669 files changed, 240265 insertions, 120618 deletions

diff --git a/.mtn-ignore b/.mtn-ignore
index de8aae230a..44a9e13383 100644
--- a/.mtn-ignore
+++ b/.mtn-ignore
@@ -31,6 +31,8 @@ depcomp
 doc/finch.1$
 doc/pidgin.1$
 doc/html
+package_revision.h
+package_revision_raw.txt
 pidgin.apspec$
 pidgin.desktop$
 pidgin.spec$
@@ -48,10 +50,12 @@ pidgin/win32/pidgin_dll_rc.rc$
 pidgin/win32/pidgin_exe_rc.rc$
 install-sh
 libpurple/dbus-bindings.c
+libpurple/dbus-signals.c
 libpurple/dbus-types.c
 libpurple/dbus-types.h
 libpurple/example/nullclient
 libpurple/gconf/purple.schemas$
+libpurple/marshallers.[ch]
 libpurple/plugins/dbus-example-bindings.c
 libpurple/plugins/perl/common/Makefile.PL$
 libpurple/plugins/perl/common/Makefile.old
diff --git a/AUTHORS b/AUTHORS
index 8d083836f1..92de8cb238 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,7 @@ Current Developers:
 ------------------
 
 Daniel 'datallah' Atallah - Developer
+Paul 'darkrain42' Aurich - Developer
 John 'rekkanoryo' Bailey - Developer
 Ethan 'Paco-Paco' Blanton - Developer
 Thomas Butter - Developer
@@ -24,6 +25,7 @@ Christopher 'siege' O'Brien - Developer
 Bartosz Oler - Developer
 Etan 'deryni' Reisner - Developer
 Tim 'marv' Ringenbach - Developer
+Michael 'Maiku' Ruprecht - Developer, voice and video
 Elliott 'QuLogic' Sales de Andrade - Developer
 Luke 'LSchiere' Schierer - Support
 Megan 'Cae' Schneider - support/QA
@@ -35,7 +37,6 @@ Nathan 'faceprint' Walp - Developer
 
 Crazy Patch Writers:
 -------------------
-Paul 'darkrain42' Aurich
 Marcus 'malu' Lundblad
 Dennis 'EvilDennisR' Ristuccia
 Peter 'Fmoo' Ruibal
diff --git a/COPYRIGHT b/COPYRIGHT
index 530611f6b6..8033be39e9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,13 +1,27 @@
 Pidgin, Finch, and libpurple
-Copyright (C) 1998-2008 by the following:
 
-If you have contributed to this project then you deserve to be on this
-list.  Contact us (see: AUTHORS) and we'll add you.
+This file is intended to be a comprehensive list of contributors to
+this project.  If you have contributed to this project then you deserve
+to be on this list.  Contact us (see: AUTHORS) and we'll add you.
+
+Many open source projects list contributor names at the top of each
+source file containing their contribution.  However, we've found
+that it is difficult to keep this list accurate, especially when old
+code is removed or existing code is moved to a different file.  So
+instead we chose to list a generic message at the top of each source
+file that points here.
+
+If concerns are raised as to the copyright holder of a particular
+piece of code, then that code should be traced through our version
+control system to see from where it came and who has modified it.
+
+Copyright (C) 1998-2009 by the following:
 
 Saleem Abdulrasool
 Dave Ahlswede
 Manuel Amador
 Matt Amato
+Josef Andrysek
 Geoffrey Antos
 Daniel Atallah
 Paul Aurich
@@ -18,6 +32,7 @@ Kosta Arvanitis
 Christopher Ayoup
 Alex Badea
 John Bailey
+Arunan Balasubramaniam
 R. Tyler Ballance
 Chris Banal
 Luca Barbato
@@ -28,6 +43,8 @@ Lukas Barth
 Derek Battams
 Martin Bayard
 Curtis Beattie
+Stefan Becker
+Carlos Bederian
 Dave Bell
 Igor Belyi
 Brian Bernas
@@ -57,6 +74,7 @@ Jeffery Brown
 Philip Brown
 Dan Bruce
 Norbert Buchmuller
+Johannes Buchner
 Sean Burke
 Thomas Butter
 Trevor Caira
@@ -166,6 +184,7 @@ David Grohmann
 Christian Grothoff
 Vladislav Guberinić
 Gideon N. Guillen
+Aman Gupta
 Christian Hammond
 Erick Hamness
 Fred Hampton
@@ -211,6 +230,8 @@ Hans Petter Jansson
 David Jedelsky
 Henry Jen
 Benjamin Kahn
+Jan Kaluza
+Yuriy Kaminskiy
 Anders Kaseorg
 Praveen Karadakal
 Jaromír Karmazín
@@ -218,6 +239,7 @@ John Kelm
 Jochen Kemnade
 Yann Kerherve
 Gordian Klein
+Krzysztof Klinikowski
 Akuke Kok
 Kir Kolyshkin
 F.W. Kong
@@ -261,7 +283,9 @@ Iain MacDonnell
 Lucio Maciel
 Brian Macke
 Paolo Maggi
+Sulabh Mahajan
 Willian T. Mahan
+Tobias Markmann
 Kris Marsh
 Fidel Martinez
 Lalo Martins
@@ -324,15 +348,16 @@ Matt Perry
 Luke Petre
 Diego Petten
 Nathan Peterson
+Dmitry Petroff
 Sebastián E. Peyrott
+Andrea Piccinelli
 Celso Pinto
 Joao Luís Marques Pinto
 Aleksander Piotrowski
 Julien Pivotto
+Robey Pointer
 Eric Polino <aluink@gmail.com>
 Ari Pollak
-Robey Pointer
-Eric Polino
 Stephen Pope
 Nathan Poznick
 Jory A. Pratt
@@ -417,6 +442,7 @@ Peter Speybrouck
 Lex Spoon
 Chris Stafford
 Kevin Stange
+Joshua Stein
 Jakub Steiner
 Richard Stellingwerff
 Charlie Stockman
@@ -430,6 +456,7 @@ Mårten Svantesson (fursten)
 Amir Szekely (kichik)
 Robert T.
 Greg Taeger
+Rob Taft
 Peter Tang
 Brian Tarricone
 Peter Teichman
@@ -442,6 +469,7 @@ Douglas Thrift (douglaswth)
 Mark Tiefenbruck
 Andrew Tinney
 Jeffery To
+Krzysztof Tobola (kreez)
 Warren Togami
 Stu Tomlinson
 Bill Tompkins
@@ -499,6 +527,7 @@ Ximian
 Ma Xuan
 Jared Yanovich
 Timmy Yee
+Li Yuan
 Nickolai Zeldovich
 Tom Zickel
 Marco Ziech
diff --git a/ChangeLog b/ChangeLog
index 61a6dbf6e6..584ea98c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,14 +2,160 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.7.0 (??/??/????):
 
-version 2.6.0 (??/??/2009):
-	General:
+version 2.6.1 (??/??/2009):
+	XMPP:
+	* Prompt the user before cancelling a presence subscription.
+
+version 2.6.0 (08/18/2009):
+	libpurple:
 	* Theme support in libpurple thanks to Justin Rodriguez's summer of code
-	  project.  With some minor additions and clean ups from Paul Aurich.
+	  project, with some minor additions and cleanups from Paul Aurich.
+	* Voice & Video framework in libpurple, thanks to Mike Ruprecht's summer
+	  of code project in 2008.
+	* It should no longer be possible to end up with duplicates of buddies
+	  in a group on the buddy list.
+	* Removed the unmaintained and unneeded toc protocol plugin.
+	* Fixed NTLM authentication on big-endian systems.
+	* Various memory cleanups when unloading libpurple. (Nick Hebner and
+	  Stefan Becker)
+	* Report idle time 'From last message sent' should work properly.
+	* Better handling of corrupt certificates in the TLS Peers cache.
+	* More efficient buddy list and conversation search functions.
+	  (Jan Kaluza and Aman Gupta)
+	* Install scalable versions of the main Pidgin icon, the protocol icons,
+	  the dialog icons, and the Buddy List emblems.
+	* Build properly on Hurd.  (Marc Dequènes)
+	* Various memory leaks fixed as reported by Josh Mueller.
+	* Properly handle an IRC buddy appearing in multiple groups.
+	* Escape HTML entities in usernames when written with the HTML logger.
+	* Do not display MySpace status changes as incoming IMs.  (Mark Doliner and
+	  Justin Williams)
+
+	DNS:
+	* DNS servers are re-read when DNS queries fail in case the system has
+	  moved to a new network and the old servers are not accessible.
+	* DNS SRV records with equal priority are sorted with respect to their
+	  weight as specified in RFC 2782.  (Vijay Raghunathan)
+	* Don't do IPv6 address lookups if the computer does not have an IPv6
+	  address configured.
+	* Fix a leak when the UI provides its own DNS resolving UI op.
+	  (Aman Gupta)
+	* Don't fork a DNS resolver process to resolve IP addresses.  (Aman Gupta)
+	* Internationalized Domain Names are supported when libpurple is compiled
+	  against the GNU IDN library.
+
+	Environment Variables:
+	* GnuTLS logging (disabled by default) can be controlled through the
+	  PURPLE_GNUTLS_DEBUG environment variable, which is an integer between
+	  0 and 9 (higher is more verbose). Higher values may reveal sensitive
+	  information.
+	* PURPLE_VERBOSE_DEBUG environment variable.  Currently, this is an "on" or
+	  "off" variable.  Set it to any value to turn it on and unset it to turn
+	  it off.  This will optionally be used to only show less useful debug
+	  information on an as-needed basis.
+	* PURPLE_LEAKCHECK_HELP environment variable.  Currently, this is an "on"
+	  or "off" variable.  Set it to any value to turn it on and unset it to
+	  turn it off.  This will be used to perform various actions that are
+	  useful when running libpurple inside of Valgrind or similar programs.
+	  Currently, it keeps plugins in memory, allowing Valgrind to perform
+	  symbol resolution of leak traces at shutdown.
+
+	AIM and ICQ:
+	* Preliminary support for a new authentication scheme called
+	  "clientLogin."
+	* Fixed a bug where your away message sometimes would not get set when
+	  you first sign on.
+	* Make sure links in your away messages show up as links to other people.
+	* For ICQ, Never change the privacy setting specified by the user.
+
+	Gadu-Gadu:
+	* Accounts can specify a server to which to connect.
+	  (Krzysztof "kreez" Tobola)
+	* Correctly show tooltip status for contacts with status messages.
+	  (Krzysztof "kkszysiu" Klinikowski)
+	* Support for fetching buddy icons.  (Krzysztof "kkszysiu" Klinikowski)
+	* Support connection progress steps in Gadu-Gadu.  (Krzysztof "kkszysiu"
+	  Klinikowski)
+
+	MSN:
+	* Add support for receiving handwritten (ink) messages on MSN.  (Chris
+	  Stafford, Gal Topper, and Elliott Sales de Andrade)
+	* Add support for receiving audio clips on MSN.  (Chris Stafford, Gal
+	  Topper, and Elliott Sales de Andrade)
+	* Show the invite message for buddies that requested authorization
+	  from you on MSN.
+	* Support sending an invite message to buddies when requesting authorization
+	  from them on MSN.
+	* Timeout switchboard connections aggressively (60 seconds).
 
 	XMPP:
-	* Add support for in-band bytestreams (XEP-0047).
-	* Add support for attention (XEP-0224).
+	* Voice & Video support with Jingle (XEP-0166, 0167, 0176, & 0177), voice
+	  support with GTalk and voice and video support with the GMail web
+	  client. (Mike "Maiku" Ruprecht)
+	* Added a Service Discovery Browser plugin for Pidgin. (Andrei Mozzhuhin)
+	* Support for in-band bytestreams for file transfers (XEP-0047). (Marcus
+	  Lundblad)
+	* Support for sending and receiving attentions (equivalent to "buzz"
+	  and "nudge") using the command /buzz. (XEP-0224)
+	* Support for connecting using BOSH. (Tobias Markmann)
+	* A buddy's local time is displayed in the Get Info dialog if the remote
+	  client supports it.
+	* The set_chat_topic function can unset the chat topic.
+	* The Ad-Hoc commands associated with our server are now always shown at
+	  login.
+	* Support showing and reporting idle times in the buddy list. (XEP-0256)
+	* Support most recent version of User Avatar. (XEP-0084 v1.1)
+	* Updated Entity Capabilities support. (Tobias Markmann)
+	* Better support for receiving remote users' nicknames.
+	* /affiliate and /role will now list the room members with the specified
+	  affiliation/role if possible. (Andrei Mozzhuhin)
+	* Put section breaks between resources in "Get Info" to improve readability.
+	* Silently remove invalid XML 1.0 entities (e.g. ASCII control characters)
+	  from sent messages.
+	* XHTML markup is only included in outgoing messages when the message
+	  contains formatting.
+	* Show when the user was last logged in when doing "Get Info" on an offline
+	  buddy, provided the server supports it.
+	* Support custom smileys in MUCs (only when all participants support the
+	  "Bits of Binary" extension, and a maximum of 10 participants are in the
+	  chat to avoid getting too many fetch requests).
+	* Fix an issue with Jabber (pre-XMPP) servers and the user's preference
+	  to require SSL not being respected.
+	* Fix an issue where Cyrus SASL DIGEST MD5 authentication might fail if
+	  the username, password, or realm (the JID domain) contain non-ASCII
+	  characters.
+	* Show emblem for mobile, handheld, and web clients and bots (if the other
+	  client supports it).
+	* Google Talk mail notifications should now work for people for whom they
+	  inexplicably did not.  (Thanks to yukam for determining the reason)
+	* New XMPP and Google Talk accounts require SSL by default.
+	* Display kicks (and the reasons given) in chat rooms when an occupant is
+	  kicked.
+	* Fix issues with case-sensitivity of XMPP roster and case-insensitive
+	  Purple groups.
+	* For contacts who advertise Entity Capabilities, only send rich text
+	  markup if they support it.
+	* Removed support for obsoleted XEP-0022 (Message Events) and XEP-0091
+	  (Legacy Entity Time).
+	* When the GNU IDN library (libidn) is available, it is used for
+	  normalization of Jabber IDs.  When unavailable, internal routines are
+	  used (as in previous versions).
+	* Topics that contain '<' followed by a non-whitespace character can now
+	  be set properly.
+
+	Yahoo!/Yahoo! JAPAN:
+	* P2P file transfers.  (Sulabh Mahajan)
+	* Sending text messages (address to +<countrycode><phone number>).
+	  (Sulabh Mahajan)
+	* Addition of MSN buddies to Yahoo accounts by adding them as
+	  'msn/buddy@somedomain.com' is now supported.  (Sulabh Mahajan)
+	* Further fixes for buddy pictures, aliases, etc.
+	* Yahoo! and Yahoo! JAPAN are now two separate protocol plugins that share
+	  common protocol code.  You can now have the same account on both
+	  networks.  Accounts should be seamlessly migrated to the new
+	  arrangement.
+	* Ability to set personal details for an account and for buddies in the
+	  buddylist.
 
 	Pidgin:
 	* Added -f command line option to tell Pidgin to ignore NetworkManager
@@ -20,6 +166,126 @@ version 2.6.0 (??/??/2009):
 	* Pressing the Enter key in the message entry box of the New Status
 	  dialog and various other dialogs now causes the cursor to move to
 	  the next line.
+	* Created a unified Buddy Pounce notification window for all pounces
+	  where "Pop up a notification" is selected, which avoids having a
+	  new dialog box every time a pounce is triggered. (Jorge Villaseñor)
+	* The New Account dialog is now broken into three tabs.  Proxy
+	  configuration has been moved from the Advanced tab to the new tab.
+	* Dragging a buddy onto a chat pops up a chat-invitation dialog.
+	  (Carlos Bederian)
+	* The nicks of the persons who leave the chatroom are italicized in the
+	  chat's conversation history. The nicks are un-italicized when they
+	  rejoin.
+	* Always set unseen-count and unseen-state on conversations.
+	  (Joshua Stein)
+	* Fix a bug in 'Conversation Colors' plugin for RTL messages.
+	* Pressing the Left and Right arrow keys in the buddy list will expand and
+	  collapse buddy groups or contacts. (Peter Ruibal)
+	* Support saving animated custom smileys as animated images or animated
+	  custom smileys. (Andrea Piccinelli)
+	* Support for keyboard navigation on the status icon. (Li Yuan)
+	* IMG tags without 'id' attributes are turned into links to the image URL.
+	  (Dmitry Petroff)
+	* Draw the user's buddy icon at the bottom of the Buddy List with rounded
+	  corners for visual consistency with the actual icons in the Buddy List.
+	  (Kosta Arvanitis)
+	* When file transfers are complete, the received file name written to the
+	  conversation window is now linked to the file.
+	* Fix a crash when closing a conversation tab that has unread messages
+	  when the Message Notification plugin is loaded.
+	* Fix a crash when closing the New Mail dialog if an account with new
+	  mail was previously disconnected while the dialog was open.
+	* Fix incorrect unread message counts for the new mail notifications.
+	* Do not lose unread messages with a hidden conversation window when
+	  new IM conversations are hidden and "Close IMs immediately when the tab
+	  is closed" is unset.
+
+	Finch:
+	* The hardware cursor is updated correctly. This will be useful
+	  especially for users of braille terminals, screen readers etc.
+	* Added a TinyURL plugin, which aids copying longer URLs.
+	* Fixed UTF-8 compatibility problems which could cause exits or other
+	  unrequested behaviour.
+
+	Pidgin GTK+ Theme Control Plugin:
+	* Removed mouse cursor color preferences.
+	* Added "Typing Notification Color" preference.
+	* Added "Disable Typing Notification Text" preference.
+	* Preferences have been reorganized into three tabs for Colors, Fonts, and
+	  Miscellaneous categories.
+
+version 2.5.9 (08/18/2009):
+	* Fix a crash via a specially crafted MSN message (CVE-2009-2694,
+	  thanks to Core Security Technologies for discovering this and
+	  notifying us privately before announcing it).
+	* Fix a crash in Bonjour, MSN, and XMPP when trying to transfer files with
+	  NULL names.
+
+version 2.5.8 (06/27/2009):
+	ICQ:
+	* Fix misparsing a web message as an SMS message. (Yuriy Kaminskiy)
+
+	MSN:
+	* Increase NS command history size to prevent crashes on buddy lists that
+	  have a lot of buddies on other networks like Yahoo!.
+
+	MySpace:
+	* Accounts with empty buddy lists are now properly marked as connected.
+	* Fix receiving messages from users of MySpace's web IM client.
+
+	Yahoo:
+	* Fixed phantom online buddies.  They should now properly disappear when
+	  signing out.
+	* Fixed the crashes some users were seeing with cn.scs.msg.yahoo.com in
+	  2.5.7.
+	* Fixed compiling on systems with glib 2.4.x or older.
+	* Fixed an issue with file transfers.  This may not resolve all issues,
+	  but it should resolve at least some of the most common ones.
+	* The pager server will automatically update to scsa.msg.yahoo.com if the
+	  user empties the field or if it is scs.msg.yahoo.com.  This should ease
+	  the pain of transition to the new login method.
+
+	XMPP:
+	* Fix an incompatibility betweeen Prosody and libpurple clients.
+
+version 2.5.7 (06/20/2009):
+	* Yahoo Protocol 16 support, including new HTTPS login method; this should
+	  fix a number of login problems that have recently cropped up.  (Sulabh
+	  Mahajan, Mike "Maiku" Ruprecht)
+	* Only display the AIM "Unable to Retrieve Buddy List" message once per
+	  connection.  (Rob Taft)
+	* Blocking MSN users not on your buddy list no longer disconnects you.
+	* When performing operations on MSN, assume users are on the MSN/Passport
+	  network if we don't get network ID's for them.
+
+version 2.5.6 (05/19/2009):
+	libpurple:
+	* Improve sleep behavior by aggregation of longer timeouts on second
+	  boundaries to allow better power saving.  (Arunan Balasubramaniam)
+	* Fix various crashes on exit.
+	* Make XML parsing more resilient to interactions with other libraries.
+	  This, along with the fix for libxml2 bug 564217, fixes the crashes
+	  on connect in XMPP with recent gst-plugins-bad (see #8830 for details).
+	* Many security related fixes.
+
+	IRC:
+	* Correctly handle WHOIS for users who are joined to a large number of
+	  channels.
+	* Notify the user if a /nick command fails, rather than trying
+	  fallback nicks.
+
+	MSN:
+	* Fix a race condition causing occasional Pidgin crashes.
+	* Fix some errors about the friendly name changing too fast caused
+	  by MSN/Yahoo integration buddies.
+
+	XMPP:
+	* Less likely to pop up a new conversation window in disregard of
+	  the "Hide new IM conversations" preference.
+
+	Yahoo:
+	* Fix a crash when sending very long messages.
+	* Fix a bug where UTF-8 status messages get garbled when going idle.
 
 version 2.5.5 (03/01/2009):
 	libpurple:
diff --git a/ChangeLog.API b/ChangeLog.API
index 4b0867523e..e2d9d879c0 100644
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -2,14 +2,30 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.7.0 (??/??/????):
 
-version 2.6.0 (??/??/2009):
+version 2.6.0 (08/18/2009):
 	libpurple:
 		Added:
+		* PurpleMedia and PurpleMediaManager API
 		* PURPLE_BLIST_NODE
 		* PURPLE_GROUP
 		* PURPLE_CONTACT
 		* PURPLE_BUDDY
 		* PURPLE_CHAT
+		* Account signals (see account-signals.dox)
+			* account-actions-changed
+			* account-created
+			* account-destroying
+		* blist-node-added and blist-node-removed signals (see
+		  blist-signals.dox)
+		* Three Blist UI ops used to overload libpurple's built-in saving
+		  of the buddy list to blist.xml. If a UI implements these, it probably
+		  wants to add the buddies itself and not call purple_blist_load.
+		* Three File Transfer UI ops used to overload libpurple's use of fread
+		  and fwrite for saving a file locally. These allow a UI to stream a
+		  file through a socket without buffering the file on the local disk.
+		* Jabber plugin signals (see jabber-signals.dox)
+		* purple_account_remove_setting
+		* purple_buddy_destroy
 		* purple_buddy_get_protocol_data
 		* purple_buddy_set_protocol_data
 		* purple_buddy_get_local_buddy_alias
@@ -18,20 +34,88 @@ version 2.6.0 (??/??/2009):
 		* purple_blist_set_ui_data
 		* purple_blist_node_get_ui_data
 		* purple_blist_node_set_ui_data
+		* purple_certificate_check_signature_chain_with_failing
+		* purple_chat_destroy
 		* purple_connection_get_protocol_data
 		* purple_connection_set_protocol_data
+		* purple_contact_destroy
+		* purple_conv_chat_invite_user
+		* purple_debug_is_unsafe
+		* purple_debug_is_verbose
+		* purple_debug_set_unsafe
+		* purple_debug_set_verbose
 		* purple_global_proxy_set_info
+		* purple_group_destroy
+		* purple_ipv4_address_is_valid
+		* purple_ipv6_address_is_valid
 		* purple_log_get_activity_score
+		* purple_markup_is_rtl
+		* purple_markup_escape_text
+		* purple_network_convert_idn_to_ascii
 		* purple_network_force_online
+		* purple_network_set_stun_server
+		* purple_network_set_turn_server
+		* purple_network_get_stun_ip
+		* purple_network_get_turn_ip
+		* purple_network_remove_port_mapping
+		* purple_plugins_get_search_paths
+		* purple_proxy_connect_udp
+		* purple_prpl_get_media_caps
+		* purple_prpl_got_account_actions
+		* purple_prpl_initiate_media
 		* purple_request_field_get_group
 		* purple_request_field_get_ui_data
 		* purple_request_field_set_ui_data
+		* purple_ssl_connect_with_ssl_cn
 		* purple_strequal
+		* purple_utf8_strip_unprintables
+		* purple_util_fetch_url_request_len_with_account
+		* purple_xfer_prpl_ready
+		* purple_xfer_ui_ready
 		* xmlnode_from_file
+		* xmlnode_get_parent
+		* xmlnode_set_attrib_full
+
+		Changed:
+		* xmlnode_remove_attrib now removes all attributes with the
+		  same name.  Previously, it would remove the first one found,
+		  which was completely non-deterministic.  If you want to remove
+		  the attribute with no namespace, then use NULL with
+		  xmlnode_remove_with_namespace.
+		* Plugins may now emit the jabber-sending-xmlnode signal in order
+		  to send stanzas; this method is preferred to the prpl send_raw
+		  function as other plugins listening to the signal see them.
+		* The conversation-updated signal with a PURPLE_CONV_UPDATE_TYPING
+		  update type is emitted when receiving an IM.  Previously, the
+		  typing state was modified (and the buddy-typing-stopped signal
+		  emitted), but this signal was not emitted.
+		* Added a client_type field in the get_ui_info core UI op. See
+		  core.h for details.
+		* Added introspection of signals exposed via the D-Bus API.
+		* purple_find_buddies is now more efficient in the case where
+		  it is enumerating all the buddies for an account.
+		* purple_find_group is now more efficient for large numbers of groups.
+		* purple_find_conversation_with_account is more efficient for large
+		  numbers of concurrent conversations.
+		* All DNS routines support internationalized domain names (IDNs) when
+		  libpurple is compiled with GNU libidn.
+		* status is set before emitting signals in purple_xfer_set_status.
+		* Creating multiple distinct chats with the same name (i.e. "MSN Chat")
+		  is deprecated and will be removed in libpurple 3.0.0.
+		* purple_xfer_start now accepts -1 as the fd parameter if the protocol
+		  plugin will administer the transfer itself. 0 is still accepted for
+		  backward compatibility since older versions of libpurple will not
+		  accept -1.
 
 		Deprecated:
+		* buddy-added and buddy-removed blist signals
+		* purple_blist_destroy
+		* purple_blist_new
 		* purple_buddy_get_local_alias
+		* purple_certificate_check_signature_chain
+		* purple_ip_address_is_valid
 		* purple_notify_user_info_remove_entry
+		* purple_set_blist
 		* purple_status_type_set_primary_attr
 		* purple_status_type_add_attr
 		* purple_status_type_add_attrs
@@ -42,6 +126,9 @@ version 2.6.0 (??/??/2009):
 		* purple_status_set_attr_string
 		* purple_presence_add_status
 		* purple_presence_add_list
+		* purple_util_fetch_url_request_len
+		* xmlnode_set_attrib_with_namespace
+		* xmlnode_set_attrib_with_prefix
 
 	pidgin:
 		Added:
@@ -50,12 +137,28 @@ version 2.6.0 (??/??/2009):
 		  gtk_imhtml_link_activate functions to process GtkIMHtmlLink
 		  objects from GtkIMHtml protocol callbacks.
 		* gtk_imhtml_set_return_inserts_newline
+		* gtk_imhtml_set_populate_primary_clipboard
 		* pidgin_blist_set_theme
 		* pidgin_blist_get_theme
+		* pidgin_prefs_labeled_password
+		* pidgin_smiley_editor_set_data
 		* pidgin_sound_is_customized
 		* pidgin_utils_init, pidgin_utils_uninit
+		* pidgin_notify_pounce_add
+		* PidginBlistTheme, PidginBlistThemeLoader API
+		* PidginIconTheme, PidginStatusIconTheme, PidginIconThemeLoader
+		  API
+		* pidgin_stock_id_from_status_primitive
+		* pidgin_stock_id_from_presence
+
+	libgnt:
+		Added:
+		* GntProgressBar and functions (Saleem Abdulrasool)
 
 	perl:
+		Added:
+		* Purple::XMLNode::get_name()
+
 		Changed:
 		* Made a bunch of functions act more perl-like. Call the new()
 		  functions as Class->new(...) instead of Class::new(...):
@@ -69,6 +172,23 @@ version 2.6.0 (??/??/2009):
 			* Purple::Request::Field::list_new
 			* Purple::Request::Field::string_new
 			* Purple::Request::Field::group_new
+		* Make the XMLNode API more perl-like. Don't pass len
+		  parameters and call them like:
+			* $xmlnode->copy()
+			* $xmlnode->to_str()
+			* $xmlnode->to_formatted_str()
+			* Purple::XMLNode::from_str(...)
+version 2.5.9 (08/18/2009):
+	No changes
+
+version 2.5.8 (06/27/2009):
+	No changes
+
+version 2.5.7 (06/20/2009):
+	No changes
+
+version 2.5.6 (05/19/2009):
+	No changes
 
 version 2.5.5 (03/01/2009):
 	libpurple:
diff --git a/ChangeLog.win32 b/ChangeLog.win32
index d7bb39e350..343d441568 100644
--- a/ChangeLog.win32
+++ b/ChangeLog.win32
@@ -1,11 +1,25 @@
 version 2.7.0 (??/??/????):
 
-version 2.6.0 (??/??/2009):
+version 2.6.0 (08/18/2009):
+	* Added XMPP URI support.
+
+version 2.5.9 (08/18/2009):
+	* No changes and no win32 packages built.
+
+version 2.5.8 (06/27/2009):
+	* No changes
+
+version 2.5.7 (06/20/2009):
+	* No changes
+
+version 2.5.6 (05/19/2009):
+	* No changes
 
 version 2.5.5 (03/01/2009):
 	* Remove the "Flash window when chat messages are received" pref from
 	  the Windows Pidgin Options plugin - the Message Notification plugin
 	  does this (and much more).
+	* Updated GTK+ to 2.14.7
 
 version 2.5.4 (01/12/2009):
 	* Fix the "Hang on Exit" issue that a number of users encountered.
diff --git a/INSTALL b/INSTALL
index 7d771dec51..3b01a0d17e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -158,7 +158,7 @@ Optional Packages:
 
 	`--with-dynamic-prpls' takes a list of comma separated protocols also.  If used only those listed will be built.  If no protocols are listed with either `--with-static-prpls' or with `--with-dynamic-prpls' then Pidgin and Finch will be effectively useless.
 
-	If configure does not find python, it will build without DBUS support.  Thiswill disable scripts such as purple-remote and purple-uri-handler, effectively disabling integration with the browser.  You can tell configure where your python binary is located with `--with-python=PATH'
+	If configure does not find python, it will build without DBUS support.  This will disable scripts such as purple-remote and purple-uri-handler, effectively disabling integration with the browser.  You can tell configure where your python binary is located with `--with-python=PATH'
 
 Specifying the System Type
 ==========================
diff --git a/Makefile.am b/Makefile.am
index 28c2e40fa1..c3088de6a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,13 +16,14 @@ EXTRA_DIST = \
 		intltool-extract.in \
 		intltool-merge.in \
 		intltool-update.in \
+		package_revision.h \
 		pidgin.apspec.in \
 		pidgin.spec.in \
 		pidgin.desktop.in \
 		po/Makefile.mingw \
 		valgrind-suppressions
 
-noinst_HEADERS = config.h
+noinst_HEADERS = config.h package_revision.h
 
 dist-hook: pidgin.spec
 	cp pidgin.spec $(distdir)
@@ -86,7 +87,42 @@ if INSTALL_I18N
 PO_DIR=po
 endif
 
-SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros $(PO_DIR) share/ca-certs share/sounds
+# This is phony, so that we always try to rebuild it.  If it succeeds
+# in calculating changes, it produces its target; otherwise, its
+# target does not exist.
+.PHONY: package_revision_raw.txt
+# if both attempts fail, then we need to remove the empty file that >
+# creates, and also make sure that the shell command exits
+# successfully; the rm -f ensures both
+package_revision_raw.txt:
+	REAL_BLDDIR=$$PWD/$(top_builddir); \
+	(cd $(srcdir) && $$REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
+	|| (cd $(srcdir) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
+	|| rm -f $@
+package_revision.h: package_revision_raw.txt
+	if [ -f $< ]; then \
+	  sed 's/^\(.\+\)$$/#define REVISION "\1"/' $< > $@; \
+	fi
+	if [ ! -f $@ -a -f $(srcdir)/$@ ]; then \
+	  cp $(srcdir)/$@ $@; \
+	fi
+	[ -f $@ ] || echo "#define REVISION \"unknown\"" > $@
+
+# This is a magic directive copy-and-pasted, then modified, from the
+# automake 1.9 manual, section 13.4, "Checking the distribution".
+# Normally, 'distcheck' does a clean build, and then afterwards runs
+# 'distclean', and 'distclean' is supposed to remove everything that
+# the build created.  However, we have some targets (package_revision.txt)
+# that we distribute, but then always attempt to rebuild optimistically, and
+# then if that fails fall back on the distributed versions.  This
+# means that 'distclean' should _not_ remove those files, since they
+# are distributed, yet building the package will generate those files,
+# thus automake thinks that 'distclean' _should_ remove those files,
+# and 'distcheck' gets cranky if we don't.  So basically what this
+# line does is tell 'distcheck' to shut up and ignore those two files.
+distcleancheck_listfiles = find . -type f -a ! -name package_revision.h
+
+SUBDIRS = . libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros $(PO_DIR) share/ca-certs share/sounds
 
 docs: Doxyfile
 if HAVE_DOXYGEN
diff --git a/Makefile.mingw b/Makefile.mingw
index a1d7c8d4db..fba747addf 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -73,7 +73,7 @@ EXTERNAL_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(EXTERNAL_DLLS))
 
 .PHONY: all docs install installer installer_nogtk installer_debug installers clean uninstall create_release_install_dir
 
-all: $(PIDGIN_CONFIG_H)
+all: $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H)
 	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE)
 	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE)
 ifndef DISABLE_NLS
@@ -96,15 +96,15 @@ create_release_install_dir: install
 	 -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';'
 
 installer: create_release_install_dir
-	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DWITH_GTK $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./
 
 installer_nogtk: create_release_install_dir
-	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-no-gtk.exe ./
 
 installer_debug: install
-	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR)" $(MAKENSISOPT)DDEBUG $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-debug.exe ./
 
 installer_zip: create_release_install_dir
@@ -125,11 +125,13 @@ clean:
 	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) clean
-	rm -f $(PIDGIN_CONFIG_H) ./VERSION pidgin-$(PIDGIN_VERSION)*.exe pidgin-$(PIDGIN_VERSION)-win32-bin.zip
+	rm -f $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) ./VERSION pidgin-$(PIDGIN_VERSION)*.exe pidgin-$(PIDGIN_VERSION)-win32-bin.zip
 	rm -rf doc/html Doxyfile.mingw
 
 uninstall:
-	rm -rf $(PURPLE_INSTALL_PERLMOD_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(STRIPPED_RELEASE_DIR)
+	rm -rf $(PURPLE_INSTALL_PERL_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(STRIPPED_RELEASE_DIR)
 	rm -f ./VERSION
 
 include $(PIDGIN_COMMON_TARGETS)
+
+.PHONY: $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT)
diff --git a/NEWS b/NEWS
index d43f4edce3..396a3751e2 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,84 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.6.0 (08/18/2009):
+	John:  Wow, four straight releases that I'm the first to NEWS on.  This
+	is getting kinda scary!  I'm beginning to wonder who else actually does
+	anything around here!  (Just kidding, of course.)  LOTS of new features
+	and a crapton of bugfixes this release.  There should pretty much be
+	something for everybody.  A great example of this is the ton of Yahoo
+	changes that have happened thanks to our SoC student from 2008, Sulabh
+	Mahajan.  Among his massive improvements are the ability to add MSN
+	buddies by adding them as "msn/user@domain.tld" and peer-to-peer file
+	transfers.  Of course, history shows we can't please everyine, so I'm
+	sure I'll see a complaint or five thousand in trac.  Enjoy, though!
+
+	Marcus: This is my first news! It's been quite a few microreleases this
+	time, but now we're finally at 2.6.0. I suppose the most anticipated
+	new feature in this release is the voice and video support, thanks to
+	Mike's heroic work. I've managed to slip in a few features too, like
+	in-band bytestream file transfers as a fallback on XMPP and idle time
+	reporting on XMPP. Enjoy!
+
+	Paul: This is my first news, too!  This release has definitely been a
+	long time coming; hopefully it won't disappoint since we've closed over
+	200 tickets.  Among other things, Tobias Markmann's GSoC project from
+	last year was merged, which means we now support BOSH (XMPP connections
+	over HTTP), and Andrei Mozzhuhin contributed an XMPP Service Discovery
+	Browser.  Also, thanks to Bernmeister for poking (at least) several
+	hundred old tickets!
+
+	Mike: Ditto. This is my first news as well. I have a feeling this is
+	getting repetitive at this point, but voice and video support is
+	finally here! Thanks to the rest of the Pidgin team, Farsight 2, and
+	GStreamer developers for making this possible! (I finally finished my
+	Summer of Code project :D)
+
+	Elliott: Hey, this is my firs... Wait, no it isn't.  Now I feel left
+	out.  So have you heard about this voice and video thing?
+	Unfortunately, not quite ready for all protocols, but it's getting
+	there.  MSN gained support for receiving voice clips at least, and
+	finally we have Ink receiving capabilities too.  Thanks to the guys
+	who wrote the original patch.  And finally, MSN no longer has over a
+	100 tickets open!
+
+2.5.9 (08/18/2009):
+	John:  This release is just a crash fix release to address a security
+	issue reported to us by CORE and a couple crashes Elliott found.
+
+2.5.8 (06/27/2009):
+	John:  This release is another somewhat rushed bugfix release to fix
+	a number of bugs that have come up since we released Pidgin 2.5.7.
+	Hopefully anything I broke there is fixed now, or at least made to be
+	less broken.  Enjoy!
+
+2.5.7 (06/20/2009):
+	John:  This release is really just a rushed fix for the broken Yahoo
+	protocol plugin.  I spent way more time on this release than I care
+	to admit, so I hope that time is well spent and this fixes the issues
+	people have been having.
+
+2.5.6 (05/19/2009):
+	Ka-Hing: Many much bugfixes. Hooray. (Paul told me to say that)
+	Oh, no one has met Paul yet? He's awesome, he backported my fixes
+	to the release branch so I didn't have to checkout a
+	workspace... except I just did to NEWS to tell you all about
+	that. Oh and I actually did do something for this release, none of
+	which is user visible though. This basically applies to the rest
+	of the release as well, nothing exciting, but you definitely want
+	it.
+
+	Daniel: This should fix a number of annoying issues that some users
+	have encountered.  We also would like to thank Veracode
+	(http://www.veracode.com) who performed a code analysis and found some
+	bugs that were addressed in this release.
+
+	Elliott: I feel like I'm repeating myself, but there are some more MSN
+	fixes that should make things better behaved at login as well, and
+	maybe you'll stop getting some of those annoying errors (though not all
+	are fixed yet).  Some other bugfixes, plus the craziness that is the
+	libxml "structured error handler" make up the rest of this release.
+
 2.5.5 (03/01/2009):
 	John: Well, yet another release with bug fixing and patches.  Hopefully
 	one of the fixed bugs is one that irritated you.  Also, thank Dimmuxx
@@ -18,10 +96,10 @@ Our development blog is available at: http://planet.pidgin.im
 	a few patches, and we've dealt with what feels like a TON of tickets
 	about two very common issues.  Feels like time for a release to me.
 
-	Etan: My first NEWS in quite a while and I don't have much to say. I
+	Etan: My first NEWS in quite a while and I don't have much to say.  I
 	haven't been too active lately and I'm hoping that won't be the case
-	going forward. I managed to get in a few perl fixes and some UI
-	language tweaks this release. My plan is to work on some of the
+	going forward.  I managed to get in a few perl fixes and some UI
+	language tweaks this release.  My plan is to work on some of the
 	issues pointed out by mpt (during his expert review of pidgin a little
 	while back) in the near future.
 
@@ -59,14 +137,14 @@ Our development blog is available at: http://planet.pidgin.im
 	messaging pleasure.
 
 	Sadrul: Despite our best efforts, this release got delayed by a
-	couple of weeks. But here it is! It is mostly a bug fix release, with
+	couple of weeks.  But here it is! It is mostly a bug fix release, with
 	a couple of important fixes, e.g. fix for the Yahoo! disconnect
-	problem. Also, welcome our newest Crazy Patch Writer, Marcus Lundblad,
+	problem.  Also, welcome our newest Crazy Patch Writer, Marcus Lundblad,
 	who, among various other fixes, has implemented custom smileys for the
-	XMPP protocol, included in this release. Enjoy!
+	XMPP protocol, included in this release.  Enjoy!
 
 	Stu: I guess this is the time of year for server migrations, and
-	I've just about had enough of them. Fortunately Pidgin is still fun,
+	I've just about had enough of them.  Fortunately Pidgin is still fun,
 	and this release should be superb.
 
 	John: Although our services were down for quite some time, we didn't
@@ -76,8 +154,8 @@ Our development blog is available at: http://planet.pidgin.im
 	happy!
 
 	Elliott: This release took a while, but that was due to an unfortunate
-	server snafu. I didn't have much to do with it, but hopefully the new
-	servers will help us out a bit. Anyway, mostly bug-fixes this time.
+	server snafu.  I didn't have much to do with it, but hopefully the new
+	servers will help us out a bit.  Anyway, mostly bug-fixes this time.
 	Nothing spectacular, unless you happen to suffer from one of those bugs.
 	Oh, and don't forget, the "Has you" tooltip is back!
 
@@ -90,9 +168,9 @@ Our development blog is available at: http://planet.pidgin.im
 	coming months.
 
 	Elliott: I'm just commenting so Kevin wouldn't be the only one in NEWS
-	and no-one else seems to want to. Anyway, there's a couple MSN login
-	fixes, so try it out. The contact list problems might still be around,
-	but you can probably find a workaround in trac. And there's a tooltip
+	and no-one else seems to want to.  Anyway, there's a couple MSN login
+	fixes, so try it out.  The contact list problems might still be around,
+	but you can probably find a workaround in trac.  And there's a tooltip
 	fix for our AIM friends, not that I had anything to do with it (except
 	closing many many duplicate tickets).
 
@@ -102,16 +180,16 @@ Our development blog is available at: http://planet.pidgin.im
 	it to the world!  There are myriad bugfixes, including some important
 	ones so you should be sure to update.
 
-	Hylke: Finally MSNP15 support. To celebrate this I refreshed a lot of
+	Hylke: Finally MSNP15 support.  To celebrate this I refreshed a lot of
 	the smilies used in the protocol and added the long awaited indispensable
-	bunny icon. I think this is one of those releases that will make a lot
+	bunny icon.  I think this is one of those releases that will make a lot
 	of users happy, especially MSN users.
 
-	Elliott: Oh look, my first NEWS! Well anyway, with that new MSNP15
+	Elliott: Oh look, my first NEWS!  Well anyway, with that new MSNP15
 	support, this release is set up to be a huge success and a total flop
-	all at the same time. Here's hoping it's the "huge success" one for you.
+	all at the same time.  Here's hoping it's the "huge success" one for you.
 	Those icon changes that Hylke made, while minor, really make things look
-	a little cleaner, I think. Oh yea, did I mention that MSNP15 stuff?
+	a little cleaner, I think.  Oh yea, did I mention that MSNP15 stuff?
 
 	Mark: Speaking of MSNP15, we'd like to welcome Elliott Sales de Andrade
 	as a full fledged developer!  He took the last few strides mushing the
@@ -119,7 +197,7 @@ Our development blog is available at: http://planet.pidgin.im
 	doing other great stuff.
 
 	Ka-Hing: "Reject"ing a certificate after your account is signed off is
-	not recommended. Deleting the file after you start sending it is also
+	not recommended.  Deleting the file after you start sending it is also
 	discouraged.
 
 2.4.3 (07/01/2008):
@@ -129,12 +207,12 @@ Our development blog is available at: http://planet.pidgin.im
 2.4.2 (5/17/2008):
 	Sadrul: We added some usability changes in this release, including the
 	typing notification, buddyicon and input area size in the conversation
-	windows, escape to close conversation windows etc. These changes should
+	windows, escape to close conversation windows etc.  These changes should
 	make pidgin more usable and more fun for Everyone! *wink*
 
 	Stu: I fixed some memory leaks, but nothing like as many as Daniel did.
 	MSN buddy list synchronization should be significantly less painful now,
-	and opening MSN inboxes might work better too. SILC passphrase changes
+	and opening MSN inboxes might work better too.  SILC passphrase changes
 	and support for passphrase-less keys has been improved also.
 
 2.4.1 (3/31/2008):
@@ -151,27 +229,27 @@ Our development blog is available at: http://planet.pidgin.im
 	John: While this release took what seems like forever to get out the
 	door, I think it's well worth the wait, especially for Yahoo! users.
 	This release serves up some fixes for long standing bugs and adds
-	file transfer for transfers with newer Yahoo! clients (finally!). As
+	file transfer for transfers with newer Yahoo! clients (finally!).  As
 	is standard with code I committed, where it works great thank the
-	patch writer, and where it's broken, feel free to yell at me. Enjoy!
+	patch writer, and where it's broken, feel free to yell at me.  Enjoy!
 
-	Sadrul: Finch is more colourful and blinky in this release! There's
+	Sadrul: Finch is more colourful and blinky in this release!  There's
 	now a log viewer, which is very useful, and also the ability to
-	block/unblock buddies. It's now also possible to find chat rooms on
-	many services, e.g. XMPP, IRC, Yahoo! etc. Happy Leap Day!
+	block/unblock buddies.  It's now also possible to find chat rooms on
+	many services, e.g. XMPP, IRC, Yahoo! etc.  Happy Leap Day!
 
 	Ka-Hing: I think all I've done for this release is committing some
 	patches written by other people.
 
-	Stu: Finally, 2.4.0 lands. I didn't do all that much except complain
-	about things I didn't like or just revert Sean's changes. I'm quite
+	Stu: Finally, 2.4.0 lands.  I didn't do all that much except complain
+	about things I didn't like or just revert Sean's changes.  I'm quite
 	pleased with how well it's turned out in the end.
 	Happy Birthday Fred, you must be nearly 10 now ;-)
 
 2.3.1 (12/7/2007):
 	Stu: I'm sorry for the MSN problems and the plugin crashes in 2.3.0.
-	Hopefully this will redeem us. This fixes a number of bugs. I'm a
-	bit late but I'd like to welcome John to the team. Enjoy!
+	Hopefully this will redeem us.  This fixes a number of bugs.  I'm a
+	bit late but I'd like to welcome John to the team.  Enjoy!
 
 	Luke: I've done absolutely nothing in the last 2 weeks, except watch
 	others commit bug and, more, leak fixes.  People should be noticing
@@ -213,23 +291,23 @@ Our development blog is available at: http://planet.pidgin.im
 	last release looking at the tickets that have been submitted
 	and many of them have been closed.
 
-	Stu: I haven't NEWS'd in a while. I haven't actually done much for
-	too long also, maybe I'll find some time soon. This release is
+	Stu: I haven't NEWS'd in a while.  I haven't actually done much for
+	too long also, maybe I'll find some time soon.  This release is
 	basically what 2.2.0 should have been - it actually compiles this
 	time.
 
 2.2.0 (9/13/2007):
 	Sean: 2.2.0 contains the results of several major Google Summer
-	of Code branches bringing some new, extraordinary features. We
+	of Code branches bringing some new, extraordinary features.  We
 	have a new protocol, MySpaceIM, a bunch of new features for an
 	existing protocol, XMPP, and nifty new certificate management
 	to make sure your IM server is who it says it is.
 
 	Ka-Hing: A number of you noticed crashes when dragging windows
-	around when certain options are enabled. Well, that was my fault,
-	and Sadrul fixed it. So Props to him and poos to me. I haven't
+	around when certain options are enabled.  Well, that was my fault,
+	and Sadrul fixed it.  So Props to him and poos to me.  I haven't
 	done much for this release, but the next one should contain
-	something that I helped work on. Hint: students are cheap slave
+	something that I helped work on.  Hint: students are cheap slave
 	coders!
 
 	Kevin: I haven't really been coding much in Pidgin, and this
@@ -239,9 +317,9 @@ Our development blog is available at: http://planet.pidgin.im
 
 2.1.1 (8/20/2007):
 	Sean: Continuing our schedule of frequent releases, Pidgin 2.1.1
-	is out. In it, we've addressed a lot of UI issues from our
+	is out.  In it, we've addressed a lot of UI issues from our
 	experimental new changes introduced in 2.1.0, and gave a lot of 
-	attention to Yahoo! and Bonjour. Thanks to everyone who 
+	attention to Yahoo! and Bonjour.  Thanks to everyone who 
 	contributed.
 
 	Luke: We have reworked some parts of the conversation windows in
@@ -252,14 +330,14 @@ Our development blog is available at: http://planet.pidgin.im
 	various issues, testing fixes, and getting patches in.
 
 	Tim: Sean finally got me to fix some of the buddy list bugs with
-	Yahoo! when in version 15 mode. So now we have some Yahoo! to
-	MSN support, which is kind of nice. Looks like some others have
+	Yahoo! when in version 15 mode.  So now we have some Yahoo! to
+	MSN support, which is kind of nice.  Looks like some others have
 	been contributing to Yahoo! while I've been AWOL, so many thanks
 	to them.
 
 2.1.0 (7/28/2007):
 	Sean: This release took a bit longer than 3 weeks, but boy is it 
-	worth it! We're beginning to experiment with new UI concepts and
+	worth it!  We're beginning to experiment with new UI concepts and
 	this release features a largely re-designed conversation window.
 	We've closed 150 tickets for this release; much thanks go to all
 	the developers, translators, and testers who made this possible.
@@ -267,28 +345,28 @@ Our development blog is available at: http://planet.pidgin.im
 	Ka-Hing: Sean said no one else NEWS'ed, so I figure I should.
 
 2.0.2 (6/14/2007):
-	Sean: Another big maintenance release. Again, about 100 tickets were
-	resolved in this release, and they keep coming in. Lots of bug fixes,
+	Sean: Another big maintenance release.  Again, about 100 tickets were
+	resolved in this release, and they keep coming in.  Lots of bug fixes,
 	some minor icon adjustements, hopefully we addressed some ICQ
 	internationalization issues, and support for Bonjour on Windows!
 	Our next release will be 2.1.0, and will come with some great new
 	features.
 
 	Stu: I think we're gradually getting the hang of this 3 week thing
-	again. This release includes yet more bug fixes. I'd also like to
+	again.  This release includes yet more bug fixes.  I'd also like to
 	specifically thank Pekka Riikonen for the patch to enable using SILC
 	Toolkit 1.1 with Pidgin/libpurple that is included in this release.
 
 2.0.1 (5/24/2007):
-	Sean: 2.0.1! Three weeks later, as scheduled! It is so nice to have
-	regular, frequent, releases again! This is a bugfix release; We have
+	Sean: 2.0.1!  Three weeks later, as scheduled!  It is so nice to have
+	regular, frequent, releases again!  This is a bugfix release; We have
 	fixed over 100 issues reported to us at http://developer.pidgin.im.
 	Thanks to everyone for their great work, and look for the next release
 	in another three weeks!
 
-	Stu: Lots'o'fixes in this. I don't know how you users find so many
-	things for us to fix. 24 hours in a day (sadly). 24 is divisible by the
-	sum of its digits and by their product. It is the smallest composite
+	Stu: Lots'o'fixes in this.  I don't know how you users find so many
+	things for us to fix.  24 hours in a day (sadly).  24 is divisible by the
+	sum of its digits and by their product.  It is the smallest composite
 	number, the product of whose divisors is a cube.
 
 	Luke: I requested that we have a bug fix release, and so we have!
@@ -310,18 +388,18 @@ Our development blog is available at: http://planet.pidgin.im
 	definition of 'cool' to get it.
 
 	Etan: Perl plugins now have access to almost all of the savedstatus
-	API functions. I also removed a couple of the preferences from the
+	API functions.  I also removed a couple of the preferences from the
 	Pidgin GTK+ Theme Control plugin which should help many of the people
-	for whom the configuration dialog size was a problem. The removed
+	for whom the configuration dialog size was a problem.  The removed
 	preferences no longer had the effects they were added to have anyway.
 
 2.0.0 (5/3/2007):
 	Sean: 2.0.0! It's real exciting to finally release Pidgin 2.0.0! I'm
-	really proud of all the work we've all done. I'm pumped. And, while
+	really proud of all the work we've all done.  I'm pumped.  And, while
 	I could go on about all the amazing thing that have been added since
 	1.5.0, what I'm really excited about is getting back to a regular,
 	rapid, release cycle of active, open development, unhindered by legal
-	quandries. Huge thanks to everyone involved.
+	quandries.  Huge thanks to everyone involved.
 
 	Luke: We have finally managed to get 2.0.0 out the door, after nearly
 	but not quite 2 years of effort and fustration.  No one regrets more
@@ -338,24 +416,24 @@ Our development blog is available at: http://planet.pidgin.im
 	attempt to avoid knee-jerk reactions.
 
 	Evan: One small step for bird, one giant leap for birdkind... except
-	this is hardly one small step. A lot more has changed from Gaim 1.5.0
+	this is hardly one small step.  A lot more has changed from Gaim 1.5.0
 	than just the name. Pidgin has a *very* attractive new look, a whole
 	new member of the family (Finch, formerly gaim-console) has been born,
 	and libpurple has come into its own as a solid, full-featured library
-	powering the greatest IM clients around. Bugs were fixed and
+	powering the greatest IM clients around.  Bugs were fixed and
 	features were added by the hundreds (thousands?) since the last
 	major release, all while improving performance and resisting feature
-	creep. As Luke said, a ton of thought and effort has gone into
+	creep.  As Luke said, a ton of thought and effort has gone into
 	Pidgin 2.0.0; I'm proud to have played a part.
 
-	Stu: We did it! finally, we have 2.0.0. It's been a long time coming,
-	but there's a great deal of goodness here. When I say a long time, I'm
+	Stu: We did it! finally, we have 2.0.0.  It's been a long time coming,
+	but there's a great deal of goodness here.  When I say a long time, I'm
 	not kidding - it's been 972 days since we branched off "oldstatus"
-	(aka 1.x). The early Greeks were uncertain as to whether 2 was a
+	(aka 1.x).  The early Greeks were uncertain as to whether 2 was a
 	number at all (or if we'd ever make this release) - it has a beginning
 	and an end but no middle (much like our unfortunately quiet development
-	period). 2 is the first prime number and the only even prime. 2 is also
-	the first deficient number (oh well). There are only 10 types of people
+	period).  2 is the first prime number and the only even prime. 2 is also
+	the first deficient number (oh well).  There are only 10 types of people
 	in the world - those who like our new names and those who do not.
 	Enjoy!
 
@@ -365,7 +443,7 @@ Our development blog is available at: http://planet.pidgin.im
 	where they are today.  Congratulations everyone!
 
 	Sadrul: My first NEWS, and on what an occasion! Pidgin 2.0.0 is finally
-	released!! And it's *really* very good!!! Give your soul a break ...
+	released!!  And it's *really* very good!!!  Give your soul a break ...
 	Use Pidgin!
 
 	Daniel: There has been a fair amount of weeping and gnashing of teeth
diff --git a/configure.ac b/configure.ac
index a7e648d562..14f7f3c76e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ AC_PREREQ([2.50])
 m4_define([purple_lt_current], [7])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [7])
-m4_define([purple_micro_version], [0])
+m4_define([purple_micro_version], [2])
 m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
@@ -55,7 +55,7 @@ m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suf
 m4_define([gnt_lt_current], [7])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [7])
-m4_define([gnt_micro_version], [0])
+m4_define([gnt_micro_version], [2])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
@@ -144,7 +144,7 @@ darwin*)
 	;;
 esac
 
-ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu id it ja ka km kn ko ku lo lt mk mn my_MM nb ne nl nn oc pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
+ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu hy id it ja ka km kn ko ku lo lt mk mn my_MM nb ne nl nn oc pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
@@ -324,6 +324,9 @@ I can find them.
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_GENMARSHAL)
+
 AC_ARG_WITH([extraversion],
 			AC_HELP_STRING([--with-extraversion=STRING],
 						   [extra version number to be displayed in Help->About and --help (for packagers)]),
@@ -703,9 +706,13 @@ dnl #######################################################################
 PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.6.0], , [
 	AC_MSG_RESULT(no)
 	AC_MSG_ERROR([
-
 You must have libxml2 >= 2.6.0 development headers installed to build.
 ])])
+PKG_CHECK_EXISTS([libxml-2.0 >= 2.6.18], , [
+	AC_MSG_WARN([
+Versions of libxml2 < 2.6.18 may contain bugs that could cause XMPP messages to be discarded.
+])])
+
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 
@@ -745,6 +752,82 @@ Use --disable-gstreamer if you do not need GStreamer (sound) support.
 fi
 
 dnl #######################################################################
+dnl # Check for GStreamer Interfaces
+dnl #######################################################################
+if test "x$enable_gst" != "xno"; then
+	AC_ARG_ENABLE(gstreamer-interfaces,
+		[AC_HELP_STRING([--disable-gstreamer-interfaces], [compile without GStreamer interface support])],
+			enable_gstinterfaces="$enableval", enable_gstinterfaces="yes")
+	if test "x$enable_gstinterfaces" != "xno"; then
+		PKG_CHECK_MODULES(GSTINTERFACES, [gstreamer-interfaces-0.10], [
+			AC_DEFINE(USE_GSTINTERFACES, 1, [Use GStreamer interfaces for X overlay support])
+			AC_SUBST(GSTINTERFACES_CFLAGS)
+			AC_SUBST(GSTINTERFACES_LIBS)
+		], [
+			enable_gstinterfaces="no"
+		])
+	fi
+else
+	enable_gstinterfaces="no"
+fi
+
+dnl #######################################################################
+dnl # Check for Farsight
+dnl #######################################################################
+AC_ARG_ENABLE(farsight,
+	[AC_HELP_STRING([--disable-farsight], [compile without farsight support])],
+	enable_farsight="$enableval", enable_farsight="yes")
+if test "x$enable_farsight" != "xno"; then
+	PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [
+		AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])
+		AC_SUBST(FARSIGHT_CFLAGS)
+		AC_SUBST(FARSIGHT_LIBS)
+	], [
+		enable_farsight="no"
+	])
+fi
+
+dnl #######################################################################
+dnl # Check for Voice and Video support
+dnl #######################################################################
+AC_ARG_ENABLE(vv,
+	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
+	[enable_vv="$enableval" force_vv=$enableval], [enable_vv="yes" force_vv=no])
+if test "x$enable_vv" != "xno"; then
+	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then
+		AC_DEFINE(USE_VV, 1, [Use voice and video])
+	else
+		enable_vv="no"
+		if test "x$force_vv" = "xyes"; then
+			AC_MSG_ERROR([
+Dependencies for voice/video were not met.
+Install the necessary gstreamer and farsight packages first.
+Or use --disable-vv if you do not need voice/video support.
+			])
+		fi
+	fi
+fi
+
+AC_ARG_ENABLE(idn,
+	[AC_HELP_STRING([--disable-idn], [compile without IDN support])],
+	[enable_idn="$enableval" force_idn=$enableval], [enable_idn="yes" force_idn=no])
+if test "x$enable_idn" != "xno"; then
+	PKG_CHECK_MODULES(IDN, libidn >= 0.0.0, [
+		AC_DEFINE(USE_IDN, 1, [Use GNU Libidn for stringprep and IDN])
+		AC_SUBST(IDN_CFLAGS)
+		AC_SUBST(IDN_LIBS)
+	], [
+		AC_MSG_RESULT(no)
+		if test "x$force_deps" = "xyes" ; then
+			AC_MSG_ERROR([
+GNU Libidn development headers not found.
+Use --disable-idn if you do not need it.
+])
+		fi
+	])
+fi
+
+dnl #######################################################################
 dnl # Check for Meanwhile headers (for Sametime)
 dnl #######################################################################
 AC_ARG_ENABLE(meanwhile,
@@ -922,7 +1005,7 @@ if test "x$gadu_manual_check" = "xno"; then
 		gadu_includes="yes"
 		gadu_libs="yes"
 	], [
-		AC_MSG_RESULT(no)
+		gadu_includes="no"
 	])
 else
 	if test "$ac_gadu_includes" != "no"; then
@@ -1011,13 +1094,19 @@ extern_init=
 load_proto=
 for i in $STATIC_PRPLS ; do
 	dnl Ugly special case for "libsilcpurple.la":
-	dnl ... and Ugly special case for multi-protocol oscar
+	dnl ... and Ugly special case for multi-protocol oscar and yahoo
 	if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
 		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
 		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
 		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
 		load_proto="$load_proto purple_init_aim_plugin();"
 		load_proto="$load_proto purple_init_icq_plugin();"
+	elif test "x$i" = "xyahoo"; then
+		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+		extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+		extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+		load_proto="$load_proto purple_init_yahoo_plugin();"
+		load_proto="$load_proto purple_init_yahoojp_plugin();"
 	else
 		if test "x$i" = "xsilc"; then
 			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
@@ -1048,7 +1137,6 @@ for i in $STATIC_PRPLS ; do
 		silc)		static_silc=yes ;;
 		silc10)		static_silc=yes ;;
 		simple)		static_simple=yes ;;
-		toc)		static_toc=yes ;;
 		yahoo)		static_yahoo=yes ;;
 		zephyr)		static_zephyr=yes ;;
 		*)			echo "Invalid static protocol $i!!" ; exit ;;
@@ -1066,7 +1154,6 @@ AM_CONDITIONAL(STATIC_QQ, test "x$static_qq" = "xyes")
 AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes")
 AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
-AM_CONDITIONAL(STATIC_TOC, test "x$static_toc" = "xyes")
 AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
 AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
 AC_SUBST(STATIC_LINK_LIBS)
@@ -1112,7 +1199,6 @@ for i in $DYNAMIC_PRPLS ; do
 		silc)		dynamic_silc=yes ;;
 		silc10)		dynamic_silc=yes ;;
 		simple)		dynamic_simple=yes ;;
-		toc)		dynamic_toc=yes ;;
 		yahoo)		dynamic_yahoo=yes ;;
 		zephyr)		dynamic_zephyr=yes ;;
 		*)			echo "Invalid dynamic protocol $i!!" ; exit ;;
@@ -1502,30 +1588,6 @@ if test "$enable_perl" = yes ; then
 			AC_MSG_RESULT(no)
 		fi
 
-		if test "x$prefix" != "xNONE"; then
-			prefix=`eval echo $prefix`
-			PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=$prefix"
-		fi
-
-		AC_ARG_WITH(perl-lib,
-		[AC_HELP_STRING([--with-perl-lib=[site|vendor|DIR]],
-			[specify where to install the Perl libraries for pidgin. Default is site.])],
-		[
-			if test "x$withval" = xsite; then
-				PERL_MM_PARAMS=""
-			elif test "x$withval" = xvendor; then
-				if test -z "`$perlpath -v | grep '5\.0'`"; then
-					PERL_MM_PARAMS="INSTALLDIRS=vendor"
-				else
-					PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=`perl -e 'use Config; print $Config{prefix}'`"
-				fi
-			else
-				PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=$withval"
-			fi
-		])
-
-		AC_SUBST(PERL_MM_PARAMS)
-
 		AC_MSG_CHECKING(for DynaLoader.a)
 		DYNALOADER_A=`echo $PERL_LDFLAGS | $perlpath -pe 's/^(.* )*([[^ ]]*DynaLoader\.a).*/\2/'`
 
@@ -1578,14 +1640,14 @@ dnl #
 dnl # Thanks go to Evolution for the checks.
 dnl #######################################################################
 
-AC_ARG_WITH(with-system-ssl-certs, [AC_HELP_STRING([--with-system-ssl-certs=<dir>], [directory containing system-wide SSL CA certificates])])
+AC_ARG_WITH(system-ssl-certs, [AC_HELP_STRING([--with-system-ssl-certs=<dir>], [directory containing system-wide SSL CA certificates])], [ssl_certificates_dir=$withval])
 
 SSL_CERTIFICATES_DIR=""
-if ! test -z "$with_system_ssl_certs" ; then
-	if ! test -d "$with_system_ssl_certs" ; then
-		AC_MSG_ERROR([$with_system_ssl_certs does not exist, if this is the correct location please make sure that it exists.])
+if ! test -z "$ssl_certificates_dir" ; then
+	if ! test -d "$ssl_certificates_dir" ; then
+		AC_MSG_ERROR([$ssl_certificates_dir does not exist, if this is the correct location please make sure that it exists.])
 	fi
-	SSL_CERTIFICATES_DIR="$with_system_ssl_certs"
+	SSL_CERTIFICATES_DIR="$ssl_certificates_dir"
 fi
 AC_SUBST(SSL_CERTIFICATES_DIR)
 AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_CERTIFICATES_DIR" = "x")
@@ -1602,7 +1664,7 @@ AC_ARG_ENABLE(nss,
 	[enable_nss="$enableval"],
 	[enable_nss="yes"])
 
-msg_ssl="None. MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
+msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
 looked_for_gnutls="no"
 dnl #
 dnl # Check for GnuTLS if it's specified.
@@ -1694,8 +1756,8 @@ if test "x$enable_gnutls" = "xyes"; then
 	LIBS="$LIBS $GNUTLS_LIBS"
 	CPPFLAGS_save="$CPPFLAGS"
 	CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS"
-	AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <gnutls/gnutls.h>],
-                                        [gnutls_session s; gnutls_priority_set_direct(s, NULL, NULL);])],
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]],
+                                        [[gnutls_session s; gnutls_priority_set_direct(s, NULL, NULL);]])],
 	               [AC_DEFINE([HAVE_GNUTLS_PRIORITY_FUNCS], 1,
                                   [Define if your gnutls has gnutls_priority_set_direct and friends])
 	                AC_MSG_RESULT(yes)],
@@ -1941,7 +2003,7 @@ if test "x$enable_nss" != "xno"; then
 
 				if test "x$ac_cv_moz_nss_libs" = "xno"; then
 					nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"
-					LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs" 
+					LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs"
 					LIBS="$LIBS $nsslibs"
 					AC_TRY_LINK_FUNC(NSS_Init,
 						[ac_cv_moz_nss_libs="yes"],
@@ -1996,19 +2058,19 @@ elif test "x$looked_for_gnutls" = "xyes" -a "x$looked_for_nss" = "xyes" -a "x$fo
 	AC_MSG_ERROR([
 Neither GnuTLS or NSS SSL development headers found.
 Use --disable-nss --disable-gnutls if you do not need SSL support.
-MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
+MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
 ])
 elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
 	AC_MSG_ERROR([
 GnuTLS SSL development headers not found.
 Use --disable-gnutls if you do not need SSL support.
-MSN, Novell Groupwise and Google Talk will not work without SSL support.
+MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
 ])
 elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
 	AC_MSG_ERROR([
 NSS SSL development headers not found.
 Use --disable-nss if you do not need SSL support.
-MSN, Novell Groupwise and Google Talk will not work without SSL support.
+MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
 ])
 fi
 
@@ -2415,6 +2477,7 @@ AC_OUTPUT([Makefile
 		   pidgin/pixmaps/emotes/small/16/Makefile
 		   pidgin/plugins/Makefile
 		   pidgin/plugins/cap/Makefile
+		   pidgin/plugins/disco/Makefile
 		   pidgin/plugins/gestures/Makefile
 		   pidgin/plugins/gevolution/Makefile
 		   pidgin/plugins/musicmessaging/Makefile
@@ -2450,7 +2513,6 @@ AC_OUTPUT([Makefile
 		   libpurple/protocols/silc/Makefile
 		   libpurple/protocols/silc10/Makefile
 		   libpurple/protocols/simple/Makefile
-		   libpurple/protocols/toc/Makefile
 		   libpurple/protocols/yahoo/Makefile
 		   libpurple/protocols/zephyr/Makefile
 		   libpurple/tests/Makefile
@@ -2482,9 +2544,11 @@ echo Protocols to link statically.. : $STATIC_PRPLS
 echo
 echo Build with GStreamer support.. : $enable_gst
 echo Build with D-Bus support...... : $enable_dbus
+echo Build with voice and video.... : $enable_vv
 if test "x$enable_dbus" = "xyes" ; then
 	eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR
 fi
+echo Build with GNU Libidn......... : $enable_idn
 echo Build with NetworkManager..... : $enable_nm
 echo SSL Library/Libraries......... : $msg_ssl
 if test "x$SSL_CERTIFICATES_DIR" != "x" ; then
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 49759f21d7..4481e645bf 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -32,6 +32,7 @@ EXTRA_DIST = \
 	gtkimhtml-signals.dox \
 	gtkrc-2.0 \
 	imgstore-signals.dox \
+	jabber-signals.dox \
 	log-signals.dox \
 	notify-signals.dox \
 	pidgin.1.in \
diff --git a/doc/PERL-HOWTO.dox b/doc/PERL-HOWTO.dox
index 0c16c73b0b..6b6eb9ecf4 100644
--- a/doc/PERL-HOWTO.dox
+++ b/doc/PERL-HOWTO.dox
@@ -323,9 +323,10 @@ in the @c plugin_load subroutine, as follows.
 sub plugin_load {
 	my $plugin = shift;
 
+	# This is necessary to create each level in the preferences tree.
+	Purple::Prefs::add_none("/plugins/core/perl_test");
 	# Here we are adding a set of preferences
 	#  The second argument is the default value for the preference.
-	Purple::Prefs::add_none("/plugins/core/perl_test");
 	Purple::Prefs::add_bool("/plugins/core/perl_test/bool", 1);
 	Purple::Prefs::add_string("/plugins/core/perl_test/choice_str", "ch1");
 	Purple::Prefs::add_int("/plugins/core/perl_test/choice_int", 1);
diff --git a/doc/TCL-HOWTO.dox b/doc/TCL-HOWTO.dox
index f8a483035c..43ea33aa99 100644
--- a/doc/TCL-HOWTO.dox
+++ b/doc/TCL-HOWTO.dox
@@ -173,6 +173,7 @@ purple::connection account gc
 purple::connection displayname gc
 purple::connection handle
 purple::connection list
+purple::connection state
 @endcode
 
   @c purple::connection is a collection of subcommands pertaining to
@@ -192,6 +193,9 @@ purple::connection list
   this list are appropriate as @c gc arguments to the other
   @c purple::connection subcommands or other commands requiring a gc.
 
+  @c state returns the PurpleConnectionState of this account as one of
+  the strings "connected", "disconnected", or "connecting".
+
 @code
 purple::conv_send account who text
 @endcode
diff --git a/doc/account-signals.dox b/doc/account-signals.dox
index 5d24f2b53d..7b503513cc 100644
--- a/doc/account-signals.dox
+++ b/doc/account-signals.dox
@@ -1,6 +1,8 @@
 /** @page account-signals Account Signals
 
  @signals
+  @signal account-created
+  @signal account-destroying
   @signal account-added
   @signal account-connecting
   @signal account-removed
@@ -9,6 +11,7 @@
   @signal account-setting-info
   @signal account-set-info
   @signal account-status-changed
+  @signal account-actions-changed
   @signal account-alias-changed
   @signal account-authorization-requested
   @signal account-authorization-denied
@@ -20,6 +23,26 @@
 
  <hr>
 
+ @signaldef account-created
+  @signalproto
+void (*account_created)(PurpleAccount *account);
+  @endsignalproto
+  @signaldesc
+   Emitted when an account is created by calling purple_account_new.
+  @param account The account.
+  @since 2.6.0
+ @endsignaldef
+
+ @signaldef account-destroying
+  @signalproto
+void (*account_destroying)(PurpleAccount *account);
+  @endsignalproto
+  @signaldesc
+   Emitted when an account is about to be destroyed.
+  @param account The account.
+  @since 2.6.0
+ @endsignaldef
+
  @signaldef account-added
   @signalproto
 void (*account_added)(PurpleAccount *account);
@@ -27,6 +50,7 @@ void (*account_added)(PurpleAccount *account);
   @signaldesc
    Emitted when an account is added.
   @param account The account that was added.
+  @see purple_accounts_add
  @endsignaldef
 
  @signaldef account-connecting
@@ -45,6 +69,7 @@ void (*account_removed)(PurpleAccount *account);
   @signaldesc
    Emitted when an account is removed.
   @param account The account that was removed.
+  @see purple_accounts_remove
  @endsignaldef
 
  @signaldef account-disabled
@@ -97,6 +122,15 @@ void (*account_status_changed)(PurpleAccount *account, PurpleStatus *old, Purple
   @param new     The status after change.
  @endsignaldef
 
+ @signaldef account-actions-changed
+  @signalproto
+void (*account_actions_changed)(PurpleAccount *account);
+  @endsignalproto
+  @signaldesc
+   Emitted when the account actions are changed after initial connection.
+  @param account The account whose actions changed.
+ @endsignaldef
+
  @signaldef account-alias-changed
   @signalproto
 void (*account_alias_changed)(PurpleAccount *account, const char *old);
@@ -109,7 +143,7 @@ void (*account_alias_changed)(PurpleAccount *account, const char *old);
 
  @signaldef account-authorization-requested
   @signalproto
-void (*account_authorization_requested)(PurpleAccount *account, const char *user);
+int (*account_authorization_requested)(PurpleAccount *account, const char *user);
   @endsignalproto
   @signaldesc
    Emitted when a user requests authorization.
diff --git a/doc/blist-signals.dox b/doc/blist-signals.dox
index ecd4273960..901be25bff 100644
--- a/doc/blist-signals.dox
+++ b/doc/blist-signals.dox
@@ -74,13 +74,30 @@ void (*blist_node_extended_menu)(PurpleBlistNode *node, GList **menu)
    a GList of PurpleBlistNodeAction's allowing a plugin to add menu items
  @endsignaldef
 
+ @signaldef blist-node-added
+  @signalproto
+void (*blist_node_added)(PurpleBlistNode *node)
+  @endsignalproto
+  @signaldesc
+   Emitted when a new blist node is added to the buddy list.
+ @endsignaldef
+
+ @signaldef blist-node-removed
+  @signalproto
+void (*blist_node_removed)(PurpleBlistNode *node)
+  @endsignalproto
+  @signaldesc
+   Emitted when a blist node is removed from the buddy list.
+ @endsignaldef
+
  @signaldef buddy-added
   @signalproto
 void (*buddy_added)(PurpleBuddy *buddy)
   @endsignalproto
   @signaldesc
    Emitted when a new buddy is added to the buddy list.
-  @endsignaldef
+  @deprecated Use blist-node-added instead.
+ @endsignaldef
 
  @signaldef buddy-removed
   @signalproto
@@ -88,7 +105,8 @@ void (*buddy_removed)(PurpleBuddy *buddy)
   @endsignalproto
   @signaldesc
    Emitted when a buddy is removed from the buddy list.
-  @endsignaldef
+  @deprecated Use blist-node-removed instead.
+ @endsignaldef
 
  @signaldef buddy-icon-changed
   @signalproto
diff --git a/doc/connection-signals.dox b/doc/connection-signals.dox
index 530be8fa70..bb6a8118ef 100644
--- a/doc/connection-signals.dox
+++ b/doc/connection-signals.dox
@@ -54,8 +54,8 @@ void (*connection_error)(PurpleConnection *gc, PurpleConnectionError err, const
   @endsignalproto
   @signaldesc
    Emitted when a connection error occurs, before @ref signed-off.
-   @param gc     The connection on which the error has occured
-   @param err    The error that occured
+   @param gc     The connection on which the error has occurred
+   @param err    The error that occurred
    @param desc   A description of the error, giving more information.
  @endsignaldef
 
diff --git a/doc/core-signals.dox b/doc/core-signals.dox
index 26c88e9ca8..a4be04136d 100644
--- a/doc/core-signals.dox
+++ b/doc/core-signals.dox
@@ -2,6 +2,7 @@
 
  @signals
   @signal quitting
+  @signal uri-handler
  @endsignals
 
  @see core.h
@@ -16,5 +17,16 @@ void (*quitting)();
    Emitted when libpurple is quitting.
  @endsignaldef
 
+ @signaldef uri-handler
+  @signalproto
+gboolean (*uri_handler)(const gchar *proto, const gchar *cmd, GHashTable *params);
+  @endsignalproto
+  @signaldesc
+   Emitted when handling a registered URI.
+  @param proto The protocol of the URI.
+  @param cmd The 'command' of the URI.
+  @param params Any key/value parameters from the URI.
+ @endsignaldef
+
  */
 // vim: syntax=c.doxygen tw=75 et
diff --git a/doc/finch.1.in b/doc/finch.1.in
index 8d67588c41..af6169086b 100644
--- a/doc/finch.1.in
+++ b/doc/finch.1.in
@@ -59,7 +59,7 @@ Offline.
 Display the version information window.
 
 .SH GNT Shortcuts
-You can use the following shortcuts:
+You can use the following shortcuts (see the "\*QWidget Actions\*U" section for a more complete list):
 .TP
 .B Alt \+ a
 Bring up a list of available actions. You can use this list to access the
@@ -378,6 +378,8 @@ menu = context-menu
 [GntWidget::binding]
 .br
 f11 = context-menu
+.br
+c-x = context-menu
 
 [GntWindow::binding]
 .br
diff --git a/doc/funniest_home_convos.txt b/doc/funniest_home_convos.txt
index 08950ddc30..6488cda723 100644
--- a/doc/funniest_home_convos.txt
+++ b/doc/funniest_home_convos.txt
@@ -565,3 +565,49 @@ not :)
              for using pidgen
 22:36 <user> why do they think this is a bad client? does it have history?
 
+--
+
+15:45 <deryni> We've had a Grand Plugin Database Plan for approximately forever.
+15:45 <SimGuy> ah, the GPDP
+15:46 <khc> well, there was a Grand Smiley Theme Database
+15:47 <SimGuy> the GSTD sounds like a bad acronym
+15:47 <khc> I realized after typing that
+
+--
+
+(01:51:38 AM) user entered the room.
+(01:52:46 AM) user: .addKeyActionListener(new KeyActionListener() onKeyPress() {if (event.geyKeyPresss().equals(Key.UP_ARROW) { inputbox.text = history.pop() }}}}}}});
+(01:52:51 AM) user: THERE, FOR **** SAKE
+(01:52:53 AM) user: its 2009
+(01:53:06 AM) user: oh wait. ctrl up works
+(01:53:07 AM) user: lol
+(01:53:11 AM) user: yey me
+(01:53:16 AM) user left the room.
+(01:55:31 AM) darkrain42: Wow.
+(01:58:15 AM) QuLogic: I think he failed to realize we'd have to re-write pidgin in java to do that
+(01:59:44 AM) khc: history.pop() is clearly wrong too
+
+--
+
+Some time later:
+(02:41:55 AM) user entered the room.
+(02:42:24 AM) user: didn't I read some idiot post, about 2 years ago, before pidgin was renamed / forked, over one dev refusing to make minimize on close?
+(02:43:12 AM) QuLogic: I see you've learned to at least ask a question before jumping to random conclusions
+(02:44:01 AM) user: QuLogic: :-))))))))))))))))))))))
+(02:44:12 AM) user: hey, I submitted a code patch!
+(02:44:36 AM) user: now, anyway, what happened? why did I get the buddy list (empty) stealing focus, and why did it exit on close?
+(02:44:40 AM) QuLogic: it's not really a patch if it's in the wrong language
+(02:44:42 AM) user: I've had this argument before, in 2006
+(02:44:55 AM) user: QuLogic: simple, rewrite the rest ;-)
+(02:44:58 AM) khc: pidgin never steals focus
+(02:45:10 AM) khc: if it exit on close, it's because you didn't turn on the systray icon
+(02:47:17 AM) user: khc - and that isn't default... why? anyway. I recall something on the matter, and I think this was the project (pre-fork?) or is this the unforked, renamed? I forget.
+(02:47:42 AM) user: Whoever it was arguing about it (and font sizes I believe) was an idiot... not one of you I suppose, just making idle chit chat.
+(02:47:43 AM) user: thanks
+(02:47:48 AM) darkrain42: It is on by default. Some distros change that.
+(02:48:00 AM) darkrain42: And I don't even know what you're arguing about at this point.
+(02:48:11 AM) user: ... /leave - That command doesn't work on this protocol... /leave #pidgin ...That comm..... :-(((
+(02:48:18 AM) user: darkrain42: now arguing, just remembering something
+(02:48:27 AM) user left the room.
+(02:49:04 AM) darkrain42: Wow. (again)
+
diff --git a/doc/jabber-signals.dox b/doc/jabber-signals.dox
new file mode 100644
index 0000000000..0d022a0424
--- /dev/null
+++ b/doc/jabber-signals.dox
@@ -0,0 +1,138 @@
+/** @page jabber-signals Jabber Signals
+
+ @signals
+  @signal jabber-receiving-iq
+  @signal jabber-receiving-message
+  @signal jabber-receiving-presence
+  @signal jabber-watched-iq
+  @signal jabber-register-namespace-watcher
+  @signal jabber-unregister-namespace-watcher
+  @signal jabber-sending-xmlnode
+  @signal jabber-receiving-xmlnode
+ @endsignals
+
+ <hr>
+
+ @signaldef jabber-receiving-iq
+  @signalproto
+gboolean (*iq_received)(PurpleConnection *gc, const char *type, const char *id,
+                     const char *from, xmlnode *iq);
+  @endsignalproto
+  @signaldesc
+   Emitted when an XMPP IQ stanza is received. Allows a plugin to process IQ
+   stanzas.
+  @param gc        The connection on which the stanza is received
+  @param type      The IQ type ('get', 'set', 'result', or 'error')
+  @param id        The ID attribute from the stanza. MUST NOT be NULL.
+  @param from      The originator of the stanza. MAY BE NULL if the stanza
+                   originated from the user's server.
+  @param iq        The full stanza received.
+  @return TRUE if the plugin processed this stanza and *nobody else* should
+          process it. FALSE otherwise.
+ @endsignaldef
+
+ @signaldef jabber-receiving-message
+  @signalproto
+gboolean (*message_received)(PurpleConnection *gc, const char *type,
+                              const char *id, const char *from, const char *to,
+                              xmlnode *message);
+  @endsignalproto
+  @signaldesc
+   Emitted when an XMPP message stanza is received. Allows a plugin to
+   process message stanzas.
+  @param gc        The connection on which the stanza is received
+  @param type      The message type (see rfc3921 or rfc3921bis)
+  @param id        The ID attribute from the stanza. MAY BE NULL.
+  @param from      The originator of the stanza. MAY BE NULL if the stanza
+                   originated from the user's server.
+  @param to        The destination of the stanza. This is probably either the
+                   full JID of the receiver or the receiver's bare JID.
+  @param message   The full stanza received.
+  @return TRUE if the plugin processed this stanza and *nobody else* should
+          process it. FALSE otherwise.
+ @endsignaldef
+
+ @signaldef jabber-receiving-presence
+  @signalproto
+gboolean (*presence_received)(PurpleConnection *gc, const char *type,
+                               const char *from, xmlnode *presence);
+  @endsignalproto
+  @signaldesc
+   Emitted when an XMPP presence stanza is received. Allows a plugin to process
+   presence stanzas.
+  @param gc        The connection on which the stanza is received
+  @param type      The presence type (see rfc3921 or rfc3921bis). NULL indicates
+                   this is an "available" (i.e. online) presence.
+  @param from      The originator of the stanza. MAY BE NULL if the stanza
+                   originated from the user's server.
+  @param presence  The full stanza received.
+  @return TRUE if the plugin processed this stanza and *nobody else* should
+          process it. FALSE otherwise.
+ @endsignaldef
+
+ @signaldef jabber-watched-iq
+  @signalproto
+gboolean (*watched_iq)(PurpleConnection *gc, const char *type, const char *id,
+                       const char *from, xmlnode *child);
+  @endsignalproto
+  @signaldesc
+   Emitted when an IQ with a watched (child, namespace) pair is received.  See
+   jabber-register-namespace-watcher and jabber-unregister-namespace-watcher.
+  @param gc        The connection on which the stanza is received
+  @param type      The IQ type ('get', 'set', 'result', or 'error')
+  @param id        The ID attribute from the stanza. MUST NOT be NULL.
+  @param from      The originator of the stanza. MAY BE NULL if the stanza
+                   originated from the user's server.
+  @param child     The child node with namespace.
+  @return TRUE if the plugin processed this stanza and *nobody else* should
+          process it. FALSE otherwise.
+ @endsignaldef
+
+ @signaldef jabber-register-namespace-watcher
+  @signalproto
+void (register_namespace_watcher)(const char *node, const char *namespace);
+  @endsignalproto
+  @signaldesc
+   Emit this signal to register your desire to have specific IQ stanzas to be
+   emitted via the jabber-watched-iq signal when received.
+  @param node      The IQ child name to longer watch.
+  @param namespace The IQ child namespace to longer watch.
+ @endsignaldef
+
+ @signaldef jabber-unregister-namespace-watcher
+  @signalproto
+void (unregister_namespace_watcher)(const char *node, const char *namespace);
+  @endsignalproto
+  @signaldesc
+   Emit this signal to unregister your desire to have specific IQ stanzas to be
+   emitted via the jabber-watched-iq signal when received.
+  @param node      The IQ child name to no longer watch.
+  @param namespace The IQ child namespace to no longer watch.
+ @endsignaldef
+
+ @signaldef jabber-sending-xmlnode
+  @signalproto
+void (sending_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
+  @endsignalproto
+  @signaldesc
+   Emit this signal (@c purple_signal_emit) to send a stanza. It is preferred
+   to use this instead of prpl_info->send_raw.
+   @param gc      The connection on which to send the stanza.
+   @param stanza  The stanza to send. If stanza is not NULL after being sent,
+                  the emitter should free it.
+ @endsignaldef
+
+ @signaldef jabber-receiving-xmlnode
+  @signalproto
+void (receiving_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
+  @endsignalproto
+  @signaldesc
+   Emitted when an XMPP stanza is received. Allows a plugin to process any
+   stanza.
+   @param gc     The connection on which the stanza was received.
+   @param stanza The received stanza. Set stanza to NULL (and free it) to
+                 stop processing the stanza.
+ @endsignaldef
+
+*/
+// vim: syntax=c.doxygen tw=75 et
diff --git a/doc/notify-signals.dox b/doc/notify-signals.dox
index 9c85c47d04..820298c604 100644
--- a/doc/notify-signals.dox
+++ b/doc/notify-signals.dox
@@ -30,7 +30,7 @@ void (*displaying_email_notification)(const char *subject,
                                       const char *url);
   @endsignalproto
   @signaldesc
-   Emitted before email notification is handed to the UI to display.
+   Emitted before notification of a single email is handed to the UI to display.
   @param subject   Subject of email being notified of.
   @param from      Who the email is from.
   @param to        Who the email is to.
diff --git a/doc/pidgin.1.in b/doc/pidgin.1.in
index 0a91454949..b64fd47d52 100644
--- a/doc/pidgin.1.in
+++ b/doc/pidgin.1.in
@@ -602,7 +602,9 @@ Pidgin's active developers are:
 .br
   Daniel 'datallah' Atallah (developer)
 .br
-  John 'rekkanoryo' Bailey (developer)
+  Paul 'darkrain42' Aurich (developer)
+.br
+  John 'rekkanoryo' Bailey (developer and bugmaster)
 .br
   Ethan 'Paco-Paco' Blanton (developer)
 .br
@@ -632,6 +634,8 @@ Pidgin's active developers are:
 .br
   Tim 'marv' Ringenbach (developer) <\fImarv_sf@users.sf.net\fR>
 .br
+  Michael 'Maiku' Ruprecht (developer, voice and video)
+.br
   Elliott 'QuLogic' Sales de Andrade (developer)
 .br
   Luke 'LSchiere' Schierer (support)
diff --git a/finch/Makefile.am b/finch/Makefile.am
index 2f08d120b1..8977644df8 100644
--- a/finch/Makefile.am
+++ b/finch/Makefile.am
@@ -26,6 +26,7 @@ finch_SOURCES = \
 	finch.c \
 	gntidle.c \
 	gntlog.c \
+	gntmedia.c \
 	gntnotify.c \
 	gntplugin.c \
 	gntpounce.c \
@@ -47,6 +48,7 @@ finch_headers = \
 	finch.h \
 	gntidle.h \
 	gntlog.h \
+	gntmedia.h \
 	gntnotify.h \
 	gntplugin.h \
 	gntpounce.h \
diff --git a/finch/finch.c b/finch/finch.c
index fe96d76deb..49a88ecef6 100644
--- a/finch/finch.c
+++ b/finch/finch.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include "account.h"
 #include "conversation.h"
@@ -47,6 +48,7 @@
 #include <getopt.h>
 
 #include "config.h"
+#include "package_revision.h"
 
 static void
 debug_init(void)
@@ -65,6 +67,26 @@ static GHashTable *finch_ui_get_info(void)
 		g_hash_table_insert(ui_info, "version", VERSION);
 		g_hash_table_insert(ui_info, "website", "http://pidgin.im");
 		g_hash_table_insert(ui_info, "dev_website", "http://developer.pidgin.im");
+		g_hash_table_insert(ui_info, "client_type", "console");
+
+		/*
+		 * This is the client key for "Finch."  It is owned by the AIM
+		 * account "markdoliner."  Please don't use this key for other
+		 * applications.  You can either not specify a client key, in
+		 * which case the default "libpurple" key will be used, or you
+		 * can register for your own client key at
+		 * http://developer.aim.com/manageKeys.jsp
+		 */
+		g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma19sqWV9ymU6UYc");
+		g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma19sqWV9ymU6UYc");
+
+		/*
+		 * This is the distid for Finch, given to us by AOL.  Please
+		 * don't use this for other applications.  You can just not
+		 * specify a distid and libpurple will use a default.
+		 */
+		g_hash_table_insert(ui_info, "prpl-aim-distid", GINT_TO_POINTER(1552));
+		g_hash_table_insert(ui_info, "prpl-icq-distid", GINT_TO_POINTER(1552));
 	}
 
 	return ui_info;
@@ -293,7 +315,7 @@ init_libpurple(int argc, char **argv)
 	if (opt_version) {
 		/* Translators may want to transliterate the name.
 		 It is not to be translated. */
-		printf("%s %s\n", _("Finch"), DISPLAY_VERSION);
+		printf("%s %s (%s)\n", _("Finch"), DISPLAY_VERSION, REVISION);
 		return 0;
 	}
 
diff --git a/finch/finch.h b/finch/finch.h
index 9f5f083599..6299a1ea98 100644
--- a/finch/finch.h
+++ b/finch/finch.h
@@ -24,8 +24,6 @@
  */
 #include <glib.h>
 
-#include "libpurple/internal.h"
-
 #define FINCH_UI "gnt-purple"
 
 #define FINCH_PREFS_ROOT "/finch"
diff --git a/finch/gntaccount.c b/finch/gntaccount.c
index b7fe53964c..9addbb331b 100644
--- a/finch/gntaccount.c
+++ b/finch/gntaccount.c
@@ -36,6 +36,7 @@
 #include <gntwindow.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include <account.h>
 #include <accountopt.h>
@@ -488,6 +489,7 @@ edit_account(PurpleAccount *account)
 	GntWidget *combo, *button, *entry;
 	GList *list, *iter;
 	AccountEditDialog *dialog;
+	PurplePlugin *plugin;
 
 	if (account)
 	{
@@ -531,9 +533,10 @@ edit_account(PurpleAccount *account)
 				((PurplePlugin*)iter->data)->info->name);
 	}
 
-	if (account)
-		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo),
-				purple_plugins_find_with_id(purple_account_get_protocol_id(account)));
+	plugin = purple_plugins_find_with_id(purple_account_get_protocol_id(account));
+
+	if (account && plugin)
+		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), plugin);
 	else
 		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), list->data);
 
@@ -669,8 +672,13 @@ static void
 account_toggled(GntWidget *widget, void *key, gpointer null)
 {
 	PurpleAccount *account = key;
+	gboolean enabled = gnt_tree_get_choice(GNT_TREE(widget), key);
+
+	if (enabled)
+		purple_savedstatus_activate_for_account(purple_savedstatus_get_current(),
+												account);
 
-	purple_account_set_enabled(account, FINCH_UI, gnt_tree_get_choice(GNT_TREE(widget), key));
+	purple_account_set_enabled(account, FINCH_UI, enabled);
 }
 
 static gboolean
diff --git a/finch/gntblist.c b/finch/gntblist.c
index 949d5b76b0..fad3d27809 100644
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include <account.h>
 #include <blist.h>
@@ -61,7 +62,7 @@
 #include <string.h>
 
 #define PREF_ROOT "/finch/blist"
-#define TYPING_TIMEOUT 4000
+#define TYPING_TIMEOUT_S 4
 
 #define SHOW_EMPTY_GROUP_TIMEOUT  60
 
@@ -588,6 +589,16 @@ new_list(PurpleBuddyList *list)
 		ggblist->manager = &default_manager;
 }
 
+static void destroy_list(PurpleBuddyList *list)
+{
+	if (ggblist == NULL)
+		return;
+
+	gnt_widget_destroy(ggblist->window);
+	g_free(ggblist);
+	ggblist = NULL;
+}
+
 static gboolean
 remove_new_empty_group(gpointer data)
 {
@@ -643,10 +654,14 @@ add_buddy_cb(void *data, PurpleRequestFields *allfields)
 		purple_blist_add_group(grp, NULL);
 	}
 
-	/* XXX: Ask if there's already the same buddy in the same group (#4553) */
+	/* XXX: Ask to merge if there's already a buddy with the same alias in the same group (#4553) */
+
+	if ((buddy = purple_find_buddy_in_group(account, username, grp)) == NULL)
+	{
+		buddy = purple_buddy_new(account, username, alias);
+		purple_blist_add_buddy(buddy, NULL, grp, NULL);
+	}
 
-	buddy = purple_buddy_new(account, username, alias);
-	purple_blist_add_buddy(buddy, NULL, grp, NULL);
 	purple_account_add_buddy(account, buddy);
 }
 
@@ -844,7 +859,7 @@ static PurpleBlistUiOps blist_ui_ops =
 	blist_show,
 	node_update,
 	node_remove,
-	NULL,
+	destroy_list,
 	NULL,
 	finch_request_add_buddy,
 	finch_request_add_chat,
@@ -931,7 +946,7 @@ get_display_name(PurpleBlistNode *node)
 	else if (PURPLE_BLIST_NODE_IS_GROUP(node))
 		return purple_group_get_name((PurpleGroup*)node);
 
-	snprintf(text, sizeof(text) - 1, "%s %s", status, name);
+	g_snprintf(text, sizeof(text) - 1, "%s %s", status, name);
 
 	return text;
 }
@@ -1917,11 +1932,11 @@ key_pressed(GntWidget *widget, const char *text, FinchBlist *ggblist)
 		if (gnt_tree_is_searching(GNT_TREE(ggblist->tree)))
 			gnt_bindable_perform_action_named(GNT_BINDABLE(ggblist->tree), "end-search", NULL);
 		remove_peripherals(ggblist);
-	} else if (strcmp(text, GNT_KEY_CTRL_O) == 0) {
-		purple_prefs_set_bool(PREF_ROOT "/showoffline",
-				!purple_prefs_get_bool(PREF_ROOT "/showoffline"));
 	} else if (strcmp(text, GNT_KEY_INS) == 0) {
-		purple_blist_request_add_buddy(NULL, NULL, NULL, NULL);
+		PurpleBlistNode *node = gnt_tree_get_selection_data(GNT_TREE(ggblist->tree));
+		purple_blist_request_add_buddy(NULL, NULL,
+				node && PURPLE_BLIST_NODE_IS_GROUP(node) ? purple_group_get_name(PURPLE_GROUP(node)) : NULL,
+				NULL);
 	} else if (!gnt_tree_is_searching(GNT_TREE(ggblist->tree))) {
 		if (strcmp(text, "t") == 0) {
 			finch_blist_toggle_tag_buddy(gnt_tree_get_selection_data(GNT_TREE(ggblist->tree)));
@@ -2012,7 +2027,7 @@ reset_blist_window(GntWidget *window, gpointer null)
 	}
 
 	if (ggblist->typing)
-		g_source_remove(ggblist->typing);
+		purple_timeout_remove(ggblist->typing);
 	remove_peripherals(ggblist);
 	if (ggblist->tagged)
 		g_list_free(ggblist->tagged);
@@ -2249,7 +2264,7 @@ remove_typing_cb(gpointer null)
 end:
 	g_free(escnewmessage);
 	if (ggblist->typing)
-		g_source_remove(ggblist->typing);
+		purple_timeout_remove(ggblist->typing);
 	ggblist->typing = 0;
 	return FALSE;
 }
@@ -2268,7 +2283,7 @@ status_selection_changed(GntComboBox *box, StatusBoxItem *old, StatusBoxItem *no
 		/* Move the focus to the entry box */
 		/* XXX: Make sure the selected status can have a message */
 		gnt_box_move_focus(GNT_BOX(ggblist->window), 1);
-		ggblist->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, NULL);
+		ggblist->typing = purple_timeout_add_seconds(TYPING_TIMEOUT_S, (GSourceFunc)remove_typing_cb, NULL);
 	}
 	else if (now->type == STATUS_SAVED_ALL)
 	{
@@ -2294,7 +2309,7 @@ status_text_changed(GntEntry *entry, const char *text, gpointer null)
 		return FALSE;
 
 	if (ggblist->typing)
-		g_source_remove(ggblist->typing);
+		purple_timeout_remove(ggblist->typing);
 	ggblist->typing = 0;
 
 	if (text[0] == '\r' && text[1] == 0)
@@ -2304,7 +2319,7 @@ status_text_changed(GntEntry *entry, const char *text, gpointer null)
 		return TRUE;
 	}
 
-	ggblist->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, NULL);
+	ggblist->typing = purple_timeout_add_seconds(TYPING_TIMEOUT_S, (GSourceFunc)remove_typing_cb, NULL);
 	return FALSE;
 }
 
@@ -2638,7 +2653,7 @@ reconstruct_grouping_menu(void)
 		char menuid[128];
 		FinchBlistManager *manager = iter->data;
 		GntMenuItem *item = gnt_menuitem_new(_(manager->name));
-		snprintf(menuid, sizeof(menuid), "grouping-%s", manager->id);
+		g_snprintf(menuid, sizeof(menuid), "grouping-%s", manager->id);
 		gnt_menuitem_set_id(GNT_MENU_ITEM(item), menuid);
 		gnt_menu_add_item(GNT_MENU(subsub), item);
 		g_object_set_data_full(G_OBJECT(item), "grouping-id", g_strdup(manager->id), g_free);
@@ -3119,6 +3134,8 @@ blist_show(PurpleBuddyList *list)
 				PURPLE_CALLBACK(reconstruct_accounts_menu), NULL);
 	purple_signal_connect(purple_connections_get_handle(), "signed-off", finch_blist_get_handle(),
 				PURPLE_CALLBACK(reconstruct_accounts_menu), NULL);
+	purple_signal_connect(purple_accounts_get_handle(), "account-actions-changed", finch_blist_get_handle(),
+				PURPLE_CALLBACK(reconstruct_accounts_menu), NULL);
 	purple_signal_connect(purple_blist_get_handle(), "buddy-status-changed", finch_blist_get_handle(),
 				PURPLE_CALLBACK(buddy_status_changed), ggblist);
 	purple_signal_connect(purple_blist_get_handle(), "buddy-idle-changed", finch_blist_get_handle(),
@@ -3177,12 +3194,6 @@ blist_show(PurpleBuddyList *list)
 
 void finch_blist_uninit()
 {
-	if (ggblist == NULL)
-		return;
-
-	gnt_widget_destroy(ggblist->window);
-	g_free(ggblist);
-	ggblist = NULL;
 }
 
 gboolean finch_blist_get_position(int *x, int *y)
diff --git a/finch/gntcertmgr.c b/finch/gntcertmgr.c
index 7c7dce093e..e123823815 100644
--- a/finch/gntcertmgr.c
+++ b/finch/gntcertmgr.c
@@ -26,6 +26,7 @@
  */
 
 #include "finch.h"
+#include <internal.h>
 
 #include "certificate.h"
 #include "debug.h"
diff --git a/finch/gntconn.c b/finch/gntconn.c
index b117881770..b23bb6a8d6 100644
--- a/finch/gntconn.c
+++ b/finch/gntconn.c
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include "account.h"
 #include "core.h"
diff --git a/finch/gntconv.c b/finch/gntconv.c
index c836262873..b4c203d987 100644
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include <cmds.h>
 #include <idle.h>
@@ -191,10 +192,7 @@ entry_key_pressed(GntWidget *w, FinchConv *ggconv)
 	}
 	else
 	{
-		char *escape = g_markup_escape_text((*text == '/' ? text + 1 : text), -1);
-		char *apos = purple_strreplace(escape, "&apos;", "'");
-		g_free(escape);
-		escape = apos;
+		char *escape = purple_markup_escape_text((*text == '/' ? text + 1 : text), -1);
 		switch (purple_conversation_get_type(ggconv->active_conv))
 		{
 			case PURPLE_CONV_TYPE_IM:
@@ -559,44 +557,11 @@ generate_send_to_menu(FinchConv *ggc)
 }
 
 static void
-invite_select_cb(FinchConv *fc, PurpleRequestFields *fields)
-{
-	PurpleConversation *conv = fc->active_conv;
-	const char *buddy = purple_request_fields_get_string(fields,  "screenname");
-	const char *message = purple_request_fields_get_string(fields,  "message");
-	serv_chat_invite(purple_conversation_get_gc(conv),
-		purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)),
-		message, buddy);
-
-}
-
-static void
 invite_cb(GntMenuItem *item, gpointer ggconv)
 {
-	PurpleRequestFields *fields;
-	PurpleRequestFieldGroup *group;
-	PurpleRequestField *field;
-
-	fields = purple_request_fields_new();
-
-	group = purple_request_field_group_new(NULL);
-	purple_request_fields_add_group(fields, group);
-
-	field = purple_request_field_string_new("screenname", _("Name"), NULL, FALSE);
-	purple_request_field_set_type_hint(field, "screenname");
-	purple_request_field_set_required(field, TRUE);
-	purple_request_field_group_add_field(group, field);
-	field = purple_request_field_string_new("message", _("Invite message"), NULL, FALSE);
-	purple_request_field_group_add_field(group, field);
-	purple_request_fields(finch_conv_get_handle(), _("Invite"),
-						NULL,
-						_("Please enter the name of the user "
-						  "you wish to invite,\nalong with an optional invite message."),
-						fields,
-						_("OK"), G_CALLBACK(invite_select_cb),
-						_("Cancel"), NULL,
-						NULL, NULL, NULL,
-						ggconv);
+	FinchConv *fc = ggconv;
+	PurpleConversation *conv = fc->active_conv;
+	purple_conv_chat_invite_user(PURPLE_CONV_CHAT(conv), NULL, NULL, TRUE);
 }
 
 static void
@@ -917,9 +882,12 @@ finch_write_common(PurpleConversation *conv, const char *who, const char *messag
 	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), "\n", GNT_TEXT_FLAG_NORMAL);
 
 	/* Unnecessary to print the timestamp for delayed message */
-	if (purple_prefs_get_bool("/finch/conversations/timestamps"))
+	if (purple_prefs_get_bool("/finch/conversations/timestamps")) {
+		if (!mtime)
+			time(&mtime);
 		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
 					purple_utf8_strftime("(%H:%M:%S)", localtime(&mtime)), gnt_color_pair(color_timestamp));
+	}
 
 	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), " ", GNT_TEXT_FLAG_NORMAL);
 
diff --git a/finch/gntdebug.c b/finch/gntdebug.c
index 43e7b84ffe..44bb5d42c2 100644
--- a/finch/gntdebug.c
+++ b/finch/gntdebug.c
@@ -35,6 +35,7 @@
 
 #include "gntdebug.h"
 #include "finch.h"
+#include <internal.h>
 #include "notify.h"
 #include "util.h"
 
diff --git a/finch/gntft.c b/finch/gntft.c
index 43cd76c52e..222bddc267 100644
--- a/finch/gntft.c
+++ b/finch/gntft.c
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include <gnt.h>
 #include <gntbox.h>
diff --git a/finch/gntlog.c b/finch/gntlog.c
index 5593f73c87..f938655097 100644
--- a/finch/gntlog.c
+++ b/finch/gntlog.c
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include <gnt.h>
 #include <gntbox.h>
@@ -66,7 +67,7 @@ static guint log_viewer_hash(gconstpointer data)
 			g_str_hash(purple_account_get_username(viewer->account));
 	}
 
-	return (guint)viewer;
+	return g_direct_hash(viewer);
 }
 
 static gboolean log_viewer_equal(gconstpointer y, gconstpointer z)
diff --git a/finch/gntmedia.c b/finch/gntmedia.c
new file mode 100644
index 0000000000..adc51372ec
--- /dev/null
+++ b/finch/gntmedia.c
@@ -0,0 +1,502 @@
+/**
+ * @file gntmedia.c GNT Media API
+ * @ingroup finch
+ */
+
+/* finch
+ *
+ * Finch is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "finch.h"
+#include <internal.h>
+#include "gntconv.h"
+#include "gntmedia.h"
+
+#include "gnt.h"
+#include "gntbutton.h"
+#include "gntbox.h"
+#include "gntlabel.h"
+
+#include "cmds.h"
+#include "conversation.h"
+#include "debug.h"
+#include "mediamanager.h"
+
+/* An incredibly large part of the following is from gtkmedia.c */
+#ifdef USE_VV
+#include "media-gst.h"
+
+#undef hangup
+
+#define FINCH_TYPE_MEDIA            (finch_media_get_type())
+#define FINCH_MEDIA(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), FINCH_TYPE_MEDIA, FinchMedia))
+#define FINCH_MEDIA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), FINCH_TYPE_MEDIA, FinchMediaClass))
+#define FINCH_IS_MEDIA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), FINCH_TYPE_MEDIA))
+#define FINCH_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), FINCH_TYPE_MEDIA))
+#define FINCH_MEDIA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), FINCH_TYPE_MEDIA, FinchMediaClass))
+
+typedef struct _FinchMedia FinchMedia;
+typedef struct _FinchMediaClass FinchMediaClass;
+typedef struct _FinchMediaPrivate FinchMediaPrivate;
+typedef enum _FinchMediaState FinchMediaState;
+
+struct _FinchMediaClass
+{
+	GntBoxClass parent_class;
+};
+
+struct _FinchMedia
+{
+	GntBox parent;
+	FinchMediaPrivate *priv;
+};
+
+struct _FinchMediaPrivate
+{
+	PurpleMedia *media;
+
+	GntWidget *accept;
+	GntWidget *reject;
+	GntWidget *hangup;
+	GntWidget *calling;
+
+	PurpleConversation *conv;
+};
+
+#define FINCH_MEDIA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), FINCH_TYPE_MEDIA, FinchMediaPrivate))
+
+static void finch_media_class_init (FinchMediaClass *klass);
+static void finch_media_init (FinchMedia *media);
+static void finch_media_finalize (GObject *object);
+static void finch_media_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void finch_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+
+static GntBoxClass *parent_class = NULL;
+
+enum {
+	MESSAGE,
+	LAST_SIGNAL
+};
+static guint finch_media_signals[LAST_SIGNAL] = {0};
+
+enum {
+	PROP_0,
+	PROP_MEDIA,
+};
+
+static GType
+finch_media_get_type(void)
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof(FinchMediaClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) finch_media_class_init,
+			NULL,
+			NULL,
+			sizeof(FinchMedia),
+			0,
+			(GInstanceInitFunc) finch_media_init,
+			NULL
+		};
+		type = g_type_register_static(GNT_TYPE_BOX, "FinchMedia", &info, 0);
+	}
+	return type;
+}
+
+
+static void
+finch_media_class_init (FinchMediaClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	parent_class = g_type_class_peek_parent(klass);
+
+	gobject_class->finalize = finch_media_finalize;
+	gobject_class->set_property = finch_media_set_property;
+	gobject_class->get_property = finch_media_get_property;
+
+	g_object_class_install_property(gobject_class, PROP_MEDIA,
+			g_param_spec_object("media",
+			"PurpleMedia",
+			"The PurpleMedia associated with this media.",
+			PURPLE_TYPE_MEDIA,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	finch_media_signals[MESSAGE] = g_signal_new("message", G_TYPE_FROM_CLASS(klass),
+					G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					g_cclosure_marshal_VOID__STRING,
+					G_TYPE_NONE, 1, G_TYPE_STRING);
+
+	g_type_class_add_private(klass, sizeof(FinchMediaPrivate));
+}
+
+
+static void
+finch_media_init (FinchMedia *media)
+{
+	media->priv = FINCH_MEDIA_GET_PRIVATE(media);
+
+	media->priv->calling = gnt_label_new(_("Calling..."));
+	media->priv->hangup = gnt_button_new(_("Hangup"));
+	media->priv->accept = gnt_button_new(_("Accept"));
+	media->priv->reject = gnt_button_new(_("Reject"));
+
+	gnt_box_set_alignment(GNT_BOX(media), GNT_ALIGN_MID);
+
+	gnt_box_add_widget(GNT_BOX(media), media->priv->accept);
+	gnt_box_add_widget(GNT_BOX(media), media->priv->reject);
+}
+
+static void
+finch_media_finalize (GObject *media)
+{
+	FinchMedia *gntmedia = FINCH_MEDIA(media);
+	purple_debug_info("gntmedia", "finch_media_finalize\n");
+	if (gntmedia->priv->media)
+		g_object_unref(gntmedia->priv->media);
+}
+
+static void
+finch_media_emit_message(FinchMedia *gntmedia, const char *msg)
+{
+	g_signal_emit(gntmedia, finch_media_signals[MESSAGE], 0, msg);
+}
+
+static void
+finch_media_connected_cb(PurpleMedia *media, FinchMedia *gntmedia)
+{
+	GntWidget *parent;
+
+	finch_media_emit_message(gntmedia, _("Call in progress."));
+
+	gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->accept);
+	gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->reject);
+	gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->hangup);
+	gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->calling);
+
+	gnt_box_add_widget(GNT_BOX(gntmedia), gntmedia->priv->hangup);
+
+	gnt_widget_destroy(gntmedia->priv->accept);
+	gnt_widget_destroy(gntmedia->priv->reject);
+	gnt_widget_destroy(gntmedia->priv->calling);
+	gntmedia->priv->accept = NULL;
+	gntmedia->priv->reject = NULL;
+	gntmedia->priv->calling = NULL;
+
+	parent = GNT_WIDGET(gntmedia);
+	while (parent->parent)
+		parent = parent->parent;
+	gnt_box_readjust(GNT_BOX(parent));
+	gnt_widget_draw(parent);
+}
+
+static void
+finch_media_wait_cb(PurpleMedia *media, FinchMedia *gntmedia)
+{
+	GntWidget *parent;
+
+	gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->accept);
+	gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->reject);
+	gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->hangup);
+	gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->calling);
+
+	gnt_box_add_widget(GNT_BOX(gntmedia), gntmedia->priv->calling);
+	gnt_box_add_widget(GNT_BOX(gntmedia), gntmedia->priv->hangup);
+
+	parent = GNT_WIDGET(gntmedia);
+	while (parent->parent)
+		parent = parent->parent;
+	gnt_box_readjust(GNT_BOX(parent));
+	gnt_widget_draw(parent);
+}
+
+static void
+finch_media_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
+		gchar *sid, gchar *name, FinchMedia *gntmedia)
+{
+	purple_debug_info("gntmedia", "state: %d sid: %s name: %s\n",
+			state, sid, name);
+	if (sid == NULL && name == NULL) {
+		if (state == PURPLE_MEDIA_STATE_END) {
+			finch_media_emit_message(gntmedia,
+					_("The call has been terminated."));
+			finch_conversation_set_info_widget(
+					gntmedia->priv->conv, NULL);
+			gnt_widget_destroy(GNT_WIDGET(gntmedia));
+			/*
+			 * XXX: This shouldn't have to be here
+			 * to free the FinchMedia widget.
+			 */
+			g_object_unref(gntmedia);
+		}
+	} else if (state == PURPLE_MEDIA_STATE_CONNECTED) {
+		finch_media_connected_cb(media, gntmedia);
+	} else if (state == PURPLE_MEDIA_STATE_NEW &&
+			sid != NULL && name != NULL && 
+			purple_media_is_initiator(media, sid, name) == FALSE) {
+		PurpleAccount *account;
+		PurpleBuddy *buddy;
+		const gchar *alias;
+		PurpleMediaSessionType type =
+				purple_media_get_session_type(media, sid);
+		gchar *message = NULL;
+
+		account = purple_media_get_account(gntmedia->priv->media);
+		buddy = purple_find_buddy(account, name);
+		alias = buddy ? purple_buddy_get_contact_alias(buddy) :	name;
+
+		if (type & PURPLE_MEDIA_AUDIO) {
+			message = g_strdup_printf(
+					_("%s wishes to start an audio session with you."),
+					alias);
+		} else {
+			message = g_strdup_printf(
+					_("%s is trying to start an unsupported media session type with you."),
+					alias);
+		}
+		finch_media_emit_message(gntmedia, message);
+		g_free(message);
+	}
+}
+
+static void
+finch_media_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
+		gchar *sid, gchar *name, gboolean local, FinchMedia *gntmedia)
+{
+	if (type == PURPLE_MEDIA_INFO_REJECT) {
+		finch_media_emit_message(gntmedia,
+				_("You have rejected the call."));
+	}
+}
+
+static void
+finch_media_accept_cb(PurpleMedia *media, GntWidget *widget)
+{
+	purple_media_stream_info(media, PURPLE_MEDIA_INFO_ACCEPT,
+			NULL, NULL, TRUE);
+}
+
+static void
+finch_media_hangup_cb(PurpleMedia *media, GntWidget *widget)
+{
+	purple_media_stream_info(media, PURPLE_MEDIA_INFO_HANGUP,
+			NULL, NULL, TRUE);
+}
+
+static void
+finch_media_reject_cb(PurpleMedia *media, GntWidget *widget)
+{
+	purple_media_stream_info(media, PURPLE_MEDIA_INFO_REJECT,
+			NULL, NULL, TRUE);
+}
+
+static void
+finch_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	FinchMedia *media;
+	g_return_if_fail(FINCH_IS_MEDIA(object));
+
+	media = FINCH_MEDIA(object);
+	switch (prop_id) {
+		case PROP_MEDIA:
+		{
+			if (media->priv->media)
+				g_object_unref(media->priv->media);
+			media->priv->media = g_value_get_object(value);
+			g_object_ref(media->priv->media);
+			g_signal_connect_swapped(G_OBJECT(media->priv->accept), "activate",
+				 G_CALLBACK(finch_media_accept_cb), media->priv->media);
+			g_signal_connect_swapped(G_OBJECT(media->priv->reject), "activate",
+				 G_CALLBACK(finch_media_reject_cb), media->priv->media);
+			g_signal_connect_swapped(G_OBJECT(media->priv->hangup), "activate",
+				 G_CALLBACK(finch_media_hangup_cb), media->priv->media);
+
+			if (purple_media_is_initiator(media->priv->media,
+					NULL, NULL) == TRUE) {
+				finch_media_wait_cb(media->priv->media, media);
+			}
+			g_signal_connect(G_OBJECT(media->priv->media), "state-changed",
+				G_CALLBACK(finch_media_state_changed_cb), media);
+			g_signal_connect(G_OBJECT(media->priv->media), "stream-info",
+				G_CALLBACK(finch_media_stream_info_cb), media);
+			break;
+		}
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+finch_media_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	FinchMedia *media;
+	g_return_if_fail(FINCH_IS_MEDIA(object));
+
+	media = FINCH_MEDIA(object);
+
+	switch (prop_id) {
+		case PROP_MEDIA:
+			g_value_set_object(value, media->priv->media);
+			break;
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);	
+			break;
+	}
+}
+
+static GntWidget *
+finch_media_new(PurpleMedia *media)
+{
+	return GNT_WIDGET(g_object_new(finch_media_get_type(),
+				"media", media,
+				"vertical", FALSE,
+				"homogeneous", FALSE,
+				NULL));
+}
+
+static void
+gntmedia_message_cb(FinchMedia *gntmedia, const char *msg, PurpleConversation *conv)
+{
+	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
+		purple_conv_im_write(PURPLE_CONV_IM(conv), NULL, msg, PURPLE_MESSAGE_SYSTEM, time(NULL));
+	}
+}
+
+static gboolean
+finch_new_media(PurpleMediaManager *manager, PurpleMedia *media,
+		PurpleAccount *account, gchar *name, gpointer null)
+{
+	GntWidget *gntmedia;
+	PurpleConversation *conv;
+
+	conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
+
+	gntmedia = finch_media_new(media);
+	g_signal_connect(G_OBJECT(gntmedia), "message", G_CALLBACK(gntmedia_message_cb), conv);
+	FINCH_MEDIA(gntmedia)->priv->conv = conv;
+	finch_conversation_set_info_widget(conv, gntmedia);
+	return TRUE;
+}
+
+static PurpleCmdRet
+call_cmd_cb(PurpleConversation *conv, const char *cmd, char **args,
+		char **eror, gpointer data)
+{
+	PurpleAccount *account = purple_conversation_get_account(conv);
+
+	if (!purple_prpl_initiate_media(account,
+			purple_conversation_get_name(conv),
+			PURPLE_MEDIA_AUDIO))
+		return PURPLE_CMD_STATUS_FAILED;
+
+	return PURPLE_CMD_STATUS_OK;
+}
+
+static GstElement *
+create_default_audio_src(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant)
+{
+	GstElement *src;
+	src = gst_element_factory_make("gconfaudiosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("autoaudiosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("alsasrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("osssrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("dshowaudiosrc", NULL);
+	if (src == NULL) {
+		purple_debug_error("gntmedia", "Unable to find a suitable "
+				"element for the default audio source.\n");
+		return NULL;
+	}
+	gst_element_set_name(src, "finchdefaultaudiosrc");
+	return src;
+}
+
+static GstElement *
+create_default_audio_sink(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant)
+{
+	GstElement *sink;
+	sink = gst_element_factory_make("gconfaudiosink", NULL);
+	if (sink == NULL)
+		sink = gst_element_factory_make("autoaudiosink",NULL);
+	if (sink == NULL) {
+		purple_debug_error("gntmedia", "Unable to find a suitable "
+				"element for the default audio sink.\n");
+		return NULL;
+	}
+	return sink;
+}
+#endif  /* USE_VV */
+
+void finch_media_manager_init(void)
+{
+#ifdef USE_VV
+	PurpleMediaManager *manager = purple_media_manager_get();
+	PurpleMediaElementInfo *default_audio_src =
+			g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
+			"id", "finchdefaultaudiosrc",
+			"name", "Finch Default Audio Source",
+			"type", PURPLE_MEDIA_ELEMENT_AUDIO
+					| PURPLE_MEDIA_ELEMENT_SRC
+					| PURPLE_MEDIA_ELEMENT_ONE_SRC
+					| PURPLE_MEDIA_ELEMENT_UNIQUE,
+			"create-cb", create_default_audio_src, NULL);
+	PurpleMediaElementInfo *default_audio_sink =
+			g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
+			"id", "finchdefaultaudiosink",
+			"name", "Finch Default Audio Sink",
+			"type", PURPLE_MEDIA_ELEMENT_AUDIO
+					| PURPLE_MEDIA_ELEMENT_SINK
+					| PURPLE_MEDIA_ELEMENT_ONE_SINK,
+			"create-cb", create_default_audio_sink, NULL);
+
+	g_signal_connect(G_OBJECT(manager), "init-media", G_CALLBACK(finch_new_media), NULL);
+	purple_cmd_register("call", "", PURPLE_CMD_P_DEFAULT,
+			PURPLE_CMD_FLAG_IM, NULL,
+			call_cmd_cb, _("call: Make an audio call."), NULL);
+
+	purple_media_manager_set_ui_caps(manager, 
+			PURPLE_MEDIA_CAPS_AUDIO |
+			PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION);
+
+	purple_debug_info("gntmedia", "Registering media element types\n");
+	purple_media_manager_set_active_element(manager, default_audio_src);
+	purple_media_manager_set_active_element(manager, default_audio_sink);
+#endif
+}
+
+void finch_media_manager_uninit(void)
+{
+#ifdef USE_VV
+	PurpleMediaManager *manager = purple_media_manager_get();
+	g_signal_handlers_disconnect_by_func(G_OBJECT(manager),
+			G_CALLBACK(finch_new_media), NULL);
+#endif
+}
+
+
diff --git a/finch/gntmedia.h b/finch/gntmedia.h
new file mode 100644
index 0000000000..95842d477d
--- /dev/null
+++ b/finch/gntmedia.h
@@ -0,0 +1,42 @@
+/**
+ * @file gntmedia.h GNT Media API
+ * @ingroup finch
+ */
+
+/* finch
+ *
+ * Finch is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef GNT_MEDIA_H
+#define GNT_MEDIA_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+G_BEGIN_DECLS
+
+void finch_media_manager_init(void);
+void finch_media_manager_uninit(void);
+
+G_END_DECLS
+
+#endif /* GNT_MEDIA_H */
+
diff --git a/finch/gntnotify.c b/finch/gntnotify.c
index 16896d6de1..f5e0151cd5 100644
--- a/finch/gntnotify.c
+++ b/finch/gntnotify.c
@@ -32,6 +32,7 @@
 #include <gntwindow.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include <util.h>
 
@@ -208,6 +209,9 @@ finch_notify_emails(PurpleConnection *gc, size_t count, gboolean detailed,
 	void *ret;
 	static int key = 0;
 
+	if (count == 0)
+		return NULL;
+
 	if (!detailed)
 	{
 		g_string_append_printf(message,
@@ -263,7 +267,7 @@ static char *
 userinfo_hash(PurpleAccount *account, const char *who)
 {
 	char key[256];
-	snprintf(key, sizeof(key), "%s - %s", purple_account_get_username(account), purple_normalize(account, who));
+	g_snprintf(key, sizeof(key), "%s - %s", purple_account_get_username(account), purple_normalize(account, who));
 	return g_utf8_strup(key, -1);
 }
 
diff --git a/finch/gntplugin.c b/finch/gntplugin.c
index 4c1127cbc2..94b153e704 100644
--- a/finch/gntplugin.c
+++ b/finch/gntplugin.c
@@ -32,6 +32,7 @@
 #include <gntutils.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include "debug.h"
 #include "notify.h"
@@ -484,10 +485,10 @@ process_pref_frame(PurplePluginPrefFrame *frame)
 				char *value = NULL;
 				switch(type) {
 					case PURPLE_PREF_BOOLEAN:
-						value = g_strdup_printf("%d", (int)list->next->data);
+						value = g_strdup_printf("%d", GPOINTER_TO_INT(list->next->data));
 						break;
 					case PURPLE_PREF_INT:
-						value = g_strdup_printf("%d", (int)list->next->data);
+						value = g_strdup_printf("%d", GPOINTER_TO_INT(list->next->data));
 						break;
 					case PURPLE_PREF_STRING:
 						value = g_strdup(list->next->data);
diff --git a/finch/gntpounce.c b/finch/gntpounce.c
index e17e1616ac..449d525323 100644
--- a/finch/gntpounce.c
+++ b/finch/gntpounce.c
@@ -36,6 +36,7 @@
 #include <gntutils.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include "account.h"
 #include "conversation.h"
diff --git a/finch/gntprefs.c b/finch/gntprefs.c
index 3b20960a7c..6d51da06eb 100644
--- a/finch/gntprefs.c
+++ b/finch/gntprefs.c
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include <prefs.h>
 #include <savedstatuses.h>
diff --git a/finch/gntrequest.c b/finch/gntrequest.c
index 9b37349cd6..6c51521697 100644
--- a/finch/gntrequest.c
+++ b/finch/gntrequest.c
@@ -35,6 +35,7 @@
 #include <gnttree.h>
 
 #include "finch.h"
+#include <internal.h>
 #include "gntrequest.h"
 #include "debug.h"
 #include "util.h"
@@ -317,6 +318,8 @@ request_fields_cb(GntWidget *button, PurpleRequestFields *fields)
 		{
 			PurpleRequestField *field = fields->data;
 			PurpleRequestFieldType type = purple_request_field_get_type(field);
+			if (!purple_request_field_is_visible(field))
+				continue;
 			if (type == PURPLE_REQUEST_FIELD_BOOLEAN)
 			{
 				GntWidget *check = FINCH_GET_DATA(field);
@@ -598,11 +601,13 @@ finch_request_fields(const char *title, const char *primary,
 
 		for (; fields ; fields = fields->next)
 		{
-			/* XXX: Break each of the fields into a separate function? */
 			PurpleRequestField *field = fields->data;
 			PurpleRequestFieldType type = purple_request_field_get_type(field);
 			const char *label = purple_request_field_get_label(field);
 
+			if (!purple_request_field_is_visible(field))
+				continue;
+
 			hbox = gnt_hbox_new(TRUE);   /* hrm */
 			gnt_box_add_widget(GNT_BOX(box), hbox);
 
diff --git a/finch/gntroomlist.c b/finch/gntroomlist.c
index bbaa3e7dad..92299d3a5c 100644
--- a/finch/gntroomlist.c
+++ b/finch/gntroomlist.c
@@ -25,6 +25,7 @@
  */
 
 #include "finch.h"
+#include <internal.h>
 
 #include "gntrequest.h"
 #include "gntroomlist.h"
@@ -190,7 +191,7 @@ roomlist_selection_changed(GntWidget *widget, gpointer old, gpointer current, gp
 				label = g_strdup(iter->data ? "True" : "False");
 				break;
 			case PURPLE_ROOMLIST_FIELD_INT:
-				label = g_strdup_printf("%d", (int)iter->data);
+				label = g_strdup_printf("%d", GPOINTER_TO_INT(iter->data));
 				break;
 			case PURPLE_ROOMLIST_FIELD_STRING:
 				label = g_strdup(iter->data);
diff --git a/finch/gntsound.c b/finch/gntsound.c
index c45afd9e5c..f38c835711 100644
--- a/finch/gntsound.c
+++ b/finch/gntsound.c
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -213,7 +214,7 @@ im_msg_sent_cb(PurpleAccount *account, const char *receiver,
 			   const char *message, PurpleSoundEventID event)
 {
 	PurpleConversation *conv = purple_find_conversation_with_account(
-		PURPLE_CONV_TYPE_ANY, receiver, account);
+		PURPLE_CONV_TYPE_IM, receiver, account);
 	play_conv_event(conv, event);
 }
 
diff --git a/finch/gntstatus.c b/finch/gntstatus.c
index 7bb115edbc..31c7494ad2 100644
--- a/finch/gntstatus.c
+++ b/finch/gntstatus.c
@@ -34,6 +34,7 @@
 #include <gntutils.h>
 
 #include "finch.h"
+#include <internal.h>
 
 #include <notify.h>
 #include <request.h>
diff --git a/finch/gntui.c b/finch/gntui.c
index 7ebdf1a59d..a526055d37 100644
--- a/finch/gntui.c
+++ b/finch/gntui.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
+#include <internal.h>
 
 #include "gntui.h"
 
@@ -31,6 +32,7 @@
 #include "gntdebug.h"
 #include "gntft.h"
 #include "gntlog.h"
+#include "gntmedia.h"
 #include "gntnotify.h"
 #include "gntplugin.h"
 #include "gntpounce.h"
@@ -91,6 +93,9 @@ void gnt_ui_init()
 	finch_roomlist_init();
 	purple_roomlist_set_ui_ops(finch_roomlist_get_ui_ops());
 
+	/* Media */
+	finch_media_manager_init();
+
 	gnt_register_action(_("Accounts"), finch_accounts_show_all);
 	gnt_register_action(_("Buddy List"), finch_blist_show);
 	gnt_register_action(_("Buddy Pounces"), finch_pounces_manager_show);
@@ -136,6 +141,10 @@ void gnt_ui_uninit()
 	finch_roomlist_uninit();
 	purple_roomlist_set_ui_ops(NULL);
 
+#ifdef USE_VV
+	finch_media_manager_uninit();
+#endif
+
 	gnt_quit();
 #endif
 }
diff --git a/finch/libgnt/Makefile.am b/finch/libgnt/Makefile.am
index 99b6d4566b..65ce3cb65f 100644
--- a/finch/libgnt/Makefile.am
+++ b/finch/libgnt/Makefile.am
@@ -28,6 +28,7 @@ libgnt_la_SOURCES = \
 	gntmenu.c \
 	gntmenuitem.c \
 	gntmenuitemcheck.c \
+	gntprogressbar.c \
 	gntslider.c \
 	gntstyle.c \
 	gnttextview.c \
@@ -56,6 +57,7 @@ libgnt_la_headers = \
 	gntmenu.h \
 	gntmenuitem.h \
 	gntmenuitemcheck.h \
+	gntprogressbar.h \
 	gntslider.h \
 	gntstyle.h \
 	gnttextview.h \
diff --git a/finch/libgnt/configure.ac b/finch/libgnt/configure.ac
index 7338908cb8..0577b3d4a5 100644
--- a/finch/libgnt/configure.ac
+++ b/finch/libgnt/configure.ac
@@ -24,11 +24,11 @@ AC_PREREQ([2.50])
 # Make sure to update ../../configure.ac with libgnt version changes.
 #
 
-m4_define([gnt_lt_current], [5])
+m4_define([gnt_lt_current], [6])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [5])
-m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_minor_version], [6])
+m4_define([gnt_micro_version], [2])
+m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
diff --git a/finch/libgnt/gnt.h b/finch/libgnt/gnt.h
index 7e7433cc81..0c1a0bc024 100644
--- a/finch/libgnt/gnt.h
+++ b/finch/libgnt/gnt.h
@@ -48,6 +48,10 @@
 	#define G_PARAM_STATIC_BLURB  G_PARAM_PRIVATE
 #endif
 
+#if !GLIB_CHECK_VERSION(2,14,0)
+	#define g_timeout_add_seconds(time, callback, data)  g_timeout_add(time * 1000, callback, data)
+#endif
+
 /**
  * Initialize GNT.
  */
diff --git a/finch/libgnt/gntbox.c b/finch/libgnt/gntbox.c
index d9d7c208f7..7fb38e6738 100644
--- a/finch/libgnt/gntbox.c
+++ b/finch/libgnt/gntbox.c
@@ -78,13 +78,11 @@ gnt_box_draw(GntWidget *widget)
 
 	g_list_foreach(box->list, (GFunc)gnt_widget_draw, NULL);
 
-	gnt_box_sync_children(box);
-
 	if (box->title && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_BORDER))
 	{
 		int pos, right;
 		char *title = g_strdup(box->title);
-		
+
 		get_title_thingies(box, title, &pos, &right);
 
 		if (gnt_widget_has_focus(widget))
@@ -96,8 +94,8 @@ gnt_box_draw(GntWidget *widget)
 		mvwaddch(widget->window, 0, right, ACS_LTEE | gnt_color_pair(GNT_COLOR_NORMAL));
 		g_free(title);
 	}
-	
-	GNTDEBUG;
+
+	gnt_box_sync_children(box);
 }
 
 static void
@@ -723,6 +721,9 @@ void gnt_box_sync_children(GntBox *box)
 	if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_BORDER))
 		pos = 0;
 
+	if (!box->active)
+		find_focusable_widget(box);
+
 	for (iter = box->list; iter; iter = iter->next)
 	{
 		GntWidget *w = GNT_WIDGET(iter->data);
@@ -764,6 +765,9 @@ void gnt_box_sync_children(GntBox *box)
 		copywin(w->window, widget->window, 0, 0,
 				y, x, y + height - 1, x + width - 1, FALSE);
 		gnt_widget_set_position(w, x + widget->priv.x, y + widget->priv.y);
+		if (w == box->active) {
+			wmove(widget->window, y + getcury(w->window), x + getcurx(w->window));
+		}
 	}
 }
 
diff --git a/finch/libgnt/gntcheckbox.c b/finch/libgnt/gntcheckbox.c
index 6b6e1c0544..c3704b4539 100644
--- a/finch/libgnt/gntcheckbox.c
+++ b/finch/libgnt/gntcheckbox.c
@@ -42,7 +42,7 @@ gnt_check_box_draw(GntWidget *widget)
 		type = GNT_COLOR_HIGHLIGHT;
 	else
 		type = GNT_COLOR_NORMAL;
-	
+
 	wbkgdset(widget->window, '\0' | gnt_color_pair(type));
 
 	text = g_strdup_printf("[%c]", cb->checked ? 'X' : ' ');
@@ -51,7 +51,8 @@ gnt_check_box_draw(GntWidget *widget)
 
 	wbkgdset(widget->window, '\0' | gnt_color_pair(GNT_COLOR_NORMAL));
 	mvwaddstr(widget->window, 0, 4, GNT_BUTTON(cb)->priv->text);
-	
+	wmove(widget->window, 0, 1);
+
 	GNTDEBUG;
 }
 
diff --git a/finch/libgnt/gntcombobox.c b/finch/libgnt/gntcombobox.c
index c012113e23..9d32749646 100644
--- a/finch/libgnt/gntcombobox.c
+++ b/finch/libgnt/gntcombobox.c
@@ -73,7 +73,7 @@ gnt_combo_box_draw(GntWidget *widget)
 	char *text = NULL, *s;
 	GntColorType type;
 	int len;
-	
+
 	if (box->dropdown && box->selected)
 		text = gnt_tree_get_selection_text(GNT_TREE(box->dropdown));
 
@@ -94,6 +94,7 @@ gnt_combo_box_draw(GntWidget *widget)
 	whline(widget->window, ' ' | gnt_color_pair(type), widget->priv.width - 4 - len);
 	mvwaddch(widget->window, 1, widget->priv.width - 3, ACS_VLINE | gnt_color_pair(GNT_COLOR_NORMAL));
 	mvwaddch(widget->window, 1, widget->priv.width - 2, ACS_DARROW | gnt_color_pair(GNT_COLOR_NORMAL));
+	wmove(widget->window, 1, 1);
 
 	g_free(text);
 	GNTDEBUG;
diff --git a/finch/libgnt/gntentry.c b/finch/libgnt/gntentry.c
index 514ff01645..85e06f351d 100644
--- a/finch/libgnt/gntentry.c
+++ b/finch/libgnt/gntentry.c
@@ -271,6 +271,7 @@ gnt_entry_draw(GntWidget *widget)
 	GntEntry *entry = GNT_ENTRY(widget);
 	int stop;
 	gboolean focus;
+	int curpos;
 
 	if ((focus = gnt_widget_has_focus(widget)))
 		wbkgdset(widget->window, '\0' | gnt_color_pair(GNT_COLOR_TEXT_NORMAL));
@@ -289,9 +290,10 @@ gnt_entry_draw(GntWidget *widget)
 	if (stop < widget->priv.width)
 		mvwhline(widget->window, 0, stop, ENTRY_CHAR, widget->priv.width - stop);
 
+	curpos = gnt_util_onscreen_width(entry->scroll, entry->cursor);
 	if (focus)
-		mvwchgat(widget->window, 0, gnt_util_onscreen_width(entry->scroll, entry->cursor),
-				1, A_REVERSE, GNT_COLOR_TEXT_NORMAL, NULL);
+		mvwchgat(widget->window, 0, curpos, 1, A_REVERSE, GNT_COLOR_TEXT_NORMAL, NULL);
+	wmove(widget->window, 0, curpos);
 
 	GNTDEBUG;
 }
diff --git a/finch/libgnt/gntkeys.c b/finch/libgnt/gntkeys.c
index dc17c1a9fa..01523f8f0b 100644
--- a/finch/libgnt/gntkeys.c
+++ b/finch/libgnt/gntkeys.c
@@ -166,7 +166,7 @@ void gnt_keys_refine(char *text)
 				strstr(term, "xterm") == term ||
 				strstr(term, "vt100") == term)
 			*(text + 1) = 'O';
-	} else if (*(unsigned char*)text == 195) {
+	} else if (g_utf8_get_char(text) == 195) {
 		if (*(text + 2) == 0 && strstr(term, "xterm") == term) {
 			*(text) = 27;
 			*(text + 1) -= 64;  /* Say wha? */
diff --git a/finch/libgnt/gntkeys.h b/finch/libgnt/gntkeys.h
index 0f5a6cc5a1..6f218aa4d6 100644
--- a/finch/libgnt/gntkeys.h
+++ b/finch/libgnt/gntkeys.h
@@ -165,5 +165,6 @@ int gnt_keys_find_combination(const char *key);
 #undef lines
 #undef buttons
 #undef newline
+#undef set_clock
 
 #endif
diff --git a/finch/libgnt/gntprogressbar.c b/finch/libgnt/gntprogressbar.c
new file mode 100644
index 0000000000..0032fabbe2
--- /dev/null
+++ b/finch/libgnt/gntprogressbar.c
@@ -0,0 +1,253 @@
+/**
+ * GNT - The GLib Ncurses Toolkit
+ *
+ * GNT is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ **/
+
+#include "gntprogressbar.h"
+#include "gntutils.h"
+
+#include <string.h>
+
+typedef struct _GntProgressBarPrivate
+{
+	gdouble fraction;
+	gboolean show_value;
+	GntProgressBarOrientation orientation;
+} GntProgressBarPrivate;
+
+struct _GntProgressBar
+{
+	GntWidget parent;
+#if !GLIB_CHECK_VERSION(2,4,0)
+	GntProgressBarPrivate priv;
+#endif
+};
+
+#if GLIB_CHECK_VERSION(2,4,0)
+#define GNT_PROGRESS_BAR_GET_PRIVATE(o)   (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNT_TYPE_PROGRESS_BAR, GntProgressBarPrivate))
+#else
+#define GNT_PROGRESS_BAR_GET_PRIVATE(o)   &(GNT_PROGRESS_BAR(o)->priv)
+#endif
+
+static GntWidgetClass *parent_class = NULL;
+
+
+static void
+gnt_progress_bar_draw (GntWidget *widget)
+{
+	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (GNT_PROGRESS_BAR (widget));
+	gchar progress[8];
+	gint start, end, i, pos;
+	int color;
+
+	g_snprintf (progress, sizeof (progress), "%.1f%%", priv->fraction * 100);
+	color = gnt_color_pair(GNT_COLOR_NORMAL);
+
+	switch (priv->orientation) {
+		case GNT_PROGRESS_LEFT_TO_RIGHT:
+		case GNT_PROGRESS_RIGHT_TO_LEFT:
+			start = (priv->orientation == GNT_PROGRESS_LEFT_TO_RIGHT ? 0 : (1.0 - priv->fraction) * widget->priv.width);
+			end = (priv->orientation == GNT_PROGRESS_LEFT_TO_RIGHT ? widget->priv.width * priv->fraction : widget->priv.width);
+
+			/* background */
+			for (i = 0; i < widget->priv.height; i++)
+				mvwhline (widget->window, i, 0, ' ' | color, widget->priv.width);
+
+			/* foreground */
+			for (i = 0; i < widget->priv.height; i++)
+				mvwhline (widget->window, i, start, ACS_CKBOARD | color | A_REVERSE, end);
+
+			/* text */
+			if (priv->show_value) {
+				pos = widget->priv.width / 2 - strlen (progress) / 2;
+				for (i = 0; i < progress[i]; i++, pos++) {
+					wattrset (widget->window, color | ((pos < start || pos > end) ? A_NORMAL : A_REVERSE));
+					mvwprintw (widget->window, widget->priv.height / 2, pos, "%c", progress[i]);
+				}
+				wattrset (widget->window, color);
+			}
+
+			break;
+		case GNT_PROGRESS_TOP_TO_BOTTOM:
+		case GNT_PROGRESS_BOTTOM_TO_TOP:
+			start = (priv->orientation == GNT_PROGRESS_TOP_TO_BOTTOM ? 0 : (1.0 - priv->fraction) * widget->priv.height);
+			end = (priv->orientation == GNT_PROGRESS_TOP_TO_BOTTOM ? widget->priv.height * priv->fraction : widget->priv.height);
+
+			/* background */
+			for (i = 0; i < widget->priv.width; i++)
+				mvwvline (widget->window, 0, i, ' ' | color, widget->priv.height);
+
+			/* foreground */
+			for (i = 0; i < widget->priv.width; i++)
+				mvwvline (widget->window, start, i, ACS_CKBOARD | color | A_REVERSE, end);
+
+			/* text */
+			if (priv->show_value) {
+				pos = widget->priv.height / 2 - strlen (progress) / 2;
+				for (i = 0; i < progress[i]; i++, pos++) {
+					wattrset (widget->window, color | ((pos < start || pos > end) ? A_NORMAL : A_REVERSE));
+					mvwprintw (widget->window, pos, widget->priv.width / 2, "%c\n", progress[i]);
+				}
+				wattrset (widget->window, color);
+			}
+
+			break;
+		default:
+			g_assert_not_reached ();
+	}
+}
+
+static void
+gnt_progress_bar_size_request (GntWidget *widget)
+{
+	gnt_widget_set_size (widget, widget->priv.minw, widget->priv.minh);
+}
+
+static void
+gnt_progress_bar_class_init (gpointer klass, gpointer class_data)
+{
+	GObjectClass *g_class = G_OBJECT_CLASS (klass);
+
+	parent_class = GNT_WIDGET_CLASS (klass);
+
+#if GLIB_CHECK_VERSION(2,4,0)
+	g_type_class_add_private (g_class, sizeof (GntProgressBarPrivate));
+#endif
+
+	parent_class->draw = gnt_progress_bar_draw;
+	parent_class->size_request = gnt_progress_bar_size_request;
+}
+
+static void
+gnt_progress_bar_init (GTypeInstance *instance, gpointer g_class)
+{
+	GntWidget *widget = GNT_WIDGET (instance);
+	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (GNT_PROGRESS_BAR (widget));
+
+	gnt_widget_set_take_focus (widget, FALSE);
+	GNT_WIDGET_SET_FLAGS (widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_GROW_X);
+
+	widget->priv.minw = 8;
+	widget->priv.minh = 1;
+
+	priv->show_value = TRUE;
+}
+
+GType
+gnt_progress_bar_get_type (void)
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof (GntProgressBarClass),
+			NULL,                         /* base_init */
+			NULL,                         /* base_finalize */
+			gnt_progress_bar_class_init,  /* class_init */
+			NULL,                         /* class_finalize */
+			NULL,                         /* class_data */
+			sizeof (GntProgressBar),
+			0,                            /* n_preallocs */
+			gnt_progress_bar_init,        /* instance_init */
+			NULL                          /* value_table */
+		}; 
+
+		type = g_type_register_static (GNT_TYPE_WIDGET, "GntProgressBar", &info, 0);
+	}
+
+	return type;
+}
+
+GntWidget *
+gnt_progress_bar_new (void)
+{
+	GntWidget *widget = g_object_new (GNT_TYPE_PROGRESS_BAR, NULL);
+	return widget;
+}
+
+void
+gnt_progress_bar_set_fraction (GntProgressBar *pbar, gdouble fraction)
+{
+	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+
+	if (fraction > 1.0)
+		priv->fraction = 1.0;
+	else if (fraction < 0.0)
+		priv->fraction = 0.0;
+	else
+		priv->fraction = fraction;
+
+	if ((GNT_WIDGET_FLAGS(pbar) & GNT_WIDGET_MAPPED))
+		gnt_widget_draw(GNT_WIDGET(pbar));
+}
+
+void
+gnt_progress_bar_set_orientation (GntProgressBar *pbar,
+		GntProgressBarOrientation orientation)
+{
+	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+	GntWidget *widget = GNT_WIDGET(pbar);
+
+	priv->orientation = orientation;
+	if (orientation == GNT_PROGRESS_LEFT_TO_RIGHT ||
+			orientation == GNT_PROGRESS_RIGHT_TO_LEFT) {
+		GNT_WIDGET_SET_FLAGS(pbar, GNT_WIDGET_GROW_X);
+		GNT_WIDGET_UNSET_FLAGS(pbar, GNT_WIDGET_GROW_Y);
+		widget->priv.minw = 8;
+		widget->priv.minh = 1;
+	} else {
+		GNT_WIDGET_UNSET_FLAGS(pbar, GNT_WIDGET_GROW_X);
+		GNT_WIDGET_SET_FLAGS(pbar, GNT_WIDGET_GROW_Y);
+		widget->priv.minw = 1;
+		widget->priv.minh = 8;
+	}
+
+	if ((GNT_WIDGET_FLAGS(pbar) & GNT_WIDGET_MAPPED))
+		gnt_widget_draw(GNT_WIDGET(pbar));
+}
+
+void
+gnt_progress_bar_set_show_progress (GntProgressBar *pbar, gboolean show)
+{
+	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+	priv->show_value = show;
+}
+
+gdouble
+gnt_progress_bar_get_fraction (GntProgressBar *pbar)
+{
+	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+	return priv->fraction;
+}
+
+GntProgressBarOrientation
+gnt_progress_bar_get_orientation (GntProgressBar *pbar)
+{
+	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+	return priv->orientation;
+}
+
+gboolean
+gnt_progress_bar_get_show_progress (GntProgressBar *pbar)
+{
+	GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (pbar);
+	return priv->show_value;
+}
+
diff --git a/finch/libgnt/gntprogressbar.h b/finch/libgnt/gntprogressbar.h
new file mode 100644
index 0000000000..fbfd788992
--- /dev/null
+++ b/finch/libgnt/gntprogressbar.h
@@ -0,0 +1,132 @@
+/**
+ * @file gntprogressbar.h Progress Bar API
+ * @ingroup gnt
+ */
+/*
+ * GNT - The GLib Ncurses Toolkit
+ *
+ * GNT is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef GNT_PROGRESS_BAR_H
+#define GNT_PROGRESS_BAR_H
+
+#include "gnt.h"
+#include "gntwidget.h"
+
+#define GNT_TYPE_PROGRESS_BAR          (gnt_progress_bar_get_type ())
+#define GNT_PROGRESS_BAR(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), GNT_TYPE_PROGRESS_BAR, GntProgressBar))
+#define GNT_PROGRESS_BAR_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST ((k), GNT_TYPE_PROGRESS_BAR, GntProgressBarClass))
+#define GNT_IS_PROGRESS_BAR(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNT_TYPE_PROGRESS_BAR))
+#define GNT_IS_PROGRESS_BAR_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), GNT_TYPE_PROGRESS_BAR))
+#define GNT_PROGRESS_BAR_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), GNT_TYPE_PROGRESS_BAR, GntProgressBarClass))
+
+typedef enum _GntProgressBarOrientation
+{
+   GNT_PROGRESS_LEFT_TO_RIGHT,
+   GNT_PROGRESS_RIGHT_TO_LEFT,
+   GNT_PROGRESS_BOTTOM_TO_TOP,
+   GNT_PROGRESS_TOP_TO_BOTTOM,
+} GntProgressBarOrientation;
+
+typedef struct _GntProgressBar GntProgressBar;
+
+typedef struct _GntProgressBarClass
+{
+   GntWidgetClass parent;
+
+   void (*gnt_reserved1)(void);
+   void (*gnt_reserved2)(void);
+   void (*gnt_reserved3)(void);
+   void (*gnt_reserved4)(void);
+} GntProgressBarClass;
+
+G_BEGIN_DECLS
+
+/**
+ * Get the GType for GntProgressBar
+ * @return The GType for GntProrgressBar
+ **/
+GType
+gnt_progress_bar_get_type (void);
+
+/**
+ * Create a new GntProgressBar
+ * @return The new GntProgressBar
+ **/
+GntWidget *
+gnt_progress_bar_new (void);
+
+/**
+ * Set the progress for a progress bar
+ *
+ * @param pbar The GntProgressBar
+ * @param fraction The value between 0 and 1 to display
+ **/
+void
+gnt_progress_bar_set_fraction (GntProgressBar *pbar, gdouble fraction);
+
+/**
+ * Set the orientation for a progress bar
+ *
+ * @param pbar The GntProgressBar
+ * @param orientation The orientation to use
+ **/
+void
+gnt_progress_bar_set_orientation (GntProgressBar *pbar, GntProgressBarOrientation orientation);
+
+/**
+ * Controls whether the progress value is shown
+ *
+ * @param pbar The GntProgressBar
+ * @param show A boolean indicating if the value is shown
+ **/
+void
+gnt_progress_bar_set_show_progress (GntProgressBar *pbar, gboolean show);
+
+/**
+ * Get the progress that is displayed
+ *
+ * @param pbar The GntProgressBar
+ * @return The progress displayed as a value between 0 and 1
+ **/
+gdouble
+gnt_progress_bar_get_fraction (GntProgressBar *pbar);
+
+/**
+ * Get the orientation for the progress bar
+ *
+ * @param pbar The GntProgressBar
+ * @return The current orientation of the progress bar
+ **/
+GntProgressBarOrientation
+gnt_progress_bar_get_orientation (GntProgressBar *pbar);
+
+/**
+ * Get a boolean describing if the progress value is shown
+ *
+ * @param pbar The GntProgressBar
+ * @return A boolean @c true if the progress value is shown, @c false otherwise.
+ **/
+gboolean
+gnt_progress_bar_get_show_progress (GntProgressBar *pbar);
+
+G_END_DECLS
+
+#endif /* GNT_PROGRESS_BAR_H */
diff --git a/finch/libgnt/gnttextview.c b/finch/libgnt/gnttextview.c
index 1991a08afb..1a1354c261 100644
--- a/finch/libgnt/gnttextview.c
+++ b/finch/libgnt/gnttextview.c
@@ -177,7 +177,7 @@ gnt_text_view_draw(GntWidget *widget)
 					gnt_color_pair(GNT_COLOR_HIGHLIGHT_D));
 	}
 
-	GNTDEBUG;
+	wmove(widget->window, 0, 0);
 }
 
 static void
@@ -799,6 +799,7 @@ int gnt_text_view_tag_change(GntTextView *view, const char *name, const char *te
 				break;
 		}
 	}
+	gnt_widget_draw(GNT_WIDGET(view));
 	return count;
 }
 
diff --git a/finch/libgnt/gnttree.c b/finch/libgnt/gnttree.c
index bcb5712981..6bb495629b 100644
--- a/finch/libgnt/gnttree.c
+++ b/finch/libgnt/gnttree.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#define SEARCH_TIMEOUT 4000   /* 4 secs */
+#define SEARCH_TIMEOUT_S 4   /* 4 secs */
 #define SEARCHING(tree)  (tree->priv->search && tree->priv->search->len > 0)
 
 #define COLUMN_INVISIBLE(tree, index)  (tree->columns[index].flags & GNT_TREE_COLUMN_INVISIBLE)
@@ -420,6 +420,7 @@ redraw_tree(GntTree *tree)
 	GntTreeRow *row;
 	int pos, up, down = 0;
 	int rows, scrcol;
+	int current = 0;
 
 	if (!GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(tree), GNT_WIDGET_MAPPED))
 		return;
@@ -431,7 +432,7 @@ redraw_tree(GntTree *tree)
 
 	if (tree->top == NULL)
 		tree->top = tree->root;
-	if (tree->current == NULL) {
+	if (tree->current == NULL && tree->root != NULL) {
 		tree->current = tree->root;
 		tree_selection_changed(tree, NULL, tree->current);
 	}
@@ -490,6 +491,13 @@ redraw_tree(GntTree *tree)
 		tree->top = get_next(tree->top);
 	row = tree->top;
 	scrcol = widget->priv.width - 1 - 2 * pos;  /* exclude the borders and the scrollbar */
+
+	if (tree->current && !row_matches_search(tree->current)) {
+		GntTreeRow *old = tree->current;
+		tree->current = tree->top;
+		tree_selection_changed(tree, old, tree->current);
+	}
+
 	for (i = start + pos; row && i < widget->priv.height - pos;
 				i++, row = get_next(row))
 	{
@@ -518,6 +526,7 @@ redraw_tree(GntTree *tree)
 
 		if (row == tree->current)
 		{
+			current = i;
 			attr |= A_BOLD;
 			if (gnt_widget_has_focus(widget))
 				attr |= gnt_color_pair(GNT_COLOR_HIGHLIGHT);
@@ -606,6 +615,7 @@ redraw_tree(GntTree *tree)
 		mvwaddnstr(widget->window, widget->priv.height - pos - 1, pos,
 				tree->priv->search->str, str - tree->priv->search->str);
 	}
+	wmove(widget->window, current, pos);
 
 	gnt_widget_queue_update(widget);
 }
@@ -818,7 +828,7 @@ gnt_tree_key_pressed(GntWidget *widget, const char *text)
 			gnt_bindable_perform_action_key(GNT_BINDABLE(tree), text);
 		}
 		g_source_remove(tree->priv->search_timeout);
-		tree->priv->search_timeout = g_timeout_add(SEARCH_TIMEOUT, search_timeout, tree);
+		tree->priv->search_timeout = g_timeout_add_seconds(SEARCH_TIMEOUT_S, search_timeout, tree);
 		return TRUE;
 	} else if (text[0] == ' ' && text[1] == 0) {
 		/* Space pressed */
@@ -930,7 +940,7 @@ start_search(GntBindable *bindable, GList *list)
 		return FALSE;
 	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(tree), GNT_WIDGET_DISABLE_ACTIONS);
 	tree->priv->search = g_string_new(NULL);
-	tree->priv->search_timeout = g_timeout_add(SEARCH_TIMEOUT, search_timeout, tree);
+	tree->priv->search_timeout = g_timeout_add_seconds(SEARCH_TIMEOUT_S, search_timeout, tree);
 	return TRUE;
 }
 
diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c
index 91cf54a768..f674ed06a9 100644
--- a/finch/libgnt/gntwm.c
+++ b/finch/libgnt/gntwm.c
@@ -135,6 +135,17 @@ gnt_wm_copy_win(GntWidget *widget, GntNode *node)
 	src = widget->window;
 	dst = node->window;
 	copywin(src, dst, node->scroll, 0, 0, 0, getmaxy(dst) - 1, getmaxx(dst) - 1, 0);
+
+	/* Update the hardware cursor */
+	if (GNT_IS_WINDOW(widget) || GNT_IS_BOX(widget)) {
+		GntWidget *active = GNT_BOX(widget)->active;
+		if (active) {
+			int curx = active->priv.x + getcurx(active->window);
+			int cury = active->priv.y + getcury(active->window);
+			if (wmove(node->window, cury - widget->priv.y, curx - widget->priv.x) != OK)
+				wmove(node->window, 0, 0);
+		}
+	}
 }
 
 /**
@@ -397,7 +408,7 @@ gnt_wm_init(GTypeInstance *instance, gpointer class)
 	wm->positions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 	if (gnt_style_get_bool(GNT_STYLE_REMPOS, TRUE))
 		read_window_positions(wm);
-	g_timeout_add(IDLE_CHECK_INTERVAL * 1000, check_idle, NULL);
+	g_timeout_add_seconds(IDLE_CHECK_INTERVAL, check_idle, NULL);
 	time(&last_active_time);
 	gnt_wm_switch_workspace(wm, 0);
 }
@@ -1101,8 +1112,8 @@ refresh_screen(GntBindable *bindable, GList *null)
 
 	g_hash_table_foreach(wm->nodes, (GHFunc)refresh_node, GINT_TO_POINTER(TRUE));
 	g_signal_emit(wm, signals[SIG_TERMINAL_REFRESH], 0);
-	update_screen(wm);
 	gnt_ws_draw_taskbar(wm->cws, TRUE);
+	update_screen(wm);
 	curs_set(0);   /* endwin resets the cursor to normal */
 
 	return TRUE;
@@ -1872,8 +1883,8 @@ void gnt_wm_new_window(GntWM *wm, GntWidget *widget)
 		}
 	}
 
-	update_screen(wm);
 	gnt_ws_draw_taskbar(wm->cws, FALSE);
+	update_screen(wm);
 }
 
 void gnt_wm_window_decorate(GntWM *wm, GntWidget *widget)
@@ -1885,6 +1896,7 @@ void gnt_wm_window_close(GntWM *wm, GntWidget *widget)
 {
 	GntWS *s;
 	int pos;
+	gboolean transient = !!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_TRANSIENT);
 
 	s = gnt_wm_widget_find_workspace(wm, widget);
 
@@ -1908,10 +1920,12 @@ void gnt_wm_window_close(GntWM *wm, GntWidget *widget)
 			if (s->ordered && wm->cws == s)
 				gnt_wm_raise_window(wm, s->ordered->data);
 		}
+	} else if (transient && wm->cws && wm->cws->ordered) {
+		gnt_wm_update_window(wm, wm->cws->ordered->data);
 	}
 
-	update_screen(wm);
 	gnt_ws_draw_taskbar(wm->cws, FALSE);
+	update_screen(wm);
 }
 
 time_t gnt_wm_get_idle_time()
@@ -2119,7 +2133,7 @@ write_positions_to_file(GntWM *wm)
 	if (write_timeout) {
 		g_source_remove(write_timeout);
 	}
-	write_timeout = g_timeout_add(10000, write_already, wm);
+	write_timeout = g_timeout_add_seconds(10, write_already, wm);
 }
 
 void gnt_wm_move_window(GntWM *wm, GntWidget *widget, int x, int y)
@@ -2181,8 +2195,8 @@ gnt_wm_give_focus(GntWM *wm, GntWidget *widget)
 		GntNode *nd = g_hash_table_lookup(wm->nodes, wm->_list.window);
 		top_panel(nd->panel);
 	}
-	update_screen(wm);
 	gnt_ws_draw_taskbar(wm->cws, FALSE);
+	update_screen(wm);
 }
 
 void gnt_wm_update_window(GntWM *wm, GntWidget *widget)
@@ -2207,8 +2221,8 @@ void gnt_wm_update_window(GntWM *wm, GntWidget *widget)
 
 	if (ws == wm->cws || GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_TRANSIENT)) {
 		gnt_wm_copy_win(widget, node);
-		update_screen(wm);
 		gnt_ws_draw_taskbar(wm->cws, FALSE);
+		update_screen(wm);
 	} else if (ws && ws != wm->cws && GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_URGENT)) {
 		if (!act || (act && !g_list_find(act, ws)))
 			act = g_list_prepend(act, ws);
diff --git a/finch/plugins/Makefile.am b/finch/plugins/Makefile.am
index d733357c76..9258ae1706 100644
--- a/finch/plugins/Makefile.am
+++ b/finch/plugins/Makefile.am
@@ -2,6 +2,7 @@ gntclipboard_la_LDFLAGS = -module -avoid-version
 gntgf_la_LDFLAGS      = -module -avoid-version
 gnthistory_la_LDFLAGS = -module -avoid-version
 gntlastlog_la_LDFLAGS = -module -avoid-version
+gnttinyurl_la_LDFLAGS = -module -avoid-version
 grouping_la_LDFLAGS   = -module -avoid-version
 
 if PLUGINS
@@ -11,6 +12,7 @@ plugin_LTLIBRARIES = \
 	gntgf.la \
 	gnthistory.la \
 	gntlastlog.la \
+	gnttinyurl.la \
 	grouping.la
 
 plugindir = $(libdir)/finch
@@ -19,6 +21,7 @@ gntclipboard_la_SOURCES = gntclipboard.c
 gntgf_la_SOURCES      = gntgf.c
 gnthistory_la_SOURCES = gnthistory.c
 gntlastlog_la_SOURCES = lastlog.c
+gnttinyurl_la_SOURCES = gnttinyurl.c
 grouping_la_SOURCES   = grouping.c
 
 gntclipboard_la_CFLAGS = $(X11_CFLAGS)
@@ -28,6 +31,7 @@ gntclipboard_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
 gntgf_la_LIBADD       = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
 gnthistory_la_LIBADD  = $(GLIB_LIBS)
 gntlastlog_la_LIBADD  = $(GLIB_LIBS)
+gnttinyurl_la_LIBADD  = $(GLIB_LIBS)
 grouping_la_LIBADD    = $(GLIB_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
 
 endif # PLUGINS
@@ -55,5 +59,5 @@ SUFFIXES = .c .so
 	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
 	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
 	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
-	@cp .libs/libtmp$@.so* $@
-	@rm -f .libs/libtmp$@.*
+	@cp .libs/libtmp$@.so.so $@
+	@rm -rf .libs/libtmp$@.*
diff --git a/finch/plugins/gntgf.c b/finch/plugins/gntgf.c
index f2e34cbbeb..1fea87003f 100644
--- a/finch/plugins/gntgf.c
+++ b/finch/plugins/gntgf.c
@@ -47,6 +47,7 @@
 #include <blist.h>
 #include <conversation.h>
 #include <debug.h>
+#include <eventloop.h>
 #include <util.h>
 
 #include <gnt.h>
@@ -75,7 +76,7 @@ destroy_toaster(GntToast *toast)
 {
 	toasters = g_list_remove(toasters, toast);
 	gnt_widget_destroy(toast->window);
-	g_source_remove(toast->timer);
+	purple_timeout_remove(toast->timer);
 	g_free(toast);
 }
 
@@ -220,7 +221,7 @@ notify(PurpleConversation *conv, const char *fmt, ...)
 	}
 	gnt_widget_draw(window);
 
-	toast->timer = g_timeout_add(4000, (GSourceFunc)remove_toaster, toast);
+	toast->timer = purple_timeout_add_seconds(4, (GSourceFunc)remove_toaster, toast);
 	toasters = g_list_prepend(toasters, toast);
 }
 
diff --git a/finch/plugins/gnthistory.c b/finch/plugins/gnthistory.c
index 60128d491e..68303be145 100644
--- a/finch/plugins/gnthistory.c
+++ b/finch/plugins/gnthistory.c
@@ -31,6 +31,7 @@
 #include "util.h"
 #include "version.h"
 
+#include "gntconv.h"
 #include "gntplugin.h"
 #include "gntrequest.h"
 
@@ -54,6 +55,9 @@ static void historize(PurpleConversation *c)
 	if (convtype == PURPLE_CONV_TYPE_IM) {
 		GSList *buddies;
 		GSList *cur;
+		FinchConv *fc = FINCH_CONV(c);
+		if (fc->list && fc->list->next) /* We were already in the middle of a conversation. */
+			return;
 
 		/* If we're not logging, don't show anything.
 		 * Otherwise, we might show a very old log. */
diff --git a/finch/plugins/gnttinyurl.c b/finch/plugins/gnttinyurl.c
new file mode 100644
index 0000000000..553d3120df
--- /dev/null
+++ b/finch/plugins/gnttinyurl.c
@@ -0,0 +1,418 @@
+/**
+ * @file gnttinyurl.c
+ *
+ * Copyright (C) 2009 Richard Nelson <wabz@whatsbeef.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+
+#include "internal.h"
+#include <glib.h>
+
+#define PLUGIN_STATIC_NAME	TinyURL
+#define PREFS_BASE          "/plugins/gnt/tinyurl"
+#define PREF_LENGTH  PREFS_BASE "/length"
+#define PREF_URL  PREFS_BASE "/url"
+
+
+#include <conversation.h>
+#include <signals.h>
+
+#include <glib.h>
+
+#include <plugin.h>
+#include <version.h>
+#include <debug.h>
+#include <notify.h>
+
+#include <gntconv.h>
+
+#include <gntplugin.h>
+#include <gnttextview.h>
+
+static int tag_num = 0;
+
+typedef struct
+{
+	PurpleConversation *conv;
+	gchar *tag;
+	int num;
+} CbInfo;
+
+/* 3 functions from util.c */
+static gboolean
+badchar(char c)
+{
+	switch (c) {
+	case ' ':
+	case ',':
+	case '\0':
+	case '\n':
+	case '\r':
+	case '<':
+	case '>':
+	case '"':
+	case '\'':
+		return TRUE;
+	default:
+		return FALSE;
+	}
+}
+
+static gboolean
+badentity(const char *c)
+{
+	if (!g_ascii_strncasecmp(c, "&lt;", 4) ||
+		!g_ascii_strncasecmp(c, "&gt;", 4) ||
+		!g_ascii_strncasecmp(c, "&quot;", 6)) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static GList *extract_urls(char *text) {
+	const char *t, *c, *q = NULL;
+	char *url_buf;
+	GList *ret = NULL;
+	gboolean inside_html = FALSE;
+	int inside_paren = 0;
+	c = text;
+	while (*c) {
+		if (*c == '(' && !inside_html) {
+			inside_paren++;
+			c++;
+		}
+		if (inside_html) {
+			if (*c == '>') {
+				inside_html = FALSE;
+			} else if (!q && (*c == '\"' || *c == '\'')) {
+				q = c;
+			} else if(q) {
+				if(*c == *q)
+					q = NULL;
+			}
+		} else if (*c == '<') {
+			inside_html = TRUE;
+			if (!g_ascii_strncasecmp(c, "<A", 2)) {
+				while (1) {
+					if (*c == '>') {
+						inside_html = FALSE;
+						break;
+					}
+					c++;
+					if (!(*c))
+						break;
+				}
+			}
+		} else if ((*c=='h') && (!g_ascii_strncasecmp(c, "http://", 7) ||
+					(!g_ascii_strncasecmp(c, "https://", 8)))) {
+			t = c;
+			while (1) {
+				if (badchar(*t) || badentity(t)) {
+
+					if ((!g_ascii_strncasecmp(c, "http://", 7) && (t - c == 7)) ||
+						(!g_ascii_strncasecmp(c, "https://", 8) && (t - c == 8))) {
+						break;
+					}
+
+					if (*(t) == ',' && (*(t + 1) != ' ')) {
+						t++;
+						continue;
+					}
+
+					if (*(t - 1) == '.')
+						t--;
+					if ((*(t - 1) == ')' && (inside_paren > 0))) {
+						t--;
+					}
+
+					url_buf = g_strndup(c, t - c);
+					if (!g_list_find_custom(ret, url_buf, (GCompareFunc)strcmp)) {
+						purple_debug_info("TinyURL", "Added URL %s\n", url_buf);
+						ret = g_list_append(ret, g_strdup(url_buf));
+					}
+					c = t;
+					break;
+				}
+				t++;
+
+			}
+		} else if (!g_ascii_strncasecmp(c, "www.", 4) && (c == text || badchar(c[-1]) || badentity(c-1))) {
+			if (c[4] != '.') {
+				t = c;
+				while (1) {
+					if (badchar(*t) || badentity(t)) {
+						if (t - c == 4) {
+							break;
+						}
+
+						if (*(t) == ',' && (*(t + 1) != ' ')) {
+							t++;
+							continue;
+						}
+
+						if (*(t - 1) == '.')
+							t--;
+						if ((*(t - 1) == ')' && (inside_paren > 0))) {
+							t--;
+						}
+						url_buf = g_strndup(c, t - c);
+						if (!g_list_find_custom(ret, url_buf, (GCompareFunc)strcmp)) {
+							purple_debug_info("TinyURL", "Added URL %s\n", url_buf);
+							ret = g_list_append(ret, url_buf);
+						}
+						c = t;
+						break;
+					}
+					t++;
+				}
+			}
+		}
+		if (*c == ')' && !inside_html) {
+			inside_paren--;
+			c++;
+		}
+		if (*c == 0)
+			break;
+		c++;
+	}
+	return ret;
+}
+
+static void url_fetched(PurpleUtilFetchUrlData *url_data, gpointer cb_data,
+				const gchar *url_text, gsize len, const gchar *error_message)
+{
+	CbInfo *data = (CbInfo *)cb_data;
+	PurpleConversation *conv = data->conv;
+	GList *convs = purple_get_conversations();
+	/* ensure the conversation still exists */
+	for (; convs; convs = convs->next) {
+		if ((PurpleConversation *)(convs->data) == conv) {
+			FinchConv *fconv = FINCH_CONV(conv);
+			gchar *str = g_strdup_printf("[%d] %s", data->num, url_text);
+			GntTextView *tv = GNT_TEXT_VIEW(fconv->tv);
+			gnt_text_view_tag_change(tv, data->tag, str, FALSE);
+			g_free(str);
+			g_free(data->tag);
+			return;
+		}
+	}
+	g_free(data->tag);
+	purple_debug_info("TinyURL", "Conversation no longer exists... :(\n");
+}
+
+static void free_urls(gpointer data, gpointer null)
+{
+	g_free(data);
+}
+
+static gboolean receiving_msg(PurpleAccount *account, char **sender, char **message,
+				PurpleConversation *conv, PurpleMessageFlags *flags) {
+	GString *t;
+	GList *iter, *urls;
+	int c = 0;
+
+	if (!(*flags & PURPLE_MESSAGE_RECV) || *flags & PURPLE_MESSAGE_INVISIBLE)
+		return FALSE;
+
+	urls = purple_conversation_get_data(conv, "TinyURLs");
+	if (urls != NULL) /* message was cancelled somewhere? Reset. */
+		g_list_foreach(urls, free_urls, NULL);
+	g_list_free(urls);
+	urls = extract_urls(*message);
+	if (!urls)
+		return FALSE;
+
+	t = g_string_new(*message);
+	g_free(*message);
+	for (iter = urls; iter; iter = iter->next) {
+		if (g_utf8_strlen((char *)iter->data, -1) >= purple_prefs_get_int(PREF_LENGTH)) {
+			int pos, x = 0;
+			gchar *j, *s, *str, *orig;
+			glong len = g_utf8_strlen(iter->data, -1);
+			s = g_strdup(t->str);
+			orig = s;
+			str = g_strdup_printf("[%d]", ++c);
+			while ((j = strstr(s, iter->data))) { /* replace all occurrences */
+				pos = j - orig + (x++ * 3);
+				s = j + len;
+				t = g_string_insert(t, pos + len, str);
+				if (*s == '\0') break;
+			}
+			g_free(orig);
+			g_free(str);
+			continue;
+		} else {
+			if (iter->prev) {
+				iter = iter->prev;
+				g_free(iter->next->data);
+				urls = g_list_delete_link(urls, iter->next);
+			} else {
+				g_free(iter->data);
+				g_list_free(urls);
+				urls = NULL;
+			}
+		}
+	}
+	*message = t->str;
+	g_string_free(t, FALSE);
+	if (conv == NULL)
+		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, *sender);
+	purple_conversation_set_data(conv, "TinyURLs", urls);
+	return FALSE;
+}
+
+static void received_msg(PurpleAccount *account, char *sender, char *message,
+				PurpleConversation *conv, PurpleMessageFlags flags) {
+	int c;
+	GList *urls, *iter;
+	FinchConv *fconv = FINCH_CONV(conv);
+	GntTextView *tv = GNT_TEXT_VIEW(fconv->tv);
+
+	urls = purple_conversation_get_data(conv, "TinyURLs");
+	if (!(flags & PURPLE_MESSAGE_RECV) || urls == NULL)
+		return;
+
+	for (iter = urls, c = 0; iter; iter = iter->next) {
+		int i;
+		CbInfo *cbdata;
+		gchar *url, *str, *tmp;
+		cbdata = g_new(CbInfo, 1);
+		cbdata->num = ++c;
+		cbdata->tag = g_strdup_printf("%s%d", "tiny_", tag_num++);
+		cbdata->conv = conv;
+		tmp = purple_unescape_html((char *)iter->data);
+		if (g_ascii_strncasecmp(tmp, "http://", 7) && g_ascii_strncasecmp(tmp, "https://", 8)) {
+			url = g_strdup_printf("%shttp%%3A%%2F%%2F%s", purple_prefs_get_string(PREF_URL), purple_url_encode(tmp));
+		} else {
+			url = g_strdup_printf("%s%s", purple_prefs_get_string(PREF_URL), purple_url_encode(tmp));
+		}
+		g_free(tmp);
+		purple_util_fetch_url(url, TRUE, "finch", FALSE, url_fetched, cbdata);
+		i = gnt_text_view_get_lines_below(tv);
+		str = g_strdup_printf(_("\nFetching TinyURL..."));
+		gnt_text_view_append_text_with_tag((tv), str, GNT_TEXT_FLAG_DIM, cbdata->tag);
+		g_free(str);
+		if (i == 0)
+			gnt_text_view_scroll(tv, 0);
+		g_free(iter->data);
+		g_free(url);
+	}
+	g_list_free(urls);
+	purple_conversation_set_data(conv, "TinyURLs", NULL);
+}
+
+static void
+free_conv_urls(PurpleConversation *conv)
+{
+	GList *urls = purple_conversation_get_data(conv, "TinyURLs");
+	if (urls)
+		g_list_foreach(urls, free_urls, NULL);
+	g_list_free(urls);
+}
+
+static gboolean
+plugin_load(PurplePlugin *plugin) {
+	purple_signal_connect(purple_conversations_get_handle(),
+			"wrote-im-msg",
+			plugin, PURPLE_CALLBACK(received_msg), NULL);
+	purple_signal_connect(purple_conversations_get_handle(),
+			"wrote-chat-msg",
+			plugin, PURPLE_CALLBACK(received_msg), NULL);
+	purple_signal_connect(purple_conversations_get_handle(),
+			"receiving-im-msg",
+			plugin, PURPLE_CALLBACK(receiving_msg), NULL);
+	purple_signal_connect(purple_conversations_get_handle(),
+			"receiving-chat-msg",
+			plugin, PURPLE_CALLBACK(receiving_msg), NULL);
+	purple_signal_connect(purple_conversations_get_handle(),
+			"deleting-conversation",
+			plugin, PURPLE_CALLBACK(free_conv_urls), NULL);
+
+	return TRUE;
+}
+
+static PurplePluginPrefFrame *
+get_plugin_pref_frame(PurplePlugin *plugin) {
+
+  PurplePluginPrefFrame *frame;
+  PurplePluginPref *pref;
+
+  frame = purple_plugin_pref_frame_new();
+
+  pref = purple_plugin_pref_new_with_name(PREF_LENGTH);
+  purple_plugin_pref_set_label(pref, _("Only create TinyURL for URLs"
+				     " of this length or greater"));
+  purple_plugin_pref_frame_add(frame, pref);
+  pref = purple_plugin_pref_new_with_name(PREF_URL);
+  purple_plugin_pref_set_label(pref, _("TinyURL (or other) address prefix"));
+  purple_plugin_pref_frame_add(frame, pref);
+
+  return frame;
+}
+
+static PurplePluginUiInfo prefs_info = {
+  get_plugin_pref_frame,
+  0,    /* page_num (Reserved) */
+  NULL, /* frame (Reserved) */
+
+  /* padding */
+  NULL,
+  NULL,
+  NULL,
+  NULL
+};
+
+static PurplePluginInfo info =
+{
+	PURPLE_PLUGIN_MAGIC,
+	PURPLE_MAJOR_VERSION,
+	PURPLE_MINOR_VERSION,
+	PURPLE_PLUGIN_STANDARD,
+	FINCH_PLUGIN_TYPE,
+	0,
+	NULL,
+	PURPLE_PRIORITY_DEFAULT,
+	"TinyURL",
+	N_("TinyURL"),
+	DISPLAY_VERSION,
+	N_("TinyURL plugin"),
+	N_("When receiving a message with URL(s), use TinyURL for easier copying"),
+	"Richard Nelson <wabz@whatsbeef.net>",
+	PURPLE_WEBSITE,
+	plugin_load,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	&prefs_info,            /**< prefs_info */
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static void
+init_plugin(PurplePlugin *plugin) {
+  purple_prefs_add_none(PREFS_BASE);
+  purple_prefs_add_int(PREF_LENGTH, 30);
+  purple_prefs_add_string(PREF_URL, "http://tinyurl.com/api-create.php?url=");
+}
+
+PURPLE_INIT_PLUGIN(PLUGIN_STATIC_NAME, init_plugin, info)
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
index ced412c40e..54fc19ec81 100644
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -1,6 +1,8 @@
 EXTRA_DIST = \
 		dbus-analyze-functions.py \
+		dbus-analyze-signals.py \
 		dbus-analyze-types.py \
+		marshallers.list \
 		purple-notifications-example \
 		purple-remote \
 		purple-send \
@@ -51,6 +53,8 @@ purple_coresources = \
 	idle.c \
 	imgstore.c \
 	log.c \
+	media.c \
+	mediamanager.c \
 	mime.c \
 	nat-pmp.c \
 	network.c \
@@ -88,6 +92,9 @@ purple_coresources = \
 	xmlnode.c \
 	whiteboard.c
 
+purple_builtsources = \
+	marshallers.c
+
 purple_coreheaders = \
 	account.h \
 	accountopt.h \
@@ -109,6 +116,9 @@ purple_coreheaders = \
 	idle.h \
 	imgstore.h \
 	log.h \
+	media.h \
+	media-gst.h \
+	mediamanager.h \
 	mime.h \
 	nat-pmp.h \
 	network.h \
@@ -141,11 +151,21 @@ purple_coreheaders = \
 	theme-manager.h \
 	upnp.h \
 	util.h \
+	valgrind.h \
 	value.h \
 	xmlnode.h \
 	whiteboard.h
 
-purple_builtheaders = purple.h version.h
+purple_builtheaders = purple.h version.h marshallers.h
+
+marshallers.h: marshallers.list
+	@echo "Generating marshallers.h"
+	$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --header > marshallers.h
+
+marshallers.c: marshallers.list marshallers.h
+	@echo "Generating marshallers.c"
+	echo "#include \"marshallers.h\"" > marshallers.c
+	$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c
 
 if ENABLE_DBUS
 
@@ -153,8 +173,11 @@ CLEANFILES = \
 	dbus-bindings.c \
 	dbus-client-binding.c \
 	dbus-client-binding.h \
+	dbus-signals.c \
 	dbus-types.c \
 	dbus-types.h \
+	marshallers.c \
+	marshallers.h \
 	purple-client-bindings.c \
 	purple-client-bindings.h \
 	purple.service
@@ -171,6 +194,10 @@ dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h buddyicon.h \
 purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \
 		$(purple_builtheaders)
 dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
+# We should probably make this better
+dbus_signals = $(addprefix $(srcdir)/, $(purple_coresources)) \
+	$(srcdir)/protocols/irc/irc.c \
+	$(srcdir)/protocols/jabber/libxmpp.c
 
 dbus-types.c: dbus-analyze-types.py $(purple_build_coreheaders)
 	cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) > $@
@@ -181,8 +208,11 @@ dbus-types.h: dbus-analyze-types.py $(purple_build_coreheaders)
 dbus-bindings.c: dbus-analyze-functions.py $(dbus_exported)
 	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py > $@
 
-dbus-server.$(OBJEXT): dbus-bindings.c dbus-types.c dbus-types.h
-dbus-server.lo: dbus-bindings.c dbus-types.c dbus-types.h
+dbus-signals.c: dbus-analyze-signals.py $(dbus_signals)
+	cat $(dbus_signals) | $(PYTHON) $(srcdir)/dbus-analyze-signals.py > $@
+
+dbus-server.$(OBJEXT): dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
+dbus-server.lo: dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
 $(libpurple_la_OBJECTS): dbus-types.h
 
 # libpurple-client
@@ -222,15 +252,17 @@ purple-client-example.$(OBJEXT): purple-client-bindings.h
 bin_SCRIPTS = purple-remote purple-send purple-send-async purple-url-handler
 
 BUILT_SOURCES = $(purple_builtheaders) \
+	$(purple_builtsources) \
+	dbus-bindings.c \
+	dbus-signals.c \
 	dbus-types.c \
 	dbus-types.h \
-	dbus-bindings.c \
 	purple-client-bindings.c \
 	purple-client-bindings.h
 
 else
 
-BUILT_SOURCES = $(purple_builtheaders)
+BUILT_SOURCES = $(purple_builtheaders) $(purple_builtsources)
 
 endif
 
@@ -238,10 +270,12 @@ lib_LTLIBRARIES = libpurple.la $(libpurple_client_lib)
 
 libpurple_la_SOURCES = \
 	$(purple_coresources) \
+	$(purple_builtsources) \
 	$(dbus_sources)
 
 noinst_HEADERS= \
-	internal.h 
+	internal.h \
+	valgrind.h
 
 libpurpleincludedir=$(includedir)/libpurple
 libpurpleinclude_HEADERS = \
@@ -258,6 +292,10 @@ libpurple_la_LIBADD = \
 	$(LIBXML_LIBS) \
 	$(NETWORKMANAGER_LIBS) \
 	$(INTLLIBS) \
+	$(FARSIGHT_LIBS) \
+	$(GSTREAMER_LIBS) \
+	$(GSTINTERFACES_LIBS) \
+	$(IDN_LIBS) \
 	-lm
 
 AM_CPPFLAGS = \
@@ -270,6 +308,10 @@ AM_CPPFLAGS = \
 	$(DEBUG_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(LIBXML_CFLAGS) \
+	$(FARSIGHT_CFLAGS) \
+	$(GSTREAMER_CFLAGS) \
+	$(GSTINTERFACES_CFLAGS) \
+	$(IDN_CFLAGS) \
 	$(NETWORKMANAGER_CFLAGS)
 
 # INSTALL_SSL_CERTIFICATES is true when SSL_CERTIFICATES_DIR is empty.
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
index 952048c699..8b2b550ca7 100644
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -35,6 +35,7 @@ C_SRC =	\
 			buddyicon.c \
 			certificate.c \
 			cipher.c \
+			circbuffer.c \
 			cmds.c \
 			connection.c \
 			conversation.c \
@@ -44,10 +45,11 @@ C_SRC =	\
 			dnssrv.c \
 			eventloop.c \
 			ft.c \
-			circbuffer.c \
 			idle.c \
 			imgstore.c \
 			log.c \
+			media.c \
+			mediamanager.c \
 			mime.c \
 			nat-pmp.c \
 			network.c \
@@ -66,22 +68,22 @@ C_SRC =	\
 			server.c \
 			signals.c \
 			smiley.c \
-			sound.c \
-			sound-theme.c \
 			sound-theme-loader.c \
+			sound-theme.c \
+			sound.c \
 			sslconn.c \
 			status.c \
 			stringref.c \
 			stun.c \
-			theme.c \
 			theme-loader.c \
 			theme-manager.c \
+			theme.c \
 			upnp.c \
 			util.c \
 			value.c \
 			version.c \
-			xmlnode.c \
 			whiteboard.c \
+			xmlnode.c \
 			win32/giowin32.c \
 			win32/libc_interface.c \
 			win32/win32dep.c
diff --git a/libpurple/account.c b/libpurple/account.c
index 0777fb4474..a8c32ed88e 100644
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -99,7 +99,7 @@ setting_to_xmlnode(gpointer key, gpointer value, gpointer user_data)
 	const char *name;
 	PurpleAccountSetting *setting;
 	xmlnode *node, *child;
-	char buf[20];
+	char buf[21];
 
 	name    = (const char *)key;
 	setting = (PurpleAccountSetting *)value;
@@ -110,7 +110,7 @@ setting_to_xmlnode(gpointer key, gpointer value, gpointer user_data)
 
 	if (setting->type == PURPLE_PREF_INT) {
 		xmlnode_set_attrib(child, "type", "int");
-		snprintf(buf, sizeof(buf), "%d", setting->value.integer);
+		g_snprintf(buf, sizeof(buf), "%d", setting->value.integer);
 		xmlnode_insert_data(child, buf, -1);
 	}
 	else if (setting->type == PURPLE_PREF_STRING && setting->value.string != NULL) {
@@ -119,7 +119,7 @@ setting_to_xmlnode(gpointer key, gpointer value, gpointer user_data)
 	}
 	else if (setting->type == PURPLE_PREF_BOOLEAN) {
 		xmlnode_set_attrib(child, "type", "bool");
-		snprintf(buf, sizeof(buf), "%d", setting->value.boolean);
+		g_snprintf(buf, sizeof(buf), "%d", setting->value.boolean);
 		xmlnode_insert_data(child, buf, -1);
 	}
 }
@@ -281,7 +281,7 @@ proxy_settings_to_xmlnode(PurpleProxyInfo *proxy_info)
 	PurpleProxyType proxy_type;
 	const char *value;
 	int int_value;
-	char buf[20];
+	char buf[21];
 
 	proxy_type = purple_proxy_info_get_type(proxy_info);
 
@@ -304,7 +304,7 @@ proxy_settings_to_xmlnode(PurpleProxyInfo *proxy_info)
 
 	if ((int_value = purple_proxy_info_get_port(proxy_info)) != 0)
 	{
-		snprintf(buf, sizeof(buf), "%d", int_value);
+		g_snprintf(buf, sizeof(buf), "%d", int_value);
 		child = xmlnode_new_child(node, "port");
 		xmlnode_insert_data(child, buf, -1);
 	}
@@ -342,7 +342,7 @@ current_error_to_xmlnode(PurpleConnectionErrorInfo *err)
 		return node;
 
 	child = xmlnode_new_child(node, "type");
-	snprintf(type_str, sizeof(type_str), "%u", err->type);
+	g_snprintf(type_str, sizeof(type_str), "%u", err->type);
 	xmlnode_insert_data(child, type_str, -1);
 
 	child = xmlnode_new_child(node, "description");
@@ -481,6 +481,36 @@ schedule_accounts_save(void)
 /*********************************************************************
  * Reading from disk                                                 *
  *********************************************************************/
+static void
+migrate_yahoo_japan(PurpleAccount *account)
+{
+	/* detect a Yahoo! JAPAN account that existed prior to 2.6.0 and convert it
+	 * to use the new prpl-yahoojp.  Also remove the account-specific settings
+	 * we no longer need */
+
+	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoo")) {
+		if(purple_account_get_bool(account, "yahoojp", FALSE)) {
+			const char *serverjp = purple_account_get_string(account, "serverjp", NULL);
+			const char *xferjp_host = purple_account_get_string(account, "xferjp_host", NULL);
+
+			g_return_if_fail(serverjp != NULL);
+			g_return_if_fail(xferjp_host != NULL);
+
+			purple_account_set_string(account, "server", serverjp);
+			purple_account_set_string(account, "xfer_host", xferjp_host);
+
+			purple_account_set_protocol_id(account, "prpl-yahoojp");
+		}
+
+		/* these should always be nuked */
+		purple_account_remove_setting(account, "yahoojp");
+		purple_account_remove_setting(account, "serverjp");
+		purple_account_remove_setting(account, "xferjp_host");
+
+	}
+
+	return;
+}
 
 static void
 parse_settings(xmlnode *node, PurpleAccount *account)
@@ -545,6 +575,10 @@ parse_settings(xmlnode *node, PurpleAccount *account)
 
 		g_free(data);
 	}
+
+	/* we do this here because we need access to account settings to determine
+	 * if we can/should migrate an old Yahoo! JAPAN account */
+	migrate_yahoo_japan(account);
 }
 
 static GList *
@@ -954,6 +988,8 @@ purple_account_new(const char *username, const char *protocol_id)
 	/* 0 is not a valid privacy setting */
 	account->perm_deny = PURPLE_PRIVACY_ALLOW_ALL;
 
+	purple_signal_emit(purple_accounts_get_handle(), "account-created", account);
+
 	prpl = purple_find_prpl(protocol_id);
 
 	if (prpl == NULL)
@@ -987,6 +1023,7 @@ purple_account_destroy(PurpleAccount *account)
 	g_return_if_fail(account != NULL);
 
 	purple_debug_info("account", "Destroying account %p\n", account);
+	purple_signal_emit(purple_accounts_get_handle(), "account-destroying", account);
 
 	for (l = purple_get_conversations(); l != NULL; l = l->next)
 	{
@@ -1129,29 +1166,32 @@ void
 purple_account_connect(PurpleAccount *account)
 {
 	PurplePlugin *prpl;
+	const char *password, *username;
 	PurplePluginProtocolInfo *prpl_info;
-	const char *password;
 
 	g_return_if_fail(account != NULL);
 
-	purple_debug_info("account", "Connecting to account %s\n",
-					purple_account_get_username(account));
+	username = purple_account_get_username(account);
 
-	if (!purple_account_get_enabled(account, purple_core_get_ui()))
+	if (!purple_account_get_enabled(account, purple_core_get_ui())) {
+		purple_debug_info("account",
+				  "Account %s not enabled, not connecting.\n",
+				  username);
 		return;
+	}
 
 	prpl = purple_find_prpl(purple_account_get_protocol_id(account));
-	if (prpl == NULL)
-	{
+	if (prpl == NULL) {
 		gchar *message;
 
-		message = g_strdup_printf(_("Missing protocol plugin for %s"),
-			purple_account_get_username(account));
+		message = g_strdup_printf(_("Missing protocol plugin for %s"), username);
 		purple_notify_error(account, _("Connection Error"), message, NULL);
 		g_free(message);
 		return;
 	}
 
+	purple_debug_info("account", "Connecting to account %s.\n", username);
+
 	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
 	password = purple_account_get_password(account);
 	if ((password == NULL) &&
@@ -1494,6 +1534,8 @@ purple_account_request_change_user_info(PurpleAccount *account)
 void
 purple_account_set_username(PurpleAccount *account, const char *username)
 {
+	PurpleBlistUiOps *blist_ops;
+
 	g_return_if_fail(account != NULL);
 
 	g_free(account->username);
@@ -1503,7 +1545,9 @@ purple_account_set_username(PurpleAccount *account, const char *username)
 
 	/* if the name changes, we should re-write the buddy list
 	 * to disk with the new name */
-	purple_blist_schedule_save();
+	blist_ops = purple_blist_get_ui_ops();
+	if (blist_ops != NULL && blist_ops->save_account != NULL)
+		blist_ops->save_account(account);
 }
 
 void
@@ -1722,6 +1766,15 @@ purple_account_clear_settings(PurpleAccount *account)
 }
 
 void
+purple_account_remove_setting(PurpleAccount *account, const char *setting)
+{
+	g_return_if_fail(account != NULL);
+	g_return_if_fail(setting != NULL);
+
+	g_hash_table_remove(account->settings, setting);
+}
+
+void
 purple_account_set_int(PurpleAccount *account, const char *name, int value)
 {
 	PurpleAccountSetting *setting;
@@ -2657,7 +2710,7 @@ purple_accounts_restore_current_statuses()
 	/* If we're not connected to the Internet right now, we bail on this */
 	if (!purple_network_is_available())
 	{
-		purple_debug_info("account", "Network not connected; skipping reconnect\n");
+		purple_debug_warning("account", "Network not connected; skipping reconnect\n");
 		return;
 	}
 
@@ -2725,6 +2778,14 @@ purple_accounts_init(void)
 										PURPLE_SUBTYPE_ACCOUNT),
 						 purple_value_new(PURPLE_TYPE_STRING));
 
+	purple_signal_register(handle, "account-created",
+						 purple_marshal_VOID__POINTER, NULL, 1,
+						 purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_ACCOUNT));
+
+	purple_signal_register(handle, "account-destroying",
+						 purple_marshal_VOID__POINTER, NULL, 1,
+						 purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_ACCOUNT));
+
 	purple_signal_register(handle, "account-added",
 						 purple_marshal_VOID__POINTER, NULL, 1,
 						 purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_ACCOUNT));
@@ -2742,6 +2803,10 @@ purple_accounts_init(void)
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_STATUS));
 
+	purple_signal_register(handle, "account-actions-changed",
+						 purple_marshal_VOID__POINTER, NULL, 1,
+						 purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_ACCOUNT));
+
 	purple_signal_register(handle, "account-alias-changed",
 						 purple_marshal_VOID__POINTER_POINTER, NULL, 2,
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
@@ -2795,6 +2860,9 @@ purple_accounts_uninit(void)
 		sync_accounts();
 	}
 
+	for (; accounts; accounts = g_list_delete_link(accounts, accounts))
+		purple_account_destroy(accounts->data);
+
 	purple_signals_disconnect_by_handle(handle);
 	purple_signals_unregister_by_instance(handle);
 }
diff --git a/libpurple/account.h b/libpurple/account.h
index 7c6bfe9282..433aa1c71c 100644
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -42,6 +42,7 @@ typedef void (*PurpleAccountUnregistrationCb)(PurpleAccount *account, gboolean s
 
 #include "connection.h"
 #include "log.h"
+#include "privacy.h"
 #include "proxy.h"
 #include "prpl.h"
 #include "status.h"
@@ -141,7 +142,7 @@ struct _PurpleAccount
 	 */
 	GSList *permit;             /**< Permit list.                           */
 	GSList *deny;               /**< Deny list.                             */
-	int perm_deny;              /**< The permit/deny setting.               */
+	PurplePrivacyType perm_deny;  /**< The permit/deny setting.               */
 
 	GList *status_types;        /**< Status types.                          */
 
@@ -458,6 +459,16 @@ void purple_account_set_status_list(PurpleAccount *account,
 void purple_account_clear_settings(PurpleAccount *account);
 
 /**
+ * Removes an account-specific setting by name.
+ *
+ * @param account The account.
+ * @param setting The setting to remove.
+ *
+ * @since 2.6.0
+ */
+void purple_account_remove_setting(PurpleAccount *account, const char *setting);
+
+/**
  * Sets a protocol-specific integer setting for an account.
  *
  * @param account The account.
diff --git a/libpurple/accountopt.c b/libpurple/accountopt.c
index 92e12f88a2..726f385f5e 100644
--- a/libpurple/accountopt.c
+++ b/libpurple/accountopt.c
@@ -111,6 +111,16 @@ purple_account_option_list_new(const char *text, const char *pref_name,
 	return option;
 }
 
+static void
+purple_account_option_list_free(gpointer data, gpointer user_data)
+{
+	PurpleKeyValuePair *kvp = data;
+
+	g_free(kvp->value);
+	g_free(kvp->key);
+	g_free(kvp);
+}
+
 void
 purple_account_option_destroy(PurpleAccountOption *option)
 {
@@ -127,7 +137,7 @@ purple_account_option_destroy(PurpleAccountOption *option)
 	{
 		if (option->default_value.list != NULL)
 		{
-			g_list_foreach(option->default_value.list, (GFunc)g_free, NULL);
+			g_list_foreach(option->default_value.list, purple_account_option_list_free, NULL);
 			g_list_free(option->default_value.list);
 		}
 	}
@@ -183,7 +193,7 @@ purple_account_option_set_list(PurpleAccountOption *option, GList *values)
 
 	if (option->default_value.list != NULL)
 	{
-		g_list_foreach(option->default_value.list, (GFunc)g_free, NULL);
+		g_list_foreach(option->default_value.list, purple_account_option_list_free, NULL);
 		g_list_free(option->default_value.list);
 	}
 
diff --git a/libpurple/blist.c b/libpurple/blist.c
index 171c1bb19d..53179acb3b 100644
--- a/libpurple/blist.c
+++ b/libpurple/blist.c
@@ -40,6 +40,20 @@
 static PurpleBlistUiOps *blist_ui_ops = NULL;
 
 static PurpleBuddyList *purplebuddylist = NULL;
+
+/**
+ * A hash table used for efficient lookups of buddies by name.
+ * PurpleAccount* => GHashTable*, with the inner hash table being
+ * struct _purple_hbuddy => PurpleBuddy*
+ */
+static GHashTable *buddies_cache = NULL;
+
+/**
+ * A hash table used for efficient lookups of groups by name.
+ * UTF-8 collate-key => PurpleGroup*.
+ */
+static GHashTable *groups_cache = NULL;
+
 static guint          save_timer = 0;
 static gboolean       blist_loaded = FALSE;
 
@@ -75,14 +89,18 @@ struct _purple_hbuddy {
 	PurpleBlistNode *group;
 };
 
+/* This function must not use purple_normalize */
 static guint _purple_blist_hbuddy_hash(struct _purple_hbuddy *hb)
 {
-	return g_str_hash(hb->name);
+	return g_str_hash(hb->name) ^ g_direct_hash(hb->group) ^ g_direct_hash(hb->account);
 }
 
+/* This function must not use purple_normalize */
 static guint _purple_blist_hbuddy_equal(struct _purple_hbuddy *hb1, struct _purple_hbuddy *hb2)
 {
-	return (purple_strequal(hb1->name, hb2->name) && hb1->account == hb2->account && hb1->group == hb2->group);
+	return (hb1->group == hb2->group &&
+	        hb1->account == hb2->account &&
+	        g_str_equal(hb1->name, hb2->name));
 }
 
 static void _purple_blist_hbuddy_free_key(struct _purple_hbuddy *hb)
@@ -91,6 +109,21 @@ static void _purple_blist_hbuddy_free_key(struct _purple_hbuddy *hb)
 	g_free(hb);
 }
 
+static void
+purple_blist_buddies_cache_add_account(PurpleAccount *account)
+{
+	GHashTable *account_buddies = g_hash_table_new_full((GHashFunc)_purple_blist_hbuddy_hash,
+						(GEqualFunc)_purple_blist_hbuddy_equal,
+						(GDestroyNotify)_purple_blist_hbuddy_free_key, NULL);
+	g_hash_table_insert(buddies_cache, account, account_buddies);
+}
+
+static void
+purple_blist_buddies_cache_remove_account(const PurpleAccount *account)
+{
+	g_hash_table_remove(buddies_cache, account);
+}
+
 
 /*********************************************************************
  * Writing to disk                                                   *
@@ -102,7 +135,7 @@ value_to_xmlnode(gpointer key, gpointer hvalue, gpointer user_data)
 	const char *name;
 	PurpleValue *value;
 	xmlnode *node, *child;
-	char buf[20];
+	char buf[21];
 
 	name    = (const char *)key;
 	value   = (PurpleValue *)hvalue;
@@ -115,7 +148,7 @@ value_to_xmlnode(gpointer key, gpointer hvalue, gpointer user_data)
 
 	if (purple_value_get_type(value) == PURPLE_TYPE_INT) {
 		xmlnode_set_attrib(child, "type", "int");
-		snprintf(buf, sizeof(buf), "%d", purple_value_get_int(value));
+		g_snprintf(buf, sizeof(buf), "%d", purple_value_get_int(value));
 		xmlnode_insert_data(child, buf, -1);
 	}
 	else if (purple_value_get_type(value) == PURPLE_TYPE_STRING) {
@@ -124,7 +157,7 @@ value_to_xmlnode(gpointer key, gpointer hvalue, gpointer user_data)
 	}
 	else if (purple_value_get_type(value) == PURPLE_TYPE_BOOLEAN) {
 		xmlnode_set_attrib(child, "type", "bool");
-		snprintf(buf, sizeof(buf), "%d", purple_value_get_boolean(value));
+		g_snprintf(buf, sizeof(buf), "%d", purple_value_get_boolean(value));
 		xmlnode_insert_data(child, buf, -1);
 	}
 }
@@ -280,7 +313,7 @@ accountprivacy_to_xmlnode(PurpleAccount *account)
 	node = xmlnode_new("account");
 	xmlnode_set_attrib(node, "proto", purple_account_get_protocol_id(account));
 	xmlnode_set_attrib(node, "name", purple_account_get_username(account));
-	snprintf(buf, sizeof(buf), "%d", account->perm_deny);
+	g_snprintf(buf, sizeof(buf), "%d", account->perm_deny);
 	xmlnode_set_attrib(node, "mode", buf);
 
 	for (cur = account->permit; cur; cur = cur->next)
@@ -360,13 +393,42 @@ save_cb(gpointer data)
 	return FALSE;
 }
 
-void
-purple_blist_schedule_save()
+static void
+_purple_blist_schedule_save()
 {
 	if (save_timer == 0)
 		save_timer = purple_timeout_add_seconds(5, save_cb, NULL);
 }
 
+static void
+purple_blist_save_account(PurpleAccount *account)
+{
+#if 1
+	_purple_blist_schedule_save();
+#else
+	if (account != NULL) {
+		/* Save the buddies and privacy data for this account */
+	} else {
+		/* Save all buddies and privacy data */
+	}
+#endif
+}
+
+static void
+purple_blist_save_node(PurpleBlistNode *node)
+{
+	_purple_blist_schedule_save();
+}
+
+void purple_blist_schedule_save()
+{
+	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+
+	/* Save everything */
+	if (ops && ops->save_account)
+		ops->save_account(NULL);
+}
+
 
 /*********************************************************************
  * Reading from disk                                                 *
@@ -666,6 +728,7 @@ purple_contact_compute_priority_buddy(PurpleContact *contact)
 PurpleBuddyList *purple_blist_new()
 {
 	PurpleBlistUiOps *ui_ops;
+	GList *account;
 	PurpleBuddyList *gbl = g_new0(PurpleBuddyList, 1);
 	PURPLE_DBUS_REGISTER_POINTER(gbl, PurpleBuddyList);
 
@@ -675,6 +738,18 @@ PurpleBuddyList *purple_blist_new()
 					 (GEqualFunc)_purple_blist_hbuddy_equal,
 					 (GDestroyNotify)_purple_blist_hbuddy_free_key, NULL);
 
+	buddies_cache = g_hash_table_new_full(g_direct_hash, g_direct_equal,
+					 NULL, (GDestroyNotify)g_hash_table_destroy);
+
+	groups_cache = g_hash_table_new_full((GHashFunc)g_str_hash,
+					 (GEqualFunc)g_str_equal,
+					 (GDestroyNotify)g_free, NULL);
+
+	for (account = purple_accounts_get_all(); account != NULL; account = account->next)
+	{
+		purple_blist_buddies_cache_add_account(account->data);
+	}
+
 	if (ui_ops != NULL && ui_ops->new_list != NULL)
 		ui_ops->new_list(gbl);
 
@@ -699,10 +774,23 @@ purple_blist_get_root()
 	return purplebuddylist ? purplebuddylist->root : NULL;
 }
 
-GHashTable *
+static void
+append_buddy(gpointer key, gpointer value, gpointer user_data)
+{
+	GSList **list = user_data;
+	*list = g_slist_prepend(*list, value);
+}
+
+GSList *
 purple_blist_get_buddies()
 {
-	return purplebuddylist ? purplebuddylist->buddies : NULL;
+	GSList *buddies = NULL;
+
+	if (!purplebuddylist)
+		return NULL;
+
+	g_hash_table_foreach(purplebuddylist->buddies, append_buddy, &buddies);
+	return buddies;
 }
 
 void *
@@ -885,24 +973,35 @@ purple_blist_update_buddy_icon(PurpleBuddy *buddy)
 void purple_blist_rename_buddy(PurpleBuddy *buddy, const char *name)
 {
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
-	struct _purple_hbuddy *hb;
+	struct _purple_hbuddy *hb, *hb2;
+	GHashTable *account_buddies;
 
 	g_return_if_fail(buddy != NULL);
 
 	hb = g_new(struct _purple_hbuddy, 1);
-	hb->name = g_strdup(purple_normalize(buddy->account, buddy->name));
+	hb->name = (gchar *)purple_normalize(buddy->account, buddy->name);
 	hb->account = buddy->account;
 	hb->group = ((PurpleBlistNode *)buddy)->parent->parent;
 	g_hash_table_remove(purplebuddylist->buddies, hb);
 
-	g_free(hb->name);
+	account_buddies = g_hash_table_lookup(buddies_cache, buddy->account);
+	g_hash_table_remove(account_buddies, hb);
+
 	hb->name = g_strdup(purple_normalize(buddy->account, name));
 	g_hash_table_replace(purplebuddylist->buddies, hb, buddy);
 
+	hb2 = g_new(struct _purple_hbuddy, 1);
+	hb2->name = g_strdup(hb->name);
+	hb2->account = buddy->account;
+	hb2->group = ((PurpleBlistNode *)buddy)->parent->parent;
+
+	g_hash_table_replace(account_buddies, hb2, buddy);
+
 	g_free(buddy->name);
 	buddy->name = g_strdup(name);
 
-	purple_blist_schedule_save();
+	if (ops && ops->save_node)
+		ops->save_node((PurpleBlistNode *) buddy);
 
 	if (ops && ops->update)
 		ops->update(purplebuddylist, (PurpleBlistNode *)buddy);
@@ -921,20 +1020,29 @@ void purple_blist_alias_contact(PurpleContact *contact, const char *alias)
 	PurpleConversation *conv;
 	PurpleBlistNode *bnode;
 	char *old_alias;
+	char *new_alias = NULL;
 
 	g_return_if_fail(contact != NULL);
 
-	if (!purple_strings_are_different(contact->alias, alias))
+	if ((alias != NULL) && (*alias != '\0'))
+		new_alias = purple_utf8_strip_unprintables(alias);
+
+	if (!purple_strings_are_different(contact->alias, new_alias)) {
+		g_free(new_alias);
 		return;
+	}
 
 	old_alias = contact->alias;
 
-	if ((alias != NULL) && (*alias != '\0'))
-		contact->alias = g_strdup(alias);
-	else
+	if ((new_alias != NULL) && (*new_alias != '\0'))
+		contact->alias = new_alias;
+	else {
 		contact->alias = NULL;
+		g_free(new_alias); /* could be "\0" */
+	}
 
-	purple_blist_schedule_save();
+	if (ops && ops->save_node)
+		ops->save_node((PurpleBlistNode*) contact);
 
 	if (ops && ops->update)
 		ops->update(purplebuddylist, (PurpleBlistNode *)contact);
@@ -958,20 +1066,29 @@ void purple_blist_alias_chat(PurpleChat *chat, const char *alias)
 {
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	char *old_alias;
+	char *new_alias = NULL;
 
 	g_return_if_fail(chat != NULL);
 
-	if (!purple_strings_are_different(chat->alias, alias))
+	if ((alias != NULL) && (*alias != '\0'))
+		new_alias = purple_utf8_strip_unprintables(alias);
+
+	if (!purple_strings_are_different(chat->alias, new_alias)) {
+		g_free(new_alias);
 		return;
+	}
 
 	old_alias = chat->alias;
 
-	if ((alias != NULL) && (*alias != '\0'))
-		chat->alias = g_strdup(alias);
-	else
+	if ((new_alias != NULL) && (*new_alias != '\0'))
+		chat->alias = new_alias;
+	else {
 		chat->alias = NULL;
+		g_free(new_alias); /* could be "\0" */
+	}
 
-	purple_blist_schedule_save();
+	if (ops && ops->save_node)
+		ops->save_node((PurpleBlistNode*) chat);
 
 	if (ops && ops->update)
 		ops->update(purplebuddylist, (PurpleBlistNode *)chat);
@@ -986,20 +1103,29 @@ void purple_blist_alias_buddy(PurpleBuddy *buddy, const char *alias)
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleConversation *conv;
 	char *old_alias;
+	char *new_alias = NULL;
 
 	g_return_if_fail(buddy != NULL);
 
-	if (!purple_strings_are_different(buddy->alias, alias))
+	if ((alias != NULL) && (*alias != '\0'))
+		new_alias = purple_utf8_strip_unprintables(alias);
+
+	if (!purple_strings_are_different(buddy->alias, new_alias)) {
+		g_free(new_alias);
 		return;
+	}
 
 	old_alias = buddy->alias;
 
-	if ((alias != NULL) && (*alias != '\0'))
+	if ((new_alias != NULL) && (*new_alias != '\0'))
 		buddy->alias = g_strdup(alias);
-	else
+	else {
 		buddy->alias = NULL;
+		g_free(new_alias); /* could be "\0" */
+	}
 
-	purple_blist_schedule_save();
+	if (ops && ops->save_node)
+		ops->save_node((PurpleBlistNode*) buddy);
 
 	if (ops && ops->update)
 		ops->update(purplebuddylist, (PurpleBlistNode *)buddy);
@@ -1019,20 +1145,29 @@ void purple_blist_server_alias_buddy(PurpleBuddy *buddy, const char *alias)
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleConversation *conv;
 	char *old_alias;
+	char *new_alias = NULL;
 
 	g_return_if_fail(buddy != NULL);
 
-	if (!purple_strings_are_different(buddy->server_alias, alias))
+	if ((alias != NULL) && (*alias != '\0') && g_utf8_validate(alias, -1, NULL))
+		new_alias = purple_utf8_strip_unprintables(alias);
+
+	if (!purple_strings_are_different(buddy->server_alias, new_alias)) {
+		g_free(new_alias);
 		return;
+	}
 
 	old_alias = buddy->server_alias;
 
-	if ((alias != NULL) && (*alias != '\0') && g_utf8_validate(alias, -1, NULL))
-		buddy->server_alias = g_strdup(alias);
-	else
+	if ((new_alias != NULL) && (*new_alias != '\0'))
+		buddy->server_alias = new_alias;
+	else {
 		buddy->server_alias = NULL;
+		g_free(new_alias); /* could be "\0"; */
+	}
 
-	purple_blist_schedule_save();
+	if (ops && ops->save_node)
+		ops->save_node((PurpleBlistNode*) buddy);
 
 	if (ops && ops->update)
 		ops->update(purplebuddylist, (PurpleBlistNode *)buddy);
@@ -1050,19 +1185,24 @@ void purple_blist_server_alias_buddy(PurpleBuddy *buddy, const char *alias)
 /*
  * TODO: If merging, prompt the user if they want to merge.
  */
-void purple_blist_rename_group(PurpleGroup *source, const char *new_name)
+void purple_blist_rename_group(PurpleGroup *source, const char *name)
 {
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleGroup *dest;
 	gchar *old_name;
+	gchar *new_name;
 	GList *moved_buddies = NULL;
 	GSList *accts;
 
 	g_return_if_fail(source != NULL);
-	g_return_if_fail(new_name != NULL);
+	g_return_if_fail(name != NULL);
 
-	if (*new_name == '\0' || purple_strequal(new_name, source->name))
+	new_name = purple_utf8_strip_unprintables(name);
+
+	if (*new_name == '\0' || purple_strequal(new_name, source->name)) {
+		g_free(new_name);
 		return;
+	}
 
 	dest = purple_find_group(new_name);
 	if (dest != NULL && purple_utf8_strcasecmp(source->name, dest->name) != 0) {
@@ -1104,9 +1244,11 @@ void purple_blist_rename_group(PurpleGroup *source, const char *new_name)
 		old_name = g_strdup(source->name);
 		purple_blist_remove_group(source);
 		source = dest;
+		g_free(new_name);
 	} else {
 		/* A simple rename */
 		PurpleBlistNode *cnode, *bnode;
+		gchar* key;
 
 		/* Build a GList of all buddies in this group */
 		for (cnode = ((PurpleBlistNode *)source)->child; cnode != NULL; cnode = cnode->next) {
@@ -1116,11 +1258,19 @@ void purple_blist_rename_group(PurpleGroup *source, const char *new_name)
 		}
 
 		old_name = source->name;
-		source->name = g_strdup(new_name);
+		source->name = new_name;
+
+		key = g_utf8_collate_key(old_name, -1);
+		g_hash_table_remove(groups_cache, key);
+		g_free(key);
+
+		key = g_utf8_collate_key(new_name, -1);
+		g_hash_table_insert(groups_cache, key, source);
 	}
 
 	/* Save our changes */
-	purple_blist_schedule_save();
+	if (ops && ops->save_node)
+		ops->save_node((PurpleBlistNode*) source);
 
 	/* Update the UI */
 	if (ops && ops->update)
@@ -1128,7 +1278,7 @@ void purple_blist_rename_group(PurpleGroup *source, const char *new_name)
 
 	/* Notify all PRPLs */
 	/* TODO: Is this condition needed?  Seems like it would always be TRUE */
-	if(old_name && purple_strequal(source->name, old_name)) {
+	if(old_name && !purple_strequal(source->name, old_name)) {
 		for (accts = purple_group_get_accounts(source); accts; accts = g_slist_remove(accts, accts->data)) {
 			PurpleAccount *account = accts->data;
 			PurpleConnection *gc = NULL;
@@ -1184,13 +1334,13 @@ PurpleChat *purple_chat_new(PurpleAccount *account, const char *alias, GHashTabl
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleChat *chat;
 
-	g_return_val_if_fail(account != NULL, FALSE);
-	g_return_val_if_fail(components != NULL, FALSE);
+	g_return_val_if_fail(account != NULL, NULL);
+	g_return_val_if_fail(components != NULL, NULL);
 
 	chat = g_new0(PurpleChat, 1);
 	chat->account = account;
 	if ((alias != NULL) && (*alias != '\0'))
-		chat->alias = g_strdup(alias);
+		chat->alias = purple_utf8_strip_unprintables(alias);
 	chat->components = components;
 	purple_blist_node_initialize_settings((PurpleBlistNode *)chat);
 	((PurpleBlistNode *)chat)->type = PURPLE_BLIST_CHAT_NODE;
@@ -1202,18 +1352,28 @@ PurpleChat *purple_chat_new(PurpleAccount *account, const char *alias, GHashTabl
 	return chat;
 }
 
+void
+purple_chat_destroy(PurpleChat *chat)
+{
+	g_hash_table_destroy(chat->components);
+	g_hash_table_destroy(chat->node.settings);
+	g_free(chat->alias);
+	PURPLE_DBUS_UNREGISTER_POINTER(chat);
+	g_free(chat);
+}
+
 PurpleBuddy *purple_buddy_new(PurpleAccount *account, const char *name, const char *alias)
 {
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleBuddy *buddy;
 
-	g_return_val_if_fail(account != NULL, FALSE);
-	g_return_val_if_fail(name != NULL, FALSE);
+	g_return_val_if_fail(account != NULL, NULL);
+	g_return_val_if_fail(name != NULL, NULL);
 
 	buddy = g_new0(PurpleBuddy, 1);
 	buddy->account  = account;
-	buddy->name     = g_strdup(name);
-	buddy->alias    = g_strdup(alias);
+	buddy->name     = purple_utf8_strip_unprintables(name);
+	buddy->alias    = purple_utf8_strip_unprintables(alias);
 	buddy->presence = purple_presence_new_for_buddy(buddy);
 	((PurpleBlistNode *)buddy)->type = PURPLE_BLIST_BUDDY_NODE;
 
@@ -1229,6 +1389,42 @@ PurpleBuddy *purple_buddy_new(PurpleAccount *account, const char *name, const ch
 }
 
 void
+purple_buddy_destroy(PurpleBuddy *buddy)
+{
+	PurplePlugin *prpl;
+	PurplePluginProtocolInfo *prpl_info;
+
+	/*
+	 * Tell the owner PRPL that we're about to free the buddy so it
+	 * can free proto_data
+	 */
+	prpl = purple_find_prpl(purple_account_get_protocol_id(buddy->account));
+	if (prpl) {
+		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+		if (prpl_info && prpl_info->buddy_free)
+			prpl_info->buddy_free(buddy);
+	}
+
+	/* Delete the node */
+	purple_buddy_icon_unref(buddy->icon);
+	g_hash_table_destroy(buddy->node.settings);
+	purple_presence_destroy(buddy->presence);
+	g_free(buddy->name);
+	g_free(buddy->alias);
+	g_free(buddy->server_alias);
+
+	PURPLE_DBUS_UNREGISTER_POINTER(buddy);
+	g_free(buddy);
+
+	/* FIXME: Once PurpleBuddy is a GObject, timeout callbacks can
+	 * g_object_ref() it when connecting the callback and
+	 * g_object_unref() it in the handler.  That way, it won't
+	 * get freed while the timeout is pending and this line can
+	 * be removed. */
+	while (g_source_remove_by_user_data((gpointer *)buddy));
+}
+
+void
 purple_buddy_set_icon(PurpleBuddy *buddy, PurpleBuddyIcon *icon)
 {
 	g_return_if_fail(buddy != NULL);
@@ -1332,8 +1528,6 @@ void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBlistNode
 		 * reinitialize it */
 		if (ops && ops->new_node)
 			ops->new_node(cnode);
-
-		purple_blist_schedule_save();
 	}
 
 	if (node != NULL) {
@@ -1362,10 +1556,14 @@ void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBlistNode
 		}
 	}
 
-	purple_blist_schedule_save();
+	if (ops && ops->save_node)
+		ops->save_node(cnode);
 
 	if (ops && ops->update)
 		ops->update(purplebuddylist, (PurpleBlistNode *)cnode);
+
+	purple_signal_emit(purple_blist_get_handle(), "blist-node-added",
+			cnode);
 }
 
 void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node)
@@ -1374,7 +1572,8 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
 	PurpleGroup *g;
 	PurpleContact *c;
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
-	struct _purple_hbuddy *hb;
+	struct _purple_hbuddy *hb, *hb2;
+	GHashTable *account_buddies;
 
 	g_return_if_fail(buddy != NULL);
 	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY((PurpleBlistNode*)buddy));
@@ -1436,16 +1635,15 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
 		if (ops && ops->remove)
 			ops->remove(purplebuddylist, bnode);
 
-		purple_blist_schedule_save();
-
 		if (bnode->parent->parent != (PurpleBlistNode*)g) {
-			hb = g_new(struct _purple_hbuddy, 1);
-			hb->name = g_strdup(purple_normalize(buddy->account, buddy->name));
-			hb->account = buddy->account;
-			hb->group = bnode->parent->parent;
-			g_hash_table_remove(purplebuddylist->buddies, hb);
-			g_free(hb->name);
-			g_free(hb);
+			struct _purple_hbuddy hb;
+			hb.name = (gchar *)purple_normalize(buddy->account, buddy->name);
+			hb.account = buddy->account;
+			hb.group = bnode->parent->parent;
+			g_hash_table_remove(purplebuddylist->buddies, &hb);
+
+			account_buddies = g_hash_table_lookup(buddies_cache, buddy->account);
+			g_hash_table_remove(account_buddies, &hb);
 		}
 
 		if (!bnode->parent->child) {
@@ -1490,15 +1688,28 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
 
 	g_hash_table_replace(purplebuddylist->buddies, hb, buddy);
 
+	account_buddies = g_hash_table_lookup(buddies_cache, buddy->account);
+
+	hb2 = g_new(struct _purple_hbuddy, 1);
+	hb2->name = g_strdup(hb->name);
+	hb2->account = buddy->account;
+	hb2->group = ((PurpleBlistNode*)buddy)->parent->parent;
+
+	g_hash_table_replace(account_buddies, hb2, buddy);
+
 	purple_contact_invalidate_priority_buddy(purple_buddy_get_contact(buddy));
 
-	purple_blist_schedule_save();
+	if (ops && ops->save_node)
+		ops->save_node((PurpleBlistNode*) buddy);
 
 	if (ops && ops->update)
 		ops->update(purplebuddylist, (PurpleBlistNode*)buddy);
 
 	/* Signal that the buddy has been added */
 	purple_signal_emit(purple_blist_get_handle(), "buddy-added", buddy);
+
+	purple_signal_emit(purple_blist_get_handle(), "blist-node-added",
+			PURPLE_BLIST_NODE(buddy));
 }
 
 PurpleContact *purple_contact_new()
@@ -1519,6 +1730,15 @@ PurpleContact *purple_contact_new()
 	return contact;
 }
 
+void
+purple_contact_destroy(PurpleContact *contact)
+{
+	g_hash_table_destroy(contact->node.settings);
+	g_free(contact->alias);
+	PURPLE_DBUS_UNREGISTER_POINTER(contact);
+	g_free(contact);
+}
+
 void purple_contact_set_alias(PurpleContact *contact, const char *alias)
 {
 	purple_blist_alias_contact(contact,alias);
@@ -1574,7 +1794,7 @@ PurpleGroup *purple_group_new(const char *name)
 		return group;
 
 	group = g_new0(PurpleGroup, 1);
-	group->name = g_strdup(name);
+	group->name = purple_utf8_strip_unprintables(name);
 	group->totalsize = 0;
 	group->currentsize = 0;
 	group->online = 0;
@@ -1588,6 +1808,15 @@ PurpleGroup *purple_group_new(const char *name)
 	return group;
 }
 
+void
+purple_group_destroy(PurpleGroup *group)
+{
+	g_hash_table_destroy(group->node.settings);
+	g_free(group->name);
+	PURPLE_DBUS_UNREGISTER_POINTER(group);
+	g_free(group);
+}
+
 void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node)
 {
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
@@ -1630,18 +1859,31 @@ void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, Purple
 			while (bnode) {
 				PurpleBlistNode *next_bnode = bnode->next;
 				PurpleBuddy *b = (PurpleBuddy*)bnode;
+				GHashTable *account_buddies;
 
-				struct _purple_hbuddy *hb = g_new(struct _purple_hbuddy, 1);
+				struct _purple_hbuddy *hb, *hb2;
+
+				hb = g_new(struct _purple_hbuddy, 1);
 				hb->name = g_strdup(purple_normalize(b->account, b->name));
 				hb->account = b->account;
 				hb->group = cnode->parent;
 
 				g_hash_table_remove(purplebuddylist->buddies, hb);
 
+				account_buddies = g_hash_table_lookup(buddies_cache, b->account);
+				g_hash_table_remove(account_buddies, hb);
+
 				if (!purple_find_buddy_in_group(b->account, b->name, g)) {
 					hb->group = gnode;
 					g_hash_table_replace(purplebuddylist->buddies, hb, b);
 
+					hb2 = g_new(struct _purple_hbuddy, 1);
+					hb2->name = g_strdup(hb->name);
+					hb2->account = b->account;
+					hb2->group = gnode;
+
+					g_hash_table_replace(account_buddies, hb2, b);
+
 					if (purple_account_get_connection(b->account))
 						serv_move_buddy(b, (PurpleGroup *)cnode->parent, g);
 				} else {
@@ -1677,7 +1919,8 @@ void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, Purple
 		if (ops && ops->remove)
 			ops->remove(purplebuddylist, cnode);
 
-		purple_blist_schedule_save();
+		if (ops && ops->remove_node)
+			ops->remove_node(cnode);
 	}
 
 	if (node && (PURPLE_BLIST_NODE_IS_CONTACT(node) ||
@@ -1703,7 +1946,13 @@ void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, Purple
 		g->currentsize++;
 	g->totalsize++;
 
-	purple_blist_schedule_save();
+	if (ops && ops->save_node)
+	{
+		if (cnode->child)
+			ops->save_node(cnode);
+		for (bnode = cnode->child; bnode; bnode = bnode->next)
+			ops->save_node(bnode);
+	}
 
 	if (ops && ops->update)
 	{
@@ -1718,7 +1967,6 @@ void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, Purple
 void purple_blist_merge_contact(PurpleContact *source, PurpleBlistNode *node)
 {
 	PurpleBlistNode *sourcenode = (PurpleBlistNode*)source;
-	PurpleBlistNode *targetnode;
 	PurpleBlistNode *prev, *cur, *next;
 	PurpleContact *target;
 
@@ -1738,7 +1986,6 @@ void purple_blist_merge_contact(PurpleContact *source, PurpleBlistNode *node)
 	if (source == target || !target)
 		return;
 
-	targetnode = (PurpleBlistNode *)target;
 	next = sourcenode->child;
 
 	while (next) {
@@ -1755,6 +2002,7 @@ void purple_blist_add_group(PurpleGroup *group, PurpleBlistNode *node)
 {
 	PurpleBlistUiOps *ops;
 	PurpleBlistNode *gnode = (PurpleBlistNode*)group;
+	gchar* key;
 
 	g_return_if_fail(group != NULL);
 	g_return_if_fail(PURPLE_BLIST_NODE_IS_GROUP((PurpleBlistNode *)group));
@@ -1763,6 +2011,9 @@ void purple_blist_add_group(PurpleGroup *group, PurpleBlistNode *node)
 
 	if (!purplebuddylist->root) {
 		purplebuddylist->root = gnode;
+
+		key = g_utf8_collate_key(group->name, -1);
+		g_hash_table_insert(groups_cache, key, group);
 		return;
 	}
 
@@ -1782,6 +2033,9 @@ void purple_blist_add_group(PurpleGroup *group, PurpleBlistNode *node)
 			gnode->prev->next = gnode->next;
 		if (gnode->next)
 			gnode->next->prev = gnode->prev;
+	} else {
+		key = g_utf8_collate_key(group->name, -1);
+		g_hash_table_insert(groups_cache, key, group);
 	}
 
 	if (node && PURPLE_BLIST_NODE_IS_GROUP(node)) {
@@ -1798,13 +2052,20 @@ void purple_blist_add_group(PurpleGroup *group, PurpleBlistNode *node)
 		purplebuddylist->root = gnode;
 	}
 
-	purple_blist_schedule_save();
+	if (ops && ops->save_node) {
+		ops->save_node(gnode);
+		for (node = gnode->child; node; node = node->next)
+			ops->save_node(node);
+	}
 
 	if (ops && ops->update) {
 		ops->update(purplebuddylist, gnode);
 		for (node = gnode->child; node; node = node->next)
 			ops->update(purplebuddylist, node);
 	}
+
+	purple_signal_emit(purple_blist_get_handle(), "blist-node-added",
+			gnode);
 }
 
 void purple_blist_remove_contact(PurpleContact *contact)
@@ -1841,16 +2102,18 @@ void purple_blist_remove_contact(PurpleContact *contact)
 		if (node->next)
 			node->next->prev = node->prev;
 
-		purple_blist_schedule_save();
-
 		/* Update the UI */
 		if (ops && ops->remove)
 			ops->remove(purplebuddylist, node);
 
+		if (ops && ops->remove_node)
+			ops->remove_node(node);
+
+		purple_signal_emit(purple_blist_get_handle(), "blist-node-removed",
+				PURPLE_BLIST_NODE(contact));
+
 		/* Delete the node */
-		g_hash_table_destroy(contact->node.settings);
-		PURPLE_DBUS_UNREGISTER_POINTER(contact);
-		g_free(contact);
+		purple_contact_destroy(contact);
 	}
 }
 
@@ -1861,8 +2124,7 @@ void purple_blist_remove_buddy(PurpleBuddy *buddy)
 	PurpleContact *contact;
 	PurpleGroup *group;
 	struct _purple_hbuddy hb;
-	PurplePlugin *prpl;
-	PurplePluginProtocolInfo *prpl_info = NULL;
+	GHashTable *account_buddies;
 
 	g_return_if_fail(buddy != NULL);
 
@@ -1902,49 +2164,29 @@ void purple_blist_remove_buddy(PurpleBuddy *buddy)
 		}
 	}
 
-	purple_blist_schedule_save();
-
 	/* Remove this buddy from the buddies hash table */
-	hb.name = g_strdup(purple_normalize(buddy->account, buddy->name));
+	hb.name = (gchar *)purple_normalize(buddy->account, buddy->name);
 	hb.account = buddy->account;
 	hb.group = gnode;
 	g_hash_table_remove(purplebuddylist->buddies, &hb);
-	g_free(hb.name);
+
+	account_buddies = g_hash_table_lookup(buddies_cache, buddy->account);
+	g_hash_table_remove(account_buddies, &hb);
 
 	/* Update the UI */
 	if (ops && ops->remove)
 		ops->remove(purplebuddylist, node);
 
+	if (ops && ops->remove_node)
+		ops->remove_node(node);
+
 	/* Signal that the buddy has been removed before freeing the memory for it */
 	purple_signal_emit(purple_blist_get_handle(), "buddy-removed", buddy);
 
-	/*
-	 * Tell the owner PRPL that we're about to free the buddy so it
-	 * can free proto_data
-	 */
-	prpl = purple_find_prpl(purple_account_get_protocol_id(buddy->account));
-	if (prpl)
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
-	if (prpl_info && prpl_info->buddy_free)
-		prpl_info->buddy_free(buddy);
+	purple_signal_emit(purple_blist_get_handle(), "blist-node-removed",
+			PURPLE_BLIST_NODE(buddy));
 
-	/* Delete the node */
-	purple_buddy_icon_unref(buddy->icon);
-	g_hash_table_destroy(buddy->node.settings);
-	purple_presence_destroy(buddy->presence);
-	g_free(buddy->name);
-	g_free(buddy->alias);
-	g_free(buddy->server_alias);
-
-	PURPLE_DBUS_UNREGISTER_POINTER(buddy);
-	g_free(buddy);
-
-	/* FIXME: Once PurpleBuddy is a GObject, timeout callbacks can
-	 * g_object_ref() it when connecting the callback and
-	 * g_object_unref() it in the handler.  That way, it won't
-	 * get freed while the timeout is pending and this line can
-	 * be removed. */
-	while (g_source_remove_by_user_data((gpointer *)buddy));
+	purple_buddy_destroy(buddy);
 
 	/* If the contact is empty then remove it */
 	if ((contact != NULL) && !cnode->child)
@@ -1980,19 +2222,20 @@ void purple_blist_remove_chat(PurpleChat *chat)
 		}
 		group->totalsize--;
 
-		purple_blist_schedule_save();
 	}
 
 	/* Update the UI */
 	if (ops && ops->remove)
 		ops->remove(purplebuddylist, node);
 
+	if (ops && ops->remove_node)
+		ops->remove_node(node);
+
+	purple_signal_emit(purple_blist_get_handle(), "blist-node-removed",
+			PURPLE_BLIST_NODE(chat));
+
 	/* Delete the node */
-	g_hash_table_destroy(chat->components);
-	g_hash_table_destroy(chat->node.settings);
-	g_free(chat->alias);
-	PURPLE_DBUS_UNREGISTER_POINTER(chat);
-	g_free(chat);
+	purple_chat_destroy(chat);
 }
 
 void purple_blist_remove_group(PurpleGroup *group)
@@ -2000,6 +2243,7 @@ void purple_blist_remove_group(PurpleGroup *group)
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
 	PurpleBlistNode *node;
 	GList *l;
+	gchar* key;
 
 	g_return_if_fail(group != NULL);
 
@@ -2017,12 +2261,20 @@ void purple_blist_remove_group(PurpleGroup *group)
 	if (node->next)
 		node->next->prev = node->prev;
 
-	purple_blist_schedule_save();
+	key = g_utf8_collate_key(group->name, -1);
+	g_hash_table_remove(groups_cache, key);
+	g_free(key);
 
 	/* Update the UI */
 	if (ops && ops->remove)
 		ops->remove(purplebuddylist, node);
 
+	if (ops && ops->remove_node)
+		ops->remove_node(node);
+
+	purple_signal_emit(purple_blist_get_handle(), "blist-node-removed",
+			PURPLE_BLIST_NODE(group));
+
 	/* Remove the group from all accounts that are online */
 	for (l = purple_connections_get_all(); l != NULL; l = l->next)
 	{
@@ -2033,10 +2285,7 @@ void purple_blist_remove_group(PurpleGroup *group)
 	}
 
 	/* Delete the node */
-	g_hash_table_destroy(group->node.settings);
-	g_free(group->name);
-	PURPLE_DBUS_UNREGISTER_POINTER(group);
-	g_free(group);
+	purple_group_destroy(group);
 }
 
 PurpleBuddy *purple_contact_get_priority_buddy(PurpleContact *contact)
@@ -2180,16 +2429,17 @@ PurpleBuddy *purple_find_buddy(PurpleAccount *account, const char *name)
 	g_return_val_if_fail((name != NULL) && (*name != '\0'), NULL);
 
 	hb.account = account;
-	hb.name = g_strdup(purple_normalize(account, name));
+	hb.name = (gchar *)purple_normalize(account, name);
 
 	for (group = purplebuddylist->root; group; group = group->next) {
+		if (!group->child)
+			continue;
+
 		hb.group = group;
 		if ((buddy = g_hash_table_lookup(purplebuddylist->buddies, &hb))) {
-			g_free(hb.name);
 			return buddy;
 		}
 	}
-	g_free(hb.name);
 
 	return NULL;
 }
@@ -2198,31 +2448,24 @@ PurpleBuddy *purple_find_buddy_in_group(PurpleAccount *account, const char *name
 		PurpleGroup *group)
 {
 	struct _purple_hbuddy hb;
-	PurpleBuddy *ret;
 
 	g_return_val_if_fail(purplebuddylist != NULL, NULL);
 	g_return_val_if_fail(account != NULL, NULL);
 	g_return_val_if_fail((name != NULL) && (*name != '\0'), NULL);
 
-	hb.name = g_strdup(purple_normalize(account, name));
+	hb.name = (gchar *)purple_normalize(account, name);
 	hb.account = account;
 	hb.group = (PurpleBlistNode*)group;
 
-	ret = g_hash_table_lookup(purplebuddylist->buddies, &hb);
-	g_free(hb.name);
-
-	return ret;
+	return g_hash_table_lookup(purplebuddylist->buddies, &hb);
 }
 
 static void find_acct_buddies(gpointer key, gpointer value, gpointer data)
 {
-	struct _purple_hbuddy *hb = key;
 	PurpleBuddy *buddy = value;
-	struct _list_account_buddies *ab = data;
+	GSList **list = data;
 
-	if (hb->account == ab->account) {
-		ab->list = g_slist_prepend(ab->list, buddy);
-	}
+	*list = g_slist_prepend(*list, buddy);
 }
 
 GSList *purple_find_buddies(PurpleAccount *account, const char *name)
@@ -2234,25 +2477,25 @@ GSList *purple_find_buddies(PurpleAccount *account, const char *name)
 	g_return_val_if_fail(purplebuddylist != NULL, NULL);
 	g_return_val_if_fail(account != NULL, NULL);
 
-
 	if ((name != NULL) && (*name != '\0')) {
 		struct _purple_hbuddy hb;
 
-		hb.name = g_strdup(purple_normalize(account, name));
+		hb.name = (gchar *)purple_normalize(account, name);
 		hb.account = account;
 
 		for (node = purplebuddylist->root; node != NULL; node = node->next) {
+			if (!node->child)
+				continue;
+
 			hb.group = node;
 			if ((buddy = g_hash_table_lookup(purplebuddylist->buddies, &hb)) != NULL)
 				ret = g_slist_prepend(ret, buddy);
 		}
-		g_free(hb.name);
 	} else {
-		struct _list_account_buddies *ab = g_new0(struct _list_account_buddies, 1);
-		ab->account = account;
-		g_hash_table_foreach(purplebuddylist->buddies, find_acct_buddies, ab);
-		ret = ab->list;
-		g_free(ab);
+		GSList *list = NULL;
+		GHashTable *buddies = g_hash_table_lookup(buddies_cache, account);
+		g_hash_table_foreach(buddies, find_acct_buddies, &list);
+		ret = list;
 	}
 
 	return ret;
@@ -2260,17 +2503,17 @@ GSList *purple_find_buddies(PurpleAccount *account, const char *name)
 
 PurpleGroup *purple_find_group(const char *name)
 {
-	PurpleBlistNode *node;
+	gchar* key;
+	PurpleGroup *group;
 
 	g_return_val_if_fail(purplebuddylist != NULL, NULL);
 	g_return_val_if_fail((name != NULL) && (*name != '\0'), NULL);
 
-	for (node = purplebuddylist->root; node != NULL; node = node->next) {
-		if (!purple_utf8_strcasecmp(((PurpleGroup *)node)->name, name))
-			return (PurpleGroup *)node;
-	}
+	key = g_utf8_collate_key(name, -1);
+	group = g_hash_table_lookup(groups_cache, key);
+	g_free(key);
 
-	return NULL;
+	return group;
 }
 
 PurpleChat *
@@ -2587,6 +2830,38 @@ purple_blist_request_add_group(void)
 }
 
 static void
+purple_blist_node_destroy(PurpleBlistNode *node)
+{
+	PurpleBlistUiOps *ui_ops;
+	PurpleBlistNode *child, *next_child;
+
+	ui_ops = purple_blist_get_ui_ops();
+	child = node->child;
+	while (child) {
+		next_child = child->next;
+		purple_blist_node_destroy(child);
+		child = next_child;
+	}
+
+	/* Allow the UI to free data */
+	node->parent = NULL;
+	node->child  = NULL;
+	node->next   = NULL;
+	node->prev   = NULL;
+	if (ui_ops && ui_ops->remove)
+		ui_ops->remove(purplebuddylist, node);
+
+	if (PURPLE_BLIST_NODE_IS_BUDDY(node))
+		purple_buddy_destroy((PurpleBuddy*)node);
+	else if (PURPLE_BLIST_NODE_IS_CHAT(node))
+		purple_chat_destroy((PurpleChat*)node);
+	else if (PURPLE_BLIST_NODE_IS_CONTACT(node))
+		purple_contact_destroy((PurpleContact*)node);
+	else if (PURPLE_BLIST_NODE_IS_GROUP(node))
+		purple_group_destroy((PurpleGroup*)node);
+}
+
+static void
 purple_blist_node_setting_free(gpointer data)
 {
 	PurpleValue *value;
@@ -2607,13 +2882,16 @@ static void purple_blist_node_initialize_settings(PurpleBlistNode *node)
 
 void purple_blist_node_remove_setting(PurpleBlistNode *node, const char *key)
 {
+	PurpleBlistUiOps *ops;
 	g_return_if_fail(node != NULL);
 	g_return_if_fail(node->settings != NULL);
 	g_return_if_fail(key != NULL);
 
 	g_hash_table_remove(node->settings, key);
 
-	purple_blist_schedule_save();
+	ops = purple_blist_get_ui_ops();
+	if (ops && ops->save_node)
+		ops->save_node(node);
 }
 
 void
@@ -2643,6 +2921,7 @@ void
 purple_blist_node_set_bool(PurpleBlistNode* node, const char *key, gboolean data)
 {
 	PurpleValue *value;
+	PurpleBlistUiOps *ops;
 
 	g_return_if_fail(node != NULL);
 	g_return_if_fail(node->settings != NULL);
@@ -2653,7 +2932,9 @@ purple_blist_node_set_bool(PurpleBlistNode* node, const char *key, gboolean data
 
 	g_hash_table_replace(node->settings, g_strdup(key), value);
 
-	purple_blist_schedule_save();
+	ops = purple_blist_get_ui_ops();
+	if (ops && ops->save_node)
+		ops->save_node(node);
 }
 
 gboolean
@@ -2679,6 +2960,7 @@ void
 purple_blist_node_set_int(PurpleBlistNode* node, const char *key, int data)
 {
 	PurpleValue *value;
+	PurpleBlistUiOps *ops;
 
 	g_return_if_fail(node != NULL);
 	g_return_if_fail(node->settings != NULL);
@@ -2689,7 +2971,9 @@ purple_blist_node_set_int(PurpleBlistNode* node, const char *key, int data)
 
 	g_hash_table_replace(node->settings, g_strdup(key), value);
 
-	purple_blist_schedule_save();
+	ops = purple_blist_get_ui_ops();
+	if (ops && ops->save_node)
+		ops->save_node(node);
 }
 
 int
@@ -2715,6 +2999,7 @@ void
 purple_blist_node_set_string(PurpleBlistNode* node, const char *key, const char *data)
 {
 	PurpleValue *value;
+	PurpleBlistUiOps *ops;
 
 	g_return_if_fail(node != NULL);
 	g_return_if_fail(node->settings != NULL);
@@ -2725,7 +3010,9 @@ purple_blist_node_set_string(PurpleBlistNode* node, const char *key, const char
 
 	g_hash_table_replace(node->settings, g_strdup(key), value);
 
-	purple_blist_schedule_save();
+	ops = purple_blist_get_ui_ops();
+	if (ops && ops->save_node)
+		ops->save_node(node);
 }
 
 const char *
@@ -2779,7 +3066,31 @@ int purple_blist_get_group_online_count(PurpleGroup *group)
 void
 purple_blist_set_ui_ops(PurpleBlistUiOps *ops)
 {
+	gboolean overrode = FALSE;
 	blist_ui_ops = ops;
+
+	if (!ops)
+		return;
+
+	if (!ops->save_node) {
+		ops->save_node = purple_blist_save_node;
+		overrode = TRUE;
+	}
+	if (!ops->remove_node) {
+		ops->remove_node = purple_blist_save_node;
+		overrode = TRUE;
+	}
+	if (!ops->save_account) {
+		ops->save_account = purple_blist_save_account;
+		overrode = TRUE;
+	}
+
+	if (overrode && (ops->save_node    != purple_blist_save_node ||
+	                 ops->remove_node  != purple_blist_save_node ||
+	                 ops->save_account != purple_blist_save_account)) {
+		purple_debug_warning("blist", "Only some of the blist saving UI ops "
+				"were overridden. This probably is not what you want!\n");
+	}
 }
 
 PurpleBlistUiOps *
@@ -2841,6 +3152,16 @@ purple_blist_init(void)
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_BLIST_BUDDY));
 
+	purple_signal_register(handle, "blist-node-added",
+						 purple_marshal_VOID__POINTER, NULL, 1,
+						 purple_value_new(PURPLE_TYPE_SUBTYPE,
+										PURPLE_SUBTYPE_BLIST_NODE));
+
+	purple_signal_register(handle, "blist-node-removed",
+						 purple_marshal_VOID__POINTER, NULL, 1,
+						 purple_value_new(PURPLE_TYPE_SUBTYPE,
+										PURPLE_SUBTYPE_BLIST_NODE));
+
 	purple_signal_register(handle, "buddy-added",
 						 purple_marshal_VOID__POINTER, NULL, 1,
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
@@ -2869,17 +3190,54 @@ purple_blist_init(void)
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_BLIST_NODE),
 						 purple_value_new(PURPLE_TYPE_STRING));
+
+	purple_signal_connect(purple_accounts_get_handle(), "account-created",
+			handle,
+			PURPLE_CALLBACK(purple_blist_buddies_cache_add_account),
+			NULL);
+
+	purple_signal_connect(purple_accounts_get_handle(), "account-destroying",
+			handle,
+			PURPLE_CALLBACK(purple_blist_buddies_cache_remove_account),
+			NULL);
 }
 
 void
 purple_blist_uninit(void)
 {
-	if (save_timer != 0)
-	{
+	PurpleBlistNode *node, *next_node;
+
+	/* This happens if we quit before purple_set_blist is called. */
+	if (purplebuddylist == NULL)
+		return;
+
+	if (save_timer != 0) {
 		purple_timeout_remove(save_timer);
 		save_timer = 0;
 		purple_blist_sync();
 	}
 
+	purple_blist_destroy();
+
+	node = purple_blist_get_root();
+	while (node) {
+		next_node = node->next;
+		purple_blist_node_destroy(node);
+		node = next_node;
+	}
+	purplebuddylist->root = NULL;
+
+	g_hash_table_destroy(purplebuddylist->buddies);
+	g_hash_table_destroy(buddies_cache);
+	g_hash_table_destroy(groups_cache);
+
+	buddies_cache = NULL;
+	groups_cache = NULL;
+
+	PURPLE_DBUS_UNREGISTER_POINTER(purplebuddylist);
+	g_free(purplebuddylist);
+	purplebuddylist = NULL;
+
+	purple_signals_disconnect_by_handle(purple_blist_get_handle());
 	purple_signals_unregister_by_instance(purple_blist_get_handle());
 }
diff --git a/libpurple/blist.h b/libpurple/blist.h
index 460291a886..57047265a1 100644
--- a/libpurple/blist.h
+++ b/libpurple/blist.h
@@ -118,8 +118,8 @@ typedef enum
 
 /**
  * A Buddy list node.  This can represent a group, a buddy, or anything else.
- * This is a base class for struct buddy and struct group and for anything
- * else that wants to put itself in the buddy list. */
+ * This is a base class for PurpleBuddy, PurpleContact, PurpleGroup, and for
+ * anything else that wants to put itself in the buddy list. */
 struct _PurpleBlistNode {
 	PurpleBlistNodeType type;             /**< The type of node this is       */
 	PurpleBlistNode *prev;                /**< The sibling before this buddy. */
@@ -207,7 +207,7 @@ struct _PurpleBlistUiOps
 		       PurpleBlistNode *node);       /**< This will update a node in the buddy list. */
 	void (*remove)(PurpleBuddyList *list,
 		       PurpleBlistNode *node);       /**< This removes a node from the list */
-	void (*destroy)(PurpleBuddyList *list);  /**< When the list gets destroyed, this gets called to destroy the UI. */
+	void (*destroy)(PurpleBuddyList *list);  /**< When the list is destroyed, this is called to destroy the UI. */
 	void (*set_visible)(PurpleBuddyList *list,
 			    gboolean show);            /**< Hides or unhides the buddy list */
 	void (*request_add_buddy)(PurpleAccount *account, const char *username,
@@ -216,10 +216,49 @@ struct _PurpleBlistUiOps
 							 const char *alias, const char *name);
 	void (*request_add_group)(void);
 
+	/**
+	 * This is called when a node has been modified and should be saved.
+	 *
+	 * Implementation of this UI op is OPTIONAL. If not implemented, it will
+	 * be set to a fallback function that saves data to blist.xml like in
+	 * previous libpurple versions.
+	 *
+	 * @attrib node    The node which has been modified.
+	 *
+	 * @since 2.6.0.
+	 */
+	void (*save_node)(PurpleBlistNode *node);
+
+	/**
+	 * Called when a node is about to be removed from the buddy list.
+	 * The UI op should update the relevant data structures to remove this
+	 * node (for example, removing a buddy from the group this node is in).
+	 *
+	 * Implementation of this UI op is OPTIONAL. If not implemented, it will
+	 * be set to a fallback function that saves data to blist.xml like in
+	 * previous libpurple versions.
+	 *
+	 * @attrib node  The node which has been modified.
+	 * @since 2.6.0.
+	 */
+	void (*remove_node)(PurpleBlistNode *node);
+
+	/**
+	 * Called to save all the data for an account. If the UI sets this,
+	 * the callback must save the privacy and buddy list data for an account.
+	 * If the account is NULL, save the data for all accounts.
+	 *
+	 * Implementation of this UI op is OPTIONAL. If not implemented, it will
+	 * be set to a fallback function that saves data to blist.xml like in
+	 * previous libpurple versions.
+	 *
+	 * @attrib account  The account whose data to save. If NULL, save all data
+	 *                  for all accounts.
+	 * @since 2.6.0.
+	 */
+	void (*save_account)(PurpleAccount *account);
+
 	void (*_purple_reserved1)(void);
-	void (*_purple_reserved2)(void);
-	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
 };
 
 #ifdef __cplusplus
@@ -235,6 +274,7 @@ extern "C" {
  * Creates a new buddy list
  *
  * @return The new buddy list.
+ * @deprecated In 3.0.0, this will be handled by purple_blist_init()
  */
 PurpleBuddyList *purple_blist_new(void);
 
@@ -242,6 +282,7 @@ PurpleBuddyList *purple_blist_new(void);
  * Sets the main buddy list.
  *
  * @param blist The buddy list you want to use.
+ * @deprecated In 3.0.0, this will be handled by purple_blist_init()
  */
 void purple_set_blist(PurpleBuddyList *blist);
 
@@ -260,13 +301,17 @@ PurpleBuddyList *purple_get_blist(void);
 PurpleBlistNode *purple_blist_get_root(void);
 
 /**
- * Returns the hash table of every buddy in the list.
+ * Returns a list of every buddy in the list.  Use of this function is
+ * discouraged if you do not actually need every buddy in the list.  Use
+ * purple_find_buddies instead.
  *
- * @return The hash table of every buddy in the list.
+ * @return A list of every buddy in the list. Caller is responsible for
+ *         freeing the list.
  *
+ * @see purple_find_buddies
  * @since 2.6.0
  */
-GHashTable *purple_blist_get_buddies(void);
+GSList *purple_blist_get_buddies(void);
 
 /**
  * Returns the UI data for the list.
@@ -275,7 +320,7 @@ GHashTable *purple_blist_get_buddies(void);
  *
  * @since 2.6.0
  */
-void *purple_blist_get_ui_data(void);
+gpointer purple_blist_get_ui_data(void);
 
 /**
  * Sets the UI data for the list.
@@ -284,7 +329,7 @@ void *purple_blist_get_ui_data(void);
  *
  * @since 2.6.0
  */
-void purple_blist_set_ui_data(void *ui_data);
+void purple_blist_set_ui_data(gpointer ui_data);
 
 /**
  * Returns the next node of a given node. This function is to be used to iterate
@@ -359,7 +404,7 @@ PurpleBlistNode *purple_blist_node_get_sibling_prev(PurpleBlistNode *node);
  * @return The UI data.
  * @since 2.6.0
  */
-void *purple_blist_node_get_ui_data(const PurpleBlistNode *node);
+gpointer purple_blist_node_get_ui_data(const PurpleBlistNode *node);
 
 /**
  * Sets the UI data of a given node.
@@ -369,7 +414,7 @@ void *purple_blist_node_get_ui_data(const PurpleBlistNode *node);
  *
  * @since 2.6.0
  */
-void purple_blist_node_set_ui_data(PurpleBlistNode *node, void *ui_data);
+void purple_blist_node_set_ui_data(PurpleBlistNode *node, gpointer ui_data);
 
 /**
  * Shows the buddy list, creating a new one if necessary.
@@ -379,6 +424,10 @@ void purple_blist_show(void);
 
 /**
  * Destroys the buddy list window.
+ *
+ * @deprecated The UI is responsible for cleaning up the
+ *             PurpleBuddyList->ui_data. purple_blist_uninit() will free the
+ *             PurpleBuddyList* itself.
  */
 void purple_blist_destroy(void);
 
@@ -392,6 +441,8 @@ void purple_blist_set_visible(gboolean show);
 /**
  * Updates a buddy's status.
  *
+ * This should only be called from within Purple.
+ *
  * @param buddy      The buddy whose status has changed.
  * @param old_status The status from which we are changing.
  */
@@ -478,6 +529,13 @@ void purple_blist_rename_group(PurpleGroup *group, const char *name);
 PurpleChat *purple_chat_new(PurpleAccount *account, const char *alias, GHashTable *components);
 
 /**
+ * Destroys a chat
+ *
+ * @param chat       The chat to destroy
+ */
+void purple_chat_destroy(PurpleChat *chat);
+
+/**
  * Adds a new chat to the buddy list.
  *
  * The chat will be inserted right after node or appended to the end
@@ -491,16 +549,30 @@ PurpleChat *purple_chat_new(PurpleAccount *account, const char *alias, GHashTabl
 void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBlistNode *node);
 
 /**
- * Creates a new buddy
+ * Creates a new buddy.
+ *
+ * This function only creates the PurpleBuddy. Use purple_blist_add_buddy
+ * to add the buddy to the list and purple_account_add_buddy to sync up
+ * with the server.
  *
  * @param account    The account this buddy will get added to
  * @param name       The name of the new buddy
  * @param alias      The alias of the new buddy (or NULL if unaliased)
  * @return           A newly allocated buddy
+ *
+ * @see purple_account_add_buddy
+ * @see purple_blist_add_buddy
  */
 PurpleBuddy *purple_buddy_new(PurpleAccount *account, const char *name, const char *alias);
 
 /**
+ * Destroys a buddy
+ *
+ * @param buddy     The buddy to destroy
+ */
+void purple_buddy_destroy(PurpleBuddy *buddy);
+
+/**
  * Sets a buddy's icon.
  *
  * This should only be called from within Purple. You probably want to
@@ -595,7 +667,7 @@ PurplePresence *purple_buddy_get_presence(const PurpleBuddy *buddy);
  * @param contact The optional contact to place the buddy in.
  * @param group   The group to add the new buddy to.
  * @param node    The insertion point.  Pass in NULL to add the node as
- *                the last child in the given group.
+ *                the first child in the given group.
  */
 void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node);
 
@@ -603,7 +675,7 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
  * Creates a new group
  *
  * You can't have more than one group with the same name.  Sorry.  If you pass
- * this the * name of a group that already exists, it will return that group.
+ * this the name of a group that already exists, it will return that group.
  *
  * @param name   The name of the new group
  * @return       A new group struct
@@ -611,6 +683,13 @@ void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGr
 PurpleGroup *purple_group_new(const char *name);
 
 /**
+ * Destroys a group
+ *
+ * @param group  The group to destroy
+*/
+void purple_group_destroy(PurpleGroup *group);
+
+/**
  * Adds a new group to the buddy list.
  *
  * The new group will be inserted after insert or prepended to the list if
@@ -629,6 +708,13 @@ void purple_blist_add_group(PurpleGroup *group, PurpleBlistNode *node);
 PurpleContact *purple_contact_new(void);
 
 /**
+ * Destroys a contact
+ *
+ * @param contact  The contact to destroy
+ */
+void purple_contact_destroy(PurpleContact *contact);
+
+/**
  * Adds a new contact to the buddy list.
  *
  * The new contact will be inserted after insert or prepended to the list if
@@ -698,18 +784,22 @@ void purple_contact_invalidate_priority_buddy(PurpleContact *contact);
 
 /**
  * Removes a buddy from the buddy list and frees the memory allocated to it.
- * This doesn't actually try to remove the buddy from the server list, nor does
- * it clean up the prpl_data.
+ * This doesn't actually try to remove the buddy from the server list.
  *
  * @param buddy   The buddy to be removed
+ *
+ * @see purple_account_remove_buddy
  */
 void purple_blist_remove_buddy(PurpleBuddy *buddy);
 
 /**
  * Removes a contact, and any buddies it contains, and frees the memory
- * allocated to it.
+ * allocated to it. This calls purple_blist_remove_buddy and therefore
+ * doesn't remove the buddies from the server list.
  *
  * @param contact The contact to be removed
+ *
+ * @see purple_blist_remove_buddy
  */
 void purple_blist_remove_contact(PurpleContact *contact);
 
@@ -821,7 +911,7 @@ PurpleBuddy *purple_find_buddy_in_group(PurpleAccount *account, const char *name
  * Finds all PurpleBuddy structs given a name and an account
  *
  * @param account The account this buddy belongs to
- * @param name    The buddy's name (or NULL to return all buddies in the account)
+ * @param name    The buddy's name (or NULL to return all buddies for the account)
  *
  * @return        A GSList of buddies (which must be freed), or NULL if the buddy doesn't exist
  */
@@ -916,7 +1006,7 @@ gboolean purple_group_on_account(PurpleGroup *g, PurpleAccount *account);
 const char *purple_group_get_name(PurpleGroup *group);
 
 /**
- * Called when an account gets signed on.  Tells the UI to update all the
+ * Called when an account connects.  Tells the UI to update all the
  * buddies.
  *
  * @param account   The account
@@ -925,7 +1015,7 @@ void purple_blist_add_account(PurpleAccount *account);
 
 
 /**
- * Called when an account gets signed off.  Sets the presence of all the buddies to 0
+ * Called when an account disconnects.  Sets the presence of all the buddies to 0
  * and tells the UI to update them.
  *
  * @param account   The account
diff --git a/libpurple/buddyicon.c b/libpurple/buddyicon.c
index b54476b99b..ee418e2b5e 100644
--- a/libpurple/buddyicon.c
+++ b/libpurple/buddyicon.c
@@ -753,6 +753,8 @@ purple_buddy_icons_set_account_icon(PurpleAccount *account,
 	}
 	unref_filename(old_icon);
 
+	old_img = g_hash_table_lookup(pointer_icon_cache, account);
+
 	if (img)
 		g_hash_table_insert(pointer_icon_cache, account, img);
 	else
@@ -770,7 +772,7 @@ purple_buddy_icons_set_account_icon(PurpleAccount *account,
 			prpl_info->set_buddy_icon(gc, img);
 	}
 
-	if ((old_img = g_hash_table_lookup(pointer_icon_cache, account)))
+	if (old_img)
 		purple_imgstore_unref(old_img);
 	else if (old_icon)
 	{
@@ -1100,7 +1102,7 @@ migrate_buddy_icon(PurpleBlistNode *node, const char *setting_name,
 				PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node);
 				const char *prpl_id = purple_account_get_protocol_id(account);
 
-				if (purple_strequal(prpl_id, "prpl-yahoo"))
+				if (g_str_equal(prpl_id, "prpl-yahoo") || g_str_equal(prpl_id, "prpl-yahoojp"))
 				{
 					int checksum = purple_blist_node_get_int(node, "icon_checksum");
 					if (checksum != 0)
@@ -1299,6 +1301,7 @@ purple_buddy_icons_uninit()
 	g_hash_table_destroy(icon_file_cache);
 	g_hash_table_destroy(pointer_icon_cache);
 	g_free(old_icons_dir);
+	g_free(cache_dir);
 }
 
 void purple_buddy_icon_get_scale_size(PurpleBuddyIconSpec *spec, int *width, int *height)
diff --git a/libpurple/buddyicon.h b/libpurple/buddyicon.h
index 0669804ea2..7fbecbb9a8 100644
--- a/libpurple/buddyicon.h
+++ b/libpurple/buddyicon.h
@@ -189,8 +189,6 @@ char *purple_buddy_icon_get_full_path(PurpleBuddyIcon *icon);
  *                  takes ownership of and will free.
  * @param icon_len  The length of the icon data.
  * @param checksum  A protocol checksum from the prpl or @c NULL.
- *
- * @return The buddy icon set, or NULL if no icon was set.
  */
 void
 purple_buddy_icons_set_for_user(PurpleAccount *account, const char *username,
diff --git a/libpurple/certificate.c b/libpurple/certificate.c
index c0049e9f2d..0ef2ec448e 100644
--- a/libpurple/certificate.c
+++ b/libpurple/certificate.c
@@ -93,14 +93,11 @@ purple_certificate_verify_complete(PurpleCertificateVerificationRequest *vrq,
 				  "Successfully verified certificate for %s\n",
 				  vrq->subject_name);
 	} else {
-		purple_debug_info("certificate",
+		purple_debug_error("certificate",
 				  "Failed to verify certificate for %s\n",
 				  vrq->subject_name);
 	}
 
-
-
-
 	/* Pass the results on to the request's callback */
 	(vrq->cb)(st, vrq->cb_data);
 
@@ -193,14 +190,20 @@ purple_certificate_signed_by(PurpleCertificate *crt, PurpleCertificate *issuer)
 }
 
 gboolean
-purple_certificate_check_signature_chain(GList *chain)
+purple_certificate_check_signature_chain_with_failing(GList *chain,
+                                                      PurpleCertificate **failing)
 {
 	GList *cur;
 	PurpleCertificate *crt, *issuer;
 	gchar *uid;
+	time_t now, activation, expiration;
+	gboolean ret;
 
 	g_return_val_if_fail(chain, FALSE);
 
+	if (failing)
+		*failing = NULL;
+
 	uid = purple_certificate_get_unique_id((PurpleCertificate *) chain->data);
 	purple_debug_info("certificate",
 			  "Checking signature chain for uid=%s\n",
@@ -214,6 +217,8 @@ purple_certificate_check_signature_chain(GList *chain)
 		return TRUE;
 	}
 
+	now = time(NULL);
+
 	/* Load crt with the first certificate */
 	crt = (PurpleCertificate *)(chain->data);
 	/* And start with the second certificate in the chain */
@@ -221,18 +226,43 @@ purple_certificate_check_signature_chain(GList *chain)
 
 		issuer = (PurpleCertificate *)(cur->data);
 
+		uid = purple_certificate_get_unique_id(issuer);
+
+		ret = purple_certificate_get_times(issuer, &activation, &expiration);
+		if (!ret || now < activation || now > expiration) { 
+			if (!ret)
+				purple_debug_error("certificate",
+						"...Failed to get validity times for certificate %s\n"
+						"Chain is INVALID\n", uid);
+			else if (now > expiration)
+				purple_debug_error("certificate",
+						"...Issuer %s expired at %s\nChain is INVALID\n",
+						uid, ctime(&expiration));
+			else
+				purple_debug_error("certificate",
+						"...Not-yet-activated issuer %s will be valid at %s\n"
+						"Chain is INVALID\n", uid, ctime(&activation));
+
+			if (failing)
+				*failing = crt;
+
+			g_free(uid);
+			return FALSE;
+		}
+
 		/* Check the signature for this link */
 		if (! purple_certificate_signed_by(crt, issuer) ) {
-			uid = purple_certificate_get_unique_id(issuer);
-			purple_debug_info("certificate",
+			purple_debug_error("certificate",
 					  "...Bad or missing signature by %s\nChain is INVALID\n",
 					  uid);
 			g_free(uid);
 
+			if (failing)
+				*failing = crt;
+
 			return FALSE;
 		}
 
-		uid = purple_certificate_get_unique_id(issuer);
 		purple_debug_info("certificate",
 				  "...Good signature by %s\n",
 				  uid);
@@ -248,6 +278,12 @@ purple_certificate_check_signature_chain(GList *chain)
 	return TRUE;
 }
 
+gboolean
+purple_certificate_check_signature_chain(GList *chain)
+{
+	return purple_certificate_check_signature_chain_with_failing(chain, NULL);
+}
+
 PurpleCertificate *
 purple_certificate_import(PurpleCertificateScheme *scheme, const gchar *filename)
 {
@@ -273,6 +309,16 @@ purple_certificate_export(const gchar *filename, PurpleCertificate *crt)
 	return (scheme->export_certificate)(filename, crt);
 }
 
+static gboolean
+byte_arrays_equal(const GByteArray *array1, const GByteArray *array2)
+{
+	g_return_val_if_fail(array1 != NULL, FALSE);
+	g_return_val_if_fail(array2 != NULL, FALSE);
+
+	return (array1->len == array2->len) &&
+		(0 == memcmp(array1->data, array2->data, array1->len));
+}
+	
 GByteArray *
 purple_certificate_get_fingerprint_sha1(PurpleCertificate *crt)
 {
@@ -340,7 +386,6 @@ purple_certificate_check_subject_name(PurpleCertificate *crt, const gchar *name)
 
 	scheme = crt->scheme;
 
-	/* TODO: Instead of failing, maybe use get_subject_name and strcmp? */
 	g_return_val_if_fail(scheme->check_subject_name, FALSE);
 
 	return (scheme->check_subject_name)(crt, name);
@@ -365,7 +410,6 @@ purple_certificate_get_times(PurpleCertificate *crt, time_t *activation, time_t
 	return (scheme->get_times)(crt, activation, expiration);
 }
 
-
 gchar *
 purple_certificate_pool_mkpath(PurpleCertificatePool *pool, const gchar *id)
 {
@@ -681,7 +725,7 @@ x509_ca_lazy_init(void)
 	/* Check that X.509 is registered */
 	x509 = purple_certificate_find_scheme(x509_ca.scheme_name);
 	if ( !x509 ) {
-		purple_debug_info("certificate/x509/ca",
+		purple_debug_warning("certificate/x509/ca",
 				  "Lazy init failed because an X.509 Scheme "
 				  "is not yet registered. Maybe it will be "
 				  "better later.\n");
@@ -926,9 +970,13 @@ x509_tls_peers_init(void)
 	poolpath = purple_certificate_pool_mkpath(&x509_tls_peers, NULL);
 	ret = purple_build_dir(poolpath, 0700); /* Make it this user only */
 
+	if (ret != 0)
+		purple_debug_info("certificate/tls_peers",
+				"Could not create %s.  Certificates will not be cached.\n",
+				poolpath);
+
 	g_free(poolpath);
 
-	g_return_val_if_fail(ret == 0, FALSE);
 	return TRUE;
 }
 
@@ -1162,7 +1210,7 @@ x509_tls_cached_user_auth_cb (x509_tls_cached_ua_ctx *c, gint id)
 		purple_certificate_verify_complete(vrq,
 						   PURPLE_CERTIFICATE_VALID);
 	} else {
-		purple_debug_info("certificate/x509/tls_cached",
+		purple_debug_warning("certificate/x509/tls_cached",
 				  "User REJECTED cert\n");
 		purple_certificate_verify_complete(vrq,
 						   PURPLE_CERTIFICATE_INVALID);
@@ -1217,20 +1265,6 @@ x509_tls_cached_user_auth(PurpleCertificateVerificationRequest *vrq,
 }
 
 static void
-x509_tls_cached_peer_cert_changed(PurpleCertificateVerificationRequest *vrq)
-{
-	/* TODO: Prompt the user, etc. */
-
-	purple_debug_info("certificate/x509/tls_cached",
-			  "Certificate for %s does not match cached. "
-			  "Auto-rejecting!\n",
-			  vrq->subject_name);
-
-	purple_certificate_verify_complete(vrq, PURPLE_CERTIFICATE_INVALID);
-	return;
-}
-
-static void
 x509_tls_cached_unknown_peer(PurpleCertificateVerificationRequest *vrq);
 
 static void
@@ -1253,12 +1287,11 @@ x509_tls_cached_cert_in_cache(PurpleCertificateVerificationRequest *vrq)
 	cached_crt = purple_certificate_pool_retrieve(
 		tls_peers, vrq->subject_name);
 	if ( !cached_crt ) {
-		purple_debug_error("certificate/x509/tls_cached",
+		purple_debug_warning("certificate/x509/tls_cached",
 				   "Lookup failed on cached certificate!\n"
-				   "It was here just a second ago. Forwarding "
-				   "to cert_changed.\n");
-		/* vrq now becomes the problem of cert_changed */
-		x509_tls_cached_peer_cert_changed(vrq);
+				   "Falling back to full verification.\n");
+		/* vrq now becomes the problem of unknown_peer */
+		x509_tls_cached_unknown_peer(vrq);
 		return;
 	}
 
@@ -1273,7 +1306,7 @@ x509_tls_cached_cert_in_cache(PurpleCertificateVerificationRequest *vrq)
 		purple_certificate_verify_complete(vrq,
 						   PURPLE_CERTIFICATE_VALID);
 	} else {
-		purple_debug_info("certificate/x509/tls_cached",
+		purple_debug_error("certificate/x509/tls_cached",
 				  "Peer cert did NOT match cached\n");
 		/* vrq now becomes the problem of the user */
 		x509_tls_cached_unknown_peer(vrq);
@@ -1284,19 +1317,112 @@ x509_tls_cached_cert_in_cache(PurpleCertificateVerificationRequest *vrq)
 	g_byte_array_free(cached_fpr, TRUE);
 }
 
+/*
+ * This is called from two points in x509_tls_cached_unknown_peer below
+ * once we've verified the signature chain is valid. Now we need to verify
+ * the subject name of the certificate.
+ */
+static void
+x509_tls_cached_check_subject_name(PurpleCertificateVerificationRequest *vrq,
+                                   gboolean had_ca_pool)
+{
+	PurpleCertificatePool *tls_peers;
+	PurpleCertificate *peer_crt;
+	GList *chain = vrq->cert_chain;
+
+	peer_crt = (PurpleCertificate *) chain->data;
+
+	/* Last, check that the hostname matches */
+	if ( ! purple_certificate_check_subject_name(peer_crt,
+						     vrq->subject_name) ) {
+		gchar *sn = purple_certificate_get_subject_name(peer_crt);
+
+		purple_debug_error("certificate/x509/tls_cached",
+				  "Name mismatch: Certificate given for %s "
+				  "has a name of %s\n",
+				  vrq->subject_name, sn);
+
+		if (had_ca_pool) {
+			/* Prompt the user to authenticate the certificate */
+			/* TODO: Provide the user with more guidance about why he is
+			   being prompted */
+			/* vrq will be completed by user_auth */
+			gchar *msg;
+			msg = g_strdup_printf(_("The certificate presented by \"%s\" "
+						"claims to be from \"%s\" instead.  "
+						"This could mean that you are not "
+						"connecting to the service you "
+						"believe you are."),
+					      vrq->subject_name, sn);
+
+			x509_tls_cached_user_auth(vrq, msg);
+			g_free(msg);
+		} else {
+			/* Had no CA pool, so couldn't verify the chain *and*
+			 * the subject name isn't valid.
+			 * I think this is bad enough to warrant a fatal error. It's
+			 * not likely anyway...
+			 */
+			purple_notify_error(NULL, /* TODO: Probably wrong. */
+						_("SSL Certificate Error"),
+						_("Invalid certificate chain"),
+						_("You have no database of root certificates, so "
+						"this certificate cannot be validated."));
+		}
+
+		g_free(sn);
+		return;
+	} /* if (name mismatch) */
+
+	if (!had_ca_pool) {
+		/* The subject name is correct, but we weren't able to verify the
+		 * chain because there was no pool of root CAs found. Prompt the user
+		 * to validate it.
+		 */
+
+		/* vrq will be completed by user_auth */
+		x509_tls_cached_user_auth(vrq,_("You have no database of root "
+						"certificates, so this "
+						"certificate cannot be "
+						"validated."));
+		return;
+	}
+
+	/* If we reach this point, the certificate is good. */
+	/* Look up the local cache and store it there for future use */
+	tls_peers = purple_certificate_find_pool(x509_tls_cached.scheme_name,
+						 "tls_peers");
+
+	if (tls_peers) {
+		if (!purple_certificate_pool_store(tls_peers,vrq->subject_name,
+						   peer_crt) ) {
+			purple_debug_error("certificate/x509/tls_cached",
+					   "FAILED to cache peer certificate\n");
+		}
+	} else {
+		purple_debug_error("certificate/x509/tls_cached",
+				   "Unable to locate tls_peers certificate "
+				   "cache.\n");
+	}
+
+	/* Whew! Done! */
+	purple_certificate_verify_complete(vrq, PURPLE_CERTIFICATE_VALID);
+
+}
+
 /* For when we've never communicated with this party before */
 /* TODO: Need ways to specify possibly multiple problems with a cert, or at
-   least  reprioritize them. For example, maybe the signature ought to be
-   checked BEFORE the hostname checking?
-   Stu thinks we should check the signature before the name, so we do now.
-   The above TODO still stands. */
+   least  reprioritize them.
+ */
 static void
 x509_tls_cached_unknown_peer(PurpleCertificateVerificationRequest *vrq)
 {
-	PurpleCertificatePool *ca, *tls_peers;
-	PurpleCertificate *end_crt, *ca_crt, *peer_crt;
+	PurpleCertificatePool *ca;
+	PurpleCertificate *peer_crt;
+	PurpleCertificate *ca_crt, *end_crt;
+	PurpleCertificate *failing_crt;
 	GList *chain = vrq->cert_chain;
-	GList *last;
+	GByteArray *last_fpr, *ca_fpr;
 	gchar *ca_id;
 
 	peer_crt = (PurpleCertificate *) chain->data;
@@ -1323,52 +1449,89 @@ x509_tls_cached_unknown_peer(PurpleCertificateVerificationRequest *vrq)
 		return;
 	} /* if (self signed) */
 
+	/* Next, attempt to verify the last certificate against a CA */
+	ca = purple_certificate_find_pool(x509_tls_cached.scheme_name, "ca");
+
 	/* Next, check that the certificate chain is valid */
-	if ( ! purple_certificate_check_signature_chain(chain) ) {
-		/* TODO: Tell the user where the chain broke? */
-		/* TODO: This error will hopelessly confuse any
-		   non-elite user. */
-		gchar *secondary;
+	if (!purple_certificate_check_signature_chain_with_failing(chain,
+				&failing_crt))
+	{
+		gboolean chain_validated = FALSE;
+		/*
+		 * Check if the failing certificate is in the CA store. If it is, then
+		 * consider this fully validated. This works around issues with some
+		 * prominent intermediate CAs whose signature is md5WithRSAEncryption.
+		 * I'm looking at CACert Class 3 here. See #4458 for details.
+		 */
+		if (ca) {
+			gchar *uid = purple_certificate_get_unique_id(failing_crt);
+			PurpleCertificate *ca_crt = purple_certificate_pool_retrieve(ca, uid);
+			if (ca_crt != NULL) {
+				GByteArray *failing_fpr;
+				GByteArray *ca_fpr;
+				failing_fpr = purple_certificate_get_fingerprint_sha1(failing_crt);
+				ca_fpr = purple_certificate_get_fingerprint_sha1(ca_crt);
+				if (byte_arrays_equal(failing_fpr, ca_fpr)) {
+					purple_debug_info("certificate/x509/tls_cached",
+							"Full chain verification failed (probably a bad "
+							"signature algorithm), but found the last "
+							"certificate %s in the CA pool.\n", uid);
+					chain_validated = TRUE;
+				}
+
+				g_byte_array_free(failing_fpr, TRUE);
+				g_byte_array_free(ca_fpr, TRUE);
+			}
 
-		secondary = g_strdup_printf(_("The certificate chain presented"
-					      " for %s is not valid."),
-					    vrq->subject_name);
+			purple_certificate_destroy(ca_crt);
+			g_free(uid);
+		}
 
-		/* TODO: Make this error either block the ensuing SSL
-		   connection error until the user dismisses this one, or
-		   stifle it. */
-		purple_notify_error(NULL, /* TODO: Probably wrong. */
-				    _("SSL Certificate Error"),
-				    _("Invalid certificate chain"),
-				    secondary );
-		g_free(secondary);
+		/*
+		 * If we get here, either the cert matched the stuff right above
+		 * or it didn't, in which case we give up and complain to the user.
+		 */
+		if (chain_validated) {
+			x509_tls_cached_check_subject_name(vrq, TRUE);
+		} else {
+			/* TODO: Tell the user where the chain broke? */
+			/* TODO: This error will hopelessly confuse any
+			   non-elite user. */
+			gchar *secondary;
+
+			secondary = g_strdup_printf(_("The certificate chain presented"
+						      " for %s is not valid."),
+						    vrq->subject_name);
+
+			/* TODO: Make this error either block the ensuing SSL
+			   connection error until the user dismisses this one, or
+			   stifle it. */
+			purple_notify_error(NULL, /* TODO: Probably wrong. */
+					    _("SSL Certificate Error"),
+					    _("Invalid certificate chain"),
+					    secondary );
+			g_free(secondary);
+
+			/* Okay, we're done here */
+			purple_certificate_verify_complete(vrq,
+							   PURPLE_CERTIFICATE_INVALID);
+		}
 
-		/* Okay, we're done here */
-		purple_certificate_verify_complete(vrq,
-						   PURPLE_CERTIFICATE_INVALID);
 		return;
 	} /* if (signature chain not good) */
 
-	/* Next, attempt to verify the last certificate against a CA */
-	ca = purple_certificate_find_pool(x509_tls_cached.scheme_name, "ca");
-
 	/* If, for whatever reason, there is no Certificate Authority pool
-	   loaded, we will simply present it to the user for checking. */
+	   loaded, we'll verify the subject name and then warn about thsi. */
 	if ( !ca ) {
 		purple_debug_error("certificate/x509/tls_cached",
 				   "No X.509 Certificate Authority pool "
 				   "could be found!\n");
 
-		/* vrq will be completed by user_auth */
-		x509_tls_cached_user_auth(vrq,_("You have no database of root "
-						"certificates, so this "
-						"certificate cannot be "
-						"validated."));
+		x509_tls_cached_check_subject_name(vrq, FALSE);
 		return;
 	}
 
-	last = g_list_last(chain);
-	end_crt = (PurpleCertificate *) last->data;
+	end_crt = g_list_last(chain)->data;
 
 	/* Attempt to look up the last certificate's issuer */
 	ca_id = purple_certificate_get_issuer_unique_id(end_crt);
@@ -1377,7 +1540,7 @@ x509_tls_cached_unknown_peer(PurpleCertificateVerificationRequest *vrq)
 			  ca_id);
 	ca_crt = purple_certificate_pool_retrieve(ca, ca_id);
 	if ( NULL == ca_crt ) {
-		purple_debug_info("certificate/x509/tls_cached",
+		purple_debug_warning("certificate/x509/tls_cached",
 				  "Certificate Authority with DN='%s' not "
 				  "found. I'll prompt the user, I guess.\n",
 				  ca_id);
@@ -1391,8 +1554,26 @@ x509_tls_cached_unknown_peer(PurpleCertificateVerificationRequest *vrq)
 
 	g_free(ca_id);
 
-	/* Check the signature */
-	if ( !purple_certificate_signed_by(end_crt, ca_crt) ) {
+	/*
+	 * Check the fingerprints; if they match, then this certificate *is* one
+	 * of the designated "trusted roots", and we don't need to verify the
+	 * signature. This is good because some of the older roots are self-signed
+	 * with bad hash algorithms that we don't want to allow in any other
+	 * circumstances (one of Verisign's root CAs is self-signed with MD2).
+	 *
+	 * If the fingerprints don't match, we'll fall back to checking the
+	 * signature.
+	 *
+	 * GnuTLS doesn't seem to include the final root in the verification
+	 * list, so this check will never succeed.  NSS *does* include it in
+	 * the list, so here we are.
+	 */
+	last_fpr = purple_certificate_get_fingerprint_sha1(end_crt);
+	ca_fpr   = purple_certificate_get_fingerprint_sha1(ca_crt);
+
+	if ( !byte_arrays_equal(last_fpr, ca_fpr) &&
+			!purple_certificate_signed_by(end_crt, ca_crt) )
+	{
 		/* TODO: If signed_by ever returns a reason, maybe mention
 		   that, too. */
 		/* TODO: Also mention the CA involved. While I could do this
@@ -1417,57 +1598,17 @@ x509_tls_cached_unknown_peer(PurpleCertificateVerificationRequest *vrq)
 		/* Signal "bad cert" */
 		purple_certificate_verify_complete(vrq,
 						   PURPLE_CERTIFICATE_INVALID);
-		return;
-	} /* if (CA signature not good) */
 
-	/* Last, check that the hostname matches */
-	if ( ! purple_certificate_check_subject_name(peer_crt,
-						     vrq->subject_name) ) {
-		gchar *sn = purple_certificate_get_subject_name(peer_crt);
-		gchar *msg;
-
-		purple_debug_info("certificate/x509/tls_cached",
-				  "Name mismatch: Certificate given for %s "
-				  "has a name of %s\n",
-				  vrq->subject_name, sn);
-
-		/* Prompt the user to authenticate the certificate */
-		/* TODO: Provide the user with more guidance about why he is
-		   being prompted */
-		/* vrq will be completed by user_auth */
-		msg = g_strdup_printf(_("The certificate presented by \"%s\" "
-					"claims to be from \"%s\" instead.  "
-					"This could mean that you are not "
-					"connecting to the service you "
-					"believe you are."),
-				      vrq->subject_name, sn);
-
-		x509_tls_cached_user_auth(vrq,msg);
-
-		g_free(sn);
-		g_free(msg);
+		purple_certificate_destroy(ca_crt);
+		g_byte_array_free(ca_fpr, TRUE);
+		g_byte_array_free(last_fpr, TRUE);
 		return;
-	} /* if (name mismatch) */
+	} /* if (CA signature not good) */
 
-	/* If we reach this point, the certificate is good. */
-	/* Look up the local cache and store it there for future use */
-	tls_peers = purple_certificate_find_pool(x509_tls_cached.scheme_name,
-						 "tls_peers");
+	g_byte_array_free(ca_fpr, TRUE);
+	g_byte_array_free(last_fpr, TRUE);
 
-	if (tls_peers) {
-		if (!purple_certificate_pool_store(tls_peers,vrq->subject_name,
-						   peer_crt) ) {
-			purple_debug_error("certificate/x509/tls_cached",
-					   "FAILED to cache peer certificate\n");
-		}
-	} else {
-		purple_debug_error("certificate/x509/tls_cached",
-				   "Unable to locate tls_peers certificate "
-				   "cache.\n");
-	}
-
-	/* Whew! Done! */
-	purple_certificate_verify_complete(vrq, PURPLE_CERTIFICATE_VALID);
+	x509_tls_cached_check_subject_name(vrq, TRUE);
 }
 
 static void
@@ -1475,6 +1616,8 @@ x509_tls_cached_start_verify(PurpleCertificateVerificationRequest *vrq)
 {
 	const gchar *tls_peers_name = "tls_peers"; /* Name of local cache */
 	PurpleCertificatePool *tls_peers;
+	time_t now, activation, expiration;
+	gboolean ret;
 
 	g_return_if_fail(vrq);
 
@@ -1482,6 +1625,48 @@ x509_tls_cached_start_verify(PurpleCertificateVerificationRequest *vrq)
 			  "Starting verify for %s\n",
 			  vrq->subject_name);
 
+	/*
+	 * Verify the first certificate (the main one) has been activated and
+	 * isn't expired, i.e. activation < now < expiration.
+	 */
+	now = time(NULL);
+	ret = purple_certificate_get_times(vrq->cert_chain->data, &activation,
+	                                   &expiration);
+	if (!ret || now > expiration || now < activation) {
+		gchar *secondary;
+
+		if (!ret) {
+			purple_debug_error("certificate/x509/tls_cached",
+					"Failed to get validity times for certificate %s\n",
+					vrq->subject_name);
+			secondary = g_strdup_printf(_("Failed to validate expiration time "
+					"for %s"), vrq->subject_name);
+		} else if (now > expiration) {
+			purple_debug_error("certificate/x509/tls_cached",
+					"Certificate %s expired at %s\n",
+					vrq->subject_name, ctime(&expiration));
+			secondary = g_strdup_printf(_("The certificate for %s is expired."),
+					vrq->subject_name);
+		} else {
+			purple_debug_error("certificate/x509/tls_cached",
+					"Certificate %s is not yet valid, will be at %s\n",
+					vrq->subject_name, ctime(&activation));
+			secondary = g_strdup_printf(_("The certificate for %s should not "
+					"yet be in use."), vrq->subject_name);
+		}
+
+		purple_notify_error(NULL, /* TODO: Probably wrong. */
+				_("SSL Certificate Error"),
+				_("Invalid certificate chain"),
+				secondary );
+		g_free(secondary);
+
+		/* Okay, we're done here */
+		purple_certificate_verify_complete(vrq,
+				PURPLE_CERTIFICATE_INVALID);
+		return;
+	}
+
 	tls_peers = purple_certificate_find_pool(x509_tls_cached.scheme_name,tls_peers_name);
 
 	if (!tls_peers) {
@@ -1504,7 +1689,7 @@ x509_tls_cached_start_verify(PurpleCertificateVerificationRequest *vrq)
 		/* vrq is now the responsibility of cert_in_cache */
 		x509_tls_cached_cert_in_cache(vrq);
 	} else {
-		purple_debug_info("certificate/x509/tls_cached",
+		purple_debug_warning("certificate/x509/tls_cached",
 				  "...Not in cache\n");
 		/* vrq now becomes the problem of unknown_peer */
 		x509_tls_cached_unknown_peer(vrq);
diff --git a/libpurple/certificate.h b/libpurple/certificate.h
index 672bf93bf1..e82efd4c9c 100644
--- a/libpurple/certificate.h
+++ b/libpurple/certificate.h
@@ -443,6 +443,28 @@ gboolean
 purple_certificate_signed_by(PurpleCertificate *crt, PurpleCertificate *issuer);
 
 /**
+ * Check that a certificate chain is valid and, if not, the failing certificate.
+ *
+ * Uses purple_certificate_signed_by() to verify that each PurpleCertificate
+ * in the chain carries a valid signature from the next. A single-certificate
+ * chain is considered to be valid.
+ *
+ * @param chain      List of PurpleCertificate instances comprising the chain,
+ *                   in the order certificate, issuer, issuer's issuer, etc.
+ * @param failing    A pointer to a PurpleCertificate*. If not NULL, if the
+ *                   chain fails to validate, this will be set to the
+ *                   certificate whose signature could not be validated.
+ * @return TRUE if the chain is valid. See description.
+ *
+ * @since 2.6.0
+ * @deprecated  This function will become
+ *              purple_certificate_check_signature_chain in 3.0.0
+ */
+gboolean
+purple_certificate_check_signature_chain_with_failing(GList *chain,
+		PurpleCertificate **failing);
+
+/**
  * Check that a certificate chain is valid
  *
  * Uses purple_certificate_signed_by() to verify that each PurpleCertificate
@@ -453,6 +475,8 @@ purple_certificate_signed_by(PurpleCertificate *crt, PurpleCertificate *issuer);
  *                   in the order certificate, issuer, issuer's issuer, etc.
  * @return TRUE if the chain is valid. See description.
  * @todo Specify which certificate in the chain caused a failure
+ * @deprecated  This function will be removed in 3.0.0 and replaced with
+ *              purple_certificate_check_signature_chain_with_failing
  */
 gboolean
 purple_certificate_check_signature_chain(GList *chain);
diff --git a/libpurple/cipher.c b/libpurple/cipher.c
index 92047f356a..c82865f952 100644
--- a/libpurple/cipher.c
+++ b/libpurple/cipher.c
@@ -61,11 +61,144 @@
 #include "signals.h"
 #include "value.h"
 
+#if GLIB_CHECK_VERSION(2,16,0)
+static void
+purple_g_checksum_init(PurpleCipherContext *context, GChecksumType type)
+{
+	GChecksum *checksum;
+
+	checksum = g_checksum_new(type);
+	purple_cipher_context_set_data(context, checksum);
+}
+
+static void
+purple_g_checksum_reset(PurpleCipherContext *context, GChecksumType type)
+{
+	GChecksum *checksum;
+
+	checksum = purple_cipher_context_get_data(context);
+	g_return_if_fail(checksum != NULL);
+
+#if GLIB_CHECK_VERSION(2,18,0)
+	g_checksum_reset(checksum);
+#else
+	g_checksum_free(checksum);
+	checksum = g_checksum_new(type);
+	purple_cipher_context_set_data(context, checksum);
+#endif
+}
+
+static void
+purple_g_checksum_uninit(PurpleCipherContext *context)
+{
+	GChecksum *checksum;
+
+	checksum = purple_cipher_context_get_data(context);
+	g_return_if_fail(checksum != NULL);
+
+	g_checksum_free(checksum);
+}
+
+static void
+purple_g_checksum_append(PurpleCipherContext *context, const guchar *data,
+                         gsize len)
+{
+	GChecksum *checksum;
+
+	checksum = purple_cipher_context_get_data(context);
+	g_return_if_fail(checksum != NULL);
+
+	while (len >= G_MAXSSIZE) {
+		g_checksum_update(checksum, data, G_MAXSSIZE);
+		len -= G_MAXSSIZE;
+		data += G_MAXSSIZE;
+	}
+
+	if (len)
+		g_checksum_update(checksum, data, len);
+}
+
+static gboolean
+purple_g_checksum_digest(PurpleCipherContext *context, GChecksumType type,
+                         gsize len, guchar *digest, gsize *out_len)
+{
+	GChecksum *checksum;
+	const gssize required_length = g_checksum_type_get_length(type);
+
+	checksum = purple_cipher_context_get_data(context);
+
+	g_return_val_if_fail(len >= required_length, FALSE);
+	g_return_val_if_fail(checksum != NULL, FALSE);
+
+	g_checksum_get_digest(checksum, digest, &len);
+
+	purple_cipher_context_reset(context, NULL);
+
+	if (out_len)
+		*out_len = len;
+
+	return TRUE;
+}
+#endif
+
+
 /*******************************************************************************
  * MD5
  ******************************************************************************/
 #define MD5_HMAC_BLOCK_SIZE	64
 
+static size_t
+md5_get_block_size(PurpleCipherContext *context)
+{
+	/* This does not change (in this case) */
+	return MD5_HMAC_BLOCK_SIZE;
+}
+
+#if GLIB_CHECK_VERSION(2,16,0)
+
+static void
+md5_init(PurpleCipherContext *context, void *extra)
+{
+	purple_g_checksum_init(context, G_CHECKSUM_MD5);
+}
+
+static void
+md5_reset(PurpleCipherContext *context, void *extra)
+{
+	purple_g_checksum_reset(context, G_CHECKSUM_MD5);
+}
+
+static gboolean
+md5_digest(PurpleCipherContext *context, gsize in_len, guchar digest[16],
+           size_t *out_len)
+{
+	return purple_g_checksum_digest(context, G_CHECKSUM_MD5, in_len,
+	                                digest, out_len);
+}
+
+static PurpleCipherOps MD5Ops = {
+	NULL,			/* Set Option		*/
+	NULL,			/* Get Option		*/
+	md5_init,		/* init				*/
+	md5_reset,		/* reset			*/
+	purple_g_checksum_uninit,	/* uninit			*/
+	NULL,			/* set iv			*/
+	purple_g_checksum_append,	/* append			*/
+	md5_digest,		/* digest			*/
+	NULL,			/* encrypt			*/
+	NULL,			/* decrypt			*/
+	NULL,			/* set salt			*/
+	NULL,			/* get salt size	*/
+	NULL,			/* set key			*/
+	NULL,			/* get key size		*/
+	NULL,			/* set batch mode */
+	NULL,			/* get batch mode */
+	md5_get_block_size,	/* get block size */
+	NULL			/* set key with len */
+};
+
+#else /* GLIB_CHECK_VERSION(2,16,0) */
+
 struct MD5Context {
 	guint32 total[2];
 	guint32 state[4];
@@ -327,13 +460,6 @@ md5_digest(PurpleCipherContext *context, size_t in_len, guchar digest[16],
 	return TRUE;
 }
 
-static size_t
-md5_get_block_size(PurpleCipherContext *context)
-{
-	/* This does not change (in this case) */
-	return MD5_HMAC_BLOCK_SIZE;
-}
-
 static PurpleCipherOps MD5Ops = {
 	NULL,			/* Set option */
 	NULL,			/* Get option */
@@ -355,6 +481,8 @@ static PurpleCipherOps MD5Ops = {
 	NULL			/* set key with len */
 };
 
+#endif /* GLIB_CHECK_VERSION(2,16,0) */
+
 /*******************************************************************************
  * MD4
  ******************************************************************************/
@@ -1613,6 +1741,61 @@ static PurpleCipherOps DES3Ops = {
  * SHA-1
  ******************************************************************************/
 #define SHA1_HMAC_BLOCK_SIZE	64
+
+static size_t
+sha1_get_block_size(PurpleCipherContext *context)
+{
+	/* This does not change (in this case) */
+	return SHA1_HMAC_BLOCK_SIZE;
+}
+
+
+#if GLIB_CHECK_VERSION(2,16,0)
+
+static void
+sha1_init(PurpleCipherContext *context, void *extra)
+{
+	purple_g_checksum_init(context, G_CHECKSUM_SHA1);
+}
+
+static void
+sha1_reset(PurpleCipherContext *context, void *extra)
+{
+	purple_g_checksum_reset(context, G_CHECKSUM_SHA1);
+}
+
+static gboolean
+sha1_digest(PurpleCipherContext *context, gsize in_len, guchar digest[20],
+            gsize *out_len)
+{
+	return purple_g_checksum_digest(context, G_CHECKSUM_SHA1, in_len,
+	                                digest, out_len);
+}
+
+static PurpleCipherOps SHA1Ops = {
+	NULL,			/* Set Option		*/
+	NULL,			/* Get Option		*/
+	sha1_init,		/* init				*/
+	sha1_reset,		/* reset			*/
+	purple_g_checksum_uninit,	/* uninit			*/
+	NULL,			/* set iv			*/
+	purple_g_checksum_append,	/* append			*/
+	sha1_digest,	/* digest			*/
+	NULL,			/* encrypt			*/
+	NULL,			/* decrypt			*/
+	NULL,			/* set salt			*/
+	NULL,			/* get salt size	*/
+	NULL,			/* set key			*/
+	NULL,			/* get key size		*/
+	NULL,			/* set batch mode */
+	NULL,			/* get batch mode */
+	sha1_get_block_size,	/* get block size */
+	NULL			/* set key with len */
+};
+
+#else /* GLIB_CHECK_VERSION(2,16,0) */
+
+#define SHA1_HMAC_BLOCK_SIZE	64
 #define SHA1_ROTL(X,n) ((((X) << (n)) | ((X) >> (32-(n)))) & 0xFFFFFFFF)
 
 struct SHA1Context {
@@ -1833,13 +2016,6 @@ sha1_digest(PurpleCipherContext *context, size_t in_len, guchar digest[20],
 	return TRUE;
 }
 
-static size_t
-sha1_get_block_size(PurpleCipherContext *context)
-{
-	/* This does not change (in this case) */
-	return SHA1_HMAC_BLOCK_SIZE;
-}
-
 static PurpleCipherOps SHA1Ops = {
 	sha1_set_opt,	/* Set Option		*/
 	sha1_get_opt,	/* Get Option		*/
@@ -1861,6 +2037,311 @@ static PurpleCipherOps SHA1Ops = {
 	NULL			/* set key with len */
 };
 
+#endif /* GLIB_CHECK_VERSION(2,16,0) */
+
+/*******************************************************************************
+ * SHA-256
+ ******************************************************************************/
+#define SHA256_HMAC_BLOCK_SIZE	64
+
+static size_t
+sha256_get_block_size(PurpleCipherContext *context)
+{
+	/* This does not change (in this case) */
+	return SHA256_HMAC_BLOCK_SIZE;
+}
+
+#if GLIB_CHECK_VERSION(2,16,0)
+
+static void
+sha256_init(PurpleCipherContext *context, void *extra)
+{
+	purple_g_checksum_init(context, G_CHECKSUM_SHA256);
+}
+
+static void
+sha256_reset(PurpleCipherContext *context, void *extra)
+{
+	purple_g_checksum_reset(context, G_CHECKSUM_SHA256);
+}
+
+static gboolean
+sha256_digest(PurpleCipherContext *context, gsize in_len, guchar digest[20],
+            gsize *out_len)
+{
+	return purple_g_checksum_digest(context, G_CHECKSUM_SHA256, in_len,
+	                                digest, out_len);
+}
+
+static PurpleCipherOps SHA256Ops = {
+	NULL,			/* Set Option		*/
+	NULL,			/* Get Option		*/
+	sha256_init,	/* init				*/
+	sha256_reset,	/* reset			*/
+	purple_g_checksum_uninit,	/* uninit			*/
+	NULL,			/* set iv			*/
+	purple_g_checksum_append,	/* append			*/
+	sha256_digest,	/* digest			*/
+	NULL,			/* encrypt			*/
+	NULL,			/* decrypt			*/
+	NULL,			/* set salt			*/
+	NULL,			/* get salt size	*/
+	NULL,			/* set key			*/
+	NULL,			/* get key size		*/
+	NULL,			/* set batch mode */
+	NULL,			/* get batch mode */
+	sha256_get_block_size,	/* get block size */
+	NULL			/* set key with len */
+};
+
+#else /* GLIB_CHECK_VERSION(2,16,0) */
+
+#define SHA256_ROTR(X,n) ((((X) >> (n)) | ((X) << (32-(n)))) & 0xFFFFFFFF)
+
+static const guint32 sha256_K[64] =
+{
+	0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+	0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+	0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+	0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+	0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+	0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+	0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+	0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+};
+
+struct SHA256Context {
+	guint32 H[8];
+	guint32 W[64];
+
+	gint lenW;
+
+	guint32 sizeHi;
+	guint32 sizeLo;
+};
+
+static void
+sha256_hash_block(struct SHA256Context *sha256_ctx) {
+	gint i;
+	guint32 A, B, C, D, E, F, G, H, T1, T2;
+
+	for(i = 16; i < 64; i++) {
+		sha256_ctx->W[i] =
+			  (SHA256_ROTR(sha256_ctx->W[i-2], 17) ^ SHA256_ROTR(sha256_ctx->W[i-2],  19) ^ (sha256_ctx->W[i-2] >> 10))
+			+ sha256_ctx->W[i-7]
+			+ (SHA256_ROTR(sha256_ctx->W[i-15], 7) ^ SHA256_ROTR(sha256_ctx->W[i-15], 18) ^ (sha256_ctx->W[i-15] >> 3))
+			+ sha256_ctx->W[i-16];
+	}
+
+	A = sha256_ctx->H[0];
+	B = sha256_ctx->H[1];
+	C = sha256_ctx->H[2];
+	D = sha256_ctx->H[3];
+	E = sha256_ctx->H[4];
+	F = sha256_ctx->H[5];
+	G = sha256_ctx->H[6];
+	H = sha256_ctx->H[7];
+
+	for(i = 0; i < 64; i++) {
+        T1 = H
+			+ (SHA256_ROTR(E, 6) ^ SHA256_ROTR(E, 11) ^ SHA256_ROTR(E, 25))
+			+ ((E & F) ^ ((~E) & G))
+			+ sha256_K[i] + sha256_ctx->W[i];
+        T2 = (SHA256_ROTR(A, 2) ^ SHA256_ROTR(A, 13) ^ SHA256_ROTR(A, 22))
+			+ ((A & B) ^ (A & C) ^ (B & C));
+		H = G;
+		G = F;
+		F = E;
+		E = D + T1;
+		D = C;
+		C = B;
+		B = A;
+		A = T1 + T2;
+	}
+
+	sha256_ctx->H[0] += A;
+	sha256_ctx->H[1] += B;
+	sha256_ctx->H[2] += C;
+	sha256_ctx->H[3] += D;
+	sha256_ctx->H[4] += E;
+	sha256_ctx->H[5] += F;
+	sha256_ctx->H[6] += G;
+	sha256_ctx->H[7] += H;
+}
+
+static void
+sha256_set_opt(PurpleCipherContext *context, const gchar *name, void *value) {
+	struct SHA256Context *ctx;
+
+	ctx = purple_cipher_context_get_data(context);
+
+	if(!strcmp(name, "sizeHi")) {
+		ctx->sizeHi = GPOINTER_TO_INT(value);
+	} else if(!strcmp(name, "sizeLo")) {
+		ctx->sizeLo = GPOINTER_TO_INT(value);
+	} else if(!strcmp(name, "lenW")) {
+		ctx->lenW = GPOINTER_TO_INT(value);
+	}
+}
+
+static void *
+sha256_get_opt(PurpleCipherContext *context, const gchar *name) {
+	struct SHA256Context *ctx;
+
+	ctx = purple_cipher_context_get_data(context);
+
+	if(!strcmp(name, "sizeHi")) {
+		return GINT_TO_POINTER(ctx->sizeHi);
+	} else if(!strcmp(name, "sizeLo")) {
+		return GINT_TO_POINTER(ctx->sizeLo);
+	} else if(!strcmp(name, "lenW")) {
+		return GINT_TO_POINTER(ctx->lenW);
+	}
+
+	return NULL;
+}
+
+static void
+sha256_init(PurpleCipherContext *context, void *extra) {
+	struct SHA256Context *sha256_ctx;
+
+	sha256_ctx = g_new0(struct SHA256Context, 1);
+
+	purple_cipher_context_set_data(context, sha256_ctx);
+
+	purple_cipher_context_reset(context, extra);
+}
+
+static void
+sha256_reset(PurpleCipherContext *context, void *extra) {
+	struct SHA256Context *sha256_ctx;
+	gint i;
+
+	sha256_ctx = purple_cipher_context_get_data(context);
+
+	g_return_if_fail(sha256_ctx);
+
+	sha256_ctx->lenW = 0;
+	sha256_ctx->sizeHi = 0;
+	sha256_ctx->sizeLo = 0;
+
+	sha256_ctx->H[0] = 0x6a09e667;
+	sha256_ctx->H[1] = 0xbb67ae85;
+	sha256_ctx->H[2] = 0x3c6ef372;
+	sha256_ctx->H[3] = 0xa54ff53a;
+	sha256_ctx->H[4] = 0x510e527f;
+	sha256_ctx->H[5] = 0x9b05688c;
+	sha256_ctx->H[6] = 0x1f83d9ab;
+	sha256_ctx->H[7] = 0x5be0cd19;
+
+	for(i = 0; i < 64; i++)
+		sha256_ctx->W[i] = 0;
+}
+
+static void
+sha256_uninit(PurpleCipherContext *context) {
+	struct SHA256Context *sha256_ctx;
+
+	purple_cipher_context_reset(context, NULL);
+
+	sha256_ctx = purple_cipher_context_get_data(context);
+
+	memset(sha256_ctx, 0, sizeof(struct SHA256Context));
+
+	g_free(sha256_ctx);
+	sha256_ctx = NULL;
+}
+
+
+static void
+sha256_append(PurpleCipherContext *context, const guchar *data, size_t len) {
+	struct SHA256Context *sha256_ctx;
+	gint i;
+
+	sha256_ctx = purple_cipher_context_get_data(context);
+
+	g_return_if_fail(sha256_ctx);
+
+	for(i = 0; i < len; i++) {
+		sha256_ctx->W[sha256_ctx->lenW / 4] <<= 8;
+		sha256_ctx->W[sha256_ctx->lenW / 4] |= data[i];
+
+		if((++sha256_ctx->lenW) % 64 == 0) {
+			sha256_hash_block(sha256_ctx);
+			sha256_ctx->lenW = 0;
+		}
+
+		sha256_ctx->sizeLo += 8;
+		sha256_ctx->sizeHi += (sha256_ctx->sizeLo < 8);
+	}
+}
+
+static gboolean
+sha256_digest(PurpleCipherContext *context, size_t in_len, guchar digest[32],
+			size_t *out_len)
+{
+	struct SHA256Context *sha256_ctx;
+	guchar pad0x80 = 0x80, pad0x00 = 0x00;
+	guchar padlen[8];
+	gint i;
+
+	g_return_val_if_fail(in_len >= 32, FALSE);
+
+	sha256_ctx = purple_cipher_context_get_data(context);
+
+	g_return_val_if_fail(sha256_ctx, FALSE);
+
+	padlen[0] = (guchar)((sha256_ctx->sizeHi >> 24) & 255);
+	padlen[1] = (guchar)((sha256_ctx->sizeHi >> 16) & 255);
+	padlen[2] = (guchar)((sha256_ctx->sizeHi >> 8) & 255);
+	padlen[3] = (guchar)((sha256_ctx->sizeHi >> 0) & 255);
+	padlen[4] = (guchar)((sha256_ctx->sizeLo >> 24) & 255);
+	padlen[5] = (guchar)((sha256_ctx->sizeLo >> 16) & 255);
+	padlen[6] = (guchar)((sha256_ctx->sizeLo >> 8) & 255);
+	padlen[7] = (guchar)((sha256_ctx->sizeLo >> 0) & 255);
+
+	/* pad with a 1, then zeroes, then length */
+	purple_cipher_context_append(context, &pad0x80, 1);
+	while(sha256_ctx->lenW != 56)
+		purple_cipher_context_append(context, &pad0x00, 1);
+	purple_cipher_context_append(context, padlen, 8);
+
+	for(i = 0; i < 32; i++) {
+		digest[i] = (guchar)(sha256_ctx->H[i / 4] >> 24);
+		sha256_ctx->H[i / 4] <<= 8;
+	}
+
+	purple_cipher_context_reset(context, NULL);
+
+	if(out_len)
+		*out_len = 32;
+
+	return TRUE;
+}
+
+static PurpleCipherOps SHA256Ops = {
+	sha256_set_opt,	/* Set Option		*/
+	sha256_get_opt,	/* Get Option		*/
+	sha256_init,	/* init				*/
+	sha256_reset,	/* reset			*/
+	sha256_uninit,	/* uninit			*/
+	NULL,			/* set iv			*/
+	sha256_append,	/* append			*/
+	sha256_digest,	/* digest			*/
+	NULL,			/* encrypt			*/
+	NULL,			/* decrypt			*/
+	NULL,			/* set salt			*/
+	NULL,			/* get salt size	*/
+	NULL,			/* set key			*/
+	NULL,			/* get key size		*/
+	NULL,			/* set batch mode */
+	NULL,			/* get batch mode */
+	sha256_get_block_size,	/* get block size */
+	NULL			/* set key with len */
+};
+
+#endif /* GLIB_CHECK_VERSION(2,16,0) */
+
 /*******************************************************************************
  * RC4
  ******************************************************************************/
@@ -2124,7 +2605,7 @@ purple_cipher_digest_region(const gchar *name, const guchar *data,
 	g_return_val_if_fail(cipher, FALSE);
 
 	if(!cipher->ops->append || !cipher->ops->digest) {
-		purple_debug_info("cipher", "purple_cipher_region failed: "
+		purple_debug_warning("cipher", "purple_cipher_region failed: "
 						"the %s cipher does not support appending and or "
 						"digesting.", cipher->name);
 		return FALSE;
@@ -2228,6 +2709,7 @@ purple_ciphers_init() {
 
 	purple_ciphers_register_cipher("md5", &MD5Ops);
 	purple_ciphers_register_cipher("sha1", &SHA1Ops);
+	purple_ciphers_register_cipher("sha256", &SHA256Ops);
 	purple_ciphers_register_cipher("md4", &MD4Ops);
 	purple_ciphers_register_cipher("hmac", &HMACOps);
 	purple_ciphers_register_cipher("des", &DESOps);
@@ -2245,8 +2727,6 @@ purple_ciphers_uninit() {
 
 		cipher = PURPLE_CIPHER(l->data);
 		purple_ciphers_unregister_cipher(cipher);
-
-		ciphers = g_list_remove(ciphers, cipher);
 	}
 
 	g_list_free(ciphers);
@@ -2271,7 +2751,7 @@ purple_cipher_context_set_option(PurpleCipherContext *context, const gchar *name
 	if(cipher->ops && cipher->ops->set_option)
 		cipher->ops->set_option(context, name, value);
 	else
-		purple_debug_info("cipher", "the %s cipher does not support the "
+		purple_debug_warning("cipher", "the %s cipher does not support the "
 						"set_option operation\n", cipher->name);
 }
 
@@ -2288,7 +2768,7 @@ purple_cipher_context_get_option(PurpleCipherContext *context, const gchar *name
 	if(cipher->ops && cipher->ops->get_option)
 		return cipher->ops->get_option(context, name);
 	else {
-		purple_debug_info("cipher", "the %s cipher does not support the "
+		purple_debug_warning("cipher", "the %s cipher does not support the "
 						"get_option operation\n", cipher->name);
 
 		return NULL;
@@ -2371,7 +2851,7 @@ purple_cipher_context_set_iv(PurpleCipherContext *context, guchar *iv, size_t le
 	if(cipher->ops && cipher->ops->set_iv)
 		cipher->ops->set_iv(context, iv, len);
 	else
-		purple_debug_info("cipher", "the %s cipher does not support the set"
+		purple_debug_warning("cipher", "the %s cipher does not support the set"
 						"initialization vector operation\n", cipher->name);
 }
 
@@ -2389,7 +2869,7 @@ purple_cipher_context_append(PurpleCipherContext *context, const guchar *data,
 	if(cipher->ops && cipher->ops->append)
 		cipher->ops->append(context, data, len);
 	else
-		purple_debug_info("cipher", "the %s cipher does not support the append "
+		purple_debug_warning("cipher", "the %s cipher does not support the append "
 						"operation\n", cipher->name);
 }
 
@@ -2406,7 +2886,7 @@ purple_cipher_context_digest(PurpleCipherContext *context, size_t in_len,
 	if(cipher->ops && cipher->ops->digest)
 		return cipher->ops->digest(context, in_len, digest, out_len);
 	else {
-		purple_debug_info("cipher", "the %s cipher does not support the digest "
+		purple_debug_warning("cipher", "the %s cipher does not support the digest "
 						"operation\n", cipher->name);
 		return FALSE;
 	}
@@ -2456,7 +2936,7 @@ purple_cipher_context_encrypt(PurpleCipherContext *context, const guchar data[],
 	if(cipher->ops && cipher->ops->encrypt)
 		return cipher->ops->encrypt(context, data, len, output, outlen);
 	else {
-		purple_debug_info("cipher", "the %s cipher does not support the encrypt"
+		purple_debug_warning("cipher", "the %s cipher does not support the encrypt"
 						"operation\n", cipher->name);
 
 		if(outlen)
@@ -2480,7 +2960,7 @@ purple_cipher_context_decrypt(PurpleCipherContext *context, const guchar data[],
 	if(cipher->ops && cipher->ops->decrypt)
 		return cipher->ops->decrypt(context, data, len, output, outlen);
 	else {
-		purple_debug_info("cipher", "the %s cipher does not support the decrypt"
+		purple_debug_warning("cipher", "the %s cipher does not support the decrypt"
 						"operation\n", cipher->name);
 
 		if(outlen)
@@ -2502,7 +2982,7 @@ purple_cipher_context_set_salt(PurpleCipherContext *context, guchar *salt) {
 	if(cipher->ops && cipher->ops->set_salt)
 		cipher->ops->set_salt(context, salt);
 	else
-		purple_debug_info("cipher", "the %s cipher does not support the "
+		purple_debug_warning("cipher", "the %s cipher does not support the "
 						"set_salt operation\n", cipher->name);
 }
 
@@ -2518,7 +2998,7 @@ purple_cipher_context_get_salt_size(PurpleCipherContext *context) {
 	if(cipher->ops && cipher->ops->get_salt_size)
 		return cipher->ops->get_salt_size(context);
 	else {
-		purple_debug_info("cipher", "the %s cipher does not support the "
+		purple_debug_warning("cipher", "the %s cipher does not support the "
 						"get_salt_size operation\n", cipher->name);
 
 		return -1;
@@ -2537,7 +3017,7 @@ purple_cipher_context_set_key(PurpleCipherContext *context, const guchar *key) {
 	if(cipher->ops && cipher->ops->set_key)
 		cipher->ops->set_key(context, key);
 	else
-		purple_debug_info("cipher", "the %s cipher does not support the "
+		purple_debug_warning("cipher", "the %s cipher does not support the "
 						"set_key operation\n", cipher->name);
 }
 
@@ -2553,7 +3033,7 @@ purple_cipher_context_get_key_size(PurpleCipherContext *context) {
 	if(cipher->ops && cipher->ops->get_key_size)
 		return cipher->ops->get_key_size(context);
 	else {
-		purple_debug_info("cipher", "the %s cipher does not support the "
+		purple_debug_warning("cipher", "the %s cipher does not support the "
 						"get_key_size operation\n", cipher->name);
 
 		return -1;
@@ -2574,7 +3054,7 @@ purple_cipher_context_set_batch_mode(PurpleCipherContext *context,
 	if(cipher->ops && cipher->ops->set_batch_mode)
 		cipher->ops->set_batch_mode(context, mode);
 	else
-		purple_debug_info("cipher", "The %s cipher does not support the "
+		purple_debug_warning("cipher", "The %s cipher does not support the "
 		                            "set_batch_mode operation\n", cipher->name);
 }
 
@@ -2591,7 +3071,7 @@ purple_cipher_context_get_batch_mode(PurpleCipherContext *context)
 	if(cipher->ops && cipher->ops->get_batch_mode)
 		return cipher->ops->get_batch_mode(context);
 	else {
-		purple_debug_info("cipher", "The %s cipher does not support the "
+		purple_debug_warning("cipher", "The %s cipher does not support the "
 		                            "get_batch_mode operation\n", cipher->name);
 		return -1;
 	}
@@ -2610,7 +3090,7 @@ purple_cipher_context_get_block_size(PurpleCipherContext *context)
 	if(cipher->ops && cipher->ops->get_block_size)
 		return cipher->ops->get_block_size(context);
 	else {
-		purple_debug_info("cipher", "The %s cipher does not support the "
+		purple_debug_warning("cipher", "The %s cipher does not support the "
 		                            "get_block_size operation\n", cipher->name);
 		return -1;
 	}
@@ -2630,7 +3110,7 @@ purple_cipher_context_set_key_with_len(PurpleCipherContext *context,
 	if(cipher->ops && cipher->ops->set_key_with_len)
 		cipher->ops->set_key_with_len(context, key, len);
 	else
-		purple_debug_info("cipher", "The %s cipher does not support the "
+		purple_debug_warning("cipher", "The %s cipher does not support the "
 		                            "set_key_with_len operation\n", cipher->name);
 }
 
diff --git a/libpurple/circbuffer.c b/libpurple/circbuffer.c
index 3c6af4301e..619d9c9758 100644
--- a/libpurple/circbuffer.c
+++ b/libpurple/circbuffer.c
@@ -68,7 +68,8 @@ static void grow_circ_buffer(PurpleCircBuffer *buf, gsize len) {
 
 	/* If the fill pointer is wrapped to before the remove
 	 * pointer, we need to shift the data */
-	if (in_offset < out_offset) {
+	if (in_offset < out_offset
+			|| (in_offset == out_offset && buf->bufused > 0)) {
 		int shift_n = MIN(buf->buflen - start_buflen,
 			in_offset);
 		memcpy(buf->buffer + start_buflen, buf->buffer,
diff --git a/libpurple/connection.c b/libpurple/connection.c
index 6a47f3b795..59ed00f32c 100644
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -309,7 +309,7 @@ _purple_connection_destroy(PurpleConnection *gc)
 	g_free(gc->password);
 	g_free(gc->display_name);
 
-	if (gc->disconnect_timeout)
+	if (gc->disconnect_timeout > 0)
 		purple_timeout_remove(gc->disconnect_timeout);
 
 	PURPLE_DBUS_UNREGISTER_POINTER(gc);
@@ -515,11 +515,20 @@ purple_connection_notice(PurpleConnection *gc, const char *text)
 static gboolean
 purple_connection_disconnect_cb(gpointer data)
 {
-	PurpleAccount *account = data;
-	char *password = g_strdup(purple_account_get_password(account));
+	PurpleAccount *account;
+	PurpleConnection *gc;
+	char *password;
+
+	account = data;
+	gc = purple_account_get_connection(account);
+
+	gc->disconnect_timeout = 0;
+
+	password = g_strdup(purple_account_get_password(account));
 	purple_account_disconnect(account);
 	purple_account_set_password(account, password);
 	g_free(password);
+
 	return FALSE;
 }
 
@@ -564,11 +573,14 @@ purple_connection_error_reason (PurpleConnection *gc,
 	}
 
 	/* If we've already got one error, we don't need any more */
-	if (gc->disconnect_timeout)
+	if (gc->disconnect_timeout > 0)
 		return;
 
 	gc->wants_to_die = purple_connection_error_is_fatal (reason);
 
+	purple_debug_info("connection", "Connection error on %p (reason: %u description: %s)\n",
+	                  gc, reason, description);
+
 	ops = purple_connections_get_ui_ops();
 
 	if (ops != NULL)
diff --git a/libpurple/connection.h b/libpurple/connection.h
index 6b715e495a..8a0291ef5c 100644
--- a/libpurple/connection.h
+++ b/libpurple/connection.h
@@ -72,7 +72,7 @@ typedef enum
 	PURPLE_CONNECTION_ERROR_INVALID_USERNAME = 1,
 	/** The username, password or some other credential was incorrect.  Use
 	 *  #PURPLE_CONNECTION_ERROR_INVALID_USERNAME instead if the username
-         *  is known to be invalid.
+	 *  is known to be invalid.
 	 */
 	PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED = 2,
 	/** libpurple doesn't speak any of the authentication methods the
@@ -560,6 +560,9 @@ GList *purple_connections_get_connecting(void);
  * Checks if gc is still a valid pointer to a gc.
  *
  * @return @c TRUE if gc is valid.
+ *
+ * @deprecated Do not use this.  Instead, cancel your asynchronous request
+ *             when the PurpleConnection is destroyed.
  */
 /*
  * TODO: Eventually this bad boy will be removed, because it is
diff --git a/libpurple/conversation.c b/libpurple/conversation.c
index 6387db9811..5568d79f11 100644
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -33,13 +33,43 @@
 #include "signals.h"
 #include "util.h"
 
-#define SEND_TYPED_TIMEOUT 5000
+#define SEND_TYPED_TIMEOUT_SECONDS 5
 
 static GList *conversations = NULL;
 static GList *ims = NULL;
 static GList *chats = NULL;
 static PurpleConversationUiOps *default_ops = NULL;
 
+/**
+ * A hash table used for efficient lookups of conversations by name.
+ * struct _purple_hconv => PurpleConversation*
+ */
+static GHashTable *conversation_cache = NULL;
+
+struct _purple_hconv {
+	PurpleConversationType type;
+	char *name;
+	const PurpleAccount *account;
+};
+
+static guint _purple_conversations_hconv_hash(struct _purple_hconv *hc)
+{
+	return g_str_hash(hc->name) ^ hc->type ^ g_direct_hash(hc->account);
+}
+
+static guint _purple_conversations_hconv_equal(struct _purple_hconv *hc1, struct _purple_hconv *hc2)
+{
+	return (hc1->type == hc2->type &&
+	        hc1->account == hc2->account &&
+	        g_str_equal(hc1->name, hc2->name));
+}
+
+static void _purple_conversations_hconv_free_key(struct _purple_hconv *hc)
+{
+	g_free(hc->name);
+	g_free(hc);
+}
+
 void
 purple_conversations_set_ui_ops(PurpleConversationUiOps *ops)
 {
@@ -55,7 +85,6 @@ reset_typing_cb(gpointer data)
 	im = PURPLE_CONV_IM(c);
 
 	purple_conv_im_set_typing_state(im, PURPLE_NOT_TYPING);
-	purple_conv_im_update_typing(im);
 	purple_conv_im_stop_typing_timeout(im);
 
 	return FALSE;
@@ -288,6 +317,7 @@ purple_conversation_new(PurpleConversationType type, PurpleAccount *account,
 	PurpleConversation *conv;
 	PurpleConnection *gc;
 	PurpleConversationUiOps *ops;
+	struct _purple_hconv *hc;
 
 	g_return_val_if_fail(type    != PURPLE_CONV_TYPE_UNKNOWN, NULL);
 	g_return_val_if_fail(account != NULL, NULL);
@@ -296,6 +326,21 @@ purple_conversation_new(PurpleConversationType type, PurpleAccount *account,
 	/* Check if this conversation already exists. */
 	if ((conv = purple_find_conversation_with_account(type, name, account)) != NULL)
 	{
+		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT &&
+				!purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) {
+			purple_debug_warning("conversation", "Trying to create multiple "
+					"chats (%s) with the same name is deprecated and will be "
+					"removed in libpurple 3.0.0", name);
+		}
+
+		/*
+		 * This hack is necessary because some prpls (MSN) have unnamed chats
+		 * that all use the same name.  A PurpleConversation for one of those
+		 * is only ever re-used if the user has left, so calls to
+		 * purple_conversation_new need to fall-through to creating a new
+		 * chat.
+		 * TODO 3.0.0: Remove this workaround and mandate unique names.
+		 */
 		if (purple_conversation_get_type(conv) != PURPLE_CONV_TYPE_CHAT ||
 				purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv)))
 		{
@@ -328,7 +373,7 @@ purple_conversation_new(PurpleConversationType type, PurpleAccount *account,
 		conv->u.im->conv = conv;
 		PURPLE_DBUS_REGISTER_POINTER(conv->u.im, PurpleConvIm);
 
-		ims = g_list_append(ims, conv);
+		ims = g_list_prepend(ims, conv);
 		if ((icon = purple_buddy_icons_find(account, name)))
 		{
 			purple_conv_im_set_icon(conv->u.im, icon);
@@ -350,7 +395,7 @@ purple_conversation_new(PurpleConversationType type, PurpleAccount *account,
 		conv->u.chat->conv = conv;
 		PURPLE_DBUS_REGISTER_POINTER(conv->u.chat, PurpleConvChat);
 
-		chats = g_list_append(chats, conv);
+		chats = g_list_prepend(chats, conv);
 
 		if ((disp = purple_connection_get_display_name(account->gc)))
 			purple_conv_chat_set_nick(conv->u.chat, disp);
@@ -365,7 +410,14 @@ purple_conversation_new(PurpleConversationType type, PurpleAccount *account,
 		}
 	}
 
-	conversations = g_list_append(conversations, conv);
+	conversations = g_list_prepend(conversations, conv);
+
+	hc = g_new(struct _purple_hconv, 1);
+	hc->name = g_strdup(purple_normalize(account, conv->name));
+	hc->account = account;
+	hc->type = type;
+
+	g_hash_table_insert(conversation_cache, hc, conv);
 
 	/* Auto-set the title. */
 	purple_conversation_autoset_title(conv);
@@ -391,6 +443,7 @@ purple_conversation_destroy(PurpleConversation *conv)
 	PurpleConversationUiOps *ops;
 	PurpleConnection *gc;
 	const char *name;
+	struct _purple_hconv hc;
 
 	g_return_if_fail(conv != NULL);
 
@@ -467,6 +520,12 @@ purple_conversation_destroy(PurpleConversation *conv)
 	else if(conv->type==PURPLE_CONV_TYPE_CHAT)
 		chats = g_list_remove(chats, conv);
 
+	hc.name = (gchar *)purple_normalize(conv->account, conv->name);
+	hc.account = conv->account;
+	hc.type = conv->type;
+
+	g_hash_table_remove(conversation_cache, &hc);
+
 	purple_signal_emit(purple_conversations_get_handle(),
 					 "deleting-conversation", conv);
 
@@ -693,10 +752,20 @@ purple_conversation_foreach(void (*func)(PurpleConversation *conv))
 void
 purple_conversation_set_name(PurpleConversation *conv, const char *name)
 {
+	struct _purple_hconv *hc;
 	g_return_if_fail(conv != NULL);
 
+	hc = g_new(struct _purple_hconv, 1);
+	hc->type = conv->type;
+	hc->account = conv->account;
+	hc->name = (gchar *)purple_normalize(conv->account, conv->name);
+
+	g_hash_table_remove(conversation_cache, hc);
 	g_free(conv->name);
+
 	conv->name = g_strdup(name);
+	hc->name = g_strdup(purple_normalize(conv->account, conv->name));
+	g_hash_table_insert(conversation_cache, hc, conv);
 
 	purple_conversation_autoset_title(conv);
 }
@@ -805,43 +874,31 @@ purple_find_conversation_with_account(PurpleConversationType type,
 									const PurpleAccount *account)
 {
 	PurpleConversation *c = NULL;
-	gchar *name1;
-	const gchar *name2;
-	GList *cnv;
+	struct _purple_hconv hc;
 
 	g_return_val_if_fail(name != NULL, NULL);
 
+	hc.name = (gchar *)purple_normalize(account, name);
+	hc.account = account;
+	hc.type = type;
+
 	switch (type) {
 		case PURPLE_CONV_TYPE_IM:
-			cnv = purple_get_ims();
-			break;
 		case PURPLE_CONV_TYPE_CHAT:
-			cnv = purple_get_chats();
+			c = g_hash_table_lookup(conversation_cache, &hc);
 			break;
 		case PURPLE_CONV_TYPE_ANY:
-			cnv = purple_get_conversations();
+			hc.type = PURPLE_CONV_TYPE_IM;
+			c = g_hash_table_lookup(conversation_cache, &hc);
+			if (!c) {
+				hc.type = PURPLE_CONV_TYPE_CHAT;
+				c = g_hash_table_lookup(conversation_cache, &hc);
+			}
 			break;
 		default:
 			g_return_val_if_reached(NULL);
 	}
 
-	name1 = g_strdup(purple_normalize(account, name));
-
-	for (; cnv != NULL; cnv = cnv->next) {
-		c = (PurpleConversation *)cnv->data;
-		name2 = purple_normalize(account, purple_conversation_get_name(c));
-
-		if ((account == purple_conversation_get_account(c)) &&
-				!purple_utf8_strcasecmp(name1, name2)) {
-
-			break;
-		}
-
-		c = NULL;
-	}
-
-	g_free(name1);
-
 	return c;
 }
 
@@ -1050,6 +1107,8 @@ purple_conv_im_set_typing_state(PurpleConvIm *im, PurpleTypingState state)
 								   "buddy-typing-stopped", im->conv->account, im->conv->name);
 				break;
 		}
+
+		purple_conv_im_update_typing(im);
 	}
 }
 
@@ -1122,8 +1181,9 @@ purple_conv_im_start_send_typed_timeout(PurpleConvIm *im)
 {
 	g_return_if_fail(im != NULL);
 
-	im->send_typed_timeout = purple_timeout_add(SEND_TYPED_TIMEOUT, send_typed_cb,
-											  purple_conv_im_get_conversation(im));
+	im->send_typed_timeout = purple_timeout_add_seconds(SEND_TYPED_TIMEOUT_SECONDS,
+	                                                    send_typed_cb,
+	                                                    purple_conv_im_get_conversation(im));
 }
 
 void
@@ -1476,11 +1536,11 @@ purple_conv_chat_write(PurpleConvChat *chat, const char *who, const char *messag
 		return;
 
 	if (!(flags & PURPLE_MESSAGE_WHISPER)) {
-		char *str;
+		const char *str;
 
-		str = g_strdup(purple_normalize(account, who));
+		str = purple_normalize(account, who);
 
-		if (purple_strequal(str, purple_normalize(account, chat->nick))) {
+		if (purple_strequal(str, chat->nick)) {
 			flags |= PURPLE_MESSAGE_SEND;
 		} else {
 			flags |= PURPLE_MESSAGE_RECV;
@@ -1488,8 +1548,6 @@ purple_conv_chat_write(PurpleConvChat *chat, const char *who, const char *messag
 			if (purple_utf8_has_word(message, chat->nick))
 				flags |= PURPLE_MESSAGE_NICK;
 		}
-
-		g_free(str);
 	}
 
 	/* Pass this on to either the ops structure or the default write func. */
@@ -2004,6 +2062,66 @@ purple_conv_chat_left(PurpleConvChat *chat)
 	purple_conversation_update(chat->conv, PURPLE_CONV_UPDATE_CHATLEFT);
 }
 
+static void
+invite_user_to_chat(gpointer data, PurpleRequestFields *fields)
+{
+	PurpleConversation *conv;
+	PurpleConvChat *chat;
+	const char *user, *message;
+
+	conv = data;
+	chat = PURPLE_CONV_CHAT(conv);
+	user = purple_request_fields_get_string(fields, "screenname");
+	message = purple_request_fields_get_string(fields, "message");
+
+	serv_chat_invite(purple_conversation_get_gc(conv), chat->id, message, user);
+}
+
+void purple_conv_chat_invite_user(PurpleConvChat *chat, const char *user,
+		const char *message, gboolean confirm)
+{
+	PurpleAccount *account;
+	PurpleConversation *conv;
+	PurpleRequestFields *fields;
+	PurpleRequestFieldGroup *group;
+	PurpleRequestField *field;
+
+	g_return_if_fail(chat);
+
+	if (!user || !*user || !message || !*message)
+		confirm = TRUE;
+
+	conv = chat->conv;
+	account = conv->account;
+
+	if (!confirm) {
+		serv_chat_invite(purple_account_get_connection(account),
+				purple_conv_chat_get_id(chat), message, user);
+		return;
+	}
+
+	fields = purple_request_fields_new();
+	group = purple_request_field_group_new(_("Invite to chat"));
+	purple_request_fields_add_group(fields, group);
+
+	field = purple_request_field_string_new("screenname", _("Buddy"), user, FALSE);
+	purple_request_field_group_add_field(group, field);
+	purple_request_field_set_required(field, TRUE);
+	purple_request_field_set_type_hint(field, "screenname");
+
+	field = purple_request_field_string_new("message", _("Message"), message, FALSE);
+	purple_request_field_group_add_field(group, field);
+
+	purple_request_fields(conv, _("Invite to chat"), NULL,
+			_("Please enter the name of the user you wish to invite, "
+				"along with an optional invite message."),
+			fields,
+			_("Invite"), G_CALLBACK(invite_user_to_chat),
+			_("Cancel"), NULL,
+			account, user, conv,
+			conv);
+}
+
 gboolean
 purple_conv_chat_has_left(PurpleConvChat *chat)
 {
@@ -2140,6 +2258,10 @@ purple_conversations_init(void)
 {
 	void *handle = purple_conversations_get_handle();
 
+	conversation_cache = g_hash_table_new_full((GHashFunc)_purple_conversations_hconv_hash,
+						(GEqualFunc)_purple_conversations_hconv_equal,
+						(GDestroyNotify)_purple_conversations_hconv_free_key, NULL);
+
 	/**********************************************************************
 	 * Register preferences
 	 **********************************************************************/
@@ -2429,6 +2551,7 @@ purple_conversations_uninit(void)
 {
 	while (conversations)
 		purple_conversation_destroy((PurpleConversation*)conversations->data);
+	g_hash_table_destroy(conversation_cache);
 	purple_signals_unregister_by_instance(purple_conversations_get_handle());
 }
 
diff --git a/libpurple/conversation.h b/libpurple/conversation.h
index e280f9f759..9090645d4e 100644
--- a/libpurple/conversation.h
+++ b/libpurple/conversation.h
@@ -1300,6 +1300,22 @@ PurpleConversation *purple_find_chat(const PurpleConnection *gc, int id);
 void purple_conv_chat_left(PurpleConvChat *chat);
 
 /**
+ * Invite a user to a chat.
+ * The user will be prompted to enter the user's name or a message if one is
+ * not given.
+ *
+ * @param chat     The chat.
+ * @param user     The user to invite to the chat.
+ * @param message  The message to send with the invitation.
+ * @param confirm  Prompt before sending the invitation. The user is always
+ *                 prompted if either #user or #message is @c NULL.
+ *
+ * @since 2.6.0
+ */
+void purple_conv_chat_invite_user(PurpleConvChat *chat, const char *user,
+		const char *message, gboolean confirm);
+
+/**
  * Returns true if we're no longer in this chat,
  * and just left the window open.
  *
diff --git a/libpurple/core.c b/libpurple/core.c
index c15d4fd77b..d4e02dc5c2 100644
--- a/libpurple/core.c
+++ b/libpurple/core.c
@@ -175,7 +175,6 @@ purple_core_init(const char *ui)
 	purple_xfers_init();
 	purple_idle_init();
 	purple_smileys_init();
-	purple_theme_manager_init();
 	/*
 	 * Call this early on to try to auto-detect our IP address and
 	 * hopefully save some time later.
@@ -216,15 +215,10 @@ purple_core_quit(void)
 	/* The SSL plugins must be uninit before they're unloaded */
 	purple_ssl_uninit();
 
-	/* Unload all plugins before the UI because UI plugins might call
-	 * UI-specific functions */
-	purple_debug_info("main", "Unloading all plugins\n");
-	purple_plugins_destroy_all();
-
-	/* Shut down the UI before all the subsystems */
-	ops = purple_core_get_ui_ops();
-	if (ops != NULL && ops->quit != NULL)
-		ops->quit();
+	/* Unload all non-loader, non-prpl plugins before shutting down
+	 * subsystems. */
+	purple_debug_info("main", "Unloading normal plugins\n");
+	purple_plugins_unload(PURPLE_PLUGIN_STANDARD);
 
 	/* Save .xml files, remove signals, etc. */
 	purple_smileys_uninit();
@@ -236,9 +230,9 @@ purple_core_quit(void)
 	purple_conversations_uninit();
 	purple_connections_uninit();
 	purple_buddy_icons_uninit();
-	purple_accounts_uninit();
 	purple_savedstatuses_uninit();
 	purple_status_uninit();
+	purple_accounts_uninit();
 	purple_sound_uninit();
 	purple_theme_manager_uninit();
 	purple_xfers_uninit();
@@ -247,7 +241,16 @@ purple_core_quit(void)
 	purple_imgstore_uninit();
 	purple_network_uninit();
 
-	/* Everything after this must not try to read any prefs */
+	/* Everything after unloading all plugins must not fail if prpls aren't
+	 * around */
+	purple_debug_info("main", "Unloading all plugins\n");
+	purple_plugins_destroy_all();
+
+	ops = purple_core_get_ui_ops();
+	if (ops != NULL && ops->quit != NULL)
+		ops->quit();
+
+	/* Everything after prefs_uninit must not try to read any prefs */
 	purple_prefs_uninit();
 	purple_plugins_uninit();
 #ifdef HAVE_DBUS
@@ -255,8 +258,9 @@ purple_core_quit(void)
 #endif
 
 	purple_cmds_uninit();
-	/* Everything after this cannot try to write things to the confdir */
+	/* Everything after util_uninit cannot try to write things to the confdir */
 	purple_util_uninit();
+	purple_log_uninit();
 
 	purple_signals_uninit();
 
diff --git a/libpurple/core.h b/libpurple/core.h
index 958685dd6b..954c930015 100644
--- a/libpurple/core.h
+++ b/libpurple/core.h
@@ -186,6 +186,12 @@ gboolean purple_core_ensure_single_instance(void);
  *
  *   <dt><tt>dev_website</tt></dt>
  *   <dd>the UI's development/support website, such as http://developer.pidgin.im.</dd>
+ *
+ *   <dt><tt>client_type</tt></dt>
+ *   <dd>the type of UI. Possible values include 'pc', 'console', 'phone',
+ *       'handheld', 'web', and 'bot'. These values are compared
+ *       programmatically and should not be localized.</dd>
+ *   
  * </dl>
  *
  * @return A GHashTable with strings for keys and values.  This
diff --git a/libpurple/dbus-analyze-functions.py b/libpurple/dbus-analyze-functions.py
index 9675b7b59c..2433256327 100644
--- a/libpurple/dbus-analyze-functions.py
+++ b/libpurple/dbus-analyze-functions.py
@@ -31,6 +31,15 @@ excluded = [\
     "purple_account_unregister",
     "purple_connection_new_unregister",
 
+    # These functions are excluded because they involve setting arbitrary
+    # data via pointers for protocols and UIs.  This just won't work.
+    "purple_blist_get_ui_data",
+    "purple_blist_set_ui_data",
+    "purple_blist_node_get_ui_data",
+    "purple_blist_node_set_ui_data",
+    "purple_buddy_get_protocol_data",
+    "purple_buddy_set_protocol_data",
+
     # This is excluded because this script treats PurpleLogReadFlags*
     # as pointer to a struct, instead of a pointer to an enum.  This
     # causes a compilation error. Someone should fix this script.
diff --git a/libpurple/dbus-analyze-signals.py b/libpurple/dbus-analyze-signals.py
new file mode 100644
index 0000000000..c60c46dc8b
--- /dev/null
+++ b/libpurple/dbus-analyze-signals.py
@@ -0,0 +1,60 @@
+# This program takes a C source as the input and produces the list of
+# all signals registered.
+#
+# Output is:
+#   <signal name="Changed">
+#       <arg name="new_value" type="b"/>
+#   </signal>
+
+import re
+import sys
+
+# List "excluded" contains signals that shouldn't be exported via
+# DBus.  If you remove a signal from this list, please make sure
+# that it does not break "make" with the configure option
+# "--enable-dbus" turned on.
+
+excluded = [\
+    # purple_dbus_signal_emit_purple prevents our "dbus-method-called"
+    # signal from being propagated to dbus.
+	"dbus-method-called",
+    ]
+
+registerregex = re.compile("purple_signal_register[^;]+\"([\w\-]+)\"[^;]+(purple_marshal_\w+)[^;]+;")
+nameregex = re.compile('[-_][a-z]')
+
+print "/* Generated by %s.  Do not edit! */" % sys.argv[0]
+print "const char *dbus_signals = "
+for match in registerregex.finditer(sys.stdin.read()):
+    signal = match.group(1)
+    marshal = match.group(2)
+    if signal in excluded:
+        continue
+
+    signal = nameregex.sub(lambda x:x.group()[1].upper(), '-'+signal)
+    print "\"<signal name='%s'>\\n\""%signal
+
+    args = marshal.split('_')
+    # ['purple', 'marshal', <return type>, '', args...]
+    if len(args) > 4:
+        for arg in args[4:]:
+            if arg == "POINTER":
+                type = 'p'
+            elif arg == "ENUM":
+                type = 'i'
+            elif arg == "INT":
+                type = 'i'
+            elif arg == "UINT":
+                type = 'u'
+            elif arg == "INT64":
+                type = 'x'
+            elif arg == "UINT64":
+                type = 't'
+            elif arg == "BOOLEAN":
+                type = 'b'
+            print "\"<arg type='%s'/>\\n\""%type
+
+    print "\"</signal>\\n\""
+
+print ";"
+
diff --git a/libpurple/dbus-server.c b/libpurple/dbus-server.c
index 930a2a591a..efe59770f2 100644
--- a/libpurple/dbus-server.c
+++ b/libpurple/dbus-server.c
@@ -421,6 +421,7 @@ purple_dbus_get_connection(void)
 }
 
 #include "dbus-bindings.c"
+#include "dbus-signals.c"
 
 static gboolean
 purple_dbus_dispatch_cb(DBusConnection *connection,
@@ -489,6 +490,9 @@ static DBusMessage *purple_dbus_introspect(DBusMessage *message)
 	DBusMessage *reply;
 	GString *str;
 	GList *bindings_list, *node;
+	const char *signals;
+	const char *type;
+	const char *pointer_type;
 
 	str = g_string_sized_new(0x1000); /* TODO: why this size? */
 
@@ -529,6 +533,19 @@ static DBusMessage *purple_dbus_introspect(DBusMessage *message)
 		}
 	}
 
+	if (sizeof(int) == sizeof(dbus_int32_t))
+		pointer_type = "type='i'";
+	else
+		pointer_type = "type='x'";
+
+	signals = dbus_signals;
+	while ((type = strstr(signals, "type='p'")) != NULL) {
+		g_string_append_len(str, signals, type - signals);
+		g_string_append(str, pointer_type);
+		signals = type + sizeof("type='p'") - 1;
+	}
+	g_string_append(str, signals);
+
 	g_string_append(str, "</interface>\n</node>\n");
 
 	reply = dbus_message_new_method_return(message);
diff --git a/libpurple/dbus-server.h b/libpurple/dbus-server.h
index e970866e9d..5215dccbae 100644
--- a/libpurple/dbus-server.h
+++ b/libpurple/dbus-server.h
@@ -192,9 +192,9 @@ void purple_dbus_uninit(void);
 /**
 
  Macro #DBUS_EXPORT expands to nothing.  It is used to indicate to the
- dbus-analize-functions.py script that the given function should be
+ dbus-analyze-functions.py script that the given function should be
  available to other applications through DBUS.  If
- dbus-analize-functions.py is run without the "--export-only" option,
+ dbus-analyze-functions.py is run without the "--export-only" option,
  this prefix is ignored.
 
  */
@@ -204,7 +204,7 @@ void purple_dbus_uninit(void);
 /*
    Here we include the list of #PURPLE_DBUS_DECLARE_TYPE statements for
    all structs defined in purple.  This file has been generated by the
-   #dbus-analize-types.py script.
+   #dbus-analyze-types.py script.
 */
 
 #include "dbus-types.h"
diff --git a/libpurple/debug.c b/libpurple/debug.c
index 3682c9e708..30b12fdb55 100644
--- a/libpurple/debug.c
+++ b/libpurple/debug.c
@@ -36,12 +36,20 @@ static PurpleDebugUiOps *debug_ui_ops = NULL;
  *
  * It doesn't make sense to make this a normal Purple preference
  * because it's a command line option.  This will always be FALSE,
- * unless the user explicitly started Purple with the -d flag.
+ * unless the user explicitly started the UI with the -d flag.
  * It doesn't matter what this value was the last time Purple was
  * started, so it doesn't make sense to save it in prefs.
  */
 static gboolean debug_enabled = FALSE;
 
+/*
+ * These determine whether verbose or unsafe debugging are desired.  I
+ * don't want to make these purple preferences because their values should
+ * not be remembered across instances of the UI.
+ */
+static gboolean debug_verbose = FALSE;
+static gboolean debug_unsafe = FALSE;
+
 static void
 purple_debug_vargs(PurpleDebugLevel level, const char *category,
 				 const char *format, va_list args)
@@ -175,6 +183,30 @@ purple_debug_set_ui_ops(PurpleDebugUiOps *ops)
 	debug_ui_ops = ops;
 }
 
+gboolean
+purple_debug_is_verbose()
+{
+	return debug_verbose;
+}
+
+void
+purple_debug_set_verbose(gboolean verbose)
+{
+	debug_verbose = verbose;
+}
+
+gboolean
+purple_debug_is_unsafe()
+{
+	return debug_unsafe;
+}
+
+void
+purple_debug_set_unsafe(gboolean unsafe)
+{
+	debug_unsafe = unsafe;
+}
+
 PurpleDebugUiOps *
 purple_debug_get_ui_ops(void)
 {
@@ -184,6 +216,13 @@ purple_debug_get_ui_ops(void)
 void
 purple_debug_init(void)
 {
+	/* Read environment variables once per init */
+	if(g_getenv("PURPLE_UNSAFE_DEBUG"))
+		purple_debug_set_unsafe(TRUE);
+
+	if(g_getenv("PURPLE_VERBOSE_DEBUG"))
+		purple_debug_set_verbose(TRUE);
+
 	purple_prefs_add_none("/purple/debug");
 
 	/*
@@ -193,3 +232,4 @@ purple_debug_init(void)
 	 */
 	purple_prefs_add_bool("/purple/debug/timestamps", TRUE);
 }
+
diff --git a/libpurple/debug.h b/libpurple/debug.h
index 682b4e464a..67dd91ce7b 100644
--- a/libpurple/debug.h
+++ b/libpurple/debug.h
@@ -151,10 +151,50 @@ void purple_debug_set_enabled(gboolean enabled);
 /**
  * Check if console debug output is enabled.
  *
- * @return TRUE if debuggin is enabled, FALSE if it is not.
+ * @return TRUE if debugging is enabled, FALSE if it is not.
  */
 gboolean purple_debug_is_enabled(void);
 
+/**
+ * Enable or disable verbose debugging.  This ordinarily should only be called
+ * by #purple_debug_init, but there are cases where this can be useful for
+ * plugins.
+ *
+ * @param verbose TRUE to enable verbose debugging or FALSE to disable it.
+ *
+ * @since 2.6.0
+ */
+void purple_debug_set_verbose(gboolean verbose);
+
+/**
+ * Check if verbose logging is enabled.
+ *
+ * @return TRUE if verbose debugging is enabled, FALSE if it is not.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_debug_is_verbose(void);
+
+/**
+ * Enable or disable verbose debugging.  This ordinarily should only be called
+ * by #purple_debug_init, but there are cases where this can be useful for
+ * plugins.
+ *
+ * @param unsafe  TRUE to enable verbose debugging or FALSE to disable it.
+ *
+ * @since 2.6.0
+ */
+void purple_debug_set_unsafe(gboolean unsafe);
+
+/**
+ * Check if unsafe debugging is enabled.
+ *
+ * @return TRUE if verbose debugging is enabled, FALSE if it is not.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_debug_is_unsafe(void);
+
 /*@}*/
 
 /**************************************************************************/
diff --git a/libpurple/desktopitem.c b/libpurple/desktopitem.c
index 714a4b14e0..4c8b5a06b6 100644
--- a/libpurple/desktopitem.c
+++ b/libpurple/desktopitem.c
@@ -823,15 +823,18 @@ lookup_locale (const PurpleDesktopItem *item, const char *key, const char *local
 	}
 }
 
-/* fallback to find something suitable for C locale */
+/**
+ * Fallback to find something suitable for C locale.
+ *
+ * @return A newly allocated string which should be g_freed by the caller.
+ */
 static char *
 try_english_key (PurpleDesktopItem *item, const char *key)
 {
-	char *str;
+	char *str = NULL;
 	char *locales[] = { "en_US", "en_GB", "en_AU", "en", NULL };
 	int i;
 
-	str = NULL;
 	for (i = 0; locales[i] != NULL && str == NULL; i++) {
 		str = g_strdup (lookup_locale (item, key, locales[i]));
 	}
diff --git a/libpurple/dnsquery.c b/libpurple/dnsquery.c
index 14d9ebe890..6f02c8f893 100644
--- a/libpurple/dnsquery.c
+++ b/libpurple/dnsquery.c
@@ -28,10 +28,15 @@
 #include "internal.h"
 #include "debug.h"
 #include "dnsquery.h"
+#include "network.h"
 #include "notify.h"
 #include "prefs.h"
 #include "util.h"
 
+#ifndef _WIN32
+#include <resolv.h>
+#endif
+
 #if (defined(__APPLE__) || defined (__unix__)) && !defined(__osf__)
 #define PURPLE_DNSQUERY_USE_FORK
 #endif
@@ -73,6 +78,7 @@ struct _PurpleDnsQueryResolverProcess {
 };
 
 static GSList *free_dns_children = NULL;
+/* TODO: Make me a GQueue when we require >= glib 2.4 */
 static GSList *queued_requests = NULL;
 
 static int number_of_dns_children = 0;
@@ -113,8 +119,11 @@ purple_dnsquery_resolved(PurpleDnsQueryData *query_data, GSList *hosts)
 	 * Add the resolver to the list of available resolvers, and set it
 	 * to NULL so that it doesn't get destroyed along with the query_data
 	 */
-	free_dns_children = g_slist_prepend(free_dns_children, query_data->resolver);
-	query_data->resolver = NULL;
+	if (query_data->resolver)
+	{
+		free_dns_children = g_slist_prepend(free_dns_children, query_data->resolver);
+		query_data->resolver = NULL;
+	}
 #endif /* PURPLE_DNSQUERY_USE_FORK */
 
 	purple_dnsquery_destroy(query_data);
@@ -123,7 +132,7 @@ purple_dnsquery_resolved(PurpleDnsQueryData *query_data, GSList *hosts)
 static void
 purple_dnsquery_failed(PurpleDnsQueryData *query_data, const gchar *error_message)
 {
-	purple_debug_info("dnsquery", "%s\n", error_message);
+	purple_debug_error("dnsquery", "%s\n", error_message);
 	if (query_data->callback != NULL)
 		query_data->callback(NULL, query_data->data, error_message);
 	purple_dnsquery_destroy(query_data);
@@ -140,6 +149,41 @@ purple_dnsquery_ui_resolve(PurpleDnsQueryData *query_data)
 	return FALSE;
 }
 
+static gboolean
+resolve_ip(PurpleDnsQueryData *query_data)
+{
+	struct sockaddr_in sin;
+	if (inet_aton(query_data->hostname, &sin.sin_addr))
+	{
+		/*
+		 * The given "hostname" is actually an IP address, so we
+		 * don't need to do anything.
+		 */
+		GSList *hosts = NULL;
+		sin.sin_family = AF_INET;
+		sin.sin_port = htons(query_data->port);
+		hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin)));
+		hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin)));
+		purple_dnsquery_resolved(query_data, hosts);
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static gboolean
+dns_str_is_ascii(const char *name)
+{
+	guchar *c;
+	for (c = (guchar *)name; c && *c; ++c) {
+		if (*c > 0x7f)
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
 #if defined(PURPLE_DNSQUERY_USE_FORK)
 
 /*
@@ -199,6 +243,7 @@ purple_dnsquery_resolver_run(int child_out, int child_in, gboolean show_debug)
 	struct sockaddr_in sin;
 	const size_t addrlen = sizeof(sin);
 #endif
+	char *hostname;
 
 #ifdef HAVE_SIGNAL_H
 	purple_restore_default_signal_handlers();
@@ -243,6 +288,22 @@ purple_dnsquery_resolver_run(int child_out, int child_in, gboolean show_debug)
 			_exit(1);
 		}
 
+#ifdef USE_IDN
+		if (!dns_str_is_ascii(dns_params.hostname)) {
+			rc = purple_network_convert_idn_to_ascii(dns_params.hostname, &hostname);
+			if (rc != 0) {
+				write_to_parent(child_out, &rc, sizeof(rc));
+				close(child_out);
+				if (show_debug)
+					fprintf(stderr, "dns[%d] Error: IDN conversion returned "
+							"%d\n", getpid(), rc);
+				dns_params.hostname[0] = '\0';
+				continue;
+			}
+		} else /* intentional to execute the g_strdup */
+#endif
+		hostname = g_strdup(dns_params.hostname);
+
 		/* We have the hostname and port, now resolve the IP */
 
 #ifdef HAVE_GETADDRINFO
@@ -256,7 +317,10 @@ purple_dnsquery_resolver_run(int child_out, int child_in, gboolean show_debug)
 		 * library.
 		 */
 		hints.ai_socktype = SOCK_STREAM;
-		rc = getaddrinfo(dns_params.hostname, servname, &hints, &res);
+#ifdef AI_ADDRCONFIG
+		hints.ai_flags |= AI_ADDRCONFIG;
+#endif /* AI_ADDRCONFIG */
+		rc = getaddrinfo(hostname, servname, &hints, &res);
 		write_to_parent(child_out, &rc, sizeof(rc));
 		if (rc != 0) {
 			close(child_out);
@@ -275,9 +339,9 @@ purple_dnsquery_resolver_run(int child_out, int child_in, gboolean show_debug)
 		}
 		freeaddrinfo(tmp);
 #else
-		if (!inet_aton(dns_params.hostname, &sin.sin_addr)) {
+		if (!inet_aton(hostname, &sin.sin_addr)) {
 			struct hostent *hp;
-			if (!(hp = gethostbyname(dns_params.hostname))) {
+			if (!(hp = gethostbyname(hostname))) {
 				write_to_parent(child_out, &h_errno, sizeof(int));
 				close(child_out);
 				if (show_debug)
@@ -298,6 +362,9 @@ purple_dnsquery_resolver_run(int child_out, int child_in, gboolean show_debug)
 #endif
 		write_to_parent(child_out, &zero, sizeof(zero));
 		dns_params.hostname[0] = '\0';
+
+		g_free(hostname);
+		hostname = NULL;
 	}
 
 	close(child_out);
@@ -325,7 +392,7 @@ cope_with_gdb_brokenness(void)
 		return;
 	already_done = TRUE;
 	ppid = getppid();
-	snprintf(s, sizeof(s), "/proc/%d/exe", ppid);
+	g_snprintf(s, sizeof(s), "/proc/%d/exe", ppid);
 	n = readlink(s, e, sizeof(e));
 	if(n < 0)
 		return;
@@ -568,8 +635,10 @@ host_resolved(gpointer data, gint source, PurpleInputCondition cond)
 		g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
 				query_data->hostname, err);
 #endif
-		purple_dnsquery_failed(query_data, message);
+		/* Re-read resolv.conf and friends in case DNS servers have changed */
+		res_init();
 
+		purple_dnsquery_failed(query_data, message);
 	} else if (rc > 0) {
 		/* Success! */
 		while (rc > 0) {
@@ -606,12 +675,20 @@ resolve_host(gpointer data)
 	query_data = data;
 	query_data->timeout = 0;
 
+	if (resolve_ip(query_data))
+	{
+		/* resolve_ip calls purple_dnsquery_resolved */
+		return FALSE;
+	}
+
 	if (purple_dnsquery_ui_resolve(query_data))
 	{
 		/* The UI is handling the resolve; we're done */
 		return FALSE;
 	}
 
+	queued_requests = g_slist_append(queued_requests, query_data);
+
 	handle_next_queued_request();
 
 	return FALSE;
@@ -641,8 +718,6 @@ purple_dnsquery_a(const char *hostname, int port,
 		g_return_val_if_reached(NULL);
 	}
 
-	queued_requests = g_slist_append(queued_requests, query_data);
-
 	purple_debug_info("dns", "DNS query for '%s' queued\n", query_data->hostname);
 
 	query_data->timeout = purple_timeout_add(0, resolve_host, query_data);
@@ -691,9 +766,27 @@ dns_thread(gpointer data)
 	struct sockaddr_in sin;
 	struct hostent *hp;
 #endif
+	char *hostname;
 
 	query_data = data;
 
+#ifdef USE_IDN
+	if (!dns_str_is_ascii(query_data->hostname)) {
+		rc = purple_network_convert_idn_to_ascii(query_data->hostname, &hostname);
+		if (rc != 0) {
+			/* FIXME: Dirty 2.6.0 string freeze hack */
+			char tmp[8];
+			g_snprintf(tmp, sizeof(tmp), "%d", rc);
+			query_data->error_message = g_strdup_printf(_("Error resolving %s:\n%s"),
+					query_data->hostname, tmp);
+			/* back to main thread */
+			purple_timeout_add(0, dns_main_thread_cb, query_data);
+			return 0;
+		}
+	} else /* intentional fallthru */
+#endif
+	hostname = g_strdup(query_data->hostname);
+
 #ifdef HAVE_GETADDRINFO
 	g_snprintf(servname, sizeof(servname), "%d", query_data->port);
 	memset(&hints,0,sizeof(hints));
@@ -706,7 +799,10 @@ dns_thread(gpointer data)
 	 * library.
 	 */
 	hints.ai_socktype = SOCK_STREAM;
-	if ((rc = getaddrinfo(query_data->hostname, servname, &hints, &res)) == 0) {
+#ifdef AI_ADDRCONFIG
+	hints.ai_flags |= AI_ADDRCONFIG;
+#endif /* AI_ADDRCONFIG */
+	if ((rc = getaddrinfo(hostname, servname, &hints, &res)) == 0) {
 		tmp = res;
 		while(res) {
 			query_data->hosts = g_slist_append(query_data->hosts,
@@ -720,7 +816,7 @@ dns_thread(gpointer data)
 		query_data->error_message = g_strdup_printf(_("Error resolving %s:\n%s"), query_data->hostname, purple_gai_strerror(rc));
 	}
 #else
-	if ((hp = gethostbyname(query_data->hostname))) {
+	if ((hp = gethostbyname(hostname))) {
 		memset(&sin, 0, sizeof(struct sockaddr_in));
 		memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
 		sin.sin_family = hp->h_addrtype;
@@ -734,6 +830,7 @@ dns_thread(gpointer data)
 		query_data->error_message = g_strdup_printf(_("Error resolving %s: %d"), query_data->hostname, h_errno);
 	}
 #endif
+	g_free(hostname);
 
 	/* back to main thread */
 	purple_timeout_add(0, dns_main_thread_cb, query_data);
@@ -745,7 +842,6 @@ static gboolean
 resolve_host(gpointer data)
 {
 	PurpleDnsQueryData *query_data;
-	struct sockaddr_in sin;
 	GError *err = NULL;
 
 	query_data = data;
@@ -757,20 +853,7 @@ resolve_host(gpointer data)
 		return FALSE;
 	}
 
-	if (inet_aton(query_data->hostname, &sin.sin_addr))
-	{
-		/*
-		 * The given "hostname" is actually an IP address, so we
-		 * don't need to do anything.
-		 */
-		GSList *hosts = NULL;
-		sin.sin_family = AF_INET;
-		sin.sin_port = htons(query_data->port);
-		hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin)));
-		hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin)));
-		purple_dnsquery_resolved(query_data, hosts);
-	}
-	else
+	if (!resolve_ip(query_data))
 	{
 		/*
 		 * Spin off a separate thread to perform the DNS lookup so
@@ -835,6 +918,7 @@ resolve_host(gpointer data)
 	PurpleDnsQueryData *query_data;
 	struct sockaddr_in sin;
 	GSList *hosts = NULL;
+	char *hostname;
 
 	query_data = data;
 	query_data->timeout = 0;
@@ -847,7 +931,22 @@ resolve_host(gpointer data)
 
 	if (!inet_aton(query_data->hostname, &sin.sin_addr)) {
 		struct hostent *hp;
-		if(!(hp = gethostbyname(query_data->hostname))) {
+#ifdef USE_IDN
+		if (!dns_str_is_ascii(query_data->hostname)) {
+			int ret = purple_network_convert_idn_to_ascii(query_data->hostname,
+					&hostname);
+			if (ret != 0) {
+				char message[1024];
+				g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
+						query_data->hostname, ret);
+				purple_dnsquery_failed(query_data, message);
+				return FALSE;
+			}
+		} else /* fallthrough is intentional to the g_strdup */
+#endif
+		hostname = g_strdup(query_data->hostname);
+
+		if(!(hp = gethostbyname(hostname))) {
 			char message[1024];
 			g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
 					query_data->hostname, h_errno);
@@ -861,6 +960,7 @@ resolve_host(gpointer data)
 		sin.sin_family = AF_INET;
 	sin.sin_port = htons(query_data->port);
 
+	g_free(hostname);
 	hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin)));
 	hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin)));
 
diff --git a/libpurple/dnssrv.c b/libpurple/dnssrv.c
index 6fce86cc3d..ed6ba7e25a 100644
--- a/libpurple/dnssrv.c
+++ b/libpurple/dnssrv.c
@@ -33,17 +33,24 @@
 #ifndef T_SRV
 #define T_SRV	33
 #endif
-#else
+#ifndef T_TXT
+#define T_TXT	16
+#endif
+#else /* WIN32 */
 #include <windns.h>
 /* Missing from the mingw headers */
 #ifndef DNS_TYPE_SRV
 # define DNS_TYPE_SRV 33
 #endif
+#ifndef DNS_TYPE_TXT
+# define DNS_TYPE_TXT 16
+#endif
 #endif
 
+#include "debug.h"
 #include "dnssrv.h"
 #include "eventloop.h"
-#include "debug.h"
+#include "network.h"
 
 #ifndef _WIN32
 typedef union {
@@ -59,21 +66,46 @@ static void (WINAPI *MyDnsRecordListFree) (PDNS_RECORD pRecordList,
 	DNS_FREE_TYPE FreeType) = NULL;
 #endif
 
+struct _PurpleTxtResponse {
+	char *content;
+};
+
 struct _PurpleSrvQueryData {
-	PurpleSrvCallback cb;
+	union {
+		PurpleSrvCallback srv;
+		PurpleTxtCallback txt;
+	} cb;
+
 	gpointer extradata;
 	guint handle;
+	int type;
 #ifdef _WIN32
 	GThread *resolver;
 	char *query;
 	char *error_message;
-	GSList *results;
+	GList *results;
 #else
 	int fd_in, fd_out;
 	pid_t pid;
 #endif
 };
 
+typedef struct _PurpleSrvInternalQuery {
+	int type;
+	char query[256];
+} PurpleSrvInternalQuery;
+
+typedef struct _PurpleSrvResponseContainer {
+	PurpleSrvResponse *response;
+	int sum;
+} PurpleSrvResponseContainer;
+
+/**
+ * Sort by priority, then by weight.  Strictly numerically--no
+ * randomness.  Technically we only need to sort by pref and then
+ * make sure any records with weight 0 are at the beginning of
+ * their group, but it's just as easy to sort by weight.
+ */
 static gint
 responsecompare(gconstpointer ar, gconstpointer br)
 {
@@ -92,6 +124,142 @@ responsecompare(gconstpointer ar, gconstpointer br)
 	return 1;
 }
 
+/**
+ * Iterate over a list of PurpleSrvResponseContainer making the sum
+ * the running total of the sums.  Select a random integer in the range
+ * (1, sum+1), then find the first element greater than or equal to the
+ * number selected.  From RFC 2782.
+ *
+ * @param list The list of PurpleSrvResponseContainer.  This function
+ *        removes a node from this list and returns the new list.
+ * @param container_ptr The PurpleSrvResponseContainer that was chosen
+ *        will be returned here.
+ */
+static GList *
+select_random_response(GList *list, PurpleSrvResponseContainer **container_ptr)
+{
+	GList *cur;
+	size_t runningtotal;
+	int r;
+
+	runningtotal = 0;
+	cur = list;
+
+	while (cur) {
+		PurpleSrvResponseContainer *container = cur->data;
+		runningtotal += container->response->weight;
+		container->sum = runningtotal;
+		cur = cur->next;
+	}
+
+	/*
+	 * If the running total is greater than 0, pick a number between
+	 * 1 and the runningtotal inclusive. (This is not precisely what
+	 * the RFC algorithm describes, but we wish to deal with integers
+	 * and avoid floats.  This is functionally equivalent.)
+	 * If running total is 0, then choose r = 0.
+	 */
+	r = runningtotal ? g_random_int_range(1, runningtotal + 1) : 0;
+	cur = list;
+	while (r > ((PurpleSrvResponseContainer *)cur->data)->sum) {
+		cur = cur->next;
+	}
+
+	/* Set the return parameter and remove cur from the list */
+	*container_ptr =  cur->data;
+	return g_list_delete_link(list, cur);
+}
+
+/**
+ * Reorder a GList of PurpleSrvResponses that have the same priority
+ * (aka "pref").
+ */
+static void
+srv_reorder(GList *list, int num)
+{
+	int i;
+	GList *cur, *container_list = NULL;
+	PurpleSrvResponseContainer *container;
+
+	if (num < 2)
+		/* Nothing to sort */
+		return;
+
+	/* First build a list of container structs */
+	for (i = 0, cur = list; i < num; i++, cur = cur->next) {
+		container = g_new(PurpleSrvResponseContainer, 1);
+		container->response = cur->data;
+		container_list = g_list_prepend(container_list, container);
+	}
+	container_list = g_list_reverse(container_list);
+
+	/*
+	 * Re-order the list that was passed in as a parameter.  We leave
+	 * the list nodes in place, but replace their data pointers.
+	 */
+	cur = list;
+	while (container_list) {
+		container_list = select_random_response(container_list, &container);
+		cur->data = container->response;
+		g_free(container);
+		cur = cur->next;
+	}
+}
+
+/**
+ * Sorts a GList of PurpleSrvResponses according to the
+ * algorithm described in RFC 2782.
+ *
+ * @param response GList of PurpleSrvResponse's
+ * @param The original list, resorted
+ */
+static GList *
+purple_srv_sort(GList *list)
+{
+	int pref, count;
+	GList *cur, *start;
+
+	if (!list || !list->next) {
+		/* Nothing to sort */
+		return list;
+	}
+
+	list = g_list_sort(list, responsecompare);
+
+	start = cur = list;
+	count = 1;
+	while (cur) {
+		PurpleSrvResponse *next_response;
+		pref = ((PurpleSrvResponse *)cur->data)->pref;
+		next_response = cur->next ? cur->next->data : NULL;
+		if (!next_response || next_response->pref != pref) {
+			/*
+			 * The 'count' records starting at 'start' all have the same
+			 * priority.  Sort them by weight.
+			 */
+			srv_reorder(start, count);
+			start = cur->next;
+			count = 0;
+		}
+		count++;
+		cur = cur->next;
+	}
+
+	return list;
+}
+
+static gboolean
+dns_str_is_ascii(const char *name)
+{
+	guchar *c;
+	for (c = (guchar *)name; c && *c; ++c) {
+		if (*c > 0x7f)
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
 #ifndef _WIN32
 
 G_GNUC_NORETURN static void
@@ -99,31 +267,35 @@ resolve(int in, int out)
 {
 	GList *ret = NULL;
 	PurpleSrvResponse *srvres;
+	PurpleTxtResponse *txtres;
 	queryans answer;
-	int size;
-	int qdcount;
-	int ancount;
-	guchar *end;
-	guchar *cp;
+	int size, qdcount, ancount;
+	guchar *end, *cp;
 	gchar name[256];
 	guint16 type, dlen, pref, weight, port;
-	gchar query[256];
+	PurpleSrvInternalQuery query;
 
 #ifdef HAVE_SIGNAL_H
 	purple_restore_default_signal_handlers();
 #endif
 
-	if (read(in, query, 256) <= 0) {
+	if (read(in, &query, sizeof(query)) <= 0) {
 		close(out);
 		close(in);
 		_exit(0);
 	}
 
-	size = res_query( query, C_IN, T_SRV, (u_char*)&answer, sizeof( answer));
+	size = res_query( query.query, C_IN, query.type, (u_char*)&answer, sizeof( answer));
+	if (size == -1) {
+		write(out, &(query.type), sizeof(query.type));
+		write(out, &size, sizeof(int));
+		close(out);
+		close(in);
+		_exit(0);
+	}
 
 	qdcount = ntohs(answer.hdr.qdcount);
 	ancount = ntohs(answer.hdr.ancount);
-
 	cp = (guchar*)&answer + sizeof(HEADER);
 	end = (guchar*)&answer + size;
 
@@ -138,17 +310,14 @@ resolve(int in, int out)
 		size = dn_expand((unsigned char*)&answer, end, cp, name, 256);
 		if(size < 0)
 			goto end;
-
 		cp += size;
-
 		GETSHORT(type,cp);
 
 		/* skip ttl and class since we already know it */
 		cp += 6;
 
 		GETSHORT(dlen,cp);
-
-		if (type == T_SRV) {
+		if (query.type == T_SRV) {
 			GETSHORT(pref,cp);
 
 			GETSHORT(weight,cp);
@@ -167,7 +336,12 @@ resolve(int in, int out)
 			srvres->port = port;
 			srvres->weight = weight;
 
-			ret = g_list_insert_sorted(ret, srvres, responsecompare);
+			ret = g_list_prepend(ret, srvres);
+		} else if (query.type == T_TXT) {
+			txtres = g_new0(PurpleTxtResponse, 1);
+			txtres->content = g_strndup((gchar*)(++cp), dlen-1);
+			ret = g_list_append(ret, txtres);
+			cp += dlen - 1;
 		} else {
 			cp += dlen;
 		}
@@ -175,10 +349,21 @@ resolve(int in, int out)
 
 end:
 	size = g_list_length(ret);
-	write(out, &size, sizeof(int));
+
+	if (query.type == T_SRV)
+		ret = purple_srv_sort(ret);
+
+	/* TODO: Check return value */
+	write(out, &(query.type), sizeof(query.type));
+	write(out, &size, sizeof(size));
 	while (ret != NULL)
 	{
-		write(out, ret->data, sizeof(PurpleSrvResponse));
+		/* TODO: Check return value */
+		if (query.type == T_SRV)
+			write(out, ret->data, sizeof(PurpleSrvResponse));
+		if (query.type == T_TXT)
+			write(out, ret->data, sizeof(PurpleTxtResponse));
+
 		g_free(ret->data);
 		ret = g_list_remove(ret, ret->data);
 	}
@@ -193,39 +378,81 @@ static void
 resolved(gpointer data, gint source, PurpleInputCondition cond)
 {
 	int size;
+	int type;
 	PurpleSrvQueryData *query_data = (PurpleSrvQueryData*)data;
-	PurpleSrvResponse *res;
-	PurpleSrvResponse *tmp;
 	int i;
-	PurpleSrvCallback cb = query_data->cb;
 	int status;
 
-	if (read(source, &size, sizeof(int)) == sizeof(int))
-	{
-		ssize_t red;
-		purple_debug_info("dnssrv","found %d SRV entries\n", size);
-		tmp = res = g_new0(PurpleSrvResponse, size);
-		for (i = 0; i < size; i++) {
-			red = read(source, tmp++, sizeof(PurpleSrvResponse));
-			if (red != sizeof(PurpleSrvResponse)) {
-				purple_debug_error("dnssrv","unable to read srv "
-						"response: %s\n", g_strerror(errno));
-				size = 0;
-				g_free(res);
-				res = NULL;
+	if (read(source, &type, sizeof(type)) == sizeof(type)) {
+		if (read(source, &size, sizeof(size)) == sizeof(size)) {
+			if (size == -1 || size == 0) {
+				if (size == -1) {
+					purple_debug_warning("dnssrv", "res_query returned an error\n");
+					/* Re-read resolv.conf and friends in case DNS servers have changed */
+					res_init();
+				} else
+					purple_debug_info("dnssrv", "Found 0 entries, errno is %i\n", errno);
+
+				if (type == T_SRV) {
+					PurpleSrvCallback cb = query_data->cb.srv;
+					cb(NULL, 0, query_data->extradata);
+				} else if (type == T_TXT) {
+					PurpleTxtCallback cb = query_data->cb.txt;
+					cb(NULL, query_data->extradata);
+				} else {
+					purple_debug_error("dnssrv", "type unknown of DNS result entry; errno is %i\n", errno);
+				}
+
+			} else if (size) {
+				if (type == T_SRV) {
+					PurpleSrvResponse *res;
+					PurpleSrvResponse *tmp;
+					PurpleSrvCallback cb = query_data->cb.srv;
+					ssize_t red;
+					purple_debug_info("dnssrv","found %d SRV entries\n", size);
+					tmp = res = g_new0(PurpleSrvResponse, size);
+					for (i = 0; i < size; i++) {
+						red = read(source, tmp++, sizeof(PurpleSrvResponse));
+						if (red != sizeof(PurpleSrvResponse)) {
+							purple_debug_error("dnssrv","unable to read srv "
+									"response: %s\n", g_strerror(errno));
+							size = 0;
+							g_free(res);
+							res = NULL;
+						}
+					}
+
+					cb(res, size, query_data->extradata);
+				} else if (type == T_TXT) {
+					GList *responses = NULL;
+					PurpleTxtResponse *res;
+					PurpleTxtCallback cb = query_data->cb.txt;
+					ssize_t red;
+					purple_debug_info("dnssrv","found %d TXT entries\n", size);
+					res = g_new0(PurpleTxtResponse, 1);
+					for (i = 0; i < size; i++) {
+						red = read(source, res, sizeof(PurpleTxtResponse));
+						if (red != sizeof(PurpleTxtResponse)) {
+							purple_debug_error("dnssrv","unable to read txt "
+									"response: %s\n", g_strerror(errno));
+							size = 0;
+							g_free(res);
+							g_list_foreach(responses, (GFunc)purple_txt_response_destroy, NULL);
+							g_list_free(responses);
+							responses = NULL;
+							break;
+						}
+					}
+
+					cb(responses, query_data->extradata);
+				} else {
+					purple_debug_error("dnssrv", "type unknown of DNS result entry; errno is %i\n", errno);
+				}
 			}
 		}
 	}
-	else
-	{
-		purple_debug_info("dnssrv","found 0 SRV entries; errno is %i\n", errno);
-		size = 0;
-		res = NULL;
-	}
 
-	cb(res, size, query_data->extradata);
 	waitpid(query_data->pid, &status, 0);
-
 	purple_srv_cancel(query_data);
 }
 
@@ -237,33 +464,44 @@ static gboolean
 res_main_thread_cb(gpointer data)
 {
 	PurpleSrvResponse *srvres = NULL;
-	int size = 0;
 	PurpleSrvQueryData *query_data = data;
-
 	if(query_data->error_message != NULL)
 		purple_debug_error("dnssrv", query_data->error_message);
 	else {
-		PurpleSrvResponse *srvres_tmp = NULL;
-		GSList *lst = query_data->results;
-
-		size = g_slist_length(lst);
-
-		if(query_data->cb && size > 0)
-			srvres_tmp = srvres = g_new0(PurpleSrvResponse, size);
-		while (lst) {
-			if(query_data->cb)
-				memcpy(srvres_tmp++, lst->data, sizeof(PurpleSrvResponse));
-			g_free(lst->data);
-			lst = g_slist_remove(lst, lst->data);
-		}
+		if (query_data->type == DNS_TYPE_SRV) {
+			PurpleSrvResponse *srvres_tmp = NULL;
+			GList *lst = query_data->results;
+			int size = g_list_length(lst);
+
+			if(query_data->cb.srv && size > 0)
+				srvres_tmp = srvres = g_new0(PurpleSrvResponse, size);
+			while (lst) {
+				PurpleSrvResponse *lstdata = lst->data;
+				lst = g_list_delete_link(lst, lst);
+
+				if(query_data->cb.srv)
+					memcpy(srvres_tmp++, lstdata, sizeof(PurpleSrvResponse));
+				g_free(lstdata);
+			}
 
-		query_data->results = NULL;
+			query_data->results = NULL;
 
-	purple_debug_info("dnssrv", "found %d SRV entries\n", size);
-	}
+			purple_debug_info("dnssrv", "found %d SRV entries\n", size);
 
-	if(query_data->cb)
-		query_data->cb(srvres, size, query_data->extradata);
+			if(query_data->cb.srv) query_data->cb.srv(srvres, size, query_data->extradata);
+		} else if (query_data->type == DNS_TYPE_TXT) {
+			GList *lst = query_data->results;
+
+			purple_debug_info("dnssrv", "found %d TXT entries\n", g_list_length(lst));
+
+			if (query_data->cb.txt) {
+				query_data->results = NULL;
+				query_data->cb.txt(lst, query_data->extradata);
+			}
+		} else {
+			purple_debug_error("dnssrv", "unknown query type");
+		}
+	}
 
 	query_data->resolver = NULL;
 	query_data->handle = 0;
@@ -277,40 +515,76 @@ static gpointer
 res_thread(gpointer data)
 {
 	PDNS_RECORD dr = NULL;
-	int type = DNS_TYPE_SRV;
+	int type;
 	DNS_STATUS ds;
 	PurpleSrvQueryData *query_data = data;
-
+	type = query_data->type;
 	ds = MyDnsQuery_UTF8(query_data->query, type, DNS_QUERY_STANDARD, NULL, &dr, NULL);
 	if (ds != ERROR_SUCCESS) {
 		gchar *msg = g_win32_error_message(ds);
-		query_data->error_message = g_strdup_printf("Couldn't look up SRV record. %s (%lu).\n", msg, ds);
+		if (type == DNS_TYPE_SRV) {
+			query_data->error_message = g_strdup_printf("Couldn't look up SRV record. %s (%lu).\n", msg, ds);
+		} else if (type == DNS_TYPE_TXT) {
+			query_data->error_message = g_strdup_printf("Couldn't look up TXT record. %s (%lu).\n", msg, ds);
+		}
 		g_free(msg);
 	} else {
-		PDNS_RECORD dr_tmp;
-		GSList *lst = NULL;
-		DNS_SRV_DATA *srv_data;
-		PurpleSrvResponse *srvres;
-
-		for (dr_tmp = dr; dr_tmp != NULL; dr_tmp = dr_tmp->pNext) {
-			/* Discard any incorrect entries. I'm not sure if this is necessary */
-			if (dr_tmp->wType != type || strcmp(dr_tmp->pName, query_data->query) != 0) {
-				continue;
+		if (type == DNS_TYPE_SRV) {
+			PDNS_RECORD dr_tmp;
+			GList *lst = NULL;
+			DNS_SRV_DATA *srv_data;
+			PurpleSrvResponse *srvres;
+
+			for (dr_tmp = dr; dr_tmp != NULL; dr_tmp = dr_tmp->pNext) {
+				/* Discard any incorrect entries. I'm not sure if this is necessary */
+				if (dr_tmp->wType != type || strcmp(dr_tmp->pName, query_data->query) != 0) {
+					continue;
+				}
+
+				srv_data = &dr_tmp->Data.SRV;
+				srvres = g_new0(PurpleSrvResponse, 1);
+				strncpy(srvres->hostname, srv_data->pNameTarget, 255);
+				srvres->hostname[255] = '\0';
+				srvres->pref = srv_data->wPriority;
+				srvres->port = srv_data->wPort;
+				srvres->weight = srv_data->wWeight;
+
+				lst = g_list_prepend(lst, srvres);
 			}
 
-			srv_data = &dr_tmp->Data.SRV;
-			srvres = g_new0(PurpleSrvResponse, 1);
-			strncpy(srvres->hostname, srv_data->pNameTarget, 255);
-			srvres->hostname[255] = '\0';
-			srvres->pref = srv_data->wPriority;
-			srvres->port = srv_data->wPort;
-			srvres->weight = srv_data->wWeight;
+			MyDnsRecordListFree(dr, DnsFreeRecordList);
+			query_data->results = purple_srv_sort(lst);
+		} else if (type == DNS_TYPE_TXT) {
+			PDNS_RECORD dr_tmp;
+			GList *lst = NULL;
+			DNS_TXT_DATA *txt_data;
+			PurpleTxtResponse *txtres;
 
-			lst = g_slist_insert_sorted(lst, srvres, responsecompare);
-		}
+			for (dr_tmp = dr; dr_tmp != NULL; dr_tmp = dr_tmp->pNext) {
+				GString *s;
+				int i;
+
+				/* Discard any incorrect entries. I'm not sure if this is necessary */
+				if (dr_tmp->wType != type || strcmp(dr_tmp->pName, query_data->query) != 0) {
+					continue;
+				}
+
+				txt_data = &dr_tmp->Data.TXT;
+				txtres = g_new0(PurpleTxtResponse, 1);
 
-		MyDnsRecordListFree(dr, DnsFreeRecordList);
-		query_data->results = lst;
+				s = g_string_new("");
+				for (i = 0; i < txt_data->dwStringCount; ++i)
+					s = g_string_append(s, txt_data->pStringArray[i]);
+				txtres->content = g_string_free(s, FALSE);
+
+				lst = g_list_append(lst, txtres);
+			}
+
+			MyDnsRecordListFree(dr, DnsFreeRecordList);
+			query_data->results = lst;
+		} else {
+
+		}
 	}
 
 	/* back to main thread */
@@ -327,8 +601,10 @@ PurpleSrvQueryData *
 purple_srv_resolve(const char *protocol, const char *transport, const char *domain, PurpleSrvCallback cb, gpointer extradata)
 {
 	char *query;
+	char *hostname;
 	PurpleSrvQueryData *query_data;
 #ifndef _WIN32
+	PurpleSrvInternalQuery internal_query;
 	int in[2], out[2];
 	int pid;
 #else
@@ -342,8 +618,22 @@ purple_srv_resolve(const char *protocol, const char *transport, const char *doma
 		g_return_val_if_reached(NULL);
 	}
 
-	query = g_strdup_printf("_%s._%s.%s", protocol, transport, domain);
-	purple_debug_info("dnssrv","querying SRV record for %s\n", query);
+#ifdef USE_IDN
+	if (!dns_str_is_ascii(domain)) {
+		int ret = purple_network_convert_idn_to_ascii(domain, &hostname);
+		if (ret != 0) {
+			purple_debug_error("dnssrv", "IDNA ToASCII failed\n");
+			cb(NULL, 0, extradata);
+			return NULL;
+		}
+	} else /* Fallthru is intentional */
+#endif
+	hostname = g_strdup(domain);
+
+	query = g_strdup_printf("_%s._%s.%s", protocol, transport, hostname);
+	purple_debug_info("dnssrv","querying SRV record for %s: %s\n", domain,
+			query);
+	g_free(hostname);
 
 #ifndef _WIN32
 	if(pipe(in) || pipe(out)) {
@@ -375,11 +665,15 @@ purple_srv_resolve(const char *protocol, const char *transport, const char *doma
 	close(out[1]);
 	close(in[0]);
 
-	if (write(in[1], query, strlen(query)+1) < 0)
+	internal_query.type = T_SRV;
+	strncpy(internal_query.query, query, 255);
+
+	if (write(in[1], &internal_query, sizeof(internal_query)) < 0)
 		purple_debug_error("dnssrv", "Could not write to SRV resolver\n");
 
 	query_data = g_new0(PurpleSrvQueryData, 1);
-	query_data->cb = cb;
+	query_data->type = T_SRV;
+	query_data->cb.srv = cb;
 	query_data->extradata = extradata;
 	query_data->pid = pid;
 	query_data->fd_out = out[0];
@@ -398,7 +692,8 @@ purple_srv_resolve(const char *protocol, const char *transport, const char *doma
 	}
 
 	query_data = g_new0(PurpleSrvQueryData, 1);
-	query_data->cb = cb;
+	query_data->type = DNS_TYPE_SRV;
+	query_data->cb.srv = cb;
 	query_data->query = query;
 	query_data->extradata = extradata;
 
@@ -422,6 +717,119 @@ purple_srv_resolve(const char *protocol, const char *transport, const char *doma
 #endif
 }
 
+PurpleSrvQueryData *purple_txt_resolve(const char *owner, const char *domain, PurpleTxtCallback cb, gpointer extradata)
+{
+	char *query;
+	char *hostname;
+	PurpleSrvQueryData *query_data;
+#ifndef _WIN32
+	PurpleSrvInternalQuery internal_query;
+	int in[2], out[2];
+	int pid;
+#else
+	GError* err = NULL;
+	static gboolean initialized = FALSE;
+#endif
+
+#ifdef USE_IDN
+	if (!dns_str_is_ascii(domain)) {
+		int ret = purple_network_convert_idn_to_ascii(domain, &hostname);
+		if (ret != 0) {
+			purple_debug_error("dnssrv", "IDNA ToASCII failed\n");
+			cb(NULL, extradata);
+			return NULL;
+		}
+	} else /* fallthru is intentional */
+#endif
+	hostname = g_strdup(domain);
+
+	query = g_strdup_printf("%s.%s", owner, hostname);
+	purple_debug_info("dnssrv","querying TXT record for %s: %s\n", domain,
+			query);
+	g_free(hostname);
+
+#ifndef _WIN32
+	if(pipe(in) || pipe(out)) {
+		purple_debug_error("dnssrv", "Could not create pipe\n");
+		g_free(query);
+		cb(NULL, extradata);
+		return NULL;
+	}
+
+	pid = fork();
+	if (pid == -1) {
+		purple_debug_error("dnssrv", "Could not create process!\n");
+		cb(NULL, extradata);
+		g_free(query);
+		return NULL;
+	}
+
+	/* Child */
+	if (pid == 0)
+	{
+		g_free(query);
+
+		close(out[0]);
+		close(in[1]);
+		resolve(in[0], out[1]);
+		/* resolve() does not return */
+	}
+
+	close(out[1]);
+	close(in[0]);
+
+	internal_query.type = T_TXT;
+	strncpy(internal_query.query, query, 255);
+
+	if (write(in[1], &internal_query, sizeof(internal_query)) < 0)
+		purple_debug_error("dnssrv", "Could not write to TXT resolver\n");
+
+	query_data = g_new0(PurpleSrvQueryData, 1);
+	query_data->type = T_TXT;
+	query_data->cb.txt = cb;
+	query_data->extradata = extradata;
+	query_data->pid = pid;
+	query_data->fd_out = out[0];
+	query_data->fd_in = in[1];
+	query_data->handle = purple_input_add(out[0], PURPLE_INPUT_READ, resolved, query_data);
+
+	g_free(query);
+
+	return query_data;
+#else
+	if (!initialized) {
+		MyDnsQuery_UTF8 = (void*) wpurple_find_and_loadproc("dnsapi.dll", "DnsQuery_UTF8");
+		MyDnsRecordListFree = (void*) wpurple_find_and_loadproc(
+			"dnsapi.dll", "DnsRecordListFree");
+		initialized = TRUE;
+	}
+
+	query_data = g_new0(PurpleSrvQueryData, 1);
+	query_data->type = DNS_TYPE_TXT;
+	query_data->cb.txt = cb;
+	query_data->query = query;
+	query_data->extradata = extradata;
+
+	if (!MyDnsQuery_UTF8 || !MyDnsRecordListFree)
+		query_data->error_message = g_strdup("System missing DNS API (Requires W2K+)\n");
+	else {
+		query_data->resolver = g_thread_create(res_thread, query_data, FALSE, &err);
+		if (query_data->resolver == NULL) {
+			query_data->error_message = g_strdup_printf("TXT thread create failure: %s\n", (err && err->message) ? err->message : "");
+			g_error_free(err);
+		}
+	}
+
+	/* The query isn't going to happen, so finish the TXT lookup now.
+	 * Asynchronously call the callback since stuff may not expect
+	 * the callback to be called before this returns */
+	if (query_data->error_message != NULL)
+		query_data->handle = purple_timeout_add(0, res_main_thread_cb, query_data);
+
+	return query_data;
+#endif
+}
+
 void
 purple_srv_cancel(PurpleSrvQueryData *query_data)
 {
@@ -435,7 +843,7 @@ purple_srv_cancel(PurpleSrvQueryData *query_data)
 		 * just set the callback to NULL and let the DNS lookup
 		 * finish.
 		 */
-		query_data->cb = NULL;
+		query_data->cb.srv = NULL;
 		return;
 	}
 	g_free(query_data->query);
@@ -446,3 +854,25 @@ purple_srv_cancel(PurpleSrvQueryData *query_data)
 #endif
 	g_free(query_data);
 }
+
+void
+purple_txt_cancel(PurpleSrvQueryData *query_data)
+{
+	purple_srv_cancel(query_data);
+}
+
+const gchar *
+purple_txt_response_get_content(PurpleTxtResponse *resp)
+{
+	g_return_val_if_fail(resp != NULL, NULL);
+
+	return resp->content;
+}
+
+void purple_txt_response_destroy(PurpleTxtResponse *resp)
+{
+	g_return_if_fail(resp != NULL);
+
+	g_free(resp->content);
+	g_free(resp);
+}
diff --git a/libpurple/dnssrv.h b/libpurple/dnssrv.h
index 4e17ae068c..376310a2a5 100644
--- a/libpurple/dnssrv.h
+++ b/libpurple/dnssrv.h
@@ -28,8 +28,11 @@
 extern "C" {
 #endif
 
-typedef struct _PurpleSrvResponse PurpleSrvResponse;
 typedef struct _PurpleSrvQueryData PurpleSrvQueryData;
+typedef struct _PurpleSrvResponse PurpleSrvResponse;
+typedef struct _PurpleTxtResponse PurpleTxtResponse;
+
+#include <glib.h>
 
 struct _PurpleSrvResponse {
 	char hostname[256];
@@ -38,9 +41,23 @@ struct _PurpleSrvResponse {
 	int pref;
 };
 
+/**
+ * @param resp An array of PurpleSrvResponse of size results.  The array
+ *        is sorted based on the order described in the DNS SRV RFC.
+ *        Users of this API should try each record in resp in order,
+ *        starting at the beginning.
+ */
 typedef void (*PurpleSrvCallback)(PurpleSrvResponse *resp, int results, gpointer data);
 
 /**
+ * Callback that returns the data retrieved from a DNS TXT lookup.
+ *
+ * @param responses   A GList of PurpleTxtResponse objects.
+ * @param data        The extra data passed to purple_txt_resolve.
+ */
+typedef void (*PurpleTxtCallback)(GList *responses, gpointer data);
+
+/**
  * Queries an SRV record.
  *
  * @param protocol Name of the protocol (e.g. "sip")
@@ -58,6 +75,43 @@ PurpleSrvQueryData *purple_srv_resolve(const char *protocol, const char *transpo
  */
 void purple_srv_cancel(PurpleSrvQueryData *query_data);
 
+/**
+ * Queries an TXT record.
+ *
+ * @param owner Name of the protocol (e.g. "_xmppconnect")
+ * @param domain Domain name to query (e.g. "blubb.com")
+ * @param cb A callback which will be called with the results
+ * @param extradata Extra data to be passed to the callback
+ *
+ * @since 2.6.0
+ */
+PurpleSrvQueryData *purple_txt_resolve(const char *owner, const char *domain, PurpleTxtCallback cb, gpointer extradata);
+
+/**
+ * Cancel an TXT DNS query.
+ *
+ * @param query_data The request to cancel.
+ * @since 2.6.0
+ */
+void purple_txt_cancel(PurpleSrvQueryData *query_data);
+
+/**
+ * Get the value of the current TXT record.
+ *
+ * @param resp  The TXT response record
+ * @returns The value of the current TXT record.
+ * @since 2.6.0
+ */
+const gchar *purple_txt_response_get_content(PurpleTxtResponse *resp);
+
+/**
+ * Destroy a TXT DNS response object.
+ *
+ * @param response The PurpleTxtResponse to destroy.
+ * @since 2.6.0
+ */
+void purple_txt_response_destroy(PurpleTxtResponse *resp);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libpurple/ft.c b/libpurple/ft.c
index b494be48b3..f1ee489a28 100644
--- a/libpurple/ft.c
+++ b/libpurple/ft.c
@@ -40,8 +40,35 @@
 static PurpleXferUiOps *xfer_ui_ops = NULL;
 static GList *xfers;
 
+/*
+ * A hack to store more data since we can't extend the size of PurpleXfer
+ * easily.
+ */
+static GHashTable *xfers_data = NULL;
+
+typedef struct _PurpleXferPrivData {
+	/*
+	 * Used to moderate the file transfer when either the read/write ui_ops are
+	 * set or fd is not set. In those cases, the UI/prpl call the respective
+	 * function, which is somewhat akin to a fd watch being triggered.
+	 */
+	enum {
+		PURPLE_XFER_READY_NONE = 0x0,
+		PURPLE_XFER_READY_UI   = 0x1,
+		PURPLE_XFER_READY_PRPL = 0x2,
+	} ready;
+} PurpleXferPrivData;
+
 static int purple_xfer_choose_file(PurpleXfer *xfer);
 
+static void
+purple_xfer_priv_data_destroy(gpointer data)
+{
+	PurpleXferPrivData *priv = data;
+
+	g_free(priv);
+}
+
 GList *
 purple_xfers_get_all()
 {
@@ -53,6 +80,7 @@ purple_xfer_new(PurpleAccount *account, PurpleXferType type, const char *who)
 {
 	PurpleXfer *xfer;
 	PurpleXferUiOps *ui_ops;
+	PurpleXferPrivData *priv;
 
 	g_return_val_if_fail(type    != PURPLE_XFER_UNKNOWN, NULL);
 	g_return_val_if_fail(account != NULL,              NULL);
@@ -70,6 +98,11 @@ purple_xfer_new(PurpleAccount *account, PurpleXferType type, const char *who)
 	xfer->current_buffer_size = FT_INITIAL_BUFFER_SIZE;
 	xfer->fd = -1;
 
+	priv = g_new0(PurpleXferPrivData, 1);
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	g_hash_table_insert(xfers_data, xfer, priv);
+
 	ui_ops = purple_xfer_get_ui_ops(xfer);
 
 	if (ui_ops != NULL && ui_ops->new_xfer != NULL)
@@ -102,9 +135,11 @@ purple_xfer_destroy(PurpleXfer *xfer)
 	g_free(xfer->remote_ip);
 	g_free(xfer->local_filename);
 
+	g_hash_table_remove(xfers_data, xfer);
+
 	PURPLE_DBUS_UNREGISTER_POINTER(xfer);
-	g_free(xfer);
 	xfers = g_list_remove(xfers, xfer);
+	g_free(xfer);
 }
 
 void
@@ -132,6 +167,11 @@ purple_xfer_set_status(PurpleXfer *xfer, PurpleXferStatusType status)
 {
 	g_return_if_fail(xfer != NULL);
 
+	if (xfer->status == status)
+		return;
+
+	xfer->status = status;
+
 	if(xfer->type == PURPLE_XFER_SEND) {
 		switch(status) {
 			case PURPLE_XFER_STATUS_ACCEPTED:
@@ -169,8 +209,6 @@ purple_xfer_set_status(PurpleXfer *xfer, PurpleXferStatusType status)
 				break;
 		}
 	}
-
-	xfer->status = status;
 }
 
 void purple_xfer_conversation_write(PurpleXfer *xfer, char *message, gboolean is_error)
@@ -458,7 +496,7 @@ purple_xfer_request_accepted(PurpleXfer *xfer, const char *filename)
 {
 	PurpleXferType type;
 	struct stat st;
-	char *msg, *utf8;
+	char *msg, *utf8, *base;
 	PurpleAccount *account;
 	PurpleBuddy *buddy;
 
@@ -479,13 +517,16 @@ purple_xfer_request_accepted(PurpleXfer *xfer, const char *filename)
 	if (type == PURPLE_XFER_SEND) {
 		/* Sending a file */
 		/* Check the filename. */
+		PurpleXferUiOps *ui_ops;
+		ui_ops = purple_xfer_get_ui_ops(xfer);
+
 #ifdef _WIN32
 		if (g_strrstr(filename, "../") || g_strrstr(filename, "..\\"))
 #else
 		if (g_strrstr(filename, "../"))
 #endif
 		{
-			char *utf8 = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+			utf8 = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
 
 			msg = g_strdup_printf(_("%s is not a valid filename.\n"), utf8);
 			purple_xfer_error(type, account, xfer->who, msg);
@@ -496,22 +537,28 @@ purple_xfer_request_accepted(PurpleXfer *xfer, const char *filename)
 			return;
 		}
 
-		if (g_stat(filename, &st) == -1) {
-			purple_xfer_show_file_error(xfer, filename);
-			purple_xfer_unref(xfer);
-			return;
-		}
+		if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+			if (g_stat(filename, &st) == -1) {
+				purple_xfer_show_file_error(xfer, filename);
+				purple_xfer_unref(xfer);
+				return;
+			}
 
-		purple_xfer_set_local_filename(xfer, filename);
-		purple_xfer_set_size(xfer, st.st_size);
+			purple_xfer_set_local_filename(xfer, filename);
+			purple_xfer_set_size(xfer, st.st_size);
+		} else {
+			utf8 = g_strdup(filename);
+			purple_xfer_set_local_filename(xfer, filename);
+		}
 
-		utf8 = g_filename_to_utf8(g_basename(filename), -1, NULL, NULL, NULL);
+		base = g_path_get_basename(filename);
+		utf8 = g_filename_to_utf8(base, -1, NULL, NULL, NULL);
+		g_free(base);
 		purple_xfer_set_filename(xfer, utf8);
 
 		msg = g_strdup_printf(_("Offering to send %s to %s"),
 				utf8, buddy ? purple_buddy_get_alias(buddy) : xfer->who);
 		g_free(utf8);
-
 		purple_xfer_conversation_write(xfer, msg, FALSE);
 		g_free(msg);
 	}
@@ -694,14 +741,34 @@ purple_xfer_set_completed(PurpleXfer *xfer, gboolean completed)
 
 	if (completed == TRUE) {
 		char *msg = NULL;
+		PurpleConversation *conv;
+
 		purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_DONE);
 
 		if (purple_xfer_get_filename(xfer) != NULL)
-			msg = g_strdup_printf(_("Transfer of file %s complete"),
-								purple_xfer_get_filename(xfer));
+		{
+			char *filename = g_markup_escape_text(purple_xfer_get_filename(xfer), -1);
+			if (purple_xfer_get_local_filename(xfer)
+			 && purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE)
+			{
+				char *local = g_markup_escape_text(purple_xfer_get_local_filename(xfer), -1);
+				msg = g_strdup_printf(_("Transfer of file <A HREF=\"file://%s\">%s</A> complete"),
+				                      local, filename);
+				g_free(local);
+			}
+			else
+				msg = g_strdup_printf(_("Transfer of file %s complete"),
+				                      filename);
+			g_free(filename);
+		}
 		else
 			msg = g_strdup(_("File transfer complete"));
-		purple_xfer_conversation_write(xfer, msg, FALSE);
+
+		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, xfer->who,
+		                                             purple_xfer_get_account(xfer));
+
+		if (conv != NULL)
+			purple_conversation_write(conv, NULL, msg, PURPLE_MESSAGE_SYSTEM, time(NULL));
 		g_free(msg);
 	}
 
@@ -857,8 +924,9 @@ purple_xfer_read(PurpleXfer *xfer, guchar **buffer)
 	else
 		s = MIN(purple_xfer_get_bytes_remaining(xfer), xfer->current_buffer_size);
 
-	if (xfer->ops.read != NULL)
+	if (xfer->ops.read != NULL)	{
 		r = (xfer->ops.read)(buffer, xfer);
+	}
 	else {
 		*buffer = g_malloc0(s);
 
@@ -867,9 +935,6 @@ purple_xfer_read(PurpleXfer *xfer, guchar **buffer)
 			r = 0;
 		else if (r < 0)
 			r = -1;
-		else if ((purple_xfer_get_size(xfer) > 0) &&
-			((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
-			purple_xfer_set_completed(xfer, TRUE);
 		else if (r == 0)
 			r = -1;
 	}
@@ -910,29 +975,39 @@ purple_xfer_write(PurpleXfer *xfer, const guchar *buffer, gsize size)
 }
 
 static void
-transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
+do_transfer(PurpleXfer *xfer)
 {
 	PurpleXferUiOps *ui_ops;
-	PurpleXfer *xfer = (PurpleXfer *)data;
 	guchar *buffer = NULL;
 	gssize r = 0;
 
-	if (condition & PURPLE_INPUT_READ) {
+	ui_ops = purple_xfer_get_ui_ops(xfer);
+
+	if (xfer->type == PURPLE_XFER_RECEIVE) {
 		r = purple_xfer_read(xfer, &buffer);
 		if (r > 0) {
-			const size_t wc = fwrite(buffer, 1, r, xfer->dest_fp);
+			size_t wc;
+			if (ui_ops && ui_ops->ui_write)
+				wc = ui_ops->ui_write(xfer, buffer, r);
+			else
+				wc = fwrite(buffer, 1, r, xfer->dest_fp);
+
 			if (wc != r) {
 				purple_debug_error("filetransfer", "Unable to write whole buffer.\n");
-				purple_xfer_cancel_remote(xfer);
+				purple_xfer_cancel_local(xfer);
+				g_free(buffer);
 				return;
 			}
+
+			if ((purple_xfer_get_size(xfer) > 0) &&
+				((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
+				purple_xfer_set_completed(xfer, TRUE);
 		} else if(r < 0) {
 			purple_xfer_cancel_remote(xfer);
+			g_free(buffer);
 			return;
 		}
-	}
-
-	if (condition & PURPLE_INPUT_WRITE) {
+	} else if (xfer->type == PURPLE_XFER_SEND) {
 		size_t result;
 		size_t s = MIN(purple_xfer_get_bytes_remaining(xfer), xfer->current_buffer_size);
 
@@ -946,26 +1021,53 @@ transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
 			return;
 		}
 
-		buffer = g_malloc0(s);
+		if (ui_ops && ui_ops->ui_read) {
+			gssize tmp = ui_ops->ui_read(xfer, &buffer, s);
+			if (tmp == 0) {
+				/*
+				 * UI isn't ready to send data. It will call
+				 * purple_xfer_ui_ready when ready, which sets back up this
+				 * watcher.
+				 */
+				if (xfer->watcher != 0) {
+					purple_timeout_remove(xfer->watcher);
+					xfer->watcher = 0;
+				}
 
-		result = fread(buffer, 1, s, xfer->dest_fp);
-		if (result != s) {
-			purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
-			purple_xfer_cancel_remote(xfer);
-			g_free(buffer);
-			return;
+				return;
+			} else if (tmp < 0) {
+				purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
+				purple_xfer_cancel_local(xfer);
+				return;
+			}
+
+			result = tmp;
+		} else {
+			buffer = g_malloc0(s);
+			result = fread(buffer, 1, s, xfer->dest_fp);
+			if (result != s) {
+				purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
+				purple_xfer_cancel_local(xfer);
+				g_free(buffer);
+				return;
+			}
 		}
 
 		/* Write as much as we're allowed to. */
-		r = purple_xfer_write(xfer, buffer, s);
+		r = purple_xfer_write(xfer, buffer, result);
 
 		if (r == -1) {
 			purple_xfer_cancel_remote(xfer);
 			g_free(buffer);
 			return;
-		} else if (r < s) {
-			/* We have to seek back in the file now. */
-			fseek(xfer->dest_fp, r - s, SEEK_CUR);
+		} else if (r < result) {
+			if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+				/* We have to seek back in the file now. */
+				fseek(xfer->dest_fp, r - s, SEEK_CUR);
+			}
+			else {
+				ui_ops->data_not_sent(xfer, buffer + r, result - r);
+			}
 		} else {
 			/*
 			 * We managed to write the entire buffer.  This means our
@@ -987,8 +1089,6 @@ transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
 
 		g_free(buffer);
 
-		ui_ops = purple_xfer_get_ui_ops(xfer);
-
 		if (ui_ops != NULL && ui_ops->update_progress != NULL)
 			ui_ops->update_progress(xfer,
 				purple_xfer_get_progress(xfer));
@@ -999,22 +1099,45 @@ transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
 }
 
 static void
+transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
+{
+	PurpleXfer *xfer = data;
+
+	if (xfer->dest_fp == NULL) {
+		/* The UI is moderating its side manually */
+		PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);
+		if (0 == (priv->ready & PURPLE_XFER_READY_UI)) {
+			priv->ready |= PURPLE_XFER_READY_PRPL;
+
+			purple_input_remove(xfer->watcher);
+			xfer->watcher = 0;
+			return;
+		}
+	}
+
+	do_transfer(xfer);
+}
+
+static void
 begin_transfer(PurpleXfer *xfer, PurpleInputCondition cond)
 {
 	PurpleXferType type = purple_xfer_get_type(xfer);
+	PurpleXferUiOps *ui_ops = purple_xfer_get_ui_ops(xfer);
 
-	xfer->dest_fp = g_fopen(purple_xfer_get_local_filename(xfer),
-						  type == PURPLE_XFER_RECEIVE ? "wb" : "rb");
+	if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+		xfer->dest_fp = g_fopen(purple_xfer_get_local_filename(xfer),
+		                        type == PURPLE_XFER_RECEIVE ? "wb" : "rb");
 
-	if (xfer->dest_fp == NULL) {
-		purple_xfer_show_file_error(xfer, purple_xfer_get_local_filename(xfer));
-		purple_xfer_cancel_local(xfer);
-		return;
-	}
+		if (xfer->dest_fp == NULL) {
+			purple_xfer_show_file_error(xfer, purple_xfer_get_local_filename(xfer));
+			purple_xfer_cancel_local(xfer);
+			return;
+		}
 
-	fseek(xfer->dest_fp, xfer->bytes_sent, SEEK_SET);
+		fseek(xfer->dest_fp, xfer->bytes_sent, SEEK_SET);
+	}
 
-	if (xfer->fd)
+	if (xfer->fd != -1)
 		xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
 
 	xfer->start_time = time(NULL);
@@ -1039,6 +1162,54 @@ connect_cb(gpointer data, gint source, const gchar *error_message)
 }
 
 void
+purple_xfer_ui_ready(PurpleXfer *xfer)
+{
+	PurpleInputCondition cond;
+	PurpleXferType type;
+	PurpleXferPrivData *priv;
+
+	g_return_if_fail(xfer != NULL);
+
+	priv = g_hash_table_lookup(xfers_data, xfer);
+	priv->ready |= PURPLE_XFER_READY_UI;
+
+	if (0 == (priv->ready & PURPLE_XFER_READY_PRPL))
+		return;
+
+	type = purple_xfer_get_type(xfer);
+	if (type == PURPLE_XFER_SEND)
+		cond = PURPLE_INPUT_WRITE;
+	else /* if (type == PURPLE_XFER_RECEIVE) */
+		cond = PURPLE_INPUT_READ;
+
+	if (xfer->watcher == 0 && xfer->fd != -1)
+		xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
+
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	do_transfer(xfer);
+}
+
+void
+purple_xfer_prpl_ready(PurpleXfer *xfer)
+{
+	PurpleXferPrivData *priv;
+
+	g_return_if_fail(xfer != NULL);
+
+	priv = g_hash_table_lookup(xfers_data, xfer);
+	priv->ready |= PURPLE_XFER_READY_PRPL;
+
+	/* I don't think fwrite/fread are ever *not* ready */
+	if (xfer->dest_fp == NULL && 0 == (priv->ready & PURPLE_XFER_READY_UI))
+		return;
+
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	do_transfer(xfer);
+}
+
+void
 purple_xfer_start(PurpleXfer *xfer, int fd, const char *ip,
 				unsigned int port)
 {
@@ -1052,6 +1223,13 @@ purple_xfer_start(PurpleXfer *xfer, int fd, const char *ip,
 
 	purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_STARTED);
 
+	/*
+	 * FIXME 3.0.0 -- there's too much broken code depending on fd == 0
+	 * meaning "don't use a real fd"
+	 */
+	if (fd == 0)
+		fd = -1;
+
 	if (type == PURPLE_XFER_RECEIVE) {
 		cond = PURPLE_INPUT_READ;
 
@@ -1098,7 +1276,7 @@ purple_xfer_end(PurpleXfer *xfer)
 		xfer->watcher = 0;
 	}
 
-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);
 
 	if (xfer->dest_fp != NULL) {
@@ -1135,7 +1313,7 @@ purple_xfer_cancel_local(PurpleXfer *xfer)
 
 	if (purple_xfer_get_filename(xfer) != NULL)
 	{
-		msg = g_strdup_printf(_("You canceled the transfer of %s"),
+		msg = g_strdup_printf(_("You cancelled the transfer of %s"),
 							  purple_xfer_get_filename(xfer));
 	}
 	else
@@ -1161,7 +1339,7 @@ purple_xfer_cancel_local(PurpleXfer *xfer)
 		xfer->watcher = 0;
 	}
 
-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);
 
 	if (xfer->dest_fp != NULL) {
@@ -1198,12 +1376,12 @@ purple_xfer_cancel_remote(PurpleXfer *xfer)
 
 	if (purple_xfer_get_filename(xfer) != NULL)
 	{
-		msg = g_strdup_printf(_("%s canceled the transfer of %s"),
+		msg = g_strdup_printf(_("%s cancelled the transfer of %s"),
 				buddy ? purple_buddy_get_alias(buddy) : xfer->who, purple_xfer_get_filename(xfer));
 	}
 	else
 	{
-		msg = g_strdup_printf(_("%s canceled the file transfer"),
+		msg = g_strdup_printf(_("%s cancelled the file transfer"),
 				buddy ? purple_buddy_get_alias(buddy) : xfer->who);
 	}
 	purple_xfer_conversation_write(xfer, msg, TRUE);
@@ -1226,7 +1404,7 @@ purple_xfer_cancel_remote(PurpleXfer *xfer)
 		xfer->watcher = 0;
 	}
 
-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);
 
 	if (xfer->dest_fp != NULL) {
@@ -1296,6 +1474,9 @@ void
 purple_xfers_init(void) {
 	void *handle = purple_xfers_get_handle();
 
+	xfers_data = g_hash_table_new_full(g_direct_hash, g_direct_equal,
+	                                   NULL, purple_xfer_priv_data_destroy);
+
 	/* register signals */
 	purple_signal_register(handle, "file-recv-accept",
 	                     purple_marshal_VOID__POINTER, NULL, 1,
@@ -1342,6 +1523,9 @@ purple_xfers_uninit(void)
 
 	purple_signals_disconnect_by_handle(handle);
 	purple_signals_unregister_by_instance(handle);
+
+	g_hash_table_destroy(xfers_data);
+	xfers_data = NULL;
 }
 
 void
diff --git a/libpurple/ft.h b/libpurple/ft.h
index d1a40a7b8b..ad5526602c 100644
--- a/libpurple/ft.h
+++ b/libpurple/ft.h
@@ -77,10 +77,50 @@ typedef struct
 	void (*cancel_local)(PurpleXfer *xfer);
 	void (*cancel_remote)(PurpleXfer *xfer);
 
+	/**
+	 * UI op to write data received from the prpl. The UI must deal with the
+	 * entire buffer and return size, or it is treated as an error.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  The buffer to write
+	 * @param size    The size of the buffer
+	 *
+	 * @return size if the write was successful, or a value between 0 and
+	 *         size on error.
+	 * @since 2.6.0
+	 */
+	gssize (*ui_write)(PurpleXfer *xfer, const guchar *buffer, gssize size);
+
+	/**
+	 * UI op to read data to send to the prpl for a file transfer.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  A pointer to a buffer. The UI must allocate this buffer.
+	 *                libpurple will free the data.
+	 * @param size    The maximum amount of data to put in the buffer.
+	 *
+	 * @returns The amount of data in the buffer, 0 if nothing is available,
+	 *          and a negative value if an error occurred and the transfer
+	 *          should be cancelled (libpurple will cancel).
+	 * @since 2.6.0
+	 */
+	gssize (*ui_read)(PurpleXfer *xfer, guchar **buffer, gssize size);
+
+	/**
+	 * Op to notify the UI that not all the data read in was written. The UI
+	 * should re-enqueue this data and return it the next time read is called.
+	 *
+	 * This MUST be implemented if read and write are implemented.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  A pointer to the beginning of the unwritten data.
+	 * @param size    The amount of unwritten data.
+	 *
+	 * @since 2.6.0
+	 */
+	void (*data_not_sent)(PurpleXfer *xfer, const guchar *buffer, gsize size);
+
 	void (*_purple_reserved1)(void);
-	void (*_purple_reserved2)(void);
-	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
 } PurpleXferUiOps;
 
 /**
@@ -132,7 +172,6 @@ struct _PurpleXfer
 		gssize (*read)(guchar **buffer, PurpleXfer *xfer);
 		gssize (*write)(const guchar *buffer, size_t size, PurpleXfer *xfer);
 		void (*ack)(PurpleXfer *xfer, const guchar *buffer, size_t size);
-
 	} ops;
 
 	PurpleXferUiOps *ui_ops;            /**< UI-specific operations. */
@@ -548,6 +587,12 @@ gssize purple_xfer_write(PurpleXfer *xfer, const guchar *buffer, gsize size);
  * file receive transfer. On send, @a fd must be specified, and
  * @a ip and @a port are ignored.
  *
+ * Prior to libpurple 2.6.0, passing '0' to @a fd was special-cased to
+ * allow the protocol plugin to facilitate the file transfer itself. As of
+ * 2.6.0, this is supported (for backward compatibility), but will be
+ * removed in libpurple 3.0.0. If a prpl detects that the running libpurple
+ * is running 2.6.0 or higher, it should use the invalid fd '-1'.
+ *
  * @param xfer The file transfer.
  * @param fd   The file descriptor for the socket.
  * @param ip   The IP address to connect to.
@@ -617,6 +662,28 @@ void purple_xfer_update_progress(PurpleXfer *xfer);
  */
 void purple_xfer_conversation_write(PurpleXfer *xfer, char *message, gboolean is_error);
 
+/**
+ * Allows the UI to signal it's ready to send/receive data (depending on
+ * the direction of the file transfer. Used when the UI is providing
+ * read/write/data_not_sent UI ops.
+ *
+ * @param xfer The file transfer which is ready.
+ *
+ * @since 2.6.0
+ */
+void purple_xfer_ui_ready(PurpleXfer *xfer);
+
+/**
+ * Allows the prpl to signal it's readh to send/receive data (depending on
+ * the direction of the file transfer. Used when the prpl provides read/write
+ * ops and cannot/does not provide a raw fd to the core.
+ *
+ * @param xfer The file transfer which is ready.
+ *
+ * @since 2.6.0
+ */
+void purple_xfer_prpl_ready(PurpleXfer *xfer);
+
 /*@}*/
 
 /**************************************************************************/
diff --git a/libpurple/idle.c b/libpurple/idle.c
index 55e338749e..909ae72f00 100644
--- a/libpurple/idle.c
+++ b/libpurple/idle.c
@@ -187,9 +187,8 @@ check_idleness(void)
 		purple_savedstatus_set_idleaway(TRUE);
 		no_away = FALSE;
 	}
-	else if (!no_away && time_idle < away_seconds)
+	else if (purple_savedstatus_is_idleaway() && time_idle < away_seconds)
 	{
-		no_away = TRUE;
 		purple_savedstatus_set_idleaway(FALSE);
 		if (time_until_next_idle_event == 0 || (away_seconds - time_idle) < time_until_next_idle_event)
 			time_until_next_idle_event = away_seconds - time_idle;
diff --git a/libpurple/idle.h b/libpurple/idle.h
index 486021c8c7..f01c75bc60 100644
--- a/libpurple/idle.h
+++ b/libpurple/idle.h
@@ -26,6 +26,8 @@
 #ifndef _PURPLE_IDLE_H_
 #define _PURPLE_IDLE_H_
 
+#include <time.h>
+
 /**
  * Idle UI operations.
  */
diff --git a/libpurple/imgstore.c b/libpurple/imgstore.c
index bde4262f85..66ab440231 100644
--- a/libpurple/imgstore.c
+++ b/libpurple/imgstore.c
@@ -75,6 +75,8 @@ purple_imgstore_new_from_file(const char *path)
 	size_t len;
 	GError *err = NULL;
 
+	g_return_val_if_fail(path != NULL && *path != '\0', NULL);
+
 	if (!g_file_get_contents(path, &data, &len, &err)) {
 		purple_debug_error("imgstore", "Error reading %s: %s\n",
 				path, err->message);
diff --git a/libpurple/internal.h b/libpurple/internal.h
index 085605f2a6..dff1bfd2ac 100644
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -148,6 +148,14 @@
 #	endif
 #endif
 
+#ifndef G_MAXSSIZE
+#	if GLIB_SIZEOF_LONG == 8
+#		define G_MAXSSIZE ((gssize) 0x7fffffffffffffff)
+#	else
+#		define G_MAXSSIZE ((gssize) 0x7fffffff)
+#	endif
+#endif
+
 #if GLIB_CHECK_VERSION(2,6,0)
 #	include <glib/gstdio.h>
 #endif
@@ -222,6 +230,50 @@
 #	endif
 #endif
 
+#ifdef HAVE_CONFIG_H
+#if SIZEOF_TIME_T == 4
+#	define PURPLE_TIME_T_MODIFIER "lu"
+#elif SIZEOF_TIME_T == 8
+#	define PURPLE_TIME_T_MODIFIER "zu"
+#else
+#error Unknown size of time_t
+#endif
+#endif
+
+#include <glib-object.h>
+
+#ifndef G_DEFINE_TYPE
+#define G_DEFINE_TYPE(TypeName, type_name, TYPE_PARENT) \
+\
+static void     type_name##_init              (TypeName        *self); \
+static void     type_name##_class_init        (TypeName##Class *klass); \
+static gpointer type_name##_parent_class = NULL; \
+static void     type_name##_class_intern_init (gpointer klass) \
+{ \
+  type_name##_parent_class = g_type_class_peek_parent (klass); \
+  type_name##_class_init ((TypeName##Class*) klass); \
+} \
+\
+GType \
+type_name##_get_type (void) \
+{ \
+  static GType g_define_type_id = 0; \
+  if (G_UNLIKELY (g_define_type_id == 0)) \
+    { \
+      g_define_type_id = \
+        g_type_register_static_simple (TYPE_PARENT, \
+                                       g_intern_static_string (#TypeName), \
+                                       sizeof (TypeName##Class), \
+                                       (GClassInitFunc)type_name##_class_intern_init, \
+                                       sizeof (TypeName), \
+                                       (GInstanceInitFunc)type_name##_init, \
+                                       (GTypeFlags) 0); \
+    }					\
+  return g_define_type_id;		\
+} /* closes type_name##_get_type() */
+
+#endif
+
 /* Safer ways to work with static buffers. When using non-static
  * buffers, either use g_strdup_* functions (preferred) or use
  * g_strlcpy/g_strlcpy directly. */
diff --git a/libpurple/log.c b/libpurple/log.c
index 0f8da9d5dd..79106bfd8a 100644
--- a/libpurple/log.c
+++ b/libpurple/log.c
@@ -1129,7 +1129,7 @@ static void log_get_log_sets_common(GHashTable *sets)
 				/* set->buddy is always set below */
 				set->normalized_name = g_strdup(purple_normalize(account, name));
 
-				/* Chat for .chat or .system at the end of the name to determine the type. */
+				/* Check for .chat or .system at the end of the name to determine the type. */
 				if (len >= 7) {
 					gchar *tmp = &name[len - 7];
 					if (purple_strequal(tmp, ".system")) {
@@ -1375,6 +1375,7 @@ static gsize html_logger_write(PurpleLog *log, PurpleMessageFlags type,
 	char *image_corrected_msg;
 	char *date;
 	char *header;
+	char *escaped_from;
 	PurplePlugin *plugin = purple_find_prpl(purple_account_get_protocol_id(log->account));
 	PurpleLogCommonLoggerData *data = log->logger_data;
 	gsize written = 0;
@@ -1413,6 +1414,8 @@ static gsize html_logger_write(PurpleLog *log, PurpleMessageFlags type,
 	if(!data->file)
 		return 0;
 
+	escaped_from = g_markup_escape_text(from, -1);
+
 	image_corrected_msg = convert_image_tags(log, message);
 	purple_markup_html_to_xhtml(image_corrected_msg, &msg_fixed, NULL);
 
@@ -1434,34 +1437,35 @@ static gsize html_logger_write(PurpleLog *log, PurpleMessageFlags type,
 			written += fprintf(data->file, "<font color=\"#FF0000\"><font size=\"2\">(%s)</font><b> %s</b></font><br/>\n", date, msg_fixed);
 		else if (type & PURPLE_MESSAGE_WHISPER)
 			written += fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font><b> %s:</b></font> %s<br/>\n",
-					date, from, msg_fixed);
+					date, escaped_from, msg_fixed);
 		else if (type & PURPLE_MESSAGE_AUTO_RESP) {
 			if (type & PURPLE_MESSAGE_SEND)
-				written += fprintf(data->file, _("<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, from, msg_fixed);
+				written += fprintf(data->file, _("<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, escaped_from, msg_fixed);
 			else if (type & PURPLE_MESSAGE_RECV)
-				written += fprintf(data->file, _("<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, from, msg_fixed);
+				written += fprintf(data->file, _("<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, escaped_from, msg_fixed);
 		} else if (type & PURPLE_MESSAGE_RECV) {
 			if(purple_message_meify(msg_fixed, -1))
 				written += fprintf(data->file, "<font color=\"#062585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 			else
 				written += fprintf(data->file, "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 		} else if (type & PURPLE_MESSAGE_SEND) {
 			if(purple_message_meify(msg_fixed, -1))
 				written += fprintf(data->file, "<font color=\"#062585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 			else
 				written += fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 		} else {
 			purple_debug_error("log", "Unhandled message type.\n");
 			written += fprintf(data->file, "<font size=\"2\">(%s)</font><b> %s:</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 		}
 	}
 	g_free(date);
 	g_free(msg_fixed);
+	g_free(escaped_from);
 	fflush(data->file);
 
 	return written;
diff --git a/libpurple/marshallers.list b/libpurple/marshallers.list
new file mode 100644
index 0000000000..39259d0a47
--- /dev/null
+++ b/libpurple/marshallers.list
@@ -0,0 +1,6 @@
+VOID:POINTER,POINTER,OBJECT
+BOOLEAN:OBJECT,POINTER,STRING
+VOID:STRING,STRING
+VOID:STRING,STRING,DOUBLE
+VOID:ENUM,STRING,STRING
+VOID:ENUM,STRING,STRING,BOOLEAN
diff --git a/libpurple/media-gst.h b/libpurple/media-gst.h
new file mode 100644
index 0000000000..3840792d2b
--- /dev/null
+++ b/libpurple/media-gst.h
@@ -0,0 +1,173 @@
+/**
+ * @file media-gst.h Media API
+ * @ingroup core
+ */
+
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _PURPLE_MEDIA_GST_H_
+#define _PURPLE_MEDIA_GST_H_
+
+#include "media.h"
+#include "mediamanager.h"
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define PURPLE_TYPE_MEDIA_ELEMENT_TYPE           (purple_media_element_type_get_type())
+#define PURPLE_TYPE_MEDIA_ELEMENT_INFO           (purple_media_element_info_get_type())
+#define PURPLE_MEDIA_ELEMENT_INFO(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo))
+#define PURPLE_MEDIA_ELEMENT_INFO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo))
+#define PURPLE_IS_MEDIA_ELEMENT_INFO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO))
+#define PURPLE_IS_MEDIA_ELEMENT_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_ELEMENT_INFO))
+#define PURPLE_MEDIA_ELEMENT_INFO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo))
+
+/** @copydoc _PurpleMediaElementInfo */
+typedef struct _PurpleMediaElementInfo PurpleMediaElementInfo;
+typedef struct _PurpleMediaElementInfoClass PurpleMediaElementInfoClass;
+typedef GstElement *(*PurpleMediaElementCreateCallback)(PurpleMedia *media,
+			const gchar *session_id, const gchar *participant);
+
+typedef enum {
+	PURPLE_MEDIA_ELEMENT_NONE = 0,			/** empty element */
+	PURPLE_MEDIA_ELEMENT_AUDIO = 1,			/** supports audio */
+	PURPLE_MEDIA_ELEMENT_VIDEO = 1 << 1,		/** supports video */
+	PURPLE_MEDIA_ELEMENT_AUDIO_VIDEO = PURPLE_MEDIA_ELEMENT_AUDIO
+			| PURPLE_MEDIA_ELEMENT_VIDEO, 	/** supports audio and video */
+
+	PURPLE_MEDIA_ELEMENT_NO_SRCS = 0,		/** has no src pads */
+	PURPLE_MEDIA_ELEMENT_ONE_SRC = 1 << 2,		/** has one src pad */
+	PURPLE_MEDIA_ELEMENT_MULTI_SRC = 1 << 3, 	/** has multiple src pads */
+	PURPLE_MEDIA_ELEMENT_REQUEST_SRC = 1 << 4, 	/** src pads must be requested */
+
+	PURPLE_MEDIA_ELEMENT_NO_SINKS = 0,		/** has no sink pads */
+	PURPLE_MEDIA_ELEMENT_ONE_SINK = 1 << 5, 	/** has one sink pad */
+	PURPLE_MEDIA_ELEMENT_MULTI_SINK = 1 << 6, 	/** has multiple sink pads */
+	PURPLE_MEDIA_ELEMENT_REQUEST_SINK = 1 << 7, 	/** sink pads must be requested */
+
+	PURPLE_MEDIA_ELEMENT_UNIQUE = 1 << 8,		/** This element is unique and
+							 only one instance of it should
+							 be created at a time */
+
+	PURPLE_MEDIA_ELEMENT_SRC = 1 << 9,		/** can be set as an active src */
+	PURPLE_MEDIA_ELEMENT_SINK = 1 << 10,		/** can be set as an active sink */
+} PurpleMediaElementType;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Gets the element type's GType.
+ *
+ * @return The element type's GType.
+ *
+ * @since 2.6.0
+ */
+GType purple_media_element_type_get_type(void);
+
+/**
+ * Gets the element info's GType.
+ *
+ * @return The element info's GType.
+ *
+ * @since 2.6.0
+ */
+GType purple_media_element_info_get_type(void);
+
+/**
+ * Gets the source from a session
+ *
+ * @param media The media object the session is in.
+ * @param sess_id The session id of the session to get the source from.
+ *
+ * @return The source retrieved.
+ *
+ * @since 2.6.0
+ */
+GstElement *purple_media_get_src(PurpleMedia *media, const gchar *sess_id);
+
+/**
+ * Gets the tee from a given session/stream.
+ *
+ * @param media The instance to get the tee from.
+ * @param session_id The id of the session to get the tee from.
+ * @param participant Optionally, the participant of the stream to get the tee from.
+ *
+ * @return The GstTee element from the chosen session/stream.
+ *
+ * @since 2.6.0
+ */
+GstElement *purple_media_get_tee(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant);
+
+
+/**
+ * Gets the pipeline from the media manager.
+ *
+ * @param manager The media manager to get the pipeline from.
+ *
+ * @return The pipeline.
+ *
+ * @since 2.6.0
+ */
+GstElement *purple_media_manager_get_pipeline(PurpleMediaManager *manager);
+
+/**
+ * Returns a GStreamer source or sink for audio or video.
+ *
+ * @param manager The media manager to use to obtain the source/sink.
+ * @param type The type of source/sink to get.
+ *
+ * @since 2.6.0
+ */
+GstElement *purple_media_manager_get_element(PurpleMediaManager *manager,
+		PurpleMediaSessionType type, PurpleMedia *media,
+		const gchar *session_id, const gchar *participant);
+
+PurpleMediaElementInfo *purple_media_manager_get_element_info(
+		PurpleMediaManager *manager, const gchar *name);
+gboolean purple_media_manager_register_element(PurpleMediaManager *manager,
+		PurpleMediaElementInfo *info);
+gboolean purple_media_manager_unregister_element(PurpleMediaManager *manager,
+		const gchar *name);
+gboolean purple_media_manager_set_active_element(PurpleMediaManager *manager,
+		PurpleMediaElementInfo *info);
+PurpleMediaElementInfo *purple_media_manager_get_active_element(
+		PurpleMediaManager *manager, PurpleMediaElementType type);
+
+gchar *purple_media_element_info_get_id(PurpleMediaElementInfo *info);
+gchar *purple_media_element_info_get_name(PurpleMediaElementInfo *info);
+PurpleMediaElementType purple_media_element_info_get_element_type(
+		PurpleMediaElementInfo *info);
+GstElement *purple_media_element_info_call_create(
+		PurpleMediaElementInfo *info, PurpleMedia *media,
+		const gchar *session_id, const gchar *participant);
+
+#ifdef __cplusplus
+}
+#endif
+
+G_END_DECLS
+
+#endif  /* _PURPLE_MEDIA_GST_H_ */
diff --git a/libpurple/media.c b/libpurple/media.c
new file mode 100644
index 0000000000..c6479b3932
--- /dev/null
+++ b/libpurple/media.c
@@ -0,0 +1,3219 @@
+/**
+ * @file media.c Media API
+ * @ingroup core
+ */
+
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <string.h>
+
+#include "internal.h"
+
+#include "account.h"
+#include "media.h"
+#include "mediamanager.h"
+#include "network.h"
+
+#include "debug.h"
+
+#ifdef USE_GSTREAMER
+#include "marshallers.h"
+#include "media-gst.h"
+#endif
+
+#ifdef USE_VV
+
+#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-element-added-notifier.h>
+
+/** @copydoc _PurpleMediaSession */
+typedef struct _PurpleMediaSession PurpleMediaSession;
+/** @copydoc _PurpleMediaStream */
+typedef struct _PurpleMediaStream PurpleMediaStream;
+/** @copydoc _PurpleMediaClass */
+typedef struct _PurpleMediaClass PurpleMediaClass;
+/** @copydoc _PurpleMediaPrivate */
+typedef struct _PurpleMediaPrivate PurpleMediaPrivate;
+/** @copydoc _PurpleMediaCandidateClass */
+typedef struct _PurpleMediaCandidateClass PurpleMediaCandidateClass;
+/** @copydoc _PurpleMediaCandidatePrivate */
+typedef struct _PurpleMediaCandidatePrivate PurpleMediaCandidatePrivate;
+/** @copydoc _PurpleMediaCodecClass */
+typedef struct _PurpleMediaCodecClass PurpleMediaCodecClass;
+/** @copydoc _PurpleMediaCodecPrivate */
+typedef struct _PurpleMediaCodecPrivate PurpleMediaCodecPrivate;
+
+/** The media class */
+struct _PurpleMediaClass
+{
+	GObjectClass parent_class;     /**< The parent class. */
+};
+
+/** The media class's private data */
+struct _PurpleMedia
+{
+	GObject parent;                /**< The parent of this object. */
+	PurpleMediaPrivate *priv;      /**< The private data of this object. */
+};
+
+struct _PurpleMediaSession
+{
+	gchar *id;
+	PurpleMedia *media;
+	GstElement *src;
+	GstElement *tee;
+	FsSession *session;
+
+	PurpleMediaSessionType type;
+	gboolean initiator;
+};
+
+struct _PurpleMediaStream
+{
+	PurpleMediaSession *session;
+	gchar *participant;
+	FsStream *stream;
+	GstElement *src;
+	GstElement *tee;
+	GstElement *volume;
+	GstElement *level;
+
+	GList *local_candidates;
+	GList *remote_candidates;
+
+	gboolean initiator;
+	gboolean accepted;
+	gboolean candidates_prepared;
+
+	GList *active_local_candidates;
+	GList *active_remote_candidates;
+
+	guint connected_cb_id;
+};
+#endif
+
+struct _PurpleMediaPrivate
+{
+#ifdef USE_VV
+	PurpleMediaManager *manager;
+	PurpleAccount *account;
+	FsConference *conference;
+	gboolean initiator;
+	gpointer prpl_data;
+
+	GHashTable *sessions;	/* PurpleMediaSession table */
+	GHashTable *participants; /* FsParticipant table */
+
+	GList *streams;		/* PurpleMediaStream table */
+
+	GstElement *confbin;
+#else
+	gpointer dummy;
+#endif
+};
+
+#ifdef USE_VV
+#define PURPLE_MEDIA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_MEDIA, PurpleMediaPrivate))
+#define PURPLE_MEDIA_CANDIDATE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_MEDIA_CANDIDATE, PurpleMediaCandidatePrivate))
+#define PURPLE_MEDIA_CODEC_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_MEDIA_CODEC, PurpleMediaCodecPrivate))
+
+static void purple_media_class_init (PurpleMediaClass *klass);
+static void purple_media_init (PurpleMedia *media);
+static void purple_media_dispose (GObject *object);
+static void purple_media_finalize (GObject *object);
+static void purple_media_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void purple_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+
+static void purple_media_new_local_candidate_cb(FsStream *stream,
+		FsCandidate *local_candidate, PurpleMediaSession *session);
+static void purple_media_candidates_prepared_cb(FsStream *stream,
+		PurpleMediaSession *session);
+static void purple_media_candidate_pair_established_cb(FsStream *stream,
+		FsCandidate *native_candidate, FsCandidate *remote_candidate,
+		PurpleMediaSession *session);
+static gboolean media_bus_call(GstBus *bus,
+		GstMessage *msg, PurpleMedia *media);
+
+static GObjectClass *parent_class = NULL;
+
+
+
+enum {
+	S_ERROR,
+	CANDIDATES_PREPARED,
+	CODECS_CHANGED,
+	LEVEL,
+	NEW_CANDIDATE,
+	STATE_CHANGED,
+	STREAM_INFO,
+	LAST_SIGNAL
+};
+static guint purple_media_signals[LAST_SIGNAL] = {0};
+
+enum {
+	PROP_0,
+	PROP_MANAGER,
+	PROP_ACCOUNT,
+	PROP_CONFERENCE,
+	PROP_INITIATOR,
+	PROP_PRPL_DATA,
+};
+#endif
+
+
+/*
+ * PurpleMediaElementType
+ */
+
+GType
+purple_media_session_type_get_type()
+{
+	static GType type = 0;
+	if (type == 0) {
+		static const GFlagsValue values[] = {
+			{ PURPLE_MEDIA_NONE,
+				"PURPLE_MEDIA_NONE", "none" },
+			{ PURPLE_MEDIA_RECV_AUDIO,
+				"PURPLE_MEDIA_RECV_AUDIO", "recv-audio" },
+			{ PURPLE_MEDIA_SEND_AUDIO,
+				"PURPLE_MEDIA_SEND_AUDIO", "send-audio" },
+			{ PURPLE_MEDIA_RECV_VIDEO,
+				"PURPLE_MEDIA_RECV_VIDEO", "recv-video" },
+			{ PURPLE_MEDIA_SEND_VIDEO,
+				"PURPLE_MEDIA_SEND_VIDEO", "send-audio" },
+			{ PURPLE_MEDIA_AUDIO,
+				"PURPLE_MEDIA_AUDIO", "audio" },
+			{ PURPLE_MEDIA_VIDEO,
+				"PURPLE_MEDIA_VIDEO", "video" },
+			{ 0, NULL, NULL }
+		};
+		type = g_flags_register_static(
+				"PurpleMediaSessionType", values);
+	}
+	return type;
+}
+
+GType
+purple_media_get_type()
+{
+#ifdef USE_VV
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof(PurpleMediaClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) purple_media_class_init,
+			NULL,
+			NULL,
+			sizeof(PurpleMedia),
+			0,
+			(GInstanceInitFunc) purple_media_init,
+			NULL
+		};
+		type = g_type_register_static(G_TYPE_OBJECT, "PurpleMedia", &info, 0);
+	}
+	return type;
+#else
+	return G_TYPE_NONE;
+#endif
+}
+
+GType
+purple_media_state_changed_get_type()
+{
+	static GType type = 0;
+	if (type == 0) {
+		static const GEnumValue values[] = {
+			{ PURPLE_MEDIA_STATE_NEW,
+				"PURPLE_MEDIA_STATE_NEW", "new" },
+			{ PURPLE_MEDIA_STATE_CONNECTED,
+				"PURPLE_MEDIA_STATE_CONNECTED", "connected" },
+			{ PURPLE_MEDIA_STATE_END,
+				"PURPLE_MEDIA_STATE_END", "end" },
+			{ 0, NULL, NULL }
+		};
+		type = g_enum_register_static("PurpleMediaState", values);
+	}
+	return type;
+}
+
+GType
+purple_media_info_type_get_type()
+{
+	static GType type = 0;
+	if (type == 0) {
+		static const GEnumValue values[] = {
+			{ PURPLE_MEDIA_INFO_HANGUP,
+					"PURPLE_MEDIA_INFO_HANGUP", "hangup" },
+			{ PURPLE_MEDIA_INFO_ACCEPT,
+					"PURPLE_MEDIA_INFO_ACCEPT", "accept" },
+			{ PURPLE_MEDIA_INFO_REJECT,
+					"PURPLE_MEDIA_INFO_REJECT", "reject" },
+			{ PURPLE_MEDIA_INFO_MUTE,
+					"PURPLE_MEDIA_INFO_MUTE", "mute" },
+			{ PURPLE_MEDIA_INFO_UNMUTE,
+					"PURPLE_MEDIA_INFO_UNMUTE", "unmute" },
+			{ PURPLE_MEDIA_INFO_PAUSE,
+					"PURPLE_MEDIA_INFO_PAUSE", "pause" },
+			{ PURPLE_MEDIA_INFO_UNPAUSE,
+					"PURPLE_MEDIA_INFO_UNPAUSE", "unpause" },
+			{ PURPLE_MEDIA_INFO_HOLD,
+					"PURPLE_MEDIA_INFO_HOLD", "hold" },
+			{ PURPLE_MEDIA_INFO_UNHOLD,
+					"PURPLE_MEDIA_INFO_HOLD", "unhold" },
+			{ 0, NULL, NULL }
+		};
+		type = g_enum_register_static("PurpleMediaInfoType", values);
+	}
+	return type;
+}
+
+#ifdef USE_VV
+static void
+purple_media_class_init (PurpleMediaClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	parent_class = g_type_class_peek_parent(klass);
+	
+	gobject_class->dispose = purple_media_dispose;
+	gobject_class->finalize = purple_media_finalize;
+	gobject_class->set_property = purple_media_set_property;
+	gobject_class->get_property = purple_media_get_property;
+
+	g_object_class_install_property(gobject_class, PROP_MANAGER,
+			g_param_spec_object("manager",
+			"Purple Media Manager",
+			"The media manager that contains this media session.",
+			PURPLE_TYPE_MEDIA_MANAGER,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_ACCOUNT,
+			g_param_spec_pointer("account",
+			"PurpleAccount",
+			"The account this media session is on.",
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_CONFERENCE,
+			g_param_spec_object("conference",
+			"Farsight conference",
+			"The FsConference associated with this media.",
+			FS_TYPE_CONFERENCE,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+
+	g_object_class_install_property(gobject_class, PROP_INITIATOR,
+			g_param_spec_boolean("initiator",
+			"initiator",
+			"If the local user initiated the conference.",
+			FALSE,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_PRPL_DATA,
+			g_param_spec_pointer("prpl-data",
+			"gpointer",
+			"Data the prpl plugin set on the media session.",
+			G_PARAM_READWRITE));
+
+	purple_media_signals[S_ERROR] = g_signal_new("error", G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					 g_cclosure_marshal_VOID__STRING,
+					 G_TYPE_NONE, 1, G_TYPE_STRING);
+	purple_media_signals[CANDIDATES_PREPARED] = g_signal_new("candidates-prepared", G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					 purple_smarshal_VOID__STRING_STRING,
+					 G_TYPE_NONE, 2, G_TYPE_STRING,
+					 G_TYPE_STRING);
+	purple_media_signals[CODECS_CHANGED] = g_signal_new("codecs-changed", G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					 g_cclosure_marshal_VOID__STRING,
+					 G_TYPE_NONE, 1, G_TYPE_STRING);
+	purple_media_signals[LEVEL] = g_signal_new("level", G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					 purple_smarshal_VOID__STRING_STRING_DOUBLE,
+					 G_TYPE_NONE, 3, G_TYPE_STRING,
+					 G_TYPE_STRING, G_TYPE_DOUBLE);
+	purple_media_signals[NEW_CANDIDATE] = g_signal_new("new-candidate", G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					 purple_smarshal_VOID__POINTER_POINTER_OBJECT,
+					 G_TYPE_NONE, 3, G_TYPE_POINTER,
+					 G_TYPE_POINTER, PURPLE_TYPE_MEDIA_CANDIDATE);
+	purple_media_signals[STATE_CHANGED] = g_signal_new("state-changed", G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					 purple_smarshal_VOID__ENUM_STRING_STRING,
+					 G_TYPE_NONE, 3, PURPLE_MEDIA_TYPE_STATE,
+					 G_TYPE_STRING, G_TYPE_STRING);
+	purple_media_signals[STREAM_INFO] = g_signal_new("stream-info", G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					 purple_smarshal_VOID__ENUM_STRING_STRING_BOOLEAN,
+					 G_TYPE_NONE, 4, PURPLE_MEDIA_TYPE_INFO_TYPE,
+					 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
+	g_type_class_add_private(klass, sizeof(PurpleMediaPrivate));
+}
+
+
+static void
+purple_media_init (PurpleMedia *media)
+{
+	media->priv = PURPLE_MEDIA_GET_PRIVATE(media);
+	memset(media->priv, 0, sizeof(*media->priv));
+}
+
+static void
+purple_media_stream_free(PurpleMediaStream *stream)
+{
+	if (stream == NULL)
+		return;
+
+	/* Remove the connected_cb timeout */
+	if (stream->connected_cb_id != 0)
+		purple_timeout_remove(stream->connected_cb_id);
+
+	g_free(stream->participant);
+
+	if (stream->local_candidates)
+		fs_candidate_list_destroy(stream->local_candidates);
+	if (stream->remote_candidates)
+		fs_candidate_list_destroy(stream->remote_candidates);
+
+	if (stream->active_local_candidates)
+		fs_candidate_list_destroy(stream->active_local_candidates);
+	if (stream->active_remote_candidates)
+		fs_candidate_list_destroy(stream->active_remote_candidates);
+
+	g_free(stream);
+}
+
+static void
+purple_media_session_free(PurpleMediaSession *session)
+{
+	if (session == NULL)
+		return;
+
+	g_free(session->id);
+	g_free(session);
+}
+
+static void
+purple_media_dispose(GObject *media)
+{
+	PurpleMediaPrivate *priv = PURPLE_MEDIA_GET_PRIVATE(media);
+	GList *iter = NULL;
+
+	purple_debug_info("media","purple_media_dispose\n");
+
+	purple_media_manager_remove_media(priv->manager, PURPLE_MEDIA(media));
+
+	if (priv->confbin) {
+		gst_element_set_locked_state(priv->confbin, TRUE);
+		gst_element_set_state(GST_ELEMENT(priv->confbin),
+				GST_STATE_NULL);
+		gst_bin_remove(GST_BIN(purple_media_manager_get_pipeline(
+				priv->manager)), priv->confbin);
+		priv->confbin = NULL;
+		priv->conference = NULL;
+	}
+
+	for (iter = priv->streams; iter; iter = g_list_next(iter)) {
+		PurpleMediaStream *stream = iter->data;
+		if (stream->stream) {
+			g_object_unref(stream->stream);
+			stream->stream = NULL;
+		}
+	}
+
+	if (priv->sessions) {
+		GList *sessions = g_hash_table_get_values(priv->sessions);
+		for (; sessions; sessions = g_list_delete_link(sessions, sessions)) {
+			PurpleMediaSession *session = sessions->data;
+			if (session->session) {
+				g_object_unref(session->session);
+				session->session = NULL;
+			}
+		}
+	}
+
+	if (priv->participants) {
+		GList *participants = g_hash_table_get_values(priv->participants);
+		for (; participants; participants = g_list_delete_link(participants, participants))
+			g_object_unref(participants->data);
+	}
+
+	if (priv->manager) {
+		GstElement *pipeline = purple_media_manager_get_pipeline(
+				priv->manager);
+		GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline));
+		g_signal_handlers_disconnect_matched(G_OBJECT(bus),
+				G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA,
+				0, 0, 0, media_bus_call, media);
+		gst_object_unref(bus);
+
+		g_object_unref(priv->manager);
+		priv->manager = NULL;
+	}
+
+	G_OBJECT_CLASS(parent_class)->dispose(media);
+}
+
+static void
+purple_media_finalize(GObject *media)
+{
+	PurpleMediaPrivate *priv = PURPLE_MEDIA_GET_PRIVATE(media);
+	purple_debug_info("media","purple_media_finalize\n");
+
+	for (; priv->streams; priv->streams = g_list_delete_link(priv->streams, priv->streams))
+		purple_media_stream_free(priv->streams->data);
+
+	if (priv->sessions) {
+		GList *sessions = g_hash_table_get_values(priv->sessions);
+		for (; sessions; sessions = g_list_delete_link(sessions, sessions)) {
+			purple_media_session_free(sessions->data);
+		}
+		g_hash_table_destroy(priv->sessions);
+	}
+
+	G_OBJECT_CLASS(parent_class)->finalize(media);
+}
+
+static void
+purple_media_setup_pipeline(PurpleMedia *media)
+{
+	GstBus *bus;
+	gchar *name;
+	GstElement *pipeline;
+
+	if (media->priv->conference == NULL || media->priv->manager == NULL)
+		return;
+
+	pipeline = purple_media_manager_get_pipeline(media->priv->manager);
+
+	name = g_strdup_printf("conf_%p",
+			media->priv->conference);
+	media->priv->confbin = gst_bin_new(name);
+	g_free(name);
+
+	bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline));
+	g_signal_connect(G_OBJECT(bus), "message",
+			G_CALLBACK(media_bus_call), media);
+	gst_object_unref(bus);
+
+	gst_bin_add(GST_BIN(pipeline),
+			media->priv->confbin);
+	gst_bin_add(GST_BIN(media->priv->confbin),
+			GST_ELEMENT(media->priv->conference));
+	gst_element_set_state(GST_ELEMENT(media->priv->confbin),
+			GST_STATE_PLAYING);
+}
+
+static void
+purple_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	PurpleMedia *media;
+	g_return_if_fail(PURPLE_IS_MEDIA(object));
+
+	media = PURPLE_MEDIA(object);
+
+	switch (prop_id) {
+		case PROP_MANAGER:
+			media->priv->manager = g_value_get_object(value);
+			g_object_ref(media->priv->manager);
+
+			purple_media_setup_pipeline(media);
+			break;
+		case PROP_ACCOUNT:
+			media->priv->account = g_value_get_pointer(value);
+			break;
+		case PROP_CONFERENCE: {
+			if (media->priv->conference)
+				gst_object_unref(media->priv->conference);
+			media->priv->conference = g_value_get_object(value);
+			gst_object_ref(media->priv->conference);
+
+			purple_media_setup_pipeline(media);
+			break;
+		}
+		case PROP_INITIATOR:
+			media->priv->initiator = g_value_get_boolean(value);
+			break;
+		case PROP_PRPL_DATA:
+			media->priv->prpl_data = g_value_get_pointer(value);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+purple_media_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	PurpleMedia *media;
+	g_return_if_fail(PURPLE_IS_MEDIA(object));
+	
+	media = PURPLE_MEDIA(object);
+
+	switch (prop_id) {
+		case PROP_MANAGER:
+			g_value_set_object(value, media->priv->manager);
+			break;
+		case PROP_ACCOUNT:
+			g_value_set_pointer(value, media->priv->account);
+			break;
+		case PROP_CONFERENCE:
+			g_value_set_object(value, media->priv->conference);
+			break;
+		case PROP_INITIATOR:
+			g_value_set_boolean(value, media->priv->initiator);
+			break;
+		case PROP_PRPL_DATA:
+			g_value_set_pointer(value, media->priv->prpl_data);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);	
+			break;
+	}
+
+}
+#endif
+
+/*
+ * PurpleMediaCandidateType
+ */
+
+GType
+purple_media_candidate_type_get_type()
+{
+	static GType type = 0;
+	if (type == 0) {
+		static const GEnumValue values[] = {
+			{ PURPLE_MEDIA_CANDIDATE_TYPE_HOST,
+					"PURPLE_MEDIA_CANDIDATE_TYPE_HOST",
+					"host" },
+			{ PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
+					"PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX",
+					"srflx" },
+			{ PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX,
+					"PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX",
+					"prflx" },
+			{ PURPLE_MEDIA_CANDIDATE_TYPE_RELAY,
+					"PPURPLE_MEDIA_CANDIDATE_TYPE_RELAY",
+					"relay" },
+			{ PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST,
+					"PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST",
+					"multicast" },
+			{ 0, NULL, NULL }
+		};
+		type = g_enum_register_static("PurpleMediaCandidateType",
+				values);
+	}
+	return type;
+}
+
+/*
+ * PurpleMediaNetworkProtocol
+ */
+
+GType
+purple_media_network_protocol_get_type()
+{
+	static GType type = 0;
+	if (type == 0) {
+		static const GEnumValue values[] = {
+			{ PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
+					"PURPLE_MEDIA_NETWORK_PROTOCOL_UDP",
+					"udp" },
+			{ PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
+					"PURPLE_MEDIA_NETWORK_PROTOCOL_TCP",
+					"tcp" },
+			{ 0, NULL, NULL }
+		};
+		type = g_enum_register_static("PurpleMediaNetworkProtocol",
+				values);
+	}
+	return type;
+}
+
+/*
+ * PurpleMediaCandidate
+ */
+
+struct _PurpleMediaCandidateClass
+{
+	GObjectClass parent_class;
+};
+
+struct _PurpleMediaCandidate
+{
+	GObject parent;
+};
+
+#ifdef USE_VV
+struct _PurpleMediaCandidatePrivate
+{
+	gchar *foundation;
+	guint component_id;
+	gchar *ip;
+	guint16 port;
+	gchar *base_ip;
+	guint16 base_port;
+	PurpleMediaNetworkProtocol proto;
+	guint32 priority;
+	PurpleMediaCandidateType type;
+	gchar *username;
+	gchar *password;
+	guint ttl;
+};
+
+enum {
+	PROP_CANDIDATE_0,
+	PROP_FOUNDATION,
+	PROP_COMPONENT_ID,
+	PROP_IP,
+	PROP_PORT,
+	PROP_BASE_IP,
+	PROP_BASE_PORT,
+	PROP_PROTOCOL,
+	PROP_PRIORITY,
+	PROP_TYPE,
+	PROP_USERNAME,
+	PROP_PASSWORD,
+	PROP_TTL,
+};
+
+static void
+purple_media_candidate_init(PurpleMediaCandidate *info)
+{
+	PurpleMediaCandidatePrivate *priv =
+			PURPLE_MEDIA_CANDIDATE_GET_PRIVATE(info);
+	priv->foundation = NULL;
+	priv->component_id = 0;
+	priv->ip = NULL;
+	priv->port = 0;
+	priv->base_ip = NULL;
+	priv->proto = PURPLE_MEDIA_NETWORK_PROTOCOL_UDP;
+	priv->priority = 0;
+	priv->type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
+	priv->username = NULL;
+	priv->password = NULL;
+	priv->ttl = 0;
+}
+
+static void
+purple_media_candidate_finalize(GObject *info)
+{
+	PurpleMediaCandidatePrivate *priv =
+			PURPLE_MEDIA_CANDIDATE_GET_PRIVATE(info);
+
+	g_free(priv->foundation);
+	g_free(priv->ip);
+	g_free(priv->base_ip);
+	g_free(priv->username);
+	g_free(priv->password);
+}
+
+static void
+purple_media_candidate_set_property (GObject *object, guint prop_id,
+		const GValue *value, GParamSpec *pspec)
+{
+	PurpleMediaCandidatePrivate *priv;
+	g_return_if_fail(PURPLE_IS_MEDIA_CANDIDATE(object));
+
+	priv = PURPLE_MEDIA_CANDIDATE_GET_PRIVATE(object);
+
+	switch (prop_id) {
+		case PROP_FOUNDATION:
+			g_free(priv->foundation);
+			priv->foundation = g_value_dup_string(value);
+			break;
+		case PROP_COMPONENT_ID:
+			priv->component_id = g_value_get_uint(value);
+			break;
+		case PROP_IP:
+			g_free(priv->ip);
+			priv->ip = g_value_dup_string(value);
+			break;
+		case PROP_PORT:
+			priv->port = g_value_get_uint(value);
+			break;
+		case PROP_BASE_IP:
+			g_free(priv->base_ip);
+			priv->base_ip = g_value_dup_string(value);
+			break;
+		case PROP_BASE_PORT:
+			priv->base_port = g_value_get_uint(value);
+			break;
+		case PROP_PROTOCOL:
+			priv->proto = g_value_get_enum(value);
+			break;
+		case PROP_PRIORITY:
+			priv->priority = g_value_get_uint(value);
+			break;
+		case PROP_TYPE:
+			priv->type = g_value_get_enum(value);
+			break;
+		case PROP_USERNAME:
+			g_free(priv->username);
+			priv->username = g_value_dup_string(value);
+			break;
+		case PROP_PASSWORD:
+			g_free(priv->password);
+			priv->password = g_value_dup_string(value);
+			break;
+		case PROP_TTL:
+			priv->ttl = g_value_get_uint(value);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID(
+					object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+purple_media_candidate_get_property (GObject *object, guint prop_id,
+		GValue *value, GParamSpec *pspec)
+{
+	PurpleMediaCandidatePrivate *priv;
+	g_return_if_fail(PURPLE_IS_MEDIA_CANDIDATE(object));
+	
+	priv = PURPLE_MEDIA_CANDIDATE_GET_PRIVATE(object);
+
+	switch (prop_id) {
+		case PROP_FOUNDATION:
+			g_value_set_string(value, priv->foundation);
+			break;
+		case PROP_COMPONENT_ID:
+			g_value_set_uint(value, priv->component_id);
+			break;
+		case PROP_IP:
+			g_value_set_string(value, priv->ip);
+			break;
+		case PROP_PORT:
+			g_value_set_uint(value, priv->port);
+			break;
+		case PROP_BASE_IP:
+			g_value_set_string(value, priv->base_ip);
+			break;
+		case PROP_BASE_PORT:
+			g_value_set_uint(value, priv->base_port);
+			break;
+		case PROP_PROTOCOL:
+			g_value_set_enum(value, priv->proto);
+			break;
+		case PROP_PRIORITY:
+			g_value_set_uint(value, priv->priority);
+			break;
+		case PROP_TYPE:
+			g_value_set_enum(value, priv->type);
+			break;
+		case PROP_USERNAME:
+			g_value_set_string(value, priv->username);
+			break;
+		case PROP_PASSWORD:
+			g_value_set_string(value, priv->password);
+			break;
+		case PROP_TTL:
+			g_value_set_uint(value, priv->ttl);
+			break;
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID(
+					object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+purple_media_candidate_class_init(PurpleMediaCandidateClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	
+	gobject_class->finalize = purple_media_candidate_finalize;
+	gobject_class->set_property = purple_media_candidate_set_property;
+	gobject_class->get_property = purple_media_candidate_get_property;
+
+	g_object_class_install_property(gobject_class, PROP_FOUNDATION,
+			g_param_spec_string("foundation",
+			"Foundation",
+			"The foundation of the candidate.",
+			NULL,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_COMPONENT_ID,
+			g_param_spec_uint("component-id",
+			"Component ID",
+			"The component id of the candidate.",
+			0, G_MAXUINT, 0,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_IP,
+			g_param_spec_string("ip",
+			"IP Address",
+			"The IP address of the candidate.",
+			NULL,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_PORT,
+			g_param_spec_uint("port",
+			"Port",
+			"The port of the candidate.",
+			0, G_MAXUINT16, 0,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_BASE_IP,
+			g_param_spec_string("base-ip",
+			"Base IP",
+			"The internal IP address of the candidate.",
+			NULL,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_BASE_PORT,
+			g_param_spec_uint("base-port",
+			"Base Port",
+			"The internal port of the candidate.",
+			0, G_MAXUINT16, 0,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_PROTOCOL,
+			g_param_spec_enum("protocol",
+			"Protocol",
+			"The protocol of the candidate.",
+			PURPLE_TYPE_MEDIA_NETWORK_PROTOCOL,
+			PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_PRIORITY,
+			g_param_spec_uint("priority",
+			"Priority",
+			"The priority of the candidate.",
+			0, G_MAXUINT32, 0,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_TYPE,
+			g_param_spec_enum("type",
+			"Type",
+			"The type of the candidate.",
+			PURPLE_TYPE_MEDIA_CANDIDATE_TYPE,
+			PURPLE_MEDIA_CANDIDATE_TYPE_HOST,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_USERNAME,
+			g_param_spec_string("username",
+			"Username",
+			"The username used to connect to the candidate.",
+			NULL,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_PASSWORD,
+			g_param_spec_string("password",
+			"Password",
+			"The password use to connect to the candidate.",
+			NULL,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_TTL,
+			g_param_spec_uint("ttl",
+			"TTL",
+			"The TTL of the candidate.",
+			0, G_MAXUINT, 0,
+			G_PARAM_READWRITE));
+
+	g_type_class_add_private(klass, sizeof(PurpleMediaCandidatePrivate));
+}
+
+G_DEFINE_TYPE(PurpleMediaCandidate,
+		purple_media_candidate, G_TYPE_OBJECT);
+#else
+GType
+purple_media_candidate_get_type()
+{
+	return G_TYPE_NONE;
+}
+#endif
+
+PurpleMediaCandidate *
+purple_media_candidate_new(const gchar *foundation, guint component_id,
+		PurpleMediaCandidateType type,
+		PurpleMediaNetworkProtocol proto,
+		const gchar *ip, guint port)
+{
+	return g_object_new(PURPLE_TYPE_MEDIA_CANDIDATE,
+			"foundation", foundation,
+			"component-id", component_id,
+			"type", type,
+			"protocol", proto,
+			"ip", ip,
+			"port", port, NULL);
+}
+
+static PurpleMediaCandidate *
+purple_media_candidate_copy(PurpleMediaCandidate *candidate)
+{
+#ifdef USE_VV
+	PurpleMediaCandidatePrivate *priv;
+	PurpleMediaCandidate *new_candidate;
+
+	if (candidate == NULL)
+		return NULL;
+
+	priv = PURPLE_MEDIA_CANDIDATE_GET_PRIVATE(candidate);
+
+	new_candidate = purple_media_candidate_new(priv->foundation,
+			priv->component_id, priv->type, priv->proto,
+			priv->ip, priv->port);
+	g_object_set(new_candidate,
+			"base-ip", priv->base_ip,
+			"base-port", priv->base_port,
+			"priority", priv->priority,
+			"username", priv->username,
+			"password", priv->password,
+			"ttl", priv->ttl, NULL);
+	return new_candidate;
+#else
+	return NULL;
+#endif
+}
+
+#ifdef USE_VV
+static FsCandidate *
+purple_media_candidate_to_fs(PurpleMediaCandidate *candidate)
+{
+	PurpleMediaCandidatePrivate *priv;
+	FsCandidate *fscandidate;
+
+	if (candidate == NULL)
+		return NULL;
+
+	priv = PURPLE_MEDIA_CANDIDATE_GET_PRIVATE(candidate);
+
+	fscandidate = fs_candidate_new(priv->foundation,
+			priv->component_id, priv->type,
+			priv->proto, priv->ip, priv->port);
+
+	fscandidate->base_ip = g_strdup(priv->base_ip);
+	fscandidate->base_port = priv->base_port;
+	fscandidate->priority = priv->priority;
+	fscandidate->username = g_strdup(priv->username);
+	fscandidate->password = g_strdup(priv->password);
+	fscandidate->ttl = priv->ttl;
+	return fscandidate;
+}
+
+static PurpleMediaCandidate *
+purple_media_candidate_from_fs(FsCandidate *fscandidate)
+{
+	PurpleMediaCandidate *candidate;
+
+	if (fscandidate == NULL)
+		return NULL;
+
+	candidate = purple_media_candidate_new(fscandidate->foundation,
+		fscandidate->component_id, fscandidate->type,
+		fscandidate->proto, fscandidate->ip, fscandidate->port);
+	g_object_set(candidate,
+			"base-ip", fscandidate->base_ip,
+			"base-port", fscandidate->base_port,
+			"priority", fscandidate->priority,
+			"username", fscandidate->username,
+			"password", fscandidate->password,
+			"ttl", fscandidate->ttl, NULL);
+	return candidate;
+}
+
+static GList *
+purple_media_candidate_list_from_fs(GList *candidates)
+{
+	GList *new_list = NULL;
+
+	for (; candidates; candidates = g_list_next(candidates)) {
+		new_list = g_list_prepend(new_list,
+				purple_media_candidate_from_fs(
+				candidates->data));
+	}
+
+	new_list = g_list_reverse(new_list);
+	return new_list;
+}
+
+static GList *
+purple_media_candidate_list_to_fs(GList *candidates)
+{
+	GList *new_list = NULL;
+
+	for (; candidates; candidates = g_list_next(candidates)) {
+		new_list = g_list_prepend(new_list,
+				purple_media_candidate_to_fs(
+				candidates->data));
+	}
+
+	new_list = g_list_reverse(new_list);
+	return new_list;
+}
+#endif
+
+GList *
+purple_media_candidate_list_copy(GList *candidates)
+{
+	GList *new_list = NULL;
+
+	for (; candidates; candidates = g_list_next(candidates)) {
+		new_list = g_list_prepend(new_list,
+				purple_media_candidate_copy(candidates->data));
+	}
+
+	new_list = g_list_reverse(new_list);
+	return new_list;
+}
+
+void
+purple_media_candidate_list_free(GList *candidates)
+{
+	for (; candidates; candidates =
+			g_list_delete_link(candidates, candidates)) {
+		g_object_unref(candidates->data);
+	}
+}
+
+gchar *
+purple_media_candidate_get_foundation(PurpleMediaCandidate *candidate)
+{
+	gchar *foundation;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate), NULL);
+	g_object_get(candidate, "foundation", &foundation, NULL);
+	return foundation;
+}
+
+guint
+purple_media_candidate_get_component_id(PurpleMediaCandidate *candidate)
+{
+	guint component_id;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate), 0);
+	g_object_get(candidate, "component-id", &component_id, NULL);
+	return component_id;
+}
+
+gchar *
+purple_media_candidate_get_ip(PurpleMediaCandidate *candidate)
+{
+	gchar *ip;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate), NULL);
+	g_object_get(candidate, "ip", &ip, NULL);
+	return ip;
+}
+
+guint16
+purple_media_candidate_get_port(PurpleMediaCandidate *candidate)
+{
+	guint port;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate), 0);
+	g_object_get(candidate, "port", &port, NULL);
+	return port;
+}
+
+gchar *
+purple_media_candidate_get_base_ip(PurpleMediaCandidate *candidate)
+{
+	gchar *base_ip;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate), NULL);
+	g_object_get(candidate, "base-ip", &base_ip, NULL);
+	return base_ip;
+}
+
+guint16
+purple_media_candidate_get_base_port(PurpleMediaCandidate *candidate)
+{
+	guint base_port;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate), 0);
+	g_object_get(candidate, "base_port", &base_port, NULL);
+	return base_port;
+}
+
+PurpleMediaNetworkProtocol
+purple_media_candidate_get_protocol(PurpleMediaCandidate *candidate)
+{
+	PurpleMediaNetworkProtocol protocol;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate),
+			PURPLE_MEDIA_NETWORK_PROTOCOL_UDP);
+	g_object_get(candidate, "protocol", &protocol, NULL);
+	return protocol;
+}
+
+guint32
+purple_media_candidate_get_priority(PurpleMediaCandidate *candidate)
+{
+	guint priority;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate), 0);
+	g_object_get(candidate, "priority", &priority, NULL);
+	return priority;
+}
+
+PurpleMediaCandidateType
+purple_media_candidate_get_candidate_type(PurpleMediaCandidate *candidate)
+{
+	PurpleMediaCandidateType type;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate),
+			PURPLE_MEDIA_CANDIDATE_TYPE_HOST);
+	g_object_get(candidate, "type", &type, NULL);
+	return type;
+}
+
+gchar *
+purple_media_candidate_get_username(PurpleMediaCandidate *candidate)
+{
+	gchar *username;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate), NULL);
+	g_object_get(candidate, "username", &username, NULL);
+	return username;
+}
+
+gchar *
+purple_media_candidate_get_password(PurpleMediaCandidate *candidate)
+{
+	gchar *password;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate), NULL);
+	g_object_get(candidate, "password", &password, NULL);
+	return password;
+}
+
+guint
+purple_media_candidate_get_ttl(PurpleMediaCandidate *candidate)
+{
+	guint ttl;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CANDIDATE(candidate), 0);
+	g_object_get(candidate, "ttl", &ttl, NULL);
+	return ttl;
+}
+
+#ifdef USE_VV
+static FsMediaType
+purple_media_to_fs_media_type(PurpleMediaSessionType type)
+{
+	if (type & PURPLE_MEDIA_AUDIO)
+		return FS_MEDIA_TYPE_AUDIO;
+	else if (type & PURPLE_MEDIA_VIDEO)
+		return FS_MEDIA_TYPE_VIDEO;
+	else
+		return 0;
+}
+
+static FsStreamDirection
+purple_media_to_fs_stream_direction(PurpleMediaSessionType type)
+{
+	if ((type & PURPLE_MEDIA_AUDIO) == PURPLE_MEDIA_AUDIO ||
+			(type & PURPLE_MEDIA_VIDEO) == PURPLE_MEDIA_VIDEO)
+		return FS_DIRECTION_BOTH;
+	else if ((type & PURPLE_MEDIA_SEND_AUDIO) ||
+			(type & PURPLE_MEDIA_SEND_VIDEO))
+		return FS_DIRECTION_SEND;
+	else if ((type & PURPLE_MEDIA_RECV_AUDIO) ||
+			(type & PURPLE_MEDIA_RECV_VIDEO))
+		return FS_DIRECTION_RECV;
+	else
+		return FS_DIRECTION_NONE;
+}
+
+static PurpleMediaSessionType
+purple_media_from_fs(FsMediaType type, FsStreamDirection direction)
+{
+	PurpleMediaSessionType result = PURPLE_MEDIA_NONE;
+	if (type == FS_MEDIA_TYPE_AUDIO) {
+		if (direction & FS_DIRECTION_SEND)
+			result |= PURPLE_MEDIA_SEND_AUDIO;
+		if (direction & FS_DIRECTION_RECV)
+			result |= PURPLE_MEDIA_RECV_AUDIO;
+	} else if (type == FS_MEDIA_TYPE_VIDEO) {
+		if (direction & FS_DIRECTION_SEND)
+			result |= PURPLE_MEDIA_SEND_VIDEO;
+		if (direction & FS_DIRECTION_RECV)
+			result |= PURPLE_MEDIA_RECV_VIDEO;
+	}
+	return result;
+}
+#endif
+
+/*
+ * PurpleMediaCodec
+ */
+
+struct _PurpleMediaCodecClass
+{
+	GObjectClass parent_class;
+};
+
+struct _PurpleMediaCodec
+{
+	GObject parent;
+};
+
+#ifdef USE_VV
+struct _PurpleMediaCodecPrivate
+{
+	gint id;
+	char *encoding_name;
+	PurpleMediaSessionType media_type;
+	guint clock_rate;
+	guint channels;
+	GList *optional_params;
+};
+
+enum {
+	PROP_CODEC_0,
+	PROP_ID,
+	PROP_ENCODING_NAME,
+	PROP_MEDIA_TYPE,
+	PROP_CLOCK_RATE,
+	PROP_CHANNELS,
+	PROP_OPTIONAL_PARAMS,
+};
+
+static void
+purple_media_codec_init(PurpleMediaCodec *info)
+{
+	PurpleMediaCodecPrivate *priv =
+			PURPLE_MEDIA_CODEC_GET_PRIVATE(info);
+	priv->encoding_name = NULL;
+	priv->optional_params = NULL;
+}
+
+static void
+purple_media_codec_finalize(GObject *info)
+{
+	PurpleMediaCodecPrivate *priv =
+			PURPLE_MEDIA_CODEC_GET_PRIVATE(info);
+	g_free(priv->encoding_name);
+	for (; priv->optional_params; priv->optional_params =
+			g_list_delete_link(priv->optional_params,
+			priv->optional_params)) {
+		g_free(priv->optional_params->data);
+	}
+}
+
+static void
+purple_media_codec_set_property (GObject *object, guint prop_id,
+		const GValue *value, GParamSpec *pspec)
+{
+	PurpleMediaCodecPrivate *priv;
+	g_return_if_fail(PURPLE_IS_MEDIA_CODEC(object));
+
+	priv = PURPLE_MEDIA_CODEC_GET_PRIVATE(object);
+
+	switch (prop_id) {
+		case PROP_ID:
+			priv->id = g_value_get_uint(value);
+			break;
+		case PROP_ENCODING_NAME:
+			g_free(priv->encoding_name);
+			priv->encoding_name = g_value_dup_string(value);
+			break;
+		case PROP_MEDIA_TYPE:
+			priv->media_type = g_value_get_flags(value);
+			break;
+		case PROP_CLOCK_RATE:
+			priv->clock_rate = g_value_get_uint(value);
+			break;
+		case PROP_CHANNELS:
+			priv->channels = g_value_get_uint(value);
+			break;
+		case PROP_OPTIONAL_PARAMS:
+			priv->optional_params = g_value_get_pointer(value);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID(
+					object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+purple_media_codec_get_property (GObject *object, guint prop_id,
+		GValue *value, GParamSpec *pspec)
+{
+	PurpleMediaCodecPrivate *priv;
+	g_return_if_fail(PURPLE_IS_MEDIA_CODEC(object));
+	
+	priv = PURPLE_MEDIA_CODEC_GET_PRIVATE(object);
+
+	switch (prop_id) {
+		case PROP_ID:
+			g_value_set_uint(value, priv->id);
+			break;
+		case PROP_ENCODING_NAME:
+			g_value_set_string(value, priv->encoding_name);
+			break;
+		case PROP_MEDIA_TYPE:
+			g_value_set_flags(value, priv->media_type);
+			break;
+		case PROP_CLOCK_RATE:
+			g_value_set_uint(value, priv->clock_rate);
+			break;
+		case PROP_CHANNELS:
+			g_value_set_uint(value, priv->channels);
+			break;
+		case PROP_OPTIONAL_PARAMS:
+			g_value_set_pointer(value, priv->optional_params);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID(
+					object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+purple_media_codec_class_init(PurpleMediaCodecClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	
+	gobject_class->finalize = purple_media_codec_finalize;
+	gobject_class->set_property = purple_media_codec_set_property;
+	gobject_class->get_property = purple_media_codec_get_property;
+
+	g_object_class_install_property(gobject_class, PROP_ID,
+			g_param_spec_uint("id",
+			"ID",
+			"The numeric identifier of the codec.",
+			0, G_MAXUINT, 0,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_ENCODING_NAME,
+			g_param_spec_string("encoding-name",
+			"Encoding Name",
+			"The name of the codec.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_MEDIA_TYPE,
+			g_param_spec_flags("media-type",
+			"Media Type",
+			"Whether this is an audio of video codec.",
+			PURPLE_TYPE_MEDIA_SESSION_TYPE,
+			PURPLE_MEDIA_NONE,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_CLOCK_RATE,
+			g_param_spec_uint("clock-rate",
+			"Create Callback",
+			"The function called to create this element.",
+			0, G_MAXUINT, 0,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_CHANNELS,
+			g_param_spec_uint("channels",
+			"Channels",
+			"The number of channels in this codec.",
+			0, G_MAXUINT, 0,
+			G_PARAM_READWRITE));
+	g_object_class_install_property(gobject_class, PROP_OPTIONAL_PARAMS,
+			g_param_spec_pointer("optional-params",
+			"Optional Params",
+			"A list of optional parameters for the codec.",
+			G_PARAM_READWRITE));
+
+	g_type_class_add_private(klass, sizeof(PurpleMediaCodecPrivate));
+}
+
+G_DEFINE_TYPE(PurpleMediaCodec,
+		purple_media_codec, G_TYPE_OBJECT);
+#else
+GType
+purple_media_codec_get_type()
+{
+	return G_TYPE_NONE;
+}
+#endif
+
+guint
+purple_media_codec_get_id(PurpleMediaCodec *codec)
+{
+	guint id;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CODEC(codec), 0);
+	g_object_get(codec, "id", &id, NULL);
+	return id;
+}
+
+gchar *
+purple_media_codec_get_encoding_name(PurpleMediaCodec *codec)
+{
+	gchar *name;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CODEC(codec), NULL);
+	g_object_get(codec, "encoding-name", &name, NULL);
+	return name;
+}
+
+guint
+purple_media_codec_get_clock_rate(PurpleMediaCodec *codec)
+{
+	guint clock_rate;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CODEC(codec), 0);
+	g_object_get(codec, "clock-rate", &clock_rate, NULL);
+	return clock_rate;
+}
+
+guint
+purple_media_codec_get_channels(PurpleMediaCodec *codec)
+{
+	guint channels;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CODEC(codec), 0);
+	g_object_get(codec, "channels", &channels, NULL);
+	return channels;
+}
+
+GList *
+purple_media_codec_get_optional_parameters(PurpleMediaCodec *codec)
+{
+	GList *optional_params;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_CODEC(codec), NULL);
+	g_object_get(codec, "optional-params", &optional_params, NULL);
+	return optional_params;
+}
+
+void
+purple_media_codec_add_optional_parameter(PurpleMediaCodec *codec,
+		const gchar *name, const gchar *value)
+{
+#ifdef USE_VV
+	PurpleMediaCodecPrivate *priv;
+	PurpleKeyValuePair *new_param;
+
+	g_return_if_fail(codec != NULL);
+	g_return_if_fail(name != NULL && value != NULL);
+
+	priv = PURPLE_MEDIA_CODEC_GET_PRIVATE(codec);
+
+	new_param = g_new0(PurpleKeyValuePair, 1);
+	new_param->key = g_strdup(name);
+	new_param->value = g_strdup(value);
+	priv->optional_params = g_list_append(
+			priv->optional_params, new_param);
+#endif
+}
+
+void
+purple_media_codec_remove_optional_parameter(PurpleMediaCodec *codec,
+		PurpleKeyValuePair *param)
+{
+#ifdef USE_VV
+	PurpleMediaCodecPrivate *priv;
+
+	g_return_if_fail(codec != NULL && param != NULL);
+
+	priv = PURPLE_MEDIA_CODEC_GET_PRIVATE(codec);
+
+	g_free(param->key);
+	g_free(param->value);
+	g_free(param);
+
+	priv->optional_params =
+			g_list_remove(priv->optional_params, param);
+#endif
+}
+
+PurpleKeyValuePair *
+purple_media_codec_get_optional_parameter(PurpleMediaCodec *codec,
+		const gchar *name, const gchar *value)
+{
+#ifdef USE_VV
+	PurpleMediaCodecPrivate *priv;
+	GList *iter;
+
+	g_return_val_if_fail(codec != NULL, NULL);
+	g_return_val_if_fail(name != NULL, NULL);
+
+	priv = PURPLE_MEDIA_CODEC_GET_PRIVATE(codec);
+
+	for (iter = priv->optional_params; iter; iter = g_list_next(iter)) {
+		PurpleKeyValuePair *param = iter->data;
+		if (!g_ascii_strcasecmp(param->key, name) &&
+				(value == NULL ||
+				!g_ascii_strcasecmp(param->value, value)))
+			return param;
+	}
+#endif
+
+	return NULL;
+}
+
+PurpleMediaCodec *
+purple_media_codec_new(int id, const char *encoding_name,
+		PurpleMediaSessionType media_type, guint clock_rate)
+{
+	PurpleMediaCodec *codec =
+			g_object_new(PURPLE_TYPE_MEDIA_CODEC,
+			"id", id,
+			"encoding_name", encoding_name,
+			"media_type", media_type,
+			"clock-rate", clock_rate, NULL);
+	return codec;
+}
+
+static PurpleMediaCodec *
+purple_media_codec_copy(PurpleMediaCodec *codec)
+{
+#ifdef USE_VV
+	PurpleMediaCodecPrivate *priv;
+	PurpleMediaCodec *new_codec;
+	GList *iter;
+
+	if (codec == NULL)
+		return NULL;
+
+	priv = PURPLE_MEDIA_CODEC_GET_PRIVATE(codec);
+
+	new_codec = purple_media_codec_new(priv->id, priv->encoding_name,
+			priv->media_type, priv->clock_rate);
+	g_object_set(codec, "channels", priv->channels, NULL);
+
+	for (iter = priv->optional_params; iter; iter = g_list_next(iter)) {
+		PurpleKeyValuePair *param =
+				(PurpleKeyValuePair*)iter->data;
+		purple_media_codec_add_optional_parameter(new_codec,
+				param->key, param->value);
+	}
+
+	return new_codec;
+#else
+	return NULL;
+#endif
+}
+
+#ifdef USE_VV
+static FsCodec *
+purple_media_codec_to_fs(const PurpleMediaCodec *codec)
+{
+	PurpleMediaCodecPrivate *priv;
+	FsCodec *new_codec;
+	GList *iter;
+
+	if (codec == NULL)
+		return NULL;
+
+	priv = PURPLE_MEDIA_CODEC_GET_PRIVATE(codec);
+
+	new_codec = fs_codec_new(priv->id, priv->encoding_name,
+			purple_media_to_fs_media_type(priv->media_type),
+			priv->clock_rate);
+	new_codec->channels = priv->channels;
+
+	for (iter = priv->optional_params; iter; iter = g_list_next(iter)) {
+		PurpleKeyValuePair *param = (PurpleKeyValuePair*)iter->data;
+		fs_codec_add_optional_parameter(new_codec,
+				param->key, param->value);
+	}
+
+	return new_codec;
+}
+
+static PurpleMediaCodec *
+purple_media_codec_from_fs(const FsCodec *codec)
+{
+	PurpleMediaCodec *new_codec;
+	GList *iter;
+
+	if (codec == NULL)
+		return NULL;
+
+	new_codec = purple_media_codec_new(codec->id, codec->encoding_name,
+			purple_media_from_fs(codec->media_type,
+			FS_DIRECTION_BOTH), codec->clock_rate);
+	g_object_set(new_codec, "channels", codec->channels, NULL);
+
+	for (iter = codec->optional_params; iter; iter = g_list_next(iter)) {
+		FsCodecParameter *param = (FsCodecParameter*)iter->data;
+		purple_media_codec_add_optional_parameter(new_codec,
+				param->name, param->value);
+	}
+
+	return new_codec;
+}
+#endif
+
+gchar *
+purple_media_codec_to_string(const PurpleMediaCodec *codec)
+{
+#ifdef USE_VV
+	FsCodec *fscodec = purple_media_codec_to_fs(codec);
+	gchar *str = fs_codec_to_string(fscodec);
+	fs_codec_destroy(fscodec);
+	return str;
+#else
+	return g_strdup("");
+#endif
+}
+
+#ifdef USE_VV
+static GList *
+purple_media_codec_list_from_fs(GList *codecs)
+{
+	GList *new_list = NULL;
+
+	for (; codecs; codecs = g_list_next(codecs)) {
+		new_list = g_list_prepend(new_list,
+				purple_media_codec_from_fs(
+				codecs->data));
+	}
+
+	new_list = g_list_reverse(new_list);
+	return new_list;
+}
+
+static GList *
+purple_media_codec_list_to_fs(GList *codecs)
+{
+	GList *new_list = NULL;
+
+	for (; codecs; codecs = g_list_next(codecs)) {
+		new_list = g_list_prepend(new_list,
+				purple_media_codec_to_fs(
+				codecs->data));
+	}
+
+	new_list = g_list_reverse(new_list);
+	return new_list;
+}
+#endif
+
+GList *
+purple_media_codec_list_copy(GList *codecs)
+{
+	GList *new_list = NULL;
+
+	for (; codecs; codecs = g_list_next(codecs)) {
+		new_list = g_list_prepend(new_list,
+				purple_media_codec_copy(codecs->data));
+	}
+
+	new_list = g_list_reverse(new_list);
+	return new_list;
+}
+
+void
+purple_media_codec_list_free(GList *codecs)
+{
+	for (; codecs; codecs =
+			g_list_delete_link(codecs, codecs)) {
+		g_object_unref(codecs->data);
+	}
+}
+
+#ifdef USE_VV
+static PurpleMediaSession*
+purple_media_get_session(PurpleMedia *media, const gchar *sess_id)
+{
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+	return (PurpleMediaSession*) (media->priv->sessions) ?
+			g_hash_table_lookup(media->priv->sessions, sess_id) : NULL;
+}
+
+static FsParticipant*
+purple_media_get_participant(PurpleMedia *media, const gchar *name)
+{
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+	return (FsParticipant*) (media->priv->participants) ?
+			g_hash_table_lookup(media->priv->participants, name) : NULL;
+}
+
+static PurpleMediaStream*
+purple_media_get_stream(PurpleMedia *media, const gchar *session, const gchar *participant)
+{
+	GList *streams;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+
+	streams = media->priv->streams;
+
+	for (; streams; streams = g_list_next(streams)) {
+		PurpleMediaStream *stream = streams->data;
+		if (!strcmp(stream->session->id, session) &&
+				!strcmp(stream->participant, participant))
+			return stream;
+	}
+
+	return NULL;
+}
+
+static GList *
+purple_media_get_streams(PurpleMedia *media, const gchar *session,
+		const gchar *participant)
+{
+	GList *streams;
+	GList *ret = NULL;
+	
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+
+	streams = media->priv->streams;
+
+	for (; streams; streams = g_list_next(streams)) {
+		PurpleMediaStream *stream = streams->data;
+		if ((session == NULL ||
+				!strcmp(stream->session->id, session)) &&
+				(participant == NULL ||
+				!strcmp(stream->participant, participant)))
+			ret = g_list_append(ret, stream);
+	}
+
+	return ret;
+}
+
+static void
+purple_media_add_session(PurpleMedia *media, PurpleMediaSession *session)
+{
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
+	g_return_if_fail(session != NULL);
+
+	if (!media->priv->sessions) {
+		purple_debug_info("media", "Creating hash table for sessions\n");
+		media->priv->sessions = g_hash_table_new(g_str_hash, g_str_equal);
+	}
+	g_hash_table_insert(media->priv->sessions, g_strdup(session->id), session);
+}
+
+static gboolean
+purple_media_remove_session(PurpleMedia *media, PurpleMediaSession *session)
+{
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+	return g_hash_table_remove(media->priv->sessions, session->id);
+}
+
+static FsParticipant *
+purple_media_add_participant(PurpleMedia *media, const gchar *name)
+{
+	FsParticipant *participant;
+	GError *err = NULL;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+
+	participant = purple_media_get_participant(media, name);
+
+	if (participant)
+		return participant;
+
+	participant = fs_conference_new_participant(media->priv->conference,
+						    (gchar*)name, &err);
+
+	if (err) {
+		purple_debug_error("media", "Error creating participant: %s\n",
+				   err->message);
+		g_error_free(err);
+		return NULL;
+	}
+
+	if (!media->priv->participants) {
+		purple_debug_info("media", "Creating hash table for participants\n");
+		media->priv->participants = g_hash_table_new_full(g_str_hash,
+				g_str_equal, g_free, NULL);
+	}
+
+	g_hash_table_insert(media->priv->participants, g_strdup(name), participant);
+
+	return participant;
+}
+
+static PurpleMediaStream *
+purple_media_insert_stream(PurpleMediaSession *session, const gchar *name, FsStream *stream)
+{
+	PurpleMediaStream *media_stream;
+	
+	g_return_val_if_fail(session != NULL, NULL);
+
+	media_stream = g_new0(PurpleMediaStream, 1);
+	media_stream->stream = stream;
+	media_stream->participant = g_strdup(name);
+	media_stream->session = session;
+
+	session->media->priv->streams =
+			g_list_append(session->media->priv->streams, media_stream);
+
+	return media_stream;
+}
+
+static void
+purple_media_insert_local_candidate(PurpleMediaSession *session, const gchar *name,
+				     FsCandidate *candidate)
+{
+	PurpleMediaStream *stream;
+
+	g_return_if_fail(session != NULL);
+
+	stream = purple_media_get_stream(session->media, session->id, name);
+	stream->local_candidates = g_list_append(stream->local_candidates, candidate);
+}
+#endif
+
+GList *
+purple_media_get_session_ids(PurpleMedia *media)
+{
+#ifdef USE_VV
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+	return media->priv->sessions != NULL ?
+			g_hash_table_get_keys(media->priv->sessions) : NULL;
+#else
+	return NULL;
+#endif
+}
+
+#ifdef USE_VV
+static void 
+purple_media_set_src(PurpleMedia *media, const gchar *sess_id, GstElement *src)
+{
+	PurpleMediaSession *session;
+	GstPad *sinkpad;
+	GstPad *srcpad;
+
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
+	g_return_if_fail(GST_IS_ELEMENT(src));
+
+	session = purple_media_get_session(media, sess_id);
+
+	if (session == NULL) {
+		purple_debug_warning("media", "purple_media_set_src: trying"
+				" to set src on non-existent session\n");
+		return;
+	}
+
+	if (session->src)
+		gst_object_unref(session->src);
+	session->src = src;
+	gst_element_set_locked_state(session->src, TRUE);
+
+	session->tee = gst_element_factory_make("tee", NULL);
+	gst_bin_add(GST_BIN(session->media->priv->confbin), session->tee);
+
+	/* This supposedly isn't necessary, but it silences some warnings */
+	if (GST_ELEMENT_PARENT(session->media->priv->confbin)
+			== GST_ELEMENT_PARENT(session->src)) {
+		GstPad *pad = gst_element_get_static_pad(session->tee, "sink");
+		GstPad *ghost = gst_ghost_pad_new(NULL, pad);
+		gst_object_unref(pad);
+		gst_pad_set_active(ghost, TRUE);
+		gst_element_add_pad(session->media->priv->confbin, ghost);
+	}
+
+	gst_element_set_state(session->tee, GST_STATE_PLAYING);
+	gst_element_link(session->src, session->media->priv->confbin);
+
+	g_object_get(session->session, "sink-pad", &sinkpad, NULL);
+	if (session->type & PURPLE_MEDIA_SEND_AUDIO) {
+		gchar *name = g_strdup_printf("volume_%s", session->id);
+		GstElement *level;
+		GstElement *volume = gst_element_factory_make("volume", name);
+		double input_volume = purple_prefs_get_int(
+				"/purple/media/audio/volume/input")/10.0;
+		g_free(name);
+		name = g_strdup_printf("sendlevel_%s", session->id);
+		level = gst_element_factory_make("level", name);
+		g_free(name);
+		gst_bin_add(GST_BIN(session->media->priv->confbin), volume);
+		gst_bin_add(GST_BIN(session->media->priv->confbin), level);
+		gst_element_set_state(level, GST_STATE_PLAYING);
+		gst_element_set_state(volume, GST_STATE_PLAYING);
+		gst_element_link(volume, level);
+		gst_element_link(session->tee, volume);
+		srcpad = gst_element_get_static_pad(level, "src");
+		g_object_set(volume, "volume", input_volume, NULL);
+	} else {
+		srcpad = gst_element_get_request_pad(session->tee, "src%d");
+	}
+	purple_debug_info("media", "connecting pad: %s\n", 
+			  gst_pad_link(srcpad, sinkpad) == GST_PAD_LINK_OK
+			  ? "success" : "failure");
+	gst_element_set_locked_state(session->src, FALSE);
+	gst_object_unref(session->src);
+}
+#endif
+
+#ifdef USE_GSTREAMER
+GstElement *
+purple_media_get_src(PurpleMedia *media, const gchar *sess_id)
+{
+#ifdef USE_VV
+	PurpleMediaSession *session;
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+	session = purple_media_get_session(media, sess_id);
+	return (session != NULL) ? session->src : NULL;
+#else
+	return NULL;
+#endif
+}
+#endif /* USE_GSTREAMER */
+
+#ifdef USE_VV
+static PurpleMediaSession *
+purple_media_session_from_fs_stream(PurpleMedia *media, FsStream *stream)
+{
+	FsSession *fssession;
+	GList *values;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+	g_return_val_if_fail(FS_IS_STREAM(stream), NULL);
+
+	g_object_get(stream, "session", &fssession, NULL);
+
+	values = g_hash_table_get_values(media->priv->sessions);
+
+	for (; values; values = g_list_delete_link(values, values)) {
+		PurpleMediaSession *session = values->data;
+
+		if (session->session == fssession) {
+			g_list_free(values);
+			g_object_unref(fssession);
+			return session;
+		}
+	}
+
+	g_object_unref(fssession);
+	return NULL;
+}
+
+static gboolean
+media_bus_call(GstBus *bus, GstMessage *msg, PurpleMedia *media)
+{
+	switch(GST_MESSAGE_TYPE(msg)) {
+		case GST_MESSAGE_ELEMENT: {
+			if (g_signal_has_handler_pending(media,
+					purple_media_signals[LEVEL], 0, FALSE)
+					&& gst_structure_has_name(
+					gst_message_get_structure(msg), "level")) {
+				GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(msg));
+				gchar *name;
+				gchar *participant = NULL;
+				PurpleMediaSession *session = NULL;
+				gdouble rms_db;
+				gdouble percent;
+				const GValue *list;
+				const GValue *value;
+
+				if (!PURPLE_IS_MEDIA(media) ||
+						GST_ELEMENT_PARENT(src) !=
+						media->priv->confbin)
+					break;
+
+				name = gst_element_get_name(src);
+				if (!strncmp(name, "sendlevel_", 10)) {
+					session = purple_media_get_session(
+							media, name+10);
+				} else {
+					GList *iter = media->priv->streams;
+					for (; iter; iter = g_list_next(iter)) {
+						PurpleMediaStream *stream = iter->data;
+						if (stream->level == src) {
+							session = stream->session;
+							participant = stream->participant;
+							break;
+						}
+					}
+				}
+				g_free(name);
+				if (!session)
+					break;
+
+				list = gst_structure_get_value(
+						gst_message_get_structure(msg), "rms");
+				value = gst_value_list_get_value(list, 0);
+				rms_db = g_value_get_double(value);
+				percent = pow(10, rms_db / 20) * 5;
+				if(percent > 1.0)
+					percent = 1.0;
+
+				g_signal_emit(media, purple_media_signals[LEVEL],
+						0, session->id, participant, percent);
+				break;
+			}
+			if (!FS_IS_CONFERENCE(GST_MESSAGE_SRC(msg)) ||
+					!PURPLE_IS_MEDIA(media) ||
+					media->priv->conference !=
+					FS_CONFERENCE(GST_MESSAGE_SRC(msg)))
+				break;
+
+			if (gst_structure_has_name(msg->structure, "farsight-error")) {
+				FsError error_no;
+				gst_structure_get_enum(msg->structure, "error-no",
+						FS_TYPE_ERROR, (gint*)&error_no);
+				/*
+				 * Unknown CName is only a problem for the
+				 * multicast transmitter which isn't used.
+				 */
+				if (error_no != FS_ERROR_UNKNOWN_CNAME)
+					purple_debug_error("media", "farsight-error: %i: %s\n", error_no,
+						  	gst_structure_get_string(msg->structure, "error-msg"));
+			} else if (gst_structure_has_name(msg->structure,
+					"farsight-new-local-candidate")) {
+				FsStream *stream = g_value_get_object(gst_structure_get_value(msg->structure, "stream"));
+				FsCandidate *local_candidate = g_value_get_boxed(gst_structure_get_value(msg->structure, "candidate"));
+				PurpleMediaSession *session = purple_media_session_from_fs_stream(media, stream);
+				purple_media_new_local_candidate_cb(stream, local_candidate, session);
+			} else if (gst_structure_has_name(msg->structure,
+					"farsight-local-candidates-prepared")) {
+				FsStream *stream = g_value_get_object(gst_structure_get_value(msg->structure, "stream"));
+				PurpleMediaSession *session = purple_media_session_from_fs_stream(media, stream);
+				purple_media_candidates_prepared_cb(stream, session);
+			} else if (gst_structure_has_name(msg->structure,
+					"farsight-new-active-candidate-pair")) {
+				FsStream *stream = g_value_get_object(gst_structure_get_value(msg->structure, "stream"));
+				FsCandidate *local_candidate = g_value_get_boxed(gst_structure_get_value(msg->structure, "local-candidate"));
+				FsCandidate *remote_candidate = g_value_get_boxed(gst_structure_get_value(msg->structure, "remote-candidate"));
+				PurpleMediaSession *session = purple_media_session_from_fs_stream(media, stream);
+				purple_media_candidate_pair_established_cb(stream, local_candidate, remote_candidate, session);
+			} else if (gst_structure_has_name(msg->structure,
+					"farsight-recv-codecs-changed")) {
+				GList *codecs = g_value_get_boxed(gst_structure_get_value(msg->structure, "codecs"));
+				FsCodec *codec = codecs->data;
+				purple_debug_info("media", "farsight-recv-codecs-changed: %s\n", codec->encoding_name);
+				
+			} else if (gst_structure_has_name(msg->structure,
+					"farsight-component-state-changed")) {
+				FsStreamState fsstate = g_value_get_enum(gst_structure_get_value(msg->structure, "state"));
+				guint component = g_value_get_uint(gst_structure_get_value(msg->structure, "component"));
+				const gchar *state;
+				switch (fsstate) {
+					case FS_STREAM_STATE_FAILED:
+						state = "FAILED";
+						break;
+					case FS_STREAM_STATE_DISCONNECTED:
+						state = "DISCONNECTED";
+						break;
+					case FS_STREAM_STATE_GATHERING:
+						state = "GATHERING";
+						break;
+					case FS_STREAM_STATE_CONNECTING:
+						state = "CONNECTING";
+						break;
+					case FS_STREAM_STATE_CONNECTED:
+						state = "CONNECTED";
+						break;
+					case FS_STREAM_STATE_READY:
+						state = "READY";
+						break;
+					default:
+						state = "UNKNOWN";
+						break;
+				}
+				purple_debug_info("media", "farsight-component-state-changed: component: %u state: %s\n", component, state);
+			} else if (gst_structure_has_name(msg->structure,
+					"farsight-send-codec-changed")) {
+				FsCodec *codec = g_value_get_boxed(gst_structure_get_value(msg->structure, "codec"));
+				gchar *codec_str = fs_codec_to_string(codec);
+				purple_debug_info("media", "farsight-send-codec-changed: codec: %s\n", codec_str);
+				g_free(codec_str);
+			} else if (gst_structure_has_name(msg->structure,
+					"farsight-codecs-changed")) {
+				GList *sessions = g_hash_table_get_values(PURPLE_MEDIA(media)->priv->sessions);
+				FsSession *fssession = g_value_get_object(gst_structure_get_value(msg->structure, "session"));
+				for (; sessions; sessions = g_list_delete_link(sessions, sessions)) {
+					PurpleMediaSession *session = sessions->data;
+					if (session->session == fssession) {
+						gchar *session_id = g_strdup(session->id);
+						g_signal_emit(media, purple_media_signals[CODECS_CHANGED], 0, session_id);
+						g_free(session_id);
+						g_list_free(sessions);
+						break;
+					}
+				}
+			}
+			break;
+		}
+		default:
+			break;
+	}
+
+	return TRUE;
+}
+#endif
+
+PurpleAccount *
+purple_media_get_account(PurpleMedia *media)
+{
+#ifdef USE_VV
+	PurpleAccount *account;
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+	g_object_get(G_OBJECT(media), "account", &account, NULL);
+	return account;
+#else
+	return NULL;
+#endif
+}
+
+gpointer
+purple_media_get_prpl_data(PurpleMedia *media)
+{
+#ifdef USE_VV
+	gpointer prpl_data;
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+	g_object_get(G_OBJECT(media), "prpl-data", &prpl_data, NULL);
+	return prpl_data;
+#else
+	return NULL;
+#endif
+}
+
+void
+purple_media_set_prpl_data(PurpleMedia *media, gpointer prpl_data)
+{
+#ifdef USE_VV
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
+	g_object_set(G_OBJECT(media), "prpl-data", prpl_data, NULL);
+#endif
+}
+
+void
+purple_media_error(PurpleMedia *media, const gchar *error, ...)
+{
+#ifdef USE_VV
+	va_list args;
+	gchar *message;
+
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
+
+	va_start(args, error);
+	message = g_strdup_vprintf(error, args);
+	va_end(args);
+
+	purple_debug_error("media", "%s\n", message);
+	g_signal_emit(media, purple_media_signals[S_ERROR], 0, message);
+
+	g_free(message);
+#endif
+}
+
+void
+purple_media_end(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant)
+{
+#ifdef USE_VV
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
+	if (session_id == NULL && participant == NULL) {
+		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
+				0, PURPLE_MEDIA_STATE_END,
+				NULL, NULL);
+		g_object_unref(media);
+	}
+#endif
+}
+
+void
+purple_media_stream_info(PurpleMedia *media, PurpleMediaInfoType type,
+		const gchar *session_id, const gchar *participant,
+		gboolean local)
+{
+#ifdef USE_VV
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
+
+	if (type == PURPLE_MEDIA_INFO_ACCEPT) {
+		GList *streams;
+
+		g_return_if_fail(PURPLE_IS_MEDIA(media));
+
+		streams = purple_media_get_streams(media,
+				session_id, participant);
+
+		for (; streams; streams =
+				g_list_delete_link(streams, streams)) {
+			PurpleMediaStream *stream = streams->data;
+			g_object_set(G_OBJECT(stream->stream), "direction",
+					purple_media_to_fs_stream_direction(
+					stream->session->type), NULL);
+			stream->accepted = TRUE;
+		}
+	} else if (local == TRUE && (type == PURPLE_MEDIA_INFO_MUTE ||
+			type == PURPLE_MEDIA_INFO_UNMUTE)) {
+		GList *sessions;
+		gboolean active = (type == PURPLE_MEDIA_INFO_MUTE);
+
+		g_return_if_fail(PURPLE_IS_MEDIA(media));
+
+		if (session_id == NULL)
+			sessions = g_hash_table_get_values(
+					media->priv->sessions);
+		else
+			sessions = g_list_prepend(NULL,
+					purple_media_get_session(
+					media, session_id));
+
+		purple_debug_info("media", "Turning mute %s\n",
+				active ? "on" : "off");
+
+		for (; sessions; sessions = g_list_delete_link(
+				sessions, sessions)) {
+			PurpleMediaSession *session = sessions->data;
+			if (session->type & PURPLE_MEDIA_SEND_AUDIO) {
+				gchar *name = g_strdup_printf("volume_%s",
+						session->id);
+				GstElement *volume = gst_bin_get_by_name(
+						GST_BIN(session->media->
+						priv->confbin), name);
+				g_free(name);
+				g_object_set(volume, "mute", active, NULL);
+			}
+		}
+	} else if (local == TRUE && (type == PURPLE_MEDIA_INFO_PAUSE ||
+			type == PURPLE_MEDIA_INFO_UNPAUSE)) {
+		gboolean active = (type == PURPLE_MEDIA_INFO_PAUSE);
+		GList *streams = purple_media_get_streams(media,
+				session_id, participant);
+		for (; streams; streams = g_list_delete_link(streams, streams)) {
+			PurpleMediaStream *stream = streams->data;
+			if (stream->session->type & PURPLE_MEDIA_SEND_VIDEO) {
+				g_object_set(stream->stream, "direction",
+						purple_media_to_fs_stream_direction(
+						stream->session->type & ((active) ?
+						~PURPLE_MEDIA_SEND_VIDEO :
+						PURPLE_MEDIA_VIDEO)), NULL);
+			}
+		}
+	}
+
+	g_signal_emit(media, purple_media_signals[STREAM_INFO],
+			0, type, session_id, participant, local);
+
+	if (type == PURPLE_MEDIA_INFO_HANGUP ||
+			type == PURPLE_MEDIA_INFO_REJECT) {
+		purple_media_end(media, session_id, participant);
+	}
+#endif
+}
+
+#ifdef USE_VV
+static void
+purple_media_new_local_candidate_cb(FsStream *stream,
+				    FsCandidate *local_candidate,
+				    PurpleMediaSession *session)
+{
+	gchar *name;
+	FsParticipant *participant;
+	PurpleMediaCandidate *candidate;
+
+	g_return_if_fail(FS_IS_STREAM(stream));
+	g_return_if_fail(session != NULL);
+
+	purple_debug_info("media", "got new local candidate: %s\n", local_candidate->foundation);
+	g_object_get(stream, "participant", &participant, NULL);
+	g_object_get(participant, "cname", &name, NULL);
+	g_object_unref(participant);
+
+	purple_media_insert_local_candidate(session, name, fs_candidate_copy(local_candidate));
+
+	candidate = purple_media_candidate_from_fs(local_candidate);
+	g_signal_emit(session->media, purple_media_signals[NEW_CANDIDATE],
+		      0, session->id, name, candidate);
+	g_object_unref(candidate);
+
+	g_free(name);
+}
+
+static void
+purple_media_candidates_prepared_cb(FsStream *stream, PurpleMediaSession *session)
+{
+	gchar *name;
+	FsParticipant *participant;
+	PurpleMediaStream *stream_data;
+
+	g_return_if_fail(FS_IS_STREAM(stream));
+	g_return_if_fail(session != NULL);
+
+	g_object_get(stream, "participant", &participant, NULL);
+	g_object_get(participant, "cname", &name, NULL);
+	g_object_unref(participant);
+
+	stream_data = purple_media_get_stream(session->media, session->id, name);
+	stream_data->candidates_prepared = TRUE;
+
+	g_signal_emit(session->media,
+			purple_media_signals[CANDIDATES_PREPARED],
+			0, session->id, name);
+
+	g_free(name);
+}
+
+/* callback called when a pair of transport candidates (local and remote)
+ * has been established */
+static void
+purple_media_candidate_pair_established_cb(FsStream *fsstream,
+					   FsCandidate *native_candidate,
+					   FsCandidate *remote_candidate,
+					   PurpleMediaSession *session)
+{
+	gchar *name;
+	FsParticipant *participant;
+	PurpleMediaStream *stream;
+	GList *iter;
+
+	g_return_if_fail(FS_IS_STREAM(fsstream));
+	g_return_if_fail(session != NULL);
+
+	g_object_get(fsstream, "participant", &participant, NULL);
+	g_object_get(participant, "cname", &name, NULL);
+	g_object_unref(participant);
+
+	stream = purple_media_get_stream(session->media, session->id, name);
+
+	iter = stream->active_local_candidates;
+	for(; iter; iter = g_list_next(iter)) {
+		FsCandidate *c = iter->data;
+		if (native_candidate->component_id == c->component_id) {
+			fs_candidate_destroy(c);
+			stream->active_local_candidates =
+					g_list_delete_link(iter, iter);
+			stream->active_local_candidates = g_list_prepend(
+					stream->active_local_candidates,
+					fs_candidate_copy(native_candidate));
+			break;
+		}
+	}
+	if (iter == NULL)
+		stream->active_local_candidates = g_list_prepend(
+				stream->active_local_candidates,
+				fs_candidate_copy(native_candidate));
+
+	iter = stream->active_remote_candidates;
+	for(; iter; iter = g_list_next(iter)) {
+		FsCandidate *c = iter->data;
+		if (native_candidate->component_id == c->component_id) {
+			fs_candidate_destroy(c);
+			stream->active_remote_candidates =
+					g_list_delete_link(iter, iter);
+			stream->active_remote_candidates = g_list_prepend(
+					stream->active_remote_candidates,
+					fs_candidate_copy(remote_candidate));
+			break;
+		}
+	}
+	if (iter == NULL)
+		stream->active_remote_candidates = g_list_prepend(
+				stream->active_remote_candidates,
+				fs_candidate_copy(remote_candidate));
+
+	purple_debug_info("media", "candidate pair established\n");
+}
+
+static gboolean
+purple_media_connected_cb(PurpleMediaStream *stream)
+{
+	g_return_val_if_fail(stream != NULL, FALSE);
+
+	stream->connected_cb_id = 0;
+
+	purple_media_manager_create_output_window(
+			stream->session->media->priv->manager,
+			stream->session->media,
+			stream->session->id, stream->participant);
+
+	g_signal_emit(stream->session->media,
+			purple_media_signals[STATE_CHANGED],
+			0, PURPLE_MEDIA_STATE_CONNECTED,
+			stream->session->id, stream->participant);
+	return FALSE;
+}
+
+static void
+purple_media_src_pad_added_cb(FsStream *fsstream, GstPad *srcpad,
+			      FsCodec *codec, PurpleMediaStream *stream)
+{
+	PurpleMediaPrivate *priv;
+	GstPad *sinkpad;
+
+	g_return_if_fail(FS_IS_STREAM(fsstream));
+	g_return_if_fail(stream != NULL);
+
+	priv = stream->session->media->priv;
+
+	if (stream->src == NULL) {
+		GstElement *sink = NULL;
+
+		if (codec->media_type == FS_MEDIA_TYPE_AUDIO) {
+			GstElement *queue = NULL;
+			double output_volume = purple_prefs_get_int(
+					"/purple/media/audio/volume/output")/10.0;
+			/*
+			 * Should this instead be:
+			 *  audioconvert ! audioresample ! liveadder !
+			 *   audioresample ! audioconvert ! realsink
+			 */
+			queue = gst_element_factory_make("queue", NULL);
+			stream->volume = gst_element_factory_make(
+					"volume", NULL);
+			g_object_set(stream->volume, "volume",
+					output_volume, NULL);
+			stream->level = gst_element_factory_make(
+					"level", NULL);
+			stream->src = gst_element_factory_make(
+					"liveadder", NULL);
+			sink = purple_media_manager_get_element(priv->manager,
+					PURPLE_MEDIA_RECV_AUDIO,
+					stream->session->media,
+					stream->session->id,
+					stream->participant);
+			gst_bin_add(GST_BIN(priv->confbin), queue);
+			gst_bin_add(GST_BIN(priv->confbin), stream->volume);
+			gst_bin_add(GST_BIN(priv->confbin), stream->level);
+			gst_bin_add(GST_BIN(priv->confbin), sink);
+			gst_element_set_state(sink, GST_STATE_PLAYING);
+			gst_element_set_state(stream->level, GST_STATE_PLAYING);
+			gst_element_set_state(stream->volume, GST_STATE_PLAYING);
+			gst_element_set_state(queue, GST_STATE_PLAYING);
+			gst_element_link(stream->level, sink);
+			gst_element_link(stream->volume, stream->level);
+			gst_element_link(queue, stream->volume);
+			sink = queue;
+		} else if (codec->media_type == FS_MEDIA_TYPE_VIDEO) {
+			stream->src = gst_element_factory_make(
+					"fsfunnel", NULL);
+			sink = gst_element_factory_make(
+					"fakesink", NULL);
+			g_object_set(G_OBJECT(sink), "async", FALSE, NULL);
+			gst_bin_add(GST_BIN(priv->confbin), sink);
+			gst_element_set_state(sink, GST_STATE_PLAYING);
+		}
+		stream->tee = gst_element_factory_make("tee", NULL);
+		gst_bin_add_many(GST_BIN(priv->confbin),
+				stream->src, stream->tee, NULL);
+		gst_element_set_state(stream->tee, GST_STATE_PLAYING);
+		gst_element_set_state(stream->src, GST_STATE_PLAYING);
+		gst_element_link_many(stream->src, stream->tee, sink, NULL);
+	}
+
+	sinkpad = gst_element_get_request_pad(stream->src, "sink%d");
+	gst_pad_link(srcpad, sinkpad);
+	gst_object_unref(sinkpad);
+
+	stream->connected_cb_id = purple_timeout_add(0,
+			(GSourceFunc)purple_media_connected_cb, stream);
+}
+
+static void
+purple_media_element_added_cb(FsElementAddedNotifier *self,
+		GstBin *bin, GstElement *element, gpointer user_data)
+{
+	/*
+	 * Hack to make H264 work with Gmail video.
+	 */
+	if (!strncmp(GST_ELEMENT_NAME(element), "x264", 4)) {
+		g_object_set(GST_OBJECT(element), "cabac", FALSE, NULL);
+	}
+}
+#endif  /* USE_VV */
+
+gboolean
+purple_media_add_stream(PurpleMedia *media, const gchar *sess_id,
+		const gchar *who, PurpleMediaSessionType type,
+		gboolean initiator, const gchar *transmitter,
+		guint num_params, GParameter *params)
+{
+#ifdef USE_VV
+	PurpleMediaSession *session;
+	FsParticipant *participant = NULL;
+	PurpleMediaStream *stream = NULL;
+	FsMediaType media_type = purple_media_to_fs_media_type(type);
+	FsStreamDirection type_direction =
+			purple_media_to_fs_stream_direction(type);
+	gboolean is_nice = !strcmp(transmitter, "nice");
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+
+	session = purple_media_get_session(media, sess_id);
+
+	if (!session) {
+		GError *err = NULL;
+		GList *codec_conf = NULL, *iter = NULL;
+		gchar *filename = NULL;
+		PurpleMediaSessionType session_type;
+		GstElement *src = NULL;
+
+		session = g_new0(PurpleMediaSession, 1);
+
+		session->session = fs_conference_new_session(
+				media->priv->conference, media_type, &err);
+
+		if (err != NULL) {
+			purple_media_error(media, "Error creating session: %s\n", err->message);
+			g_error_free(err);
+			g_free(session);
+			return FALSE;
+		}
+
+		filename = g_build_filename(purple_user_dir(), "fs-codec.conf", NULL);
+		codec_conf = fs_codec_list_from_keyfile(filename, &err);
+		g_free(filename);
+
+		if (err != NULL) {
+			if (err->code == 4)
+				purple_debug_info("media", "Couldn't read "
+						"fs-codec.conf: %s\n",
+						err->message);
+			else
+				purple_debug_error("media", "Error reading "
+						"fs-codec.conf: %s\n",
+						err->message);
+			g_error_free(err);
+		}
+
+		/*
+		 * Add SPEEX if the configuration file doesn't exist or
+		 * there isn't a speex entry.
+		 */
+		for (iter = codec_conf; iter; iter = g_list_next(iter)) {
+			FsCodec *codec = iter->data;
+			if (!g_ascii_strcasecmp(codec->encoding_name, "speex"))
+				break;
+		}
+
+		if (iter == NULL) {
+			codec_conf = g_list_prepend(codec_conf,
+					fs_codec_new(FS_CODEC_ID_ANY,
+					"SPEEX", FS_MEDIA_TYPE_AUDIO, 8000));
+			codec_conf = g_list_prepend(codec_conf,
+					fs_codec_new(FS_CODEC_ID_ANY,
+					"SPEEX", FS_MEDIA_TYPE_AUDIO, 16000));
+		}
+
+		fs_session_set_codec_preferences(session->session, codec_conf, NULL);
+
+		/*
+		 * Removes a 5-7 second delay before
+		 * receiving the src-pad-added signal.
+		 * Only works for non-multicast FsRtpSessions.
+		 */
+		if (is_nice || !strcmp(transmitter, "rawudp"))
+			g_object_set(G_OBJECT(session->session),
+					"no-rtcp-timeout", 0, NULL);
+
+		/*
+		 * Hack to make x264 work with Gmail video.
+		 */
+		if (is_nice && !strcmp(sess_id, "google-video")) {
+			FsElementAddedNotifier *notifier =
+					fs_element_added_notifier_new();
+			g_signal_connect(G_OBJECT(notifier), "element-added",
+					G_CALLBACK(purple_media_element_added_cb),
+					stream);
+			fs_element_added_notifier_add(notifier,
+					GST_BIN(media->priv->conference));
+		}
+
+		fs_codec_list_destroy(codec_conf);
+
+		session->id = g_strdup(sess_id);
+		session->media = media;
+		session->type = type;
+		session->initiator = initiator;
+
+		purple_media_add_session(media, session);
+		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
+				0, PURPLE_MEDIA_STATE_NEW,
+				session->id, NULL);
+
+		if (type_direction & FS_DIRECTION_SEND) {
+			session_type = purple_media_from_fs(media_type,
+					FS_DIRECTION_SEND);
+			src = purple_media_manager_get_element(
+					media->priv->manager, session_type,
+					media, session->id, who);
+			if (!GST_IS_ELEMENT(src)) {
+				purple_debug_error("media",
+						"Error creating src for session %s\n",
+						session->id);
+				purple_media_end(media, session->id, NULL);
+				return FALSE;
+			}
+
+			purple_media_set_src(media, session->id, src);
+			gst_element_set_state(session->src, GST_STATE_PLAYING);
+			purple_media_manager_create_output_window(
+					media->priv->manager,
+					session->media,
+					session->id, NULL);
+		}
+	}
+
+	if (!(participant = purple_media_add_participant(media, who))) {
+		purple_media_remove_session(media, session);
+		g_free(session);
+		return FALSE;
+	} else {
+		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
+				0, PURPLE_MEDIA_STATE_NEW,
+				NULL, who);
+	}
+
+	stream = purple_media_get_stream(media, sess_id, who);
+
+	if (!stream) {
+		GError *err = NULL;
+		FsStream *fsstream = NULL;
+		const gchar *stun_ip = purple_network_get_stun_ip();
+		const gchar *turn_ip = purple_network_get_turn_ip();
+
+		if (stun_ip || turn_ip) {
+			guint new_num_params = 
+					(stun_ip && is_nice) && turn_ip ?
+					num_params + 2 : num_params + 1;
+			guint next_param_index = num_params;
+			GParameter *param = g_new0(GParameter, new_num_params);
+			memcpy(param, params, sizeof(GParameter) * num_params);
+
+			if (stun_ip) {
+				purple_debug_info("media", 
+					"setting property stun-ip on new stream: %s\n", stun_ip);
+
+				param[next_param_index].name = "stun-ip";
+				g_value_init(&param[next_param_index].value, G_TYPE_STRING);
+				g_value_set_string(&param[next_param_index].value, stun_ip);
+				next_param_index++;
+			}
+
+			if (turn_ip && is_nice) {
+				GValueArray *relay_info = g_value_array_new(0);
+				GValue value;
+				gint turn_port = 
+					purple_prefs_get_int("/purple/network/turn_port");
+				const gchar *username =
+					purple_prefs_get_string("/purple/network/turn_username");
+				const gchar *password =
+					purple_prefs_get_string("/purple/network/turn_password");
+				GstStructure *turn_setup = gst_structure_new("relay-info",
+					"ip", G_TYPE_STRING, turn_ip, 
+					"port", G_TYPE_UINT, turn_port,
+					"username", G_TYPE_STRING, username,
+					"password", G_TYPE_STRING, password,
+					NULL);
+
+				if (turn_setup) {
+					memset(&value, 0, sizeof(GValue));
+					g_value_init(&value, GST_TYPE_STRUCTURE);
+					gst_value_set_structure(&value, turn_setup);
+					relay_info = g_value_array_append(relay_info, &value);
+					gst_structure_free(turn_setup);
+
+					purple_debug_info("media",
+						"setting property relay-info on new stream\n");
+					param[next_param_index].name = "relay-info";
+					g_value_init(&param[next_param_index].value, 
+						G_TYPE_VALUE_ARRAY);
+					g_value_set_boxed(&param[next_param_index].value,
+						relay_info);
+					g_value_array_free(relay_info);
+				} else {
+					purple_debug_error("media", "Error relay info");
+					g_object_unref(participant);
+					g_hash_table_remove(media->priv->participants, who);
+					purple_media_remove_session(media, session);
+					g_free(session);
+					return FALSE;
+				}
+			}
+
+			fsstream = fs_session_new_stream(session->session,
+					participant, type_direction &
+					FS_DIRECTION_RECV, transmitter,
+					new_num_params, param, &err);
+			g_free(param);
+		} else {
+			fsstream = fs_session_new_stream(session->session,
+					participant, type_direction &
+					FS_DIRECTION_RECV, transmitter,
+					num_params, params, &err);
+		}
+
+		if (err) {
+			purple_debug_error("media", "Error creating stream: %s\n",
+					   err->message);
+			g_error_free(err);
+			g_object_unref(participant);
+			g_hash_table_remove(media->priv->participants, who);
+			purple_media_remove_session(media, session);
+			g_free(session);
+			return FALSE;
+		}
+
+		stream = purple_media_insert_stream(session, who, fsstream);
+		stream->initiator = initiator;
+
+		/* callback for source pad added (new stream source ready) */
+		g_signal_connect(G_OBJECT(fsstream),
+				 "src-pad-added", G_CALLBACK(purple_media_src_pad_added_cb), stream);
+
+		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
+				0, PURPLE_MEDIA_STATE_NEW,
+				session->id, who);
+	} else {
+		if (purple_media_to_fs_stream_direction(stream->session->type)
+				!= type_direction) {
+			/* change direction */
+			g_object_set(stream->stream, "direction",
+					type_direction, NULL);
+		}
+	}
+
+	return TRUE;
+#else
+	return FALSE;
+#endif  /* USE_VV */
+}
+
+PurpleMediaManager *
+purple_media_get_manager(PurpleMedia *media)
+{
+	PurpleMediaManager *ret;
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+	g_object_get(media, "manager", &ret, NULL);
+	return ret;
+}
+
+PurpleMediaSessionType
+purple_media_get_session_type(PurpleMedia *media, const gchar *sess_id)
+{
+#ifdef USE_VV
+	PurpleMediaSession *session;
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), PURPLE_MEDIA_NONE);
+	session = purple_media_get_session(media, sess_id);
+	return session->type;
+#else
+	return PURPLE_MEDIA_NONE;
+#endif
+}
+/* XXX: Should wait until codecs-ready is TRUE before using this function */
+GList *
+purple_media_get_codecs(PurpleMedia *media, const gchar *sess_id)
+{
+#ifdef USE_VV
+	GList *fscodecs;
+	GList *codecs;
+	PurpleMediaSession *session;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+
+	session = purple_media_get_session(media, sess_id);
+
+	if (session == NULL)
+		return NULL;
+
+	g_object_get(G_OBJECT(session->session),
+		     "codecs", &fscodecs, NULL);
+	codecs = purple_media_codec_list_from_fs(fscodecs);
+	fs_codec_list_destroy(fscodecs);
+	return codecs;
+#else
+	return NULL;
+#endif
+}
+
+GList *
+purple_media_get_local_candidates(PurpleMedia *media, const gchar *sess_id,
+                                  const gchar *participant)
+{
+#ifdef USE_VV
+	PurpleMediaStream *stream;
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+	stream = purple_media_get_stream(media, sess_id, participant);
+	return stream ? purple_media_candidate_list_from_fs(
+			stream->local_candidates) : NULL;
+#else
+	return NULL;
+#endif
+}
+
+void
+purple_media_add_remote_candidates(PurpleMedia *media, const gchar *sess_id,
+                                   const gchar *participant,
+                                   GList *remote_candidates)
+{
+#ifdef USE_VV
+	PurpleMediaStream *stream;
+	GError *err = NULL;
+
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
+	stream = purple_media_get_stream(media, sess_id, participant);
+
+	if (stream == NULL) {
+		purple_debug_error("media",
+				"purple_media_add_remote_candidates: "
+				"couldn't find stream %s %s.\n",
+				sess_id ? sess_id : "(null)",
+				participant ? participant : "(null)");
+		return;
+	}
+
+	stream->remote_candidates = g_list_concat(stream->remote_candidates,
+			purple_media_candidate_list_to_fs(remote_candidates));
+
+	fs_stream_set_remote_candidates(stream->stream,
+			stream->remote_candidates, &err);
+
+	if (err) {
+		purple_debug_error("media", "Error adding remote"
+				" candidates: %s\n", err->message);
+		g_error_free(err);
+	}
+#endif
+}
+
+#if 0
+/*
+ * These two functions aren't being used and I'd rather not lock in the API
+ * until they are needed. If they ever are.
+ */
+
+GList *
+purple_media_get_active_local_candidates(PurpleMedia *media,
+		const gchar *sess_id, const gchar *participant)
+{
+#ifdef USE_VV
+	PurpleMediaStream *stream;
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+	stream = purple_media_get_stream(media, sess_id, participant);
+	return purple_media_candidate_list_from_fs(
+			stream->active_local_candidates);
+#else
+	return NULL;
+#endif
+}
+
+GList *
+purple_media_get_active_remote_candidates(PurpleMedia *media,
+		const gchar *sess_id, const gchar *participant)
+{
+#ifdef USE_VV
+	PurpleMediaStream *stream;
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+	stream = purple_media_get_stream(media, sess_id, participant);
+	return purple_media_candidate_list_from_fs(
+			stream->active_remote_candidates);
+#else
+	return NULL;
+#endif
+}
+#endif
+
+gboolean
+purple_media_set_remote_codecs(PurpleMedia *media, const gchar *sess_id,
+                               const gchar *participant, GList *codecs)
+{
+#ifdef USE_VV
+	PurpleMediaStream *stream;
+	FsStream *fsstream;
+	GList *fscodecs;
+	GError *err = NULL;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+	stream = purple_media_get_stream(media, sess_id, participant);
+
+	if (stream == NULL)
+		return FALSE;
+
+	fsstream = stream->stream;
+	fscodecs = purple_media_codec_list_to_fs(codecs);
+	fs_stream_set_remote_codecs(fsstream, fscodecs, &err);
+	fs_codec_list_destroy(fscodecs);
+
+	if (err) {
+		purple_debug_error("media", "Error setting remote codecs: %s\n",
+				   err->message);
+		g_error_free(err);
+		return FALSE;
+	}
+	return TRUE;
+#else
+	return FALSE;
+#endif
+}
+
+gboolean
+purple_media_candidates_prepared(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant)
+{
+#ifdef USE_VV
+	GList *streams;
+	gboolean prepared = TRUE;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+
+	streams = purple_media_get_streams(media, session_id, participant);
+
+	for (; streams; streams = g_list_delete_link(streams, streams)) {
+		PurpleMediaStream *stream = streams->data;
+		if (stream->candidates_prepared == FALSE) {
+			g_list_free(streams);
+			prepared = FALSE;
+			break;
+		}
+	}
+
+	return prepared;
+#else
+	return FALSE;
+#endif
+}
+
+gboolean
+purple_media_set_send_codec(PurpleMedia *media, const gchar *sess_id, PurpleMediaCodec *codec)
+{
+#ifdef USE_VV
+	PurpleMediaSession *session;
+	FsCodec *fscodec;
+	GError *err = NULL;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+
+	session = purple_media_get_session(media, sess_id);
+
+	if (session != NULL)
+		return FALSE;
+
+	fscodec = purple_media_codec_to_fs(codec);
+	fs_session_set_send_codec(session->session, fscodec, &err);
+	fs_codec_destroy(fscodec);
+
+	if (err) {
+		purple_debug_error("media", "Error setting send codec\n");
+		g_error_free(err);
+		return FALSE;
+	}
+	return TRUE;
+#else
+	return FALSE;
+#endif
+}
+
+gboolean
+purple_media_codecs_ready(PurpleMedia *media, const gchar *sess_id)
+{
+#ifdef USE_VV
+	gboolean ret;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+
+	if (sess_id != NULL) {
+		PurpleMediaSession *session;
+		session = purple_media_get_session(media, sess_id);
+
+		if (session == NULL)
+			return FALSE;
+		if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
+				PURPLE_MEDIA_SEND_VIDEO))
+			g_object_get(session->session,
+					"codecs-ready", &ret, NULL);
+		else
+			ret = TRUE;
+	} else {
+		GList *values = g_hash_table_get_values(media->priv->sessions);
+		for (; values; values = g_list_delete_link(values, values)) {
+			PurpleMediaSession *session = values->data;
+			if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
+					PURPLE_MEDIA_SEND_VIDEO))
+				g_object_get(session->session,
+						"codecs-ready", &ret, NULL);
+			else
+				ret = TRUE;
+
+			if (ret == FALSE)
+				break;
+		}
+		if (values != NULL)
+			g_list_free(values);
+	}
+	return ret;
+#else
+	return FALSE;
+#endif
+}
+
+gboolean
+purple_media_is_initiator(PurpleMedia *media,
+		const gchar *sess_id, const gchar *participant)
+{
+#ifdef USE_VV
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+
+	if (sess_id == NULL && participant == NULL)
+		return media->priv->initiator;
+	else if (sess_id != NULL && participant == NULL) {
+		PurpleMediaSession *session =
+				purple_media_get_session(media, sess_id);
+		return session != NULL ? session->initiator : FALSE;
+	} else if (sess_id != NULL && participant != NULL) {
+		PurpleMediaStream *stream = purple_media_get_stream(
+				media, sess_id, participant);
+		return stream != NULL ? stream->initiator : FALSE;
+	}
+#endif
+	return FALSE;
+}
+
+gboolean
+purple_media_accepted(PurpleMedia *media, const gchar *sess_id,
+		const gchar *participant)
+{
+#ifdef USE_VV
+	gboolean accepted = TRUE;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+
+	if (sess_id == NULL && participant == NULL) {
+		GList *streams = media->priv->streams;
+
+		for (; streams; streams = g_list_next(streams)) {
+			PurpleMediaStream *stream = streams->data;
+			if (stream->accepted == FALSE) {
+				accepted = FALSE;
+				break;
+			}
+		}
+	} else if (sess_id != NULL && participant == NULL) {
+		GList *streams = purple_media_get_streams(
+				media, sess_id, NULL);
+		for (; streams; streams =
+				g_list_delete_link(streams, streams)) {
+			PurpleMediaStream *stream = streams->data;
+			if (stream->accepted == FALSE) {
+				g_list_free(streams);
+				accepted = FALSE;
+				break;
+			}
+		}
+	} else if (sess_id != NULL && participant != NULL) {
+		PurpleMediaStream *stream = purple_media_get_stream(
+				media, sess_id, participant);
+		if (stream == NULL || stream->accepted == FALSE)
+			accepted = FALSE;
+	}
+
+	return accepted;
+#else
+	return FALSE;
+#endif
+}
+
+void purple_media_set_input_volume(PurpleMedia *media,
+		const gchar *session_id, double level)
+{
+#ifdef USE_VV
+	GList *sessions;
+
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
+
+	purple_prefs_set_int("/purple/media/audio/volume/input", level);
+
+	if (session_id == NULL)
+		sessions = g_hash_table_get_values(media->priv->sessions);
+	else
+		sessions = g_list_append(NULL,
+				purple_media_get_session(media, session_id));
+
+	for (; sessions; sessions = g_list_delete_link(sessions, sessions)) {
+		PurpleMediaSession *session = sessions->data;
+
+		if (session->type & PURPLE_MEDIA_SEND_AUDIO) {
+			gchar *name = g_strdup_printf("volume_%s",
+					session->id);
+			GstElement *volume = gst_bin_get_by_name(
+					GST_BIN(session->media->priv->confbin),
+					name);
+			g_free(name);
+			g_object_set(volume, "volume", level/10.0, NULL);
+		}
+	}
+#endif
+}
+
+void purple_media_set_output_volume(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant,
+		double level)
+{
+#ifdef USE_VV
+	GList *streams;
+
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
+
+	purple_prefs_set_int("/purple/media/audio/volume/output", level);
+
+	streams = purple_media_get_streams(media,
+			session_id, participant);
+
+	for (; streams; streams = g_list_delete_link(streams, streams)) {
+		PurpleMediaStream *stream = streams->data;
+
+		if (stream->session->type & PURPLE_MEDIA_RECV_AUDIO
+				&& GST_IS_ELEMENT(stream->volume)) {
+			g_object_set(stream->volume, "volume", level/10.0, NULL);
+		}
+	}
+#endif
+}
+
+gulong
+purple_media_set_output_window(PurpleMedia *media, const gchar *session_id,
+		const gchar *participant, gulong window_id)
+{
+#ifdef USE_VV
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+
+	return purple_media_manager_set_output_window(media->priv->manager,
+			media, session_id, participant, window_id);
+#else
+	return 0;
+#endif
+}
+
+void
+purple_media_remove_output_windows(PurpleMedia *media)
+{
+#ifdef USE_VV
+	GList *iter = media->priv->streams;
+	for (; iter; iter = g_list_next(iter)) {
+		PurpleMediaStream *stream = iter->data;
+		purple_media_manager_remove_output_windows(
+				media->priv->manager, media,
+				stream->session->id, stream->participant);
+	}
+
+	iter = purple_media_get_session_ids(media);
+	for (; iter; iter = g_list_delete_link(iter, iter)) {
+		gchar *session_name = iter->data;
+		purple_media_manager_remove_output_windows(
+				media->priv->manager, media,
+				session_name, NULL);
+	}
+#endif
+}
+
+#ifdef USE_GSTREAMER
+GstElement *
+purple_media_get_tee(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant)
+{
+#ifdef USE_VV
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
+
+	if (session_id != NULL && participant == NULL) {
+		PurpleMediaSession *session =
+				purple_media_get_session(media, session_id);
+		return (session != NULL) ? session->tee : NULL;
+	} else if (session_id != NULL && participant != NULL) {
+		PurpleMediaStream *stream =
+				purple_media_get_stream(media,
+				session_id, participant);
+		return (stream != NULL) ? stream->tee : NULL;
+	}
+	g_return_val_if_reached(NULL);
+#else
+	return NULL;
+#endif
+}
+#endif /* USE_GSTREAMER */
+
diff --git a/libpurple/media.h b/libpurple/media.h
new file mode 100644
index 0000000000..dd8942fb56
--- /dev/null
+++ b/libpurple/media.h
@@ -0,0 +1,692 @@
+/**
+ * @file media.h Media API
+ * @ingroup core
+ */
+
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _PURPLE_MEDIA_H_
+#define _PURPLE_MEDIA_H_
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define PURPLE_TYPE_MEDIA_CANDIDATE           (purple_media_candidate_get_type())
+#define PURPLE_MEDIA_CANDIDATE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_CANDIDATE, PurpleMediaCandidate))
+#define PURPLE_MEDIA_CANDIDATE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_CANDIDATE, PurpleMediaCandidate))
+#define PURPLE_IS_MEDIA_CANDIDATE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_CANDIDATE))
+#define PURPLE_IS_MEDIA_CANDIDATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_CANDIDATE))
+#define PURPLE_MEDIA_CANDIDATE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_CANDIDATE, PurpleMediaCandidate))
+
+#define PURPLE_TYPE_MEDIA_CODEC           (purple_media_codec_get_type())
+#define PURPLE_MEDIA_CODEC(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_CODEC, PurpleMediaCodec))
+#define PURPLE_MEDIA_CODEC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_CODEC, PurpleMediaCodec))
+#define PURPLE_IS_MEDIA_CODEC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_CODEC))
+#define PURPLE_IS_MEDIA_CODEC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_CODEC))
+#define PURPLE_MEDIA_CODEC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_CODEC, PurpleMediaCodec))
+
+#define PURPLE_TYPE_MEDIA_SESSION_TYPE (purple_media_session_type_get_type())
+#define PURPLE_TYPE_MEDIA            (purple_media_get_type())
+#define PURPLE_MEDIA(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA, PurpleMedia))
+#define PURPLE_MEDIA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA, PurpleMediaClass))
+#define PURPLE_IS_MEDIA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA))
+#define PURPLE_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA))
+#define PURPLE_MEDIA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA, PurpleMediaClass))
+
+#define PURPLE_TYPE_MEDIA_CANDIDATE_TYPE (purple_media_candidate_type_get_type())
+#define PURPLE_TYPE_MEDIA_NETWORK_PROTOCOL (purple_media_network_protocol_get_type())
+#define PURPLE_MEDIA_TYPE_STATE      (purple_media_state_changed_get_type())
+#define PURPLE_MEDIA_TYPE_INFO_TYPE	(purple_media_info_type_get_type())
+
+/** @copydoc _PurpleMedia */
+typedef struct _PurpleMedia PurpleMedia;
+/** @copydoc _PurpleMediaCandidate */
+typedef struct _PurpleMediaCandidate PurpleMediaCandidate;
+/** @copydoc _PurpleMediaCodec */
+typedef struct _PurpleMediaCodec PurpleMediaCodec;
+
+/** Media caps */
+typedef enum {
+	PURPLE_MEDIA_CAPS_NONE = 0,
+	PURPLE_MEDIA_CAPS_AUDIO = 1,
+	PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION = 1 << 1,
+	PURPLE_MEDIA_CAPS_VIDEO = 1 << 2,
+	PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION = 1 << 3,
+	PURPLE_MEDIA_CAPS_AUDIO_VIDEO = 1 << 4,
+	PURPLE_MEDIA_CAPS_MODIFY_SESSION = 1 << 5,
+	PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6,
+} PurpleMediaCaps;
+
+/** Media session types */
+typedef enum {
+	PURPLE_MEDIA_NONE	= 0,
+	PURPLE_MEDIA_RECV_AUDIO = 1 << 0,
+	PURPLE_MEDIA_SEND_AUDIO = 1 << 1,
+	PURPLE_MEDIA_RECV_VIDEO = 1 << 2,
+	PURPLE_MEDIA_SEND_VIDEO = 1 << 3,
+	PURPLE_MEDIA_AUDIO = PURPLE_MEDIA_RECV_AUDIO | PURPLE_MEDIA_SEND_AUDIO,
+	PURPLE_MEDIA_VIDEO = PURPLE_MEDIA_RECV_VIDEO | PURPLE_MEDIA_SEND_VIDEO
+} PurpleMediaSessionType;
+
+/** Media state-changed types */
+typedef enum {
+	PURPLE_MEDIA_STATE_NEW = 0,
+	PURPLE_MEDIA_STATE_CONNECTED,
+	PURPLE_MEDIA_STATE_END,
+} PurpleMediaState;
+
+/** Media info types */
+typedef enum {
+	PURPLE_MEDIA_INFO_HANGUP = 0,
+	PURPLE_MEDIA_INFO_ACCEPT,
+	PURPLE_MEDIA_INFO_REJECT,
+	PURPLE_MEDIA_INFO_MUTE,
+	PURPLE_MEDIA_INFO_UNMUTE,
+	PURPLE_MEDIA_INFO_PAUSE,
+	PURPLE_MEDIA_INFO_UNPAUSE,
+	PURPLE_MEDIA_INFO_HOLD,
+	PURPLE_MEDIA_INFO_UNHOLD,
+} PurpleMediaInfoType;
+
+typedef enum {
+	PURPLE_MEDIA_CANDIDATE_TYPE_HOST,
+	PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
+	PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX,
+	PURPLE_MEDIA_CANDIDATE_TYPE_RELAY,
+	PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST,
+} PurpleMediaCandidateType;
+
+typedef enum {
+	PURPLE_MEDIA_COMPONENT_NONE = 0,
+	PURPLE_MEDIA_COMPONENT_RTP = 1,
+	PURPLE_MEDIA_COMPONENT_RTCP = 2,
+} PurpleMediaComponentType;
+
+typedef enum {
+	PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
+	PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
+} PurpleMediaNetworkProtocol;
+
+#include "signals.h"
+#include "util.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Gets the media session type's GType
+ *
+ * @return The media session type's GType.
+ *
+ * @since 2.6.0
+ */
+GType purple_media_session_type_get_type(void);
+
+/**
+ * Gets the media candidate type's GType
+ *
+ * @return The media candidate type's GType.
+ *
+ * @since 2.6.0
+ */
+GType purple_media_candidate_type_get_type(void);
+
+/**
+ * Gets the media network protocol's GType
+ *
+ * @return The media network protocol's GType.
+ *
+ * @since 2.6.0
+ */
+GType purple_media_network_protocol_get_type(void);
+
+/**
+ * Gets the media class's GType
+ *
+ * @return The media class's GType.
+ *
+ * @since 2.6.0
+ */
+GType purple_media_get_type(void);
+
+/**
+ * Gets the type of the state-changed enum
+ *
+ * @return The state-changed enum's GType
+ *
+ * @since 2.6.0
+ */
+GType purple_media_state_changed_get_type(void);
+
+/**
+ * Gets the type of the info type enum
+ *
+ * @return The info type enum's GType
+ *
+ * @since 2.6.0
+ */
+GType purple_media_info_type_get_type(void);
+
+/**
+ * Gets the type of the media candidate structure.
+ *
+ * @return The media canditate's GType
+ *
+ * @since 2.6.0
+ */
+GType purple_media_candidate_get_type(void);
+
+/**
+ * Creates a PurpleMediaCandidate instance.
+ *
+ * @param foundation The foundation of the candidate.
+ * @param component_id The component this candidate is for.
+ * @param type The type of candidate.
+ * @param proto The protocol this component is for.
+ * @param ip The IP address of this component.
+ * @param port The network port.
+ *
+ * @return The newly created PurpleMediaCandidate instance.
+ *
+ * @since 2.6.0
+ */
+PurpleMediaCandidate *purple_media_candidate_new(
+		const gchar *foundation, guint component_id,
+		PurpleMediaCandidateType type,
+		PurpleMediaNetworkProtocol proto,
+		const gchar *ip, guint port);
+
+/**
+ * Copies a GList of PurpleMediaCandidate and its contents.
+ *
+ * @param candidates The list of candidates to be copied.
+ *
+ * @return The copy of the GList.
+ *
+ * @since 2.6.0
+ */
+GList *purple_media_candidate_list_copy(GList *candidates);
+
+/**
+ * Frees a GList of PurpleMediaCandidate and its contents.
+ *
+ * @param candidates The list of candidates to be freed.
+ *
+ * @since 2.6.0
+ */
+void purple_media_candidate_list_free(GList *candidates);
+
+gchar *purple_media_candidate_get_foundation(PurpleMediaCandidate *candidate);
+guint purple_media_candidate_get_component_id(PurpleMediaCandidate *candidate);
+gchar *purple_media_candidate_get_ip(PurpleMediaCandidate *candidate);
+guint16 purple_media_candidate_get_port(PurpleMediaCandidate *candidate);
+gchar *purple_media_candidate_get_base_ip(PurpleMediaCandidate *candidate);
+guint16 purple_media_candidate_get_base_port(PurpleMediaCandidate *candidate);
+PurpleMediaNetworkProtocol purple_media_candidate_get_protocol(
+		PurpleMediaCandidate *candidate);
+guint32 purple_media_candidate_get_priority(PurpleMediaCandidate *candidate);
+PurpleMediaCandidateType purple_media_candidate_get_candidate_type(
+		PurpleMediaCandidate *candidate);
+gchar *purple_media_candidate_get_username(PurpleMediaCandidate *candidate);
+gchar *purple_media_candidate_get_password(PurpleMediaCandidate *candidate);
+guint purple_media_candidate_get_ttl(PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the type of the media codec structure.
+ *
+ * @return The media codec's GType
+ *
+ * @since 2.6.0
+ */
+GType purple_media_codec_get_type(void);
+
+/**
+ * Creates a new PurpleMediaCodec instance.
+ *
+ * @param id Codec identifier.
+ * @param encoding_name Name of the media type this encodes.
+ * @param media_type PurpleMediaSessionType of this codec.
+ * @param clock_rate The clock rate this codec encodes at, if applicable.
+ *
+ * @return The newly created PurpleMediaCodec.
+ *
+ * @since 2.6.0
+ */
+PurpleMediaCodec *purple_media_codec_new(int id, const char *encoding_name,
+		PurpleMediaSessionType media_type, guint clock_rate);
+
+guint purple_media_codec_get_id(PurpleMediaCodec *codec);
+gchar *purple_media_codec_get_encoding_name(PurpleMediaCodec *codec);
+guint purple_media_codec_get_clock_rate(PurpleMediaCodec *codec);
+guint purple_media_codec_get_channels(PurpleMediaCodec *codec);
+GList *purple_media_codec_get_optional_parameters(PurpleMediaCodec *codec);
+
+/**
+ * Creates a string representation of the codec.
+ *
+ * @param codec The codec to create the string of.
+ *
+ * @return The new string representation.
+ *
+ * @since 2.6.0
+ */
+gchar *purple_media_codec_to_string(const PurpleMediaCodec *codec);
+
+/**
+ * Adds an optional parameter to the codec.
+ *
+ * @param codec The codec to add the parameter to.
+ * @param name The name of the parameter to add.
+ * @param value The value of the parameter to add.
+ *
+ * @since 2.6.0
+ */
+void purple_media_codec_add_optional_parameter(PurpleMediaCodec *codec,
+		const gchar *name, const gchar *value);
+
+/**
+ * Removes an optional parameter from the codec.
+ *
+ * @param codec The codec to remove the parameter from.
+ * @param param A pointer to the parameter to remove.
+ *
+ * @since 2.6.0
+ */
+void purple_media_codec_remove_optional_parameter(PurpleMediaCodec *codec,
+		PurpleKeyValuePair *param);
+
+/**
+ * Gets an optional parameter based on the values given.
+ *
+ * @param codec The codec to find the parameter in.
+ * @param name The name of the parameter to search for.
+ * @param value The value to search for or NULL.
+ *
+ * @return The value found or NULL.
+ *
+ * @since 2.6.0
+ */
+PurpleKeyValuePair *purple_media_codec_get_optional_parameter(
+		PurpleMediaCodec *codec, const gchar *name,
+		const gchar *value);
+
+/**
+ * Copies a GList of PurpleMediaCodec and its contents.
+ *
+ * @param codecs The list of codecs to be copied.
+ *
+ * @return The copy of the GList.
+ *
+ * @since 2.6.0
+ */
+GList *purple_media_codec_list_copy(GList *codecs);
+
+/**
+ * Frees a GList of PurpleMediaCodec and its contents.
+ *
+ * @param codecs The list of codecs to be freed.
+ *
+ * @since 2.6.0
+ */
+void purple_media_codec_list_free(GList *codecs);
+
+/**
+ * Gets a list of session IDs.
+ *
+ * @param media The media session from which to retrieve session IDs.
+ *
+ * @return GList of session IDs. The caller must free the list.
+ *
+ * @since 2.6.0
+ */
+GList *purple_media_get_session_ids(PurpleMedia *media);
+
+/**
+ * Gets the PurpleAccount this media session is on.
+ *
+ * @param media The media session to retrieve the account from.
+ *
+ * @return The account retrieved.
+ *
+ * @since 2.6.0
+ */
+PurpleAccount *purple_media_get_account(PurpleMedia *media);
+
+/**
+ * Gets the prpl data from the media session.
+ *
+ * @param media The media session to retrieve the prpl data from.
+ *
+ * @return The prpl data retrieved.
+ *
+ * @since 2.6.0
+ */
+gpointer purple_media_get_prpl_data(PurpleMedia *media);
+
+/**
+ * Sets the prpl data on the media session.
+ *
+ * @param media The media session to set the prpl data on.
+ * @param prpl_data The data to set on the media session.
+ *
+ * @since 2.6.0
+ */
+void purple_media_set_prpl_data(PurpleMedia *media, gpointer prpl_data);
+
+/**
+ * Signals an error in the media session.
+ *
+ * @param media The media object to set the state on.
+ * @param error The format of the error message to send in the signal.
+ * @param ... The arguments to plug into the format.
+ *
+ * @since 2.6.0
+ */
+void purple_media_error(PurpleMedia *media, const gchar *error, ...);
+
+/**
+ * Ends all streams that match the given parameters
+ *
+ * @param media The media object with which to end streams.
+ * @param session_id The session to end streams on.
+ * @param participant The participant to end streams with.
+ *
+ * @since 2.6.0
+ */
+void purple_media_end(PurpleMedia *media, const gchar *session_id,
+		const gchar *participant);
+
+/**
+ * Signals different information about the given stream.
+ *
+ * @param media The media instance to containing the stream to signal.
+ * @param type The type of info being signaled.
+ * @param session_id The id of the session of the stream being signaled.
+ * @param participant The participant of the stream being signaled.
+ * @param local TRUE if the info originated locally, FALSE if on the remote end.
+ *
+ * @since 2.6.0
+ */
+void purple_media_stream_info(PurpleMedia *media, PurpleMediaInfoType type,
+		const gchar *session_id, const gchar *participant,
+		gboolean local);
+
+/**
+ * Adds a stream to a session.
+ *
+ * It only adds a stream to one audio session or video session as
+ * the @c sess_id must be unique between sessions.
+ *
+ * @param media The media object to find the session in.
+ * @param sess_id The session id of the session to add the stream to.
+ * @param who The name of the remote user to add the stream for.
+ * @param type The type of stream to create.
+ * @param initiator Whether or not the local user initiated the stream.
+ * @param transmitter The transmitter to use for the stream.
+ * @param num_params The number of parameters to pass to Farsight.
+ * @param params The parameters to pass to Farsight.
+ *
+ * @return @c TRUE The stream was added successfully, @c FALSE otherwise.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_media_add_stream(PurpleMedia *media, const gchar *sess_id,
+		const gchar *who, PurpleMediaSessionType type,
+		gboolean initiator, const gchar *transmitter,
+		guint num_params, GParameter *params);
+
+/**
+ * Gets the session type from a session
+ *
+ * @param media The media object to find the session in.
+ * @param sess_id The session id of the session to get the type from.
+ *
+ * @return The retreived session type.
+ *
+ * @since 2.6.0
+ */
+PurpleMediaSessionType purple_media_get_session_type(PurpleMedia *media, const gchar *sess_id);
+
+/**
+ * Gets the PurpleMediaManager this media session is a part of.
+ *
+ * @param media The media object to get the manager instance from.
+ *
+ * @return The PurpleMediaManager instance retrieved.
+ *
+ * @since 2.6.0
+ */
+struct _PurpleMediaManager *purple_media_get_manager(PurpleMedia *media);
+
+/**
+ * Gets the codecs from a session.
+ *
+ * @param media The media object to find the session in.
+ * @param sess_id The session id of the session to get the codecs from.
+ *
+ * @return The retreieved codecs.
+ *
+ * @since 2.6.0
+ */
+GList *purple_media_get_codecs(PurpleMedia *media, const gchar *sess_id);
+
+/**
+ * Adds remote candidates to the stream.
+ *
+ * @param media The media object to find the session in.
+ * @param sess_id The session id of the session find the stream in.
+ * @param participant The name of the remote user to add the candidates for.
+ * @param remote_candidates The remote candidates to add.
+ *
+ * @since 2.6.0
+ */
+void purple_media_add_remote_candidates(PurpleMedia *media,
+					const gchar *sess_id,
+					const gchar *participant,
+					GList *remote_candidates);
+
+/**
+ * Gets the local candidates from a stream.
+ *
+ * @param media The media object to find the session in.
+ * @param sess_id The session id of the session to find the stream in.
+ * @param participant The name of the remote user to get the candidates from.
+ *
+ * @since 2.6.0
+ */
+GList *purple_media_get_local_candidates(PurpleMedia *media,
+					 const gchar *sess_id,
+					 const gchar *participant);
+
+#if 0
+/*
+ * These two functions aren't being used and I'd rather not lock in the API
+ * until they are needed. If they ever are.
+ */
+
+/**
+ * Gets the active local candidates for the stream.
+ *
+ * @param media The media object to find the session in.
+ * @param sess_id The session id of the session to find the stream in.
+ * @param participant The name of the remote user to get the active candidate
+ *                    from.
+ *
+ * @return The active candidates retrieved.
+ */
+GList *purple_media_get_active_local_candidates(PurpleMedia *media,
+		const gchar *sess_id, const gchar *participant);
+
+/**
+ * Gets the active remote candidates for the stream.
+ *
+ * @param media The media object to find the session in.
+ * @param sess_id The session id of the session to find the stream in.
+ * @param participant The name of the remote user to get the remote candidate
+ *                    from.
+ *
+ * @return The remote candidates retrieved.
+ */
+GList *purple_media_get_active_remote_candidates(PurpleMedia *media,
+		const gchar *sess_id, const gchar *participant);
+#endif
+
+/**
+ * Sets remote candidates from the stream.
+ *
+ * @param media The media object to find the session in.
+ * @param sess_id The session id of the session find the stream in.
+ * @param participant The name of the remote user to set the candidates from.
+ *
+ * @return @c TRUE The codecs were set successfully, or @c FALSE otherwise.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_media_set_remote_codecs(PurpleMedia *media, const gchar *sess_id,
+					const gchar *participant, GList *codecs);
+
+/**
+ * Returns whether or not the candidates for set of streams are prepared
+ *
+ * @param media The media object to find the remote user in.
+ * @param session_id The session id of the session to check.
+ * @param participant The remote user to check for.
+ *
+ * @return @c TRUE All streams for the given session_id/participant combination have candidates prepared, @c FALSE otherwise.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_media_candidates_prepared(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant);
+
+/**
+ * Sets the send codec for the a session.
+ *
+ * @param media The media object to find the session in.
+ * @param sess_id The session id of the session to set the codec for.
+ * @param codec The codec to set the session to stream.
+ *
+ * @return @c TRUE The codec was successfully changed, or @c FALSE otherwise.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_media_set_send_codec(PurpleMedia *media, const gchar *sess_id, PurpleMediaCodec *codec);
+
+/**
+ * Gets whether a session's codecs are ready to be used.
+ *
+ * @param media The media object to find the session in.
+ * @param sess_id The session id of the session to check.
+ *
+ * @return @c TRUE The codecs are ready, or @c FALSE otherwise.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_media_codecs_ready(PurpleMedia *media, const gchar *sess_id);
+
+/**
+ * Gets whether the local user is the conference/session/stream's initiator.
+ *
+ * @param media The media instance to find the session in.
+ * @param sess_id The session id of the session to check.
+ * @param participant The participant of the stream to check.
+ *
+ * @return TRUE if the local user is the stream's initator, else FALSE.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_media_is_initiator(PurpleMedia *media,
+		const gchar *sess_id, const gchar *participant);
+
+/**
+ * Gets whether a streams selected have been accepted.
+ *
+ * @param media The media object to find the session in.
+ * @param sess_id The session id of the session to check.
+ * @param participant The participant to check.
+ *
+ * @return @c TRUE The selected streams have been accepted, or @c FALSE otherwise.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_media_accepted(PurpleMedia *media, const gchar *sess_id,
+		const gchar *participant);
+
+/**
+ * Sets the input volume of all the selected sessions.
+ *
+ * @param media The media object the sessions are in.
+ * @param session_id The session to select (if any).
+ * @param level The level to set the volume to.
+ *
+ * @since 2.6.0
+ */
+void purple_media_set_input_volume(PurpleMedia *media, const gchar *session_id, double level);
+
+/**
+ * Sets the output volume of all the selected streams.
+ *
+ * @param media The media object the streams are in.
+ * @param session_id The session to limit the streams to (if any).
+ * @param participant The participant to limit the streams to (if any).
+ * @param level The level to set the volume to.
+ *
+ * @since 2.6.0
+ */
+void purple_media_set_output_volume(PurpleMedia *media, const gchar *session_id,
+		const gchar *participant, double level);
+
+/**
+ * Sets a video output window for the given session/stream.
+ *
+ * @param media The media instance to set the output window on.
+ * @param session_id The session to set the output window on.
+ * @param participant Optionally, the participant to set the output window on.
+ * @param window_id The window id use for embedding the video in.
+ *
+ * @return An id to reference the output window.
+ *
+ * @since 2.6.0
+ */
+gulong purple_media_set_output_window(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant,
+		gulong window_id);
+
+/**
+ * Removes all output windows from a given media session.
+ *
+ * @param media The instance to remove all output windows from.
+ *
+ * @since 2.6.0
+ */
+void purple_media_remove_output_windows(PurpleMedia *media);
+
+#ifdef __cplusplus
+}
+#endif
+
+G_END_DECLS
+
+#endif  /* _PURPLE_MEDIA_H_ */
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
new file mode 100644
index 0000000000..1bcaefd76c
--- /dev/null
+++ b/libpurple/mediamanager.c
@@ -0,0 +1,1187 @@
+/**
+ * @file mediamanager.c Media Manager API
+ * @ingroup core
+ */
+
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "internal.h"
+
+#include "account.h"
+#include "debug.h"
+#include "media.h"
+#include "mediamanager.h"
+
+#ifdef USE_GSTREAMER
+#include "marshallers.h"
+#include "media-gst.h"
+#endif
+
+#ifdef USE_VV
+
+#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-element-added-notifier.h>
+#include <gst/interfaces/xoverlay.h>
+
+/** @copydoc _PurpleMediaManagerPrivate */
+typedef struct _PurpleMediaManagerPrivate PurpleMediaManagerPrivate;
+/** @copydoc _PurpleMediaOutputWindow */
+typedef struct _PurpleMediaOutputWindow PurpleMediaOutputWindow;
+/** @copydoc _PurpleMediaManagerPrivate */
+typedef struct _PurpleMediaElementInfoPrivate PurpleMediaElementInfoPrivate;
+
+/** The media manager class. */
+struct _PurpleMediaManagerClass
+{
+	GObjectClass parent_class;       /**< The parent class. */
+};
+
+/** The media manager's data. */
+struct _PurpleMediaManager
+{
+	GObject parent;                  /**< The parent of this manager. */
+	PurpleMediaManagerPrivate *priv; /**< Private data for the manager. */
+};
+
+struct _PurpleMediaOutputWindow
+{
+	gulong id;
+	PurpleMedia *media;
+	gchar *session_id;
+	gchar *participant;
+	gulong window_id;
+	GstElement *sink;
+};
+
+struct _PurpleMediaManagerPrivate
+{
+	GstElement *pipeline;
+	PurpleMediaCaps ui_caps;
+	GList *medias;
+	GList *elements;
+	GList *output_windows;
+	gulong next_output_window_id;
+
+	PurpleMediaElementInfo *video_src;
+	PurpleMediaElementInfo *video_sink;
+	PurpleMediaElementInfo *audio_src;
+	PurpleMediaElementInfo *audio_sink;
+};
+
+#define PURPLE_MEDIA_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerPrivate))
+#define PURPLE_MEDIA_ELEMENT_INFO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfoPrivate))
+
+static void purple_media_manager_class_init (PurpleMediaManagerClass *klass);
+static void purple_media_manager_init (PurpleMediaManager *media);
+static void purple_media_manager_finalize (GObject *object);
+
+static GObjectClass *parent_class = NULL;
+
+
+
+enum {
+	INIT_MEDIA,
+	LAST_SIGNAL
+};
+static guint purple_media_manager_signals[LAST_SIGNAL] = {0};
+#endif
+
+GType
+purple_media_manager_get_type()
+{
+#ifdef USE_VV
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof(PurpleMediaManagerClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) purple_media_manager_class_init,
+			NULL,
+			NULL,
+			sizeof(PurpleMediaManager),
+			0,
+			(GInstanceInitFunc) purple_media_manager_init,
+			NULL
+		};
+		type = g_type_register_static(G_TYPE_OBJECT, "PurpleMediaManager", &info, 0);
+	}
+	return type;
+#else
+	return G_TYPE_NONE;
+#endif
+}
+
+#ifdef USE_VV
+static void
+purple_media_manager_class_init (PurpleMediaManagerClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	parent_class = g_type_class_peek_parent(klass);
+	
+	gobject_class->finalize = purple_media_manager_finalize;
+
+	purple_media_manager_signals[INIT_MEDIA] = g_signal_new ("init-media",
+		G_TYPE_FROM_CLASS (klass),
+		G_SIGNAL_RUN_LAST,
+		0, NULL, NULL,
+		purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING,
+		G_TYPE_BOOLEAN, 3, PURPLE_TYPE_MEDIA,
+		G_TYPE_POINTER, G_TYPE_STRING);
+	g_type_class_add_private(klass, sizeof(PurpleMediaManagerPrivate));
+}
+
+static void
+purple_media_manager_init (PurpleMediaManager *media)
+{
+	media->priv = PURPLE_MEDIA_MANAGER_GET_PRIVATE(media);
+	media->priv->medias = NULL;
+	media->priv->next_output_window_id = 1;
+
+	purple_prefs_add_none("/purple/media");
+	purple_prefs_add_none("/purple/media/audio");
+	purple_prefs_add_none("/purple/media/audio/volume");
+	purple_prefs_add_int("/purple/media/audio/volume/input", 10);
+	purple_prefs_add_int("/purple/media/audio/volume/output", 10);
+}
+
+static void
+purple_media_manager_finalize (GObject *media)
+{
+	PurpleMediaManagerPrivate *priv = PURPLE_MEDIA_MANAGER_GET_PRIVATE(media);
+	for (; priv->medias; priv->medias =
+			g_list_delete_link(priv->medias, priv->medias)) {
+		g_object_unref(priv->medias->data);
+	}
+	for (; priv->elements; priv->elements =
+			g_list_delete_link(priv->elements, priv->elements)) {
+		g_object_unref(priv->elements->data);
+	}
+	parent_class->finalize(media);
+}
+#endif
+
+PurpleMediaManager *
+purple_media_manager_get()
+{
+#ifdef USE_VV
+	static PurpleMediaManager *manager = NULL;
+
+	if (manager == NULL)
+		manager = PURPLE_MEDIA_MANAGER(g_object_new(purple_media_manager_get_type(), NULL));
+	return manager;
+#else
+	return NULL;
+#endif
+}
+
+#ifdef USE_VV
+static gboolean
+pipeline_bus_call(GstBus *bus, GstMessage *msg, PurpleMediaManager *manager)
+{
+	switch(GST_MESSAGE_TYPE(msg)) {
+		case GST_MESSAGE_EOS:
+			purple_debug_info("mediamanager", "End of Stream\n");
+			break;
+		case GST_MESSAGE_ERROR: {
+			gchar *debug = NULL;
+			GError *err = NULL;
+
+			gst_message_parse_error(msg, &err, &debug);
+
+			purple_debug_error("mediamanager",
+					"gst pipeline error: %s\n",
+					err->message);
+			g_error_free(err);
+
+			if (debug) {
+				purple_debug_error("mediamanager",
+						"Debug details: %s\n", debug);
+				g_free (debug);
+			}
+			break;
+		}
+		default:
+			break;
+	}
+	return TRUE;
+}
+#endif
+
+#ifdef USE_GSTREAMER
+GstElement *
+purple_media_manager_get_pipeline(PurpleMediaManager *manager)
+{
+#ifdef USE_VV
+	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), NULL);
+
+	if (manager->priv->pipeline == NULL) {
+		FsElementAddedNotifier *notifier;
+		gchar *filename;
+		GError *err = NULL;
+		GKeyFile *keyfile;
+		GstBus *bus;
+		manager->priv->pipeline = gst_pipeline_new(NULL);
+
+		bus = gst_pipeline_get_bus(
+				GST_PIPELINE(manager->priv->pipeline));
+		gst_bus_add_signal_watch(GST_BUS(bus));
+		g_signal_connect(G_OBJECT(bus), "message",
+				G_CALLBACK(pipeline_bus_call), manager);
+		gst_bus_set_sync_handler(bus,
+				gst_bus_sync_signal_handler, NULL);
+		gst_object_unref(bus);
+
+		filename = g_build_filename(purple_user_dir(),
+				"fs-element.conf", NULL);
+		keyfile = g_key_file_new();
+		if (!g_key_file_load_from_file(keyfile, filename,
+				G_KEY_FILE_NONE, &err)) {
+			if (err->code == 4)
+				purple_debug_info("mediamanager",
+						"Couldn't read "
+						"fs-element.conf: %s\n",
+						err->message);
+			else
+				purple_debug_error("mediamanager",
+						"Error reading "
+						"fs-element.conf: %s\n",
+						err->message);
+			g_error_free(err);
+		}
+		g_free(filename);
+
+		/* Hack to make alsasrc stop messing up audio timestamps */
+		if (!g_key_file_has_key(keyfile,
+				"alsasrc", "slave-method", NULL)) {
+			g_key_file_set_integer(keyfile,
+					"alsasrc", "slave-method", 2);
+		}
+
+		notifier = fs_element_added_notifier_new();
+		fs_element_added_notifier_add(notifier,
+				GST_BIN(manager->priv->pipeline));
+		fs_element_added_notifier_set_properties_from_keyfile(
+				notifier, keyfile);
+
+		gst_element_set_state(manager->priv->pipeline,
+				GST_STATE_PLAYING);
+	}
+
+	return manager->priv->pipeline;
+#else
+	return NULL;
+#endif
+}
+#endif /* USE_GSTREAMER */
+
+PurpleMedia *
+purple_media_manager_create_media(PurpleMediaManager *manager,
+				  PurpleAccount *account,
+				  const char *conference_type,
+				  const char *remote_user,
+				  gboolean initiator)
+{
+#ifdef USE_VV
+	PurpleMedia *media;
+	FsConference *conference = FS_CONFERENCE(gst_element_factory_make(conference_type, NULL));
+	GstStateChangeReturn ret;
+	gboolean signal_ret;
+
+	if (conference == NULL) {
+		purple_conv_present_error(remote_user, account,
+					  _("Error creating conference."));
+		purple_debug_error("media", "Conference == NULL\n");
+		return NULL;
+	}
+
+	media = PURPLE_MEDIA(g_object_new(purple_media_get_type(),
+			     "manager", manager,
+			     "account", account,
+			     "conference", conference,
+			     "initiator", initiator,
+			     NULL));
+
+	ret = gst_element_set_state(GST_ELEMENT(conference), GST_STATE_PLAYING);
+
+	if (ret == GST_STATE_CHANGE_FAILURE) {
+		purple_conv_present_error(remote_user, account,
+					  _("Error creating conference."));
+		purple_debug_error("media", "Failed to start conference.\n");
+		g_object_unref(media);
+		return NULL;
+	}
+
+	g_signal_emit(manager, purple_media_manager_signals[INIT_MEDIA], 0,
+			media, account, remote_user, &signal_ret);
+
+	if (signal_ret == FALSE) {
+		g_object_unref(media);
+		return NULL;
+	}
+
+	manager->priv->medias = g_list_append(manager->priv->medias, media);
+	return media;
+#else
+	return NULL;
+#endif
+}
+
+GList *
+purple_media_manager_get_media(PurpleMediaManager *manager)
+{
+#ifdef USE_VV
+	return manager->priv->medias;
+#else
+	return NULL;
+#endif
+}
+
+GList *
+purple_media_manager_get_media_by_account(PurpleMediaManager *manager,
+		PurpleAccount *account)
+{
+#ifdef USE_VV
+	GList *media = NULL;
+	GList *iter;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), NULL);
+
+	iter = manager->priv->medias;
+	for (; iter; iter = g_list_next(iter)) {
+		if (purple_media_get_account(iter->data) == account) {
+			media = g_list_prepend(media, iter->data);
+		}
+	}
+
+	return media;
+#else
+	return NULL;
+#endif
+}
+
+void
+purple_media_manager_remove_media(PurpleMediaManager *manager,
+				  PurpleMedia *media)
+{
+#ifdef USE_VV
+	GList *list = g_list_find(manager->priv->medias, media);
+	if (list)
+		manager->priv->medias =
+			g_list_delete_link(manager->priv->medias, list);
+#endif
+}
+
+#ifdef USE_VV
+static void
+request_pad_unlinked_cb(GstPad *pad, GstPad *peer, gpointer user_data)
+{
+	GstElement *parent = GST_ELEMENT_PARENT(pad);
+	GstIterator *iter;
+	GstPad *remaining_pad;
+	GstIteratorResult result;
+
+	gst_element_release_request_pad(GST_ELEMENT_PARENT(pad), pad);
+	iter = gst_element_iterate_src_pads(parent);
+
+	result = gst_iterator_next(iter, (gpointer)&remaining_pad);
+
+	if (result == GST_ITERATOR_DONE) {
+		gst_element_set_locked_state(parent, TRUE);
+		gst_element_set_state(parent, GST_STATE_NULL);
+		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(parent)), parent);
+	} else if (result == GST_ITERATOR_OK) {
+		gst_object_unref(remaining_pad);
+	}
+
+	gst_iterator_free(iter);
+}
+#endif
+
+#ifdef USE_GSTREAMER
+GstElement *
+purple_media_manager_get_element(PurpleMediaManager *manager,
+		PurpleMediaSessionType type, PurpleMedia *media,
+		const gchar *session_id, const gchar *participant)
+{
+#ifdef USE_VV
+	GstElement *ret = NULL;
+	PurpleMediaElementInfo *info = NULL;
+	PurpleMediaElementType element_type;
+
+	if (type & PURPLE_MEDIA_SEND_AUDIO)
+		info = manager->priv->audio_src;
+	else if (type & PURPLE_MEDIA_RECV_AUDIO)
+		info = manager->priv->audio_sink;
+	else if (type & PURPLE_MEDIA_SEND_VIDEO)
+		info = manager->priv->video_src;
+	else if (type & PURPLE_MEDIA_RECV_VIDEO)
+		info = manager->priv->video_sink;
+
+	if (info == NULL)
+		return NULL;
+
+	element_type = purple_media_element_info_get_element_type(info);
+
+	if (element_type & PURPLE_MEDIA_ELEMENT_UNIQUE &&
+			element_type & PURPLE_MEDIA_ELEMENT_SRC) {
+		GstElement *tee;
+		GstPad *pad;
+		GstPad *ghost;
+		gchar *id = purple_media_element_info_get_id(info);
+
+		ret = gst_bin_get_by_name(GST_BIN(
+				purple_media_manager_get_pipeline(
+				manager)), id);
+
+		if (ret == NULL) {
+			GstElement *bin, *fakesink;
+			ret = purple_media_element_info_call_create(info,
+					media, session_id, participant);
+			bin = gst_bin_new(id);
+			tee = gst_element_factory_make("tee", "tee");
+			gst_bin_add_many(GST_BIN(bin), ret, tee, NULL);
+			gst_element_link(ret, tee);
+
+			/*
+			 * This shouldn't be necessary, but it stops it from
+			 * giving a not-linked error upon destruction
+			 */
+			fakesink = gst_element_factory_make("fakesink", NULL);
+			g_object_set(fakesink, "sync", FALSE, NULL);
+			gst_bin_add(GST_BIN(bin), fakesink);
+			gst_element_link(tee, fakesink);
+
+			ret = bin;
+			gst_object_ref(ret);
+			gst_bin_add(GST_BIN(purple_media_manager_get_pipeline(
+					manager)), ret);
+		}
+		g_free(id);
+
+		tee = gst_bin_get_by_name(GST_BIN(ret), "tee");
+		pad = gst_element_get_request_pad(tee, "src%d");
+		gst_object_unref(tee);
+		ghost = gst_ghost_pad_new(NULL, pad);
+		gst_object_unref(pad);
+		g_signal_connect(GST_PAD(ghost), "unlinked",
+				G_CALLBACK(request_pad_unlinked_cb), NULL);
+		gst_pad_set_active(ghost, TRUE);
+		gst_element_add_pad(ret, ghost);
+	} else {
+		ret = purple_media_element_info_call_create(info,
+				media, session_id, participant);
+	}
+
+	if (ret == NULL)
+		purple_debug_error("media", "Error creating source or sink\n");
+
+	return ret;
+#else
+	return NULL;
+#endif
+}
+
+PurpleMediaElementInfo *
+purple_media_manager_get_element_info(PurpleMediaManager *manager,
+		const gchar *id)
+{
+#ifdef USE_VV
+	GList *iter;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), NULL);
+
+	iter = manager->priv->elements;
+
+	for (; iter; iter = g_list_next(iter)) {
+		gchar *element_id =
+				purple_media_element_info_get_id(iter->data);
+		if (!strcmp(element_id, id)) {
+			g_free(element_id);
+			g_object_ref(iter->data);
+			return iter->data;
+		}
+		g_free(element_id);
+	}
+#endif
+
+	return NULL;
+}
+
+gboolean
+purple_media_manager_register_element(PurpleMediaManager *manager,
+		PurpleMediaElementInfo *info)
+{
+#ifdef USE_VV
+	PurpleMediaElementInfo *info2;
+	gchar *id;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), FALSE);
+	g_return_val_if_fail(info != NULL, FALSE);
+
+	id = purple_media_element_info_get_id(info);
+	info2 = purple_media_manager_get_element_info(manager, id);
+	g_free(id);
+
+	if (info2 != NULL) {
+		g_object_unref(info2);
+		return FALSE;
+	}
+
+	manager->priv->elements =
+			g_list_prepend(manager->priv->elements, info);
+	return TRUE;
+#else
+	return FALSE;
+#endif
+}
+
+gboolean
+purple_media_manager_unregister_element(PurpleMediaManager *manager,
+		const gchar *id)
+{
+#ifdef USE_VV
+	PurpleMediaElementInfo *info;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), FALSE);
+
+	info = purple_media_manager_get_element_info(manager, id);
+
+	if (info == NULL) {
+		g_object_unref(info);
+		return FALSE;
+	}
+
+	if (manager->priv->audio_src == info)
+		manager->priv->audio_src = NULL;
+	if (manager->priv->audio_sink == info)
+		manager->priv->audio_sink = NULL;
+	if (manager->priv->video_src == info)
+		manager->priv->video_src = NULL;
+	if (manager->priv->video_sink == info)
+		manager->priv->video_sink = NULL;
+
+	manager->priv->elements = g_list_remove(
+			manager->priv->elements, info);
+	g_object_unref(info);
+	return TRUE;
+#else
+	return FALSE;
+#endif
+}
+
+gboolean
+purple_media_manager_set_active_element(PurpleMediaManager *manager,
+		PurpleMediaElementInfo *info)
+{
+#ifdef USE_VV
+	PurpleMediaElementInfo *info2;
+	PurpleMediaElementType type;
+	gboolean ret = FALSE;
+	gchar *id;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), FALSE);
+	g_return_val_if_fail(info != NULL, FALSE);
+
+	id = purple_media_element_info_get_id(info);
+	info2 = purple_media_manager_get_element_info(manager, id);
+	g_free(id);
+
+	if (info2 == NULL)
+		purple_media_manager_register_element(manager, info);
+	else
+		g_object_unref(info2);
+
+	type = purple_media_element_info_get_element_type(info);
+
+	if (type & PURPLE_MEDIA_ELEMENT_SRC) {
+		if (type & PURPLE_MEDIA_ELEMENT_AUDIO) {
+			manager->priv->audio_src = info;
+			ret = TRUE;
+		}
+		if (type & PURPLE_MEDIA_ELEMENT_VIDEO) {
+			manager->priv->video_src = info;
+			ret = TRUE;
+		}
+	}
+	if (type & PURPLE_MEDIA_ELEMENT_SINK) {
+		if (type & PURPLE_MEDIA_ELEMENT_AUDIO) {
+			manager->priv->audio_sink = info;
+			ret = TRUE;
+		}
+		if (type & PURPLE_MEDIA_ELEMENT_VIDEO) {
+			manager->priv->video_sink = info;
+			ret = TRUE;
+		}
+	}
+
+	return ret;
+#else
+	return FALSE;
+#endif
+}
+
+PurpleMediaElementInfo *
+purple_media_manager_get_active_element(PurpleMediaManager *manager,
+		PurpleMediaElementType type)
+{
+#ifdef USE_VV
+	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), NULL);
+
+	if (type & PURPLE_MEDIA_ELEMENT_SRC) {
+		if (type & PURPLE_MEDIA_ELEMENT_AUDIO)
+			return manager->priv->audio_src;
+		else if (type & PURPLE_MEDIA_ELEMENT_VIDEO)
+			return manager->priv->video_src;
+	} else if (type & PURPLE_MEDIA_ELEMENT_SINK) {
+		if (type & PURPLE_MEDIA_ELEMENT_AUDIO)
+			return manager->priv->audio_sink;
+		else if (type & PURPLE_MEDIA_ELEMENT_VIDEO)
+			return manager->priv->video_sink;
+	}
+#endif
+
+	return NULL;
+}
+#endif /* USE_GSTREAMER */
+
+#ifdef USE_VV
+static void
+window_id_cb(GstBus *bus, GstMessage *msg, PurpleMediaOutputWindow *ow)
+{
+	GstElement *sink;
+
+	if (GST_MESSAGE_TYPE(msg) != GST_MESSAGE_ELEMENT ||
+			!gst_structure_has_name(msg->structure,
+			"prepare-xwindow-id"))
+		return;
+
+	sink = GST_ELEMENT(GST_MESSAGE_SRC(msg));
+	while (sink != ow->sink) {
+		if (sink == NULL)
+			return;
+		sink = GST_ELEMENT_PARENT(sink);
+	}
+
+	g_signal_handlers_disconnect_matched(bus, G_SIGNAL_MATCH_FUNC
+			| G_SIGNAL_MATCH_DATA, 0, 0, NULL,
+			window_id_cb, ow);
+
+	gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(
+			GST_MESSAGE_SRC(msg)), ow->window_id);
+}
+#endif
+
+gboolean
+purple_media_manager_create_output_window(PurpleMediaManager *manager,
+		PurpleMedia *media, const gchar *session_id,
+		const gchar *participant)
+{
+#ifdef USE_VV
+	GList *iter;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+
+	iter = manager->priv->output_windows;
+	for(; iter; iter = g_list_next(iter)) {
+		PurpleMediaOutputWindow *ow = iter->data;
+
+		if (ow->sink == NULL && ow->media == media &&
+				((participant != NULL &&
+				ow->participant != NULL &&
+				!strcmp(participant, ow->participant)) ||
+				(participant == ow->participant)) &&
+				!strcmp(session_id, ow->session_id)) {
+			GstBus *bus;
+			GstElement *queue, *colorspace;
+			GstElement *tee = purple_media_get_tee(media,
+					session_id, participant);
+
+			if (tee == NULL)
+				continue;
+
+			queue = gst_element_factory_make(
+					"queue", NULL);
+			colorspace = gst_element_factory_make(
+					"ffmpegcolorspace", NULL);
+			ow->sink = purple_media_manager_get_element(
+					manager, PURPLE_MEDIA_RECV_VIDEO,
+					ow->media, ow->session_id,
+					ow->participant);
+
+			if (participant == NULL) {
+				/* aka this is a preview sink */
+				GObjectClass *klass =
+						G_OBJECT_GET_CLASS(ow->sink);
+				if (g_object_class_find_property(klass,
+						"sync"))
+					g_object_set(G_OBJECT(ow->sink),
+							"sync", "FALSE", NULL);
+				if (g_object_class_find_property(klass,
+						"async"))
+					g_object_set(G_OBJECT(ow->sink),
+							"async", FALSE, NULL);
+			}
+
+			gst_bin_add_many(GST_BIN(GST_ELEMENT_PARENT(tee)),
+					queue, colorspace, ow->sink, NULL);
+
+			bus = gst_pipeline_get_bus(GST_PIPELINE(
+					manager->priv->pipeline));
+			g_signal_connect(bus, "sync-message::element",
+					G_CALLBACK(window_id_cb), ow);
+			gst_object_unref(bus);
+
+			gst_element_set_state(ow->sink, GST_STATE_PLAYING);
+			gst_element_set_state(colorspace, GST_STATE_PLAYING);
+			gst_element_set_state(queue, GST_STATE_PLAYING);
+			gst_element_link(colorspace, ow->sink);
+			gst_element_link(queue, colorspace);
+			gst_element_link(tee, queue);
+		}
+	}
+	return TRUE;
+#else
+	return FALSE;
+#endif
+}
+
+gulong
+purple_media_manager_set_output_window(PurpleMediaManager *manager,
+		PurpleMedia *media, const gchar *session_id,
+		const gchar *participant, gulong window_id)
+{
+#ifdef USE_VV
+	PurpleMediaOutputWindow *output_window;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), FALSE);
+	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+
+	output_window = g_new0(PurpleMediaOutputWindow, 1);
+	output_window->id = manager->priv->next_output_window_id++;
+	output_window->media = media;
+	output_window->session_id = g_strdup(session_id);
+	output_window->participant = g_strdup(participant);
+	output_window->window_id = window_id;
+
+	manager->priv->output_windows = g_list_prepend(
+			manager->priv->output_windows, output_window);
+
+	if (purple_media_get_tee(media, session_id, participant) != NULL)
+		purple_media_manager_create_output_window(manager,
+				media, session_id, participant);
+
+	return output_window->id;
+#else
+	return 0;
+#endif
+}
+
+gboolean
+purple_media_manager_remove_output_window(PurpleMediaManager *manager,
+		gulong output_window_id)
+{
+#ifdef USE_VV
+	PurpleMediaOutputWindow *output_window = NULL;
+	GList *iter;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), FALSE);
+
+	iter = manager->priv->output_windows;
+	for (; iter; iter = g_list_next(iter)) {
+		PurpleMediaOutputWindow *ow = iter->data;
+		if (ow->id == output_window_id) {
+			manager->priv->output_windows = g_list_delete_link(
+					manager->priv->output_windows, iter);
+			output_window = ow;
+			break;
+		}
+	}
+
+	if (output_window == NULL)
+		return FALSE;
+
+	if (output_window->sink != NULL) {
+		GstPad *pad = gst_element_get_static_pad(
+				output_window->sink, "sink");
+		GstPad *peer = gst_pad_get_peer(pad);
+		GstElement *colorspace = GST_ELEMENT_PARENT(peer), *queue;
+		gst_object_unref(pad);
+		gst_object_unref(peer);
+		pad = gst_element_get_static_pad(colorspace, "sink");
+		peer = gst_pad_get_peer(pad);
+		queue = GST_ELEMENT_PARENT(peer);
+		gst_object_unref(pad);
+		gst_object_unref(peer);
+		pad = gst_element_get_static_pad(queue, "sink");
+		peer = gst_pad_get_peer(pad);
+		gst_object_unref(pad);
+		if (peer != NULL)
+			gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer);
+		gst_element_set_locked_state(queue, TRUE);
+		gst_element_set_state(queue, GST_STATE_NULL);
+		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue);
+		gst_element_set_locked_state(colorspace, TRUE);
+		gst_element_set_state(colorspace, GST_STATE_NULL);
+		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(colorspace)), colorspace);
+		gst_element_set_locked_state(output_window->sink, TRUE);
+		gst_element_set_state(output_window->sink, GST_STATE_NULL);
+		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(output_window->sink)),
+				output_window->sink);
+	}
+
+	g_free(output_window->session_id);
+	g_free(output_window->participant);
+	g_free(output_window);
+
+	return TRUE;
+#else
+	return FALSE;
+#endif
+}
+
+void
+purple_media_manager_remove_output_windows(PurpleMediaManager *manager,
+		PurpleMedia *media, const gchar *session_id,
+		const gchar *participant)
+{
+#ifdef USE_VV
+	GList *iter;
+
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
+
+	iter = manager->priv->output_windows;
+
+	for (; iter;) {
+		PurpleMediaOutputWindow *ow = iter->data;
+		iter = g_list_next(iter);
+
+	if (media == ow->media &&
+			((session_id != NULL && ow->session_id != NULL &&
+			!strcmp(session_id, ow->session_id)) ||
+			(session_id == ow->session_id)) &&
+			((participant != NULL && ow->participant != NULL &&
+			!strcmp(participant, ow->participant)) ||
+			(participant == ow->participant)))
+		purple_media_manager_remove_output_window(
+				manager, ow->id);
+	}
+#endif
+}
+
+void
+purple_media_manager_set_ui_caps(PurpleMediaManager *manager,
+		PurpleMediaCaps caps)
+{
+#ifdef USE_VV
+	g_return_if_fail(PURPLE_IS_MEDIA_MANAGER(manager));
+	manager->priv->ui_caps = caps;
+#endif
+}
+
+PurpleMediaCaps
+purple_media_manager_get_ui_caps(PurpleMediaManager *manager)
+{
+#ifdef USE_VV
+	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager),
+			PURPLE_MEDIA_CAPS_NONE);
+	return manager->priv->ui_caps;
+#else
+	return PURPLE_MEDIA_CAPS_NONE;
+#endif
+}
+
+#ifdef USE_GSTREAMER
+
+/*
+ * PurpleMediaElementType
+ */
+
+GType
+purple_media_element_type_get_type()
+{
+	static GType type = 0;
+	if (type == 0) {
+		static const GFlagsValue values[] = {
+			{ PURPLE_MEDIA_ELEMENT_NONE,
+				"PURPLE_MEDIA_ELEMENT_NONE", "none" },
+			{ PURPLE_MEDIA_ELEMENT_AUDIO,
+				"PURPLE_MEDIA_ELEMENT_AUDIO", "audio" },
+			{ PURPLE_MEDIA_ELEMENT_VIDEO,
+				"PURPLE_MEDIA_ELEMENT_VIDEO", "video" },
+			{ PURPLE_MEDIA_ELEMENT_AUDIO_VIDEO,
+				"PURPLE_MEDIA_ELEMENT_AUDIO_VIDEO",
+				"audio-video" },
+			{ PURPLE_MEDIA_ELEMENT_NO_SRCS,
+				"PURPLE_MEDIA_ELEMENT_NO_SRCS", "no-srcs" },
+			{ PURPLE_MEDIA_ELEMENT_ONE_SRC,
+				"PURPLE_MEDIA_ELEMENT_ONE_SRC", "one-src" },
+			{ PURPLE_MEDIA_ELEMENT_MULTI_SRC,
+				"PURPLE_MEDIA_ELEMENT_MULTI_SRC",
+				"multi-src" },
+			{ PURPLE_MEDIA_ELEMENT_REQUEST_SRC,
+				"PURPLE_MEDIA_ELEMENT_REQUEST_SRC",
+				"request-src" },
+			{ PURPLE_MEDIA_ELEMENT_NO_SINKS,
+				"PURPLE_MEDIA_ELEMENT_NO_SINKS", "no-sinks" },
+			{ PURPLE_MEDIA_ELEMENT_ONE_SINK,
+				"PURPLE_MEDIA_ELEMENT_ONE_SINK", "one-sink" },
+			{ PURPLE_MEDIA_ELEMENT_MULTI_SINK,
+				"PURPLE_MEDIA_ELEMENT_MULTI_SINK",
+				"multi-sink" },
+			{ PURPLE_MEDIA_ELEMENT_REQUEST_SINK,
+				"PURPLE_MEDIA_ELEMENT_REQUEST_SINK",
+				"request-sink" },
+			{ PURPLE_MEDIA_ELEMENT_UNIQUE,
+				"PURPLE_MEDIA_ELEMENT_UNIQUE", "unique" },
+			{ PURPLE_MEDIA_ELEMENT_SRC,
+				"PURPLE_MEDIA_ELEMENT_SRC", "src" },
+			{ PURPLE_MEDIA_ELEMENT_SINK,
+				"PURPLE_MEDIA_ELEMENT_SINK", "sink" },
+			{ 0, NULL, NULL }
+		};
+		type = g_flags_register_static(
+				"PurpleMediaElementType", values);
+	}
+	return type;
+}
+
+/*
+ * PurpleMediaElementInfo
+ */
+
+struct _PurpleMediaElementInfoClass
+{
+	GObjectClass parent_class;
+};
+
+struct _PurpleMediaElementInfo
+{
+	GObject parent;
+};
+
+#ifdef USE_VV
+struct _PurpleMediaElementInfoPrivate
+{
+	gchar *id;
+	gchar *name;
+	PurpleMediaElementType type;
+	PurpleMediaElementCreateCallback create;
+};
+
+enum {
+	PROP_0,
+	PROP_ID,
+	PROP_NAME,
+	PROP_TYPE,
+	PROP_CREATE_CB,
+};
+
+static void
+purple_media_element_info_init(PurpleMediaElementInfo *info)
+{
+	PurpleMediaElementInfoPrivate *priv =
+			PURPLE_MEDIA_ELEMENT_INFO_GET_PRIVATE(info);
+	priv->id = NULL;
+	priv->name = NULL;
+	priv->type = PURPLE_MEDIA_ELEMENT_NONE;
+	priv->create = NULL;
+}
+
+static void
+purple_media_element_info_finalize(GObject *info)
+{
+	PurpleMediaElementInfoPrivate *priv =
+			PURPLE_MEDIA_ELEMENT_INFO_GET_PRIVATE(info);
+	g_free(priv->id);
+	g_free(priv->name);
+}
+
+static void
+purple_media_element_info_set_property (GObject *object, guint prop_id,
+		const GValue *value, GParamSpec *pspec)
+{
+	PurpleMediaElementInfoPrivate *priv;
+	g_return_if_fail(PURPLE_IS_MEDIA_ELEMENT_INFO(object));
+
+	priv = PURPLE_MEDIA_ELEMENT_INFO_GET_PRIVATE(object);
+
+	switch (prop_id) {
+		case PROP_ID:
+			g_free(priv->id);
+			priv->id = g_value_dup_string(value);
+			break;
+		case PROP_NAME:
+			g_free(priv->name);
+			priv->name = g_value_dup_string(value);
+			break;
+		case PROP_TYPE: {
+			priv->type = g_value_get_flags(value);
+			break;
+		}
+		case PROP_CREATE_CB:
+			priv->create = g_value_get_pointer(value);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID(
+					object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+purple_media_element_info_get_property (GObject *object, guint prop_id,
+		GValue *value, GParamSpec *pspec)
+{
+	PurpleMediaElementInfoPrivate *priv;
+	g_return_if_fail(PURPLE_IS_MEDIA_ELEMENT_INFO(object));
+	
+	priv = PURPLE_MEDIA_ELEMENT_INFO_GET_PRIVATE(object);
+
+	switch (prop_id) {
+		case PROP_ID:
+			g_value_set_string(value, priv->id);
+			break;
+		case PROP_NAME:
+			g_value_set_string(value, priv->name);
+			break;
+		case PROP_TYPE:
+			g_value_set_flags(value, priv->type);
+			break;
+		case PROP_CREATE_CB:
+			g_value_set_pointer(value, priv->create);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID(
+					object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+purple_media_element_info_class_init(PurpleMediaElementInfoClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	
+	gobject_class->finalize = purple_media_element_info_finalize;
+	gobject_class->set_property = purple_media_element_info_set_property;
+	gobject_class->get_property = purple_media_element_info_get_property;
+
+	g_object_class_install_property(gobject_class, PROP_ID,
+			g_param_spec_string("id",
+			"ID",
+			"The unique identifier of the element.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_NAME,
+			g_param_spec_string("name",
+			"Name",
+			"The friendly/display name of this element.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_TYPE,
+			g_param_spec_flags("type",
+			"Element Type",
+			"The type of element this is.",
+			PURPLE_TYPE_MEDIA_ELEMENT_TYPE,
+			PURPLE_MEDIA_ELEMENT_NONE,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_CREATE_CB,
+			g_param_spec_pointer("create-cb",
+			"Create Callback",
+			"The function called to create this element.",
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_type_class_add_private(klass, sizeof(PurpleMediaElementInfoPrivate));
+}
+
+G_DEFINE_TYPE(PurpleMediaElementInfo,
+		purple_media_element_info, G_TYPE_OBJECT);
+#else
+GType
+purple_media_element_info_get_type()
+{
+	return G_TYPE_NONE;
+}
+#endif
+
+gchar *
+purple_media_element_info_get_id(PurpleMediaElementInfo *info)
+{
+#ifdef USE_VV
+	gchar *id;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_ELEMENT_INFO(info), NULL);
+	g_object_get(info, "id", &id, NULL);
+	return id;
+#else
+	return NULL;
+#endif
+}
+
+gchar *
+purple_media_element_info_get_name(PurpleMediaElementInfo *info)
+{
+#ifdef USE_VV
+	gchar *name;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_ELEMENT_INFO(info), NULL);
+	g_object_get(info, "name", &name, NULL);
+	return name;
+#else
+	return NULL;
+#endif
+}
+
+PurpleMediaElementType
+purple_media_element_info_get_element_type(PurpleMediaElementInfo *info)
+{
+#ifdef USE_VV
+	PurpleMediaElementType type;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_ELEMENT_INFO(info),
+			PURPLE_MEDIA_ELEMENT_NONE);
+	g_object_get(info, "type", &type, NULL);
+	return type;
+#else
+	return PURPLE_MEDIA_ELEMENT_NONE;
+#endif
+}
+
+GstElement *
+purple_media_element_info_call_create(PurpleMediaElementInfo *info,
+		PurpleMedia *media, const gchar *session_id,
+		const gchar *participant)
+{
+#ifdef USE_VV
+	PurpleMediaElementCreateCallback create;
+	g_return_val_if_fail(PURPLE_IS_MEDIA_ELEMENT_INFO(info), NULL);
+	g_object_get(info, "create-cb", &create, NULL);
+	if (create)
+		return create(media, session_id, participant);
+#endif
+	return NULL;
+}
+
+#endif /* USE_GSTREAMER */
+
diff --git a/libpurple/mediamanager.h b/libpurple/mediamanager.h
new file mode 100644
index 0000000000..8fdf06662f
--- /dev/null
+++ b/libpurple/mediamanager.h
@@ -0,0 +1,223 @@
+/**
+ * @file mediamanager.h Media Manager API
+ * @ingroup core
+ */
+
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _PURPLE_MEDIA_MANAGER_H_
+#define _PURPLE_MEDIA_MANAGER_H_
+
+#include <glib.h>
+#include <glib-object.h>
+
+/** @copydoc _PurpleMediaManager */
+typedef struct _PurpleMediaManager PurpleMediaManager;
+/** @copydoc _PurpleMediaManagerClass */
+typedef struct _PurpleMediaManagerClass PurpleMediaManagerClass;
+
+#include "account.h"
+#include "media.h"
+
+G_BEGIN_DECLS
+
+#define PURPLE_TYPE_MEDIA_MANAGER            (purple_media_manager_get_type())
+#define PURPLE_MEDIA_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManager))
+#define PURPLE_MEDIA_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass))
+#define PURPLE_IS_MEDIA_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_MANAGER))
+#define PURPLE_IS_MEDIA_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_MANAGER))
+#define PURPLE_MEDIA_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass))
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**************************************************************************/
+/** @name Media Manager API                                              */
+/**************************************************************************/
+/*@{*/
+
+/**
+ * Gets the media manager's GType.
+ *
+ * @return The media manager's GType.
+ *
+ * @since 2.6.0
+ */
+GType purple_media_manager_get_type(void);
+
+/**
+ * Gets the "global" media manager object. It's created if it doesn't already exist.
+ *
+ * @return The "global" instance of the media manager object.
+ *
+ * @since 2.6.0
+ */
+PurpleMediaManager *purple_media_manager_get(void);
+
+/**
+ * Creates a media session.
+ *
+ * @param manager The media manager to create the session under.
+ * @param account The account to create the session on.
+ * @param conference_type The conference type to feed into Farsight2.
+ * @param remote_user The remote user to initiate the session with.
+ *
+ * @return A newly created media session.
+ *
+ * @since 2.6.0
+ */
+PurpleMedia *purple_media_manager_create_media(PurpleMediaManager *manager,
+						PurpleAccount *account,
+						const char *conference_type,
+						const char *remote_user,
+						gboolean initiator);
+
+/**
+ * Gets all of the media sessions.
+ *
+ * @param manager The media manager to get all of the sessions from.
+ *
+ * @return A list of all the media sessions.
+ *
+ * @since 2.6.0
+ */
+GList *purple_media_manager_get_media(PurpleMediaManager *manager);
+
+/**
+ * Gets all of the media sessions for a given account.
+ *
+ * @param manager The media manager to get the sessions from.
+ * @param account The account the sessions are on.
+ *
+ * @return A list of the media sessions on the given account.
+ *
+ * @since 2.6.0
+ */
+GList *purple_media_manager_get_media_by_account(
+		PurpleMediaManager *manager, PurpleAccount *account);
+
+/**
+ * Removes a media session from the media manager.
+ *
+ * @param manager The media manager to remove the media session from.
+ * @param media The media session to remove.
+ *
+ * @since 2.6.0
+ */
+void
+purple_media_manager_remove_media(PurpleMediaManager *manager,
+				  PurpleMedia *media);
+
+/**
+ * Signals that output windows should be created for the chosen stream.
+ *
+ * This shouldn't be called outside of mediamanager.c and media.c
+ *
+ * @param manager Manager the output windows are registered with.
+ * @param media Media session the output windows are registered for.
+ * @param session_id The session the output windows are registered with.
+ * @param participant The participant the output windows are registered with.
+ *
+ * @return TRUE if it succeeded, FALSE if it failed.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_media_manager_create_output_window(
+		PurpleMediaManager *manager, PurpleMedia *media,
+		const gchar *session_id, const gchar *participant);
+
+/**
+ * Registers a video output window to be created for a given stream.
+ *
+ * @param manager The manager to register the output window with.
+ * @param media The media instance to find the stream in.
+ * @param session_id The session the stream is associated with.
+ * @param participant The participant the stream is associated with.
+ * @param window_id The window ID to embed the video in.
+ *
+ * @return A unique ID to the registered output window, 0 if it failed.
+ *
+ * @since 2.6.0
+ */
+gulong purple_media_manager_set_output_window(PurpleMediaManager *manager,
+		PurpleMedia *media, const gchar *session_id,
+		const gchar *participant, gulong window_id);
+
+/**
+ * Remove a previously registerd output window.
+ *
+ * @param manager The manager the output window was registered with.
+ * @param output_window_id The ID of the output window.
+ *
+ * @return TRUE if it found the output window and was successful, else FALSE.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_media_manager_remove_output_window(
+		PurpleMediaManager *manager, gulong output_window_id);
+
+/**
+ * Remove all output windows for a given conference/session/participant/stream.
+ *
+ * @param manager The manager the output windows were registered with.
+ * @param media The media instance the output windows were registered for.
+ * @param session_id The session the output windows were registered for.
+ * @param participant The participant the output windows were registered for.
+ *
+ * @since 2.6.0
+ */
+void purple_media_manager_remove_output_windows(
+		PurpleMediaManager *manager, PurpleMedia *media,
+		const gchar *session_id, const gchar *participant);
+
+/**
+ * Sets which media caps the UI supports.
+ *
+ * @param manager The manager to set the caps on.
+ * @param caps The caps to set.
+ *
+ * @since 2.6.0
+ */
+void purple_media_manager_set_ui_caps(PurpleMediaManager *manager,
+		PurpleMediaCaps caps);
+
+/**
+ * Gets which media caps the UI supports.
+ *
+ * @param manager The manager to get caps from.
+ *
+ * @return caps The caps retrieved.
+ *
+ * @since 2.6.0
+ */
+PurpleMediaCaps purple_media_manager_get_ui_caps(PurpleMediaManager *manager);
+
+/*}@*/
+
+#ifdef __cplusplus
+}
+#endif
+
+G_END_DECLS
+
+#endif  /* _PURPLE_MEDIA_MANAGER_H_ */
diff --git a/libpurple/mime.c b/libpurple/mime.c
index 6dae7a5f08..46d0929284 100644
--- a/libpurple/mime.c
+++ b/libpurple/mime.c
@@ -25,9 +25,6 @@
 #include <string.h>
 
 #include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
-#include <glib/gstring.h>
 
 #include "internal.h"
 
@@ -113,7 +110,7 @@ static void
 fields_loadline(struct mime_fields *mf, const char *line, gsize len)
 {
 	/* split the line into key: value */
-	char *key, *val;
+	char *key, *newkey, *val;
 	char **tokens;
 
 	/* feh, need it to be NUL terminated */
@@ -129,17 +126,18 @@ fields_loadline(struct mime_fields *mf, const char *line, gsize len)
 
 	/* normalize whitespace (sorta) and trim on key and value */
 	tokens = g_strsplit(key, "\t\r\n", 0);
-	key = g_strjoinv("", tokens);
-	key = g_strstrip(key);
+	newkey = g_strjoinv("", tokens);
+	g_strstrip(newkey);
 	g_strfreev(tokens);
 
 	tokens = g_strsplit(val, "\t\r\n", 0);
 	val = g_strjoinv("", tokens);
-	val = g_strstrip(val);
+	g_strstrip(val);
 	g_strfreev(tokens);
 
-	fields_set(mf, key, val);
+	fields_set(mf, newkey, val);
 
+	g_free(newkey);
 	g_free(key);
 	g_free(val);
 }
@@ -405,7 +403,7 @@ doc_parts_load(PurpleMimeDocument *doc, const char *boundary, const char *buf, g
 	char *b = (char *) buf;
 	gsize n = len;
 
-	const char *bnd;
+	char *bnd;
 	gsize bl;
 
 	bnd = g_strdup_printf("--%s", boundary);
@@ -439,6 +437,8 @@ doc_parts_load(PurpleMimeDocument *doc, const char *boundary, const char *buf, g
 
 		b = tail;
 	}
+
+	g_free(bnd);
 }
 
 
diff --git a/libpurple/mime.h b/libpurple/mime.h
index fd4f43c62c..b568a49288 100644
--- a/libpurple/mime.h
+++ b/libpurple/mime.h
@@ -25,7 +25,6 @@
 #define _PURPLE_MIME_H
 
 #include <glib.h>
-#include <glib/glist.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libpurple/nat-pmp.c b/libpurple/nat-pmp.c
index be5bc66222..f58ae526e8 100644
--- a/libpurple/nat-pmp.c
+++ b/libpurple/nat-pmp.c
@@ -200,7 +200,7 @@ default_gw()
 
     if (!(buf = malloc(needed)))
 	{
-		purple_debug_warning("nat-pmp", "Failed to malloc %i\n", needed);
+		purple_debug_warning("nat-pmp", "Failed to malloc %" G_GSIZE_FORMAT "\n", needed);
 		return NULL;
     }
 
diff --git a/libpurple/network.c b/libpurple/network.c
index c9782b6731..559cff6516 100644
--- a/libpurple/network.c
+++ b/libpurple/network.c
@@ -48,6 +48,11 @@
 #include "prefs.h"
 #include "stun.h"
 #include "upnp.h"
+#include "dnsquery.h"
+
+#ifdef USE_IDN
+#include <idna.h>
+#endif
 
 /*
  * Calling sizeof(struct ifreq) isn't always correct on
@@ -100,6 +105,14 @@ static NMState nm_get_network_state(void);
 static gboolean force_online;
 #endif
 
+/* Cached IP addresses for STUN and TURN servers (set globally in prefs) */
+static gchar *stun_ip = NULL;
+static gchar *turn_ip = NULL;
+
+/* Keep track of port mappings done with UPnP and NAT-PMP */
+static GHashTable *upnp_port_mappings = NULL;
+static GHashTable *nat_pmp_port_mappings = NULL;
+
 const unsigned char *
 purple_network_ip_atoi(const char *ip)
 {
@@ -231,7 +244,7 @@ purple_network_set_upnp_port_mapping_cb(gboolean success, gpointer data)
 	/* listen_data->pnp_data = NULL; */
 
 	if (!success) {
-		purple_debug_info("network", "Couldn't create UPnP mapping\n");
+		purple_debug_warning("network", "Couldn't create UPnP mapping\n");
 		if (listen_data->retry) {
 			listen_data->retry = FALSE;
 			listen_data->adding = FALSE;
@@ -252,6 +265,15 @@ purple_network_set_upnp_port_mapping_cb(gboolean success, gpointer data)
 		return;
 	}
 
+	if (success) {
+		/* add port mapping to hash table */
+		gint *key = g_new(gint, 1);
+		gint *value = g_new(gint, 1);
+		*key = purple_network_get_port_from_fd(listen_data->listenfd);
+		*value = listen_data->socket_type;
+		g_hash_table_insert(upnp_port_mappings, key, value);
+	}
+
 	if (listen_data->cb)
 		listen_data->cb(listen_data->listenfd, listen_data->cb_data);
 
@@ -265,9 +287,16 @@ static gboolean
 purple_network_finish_pmp_map_cb(gpointer data)
 {
 	PurpleNetworkListenData *listen_data;
+	gint *key = g_new(gint, 1);
+	gint *value = g_new(gint, 1);
 
 	listen_data = data;
 
+	/* add port mapping to hash table */
+	*key = purple_network_get_port_from_fd(listen_data->listenfd);
+	*value = listen_data->socket_type;
+	g_hash_table_insert(nat_pmp_port_mappings, key, value);
+
 	if (listen_data->cb)
 		listen_data->cb(listen_data->listenfd, listen_data->cb_data);
 
@@ -298,7 +327,7 @@ purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkList
 	/*
 	 * Get a list of addresses on this machine.
 	 */
-	snprintf(serv, sizeof(serv), "%hu", port);
+	g_snprintf(serv, sizeof(serv), "%hu", port);
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_flags = AI_PASSIVE;
 	hints.ai_family = AF_UNSPEC;
@@ -723,6 +752,14 @@ nm_update_state(NMState state)
 		case NM_STATE_CONNECTED:
 			/* Call res_init in case DNS servers have changed */
 			res_init();
+			/* update STUN IP in case we it changed (theoretically we could
+			   have gone from IPv4 to IPv6, f.ex. or we were previously
+			   offline */
+			purple_network_set_stun_server(
+				purple_prefs_get_string("/purple/network/stun_server"));
+			purple_network_set_turn_server(
+				purple_prefs_get_string("/purple/network/turn_server"));
+			
 			if (ui_ops != NULL && ui_ops->network_connected != NULL)
 				ui_ops->network_connected();
 			break;
@@ -784,6 +821,93 @@ nm_dbus_name_owner_changed_cb(DBusGProxy *proxy, char *service, char *old_owner,
 
 #endif
 
+static void
+purple_network_ip_lookup_cb(GSList *hosts, gpointer data, 
+	const char *error_message)
+{
+	const gchar **ip = (const gchar **) data; 
+
+	if (error_message) {
+		purple_debug_error("network", "lookup of IP address failed: %s\n",
+			error_message);
+		g_slist_free(hosts);
+		return;
+	}
+
+	if (hosts && g_slist_next(hosts)) {
+		struct sockaddr *addr = g_slist_next(hosts)->data; 
+		char dst[INET6_ADDRSTRLEN];
+		
+		if (addr->sa_family == AF_INET6) {
+			inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr, 
+				dst, sizeof(dst));
+		} else {
+			inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr, 
+				dst, sizeof(dst));
+		}
+
+		*ip = g_strdup(dst);
+		purple_debug_info("network", "set IP address: %s\n", *ip);
+	}
+
+	while (hosts != NULL) {
+		hosts = g_slist_delete_link(hosts, hosts);
+		/* Free the address */
+		g_free(hosts->data);
+		hosts = g_slist_delete_link(hosts, hosts);
+	}
+}
+
+void
+purple_network_set_stun_server(const gchar *stun_server)
+{
+	if (stun_server && stun_server[0] != '\0') {
+		if (purple_network_is_available()) {
+			purple_debug_info("network", "running DNS query for STUN server\n");
+			purple_dnsquery_a(stun_server, 3478, purple_network_ip_lookup_cb,
+				&stun_ip);
+		} else {
+			purple_debug_info("network", 
+				"network is unavailable, don't try to update STUN IP");
+		}
+	} else if (stun_ip) {
+		g_free(stun_ip);
+		stun_ip = NULL;
+	}
+}
+
+void
+purple_network_set_turn_server(const gchar *turn_server)
+{
+	if (turn_server && turn_server[0] != '\0') {
+		if (purple_network_is_available()) {
+			purple_debug_info("network", "running DNS query for TURN server\n");
+			purple_dnsquery_a(turn_server, 
+				purple_prefs_get_int("/purple/network/turn_port"), 
+				purple_network_ip_lookup_cb, &turn_ip);
+		} else {
+			purple_debug_info("network", 
+				"network is unavailable, don't try to update TURN IP");
+		}
+	} else if (turn_ip) {
+		g_free(turn_ip);
+		turn_ip = NULL;
+	}
+}
+
+
+const gchar *
+purple_network_get_stun_ip(void)
+{
+	return stun_ip;
+}
+
+const gchar *
+purple_network_get_turn_ip(void)
+{
+	return turn_ip;
+}
+
 void *
 purple_network_get_handle(void)
 {
@@ -792,6 +916,87 @@ purple_network_get_handle(void)
 	return &handle;
 }
 
+static void
+purple_network_upnp_mapping_remove_cb(gboolean sucess, gpointer data)
+{
+	purple_debug_info("network", "done removing UPnP port mapping\n");
+}
+
+/* the reason for these functions to have these signatures is to be able to
+ use them for g_hash_table_foreach to clean remaining port mappings, which is
+ not yet done */
+static void
+purple_network_upnp_mapping_remove(gpointer key, gpointer value,
+	gpointer user_data)
+{
+	gint port = (gint) *((gint *) key);
+	gint protocol = (gint) *((gint *) value);
+	purple_debug_info("network", "removing UPnP port mapping for port %d\n",
+		port);
+	purple_upnp_remove_port_mapping(port, 
+		protocol == SOCK_STREAM ? "TCP" : "UDP", 
+		purple_network_upnp_mapping_remove_cb, NULL);
+	g_hash_table_remove(upnp_port_mappings, key);
+}
+
+static void
+purple_network_nat_pmp_mapping_remove(gpointer key, gpointer value,
+	gpointer user_data)
+{
+	gint port = (gint) *((gint *) key);
+	gint protocol = (gint) *((gint *) value);
+	purple_debug_info("network", "removing NAT-PMP port mapping for port %d\n",
+		port);
+	purple_pmp_destroy_map(
+		protocol == SOCK_STREAM ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP, 
+		port);
+	g_hash_table_remove(nat_pmp_port_mappings, key);
+}
+
+void
+purple_network_remove_port_mapping(gint fd)
+{
+	int port = purple_network_get_port_from_fd(fd);
+	gint *protocol = g_hash_table_lookup(upnp_port_mappings, &port);
+
+	if (protocol) {
+		purple_network_upnp_mapping_remove(&port, protocol, NULL);
+		g_hash_table_remove(upnp_port_mappings, protocol);
+	} else {
+		protocol = g_hash_table_lookup(nat_pmp_port_mappings, &port);
+		if (protocol) {
+			purple_network_nat_pmp_mapping_remove(&port, protocol, NULL);
+			g_hash_table_remove(nat_pmp_port_mappings, protocol);
+		}
+	}
+}
+
+int purple_network_convert_idn_to_ascii(const gchar *in, gchar **out)
+{
+#ifdef USE_IDN
+	char *tmp;
+	int ret;
+
+	g_return_val_if_fail(out != NULL, -1);
+
+	ret = idna_to_ascii_8z(in, &tmp, IDNA_USE_STD3_ASCII_RULES);
+	if (ret != IDNA_SUCCESS) {
+		*out = NULL;
+		return ret;
+	}
+
+	*out = g_strdup(tmp);
+	/* This *MUST* be freed with free, not g_free */
+	free(tmp);
+	return 0;
+#else
+	g_return_val_if_fail(out != NULL, -1);
+
+	*out = g_strdup(in);
+	return 0;
+#endif
+}
+
 void
 purple_network_init(void)
 {
@@ -816,6 +1021,11 @@ purple_network_init(void)
 #endif
 
 	purple_prefs_add_none  ("/purple/network");
+	purple_prefs_add_string("/purple/network/stun_server", "");
+	purple_prefs_add_string("/purple/network/turn_server", "");
+	purple_prefs_add_int   ("/purple/network/turn_port", 3478);
+	purple_prefs_add_string("/purple/network/turn_username", "");
+	purple_prefs_add_string("/purple/network/turn_password", "");
 	purple_prefs_add_bool  ("/purple/network/auto_ip", TRUE);
 	purple_prefs_add_string("/purple/network/public_ip", "");
 	purple_prefs_add_bool  ("/purple/network/map_ports", TRUE);
@@ -854,8 +1064,20 @@ purple_network_init(void)
 
 	purple_pmp_init();
 	purple_upnp_init();
+	
+	purple_network_set_stun_server(
+		purple_prefs_get_string("/purple/network/stun_server"));
+	purple_network_set_turn_server(
+		purple_prefs_get_string("/purple/network/turn_server"));
+
+	upnp_port_mappings = 
+		g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free);
+	nat_pmp_port_mappings =
+		g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free);
 }
 
+
+
 void
 purple_network_uninit(void)
 {
@@ -895,4 +1117,13 @@ purple_network_uninit(void)
 #endif
 	purple_signal_unregister(purple_network_get_handle(),
 							 "network-configuration-changed");
+	
+	if (stun_ip)
+		g_free(stun_ip);
+
+	g_hash_table_destroy(upnp_port_mappings);
+	g_hash_table_destroy(nat_pmp_port_mappings);
+
+	/* TODO: clean up remaining port mappings, note calling 
+	 purple_upnp_remove_port_mapping from here doesn't quite work... */
 }
diff --git a/libpurple/network.h b/libpurple/network.h
index 21b3a0835d..566a0c8a51 100644
--- a/libpurple/network.h
+++ b/libpurple/network.h
@@ -225,6 +225,67 @@ void purple_network_force_online(void);
  */
 void *purple_network_get_handle(void);
 
+/**	
+ * Update the STUN server IP given the host name
+ * Will result in a DNS query being executed asynchronous
+ * 
+ * @param stun_server The host name of the STUN server to set
+ * @since 2.6.0
+ */
+void purple_network_set_stun_server(const gchar *stun_server);
+	
+/**
+ * Get the IP address of the STUN server as a string representation
+ *
+ * @return the IP address
+ * @since 2.6.0
+ */
+const gchar *purple_network_get_stun_ip(void);
+	
+/**	
+ * Update the TURN server IP given the host name
+ * Will result in a DNS query being executed asynchronous
+ * 
+ * @param turn_server The host name of the TURN server to set
+ * @since 2.6.0
+ */
+void purple_network_set_turn_server(const gchar *turn_server);
+	
+/**
+ * Get the IP address of the STUN server as a string representation
+ *
+ * @return the IP address
+ * @since 2.6.0
+ */
+const gchar *purple_network_get_turn_ip(void);
+		
+/**
+ * Remove a port mapping (UPnP or NAT-PMP) associated with listening socket
+ *
+ * @param fd Socket to remove the port mapping for
+ * @since 2.6.0
+ */
+void purple_network_remove_port_mapping(gint fd);	
+
+/**
+ * Convert a UTF-8 domain name to ASCII in accordance with the IDNA
+ * specification. If libpurple is compiled without IDN support, this function
+ * copies the input into the output buffer.
+ *
+ * Because this function is used by DNS resolver child/threads, it uses no
+ * other libpurple API and is threadsafe.
+ *
+ * In general, a buffer of about 512 bytes is the appropriate size to use.
+ *
+ * @param in      The hostname to be converted.
+ * @param out     The output buffer where an allocated string will be returned.
+ *                The caller is responsible for freeing this.
+ * @returns       0 on success, -1 if the out is NULL, or an error code
+ *                that currently corresponds to the Idna_rc enum in libidn.
+ * @since 2.6.0
+ */
+int purple_network_convert_idn_to_ascii(const gchar *in, gchar **out);
+
 /**
  * Initializes the network subsystem.
  */
diff --git a/libpurple/notify.h b/libpurple/notify.h
index d82fe86215..ed770dd425 100644
--- a/libpurple/notify.h
+++ b/libpurple/notify.h
@@ -427,7 +427,9 @@ void *purple_notify_email(void *handle, const char *subject,
  * Displays a notification for multiple emails to the user.
  *
  * @param handle    The plugin or connection handle.
- * @param count     The number of emails.
+ * @param count     The number of emails.  '0' can be used to signify that
+ *                  the user has no unread emails and the UI should remove
+ *                  the mail notification.
  * @param detailed  @c TRUE if there is information for each email in the
  *                  arrays.
  * @param subjects  The array of subjects.
diff --git a/libpurple/ntlm.c b/libpurple/ntlm.c
index b7d3757e44..d551d02d2f 100644
--- a/libpurple/ntlm.c
+++ b/libpurple/ntlm.c
@@ -41,12 +41,12 @@ struct type1_message {
 	guint32 type;            /* 0x00000001 */
 	guint32 flags;           /* 0x0000b203 */
 
-	short   dom_len1;        /* domain string length */
-	short   dom_len2;        /* domain string length */
+	guint16 dom_len1;        /* domain string length */
+	guint16 dom_len2;        /* domain string length */
 	guint32 dom_off;         /* domain string offset */
 
-	short   host_len1;       /* host string length */
-	short   host_len2;       /* host string length */
+	guint16 host_len1;       /* host string length */
+	guint16 host_len2;       /* host string length */
 	guint32 host_off;        /* host string offset (always 0x00000020) */
 
 #if 0
@@ -59,47 +59,47 @@ struct type2_message {
 	guint8  protocol[8];     /* 'N', 'T', 'L', 'M', 'S', 'S', 'P', '\0'*/
 	guint32 type;            /* 0x00000002 */
 
-	short   msg_len1;        /* target name length */
-	short   msg_len2;        /* target name length */
-	guint32 msg_off;         /* target name offset (always 0x00000048) */
+	guint32 zero;
+	guint16 msg_len1;        /* target name length */
+	guint16 msg_len2;        /* target name length */
 
 	guint32 flags;           /* 0x00008201 */
 
 	guint8  nonce[8];        /* nonce */
-	guint8 context[8];
+	guint8  context[8];
 };
 
 struct type3_message {
 	guint8  protocol[8];     /* 'N', 'T', 'L', 'M', 'S', 'S', 'P', '\0'*/
 	guint32 type;            /* 0x00000003 */
 
-	short   lm_resp_len1;    /* LanManager response length (always 0x18)*/
-	short   lm_resp_len2;    /* LanManager response length (always 0x18)*/
+	guint16 lm_resp_len1;    /* LanManager response length (always 0x18)*/
+	guint16 lm_resp_len2;    /* LanManager response length (always 0x18)*/
 	guint32 lm_resp_off;     /* LanManager response offset */
 
-	short   nt_resp_len1;    /* NT response length (always 0x18) */
-	short   nt_resp_len2;    /* NT response length (always 0x18) */
+	guint16 nt_resp_len1;    /* NT response length (always 0x18) */
+	guint16 nt_resp_len2;    /* NT response length (always 0x18) */
 	guint32 nt_resp_off;     /* NT response offset */
 
-	short   dom_len1;        /* domain string length */
-	short   dom_len2;        /* domain string length */
+	guint16 dom_len1;        /* domain string length */
+	guint16 dom_len2;        /* domain string length */
 	guint32 dom_off;         /* domain string offset (always 0x00000040) */
 
-	short   user_len1;       /* username string length */
-	short   user_len2;       /* username string length */
+	guint16 user_len1;       /* username string length */
+	guint16 user_len2;       /* username string length */
 	guint32 user_off;        /* username string offset */
 
-	short   host_len1;       /* host string length */
-	short   host_len2;       /* host string length */
+	guint16 host_len1;       /* host string length */
+	guint16 host_len2;       /* host string length */
 	guint32 host_off;        /* host string offset */
 
-	short   sess_len1;
-	short	sess_len2;
+	guint16 sess_len1;
+	guint16 sess_len2;
 	guint32 sess_off;         /* message length */
 
 	guint32 flags;            /* 0x00008201 */
 	/* guint32 flags2; */     /* unknown, used in windows messenger */
-	/* guint32  flags3; */
+	/* guint32 flags3; */
 
 #if 0
 	guint8  dom[*];          /* domain string (unicode UTF-16LE) */
@@ -110,7 +110,6 @@ struct type3_message {
 #endif
 };
 
-/* TODO: Will this work on both little-endian and big-endian machines? */
 gchar *
 purple_ntlm_gen_type1(const gchar *hostname, const gchar *domain)
 {
@@ -132,12 +131,12 @@ purple_ntlm_gen_type1(const gchar *hostname, const gchar *domain)
 	tmsg->protocol[5] = 'S';
 	tmsg->protocol[6] = 'P';
 	tmsg->protocol[7] = '\0';
-	tmsg->type      = 0x00000001;
-	tmsg->flags     = 0x0000b203;
-	tmsg->dom_len1  = tmsg->dom_len2 = domainlen;
-	tmsg->dom_off   = sizeof(struct type1_message) + hostnamelen;
-	tmsg->host_len1 = tmsg->host_len2 = hostnamelen;
-	tmsg->host_off  = sizeof(struct type1_message);
+	tmsg->type      = GUINT32_TO_LE(0x00000001);
+	tmsg->flags     = GUINT32_TO_LE(0x0000b203);
+	tmsg->dom_len1  = tmsg->dom_len2 = GUINT16_TO_LE(domainlen);
+	tmsg->dom_off   = GUINT32_TO_LE(sizeof(struct type1_message) + hostnamelen);
+	tmsg->host_len1 = tmsg->host_len2 = GUINT16_TO_LE(hostnamelen);
+	tmsg->host_off  = GUINT32_TO_LE(sizeof(struct type1_message));
 	memcpy(msg + tmsg->host_off, hostname, hostnamelen);
 	memcpy(msg + tmsg->dom_off, domain, domainlen);
 
@@ -157,7 +156,7 @@ purple_ntlm_parse_type2(const gchar *type2, guint32 *flags)
 	tmsg = (struct type2_message*)purple_base64_decode(type2, &retlen);
 	memcpy(nonce, tmsg->nonce, 8);
 	if (flags != NULL)
-		*flags = tmsg->flags;
+		*flags = GUINT16_FROM_LE(tmsg->flags);
 	g_free(tmsg);
 
 	return nonce;
@@ -268,27 +267,27 @@ purple_ntlm_gen_type3(const gchar *username, const gchar *passw, const gchar *ho
 	tmsg->protocol[4] = 'S';
 	tmsg->protocol[5] = 'S';
 	tmsg->protocol[6] = 'P';
-	tmsg->type = 0x00000003;
-	tmsg->lm_resp_len1 = tmsg->lm_resp_len2 = 0x18;
-	tmsg->lm_resp_off = sizeof(struct type3_message) + domainlen + usernamelen + hostnamelen;
-	tmsg->nt_resp_len1 = tmsg->nt_resp_len2 = 0x18;
-	tmsg->nt_resp_off = sizeof(struct type3_message) + domainlen + usernamelen + hostnamelen + 0x18;
+	tmsg->type = GUINT32_TO_LE(0x00000003);
+	tmsg->lm_resp_len1 = tmsg->lm_resp_len2 = GUINT16_TO_LE(0x18);
+	tmsg->lm_resp_off = GUINT32_TO_LE(sizeof(struct type3_message) + domainlen + usernamelen + hostnamelen);
+	tmsg->nt_resp_len1 = tmsg->nt_resp_len2 = GUINT16_TO_LE(0x18);
+	tmsg->nt_resp_off = GUINT32_TO_LE(sizeof(struct type3_message) + domainlen + usernamelen + hostnamelen + 0x18);
 
-	tmsg->dom_len1 = tmsg->dom_len2 = domainlen;
-	tmsg->dom_off = sizeof(struct type3_message);
+	tmsg->dom_len1 = tmsg->dom_len2 = GUINT16_TO_LE(domainlen);
+	tmsg->dom_off = GUINT32_TO_LE(sizeof(struct type3_message));
 
-	tmsg->user_len1 = tmsg->user_len2 = usernamelen;
-	tmsg->user_off = sizeof(struct type3_message) + domainlen;
+	tmsg->user_len1 = tmsg->user_len2 = GUINT16_TO_LE(usernamelen);
+	tmsg->user_off = GUINT32_TO_LE(sizeof(struct type3_message) + domainlen);
 
-	tmsg->host_len1 = tmsg->host_len2 = hostnamelen;
-	tmsg->host_off = sizeof(struct type3_message) + domainlen + usernamelen;
+	tmsg->host_len1 = tmsg->host_len2 = GUINT16_TO_LE(hostnamelen);
+	tmsg->host_off = GUINT32_TO_LE(sizeof(struct type3_message) + domainlen + usernamelen);
 
 	if(flags) {
-		tmsg->sess_off = sizeof(struct type3_message) + domainlen + usernamelen + hostnamelen + 0x18 + 0x18;
-		tmsg->sess_len1 = tmsg->sess_len2 = 0x0010;
+		tmsg->sess_off = GUINT32_TO_LE(sizeof(struct type3_message) + domainlen + usernamelen + hostnamelen + 0x18 + 0x18);
+		tmsg->sess_len1 = tmsg->sess_len2 = GUINT16_TO_LE(0x0010);
 	}
 
-	tmsg->flags = 0x00008201;
+	tmsg->flags = GUINT32_TO_LE(0x00008201);
 
 	tmp = (char *)tmsg + sizeof(struct type3_message);
 
@@ -361,7 +360,7 @@ purple_ntlm_gen_type3(const gchar *username, const gchar *passw, const gchar *ho
 
 	/* LCS Stuff */
 	if (flags) {
-		tmsg->flags = 0x409082d4;
+		tmsg->flags = GUINT32_TO_LE(0x409082d4);
 		gensesskey(sesskey, NULL);
 		memcpy(tmp, sesskey, 0x10);
 	}
diff --git a/libpurple/plugin.c b/libpurple/plugin.c
index b46b09eec4..da678b3258 100644
--- a/libpurple/plugin.c
+++ b/libpurple/plugin.c
@@ -33,6 +33,7 @@
 #include "request.h"
 #include "signals.h"
 #include "util.h"
+#include "valgrind.h"
 #include "version.h"
 
 typedef struct
@@ -222,7 +223,7 @@ purple_plugin_probe(const char *filename)
 			return plugin;
 		else if (!purple_plugin_is_unloadable(plugin))
 		{
-			purple_debug_info("plugins", "Not loading %s. "
+			purple_debug_warning("plugins", "Not loading %s. "
 							"Another plugin with the same name (%s) has already been loaded.\n",
 							filename, plugin->path);
 			return plugin;
@@ -861,6 +862,7 @@ purple_plugin_destroy(PurplePlugin *plugin)
 				}
 
 				g_list_free(loader_info->exts);
+				loader_info->exts = NULL;
 			}
 
 			plugin_loaders = g_list_remove(plugin_loaders, plugin);
@@ -869,8 +871,16 @@ purple_plugin_destroy(PurplePlugin *plugin)
 		if (plugin->info != NULL && plugin->info->destroy != NULL)
 			plugin->info->destroy(plugin);
 
-		if (plugin->handle != NULL)
-			g_module_close(plugin->handle);
+		/*
+		 * I find it extremely useful to do this when using valgrind, as
+		 * it keeps all the plugins open, meaning that valgrind is able to
+		 * resolve symbol names in leak traces from plugins.
+		 */
+		if (!g_getenv("PURPLE_LEAKCHECK_HELP") && !RUNNING_ON_VALGRIND)
+		{
+			if (plugin->handle != NULL)
+				g_module_close(plugin->handle);
+		}
 	}
 	else
 	{
@@ -1201,6 +1211,11 @@ purple_plugins_uninit(void)
 
 	purple_signals_disconnect_by_handle(handle);
 	purple_signals_unregister_by_instance(handle);
+
+	while (search_paths) {
+		g_free(search_paths->data);
+		search_paths = g_list_delete_link(search_paths, search_paths);
+	}
 }
 
 /**************************************************************************
@@ -1217,6 +1232,12 @@ purple_plugins_add_search_path(const char *path)
 	search_paths = g_list_append(search_paths, g_strdup(path));
 }
 
+GList *
+purple_plugins_get_search_paths()
+{
+	return search_paths;
+}
+
 void
 purple_plugins_unload_all(void)
 {
@@ -1229,6 +1250,21 @@ purple_plugins_unload_all(void)
 }
 
 void
+purple_plugins_unload(PurplePluginType type)
+{
+#ifdef PURPLE_PLUGINS
+	GList *l;
+
+	for (l = plugins; l; l = l->next) {
+		PurplePlugin *plugin = l->data;
+		if (plugin->info->type == type && purple_plugin_is_loaded(plugin))
+			purple_plugin_unload(plugin);
+	}
+
+#endif /* PURPLE_PLUGINS */
+}
+
+void
 purple_plugins_destroy_all(void)
 {
 #ifdef PURPLE_PLUGINS
diff --git a/libpurple/plugin.h b/libpurple/plugin.h
index 6ce6ada8df..9225aecd92 100644
--- a/libpurple/plugin.h
+++ b/libpurple/plugin.h
@@ -29,7 +29,7 @@
 #ifndef _PURPLE_PLUGIN_H_
 #define _PURPLE_PLUGIN_H_
 
-#include <glib/glist.h>
+#include <glib.h>
 #include <gmodule.h>
 #include "signals.h"
 #include "value.h"
@@ -105,6 +105,20 @@ struct _PurplePluginInfo
 	void *ui_info; /**< Used only by UI-specific plugins to build a preference screen with a custom UI */
 	void *extra_info;
 	PurplePluginUiInfo *prefs_info; /**< Used by any plugin to display preferences.  If #ui_info has been specified, this will be ignored. */
+
+	/**
+	 * This callback has a different use depending on whether this
+	 * plugin type is PURPLE_PLUGIN_STANDARD or PURPLE_PLUGIN_PROTOCOL.
+	 *
+	 * If PURPLE_PLUGIN_STANDARD then the list of actions will show up
+	 * in the Tools menu, under a submenu with the name of the plugin.
+	 * context will be NULL.
+	 *
+	 * If PURPLE_PLUGIN_PROTOCOL then the list of actions will show up
+	 * in the Accounts menu, under a submenu with the name of the
+	 * account.  context will be set to the PurpleConnection for that
+	 * account.  This callback will only be called for online accounts.
+	 */
 	GList *(*actions)(PurplePlugin *plugin, gpointer context);
 
 	void (*_purple_reserved1)(void);
@@ -498,11 +512,25 @@ void *purple_plugin_ipc_call(PurplePlugin *plugin, const char *command,
 void purple_plugins_add_search_path(const char *path);
 
 /**
+ * Returns a list of plugin search paths.
+ *
+ * @constreturn A list of searched paths.
+ *
+ * @since 2.6.0
+ */
+GList *purple_plugins_get_search_paths(void);
+
+/**
  * Unloads all loaded plugins.
  */
 void purple_plugins_unload_all(void);
 
 /**
+ * Unloads all plugins of a specific type.
+ */
+void purple_plugins_unload(PurplePluginType type);
+
+/**
  * Destroys all registered plugins.
  */
 void purple_plugins_destroy_all(void);
diff --git a/libpurple/pluginpref.c b/libpurple/pluginpref.c
index a84b19292d..61c0fc493f 100644
--- a/libpurple/pluginpref.c
+++ b/libpurple/pluginpref.c
@@ -196,7 +196,7 @@ purple_plugin_pref_set_bounds(PurplePluginPref *pref, int min, int max)
 
 	if (purple_prefs_get_type(pref->name) != PURPLE_PREF_INT)
 	{
-		purple_debug_info("pluginpref",
+		purple_debug_warning("pluginpref",
 				"purple_plugin_pref_set_bounds: %s is not an integer pref\n",
 				pref->name);
 		return;
@@ -220,7 +220,7 @@ void purple_plugin_pref_get_bounds(PurplePluginPref *pref, int *min, int *max)
 
 	if (purple_prefs_get_type(pref->name) != PURPLE_PREF_INT)
 	{
-		purple_debug(PURPLE_DEBUG_INFO, "pluginpref",
+		purple_debug_warning("pluginpref",
 				"purple_plugin_pref_get_bounds: %s is not an integer pref\n",
 				pref->name);
 		return;
diff --git a/libpurple/plugins/Makefile.am b/libpurple/plugins/Makefile.am
index 6cb2c8f45e..adc6209773 100644
--- a/libpurple/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -36,6 +36,7 @@ log_reader_la_LDFLAGS       = -module -avoid-version
 newline_la_LDFLAGS          = -module -avoid-version
 notify_example_la_LDFLAGS   = -module -avoid-version
 offlinemsg_la_LDFLAGS       = -module -avoid-version
+one_time_password_la_LDFLAGS	= -module -avoid-version
 pluginpref_example_la_LDFLAGS = -module -avoid-version
 psychic_la_LDFLAGS          = -module -avoid-version
 signals_test_la_LDFLAGS		= -module -avoid-version
@@ -65,6 +66,7 @@ noinst_LTLIBRARIES = \
 	debug_example.la \
 	helloworld.la \
 	notify_example.la \
+	one_time_password.la \
 	pluginpref_example.la \
 	signals_test.la \
 	simple.la
@@ -81,6 +83,7 @@ log_reader_la_SOURCES       = log_reader.c
 newline_la_SOURCES          = newline.c
 notify_example_la_SOURCES   = notify_example.c
 offlinemsg_la_SOURCES       = offlinemsg.c
+one_time_password_la_SOURCES	= one_time_password.c
 pluginpref_example_la_SOURCES = pluginpref_example.c
 psychic_la_SOURCES          = psychic.c
 signals_test_la_SOURCES		= signals-test.c
@@ -97,6 +100,7 @@ log_reader_la_LIBADD        = $(GLIB_LIBS)
 newline_la_LIBADD           = $(GLIB_LIBS)
 notify_example_la_LIBADD    = $(GLIB_LIBS)
 offlinemsg_la_LIBADD        = $(GLIB_LIBS)
+one_time_password_la_LIBADD = $(GLIB_LIBS)
 pluginpref_example_la_LIBADD = $(GLIB_LIBS)
 psychic_la_LIBADD           = $(GLIB_LIBS)
 signals_test_la_LIBADD		= $(GLIB_LIBS)
@@ -153,5 +157,5 @@ SUFFIXES = .c .so
 	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
 	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
 	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
-	@cp .libs/libtmp$@.so* $@
-	@rm -f .libs/libtmp$@.*
+	@cp .libs/libtmp$@*.so $@
+	@rm -rf .libs/libtmp$@.*
diff --git a/libpurple/plugins/filectl.c b/libpurple/plugins/filectl.c
index 15442f3128..96919e4374 100644
--- a/libpurple/plugins/filectl.c
+++ b/libpurple/plugins/filectl.c
@@ -220,7 +220,7 @@ static gboolean
 plugin_load(PurplePlugin *plugin)
 {
 	init_file();
-	check = purple_timeout_add(5000, (GSourceFunc)check_file, NULL);
+	check = purple_timeout_add_seconds(5, (GSourceFunc)check_file, NULL);
 
 	return TRUE;
 }
diff --git a/libpurple/plugins/joinpart.c b/libpurple/plugins/joinpart.c
index 53ea871909..9969022d36 100644
--- a/libpurple/plugins/joinpart.c
+++ b/libpurple/plugins/joinpart.c
@@ -194,7 +194,7 @@ static gboolean plugin_load(PurplePlugin *plugin)
 	                    PURPLE_CALLBACK(received_chat_msg_cb), users);
 
 	/* Cleanup every 5 minutes */
-	id = purple_timeout_add(1000 * 60 * 5, (GSourceFunc)clean_users_hash, users);
+	id = purple_timeout_add_seconds(60 * 5, (GSourceFunc)clean_users_hash, users);
 
 	data = g_new(gpointer, 2);
 	data[0] = users;
@@ -229,16 +229,17 @@ get_plugin_pref_frame(PurplePlugin *plugin)
 
 	frame = purple_plugin_pref_frame_new();
 
-	ppref = purple_plugin_pref_new_with_label(_("Join/Part Hiding Configuration"));
+	ppref = purple_plugin_pref_new_with_label(_("Hide Joins/Parts"));
 	purple_plugin_pref_frame_add(frame, ppref);
 
 	ppref = purple_plugin_pref_new_with_name_and_label(THRESHOLD_PREF,
-	                                                 _("Minimum Room Size"));
+	                                                 /* Translators: Followed by an input request a number of people */
+	                                                 _("For rooms with more than this many people"));
 	purple_plugin_pref_set_bounds(ppref, 0, 1000);
 	purple_plugin_pref_frame_add(frame, ppref);
 
 	ppref = purple_plugin_pref_new_with_name_and_label(DELAY_PREF,
-	                                                 _("User Inactivity Timeout (in minutes)"));
+	                                                 _("If user has not spoken in this many minutes"));
 	purple_plugin_pref_set_bounds(ppref, 0, 8 * 60); /* 8 Hours */
 	purple_plugin_pref_frame_add(frame, ppref);
 
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
index 1cc3687449..0feebad98a 100644
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -2941,7 +2941,8 @@ static PurplePluginInfo info =
 	/** description */
 	N_("When viewing logs, this plugin will include "
 	   "logs from other IM clients. Currently, this "
-	   "includes Adium, MSN Messenger, and Trillian.\n\n"
+	   "includes Adium, MSN Messenger, aMSN, and "
+	   "Trillian.\n\n"
 	   "WARNING: This plugin is still alpha code and "
 	   "may crash frequently.  Use it at your own risk!"),
 
diff --git a/libpurple/plugins/mono/loader/debug-glue.c b/libpurple/plugins/mono/loader/debug-glue.c
index 01333521f8..fc07ca2289 100644
--- a/libpurple/plugins/mono/loader/debug-glue.c
+++ b/libpurple/plugins/mono/loader/debug-glue.c
@@ -9,7 +9,7 @@ void purple_debug_glue(int type, MonoString *cat, MonoString *str)
 	ccat = mono_string_to_utf8(cat);
 	cstr = mono_string_to_utf8(str);
 	
-	purple_debug(type, ccat, cstr);
+	purple_debug(type, ccat, "%s", cstr);
 	
 	g_free(ccat);
 	g_free(cstr);
diff --git a/libpurple/plugins/mono/loader/mono.c b/libpurple/plugins/mono/loader/mono.c
index fe28bdd613..1f378e0901 100644
--- a/libpurple/plugins/mono/loader/mono.c
+++ b/libpurple/plugins/mono/loader/mono.c
@@ -39,18 +39,18 @@ static gboolean probe_mono_plugin(PurplePlugin *plugin)
 
 	if (!assm) {
 		return FALSE;
-	} 
+	}
 
 	purple_debug(PURPLE_DEBUG_INFO, "mono", "Probing plugin\n");
 
 	if (ml_is_api_dll(mono_assembly_get_image(assm))) {
-		purple_debug(PURPLE_DEBUG_INFO, "mono", "Found our PurpleAPI.dll\n");
+		purple_debug_info("mono", "Found our PurpleAPI.dll\n");
+		mono_assembly_close(assm);
 		return FALSE;
 	}
 
-	info = g_new0(PurplePluginInfo, 1);
 	mplug = g_new0(PurpleMonoPlugin, 1);
-	
+
 	mplug->signal_data = NULL;
 
 	mplug->assm = assm;
@@ -58,12 +58,16 @@ static gboolean probe_mono_plugin(PurplePlugin *plugin)
 	mplug->klass = ml_find_plugin_class(mono_assembly_get_image(mplug->assm));
 	if (!mplug->klass) {
 		purple_debug(PURPLE_DEBUG_ERROR, "mono", "no plugin class in \'%s\'\n", file);
+		mono_assembly_close(assm);
+		g_free(mplug);
 		return FALSE;
 	}
 
 	mplug->obj = mono_object_new(ml_get_domain(), mplug->klass);
 	if (!mplug->obj) {
 		purple_debug(PURPLE_DEBUG_ERROR, "mono", "obj not valid\n");
+		mono_assembly_close(assm);
+		g_free(mplug);
 		return FALSE;
 	}
 
@@ -85,14 +89,17 @@ static gboolean probe_mono_plugin(PurplePlugin *plugin)
 
 	if (!(found_load && found_unload && found_destroy)) {
 		purple_debug(PURPLE_DEBUG_ERROR, "mono", "did not find the required methods\n");
+		mono_assembly_close(assm);
+		g_free(mplug);
 		return FALSE;
 	}
-	
+
 	plugin_info = ml_get_info_prop(mplug->obj);
 
 	/* now that the methods are filled out we can populate
 	   the info struct with all the needed info */
 
+	info = g_new0(PurplePluginInfo, 1);
 	info->id = ml_get_prop_string(plugin_info, "Id");
 	info->name = ml_get_prop_string(plugin_info, "Name");
 	info->version = ml_get_prop_string(plugin_info, "Version");
@@ -109,7 +116,7 @@ static gboolean probe_mono_plugin(PurplePlugin *plugin)
 	/* this plugin depends on us; duh */
 	info->dependencies = g_list_append(info->dependencies, MONO_PLUGIN_ID);
 	mplug->plugin = plugin;
-				
+
 	plugin->info = info;
 	info->extra_info = mplug;
 
@@ -238,7 +245,7 @@ static PurplePluginInfo info =
 static void init_plugin(PurplePlugin *plugin)
 {
 	ml_init();
-	
+
 	loader_info.exts = g_list_append(loader_info.exts, "dll");
 }
 
diff --git a/libpurple/plugins/offlinemsg.c b/libpurple/plugins/offlinemsg.c
index bcc16b3171..aa32e57172 100644
--- a/libpurple/plugins/offlinemsg.c
+++ b/libpurple/plugins/offlinemsg.c
@@ -93,7 +93,7 @@ record_pounce(OfflineMsg *offline)
 	conv = offline->conv;
 	if (!purple_conversation_get_data(conv, "plugin_pack:offlinemsg"))
 		purple_conversation_write(conv, NULL, _("The rest of the messages will be saved "
-							"as pounce. You can edit/delete the pounce from the `Buddy "
+							"as pounces. You can edit/delete the pounce from the `Buddy "
 							"Pounce' dialog."),
 							PURPLE_MESSAGE_SYSTEM, time(NULL));
 	purple_conversation_set_data(conv, "plugin_pack:offlinemsg",
diff --git a/libpurple/plugins/one_time_password.c b/libpurple/plugins/one_time_password.c
new file mode 100644
index 0000000000..caf29212a9
--- /dev/null
+++ b/libpurple/plugins/one_time_password.c
@@ -0,0 +1,151 @@
+/*
+ * One Time Password support plugin for libpurple
+ *
+ * Copyright (C) 2009, Daniel Atallah <datallah@pidgin.im>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
+ */
+#include "internal.h"
+#include "debug.h"
+#include "plugin.h"
+#include "version.h"
+#include "account.h"
+#include "accountopt.h"
+
+#define PLUGIN_ID "core-one_time_password"
+#define PREF_NAME PLUGIN_ID "_enabled"
+
+static void
+signed_on_cb(PurpleConnection *conn, void *data)
+{
+	PurpleAccount *account = purple_connection_get_account(conn);
+
+	if (purple_account_get_bool(account, PREF_NAME, FALSE)) {
+		if(purple_account_get_remember_password(account))
+			purple_debug_error("One Time Password",
+					   "Unable to enforce one time password for account %s (%s).\n"
+					   "Account is set to remember the password.\n",
+					   purple_account_get_username(account),
+					   purple_account_get_protocol_name(account));
+		else {
+
+			purple_debug_info("One Time Password", "Clearing password for account %s (%s).\n",
+					  purple_account_get_username(account),
+					  purple_account_get_protocol_name(account));
+
+			purple_account_set_password(account, NULL);
+			/* TODO: Do we need to somehow clear conn->password ? */
+		}
+	}
+}
+
+static gboolean
+plugin_load(PurplePlugin *plugin)
+{
+	PurplePlugin *prpl;
+	PurplePluginProtocolInfo *prpl_info;
+	PurpleAccountOption *option;
+	GList *l;
+
+	/* Register protocol preference. */
+	for (l = purple_plugins_get_protocols(); l != NULL; l = l->next) {
+		prpl = (PurplePlugin *)l->data;
+		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+		if (prpl_info != NULL && !(prpl_info->options & OPT_PROTO_NO_PASSWORD)) {
+			option = purple_account_option_bool_new(_("One Time Password"),
+								PREF_NAME, FALSE);
+			prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
+		}
+	}
+
+	/* Register callback. */
+	purple_signal_connect(purple_connections_get_handle(), "signed-on",
+			      plugin, PURPLE_CALLBACK(signed_on_cb), NULL);
+
+	return TRUE;
+}
+
+static gboolean
+plugin_unload(PurplePlugin *plugin)
+{
+	PurplePlugin *prpl;
+	PurplePluginProtocolInfo *prpl_info;
+	PurpleAccountOption *option;
+	GList *l, *options;
+
+	/* Remove protocol preference. */
+	for (l = purple_plugins_get_protocols(); l != NULL; l = l->next) {
+		prpl = (PurplePlugin *)l->data;
+		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+		if (prpl_info != NULL && !(prpl_info->options & OPT_PROTO_NO_PASSWORD)) {
+			options = prpl_info->protocol_options;
+			while (options != NULL) {
+				option = (PurpleAccountOption *) options->data;
+				if (strcmp(PREF_NAME, purple_account_option_get_setting(option)) == 0) {
+					prpl_info->protocol_options = g_list_delete_link(prpl_info->protocol_options, options);
+					purple_account_option_destroy(option);
+					break;
+				}
+				options = options->next;
+			}
+		}
+	}
+
+	/* Callback will be automagically unregistered */
+
+	return TRUE;
+}
+
+static PurplePluginInfo info =
+{
+	PURPLE_PLUGIN_MAGIC,
+	PURPLE_MAJOR_VERSION,
+	PURPLE_MINOR_VERSION,
+	PURPLE_PLUGIN_STANDARD,				/**< type           */
+	NULL,						/**< ui_requirement */
+	0,						/**< flags          */
+	NULL,						/**< dependencies   */
+	PURPLE_PRIORITY_DEFAULT,			/**< priority       */
+	PLUGIN_ID,					/**< id             */
+	N_("One Time Password Support"),		/**< name           */
+	DISPLAY_VERSION,				/**< version        */
+							/**  summary        */
+	N_("Enforce that passwords are used only once."),
+							/**  description    */
+	N_("Allows you to enforce on a per-account basis that passwords not "
+	   "being saved are only used in a single successful connection.\n"
+	   "Note: The account password must not be saved for this to work."),
+	"Daniel Atallah <datallah@pidgin.im>",		/**< author         */
+	PURPLE_WEBSITE,					/**< homepage       */
+	plugin_load,					/**< load           */
+	plugin_unload,					/**< unload         */
+	NULL,						/**< destroy        */
+	NULL,						/**< ui_info        */
+	NULL,						/**< extra_info     */
+	NULL,						/**< prefs_info     */
+	NULL,						/**< actions        */
+	NULL,						/**< reserved 1     */
+	NULL,						/**< reserved 2     */
+	NULL,						/**< reserved 3     */
+	NULL						/**< reserved 4     */
+};
+
+static void
+init_plugin(PurplePlugin *plugin)
+{
+}
+
+PURPLE_INIT_PLUGIN(one_time_password, init_plugin, info)
diff --git a/libpurple/plugins/perl/Makefile.am b/libpurple/plugins/perl/Makefile.am
index 62c652a73e..3843e42db2 100644
--- a/libpurple/plugins/perl/Makefile.am
+++ b/libpurple/plugins/perl/Makefile.am
@@ -99,7 +99,7 @@ common/Makefile: common/Makefile.PL
 			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
-	@cd common && $(perlpath) Makefile.PL $(PERL_MM_PARAMS)
+	@cd common && $(perlpath) Makefile.PL
 
 common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
@@ -108,7 +108,7 @@ all-local: common/Makefile
 	@for dir in $(perl_dirs); do \
 		cd $$dir && \
 		if [ ! -f Makefile ]; then \
-			$(perlpath) Makefile.PL $(PERL_MM_PARAMS); \
+			$(perlpath) Makefile.PL; \
 		fi && \
 		($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
 		 $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
@@ -164,6 +164,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
+	-DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)\" \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
diff --git a/libpurple/plugins/perl/common/Certificate.xs b/libpurple/plugins/perl/common/Certificate.xs
index 558fe25e8a..02888722ec 100644
--- a/libpurple/plugins/perl/common/Certificate.xs
+++ b/libpurple/plugins/perl/common/Certificate.xs
@@ -214,7 +214,7 @@ purple_certificate_get_fingerprint_sha1(crt)
 		GByteArray *gba = NULL;
 	CODE:
 		gba = purple_certificate_get_fingerprint_sha1(crt);
-		RETVAL = newSVpv(gba->data, gba->len);
+		RETVAL = newSVpv((gchar *)gba->data, gba->len);
 		g_byte_array_free(gba, TRUE);
 	OUTPUT:
 		RETVAL
diff --git a/libpurple/plugins/perl/common/Cipher.xs b/libpurple/plugins/perl/common/Cipher.xs
index 3a62dcae7f..558e3f3474 100644
--- a/libpurple/plugins/perl/common/Cipher.xs
+++ b/libpurple/plugins/perl/common/Cipher.xs
@@ -66,9 +66,9 @@ purple_cipher_digest_region(name, data_sv, in_len, digest)
 		guchar *data = NULL;
 		size_t data_len;
 	CODE:
-		data = SvPV(data_sv, data_len);
+		data = (guchar *)SvPV(data_sv, data_len);
 		SvUPGRADE(digest, SVt_PV);
-		buff = SvGROW(digest, in_len);
+		buff = (guchar *)SvGROW(digest, in_len);
 		ret = purple_cipher_digest_region(name, data, data_len, in_len, buff, &RETVAL);
 		if(!ret) {
 			SvSetSV_nosteal(digest, &PL_sv_undef);
@@ -181,7 +181,7 @@ purple_cipher_context_digest(context, in_len, digest)
 		guchar *buff = NULL;
 	CODE:
 		SvUPGRADE(digest, SVt_PV);
-		buff = SvGROW(digest, in_len);
+		buff = (guchar *)SvGROW(digest, in_len);
 		ret = purple_cipher_context_digest(context, in_len, buff, &RETVAL);
 		if(!ret) {
 			SvSetSV_nosteal(digest, &PL_sv_undef);
@@ -225,9 +225,9 @@ purple_cipher_context_encrypt(context, data_sv, output, OUTLIST size_t outlen)
 		guchar *buff = NULL;
 		guchar *data = NULL;
 	CODE:
-		data = SvPV(data_sv, datalen);
+		data = (guchar *)SvPV(data_sv, datalen);
 		SvUPGRADE(output, SVt_PV);
-		buff = SvGROW(output, datalen);
+		buff = (guchar *)SvGROW(output, datalen);
 		RETVAL = purple_cipher_context_encrypt(context, data, datalen, buff, &outlen);
 		if(outlen != 0) {
 			SvPOK_only(output);
@@ -249,9 +249,9 @@ purple_cipher_context_decrypt(context, data_sv, output, OUTLIST size_t outlen)
 		guchar *buff = NULL;
 		guchar *data = NULL;
 	CODE:
-		data = SvPV(data_sv, datalen);
+		data = (guchar *)SvPV(data_sv, datalen);
 		SvUPGRADE(output, SVt_PV);
-		buff = SvGROW(output, datalen);
+		buff = (guchar *)SvGROW(output, datalen);
 		RETVAL = purple_cipher_context_decrypt(context, data, datalen, buff, &outlen);
 		if(outlen != 0) {
 			SvPOK_only(output);
diff --git a/libpurple/plugins/perl/common/Makefile.PL.in b/libpurple/plugins/perl/common/Makefile.PL.in
index f59fc7f14f..07ec65d694 100644
--- a/libpurple/plugins/perl/common/Makefile.PL.in
+++ b/libpurple/plugins/perl/common/Makefile.PL.in
@@ -13,4 +13,16 @@ WriteMakefile(
     'INC'               => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple @GLIB_CFLAGS@',
     'OBJECT'            => '$(O_FILES)', # link all the C files too
 #    'OPTIMIZE'          => '-g', # For debugging
+    'INSTALLDIRS'          => 'vendor',
+    'INSTALL_BASE'         => '$(prefix)',
+    'INSTALLVENDORARCH'    => '$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/perl',
+    'INSTALLVENDORMAN3DIR' => '$(mandir)/man3',
+    'macro'                => {
+        'prefix'               => '@prefix@',
+        'exec_prefix'          => '@exec_prefix@',
+        'libdir'               => '@libdir@',
+        'mandir'               => '@mandir@',
+        'datarootdir'          => '@datarootdir@',
+        'PURPLE_MAJOR_VERSION' => '@PURPLE_MAJOR_VERSION@',
+    },
 );
diff --git a/libpurple/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw
index 9e946c8722..03a41d21f5 100644
--- a/libpurple/plugins/perl/common/Makefile.mingw
+++ b/libpurple/plugins/perl/common/Makefile.mingw
@@ -97,9 +97,10 @@ include $(PIDGIN_COMMON_RULES)
 all: $(TARGET).dll $(AUTOSPLIT)
 
 install: all
-	rm -rf $(PURPLE_INSTALL_PERLMOD_DIR)
-	cp -R lib $(PURPLE_INSTALL_PERLMOD_DIR)
-	cp $(TARGET).dll $(PURPLE_INSTALL_PERLMOD_DIR)
+	rm -rf $(PURPLE_INSTALL_PERL_DIR)
+	mkdir -p $(PURPLE_INSTALL_PERL_DIR)
+	cp -R lib/* $(PURPLE_INSTALL_PERL_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_PERL_DIR)/auto/Purple
 
 $(C_FILES): $(PURPLE_CONFIG_H)
 
diff --git a/libpurple/plugins/perl/common/Util.xs b/libpurple/plugins/perl/common/Util.xs
index 36bde18780..4ef2fec056 100644
--- a/libpurple/plugins/perl/common/Util.xs
+++ b/libpurple/plugins/perl/common/Util.xs
@@ -69,7 +69,7 @@ purple_message_meify(SV *msg)
 	PREINIT:
 		char *message = NULL;
 		gboolean ret;
-		gssize len;
+		gsize len;
 	CODE:
 		message = SvPV(msg, len);
 		message = g_strndup(message, len);
@@ -239,7 +239,7 @@ purple_base16_decode(str)
 	CODE:
 		ret = purple_base16_decode(str, &len);
 		if(len) {
-			RETVAL = newSVpv(ret, len);
+			RETVAL = newSVpv((gchar *)ret, len);
 		} else {
 			g_free(ret);
 			XSRETURN_UNDEF;
@@ -257,7 +257,7 @@ purple_base64_decode(str)
 	CODE:
 		ret = purple_base64_decode(str, &len);
 		if(len) {
-			RETVAL = newSVpv(ret, len);
+			RETVAL = newSVpv((gchar *)ret, len);
 		} else {
 			g_free(ret);
 			XSRETURN_UNDEF;
@@ -275,7 +275,7 @@ purple_quotedp_decode(str)
 	CODE:
 		ret = purple_quotedp_decode(str, &len);
 		if(len) {
-			RETVAL = newSVpv(ret, len);
+			RETVAL = newSVpv((gchar *)ret, len);
 		} else {
 			g_free(ret);
 			XSRETURN_UNDEF;
@@ -499,11 +499,11 @@ purple_util_format_song_info(title, artist, album, unused)
 	gpointer unused
 
 const char*
-purple_util_get_image_extension(gconstpointer data, size_t length(data))
+purple_util_get_image_extension(const char *data, size_t length(data))
 	PROTOTYPE: $
 
 gchar_own*
-purple_util_get_image_filename(gconstpointer image_data, size_t length(image_data))
+purple_util_get_image_filename(const char *image_data, size_t length(image_data))
 	PROTOTYPE: $
 
 Purple::XMLNode
diff --git a/libpurple/plugins/perl/common/XMLNode.xs b/libpurple/plugins/perl/common/XMLNode.xs
index cc437e6e55..0491512210 100644
--- a/libpurple/plugins/perl/common/XMLNode.xs
+++ b/libpurple/plugins/perl/common/XMLNode.xs
@@ -4,21 +4,24 @@ MODULE = Purple::XMLNode  PACKAGE = Purple::XMLNode  PREFIX = xmlnode_
 PROTOTYPES: ENABLE
 
 Purple::XMLNode
-xmlnode_copy(class, src)
+xmlnode_copy(src)
 	Purple::XMLNode src
-    C_ARGS:
-	src
 
 void
 xmlnode_free(node)
 	Purple::XMLNode node
 
 Purple::XMLNode
-xmlnode_from_str(class, str, size)
-	const char *str
-	gssize size
-    C_ARGS:
-	str, size
+xmlnode_from_str(const char *str, gssize length(str))
+    PROTOTYPE: $
+
+const char *
+xmlnode_get_name(node)
+	Purple::XMLNode node
+	CODE:
+	RETVAL = node->name;
+	OUTPUT:
+	RETVAL
 
 const char *
 xmlnode_get_attrib(node, attr)
@@ -78,11 +81,17 @@ xmlnode_set_attrib(node, attr, value)
 	const char *value
 
 gchar_own *
-xmlnode_to_formatted_str(node, len)
+xmlnode_to_formatted_str(node)
 	Purple::XMLNode node
-	int *len
+    CODE:
+	RETVAL = xmlnode_to_formatted_str(node, NULL);
+    OUTPUT:
+	RETVAL
 
 gchar_own *
-xmlnode_to_str(node, len)
+xmlnode_to_str(node)
 	Purple::XMLNode node
-	int *len
+    CODE:
+	RETVAL = xmlnode_to_str(node, NULL);
+    OUTPUT:
+	RETVAL
diff --git a/libpurple/plugins/perl/perl-common.c b/libpurple/plugins/perl/perl-common.c
index 4266ab7626..061dbdd2fb 100644
--- a/libpurple/plugins/perl/perl-common.c
+++ b/libpurple/plugins/perl/perl-common.c
@@ -403,7 +403,7 @@ purple_perl_data_from_sv(PurpleValue *value, SV *sv)
 static SV *
 purple_perl_sv_from_subtype(const PurpleValue *value, void *arg)
 {
-	const char *stash = NULL;
+	const char *stash = "Purple"; /* ? */
 
 	switch (purple_value_get_subtype(value)) {
 		case PURPLE_SUBTYPE_ACCOUNT:
@@ -442,6 +442,9 @@ purple_perl_sv_from_subtype(const PurpleValue *value, void *arg)
 		case PURPLE_SUBTYPE_STATUS:
 			stash = "Purple::Status";
 			break;
+		case PURPLE_SUBTYPE_SAVEDSTATUS:
+			stash = "Purple::SavedStatus";
+			break;
 		case PURPLE_SUBTYPE_LOG:
 			stash = "Purple::Log";
 			break;
@@ -451,10 +454,19 @@ purple_perl_sv_from_subtype(const PurpleValue *value, void *arg)
 		case PURPLE_SUBTYPE_XMLNODE:
 			stash = "Purple::XMLNode";
 			break;
-
-		default:
-			stash = "Purple"; /* ? */
-	}
+ 		case PURPLE_SUBTYPE_USERINFO:
+ 			stash = "Purple::NotifyUserInfo";
+ 			break;
+ 		case PURPLE_SUBTYPE_STORED_IMAGE:
+ 			stash = "Purple::StoredImage";
+ 			break;
+ 		case PURPLE_SUBTYPE_CERTIFICATEPOOL:
+ 			stash = "Purple::Certificate::Pool";
+ 			break;
+ 		case PURPLE_SUBTYPE_UNKNOWN:
+ 			stash = "Purple::Unknown";
+ 			break;
+  	}
 
 	return sv_2mortal(purple_perl_bless_object(arg, stash));
 }
diff --git a/libpurple/plugins/perl/perl-handlers.c b/libpurple/plugins/perl/perl-handlers.c
index f12e67dca5..4326bc5b42 100644
--- a/libpurple/plugins/perl/perl-handlers.c
+++ b/libpurple/plugins/perl/perl-handlers.c
@@ -284,6 +284,8 @@ perl_signal_cb(va_list args, void *data)
 	DATATYPE **copy_args;
 
 	dSP;
+	PERL_SET_CONTEXT(my_perl);
+	SPAGAIN;
 	ENTER;
 	SAVETMPS;
 	PUSHMARK(sp);
@@ -364,7 +366,8 @@ perl_signal_cb(va_list args, void *data)
 					break;
 
 				case PURPLE_TYPE_STRING:
-					if (strcmp(*((char **)copy_args[i]), SvPVX(sv_args[i]))) {
+					if (!*((char **)copy_args[i]) || !SvPVX(sv_args[i]) ||
+							strcmp(*((char **)copy_args[i]), SvPVX(sv_args[i]))) {
 						g_free(*((char **)copy_args[i]));
 						*((char **)copy_args[i]) =
 							g_strdup(SvPVutf8_nolen(sv_args[i]));
diff --git a/libpurple/plugins/perl/perl.c b/libpurple/plugins/perl/perl.c
index cba35647e2..89942e9a8d 100644
--- a/libpurple/plugins/perl/perl.c
+++ b/libpurple/plugins/perl/perl.c
@@ -131,6 +131,7 @@ xs_init(pTHX)
 #endif
 {
 	char *file = __FILE__;
+	GList *search_paths = purple_plugins_get_search_paths();
 	dXSUB_SYS;
 
 	/* This one allows dynamic loading of perl modules in perl scripts by
@@ -139,6 +140,17 @@ xs_init(pTHX)
 #ifdef _WIN32
 	newXS("Win32CORE::bootstrap", boot_Win32CORE, file);
 #endif
+
+	while (search_paths != NULL) {
+		gchar *uselib;
+		const gchar *search_path = search_paths->data;
+		search_paths = g_list_next(search_paths);
+
+		uselib = g_strdup_printf("unshift @INC, q(%s%sperl);",
+		                         search_path, G_DIR_SEPARATOR_S);
+		eval_pv(uselib, TRUE);
+		g_free(uselib);
+	}
 }
 
 static void
diff --git a/libpurple/plugins/psychic.c b/libpurple/plugins/psychic.c
index a12215bb0d..2464279f64 100644
--- a/libpurple/plugins/psychic.c
+++ b/libpurple/plugins/psychic.c
@@ -74,6 +74,7 @@ buddy_typing_cb(PurpleAccount *acct, const char *name, void *data) {
 			      time(NULL));
     }
 
+    /* Necessary because we may be creating a new conversation window. */
     purple_conv_im_set_typing_state(PURPLE_CONV_IM(gconv), PURPLE_TYPING);
   }
 }
diff --git a/libpurple/plugins/signals-test.c b/libpurple/plugins/signals-test.c
index 220fb87b5f..f6f0e89736 100644
--- a/libpurple/plugins/signals-test.c
+++ b/libpurple/plugins/signals-test.c
@@ -145,16 +145,39 @@ buddy_signed_off_cb(PurpleBuddy *buddy, void *data)
 }
 
 static void
-buddy_added_cb(PurpleBuddy *buddy, void *data)
-{
-	purple_debug_misc("signals test", "buddy_added_cb (%s)\n",
-	                  purple_buddy_get_name(buddy));
+blist_node_added_cb(PurpleBlistNode *bnode, void *data)
+{
+	const char *name;
+	if (PURPLE_BLIST_NODE_IS_GROUP(bnode))
+		name = purple_group_get_name(PURPLE_GROUP(bnode));
+	else if (PURPLE_BLIST_NODE_IS_CONTACT(bnode))
+		/* Close enough */
+		name = purple_contact_get_alias(PURPLE_CONTACT(bnode));
+	else if (PURPLE_BLIST_NODE_IS_BUDDY(bnode))
+		name = purple_buddy_get_name(PURPLE_BUDDY(bnode));
+	else
+		name = "(unknown)";
+
+	purple_debug_misc("signals test", "blist_node_added_cb (%s)\n",
+	                  name ? name : "(null)");
 }
 
 static void
-buddy_removed_cb(PurpleBuddy *buddy, void *data)
+blist_node_removed_cb(PurpleBlistNode *bnode, void *data)
 {
-	purple_debug_misc("signals test", "buddy_removed_cb (%s)\n", purple_buddy_get_name(buddy));
+	const char *name;
+	if (PURPLE_BLIST_NODE_IS_GROUP(bnode))
+		name = purple_group_get_name(PURPLE_GROUP(bnode));
+	else if (PURPLE_BLIST_NODE_IS_CONTACT(bnode))
+		/* Close enough */
+		name = purple_contact_get_alias(PURPLE_CONTACT(bnode));
+	else if (PURPLE_BLIST_NODE_IS_BUDDY(bnode))
+		name = purple_buddy_get_name(PURPLE_BUDDY(bnode));
+	else
+		name = "(unknown)";
+
+	purple_debug_misc("signals test", "blist_node_removed_cb (%s)\n",
+	                  name ? name : "(null)");
 }
 
 static void
@@ -601,6 +624,70 @@ notify_emails_cb(char **subjects, char **froms, char **tos, char **urls, guint c
 }
 
 /**************************************************************************
+ * Jabber signals callbacks
+ **************************************************************************/
+static gboolean
+jabber_iq_received(PurpleConnection *pc, const char *type, const char *id,
+                   const char *from, xmlnode *iq)
+{
+	purple_debug_misc("signals test", "jabber IQ (type=%s, id=%s, from=%s) %p\n",
+	                  type, id, from ? from : "(null)", iq);
+
+	/* We don't want the plugin to stop processing */
+	return FALSE;
+}
+
+static gboolean
+jabber_message_received(PurpleConnection *pc, const char *type, const char *id,
+                        const char *from, const char *to, xmlnode *message)
+{
+	purple_debug_misc("signals test", "jabber message (type=%s, id=%s, "
+	                  "from=%s to=%s) %p\n",
+	                  type ? type : "(null)", id ? id : "(null)",
+	                  from ? from : "(null)", to ? to : "(null)", message);
+
+	/* We don't want the plugin to stop processing */
+	return FALSE;
+}
+
+static gboolean
+jabber_presence_received(PurpleConnection *pc, const char *type,
+                         const char *from, xmlnode *presence)
+{
+	purple_debug_misc("signals test", "jabber presence (type=%s, from=%s) %p\n",
+	                  type ? type : "(null)", from ? from : "(null)", presence);
+
+	/* We don't want the plugin to stop processing */
+	return FALSE;
+}
+
+static gboolean
+jabber_watched_iq(PurpleConnection *pc, const char *type, const char *id,
+                  const char *from, xmlnode *child)
+{
+	purple_debug_misc("signals test", "jabber watched IQ (type=%s, id=%s, from=%s)\n"
+	                  "child %p name=%s, namespace=%s\n",
+	                  type, id, from, child, child->name,
+	                  xmlnode_get_namespace(child));
+
+	if (g_str_equal(type, "get") || g_str_equal(type, "set")) {
+		/* Send the requisite reply */
+		xmlnode *iq = xmlnode_new("iq");
+		xmlnode_set_attrib(iq, "to", from);
+		xmlnode_set_attrib(iq, "id", id);
+		xmlnode_set_attrib(iq, "type", "result");
+
+		purple_signal_emit(purple_connection_get_prpl(pc),
+		                   "jabber-sending-xmlnode", pc, &iq);
+		if (iq != NULL)
+			xmlnode_free(iq);
+	}
+
+	/* Cookie monster eats IQ stanzas; the prpl shouldn't keep processing */
+	return TRUE;
+}
+
+/**************************************************************************
  * Plugin stuff
  **************************************************************************/
 static gboolean
@@ -615,6 +702,7 @@ plugin_load(PurplePlugin *plugin)
 	void *ft_handle       = purple_xfers_get_handle();
 	void *sound_handle    = purple_sounds_get_handle();
 	void *notify_handle   = purple_notify_get_handle();
+	void *jabber_handle   = purple_plugins_find_with_id("prpl-jabber");
 
 	/* Accounts subsystem signals */
 	purple_signal_connect(accounts_handle, "account-connecting",
@@ -643,10 +731,10 @@ plugin_load(PurplePlugin *plugin)
 						plugin, PURPLE_CALLBACK(buddy_signed_on_cb), NULL);
 	purple_signal_connect(blist_handle, "buddy-signed-off",
 						plugin, PURPLE_CALLBACK(buddy_signed_off_cb), NULL);
-	purple_signal_connect(blist_handle, "buddy-added",
-						plugin, PURPLE_CALLBACK(buddy_added_cb), NULL);
-	purple_signal_connect(blist_handle, "buddy-removed",
-						plugin, PURPLE_CALLBACK(buddy_removed_cb), NULL);
+	purple_signal_connect(blist_handle, "blist-node-added",
+						plugin, PURPLE_CALLBACK(blist_node_added_cb), NULL);
+	purple_signal_connect(blist_handle, "blist-node-removed",
+						plugin, PURPLE_CALLBACK(blist_node_removed_cb), NULL);
 	purple_signal_connect(blist_handle, "buddy-icon-changed",
 						plugin, PURPLE_CALLBACK(buddy_icon_changed_cb), NULL);
 	purple_signal_connect(blist_handle, "blist-node-aliased",
@@ -760,6 +848,45 @@ plugin_load(PurplePlugin *plugin)
 	purple_signal_connect(notify_handle, "displaying-emails-notification",
 						plugin, PURPLE_CALLBACK(notify_emails_cb), NULL);
 
+	/* Jabber signals */
+	if (jabber_handle) {
+		purple_signal_connect(jabber_handle, "jabber-receiving-iq", plugin,
+		                      PURPLE_CALLBACK(jabber_iq_received), NULL);
+		purple_signal_connect(jabber_handle, "jabber-receiving-message", plugin,
+		                      PURPLE_CALLBACK(jabber_message_received), NULL);
+		purple_signal_connect(jabber_handle, "jabber-receiving-presence", plugin,
+		                      PURPLE_CALLBACK(jabber_presence_received), NULL);
+
+		/* IQ namespace signals */
+		purple_signal_emit(jabber_handle, "jabber-register-namespace-watcher",
+		                   "bogus_node", "super-duper-namespace");
+		/* The above is equivalent to doing:
+			int result = GPOINTER_TO_INT(purple_plugin_ipc_call(jabber_handle, "register_namespace_watcher", &ok, "bogus_node", "super-duper-namespace"));
+		 */
+
+		purple_signal_connect(jabber_handle, "jabber-watched-iq", plugin,
+		                      PURPLE_CALLBACK(jabber_watched_iq), NULL);
+	}
+
+	return TRUE;
+}
+
+static gboolean
+plugin_unload(PurplePlugin *plugin)
+{
+	void *jabber_handle = purple_plugins_find_with_id("prpl-jabber");
+
+	purple_signals_disconnect_by_handle(plugin);
+
+	if (jabber_handle) {
+		/* Unregister watched namespaces */
+		purple_signal_emit(jabber_handle, "jabber-unregister-namespace-watcher",
+		                   "bogus_node", "super-duper-namespace");
+		/* The above is equivalent to doing:
+		   int result = GPOINTER_TO_INT(purple_plugin_ipc_call(jabber_handle, "unregister_namespace_watcher", &ok, "bogus_node", "super-duper-namespace"));
+		 */
+	}
+
 	return TRUE;
 }
 
@@ -785,7 +912,7 @@ static PurplePluginInfo info =
 	PURPLE_WEBSITE,                                     /**< homepage       */
 
 	plugin_load,                                      /**< load           */
-	NULL,                                             /**< unload         */
+	plugin_unload,                                    /**< unload         */
 	NULL,                                             /**< destroy        */
 
 	NULL,                                             /**< ui_info        */
diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
index de4908eec1..0d6655c75a 100644
--- a/libpurple/plugins/ssl/ssl-gnutls.c
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
@@ -43,8 +43,17 @@ typedef struct
 static gnutls_certificate_client_credentials xcred;
 
 static void
+ssl_gnutls_log(int level, const char *str)
+{
+	/* GnuTLS log messages include the '\n' */
+	purple_debug_misc("gnutls", "lvl %d: %s", level, str);
+}
+
+static void
 ssl_gnutls_init_gnutls(void)
 {
+	const char *debug_level;
+
 	/* Configure GnuTLS to use glib memory management */
 	/* I expect that this isn't really necessary, but it may prevent
 	   some bugs */
@@ -59,6 +68,20 @@ ssl_gnutls_init_gnutls(void)
 		(gnutls_free_function)    g_free     /* free */
 		);
 
+	debug_level = g_getenv("PURPLE_GNUTLS_DEBUG");
+	if (debug_level) {
+		int level = atoi(debug_level);
+		if (level < 0) {
+			purple_debug_warning("gnutls", "Assuming log level 0 instead of %d\n",
+			                     level);
+			level = 0;
+		}
+
+		/* "The level is an integer between 0 and 9. Higher values mean more verbosity." */
+		gnutls_global_set_log_level(level);
+		gnutls_global_set_log_function(ssl_gnutls_log);
+	}
+
 	gnutls_global_init();
 
 	gnutls_certificate_allocate_credentials(&xcred);
@@ -576,7 +599,6 @@ x509_export_certificate(const gchar *filename, PurpleCertificate *crt)
 							  out_buf, out_size);
 
 	g_free(out_buf);
-	g_return_val_if_fail(success, FALSE);
 	return success;
 }
 
@@ -646,6 +668,8 @@ x509_certificate_signed_by(PurpleCertificate * crt,
 	gnutls_x509_crt issuer_dat;
 	unsigned int verify; /* used to store result from GnuTLS verifier */
 	int ret;
+	gchar *crt_id = NULL;
+	gchar *issuer_id = NULL;
 
 	g_return_val_if_fail(crt, FALSE);
 	g_return_val_if_fail(issuer, FALSE);
@@ -706,13 +730,29 @@ x509_certificate_signed_by(PurpleCertificate * crt,
 		return FALSE;
 	}
 
+	if (verify & GNUTLS_CERT_INSECURE_ALGORITHM) {
+		/*
+		 * A certificate in the chain is signed with an insecure
+		 * algorithm. Put a warning into the log to make this error
+		 * perfectly clear as soon as someone looks at the debug log is
+		 * generated.
+		 */
+		crt_id = purple_certificate_get_unique_id(crt);
+		issuer_id = purple_certificate_get_issuer_unique_id(crt);
+		purple_debug_warning("gnutls/x509",
+				"Insecure hash algorithm used by %s to sign %s\n",
+				issuer_id, crt_id);
+	}
+
 	if (verify & GNUTLS_CERT_INVALID) {
 		/* Signature didn't check out, but at least
 		   there were no errors*/
-		gchar *crt_id = purple_certificate_get_unique_id(crt);
-		gchar *issuer_id = purple_certificate_get_issuer_unique_id(crt);
-		purple_debug_info("gnutls/x509",
-				  "Bad signature for %s on %s\n",
+		if (!crt_id)
+			crt_id = purple_certificate_get_unique_id(crt);
+		if (!issuer_id)
+			issuer_id = purple_certificate_get_issuer_unique_id(crt);
+		purple_debug_error("gnutls/x509",
+				  "Bad signature from %s on %s\n",
 				  issuer_id, crt_id);
 		g_free(crt_id);
 		g_free(issuer_id);
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c
index 4717d2fa37..0058b40ffd 100644
--- a/libpurple/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
@@ -540,12 +540,12 @@ x509_import_from_file(const gchar *filename)
 	CERTCertificate *crt_dat;
 	PurpleCertificate *crt;
 
-	g_return_val_if_fail(filename, NULL);
+	g_return_val_if_fail(filename != NULL, NULL);
 
 	purple_debug_info("nss/x509",
 			  "Loading certificate from %s\n",
 			  filename);
-	
+
 	/* Load the raw data up */
 	if (!g_file_get_contents(filename,
 				 &rawcert, &len,
@@ -554,12 +554,20 @@ x509_import_from_file(const gchar *filename)
 		return NULL;
 	}
 
+	if (len == 0) {
+		purple_debug_error("nss/x509",
+				"Certificate file has no contents!\n");
+		if (rawcert)
+			g_free(rawcert);
+		return NULL;
+	}
+
 	/* Decode the certificate */
 	crt_dat = CERT_DecodeCertFromPackage(rawcert, len);
 	g_free(rawcert);
 
-	g_return_val_if_fail(crt_dat, NULL);
-	
+	g_return_val_if_fail(crt_dat != NULL, NULL);
+
 	crt = g_new0(PurpleCertificate, 1);
 	crt->scheme = &x509_nss;
 	crt->data = crt_dat;
diff --git a/libpurple/plugins/statenotify.c b/libpurple/plugins/statenotify.c
index 7feeba9558..bfbe595e50 100644
--- a/libpurple/plugins/statenotify.c
+++ b/libpurple/plugins/statenotify.c
@@ -71,9 +71,9 @@ buddy_idle_changed_cb(PurpleBuddy *buddy, gboolean old_idle, gboolean idle,
                       void *data)
 {
 	if (purple_prefs_get_bool("/plugins/core/statenotify/notify_idle")) {
-		if (idle) {
+		if (idle && !old_idle) {
 			write_status(buddy, _("%s has become idle."));
-		} else {
+		} else if (!idle && old_idle) {
 			write_status(buddy, _("%s is no longer idle."));
 		}
 	}
diff --git a/libpurple/plugins/tcl/tcl_cmds.c b/libpurple/plugins/tcl/tcl_cmds.c
index 53af8595ef..c8f1aeb1aa 100644
--- a/libpurple/plugins/tcl/tcl_cmds.c
+++ b/libpurple/plugins/tcl/tcl_cmds.c
@@ -683,8 +683,9 @@ int tcl_cmd_cmd(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST
 int tcl_cmd_connection(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
 	Tcl_Obj *list, *elem;
-	const char *cmds[] = { "account", "displayname", "handle", "list", NULL };
-	enum { CMD_CONN_ACCOUNT, CMD_CONN_DISPLAYNAME, CMD_CONN_HANDLE, CMD_CONN_LIST } cmd;
+	const char *cmds[] = { "account", "displayname", "handle", "list", "state", NULL };
+	enum { CMD_CONN_ACCOUNT, CMD_CONN_DISPLAYNAME, CMD_CONN_HANDLE,
+	       CMD_CONN_LIST, CMD_CONN_STATE } cmd;
 	int error;
 	GList *cur;
 	PurpleConnection *gc;
@@ -739,6 +740,25 @@ int tcl_cmd_connection(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj
 		}
 		Tcl_SetObjResult(interp, list);
 		break;
+	case CMD_CONN_STATE:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "gc");
+			return TCL_ERROR;
+		}
+		if ((gc = tcl_validate_gc(objv[2], interp)) == NULL)
+			return TCL_ERROR;
+		switch (purple_connection_get_state(gc)) {
+		case PURPLE_DISCONNECTED:
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("disconnected", -1));
+			break;
+		case PURPLE_CONNECTED:
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("connected", -1));
+			break;
+		case PURPLE_CONNECTING:
+			Tcl_SetObjResult(interp, Tcl_NewStringObj("connecting", -1));
+			break;
+		}
+		break;
 	}
 
 	return TCL_OK;
diff --git a/libpurple/pounce.c b/libpurple/pounce.c
index 2d668c735e..7f9bdedc3e 100644
--- a/libpurple/pounce.c
+++ b/libpurple/pounce.c
@@ -1157,4 +1157,7 @@ purple_pounces_uninit()
 	}
 
 	purple_signals_disconnect_by_handle(purple_pounces_get_handle());
+
+	g_hash_table_destroy(pounce_handlers);
+	pounce_handlers = NULL;
 }
diff --git a/libpurple/prefs.c b/libpurple/prefs.c
index 162045c7be..5ef0c07c08 100644
--- a/libpurple/prefs.c
+++ b/libpurple/prefs.c
@@ -118,7 +118,7 @@ pref_to_xmlnode(xmlnode *parent, struct purple_pref *pref)
 {
 	xmlnode *node, *childnode;
 	struct purple_pref *child;
-	char buf[20];
+	char buf[21];
 	GList *cur;
 
 	/* Create a new node */
@@ -128,7 +128,7 @@ pref_to_xmlnode(xmlnode *parent, struct purple_pref *pref)
 	/* Set the type of this node (if type == PURPLE_PREF_NONE then do nothing) */
 	if (pref->type == PURPLE_PREF_INT) {
 		xmlnode_set_attrib(node, "type", "int");
-		snprintf(buf, sizeof(buf), "%d", pref->value.integer);
+		g_snprintf(buf, sizeof(buf), "%d", pref->value.integer);
 		xmlnode_set_attrib(node, "value", buf);
 	}
 	else if (pref->type == PURPLE_PREF_STRING) {
@@ -161,7 +161,7 @@ pref_to_xmlnode(xmlnode *parent, struct purple_pref *pref)
 	}
 	else if (pref->type == PURPLE_PREF_BOOLEAN) {
 		xmlnode_set_attrib(node, "type", "bool");
-		snprintf(buf, sizeof(buf), "%d", pref->value.boolean);
+		g_snprintf(buf, sizeof(buf), "%d", pref->value.boolean);
 		xmlnode_set_attrib(node, "value", buf);
 	}
 
@@ -1450,6 +1450,8 @@ purple_prefs_uninit()
 		sync_prefs();
 	}
 
+	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
+
 	prefs_loaded = FALSE;
 	purple_prefs_destroy();
 	g_hash_table_destroy(prefs_hash);
diff --git a/libpurple/prefs.h b/libpurple/prefs.h
index 3129719c08..2ab5e971b7 100644
--- a/libpurple/prefs.h
+++ b/libpurple/prefs.h
@@ -315,6 +315,15 @@ GList *purple_prefs_get_children_names(const char *name);
 
 /**
  * Add a callback to a pref (and its children)
+ *
+ * @param handle   The handle of the receiver.
+ * @param name     The name of the preference
+ * @param cb       The callback function
+ * @param data     The data to pass to the callback function.
+ *
+ * @return An id to disconnect the callback
+ *
+ * @see purple_prefs_disconnect_callback
  */
 guint purple_prefs_connect_callback(void *handle, const char *name, PurplePrefCallback cb,
 		gpointer data);
diff --git a/libpurple/privacy.c b/libpurple/privacy.c
index bbb5e017fe..00dd7e4493 100644
--- a/libpurple/privacy.c
+++ b/libpurple/privacy.c
@@ -35,6 +35,7 @@ purple_privacy_permit_add(PurpleAccount *account, const char *who,
 	GSList *l;
 	char *name;
 	PurpleBuddy *buddy;
+	PurpleBlistUiOps *blist_ops;
 
 	g_return_val_if_fail(account != NULL, FALSE);
 	g_return_val_if_fail(who     != NULL, FALSE);
@@ -62,7 +63,9 @@ purple_privacy_permit_add(PurpleAccount *account, const char *who,
 	if (privacy_ops != NULL && privacy_ops->permit_added != NULL)
 		privacy_ops->permit_added(account, who);
 
-	purple_blist_schedule_save();
+	blist_ops = purple_blist_get_ui_ops();
+	if (blist_ops != NULL && blist_ops->save_account != NULL)
+		blist_ops->save_account(account);
 
 	/* This lets the UI know a buddy has had its privacy setting changed */
 	buddy = purple_find_buddy(account, name);
@@ -81,6 +84,7 @@ purple_privacy_permit_remove(PurpleAccount *account, const char *who,
 	const char *name;
 	PurpleBuddy *buddy;
 	char *del;
+	PurpleBlistUiOps *blist_ops;
 
 	g_return_val_if_fail(account != NULL, FALSE);
 	g_return_val_if_fail(who     != NULL, FALSE);
@@ -109,7 +113,9 @@ purple_privacy_permit_remove(PurpleAccount *account, const char *who,
 	if (privacy_ops != NULL && privacy_ops->permit_removed != NULL)
 		privacy_ops->permit_removed(account, who);
 
-	purple_blist_schedule_save();
+	blist_ops = purple_blist_get_ui_ops();
+	if (blist_ops != NULL && blist_ops->save_account != NULL)
+		blist_ops->save_account(account);
 
 	buddy = purple_find_buddy(account, name);
 	if (buddy != NULL) {
@@ -127,6 +133,7 @@ purple_privacy_deny_add(PurpleAccount *account, const char *who,
 	GSList *l;
 	char *name;
 	PurpleBuddy *buddy;
+	PurpleBlistUiOps *blist_ops;
 
 	g_return_val_if_fail(account != NULL, FALSE);
 	g_return_val_if_fail(who     != NULL, FALSE);
@@ -154,7 +161,9 @@ purple_privacy_deny_add(PurpleAccount *account, const char *who,
 	if (privacy_ops != NULL && privacy_ops->deny_added != NULL)
 		privacy_ops->deny_added(account, who);
 
-	purple_blist_schedule_save();
+	blist_ops = purple_blist_get_ui_ops();
+	if (blist_ops != NULL && blist_ops->save_account != NULL)
+		blist_ops->save_account(account);
 
 	buddy = purple_find_buddy(account, name);
 	if (buddy != NULL) {
@@ -172,6 +181,7 @@ purple_privacy_deny_remove(PurpleAccount *account, const char *who,
 	const char *normalized;
 	char *name;
 	PurpleBuddy *buddy;
+	PurpleBlistUiOps *blist_ops;
 
 	g_return_val_if_fail(account != NULL, FALSE);
 	g_return_val_if_fail(who     != NULL, FALSE);
@@ -205,7 +215,10 @@ purple_privacy_deny_remove(PurpleAccount *account, const char *who,
 	}
 
 	g_free(name);
-	purple_blist_schedule_save();
+
+	blist_ops = purple_blist_get_ui_ops();
+	if (blist_ops != NULL && blist_ops->save_account != NULL)
+		blist_ops->save_account(account);
 
 	return TRUE;
 }
diff --git a/libpurple/privacy.h b/libpurple/privacy.h
index 2911758fc3..0250541128 100644
--- a/libpurple/privacy.h
+++ b/libpurple/privacy.h
@@ -26,8 +26,6 @@
 #ifndef _PURPLE_PRIVACY_H_
 #define _PURPLE_PRIVACY_H_
 
-#include "account.h"
-
 /**
  * Privacy data types.
  */
@@ -40,6 +38,8 @@ typedef enum _PurplePrivacyType
 	PURPLE_PRIVACY_ALLOW_BUDDYLIST
 } PurplePrivacyType;
 
+#include "account.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libpurple/protocols/Makefile.am b/libpurple/protocols/Makefile.am
index c904076abb..97d1de9357 100644
--- a/libpurple/protocols/Makefile.am
+++ b/libpurple/protocols/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = Makefile.mingw
 
-DIST_SUBDIRS = bonjour gg irc jabber msn msnp9 myspace novell null oscar qq sametime silc silc10 toc simple yahoo zephyr
+DIST_SUBDIRS = bonjour gg irc jabber msn msnp9 myspace novell null oscar qq sametime silc silc10 simple yahoo zephyr
 
 SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
diff --git a/libpurple/protocols/bonjour/bonjour.c b/libpurple/protocols/bonjour/bonjour.c
index f053940186..39eca55502 100644
--- a/libpurple/protocols/bonjour/bonjour.c
+++ b/libpurple/protocols/bonjour/bonjour.c
@@ -89,13 +89,12 @@ bonjour_login(PurpleAccount *account)
 #ifdef _WIN32
 	if (!dns_sd_available()) {
 		purple_connection_error_reason(gc,
-			PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-			_("The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: "
-			  "http://d.pidgin.im/BonjourWindows"
-			  " for more information."));
+				PURPLE_CONNECTION_ERROR_OTHER_ERROR,
+				_("Unable to find Apple's \"Bonjour for Windows\" toolkit, see "
+				  "http://d.pidgin.im/BonjourWindows for more information."));
 		return;
 	}
-#endif
+#endif /* _WIN32 */
 
 	gc->flags |= PURPLE_CONNECTION_HTML;
 	gc->proto_data = bd = g_new0(BonjourData, 1);
@@ -108,8 +107,8 @@ bonjour_login(PurpleAccount *account)
 	if (bonjour_jabber_start(bd->jabber_data) == -1) {
 		/* Send a message about the connection error */
 		purple_connection_error_reason (gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Unable to listen for incoming IM connections\n"));
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+				_("Unable to listen for incoming IM connections"));
 		return;
 	}
 
@@ -498,13 +497,13 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,                                                    /* whiteboard_prpl_ops */
 	NULL,                                                    /* send_raw */
 	NULL,                                                    /* roomlist_room_serialize */
-
-	/* padding */
-	NULL,
-	NULL,
-	NULL,
-	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	NULL,                                                    /* unregister_user */
+	NULL,                                                    /* send_attention */
+	NULL,                                                    /* get_attention_types */
+	sizeof(PurplePluginProtocolInfo),                        /* struct_size */
+	NULL,                                                    /* get_account_text_table */
+	NULL,                                                    /* initiate_media */
+	NULL                                                     /* can_do_media */
 };
 
 static PurplePluginInfo info =
diff --git a/libpurple/protocols/bonjour/bonjour_ft.c b/libpurple/protocols/bonjour/bonjour_ft.c
index 93b9f1fe01..2d326992db 100644
--- a/libpurple/protocols/bonjour/bonjour_ft.c
+++ b/libpurple/protocols/bonjour/bonjour_ft.c
@@ -450,9 +450,11 @@ xep_si_parse(PurpleConnection *pc, xmlnode *packet, PurpleBuddy *pb)
 
 				/* TODO: Make sure that it is advertising a bytestreams transfer */
 
-				bonjour_xfer_receive(pc, id, sid, name, filesize, filename, XEP_BYTESTREAMS);
+				if (filename) {
+					bonjour_xfer_receive(pc, id, sid, name, filesize, filename, XEP_BYTESTREAMS);
 
-				parsed_receive = TRUE;
+					parsed_receive = TRUE;
+				}
 			}
 
 			if (!parsed_receive) {
@@ -880,7 +882,9 @@ bonjour_bytestreams_connect(PurpleXfer *xfer, PurpleBuddy *pb)
 	purple_proxy_info_set_type(xf->proxy_info, PURPLE_PROXY_SOCKS5);
 	purple_proxy_info_set_host(xf->proxy_info, xf->proxy_host);
 	purple_proxy_info_set_port(xf->proxy_info, xf->proxy_port);
-	xf->proxy_connection = purple_proxy_connect_socks5(NULL, xf->proxy_info,
+	xf->proxy_connection = purple_proxy_connect_socks5(
+							   purple_account_get_connection(account),
+							   xf->proxy_info,
 							   dstaddr, 0,
 							   bonjour_bytestreams_connect_cb, xfer);
 
diff --git a/libpurple/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c
index 3ee7dd54dc..e07a95f960 100644
--- a/libpurple/protocols/bonjour/jabber.c
+++ b/libpurple/protocols/bonjour/jabber.c
@@ -233,26 +233,22 @@ _jabber_parse_and_write_message_to_ui(xmlnode *message_node, PurpleBuddy *pb)
 struct _match_buddies_by_address_t {
 	const char *address;
 	GSList *matched_buddies;
-	BonjourJabber *jdata;
 };
 
 static void
-_match_buddies_by_address(gpointer key, gpointer value, gpointer data)
+_match_buddies_by_address(gpointer value, gpointer data)
 {
 	PurpleBuddy *pb = value;
-	PurpleAccount *account = NULL;
 	BonjourBuddy *bb = NULL;
 	struct _match_buddies_by_address_t *mbba = data;
 
-	account = purple_buddy_get_account(pb);
 	bb = purple_buddy_get_protocol_data(pb);
 
 	/*
-	 * If the current PurpleBuddy's data is not null and the PurpleBuddy's account
-	 * is the same as the account requesting the check then continue to determine
+	 * If the current PurpleBuddy's data is not null, then continue to determine
 	 * whether one of the buddies IPs matches the target IP.
 	 */
-	if (mbba->jdata->account == account && bb != NULL)
+	if (bb != NULL)
 	{
 		const char *ip;
 		GSList *tmp = bb->ips;
@@ -638,6 +634,7 @@ _server_socket_handler(gpointer data, int server_socket, PurpleInputCondition co
 	char *address_text = NULL;
 	struct _match_buddies_by_address_t *mbba;
 	BonjourJabberConversation *bconv;
+	GSList *buddies;
 
 	/* Check that it is a read condition */
 	if (condition != PURPLE_INPUT_READ)
@@ -657,12 +654,13 @@ _server_socket_handler(gpointer data, int server_socket, PurpleInputCondition co
 	purple_debug_info("bonjour", "Received incoming connection from %s.\n", address_text);
 	mbba = g_new0(struct _match_buddies_by_address_t, 1);
 	mbba->address = address_text;
-	mbba->jdata = jdata;
-	g_hash_table_foreach(purple_blist_get_buddies(), _match_buddies_by_address, mbba);
+
+	buddies = purple_find_buddies(jdata->account, NULL);
+	g_slist_foreach(buddies, _match_buddies_by_address, mbba);
+	g_slist_free(buddies);
 
 	if (mbba->matched_buddies == NULL) {
 		purple_debug_info("bonjour", "We don't like invisible buddies, this is not a superheros comic\n");
-		g_slist_free(mbba->matched_buddies);
 		g_free(mbba);
 		close(client_socket);
 		return;
@@ -688,11 +686,13 @@ bonjour_jabber_start(BonjourJabber *jdata)
 	struct sockaddr_in my_addr;
 
 	/* Open a listening socket for incoming conversations */
-	if ((jdata->socket = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
-		purple_debug_error("bonjour", "Cannot open socket: %s\n", g_strerror(errno));
+	jdata->socket = socket(PF_INET, SOCK_STREAM, 0);
+	if (jdata->socket < 0) {
+		gchar *buf = g_strdup_printf(_("Unable to create socket: %s"),
+				g_strerror(errno));
 		purple_connection_error_reason(jdata->account->gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Cannot open socket"));
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, buf);
+		g_free(buf);
 		return -1;
 	}
 
@@ -701,25 +701,31 @@ bonjour_jabber_start(BonjourJabber *jdata)
 
 	/* Try to use the specified port - if it isn't available, use a random port */
 	my_addr.sin_port = htons(jdata->port);
-	if (bind(jdata->socket, (struct sockaddr*)&my_addr, sizeof(struct sockaddr)) != 0) {
-		purple_debug_info("bonjour", "Unable to bind to specified port %u (%s).\n", jdata->port, g_strerror(errno));
+	if (bind(jdata->socket, (struct sockaddr*)&my_addr, sizeof(struct sockaddr)) != 0)
+	{
+		purple_debug_info("bonjour", "Unable to bind to specified "
+				"port %i: %s\n", jdata->port, g_strerror(errno));
 		my_addr.sin_port = 0;
-		if (bind(jdata->socket, (struct sockaddr*)&my_addr, sizeof(struct sockaddr)) != 0) {
-			purple_debug_error("bonjour", "Unable to bind to system assigned port (%s).\n", g_strerror(errno));
+		if (bind(jdata->socket, (struct sockaddr*)&my_addr, sizeof(struct sockaddr)) != 0)
+		{
+			gchar *buf = g_strdup_printf(_("Unable to bind socket "
+					"to port: %s"), g_strerror(errno));
 			purple_connection_error_reason(jdata->account->gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Could not bind socket to port"));
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, buf);
+			g_free(buf);
 			return -1;
 		}
 		jdata->port = purple_network_get_port_from_fd(jdata->socket);
 	}
 
 	/* Attempt to listen on the bound socket */
-	if (listen(jdata->socket, 10) != 0) {
-		purple_debug_error("bonjour", "Cannot listen on socket: %s\n", g_strerror(errno));
+	if (listen(jdata->socket, 10) != 0)
+	{
+		gchar *buf = g_strdup_printf(_("Unable to listen on socket: %s"),
+				g_strerror(errno));
 		purple_connection_error_reason(jdata->account->gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Could not listen on socket"));
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, buf);
+		g_free(buf);
 		return -1;
 	}
 
@@ -850,11 +856,14 @@ void
 bonjour_jabber_conv_match_by_ip(BonjourJabberConversation *bconv) {
 	BonjourJabber *jdata = ((BonjourData*) bconv->account->gc->proto_data)->jabber_data;
 	struct _match_buddies_by_address_t *mbba;
+	GSList *buddies;
 
 	mbba = g_new0(struct _match_buddies_by_address_t, 1);
 	mbba->address = bconv->ip;
-	mbba->jdata = jdata;
-	g_hash_table_foreach(purple_blist_get_buddies(), _match_buddies_by_address, mbba);
+
+	buddies = purple_find_buddies(jdata->account, NULL);
+	g_slist_foreach(buddies, _match_buddies_by_address, mbba);
+	g_slist_free(buddies);
 
 	/* If there is exactly one match, use it */
 	if(mbba->matched_buddies != NULL) {
@@ -925,7 +934,9 @@ _find_or_start_conversation(BonjourJabber *jdata, const gchar *to)
 		}
 		purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_NONE);
 
-		connect_data = purple_proxy_connect(NULL, jdata->account,
+		connect_data = purple_proxy_connect(
+						    purple_account_get_connection(jdata->account),
+						    jdata->account,
 						    ip, bb->port_p2pj, _connected_to_buddy, pb);
 
 		if (connect_data == NULL) {
diff --git a/libpurple/protocols/bonjour/mdns_avahi.c b/libpurple/protocols/bonjour/mdns_avahi.c
index 69e65b5628..067dbed96e 100644
--- a/libpurple/protocols/bonjour/mdns_avahi.c
+++ b/libpurple/protocols/bonjour/mdns_avahi.c
@@ -200,8 +200,8 @@ _resolver_callback(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtoco
 			}
 
 			if (!bonjour_buddy_check(bb)) {
-				_cleanup_resolver_data(rd);
 				b_impl->resolvers = g_slist_remove(b_impl->resolvers, rd);
+				_cleanup_resolver_data(rd);
 				/* If this was the last resolver, remove the buddy */
 				if (b_impl->resolvers == NULL) {
 					if (pb != NULL)
@@ -357,14 +357,16 @@ _buddy_icon_record_cb(AvahiRecordBrowser *b, AvahiIfIndex interface, AvahiProtoc
 	AvahiBuddyImplData *idata = buddy->mdns_impl_data;
 
 	switch (event) {
+		case AVAHI_BROWSER_CACHE_EXHAUSTED:
+		case AVAHI_BROWSER_ALL_FOR_NOW:
+			/* Ignore these "meta" informational events */
+			return;
 		case AVAHI_BROWSER_NEW:
 			bonjour_buddy_got_buddy_icon(buddy, rdata, size);
 			break;
 		case AVAHI_BROWSER_REMOVE:
-		case AVAHI_BROWSER_CACHE_EXHAUSTED:
-		case AVAHI_BROWSER_ALL_FOR_NOW:
 		case AVAHI_BROWSER_FAILURE:
-			purple_debug_error("bonjour", "Error rerieving buddy icon record: %s\n",
+			purple_debug_error("bonjour", "Error retrieving buddy icon record: %s\n",
 				avahi_strerror(avahi_client_errno(avahi_record_browser_get_client(b))));
 			break;
 	}
diff --git a/libpurple/protocols/bonjour/mdns_win32.c b/libpurple/protocols/bonjour/mdns_win32.c
index 10ee701e9f..fb94484020 100644
--- a/libpurple/protocols/bonjour/mdns_win32.c
+++ b/libpurple/protocols/bonjour/mdns_win32.c
@@ -169,14 +169,17 @@ _mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_mess
 	gboolean delete_buddy = FALSE;
 	PurpleBuddy *pb = NULL;
 
+	if ((pb = purple_find_buddy(args->account, args->res_data->name))) {
+		if (pb->proto_data != args->bb) {
+			purple_debug_error("bonjour", "Found purple buddy for %s not matching bonjour buddy record.",
+				args->res_data->name);
+			goto cleanup;
+		}
 	/* Make sure that the BonjourBuddy associated with this request is still around */
-	if (g_slist_find(pending_buddies, args->bb) == NULL)
+	} else if (g_slist_find(pending_buddies, args->bb) == NULL) {
+		purple_debug_error("bonjour", "host resolution - complete, but buddy no longer pending.\n");
 		goto cleanup;
-
-	if ((pb = purple_find_buddy(args->account, args->bb->name)))
-		if (pb->proto_data != args->bb)
-			purple_debug_error("bonjour", "Found purple buddy for %s not matching bonjour buddy record. "
-				"This is going to be ugly!.\n", args->bb->name);
+	}
 
 	if (!hosts || !hosts->data) {
 		purple_debug_error("bonjour", "host resolution - callback error.\n");
diff --git a/libpurple/protocols/bonjour/parser.c b/libpurple/protocols/bonjour/parser.c
index 44a8e8bd99..b5fbbd4a4d 100644
--- a/libpurple/protocols/bonjour/parser.c
+++ b/libpurple/protocols/bonjour/parser.c
@@ -91,14 +91,12 @@ bonjour_parser_element_start_libxml(void *user_data,
 		xmlnode_set_namespace(node, (const char*) namespace);
 
 		for(i=0; i < nb_attributes * 5; i+=5) {
+			const char *name = (const char *)attributes[i];
+			const char *prefix = (const char *)attributes[i+1];
+			const char *attrib_ns = (const char *)attributes[i+2];
 			char *txt;
 			int attrib_len = attributes[i+4] - attributes[i+3];
 			char *attrib = g_malloc(attrib_len + 1);
-			char *attrib_ns = NULL;
-
-			if (attributes[i+2]) {
-				attrib_ns = g_strdup((char*)attributes[i+2]);
-			}
 
 			memcpy(attrib, attributes[i+3], attrib_len);
 			attrib[attrib_len] = '\0';
@@ -106,9 +104,8 @@ bonjour_parser_element_start_libxml(void *user_data,
 			txt = attrib;
 			attrib = purple_unescape_html(txt);
 			g_free(txt);
-			xmlnode_set_attrib_with_namespace(node, (const char*) attributes[i], attrib_ns, attrib);
+			xmlnode_set_attrib_full(node, name, attrib_ns, prefix, attrib);
 			g_free(attrib);
-			g_free(attrib_ns);
 		}
 
 		bconv->current = node;
@@ -156,6 +153,18 @@ bonjour_parser_element_text_libxml(void *user_data, const xmlChar *text, int tex
 	xmlnode_insert_data(bconv->current, (const char*) text, text_len);
 }
 
+static void
+bonjour_parser_structured_error_handler(void *user_data, xmlErrorPtr error)
+{
+	BonjourJabberConversation *bconv = user_data;
+
+	purple_debug_error("jabber", "XML parser error for BonjourJabberConversation %p: "
+	                             "Domain %i, code %i, level %i: %s",
+	                   bconv,
+	                   error->domain, error->code, error->level,
+	                   (error->message ? error->message : "(null)\n"));
+}
+
 static xmlSAXHandler bonjour_parser_libxml = {
 	NULL,									/*internalSubset*/
 	NULL,									/*isStandalone*/
@@ -188,7 +197,7 @@ static xmlSAXHandler bonjour_parser_libxml = {
 	NULL,									/*_private*/
 	bonjour_parser_element_start_libxml,	/*startElementNs*/
 	bonjour_parser_element_end_libxml,		/*endElementNs*/
-	NULL									/*serror*/
+	bonjour_parser_structured_error_handler /*serror*/
 };
 
 void
diff --git a/libpurple/protocols/gg/buddylist.c b/libpurple/protocols/gg/buddylist.c
index 6e2752e6a5..f83e6b0fad 100644
--- a/libpurple/protocols/gg/buddylist.c
+++ b/libpurple/protocols/gg/buddylist.c
@@ -40,57 +40,33 @@ void ggp_buddylist_send(PurpleConnection *gc)
 {
 	GGPInfo *info = gc->proto_data;
 	PurpleAccount *account = purple_connection_get_account(gc);
+	GSList *buddies;
+	uin_t *userlist;
+	gchar *types;
+	int i = 0, ret = 0;
+	int size;
 
-	PurpleBlistNode *gnode, *cnode, *bnode;
-	PurpleBuddy *buddy;
-	uin_t *userlist = NULL;
-	gchar *types = NULL;
-	int size = 0, ret = 0;
-
-	for (gnode = purple_blist_get_root();
-	     gnode != NULL;
-	     gnode = purple_blist_node_get_sibling_next(gnode))
-	{
-		if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-
-		for (cnode = purple_blist_node_get_first_child(gnode);
-		     cnode != NULL;
-		     cnode = purple_blist_node_get_sibling_next(cnode))
-		{
-			if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
+	buddies = purple_find_buddies(account, NULL);
 
-			for (bnode = purple_blist_node_get_first_child(cnode);
-			     bnode != NULL;
-			     bnode = purple_blist_node_get_sibling_next(bnode))
-			{
-				const gchar *name = NULL;
+	size = g_slist_length(buddies);
+	userlist = g_new(uin_t, size);
+	types    = g_new(gchar, size);
 
-				if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-
-				buddy = (PurpleBuddy *)bnode;
-
-				if (purple_buddy_get_account(buddy) != account)
-					continue;
-
-				name = purple_buddy_get_name(buddy);
+	for (buddies = purple_find_buddies(account, NULL); buddies;
+			buddies = g_slist_delete_link(buddies, buddies), ++i)
+	{
+		PurpleBuddy *buddy = buddies->data;
+		const gchar *name = purple_buddy_get_name(buddy);
 
-				size++;
-				userlist = (uin_t *) g_renew(uin_t, userlist, size);
-				types    = (gchar *) g_renew(gchar, types, size);
-				userlist[size - 1] = ggp_str_to_uin(name);
-				types[size - 1]    = GG_USER_NORMAL;
-				purple_debug_info("gg", "ggp_buddylist_send: adding %d\n",
-						userlist[size - 1]);
-			}
-		}
+		userlist[i] = ggp_str_to_uin(name);
+		types[i]    = GG_USER_NORMAL;
+		purple_debug_info("gg", "ggp_buddylist_send: adding %d\n",
+		                  userlist[i]);
 	}
 
 	ret = gg_notify_ex(info->session, userlist, types, size);
 	purple_debug_info("gg", "send: ret=%d; size=%d\n", ret, size);
-	
+
 	if (userlist) {
 		g_free(userlist);
 		g_free(types);
@@ -178,105 +154,28 @@ void ggp_buddylist_load(PurpleConnection *gc, char *buddylist)
 }
 /* }}} */
 
-/* void ggp_buddylist_offline(PurpleConnection *gc) {{{ */
-void ggp_buddylist_offline(PurpleConnection *gc)
-{
-	PurpleAccount *account = purple_connection_get_account(gc);
-	PurpleBlistNode *gnode, *cnode, *bnode;
-	PurpleBuddy *buddy;
-
-	for (gnode = purple_blist_get_root();
-	     gnode != NULL;
-	     gnode = purple_blist_node_get_sibling_next(gnode))
-	{
-		if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-
-		for (cnode = purple_blist_node_get_first_child(gnode);
-		     cnode != NULL;
-		     cnode = purple_blist_node_get_sibling_next(cnode))
-		{
-			if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-
-			for (bnode = purple_blist_node_get_first_child(cnode);
-			     bnode != NULL;
-			     bnode = purple_blist_node_get_sibling_next(bnode))
-			{
-				const gchar *name = NULL;
-
-				if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-
-				buddy = (PurpleBuddy *)bnode;
-				
-				name = purple_buddy_get_name(buddy);
-
-				if (purple_buddy_get_account(buddy) != account)
-					continue;
-
-				purple_prpl_got_user_status(
-					account, name, "offline", NULL);
-
-				purple_debug_info("gg",
-					"ggp_buddylist_offline: gone: %s\n",
-					name);
-			}
-		}
-	}
-}
-/* }}} */
-
 /* char *ggp_buddylist_dump(PurpleAccount *account) {{{ */
 char *ggp_buddylist_dump(PurpleAccount *account)
 {
-	PurpleBlistNode *gnode, *cnode, *bnode;
-	PurpleGroup *group;
-	PurpleBuddy *buddy;
+	GSList *buddies;
 	GString *buddylist = g_string_sized_new(1024);
 	char *ptr;
 
-	for (gnode = purple_blist_get_root();
-	     gnode != NULL;
-	     gnode = purple_blist_node_get_sibling_next(gnode))
-	{
-		if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-
-		group = (PurpleGroup *)gnode;
-
-		for (cnode = purple_blist_node_get_first_child(gnode);
-		     cnode != NULL;
-		     cnode = purple_blist_node_get_sibling_next(cnode))
-		{
-			if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-
-			for (bnode = purple_blist_node_get_first_child(cnode);
-			     bnode != NULL;
-			     bnode = purple_blist_node_get_sibling_next(bnode))
-			{
-				const gchar *name, *alias, *gname;
-
-				if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-
-				buddy = (PurpleBuddy *)bnode;
-				if (purple_buddy_get_account(buddy) != account)
-					continue;
-
-				name = purple_buddy_get_name(buddy);
-				alias = purple_buddy_get_alias(buddy);
-				if(alias == NULL)
-					alias = name;
-				gname = purple_group_get_name(group);
-
-				g_string_append_printf(buddylist,
-						"%s;%s;%s;%s;%s;%s;%s;%s%s\r\n",
-						alias, alias, alias, alias,
-						"", gname, name, "", "");
-			}
-		}
+	for (buddies = purple_find_buddies(account, NULL); buddies;
+			buddies = g_slist_delete_link(buddies, buddies)) {
+		PurpleBuddy *buddy = buddies->data;
+		PurpleGroup *group = purple_buddy_get_group(buddy);
+		const char *bname = purple_buddy_get_name(buddy);
+		const char *gname = purple_group_get_name(group);
+		const char *alias = purple_buddy_get_alias(buddy);
+
+		if (alias == NULL)
+			alias = bname;
+
+		g_string_append_printf(buddylist,
+				"%s;%s;%s;%s;%s;%s;%s;%s%s\r\n",
+				alias, alias, alias, alias,
+				"", gname, bname, "", "");
 	}
 
 	ptr = charset_convert(buddylist->str, "UTF-8", "CP1250");
diff --git a/libpurple/protocols/gg/buddylist.h b/libpurple/protocols/gg/buddylist.h
index ed31974db6..86a47b3292 100644
--- a/libpurple/protocols/gg/buddylist.h
+++ b/libpurple/protocols/gg/buddylist.h
@@ -31,7 +31,7 @@ void
 ggp_buddylist_send(PurpleConnection *gc);
 
 /**
- * Load buddylist from server into the rooster.
+ * Load buddylist from server into the roster.
  *
  * @param gc PurpleConnection
  * @param buddylist Pointer to the buddylist that will be loaded.
@@ -41,14 +41,6 @@ void
 ggp_buddylist_load(PurpleConnection *gc, char *buddylist);
 
 /**
- * Set offline status for all buddies.
- *
- * @param gc Connection handler
- */
-void
-ggp_buddylist_offline(PurpleConnection *gc);
-
-/**
  * Get all the buddies in the current account.
  *
  * @param account Current account.
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
index 28ad424a0c..c66be1b7b5 100644
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -7,6 +7,7 @@
  *
  * Some parts of the code are adapted or taken from the previous implementation
  * of this plugin written by Arkadiusz Miskiewicz <misiek@pld.org.pl>
+ * Some parts Copyright (C) 2009  Krzysztof Klinikowski <grommasher@gmail.com>
  *
  * Thanks to Google's Summer of Code Program.
  *
@@ -36,6 +37,7 @@
 #include "debug.h"
 #include "util.h"
 #include "request.h"
+#include "xmlnode.h"
 
 #include <libgadu.h>
 
@@ -350,14 +352,14 @@ static void ggp_callback_register_account_ok(PurpleConnection *gc,
 	    *email == '\0' || *p1 == '\0' || *p2 == '\0' || *t == '\0') {
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-			_("Fill in the registration fields."));
+			_("You must fill in all registration fields"));
 		goto exit_err;
 	}
 
 	if (g_utf8_collate(p1, p2) != 0) {
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
-			_("Passwords do not match."));
+			_("Passwords do not match"));
 		goto exit_err;
 	}
 
@@ -367,7 +369,7 @@ static void ggp_callback_register_account_ok(PurpleConnection *gc,
 	if (h == NULL || !(s = h->data) || !s->success) {
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-			_("Unable to register new account. Error occurred.\n"));
+			_("Unable to register new account.  An unknown error occurred."));
 		goto exit_err;
 	}
 
@@ -448,18 +450,18 @@ static void ggp_register_user_dialog(PurpleConnection *gc)
 	purple_request_field_group_add_field(group, field);
 
 	field = purple_request_field_string_new("password2",
-			_("Password (retype)"), "", FALSE);
+			_("Password (again)"), "", FALSE);
 	purple_request_field_string_set_masked(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
 	field = purple_request_field_string_new("token",
-			_("Enter current token"), "", FALSE);
+			_("Enter captcha text"), "", FALSE);
 	purple_request_field_string_set_masked(field, FALSE);
 	purple_request_field_group_add_field(group, field);
 
 	/* original size: 60x24 */
 	field = purple_request_field_image_new("token_img",
-			_("Current token"), token->data, token->size);
+			_("Captcha"), token->data, token->size);
 	purple_request_field_group_add_field(group, field);
 
 	purple_request_fields(account,
@@ -858,6 +860,133 @@ static void ggp_bmenu_block(PurpleBlistNode *node, gpointer ignored)
 static void ggp_set_status(PurpleAccount *account, PurpleStatus *status);
 static int ggp_to_gg_status(PurpleStatus *status, char **msg);
 
+struct gg_fetch_avatar_data
+{
+	PurpleConnection *gc;
+	gchar *uin;
+	gchar *avatar_url;
+};
+
+
+static void gg_fetch_avatar_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
+               const gchar *data, size_t len, const gchar *error_message) {
+	struct gg_fetch_avatar_data *d = user_data;
+	PurpleAccount *account;
+	PurpleBuddy *buddy;
+	gpointer buddy_icon_data;
+
+	/* FIXME: This shouldn't be necessary */
+	if (!PURPLE_CONNECTION_IS_VALID(d->gc)) {
+		g_free(d->uin);
+		g_free(d->avatar_url);
+		g_free(d);
+		g_return_if_reached();
+	}
+
+	account = purple_connection_get_account(d->gc);
+	buddy = purple_find_buddy(account, d->uin);
+
+	if (buddy == NULL)
+		goto out;
+
+	buddy_icon_data = g_memdup(data, len);
+
+	purple_buddy_icons_set_for_user(account, purple_buddy_get_name(buddy),
+			buddy_icon_data, len, d->avatar_url);
+	purple_debug_info("gg", "UIN: %s should have avatar now\n", d->uin);
+
+out:
+	g_free(d->uin);
+	g_free(d->avatar_url);
+	g_free(d);
+}
+
+static void gg_get_avatar_url_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
+               const gchar *url_text, size_t len, const gchar *error_message) {
+	struct gg_fetch_avatar_data *data;
+	PurpleConnection *gc = user_data;
+	PurpleAccount *account;
+	PurpleBuddy *buddy;
+	const char *uin;
+	const char *is_blank;
+	const char *checksum;
+
+	gchar *bigavatar = NULL;
+	xmlnode *xml = NULL;
+	xmlnode *xmlnode_users;
+	xmlnode *xmlnode_user;
+	xmlnode *xmlnode_avatars;
+	xmlnode *xmlnode_avatar;
+	xmlnode *xmlnode_bigavatar;
+
+	g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc));
+	account = purple_connection_get_account(gc);
+
+	if (error_message != NULL)
+		purple_debug_error("gg", "gg_get_avatars_cb error: %s\n", error_message);
+	else if (len > 0 && url_text && *url_text) {
+		xml = xmlnode_from_str(url_text, -1);
+		if (xml == NULL)
+			goto out;
+
+		xmlnode_users = xmlnode_get_child(xml, "users");
+		if (xmlnode_users == NULL)
+			goto out;
+
+		xmlnode_user = xmlnode_get_child(xmlnode_users, "user");
+		if (xmlnode_user == NULL)
+			goto out;
+
+		uin = xmlnode_get_attrib(xmlnode_user, "uin");
+
+		xmlnode_avatars = xmlnode_get_child(xmlnode_user, "avatars");
+		if (xmlnode_avatars == NULL)
+			goto out;
+
+		xmlnode_avatar = xmlnode_get_child(xmlnode_avatars, "avatar");
+		if (xmlnode_avatar == NULL)
+			goto out;
+
+		xmlnode_bigavatar = xmlnode_get_child(xmlnode_avatar, "bigAvatar");
+		if (xmlnode_bigavatar == NULL)
+			goto out;
+
+		is_blank = xmlnode_get_attrib(xmlnode_avatar, "blank");
+		bigavatar = xmlnode_get_data(xmlnode_bigavatar);
+
+		purple_debug_info("gg", "gg_get_avatar_url_cb: UIN %s, IS_BLANK %s, "
+		                        "URL %s\n",
+		                  uin ? uin : "(null)", is_blank ? is_blank : "(null)",
+		                  bigavatar ? bigavatar : "(null)");
+
+		if (uin != NULL && bigavatar != NULL) {
+			buddy = purple_find_buddy(account, uin);
+			if (buddy == NULL)
+				goto out;
+
+			checksum = purple_buddy_icons_get_checksum_for_user(buddy);
+
+			if (purple_strequal(is_blank, "1")) {
+				purple_buddy_icons_set_for_user(account,
+						purple_buddy_get_name(buddy), NULL, 0, NULL);
+			} else if (!purple_strequal(checksum, bigavatar)) {
+				data = g_new0(struct gg_fetch_avatar_data, 1);
+				data->gc = gc;
+				data->uin = g_strdup(uin);
+				data->avatar_url = g_strdup(bigavatar);
+
+				url_data = purple_util_fetch_url_request_len_with_account(account,
+						bigavatar, TRUE, "Mozilla/4.0 (compatible; MSIE 5.0)",
+						FALSE, NULL, FALSE, -1, gg_fetch_avatar_cb, data);
+			}
+		}
+	}
+
+out:
+	if (xml)
+		xmlnode_free(xml);
+	g_free(bigavatar);
+}
 
 /**
  * Handle change of the status of the buddy.
@@ -873,8 +1002,19 @@ static void ggp_generic_status_handler(PurpleConnection *gc, uin_t uin,
 	gchar *from;
 	const char *st;
 	gchar *msg;
+	gchar *avatarurl;
+	PurpleUtilFetchUrlData *url_data;
+
+	from = g_strdup_printf("%u", uin);
+	avatarurl = g_strdup_printf("http://api.gadu-gadu.pl/avatars/%s/0.xml", from);
+
+	url_data = purple_util_fetch_url_request_len_with_account(
+			purple_connection_get_account(gc), avatarurl, TRUE,
+			"Mozilla/4.0 (compatible; MSIE 5.5)", FALSE, NULL, FALSE, -1,
+			gg_get_avatar_url_cb, gc);
+
+	g_free(avatarurl);
 
-	from = g_strdup_printf("%ld", (unsigned long int)uin);
 	switch (status) {
 		case GG_STATUS_NOT_AVAIL:
 		case GG_STATUS_NOT_AVAIL_DESCR:
@@ -931,12 +1071,15 @@ static const char *ggp_status_by_id(unsigned int id)
 	purple_debug_info("gg", "ggp_status_by_id: %d\n", id);
 	switch (id) {
 		case GG_STATUS_NOT_AVAIL:
+		case GG_STATUS_NOT_AVAIL_DESCR:
 			st = _("Offline");
 			break;
 		case GG_STATUS_AVAIL:
+		case GG_STATUS_AVAIL_DESCR:
 			st = _("Available");
 			break;
 		case GG_STATUS_BUSY:
+		case GG_STATUS_BUSY_DESCR:
 			st = _("Away");
 			break;
 		default:
@@ -1387,7 +1530,7 @@ static void ggp_callback_recv(gpointer _gc, gint fd, PurpleInputCondition cond)
 			"ggp_callback_recv: gg_watch_fd failed -- CRITICAL!\n");
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Unable to read socket"));
+			_("Unable to read from socket"));
 		return;
 	}
 	gc->last_received = time(NULL);
@@ -1545,7 +1688,7 @@ static void ggp_async_login_handler(gpointer _gc, gint fd, PurpleInputCondition
 		purple_debug_error("gg", "login_handler: gg_watch_fd failed!\n");
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Unable to read socket"));
+			_("Unable to read from socket"));
 		return;
 	}
 	purple_debug_info("gg", "login_handler: session->fd = %d\n", info->session->fd);
@@ -1572,9 +1715,10 @@ static void ggp_async_login_handler(gpointer _gc, gint fd, PurpleInputCondition
 				gc->inpa = purple_input_add(info->session->fd,
 							  PURPLE_INPUT_READ,
 							  ggp_callback_recv, gc);
-
-				purple_connection_set_state(gc, PURPLE_CONNECTED);
+				
 				ggp_buddylist_send(gc);
+				purple_connection_update_progress(gc, _("Connected"), 2, 2);
+				purple_connection_set_state(gc, PURPLE_CONNECTED);
 			}
 			break;
 		case GG_EVENT_CONN_FAILED:
@@ -1582,7 +1726,7 @@ static void ggp_async_login_handler(gpointer _gc, gint fd, PurpleInputCondition
 			gc->inpa = 0;
 			purple_connection_error_reason (gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Connection failed."));
+				_("Connection failed"));
 			break;
 		default:
 			purple_debug_error("gg", "strange event: %d\n", ev->type);
@@ -1759,6 +1903,7 @@ static void ggp_login(PurpleAccount *account)
 	PurpleStatus *status;
 	struct gg_login_params *glp;
 	GGPInfo *info;
+	const char *address;
 
 	if (ggp_setup_proxy(account) == -1)
 		return;
@@ -1789,11 +1934,34 @@ static void ggp_login(PurpleAccount *account)
 	glp->status = ggp_to_gg_status(status, &glp->status_descr);
 	glp->tls = 0;
 
+	address = purple_account_get_string(account, "gg_server", "");
+	if (address && *address) {
+		/* TODO: Make this non-blocking */
+		struct in_addr *addr = gg_gethostbyname(address);
+
+		purple_debug_info("gg", "Using gg server given by user (%s)\n", address);
+
+		if (addr == NULL) {
+			gchar *tmp = g_strdup_printf(_("Unable to resolve hostname '%s': %s"),
+					address, g_strerror(errno));
+			purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, /* should this be a settings error? */
+				tmp);
+			g_free(tmp);
+			return;
+		}
+
+		glp->server_addr = inet_addr(inet_ntoa(*addr));
+		glp->server_port = 8074;
+	} else
+		purple_debug_info("gg", "Trying to retrieve address from gg appmsg service\n");
+
 	info->session = gg_login(glp);
+	purple_connection_update_progress(gc, _("Connecting"), 1, 2); 			
 	if (info->session == NULL) {
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Connection failed."));
+			_("Connection failed"));
 		g_free(glp);
 		return;
 	}
@@ -1837,8 +2005,6 @@ static void ggp_close(PurpleConnection *gc)
 	if (gc->inpa > 0)
 		purple_input_remove(gc->inpa);
 
-	ggp_buddylist_offline(gc);
-
 	purple_debug_info("gg", "Connection closed.\n");
 }
 
@@ -2170,7 +2336,7 @@ static void ggp_keepalive(PurpleConnection *gc)
 				"or gg_session is not correct\n");
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Not connected to the server."));
+			_("Not connected to the server"));
 	}
 }
 
@@ -2293,13 +2459,13 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,				/* whiteboard_prpl_ops */
 	NULL,				/* send_raw */
 	NULL,				/* roomlist_room_serialize */
-
-	/* padding */
-	NULL,
-	NULL,
-	NULL,
+	NULL,				/* unregister_user */
+	NULL,				/* send_attention */
+	NULL,				/* get_attention_types */
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	NULL,                           /* get_account_text_table */
+	NULL,                           /* initiate_media */
+	NULL                            /* can_do_media */
 };
 
 static PurplePluginInfo info = {
@@ -2369,6 +2535,11 @@ static void init_plugin(PurplePlugin *plugin)
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 						   option);
 
+	option = purple_account_option_string_new(_("GG server"),
+			"gg_server", "");
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+			option);
+
 	my_protocol = plugin;
 
 	gg_debug_handler = purple_gg_debug_handler;
diff --git a/libpurple/protocols/gg/lib/libgadu.c b/libpurple/protocols/gg/lib/libgadu.c
index 1b8ba650d9..b9634e2511 100644
--- a/libpurple/protocols/gg/lib/libgadu.c
+++ b/libpurple/protocols/gg/lib/libgadu.c
@@ -790,6 +790,7 @@ void *gg_recv_packet(struct gg_session *sess)
 		gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() body recv(%d,%p,%d) = %d\n", sess->fd, buf + sizeof(h) + offset, size, ret);
 		if (!ret) {
 			gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() body recv() failed: connection broken\n");
+			free(buf);
 			errno = ECONNRESET;
 			return NULL;
 		}
diff --git a/libpurple/protocols/irc/cmds.c b/libpurple/protocols/irc/cmds.c
index 34a5e40a45..902a98bcf0 100644
--- a/libpurple/protocols/irc/cmds.c
+++ b/libpurple/protocols/irc/cmds.c
@@ -142,10 +142,10 @@ int irc_cmd_ctcp_action(struct irc_conn *irc, const char *cmd, const char *targe
 		if (purple_conversation_get_type(convo) == PURPLE_CONV_TYPE_CHAT)
 			serv_got_chat_in(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(convo)),
 			                 purple_connection_get_display_name(gc),
-			                 0, action, time(NULL));
+			                 PURPLE_MESSAGE_SEND, action, time(NULL));
 		else
 			purple_conv_im_write(PURPLE_CONV_IM(convo), purple_connection_get_display_name(gc),
-			                     action, 0, time(NULL));
+			                     action, PURPLE_MESSAGE_SEND, time(NULL));
 		g_free(action);
 	}
 
diff --git a/libpurple/protocols/irc/dcc_send.c b/libpurple/protocols/irc/dcc_send.c
index 5731531c96..bb03c29947 100644
--- a/libpurple/protocols/irc/dcc_send.c
+++ b/libpurple/protocols/irc/dcc_send.c
@@ -50,7 +50,7 @@ static void irc_dccsend_recv_destroy(PurpleXfer *xfer)
  * unsigned 4 byte integer in network byte order)
  */
 static void irc_dccsend_recv_ack(PurpleXfer *xfer, const guchar *data, size_t size) {
-	unsigned long l;
+	guint32 l;
 	size_t result;
 
 	l = htonl(xfer->bytes_sent);
@@ -302,7 +302,7 @@ irc_dccsend_network_listen_cb(int sock, gpointer data)
 
 	if (sock < 0) {
 		purple_notify_error(gc, NULL, _("File Transfer Failed"),
-		                    _("Could not open a listening port."));
+		                    _("Unable to open a listening port."));
 		purple_xfer_cancel_local(xfer);
 		return;
 	}
@@ -343,7 +343,7 @@ static void irc_dccsend_send_init(PurpleXfer *xfer) {
 	if (xd->listen_data == NULL) {
 		purple_xfer_unref(xfer);
 		purple_notify_error(gc, NULL, _("File Transfer Failed"),
-		                    _("Could not open a listening port."));
+		                    _("Unable to open a listening port."));
 		purple_xfer_cancel_local(xfer);
 	}
 
diff --git a/libpurple/protocols/irc/irc.c b/libpurple/protocols/irc/irc.c
index 9721536931..b60b2dd5ca 100644
--- a/libpurple/protocols/irc/irc.c
+++ b/libpurple/protocols/irc/irc.c
@@ -122,9 +122,11 @@ irc_send_cb(gpointer data, gint source, PurpleInputCondition cond)
 		return;
 	else if (ret <= 0) {
 		PurpleConnection *gc = purple_account_get_connection(irc->account);
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+			g_strerror(errno));
 		purple_connection_error_reason (gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Server has disconnected"));
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		return;
 	}
 
@@ -162,9 +164,11 @@ int irc_send(struct irc_conn *irc, const char *buf)
 		irc->gsc ? " (ssl)" : "", tosend); */
 	if (ret <= 0 && errno != EAGAIN) {
 		PurpleConnection *gc = purple_account_get_connection(irc->account);
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+			g_strerror(errno));
 		purple_connection_error_reason (gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Server has disconnected"));
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 	} else if (ret < buflen) {
 		if (ret < 0)
 			ret = 0;
@@ -306,7 +310,7 @@ static void irc_login(PurpleAccount *account)
 	if (strpbrk(username, " \t\v\r\n") != NULL) {
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
-			_("IRC nicks may not contain whitespace"));
+			_("IRC nick and server may not contain whitespace"));
 		return;
 	}
 
@@ -350,7 +354,7 @@ static void irc_login(PurpleAccount *account)
 		{
 			purple_connection_error_reason (gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Couldn't create socket"));
+				_("Unable to connect"));
 			return;
 		}
 	}
@@ -446,9 +450,11 @@ static void irc_login_cb(gpointer data, gint source, const gchar *error_message)
 	struct irc_conn *irc = gc->proto_data;
 
 	if (source < 0) {
+		gchar *tmp = g_strdup_printf(_("Unable to connect: %s"),
+			error_message);
 		purple_connection_error_reason (gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Couldn't connect to host"));
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		return;
 	}
 
@@ -563,9 +569,20 @@ static void irc_set_status(PurpleAccount *account, PurpleStatus *status)
 static void irc_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
 	struct irc_conn *irc = (struct irc_conn *)gc->proto_data;
-	struct irc_buddy *ib = g_new0(struct irc_buddy, 1);
-	ib->name = g_strdup(purple_buddy_get_name(buddy));
-	g_hash_table_insert(irc->buddies, ib->name, ib);
+	struct irc_buddy *ib;
+	const char *bname = purple_buddy_get_name(buddy);
+
+	ib = g_hash_table_lookup(irc->buddies, bname);
+	if (ib != NULL) {
+		ib->ref++;
+		purple_prpl_got_user_status(irc->account, bname,
+				ib->online ? "available" : "offline", NULL);
+	} else {
+		ib = g_new0(struct irc_buddy, 1);
+		ib->name = g_strdup(bname);
+		ib->ref = 1;
+		g_hash_table_replace(irc->buddies, ib->name, ib);
+	}
 
 	/* if the timer isn't set, this is during signon, so we don't want to flood
 	 * ourself off with ISON's, so we don't, but after that we want to know when
@@ -577,7 +594,12 @@ static void irc_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup
 static void irc_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
 	struct irc_conn *irc = (struct irc_conn *)gc->proto_data;
-	g_hash_table_remove(irc->buddies, purple_buddy_get_name(buddy));
+	struct irc_buddy *ib;
+
+	ib = g_hash_table_lookup(irc->buddies, purple_buddy_get_name(buddy));
+	if (ib && --ib->ref == 0) {
+		g_hash_table_remove(irc->buddies, purple_buddy_get_name(buddy));
+	}
 }
 
 static void read_input(struct irc_conn *irc, int len)
@@ -635,14 +657,16 @@ static void irc_input_cb_ssl(gpointer data, PurpleSslConnection *gsc,
 		/* Try again later */
 		return;
 	} else if (len < 0) {
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+				g_strerror(errno));
 		purple_connection_error_reason (gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Read error"));
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		return;
 	} else if (len == 0) {
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Server has disconnected"));
+			_("Server closed the connection"));
 		return;
 	}
 
@@ -664,14 +688,16 @@ static void irc_input_cb(gpointer data, gint source, PurpleInputCondition cond)
 	if (len < 0 && errno == EAGAIN) {
 		return;
 	} else if (len < 0) {
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+				g_strerror(errno));
 		purple_connection_error_reason (gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Read error"));
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		return;
 	} else if (len == 0) {
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Server has disconnected"));
+			_("Server closed the connection"));
 		return;
 	}
 
@@ -912,13 +938,13 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,					/* whiteboard_prpl_ops */
 	irc_send_raw,			/* send_raw */
 	NULL,					/* roomlist_room_serialize */
-
-	/* padding */
-	NULL,
-	NULL,
-	NULL,
-	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	NULL,                   /* unregister_user */
+	NULL,                   /* send_attention */
+	NULL,                   /* get_attention_types */
+	sizeof(PurplePluginProtocolInfo),    /* struct_size */
+	NULL,                    /* get_account_text_table */
+	NULL,                    /* initiate_media */
+	NULL					 /* can_do_media */
 };
 
 static gboolean load_plugin (PurplePlugin *plugin) {
diff --git a/libpurple/protocols/irc/irc.h b/libpurple/protocols/irc/irc.h
index 522405c246..026f558d5e 100644
--- a/libpurple/protocols/irc/irc.h
+++ b/libpurple/protocols/irc/irc.h
@@ -72,7 +72,7 @@ struct irc_conn {
 		char *name;
 		char *server;
 		char *serverinfo;
-		char *channels;
+		GString *channels;
 		int ircop;
 		int identified;
 		int idle;
@@ -97,6 +97,7 @@ struct irc_buddy {
 	char *name;
 	gboolean online;
 	gboolean flag;
+	int ref;
 };
 
 typedef int (*IRCCmdCallback) (struct irc_conn *irc, const char *cmd, const char *target, const char **args);
diff --git a/libpurple/protocols/irc/msgs.c b/libpurple/protocols/irc/msgs.c
index 81e107d0b1..2bfd0dc651 100644
--- a/libpurple/protocols/irc/msgs.c
+++ b/libpurple/protocols/irc/msgs.c
@@ -78,7 +78,7 @@ static void irc_connected(struct irc_conn *irc, const char *nick)
 {
 	PurpleConnection *gc;
 	PurpleStatus *status;
-	PurpleBlistNode *gnode, *cnode, *bnode;
+	GSList *buddies;
 	PurpleAccount *account;
 
 	if ((gc = purple_account_get_connection(irc->account)) == NULL
@@ -97,38 +97,19 @@ static void irc_connected(struct irc_conn *irc, const char *nick)
 	}
 
 	/* this used to be in the core, but it's not now */
-	for (gnode = purple_blist_get_root();
-	     gnode;
-	     gnode = purple_blist_node_get_sibling_next(gnode))
+	for (buddies = purple_find_buddies(account, NULL); buddies;
+			buddies = g_slist_delete_link(buddies, buddies))
 	{
-		if(!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-		for(cnode = purple_blist_node_get_first_child(gnode);
-		    cnode;
-		    cnode = purple_blist_node_get_sibling_next(cnode))
-		{
-			if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-			for(bnode = purple_blist_node_get_first_child(cnode);
-			    bnode;
-			    bnode = purple_blist_node_get_sibling_next(bnode))
-			{
-				PurpleBuddy *b;
-				if(!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-				b = (PurpleBuddy *)bnode;
-				if(purple_buddy_get_account(b) == account) {
-					struct irc_buddy *ib = g_new0(struct irc_buddy, 1);
-					ib->name = g_strdup(purple_buddy_get_name(b));
-					g_hash_table_insert(irc->buddies, ib->name, ib);
-				}
-			}
-		}
+		PurpleBuddy *b = buddies->data;
+		struct irc_buddy *ib = g_new0(struct irc_buddy, 1);
+		ib->name = g_strdup(purple_buddy_get_name(b));
+		ib->ref = 1;
+		g_hash_table_replace(irc->buddies, ib->name, ib);
 	}
 
 	irc_blist_timeout(irc);
 	if (!irc->timer)
-		irc->timer = purple_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
+		irc->timer = purple_timeout_add_seconds(45, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
 }
 
 void irc_msg_default(struct irc_conn *irc, const char *name, const char *from, char **args)
@@ -336,7 +317,11 @@ void irc_msg_whois(struct irc_conn *irc, const char *name, const char *from, cha
 		if (args[3])
 			irc->whois.signon = (time_t)atoi(args[3]);
 	} else if (!strcmp(name, "319")) {
-		irc->whois.channels = g_strdup(args[2]);
+		if (irc->whois.channels == NULL) {
+			irc->whois.channels = g_string_new(args[2]);
+		} else {
+			irc->whois.channels = g_string_append(irc->whois.channels, args[2]);
+		}
 	} else if (!strcmp(name, "320")) {
 		irc->whois.identified = 1;
 	}
@@ -391,8 +376,8 @@ void irc_msg_endwhois(struct irc_conn *irc, const char *name, const char *from,
 		g_free(irc->whois.serverinfo);
 	}
 	if (irc->whois.channels) {
-		purple_notify_user_info_add_pair(user_info, _("Currently on"), irc->whois.channels);
-		g_free(irc->whois.channels);
+		purple_notify_user_info_add_pair(user_info, _("Currently on"), irc->whois.channels->str);
+		g_string_free(irc->whois.channels, TRUE);
 	}
 	if (irc->whois.idle) {
 		gchar *timex = purple_str_seconds_to_string(irc->whois.idle);
@@ -1000,10 +985,25 @@ void irc_msg_badnick(struct irc_conn *irc, const char *name, const char *from, c
 void irc_msg_nickused(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	char *newnick, *buf, *end;
+	PurpleConnection *gc = purple_account_get_connection(irc->account);
 
 	if (!args || !args[1])
 		return;
 
+	if (gc && purple_connection_get_state(gc) == PURPLE_CONNECTED) {
+		/* We only want to do the following dance if the connection
+		   has not been successfully completed.  If it has, just
+		   notify the user that their /nick command didn't go. */
+		buf = g_strdup_printf(_("The nickname \"%s\" is already being used."),
+				      irc->reqnick);
+		purple_notify_error(gc, _("Nickname in use"),
+				    _("Nickname in use"), buf);
+		g_free(buf);
+		g_free(irc->reqnick);
+		irc->reqnick = NULL;
+		return;
+	}
+
 	if (strlen(args[1]) < strlen(irc->reqnick) || irc->nickused)
 		newnick = g_strdup(args[1]);
 	else
@@ -1174,7 +1174,7 @@ static void irc_msg_handle_privmsg(struct irc_conn *irc, const char *name, const
 	if (!purple_utf8_strcasecmp(to, purple_connection_get_display_name(gc))) {
 		serv_got_im(gc, nick, msg, 0, time(NULL));
 	} else {
-		convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, to, irc->account);
+		convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, irc_nick_skip_mode(irc, to), irc->account);
 		if (convo)
 			serv_got_chat_in(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(convo)), nick, 0, msg, time(NULL));
 		else
diff --git a/libpurple/protocols/jabber/Makefile.am b/libpurple/protocols/jabber/Makefile.am
index e9b776b671..d334313707 100644
--- a/libpurple/protocols/jabber/Makefile.am
+++ b/libpurple/protocols/jabber/Makefile.am
@@ -9,6 +9,8 @@ JABBERSOURCES = auth.c \
 			  auth.h \
 			  buddy.c \
 			  buddy.h \
+			  bosh.c \
+			  bosh.h \
 			  chat.c \
 			  chat.h \
 			  data.c \
@@ -23,6 +25,20 @@ JABBERSOURCES = auth.c \
 			  iq.h \
 			  jabber.c \
 			  jabber.h \
+			  jingle/jingle.c \
+			  jingle/jingle.h \
+			  jingle/content.c \
+			  jingle/content.h \
+			  jingle/iceudp.c \
+			  jingle/iceudp.h \
+			  jingle/rawudp.c \
+			  jingle/rawudp.h \
+			  jingle/rtp.c \
+			  jingle/rtp.h \
+			  jingle/session.c \
+			  jingle/session.h \
+			  jingle/transport.c \
+			  jingle/transport.h \
 			  jutil.c \
 			  jutil.h \
 			  message.c \
@@ -47,6 +63,8 @@ JABBERSOURCES = auth.c \
 			  adhoccommands.h \
 			  pep.c \
 			  pep.h \
+			  useravatar.c \
+			  useravatar.h \
 			  usermood.c \
 			  usermood.h \
 			  usernick.c \
@@ -70,7 +88,7 @@ else
 st =
 pkg_LTLIBRARIES      = libjabber.la libxmpp.la
 libjabber_la_SOURCES = $(JABBERSOURCES)
-libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS)
+libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)
 
 libxmpp_la_SOURCES = libxmpp.c
 libxmpp_la_LIBADD = libjabber.la
@@ -82,4 +100,5 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(IDN_CFLAGS) \
 	$(LIBXML_CFLAGS)
diff --git a/libpurple/protocols/jabber/Makefile.mingw b/libpurple/protocols/jabber/Makefile.mingw
index 524f776dd3..fbf0cf3d51 100644
--- a/libpurple/protocols/jabber/Makefile.mingw
+++ b/libpurple/protocols/jabber/Makefile.mingw
@@ -46,6 +46,7 @@ C_SRC =	\
 			adhoccommands.c \
 			auth.c \
 			buddy.c \
+			bosh.c \
 			caps.c \
 			chat.c \
 			data.c \
@@ -54,6 +55,13 @@ C_SRC =	\
 			ibb.c \
 			iq.c \
 			jabber.c \
+			jingle/jingle.c \
+			jingle/content.c \
+			jingle/iceudp.c \
+			jingle/rawudp.c \
+			jingle/rtp.c \
+			jingle/session.c \
+			jingle/transport.c \
 			jutil.c \
 			message.c \
 			oob.c \
@@ -63,6 +71,7 @@ C_SRC =	\
 			presence.c \
 			roster.c \
 			si.c \
+			useravatar.c \
 			usermood.c \
 			usernick.c \
 			usertune.c \
@@ -79,6 +88,7 @@ XMPP_OBJECTS = $(XMPP_C_SRC:%.c=%.o)
 ##
 LIBS = \
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lxml2 \
 			-lws2_32 \
 			-lintl \
diff --git a/libpurple/protocols/jabber/adhoccommands.c b/libpurple/protocols/jabber/adhoccommands.c
index 0781822eeb..8c84d0104c 100644
--- a/libpurple/protocols/jabber/adhoccommands.c
+++ b/libpurple/protocols/jabber/adhoccommands.c
@@ -39,29 +39,18 @@ typedef struct _JabberAdHocActionInfo {
 	GList *actionslist;
 } JabberAdHocActionInfo;
 
-void jabber_adhoc_disco_result_cb(JabberStream *js, xmlnode *packet, gpointer data) {
-	const char *from = xmlnode_get_attrib(packet, "from");
-	const char *type = xmlnode_get_attrib(packet, "type");
-	const char *node;
-	xmlnode *query, *item;
-	JabberID *jabberid;
+static void
+jabber_adhoc_got_buddy_list(JabberStream *js, const char *from, xmlnode *query)
+{
+	JabberID *jid;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr = NULL;
+	xmlnode *item;
 
-	if(strcmp(type, "result"))
-		return;
-
-	query = xmlnode_get_child_with_namespace(packet,"query","http://jabber.org/protocol/disco#items");
-	if(!query)
-		return;
-	node = xmlnode_get_attrib(query,"node");
-	if(!node || strcmp(node, "http://jabber.org/protocol/commands"))
-		return;
-
-	if((jabberid = jabber_id_new(from))) {
-		if(jabberid->resource && (jb = jabber_buddy_find(js, from, TRUE)))
-			jbr = jabber_buddy_find_resource(jb, jabberid->resource);
-		jabber_id_free(jabberid);
+	if ((jid = jabber_id_new(from))) {
+		if (jid->resource && (jb = jabber_buddy_find(js, from, TRUE)))
+			jbr = jabber_buddy_find_resource(jb, jid->resource);
+		jabber_id_free(jid);
 	}
 
 	if(!jbr)
@@ -95,7 +84,30 @@ void jabber_adhoc_disco_result_cb(JabberStream *js, xmlnode *packet, gpointer da
 	}
 }
 
-static void jabber_adhoc_parse(JabberStream *js, xmlnode *packet, gpointer data);
+void
+jabber_adhoc_disco_result_cb(JabberStream *js, const char *from,
+                             JabberIqType type, const char *id,
+                             xmlnode *packet, gpointer data)
+{
+	xmlnode *query;
+	const char *node;
+
+	if (type == JABBER_IQ_ERROR)
+		return;
+
+	query = xmlnode_get_child_with_namespace(packet, "query", "http://jabber.org/protocol/disco#items");
+	if (!query)
+		return;
+	node = xmlnode_get_attrib(query, "node");
+	if (!purple_strequal(node, "http://jabber.org/protocol/commands"))
+		return;
+
+	jabber_adhoc_got_buddy_list(js, from, query);
+}
+
+static void jabber_adhoc_parse(JabberStream *js, const char *from,
+                               JabberIqType type, const char *id,
+                               xmlnode *packet, gpointer data);
 
 static void do_adhoc_action_cb(JabberStream *js, xmlnode *result, const char *actionhandle, gpointer user_data) {
 	xmlnode *command;
@@ -131,13 +143,16 @@ static void do_adhoc_action_cb(JabberStream *js, xmlnode *result, const char *ac
 	jabber_iq_send(iq);
 }
 
-static void jabber_adhoc_parse(JabberStream *js, xmlnode *packet, gpointer data) {
+static void
+jabber_adhoc_parse(JabberStream *js, const char *from,
+                   JabberIqType type, const char *id,
+                   xmlnode *packet, gpointer data)
+{
 	xmlnode *command = xmlnode_get_child_with_namespace(packet, "command", "http://jabber.org/protocol/commands");
 	const char *status = xmlnode_get_attrib(command,"status");
 	xmlnode *xdata = xmlnode_get_child_with_namespace(command,"x","jabber:x:data");
-	const char *type = xmlnode_get_attrib(packet,"type");
 
-	if(type && !strcmp(type,"error")) {
+	if (type == JABBER_IQ_ERROR) {
 		char *msg = jabber_parse_error(js, packet, NULL);
 		if(!msg)
 			msg = g_strdup(_("Unknown Error"));
@@ -147,8 +162,6 @@ static void jabber_adhoc_parse(JabberStream *js, xmlnode *packet, gpointer data)
 		g_free(msg);
 		return;
 	}
-	if(!type || strcmp(type,"result"))
-		return;
 
 	if(!status)
 		return;
@@ -159,7 +172,7 @@ static void jabber_adhoc_parse(JabberStream *js, xmlnode *packet, gpointer data)
 
 		if(note) {
 			char *data = xmlnode_get_data(note);
-			purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), data, NULL);
+			purple_notify_info(NULL, from, data, NULL);
 			g_free(data);
 		}
 
@@ -199,7 +212,7 @@ static void jabber_adhoc_parse(JabberStream *js, xmlnode *packet, gpointer data)
 
 		actionInfo = g_new0(JabberAdHocActionInfo, 1);
 		actionInfo->sessionid = g_strdup(xmlnode_get_attrib(command,"sessionid"));
-		actionInfo->who = g_strdup(xmlnode_get_attrib(packet,"from"));
+		actionInfo->who = g_strdup(from);
 		actionInfo->node = g_strdup(xmlnode_get_attrib(command,"node"));
 		actionInfo->actionslist = actionslist;
 
@@ -218,8 +231,9 @@ void jabber_adhoc_execute_action(PurpleBlistNode *node, gpointer data) {
 	}
 }
 
-static void jabber_adhoc_server_got_list_cb(JabberStream *js, xmlnode *packet, gpointer data) {
-	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query", "http://jabber.org/protocol/disco#items");
+static void
+jabber_adhoc_got_server_list(JabberStream *js, const char *from, xmlnode *query)
+{
 	xmlnode *item;
 
 	if(!query)
@@ -249,6 +263,29 @@ static void jabber_adhoc_server_got_list_cb(JabberStream *js, xmlnode *packet, g
 
 		js->commands = g_list_append(js->commands,cmd);
 	}
+
+	if (js->state == JABBER_STREAM_CONNECTED)
+		purple_prpl_got_account_actions(purple_connection_get_account(js->gc));
+}
+
+static void
+jabber_adhoc_server_got_list_cb(JabberStream *js, const char *from,
+                                JabberIqType type, const char *id,
+                                xmlnode *packet, gpointer data)
+{
+	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query", "http://jabber.org/protocol/disco#items");
+
+	jabber_adhoc_got_server_list(js, from, query);
+
+}
+
+void jabber_adhoc_got_list(JabberStream *js, const char *from, xmlnode *query)
+{
+	if (purple_strequal(from, js->user->domain)) {
+		jabber_adhoc_got_server_list(js, from, query);
+	} else {
+		jabber_adhoc_got_buddy_list(js, from, query);
+	}
 }
 
 void jabber_adhoc_server_get_list(JabberStream *js) {
diff --git a/libpurple/protocols/jabber/adhoccommands.h b/libpurple/protocols/jabber/adhoccommands.h
index 46559ee249..407467466c 100644
--- a/libpurple/protocols/jabber/adhoccommands.h
+++ b/libpurple/protocols/jabber/adhoccommands.h
@@ -19,21 +19,25 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_ADHOCCOMMANDS_H_
-#define _PURPLE_JABBER_ADHOCCOMMANDS_H_
+#ifndef PURPLE_JABBER_ADHOCCOMMANDS_H_
+#define PURPLE_JABBER_ADHOCCOMMANDS_H_
 
 #include "jabber.h"
 
 /* Implementation of XEP-0050 */
 
-void jabber_adhoc_disco_result_cb(JabberStream *js, xmlnode *packet, gpointer data);
+void jabber_adhoc_disco_result_cb(JabberStream *js, const char *from,
+                                  JabberIqType type, const char *id,
+                                  xmlnode *packet, gpointer data);
 
 void jabber_adhoc_execute(JabberStream *js, JabberAdHocCommands *cmd);
 
 void jabber_adhoc_execute_action(PurpleBlistNode *node, gpointer data);
 
+void jabber_adhoc_got_list(JabberStream *js, const char *from, xmlnode *query);
+
 void jabber_adhoc_server_get_list(JabberStream *js);
 
 void jabber_adhoc_init_server_commands(JabberStream *js, GList **m);
 
-#endif /* _PURPLE_JABBER_ADHOCCOMMANDS_H_ */
+#endif /* PURPLE_JABBER_ADHOCCOMMANDS_H_ */
diff --git a/libpurple/protocols/jabber/auth.c b/libpurple/protocols/jabber/auth.c
index ae8320f871..78078c5bb7 100644
--- a/libpurple/protocols/jabber/auth.c
+++ b/libpurple/protocols/jabber/auth.c
@@ -30,14 +30,16 @@
 #include "util.h"
 #include "xmlnode.h"
 
-#include "jutil.h"
 #include "auth.h"
+#include "disco.h"
 #include "jabber.h"
+#include "jutil.h"
 #include "iq.h"
 #include "notify.h"
 
-static void auth_old_result_cb(JabberStream *js, xmlnode *packet,
-		gpointer data);
+static void auth_old_result_cb(JabberStream *js, const char *from,
+                               JabberIqType type, const char *id,
+                               xmlnode *packet, gpointer data);
 
 gboolean
 jabber_process_starttls(JabberStream *js, xmlnode *packet)
@@ -50,14 +52,14 @@ jabber_process_starttls(JabberStream *js, xmlnode *packet)
 					"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
 			return TRUE;
 		} else if(xmlnode_get_child(starttls, "required")) {
-			purple_connection_error_reason (js->gc,
+			purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
-				_("Server requires TLS/SSL for login.  No TLS/SSL support found."));
+				_("Server requires TLS/SSL, but no TLS/SSL support was found."));
 			return TRUE;
 		} else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE)) {
-			purple_connection_error_reason (js->gc,
+			purple_connection_error_reason(js->gc,
 				 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
-				_("You require encryption, but no TLS/SSL support found."));
+				_("You require encryption, but no TLS/SSL support was found."));
 			return TRUE;
 		}
 	}
@@ -120,7 +122,7 @@ static void allow_plaintext_auth(PurpleAccount *account)
 
 static void disallow_plaintext_auth(PurpleAccount *account)
 {
-	purple_connection_error_reason (account->gc,
+	purple_connection_error_reason(account->gc,
 		PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
 		_("Server requires plaintext authentication over an unencrypted stream"));
 }
@@ -281,7 +283,7 @@ static void jabber_auth_start_cyrus(JabberStream *js)
 	secprops.min_ssf = 0;
 	secprops.security_flags = SASL_SEC_NOANONYMOUS;
 
-	if (!js->gsc) {
+	if (!jabber_stream_is_ssl(js)) {
 		secprops.max_ssf = -1;
 		secprops.maxbufsize = 4096;
 		plaintext = purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE);
@@ -413,9 +415,9 @@ static void jabber_auth_start_cyrus(JabberStream *js)
 		jabber_send(js, auth);
 		xmlnode_free(auth);
 	} else {
-		purple_connection_error_reason (js->gc,
+		purple_connection_error_reason(js->gc,
 			PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
-			"SASL authentication failed\n");
+			_("SASL authentication failed"));
 	}
 }
 
@@ -488,9 +490,9 @@ jabber_auth_start(JabberStream *js, xmlnode *packet)
 	mechs = xmlnode_get_child(packet, "mechanisms");
 
 	if(!mechs) {
-		purple_connection_error_reason (js->gc,
+		purple_connection_error_reason(js->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Invalid response from server."));
+			_("Invalid response from server"));
 		return;
 	}
 
@@ -544,7 +546,7 @@ jabber_auth_start(JabberStream *js, xmlnode *packet)
 	} else if(plain) {
 		js->auth_type = JABBER_AUTH_PLAIN;
 
-		if(js->gsc == NULL && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) {
+		if(!jabber_stream_is_ssl(js) && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) {
 			char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
 					js->gc->account->username);
 			purple_request_yes_no(js->gc, _("Plaintext Authentication"),
@@ -559,19 +561,19 @@ jabber_auth_start(JabberStream *js, xmlnode *packet)
 		}
 		finish_plaintext_authentication(js);
 	} else {
-		purple_connection_error_reason (js->gc,
+		purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
 				_("Server does not use any supported authentication method"));
 	}
 #endif
 }
 
-static void auth_old_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+static void auth_old_result_cb(JabberStream *js, const char *from,
+                               JabberIqType type, const char *id,
+                               xmlnode *packet, gpointer data)
 {
-	const char *type = xmlnode_get_attrib(packet, "type");
-
-	if(type && !strcmp(type, "result")) {
-		jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
+	if (type == JABBER_IQ_RESULT) {
+		jabber_disco_items_server(js);
 	} else {
 		PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 		char *msg = jabber_parse_error(js, packet, &reason);
@@ -588,29 +590,25 @@ static void auth_old_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
 				purple_account_set_password(js->gc->account, NULL);
 		}
 
-		purple_connection_error_reason (js->gc, reason, msg);
+		purple_connection_error_reason(js->gc, reason, msg);
 		g_free(msg);
 	}
 }
 
-static void auth_old_cb(JabberStream *js, xmlnode *packet, gpointer data)
+static void auth_old_cb(JabberStream *js, const char *from,
+                        JabberIqType type, const char *id,
+                        xmlnode *packet, gpointer data)
 {
 	JabberIq *iq;
 	xmlnode *query, *x;
-	const char *type = xmlnode_get_attrib(packet, "type");
 	const char *pw = purple_connection_get_password(js->gc);
 
-	if(!type) {
-		purple_connection_error_reason (js->gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Invalid response from server."));
-		return;
-	} else if(!strcmp(type, "error")) {
+	if (type == JABBER_IQ_ERROR) {
 		PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 		char *msg = jabber_parse_error(js, packet, &reason);
-		purple_connection_error_reason (js->gc, reason, msg);
+		purple_connection_error_reason(js->gc, reason, msg);
 		g_free(msg);
-	} else if(!strcmp(type, "result")) {
+	} else if (type == JABBER_IQ_RESULT) {
 		query = xmlnode_get_child(packet, "query");
 		if(js->stream_id && xmlnode_get_child(query, "digest")) {
 			char *s, *hash;
@@ -662,7 +660,7 @@ static void auth_old_cb(JabberStream *js, xmlnode *packet, gpointer data)
 			jabber_iq_send(iq);
 
 		} else if(xmlnode_get_child(query, "password")) {
-			if(js->gsc == NULL && !purple_account_get_bool(js->gc->account,
+			if(!jabber_stream_is_ssl(js) && !purple_account_get_bool(js->gc->account,
 						"auth_plain_in_clear", FALSE)) {
 				char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
 											js->gc->account->username);
@@ -678,7 +676,7 @@ static void auth_old_cb(JabberStream *js, xmlnode *packet, gpointer data)
 			}
 			finish_plaintext_authentication(js);
 		} else {
-			purple_connection_error_reason (js->gc,
+			purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
 				_("Server does not use any supported authentication method"));
 			return;
@@ -691,6 +689,18 @@ void jabber_auth_start_old(JabberStream *js)
 	JabberIq *iq;
 	xmlnode *query, *username;
 
+	/* We can end up here without encryption if the server doesn't support
+	 * <stream:features/> and we're not using old-style SSL.  If the user
+	 * is requiring SSL/TLS, we need to enforce it.
+	 */
+	if (!jabber_stream_is_ssl(js) &&
+			purple_account_get_bool(purple_connection_get_account(js->gc), "require_tls", FALSE)) {
+		purple_connection_error_reason(js->gc,
+			PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
+			_("You require encryption, but it is not available on this server."));
+		return;
+	}
+
 #ifdef HAVE_CYRUS_SASL
 	/* If we have Cyrus SASL, then passwords will have been set
 	 * to OPTIONAL for this protocol. So, we need to do our own
@@ -846,9 +856,9 @@ jabber_auth_handle_challenge(JabberStream *js, xmlnode *packet)
 		GHashTable *parts;
 
 		if(!enc_in) {
-			purple_connection_error_reason (js->gc,
+			purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Invalid response from server."));
+				_("Invalid response from server"));
 			return;
 		}
 
@@ -869,7 +879,7 @@ jabber_auth_handle_challenge(JabberStream *js, xmlnode *packet)
 						"<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl' />",
 						-1);
 			} else {
-				purple_connection_error_reason (js->gc,
+				purple_connection_error_reason(js->gc,
 					PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 					_("Invalid challenge from server"));
 			}
@@ -895,7 +905,7 @@ jabber_auth_handle_challenge(JabberStream *js, xmlnode *packet)
 				realm = js->user->domain;
 
 			if (nonce == NULL || realm == NULL)
-				purple_connection_error_reason (js->gc,
+				purple_connection_error_reason(js->gc,
 					PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 					_("Invalid challenge from server"));
 			else {
@@ -970,16 +980,36 @@ jabber_auth_handle_challenge(JabberStream *js, xmlnode *packet)
 		g_free(enc_in);
 		g_free(dec_in);
 		if (js->sasl_state != SASL_CONTINUE && js->sasl_state != SASL_OK) {
-			purple_debug_error("jabber", "Error is %d : %s\n",js->sasl_state,sasl_errdetail(js->sasl));
-			purple_connection_error_reason (js->gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("SASL error"));
+			gchar *tmp = g_strdup_printf(_("SASL error: %s"),
+					sasl_errdetail(js->sasl));
+			purple_debug_error("jabber", "Error is %d : %s\n",
+					js->sasl_state, sasl_errdetail(js->sasl));
+			purple_connection_error_reason(js->gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+			g_free(tmp);
 			return;
 		} else {
 			response = xmlnode_new("response");
 			xmlnode_set_namespace(response, "urn:ietf:params:xml:ns:xmpp-sasl");
 			if (clen > 0) {
-				enc_out = purple_base64_encode((unsigned char*)c_out, clen);
+				/* Cyrus SASL 2.1.22 appears to contain code to add the charset
+				 * to the response for DIGEST-MD5 but there is no possibility
+				 * it will be executed.
+				 *
+				 * My reading of the digestmd5 plugin indicates the username and
+				 * realm are always encoded in UTF-8 (they seem to be the values
+				 * we pass in), so we need to ensure charset=utf-8 is set.
+				 */
+				if (!js->current_mech || !g_str_equal(js->current_mech, "DIGEST-MD5") ||
+						strstr(c_out, ",charset="))
+					/* If we're not using DIGEST-MD5 or Cyrus SASL is fixed */
+					enc_out = purple_base64_encode((unsigned char*)c_out, clen);
+				else {
+					char *tmp = g_strdup_printf("%s,charset=utf-8", c_out);
+					enc_out = purple_base64_encode((unsigned char*)tmp, clen + 14);
+					g_free(tmp);
+				}
+
 				xmlnode_insert_data(response, enc_out, -1);
 				g_free(enc_out);
 			}
@@ -998,9 +1028,9 @@ void jabber_auth_handle_success(JabberStream *js, xmlnode *packet)
 #endif
 
 	if(!ns || strcmp(ns, "urn:ietf:params:xml:ns:xmpp-sasl")) {
-		purple_connection_error_reason (js->gc,
+		purple_connection_error_reason(js->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Invalid response from server."));
+			_("Invalid response from server"));
 		return;
 	}
 
@@ -1025,9 +1055,9 @@ void jabber_auth_handle_success(JabberStream *js, xmlnode *packet)
 
 		if (js->sasl_state != SASL_OK) {
 			/* This should never happen! */
-			purple_connection_error_reason (js->gc,
+			purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Invalid response from server."));
+				_("Invalid response from server"));
 		}
 	}
 	/* If we've negotiated a security layer, we need to enable it */
@@ -1071,11 +1101,11 @@ void jabber_auth_handle_failure(JabberStream *js, xmlnode *packet)
 #endif
 	msg = jabber_parse_error(js, packet, &reason);
 	if(!msg) {
-		purple_connection_error_reason (js->gc,
+		purple_connection_error_reason(js->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Invalid response from server."));
+			_("Invalid response from server"));
 	} else {
-		purple_connection_error_reason (js->gc, reason, msg);
+		purple_connection_error_reason(js->gc, reason, msg);
 		g_free(msg);
 	}
 }
diff --git a/libpurple/protocols/jabber/auth.h b/libpurple/protocols/jabber/auth.h
index 89783da561..f89133f380 100644
--- a/libpurple/protocols/jabber/auth.h
+++ b/libpurple/protocols/jabber/auth.h
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_AUTH_H_
-#define _PURPLE_JABBER_AUTH_H_
+#ifndef PURPLE_JABBER_AUTH_H_
+#define PURPLE_JABBER_AUTH_H_
 
 #include "jabber.h"
 #include "xmlnode.h"
@@ -32,4 +32,4 @@ void jabber_auth_handle_challenge(JabberStream *js, xmlnode *packet);
 void jabber_auth_handle_success(JabberStream *js, xmlnode *packet);
 void jabber_auth_handle_failure(JabberStream *js, xmlnode *packet);
 
-#endif /* _PURPLE_JABBER_AUTH_H_ */
+#endif /* PURPLE_JABBER_AUTH_H_ */
diff --git a/libpurple/protocols/jabber/bosh.c b/libpurple/protocols/jabber/bosh.c
new file mode 100644
index 0000000000..d3ad1e7b0d
--- /dev/null
+++ b/libpurple/protocols/jabber/bosh.c
@@ -0,0 +1,1046 @@
+/*
+ * purple - Jabber Protocol Plugin
+ *
+ * Copyright (C) 2008, Tobias Markmann <tmarkmann@googlemail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+#include "internal.h"
+#include "circbuffer.h"
+#include "core.h"
+#include "cipher.h"
+#include "debug.h"
+#include "prpl.h"
+#include "util.h"
+#include "xmlnode.h"
+
+#include "bosh.h"
+
+/* The number of HTTP connections to use. This MUST be at least 2. */
+#define NUM_HTTP_CONNECTIONS      2
+/* How many failed connection attempts before it becomes a fatal error */
+#define MAX_FAILED_CONNECTIONS    3
+/* How long in seconds to queue up outgoing messages */
+#define BUFFER_SEND_IN_SECS       1
+
+typedef struct _PurpleHTTPConnection PurpleHTTPConnection;
+
+typedef void (*PurpleBOSHConnectionConnectFunction)(PurpleBOSHConnection *conn);
+typedef void (*PurpleBOSHConnectionReceiveFunction)(PurpleBOSHConnection *conn, xmlnode *node);
+
+static char *bosh_useragent = NULL;
+
+typedef enum {
+	PACKET_NORMAL,
+	PACKET_TERMINATE,
+	PACKET_FLUSH,
+} PurpleBOSHPacketType;
+
+struct _PurpleBOSHConnection {
+	JabberStream *js;
+	PurpleHTTPConnection *connections[NUM_HTTP_CONNECTIONS];
+
+	PurpleCircBuffer *pending;
+	PurpleBOSHConnectionConnectFunction connect_cb;
+	PurpleBOSHConnectionReceiveFunction receive_cb;
+
+	/* Must be big enough to hold 2^53 - 1 */
+	char *sid;
+	guint64 rid;
+
+	/* decoded URL */
+	char *host;
+	char *path;
+	guint16 port;
+
+	gboolean pipelining;
+	gboolean ssl;
+	gboolean needs_restart;
+
+	enum {
+		BOSH_CONN_OFFLINE,
+		BOSH_CONN_BOOTING,
+		BOSH_CONN_ONLINE
+	} state;
+	guint8 failed_connections;
+
+	int max_inactivity;
+	int wait;
+
+	int max_requests;
+	int requests;
+
+	guint inactivity_timer;
+	guint send_timer;
+};
+
+struct _PurpleHTTPConnection {
+	PurpleBOSHConnection *bosh;
+	PurpleSslConnection *psc;
+
+	PurpleCircBuffer *write_buf;
+	GString *read_buf;
+
+	gsize handled_len;
+	gsize body_len;
+
+	int fd;
+	guint readh;
+	guint writeh;
+
+	enum {
+		HTTP_CONN_OFFLINE,
+		HTTP_CONN_CONNECTING,
+		HTTP_CONN_CONNECTED
+	} state;
+	int requests; /* number of outstanding HTTP requests */
+
+	gboolean headers_done;
+
+};
+
+static void http_connection_connect(PurpleHTTPConnection *conn);
+static void http_connection_send_request(PurpleHTTPConnection *conn,
+                                         const GString *req);
+static gboolean send_timer_cb(gpointer data);
+
+void jabber_bosh_init(void)
+{
+	GHashTable *ui_info = purple_core_get_ui_info();
+	const char *ui_name = NULL;
+	const char *ui_version = NULL;
+
+	if (ui_info) {
+		ui_name = g_hash_table_lookup(ui_info, "name");
+		ui_version = g_hash_table_lookup(ui_info, "version");
+	}
+
+	if (ui_name)
+		bosh_useragent = g_strdup_printf("%s%s%s (libpurple " VERSION ")",
+		                                 ui_name, ui_version ? " " : "",
+		                                 ui_version ? ui_version : "");
+	else
+		bosh_useragent = g_strdup("libpurple " VERSION);
+}
+
+void jabber_bosh_uninit(void)
+{
+	g_free(bosh_useragent);
+	bosh_useragent = NULL;
+}
+
+static PurpleHTTPConnection*
+jabber_bosh_http_connection_init(PurpleBOSHConnection *bosh)
+{
+	PurpleHTTPConnection *conn = g_new0(PurpleHTTPConnection, 1);
+	conn->bosh = bosh;
+	conn->fd = -1;
+	conn->state = HTTP_CONN_OFFLINE;
+
+	conn->write_buf = purple_circ_buffer_new(0 /* default grow size */);
+
+	return conn;
+}
+
+static void
+jabber_bosh_http_connection_destroy(PurpleHTTPConnection *conn)
+{
+	if (conn->read_buf)
+		g_string_free(conn->read_buf, TRUE);
+
+	if (conn->write_buf)
+		purple_circ_buffer_destroy(conn->write_buf);
+	if (conn->readh)
+		purple_input_remove(conn->readh);
+	if (conn->writeh)
+		purple_input_remove(conn->writeh);
+	if (conn->psc)
+		purple_ssl_close(conn->psc);
+	if (conn->fd >= 0)
+		close(conn->fd);
+
+	purple_proxy_connect_cancel_with_handle(conn);
+
+	g_free(conn);
+}
+
+PurpleBOSHConnection*
+jabber_bosh_connection_init(JabberStream *js, const char *url)
+{
+	PurpleBOSHConnection *conn;
+	char *host, *path, *user, *passwd;
+	int port;
+
+	if (!purple_url_parse(url, &host, &port, &path, &user, &passwd)) {
+		purple_debug_info("jabber", "Unable to parse given URL.\n");
+		return NULL;
+	}
+
+	conn = g_new0(PurpleBOSHConnection, 1);
+	conn->host = host;
+	conn->port = port;
+	conn->path = g_strdup_printf("/%s", path);
+	g_free(path);
+	conn->pipelining = TRUE;
+	conn->needs_restart = FALSE;
+
+	if ((user && user[0] != '\0') || (passwd && passwd[0] != '\0')) {
+		purple_debug_info("jabber", "Ignoring unexpected username and password "
+		                            "in BOSH URL.\n");
+	}
+
+	g_free(user);
+	g_free(passwd);
+
+	conn->js = js;
+
+	/*
+	 * Random 64-bit integer masked off by 2^52 - 1.
+	 *
+	 * This should produce a random integer in the range [0, 2^52). It's
+	 * unlikely we'll send enough packets in one session to overflow the rid.
+	 */
+	conn->rid = ((guint64)g_random_int() << 32) | g_random_int();
+	conn->rid &= 0xFFFFFFFFFFFFFLL;
+
+	conn->pending = purple_circ_buffer_new(0 /* default grow size */);
+
+	conn->state = BOSH_CONN_OFFLINE;
+	if (purple_strcasestr(url, "https://") != NULL)
+		conn->ssl = TRUE;
+	else
+		conn->ssl = FALSE;
+
+	conn->connections[0] = jabber_bosh_http_connection_init(conn);
+
+	return conn;
+}
+
+void
+jabber_bosh_connection_destroy(PurpleBOSHConnection *conn)
+{
+	int i;
+
+	g_free(conn->host);
+	g_free(conn->path);
+
+	if (conn->send_timer)
+		purple_timeout_remove(conn->send_timer);
+	if (conn->inactivity_timer)
+		purple_timeout_remove(conn->inactivity_timer);
+
+	purple_circ_buffer_destroy(conn->pending);
+
+	for (i = 0; i < NUM_HTTP_CONNECTIONS; ++i) {
+		if (conn->connections[i])
+			jabber_bosh_http_connection_destroy(conn->connections[i]);
+	}
+
+	g_free(conn);
+}
+
+gboolean jabber_bosh_connection_is_ssl(PurpleBOSHConnection *conn)
+{
+	return conn->ssl;
+}
+
+static PurpleHTTPConnection *
+find_available_http_connection(PurpleBOSHConnection *conn)
+{
+	int i;
+
+	if (purple_debug_is_verbose()) {
+		for (i = 0; i < NUM_HTTP_CONNECTIONS; ++i) {
+			PurpleHTTPConnection *httpconn = conn->connections[i];
+			if (httpconn == NULL)
+				purple_debug_misc("jabber", "BOSH %p->connections[%d] = (nil)\n",
+				                  conn, i);
+			else
+				purple_debug_misc("jabber", "BOSH %p->connections[%d] = %p, state = %d"
+				                  ", requests = %d\n", conn, i, httpconn,
+				                  httpconn->state, httpconn->requests);
+		}
+	}
+
+	/* Easy solution: Does everyone involved support pipelining? Hooray! Just use
+	 * one TCP connection! */
+	if (conn->pipelining)
+		return conn->connections[0]->state == HTTP_CONN_CONNECTED ?
+				conn->connections[0] : NULL;
+
+	/* First loop, look for a connection that's ready */
+	for (i = 0; i < NUM_HTTP_CONNECTIONS; ++i) {
+		if (conn->connections[i] &&
+				conn->connections[i]->state == HTTP_CONN_CONNECTED &&
+				conn->connections[i]->requests == 0)
+			return conn->connections[i];
+	}
+
+	/* Second loop, is something currently connecting? If so, just queue up. */
+	for (i = 0; i < NUM_HTTP_CONNECTIONS; ++i) {
+		if (conn->connections[i] &&
+				conn->connections[i]->state == HTTP_CONN_CONNECTING)
+			return NULL;
+	}
+
+	/* Third loop, look for one that's NULL and create a new connection */
+	for (i = 0; i < NUM_HTTP_CONNECTIONS; ++i) {
+		if (!conn->connections[i]) {
+			purple_debug_info("jabber", "bosh: Creating and connecting new httpconn\n");
+			conn->connections[i] = jabber_bosh_http_connection_init(conn);
+
+			http_connection_connect(conn->connections[i]);
+			return NULL;
+		}
+	}
+
+	purple_debug_warning("jabber", "Could not find a HTTP connection!\n");
+
+	/* None available. */
+	return NULL;
+}
+
+static void
+jabber_bosh_connection_send(PurpleBOSHConnection *conn,
+                            const PurpleBOSHPacketType type, const char *data)
+{
+	PurpleHTTPConnection *chosen;
+	GString *packet = NULL;
+
+	if (type != PACKET_FLUSH && type != PACKET_TERMINATE) {
+		/*
+		 * Unless this is a flush (or session terminate, which needs to be
+		 * sent immediately), queue up the data and start a timer to flush
+		 * the buffer.
+		 */
+		if (data) {
+			int len = data ? strlen(data) : 0;
+			purple_circ_buffer_append(conn->pending, data, len);
+		}
+
+		if (purple_debug_is_verbose())
+			purple_debug_misc("jabber", "bosh: %p has %" G_GSIZE_FORMAT " bytes in "
+			                  "the buffer.\n", conn, conn->pending->bufused);
+		if (conn->send_timer == 0)
+			conn->send_timer = purple_timeout_add_seconds(BUFFER_SEND_IN_SECS,
+					send_timer_cb, conn);
+		return;
+	}
+
+	chosen = find_available_http_connection(conn);
+
+	if (!chosen) {
+		/*
+		 * For non-ordinary traffic, we can't 'buffer' it, so use the
+		 * first connection.
+		 */
+		chosen = conn->connections[0];
+
+		if (chosen->state != HTTP_CONN_CONNECTED) {
+			purple_debug_warning("jabber", "Unable to find a ready BOSH "
+					"connection. Ignoring send of type 0x%02x.\n", type);
+			return;
+		}
+	}
+
+	/* We're flushing the send buffer, so remove the send timer */
+	if (conn->send_timer != 0) {
+		purple_timeout_remove(conn->send_timer);
+		conn->send_timer = 0;
+	}
+
+	packet = g_string_new(NULL);
+
+	g_string_printf(packet, "<body "
+	                "rid='%" G_GUINT64_FORMAT "' "
+	                "sid='%s' "
+	                "to='%s' "
+	                "xml:lang='en' "
+	                "xmlns='http://jabber.org/protocol/httpbind' "
+	                "xmlns:xmpp='urn:xmpp:xbosh'",
+	                ++conn->rid,
+	                conn->sid,
+	                conn->js->user->domain);
+
+	if (conn->needs_restart) {
+		packet = g_string_append(packet, " xmpp:restart='true'/>");
+		/* TODO: Do we need to wait for a response? */
+		conn->needs_restart = FALSE;
+	} else {
+		gsize read_amt;
+		if (type == PACKET_TERMINATE)
+			packet = g_string_append(packet, " type='terminate'");
+
+		packet = g_string_append_c(packet, '>');
+
+		while ((read_amt = purple_circ_buffer_get_max_read(conn->pending)) > 0) {
+			packet = g_string_append_len(packet, conn->pending->outptr, read_amt);
+			purple_circ_buffer_mark_read(conn->pending, read_amt);
+		}
+
+		if (data)
+			packet = g_string_append(packet, data);
+		packet = g_string_append(packet, "</body>");
+	}
+
+	http_connection_send_request(chosen, packet);
+}
+
+void jabber_bosh_connection_close(PurpleBOSHConnection *conn)
+{
+	jabber_bosh_connection_send(conn, PACKET_TERMINATE, NULL);
+}
+
+static void jabber_bosh_connection_stream_restart(PurpleBOSHConnection *conn)
+{
+	conn->needs_restart = TRUE;
+	jabber_bosh_connection_send(conn, PACKET_NORMAL, NULL);
+}
+
+static gboolean jabber_bosh_connection_error_check(PurpleBOSHConnection *conn, xmlnode *node) {
+	const char *type;
+
+	type = xmlnode_get_attrib(node, "type");
+
+	if (type != NULL && !strcmp(type, "terminate")) {
+		conn->state = BOSH_CONN_OFFLINE;
+		purple_connection_error_reason(conn->js->gc,
+			PURPLE_CONNECTION_ERROR_OTHER_ERROR,
+			_("The BOSH connection manager terminated your session."));
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static gboolean
+send_timer_cb(gpointer data)
+{
+	PurpleBOSHConnection *bosh;
+
+	bosh = data;
+	bosh->send_timer = 0;
+
+	jabber_bosh_connection_send(bosh, PACKET_FLUSH, NULL);
+
+	return FALSE;
+}
+
+static gboolean
+bosh_inactivity_cb(gpointer data)
+{
+	PurpleBOSHConnection *bosh = data;
+	bosh->inactivity_timer = 0;
+
+	if (bosh->send_timer != 0)
+		purple_timeout_remove(bosh->send_timer);
+
+	/* clears bosh->send_timer */
+	send_timer_cb(bosh);
+
+	return FALSE;
+}
+
+static void
+restart_inactivity_timer(PurpleBOSHConnection *conn)
+{
+	if (conn->inactivity_timer != 0) {
+		purple_timeout_remove(conn->inactivity_timer);
+		conn->inactivity_timer = 0;
+	}
+
+	if (conn->max_inactivity != 0) {
+		conn->inactivity_timer =
+			purple_timeout_add_seconds(conn->max_inactivity - 5 /* rounding */,
+			                           bosh_inactivity_cb, conn);
+	}
+}
+
+static void jabber_bosh_connection_received(PurpleBOSHConnection *conn, xmlnode *node) {
+	xmlnode *child;
+	JabberStream *js = conn->js;
+
+	g_return_if_fail(node != NULL);
+	if (jabber_bosh_connection_error_check(conn, node))
+		return;
+
+	child = node->child;
+	while (child != NULL) {
+		/* jabber_process_packet might free child */
+		xmlnode *next = child->next;
+		if (child->type == XMLNODE_TYPE_TAG) {
+			jabber_process_packet(js, &child);
+		}
+
+		child = next;
+	}
+}
+
+static void auth_response_cb(PurpleBOSHConnection *conn, xmlnode *node) {
+	xmlnode *child;
+
+	g_return_if_fail(node != NULL);
+	if (jabber_bosh_connection_error_check(conn, node))
+		return;
+
+	child = node->child;
+	while(child != NULL && child->type != XMLNODE_TYPE_TAG) {
+		child = child->next;
+	}
+
+	/* We're only expecting one XML node here, so only process the first one */
+	if (child != NULL && child->type == XMLNODE_TYPE_TAG) {
+		JabberStream *js = conn->js;
+		if (!strcmp(child->name, "success")) {
+			jabber_bosh_connection_stream_restart(conn);
+			jabber_process_packet(js, &child);
+			conn->receive_cb = jabber_bosh_connection_received;
+		} else {
+			js->state = JABBER_STREAM_AUTHENTICATING;
+			jabber_process_packet(js, &child);
+		}
+	} else {
+		purple_debug_warning("jabber", "Received unexepcted empty BOSH packet.\n");
+	}
+}
+
+static void boot_response_cb(PurpleBOSHConnection *conn, xmlnode *node) {
+	const char *sid, *version;
+	const char *inactivity, *requests;
+	xmlnode *packet;
+
+	g_return_if_fail(node != NULL);
+	if (jabber_bosh_connection_error_check(conn, node))
+		return;
+
+	sid = xmlnode_get_attrib(node, "sid");
+	version = xmlnode_get_attrib(node, "ver");
+
+	inactivity = xmlnode_get_attrib(node, "inactivity");
+	requests = xmlnode_get_attrib(node, "requests");
+
+	if (sid) {
+		conn->sid = g_strdup(sid);
+	} else {
+		purple_connection_error_reason(conn->js->gc,
+		        PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+		        _("No session ID given"));
+		return;
+	}
+
+	if (version) {
+		const char *dot = strstr(version, ".");
+		int major, minor = 0;
+
+		purple_debug_info("jabber", "BOSH connection manager version %s\n", version);
+
+		major = atoi(version);
+		if (dot)
+			minor = atoi(dot + 1);
+
+		if (major != 1 || minor < 6) {
+			purple_connection_error_reason(conn->js->gc,
+			        PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+			        _("Unsupported version of BOSH protocol"));
+			return;
+		}
+	} else {
+		purple_debug_info("jabber", "Missing version in BOSH initiation\n");
+	}
+
+	if (inactivity) {
+		conn->max_inactivity = atoi(inactivity);
+		if (conn->max_inactivity <= 5) {
+			purple_debug_warning("jabber", "Ignoring bogusly small inactivity: %s\n",
+			                     inactivity);
+			conn->max_inactivity = 0;
+		} else {
+			/* TODO: Integrate this with jabber.c keepalive checks... */
+			/* TODO: Can this check fail? It shouldn't */
+			if (conn->inactivity_timer == 0) {
+				purple_debug_misc("jabber", "Starting BOSH inactivity timer "
+						"for %d secs (compensating for rounding)\n",
+						conn->max_inactivity - 5);
+				restart_inactivity_timer(conn);
+			}
+		}
+	}
+
+	if (requests)
+		conn->max_requests = atoi(requests);
+
+	/* FIXME: Depending on receiving features might break with some hosts */
+	packet = xmlnode_get_child(node, "features");
+	conn->state = BOSH_CONN_ONLINE;
+	conn->receive_cb = auth_response_cb;
+	jabber_stream_features_parse(conn->js, packet);
+}
+
+static void jabber_bosh_connection_boot(PurpleBOSHConnection *conn) {
+	GString *buf = g_string_new(NULL);
+
+	g_string_printf(buf, "<body content='text/xml; charset=utf-8' "
+	                "secure='true' "
+	                "to='%s' "
+	                "xml:lang='en' "
+	                "xmpp:version='1.0' "
+	                "ver='1.6' "
+	                "xmlns:xmpp='urn:xmpp:bosh' "
+	                "rid='%" G_GUINT64_FORMAT "' "
+/* TODO: This should be adjusted/adjustable automatically according to
+ * realtime network behavior */
+	                "wait='60' "
+	                "hold='1' "
+	                "xmlns='http://jabber.org/protocol/httpbind'/>",
+	                conn->js->user->domain,
+	                ++conn->rid);
+
+	purple_debug_misc("jabber", "SendBOSH Boot %s(%" G_GSIZE_FORMAT "): %s\n",
+	                  conn->ssl ? "(ssl)" : "", buf->len, buf->str);
+	conn->receive_cb = boot_response_cb;
+	http_connection_send_request(conn->connections[0], buf);
+	g_string_free(buf, TRUE);
+}
+
+static void
+http_received_cb(const char *data, int len, PurpleBOSHConnection *conn)
+{
+	if (conn->failed_connections)
+		/* We've got some data, so reset the number of failed connections */
+		conn->failed_connections = 0;
+
+	if (conn->receive_cb) {
+		xmlnode *node = xmlnode_from_str(data, len);
+
+		purple_debug_info("jabber", "RecvBOSH %s(%d): %s\n",
+		                  conn->ssl ? "(ssl)" : "", len, data);
+
+		if (node) {
+			conn->receive_cb(conn, node);
+			xmlnode_free(node);
+		} else {
+			purple_debug_warning("jabber", "BOSH: Received invalid XML\n");
+		}
+	} else {
+		g_return_if_reached();
+	}
+}
+
+void jabber_bosh_connection_send_raw(PurpleBOSHConnection *conn,
+                                     const char *data)
+{
+	jabber_bosh_connection_send(conn, PACKET_NORMAL, data);
+}
+
+static void
+connection_common_established_cb(PurpleHTTPConnection *conn)
+{
+	/* Indicate we're ready and reset some variables */
+	conn->state = HTTP_CONN_CONNECTED;
+	if (conn->requests != 0)
+		purple_debug_error("jabber", "bosh: httpconn %p has %d requests, != 0\n",
+		                   conn, conn->requests);
+
+	conn->requests = 0;
+	if (conn->read_buf) {
+		g_string_free(conn->read_buf, TRUE);
+		conn->read_buf = NULL;
+	}
+	conn->headers_done = FALSE;
+	conn->handled_len = conn->body_len = 0;
+
+	if (conn->bosh->needs_restart)
+		jabber_bosh_connection_stream_restart(conn->bosh);
+	else if (conn->bosh->state == BOSH_CONN_ONLINE) {
+		purple_debug_info("jabber", "BOSH session already exists. Trying to reuse it.\n");
+		if (conn->bosh->requests == 0 || conn->bosh->pending->bufused > 0) {
+			/* Send the pending data */
+			jabber_bosh_connection_send(conn->bosh, PACKET_FLUSH, NULL);
+		}
+	} else
+		jabber_bosh_connection_boot(conn->bosh);
+}
+
+static void http_connection_disconnected(PurpleHTTPConnection *conn)
+{
+	/*
+	 * Well, then. Fine! I never liked you anyway, server! I was cheating on you
+	 * with AIM!
+	 */
+	conn->state = HTTP_CONN_OFFLINE;
+	if (conn->psc) {
+		purple_ssl_close(conn->psc);
+		conn->psc = NULL;
+	} else if (conn->fd >= 0) {
+		close(conn->fd);
+		conn->fd = -1;
+	}
+
+	if (conn->readh) {
+		purple_input_remove(conn->readh);
+		conn->readh = 0;
+	}
+
+	if (conn->writeh) {
+		purple_input_remove(conn->writeh);
+		conn->writeh = 0;
+	}
+
+	if (conn->requests > 0 && conn->read_buf->len == 0) {
+		purple_debug_error("jabber", "bosh: Adjusting BOSHconn requests (%d) to %d\n",
+		                   conn->bosh->requests, conn->bosh->requests - conn->requests);
+		conn->bosh->requests -= conn->requests;
+		conn->requests = 0;
+	}
+
+	if (conn->bosh->pipelining) {
+		/* Hmmmm, fall back to multiple connections */
+		conn->bosh->pipelining = FALSE;
+		if (conn->bosh->connections[1] == NULL) {
+			conn->bosh->connections[1] = jabber_bosh_http_connection_init(conn->bosh);
+			http_connection_connect(conn->bosh->connections[1]);
+		}
+	}
+
+	if (++conn->bosh->failed_connections == MAX_FAILED_CONNECTIONS) {
+		purple_connection_error_reason(conn->bosh->js->gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+				_("Unable to establish a connection with the server"));
+	} else {
+		/* No! Please! Take me back. It was me, not you! I was weak! */
+		http_connection_connect(conn);
+	}
+}
+
+void jabber_bosh_connection_connect(PurpleBOSHConnection *bosh) {
+	PurpleHTTPConnection *conn = bosh->connections[0];
+
+	g_return_if_fail(bosh->state == BOSH_CONN_OFFLINE);
+	bosh->state = BOSH_CONN_BOOTING;
+
+	http_connection_connect(conn);
+}
+
+static void
+jabber_bosh_http_connection_process(PurpleHTTPConnection *conn)
+{
+	const char *cursor;
+
+	cursor = conn->read_buf->str + conn->handled_len;
+
+	if (!conn->headers_done) {
+		const char *content_length = purple_strcasestr(cursor, "\r\nContent-Length");
+		const char *end_of_headers = strstr(cursor, "\r\n\r\n");
+
+		/* Make sure Content-Length is in headers, not body */
+		if (content_length && (!end_of_headers || content_length < end_of_headers)) {
+			const char *sep;
+			const char *eol;
+			int len;
+
+			if ((sep = strstr(content_length, ": ")) == NULL ||
+					(eol = strstr(sep, "\r\n")) == NULL)
+				/*
+				 * The packet ends in the middle of the Content-Length line.
+				 * We'll try again later when we have more.
+				 */
+				return;
+
+			len = atoi(sep + 2);
+			if (len == 0)
+				purple_debug_warning("jabber", "Found mangled Content-Length header.\n");
+
+			conn->body_len = len;
+		}
+
+		if (end_of_headers) {
+			conn->headers_done = TRUE;
+			conn->handled_len = end_of_headers - conn->read_buf->str + 4;
+			cursor = end_of_headers + 4;
+		} else {
+			conn->handled_len = conn->read_buf->len;
+			return;
+		}
+	}
+
+	/* Have we handled everything in the buffer? */
+	if (conn->handled_len >= conn->read_buf->len)
+		return;
+
+	/* Have we read all that the Content-Length promised us? */
+	if (conn->read_buf->len - conn->handled_len < conn->body_len)
+		return;
+
+	--conn->requests;
+	--conn->bosh->requests;
+
+	http_received_cb(conn->read_buf->str + conn->handled_len, conn->body_len,
+	                 conn->bosh);
+
+	if (conn->bosh->state == BOSH_CONN_ONLINE &&
+			(conn->bosh->requests == 0 || conn->bosh->pending->bufused > 0)) {
+		purple_debug_misc("jabber", "BOSH: Sending an empty request\n");
+		jabber_bosh_connection_send(conn->bosh, PACKET_NORMAL, NULL);
+	}
+
+	g_string_free(conn->read_buf, TRUE);
+	conn->read_buf = NULL;
+	conn->headers_done = FALSE;
+	conn->handled_len = conn->body_len = 0;
+}
+
+/*
+ * Common code for reading, called from http_connection_read_cb_ssl and
+ * http_connection_read_cb.
+ */
+static void
+http_connection_read(PurpleHTTPConnection *conn)
+{
+	char buffer[1025];
+	int cnt, count = 0;
+
+	if (!conn->read_buf)
+		conn->read_buf = g_string_new(NULL);
+
+	do {
+		if (conn->psc)
+			cnt = purple_ssl_read(conn->psc, buffer, sizeof(buffer));
+		else
+			cnt = read(conn->fd, buffer, sizeof(buffer));
+
+		if (cnt > 0) {
+			count += cnt;
+			g_string_append_len(conn->read_buf, buffer, cnt);
+		}
+	} while (cnt > 0);
+
+	if (cnt == 0 || (cnt < 0 && errno != EAGAIN)) {
+		if (cnt < 0)
+			purple_debug_info("jabber", "bosh read=%d, errno=%d, error=%s\n",
+			                  cnt, errno, g_strerror(errno));
+		else
+			purple_debug_info("jabber", "bosh server closed the connection\n");
+
+		/*
+		 * If the socket is closed, the processing really needs to know about
+		 * it. Handle that now.
+		 */
+		http_connection_disconnected(conn);
+
+		/* Process what we do have */
+	}
+
+	if (conn->read_buf->len > 0)
+		jabber_bosh_http_connection_process(conn);
+}
+
+static void
+http_connection_read_cb(gpointer data, gint fd, PurpleInputCondition condition)
+{
+	PurpleHTTPConnection *conn = data;
+
+	http_connection_read(conn);
+}
+
+static void
+http_connection_read_cb_ssl(gpointer data, PurpleSslConnection *psc,
+                            PurpleInputCondition cond)
+{
+	PurpleHTTPConnection *conn = data;
+
+	http_connection_read(conn);
+}
+
+static void
+ssl_connection_established_cb(gpointer data, PurpleSslConnection *psc,
+                              PurpleInputCondition cond)
+{
+	PurpleHTTPConnection *conn = data;
+
+	purple_ssl_input_add(psc, http_connection_read_cb_ssl, conn);
+	connection_common_established_cb(conn);
+}
+
+static void
+ssl_connection_error_cb(PurpleSslConnection *gsc, PurpleSslErrorType error,
+                        gpointer data)
+{
+	PurpleHTTPConnection *conn = data;
+
+	/* sslconn frees the connection on error */
+	conn->psc = NULL;
+
+	purple_connection_ssl_error(conn->bosh->js->gc, error);
+}
+
+static void
+connection_established_cb(gpointer data, gint source, const gchar *error)
+{
+	PurpleHTTPConnection *conn = data;
+	PurpleConnection *gc = conn->bosh->js->gc;
+
+	if (source < 0) {
+		gchar *tmp;
+		tmp = g_strdup_printf(_("Unable to establish a connection with the server: %s"),
+		        error);
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
+		return;
+	}
+
+	conn->fd = source;
+	conn->readh = purple_input_add(conn->fd, PURPLE_INPUT_READ,
+	        http_connection_read_cb, conn);
+	connection_common_established_cb(conn);
+}
+
+static void http_connection_connect(PurpleHTTPConnection *conn)
+{
+	PurpleBOSHConnection *bosh = conn->bosh;
+	PurpleConnection *gc = bosh->js->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
+
+	conn->state = HTTP_CONN_CONNECTING;
+
+	if (bosh->ssl) {
+		if (purple_ssl_is_supported()) {
+			conn->psc = purple_ssl_connect(account, bosh->host, bosh->port,
+			                               ssl_connection_established_cb,
+			                               ssl_connection_error_cb,
+			                               conn);
+			if (!conn->psc) {
+				purple_connection_error_reason(gc,
+					PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+					_("Unable to establish SSL connection"));
+			}
+		} else {
+			purple_connection_error_reason(gc,
+			    PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+			    _("SSL support unavailable"));
+		}
+	} else if (purple_proxy_connect(conn, account, bosh->host, bosh->port,
+	                                 connection_established_cb, conn) == NULL) {
+		purple_connection_error_reason(gc,
+		    PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+		    _("Unable to connect"));
+	}
+}
+
+static int
+http_connection_do_send(PurpleHTTPConnection *conn, const char *data, int len)
+{
+	int ret;
+
+	if (conn->psc)
+		ret = purple_ssl_write(conn->psc, data, len);
+	else
+		ret = write(conn->fd, data, len);
+
+	return ret;
+}
+
+static void
+http_connection_send_cb(gpointer data, gint source, PurpleInputCondition cond)
+{
+	PurpleHTTPConnection *conn = data;
+	int ret;
+	int writelen = purple_circ_buffer_get_max_read(conn->write_buf);
+
+	if (writelen == 0) {
+		purple_input_remove(conn->writeh);
+		conn->writeh = 0;
+		return;
+	}
+
+	ret = http_connection_do_send(conn, conn->write_buf->outptr, writelen);
+
+	if (ret < 0 && errno == EAGAIN)
+		return;
+	else if (ret <= 0) {
+		/*
+		 * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+		 * buffer that stores what is "being sent" until the
+		 * PurpleHTTPConnection reports it is fully sent.
+		 */
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+				g_strerror(errno));
+		purple_connection_error_reason(conn->bosh->js->gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+				tmp);
+		g_free(tmp);
+		return;
+	}
+
+	purple_circ_buffer_mark_read(conn->write_buf, ret);
+}
+
+static void
+http_connection_send_request(PurpleHTTPConnection *conn, const GString *req)
+{
+	char *data;
+	int ret;
+	size_t len;
+
+	/* Sending something to the server, restart the inactivity timer */
+	restart_inactivity_timer(conn->bosh);
+
+	data = g_strdup_printf("POST %s HTTP/1.1\r\n"
+	                       "Host: %s\r\n"
+	                       "User-Agent: %s\r\n"
+	                       "Content-Encoding: text/xml; charset=utf-8\r\n"
+	                       "Content-Length: %" G_GSIZE_FORMAT "\r\n\r\n"
+	                       "%s",
+	                       conn->bosh->path, conn->bosh->host, bosh_useragent,
+	                       req->len, req->str);
+
+	len = strlen(data);
+
+	++conn->requests;
+	++conn->bosh->requests;
+
+	if (purple_debug_is_unsafe() && purple_debug_is_verbose())
+		/* Will contain passwords for SASL PLAIN and is verbose */
+		purple_debug_misc("jabber", "BOSH: Sending %s\n", data);
+
+	if (conn->writeh == 0)
+		ret = http_connection_do_send(conn, data, len);
+	else {
+		ret = -1;
+		errno = EAGAIN;
+	}
+
+	if (ret < 0 && errno != EAGAIN) {
+		/*
+		 * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+		 * buffer that stores what is "being sent" until the
+		 * PurpleHTTPConnection reports it is fully sent.
+		 */
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+				g_strerror(errno));
+		purple_connection_error_reason(conn->bosh->js->gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+				tmp);
+		g_free(tmp);
+		return;
+	} else if (ret < len) {
+		if (ret < 0)
+			ret = 0;
+		if (conn->writeh == 0)
+			conn->writeh = purple_input_add(conn->psc ? conn->psc->fd : conn->fd,
+					PURPLE_INPUT_WRITE, http_connection_send_cb, conn);
+		purple_circ_buffer_append(conn->write_buf, data + ret, len - ret);
+	}
+}
+
diff --git a/libpurple/protocols/jabber/bosh.h b/libpurple/protocols/jabber/bosh.h
new file mode 100644
index 0000000000..29e0f23715
--- /dev/null
+++ b/libpurple/protocols/jabber/bosh.h
@@ -0,0 +1,40 @@
+/**
+ * @file bosh.h Bidirectional-streams over Synchronous HTTP (BOSH) (XEP-0124 and XEP-0206)
+ *
+ * purple
+ *
+ * Copyright (C) 2008, Tobias Markmann <tmarkmann@googlemail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+#ifndef PURPLE_JABBER_BOSH_H_
+#define PURPLE_JABBER_BOSH_H_
+
+typedef struct _PurpleBOSHConnection PurpleBOSHConnection;
+
+#include "jabber.h"
+
+void jabber_bosh_init(void);
+void jabber_bosh_uninit(void);
+
+PurpleBOSHConnection* jabber_bosh_connection_init(JabberStream *js, const char *url);
+void jabber_bosh_connection_destroy(PurpleBOSHConnection *conn);
+
+gboolean jabber_bosh_connection_is_ssl(PurpleBOSHConnection *conn);
+
+void jabber_bosh_connection_connect(PurpleBOSHConnection *conn);
+void jabber_bosh_connection_close(PurpleBOSHConnection *conn);
+void jabber_bosh_connection_send_raw(PurpleBOSHConnection *conn, const char *data);
+#endif /* PURPLE_JABBER_BOSH_H_ */
diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c
index 31f20c7e45..7ccbb1036c 100644
--- a/libpurple/protocols/jabber/buddy.c
+++ b/libpurple/protocols/jabber/buddy.c
@@ -32,12 +32,11 @@
 #include "jabber.h"
 #include "iq.h"
 #include "presence.h"
+#include "useravatar.h"
 #include "xdata.h"
 #include "pep.h"
 #include "adhoccommands.h"
 
-#define MAX_HTTP_BUDDYICON_BYTES (200 * 1024)
-
 typedef struct {
 	long idle_seconds;
 } JabberBuddyInfoResource;
@@ -48,9 +47,11 @@ typedef struct {
 	char *jid;
 	GSList *ids;
 	GHashTable *resources;
-	int timeout_handle;
+	guint timeout_handle;
 	GSList *vcard_imgids;
 	PurpleNotifyUserInfo *user_info;
+	long last_seconds;
+	gchar *last_message;
 } JabberBuddyInfo;
 
 void jabber_buddy_free(JabberBuddy *jb)
@@ -68,24 +69,102 @@ JabberBuddy *jabber_buddy_find(JabberStream *js, const char *name,
 		gboolean create)
 {
 	JabberBuddy *jb;
-	const char *realname;
+	char *realname;
 
 	if (js->buddies == NULL)
 		return NULL;
 
-	if(!(realname = jabber_normalize(js->gc->account, name)))
+	if(!(realname = jabber_get_bare_jid(name)))
 		return NULL;
 
 	jb = g_hash_table_lookup(js->buddies, realname);
 
 	if(!jb && create) {
 		jb = g_new0(JabberBuddy, 1);
-		g_hash_table_insert(js->buddies, g_strdup(realname), jb);
-	}
+		g_hash_table_insert(js->buddies, realname, jb);
+	} else
+		g_free(realname);
 
 	return jb;
 }
 
+static gint resource_compare_cb(gconstpointer a, gconstpointer b)
+{
+	const JabberBuddyResource *jbra = a;
+	const JabberBuddyResource *jbrb = b;
+	JabberBuddyState state_a, state_b;
+
+	if (jbra->priority != jbrb->priority)
+		return jbra->priority > jbrb->priority ? 1 : -1;
+
+	/* Fold the states for easier comparison */
+	switch (jbra->state) {
+		case JABBER_BUDDY_STATE_ONLINE:
+		case JABBER_BUDDY_STATE_CHAT:
+			state_a = JABBER_BUDDY_STATE_ONLINE;
+			break;
+		case JABBER_BUDDY_STATE_AWAY:
+		case JABBER_BUDDY_STATE_DND:
+			state_a = JABBER_BUDDY_STATE_AWAY;
+			break;
+		case JABBER_BUDDY_STATE_XA:
+			state_a = JABBER_BUDDY_STATE_XA;
+			break;
+		case JABBER_BUDDY_STATE_UNAVAILABLE:
+			state_a = JABBER_BUDDY_STATE_UNAVAILABLE;
+			break;
+		default:
+			state_a = JABBER_BUDDY_STATE_UNKNOWN;
+			break;
+	}
+
+	switch (jbrb->state) {
+		case JABBER_BUDDY_STATE_ONLINE:
+		case JABBER_BUDDY_STATE_CHAT:
+			state_b = JABBER_BUDDY_STATE_ONLINE;
+			break;
+		case JABBER_BUDDY_STATE_AWAY:
+		case JABBER_BUDDY_STATE_DND:
+			state_b = JABBER_BUDDY_STATE_AWAY;
+			break;
+		case JABBER_BUDDY_STATE_XA:
+			state_b = JABBER_BUDDY_STATE_XA;
+			break;
+		case JABBER_BUDDY_STATE_UNAVAILABLE:
+			state_b = JABBER_BUDDY_STATE_UNAVAILABLE;
+			break;
+		default:
+			state_b = JABBER_BUDDY_STATE_UNKNOWN;
+			break;
+	}
+
+	if (state_a == state_b) {
+		if (jbra->idle == jbrb->idle)
+			return 0;
+		else if ((jbra->idle && !jbrb->idle) ||
+				(jbra->idle && jbrb->idle && jbra->idle < jbrb->idle))
+			return -1;
+		else
+			return 1;
+	}
+
+	if (state_a == JABBER_BUDDY_STATE_ONLINE)
+		return 1;
+	else if (state_a == JABBER_BUDDY_STATE_AWAY &&
+				(state_b == JABBER_BUDDY_STATE_XA ||
+				 state_b == JABBER_BUDDY_STATE_UNAVAILABLE ||
+				 state_b == JABBER_BUDDY_STATE_UNKNOWN))
+		return 1;
+	else if (state_a == JABBER_BUDDY_STATE_XA &&
+				(state_b == JABBER_BUDDY_STATE_UNAVAILABLE ||
+				 state_b == JABBER_BUDDY_STATE_UNKNOWN))
+		return 1;
+	else if (state_a == JABBER_BUDDY_STATE_UNAVAILABLE &&
+				state_b == JABBER_BUDDY_STATE_UNKNOWN)
+		return 1;
+
+	return -1;
+}
 
 JabberBuddyResource *jabber_buddy_find_resource(JabberBuddy *jb,
 		const char *resource)
@@ -98,46 +177,15 @@ JabberBuddyResource *jabber_buddy_find_resource(JabberBuddy *jb,
 
 	for(l = jb->resources; l; l = l->next)
 	{
-		if(!jbr && !resource) {
-			jbr = l->data;
-		} else if(!resource) {
-			if(((JabberBuddyResource *)l->data)->priority > jbr->priority)
-				jbr = l->data;
-			else if(((JabberBuddyResource *)l->data)->priority == jbr->priority) {
-				/* Determine if this resource is more available than the one we've currently chosen */
-				switch(((JabberBuddyResource *)l->data)->state) {
-					case JABBER_BUDDY_STATE_ONLINE:
-					case JABBER_BUDDY_STATE_CHAT:
-						/* This resource is online/chatty. Prefer to one which isn't either. */
-						if ((jbr->state != JABBER_BUDDY_STATE_ONLINE) && (jbr->state != JABBER_BUDDY_STATE_CHAT))
-							jbr = l->data;
-						break;
-					case JABBER_BUDDY_STATE_AWAY:
-					case JABBER_BUDDY_STATE_DND:
-						/* This resource is away/dnd. Prefer to one which is extended away, unavailable, or unknown. */
-						if ((jbr->state == JABBER_BUDDY_STATE_XA) || (jbr->state == JABBER_BUDDY_STATE_UNAVAILABLE) ||
-							(jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR))
-							jbr = l->data;
-						break;
-					case JABBER_BUDDY_STATE_XA:
-						/* This resource is extended away. That's better than unavailable or unknown. */
-						if ((jbr->state == JABBER_BUDDY_STATE_UNAVAILABLE) || (jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR))
-							jbr = l->data;
-						break;
-					case JABBER_BUDDY_STATE_UNAVAILABLE:
-						/* This resource is unavailable. That's better than unknown. */
-						if ((jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR))
-							jbr = l->data;
-						break;
-					case JABBER_BUDDY_STATE_UNKNOWN:
-					case JABBER_BUDDY_STATE_ERROR:
-						/* These are never preferable. */
-						break;
-				}
-			}
-		} else if(((JabberBuddyResource *)l->data)->name) {
-			if(!strcmp(((JabberBuddyResource *)l->data)->name, resource)) {
-				jbr = l->data;
+		JabberBuddyResource *tmp = (JabberBuddyResource *) l->data;
+		if (!jbr && !resource) {
+			jbr = tmp;
+		} else if (!resource) {
+			if (resource_compare_cb(tmp, jbr) > 0)
+				jbr = tmp;
+		} else if(tmp->name) {
+			if(!strcmp(tmp->name, resource)) {
+				jbr = tmp;
 				break;
 			}
 		}
@@ -154,13 +202,14 @@ JabberBuddyResource *jabber_buddy_track_resource(JabberBuddy *jb, const char *re
 		jbr = g_new0(JabberBuddyResource, 1);
 		jbr->jb = jb;
 		jbr->name = g_strdup(resource);
-		jbr->capabilities = JABBER_CAP_XHTML;
+		jbr->capabilities = JABBER_CAP_NONE;
+		jbr->tz_off = PURPLE_NO_TZ_OFF;
 		jb->resources = g_list_append(jb->resources, jbr);
 	}
 	jbr->priority = priority;
 	jbr->state = state;
 	g_free(jbr->status);
-	jbr->status = status != NULL ? g_markup_escape_text(status, -1) : NULL;
+	jbr->status = g_strdup(status);
 
 	return jbr;
 }
@@ -180,8 +229,10 @@ void jabber_buddy_resource_free(JabberBuddyResource *jbr)
 		jbr->commands = g_list_delete_link(jbr->commands, jbr->commands);
 	}
 
-	jabber_caps_free_clientinfo(jbr->caps);
-
+	if (jbr->caps.exts) {
+		g_list_foreach(jbr->caps.exts, (GFunc)g_free, NULL);
+		g_list_free(jbr->caps.exts);
+	}
 	g_free(jbr->name);
 	g_free(jbr->status);
 	g_free(jbr->thread_id);
@@ -201,21 +252,6 @@ void jabber_buddy_remove_resource(JabberBuddy *jb, const char *resource)
 	jabber_buddy_resource_free(jbr);
 }
 
-const char *jabber_buddy_get_status_msg(JabberBuddy *jb)
-{
-	JabberBuddyResource *jbr;
-
-	if(!jb)
-		return NULL;
-
-	jbr = jabber_buddy_find_resource(jb, NULL);
-
-	if(!jbr)
-		return NULL;
-
-	return jbr->status;
-}
-
 /*******
  * This is the old vCard stuff taken from the old prpl.  vCards, by definition
  * are a temporary thing until jabber can get its act together and come up
@@ -301,36 +337,32 @@ const char *jabber_buddy_get_status_msg(JabberBuddy *jb)
 
 struct vcard_template {
 	char *label;			/* label text pointer */
-	char *text;			/* entry text pointer */
-	int  visible;			/* should entry field be "visible?" */
-	int  editable;			/* should entry field be editable? */
 	char *tag;			/* tag text */
 	char *ptag;			/* parent tag "path" text */
-	char *url;			/* vCard display format if URL */
 } const vcard_template_data[] = {
-	{N_("Full Name"),          NULL, TRUE, TRUE, "FN",        NULL,  NULL},
-	{N_("Family Name"),        NULL, TRUE, TRUE, "FAMILY",    "N",   NULL},
-	{N_("Given Name"),         NULL, TRUE, TRUE, "GIVEN",     "N",   NULL},
-	{N_("Nickname"),           NULL, TRUE, TRUE, "NICKNAME",  NULL,  NULL},
-	{N_("URL"),                NULL, TRUE, TRUE, "URL",       NULL,  "<A HREF=\"%s\">%s</A>"},
-	{N_("Street Address"),     NULL, TRUE, TRUE, "STREET",    "ADR", NULL},
-	{N_("Extended Address"),   NULL, TRUE, TRUE, "EXTADD",    "ADR", NULL},
-	{N_("Locality"),           NULL, TRUE, TRUE, "LOCALITY",  "ADR", NULL},
-	{N_("Region"),             NULL, TRUE, TRUE, "REGION",    "ADR", NULL},
-	{N_("Postal Code"),        NULL, TRUE, TRUE, "PCODE",     "ADR", NULL},
-	{N_("Country"),            NULL, TRUE, TRUE, "CTRY",      "ADR", NULL},
-	{N_("Telephone"),          NULL, TRUE, TRUE, "NUMBER",    "TEL",  NULL},
-	{N_("Email"),             NULL, TRUE, TRUE, "USERID",    "EMAIL",  "<A HREF=\"mailto:%s\">%s</A>"},
-	{N_("Organization Name"),  NULL, TRUE, TRUE, "ORGNAME",   "ORG", NULL},
-	{N_("Organization Unit"),  NULL, TRUE, TRUE, "ORGUNIT",   "ORG", NULL},
-	{N_("Title"),              NULL, TRUE, TRUE, "TITLE",     NULL,  NULL},
-	{N_("Role"),               NULL, TRUE, TRUE, "ROLE",      NULL,  NULL},
-	{N_("Birthday"),           NULL, TRUE, TRUE, "BDAY",      NULL,  NULL},
-	{N_("Description"),        NULL, TRUE, TRUE, "DESC",      NULL,  NULL},
-	{"", NULL, TRUE, TRUE, "N",     NULL, NULL},
-	{"", NULL, TRUE, TRUE, "ADR",   NULL, NULL},
-	{"", NULL, TRUE, TRUE, "ORG",   NULL, NULL},
-	{NULL, NULL, 0, 0, NULL, NULL, NULL}
+	{N_("Full Name"),          "FN",        NULL},
+	{N_("Family Name"),        "FAMILY",    "N"},
+	{N_("Given Name"),         "GIVEN",     "N"},
+	{N_("Nickname"),           "NICKNAME",  NULL},
+	{N_("URL"),                "URL",       NULL},
+	{N_("Street Address"),     "STREET",    "ADR"},
+	{N_("Extended Address"),   "EXTADD",    "ADR"},
+	{N_("Locality"),           "LOCALITY",  "ADR"},
+	{N_("Region"),             "REGION",    "ADR"},
+	{N_("Postal Code"),        "PCODE",     "ADR"},
+	{N_("Country"),            "CTRY",      "ADR"},
+	{N_("Telephone"),          "NUMBER",    "TEL"},
+	{N_("Email"),              "USERID",    "EMAIL"},
+	{N_("Organization Name"),  "ORGNAME",   "ORG"},
+	{N_("Organization Unit"),  "ORGUNIT",   "ORG"},
+	{N_("Title"),              "TITLE",     NULL},
+	{N_("Role"),               "ROLE",      NULL},
+	{N_("Birthday"),           "BDAY",      NULL},
+	{N_("Description"),        "DESC",      NULL},
+	{"",                       "N",         NULL},
+	{"",                       "ADR",       NULL},
+	{"",                       "ORG",       NULL},
+	{NULL,                     NULL,        NULL}
 };
 
 /*
@@ -431,6 +463,11 @@ void jabber_set_info(PurpleConnection *gc, const char *info)
 	if(!js->vcard_fetched)
 		return;
 
+	if (js->vcard_timer) {
+		purple_timeout_remove(js->vcard_timer);
+		js->vcard_timer = 0;
+	}
+
 	g_free(js->avatar_hash);
 	js->avatar_hash = NULL;
 
@@ -476,6 +513,7 @@ void jabber_set_info(PurpleConnection *gc, const char *info)
 
 		xmlnode_insert_data(binval, enc, -1);
 		g_free(enc);
+		purple_imgstore_unref(img);
 	} else if (vc_node) {
 		xmlnode *photo;
 		/* TODO: Remove all PHOTO children? (see above note) */
@@ -488,134 +526,25 @@ void jabber_set_info(PurpleConnection *gc, const char *info)
 		iq = jabber_iq_new(js, JABBER_IQ_SET);
 		xmlnode_insert_child(iq->node, vc_node);
 		jabber_iq_send(iq);
+
+		/* Send presence to update vcard-temp:x:update */
+		jabber_presence_send(js, FALSE);
 	}
 }
 
 void jabber_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img)
 {
-	PurplePresence *gpresence;
-	PurpleStatus *status;
+	PurpleAccount *account = purple_connection_get_account(gc);
 
-	if(((JabberStream*)purple_connection_get_protocol_data(gc))->pep) {
-		/* XEP-0084: User Avatars */
-		if(img) {
-			/*
-			 * TODO: This is pretty gross.  The Jabber PRPL really shouldn't
-			 *       do voodoo to try to determine the image type, height
-			 *       and width.
-			 */
-			/* A PNG header, including the IHDR, but nothing else */
-			const struct {
-				guchar signature[8]; /* must be hex 89 50 4E 47 0D 0A 1A 0A */
-				struct {
-					guint32 length; /* must be 0x0d */
-					guchar type[4]; /* must be 'I' 'H' 'D' 'R' */
-					guint32 width;
-					guint32 height;
-					guchar bitdepth;
-					guchar colortype;
-					guchar compression;
-					guchar filter;
-					guchar interlace;
-				} ihdr;
-			} *png = purple_imgstore_get_data(img); /* ATTN: this is in network byte order! */
-
-			/* check if the data is a valid png file (well, at least to some extend) */
-			if(png->signature[0] == 0x89 &&
-			   png->signature[1] == 0x50 &&
-			   png->signature[2] == 0x4e &&
-			   png->signature[3] == 0x47 &&
-			   png->signature[4] == 0x0d &&
-			   png->signature[5] == 0x0a &&
-			   png->signature[6] == 0x1a &&
-			   png->signature[7] == 0x0a &&
-			   ntohl(png->ihdr.length) == 0x0d &&
-			   png->ihdr.type[0] == 'I' &&
-			   png->ihdr.type[1] == 'H' &&
-			   png->ihdr.type[2] == 'D' &&
-			   png->ihdr.type[3] == 'R') {
-				/* parse PNG header to get the size of the image (yes, this is required) */
-				guint32 width = ntohl(png->ihdr.width);
-				guint32 height = ntohl(png->ihdr.height);
-				xmlnode *publish, *item, *data, *metadata, *info;
-				char *lengthstring, *widthstring, *heightstring;
-
-				/* compute the sha1 hash */
-				char *hash = jabber_calculate_data_sha1sum(purple_imgstore_get_data(img), purple_imgstore_get_size(img));
-				char *base64avatar;
-
-				publish = xmlnode_new("publish");
-				xmlnode_set_attrib(publish,"node",AVATARNAMESPACEDATA);
-
-				item = xmlnode_new_child(publish, "item");
-				xmlnode_set_attrib(item, "id", hash);
-
-				data = xmlnode_new_child(item, "data");
-				xmlnode_set_namespace(data,AVATARNAMESPACEDATA);
-
-				base64avatar = purple_base64_encode(purple_imgstore_get_data(img), purple_imgstore_get_size(img));
-				xmlnode_insert_data(data,base64avatar,-1);
-				g_free(base64avatar);
-
-				/* publish the avatar itself */
-				jabber_pep_publish((JabberStream*)purple_connection_get_protocol_data(gc), publish);
-
-				/* next step: publish the metadata */
-				publish = xmlnode_new("publish");
-				xmlnode_set_attrib(publish,"node",AVATARNAMESPACEMETA);
-
-				item = xmlnode_new_child(publish, "item");
-				xmlnode_set_attrib(item, "id", hash);
-
-				metadata = xmlnode_new_child(item, "metadata");
-				xmlnode_set_namespace(metadata,AVATARNAMESPACEMETA);
-
-				info = xmlnode_new_child(metadata, "info");
-				xmlnode_set_attrib(info, "id", hash);
-				xmlnode_set_attrib(info, "type", "image/png");
-				lengthstring = g_strdup_printf("%u", (unsigned)purple_imgstore_get_size(img));
-				xmlnode_set_attrib(info, "bytes", lengthstring);
-				g_free(lengthstring);
-				widthstring = g_strdup_printf("%u", width);
-				xmlnode_set_attrib(info, "width", widthstring);
-				g_free(widthstring);
-				heightstring = g_strdup_printf("%u", height);
-				xmlnode_set_attrib(info, "height", heightstring);
-				g_free(heightstring);
-
-				/* publish the metadata */
-				jabber_pep_publish((JabberStream*)purple_connection_get_protocol_data(gc), publish);
-
-				g_free(hash);
-			} else {
-				purple_debug_error("jabber", "jabber_set_buddy_icon received non-png data");
-			}
-		} else {
-			/* remove the metadata */
-			xmlnode *metadata, *item;
-			xmlnode *publish = xmlnode_new("publish");
-			xmlnode_set_attrib(publish,"node",AVATARNAMESPACEMETA);
-
-			item = xmlnode_new_child(publish, "item");
-
-			metadata = xmlnode_new_child(item, "metadata");
-			xmlnode_set_namespace(metadata,AVATARNAMESPACEMETA);
+	/* Publish the avatar as specified in XEP-0084 */
+	jabber_avatar_set(gc->proto_data, img);
+	/* Set the image in our vCard */
+	jabber_set_info(gc, purple_account_get_user_info(account));
 
-			xmlnode_new_child(metadata, "stop");
-
-			/* publish the metadata */
-			jabber_pep_publish((JabberStream*)gc->proto_data, publish);
-		}
-	}
-
-	/* vCard avatars do not have an image type requirement so update our
-	 * vCard avatar regardless of image type for those poor older clients
-	 */
-	jabber_set_info(gc, purple_account_get_user_info(gc->account));
-
-	gpresence = purple_account_get_presence(gc->account);
-	status = purple_presence_get_active_status(gpresence);
-	jabber_presence_send(gc->account, status);
+	/* TODO: Fake image to ourselves, since a number of servers do not echo
+	 * back our presence to us. To do this without uselessly copying the data
+	 * of the image, we need purple_buddy_icons_set_for_user_image (i.e. takes
+	 * an existing icon/stored image). */
 }
 
 /*
@@ -763,20 +692,93 @@ static void jabber_buddy_info_destroy(JabberBuddyInfo *jbi)
 
 	g_free(jbi->jid);
 	g_hash_table_destroy(jbi->resources);
+	g_free(jbi->last_message);
 	purple_notify_user_info_destroy(jbi->user_info);
 	g_free(jbi);
 }
 
+static void
+add_jbr_info(JabberBuddyInfo *jbi, const char *resource,
+             JabberBuddyResource *jbr)
+{
+	JabberBuddyInfoResource *jbir;
+	PurpleNotifyUserInfo *user_info;
+
+	jbir = g_hash_table_lookup(jbi->resources, resource);
+	user_info = jbi->user_info;
+
+	if (jbr && jbr->client.name) {
+		char *tmp =
+			g_strdup_printf("%s%s%s", jbr->client.name,
+		                    (jbr->client.version ? " " : ""),
+		                    (jbr->client.version ? jbr->client.version : ""));
+		purple_notify_user_info_prepend_pair(user_info, _("Client"), tmp);
+		g_free(tmp);
+
+		if (jbr->client.os)
+			purple_notify_user_info_prepend_pair(user_info, _("Operating System"), jbr->client.os);
+	}
+
+	if (jbr && jbr->tz_off != PURPLE_NO_TZ_OFF) {
+		time_t now_t;
+		struct tm *now;
+		char *timestamp;
+		time(&now_t);
+		now_t += jbr->tz_off;
+		now = gmtime(&now_t);
+
+		timestamp =
+			g_strdup_printf("%s %c%02d%02d", purple_time_format(now),
+		                    jbr->tz_off < 0 ? '-' : '+',
+		                    abs(jbr->tz_off / (60*60)),
+		                    abs((jbr->tz_off % (60*60)) / 60));
+		purple_notify_user_info_prepend_pair(user_info, _("Local Time"), timestamp);
+		g_free(timestamp);
+	}
+
+	if (jbir && jbir->idle_seconds > 0) {
+		char *idle = purple_str_seconds_to_string(jbir->idle_seconds);
+		purple_notify_user_info_prepend_pair(user_info, _("Idle"), idle);
+		g_free(idle);
+	}
+
+	if (jbr) {
+		char *purdy = NULL;
+		char *tmp;
+		char priority[12];
+		const char *status_name = jabber_buddy_state_get_name(jbr->state);
+
+		if (jbr->status) {
+			purdy = purple_strdup_withhtml(jbr->status);
+
+			if (purple_strequal(status_name, purdy))
+				status_name = NULL;
+		}
+
+		tmp = g_strdup_printf("%s%s%s", (status_name ? status_name : ""),
+						((status_name && purdy) ? ": " : ""),
+						(purdy ? purdy : ""));
+		purple_notify_user_info_prepend_pair(user_info, _("Status"), tmp);
+
+		g_snprintf(priority, sizeof(priority), "%d", jbr->priority);
+		purple_notify_user_info_prepend_pair(user_info, _("Priority"), priority);
+
+		g_free(tmp);
+		g_free(purdy);
+	} else {
+		purple_notify_user_info_prepend_pair(user_info, _("Status"), _("Unknown"));
+	}
+}
+
 static void jabber_buddy_info_show_if_ready(JabberBuddyInfo *jbi)
 {
-	char *resource_name, *tmp;
+	char *resource_name;
 	JabberBuddyResource *jbr;
-	JabberBuddyInfoResource *jbir = NULL;
 	GList *resources;
 	PurpleNotifyUserInfo *user_info;
 
 	/* not yet */
-	if(jbi->ids)
+	if (jbi->ids)
 		return;
 
 	user_info = jbi->user_info;
@@ -786,347 +788,50 @@ static void jabber_buddy_info_show_if_ready(JabberBuddyInfo *jbi)
 	if (purple_notify_user_info_get_entries(user_info))
 		purple_notify_user_info_prepend_section_break(user_info);
 
-	/* Prepend the primary buddy info to user_info so that it goes before the vcard. */
-	if(resource_name) {
+	/* Add the information about the user's resource(s) */
+	if (resource_name) {
 		jbr = jabber_buddy_find_resource(jbi->jb, resource_name);
-		jbir = g_hash_table_lookup(jbi->resources, resource_name);
-		if(jbr && jbr->client.name) {
-			tmp = g_strdup_printf("%s%s%s", jbr->client.name,
-								  (jbr->client.version ? " " : ""),
-								  (jbr->client.version ? jbr->client.version : ""));
-			purple_notify_user_info_add_pair(user_info, _("Client"), tmp);
-			g_free(tmp);
-
-			if(jbr->client.os) {
-				purple_notify_user_info_prepend_pair(user_info, _("Operating System"), jbr->client.os);
-			}
-		}
-		if(jbir) {
-			if(jbir->idle_seconds > 0) {
-				char *idle = purple_str_seconds_to_string(jbir->idle_seconds);
-				purple_notify_user_info_prepend_pair(user_info, _("Idle"), idle);
-				g_free(idle);
-			}
-		}
-		if(jbr) {
-			char *purdy = NULL;
-			const char *status_name = jabber_buddy_state_get_name(jbr->state);
-			if(jbr->status)
-				purdy = purple_strdup_withhtml(jbr->status);
-			if(status_name && purdy && !strcmp(status_name, purdy))
-				status_name = NULL;
-
-			tmp = g_strdup_printf("%s%s%s", (status_name ? status_name : ""),
-							((status_name && purdy) ? ": " : ""),
-							(purdy ? purdy : ""));
-			purple_notify_user_info_prepend_pair(user_info, _("Status"), tmp);
-			g_free(tmp);
-			g_free(purdy);
-		} else {
-			purple_notify_user_info_prepend_pair(user_info, _("Status"), _("Unknown"));
-		}
-#if 0
-		/* #if 0 this for now; I think this would be far more useful if we limited this to a particular set of features
- 		 * of particular interest (-vv jumps out as one). As it is now, I don't picture people getting all excited: "Oh sweet crap!
- 		 * So-and-so supports 'jabber:x:data' AND 'Collaborative Data Objects'!"
- 		 */
-
-		if(jbr && jbr->caps) {
-			GString *tmp = g_string_new("");
-			GList *iter;
-			for(iter = jbr->caps->features; iter; iter = g_list_next(iter)) {
-				const char *feature = iter->data;
-
-				if(!strcmp(feature, "jabber:iq:last"))
-					feature = _("Last Activity");
-				else if(!strcmp(feature, "http://jabber.org/protocol/disco#info"))
-					feature = _("Service Discovery Info");
-				else if(!strcmp(feature, "http://jabber.org/protocol/disco#items"))
-					feature = _("Service Discovery Items");
-				else if(!strcmp(feature, "http://jabber.org/protocol/address"))
-					feature = _("Extended Stanza Addressing");
-				else if(!strcmp(feature, "http://jabber.org/protocol/muc"))
-					feature = _("Multi-User Chat");
-				else if(!strcmp(feature, "http://jabber.org/protocol/muc#user"))
-					feature = _("Multi-User Chat Extended Presence Information");
-				else if(!strcmp(feature, "http://jabber.org/protocol/ibb"))
-					feature = _("In-Band Bytestreams");
-				else if(!strcmp(feature, "http://jabber.org/protocol/commands"))
-					feature = _("Ad-Hoc Commands");
-				else if(!strcmp(feature, "http://jabber.org/protocol/pubsub"))
-					feature = _("PubSub Service");
-				else if(!strcmp(feature, "http://jabber.org/protocol/bytestreams"))
-					feature = _("SOCKS5 Bytestreams");
-				else if(!strcmp(feature, "jabber:x:oob"))
-					feature = _("Out of Band Data");
-				else if(!strcmp(feature, "http://jabber.org/protocol/xhtml-im"))
-					feature = _("XHTML-IM");
-				else if(!strcmp(feature, "jabber:iq:register"))
-					feature = _("In-Band Registration");
-				else if(!strcmp(feature, "http://jabber.org/protocol/geoloc"))
-					feature = _("User Location");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0084.html"))
-					feature = _("User Avatar");
-				else if(!strcmp(feature, "http://jabber.org/protocol/chatstates"))
-					feature = _("Chat State Notifications");
-				else if(!strcmp(feature, "jabber:iq:version"))
-					feature = _("Software Version");
-				else if(!strcmp(feature, "http://jabber.org/protocol/si"))
-					feature = _("Stream Initiation");
-				else if(!strcmp(feature, "http://jabber.org/protocol/si/profile/file-transfer"))
-					feature = _("File Transfer");
-				else if(!strcmp(feature, "http://jabber.org/protocol/mood"))
-					feature = _("User Mood");
-				else if(!strcmp(feature, "http://jabber.org/protocol/activity"))
-					feature = _("User Activity");
-				else if(!strcmp(feature, "http://jabber.org/protocol/caps"))
-					feature = _("Entity Capabilities");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html"))
-					feature = _("Encrypted Session Negotiations");
-				else if(!strcmp(feature, "http://jabber.org/protocol/tune"))
-					feature = _("User Tune");
-				else if(!strcmp(feature, "http://jabber.org/protocol/rosterx"))
-					feature = _("Roster Item Exchange");
-				else if(!strcmp(feature, "http://jabber.org/protocol/reach"))
-					feature = _("Reachability Address");
-				else if(!strcmp(feature, "http://jabber.org/protocol/profile"))
-					feature = _("User Profile");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0166.html#ns"))
-					feature = _("Jingle");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0167.html#ns"))
-					feature = _("Jingle Audio");
-				else if(!strcmp(feature, "http://jabber.org/protocol/nick"))
-					feature = _("User Nickname");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-udp"))
-					feature = _("Jingle ICE UDP");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-tcp"))
-					feature = _("Jingle ICE TCP");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0177.html#ns"))
-					feature = _("Jingle Raw UDP");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0180.html#ns"))
-					feature = _("Jingle Video");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0181.html#ns"))
-					feature = _("Jingle DTMF");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0184.html#ns"))
-					feature = _("Message Receipts");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0189.html#ns"))
-					feature = _("Public Key Publishing");
-				else if(!strcmp(feature, "http://jabber.org/protocol/chatting"))
-					feature = _("User Chatting");
-				else if(!strcmp(feature, "http://jabber.org/protocol/browsing"))
-					feature = _("User Browsing");
-				else if(!strcmp(feature, "http://jabber.org/protocol/gaming"))
-					feature = _("User Gaming");
-				else if(!strcmp(feature, "http://jabber.org/protocol/viewing"))
-					feature = _("User Viewing");
-				else if(!strcmp(feature, "urn:xmpp:ping") || !strcmp(feature, "http://www.xmpp.org/extensions/xep-0199.html#ns"))
-					feature = _("Ping");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0200.html#ns"))
-					feature = _("Stanza Encryption");
-				else if(!strcmp(feature, "urn:xmpp:time"))
-					feature = _("Entity Time");
-				else if(!strcmp(feature, "urn:xmpp:delay"))
-					feature = _("Delayed Delivery");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0204.html#ns"))
-					feature = _("Collaborative Data Objects");
-				else if(!strcmp(feature, "http://jabber.org/protocol/fileshare"))
-					feature = _("File Repository and Sharing");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0215.html#ns"))
-					feature = _("STUN Service Discovery for Jingle");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html#ns"))
-					feature = _("Simplified Encrypted Session Negotiation");
-				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0219.html#ns"))
-					feature = _("Hop Check");
-				else if(g_str_has_suffix(feature, "+notify"))
-					feature = NULL;
-				if(feature)
-					g_string_append_printf(tmp, "%s<br/>", feature);
-			}
-
-			if(strlen(tmp->str) > 0)
-				purple_notify_user_info_prepend_pair(user_info, _("Capabilities"), tmp->str);
-
-			g_string_free(tmp, TRUE);
-		}
-#endif
+		add_jbr_info(jbi, resource_name, jbr);
 	} else {
-		gboolean multiple_resources = jbi->jb->resources && jbi->jb->resources->next;
-
-		for(resources = jbi->jb->resources; resources; resources = resources->next) {
-			char *purdy = NULL;
-			const char *status_name = NULL;
-
+		for (resources = jbi->jb->resources; resources; resources = resources->next) {
 			jbr = resources->data;
 
-			if(jbr->client.name) {
-				tmp = g_strdup_printf("%s%s%s", jbr->client.name,
-									  (jbr->client.version ? " " : ""),
-									  (jbr->client.version ? jbr->client.version : ""));
-				purple_notify_user_info_prepend_pair(user_info,
-												 _("Client"), tmp);
-				g_free(tmp);
-
-				if(jbr->client.os) {
-					purple_notify_user_info_prepend_pair(user_info, _("Operating System"), jbr->client.os);
-				}
-			}
-
-			if(jbr->name && (jbir = g_hash_table_lookup(jbi->resources, jbr->name))) {
-				if(jbir->idle_seconds > 0) {
-					char *idle = purple_str_seconds_to_string(jbir->idle_seconds);
-					purple_notify_user_info_prepend_pair(user_info, _("Idle"), idle);
-					g_free(idle);
-				}
-			}
-
-			status_name = jabber_buddy_state_get_name(jbr->state);
-			if(jbr->status)
-				purdy = purple_strdup_withhtml(jbr->status);
-			if(status_name && purdy && !strcmp(status_name, purdy))
-				status_name = NULL;
+			/* put a section break between resources, this is not needed if
+			 we are at the first, because one was already added for the vcard
+			 section */
+			if (resources != jbi->jb->resources)
+				purple_notify_user_info_prepend_section_break(user_info);
 
-			tmp = g_strdup_printf("%s%s%s", (status_name ? status_name : ""),
-								  ((status_name && purdy) ? ": " : ""),
-								  (purdy ? purdy : ""));
-			purple_notify_user_info_prepend_pair(user_info, _("Status"), tmp);
-			g_free(tmp);
-			g_free(purdy);
+			add_jbr_info(jbi, jbr->name, jbr);
 
-			if(multiple_resources) {
-				tmp = g_strdup_printf("%d", jbr->priority);
-				purple_notify_user_info_prepend_pair(user_info, _("Priority"), tmp);
-				g_free(tmp);
-			}
-
-			if(jbr->name)
+			if (jbr->name)
 				purple_notify_user_info_prepend_pair(user_info, _("Resource"), jbr->name);
-#if 0
-			if(jbr && jbr->caps) {
-				GString *tmp = g_string_new("");
-				GList *iter;
-				for(iter = jbr->caps->features; iter; iter = g_list_next(iter)) {
-					const char *feature = iter->data;
-
-					if(!strcmp(feature, "jabber:iq:last"))
-						feature = _("Last Activity");
-					else if(!strcmp(feature, "http://jabber.org/protocol/disco#info"))
-						feature = _("Service Discovery Info");
-					else if(!strcmp(feature, "http://jabber.org/protocol/disco#items"))
-						feature = _("Service Discovery Items");
-					else if(!strcmp(feature, "http://jabber.org/protocol/address"))
-						feature = _("Extended Stanza Addressing");
-					else if(!strcmp(feature, "http://jabber.org/protocol/muc"))
-						feature = _("Multi-User Chat");
-					else if(!strcmp(feature, "http://jabber.org/protocol/muc#user"))
-						feature = _("Multi-User Chat Extended Presence Information");
-					else if(!strcmp(feature, "http://jabber.org/protocol/ibb"))
-						feature = _("In-Band Bytestreams");
-					else if(!strcmp(feature, "http://jabber.org/protocol/commands"))
-						feature = _("Ad-Hoc Commands");
-					else if(!strcmp(feature, "http://jabber.org/protocol/pubsub"))
-						feature = _("PubSub Service");
-					else if(!strcmp(feature, "http://jabber.org/protocol/bytestreams"))
-						feature = _("SOCKS5 Bytestreams");
-					else if(!strcmp(feature, "jabber:x:oob"))
-						feature = _("Out of Band Data");
-					else if(!strcmp(feature, "http://jabber.org/protocol/xhtml-im"))
-						feature = _("XHTML-IM");
-					else if(!strcmp(feature, "jabber:iq:register"))
-						feature = _("In-Band Registration");
-					else if(!strcmp(feature, "http://jabber.org/protocol/geoloc"))
-						feature = _("User Location");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0084.html"))
-						feature = _("User Avatar");
-					else if(!strcmp(feature, "http://jabber.org/protocol/chatstates"))
-						feature = _("Chat State Notifications");
-					else if(!strcmp(feature, "jabber:iq:version"))
-						feature = _("Software Version");
-					else if(!strcmp(feature, "http://jabber.org/protocol/si"))
-						feature = _("Stream Initiation");
-					else if(!strcmp(feature, "http://jabber.org/protocol/si/profile/file-transfer"))
-						feature = _("File Transfer");
-					else if(!strcmp(feature, "http://jabber.org/protocol/mood"))
-						feature = _("User Mood");
-					else if(!strcmp(feature, "http://jabber.org/protocol/activity"))
-						feature = _("User Activity");
-					else if(!strcmp(feature, "http://jabber.org/protocol/caps"))
-						feature = _("Entity Capabilities");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html"))
-						feature = _("Encrypted Session Negotiations");
-					else if(!strcmp(feature, "http://jabber.org/protocol/tune"))
-						feature = _("User Tune");
-					else if(!strcmp(feature, "http://jabber.org/protocol/rosterx"))
-						feature = _("Roster Item Exchange");
-					else if(!strcmp(feature, "http://jabber.org/protocol/reach"))
-						feature = _("Reachability Address");
-					else if(!strcmp(feature, "http://jabber.org/protocol/profile"))
-						feature = _("User Profile");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0166.html#ns"))
-						feature = _("Jingle");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0167.html#ns"))
-						feature = _("Jingle Audio");
-					else if(!strcmp(feature, "http://jabber.org/protocol/nick"))
-						feature = _("User Nickname");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-udp"))
-						feature = _("Jingle ICE UDP");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-tcp"))
-						feature = _("Jingle ICE TCP");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0177.html#ns"))
-						feature = _("Jingle Raw UDP");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0180.html#ns"))
-						feature = _("Jingle Video");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0181.html#ns"))
-						feature = _("Jingle DTMF");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0184.html#ns"))
-						feature = _("Message Receipts");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0189.html#ns"))
-						feature = _("Public Key Publishing");
-					else if(!strcmp(feature, "http://jabber.org/protocol/chatting"))
-						feature = _("User Chatting");
-					else if(!strcmp(feature, "http://jabber.org/protocol/browsing"))
-						feature = _("User Browsing");
-					else if(!strcmp(feature, "http://jabber.org/protocol/gaming"))
-						feature = _("User Gaming");
-					else if(!strcmp(feature, "http://jabber.org/protocol/viewing"))
-						feature = _("User Viewing");
-					else if(!strcmp(feature, "urn:xmpp:ping") || !strcmp(feature, "http://www.xmpp.org/extensions/xep-0199.html#ns"))
-						feature = _("Ping");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0200.html#ns"))
-						feature = _("Stanza Encryption");
-					else if(!strcmp(feature, "urn:xmpp:time"))
-						feature = _("Entity Time");
-					else if(!strcmp(feature, "urn:xmpp:delay"))
-						feature = _("Delayed Delivery");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0204.html#ns"))
-						feature = _("Collaborative Data Objects");
-					else if(!strcmp(feature, "http://jabber.org/protocol/fileshare"))
-						feature = _("File Repository and Sharing");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0215.html#ns"))
-						feature = _("STUN Service Discovery for Jingle");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html#ns"))
-						feature = _("Simplified Encrypted Session Negotiation");
-					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0219.html#ns"))
-						feature = _("Hop Check");
-					else if(g_str_has_suffix(feature, "+notify"))
-						feature = NULL;
-
-					if(feature)
-						g_string_append_printf(tmp, "%s\n", feature);
-				}
-				if(strlen(tmp->str) > 0)
-					purple_notify_user_info_prepend_pair(user_info, _("Capabilities"), tmp->str);
+		}
+	}
 
-				g_string_free(tmp, TRUE);
-			}
-#endif
+	if (!jbi->jb->resources) {
+		/* the buddy is offline */
+		gchar *status =
+			g_strdup_printf("%s%s%s",	_("Offline"),
+			                jbi->last_message ? ": " : "",
+			                jbi->last_message ? jbi->last_message : "");
+		if (jbi->last_seconds > 0) {
+			char *last = purple_str_seconds_to_string(jbi->last_seconds);
+			gchar *message = g_strdup_printf(_("%s ago"), last);
+			purple_notify_user_info_prepend_pair(user_info,
+				_("Logged Off"), message);
+			g_free(last);
+			g_free(message);
 		}
+		purple_notify_user_info_prepend_pair(user_info, _("Status"), status);
+		g_free(status);
 	}
 
 	g_free(resource_name);
 
 	purple_notify_userinfo(jbi->js->gc, jbi->jid, user_info, NULL, NULL);
 
-	while(jbi->vcard_imgids) {
+	while (jbi->vcard_imgids) {
 		purple_imgstore_unref_by_id(GPOINTER_TO_INT(jbi->vcard_imgids->data));
 		jbi->vcard_imgids = g_slist_delete_link(jbi->vcard_imgids, jbi->vcard_imgids);
 	}
@@ -1155,18 +860,43 @@ static void jabber_buddy_info_remove_id(JabberBuddyInfo *jbi, const char *id)
 	}
 }
 
-static void jabber_vcard_save_mine(JabberStream *js, xmlnode *packet, gpointer data)
+static gboolean
+set_own_vcard_cb(gpointer data)
 {
-	xmlnode *vcard;
-	char *txt;
-	PurpleStoredImage *img;
+	JabberStream *js = data;
+	PurpleAccount *account = purple_connection_get_account(js->gc);
+
+	js->vcard_timer = 0;
+
+	jabber_set_info(js->gc, purple_account_get_user_info(account));
+
+	return FALSE;
+}
+
+static void jabber_vcard_save_mine(JabberStream *js, const char *from,
+                                   JabberIqType type, const char *id,
+                                   xmlnode *packet, gpointer data)
+{
+	xmlnode *vcard, *photo, *binval;
+	char *txt, *vcard_hash = NULL;
+	PurpleAccount *account;
+
+	if (type == JABBER_IQ_ERROR) {
+		xmlnode *error;
+		purple_debug_warning("jabber", "Server returned error while retrieving vCard\n");
+
+		error = xmlnode_get_child(packet, "error");
+		if (!error || !xmlnode_get_child(error, "item-not-found"))
+			return;
+	}
+
+	account = purple_connection_get_account(js->gc);
 
 	if((vcard = xmlnode_get_child(packet, "vCard")) ||
 			(vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp")))
 	{
 		txt = xmlnode_to_str(vcard, NULL);
-		purple_account_set_user_info(purple_connection_get_account(js->gc), txt);
-
+		purple_account_set_user_info(account, txt);
 		g_free(txt);
 	} else {
 		/* if we have no vCard, then lets not overwrite what we might have locally */
@@ -1174,10 +904,38 @@ static void jabber_vcard_save_mine(JabberStream *js, xmlnode *packet, gpointer d
 
 	js->vcard_fetched = TRUE;
 
-	if(NULL != (img = purple_buddy_icons_find_account_icon(js->gc->account))) {
-		jabber_set_buddy_icon(js->gc, img);
-		purple_imgstore_unref(img);
+	if (vcard && (photo = xmlnode_get_child(vcard, "PHOTO")) &&
+	             (binval = xmlnode_get_child(photo, "BINVAL"))) {
+		gsize size;
+		char *bintext = xmlnode_get_data(binval);
+		guchar *data = purple_base64_decode(bintext, &size);
+		g_free(bintext);
+
+		if (data) {
+			vcard_hash = jabber_calculate_data_sha1sum(data, size);
+			g_free(data);
+		}
 	}
+
+	/* Republish our vcard if the photo is different than the server's */
+	if (!purple_strequal(vcard_hash, js->initial_avatar_hash)) {
+		/*
+		 * Google Talk has developed the behavior that it will not accept
+		 * a vcard set in the first 10 seconds (or so) of the connection;
+		 * it returns an error (namespaces trimmed):
+		 * <error code="500" type="wait"><internal-server-error/></error>.
+		 */
+		if (js->googletalk)
+			js->vcard_timer = purple_timeout_add_seconds(10, set_own_vcard_cb,
+			                                             js);
+		else
+			jabber_set_info(js->gc, purple_account_get_user_info(account));
+	} else if (js->initial_avatar_hash) {
+		/* Our photo is in the vcard, so advertise vcard-temp updates */
+		js->avatar_hash = g_strdup(js->initial_avatar_hash);
+	}
+
+	g_free(vcard_hash);
 }
 
 void jabber_vcard_fetch_mine(JabberStream *js)
@@ -1191,9 +949,10 @@ void jabber_vcard_fetch_mine(JabberStream *js)
 	jabber_iq_send(iq);
 }
 
-static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data)
+static void jabber_vcard_parse(JabberStream *js, const char *from,
+                               JabberIqType type, const char *id,
+                               xmlnode *packet, gpointer data)
 {
-	const char *id, *from;
 	char *bare_jid;
 	char *text;
 	char *serverside_alias = NULL;
@@ -1202,9 +961,6 @@ static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data)
 	JabberBuddyInfo *jbi = data;
 	PurpleNotifyUserInfo *user_info;
 
-	from = xmlnode_get_attrib(packet, "from");
-	id = xmlnode_get_attrib(packet, "id");
-
 	if(!jbi)
 		return;
 
@@ -1292,7 +1048,12 @@ static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data)
 
 					if(!strcmp(child2->name, "POBOX")) {
 						purple_notify_user_info_add_pair(user_info, _("P.O. Box"), text2);
-					} else if(!strcmp(child2->name, "EXTADR")) {
+					} else if (g_str_equal(child2->name, "EXTADD") || g_str_equal(child2->name, "EXTADR")) {
+						/*
+						 * EXTADD is correct, EXTADR is generated by other
+						 * clients. The next time someone reads this, remove
+						 * EXTADR.
+						 */
 						purple_notify_user_info_add_pair(user_info, _("Extended Address"), text2);
 					} else if(!strcmp(child2->name, "STREET")) {
 						purple_notify_user_info_add_pair(user_info, _("Street Address"), text2);
@@ -1427,146 +1188,38 @@ static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data)
 	jabber_buddy_info_show_if_ready(jbi);
 }
 
-typedef struct _JabberBuddyAvatarUpdateURLInfo {
-	JabberStream *js;
-	char *from;
-	char *id;
-} JabberBuddyAvatarUpdateURLInfo;
-
-static void do_buddy_avatar_update_fromurl(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, gsize len, const gchar *error_message) {
-	JabberBuddyAvatarUpdateURLInfo *info = user_data;
-	if(!url_text) {
-		purple_debug(PURPLE_DEBUG_ERROR, "jabber",
-					 "do_buddy_avatar_update_fromurl got error \"%s\"", error_message);
-		return;
-	}
-
-	purple_buddy_icons_set_for_user(purple_connection_get_account(info->js->gc), info->from, (void*)url_text, len, info->id);
-	g_free(info->from);
-	g_free(info->id);
-	g_free(info);
-}
-
-static void do_buddy_avatar_update_data(JabberStream *js, const char *from, xmlnode *items) {
-	xmlnode *item, *data;
-	const char *checksum;
-	char *b64data;
-	void *img;
-	size_t size;
-	if(!items)
-		return;
-
-	item = xmlnode_get_child(items, "item");
-	if(!item)
-		return;
-
-	data = xmlnode_get_child_with_namespace(item,"data",AVATARNAMESPACEDATA);
-	if(!data)
-		return;
-
-	checksum = xmlnode_get_attrib(item,"id");
-	if(!checksum)
-		return;
-
-	b64data = xmlnode_get_data(data);
-	if(!b64data)
-		return;
-
-	img = purple_base64_decode(b64data, &size);
-	if(!img) {
-		g_free(b64data);
-		return;
-	}
-
-	purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, img, size, checksum);
-	g_free(b64data);
+static void jabber_buddy_info_resource_free(gpointer data)
+{
+	JabberBuddyInfoResource *jbri = data;
+	g_free(jbri);
 }
 
-void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xmlnode *items) {
-	PurpleBuddy *buddy = purple_find_buddy(purple_connection_get_account(js->gc), from);
-	const char *checksum;
-	xmlnode *item, *metadata;
-	if(!buddy)
-		return;
-
-	checksum = purple_buddy_icons_get_checksum_for_user(buddy);
-	item = xmlnode_get_child(items,"item");
-	metadata = xmlnode_get_child_with_namespace(item, "metadata", AVATARNAMESPACEMETA);
-	if(!metadata)
-		return;
-	/* check if we have received a stop */
-	if(xmlnode_get_child(metadata, "stop")) {
-		purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, NULL, 0, NULL);
-	} else {
-		xmlnode *info, *goodinfo = NULL;
-		gboolean has_children = FALSE;
-
-		/* iterate over all info nodes to get one we can use */
-		for(info = metadata->child; info; info = info->next) {
-			if(info->type == XMLNODE_TYPE_TAG)
-				has_children = TRUE;
-			if(info->type == XMLNODE_TYPE_TAG && !strcmp(info->name,"info")) {
-				const char *type = xmlnode_get_attrib(info,"type");
-				const char *id = xmlnode_get_attrib(info,"id");
-
-				if(checksum && id && !strcmp(id, checksum)) {
-					/* we already have that avatar, so we don't have to do anything */
-					goodinfo = NULL;
-					break;
-				}
-				/* We'll only pick the png one for now. It's a very nice image format anyways. */
-				if(type && id && !goodinfo && !strcmp(type, "image/png"))
-					goodinfo = info;
-			}
-		}
-		if(has_children == FALSE) {
-			purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, NULL, 0, NULL);
-		} else if(goodinfo) {
-			const char *url = xmlnode_get_attrib(goodinfo, "url");
-			const char *id = xmlnode_get_attrib(goodinfo,"id");
-
-			/* the avatar might either be stored in a pep node, or on a HTTP/HTTPS URL */
-			if(!url)
-				jabber_pep_request_item(js, from, AVATARNAMESPACEDATA, id, do_buddy_avatar_update_data);
-			else {
-				PurpleUtilFetchUrlData *url_data;
-				JabberBuddyAvatarUpdateURLInfo *info = g_new0(JabberBuddyAvatarUpdateURLInfo, 1);
-				info->js = js;
-
-				url_data = purple_util_fetch_url_len(url, TRUE, NULL, TRUE,
-										  MAX_HTTP_BUDDYICON_BYTES,
-										  do_buddy_avatar_update_fromurl, info);
-				if (url_data) {
-					info->from = g_strdup(from);
-					info->id = g_strdup(id);
-					js->url_datas = g_slist_prepend(js->url_datas, url_data);
-				} else
-					g_free(info);
-
-			}
-		}
-	}
+static guint jbir_hash(gconstpointer v)
+{
+	if (v)
+		return g_str_hash(v);
+	else
+		return 0;
 }
 
-static void jabber_buddy_info_resource_free(gpointer data)
+static gboolean jbir_equal(gconstpointer v1, gconstpointer v2)
 {
-	JabberBuddyInfoResource *jbri = data;
-	g_free(jbri);
+	const gchar *resource_1 = v1;
+	const gchar *resource_2 = v2;
+
+	return purple_strequal(resource_1, resource_2);
 }
 
-static void jabber_version_parse(JabberStream *js, xmlnode *packet, gpointer data)
+static void jabber_version_parse(JabberStream *js, const char *from,
+                                 JabberIqType type, const char *id,
+                                 xmlnode *packet, gpointer data)
 {
 	JabberBuddyInfo *jbi = data;
-	const char *type, *id, *from;
 	xmlnode *query;
 	char *resource_name;
 
 	g_return_if_fail(jbi != NULL);
 
-	type = xmlnode_get_attrib(packet, "type");
-	id = xmlnode_get_attrib(packet, "id");
-	from = xmlnode_get_attrib(packet, "from");
-
 	jabber_buddy_info_remove_id(jbi, id);
 
 	if(!from)
@@ -1575,7 +1228,7 @@ static void jabber_version_parse(JabberStream *js, xmlnode *packet, gpointer dat
 	resource_name = jabber_get_resource(from);
 
 	if(resource_name) {
-		if(type && !strcmp(type, "result")) {
+		if (type == JABBER_IQ_RESULT) {
 			if((query = xmlnode_get_child(packet, "query"))) {
 				JabberBuddyResource *jbr = jabber_buddy_find_resource(jbi->jb, resource_name);
 				if(jbr) {
@@ -1598,19 +1251,17 @@ static void jabber_version_parse(JabberStream *js, xmlnode *packet, gpointer dat
 	jabber_buddy_info_show_if_ready(jbi);
 }
 
-static void jabber_last_parse(JabberStream *js, xmlnode *packet, gpointer data)
+static void jabber_last_parse(JabberStream *js, const char *from,
+                              JabberIqType type, const char *id,
+                              xmlnode *packet, gpointer data)
 {
 	JabberBuddyInfo *jbi = data;
 	xmlnode *query;
 	char *resource_name;
-	const char *type, *id, *from, *seconds;
+	const char *seconds;
 
 	g_return_if_fail(jbi != NULL);
 
-	type = xmlnode_get_attrib(packet, "type");
-	id = xmlnode_get_attrib(packet, "id");
-	from = xmlnode_get_attrib(packet, "from");
-
 	jabber_buddy_info_remove_id(jbi, id);
 
 	if(!from)
@@ -1619,18 +1270,56 @@ static void jabber_last_parse(JabberStream *js, xmlnode *packet, gpointer data)
 	resource_name = jabber_get_resource(from);
 
 	if(resource_name) {
-		if(type && !strcmp(type, "result")) {
+		if (type == JABBER_IQ_RESULT) {
 			if((query = xmlnode_get_child(packet, "query"))) {
 				seconds = xmlnode_get_attrib(query, "seconds");
 				if(seconds) {
 					char *end = NULL;
 					long sec = strtol(seconds, &end, 10);
+					JabberBuddy *jb = NULL;
+					char *resource = NULL;
+					char *buddy_name = NULL;
+					JabberBuddyResource *jbr = NULL;
+
 					if(end != seconds) {
 						JabberBuddyInfoResource *jbir = g_hash_table_lookup(jbi->resources, resource_name);
 						if(jbir) {
 							jbir->idle_seconds = sec;
 						}
 					}
+					/* Update the idle time of the buddy resource, if we got it.
+					 This will correct the value when a server doesn't mark
+					 delayed presence and we got the presence when signing on */
+					jb = jabber_buddy_find(js, from, FALSE);
+					if (jb) {
+						resource = jabber_get_resource(from);
+						buddy_name = jabber_get_bare_jid(from);
+						/* if the resource already has an idle time set, we
+						 must have gotten it originally from a presence. In
+						 this case we update it. Otherwise don't update it, to
+						 avoid setting an idle and not getting informed about
+						 the resource getting unidle */
+						if (resource && buddy_name) {
+							jbr = jabber_buddy_find_resource(jb, resource);
+							if (jbr) {
+								if (jbr->idle) {
+									if (sec) {
+										jbr->idle = time(NULL) - sec;
+									} else {
+										jbr->idle = 0;
+									}
+
+									if (jbr ==
+										jabber_buddy_find_resource(jb, NULL)) {
+										purple_prpl_got_user_idle(js->gc->account,
+											buddy_name, jbr->idle, jbr->idle);
+									}
+								}
+							}
+						}
+						g_free(resource);
+						g_free(buddy_name);
+					}
 				}
 			}
 		}
@@ -1640,6 +1329,88 @@ static void jabber_last_parse(JabberStream *js, xmlnode *packet, gpointer data)
 	jabber_buddy_info_show_if_ready(jbi);
 }
 
+static void jabber_last_offline_parse(JabberStream *js, const char *from,
+									  JabberIqType type, const char *id,
+									  xmlnode *packet, gpointer data)
+{
+	JabberBuddyInfo *jbi = data;
+	xmlnode *query;
+	const char *seconds;
+
+	g_return_if_fail(jbi != NULL);
+
+	jabber_buddy_info_remove_id(jbi, id);
+
+	if(!from)
+		return;
+
+	if (type == JABBER_IQ_RESULT) {
+		if((query = xmlnode_get_child(packet, "query"))) {
+			seconds = xmlnode_get_attrib(query, "seconds");
+			if(seconds) {
+				char *end = NULL;
+				long sec = strtol(seconds, &end, 10);
+				if(end != seconds) {
+					jbi->last_seconds = sec;
+				}
+			}
+			jbi->last_message = xmlnode_get_data(query);
+		}
+	}
+
+	jabber_buddy_info_show_if_ready(jbi);
+}
+
+static void jabber_time_parse(JabberStream *js, const char *from,
+                              JabberIqType type, const char *id,
+                              xmlnode *packet, gpointer data)
+{
+	JabberBuddyInfo *jbi = data;
+	JabberBuddyResource *jbr;
+	char *resource_name;
+
+	g_return_if_fail(jbi != NULL);
+
+	jabber_buddy_info_remove_id(jbi, id);
+
+	if (!from)
+		return;
+
+	resource_name = jabber_get_resource(from);
+	jbr = resource_name ? jabber_buddy_find_resource(jbi->jb, resource_name) : NULL;
+	g_free(resource_name);
+	if (jbr) {
+		if (type == JABBER_IQ_RESULT) {
+			xmlnode *time = xmlnode_get_child(packet, "time");
+			xmlnode *tzo = time ? xmlnode_get_child(time, "tzo") : NULL;
+			char *tzo_data = tzo ? xmlnode_get_data(tzo) : NULL;
+			if (tzo_data) {
+				char *c = tzo_data;
+				int hours, minutes;
+				if (tzo_data[0] == 'Z' && tzo_data[1] == '\0') {
+					jbr->tz_off = 0;
+				} else {
+					gboolean offset_positive = (tzo_data[0] == '+');
+					/* [+-]HH:MM */
+					if (((*c == '+' || *c == '-') && (c = c + 1)) &&
+							sscanf(c, "%02d:%02d", &hours, &minutes) == 2) {
+						jbr->tz_off = 60*60*hours + 60*minutes;
+						if (!offset_positive)
+							jbr->tz_off *= -1;
+					} else {
+						purple_debug_info("jabber", "Ignoring malformed timezone %s",
+						                  tzo_data);
+					}
+				}
+
+				g_free(tzo_data);
+			}
+		}
+	}
+
+	jabber_buddy_info_show_if_ready(jbi);
+}
+
 void jabber_buddy_remove_all_pending_buddy_info_requests(JabberStream *js)
 {
 	if (js->pending_buddy_info_requests)
@@ -1700,6 +1471,62 @@ static gboolean _client_is_blacklisted(JabberBuddyResource *jbr, const char *ns)
 	return FALSE;
 }
 
+static void
+dispatch_queries_for_resource(JabberStream *js, JabberBuddyInfo *jbi,
+                              gboolean is_bare_jid, const char *jid,
+                              JabberBuddyResource *jbr)
+{
+	JabberIq *iq;
+	JabberBuddyInfoResource *jbir;
+	char *full_jid = NULL;
+	const char *to;
+
+	if (is_bare_jid && jbr->name) {
+		full_jid = g_strdup_printf("%s/%s", jid, jbr->name);
+		to = full_jid;
+	} else
+		to = jid;
+
+	jbir = g_new0(JabberBuddyInfoResource, 1);
+	g_hash_table_insert(jbi->resources, g_strdup(jbr->name), jbir);
+
+	if(!jbr->client.name) {
+		iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:version");
+		xmlnode_set_attrib(iq->node, "to", to);
+		jabber_iq_set_callback(iq, jabber_version_parse, jbi);
+		jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id));
+		jabber_iq_send(iq);
+	}
+
+	/* this is to fix the feeling of irritation I get when trying
+	 * to get info on a friend running Trillian, which doesn't
+	 * respond (with an error or otherwise) to jabber:iq:last
+	 * requests.  There are a number of Trillian users in my
+	 * office. */
+	if(!_client_is_blacklisted(jbr, "jabber:iq:last")) {
+		iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:last");
+		xmlnode_set_attrib(iq->node, "to", to);
+		jabber_iq_set_callback(iq, jabber_last_parse, jbi);
+		jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id));
+		jabber_iq_send(iq);
+	}
+
+	if (jbr->tz_off == PURPLE_NO_TZ_OFF &&
+			(!jbr->caps.info ||
+			 	jabber_resource_has_capability(jbr, "urn:xmpp:time"))) {
+		xmlnode *child;
+		iq = jabber_iq_new(js, JABBER_IQ_GET);
+		xmlnode_set_attrib(iq->node, "to", to);
+		child = xmlnode_new_child(iq->node, "time");
+		xmlnode_set_namespace(child, "urn:xmpp:time");
+		jabber_iq_set_callback(iq, jabber_time_parse, jbi);
+		jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id));
+		jabber_iq_send(iq);
+	}
+
+	g_free(full_jid);
+}
+
 static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *jid)
 {
 	JabberIq *iq;
@@ -1707,6 +1534,8 @@ static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *jid)
 	GList *resources;
 	JabberBuddy *jb;
 	JabberBuddyInfo *jbi;
+	const char *slash;
+	gboolean is_bare_jid;
 
 	jb = jabber_buddy_find(js, jid, TRUE);
 
@@ -1714,11 +1543,14 @@ static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *jid)
 	if(!jb)
 		return;
 
+	slash = strchr(jid, '/');
+	is_bare_jid = (slash == NULL);
+
 	jbi = g_new0(JabberBuddyInfo, 1);
 	jbi->jid = g_strdup(jid);
 	jbi->js = js;
 	jbi->jb = jb;
-	jbi->resources = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, jabber_buddy_info_resource_free);
+	jbi->resources = g_hash_table_new_full(jbir_hash, jbir_equal, g_free, jabber_buddy_info_resource_free);
 	jbi->user_info = purple_notify_user_info_new();
 
 	iq = jabber_iq_new(js, JABBER_IQ_GET);
@@ -1732,50 +1564,32 @@ static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *jid)
 
 	jabber_iq_send(iq);
 
-	for(resources = jb->resources; resources; resources = resources->next)
-	{
-		JabberBuddyResource *jbr = resources->data;
-		JabberBuddyInfoResource *jbir;
-		char *full_jid;
-
-		if ((strchr(jid, '/') == NULL) && (jbr->name != NULL)) {
-			full_jid = g_strdup_printf("%s/%s", jid, jbr->name);
-		} else {
-			full_jid = g_strdup(jid);
-		}
-
-		if (jbr->name != NULL)
-		{
-			jbir = g_new0(JabberBuddyInfoResource, 1);
-			g_hash_table_insert(jbi->resources, g_strdup(jbr->name), jbir);
-		}
-
-		if(!jbr->client.name) {
-			iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:version");
-			xmlnode_set_attrib(iq->node, "to", full_jid);
-			jabber_iq_set_callback(iq, jabber_version_parse, jbi);
-			jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id));
-			jabber_iq_send(iq);
-		}
-
-		/* this is to fix the feeling of irritation I get when trying
-		 * to get info on a friend running Trillian, which doesn't
-		 * respond (with an error or otherwise) to jabber:iq:last
-		 * requests.  There are a number of Trillian users in my
-		 * office. */
-		if(!_client_is_blacklisted(jbr, "jabber:iq:last")) {
-			iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:last");
-			xmlnode_set_attrib(iq->node, "to", full_jid);
-			jabber_iq_set_callback(iq, jabber_last_parse, jbi);
-			jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id));
-			jabber_iq_send(iq);
+	if (is_bare_jid) {
+		for(resources = jb->resources; resources; resources = resources->next) {
+			JabberBuddyResource *jbr = resources->data;
+			dispatch_queries_for_resource(js, jbi, is_bare_jid, jid, jbr);
 		}
+	} else {
+		JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, slash + 1);
+		if (jbr)
+			dispatch_queries_for_resource(js, jbi, is_bare_jid, jid, jbr);
+		else
+			purple_debug_warning("jabber", "jabber_buddy_get_info_for_jid() "
+					"was passed JID %s, but there is no corresponding "
+					"JabberBuddyResource!\n", jid);
+	}
 
-		g_free(full_jid);
+	if (!jb->resources && is_bare_jid) {
+		/* user is offline, send a jabber:iq:last to find out last time online */
+		iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:last");
+		xmlnode_set_attrib(iq->node, "to", jid);
+		jabber_iq_set_callback(iq, jabber_last_offline_parse, jbi);
+		jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id));
+		jabber_iq_send(iq);
 	}
 
 	js->pending_buddy_info_requests = g_slist_prepend(js->pending_buddy_info_requests, jbi);
-	jbi->timeout_handle = purple_timeout_add(30000, jabber_buddy_get_info_timeout, jbi);
+	jbi->timeout_handle = purple_timeout_add_seconds(30, jabber_buddy_get_info_timeout, jbi);
 }
 
 void jabber_buddy_get_info(PurpleConnection *gc, const char *who)
@@ -1861,23 +1675,44 @@ static void jabber_buddy_make_visible(PurpleBlistNode *node, gpointer data)
 	jabber_buddy_set_invisibility(js, purple_buddy_get_name(buddy), FALSE);
 }
 
-static void jabber_buddy_cancel_presence_notification(PurpleBlistNode *node,
-		gpointer data)
+static void cancel_presence_notification(gpointer data)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
 	JabberStream *js;
 
-	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
-
-	buddy = (PurpleBuddy *) node;
+	buddy = data;
 	gc = purple_account_get_connection(purple_buddy_get_account(buddy));
 	js = purple_connection_get_protocol_data(gc);
 
-	/* I wonder if we should prompt the user before doing this */
 	jabber_presence_subscription_set(js, purple_buddy_get_name(buddy), "unsubscribed");
 }
 
+static void
+jabber_buddy_cancel_presence_notification(PurpleBlistNode *node,
+                                          gpointer data)
+{
+	PurpleBuddy *buddy;
+	PurpleAccount *account;
+	PurpleConnection *gc;
+	const gchar *name;
+	char *msg;
+
+	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
+
+	buddy = (PurpleBuddy *) node;
+	name = purple_buddy_get_name(buddy);
+	account = purple_buddy_get_account(buddy);
+	gc = purple_account_get_connection(account);
+
+	msg = g_strdup_printf(_("%s will no longer be able to see your status "
+	                        "updates.  Do you want to continue?"), name);
+	purple_request_yes_no(gc, NULL, _("Cancel Presence Notification"),
+	                      msg, 0 /* Yes */, account, name, NULL, buddy,
+	                      cancel_presence_notification, NULL /* Do nothing */);
+	g_free(msg);
+}
+
 static void jabber_buddy_rerequest_auth(PurpleBlistNode *node, gpointer data)
 {
 	PurpleBuddy *buddy;
@@ -1966,9 +1801,7 @@ static GList *jabber_buddy_menu(PurpleBuddy *buddy)
 	if(!jb)
 		return m;
 
-	/* XXX: fix the NOT ME below */
-
-	if(js->protocol_version == JABBER_PROTO_0_9 /* && NOT ME */) {
+	if (js->protocol_version == JABBER_PROTO_0_9 && jb != js->user_jb) {
 		if(jb->invisible & JABBER_INVIS_BUDDY) {
 			act = purple_menu_action_new(_("Un-hide From"),
 			                           PURPLE_CALLBACK(jabber_buddy_make_visible),
@@ -1981,7 +1814,7 @@ static GList *jabber_buddy_menu(PurpleBuddy *buddy)
 		m = g_list_append(m, act);
 	}
 
-	if(jb->subscription & JABBER_SUB_FROM /* && NOT ME */) {
+	if(jb->subscription & JABBER_SUB_FROM && jb != js->user_jb) {
 		act = purple_menu_action_new(_("Cancel Presence Notification"),
 		                           PURPLE_CALLBACK(jabber_buddy_cancel_presence_notification),
 		                           NULL, NULL);
@@ -1994,7 +1827,7 @@ static GList *jabber_buddy_menu(PurpleBuddy *buddy)
 		                           NULL, NULL);
 		m = g_list_append(m, act);
 
-	} else /* if(NOT ME) */{
+	} else if (jb != js->user_jb) {
 
 		/* shouldn't this just happen automatically when the buddy is
 		   removed? */
@@ -2096,45 +1929,45 @@ JabberBuddyState jabber_buddy_status_id_get_state(const char *id) {
 	return JABBER_BUDDY_STATE_UNKNOWN;
 }
 
-JabberBuddyState jabber_buddy_show_get_state(const char *id) {
-	if(!id)
-		return JABBER_BUDDY_STATE_UNKNOWN;
-	if(!strcmp(id, "available"))
-		return JABBER_BUDDY_STATE_ONLINE;
-	if(!strcmp(id, "chat"))
-		return JABBER_BUDDY_STATE_CHAT;
-	if(!strcmp(id, "away"))
-		return JABBER_BUDDY_STATE_AWAY;
-	if(!strcmp(id, "xa"))
-		return JABBER_BUDDY_STATE_XA;
-	if(!strcmp(id, "dnd"))
-		return JABBER_BUDDY_STATE_DND;
-	if(!strcmp(id, "offline"))
-		return JABBER_BUDDY_STATE_UNAVAILABLE;
-	if(!strcmp(id, "error"))
-		return JABBER_BUDDY_STATE_ERROR;
+const struct {
+	const char *name;
+	JabberBuddyState state;
+} show_state_pairs[] = {
+	{ "available", JABBER_BUDDY_STATE_ONLINE },
+	{ "chat",      JABBER_BUDDY_STATE_CHAT },
+	{ "away",      JABBER_BUDDY_STATE_AWAY },
+	{ "xa",        JABBER_BUDDY_STATE_XA },
+	{ "dnd",       JABBER_BUDDY_STATE_DND },
+	{ "offline",   JABBER_BUDDY_STATE_UNAVAILABLE },
+	{ "error",     JABBER_BUDDY_STATE_ERROR },
+	{ NULL,        JABBER_BUDDY_STATE_UNKNOWN }
+};
+
+JabberBuddyState jabber_buddy_show_get_state(const char *id)
+{
+	int i;
 
+	g_return_val_if_fail(id != NULL, JABBER_BUDDY_STATE_UNKNOWN);
+
+	for (i = 0; show_state_pairs[i].name; ++i)
+		if (g_str_equal(id, show_state_pairs[i].name))
+			return show_state_pairs[i].state;
+
+	purple_debug_warning("jabber", "Invalid value of presence <show/> "
+	                     "attribute: %s\n", id);
 	return JABBER_BUDDY_STATE_UNKNOWN;
 }
 
-const char *jabber_buddy_state_get_show(JabberBuddyState state) {
-	switch(state) {
-		case JABBER_BUDDY_STATE_CHAT:
-			return "chat";
-		case JABBER_BUDDY_STATE_AWAY:
-			return "away";
-		case JABBER_BUDDY_STATE_XA:
-			return "xa";
-		case JABBER_BUDDY_STATE_DND:
-			return "dnd";
-		case JABBER_BUDDY_STATE_ONLINE:
-			return "available";
-		case JABBER_BUDDY_STATE_UNKNOWN:
-		case JABBER_BUDDY_STATE_ERROR:
-			return NULL;
-		case JABBER_BUDDY_STATE_UNAVAILABLE:
-			return "offline";
-	}
+const char *
+jabber_buddy_state_get_show(JabberBuddyState state)
+{
+	int i;
+
+	for (i = 0; show_state_pairs[i].name; ++i)
+		if (state == show_state_pairs[i].state)
+			return show_state_pairs[i].name;
+
+/*	purple_debug_warning("jabber", "Unknown buddy state: %d\n", state); */
 	return NULL;
 }
 
@@ -2167,7 +2000,9 @@ static void user_search_result_add_buddy_cb(PurpleConnection *gc, GList *row, vo
 			g_list_nth_data(row, 0), NULL, NULL);
 }
 
-static void user_search_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+static void user_search_result_cb(JabberStream *js, const char *from,
+                                  JabberIqType type, const char *id,
+                                  xmlnode *packet, gpointer data)
 {
 	PurpleNotifySearchResults *results;
 	PurpleNotifySearchColumn *column;
@@ -2363,15 +2198,16 @@ static const char * jabber_user_dir_comments [] = {
 };
 #endif
 
-static void user_search_fields_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+static void user_search_fields_result_cb(JabberStream *js, const char *from,
+                                         JabberIqType type, const char *id,
+                                         xmlnode *packet, gpointer data)
 {
 	xmlnode *query, *x;
-	const char *from, *type;
 
-	if(!(from = xmlnode_get_attrib(packet, "from")))
+	if (!from)
 		return;
 
-	if(!(type = xmlnode_get_attrib(packet, "type")) || !strcmp(type, "error")) {
+	if (type == JABBER_IQ_ERROR) {
 		char *msg = jabber_parse_error(js, packet, NULL);
 
 		if(!msg)
@@ -2495,23 +2331,29 @@ void jabber_user_search_begin(PurplePluginAction *action)
 gboolean
 jabber_resource_has_capability(const JabberBuddyResource *jbr, const gchar *cap)
 {
-	const GList *iter = NULL;
+	const GList *node = NULL;
+	const JabberCapsNodeExts *exts;
 
-	if (!jbr->caps) {
-		purple_debug_error("jabber",
+	if (!jbr->caps.info) {
+		purple_debug_info("jabber",
 			"Unable to find caps: nothing known about buddy\n");
 		return FALSE;
 	}
 
-	for (iter = jbr->caps->features ; iter ; iter = g_list_next(iter)) {
-		if (strcmp(iter->data, cap) == 0) {
-			purple_debug_info("jabber", "Found cap: %s\n", (char *)iter->data);
-			return TRUE;
+	node = g_list_find_custom(jbr->caps.info->features, cap, (GCompareFunc)strcmp);
+	if (!node && jbr->caps.exts && jbr->caps.info->exts) {
+		const GList *ext;
+		exts = jbr->caps.info->exts;
+		/* Walk through all the enabled caps, checking each list for the cap.
+		 * Don't check it twice, though. */
+		for (ext = jbr->caps.exts; ext && !node; ext = ext->next) {
+			GList *features = g_hash_table_lookup(exts->exts, ext->data);
+			if (features)
+				node = g_list_find_custom(features, cap, (GCompareFunc)strcmp);
 		}
 	}
 
-	purple_debug_info("jabber", "Cap %s not found\n", cap);
-	return FALSE;
+	return (node != NULL);
 }
 
 gboolean
@@ -2528,3 +2370,22 @@ jabber_buddy_has_capability(const JabberBuddy *jb, const gchar *cap)
 	return jabber_resource_has_capability(jbr, cap);
 }
 
+const gchar *
+jabber_resource_get_identity_category_type(const JabberBuddyResource *jbr,
+	const gchar *category)
+{
+	const GList *iter = NULL;
+	
+	if (jbr->caps.info) {
+		for (iter = jbr->caps.info->identities ; iter ; iter = g_list_next(iter)) {
+			const JabberIdentity *identity = 
+				(JabberIdentity *) iter->data;
+		
+			if (strcmp(identity->category, category) == 0) {
+				return identity->type;
+			}
+		}
+	}
+		
+	return NULL;
+}
diff --git a/libpurple/protocols/jabber/buddy.h b/libpurple/protocols/jabber/buddy.h
index 0eb49b7c50..09a5c21c17 100644
--- a/libpurple/protocols/jabber/buddy.h
+++ b/libpurple/protocols/jabber/buddy.h
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_BUDDY_H_
-#define _PURPLE_JABBER_BUDDY_H_
+#ifndef PURPLE_JABBER_BUDDY_H_
+#define PURPLE_JABBER_BUDDY_H_
 
 typedef enum {
 	JABBER_BUDDY_STATE_UNKNOWN = -2,
@@ -33,13 +33,12 @@ typedef enum {
 	JABBER_BUDDY_STATE_DND
 } JabberBuddyState;
 
+typedef struct _JabberBuddy JabberBuddy;
+
 #include "jabber.h"
 #include "caps.h"
 
-#define AVATARNAMESPACEDATA "http://www.xmpp.org/extensions/xep-0084.html#ns-data"
-#define AVATARNAMESPACEMETA "http://www.xmpp.org/extensions/xep-0084.html#ns-metadata"
-
-typedef struct _JabberBuddy {
+struct _JabberBuddy {
 	GList *resources;
 	char *error_msg;
 	enum {
@@ -55,7 +54,7 @@ typedef struct _JabberBuddy {
 		JABBER_SUB_BOTH    = (JABBER_SUB_TO | JABBER_SUB_FROM),
 		JABBER_SUB_REMOVE  = 1 << 4
 	} subscription;
-} JabberBuddy;
+};
 
 typedef struct _JabberAdHocCommands {
 	char *jid;
@@ -69,6 +68,7 @@ typedef struct _JabberBuddyResource {
 	int priority;
 	JabberBuddyState state;
 	char *status;
+	time_t idle;
 	JabberCapabilities capabilities;
 	char *thread_id;
 	enum {
@@ -81,8 +81,14 @@ typedef struct _JabberBuddyResource {
 		char *name;
 		char *os;
 	} client;
-	JabberCapsClientInfo *caps;
+	/* tz_off == PURPLE_NO_TZ_OFF when unset */
+	long tz_off;
+	struct {
+		JabberCapsClientInfo *info;
+		GList *exts;
+	} caps;
 	GList *commands;
+	gboolean commands_fetched;
 } JabberBuddyResource;
 
 void jabber_buddy_free(JabberBuddy *jb);
@@ -94,7 +100,6 @@ JabberBuddyResource *jabber_buddy_track_resource(JabberBuddy *jb, const char *re
 		int priority, JabberBuddyState state, const char *status);
 void jabber_buddy_resource_free(JabberBuddyResource *jbr);
 void jabber_buddy_remove_resource(JabberBuddy *jb, const char *resource);
-const char *jabber_buddy_get_status_msg(JabberBuddy *jb);
 void jabber_buddy_get_info(PurpleConnection *gc, const char *who);
 
 GList *jabber_blist_node_menu(PurpleBlistNode *node);
@@ -102,7 +107,6 @@ GList *jabber_blist_node_menu(PurpleBlistNode *node);
 void jabber_set_info(PurpleConnection *gc, const char *info);
 void jabber_setup_set_info(PurplePluginAction *action);
 void jabber_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img);
-void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xmlnode *items);
 
 const char *jabber_buddy_state_get_name(JabberBuddyState state);
 const char *jabber_buddy_state_get_status_id(JabberBuddyState state);
@@ -121,4 +125,8 @@ gboolean jabber_resource_has_capability(const JabberBuddyResource *jbr,
 										const gchar *cap);
 gboolean jabber_buddy_has_capability(const JabberBuddy *jb, const gchar *cap);
 
-#endif /* _PURPLE_JABBER_BUDDY_H_ */
+const gchar *
+jabber_resource_get_identity_category_type(const JabberBuddyResource *jbr,
+	const gchar *category);
+
+#endif /* PURPLE_JABBER_BUDDY_H_ */
diff --git a/libpurple/protocols/jabber/caps.c b/libpurple/protocols/jabber/caps.c
index 99213b3ea6..87090ff1c8 100644
--- a/libpurple/protocols/jabber/caps.c
+++ b/libpurple/protocols/jabber/caps.c
@@ -21,99 +21,215 @@
 
 #include "internal.h"
 
+#include "debug.h"
 #include "caps.h"
-#include <string.h>
-#include "internal.h"
-#include "util.h"
+#include "cipher.h"
 #include "iq.h"
+#include "presence.h"
+#include "util.h"
 
 #define JABBER_CAPS_FILENAME "xmpp-caps.xml"
 
-static GHashTable *capstable = NULL; /* JabberCapsKey -> JabberCapsValue */
+typedef struct _JabberDataFormField {
+	gchar *var;
+	GList *values;
+} JabberDataFormField;
 
-typedef struct _JabberCapsKey {
-	char *node;
-	char *ver;
-} JabberCapsKey;
+static GHashTable *capstable = NULL; /* JabberCapsTuple -> JabberCapsClientInfo */
+static GHashTable *nodetable = NULL; /* char *node -> JabberCapsNodeExts */
+static guint       save_timer = 0;
+
+/**
+ *	Processes a query-node and returns a JabberCapsClientInfo object with all relevant info.
+ *
+ *	@param 	query 	A query object.
+ *	@return 		A JabberCapsClientInfo object.
+ */
+static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query);
+
+/* Free a GList of allocated char* */
+static void
+free_string_glist(GList *list)
+{
+	g_list_foreach(list, (GFunc)g_free, NULL);
+	g_list_free(list);
+}
+
+static JabberCapsNodeExts*
+jabber_caps_node_exts_ref(JabberCapsNodeExts *exts)
+{
+	g_return_val_if_fail(exts != NULL, NULL);
+
+	++exts->ref;
+	return exts;
+}
 
-typedef struct _JabberCapsValueExt {
-	GList *identities; /* JabberCapsIdentity */
-	GList *features; /* char * */
-} JabberCapsValueExt;
+static void
+jabber_caps_node_exts_unref(JabberCapsNodeExts *exts)
+{
+	if (exts == NULL)
+		return;
+
+	g_return_if_fail(exts->ref != 0);
 
-typedef struct _JabberCapsValue {
-	GList *identities; /* JabberCapsIdentity */
-	GList *features; /* char * */
-	GHashTable *ext; /* char * -> JabberCapsValueExt */
-} JabberCapsValue;
+	if (--exts->ref != 0)
+		return;
 
-static guint jabber_caps_hash(gconstpointer key) {
-	const JabberCapsKey *name = key;
-	guint nodehash = g_str_hash(name->node);
-	guint verhash = g_str_hash(name->ver);
+	g_hash_table_destroy(exts->exts);
+	g_free(exts);
+}
 
-	return nodehash ^ verhash;
+static guint jabber_caps_hash(gconstpointer data) {
+	const JabberCapsTuple *key = data;
+	guint nodehash = g_str_hash(key->node);
+	guint verhash  = g_str_hash(key->ver);
+	/*
+	 * 'hash' was optional in XEP-0115 v1.4 and g_str_hash crashes on NULL >:O.
+	 * Okay, maybe I've played too much Zelda, but that looks like
+	 * a Deku Shrub...
+	 */
+	guint hashhash = (key->hash ? g_str_hash(key->hash) : 0);
+	return nodehash ^ verhash ^ hashhash;
 }
 
 static gboolean jabber_caps_compare(gconstpointer v1, gconstpointer v2) {
-	const JabberCapsKey *name1 = v1;
-	const JabberCapsKey *name2 = v2;
+	const JabberCapsTuple *name1 = v1;
+	const JabberCapsTuple *name2 = v2;
 
-	return strcmp(name1->node,name2->node) == 0 && strcmp(name1->ver,name2->ver) == 0;
+	return g_str_equal(name1->node, name2->node) &&
+	       g_str_equal(name1->ver, name2->ver) &&
+	       purple_strequal(name1->hash, name2->hash);
 }
 
-static void jabber_caps_destroy_key(gpointer key) {
-	JabberCapsKey *keystruct = key;
-	g_free(keystruct->node);
-	g_free(keystruct->ver);
-	g_free(keystruct);
-}
+static void
+jabber_caps_client_info_destroy(JabberCapsClientInfo *info)
+{
+	if (info == NULL)
+		return;
 
-static void jabber_caps_destroy_value(gpointer value) {
-	JabberCapsValue *valuestruct = value;
-	while(valuestruct->identities) {
-		JabberCapsIdentity *id = valuestruct->identities->data;
+	while(info->identities) {
+		JabberIdentity *id = info->identities->data;
 		g_free(id->category);
 		g_free(id->type);
 		g_free(id->name);
+		g_free(id->lang);
 		g_free(id);
+		info->identities = g_list_delete_link(info->identities, info->identities);
+	}
+
+	free_string_glist(info->features);
 
-		valuestruct->identities = g_list_delete_link(valuestruct->identities,valuestruct->identities);
+	while (info->forms) {
+		xmlnode_free(info->forms->data);
+		info->forms = g_list_delete_link(info->forms, info->forms);
 	}
-	while(valuestruct->features) {
-		g_free(valuestruct->features->data);
-		valuestruct->features = g_list_delete_link(valuestruct->features,valuestruct->features);
+
+	jabber_caps_node_exts_unref(info->exts);
+
+	g_free((char *)info->tuple.node);
+	g_free((char *)info->tuple.ver);
+	g_free((char *)info->tuple.hash);
+
+	g_free(info);
+}
+
+/* NOTE: Takes a reference to the exts, unref it if you don't really want to
+ * keep it around. */
+static JabberCapsNodeExts*
+jabber_caps_find_exts_by_node(const char *node)
+{
+	JabberCapsNodeExts *exts;
+	if (NULL == (exts = g_hash_table_lookup(nodetable, node))) {
+		exts = g_new0(JabberCapsNodeExts, 1);
+		exts->exts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+		                                   (GDestroyNotify)free_string_glist);
+		g_hash_table_insert(nodetable, g_strdup(node), jabber_caps_node_exts_ref(exts));
 	}
-	g_hash_table_destroy(valuestruct->ext);
-	g_free(valuestruct);
+
+	return jabber_caps_node_exts_ref(exts);
 }
 
-static void jabber_caps_ext_destroy_value(gpointer value) {
-	JabberCapsValueExt *valuestruct = value;
-	while(valuestruct->identities) {
-		JabberCapsIdentity *id = valuestruct->identities->data;
-		g_free(id->category);
-		g_free(id->type);
-		g_free(id->name);
-		g_free(id);
+static void
+exts_to_xmlnode(gconstpointer key, gconstpointer value, gpointer user_data)
+{
+	const char *identifier = key;
+	const GList *features = value, *node;
+	xmlnode *client = user_data, *ext, *feature;
+
+	ext = xmlnode_new_child(client, "ext");
+	xmlnode_set_attrib(ext, "identifier", identifier);
 
-		valuestruct->identities = g_list_delete_link(valuestruct->identities,valuestruct->identities);
+	for (node = features; node; node = node->next) {
+		feature = xmlnode_new_child(ext, "feature");
+		xmlnode_set_attrib(feature, "var", (const gchar *)node->data);
 	}
-	while(valuestruct->features) {
-		g_free(valuestruct->features->data);
-		valuestruct->features = g_list_delete_link(valuestruct->features,valuestruct->features);
+}
+
+static void jabber_caps_store_client(gpointer key, gpointer value, gpointer user_data) {
+	const JabberCapsTuple *tuple = key;
+	const JabberCapsClientInfo *props = value;
+	xmlnode *root = user_data;
+	xmlnode *client = xmlnode_new_child(root, "client");
+	GList *iter;
+
+	xmlnode_set_attrib(client, "node", tuple->node);
+	xmlnode_set_attrib(client, "ver", tuple->ver);
+	if (tuple->hash)
+		xmlnode_set_attrib(client, "hash", tuple->hash);
+	for(iter = props->identities; iter; iter = g_list_next(iter)) {
+		JabberIdentity *id = iter->data;
+		xmlnode *identity = xmlnode_new_child(client, "identity");
+		xmlnode_set_attrib(identity, "category", id->category);
+		xmlnode_set_attrib(identity, "type", id->type);
+		if (id->name)
+			xmlnode_set_attrib(identity, "name", id->name);
+		if (id->lang)
+			xmlnode_set_attrib(identity, "lang", id->lang);
 	}
-	g_free(valuestruct);
+
+	for(iter = props->features; iter; iter = g_list_next(iter)) {
+		const char *feat = iter->data;
+		xmlnode *feature = xmlnode_new_child(client, "feature");
+		xmlnode_set_attrib(feature, "var", feat);
+	}
+
+	for(iter = props->forms; iter; iter = g_list_next(iter)) {
+		/* FIXME: See #7814 */
+		xmlnode *xdata = iter->data;
+		xmlnode_insert_child(client, xmlnode_copy(xdata));
+	}
+
+	/* TODO: Ideally, only save this once-per-node... */
+	if (props->exts)
+		g_hash_table_foreach(props->exts->exts, (GHFunc)exts_to_xmlnode, client);
 }
 
-static void jabber_caps_load(void);
+static gboolean
+do_jabber_caps_store(gpointer data)
+{
+	char *str;
+	int length = 0;
+	xmlnode *root = xmlnode_new("capabilities");
+	g_hash_table_foreach(capstable, jabber_caps_store_client, root);
+	str = xmlnode_to_formatted_str(root, &length);
+	xmlnode_free(root);
+	purple_util_write_data_to_file(JABBER_CAPS_FILENAME, str, length);
+	g_free(str);
 
-void jabber_caps_init(void) {
-	capstable = g_hash_table_new_full(jabber_caps_hash, jabber_caps_compare, jabber_caps_destroy_key, jabber_caps_destroy_value);
-	jabber_caps_load();
+	save_timer = 0;
+	return FALSE;
 }
 
-static void jabber_caps_load(void) {
+static void
+schedule_caps_save(void)
+{
+	if (save_timer == 0)
+		save_timer = purple_timeout_add_seconds(5, do_jabber_caps_store, NULL);
+}
+
+static void
+jabber_caps_load(void)
+{
 	xmlnode *capsdata = purple_util_read_xml_from_file(JABBER_CAPS_FILENAME, "XMPP capabilities cache");
 	xmlnode *client;
 
@@ -129,12 +245,18 @@ static void jabber_caps_load(void) {
 		if(client->type != XMLNODE_TYPE_TAG)
 			continue;
 		if(!strcmp(client->name, "client")) {
-			JabberCapsKey *key = g_new0(JabberCapsKey, 1);
-			JabberCapsValue *value = g_new0(JabberCapsValue, 1);
+			JabberCapsClientInfo *value = g_new0(JabberCapsClientInfo, 1);
+			JabberCapsTuple *key = (JabberCapsTuple*)&value->tuple;
 			xmlnode *child;
+			JabberCapsNodeExts *exts = NULL;
 			key->node = g_strdup(xmlnode_get_attrib(client,"node"));
 			key->ver  = g_strdup(xmlnode_get_attrib(client,"ver"));
-			value->ext = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, jabber_caps_ext_destroy_value);
+			key->hash = g_strdup(xmlnode_get_attrib(client,"hash"));
+
+			/* v1.3 capabilities */
+			if (key->hash == NULL)
+				exts = jabber_caps_find_exts_by_node(key->node);
+
 			for(child = client->child; child; child = child->next) {
 				if(child->type != XMLNODE_TYPE_TAG)
 					continue;
@@ -147,432 +269,732 @@ static void jabber_caps_load(void) {
 					const char *category = xmlnode_get_attrib(child, "category");
 					const char *type = xmlnode_get_attrib(child, "type");
 					const char *name = xmlnode_get_attrib(child, "name");
+					const char *lang = xmlnode_get_attrib(child, "lang");
+					JabberIdentity *id;
 
-					JabberCapsIdentity *id = g_new0(JabberCapsIdentity, 1);
+					if (!category || !type)
+						continue;
+
+					id = g_new0(JabberIdentity, 1);
 					id->category = g_strdup(category);
 					id->type = g_strdup(type);
 					id->name = g_strdup(name);
+					id->lang = g_strdup(lang);
 
 					value->identities = g_list_append(value->identities,id);
-				} else if(!strcmp(child->name,"ext")) {
+				} else if(!strcmp(child->name,"x")) {
+					/* TODO: See #7814 -- this might cause problems if anyone
+					 * ever actually specifies forms. In fact, for this to
+					 * work properly, that bug needs to be fixed in
+					 * xmlnode_from_str, not the output version... */
+					value->forms = g_list_append(value->forms, xmlnode_copy(child));
+				} else if (!strcmp(child->name, "ext") && key->hash != NULL) {
+					purple_debug_warning("jabber", "Ignoring exts when reading new-style caps\n");
+				} else if (!strcmp(child->name, "ext")) {
+					/* TODO: Do we care about reading in the identities listed here? */
 					const char *identifier = xmlnode_get_attrib(child, "identifier");
-					if(identifier) {
-						xmlnode *extchild;
+					xmlnode *node;
+					GList *features = NULL;
 
-						JabberCapsValueExt *extvalue = g_new0(JabberCapsValueExt, 1);
+					if (!identifier)
+						continue;
 
-						for(extchild = child->child; extchild; extchild = extchild->next) {
-							if(extchild->type != XMLNODE_TYPE_TAG)
+					for (node = child->child; node; node = node->next) {
+						if (node->type != XMLNODE_TYPE_TAG)
+							continue;
+						if (!strcmp(node->name, "feature")) {
+							const char *var = xmlnode_get_attrib(node, "var");
+							if (!var)
 								continue;
-							if(!strcmp(extchild->name,"feature")) {
-								const char *var = xmlnode_get_attrib(extchild, "var");
-								if(!var)
-									continue;
-								extvalue->features = g_list_append(extvalue->features,g_strdup(var));
-							} else if(!strcmp(extchild->name,"identity")) {
-								const char *category = xmlnode_get_attrib(extchild, "category");
-								const char *type = xmlnode_get_attrib(extchild, "type");
-								const char *name = xmlnode_get_attrib(extchild, "name");
-
-								JabberCapsIdentity *id = g_new0(JabberCapsIdentity, 1);
-								id->category = g_strdup(category);
-								id->type = g_strdup(type);
-								id->name = g_strdup(name);
-
-								extvalue->identities = g_list_append(extvalue->identities,id);
-							}
+							features = g_list_prepend(features, g_strdup(var));
 						}
-						g_hash_table_replace(value->ext, g_strdup(identifier), extvalue);
 					}
+
+					if (features) {
+						g_hash_table_insert(exts->exts, g_strdup(identifier),
+						                    features);
+					} else
+						purple_debug_warning("jabber", "Caps ext %s had no features.\n",
+						                     identifier);
 				}
 			}
+
+			value->exts = exts;
 			g_hash_table_replace(capstable, key, value);
+
 		}
 	}
 	xmlnode_free(capsdata);
 }
 
-static void jabber_caps_store_ext(gpointer key, gpointer value, gpointer user_data) {
-	const char *extname = key;
-	JabberCapsValueExt *props = value;
-	xmlnode *root = user_data;
-	xmlnode *ext = xmlnode_new_child(root,"ext");
-	GList *iter;
-
-	xmlnode_set_attrib(ext,"identifier",extname);
+void jabber_caps_init(void)
+{
+	nodetable = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)jabber_caps_node_exts_unref);
+	capstable = g_hash_table_new_full(jabber_caps_hash, jabber_caps_compare, NULL, (GDestroyNotify)jabber_caps_client_info_destroy);
+	jabber_caps_load();
+}
 
-	for(iter = props->identities; iter; iter = g_list_next(iter)) {
-		JabberCapsIdentity *id = iter->data;
-		xmlnode *identity = xmlnode_new_child(ext, "identity");
-		xmlnode_set_attrib(identity, "category", id->category);
-		xmlnode_set_attrib(identity, "type", id->type);
-		if (id->name)
-			xmlnode_set_attrib(identity, "name", id->name);
+void jabber_caps_uninit(void)
+{
+	if (save_timer != 0) {
+		purple_timeout_remove(save_timer);
+		save_timer = 0;
+		do_jabber_caps_store(NULL);
 	}
+	g_hash_table_destroy(capstable);
+	g_hash_table_destroy(nodetable);
+	capstable = nodetable = NULL;
+}
 
-	for(iter = props->features; iter; iter = g_list_next(iter)) {
-		const char *feat = iter->data;
-		xmlnode *feature = xmlnode_new_child(ext, "feature");
-		xmlnode_set_attrib(feature, "var", feat);
+gboolean jabber_caps_exts_known(const JabberCapsClientInfo *info,
+                                char **exts)
+{
+	int i;
+	g_return_val_if_fail(info != NULL, FALSE);
+
+	if (!exts)
+		return TRUE;
+
+	for (i = 0; exts[i]; ++i) {
+		/* Hack since we advertise the ext along with v1.5 caps but don't
+		 * store any exts */
+		if (g_str_equal(exts[i], "voice-v1") && !info->exts)
+			continue;
+		if (!info->exts ||
+				!g_hash_table_lookup(info->exts->exts, exts[i]))
+			return FALSE;
 	}
+
+	return TRUE;
 }
 
-static void jabber_caps_store_client(gpointer key, gpointer value, gpointer user_data) {
-	JabberCapsKey *clientinfo = key;
-	JabberCapsValue *props = value;
-	xmlnode *root = user_data;
-	xmlnode *client = xmlnode_new_child(root,"client");
-	GList *iter;
+typedef struct _jabber_caps_cbplususerdata {
+	guint ref;
 
-	xmlnode_set_attrib(client,"node",clientinfo->node);
-	xmlnode_set_attrib(client,"ver",clientinfo->ver);
+	jabber_caps_get_info_cb cb;
+	gpointer cb_data;
 
-	for(iter = props->identities; iter; iter = g_list_next(iter)) {
-		JabberCapsIdentity *id = iter->data;
-		xmlnode *identity = xmlnode_new_child(client, "identity");
-		xmlnode_set_attrib(identity, "category", id->category);
-		xmlnode_set_attrib(identity, "type", id->type);
-		if (id->name)
-			xmlnode_set_attrib(identity, "name", id->name);
-	}
+	char *who;
+	char *node;
+	char *ver;
+	char *hash;
 
-	for(iter = props->features; iter; iter = g_list_next(iter)) {
-		const char *feat = iter->data;
-		xmlnode *feature = xmlnode_new_child(client, "feature");
-		xmlnode_set_attrib(feature, "var", feat);
-	}
+	JabberCapsClientInfo *info;
+
+	GList *exts;
+	guint extOutstanding;
+	JabberCapsNodeExts *node_exts;
+} jabber_caps_cbplususerdata;
+
+static jabber_caps_cbplususerdata*
+cbplususerdata_ref(jabber_caps_cbplususerdata *data)
+{
+	g_return_val_if_fail(data != NULL, NULL);
 
-	g_hash_table_foreach(props->ext,jabber_caps_store_ext,client);
+	++data->ref;
+	return data;
 }
 
-static void jabber_caps_store(void) {
-	char *str;
-	xmlnode *root = xmlnode_new("capabilities");
-	g_hash_table_foreach(capstable, jabber_caps_store_client, root);
-	str = xmlnode_to_formatted_str(root, NULL);
-	xmlnode_free(root);
-	purple_util_write_data_to_file(JABBER_CAPS_FILENAME, str, -1);
-	g_free(str);
+static void
+cbplususerdata_unref(jabber_caps_cbplususerdata *data)
+{
+	if (data == NULL)
+		return;
+
+	g_return_if_fail(data->ref != 0);
+
+	if (--data->ref > 0)
+		return;
+
+	g_free(data->who);
+	g_free(data->node);
+	g_free(data->ver);
+	g_free(data->hash);
+
+	/* If we have info here, it's already in the capstable, so don't free it */
+	if (data->exts)
+		free_string_glist(data->exts);
+	if (data->node_exts)
+		jabber_caps_node_exts_unref(data->node_exts);
+	g_free(data);
 }
 
-/* this function assumes that all information is available locally */
-static JabberCapsClientInfo *jabber_caps_collect_info(const char *node, const char *ver, GList *ext) {
-	JabberCapsClientInfo *result;
-	JabberCapsKey *key = g_new0(JabberCapsKey, 1);
-	JabberCapsValue *caps;
-	GList *iter;
+static void
+jabber_caps_get_info_complete(jabber_caps_cbplususerdata *userdata)
+{
+	if (userdata->cb) {
+		userdata->cb(userdata->info, userdata->exts, userdata->cb_data);
+		userdata->info = NULL;
+		userdata->exts = NULL;
+	}
 
-	key->node = (char *)node;
-	key->ver = (char *)ver;
+	if (userdata->ref != 1)
+		purple_debug_warning("jabber", "Lost a reference to caps cbdata: %d\n",
+		                     userdata->ref);
+}
 
-	caps = g_hash_table_lookup(capstable,key);
+static void
+jabber_caps_client_iqcb(JabberStream *js, const char *from, JabberIqType type,
+                        const char *id, xmlnode *packet, gpointer data)
+{
+	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
+		"http://jabber.org/protocol/disco#info");
+	jabber_caps_cbplususerdata *userdata = data;
+	JabberCapsClientInfo *info = NULL, *value;
+	JabberCapsTuple key;
 
-	g_free(key);
+	if (!query || type == JABBER_IQ_ERROR) {
+		/* Any outstanding exts will be dealt with via ref-counting */
+		userdata->cb(NULL, NULL, userdata->cb_data);
+		cbplususerdata_unref(userdata);
+		return;
+	}
 
-	if (caps == NULL)
-		return NULL;
+	/* check hash */
+	info = jabber_caps_parse_client_info(query);
+
+	/* Only validate if these are v1.5 capabilities */
+	if (userdata->hash) {
+		gchar *hash = NULL;
+		/*
+		 * TODO: If you add *any* hash here, make sure the checksum buffer
+		 * size in jabber_caps_calculate_hash is large enough. The cipher API
+		 * doesn't seem to offer a "Get the hash size" function(?).
+		 */
+		if (!strcmp(userdata->hash, "sha-1")) {
+			hash = jabber_caps_calculate_hash(info, "sha1");
+		} else if (!strcmp(userdata->hash, "md5")) {
+			hash = jabber_caps_calculate_hash(info, "md5");
+		}
 
-	result = g_new0(JabberCapsClientInfo, 1);
+		if (!hash || strcmp(hash, userdata->ver)) {
+			purple_debug_warning("jabber", "Could not validate caps info from %s\n",
+			                     xmlnode_get_attrib(packet, "from"));
 
-	/* join all information */
-	for(iter = caps->identities; iter; iter = g_list_next(iter)) {
-		JabberCapsIdentity *id = iter->data;
-		JabberCapsIdentity *newid = g_new0(JabberCapsIdentity, 1);
-		newid->category = g_strdup(id->category);
-		newid->type = g_strdup(id->type);
-		newid->name = g_strdup(id->name);
+			userdata->cb(NULL, NULL, userdata->cb_data);
+			jabber_caps_client_info_destroy(info);
+			cbplususerdata_unref(userdata);
+			g_free(hash);
+			return;
+		}
 
-		result->identities = g_list_append(result->identities,newid);
+		g_free(hash);
 	}
-	for(iter = caps->features; iter; iter = g_list_next(iter)) {
-		const char *feat = iter->data;
-		char *newfeat = g_strdup(feat);
 
-		result->features = g_list_append(result->features,newfeat);
+	if (!userdata->hash && userdata->node_exts) {
+		/* If the ClientInfo doesn't have information about the exts, give them
+		 * ours (along with our ref) */
+		info->exts = userdata->node_exts;
+		userdata->node_exts = NULL;
 	}
 
-	for(iter = ext; iter; iter = g_list_next(iter)) {
-		const char *extname = iter->data;
-		JabberCapsValueExt *extinfo = g_hash_table_lookup(caps->ext,extname);
+	key.node = userdata->node;
+	key.ver  = userdata->ver;
+	key.hash = userdata->hash;
+
+	/* Use the copy of this data already in the table if it exists or insert
+	 * a new one if we need to */
+	if ((value = g_hash_table_lookup(capstable, &key))) {
+		jabber_caps_client_info_destroy(info);
+		info = value;
+	} else {
+		JabberCapsTuple *n_key = (JabberCapsTuple *)&info->tuple;
+		n_key->node = userdata->node;
+		n_key->ver  = userdata->ver;
+		n_key->hash = userdata->hash;
+		userdata->node = userdata->ver = userdata->hash = NULL;
+
+		/* The capstable gets a reference */
+		g_hash_table_insert(capstable, n_key, info);
+		schedule_caps_save();
+	}
 
-		if(extinfo) {
-			GList *iter2;
-			for(iter2 = extinfo->identities; iter2; iter2 = g_list_next(iter2)) {
-				JabberCapsIdentity *id = iter2->data;
-				JabberCapsIdentity *newid = g_new0(JabberCapsIdentity, 1);
-				newid->category = g_strdup(id->category);
-				newid->type = g_strdup(id->type);
-				newid->name = g_strdup(id->name);
+	userdata->info = info;
 
-				result->identities = g_list_append(result->identities,newid);
-			}
-			for(iter2 = extinfo->features; iter2; iter2 = g_list_next(iter2)) {
-				const char *feat = iter2->data;
-				char *newfeat = g_strdup(feat);
+	if (userdata->extOutstanding == 0)
+		jabber_caps_get_info_complete(userdata);
 
-				result->features = g_list_append(result->features,newfeat);
-			}
-		}
-	}
-	return result;
+	cbplususerdata_unref(userdata);
 }
 
-void jabber_caps_free_clientinfo(JabberCapsClientInfo *clientinfo) {
-	if(!clientinfo)
+typedef struct {
+	const char *name;
+	jabber_caps_cbplususerdata *data;
+} ext_iq_data;
+
+static void
+jabber_caps_ext_iqcb(JabberStream *js, const char *from, JabberIqType type,
+                     const char *id, xmlnode *packet, gpointer data)
+{
+	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
+		"http://jabber.org/protocol/disco#info");
+	xmlnode *child;
+	ext_iq_data *userdata = data;
+	GList *features = NULL;
+	JabberCapsNodeExts *node_exts;
+
+	if (!query || type == JABBER_IQ_ERROR) {
+		cbplususerdata_unref(userdata->data);
+		g_free(userdata);
 		return;
-	while(clientinfo->identities) {
-		JabberCapsIdentity *id = clientinfo->identities->data;
-		g_free(id->category);
-		g_free(id->type);
-		g_free(id->name);
-		g_free(id);
+	}
 
-		clientinfo->identities = g_list_delete_link(clientinfo->identities,clientinfo->identities);
+	node_exts = (userdata->data->info ? userdata->data->info->exts :
+	                                    userdata->data->node_exts);
+
+	/* TODO: I don't see how this can actually happen, but it crashed khc. */
+	if (!node_exts) {
+		purple_debug_error("jabber", "Couldn't find JabberCapsNodeExts. If you "
+				"see this, please tell darkrain42 and save your debug log.\n"
+				"JabberCapsClientInfo = %p\n", userdata->data->info);
+
+
+		/* Try once more to find the exts and then fail */
+		node_exts = jabber_caps_find_exts_by_node(userdata->data->node);
+		if (node_exts) {
+			purple_debug_info("jabber", "Found the exts on the second try.\n");
+			if (userdata->data->info)
+				userdata->data->info->exts = node_exts;
+			else
+				userdata->data->node_exts = node_exts;
+		} else {
+			cbplususerdata_unref(userdata->data);
+			g_free(userdata);
+			g_return_if_reached();
+		}
 	}
-	while(clientinfo->features) {
-		char *feat = clientinfo->features->data;
-		g_free(feat);
 
-		clientinfo->features = g_list_delete_link(clientinfo->features,clientinfo->features);
+	/* So, we decrement this after checking for an error, which means that
+	 * if there *is* an error, we'll never call the callback passed to
+	 * jabber_caps_get_info. We will still free all of our data, though.
+	 */
+	--userdata->data->extOutstanding;
+
+	for (child = xmlnode_get_child(query, "feature"); child;
+	        child = xmlnode_get_next_twin(child)) {
+		const char *var = xmlnode_get_attrib(child, "var");
+		if (var)
+			features = g_list_prepend(features, g_strdup(var));
 	}
 
-	g_free(clientinfo);
-}
+	g_hash_table_insert(node_exts->exts, g_strdup(userdata->name), features);
+	schedule_caps_save();
 
-typedef struct _jabber_caps_cbplususerdata {
-	jabber_caps_get_info_cb cb;
-	gpointer user_data;
+	/* Are we done? */
+	if (userdata->data->info && userdata->data->extOutstanding == 0)
+		jabber_caps_get_info_complete(userdata->data);
 
-	char *who;
-	char *node;
-	char *ver;
-	GList *ext;
-	unsigned extOutstanding;
-} jabber_caps_cbplususerdata;
+	cbplususerdata_unref(userdata->data);
+	g_free(userdata);
+}
 
-typedef struct jabber_ext_userdata {
+void jabber_caps_get_info(JabberStream *js, const char *who, const char *node,
+        const char *ver, const char *hash, char **exts,
+        jabber_caps_get_info_cb cb, gpointer user_data)
+{
+	JabberCapsClientInfo *info;
+	JabberCapsTuple key;
 	jabber_caps_cbplususerdata *userdata;
-	char *node;
-} jabber_ext_userdata;
-
-static void jabber_caps_get_info_check_completion(jabber_caps_cbplususerdata *userdata) {
-	if(userdata->extOutstanding == 0) {
-		userdata->cb(jabber_caps_collect_info(userdata->node, userdata->ver, userdata->ext), userdata->user_data);
-		g_free(userdata->who);
-		g_free(userdata->node);
-		g_free(userdata->ver);
-		while(userdata->ext) {
-			g_free(userdata->ext->data);
-			userdata->ext = g_list_delete_link(userdata->ext,userdata->ext);
-		}
-		g_free(userdata);
+
+	if (exts && hash) {
+		purple_debug_info("jabber", "Ignoring exts in new-style caps from %s\n",
+		                     who);
+		g_strfreev(exts);
+		exts = NULL;
 	}
-}
 
-static void jabber_caps_ext_iqcb(JabberStream *js, xmlnode *packet, gpointer data) {
-	/* collect data and fetch all exts */
-	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query", "http://jabber.org/protocol/disco#info");
-	jabber_ext_userdata *extuserdata = data;
-	jabber_caps_cbplususerdata *userdata = extuserdata->userdata;
-	const char *node = extuserdata->node;
+	/* Using this in a read-only fashion, so the cast is OK */
+	key.node = (char *)node;
+	key.ver = (char *)ver;
+	key.hash = (char *)hash;
 
-	--userdata->extOutstanding;
+	info = g_hash_table_lookup(capstable, &key);
+	if (info && hash) {
+		/* v1.5 - We already have all the information we care about */
+		if (cb)
+			cb(info, NULL, user_data);
+		return;
+	}
 
-	/* TODO: Better error handling */
+	userdata = g_new0(jabber_caps_cbplususerdata, 1);
+	/* We start out with 0 references. Every query takes one */
+	userdata->cb = cb;
+	userdata->cb_data = user_data;
+	userdata->who = g_strdup(who);
+	userdata->node = g_strdup(node);
+	userdata->ver = g_strdup(ver);
+	userdata->hash = g_strdup(hash);
 
-	if(node && query) {
-		const char *key;
-		JabberCapsValue *client;
-		xmlnode *child;
-		JabberCapsValueExt *value = g_new0(JabberCapsValueExt, 1);
-		JabberCapsKey *clientkey = g_new0(JabberCapsKey, 1);
+	if (info) {
+		userdata->info = info;
+	} else {
+		/* If we don't have the basic information about the client, we need
+		 * to fetch it. */
+		JabberIq *iq;
+		xmlnode *query;
+		char *nodever;
+
+		iq = jabber_iq_new_query(js, JABBER_IQ_GET,
+					"http://jabber.org/protocol/disco#info");
+		query = xmlnode_get_child_with_namespace(iq->node, "query",
+					"http://jabber.org/protocol/disco#info");
+		nodever = g_strdup_printf("%s#%s", node, ver);
+		xmlnode_set_attrib(query, "node", nodever);
+		g_free(nodever);
+		xmlnode_set_attrib(iq->node, "to", who);
 
-		clientkey->node = userdata->node;
-		clientkey->ver = userdata->ver;
+		cbplususerdata_ref(userdata);
 
-		client = g_hash_table_lookup(capstable, clientkey);
+		jabber_iq_set_callback(iq, jabber_caps_client_iqcb, userdata);
+		jabber_iq_send(iq);
+	}
 
-		g_free(clientkey);
+	/* Are there any exts that we don't recognize? */
+	if (exts) {
+		JabberCapsNodeExts *node_exts;
+		int i;
 
-		/* split node by #, key either points to \0 or the correct ext afterwards */
-		for(key = node; key[0] != '\0'; ++key) {
-			if(key[0] == '#') {
-				++key;
-				break;
+		if (info) {
+			if (info->exts)
+				node_exts = info->exts;
+			else
+				node_exts = info->exts = jabber_caps_find_exts_by_node(node);
+		} else
+			/* We'll put it in later once we have the client info */
+			node_exts = userdata->node_exts = jabber_caps_find_exts_by_node(node);
+
+		for (i = 0; exts[i]; ++i) {
+			userdata->exts = g_list_prepend(userdata->exts, exts[i]);
+			/* Look it up if we don't already know what it means */
+			if (!g_hash_table_lookup(node_exts->exts, exts[i])) {
+				JabberIq *iq;
+				xmlnode *query;
+				char *nodeext;
+				ext_iq_data *cbdata = g_new(ext_iq_data, 1);
+
+				cbdata->name = exts[i];
+				cbdata->data = cbplususerdata_ref(userdata);
+
+				iq = jabber_iq_new_query(js, JABBER_IQ_GET,
+				            "http://jabber.org/protocol/disco#info");
+				query = xmlnode_get_child_with_namespace(iq->node, "query",
+				            "http://jabber.org/protocol/disco#info");
+				nodeext = g_strdup_printf("%s#%s", node, exts[i]);
+				xmlnode_set_attrib(query, "node", nodeext);
+				g_free(nodeext);
+				xmlnode_set_attrib(iq->node, "to", who);
+
+				jabber_iq_set_callback(iq, jabber_caps_ext_iqcb, cbdata);
+				jabber_iq_send(iq);
+
+				++userdata->extOutstanding;
 			}
+			exts[i] = NULL;
 		}
+		/* All the strings are now part of the GList, so don't need
+		 * g_strfreev. */
+		g_free(exts);
+	}
 
-		for(child = query->child; child; child = child->next) {
-			if(child->type != XMLNODE_TYPE_TAG)
-				continue;
-			if(!strcmp(child->name,"feature")) {
-				const char *var = xmlnode_get_attrib(child, "var");
-				if(!var)
-					continue;
-				value->features = g_list_append(value->features,g_strdup(var));
-			} else if(!strcmp(child->name,"identity")) {
-				const char *category = xmlnode_get_attrib(child, "category");
-				const char *type = xmlnode_get_attrib(child, "type");
-				const char *name = xmlnode_get_attrib(child, "name");
-
-				JabberCapsIdentity *id = g_new0(JabberCapsIdentity, 1);
-				id->category = g_strdup(category);
-				id->type = g_strdup(type);
-				id->name = g_strdup(name);
-
-				value->identities = g_list_append(value->identities,id);
-			}
-		}
-		g_hash_table_replace(client->ext, g_strdup(key), value);
+	if (userdata->info && userdata->extOutstanding == 0) {
+		/* Start with 1 ref so the below functions are happy */
+		userdata->ref = 1;
 
-		jabber_caps_store();
+		/* We have everything we need right now */
+		jabber_caps_get_info_complete(userdata);
+		cbplususerdata_unref(userdata);
 	}
+}
 
-	g_free(extuserdata->node);
-	g_free(extuserdata);
-	jabber_caps_get_info_check_completion(userdata);
+static gint
+jabber_identity_compare(gconstpointer a, gconstpointer b)
+{
+	const JabberIdentity *ac;
+	const JabberIdentity *bc;
+	gint cat_cmp;
+	gint typ_cmp;
+
+	ac = a;
+	bc = b;
+
+	if ((cat_cmp = strcmp(ac->category, bc->category)) == 0) {
+		if ((typ_cmp = strcmp(ac->type, bc->type)) == 0) {
+			if (!ac->lang && !bc->lang) {
+				return 0;
+			} else if (ac->lang && !bc->lang) {
+				return 1;
+			} else if (!ac->lang && bc->lang) {
+				return -1;
+			} else {
+				return strcmp(ac->lang, bc->lang);
+			}
+		} else {
+			return typ_cmp;
+		}
+	} else {
+		return cat_cmp;
+	}
 }
 
-static void jabber_caps_client_iqcb(JabberStream *js, xmlnode *packet, gpointer data) {
-	/* collect data and fetch all exts */
-	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
-		"http://jabber.org/protocol/disco#info");
-	jabber_caps_cbplususerdata *userdata = data;
+static gchar *jabber_caps_get_formtype(const xmlnode *x) {
+	xmlnode *formtypefield;
+	formtypefield = xmlnode_get_child(x, "field");
+	while (formtypefield && strcmp(xmlnode_get_attrib(formtypefield, "var"), "FORM_TYPE")) formtypefield = xmlnode_get_next_twin(formtypefield);
+	formtypefield = xmlnode_get_child(formtypefield, "value");
+	return xmlnode_get_data(formtypefield);;
+}
 
-	/* TODO: Better error checking! */
+static gint
+jabber_xdata_compare(gconstpointer a, gconstpointer b)
+{
+	const xmlnode *aformtypefield = a;
+	const xmlnode *bformtypefield = b;
+	char *aformtype;
+	char *bformtype;
+	int result;
+
+	aformtype = jabber_caps_get_formtype(aformtypefield);
+	bformtype = jabber_caps_get_formtype(bformtypefield);
+
+	result = strcmp(aformtype, bformtype);
+	g_free(aformtype);
+	g_free(bformtype);
+	return result;
+}
 
-	if (query) {
-		JabberCapsValue *value = g_new0(JabberCapsValue, 1);
-		JabberCapsKey *key = g_new0(JabberCapsKey, 1);
-		xmlnode *child;
-		GList *iter;
+static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query)
+{
+	xmlnode *child;
+	JabberCapsClientInfo *info;
 
-		value->ext = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, jabber_caps_ext_destroy_value);
+	if (!query || strcmp(query->xmlns, "http://jabber.org/protocol/disco#info"))
+		return 0;
 
-		key->node = g_strdup(userdata->node);
-		key->ver = g_strdup(userdata->ver);
+	info = g_new0(JabberCapsClientInfo, 1);
 
-		for(child = query->child; child; child = child->next) {
-			if(child->type != XMLNODE_TYPE_TAG)
+	for(child = query->child; child; child = child->next) {
+		if (child->type != XMLNODE_TYPE_TAG)
+			continue;
+		if (!strcmp(child->name,"identity")) {
+			/* parse identity */
+			const char *category = xmlnode_get_attrib(child, "category");
+			const char *type = xmlnode_get_attrib(child, "type");
+			const char *name = xmlnode_get_attrib(child, "name");
+			const char *lang = xmlnode_get_attrib(child, "lang");
+			JabberIdentity *id;
+
+			if (!category || !type)
 				continue;
-			if(!strcmp(child->name,"feature")) {
-				const char *var = xmlnode_get_attrib(child, "var");
-				if(!var)
-					continue;
-				value->features = g_list_append(value->features, g_strdup(var));
-			} else if(!strcmp(child->name,"identity")) {
-				const char *category = xmlnode_get_attrib(child, "category");
-				const char *type = xmlnode_get_attrib(child, "type");
-				const char *name = xmlnode_get_attrib(child, "name");
-
-				JabberCapsIdentity *id = g_new0(JabberCapsIdentity, 1);
-				id->category = g_strdup(category);
-				id->type = g_strdup(type);
-				id->name = g_strdup(name);
-
-				value->identities = g_list_append(value->identities,id);
+
+			id = g_new0(JabberIdentity, 1);
+			id->category = g_strdup(category);
+			id->type = g_strdup(type);
+			id->name = g_strdup(name);
+			id->lang = g_strdup(lang);
+
+			info->identities = g_list_append(info->identities, id);
+		} else if (!strcmp(child->name, "feature")) {
+			/* parse feature */
+			const char *var = xmlnode_get_attrib(child, "var");
+			if (var)
+				info->features = g_list_prepend(info->features, g_strdup(var));
+		} else if (!strcmp(child->name, "x")) {
+			if (child->xmlns && !strcmp(child->xmlns, "jabber:x:data")) {
+				/* x-data form */
+				xmlnode *dataform = xmlnode_copy(child);
+				info->forms = g_list_append(info->forms, dataform);
 			}
 		}
-		g_hash_table_replace(capstable, key, value);
-		jabber_caps_store();
-
-
-		/* fetch all exts */
-		for(iter = userdata->ext; iter; iter = g_list_next(iter)) {
-			JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET,
-				"http://jabber.org/protocol/disco#info");
-			xmlnode *query = xmlnode_get_child_with_namespace(iq->node,
-				"query", "http://jabber.org/protocol/disco#info");
-			char *node = g_strdup_printf("%s#%s", userdata->node, (const char*)iter->data);
-			jabber_ext_userdata *ext_data = g_new0(jabber_ext_userdata, 1);
-			ext_data->node = node;
-			ext_data->userdata = userdata;
-
-			xmlnode_set_attrib(query, "node", node);
-			xmlnode_set_attrib(iq->node, "to", userdata->who);
-
-			jabber_iq_set_callback(iq, jabber_caps_ext_iqcb, ext_data);
-			jabber_iq_send(iq);
+	}
+	return info;
+}
+
+static gint jabber_caps_xdata_field_compare(gconstpointer a, gconstpointer b)
+{
+	const JabberDataFormField *ac = a;
+	const JabberDataFormField *bc = b;
+
+	return strcmp(ac->var, bc->var);
+}
+
+static GList* jabber_caps_xdata_get_fields(const xmlnode *x)
+{
+	GList *fields = NULL;
+	xmlnode *field;
+
+	if (!x)
+		return NULL;
+
+	for (field = xmlnode_get_child(x, "field"); field; field = xmlnode_get_next_twin(field)) {
+		xmlnode *value;
+		JabberDataFormField *xdatafield = g_new0(JabberDataFormField, 1);
+		xdatafield->var = g_strdup(xmlnode_get_attrib(field, "var"));
+
+		for (value = xmlnode_get_child(field, "value"); value; value = xmlnode_get_next_twin(value)) {
+			gchar *val = xmlnode_get_data(value);
+			xdatafield->values = g_list_append(xdatafield->values, val);
 		}
 
-	} else
-		/* Don't wait for the ext discoveries; they aren't going to happen */
-		userdata->extOutstanding = 0;
+		xdatafield->values = g_list_sort(xdatafield->values, (GCompareFunc)strcmp);
+		fields = g_list_append(fields, xdatafield);
+	}
 
-	jabber_caps_get_info_check_completion(userdata);
+	fields = g_list_sort(fields, jabber_caps_xdata_field_compare);
+	return fields;
 }
 
-void jabber_caps_get_info(JabberStream *js, const char *who, const char *node, const char *ver, const char *ext, jabber_caps_get_info_cb cb, gpointer user_data) {
-	JabberCapsValue *client;
-	JabberCapsKey *key = g_new0(JabberCapsKey, 1);
-	char *originalext = g_strdup(ext);
-	jabber_caps_cbplususerdata *userdata = g_new0(jabber_caps_cbplususerdata, 1);
-	userdata->cb = cb;
-	userdata->user_data = user_data;
-	userdata->who = g_strdup(who);
-	userdata->node = g_strdup(node);
-	userdata->ver = g_strdup(ver);
+static GString*
+jabber_caps_verification_append(GString *verification, const gchar *str)
+{
+	char *tmp = g_markup_escape_text(str, -1);
+	verification = g_string_append(verification, tmp);
+	g_free(tmp);
+	return g_string_append_c(verification, '<');
+}
 
-	if(originalext) {
-		int i;
-		gchar **splat = g_strsplit(originalext, " ", 0);
-		for(i =0; splat[i]; i++) {
-			userdata->ext = g_list_append(userdata->ext, splat[i]);
-			++userdata->extOutstanding;
+gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, const char *hash)
+{
+	GList *node;
+	GString *verification;
+	PurpleCipherContext *context;
+	guint8 checksum[20];
+	gsize checksum_size = 20;
+	gboolean success;
+
+	if (!info || !(context = purple_cipher_context_new_by_name(hash, NULL)))
+		return NULL;
+
+	/* sort identities, features and x-data forms */
+	info->identities = g_list_sort(info->identities, jabber_identity_compare);
+	info->features = g_list_sort(info->features, (GCompareFunc)strcmp);
+	info->forms = g_list_sort(info->forms, jabber_xdata_compare);
+
+	verification = g_string_new("");
+
+	/* concat identities to the verification string */
+	for (node = info->identities; node; node = node->next) {
+		JabberIdentity *id = (JabberIdentity*)node->data;
+		char *category = g_markup_escape_text(id->category, -1);
+		char *type = g_markup_escape_text(id->type, -1);
+		char *lang = NULL;
+		char *name = NULL;
+
+		if (id->lang)
+			lang = g_markup_escape_text(id->lang, -1);
+		if (id->name)
+			name = g_markup_escape_text(id->name, -1);
+
+		g_string_append_printf(verification, "%s/%s/%s/%s<", category,
+		        type, lang ? lang : "", name ? name : "");
+
+		g_free(category);
+		g_free(type);
+		g_free(lang);
+		g_free(name);
+	}
+
+	/* concat features to the verification string */
+	for (node = info->features; node; node = node->next) {
+		verification = jabber_caps_verification_append(verification, node->data);
+	}
+
+	/* concat x-data forms to the verification string */
+	for(node = info->forms; node; node = node->next) {
+		xmlnode *data = (xmlnode *)node->data;
+		gchar *formtype = jabber_caps_get_formtype(data);
+		GList *fields = jabber_caps_xdata_get_fields(data);
+
+		/* append FORM_TYPE's field value to the verification string */
+		verification = jabber_caps_verification_append(verification, formtype);
+		g_free(formtype);
+
+		while (fields) {
+			GList *value;
+			JabberDataFormField *field = (JabberDataFormField*)fields->data;
+
+			if (strcmp(field->var, "FORM_TYPE")) {
+				/* Append the "var" attribute */
+				verification = jabber_caps_verification_append(verification, field->var);
+				/* Append <value/> elements' cdata */
+				for(value = field->values; value; value = value->next) {
+					verification = jabber_caps_verification_append(verification, value->data);
+					g_free(value->data);
+				}
+			}
+
+			g_free(field->var);
+			g_list_free(field->values);
+
+			fields = g_list_delete_link(fields, fields);
 		}
-		g_free(splat);
 	}
-	g_free(originalext);
 
-	key->node = (char *)node;
-	key->ver = (char *)ver;
+	/* generate hash */
+	purple_cipher_context_append(context, (guchar*)verification->str, verification->len);
 
-	client = g_hash_table_lookup(capstable, key);
+	success = purple_cipher_context_digest(context, verification->len,
+	                                       checksum, &checksum_size);
 
-	g_free(key);
+	g_string_free(verification, TRUE);
+	purple_cipher_context_destroy(context);
 
-	if(!client) {
-		JabberIq *iq = jabber_iq_new_query(js,JABBER_IQ_GET,"http://jabber.org/protocol/disco#info");
-		xmlnode *query = xmlnode_get_child_with_namespace(iq->node,"query","http://jabber.org/protocol/disco#info");
-		char *nodever = g_strdup_printf("%s#%s", node, ver);
-		xmlnode_set_attrib(query, "node", nodever);
-		g_free(nodever);
-		xmlnode_set_attrib(iq->node, "to", who);
+	return (success ? purple_base64_encode(checksum, checksum_size) : NULL);
+}
 
-		jabber_iq_set_callback(iq,jabber_caps_client_iqcb,userdata);
-		jabber_iq_send(iq);
-	} else {
-		GList *iter;
-		/* fetch unknown exts only */
-		for(iter = userdata->ext; iter; iter = g_list_next(iter)) {
-			JabberCapsValueExt *extvalue = g_hash_table_lookup(client->ext, (const char*)iter->data);
-			JabberIq *iq;
-			xmlnode *query;
-			char *nodever;
-			jabber_ext_userdata *ext_data;
-
-			if(extvalue) {
-				/* we already have this ext, don't bother with it */
-				--userdata->extOutstanding;
-				continue;
+void jabber_caps_calculate_own_hash(JabberStream *js) {
+	JabberCapsClientInfo info;
+	GList *iter = 0;
+	GList *features = 0;
+
+	if (!jabber_identities && !jabber_features) {
+		/* This really shouldn't ever happen */
+		purple_debug_warning("jabber", "No features or identities, cannot calculate own caps hash.\n");
+		g_free(js->caps_hash);
+		js->caps_hash = NULL;
+		return;
+	}
+
+	/* build the currently-supported list of features */
+	if (jabber_features) {
+		for (iter = jabber_features; iter; iter = iter->next) {
+			JabberFeature *feat = iter->data;
+			if(!feat->is_enabled || feat->is_enabled(js, feat->namespace)) {
+				features = g_list_append(features, feat->namespace);
 			}
+		}
+	}
 
-			ext_data = g_new0(jabber_ext_userdata, 1);
+	info.features = features;
+	info.identities = g_list_copy(jabber_identities);
+	info.forms = NULL;
 
-			iq = jabber_iq_new_query(js,JABBER_IQ_GET,"http://jabber.org/protocol/disco#info");
-			query = xmlnode_get_child_with_namespace(iq->node,"query","http://jabber.org/protocol/disco#info");
-			nodever = g_strdup_printf("%s#%s", node, (const char*)iter->data);
-			xmlnode_set_attrib(query, "node", nodever);
-			xmlnode_set_attrib(iq->node, "to", who);
+	g_free(js->caps_hash);
+	js->caps_hash = jabber_caps_calculate_hash(&info, "sha1");
+	g_list_free(info.identities);
+	g_list_free(features);
+}
 
-			ext_data->node = nodever;
-			ext_data->userdata = userdata;
+const gchar* jabber_caps_get_own_hash(JabberStream *js)
+{
+	if (!js->caps_hash)
+		jabber_caps_calculate_own_hash(js);
 
-			jabber_iq_set_callback(iq, jabber_caps_ext_iqcb, ext_data);
-			jabber_iq_send(iq);
+	return js->caps_hash;
+}
+
+void jabber_caps_broadcast_change()
+{
+	GList *node, *accounts = purple_accounts_get_all_active();
+
+	for (node = accounts; node; node = node->next) {
+		PurpleAccount *account = node->data;
+		const char *prpl_id = purple_account_get_protocol_id(account);
+		if (!strcmp("prpl-jabber", prpl_id) && purple_account_is_connected(account)) {
+			PurpleConnection *gc = purple_account_get_connection(account);
+			jabber_presence_send(gc->proto_data, TRUE);
 		}
-		/* maybe we have all data available anyways? This is the ideal case where no network traffic is necessary */
-		jabber_caps_get_info_check_completion(userdata);
 	}
+
+	g_list_free(accounts);
 }
 
diff --git a/libpurple/protocols/jabber/caps.h b/libpurple/protocols/jabber/caps.h
index 07cf0baaaf..46a31ac625 100644
--- a/libpurple/protocols/jabber/caps.h
+++ b/libpurple/protocols/jabber/caps.h
@@ -19,31 +19,98 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_CAPS_H_
-#define _PURPLE_JABBER_CAPS_H_
+#ifndef PURPLE_JABBER_CAPS_H_
+#define PURPLE_JABBER_CAPS_H_
 
 typedef struct _JabberCapsClientInfo JabberCapsClientInfo;
 
 #include "jabber.h"
 
-/* Implementation of XEP-0115 */
+/* Implementation of XEP-0115 - Entity Capabilities */
 
-typedef struct _JabberCapsIdentity {
-	char *category;
-	char *type;
-	char *name;
-} JabberCapsIdentity;
+typedef struct _JabberCapsNodeExts JabberCapsNodeExts;
+
+typedef struct _JabberCapsTuple {
+	const char *node;
+	const char *ver;
+	const char *hash;
+} JabberCapsTuple;
 
 struct _JabberCapsClientInfo {
-	GList *identities; /* JabberCapsIdentity */
+	GList *identities; /* JabberIdentity */
 	GList *features; /* char * */
+	GList *forms; /* xmlnode * */
+	JabberCapsNodeExts *exts;
+
+	const JabberCapsTuple tuple;
 };
 
-typedef void (*jabber_caps_get_info_cb)(JabberCapsClientInfo *info, gpointer user_data);
+/*
+ * This stores a set of exts "known" for a specific node (which indicates
+ * a specific client -- for reference, Pidgin, Finch, Meebo, et al share one
+ * node.) In XEP-0115 v1.3, exts are used for features that may or may not be
+ * present at a given time (PEP things, buzz might be disabled, etc).
+ *
+ * This structure is shared among all JabberCapsClientInfo instances matching
+ * a specific node (if the capstable key->hash == NULL, which indicates that
+ * the ClientInfo is using v1.3 caps as opposed to v1.5 caps).
+ *
+ * It's only exposed so that jabber_resource_has_capability can use it.
+ * Everyone else, STAY AWAY!
+ */
+struct _JabberCapsNodeExts {
+	guint ref;
+	GHashTable *exts; /* char *ext_name -> GList *features */
+};
+
+typedef void (*jabber_caps_get_info_cb)(JabberCapsClientInfo *info, GList *exts, gpointer user_data);
 
 void jabber_caps_init(void);
+void jabber_caps_uninit(void);
 
-void jabber_caps_get_info(JabberStream *js, const char *who, const char *node, const char *ver, const char *ext, jabber_caps_get_info_cb cb, gpointer user_data);
-void jabber_caps_free_clientinfo(JabberCapsClientInfo *clientinfo);
+/**
+ * Check whether all of the exts in a char* array are known to the given info.
+ */
+gboolean jabber_caps_exts_known(const JabberCapsClientInfo *info, char **exts);
+
+/**
+ * Main entity capabilites function to get the capabilities of a contact.
+ *
+ * The callback will be called synchronously if we already have the
+ * capabilities for the specified (node,ver,hash) (and, if exts are specified,
+ * if we know what each means)
+ *
+ * @param exts A g_strsplit'd (NULL-terminated) array of strings. This
+ *             function is responsible for freeing it.
+ */
+void jabber_caps_get_info(JabberStream *js, const char *who, const char *node,
+                          const char *ver, const char *hash,
+                          char **exts, jabber_caps_get_info_cb cb,
+                          gpointer user_data);
+
+/**
+ *	Takes a JabberCapsClientInfo pointer and returns the caps hash according to
+ *	XEP-0115 Version 1.5.
+ *
+ *	@param info A JabberCapsClientInfo pointer.
+ *	@param hash Hash cipher to be used. Either sha-1 or md5.
+ *	@return		The base64 encoded SHA-1 hash; must be freed by caller
+ */
+gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, const char *hash);
+
+/**
+ *  Calculate SHA1 hash for own featureset.
+ */
+void jabber_caps_calculate_own_hash(JabberStream *js);
+
+/** Get the current caps hash.
+ * 	@ret hash
+**/
+const gchar* jabber_caps_get_own_hash(JabberStream *js);
+
+/**
+ *  Broadcast a new calculated hash using a <presence> stanza.
+ */
+void jabber_caps_broadcast_change(void);
 
-#endif /* _PURPLE_JABBER_CAPS_H_ */
+#endif /* PURPLE_JABBER_CAPS_H_ */
diff --git a/libpurple/protocols/jabber/chat.c b/libpurple/protocols/jabber/chat.c
index 4c2a644b02..1fbcd0302f 100644
--- a/libpurple/protocols/jabber/chat.c
+++ b/libpurple/protocols/jabber/chat.c
@@ -235,7 +235,7 @@ void jabber_chat_join(PurpleConnection *gc, GHashTable *data)
 		purple_serv_got_join_chat_failed(gc, data);
 		g_free(buf);
 		return;
-	} else if(!jabber_nameprep_validate(server)) {
+	} else if(!jabber_domain_validate(server)) {
 		char *buf = g_strdup_printf(_("%s is not a valid server name"), server);
 		purple_notify_error(gc, _("Invalid Server Name"),
 				_("Invalid Server Name"), buf);
@@ -376,21 +376,19 @@ static void jabber_chat_room_configure_x_data_cb(JabberStream *js, xmlnode *resu
 	jabber_iq_send(iq);
 }
 
-static void jabber_chat_room_configure_cb(JabberStream *js, xmlnode *packet, gpointer data)
+static void jabber_chat_room_configure_cb(JabberStream *js, const char *from,
+                                          JabberIqType type, const char *id,
+                                          xmlnode *packet, gpointer data)
 {
 	xmlnode *query, *x;
-	const char *type = xmlnode_get_attrib(packet, "type");
-	const char *from = xmlnode_get_attrib(packet, "from");
 	char *msg;
 	JabberChat *chat;
 	JabberID *jid;
 
-	if(!type || !from)
+	if (!from)
 		return;
 
-
-
-	if(!strcmp(type, "result")) {
+	if (type == JABBER_IQ_RESULT) {
 		jid = jabber_id_new(from);
 
 		if(!jid)
@@ -416,7 +414,7 @@ static void jabber_chat_room_configure_cb(JabberStream *js, xmlnode *packet, gpo
 				return;
 			}
 		}
-	} else if(!strcmp(type, "error")) {
+	} else if (type == JABBER_IQ_ERROR) {
 		char *msg = jabber_parse_error(js, packet, NULL);
 
 		purple_notify_error(js->gc, _("Configuration error"), _("Configuration error"), msg);
@@ -486,11 +484,12 @@ void jabber_chat_create_instant_room(JabberChat *chat) {
 	g_free(room_jid);
 }
 
-static void jabber_chat_register_x_data_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+static void
+jabber_chat_register_x_data_result_cb(JabberStream *js, const char *from,
+                                      JabberIqType type, const char *id,
+                                      xmlnode *packet, gpointer data)
 {
-	const char *type = xmlnode_get_attrib(packet, "type");
-
-	if(type && !strcmp(type, "error")) {
+	if (type == JABBER_IQ_ERROR) {
 		char *msg = jabber_parse_error(js, packet, NULL);
 
 		purple_notify_error(js->gc, _("Registration error"), _("Registration error"), msg);
@@ -521,19 +520,19 @@ static void jabber_chat_register_x_data_cb(JabberStream *js, xmlnode *result, gp
 	jabber_iq_send(iq);
 }
 
-static void jabber_chat_register_cb(JabberStream *js, xmlnode *packet, gpointer data)
+static void jabber_chat_register_cb(JabberStream *js, const char *from,
+                                    JabberIqType type, const char *id,
+                                    xmlnode *packet, gpointer data)
 {
 	xmlnode *query, *x;
-	const char *type = xmlnode_get_attrib(packet, "type");
-	const char *from = xmlnode_get_attrib(packet, "from");
 	char *msg;
 	JabberChat *chat;
 	JabberID *jid;
 
-	if(!type || !from)
+	if (!from)
 		return;
 
-	if(!strcmp(type, "result")) {
+	if (type == JABBER_IQ_RESULT) {
 		jid = jabber_id_new(from);
 
 		if(!jid)
@@ -559,7 +558,7 @@ static void jabber_chat_register_cb(JabberStream *js, xmlnode *packet, gpointer
 				return;
 			}
 		}
-	} else if(!strcmp(type, "error")) {
+	} else if (type == JABBER_IQ_ERROR) {
 		char *msg = jabber_parse_error(js, packet, NULL);
 
 		purple_notify_error(js->gc, _("Registration error"), _("Registration error"), msg);
@@ -598,37 +597,25 @@ void jabber_chat_register(JabberChat *chat)
 /* merge this with the function below when we get everyone on the same page wrt /commands */
 void jabber_chat_change_topic(JabberChat *chat, const char *topic)
 {
-	if(topic && *topic) {
-		JabberMessage *jm;
-		jm = g_new0(JabberMessage, 1);
-		jm->js = chat->js;
-		jm->type = JABBER_MESSAGE_GROUPCHAT;
-		jm->subject = purple_markup_strip_html(topic);
-		jm->to = g_strdup_printf("%s@%s", chat->room, chat->server);
-		jabber_message_send(jm);
-		jabber_message_free(jm);
-	} else {
-		const char *cur = purple_conv_chat_get_topic(PURPLE_CONV_CHAT(chat->conv));
-		char *buf, *tmp, *tmp2;
-
-		if(cur) {
-			tmp = g_markup_escape_text(cur, -1);
-			tmp2 = purple_markup_linkify(tmp);
-			buf = g_strdup_printf(_("current topic is: %s"), tmp2);
-			g_free(tmp);
-			g_free(tmp2);
-		} else
-			buf = g_strdup(_("No topic is set"));
-		purple_conv_chat_write(PURPLE_CONV_CHAT(chat->conv), "", buf,
-				PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG, time(NULL));
-		g_free(buf);
-	}
+	JabberMessage *jm;
+
+	jm = g_new0(JabberMessage, 1);
+	jm->js = chat->js;
+	jm->type = JABBER_MESSAGE_GROUPCHAT;
+	jm->to = g_strdup_printf("%s@%s", chat->room, chat->server);
 
+	if (topic && *topic)
+		jm->subject = g_strdup(topic);
+	else
+		jm->subject = g_strdup("");
+
+	jabber_message_send(jm);
+	jabber_message_free(jm);
 }
 
 void jabber_chat_set_topic(PurpleConnection *gc, int id, const char *topic)
 {
-	JabberStream *js = gc->proto_data;
+	JabberStream *js = purple_connection_get_protocol_data(gc);
 	JabberChat *chat = jabber_chat_find_by_id(js, id);
 
 	if(!chat)
@@ -690,16 +677,17 @@ void jabber_chat_part(JabberChat *chat, const char *msg)
 	g_free(room_jid);
 }
 
-static void roomlist_disco_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+static void roomlist_disco_result_cb(JabberStream *js, const char *from,
+                                     JabberIqType type, const char *id,
+                                     xmlnode *packet, gpointer data)
 {
 	xmlnode *query;
 	xmlnode *item;
-	const char *type;
 
 	if(!js->roomlist)
 		return;
 
-	if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "result")) {
+	if (type == JABBER_IQ_ERROR) {
 		char *err = jabber_parse_error(js, packet, NULL);
 		purple_notify_error(js->gc, _("Error"),
 				_("Error retrieving room list"), err);
@@ -762,6 +750,7 @@ static void roomlist_ok_cb(JabberStream *js, const char *server)
 
 	if(!server || !*server) {
 		purple_notify_error(js->gc, _("Invalid Server"), _("Invalid Server"), NULL);
+		purple_roomlist_set_in_progress(js->roomlist, FALSE);
 		return;
 	}
 
@@ -928,6 +917,68 @@ gboolean jabber_chat_affiliate_user(JabberChat *chat, const char *who, const cha
 	return TRUE;
 }
 
+static void
+jabber_chat_affiliation_list_cb(JabberStream *js, const char *from,
+                                JabberIqType type, const char *id,
+                                xmlnode *packet, gpointer data)
+{
+	JabberChat *chat;
+	xmlnode *query, *item;
+	int chat_id = GPOINTER_TO_INT(data);
+	GString *buf;
+
+	if(!(chat = jabber_chat_find_by_id(js, chat_id)))
+		return;
+
+	if (type == JABBER_IQ_ERROR)
+		return;
+
+	if(!(query = xmlnode_get_child(packet, "query")))
+		return;
+
+	buf = g_string_new(_("Affiliations:"));
+
+	item = xmlnode_get_child(query, "item");
+	if (item) {
+		for( ; item; item = xmlnode_get_next_twin(item)) {
+			const char *jid = xmlnode_get_attrib(item, "jid");
+			const char *affiliation = xmlnode_get_attrib(item, "affiliation");
+			if (jid && affiliation)
+				g_string_append_printf(buf, "\n%s %s", jid, affiliation);
+		}
+    } else {
+		buf = g_string_append_c(buf, '\n');
+		buf = g_string_append_len(buf, _("No users found"), -1);
+	}
+
+	purple_conv_chat_write(PURPLE_CONV_CHAT(chat->conv), "", buf->str,
+    	PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG, time(NULL));
+
+	g_string_free(buf, TRUE);
+}
+
+gboolean jabber_chat_affiliation_list(JabberChat *chat, const char *affiliation)
+{
+	JabberIq *iq;
+	char *room_jid;
+	xmlnode *query, *item;
+
+	iq = jabber_iq_new_query(chat->js, JABBER_IQ_GET,
+			"http://jabber.org/protocol/muc#admin");
+
+	room_jid = g_strdup_printf("%s@%s", chat->room, chat->server);
+	xmlnode_set_attrib(iq->node, "to", room_jid);
+
+	query = xmlnode_get_child(iq->node, "query");
+	item = xmlnode_new_child(query, "item");
+	xmlnode_set_attrib(item, "affiliation", affiliation);
+
+	jabber_iq_set_callback(iq, jabber_chat_affiliation_list_cb, GINT_TO_POINTER(chat->id));
+	jabber_iq_send(iq);
+
+	return TRUE;
+}
+
 gboolean jabber_chat_role_user(JabberChat *chat, const char *who, const char *role)
 {
 	char *to;
@@ -957,6 +1008,67 @@ gboolean jabber_chat_role_user(JabberChat *chat, const char *who, const char *ro
 	return TRUE;
 }
 
+static void jabber_chat_role_list_cb(JabberStream *js, const char *from,
+                                     JabberIqType type, const char *id,
+                                     xmlnode *packet, gpointer data)
+{
+	JabberChat *chat;
+	xmlnode *query, *item;
+	int chat_id = GPOINTER_TO_INT(data);
+	GString *buf;
+
+	if(!(chat = jabber_chat_find_by_id(js, chat_id)))
+		return;
+
+	if (type == JABBER_IQ_ERROR)
+		return;
+
+	if(!(query = xmlnode_get_child(packet, "query")))
+		return;
+
+	buf = g_string_new(_("Roles:"));
+
+	item = xmlnode_get_child(query, "item");
+	if (item) {
+		for( ; item; item = xmlnode_get_next_twin(item)) {
+			const char *jid  = xmlnode_get_attrib(item, "jid");
+			const char *role = xmlnode_get_attrib(item, "role");
+			if (jid && role)
+				g_string_append_printf(buf, "\n%s %s", jid, role);
+	    }
+	} else {
+		buf = g_string_append_c(buf, '\n');
+		buf = g_string_append_len(buf, _("No users found"), -1);
+	}
+
+	purple_conv_chat_write(PURPLE_CONV_CHAT(chat->conv), "", buf->str,
+    	PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG, time(NULL));
+
+	g_string_free(buf, TRUE);
+}
+
+gboolean jabber_chat_role_list(JabberChat *chat, const char *role)
+{
+	JabberIq *iq;
+	char *room_jid;
+	xmlnode *query, *item;
+
+	iq = jabber_iq_new_query(chat->js, JABBER_IQ_GET,
+			"http://jabber.org/protocol/muc#admin");
+
+	room_jid = g_strdup_printf("%s@%s", chat->room, chat->server);
+	xmlnode_set_attrib(iq->node, "to", room_jid);
+
+	query = xmlnode_get_child(iq->node, "query");
+	item = xmlnode_new_child(query, "item");
+	xmlnode_set_attrib(item, "role", role);
+
+	jabber_iq_set_callback(iq, jabber_chat_role_list_cb, GINT_TO_POINTER(chat->id));
+	jabber_iq_send(iq);
+
+	return TRUE;
+}
+
 gboolean jabber_chat_kick_user(JabberChat *chat, const char *who, const char *why)
 {
 	JabberIq *iq;
@@ -988,13 +1100,17 @@ gboolean jabber_chat_kick_user(JabberChat *chat, const char *who, const char *wh
 	return TRUE;
 }
 
-static void jabber_chat_disco_traffic_cb(JabberStream *js, xmlnode *packet, gpointer data)
+static void jabber_chat_disco_traffic_cb(JabberStream *js, const char *from,
+                                         JabberIqType type, const char *id,
+                                         xmlnode *packet, gpointer data)
 {
 	JabberChat *chat;
-	/*xmlnode *query;*/
-	int id = GPOINTER_TO_INT(data);
+#if 0
+	xmlnode *query, *x;
+#endif
+	int chat_id = GPOINTER_TO_INT(data);
 
-	if(!(chat = jabber_chat_find_by_id(js, id)))
+	if(!(chat = jabber_chat_find_by_id(js, chat_id)))
 		return;
 
 	/* defaults, in case the conference server doesn't
@@ -1002,8 +1118,9 @@ static void jabber_chat_disco_traffic_cb(JabberStream *js, xmlnode *packet, gpoi
 	chat->xhtml = TRUE;
 
 	/* disabling this until more MUC servers support
-	 * announcing this
-	if(xmlnode_get_child(packet, "error")) {
+	 * announcing this */
+#if 0
+	if (type == JABBER_IQ_ERROR) {
 		return;
 	}
 
@@ -1019,7 +1136,7 @@ static void jabber_chat_disco_traffic_cb(JabberStream *js, xmlnode *packet, gpoi
 			chat->xhtml = TRUE;
 		}
 	}
-	*/
+#endif
 }
 
 void jabber_chat_disco_traffic(JabberChat *chat)
@@ -1046,5 +1163,59 @@ void jabber_chat_disco_traffic(JabberChat *chat)
 	g_free(room_jid);
 }
 
+typedef struct {
+	const gchar *cap;
+	gboolean *all_support;
+	JabberBuddy *jb;
+} JabberChatCapsData;
 
+static void
+jabber_chat_all_participants_have_capability_foreach(gpointer key,
+                                                     gpointer value,
+                                                     gpointer user_data)
+{
+	const gchar *cap = ((JabberChatCapsData *) user_data)->cap;
+	gboolean *all_support = ((JabberChatCapsData *) user_data)->all_support;
+	JabberBuddy *jb = ((JabberChatCapsData *) user_data)->jb;
+	JabberChatMember *member = (JabberChatMember *) value;
+	const gchar *resource = member->handle;
+	JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, resource);
+
+	if (jbr) {
+		*all_support &= jabber_resource_has_capability(jbr, cap);
+	} else {
+		*all_support = FALSE;
+	}
+}
+
+gboolean
+jabber_chat_all_participants_have_capability(const JabberChat *chat,
+	const gchar *cap)
+{
+	gchar *chat_jid = NULL;
+	JabberBuddy *jb = NULL;
+	gboolean all_support = TRUE;
+	JabberChatCapsData data;
+
+	chat_jid = g_strdup_printf("%s@%s", chat->room, chat->server);
+	jb = jabber_buddy_find(chat->js, chat_jid, FALSE);
+
+	if (jb) {
+		data.cap = cap;
+		data.all_support = &all_support;
+		data.jb = jb;
 
+		g_hash_table_foreach(chat->members,
+			jabber_chat_all_participants_have_capability_foreach, &data);
+	} else {
+		all_support = FALSE;
+	}
+	g_free(chat_jid);
+	return all_support;
+}
+
+guint
+jabber_chat_get_num_participants(const JabberChat *chat)
+{
+	return g_hash_table_size(chat->members);
+}
diff --git a/libpurple/protocols/jabber/chat.h b/libpurple/protocols/jabber/chat.h
index 64f924786a..26a12a37c6 100644
--- a/libpurple/protocols/jabber/chat.h
+++ b/libpurple/protocols/jabber/chat.h
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_CHAT_H_
-#define _PURPLE_JABBER_CHAT_H_
+#ifndef PURPLE_JABBER_CHAT_H_
+#define PURPLE_JABBER_CHAT_H_
 
 #include "internal.h"
 #include "connection.h"
@@ -81,8 +81,10 @@ gboolean jabber_chat_ban_user(JabberChat *chat, const char *who,
 		const char *why);
 gboolean jabber_chat_affiliate_user(JabberChat *chat, const char *who,
 		const char *affiliation);
+gboolean jabber_chat_affiliation_list(JabberChat *chat, const char *affiliation);
 gboolean jabber_chat_role_user(JabberChat *chat, const char *who,
 		const char *role);
+gboolean jabber_chat_role_list(JabberChat *chat, const char *role);
 gboolean jabber_chat_kick_user(JabberChat *chat, const char *who,
 		const char *why);
 
@@ -93,5 +95,8 @@ void jabber_chat_disco_traffic(JabberChat *chat);
 
 char *jabber_roomlist_room_serialize(PurpleRoomlistRoom *room);
 
+gboolean jabber_chat_all_participants_have_capability(const JabberChat *chat,
+	const gchar *cap);
+guint jabber_chat_get_num_participants(const JabberChat *chat);
 
-#endif /* _PURPLE_JABBER_CHAT_H_ */
+#endif /* PURPLE_JABBER_CHAT_H_ */
diff --git a/libpurple/protocols/jabber/data.c b/libpurple/protocols/jabber/data.c
index ba1d91ba33..37619650bf 100644
--- a/libpurple/protocols/jabber/data.c
+++ b/libpurple/protocols/jabber/data.c
@@ -200,25 +200,26 @@ jabber_data_associate_remote(JabberData *data)
 }
 
 void
-jabber_data_parse(JabberStream *js, xmlnode *packet)
+jabber_data_parse(JabberStream *js, const char *who, JabberIqType type,
+                  const char *id, xmlnode *data_node)
 {
 	JabberIq *result = NULL;
-	const char *who = xmlnode_get_attrib(packet, "from");
-	xmlnode *data_node = xmlnode_get_child(packet, "data");
-	const JabberData *data =
-		jabber_data_find_local_by_cid(xmlnode_get_attrib(data_node, "cid"));
+	const char *cid = xmlnode_get_attrib(data_node, "cid");
+	const JabberData *data = cid ? jabber_data_find_local_by_cid(cid) : NULL;
 
 	if (!data) {
 		xmlnode *item_not_found = xmlnode_new("item-not-found");
 
 		result = jabber_iq_new(js, JABBER_IQ_ERROR);
-		xmlnode_set_attrib(result->node, "to", who);
-		xmlnode_set_attrib(result->node, "id", xmlnode_get_attrib(packet, "id"));
+		if (who)
+			xmlnode_set_attrib(result->node, "to", who);
+		xmlnode_set_attrib(result->node, "id", id);
 		xmlnode_insert_child(result->node, item_not_found);
 	} else {
 		result = jabber_iq_new(js, JABBER_IQ_RESULT);
-		xmlnode_set_attrib(result->node, "to", who);
-		xmlnode_set_attrib(result->node, "id", xmlnode_get_attrib(packet, "id"));
+		if (who)
+			xmlnode_set_attrib(result->node, "to", who);
+		xmlnode_set_attrib(result->node, "id", id);
 		xmlnode_insert_child(result->node,
 							 jabber_data_get_xml_definition(data));
 	}
@@ -235,6 +236,8 @@ jabber_data_init(void)
 		g_free, jabber_data_delete);
 	remote_data_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal,
 		g_free, jabber_data_delete);
+
+	jabber_iq_register_handler("data", XEP_0231_NAMESPACE, jabber_data_parse);
 }
 
 void
@@ -244,4 +247,5 @@ jabber_data_uninit(void)
 	g_hash_table_destroy(local_data_by_alt);
 	g_hash_table_destroy(local_data_by_cid);
 	g_hash_table_destroy(remote_data_by_cid);
+	local_data_by_alt = local_data_by_cid = remote_data_by_cid = NULL;
 }
diff --git a/libpurple/protocols/jabber/data.h b/libpurple/protocols/jabber/data.h
index 5134de2777..764ed062a3 100644
--- a/libpurple/protocols/jabber/data.h
+++ b/libpurple/protocols/jabber/data.h
@@ -14,8 +14,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
  */
 
-#ifndef JABBER_DATA_H
-#define JABBER_DATA_H
+#ifndef PURPLE_JABBER_DATA_H
+#define PURPLE_JABBER_DATA_H
 
 #include "xmlnode.h"
 #include "jabber.h"
@@ -65,9 +65,10 @@ void jabber_data_associate_local(JabberData *data, const gchar *alt);
 void jabber_data_associate_remote(JabberData *data);
 
 /* handles iq requests */
-void jabber_data_parse(JabberStream *js, xmlnode *packet);
+void jabber_data_parse(JabberStream *js, const char *who, JabberIqType type,
+                       const char *id, xmlnode *data_node);
 
 void jabber_data_init(void);
 void jabber_data_uninit(void);
 
-#endif /* JABBER_DATA_H */
+#endif /* PURPLE_JABBER_DATA_H */
diff --git a/libpurple/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c
index 85e8524d67..39ba131f77 100644
--- a/libpurple/protocols/jabber/disco.c
+++ b/libpurple/protocols/jabber/disco.c
@@ -1,5 +1,5 @@
 /*
- * purple - Jabber Protocol Plugin
+ * purple - Jabber Service Discovery
  *
  * Copyright (C) 2003, Nathan Walp <faceprint@faceprint.com>
  *
@@ -22,32 +22,41 @@
 #include "internal.h"
 #include "prefs.h"
 #include "debug.h"
+#include "request.h"
 
+#include "adhoccommands.h"
 #include "buddy.h"
+#include "disco.h"
 #include "google.h"
 #include "iq.h"
-#include "disco.h"
 #include "jabber.h"
+#include "jingle/jingle.h"
+#include "pep.h"
 #include "presence.h"
 #include "roster.h"
-#include "pep.h"
-#include "adhoccommands.h"
-
+#include "useravatar.h"
 
 struct _jabber_disco_info_cb_data {
 	gpointer data;
 	JabberDiscoInfoCallback *callback;
 };
 
+struct _jabber_disco_items_cb_data {
+	gpointer data;
+	JabberDiscoItemsCallback *callback;
+};
+
 #define SUPPORT_FEATURE(x) { \
 	feature = xmlnode_new_child(query, "feature"); \
 	xmlnode_set_attrib(feature, "var", x); \
 }
 
 static void
-jabber_disco_bytestream_server_cb(JabberStream *js, xmlnode *packet, gpointer data) {
+jabber_disco_bytestream_server_cb(JabberStream *js, const char *from,
+                                  JabberIqType type, const char *id,
+                                  xmlnode *packet, gpointer data)
+{
 	JabberBytestreamsStreamhost *sh = data;
-	const char *from = xmlnode_get_attrib(packet, "from");
 	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
 		"http://jabber.org/protocol/bytestreams");
 
@@ -76,136 +85,149 @@ jabber_disco_bytestream_server_cb(JabberStream *js, xmlnode *packet, gpointer da
 
 	/* TODO: When we support zeroconf proxies, fix this to handle them */
 	if (!(sh->jid && sh->host && sh->port > 0)) {
+		js->bs_proxies = g_list_remove(js->bs_proxies, sh);
 		g_free(sh->jid);
 		g_free(sh->host);
 		g_free(sh->zeroconf);
 		g_free(sh);
-		js->bs_proxies = g_list_remove(js->bs_proxies, sh);
 	}
 }
 
 
-void jabber_disco_info_parse(JabberStream *js, xmlnode *packet) {
-	const char *from = xmlnode_get_attrib(packet, "from");
-	const char *type = xmlnode_get_attrib(packet, "type");
-
-	if(!from || !type)
-		return;
-
-	if(!strcmp(type, "get")) {
+void jabber_disco_info_parse(JabberStream *js, const char *from,
+                             JabberIqType type, const char *id,
+                             xmlnode *in_query)
+{
+	if(type == JABBER_IQ_GET) {
 		xmlnode *query, *identity, *feature;
 		JabberIq *iq;
+		const char *node = xmlnode_get_attrib(in_query, "node");
+		char *node_uri = NULL;
 
-		xmlnode *in_query;
-		const char *node = NULL;
-
-		if((in_query = xmlnode_get_child(packet, "query"))) {
-			node = xmlnode_get_attrib(in_query, "node");
-		}
-
+		/* create custom caps node URI */
+		node_uri = g_strconcat(CAPS0115_NODE, "#", jabber_caps_get_own_hash(js), NULL);
 
 		iq = jabber_iq_new_query(js, JABBER_IQ_RESULT,
 				"http://jabber.org/protocol/disco#info");
 
-		jabber_iq_set_id(iq, xmlnode_get_attrib(packet, "id"));
+		jabber_iq_set_id(iq, id);
 
-		xmlnode_set_attrib(iq->node, "to", from);
+		if (from)
+			xmlnode_set_attrib(iq->node, "to", from);
 		query = xmlnode_get_child(iq->node, "query");
 
 		if(node)
 			xmlnode_set_attrib(query, "node", node);
 
-		if(!node || !strcmp(node, CAPS0115_NODE "#" VERSION)) {
-			identity = xmlnode_new_child(query, "identity");
-			xmlnode_set_attrib(identity, "category", "client");
-			xmlnode_set_attrib(identity, "type", "pc"); /* XXX: bot, console,
-														 * handheld, pc, phone,
-														 * web */
-			xmlnode_set_attrib(identity, "name", PACKAGE);
-
-			SUPPORT_FEATURE("jabber:iq:last")
-			SUPPORT_FEATURE("jabber:iq:oob")
-			SUPPORT_FEATURE("jabber:iq:time")
-			SUPPORT_FEATURE("xmpp:urn:time")
-			SUPPORT_FEATURE("jabber:iq:version")
-			SUPPORT_FEATURE("jabber:x:conference")
-			SUPPORT_FEATURE("http://jabber.org/protocol/bytestreams")
-			SUPPORT_FEATURE("http://jabber.org/protocol/disco#info")
-			SUPPORT_FEATURE("http://jabber.org/protocol/disco#items")
-			SUPPORT_FEATURE("http://jabber.org/protocol/ibb");
-			SUPPORT_FEATURE("http://jabber.org/protocol/muc")
-			SUPPORT_FEATURE("http://jabber.org/protocol/muc#user")
-			SUPPORT_FEATURE("http://jabber.org/protocol/si")
-			SUPPORT_FEATURE("http://jabber.org/protocol/si/profile/file-transfer")
-			SUPPORT_FEATURE("http://jabber.org/protocol/xhtml-im")
-			SUPPORT_FEATURE("urn:xmpp:ping")
-			SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0199.html#ns")
-
-			if(!node) { /* non-caps disco#info, add all enabled extensions */
-				GList *features;
-				for(features = jabber_features; features; features = features->next) {
-					JabberFeature *feat = (JabberFeature*)features->data;
-					if(feat->is_enabled == NULL || feat->is_enabled(js, feat->shortname, feat->namespace) == TRUE)
-						SUPPORT_FEATURE(feat->namespace);
-				}
+		if(!node || g_str_equal(node, node_uri)) {
+			GList *features, *identities;
+			for(identities = jabber_identities; identities; identities = identities->next) {
+				JabberIdentity *ident = (JabberIdentity*)identities->data;
+				identity = xmlnode_new_child(query, "identity");
+				xmlnode_set_attrib(identity, "category", ident->category);
+				xmlnode_set_attrib(identity, "type", ident->type);
+				if (ident->lang)
+					xmlnode_set_attrib(identity, "xml:lang", ident->lang);
+				if (ident->name)
+					xmlnode_set_attrib(identity, "name", ident->name);
 			}
-		} else {
-			const char *ext = NULL;
-			unsigned pos;
-			unsigned nodelen = strlen(node);
-			unsigned capslen = strlen(CAPS0115_NODE);
-			/* do a basic plausability check */
-			if(nodelen > capslen+1) {
-				/* verify that the string is CAPS0115#<ext> and get the pointer to the ext part */
-				for(pos = 0; pos < capslen+1; ++pos) {
-					if(pos == capslen) {
-						if(node[pos] == '#')
-							ext = &node[pos+1];
-						else
-							break;
-					} else if(node[pos] != CAPS0115_NODE[pos])
-					break;
-				}
-
-				if(ext != NULL) {
-					/* look for that ext */
-					GList *features;
-					for(features = jabber_features; features; features = features->next) {
-						JabberFeature *feat = (JabberFeature*)features->data;
-						if(!strcmp(feat->shortname, ext)) {
-							SUPPORT_FEATURE(feat->namespace);
-							break;
-						}
-					}
-					if(features == NULL)
-						ext = NULL;
+			for(features = jabber_features; features; features = features->next) {
+				JabberFeature *feat = (JabberFeature*)features->data;
+				if (!feat->is_enabled || feat->is_enabled(js, feat->namespace)) {
+					feature = xmlnode_new_child(query, "feature");
+					xmlnode_set_attrib(feature, "var", feat->namespace);
 				}
 			}
+#ifdef USE_VV
+		} else if (g_str_equal(node, CAPS0115_NODE "#" "voice-v1")) {
+			/*
+			 * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+			 * where we add <c/> to the <presence/>) for the Google Talk
+			 * clients that don't actually check disco#info features.
+			 *
+			 * This specific feature is redundant but is what
+			 * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+			 * advertises as 'voice-v1'.
+			 */
+			xmlnode *feature = xmlnode_new_child(query, "feature");
+			xmlnode_set_attrib(feature, "var", "http://www.google.com/xmpp/protocol/voice/v1");
+		} else if (g_str_equal(node, CAPS0115_NODE "#" "video-v1")) {
+			/*
+			 * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+			 * where we add <c/> to the <presence/>) for the Google Talk
+			 * clients that don't actually check disco#info features.
+			 *
+			 * This specific feature is redundant but is what
+			 * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+			 * advertises as 'video-v1'.
+			 */
+			xmlnode *feature = xmlnode_new_child(query, "feature");
+			xmlnode_set_attrib(feature, "var", "http://www.google.com/xmpp/protocol/video/v1");
+		} else if (g_str_equal(node, CAPS0115_NODE "#" "camera-v1")) {
+			/*
+			 * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+			 * where we add <c/> to the <presence/>) for the Google Talk
+			 * clients that don't actually check disco#info features.
+			 *
+			 * This specific feature is redundant but is what
+			 * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+			 * advertises as 'camera-v1'.
+			 */
+			xmlnode *feature = xmlnode_new_child(query, "feature");
+			xmlnode_set_attrib(feature, "var", "http://www.google.com/xmpp/protocol/camera/v1");
+#endif
+		} else {
+			xmlnode *error, *inf;
 
-			if(ext == NULL) {
-				xmlnode *error, *inf;
-
-				/* XXX: gross hack, implement jabber_iq_set_type or something */
-				xmlnode_set_attrib(iq->node, "type", "error");
-				iq->type = JABBER_IQ_ERROR;
+			/* XXX: gross hack, implement jabber_iq_set_type or something */
+			xmlnode_set_attrib(iq->node, "type", "error");
+			iq->type = JABBER_IQ_ERROR;
 
-				error = xmlnode_new_child(query, "error");
-				xmlnode_set_attrib(error, "code", "404");
-				xmlnode_set_attrib(error, "type", "cancel");
-				inf = xmlnode_new_child(error, "item-not-found");
-				xmlnode_set_namespace(inf, "urn:ietf:params:xml:ns:xmpp-stanzas");
-			}
+			error = xmlnode_new_child(query, "error");
+			xmlnode_set_attrib(error, "code", "404");
+			xmlnode_set_attrib(error, "type", "cancel");
+			inf = xmlnode_new_child(error, "item-not-found");
+			xmlnode_set_namespace(inf, "urn:ietf:params:xml:ns:xmpp-stanzas");
 		}
+		g_free(node_uri);
+		jabber_iq_send(iq);
+	} else if (type == JABBER_IQ_SET) {
+		/* wtf? seriously. wtf‽ */
+		JabberIq *iq = jabber_iq_new(js, JABBER_IQ_ERROR);
+		xmlnode *error, *bad_request;
+
+		/* Free the <query/> */
+		xmlnode_free(xmlnode_get_child(iq->node, "query"));
+		/* Add an error */
+		error = xmlnode_new_child(iq->node, "error");
+		xmlnode_set_attrib(error, "type", "modify");
+		bad_request = xmlnode_new_child(error, "bad-request");
+		xmlnode_set_namespace(bad_request, "urn:ietf:params:xml:ns:xmpp-stanzas");
+
+		jabber_iq_set_id(iq, id);
+		if (from)
+			xmlnode_set_attrib(iq->node, "to", from);
 
 		jabber_iq_send(iq);
-	} else if(!strcmp(type, "result")) {
-		xmlnode *query = xmlnode_get_child(packet, "query");
+	}
+}
+
+static void jabber_disco_info_cb(JabberStream *js, const char *from,
+                                 JabberIqType type, const char *id,
+                                 xmlnode *packet, gpointer data)
+{
+	struct _jabber_disco_info_cb_data *jdicd = data;
+	xmlnode *query;
+
+	query = xmlnode_get_child_with_namespace(packet, "query",
+				"http://jabber.org/protocol/disco#info");
+
+	if (type == JABBER_IQ_RESULT && query) {
 		xmlnode *child;
 		JabberID *jid;
 		JabberBuddy *jb;
 		JabberBuddyResource *jbr = NULL;
 		JabberCapabilities capabilities = JABBER_CAP_NONE;
-		struct _jabber_disco_info_cb_data *jdicd;
 
 		if((jid = jabber_id_new(from))) {
 			if(jid->resource && (jb = jabber_buddy_find(js, from, TRUE)))
@@ -266,8 +288,10 @@ void jabber_disco_info_parse(JabberStream *js, xmlnode *packet) {
 					capabilities |= JABBER_CAP_IQ_SEARCH;
 				else if(!strcmp(var, "jabber:iq:register"))
 					capabilities |= JABBER_CAP_IQ_REGISTER;
-				else if(!strcmp(var, "http://www.xmpp.org/extensions/xep-0199.html#ns"))
+				else if(!strcmp(var, "urn:xmpp:ping"))
 					capabilities |= JABBER_CAP_PING;
+				else if(!strcmp(var, "http://jabber.org/protocol/disco#items"))
+					capabilities |= JABBER_CAP_ITEMS;
 				else if(!strcmp(var, "http://jabber.org/protocol/commands")) {
 					capabilities |= JABBER_CAP_ADHOC;
 				}
@@ -278,24 +302,20 @@ void jabber_disco_info_parse(JabberStream *js, xmlnode *packet) {
 			}
 		}
 
+		js->chat_servers = g_list_reverse(js->chat_servers);
+
 		capabilities |= JABBER_CAP_RETRIEVED;
 
 		if(jbr)
 			jbr->capabilities = capabilities;
 
-		if((jdicd = g_hash_table_lookup(js->disco_callbacks, from))) {
+		if (jdicd && jdicd->callback)
 			jdicd->callback(js, from, capabilities, jdicd->data);
-			g_hash_table_remove(js->disco_callbacks, from);
-		}
-	} else if(!strcmp(type, "error")) {
+	} else { /* type == JABBER_IQ_ERROR or query == NULL */
 		JabberID *jid;
 		JabberBuddy *jb;
 		JabberBuddyResource *jbr = NULL;
 		JabberCapabilities capabilities = JABBER_CAP_NONE;
-		struct _jabber_disco_info_cb_data *jdicd;
-
-		if(!(jdicd = g_hash_table_lookup(js->disco_callbacks, from)))
-			return;
 
 		if((jid = jabber_id_new(from))) {
 			if(jid->resource && (jb = jabber_buddy_find(js, from, TRUE)))
@@ -306,33 +326,31 @@ void jabber_disco_info_parse(JabberStream *js, xmlnode *packet) {
 		if(jbr)
 			capabilities = jbr->capabilities;
 
-		jdicd->callback(js, from, capabilities, jdicd->data);
-		g_hash_table_remove(js->disco_callbacks, from);
+		if (jdicd && jdicd->callback)
+			jdicd->callback(js, from, capabilities, jdicd->data);
 	}
-}
 
-void jabber_disco_items_parse(JabberStream *js, xmlnode *packet) {
-	const char *from = xmlnode_get_attrib(packet, "from");
-	const char *type = xmlnode_get_attrib(packet, "type");
+	g_free(jdicd);
+}
 
-	if(type && !strcmp(type, "get")) {
+void jabber_disco_items_parse(JabberStream *js, const char *from,
+                              JabberIqType type, const char *id,
+                              xmlnode *query)
+{
+	if(type == JABBER_IQ_GET) {
 		JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_RESULT,
 				"http://jabber.org/protocol/disco#items");
 
 		/* preserve node */
-		xmlnode *iq_query = xmlnode_get_child_with_namespace(iq->node,"query","http://jabber.org/protocol/disco#items");
-		if(iq_query) {
-			xmlnode *query = xmlnode_get_child_with_namespace(packet,"query","http://jabber.org/protocol/disco#items");
-			if(query) {
-				const char *node = xmlnode_get_attrib(query,"node");
-				if(node)
-					xmlnode_set_attrib(iq_query,"node",node);
-			}
-		}
+		xmlnode *iq_query = xmlnode_get_child(iq->node, "query");
+		const char *node = xmlnode_get_attrib(query, "node");
+		if(node)
+			xmlnode_set_attrib(iq_query,"node",node);
 
-		jabber_iq_set_id(iq, xmlnode_get_attrib(packet, "id"));
+		jabber_iq_set_id(iq, id);
 
-		xmlnode_set_attrib(iq->node, "to", from);
+		if (from)
+			xmlnode_set_attrib(iq->node, "to", from);
 		jabber_iq_send(iq);
 	}
 }
@@ -342,16 +360,21 @@ jabber_disco_finish_server_info_result_cb(JabberStream *js)
 {
 	const char *ft_proxies;
 
+	/*
+	 * This *should* happen only if the server supports vcard-temp, but there
+	 * are apparently some servers that don't advertise it even though they
+	 * support it.
+	 */
 	jabber_vcard_fetch_mine(js);
 
+	if (js->pep)
+		jabber_avatar_fetch_mine(js);
+
 	if (!(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) {
 		/* If the server supports JABBER_CAP_GOOGLE_ROSTER; we will have already requested it */
 		jabber_roster_request(js);
 	}
 
-	/* Send initial presence; this will trigger receipt of presence for contacts on the roster */
-	jabber_presence_send(js->gc->account, NULL);
-
 	if (js->server_caps & JABBER_CAP_ADHOC) {
 		/* The server supports ad-hoc commands, so let's request the list */
 		jabber_adhoc_server_get_list(js);
@@ -397,19 +420,18 @@ jabber_disco_finish_server_info_result_cb(JabberStream *js)
 }
 
 static void
-jabber_disco_server_info_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+jabber_disco_server_info_result_cb(JabberStream *js, const char *from,
+                                   JabberIqType type, const char *id,
+                                   xmlnode *packet, gpointer data)
 {
 	xmlnode *query, *child;
-	const char *from = xmlnode_get_attrib(packet, "from");
-	const char *type = xmlnode_get_attrib(packet, "type");
 
-	if((!from || !type) ||
-	   (strcmp(from, js->user->domain))) {
+	if (!from || strcmp(from, js->user->domain)) {
 		jabber_disco_finish_server_info_result_cb(js);
 		return;
 	}
 
-	if(strcmp(type, "result")) {
+	if (type == JABBER_IQ_ERROR) {
 		/* A common way to get here is for the server not to support xmlns http://jabber.org/protocol/disco#info */
 		jabber_disco_finish_server_info_result_cb(js);
 		return;
@@ -443,6 +465,11 @@ jabber_disco_server_info_result_cb(JabberStream *js, xmlnode *packet, gpointer d
 		if (!strcmp(name, "Google Talk")) {
 			purple_debug_info("jabber", "Google Talk!\n");
 			js->googletalk = TRUE;
+
+			/* autodiscover stun and relays */
+			jabber_google_send_jingle_info(js);
+		} else {
+			/* TODO: add external service discovery here... */
 		}
 	}
 
@@ -470,19 +497,16 @@ jabber_disco_server_info_result_cb(JabberStream *js, xmlnode *packet, gpointer d
 }
 
 static void
-jabber_disco_server_items_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+jabber_disco_server_items_result_cb(JabberStream *js, const char *from,
+                                    JabberIqType type, const char *id,
+                                    xmlnode *packet, gpointer data)
 {
 	xmlnode *query, *child;
-	const char *from = xmlnode_get_attrib(packet, "from");
-	const char *type = xmlnode_get_attrib(packet, "type");
-
-	if(!from || !type)
-		return;
 
-	if(strcmp(from, js->user->domain))
+	if (!from || strcmp(from, js->user->domain) != 0)
 		return;
 
-	if(strcmp(type, "result"))
+	if (type == JABBER_IQ_ERROR)
 		return;
 
 	while(js->chat_servers) {
@@ -507,6 +531,7 @@ jabber_disco_server_items_result_cb(JabberStream *js, xmlnode *packet, gpointer
 
 		iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
 		xmlnode_set_attrib(iq->node, "to", jid);
+		jabber_iq_set_callback(iq, jabber_disco_info_cb, NULL);
 		jabber_iq_send(iq);
 	}
 }
@@ -550,12 +575,10 @@ void jabber_disco_info_do(JabberStream *js, const char *who, JabberDiscoInfoCall
 	jdicd->data = data;
 	jdicd->callback = callback;
 
-	g_hash_table_insert(js->disco_callbacks, g_strdup(who), jdicd);
-
 	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
 	xmlnode_set_attrib(iq->node, "to", who);
 
+	jabber_iq_set_callback(iq, jabber_disco_info_cb, jdicd);
 	jabber_iq_send(iq);
 }
 
-
diff --git a/libpurple/protocols/jabber/disco.h b/libpurple/protocols/jabber/disco.h
index 04e17853bd..7f76985420 100644
--- a/libpurple/protocols/jabber/disco.h
+++ b/libpurple/protocols/jabber/disco.h
@@ -1,5 +1,5 @@
 /**
- * @file iq.h JabberID handlers
+ * @file disco.h Jabber Service Discovery
  *
  * purple
  *
@@ -19,20 +19,31 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_DISCO_H_
-#define _PURPLE_JABBER_DISCO_H_
+#ifndef PURPLE_JABBER_DISCO_H_
+#define PURPLE_JABBER_DISCO_H_
 
 #include "jabber.h"
 
+typedef struct _JabberDiscoItem {
+	const char *jid;  /* MUST */
+	const char *node; /* SHOULD */
+	const char *name; /* MAY */
+} JabberDiscoItem;
+
 typedef void (JabberDiscoInfoCallback)(JabberStream *js, const char *who,
 		JabberCapabilities capabilities, gpointer data);
 
-void jabber_disco_info_parse(JabberStream *js, xmlnode *packet);
-void jabber_disco_items_parse(JabberStream *js, xmlnode *packet);
+typedef void (JabberDiscoItemsCallback)(JabberStream *js, const char *jid,
+		const char *node, GSList *items, gpointer data);
+
+void jabber_disco_info_parse(JabberStream *js, const char *from,
+                             JabberIqType type, const char *id, xmlnode *in_query);
+void jabber_disco_items_parse(JabberStream *js, const char *from,
+                              JabberIqType type, const char *id, xmlnode *query);
 
 void jabber_disco_items_server(JabberStream *js);
 
 void jabber_disco_info_do(JabberStream *js, const char *who,
 		JabberDiscoInfoCallback *callback, gpointer data);
 
-#endif /* _PURPLE_JABBER_DISCO_H_ */
+#endif /* PURPLE_JABBER_DISCO_H_ */
diff --git a/libpurple/protocols/jabber/google.c b/libpurple/protocols/jabber/google.c
index 70c184fa8b..3fdd92e9d3 100644
--- a/libpurple/protocols/jabber/google.c
+++ b/libpurple/protocols/jabber/google.c
@@ -20,8 +20,11 @@
 
 #include "internal.h"
 #include "debug.h"
+#include "mediamanager.h"
 #include "util.h"
 #include "privacy.h"
+#include "dnsquery.h"
+#include "network.h"
 
 #include "buddy.h"
 #include "google.h"
@@ -29,24 +32,774 @@
 #include "presence.h"
 #include "iq.h"
 
+#include "jingle/jingle.h"
+
+#ifdef USE_VV
+
+#define NS_GOOGLE_VIDEO "http://www.google.com/session/video"
+#define NS_GOOGLE_PHONE "http://www.google.com/session/phone"
+
+typedef struct {
+	char *id;
+	char *initiator;
+} GoogleSessionId;
+
+typedef enum {
+	UNINIT,
+	SENT_INITIATE,
+	RECEIVED_INITIATE,
+	IN_PRORESS,
+	TERMINATED
+} GoogleSessionState;
+
+typedef struct {
+	GoogleSessionId id;
+	GoogleSessionState state;
+	PurpleMedia *media;
+	JabberStream *js;
+	char *remote_jid;
+	gboolean video;
+} GoogleSession;
+
+static gboolean
+google_session_id_equal(gconstpointer a, gconstpointer b)
+{
+	GoogleSessionId *c = (GoogleSessionId*)a;
+	GoogleSessionId *d = (GoogleSessionId*)b;
+
+	return !strcmp(c->id, d->id) && !strcmp(c->initiator, d->initiator);
+}
+
+static void
+google_session_destroy(GoogleSession *session)
+{
+	g_free(session->id.id);
+	g_free(session->id.initiator);
+	g_free(session->remote_jid);
+	g_free(session);
+}
+
+static xmlnode *
+google_session_create_xmlnode(GoogleSession *session, const char *type)
+{
+	xmlnode *node = xmlnode_new("session");
+	xmlnode_set_namespace(node, "http://www.google.com/session");
+	xmlnode_set_attrib(node, "id", session->id.id);
+	xmlnode_set_attrib(node, "initiator", session->id.initiator);
+	xmlnode_set_attrib(node, "type", type);
+	return node;
+}
+
+static void
+google_session_send_terminate(GoogleSession *session)
+{
+	xmlnode *sess;
+	JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
+
+	xmlnode_set_attrib(iq->node, "to", session->remote_jid);
+	sess = google_session_create_xmlnode(session, "terminate");
+	xmlnode_insert_child(iq->node, sess);
+
+	jabber_iq_send(iq);
+	google_session_destroy(session);
+}
+
+static void
+google_session_send_candidates(PurpleMedia *media, gchar *session_id,
+		gchar *participant, GoogleSession *session)
+{
+	GList *candidates = purple_media_get_local_candidates(
+			session->media, session_id, session->remote_jid);
+	PurpleMediaCandidate *transport;
+	gboolean video = FALSE;
+
+	if (!strcmp(session_id, "google-video"))
+		video = TRUE;
+
+	for (;candidates;candidates = candidates->next) {
+		JabberIq *iq;
+		gchar *ip, *port, *pref, *username, *password;
+		PurpleMediaCandidateType type;
+		xmlnode *sess;
+		xmlnode *candidate;
+		guint component_id;
+		transport = (PurpleMediaCandidate*)(candidates->data);
+		component_id = purple_media_candidate_get_component_id(
+				transport);
+
+		iq = jabber_iq_new(session->js, JABBER_IQ_SET);
+		sess = google_session_create_xmlnode(session, "candidates");
+		xmlnode_insert_child(iq->node, sess);
+		xmlnode_set_attrib(iq->node, "to", session->remote_jid);
+
+		candidate = xmlnode_new("candidate");
+
+		ip = purple_media_candidate_get_ip(transport);
+		port = g_strdup_printf("%d",
+				purple_media_candidate_get_port(transport));
+		pref = g_strdup_printf("%f",
+				purple_media_candidate_get_priority(transport)
+				/1000.0);
+		username = purple_media_candidate_get_username(transport);
+		password = purple_media_candidate_get_password(transport);
+		type = purple_media_candidate_get_candidate_type(transport);
+
+		xmlnode_set_attrib(candidate, "address", ip);
+		xmlnode_set_attrib(candidate, "port", port);
+		xmlnode_set_attrib(candidate, "name",
+				component_id == PURPLE_MEDIA_COMPONENT_RTP ?
+				video ? "video_rtp" : "rtp" :
+				component_id == PURPLE_MEDIA_COMPONENT_RTCP ?
+				video ? "video_rtcp" : "rtcp" : "none");
+		xmlnode_set_attrib(candidate, "username", username);
+		/*
+		 * As of this writing, Farsight 2 in Google compatibility
+		 * mode doesn't provide a password. The Gmail client
+		 * requires this to be set.
+		 */
+		xmlnode_set_attrib(candidate, "password",
+				password != NULL ? password : "");
+		xmlnode_set_attrib(candidate, "preference", pref);
+		xmlnode_set_attrib(candidate, "protocol",
+				purple_media_candidate_get_protocol(transport)
+				== PURPLE_MEDIA_NETWORK_PROTOCOL_UDP ?
+				"udp" : "tcp");
+		xmlnode_set_attrib(candidate, "type", type ==
+				PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "local" :
+						      type ==
+				PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "stun" :
+					       	      type ==
+				PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" :
+				NULL);
+		xmlnode_set_attrib(candidate, "generation", "0");
+		xmlnode_set_attrib(candidate, "network", "0");
+		xmlnode_insert_child(sess, candidate);
+
+		g_free(ip);
+		g_free(port);
+		g_free(pref);
+		g_free(username);
+		g_free(password);
+
+		jabber_iq_send(iq);
+	}
+}
+
+static void
+google_session_ready(GoogleSession *session)
+{
+	PurpleMedia *media = session->media;
+	if (purple_media_codecs_ready(media, NULL) &&
+			purple_media_candidates_prepared(media, NULL, NULL)) {
+		gchar *me = g_strdup_printf("%s@%s/%s",
+				session->js->user->node,
+				session->js->user->domain,
+				session->js->user->resource);
+		JabberIq *iq;
+		xmlnode *sess, *desc, *payload;
+		GList *codecs, *iter;
+		gboolean is_initiator = !strcmp(session->id.initiator, me);
+
+		if (!is_initiator &&
+				!purple_media_accepted(media, NULL, NULL)) {
+			g_free(me);
+			return;
+		}
+
+		iq = jabber_iq_new(session->js, JABBER_IQ_SET);
+
+		if (is_initiator) {
+			xmlnode_set_attrib(iq->node, "to", session->remote_jid);
+			xmlnode_set_attrib(iq->node, "from", session->id.initiator);
+			sess = google_session_create_xmlnode(session, "initiate");
+		} else {
+			google_session_send_candidates(session->media,
+					"google-voice", session->remote_jid,
+					session);
+			google_session_send_candidates(session->media,
+					"google-video", session->remote_jid,
+					session);
+			xmlnode_set_attrib(iq->node, "to", session->remote_jid);
+			xmlnode_set_attrib(iq->node, "from", me);
+			sess = google_session_create_xmlnode(session, "accept");
+		}
+		xmlnode_insert_child(iq->node, sess);
+		desc = xmlnode_new_child(sess, "description");
+		if (session->video)
+			xmlnode_set_namespace(desc, NS_GOOGLE_VIDEO);
+		else
+			xmlnode_set_namespace(desc, NS_GOOGLE_PHONE);
+
+		codecs = purple_media_get_codecs(media, "google-video");
+
+		for (iter = codecs; iter; iter = g_list_next(iter)) {
+			PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data;
+			gchar *id = g_strdup_printf("%d",
+					purple_media_codec_get_id(codec));
+			gchar *encoding_name =
+					purple_media_codec_get_encoding_name(codec);
+			payload = xmlnode_new_child(desc, "payload-type");
+			xmlnode_set_attrib(payload, "id", id);
+			xmlnode_set_attrib(payload, "name", encoding_name);
+			xmlnode_set_attrib(payload, "width", "320");
+			xmlnode_set_attrib(payload, "height", "200");
+			xmlnode_set_attrib(payload, "framerate", "30");
+			g_free(encoding_name);
+			g_free(id);
+		}
+		purple_media_codec_list_free(codecs);
+
+		codecs = purple_media_get_codecs(media, "google-voice");
+
+		for (iter = codecs; iter; iter = g_list_next(iter)) {
+			PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data;
+			gchar *id = g_strdup_printf("%d",
+					purple_media_codec_get_id(codec));
+			gchar *encoding_name =
+					purple_media_codec_get_encoding_name(codec);
+			gchar *clock_rate = g_strdup_printf("%d",
+					purple_media_codec_get_clock_rate(codec));
+			payload = xmlnode_new_child(desc, "payload-type");
+			if (session->video)
+				xmlnode_set_namespace(payload, NS_GOOGLE_PHONE);
+			xmlnode_set_attrib(payload, "id", id);
+			/*
+			 * Hack to make Gmail accept speex as the codec.
+			 * It shouldn't have to be case sensitive.
+			 */
+			if (purple_strequal(encoding_name, "SPEEX"))
+				xmlnode_set_attrib(payload, "name", "speex");
+			else
+				xmlnode_set_attrib(payload, "name", encoding_name);
+			xmlnode_set_attrib(payload, "clockrate", clock_rate);
+			g_free(clock_rate);
+			g_free(encoding_name);
+			g_free(id);
+		}
+		purple_media_codec_list_free(codecs);
+
+		jabber_iq_send(iq);
+
+		if (is_initiator) {
+			google_session_send_candidates(session->media,
+					"google-voice", session->remote_jid,
+					session);
+			google_session_send_candidates(session->media,
+					"google-video", session->remote_jid,
+					session);
+		}
+
+		g_signal_handlers_disconnect_by_func(G_OBJECT(session->media),
+				G_CALLBACK(google_session_ready), session);
+	}
+}
+
+static void
+google_session_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
+		gchar *sid, gchar *name, GoogleSession *session)
+{
+	if (sid == NULL && name == NULL) {
+		if (state == PURPLE_MEDIA_STATE_END) {
+			google_session_destroy(session);
+		}
+	}
+}
+
+static void
+google_session_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
+		gchar *sid, gchar *name, gboolean local,
+		GoogleSession *session)
+{
+	if (type == PURPLE_MEDIA_INFO_HANGUP) {
+		xmlnode *sess;
+		JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
+
+		xmlnode_set_attrib(iq->node, "to", session->remote_jid);
+		sess = google_session_create_xmlnode(session, "terminate");
+		xmlnode_insert_child(iq->node, sess);
+
+		jabber_iq_send(iq);
+	} else if (type == PURPLE_MEDIA_INFO_REJECT) {
+		xmlnode *sess;
+		JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
+
+		xmlnode_set_attrib(iq->node, "to", session->remote_jid);
+		sess = google_session_create_xmlnode(session, "reject");
+		xmlnode_insert_child(iq->node, sess);
+
+		jabber_iq_send(iq);
+	}
+}
+
+static GParameter *
+jabber_google_session_get_params(JabberStream *js, guint *num)
+{
+	guint num_params;
+	GParameter *params = jingle_get_params(js, &num_params);
+	GParameter *new_params = g_new0(GParameter, num_params + 1);
+
+	memcpy(new_params, params, sizeof(GParameter) * num_params);
+
+	purple_debug_info("jabber", "setting Google jingle compatibility param\n");
+	new_params[num_params].name = "compatibility-mode";
+	g_value_init(&new_params[num_params].value, G_TYPE_UINT);
+	g_value_set_uint(&new_params[num_params].value, 1); /* NICE_COMPATIBILITY_GOOGLE */
+
+	g_free(params);
+	*num = num_params + 1;
+	return new_params;
+}
+
+
+gboolean
+jabber_google_session_initiate(JabberStream *js, const gchar *who, PurpleMediaSessionType type)
+{
+	GoogleSession *session;
+	JabberBuddy *jb;
+	JabberBuddyResource *jbr;
+	gchar *jid;
+	GParameter *params;
+	guint num_params;
+
+	/* construct JID to send to */
+	jb = jabber_buddy_find(js, who, FALSE);
+	if (!jb) {
+		purple_debug_error("jingle-rtp",
+				"Could not find Jabber buddy\n");
+		return FALSE;
+	}
+	jbr = jabber_buddy_find_resource(jb, NULL);
+	if (!jbr) {
+		purple_debug_error("jingle-rtp",
+				"Could not find buddy's resource\n");
+	}
+
+	if ((strchr(who, '/') == NULL) && jbr && (jbr->name != NULL)) {
+		jid = g_strdup_printf("%s/%s", who, jbr->name);
+	} else {
+		jid = g_strdup(who);
+	}
+
+	session = g_new0(GoogleSession, 1);
+	session->id.id = jabber_get_next_id(js);
+	session->id.initiator = g_strdup_printf("%s@%s/%s", js->user->node,
+			js->user->domain, js->user->resource);
+	session->state = SENT_INITIATE;
+	session->js = js;
+	session->remote_jid = jid;
+
+	if (type & PURPLE_MEDIA_VIDEO)
+		session->video = TRUE;
+
+	session->media = purple_media_manager_create_media(
+			purple_media_manager_get(),
+			purple_connection_get_account(js->gc),
+			"fsrtpconference", session->remote_jid, TRUE);
+
+	purple_media_set_prpl_data(session->media, session);
+
+	params = jabber_google_session_get_params(js, &num_params);
+
+	if (purple_media_add_stream(session->media, "google-voice",
+			session->remote_jid, PURPLE_MEDIA_AUDIO,
+			TRUE, "nice", num_params, params) == FALSE ||
+			(session->video && purple_media_add_stream(
+			session->media, "google-video",
+			session->remote_jid, PURPLE_MEDIA_VIDEO,
+			TRUE, "nice", num_params, params) == FALSE)) {
+		purple_media_error(session->media, "Error adding stream.");
+		purple_media_stream_info(session->media,
+				PURPLE_MEDIA_INFO_HANGUP, NULL, NULL, TRUE);
+		google_session_destroy(session);
+		g_free(params);
+		return FALSE;
+	}
+
+	g_signal_connect_swapped(G_OBJECT(session->media),
+			"candidates-prepared",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect_swapped(G_OBJECT(session->media), "codecs-changed",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect(G_OBJECT(session->media), "state-changed",
+			G_CALLBACK(google_session_state_changed_cb), session);
+	g_signal_connect(G_OBJECT(session->media), "stream-info",
+			G_CALLBACK(google_session_stream_info_cb), session);
+
+	g_free(params);
+
+	return (session->media != NULL) ? TRUE : FALSE;
+}
+
+static gboolean
+google_session_handle_initiate(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
+{
+	JabberIq *result;
+	GList *codecs = NULL, *video_codecs = NULL;
+	xmlnode *desc_element, *codec_element;
+	PurpleMediaCodec *codec;
+	const char *xmlns;
+	GParameter *params;
+	guint num_params;
+
+	if (session->state != UNINIT) {
+		purple_debug_error("jabber", "Received initiate for active session.\n");
+		return FALSE;
+	}
+
+	desc_element = xmlnode_get_child(sess, "description");
+	xmlns = xmlnode_get_namespace(desc_element);
+
+	if (purple_strequal(xmlns, NS_GOOGLE_PHONE))
+		session->video = FALSE;
+	else if (purple_strequal(xmlns, NS_GOOGLE_VIDEO))
+		session->video = TRUE;
+	else {
+		purple_debug_error("jabber", "Received initiate with "
+				"invalid namespace %s.\n", xmlns);
+		return FALSE;
+	}
+
+	session->media = purple_media_manager_create_media(
+			purple_media_manager_get(),
+			purple_connection_get_account(js->gc),
+			"fsrtpconference", session->remote_jid, FALSE);
+
+	purple_media_set_prpl_data(session->media, session);
+
+	params = jabber_google_session_get_params(js, &num_params);
+
+	if (purple_media_add_stream(session->media, "google-voice",
+			session->remote_jid, PURPLE_MEDIA_AUDIO, FALSE,
+			"nice", num_params, params) == FALSE ||
+			(session->video && purple_media_add_stream(
+			session->media, "google-video",
+			session->remote_jid, PURPLE_MEDIA_VIDEO,
+			FALSE, "nice", num_params, params) == FALSE)) {
+		purple_media_error(session->media, "Error adding stream.");
+		purple_media_stream_info(session->media,
+				PURPLE_MEDIA_INFO_HANGUP, NULL, NULL, TRUE);
+		google_session_send_terminate(session);
+		g_free(params);
+		return FALSE;
+	}
+
+	g_free(params);
+
+	for (codec_element = xmlnode_get_child(desc_element, "payload-type");
+	     codec_element; codec_element = codec_element->next) {
+		const char *id, *encoding_name,  *clock_rate,
+				*width, *height, *framerate;
+		gboolean video;
+		if (codec_element->name &&
+				strcmp(codec_element->name, "payload-type"))
+			continue;
+
+		xmlns = xmlnode_get_namespace(codec_element);
+		encoding_name = xmlnode_get_attrib(codec_element, "name");
+		id = xmlnode_get_attrib(codec_element, "id");
+
+		if (!session->video ||
+				(xmlns && !strcmp(xmlns, NS_GOOGLE_PHONE))) {
+			clock_rate = xmlnode_get_attrib(
+					codec_element, "clockrate");
+			video = FALSE;
+		} else {
+			width = xmlnode_get_attrib(codec_element, "width");
+			height = xmlnode_get_attrib(codec_element, "height");
+			framerate = xmlnode_get_attrib(
+					codec_element, "framerate");
+			clock_rate = "90000";
+			video = TRUE;
+		}
+
+		if (id) {
+			codec = purple_media_codec_new(atoi(id), encoding_name,
+					video ?	PURPLE_MEDIA_VIDEO :
+					PURPLE_MEDIA_AUDIO,
+					clock_rate ? atoi(clock_rate) : 0);
+			if (video)
+				video_codecs = g_list_append(
+						video_codecs, codec);
+			else
+				codecs = g_list_append(codecs, codec);
+		}
+	}
+
+	if (codecs)
+		purple_media_set_remote_codecs(session->media, "google-voice",
+				session->remote_jid, codecs);
+	if (video_codecs)
+		purple_media_set_remote_codecs(session->media, "google-video",
+				session->remote_jid, video_codecs);
+
+	purple_media_codec_list_free(codecs);
+	purple_media_codec_list_free(video_codecs);
+
+	g_signal_connect_swapped(G_OBJECT(session->media), "accepted",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect_swapped(G_OBJECT(session->media),
+			"candidates-prepared",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect_swapped(G_OBJECT(session->media), "codecs-changed",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect(G_OBJECT(session->media), "state-changed",
+			G_CALLBACK(google_session_state_changed_cb), session);
+	g_signal_connect(G_OBJECT(session->media), "stream-info",
+			G_CALLBACK(google_session_stream_info_cb), session);
+
+	result = jabber_iq_new(js, JABBER_IQ_RESULT);
+	jabber_iq_set_id(result, iq_id);
+	xmlnode_set_attrib(result->node, "to", session->remote_jid);
+	jabber_iq_send(result);
+
+	return TRUE;
+}
+
+static void
+google_session_handle_candidates(JabberStream  *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
+{
+	JabberIq *result;
+	GList *list = NULL, *video_list = NULL;
+	xmlnode *cand;
+	static int name = 0;
+	char n[4];
+
+	for (cand = xmlnode_get_child(sess, "candidate"); cand;
+			cand = xmlnode_get_next_twin(cand)) {
+		PurpleMediaCandidate *info;
+		const gchar *cname = xmlnode_get_attrib(cand, "name");
+		const gchar *type = xmlnode_get_attrib(cand, "type");
+		const gchar *protocol = xmlnode_get_attrib(cand, "protocol");
+		const gchar *address = xmlnode_get_attrib(cand, "address");
+		const gchar *port = xmlnode_get_attrib(cand, "port");
+		guint component_id;
+
+		if (cname && type && address && port) {
+			PurpleMediaCandidateType candidate_type;
+
+			g_snprintf(n, sizeof(n), "S%d", name++);
+
+			if (g_str_equal(type, "local"))
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
+			else if (g_str_equal(type, "stun"))
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX;
+			else if (g_str_equal(type, "relay"))
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_RELAY;
+			else
+				candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
+
+			if (purple_strequal(cname, "rtcp") ||
+					purple_strequal(cname, "video_rtcp"))
+				component_id = PURPLE_MEDIA_COMPONENT_RTCP;
+			else
+				component_id = PURPLE_MEDIA_COMPONENT_RTP;
+
+			info = purple_media_candidate_new(n, component_id,
+					candidate_type,
+					purple_strequal(protocol, "udp") ?
+							PURPLE_MEDIA_NETWORK_PROTOCOL_UDP :
+							PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
+					address,
+					atoi(port));
+			g_object_set(info, "username", xmlnode_get_attrib(cand, "username"),
+					"password", xmlnode_get_attrib(cand, "password"), NULL);
+			if (!strncmp(cname, "video_", 6))
+				video_list = g_list_append(video_list, info);
+			else
+				list = g_list_append(list, info);
+		}
+	}
+
+	if (list)
+		purple_media_add_remote_candidates(
+				session->media, "google-voice",
+				session->remote_jid, list);
+	if (video_list)
+		purple_media_add_remote_candidates(
+				session->media, "google-video",
+				session->remote_jid, video_list);
+	purple_media_candidate_list_free(list);
+	purple_media_candidate_list_free(video_list);
+
+	result = jabber_iq_new(js, JABBER_IQ_RESULT);
+	jabber_iq_set_id(result, iq_id);
+	xmlnode_set_attrib(result->node, "to", session->remote_jid);
+	jabber_iq_send(result);
+}
+
+static void
+google_session_handle_accept(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
+{
+	xmlnode *desc_element = xmlnode_get_child(sess, "description");
+	xmlnode *codec_element = xmlnode_get_child(
+			desc_element, "payload-type");
+	GList *codecs = NULL, *video_codecs = NULL;
+	JabberIq *result = NULL;
+	const gchar *xmlns = xmlnode_get_namespace(desc_element);
+	gboolean video = (xmlns && !strcmp(xmlns, NS_GOOGLE_VIDEO));
+
+	for (; codec_element; codec_element = codec_element->next) {
+		const gchar *xmlns, *encoding_name, *id,
+				*clock_rate, *width, *height, *framerate;
+		gboolean video_codec = FALSE;
+
+		if (!purple_strequal(codec_element->name, "payload-type"))
+			continue;
+
+		xmlns = xmlnode_get_namespace(codec_element);
+		encoding_name =	xmlnode_get_attrib(codec_element, "name");
+		id = xmlnode_get_attrib(codec_element, "id");
+
+		if (!video || purple_strequal(xmlns, NS_GOOGLE_PHONE))
+			clock_rate = xmlnode_get_attrib(
+					codec_element, "clockrate");
+		else {
+			clock_rate = "90000";
+			width = xmlnode_get_attrib(codec_element, "width");
+			height = xmlnode_get_attrib(codec_element, "height");
+			framerate = xmlnode_get_attrib(
+					codec_element, "framerate");
+			video_codec = TRUE;
+		}
+
+		if (id && encoding_name) {
+			PurpleMediaCodec *codec = purple_media_codec_new(
+					atoi(id), encoding_name,
+					video_codec ? PURPLE_MEDIA_VIDEO :
+					PURPLE_MEDIA_AUDIO,
+					clock_rate ? atoi(clock_rate) : 0);
+			if (video_codec)
+				video_codecs = g_list_append(
+						video_codecs, codec);
+			else
+				codecs = g_list_append(codecs, codec);
+		}
+	}
+
+	if (codecs)
+		purple_media_set_remote_codecs(session->media, "google-voice",
+				session->remote_jid, codecs);
+	if (video_codecs)
+		purple_media_set_remote_codecs(session->media, "google-video",
+				session->remote_jid, video_codecs);
+
+	purple_media_stream_info(session->media, PURPLE_MEDIA_INFO_ACCEPT,
+			NULL, NULL, FALSE);
+
+	result = jabber_iq_new(js, JABBER_IQ_RESULT);
+	jabber_iq_set_id(result, iq_id);
+	xmlnode_set_attrib(result->node, "to", session->remote_jid);
+	jabber_iq_send(result);
+}
+
+static void
+google_session_handle_reject(JabberStream *js, GoogleSession *session, xmlnode *sess)
+{
+	purple_media_end(session->media, NULL, NULL);
+}
+
+static void
+google_session_handle_terminate(JabberStream *js, GoogleSession *session, xmlnode *sess)
+{
+	purple_media_end(session->media, NULL, NULL);
+}
+
+static void
+google_session_parse_iq(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
+{
+	const char *type = xmlnode_get_attrib(sess, "type");
+
+	if (!strcmp(type, "initiate")) {
+		google_session_handle_initiate(js, session, sess, iq_id);
+	} else if (!strcmp(type, "accept")) {
+		google_session_handle_accept(js, session, sess, iq_id);
+	} else if (!strcmp(type, "reject")) {
+		google_session_handle_reject(js, session, sess);
+	} else if (!strcmp(type, "terminate")) {
+		google_session_handle_terminate(js, session, sess);
+	} else if (!strcmp(type, "candidates")) {
+		google_session_handle_candidates(js, session, sess, iq_id);
+	}
+}
+
+void
+jabber_google_session_parse(JabberStream *js, const char *from,
+                            JabberIqType type, const char *iq_id,
+                            xmlnode *session_node)
+{
+	GoogleSession *session = NULL;
+	GoogleSessionId id;
+
+	xmlnode *desc_node;
+
+	GList *iter = NULL;
+
+	if (type != JABBER_IQ_SET)
+		return;
+
+	id.id = (gchar*)xmlnode_get_attrib(session_node, "id");
+	if (!id.id)
+		return;
+
+	id.initiator = (gchar*)xmlnode_get_attrib(session_node, "initiator");
+	if (!id.initiator)
+		return;
+
+	iter = purple_media_manager_get_media_by_account(
+			purple_media_manager_get(),
+			purple_connection_get_account(js->gc));
+	for (; iter; iter = g_list_delete_link(iter, iter)) {
+		GoogleSession *gsession =
+				purple_media_get_prpl_data(iter->data);
+		if (google_session_id_equal(&(gsession->id), &id)) {
+			session = gsession;
+			break;
+		}
+	}
+	if (iter != NULL) {
+		g_list_free(iter);
+	}
+
+	if (session) {
+		google_session_parse_iq(js, session, session_node, iq_id);
+		return;
+	}
+
+	/* If the session doesn't exist, this has to be an initiate message */
+	if (strcmp(xmlnode_get_attrib(session_node, "type"), "initiate"))
+		return;
+	desc_node = xmlnode_get_child(session_node, "description");
+	if (!desc_node)
+		return;
+	session = g_new0(GoogleSession, 1);
+	session->id.id = g_strdup(id.id);
+	session->id.initiator = g_strdup(id.initiator);
+	session->state = UNINIT;
+	session->js = js;
+	session->remote_jid = g_strdup(session->id.initiator);
+
+	if (!google_session_handle_initiate(js, session, session_node, iq_id))
+		google_session_destroy(session);
+}
+#endif /* USE_VV */
+
 static void
-jabber_gmail_parse(JabberStream *js, xmlnode *packet, gpointer nul)
+jabber_gmail_parse(JabberStream *js, const char *from,
+                   JabberIqType type, const char *id,
+                   xmlnode *packet, gpointer nul)
 {
-	const char *type = xmlnode_get_attrib(packet, "type");
 	xmlnode *child;
-	xmlnode *message, *sender_node, *subject_node;
-	const char *from, *to, *url, *tid;
-	char *subject;
+	xmlnode *message;
+	const char *to, *url;
 	const char *in_str;
 	char *to_name;
-	char *default_tos[1];
 
 	int i, count = 1, returned_count;
 
 	const char **tos, **froms, **urls;
 	char **subjects;
 
-	if (strcmp(type, "result"))
+	if (type == JABBER_IQ_ERROR)
 		return;
 
 	child = xmlnode_get_child(packet, "mailbox");
@@ -59,14 +812,20 @@ jabber_gmail_parse(JabberStream *js, xmlnode *packet, gpointer nul)
 
 	/* If Gmail doesn't tell us who the mail is to, let's use our JID */
 	to = xmlnode_get_attrib(packet, "to");
-	default_tos[0] = jabber_get_bare_jid(to);
 
 	message = xmlnode_get_child(child, "mail-thread-info");
 
 	if (count == 0 || !message) {
-		if (count > 0)
-			purple_notify_emails(js->gc, count, FALSE, NULL, NULL, (const char**) default_tos, NULL, NULL, NULL);
-		g_free(default_tos[0]);
+		if (count > 0) {
+			char *bare_jid = jabber_get_bare_jid(to);
+			const char *default_tos[2] = { bare_jid };
+
+			purple_notify_emails(js->gc, count, FALSE, NULL, NULL, default_tos, NULL, NULL, NULL);
+			g_free(bare_jid);
+		} else {
+			purple_notify_emails(js->gc, count, FALSE, NULL, NULL, NULL, NULL, NULL, NULL);
+		}
+
 		return;
 	}
 
@@ -74,10 +833,10 @@ jabber_gmail_parse(JabberStream *js, xmlnode *packet, gpointer nul)
 	 * accordingly */
 	for (returned_count = 0; message; returned_count++, message=xmlnode_get_next_twin(message));
 
-	froms    = g_new0(const char* , returned_count);
-	tos      = g_new0(const char* , returned_count);
-	subjects = g_new0(char* , returned_count);
-	urls     = g_new0(const char* , returned_count);
+	froms    = g_new0(const char* , returned_count + 1);
+	tos      = g_new0(const char* , returned_count + 1);
+	subjects = g_new0(char* , returned_count + 1);
+	urls     = g_new0(const char* , returned_count + 1);
 
 	to = xmlnode_get_attrib(packet, "to");
 	to_name = jabber_get_bare_jid(to);
@@ -87,6 +846,10 @@ jabber_gmail_parse(JabberStream *js, xmlnode *packet, gpointer nul)
 
 	message= xmlnode_get_child(child, "mail-thread-info");
 	for (i=0; message; message = xmlnode_get_next_twin(message), i++) {
+		xmlnode *sender_node, *subject_node;
+		const char *from, *tid;
+		char *subject;
+
 		subject_node = xmlnode_get_child(message, "subject");
 		sender_node  = xmlnode_get_child(message, "senders");
 		sender_node  = xmlnode_get_child(sender_node, "sender");
@@ -123,16 +886,12 @@ jabber_gmail_parse(JabberStream *js, xmlnode *packet, gpointer nul)
 	if (i>0)
 		purple_notify_emails(js->gc, count, count == i, (const char**) subjects, froms, tos,
 				urls, NULL, NULL);
-	else
-		purple_notify_emails(js->gc, count, FALSE, NULL, NULL, (const char**) default_tos, NULL, NULL, NULL);
-
 
 	g_free(to_name);
 	g_free(tos);
-	g_free(default_tos[0]);
 	g_free(froms);
-	for (; i > 0; i--)
-		g_free(subjects[i - 1]);
+	for (i = 0; i < returned_count; i++)
+		g_free(subjects[i]);
 	g_free(subjects);
 	g_free(urls);
 
@@ -144,9 +903,9 @@ jabber_gmail_parse(JabberStream *js, xmlnode *packet, gpointer nul)
 }
 
 void
-jabber_gmail_poke(JabberStream *js, xmlnode *packet)
+jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
+                  const char *id, xmlnode *new_mail)
 {
-	const char *type;
 	xmlnode *query;
 	JabberIq *iq;
 
@@ -154,13 +913,17 @@ jabber_gmail_poke(JabberStream *js, xmlnode *packet)
 	if (!purple_account_get_check_mail(js->gc->account))
 		return;
 
-	type = xmlnode_get_attrib(packet, "type");
-
-
 	/* Is this an initial incoming mail notification? If so, send a request for more info */
-	if (strcmp(type, "set") || !xmlnode_get_child(packet, "new-mail"))
+	if (type != JABBER_IQ_SET)
 		return;
 
+	/* Acknowledge the notification */
+	iq = jabber_iq_new(js, JABBER_IQ_RESULT);
+	if (from)
+		xmlnode_set_attrib(iq->node, "to", from);
+	xmlnode_set_attrib(iq->node, "id", id);
+	jabber_iq_send(iq);
+
 	purple_debug(PURPLE_DEBUG_MISC, "jabber",
 		   "Got new mail notification. Sending request for more info\n");
 
@@ -179,10 +942,25 @@ jabber_gmail_poke(JabberStream *js, xmlnode *packet)
 
 void jabber_gmail_init(JabberStream *js) {
 	JabberIq *iq;
+	xmlnode *usersetting, *mailnotifications;
 
-	if (!purple_account_get_check_mail(js->gc->account))
+	if (!purple_account_get_check_mail(purple_connection_get_account(js->gc)))
 		return;
 
+	/*
+	 * Quoting http://code.google.com/apis/talk/jep_extensions/usersettings.html:
+	 * To ensure better compatibility with other clients, rather than
+	 * setting this value to "false" to turn off notifications, it is
+	 * recommended that a client set this to "true" and filter incoming
+	 * email notifications itself.
+	 */
+	iq = jabber_iq_new(js, JABBER_IQ_SET);
+	usersetting = xmlnode_new_child(iq->node, "usersetting");
+	xmlnode_set_namespace(usersetting, "google:setting");
+	mailnotifications = xmlnode_new_child(usersetting, "mailnotifications");
+	xmlnode_set_attrib(mailnotifications, "value", "true");
+	jabber_iq_send(iq);
+
 	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "google:mail:notify");
 	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
 	jabber_iq_send(iq);
@@ -207,27 +985,22 @@ void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *it
 	PurpleAccount *account = purple_connection_get_account(js->gc);
 	GSList *list = account->deny;
 	const char *jid = xmlnode_get_attrib(item, "jid");
-	char *jid_norm = g_strdup(jabber_normalize(account, jid));
+	char *jid_norm = (char *)jabber_normalize(account, jid);
 
 	while (list) {
 		if (!strcmp(jid_norm, (char*)list->data)) {
 			xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
-			xmlnode_set_attrib(item, "gr:t", "B");
-			xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
 			xmlnode_set_attrib(query, "gr:ext", "2");
+			xmlnode_set_attrib(item, "gr:t", "B");
 			return;
 		}
 		list = list->next;
 	}
-
-	g_free(jid_norm);
-
 }
 
 gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item)
 {
 	PurpleAccount *account = purple_connection_get_account(js->gc);
-	GSList *list = account->deny;
 	const char *jid = xmlnode_get_attrib(item, "jid");
 	gboolean on_block_list = FALSE;
 
@@ -245,18 +1018,20 @@ gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item)
 
  	jid_norm = g_strdup(jabber_normalize(account, jid));
 
-	while (list) {
-		if (!strcmp(jid_norm, (char*)list->data)) {
-			on_block_list = TRUE;
-			break;
-		}
-		list = list->next;
-	}
+	on_block_list = NULL != g_slist_find_custom(account->deny, jid_norm,
+	                                            (GCompareFunc)strcmp);
 
 	if (grt && (*grt == 'H' || *grt == 'h')) {
-		PurpleBuddy *buddy = purple_find_buddy(account, jid_norm);
-		if (buddy)
-			purple_blist_remove_buddy(buddy);
+		/* Hidden; don't show this buddy. */
+		GSList *buddies = purple_find_buddies(account, jid_norm);
+		if (buddies)
+			purple_debug_info("jabber", "Removing %s from local buddy list\n",
+			                  jid_norm);
+
+		for ( ; buddies; buddies = g_slist_delete_link(buddies, buddies)) {
+			purple_blist_remove_buddy(buddies->data);
+		}
+
 		g_free(jid_norm);
 		return FALSE;
 	}
@@ -287,7 +1062,7 @@ void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who)
 
 	js = (JabberStream*)(gc->proto_data);
 
-	if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+	if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
 		return;
 
 	jb = jabber_buddy_find(js, who, TRUE);
@@ -357,7 +1132,7 @@ void jabber_google_roster_rem_deny(PurpleConnection *gc, const char *who)
 
 	js = (JabberStream*)(gc->proto_data);
 
-	if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+	if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
 		return;
 
 	buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);
@@ -515,9 +1290,10 @@ void jabber_google_presence_incoming(JabberStream *js, const char *user, JabberB
 {
 	if (!js->googletalk)
 		return;
-	if (jbr->status && !strncmp(jbr->status, "♫ ", strlen("♫ "))) {
+	if (jbr->status && purple_str_has_prefix(jbr->status, "♫ ")) {
 		purple_prpl_got_user_status(js->gc->account, user, "tune",
 					    PURPLE_TUNE_TITLE, jbr->status + strlen("♫ "), NULL);
+		g_free(jbr->status);
 		jbr->status = NULL;
 	} else {
 		purple_prpl_got_user_status_deactive(js->gc->account, user, "tune");
@@ -529,3 +1305,139 @@ char *jabber_google_presence_outgoing(PurpleStatus *tune)
 	const char *attr = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE);
 	return attr ? g_strdup_printf("♫ %s", attr) : g_strdup("");
 }
+
+static void
+jabber_google_stun_lookup_cb(GSList *hosts, gpointer data,
+	const char *error_message)
+{
+	JabberStream *js = (JabberStream *) data;
+
+	if (error_message) {
+		purple_debug_error("jabber", "Google STUN lookup failed: %s\n",
+			error_message);
+		g_slist_free(hosts);
+		return;
+	}
+
+	if (hosts && g_slist_next(hosts)) {
+		struct sockaddr *addr = g_slist_next(hosts)->data;
+		char dst[INET6_ADDRSTRLEN];
+		int port;
+
+		if (addr->sa_family == AF_INET6) {
+			inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr,
+				dst, sizeof(dst));
+			port = ntohs(((struct sockaddr_in6 *) addr)->sin6_port);
+		} else {
+			inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr,
+				dst, sizeof(dst));
+			port = ntohs(((struct sockaddr_in *) addr)->sin_port);
+		}
+
+		if (js) {
+			if (js->stun_ip) {
+				g_free(js->stun_ip);
+			}
+			js->stun_ip = g_strdup(dst);
+			purple_debug_info("jabber", "set Google STUN IP address: %s\n", dst);
+			js->stun_port = port;
+			purple_debug_info("jabber", "set Google STUN port: %d\n", port);
+			purple_debug_info("jabber", "set Google STUN port: %d\n", port);
+			/* unmark ongoing query */
+			js->stun_query = NULL;
+		}
+	}
+
+	while (hosts != NULL) {
+		hosts = g_slist_delete_link(hosts, hosts);
+		/* Free the address */
+		g_free(hosts->data);
+		hosts = g_slist_delete_link(hosts, hosts);
+	}
+}
+
+static void
+jabber_google_jingle_info_common(JabberStream *js, const char *from,
+                                 JabberIqType type, xmlnode *query)
+{
+	const xmlnode *stun = xmlnode_get_child(query, "stun");
+	gchar *my_bare_jid;
+
+	/*
+	 * Make sure that random people aren't sending us STUN servers. Per
+	 * http://code.google.com/apis/talk/jep_extensions/jingleinfo.html, these
+	 * stanzas are stamped from our bare JID.
+	 */
+	if (from) {
+		my_bare_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
+		if (!purple_strequal(from, my_bare_jid)) {
+			purple_debug_warning("jabber", "got google:jingleinfo with invalid from (%s)\n",
+			                  from);
+			g_free(my_bare_jid);
+			return;
+		}
+
+		g_free(my_bare_jid);
+	}
+
+	if (type == JABBER_IQ_ERROR || type == JABBER_IQ_GET)
+		return;
+
+	purple_debug_info("jabber", "got google:jingleinfo\n");
+
+	if (stun) {
+		xmlnode *server = xmlnode_get_child(stun, "server");
+
+		if (server) {
+			const gchar *host = xmlnode_get_attrib(server, "host");
+			const gchar *udp = xmlnode_get_attrib(server, "udp");
+
+			if (host && udp) {
+				int port = atoi(udp);
+				/* if there, would already be an ongoing query,
+				 cancel it */
+				if (js->stun_query)
+					purple_dnsquery_destroy(js->stun_query);
+
+				js->stun_query = purple_dnsquery_a(host, port,
+					jabber_google_stun_lookup_cb, js);
+			}
+		}
+	}
+	/* should perhaps handle relays later on, or maybe wait until
+	 Google supports a common standard... */
+}
+
+static void
+jabber_google_jingle_info_cb(JabberStream *js, const char *from,
+                             JabberIqType type, const char *id,
+                             xmlnode *packet, gpointer data)
+{
+	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
+			GOOGLE_JINGLE_INFO_NAMESPACE);
+
+	if (query)
+		jabber_google_jingle_info_common(js, from, type, query);
+	else
+		purple_debug_warning("jabber", "Got invalid google:jingleinfo\n");
+}
+
+void
+jabber_google_handle_jingle_info(JabberStream *js, const char *from,
+                                 JabberIqType type, const char *id,
+                                 xmlnode *child)
+{
+	jabber_google_jingle_info_common(js, from, type, child);
+}
+
+void
+jabber_google_send_jingle_info(JabberStream *js)
+{
+	JabberIq *jingle_info =
+		jabber_iq_new_query(js, JABBER_IQ_GET, GOOGLE_JINGLE_INFO_NAMESPACE);
+
+	jabber_iq_set_callback(jingle_info, jabber_google_jingle_info_cb,
+		NULL);
+	purple_debug_info("jabber", "sending google:jingleinfo query\n");
+	jabber_iq_send(jingle_info);
+}
diff --git a/libpurple/protocols/jabber/google.h b/libpurple/protocols/jabber/google.h
index c1b6e0d0c2..ae6d21cef5 100644
--- a/libpurple/protocols/jabber/google.h
+++ b/libpurple/protocols/jabber/google.h
@@ -18,16 +18,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef _PURPLE_GOOGLE_H_
-#define _PURPLE_GOOGLE_H_
+#ifndef PURPLE_JABBER_GOOGLE_H_
+#define PURPLE_JABBER_GOOGLE_H_
 
 /* This is a place for Google Talk-specific XMPP extensions to live
  * such that they don't intermingle with code for the XMPP RFCs and XEPs :) */
 
 #include "jabber.h"
+#include "media.h"
+
+#define GOOGLE_VOICE_CAP "http://www.google.com/xmpp/protocol/voice/v1"
+#define GOOGLE_VIDEO_CAP "http://www.google.com/xmpp/protocol/video/v1"
+#define GOOGLE_JINGLE_INFO_NAMESPACE "google:jingleinfo"
 
 void jabber_gmail_init(JabberStream *js);
-void jabber_gmail_poke(JabberStream *js, xmlnode *node);
+void jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
+                       const char *id, xmlnode *new_mail);
 
 void jabber_google_roster_init(JabberStream *js);
 void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item);
@@ -45,6 +51,12 @@ void jabber_google_roster_rem_deny(PurpleConnection *gc, const char *who);
 
 char *jabber_google_format_to_html(const char *text);
 
+gboolean jabber_google_session_initiate(JabberStream *js, const gchar *who, PurpleMediaSessionType type);
+void jabber_google_session_parse(JabberStream *js, const char *from, JabberIqType type, const char *iq, xmlnode *session);
 
+void jabber_google_handle_jingle_info(JabberStream *js, const char *from,
+                                      JabberIqType type, const char *id,
+                                      xmlnode *child);
+void jabber_google_send_jingle_info(JabberStream *js);
 
-#endif   /* _PURPLE_GOOGLE_H_ */
+#endif   /* PURPLE_JABBER_GOOGLE_H_ */
diff --git a/libpurple/protocols/jabber/ibb.c b/libpurple/protocols/jabber/ibb.c
index 2efebeda8c..416f6f7f53 100644
--- a/libpurple/protocols/jabber/ibb.c
+++ b/libpurple/protocols/jabber/ibb.c
@@ -46,12 +46,10 @@ jabber_ibb_session_create(JabberStream *js, const gchar *sid, const gchar *who,
 }
 
 JabberIBBSession *
-jabber_ibb_session_create_from_xmlnode(JabberStream *js, xmlnode *packet,
-	gpointer user_data)
+jabber_ibb_session_create_from_xmlnode(JabberStream *js, const char *from,
+	const char *id, xmlnode *open, gpointer user_data)
 {
 	JabberIBBSession *sess = NULL;
-	xmlnode *open = xmlnode_get_child_with_namespace(packet, "open",
-		XEP_0047_NAMESPACE);
 	const gchar *sid = xmlnode_get_attrib(open, "sid");
 	const gchar *block_size = xmlnode_get_attrib(open, "block-size");
 
@@ -66,9 +64,8 @@ jabber_ibb_session_create_from_xmlnode(JabberStream *js, xmlnode *packet,
 		return NULL;
 	}
 
-	sess = jabber_ibb_session_create(js, sid,
-			xmlnode_get_attrib(packet, "from"), user_data);
-	sess->id = g_strdup(xmlnode_get_attrib(packet, "id"));
+	sess = jabber_ibb_session_create(js, sid, from, user_data);
+	sess->id = g_strdup(id);
 	sess->block_size = atoi(block_size);
 	/* if we create a session from an incoming <open/> request, it means the
 	  session is immediatly open... */
@@ -198,11 +195,13 @@ jabber_ibb_session_set_error_callback(JabberIBBSession *sess,
 }
 
 static void
-jabber_ibb_session_opened_cb(JabberStream *js, xmlnode *packet, gpointer data)
+jabber_ibb_session_opened_cb(JabberStream *js, const char *from,
+                             JabberIqType type, const char *id,
+                             xmlnode *packet, gpointer data)
 {
 	JabberIBBSession *sess = (JabberIBBSession *) data;
 
-	if (strcmp(xmlnode_get_attrib(packet, "type"), "error") == 0) {
+	if (type == JABBER_IQ_ERROR) {
 		sess->state = JABBER_IBB_SESSION_ERROR;
 	} else {
 		sess->state = JABBER_IBB_SESSION_OPENED;
@@ -274,10 +273,11 @@ jabber_ibb_session_accept(JabberIBBSession *sess)
 }
 
 static void
-jabber_ibb_session_send_acknowledge_cb(JabberStream *js, xmlnode *packet, gpointer data)
+jabber_ibb_session_send_acknowledge_cb(JabberStream *js, const char *from,
+                                       JabberIqType type, const char *id,
+                                       xmlnode *packet, gpointer data)
 {
 	JabberIBBSession *sess = (JabberIBBSession *) data;
-	xmlnode *error = xmlnode_get_child(packet, "error");
 
 	if (sess) {
 		/* reset callback */
@@ -286,7 +286,7 @@ jabber_ibb_session_send_acknowledge_cb(JabberStream *js, xmlnode *packet, gpoint
 			sess->last_iq_id = NULL;
 		}
 
-		if (error) {
+		if (type == JABBER_IQ_ERROR) {
 			jabber_ibb_session_close(sess);
 			sess->state = JABBER_IBB_SESSION_ERROR;
 
@@ -351,7 +351,7 @@ jabber_ibb_session_send_data(JabberIBBSession *sess, gconstpointer data,
 }
 
 static void
-jabber_ibb_send_error_response(JabberStream *js, xmlnode *packet)
+jabber_ibb_send_error_response(JabberStream *js, const char *to, const char *id)
 {
 	JabberIq *result = jabber_iq_new(js, JABBER_IQ_ERROR);
 	xmlnode *error = xmlnode_new("error");
@@ -361,9 +361,8 @@ jabber_ibb_send_error_response(JabberStream *js, xmlnode *packet)
 		"urn:ietf:params:xml:ns:xmpp-stanzas");
 	xmlnode_set_attrib(error, "code", "440");
 	xmlnode_set_attrib(error, "type", "cancel");
-	jabber_iq_set_id(result, xmlnode_get_attrib(packet, "id"));
-	xmlnode_set_attrib(result->node, "to",
-		xmlnode_get_attrib(packet, "from"));
+	jabber_iq_set_id(result, id);
+	xmlnode_set_attrib(result->node, "to", to);
 	xmlnode_insert_child(error, item_not_found);
 	xmlnode_insert_child(result->node, error);
 
@@ -371,20 +370,17 @@ jabber_ibb_send_error_response(JabberStream *js, xmlnode *packet)
 }
 
 void
-jabber_ibb_parse(JabberStream *js, xmlnode *packet)
+jabber_ibb_parse(JabberStream *js, const char *who, JabberIqType type,
+                 const char *id, xmlnode *child)
 {
-	xmlnode *data = xmlnode_get_child_with_namespace(packet, "data",
-		XEP_0047_NAMESPACE);
-	xmlnode *close = xmlnode_get_child_with_namespace(packet, "close",
-		XEP_0047_NAMESPACE);
-	xmlnode *open = xmlnode_get_child_with_namespace(packet, "open",
-		XEP_0047_NAMESPACE);
-	const gchar *sid =
-		data ? xmlnode_get_attrib(data, "sid") :
-			close ? xmlnode_get_attrib(close, "sid") : NULL;
+	const char *name = child->name;
+	gboolean data  = g_str_equal(name, "data");
+	gboolean close = g_str_equal(name, "close");
+	gboolean open  = g_str_equal(name, "open");
+	const gchar *sid = (data || close) ?
+		xmlnode_get_attrib(child, "sid") : NULL;
 	JabberIBBSession *sess =
 		sid ? g_hash_table_lookup(jabber_ibb_sessions, sid) : NULL;
-	const gchar *who = xmlnode_get_attrib(packet, "from");
 
 	if (sess) {
 
@@ -394,7 +390,7 @@ jabber_ibb_parse(JabberStream *js, xmlnode *packet)
 			purple_debug_error("jabber",
 				"Got IBB iq from wrong JID, ignoring\n");
 		} else if (data) {
-			const gchar *seq_attr = xmlnode_get_attrib(data, "seq");
+			const gchar *seq_attr = xmlnode_get_attrib(child, "seq");
 			guint16 seq = (seq_attr ? atoi(seq_attr) : 0);
 
 			/* reject the data, and set the session in error if we get an
@@ -403,12 +399,11 @@ jabber_ibb_parse(JabberStream *js, xmlnode *packet)
 				/* sequence # is the expected... */
 				JabberIq *result = jabber_iq_new(js, JABBER_IQ_RESULT);
 
-				jabber_iq_set_id(result, xmlnode_get_attrib(packet, "id"));
-				xmlnode_set_attrib(result->node, "to",
-					xmlnode_get_attrib(packet, "from"));
+				jabber_iq_set_id(result, id);
+				xmlnode_set_attrib(result->node, "to", who);
 
 				if (sess->data_received_cb) {
-					gchar *base64 = xmlnode_get_data(data);
+					gchar *base64 = xmlnode_get_data(child);
 					gsize size;
 					gpointer rawdata = purple_base64_decode(base64, &size);
 
@@ -475,20 +470,19 @@ jabber_ibb_parse(JabberStream *js, xmlnode *packet)
 			 iterator = g_list_next(iterator)) {
 			JabberIBBOpenHandler *handler = iterator->data;
 
-			if (handler(js, packet)) {
+			if (handler(js, who, id, child)) {
 				result = jabber_iq_new(js, JABBER_IQ_RESULT);
-				xmlnode_set_attrib(result->node, "to",
-					xmlnode_get_attrib(packet, "from"));
-				jabber_iq_set_id(result, xmlnode_get_attrib(packet, "id"));
+				xmlnode_set_attrib(result->node, "to", who);
+				jabber_iq_set_id(result, id);
 				jabber_iq_send(result);
 				return;
 			}
 		}
 		/* no open callback returned success, reject */
-		jabber_ibb_send_error_response(js, packet);
+		jabber_ibb_send_error_response(js, who, id);
 	} else {
 		/* send error reply */
-		jabber_ibb_send_error_response(js, packet);
+		jabber_ibb_send_error_response(js, who, id);
 	}
 }
 
@@ -508,6 +502,12 @@ void
 jabber_ibb_init(void)
 {
 	jabber_ibb_sessions = g_hash_table_new(g_str_hash, g_str_equal);
+
+	jabber_add_feature(XEP_0047_NAMESPACE, NULL);
+
+	jabber_iq_register_handler("close", XEP_0047_NAMESPACE, jabber_ibb_parse);
+	jabber_iq_register_handler("data", XEP_0047_NAMESPACE, jabber_ibb_parse);
+	jabber_iq_register_handler("open", XEP_0047_NAMESPACE, jabber_ibb_parse);
 }
 
 void
diff --git a/libpurple/protocols/jabber/ibb.h b/libpurple/protocols/jabber/ibb.h
index b06be47736..54da63a20f 100644
--- a/libpurple/protocols/jabber/ibb.h
+++ b/libpurple/protocols/jabber/ibb.h
@@ -14,8 +14,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
  */
 
-#ifndef _PURPLE_JABBER_IBB_H_
-#define _PURPLE_JABBER_IBB_H_
+#ifndef PURPLE_JABBER_IBB_H_
+#define PURPLE_JABBER_IBB_H_
 
 #include "jabber.h"
 #include "iq.h"
@@ -32,7 +32,8 @@ typedef void (JabberIBBClosedCallback)(JabberIBBSession *);
 typedef void (JabberIBBErrorCallback)(JabberIBBSession *);
 typedef void (JabberIBBSentCallback)(JabberIBBSession *);
 
-typedef gboolean (JabberIBBOpenHandler)(JabberStream *js, xmlnode *packet);
+typedef gboolean (JabberIBBOpenHandler)(JabberStream *js, const char *from,
+                                        const char *id, xmlnode *open);
 
 typedef enum {
 	JABBER_IBB_SESSION_NOT_OPENED,
@@ -71,7 +72,7 @@ struct _JabberIBBSession {
 JabberIBBSession *jabber_ibb_session_create(JabberStream *js, const gchar *sid,
 	const gchar *who, gpointer user_data);
 JabberIBBSession *jabber_ibb_session_create_from_xmlnode(JabberStream *js,
-	xmlnode *packet, gpointer user_data);
+	const gchar *from, const gchar *id, xmlnode *open, gpointer user_data);
 
 void jabber_ibb_session_destroy(JabberIBBSession *sess);
 
@@ -107,7 +108,8 @@ void jabber_ibb_session_set_block_size(JabberIBBSession *sess, gsize size);
 gpointer jabber_ibb_session_get_user_data(JabberIBBSession *sess);
 
 /* handle incoming packet */
-void jabber_ibb_parse(JabberStream *js, xmlnode *packet);
+void jabber_ibb_parse(JabberStream *js, const char *who, JabberIqType type,
+                      const char *id, xmlnode *child);
 
 /* add a handler for open session */
 void jabber_ibb_register_open_handler(JabberIBBOpenHandler *cb);
@@ -116,4 +118,4 @@ void jabber_ibb_unregister_open_handler(JabberIBBOpenHandler *cb);
 void jabber_ibb_init(void);
 void jabber_ibb_uninit(void);
 
-#endif /* _PURPLE_JABBER_IBB_H_ */
+#endif /* PURPLE_JABBER_IBB_H_ */
diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
index 33126a41ed..2fd2af685c 100644
--- a/libpurple/protocols/jabber/iq.c
+++ b/libpurple/protocols/jabber/iq.c
@@ -28,6 +28,7 @@
 #include "disco.h"
 #include "google.h"
 #include "iq.h"
+#include "jingle/jingle.h"
 #include "oob.h"
 #include "roster.h"
 #include "si.h"
@@ -41,7 +42,7 @@
 #endif
 
 GHashTable *iq_handlers = NULL;
-
+GHashTable *signal_iq_handlers = NULL;
 
 JabberIq *jabber_iq_new(JabberStream *js, JabberIqType type)
 {
@@ -143,23 +144,19 @@ void jabber_iq_free(JabberIq *iq)
 	g_free(iq);
 }
 
-static void jabber_iq_last_parse(JabberStream *js, xmlnode *packet)
+static void jabber_iq_last_parse(JabberStream *js, const char *from,
+                                 JabberIqType type, const char *id,
+                                 xmlnode *packet)
 {
 	JabberIq *iq;
-	const char *type;
-	const char *from;
-	const char *id;
 	xmlnode *query;
 	char *idle_time;
 
-	type = xmlnode_get_attrib(packet, "type");
-	from = xmlnode_get_attrib(packet, "from");
-	id = xmlnode_get_attrib(packet, "id");
-
-	if(type && !strcmp(type, "get")) {
+	if(type == JABBER_IQ_GET) {
 		iq = jabber_iq_new_query(js, JABBER_IQ_RESULT, "jabber:iq:last");
 		jabber_iq_set_id(iq, id);
-		xmlnode_set_attrib(iq->node, "to", from);
+		if (from)
+			xmlnode_set_attrib(iq->node, "to", from);
 
 		query = xmlnode_get_child(iq->node, "query");
 
@@ -171,88 +168,54 @@ static void jabber_iq_last_parse(JabberStream *js, xmlnode *packet)
 	}
 }
 
-static void jabber_iq_time_parse(JabberStream *js, xmlnode *packet)
+static void jabber_time_parse(JabberStream *js, const char *from,
+                              JabberIqType type, const char *id,
+                              xmlnode *child)
 {
-	const char *type, *from, *id, *xmlns;
 	JabberIq *iq;
-	xmlnode *query;
 	time_t now_t;
-	struct tm *now;
+	struct tm *tm;
 
 	time(&now_t);
-	now = localtime(&now_t);
-
-	type = xmlnode_get_attrib(packet, "type");
-	from = xmlnode_get_attrib(packet, "from");
-	id = xmlnode_get_attrib(packet, "id");
-
-	/* we're gonna throw this away in a moment, but we need it
-	 * to get the xmlns, so we can figure out if this is
-	 * jabber:iq:time or urn:xmpp:time */
-	query = xmlnode_get_child(packet, "query");
-	xmlns = xmlnode_get_namespace(query);
 
-	if(type && !strcmp(type, "get")) {
-		xmlnode *utc;
-		const char *date;
+	if(type == JABBER_IQ_GET) {
+		xmlnode *tzo, *utc;
+		const char *date, *tz;
 
-		iq = jabber_iq_new_query(js, JABBER_IQ_RESULT, xmlns);
+		iq = jabber_iq_new(js, JABBER_IQ_RESULT);
 		jabber_iq_set_id(iq, id);
-		xmlnode_set_attrib(iq->node, "to", from);
-
-		query = xmlnode_get_child(iq->node, "query");
-
-		date = purple_utf8_strftime("%Y%m%dT%T", now);
-		utc = xmlnode_new_child(query, "utc");
-		xmlnode_insert_data(utc, date, -1);
-
-		if(!strcmp("urn:xmpp:time", xmlns)) {
-			xmlnode_insert_data(utc, "Z", 1); /* of COURSE the thing that is the same is different */
-
-			date = purple_get_tzoff_str(now, TRUE);
-			xmlnode_insert_data(xmlnode_new_child(query, "tzo"), date, -1);
-		} else { /* jabber:iq:time */
-			date = purple_utf8_strftime("%Z", now);
-			xmlnode_insert_data(xmlnode_new_child(query, "tz"), date, -1);
-
-			date = purple_utf8_strftime("%d %b %Y %T", now);
-			xmlnode_insert_data(xmlnode_new_child(query, "display"), date, -1);
-		}
-
-		jabber_iq_send(iq);
-	}
-}
-
-static void urn_xmpp_ping_parse(JabberStream *js, xmlnode *packet)
-{
-	const char *type, *id, *from;
-	JabberIq *iq;
+		if (from)
+			xmlnode_set_attrib(iq->node, "to", from);
 
-	type = xmlnode_get_attrib(packet, "type");
-	from = xmlnode_get_attrib(packet, "from");
-	id = xmlnode_get_attrib(packet, "id");
+		child = xmlnode_new_child(iq->node, child->name);
+		xmlnode_set_namespace(child, "urn:xmpp:time");
 
-	if(type && !strcmp(type, "get")) {
-		iq = jabber_iq_new_query(js, JABBER_IQ_RESULT, "urn:xmpp:ping");
+		/* <tzo>-06:00</tzo> */
+		tm = localtime(&now_t);
+		tz = purple_get_tzoff_str(tm, TRUE);
+		tzo = xmlnode_new_child(child, "tzo");
+		xmlnode_insert_data(tzo, tz, -1);
 
-		jabber_iq_set_id(iq, id);
-		xmlnode_set_attrib(iq->node, "to", from);
+		/* <utc>2006-12-19T17:58:35Z</utc> */
+		tm = gmtime(&now_t);
+		date = purple_utf8_strftime("%FT%TZ", tm);
+		utc = xmlnode_new_child(child, "utc");
+		xmlnode_insert_data(utc, date, -1);
 
 		jabber_iq_send(iq);
 	} else {
-		/* XXX: error */
+		/* TODO: Errors */
 	}
 }
 
-static void jabber_iq_version_parse(JabberStream *js, xmlnode *packet)
+static void jabber_iq_version_parse(JabberStream *js, const char *from,
+                                    JabberIqType type, const char *id,
+                                    xmlnode *packet)
 {
 	JabberIq *iq;
-	const char *type, *from, *id;
 	xmlnode *query;
 
-	type = xmlnode_get_attrib(packet, "type");
-
-	if(type && !strcmp(type, "get")) {
+	if(type == JABBER_IQ_GET) {
 		GHashTable *ui_info;
 		const char *ui_name = NULL, *ui_version = NULL;
 #if 0
@@ -265,11 +228,10 @@ static void jabber_iq_version_parse(JabberStream *js, xmlnode *packet)
 					osinfo.machine);
 		}
 #endif
-		from = xmlnode_get_attrib(packet, "from");
-		id = xmlnode_get_attrib(packet, "id");
 
 		iq = jabber_iq_new_query(js, JABBER_IQ_RESULT, "jabber:iq:version");
-		xmlnode_set_attrib(iq->node, "to", from);
+		if (from)
+			xmlnode_set_attrib(iq->node, "to", from);
 		jabber_iq_set_id(iq, id);
 
 		query = xmlnode_get_child(iq->node, "query");
@@ -310,33 +272,57 @@ void jabber_iq_remove_callback_by_id(JabberStream *js, const char *id)
 void jabber_iq_parse(JabberStream *js, xmlnode *packet)
 {
 	JabberCallbackData *jcd;
-	xmlnode *query, *error, *x;
+	xmlnode *child, *error, *x;
 	const char *xmlns;
-	const char *type, *id, *from;
-	JabberIqHandler *jih;
+	const char *iq_type, *id, *from;
+	JabberIqType type = JABBER_IQ_NONE;
+	gboolean signal_return;
 
-	query = xmlnode_get_child(packet, "query");
-	type = xmlnode_get_attrib(packet, "type");
 	from = xmlnode_get_attrib(packet, "from");
 	id = xmlnode_get_attrib(packet, "id");
+	iq_type = xmlnode_get_attrib(packet, "type");
+
+	/*
+	 * child will be either the first tag child or NULL if there is no child.
+	 * Historically, we used just the 'query' subchild, but newer XEPs use
+	 * differently named children. Grabbing the first child is (for the time
+	 * being) sufficient.
+	 */
+	for (child = packet->child; child; child = child->next) {
+		if (child->type == XMLNODE_TYPE_TAG)
+			break;
+	}
+
+	if (iq_type) {
+		if (!strcmp(iq_type, "get"))
+			type = JABBER_IQ_GET;
+		else if (!strcmp(iq_type, "set"))
+			type = JABBER_IQ_SET;
+		else if (!strcmp(iq_type, "result"))
+			type = JABBER_IQ_RESULT;
+		else if (!strcmp(iq_type, "error"))
+			type = JABBER_IQ_ERROR;
+	}
 
-	if(type == NULL || !(!strcmp(type, "get") || !strcmp(type, "set")
-			|| !strcmp(type, "result") || !strcmp(type, "error"))) {
+	if (type == JABBER_IQ_NONE) {
 		purple_debug_error("jabber", "IQ with invalid type ('%s') - ignoring.\n",
-						   type ? type : "(null)");
+						   iq_type ? iq_type : "(null)");
 		return;
 	}
 
 	/* All IQs must have an ID, so send an error for a set/get that doesn't */
 	if(!id || !*id) {
 
-		if(!strcmp(type, "set") || !strcmp(type, "get")) {
+		if(type == JABBER_IQ_SET || type == JABBER_IQ_GET) {
 			JabberIq *iq = jabber_iq_new(js, JABBER_IQ_ERROR);
 
 			xmlnode_free(iq->node);
 			iq->node = xmlnode_copy(packet);
-			xmlnode_set_attrib(iq->node, "to", from);
-			xmlnode_remove_attrib(iq->node, "from");
+			if (from) {
+				xmlnode_set_attrib(iq->node, "to", from);
+				xmlnode_remove_attrib(iq->node, "from");
+			}
+
 			xmlnode_set_attrib(iq->node, "type", "error");
 			/* This id is clearly not useful, but we must put something there for a valid stanza */
 			iq->id = jabber_get_next_id(js);
@@ -348,67 +334,62 @@ void jabber_iq_parse(JabberStream *js, xmlnode *packet)
 
 			jabber_iq_send(iq);
 		} else
-			purple_debug_error("jabber", "IQ of type '%s' missing id - ignoring.\n", type);
+			purple_debug_error("jabber", "IQ of type '%s' missing id - ignoring.\n",
+			                   iq_type);
 
 		return;
 	}
 
-	/* First, lets see if a special callback got registered */
+	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
+			"jabber-receiving-iq", js->gc, iq_type, id, from, packet));
+	if (signal_return)
+		return;
 
-	if(!strcmp(type, "result") || !strcmp(type, "error")) {
-		if(id && *id && (jcd = g_hash_table_lookup(js->iq_callbacks, id))) {
-			jcd->callback(js, packet, jcd->data);
+	/* First, lets see if a special callback got registered */
+	if(type == JABBER_IQ_RESULT || type == JABBER_IQ_ERROR) {
+		if((jcd = g_hash_table_lookup(js->iq_callbacks, id))) {
+			jcd->callback(js, from, type, id, packet, jcd->data);
 			jabber_iq_remove_callback_by_id(js, id);
 			return;
 		}
 	}
 
-	/* Apparently not, so lets see if we have a pre-defined handler */
+	/*
+	 * Apparently not, so let's see if we have a pre-defined handler
+	 * or if an outside plugin is interested.
+	 */
+	if(child && (xmlns = xmlnode_get_namespace(child))) {
+		char *key = g_strdup_printf("%s %s", child->name, xmlns);
+		JabberIqHandler *jih = g_hash_table_lookup(iq_handlers, key);
+		int signal_ref = GPOINTER_TO_INT(g_hash_table_lookup(signal_iq_handlers, key));
+		g_free(key);
+
+		if (signal_ref > 0) {
+			signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin, "jabber-watched-iq",
+					js->gc, iq_type, id, from, child));
+			if (signal_return)
+				return;
+		}
 
-	if(query && (xmlns = xmlnode_get_namespace(query))) {
-		if((jih = g_hash_table_lookup(iq_handlers, xmlns))) {
-			jih(js, packet);
+		if(jih) {
+			jih(js, from, type, id, child);
 			return;
 		}
 	}
 
-	if(xmlnode_get_child_with_namespace(packet, "si", "http://jabber.org/protocol/si")) {
-		jabber_si_parse(js, packet);
-		return;
-	}
-
-	if(xmlnode_get_child_with_namespace(packet, "new-mail", "google:mail:notify")) {
-		jabber_gmail_poke(js, packet);
-		return;
-	}
-
 	purple_debug_info("jabber", "jabber_iq_parse\n");
 
-	if(xmlnode_get_child_with_namespace(packet, "ping", "urn:xmpp:ping")) {
-		jabber_ping_parse(js, packet);
-		return;
-	}
-
-	if (xmlnode_get_child_with_namespace(packet, "data", XEP_0231_NAMESPACE)) {
-		jabber_data_parse(js, packet);
-		return;
-	}
-
-	if (xmlnode_get_child_with_namespace(packet, "data", XEP_0047_NAMESPACE)
-		|| xmlnode_get_child_with_namespace(packet, "close", XEP_0047_NAMESPACE)
-		|| xmlnode_get_child_with_namespace(packet, "open", XEP_0047_NAMESPACE)) {
-		jabber_ibb_parse(js, packet);
-		return;
-	}
-
 	/* If we get here, send the default error reply mandated by XMPP-CORE */
-	if(!strcmp(type, "set") || !strcmp(type, "get")) {
+	if(type == JABBER_IQ_SET || type == JABBER_IQ_GET) {
 		JabberIq *iq = jabber_iq_new(js, JABBER_IQ_ERROR);
 
 		xmlnode_free(iq->node);
 		iq->node = xmlnode_copy(packet);
-		xmlnode_set_attrib(iq->node, "to", from);
-		xmlnode_remove_attrib(iq->node, "from");
+		if (from) {
+			xmlnode_set_attrib(iq->node, "to", from);
+			xmlnode_remove_attrib(iq->node, "from");
+		}
+
 		xmlnode_set_attrib(iq->node, "type", "error");
 		error = xmlnode_new_child(iq->node, "error");
 		xmlnode_set_attrib(error, "type", "cancel");
@@ -420,31 +401,95 @@ void jabber_iq_parse(JabberStream *js, xmlnode *packet)
 	}
 }
 
-void jabber_iq_register_handler(const char *xmlns, JabberIqHandler *handlerfunc)
+void jabber_iq_register_handler(const char *node, const char *xmlns, JabberIqHandler *handlerfunc)
+{
+	/*
+	 * This is valid because nodes nor namespaces cannot have spaces in them
+	 * (see http://www.w3.org/TR/2006/REC-xml-20060816/ and
+	 * http://www.w3.org/TR/REC-xml-names/)
+	 */
+	char *key = g_strdup_printf("%s %s", node, xmlns);
+	g_hash_table_replace(iq_handlers, key, handlerfunc);
+}
+
+void jabber_iq_signal_register(const gchar *node, const gchar *xmlns)
 {
-	g_hash_table_replace(iq_handlers, g_strdup(xmlns), handlerfunc);
+	gchar *key;
+	int ref;
+
+	g_return_if_fail(node != NULL && *node != '\0');
+	g_return_if_fail(xmlns != NULL && *xmlns != '\0');
+
+	key = g_strdup_printf("%s %s", node, xmlns);
+	ref = GPOINTER_TO_INT(g_hash_table_lookup(signal_iq_handlers, key));
+	if (ref == 0) {
+		g_hash_table_insert(signal_iq_handlers, key, GINT_TO_POINTER(1));
+	} else {
+		g_hash_table_insert(signal_iq_handlers, key, GINT_TO_POINTER(ref + 1));
+		g_free(key);
+	}
+}
+
+void jabber_iq_signal_unregister(const gchar *node, const gchar *xmlns)
+{
+	gchar *key;
+	int ref;
+
+	g_return_if_fail(node != NULL && *node != '\0');
+	g_return_if_fail(xmlns != NULL && *xmlns != '\0');
+
+	key = g_strdup_printf("%s %s", node, xmlns);
+	ref = GPOINTER_TO_INT(g_hash_table_lookup(signal_iq_handlers, key));
+
+	if (ref == 1) {
+		g_hash_table_remove(signal_iq_handlers, key);
+	} else if (ref > 1) {
+		g_hash_table_insert(signal_iq_handlers, key, GINT_TO_POINTER(ref - 1));
+	}
+
+	g_free(key);
 }
 
 void jabber_iq_init(void)
 {
 	iq_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+	signal_iq_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+
+	jabber_iq_register_handler("jingle", JINGLE, jingle_parse);
+	jabber_iq_register_handler("mailbox", "google:mail:notify",
+			jabber_gmail_poke);
+	jabber_iq_register_handler("new-mail", "google:mail:notify",
+			jabber_gmail_poke);
+	jabber_iq_register_handler("ping", "urn:xmpp:ping", jabber_ping_parse);
+	jabber_iq_register_handler("query", GOOGLE_JINGLE_INFO_NAMESPACE,
+			jabber_google_handle_jingle_info);
+	jabber_iq_register_handler("query", "http://jabber.org/protocol/bytestreams",
+			jabber_bytestreams_parse);
+	jabber_iq_register_handler("query", "http://jabber.org/protocol/disco#info",
+			jabber_disco_info_parse);
+	jabber_iq_register_handler("query", "http://jabber.org/protocol/disco#items",
+			jabber_disco_items_parse);
+	jabber_iq_register_handler("query", "jabber:iq:last", jabber_iq_last_parse);
+	jabber_iq_register_handler("query", "jabber:iq:oob", jabber_oob_parse);
+	jabber_iq_register_handler("query", "jabber:iq:register",
+			jabber_register_parse);
+	jabber_iq_register_handler("query", "jabber:iq:roster",
+			jabber_roster_parse);
+	jabber_iq_register_handler("query", "jabber:iq:version",
+			jabber_iq_version_parse);
+#ifdef USE_VV
+	jabber_iq_register_handler("session", "http://www.google.com/session",
+		jabber_google_session_parse);
+#endif
+	jabber_iq_register_handler("block", "urn:xmpp:blocking", jabber_blocklist_parse_push);
+	jabber_iq_register_handler("unblock", "urn:xmpp:blocking", jabber_blocklist_parse_push);
+	jabber_iq_register_handler("time", "urn:xmpp:time", jabber_time_parse);
 
-	jabber_iq_register_handler("jabber:iq:roster", jabber_roster_parse);
-	jabber_iq_register_handler("jabber:iq:oob", jabber_oob_parse);
-	jabber_iq_register_handler("http://jabber.org/protocol/bytestreams", jabber_bytestreams_parse);
-	jabber_iq_register_handler("jabber:iq:last", jabber_iq_last_parse);
-	jabber_iq_register_handler("jabber:iq:time", jabber_iq_time_parse);
-	jabber_iq_register_handler("urn:xmpp:time", jabber_iq_time_parse);
-	jabber_iq_register_handler("jabber:iq:version", jabber_iq_version_parse);
-	jabber_iq_register_handler("http://jabber.org/protocol/disco#info", jabber_disco_info_parse);
-	jabber_iq_register_handler("http://jabber.org/protocol/disco#items", jabber_disco_items_parse);
-	jabber_iq_register_handler("jabber:iq:register", jabber_register_parse);
-	jabber_iq_register_handler("urn:xmpp:ping", urn_xmpp_ping_parse);
 }
 
 void jabber_iq_uninit(void)
 {
 	g_hash_table_destroy(iq_handlers);
-	iq_handlers = NULL;
+	g_hash_table_destroy(signal_iq_handlers);
+	iq_handlers = signal_iq_handlers = NULL;
 }
-
diff --git a/libpurple/protocols/jabber/iq.h b/libpurple/protocols/jabber/iq.h
index a8743350cd..5d506841dc 100644
--- a/libpurple/protocols/jabber/iq.h
+++ b/libpurple/protocols/jabber/iq.h
@@ -19,12 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_IQ_H_
-#define _PURPLE_JABBER_IQ_H_
-
-#include "jabber.h"
-
-typedef struct _JabberIq JabberIq;
+#ifndef PURPLE_JABBER_IQ_H_
+#define PURPLE_JABBER_IQ_H_
 
 typedef enum {
 	JABBER_IQ_SET,
@@ -34,9 +30,52 @@ typedef enum {
 	JABBER_IQ_NONE
 } JabberIqType;
 
-typedef void (JabberIqHandler)(JabberStream *js, xmlnode *packet);
+#include "jabber.h"
+#include "connection.h"
 
-typedef void (JabberIqCallback)(JabberStream *js, xmlnode *packet, gpointer data);
+typedef struct _JabberIq JabberIq;
+
+/**
+ * A JabberIqHandler is called to process an incoming IQ stanza.
+ * Handlers typically process unsolicited incoming GETs or SETs for their
+ * registered namespace, but may be called to handle the results of a
+ * GET or SET that we generated if no JabberIqCallback was generated
+ * The handler may be called for the results of a GET or SET (RESULT or ERROR)
+ * that we generated
+ * if the generating function did not register a JabberIqCallback.
+ *
+ * @param js    The JabberStream object.
+ * @param from  The remote entity (the from attribute on the <iq/> stanza)
+ * @param type  The IQ type.
+ * @param id    The IQ id (the id attribute on the <iq/> stanza)
+ * @param child The child element of the <iq/> stanza that matches the name
+ *              and namespace registered with jabber_iq_register_handler.
+ *
+ * @see jabber_iq_register_handler()
+ * @see JabberIqCallback
+ */
+typedef void (JabberIqHandler)(JabberStream *js, const char *from,
+                               JabberIqType type, const char *id,
+                               xmlnode *child);
+
+/**
+ * A JabberIqCallback is called to process the results of a GET or SET that
+ * we send to a remote entity. The callback is matched based on the id
+ * of the incoming stanza (which matches the one on the initial stanza).
+ *
+ * @param js     The JabberStream object.
+ * @param from   The remote entity (the from attribute on the <iq/> stanza)
+ * @param type   The IQ type. The only possible values are JABBER_IQ_RESULT
+ *               and JABBER_IQ_ERROR.
+ * @param id     The IQ id (the id attribute on the <iq/> stanza)
+ * @param packet The <iq/> stanza
+ * @param data   The callback data passed to jabber_iq_set_callback()
+ *
+ * @see jabber_iq_set_callback()
+ */
+typedef void (JabberIqCallback)(JabberStream *js, const char *from,
+                                JabberIqType type, const char *id,
+                                xmlnode *packet, gpointer data);
 
 struct _JabberIq {
 	JabberIqType type;
@@ -65,6 +104,11 @@ void jabber_iq_free(JabberIq *iq);
 void jabber_iq_init(void);
 void jabber_iq_uninit(void);
 
-void jabber_iq_register_handler(const char *xmlns, JabberIqHandler *func);
+void jabber_iq_register_handler(const char *node, const char *xmlns,
+                                JabberIqHandler *func);
+
+/* Connected to namespace-handler registration signals */
+void jabber_iq_signal_register(const gchar *node, const gchar *xmlns);
+void jabber_iq_signal_unregister(const gchar *node, const gchar *xmlns);
 
-#endif /* _PURPLE_JABBER_IQ_H_ */
+#endif /* PURPLE_JABBER_IQ_H_ */
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index 39e9a3f672..b49751f06c 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -23,11 +23,13 @@
 #include "account.h"
 #include "accountopt.h"
 #include "blist.h"
+#include "core.h"
 #include "cmds.h"
 #include "connection.h"
 #include "conversation.h"
 #include "debug.h"
 #include "dnssrv.h"
+#include "imgstore.h"
 #include "message.h"
 #include "notify.h"
 #include "pluginpref.h"
@@ -36,12 +38,14 @@
 #include "prpl.h"
 #include "request.h"
 #include "server.h"
+#include "status.h"
 #include "util.h"
 #include "version.h"
 #include "xmlnode.h"
 
 #include "auth.h"
 #include "buddy.h"
+#include "caps.h"
 #include "chat.h"
 #include "data.h"
 #include "disco.h"
@@ -59,11 +63,15 @@
 #include "pep.h"
 #include "adhoccommands.h"
 
+#include "jingle/jingle.h"
+#include "jingle/rtp.h"
 
 #define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5)
 
-static PurplePlugin *my_protocol = NULL;
+PurplePlugin *jabber_plugin = NULL;
 GList *jabber_features = NULL;
+GList *jabber_identities = NULL;
+GSList *jabber_cmds = NULL;
 
 static void jabber_unregister_account_cb(JabberStream *js);
 static void try_srv_connect(JabberStream *js);
@@ -85,15 +93,16 @@ static void jabber_stream_init(JabberStream *js)
 }
 
 static void
-jabber_session_initialized_cb(JabberStream *js, xmlnode *packet, gpointer data)
+jabber_session_initialized_cb(JabberStream *js, const char *from,
+                              JabberIqType type, const char *id,
+                              xmlnode *packet, gpointer data)
 {
-	const char *type = xmlnode_get_attrib(packet, "type");
-	if(type && !strcmp(type, "result")) {
-		jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
+	if (type == JABBER_IQ_RESULT) {
+		jabber_disco_items_server(js);
 		if(js->unregistration)
 			jabber_unregister_account_cb(js);
 	} else {
-		purple_connection_error_reason (js->gc,
+		purple_connection_error_reason(js->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 			("Error initializing session"));
 	}
@@ -112,26 +121,30 @@ static void jabber_session_init(JabberStream *js)
 	jabber_iq_send(iq);
 }
 
-static void jabber_bind_result_cb(JabberStream *js, xmlnode *packet,
-		gpointer data)
+static void jabber_bind_result_cb(JabberStream *js, const char *from,
+                                  JabberIqType type, const char *id,
+                                  xmlnode *packet, gpointer data)
 {
-	const char *type = xmlnode_get_attrib(packet, "type");
 	xmlnode *bind;
 
-	if(type && !strcmp(type, "result") &&
+	if (type == JABBER_IQ_RESULT &&
 			(bind = xmlnode_get_child_with_namespace(packet, "bind", "urn:ietf:params:xml:ns:xmpp-bind"))) {
 		xmlnode *jid;
 		char *full_jid;
 		if((jid = xmlnode_get_child(bind, "jid")) && (full_jid = xmlnode_get_data(jid))) {
-			JabberBuddy *my_jb = NULL;
 			jabber_id_free(js->user);
-			if(!(js->user = jabber_id_new(full_jid))) {
-				purple_connection_error_reason (js->gc,
+
+			js->user = jabber_id_new(full_jid);
+			if (js->user == NULL) {
+				purple_connection_error_reason(js->gc,
 					PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-					_("Invalid response from server."));
+					_("Invalid response from server"));
+				g_free(full_jid);
+				return;
 			}
-			if((my_jb = jabber_buddy_find(js, full_jid, TRUE)))
-				my_jb->subscription |= JABBER_SUB_BOTH;
+
+			js->user_jb = jabber_buddy_find(js, full_jid, TRUE);
+			js->user_jb->subscription |= JABBER_SUB_BOTH;
 
 			purple_connection_set_display_name(js->gc, full_jid);
 
@@ -140,7 +153,7 @@ static void jabber_bind_result_cb(JabberStream *js, xmlnode *packet,
 	} else {
 		PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 		char *msg = jabber_parse_error(js, packet, &reason);
-		purple_connection_error_reason (js->gc, reason, msg);
+		purple_connection_error_reason(js->gc, reason, msg);
 		g_free(msg);
 	}
 
@@ -180,14 +193,14 @@ static char *jabber_prep_resource(char *input) {
 	return purple_strreplace(input, "__HOSTNAME__", hostname);
 }
 
-static void jabber_stream_features_parse(JabberStream *js, xmlnode *packet)
+void jabber_stream_features_parse(JabberStream *js, xmlnode *packet)
 {
 	if(xmlnode_get_child(packet, "starttls")) {
 		if(jabber_process_starttls(js, packet))
 
 			return;
-	} else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE) && !js->gsc) {
-		purple_connection_error_reason (js->gc,
+	} else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE) && !jabber_stream_is_ssl(js)) {
+		purple_connection_error_reason(js->gc,
 			 PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
 			_("You require encryption, but it is not available on this server."));
 		return;
@@ -229,7 +242,7 @@ static void jabber_stream_handle_error(JabberStream *js, xmlnode *packet)
 	PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 	char *msg = jabber_parse_error(js, packet, &reason);
 
-	purple_connection_error_reason (js->gc, reason, msg);
+	purple_connection_error_reason(js->gc, reason, msg);
 
 	g_free(msg);
 }
@@ -240,7 +253,7 @@ void jabber_process_packet(JabberStream *js, xmlnode **packet)
 {
 	const char *xmlns;
 
-	purple_signal_emit(my_protocol, "jabber-receiving-xmlnode", js->gc, packet);
+	purple_signal_emit(jabber_plugin, "jabber-receiving-xmlnode", js->gc, packet);
 
 	/* if the signal leaves us with a null packet, we're done */
 	if(NULL == *packet)
@@ -311,9 +324,11 @@ static void jabber_send_cb(gpointer data, gint source, PurpleInputCondition cond
 	if (ret < 0 && errno == EAGAIN)
 		return;
 	else if (ret <= 0) {
-		purple_connection_error_reason (js->gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Write error"));
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+				g_strerror(errno));
+		purple_connection_error_reason(js->gc,
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		return;
 	}
 
@@ -336,9 +351,11 @@ static gboolean do_jabber_send_raw(JabberStream *js, const char *data, int len)
 	}
 
 	if (ret < 0 && errno != EAGAIN) {
-		purple_connection_error_reason (js->gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Write error"));
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+				g_strerror(errno));
+		purple_connection_error_reason(js->gc,
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		success = FALSE;
 	} else if (ret < len) {
 		if (ret < 0)
@@ -372,6 +389,11 @@ void jabber_send_raw(JabberStream *js, const char *data, int len)
 			char *data_start, *tag_end = strchr(tag_start, '>');
 			text = g_strdup(data);
 
+			/* Better to print out some wacky debugging than crash
+			 * due to a plugin sending bad xml */
+			if (tag_end == NULL)
+				tag_end = tag_start;
+
 			data_start = text + (tag_end - data) + 1;
 
 			last_part = strchr(data_start, '<');
@@ -379,7 +401,7 @@ void jabber_send_raw(JabberStream *js, const char *data, int len)
 		}
 
 		purple_debug(PURPLE_DEBUG_MISC, "jabber", "Sending%s: %s%s%s\n",
-				js->gsc ? " (ssl)" : "", text ? text : data,
+				jabber_stream_is_ssl(js) ? " (ssl)" : "", text ? text : data,
 				last_part ? "password removed" : "",
 				last_part ? last_part : "");
 
@@ -389,7 +411,7 @@ void jabber_send_raw(JabberStream *js, const char *data, int len)
 	/* If we've got a security layer, we need to encode the data,
 	 * splitting it on the maximum buffer length negotiated */
 
-	purple_signal_emit(my_protocol, "jabber-sending-text", js->gc, &data);
+	purple_signal_emit(jabber_plugin, "jabber-sending-text", js->gc, &data);
 	if (data == NULL)
 		return;
 
@@ -420,7 +442,13 @@ void jabber_send_raw(JabberStream *js, const char *data, int len)
 	}
 #endif
 
-	do_jabber_send_raw(js, data, len);
+	if (len == -1)
+		len = strlen(data);
+
+	if (js->bosh)
+		jabber_bosh_connection_send_raw(js->bosh, data);
+	else
+		do_jabber_send_raw(js, data, len);
 }
 
 int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len)
@@ -430,34 +458,38 @@ int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len)
 	return len;
 }
 
-void jabber_send(JabberStream *js, xmlnode *packet)
+void jabber_send_signal_cb(PurpleConnection *pc, xmlnode **packet,
+                           gpointer unused)
 {
+	JabberStream *js;
 	char *txt;
 	int len;
 
-	purple_signal_emit(my_protocol, "jabber-sending-xmlnode", js->gc, &packet);
-
-	/* if we get NULL back, we're done processing */
-	if(NULL == packet)
+	if (NULL == packet)
 		return;
 
-	txt = xmlnode_to_str(packet, &len);
+	js = purple_connection_get_protocol_data(pc);
+	if (js->bosh)
+		if (g_str_equal((*packet)->name, "message") ||
+				g_str_equal((*packet)->name, "iq") ||
+				g_str_equal((*packet)->name, "presence"))
+			xmlnode_set_namespace(*packet, "jabber:client");
+	txt = xmlnode_to_str(*packet, &len);
 	jabber_send_raw(js, txt, len);
 	g_free(txt);
 }
 
-static void jabber_pong_cb(JabberStream *js, xmlnode *packet, gpointer unused)
+void jabber_send(JabberStream *js, xmlnode *packet)
 {
-	purple_timeout_remove(js->keepalive_timeout);
-	js->keepalive_timeout = -1;
+	purple_signal_emit(jabber_plugin, "jabber-sending-xmlnode", js->gc, &packet);
 }
 
-static gboolean jabber_pong_timeout(PurpleConnection *gc)
+static gboolean jabber_keepalive_timeout(PurpleConnection *gc)
 {
 	JabberStream *js = gc->proto_data;
 	purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-					_("Ping timeout"));
-	js->keepalive_timeout = -1;
+					_("Ping timed out"));
+	js->keepalive_timeout = 0;
 	return FALSE;
 }
 
@@ -465,15 +497,10 @@ void jabber_keepalive(PurpleConnection *gc)
 {
 	JabberStream *js = gc->proto_data;
 
-	if (js->keepalive_timeout == -1) {
-		JabberIq *iq = jabber_iq_new(js, JABBER_IQ_GET);
-
-		xmlnode *ping = xmlnode_new_child(iq->node, "ping");
-		xmlnode_set_namespace(ping, "urn:xmpp:ping");
-
-		js->keepalive_timeout = purple_timeout_add_seconds(120, (GSourceFunc)(jabber_pong_timeout), gc);
-		jabber_iq_set_callback(iq, jabber_pong_cb, NULL);
-		jabber_iq_send(iq);
+	if (js->keepalive_timeout == 0) {
+		jabber_keepalive_ping(js);
+		js->keepalive_timeout = purple_timeout_add_seconds(120,
+				(GSourceFunc)(jabber_keepalive_timeout), gc);
 	}
 }
 
@@ -504,13 +531,15 @@ jabber_recv_cb_ssl(gpointer data, PurpleSslConnection *gsc,
 	if(len < 0 && errno == EAGAIN)
 		return;
 	else {
+		gchar *tmp;
 		if (len == 0)
-			purple_debug_info("jabber", "Server closed the connection.\n");
+			tmp = g_strdup_printf(_("Server closed the connection"));
 		else
-			purple_debug_info("jabber", "Disconnected: %s\n", g_strerror(errno));
-		purple_connection_error_reason (js->gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Read Error"));
+			tmp = g_strdup_printf(_("Lost connection with server: %s"),
+					g_strerror(errno));
+		purple_connection_error_reason(js->gc,
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 	}
 }
 
@@ -549,13 +578,15 @@ jabber_recv_cb(gpointer data, gint source, PurpleInputCondition condition)
 	} else if(len < 0 && errno == EAGAIN) {
 		return;
 	} else {
+		gchar *tmp;
 		if (len == 0)
-			purple_debug_info("jabber", "Server closed the connection.\n");
+			tmp = g_strdup_printf(_("Server closed the connection"));
 		else
-			purple_debug_info("jabber", "Disconnected: %s\n", g_strerror(errno));
-		purple_connection_error_reason (js->gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Read Error"));
+			tmp = g_strdup_printf(_("Lost connection with server: %s"),
+					g_strerror(errno));
+		purple_connection_error_reason(js->gc,
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 	}
 }
 
@@ -583,6 +614,47 @@ jabber_login_callback_ssl(gpointer data, PurpleSslConnection *gsc,
 	jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING_ENCRYPTION);
 }
 
+static void
+txt_resolved_cb(GList *responses, gpointer data)
+{
+	JabberStream *js = data;
+
+	js->srv_query_data = NULL;
+
+	if (responses == NULL) {
+		purple_connection_error_reason(js->gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+				_("Unable to find alternative XMPP connection "
+				  "methods after failing to connect directly."));
+		return;
+	}
+
+	while (responses) {
+		PurpleTxtResponse *resp = responses->data;
+		gchar **token;
+		token = g_strsplit(purple_txt_response_get_content(resp), "=", 2);
+		if (!strcmp(token[0], "_xmpp-client-xbosh")) {
+			purple_debug_info("jabber","Found alternative connection method using %s at %s.\n", token[0], token[1]);
+			js->bosh = jabber_bosh_connection_init(js, token[1]);
+			g_strfreev(token);
+			break;
+		}
+		g_strfreev(token);
+		purple_txt_response_destroy(resp);
+		responses = g_list_delete_link(responses, responses);
+	}
+
+	if (js->bosh) {
+		jabber_bosh_connection_connect(js->bosh);
+	} else {
+		purple_debug_info("jabber","Didn't find an alternative connection method.\n");
+	}
+
+	if (responses) {
+		g_list_foreach(responses, (GFunc)purple_txt_response_destroy, NULL);
+		g_list_free(responses);
+	}
+}
 
 static void
 jabber_login_callback(gpointer data, gint source, const gchar *error)
@@ -595,12 +667,9 @@ jabber_login_callback(gpointer data, gint source, const gchar *error)
 			purple_debug_error("jabber", "Unable to connect to server: %s.  Trying next SRV record.\n", error);
 			try_srv_connect(js);
 		} else {
-			gchar *tmp;
-			tmp = g_strdup_printf(_("Could not establish a connection with the server:\n%s"),
-					      error);
-			purple_connection_error_reason(gc,
-					PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
-			g_free(tmp);
+			purple_debug_info("jabber","Couldn't connect directly to %s. Trying to find alternative connection methods, like BOSH.\n", js->user->domain);
+			js->srv_query_data = purple_txt_resolve("_xmppconnect",
+					js->user->domain, txt_resolved_cb, js);
 		}
 		return;
 	}
@@ -640,6 +709,8 @@ static void tls_init(JabberStream *js)
 	js->gc->inpa = 0;
 	js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd,
 			jabber_login_callback_ssl, jabber_ssl_connect_failure, js->certificate_CN, js->gc);
+	/* The fd is no longer our concern */
+	js->fd = -1;
 }
 
 static gboolean jabber_login_connect(JabberStream *js, const char *domain, const char *host, int port,
@@ -655,12 +726,12 @@ static gboolean jabber_login_connect(JabberStream *js, const char *domain, const
 	else
 		js->serverFQDN = g_strdup(host);
 
-	if (purple_proxy_connect(js->gc, js->gc->account, host,
-			port, jabber_login_callback, js->gc) == NULL) {
+	if (purple_proxy_connect(js->gc, purple_connection_get_account(js->gc),
+			host, port, jabber_login_callback, js->gc) == NULL) {
 		if (fatal_failure) {
-			purple_connection_error_reason (js->gc,
+			purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Unable to create socket"));
+				_("Unable to connect"));
 		}
 
 		return FALSE;
@@ -682,7 +753,8 @@ static void try_srv_connect(JabberStream *js)
 
 	/* Fall back to the defaults (I'm not sure if we should actually do this) */
 	jabber_login_connect(js, js->user->domain, js->user->domain,
-		purple_account_get_int(js->gc->account, "port", 5222), TRUE);
+			purple_account_get_int(purple_connection_get_account(js->gc), "port", 5222),
+			TRUE);
 }
 
 static void srv_resolved_cb(PurpleSrvResponse *resp, int results, gpointer data)
@@ -697,84 +769,178 @@ static void srv_resolved_cb(PurpleSrvResponse *resp, int results, gpointer data)
 		try_srv_connect(js);
 	} else {
 		jabber_login_connect(js, js->user->domain, js->user->domain,
-			purple_account_get_int(js->gc->account, "port", 5222), TRUE);
+				purple_account_get_int(purple_connection_get_account(js->gc), "port", 5222),
+				TRUE);
 	}
 }
 
-void
-jabber_login(PurpleAccount *account)
+static JabberStream *
+jabber_stream_new(PurpleAccount *account)
 {
 	PurpleConnection *gc = purple_account_get_connection(account);
-	const char *connect_server = purple_account_get_string(account,
-			"connect_server", "");
 	JabberStream *js;
-	JabberBuddy *my_jb = NULL;
+	PurplePresence *presence;
+	gchar *user;
+	gchar *slash;
 
-	gc->flags |= PURPLE_CONNECTION_HTML |
-		PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY;
 	js = gc->proto_data = g_new0(JabberStream, 1);
 	js->gc = gc;
 	js->fd = -1;
-	js->iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, g_free);
-	js->disco_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, g_free);
-	js->buddies = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, (GDestroyNotify)jabber_buddy_free);
-	js->chats = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, (GDestroyNotify)jabber_chat_free);
-	js->user = jabber_id_new(purple_account_get_username(account));
-	js->next_id = g_random_int();
-	js->write_buffer = purple_circ_buffer_new(512);
-	js->old_length = 0;
-	js->keepalive_timeout = -1;
-	js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user ? js->user->domain : NULL);
 
-	if(!js->user) {
-		purple_connection_error_reason (gc,
+	user = g_strdup(purple_account_get_username(account));
+	/* jabber_id_new doesn't accept "user@domain/" as valid */
+	slash = strchr(user, '/');
+	if (slash && *(slash + 1) == '\0')
+		*slash = '\0';
+	js->user = jabber_id_new(user);
+
+	if (!js->user) {
+		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
 			_("Invalid XMPP ID"));
-		return;
+		/* Destroying the connection will free the JabberStream */
+		return NULL;
 	}
 
 	if (!js->user->domain || *(js->user->domain) == '\0') {
-		purple_connection_error_reason (gc,
+		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
 			_("Invalid XMPP ID. Domain must be set."));
-		return;
+		/* Destroying the connection will free the JabberStream */
+		return NULL;
+	}
+
+	js->buddies = g_hash_table_new_full(g_str_hash, g_str_equal,
+			g_free, (GDestroyNotify)jabber_buddy_free);
+
+	js->user_jb = jabber_buddy_find(js, user, TRUE);
+	g_free(user);
+	if (!js->user_jb) {
+		/* This basically *can't* fail, but for good measure... */
+		purple_connection_error_reason(gc,
+			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
+			_("Invalid XMPP ID"));
+		/* Destroying the connection will free the JabberStream */
+		g_return_val_if_reached(NULL);
 	}
 
-	if((my_jb = jabber_buddy_find(js, purple_account_get_username(account), TRUE)))
-		my_jb->subscription |= JABBER_SUB_BOTH;
+	js->user_jb->subscription |= JABBER_SUB_BOTH;
+
+	js->iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal,
+			g_free, g_free);
+	js->chats = g_hash_table_new_full(g_str_hash, g_str_equal,
+			g_free, (GDestroyNotify)jabber_chat_free);
+	js->next_id = g_random_int();
+	js->write_buffer = purple_circ_buffer_new(512);
+	js->old_length = 0;
+	js->keepalive_timeout = 0;
+	/* Set the default protocol version to 1.0. Overridden in parser.c. */
+	js->protocol_version = JABBER_PROTO_1_0;
+	js->sessions = NULL;
+	js->stun_ip = NULL;
+	js->stun_port = 0;
+	js->stun_query = NULL;
+
+	/* if we are idle, set idle-ness on the stream (this could happen if we get
+		disconnected and the reconnects while being idle. I don't think it makes
+		sense to do this when registering a new account... */
+	presence = purple_account_get_presence(account);
+	if (purple_presence_is_idle(presence))
+		js->idle = purple_presence_get_idle_time(presence);
+
+	return js;
+}
+
+static void
+jabber_stream_connect(JabberStream *js)
+{
+	PurpleConnection *gc = js->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
+	const char *connect_server = purple_account_get_string(account,
+			"connect_server", "");
+	const char *bosh_url = purple_account_get_string(account,
+			"bosh_url", "");
 
 	jabber_stream_set_state(js, JABBER_STREAM_CONNECTING);
 
+	/* If both BOSH and a Connect Server are specified, we prefer BOSH. I'm not
+	 * attached to that choice, though.
+	 */
+	if (*bosh_url) {
+		js->bosh = jabber_bosh_connection_init(js, bosh_url);
+		if (js->bosh)
+			jabber_bosh_connection_connect(js->bosh);
+		else {
+			purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
+				_("Malformed BOSH URL"));
+		}
+
+		return;
+	}
+
+	js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user->domain);
+
 	/* if they've got old-ssl mode going, we probably want to ignore SRV lookups */
-	if(purple_account_get_bool(js->gc->account, "old_ssl", FALSE)) {
+	if(purple_account_get_bool(account, "old_ssl", FALSE)) {
 		if(purple_ssl_is_supported()) {
-			js->gsc = purple_ssl_connect(js->gc->account,
-					js->certificate_CN,
-					purple_account_get_int(account, "port", 5223), jabber_login_callback_ssl,
-					jabber_ssl_connect_failure, js->gc);
+			js->gsc = purple_ssl_connect(account, js->certificate_CN,
+					purple_account_get_int(account, "port", 5223),
+					jabber_login_callback_ssl, jabber_ssl_connect_failure, gc);
+			if (!js->gsc) {
+				purple_connection_error_reason(gc,
+					PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+					_("Unable to establish SSL connection"));
+			}
 		} else {
-			purple_connection_error_reason (js->gc,
+			purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 				_("SSL support unavailable"));
 		}
+
+		return;
 	}
 
 	/* no old-ssl, so if they've specified a connect server, we'll use that, otherwise we'll
 	 * invoke the magic of SRV lookups, to figure out host and port */
-	if(!js->gsc) {
-		if(connect_server[0]) {
-			jabber_login_connect(js, js->user->domain, connect_server, purple_account_get_int(account, "port", 5222), TRUE);
-		} else {
-			js->srv_query_data = purple_srv_resolve("xmpp-client",
-					"tcp", js->user->domain, srv_resolved_cb, js);
-		}
+	if(connect_server[0]) {
+		jabber_login_connect(js, js->user->domain, connect_server,
+				purple_account_get_int(account, "port", 5222), TRUE);
+	} else {
+		js->srv_query_data = purple_srv_resolve("xmpp-client",
+				"tcp", js->user->domain, srv_resolved_cb, js);
 	}
 }
 
+void
+jabber_login(PurpleAccount *account)
+{
+	PurpleConnection *gc = purple_account_get_connection(account);
+	JabberStream *js;
+	PurpleStoredImage *image;
+
+	gc->flags |= PURPLE_CONNECTION_HTML |
+		PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY;
+	js = jabber_stream_new(account);
+	if (js == NULL)
+		return;
+
+	/*
+	 * Calculate the avatar hash for our current image so we know (when we
+	 * fetch our vCard and PEP avatar) if we should send our avatar to the
+	 * server.
+	 */
+	image = purple_buddy_icons_find_account_icon(account);
+	if (image != NULL) {
+		js->initial_avatar_hash =
+			jabber_calculate_data_sha1sum(purple_imgstore_get_data(image),
+					purple_imgstore_get_size(image));
+		purple_imgstore_unref(image);
+	}
+
+	jabber_stream_connect(js);
+}
+
 
 static gboolean
 conn_close_cb(gpointer data)
@@ -796,17 +962,18 @@ jabber_connection_schedule_close(JabberStream *js)
 }
 
 static void
-jabber_registration_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+jabber_registration_result_cb(JabberStream *js, const char *from,
+                              JabberIqType type, const char *id,
+                              xmlnode *packet, gpointer data)
 {
 	PurpleAccount *account = purple_connection_get_account(js->gc);
-	const char *type = xmlnode_get_attrib(packet, "type");
 	char *buf;
 	char *to = data;
 
-	if(!strcmp(type, "result")) {
+	if (type == JABBER_IQ_RESULT) {
 		if(js->registration) {
-		buf = g_strdup_printf(_("Registration of %s@%s successful"),
-				js->user->node, js->user->domain);
+			buf = g_strdup_printf(_("Registration of %s@%s successful"),
+					js->user->node, js->user->domain);
 			if(account->registration_cb)
 				(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
 		} else {
@@ -831,13 +998,14 @@ jabber_registration_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
 	}
 	g_free(to);
 	if(js->registration)
-	jabber_connection_schedule_close(js);
+		jabber_connection_schedule_close(js);
 }
 
 static void
-jabber_unregistration_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+jabber_unregistration_result_cb(JabberStream *js, const char *from,
+                                JabberIqType type, const char *id,
+                                xmlnode *packet, gpointer data)
 {
-	const char *type = xmlnode_get_attrib(packet, "type");
 	char *buf;
 	char *to = data;
 
@@ -845,7 +1013,7 @@ jabber_unregistration_result_cb(JabberStream *js, xmlnode *packet, gpointer data
 	 * the server, so there should always be a 'to' address. */
 	g_return_if_fail(to != NULL);
 
-	if(!strcmp(type, "result")) {
+	if (type == JABBER_IQ_RESULT) {
 		buf = g_strdup_printf(_("Registration from %s successfully removed"),
 							  to);
 		purple_notify_info(NULL, _("Unregistration Successful"),
@@ -994,31 +1162,45 @@ static void jabber_register_x_data_cb(JabberStream *js, xmlnode *result, gpointe
 	jabber_iq_send(iq);
 }
 
-void jabber_register_parse(JabberStream *js, xmlnode *packet)
+static const struct {
+	const char *name;
+	const char *label;
+} registration_fields[] = {
+	{ "email",   N_("Email") },
+	{ "nick",    N_("Nickname") },
+	{ "first",   N_("First name") },
+	{ "last",    N_("Last name") },
+	{ "address", N_("Address") },
+	{ "city",    N_("City") },
+	{ "state",   N_("State") },
+	{ "zip",     N_("Postal code") },
+	{ "phone",   N_("Phone") },
+	{ "url",     N_("URL") },
+	{ "date",    N_("Date") },
+	{ NULL, NULL }
+};
+
+void jabber_register_parse(JabberStream *js, const char *from, JabberIqType type,
+                           const char *id, xmlnode *query)
 {
 	PurpleAccount *account = purple_connection_get_account(js->gc);
-	const char *type;
-	const char *from;
 	PurpleRequestFields *fields;
 	PurpleRequestFieldGroup *group;
 	PurpleRequestField *field;
-	xmlnode *query, *x, *y;
+	xmlnode *x, *y, *node;
 	char *instructions;
 	JabberRegisterCBData *cbdata;
 	gboolean registered = FALSE;
+	int i;
 
-	if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "result"))
+	if (type != JABBER_IQ_RESULT)
 		return;
 
-	from = xmlnode_get_attrib(packet, "from");
-
 	if(js->registration) {
 		/* get rid of the login thingy */
 		purple_connection_set_state(js->gc, PURPLE_CONNECTED);
 	}
 
-	query = xmlnode_get_child(packet, "query");
-
 	if(xmlnode_get_child(query, "registered")) {
 		registered = TRUE;
 
@@ -1062,74 +1244,53 @@ void jabber_register_parse(JabberStream *js, xmlnode *packet)
 	group = purple_request_field_group_new(NULL);
 	purple_request_fields_add_group(fields, group);
 
-	if(js->registration)
-		field = purple_request_field_string_new("username", _("Username"), js->user->node, FALSE);
-	else
-		field = purple_request_field_string_new("username", _("Username"), NULL, FALSE);
-
-	purple_request_field_group_add_field(group, field);
-
-	if(js->registration)
-		field = purple_request_field_string_new("password", _("Password"),
-									purple_connection_get_password(js->gc), FALSE);
-	else
-		field = purple_request_field_string_new("password", _("Password"), NULL, FALSE);
-
-	purple_request_field_string_set_masked(field, TRUE);
-	purple_request_field_group_add_field(group, field);
-
-	if(xmlnode_get_child(query, "name")) {
+	if((node = xmlnode_get_child(query, "username"))) {
+		char *data = xmlnode_get_data(node);
 		if(js->registration)
-			field = purple_request_field_string_new("name", _("Name"),
-													purple_account_get_alias(js->gc->account), FALSE);
+			field = purple_request_field_string_new("username", _("Username"), data ? data : js->user->node, FALSE);
 		else
-			field = purple_request_field_string_new("name", _("Name"), NULL, FALSE);
-		purple_request_field_group_add_field(group, field);
-	}
-	if(xmlnode_get_child(query, "email")) {
-		field = purple_request_field_string_new("email", _("Email"), NULL, FALSE);
-		purple_request_field_group_add_field(group, field);
-	}
-	if(xmlnode_get_child(query, "nick")) {
-		field = purple_request_field_string_new("nick", _("Nickname"), NULL, FALSE);
-		purple_request_field_group_add_field(group, field);
-	}
-	if(xmlnode_get_child(query, "first")) {
-		field = purple_request_field_string_new("first", _("First name"), NULL, FALSE);
-		purple_request_field_group_add_field(group, field);
-	}
-	if(xmlnode_get_child(query, "last")) {
-		field = purple_request_field_string_new("last", _("Last name"), NULL, FALSE);
-		purple_request_field_group_add_field(group, field);
-	}
-	if(xmlnode_get_child(query, "address")) {
-		field = purple_request_field_string_new("address", _("Address"), NULL, FALSE);
-		purple_request_field_group_add_field(group, field);
-	}
-	if(xmlnode_get_child(query, "city")) {
-		field = purple_request_field_string_new("city", _("City"), NULL, FALSE);
-		purple_request_field_group_add_field(group, field);
-	}
-	if(xmlnode_get_child(query, "state")) {
-		field = purple_request_field_string_new("state", _("State"), NULL, FALSE);
-		purple_request_field_group_add_field(group, field);
-	}
-	if(xmlnode_get_child(query, "zip")) {
-		field = purple_request_field_string_new("zip", _("Postal code"), NULL, FALSE);
+			field = purple_request_field_string_new("username", _("Username"), data, FALSE);
+
 		purple_request_field_group_add_field(group, field);
+		g_free(data);
 	}
-	if(xmlnode_get_child(query, "phone")) {
-		field = purple_request_field_string_new("phone", _("Phone"), NULL, FALSE);
+	if((node = xmlnode_get_child(query, "password"))) {
+		if(js->registration)
+			field = purple_request_field_string_new("password", _("Password"),
+										purple_connection_get_password(js->gc), FALSE);
+		else {
+			char *data = xmlnode_get_data(node);
+			field = purple_request_field_string_new("password", _("Password"), data, FALSE);
+			g_free(data);
+		}
+
+		purple_request_field_string_set_masked(field, TRUE);
 		purple_request_field_group_add_field(group, field);
 	}
-	if(xmlnode_get_child(query, "url")) {
-		field = purple_request_field_string_new("url", _("URL"), NULL, FALSE);
+
+	if((node = xmlnode_get_child(query, "name"))) {
+		if(js->registration)
+			field = purple_request_field_string_new("name", _("Name"),
+													purple_account_get_alias(js->gc->account), FALSE);
+		else {
+			char *data = xmlnode_get_data(node);
+			field = purple_request_field_string_new("name", _("Name"), data, FALSE);
+			g_free(data);
+		}
 		purple_request_field_group_add_field(group, field);
 	}
-	if(xmlnode_get_child(query, "date")) {
-		field = purple_request_field_string_new("date", _("Date"), NULL, FALSE);
-		purple_request_field_group_add_field(group, field);
+
+	for (i = 0; registration_fields[i].name != NULL; ++i) {
+		if ((node = xmlnode_get_child(query, registration_fields[i].name))) {
+			char *data = xmlnode_get_data(node);
+			field = purple_request_field_string_new(registration_fields[i].name,
+			                                        _(registration_fields[i].label),
+			                                        data, FALSE);
+			purple_request_field_group_add_field(group, field);
+			g_free(data);
+		}
 	}
+
 	if(registered) {
 		field = purple_request_field_bool_new("unregister", _("Unregister"), FALSE);
 		purple_request_field_group_add_field(group, field);
@@ -1190,72 +1351,24 @@ void jabber_register_gateway(JabberStream *js, const char *gateway) {
 
 void jabber_register_account(PurpleAccount *account)
 {
-	PurpleConnection *gc = purple_account_get_connection(account);
 	JabberStream *js;
-	JabberBuddy *my_jb = NULL;
-	const char *connect_server = purple_account_get_string(account,
-			"connect_server", "");
-	const char *server;
 
-	js = gc->proto_data = g_new0(JabberStream, 1);
-	js->gc = gc;
-	js->registration = TRUE;
-	js->iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, g_free);
-	js->disco_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, g_free);
-	js->user = jabber_id_new(purple_account_get_username(account));
-	js->next_id = g_random_int();
-	js->old_length = 0;
-
-	if(!js->user) {
-		purple_connection_error_reason (gc,
-			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
-			_("Invalid XMPP ID"));
+	js = jabber_stream_new(account);
+	if (js == NULL)
 		return;
-	}
-
-	js->write_buffer = purple_circ_buffer_new(512);
 
-	if((my_jb = jabber_buddy_find(js, purple_account_get_username(account), TRUE)))
-		my_jb->subscription |= JABBER_SUB_BOTH;
-
-	server = connect_server[0] ? connect_server : js->user->domain;
-	js->certificate_CN = g_strdup(server);
-
-	jabber_stream_set_state(js, JABBER_STREAM_CONNECTING);
-
-	if(purple_account_get_bool(account, "old_ssl", FALSE)) {
-		if(purple_ssl_is_supported()) {
-			js->gsc = purple_ssl_connect(account, server,
-					purple_account_get_int(account, "port", 5222),
-					jabber_login_callback_ssl, jabber_ssl_connect_failure, gc);
-		} else {
-			purple_connection_error_reason (gc,
-				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
-				_("SSL support unavailable"));
-		}
-	}
-
-	if(!js->gsc) {
-		if (connect_server[0]) {
-			jabber_login_connect(js, js->user->domain, server,
-			                     purple_account_get_int(account,
-			                                          "port", 5222), TRUE);
-		} else {
-			js->srv_query_data = purple_srv_resolve("xmpp-client",
-			                                      "tcp",
-			                                      js->user->domain,
-			                                      srv_resolved_cb,
-			                                      js);
-		}
-	}
+	js->registration = TRUE;
+	jabber_stream_connect(js);
 }
 
-static void jabber_unregister_account_iq_cb(JabberStream *js, xmlnode *packet, gpointer data) {
+static void
+jabber_unregister_account_iq_cb(JabberStream *js, const char *from,
+                                JabberIqType type, const char *id,
+                                xmlnode *packet, gpointer data)
+{
 	PurpleAccount *account = purple_connection_get_account(js->gc);
-	const char *type = xmlnode_get_attrib(packet,"type");
-	if(!strcmp(type,"error")) {
+
+	if (type == JABBER_IQ_ERROR) {
 		char *msg = jabber_parse_error(js, packet, NULL);
 
 		purple_notify_error(js->gc, _("Error unregistering account"),
@@ -1263,7 +1376,7 @@ static void jabber_unregister_account_iq_cb(JabberStream *js, xmlnode *packet, g
 		g_free(msg);
 		if(js->unregistration_cb)
 			js->unregistration_cb(account, FALSE, js->unregistration_user_data);
-	} else if(!strcmp(type,"result")) {
+	} else {
 		purple_notify_info(js->gc, _("Account successfully unregistered"),
 						   _("Account successfully unregistered"), NULL);
 		if(js->unregistration_cb)
@@ -1316,16 +1429,28 @@ void jabber_unregister_account(PurpleAccount *account, PurpleAccountUnregistrati
 	jabber_unregister_account_cb(js);
 }
 
+/* TODO: As Will pointed out in IRC, after being notified by the core to
+ * shutdown, we should async. wait for the server to send us the stream
+ * termination before destorying everything. That seems like it would require
+ * changing the semantics of prpl->close(), so it's a good idea for 3.0.0.
+ */
 void jabber_close(PurpleConnection *gc)
 {
 	JabberStream *js = gc->proto_data;
 
+	/* Close all of the open Jingle sessions on this stream */
+	jingle_terminate_sessions(js);
+
 	/* Don't perform any actions on the ssl connection
 	 * if we were forcibly disconnected because it will crash
 	 * on some SSL backends.
 	 */
-	if (!gc->disconnect_timeout)
-		jabber_send_raw(js, "</stream:stream>", -1);
+	if (!gc->disconnect_timeout) {
+		if (js->bosh)
+			jabber_bosh_connection_close(js->bosh);
+		else if ((js->gsc && js->gsc->fd > 0) || js->fd > 0)
+			jabber_send_raw(js, "</stream:stream>", -1);
+	}
 
 	if (js->srv_query_data)
 		purple_srv_cancel(js->srv_query_data);
@@ -1341,14 +1466,15 @@ void jabber_close(PurpleConnection *gc)
 		close(js->fd);
 	}
 
+	if (js->bosh)
+		jabber_bosh_connection_destroy(js->bosh);
+
 	jabber_buddy_remove_all_pending_buddy_info_requests(js);
 
 	jabber_parser_free(js);
 
 	if(js->iq_callbacks)
 		g_hash_table_destroy(js->iq_callbacks);
-	if(js->disco_callbacks)
-		g_hash_table_destroy(js->disco_callbacks);
 	if(js->buddies)
 		g_hash_table_destroy(js->buddies);
 	if(js->chats)
@@ -1381,7 +1507,9 @@ void jabber_close(PurpleConnection *gc)
 	g_free(js->stream_id);
 	if(js->user)
 		jabber_id_free(js->user);
+	g_free(js->initial_avatar_hash);
 	g_free(js->avatar_hash);
+	g_free(js->caps_hash);
 
 	purple_circ_buffer_destroy(js->write_buffer);
 	if(js->writeh)
@@ -1415,12 +1543,24 @@ void jabber_close(PurpleConnection *gc)
 	g_free(js->old_track);
 	g_free(js->expected_rspauth);
 
-	if (js->keepalive_timeout != -1)
+	if (js->vcard_timer != 0)
+		purple_timeout_remove(js->vcard_timer);
+
+	if (js->keepalive_timeout != 0)
 		purple_timeout_remove(js->keepalive_timeout);
 
 	g_free(js->srv_rec);
 	js->srv_rec = NULL;
 
+	g_free(js->stun_ip);
+	js->stun_ip = NULL;
+
+	/* cancel DNS query for STUN, if one is ongoing */
+	if (js->stun_query) {
+		purple_dnsquery_destroy(js->stun_query);
+		js->stun_query = NULL;
+	}
+
 	g_free(js);
 
 	gc->proto_data = NULL;
@@ -1472,9 +1612,9 @@ void jabber_stream_set_state(JabberStream *js, JabberStreamState state)
 
 			break;
 		case JABBER_STREAM_CONNECTED:
-			/* now we can alert the core that we're ready to send status */
+			/* Send initial presence */
+			jabber_presence_send(js, TRUE);
 			purple_connection_set_state(js->gc, PURPLE_CONNECTED);
-			jabber_disco_items_server(js);
 			break;
 	}
 }
@@ -1490,9 +1630,82 @@ void jabber_idle_set(PurpleConnection *gc, int idle)
 	JabberStream *js = gc->proto_data;
 
 	js->idle = idle ? time(NULL) - idle : idle;
+
+	/* send out an updated prescence */
+	purple_debug_info("jabber", "sending updated presence for idle\n");
+	jabber_presence_send(js, FALSE);
 }
 
-static void jabber_blocklist_parse(JabberStream *js, xmlnode *packet, gpointer data)
+void jabber_blocklist_parse_push(JabberStream *js, const char *from,
+                                 JabberIqType type, const char *id,
+                                 xmlnode *child)
+{
+	JabberIq *result;
+	xmlnode *item;
+	PurpleAccount *account;
+	gboolean is_block;
+
+	if (!jabber_is_own_account(js, from)) {
+		xmlnode *error, *x;
+		result = jabber_iq_new(js, JABBER_IQ_ERROR);
+		xmlnode_set_attrib(result->node, "id", id);
+		if (from)
+			xmlnode_set_attrib(result->node, "to", from);
+
+		error = xmlnode_new_child(result->node, "error");
+		xmlnode_set_attrib(error, "type", "cancel");
+		x = xmlnode_new_child(error, "not-allowed");
+		xmlnode_set_namespace(x, "urn:ietf:params:xml:ns:xmpp-stanzas");
+
+		jabber_iq_send(result);
+		return;
+	}
+
+	account = purple_connection_get_account(js->gc);
+	is_block = g_str_equal(child->name, "block");
+
+	item = xmlnode_get_child(child, "item");
+	if (!is_block && item == NULL) {
+		/* Unblock everyone */
+		purple_debug_info("jabber", "Received unblock push. Unblocking everyone.\n");
+
+		while (account->deny != NULL) {
+			purple_privacy_deny_remove(account, account->deny->data, TRUE);
+		}
+	} else if (item == NULL) {
+		/* An empty <block/> is bogus */
+		xmlnode *error, *x;
+		result = jabber_iq_new(js, JABBER_IQ_ERROR);
+		xmlnode_set_attrib(result->node, "id", id);
+
+		error = xmlnode_new_child(result->node, "error");
+		xmlnode_set_attrib(error, "type", "modify");
+		x = xmlnode_new_child(error, "bad-request");
+		xmlnode_set_namespace(x, "urn:ietf:params:xml:ns:xmpp-stanzas");
+
+		jabber_iq_send(result);
+		return;
+	} else {
+		for ( ; item; item = xmlnode_get_next_twin(item)) {
+			const char *jid = xmlnode_get_attrib(item, "jid");
+			if (jid == NULL || *jid == '\0')
+				continue;
+
+			if (is_block)
+				purple_privacy_deny_add(account, jid, TRUE);
+			else
+				purple_privacy_deny_remove(account, jid, TRUE);
+		}
+	}
+
+	result = jabber_iq_new(js, JABBER_IQ_RESULT);
+	xmlnode_set_attrib(result->node, "id", id);
+	jabber_iq_send(result);
+}
+
+static void jabber_blocklist_parse(JabberStream *js, const char *from,
+                                   JabberIqType type, const char *id,
+                                   xmlnode *packet, gpointer data)
 {
 	xmlnode *blocklist, *item;
 	PurpleAccount *account;
@@ -1501,13 +1714,23 @@ static void jabber_blocklist_parse(JabberStream *js, xmlnode *packet, gpointer d
 			"blocklist", "urn:xmpp:blocking");
 	account = purple_connection_get_account(js->gc);
 
-	if (blocklist == NULL)
+	if (type == JABBER_IQ_ERROR || blocklist == NULL)
 		return;
 
+	/* This is the only privacy method supported by XEP-0191 */
+	if (account->perm_deny != PURPLE_PRIVACY_DENY_USERS)
+		account->perm_deny = PURPLE_PRIVACY_DENY_USERS;
+
+	/*
+	 * TODO: When account->deny is something more than a hash table, this can
+	 * be re-written to find the set intersection and difference.
+	 */
+	while (account->deny)
+		purple_privacy_deny_remove(account, account->deny->data, TRUE);
+
 	item = xmlnode_get_child(blocklist, "item");
 	while (item != NULL) {
 		const char *jid = xmlnode_get_attrib(item, "jid");
-
 		purple_privacy_deny_add(account, jid, TRUE);
 		item = xmlnode_get_next_twin(item);
 	}
@@ -1592,31 +1815,27 @@ void jabber_rem_deny(PurpleConnection *gc, const char *who)
 	jabber_iq_send(iq);
 }
 
-void jabber_add_feature(const char *shortname, const char *namespace, JabberFeatureEnabled cb) {
+void jabber_add_feature(const char *namespace, JabberFeatureEnabled cb) {
 	JabberFeature *feat;
 
-	g_return_if_fail(shortname != NULL);
 	g_return_if_fail(namespace != NULL);
 
 	feat = g_new0(JabberFeature,1);
-	feat->shortname = g_strdup(shortname);
 	feat->namespace = g_strdup(namespace);
 	feat->is_enabled = cb;
 
 	/* try to remove just in case it already exists in the list */
-	jabber_remove_feature(shortname);
+	jabber_remove_feature(namespace);
 
 	jabber_features = g_list_append(jabber_features, feat);
 }
 
-void jabber_remove_feature(const char *shortname) {
+void jabber_remove_feature(const char *namespace) {
 	GList *feature;
 	for(feature = jabber_features; feature; feature = feature->next) {
 		JabberFeature *feat = (JabberFeature*)feature->data;
-		if(!strcmp(feat->shortname, shortname)) {
-			g_free(feat->shortname);
+		if(!strcmp(feat->namespace, namespace)) {
 			g_free(feat->namespace);
-
 			g_free(feature->data);
 			jabber_features = g_list_delete_link(jabber_features, feature);
 			break;
@@ -1624,6 +1843,59 @@ void jabber_remove_feature(const char *shortname) {
 	}
 }
 
+static void jabber_features_destroy(void)
+{
+	while (jabber_features) {
+		JabberFeature *feature = jabber_features->data;
+		g_free(feature->namespace);
+		g_free(feature);
+		jabber_features = g_list_remove_link(jabber_features, jabber_features);
+	}
+}
+
+void jabber_add_identity(const gchar *category, const gchar *type, const gchar *lang, const gchar *name) {
+	GList *identity;
+	JabberIdentity *ident;
+	/* both required according to XEP-0030 */
+	g_return_if_fail(category != NULL);
+	g_return_if_fail(type != NULL);
+
+	for(identity = jabber_identities; identity; identity = identity->next) {
+		JabberIdentity *ident = (JabberIdentity*)identity->data;
+		if (!strcmp(ident->category, category) &&
+		    !strcmp(ident->type, type) &&
+		    ((!ident->lang && !lang) || (ident->lang && lang && !strcmp(ident->lang, lang)))) {
+			return;
+		}
+	}
+
+	ident = g_new0(JabberIdentity, 1);
+	ident->category = g_strdup(category);
+	ident->type = g_strdup(type);
+	ident->lang = g_strdup(lang);
+	ident->name = g_strdup(name);
+	jabber_identities = g_list_prepend(jabber_identities, ident);
+}
+
+static void jabber_identities_destroy(void)
+{
+	while (jabber_identities) {
+		JabberIdentity *id = jabber_identities->data;
+		g_free(id->category);
+		g_free(id->type);
+		g_free(id->lang);
+		g_free(id->name);
+		g_free(id);
+		jabber_identities = g_list_remove_link(jabber_identities, jabber_identities);
+	}
+}
+
+gboolean jabber_stream_is_ssl(JabberStream *js)
+{
+	return (js->bosh && jabber_bosh_connection_is_ssl(js->bosh)) ||
+	       (!js->bosh && js->gsc);
+}
+
 const char *jabber_list_icon(PurpleAccount *a, PurpleBuddy *b)
 {
 	return "jabber";
@@ -1647,6 +1919,28 @@ const char* jabber_list_emblem(PurpleBuddy *b)
 					!(jb->subscription & JABBER_SUB_TO)))
 			return "not-authorized";
 	}
+
+	if (jb) {
+		JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, NULL);
+		if (jbr) {
+			const gchar *client_type = 
+				jabber_resource_get_identity_category_type(jbr, "client");
+		
+			if (client_type) {
+				if (strcmp(client_type, "phone") == 0) {
+					return "mobile";
+				} else if (strcmp(client_type, "web") == 0) {
+					return "external";
+				} else if (strcmp(client_type, "handheld") == 0) {
+					return "hiptop";
+				} else if (strcmp(client_type, "bot") == 0) {
+					return "bot";
+				}
+				/* the default value "pc" falls through and has no emblem */
+			}
+		}
+	}
+		
 	return NULL;
 }
 
@@ -1665,25 +1959,69 @@ char *jabber_status_text(PurpleBuddy *b)
 	} else if(jb && !PURPLE_BUDDY_IS_ONLINE(b) && jb->error_msg) {
 		ret = g_strdup(jb->error_msg);
 	} else {
-		char *stripped;
-
-		if(!(stripped = purple_markup_strip_html(jabber_buddy_get_status_msg(jb)))) {
-			PurplePresence *presence = purple_buddy_get_presence(b);
-			if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) {
-				PurpleStatus *status = purple_presence_get_status(presence, "tune");
-				stripped = g_strdup(purple_status_get_attr_string(status, PURPLE_TUNE_TITLE));
-			}
-		}
-
-		if(stripped) {
-			ret = g_markup_escape_text(stripped, -1);
-			g_free(stripped);
+		PurplePresence *presence = purple_buddy_get_presence(b);
+		PurpleStatus *status = purple_presence_get_active_status(presence);
+		const char *message;
+
+		if((message = purple_status_get_attr_string(status, "message"))) {
+			ret = g_markup_escape_text(message, -1);
+		} else if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) {
+			PurpleStatus *status = purple_presence_get_status(presence, "tune");
+			const char *title = purple_status_get_attr_string(status, PURPLE_TUNE_TITLE);
+			const char *artist = purple_status_get_attr_string(status, PURPLE_TUNE_ARTIST);
+			const char *album = purple_status_get_attr_string(status, PURPLE_TUNE_ALBUM);
+			ret = purple_util_format_song_info(title, artist, album, NULL);
 		}
 	}
 
 	return ret;
 }
 
+static void
+jabber_tooltip_add_resource_text(JabberBuddyResource *jbr,
+	PurpleNotifyUserInfo *user_info, gboolean multiple_resources)
+{
+	char *text = NULL;
+	char *res = NULL;
+	char *label, *value;
+	const char *state;
+
+	if(jbr->status) {
+		text = g_markup_escape_text(jbr->status, -1);
+	}
+
+	if(jbr->name)
+		res = g_strdup_printf(" (%s)", jbr->name);
+
+	state = jabber_buddy_state_get_name(jbr->state);
+	if (text != NULL && !purple_utf8_strcasecmp(state, text)) {
+		g_free(text);
+		text = NULL;
+	}
+
+	label = g_strdup_printf("%s%s", _("Status"), (res ? res : ""));
+	value = g_strdup_printf("%s%s%s", state, (text ? ": " : ""), (text ? text : ""));
+
+	purple_notify_user_info_add_pair(user_info, label, value);
+	g_free(label);
+	g_free(value);
+	g_free(text);
+
+	/* if the resource is idle, show that */
+	/* only show it if there is more than one resource available for
+	the buddy, since the "general" idleness will be shown anyway,
+	this way we can see see the idleness of lower-priority resources */
+	if (jbr->idle && multiple_resources) {
+		gchar *idle_str =
+			purple_str_seconds_to_string(time(NULL) - jbr->idle);
+		label = g_strdup_printf("%s%s", _("Idle"), (res ? res : ""));
+		purple_notify_user_info_add_pair(user_info, label, idle_str);
+		g_free(idle_str);
+		g_free(label);
+	}
+	g_free(res);
+}
+
 void jabber_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full)
 {
 	JabberBuddy *jb;
@@ -1707,27 +2045,27 @@ void jabber_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboole
 		const char *sub;
 		GList *l;
 		const char *mood;
+		gboolean multiple_resources =
+			jb->resources && g_list_next(jb->resources);
+		JabberBuddyResource *top_jbr = jabber_buddy_find_resource(jb, NULL);
+
+		/* resource-specific info for the top resource */
+		if (top_jbr) {
+			jabber_tooltip_add_resource_text(top_jbr, user_info,
+				multiple_resources);
+		}
 
-		if (full) {
-			PurpleStatus *status;
-
-			if(jb->subscription & JABBER_SUB_FROM) {
-				if(jb->subscription & JABBER_SUB_TO)
-					sub = _("Both");
-				else if(jb->subscription & JABBER_SUB_PENDING)
-					sub = _("From (To pending)");
-				else
-					sub = _("From");
-			} else {
-				if(jb->subscription & JABBER_SUB_TO)
-					sub = _("To");
-				else if(jb->subscription & JABBER_SUB_PENDING)
-					sub = _("None (To pending)");
-				else
-					sub = _("None");
+		for(l=jb->resources; l; l = l->next) {
+			jbr = l->data;
+			/* the remaining resources */
+			if (jbr != top_jbr) {
+				jabber_tooltip_add_resource_text(jbr, user_info,
+					multiple_resources);
 			}
+		}
 
-			purple_notify_user_info_add_pair(user_info, _("Subscription"), sub);
+		if (full) {
+			PurpleStatus *status;
 
 			status = purple_presence_get_active_status(presence);
 			mood = purple_status_get_attr_string(status, "mood");
@@ -1753,47 +2091,25 @@ void jabber_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboole
 					g_free(playing);
 				}
 			}
-		}
 
-		for(l=jb->resources; l; l = l->next) {
-			char *text = NULL;
-			char *res = NULL;
-			char *label, *value;
-			const char *state;
-
-			jbr = l->data;
-
-			if(jbr->status) {
-				char *tmp;
-				text = purple_strreplace(jbr->status, "\n", "<br />\n");
-				tmp = purple_markup_strip_html(text);
-				g_free(text);
-				text = g_markup_escape_text(tmp, -1);
-				g_free(tmp);
-			}
-
-			if(jbr->name)
-				res = g_strdup_printf(" (%s)", jbr->name);
-
-			state = jabber_buddy_state_get_name(jbr->state);
-			if (text != NULL && !purple_utf8_strcasecmp(state, text)) {
-				g_free(text);
-				text = NULL;
+			if(jb->subscription & JABBER_SUB_FROM) {
+				if(jb->subscription & JABBER_SUB_TO)
+					sub = _("Both");
+				else if(jb->subscription & JABBER_SUB_PENDING)
+					sub = _("From (To pending)");
+				else
+					sub = _("From");
+			} else {
+				if(jb->subscription & JABBER_SUB_TO)
+					sub = _("To");
+				else if(jb->subscription & JABBER_SUB_PENDING)
+					sub = _("None (To pending)");
+				else
+					sub = _("None");
 			}
 
-			label = g_strdup_printf("%s%s",
-							_("Status"), (res ? res : ""));
-			value = g_strdup_printf("%s%s%s",
-							state,
-							(text ? ": " : ""),
-							(text ? text : ""));
-
-			purple_notify_user_info_add_pair(user_info, label, value);
+			purple_notify_user_info_add_pair(user_info, _("Subscription"), sub);
 
-			g_free(label);
-			g_free(value);
-			g_free(text);
-			g_free(res);
 		}
 
 		if(!PURPLE_BUDDY_IS_ONLINE(b) && jb->error_msg) {
@@ -1916,14 +2232,11 @@ GList *jabber_status_types(PurpleAccount *account)
 }
 
 static void
-jabber_password_change_result_cb(JabberStream *js, xmlnode *packet,
-		gpointer data)
+jabber_password_change_result_cb(JabberStream *js, const char *from,
+                                 JabberIqType type, const char *id,
+                                 xmlnode *packet, gpointer data)
 {
-	const char *type;
-
-	type = xmlnode_get_attrib(packet, "type");
-
-	if(type && !strcmp(type, "result")) {
+	if (type == JABBER_IQ_RESULT) {
 		purple_notify_info(js->gc, _("Password Changed"), _("Password Changed"),
 				_("Your password has been changed."));
 
@@ -2090,8 +2403,6 @@ void jabber_convo_closed(PurpleConnection *gc, const char *who)
 			g_free(jbr->thread_id);
 			jbr->thread_id = NULL;
 		}
-		if(jbr->chat_states == JABBER_CHAT_STATES_SUPPORTED)
-			jabber_message_conv_closed(js, who);
 	}
 
 	jabber_id_free(jid);
@@ -2289,7 +2600,25 @@ static PurpleCmdRet jabber_cmd_chat_topic(PurpleConversation *conv,
 	if (!chat)
 		return PURPLE_CMD_RET_FAILED;
 
-	jabber_chat_change_topic(chat, args ? args[0] : NULL);
+	if (args && args[0] && *args[0])
+		jabber_chat_change_topic(chat, args[0]);
+	else {
+		const char *cur = purple_conv_chat_get_topic(PURPLE_CONV_CHAT(conv));
+		char *buf, *tmp, *tmp2;
+
+		if (cur) {
+			tmp = g_markup_escape_text(cur, -1);
+			tmp2 = purple_markup_linkify(tmp);
+			buf = g_strdup_printf(_("current topic is: %s"), tmp2);
+			g_free(tmp);
+			g_free(tmp2);
+		} else
+			buf = g_strdup(_("No topic is set"));
+		purple_conv_chat_write(PURPLE_CONV_CHAT(conv), "", buf,
+				PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG, time(NULL));
+		g_free(buf);
+	}
+
 	return PURPLE_CMD_RET_OK;
 }
 
@@ -2338,21 +2667,32 @@ static PurpleCmdRet jabber_cmd_chat_affiliate(PurpleConversation *conv,
 {
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
 
-	if (!chat || !args || !args[0] || !args[1])
+	if (!chat || !args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
 
-	if (strcmp(args[1], "owner") != 0 &&
-	    strcmp(args[1], "admin") != 0 &&
-	    strcmp(args[1], "member") != 0 &&
-	    strcmp(args[1], "outcast") != 0 &&
-	    strcmp(args[1], "none") != 0) {
-		*error = g_strdup_printf(_("Unknown affiliation: \"%s\""), args[1]);
+	if (strcmp(args[0], "owner") != 0 &&
+	    strcmp(args[0], "admin") != 0 &&
+	    strcmp(args[0], "member") != 0 &&
+	    strcmp(args[0], "outcast") != 0 &&
+	    strcmp(args[0], "none") != 0) {
+		*error = g_strdup_printf(_("Unknown affiliation: \"%s\""), args[0]);
 		return PURPLE_CMD_RET_FAILED;
 	}
 
-	if (!jabber_chat_affiliate_user(chat, args[0], args[1])) {
-		*error = g_strdup_printf(_("Unable to affiliate user %s as \"%s\""), args[0], args[1]);
-		return PURPLE_CMD_RET_FAILED;
+	if (args[1]) {
+		int i;
+		char **nicks = g_strsplit(args[1], " ", -1);
+
+		for (i = 0; nicks[i]; ++i)
+			if (!jabber_chat_affiliate_user(chat, nicks[i], args[0])) {
+				*error = g_strdup_printf(_("Unable to affiliate user %s as \"%s\""), nicks[i], args[0]);
+				g_strfreev(nicks);
+				return PURPLE_CMD_RET_FAILED;
+			}
+
+		g_strfreev(nicks);
+	} else {
+		jabber_chat_affiliation_list(chat, args[0]);
 	}
 
 	return PURPLE_CMD_RET_OK;
@@ -2363,23 +2703,32 @@ static PurpleCmdRet jabber_cmd_chat_role(PurpleConversation *conv,
 {
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
 
-	if (!chat || !args || !args[0] || !args[1])
+	if (!chat || !args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
 
-	if (strcmp(args[1], "moderator") != 0 &&
-	    strcmp(args[1], "participant") != 0 &&
-	    strcmp(args[1], "visitor") != 0 &&
-	    strcmp(args[1], "none") != 0) {
-		*error = g_strdup_printf(_("Unknown role: \"%s\""), args[1]);
+	if (strcmp(args[0], "moderator") != 0 &&
+	    strcmp(args[0], "participant") != 0 &&
+	    strcmp(args[0], "visitor") != 0 &&
+	    strcmp(args[0], "none") != 0) {
+		*error = g_strdup_printf(_("Unknown role: \"%s\""), args[0]);
 		return PURPLE_CMD_RET_FAILED;
 	}
 
-	if (!jabber_chat_role_user(chat, args[0], args[1])) {
-		*error = g_strdup_printf(_("Unable to set role \"%s\" for user: %s"),
-		                         args[1], args[0]);
-		return PURPLE_CMD_RET_FAILED;
-	}
+	if (args[1]) {
+		int i;
+		char **nicks = g_strsplit(args[1], " ", -1);
 
+		for (i = 0; nicks[i]; i++)
+			if (!jabber_chat_role_user(chat, nicks[i], args[0])) {
+				*error = g_strdup_printf(_("Unable to set role \"%s\" for user: %s"),
+										 args[0], nicks[i]);
+				return PURPLE_CMD_RET_FAILED;
+			}
+
+		g_strfreev(nicks);
+	} else {
+		jabber_chat_role_list(chat, args[0]);
+	}
 	return PURPLE_CMD_RET_OK;
 }
 
@@ -2455,10 +2804,16 @@ static PurpleCmdRet jabber_cmd_chat_msg(PurpleConversation *conv,
 static PurpleCmdRet jabber_cmd_ping(PurpleConversation *conv,
 		const char *cmd, char **args, char **error, void *data)
 {
+	PurpleAccount *account;
+	PurpleConnection *pc;
+
 	if(!args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
 
-	if(!jabber_ping_jid(conv, args[0])) {
+	account = purple_conversation_get_account(conv);
+	pc = purple_account_get_connection(account);
+
+	if(!jabber_ping_jid(purple_connection_get_protocol_data(pc), args[0])) {
 		*error = g_strdup_printf(_("Unable to ping user %s"), args[0]);
 		return PURPLE_CMD_RET_FAILED;
 	}
@@ -2513,7 +2868,7 @@ static gboolean _jabber_send_buzz(JabberStream *js, const char *username, char *
 		return TRUE;
 	} else {
 		*error = g_strdup_printf(_("Unable to buzz, because %s does "
-			"not support it or do not wish to receive buzzes now."), alias);
+			"not support it or does not wish to receive buzzes now."), alias);
 		return FALSE;
 	}
 }
@@ -2590,93 +2945,573 @@ gboolean jabber_offline_message(const PurpleBuddy *buddy)
 	return TRUE;
 }
 
+#ifdef USE_VV
+gboolean
+jabber_audio_enabled(JabberStream *js, const char *namespace)
+{
+	PurpleMediaManager *manager = purple_media_manager_get();
+	PurpleMediaCaps caps = purple_media_manager_get_ui_caps(manager);
+
+	return (caps & (PURPLE_MEDIA_CAPS_AUDIO | PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION));
+}
+
+gboolean
+jabber_video_enabled(JabberStream *js, const char *namespace)
+{
+	PurpleMediaManager *manager = purple_media_manager_get();
+	PurpleMediaCaps caps = purple_media_manager_get_ui_caps(manager);
+
+	return (caps & (PURPLE_MEDIA_CAPS_VIDEO | PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION));
+}
+
+typedef struct {
+	PurpleAccount *account;
+	gchar *who;
+	PurpleMediaSessionType type;
+
+} JabberMediaRequest;
+
+static void
+jabber_media_cancel_cb(JabberMediaRequest *request,
+		PurpleRequestFields *fields)
+{
+	g_free(request->who);
+	g_free(request);
+}
+
+static void
+jabber_media_ok_cb(JabberMediaRequest *request, PurpleRequestFields *fields)
+{
+	PurpleRequestField *field =
+			purple_request_fields_get_field(fields, "resource");
+	int selected_id = purple_request_field_choice_get_value(field);
+	GList *labels = purple_request_field_choice_get_labels(field);
+	gchar *who = g_strdup_printf("%s/%s", request->who,
+			(gchar*)g_list_nth_data(labels, selected_id));
+	jabber_initiate_media(request->account, who, request->type);
+
+	g_free(who);
+	g_free(request->who);
+	g_free(request);
+}
+#endif
+
+gboolean
+jabber_initiate_media(PurpleAccount *account, const char *who,
+		      PurpleMediaSessionType type)
+{
+#ifdef USE_VV
+	JabberStream *js = (JabberStream *)
+			purple_account_get_connection(account)->proto_data;
+	JabberBuddy *jb;
+	JabberBuddyResource *jbr = NULL;
+	char *resource;
+
+	if (!js) {
+		purple_debug_error("jabber",
+				"jabber_initiate_media: NULL stream\n");
+		return FALSE;
+	}
+
+
+	if((resource = jabber_get_resource(who)) != NULL) {
+		/* they've specified a resource, no need to ask or
+		 * default or anything, just do it */
+
+		jb = jabber_buddy_find(js, who, FALSE);
+		jbr = jabber_buddy_find_resource(jb, resource);
+		g_free(resource);
+
+		if (type & PURPLE_MEDIA_AUDIO &&
+				!jabber_resource_has_capability(jbr,
+				JINGLE_APP_RTP_SUPPORT_AUDIO) &&
+				jabber_resource_has_capability(jbr,
+				GOOGLE_VOICE_CAP))
+			return jabber_google_session_initiate(js, who, type);
+		else
+			return jingle_rtp_initiate_media(js, who, type);
+	}
+
+	jb = jabber_buddy_find(js, who, FALSE);
+
+	if(!jb || !jb->resources) {
+		/* no resources online, we're trying to initiate with someone
+		 * whose presence we're not subscribed to, or
+		 * someone who is offline.  Let's inform the user */
+		char *msg;
+
+		if(!jb) {
+			msg = g_strdup_printf(_("Unable to initiate media with %s: invalid JID"), who);
+		} else if(jb->subscription & JABBER_SUB_TO) {
+			msg = g_strdup_printf(_("Unable to initiate media with %s: user is not online"), who);
+		} else {
+			msg = g_strdup_printf(_("Unable to initiate media with %s: not subscribed to user presence"), who);
+		}
+
+		purple_notify_error(account, _("Media Initiation Failed"),
+				_("Media Initiation Failed"), msg);
+		g_free(msg);
+		return FALSE;
+	} else if(!jb->resources->next) {
+		/* only 1 resource online (probably our most common case)
+		 * so no need to ask who to initiate with */
+		gchar *name;
+		gboolean result;
+		jbr = jb->resources->data;
+		name = g_strdup_printf("%s/%s", who, jbr->name);
+		result = jabber_initiate_media(account, name, type);
+		g_free(name);
+		return result;
+	} else {
+		/* we've got multiple resources,
+		 * we need to pick one to initiate with */
+		GList *l;
+		char *msg;
+		PurpleRequestFields *fields;
+		PurpleRequestField *field = purple_request_field_choice_new(
+				"resource", _("Resource"), 0);
+		PurpleRequestFieldGroup *group;
+		JabberMediaRequest *request;
+
+		for(l = jb->resources; l; l = l->next)
+		{
+			JabberBuddyResource *ljbr = l->data;
+			PurpleMediaCaps caps;
+			gchar *name;
+			name = g_strdup_printf("%s/%s", who, ljbr->name);
+			caps = jabber_get_media_caps(account, name);
+			g_free(name);
+
+			if ((type & PURPLE_MEDIA_AUDIO) &&
+					(type & PURPLE_MEDIA_VIDEO)) {
+				if (caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO) {
+					jbr = ljbr;
+					purple_request_field_choice_add(
+							field, jbr->name);
+				}
+			} else if (type & (PURPLE_MEDIA_AUDIO) &&
+					(caps & PURPLE_MEDIA_CAPS_AUDIO)) {
+				jbr = ljbr;
+				purple_request_field_choice_add(
+						field, jbr->name);
+			}else if (type & (PURPLE_MEDIA_VIDEO) &&
+					(caps & PURPLE_MEDIA_CAPS_VIDEO)) {
+				jbr = ljbr;
+				purple_request_field_choice_add(
+						field, jbr->name);
+			}
+		}
+
+		if (jbr == NULL) {
+			purple_debug_error("jabber",
+					"No resources available\n");
+			return FALSE;
+		}
+
+		if (g_list_length(purple_request_field_choice_get_labels(
+				field)) <= 1) {
+			gchar *name;
+			gboolean result;
+			purple_request_field_destroy(field);
+			name = g_strdup_printf("%s/%s", who, jbr->name);
+			result = jabber_initiate_media(account, name, type);
+			g_free(name);
+			return result;
+		}
+
+		msg = g_strdup_printf(_("Please select the resource of %s with which you would like to start a media session."), who);
+		fields = purple_request_fields_new();
+		group =	purple_request_field_group_new(NULL);
+		request = g_new0(JabberMediaRequest, 1);
+		request->account = account;
+		request->who = g_strdup(who);
+		request->type = type;
+
+		purple_request_field_group_add_field(group, field);
+		purple_request_fields_add_group(fields, group);
+		purple_request_fields(account, _("Select a Resource"), msg,
+				NULL, fields, _("Initiate Media"),
+				G_CALLBACK(jabber_media_ok_cb), _("Cancel"),
+				G_CALLBACK(jabber_media_cancel_cb),
+				account, who, NULL, request);
+
+		g_free(msg);
+		return TRUE;
+	}
+#endif
+	return FALSE;
+}
+
+PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who)
+{
+#ifdef USE_VV
+	JabberStream *js = (JabberStream *)
+			purple_account_get_connection(account)->proto_data;
+	JabberBuddy *jb;
+	JabberBuddyResource *jbr;
+	PurpleMediaCaps caps = PURPLE_MEDIA_CAPS_NONE;
+	gchar *resource;
+
+	if (!js) {
+		purple_debug_info("jabber",
+				"jabber_can_do_media: NULL stream\n");
+		return FALSE;
+	}
+
+	if ((resource = jabber_get_resource(who)) != NULL) {
+		/* they've specified a resource, no need to ask or
+		 * default or anything, just do it */
+
+		jb = jabber_buddy_find(js, who, FALSE);
+		jbr = jabber_buddy_find_resource(jb, resource);
+		g_free(resource);
+
+		if (!jbr) {
+			purple_debug_error("jabber", "jabber_get_media_caps:"
+					" Can't find resource %s\n", who);
+			return caps;
+		}
+
+		if (jabber_resource_has_capability(jbr,
+				JINGLE_APP_RTP_SUPPORT_AUDIO))
+			caps |= PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION |
+					PURPLE_MEDIA_CAPS_AUDIO;
+		if (jabber_resource_has_capability(jbr,
+				JINGLE_APP_RTP_SUPPORT_VIDEO))
+			caps |= PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION |
+					PURPLE_MEDIA_CAPS_VIDEO;
+		if (caps & PURPLE_MEDIA_CAPS_AUDIO && caps &
+				PURPLE_MEDIA_CAPS_VIDEO)
+			caps |= PURPLE_MEDIA_CAPS_AUDIO_VIDEO;
+		if (caps != PURPLE_MEDIA_CAPS_NONE) {
+			if (!jabber_resource_has_capability(jbr,
+					JINGLE_TRANSPORT_ICEUDP) &&
+					!jabber_resource_has_capability(jbr,
+					JINGLE_TRANSPORT_RAWUDP)) {
+				purple_debug_info("jingle-rtp", "Buddy doesn't "
+						"support the same transport types\n");
+				caps = PURPLE_MEDIA_CAPS_NONE;
+			} else
+				caps |= PURPLE_MEDIA_CAPS_MODIFY_SESSION |
+						PURPLE_MEDIA_CAPS_CHANGE_DIRECTION;
+		}
+		if (jabber_resource_has_capability(jbr, GOOGLE_VOICE_CAP)) {
+			caps |= PURPLE_MEDIA_CAPS_AUDIO;
+			if (jabber_resource_has_capability(jbr,
+					GOOGLE_VIDEO_CAP))
+				caps |= PURPLE_MEDIA_CAPS_AUDIO_VIDEO;
+		}
+		return caps;
+	}
+
+	jb = jabber_buddy_find(js, who, FALSE);
+
+	if(!jb || !jb->resources) {
+		/* no resources online, we're trying to get caps for someone
+		 * whose presence we're not subscribed to, or
+		 * someone who is offline. */
+		return caps;
+	} else if(!jb->resources->next) {
+		/* only 1 resource online (probably our most common case) */
+		gchar *name;
+		jbr = jb->resources->data;
+		name = g_strdup_printf("%s/%s", who, jbr->name);
+		caps = jabber_get_media_caps(account, name);
+		g_free(name);
+	} else {
+		/* we've got multiple resources, combine their caps */
+		GList *l;
+
+		for(l = jb->resources; l; l = l->next)
+		{
+			gchar *name;
+			jbr = l->data;
+			name = g_strdup_printf("%s/%s", who, jbr->name);
+			caps |= jabber_get_media_caps(account, name);
+			g_free(name);
+		}
+	}
+
+	return caps;
+#else
+	return PURPLE_MEDIA_CAPS_NONE;
+#endif
+}
+
 void jabber_register_commands(void)
 {
-	purple_cmd_register("config", "", PURPLE_CMD_P_PRPL,
+	PurpleCmdId id;
+	id = purple_cmd_register("config", "", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY,
 	                  "prpl-jabber", jabber_cmd_chat_config,
 	                  _("config:  Configure a chat room."), NULL);
-	purple_cmd_register("configure", "", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("configure", "", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY,
 	                  "prpl-jabber", jabber_cmd_chat_config,
 	                  _("configure:  Configure a chat room."), NULL);
-	purple_cmd_register("nick", "s", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("nick", "s", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY,
 	                  "prpl-jabber", jabber_cmd_chat_nick,
 	                  _("nick &lt;new nickname&gt;:  Change your nickname."),
 	                  NULL);
-	purple_cmd_register("part", "s", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("part", "s", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_part, _("part [room]:  Leave the room."),
 	                  NULL);
-	purple_cmd_register("register", "", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("register", "", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY,
 	                  "prpl-jabber", jabber_cmd_chat_register,
 	                  _("register:  Register with a chat room."), NULL);
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
 	/* XXX: there needs to be a core /topic cmd, methinks */
-	purple_cmd_register("topic", "s", PURPLE_CMD_P_PRPL,
+	id = purple_cmd_register("topic", "s", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_topic,
 	                  _("topic [new topic]:  View or change the topic."),
 	                  NULL);
-	purple_cmd_register("ban", "ws", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("ban", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_ban,
 	                  _("ban &lt;user&gt; [reason]:  Ban a user from the room."),
 	                  NULL);
-	purple_cmd_register("affiliate", "ws", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("affiliate", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_affiliate,
-	                  _("affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."),
+	                  _("affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get the users with an affiliation or set users' affiliation with the room."),
 	                  NULL);
-	purple_cmd_register("role", "ws", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("role", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_role,
-	                  _("role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."),
+	                  _("role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the users with a role or set users' role with the room."),
 	                  NULL);
-	purple_cmd_register("invite", "ws", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("invite", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_invite,
 	                  _("invite &lt;user&gt; [message]:  Invite a user to the room."),
 	                  NULL);
-	purple_cmd_register("join", "ws", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("join", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_join,
 	                  _("join: &lt;room&gt; [password]:  Join a chat on this server."),
 	                  NULL);
-	purple_cmd_register("kick", "ws", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("kick", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_kick,
 	                  _("kick &lt;user&gt; [reason]:  Kick a user from the room."),
 	                  NULL);
-	purple_cmd_register("msg", "ws", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("msg", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY,
 	                  "prpl-jabber", jabber_cmd_chat_msg,
 	                  _("msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."),
 	                  NULL);
-	purple_cmd_register("ping", "w", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("ping", "w", PURPLE_CMD_P_PRPL,
 					  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM |
 					  PURPLE_CMD_FLAG_PRPL_ONLY,
 					  "prpl-jabber", jabber_cmd_ping,
 					  _("ping &lt;jid&gt;:	Ping a user/component/server."),
 					  NULL);
-	purple_cmd_register("buzz", "w", PURPLE_CMD_P_PRPL,
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("buzz", "w", PURPLE_CMD_P_PRPL,
 					  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY |
 					  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS,
 					  "prpl-jabber", jabber_cmd_buzz,
 					  _("buzz: Buzz a user to get their attention"), NULL);
+	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+}
+
+void jabber_unregister_commands(void)
+{
+	while (jabber_cmds != NULL) {
+		purple_cmd_unregister(GPOINTER_TO_UINT(jabber_cmds->data));
+		jabber_cmds = g_slist_delete_link(jabber_cmds, jabber_cmds);
+	}
+}
+
+/* IPC functions */
+
+/**
+ * IPC function for determining if a contact supports a certain feature.
+ *
+ * @param account   The PurpleAccount
+ * @param jid       The full JID of the contact.
+ * @param feature   The feature's namespace.
+ *
+ * @return TRUE if supports feature; else FALSE.
+ */
+static gboolean
+jabber_ipc_contact_has_feature(PurpleAccount *account, const gchar *jid,
+                               const gchar *feature)
+{
+	PurpleConnection *gc = purple_account_get_connection(account);
+	JabberStream *js;
+	JabberBuddy *jb;
+	JabberBuddyResource *jbr;
+	gchar *resource;
+
+	if (!purple_account_is_connected(account))
+		return FALSE;
+	js = gc->proto_data;
+
+	if (!(resource = jabber_get_resource(jid)) ||
+	    !(jb = jabber_buddy_find(js, jid, FALSE)) ||
+	    !(jbr = jabber_buddy_find_resource(jb, resource))) {
+		g_free(resource);
+		return FALSE;
+	}
+
+	g_free(resource);
+
+	return jabber_resource_has_capability(jbr, feature);
+}
+
+static void
+jabber_ipc_add_feature(const gchar *feature)
+{
+	if (!feature)
+		return;
+	jabber_add_feature(feature, 0);
+
+	/* send presence with new caps info for all connected accounts */
+	jabber_caps_broadcast_change();
 }
 
 void
 jabber_init_plugin(PurplePlugin *plugin)
 {
-        my_protocol = plugin;
+	GHashTable *ui_info = purple_core_get_ui_info();
+	const gchar *ui_type;
+	const gchar *type = "pc"; /* default client type, if unknown or
+								unspecified */
+	const gchar *ui_name = NULL;
+
+	jabber_plugin = plugin;
+
+	ui_type = ui_info ? g_hash_table_lookup(ui_info, "client_type") : NULL;
+	if (ui_type) {
+		if (strcmp(ui_type, "pc") == 0 ||
+			strcmp(ui_type, "console") == 0 ||
+			strcmp(ui_type, "phone") == 0 ||
+			strcmp(ui_type, "handheld") == 0 ||
+			strcmp(ui_type, "web") == 0 ||
+			strcmp(ui_type, "bot") == 0) {
+			type = ui_type;
+		}
+	}
+
+	if (ui_info)
+		ui_name = g_hash_table_lookup(ui_info, "name");
+	if (ui_name == NULL)
+		ui_name = PACKAGE;
+
+	jabber_add_identity("client", type, NULL, ui_name);
+
+	/* initialize jabber_features list */
+	jabber_add_feature("jabber:iq:last", 0);
+	jabber_add_feature("jabber:iq:oob", 0);
+	jabber_add_feature("urn:xmpp:time", 0);
+	jabber_add_feature("jabber:iq:version", 0);
+	jabber_add_feature("jabber:x:conference", 0);
+	jabber_add_feature("http://jabber.org/protocol/bytestreams", 0);
+	jabber_add_feature("http://jabber.org/protocol/caps", 0);
+	jabber_add_feature("http://jabber.org/protocol/chatstates", 0);
+	jabber_add_feature("http://jabber.org/protocol/disco#info", 0);
+	jabber_add_feature("http://jabber.org/protocol/disco#items", 0);
+	jabber_add_feature("http://jabber.org/protocol/ibb", 0);
+	jabber_add_feature("http://jabber.org/protocol/muc", 0);
+	jabber_add_feature("http://jabber.org/protocol/muc#user", 0);
+	jabber_add_feature("http://jabber.org/protocol/si", 0);
+	jabber_add_feature("http://jabber.org/protocol/si/profile/file-transfer", 0);
+	jabber_add_feature("http://jabber.org/protocol/xhtml-im", 0);
+	jabber_add_feature("urn:xmpp:ping", 0);
+
+	/* Buzz/Attention */
+	jabber_add_feature(XEP_0224_NAMESPACE, jabber_buzz_isenabled);
+
+	/* Bits Of Binary */
+	jabber_add_feature(XEP_0231_NAMESPACE, 0);
+
+	/* Jingle features! */
+	jabber_add_feature(JINGLE, 0);
+	jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0);
+
+#ifdef USE_VV
+	jabber_add_feature("http://www.google.com/xmpp/protocol/session", jabber_audio_enabled);
+	jabber_add_feature("http://www.google.com/xmpp/protocol/voice/v1", jabber_audio_enabled);
+	jabber_add_feature("http://www.google.com/xmpp/protocol/video/v1", jabber_video_enabled);
+	jabber_add_feature("http://www.google.com/xmpp/protocol/camera/v1", jabber_video_enabled);
+	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled);
+	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled);
+	jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0);
+#endif
+
+	/* IPC functions */
+	purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature),
+							 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER,
+							 purple_value_new(PURPLE_TYPE_BOOLEAN), 3,
+							 purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_ACCOUNT),
+							 purple_value_new(PURPLE_TYPE_STRING),
+							 purple_value_new(PURPLE_TYPE_STRING));
+
+	purple_plugin_ipc_register(plugin, "add_feature", PURPLE_CALLBACK(jabber_ipc_add_feature),
+							 purple_marshal_VOID__POINTER,
+							 NULL, 1,
+							 purple_value_new(PURPLE_TYPE_STRING));
+
+	/* Modifying these? Look at libxmpp.c:load_plugin for the signal versions */
+	purple_plugin_ipc_register(plugin, "register_namespace_watcher",
+	                           PURPLE_CALLBACK(jabber_iq_signal_register),
+	                           purple_marshal_VOID__POINTER_POINTER,
+	                           NULL, 2,
+	                           purple_value_new(PURPLE_TYPE_STRING),  /* node */
+	                           purple_value_new(PURPLE_TYPE_STRING)); /* namespace */
+
+	purple_plugin_ipc_register(plugin, "unregister_namespace_watcher",
+	                           PURPLE_CALLBACK(jabber_iq_signal_unregister),
+	                           purple_marshal_VOID__POINTER_POINTER,
+	                           NULL, 2,
+	                           purple_value_new(PURPLE_TYPE_STRING),  /* node */
+	                           purple_value_new(PURPLE_TYPE_STRING)); /* namespace */
+}
+
+void
+jabber_uninit_plugin(void)
+{
+	purple_plugin_ipc_unregister_all(jabber_plugin);
+
+	jabber_features_destroy();
+	jabber_identities_destroy();
 }
diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
index d616119631..f2c1e9c5e1 100644
--- a/libpurple/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
@@ -19,13 +19,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_H_
-#define _PURPLE_JABBER_H_
+#ifndef PURPLE_JABBER_H_
+#define PURPLE_JABBER_H_
 
 typedef enum {
 	JABBER_CAP_NONE           = 0,
-	JABBER_CAP_XHTML          = 1 << 0,
-	JABBER_CAP_COMPOSING      = 1 << 1,
+/*	JABBER_CAP_XHTML          = 1 << 0, */
+/*	JABBER_CAP_COMPOSING      = 1 << 1, */
 	JABBER_CAP_SI             = 1 << 2,
 	JABBER_CAP_SI_FILE_XFER   = 1 << 3,
 	JABBER_CAP_BYTESTREAMS    = 1 << 4,
@@ -44,6 +44,8 @@ typedef enum {
 	JABBER_CAP_ADHOC		  = 1 << 12,
 	JABBER_CAP_BLOCKING       = 1 << 13,
 
+	JABBER_CAP_ITEMS          = 1 << 14,
+
 	JABBER_CAP_RETRIEVED      = 1 << 31
 } JabberCapabilities;
 
@@ -53,23 +55,30 @@ typedef struct _JabberStream JabberStream;
 #include <glib.h>
 #include "circbuffer.h"
 #include "connection.h"
+#include "dnsquery.h"
 #include "dnssrv.h"
+#include "media.h"
+#include "mediamanager.h"
 #include "roomlist.h"
 #include "sslconn.h"
 
+#include "iq.h"
 #include "jutil.h"
 #include "xmlnode.h"
 #include "buddy.h"
+#include "bosh.h"
 
 #ifdef HAVE_CYRUS_SASL
 #include <sasl/sasl.h>
 #endif
 
-#define CAPS0115_NODE "http://pidgin.im/caps"
+#define CAPS0115_NODE "http://pidgin.im/"
 
 /* Index into attention_types list */
 #define JABBER_BUZZ 0
 
+extern PurplePlugin *jabber_plugin;
+
 typedef enum {
 	JABBER_STREAM_OFFLINE,
 	JABBER_STREAM_CONNECTING,
@@ -107,7 +116,6 @@ struct _JabberStream
 	char *expected_rspauth;
 
 	GHashTable *buddies;
-	gboolean roster_parsed;
 
 	/*
 	 * This boolean was added to eliminate a heinous bug where we would
@@ -146,7 +154,6 @@ struct _JabberStream
 	GList *user_directories;
 
 	GHashTable *iq_callbacks;
-	GHashTable *disco_callbacks;
 	int next_id;
 
 	GList *bs_proxies;
@@ -154,13 +161,17 @@ struct _JabberStream
 	GList *file_transfers;
 
 	time_t idle;
+	time_t old_idle;
 
 	JabberID *user;
+	JabberBuddy *user_jb;
+
 	PurpleConnection *gc;
 	PurpleSslConnection *gsc;
 
 	gboolean registration;
 
+	char *initial_avatar_hash;
 	char *avatar_hash;
 	GSList *pending_avatar_requests;
 
@@ -205,6 +216,11 @@ struct _JabberStream
 	void *unregistration_user_data;
 
 	gboolean vcard_fetched;
+	/* Timer at login to push updated avatar */
+	guint vcard_timer;
+
+	/* Entity Capabilities hash */
+	char *caps_hash;
 
 	/* does the local server support PEP? */
 	gboolean pep;
@@ -232,27 +248,47 @@ struct _JabberStream
 	char *certificate_CN;
 
 	/* A purple timeout tag for the keepalive */
-	int keepalive_timeout;
+	guint keepalive_timeout;
 
 	PurpleSrvResponse *srv_rec;
 	guint srv_rec_idx;
 	guint max_srv_rec_idx;
+
+	/* BOSH stuff */
+	PurpleBOSHConnection *bosh;
+
 	/**
 	 * This linked list contains PurpleUtilFetchUrlData structs
 	 * for when we lookup buddy icons from a url
 	 */
 	GSList *url_datas;
+
+	/* keep a hash table of JingleSessions */
+	GHashTable *sessions;
+
+	/* maybe this should only be present when USE_VV? */
+	gchar *stun_ip;
+	int stun_port;
+	PurpleDnsQueryData *stun_query;
+	/* later add stuff to handle TURN relays... */
 };
 
-typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *shortname, const gchar *namespace);
+typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace);
 
 typedef struct _JabberFeature
 {
-	gchar *shortname;
 	gchar *namespace;
 	JabberFeatureEnabled *is_enabled;
 } JabberFeature;
 
+typedef struct _JabberIdentity
+{
+	gchar *category;
+	gchar *type;
+	gchar *name;
+	gchar *lang;
+} JabberIdentity;
+
 typedef struct _JabberBytestreamsStreamhost {
 	char *jid;
 	char *host;
@@ -262,14 +298,19 @@ typedef struct _JabberBytestreamsStreamhost {
 
 /* what kind of additional features as returned from disco#info are supported? */
 extern GList *jabber_features;
+extern GList *jabber_identities;
 
+void jabber_stream_features_parse(JabberStream *js, xmlnode *packet);
 void jabber_process_packet(JabberStream *js, xmlnode **packet);
 void jabber_send(JabberStream *js, xmlnode *data);
 void jabber_send_raw(JabberStream *js, const char *data, int len);
+void jabber_send_signal_cb(PurpleConnection *pc, xmlnode **packet,
+                           gpointer unused);
 
 void jabber_stream_set_state(JabberStream *js, JabberStreamState state);
 
-void jabber_register_parse(JabberStream *js, xmlnode *packet);
+void jabber_register_parse(JabberStream *js, const char *from,
+                           JabberIqType type, const char *id, xmlnode *query);
 void jabber_register_start(JabberStream *js);
 
 char *jabber_get_next_id(JabberStream *js);
@@ -283,8 +324,24 @@ char *jabber_get_next_id(JabberStream *js);
  */
 char *jabber_parse_error(JabberStream *js, xmlnode *packet, PurpleConnectionError *reason);
 
-void jabber_add_feature(const gchar *shortname, const gchar *namespace, JabberFeatureEnabled cb); /* cb may be NULL */
-void jabber_remove_feature(const gchar *shortname);
+void jabber_add_feature(const gchar *namespace, JabberFeatureEnabled cb); /* cb may be NULL */
+void jabber_remove_feature(const gchar *namespace);
+
+/** Adds an identity to this jabber library instance. For list of valid values visit the
+ *	website of the XMPP Registrar ( http://www.xmpp.org/registrar/disco-categories.html#client ).
+ *  @param category the category of the identity.
+ *  @param type the type of the identity.
+ *  @param language the language localization of the name. Can be NULL.
+ *  @param name the name of the identity.
+ */
+void jabber_add_identity(const gchar *category, const gchar *type, const gchar *lang, const gchar *name);
+
+/**
+ * Returns true if this connection is over a secure (SSL) stream. Use this
+ * instead of checking js->gsc because BOSH stores its PurpleSslConnection
+ * members in its own data structure.
+ */
+gboolean jabber_stream_is_ssl(JabberStream *js);
 
 /** PRPL functions */
 const char *jabber_list_icon(PurpleAccount *a, PurpleBuddy *b);
@@ -295,6 +352,9 @@ GList *jabber_status_types(PurpleAccount *account);
 void jabber_login(PurpleAccount *account);
 void jabber_close(PurpleConnection *gc);
 void jabber_idle_set(PurpleConnection *gc, int idle);
+void jabber_blocklist_parse_push(JabberStream *js, const char *from,
+                                 JabberIqType type, const char *id,
+                                 xmlnode *child);
 void jabber_request_block_list(JabberStream *js);
 void jabber_add_deny(PurpleConnection *gc, const char *who);
 void jabber_rem_deny(PurpleConnection *gc, const char *who);
@@ -309,7 +369,17 @@ PurpleChat *jabber_find_blist_chat(PurpleAccount *account, const char *name);
 gboolean jabber_offline_message(const PurpleBuddy *buddy);
 int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len);
 GList *jabber_actions(PurplePlugin *plugin, gpointer context);
+
+gboolean jabber_audio_enabled(JabberStream *js, const char *unused);
+gboolean jabber_video_enabled(JabberStream *js, const char *unused);
+gboolean jabber_initiate_media(PurpleAccount *account, const char *who,
+		PurpleMediaSessionType type);
+PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who);
+
 void jabber_register_commands(void);
+void jabber_unregister_commands(void);
+
 void jabber_init_plugin(PurplePlugin *plugin);
+void jabber_uninit_plugin(void);
 
-#endif /* _PURPLE_JABBER_H_ */
+#endif /* PURPLE_JABBER_H_ */
diff --git a/libpurple/protocols/jabber/jingle/content.c b/libpurple/protocols/jabber/jingle/content.c
new file mode 100644
index 0000000000..e3d06c9662
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/content.c
@@ -0,0 +1,461 @@
+/**
+ * @file content.c
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+
+#include "debug.h"
+#include "content.h"
+#include "jingle.h"
+
+#include <string.h>
+
+struct _JingleContentPrivate
+{
+	JingleSession *session;
+	gchar *description_type;
+	gchar *creator;
+	gchar *disposition;
+	gchar *name;
+	gchar *senders;
+	JingleTransport *transport;
+	JingleTransport *pending_transport;
+};
+
+#define JINGLE_CONTENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), JINGLE_TYPE_CONTENT, JingleContentPrivate))
+
+static void jingle_content_class_init (JingleContentClass *klass);
+static void jingle_content_init (JingleContent *content);
+static void jingle_content_finalize (GObject *object);
+static void jingle_content_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void jingle_content_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+static xmlnode *jingle_content_to_xml_internal(JingleContent *content, xmlnode *jingle, JingleActionType action);
+static JingleContent *jingle_content_parse_internal(xmlnode *content);
+
+static GObjectClass *parent_class = NULL;
+
+enum {
+	PROP_0,
+	PROP_SESSION,
+	PROP_CREATOR,
+	PROP_DISPOSITION,
+	PROP_NAME,
+	PROP_SENDERS,
+	PROP_TRANSPORT,
+	PROP_PENDING_TRANSPORT,
+};
+
+GType
+jingle_content_get_type()
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof(JingleContentClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) jingle_content_class_init,
+			NULL,
+			NULL,
+			sizeof(JingleContent),
+			0,
+			(GInstanceInitFunc) jingle_content_init,
+			NULL
+		};
+		type = g_type_register_static(G_TYPE_OBJECT, "JingleContent", &info, 0);
+	}
+	return type;
+}
+
+static void
+jingle_content_class_init (JingleContentClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	parent_class = g_type_class_peek_parent(klass);
+	
+	gobject_class->finalize = jingle_content_finalize;
+	gobject_class->set_property = jingle_content_set_property;
+	gobject_class->get_property = jingle_content_get_property;
+	klass->to_xml = jingle_content_to_xml_internal;
+	klass->parse = jingle_content_parse_internal;
+
+	g_object_class_install_property(gobject_class, PROP_SESSION,
+			g_param_spec_object("session",
+			"Jingle Session",
+			"The jingle session parent of this content.",
+			JINGLE_TYPE_SESSION,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_CREATOR,
+			g_param_spec_string("creator",
+			"Creator",
+			"The participant that created this content.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_DISPOSITION,
+			g_param_spec_string("disposition",
+			"Disposition",
+			"The disposition of the content.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_NAME,
+			g_param_spec_string("name",
+			"Name",
+			"The name of this content.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_SENDERS,
+			g_param_spec_string("senders",
+			"Senders",
+			"The sender of this content.",
+			NULL,
+			G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_TRANSPORT,
+			g_param_spec_object("transport",
+			"transport",
+			"The transport of this content.",
+			JINGLE_TYPE_TRANSPORT,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_PENDING_TRANSPORT,
+			g_param_spec_object("pending-transport",
+			"Pending transport",
+			"The pending transport contained within this content",
+			JINGLE_TYPE_TRANSPORT,
+			G_PARAM_READWRITE));
+
+	g_type_class_add_private(klass, sizeof(JingleContentPrivate));
+}
+
+static void
+jingle_content_init (JingleContent *content)
+{
+	content->priv = JINGLE_CONTENT_GET_PRIVATE(content);
+	memset(content->priv, 0, sizeof(*content->priv));
+}
+
+static void
+jingle_content_finalize (GObject *content)
+{
+	JingleContentPrivate *priv = JINGLE_CONTENT_GET_PRIVATE(content);
+	purple_debug_info("jingle","jingle_content_finalize\n");
+	
+	g_free(priv->description_type);
+	g_free(priv->creator);
+	g_free(priv->disposition);
+	g_free(priv->name);
+	g_free(priv->senders);
+	g_object_unref(priv->transport);
+	if (priv->pending_transport)
+		g_object_unref(priv->pending_transport);
+
+	parent_class->finalize(content);
+}
+
+static void
+jingle_content_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	JingleContent *content;
+	g_return_if_fail(JINGLE_IS_CONTENT(object));
+
+	content = JINGLE_CONTENT(object);
+
+	switch (prop_id) {
+		case PROP_SESSION:
+			content->priv->session = g_value_get_object(value);
+			break;
+		case PROP_CREATOR:
+			g_free(content->priv->creator);
+			content->priv->creator = g_value_dup_string(value);
+			break;
+		case PROP_DISPOSITION:
+			g_free(content->priv->disposition);
+			content->priv->disposition = g_value_dup_string(value);
+			break;
+		case PROP_NAME:
+			g_free(content->priv->name);
+			content->priv->name = g_value_dup_string(value);
+			break;
+		case PROP_SENDERS:
+			g_free(content->priv->senders);
+			content->priv->senders = g_value_dup_string(value);
+			break;
+		case PROP_TRANSPORT:
+			if (content->priv->transport)
+				g_object_unref(content->priv->transport);
+			content->priv->transport = g_value_get_object(value);
+			break;
+		case PROP_PENDING_TRANSPORT:
+			if (content->priv->pending_transport)
+				g_object_unref(content->priv->pending_transport);
+			content->priv->pending_transport = g_value_get_object(value);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+jingle_content_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	JingleContent *content;
+	g_return_if_fail(JINGLE_IS_CONTENT(object));
+	
+	content = JINGLE_CONTENT(object);
+
+	switch (prop_id) {
+		case PROP_SESSION:
+			g_value_set_object(value, content->priv->session);
+			break;
+		case PROP_CREATOR:
+			g_value_set_string(value, content->priv->creator);
+			break;
+		case PROP_DISPOSITION:
+			g_value_set_string(value, content->priv->disposition);
+			break;
+		case PROP_NAME:
+			g_value_set_string(value, content->priv->name);
+			break;
+		case PROP_SENDERS:
+			g_value_set_string(value, content->priv->senders);
+			break;
+		case PROP_TRANSPORT:
+			g_value_set_object(value, content->priv->transport);
+			break;
+		case PROP_PENDING_TRANSPORT:
+			g_value_set_object(value, content->priv->pending_transport);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);	
+			break;
+	}
+}
+
+JingleContent *
+jingle_content_create(const gchar *type, const gchar *creator,
+		const gchar *disposition, const gchar *name,
+		const gchar *senders, JingleTransport *transport)
+{
+	
+
+	JingleContent *content = g_object_new(jingle_get_type(type),
+			"creator", creator,
+			"disposition", disposition != NULL ? disposition : "session",
+			"name", name,
+			"senders", senders != NULL ? senders : "both",
+			"transport", transport,
+			NULL);
+	return content;
+}
+
+JingleSession *jingle_content_get_session(JingleContent *content)
+{
+	JingleSession *session;
+	g_object_get(content, "session", &session, NULL);
+	return session;
+}
+
+const gchar *
+jingle_content_get_description_type(JingleContent *content)
+{
+	return JINGLE_CONTENT_GET_CLASS(content)->description_type;
+}
+
+gchar *
+jingle_content_get_creator(JingleContent *content)
+{
+	gchar *creator;
+	g_object_get(content, "creator", &creator, NULL);
+	return creator;
+}
+
+gchar *
+jingle_content_get_disposition(JingleContent *content)
+{
+	gchar *disposition;
+	g_object_get(content, "disposition", &disposition, NULL);
+	return disposition;
+}
+
+gchar *
+jingle_content_get_name(JingleContent *content)
+{
+	gchar *name;
+	g_object_get(content, "name", &name, NULL);
+	return name;
+}
+
+gchar *
+jingle_content_get_senders(JingleContent *content)
+{
+	gchar *senders;
+	g_object_get(content, "senders", &senders, NULL);
+	return senders;
+}
+
+JingleTransport *
+jingle_content_get_transport(JingleContent *content)
+{
+	JingleTransport *transport;
+	g_object_get(content, "transport", &transport, NULL);
+	return transport;
+}
+
+void
+jingle_content_set_session(JingleContent *content, JingleSession *session)
+{
+	JINGLE_IS_CONTENT(content);
+	JINGLE_IS_SESSION(session);
+	g_object_set(content, "session", session, NULL);
+}
+
+JingleTransport *
+jingle_content_get_pending_transport(JingleContent *content)
+{
+	JingleTransport *pending_transport;
+	g_object_get(content, "pending_transport", &pending_transport, NULL);
+	return pending_transport;
+}
+
+void
+jingle_content_set_pending_transport(JingleContent *content, JingleTransport *transport)
+{
+	g_object_set(content, "pending-transport", transport, NULL);
+}
+
+void
+jingle_content_accept_transport(JingleContent *content)
+{
+	if (content->priv->transport)
+		g_object_unref(content->priv->transport);
+	content->priv->transport = content->priv->pending_transport;
+	content->priv->pending_transport = NULL;
+}
+
+void
+jingle_content_remove_pending_transport(JingleContent *content)
+{
+	if (content->priv->pending_transport) {
+		g_object_unref(content->priv->pending_transport);
+		content->priv->pending_transport = NULL;
+	}
+}
+
+void
+jingle_content_modify(JingleContent *content, const gchar *senders)
+{
+	g_object_set(content, "senders", senders, NULL);
+}
+
+static JingleContent *
+jingle_content_parse_internal(xmlnode *content)
+{
+	xmlnode *description = xmlnode_get_child(content, "description");
+	const gchar *type = xmlnode_get_namespace(description);
+	const gchar *creator = xmlnode_get_attrib(content, "creator");
+	const gchar *disposition = xmlnode_get_attrib(content, "disposition");
+	const gchar *senders = xmlnode_get_attrib(content, "senders");
+	const gchar *name = xmlnode_get_attrib(content, "name");
+	JingleTransport *transport =
+			jingle_transport_parse(xmlnode_get_child(content, "transport"));
+
+	if (senders == NULL)
+		senders = "both";
+
+	return jingle_content_create(type, creator, disposition, name, senders, transport);
+}
+
+JingleContent *
+jingle_content_parse(xmlnode *content)
+{
+	const gchar *type = xmlnode_get_namespace(xmlnode_get_child(content, "description"));
+	GType jingle_type = jingle_get_type(type);
+
+	if (jingle_type != G_TYPE_NONE) {
+		return JINGLE_CONTENT_CLASS(g_type_class_ref(jingle_type))->parse(content);
+	} else {
+		return NULL;
+	}
+}
+
+static xmlnode *
+jingle_content_to_xml_internal(JingleContent *content, xmlnode *jingle, JingleActionType action)
+{
+	xmlnode *node = xmlnode_new_child(jingle, "content");
+	gchar *creator = jingle_content_get_creator(content);
+	gchar *name = jingle_content_get_name(content);
+	gchar *senders = jingle_content_get_senders(content);
+	gchar *disposition = jingle_content_get_disposition(content);
+
+	xmlnode_set_attrib(node, "creator", creator);
+	xmlnode_set_attrib(node, "name", name);
+	xmlnode_set_attrib(node, "senders", senders);
+	if (strcmp("session", disposition))
+		xmlnode_set_attrib(node, "disposition", disposition);
+
+	g_free(disposition);
+	g_free(senders);
+	g_free(name);
+	g_free(creator);
+
+	if (action != JINGLE_CONTENT_REMOVE) {
+		JingleTransport *transport;
+
+		if (action != JINGLE_TRANSPORT_ACCEPT &&
+				action != JINGLE_TRANSPORT_INFO &&
+				action != JINGLE_TRANSPORT_REJECT &&
+				action != JINGLE_TRANSPORT_REPLACE) {
+			xmlnode *description = xmlnode_new_child(node, "description");
+
+			xmlnode_set_namespace(description,
+					jingle_content_get_description_type(content));
+		}
+
+		if (action != JINGLE_TRANSPORT_REJECT && action == JINGLE_TRANSPORT_REPLACE)
+			transport = jingle_content_get_pending_transport(content);
+		else
+			transport = jingle_content_get_transport(content);
+
+		jingle_transport_to_xml(transport, node, action);
+		g_object_unref(transport);
+	}
+
+	return node;
+}
+
+xmlnode *
+jingle_content_to_xml(JingleContent *content, xmlnode *jingle, JingleActionType action)
+{
+	g_return_val_if_fail(JINGLE_IS_CONTENT(content), NULL);
+	return JINGLE_CONTENT_GET_CLASS(content)->to_xml(content, jingle, action);
+}
+
+void
+jingle_content_handle_action(JingleContent *content, xmlnode *xmlcontent, JingleActionType action)
+{
+	g_return_if_fail(JINGLE_IS_CONTENT(content));
+	JINGLE_CONTENT_GET_CLASS(content)->handle_action(content, xmlcontent, action);
+}
+
diff --git a/libpurple/protocols/jabber/jingle/content.h b/libpurple/protocols/jabber/jingle/content.h
new file mode 100644
index 0000000000..bb23be01f1
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/content.h
@@ -0,0 +1,117 @@
+/**
+ * @file content.h
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef PURPLE_JABBER_JINGLE_CONTENT_H
+#define PURPLE_JABBER_JINGLE_CONTENT_H
+
+
+#include "jabber.h"
+#include "jingle.h"
+#include "session.h"
+#include "transport.h"
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define JINGLE_TYPE_CONTENT            (jingle_content_get_type())
+#define JINGLE_CONTENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), JINGLE_TYPE_CONTENT, JingleContent))
+#define JINGLE_CONTENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), JINGLE_TYPE_CONTENT, JingleContentClass))
+#define JINGLE_IS_CONTENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), JINGLE_TYPE_CONTENT))
+#define JINGLE_IS_CONTENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), JINGLE_TYPE_CONTENT))
+#define JINGLE_CONTENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), JINGLE_TYPE_CONTENT, JingleContentClass))
+
+/** @copydoc _JingleContent */
+typedef struct _JingleContent JingleContent;
+/** @copydoc _JingleContentClass */
+typedef struct _JingleContentClass JingleContentClass;
+/** @copydoc _JingleContentPrivate */
+typedef struct _JingleContentPrivate JingleContentPrivate;
+
+/** The content class */
+struct _JingleContentClass
+{
+	GObjectClass parent_class;     /**< The parent class. */
+
+	xmlnode *(*to_xml) (JingleContent *content, xmlnode *jingle, JingleActionType action);
+	JingleContent *(*parse) (xmlnode *content);
+	void (*handle_action) (JingleContent *content, xmlnode *xmlcontent, JingleActionType action);
+	const gchar *description_type;
+};
+
+/** The content class's private data */
+struct _JingleContent
+{
+	GObject parent;                /**< The parent of this object. */
+	JingleContentPrivate *priv;      /**< The private data of this object. */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Gets the content class's GType
+ *
+ * @return The content class's GType.
+ */
+GType jingle_content_get_type(void);
+
+JingleContent *jingle_content_create(const gchar *type, const gchar *creator,
+		const gchar *disposition, const gchar *name,
+		const gchar *senders, JingleTransport *transport);
+
+JingleSession *jingle_content_get_session(JingleContent *content);
+const gchar *jingle_content_get_description_type(JingleContent *content);
+gchar *jingle_content_get_creator(JingleContent *content);
+gchar *jingle_content_get_disposition(JingleContent *content);
+gchar *jingle_content_get_name(JingleContent *content);
+gchar *jingle_content_get_senders(JingleContent *content);
+JingleTransport *jingle_content_get_transport(JingleContent *content);
+JingleTransport *jingle_content_get_pending_transport(JingleContent *content);
+
+void jingle_content_set_session(JingleContent *content, JingleSession *session);
+void jingle_content_set_pending_transport(JingleContent *content, JingleTransport *transport);
+void jingle_content_accept_transport(JingleContent *content);
+void jingle_content_remove_pending_transport(JingleContent *content);
+void jingle_content_modify(JingleContent *content, const gchar *senders);
+
+#define jingle_content_create_content_accept(session) \
+	jingle_session_to_packet(session, JINGLE_CONTENT_ACCEPT)
+#define jingle_content_create_content_add(session) \
+	jingle_session_to_packet(session, JINGLE_CONTENT_ADD)
+#define jingle_content_create_content_modify(session) \
+	jingle_session_to_packet(session, JINGLE_CONTENT_MODIFY)
+#define jingle_content_create_content_remove(session) \
+	jingle_session_to_packet(session, JINGLE_CONTENT_REMOVE)
+
+JingleContent *jingle_content_parse(xmlnode *content);
+xmlnode *jingle_content_to_xml(JingleContent *content, xmlnode *jingle, JingleActionType action);
+void jingle_content_handle_action(JingleContent *content, xmlnode *xmlcontent, JingleActionType action);
+
+#ifdef __cplusplus
+}
+#endif
+
+G_END_DECLS
+
+#endif /* PURPLE_JABBER_JINGLE_CONTENT_H */
+
diff --git a/libpurple/protocols/jabber/jingle/iceudp.c b/libpurple/protocols/jabber/jingle/iceudp.c
new file mode 100644
index 0000000000..966fff28fe
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/iceudp.c
@@ -0,0 +1,427 @@
+/**
+ * @file iceudp.c
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+
+#include "iceudp.h"
+#include "jingle.h"
+#include "debug.h"
+
+#include <string.h>
+
+struct _JingleIceUdpPrivate
+{
+	GList *local_candidates;
+	GList *remote_candidates;
+};
+
+#define JINGLE_ICEUDP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), JINGLE_TYPE_ICEUDP, JingleIceUdpPrivate))
+
+static void jingle_iceudp_class_init (JingleIceUdpClass *klass);
+static void jingle_iceudp_init (JingleIceUdp *iceudp);
+static void jingle_iceudp_finalize (GObject *object);
+static void jingle_iceudp_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void jingle_iceudp_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+static JingleTransport *jingle_iceudp_parse_internal(xmlnode *iceudp);
+static xmlnode *jingle_iceudp_to_xml_internal(JingleTransport *transport, xmlnode *content, JingleActionType action);
+
+static JingleTransportClass *parent_class = NULL;
+
+enum {
+	PROP_0,
+	PROP_LOCAL_CANDIDATES,
+	PROP_REMOTE_CANDIDATES,
+};
+
+static JingleIceUdpCandidate *
+jingle_iceudp_candidate_copy(JingleIceUdpCandidate *candidate)
+{
+	JingleIceUdpCandidate *new_candidate = g_new0(JingleIceUdpCandidate, 1);
+	new_candidate->component = candidate->component;
+	new_candidate->foundation = g_strdup(candidate->foundation);
+	new_candidate->generation = candidate->generation;
+	new_candidate->id = g_strdup(candidate->id);
+	new_candidate->ip = g_strdup(candidate->ip);
+	new_candidate->network = candidate->network;
+	new_candidate->port = candidate->port;
+	new_candidate->priority = candidate->priority;
+	new_candidate->protocol = g_strdup(candidate->protocol);
+	new_candidate->type = g_strdup(candidate->type);
+
+	new_candidate->username = g_strdup(candidate->username);
+	new_candidate->password = g_strdup(candidate->password);
+
+	new_candidate->rem_known = candidate->rem_known;
+
+	return new_candidate;
+}
+
+static void
+jingle_iceudp_candidate_free(JingleIceUdpCandidate *candidate)
+{
+	g_free(candidate->foundation);
+	g_free(candidate->id);
+	g_free(candidate->ip);
+	g_free(candidate->protocol);
+	g_free(candidate->reladdr);
+	g_free(candidate->type);
+
+	g_free(candidate->username);
+	g_free(candidate->password);
+}
+
+GType
+jingle_iceudp_candidate_get_type()
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		type = g_boxed_type_register_static("JingleIceUdpCandidate",
+				(GBoxedCopyFunc)jingle_iceudp_candidate_copy,
+				(GBoxedFreeFunc)jingle_iceudp_candidate_free);
+	}
+	return type;
+}
+
+JingleIceUdpCandidate *
+jingle_iceudp_candidate_new(guint component, const gchar *foundation,
+		guint generation, const gchar *id, const gchar *ip,
+		guint network, guint port, guint priority,
+		const gchar *protocol, const gchar *type,
+		const gchar *username, const gchar *password)
+{
+	JingleIceUdpCandidate *candidate = g_new0(JingleIceUdpCandidate, 1);
+	candidate->component = component;
+	candidate->foundation = g_strdup(foundation);
+	candidate->generation = generation;
+	candidate->id = g_strdup(id);
+	candidate->ip = g_strdup(ip);
+	candidate->network = network;
+	candidate->port = port;
+	candidate->priority = priority;
+	candidate->protocol = g_strdup(protocol);
+	candidate->type = g_strdup(type);
+
+	candidate->username = g_strdup(username);
+	candidate->password = g_strdup(password);
+
+	candidate->rem_known = FALSE;
+	return candidate;
+}
+
+GType
+jingle_iceudp_get_type()
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof(JingleIceUdpClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) jingle_iceudp_class_init,
+			NULL,
+			NULL,
+			sizeof(JingleIceUdp),
+			0,
+			(GInstanceInitFunc) jingle_iceudp_init,
+			NULL
+		};
+		type = g_type_register_static(JINGLE_TYPE_TRANSPORT, "JingleIceUdp", &info, 0);
+	}
+	return type;
+}
+
+static void
+jingle_iceudp_class_init (JingleIceUdpClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	parent_class = g_type_class_peek_parent(klass);
+
+	gobject_class->finalize = jingle_iceudp_finalize;
+	gobject_class->set_property = jingle_iceudp_set_property;
+	gobject_class->get_property = jingle_iceudp_get_property;
+	klass->parent_class.to_xml = jingle_iceudp_to_xml_internal;
+	klass->parent_class.parse = jingle_iceudp_parse_internal;
+	klass->parent_class.transport_type = JINGLE_TRANSPORT_ICEUDP;
+
+	g_object_class_install_property(gobject_class, PROP_LOCAL_CANDIDATES,
+			g_param_spec_pointer("local-candidates",
+			"Local candidates",
+			"The local candidates for this transport.",
+			G_PARAM_READABLE));
+
+	g_object_class_install_property(gobject_class, PROP_REMOTE_CANDIDATES,
+			g_param_spec_pointer("remote-candidates",
+			"Remote candidates",
+			"The remote candidates for this transport.",
+			G_PARAM_READABLE));
+
+	g_type_class_add_private(klass, sizeof(JingleIceUdpPrivate));
+}
+
+static void
+jingle_iceudp_init (JingleIceUdp *iceudp)
+{
+	iceudp->priv = JINGLE_ICEUDP_GET_PRIVATE(iceudp);
+	iceudp->priv->local_candidates = NULL;
+	iceudp->priv->remote_candidates = NULL;
+}
+
+static void
+jingle_iceudp_finalize (GObject *iceudp)
+{
+/*	JingleIceUdpPrivate *priv = JINGLE_ICEUDP_GET_PRIVATE(iceudp); */
+	purple_debug_info("jingle","jingle_iceudp_finalize\n");
+
+	G_OBJECT_CLASS(parent_class)->finalize(iceudp);
+}
+
+static void
+jingle_iceudp_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	JingleIceUdp *iceudp;
+	g_return_if_fail(JINGLE_IS_ICEUDP(object));
+
+	iceudp = JINGLE_ICEUDP(object);
+
+	switch (prop_id) {
+		case PROP_LOCAL_CANDIDATES:
+			iceudp->priv->local_candidates =
+					g_value_get_pointer(value);
+			break;
+		case PROP_REMOTE_CANDIDATES:
+			iceudp->priv->remote_candidates =
+					g_value_get_pointer(value);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+jingle_iceudp_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	JingleIceUdp *iceudp;
+	g_return_if_fail(JINGLE_IS_ICEUDP(object));
+	
+	iceudp = JINGLE_ICEUDP(object);
+
+	switch (prop_id) {
+		case PROP_LOCAL_CANDIDATES:
+			g_value_set_pointer(value, iceudp->priv->local_candidates);
+			break;
+		case PROP_REMOTE_CANDIDATES:
+			g_value_set_pointer(value, iceudp->priv->remote_candidates);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);	
+			break;
+	}
+}
+
+void
+jingle_iceudp_add_local_candidate(JingleIceUdp *iceudp, JingleIceUdpCandidate *candidate)
+{
+	GList *iter = iceudp->priv->local_candidates;
+
+	for (; iter; iter = g_list_next(iter)) {
+		JingleIceUdpCandidate *c = iter->data;
+		if (!strcmp(c->id, candidate->id)) {
+			guint generation = c->generation + 1;
+
+			g_boxed_free(JINGLE_TYPE_ICEUDP_CANDIDATE, c);
+			iceudp->priv->local_candidates = g_list_delete_link(
+					iceudp->priv->local_candidates, iter);
+
+			candidate->generation = generation;
+
+			iceudp->priv->local_candidates = g_list_append(
+					iceudp->priv->local_candidates, candidate);
+			return;
+		}
+	}
+
+	iceudp->priv->local_candidates = g_list_append(
+			iceudp->priv->local_candidates, candidate);
+}
+
+GList *
+jingle_iceudp_get_remote_candidates(JingleIceUdp *iceudp)
+{
+	return g_list_copy(iceudp->priv->remote_candidates);
+}
+
+static JingleIceUdpCandidate *
+jingle_iceudp_get_remote_candidate_by_id(JingleIceUdp *iceudp,
+		const gchar *id)
+{
+	GList *iter = iceudp->priv->remote_candidates;
+	for (; iter; iter = g_list_next(iter)) {
+		JingleIceUdpCandidate *candidate = iter->data;
+		if (!strcmp(candidate->id, id)) {
+			return candidate;
+		}
+	}
+	return NULL;
+}
+
+static void
+jingle_iceudp_add_remote_candidate(JingleIceUdp *iceudp, JingleIceUdpCandidate *candidate)
+{
+	JingleIceUdpPrivate *priv = JINGLE_ICEUDP_GET_PRIVATE(iceudp);
+	JingleIceUdpCandidate *iceudp_candidate =
+			jingle_iceudp_get_remote_candidate_by_id(iceudp,
+					candidate->id);
+	if (iceudp_candidate != NULL) {
+		priv->remote_candidates = g_list_remove(
+				priv->remote_candidates, iceudp_candidate);
+		g_boxed_free(JINGLE_TYPE_ICEUDP_CANDIDATE, iceudp_candidate);
+	}
+	priv->remote_candidates = g_list_append(priv->remote_candidates, candidate);
+}
+
+static JingleTransport *
+jingle_iceudp_parse_internal(xmlnode *iceudp)
+{
+	JingleTransport *transport = parent_class->parse(iceudp);
+	xmlnode *candidate = xmlnode_get_child(iceudp, "candidate");
+	JingleIceUdpCandidate *iceudp_candidate = NULL;
+
+	const gchar *username = xmlnode_get_attrib(iceudp, "ufrag");
+	const gchar *password = xmlnode_get_attrib(iceudp, "pwd");
+
+	for (; candidate; candidate = xmlnode_get_next_twin(candidate)) {
+		const gchar *relport = xmlnode_get_attrib(candidate, "rel-port");
+		const gchar *component = xmlnode_get_attrib(candidate, "component");
+		const gchar *foundation = xmlnode_get_attrib(candidate, "foundation");
+		const gchar *generation = xmlnode_get_attrib(candidate, "generation");
+		const gchar *id = xmlnode_get_attrib(candidate, "id");
+		const gchar *ip = xmlnode_get_attrib(candidate, "ip");
+		const gchar *network = xmlnode_get_attrib(candidate, "network");
+		const gchar *port = xmlnode_get_attrib(candidate, "port");
+		const gchar *priority = xmlnode_get_attrib(candidate, "priority");
+		const gchar *protocol = xmlnode_get_attrib(candidate, "protocol");
+		const gchar *type = xmlnode_get_attrib(candidate, "type");
+
+		if (!component || !foundation || !generation || !id || !ip ||
+				!network || !port || !priority || !protocol || !type)
+			continue;
+
+		iceudp_candidate = jingle_iceudp_candidate_new(
+				atoi(component),
+				foundation,
+				atoi(generation),
+				id,
+				ip,
+				atoi(network),
+				atoi(port),
+				atoi(priority),
+				protocol,
+				type,
+				username, password);
+		iceudp_candidate->reladdr = g_strdup(
+				xmlnode_get_attrib(candidate, "rel-addr"));
+		iceudp_candidate->relport =
+				relport != NULL ? atoi(relport) : 0;
+		iceudp_candidate->rem_known = TRUE;
+		jingle_iceudp_add_remote_candidate(JINGLE_ICEUDP(transport), iceudp_candidate);
+	}
+
+	return transport;
+}
+
+static xmlnode *
+jingle_iceudp_to_xml_internal(JingleTransport *transport, xmlnode *content, JingleActionType action)
+{
+	xmlnode *node = parent_class->to_xml(transport, content, action);
+
+	if (action == JINGLE_SESSION_INITIATE ||
+			action == JINGLE_SESSION_ACCEPT ||
+			action == JINGLE_TRANSPORT_INFO ||
+			action == JINGLE_CONTENT_ADD ||
+			action == JINGLE_TRANSPORT_REPLACE) {
+		JingleIceUdpPrivate *priv = JINGLE_ICEUDP_GET_PRIVATE(transport);
+		GList *iter = priv->local_candidates;
+		gboolean used_candidate = FALSE;
+
+		for (; iter; iter = g_list_next(iter)) {
+			JingleIceUdpCandidate *candidate = iter->data;
+			xmlnode *xmltransport;
+			gchar *component, *generation, *network,
+					*port, *priority;
+
+			if (candidate->rem_known == TRUE)
+				continue;
+
+			used_candidate = TRUE;
+			candidate->rem_known = TRUE;
+
+			xmltransport = xmlnode_new_child(node, "candidate");
+			component = g_strdup_printf("%d", candidate->component);
+			generation = g_strdup_printf("%d",
+					candidate->generation);
+			network = g_strdup_printf("%d", candidate->network);
+			port = g_strdup_printf("%d", candidate->port);
+			priority = g_strdup_printf("%d", candidate->priority);
+
+			xmlnode_set_attrib(xmltransport, "component", component);
+			xmlnode_set_attrib(xmltransport, "foundation", candidate->foundation);
+			xmlnode_set_attrib(xmltransport, "generation", generation);
+			xmlnode_set_attrib(xmltransport, "id", candidate->id);
+			xmlnode_set_attrib(xmltransport, "ip", candidate->ip);
+			xmlnode_set_attrib(xmltransport, "network", network);
+			xmlnode_set_attrib(xmltransport, "port", port);
+			xmlnode_set_attrib(xmltransport, "priority", priority);
+			xmlnode_set_attrib(xmltransport, "protocol", candidate->protocol);
+
+			if (candidate->reladdr != NULL &&
+					(strcmp(candidate->ip, candidate->reladdr) ||
+					(candidate->port != candidate->relport))) {
+				gchar *relport = g_strdup_printf("%d",
+						candidate->relport);
+				xmlnode_set_attrib(xmltransport, "rel-addr",
+						candidate->reladdr);
+				xmlnode_set_attrib(xmltransport, "rel-port",
+						relport);
+				g_free(relport);
+			}
+
+			xmlnode_set_attrib(xmltransport, "type", candidate->type);
+
+			g_free(component);
+			g_free(generation);
+			g_free(network);
+			g_free(port);
+			g_free(priority);
+		}
+
+		if (used_candidate == TRUE) {
+			JingleIceUdpCandidate *candidate =
+					priv->local_candidates->data;
+			xmlnode_set_attrib(node, "pwd", candidate->password);
+			xmlnode_set_attrib(node, "ufrag", candidate->username);
+		}
+	}
+
+	return node;
+}
+
diff --git a/libpurple/protocols/jabber/jingle/iceudp.h b/libpurple/protocols/jabber/jingle/iceudp.h
new file mode 100644
index 0000000000..bf3b961f37
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/iceudp.h
@@ -0,0 +1,114 @@
+/**
+ * @file iceudp.h
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef PURPLE_JABBER_JINGLE_ICEUDP_H
+#define PURPLE_JABBER_JINGLE_ICEUDP_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include "transport.h"
+
+G_BEGIN_DECLS
+
+#define JINGLE_TYPE_ICEUDP            (jingle_iceudp_get_type())
+#define JINGLE_TYPE_ICEUDP_CANDIDATE  (jingle_iceudp_candidate_get_type())
+#define JINGLE_ICEUDP(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), JINGLE_TYPE_ICEUDP, JingleIceUdp))
+#define JINGLE_ICEUDP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), JINGLE_TYPE_ICEUDP, JingleIceUdpClass))
+#define JINGLE_IS_ICEUDP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), JINGLE_TYPE_ICEUDP))
+#define JINGLE_IS_ICEUDP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), JINGLE_TYPE_ICEUDP))
+#define JINGLE_ICEUDP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), JINGLE_TYPE_ICEUDP, JingleIceUdpClass))
+
+/** @copydoc _JingleIceUdp */
+typedef struct _JingleIceUdp JingleIceUdp;
+/** @copydoc _JingleIceUdpClass */
+typedef struct _JingleIceUdpClass JingleIceUdpClass;
+/** @copydoc _JingleIceUdpPrivate */
+typedef struct _JingleIceUdpPrivate JingleIceUdpPrivate;
+/** @copydoc _JingleIceUdpCandidate */
+typedef struct _JingleIceUdpCandidate JingleIceUdpCandidate;
+
+/** The iceudp class */
+struct _JingleIceUdpClass
+{
+	JingleTransportClass parent_class;     /**< The parent class. */
+
+	xmlnode *(*to_xml) (JingleTransport *transport, xmlnode *content, JingleActionType action);
+	JingleTransport *(*parse) (xmlnode *transport);
+};
+
+/** The iceudp class's private data */
+struct _JingleIceUdp
+{
+	JingleTransport parent;                /**< The parent of this object. */
+	JingleIceUdpPrivate *priv;      /**< The private data of this object. */
+};
+
+struct _JingleIceUdpCandidate
+{
+	guint component;
+	gchar *foundation;
+	guint generation;
+	gchar *id;
+	gchar *ip;
+	guint network;
+	guint port;
+	guint priority;
+	gchar *protocol;
+	gchar *reladdr;
+	guint relport;
+	gchar *type;
+
+	gchar *username;
+	gchar *password;
+
+	gboolean rem_known;	/* TRUE if the remote side knows
+				 * about this candidate */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+GType jingle_iceudp_candidate_get_type(void);
+
+/**
+ * Gets the iceudp class's GType
+ *
+ * @return The iceudp class's GType.
+ */
+GType jingle_iceudp_get_type(void);
+
+JingleIceUdpCandidate *jingle_iceudp_candidate_new(guint component,
+		const gchar *foundation, guint generation, const gchar *id,
+		const gchar *ip, guint network, guint port, guint priority,
+		const gchar *protocol, const gchar *type,
+		const gchar *username, const gchar *password);
+void jingle_iceudp_add_local_candidate(JingleIceUdp *iceudp, JingleIceUdpCandidate *candidate);
+GList *jingle_iceudp_get_remote_candidates(JingleIceUdp *iceudp);
+
+#ifdef __cplusplus
+}
+#endif
+
+G_END_DECLS
+
+#endif /* PURPLE_JABBER_JINGLE_ICEUDP_H */
+
diff --git a/libpurple/protocols/jabber/jingle/jingle.c b/libpurple/protocols/jabber/jingle/jingle.c
new file mode 100644
index 0000000000..12b51737bf
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/jingle.c
@@ -0,0 +1,457 @@
+/*
+ * @file jingle.c
+ *
+ * purple - Jabber Protocol Plugin
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+
+#include "internal.h"
+#include "network.h"
+
+#include "content.h"
+#include "debug.h"
+#include "jingle.h"
+#include <string.h>
+#include "session.h"
+#include "iceudp.h"
+#include "rawudp.h"
+#include "rtp.h"
+
+GType
+jingle_get_type(const gchar *type)
+{
+	if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP))
+		return JINGLE_TYPE_RAWUDP;
+	else if (!strcmp(type, JINGLE_TRANSPORT_ICEUDP))
+		return JINGLE_TYPE_ICEUDP;
+#if 0
+	else if (!strcmp(type, JINGLE_TRANSPORT_SOCKS))
+		return JINGLE_TYPE_SOCKS;
+	else if (!strcmp(type, JINGLE_TRANSPORT_IBB))
+		return JINGLE_TYPE_IBB;
+#endif
+#ifdef USE_VV
+	else if (!strcmp(type, JINGLE_APP_RTP))
+		return JINGLE_TYPE_RTP;
+#endif
+#if 0
+	else if (!strcmp(type, JINGLE_APP_FT))
+		return JINGLE_TYPE_FT;
+	else if (!strcmp(type, JINGLE_APP_XML))
+		return JINGLE_TYPE_XML;
+#endif
+	else
+		return G_TYPE_NONE;
+}
+
+static void
+jingle_handle_unknown_type(JingleSession *session, xmlnode *jingle)
+{
+	/* Send error */
+}
+
+static void
+jingle_handle_content_accept(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		const gchar *name = xmlnode_get_attrib(content, "name");
+		const gchar *creator = xmlnode_get_attrib(content, "creator");
+		jingle_session_accept_content(session, name, creator);
+		/* signal here */
+	}
+}
+
+static void
+jingle_handle_content_add(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		JingleContent *pending_content =
+				jingle_content_parse(content);
+		if (pending_content == NULL) {
+			purple_debug_error("jingle",
+					"Error parsing \"content-add\" content.\n");
+			/* XXX: send error here */
+		} else {
+			jingle_session_add_pending_content(session,
+					pending_content);
+		}
+	}
+
+	/* XXX: signal here */
+}
+
+static void
+jingle_handle_content_modify(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		const gchar *name = xmlnode_get_attrib(content, "name");
+		const gchar *creator = xmlnode_get_attrib(content, "creator");
+		JingleContent *local_content = jingle_session_find_content(session, name, creator);
+
+		if (content != NULL) {
+			const gchar *senders = xmlnode_get_attrib(content, "senders");
+			gchar *local_senders = jingle_content_get_senders(local_content);
+			if (strcmp(senders, local_senders))
+				jingle_content_modify(local_content, senders);
+			g_free(local_senders);
+		} else {
+			purple_debug_error("jingle", "content_modify: unknown content\n");
+			/* XXX: send error */
+		}
+	}
+}
+
+static void
+jingle_handle_content_reject(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		const gchar *name = xmlnode_get_attrib(content, "name");
+		const gchar *creator = xmlnode_get_attrib(content, "creator");
+		jingle_session_remove_pending_content(session, name, creator);
+		/* signal here */
+	}
+}
+
+static void
+jingle_handle_content_remove(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		const gchar *name = xmlnode_get_attrib(content, "name");
+		const gchar *creator = xmlnode_get_attrib(content, "creator");
+		jingle_session_remove_content(session, name, creator);
+	}
+}
+
+static void
+jingle_handle_description_info(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+
+	jingle_session_accept_session(session);
+	
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		const gchar *name = xmlnode_get_attrib(content, "name");
+		const gchar *creator = xmlnode_get_attrib(content, "creator");
+		JingleContent *parsed_content =
+				jingle_session_find_content(session, name, creator);
+		if (parsed_content == NULL) {
+			purple_debug_error("jingle", "Error parsing content\n");
+			/* XXX: send error */
+		} else {
+			jingle_content_handle_action(parsed_content, content,
+					JINGLE_DESCRIPTION_INFO);
+		}
+	}
+}
+
+static void
+jingle_handle_security_info(JingleSession *session, xmlnode *jingle)
+{
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+}
+
+static void
+jingle_handle_session_accept(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+
+	jingle_session_accept_session(session);
+	
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		const gchar *name = xmlnode_get_attrib(content, "name");
+		const gchar *creator = xmlnode_get_attrib(content, "creator");
+		JingleContent *parsed_content =
+				jingle_session_find_content(session, name, creator);
+		if (parsed_content == NULL) {
+			purple_debug_error("jingle", "Error parsing content\n");
+			/* XXX: send error */
+		} else {
+			jingle_content_handle_action(parsed_content, content,
+					JINGLE_SESSION_ACCEPT);
+		}
+	}
+}
+
+static void
+jingle_handle_session_info(JingleSession *session, xmlnode *jingle)
+{
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+	/* XXX: call signal */
+}
+
+static void
+jingle_handle_session_initiate(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		JingleContent *parsed_content = jingle_content_parse(content);
+		if (parsed_content == NULL) {
+			purple_debug_error("jingle", "Error parsing content\n");
+			/* XXX: send error */
+		} else {
+			jingle_session_add_content(session, parsed_content);
+			jingle_content_handle_action(parsed_content, content,
+					JINGLE_SESSION_INITIATE);
+		}
+	}
+
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+}
+
+static void
+jingle_handle_session_terminate(JingleSession *session, xmlnode *jingle)
+{
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+
+	jingle_session_handle_action(session, jingle,
+			JINGLE_SESSION_TERMINATE);
+	/* display reason? */
+	g_object_unref(session);
+}
+
+static void
+jingle_handle_transport_accept(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+	
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		const gchar *name = xmlnode_get_attrib(content, "name");
+		const gchar *creator = xmlnode_get_attrib(content, "creator");
+		JingleContent *content = jingle_session_find_content(session, name, creator);
+		jingle_content_accept_transport(content);
+	}
+}
+
+static void
+jingle_handle_transport_info(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		const gchar *name = xmlnode_get_attrib(content, "name");
+		const gchar *creator = xmlnode_get_attrib(content, "creator");
+		JingleContent *parsed_content = 
+				jingle_session_find_content(session, name, creator);
+		if (parsed_content == NULL) {
+			purple_debug_error("jingle", "Error parsing content\n");
+			/* XXX: send error */
+		} else {
+			jingle_content_handle_action(parsed_content, content,
+					JINGLE_TRANSPORT_INFO);
+		}
+	}
+}
+
+static void
+jingle_handle_transport_reject(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+	
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		const gchar *name = xmlnode_get_attrib(content, "name");
+		const gchar *creator = xmlnode_get_attrib(content, "creator");
+		JingleContent *content = jingle_session_find_content(session, name, creator);
+		jingle_content_remove_pending_transport(content);
+	}
+}
+
+static void
+jingle_handle_transport_replace(JingleSession *session, xmlnode *jingle)
+{
+	xmlnode *content = xmlnode_get_child(jingle, "content");
+
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+
+	for (; content; content = xmlnode_get_next_twin(content)) {
+		const gchar *name = xmlnode_get_attrib(content, "name");
+		const gchar *creator = xmlnode_get_attrib(content, "creator");
+		xmlnode *xmltransport = xmlnode_get_child(content, "transport");
+		JingleTransport *transport = jingle_transport_parse(xmltransport);
+		JingleContent *content = jingle_session_find_content(session, name, creator);
+
+		jingle_content_set_pending_transport(content, transport);
+	}
+}
+
+typedef struct {
+	const char *name;
+	void (*handler)(JingleSession*, xmlnode*);
+} JingleAction;
+
+static const JingleAction jingle_actions[] = {
+	{"unknown-type",	jingle_handle_unknown_type},
+	{"content-accept",	jingle_handle_content_accept},
+	{"content-add",		jingle_handle_content_add},
+	{"content-modify",	jingle_handle_content_modify},
+	{"content-reject",	jingle_handle_content_reject},
+	{"content-remove",	jingle_handle_content_remove},
+	{"description-info",	jingle_handle_description_info},
+	{"security-info",	jingle_handle_security_info},
+	{"session-accept",	jingle_handle_session_accept},
+	{"session-info",	jingle_handle_session_info},
+	{"session-initiate",	jingle_handle_session_initiate},
+	{"session-terminate",	jingle_handle_session_terminate},
+	{"transport-accept",	jingle_handle_transport_accept},
+	{"transport-info",	jingle_handle_transport_info},
+	{"transport-reject",	jingle_handle_transport_reject},
+	{"transport-replace",	jingle_handle_transport_replace},
+};
+
+const gchar *
+jingle_get_action_name(JingleActionType action)
+{
+	return jingle_actions[action].name;
+}
+
+JingleActionType
+jingle_get_action_type(const gchar *action)
+{
+	static const int num_actions =
+			sizeof(jingle_actions)/sizeof(JingleAction);
+	/* Start at 1 to skip the unknown-action type */
+	int i = 1;
+	for (; i < num_actions; ++i) {
+		if (!strcmp(action, jingle_actions[i].name))
+			return i;
+	}
+	return JINGLE_UNKNOWN_TYPE;
+}
+
+void
+jingle_parse(JabberStream *js, const char *from, JabberIqType type,
+             const char *id, xmlnode *jingle)
+{
+	const gchar *action;
+	const gchar *sid;
+	JingleActionType action_type;
+	JingleSession *session;
+
+	if (type != JABBER_IQ_SET) {
+		/* TODO: send iq error here */
+		return;
+	}
+
+	if (!(action = xmlnode_get_attrib(jingle, "action"))) {
+		/* TODO: send iq error here */
+		return;
+	}
+
+	action_type = jingle_get_action_type(action);
+
+	purple_debug_info("jabber", "got Jingle package action = %s\n",
+			  action);
+
+	if (!(sid = xmlnode_get_attrib(jingle, "sid"))) {
+		/* send iq error here */
+		return;
+	}
+
+	if (!(session = jingle_session_find_by_sid(js, sid))
+			&& strcmp(action, "session-initiate")) {
+		purple_debug_error("jingle", "jabber_jingle_session_parse couldn't find session\n");
+		/* send iq error here */
+		return;
+	}
+
+	if (action_type == JINGLE_SESSION_INITIATE) {
+		if (session) {
+			/* This should only happen if you start a session with yourself */
+			purple_debug_error("jingle", "Jingle session with "
+					"id={%s} already exists\n", sid);
+			/* send iq error */
+			return;
+		} else {
+			char *own_jid = g_strdup_printf("%s@%s/%s", js->user->node,
+					js->user->domain, js->user->resource);
+			session = jingle_session_create(js, sid, own_jid, from, FALSE);
+			g_free(own_jid);
+		}
+	}
+
+	jingle_actions[action_type].handler(session, jingle);
+}
+
+static void
+jingle_terminate_sessions_gh(gpointer key, gpointer value, gpointer user_data)
+{
+	g_object_unref(value);
+}
+
+void
+jingle_terminate_sessions(JabberStream *js)
+{
+	if (js->sessions)
+		g_hash_table_foreach(js->sessions,
+				jingle_terminate_sessions_gh, NULL);
+}
+
+GParameter *
+jingle_get_params(JabberStream *js, guint *num)
+{
+	/* don't set a STUN server if one is set globally in prefs, in that case
+	 this will be handled in media.c */
+	gboolean has_account_stun = js->stun_ip && !purple_network_get_stun_ip();
+	guint num_params = has_account_stun ? 2 : 0;
+	GParameter *params = NULL;
+
+	if (num_params > 0) {
+		params = g_new0(GParameter, num_params);
+
+		purple_debug_info("jabber", 
+						  "setting param stun-ip for stream using Google auto-config: %s\n",
+						  js->stun_ip);
+		params[0].name = "stun-ip";
+		g_value_init(&params[0].value, G_TYPE_STRING);
+		g_value_set_string(&params[0].value, js->stun_ip);
+		purple_debug_info("jabber", 
+						  "setting param stun-port for stream using Google auto-config: %d\n",
+						  js->stun_port);
+		params[1].name = "stun-port";
+		g_value_init(&params[1].value, G_TYPE_UINT);
+		g_value_set_uint(&params[1].value, js->stun_port);
+	}
+
+	*num = num_params;
+	return params;
+}
diff --git a/libpurple/protocols/jabber/jingle/jingle.h b/libpurple/protocols/jabber/jingle/jingle.h
new file mode 100644
index 0000000000..cb3d3e9ad8
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/jingle.h
@@ -0,0 +1,87 @@
+/*
+ * @file jingle.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ */
+ 
+#ifndef PURPLE_JABBER_JINGLE_H
+#define PURPLE_JABBER_JINGLE_H
+
+#include "jabber.h"
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define JINGLE "urn:xmpp:jingle:1"
+#define JINGLE_ERROR "urn:xmpp:jingle:errors:0"
+#define JINGLE_APP_FT "urn:xmpp:jingle:apps:file-transfer:1"
+#define JINGLE_APP_RTP "urn:xmpp:jingle:apps:rtp:1"
+#define JINGLE_APP_RTP_ERROR "urn:xmpp:jingle:apps:rtp:errors:1"
+#define JINGLE_APP_RTP_INFO "urn:xmpp:jingle:apps:rtp:info:1"
+#define JINGLE_APP_RTP_SUPPORT_AUDIO "urn:xmpp:jingle:apps:rtp:audio"
+#define JINGLE_APP_RTP_SUPPORT_VIDEO "urn:xmpp:jingle:apps:rtp:video"
+#define JINGLE_APP_XML "urn:xmpp:tmp:jingle:apps:xmlstream"
+#define JINGLE_DTMF "urn:xmpp:jingle:dtmf:0"
+#define JINGLE_TRANSPORT_S5B "urn:xmpp:jingle:transports:s5b:0"
+#define JINGLE_TRANSPORT_IBB "urn:xmpp:jingle:transports:ibb:0"
+#define JINGLE_TRANSPORT_ICEUDP "urn:xmpp:jingle:transports:ice-udp:1"
+#define JINGLE_TRANSPORT_RAWUDP "urn:xmpp:jingle:transports:raw-udp:1"
+
+typedef enum {
+	JINGLE_UNKNOWN_TYPE,
+	JINGLE_CONTENT_ACCEPT,
+	JINGLE_CONTENT_ADD,
+	JINGLE_CONTENT_MODIFY,
+	JINGLE_CONTENT_REJECT,
+	JINGLE_CONTENT_REMOVE,
+	JINGLE_DESCRIPTION_INFO,
+	JINGLE_SECURITY_INFO,
+	JINGLE_SESSION_ACCEPT,
+	JINGLE_SESSION_INFO,
+	JINGLE_SESSION_INITIATE,
+	JINGLE_SESSION_TERMINATE,
+	JINGLE_TRANSPORT_ACCEPT,
+	JINGLE_TRANSPORT_INFO,
+	JINGLE_TRANSPORT_REJECT,
+	JINGLE_TRANSPORT_REPLACE,
+} JingleActionType;
+
+const gchar *jingle_get_action_name(JingleActionType action);
+JingleActionType jingle_get_action_type(const gchar *action);
+
+GType jingle_get_type(const gchar *type);
+
+void jingle_parse(JabberStream *js, const char *from, JabberIqType type,
+                  const char *id, xmlnode *child);
+
+void jingle_terminate_sessions(JabberStream *js);
+
+/* create a GParam array given autoconfigured STUN (and later perhaps TURN).
+	if google_talk is TRUE, set compatability mode to GOOGLE_TALK */
+GParameter *jingle_get_params(JabberStream *js, guint *num_params);
+
+#ifdef __cplusplus
+}
+#endif
+
+G_END_DECLS
+
+#endif /* PURPLE_JABBER_JINGLE_H */
diff --git a/libpurple/protocols/jabber/jingle/rawudp.c b/libpurple/protocols/jabber/jingle/rawudp.c
new file mode 100644
index 0000000000..8948aa58f3
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/rawudp.c
@@ -0,0 +1,351 @@
+/**
+ * @file rawudp.c
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+
+#include "rawudp.h"
+#include "jingle.h"
+#include "debug.h"
+
+#include <string.h>
+
+struct _JingleRawUdpPrivate
+{
+	GList *local_candidates;
+	GList *remote_candidates;
+};
+
+#define JINGLE_RAWUDP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), JINGLE_TYPE_RAWUDP, JingleRawUdpPrivate))
+
+static void jingle_rawudp_class_init (JingleRawUdpClass *klass);
+static void jingle_rawudp_init (JingleRawUdp *rawudp);
+static void jingle_rawudp_finalize (GObject *object);
+static void jingle_rawudp_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void jingle_rawudp_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+static JingleTransport *jingle_rawudp_parse_internal(xmlnode *rawudp);
+static xmlnode *jingle_rawudp_to_xml_internal(JingleTransport *transport, xmlnode *content, JingleActionType action);
+
+static JingleTransportClass *parent_class = NULL;
+
+enum {
+	PROP_0,
+	PROP_LOCAL_CANDIDATES,
+	PROP_REMOTE_CANDIDATES,
+};
+
+static JingleRawUdpCandidate *
+jingle_rawudp_candidate_copy(JingleRawUdpCandidate *candidate)
+{
+	JingleRawUdpCandidate *new_candidate = g_new0(JingleRawUdpCandidate, 1);
+	new_candidate->generation = candidate->generation;
+	new_candidate->component = candidate->component;
+	new_candidate->id = g_strdup(candidate->id);
+	new_candidate->ip = g_strdup(candidate->ip);
+	new_candidate->port = candidate->port;
+
+	new_candidate->rem_known = candidate->rem_known;
+	return new_candidate;
+}
+
+static void
+jingle_rawudp_candidate_free(JingleRawUdpCandidate *candidate)
+{
+	g_free(candidate->id);
+	g_free(candidate->ip);
+}
+
+GType
+jingle_rawudp_candidate_get_type()
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		type = g_boxed_type_register_static("JingleRawUdpCandidate",
+				(GBoxedCopyFunc)jingle_rawudp_candidate_copy,
+				(GBoxedFreeFunc)jingle_rawudp_candidate_free);
+	}
+	return type;
+}
+
+JingleRawUdpCandidate *
+jingle_rawudp_candidate_new(const gchar *id, guint generation, guint component, const gchar *ip, guint port)
+{
+	JingleRawUdpCandidate *candidate = g_new0(JingleRawUdpCandidate, 1);
+	candidate->generation = generation;
+	candidate->component = component;
+	candidate->id = g_strdup(id);
+	candidate->ip = g_strdup(ip);
+	candidate->port = port;
+
+	candidate->rem_known = FALSE;
+	return candidate;
+}
+
+GType
+jingle_rawudp_get_type()
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof(JingleRawUdpClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) jingle_rawudp_class_init,
+			NULL,
+			NULL,
+			sizeof(JingleRawUdp),
+			0,
+			(GInstanceInitFunc) jingle_rawudp_init,
+			NULL
+		};
+		type = g_type_register_static(JINGLE_TYPE_TRANSPORT, "JingleRawUdp", &info, 0);
+	}
+	return type;
+}
+
+static void
+jingle_rawudp_class_init (JingleRawUdpClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	parent_class = g_type_class_peek_parent(klass);
+
+	gobject_class->finalize = jingle_rawudp_finalize;
+	gobject_class->set_property = jingle_rawudp_set_property;
+	gobject_class->get_property = jingle_rawudp_get_property;
+	klass->parent_class.to_xml = jingle_rawudp_to_xml_internal;
+	klass->parent_class.parse = jingle_rawudp_parse_internal;
+	klass->parent_class.transport_type = JINGLE_TRANSPORT_RAWUDP;
+
+	g_object_class_install_property(gobject_class, PROP_LOCAL_CANDIDATES,
+			g_param_spec_pointer("local-candidates",
+			"Local candidates",
+			"The local candidates for this transport.",
+			G_PARAM_READABLE));
+
+	g_object_class_install_property(gobject_class, PROP_REMOTE_CANDIDATES,
+			g_param_spec_pointer("remote-candidates",
+			"Remote candidates",
+			"The remote candidates for this transport.",
+			G_PARAM_READABLE));
+
+	g_type_class_add_private(klass, sizeof(JingleRawUdpPrivate));
+}
+
+static void
+jingle_rawudp_init (JingleRawUdp *rawudp)
+{
+	rawudp->priv = JINGLE_RAWUDP_GET_PRIVATE(rawudp);
+	rawudp->priv->local_candidates = NULL;
+	rawudp->priv->remote_candidates = NULL;
+}
+
+static void
+jingle_rawudp_finalize (GObject *rawudp)
+{
+/*	JingleRawUdpPrivate *priv = JINGLE_RAWUDP_GET_PRIVATE(rawudp); */
+	purple_debug_info("jingle","jingle_rawudp_finalize\n");
+
+	G_OBJECT_CLASS(parent_class)->finalize(rawudp);
+}
+
+static void
+jingle_rawudp_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	JingleRawUdp *rawudp;
+	g_return_if_fail(JINGLE_IS_RAWUDP(object));
+
+	rawudp = JINGLE_RAWUDP(object);
+
+	switch (prop_id) {
+		case PROP_LOCAL_CANDIDATES:
+			rawudp->priv->local_candidates =
+					g_value_get_pointer(value);
+			break;
+		case PROP_REMOTE_CANDIDATES:
+			rawudp->priv->remote_candidates =
+					g_value_get_pointer(value);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+jingle_rawudp_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	JingleRawUdp *rawudp;
+	g_return_if_fail(JINGLE_IS_RAWUDP(object));
+	
+	rawudp = JINGLE_RAWUDP(object);
+
+	switch (prop_id) {
+		case PROP_LOCAL_CANDIDATES:
+			g_value_set_pointer(value, rawudp->priv->local_candidates);
+			break;
+		case PROP_REMOTE_CANDIDATES:
+			g_value_set_pointer(value, rawudp->priv->remote_candidates);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);	
+			break;
+	}
+}
+
+void
+jingle_rawudp_add_local_candidate(JingleRawUdp *rawudp, JingleRawUdpCandidate *candidate)
+{
+	GList *iter = rawudp->priv->local_candidates;
+
+	for (; iter; iter = g_list_next(iter)) {
+		JingleRawUdpCandidate *c = iter->data;
+		if (!strcmp(c->id, candidate->id)) {
+			guint generation = c->generation + 1;
+
+			g_boxed_free(JINGLE_TYPE_RAWUDP_CANDIDATE, c);
+			rawudp->priv->local_candidates = g_list_delete_link(
+					rawudp->priv->local_candidates, iter);
+
+			candidate->generation = generation;
+
+			rawudp->priv->local_candidates = g_list_append(
+					rawudp->priv->local_candidates, candidate);
+			return;
+		}
+	}
+
+	rawudp->priv->local_candidates = g_list_append(
+			rawudp->priv->local_candidates, candidate);
+}
+
+GList *
+jingle_rawudp_get_remote_candidates(JingleRawUdp *rawudp)
+{
+	return g_list_copy(rawudp->priv->remote_candidates);
+}
+
+static JingleRawUdpCandidate *
+jingle_rawudp_get_remote_candidate_by_id(JingleRawUdp *rawudp, gchar *id)
+{
+	GList *iter = rawudp->priv->remote_candidates;
+	for (; iter; iter = g_list_next(iter)) {
+		JingleRawUdpCandidate *candidate = iter->data;
+		if (!strcmp(candidate->id, id)) {
+			return candidate;
+		}
+	}
+	return NULL;
+}
+
+static void
+jingle_rawudp_add_remote_candidate(JingleRawUdp *rawudp, JingleRawUdpCandidate *candidate)
+{
+	JingleRawUdpPrivate *priv = JINGLE_RAWUDP_GET_PRIVATE(rawudp);
+	JingleRawUdpCandidate *rawudp_candidate =
+			jingle_rawudp_get_remote_candidate_by_id(rawudp, candidate->id);
+	if (rawudp_candidate != NULL) {
+		priv->remote_candidates = g_list_remove(
+				priv->remote_candidates, rawudp_candidate);
+		g_boxed_free(JINGLE_TYPE_RAWUDP_CANDIDATE, rawudp_candidate);
+	}
+	priv->remote_candidates = g_list_append(priv->remote_candidates, candidate);
+}
+
+static JingleTransport *
+jingle_rawudp_parse_internal(xmlnode *rawudp)
+{
+	JingleTransport *transport = parent_class->parse(rawudp);
+	JingleRawUdpPrivate *priv = JINGLE_RAWUDP_GET_PRIVATE(transport);
+	xmlnode *candidate = xmlnode_get_child(rawudp, "candidate");
+	JingleRawUdpCandidate *rawudp_candidate = NULL;
+
+	for (; candidate; candidate = xmlnode_get_next_twin(candidate)) {
+		const gchar *id = xmlnode_get_attrib(candidate, "id");
+		const gchar *generation = xmlnode_get_attrib(candidate, "generation");
+		const gchar *component = xmlnode_get_attrib(candidate, "component");
+		const gchar *ip = xmlnode_get_attrib(candidate, "ip");
+		const gchar *port = xmlnode_get_attrib(candidate, "port");
+
+		if (!id || !generation || !component || !ip || !port)
+			continue;
+
+		rawudp_candidate = jingle_rawudp_candidate_new(
+				id,
+				atoi(generation),
+				atoi(component),
+				ip,
+				atoi(port));
+		rawudp_candidate->rem_known = TRUE;
+		jingle_rawudp_add_remote_candidate(JINGLE_RAWUDP(transport), rawudp_candidate);
+	}
+
+	if (rawudp_candidate != NULL &&
+			g_list_length(priv->remote_candidates) == 1) {
+		/* manufacture rtcp candidate */
+		rawudp_candidate = g_boxed_copy(JINGLE_TYPE_RAWUDP_CANDIDATE, rawudp_candidate);
+		rawudp_candidate->component = 2;
+		rawudp_candidate->port = rawudp_candidate->port + 1;
+		rawudp_candidate->rem_known = TRUE;
+		jingle_rawudp_add_remote_candidate(JINGLE_RAWUDP(transport), rawudp_candidate);
+	}
+
+	return transport;
+}
+
+static xmlnode *
+jingle_rawudp_to_xml_internal(JingleTransport *transport, xmlnode *content, JingleActionType action)
+{
+	xmlnode *node = parent_class->to_xml(transport, content, action);
+
+	if (action == JINGLE_SESSION_INITIATE ||
+			action == JINGLE_TRANSPORT_INFO ||
+			action == JINGLE_SESSION_ACCEPT) {
+		JingleRawUdpPrivate *priv = JINGLE_RAWUDP_GET_PRIVATE(transport);
+		GList *iter = priv->local_candidates;
+
+		for (; iter; iter = g_list_next(iter)) {
+			JingleRawUdpCandidate *candidate = iter->data;
+			xmlnode *xmltransport;
+			gchar *generation, *component, *port;
+
+			if (candidate->rem_known == TRUE)
+				continue;
+			candidate->rem_known = TRUE;
+
+			xmltransport = xmlnode_new_child(node, "candidate");
+			generation = g_strdup_printf("%d", candidate->generation);
+			component = g_strdup_printf("%d", candidate->component);
+			port = g_strdup_printf("%d", candidate->port);
+
+			xmlnode_set_attrib(xmltransport, "generation", generation);
+			xmlnode_set_attrib(xmltransport, "component", component);
+			xmlnode_set_attrib(xmltransport, "id", candidate->id);
+			xmlnode_set_attrib(xmltransport, "ip", candidate->ip);
+			xmlnode_set_attrib(xmltransport, "port", port);
+
+			g_free(port);
+			g_free(generation);
+		}
+	}
+
+	return node;
+}
+
diff --git a/libpurple/protocols/jabber/jingle/rawudp.h b/libpurple/protocols/jabber/jingle/rawudp.h
new file mode 100644
index 0000000000..99135cc384
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/rawudp.h
@@ -0,0 +1,101 @@
+/**
+ * @file rawudp.h
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef PURPLE_JABBER_JINGLE_RAWUDP_H
+#define PURPLE_JABBER_JINGLE_RAWUDP_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include "transport.h"
+
+G_BEGIN_DECLS
+
+#define JINGLE_TYPE_RAWUDP            (jingle_rawudp_get_type())
+#define JINGLE_TYPE_RAWUDP_CANDIDATE  (jingle_rawudp_candidate_get_type())
+#define JINGLE_RAWUDP(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), JINGLE_TYPE_RAWUDP, JingleRawUdp))
+#define JINGLE_RAWUDP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), JINGLE_TYPE_RAWUDP, JingleRawUdpClass))
+#define JINGLE_IS_RAWUDP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), JINGLE_TYPE_RAWUDP))
+#define JINGLE_IS_RAWUDP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), JINGLE_TYPE_RAWUDP))
+#define JINGLE_RAWUDP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), JINGLE_TYPE_RAWUDP, JingleRawUdpClass))
+
+/** @copydoc _JingleRawUdp */
+typedef struct _JingleRawUdp JingleRawUdp;
+/** @copydoc _JingleRawUdpClass */
+typedef struct _JingleRawUdpClass JingleRawUdpClass;
+/** @copydoc _JingleRawUdpPrivate */
+typedef struct _JingleRawUdpPrivate JingleRawUdpPrivate;
+/** @copydoc _JingleRawUdpCandidate */
+typedef struct _JingleRawUdpCandidate JingleRawUdpCandidate;
+
+/** The rawudp class */
+struct _JingleRawUdpClass
+{
+	JingleTransportClass parent_class;     /**< The parent class. */
+
+	xmlnode *(*to_xml) (JingleTransport *transport, xmlnode *content, JingleActionType action);
+	JingleTransport *(*parse) (xmlnode *transport);
+};
+
+/** The rawudp class's private data */
+struct _JingleRawUdp
+{
+	JingleTransport parent;                /**< The parent of this object. */
+	JingleRawUdpPrivate *priv;      /**< The private data of this object. */
+};
+
+struct _JingleRawUdpCandidate
+{
+	guint generation;
+	guint component;
+	gchar *id;
+	gchar *ip;
+	guint port;
+
+	gboolean rem_known;	/* TRUE if the remote side knows
+				 * about this candidate */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+GType jingle_rawudp_candidate_get_type(void);
+
+/**
+ * Gets the rawudp class's GType
+ *
+ * @return The rawudp class's GType.
+ */
+GType jingle_rawudp_get_type(void);
+
+JingleRawUdpCandidate *jingle_rawudp_candidate_new(const gchar *id,
+		guint generation, guint component, const gchar *ip, guint port);
+void jingle_rawudp_add_local_candidate(JingleRawUdp *rawudp, JingleRawUdpCandidate *candidate);
+GList *jingle_rawudp_get_remote_candidates(JingleRawUdp *rawudp);
+
+#ifdef __cplusplus
+}
+#endif
+
+G_END_DECLS
+
+#endif /* PURPLE_JABBER_JINGLE_RAWUDP_H */
+
diff --git a/libpurple/protocols/jabber/jingle/rtp.c b/libpurple/protocols/jabber/jingle/rtp.c
new file mode 100644
index 0000000000..76960f0a52
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/rtp.c
@@ -0,0 +1,916 @@
+/**
+ * @file rtp.c
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "config.h"
+
+#ifdef USE_VV
+
+#include "jabber.h"
+#include "jingle.h"
+#include "media.h"
+#include "mediamanager.h"
+#include "iceudp.h"
+#include "rawudp.h"
+#include "rtp.h"
+#include "session.h"
+#include "debug.h"
+
+#include <string.h>
+
+struct _JingleRtpPrivate
+{
+	gchar *media_type;
+	gchar *ssrc;
+};
+
+#define JINGLE_RTP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), JINGLE_TYPE_RTP, JingleRtpPrivate))
+
+static void jingle_rtp_class_init (JingleRtpClass *klass);
+static void jingle_rtp_init (JingleRtp *rtp);
+static void jingle_rtp_finalize (GObject *object);
+static void jingle_rtp_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void jingle_rtp_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+static JingleContent *jingle_rtp_parse_internal(xmlnode *rtp);
+static xmlnode *jingle_rtp_to_xml_internal(JingleContent *rtp, xmlnode *content, JingleActionType action);
+static void jingle_rtp_handle_action_internal(JingleContent *content, xmlnode *jingle, JingleActionType action);
+
+static PurpleMedia *jingle_rtp_get_media(JingleSession *session);
+
+static JingleContentClass *parent_class = NULL;
+#if 0
+enum {
+	LAST_SIGNAL
+};
+static guint jingle_rtp_signals[LAST_SIGNAL] = {0};
+#endif
+
+enum {
+	PROP_0,
+	PROP_MEDIA_TYPE,
+	PROP_SSRC,
+};
+
+GType
+jingle_rtp_get_type()
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof(JingleRtpClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) jingle_rtp_class_init,
+			NULL,
+			NULL,
+			sizeof(JingleRtp),
+			0,
+			(GInstanceInitFunc) jingle_rtp_init,
+			NULL
+		};
+		type = g_type_register_static(JINGLE_TYPE_CONTENT, "JingleRtp", &info, 0);
+	}
+	return type;
+}
+
+static void
+jingle_rtp_class_init (JingleRtpClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	parent_class = g_type_class_peek_parent(klass);
+
+	gobject_class->finalize = jingle_rtp_finalize;
+	gobject_class->set_property = jingle_rtp_set_property;
+	gobject_class->get_property = jingle_rtp_get_property;
+	klass->parent_class.to_xml = jingle_rtp_to_xml_internal;
+	klass->parent_class.parse = jingle_rtp_parse_internal;
+	klass->parent_class.description_type = JINGLE_APP_RTP;
+	klass->parent_class.handle_action = jingle_rtp_handle_action_internal;
+
+	g_object_class_install_property(gobject_class, PROP_MEDIA_TYPE,
+			g_param_spec_string("media-type",
+			"Media Type",
+			"The media type (\"audio\" or \"video\") for this rtp session.",
+			NULL,
+			G_PARAM_READWRITE));
+	g_object_class_install_property(gobject_class, PROP_SSRC,
+			g_param_spec_string("ssrc",
+			"ssrc",
+			"The ssrc for this rtp session.",
+			NULL,
+			G_PARAM_READWRITE));
+
+	g_type_class_add_private(klass, sizeof(JingleRtpPrivate));
+}
+
+static void
+jingle_rtp_init (JingleRtp *rtp)
+{
+	rtp->priv = JINGLE_RTP_GET_PRIVATE(rtp);
+	memset(rtp->priv, 0, sizeof(*rtp->priv));
+}
+
+static void
+jingle_rtp_finalize (GObject *rtp)
+{
+	JingleRtpPrivate *priv = JINGLE_RTP_GET_PRIVATE(rtp);
+	purple_debug_info("jingle-rtp","jingle_rtp_finalize\n");
+
+	g_free(priv->media_type);
+	g_free(priv->ssrc);
+
+	G_OBJECT_CLASS(parent_class)->finalize(rtp);
+}
+
+static void
+jingle_rtp_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	JingleRtp *rtp;
+	g_return_if_fail(JINGLE_IS_RTP(object));
+
+	rtp = JINGLE_RTP(object);
+
+	switch (prop_id) {
+		case PROP_MEDIA_TYPE:
+			g_free(rtp->priv->media_type);
+			rtp->priv->media_type = g_value_dup_string(value);
+			break;
+		case PROP_SSRC:
+			g_free(rtp->priv->ssrc);
+			rtp->priv->ssrc = g_value_dup_string(value);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+jingle_rtp_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	JingleRtp *rtp;
+	g_return_if_fail(JINGLE_IS_RTP(object));
+	
+	rtp = JINGLE_RTP(object);
+
+	switch (prop_id) {
+		case PROP_MEDIA_TYPE:
+			g_value_set_string(value, rtp->priv->media_type);
+			break;
+		case PROP_SSRC:
+			g_value_set_string(value, rtp->priv->ssrc);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);	
+			break;
+	}
+}
+
+gchar *
+jingle_rtp_get_media_type(JingleContent *content)
+{
+	gchar *media_type;
+	g_object_get(content, "media-type", &media_type, NULL);
+	return media_type;
+}
+
+gchar *
+jingle_rtp_get_ssrc(JingleContent *content)
+{
+	gchar *ssrc;
+	g_object_get(content, "ssrc", &ssrc, NULL);
+	return ssrc;
+}
+
+static PurpleMedia *
+jingle_rtp_get_media(JingleSession *session)
+{
+	JabberStream *js = jingle_session_get_js(session);
+	PurpleMedia *media = NULL;
+	GList *iter = purple_media_manager_get_media_by_account(
+			purple_media_manager_get(),
+			purple_connection_get_account(js->gc));
+
+	for (; iter; iter = g_list_delete_link(iter, iter)) {
+		JingleSession *media_session =
+				purple_media_get_prpl_data(iter->data);
+		if (media_session == session) {
+			media = iter->data;
+			break;
+		}
+	}
+	if (iter != NULL)
+		g_list_free(iter);
+
+	return media;
+}
+
+static JingleRawUdpCandidate *
+jingle_rtp_candidate_to_rawudp(JingleSession *session, guint generation,
+		PurpleMediaCandidate *candidate)
+{
+	gchar *id = jabber_get_next_id(jingle_session_get_js(session));
+	gchar *ip = purple_media_candidate_get_ip(candidate);
+	JingleRawUdpCandidate *rawudp_candidate =
+			jingle_rawudp_candidate_new(id, generation,
+			purple_media_candidate_get_component_id(candidate),
+			ip, purple_media_candidate_get_port(candidate));
+	g_free(ip);
+	g_free(id);
+	return rawudp_candidate;
+}
+
+static JingleIceUdpCandidate *
+jingle_rtp_candidate_to_iceudp(JingleSession *session, guint generation,
+		PurpleMediaCandidate *candidate)
+{
+	gchar *id = jabber_get_next_id(jingle_session_get_js(session));
+	gchar *ip = purple_media_candidate_get_ip(candidate);
+	gchar *username = purple_media_candidate_get_username(candidate);
+	gchar *password = purple_media_candidate_get_password(candidate);
+	PurpleMediaCandidateType type =
+			purple_media_candidate_get_candidate_type(candidate);
+	
+	JingleIceUdpCandidate *iceudp_candidate = jingle_iceudp_candidate_new(
+			purple_media_candidate_get_component_id(candidate),
+			purple_media_candidate_get_foundation(candidate),
+			generation, id, ip, 0,
+			purple_media_candidate_get_port(candidate),
+			purple_media_candidate_get_priority(candidate), "udp",
+			type == PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "host" :
+			type == PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "srflx" :
+			type == PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX ? "prflx" :
+			type == PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" :
+			"", username, password);
+	iceudp_candidate->reladdr =
+			purple_media_candidate_get_base_ip(candidate);
+	iceudp_candidate->relport =
+			purple_media_candidate_get_base_port(candidate);
+	g_free(password);
+	g_free(username);
+	g_free(ip);
+	g_free(id);
+	return iceudp_candidate;
+}
+
+static JingleTransport *
+jingle_rtp_candidates_to_transport(JingleSession *session, GType type, guint generation, GList *candidates)
+{
+	if (type == JINGLE_TYPE_RAWUDP) {
+		JingleTransport *transport = jingle_transport_create(JINGLE_TRANSPORT_RAWUDP);
+		JingleRawUdpCandidate *rawudp_candidate;
+		for (; candidates; candidates = g_list_next(candidates)) {
+			PurpleMediaCandidate *candidate = candidates->data;
+			rawudp_candidate = jingle_rtp_candidate_to_rawudp(
+					session, generation, candidate);
+			jingle_rawudp_add_local_candidate(
+					JINGLE_RAWUDP(transport),
+					rawudp_candidate);
+		}
+		return transport;
+	} else if (type == JINGLE_TYPE_ICEUDP) {
+		JingleTransport *transport = jingle_transport_create(JINGLE_TRANSPORT_ICEUDP);
+		JingleIceUdpCandidate *iceudp_candidate;
+		for (; candidates; candidates = g_list_next(candidates)) {
+			PurpleMediaCandidate *candidate = candidates->data;
+			iceudp_candidate = jingle_rtp_candidate_to_iceudp(
+					session, generation, candidate);
+			jingle_iceudp_add_local_candidate(
+					JINGLE_ICEUDP(transport),
+					iceudp_candidate);
+		}
+		return transport;
+	} else {
+		return NULL;
+	}
+}
+
+static GList *
+jingle_rtp_transport_to_candidates(JingleTransport *transport)
+{
+	const gchar *type = jingle_transport_get_transport_type(transport);
+	GList *ret = NULL;
+	if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP)) {
+		GList *candidates = jingle_rawudp_get_remote_candidates(JINGLE_RAWUDP(transport));
+
+		for (; candidates; candidates = g_list_delete_link(candidates, candidates)) {
+			JingleRawUdpCandidate *candidate = candidates->data;
+			ret = g_list_append(ret, purple_media_candidate_new(
+					"", candidate->component,
+					PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
+					PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
+					candidate->ip, candidate->port));
+		}
+
+		return ret;
+	} else if (!strcmp(type, JINGLE_TRANSPORT_ICEUDP)) {
+		GList *candidates = jingle_iceudp_get_remote_candidates(JINGLE_ICEUDP(transport));
+
+		for (; candidates; candidates = g_list_delete_link(candidates, candidates)) {
+			JingleIceUdpCandidate *candidate = candidates->data;
+			PurpleMediaCandidate *new_candidate = purple_media_candidate_new(
+					candidate->foundation, candidate->component,
+					!strcmp(candidate->type, "host") ?
+					PURPLE_MEDIA_CANDIDATE_TYPE_HOST :
+					!strcmp(candidate->type, "srflx") ?
+					PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX :
+					!strcmp(candidate->type, "prflx") ?
+					PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX :
+					!strcmp(candidate->type, "relay") ?
+					PURPLE_MEDIA_CANDIDATE_TYPE_RELAY : 0,
+					PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
+					candidate->ip, candidate->port);
+			g_object_set(new_candidate,
+					"base-ip", candidate->reladdr,
+					"base-port", candidate->relport,
+					"username", candidate->username,
+					"password", candidate->password,
+					"priority", candidate->priority, NULL);
+			ret = g_list_append(ret, new_candidate);
+		}
+
+		return ret;
+	} else {
+		return NULL;
+	}
+}
+
+static void jingle_rtp_ready(JingleSession *session);
+
+static void
+jingle_rtp_candidates_prepared_cb(PurpleMedia *media,
+		gchar *sid, gchar *name, JingleSession *session)
+{
+	JingleContent *content = jingle_session_find_content(
+			session, sid, NULL);
+	JingleTransport *oldtransport, *transport;
+	GList *candidates;
+
+	purple_debug_info("jingle-rtp", "jingle_rtp_candidates_prepared_cb\n");
+
+	if (content == NULL) {
+		purple_debug_error("jingle-rtp",
+				"jingle_rtp_candidates_prepared_cb: "
+				"Can't find session %s\n", sid);
+		return;
+	}
+
+	oldtransport = jingle_content_get_transport(content);
+	candidates = purple_media_get_local_candidates(media, sid, name);
+	transport = JINGLE_TRANSPORT(jingle_rtp_candidates_to_transport(
+			session, JINGLE_IS_RAWUDP(oldtransport) ?
+				JINGLE_TYPE_RAWUDP : JINGLE_TYPE_ICEUDP,
+			0, candidates));
+
+	g_list_free(candidates);
+	g_object_unref(oldtransport);
+
+	jingle_content_set_pending_transport(content, transport);
+	jingle_content_accept_transport(content);
+
+	jingle_rtp_ready(session);
+}
+
+static void
+jingle_rtp_codecs_changed_cb(PurpleMedia *media, gchar *sid,
+		JingleSession *session)
+{
+	purple_debug_info("jingle-rtp", "jingle_rtp_codecs_changed_cb: "
+			"session_id: %s jingle_session: %p\n", sid, session);
+	jingle_rtp_ready(session);
+}
+
+static void
+jingle_rtp_new_candidate_cb(PurpleMedia *media, gchar *sid, gchar *name, PurpleMediaCandidate *candidate, JingleSession *session)
+{
+	JingleContent *content = jingle_session_find_content(
+			session, sid, NULL);
+	JingleTransport *transport;
+
+	purple_debug_info("jingle-rtp", "jingle_rtp_new_candidate_cb\n");
+
+	if (content == NULL) {
+		purple_debug_error("jingle-rtp",
+				"jingle_rtp_new_candidate_cb: "
+				"Can't find session %s\n", sid);
+		return;
+	}
+
+	transport = jingle_content_get_transport(content);
+
+	if (JINGLE_IS_ICEUDP(transport))
+		jingle_iceudp_add_local_candidate(JINGLE_ICEUDP(transport),
+				jingle_rtp_candidate_to_iceudp(
+				session, 1, candidate));
+	else if (JINGLE_IS_RAWUDP(transport))
+		jingle_rawudp_add_local_candidate(JINGLE_RAWUDP(transport),
+				jingle_rtp_candidate_to_rawudp(
+				session, 1, candidate));
+
+	g_object_unref(transport);
+
+	jabber_iq_send(jingle_session_to_packet(session,
+			JINGLE_TRANSPORT_INFO));
+}
+
+static void
+jingle_rtp_initiate_ack_cb(JabberStream *js, const char *from,
+                           JabberIqType type, const char *id,
+                           xmlnode *packet, gpointer data)
+{
+	JingleSession *session = data;
+
+	if (type == JABBER_IQ_ERROR || xmlnode_get_child(packet, "error")) {
+		purple_media_end(jingle_rtp_get_media(session), NULL, NULL);
+		g_object_unref(session);
+		return;
+	}
+}
+
+static void
+jingle_rtp_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
+		gchar *sid, gchar *name, JingleSession *session)
+{
+	purple_debug_info("jingle-rtp", "state-changed: state %d "
+			"id: %s name: %s\n", state, sid ? sid : "(null)",
+			name ? name : "(null)");
+}
+
+static void
+jingle_rtp_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
+		gchar *sid, gchar *name, gboolean local,
+		JingleSession *session)
+{
+	purple_debug_info("jingle-rtp", "stream-info: type %d "
+			"id: %s name: %s\n", type, sid ? sid : "(null)",
+			name ? name : "(null)");
+
+	g_return_if_fail(JINGLE_IS_SESSION(session));
+
+	if (type == PURPLE_MEDIA_INFO_HANGUP) {
+		jabber_iq_send(jingle_session_terminate_packet(
+				session, "success"));
+		g_object_unref(session);
+	} else if (type == PURPLE_MEDIA_INFO_REJECT) {
+		jabber_iq_send(jingle_session_terminate_packet(
+				session, "decline"));
+		g_object_unref(session);
+	} else if (type == PURPLE_MEDIA_INFO_ACCEPT &&
+			jingle_session_is_initiator(session) == FALSE) {
+		jingle_rtp_ready(session);
+	}
+}
+
+static void
+jingle_rtp_ready(JingleSession *session)
+{
+	PurpleMedia *media = jingle_rtp_get_media(session);
+
+	if (purple_media_candidates_prepared(media, NULL, NULL) &&
+			purple_media_codecs_ready(media, NULL) &&
+			(jingle_session_is_initiator(session) == TRUE ||
+			purple_media_accepted(media, NULL, NULL))) {
+		if (jingle_session_is_initiator(session)) {
+			JabberIq *iq = jingle_session_to_packet(
+					session, JINGLE_SESSION_INITIATE);
+			jabber_iq_set_callback(iq,
+					jingle_rtp_initiate_ack_cb, session);
+			jabber_iq_send(iq);
+		} else {
+			jabber_iq_send(jingle_session_to_packet(session,
+					JINGLE_SESSION_ACCEPT));
+		}
+
+		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
+				G_CALLBACK(jingle_rtp_candidates_prepared_cb),
+				session);
+		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
+				G_CALLBACK(jingle_rtp_codecs_changed_cb),
+				session);
+		g_signal_connect(G_OBJECT(media), "new-candidate",
+				G_CALLBACK(jingle_rtp_new_candidate_cb),
+				session);
+	}
+}
+
+static PurpleMedia *
+jingle_rtp_create_media(JingleContent *content)
+{
+	JingleSession *session = jingle_content_get_session(content);
+	JabberStream *js = jingle_session_get_js(session);
+	gchar *remote_jid = jingle_session_get_remote_jid(session);
+
+	PurpleMedia *media = purple_media_manager_create_media(
+			purple_media_manager_get(), 
+			purple_connection_get_account(js->gc),
+			"fsrtpconference", remote_jid,
+			jingle_session_is_initiator(session));
+	g_free(remote_jid);
+
+	if (!media) {
+		purple_debug_error("jingle-rtp", "Couldn't create media session\n");
+		return NULL;
+	}
+
+	purple_media_set_prpl_data(media, session);
+
+	/* connect callbacks */
+	g_signal_connect(G_OBJECT(media), "candidates-prepared",
+				 G_CALLBACK(jingle_rtp_candidates_prepared_cb), session);
+	g_signal_connect(G_OBJECT(media), "codecs-changed",
+				 G_CALLBACK(jingle_rtp_codecs_changed_cb), session);
+	g_signal_connect(G_OBJECT(media), "state-changed",
+				 G_CALLBACK(jingle_rtp_state_changed_cb), session);
+	g_signal_connect(G_OBJECT(media), "stream-info",
+			G_CALLBACK(jingle_rtp_stream_info_cb), session);
+
+	g_object_unref(session);
+	return media;
+}
+
+static gboolean
+jingle_rtp_init_media(JingleContent *content)
+{
+	JingleSession *session = jingle_content_get_session(content);
+	PurpleMedia *media = jingle_rtp_get_media(session);
+	gchar *creator;
+	gchar *media_type;
+	gchar *remote_jid;
+	gchar *senders;
+	gchar *name;
+	const gchar *transmitter;
+	gboolean is_audio;
+	gboolean is_creator;
+	PurpleMediaSessionType type;
+	JingleTransport *transport;
+	GParameter *params = NULL;
+	guint num_params;
+
+	/* maybe this create ought to just be in initiate and handle initiate */
+	if (media == NULL)
+		media = jingle_rtp_create_media(content);
+
+	if (media == NULL)
+		return FALSE;
+
+	name = jingle_content_get_name(content);
+	media_type = jingle_rtp_get_media_type(content);
+	remote_jid = jingle_session_get_remote_jid(session);
+	senders = jingle_content_get_senders(content);
+	transport = jingle_content_get_transport(content);
+
+	if (JINGLE_IS_RAWUDP(transport))
+		transmitter = "rawudp";
+	else if (JINGLE_IS_ICEUDP(transport))
+		transmitter = "nice";
+	else
+		transmitter = "notransmitter";
+	g_object_unref(transport);
+
+	is_audio = !strcmp(media_type, "audio");
+
+	if (!strcmp(senders, "both"))
+		type = is_audio == TRUE ? PURPLE_MEDIA_AUDIO
+				: PURPLE_MEDIA_VIDEO;
+	else if ((strcmp(senders, "initiator") == 0) ==
+			jingle_session_is_initiator(session))
+		type = is_audio == TRUE ? PURPLE_MEDIA_SEND_AUDIO
+				: PURPLE_MEDIA_SEND_VIDEO;
+	else
+		type = is_audio == TRUE ? PURPLE_MEDIA_RECV_AUDIO
+				: PURPLE_MEDIA_RECV_VIDEO;
+
+	params = 
+		jingle_get_params(jingle_session_get_js(session), &num_params);
+
+	creator = jingle_content_get_creator(content);
+	if (!strcmp(creator, "initiator"))
+		is_creator = jingle_session_is_initiator(session);
+	else
+		is_creator = !jingle_session_is_initiator(session);
+	g_free(creator);
+
+	purple_media_add_stream(media, name, remote_jid,
+			type, is_creator, transmitter, num_params, params);
+
+	g_free(name);
+	g_free(media_type);
+	g_free(remote_jid);
+	g_free(senders);
+	g_free(params);
+	g_object_unref(session);
+
+	return TRUE;
+}
+
+static GList *
+jingle_rtp_parse_codecs(xmlnode *description)
+{
+	GList *codecs = NULL;
+	xmlnode *codec_element = NULL;
+	const char *encoding_name,*id, *clock_rate;
+	PurpleMediaCodec *codec;
+	const gchar *media = xmlnode_get_attrib(description, "media");
+	PurpleMediaSessionType type =
+			!strcmp(media, "video") ? PURPLE_MEDIA_VIDEO :
+			!strcmp(media, "audio") ? PURPLE_MEDIA_AUDIO : 0;
+
+	for (codec_element = xmlnode_get_child(description, "payload-type") ;
+		 codec_element ;
+		 codec_element = xmlnode_get_next_twin(codec_element)) {
+		xmlnode *param;
+		gchar *codec_str;
+		encoding_name = xmlnode_get_attrib(codec_element, "name");
+
+		id = xmlnode_get_attrib(codec_element, "id");
+		clock_rate = xmlnode_get_attrib(codec_element, "clockrate");
+
+		codec = purple_media_codec_new(atoi(id), encoding_name, 
+				     type, 
+				     clock_rate ? atoi(clock_rate) : 0);
+
+		for (param = xmlnode_get_child(codec_element, "parameter");
+				param; param = xmlnode_get_next_twin(param)) {
+			purple_media_codec_add_optional_parameter(codec,
+					xmlnode_get_attrib(param, "name"),
+					xmlnode_get_attrib(param, "value"));
+		}
+
+		codec_str = purple_media_codec_to_string(codec);
+		purple_debug_info("jingle-rtp", "received codec: %s\n", codec_str);
+		g_free(codec_str);
+
+		codecs = g_list_append(codecs, codec);
+	}
+	return codecs;
+}
+
+static JingleContent *
+jingle_rtp_parse_internal(xmlnode *rtp)
+{
+	JingleContent *content = parent_class->parse(rtp);
+	xmlnode *description = xmlnode_get_child(rtp, "description");
+	const gchar *media_type = xmlnode_get_attrib(description, "media");
+	const gchar *ssrc = xmlnode_get_attrib(description, "ssrc");
+	purple_debug_info("jingle-rtp", "rtp parse\n");
+	g_object_set(content, "media-type", media_type, NULL);
+	if (ssrc != NULL)
+		g_object_set(content, "ssrc", ssrc, NULL);
+	return content;
+}
+
+static void
+jingle_rtp_add_payloads(xmlnode *description, GList *codecs)
+{
+	for (; codecs ; codecs = codecs->next) {
+		PurpleMediaCodec *codec = (PurpleMediaCodec*)codecs->data;
+		GList *iter = purple_media_codec_get_optional_parameters(codec);
+		gchar *id, *name, *clockrate, *channels;
+		gchar *codec_str;
+		xmlnode *payload = xmlnode_new_child(description, "payload-type");
+		
+		id = g_strdup_printf("%d",
+				purple_media_codec_get_id(codec));
+		name = purple_media_codec_get_encoding_name(codec);
+		clockrate = g_strdup_printf("%d",
+				purple_media_codec_get_clock_rate(codec));
+		channels = g_strdup_printf("%d",
+				purple_media_codec_get_channels(codec));
+
+		xmlnode_set_attrib(payload, "name", name);
+		xmlnode_set_attrib(payload, "id", id);
+		xmlnode_set_attrib(payload, "clockrate", clockrate);
+		xmlnode_set_attrib(payload, "channels", channels);
+
+		g_free(channels);
+		g_free(clockrate);
+		g_free(name);
+		g_free(id);
+
+		for (; iter; iter = g_list_next(iter)) {
+			PurpleKeyValuePair *mparam = iter->data;
+			xmlnode *param = xmlnode_new_child(payload, "parameter");
+			xmlnode_set_attrib(param, "name", mparam->key);
+			xmlnode_set_attrib(param, "value", mparam->value);
+		}
+
+		codec_str = purple_media_codec_to_string(codec);
+		purple_debug_info("jingle", "adding codec: %s\n", codec_str);
+		g_free(codec_str);
+	}
+}
+
+static xmlnode *
+jingle_rtp_to_xml_internal(JingleContent *rtp, xmlnode *content, JingleActionType action)
+{
+	xmlnode *node = parent_class->to_xml(rtp, content, action);
+	xmlnode *description = xmlnode_get_child(node, "description");
+	if (description != NULL) {
+		JingleSession *session = jingle_content_get_session(rtp);
+		PurpleMedia *media = jingle_rtp_get_media(session);
+		gchar *media_type = jingle_rtp_get_media_type(rtp);
+		gchar *ssrc = jingle_rtp_get_ssrc(rtp);
+		gchar *name = jingle_content_get_name(rtp);
+		GList *codecs = purple_media_get_codecs(media, name);
+
+		xmlnode_set_attrib(description, "media", media_type);
+
+		if (ssrc != NULL)
+			xmlnode_set_attrib(description, "ssrc", ssrc);
+
+		g_free(media_type);
+		g_free(name);
+		g_object_unref(session);
+
+		jingle_rtp_add_payloads(description, codecs);
+		purple_media_codec_list_free(codecs);
+	}
+	return node;
+}
+
+static void
+jingle_rtp_handle_action_internal(JingleContent *content, xmlnode *xmlcontent, JingleActionType action)
+{
+	switch (action) {
+		case JINGLE_SESSION_ACCEPT:
+		case JINGLE_SESSION_INITIATE: {
+			JingleSession *session = jingle_content_get_session(content);
+			JingleTransport *transport = jingle_transport_parse(
+					xmlnode_get_child(xmlcontent, "transport"));
+			xmlnode *description = xmlnode_get_child(xmlcontent, "description");
+			GList *candidates = jingle_rtp_transport_to_candidates(transport);
+			GList *codecs = jingle_rtp_parse_codecs(description);
+			gchar *name = jingle_content_get_name(content);
+			gchar *remote_jid =
+					jingle_session_get_remote_jid(session);
+			PurpleMedia *media;
+
+			if (action == JINGLE_SESSION_INITIATE &&
+					jingle_rtp_init_media(content) == FALSE) {
+				/* XXX: send error */
+				jabber_iq_send(jingle_session_terminate_packet(
+						session, "general-error"));
+				g_object_unref(session);
+				break;
+			}
+
+			media = jingle_rtp_get_media(session);
+			purple_media_set_remote_codecs(media,
+					name, remote_jid, codecs);
+			purple_media_add_remote_candidates(media,
+					name, remote_jid, candidates);
+
+			if (action == JINGLE_SESSION_ACCEPT)
+				purple_media_stream_info(media,
+						PURPLE_MEDIA_INFO_ACCEPT,
+						name, remote_jid, FALSE);
+
+			g_free(remote_jid);
+			g_free(name);
+			g_object_unref(session);
+			break;
+		}
+		case JINGLE_SESSION_TERMINATE: {
+			JingleSession *session = jingle_content_get_session(content);
+			PurpleMedia *media = jingle_rtp_get_media(session);
+
+			if (media != NULL) {
+				purple_media_end(media, NULL, NULL);
+			}
+
+			g_object_unref(session);
+			break;
+		}
+		case JINGLE_TRANSPORT_INFO: {
+			JingleSession *session = jingle_content_get_session(content);
+			JingleTransport *transport = jingle_transport_parse(
+					xmlnode_get_child(xmlcontent, "transport"));
+			GList *candidates = jingle_rtp_transport_to_candidates(transport);
+			gchar *name = jingle_content_get_name(content);
+			gchar *remote_jid =
+					jingle_session_get_remote_jid(session);
+
+			purple_media_add_remote_candidates(
+					jingle_rtp_get_media(session),
+					name, remote_jid, candidates);
+
+			g_free(remote_jid);
+			g_free(name);
+			g_object_unref(session);
+			break;
+		}
+		default:
+			break;
+	}
+}
+
+gboolean
+jingle_rtp_initiate_media(JabberStream *js, const gchar *who, 
+		      PurpleMediaSessionType type)
+{
+	/* create content negotiation */
+	JingleSession *session;
+	JingleContent *content;
+	JingleTransport *transport;
+	JabberBuddy *jb;
+	JabberBuddyResource *jbr;
+	const gchar *transport_type;
+	
+	gchar *resource = NULL, *me = NULL, *sid = NULL;
+
+	/* construct JID to send to */
+	jb = jabber_buddy_find(js, who, FALSE);
+	if (!jb) {
+		purple_debug_error("jingle-rtp", "Could not find Jabber buddy\n");
+		return FALSE;
+	}
+
+	resource = jabber_get_resource(who);
+	jbr = jabber_buddy_find_resource(jb, resource);
+	g_free(resource);
+
+	if (!jbr) {
+		purple_debug_error("jingle-rtp", "Could not find buddy's resource\n");
+	}
+
+	if (jabber_resource_has_capability(jbr, JINGLE_TRANSPORT_ICEUDP)) {
+		transport_type = JINGLE_TRANSPORT_ICEUDP;
+	} else if (jabber_resource_has_capability(jbr, JINGLE_TRANSPORT_RAWUDP)) {
+		transport_type = JINGLE_TRANSPORT_RAWUDP;
+	} else {
+		purple_debug_error("jingle-rtp", "Resource doesn't support "
+				"the same transport types\n");
+		return FALSE;
+	}
+
+	/* set ourselves as initiator */
+	me = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain, js->user->resource);
+
+	sid = jabber_get_next_id(js);
+	session = jingle_session_create(js, sid, me, who, TRUE);
+	g_free(sid);
+
+
+	if (type & PURPLE_MEDIA_AUDIO) {
+		transport = jingle_transport_create(transport_type);
+		content = jingle_content_create(JINGLE_APP_RTP, "initiator",
+				"session", "audio-session", "both", transport);
+		jingle_session_add_content(session, content);
+		JINGLE_RTP(content)->priv->media_type = g_strdup("audio");
+		jingle_rtp_init_media(content);
+	}
+	if (type & PURPLE_MEDIA_VIDEO) {
+		transport = jingle_transport_create(transport_type);
+		content = jingle_content_create(JINGLE_APP_RTP, "initiator",
+				"session", "video-session", "both", transport);
+		jingle_session_add_content(session, content);
+		JINGLE_RTP(content)->priv->media_type = g_strdup("video");
+		jingle_rtp_init_media(content);
+	}
+
+	g_free(me);
+
+	if (jingle_rtp_get_media(session) == NULL) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+void
+jingle_rtp_terminate_session(JabberStream *js, const gchar *who)
+{
+	JingleSession *session;
+/* XXX: This may cause file transfers and xml sessions to stop as well */
+	session = jingle_session_find_by_jid(js, who);
+
+	if (session) {
+		PurpleMedia *media = jingle_rtp_get_media(session);
+		if (media) {
+			purple_debug_info("jingle-rtp", "hanging up media\n");
+			purple_media_stream_info(media,
+					PURPLE_MEDIA_INFO_HANGUP,
+					NULL, NULL, TRUE);
+		}
+	}
+}
+
+#endif /* USE_VV */
+
diff --git a/libpurple/protocols/jabber/jingle/rtp.h b/libpurple/protocols/jabber/jingle/rtp.h
new file mode 100644
index 0000000000..db21706f45
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/rtp.h
@@ -0,0 +1,92 @@
+/**
+ * @file rtp.h
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef PURPLE_JABBER_JINGLE_RTP_H
+#define PURPLE_JABBER_JINGLE_RTP_H
+
+#include "config.h"
+
+#ifdef USE_VV
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include "content.h"
+#include "media.h"
+#include "xmlnode.h"
+
+G_BEGIN_DECLS
+
+#define JINGLE_TYPE_RTP            (jingle_rtp_get_type())
+#define JINGLE_RTP(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), JINGLE_TYPE_RTP, JingleRtp))
+#define JINGLE_RTP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), JINGLE_TYPE_RTP, JingleRtpClass))
+#define JINGLE_IS_RTP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), JINGLE_TYPE_RTP))
+#define JINGLE_IS_RTP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), JINGLE_TYPE_RTP))
+#define JINGLE_RTP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), JINGLE_TYPE_RTP, JingleRtpClass))
+
+/** @copydoc _JingleRtp */
+typedef struct _JingleRtp JingleRtp;
+/** @copydoc _JingleRtpClass */
+typedef struct _JingleRtpClass JingleRtpClass;
+/** @copydoc _JingleRtpPrivate */
+typedef struct _JingleRtpPrivate JingleRtpPrivate;
+
+/** The rtp class */
+struct _JingleRtpClass
+{
+	JingleContentClass parent_class;     /**< The parent class. */
+};
+
+/** The rtp class's private data */
+struct _JingleRtp
+{
+	JingleContent parent;                /**< The parent of this object. */
+	JingleRtpPrivate *priv;      /**< The private data of this object. */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Gets the rtp class's GType
+ *
+ * @return The rtp class's GType.
+ */
+GType jingle_rtp_get_type(void);
+
+gchar *jingle_rtp_get_media_type(JingleContent *content);
+gchar *jingle_rtp_get_ssrc(JingleContent *content);
+
+gboolean jingle_rtp_initiate_media(JabberStream *js,
+				   const gchar *who,
+				   PurpleMediaSessionType type);
+void jingle_rtp_terminate_session(JabberStream *js, const gchar *who);
+
+#ifdef __cplusplus
+}
+#endif
+
+G_END_DECLS
+
+#endif /* USE_VV */
+
+#endif /* PURPLE_JABBER_JINGLE_RTP_H */
+
diff --git a/libpurple/protocols/jabber/jingle/session.c b/libpurple/protocols/jabber/jingle/session.c
new file mode 100644
index 0000000000..2a262e9d7d
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/session.c
@@ -0,0 +1,680 @@
+/**
+ * @file session.c
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+
+#include "content.h"
+#include "debug.h"
+#include "session.h"
+#include "jingle.h"
+
+#include <string.h>
+
+struct _JingleSessionPrivate
+{
+	gchar *sid;
+	JabberStream *js;
+	gchar *remote_jid;
+	gchar *local_jid;
+	gboolean is_initiator;
+	gboolean state;
+	GList *contents;
+	GList *pending_contents;
+};
+
+#define JINGLE_SESSION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), JINGLE_TYPE_SESSION, JingleSessionPrivate))
+
+static void jingle_session_class_init (JingleSessionClass *klass);
+static void jingle_session_init (JingleSession *session);
+static void jingle_session_finalize (GObject *object);
+static void jingle_session_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void jingle_session_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+
+static GObjectClass *parent_class = NULL;
+
+enum {
+	PROP_0,
+	PROP_SID,
+	PROP_JS,
+	PROP_REMOTE_JID,
+	PROP_LOCAL_JID,
+	PROP_IS_INITIATOR,
+	PROP_STATE,
+	PROP_CONTENTS,
+	PROP_PENDING_CONTENTS,
+};
+
+GType
+jingle_session_get_type()
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof(JingleSessionClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) jingle_session_class_init,
+			NULL,
+			NULL,
+			sizeof(JingleSession),
+			0,
+			(GInstanceInitFunc) jingle_session_init,
+			NULL
+		};
+		type = g_type_register_static(G_TYPE_OBJECT, "JingleSession", &info, 0);
+	}
+	return type;
+}
+
+static void
+jingle_session_class_init (JingleSessionClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	parent_class = g_type_class_peek_parent(klass);
+	
+	gobject_class->finalize = jingle_session_finalize;
+	gobject_class->set_property = jingle_session_set_property;
+	gobject_class->get_property = jingle_session_get_property;
+
+	g_object_class_install_property(gobject_class, PROP_SID,
+			g_param_spec_string("sid",
+			"Session ID",
+			"The unique session ID of the Jingle Session.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_JS,
+			g_param_spec_pointer("js",
+			"JabberStream",
+			"The Jabber stream associated with this session.",
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_REMOTE_JID,
+			g_param_spec_string("remote-jid",
+			"Remote JID",
+			"The JID of the remote participant.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_LOCAL_JID,
+			g_param_spec_string("local-jid",
+			"Local JID",
+			"The JID of the local participant.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_IS_INITIATOR,
+			g_param_spec_boolean("is-initiator",
+			"Is Initiator",
+			"Whether or not the local JID is the initiator of the session.",
+			FALSE,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_object_class_install_property(gobject_class, PROP_STATE,
+			g_param_spec_boolean("state",
+			"State",
+			"The state of the session (PENDING=FALSE, ACTIVE=TRUE).",
+			FALSE,
+			G_PARAM_READABLE));
+
+	g_object_class_install_property(gobject_class, PROP_CONTENTS,
+			g_param_spec_pointer("contents",
+			"Contents",
+			"The active contents contained within this session",
+			G_PARAM_READABLE));
+
+	g_object_class_install_property(gobject_class, PROP_PENDING_CONTENTS,
+			g_param_spec_pointer("pending-contents",
+			"Pending contents",
+			"The pending contents contained within this session",
+			G_PARAM_READABLE));
+
+	g_type_class_add_private(klass, sizeof(JingleSessionPrivate));
+}
+
+static void
+jingle_session_init (JingleSession *session)
+{
+	session->priv = JINGLE_SESSION_GET_PRIVATE(session);
+	memset(session->priv, 0, sizeof(*session->priv));
+}
+
+static void
+jingle_session_finalize (GObject *session)
+{
+	JingleSessionPrivate *priv = JINGLE_SESSION_GET_PRIVATE(session);
+	purple_debug_info("jingle","jingle_session_finalize\n");
+
+	g_hash_table_remove(priv->js->sessions, priv->sid);
+
+	g_free(priv->sid);
+	g_free(priv->remote_jid);
+	g_free(priv->local_jid);
+
+	for (; priv->contents; priv->contents =
+			g_list_delete_link(priv->contents, priv->contents)) {
+		g_object_unref(priv->contents->data);
+	}
+	for (; priv->pending_contents; priv->pending_contents =
+			g_list_delete_link(priv->pending_contents, priv->pending_contents)) {
+		g_object_unref(priv->pending_contents->data);
+	}
+
+	parent_class->finalize(session);
+}
+
+static void
+jingle_session_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	JingleSession *session;
+	g_return_if_fail(JINGLE_IS_SESSION(object));
+
+	session = JINGLE_SESSION(object);
+
+	switch (prop_id) {
+		case PROP_SID:
+			g_free(session->priv->sid);
+			session->priv->sid = g_value_dup_string(value);
+			break;
+		case PROP_JS:
+			session->priv->js = g_value_get_pointer(value);
+			break;
+		case PROP_REMOTE_JID:
+			g_free(session->priv->remote_jid);
+			session->priv->remote_jid = g_value_dup_string(value);
+			break;
+		case PROP_LOCAL_JID:
+			g_free(session->priv->local_jid);
+			session->priv->local_jid = g_value_dup_string(value);
+			break;
+		case PROP_IS_INITIATOR:
+			session->priv->is_initiator = g_value_get_boolean(value);
+			break;
+		case PROP_STATE:
+			session->priv->state = g_value_get_boolean(value);
+			break;
+		case PROP_CONTENTS:
+			session->priv->contents = g_value_get_pointer(value);
+			break;
+		case PROP_PENDING_CONTENTS:
+			session->priv->pending_contents = g_value_get_pointer(value);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+jingle_session_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	JingleSession *session;
+	g_return_if_fail(JINGLE_IS_SESSION(object));
+	
+	session = JINGLE_SESSION(object);
+
+	switch (prop_id) {
+		case PROP_SID:
+			g_value_set_string(value, session->priv->sid);
+			break;
+		case PROP_JS:
+			g_value_set_pointer(value, session->priv->js);
+			break;
+		case PROP_REMOTE_JID:
+			g_value_set_string(value, session->priv->remote_jid);
+			break;
+		case PROP_LOCAL_JID:
+			g_value_set_string(value, session->priv->local_jid);
+			break;
+		case PROP_IS_INITIATOR:
+			g_value_set_boolean(value, session->priv->is_initiator);
+			break;
+		case PROP_STATE:
+			g_value_set_boolean(value, session->priv->state);
+			break;
+		case PROP_CONTENTS:
+			g_value_set_pointer(value, session->priv->contents);
+			break;
+		case PROP_PENDING_CONTENTS:
+			g_value_set_pointer(value, session->priv->pending_contents);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);	
+			break;
+	}
+}
+
+
+JingleSession *
+jingle_session_create(JabberStream *js, const gchar *sid,
+			const gchar *local_jid, const gchar *remote_jid,
+			gboolean is_initiator)
+{
+	JingleSession *session = g_object_new(jingle_session_get_type(),
+			"js", js,
+			"sid", sid,
+			"local-jid", local_jid,
+			"remote-jid", remote_jid,
+			"is_initiator", is_initiator,
+			NULL);
+
+	/* insert it into the hash table */
+	if (!js->sessions) {
+		purple_debug_info("jingle",
+				"Creating hash table for sessions\n");
+		js->sessions = g_hash_table_new(g_str_hash, g_str_equal);
+	}
+	purple_debug_info("jingle",
+			"inserting session with key: %s into table\n", sid);
+	g_hash_table_insert(js->sessions, g_strdup(sid), session);
+
+	return session;
+}
+
+JabberStream *
+jingle_session_get_js(JingleSession *session)
+{
+	JabberStream *js;
+	g_object_get(session, "js", &js, NULL);
+	return js;
+}
+
+gchar *
+jingle_session_get_sid(JingleSession *session)
+{
+	gchar *sid;
+	g_object_get(session, "sid", &sid, NULL);
+	return sid;
+}
+
+gchar *
+jingle_session_get_local_jid(JingleSession *session)
+{
+	gchar *local_jid;
+	g_object_get(session, "local-jid", &local_jid, NULL);
+	return local_jid;
+}
+
+gchar *
+jingle_session_get_remote_jid(JingleSession *session)
+{
+	gchar *remote_jid;
+	g_object_get(session, "remote-jid", &remote_jid, NULL);
+	return remote_jid;
+}
+
+gboolean
+jingle_session_is_initiator(JingleSession *session)
+{
+	gboolean is_initiator;
+	g_object_get(session, "is-initiator", &is_initiator, NULL);
+	return is_initiator;
+}
+
+gboolean
+jingle_session_get_state(JingleSession *session)
+{
+	gboolean state;
+	g_object_get(session, "state", &state, NULL);
+	return state;
+}
+
+GList *
+jingle_session_get_contents(JingleSession *session)
+{
+	GList *contents;
+	g_object_get(session, "contents", &contents, NULL);
+	return contents;
+}
+
+GList *
+jingle_session_get_pending_contents(JingleSession *session)
+{
+	GList *pending_contents;
+	g_object_get(session, "pending-contents", &pending_contents, NULL);
+	return pending_contents;
+}
+
+JingleSession *
+jingle_session_find_by_sid(JabberStream *js, const gchar *sid)
+{
+	purple_debug_info("jingle", "find_by_id %s\n", sid);
+	purple_debug_info("jingle", "lookup: %p\n", (js->sessions) ?
+			  g_hash_table_lookup(js->sessions, sid) : NULL);  
+	return (JingleSession *) (js->sessions) ?
+			  g_hash_table_lookup(js->sessions, sid) : NULL;
+}
+
+#if GLIB_CHECK_VERSION(2,4,0)
+static gboolean find_by_jid_ghr(gpointer key,
+		gpointer value, gpointer user_data)
+{
+	JingleSession *session = (JingleSession *)value;
+	const gchar *jid = user_data;
+	gboolean use_bare = g_utf8_strchr(jid, -1, '/') == NULL;
+	gchar *remote_jid = jingle_session_get_remote_jid(session);
+	gchar *cmp_jid = use_bare ? jabber_get_bare_jid(remote_jid)
+				  : g_strdup(remote_jid);
+	g_free(remote_jid);
+	if (g_str_equal(jid, cmp_jid)) {
+		g_free(cmp_jid);
+		return TRUE;
+	}
+	g_free(cmp_jid);
+
+	return FALSE;
+}
+
+#else /* GLIB_CHECK_VERSION 2.4.0 */
+
+/* Ugly code; g_hash_table_find version above is much nicer */
+struct session_find_jid
+{
+	const gchar *jid;
+	JingleSession *ret;
+	gboolean use_bare;
+};
+
+static void find_by_jid_ghr(gpointer key, gpointer value, gpointer user_data)
+{
+	JingleSession *session = (JingleSession *)value;
+	struct session_find_jid *data = user_data;
+	gchar *remote_jid;
+	gchar *cmp_jid;
+
+	if (data->ret != NULL)
+		return;
+
+	remote_jid = jingle_session_get_remote_jid(session);
+	cmp_jid = data->use_bare ? jabber_get_bare_jid(remote_jid)
+				: g_strdup(remote_jid);
+	g_free(remote_jid);
+
+	if (g_str_equal(data->jid, cmp_jid))
+		data->ret = session;
+
+	g_free(cmp_jid);
+}
+#endif /* GLIB_CHECK_VERSION 2.4.0 */
+
+JingleSession *
+jingle_session_find_by_jid(JabberStream *js, const gchar *jid)
+{
+#if GLIB_CHECK_VERSION(2,4,0)
+	return js->sessions != NULL ?
+			g_hash_table_find(js->sessions,
+			find_by_jid_ghr, (gpointer)jid) : NULL; 
+#else
+	struct session_find_jid data;
+
+	if (js->sessions == NULL)
+		return NULL;
+
+	data.jid = jid;
+	data.ret = NULL;
+	data.use_bare = g_utf8_strchr(jid, -1, '/') == NULL;
+
+	g_hash_table_foreach(js->sessions, find_by_jid_ghr, &data);
+	return data.ret;
+#endif
+}
+
+static xmlnode *
+jingle_add_jingle_packet(JingleSession *session,
+			 JabberIq *iq, JingleActionType action)
+{
+	xmlnode *jingle = iq ?
+			xmlnode_new_child(iq->node, "jingle") :
+			xmlnode_new("jingle");
+	gchar *local_jid = jingle_session_get_local_jid(session);
+	gchar *remote_jid = jingle_session_get_remote_jid(session);
+
+	xmlnode_set_namespace(jingle, JINGLE);
+	xmlnode_set_attrib(jingle, "action", jingle_get_action_name(action));
+
+	if (jingle_session_is_initiator(session)) {
+		xmlnode_set_attrib(jingle, "initiator",
+				jingle_session_get_local_jid(session));
+		xmlnode_set_attrib(jingle, "responder",
+				jingle_session_get_remote_jid(session));
+	} else {
+		xmlnode_set_attrib(jingle, "initiator",
+				jingle_session_get_remote_jid(session));
+		xmlnode_set_attrib(jingle, "responder",
+				jingle_session_get_local_jid(session));
+	}
+
+	g_free(local_jid);
+	g_free(remote_jid);
+
+	xmlnode_set_attrib(jingle, "sid", jingle_session_get_sid(session));
+	
+	return jingle;
+}
+
+JabberIq *
+jingle_session_create_ack(JingleSession *session, const xmlnode *jingle)
+{
+	JabberIq *result = jabber_iq_new(
+			jingle_session_get_js(session),
+			JABBER_IQ_RESULT);
+	xmlnode *packet = xmlnode_get_parent(jingle);
+	jabber_iq_set_id(result, xmlnode_get_attrib(packet, "id"));
+	xmlnode_set_attrib(result->node, "from", xmlnode_get_attrib(packet, "to"));
+	xmlnode_set_attrib(result->node, "to", xmlnode_get_attrib(packet, "from"));
+	return result;
+}
+
+static JabberIq *
+jingle_create_iq(JingleSession *session)
+{
+	JabberStream *js = jingle_session_get_js(session);
+	JabberIq *result = jabber_iq_new(js, JABBER_IQ_SET);
+	gchar *from = jingle_session_get_local_jid(session);
+	gchar *to = jingle_session_get_remote_jid(session);
+
+	xmlnode_set_attrib(result->node, "from", from);
+	xmlnode_set_attrib(result->node, "to", to);
+
+	g_free(from);
+	g_free(to);
+	return result;
+}
+
+xmlnode *
+jingle_session_to_xml(JingleSession *session, xmlnode *jingle, JingleActionType action)
+{
+	if (action != JINGLE_SESSION_INFO && action != JINGLE_SESSION_TERMINATE) {
+		GList *iter;
+		if (action == JINGLE_CONTENT_ACCEPT
+				|| action == JINGLE_CONTENT_ADD
+				|| action == JINGLE_CONTENT_REMOVE)
+			iter = jingle_session_get_pending_contents(session);
+		else
+			iter = jingle_session_get_contents(session);
+
+		for (; iter; iter = g_list_next(iter)) {
+			jingle_content_to_xml(iter->data, jingle, action);
+		}
+	}
+	return jingle;
+}
+
+JabberIq *
+jingle_session_to_packet(JingleSession *session, JingleActionType action)
+{
+	JabberIq *iq = jingle_create_iq(session);
+	xmlnode *jingle = jingle_add_jingle_packet(session, iq, action);
+	jingle_session_to_xml(session, jingle, action);
+	return iq;
+}
+
+void jingle_session_handle_action(JingleSession *session, xmlnode *jingle, JingleActionType action)
+{
+	GList *iter;
+	if (action == JINGLE_CONTENT_ADD || action == JINGLE_CONTENT_REMOVE)
+		iter = jingle_session_get_pending_contents(session);
+	else
+		iter = jingle_session_get_contents(session);
+
+	for (; iter; iter = g_list_next(iter)) {
+		jingle_content_handle_action(iter->data, jingle, action);
+	}
+}
+
+JingleContent *
+jingle_session_find_content(JingleSession *session, const gchar *name, const gchar *creator)
+{
+	GList *iter = session->priv->contents;
+	for (; iter; iter = g_list_next(iter)) {
+		JingleContent *content = iter->data;
+		gchar *cname = jingle_content_get_name(content);
+		gboolean result = !strcmp(name, cname);
+		g_free(cname);
+
+		if (creator != NULL) {
+			gchar *ccreator = jingle_content_get_creator(content);
+			result = (result && !strcmp(creator, ccreator));
+			g_free(ccreator);
+		}
+
+		if (result == TRUE)
+			return content;
+	}
+	return NULL;
+}
+
+JingleContent *
+jingle_session_find_pending_content(JingleSession *session, const gchar *name, const gchar *creator)
+{
+	GList *iter = session->priv->pending_contents;
+	for (; iter; iter = g_list_next(iter)) {
+		JingleContent *content = iter->data;
+		gchar *cname = jingle_content_get_name(content);
+		gboolean result = !strcmp(name, cname);
+		g_free(cname);
+
+		if (creator != NULL) {
+			gchar *ccreator = jingle_content_get_creator(content);
+			result = (result && !strcmp(creator, ccreator));
+			g_free(ccreator);
+		}
+
+		if (result == TRUE)
+			return content;
+	}
+	return NULL;
+}
+
+void
+jingle_session_add_content(JingleSession *session, JingleContent* content)
+{
+	session->priv->contents =
+			g_list_append(session->priv->contents, content);
+	jingle_content_set_session(content, session);
+}
+
+void
+jingle_session_remove_content(JingleSession *session, const gchar *name, const gchar *creator)
+{
+	JingleContent *content =
+			jingle_session_find_content(session, name, creator);
+
+	if (content) {
+		session->priv->contents =
+				g_list_remove(session->priv->contents, content);
+		g_object_unref(content);
+	}
+}
+
+void
+jingle_session_add_pending_content(JingleSession *session, JingleContent* content)
+{
+	session->priv->pending_contents =
+			g_list_append(session->priv->pending_contents, content);
+	jingle_content_set_session(content, session);
+}
+
+void
+jingle_session_remove_pending_content(JingleSession *session, const gchar *name, const gchar *creator)
+{
+	JingleContent *content = jingle_session_find_pending_content(session, name, creator);
+
+	if (content) {
+		session->priv->pending_contents =
+				g_list_remove(session->priv->pending_contents, content);
+		g_object_unref(content);
+	}
+}
+
+void
+jingle_session_accept_content(JingleSession *session, const gchar *name, const gchar *creator)
+{
+	JingleContent *content = jingle_session_find_pending_content(session, name, creator);
+
+	if (content) {
+		g_object_ref(content);
+		jingle_session_remove_pending_content(session, name, creator);
+		jingle_session_add_content(session, content);
+	}
+}
+
+void
+jingle_session_accept_session(JingleSession *session)
+{
+	session->priv->state = TRUE;
+}
+
+JabberIq *
+jingle_session_terminate_packet(JingleSession *session, const gchar *reason)
+{
+	JabberIq *iq = jingle_session_to_packet(session,
+			JINGLE_SESSION_TERMINATE);
+	xmlnode *jingle = xmlnode_get_child(iq->node, "jingle");
+
+	if (reason != NULL) {
+		xmlnode *reason_node;
+		reason_node = xmlnode_new_child(jingle, "reason");
+		xmlnode_new_child(reason_node, reason);
+	}
+	return iq;
+}
+
+JabberIq *
+jingle_session_redirect_packet(JingleSession *session, const gchar *sid)
+{
+	JabberIq *iq = jingle_session_terminate_packet(session,
+			"alternative-session");
+	xmlnode *alt_session;
+
+	if (sid == NULL)
+		return iq;
+
+	alt_session = xmlnode_get_child(iq->node,
+			"jingle/reason/alternative-session");
+
+	if (alt_session != NULL) {
+		xmlnode *sid_node = xmlnode_new_child(alt_session, "sid");
+		xmlnode_insert_data(sid_node, sid, -1);
+	}
+	return iq;
+}
+
diff --git a/libpurple/protocols/jabber/jingle/session.h b/libpurple/protocols/jabber/jingle/session.h
new file mode 100644
index 0000000000..15c90fda98
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/session.h
@@ -0,0 +1,115 @@
+/**
+ * @file session.h
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef PURPLE_JABBER_JINGLE_SESSION_H
+#define PURPLE_JABBER_JINGLE_SESSION_H
+
+#include "iq.h"
+#include "jabber.h"
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define JINGLE_TYPE_SESSION            (jingle_session_get_type())
+#define JINGLE_SESSION(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), JINGLE_TYPE_SESSION, JingleSession))
+#define JINGLE_SESSION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), JINGLE_TYPE_SESSION, JingleSessionClass))
+#define JINGLE_IS_SESSION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), JINGLE_TYPE_SESSION))
+#define JINGLE_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), JINGLE_TYPE_SESSION))
+#define JINGLE_SESSION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), JINGLE_TYPE_SESSION, JingleSessionClass))
+
+/** @copydoc _JingleSession */
+typedef struct _JingleSession JingleSession;
+/** @copydoc _JingleSessionClass */
+typedef struct _JingleSessionClass JingleSessionClass;
+/** @copydoc _JingleSessionPrivate */
+typedef struct _JingleSessionPrivate JingleSessionPrivate;
+
+/** The session class */
+struct _JingleSessionClass
+{
+	GObjectClass parent_class;     /**< The parent class. */
+};
+
+/** The session class's private data */
+struct _JingleSession
+{
+	GObject parent;                /**< The parent of this object. */
+	JingleSessionPrivate *priv;      /**< The private data of this object. */
+};
+
+struct _JingleContent;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Gets the session class's GType
+ *
+ * @return The session class's GType.
+ */
+GType jingle_session_get_type(void);
+
+JingleSession *jingle_session_create(JabberStream *js, const gchar *sid,
+				     const gchar *local_jid, const gchar *remote_jid,
+				     gboolean is_initiator);
+JabberStream *jingle_session_get_js(JingleSession *session);
+gchar *jingle_session_get_sid(JingleSession *session);
+gchar *jingle_session_get_local_jid(JingleSession *session);
+gchar *jingle_session_get_remote_jid(JingleSession *session);
+gboolean jingle_session_is_initiator(JingleSession *session);
+gboolean jingle_session_get_state(JingleSession *session);
+
+GList *jingle_session_get_contents(JingleSession *session);
+GList *jingle_session_get_pending_contents(JingleSession *session);
+
+JingleSession *jingle_session_find_by_sid(JabberStream *js, const gchar *sid);
+JingleSession *jingle_session_find_by_jid(JabberStream *js, const gchar *jid);
+
+JabberIq *jingle_session_create_ack(JingleSession *session, const xmlnode *jingle);
+xmlnode *jingle_session_to_xml(JingleSession *session, xmlnode *parent, JingleActionType action);
+JabberIq *jingle_session_to_packet(JingleSession *session, JingleActionType action);
+
+void jingle_session_handle_action(JingleSession *session, xmlnode *jingle, JingleActionType action);
+
+struct _JingleContent *jingle_session_find_content(JingleSession *session,
+					const gchar *name, const gchar *creator);
+struct _JingleContent *jingle_session_find_pending_content(JingleSession *session,
+					const gchar *name, const gchar *creator);
+
+void jingle_session_add_content(JingleSession *session, struct _JingleContent* content);
+void jingle_session_remove_content(JingleSession *session, const gchar *name, const gchar *creator);
+void jingle_session_add_pending_content(JingleSession *session, struct _JingleContent* content);
+void jingle_session_remove_pending_content(JingleSession *session, const gchar *name, const gchar *creator);
+void jingle_session_accept_content(JingleSession *session, const gchar *name, const gchar *creator);
+void jingle_session_accept_session(JingleSession *session);
+JabberIq *jingle_session_terminate_packet(JingleSession *session, const gchar *reason);
+JabberIq *jingle_session_redirect_packet(JingleSession *session, const gchar *sid);
+
+#ifdef __cplusplus
+}
+#endif
+
+G_END_DECLS
+
+#endif /* PURPLE_JABBER_JINGLE_SESSION_H */
+
diff --git a/libpurple/protocols/jabber/jingle/transport.c b/libpurple/protocols/jabber/jingle/transport.c
new file mode 100644
index 0000000000..c3105f43eb
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/transport.c
@@ -0,0 +1,174 @@
+/**
+ * @file transport.c
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+
+#include "transport.h"
+#include "jingle.h"
+#include "debug.h"
+
+#include <string.h>
+
+struct _JingleTransportPrivate
+{
+	void *dummy;
+};
+
+#define JINGLE_TRANSPORT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), JINGLE_TYPE_TRANSPORT, JingleTransportPrivate))
+
+static void jingle_transport_class_init (JingleTransportClass *klass);
+static void jingle_transport_init (JingleTransport *transport);
+static void jingle_transport_finalize (GObject *object);
+static void jingle_transport_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void jingle_transport_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+JingleTransport *jingle_transport_parse_internal(xmlnode *transport);
+xmlnode *jingle_transport_to_xml_internal(JingleTransport *transport, xmlnode *content, JingleActionType action);
+
+static GObjectClass *parent_class = NULL;
+
+enum {
+	PROP_0,
+};
+
+GType
+jingle_transport_get_type()
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof(JingleTransportClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) jingle_transport_class_init,
+			NULL,
+			NULL,
+			sizeof(JingleTransport),
+			0,
+			(GInstanceInitFunc) jingle_transport_init,
+			NULL
+		};
+		type = g_type_register_static(G_TYPE_OBJECT, "JingleTransport", &info, 0);
+	}
+	return type;
+}
+
+static void
+jingle_transport_class_init (JingleTransportClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	parent_class = g_type_class_peek_parent(klass);
+
+	gobject_class->finalize = jingle_transport_finalize;
+	gobject_class->set_property = jingle_transport_set_property;
+	gobject_class->get_property = jingle_transport_get_property;
+	klass->to_xml = jingle_transport_to_xml_internal;
+	klass->parse = jingle_transport_parse_internal;
+
+	g_type_class_add_private(klass, sizeof(JingleTransportPrivate));
+}
+
+static void
+jingle_transport_init (JingleTransport *transport)
+{
+	transport->priv = JINGLE_TRANSPORT_GET_PRIVATE(transport);
+	transport->priv->dummy = NULL;
+}
+
+static void
+jingle_transport_finalize (GObject *transport)
+{
+	/* JingleTransportPrivate *priv = JINGLE_TRANSPORT_GET_PRIVATE(transport); */
+	purple_debug_info("jingle","jingle_transport_finalize\n");
+
+	parent_class->finalize(transport);
+}
+
+static void
+jingle_transport_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	JingleTransport *transport;
+	g_return_if_fail(JINGLE_IS_TRANSPORT(object));
+
+	transport = JINGLE_TRANSPORT(object);
+
+	switch (prop_id) {
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+jingle_transport_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	JingleTransport *transport;
+	g_return_if_fail(JINGLE_IS_TRANSPORT(object));
+	
+	transport = JINGLE_TRANSPORT(object);
+
+	switch (prop_id) {
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);	
+			break;
+	}
+}
+
+JingleTransport *
+jingle_transport_create(const gchar *type)
+{
+	return g_object_new(jingle_get_type(type), NULL);
+}
+
+const gchar *
+jingle_transport_get_transport_type(JingleTransport *transport)
+{
+	return JINGLE_TRANSPORT_GET_CLASS(transport)->transport_type;
+}
+
+JingleTransport *
+jingle_transport_parse_internal(xmlnode *transport)
+{
+	const gchar *type = xmlnode_get_namespace(transport);
+	return jingle_transport_create(type);
+}
+
+xmlnode *
+jingle_transport_to_xml_internal(JingleTransport *transport, xmlnode *content, JingleActionType action)
+{
+	xmlnode *node = xmlnode_new_child(content, "transport");
+	xmlnode_set_namespace(node, jingle_transport_get_transport_type(transport));
+	return node;
+}
+
+JingleTransport *
+jingle_transport_parse(xmlnode *transport)
+{
+	const gchar *type = xmlnode_get_namespace(transport);
+	return JINGLE_TRANSPORT_CLASS(g_type_class_ref(jingle_get_type(type)))->parse(transport);
+}
+
+xmlnode *
+jingle_transport_to_xml(JingleTransport *transport, xmlnode *content, JingleActionType action)
+{
+	g_return_val_if_fail(JINGLE_IS_TRANSPORT(transport), NULL);
+	return JINGLE_TRANSPORT_GET_CLASS(transport)->to_xml(transport, content, action);
+}
+
diff --git a/libpurple/protocols/jabber/jingle/transport.h b/libpurple/protocols/jabber/jingle/transport.h
new file mode 100644
index 0000000000..6b00d06a35
--- /dev/null
+++ b/libpurple/protocols/jabber/jingle/transport.h
@@ -0,0 +1,88 @@
+/**
+ * @file transport.h
+ *
+ * purple
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef PURPLE_JABBER_JINGLE_TRANSPORT_H
+#define PURPLE_JABBER_JINGLE_TRANSPORT_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include "jingle.h"
+#include "xmlnode.h"
+
+G_BEGIN_DECLS
+
+#define JINGLE_TYPE_TRANSPORT            (jingle_transport_get_type())
+#define JINGLE_TRANSPORT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), JINGLE_TYPE_TRANSPORT, JingleTransport))
+#define JINGLE_TRANSPORT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), JINGLE_TYPE_TRANSPORT, JingleTransportClass))
+#define JINGLE_IS_TRANSPORT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), JINGLE_TYPE_TRANSPORT))
+#define JINGLE_IS_TRANSPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), JINGLE_TYPE_TRANSPORT))
+#define JINGLE_TRANSPORT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), JINGLE_TYPE_TRANSPORT, JingleTransportClass))
+
+/** @copydoc _JingleTransport */
+typedef struct _JingleTransport JingleTransport;
+/** @copydoc _JingleTransportClass */
+typedef struct _JingleTransportClass JingleTransportClass;
+/** @copydoc _JingleTransportPrivate */
+typedef struct _JingleTransportPrivate JingleTransportPrivate;
+
+/** The transport class */
+struct _JingleTransportClass
+{
+	GObjectClass parent_class;     /**< The parent class. */
+
+	const gchar *transport_type;
+	xmlnode *(*to_xml) (JingleTransport *transport, xmlnode *content, JingleActionType action);
+	JingleTransport *(*parse) (xmlnode *transport);
+};
+
+/** The transport class's private data */
+struct _JingleTransport
+{
+	GObject parent;                /**< The parent of this object. */
+	JingleTransportPrivate *priv;      /**< The private data of this object. */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Gets the transport class's GType
+ *
+ * @return The transport class's GType.
+ */
+GType jingle_transport_get_type(void);
+
+JingleTransport *jingle_transport_create(const gchar *type);
+const gchar *jingle_transport_get_transport_type(JingleTransport *transport);
+void jingle_transport_add_candidate();
+
+JingleTransport *jingle_transport_parse(xmlnode *transport);
+xmlnode *jingle_transport_to_xml(JingleTransport *transport, xmlnode *content, JingleActionType action);
+
+#ifdef __cplusplus
+}
+#endif
+
+G_END_DECLS
+
+#endif /* PURPLE_JABBER_JINGLE_TRANSPORT_H */
+
diff --git a/libpurple/protocols/jabber/jutil.c b/libpurple/protocols/jabber/jutil.c
index 5f77db9fcb..426755131a 100644
--- a/libpurple/protocols/jabber/jutil.c
+++ b/libpurple/protocols/jabber/jutil.c
@@ -31,9 +31,145 @@
 #include "presence.h"
 #include "jutil.h"
 
+#ifdef USE_IDN
+#include <idna.h>
+#include <stringprep.h>
+static char idn_buffer[1024];
+#endif
+
+#ifdef USE_IDN
+static gboolean jabber_nodeprep(char *str, size_t buflen)
+{
+	return stringprep_xmpp_nodeprep(str, buflen) == STRINGPREP_OK;
+}
+
+static gboolean jabber_resourceprep(char *str, size_t buflen)
+{
+	return stringprep_xmpp_resourceprep(str, buflen) == STRINGPREP_OK;
+}
+
+static JabberID*
+jabber_idn_validate(const char *str, const char *at, const char *slash,
+                    const char *null)
+{
+	const char *node = NULL;
+	const char *domain = NULL;
+	const char *resource = NULL;
+	int node_len = 0;
+	int domain_len = 0;
+	int resource_len = 0;
+	char *out;
+	JabberID *jid;
+
+	/* Ensure no parts are > 1023 bytes */
+	if (at) {
+		node = str;
+		node_len = at - str;
+
+		domain = at + 1;
+		if (slash) {
+			domain_len = slash - (at + 1);
+			resource = slash + 1;
+			resource_len = null - (slash + 1);
+		} else {
+			domain_len = null - (at + 1);
+		}
+	} else {
+		domain = str;
+
+		if (slash) {
+			domain_len = slash - str;
+			resource = slash;
+			resource_len = null - (slash + 1);
+		} else {
+			domain_len = null - (str + 1);
+		}
+	}
+
+	if (node && node_len > 1023)
+		return NULL;
+	if (domain_len > 1023)
+		return NULL;
+	if (resource && resource_len > 1023)
+		return NULL;
+
+	jid = g_new0(JabberID, 1);
+
+	if (node) {
+		strncpy(idn_buffer, node, node_len);
+		idn_buffer[node_len] = '\0';
+
+		if (!jabber_nodeprep(idn_buffer, sizeof(idn_buffer))) {
+			jabber_id_free(jid);
+			jid = NULL;
+			goto out;
+		}
+
+		jid->node = g_strdup(idn_buffer);
+	}
+
+	/* domain *must* be here */
+	strncpy(idn_buffer, domain, domain_len);
+	idn_buffer[domain_len] = '\0';
+	if (domain[0] == '[') { /* IPv6 address */
+		gboolean valid = FALSE;
+
+		if (idn_buffer[domain_len - 1] == ']') {
+			idn_buffer[domain_len - 1] = '\0';
+			valid = purple_ipv6_address_is_valid(idn_buffer + 1);
+		}
+
+		if (!valid) {
+			jabber_id_free(jid);
+			jid = NULL;
+			goto out;
+		}
+	} else {
+		/* Apply nameprep */
+		if (stringprep_nameprep(idn_buffer, sizeof(idn_buffer)) != STRINGPREP_OK) {
+			jabber_id_free(jid);
+			jid = NULL;
+			goto out;
+		}
+
+		/* And now ToASCII */
+		if (idna_to_ascii_8z(idn_buffer, &out, IDNA_USE_STD3_ASCII_RULES) != IDNA_SUCCESS) {
+			jabber_id_free(jid);
+			jid = NULL;
+			goto out;
+		}
+
+		/* This *MUST* be freed using 'free', not 'g_free' */
+		free(out);
+		jid->domain = g_strdup(idn_buffer);
+	}
+
+	if (resource) {
+		strncpy(idn_buffer, resource, resource_len);
+		idn_buffer[resource_len] = '\0';
+
+		if (!jabber_resourceprep(idn_buffer, sizeof(idn_buffer))) {
+			jabber_id_free(jid);
+			jid = NULL;
+			/* goto out; */
+		}
+
+		jid->resource = g_strdup(idn_buffer);
+	}
+
+out:
+	return jid;
+}
+
+#endif /* USE_IDN */
+
 gboolean jabber_nodeprep_validate(const char *str)
 {
+#ifdef USE_IDN
+	gboolean result;
+#else
 	const char *c;
+#endif
 
 	if(!str)
 		return TRUE;
@@ -41,6 +177,12 @@ gboolean jabber_nodeprep_validate(const char *str)
 	if(strlen(str) > 1023)
 		return FALSE;
 
+#ifdef USE_IDN
+	strncpy(idn_buffer, str, sizeof(idn_buffer) - 1);
+	idn_buffer[sizeof(idn_buffer) - 1] = '\0';
+	result = jabber_nodeprep(idn_buffer, sizeof(idn_buffer));
+	return result;
+#else /* USE_IDN */
 	c = str;
 	while(c && *c) {
 		gunichar ch = g_utf8_get_char(c);
@@ -52,34 +194,61 @@ gboolean jabber_nodeprep_validate(const char *str)
 	}
 
 	return TRUE;
+#endif /* USE_IDN */
 }
 
-gboolean jabber_nameprep_validate(const char *str)
+gboolean jabber_domain_validate(const char *str)
 {
 	const char *c;
+	size_t len;
 
 	if(!str)
 		return TRUE;
 
-	if(strlen(str) > 1023)
+	len = strlen(str);
+	if (len > 1023)
 		return FALSE;
 
 	c = str;
+
+	if (*c == '[') {
+		/* Check if str is a valid IPv6 identifier */
+		gboolean valid = FALSE;
+
+		if (*(c + len - 1) != ']')
+			return FALSE;
+
+		/* Ugly, but in-place */
+		*(gchar *)(c + len - 1) = '\0';
+		valid = purple_ipv6_address_is_valid(c + 1);
+		*(gchar *)(c + len - 1) = ']';
+
+		return valid;
+	}
+
 	while(c && *c) {
 		gunichar ch = g_utf8_get_char(c);
-		if(!g_unichar_isgraph(ch))
+		/* The list of characters allowed in domain names is pretty small */
+		if ((ch <= 0x7F && !( (ch >= 'a' && ch <= 'z')
+				|| (ch >= '0' && ch <= '9')
+				|| (ch >= 'A' && ch <= 'Z')
+				|| ch == '.'
+				|| ch == '-' )) || (ch >= 0x80 && !g_unichar_isgraph(ch)))
 			return FALSE;
 
 		c = g_utf8_next_char(c);
 	}
 
-
 	return TRUE;
 }
 
 gboolean jabber_resourceprep_validate(const char *str)
 {
+#ifdef USE_IDN
+	gboolean result;
+#else
 	const char *c;
+#endif
 
 	if(!str)
 		return TRUE;
@@ -87,6 +256,12 @@ gboolean jabber_resourceprep_validate(const char *str)
 	if(strlen(str) > 1023)
 		return FALSE;
 
+#ifdef USE_IDN
+	strncpy(idn_buffer, str, sizeof(idn_buffer) - 1);
+	idn_buffer[sizeof(idn_buffer) - 1] = '\0';
+	result = jabber_resourceprep(idn_buffer, sizeof(idn_buffer));
+	return result;
+#else /* USE_IDN */
 	c = str;
 	while(c && *c) {
 		gunichar ch = g_utf8_get_char(c);
@@ -97,50 +272,186 @@ gboolean jabber_resourceprep_validate(const char *str)
 	}
 
 	return TRUE;
+#endif /* USE_IDN */
 }
 
-
 JabberID*
 jabber_id_new(const char *str)
 {
-	char *at;
-	char *slash;
+	const char *at = NULL;
+	const char *slash = NULL;
+	const char *c;
+	gboolean needs_validation = FALSE;
+#if 0
+	gboolean node_is_required = FALSE;
+#endif
+#ifndef USE_IDN
+	char *node = NULL;
+	char *domain;
+#endif
 	JabberID *jid;
 
-	if(!str || !g_utf8_validate(str, -1, NULL))
+	if (!str)
 		return NULL;
 
-	jid = g_new0(JabberID, 1);
+	for (c = str; *c != '\0'; c++)
+	{
+		switch (*c) {
+			case '@':
+				if (!slash) {
+					if (at) {
+						/* Multiple @'s in the node/domain portion, not a valid JID! */
+						return NULL;
+					}
+					if (c == str) {
+						/* JIDs cannot start with @ */
+						return NULL;
+					}
+					if (c[1] == '\0') {
+						/* JIDs cannot end with @ */
+						return NULL;
+					}
+					at = c;
+				}
+				break;
+
+			case '/':
+				if (!slash) {
+					if (c == str) {
+						/* JIDs cannot start with / */
+						return NULL;
+					}
+					if (c[1] == '\0') {
+						/* JIDs cannot end with / */
+						return NULL;
+					}
+					slash = c;
+				}
+				break;
+
+			default:
+				/* characters allowed everywhere */
+				if ((*c >= 'a' && *c <= 'z')
+						|| (*c >= '0' && *c <= '9')
+						|| (*c >= 'A' && *c <= 'Z')
+						|| *c == '.' || *c == '-')
+					/* We're good */
+					break;
+
+#if 0
+				if (slash != NULL) {
+					/* characters allowed only in the resource */
+					if (implement_me)
+						/* We're good */
+						break;
+				}
+
+				/* characters allowed only in the node */
+				if (implement_me) {
+					/*
+					 * Ok, this character is valid, but only if it's a part
+					 * of the node and not the domain.  But we don't know
+					 * if "c" is a part of the node or the domain until after
+					 * we've found the @.  So set a flag for now and check
+					 * that we found an @ later.
+					 */
+					node_is_required = TRUE;
+					break;
+				}
+#endif
+
+				/*
+				 * Hmm, this character is a bit more exotic.  Better fall
+				 * back to using the more expensive UTF-8 compliant
+				 * stringprep functions.
+				 */
+				needs_validation = TRUE;
+				break;
+		}
+	}
 
-	at = g_utf8_strchr(str, -1, '@');
-	slash = g_utf8_strchr(str, -1, '/');
+#if 0
+	if (node_is_required && at == NULL)
+		/* Found invalid characters in the domain */
+		return NULL;
+#endif
+
+	if (!needs_validation) {
+		/* JID is made of only ASCII characters--just lowercase and return */
+		jid = g_new0(JabberID, 1);
+
+		if (at) {
+			jid->node = g_ascii_strdown(str, at - str);
+			if (slash) {
+				jid->domain = g_ascii_strdown(at + 1, slash - (at + 1));
+				jid->resource = g_strdup(slash + 1);
+			} else {
+				jid->domain = g_ascii_strdown(at + 1, -1);
+			}
+		} else {
+			if (slash) {
+				jid->domain = g_ascii_strdown(str, slash - str);
+				jid->resource = g_strdup(slash + 1);
+			} else {
+				jid->domain = g_ascii_strdown(str, -1);
+			}
+		}
+		return jid;
+	}
+
+	/*
+	 * If we get here, there are some non-ASCII chars in the string, so
+	 * we'll need to validate it, normalize, and finally do a full jabber
+	 * nodeprep on the jid.
+	 */
 
+	if (!g_utf8_validate(str, -1, NULL))
+		return NULL;
+
+#ifdef USE_IDN
+	return jabber_idn_validate(str, at, slash, c /* points to the null */);
+#else /* USE_IDN */
+
+	jid = g_new0(JabberID, 1);
+
+	/* normalization */
 	if(at) {
-		jid->node = g_utf8_normalize(str, at-str, G_NORMALIZE_NFKC);
+		node = g_utf8_casefold(str, at-str);
 		if(slash) {
-			jid->domain = g_utf8_normalize(at+1, slash-(at+1), G_NORMALIZE_NFKC);
+			domain = g_utf8_casefold(at+1, slash-(at+1));
 			jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
 		} else {
-			jid->domain = g_utf8_normalize(at+1, -1, G_NORMALIZE_NFKC);
+			domain = g_utf8_casefold(at+1, -1);
 		}
 	} else {
 		if(slash) {
-			jid->domain = g_utf8_normalize(str, slash-str, G_NORMALIZE_NFKC);
+			domain = g_utf8_casefold(str, slash-str);
 			jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
 		} else {
-			jid->domain = g_utf8_normalize(str, -1, G_NORMALIZE_NFKC);
+			domain = g_utf8_casefold(str, -1);
 		}
 	}
 
+	if (node) {
+		jid->node = g_utf8_normalize(node, -1, G_NORMALIZE_NFKC);
+		g_free(node);
+	}
 
+	if (domain) {
+		jid->domain = g_utf8_normalize(domain, -1, G_NORMALIZE_NFKC);
+		g_free(domain);
+	}
+
+	/* and finally the jabber nodeprep */
 	if(!jabber_nodeprep_validate(jid->node) ||
-			!jabber_nameprep_validate(jid->domain) ||
+			!jabber_domain_validate(jid->domain) ||
 			!jabber_resourceprep_validate(jid->resource)) {
 		jabber_id_free(jid);
 		return NULL;
 	}
 
 	return jid;
+#endif /* USE_IDN */
 }
 
 void
@@ -193,32 +504,70 @@ const char *jabber_normalize(const PurpleAccount *account, const char *in)
 	JabberStream *js = gc ? gc->proto_data : NULL;
 	static char buf[3072]; /* maximum legal length of a jabber jid */
 	JabberID *jid;
-	char *node, *domain;
 
 	jid = jabber_id_new(in);
 
 	if(!jid)
 		return NULL;
 
-	node = jid->node ? g_utf8_strdown(jid->node, -1) : NULL;
-	domain = g_utf8_strdown(jid->domain, -1);
-
-
-	if(js && node && jid->resource &&
-			jabber_chat_find(js, node, domain))
-		g_snprintf(buf, sizeof(buf), "%s@%s/%s", node, domain,
+	if(js && jid->node && jid->resource &&
+			jabber_chat_find(js, jid->node, jid->domain))
+		g_snprintf(buf, sizeof(buf), "%s@%s/%s", jid->node, jid->domain,
 				jid->resource);
 	else
-		g_snprintf(buf, sizeof(buf), "%s%s%s", node ? node : "",
-				node ? "@" : "", domain);
+		g_snprintf(buf, sizeof(buf), "%s%s%s", jid->node ? jid->node : "",
+				jid->node ? "@" : "", jid->domain);
 
 	jabber_id_free(jid);
-	g_free(node);
-	g_free(domain);
 
 	return buf;
 }
 
+gboolean
+jabber_is_own_server(JabberStream *js, const char *str)
+{
+	JabberID *jid;
+	gboolean equal;
+
+	if (str == NULL)
+		return FALSE;
+
+	g_return_val_if_fail(*str != '\0', FALSE);
+
+	jid = jabber_id_new(str);
+	if (!jid)
+		return FALSE;
+
+	equal = (jid->node == NULL &&
+	         g_str_equal(jid->domain, js->user->domain) &&
+	         jid->resource == NULL);
+	jabber_id_free(jid);
+	return equal;
+}
+
+gboolean
+jabber_is_own_account(JabberStream *js, const char *str)
+{
+	JabberID *jid;
+	gboolean equal;
+
+	if (str == NULL)
+		return TRUE;
+
+	g_return_val_if_fail(*str != '\0', FALSE);
+
+	jid = jabber_id_new(str);
+	if (!jid)
+		return FALSE;
+
+	equal = (purple_strequal(jid->node, js->user->node) &&
+	         g_str_equal(jid->domain, js->user->domain) &&
+	         (jid->resource == NULL ||
+	             g_str_equal(jid->resource, js->user->resource)));
+	jabber_id_free(jid);
+	return equal;
+}
+
 PurpleConversation *
 jabber_find_unnormalized_conv(const char *name, PurpleAccount *account)
 {
diff --git a/libpurple/protocols/jabber/jutil.h b/libpurple/protocols/jabber/jutil.h
index f7ddf1ce11..e32c4bbff9 100644
--- a/libpurple/protocols/jabber/jutil.h
+++ b/libpurple/protocols/jabber/jutil.h
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_JUTIL_H_
-#define _PURPLE_JABBER_JUTIL_H_
+#ifndef PURPLE_JABBER_JUTIL_H_
+#define PURPLE_JABBER_JUTIL_H_
 
 typedef struct _JabberID {
 	char *node;
@@ -28,6 +28,8 @@ typedef struct _JabberID {
 	char *resource;
 } JabberID;
 
+#include "jabber.h"
+
 JabberID* jabber_id_new(const char *str);
 void jabber_id_free(JabberID *jid);
 
@@ -36,11 +38,17 @@ char *jabber_get_bare_jid(const char *jid);
 
 const char *jabber_normalize(const PurpleAccount *account, const char *in);
 
+/* Returns true if JID is the bare JID of our server. */
+gboolean jabber_is_own_server(JabberStream *js, const char *jid);
+
+/* Returns true if JID is the bare JID of our account. */
+gboolean jabber_is_own_account(JabberStream *js, const char *jid);
+
 gboolean jabber_nodeprep_validate(const char *);
-gboolean jabber_nameprep_validate(const char *);
+gboolean jabber_domain_validate(const char *);
 gboolean jabber_resourceprep_validate(const char *);
 
 PurpleConversation *jabber_find_unnormalized_conv(const char *name, PurpleAccount *account);
 
 char *jabber_calculate_data_sha1sum(gconstpointer data, size_t len);
-#endif /* _PURPLE_JABBER_JUTIL_H_ */
+#endif /* PURPLE_JABBER_JUTIL_H_ */
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c
index 46b56c260c..d2a587ecbd 100644
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/libxmpp.c
@@ -28,12 +28,14 @@
 #include "internal.h"
 
 #include "accountopt.h"
+#include "core.h"
 #include "debug.h"
 #include "version.h"
 
 #include "iq.h"
 #include "jabber.h"
 #include "chat.h"
+#include "disco.h"
 #include "message.h"
 #include "roster.h"
 #include "si.h"
@@ -46,6 +48,8 @@
 #include "data.h"
 #include "ibb.h"
 
+static PurplePlugin *my_protocol = NULL;
+
 static PurplePluginProtocolInfo prpl_info =
 {
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK |
@@ -70,7 +74,7 @@ static PurplePluginProtocolInfo prpl_info =
 	jabber_set_info,				/* set_info */
 	jabber_send_typing,				/* send_typing */
 	jabber_buddy_get_info,			/* get_info */
-	jabber_presence_send,			/* set_status */
+	jabber_set_status,				/* set_status */
 	jabber_idle_set,				/* set_idle */
 	NULL,							/* change_passwd */
 	jabber_roster_add_buddy,		/* add_buddy */
@@ -119,7 +123,9 @@ static PurplePluginProtocolInfo prpl_info =
 	jabber_attention_types,			/* attention_types */
 
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	NULL, /* get_account_text_table */
+	jabber_initiate_media,          /* initiate_media */
+	jabber_get_media_caps,                  /* get_media_caps */
 };
 
 static gboolean load_plugin(PurplePlugin *plugin)
@@ -134,25 +140,94 @@ static gboolean load_plugin(PurplePlugin *plugin)
 			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
 			purple_value_new_outgoing(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE));
 
+	/*
+	 * Do not remove this or the plugin will fail. Completely. You have been
+	 * warned!
+	 */
+	purple_signal_connect_priority(plugin, "jabber-sending-xmlnode",
+			plugin, PURPLE_CALLBACK(jabber_send_signal_cb),
+			NULL, PURPLE_SIGNAL_PRIORITY_HIGHEST);
+
 	purple_signal_register(plugin, "jabber-sending-text",
 			     purple_marshal_VOID__POINTER_POINTER, NULL, 2,
 			     purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
 			     purple_value_new_outgoing(PURPLE_TYPE_STRING));
 
+	purple_signal_register(plugin, "jabber-receiving-message",
+			purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER,
+			purple_value_new(PURPLE_TYPE_BOOLEAN), 6,
+			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
+			purple_value_new(PURPLE_TYPE_STRING), /* type */
+			purple_value_new(PURPLE_TYPE_STRING), /* id */
+			purple_value_new(PURPLE_TYPE_STRING), /* from */
+			purple_value_new(PURPLE_TYPE_STRING), /* to */
+			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE));
+
+	purple_signal_register(plugin, "jabber-receiving-iq",
+			purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER,
+			purple_value_new(PURPLE_TYPE_BOOLEAN), 5,
+			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
+			purple_value_new(PURPLE_TYPE_STRING), /* type */
+			purple_value_new(PURPLE_TYPE_STRING), /* id */
+			purple_value_new(PURPLE_TYPE_STRING), /* from */
+			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE));
+
+	purple_signal_register(plugin, "jabber-watched-iq",
+			purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER,
+			purple_value_new(PURPLE_TYPE_BOOLEAN), 5,
+			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
+			purple_value_new(PURPLE_TYPE_STRING), /* type */
+			purple_value_new(PURPLE_TYPE_STRING), /* id */
+			purple_value_new(PURPLE_TYPE_STRING), /* from */
+			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE)); /* child */
+
+	/* Modifying these? Look at jabber_init_plugin for the ipc versions */
+	purple_signal_register(plugin, "jabber-register-namespace-watcher",
+			purple_marshal_VOID__POINTER_POINTER,
+			NULL, 2,
+			purple_value_new(PURPLE_TYPE_STRING),  /* node */
+			purple_value_new(PURPLE_TYPE_STRING)); /* namespace */
+
+	purple_signal_register(plugin, "jabber-unregister-namespace-watcher",
+			purple_marshal_VOID__POINTER_POINTER,
+			NULL, 2,
+			purple_value_new(PURPLE_TYPE_STRING),  /* node */
+			purple_value_new(PURPLE_TYPE_STRING)); /* namespace */
+
+	purple_signal_connect(plugin, "jabber-register-namespace-watcher",
+			plugin, PURPLE_CALLBACK(jabber_iq_signal_register), NULL);
+	purple_signal_connect(plugin, "jabber-unregister-namespace-watcher",
+			plugin, PURPLE_CALLBACK(jabber_iq_signal_unregister), NULL);
+
+	purple_signal_register(plugin, "jabber-receiving-presence",
+			purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER,
+			purple_value_new(PURPLE_TYPE_BOOLEAN), 4,
+			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
+			purple_value_new(PURPLE_TYPE_STRING), /* type */
+			purple_value_new(PURPLE_TYPE_STRING), /* from */
+			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE));
+
 	return TRUE;
 }
 
 static gboolean unload_plugin(PurplePlugin *plugin)
 {
-	purple_signal_unregister(plugin, "jabber-receiving-xmlnode");
-
-	purple_signal_unregister(plugin, "jabber-sending-xmlnode");
-
-	purple_signal_unregister(plugin, "jabber-sending-text");
+	purple_signals_unregister_by_instance(plugin);
 
+	/* reverse order of init_plugin */
+	jabber_bosh_uninit();
 	jabber_data_uninit();
 	jabber_si_uninit();
 	jabber_ibb_uninit();
+	/* PEP things should be uninit via jabber_pep_uninit, not here */
+	jabber_pep_uninit();
+	jabber_caps_uninit();
+	jabber_iq_uninit();
+
+	jabber_unregister_commands();
+
+	/* Stay on target...stay on target... Almost there... */
+	jabber_uninit_plugin();
 
 	return TRUE;
 }
@@ -194,6 +269,70 @@ static PurplePluginInfo info =
 	NULL
 };
 
+static PurpleAccount *find_acct(const char *prpl, const char *acct_id)
+{
+	PurpleAccount *acct = NULL;
+
+	/* If we have a specific acct, use it */
+	if (acct_id) {
+		acct = purple_accounts_find(acct_id, prpl);
+		if (acct && !purple_account_is_connected(acct))
+			acct = NULL;
+	} else { /* Otherwise find an active account for the protocol */
+		GList *l = purple_accounts_get_all();
+		while (l) {
+			if (!strcmp(prpl, purple_account_get_protocol_id(l->data))
+					&& purple_account_is_connected(l->data)) {
+				acct = l->data;
+				break;
+			}
+			l = l->next;
+		}
+	}
+
+	return acct;
+}
+
+static gboolean xmpp_uri_handler(const char *proto, const char *user, GHashTable *params)
+{
+	char *acct_id = g_hash_table_lookup(params, "account");
+	PurpleAccount *acct;
+
+	if (g_ascii_strcasecmp(proto, "xmpp"))
+		return FALSE;
+
+	acct = find_acct(purple_plugin_get_id(my_protocol), acct_id);
+
+	if (!acct)
+		return FALSE;
+
+	/* xmpp:romeo@montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message */
+	if (g_hash_table_lookup_extended(params, "message", NULL, NULL)) {
+		char *body = g_hash_table_lookup(params, "body");
+		if (user && *user) {
+			PurpleConversation *conv =
+					purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, user);
+			purple_conversation_present(conv);
+			if (body && *body)
+				purple_conv_send_confirm(conv, body);
+		}
+	} else if (g_hash_table_lookup_extended(params, "roster", NULL, NULL)) {
+		char *name = g_hash_table_lookup(params, "name");
+		if (user && *user)
+			purple_blist_request_add_buddy(acct, user, NULL, name);
+	} else if (g_hash_table_lookup_extended(params, "join", NULL, NULL)) {
+		PurpleConnection *gc = purple_account_get_connection(acct);
+		if (user && *user) {
+			GHashTable *params = jabber_chat_info_defaults(gc, user);
+			jabber_chat_join(gc, params);
+		}
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+
 static void
 init_plugin(PurplePlugin *plugin)
 {
@@ -216,7 +355,7 @@ init_plugin(PurplePlugin *plugin)
 	purple_account_user_split_set_reverse(split, FALSE);
 	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
 
-	option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", FALSE);
+	option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", TRUE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 											   option);
 
@@ -241,8 +380,14 @@ init_plugin(PurplePlugin *plugin)
 
 	option = purple_account_option_string_new(_("File transfer proxies"),
 						  "ft_proxies",
-						/* TODO: Is this an acceptable default? */
-						  "proxy.jabber.org");
+						/* TODO: Is this an acceptable default?
+						 * Also, keep this in sync as they add more servers */
+						  "proxy.eu.jabber.org");
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+						  option);
+
+	option = purple_account_option_string_new(_("BOSH URL"),
+						  "bosh_url", NULL);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 						  option);
 
@@ -253,6 +398,7 @@ init_plugin(PurplePlugin *plugin)
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 		option);
 
+	my_protocol = plugin;
 	jabber_init_plugin(plugin);
 
 	purple_prefs_remove("/plugins/prpl/jabber");
@@ -276,27 +422,21 @@ init_plugin(PurplePlugin *plugin)
 #endif
 	jabber_register_commands();
 
+	/* reverse order of unload_plugin */
 	jabber_iq_init();
-	jabber_pep_init();
-
-	jabber_tune_init();
 	jabber_caps_init();
-
+	/* PEP things should be init via jabber_pep_init, not here */
+	jabber_pep_init();
 	jabber_data_init();
+	jabber_bosh_init();
 
+	#warning implement adding and retrieving own features via IPC API
 
 	jabber_ibb_init();
 	jabber_si_init();
 
-	jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb);
-	jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb);
-	jabber_add_feature("buzz", XEP_0224_NAMESPACE,
-					   jabber_buzz_isenabled);
-	jabber_add_feature("bob", XEP_0231_NAMESPACE,
-					   jabber_custom_smileys_isenabled);
-	jabber_add_feature("ibb", XEP_0047_NAMESPACE, NULL);
-
-	jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
+	purple_signal_connect(purple_get_core(), "uri-handler", plugin,
+		PURPLE_CALLBACK(xmpp_uri_handler), NULL);
 }
 
 
diff --git a/libpurple/protocols/jabber/message.c b/libpurple/protocols/jabber/message.c
index ed7fdc9eec..c11da76a23 100644
--- a/libpurple/protocols/jabber/message.c
+++ b/libpurple/protocols/jabber/message.c
@@ -24,6 +24,7 @@
 #include "notify.h"
 #include "server.h"
 #include "util.h"
+#include "adhoccommands.h"
 #include "buddy.h"
 #include "chat.h"
 #include "data.h"
@@ -86,6 +87,9 @@ static void handle_chat(JabberMessage *jm)
 	}
 
 	if(!jm->xhtml && !jm->body) {
+		if (jbr)
+			jbr->chat_states = JABBER_CHAT_STATES_SUPPORTED;
+
 		if(JM_STATE_COMPOSING == jm->chat_state) {
 			serv_got_typing(jm->js->gc, from, 0, PURPLE_TYPING);
 		} else if(JM_STATE_PAUSED == jm->chat_state) {
@@ -124,15 +128,10 @@ static void handle_chat(JabberMessage *jm)
 		}
 	} else {
 		if(jbr) {
-			if(JM_TS_JEP_0085 == (jm->typing_style & JM_TS_JEP_0085)) {
+			if (jm->chat_state != JM_STATE_NONE)
 				jbr->chat_states = JABBER_CHAT_STATES_SUPPORTED;
-			} else {
+			else
 				jbr->chat_states = JABBER_CHAT_STATES_UNSUPPORTED;
-			}
-
-			if(JM_TS_JEP_0022 == (jm->typing_style & JM_TS_JEP_0022)) {
-				jbr->capabilities |= JABBER_CAP_COMPOSING;
-			}
 
 			if(jbr->thread_id)
 				g_free(jbr->thread_id);
@@ -477,7 +476,9 @@ typedef struct {
 } JabberDataRef;
 
 static void
-jabber_message_get_data_cb(JabberStream *js, xmlnode *packet, gpointer data)
+jabber_message_get_data_cb(JabberStream *js, const char *from,
+                           JabberIqType type, const char *id,
+                           xmlnode *packet, gpointer data)
 {
 	JabberDataRef *ref = (JabberDataRef *) data;
 	PurpleConversation *conv = ref->conv;
@@ -529,15 +530,25 @@ jabber_message_send_data_request(JabberStream *js, PurpleConversation *conv,
 void jabber_message_parse(JabberStream *js, xmlnode *packet)
 {
 	JabberMessage *jm;
-	const char *type;
+	const char *id, *from, *to, *type;
 	xmlnode *child;
+	gboolean signal_return;
+
+	from = xmlnode_get_attrib(packet, "from");
+	id   = xmlnode_get_attrib(packet, "id");
+	to   = xmlnode_get_attrib(packet, "to");
+	type = xmlnode_get_attrib(packet, "type");
+
+	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
+			"jabber-receiving-message", js->gc, type, id, from, to, packet));
+	if (signal_return)
+		return;
 
 	jm = g_new0(JabberMessage, 1);
 	jm->js = js;
 	jm->sent = time(NULL);
 	jm->delayed = FALSE;
-
-	type = xmlnode_get_attrib(packet, "type");
+	jm->chat_state = JM_STATE_NONE;
 
 	if(type) {
 		if(!strcmp(type, "normal"))
@@ -556,9 +567,9 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 		jm->type = JABBER_MESSAGE_NORMAL;
 	}
 
-	jm->from = g_strdup(xmlnode_get_attrib(packet, "from"));
-	jm->to = g_strdup(xmlnode_get_attrib(packet, "to"));
-	jm->id = g_strdup(xmlnode_get_attrib(packet, "id"));
+	jm->from = g_strdup(from);
+	jm->to   = g_strdup(to);
+	jm->id   = g_strdup(id);
 
 	for(child = packet->child; child; child = child->next) {
 		const char *xmlns = xmlnode_get_namespace(child);
@@ -595,8 +606,11 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 			/* The following tests expect xmlns != NULL */
 			continue;
 		} else if(!strcmp(child->name, "subject") && !strcmp(xmlns,"jabber:client")) {
-			if(!jm->subject)
+			if(!jm->subject) {
 				jm->subject = xmlnode_get_data(child);
+				if(!jm->subject)
+					jm->subject = g_strdup("");
+			}
 		} else if(!strcmp(child->name, "thread") && !strcmp(xmlns,"jabber:client")) {
 			if(!jm->thread_id)
 				jm->thread_id = xmlnode_get_data(child);
@@ -611,7 +625,6 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 				char *c;
 
 				const PurpleConnection *gc = js->gc;
-				const gchar *who = xmlnode_get_attrib(packet, "from");
 				PurpleAccount *account = purple_connection_get_account(gc);
 				PurpleConversation *conv = NULL;
 				GList *smiley_refs = NULL;
@@ -624,24 +637,28 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 					purple_debug_info("jabber", "found %d smileys\n",
 						g_list_length(smiley_refs));
 
-					if (jm->type == JABBER_MESSAGE_GROUPCHAT) {
-						JabberID *jid = jabber_id_new(jm->from);
-						JabberChat *chat = NULL;
-
-						if (jid) {
-							chat = jabber_chat_find(js, jid->node, jid->domain);
-							if (chat) conv = chat->conv;
-						}
-
-						jabber_id_free(jid);
-					} else {
-						conv =
-							purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY,
-								who, account);
-						if (!conv) {
-							/* we need to create the conversation here */
-							conv = purple_conversation_new(PURPLE_CONV_TYPE_IM,
-								account, who);
+					if (smiley_refs) {
+						if (jm->type == JABBER_MESSAGE_GROUPCHAT) {
+							JabberID *jid = jabber_id_new(jm->from);
+							JabberChat *chat = NULL;
+
+							if (jid) {
+								chat = jabber_chat_find(js, jid->node, jid->domain);
+								if (chat)
+									conv = chat->conv;
+								jabber_id_free(jid);
+							}
+						} else if (jm->type == JABBER_MESSAGE_NORMAL ||
+						           jm->type == JABBER_MESSAGE_CHAT) {
+							conv =
+								purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY,
+									from, account);
+							if (!conv) {
+								/* we need to create the conversation here */
+								conv =
+									purple_conversation_new(PURPLE_CONV_TYPE_IM,
+									account, from);
+							}
 						}
 					}
 
@@ -673,7 +690,7 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 						    TRUE)) {
 						const JabberData *data =
 								jabber_data_find_remote_by_cid(cid);
-						/* if data is already known, we add write it immediatly */
+						/* if data is already known, we write it immediatly */
 						if (data) {
 							purple_debug_info("jabber",
 								"data is already known\n");
@@ -685,7 +702,7 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 							/* we need to request the smiley (data) */
 							purple_debug_info("jabber",
 								"data is unknown, need to request it\n");
-							jabber_message_send_data_request(js, conv, cid, who,
+							jabber_message_send_data_request(js, conv, cid, from,
 								alt);
 						}
 					}
@@ -704,19 +721,14 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 			}
 		} else if(!strcmp(child->name, "active") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_ACTIVE;
-			jm->typing_style |= JM_TS_JEP_0085;
 		} else if(!strcmp(child->name, "composing") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_COMPOSING;
-			jm->typing_style |= JM_TS_JEP_0085;
 		} else if(!strcmp(child->name, "paused") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_PAUSED;
-			jm->typing_style |= JM_TS_JEP_0085;
 		} else if(!strcmp(child->name, "inactive") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_INACTIVE;
-			jm->typing_style |= JM_TS_JEP_0085;
 		} else if(!strcmp(child->name, "gone") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_GONE;
-			jm->typing_style |= JM_TS_JEP_0085;
 		} else if(!strcmp(child->name, "event") && !strcmp(xmlns,"http://jabber.org/protocol/pubsub#event")) {
 			xmlnode *items;
 			jm->type = JABBER_MESSAGE_EVENT;
@@ -730,13 +742,7 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 			if(timestamp)
 				jm->sent = purple_str_to_time(timestamp, TRUE, NULL, NULL, NULL);
 		} else if(!strcmp(child->name, "x")) {
-			if(!strcmp(xmlns, "jabber:x:event")) {
-				if(xmlnode_get_child(child, "composing")) {
-					if(jm->chat_state == JM_STATE_ACTIVE)
-						jm->chat_state = JM_STATE_COMPOSING;
-					jm->typing_style |= JM_TS_JEP_0022;
-				}
-			} else if(!strcmp(xmlns, "jabber:x:delay")) {
+			if(!strcmp(xmlns, "jabber:x:delay")) {
 				const char *timestamp = xmlnode_get_attrib(child, "stamp");
 				jm->delayed = TRUE;
 				if(timestamp)
@@ -771,6 +777,12 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 			} else {
 				jm->etc = g_list_append(jm->etc, child);
 			}
+		} else if (g_str_equal(child->name, "query")) {
+			const char *node = xmlnode_get_attrib(child, "node");
+			if (purple_strequal(xmlns, "http://jabber.org/protocol/disco#items")
+					&& purple_strequal(node, "http://jabber.org/protocol/commands")) {
+				jabber_adhoc_got_list(js, jm->from, child);
+			}
 		}
 	}
 
@@ -778,6 +790,10 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 		handle_buzz(jm);
 
 	switch(jm->type) {
+		case JABBER_MESSAGE_OTHER:
+			purple_debug(PURPLE_DEBUG_INFO, "jabber",
+					"Received message of unknown type: %s\n", type);
+			/* Fall-through is intentional */
 		case JABBER_MESSAGE_NORMAL:
 		case JABBER_MESSAGE_CHAT:
 			handle_chat(jm);
@@ -797,10 +813,6 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 		case JABBER_MESSAGE_ERROR:
 			handle_error(jm);
 			break;
-		case JABBER_MESSAGE_OTHER:
-			purple_debug(PURPLE_DEBUG_INFO, "jabber",
-					"Received message of unknown type: %s\n", type);
-			break;
 	}
 	jabber_message_free(jm);
 }
@@ -896,11 +908,12 @@ jabber_message_get_smileyfied_xhtml(const gchar *xhtml, const GList *smileys)
 
 static gboolean
 jabber_conv_support_custom_smileys(const PurpleConnection *gc,
-								   const PurpleConversation *conv,
+								   PurpleConversation *conv,
 								   const gchar *who)
 {
 	JabberStream *js = (JabberStream *) gc->proto_data;
 	JabberBuddy *jb;
+	JabberChat *chat;
 
 	if (!js) {
 		purple_debug_error("jabber",
@@ -909,7 +922,6 @@ jabber_conv_support_custom_smileys(const PurpleConnection *gc,
 	}
 
 	switch (purple_conversation_get_type(conv)) {
-		/* for the time being, we will not support custom smileys in MUCs */
 		case PURPLE_CONV_TYPE_IM:
 			jb = jabber_buddy_find(js, who, FALSE);
 			if (jb) {
@@ -918,12 +930,76 @@ jabber_conv_support_custom_smileys(const PurpleConnection *gc,
 				return FALSE;
 			}
 			break;
+		case PURPLE_CONV_TYPE_CHAT:
+			chat = jabber_chat_find_by_conv(conv);
+			if (chat) {
+				/* do not attempt to send custom smileys in a MUC with more than
+				 10 people, to avoid getting too many BoB requests */
+				return jabber_chat_get_num_participants(chat) <= 10 &&
+					jabber_chat_all_participants_have_capability(chat,
+						XEP_0231_NAMESPACE);
+			} else {
+				return FALSE;
+			}
+			break;
 		default:
 			return FALSE;
 			break;
 	}
 }
 
+static char *
+jabber_message_smileyfy_xhtml(JabberMessage *jm, const char *xhtml)
+{
+	PurpleAccount *account = purple_connection_get_account(jm->js->gc);
+	PurpleConversation *conv =
+		purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, jm->to,
+			account);
+
+	if (jabber_conv_support_custom_smileys(jm->js->gc, conv, jm->to)) {
+		GList *found_smileys = jabber_message_xhtml_find_smileys(xhtml);
+
+		if (found_smileys) {
+			gchar *smileyfied_xhtml = NULL;
+			const GList *iterator;
+
+			for (iterator = found_smileys; iterator ;
+				iterator = g_list_next(iterator)) {
+				const PurpleSmiley *smiley =
+						(PurpleSmiley *) iterator->data;
+				const gchar *shortcut = purple_smiley_get_shortcut(smiley);
+				const JabberData *data =
+					jabber_data_find_local_by_alt(shortcut);
+
+				/* the object has not been sent before */
+				if (!data) {
+					PurpleStoredImage *image =
+							purple_smiley_get_stored_image(smiley);
+					const gchar *ext = purple_imgstore_get_extension(image);
+					JabberStream *js = jm->js;
+
+					JabberData *new_data =
+						jabber_data_create_from_data(purple_imgstore_get_data(image),
+							purple_imgstore_get_size(image),
+							jabber_message_get_mimetype_from_ext(ext), js);
+					purple_debug_info("jabber",
+						"cache local smiley alt = %s, cid = %s\n",
+						shortcut, jabber_data_get_cid(new_data));
+					jabber_data_associate_local(new_data, shortcut);
+				}
+			}
+
+			smileyfied_xhtml =
+				jabber_message_get_smileyfied_xhtml(xhtml, found_smileys);
+			g_list_free(found_smileys);
+
+			return smileyfied_xhtml;
+		}
+	}
+
+	return NULL;
+}
+
 void jabber_message_send(JabberMessage *jm)
 {
 	xmlnode *message, *child;
@@ -967,36 +1043,30 @@ void jabber_message_send(JabberMessage *jm)
 		xmlnode_insert_data(child, jm->thread_id, -1);
 	}
 
-	if(JM_TS_JEP_0022 == (jm->typing_style & JM_TS_JEP_0022)) {
-		child = xmlnode_new_child(message, "x");
-		xmlnode_set_namespace(child, "jabber:x:event");
-		if(jm->chat_state == JM_STATE_COMPOSING || jm->body)
-			xmlnode_new_child(child, "composing");
-	}
-
-	if(JM_TS_JEP_0085 == (jm->typing_style & JM_TS_JEP_0085)) {
-		child = NULL;
-		switch(jm->chat_state)
-		{
-			case JM_STATE_ACTIVE:
-				child = xmlnode_new_child(message, "active");
-				break;
-			case JM_STATE_COMPOSING:
-				child = xmlnode_new_child(message, "composing");
-				break;
-			case JM_STATE_PAUSED:
-				child = xmlnode_new_child(message, "paused");
-				break;
-			case JM_STATE_INACTIVE:
-				child = xmlnode_new_child(message, "inactive");
-				break;
-			case JM_STATE_GONE:
-				child = xmlnode_new_child(message, "gone");
-				break;
-		}
-		if(child)
-			xmlnode_set_namespace(child, "http://jabber.org/protocol/chatstates");
+	child = NULL;
+	switch(jm->chat_state)
+	{
+		case JM_STATE_ACTIVE:
+			child = xmlnode_new_child(message, "active");
+			break;
+		case JM_STATE_COMPOSING:
+			child = xmlnode_new_child(message, "composing");
+			break;
+		case JM_STATE_PAUSED:
+			child = xmlnode_new_child(message, "paused");
+			break;
+		case JM_STATE_INACTIVE:
+			child = xmlnode_new_child(message, "inactive");
+			break;
+		case JM_STATE_GONE:
+			child = xmlnode_new_child(message, "gone");
+			break;
+		case JM_STATE_NONE:
+			/* yep, nothing */
+			break;
 	}
+	if(child)
+		xmlnode_set_namespace(child, "http://jabber.org/protocol/chatstates");
 
 	if(jm->subject) {
 		child = xmlnode_new_child(message, "subject");
@@ -1009,56 +1079,7 @@ void jabber_message_send(JabberMessage *jm)
 	}
 
 	if(jm->xhtml) {
-		PurpleAccount *account = purple_connection_get_account(jm->js->gc);
-		PurpleConversation *conv =
-			purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, jm->to,
-				account);
-
-		if (jabber_conv_support_custom_smileys(jm->js->gc, conv, jm->to)) {
-			GList *found_smileys = jabber_message_xhtml_find_smileys(jm->xhtml);
-
-			if (found_smileys) {
-				gchar *smileyfied_xhtml = NULL;
-				const GList *iterator;
-
-				for (iterator = found_smileys; iterator ;
-					iterator = g_list_next(iterator)) {
-					const PurpleSmiley *smiley =
-							(PurpleSmiley *) iterator->data;
-					const gchar *shortcut = purple_smiley_get_shortcut(smiley);
-					const JabberData *data =
-						jabber_data_find_local_by_alt(shortcut);
-
-					/* the object has not been sent before */
-					if (!data) {
-						PurpleStoredImage *image =
-								purple_smiley_get_stored_image(smiley);
-						const gchar *ext = purple_imgstore_get_extension(image);
-						JabberStream *js = jm->js;
-
-						JabberData *new_data =
-							jabber_data_create_from_data(purple_imgstore_get_data(image),
-								purple_imgstore_get_size(image),
-								jabber_message_get_mimetype_from_ext(ext), js);
-						purple_debug_info("jabber",
-							"cache local smiley alt = %s, cid = %s\n",
-							shortcut, jabber_data_get_cid(new_data));
-						jabber_data_associate_local(new_data, shortcut);
-					}
-				}
-
-				smileyfied_xhtml =
-					jabber_message_get_smileyfied_xhtml(jm->xhtml, found_smileys);
-				child = xmlnode_from_str(smileyfied_xhtml, -1);
-				g_free(smileyfied_xhtml);
-				g_list_free(found_smileys);
-			} else {
-				child = xmlnode_from_str(jm->xhtml, -1);
-			}
-		} else {
-			child = xmlnode_from_str(jm->xhtml, -1);
-		}
-		if(child) {
+		if ((child = xmlnode_from_str(jm->xhtml, -1))) {
 			xmlnode_insert_child(message, child);
 		} else {
 			purple_debug(PURPLE_DEBUG_ERROR, "jabber",
@@ -1072,14 +1093,51 @@ void jabber_message_send(JabberMessage *jm)
 	xmlnode_free(message);
 }
 
+/*
+ * Compare the XHTML and plain strings passed in for "equality". Any HTML markup
+ * other than <br/> (matches a newline) in the XHTML will cause this to return
+ * FALSE.
+ */
+static gboolean
+jabber_xhtml_plain_equal(const char *xhtml_escaped,
+                         const char *plain)
+{
+	int i = 0;
+	int j = 0;
+	gboolean ret;
+	char *xhtml = purple_unescape_html(xhtml_escaped);
+
+	while (xhtml[i] && plain[j]) {
+		if (xhtml[i] == plain[j]) {
+			i += 1;
+			j += 1;
+			continue;
+		}
+
+		if (plain[j] == '\n' && !strncmp(xhtml+i, "<br/>", 5)) {
+			i += 5;
+			j += 1;
+			continue;
+		}
+
+		g_free(xhtml);
+		return FALSE;
+	}
+
+	/* Are we at the end of both strings? */
+	ret = (xhtml[i] == plain[j]) && (xhtml[i] == '\0');
+	g_free(xhtml);
+	return ret;
+}
+
 int jabber_message_send_im(PurpleConnection *gc, const char *who, const char *msg,
 		PurpleMessageFlags flags)
 {
 	JabberMessage *jm;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
-	char *buf;
 	char *xhtml;
+	char *tmp;
 	char *resource;
 
 	if(!who || !msg)
@@ -1098,31 +1156,39 @@ int jabber_message_send_im(PurpleConnection *gc, const char *who, const char *ms
 	jm->chat_state = JM_STATE_ACTIVE;
 	jm->to = g_strdup(who);
 	jm->id = jabber_get_next_id(jm->js);
-	jm->chat_state = JM_STATE_ACTIVE;
 
 	if(jbr) {
 		if(jbr->thread_id)
 			jm->thread_id = jbr->thread_id;
 
-		if(jbr->chat_states != JABBER_CHAT_STATES_UNSUPPORTED) {
-			jm->typing_style |= JM_TS_JEP_0085;
+		if (jbr->chat_states == JABBER_CHAT_STATES_UNSUPPORTED)
+			jm->chat_state = JM_STATE_NONE;
+		else {
 			/* if(JABBER_CHAT_STATES_UNKNOWN == jbr->chat_states)
 			   jbr->chat_states = JABBER_CHAT_STATES_UNSUPPORTED; */
 		}
-
-		if(jbr->chat_states != JABBER_CHAT_STATES_SUPPORTED)
-			jm->typing_style |= JM_TS_JEP_0022;
 	}
 
-	buf = g_strdup_printf("<html xmlns='http://jabber.org/protocol/xhtml-im'><body xmlns='http://www.w3.org/1999/xhtml'>%s</body></html>", msg);
+	tmp = purple_utf8_strip_unprintables(msg);
+	purple_markup_html_to_xhtml(tmp, &xhtml, &jm->body);
+	g_free(tmp);
+	tmp = jabber_message_smileyfy_xhtml(jm, xhtml);
+	if (tmp) {
+		g_free(xhtml);
+		xhtml = tmp;
+	}
 
-	purple_markup_html_to_xhtml(buf, &xhtml, &jm->body);
-	g_free(buf);
+	/*
+	 * For backward compatibility with user expectations or for those not on
+	 * the user's roster, allow sending XHTML-IM markup.
+	 */
+	if (!jbr || !jbr->caps.info ||
+			jabber_resource_has_capability(jbr, "http://jabber.org/protocol/xhtml-im")) {
+		if (!jabber_xhtml_plain_equal(xhtml, jm->body))
+			jm->xhtml = g_strdup_printf("<html xmlns='http://jabber.org/protocol/xhtml-im'><body xmlns='http://www.w3.org/1999/xhtml'>%s</body></html>", xhtml);
+	}
 
-	if(!jbr || jbr->capabilities & JABBER_CAP_XHTML)
-		jm->xhtml = xhtml;
-	else
-		g_free(xhtml);
+	g_free(xhtml);
 
 	jabber_message_send(jm);
 	jabber_message_free(jm);
@@ -1134,7 +1200,8 @@ int jabber_message_send_chat(PurpleConnection *gc, int id, const char *msg, Purp
 	JabberChat *chat;
 	JabberMessage *jm;
 	JabberStream *js;
-	char *buf;
+	char *xhtml;
+	char *tmp;
 
 	if(!msg || !gc)
 		return 0;
@@ -1151,15 +1218,20 @@ int jabber_message_send_chat(PurpleConnection *gc, int id, const char *msg, Purp
 	jm->to = g_strdup_printf("%s@%s", chat->room, chat->server);
 	jm->id = jabber_get_next_id(jm->js);
 
-	buf = g_strdup_printf("<html xmlns='http://jabber.org/protocol/xhtml-im'><body xmlns='http://www.w3.org/1999/xhtml'>%s</body></html>", msg);
-	purple_markup_html_to_xhtml(buf, &jm->xhtml, &jm->body);
-	g_free(buf);
-
-	if(!chat->xhtml) {
-		g_free(jm->xhtml);
-		jm->xhtml = NULL;
+	tmp = purple_utf8_strip_unprintables(msg);
+	purple_markup_html_to_xhtml(msg, &xhtml, &jm->body);
+	g_free(tmp);
+	tmp = jabber_message_smileyfy_xhtml(jm, xhtml);
+	if (tmp) {
+		g_free(xhtml);
+		xhtml = tmp;
 	}
 
+	if (chat->xhtml && !jabber_xhtml_plain_equal(xhtml, jm->body))
+		jm->xhtml = g_strdup_printf("<html xmlns='http://jabber.org/protocol/xhtml-im'><body xmlns='http://www.w3.org/1999/xhtml'>%s</body></html>", xhtml);
+
+	g_free(xhtml);
+
 	jabber_message_send(jm);
 	jabber_message_free(jm);
 
@@ -1178,7 +1250,7 @@ unsigned int jabber_send_typing(PurpleConnection *gc, const char *who, PurpleTyp
 
 	g_free(resource);
 
-	if(!jbr || !((jbr->capabilities & JABBER_CAP_COMPOSING) || (jbr->chat_states != JABBER_CHAT_STATES_UNSUPPORTED)))
+	if (!jbr || (jbr->chat_states == JABBER_CHAT_STATES_UNSUPPORTED))
 		return 0;
 
 	/* TODO: figure out threading */
@@ -1195,14 +1267,8 @@ unsigned int jabber_send_typing(PurpleConnection *gc, const char *who, PurpleTyp
 	else
 		jm->chat_state = JM_STATE_ACTIVE;
 
-	if(jbr->chat_states != JABBER_CHAT_STATES_UNSUPPORTED) {
-		jm->typing_style |= JM_TS_JEP_0085;
-		/* if(JABBER_CHAT_STATES_UNKNOWN == jbr->chat_states)
-			jbr->chat_states = JABBER_CHAT_STATES_UNSUPPORTED; */
-	}
-
-	if(jbr->chat_states != JABBER_CHAT_STATES_SUPPORTED)
-		jm->typing_style |= JM_TS_JEP_0022;
+	/* if(JABBER_CHAT_STATES_UNKNOWN == jbr->chat_states)
+		jbr->chat_states = JABBER_CHAT_STATES_UNSUPPORTED; */
 
 	jabber_message_send(jm);
 	jabber_message_free(jm);
@@ -1210,29 +1276,11 @@ unsigned int jabber_send_typing(PurpleConnection *gc, const char *who, PurpleTyp
 	return 0;
 }
 
-void jabber_message_conv_closed(JabberStream *js, const char *who)
-{
-	JabberMessage *jm;
-	if (!purple_prefs_get_bool("/purple/conversations/im/send_typing"))
-		return;
-
-	jm  = g_new0(JabberMessage, 1);
-	jm->js = js;
-	jm->type = JABBER_MESSAGE_CHAT;
-	jm->to = g_strdup(who);
-	jm->id = jabber_get_next_id(jm->js);
-	jm->typing_style = JM_TS_JEP_0085;
-	jm->chat_state = JM_STATE_GONE;
-	jabber_message_send(jm);
-	jabber_message_free(jm);
-}
-
-gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *shortname, const gchar *namespace) {
+gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *namespace) {
 	return js->allowBuzz;
 }
 
-gboolean jabber_custom_smileys_isenabled(JabberStream *js, const gchar *shortname,
-										 const gchar *namespace)
+gboolean jabber_custom_smileys_isenabled(JabberStream *js, const gchar *namespace)
 {
 	const PurpleConnection *gc = js->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);
diff --git a/libpurple/protocols/jabber/message.h b/libpurple/protocols/jabber/message.h
index b14aa992ef..34669cab32 100644
--- a/libpurple/protocols/jabber/message.h
+++ b/libpurple/protocols/jabber/message.h
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_MESSAGE_H_
-#define _PURPLE_JABBER_MESSAGE_H_
+#ifndef PURPLE_JABBER_MESSAGE_H_
+#define PURPLE_JABBER_MESSAGE_H_
 
 #include "buddy.h"
 #include "jabber.h"
@@ -53,11 +53,7 @@ typedef struct _JabberMessage {
 	char *error;
 	char *thread_id;
 	enum {
-		JM_TS_NONE = 0,
-		JM_TS_JEP_0022 = 0x1,
-		JM_TS_JEP_0085 = 0x2
-	} typing_style;
-	enum {
+		JM_STATE_NONE,
 		JM_STATE_ACTIVE,
 		JM_STATE_COMPOSING,
 		JM_STATE_PAUSED,
@@ -78,11 +74,9 @@ int jabber_message_send_im(PurpleConnection *gc, const char *who, const char *ms
 int jabber_message_send_chat(PurpleConnection *gc, int id, const char *message, PurpleMessageFlags flags);
 
 unsigned int jabber_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state);
-void jabber_message_conv_closed(JabberStream *js, const char *who);
 
-gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *shortname, const gchar *namespace);
+gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *namespace);
 
-gboolean jabber_custom_smileys_isenabled(JabberStream *js, const gchar *shortname,
-										 const gchar *namespace);
+gboolean jabber_custom_smileys_isenabled(JabberStream *js, const const gchar *namespace);
 
-#endif /* _PURPLE_JABBER_MESSAGE_H_ */
+#endif /* PURPLE_JABBER_MESSAGE_H_ */
diff --git a/libpurple/protocols/jabber/oob.c b/libpurple/protocols/jabber/oob.c
index e43bf5c3ec..b6a3444b0b 100644
--- a/libpurple/protocols/jabber/oob.c
+++ b/libpurple/protocols/jabber/oob.c
@@ -187,18 +187,18 @@ static void jabber_oob_xfer_recv_canceled(PurpleXfer *xfer) {
 	jabber_oob_xfer_recv_error(xfer, "404");
 }
 
-void jabber_oob_parse(JabberStream *js, xmlnode *packet) {
+void jabber_oob_parse(JabberStream *js, const char *from, JabberIqType type,
+                      const char *id, xmlnode *querynode) {
 	JabberOOBXfer *jox;
 	PurpleXfer *xfer;
 	char *filename;
 	char *url;
-	const char *type;
-	xmlnode *querynode, *urlnode;
+	xmlnode *urlnode;
 
-	if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "set"))
+	if(type != JABBER_IQ_SET)
 		return;
 
-	if(!(querynode = xmlnode_get_child(packet, "query")))
+	if(!from)
 		return;
 
 	if(!(urlnode = xmlnode_get_child(querynode, "url")))
@@ -207,14 +207,16 @@ void jabber_oob_parse(JabberStream *js, xmlnode *packet) {
 	url = xmlnode_get_data(urlnode);
 
 	jox = g_new0(JabberOOBXfer, 1);
-	purple_url_parse(url, &jox->address, &jox->port, &jox->page, NULL, NULL);
+	if (!purple_url_parse(url, &jox->address, &jox->port, &jox->page, NULL, NULL)) {
+		g_free(url);
+		return;
+	}
 	g_free(url);
 	jox->js = js;
 	jox->headers = g_string_new("");
-	jox->iq_id = g_strdup(xmlnode_get_attrib(packet, "id"));
+	jox->iq_id = g_strdup(id);
 
-	xfer = purple_xfer_new(js->gc->account, PURPLE_XFER_RECEIVE,
-			xmlnode_get_attrib(packet, "from"));
+	xfer = purple_xfer_new(js->gc->account, PURPLE_XFER_RECEIVE, from);
 	if (xfer)
 	{
 		xfer->data = jox;
diff --git a/libpurple/protocols/jabber/oob.h b/libpurple/protocols/jabber/oob.h
index 3a669003dd..c1103e6b12 100644
--- a/libpurple/protocols/jabber/oob.h
+++ b/libpurple/protocols/jabber/oob.h
@@ -1,5 +1,5 @@
 /**
- * @file jutil.h utility functions
+ * @file oob.h out-of-band transfer functions
  *
  * purple
  *
@@ -19,9 +19,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_OOB_H_
-#define _PURPLE_JABBER_OOB_H_
+#ifndef PURPLE_JABBER_OOB_H_
+#define PURPLE_JABBER_OOB_H_
 
-void jabber_oob_parse(JabberStream *js, xmlnode *packet);
+#include "jabber.h"
 
-#endif /* _PURPLE_JABBER_OOB_H_ */
+void jabber_oob_parse(JabberStream *js, const char *from, JabberIqType type,
+                      const char *id, xmlnode *querynode);
+
+#endif /* PURPLE_JABBER_OOB_H_ */
diff --git a/libpurple/protocols/jabber/parser.c b/libpurple/protocols/jabber/parser.c
index 4e602768ce..3cc5e0e2c3 100644
--- a/libpurple/protocols/jabber/parser.c
+++ b/libpurple/protocols/jabber/parser.c
@@ -86,6 +86,8 @@ jabber_parser_element_start_libxml(void *user_data,
 			}
 		}
 		for(i=0; i < nb_attributes * 5; i+=5) {
+			const char *name = (const char *)attributes[i];
+			const char *prefix = (const char *)attributes[i+1];
 			const char *attrib_ns = (const char *)attributes[i+2];
 			char *txt;
 			int attrib_len = attributes[i+4] - attributes[i+3];
@@ -97,7 +99,7 @@ jabber_parser_element_start_libxml(void *user_data,
 			txt = attrib;
 			attrib = purple_unescape_html(txt);
 			g_free(txt);
-			xmlnode_set_attrib_with_namespace(node, (const char*) attributes[i], attrib_ns, attrib);
+			xmlnode_set_attrib_full(node, name, attrib_ns, prefix, attrib);
 			g_free(attrib);
 		}
 
@@ -224,8 +226,17 @@ void jabber_parser_process(JabberStream *js, const char *buf, int len)
 		xmlParseChunk(js->context, "", 0, 0);
 	} else if ((ret = xmlParseChunk(js->context, buf, len, 0)) != XML_ERR_OK) {
 		xmlError *err = xmlCtxtGetLastError(js->context);
+		/*
+		 * libxml2 uses a global setting to determine whether or not to store
+		 * warnings.  Other libraries may set this, which causes err to be
+		 * NULL. See #8136 for details.
+		 */
+		xmlErrorLevel level = XML_ERR_WARNING;
+
+		if (err)
+			level = err->level;
 
-		switch (err->level) {
+		switch (level) {
 			case XML_ERR_NONE:
 				purple_debug_info("jabber", "xmlParseChunk returned info %i\n", ret);
 				break;
diff --git a/libpurple/protocols/jabber/parser.h b/libpurple/protocols/jabber/parser.h
index cfc30e55eb..b08f0c950e 100644
--- a/libpurple/protocols/jabber/parser.h
+++ b/libpurple/protocols/jabber/parser.h
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_PARSER_H_
-#define _PURPLE_JABBER_PARSER_H_
+#ifndef PURPLE_JABBER_PARSER_H_
+#define PURPLE_JABBER_PARSER_H_
 
 #include "jabber.h"
 
@@ -28,4 +28,4 @@ void jabber_parser_setup(JabberStream *js);
 void jabber_parser_free(JabberStream *js);
 void jabber_parser_process(JabberStream *js, const char *buf, int len);
 
-#endif /* _PURPLE_JABBER_PARSER_H_ */
+#endif /* PURPLE_JABBER_PARSER_H_ */
diff --git a/libpurple/protocols/jabber/pep.c b/libpurple/protocols/jabber/pep.c
index 843e69b427..bdc91815a2 100644
--- a/libpurple/protocols/jabber/pep.c
+++ b/libpurple/protocols/jabber/pep.c
@@ -24,8 +24,10 @@
 #include "pep.h"
 #include "iq.h"
 #include <string.h>
+#include "useravatar.h"
 #include "usermood.h"
 #include "usernick.h"
+#include "usertune.h"
 
 static GHashTable *pep_handlers = NULL;
 
@@ -34,32 +36,49 @@ void jabber_pep_init(void) {
 		pep_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
 		/* register PEP handlers */
+		jabber_avatar_init();
 		jabber_mood_init();
+		jabber_tune_init();
 		jabber_nick_init();
 	}
 }
 
+void jabber_pep_uninit(void) {
+	/* any PEP handlers that need to clean things up go here. The standard
+	 * cleanup of removing the handler and feature are handled here and by
+	 * jabber_features_destroy() in jabber.c
+	 */
+	g_hash_table_destroy(pep_handlers);
+	pep_handlers = NULL;
+}
+
 void jabber_pep_init_actions(GList **m) {
 	/* register the PEP-specific actions */
 	jabber_mood_init_action(m);
 	jabber_nick_init_action(m);
 }
 
-void jabber_pep_register_handler(const char *shortname, const char *xmlns, JabberPEPHandler handlerfunc) {
+void jabber_pep_register_handler(const char *xmlns, JabberPEPHandler handlerfunc) {
 	gchar *notifyns = g_strdup_printf("%s+notify", xmlns);
-	jabber_add_feature(shortname, notifyns, NULL); /* receiving PEPs is always supported */
+	jabber_add_feature(notifyns, NULL); /* receiving PEPs is always supported */
 	g_free(notifyns);
 	g_hash_table_replace(pep_handlers, g_strdup(xmlns), handlerfunc);
 }
 
-static void do_pep_iq_request_item_callback(JabberStream *js, xmlnode *packet, gpointer data) {
-	const char *from = xmlnode_get_attrib(packet,"from");
-	xmlnode *pubsub = xmlnode_get_child_with_namespace(packet,"pubsub","http://jabber.org/protocol/pubsub");
+static void
+do_pep_iq_request_item_callback(JabberStream *js, const char *from,
+                                JabberIqType type, const char *id,
+                                xmlnode *packet, gpointer data)
+{
+	xmlnode *pubsub;
 	xmlnode *items = NULL;
 	JabberPEPHandler *cb = data;
 
-	if(pubsub)
-		items = xmlnode_get_child(pubsub, "items");
+	if (type == JABBER_IQ_RESULT) {
+		pubsub = xmlnode_get_child_with_namespace(packet, "pubsub", "http://jabber.org/protocol/pubsub");
+		if(pubsub)
+			items = xmlnode_get_child(pubsub, "items");
+	}
 
 	cb(js, from, items);
 }
@@ -85,7 +104,7 @@ void jabber_pep_request_item(JabberStream *js, const char *to, const char *node,
 	jabber_iq_send(iq);
 }
 
-gboolean jabber_pep_namespace_only_when_pep_enabled_cb(JabberStream *js, const gchar *shortname, const gchar *namespace) {
+gboolean jabber_pep_namespace_only_when_pep_enabled_cb(JabberStream *js, const gchar *namespace) {
 	return js->pep;
 }
 
@@ -93,7 +112,12 @@ void jabber_handle_event(JabberMessage *jm) {
 	/* this may be called even when the own server doesn't support pep! */
 	JabberPEPHandler *jph;
 	GList *itemslist;
-	char *jid = jabber_get_bare_jid(jm->from);
+	char *jid;
+
+	if (jm->type != JABBER_MESSAGE_EVENT)
+		return;
+
+	jid = jabber_get_bare_jid(jm->from);
 
 	for(itemslist = jm->eventitems; itemslist; itemslist = itemslist->next) {
 		xmlnode *items = (xmlnode*)itemslist->data;
@@ -107,6 +131,25 @@ void jabber_handle_event(JabberMessage *jm) {
 	g_free(jid);
 }
 
+void jabber_pep_delete_node(JabberStream *js, const gchar *node)
+{
+	JabberIq *iq;
+	xmlnode *pubsub, *del;
+
+	g_return_if_fail(node != NULL);
+	g_return_if_fail(js->pep);
+
+	iq = jabber_iq_new(js, JABBER_IQ_SET);
+
+	pubsub = xmlnode_new_child(iq->node, "pubsub");
+	xmlnode_set_namespace(pubsub, "http://jabber.org/protocol/pubsub#owner");
+
+	del = xmlnode_new_child(pubsub, "delete");
+	xmlnode_set_attrib(del, "node", node);
+
+	jabber_iq_send(iq);
+}
+
 void jabber_pep_publish(JabberStream *js, xmlnode *publish) {
 	JabberIq *iq;
 	xmlnode *pubsub;
diff --git a/libpurple/protocols/jabber/pep.h b/libpurple/protocols/jabber/pep.h
index f1e1aca059..5be64754e9 100644
--- a/libpurple/protocols/jabber/pep.h
+++ b/libpurple/protocols/jabber/pep.h
@@ -19,14 +19,15 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_PEP_H_
-#define _PURPLE_JABBER_PEP_H_
+#ifndef PURPLE_JABBER_PEP_H_
+#define PURPLE_JABBER_PEP_H_
 
 #include "jabber.h"
 #include "message.h"
 #include "buddy.h"
 
 void jabber_pep_init(void);
+void jabber_pep_uninit(void);
 
 void jabber_pep_init_actions(GList **m);
 
@@ -42,11 +43,10 @@ typedef void (JabberPEPHandler)(JabberStream *js, const char *from, xmlnode *ite
  * Registers a callback for PEP events. Also automatically announces this receiving capability via disco#info.
  * Don't forget to use jabber_add_feature when supporting the sending of PEP events of this type.
  *
- * @parameter shortname		A short name for this feature for XEP-0115. It has no semantic meaning, it just has to be unique.
- * @parameter xmlns		The namespace for this event
+ * @parameter xmlns			The namespace for this event
  * @parameter handlerfunc	The callback to be used when receiving an event with this namespace
  */
-void jabber_pep_register_handler(const char *shortname, const char *xmlns, JabberPEPHandler handlerfunc);
+void jabber_pep_register_handler(const char *xmlns, JabberPEPHandler handlerfunc);
 
 /*
  * Request a specific item from another PEP node.
@@ -64,16 +64,20 @@ void jabber_pep_request_item(JabberStream *js, const char *to, const char *node,
 /*
  * Default callback that can be used for namespaces which should only be enabled when PEP is supported
  *
- * @parameter js	The JabberStream struct for this connection
- * @parameter shortname	The namespace's shortname (for caps), ignored.
+ * @parameter js		The JabberStream struct for this connection
  * @parameter namespace The namespace that's queried, ignored.
  *
  * @returns TRUE when PEP is enabled, FALSE otherwise
  */
-gboolean jabber_pep_namespace_only_when_pep_enabled_cb(JabberStream *js, const gchar *shortname, const gchar *namespace);
+gboolean jabber_pep_namespace_only_when_pep_enabled_cb(JabberStream *js, const gchar *namespace);
 
 void jabber_handle_event(JabberMessage *jm);
 
+/**
+ * Delete the specified PEP node.
+ */
+void jabber_pep_delete_node(JabberStream *js, const gchar *node);
+
 /*
  * Publishes PEP item(s)
  *
@@ -82,4 +86,4 @@ void jabber_handle_event(JabberMessage *jm);
  */
 void jabber_pep_publish(JabberStream *js, xmlnode *publish);
 
-#endif /* _PURPLE_JABBER_PEP_H_ */
+#endif /* PURPLE_JABBER_PEP_H_ */
diff --git a/libpurple/protocols/jabber/ping.c b/libpurple/protocols/jabber/ping.c
index 4339c27dd1..4fabbe575d 100644
--- a/libpurple/protocols/jabber/ping.c
+++ b/libpurple/protocols/jabber/ping.c
@@ -23,50 +23,69 @@
 #include "internal.h"
 
 #include "debug.h"
-#include "xmlnode.h"
 
 #include "jabber.h"
 #include "ping.h"
 #include "iq.h"
 
-void
-jabber_ping_parse(JabberStream *js, xmlnode *packet)
+static void jabber_keepalive_pong_cb(JabberStream *js, const char *from,
+                                     JabberIqType type, const char *id,
+                                     xmlnode *packet, gpointer data)
 {
-	JabberIq *iq;
-
-	purple_debug_info("jabber", "jabber_ping_parse\n");
-
-	iq = jabber_iq_new(js, JABBER_IQ_RESULT);
+	if (js->keepalive_timeout != 0) {
+		purple_timeout_remove(js->keepalive_timeout);
+		js->keepalive_timeout = 0;
+	}
+}
 
-	xmlnode_set_attrib(iq->node, "to", xmlnode_get_attrib(packet, "from") );
+void
+jabber_ping_parse(JabberStream *js, const char *from,
+                  JabberIqType type, const char *id, xmlnode *ping)
+{
+	if (type == JABBER_IQ_GET) {
+		JabberIq *iq = jabber_iq_new(js, JABBER_IQ_RESULT);
 
-	jabber_iq_set_id(iq, xmlnode_get_attrib(packet, "id"));
+		if (from)
+			xmlnode_set_attrib(iq->node, "to", from);
+		xmlnode_set_attrib(iq->node, "id", id);
 
-	jabber_iq_send(iq);
+		jabber_iq_send(iq);
+	} else if (type == JABBER_IQ_SET) {
+		/* XXX: error */
+	}
 }
 
-static void jabber_ping_result_cb(JabberStream *js, xmlnode *packet,
-		gpointer data)
+static void jabber_ping_result_cb(JabberStream *js, const char *from,
+                                  JabberIqType type, const char *id,
+                                  xmlnode *packet, gpointer data)
 {
-	const char *type = xmlnode_get_attrib(packet, "type");
-
-	purple_debug_info("jabber", "jabber_ping_result_cb\n");
-	if(type && !strcmp(type, "result")) {
+	if (type == JABBER_IQ_RESULT)
 		purple_debug_info("jabber", "PONG!\n");
-	} else {
-		purple_debug_info("jabber", "(not supported)\n");
-	}
+	else
+		purple_debug_info("jabber", "ping not supported\n");
 }
 
-gboolean jabber_ping_jid(PurpleConversation *conv, const char *jid)
+void jabber_keepalive_ping(JabberStream *js)
 {
 	JabberIq *iq;
 	xmlnode *ping;
 
-	purple_debug_info("jabber", "jabber_ping_jid\n");
+	iq = jabber_iq_new(js, JABBER_IQ_GET);
+	ping = xmlnode_new_child(iq->node, "ping");
+	xmlnode_set_namespace(ping, "urn:xmpp:ping");
 
-	iq = jabber_iq_new(conv->account->gc->proto_data, JABBER_IQ_GET);
-	xmlnode_set_attrib(iq->node, "to", jid);
+	jabber_iq_set_callback(iq, jabber_keepalive_pong_cb, NULL);
+	jabber_iq_send(iq);
+}
+
+gboolean jabber_ping_jid(JabberStream *js, const char *jid)
+{
+	JabberIq *iq;
+	xmlnode *ping;
+
+	iq = jabber_iq_new(js, JABBER_IQ_GET);
+	if (jid)
+		xmlnode_set_attrib(iq->node, "to", jid);
 
 	ping = xmlnode_new_child(iq->node, "ping");
 	xmlnode_set_namespace(ping, "urn:xmpp:ping");
@@ -74,7 +93,5 @@ gboolean jabber_ping_jid(PurpleConversation *conv, const char *jid)
 	jabber_iq_set_callback(iq, jabber_ping_result_cb, NULL);
 	jabber_iq_send(iq);
 
-
-
 	return TRUE;
 }
diff --git a/libpurple/protocols/jabber/ping.h b/libpurple/protocols/jabber/ping.h
index 377452f56c..f34a5a4be5 100644
--- a/libpurple/protocols/jabber/ping.h
+++ b/libpurple/protocols/jabber/ping.h
@@ -1,5 +1,5 @@
 /**
- * @file ping.h utility functions
+ * @file ping.h ping functions
  *
  * purple
  *
@@ -19,17 +19,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _PURPLE_JABBER_PING_H_
-#define _PURPLE_JABBER_PING_H_
+#ifndef PURPLE_JABBER_PING_H_
+#define PURPLE_JABBER_PING_H_
 
 #include "jabber.h"
-#include "conversation.h"
+#include "iq.h"
+#include "xmlnode.h"
 
-void jabber_ping_parse(JabberStream *js,
-						xmlnode *packet);
+void jabber_ping_parse(JabberStream *js, const char *from,
+                       JabberIqType, const char *id, xmlnode *child);
+gboolean jabber_ping_jid(JabberStream *js, const char *jid);
+void jabber_keepalive_ping(JabberStream *js);
 
-
-gboolean jabber_ping_jid(PurpleConversation *conv, const char *jid);
-
-
-#endif /* _PURPLE_JABBER_PING_H_ */
+#endif /* PURPLE_JABBER_PING_H_ */
diff --git a/libpurple/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c
index d22e6a0726..88e4a6cad5 100644
--- a/libpurple/protocols/jabber/presence.c
+++ b/libpurple/protocols/jabber/presence.c
@@ -59,45 +59,79 @@ static void chats_send_presence_foreach(gpointer key, gpointer val,
 	g_free(chat_full_jid);
 }
 
-void jabber_presence_fake_to_self(JabberStream *js, const PurpleStatus *gstatus) {
-	char *my_base_jid;
+void jabber_presence_fake_to_self(JabberStream *js, PurpleStatus *status)
+{
+	PurpleAccount *account;
+	PurplePresence *presence;
+	const char *username;
 
-	if(!js->user)
-		return;
+	g_return_if_fail(js->user != NULL);
 
-	my_base_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
-	if(purple_find_buddy(js->gc->account, my_base_jid)) {
-		JabberBuddy *jb;
+	account = purple_connection_get_account(js->gc);
+	username = purple_connection_get_display_name(js->gc);
+	presence = purple_account_get_presence(account);
+	if (status == NULL)
+		status = purple_presence_get_active_status(presence);
+
+	if (purple_find_buddy(account, username)) {
+		JabberBuddy *jb = jabber_buddy_find(js, username, TRUE);
 		JabberBuddyResource *jbr;
-		if((jb = jabber_buddy_find(js, my_base_jid, TRUE))) {
-			JabberBuddyState state;
-			char *msg;
-			int priority;
+		JabberBuddyState state;
+		char *msg;
+		int priority;
 
-			purple_status_to_jabber(gstatus, &state, &msg, &priority);
+		g_return_if_fail(jb != NULL);
 
-			if (state == JABBER_BUDDY_STATE_UNAVAILABLE || state == JABBER_BUDDY_STATE_UNKNOWN) {
-				jabber_buddy_remove_resource(jb, js->user->resource);
-			} else {
-				jabber_buddy_track_resource(jb, js->user->resource, priority, state, msg);
-			}
-			if((jbr = jabber_buddy_find_resource(jb, NULL))) {
-				purple_prpl_got_user_status(js->gc->account, my_base_jid, jabber_buddy_state_get_status_id(jbr->state), "priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL);
-			} else {
-				purple_prpl_got_user_status(js->gc->account, my_base_jid, "offline", msg ? "message" : NULL, msg, NULL);
-			}
+		purple_status_to_jabber(status, &state, &msg, &priority);
 
-			g_free(msg);
+		if (state == JABBER_BUDDY_STATE_UNAVAILABLE ||
+				state == JABBER_BUDDY_STATE_UNKNOWN) {
+			jabber_buddy_remove_resource(jb, js->user->resource);
+		} else {
+			jbr = jabber_buddy_track_resource(jb, js->user->resource, priority,
+					state, msg);
+			jbr->idle = purple_presence_is_idle(presence) ?
+					purple_presence_get_idle_time(presence) : 0;
 		}
+
+		if ((jbr = jabber_buddy_find_resource(jb, NULL))) {
+			purple_prpl_got_user_status(account, username,
+					jabber_buddy_state_get_status_id(jbr->state),
+					"priority", jbr->priority,
+					jbr->status ? "message" : NULL, jbr->status,
+					NULL);
+			purple_prpl_got_user_idle(account, username, jbr->idle, jbr->idle);
+		} else {
+			purple_prpl_got_user_status(account, username, "offline",
+					msg ? "message" : NULL, msg,
+					NULL);
+		}
+		g_free(msg);
 	}
-	g_free(my_base_jid);
 }
 
+void jabber_set_status(PurpleAccount *account, PurpleStatus *status)
+{
+	PurpleConnection *gc;
+	JabberStream *js;
+
+	if (!purple_account_is_connected(account))
+		return;
 
-void jabber_presence_send(PurpleAccount *account, PurpleStatus *status)
+	if (purple_status_is_exclusive(status) && !purple_status_is_active(status)) {
+		/* An exclusive status can't be deactivated. You should just
+		 * activate some other exclusive status. */
+		return;
+	}
+
+	gc = purple_account_get_connection(account);
+	js = purple_connection_get_protocol_data(gc);
+	jabber_presence_send(js, FALSE);
+}
+
+void jabber_presence_send(JabberStream *js, gboolean force)
 {
-	PurpleConnection *gc = NULL;
-	JabberStream *js = NULL;
+	PurpleAccount *account;
 	xmlnode *presence, *x, *photo;
 	char *stripped = NULL;
 	JabberBuddyState state;
@@ -106,31 +140,14 @@ void jabber_presence_send(PurpleAccount *account, PurpleStatus *status)
 	int length = -1;
 	gboolean allowBuzz;
 	PurplePresence *p;
-	PurpleStatus *tune;
-
-	if (purple_account_is_disconnected(account))
-		return;
+	PurpleStatus *status, *tune;
 
+	account = purple_connection_get_account(js->gc);
 	p = purple_account_get_presence(account);
-	if (NULL == status) {
-		status = purple_presence_get_active_status(p);
-	}
-
-	if (purple_status_is_exclusive(status)) {
-		/* An exclusive status can't be deactivated. You should just
-		 * activate some other exclusive status. */
-		if (!purple_status_is_active(status))
-			return;
-	} else {
-		/* Work with the exclusive status. */
-		status = purple_presence_get_active_status(p);
-	}
-
-	gc = purple_account_get_connection(account);
-	js = gc->proto_data;
+	status = purple_presence_get_active_status(p);
 
 	/* we don't want to send presence before we've gotten our roster */
-	if(!js->roster_parsed) {
+	if (js->state != JABBER_STREAM_CONNECTED) {
 		purple_debug_info("jabber", "attempt to send presence before roster retrieved\n");
 		return;
 	}
@@ -141,25 +158,35 @@ void jabber_presence_send(PurpleAccount *account, PurpleStatus *status)
 	allowBuzz = purple_status_get_attr_boolean(status,"buzz");
 	/* changing the buzz state has to trigger a re-broadcasting of the presence for caps */
 
-	if (js->googletalk && stripped == NULL && purple_presence_is_status_primitive_active(p, PURPLE_STATUS_TUNE)) {
-		tune = purple_presence_get_status(p, "tune");
+	tune = purple_presence_get_status(p, "tune");
+	if (js->googletalk && !stripped && purple_status_is_active(tune)) {
 		stripped = jabber_google_presence_outgoing(tune);
 	}
 
 #define CHANGED(a,b) ((!a && b) || (a && a[0] == '\0' && b && b[0] != '\0') || \
 					  (a && !b) || (a && a[0] != '\0' && b && b[0] == '\0') || (a && b && strcmp(a,b)))
 	/* check if there are any differences to the <presence> and send them in that case */
-	if (allowBuzz != js->allowBuzz || js->old_state != state || CHANGED(js->old_msg, stripped) ||
-		js->old_priority != priority || CHANGED(js->old_avatarhash, js->avatar_hash)) {
+	if (force || allowBuzz != js->allowBuzz || js->old_state != state ||
+		CHANGED(js->old_msg, stripped) || js->old_priority != priority ||
+		CHANGED(js->old_avatarhash, js->avatar_hash) || js->old_idle != js->idle) {
+		/* Need to update allowBuzz before creating the presence (with caps) */
 		js->allowBuzz = allowBuzz;
 
 		presence = jabber_presence_create_js(js, state, stripped, priority);
 
-		if(js->avatar_hash) {
-			x = xmlnode_new_child(presence, "x");
-			xmlnode_set_namespace(x, "vcard-temp:x:update");
+		/* Per XEP-0153 4.1, we must always send the <x> */
+		x = xmlnode_new_child(presence, "x");
+		xmlnode_set_namespace(x, "vcard-temp:x:update");
+		/*
+		 * FIXME: Per XEP-0153 4.3.2 bullet 2, we must not publish our
+		 * image hash if another resource has logged in and updated the
+		 * vcard avatar. Requires changes in jabber_presence_parse.
+		 */
+		if (js->vcard_fetched) {
+			/* Always publish a <photo>; it's empty if we have no image. */
 			photo = xmlnode_new_child(x, "photo");
-			xmlnode_insert_data(photo, js->avatar_hash, -1);
+			if (js->avatar_hash)
+				xmlnode_insert_data(photo, js->avatar_hash, -1);
 		}
 
 		jabber_send(js, presence);
@@ -177,12 +204,12 @@ void jabber_presence_send(PurpleAccount *account, PurpleStatus *status)
 		js->old_avatarhash = g_strdup(js->avatar_hash);
 		js->old_state = state;
 		js->old_priority = priority;
+		js->old_idle = js->idle;
 	}
 	g_free(stripped);
 
 	/* next, check if there are any changes to the tune values */
-	tune = purple_presence_get_status(p, "tune");
-	if (tune && purple_status_is_active(tune)) {
+	if (purple_status_is_active(tune)) {
 		artist = purple_status_get_attr_string(tune, PURPLE_TUNE_ARTIST);
 		title = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE);
 		source = purple_status_get_attr_string(tune, PURPLE_TUNE_ALBUM);
@@ -232,6 +259,9 @@ xmlnode *jabber_presence_create_js(JabberStream *js, JabberBuddyState state, con
 {
 	xmlnode *show, *status, *presence, *pri, *c;
 	const char *show_string = NULL;
+#ifdef USE_VV
+	gboolean audio_enabled, video_enabled;
+#endif
 
 	presence = xmlnode_new("presence");
 
@@ -259,43 +289,47 @@ xmlnode *jabber_presence_create_js(JabberStream *js, JabberBuddyState state, con
 		g_free(pstr);
 	}
 
+	/* if we are idle and not offline, include idle */
+	if (js->idle && state != JABBER_BUDDY_STATE_UNAVAILABLE) {
+		xmlnode *query = xmlnode_new_child(presence, "query");
+		gchar seconds[10];
+		g_snprintf(seconds, 10, "%d", (int) (time(NULL) - js->idle));
+
+		xmlnode_set_namespace(query, "jabber:iq:last");
+		xmlnode_set_attrib(query, "seconds", seconds);
+	}
+
 	/* JEP-0115 */
+	/* calculate hash */
+	jabber_caps_calculate_own_hash(js);
+	/* create xml */
 	c = xmlnode_new_child(presence, "c");
 	xmlnode_set_namespace(c, "http://jabber.org/protocol/caps");
 	xmlnode_set_attrib(c, "node", CAPS0115_NODE);
-	xmlnode_set_attrib(c, "ver", VERSION);
-
-	if(js != NULL) {
-		/* add the extensions */
-		char extlist[1024];
-		unsigned remaining = 1023; /* one less for the \0 */
-		GList *feature;
-
-		extlist[0] = '\0';
-		for(feature = jabber_features; feature && remaining > 0; feature = feature->next) {
-			JabberFeature *feat = (JabberFeature*)feature->data;
-			unsigned featlen;
-
-			if(feat->is_enabled != NULL && feat->is_enabled(js, feat->shortname, feat->namespace) == FALSE)
-				continue; /* skip this feature */
-
-			featlen = strlen(feat->shortname);
-
-			/* cut off when we don't have any more space left in our buffer (too bad) */
-			if(featlen > remaining)
-				break;
-
-			strncat(extlist,feat->shortname,remaining);
-			remaining -= featlen;
-			if(feature->next) { /* no space at the end */
-				strncat(extlist," ",remaining);
-				--remaining;
-			}
-		}
-		/* did we add anything? */
-		if(remaining < 1023)
-			xmlnode_set_attrib(c, "ext", extlist);
-	}
+	xmlnode_set_attrib(c, "hash", "sha-1");
+	xmlnode_set_attrib(c, "ver", jabber_caps_get_own_hash(js));
+
+#ifdef USE_VV
+	/*
+	 * MASSIVE HUGE DISGUSTING HACK
+	 * This is a huge hack. As far as I can tell, Google Talk's gmail client
+	 * doesn't bother to check the actual features we advertise; they
+	 * just assume that if we specify a 'voice-v1' ext (ignoring that
+	 * these are to be assigned no semantic value), we support receiving voice
+	 * calls.
+	 *
+	 * Ditto for 'video-v1'.
+	 */
+	audio_enabled = jabber_audio_enabled(js, NULL /* unused */);
+	video_enabled = jabber_video_enabled(js, NULL /* unused */);
+
+	if (audio_enabled && video_enabled)
+		xmlnode_set_attrib(c, "ext", "voice-v1 camera-v1 video-v1");
+	else if (audio_enabled)
+		xmlnode_set_attrib(c, "ext", "voice-v1");
+	else if (video_enabled)
+		xmlnode_set_attrib(c, "ext", "camera-v1 video-v1");
+#endif
 
 	return presence;
 }
@@ -326,14 +360,14 @@ static void deny_add_cb(gpointer data)
 	g_free(jap);
 }
 
-static void jabber_vcard_parse_avatar(JabberStream *js, xmlnode *packet, gpointer blah)
+static void
+jabber_vcard_parse_avatar(JabberStream *js, const char *from,
+                          JabberIqType type, const char *id,
+                          xmlnode *packet, gpointer blah)
 {
 	JabberBuddy *jb = NULL;
-	xmlnode *vcard, *photo, *binval;
+	xmlnode *vcard, *photo, *binval, *fn, *nick;
 	char *text;
-	guchar *data;
-	gsize size;
-	const char *from = xmlnode_get_attrib(packet, "from");
 
 	if(!from)
 		return;
@@ -344,14 +378,40 @@ static void jabber_vcard_parse_avatar(JabberStream *js, xmlnode *packet, gpointe
 
 	if((vcard = xmlnode_get_child(packet, "vCard")) ||
 			(vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp"))) {
+		/* The logic here regarding the nickname and full name is copied from
+		 * buddy.c:jabber_vcard_parse. */
+		gchar *nickname = NULL;
+		if ((fn = xmlnode_get_child(vcard, "FN")))
+			nickname = xmlnode_get_data(fn);
+
+		if ((nick = xmlnode_get_child(vcard, "NICKNAME"))) {
+			char *tmp = xmlnode_get_data(nick);
+			char *bare_jid = jabber_get_bare_jid(from);
+			if (tmp && strstr(bare_jid, tmp) == NULL) {
+				g_free(nickname);
+				nickname = tmp;
+			} else if (tmp)
+				g_free(tmp);
+
+			g_free(bare_jid);
+		}
+
+		if (nickname) {
+			serv_got_alias(js->gc, from, nickname);
+			g_free(nickname);
+		}
+
 		if((photo = xmlnode_get_child(vcard, "PHOTO")) &&
 				(( (binval = xmlnode_get_child(photo, "BINVAL")) &&
 				(text = xmlnode_get_data(binval))) ||
 				(text = xmlnode_get_data(photo)))) {
-			char *hash;
+			guchar *data;
+			gchar *hash;
+			gsize size;
 
 			data = purple_base64_decode(text, &size);
 			hash = jabber_calculate_data_sha1sum(data, size);
+
 			purple_buddy_icons_set_for_user(js->gc->account, from, data, size, hash);
 			g_free(hash);
 			g_free(text);
@@ -365,52 +425,64 @@ typedef struct _JabberPresenceCapabilities {
 	char *from;
 } JabberPresenceCapabilities;
 
-static void jabber_presence_set_capabilities(JabberCapsClientInfo *info, gpointer user_data) {
-	JabberPresenceCapabilities *userdata = user_data;
-	JabberID *jid;
+static void
+jabber_presence_set_capabilities(JabberCapsClientInfo *info, GList *exts,
+                                 JabberPresenceCapabilities *userdata)
+{
 	JabberBuddyResource *jbr;
-	GList *iter;
+	char *resource = g_utf8_strchr(userdata->from, -1, '/');
 
-	jid = jabber_id_new(userdata->from);
-	jbr = jabber_buddy_find_resource(userdata->jb, jid->resource);
-	jabber_id_free(jid);
+	if (resource)
+		resource += 1;
 
-	if(!jbr) {
+	jbr = jabber_buddy_find_resource(userdata->jb, resource);
+	if (!jbr) {
 		g_free(userdata->from);
 		g_free(userdata);
+		if (exts) {
+			g_list_foreach(exts, (GFunc)g_free, NULL);
+			g_list_free(exts);
+		}
 		return;
 	}
 
-	if(jbr->caps)
-		jabber_caps_free_clientinfo(jbr->caps);
-	jbr->caps = info;
-
-	if (info) {
-		for(iter = info->features; iter; iter = g_list_next(iter)) {
-			if(!strcmp((const char*)iter->data, "http://jabber.org/protocol/commands")) {
-				JabberIq *iq = jabber_iq_new_query(userdata->js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
-				xmlnode *query = xmlnode_get_child_with_namespace(iq->node,"query","http://jabber.org/protocol/disco#items");
-				xmlnode_set_attrib(iq->node, "to", userdata->from);
-				xmlnode_set_attrib(query, "node", "http://jabber.org/protocol/commands");
-
-				jabber_iq_set_callback(iq, jabber_adhoc_disco_result_cb, NULL);
-				jabber_iq_send(iq);
-				break;
-			}
-		}
+	/* Any old jbr->caps.info is owned by the caps code */
+	if (jbr->caps.exts) {
+		g_list_foreach(jbr->caps.exts, (GFunc)g_free, NULL);
+		g_list_free(jbr->caps.exts);
 	}
 
+	jbr->caps.info = info;
+	jbr->caps.exts = exts;
+
+	if (info == NULL)
+		goto out;
+
+	if (!jbr->commands_fetched && jabber_resource_has_capability(jbr, "http://jabber.org/protocol/commands")) {
+		JabberIq *iq = jabber_iq_new_query(userdata->js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
+		xmlnode *query = xmlnode_get_child_with_namespace(iq->node, "query", "http://jabber.org/protocol/disco#items");
+		xmlnode_set_attrib(iq->node, "to", userdata->from);
+		xmlnode_set_attrib(query, "node", "http://jabber.org/protocol/commands");
+		jabber_iq_set_callback(iq, jabber_adhoc_disco_result_cb, NULL);
+		jabber_iq_send(iq);
+
+		jbr->commands_fetched = TRUE;
+	}
+
+	if (jabber_resource_has_capability(jbr, "http://jabber.org/protocol/chatstates"))
+		jbr->chat_states = JABBER_CHAT_STATES_SUPPORTED;
+	else
+		jbr->chat_states = JABBER_CHAT_STATES_UNSUPPORTED;
+
+out:
 	g_free(userdata->from);
 	g_free(userdata);
 }
 
 void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 {
-	const char *from = xmlnode_get_attrib(packet, "from");
-	const char *type = xmlnode_get_attrib(packet, "type");
-	const char *real_jid = NULL;
-	const char *affiliation = NULL;
-	const char *role = NULL;
+	const char *from;
+	const char *type;
 	char *status = NULL;
 	int priority = 0;
 	JabberID *jid;
@@ -419,35 +491,74 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 	JabberBuddyResource *jbr = NULL, *found_jbr = NULL;
 	PurpleConvChatBuddyFlags flags = PURPLE_CBFLAGS_NONE;
 	gboolean delayed = FALSE;
+	const gchar *stamp = NULL; /* from <delayed/> element */
 	PurpleBuddy *b = NULL;
 	char *buddy_name;
 	JabberBuddyState state = JABBER_BUDDY_STATE_UNKNOWN;
 	xmlnode *y;
-	gboolean muc = FALSE;
 	char *avatar_hash = NULL;
 	xmlnode *caps = NULL;
+	int idle = 0;
+	gchar *nickname = NULL;
+	gboolean signal_return;
+
+	from = xmlnode_get_attrib(packet, "from");
+	type = xmlnode_get_attrib(packet, "type");
 
-	if(!(jb = jabber_buddy_find(js, from, TRUE)))
+	jb = jabber_buddy_find(js, from, TRUE);
+	g_return_if_fail(jb != NULL);
+
+	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
+			"jabber-receiving-presence", js->gc, type, from, packet));
+	if (signal_return)
 		return;
 
-	if(!(jid = jabber_id_new(from)))
+	jid = jabber_id_new(from);
+	if (jid == NULL) {
+		purple_debug_error("jabber", "Ignoring presence with malformed 'from' "
+		                   "JID: %s\n", from);
 		return;
+	}
 
 	if(jb->error_msg) {
 		g_free(jb->error_msg);
 		jb->error_msg = NULL;
 	}
 
-	if(type && !strcmp(type, "error")) {
+	if (type == NULL) {
+		xmlnode *show;
+		char *show_data = NULL;
+
+		state = JABBER_BUDDY_STATE_ONLINE;
+
+		show = xmlnode_get_child(packet, "show");
+		if (show) {
+			show_data = xmlnode_get_data(show);
+			if (show_data) {
+				state = jabber_buddy_show_get_state(show_data);
+				g_free(show_data);
+			} else
+				purple_debug_warning("jabber", "<show/> present on presence, "
+				                     "but no contents!\n");
+		}
+	} else if (g_str_equal(type, "error")) {
 		char *msg = jabber_parse_error(js, packet, NULL);
 
 		state = JABBER_BUDDY_STATE_ERROR;
 		jb->error_msg = msg ? msg : g_strdup(_("Unknown Error in presence"));
-	} else if(type && !strcmp(type, "subscribe")) {
+	} else if (g_str_equal(type, "subscribe")) {
 		struct _jabber_add_permit *jap = g_new0(struct _jabber_add_permit, 1);
 		gboolean onlist = FALSE;
-		PurpleBuddy *buddy = purple_find_buddy(purple_connection_get_account(js->gc), from);
+		PurpleAccount *account;
+		PurpleBuddy *buddy;
 		JabberBuddy *jb = NULL;
+		xmlnode *nick;
+
+		account = purple_connection_get_account(js->gc);
+		buddy = purple_find_buddy(account, from);
+		nick = xmlnode_get_child_with_namespace(packet, "nick", "http://jabber.org/protocol/nick");
+		if (nick)
+			nickname = xmlnode_get_data(nick);
 
 		if (buddy) {
 			jb = jabber_buddy_find(js, from, TRUE);
@@ -459,15 +570,17 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 		jap->who = g_strdup(from);
 		jap->js = js;
 
-		purple_account_request_authorization(purple_connection_get_account(js->gc), from, NULL, NULL, NULL, onlist,
-				authorize_add_cb, deny_add_cb, jap);
+		purple_account_request_authorization(account, from, NULL, nickname,
+				NULL, onlist, authorize_add_cb, deny_add_cb, jap);
+
+		g_free(nickname);
 		jabber_id_free(jid);
 		return;
-	} else if(type && !strcmp(type, "subscribed")) {
+	} else if (g_str_equal(type, "subscribed")) {
 		/* we've been allowed to see their presence, but we don't care */
 		jabber_id_free(jid);
 		return;
-	} else if(type && !strcmp(type, "unsubscribe")) {
+	} else if (g_str_equal(type, "unsubscribe")) {
 		/* XXX I'm not sure this is the right way to handle this, it
 		 * might be better to add "unsubscribe" to the presence status
 		 * if lower down, but I'm not sure. */
@@ -476,14 +589,19 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 		 * acknowledging this (and the others) at some point. */
 		jabber_id_free(jid);
 		return;
+	} else if (g_str_equal(type, "probe")) {
+		purple_debug_warning("jabber", "Ignoring presence probe\n");
+		jabber_id_free(jid);
+		return;
+	} else if (g_str_equal(type, "unavailable")) {
+		state = JABBER_BUDDY_STATE_UNAVAILABLE;
+	} else if (g_str_equal(type, "unsubscribed")) {
+		state = JABBER_BUDDY_STATE_UNKNOWN;
 	} else {
-		if((y = xmlnode_get_child(packet, "show"))) {
-			char *show = xmlnode_get_data(y);
-			state = jabber_buddy_show_get_state(show);
-			g_free(show);
-		} else {
-			state = JABBER_BUDDY_STATE_ONLINE;
-		}
+		purple_debug_warning("jabber", "Ignoring presence with invalid type "
+		                     "'%s'\n", type);
+		jabber_id_free(jid);
+		return;
 	}
 
 
@@ -508,55 +626,17 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 		} else if(!strcmp(y->name, "delay") && !strcmp(xmlns, "urn:xmpp:delay")) {
 			/* XXX: compare the time.  jabber:x:delay can happen on presence packets that aren't really and truly delayed */
 			delayed = TRUE;
+			stamp = xmlnode_get_attrib(y, "stamp");
 		} else if(!strcmp(y->name, "c") && !strcmp(xmlns, "http://jabber.org/protocol/caps")) {
 			caps = y; /* store for later, when creating buddy resource */
+		} else if (g_str_equal(y->name, "nick") && g_str_equal(xmlns, "http://jabber.org/protocol/nick")) {
+			nickname = xmlnode_get_data(y);
 		} else if(!strcmp(y->name, "x")) {
 			if(!strcmp(xmlns, "jabber:x:delay")) {
 				/* XXX: compare the time.  jabber:x:delay can happen on presence packets that aren't really and truly delayed */
 				delayed = TRUE;
+				stamp = xmlnode_get_attrib(y, "stamp");
 			} else if(!strcmp(xmlns, "http://jabber.org/protocol/muc#user")) {
-				xmlnode *z;
-
-				muc = TRUE;
-				if((z = xmlnode_get_child(y, "status"))) {
-					const char *code = xmlnode_get_attrib(z, "code");
-					if(code && !strcmp(code, "201")) {
-						if((chat = jabber_chat_find(js, jid->node, jid->domain))) {
-							chat->config_dialog_type = PURPLE_REQUEST_ACTION;
-							chat->config_dialog_handle =
-								purple_request_action(js->gc,
-										_("Create New Room"),
-										_("Create New Room"),
-										_("You are creating a new room.  Would"
-											" you like to configure it, or"
-											" accept the default settings?"),
-										/* Default Action */ 1,
-										purple_connection_get_account(js->gc), NULL, chat->conv,
-										chat, 2,
-										_("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure),
-										_("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room));
-						}
-					} else if(code && !strcmp(code, "210")) {
-						/*  server rewrote room-nick */
-						if((chat = jabber_chat_find(js, jid->node, jid->domain))) {
-							g_free(chat->handle);
-							chat->handle = g_strdup(jid->resource);
-						}
-					}
-				}
-				if((z = xmlnode_get_child(y, "item"))) {
-					real_jid = xmlnode_get_attrib(z, "jid");
-					affiliation = xmlnode_get_attrib(z, "affiliation");
-					role = xmlnode_get_attrib(z, "role");
-					if(affiliation != NULL && !strcmp(affiliation, "owner"))
-						flags |= PURPLE_CBFLAGS_FOUNDER;
-					if (role != NULL) {
-						if (!strcmp(role, "moderator"))
-							flags |= PURPLE_CBFLAGS_OP;
-						else if (!strcmp(role, "participant"))
-							flags |= PURPLE_CBFLAGS_VOICE;
-					}
-				}
 			} else if(!strcmp(xmlns, "vcard-temp:x:update")) {
 				xmlnode *photo = xmlnode_get_child(y, "photo");
 				if(photo) {
@@ -564,13 +644,29 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 					avatar_hash = xmlnode_get_data(photo);
 				}
 			}
+		} else if (!strcmp(y->name, "query") &&
+			!strcmp(xmlnode_get_namespace(y), "jabber:iq:last")) {
+			/* resource has specified idle */
+			const gchar *seconds = xmlnode_get_attrib(y, "seconds");
+			if (seconds) {
+				/* we may need to take "delayed" into account here */
+				idle = atoi(seconds);
+			}
 		}
 	}
 
+	if (idle && delayed && stamp) {
+		/* if we have a delayed presence, we need to add the delay to the idle
+		 value */
+		time_t offset = time(NULL) - purple_str_to_time(stamp, TRUE, NULL, NULL,
+			NULL);
+		purple_debug_info("jabber", "got delay %s yielding %ld s offset\n",
+			stamp, offset);
+		idle += offset;
+	}
 
 	if(jid->node && (chat = jabber_chat_find(js, jid->node, jid->domain))) {
 		static int i = 1;
-		char *room_jid = g_strdup_printf("%s@%s", jid->node, jid->domain);
 
 		if(state == JABBER_BUDDY_STATE_ERROR) {
 			char *title, *msg = jabber_parse_error(js, packet, NULL);
@@ -592,58 +688,211 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 				jabber_chat_destroy(chat);
 			jabber_id_free(jid);
 			g_free(status);
-			g_free(room_jid);
 			g_free(avatar_hash);
+			g_free(nickname);
 			return;
 		}
 
+		if (type == NULL) {
+			xmlnode *x;
+			const char *real_jid = NULL;
+			const char *affiliation = NULL;
+			const char *role = NULL;
+			gboolean is_our_resource = FALSE; /* Is the presence about us? */
+
+			/*
+			 * XEP-0045 mandates the presence to include a resource (which is
+			 * treated as the chat nick). Some non-compliant servers allow
+			 * joining without a nick.
+			 */
+			if (!jid->resource) {
+				jabber_id_free(jid);
+				g_free(avatar_hash);
+				g_free(nickname);
+				g_free(status);
+				return;
+			}
 
-		if(type && !strcmp(type, "unavailable")) {
-			gboolean nick_change = FALSE;
+			x = xmlnode_get_child_with_namespace(packet, "x",
+					"http://jabber.org/protocol/muc#user");
+			if (x) {
+				xmlnode *status_node;
+				xmlnode *item_node;
+
+				for (status_node = xmlnode_get_child(x, "status"); status_node;
+						status_node = xmlnode_get_next_twin(status_node)) {
+					const char *code = xmlnode_get_attrib(status_node, "code");
+					if (!code)
+						continue;
+
+					if (g_str_equal(code, "110")) {
+						is_our_resource = TRUE;
+					} else if (g_str_equal(code, "201")) {
+						if ((chat = jabber_chat_find(js, jid->node, jid->domain))) {
+							chat->config_dialog_type = PURPLE_REQUEST_ACTION;
+							chat->config_dialog_handle =
+								purple_request_action(js->gc,
+										_("Create New Room"),
+										_("Create New Room"),
+										_("You are creating a new room.  Would"
+											" you like to configure it, or"
+											" accept the default settings?"),
+										/* Default Action */ 1,
+										purple_connection_get_account(js->gc), NULL, chat->conv,
+										chat, 2,
+										_("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure),
+										_("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room));
+						}
+					} else if (g_str_equal(code, "210")) {
+						/* server rewrote room-nick */
+						if((chat = jabber_chat_find(js, jid->node, jid->domain))) {
+							g_free(chat->handle);
+							chat->handle = g_strdup(jid->resource);
+						}
+					}
+				}
+
+				item_node = xmlnode_get_child(x, "item");
+				if (item_node) {
+					real_jid    = xmlnode_get_attrib(item_node, "jid");
+					affiliation = xmlnode_get_attrib(item_node, "affiliation");
+					role        = xmlnode_get_attrib(item_node, "role");
+
+					if (purple_strequal(affiliation, "owner"))
+						flags |= PURPLE_CBFLAGS_FOUNDER;
+					if (role) {
+						if (g_str_equal(role, "moderator"))
+							flags |= PURPLE_CBFLAGS_OP;
+						else if (g_str_equal(role, "participant"))
+							flags |= PURPLE_CBFLAGS_VOICE;
+					}
+				}
+			}
 
-			/* If we haven't joined the chat yet, we don't care that someone
-			 * left, or it was us leaving after we closed the chat */
-			if (!chat->conv || chat->left) {
+			if(!chat->conv) {
+				char *room_jid = g_strdup_printf("%s@%s", jid->node, jid->domain);
+				chat->id = i++;
+				chat->muc = (x != NULL);
+				chat->conv = serv_got_joined_chat(js->gc, chat->id, room_jid);
+				purple_conv_chat_set_nick(PURPLE_CONV_CHAT(chat->conv), chat->handle);
+
+				jabber_chat_disco_traffic(chat);
+				g_free(room_jid);
+			}
+
+			jabber_buddy_track_resource(jb, jid->resource, priority, state,
+					status);
+
+			jabber_chat_track_handle(chat, jid->resource, real_jid, affiliation, role);
+
+			if(!jabber_chat_find_buddy(chat->conv, jid->resource))
+				purple_conv_chat_add_user(PURPLE_CONV_CHAT(chat->conv), jid->resource,
+						real_jid, flags, !delayed);
+			else
+				purple_conv_chat_user_set_flags(PURPLE_CONV_CHAT(chat->conv), jid->resource,
+						flags);
+		} else if (g_str_equal(type, "unavailable")) {
+			xmlnode *x;
+			gboolean nick_change = FALSE;
+			gboolean kick = FALSE;
+			gboolean is_our_resource = FALSE; /* Is the presence about us? */
+
+			/* If the chat nick is invalid, we haven't yet joined, or we've
+			 * already left (it was probably us leaving after we closed the
+			 * chat), we don't care.
+			 */
+			if (!jid->resource || !chat->conv || chat->left) {
 				if (chat->left &&
 						jid->resource && chat->handle && !strcmp(jid->resource, chat->handle))
 					jabber_chat_destroy(chat);
 				jabber_id_free(jid);
 				g_free(status);
-				g_free(room_jid);
 				g_free(avatar_hash);
+				g_free(nickname);
 				return;
 			}
 
+			is_our_resource = (0 == g_utf8_collate(jid->resource, chat->handle));
+
 			jabber_buddy_remove_resource(jb, jid->resource);
-			if(chat->muc) {
-				xmlnode *x;
-				for(x = xmlnode_get_child(packet, "x"); x; x = xmlnode_get_next_twin(x)) {
-					const char *xmlns, *nick, *code;
-					xmlnode *stat, *item;
-					if(!(xmlns = xmlnode_get_namespace(x)) ||
-							strcmp(xmlns, "http://jabber.org/protocol/muc#user"))
-						continue;
-					if(!(stat = xmlnode_get_child(x, "status")))
-						continue;
-					if(!(code = xmlnode_get_attrib(stat, "code")))
+
+			x = xmlnode_get_child_with_namespace(packet, "x",
+					"http://jabber.org/protocol/muc#user");
+			if (chat->muc && x) {
+				const char *nick;
+				const char *item_jid = NULL;
+				const char *to;
+				xmlnode *stat;
+				xmlnode *item;
+
+				item = xmlnode_get_child(x, "item");
+				if (item)
+					item_jid = xmlnode_get_attrib(item, "jid");
+
+				for (stat = xmlnode_get_child(x, "status"); stat;
+						stat = xmlnode_get_next_twin(stat)) {
+					const char *code = xmlnode_get_attrib(stat, "code");
+
+					if (!code)
 						continue;
-					if(!strcmp(code, "301")) {
+
+					if (g_str_equal(code, "110")) {
+						is_our_resource = TRUE;
+					} else if(!strcmp(code, "301")) {
 						/* XXX: we got banned */
-					} else if(!strcmp(code, "303")) {
-						if(!(item = xmlnode_get_child(x, "item")))
-							continue;
-						if(!(nick = xmlnode_get_attrib(item, "nick")))
-							continue;
+					} else if(!strcmp(code, "303") && item &&
+							(nick = xmlnode_get_attrib(item, "nick"))) {
 						nick_change = TRUE;
 						if(!strcmp(jid->resource, chat->handle)) {
 							g_free(chat->handle);
 							chat->handle = g_strdup(nick);
 						}
+
+						/* TODO: This should probably be moved out of the loop */
 						purple_conv_chat_rename_user(PURPLE_CONV_CHAT(chat->conv), jid->resource, nick);
 						jabber_chat_remove_handle(chat, jid->resource);
-						break;
+						continue;
 					} else if(!strcmp(code, "307")) {
-						/* XXX: we got kicked */
+						/* Someone was kicked from the room */
+						xmlnode *reason = NULL, *actor = NULL;
+						const char *actor_name = NULL;
+						char *reason_text = NULL;
+						char *tmp;
+
+						kick = TRUE;
+
+						if (item) {
+							reason = xmlnode_get_child(item, "reason");
+							actor = xmlnode_get_child(item, "actor");
+
+							if (reason != NULL)
+								reason_text = xmlnode_get_data(reason);
+							if (actor != NULL)
+								actor_name = xmlnode_get_attrib(actor, "jid");
+						}
+
+						if (reason_text == NULL)
+							reason_text = g_strdup(_("No reason"));
+
+						if (is_our_resource) {
+							if (actor_name != NULL)
+								tmp = g_strdup_printf(_("You have been kicked by %s: (%s)"),
+										actor_name, reason_text);
+							else
+								tmp = g_strdup_printf(_("You have been kicked: (%s)"),
+										reason_text);
+						} else {
+							if (actor_name != NULL)
+								tmp = g_strdup_printf(_("Kicked by %s (%s)"),
+										actor_name, reason_text);
+							else
+								tmp = g_strdup_printf(_("Kicked (%s)"),
+										reason_text);
+						}
+
+						g_free(reason_text);
+						g_free(status);
+						status = tmp;
 					} else if(!strcmp(code, "321")) {
 						/* XXX: removed due to an affiliation change */
 					} else if(!strcmp(code, "322")) {
@@ -652,9 +901,29 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 						/* XXX: removed due to system shutdown */
 					}
 				}
+
+				/*
+				 * Possibly another connected resource of our JID (see XEP-0045
+				 * v1.24 section 7.1.10) being disconnected. Should be
+				 * distinguished by the item_jid.
+				 * Also possibly works around bits of an Openfire bug. See
+				 * #8319.
+				 */
+				to = xmlnode_get_attrib(packet, "to");
+				if (is_our_resource && item_jid && !purple_strequal(to, item_jid)) {
+					/* TODO: When the above is a loop, this needs to still act
+					 * sanely for all cases (this code is a little fragile). */
+					if (!kick && !nick_change)
+						/* Presumably, kicks and nick changes also affect us. */
+						is_our_resource = FALSE;
+				}
 			}
 			if(!nick_change) {
-				if(!g_utf8_collate(jid->resource, chat->handle)) {
+				if (is_our_resource) {
+					if (kick)
+						purple_conv_chat_write(PURPLE_CONV_CHAT(chat->conv), jid->resource,
+								status, PURPLE_MESSAGE_SYSTEM, time(NULL));
+
 					serv_got_chat_left(js->gc, chat->id);
 					jabber_chat_destroy(chat);
 				} else {
@@ -664,28 +933,16 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 				}
 			}
 		} else {
-			if(!chat->conv) {
-				chat->id = i++;
-				chat->muc = muc;
-				chat->conv = serv_got_joined_chat(js->gc, chat->id, room_jid);
-				purple_conv_chat_set_nick(PURPLE_CONV_CHAT(chat->conv), chat->handle);
+			/* A type that isn't available or unavailable */
+			purple_debug_error("jabber", "MUC presence with bad type: %s\n",
+			                   type);
 
-				jabber_chat_disco_traffic(chat);
-			}
-
-			jabber_buddy_track_resource(jb, jid->resource, priority, state,
-					status);
-
-			jabber_chat_track_handle(chat, jid->resource, real_jid, affiliation, role);
-
-			if(!jabber_chat_find_buddy(chat->conv, jid->resource))
-				purple_conv_chat_add_user(PURPLE_CONV_CHAT(chat->conv), jid->resource,
-						real_jid, flags, !delayed);
-			else
-				purple_conv_chat_user_set_flags(PURPLE_CONV_CHAT(chat->conv), jid->resource,
-						flags);
+			jabber_id_free(jid);
+			g_free(avatar_hash);
+			g_free(status);
+			g_free(nickname);
+			g_return_if_reached();
 		}
-		g_free(room_jid);
 	} else {
 		buddy_name = g_strdup_printf("%s%s%s", jid->node ? jid->node : "",
 									 jid->node ? "@" : "", jid->domain);
@@ -696,6 +953,7 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 				jabber_id_free(jid);
 				g_free(avatar_hash);
 				g_free(buddy_name);
+				g_free(nickname);
 				g_free(status);
 				return;
 			} else {
@@ -730,8 +988,8 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 		}
 
 		if(state == JABBER_BUDDY_STATE_ERROR ||
-				(type && (!strcmp(type, "unavailable") ||
-						  !strcmp(type, "unsubscribed")))) {
+				(type && (g_str_equal(type, "unavailable") ||
+				          g_str_equal(type, "unsubscribed")))) {
 			PurpleConversation *conv;
 
 			jabber_buddy_remove_resource(jb, jid->resource);
@@ -741,29 +999,59 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 		} else {
 			jbr = jabber_buddy_track_resource(jb, jid->resource, priority,
 					state, status);
-			if(caps) {
-				const char *node = xmlnode_get_attrib(caps,"node");
-				const char *ver = xmlnode_get_attrib(caps,"ver");
-				const char *ext = xmlnode_get_attrib(caps,"ext");
-
-				if(node && ver) {
-					JabberPresenceCapabilities *userdata = g_new0(JabberPresenceCapabilities, 1);
-					userdata->js = js;
-					userdata->jb = jb;
-					userdata->from = g_strdup(from);
-					jabber_caps_get_info(js, from, node, ver, ext, jabber_presence_set_capabilities, userdata);
-				}
+			if (idle) {
+				jbr->idle = time(NULL) - idle;
+			} else {
+				jbr->idle = 0;
 			}
 		}
 
 		if((found_jbr = jabber_buddy_find_resource(jb, NULL))) {
 			jabber_google_presence_incoming(js, buddy_name, found_jbr);
 			purple_prpl_got_user_status(js->gc->account, buddy_name, jabber_buddy_state_get_status_id(found_jbr->state), "priority", found_jbr->priority, "message", found_jbr->status, NULL);
+			purple_prpl_got_user_idle(js->gc->account, buddy_name, found_jbr->idle, found_jbr->idle);
+			if (nickname)
+				serv_got_alias(js->gc, buddy_name, nickname);
 		} else {
 			purple_prpl_got_user_status(js->gc->account, buddy_name, "offline", status ? "message" : NULL, status, NULL);
 		}
 		g_free(buddy_name);
 	}
+
+	if (caps && !type) {
+		/* handle Entity Capabilities (XEP-0115) */
+		const char *node = xmlnode_get_attrib(caps, "node");
+		const char *ver  = xmlnode_get_attrib(caps, "ver");
+		const char *hash = xmlnode_get_attrib(caps, "hash");
+		const char *ext  = xmlnode_get_attrib(caps, "ext");
+
+		/* v1.3 uses: node, ver, and optionally ext.
+		 * v1.5 uses: node, ver, and hash. */
+		if (node && *node && ver && *ver) {
+			gchar **exts = ext && *ext ? g_strsplit(ext, " ", -1) : NULL;
+			jbr = jabber_buddy_find_resource(jb, jid->resource);
+
+			/* Look it up if we don't already have all this information */
+			if (!jbr || !jbr->caps.info ||
+					!g_str_equal(node, jbr->caps.info->tuple.node) ||
+					!g_str_equal(ver, jbr->caps.info->tuple.ver) ||
+					!purple_strequal(hash, jbr->caps.info->tuple.hash) ||
+					!jabber_caps_exts_known(jbr->caps.info, (gchar **)exts)) {
+				JabberPresenceCapabilities *userdata = g_new0(JabberPresenceCapabilities, 1);
+				userdata->js = js;
+				userdata->jb = jb;
+				userdata->from = g_strdup(from);
+				jabber_caps_get_info(js, from, node, ver, hash, exts,
+				    (jabber_caps_get_info_cb)jabber_presence_set_capabilities,
+				    userdata);
+			} else {
+				if (exts)
+					g_strfreev(exts);
+			}
+		}
+	}
+
+	g_free(nickname);
 	g_free(status);
 	jabber_id_free(jid);
 	g_free(avatar_hash);
@@ -801,10 +1089,7 @@ void purple_status_to_jabber(const PurpleStatus *status, JabberBuddyState *state
 			formatted_msg = purple_status_get_attr_string(status, "message");
 
 			/* if the message is blank, then there really isn't a message */
-			if(formatted_msg && !*formatted_msg)
-				formatted_msg = NULL;
-
-			if(formatted_msg)
+			if(formatted_msg && *formatted_msg)
 				*msg = purple_markup_strip_html(formatted_msg);
 		}
 
diff --git a/libpurple/protocols/jabber/presence.h b/libpurple/protocols/jabber/presence.h
index 961c56ddc7..03872135bd 100644
--- a/libpurple/protocols/jabber/presence.h
+++ b/libpurple/protocols/jabber/presence.h
@@ -19,20 +19,30 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_PRESENCE_H_
-#define _PURPLE_JABBER_PRESENCE_H_
+#ifndef PURPLE_JABBER_PRESENCE_H_
+#define PURPLE_JABBER_PRESENCE_H_
 
 #include "buddy.h"
 #include "jabber.h"
 #include "xmlnode.h"
 
-void jabber_presence_send(PurpleAccount *account, PurpleStatus *status);
+void jabber_set_status(PurpleAccount *account, PurpleStatus *status);
+
+/**
+ *	Send a full presence stanza.
+ *
+ *	@param js       A JabberStream object.
+ *	@param force    Force sending the presence stanza, irrespective of whether
+ *	                the contents seem to have changed.
+ */
+void jabber_presence_send(JabberStream *js, gboolean force);
+
 xmlnode *jabber_presence_create(JabberBuddyState state, const char *msg, int priority); /* DEPRECATED */
 xmlnode *jabber_presence_create_js(JabberStream *js, JabberBuddyState state, const char *msg, int priority);
 void jabber_presence_parse(JabberStream *js, xmlnode *packet);
 void jabber_presence_subscription_set(JabberStream *js, const char *who,
 		const char *type);
-void jabber_presence_fake_to_self(JabberStream *js, const PurpleStatus *status);
+void jabber_presence_fake_to_self(JabberStream *js, PurpleStatus *status);
 void purple_status_to_jabber(const PurpleStatus *status, JabberBuddyState *state, char **msg, int *priority);
 
-#endif /* _PURPLE_JABBER_PRESENCE_H_ */
+#endif /* PURPLE_JABBER_PRESENCE_H_ */
diff --git a/libpurple/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c
index 9febc1e729..625bc5ebff 100644
--- a/libpurple/protocols/jabber/roster.c
+++ b/libpurple/protocols/jabber/roster.c
@@ -31,6 +31,19 @@
 
 #include <string.h>
 
+/* Take a list of strings and join them with a ", " separator */
+static gchar *roster_groups_join(GSList *list)
+{
+	GString *out = g_string_new(NULL);
+	for ( ; list; list = list->next) {
+		out = g_string_append(out, (const char *)list->data);
+		if (list->next)
+			out = g_string_append(out, ", ");
+	}
+
+	return g_string_free(out, FALSE);
+}
+
 void jabber_roster_request(JabberStream *js)
 {
 	JabberIq *iq;
@@ -52,35 +65,41 @@ static void remove_purple_buddies(JabberStream *js, const char *jid)
 	g_slist_free(buddies);
 }
 
-static void add_purple_buddies_to_groups(JabberStream *js, const char *jid,
+static void add_purple_buddy_to_groups(JabberStream *js, const char *jid,
 		const char *alias, GSList *groups)
 {
-	GSList *buddies, *g2, *l;
-	gchar *my_bare_jid;
-	GList *pool = NULL;
+	GSList *buddies, *l;
+	GSList *pool = NULL;
 
 	buddies = purple_find_buddies(js->gc->account, jid);
 
-	g2 = groups;
-
 	if(!groups) {
 		if(!buddies)
-			g2 = g_slist_append(g2, g_strdup(_("Buddies")));
+			groups = g_slist_append(groups, g_strdup(_("Buddies")));
 		else {
+			/* TODO: What should we do here? Removing the local buddies
+			 * is wrong, but so is letting the group state get out of sync with
+			 * the server.
+			 */
 			g_slist_free(buddies);
 			return;
 		}
 	}
 
-	my_bare_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
-
 	while(buddies) {
 		PurpleBuddy *b = buddies->data;
 		PurpleGroup *g = purple_buddy_get_group(b);
 
-		buddies = g_slist_remove(buddies, b);
+		buddies = g_slist_delete_link(buddies, buddies);
 
-		if((l = g_slist_find_custom(g2, purple_group_get_name(g), (GCompareFunc)strcmp))) {
+		/* XMPP groups are case-sensitive, but libpurple groups are
+		 * case-insensitive. We treat a buddy in both "Friends" and "friends"
+		 * as only being in one group, but if we push changes about the buddy
+		 * to the server, the buddy will be dropped from one of the groups.
+		 * Not optimal, but better than the alternative, I think.
+		 */
+		if((l = g_slist_find_custom(groups, purple_group_get_name(g), (GCompareFunc)purple_utf8_strcasecmp))) {
+			/* The buddy is already on the local list. Update info. */
 			const char *servernick, *balias;
 
 			/* Previously stored serverside / buddy-supplied alias */
@@ -89,89 +108,85 @@ static void add_purple_buddies_to_groups(JabberStream *js, const char *jid,
 
 			/* Alias from our roster retrieval */
 			balias = purple_buddy_get_local_buddy_alias(b);
-			if(alias && (!balias || strcmp(balias, alias)))
+			if(alias && !purple_strequal(alias, balias))
 				purple_serv_got_private_alias(js->gc, jid, alias);
 			g_free(l->data);
-			g2 = g_slist_delete_link(g2, l);
+			groups = g_slist_delete_link(groups, l);
 		} else {
-			pool = g_list_prepend(pool, b);
+			/* This buddy isn't in the group on the server anymore */
+			pool = g_slist_prepend(pool, b);
+		}
+	}
+
+	if (pool) {
+		GString *tmp = g_string_new(NULL);
+		GSList *list = pool;
+		for ( ; list; list = list->next) {
+			tmp = g_string_append(tmp,
+					purple_group_get_name(purple_buddy_get_group(list->data)));
+			if (list->next)
+				tmp = g_string_append(tmp, ", ");
 		}
+
+		purple_debug_info("jabber", "jabber_roster_parse(): Removing %s from "
+		                  "groups: %s\n", jid, tmp->str);
+		g_string_free(tmp, TRUE);
+	}
+
+	if (groups) {
+		char *tmp = roster_groups_join(groups);
+		purple_debug_info("jabber", "jabber_roster_parse(): Adding %s to "
+		                  "groups: %s\n", jid, tmp);
+		g_free(tmp);
 	}
 
-	while(g2) {
-		PurpleGroup *g = purple_find_group(g2->data);
+	while(groups) {
+		PurpleGroup *g = purple_find_group(groups->data);
 		PurpleBuddy *b = NULL;
 
+		/* If there are buddies we would otherwise delete, move them to
+		 * the new group (instead of deleting them below)
+		 */
 		if (pool) {
 			b = pool->data;
-			pool = g_list_delete_link(pool, pool);
+			pool = g_slist_delete_link(pool, pool);
 		} else {
 			b = purple_buddy_new(js->gc->account, jid, alias);
 		}
 
 		if(!g) {
-			g = purple_group_new(g2->data);
+			g = purple_group_new(groups->data);
 			purple_blist_add_group(g, NULL);
 		}
 
 		purple_blist_add_buddy(b, NULL, g, NULL);
 		purple_blist_alias_buddy(b, alias);
 
-		/* If we just learned about ourself, then fake our status,
-		 * because we won't be receiving a normal presence message
-		 * about ourself. */
-		if(!strcmp(purple_buddy_get_name(b), my_bare_jid)) {
-			PurplePresence *gpresence;
-			PurpleStatus *status;
-			PurpleAccount *account;
-
-			account = purple_connection_get_account(js->gc);
-			gpresence = purple_account_get_presence(account);
-			status = purple_presence_get_active_status(gpresence);
-			jabber_presence_fake_to_self(js, status);
-		}
-
-		g_free(g2->data);
-		g2 = g_slist_delete_link(g2, g2);
+		g_free(groups->data);
+		groups = g_slist_delete_link(groups, groups);
 	}
 
+	/* Remove this person from all the groups they're no longer in on the
+	 * server */
 	while (pool) {
 		PurpleBuddy *b = pool->data;
 		purple_blist_remove_buddy(b);
-		pool = g_list_delete_link(pool, pool);
+		pool = g_slist_delete_link(pool, pool);
 	}
 
-	g_free(my_bare_jid);
 	g_slist_free(buddies);
 }
 
-void jabber_roster_parse(JabberStream *js, xmlnode *packet)
+void jabber_roster_parse(JabberStream *js, const char *from,
+                         JabberIqType type, const char *id, xmlnode *query)
 {
-	xmlnode *query, *item, *group;
-	const char *from = xmlnode_get_attrib(packet, "from");
-
-	if(from) {
-		char *from_norm;
-		gboolean invalid;
-
-		from_norm = g_strdup(jabber_normalize(js->gc->account, from));
-
-		if(!from_norm)
-			return;
+	xmlnode *item, *group;
 
-		invalid = g_utf8_collate(from_norm,
-				jabber_normalize(js->gc->account,
-					purple_account_get_username(js->gc->account)));
-
-		g_free(from_norm);
-
-		if(invalid)
-			return;
-	}
-
-	query = xmlnode_get_child(packet, "query");
-	if(!query)
+	if (!jabber_is_own_account(js, from)) {
+		purple_debug_warning("jabber", "Received bogon roster push from %s\n",
+		                     from);
 		return;
+	}
 
 	js->currently_parsing_roster_push = TRUE;
 
@@ -192,18 +207,7 @@ void jabber_roster_parse(JabberStream *js, xmlnode *packet)
 			continue;
 
 		if(subscription) {
-			gint me = -1;
-			char *jid_norm;
-			const char *username;
-
-			jid_norm = g_strdup(jabber_normalize(js->gc->account, jid));
-			username = purple_account_get_username(js->gc->account);
-			me = g_utf8_collate(jid_norm,
-			                    jabber_normalize(js->gc->account,
-			                                     username));
-			g_free(jid_norm);
-
-			if(me == 0)
+			if (jb == js->user_jb)
 				jb->subscription = JABBER_SUB_BOTH;
 			else if(!strcmp(subscription, "none"))
 				jb->subscription = JABBER_SUB_NONE;
@@ -215,20 +219,9 @@ void jabber_roster_parse(JabberStream *js, xmlnode *packet)
 				jb->subscription = JABBER_SUB_BOTH;
 			else if(!strcmp(subscription, "remove"))
 				jb->subscription = JABBER_SUB_REMOVE;
-			/* XXX: if subscription is now "from" or "none" we need to
-			 * fake a signoff, since we won't get any presence from them
-			 * anymore */
-			/* YYY: I was going to use this, but I'm not sure it's necessary
-			 * anymore, but it's here in case it is. */
-			/*
-			if ((jb->subscription & JABBER_SUB_FROM) ||
-					(jb->subscription & JABBER_SUB_NONE)) {
-				purple_prpl_got_user_status(js->gc->account, jid, "offline", NULL);
-			}
-			*/
 		}
 
-		if(ask && !strcmp(ask, "subscribe"))
+		if(purple_strequal(ask, "subscribe"))
 			jb->subscription |= JABBER_SUB_PENDING;
 		else
 			jb->subscription &= ~JABBER_SUB_PENDING;
@@ -237,43 +230,45 @@ void jabber_roster_parse(JabberStream *js, xmlnode *packet)
 			remove_purple_buddies(js, jid);
 		} else {
 			GSList *groups = NULL;
+			gboolean seen_empty = FALSE;
 
 			if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
 				if (!jabber_google_roster_incoming(js, item))
 					continue;
 
 			for(group = xmlnode_get_child(item, "group"); group; group = xmlnode_get_next_twin(group)) {
-				char *group_name;
+				char *group_name = xmlnode_get_data(group);
 
-				if(!(group_name = xmlnode_get_data(group)))
+				if (!group_name && !seen_empty) {
 					group_name = g_strdup("");
+					seen_empty = TRUE;
+				}
 
-				if (g_slist_find_custom(groups, group_name, (GCompareFunc)purple_utf8_strcasecmp) == NULL)
-					groups = g_slist_append(groups, group_name);
-				else
-					g_free(group_name);
+				groups = g_slist_prepend(groups, group_name);
 			}
-			add_purple_buddies_to_groups(js, jid, name, groups);
+
+			add_purple_buddy_to_groups(js, jid, name, groups);
+			if (jb == js->user_jb)
+				jabber_presence_fake_to_self(js, NULL);
 		}
 	}
 
 	js->currently_parsing_roster_push = FALSE;
 
 	/* if we're just now parsing the roster for the first time,
-	 * then now would be the time to send our initial presence */
-	if(!js->roster_parsed) {
-		js->roster_parsed = TRUE;
-
-		jabber_presence_send(js->gc->account, NULL);
-	}
+	 * then now would be the time to declare ourselves connected.
+	 */
+	if (js->state != JABBER_STREAM_CONNECTED)
+		jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
 }
 
+/* jabber_roster_update frees the GSList* passed in */
 static void jabber_roster_update(JabberStream *js, const char *name,
-		GSList *grps)
+		GSList *groups)
 {
 	PurpleBuddy *b;
 	PurpleGroup *g;
-	GSList *groups = NULL, *l;
+	GSList *l;
 	JabberIq *iq;
 	xmlnode *query, *item, *group;
 	const char *balias;
@@ -284,10 +279,16 @@ static void jabber_roster_update(JabberStream *js, const char *name,
 	if(!(b = purple_find_buddy(js->gc->account, name)))
 		return;
 
-	if(grps) {
-		groups = grps;
+	if (groups) {
+		char *tmp = roster_groups_join(groups);
+
+		purple_debug_info("jabber", "jabber_roster_update(%s): [Source: "
+		                  "groups]: groups: %s\n", name, tmp);
+		g_free(tmp);
 	} else {
 		GSList *buddies = purple_find_buddies(js->gc->account, name);
+		char *tmp;
+
 		if(!buddies)
 			return;
 		while(buddies) {
@@ -296,6 +297,11 @@ static void jabber_roster_update(JabberStream *js, const char *name,
 			groups = g_slist_append(groups, (char *)purple_group_get_name(g));
 			buddies = g_slist_remove(buddies, b);
 		}
+
+		tmp = roster_groups_join(groups);
+		purple_debug_info("jabber", "jabber_roster_update(%s): [Source: local blist]: groups: %s\n",
+		                  name, tmp);
+		g_free(tmp);
 	}
 
 	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
@@ -313,8 +319,7 @@ static void jabber_roster_update(JabberStream *js, const char *name,
 		xmlnode_insert_data(group, l->data, -1);
 	}
 
-	if(!grps)
-		g_slist_free(groups);
+	g_slist_free(groups);
 
 	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) {
 		jabber_google_roster_outgoing(js, query, item);
@@ -331,10 +336,10 @@ void jabber_roster_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
 	char *who;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
-	char *my_bare_jid;
 	const char *name;
 
-	if(!js->roster_parsed)
+	/* If we haven't received the roster yet, ignore any adds */
+	if (js->state != JABBER_STREAM_CONNECTED)
 		return;
 
 	name = purple_buddy_get_name(buddy);
@@ -343,16 +348,13 @@ void jabber_roster_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
 
 	jb = jabber_buddy_find(js, name, FALSE);
 
-	jabber_roster_update(js, who, NULL);
+	purple_debug_info("jabber", "jabber_roster_add_buddy(): Adding %s\n",
+	                  name);
 
-	my_bare_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
-	if(!strcmp(who, my_bare_jid)) {
-		PurplePresence *gpresence;
-		PurpleStatus *status;
+	jabber_roster_update(js, who, NULL);
 
-		gpresence = purple_account_get_presence(js->gc->account);
-		status = purple_presence_get_active_status(gpresence);
-		jabber_presence_fake_to_self(js, status);
+	if (jb == js->user_jb) {
+		jabber_presence_fake_to_self(js, NULL);
 	} else if(!jb || !(jb->subscription & JABBER_SUB_TO)) {
 		jabber_presence_subscription_set(js, who, "subscribe");
 	} else if((jbr =jabber_buddy_find_resource(jb, NULL))) {
@@ -361,7 +363,6 @@ void jabber_roster_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
 				"priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL);
 	}
 
-	g_free(my_bare_jid);
 	g_free(who);
 }
 
@@ -372,6 +373,9 @@ void jabber_roster_alias_change(PurpleConnection *gc, const char *name, const ch
 	if(b != NULL) {
 		purple_blist_alias_buddy(b, alias);
 
+		purple_debug_info("jabber", "jabber_roster_alias_change(): Aliased %s to %s\n",
+				name, alias ? alias : "(null)");
+
 		jabber_roster_update(gc->proto_data, name, NULL);
 	}
 }
@@ -398,8 +402,11 @@ void jabber_roster_group_change(PurpleConnection *gc, const char *name,
 			groups = g_slist_append(groups, (char*)gname);
 		buddies = g_slist_remove(buddies, b);
 	}
+
+	purple_debug_info("jabber", "jabber_roster_group_change(): Moving %s from %s to %s\n",
+	                  name, old_group, new_group);
+
 	jabber_roster_update(gc->proto_data, name, groups);
-	g_slist_free(groups);
 }
 
 void jabber_roster_group_rename(PurpleConnection *gc, const char *old_name,
@@ -431,8 +438,10 @@ void jabber_roster_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
 			buddies = g_slist_remove(buddies, tmpbuddy);
 		}
 
+		purple_debug_info("jabber", "jabber_roster_remove_buddy(): Removing %s from %s\n",
+		                  purple_buddy_get_name(buddy), purple_group_get_name(group));
+
 		jabber_roster_update(gc->proto_data, name, groups);
-		g_slist_free(groups);
 	} else {
 		JabberIq *iq = jabber_iq_new_query(gc->proto_data, JABBER_IQ_SET,
 				"jabber:iq:roster");
@@ -442,6 +451,9 @@ void jabber_roster_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
 		xmlnode_set_attrib(item, "jid", name);
 		xmlnode_set_attrib(item, "subscription", "remove");
 
+		purple_debug_info("jabber", "jabber_roster_remove_buddy(): Removing %s\n",
+		                  purple_buddy_get_name(buddy));
+
 		jabber_iq_send(iq);
 	}
 }
diff --git a/libpurple/protocols/jabber/roster.h b/libpurple/protocols/jabber/roster.h
index a20ac309ee..d84b806bd7 100644
--- a/libpurple/protocols/jabber/roster.h
+++ b/libpurple/protocols/jabber/roster.h
@@ -19,14 +19,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_ROSTER_H_
-#define _PURPLE_JABBER_ROSTER_H_
+#ifndef PURPLE_JABBER_ROSTER_H_
+#define PURPLE_JABBER_ROSTER_H_
 
 #include "jabber.h"
 
 void jabber_roster_request(JabberStream *js);
 
-void jabber_roster_parse(JabberStream *js, xmlnode *packet);
+void jabber_roster_parse(JabberStream *js, const char *from,
+                         JabberIqType type, const char *id, xmlnode *query);
 
 void jabber_roster_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
 		PurpleGroup *group);
@@ -39,4 +40,4 @@ void jabber_roster_group_rename(PurpleConnection *gc, const char *old_name,
 void jabber_roster_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
 		PurpleGroup *group);
 
-#endif /* _PURPLE_JABBER_ROSTER_H_ */
+#endif /* PURPLE_JABBER_ROSTER_H_ */
diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c
index d4560a09ec..fcd3eb911a 100644
--- a/libpurple/protocols/jabber/si.c
+++ b/libpurple/protocols/jabber/si.c
@@ -51,9 +51,9 @@ typedef struct _JabberSIXfer {
 	char *iq_id;
 
 	enum {
-		STREAM_METHOD_UNKNOWN = 0,
+		STREAM_METHOD_UNKNOWN     = 0,
 		STREAM_METHOD_BYTESTREAMS = 2 << 1,
-		STREAM_METHOD_IBB = 2 << 2,
+		STREAM_METHOD_IBB         = 2 << 2,
 		STREAM_METHOD_UNSUPPORTED = 2 << 31
 	} stream_method;
 
@@ -67,7 +67,7 @@ typedef struct _JabberSIXfer {
 
 	JabberIBBSession *ibb_session;
 	guint ibb_timeout_handle;
-	FILE *fp;
+	PurpleCircBuffer *ibb_buffer;
 } JabberSIXfer;
 
 /* some forward declarations */
@@ -311,20 +311,18 @@ static void jabber_si_bytestreams_attempt_connect(PurpleXfer *xfer)
 	}
 }
 
-void jabber_bytestreams_parse(JabberStream *js, xmlnode *packet)
+void jabber_bytestreams_parse(JabberStream *js, const char *from,
+                              JabberIqType type, const char *id, xmlnode *query)
 {
 	PurpleXfer *xfer;
 	JabberSIXfer *jsx;
-	xmlnode *query, *streamhost;
-	const char *sid, *from, *type;
-
-	if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "set"))
-		return;
+	xmlnode *streamhost;
+	const char *sid;
 
-	if(!(from = xmlnode_get_attrib(packet, "from")))
+	if(type != JABBER_IQ_SET)
 		return;
 
-	if(!(query = xmlnode_get_child(packet, "query")))
+	if(!from)
 		return;
 
 	if(!(sid = xmlnode_get_attrib(query, "sid")))
@@ -340,7 +338,7 @@ void jabber_bytestreams_parse(JabberStream *js, xmlnode *packet)
 
 	if(jsx->iq_id)
 		g_free(jsx->iq_id);
-	jsx->iq_id = g_strdup(xmlnode_get_attrib(packet, "id"));
+	jsx->iq_id = g_strdup(id);
 
 	for(streamhost = xmlnode_get_child(query, "streamhost"); streamhost;
 			streamhost = xmlnode_get_next_twin(streamhost)) {
@@ -409,7 +407,7 @@ jabber_si_xfer_bytestreams_send_read_again_cb(gpointer data, gint source,
 {
 	PurpleXfer *xfer = data;
 	JabberSIXfer *jsx = xfer->data;
-	char buffer[256];
+	char buffer[42]; /* 40 for DST.ADDR + 2 bytes for port number*/
 	int len;
 	char *dstaddr, *hash;
 	const char *host;
@@ -433,16 +431,21 @@ jabber_si_xfer_bytestreams_send_read_again_cb(gpointer data, gint source,
 		jsx->rxlen += len;
 		return;
 	} else if(jsx->rxqueue[0] != 0x05 || jsx->rxqueue[1] != 0x01 ||
-			jsx->rxqueue[3] != 0x03) {
-		purple_debug_info("jabber", "invalid socks5 stuff\n");
+			jsx->rxqueue[3] != 0x03 || jsx->rxqueue[4] != 40) {
+		purple_debug_info("jabber", "Invalid socks5 conn req. header[0x%x,0x%x,0x%x,0x%x,0x%x]\n",
+				  jsx->rxqueue[0], jsx->rxqueue[1], jsx->rxqueue[2],
+				  jsx->rxqueue[3], jsx->rxqueue[4]);
 		purple_input_remove(xfer->watcher);
 		xfer->watcher = 0;
 		close(source);
 		purple_xfer_cancel_remote(xfer);
 		return;
 	} else if(jsx->rxlen - 5 <  jsx->rxqueue[4] + 2) {
-		purple_debug_info("jabber", "reading umpteen more bytes\n");
-		len = read(source, buffer, jsx->rxqueue[4] + 5 + 2 - jsx->rxlen);
+		/* Upper-bound of 257 (jsx->rxlen = 5, jsx->rxqueue[4] = 0xFF) */
+		unsigned short to_read = jsx->rxqueue[4] + 2 - (jsx->rxlen - 5);
+		purple_debug_info("jabber", "reading %u bytes for DST.ADDR + port num (trying to read %hu now)\n",
+				  jsx->rxqueue[4] + 2, to_read);
+		len = read(source, buffer, to_read);
 		if(len < 0 && errno == EAGAIN)
 			return;
 		else if(len <= 0) {
@@ -457,6 +460,7 @@ jabber_si_xfer_bytestreams_send_read_again_cb(gpointer data, gint source,
 		jsx->rxlen += len;
 	}
 
+	/* Have we not read all of DST.ADDR and the following 2-byte port number? */
 	if(jsx->rxlen - 5 < jsx->rxqueue[4] + 2)
 		return;
 
@@ -470,9 +474,16 @@ jabber_si_xfer_bytestreams_send_read_again_cb(gpointer data, gint source,
 	/* Per XEP-0065, the 'host' must be SHA1(SID + from JID + to JID) */
 	hash = jabber_calculate_data_sha1sum(dstaddr, strlen(dstaddr));
 
-	if(jsx->rxqueue[4] != 40 || strncmp(hash, jsx->rxqueue+5, 40) ||
+	if(strncmp(hash, jsx->rxqueue + 5, 40) ||
 			jsx->rxqueue[45] != 0x00 || jsx->rxqueue[46] != 0x00) {
-		purple_debug_error("jabber", "someone connected with the wrong info!\n");
+		if (jsx->rxqueue[45] != 0x00 || jsx->rxqueue[46] != 0x00)
+			purple_debug_error("jabber", "Got SOCKS5 BS conn with the wrong DST.PORT"
+						     " (must be 0 - got[0x%x,0x%x]).\n",
+						     jsx->rxqueue[45], jsx->rxqueue[46]);
+		else
+			purple_debug_error("jabber", "Got SOCKS5 BS conn with the wrong DST.ADDR"
+						     " (expected '%s' - got '%.40s').\n",
+						     hash, jsx->rxqueue + 5);
 		close(source);
 		purple_xfer_cancel_remote(xfer);
 		g_free(hash);
@@ -533,11 +544,13 @@ jabber_si_xfer_bytestreams_send_read_response_cb(gpointer data, gint source,
 	purple_input_remove(xfer->watcher);
 	xfer->watcher = 0;
 
+	/* If we sent a "Success", wait for a response, otherwise give up and cancel */
 	if (jsx->rxqueue[1] == 0x00) {
 		xfer->watcher = purple_input_add(source, PURPLE_INPUT_READ,
 			jabber_si_xfer_bytestreams_send_read_again_cb, xfer);
 		g_free(jsx->rxqueue);
 		jsx->rxqueue = NULL;
+		jsx->rxlen = 0;
 	} else {
 		close(source);
 		purple_xfer_cancel_remote(xfer);
@@ -558,6 +571,7 @@ jabber_si_xfer_bytestreams_send_read_cb(gpointer data, gint source,
 
 	xfer->fd = source;
 
+	/** Try to read the SOCKS5 header */
 	if(jsx->rxlen < 2) {
 		purple_debug_info("jabber", "reading those first two bytes\n");
 		len = read(source, buffer, 2 - jsx->rxlen);
@@ -574,9 +588,12 @@ jabber_si_xfer_bytestreams_send_read_cb(gpointer data, gint source,
 		memcpy(jsx->rxqueue + jsx->rxlen, buffer, len);
 		jsx->rxlen += len;
 		return;
-	} else if(jsx->rxlen - 2 <  jsx->rxqueue[1]) {
-		purple_debug_info("jabber", "reading the next umpteen bytes\n");
-		len = read(source, buffer, jsx->rxqueue[1] + 2 - jsx->rxlen);
+	} else if(jsx->rxlen - 2 < jsx->rxqueue[1]) {
+		/* Has a maximum value of 255 (jsx->rxlen = 2, jsx->rxqueue[1] = 0xFF) */
+		unsigned short to_read = jsx->rxqueue[1] - (jsx->rxlen - 2);
+		purple_debug_info("jabber", "reading %u bytes for auth methods (trying to read %hu now)\n",
+				  jsx->rxqueue[1], to_read);
+		len = read(source, buffer, to_read);
 		if(len < 0 && errno == EAGAIN)
 			return;
 		else if(len <= 0) {
@@ -591,6 +608,7 @@ jabber_si_xfer_bytestreams_send_read_cb(gpointer data, gint source,
 		jsx->rxlen += len;
 	}
 
+	/* Have we not read all the auth. method bytes? */
 	if(jsx->rxlen -2 < jsx->rxqueue[1])
 		return;
 
@@ -685,13 +703,14 @@ jabber_si_xfer_bytestreams_send_connected_cb(gpointer data, gint source,
 }
 
 static void
-jabber_si_connect_proxy_cb(JabberStream *js, xmlnode *packet,
-		gpointer data)
+jabber_si_connect_proxy_cb(JabberStream *js, const char *from,
+                           JabberIqType type, const char *id,
+                           xmlnode *packet, gpointer data)
 {
 	PurpleXfer *xfer = data;
 	JabberSIXfer *jsx;
 	xmlnode *query, *streamhost_used;
-	const char *from, *type, *jid;
+	const char *jid;
 	GList *matched;
 
 	/* TODO: This need to send errors if we don't see what we're looking for */
@@ -708,37 +727,34 @@ jabber_si_connect_proxy_cb(JabberStream *js, xmlnode *packet,
 
 	jsx = xfer->data;
 
-	if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "result")) {
-	  purple_debug_info("jabber",
-			    "jabber_si_xfer_connect_proxy_cb: type = %s\n",
-			    type);
-		if (type && !strcmp(type, "error")) {
-			/* if IBB is available, open IBB session */
-			purple_debug_info("jabber",
-				"jabber_si_xfer_connect_proxy_cb: got error, method: %d\n",
-				jsx->stream_method);
-			if (jsx->stream_method & STREAM_METHOD_IBB) {
-				purple_debug_info("jabber", "IBB is possible, try it\n");
-				/* if we are the sender and haven't already opened an IBB
-				  session, do so now (we might already have failed to open
-				  the bytestream proxy ourselves when receiving this <iq/> */
-				if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND
-					&& !jsx->ibb_session) {
-					jabber_si_xfer_ibb_send_init(js, xfer);
-				} else {
-					jsx->ibb_timeout_handle = purple_timeout_add_seconds(30,
-						jabber_si_bytestreams_ibb_timeout_cb, xfer);
-				}
-				/* if we are receiver, just wait for IBB open stanza, callback
-				  is already set up */
+	if(type != JABBER_IQ_RESULT) {
+		purple_debug_info("jabber",
+			    "jabber_si_xfer_connect_proxy_cb: type = error\n");
+		/* if IBB is available, open IBB session */
+		purple_debug_info("jabber",
+			"jabber_si_xfer_connect_proxy_cb: got error, method: %d\n",
+			jsx->stream_method);
+		if (jsx->stream_method & STREAM_METHOD_IBB) {
+			purple_debug_info("jabber", "IBB is possible, try it\n");
+			/* if we are the sender and haven't already opened an IBB
+			  session, do so now (we might already have failed to open
+			  the bytestream proxy ourselves when receiving this <iq/> */
+			if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND
+				&& !jsx->ibb_session) {
+				jabber_si_xfer_ibb_send_init(js, xfer);
 			} else {
-				purple_xfer_cancel_remote(xfer);
+				jsx->ibb_timeout_handle = purple_timeout_add_seconds(30,
+					jabber_si_bytestreams_ibb_timeout_cb, xfer);
 			}
+			/* if we are receiver, just wait for IBB open stanza, callback
+			  is already set up */
+		} else {
+			purple_xfer_cancel_remote(xfer);
 		}
 		return;
 	}
 
-	if(!(from = xmlnode_get_attrib(packet, "from")))
+	if (!from)
 		return;
 
 	if(!(query = xmlnode_get_child(packet, "query")))
@@ -960,10 +976,10 @@ jabber_si_xfer_ibb_error_cb(JabberIBBSession *sess)
 	PurpleConnection *gc = js->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);
 
-	purple_debug_error("jabber", "an error occured during IBB file transfer\n");
+	purple_debug_error("jabber", "an error occurred during IBB file transfer\n");
 	purple_xfer_error(purple_xfer_get_type(xfer), account,
 		jabber_ibb_session_get_who(sess),
-			_("An error occured on the in-band bytestream transfer\n"));
+			_("An error occurred on the in-band bytestream transfer\n"));
 	purple_xfer_cancel_remote(xfer);
 }
 
@@ -996,18 +1012,8 @@ jabber_si_xfer_ibb_recv_data_cb(JabberIBBSession *sess, gpointer data,
 	if (size <= purple_xfer_get_bytes_remaining(xfer)) {
 		purple_debug_info("jabber", "about to write %" G_GSIZE_FORMAT " bytes from IBB stream\n",
 			size);
-		if(!fwrite(data, size, 1, jsx->fp)) {
-			purple_debug_error("jabber", "error writing to file\n");
-			purple_xfer_cancel_remote(xfer);
-			return;
-		}
-		purple_xfer_set_bytes_sent(xfer, purple_xfer_get_bytes_sent(xfer) + size);
-		purple_xfer_update_progress(xfer);
-
-		if (purple_xfer_get_bytes_remaining(xfer) == 0) {
-			purple_xfer_set_completed(xfer, TRUE);
-			purple_xfer_end(xfer);
-		}
+		purple_circ_buffer_append(jsx->ibb_buffer, data, size);
+		purple_xfer_prpl_ready(xfer);
 	} else {
 		/* trying to write past size of file transfers negotiated size,
 		  reject transfer to protect against malicious behaviour */
@@ -1018,32 +1024,39 @@ jabber_si_xfer_ibb_recv_data_cb(JabberIBBSession *sess, gpointer data,
 
 }
 
+static gssize
+jabber_si_xfer_ibb_read(guchar **out_buffer, PurpleXfer *xfer)
+{
+	JabberSIXfer *jsx = xfer->data;
+	guchar *buffer;
+	gsize size;
+	gsize tmp;
+
+	size = jsx->ibb_buffer->bufused;
+	*out_buffer = buffer = g_malloc(size);
+	while ((tmp = purple_circ_buffer_get_max_read(jsx->ibb_buffer))) {
+		memcpy(buffer, jsx->ibb_buffer->outptr, tmp);
+		buffer += tmp;
+		purple_circ_buffer_mark_read(jsx->ibb_buffer, tmp);
+	}
+
+	return size;
+}
+
 static gboolean
-jabber_si_xfer_ibb_open_cb(JabberStream *js, xmlnode *packet)
+jabber_si_xfer_ibb_open_cb(JabberStream *js, const char *who, const char *id,
+                           xmlnode *open)
 {
-	const gchar *who = xmlnode_get_attrib(packet, "from");
-	xmlnode *open = xmlnode_get_child(packet, "open");
 	const gchar *sid = xmlnode_get_attrib(open, "sid");
 	PurpleXfer *xfer = jabber_si_xfer_find(js, sid, who);
 	if (xfer) {
 		JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 		JabberIBBSession *sess =
-			jabber_ibb_session_create_from_xmlnode(js, packet, xfer);
-		const char *filename;
+			jabber_ibb_session_create_from_xmlnode(js, who, id, open, xfer);
 
 		jabber_si_bytestreams_ibb_timeout_remove(jsx);
 
 		if (sess) {
-			/* open the file to write to */
-			filename = purple_xfer_get_local_filename(xfer);
-			jsx->fp = g_fopen(filename, "wb");
-			if (jsx->fp == NULL) {
-				purple_debug_error("jabber", "failed to open file %s for writing: %s\n",
-					filename, g_strerror(errno));
-				purple_xfer_cancel_remote(xfer);
-				return FALSE;
-			}
-
 			/* setup callbacks here...*/
 			jabber_ibb_session_set_data_received_callback(sess,
 				jabber_si_xfer_ibb_recv_data_cb);
@@ -1053,9 +1066,14 @@ jabber_si_xfer_ibb_open_cb(JabberStream *js, xmlnode *packet)
 				jabber_si_xfer_ibb_error_cb);
 
 			jsx->ibb_session = sess;
+			jsx->ibb_buffer =
+				purple_circ_buffer_new(jabber_ibb_session_get_block_size(sess));
+
+			/* set up read function */
+			purple_xfer_set_read_fnc(xfer, jabber_si_xfer_ibb_read);
 
 			/* start the transfer */
-			purple_xfer_start(xfer, 0, NULL, 0);
+			purple_xfer_start(xfer, -1, NULL, 0);
 			return TRUE;
 		} else {
 			/* failed to create IBB session */
@@ -1071,31 +1089,17 @@ jabber_si_xfer_ibb_open_cb(JabberStream *js, xmlnode *packet)
 	}
 }
 
-static void
-jabber_si_xfer_ibb_send_data(JabberIBBSession *sess)
+static gssize
+jabber_si_xfer_ibb_write(const guchar *buffer, size_t len, PurpleXfer *xfer)
 {
-	PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
 	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
-	gsize remaining = purple_xfer_get_bytes_remaining(xfer);
-	gsize packet_size = remaining < jabber_ibb_session_get_block_size(sess) ?
-		remaining : jabber_ibb_session_get_block_size(sess);
-	gpointer data = g_malloc(packet_size);
-	int res;
-
-	purple_debug_info("jabber", "IBB: about to read %" G_GSIZE_FORMAT " bytes from file %p\n",
-		packet_size, jsx->fp);
-	res = fread(data, packet_size, 1, jsx->fp);
-
-	if (res == 1) {
-		jabber_ibb_session_send_data(sess, data, packet_size);
-		purple_xfer_set_bytes_sent(xfer,
-			purple_xfer_get_bytes_sent(xfer) + packet_size);
-		purple_xfer_update_progress(xfer);
-	} else {
-		purple_debug_error("jabber",
-			"jabber_si_xfer_ibb_send_data: error reading from file\n");
-		purple_xfer_cancel_local(xfer);
-	}
+	JabberIBBSession *sess = jsx->ibb_session;
+	gsize packet_size = len < jabber_ibb_session_get_block_size(sess) ?
+		len : jabber_ibb_session_get_block_size(sess);
+
+	jabber_ibb_session_send_data(sess, buffer, packet_size);
+
+	return packet_size;
 }
 
 static void
@@ -1111,7 +1115,7 @@ jabber_si_xfer_ibb_sent_cb(JabberIBBSession *sess)
 		purple_xfer_end(xfer);
 	} else {
 		/* send more... */
-		jabber_si_xfer_ibb_send_data(sess);
+		purple_xfer_prpl_ready(xfer);
 	}
 }
 
@@ -1119,28 +1123,13 @@ static void
 jabber_si_xfer_ibb_opened_cb(JabberIBBSession *sess)
 {
 	PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
-	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 	JabberStream *js = jabber_ibb_session_get_js(sess);
 	PurpleConnection *gc = js->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);
 
 	if (jabber_ibb_session_get_state(sess) == JABBER_IBB_SESSION_OPENED) {
-		const char *filename = purple_xfer_get_local_filename(xfer);
-		jsx->fp = g_fopen(filename, "rb");
-		if (jsx->fp == NULL) {
-			purple_debug_error("jabber", "Failed to open file %s for reading: %s\n",
-				filename, g_strerror(errno));
-			purple_xfer_error(purple_xfer_get_type(xfer), account,
-				jabber_ibb_session_get_who(sess),
-				_("Failed to open the file"));
-			purple_xfer_cancel_local(xfer);
-			return;
-		}
-
-		purple_xfer_start(xfer, 0, NULL, 0);
-		purple_xfer_set_bytes_sent(xfer, 0);
-		purple_xfer_update_progress(xfer);
-		jabber_si_xfer_ibb_send_data(sess);
+		purple_xfer_start(xfer, -1, NULL, 0);
+		purple_xfer_prpl_ready(xfer);
 	} else {
 		/* error */
 		purple_xfer_error(purple_xfer_get_type(xfer), account,
@@ -1155,8 +1144,6 @@ jabber_si_xfer_ibb_send_init(JabberStream *js, PurpleXfer *xfer)
 {
 	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 
-	purple_xfer_ref(xfer);
-
 	jsx->ibb_session = jabber_ibb_session_create(js, jsx->stream_id,
 		purple_xfer_get_remote_user(xfer), xfer);
 
@@ -1171,6 +1158,11 @@ jabber_si_xfer_ibb_send_init(JabberStream *js, PurpleXfer *xfer)
 		jabber_ibb_session_set_error_callback(jsx->ibb_session,
 			jabber_si_xfer_ibb_error_cb);
 
+		purple_xfer_set_write_fnc(xfer, jabber_si_xfer_ibb_write);
+
+		jsx->ibb_buffer =
+			purple_circ_buffer_new(jabber_ibb_session_get_block_size(jsx->ibb_session));
+
 		/* open the IBB session */
 		jabber_ibb_session_open(jsx->ibb_session);
 
@@ -1182,8 +1174,9 @@ jabber_si_xfer_ibb_send_init(JabberStream *js, PurpleXfer *xfer)
 	}
 }
 
-static void jabber_si_xfer_send_method_cb(JabberStream *js, xmlnode *packet,
-		gpointer data)
+static void jabber_si_xfer_send_method_cb(JabberStream *js, const char *from,
+                                          JabberIqType type, const char *id,
+                                          xmlnode *packet, gpointer data)
 {
 	PurpleXfer *xfer = data;
 	xmlnode *si, *feature, *x, *field, *value;
@@ -1304,6 +1297,11 @@ static void jabber_si_xfer_free(PurpleXfer *xfer)
 			jabber_iq_remove_callback_by_id(js, jsx->iq_id);
 		if (jsx->local_streamhost_fd >= 0)
 			close(jsx->local_streamhost_fd);
+		if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND &&
+			xfer->fd >= 0) {
+			purple_debug_info("jabber", "remove port mapping\n");
+			purple_network_remove_port_mapping(xfer->fd);
+		}
 		if (jsx->connect_timeout > 0)
 			purple_timeout_remove(jsx->connect_timeout);
 		if (jsx->ibb_timeout_handle > 0)
@@ -1320,20 +1318,18 @@ static void jabber_si_xfer_free(PurpleXfer *xfer)
 			jabber_ibb_session_destroy(jsx->ibb_session);
 		}
 
-		if (jsx->fp) {
-			purple_debug_info("jabber",
-				"jabber_si_xfer_free: closing file for IBB transfer\n");
-			fclose(jsx->fp);
+		if (jsx->ibb_buffer) {
+			purple_circ_buffer_destroy(jsx->ibb_buffer);
 		}
 
+		purple_debug_info("jabber", "jabber_si_xfer_free(): freeing jsx %p\n", jsx);
+
 		g_free(jsx->stream_id);
 		g_free(jsx->iq_id);
 		/* XXX: free other stuff */
 		g_free(jsx->rxqueue);
 		g_free(jsx);
 		xfer->data = NULL;
-
-		purple_debug_info("jabber", "jabber_si_xfer_free(): freeing jsx %p\n", jsx);
 	}
 }
 
@@ -1357,6 +1353,31 @@ static void jabber_si_xfer_cancel_send(PurpleXfer *xfer)
 
 static void jabber_si_xfer_request_denied(PurpleXfer *xfer)
 {
+	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
+	JabberStream *js = jsx->js;
+
+	/*
+	 * TODO: It's probably an error if jsx->iq_id == NULL. g_return_if_fail
+	 * might be warranted.
+	 */
+	if (jsx->iq_id && !jsx->accepted) {
+		JabberIq *iq;
+		xmlnode *error, *child;
+		iq = jabber_iq_new(js, JABBER_IQ_ERROR);
+		xmlnode_set_attrib(iq->node, "to", xfer->who);
+		jabber_iq_set_id(iq, jsx->iq_id);
+
+		error = xmlnode_new_child(iq->node, "error");
+		xmlnode_set_attrib(error, "type", "cancel");
+		child = xmlnode_new_child(error, "forbidden");
+		xmlnode_set_namespace(child, "urn:ietf:params:xml:ns:xmpp-stanzas");
+		child = xmlnode_new_child(error, "text");
+		xmlnode_set_namespace(child, "urn:ietf:params:xml:ns:xmpp-stanzas");
+		xmlnode_insert_data(child, "Offer Declined", -1);
+
+		jabber_iq_send(iq);
+	}
+
 	jabber_si_xfer_free(xfer);
 	purple_debug(PURPLE_DEBUG_INFO, "jabber", "in jabber_si_xfer_request_denied\n");
 }
@@ -1399,6 +1420,7 @@ static void jabber_si_xfer_send_disco_cb(JabberStream *js, const char *who,
 		purple_notify_error(js->gc, _("File Send Failed"),
 				_("File Send Failed"), msg);
 		g_free(msg);
+		purple_xfer_cancel_local(xfer);
 	}
 }
 
@@ -1412,13 +1434,38 @@ static void do_transfer_send(PurpleXfer *xfer, const char *resource)
 	JabberSIXfer *jsx = xfer->data;
 	char **who_v = g_strsplit(xfer->who, "/", 2);
 	char *who;
+	JabberBuddy *jb;
+	JabberBuddyResource *jbr = NULL;
+
+	jb = jabber_buddy_find(jsx->js, who_v[0], FALSE);
+	if (jb) {
+		jbr = jabber_buddy_find_resource(jb, resource);
+	}
 
 	who = g_strdup_printf("%s/%s", who_v[0], resource);
 	g_strfreev(who_v);
 	g_free(xfer->who);
 	xfer->who = who;
-	jabber_disco_info_do(jsx->js, who,
-			jabber_si_xfer_send_disco_cb, xfer);
+
+	if (jbr) {
+		char *msg;
+
+		if (jabber_resource_has_capability(jbr, XEP_0047_NAMESPACE))
+			jsx->stream_method |= STREAM_METHOD_IBB;
+		if (jabber_resource_has_capability(jbr, "http://jabber.org/protocol/si/profile/file-transfer")) {
+			jabber_si_xfer_send_request(xfer);
+			return;
+		}
+
+		msg = g_strdup_printf(_("Unable to send file to %s, user does not support file transfers"), who);
+		purple_notify_error(jsx->js->gc, _("File Send Failed"),
+				_("File Send Failed"), msg);
+		g_free(msg);
+		purple_xfer_cancel_local(xfer);
+	} else {
+		jabber_disco_info_do(jsx->js, who,
+				jabber_si_xfer_send_disco_cb, xfer);
+	}
 }
 
 static void resource_select_ok_cb(PurpleXfer *xfer, PurpleRequestFields *fields)
@@ -1507,6 +1554,8 @@ static void jabber_si_xfer_init(PurpleXfer *xfer)
 		xmlnode_set_attrib(iq->node, "to", xfer->who);
 		if(jsx->iq_id)
 			jabber_iq_set_id(iq, jsx->iq_id);
+		else
+			purple_debug_error("jabber", "Sending SI result with new IQ id.\n");
 
 		jsx->accepted = TRUE;
 
@@ -1556,7 +1605,6 @@ PurpleXfer *jabber_si_new_xfer(PurpleConnection *gc, const char *who)
 		jsx->local_streamhost_fd = -1;
 
 		jsx->ibb_session = NULL;
-		jsx->fp = NULL;
 
 		purple_xfer_set_init_fnc(xfer, jabber_si_xfer_init);
 		purple_xfer_set_cancel_send_fnc(xfer, jabber_si_xfer_cancel_send);
@@ -1584,17 +1632,15 @@ void jabber_si_xfer_send(PurpleConnection *gc, const char *who, const char *file
 		purple_xfer_request(xfer);
 }
 
-void jabber_si_parse(JabberStream *js, xmlnode *packet)
+void jabber_si_parse(JabberStream *js, const char *from, JabberIqType type,
+                     const char *id, xmlnode *si)
 {
 	JabberSIXfer *jsx;
 	PurpleXfer *xfer;
-	xmlnode *si, *file, *feature, *x, *field, *option, *value;
-	const char *stream_id, *filename, *filesize_c, *profile, *from;
+	xmlnode *file, *feature, *x, *field, *option, *value;
+	const char *stream_id, *filename, *filesize_c, *profile;
 	size_t filesize = 0;
 
-	if(!(si = xmlnode_get_child(packet, "si")))
-		return;
-
 	if(!(profile = xmlnode_get_attrib(si, "profile")) ||
 			strcmp(profile, "http://jabber.org/protocol/si/profile/file-transfer"))
 		return;
@@ -1617,7 +1663,7 @@ void jabber_si_parse(JabberStream *js, xmlnode *packet)
 	if(!(x = xmlnode_get_child_with_namespace(feature, "x", "jabber:x:data")))
 		return;
 
-	if(!(from = xmlnode_get_attrib(packet, "from")))
+	if(!from)
 		return;
 
 	/* if they've already sent us this file transfer with the same damn id
@@ -1658,31 +1704,32 @@ void jabber_si_parse(JabberStream *js, xmlnode *packet)
 
 	jsx->js = js;
 	jsx->stream_id = g_strdup(stream_id);
-	jsx->iq_id = g_strdup(xmlnode_get_attrib(packet, "id"));
+	jsx->iq_id = g_strdup(id);
 
 	xfer = purple_xfer_new(js->gc->account, PURPLE_XFER_RECEIVE, from);
-	if (xfer)
-	{
-		xfer->data = jsx;
+	g_return_if_fail(xfer != NULL);
 
-		purple_xfer_set_filename(xfer, filename);
-		if(filesize > 0)
-			purple_xfer_set_size(xfer, filesize);
+	xfer->data = jsx;
 
-		purple_xfer_set_init_fnc(xfer, jabber_si_xfer_init);
-		purple_xfer_set_request_denied_fnc(xfer, jabber_si_xfer_request_denied);
-		purple_xfer_set_cancel_recv_fnc(xfer, jabber_si_xfer_cancel_recv);
-		purple_xfer_set_end_fnc(xfer, jabber_si_xfer_end);
+	purple_xfer_set_filename(xfer, filename);
+	if(filesize > 0)
+		purple_xfer_set_size(xfer, filesize);
 
-		js->file_transfers = g_list_append(js->file_transfers, xfer);
+	purple_xfer_set_init_fnc(xfer, jabber_si_xfer_init);
+	purple_xfer_set_request_denied_fnc(xfer, jabber_si_xfer_request_denied);
+	purple_xfer_set_cancel_recv_fnc(xfer, jabber_si_xfer_cancel_recv);
+	purple_xfer_set_end_fnc(xfer, jabber_si_xfer_end);
 
-		purple_xfer_request(xfer);
-	}
+	js->file_transfers = g_list_append(js->file_transfers, xfer);
+
+	purple_xfer_request(xfer);
 }
 
 void
 jabber_si_init(void)
 {
+	jabber_iq_register_handler("si", "http://jabber.org/protocol/si", jabber_si_parse);
+
 	jabber_ibb_register_open_handler(jabber_si_xfer_ibb_open_cb);
 }
 
diff --git a/libpurple/protocols/jabber/si.h b/libpurple/protocols/jabber/si.h
index 120046fc59..8186d94554 100644
--- a/libpurple/protocols/jabber/si.h
+++ b/libpurple/protocols/jabber/si.h
@@ -1,5 +1,5 @@
 /**
- * @file jutil.h utility functions
+ * @file si.h SI transfer functions
  *
  * purple
  *
@@ -19,18 +19,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_SI_H_
-#define _PURPLE_JABBER_SI_H_
+#ifndef PURPLE_JABBER_SI_H_
+#define PURPLE_JABBER_SI_H_
 
 #include "ft.h"
 
 #include "jabber.h"
 
-void jabber_bytestreams_parse(JabberStream *js, xmlnode *packet);
-void jabber_si_parse(JabberStream *js, xmlnode *packet);
+void jabber_bytestreams_parse(JabberStream *js, const char *from,
+                              JabberIqType type, const char *id, xmlnode *query);
+void jabber_si_parse(JabberStream *js, const char *from, JabberIqType type,
+                     const char *id, xmlnode *si);
 PurpleXfer *jabber_si_new_xfer(PurpleConnection *gc, const char *who);
 void jabber_si_xfer_send(PurpleConnection *gc, const char *who, const char *file);
 void jabber_si_init(void);
 void jabber_si_uninit(void);
 
-#endif /* _PURPLE_JABBER_SI_H_ */
+#endif /* PURPLE_JABBER_SI_H_ */
diff --git a/libpurple/protocols/jabber/useravatar.c b/libpurple/protocols/jabber/useravatar.c
new file mode 100644
index 0000000000..dabe2873bc
--- /dev/null
+++ b/libpurple/protocols/jabber/useravatar.c
@@ -0,0 +1,392 @@
+/*
+ * purple - Jabber Protocol Plugin
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA	 02111-1307	 USA
+ *
+ */
+
+#include "internal.h"
+
+#include "useravatar.h"
+#include "pep.h"
+#include "debug.h"
+
+#define MAX_HTTP_BUDDYICON_BYTES (200 * 1024)
+
+static void update_buddy_metadata(JabberStream *js, const char *from, xmlnode *items);
+
+void jabber_avatar_init(void)
+{
+	jabber_add_feature(NS_AVATAR_1_1_METADATA,
+	                   jabber_pep_namespace_only_when_pep_enabled_cb);
+	jabber_add_feature(NS_AVATAR_1_1_DATA,
+	                   jabber_pep_namespace_only_when_pep_enabled_cb);
+
+	jabber_pep_register_handler(NS_AVATAR_1_1_METADATA,
+	                            update_buddy_metadata);
+}
+
+static void
+remove_avatar_0_12_nodes(JabberStream *js)
+{
+#if 0
+	/* See note below for why this is #if 0'd */
+
+	/* Publish an empty avatar according to the XEP-0084 v0.12 semantics */
+	xmlnode *publish, *item, *metadata;
+	/* publish the metadata */
+	publish = xmlnode_new("publish");
+	xmlnode_set_attrib(publish, "node", NS_AVATAR_0_12_METADATA);
+
+	item = xmlnode_new_child(publish, "item");
+	xmlnode_set_attrib(item, "id", "stop");
+
+	metadata = xmlnode_new_child(item, "metadata");
+	xmlnode_set_namespace(metadata, NS_AVATAR_0_12_METADATA);
+
+	xmlnode_new_child(metadata, "stop");
+
+	/* publish */
+	jabber_pep_publish(js, publish);
+#endif
+
+	/*
+	 * This causes ejabberd 2.0.0 to kill the connection unceremoniously.
+	 * See https://support.process-one.net/browse/EJAB-623. When adiumx.com
+	 * was upgraded, the issue went away.
+	 *
+	 * I think it makes a lot of sense to not have an avatar at the old
+	 * node instead of having something interpreted as "no avatar". When
+	 * a contact with an older client logs in, in the latter situation,
+	 * there's a race between interpreting the <presence/> vcard-temp:x:update
+	 * avatar (non-empty) and the XEP-0084 v0.12 avatar (empty, so show no
+	 * avatar for the buddy) which leads to unhappy and confused users.
+	 *
+	 * A deluge of frustrating "Read error" bug reports may change my mind
+	 * about this.
+	 * --darkrain42
+	 */
+	jabber_pep_delete_node(js, NS_AVATAR_0_12_METADATA);
+	jabber_pep_delete_node(js, NS_AVATAR_0_12_DATA);
+}
+
+void jabber_avatar_set(JabberStream *js, PurpleStoredImage *img)
+{
+	xmlnode *publish, *metadata, *item;
+
+	if (!js->pep)
+		return;
+
+	/* Hmmm, not sure if this is worth the traffic, but meh */
+	remove_avatar_0_12_nodes(js);
+
+	if (!img) {
+		publish = xmlnode_new("publish");
+		xmlnode_set_attrib(publish, "node", NS_AVATAR_1_1_METADATA);
+
+		item = xmlnode_new_child(publish, "item");
+		metadata = xmlnode_new_child(item, "metadata");
+		xmlnode_set_namespace(metadata, NS_AVATAR_1_1_METADATA);
+
+		/* publish */
+		jabber_pep_publish(js, publish);
+	} else {
+		/*
+		 * TODO: This is pretty gross.  The Jabber PRPL really shouldn't
+		 *       do voodoo to try to determine the image type, height
+		 *       and width.
+		 */
+		/* A PNG header, including the IHDR, but nothing else */
+		const struct {
+			guchar signature[8]; /* must be hex 89 50 4E 47 0D 0A 1A 0A */
+			struct {
+				guint32 length; /* must be 0x0d */
+				guchar type[4]; /* must be 'I' 'H' 'D' 'R' */
+				guint32 width;
+				guint32 height;
+				guchar bitdepth;
+				guchar colortype;
+				guchar compression;
+				guchar filter;
+				guchar interlace;
+			} ihdr;
+		} *png = purple_imgstore_get_data(img); /* ATTN: this is in network byte order! */
+
+		/* check if the data is a valid png file (well, at least to some extent) */
+		if(png->signature[0] == 0x89 &&
+		   png->signature[1] == 0x50 &&
+		   png->signature[2] == 0x4e &&
+		   png->signature[3] == 0x47 &&
+		   png->signature[4] == 0x0d &&
+		   png->signature[5] == 0x0a &&
+		   png->signature[6] == 0x1a &&
+		   png->signature[7] == 0x0a &&
+		   ntohl(png->ihdr.length) == 0x0d &&
+		   png->ihdr.type[0] == 'I' &&
+		   png->ihdr.type[1] == 'H' &&
+		   png->ihdr.type[2] == 'D' &&
+		   png->ihdr.type[3] == 'R') {
+			/* parse PNG header to get the size of the image (yes, this is required) */
+			guint32 width = ntohl(png->ihdr.width);
+			guint32 height = ntohl(png->ihdr.height);
+			xmlnode *data, *info;
+			char *lengthstring, *widthstring, *heightstring;
+
+			/* compute the sha1 hash */
+			char *hash = jabber_calculate_data_sha1sum(purple_imgstore_get_data(img),
+			                                           purple_imgstore_get_size(img));
+			char *base64avatar = purple_base64_encode(purple_imgstore_get_data(img),
+			                                          purple_imgstore_get_size(img));
+
+			publish = xmlnode_new("publish");
+			xmlnode_set_attrib(publish, "node", NS_AVATAR_1_1_DATA);
+
+			item = xmlnode_new_child(publish, "item");
+			xmlnode_set_attrib(item, "id", hash);
+
+			data = xmlnode_new_child(item, "data");
+			xmlnode_set_namespace(data, NS_AVATAR_1_1_DATA);
+
+			xmlnode_insert_data(data, base64avatar, -1);
+			/* publish the avatar itself */
+			jabber_pep_publish(js, publish);
+
+			g_free(base64avatar);
+
+			lengthstring = g_strdup_printf("%" G_GSIZE_FORMAT,
+			                               purple_imgstore_get_size(img));
+			widthstring = g_strdup_printf("%u", width);
+			heightstring = g_strdup_printf("%u", height);
+
+			/* publish the metadata */
+			publish = xmlnode_new("publish");
+			xmlnode_set_attrib(publish, "node", NS_AVATAR_1_1_METADATA);
+
+			item = xmlnode_new_child(publish, "item");
+			xmlnode_set_attrib(item, "id", hash);
+
+			metadata = xmlnode_new_child(item, "metadata");
+			xmlnode_set_namespace(metadata, NS_AVATAR_1_1_METADATA);
+
+			info = xmlnode_new_child(metadata, "info");
+			xmlnode_set_attrib(info, "id", hash);
+			xmlnode_set_attrib(info, "type", "image/png");
+			xmlnode_set_attrib(info, "bytes", lengthstring);
+			xmlnode_set_attrib(info, "width", widthstring);
+			xmlnode_set_attrib(info, "height", heightstring);
+
+			jabber_pep_publish(js, publish);
+
+			g_free(lengthstring);
+			g_free(widthstring);
+			g_free(heightstring);
+			g_free(hash);
+		} else {
+			purple_debug_error("jabber", "Cannot set PEP avatar to non-PNG data\n");
+		}
+	}
+}
+
+static void
+do_got_own_avatar_0_12_cb(JabberStream *js, const char *from, xmlnode *items)
+{
+	if (items)
+		/* It wasn't an error (i.e. 'item-not-found') */
+		remove_avatar_0_12_nodes(js);
+}
+
+static void
+do_got_own_avatar_cb(JabberStream *js, const char *from, xmlnode *items)
+{
+	xmlnode *item = NULL, *metadata = NULL, *info = NULL;
+	PurpleAccount *account = purple_connection_get_account(js->gc);
+	const char *server_hash = NULL;
+
+	if (items && (item = xmlnode_get_child(items, "item")) &&
+			(metadata = xmlnode_get_child(item, "metadata")) &&
+			(info = xmlnode_get_child(metadata, "info"))) {
+		server_hash = xmlnode_get_attrib(info, "id");
+	}
+
+	/*
+	 * If we have an avatar and the server returned an error/malformed data,
+	 * push our avatar. If the server avatar doesn't match the local one, push
+	 * our avatar.
+	 */
+	if (((!items || !metadata) && js->initial_avatar_hash) ||
+			!purple_strequal(server_hash, js->initial_avatar_hash)) {
+		PurpleStoredImage *img = purple_buddy_icons_find_account_icon(account);
+		jabber_avatar_set(js, img);
+		purple_imgstore_unref(img);
+	}
+}
+
+void jabber_avatar_fetch_mine(JabberStream *js)
+{
+	char *jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
+	jabber_pep_request_item(js, jid, NS_AVATAR_0_12_METADATA, NULL,
+	                        do_got_own_avatar_0_12_cb);
+	jabber_pep_request_item(js, jid, NS_AVATAR_1_1_METADATA, NULL,
+	                        do_got_own_avatar_cb);
+	g_free(jid);
+}
+
+typedef struct _JabberBuddyAvatarUpdateURLInfo {
+	JabberStream *js;
+	char *from;
+	char *id;
+} JabberBuddyAvatarUpdateURLInfo;
+
+static void
+do_buddy_avatar_update_fromurl(PurpleUtilFetchUrlData *url_data,
+                               gpointer user_data, const gchar *url_text,
+                               gsize len, const gchar *error_message)
+{
+	JabberBuddyAvatarUpdateURLInfo *info = user_data;
+	gpointer icon_data;
+
+	if(!url_text) {
+		purple_debug(PURPLE_DEBUG_ERROR, "jabber",
+		             "do_buddy_avatar_update_fromurl got error \"%s\"",
+		             error_message);
+		goto out;
+	}
+
+	icon_data = g_memdup(url_text, len);
+	purple_buddy_icons_set_for_user(purple_connection_get_account(info->js->gc), info->from, icon_data, len, info->id);
+
+out:
+	g_free(info->from);
+	g_free(info->id);
+	g_free(info);
+}
+
+static void
+do_buddy_avatar_update_data(JabberStream *js, const char *from, xmlnode *items)
+{
+	xmlnode *item, *data;
+	const char *checksum;
+	char *b64data;
+	void *img;
+	size_t size;
+	if(!items)
+		return;
+
+	item = xmlnode_get_child(items, "item");
+	if(!item)
+		return;
+
+	data = xmlnode_get_child(item, "data");
+	if(!data)
+		return;
+
+	checksum = xmlnode_get_attrib(item,"id");
+	if(!checksum)
+		return;
+
+	b64data = xmlnode_get_data(data);
+	if(!b64data)
+		return;
+
+	img = purple_base64_decode(b64data, &size);
+	if(!img) {
+		g_free(b64data);
+		return;
+	}
+
+	purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, img, size, checksum);
+	g_free(b64data);
+}
+
+static void
+update_buddy_metadata(JabberStream *js, const char *from, xmlnode *items)
+{
+	PurpleBuddy *buddy = purple_find_buddy(purple_connection_get_account(js->gc), from);
+	const char *checksum;
+	xmlnode *item, *metadata;
+	if(!buddy)
+		return;
+
+	if (!items)
+		return;
+
+	item = xmlnode_get_child(items,"item");
+	if (!item)
+		return;
+
+	metadata = xmlnode_get_child(item, "metadata");
+	if(!metadata)
+		return;
+
+	checksum = purple_buddy_icons_get_checksum_for_user(buddy);
+
+	/* <stop/> was the pre-v1.1 method of publishing an empty avatar */
+	if(xmlnode_get_child(metadata, "stop")) {
+		purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, NULL, 0, NULL);
+	} else {
+		xmlnode *info, *goodinfo = NULL;
+		gboolean has_children = FALSE;
+
+		/* iterate over all info nodes to get one we can use */
+		for(info = metadata->child; info; info = info->next) {
+			if(info->type == XMLNODE_TYPE_TAG)
+				has_children = TRUE;
+			if(info->type == XMLNODE_TYPE_TAG && !strcmp(info->name,"info")) {
+				const char *type = xmlnode_get_attrib(info,"type");
+				const char *id = xmlnode_get_attrib(info,"id");
+
+				if(checksum && id && !strcmp(id, checksum)) {
+					/* we already have that avatar, so we don't have to do anything */
+					goodinfo = NULL;
+					break;
+				}
+				/* We'll only pick the png one for now. It's a very nice image format anyways. */
+				if(type && id && !goodinfo && !strcmp(type, "image/png"))
+					goodinfo = info;
+			}
+		}
+		if(has_children == FALSE) {
+			purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, NULL, 0, NULL);
+		} else if(goodinfo) {
+			const char *url = xmlnode_get_attrib(goodinfo, "url");
+			const char *id = xmlnode_get_attrib(goodinfo,"id");
+
+			/* the avatar might either be stored in a pep node, or on a HTTP(S) URL */
+			if(!url) {
+				jabber_pep_request_item(js, from, NS_AVATAR_1_1_DATA, id,
+				                        do_buddy_avatar_update_data);
+			} else {
+				PurpleUtilFetchUrlData *url_data;
+				JabberBuddyAvatarUpdateURLInfo *info = g_new0(JabberBuddyAvatarUpdateURLInfo, 1);
+				info->js = js;
+
+				url_data = purple_util_fetch_url_len(url, TRUE, NULL, TRUE,
+										  MAX_HTTP_BUDDYICON_BYTES,
+										  do_buddy_avatar_update_fromurl, info);
+				if (url_data) {
+					info->from = g_strdup(from);
+					info->id = g_strdup(id);
+					js->url_datas = g_slist_prepend(js->url_datas, url_data);
+				} else
+					g_free(info);
+
+			}
+		}
+	}
+}
diff --git a/libpurple/protocols/jabber/useravatar.h b/libpurple/protocols/jabber/useravatar.h
new file mode 100644
index 0000000000..0ae77dfdfa
--- /dev/null
+++ b/libpurple/protocols/jabber/useravatar.h
@@ -0,0 +1,43 @@
+/*
+ * purple - Jabber Protocol Plugin
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA	 02111-1307	 USA
+ *
+ */
+
+#ifndef _PURPLE_JABBER_USERAVATAR_H_
+#define _PURPLE_JABBER_USERAVATAR_H_
+
+#include "jabber.h"
+#include "imgstore.h"
+
+/* Implementation of XEP-0084 */
+
+#define NS_AVATAR_0_12_DATA     "http://www.xmpp.org/extensions/xep-0084.html#ns-data"
+#define NS_AVATAR_0_12_METADATA "http://www.xmpp.org/extensions/xep-0084.html#ns-metadata"
+
+#define NS_AVATAR_1_1_DATA      "urn:xmpp:avatar:data"
+#define NS_AVATAR_1_1_METADATA  "urn:xmpp:avatar:metadata"
+
+void jabber_avatar_init(void);
+void jabber_avatar_set(JabberStream *js, PurpleStoredImage *img);
+
+void jabber_avatar_fetch_mine(JabberStream *js);
+
+#endif /* _PURPLE_JABBER_USERAVATAR_H_ */
diff --git a/libpurple/protocols/jabber/usermood.c b/libpurple/protocols/jabber/usermood.c
index 217d0926dd..0caaa2fd83 100644
--- a/libpurple/protocols/jabber/usermood.c
+++ b/libpurple/protocols/jabber/usermood.c
@@ -141,8 +141,8 @@ static void jabber_mood_cb(JabberStream *js, const char *from, xmlnode *items) {
 }
 
 void jabber_mood_init(void) {
-	jabber_add_feature("mood", "http://jabber.org/protocol/mood", jabber_pep_namespace_only_when_pep_enabled_cb);
-	jabber_pep_register_handler("moodn", "http://jabber.org/protocol/mood", jabber_mood_cb);
+	jabber_add_feature("http://jabber.org/protocol/mood", jabber_pep_namespace_only_when_pep_enabled_cb);
+	jabber_pep_register_handler("http://jabber.org/protocol/mood", jabber_mood_cb);
 }
 
 static void do_mood_set_from_fields(PurpleConnection *gc, PurpleRequestFields *fields) {
diff --git a/libpurple/protocols/jabber/usermood.h b/libpurple/protocols/jabber/usermood.h
index 425c8065ca..ebea275ba9 100644
--- a/libpurple/protocols/jabber/usermood.h
+++ b/libpurple/protocols/jabber/usermood.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_USERMOOD_H_
-#define _PURPLE_JABBER_USERMOOD_H_
+#ifndef PURPLE_JABBER_USERMOOD_H_
+#define PURPLE_JABBER_USERMOOD_H_
 
 #include "jabber.h"
 
@@ -34,4 +34,4 @@ void jabber_mood_set(JabberStream *js,
 		     const char *mood, /* must be one of the valid strings defined in the XEP */
 		     const char *text /* might be NULL */);
 
-#endif /* _PURPLE_JABBER_USERMOOD_H_ */
+#endif /* PURPLE_JABBER_USERMOOD_H_ */
diff --git a/libpurple/protocols/jabber/usernick.c b/libpurple/protocols/jabber/usernick.c
index ff269ceeb5..7a6a5c0c5a 100644
--- a/libpurple/protocols/jabber/usernick.c
+++ b/libpurple/protocols/jabber/usernick.c
@@ -35,7 +35,7 @@ static void jabber_nick_cb(JabberStream *js, const char *from, xmlnode *items) {
 	xmlnode *nick;
 	char *nickname = NULL;
 
-	/* ignore the tune of people not on our buddy list */
+	/* ignore the nick of people not on our buddy list */
 	if (!buddy || !item)
 		return;
 
@@ -65,7 +65,10 @@ static void do_nick_set(JabberStream *js, const char *nick) {
 
 static void do_nick_got_own_nick_cb(JabberStream *js, const char *from, xmlnode *items) {
 	char *oldnickname = NULL;
-	xmlnode *item = xmlnode_get_child(items,"item");
+	xmlnode *item = NULL;
+	
+	if (items)
+		item = xmlnode_get_child(items,"item");
 
 	if(item) {
 		xmlnode *nick = xmlnode_get_child_with_namespace(item,"nick","http://jabber.org/protocol/nick");
@@ -92,8 +95,8 @@ static void do_nick_set_nick(PurplePluginAction *action) {
 }
 
 void jabber_nick_init(void) {
-	jabber_add_feature("nick", "http://jabber.org/protocol/nick", jabber_pep_namespace_only_when_pep_enabled_cb);
-	jabber_pep_register_handler("nickn", "http://jabber.org/protocol/nick", jabber_nick_cb);
+	jabber_add_feature("http://jabber.org/protocol/nick", jabber_pep_namespace_only_when_pep_enabled_cb);
+	jabber_pep_register_handler("http://jabber.org/protocol/nick", jabber_nick_cb);
 }
 
 void jabber_nick_init_action(GList **m) {
diff --git a/libpurple/protocols/jabber/usernick.h b/libpurple/protocols/jabber/usernick.h
index 60a7e03026..f3f000041a 100644
--- a/libpurple/protocols/jabber/usernick.h
+++ b/libpurple/protocols/jabber/usernick.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_USERNICK_H_
-#define _PURPLE_JABBER_USERNICK_H_
+#ifndef PURPLE_JABBER_USERNICK_H_
+#define PURPLE_JABBER_USERNICK_H_
 
 #include "jabber.h"
 
@@ -29,4 +29,4 @@
 void jabber_nick_init(void);
 void jabber_nick_init_action(GList **m);
 
-#endif /* _PURPLE_JABBER_USERNICK_H_ */
+#endif /* PURPLE_JABBER_USERNICK_H_ */
diff --git a/libpurple/protocols/jabber/usertune.c b/libpurple/protocols/jabber/usertune.c
index 73139d5920..0c1996cc0e 100644
--- a/libpurple/protocols/jabber/usertune.c
+++ b/libpurple/protocols/jabber/usertune.c
@@ -109,8 +109,8 @@ static void jabber_tune_cb(JabberStream *js, const char *from, xmlnode *items) {
 }
 
 void jabber_tune_init(void) {
-	jabber_add_feature("tune", "http://jabber.org/protocol/tune", jabber_pep_namespace_only_when_pep_enabled_cb);
-	jabber_pep_register_handler("tunen", "http://jabber.org/protocol/tune", jabber_tune_cb);
+	jabber_add_feature("http://jabber.org/protocol/tune", jabber_pep_namespace_only_when_pep_enabled_cb);
+	jabber_pep_register_handler("http://jabber.org/protocol/tune", jabber_tune_cb);
 }
 
 void jabber_tune_set(PurpleConnection *gc, const PurpleJabberTuneInfo *tuneinfo) {
diff --git a/libpurple/protocols/jabber/usertune.h b/libpurple/protocols/jabber/usertune.h
index 9457b29480..8b72923c1b 100644
--- a/libpurple/protocols/jabber/usertune.h
+++ b/libpurple/protocols/jabber/usertune.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _PURPLE_JABBER_USERTUNE_H_
-#define _PURPLE_JABBER_USERTUNE_H_
+#ifndef PURPLE_JABBER_USERTUNE_H_
+#define PURPLE_JABBER_USERTUNE_H_
 
 #include "jabber.h"
 
@@ -40,4 +40,4 @@ void jabber_tune_init(void);
 
 void jabber_tune_set(PurpleConnection *gc, const PurpleJabberTuneInfo *tuneinfo);
 
-#endif /* _PURPLE_JABBER_USERTUNE_H_ */
+#endif /* PURPLE_JABBER_USERTUNE_H_ */
diff --git a/libpurple/protocols/jabber/xdata.c b/libpurple/protocols/jabber/xdata.c
index 1d2571c269..3a1914fc32 100644
--- a/libpurple/protocols/jabber/xdata.c
+++ b/libpurple/protocols/jabber/xdata.c
@@ -153,11 +153,12 @@ static void jabber_x_data_ok_cb(struct jabber_x_data_data *data, PurpleRequestFi
 	}
 	g_free(data);
 
-	if (hasActions) {
+	if (hasActions)
 		cb(js, result, actionhandle, user_data);
-		g_free(actionhandle);
-	} else
+	else
 		((jabber_x_data_cb)cb)(js, result, user_data);
+
+	g_free(actionhandle);
 }
 
 static void jabber_x_data_cancel_cb(struct jabber_x_data_data *data, PurpleRequestFields *fields) {
diff --git a/libpurple/protocols/jabber/xdata.h b/libpurple/protocols/jabber/xdata.h
index e99dcaf482..c0cba5b931 100644
--- a/libpurple/protocols/jabber/xdata.h
+++ b/libpurple/protocols/jabber/xdata.h
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _PURPLE_JABBER_XDATA_H_
-#define _PURPLE_JABBER_XDATA_H_
+#ifndef PURPLE_JABBER_XDATA_H_
+#define PURPLE_JABBER_XDATA_H_
 
 #include "jabber.h"
 #include "xmlnode.h"
@@ -35,4 +35,4 @@ typedef void (*jabber_x_data_action_cb)(JabberStream *js, xmlnode *result, const
 void *jabber_x_data_request(JabberStream *js, xmlnode *packet, jabber_x_data_cb cb, gpointer user_data);
 void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GList *actions, int defaultaction, jabber_x_data_action_cb cb, gpointer user_data);
 
-#endif /* _PURPLE_JABBER_XDATA_H_ */
+#endif /* PURPLE_JABBER_XDATA_H_ */
diff --git a/libpurple/protocols/msn/Makefile.mingw b/libpurple/protocols/msn/Makefile.mingw
index fe75c1cb68..40d5ea9db8 100644
--- a/libpurple/protocols/msn/Makefile.mingw
+++ b/libpurple/protocols/msn/Makefile.mingw
@@ -41,7 +41,6 @@ C_SRC =			cmdproc.c \
 			command.c \
 			contact.c\
 			dialog.c \
-			directconn.c \
 			error.c \
 			group.c \
 			history.c \
diff --git a/libpurple/protocols/msn/cmdproc.c b/libpurple/protocols/msn/cmdproc.c
index e487c77a66..0b3646353b 100644
--- a/libpurple/protocols/msn/cmdproc.c
+++ b/libpurple/protocols/msn/cmdproc.c
@@ -117,8 +117,10 @@ msn_cmdproc_send_trans(MsnCmdProc *cmdproc, MsnTransaction *trans)
 
 	servconn = cmdproc->servconn;
 
-	if (!servconn->connected)
+	if (!servconn->connected) {
+		/* TODO: Need to free trans */
 		return;
+	}
 
 	msn_history_add(cmdproc->history, trans);
 
@@ -208,6 +210,7 @@ msn_cmdproc_send(MsnCmdProc *cmdproc, const char *command,
 
 	trans = g_new0(MsnTransaction, 1);
 
+	trans->cmdproc = cmdproc;
 	trans->command = g_strdup(command);
 
 	if (format != NULL)
@@ -330,60 +333,38 @@ msn_cmdproc_process_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 			trans->timer = 0;
 		}
 
-	if (g_ascii_isdigit(cmd->command[0]))
+	if (g_ascii_isdigit(cmd->command[0]) && trans != NULL)
 	{
-		if (trans != NULL)
-		{
-			MsnErrorCb error_cb = NULL;
-			int error;
+		MsnErrorCb error_cb;
+		int error;
 
-			error = atoi(cmd->command);
+		error = atoi(cmd->command);
 
-			if (trans->error_cb != NULL)
-				error_cb = trans->error_cb;
+		error_cb = trans->error_cb;
+		if (error_cb == NULL)
+			error_cb = g_hash_table_lookup(cmdproc->cbs_table->errors, trans->command);
 
-			if (error_cb == NULL && cmdproc->cbs_table->errors != NULL)
-				error_cb = g_hash_table_lookup(cmdproc->cbs_table->errors, trans->command);
+		if (error_cb != NULL)
+			error_cb(cmdproc, trans, error);
+		else
+			msn_error_handle(cmdproc->session, error);
 
-			if (error_cb != NULL)
-			{
-				error_cb(cmdproc, trans, error);
-			}
-			else
-			{
-#if 1
-				msn_error_handle(cmdproc->session, error);
-#else
-				purple_debug_warning("msn", "Unhandled error '%s'\n",
-								   cmd->command);
-#endif
-			}
-
-			return;
-		}
+		return;
 	}
 
-	if (cmdproc->cbs_table->async != NULL)
-		cb = g_hash_table_lookup(cmdproc->cbs_table->async, cmd->command);
+	cb = g_hash_table_lookup(cmdproc->cbs_table->async, cmd->command);
 
-	if (cb == NULL && trans != NULL)
-	{
-		if (trans->callbacks != NULL)
-			cb = g_hash_table_lookup(trans->callbacks, cmd->command);
-	}
+	if (cb == NULL && trans != NULL && trans->callbacks != NULL)
+		cb = g_hash_table_lookup(trans->callbacks, cmd->command);
 
-	if (cb == NULL && cmdproc->cbs_table->fallback != NULL)
+	if (cb == NULL)
 		cb = g_hash_table_lookup(cmdproc->cbs_table->fallback, cmd->command);
 
 	if (cb != NULL)
-	{
 		cb(cmdproc, cmd);
-	}
 	else
-	{
 		purple_debug_warning("msn", "Unhandled command '%s'\n",
 						   cmd->command);
-	}
 
 	if (trans != NULL && trans->pendent_cmd != NULL)
 		msn_transaction_unqueue_cmd(trans, cmdproc);
diff --git a/libpurple/protocols/msn/contact.c b/libpurple/protocols/msn/contact.c
index 1310ce1b74..cf70e4947c 100644
--- a/libpurple/protocols/msn/contact.c
+++ b/libpurple/protocols/msn/contact.c
@@ -351,35 +351,52 @@ static void
 msn_parse_each_member(MsnSession *session, xmlnode *member, const char *node,
 	MsnListId list)
 {
-	char *passport = xmlnode_get_data(xmlnode_get_child(member, node));
-	char *type = xmlnode_get_data(xmlnode_get_child(member, "Type"));
-	char *member_id = xmlnode_get_data(xmlnode_get_child(member, "MembershipId"));
-	MsnUser *user = msn_userlist_find_add_user(session->userlist, passport, NULL);
+	char *passport;
+	char *type;
+	char *member_id;
+	MsnUser *user;
 	xmlnode *annotation;
 	guint nid = MSN_NETWORK_UNKNOWN;
+	char *invite = NULL;
 
-	/* For EmailMembers, the network must be found in the annotations. */
-	if (!strcmp(node, "PassportName")) {
-		nid = MSN_NETWORK_PASSPORT;
-	} else {
-		for (annotation = xmlnode_get_child(member, "Annotations/Annotation");
-		     annotation;
-		     annotation = xmlnode_get_next_twin(annotation)) {
-			char *name = xmlnode_get_data(xmlnode_get_child(annotation, "Name"));
-			if (name && !strcmp(name, "MSN.IM.BuddyType")) {
-				char *value = xmlnode_get_data(xmlnode_get_child(annotation, "Value"));
-				if (value != NULL)
-					nid = strtoul(value, NULL, 10);
-				g_free(value);
+	passport = xmlnode_get_data(xmlnode_get_child(member, node));
+	if (!purple_email_is_valid(passport)) {
+		g_free(passport);
+		return;
+	}
+
+	type = xmlnode_get_data(xmlnode_get_child(member, "Type"));
+	member_id = xmlnode_get_data(xmlnode_get_child(member, "MembershipId"));
+	user = msn_userlist_find_add_user(session->userlist, passport, NULL);
+
+	for (annotation = xmlnode_get_child(member, "Annotations/Annotation");
+	     annotation;
+	     annotation = xmlnode_get_next_twin(annotation)) {
+		char *name = xmlnode_get_data(xmlnode_get_child(annotation, "Name"));
+		char *value = xmlnode_get_data(xmlnode_get_child(annotation, "Value"));
+		if (name && value) {
+			if (!strcmp(name, "MSN.IM.BuddyType")) {
+				nid = strtoul(value, NULL, 10);
+			}
+			else if (!strcmp(name, "MSN.IM.InviteMessage")) {
+				invite = value;
+				value = NULL;
 			}
-			g_free(name);
 		}
+		g_free(name);
+		g_free(value);
 	}
 
+	/* For EmailMembers, the network must be found in the annotations, above.
+	   Otherwise, PassportMembers are on the Passport network. */
+	if (!strcmp(node, "PassportName"))
+		nid = MSN_NETWORK_PASSPORT;
+
 	purple_debug_info("msn", "CL: %s name: %s, Type: %s, MembershipID: %s, NetworkID: %u\n",
 		node, passport, type, member_id == NULL ? "(null)" : member_id, nid);
 
 	msn_user_set_network(user, nid);
+	msn_user_set_invite_message(user, invite);
 
 	if (member_id) {
 		user->membership_id[list] = atoi(member_id);
@@ -390,6 +407,7 @@ msn_parse_each_member(MsnSession *session, xmlnode *member, const char *node,
 	g_free(passport);
 	g_free(type);
 	g_free(member_id);
+	g_free(invite);
 }
 
 static void
@@ -697,24 +715,25 @@ msn_parse_addressbook_contacts(MsnSession *session, xmlnode *node)
 				/*TODO:  need to support the Mobile type*/
 				continue;
 			}
-			for (contactEmailNode = xmlnode_get_child(emailsNode, "ContactEmail"); contactEmailNode;
-					contactEmailNode = xmlnode_get_next_twin(contactEmailNode)) {
-				if (!(messengerEnabledNode = xmlnode_get_child(contactEmailNode, "isMessengerEnabled")))
-					continue;
+			for (contactEmailNode = xmlnode_get_child(emailsNode, "ContactEmail");
+			     contactEmailNode;
+			     contactEmailNode = xmlnode_get_next_twin(contactEmailNode)) {
+				if ((messengerEnabledNode = xmlnode_get_child(contactEmailNode, "isMessengerEnabled"))) {
 
-				msnEnabled = xmlnode_get_data(messengerEnabledNode);
+					msnEnabled = xmlnode_get_data(messengerEnabledNode);
 
-				if (msnEnabled && !strcmp(msnEnabled, "true")) {
-					if ((emailNode = xmlnode_get_child(contactEmailNode, "email")))
-						passport = xmlnode_get_data(emailNode);
+					if (msnEnabled && !strcmp(msnEnabled, "true")) {
+						if ((emailNode = xmlnode_get_child(contactEmailNode, "email")))
+							passport = xmlnode_get_data(emailNode);
+
+						/* Messenger enabled, Get the Passport*/
+						purple_debug_info("msn", "AB Yahoo/Federated User %s\n", passport ? passport : "(null)");
+						g_free(msnEnabled);
+						break;
+					}
 
-					/*Messenger enabled, Get the Passport*/
-					purple_debug_info("msn", "AB Yahoo/Federated User %s\n", passport ? passport : "(null)");
 					g_free(msnEnabled);
-					break;
 				}
-
-				g_free(msnEnabled);
 			}
 		} else {
 			xmlnode *messenger_user;
@@ -733,9 +752,13 @@ msn_parse_addressbook_contacts(MsnSession *session, xmlnode *node)
 			passport = xmlnode_get_data(passportName);
 		}
 
+		/* Couldn't find anything */
 		if (passport == NULL)
 			continue;
 
+		if (!purple_email_is_valid(passport))
+			continue;
+
 		if ((displayName = xmlnode_get_child(contactInfo, "displayName")))
 			Name = xmlnode_get_data(displayName);
 		else
@@ -1149,7 +1172,7 @@ msn_add_contact_to_group(MsnSession *session, MsnCallbackState *state,
 {
 	MsnUserList *userlist;
 	MsnUser *user;
-	gchar *body = NULL, *contact_xml;
+	gchar *body = NULL, *contact_xml, *invite;
 
 	g_return_if_fail(passport != NULL);
 	g_return_if_fail(groupId != NULL);
@@ -1197,7 +1220,23 @@ msn_add_contact_to_group(MsnSession *session, MsnCallbackState *state,
 		contact_xml = g_strdup_printf(MSN_CONTACT_XML, passport);
 	}
 
-	body = g_strdup_printf(MSN_ADD_CONTACT_GROUP_TEMPLATE, groupId, contact_xml);
+	if (user->invite_message) {
+		char *tmp;
+		body = g_markup_escape_text(user->invite_message, -1);
+		tmp = g_markup_escape_text(purple_connection_get_display_name(session->account->gc), -1);
+		invite = g_strdup_printf(MSN_CONTACT_INVITE_MESSAGE_XML, body, tmp);
+		g_free(body);
+		g_free(tmp);
+
+		/* We can free this now */
+		g_free(user->invite_message);
+		user->invite_message = NULL;
+
+	} else {
+		invite = g_strdup("");
+	}
+
+	body = g_strdup_printf(MSN_ADD_CONTACT_GROUP_TEMPLATE, groupId, contact_xml, invite);
 
 	state->body = xmlnode_from_str(body, -1);
 	state->post_action = MSN_ADD_CONTACT_GROUP_SOAP_ACTION;
@@ -1205,6 +1244,7 @@ msn_add_contact_to_group(MsnSession *session, MsnCallbackState *state,
 	state->cb = msn_add_contact_to_group_read_cb;
 	msn_contact_request(state);
 
+	g_free(invite);
 	g_free(contact_xml);
 	g_free(body);
 }
@@ -1482,8 +1522,6 @@ msn_del_contact_from_list(MsnSession *session, MsnCallbackState *state,
 			  const gchar *passport, const MsnListId list)
 {
 	gchar *body = NULL, *member = NULL;
-	const char *type = "PassportMember";
-	gchar *federate = NULL;
 	MsnSoapPartnerScenario partner_scenario;
 	MsnUser *user;
 
@@ -1501,23 +1539,28 @@ msn_del_contact_from_list(MsnSession *session, MsnCallbackState *state,
 	msn_callback_state_set_who(state, passport);
 
 	user = msn_userlist_find_user(session->userlist, passport);
-	if (user && user->networkid != MSN_NETWORK_PASSPORT) {
-		type = "EmailMember";
-		federate = g_strdup_printf(MSN_MEMBER_FEDERATED_ANNOTATION_XML,
-		                           user->networkid);
-	}
 	
 	if (list == MSN_LIST_PL) {
 		partner_scenario = MSN_PS_CONTACT_API;
-		member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
-		                         type, user->membership_id[MSN_LIST_PL],
-		                         federate ? federate : "");
+		if (user && user->networkid != MSN_NETWORK_PASSPORT)
+			member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
+			                         "EmailMember", "Email",
+			                         user->membership_id[MSN_LIST_PL]);
+		else
+			member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
+			                         "PassportMember", "Passport",
+			                         user->membership_id[MSN_LIST_PL]);
 	} else {
 		/* list == MSN_LIST_AL || list == MSN_LIST_BL */
 		partner_scenario = MSN_PS_BLOCK_UNBLOCK;
-		member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
-		                         type, passport,
-		                         federate ? federate : "");
+		if (user && user->networkid != MSN_NETWORK_PASSPORT)
+			member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
+			                         "EmailMember", "Email",
+			                         "Email", passport, "Email");
+		else
+			member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
+			                         "PassportMember", "Passport",
+			                         "PassportName", passport, "PassportName");
 	}
 
 	body = g_strdup_printf(MSN_CONTACT_DELETE_FROM_LIST_TEMPLATE,
@@ -1530,7 +1573,6 @@ msn_del_contact_from_list(MsnSession *session, MsnCallbackState *state,
 	state->cb = msn_del_contact_from_list_read_cb;
 	msn_contact_request(state);
 
-	g_free(federate);
 	g_free(member);
 	g_free(body);
 }
@@ -1578,8 +1620,6 @@ msn_add_contact_to_list(MsnSession *session, MsnCallbackState *state,
 			const gchar *passport, const MsnListId list)
 {
 	gchar *body = NULL, *member = NULL;
-	const char *type = "PassportMember";
-	gchar *federate = NULL;
 	MsnSoapPartnerScenario partner_scenario;
 	MsnUser *user;
 
@@ -1596,15 +1636,16 @@ msn_add_contact_to_list(MsnSession *session, MsnCallbackState *state,
 	msn_callback_state_set_who(state, passport);
 
 	user = msn_userlist_find_user(session->userlist, passport);
-	if (user && user->networkid != MSN_NETWORK_PASSPORT) {
-		type = "EmailMember";
-		federate = g_strdup_printf(MSN_MEMBER_FEDERATED_ANNOTATION_XML,
-		                           user->networkid);
-	}
 
 	partner_scenario = (list == MSN_LIST_RL) ? MSN_PS_CONTACT_API : MSN_PS_BLOCK_UNBLOCK;
-	member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
-	                         type, state->who, federate ? federate : "");
+	if (user && user->networkid != MSN_NETWORK_PASSPORT)
+		member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
+		                         "EmailMember", "Email",
+		                         "Email", state->who, "Email");
+	else
+		member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
+		                         "PassportMember", "Passport",
+		                         "PassportName", state->who, "PassportName");
 
 	body = g_strdup_printf(MSN_CONTACT_ADD_TO_LIST_TEMPLATE,
 		MsnSoapPartnerScenarioText[partner_scenario],
@@ -1616,7 +1657,6 @@ msn_add_contact_to_list(MsnSession *session, MsnCallbackState *state,
 	state->cb = msn_add_contact_to_list_read_cb;
 	msn_contact_request(state);
 
-	g_free(federate);
 	g_free(member);
 	g_free(body);
 }
diff --git a/libpurple/protocols/msn/contact.h b/libpurple/protocols/msn/contact.h
index 8c0f612f95..b44097c794 100644
--- a/libpurple/protocols/msn/contact.h
+++ b/libpurple/protocols/msn/contact.h
@@ -232,6 +232,17 @@
 		"</contactInfo>"\
 	"</Contact>"
 
+#define MSN_CONTACT_INVITE_MESSAGE_XML \
+	"<MessengerMemberInfo>"\
+		"<PendingAnnotations>"\
+			"<Annotation>"\
+				"<Name>MSN.IM.InviteMessage</Name>"\
+				"<Value>%s</Value>"\
+			"</Annotation>"\
+		"</PendingAnnotations>"\
+		"<DisplayName>%s</DisplayName>"\
+	"</MessengerMemberInfo>"
+
 #define MSN_ADD_CONTACT_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
 "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\""\
 	" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""\
@@ -290,6 +301,7 @@
 				"<fGenerateMissingQuickName>true</fGenerateMissingQuickName>"\
 				"<EnableAllowListManagement>true</EnableAllowListManagement>"\
 			"</groupContactAddOptions>"\
+			"%s"\
 		"</ABGroupContactAdd>"\
 	"</soap:Body>"\
 "</soap:Envelope>"
@@ -397,28 +409,18 @@
 
 #define MSN_MEMBER_PASSPORT_XML	\
 	"<Member xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"%s\">"\
-		"<Type>Passport</Type>"\
+		"<Type>%s</Type>"\
 		"<State>Accepted</State>"\
-		"<PassportName>%s</PassportName>"\
-		"%s"\
+		"<%s>%s</%s>"\
 	"</Member>"
 
 #define MSN_MEMBER_MEMBERSHIPID_XML	\
 	"<Member xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"%s\">"\
-		"<Type>Passport</Type>"\
+		"<Type>%s</Type>"\
 		"<MembershipId>%u</MembershipId>"\
 		"<State>Accepted</State>"\
-		"%s"\
 	"</Member>"
 
-#define MSN_MEMBER_FEDERATED_ANNOTATION_XML \
-	"<Annotations>"\
-		"<Annotation>"\
-			"<Name>MSN.IM.BuddyType</Name>"\
-			"<Value>%02d:</Value>"\
-		"</Annotation>"\
-	"</Annotations>"
-
 /* first delete contact from allow list */
 
 #define MSN_CONTACT_DELETE_FROM_LIST_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
diff --git a/libpurple/protocols/msn/directconn.c b/libpurple/protocols/msn/directconn.c
index 1ebc6f8b43..e846d75ea1 100644
--- a/libpurple/protocols/msn/directconn.c
+++ b/libpurple/protocols/msn/directconn.c
@@ -247,14 +247,6 @@ msn_directconn_send_msg(MsnDirectConn *directconn, MsnMessage *msg)
 }
 
 static void
-msn_directconn_process_msg(MsnDirectConn *directconn, MsnMessage *msg)
-{
-	purple_debug_info("msn", "directconn: process_msg\n");
-
-	msn_slplink_process_msg(directconn->slplink, msg);
-}
-
-static void
 read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnDirectConn* directconn;
@@ -267,6 +259,19 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 	directconn = data;
 
 	/* Let's read the length of the data. */
+#error This code is broken.  See the note below.
+	/*
+	 * TODO: This has problems!  First of all, sizeof(body_len) will be
+	 *       different on 32bit systems and on 64bit systems (4 bytes
+	 *       vs. 8 bytes).
+	 *       Secondly, we're reading from a TCP stream.  There is no
+	 *       guarantee that we have received the number of bytes we're
+	 *       trying to read.  We need to read into a buffer.  If read
+	 *       returns <0 then we need to check errno.  If errno is EAGAIN
+	 *       then don't destroy anything, just exit and wait for more
+	 *       data.  See every other function in libpurple that does this
+	 *       correctly for an example.
+	 */
 	len = read(directconn->fd, &body_len, sizeof(body_len));
 
 	if (len <= 0)
@@ -337,7 +342,8 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 		msg = msn_message_new_msnslp();
 		msn_message_parse_slp_body(msg, body, body_len);
 
-		msn_directconn_process_msg(directconn, msg);
+		purple_debug_info("msn", "directconn: process_msg\n");
+		msn_slplink_process_msg(directconn->slplink, msg);
 	}
 	else
 	{
@@ -351,6 +357,8 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 
 		msn_directconn_destroy(directconn);
 	}
+
+	g_free(body);
 }
 
 static void
diff --git a/libpurple/protocols/msn/error.c b/libpurple/protocols/msn/error.c
index c2aac882f1..fd13bea29f 100644
--- a/libpurple/protocols/msn/error.c
+++ b/libpurple/protocols/msn/error.c
@@ -198,7 +198,7 @@ msn_error_get_text(unsigned int type, gboolean *debug)
 			break;
 
 		case 800:
-			result = _("Friendly name changes too rapidly");
+			result = _("Friendly name is changing too rapidly");
 			break;
 
 		case 910:
diff --git a/libpurple/protocols/msn/history.c b/libpurple/protocols/msn/history.c
index a0b0c498b7..82488ce102 100644
--- a/libpurple/protocols/msn/history.c
+++ b/libpurple/protocols/msn/history.c
@@ -68,6 +68,7 @@ void
 msn_history_add(MsnHistory *history, MsnTransaction *trans)
 {
 	GQueue *queue;
+	int max_elems;
 
 	g_return_if_fail(history != NULL);
 	g_return_if_fail(trans   != NULL);
@@ -78,7 +79,12 @@ msn_history_add(MsnHistory *history, MsnTransaction *trans)
 
 	g_queue_push_tail(queue, trans);
 
-	if (queue->length > MSN_HIST_ELEMS)
+	if (trans->cmdproc->servconn->type == MSN_SERVCONN_NS)
+		max_elems = MSN_NS_HIST_ELEMS;
+	else
+		max_elems = MSN_SB_HIST_ELEMS;
+
+	if (queue->length > max_elems)
 	{
 		trans = g_queue_pop_head(queue);
 		msn_transaction_destroy(trans);
diff --git a/libpurple/protocols/msn/history.h b/libpurple/protocols/msn/history.h
index 91fa55281e..00018f5d43 100644
--- a/libpurple/protocols/msn/history.h
+++ b/libpurple/protocols/msn/history.h
@@ -24,7 +24,8 @@
 #ifndef _MSN_HISTORY_H
 #define _MSN_HISTORY_H
 
-#define MSN_HIST_ELEMS 0x30
+#define MSN_NS_HIST_ELEMS 0x300
+#define MSN_SB_HIST_ELEMS 0x30
 
 typedef struct _MsnHistory MsnHistory;
 
diff --git a/libpurple/protocols/msn/httpconn.c b/libpurple/protocols/msn/httpconn.c
index abf9963e9d..ba44841091 100644
--- a/libpurple/protocols/msn/httpconn.c
+++ b/libpurple/protocols/msn/httpconn.c
@@ -161,10 +161,9 @@ msn_httpconn_parse_data(MsnHttpConn *httpconn, const char *buf,
 	memcpy(body, body_start, body_len);
 	body[body_len] = '\0';
 
-#ifdef MSN_DEBUG_HTTP
-	purple_debug_misc("msn", "Incoming HTTP buffer (header): {%s}\n",
-					header);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_misc("msn", "Incoming HTTP buffer (header): {%s}\n",
+		                  header);
 
 	/* Now we should be able to process the data. */
 	if ((s = purple_strcasestr(header, "X-MSN-Messenger: ")) != NULL)
@@ -219,7 +218,13 @@ msn_httpconn_parse_data(MsnHttpConn *httpconn, const char *buf,
 		g_free(tmp);
 
 		t = strchr(full_session_id, '.');
-		session_id = g_strndup(full_session_id, t - full_session_id);
+		if (t != NULL)
+			session_id = g_strndup(full_session_id, t - full_session_id);
+		else {
+			purple_debug_error("msn", "Malformed full_session_id[%s]\n",
+					   full_session_id ? full_session_id : NULL);
+			session_id = g_strdup(full_session_id);
+		}
 
 		if (session_action == NULL || strcmp(session_action, "close") != 0)
 		{
@@ -288,7 +293,7 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 		purple_debug_error("msn", "HTTP: servconn %03d read error, "
 			"len: %" G_GSSIZE_FORMAT ", errno: %d, error: %s\n",
 			servconn->num, len, error, g_strerror(errno));
-		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ);
+		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ, NULL);
 
 		return;
 	}
@@ -304,7 +309,7 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 	{
 		/* Either we must wait for more input, or something went wrong */
 		if (error)
-			msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ);
+			msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ, NULL);
 
 		return;
 	}
@@ -312,7 +317,7 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 	if (error)
 	{
 		purple_debug_error("msn", "HTTP: Special error\n");
-		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ);
+		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ, NULL);
 
 		return;
 	}
@@ -363,7 +368,7 @@ httpconn_write_cb(gpointer data, gint source, PurpleInputCondition cond)
 			return;
 
 		/* Error! */
-		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_WRITE);
+		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_WRITE, NULL);
 		return;
 	}
 
@@ -389,7 +394,7 @@ write_raw(MsnHttpConn *httpconn, const char *data, size_t data_len)
 
 	if ((res <= 0) && ((errno != EAGAIN) && (errno != EWOULDBLOCK)))
 	{
-		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_WRITE);
+		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_WRITE, NULL);
 		return FALSE;
 	}
 
@@ -667,7 +672,7 @@ connect_cb(gpointer data, gint source, const gchar *error_message)
 	{
 		purple_debug_error("msn", "HTTP: Connection error: %s\n",
 		                   error_message ? error_message : "(null)");
-		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_CONNECT);
+		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_CONNECT, error_message);
 	}
 }
 
diff --git a/libpurple/protocols/msn/msg.c b/libpurple/protocols/msn/msg.c
index 0de408d9e3..bb13bea181 100644
--- a/libpurple/protocols/msn/msg.c
+++ b/libpurple/protocols/msn/msg.c
@@ -33,9 +33,8 @@ msn_message_new(MsnMsgType type)
 	msg = g_new0(MsnMessage, 1);
 	msg->type = type;
 
-#ifdef MSN_DEBUG_MSG
-	purple_debug_info("msn", "message new (%p)(%d)\n", msg, type);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "message new (%p)(%d)\n", msg, type);
 
 	msg->attr_table = g_hash_table_new_full(g_str_hash, g_str_equal,
 											g_free, g_free);
@@ -57,9 +56,8 @@ msn_message_destroy(MsnMessage *msg)
 		return;
 	}
 
-#ifdef MSN_DEBUG_MSG
-	purple_debug_info("msn", "message destroy (%p)\n", msg);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "message destroy (%p)\n", msg);
 
 	g_free(msg->remote_user);
 	g_free(msg->body);
@@ -79,9 +77,8 @@ msn_message_ref(MsnMessage *msg)
 
 	msg->ref_count++;
 
-#ifdef MSN_DEBUG_MSG
-	purple_debug_info("msn", "message ref (%p)[%" G_GSIZE_FORMAT "]\n", msg, msg->ref_count);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "message ref (%p)[%" G_GSIZE_FORMAT "]\n", msg, msg->ref_count);
 
 	return msg;
 }
@@ -94,9 +91,8 @@ msn_message_unref(MsnMessage *msg)
 
 	msg->ref_count--;
 
-#ifdef MSN_DEBUG_MSG
-	purple_debug_info("msn", "message unref (%p)[%" G_GSIZE_FORMAT "]\n", msg, msg->ref_count);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "message unref (%p)[%" G_GSIZE_FORMAT "]\n", msg, msg->ref_count);
 
 	if (msg->ref_count == 0)
 	{
@@ -353,7 +349,8 @@ msn_message_parse_payload(MsnMessage *msg,
 			msg->body[msg->body_len] = '\0';
 		}
 		
-		if (msg->charset == NULL) {
+		if ((!content_type || !strcmp(content_type, "text/plain"))
+			&& msg->charset == NULL) {
 			char *body = g_convert(msg->body, msg->body_len, "UTF-8",
 			                       "ISO-8859-1", NULL, &msg->body_len, NULL);
 			g_free(msg->body);
@@ -771,8 +768,7 @@ msn_message_show_readable(MsnMessage *msg, const char *info,
 		g_string_append_printf(str, "SUB ID:     %u\r\n", msg->msnslp_header.ack_sub_id);
 		g_string_append_printf(str, "ACK Size:   %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.ack_size);
 
-#ifdef MSN_DEBUG_SLP_VERBOSE
-		if (body != NULL)
+		if (purple_debug_is_verbose() && body != NULL)
 		{
 			if (text_body)
 			{
@@ -796,7 +792,6 @@ msn_message_show_readable(MsnMessage *msg, const char *info,
 				g_string_append(str, "\r\n");
 			}
 		}
-#endif
 
 		g_string_append_printf(str, "Footer:     %u\r\n", msg->msnslp_footer.value);
 	}
@@ -937,6 +932,91 @@ msn_control_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	}
 }
 
+static void
+datacast_inform_user(MsnSwitchBoard *swboard, const char *who,
+                     const char *msg, const char *filename)
+{
+	char *username, *str;
+	PurpleAccount *account;
+	PurpleBuddy *b;
+
+	account = swboard->session->account;
+
+	if ((b = purple_find_buddy(account, who)) != NULL)
+		username = g_markup_escape_text(purple_buddy_get_alias(b), -1);
+	else
+		username = g_markup_escape_text(who, -1);
+	str = g_strdup_printf(msg, username, filename);
+	g_free(username);
+
+	if (swboard->conv == NULL) {
+		if (swboard->current_users > 1) 
+			swboard->conv = purple_find_chat(account->gc, swboard->chat_id);
+		else {
+			swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
+									who, account);
+			if (swboard->conv == NULL)
+				swboard->conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who);
+		}
+	}
+	swboard->flag |= MSN_SB_FLAG_IM;
+
+	purple_conversation_write(swboard->conv, NULL, str, PURPLE_MESSAGE_SYSTEM, time(NULL));
+	g_free(str);
+
+}
+
+/* TODO: Make these not be such duplicates of each other */
+static void 
+got_wink_cb(MsnSlpCall *slpcall, const guchar *data, gsize size)
+{
+	FILE *f;
+	char *path = NULL;
+	const char *who = slpcall->slplink->remote_user;
+	purple_debug_info("msn", "Received wink from %s\n", who);
+
+	if ((f = purple_mkstemp(&path, TRUE))) {
+		fwrite(data, size, 1, f);
+		fclose(f);
+		datacast_inform_user(slpcall->slplink->swboard,
+		                     who,
+		                     _("%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"),
+		                     path);
+	} else {
+		purple_debug_error("msn", "Couldn\'t create temp file to store wink\n");
+		datacast_inform_user(slpcall->slplink->swboard,
+		                     who,
+		                     _("%s sent a wink, but it could not be saved"),
+		                     NULL);
+	} 
+	g_free(path);
+}
+
+static void 
+got_voiceclip_cb(MsnSlpCall *slpcall, const guchar *data, gsize size)
+{
+	FILE *f;
+	char *path = NULL;
+	const char *who = slpcall->slplink->remote_user;
+	purple_debug_info("msn", "Received voice clip from %s\n", who);
+
+	if ((f = purple_mkstemp(&path, TRUE))) {
+		fwrite(data, size, 1, f);
+		fclose(f);
+		datacast_inform_user(slpcall->slplink->swboard,
+		                     who,
+		                     _("%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"),
+		                     path);
+	} else {
+		purple_debug_error("msn", "Couldn\'t create temp file to store sound\n");
+		datacast_inform_user(slpcall->slplink->swboard,
+		                     who,
+		                     _("%s sent a voice clip, but it could not be saved"),
+		                     NULL);
+	} 
+	g_free(path);
+}
+
 void
 msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
@@ -970,9 +1050,42 @@ msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 
 	} else if (!strcmp(id, "2")) {
 		/* Wink */
+		MsnSession *session;
+		MsnSlpLink *slplink;
+		MsnObject *obj;
+		const char *who;
+		const char *data;
+
+		session = cmdproc->session;
+
+		data = g_hash_table_lookup(body, "Data");
+		obj = msn_object_new_from_string(data);
+		who = msn_object_get_creator(obj);
+
+		slplink = msn_session_get_slplink(session, who);
+		msn_slplink_request_object(slplink, data, got_wink_cb, NULL, obj);
+
+		msn_object_destroy(obj);
+
 
 	} else if (!strcmp(id, "3")) {
 		/* Voiceclip */
+		MsnSession *session;
+		MsnSlpLink *slplink;
+		MsnObject *obj;
+		const char *who;
+		const char *data;
+
+		session = cmdproc->session;
+
+		data = g_hash_table_lookup(body, "Data");
+		obj = msn_object_new_from_string(data);
+		who = msn_object_get_creator(obj);
+
+		slplink = msn_session_get_slplink(session, who);
+		msn_slplink_request_object(slplink, data, got_voiceclip_cb, NULL, obj);
+
+		msn_object_destroy(obj);
 
 	} else if (!strcmp(id, "4")) {
 		/* Action */
@@ -984,3 +1097,108 @@ msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	g_hash_table_destroy(body);
 }
 
+void
+msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
+{
+	GHashTable *body;
+	const gchar *guid;
+	gboolean accepted = FALSE;
+
+	g_return_if_fail(cmdproc != NULL);
+	g_return_if_fail(msg != NULL);
+
+	body = msn_message_get_hashtable_from_body(msg);
+
+	if (body == NULL) {
+		purple_debug_warning("msn",
+				"Unable to parse invite msg body.\n");
+		return;
+	}
+
+	guid = g_hash_table_lookup(body, "Application-GUID");
+
+	if (guid == NULL) {
+		const gchar *cmd = g_hash_table_lookup(
+				body, "Invitation-Command");
+
+		if (cmd && !strcmp(cmd, "CANCEL")) {
+			const gchar *code = g_hash_table_lookup(
+					body, "Cancel-Code");
+			purple_debug_info("msn",
+					"MSMSGS invitation cancelled: %s.\n",
+					code ? code : "no reason given");
+		} else
+			purple_debug_warning("msn", "Invite msg missing "
+					"Application-GUID.\n");
+
+		accepted = TRUE;
+
+	} else if (!strcmp(guid, "{02D3C01F-BF30-4825-A83A-DE7AF41648AA}")) {
+		purple_debug_info("msn", "Computer call\n");
+
+		if (cmdproc->session) {
+			PurpleConversation *conv = NULL;
+			gchar *from = msg->remote_user;
+			gchar *buf = NULL;
+
+			if (from)
+				conv = purple_find_conversation_with_account(
+						PURPLE_CONV_TYPE_IM, from,
+						cmdproc->session->account);
+			if (conv)
+				buf = g_strdup_printf(
+						_("%s sent you a voice chat "
+						"invite, which is not yet "
+						"supported."), from);
+			if (buf) {
+				purple_conversation_write(conv, NULL, buf,
+						PURPLE_MESSAGE_SYSTEM |
+						PURPLE_MESSAGE_NOTIFY,
+						time(NULL));
+				g_free(buf);
+			}
+		}
+	} else {
+		const gchar *application = g_hash_table_lookup(body, "Application-Name");
+		purple_debug_warning("msn", "Unhandled invite msg with GUID %s: %s.\n",
+		                     guid, application ? application : "(null)");
+	}
+
+	if (!accepted) {
+		const gchar *cookie = g_hash_table_lookup(body, "Invitation-Cookie");
+		if (cookie) {
+			MsnSwitchBoard *swboard = cmdproc->data;
+			char *text;
+			MsnMessage *cancel;
+
+			cancel = msn_message_new(MSN_MSG_TEXT);
+			msn_message_set_content_type(cancel, "text/x-msmsgsinvite");
+			msn_message_set_charset(cancel, "UTF-8");
+			msn_message_set_flag(cancel, 'U');
+
+			text = g_strdup_printf("Invitation-Command: CANCEL\r\n"
+			                       "Invitation-Cookie: %s\r\n"
+			                       "Cancel-Code: REJECT_NOT_INSTALLED\r\n",
+			                       cookie);
+			msn_message_set_bin_data(cancel, text, strlen(text));
+			g_free(text);
+
+			msn_switchboard_send_msg(swboard, cancel, TRUE);
+			msn_message_destroy(cancel);
+		}
+	}
+
+	g_hash_table_destroy(body);
+}
+
+/* Only called from chats. Handwritten messages for IMs come as a SLP message */
+void
+msn_handwritten_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
+{
+	const char *body;
+	size_t body_len;
+
+	body = msn_message_get_bin_data(msg, &body_len);
+	msn_switchboard_show_ink(cmdproc->data, msg->remote_user, body);
+}
+
diff --git a/libpurple/protocols/msn/msg.h b/libpurple/protocols/msn/msg.h
index 9bb39befdb..6b63cadc2d 100644
--- a/libpurple/protocols/msn/msg.h
+++ b/libpurple/protocols/msn/msg.h
@@ -345,4 +345,6 @@ void msn_control_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
 void msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
+void msn_handwritten_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
+
 #endif /* _MSN_MSG_H_ */
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
index 5cbfd8e879..63c3f0a2e2 100644
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -92,6 +92,13 @@ typedef struct
 	MsnObject *obj;
 } MsnEmoticon;
 
+typedef struct
+{
+	PurpleConnection *pc;
+	PurpleBuddy *buddy;
+	PurpleGroup *group;
+} MsnAddReqData;
+
 static const char *
 msn_normalize(const PurpleAccount *account, const char *str)
 {
@@ -178,8 +185,12 @@ msn_act_id(PurpleConnection *gc, const char *entry)
 	cmdproc = session->notification->cmdproc;
 	account = purple_connection_get_account(gc);
 
-	if(entry && strlen(entry))
-		alias = purple_url_encode(entry);
+	if (entry && *entry)
+	{
+		char *tmp = g_strdup(entry);
+		alias = purple_url_encode(g_strstrip(tmp));
+		g_free(tmp);
+	}
 	else
 		alias = "";
 
@@ -195,7 +206,6 @@ msn_act_id(PurpleConnection *gc, const char *entry)
 	}
 
 	msn_cmdproc_send(cmdproc, "PRP", "MFN %s", alias);
-
 }
 
 static void
@@ -672,12 +682,8 @@ msn_status_text(PurpleBuddy *buddy)
 		if (title && *title) {
 			const char *artist = purple_status_get_attr_string(status, PURPLE_TUNE_ARTIST);
 			const char *album = purple_status_get_attr_string(status, PURPLE_TUNE_ALBUM);
-			media = g_strdup_printf("%s%s%s%s%s%s", title,
-			                        (artist && *artist) ? " - " : "",
-			                        (artist && *artist) ? artist : "",
-			                        (album && *album) ? " (" : "",
-			                        (album && *album) ? album : "",
-			                        (album && *album) ? ")" : "");
+			media = purple_util_format_song_info(title, artist, album, NULL);
+			return media;
 		}
 		else if (game && *game)
 			media = g_strdup_printf("Playing %s", game);
@@ -1028,7 +1034,7 @@ msn_login(PurpleAccount *account)
 	if (!msn_session_connect(session, host, port, http_method))
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Failed to connect to server."));
+			_("Unable to connect"));
 }
 
 static void
@@ -1281,7 +1287,7 @@ msn_send_im(PurpleConnection *gc, const char *who, const char *message,
 			imdata->gc = gc;
 			imdata->who = who;
 			imdata->msg = body_str;
-			imdata->flags = flags;
+			imdata->flags = flags & ~PURPLE_MESSAGE_SEND;
 			imdata->when = time(NULL);
 			purple_timeout_add(0, msn_send_me_im, imdata);
 		}
@@ -1380,90 +1386,82 @@ msn_set_idle(PurpleConnection *gc, int idle)
 	msn_change_status(session);
 }
 
-#if 0
+/*
+ * Actually adds a buddy once we have the response from FQY
+ */
 static void
-fake_userlist_add_buddy(MsnUserList *userlist,
-					   const char *who, int list_id,
-					   const char *group_name)
+add_pending_buddy(MsnSession *session,
+                  const char *who,
+                  MsnNetwork network,
+                  MsnUser *user)
 {
-	MsnUser *user;
-	static int group_id_c = 1;
-	int group_id;
+	char *group;
 
-	group_id = -1;
+	g_return_if_fail(user != NULL);
 
-	if (group_name != NULL)
-	{
-		MsnGroup *group;
-		group = msn_group_new(userlist, group_id_c, group_name);
-		group_id = group_id_c++;
-	}
+	group = msn_user_remove_pending_group(user);
 
-	user = msn_userlist_find_user(userlist, who);
+	if (network != MSN_NETWORK_UNKNOWN) {
+		MsnUserList *userlist = session->userlist;
+		MsnUser *user2 = msn_userlist_find_user(userlist, who);
+		if (user2 != NULL) {
+			/* User already in userlist, so just update it. */
+			msn_user_destroy(user);
+			user = user2;
+		} else {
+			msn_userlist_add_user(userlist, user);
+		}
 
-	if (user == NULL)
-	{
-		user = msn_user_new(userlist, who, NULL);
-		msn_userlist_add_user(userlist, user);
+		msn_user_set_network(user, network);
+		msn_userlist_add_buddy(userlist, who, group);
 	}
 	else
-		if (user->list_op & (1 << list_id))
-		{
-			if (list_id == MSN_LIST_FL)
-			{
-				if (group_id >= 0)
-					if (g_list_find(user->group_ids,
-									GINT_TO_POINTER(group_id)))
-						return;
-			}
-			else
-				return;
-		}
-
-	if (group_id >= 0)
 	{
-		/* This is wrong... user->group_ids contains g_strdup()'d data now */
-		user->group_ids = g_list_append(user->group_ids,
-										GINT_TO_POINTER(group_id));
-	}
+		PurpleBuddy * buddy = purple_find_buddy(session->account, who);
+		gchar *buf;
+		buf = g_strdup_printf(_("Unable to add the buddy %s because the username is invalid.  Usernames must be a valid email address."), who);
+		if (!purple_conv_present_error(who, session->account, buf))
+			purple_notify_error(purple_account_get_connection(session->account), NULL, _("Unable to Add"), buf);
+		g_free(buf);
 
-	user->list_op |= (1 << list_id);
+		/* Remove from local list */
+		purple_blist_remove_buddy(buddy);
+		msn_user_destroy(user);
+	}
+	g_free(group);
 }
-#endif
 
 static void
-msn_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
+finish_auth_request(MsnAddReqData *data, char *msg)
 {
+	PurpleConnection *pc;
+	PurpleBuddy *buddy;
+	PurpleGroup *group;
+	PurpleAccount *account;
 	MsnSession *session;
 	MsnUserList *userlist;
 	const char *who, *gname;
 	MsnUser *user;
 
-	session = gc->proto_data;
+	pc = data->pc;
+	buddy = data->buddy;
+	group = data->group;
+	g_free(data);
+
+	account = purple_connection_get_account(pc);
+	session = pc->proto_data;
 	userlist = session->userlist;
-	who = msn_normalize(purple_connection_get_account(gc), purple_buddy_get_name(buddy));
 
+	who = msn_normalize(account, purple_buddy_get_name(buddy));
 	gname = group ? purple_group_get_name(group) : NULL;
 	purple_debug_info("msn", "Add user:%s to group:%s\n", who, gname ? gname : "(null)");
 	if (!session->logged_in)
 	{
-#if 0
-		fake_userlist_add_buddy(session->sync_userlist, who, MSN_LIST_FL,
-								group ? group->name : NULL);
-#else
 		purple_debug_error("msn", "msn_add_buddy called before connected\n");
-#endif
 
 		return;
 	}
 
-#if 0
-	if (group != NULL && group->name != NULL)
-		purple_debug_info("msn", "msn_add_buddy: %s, %s\n", who, group->name);
-	else
-		purple_debug_info("msn", "msn_add_buddy: %s\n", who);
-#endif
-
 	/* XXX - Would group ever be NULL here?  I don't think so...
 	 * shx: Yes it should; MSN handles non-grouped buddies, and this is only
 	 * internal. */
@@ -1471,24 +1469,71 @@ msn_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 	if ((user != NULL) && (user->networkid != MSN_NETWORK_UNKNOWN)) {
 		/* We already know this buddy and their network. This function knows
 		   what to do with users already in the list and stuff... */
+		msn_user_set_invite_message(user, msg);
 		msn_userlist_add_buddy(userlist, who, gname);
 	} else {
 		char **tokens;
 		char *fqy;
 		/* We need to check the network for this buddy first */
-		msn_userlist_save_pending_buddy(userlist, who, gname);
+		user = msn_user_new(userlist, who, NULL);
+		msn_user_set_invite_message(user, msg);
+		msn_user_set_pending_group(user, gname);
+		msn_user_set_network(user, MSN_NETWORK_UNKNOWN);
 		tokens = g_strsplit(who, "@", 2);
 		fqy = g_strdup_printf("<ml><d n=\"%s\"><c n=\"%s\"/></d></ml>",
 		                      tokens[1],
 		                      tokens[0]);
 		msn_notification_send_fqy(session, fqy, strlen(fqy),
-		                          (MsnFqyCb)msn_userlist_add_pending_buddy);
+		                          (MsnFqyCb)add_pending_buddy, user);
 		g_free(fqy);
 		g_strfreev(tokens);
 	}
 }
 
 static void
+cancel_auth_request(MsnAddReqData *data, char *msg)
+{
+	/* Remove from local list */
+	purple_blist_remove_buddy(data->buddy);
+	
+	g_free(data);
+}
+
+static void
+msn_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
+{
+	const char *bname;
+	MsnAddReqData *data;
+
+	bname = purple_buddy_get_name(buddy);
+
+	if (!purple_email_is_valid(bname)) {
+		gchar *buf;
+		buf = g_strdup_printf(_("Unable to add the buddy %s because the username is invalid.  Usernames must be a valid email address."), bname);
+		if (!purple_conv_present_error(bname, purple_connection_get_account(gc), buf))
+			purple_notify_error(gc, NULL, _("Unable to Add"), buf);
+		g_free(buf);
+
+		/* Remove from local list */
+		purple_blist_remove_buddy(buddy);
+
+		return;
+	}
+
+	data = g_new0(MsnAddReqData, 1);
+	data->pc = gc;
+	data->buddy = buddy;
+	data->group = group;
+
+	purple_request_input(gc, NULL, _("Authorization Request Message:"),
+	                     NULL, _("Please authorize me!"), TRUE, FALSE, NULL,
+	                     _("_OK"), G_CALLBACK(finish_auth_request),
+	                     _("_Cancel"), G_CALLBACK(cancel_auth_request),
+	                     purple_connection_get_account(gc), bname, NULL,
+	                     data);
+}
+
+static void
 msn_rem_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
 	MsnSession *session;
@@ -2607,9 +2652,10 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,					/* unregister_user */
 	msn_send_attention,                     /* send_attention */
 	msn_attention_types,                    /* attention_types */
-
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	msn_get_account_text_table,             /* get_account_text_table */
+	NULL,                                   /* initiate_media */
+	NULL                                    /* can_do_media */
 };
 
 static PurplePluginInfo info =
diff --git a/libpurple/protocols/msn/msn.h b/libpurple/protocols/msn/msn.h
index d5bf4a590a..b9369aee01 100644
--- a/libpurple/protocols/msn/msn.h
+++ b/libpurple/protocols/msn/msn.h
@@ -24,17 +24,6 @@
 #ifndef _MSN_H_
 #define _MSN_H_
 
-/* #define MSN_DEBUG_MSG 1 */
-/* #define MSN_DEBUG_SLPMSG 1 */
-/* #define MSN_DEBUG_HTTP 1 */
-
-/* #define MSN_DEBUG_SLP 1 */
-/* #define MSN_DEBUG_SLP_VERBOSE 1 */
-/* #define MSN_DEBUG_SLP_FILES 1 */
-
-/* #define MSN_DEBUG_NS 1 */
-/* #define MSN_DEBUG_SB 1 */
-
 #include "internal.h"
 
 #include "account.h"
@@ -76,6 +65,8 @@
 
 #define BUDDY_ALIAS_MAXLEN 387
 
+#define MSN_CAM_GUID "4BD96FC0-AB17-4425-A14A-439185962DC8"
+#define MSN_CAM_REQUEST_GUID "1C9AA97E-9C05-4583-A3BD-908A196F1E92"
 #define MSN_FT_GUID "5D3E02AB-6190-11D3-BBBB-00C04F795683"
 #define MSN_OBJ_GUID "A4268EEC-FEC5-49E5-95C3-F126696BDBF6"
 
@@ -136,7 +127,7 @@ typedef enum
 } MsnClientVerId;
 
 #define MSN_CLIENT_ID_VERSION      MSN_CLIENT_VER_7_0
-#define MSN_CLIENT_ID_CAPABILITIES MSN_CLIENT_CAP_PACKET
+#define MSN_CLIENT_ID_CAPABILITIES (MSN_CLIENT_CAP_PACKET|MSN_CLIENT_CAP_INK_GIF|MSN_CLIENT_CAP_VOICEIM)
 
 #define MSN_CLIENT_ID \
 	((MSN_CLIENT_ID_VERSION    << 24) | \
diff --git a/libpurple/protocols/msn/msnutils.c b/libpurple/protocols/msn/msnutils.c
index 12a921620f..c8870d5603 100644
--- a/libpurple/protocols/msn/msnutils.c
+++ b/libpurple/protocols/msn/msnutils.c
@@ -222,7 +222,7 @@ msn_import_html(const char *html, char **attributes, char **message)
 	const char *c;
 	char *msg;
 	char *fontface = NULL;
-	char fonteffect[4];
+	char fonteffect[5];
 	char fontcolor[7];
 	char direction = '0';
 
diff --git a/libpurple/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c
index a7ffdf5b4e..d64d52f6a1 100644
--- a/libpurple/protocols/msn/notification.c
+++ b/libpurple/protocols/msn/notification.c
@@ -149,48 +149,6 @@ msn_notification_disconnect(MsnNotification *notification)
 }
 
 /**************************************************************************
- * Util
- **************************************************************************/
-
-static void
-group_error_helper(MsnSession *session, const char *msg, const char *group_id, int error)
-{
-	PurpleAccount *account;
-	PurpleConnection *gc;
-	char *reason = NULL;
-	char *title = NULL;
-
-	account = session->account;
-	gc = purple_account_get_connection(account);
-
-	if (error == 224)
-	{
-		if (group_id == 0)
-		{
-			return;
-		}
-		else
-		{
-			const char *group_name;
-			group_name = msn_userlist_find_group_name(session->userlist,group_id);
-			reason = g_strdup_printf(_("%s is not a valid group."),
-									 group_name ? group_name : "");
-		}
-	}
-	else
-	{
-		reason = g_strdup(_("Unknown error."));
-	}
-
-	title = g_strdup_printf(_("%s on %s (%s)"), msg,
-						  purple_account_get_username(account),
-						  purple_account_get_protocol_name(account));
-	purple_notify_error(gc, NULL, title, reason);
-	g_free(title);
-	g_free(reason);
-}
-
-/**************************************************************************
  * Login
  **************************************************************************/
 
@@ -352,9 +310,8 @@ msg_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 	msg = msn_message_new_from_cmd(cmdproc->session, cmd);
 
 	msn_message_parse_payload(msg, payload, len, MSG_LINE_DEM, MSG_BODY_DEM);
-#ifdef MSN_DEBUG_NS
-	msn_message_show_readable(msg, "Notification", TRUE);
-#endif
+	if (purple_debug_is_verbose())
+		msn_message_show_readable(msg, "Notification", TRUE);
 
 	msn_cmdproc_process_msg(cmdproc, msg);
 
@@ -369,14 +326,13 @@ msg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 	/* NOTE: cmd is not always cmdproc->last_cmd, sometimes cmd is a queued
 	 * command and we are processing it */
 	if (cmd->payload == NULL) {
-		cmdproc->last_cmd->payload_cb  = msg_cmd_post;
+		cmdproc->last_cmd->payload_cb = msg_cmd_post;
 		cmd->payload_len = atoi(cmd->params[2]);
-
 	} else {
 		g_return_if_fail(cmd->payload_cb != NULL);
 
 #if 0 /* glib on win32 doesn't correctly support precision modifiers for a string */
-		purple_debug_info("msn", "MSG payload:{%.*s}\n", cmd->payload_len, cmd->payload);
+		purple_debug_info("msn", "MSG payload:{%.*s}\n", (guint)cmd->payload_len, cmd->payload);
 #endif
 		cmd->payload_cb(cmdproc, cmd, cmd->payload, cmd->payload_len);
 	}
@@ -419,9 +375,8 @@ ubm_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 	msg = msn_message_new_from_cmd(cmdproc->session, cmd);
 
 	msn_message_parse_payload(msg, payload, len,MSG_LINE_DEM,MSG_BODY_DEM);
-#ifdef MSN_DEBUG_NS
-	msn_message_show_readable(msg, "Notification", TRUE);
-#endif
+	if (purple_debug_is_verbose())
+		msn_message_show_readable(msg, "Notification", TRUE);
 
 	gc = cmdproc->session->account->gc;
 	passport = msg->remote_user;
@@ -521,6 +476,12 @@ chl_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 /**************************************************************************
  * Buddy Lists
  **************************************************************************/
+
+typedef struct MsnFqyCbData {
+	MsnFqyCb cb;
+	gpointer data;
+} MsnFqyCbData;
+
 /* add contact to xmlnode */
 static void
 msn_add_contact_xml(MsnSession *session, xmlnode *mlNode,const char *passport, MsnListOp list_op, MsnNetwork networkId)
@@ -593,27 +554,58 @@ msn_notification_post_adl(MsnCmdProc *cmdproc, const char *payload, int payload_
 	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
+static void
+msn_notification_post_rml(MsnCmdProc *cmdproc, const char *payload, int payload_len)
+{
+	MsnTransaction *trans;
+	purple_debug_info("msn", "Sending RML with payload: %s\n", payload);
+	trans = msn_transaction_new(cmdproc, "RML", "%i", payload_len);
+	msn_transaction_set_payload(trans, payload, payload_len);
+	msn_cmdproc_send_trans(cmdproc, trans);
+}
+
 void
 msn_notification_send_fqy(MsnSession *session,
                           const char *payload, int payload_len,
-                          MsnFqyCb cb)
+                          MsnFqyCb cb,
+                          gpointer cb_data)
 {
 	MsnTransaction *trans;
 	MsnCmdProc *cmdproc;
+	MsnFqyCbData *data;
 
 	cmdproc = session->notification->cmdproc;
 
+	data = g_new(MsnFqyCbData, 1);
+	data->cb = cb;
+	data->data = cb_data;
+
 	trans = msn_transaction_new(cmdproc, "FQY", "%d", payload_len);
 	msn_transaction_set_payload(trans, payload, payload_len);
-	msn_transaction_set_data(trans, cb);
+	msn_transaction_set_data(trans, data);
 	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 static void
-update_contact_network(MsnSession *session, const char *passport, MsnNetwork network)
+update_contact_network(MsnSession *session, const char *passport, MsnNetwork network, gpointer unused)
 {
-	MsnUser *user = msn_userlist_find_user(session->userlist, passport);
+	MsnUser *user;
+
+	if (network == MSN_NETWORK_UNKNOWN)
+	{
+		purple_debug_warning("msn",
+		                     "Ignoring user %s about which server knows nothing.\n",
+		                     passport);
+		/* Decrement the count for unknown results so that we'll continue login.
+		   Also, need to finish the login process here as well, because ADL OK
+		   will not be called. */
+		if (--session->adl_fqy == 0)
+			msn_session_finish_login(session);
+		return;
+	}
+
 	/* TODO: Also figure out how to update membership lists */
+	user = msn_userlist_find_user(session->userlist, passport);
 	if (user) {
 		xmlnode *adl_node;
 		char *payload;
@@ -630,7 +622,7 @@ update_contact_network(MsnSession *session, const char *passport, MsnNetwork net
 
 	} else {
 		purple_debug_error("msn",
-		                   "Got FQY update for unkwown user %s on network %d.\n",
+		                   "Got FQY update for unknown user %s on network %d.\n",
 		                   passport, network);
 	}
 }
@@ -665,13 +657,14 @@ msn_notification_dump_contact(MsnSession *session)
 		if (user->passport && !strcmp(user->passport, "messenger@microsoft.com"))
 			continue;
 
-		if ((user->list_op & MSN_LIST_OP_MASK) == (MSN_LIST_AL_OP | MSN_LIST_BL_OP)) {
+		if ((user->list_op & MSN_LIST_OP_MASK & ~MSN_LIST_FL_OP)
+		 == (MSN_LIST_AL_OP | MSN_LIST_BL_OP)) {
 			/* The server will complain if we send it a user on both the
 			   Allow and Block lists. So assume they're on the Block list
 			   and remove them from the Allow list in the membership lists to
 			   stop this from happening again. */
 			purple_debug_warning("msn",
-			                     "User %s is on both Allow and Block list,"
+			                     "User %s is on both Allow and Block list; "
 			                     "removing from Allow list.\n",
 			                     user->passport);
 			msn_userlist_rem_buddy_from_list(session->userlist, user->passport, MSN_LIST_AL);
@@ -685,6 +678,9 @@ msn_notification_dump_contact(MsnSession *session)
 			if (++adl_count % 150 == 0) {
 				payload = xmlnode_to_str(adl_node, &payload_len);
 
+				/* ADL's are returned all-together */
+				session->adl_fqy++;
+
 				msn_notification_post_adl(session->notification->cmdproc,
 					payload, payload_len);
 
@@ -696,6 +692,9 @@ msn_notification_dump_contact(MsnSession *session)
 				xmlnode_set_attrib(adl_node, "l", "1");
 			}
 		} else {
+			/* FQY's are returned one-at-a-time */
+			session->adl_fqy++;
+
 			msn_add_contact_xml(session, fqy_node, user->passport,
 				0, user->networkid);
 
@@ -704,7 +703,7 @@ msn_notification_dump_contact(MsnSession *session)
 				payload = xmlnode_to_str(fqy_node, &payload_len);
 
 				msn_notification_send_fqy(session, payload, payload_len,
-				                          update_contact_network);
+				                          update_contact_network, NULL);
 
 				g_free(payload);
 				xmlnode_free(fqy_node);
@@ -717,6 +716,9 @@ msn_notification_dump_contact(MsnSession *session)
 	if (adl_count == 0 || adl_count % 150 != 0) {
 		payload = xmlnode_to_str(adl_node, &payload_len);
 
+		/* ADL's are returned all-together */
+		session->adl_fqy++;
+
 		msn_notification_post_adl(session->notification->cmdproc, payload, payload_len);
 
 		g_free(payload);
@@ -726,7 +728,7 @@ msn_notification_dump_contact(MsnSession *session)
 		payload = xmlnode_to_str(fqy_node, &payload_len);
 
 		msn_notification_send_fqy(session, payload, payload_len,
-		                          update_contact_network);
+		                          update_contact_network, NULL);
 
 		g_free(payload);
 	}
@@ -764,13 +766,17 @@ adl_cmd_parse(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 		purple_debug_info("msn", "Invalid XML in ADL!\n");
 		return;
 	}
-	for (domain_node = xmlnode_get_child(root, "d"); domain_node; domain_node = xmlnode_get_next_twin(domain_node)) {
+	for (domain_node = xmlnode_get_child(root, "d");
+	     domain_node;
+	     domain_node = xmlnode_get_next_twin(domain_node)) {
 		const gchar * domain = NULL;
 		xmlnode *contact_node = NULL;
 
 		domain = xmlnode_get_attrib(domain_node, "n");
 
-		for (contact_node = xmlnode_get_child(domain_node, "c"); contact_node; contact_node = xmlnode_get_next_twin(contact_node)) {
+		for (contact_node = xmlnode_get_child(domain_node, "c");
+		     contact_node;
+		     contact_node = xmlnode_get_next_twin(contact_node)) {
 			const gchar *list;
 			gint list_op = 0;
 
@@ -803,7 +809,8 @@ adl_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 
 	if (!strcmp(cmd->params[1], "OK")) {
 		/* ADL ack */
-		msn_session_finish_login(session);
+		if (--session->adl_fqy == 0)
+			msn_session_finish_login(session);
 	} else {
 		cmdproc->last_cmd->payload_cb = adl_cmd_parse;
 		cmd->payload_len = atoi(cmd->params[1]);
@@ -818,10 +825,10 @@ adl_error_parse(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, size_t len)
 	MsnSession *session;
 	PurpleAccount *account;
 	PurpleConnection *gc;
-	/*char *adl = g_strndup(payload, len);*/
-	char *reason = g_strdup_printf(_("Unknown error (%d)"),
-		GPOINTER_TO_INT(cmd->payload_cbdata)/*, adl*/);
-	/*g_free(adl);*/
+	char *adl = g_strndup(payload, len);
+	char *reason = g_strdup_printf(_("Unknown error (%d): %s"),
+		GPOINTER_TO_INT(cmd->payload_cbdata), adl);
+	g_free(adl);
 
 	session = cmdproc->session;
 	account = session->account;
@@ -931,15 +938,20 @@ fqy_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 
 			passport = g_strdup_printf("%s@%s", local, domain);
 
-			if (type != NULL)
+			if (g_ascii_isdigit(cmd->command[0]))
+				network = MSN_NETWORK_UNKNOWN;
+			else if (type != NULL)
 				network = (MsnNetwork)strtoul(type, NULL, 10);
-			else
-				network = MSN_NETWORK_PASSPORT;
 
 			purple_debug_info("msn", "FQY response says %s is from network %d\n",
 			                  passport, network);
-			if (cmd->trans->data)
-				((MsnFqyCb)cmd->trans->data)(session, passport, network);
+			if (cmd->trans->data) {
+				MsnFqyCbData *fqy_data = cmd->trans->data;
+				fqy_data->cb(session, passport, network, fqy_data->data);
+				/* TODO: This leaks, but the server responds to FQY multiple times, so we
+				         can't free it yet. We need to figure out somewhere else to do so.
+				g_free(fqy_data); */
+			}
 
 			g_free(passport);
 		}
@@ -949,6 +961,26 @@ fqy_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 }
 
 static void
+fqy_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
+{
+	MsnCommand *cmd = cmdproc->last_cmd;
+
+	purple_debug_warning("msn", "FQY error %d\n", error);
+	if (cmd->param_count > 1) {
+		cmd->payload_cb = fqy_cmd_post;
+		cmd->payload_len = atoi(cmd->params[1]);
+		cmd->payload_cbdata = GINT_TO_POINTER(error);
+	}
+#if 0
+	/* If the server didn't send us a corresponding email address for this
+	   FQY error, it's probably going to disconnect us. So it isn't necessary
+	   to tell the handler about it. */
+	else if (trans->data)
+		((MsnFqyCb)trans->data)(session, NULL, MSN_NETWORK_UNKNOWN, NULL);
+#endif
+}
+
+static void
 fqy_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	purple_debug_info("msn", "Process FQY\n");
@@ -973,117 +1005,6 @@ rml_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 }
 
 static void
-add_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
-{
-	MsnSession *session;
-	PurpleAccount *account;
-	PurpleConnection *gc;
-	const char *list, *passport;
-	char *reason = NULL;
-	char *msg = NULL;
-	char **params;
-
-	session = cmdproc->session;
-	account = session->account;
-	gc = purple_account_get_connection(account);
-	params = g_strsplit(trans->params, " ", 0);
-
-	list     = params[0];
-	passport = params[1];
-
-	if (!strcmp(list, "FL"))
-		msg = g_strdup_printf(_("Unable to add user on %s (%s)"),
-							  purple_account_get_username(account),
-							  purple_account_get_protocol_name(account));
-	else if (!strcmp(list, "BL"))
-		msg = g_strdup_printf(_("Unable to block user on %s (%s)"),
-							  purple_account_get_username(account),
-							  purple_account_get_protocol_name(account));
-	else if (!strcmp(list, "AL"))
-		msg = g_strdup_printf(_("Unable to permit user on %s (%s)"),
-							  purple_account_get_username(account),
-							  purple_account_get_protocol_name(account));
-
-	if (!strcmp(list, "FL"))
-	{
-		if (error == 210)
-		{
-			reason = g_strdup_printf(_("%s could not be added because "
-									   "your buddy list is full."), passport);
-		}
-	}
-
-	if (reason == NULL)
-	{
-		if (error == 208)
-		{
-			reason = g_strdup_printf(_("%s is not a valid passport account."),
-									 passport);
-		}
-		else if (error == 500)
-		{
-			reason = g_strdup(_("Service Temporarily Unavailable."));
-		}
-		else
-		{
-			reason = g_strdup(_("Unknown error."));
-		}
-	}
-
-	if (msg != NULL)
-	{
-		purple_notify_error(gc, NULL, msg, reason);
-		g_free(msg);
-	}
-
-	if (!strcmp(list, "FL"))
-	{
-		PurpleBuddy *buddy;
-
-		buddy = purple_find_buddy(account, passport);
-
-		if (buddy != NULL)
-			purple_blist_remove_buddy(buddy);
-	}
-
-	g_free(reason);
-
-	g_strfreev(params);
-}
-
-static void
-adg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	gint group_id;
-	const char *group_name;
-
-	session = cmdproc->session;
-
-	group_id = atoi(cmd->params[3]);
-
-	group_name = purple_url_decode(cmd->params[2]);
-
-	msn_group_new(session->userlist, cmd->params[3], group_name);
-
-	/* There is a user that must be moved to this group */
-	if (cmd->trans->data)
-	{
-		/* msn_userlist_move_buddy(); */
-		MsnUserList *userlist = cmdproc->session->userlist;
-		MsnCallbackState *data = cmd->trans->data;
-
-		if (data->old_group_name != NULL)
-		{
-			msn_userlist_move_buddy(userlist, data->who, data->old_group_name, group_name);
-			g_free(data->old_group_name);
-		} else {
-			/* msn_add_contact_to_group(userlist, data, data->who, group_name); */
-		}
-	}
-}
-
-static void
 qng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	/* TODO: Call PNG after the timeout specified. */
@@ -1418,61 +1339,6 @@ prp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 	}
 }
 
-static void
-reg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	const char *group_id, *group_name;
-
-	session = cmdproc->session;
-	group_id = cmd->params[2];
-	group_name = purple_url_decode(cmd->params[3]);
-
-	msn_userlist_rename_group_id(session->userlist, group_id, group_name);
-}
-
-static void
-reg_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
-{
-	const char * group_id;
-	char **params;
-
-	params = g_strsplit(trans->params, " ", 0);
-
-	group_id = params[0];
-
-	group_error_helper(cmdproc->session, _("Unable to rename group"), group_id, error);
-
-	g_strfreev(params);
-}
-
-static void
-rmg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	const char *group_id;
-
-	session = cmdproc->session;
-	group_id = cmd->params[2];
-
-	msn_userlist_remove_group_id(session->userlist, group_id);
-}
-
-static void
-rmg_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
-{
-	const char *group_id;
-	char **params;
-
-	params = g_strsplit(trans->params, " ", 0);
-
-	group_id = params[0];
-
-	group_error_helper(cmdproc->session, _("Unable to delete group"), group_id, error);
-
-	g_strfreev(params);
-}
-
 /**************************************************************************
  * Misc commands
  **************************************************************************/
@@ -1608,7 +1474,7 @@ gcf_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 
 	if ( (root = xmlnode_from_str(cmd->payload, cmd->payload_len)) == NULL)
 	{
-		purple_debug_error("msn", "Unable to parse GCF payload into a XML tree");
+		purple_debug_error("msn", "Unable to parse GCF payload into a XML tree\n");
 		return;
 	}
 
@@ -1681,7 +1547,7 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 	user = msn_userlist_find_user(session->userlist, passport);
 	if (user == NULL) {
 		char *str = g_strndup(payload, len);
-		purple_debug_info("msn", "unknown user %s, payload is %s",
+		purple_debug_info("msn", "unknown user %s, payload is %s\n",
 			passport, str);
 		g_free(str);
 		return;
@@ -1841,14 +1707,11 @@ initial_email_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 
 		if (count > 0)
 		{
-			const char *passport;
-			const char *url;
-
-			passport = msn_user_get_passport(session->user);
-			url = session->passport_info.mail_url;
+			const char *passports[2] = { msn_user_get_passport(session->user) };
+			const char *urls[2] = { session->passport_info.mail_url };
 
 			purple_notify_emails(gc, count, FALSE, NULL, NULL,
-							   &passport, &url, NULL, NULL);
+							   passports, urls, NULL, NULL);
 		}
 	}
 
@@ -1910,14 +1773,11 @@ initial_mdata_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 
 		if (count > 0)
 		{
-			const char *passport;
-			const char *url;
-
-			passport = msn_user_get_passport(session->user);
-			url = session->passport_info.mail_url;
+			const char *passports[2] = { msn_user_get_passport(session->user) };
+			const char *urls[2] = { session->passport_info.mail_url };
 
 			purple_notify_emails(gc, count, FALSE, NULL, NULL,
-							   &passport, &url, NULL, NULL);
+							   passports, urls, NULL, NULL);
 		}
 	}
 
@@ -2031,10 +1891,54 @@ system_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	g_hash_table_destroy(table);
 }
 
+/**************************************************************************
+ * Dispatch server list management 
+ **************************************************************************/
+typedef struct MsnAddRemoveListData {
+	MsnCmdProc *cmdproc;
+	MsnUser *user;
+	MsnListOp list_op;
+	gboolean add;
+} MsnAddRemoveListData;
+
+static void
+modify_unknown_buddy_on_list(MsnSession *session, const char *passport,
+                             MsnNetwork network, gpointer data)
+{
+	MsnAddRemoveListData *addrem = data;
+	MsnCmdProc *cmdproc;
+	xmlnode *node;
+	char *payload;
+	int payload_len;
+
+	cmdproc = addrem->cmdproc;
+
+	/* Update user first */
+	msn_user_set_network(addrem->user, network);
+
+	node = xmlnode_new("ml");
+	node->child = NULL;
+
+	msn_add_contact_xml(session, node, passport,
+	                    addrem->list_op, network);
+
+	payload = xmlnode_to_str(node, &payload_len);
+	xmlnode_free(node);
+
+	if (addrem->add)
+		msn_notification_post_adl(cmdproc, payload, payload_len);
+	else
+		msn_notification_post_rml(cmdproc, payload, payload_len);
+
+	g_free(payload);
+	g_free(addrem);
+}
+
 void
 msn_notification_add_buddy_to_list(MsnNotification *notification, MsnListId list_id,
 							  MsnUser *user)
 {
+	MsnAddRemoveListData *addrem;
 	MsnCmdProc *cmdproc;
 	MsnListOp list_op = 1 << list_id;
 	xmlnode *adl_node;
@@ -2049,11 +1953,23 @@ msn_notification_add_buddy_to_list(MsnNotification *notification, MsnListId list
 	msn_add_contact_xml(notification->session, adl_node, user->passport,
 	                    list_op, user->networkid);
 
-	payload = xmlnode_to_str(adl_node,&payload_len);
+	payload = xmlnode_to_str(adl_node, &payload_len);
 	xmlnode_free(adl_node);
 
-	msn_notification_post_adl(notification->servconn->cmdproc,
-						payload,payload_len);
+	if (user->networkid != MSN_NETWORK_UNKNOWN) {
+		msn_notification_post_adl(cmdproc, payload, payload_len);
+
+	} else {
+		addrem = g_new(MsnAddRemoveListData, 1);
+		addrem->cmdproc = cmdproc;
+		addrem->user = user;
+		addrem->list_op = list_op;
+		addrem->add = TRUE;
+
+		msn_notification_send_fqy(notification->session, payload, payload_len,
+		                          modify_unknown_buddy_on_list, addrem);
+	}
+
 	g_free(payload);
 }
 
@@ -2061,8 +1977,8 @@ void
 msn_notification_rem_buddy_from_list(MsnNotification *notification, MsnListId list_id,
 						   MsnUser *user)
 {
+	MsnAddRemoveListData *addrem;
 	MsnCmdProc *cmdproc;
-	MsnTransaction *trans;
 	MsnListOp list_op = 1 << list_id;
 	xmlnode *rml_node;
 	char *payload;
@@ -2079,10 +1995,20 @@ msn_notification_rem_buddy_from_list(MsnNotification *notification, MsnListId li
 	payload = xmlnode_to_str(rml_node, &payload_len);
 	xmlnode_free(rml_node);
 
-	purple_debug_info("msn", "Send RML with payload:\n%s\n", payload);
-	trans = msn_transaction_new(cmdproc, "RML","%" G_GSIZE_FORMAT, strlen(payload));
-	msn_transaction_set_payload(trans, payload, strlen(payload));
-	msn_cmdproc_send_trans(cmdproc, trans);
+	if (user->networkid != MSN_NETWORK_UNKNOWN) {
+		msn_notification_post_rml(cmdproc, payload, payload_len);
+
+	} else {
+		addrem = g_new(MsnAddRemoveListData, 1);
+		addrem->cmdproc = cmdproc;
+		addrem->user = user;
+		addrem->list_op = list_op;
+		addrem->add = FALSE;
+
+		msn_notification_send_fqy(notification->session, payload, payload_len,
+		                          modify_unknown_buddy_on_list, addrem);
+	}
+
 	g_free(payload);
 }
 
@@ -2105,9 +2031,6 @@ msn_notification_init(void)
 	msn_table_add_cmd(cbs_table, "VER", "VER", ver_cmd);
 	msn_table_add_cmd(cbs_table, "PRP", "PRP", prp_cmd);
 	msn_table_add_cmd(cbs_table, "BLP", "BLP", blp_cmd);
-	msn_table_add_cmd(cbs_table, "REG", "REG", reg_cmd);
-	msn_table_add_cmd(cbs_table, "ADG", "ADG", adg_cmd);
-	msn_table_add_cmd(cbs_table, "RMG", "RMG", rmg_cmd);
 	msn_table_add_cmd(cbs_table, "XFR", "XFR", xfr_cmd);
 
 	/* Asynchronous */
@@ -2140,10 +2063,8 @@ msn_notification_init(void)
 
 	msn_table_add_cmd(cbs_table, NULL, "241", adl_241_error_cmd);
 
-	msn_table_add_error(cbs_table, "ADD", add_error);
 	msn_table_add_error(cbs_table, "ADL", adl_error);
-	msn_table_add_error(cbs_table, "REG", reg_error);
-	msn_table_add_error(cbs_table, "RMG", rmg_error);
+	msn_table_add_error(cbs_table, "FQY", fqy_error);
 	msn_table_add_error(cbs_table, "USR", usr_error);
 
 	msn_table_add_msg_type(cbs_table,
diff --git a/libpurple/protocols/msn/notification.h b/libpurple/protocols/msn/notification.h
index e2efd415cb..d762ffc78b 100644
--- a/libpurple/protocols/msn/notification.h
+++ b/libpurple/protocols/msn/notification.h
@@ -58,7 +58,7 @@ struct _MsnNotification
 	gboolean in_use;
 };
 
-typedef void (*MsnFqyCb)(MsnSession *session, const char *passport, MsnNetwork network);
+typedef void (*MsnFqyCb)(MsnSession *session, const char *passport, MsnNetwork network, gpointer data);
 
 #include "state.h"
 void uum_send_msg(MsnSession *session,MsnMessage *msg);
@@ -73,7 +73,7 @@ void msn_notification_rem_buddy_from_list(MsnNotification *notification,
 
 void msn_notification_send_fqy(MsnSession *session,
                                const char *payload, int payload_len,
-                               MsnFqyCb cb);
+                               MsnFqyCb cb, gpointer cb_data);
 
 MsnNotification *msn_notification_new(MsnSession *session);
 void msn_notification_destroy(MsnNotification *notification);
diff --git a/libpurple/protocols/msn/oim.c b/libpurple/protocols/msn/oim.c
index 927c9376aa..1c6aabab96 100644
--- a/libpurple/protocols/msn/oim.c
+++ b/libpurple/protocols/msn/oim.c
@@ -174,7 +174,7 @@ msn_oim_request_cb(MsnSoapMessage *request, MsnSoapMessage *response,
 		gchar *faultcode_str = xmlnode_get_data(faultcode);
 
 		if (faultcode_str && g_str_equal(faultcode_str, "q0:BadContextToken")) {
-			purple_debug_warning("msn", "OIM Request Error, Updating token now.");
+			purple_debug_warning("msn", "OIM Request Error, Updating token now.\n");
 			msn_nexus_update_token(data->oim->session->nexus,
 				data->send ? MSN_AUTH_LIVE_SECURE : MSN_AUTH_MESSENGER_WEB,
 				(GSourceFunc)msn_oim_request_helper, data);
@@ -183,7 +183,7 @@ msn_oim_request_cb(MsnSoapMessage *request, MsnSoapMessage *response,
 
 		} else if (faultcode_str && g_str_equal(faultcode_str, "q0:AuthenticationFailed")) {
 			if (xmlnode_get_child(fault, "detail/RequiredAuthPolicy") != NULL) {
-				purple_debug_warning("msn", "OIM Request Error, Updating token now.");
+				purple_debug_warning("msn", "OIM Request Error, Updating token now.\n");
 				msn_nexus_update_token(data->oim->session->nexus,
 					data->send ? MSN_AUTH_LIVE_SECURE : MSN_AUTH_MESSENGER_WEB,
 					(GSourceFunc)msn_oim_request_helper, data);
@@ -668,9 +668,15 @@ msn_oim_report_to_user(MsnOimRecvData *rdata, const char *msg_str)
 		if (tokens[1] != NULL)
 			from = (const char *)tokens[1];
 
-		start = strchr(from, '<') + 1;
-		end = strchr(from, '>');
-		passport = g_strndup(start, end - start);
+		start = strchr(from, '<');
+		if (start != NULL) {
+			start++;
+			end = strchr(from, '>');
+			if (end != NULL)
+				passport = g_strndup(start, end - start);
+		}
+		if (passport == NULL)
+			passport = g_strdup(_("Unknown"));
 
 		g_strfreev(tokens);
 	}
@@ -764,14 +770,14 @@ msn_parse_oim_xml(MsnOim *oim, xmlnode *node)
 	if (iu_node != NULL && purple_account_get_check_mail(session->account))
 	{
 		char *unread = xmlnode_get_data(iu_node);
-		const char *passport = msn_user_get_passport(session->user);
-		const char *url = session->passport_info.mail_url;
+		const char *passports[2] = { msn_user_get_passport(session->user) };
+		const char *urls[2] = { session->passport_info.mail_url };
 		int count = atoi(unread);
 
 		/* XXX/khc: pretty sure this is wrong */
 		if (count > 0)
 			purple_notify_emails(session->account->gc, count, FALSE, NULL,
-				NULL, &passport, &url, NULL, NULL);
+				NULL, passports, urls, NULL, NULL);
 		g_free(unread);
 	}
 
diff --git a/libpurple/protocols/msn/servconn.c b/libpurple/protocols/msn/servconn.c
index 728e4410ec..1d57865a06 100644
--- a/libpurple/protocols/msn/servconn.c
+++ b/libpurple/protocols/msn/servconn.c
@@ -26,6 +26,7 @@
 #include "error.h"
 
 static void read_cb(gpointer data, gint source, PurpleInputCondition cond);
+static void servconn_timeout_renew(MsnServConn *servconn);
 
 /**************************************************************************
  * Main
@@ -52,6 +53,8 @@ msn_servconn_new(MsnSession *session, MsnServConnType type)
 
 	servconn->tx_buf = purple_circ_buffer_new(MSN_BUF_LEN);
 	servconn->tx_handler = 0;
+	servconn->timeout_sec = 0;
+	servconn->timeout_handle = 0;
 
 	servconn->fd = -1;
 
@@ -82,6 +85,8 @@ msn_servconn_destroy(MsnServConn *servconn)
 	purple_circ_buffer_destroy(servconn->tx_buf);
 	if (servconn->tx_handler > 0)
 		purple_input_remove(servconn->tx_handler);
+	if (servconn->timeout_handle > 0)
+		purple_input_remove(servconn->timeout_handle);
 
 	msn_cmdproc_destroy(servconn->cmdproc);
 	g_free(servconn);
@@ -118,38 +123,35 @@ msn_servconn_set_destroy_cb(MsnServConn *servconn,
  **************************************************************************/
 
 void
-msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error)
+msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error,
+                       const char *reason)
 {
-	char *tmp;
-	const char *reason;
+	MsnSession *session = servconn->session;
+	MsnServConnType type = servconn->type;
 
 	const char *names[] = { "Notification", "Switchboard" };
 	const char *name;
 
-	name = names[servconn->type];
+	name = names[type];
 
-	switch (error)
-	{
-		case MSN_SERVCONN_ERROR_CONNECT:
-			reason = _("Unable to connect"); break;
-		case MSN_SERVCONN_ERROR_WRITE:
-			reason = _("Writing error"); break;
-		case MSN_SERVCONN_ERROR_READ:
-			reason = _("Reading error"); break;
-		default:
-			reason = _("Unknown error"); break;
+	if (reason == NULL) {
+		switch (error)
+		{
+			case MSN_SERVCONN_ERROR_CONNECT:
+				reason = _("Unable to connect"); break;
+			case MSN_SERVCONN_ERROR_WRITE:
+				reason = _("Writing error"); break;
+			case MSN_SERVCONN_ERROR_READ:
+				reason = _("Reading error"); break;
+			default:
+				reason = _("Unknown error"); break;
+		}
 	}
 
 	purple_debug_error("msn", "Connection error from %s server (%s): %s\n",
 					 name, servconn->host, reason);
-	tmp = g_strdup_printf(_("Connection error from %s server:\n%s"),
-						  name, reason);
 
-	if (servconn->type == MSN_SERVCONN_NS)
-	{
-		msn_session_set_error(servconn->session, MSN_ERROR_SERVCONN, tmp);
-	}
-	else if (servconn->type == MSN_SERVCONN_SB)
+	if (type == MSN_SERVCONN_SB)
 	{
 		MsnSwitchBoard *swboard;
 		swboard = servconn->cmdproc->data;
@@ -157,9 +159,16 @@ msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error)
 			swboard->error = MSN_SB_ERROR_CONNECTION;
 	}
 
+	/* servconn->disconnect_cb may destroy servconn, so don't use it again */
 	msn_servconn_disconnect(servconn);
 
-	g_free(tmp);
+	if (type == MSN_SERVCONN_NS)
+	{
+		char *tmp = g_strdup_printf(_("Connection error from %s server:\n%s"),
+		                            name, reason);
+		msn_session_set_error(session, MSN_ERROR_SERVCONN, tmp);
+		g_free(tmp);
+	}
 }
 
 /**************************************************************************
@@ -184,11 +193,12 @@ connect_cb(gpointer data, gint source, const char *error_message)
 		servconn->connect_cb(servconn);
 		servconn->inpa = purple_input_add(servconn->fd, PURPLE_INPUT_READ,
 			read_cb, data);
+		servconn_timeout_renew(servconn);
 	}
 	else
 	{
 		purple_debug_error("msn", "Connection error: %s\n", error_message);
-		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_CONNECT);
+		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_CONNECT, error_message);
 	}
 }
 
@@ -219,6 +229,7 @@ msn_servconn_connect(MsnServConn *servconn, const char *host, int port, gboolean
 
 		servconn->connected = TRUE;
 		servconn->httpconn->virgin = TRUE;
+		servconn_timeout_renew(servconn);
 
 		/* Someone wants to know we connected. */
 		servconn->connect_cb(servconn);
@@ -267,6 +278,12 @@ msn_servconn_disconnect(MsnServConn *servconn)
 		servconn->inpa = 0;
 	}
 
+	if (servconn->timeout_handle > 0)
+	{
+		purple_input_remove(servconn->timeout_handle);
+		servconn->timeout_handle = 0;
+	}
+
 	close(servconn->fd);
 
 	servconn->rx_buf = NULL;
@@ -279,6 +296,36 @@ msn_servconn_disconnect(MsnServConn *servconn)
 		servconn->disconnect_cb(servconn);
 }
 
+static gboolean
+servconn_idle_timeout_cb(MsnServConn *servconn)
+{
+	msn_servconn_disconnect(servconn);
+	servconn->timeout_handle = 0;
+	return FALSE;
+}
+
+static void
+servconn_timeout_renew(MsnServConn *servconn)
+{
+	if (servconn->timeout_handle) {
+		purple_input_remove(servconn->timeout_handle);
+		servconn->timeout_handle = 0;
+	}
+
+	if (servconn->connected && servconn->timeout_sec) {
+		servconn->timeout_handle = purple_timeout_add_seconds(
+			servconn->timeout_sec, (GSourceFunc)servconn_idle_timeout_cb, servconn);
+	}
+}
+
+void
+msn_servconn_set_idle_timeout(MsnServConn *servconn, guint seconds)
+{
+	servconn->timeout_sec = seconds;
+	if (servconn->connected)
+		servconn_timeout_renew(servconn);
+}
+
 static void
 servconn_write_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
@@ -299,11 +346,12 @@ servconn_write_cb(gpointer data, gint source, PurpleInputCondition cond)
 	if (ret < 0 && errno == EAGAIN)
 		return;
 	else if (ret <= 0) {
-		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE);
+		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE, NULL);
 		return;
 	}
 
 	purple_circ_buffer_mark_read(servconn->tx_buf, ret);
+	servconn_timeout_renew(servconn);
 }
 
 gssize
@@ -355,9 +403,10 @@ msn_servconn_write(MsnServConn *servconn, const char *buf, size_t len)
 
 	if (ret == -1)
 	{
-		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE);
+		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE, NULL);
 	}
 
+	servconn_timeout_renew(servconn);
 	return ret;
 }
 
@@ -380,7 +429,7 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 		purple_debug_error("msn", "servconn %03d read error, "
 			"len: %" G_GSSIZE_FORMAT ", errno: %d, error: %s\n",
 			servconn->num, len, errno, g_strerror(errno));
-		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ);
+		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ, NULL);
 
 		return;
 	}
@@ -392,6 +441,7 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 	servconn->rx_len += len;
 
 	msn_servconn_process_data(servconn);
+	servconn_timeout_renew(servconn);
 }
 
 void msn_servconn_process_data(MsnServConn *servconn)
diff --git a/libpurple/protocols/msn/servconn.h b/libpurple/protocols/msn/servconn.h
index b6d0687a4a..6023a7cd04 100644
--- a/libpurple/protocols/msn/servconn.h
+++ b/libpurple/protocols/msn/servconn.h
@@ -88,6 +88,8 @@ struct _MsnServConn
 
 	PurpleCircBuffer *tx_buf;
 	guint tx_handler;
+	guint timeout_sec;
+	guint timeout_handle;
 
 	void (*connect_cb)(MsnServConn *); /**< The callback to call when connecting. */
 	void (*disconnect_cb)(MsnServConn *); /**< The callback to call when disconnecting. */
@@ -168,7 +170,8 @@ gssize msn_servconn_write(MsnServConn *servconn, const char *buf,
  * @param servconn The servconn.
  * @param error The error that happened.
  */
-void msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error);
+void msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error,
+                            const char *reason);
 
 /**
  * Process the data in servconn->rx_buf.  This is called after reading
@@ -178,4 +181,12 @@ void msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error);
  */
 void msn_servconn_process_data(MsnServConn *servconn);
 
+/**
+ * Set a idle timeout fot this servconn
+ *
+ * @param servconn The servconn
+ * @param seconds The idle timeout in seconds
+ */
+void msn_servconn_set_idle_timeout(MsnServConn *servconn, guint seconds);
+
 #endif /* _MSN_SERVCONN_H_ */
diff --git a/libpurple/protocols/msn/session.c b/libpurple/protocols/msn/session.c
index 424a37c6d5..1517717fdd 100644
--- a/libpurple/protocols/msn/session.c
+++ b/libpurple/protocols/msn/session.c
@@ -261,9 +261,9 @@ msn_session_get_swboard(MsnSession *session, const char *username,
 static void
 msn_session_sync_users(MsnSession *session)
 {
-	PurpleBlistNode *gnode, *cnode, *bnode;
 	PurpleConnection *gc = purple_account_get_connection(session->account);
 	GList *to_remove = NULL;
+	GSList *buddies;
 
 	g_return_if_fail(gc != NULL);
 
@@ -271,60 +271,36 @@ msn_session_sync_users(MsnSession *session)
 	 * being logged in. This no longer happens, so we manually iterate
 	 * over the whole buddy list to identify sync issues.
 	 */
-	for (gnode = purple_blist_get_root(); gnode;
-			gnode = purple_blist_node_get_sibling_next(gnode)) {
-		PurpleGroup *group = (PurpleGroup *)gnode;
-		const char *group_name;
-		if(!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-		group_name = purple_group_get_name(group);
-		for(cnode = purple_blist_node_get_first_child(gnode);
-				cnode;
-				cnode = purple_blist_node_get_sibling_next(cnode)) {
-			if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-			for(bnode = purple_blist_node_get_first_child(cnode);
-					bnode;
-					bnode = purple_blist_node_get_sibling_next(bnode)) {
-				PurpleBuddy *b;
-				if(!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-				b = (PurpleBuddy *)bnode;
-				if(purple_buddy_get_account(b) == purple_connection_get_account(gc)) {
-					MsnUser *remote_user;
-					gboolean found = FALSE;
-
-					remote_user = msn_userlist_find_user(session->userlist, purple_buddy_get_name(b));
-
-					if ((remote_user != NULL) && (remote_user->list_op & MSN_LIST_FL_OP))
-					{
-						GList *l;
-
-						for (l = remote_user->group_ids; l != NULL; l = l->next)
-						{
-							const char *name = msn_userlist_find_group_name(remote_user->userlist, l->data);
-							if (name && !g_strcasecmp(group_name, name))
-							{
-								found = TRUE;
-								break;
-							}
-						}
-					}
-
-					/* We don't care if they're in a different group, as long as they're on the
-					 * list somewhere. If we check for the group, we cause pain, agony and
-					 * suffering for people who decide to re-arrange their buddy list elsewhere.
-					 */
-					if (!found)
-					{
-						if ((remote_user == NULL) || !(remote_user->list_op & MSN_LIST_FL_OP)) {
-							/* The user is not on the server list */
-							msn_show_sync_issue(session, purple_buddy_get_name(b), group_name);
-						} else {
-							/* The user is not in that group on the server list */
-							to_remove = g_list_prepend(to_remove, b);
-						}
-					}
+	for (buddies = purple_find_buddies(session->account, NULL); buddies;
+			buddies = g_slist_delete_link(buddies, buddies)) {
+		PurpleBuddy *buddy = buddies->data;
+		const gchar *buddy_name = purple_buddy_get_name(buddy);
+		const gchar *group_name = purple_group_get_name(purple_buddy_get_group(buddy));
+		MsnUser *remote_user;
+		gboolean found = FALSE;
+
+		remote_user = msn_userlist_find_user(session->userlist, buddy_name);
+		if (remote_user && remote_user->list_op & MSN_LIST_FL_OP) {
+			GList *l;
+			for (l = remote_user->group_ids; l; l = l->next) {
+				const char *name = msn_userlist_find_group_name(remote_user->userlist, l->data);
+				if (name && !g_ascii_strcasecmp(group_name, name)) {
+					found = TRUE;
+					break;
+				}
+			}
+
+			/* We don't care if they're in a different group, as long as they're on the
+			 * list somewhere. If we check for the group, we cause pain, agony and
+			 * suffering for people who decide to re-arrange their buddy list elsewhere.
+			 */
+			if (!found) {
+				if ((remote_user == NULL) || !(remote_user->list_op & MSN_LIST_FL_OP)) {
+					/* The user is not on the server list */
+					msn_show_sync_issue(session, buddy_name, group_name);
+				} else {
+					/* The user is not in that group on the server list */
+					to_remove = g_list_prepend(to_remove, buddy);
 				}
 			}
 		}
@@ -358,15 +334,15 @@ msn_session_set_error(MsnSession *session, MsnErrorType error,
 		case MSN_ERROR_UNSUPPORTED_PROTOCOL:
 			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 			msg = g_strdup(_("Our protocol is not supported by the "
-							 "server."));
+							 "server"));
 			break;
 		case MSN_ERROR_HTTP_MALFORMED:
 			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-			msg = g_strdup(_("Error parsing HTTP."));
+			msg = g_strdup(_("Error parsing HTTP"));
 			break;
 		case MSN_ERROR_SIGN_OTHER:
 			reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE;
-			msg = g_strdup(_("You have signed on from another location."));
+			msg = g_strdup(_("You have signed on from another location"));
 			if (!purple_account_get_remember_password(session->account))
 				purple_account_set_password(session->account, NULL);
 			break;
@@ -379,7 +355,7 @@ msn_session_set_error(MsnSession *session, MsnErrorType error,
 		case MSN_ERROR_SERV_DOWN:
 			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 			msg = g_strdup(_("The MSN servers are going down "
-							 "temporarily."));
+							 "temporarily"));
 			break;
 		case MSN_ERROR_AUTH:
 			reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
@@ -395,13 +371,13 @@ msn_session_set_error(MsnSession *session, MsnErrorType error,
 			break;
 		default:
 			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-			msg = g_strdup(_("Unknown error."));
+			msg = g_strdup(_("Unknown error"));
 			break;
 	}
 
 	msn_session_disconnect(session);
 
-	purple_connection_error_reason (gc, reason, msg);
+	purple_connection_error_reason(gc, reason, msg);
 
 	g_free(msg);
 }
diff --git a/libpurple/protocols/msn/session.h b/libpurple/protocols/msn/session.h
index 82c5a508e9..36ea2ff026 100644
--- a/libpurple/protocols/msn/session.h
+++ b/libpurple/protocols/msn/session.h
@@ -35,7 +35,6 @@ typedef struct _MsnSession MsnSession;
 #include "switchboard.h"
 #include "group.h"
 
-#include "cmdproc.h"
 #include "nexus.h"
 #include "httpconn.h"
 #include "oim.h"
@@ -90,6 +89,7 @@ struct _MsnSession
 
 	gboolean connected;
 	gboolean logged_in; /**< A temporal flag to ignore local buddy list adds. */
+	int      adl_fqy; /**< A count of ADL/FQY so status is only changed once. */
 	gboolean destroying; /**< A flag that states if the session is being destroyed. */
 	gboolean http_method;
 
diff --git a/libpurple/protocols/msn/slp.c b/libpurple/protocols/msn/slp.c
index ba6451a494..0a66a0f131 100644
--- a/libpurple/protocols/msn/slp.c
+++ b/libpurple/protocols/msn/slp.c
@@ -34,8 +34,6 @@
 
 /* ms to delay between sending buddy icon requests to the server. */
 #define BUDDY_ICON_DELAY 20
-/*debug SLP*/
-#define MSN_DEBUG_UD
 
 static void send_ok(MsnSlpCall *slpcall, const char *branch,
 					const char *type, const char *content);
@@ -212,10 +210,8 @@ send_ok(MsnSlpCall *slpcall, const char *branch,
 								"MSNSLP/1.0 200 OK",
 								branch, type, content);
 
-#ifdef MSN_DEBUG_SLP
 	slpmsg->info = "SLP 200 OK";
 	slpmsg->text_body = TRUE;
-#endif
 
 	msn_slplink_queue_slpmsg(slplink, slpmsg);
 
@@ -236,10 +232,8 @@ send_decline(MsnSlpCall *slpcall, const char *branch,
 								"MSNSLP/1.0 603 Decline",
 								branch, type, content);
 
-#ifdef MSN_DEBUG_SLP
 	slpmsg->info = "SLP 603 Decline";
 	slpmsg->text_body = TRUE;
-#endif
 
 	msn_slplink_queue_slpmsg(slplink, slpmsg);
 }
@@ -250,6 +244,8 @@ static void
 got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 			   const char *euf_guid, const char *context)
 {
+	gboolean accepted = FALSE;
+
 	if (!strcmp(euf_guid, MSN_OBJ_GUID))
 	{
 		/* Emoticon or UserDisplay */
@@ -309,22 +305,21 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 		slpmsg->slpcall = slpcall;
 		slpmsg->session_id = slpcall->session_id;
 		msn_slpmsg_set_body(slpmsg, NULL, 4);
-#ifdef MSN_DEBUG_SLP
 		slpmsg->info = "SLP DATA PREP";
-#endif
 		msn_slplink_queue_slpmsg(slplink, slpmsg);
 
 		/* DATA */
 		slpmsg = msn_slpmsg_new(slplink);
 		slpmsg->slpcall = slpcall;
 		slpmsg->flags = 0x20;
-#ifdef MSN_DEBUG_SLP
 		slpmsg->info = "SLP DATA";
-#endif
 		msn_slpmsg_set_image(slpmsg, img);
 		msn_slplink_queue_slpmsg(slplink, slpmsg);
 		purple_imgstore_unref(img);
+
+		accepted = TRUE;
 	}
+
 	else if (!strcmp(euf_guid, MSN_FT_GUID))
 	{
 		/* File Transfer */
@@ -334,7 +329,6 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 		gsize bin_len;
 		guint32 file_size;
 		char *file_name;
-		gunichar2 *uni_name;
 
 		account = slpcall->slplink->session->account;
 
@@ -352,18 +346,12 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 			bin = (char *)purple_base64_decode(context, &bin_len);
 			file_size = GUINT32_FROM_LE(*(gsize *)(bin + 8));
 
-			uni_name = (gunichar2 *)(bin + 20);
-			while(*uni_name != 0 && ((char *)uni_name - (bin + 20)) < MAX_FILE_NAME_LEN) {
-				*uni_name = GUINT16_FROM_LE(*uni_name);
-				uni_name++;
-			}
-
-			file_name = g_utf16_to_utf8((const gunichar2 *)(bin + 20), -1,
-										NULL, NULL, NULL);
+			file_name = g_convert(bin + 20, MAX_FILE_NAME_LEN, "UTF-8", "UTF-16LE",
+			                      NULL, NULL, NULL);
 
 			g_free(bin);
 
-			purple_xfer_set_filename(xfer, file_name);
+			purple_xfer_set_filename(xfer, file_name ? file_name : "");
 			g_free(file_name);
 			purple_xfer_set_size(xfer, file_size);
 			purple_xfer_set_init_fnc(xfer, msn_xfer_init);
@@ -377,8 +365,64 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 
 			purple_xfer_request(xfer);
 		}
+
+		accepted = TRUE;
+
+	} else if (!strcmp(euf_guid, MSN_CAM_REQUEST_GUID)) {
+		purple_debug_info("msn", "Cam request.\n");
+		if (slpcall && slpcall->slplink &&
+				slpcall->slplink->session) {
+			PurpleConversation *conv;
+			gchar *from = slpcall->slplink->remote_user;
+			conv = purple_find_conversation_with_account(
+					PURPLE_CONV_TYPE_IM, from,
+					slpcall->slplink->session->account);
+			if (conv) {
+				char *buf;
+				buf = g_strdup_printf(
+						_("%s requests to view your "
+						"webcam, but this request is "
+						"not yet supported."), from);
+				purple_conversation_write(conv, NULL, buf,
+						PURPLE_MESSAGE_SYSTEM |
+						PURPLE_MESSAGE_NOTIFY,
+						time(NULL));
+				g_free(buf);
+			}
+		}
+
+	} else if (!strcmp(euf_guid, MSN_CAM_GUID)) {
+		purple_debug_info("msn", "Cam invite.\n");
+		if (slpcall && slpcall->slplink &&
+				slpcall->slplink->session) {
+			PurpleConversation *conv;
+			gchar *from = slpcall->slplink->remote_user;
+			conv = purple_find_conversation_with_account(
+					PURPLE_CONV_TYPE_IM, from,
+					slpcall->slplink->session->account);
+			if (conv) {
+				char *buf;
+				buf = g_strdup_printf(
+						_("%s has sent you a webcam "
+						"invite, which is not yet "
+						"supported."), from);
+				purple_conversation_write(conv, NULL, buf,
+						PURPLE_MESSAGE_SYSTEM |
+						PURPLE_MESSAGE_NOTIFY,
+						time(NULL));
+				g_free(buf);
+			}
+		}
+
 	} else
 		purple_debug_warning("msn", "SLP SessionReq with unknown EUF-GUID: %s\n", euf_guid);
+
+	if (!accepted) {
+		char *content = g_strdup_printf("SessionID: %lu\r\n\r\n",
+		                                slpcall->session_id);
+		send_decline(slpcall, branch, "application/x-msnmsgr-sessionreqbody", content);
+		g_free(content);
+	}
 }
 
 void
@@ -404,10 +448,8 @@ send_bye(MsnSlpCall *slpcall, const char *type)
 								"\r\n");
 	g_free(header);
 
-#ifdef MSN_DEBUG_SLP
 	slpmsg->info = "SLP BYE";
 	slpmsg->text_body = TRUE;
-#endif
 
 	msn_slplink_queue_slpmsg(slplink, slpmsg);
 }
@@ -575,10 +617,8 @@ got_ok(MsnSlpCall *slpcall,
 										"application/x-msnmsgr-transreqbody",
 										content);
 
-#ifdef MSN_DEBUG_SLP
 			slpmsg->info = "SLP INVITE";
 			slpmsg->text_body = TRUE;
-#endif
 			msn_slplink_send_slpmsg(slplink, slpmsg);
 
 			g_free(header);
@@ -795,9 +835,8 @@ got_emoticon(MsnSlpCall *slpcall,
 		purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
 		purple_conv_custom_smiley_close(conv, slpcall->data_info );
 	}
-#ifdef MSN_DEBUG_UD
-	purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
 }
 
 void
@@ -919,9 +958,8 @@ msn_release_buddy_icon_request(MsnUserList *userlist)
 
 	g_return_if_fail(userlist != NULL);
 
-#ifdef MSN_DEBUG_UD
-	purple_debug_info("msn", "Releasing buddy icon request\n");
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "Releasing buddy icon request\n");
 
 	if (userlist->buddy_icon_window > 0)
 	{
@@ -942,10 +980,10 @@ msn_release_buddy_icon_request(MsnUserList *userlist)
 		userlist->buddy_icon_window--;
 		request_user_display(user);
 
-#ifdef MSN_DEBUG_UD
-		purple_debug_info("msn", "msn_release_buddy_icon_request(): buddy_icon_window-- yields =%d\n",
-						userlist->buddy_icon_window);
-#endif
+		if (purple_debug_is_verbose())
+			purple_debug_info("msn",
+			                  "msn_release_buddy_icon_request(): buddy_icon_window-- yields =%d\n",
+			                  userlist->buddy_icon_window);
 	}
 }
 
@@ -995,10 +1033,9 @@ msn_queue_buddy_icon_request(MsnUser *user)
 		userlist = user->userlist;
 		queue = userlist->buddy_icon_requests;
 
-#ifdef MSN_DEBUG_UD
-		purple_debug_info("msn", "Queueing buddy icon request for %s (buddy_icon_window = %i)\n",
-						user->passport, userlist->buddy_icon_window);
-#endif
+		if (purple_debug_is_verbose())
+			purple_debug_info("msn", "Queueing buddy icon request for %s (buddy_icon_window = %i)\n",
+			                  user->passport, userlist->buddy_icon_window);
 
 		g_queue_push_tail(queue, user);
 
@@ -1018,9 +1055,8 @@ got_user_display(MsnSlpCall *slpcall,
 	g_return_if_fail(slpcall != NULL);
 
 	info = slpcall->data_info;
-#ifdef MSN_DEBUG_UD
-	purple_debug_info("msn", "Got User Display: %s\n", slpcall->slplink->remote_user);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "Got User Display: %s\n", slpcall->slplink->remote_user);
 
 	userlist = slpcall->slplink->session->userlist;
 	account = slpcall->slplink->session->account;
@@ -1046,9 +1082,8 @@ end_user_display(MsnSlpCall *slpcall, MsnSession *session)
 
 	g_return_if_fail(session != NULL);
 
-#ifdef MSN_DEBUG_UD
-	purple_debug_info("msn", "End User Display\n");
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "End User Display\n");
 
 	userlist = session->userlist;
 
@@ -1106,9 +1141,8 @@ request_user_display(MsnUser *user)
 		gconstpointer data = NULL;
 		size_t len = 0;
 
-#ifdef MSN_DEBUG_UD
-		purple_debug_info("msn", "Requesting our own user display\n");
-#endif
+		if (purple_debug_is_verbose())
+			purple_debug_info("msn", "Requesting our own user display\n");
 
 		my_obj = msn_user_get_object(session->user);
 
@@ -1124,10 +1158,9 @@ request_user_display(MsnUser *user)
 		/* Free one window slot */
 		session->userlist->buddy_icon_window++;
 
-#ifdef MSN_DEBUG_UD
-		purple_debug_info("msn", "request_user_display(): buddy_icon_window++ yields =%d\n",
-						session->userlist->buddy_icon_window);
-#endif
+		if (purple_debug_is_verbose())
+			purple_debug_info("msn", "request_user_display(): buddy_icon_window++ yields =%d\n",
+			                  session->userlist->buddy_icon_window);
 
 		msn_release_buddy_icon_request(session->userlist);
 	}
diff --git a/libpurple/protocols/msn/slpcall.c b/libpurple/protocols/msn/slpcall.c
index 7de69a09be..6bb1357f2a 100644
--- a/libpurple/protocols/msn/slpcall.c
+++ b/libpurple/protocols/msn/slpcall.c
@@ -27,8 +27,6 @@
 
 #include "slp.h"
 
-/* #define MSN_DEBUG_SLPCALL */
-
 /**************************************************************************
  * Main
  **************************************************************************/
@@ -40,9 +38,8 @@ msn_slpcall_timeout(gpointer data)
 
 	slpcall = data;
 
-#ifdef MSN_DEBUG_SLPCALL
-	purple_debug_info("msn", "slpcall_timeout: slpcall(%p)\n", slpcall);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "slpcall_timeout: slpcall(%p)\n", slpcall);
 
 	if (!slpcall->pending && !slpcall->progress)
 	{
@@ -64,9 +61,8 @@ msn_slpcall_new(MsnSlpLink *slplink)
 
 	slpcall = g_new0(MsnSlpCall, 1);
 
-#ifdef MSN_DEBUG_SLPCALL
-	purple_debug_info("msn", "slpcall_new: slpcall(%p)\n", slpcall);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "slpcall_new: slpcall(%p)\n", slpcall);
 
 	slpcall->slplink = slplink;
 
@@ -82,9 +78,8 @@ msn_slpcall_destroy(MsnSlpCall *slpcall)
 {
 	GList *e;
 
-#ifdef MSN_DEBUG_SLPCALL
-	purple_debug_info("msn", "slpcall_destroy: slpcall(%p)\n", slpcall);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "slpcall_destroy: slpcall(%p)\n", slpcall);
 
 	g_return_if_fail(slpcall != NULL);
 
@@ -96,10 +91,9 @@ msn_slpcall_destroy(MsnSlpCall *slpcall)
 		MsnSlpMessage *slpmsg = e->data;
 		e = e->next;
 
-#ifdef MSN_DEBUG_SLPCALL_VERBOSE
-		purple_debug_info("msn", "slpcall_destroy: trying slpmsg(%p)\n",
-						slpmsg);
-#endif
+		if (purple_debug_is_verbose())
+			purple_debug_info("msn", "slpcall_destroy: trying slpmsg(%p)\n",
+			                  slpmsg);
 
 		if (slpmsg->slpcall == slpcall)
 		{
@@ -173,10 +167,8 @@ msn_slpcall_invite(MsnSlpCall *slpcall, const char *euf_guid,
 	slpmsg = msn_slpmsg_sip_new(slpcall, 0, header, slpcall->branch,
 								"application/x-msnmsgr-sessionreqbody", content);
 
-#ifdef MSN_DEBUG_SLP
 	slpmsg->info = "SLP INVITE";
 	slpmsg->text_body = TRUE;
-#endif
 
 	msn_slplink_send_slpmsg(slplink, slpmsg);
 
@@ -210,8 +202,61 @@ msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 	{
 		char *body_str;
 
-		body_str = g_strndup((const char *)body, body_len);
-		slpcall = msn_slp_sip_recv(slplink, body_str);
+		if (slpmsg->session_id == 64)
+		{
+			/* This is for handwritten messages (Ink) */
+			GError *error;
+			gsize bytes_read, bytes_written;
+
+			body_str = g_convert((const gchar *)body, body_len / 2,
+			                     "UTF-8", "UTF-16LE",
+			                     &bytes_read, &bytes_written, &error);
+			body_len -= bytes_read + 2;
+			body += bytes_read + 2;
+			if (body_str == NULL
+			 || body_len <= 0
+			 || strstr(body_str, "image/gif") == NULL)
+			{
+				if (error != NULL) {
+					purple_debug_error("msn",
+					                   "Unable to convert Ink header from UTF-16 to UTF-8: %s\n",
+					                   error->message);
+					g_error_free(error);
+				}
+				else
+					purple_debug_error("msn",
+					                   "Received Ink in unknown format\n");
+				g_free(body_str);
+				return NULL;
+			}
+			g_free(body_str);
+
+			body_str = g_convert((const gchar *)body, body_len / 2,
+			                     "UTF-8", "UTF16-LE",
+			                     &bytes_read, &bytes_written, &error);
+			if (!body_str)
+			{
+				if (error != NULL) {
+					purple_debug_error("msn",
+					                   "Unable to convert Ink body from UTF-16 to UTF-8: %s\n",
+					                   error->message);
+					g_error_free(error);
+				}
+				else
+					purple_debug_error("msn",
+					                   "Received Ink in unknown format\n");
+				return NULL;
+			}
+
+			msn_switchboard_show_ink(slpmsg->slplink->swboard,
+			                         slplink->remote_user,
+			                         body_str);
+		}
+		else
+		{
+			body_str = g_strndup((const char *)body, body_len);
+			slpcall = msn_slp_sip_recv(slplink, body_str);
+		}
 		g_free(body_str);
 	}
 	else if (slpmsg->flags == 0x20 ||
diff --git a/libpurple/protocols/msn/slplink.c b/libpurple/protocols/msn/slplink.c
index d292c9940f..0b921fa633 100644
--- a/libpurple/protocols/msn/slplink.c
+++ b/libpurple/protocols/msn/slplink.c
@@ -46,7 +46,7 @@ debug_msg_to_file(MsnMessage *msg, gboolean send)
 	pload = msn_message_gen_payload(msg, &pload_size);
 	if (!purple_util_write_data_to_file_absolute(tmp, pload, pload_size))
 	{
-		purple_debug_error("msn", "could not save debug file");
+		purple_debug_error("msn", "could not save debug file\n");
 	}
 	g_free(tmp);
 }
@@ -65,9 +65,8 @@ msn_slplink_new(MsnSession *session, const char *username)
 
 	slplink = g_new0(MsnSlpLink, 1);
 
-#ifdef MSN_DEBUG_SLPLINK
-	purple_debug_info("msn", "slplink_new: slplink(%p)\n", slplink);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "slplink_new: slplink(%p)\n", slplink);
 
 	slplink->session = session;
 	slplink->slp_seq_id = rand() % 0xFFFFFF00 + 4;
@@ -87,9 +86,8 @@ msn_slplink_destroy(MsnSlpLink *slplink)
 {
 	MsnSession *session;
 
-#ifdef MSN_DEBUG_SLPLINK
-	purple_debug_info("msn", "slplink_destroy: slplink(%p)\n", slplink);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "slplink_destroy: slplink(%p)\n", slplink);
 
 	g_return_if_fail(slplink != NULL);
 
@@ -269,9 +267,8 @@ msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 		msg->msnslp_header.length = len;
 	}
 
-#ifdef MSN_DEBUG_SLP
-	msn_message_show_readable(msg, slpmsg->info, slpmsg->text_body);
-#endif
+	if (purple_debug_is_verbose())
+		msn_message_show_readable(msg, slpmsg->info, slpmsg->text_body);
 
 #ifdef MSN_DEBUG_SLP_FILES
 	debug_msg_to_file(msg, TRUE);
@@ -441,12 +438,10 @@ msn_slplink_send_ack(MsnSlpLink *slplink, MsnMessage *msg)
 	slpmsg->ack_id     = msg->msnslp_header.id;
 	slpmsg->ack_sub_id = msg->msnslp_header.ack_id;
 	slpmsg->ack_size   = msg->msnslp_header.total_size;
-
-#ifdef MSN_DEBUG_SLP
 	slpmsg->info = "SLP ACK";
-#endif
 
 	msn_slplink_send_slpmsg(slplink, slpmsg);
+	msn_slpmsg_destroy(slpmsg);
 }
 
 static void
@@ -459,11 +454,10 @@ send_file_cb(MsnSlpCall *slpcall)
 	slpmsg = msn_slpmsg_new(slpcall->slplink);
 	slpmsg->slpcall = slpcall;
 	slpmsg->flags = 0x1000030;
-#ifdef MSN_DEBUG_SLP
 	slpmsg->info = "SLP FILE";
-#endif
+
 	xfer = (PurpleXfer *)slpcall->xfer;
-	purple_xfer_start(slpcall->xfer, 0, NULL, 0);
+	purple_xfer_start(slpcall->xfer, -1, NULL, 0);
 	slpmsg->fp = xfer->dest_fp;
 	if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
 		slpmsg->size = st.st_size;
@@ -493,12 +487,11 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 {
 	MsnSlpMessage *slpmsg;
 	const char *data;
-	gsize offset;
+	guint64 offset;
 	gsize len;
 
-#ifdef MSN_DEBUG_SLP
-	msn_slpmsg_show(msg);
-#endif
+	if (purple_debug_is_verbose())
+		msn_slpmsg_show(msg);
 
 #ifdef MSN_DEBUG_SLP_FILES
 	debug_msg_to_file(msg, FALSE);
@@ -510,14 +503,8 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 		g_return_if_reached();
 	}
 
-	slpmsg = NULL;
 	data = msn_message_get_bin_data(msg, &len);
 
-	/*
-		OVERHEAD!
-		if (msg->msnslp_header.length < msg->msnslp_header.total_size)
-	 */
-
 	offset = msg->msnslp_header.offset;
 
 	if (offset == 0)
@@ -545,11 +532,12 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 					if (xfer != NULL)
 					{
 						purple_xfer_ref(xfer);
-						purple_xfer_start(xfer,	0, NULL, 0);
+						purple_xfer_start(xfer,	-1, NULL, 0);
 
 						if (xfer->data == NULL) {
 							purple_xfer_unref(xfer);
-							return;
+							msn_slpmsg_destroy(slpmsg);
+							g_return_if_reached();
 						} else {
 							purple_xfer_unref(xfer);
 							slpmsg->fp = xfer->dest_fp;
@@ -565,6 +553,7 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 			if (slpmsg->buffer == NULL)
 			{
 				purple_debug_error("msn", "Failed to allocate buffer for slpmsg\n");
+				msn_slpmsg_destroy(slpmsg);
 				return;
 			}
 		}
@@ -572,13 +561,12 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 	else
 	{
 		slpmsg = msn_slplink_message_find(slplink, msg->msnslp_header.session_id, msg->msnslp_header.id);
-	}
-
-	if (slpmsg == NULL)
-	{
-		/* Probably the transfer was canceled */
-		purple_debug_error("msn", "Couldn't find slpmsg\n");
-		return;
+		if (slpmsg == NULL)
+		{
+			/* Probably the transfer was canceled */
+			purple_debug_error("msn", "Couldn't find slpmsg\n");
+			return;
+		}
 	}
 
 	if (slpmsg->fp)
@@ -586,12 +574,12 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 		/* fseek(slpmsg->fp, offset, SEEK_SET); */
 		len = fwrite(data, 1, len, slpmsg->fp);
 	}
-	else if (slpmsg->size)
+	else if (slpmsg->size && slpmsg->buffer)
 	{
 		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size)
 		{
 			purple_debug_error("msn",
-				"Oversized slpmsg - msgsize=%lld offset=%" G_GSIZE_FORMAT " len=%" G_GSIZE_FORMAT "\n",
+				"Oversized slpmsg - msgsize=%lld offset=%" G_GUINT64_FORMAT " len=%" G_GSIZE_FORMAT "\n",
 				slpmsg->size, offset, len);
 			g_return_if_reached();
 		}
@@ -682,7 +670,9 @@ gen_context(const char *file_name, const char *file_path)
 		size = st.st_size;
 
 	if(!file_name) {
-		u8 = purple_utf8_try_convert(g_basename(file_path));
+		gchar *basename = g_path_get_basename(file_path);
+		u8 = purple_utf8_try_convert(basename);
+		g_free(basename);
 		file_name = u8;
 	}
 
diff --git a/libpurple/protocols/msn/slpmsg.c b/libpurple/protocols/msn/slpmsg.c
index 92ef81fbf0..919f5de910 100644
--- a/libpurple/protocols/msn/slpmsg.c
+++ b/libpurple/protocols/msn/slpmsg.c
@@ -36,9 +36,8 @@ msn_slpmsg_new(MsnSlpLink *slplink)
 
 	slpmsg = g_new0(MsnSlpMessage, 1);
 
-#ifdef MSN_DEBUG_SLPMSG
-	purple_debug_info("msn", "slpmsg new (%p)\n", slpmsg);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "slpmsg new (%p)\n", slpmsg);
 
 	slpmsg->slplink = slplink;
 
@@ -56,9 +55,8 @@ msn_slpmsg_destroy(MsnSlpMessage *slpmsg)
 
 	g_return_if_fail(slpmsg != NULL);
 
-#ifdef MSN_DEBUG_SLPMSG
-	purple_debug_info("msn", "slpmsg destroy (%p)\n", slpmsg);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "slpmsg destroy (%p)\n", slpmsg);
 
 	slplink = slpmsg->slplink;
 
@@ -72,13 +70,6 @@ msn_slpmsg_destroy(MsnSlpMessage *slpmsg)
 	if (slpmsg->img == NULL)
 		g_free(slpmsg->buffer);
 
-#ifdef MSN_DEBUG_SLP
-	/*
-	if (slpmsg->info != NULL)
-		g_free(slpmsg->info);
-	*/
-#endif
-
 	for (cur = slpmsg->msgs; cur != NULL; cur = cur->next)
 	{
 		/* Something is pointing to this slpmsg, so we should remove that
@@ -87,10 +78,6 @@ msn_slpmsg_destroy(MsnSlpMessage *slpmsg)
 
 		MsnMessage *msg = cur->data;
 
-#ifdef MSN_DEBUG_SLPMSG
-		purple_debug_info("msn", "Unlink slpmsg callbacks.\n");
-#endif
-
 		msg->ack_cb = NULL;
 		msg->nak_cb = NULL;
 		msg->ack_data = NULL;
@@ -132,7 +119,6 @@ msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PurpleStoredImage *img)
 	slpmsg->size = purple_imgstore_get_size(img);
 }
 
-#ifdef MSN_DEBUG_SLP
 void
 msn_slpmsg_show(MsnMessage *msg)
 {
@@ -161,7 +147,6 @@ msn_slpmsg_show(MsnMessage *msg)
 
 	msn_message_show_readable(msg, info, text);
 }
-#endif
 
 MsnSlpMessage *
 msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq,
diff --git a/libpurple/protocols/msn/slpmsg.h b/libpurple/protocols/msn/slpmsg.h
index 677613a226..6f1349aa4c 100644
--- a/libpurple/protocols/msn/slpmsg.h
+++ b/libpurple/protocols/msn/slpmsg.h
@@ -50,10 +50,8 @@ struct _MsnSlpMessage
 	long ack_id;
 	long ack_sub_id;
 	long long ack_size;
-	long app_id;
 
 	gboolean sip; /**< A flag that states if this is a SIP slp message. */
-	int ref_count; /**< The reference count. */
 	long flags;
 
 	FILE *fp;
@@ -68,10 +66,8 @@ struct _MsnSlpMessage
 	MsnMessage *msg; /**< The temporary real message that will be sent. */
 #endif
 
-#ifdef MSN_DEBUG_SLP
-	char *info;
+	const char *info;
 	gboolean text_body;
-#endif
 };
 
 /**
@@ -100,8 +96,6 @@ MsnSlpMessage * msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq,
 								   const char *content_type,
 								   const char *content);
 
-#ifdef MSN_DEBUG_SLP
 void msn_slpmsg_show(MsnMessage *msg);
-#endif
 
 #endif /* _MSN_SLPMSG_H_ */
diff --git a/libpurple/protocols/msn/soap.c b/libpurple/protocols/msn/soap.c
index b986562272..badb8a9494 100644
--- a/libpurple/protocols/msn/soap.c
+++ b/libpurple/protocols/msn/soap.c
@@ -80,7 +80,7 @@ msn_soap_connection_new(MsnSession *session, const char *host)
 	conn->session = session;
 	conn->host = g_strdup(host);
 	conn->queue = g_queue_new();
-	conn->unsafe_debug = g_getenv("PURPLE_MSN_UNSAFE_DEBUG") != NULL;
+	conn->unsafe_debug = purple_debug_is_unsafe();
 	return conn;
 }
 
@@ -385,7 +385,7 @@ msn_soap_process(MsnSoapConnection *conn)
 					msn_soap_connection_handle_next(conn);
 					handled = TRUE;
 					break;
-				} else if (conn->response_code == 503) {
+				} else if (conn->response_code == 503 && conn->session->login_step < MSN_LOGIN_STEP_END) {
 					msn_soap_connection_sanitize(conn, TRUE);
 					msn_session_set_error(conn->session, MSN_ERROR_SERV_UNAVAILABLE, NULL);
 					return;
@@ -434,7 +434,7 @@ msn_soap_process(MsnSoapConnection *conn)
 					g_free(line);
 					return;
 				} else if (strcmp(key, "Content-Length") == 0) {
-					conn->body_len = atoi(value);
+					sscanf(value, "%" G_GSIZE_FORMAT, &(conn->body_len));
 				} else if (strcmp(key, "Connection") == 0) {
 					if (strcmp(value, "close") == 0) {
 						conn->close_when_done = TRUE;
@@ -667,6 +667,8 @@ msn_soap_connection_run(gpointer data)
 			conn->handled_len = 0;
 			conn->current_request = req;
 
+			if (conn->event_handle)
+				purple_input_remove(conn->event_handle);
 			conn->event_handle = purple_input_add(conn->ssl->fd,
 				PURPLE_INPUT_WRITE, msn_soap_write_cb, conn);
 			if (!msn_soap_write_cb_internal(conn, conn->ssl->fd, PURPLE_INPUT_WRITE, TRUE)) {
diff --git a/libpurple/protocols/msn/state.c b/libpurple/protocols/msn/state.c
index e172d880bb..50910d1c64 100644
--- a/libpurple/protocols/msn/state.c
+++ b/libpurple/protocols/msn/state.c
@@ -21,6 +21,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include "internal.h"
+#include "core.h"
+
 #include "msn.h"
 #include "state.h"
 
@@ -169,7 +173,7 @@ msn_get_currentmedia(char *xml_str, gsize len)
 	}
 	currentmediaNode = xmlnode_get_child(payloadNode, "CurrentMedia");
 	if (currentmediaNode == NULL) {
-		purple_debug_info("msn", "No CurrentMedia Node");
+		purple_debug_info("msn", "No CurrentMedia Node\n");
 		xmlnode_free(payloadNode);
 		return NULL;
 	}
@@ -195,7 +199,7 @@ msn_get_psm(char *xml_str, gsize len)
 	}
 	psmNode = xmlnode_get_child(payloadNode, "PSM");
 	if (psmNode == NULL) {
-		purple_debug_info("msn", "No PSM status Node");
+		purple_debug_info("msn", "No PSM status Node\n");
 		xmlnode_free(payloadNode);
 		return NULL;
 	}
@@ -245,7 +249,7 @@ create_media_string(PurplePresence *presence)
 void
 msn_set_psm(MsnSession *session)
 {
-	PurpleAccount *account = session->account;
+	PurpleAccount *account;
 	PurplePresence *presence;
 	PurpleStatus *status;
 	MsnCmdProc *cmdproc;
@@ -257,6 +261,7 @@ msn_set_psm(MsnSession *session)
 	g_return_if_fail(session != NULL);
 	g_return_if_fail(session->notification != NULL);
 
+	account = session->account;
 	cmdproc = session->notification->cmdproc;
 
 	/* Get the PSM string from Purple's Status Line */
@@ -288,10 +293,29 @@ msn_change_status(MsnSession *session)
 	MsnUser *user;
 	MsnObject *msnobj;
 	const char *state_text;
+	GHashTable *ui_info = purple_core_get_ui_info();
+	MsnClientCaps caps = MSN_CLIENT_ID;
 
 	g_return_if_fail(session != NULL);
 	g_return_if_fail(session->notification != NULL);
 
+	/* set client caps based on what the UI tells us it is... */
+	if (ui_info) {
+		const gchar *client_type = g_hash_table_lookup(ui_info, "client_type");
+		if (client_type) {
+			if (strcmp(client_type, "phone") == 0 ||
+				strcmp(client_type, "handheld") == 0) {
+				caps |= MSN_CLIENT_CAP_WIN_MOBILE;
+			} else if (strcmp(client_type, "web") == 0) {
+				caps |= MSN_CLIENT_CAP_WEBMSGR;
+			} else if (strcmp(client_type, "bot") == 0) {
+				caps |= MSN_CLIENT_CAP_BOT;
+			}
+			/* MSN doesn't a "console" type... 
+			 What, they have no ncurses UI? :-) */
+		}
+	}
+
 	account = session->account;
 	cmdproc = session->notification->cmdproc;
 	user = session->user;
@@ -307,8 +331,7 @@ msn_change_status(MsnSession *session)
 
 	if (msnobj == NULL)
 	{
-		msn_cmdproc_send(cmdproc, "CHG", "%s %d", state_text,
-						 MSN_CLIENT_ID);
+		msn_cmdproc_send(cmdproc, "CHG", "%s %d", state_text, caps);
 	}
 	else
 	{
@@ -317,7 +340,7 @@ msn_change_status(MsnSession *session)
 		msnobj_str = msn_object_to_string(msnobj);
 
 		msn_cmdproc_send(cmdproc, "CHG", "%s %d %s", state_text,
-						 MSN_CLIENT_ID, purple_url_encode(msnobj_str));
+						 caps, purple_url_encode(msnobj_str));
 
 		g_free(msnobj_str);
 	}
diff --git a/libpurple/protocols/msn/switchboard.c b/libpurple/protocols/msn/switchboard.c
index 0ada2639d1..c4f9c13baa 100644
--- a/libpurple/protocols/msn/switchboard.c
+++ b/libpurple/protocols/msn/switchboard.c
@@ -42,15 +42,15 @@ MsnSwitchBoard *
 msn_switchboard_new(MsnSession *session)
 {
 	MsnSwitchBoard *swboard;
-	MsnServConn *servconn;
 
 	g_return_val_if_fail(session != NULL, NULL);
 
 	swboard = g_new0(MsnSwitchBoard, 1);
 
 	swboard->session = session;
-	swboard->servconn = servconn = msn_servconn_new(session, MSN_SERVCONN_SB);
-	swboard->cmdproc = servconn->cmdproc;
+	swboard->servconn = msn_servconn_new(session, MSN_SERVCONN_SB);
+	msn_servconn_set_idle_timeout(swboard->servconn, 60);
+	swboard->cmdproc = swboard->servconn->cmdproc;
 
 	swboard->msg_queue = g_queue_new();
 	swboard->empty = TRUE;
@@ -60,6 +60,9 @@ msn_switchboard_new(MsnSession *session)
 
 	session->switches = g_list_prepend(session->switches, swboard);
 
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "switchboard new: swboard(%p)\n", swboard);
+
 	return swboard;
 }
 
@@ -70,9 +73,8 @@ msn_switchboard_destroy(MsnSwitchBoard *swboard)
 	MsnMessage *msg;
 	GList *l;
 
-#ifdef MSN_DEBUG_SB
-	purple_debug_info("msn", "switchboard_destroy: swboard(%p)\n", swboard);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "switchboard destroy: swboard(%p)\n", swboard);
 
 	g_return_if_fail(swboard != NULL);
 
@@ -230,10 +232,9 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 	swboard->current_users++;
 	swboard->empty = FALSE;
 
-#ifdef MSN_DEBUG_CHAT
-	purple_debug_info("msn", "user=[%s], total=%d\n", user,
-					swboard->current_users);
-#endif
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "user=[%s], total=%d\n",
+		                  user, swboard->current_users);
 
 	if (!(swboard->flag & MSN_SB_FLAG_IM) && (swboard->conv != NULL))
 	{
@@ -255,10 +256,6 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 		{
 			GList *l;
 
-#ifdef MSN_DEBUG_CHAT
-			purple_debug_info("msn", "[chat] Switching to chat.\n");
-#endif
-
 #if 0
 			/* this is bad - it causes msn_switchboard_close to be called on the
 			 * switchboard we're in the middle of using :( */
@@ -278,18 +275,10 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 
 				tmp_user = l->data;
 
-#ifdef MSN_DEBUG_CHAT
-				purple_debug_info("msn", "[chat] Adding [%s].\n", tmp_user);
-#endif
-
 				purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv),
 										tmp_user, NULL, PURPLE_CBFLAGS_NONE, TRUE);
 			}
 
-#ifdef MSN_DEBUG_CHAT
-			purple_debug_info("msn", "[chat] We add ourselves.\n");
-#endif
-
 			purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv),
 									purple_account_get_username(account),
 									NULL, PURPLE_CBFLAGS_NONE, TRUE);
@@ -589,10 +578,10 @@ release_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
 
 	payload = msn_message_gen_payload(msg, &payload_len);
 
-#ifdef MSN_DEBUG_SB
-	purple_debug_info("msn", "SB length:{%" G_GSIZE_FORMAT "}", payload_len);
-	msn_message_show_readable(msg, "SB SEND", FALSE);
-#endif
+	if (purple_debug_is_verbose()) {
+		purple_debug_info("msn", "SB length:{%" G_GSIZE_FORMAT "}\n", payload_len);
+		msn_message_show_readable(msg, "SB SEND", FALSE);
+	}
 
 	flag = msn_message_get_flag(msg);
 	trans = msn_transaction_new(cmdproc, "MSG", "%c %" G_GSIZE_FORMAT,
@@ -790,9 +779,8 @@ msg_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, size_t len)
 
 	msn_message_parse_payload(msg, payload, len,
 					MSG_LINE_DEM,MSG_BODY_DEM);
-#ifdef MSN_DEBUG_SB
-	msn_message_show_readable(msg, "SB RECV", FALSE);
-#endif
+	if (purple_debug_is_verbose())
+		msn_message_show_readable(msg, "SB RECV", FALSE);
 
 	g_free (msg->remote_user);
 	msg->remote_user = g_strdup(cmd->params[0]);
@@ -905,6 +893,47 @@ clientcaps_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 #endif
 }
 
+void
+msn_switchboard_show_ink(MsnSwitchBoard *swboard, const char *passport,
+                         const char *data)
+{
+	PurpleConnection *gc;
+	guchar *image_data;
+	size_t image_len;
+	int imgid;
+	char *image_msg;
+
+	if (!purple_str_has_prefix(data, "base64:"))
+	{
+		purple_debug_error("msn", "Ignoring Ink not in Base64 format.\n");
+		return;
+	}
+
+	gc = purple_account_get_connection(swboard->session->account);
+
+	data += sizeof("base64:") - 1;
+	image_data = purple_base64_decode(data, &image_len);
+	if (!image_data || !image_len) 
+	{
+		purple_debug_error("msn", "Unable to decode Ink from Base64 format.\n");
+		return;
+	}
+
+	imgid = purple_imgstore_add_with_id(image_data, image_len, NULL);
+	image_msg = g_strdup_printf("<IMG ID=%d/>", imgid);
+
+	if (swboard->current_users > 1 ||
+		((swboard->conv != NULL) &&
+		 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
+		serv_got_chat_in(gc, swboard->chat_id, passport, 0, image_msg,
+						 time(NULL));
+	else
+		serv_got_im(gc, passport, image_msg, 0, time(NULL));
+
+	purple_imgstore_unref_by_id(imgid);
+	g_free(image_msg);
+}
+
 /**************************************************************************
  * Connect stuff
  **************************************************************************/
@@ -1237,10 +1266,10 @@ msn_switchboard_init(void)
 	                       msn_emoticon_msg);
 	msn_table_add_msg_type(cbs_table, "text/x-msnmsgr-datacast",
 						   msn_datacast_msg);
-#if 0
-	msn_table_add_msg_type(cbs_table, "text/x-msmmsginvite",
+	msn_table_add_msg_type(cbs_table, "text/x-msmsgsinvite",
 						   msn_invite_msg);
-#endif
+	msn_table_add_msg_type(cbs_table, "image/gif",
+						   msn_handwritten_msg);
 }
 
 void
diff --git a/libpurple/protocols/msn/switchboard.h b/libpurple/protocols/msn/switchboard.h
index 8254efd441..891d31902d 100644
--- a/libpurple/protocols/msn/switchboard.h
+++ b/libpurple/protocols/msn/switchboard.h
@@ -280,4 +280,14 @@ void msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
  */
 void msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
+/**
+ * Shows an ink message from this switchboard.
+ *
+ * @param swboard  The switchboard.
+ * @param passport The user that sent the ink.
+ * @param data     The ink data.
+ */
+void msn_switchboard_show_ink(MsnSwitchBoard *swboard, const char *passport,
+                              const char *data);
+
 #endif /* _MSN_SWITCHBOARD_H_ */
diff --git a/libpurple/protocols/msn/sync.h b/libpurple/protocols/msn/sync.h
index 5720b03c8a..69ce7757d9 100644
--- a/libpurple/protocols/msn/sync.h
+++ b/libpurple/protocols/msn/sync.h
@@ -34,6 +34,11 @@ struct _MsnSync
 {
 	MsnSession *session;
 	MsnTable *cbs_table;
+
+	/*
+	 * TODO: What is the intended purpose of old_cbs_table?  Nothing
+	 *       sets it and it is only read in two places.
+	 */
 	MsnTable *old_cbs_table;
 
 	int num_users;
diff --git a/libpurple/protocols/msn/user.c b/libpurple/protocols/msn/user.c
index 2ec31db3a4..de4e4aabd0 100644
--- a/libpurple/protocols/msn/user.c
+++ b/libpurple/protocols/msn/user.c
@@ -74,6 +74,7 @@ msn_user_destroy(MsnUser *user)
 	g_free(user->media.title);
 	g_free(user->media.album);
 	g_free(user->statusline);
+	g_free(user->invite_message);
 
 	g_free(user);
 }
@@ -426,6 +427,15 @@ msn_user_set_client_caps(MsnUser *user, GHashTable *info)
 	user->clientcaps = info;
 }
 
+void
+msn_user_set_invite_message(MsnUser *user, const char *message)
+{
+	g_return_if_fail(user != NULL);
+
+	g_free(user->invite_message);
+	user->invite_message = g_strdup(message);
+}
+
 const char *
 msn_user_get_passport(const MsnUser *user)
 {
@@ -489,3 +499,12 @@ msn_user_get_client_caps(const MsnUser *user)
 
 	return user->clientcaps;
 }
+
+const char *
+msn_user_get_invite_message(const MsnUser *user)
+{
+	g_return_val_if_fail(user != NULL, NULL);
+
+	return user->invite_message;
+}
+
diff --git a/libpurple/protocols/msn/user.h b/libpurple/protocols/msn/user.h
index 60c83b17b0..63c8d827f2 100644
--- a/libpurple/protocols/msn/user.h
+++ b/libpurple/protocols/msn/user.h
@@ -105,6 +105,8 @@ struct _MsnUser
 
 	guint membership_id[5];	/**< The membershipId sent by the contacts server,
 				     indexed by the list it belongs to		*/
+
+	char *invite_message;   /**< Invite message of user request */
 };
 
 /**************************************************************************
@@ -290,6 +292,14 @@ void msn_user_set_object(MsnUser *user, MsnObject *obj);
  */
 void msn_user_set_client_caps(MsnUser *user, GHashTable *info);
 
+/**
+ * Sets the invite message for a user.
+ *
+ * @param user    The user.
+ * @param message The invite message for a user.
+ */
+void msn_user_set_invite_message(MsnUser *user, const char *message);
+
 
 /**
  * Returns the passport account for a user.
@@ -373,6 +383,15 @@ MsnObject *msn_user_get_object(const MsnUser *user);
 GHashTable *msn_user_get_client_caps(const MsnUser *user);
 
 /**
+ * Returns the invite message for a user.
+ *
+ * @param user The user.
+ *
+ * @return The user's invite message.
+ */
+const char *msn_user_get_invite_message(const MsnUser *user);
+
+/**
  * check to see if user is online
  */
 gboolean
diff --git a/libpurple/protocols/msn/userlist.c b/libpurple/protocols/msn/userlist.c
index a98919d537..5e1135292b 100644
--- a/libpurple/protocols/msn/userlist.c
+++ b/libpurple/protocols/msn/userlist.c
@@ -86,7 +86,7 @@ msn_cancel_add_cb(gpointer data)
 }
 
 static void
-got_new_entry(PurpleConnection *gc, const char *passport, const char *friendly)
+got_new_entry(PurpleConnection *gc, const char *passport, const char *friendly, const char *message)
 {
 	PurpleAccount *acct;
 	MsnPermitAdd *pa;
@@ -97,7 +97,7 @@ got_new_entry(PurpleConnection *gc, const char *passport, const char *friendly)
 	pa->gc = gc;
 
 	acct = purple_connection_get_account(gc);
-	purple_account_request_authorization(acct, passport, NULL, friendly, NULL,
+	purple_account_request_authorization(acct, passport, NULL, friendly, message,
 										 purple_find_buddy(acct, passport) != NULL,
 										 msn_accept_add_cb, msn_cancel_add_cb, pa);
 
@@ -142,155 +142,6 @@ msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id)
  * Server functions
  **************************************************************************/
 
-MsnListId
-msn_get_list_id(const char *list)
-{
-	if (list[0] == 'F')
-		return MSN_LIST_FL;
-	else if (list[0] == 'A')
-		return MSN_LIST_AL;
-	else if (list[0] == 'B')
-		return MSN_LIST_BL;
-	else if (list[0] == 'R')
-		return MSN_LIST_RL;
-
-	return -1;
-}
-
-/* this function msn_got_add_user isn't called anywhere */
-void
-msn_got_add_user(MsnSession *session, MsnUser *user,
-				 MsnListId list_id, const char * group_id)
-{
-	PurpleAccount *account;
-	const char *passport;
-	const char *friendly;
-
-	purple_debug_info("msn", "got add user...\n");
-	account = session->account;
-
-	passport = msn_user_get_passport(user);
-	friendly = msn_user_get_friendly_name(user);
-
-	if (list_id == MSN_LIST_FL)
-	{
-		PurpleConnection *gc;
-
-		gc = purple_account_get_connection(account);
-
-		serv_got_alias(gc, passport, friendly);
-
-		if (group_id != NULL)
-		{
-			msn_user_add_group_id(user, group_id);
-		}
-	}
-	else if (list_id == MSN_LIST_AL)
-	{
-		purple_privacy_permit_add(account, passport, TRUE);
-	}
-	else if (list_id == MSN_LIST_BL)
-	{
-		purple_privacy_deny_add(account, passport, TRUE);
-	}
-	else if (list_id == MSN_LIST_RL)
-	{
-		PurpleConversation *convo;
-
-		purple_debug_info("msn",
-						"%s has added you to his or her buddy list.\n",
-						passport);
-
- 		convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, passport, account);
- 		if (convo) {
- 			PurpleBuddy *buddy;
- 			char *msg;
-
- 			buddy = purple_find_buddy(account, passport);
- 			msg = g_strdup_printf(
- 				_("%s has added you to his or her buddy list."),
- 				buddy ? purple_buddy_get_contact_alias(buddy) : passport);
- 			purple_conv_im_write(PURPLE_CONV_IM(convo), passport, msg,
- 				PURPLE_MESSAGE_SYSTEM, time(NULL));
- 			g_free(msg);
- 		}
-
-		if (!(user->list_op & (MSN_LIST_AL_OP | MSN_LIST_BL_OP)))
-		{
-			/*
-			 * TODO: The friendly name was NULL for me when I
-			 *       looked at this.  Maybe we should use the store
-			 *       name instead? --KingAnt
-			 */
-/*			got_new_entry(gc, passport, friendly); */
-		}
-	}
-
-	user->list_op |= (1 << list_id);
-	/* purple_user_add_list_id (user, list_id); */
-}
-
-void
-msn_got_rem_user(MsnSession *session, MsnUser *user,
-				 MsnListId list_id, const char * group_id)
-{
-	PurpleAccount *account;
-	const char *passport;
-
-	account = session->account;
-
-	passport = msn_user_get_passport(user);
-
-	if (list_id == MSN_LIST_FL)
-	{
-		/* TODO: When is the user totally removed? */
-		if (group_id != NULL)
-		{
-			msn_user_remove_group_id(user, group_id);
-			return;
-		}
-	}
-	else if (list_id == MSN_LIST_AL)
-	{
-		purple_privacy_permit_remove(account, passport, TRUE);
-	}
-	else if (list_id == MSN_LIST_BL)
-	{
-		purple_privacy_deny_remove(account, passport, TRUE);
-	}
-	else if (list_id == MSN_LIST_RL)
-	{
-		PurpleConversation *convo;
-
-		purple_debug_info("msn",
-						"%s has removed you from his or her buddy list.\n",
-						passport);
-
-		convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, passport, account);
-		if (convo) {
-			PurpleBuddy *buddy;
-			char *msg;
-
-			buddy = purple_find_buddy(account, passport);
-			msg = g_strdup_printf(
-				_("%s has removed you from his or her buddy list."),
-				buddy ? purple_buddy_get_contact_alias(buddy) : passport);
-			purple_conv_im_write(PURPLE_CONV_IM(convo), passport, msg,
-				PURPLE_MESSAGE_SYSTEM, time(NULL));
-			g_free(msg);
-		}
-	}
-
-	user->list_op &= ~(1 << list_id);
-	/* purple_user_remove_list_id (user, list_id); */
-
-	if (user->list_op == 0)
-	{
-		purple_debug_info("msn", "Buddy '%s' shall be deleted?.\n",
-						passport);
-	}
-}
-
 void
 msn_got_lst_user(MsnSession *session, MsnUser *user,
 				 int list_op, GSList *group_ids)
@@ -299,12 +150,14 @@ msn_got_lst_user(MsnSession *session, MsnUser *user,
 	PurpleAccount *account;
 	const char *passport;
 	const char *store;
+	const char *message;
 
 	account = session->account;
 	gc = purple_account_get_connection(account);
 
 	passport = msn_user_get_passport(user);
 	store = msn_user_get_friendly_name(user);
+	message = msn_user_get_invite_message(user);
 
 	msn_user_set_op(user, list_op);
 
@@ -348,13 +201,13 @@ msn_got_lst_user(MsnSession *session, MsnUser *user,
 
 		if (!(list_op & (MSN_LIST_AL_OP | MSN_LIST_BL_OP)))
 		{
-/*			got_new_entry(gc, passport, store); */
+/*			got_new_entry(gc, passport, store, NULL); */
 		}
 	}
 
 	if (list_op & MSN_LIST_PL_OP)
 	{
-		got_new_entry(gc, passport, store);
+		got_new_entry(gc, passport, store, message);
 	}
 }
 
@@ -448,7 +301,7 @@ msn_userlist_find_user(MsnUserList *userlist, const char *passport)
 
 		g_return_val_if_fail(user->passport != NULL, NULL);
 
-		if (!g_strcasecmp(passport, user->passport)){
+		if (!g_ascii_strcasecmp(passport, user->passport)){
 			return user;
 		}
 	}
@@ -470,7 +323,7 @@ msn_userlist_find_user_with_id(MsnUserList *userlist, const char *uid)
 			continue;
 		}
 
-		if ( !g_strcasecmp(uid, user->uid) ) {
+		if ( !g_ascii_strcasecmp(uid, user->uid) ) {
 			return user;
 		}
 	}
@@ -492,7 +345,7 @@ msn_userlist_find_user_with_mobile_phone(MsnUserList *userlist, const char *numb
 			continue;
 		}
 
-		if (!g_strcasecmp(number, user->phone.mobile)) {
+		if (!g_ascii_strcasecmp(number, user->phone.mobile)) {
 			return user;
 		}
 	}
@@ -524,7 +377,7 @@ msn_userlist_find_group_with_id(MsnUserList *userlist, const char * id)
 	{
 		MsnGroup *group = l->data;
 
-		if (!g_strcasecmp(group->id,id))
+		if (!g_ascii_strcasecmp(group->id,id))
 			return group;
 	}
 
@@ -543,7 +396,7 @@ msn_userlist_find_group_with_name(MsnUserList *userlist, const char *name)
 	{
 		MsnGroup *group = l->data;
 
-		if ((group->name != NULL) && !g_strcasecmp(name, group->name))
+		if ((group->name != NULL) && !g_ascii_strcasecmp(name, group->name))
 			return group;
 	}
 
@@ -748,69 +601,6 @@ msn_userlist_add_buddy(MsnUserList *userlist, const char *who, const char *group
 	msn_add_contact_to_group(userlist->session, state, who, group_id);
 }
 
-/*
- * Save a buddy address/group until we get back response from FQY
- */
-void
-msn_userlist_save_pending_buddy(MsnUserList *userlist,
-                               const char *who,
-                               const char *group_name)
-{
-	MsnUser *user;
-
-	g_return_if_fail(userlist != NULL);
-
-	user = msn_user_new(userlist, who, NULL);
-	msn_user_set_pending_group(user, group_name);
-	msn_user_set_network(user, MSN_NETWORK_UNKNOWN);
-	userlist->pending = g_list_prepend(userlist->pending, user);
-}
-
-/*
- * Actually adds a buddy once we have the response from FQY
- */
-void
-msn_userlist_add_pending_buddy(MsnSession *session,
-                               const char *who,
-                               /*MsnNetwork*/ int network)
-{
-	MsnUserList *userlist = session->userlist;
-	MsnUser *user = NULL;
-	MsnUser *user2;
-	GList *l;
-	char *group;
-
-	for (l = userlist->pending; l != NULL; l = l->next)
-	{
-		user = (MsnUser *)l->data;
-
-		if (!g_strcasecmp(who, user->passport)) {
-			userlist->pending = g_list_delete_link(userlist->pending, l);
-			break;
-		}
-	}
-
-	if (user == NULL) {
-		purple_debug_error("msn", "Attempting to add a pending user that does not exist.\n");
-		return;
-	}
-
-	group = msn_user_remove_pending_group(user);
-
-	user2 = msn_userlist_find_user(userlist, who);
-	if (user2 != NULL) {
-		/* User already in userlist, so just update it. */
-		msn_user_destroy(user);
-		user = user2;
-	} else {
-		msn_userlist_add_user(userlist, user);
-	}
-
-	msn_user_set_network(user, network);
-	msn_userlist_add_buddy(userlist, who, group);
-	g_free(group);
-}
-
 void
 msn_userlist_add_buddy_to_list(MsnUserList *userlist, const char *who,
 							MsnListId list_id)
@@ -858,7 +648,7 @@ msn_userlist_add_buddy_to_group(MsnUserList *userlist, const char *who,
 	}
 
 	if ( (user = msn_userlist_find_user(userlist, who)) == NULL) {
-		purple_debug_error("msn", "User %s not found!", who);
+		purple_debug_error("msn", "User %s not found!\n", who);
 		return FALSE;
 	}
 
@@ -887,7 +677,7 @@ msn_userlist_rem_buddy_from_group(MsnUserList *userlist, const char *who,
 	}
 
 	if ( (user = msn_userlist_find_user(userlist, who)) == NULL) {
-		purple_debug_error("msn", "User %s not found!", who);
+		purple_debug_error("msn", "User %s not found!\n", who);
 		return FALSE;
 	}
 
@@ -930,7 +720,6 @@ msn_userlist_move_buddy(MsnUserList *userlist, const char *who,
 void
 msn_userlist_load(MsnSession *session)
 {
-	PurpleBlistNode *gnode, *cnode, *bnode;
 	PurpleAccount *account = session->account;
 	PurpleConnection *gc = purple_account_get_connection(account);
 	GSList *l;
@@ -938,34 +727,14 @@ msn_userlist_load(MsnSession *session)
 
 	g_return_if_fail(gc != NULL);
 
-	for (gnode = purple_blist_get_root(); gnode;
-			gnode = purple_blist_node_get_sibling_next(gnode))
-	{
-		if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-		for (cnode = purple_blist_node_get_first_child(gnode);
-				cnode;
-				cnode = purple_blist_node_get_sibling_next(cnode))
-		{
-			if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-			for (bnode = purple_blist_node_get_first_child(cnode);
-					bnode;
-					bnode = purple_blist_node_get_sibling_next(bnode))
-			{
-				PurpleBuddy *b;
-				if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-				b = (PurpleBuddy *)bnode;
-				if (purple_buddy_get_account(b) == account)
-				{
-					user = msn_userlist_find_add_user(session->userlist,
-						purple_buddy_get_name(b), NULL);
-					purple_buddy_set_protocol_data(b, user);
-					msn_user_set_op(user, MSN_LIST_FL_OP);
-				}
-			}
-		}
+	for (l = purple_find_buddies(account, NULL); l != NULL;
+			l = g_slist_delete_link(l, l)) {
+		PurpleBuddy *buddy = l->data;
+
+		user = msn_userlist_find_add_user(session->userlist,
+			purple_buddy_get_name(buddy), NULL);
+		purple_buddy_set_protocol_data(buddy, user);
+		msn_user_set_op(user, MSN_LIST_FL_OP);
 	}
 	for (l = session->account->permit; l != NULL; l = l->next)
 	{
diff --git a/libpurple/protocols/msn/userlist.h b/libpurple/protocols/msn/userlist.h
index fef45a3491..56e1ba0450 100644
--- a/libpurple/protocols/msn/userlist.h
+++ b/libpurple/protocols/msn/userlist.h
@@ -26,7 +26,6 @@
 
 typedef struct _MsnUserList MsnUserList;
 
-#include "cmdproc.h"
 #include "user.h"
 #include "group.h"
 
@@ -47,7 +46,6 @@ struct _MsnUserList
 
 	GList *users; /* Contains MsnUsers */
 	GList *groups; /* Contains MsnGroups */
-	GList *pending; /* MsnUsers pending addition (waiting for FQY response) */
 
 	GQueue *buddy_icon_requests;
 	int buddy_icon_window;
@@ -57,12 +55,7 @@ struct _MsnUserList
 
 gboolean msn_userlist_user_is_in_group(MsnUser *user, const char * group_id);
 gboolean msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id);
-MsnListId msn_get_list_id(const char *list);
 
-void msn_got_add_user(MsnSession *session, MsnUser *user,
-					  MsnListId list_id, const char *group_id);
-void msn_got_rem_user(MsnSession *session, MsnUser *user,
-					  MsnListId list_id, const char *group_id);
 void msn_got_lst_user(MsnSession *session, MsnUser *user,
 					  int list_op, GSList *group_ids);
 
@@ -92,12 +85,6 @@ void msn_userlist_remove_group_id(MsnUserList *userlist, const char *group_id);
 void msn_userlist_rem_buddy(MsnUserList *userlist, const char *who);
 void msn_userlist_add_buddy(MsnUserList *userlist,
 			    const char *who, const char *group_name);
-void msn_userlist_save_pending_buddy(MsnUserList *userlist,
-                                     const char *who,
-                                     const char *group_name);
-void msn_userlist_add_pending_buddy(MsnSession *session,
-                                    const char *who,
-                                    /*MsnNetwork*/ int network);
 void msn_userlist_move_buddy(MsnUserList *userlist, const char *who,
 						    const char *old_group_name,
 						    const char *new_group_name);
diff --git a/libpurple/protocols/msnp9/command.c b/libpurple/protocols/msnp9/command.c
index 5b5ea1f69c..fe8ac14073 100644
--- a/libpurple/protocols/msnp9/command.c
+++ b/libpurple/protocols/msnp9/command.c
@@ -59,7 +59,6 @@ msn_command_from_string(const char *string)
 
 	if (cmd->params != NULL)
 	{
-		char *param;
 		int c;
 
 		for (c = 0; cmd->params[c]; c++);
diff --git a/libpurple/protocols/msnp9/directconn.c b/libpurple/protocols/msnp9/directconn.c
index cfe9e7382f..b51debdd61 100644
--- a/libpurple/protocols/msnp9/directconn.c
+++ b/libpurple/protocols/msnp9/directconn.c
@@ -355,6 +355,8 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 
 		msn_directconn_destroy(directconn);
 	}
+
+	g_free(body);
 }
 
 static void
diff --git a/libpurple/protocols/msnp9/httpconn.c b/libpurple/protocols/msnp9/httpconn.c
index 4a4095e318..4130c921f1 100644
--- a/libpurple/protocols/msnp9/httpconn.c
+++ b/libpurple/protocols/msnp9/httpconn.c
@@ -703,7 +703,7 @@ connect_cb(gpointer data, gint source, const gchar *error_message)
 		httpconn->inpa = purple_input_add(httpconn->fd, PURPLE_INPUT_READ,
 			read_cb, data);
 
-		httpconn->timer = purple_timeout_add(2000, msn_httpconn_poll, httpconn);
+		httpconn->timer = purple_timeout_add_seconds(3, msn_httpconn_poll, httpconn);
 
 		msn_httpconn_process_queue(httpconn);
 	}
diff --git a/libpurple/protocols/msnp9/msn.c b/libpurple/protocols/msnp9/msn.c
index cf8527864a..e7446dfaf8 100644
--- a/libpurple/protocols/msnp9/msn.c
+++ b/libpurple/protocols/msnp9/msn.c
@@ -789,7 +789,7 @@ msn_login(PurpleAccount *account)
 	if (!msn_session_connect(session, host, port, http_method))
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Failed to connect to server."));
+			_("Unable to connect"));
 }
 
 static void
@@ -2276,9 +2276,10 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,					/* unregister_user */
 	msn_send_attention,                     /* send_attention */
 	msn_attention_types,                    /* attention_types */
-
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	msn_get_account_text_table,             /* get_account_text_table */
+	NULL,                                   /* initiate_media */
+	NULL                                    /* can_do_media */
 };
 
 static PurplePluginInfo info =
diff --git a/libpurple/protocols/msnp9/notification.c b/libpurple/protocols/msnp9/notification.c
index 4e5c51c7fd..a81e0d5e05 100644
--- a/libpurple/protocols/msnp9/notification.c
+++ b/libpurple/protocols/msnp9/notification.c
@@ -1280,14 +1280,11 @@ initial_email_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 
 		if (count > 0)
 		{
-			const char *passport;
-			const char *url;
+			const char *passports[2] = { msn_user_get_passport(session->user) };
+			const char *urls[2] = { session->passport_info.file };
 
-			passport = msn_user_get_passport(session->user);
-			url = session->passport_info.file;
-
-			purple_notify_emails(gc, atoi(unread), FALSE, NULL, NULL,
-							   &passport, &url, NULL, NULL);
+			purple_notify_emails(gc, count, FALSE, NULL, NULL,
+							   passports, urls, NULL, NULL);
 		}
 	}
 
diff --git a/libpurple/protocols/msnp9/session.c b/libpurple/protocols/msnp9/session.c
index ca8f7f124c..60564794f0 100644
--- a/libpurple/protocols/msnp9/session.c
+++ b/libpurple/protocols/msnp9/session.c
@@ -221,68 +221,51 @@ msn_session_get_swboard(MsnSession *session, const char *username,
 static void
 msn_session_sync_users(MsnSession *session)
 {
-	PurpleBlistNode *gnode, *cnode, *bnode;
 	PurpleConnection *gc = purple_account_get_connection(session->account);
 	GList *to_remove = NULL;
+	GSList *buddies;
 
 	g_return_if_fail(gc != NULL);
 
 	/* The core used to use msn_add_buddy to add all buddies before
 	 * being logged in. This no longer happens, so we manually iterate
 	 * over the whole buddy list to identify sync issues. */
+	for (buddies = purple_find_buddies(session->account, NULL); buddies;
+			buddies = g_slist_delete_link(buddies, buddies)) {
+		PurpleBuddy *buddy = buddies->data;
+		const char *buddy_name = purple_buddy_get_name(buddy);
+		const char *group_name = purple_group_get_name(purple_buddy_get_group(buddy));
+		MsnUser *remote_user;
+		gboolean found = FALSE;
+
+		remote_user = msn_userlist_find_user(session->userlist, buddy_name);
+
+		if (remote_user && remote_user->list_op & MSN_LIST_FL_OP) {
+			int group_id;
+			GList *l;
+
+			group_id = msn_userlist_find_group_id(remote_user->userlist,
+					group_name);
+
+			for (l = remote_user->group_ids; l; l = l->next) {
+				if (group_id == GPOINTER_TO_INT(l->data)) {
+					found = TRUE;
+					break;
+				}
+			}
 
-	for (gnode = purple_blist_get_root(); gnode; gnode = gnode->next) {
-		PurpleGroup *group = (PurpleGroup *)gnode;
-		const char *group_name = group->name;
-		if(!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-		for(cnode = gnode->child; cnode; cnode = cnode->next) {
-			if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-			for(bnode = cnode->child; bnode; bnode = bnode->next) {
-				PurpleBuddy *b;
-				if(!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-				b = (PurpleBuddy *)bnode;
-				if(purple_buddy_get_account(b) == purple_connection_get_account(gc)) {
-					MsnUser *remote_user;
-					gboolean found = FALSE;
-
-					remote_user = msn_userlist_find_user(session->userlist, purple_buddy_get_name(b));
-
-					if ((remote_user != NULL) && (remote_user->list_op & MSN_LIST_FL_OP))
-					{
-						int group_id;
-						GList *l;
-
-						group_id = msn_userlist_find_group_id(remote_user->userlist,
-								group_name);
-
-						for (l = remote_user->group_ids; l != NULL; l = l->next)
-						{
-							if (group_id == GPOINTER_TO_INT(l->data))
-							{
-								found = TRUE;
-								break;
-							}
-						}
-
-					}
-
-					/* We don't care if they're in a different group, as long as they're on the
-					 * list somewhere. If we check for the group, we cause pain, agony and
-					 * suffering for people who decide to re-arrange their buddy list elsewhere.
-					 */
-					if (!found)
-					{
-						if ((remote_user == NULL) || !(remote_user->list_op & MSN_LIST_FL_OP)) {
-							/* The user is not on the server list */
-							msn_show_sync_issue(session, purple_buddy_get_name(b), group_name);
-						} else {
-							/* The user is not in that group on the server list */
-							to_remove = g_list_prepend(to_remove, b);
-						}
-					}
+			/* We don't care if they're in a different group, as long as they're on the
+			 * list somewhere. If we check for the group, we cause pain, agony and
+			 * suffering for people who decide to re-arrange their buddy list elsewhere.
+			 */
+			if (!found)
+			{
+				if ((remote_user == NULL) || !(remote_user->list_op & MSN_LIST_FL_OP)) {
+					/* The user is not on the server list */
+					msn_show_sync_issue(session, buddy_name, group_name);
+				} else {
+					/* The user is not in that group on the server list */
+					to_remove = g_list_prepend(to_remove, buddy);
 				}
 			}
 		}
@@ -313,15 +296,15 @@ msn_session_set_error(MsnSession *session, MsnErrorType error,
 		case MSN_ERROR_UNSUPPORTED_PROTOCOL:
 			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 			msg = g_strdup(_("Our protocol is not supported by the "
-							 "server."));
+							 "server"));
 			break;
 		case MSN_ERROR_HTTP_MALFORMED:
 			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-			msg = g_strdup(_("Error parsing HTTP."));
+			msg = g_strdup(_("Error parsing HTTP"));
 			break;
 		case MSN_ERROR_SIGN_OTHER:
 			reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE;
-			msg = g_strdup(_("You have signed on from another location."));
+			msg = g_strdup(_("You have signed on from another location"));
 			if (!purple_account_get_remember_password(session->account))
 				purple_account_set_password(session->account, NULL);
 			break;
@@ -334,7 +317,7 @@ msn_session_set_error(MsnSession *session, MsnErrorType error,
 		case MSN_ERROR_SERV_DOWN:
 			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 			msg = g_strdup(_("The MSN servers are going down "
-							 "temporarily."));
+							 "temporarily"));
 			break;
 		case MSN_ERROR_AUTH:
 			reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
@@ -350,13 +333,13 @@ msn_session_set_error(MsnSession *session, MsnErrorType error,
 			break;
 		default:
 			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-			msg = g_strdup(_("Unknown error."));
+			msg = g_strdup(_("Unknown error"));
 			break;
 	}
 
 	msn_session_disconnect(session);
 
-	purple_connection_error_reason (gc, reason, msg);
+	purple_connection_error_reason(gc, reason, msg);
 
 	g_free(msg);
 }
diff --git a/libpurple/protocols/msnp9/slp.c b/libpurple/protocols/msnp9/slp.c
index d7ccb6e5ae..3ccc898678 100644
--- a/libpurple/protocols/msnp9/slp.c
+++ b/libpurple/protocols/msnp9/slp.c
@@ -33,8 +33,8 @@
 
 #include "smiley.h"
 
-/* ms to delay between sending buddy icon requests to the server. */
-#define BUDDY_ICON_DELAY 20000
+/* Seconds to delay between sending buddy icon requests to the server. */
+#define BUDDY_ICON_DELAY 20
 
 static void send_ok(MsnSlpCall *slpcall, const char *branch,
 					const char *type, const char *content);
@@ -338,7 +338,7 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 		char *bin;
 		gsize bin_len;
 		guint32 file_size;
-		char *file_name;
+		gchar *file_name;
 		gunichar2 *uni_name;
 
 		account = slpcall->slplink->session->account;
@@ -368,7 +368,8 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 
 			g_free(bin);
 
-			purple_xfer_set_filename(xfer, file_name);
+			purple_xfer_set_filename(xfer, file_name ? file_name : "");
+			g_free(file_name);
 			purple_xfer_set_size(xfer, file_size);
 			purple_xfer_set_init_fnc(xfer, msn_xfer_init);
 			purple_xfer_set_request_denied_fnc(xfer, msn_xfer_cancel);
@@ -1058,8 +1059,8 @@ end_user_display(MsnSlpCall *slpcall, MsnSession *session)
 		purple_timeout_remove(userlist->buddy_icon_request_timer);
 	}
 
-	/* Wait BUDDY_ICON_DELAY ms before freeing our window slot and requesting the next icon. */
-	userlist->buddy_icon_request_timer = purple_timeout_add(BUDDY_ICON_DELAY, 
+	/* Wait BUDDY_ICON_DELAY_S seconds before freeing our window slot and requesting the next icon. */
+	userlist->buddy_icon_request_timer = purple_timeout_add_seconds(BUDDY_ICON_DELAY, 
 														  msn_release_buddy_icon_request_timeout, userlist);
 }
 
diff --git a/libpurple/protocols/msnp9/slpcall.c b/libpurple/protocols/msnp9/slpcall.c
index 2bebadb8da..2c7a1e9799 100644
--- a/libpurple/protocols/msnp9/slpcall.c
+++ b/libpurple/protocols/msnp9/slpcall.c
@@ -68,7 +68,7 @@ msn_slp_call_new(MsnSlpLink *slplink)
 
 	msn_slplink_add_slpcall(slplink, slpcall);
 
-	slpcall->timer = purple_timeout_add(MSN_SLPCALL_TIMEOUT, msn_slp_call_timeout, slpcall);
+	slpcall->timer = purple_timeout_add_seconds(MSN_SLPCALL_TIMEOUT, msn_slp_call_timeout, slpcall);
 
 	return slpcall;
 }
diff --git a/libpurple/protocols/msnp9/slpcall.h b/libpurple/protocols/msnp9/slpcall.h
index 37b3ec21af..8f15f1c919 100644
--- a/libpurple/protocols/msnp9/slpcall.h
+++ b/libpurple/protocols/msnp9/slpcall.h
@@ -33,7 +33,7 @@ typedef struct _MsnSlpCall MsnSlpCall;
 #include "slpsession.h"
 
 /* The official client seems to timeout slp calls after 5 minutes */
-#define MSN_SLPCALL_TIMEOUT 300000
+#define MSN_SLPCALL_TIMEOUT 300
 
 typedef enum
 {
diff --git a/libpurple/protocols/msnp9/slplink.c b/libpurple/protocols/msnp9/slplink.c
index b7a61ac0b4..dfad7bf7f4 100644
--- a/libpurple/protocols/msnp9/slplink.c
+++ b/libpurple/protocols/msnp9/slplink.c
@@ -477,6 +477,7 @@ msn_slplink_send_ack(MsnSlpLink *slplink, MsnMessage *msg)
 #endif
 
 	msn_slplink_send_slpmsg(slplink, slpmsg);
+	msn_slpmsg_destroy(slpmsg);
 }
 
 static void
@@ -496,7 +497,7 @@ send_file_cb(MsnSlpSession *slpsession)
 	slpmsg->info = "SLP FILE";
 #endif
 	xfer = (PurpleXfer *)slpcall->xfer;
-	purple_xfer_start(slpcall->xfer, 0, NULL, 0);
+	purple_xfer_start(slpcall->xfer, -1, NULL, 0);
 	slpmsg->fp = xfer->dest_fp;
 	if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
 		slpmsg->size = st.st_size;
@@ -510,7 +511,7 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 {
 	MsnSlpMessage *slpmsg;
 	const char *data;
-	gsize offset;
+	guint64 offset;
 	gsize len;
 
 #ifdef MSN_DEBUG_SLP
@@ -561,7 +562,7 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 					if (xfer != NULL)
 					{
 						purple_xfer_ref(xfer);
-						purple_xfer_start(xfer,	0, NULL, 0);
+						purple_xfer_start(xfer,	-1, NULL, 0);
 
 						if (xfer->data == NULL) {
 							purple_xfer_unref(xfer);
@@ -581,6 +582,7 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 			if (slpmsg->buffer == NULL)
 			{
 				purple_debug_error("msn", "Failed to allocate buffer for slpmsg\n");
+				msn_slpmsg_destroy(slpmsg);
 				return;
 			}
 		}
@@ -602,7 +604,7 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 		/* fseek(slpmsg->fp, offset, SEEK_SET); */
 		len = fwrite(data, 1, len, slpmsg->fp);
 	}
-	else if (slpmsg->size)
+	else if (slpmsg->size && slpmsg->buffer)
 	{
 		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size)
 		{
diff --git a/libpurple/protocols/msnp9/transaction.c b/libpurple/protocols/msnp9/transaction.c
index 89049804e1..f22c0a37db 100644
--- a/libpurple/protocols/msnp9/transaction.c
+++ b/libpurple/protocols/msnp9/transaction.c
@@ -211,7 +211,7 @@ msn_transaction_set_timeout_cb(MsnTransaction *trans, MsnTimeoutCb cb)
 		purple_timeout_remove(trans->timer);
 	}
 	trans->timeout_cb = cb;
-	trans->timer = purple_timeout_add(60000, transaction_timeout, trans);
+	trans->timer = purple_timeout_add_seconds(60, transaction_timeout, trans);
 }
 
 void
diff --git a/libpurple/protocols/myspace/markup.c b/libpurple/protocols/myspace/markup.c
index 8e5e7b4909..ea4ae8f268 100644
--- a/libpurple/protocols/myspace/markup.c
+++ b/libpurple/protocols/myspace/markup.c
@@ -112,8 +112,10 @@ static double msim_round(double value)
 	}
 }
 
-/** Convert typographical font point size to HTML font size.
- * Based on libpurple/gtkimhtml.c */
+/**
+ * Convert typographical font point size to HTML font size.
+ * Based on libpurple/gtkimhtml.c
+ */
 static guint
 msim_point_to_purple_size(MsimSession *session, guint point)
 {
@@ -135,7 +137,9 @@ msim_point_to_purple_size(MsimSession *session, guint point)
 	return this_point;
 }
 
-/** Convert HTML font size to point size. */
+/**
+ * Convert HTML font size to point size.
+ */
 static guint
 msim_purple_size_to_point(MsimSession *session, guint size)
 {
@@ -155,7 +159,9 @@ msim_purple_size_to_point(MsimSession *session, guint size)
 	return point;
 }
 
-/** Convert a msim markup font pixel height to the more usual point size, for incoming messages. */
+/**
+ * Convert a msim markup font pixel height to the more usual point size, for incoming messages.
+ */
 static guint
 msim_height_to_point(MsimSession *session, guint height)
 {
@@ -169,7 +175,9 @@ msim_height_to_point(MsimSession *session, guint height)
 	 * _font_size_ichat_to_purple */
 }
 
-/** Convert point size to msim pixel height font size specification, for outgoing messages. */
+/**
+ * Convert point size to msim pixel height font size specification, for outgoing messages.
+ */
 static guint
 msim_point_to_height(MsimSession *session, guint point)
 {
@@ -180,7 +188,9 @@ msim_point_to_height(MsimSession *session, guint point)
 	return (guint)msim_round((dpi * 1. / POINTS_PER_INCH) * point);
 }
 
-/** Convert the msim markup <f> (font) tag into HTML. */
+/**
+ * Convert the msim markup <f> (font) tag into HTML.
+ */
 static void
 msim_markup_f_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar **end)
 {
@@ -244,7 +254,8 @@ msim_markup_f_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar
 	*end = g_string_free(gs_end, FALSE);
 }
 
-/** Convert a msim markup color to a color suitable for libpurple.
+/**
+ * Convert a msim markup color to a color suitable for libpurple.
  *
  * @param msim Either a color name, or an rgb(x,y,z) code.
  *
@@ -268,7 +279,9 @@ msim_color_to_purple(const char *msim)
 	return g_strdup_printf("#%.2x%.2x%.2x", red, green, blue);
 }
 
-/** Convert the msim markup <a> (anchor) tag into HTML. */
+/**
+ * Convert the msim markup <a> (anchor) tag into HTML.
+ */
 static void
 msim_markup_a_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar **end)
 {
@@ -283,7 +296,9 @@ msim_markup_a_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar
 	*end = g_strdup("</a>");
 }
 
-/** Convert the msim markup <p> (paragraph) tag into HTML. */
+/**
+ * Convert the msim markup <p> (paragraph) tag into HTML.
+ */
 static void
 msim_markup_p_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar **end)
 {
@@ -356,7 +371,9 @@ msim_markup_b_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar
 	g_free(purple_color);
 }
 
-/** Convert the msim markup <i> tag (emoticon image) into HTML. */
+/**
+ * Convert the msim markup <i> tag (emoticon image) into HTML.
+ */
 static void
 msim_markup_i_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar **end)
 {
@@ -387,7 +404,9 @@ msim_markup_i_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar
 	*end = g_strdup("");
 }
 
-/** Convert an individual msim markup tag to HTML. */
+/**
+ * Convert an individual msim markup tag to HTML.
+ */
 static int
 msim_markup_tag_to_html(MsimSession *session, xmlnode *root, gchar **begin,
 		gchar **end)
@@ -416,7 +435,9 @@ msim_markup_tag_to_html(MsimSession *session, xmlnode *root, gchar **begin,
 	return 0;
 }
 
-/** Convert an individual HTML tag to msim markup. */
+/**
+ * Convert an individual HTML tag to msim markup.
+ */
 static int
 html_tag_to_msim_markup(MsimSession *session, xmlnode *root, gchar **begin,
 		gchar **end)
@@ -520,10 +541,10 @@ html_tag_to_msim_markup(MsimSession *session, xmlnode *root, gchar **begin,
 		tmpend = g_string_new("</f>");
 
 		if (face != NULL)
-			g_string_append_printf(tmpbegin, "f='%s'", face);
+			g_string_append_printf(tmpbegin, " f='%s'", face);
 
 		if (size != NULL)
-			g_string_append_printf(tmpbegin, "h='%d'",
+			g_string_append_printf(tmpbegin, " h='%d'",
 					 msim_point_to_height(session,
 						 msim_purple_size_to_point(session, atoi(size))));
 
@@ -568,7 +589,8 @@ html_tag_to_msim_markup(MsimSession *session, xmlnode *root, gchar **begin,
 	return ret;
 }
 
-/** Convert an xmlnode of msim markup or HTML to an HTML string or msim markup.
+/**
+ * Convert an xmlnode of msim markup or HTML to an HTML string or msim markup.
  *
  * @param f Function to convert tags.
  *
@@ -635,7 +657,9 @@ msim_convert_xmlnode(MsimSession *session, GString *out, xmlnode *root, MSIM_XML
 	g_free(end);
 }
 
-/** Convert XML to something based on MSIM_XMLNODE_CONVERT. */
+/**
+ * Convert XML to something based on MSIM_XMLNODE_CONVERT.
+ */
 static gchar *
 msim_convert_xml(MsimSession *session, const gchar *raw, MSIM_XMLNODE_CONVERT f)
 {
@@ -669,7 +693,8 @@ msim_convert_xml(MsimSession *session, const gchar *raw, MSIM_XMLNODE_CONVERT f)
 	return g_string_free(str, FALSE);
 }
 
-/** Convert plaintext smileys to <i> markup tags.
+/**
+ * Convert plaintext smileys to <i> markup tags.
  *
  * @param before Original text with ASCII smileys. Will be freed.
  * @return A new string with <i> tags, if applicable. Must be g_free()'d.
diff --git a/libpurple/protocols/myspace/message.c b/libpurple/protocols/myspace/message.c
index f52287c09e..2311c49239 100644
--- a/libpurple/protocols/myspace/message.c
+++ b/libpurple/protocols/myspace/message.c
@@ -19,9 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "internal.h"
-#include "message.h"
 #include "myspace.h"
+#include "message.h"
 
 static void msim_msg_debug_string_element(gpointer data, gpointer user_data);
 
diff --git a/libpurple/protocols/myspace/myspace.c b/libpurple/protocols/myspace/myspace.c
index 40ec871bd0..8c40d9b1c3 100644
--- a/libpurple/protocols/myspace/myspace.c
+++ b/libpurple/protocols/myspace/myspace.c
@@ -388,7 +388,7 @@ msim_status_text(PurpleBuddy *buddy)
 
 	g_return_val_if_fail(buddy != NULL, NULL);
 
-	user = msim_get_user_from_buddy(buddy);
+	user = msim_get_user_from_buddy(buddy, TRUE);
 
 	account = purple_buddy_get_account(buddy);
 	gc = purple_account_get_connection(account);
@@ -436,7 +436,7 @@ msim_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info,
 	g_return_if_fail(buddy != NULL);
 	g_return_if_fail(user_info != NULL);
 
-	user = msim_get_user_from_buddy(buddy);
+	user = msim_get_user_from_buddy(buddy, TRUE);
 
 	if (PURPLE_BUDDY_IS_ONLINE(buddy)) {
 		MsimSession *session;
@@ -519,6 +519,18 @@ msim_status_types(PurpleAccount *acct)
 	return types;
 }
 
+/*
+ * TODO: This define is stolen from oscar.h.
+ *       It's also in yahoo.h.
+ *       It should be in libpurple/util.c
+ */
+#define msim_put32(buf, data) ( \
+		(*((buf)) = (unsigned char)((data)>>24)&0xff), \
+		(*((buf)+1) = (unsigned char)((data)>>16)&0xff), \
+		(*((buf)+2) = (unsigned char)((data)>>8)&0xff), \
+		(*((buf)+3) = (unsigned char)(data)&0xff), \
+		4)
+
 /**
  * Compute the base64'd login challenge response based on username, password, nonce, and IPs.
  *
@@ -619,15 +631,27 @@ msim_compute_login_response(const gchar nonce[2 * NONCE_SIZE],
 	purple_cipher_context_set_option(rc4, "key_len", (gpointer)0x10);
 	purple_cipher_context_set_key(rc4, key);
 
-	/* TODO: obtain IPs of network interfaces */
-
 	/* rc4 encrypt:
 	 * nonce1+email+IP list */
 
 	data = g_string_new(NULL);
 	g_string_append_len(data, nonce, NONCE_SIZE);
-	g_string_append(data, email);
+
+	/* Include the null terminator */
+	g_string_append_len(data, email, strlen(email) + 1);
+
+	while (data->len % 4 != 0)
+		g_string_append_c(data, 0xfb);
+
+#ifdef SEND_OUR_IP_ADDRESSES
+	/* TODO: Obtain IPs of network interfaces instead of using this hardcoded value */
+	g_string_set_size(data, data->len + 4);
+	msim_put32(data->str + data->len - 4, MSIM_LOGIN_IP_LIST_LEN);
 	g_string_append_len(data, MSIM_LOGIN_IP_LIST, MSIM_LOGIN_IP_LIST_LEN);
+#else
+	g_string_set_size(data, data->len + 4);
+	msim_put32(data->str + data->len - 4, 0);
+#endif /* !SEND_OUR_IP_ADDRESSES */
 
 	data_out = g_new0(guchar, data->len);
 
@@ -847,8 +871,6 @@ msim_check_inbox_cb(MsimSession *session, const MsimMessage *reply, gpointer dat
 	MsimMessage *body;
 	guint old_inbox_status;
 	guint i, n;
-	const gchar *froms[5], *tos[5], *urls[5], *subjects[5];
-
 	/* Information for each new inbox message type. */
 	static struct
 	{
@@ -863,16 +885,22 @@ msim_check_inbox_cb(MsimSession *session, const MsimMessage *reply, gpointer dat
 		{ "FriendRequest", MSIM_INBOX_FRIEND_REQUEST, "http://messaging.myspace.com/index.cfm?fuseaction=mail.friendRequests", NULL },
 		{ "PictureComment", MSIM_INBOX_PICTURE_COMMENT, "http://home.myspace.com/index.cfm?fuseaction=user", NULL }
 	};
+	const gchar *froms[G_N_ELEMENTS(message_types) + 1] = { "" },
+		*tos[G_N_ELEMENTS(message_types) + 1] = { "" },
+		*urls[G_N_ELEMENTS(message_types) + 1] = { "" },
+		*subjects[G_N_ELEMENTS(message_types) + 1] = { "" };
+
+	g_return_if_fail(reply != NULL);
 
 	/* Can't write _()'d strings in array initializers. Workaround. */
+	/* khc: then use N_() in the array initializer and use _() when they are
+	   used */
 	message_types[0].text = _("New mail messages");
 	message_types[1].text = _("New blog comments");
 	message_types[2].text = _("New profile comments");
 	message_types[3].text = _("New friend requests!");
 	message_types[4].text = _("New picture comments");
 
-	g_return_if_fail(reply != NULL);
-
 	body = msim_msg_get_dictionary(reply, "body");
 
 	if (body == NULL)
@@ -882,7 +910,7 @@ msim_check_inbox_cb(MsimSession *session, const MsimMessage *reply, gpointer dat
 
 	n = 0;
 
-	for (i = 0; i < sizeof(message_types) / sizeof(message_types[0]); ++i) {
+	for (i = 0; i < G_N_ELEMENTS(message_types); ++i) {
 		const gchar *key;
 		guint bit;
 
@@ -1053,7 +1081,7 @@ msim_add_contact_from_server_cb(MsimSession *session, const MsimMessage *user_lo
 	g_free(display_name);
 
 	/* 3. Update buddy information */
-	user = msim_get_user_from_buddy(buddy);
+	user = msim_get_user_from_buddy(buddy, TRUE);
 
 	user->id = uid;
 	/* Keep track of the user ID across sessions */
@@ -1114,10 +1142,6 @@ msim_got_contact_list(MsimSession *session, const MsimMessage *reply, gpointer u
 	guint buddy_count;
 
 	body = msim_msg_get_dictionary(reply, "body");
-	if (!body) {
-		/* No friends. Not an error. */
-		return;
-	}
 
 	buddy_count = 0;
 
@@ -1245,7 +1269,7 @@ gboolean msim_we_are_logged_on(MsimSession *session)
 
 	/* Disable due to problems with timeouts. TODO: fix. */
 #ifdef MSIM_USE_KEEPALIVE
-	purple_timeout_add(MSIM_KEEPALIVE_INTERVAL_CHECK,
+	purple_timeout_add_seconds(MSIM_KEEPALIVE_INTERVAL_CHECK,
 			(GSourceFunc)msim_check_alive, session);
 #endif
 
@@ -1317,6 +1341,27 @@ msim_send_unofficial_client(MsimSession *session, gchar *username)
 	return ret;
 }
 #endif
+/**
+ * Process incoming status mood messages.
+ *
+ * @param session
+ * @param msg Status mood update message. Caller frees.
+ *
+ * @return TRUE if successful.
+ */
+static gboolean
+msim_incoming_status_mood(MsimSession *session, MsimMessage *msg) {
+	/* TODO: I dont know too much about this yet,
+	 * so until I see how the official client handles
+	 * this and decide if libpurple should as well,
+	 * well just say we used it
+	 */
+	gchar *ss;
+	ss = msim_msg_get_string(msg, "msg");
+	purple_debug_info("msim", "Incoming Status Message: %s", ss ? ss : "(NULL)");
+	g_free(ss);
+	return TRUE;
+}
 
 /**
  * Process incoming status messages.
@@ -1377,7 +1422,7 @@ msim_incoming_status(MsimSession *session, MsimMessage *msg)
 		buddy = purple_buddy_new(session->account, username, NULL);
 		purple_blist_add_buddy(buddy, NULL, NULL, NULL);
 
-		user = msim_get_user_from_buddy(buddy);
+		user = msim_get_user_from_buddy(buddy, TRUE);
 		user->id = msim_msg_get_integer(msg, "f");
 
 		/* Keep track of the user ID across sessions */
@@ -1473,28 +1518,22 @@ msim_incoming_status(MsimSession *session, MsimMessage *msg)
  * @return TRUE if successful.
  */
 static gboolean
-msim_incoming_im(MsimSession *session, MsimMessage *msg)
+msim_incoming_im(MsimSession *session, MsimMessage *msg, const gchar *username)
 {
-	gchar *username, *msg_msim_markup, *msg_purple_markup;
+	gchar *msg_msim_markup, *msg_purple_markup;
 	gchar *userid;
 	time_t time_received;
 	PurpleConversation *conv;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
-	g_return_val_if_fail(msg != NULL, FALSE);
-
-	username = msim_msg_get_string(msg, "_username");
 	/* I know this isn't really a string... but we need it to be one for
 	 * purple_find_conversation_with_account(). */
 	userid = msim_msg_get_string(msg, "f");
-	g_return_val_if_fail(username != NULL, FALSE);
 
 	purple_debug_info("msim_incoming_im", "UserID is %s", userid);
 
 	if (msim_is_userid(username)) {
 		purple_debug_info("msim", "Ignoring message from spambot (%s) on account %s\n",
 				username, purple_account_get_username(session->account));
-		g_free(username);
 		return FALSE;
 	}
 
@@ -1519,14 +1558,13 @@ msim_incoming_im(MsimSession *session, MsimMessage *msg)
 
 	serv_got_im(session->gc, username, msg_purple_markup, PURPLE_MESSAGE_RECV, time_received);
 
-	g_free(username);
 	g_free(msg_purple_markup);
 
 	return TRUE;
 }
 
 /**
- * Handle an incoming action message.
+ * Handle an incoming action message or an IM.
  *
  * @param session
  * @param msg
@@ -1534,7 +1572,7 @@ msim_incoming_im(MsimSession *session, MsimMessage *msg)
  * @return TRUE if successful.
  */
 static gboolean
-msim_incoming_action(MsimSession *session, MsimMessage *msg)
+msim_incoming_action_or_im(MsimSession *session, MsimMessage *msg)
 {
 	gchar *msg_text, *username;
 	gboolean rc;
@@ -1548,7 +1586,8 @@ msim_incoming_action(MsimSession *session, MsimMessage *msg)
 	username = msim_msg_get_string(msg, "_username");
 	g_return_val_if_fail(username != NULL, FALSE);
 
-	purple_debug_info("msim", "msim_incoming_action: action <%s> from <%s>\n",
+	purple_debug_info("msim",
+			"msim_incoming_action_or_im: action <%s> from <%s>\n",
 			msg_text, username);
 
 	if (g_str_equal(msg_text, "%typing%")) {
@@ -1562,13 +1601,16 @@ msim_incoming_action(MsimSession *session, MsimMessage *msg)
 	} else if (strstr(msg_text, "!!!GroupCount=")) {
 		/* TODO: support group chats. I think the number in msg_text has
 		 * something to do with the 'gid' field. */
-		purple_debug_info("msim", "msim_incoming_action: TODO: implement #4691, group chats: %s\n", msg_text);
+		purple_debug_info("msim",
+				"msim_incoming_action_or_im: "
+				"TODO: implement #4691, group chats: %s\n", msg_text);
 
 		rc = TRUE;
 	} else if (strstr(msg_text, "!!!Offline=")) {
 		/* TODO: support group chats. This one might mean a user
 		 * went offline or exited the chat. */
-		purple_debug_info("msim", "msim_incoming_action: TODO: implement #4691, group chats: %s\n", msg_text);
+		purple_debug_info("msim", "msim_incoming_action_or_im: "
+				"TODO: implement #4691, group chats: %s\n", msg_text);
 
 		rc = TRUE;
 	} else if (msim_msg_get_integer(msg, "aid") != 0) {
@@ -1579,9 +1621,7 @@ msim_incoming_action(MsimSession *session, MsimMessage *msg)
 
 		rc = TRUE;
 	} else {
-		msim_unrecognized(session, msg,
-				"got to msim_incoming_action but unrecognized value for 'msg'");
-		rc = FALSE;
+		rc = msim_incoming_im(session, msg, username);
 	}
 
 	g_free(msg_text);
@@ -1666,18 +1706,26 @@ msim_incoming_bm(MsimSession *session, MsimMessage *msg)
 	switch (bm) {
 		case MSIM_BM_STATUS:
 			return msim_incoming_status(session, msg);
-		case MSIM_BM_INSTANT:
-			return msim_incoming_im(session, msg);
-		case MSIM_BM_ACTION:
-			return msim_incoming_action(session, msg);
+		case MSIM_BM_ACTION_OR_IM_DELAYABLE:
+		case MSIM_BM_ACTION_OR_IM_INSTANT:
+			return msim_incoming_action_or_im(session, msg);
 		case MSIM_BM_MEDIA:
 			return msim_incoming_media(session, msg);
 		case MSIM_BM_UNOFFICIAL_CLIENT:
 			return msim_incoming_unofficial_client(session, msg);
+		case MSIM_BM_STATUS_MOOD:
+			return msim_incoming_status_mood(session, msg);
 		default:
-			/* Not really an IM, but show it for informational
-			 * purposes during development. */
-			return msim_incoming_im(session, msg);
+			/*
+			 * Unknown message type!  We used to call
+			 *   msim_incoming_action_or_im(session, msg);
+			 * for these, but that doesn't help anything, and it means
+			 * we'll show broken gibberish if MySpace starts sending us
+			 * other message types.
+			 */
+			purple_debug_warning("myspace", "Received unknown imcoming "
+					"message, bm=%u\n", bm);
+			return TRUE;
 	}
 }
 
@@ -1829,17 +1877,19 @@ msim_error(MsimSession *session, MsimMessage *msg)
 					gchar *suggestion;
 
 					suggestion = g_strdup_printf(_("%s Your password is "
-							"%d characters, greater than the "
-							"expected maximum length of %d for "
-							"MySpaceIM. Please shorten your "
+							"%zu characters, which is longer than the "
+							"maximum length of %d.  Please shorten your "
 							"password at http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try again."),
-							full_errmsg, (int)
+							full_errmsg,
 							strlen(session->account->password),
 							MSIM_MAX_PASSWORD_LENGTH);
 
 					/* Replace full_errmsg. */
 					g_free(full_errmsg);
 					full_errmsg = suggestion;
+				} else {
+					g_free(full_errmsg);
+					full_errmsg = g_strdup(_("Incorrect username or password"));
 				}
 #endif
 				break;
@@ -1849,7 +1899,7 @@ msim_error(MsimSession *session, MsimMessage *msg)
 					purple_account_set_password(session->account, NULL);
 				break;
 		}
-		purple_connection_error_reason (session->gc, reason, full_errmsg);
+		purple_connection_error_reason(session->gc, reason, full_errmsg);
 	} else {
 		purple_notify_error(session->account, _("MySpaceIM Error"), full_errmsg, NULL);
 	}
@@ -2048,30 +2098,23 @@ msim_input_cb(gpointer gc_uncasted, gint source, PurpleInputCondition cond)
 		 session->rxbuf + session->rxoff,
 		 session->rxsize - session->rxoff - 1, 0);
 
-	if (n < 0 && errno == EAGAIN) {
-		return;
-	} else if (n < 0) {
-		purple_debug_error("msim", "msim_input_cb: read error, ret=%d, "
-			"error=%s, source=%d, fd=%d (%X))\n",
-			n, g_strerror(errno), source, session->fd, session->fd);
-		purple_connection_error_reason (gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Read error"));
+	if (n < 0) {
+		gchar *tmp;
+
+		if (errno == EAGAIN)
+			/* No worries */
+			return;
+
+		tmp = g_strdup_printf(_("Lost connection with server: %s"),
+				g_strerror(errno));
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		return;
 	} else if (n == 0) {
-		purple_debug_info("msim", "msim_input_cb: server disconnected\n");
-		purple_connection_error_reason (gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Server has disconnected"));
-		return;
-	}
-
-	if (n + session->rxoff > session->rxsize) {
-		purple_debug_info("msim_input_cb", "received %d bytes, pushing rxoff to %d, over buffer size of %d\n",
-				n, n + session->rxoff, session->rxsize);
-		purple_connection_error_reason (gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Read buffer full (2)"));
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+				_("Server closed the connection"));
 		return;
 	}
 
@@ -2114,7 +2157,7 @@ msim_input_cb(gpointer gc_uncasted, gint source, PurpleInputCondition cond)
 			purple_debug_info("msim", "msim_input_cb: couldn't parse rxbuf\n");
 			purple_connection_error_reason (gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Unparseable message"));
+				_("Unable to parse message"));
 			break;
 		} else {
 			/* Process message and then free it (processing function should
@@ -2155,11 +2198,11 @@ msim_connect_cb(gpointer data, gint source, const gchar *error_message)
 	session = (MsimSession *)gc->proto_data;
 
 	if (source < 0) {
+		gchar *tmp = g_strdup_printf(_("Unable to connect: %s"),
+				error_message);
 		purple_connection_error_reason (gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			g_strdup_printf(_("Couldn't connect to host: %s (%d)"),
-					error_message ? error_message : "no message given",
-					source));
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+			g_free(tmp);
 		return;
 	}
 
@@ -2216,7 +2259,7 @@ msim_login(PurpleAccount *acct)
 		 * working port and try that first next time. */
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Couldn't create socket"));
+			_("Unable to connect"));
 		return;
 	}
 }
@@ -2290,7 +2333,7 @@ msim_send_im(PurpleConnection *gc, const gchar *who, const gchar *message,
 
 	message_msim = html_to_msim_markup(session, message);
 
-	if (msim_send_bm(session, who, message_msim, MSIM_BM_INSTANT)) {
+	if (msim_send_bm(session, who, message_msim, MSIM_BM_ACTION_OR_IM_DELAYABLE)) {
 		/* Return 1 to have Purple show this IM as being sent, 0 to not. I always
 		 * return 1 even if the message could not be sent, since I don't know if
 		 * it has failed yet--because the IM is only sent after the userid is
@@ -2343,7 +2386,7 @@ msim_send_typing(PurpleConnection *gc, const gchar *name,
 	}
 
 	purple_debug_info("msim", "msim_send_typing(%s): %d (%s)\n", name, state, typing_str);
-	msim_send_bm(session, name, typing_str, MSIM_BM_ACTION);
+	msim_send_bm(session, name, typing_str, MSIM_BM_ACTION_OR_IM_INSTANT);
 	return 0;
 }
 
@@ -2641,6 +2684,9 @@ msim_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 	name = purple_buddy_get_name(buddy);
 	gname = group ? purple_group_get_name(group) : NULL;
 
+	if (msim_get_user_from_buddy(buddy, FALSE) != NULL)
+		return;
+
 	purple_debug_info("msim", "msim_add_buddy: want to add %s to %s\n",
 			name, gname ? gname : "(no group)");
 
@@ -3085,9 +3131,10 @@ static PurplePluginProtocolInfo prpl_info = {
 	NULL,                  /* unregister_user */
 	msim_send_attention,   /* send_attention */
 	msim_attention_types,  /* attention_types */
-
-	sizeof(PurplePluginProtocolInfo),  /* struct_size */
+	sizeof(PurplePluginProtocolInfo), /* struct_size */
 	msim_get_account_text_table,              /* get_account_text_table */
+	NULL,                   /* initiate_media */
+	NULL                    /* can_do_media */
 };
 
 /**
diff --git a/libpurple/protocols/myspace/myspace.h b/libpurple/protocols/myspace/myspace.h
index 7c161a8c33..ff725e5ef6 100644
--- a/libpurple/protocols/myspace/myspace.h
+++ b/libpurple/protocols/myspace/myspace.h
@@ -114,8 +114,8 @@
 #define MSIM_KEEPALIVE_INTERVAL     (3 * 60)
 /*#define MSIM_USE_KEEPALIVE*/
 
-/* Time to check if alive (milliseconds) */
-#define MSIM_KEEPALIVE_INTERVAL_CHECK   (30 * 1000)
+/* Time to check if alive (seconds) */
+#define MSIM_KEEPALIVE_INTERVAL_CHECK   30
 
 /* Time to check for new mail (milliseconds) */
 #define MSIM_MAIL_INTERVAL_CHECK    (60 * 1000)
@@ -127,12 +127,13 @@
 #define MSIM_FINAL_STRING           "\\final\\" /**< Message end marker */
 
 /* Messages */
-#define MSIM_BM_INSTANT             1
-#define MSIM_BM_STATUS              100
-#define MSIM_BM_ACTION              121
-#define MSIM_BM_MEDIA               122
-#define MSIM_BM_PROFILE             124
-#define MSIM_BM_UNOFFICIAL_CLIENT   200
+#define MSIM_BM_ACTION_OR_IM_DELAYABLE  1
+#define MSIM_BM_STATUS                  100
+#define MSIM_BM_ACTION_OR_IM_INSTANT    121
+#define MSIM_BM_MEDIA                   122
+#define MSIM_BM_PROFILE                 124
+#define MSIM_BM_STATUS_MOOD             126
+#define MSIM_BM_UNOFFICIAL_CLIENT       200
 
 /* Authentication algorithm for login2 */
 #define MSIM_AUTH_ALGORITHM         196610
@@ -140,6 +141,7 @@
 /* Recognized challenge length */
 #define MSIM_AUTH_CHALLENGE_LENGTH  0x40
 
+#ifdef SEND_OUR_IP_ADDRESSES
 /* TODO: obtain IPs of network interfaces from user's machine, instead of
  * hardcoding these values below (used in msim_compute_login_response).
  * This is not immediately
@@ -152,6 +154,7 @@
 
 #define MSIM_LOGIN_IP_LIST  "\x00\x00\x00\x00\x05\x7f\x00\x00\x01\x00\x00\x00\x00\x0a\x00\x00\x40\xc0\xa8\x58\x01\xc0\xa8\x3c\x01"
 #define MSIM_LOGIN_IP_LIST_LEN         25
+#endif /* SEND_OUR_IP_ADDRESSES */
 
 /* Indexes into status string (0|1|2|3|..., but 0 always empty) */
 #define MSIM_STATUS_ORDINAL_EMPTY       0
diff --git a/libpurple/protocols/myspace/user.c b/libpurple/protocols/myspace/user.c
index bdd53d084c..3b9175818c 100644
--- a/libpurple/protocols/myspace/user.c
+++ b/libpurple/protocols/myspace/user.c
@@ -41,10 +41,10 @@ msim_format_now_playing(const gchar *band, const gchar *song)
 }
 
 /**
- * Get the MsimUser from a PurpleBuddy, creating it if needed.
+ * Get the MsimUser from a PurpleBuddy, optionally creating it if needed.
  */
 MsimUser *
-msim_get_user_from_buddy(PurpleBuddy *buddy)
+msim_get_user_from_buddy(PurpleBuddy *buddy, gboolean create)
 {
 	MsimUser *user;
 
@@ -52,11 +52,13 @@ msim_get_user_from_buddy(PurpleBuddy *buddy)
 		return NULL;
 	}
 
-	if (!(user = purple_buddy_get_protocol_data(buddy))) {
+	user = purple_buddy_get_protocol_data(buddy);
+	if (create && !user) {
 		/* No MsimUser for this buddy; make one. */
 
 		user = g_new0(MsimUser, 1);
 		user->buddy = buddy;
+		user->id = purple_blist_node_get_int(&buddy->node, "UserID");
 		purple_buddy_set_protocol_data(buddy, user);
 	}
 
@@ -94,7 +96,7 @@ msim_find_user(MsimSession *session, const gchar *username)
 		return NULL;
 	}
 
-	user = msim_get_user_from_buddy(buddy);
+	user = msim_get_user_from_buddy(buddy, TRUE);
 
 	return user;
 }
@@ -108,7 +110,6 @@ msim_append_user_info(MsimSession *session, PurpleNotifyUserInfo *user_info, Msi
 {
 	PurplePresence *presence;
 	gchar *str;
-	guint uid;
 	guint cv;
 
 	/* Useful to identify the account the tooltip refers to.
@@ -117,8 +118,6 @@ msim_append_user_info(MsimSession *session, PurpleNotifyUserInfo *user_info, Msi
 		purple_notify_user_info_add_pair(user_info, _("User"), user->username);
 	}
 
-	uid = purple_blist_node_get_int((PurpleBlistNode *)user->buddy, "UserID");
-
 	/* a/s/l...the vitals */
 	if (user->age) {
 		char age[16];
@@ -638,8 +637,7 @@ static void msim_username_is_set_cb(MsimSession *session, const MsimMessage *use
 	uid = msim_msg_get_integer(userinfo, "uid");
 	lid = msim_msg_get_integer(userinfo, "lid");
 	body = msim_msg_get_dictionary(userinfo, "body");
-	/* XXX: Mark for translation */
-	errmsg = ("An error occurred while trying to set the username.\n"
+	errmsg = _("An error occurred while trying to set the username.  "
 			"Please try again, or visit http://editprofile.myspace.com/index.cfm?"
 			"fuseaction=profile.username to set your username.");
 
@@ -798,9 +796,9 @@ static void msim_username_is_available_cb(MsimSession *session, const MsimMessag
 	if (!body) {
 		purple_debug_info("msim_username_is_available_cb", "No body for %s?!\n", username);
 		purple_connection_error_reason(session->gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-				"An error occurred while trying to set the username.\n"
+				_("An error occurred while trying to set the username.  "
 				"Please try again, or visit http://editprofile.myspace.com/index.cfm?"
-				"fuseaction=profile.username to set your username.");
+				"fuseaction=profile.username to set your username."));
 		return;
 	}
 
diff --git a/libpurple/protocols/myspace/user.h b/libpurple/protocols/myspace/user.h
index 0f17b28c6d..d1a8b59970 100644
--- a/libpurple/protocols/myspace/user.h
+++ b/libpurple/protocols/myspace/user.h
@@ -46,7 +46,7 @@ typedef struct _MsimUser
  * initiated from a user lookup. */
 typedef void (*MSIM_USER_LOOKUP_CB)(MsimSession *session, const MsimMessage *userinfo, gpointer data);
 
-MsimUser *msim_get_user_from_buddy(PurpleBuddy *buddy);
+MsimUser *msim_get_user_from_buddy(PurpleBuddy *buddy, gboolean create);
 void msim_user_free(MsimUser *user);
 MsimUser *msim_find_user(MsimSession *session, const gchar *username);
 void msim_append_user_info(MsimSession *session, PurpleNotifyUserInfo *user_info, MsimUser *user, gboolean full);
diff --git a/libpurple/protocols/myspace/zap.c b/libpurple/protocols/myspace/zap.c
index a1501b28ef..ed45e56d24 100644
--- a/libpurple/protocols/myspace/zap.c
+++ b/libpurple/protocols/myspace/zap.c
@@ -109,7 +109,7 @@ msim_send_zap(MsimSession *session, const gchar *username, guint code)
 	/* Construct and send the actual zap command. */
 	zap_string = g_strdup_printf("!!!ZAP_SEND!!!=RTE_BTN_ZAPS_%d", code);
 
-	if (!msim_send_bm(session, username, zap_string, MSIM_BM_ACTION)) {
+	if (!msim_send_bm(session, username, zap_string, MSIM_BM_ACTION_OR_IM_INSTANT)) {
 		purple_debug_info("msim_send_zap",
 				"msim_send_bm failed: zapping %s with %s\n",
 				username, zap_string);
diff --git a/libpurple/protocols/novell/nmmessage.c b/libpurple/protocols/novell/nmmessage.c
index aa67bfec47..70b00eed22 100644
--- a/libpurple/protocols/novell/nmmessage.c
+++ b/libpurple/protocols/novell/nmmessage.c
@@ -24,7 +24,6 @@ struct _NMMessage
 {
 	NMConference *conference;
 	char *text;
-	gpointer data;
 	guint32 ref_count;
 };
 
diff --git a/libpurple/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c
index 50ca789452..d6090ccc66 100644
--- a/libpurple/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
@@ -121,7 +121,7 @@ _login_resp_cb(NMUser * user, NMERR_T ret_code,
 
 	} else {
 		PurpleConnectionError reason;
-		char *err = g_strdup_printf(_("Login failed (%s)."),
+		char *err = g_strdup_printf(_("Unable to login: %s"),
 					    nm_error_to_string (ret_code));
 
 		switch (ret_code) {
@@ -140,7 +140,7 @@ _login_resp_cb(NMUser * user, NMERR_T ret_code,
 				reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 		}
 
-		purple_connection_error_reason (gc, reason, err);
+		purple_connection_error_reason(gc, reason, err);
 		g_free(err);
 	}
 }
@@ -1126,7 +1126,7 @@ _check_for_disconnect(NMUser * user, NMERR_T err)
 
 	if (_is_disconnect_error(err)) {
 
-		purple_connection_error_reason (gc,
+		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 			_("Error communicating with server. Closing connection."));
 		return TRUE;
@@ -1701,7 +1701,7 @@ novell_ssl_recv_cb(gpointer data, PurpleSslConnection * gsc,
 
 		if (_is_disconnect_error(rc)) {
 
-			purple_connection_error_reason (gc,
+			purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 				_("Error communicating with server. Closing connection."));
 		} else {
@@ -1742,9 +1742,9 @@ novell_ssl_connected_cb(gpointer data, PurpleSslConnection * gsc,
 		conn->connected = TRUE;
 		purple_ssl_input_add(gsc, novell_ssl_recv_cb, gc);
 	} else {
-		purple_connection_error_reason (gc,
+		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Unable to connect to server."));
+			_("Unable to connect"));
 	}
 
 	purple_connection_update_progress(gc, _("Waiting for response..."),
@@ -2027,10 +2027,9 @@ _evt_user_disconnect(NMUser * user, NMEvent * event)
 	{
 		if (!purple_account_get_remember_password(account))
 			purple_account_set_password(account, NULL);
-		purple_connection_error_reason (gc,
+		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_NAME_IN_USE,
-			_("You have been logged out because you"
-			  " logged in at another workstation."));
+			_("You have signed on from another location"));
 	}
 }
 
@@ -2184,10 +2183,10 @@ novell_login(PurpleAccount * account)
 		 */
 
 		/* ...but for now just error out with a nice message. */
-		purple_connection_error_reason (gc,
+		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
 			_("Unable to connect to server. Please enter the "
-			  "address of the server you wish to connect to."));
+			  "address of the server to which you wish to connect."));
 		return;
 	}
 
@@ -2213,9 +2212,9 @@ novell_login(PurpleAccount * account)
 													  user->conn->addr, user->conn->port,
 													  novell_ssl_connected_cb, novell_ssl_connect_error, gc);
 		if (user->conn->ssl_conn->data == NULL) {
-			purple_connection_error_reason (gc,
+			purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
-				_("Error. SSL support is not installed."));
+				_("SSL support unavailable"));
 		}
 	}
 }
@@ -2547,7 +2546,7 @@ novell_add_buddy(PurpleConnection * gc, PurpleBuddy *buddy, PurpleGroup * group)
 	if (gc == NULL || buddy == NULL || group == NULL)
 		return;
 
-	user = (NMUser *) gc->proto_data;
+	user = (NMUser *) purple_connection_get_protocol_data(gc);
 	if (user == NULL)
 		return;
 
@@ -2557,6 +2556,10 @@ novell_add_buddy(PurpleConnection * gc, PurpleBuddy *buddy, PurpleGroup * group)
 	if (!user->clist_synched)
 		return;
 
+	/* Don't re-add a buddy that is already on our contact list */
+	if (nm_find_user_record(user, purple_buddy_get_name(buddy)) != NULL)
+		return;
+
 	contact = nm_create_contact();
 	nm_contact_set_dn(contact, purple_buddy_get_name(buddy));
 
@@ -3520,13 +3523,13 @@ static PurplePluginProtocolInfo prpl_info = {
 	NULL,						/* whiteboard_prpl_ops */
 	NULL,						/* send_raw */
 	NULL,						/* roomlist_room_serialize */
-
-	/* padding */
-	NULL,
-	NULL,
-	NULL,
+	NULL,						/* unregister_user */
+	NULL,						/* send_attention */
+	NULL,						/* get_attention_types */
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	NULL,						/* get_account_text_table */
+	NULL,						/* initiate_media */
+	NULL						/* can_do_media */
 };
 
 static PurplePluginInfo info = {
diff --git a/libpurple/protocols/null/nullprpl.c b/libpurple/protocols/null/nullprpl.c
index 21d2f63caa..13e6528144 100644
--- a/libpurple/protocols/null/nullprpl.c
+++ b/libpurple/protocols/null/nullprpl.c
@@ -909,7 +909,8 @@ static const char *nullprpl_normalize(const PurpleAccount *acct,
 static void nullprpl_set_buddy_icon(PurpleConnection *gc,
                                     PurpleStoredImage *img) {
  purple_debug_info("nullprpl", "setting %s's buddy icon to %s\n",
-                   gc->account->username, purple_imgstore_get_filename(img));
+                   gc->account->username,
+                   img ? purple_imgstore_get_filename(img) : "(null)");
 }
 
 static void nullprpl_remove_group(PurpleConnection *gc, PurpleGroup *group) {
@@ -1112,11 +1113,13 @@ static PurplePluginProtocolInfo prpl_info =
   NULL,                                /* whiteboard_prpl_ops */
   NULL,                                /* send_raw */
   NULL,                                /* roomlist_room_serialize */
-  NULL,	                               /* unregister_user */
+  NULL,                                /* unregister_user */
   NULL,                                /* send_attention */
-  NULL,                                /* attention_types */
+  NULL,                                /* get_attention_types */
   sizeof(PurplePluginProtocolInfo),    /* struct_size */
-  NULL,                                /* get_account_text_table */
+  NULL,
+  NULL,                                 /* initiate_media */
+  NULL                                  /* can_do_media */	
 };
 
 static void nullprpl_init(PurplePlugin *plugin)
diff --git a/libpurple/protocols/oscar/Makefile.am b/libpurple/protocols/oscar/Makefile.am
index 1436974cbe..5dfcba37df 100644
--- a/libpurple/protocols/oscar/Makefile.am
+++ b/libpurple/protocols/oscar/Makefile.am
@@ -7,6 +7,7 @@ pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
 OSCARSOURCES = \
 	bstream.c           \
+	clientlogin.c       \
 	family_admin.c      \
 	family_advert.c     \
 	family_alert.c      \
diff --git a/libpurple/protocols/oscar/Makefile.mingw b/libpurple/protocols/oscar/Makefile.mingw
index 983815b40c..e9b7edd5fd 100644
--- a/libpurple/protocols/oscar/Makefile.mingw
+++ b/libpurple/protocols/oscar/Makefile.mingw
@@ -42,6 +42,7 @@ LIB_PATHS +=		-L$(GTK_TOP)/lib \
 ##
 C_SRC = \
 	bstream.c		\
+	clientlogin.c		\
 	family_admin.c		\
 	family_advert.c		\
 	family_alert.c		\
diff --git a/libpurple/protocols/oscar/bstream.c b/libpurple/protocols/oscar/bstream.c
index 9119fe063e..cee0c87b54 100644
--- a/libpurple/protocols/oscar/bstream.c
+++ b/libpurple/protocols/oscar/bstream.c
@@ -161,15 +161,19 @@ guint32 byte_stream_getle32(ByteStream *bs)
 	return aimutil_getle32(bs->data + bs->offset - 4);
 }
 
+static void byte_stream_getrawbuf_nocheck(ByteStream *bs, guint8 *buf, int len)
+{
+	memcpy(buf, bs->data + bs->offset, len);
+	bs->offset += len;
+}
+
 int byte_stream_getrawbuf(ByteStream *bs, guint8 *buf, int len)
 {
 
 	if (byte_stream_empty(bs) < len)
 		return 0;
 
-	memcpy(buf, bs->data + bs->offset, len);
-	bs->offset += len;
-
+	byte_stream_getrawbuf_nocheck(bs, buf, len);
 	return len;
 }
 
@@ -177,12 +181,12 @@ guint8 *byte_stream_getraw(ByteStream *bs, int len)
 {
 	guint8 *ob;
 
+	if (byte_stream_empty(bs) < len)
+		return NULL;
+
 	ob = g_malloc(len);
 
-	if (byte_stream_getrawbuf(bs, ob, len) < len) {
-		g_free(ob);
-		return NULL;
-	}
+	byte_stream_getrawbuf_nocheck(bs, ob, len);
 
 	return ob;
 }
@@ -191,12 +195,12 @@ char *byte_stream_getstr(ByteStream *bs, int len)
 {
 	char *ob;
 
+	if (byte_stream_empty(bs) < len)
+		return NULL;
+
 	ob = g_malloc(len + 1);
 
-	if (byte_stream_getrawbuf(bs, (guint8 *)ob, len) < len) {
-		g_free(ob);
-		return NULL;
-	}
+	byte_stream_getrawbuf_nocheck(bs, (guint8 *)ob, len);
 
 	ob[len] = '\0';
 
@@ -311,3 +315,37 @@ int byte_stream_putuid(ByteStream *bs, OscarData *od)
 
 	return byte_stream_putle32(bs, atoi(purple_account_get_username(account)));
 }
+
+void byte_stream_put_bart_asset(ByteStream *bs, guint16 type, ByteStream *data)
+{
+	byte_stream_put16(bs, type);
+
+	if (data != NULL && data->len > 0) {
+		/* Flags. 0x04 means "this asset has data attached to it" */
+		byte_stream_put8(bs, 0x04); /* Flags */
+		byte_stream_put8(bs, data->len); /* Length */
+		byte_stream_rewind(data);
+		byte_stream_putbs(bs, data, data->len); /* Data */
+	} else {
+		byte_stream_put8(bs, 0x00); /* No flags */
+		byte_stream_put8(bs, 0x00); /* Length */
+		/* No data */
+	}
+}
+
+void byte_stream_put_bart_asset_str(ByteStream *bs, guint16 type, const char *datastr)
+{
+	ByteStream data;
+	size_t len = datastr != NULL ? strlen(datastr) : 0;
+
+	if (len > 0) {
+		byte_stream_new(&data, 2 + len + 2);
+		byte_stream_put16(&data, len); /* Length */
+		byte_stream_putstr(&data, datastr); /* String */
+		byte_stream_put16(&data, 0x0000); /* Unknown */
+		byte_stream_put_bart_asset(bs, type, &data);
+		byte_stream_destroy(&data);
+	} else {
+		byte_stream_put_bart_asset(bs, type, NULL);
+	}
+}
diff --git a/libpurple/protocols/oscar/clientlogin.c b/libpurple/protocols/oscar/clientlogin.c
new file mode 100644
index 0000000000..12456e0493
--- /dev/null
+++ b/libpurple/protocols/oscar/clientlogin.c
@@ -0,0 +1,576 @@
+/*
+ * Purple's oscar protocol plugin
+ * This file is the legal property of its developers.
+ * Please see the AUTHORS file distributed alongside this file.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+*/
+
+/**
+ * This file implements AIM's clientLogin procedure for authenticating
+ * users.  This replaces the older MD5-based and XOR-based
+ * authentication methods that use SNAC family 0x0017.
+ *
+ * This doesn't use SNACs or FLAPs at all.  It makes http and https
+ * POSTs to AOL to validate the user based on the password they
+ * provided to us.  Upon successful authentication we request a
+ * connection to the BOS server by calling startOSCARsession.  The
+ * AOL server gives us the hostname and port number to use, as well
+ * as the cookie to use to authenticate to the BOS server.  And then
+ * everything else is the same as with BUCP.
+ *
+ * For details, see:
+ * http://dev.aol.com/aim/oscar/#AUTH
+ * http://dev.aol.com/authentication_for_clients
+ */
+
+#include "cipher.h"
+#include "core.h"
+
+#include "oscar.h"
+
+#define URL_CLIENT_LOGIN "https://api.screenname.aol.com/auth/clientLogin"
+#define URL_START_OSCAR_SESSION "http://api.oscar.aol.com/aim/startOSCARSession"
+
+/*
+ * Using clientLogin requires a developer ID.  This key is for libpurple.
+ * It is the default key for all libpurple-based clients.  AOL encourages
+ * UIs (especially ones with lots of users) to override this with their
+ * own key.  This key is owned by the AIM account "markdoliner"
+ *
+ * Keys can be managed at http://developer.aim.com/manageKeys.jsp
+ */
+#define DEFAULT_CLIENT_KEY "ma15d7JTxbmVG-RP"
+
+static const char *get_client_key(OscarData *od)
+{
+	return oscar_get_ui_info_string(
+			od->icq ? "prpl-icq-clientkey" : "prpl-aim-clientkey",
+			DEFAULT_CLIENT_KEY);
+}
+
+/**
+ * This is similar to purple_url_encode() except that it follows
+ * RFC3986 a little more closely by not encoding - . _ and ~
+ * It also uses capital letters as hex characters because capital
+ * letters are required by AOL.  The RFC says that capital letters
+ * are a SHOULD and that URLs that use capital letters are
+ * equivalent to URLs that use small letters.
+ *
+ * TODO: Check if purple_url_encode() can be replaced with this
+ *       version without breaking anything.
+ */
+static const char *oscar_auth_url_encode(const char *str)
+{
+	const char *iter;
+	static char buf[BUF_LEN];
+	char utf_char[6];
+	guint i, j = 0;
+
+	g_return_val_if_fail(str != NULL, NULL);
+	g_return_val_if_fail(g_utf8_validate(str, -1, NULL), NULL);
+
+	iter = str;
+	for (; *iter && j < (BUF_LEN - 1) ; iter = g_utf8_next_char(iter)) {
+		gunichar c = g_utf8_get_char(iter);
+		/* If the character is an ASCII character and is alphanumeric
+		 * no need to escape */
+		if ((c < 128 && isalnum(c)) || c =='-' || c == '.' || c == '_' || c == '~') {
+			buf[j++] = c;
+		} else {
+			int bytes = g_unichar_to_utf8(c, utf_char);
+			for (i = 0; i < bytes; i++) {
+				if (j > (BUF_LEN - 4))
+					break;
+				sprintf(buf + j, "%%%02X", utf_char[i] & 0xff);
+				j += 3;
+			}
+		}
+	}
+
+	buf[j] = '\0';
+
+	return buf;
+}
+
+/**
+ * @return A null-terminated base64 encoded version of the HMAC
+ *         calculated using the given key and data.
+ */
+static gchar *hmac_sha256(const char *key, const char *message)
+{
+	PurpleCipherContext *context;
+	guchar digest[32];
+
+	context = purple_cipher_context_new_by_name("hmac", NULL);
+	purple_cipher_context_set_option(context, "hash", "sha256");
+	purple_cipher_context_set_key(context, (guchar *)key);
+	purple_cipher_context_append(context, (guchar *)message, strlen(message));
+	purple_cipher_context_digest(context, sizeof(digest), digest, NULL);
+	purple_cipher_context_destroy(context);
+
+	return purple_base64_encode(digest, sizeof(digest));
+}
+
+/**
+ * @return A base-64 encoded HMAC-SHA256 signature created using the
+ *         technique documented at
+ *         http://dev.aol.com/authentication_for_clients#signing
+ */
+static gchar *generate_signature(const char *method, const char *url, const char *parameters, const char *session_key)
+{
+	char *encoded_url, *signature_base_string, *signature;
+	const char *encoded_parameters;
+
+	encoded_url = g_strdup(oscar_auth_url_encode(url));
+	encoded_parameters = oscar_auth_url_encode(parameters);
+	signature_base_string = g_strdup_printf("%s&%s&%s",
+			method, encoded_url, encoded_parameters);
+	g_free(encoded_url);
+
+	signature = hmac_sha256(session_key, signature_base_string);
+	g_free(signature_base_string);
+
+	return signature;
+}
+
+static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const gchar *response, gsize response_len, char **host, unsigned short *port, char **cookie)
+{
+	xmlnode *response_node, *tmp_node, *data_node;
+	xmlnode *host_node = NULL, *port_node = NULL, *cookie_node = NULL;
+	char *tmp;
+
+	/* Parse the response as XML */
+	response_node = xmlnode_from_str(response, response_len);
+	if (response_node == NULL)
+	{
+		char *msg;
+		purple_debug_error("oscar", "startOSCARSession could not parse "
+				"response as XML: %s\n", response);
+		/* Note to translators: %s in this string is a URL */
+		msg = g_strdup_printf(_("Received unexpected response from %s"),
+				URL_START_OSCAR_SESSION);
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
+		g_free(msg);
+		return FALSE;
+	}
+
+	/* Grab the necessary XML nodes */
+	tmp_node = xmlnode_get_child(response_node, "statusCode");
+	data_node = xmlnode_get_child(response_node, "data");
+	if (data_node != NULL) {
+		host_node = xmlnode_get_child(data_node, "host");
+		port_node = xmlnode_get_child(data_node, "port");
+		cookie_node = xmlnode_get_child(data_node, "cookie");
+	}
+
+	/* Make sure we have a status code */
+	if (tmp_node == NULL || (tmp = xmlnode_get_data_unescaped(tmp_node)) == NULL) {
+		char *msg;
+		purple_debug_error("oscar", "startOSCARSession response was "
+				"missing statusCode: %s\n", response);
+		msg = g_strdup_printf(_("Received unexpected response from %s"),
+				URL_START_OSCAR_SESSION);
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
+		g_free(msg);
+		xmlnode_free(response_node);
+		return FALSE;
+	}
+
+	/* Make sure the status code was 200 */
+	if (strcmp(tmp, "200") != 0)
+	{
+		purple_debug_error("oscar", "startOSCARSession response statusCode "
+				"was %s: %s\n", tmp, response);
+
+		if (strcmp(tmp, "401") == 0)
+			purple_connection_error_reason(gc,
+					PURPLE_CONNECTION_ERROR_OTHER_ERROR,
+					_("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."));
+		else {
+			char *msg;
+			msg = g_strdup_printf(_("Received unexpected response from %s"),
+					URL_START_OSCAR_SESSION);
+			purple_connection_error_reason(gc,
+					PURPLE_CONNECTION_ERROR_OTHER_ERROR, msg);
+			g_free(msg);
+		}
+
+		g_free(tmp);
+		xmlnode_free(response_node);
+		return FALSE;
+	}
+	g_free(tmp);
+
+	/* Make sure we have everything else */
+	if (data_node == NULL || host_node == NULL ||
+		port_node == NULL || cookie_node == NULL)
+	{
+		char *msg;
+		purple_debug_error("oscar", "startOSCARSession response was missing "
+				"something: %s\n", response);
+		msg = g_strdup_printf(_("Received unexpected response from %s"),
+				URL_START_OSCAR_SESSION);
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
+		g_free(msg);
+		xmlnode_free(response_node);
+		return FALSE;
+	}
+
+	/* Extract data from the XML */
+	*host = xmlnode_get_data_unescaped(host_node);
+	tmp = xmlnode_get_data_unescaped(port_node);
+	*cookie = xmlnode_get_data_unescaped(cookie_node);
+	if (*host == NULL || **host == '\0' || tmp == NULL || *tmp == '\0' || cookie == NULL || *cookie == '\0')
+	{
+		char *msg;
+		purple_debug_error("oscar", "startOSCARSession response was missing "
+				"something: %s\n", response);
+		msg = g_strdup_printf(_("Received unexpected response from %s"),
+				URL_START_OSCAR_SESSION);
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
+		g_free(msg);
+		g_free(*host);
+		g_free(tmp);
+		g_free(*cookie);
+		xmlnode_free(response_node);
+		return FALSE;
+	}
+
+	*port = atoi(tmp);
+	g_free(tmp);
+
+	return TRUE;
+}
+
+static void start_oscar_session_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, gsize len, const gchar *error_message)
+{
+	OscarData *od;
+	PurpleConnection *gc;
+	char *host, *cookie;
+	unsigned short port;
+	guint8 *cookiedata;
+	gsize cookiedata_len;
+
+	od = user_data;
+	gc = od->gc;
+
+	od->url_data = NULL;
+
+	if (error_message != NULL || len == 0) {
+		gchar *tmp;
+		/* Note to translators: The first %s is a URL, the second is an
+		   error message. */
+		tmp = g_strdup_printf(_("Error requesting %s: %s"),
+				URL_START_OSCAR_SESSION, error_message);
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
+		return;
+	}
+
+	if (!parse_start_oscar_session_response(gc, url_text, len, &host, &port, &cookie))
+		return;
+
+	cookiedata = purple_base64_decode(cookie, &cookiedata_len);
+	oscar_connect_to_bos(gc, od, host, port, cookiedata, cookiedata_len);
+	g_free(cookiedata);
+
+	g_free(host);
+	g_free(cookie);
+}
+
+static void send_start_oscar_session(OscarData *od, const char *token, const char *session_key, time_t hosttime)
+{
+	char *query_string, *signature, *url;
+
+	/* Construct the GET parameters */
+	query_string = g_strdup_printf("a=%s"
+			"&f=xml"
+			"&k=%s"
+			"&ts=%" PURPLE_TIME_T_MODIFIER
+			"&useTLS=0",
+			oscar_auth_url_encode(token), get_client_key(od), hosttime);
+	signature = generate_signature("GET", URL_START_OSCAR_SESSION,
+			query_string, session_key);
+	url = g_strdup_printf(URL_START_OSCAR_SESSION "?%s&sig_sha256=%s",
+			query_string, signature);
+	g_free(query_string);
+	g_free(signature);
+
+	/* Make the request */
+	od->url_data = purple_util_fetch_url(url, TRUE, NULL, FALSE,
+			start_oscar_session_cb, od);
+	g_free(url);
+}
+
+/**
+ * This function parses the given response from a clientLogin request
+ * and extracts the useful information.
+ *
+ * @param gc           The PurpleConnection.  If the response data does
+ *                     not indicate then purple_connection_error_reason()
+ *                     will be called to close this connection.
+ * @param response     The response data from the clientLogin request.
+ * @param response_len The length of the above response, or -1 if
+ *                     @response is NUL terminated.
+ * @param token        If parsing was successful then this will be set to
+ *                     a newly allocated string containing the token.  The
+ *                     caller should g_free this string when it is finished
+ *                     with it.  On failure this value will be untouched.
+ * @param secret       If parsing was successful then this will be set to
+ *                     a newly allocated string containing the secret.  The
+ *                     caller should g_free this string when it is finished
+ *                     with it.  On failure this value will be untouched.
+ * @param hosttime     If parsing was successful then this will be set to
+ *                     the time on the OpenAuth Server in seconds since the
+ *                     Unix epoch.  On failure this value will be untouched.
+ *
+ * @return TRUE if the request was successful and we were able to
+ *         extract all info we need.  Otherwise FALSE.
+ */
+static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *response, gsize response_len, char **token, char **secret, time_t *hosttime)
+{
+	xmlnode *response_node, *tmp_node, *data_node;
+	xmlnode *secret_node = NULL, *hosttime_node = NULL, *token_node = NULL, *tokena_node = NULL;
+	char *tmp;
+
+	/* Parse the response as XML */
+	response_node = xmlnode_from_str(response, response_len);
+	if (response_node == NULL)
+	{
+		char *msg;
+		purple_debug_error("oscar", "clientLogin could not parse "
+				"response as XML: %s\n", response);
+		msg = g_strdup_printf(_("Received unexpected response from %s"),
+				URL_CLIENT_LOGIN);
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
+		g_free(msg);
+		return FALSE;
+	}
+
+	/* Grab the necessary XML nodes */
+	tmp_node = xmlnode_get_child(response_node, "statusCode");
+	data_node = xmlnode_get_child(response_node, "data");
+	if (data_node != NULL) {
+		secret_node = xmlnode_get_child(data_node, "sessionSecret");
+		hosttime_node = xmlnode_get_child(data_node, "hostTime");
+		token_node = xmlnode_get_child(data_node, "token");
+		if (token_node != NULL)
+			tokena_node = xmlnode_get_child(token_node, "a");
+	}
+
+	/* Make sure we have a status code */
+	if (tmp_node == NULL || (tmp = xmlnode_get_data_unescaped(tmp_node)) == NULL) {
+		char *msg;
+		purple_debug_error("oscar", "clientLogin response was "
+				"missing statusCode: %s\n", response);
+		msg = g_strdup_printf(_("Received unexpected response from %s"),
+				URL_CLIENT_LOGIN);
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
+		g_free(msg);
+		xmlnode_free(response_node);
+		return FALSE;
+	}
+
+	/* Make sure the status code was 200 */
+	if (strcmp(tmp, "200") != 0)
+	{
+		int status_code, status_detail_code = 0;
+
+		status_code = atoi(tmp);
+		g_free(tmp);
+		tmp_node = xmlnode_get_child(response_node, "statusDetailCode");
+		if (tmp_node != NULL && (tmp = xmlnode_get_data_unescaped(tmp_node)) != NULL) {
+			status_detail_code = atoi(tmp);
+			g_free(tmp);
+		}
+
+		purple_debug_error("oscar", "clientLogin response statusCode "
+				"was %d (%d): %s\n", status_code, status_detail_code, response);
+
+		if (status_code == 330 && status_detail_code == 3011) {
+			purple_connection_error_reason(gc,
+					PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
+					_("Incorrect password"));
+		} else if (status_code == 401 && status_detail_code == 3019) {
+			purple_connection_error_reason(gc,
+					PURPLE_CONNECTION_ERROR_OTHER_ERROR,
+					_("AOL does not allow your screen name to authenticate here"));
+		} else {
+			char *msg;
+			msg = g_strdup_printf(_("Received unexpected response from %s"),
+					URL_CLIENT_LOGIN);
+			purple_connection_error_reason(gc,
+					PURPLE_CONNECTION_ERROR_OTHER_ERROR, msg);
+			g_free(msg);
+		}
+
+		xmlnode_free(response_node);
+		return FALSE;
+	}
+	g_free(tmp);
+
+	/* Make sure we have everything else */
+	if (data_node == NULL || secret_node == NULL ||
+		token_node == NULL || tokena_node == NULL)
+	{
+		char *msg;
+		purple_debug_error("oscar", "clientLogin response was missing "
+				"something: %s\n", response);
+		msg = g_strdup_printf(_("Received unexpected response from %s"),
+				URL_CLIENT_LOGIN);
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
+		g_free(msg);
+		xmlnode_free(response_node);
+		return FALSE;
+	}
+
+	/* Extract data from the XML */
+	*token = xmlnode_get_data_unescaped(tokena_node);
+	*secret = xmlnode_get_data_unescaped(secret_node);
+	tmp = xmlnode_get_data_unescaped(hosttime_node);
+	if (*token == NULL || **token == '\0' || *secret == NULL || **secret == '\0' || tmp == NULL || *tmp == '\0')
+	{
+		char *msg;
+		purple_debug_error("oscar", "clientLogin response was missing "
+				"something: %s\n", response);
+		msg = g_strdup_printf(_("Received unexpected response from %s"),
+				URL_CLIENT_LOGIN);
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
+		g_free(msg);
+		g_free(*token);
+		g_free(*secret);
+		g_free(tmp);
+		xmlnode_free(response_node);
+		return FALSE;
+	}
+
+	*hosttime = strtol(tmp, NULL, 10);
+	g_free(tmp);
+
+	xmlnode_free(response_node);
+
+	return TRUE;
+}
+
+static void client_login_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, gsize len, const gchar *error_message)
+{
+	OscarData *od;
+	PurpleConnection *gc;
+	char *token, *secret, *session_key;
+	time_t hosttime;
+	int password_len;
+	char *password;
+
+	od = user_data;
+	gc = od->gc;
+
+	od->url_data = NULL;
+
+	if (error_message != NULL || len == 0) {
+		gchar *tmp;
+		tmp = g_strdup_printf(_("Error requesting %s: %s"),
+				URL_CLIENT_LOGIN, error_message);
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
+		return;
+	}
+
+	if (!parse_client_login_response(gc, url_text, len, &token, &secret, &hosttime))
+		return;
+
+	password_len = strlen(purple_connection_get_password(gc));
+	password = g_strdup_printf("%.*s",
+			od->icq ? MIN(password_len, MAXICQPASSLEN) : password_len,
+			purple_connection_get_password(gc));
+	session_key = hmac_sha256(password, secret);
+	g_free(password);
+	g_free(secret);
+
+	send_start_oscar_session(od, token, session_key, hosttime);
+
+	g_free(token);
+	g_free(session_key);
+}
+
+/**
+ * This function sends a request to
+ * https://api.screenname.aol.com/auth/clientLogin with the user's
+ * username and password and receives the user's session key, which is
+ * used to request a connection to the BOSS server.
+ */
+void send_client_login(OscarData *od, const char *username)
+{
+	PurpleConnection *gc;
+	GString *request, *body;
+	const char *tmp;
+	char *password;
+	int password_len;
+
+	gc = od->gc;
+
+	/*
+	 * We truncate ICQ passwords to 8 characters.  There is probably a
+	 * limit for AIM passwords, too, but we really only need to do
+	 * this for ICQ because older ICQ clients let you enter a password
+	 * as long as you wanted and then they truncated it silently.
+	 *
+	 * And we can truncate based on the number of bytes and not the
+	 * number of characters because passwords for AIM and ICQ are
+	 * supposed to be plain ASCII (I don't know if this has always been
+	 * the case, though).
+	 */
+	tmp = purple_connection_get_password(gc);
+	password_len = strlen(tmp);
+	password = g_strndup(tmp, od->icq ? MIN(password_len, MAXICQPASSLEN) : password_len);
+
+	/* Construct the body of the HTTP POST request */
+	body = g_string_new("");
+	g_string_append_printf(body, "devId=%s", get_client_key(od));
+	g_string_append_printf(body, "&f=xml");
+	g_string_append_printf(body, "&pwd=%s", oscar_auth_url_encode(password));
+	g_string_append_printf(body, "&s=%s", oscar_auth_url_encode(username));
+	g_free(password);
+
+	/* Construct an HTTP POST request */
+	request = g_string_new("POST /auth/clientLogin HTTP/1.0\r\n"
+			"Connection: close\r\n"
+			"Accept: */*\r\n");
+
+	/* Tack on the body */
+	g_string_append_printf(request, "Content-Type: application/x-www-form-urlencoded; charset=UTF-8\r\n");
+	g_string_append_printf(request, "Content-Length: %" G_GSIZE_FORMAT "\r\n\r\n", body->len);
+	g_string_append_len(request, body->str, body->len);
+	g_string_free(body, TRUE);
+
+	/* Send the POST request  */
+	od->url_data = purple_util_fetch_url_request(URL_CLIENT_LOGIN,
+			TRUE, NULL, FALSE, request->str, FALSE,
+			client_login_cb, od);
+	g_string_free(request, TRUE);
+}
diff --git a/libpurple/protocols/oscar/family_auth.c b/libpurple/protocols/oscar/family_auth.c
index 9b8bbb5b8f..1aced5cf76 100644
--- a/libpurple/protocols/oscar/family_auth.c
+++ b/libpurple/protocols/oscar/family_auth.c
@@ -26,11 +26,11 @@
  *
  */
 
-#include "oscar.h"
+#include <ctype.h>
 
 #include "cipher.h"
 
-#include <ctype.h>
+#include "oscar.h"
 
 /* #define USE_XOR_FOR_ICQ */
 
@@ -129,6 +129,7 @@ goddamnicq2(OscarData *od, FlapConnection *conn, const char *sn, const char *pas
 	GSList *tlvlist = NULL;
 	int passwdlen;
 	guint8 *password_encoded;
+	guint32 distrib;
 
 	passwdlen = strlen(password);
 	password_encoded = (guint8 *)g_malloc(passwdlen+1);
@@ -139,18 +140,27 @@ goddamnicq2(OscarData *od, FlapConnection *conn, const char *sn, const char *pas
 
 	aim_encode_password(password, password_encoded);
 
+	distrib = oscar_get_ui_info_int(
+			od->icq ? "prpl-icq-distid" : "prpl-aim-distid",
+			ci->distrib);
+
 	byte_stream_put32(&frame->data, 0x00000001); /* FLAP Version */
 	aim_tlvlist_add_str(&tlvlist, 0x0001, sn);
 	aim_tlvlist_add_raw(&tlvlist, 0x0002, passwdlen, password_encoded);
 
-	if (ci->clientstring)
+	if (ci->clientstring != NULL)
 		aim_tlvlist_add_str(&tlvlist, 0x0003, ci->clientstring);
+	else {
+		gchar *clientstring = oscar_get_clientstring();
+		aim_tlvlist_add_str(&tlvlist, 0x0003, clientstring);
+		g_free(clientstring);
+	}
 	aim_tlvlist_add_16(&tlvlist, 0x0016, (guint16)ci->clientid);
 	aim_tlvlist_add_16(&tlvlist, 0x0017, (guint16)ci->major);
 	aim_tlvlist_add_16(&tlvlist, 0x0018, (guint16)ci->minor);
 	aim_tlvlist_add_16(&tlvlist, 0x0019, (guint16)ci->point);
 	aim_tlvlist_add_16(&tlvlist, 0x001a, (guint16)ci->build);
-	aim_tlvlist_add_32(&tlvlist, 0x0014, (guint32)ci->distrib); /* distribution chan */
+	aim_tlvlist_add_32(&tlvlist, 0x0014, distrib); /* distribution chan */
 	aim_tlvlist_add_str(&tlvlist, 0x000f, ci->lang);
 	aim_tlvlist_add_str(&tlvlist, 0x000e, ci->country);
 
@@ -210,6 +220,7 @@ aim_send_login(OscarData *od, FlapConnection *conn, const char *sn, const char *
 	guint8 digest[16];
 	aim_snacid_t snacid;
 	size_t password_len;
+	guint32 distrib;
 
 	if (!ci || !sn || !password)
 		return -EINVAL;
@@ -236,20 +247,29 @@ aim_send_login(OscarData *od, FlapConnection *conn, const char *sn, const char *
 
 	aim_encode_password_md5(password, password_len, key, digest);
 
+	distrib = oscar_get_ui_info_int(
+			od->icq ? "prpl-icq-distid" : "prpl-aim-distid",
+			ci->distrib);
+
 	aim_tlvlist_add_raw(&tlvlist, 0x0025, 16, digest);
 
 #ifndef USE_OLD_MD5
 	aim_tlvlist_add_noval(&tlvlist, 0x004c);
 #endif
 
-	if (ci->clientstring)
+	if (ci->clientstring != NULL)
 		aim_tlvlist_add_str(&tlvlist, 0x0003, ci->clientstring);
+	else {
+		gchar *clientstring = oscar_get_clientstring();
+		aim_tlvlist_add_str(&tlvlist, 0x0003, clientstring);
+		g_free(clientstring);
+	}
 	aim_tlvlist_add_16(&tlvlist, 0x0016, (guint16)ci->clientid);
 	aim_tlvlist_add_16(&tlvlist, 0x0017, (guint16)ci->major);
 	aim_tlvlist_add_16(&tlvlist, 0x0018, (guint16)ci->minor);
 	aim_tlvlist_add_16(&tlvlist, 0x0019, (guint16)ci->point);
 	aim_tlvlist_add_16(&tlvlist, 0x001a, (guint16)ci->build);
-	aim_tlvlist_add_32(&tlvlist, 0x0014, (guint32)ci->distrib);
+	aim_tlvlist_add_32(&tlvlist, 0x0014, distrib);
 	aim_tlvlist_add_str(&tlvlist, 0x000f, ci->lang);
 	aim_tlvlist_add_str(&tlvlist, 0x000e, ci->country);
 
diff --git a/libpurple/protocols/oscar/family_buddy.c b/libpurple/protocols/oscar/family_buddy.c
index 3b98664519..9ca1dfae07 100644
--- a/libpurple/protocols/oscar/family_buddy.c
+++ b/libpurple/protocols/oscar/family_buddy.c
@@ -221,9 +221,6 @@ buddychange(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *f
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, &userinfo);
 
-	if (snac->subtype == SNAC_SUBTYPE_BUDDY_ONCOMING && userinfo.flags & AIM_FLAG_AWAY)
-		aim_locate_autofetch_away_message(od, userinfo.bn);
-
 	aim_info_free(&userinfo);
 
 	return ret;
diff --git a/libpurple/protocols/oscar/family_chatnav.c b/libpurple/protocols/oscar/family_chatnav.c
index d24c31eb0d..1509b3c14e 100644
--- a/libpurple/protocols/oscar/family_chatnav.c
+++ b/libpurple/protocols/oscar/family_chatnav.c
@@ -44,6 +44,8 @@ error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame,
 
 	if (snac2->family != SNAC_FAMILY_CHATNAV) {
 		purple_debug_warning("oscar", "chatnav error: received response that maps to corrupt request (fam=%04x)\n", snac2->family);
+		g_free(snac2->data);
+		g_free(snac2);
 		return 0;
 	}
 
@@ -462,6 +464,8 @@ parseinfo(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fra
 
 	if (snac2->family != SNAC_FAMILY_CHATNAV) {
 		purple_debug_misc("oscar", "faim: chatnav_parse_info: received response that maps to corrupt request! (fam=%04x)\n", snac2->family);
+		g_free(snac2->data);
+		g_free(snac2);
 		return 0;
 	}
 
diff --git a/libpurple/protocols/oscar/family_icbm.c b/libpurple/protocols/oscar/family_icbm.c
index c217e0f3bb..bbfb8a4bea 100644
--- a/libpurple/protocols/oscar/family_icbm.c
+++ b/libpurple/protocols/oscar/family_icbm.c
@@ -221,7 +221,11 @@ static int aim_im_paraminfo(OscarData *od, FlapConnection *conn, aim_module_t *m
 	params.maxrecverwarn = byte_stream_get16(bs);
 	params.minmsginterval = byte_stream_get32(bs);
 
-	params.flags = 0x0000000b | AIM_IMPARAM_FLAG_SUPPORT_OFFLINEMSGS;
+	params.flags = AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED
+			| AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED
+			| AIM_IMPARAM_FLAG_EVENTS_ALLOWED
+			| AIM_IMPARAM_FLAG_SMS_SUPPORTED
+			| AIM_IMPARAM_FLAG_OFFLINE_MSGS_ALLOWED;
 	params.maxmsglen = 8000;
 	params.minmsginterval = 0;
 
@@ -906,6 +910,9 @@ aim_im_sendch2_sendfile_requestdirect(OscarData *od, guchar *cookie, const char
 	GSList *outer_tlvlist = NULL, *inner_tlvlist = NULL;
 	ByteStream hdrbs;
 
+	g_return_if_fail(bn != NULL);
+	g_return_if_fail(ip != NULL);
+
 	conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICBM);
 	if (conn == NULL)
 		return;
@@ -1566,7 +1573,7 @@ static int incomingim_ch1_parsemsgs(OscarData *od, aim_userinfo_t *userinfo, gui
 
 static int incomingim_ch1(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, guint16 channel, aim_userinfo_t *userinfo, ByteStream *bs, guint8 *cookie)
 {
-	guint16 type, length, magic1, msglen;
+	guint16 type, length, magic1, msglen = 0;
 	aim_rxcallback_t userfunc;
 	int ret = 0;
 	int rev = 0;
diff --git a/libpurple/protocols/oscar/family_icq.c b/libpurple/protocols/oscar/family_icq.c
index 88d1a6b820..35a5edf167 100644
--- a/libpurple/protocols/oscar/family_icq.c
+++ b/libpurple/protocols/oscar/family_icq.c
@@ -246,7 +246,7 @@ int aim_icq_getalias(OscarData *od, const char *uin)
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICQ)))
 		return -EINVAL;
 
-	purple_debug_info("oscar", "Requesting ICQ alias for %s", uin);
+	purple_debug_info("oscar", "Requesting ICQ alias for %s\n", uin);
 
 	bslen = 2 + 4 + 2 + 2 + 2 + 4;
 
@@ -735,14 +735,6 @@ icqresponse(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *f
 
 				info = g_new0(struct aim_icq_info, 1);
 
-				if (info == NULL)
-				{
-					g_free(uin);
-					g_free(status_note_title);
-
-					break;
-				}
-
 				bslen = 13 + strlen(uin) + 30 + 6 + 4 + 55 + 85 + 4;
 				byte_stream_new(&bs, 4 + bslen);
 
diff --git a/libpurple/protocols/oscar/family_locate.c b/libpurple/protocols/oscar/family_locate.c
index 8bcb8c0955..711cb9794a 100644
--- a/libpurple/protocols/oscar/family_locate.c
+++ b/libpurple/protocols/oscar/family_locate.c
@@ -250,8 +250,6 @@ static void
 aim_locate_adduserinfo(OscarData *od, aim_userinfo_t *userinfo)
 {
 	aim_userinfo_t *cur;
-	FlapConnection *conn;
-	aim_rxcallback_t userfunc;
 
 	cur = aim_locate_finduserinfo(od, userinfo->bn);
 
@@ -353,73 +351,6 @@ aim_locate_adduserinfo(OscarData *od, aim_userinfo_t *userinfo)
 		}
 		cur->away_len = 0;
 	}
-
-	/*
-	 * This callback can be used by a client if they want to know whenever
-	 * info for a buddy is updated.  For example, if a client shows away
-	 * messages in its buddy list, then it would need to know if a user's
-	 * away message changes.
-	 */
-	conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE);
-	if ((userfunc = aim_callhandler(od, SNAC_FAMILY_LOCATE, SNAC_SUBTYPE_LOCATE_GOTINFOBLOCK)))
-		userfunc(od, conn, NULL, cur);
-}
-
-/**
- * Remove this buddy name from our queue.  If this info was requested
- * by our info request queue, then pop the next element off of the queue.
- *
- * @param od The aim session.
- * @param bn Buddy name of the info we just received.
- * @return True if the request was explicit (client requested the info),
- *         false if the request was implicit (libfaim request the info).
- */
-static int
-aim_locate_gotuserinfo(OscarData *od, FlapConnection *conn, const char *bn)
-{
-	struct userinfo_node *cur, *del;
-	int was_explicit = TRUE;
-
-	while ((od->locate.requested != NULL) && (oscar_util_name_compare(bn, od->locate.requested->bn) == 0)) {
-		del = od->locate.requested;
-		od->locate.requested = del->next;
-		was_explicit = FALSE;
-		g_free(del->bn);
-		g_free(del);
-	}
-
-	cur = od->locate.requested;
-	while ((cur != NULL) && (cur->next != NULL)) {
-		if (oscar_util_name_compare(bn, cur->next->bn) == 0) {
-			del = cur->next;
-			cur->next = del->next;
-			was_explicit = FALSE;
-			g_free(del->bn);
-			g_free(del);
-		} else
-			cur = cur->next;
-	}
-
-	return was_explicit;
-}
-
-void
-aim_locate_autofetch_away_message(OscarData *od, const char *bn)
-{
-	struct userinfo_node *cur;
-
-	/* Make sure we haven't already made an info request for this buddy */
-	for (cur = od->locate.requested; cur != NULL; cur = cur->next)
-		if (oscar_util_name_compare(bn, cur->bn) == 0)
-			return;
-
-	/* Add a new node to our request queue */
-	cur = (struct userinfo_node *)g_malloc(sizeof(struct userinfo_node));
-	cur->bn = g_strdup(bn);
-	cur->next = od->locate.requested;
-	od->locate.requested = cur;
-
-	aim_locate_getinfoshort(od, cur->bn, 0x00000002);
 }
 
 aim_userinfo_t *aim_locate_finduserinfo(OscarData *od, const char *bn) {
@@ -615,13 +546,15 @@ aim_info_extract(OscarData *od, ByteStream *bs, aim_userinfo_t *outinfo)
 			 * User flags
 			 *
 			 * Specified as any of the following ORed together:
-			 *      0x0001  Trial (user less than 60days)
+			 *      0x0001  Unconfirmed account
 			 *      0x0002  Unknown bit 2
 			 *      0x0004  AOL Main Service user
 			 *      0x0008  Unknown bit 4
 			 *      0x0010  Free (AIM) user
 			 *      0x0020  Away
-			 *      0x0400  ActiveBuddy
+			 *      0x0040  ICQ user (AIM bit also set)
+			 *      0x0080  Mobile device
+			 *      0x0400  Bot (like ActiveBuddy)
 			 */
 			outinfo->flags = byte_stream_get16(bs);
 			outinfo->present |= AIM_USERINFO_PRESENT_FLAGS;
@@ -954,7 +887,6 @@ error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame,
 	aim_snac_t *snac2;
 	guint16 reason;
 	char *bn;
-	int was_explicit;
 
 	if (!(snac2 = aim_remsnac(od, snac->id))) {
 		purple_debug_misc("oscar", "locate error: received response from unknown request!\n");
@@ -963,25 +895,22 @@ error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame,
 
 	if ((snac2->family != SNAC_FAMILY_LOCATE) && (snac2->type != 0x0015)) {
 		purple_debug_misc("oscar", "locate error: received response from invalid request! %d\n", snac2->family);
+		g_free(snac2->data);
+		g_free(snac2);
 		return 0;
 	}
 
 	if (!(bn = snac2->data)) {
 		purple_debug_misc("oscar", "locate error: received response from request without a buddy name!\n");
+		g_free(snac2);
 		return 0;
 	}
 
 	reason = byte_stream_get16(bs);
 
-	/*
-	 * Remove this buddy name from our queue.  If the client requested
-	 * this buddy's info explicitly, then notify them that we do not have
-	 * info for this buddy.
-	 */
-	was_explicit = aim_locate_gotuserinfo(od, conn, bn);
-	if (was_explicit == TRUE)
-		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-			ret = userfunc(od, conn, frame, reason, bn);
+	/* Notify the user that we do not have info for this buddy */
+	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
+		ret = userfunc(od, conn, frame, reason, bn);
 
 	if (snac2)
 		g_free(snac2->data);
@@ -1197,7 +1126,6 @@ userinfo(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fram
 	aim_userinfo_t *userinfo, *userinfo2;
 	GSList *tlvlist;
 	aim_tlv_t *tlv = NULL;
-	int was_explicit;
 
 	userinfo = (aim_userinfo_t *)g_malloc(sizeof(aim_userinfo_t));
 	aim_info_extract(od, bs, userinfo);
@@ -1233,18 +1161,9 @@ userinfo(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fram
 	aim_info_free(userinfo);
 	g_free(userinfo);
 
-	/*
-	 * Remove this buddy name from our queue.  If the client requested
-	 * this buddy's info explicitly, then notify them that we have info
-	 * for this buddy.
-	 */
-	if (userinfo2 != NULL)
-	{
-		was_explicit = aim_locate_gotuserinfo(od, conn, userinfo2->bn);
-		if (was_explicit == TRUE)
-			if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-				ret = userfunc(od, conn, frame, userinfo2);
-	}
+	/* Show the info to the user */
+	if (userinfo2 != NULL && ((userfunc = aim_callhandler(od, snac->family, snac->subtype))))
+		ret = userfunc(od, conn, frame, userinfo2);
 
 	return ret;
 }
diff --git a/libpurple/protocols/oscar/family_oservice.c b/libpurple/protocols/oscar/family_oservice.c
index 746f3b28a6..1ba0f2833b 100644
--- a/libpurple/protocols/oscar/family_oservice.c
+++ b/libpurple/protocols/oscar/family_oservice.c
@@ -151,7 +151,7 @@ aim_chat_join(OscarData *od, guint16 exchange, const char *roomname, guint16 ins
 
 	memset(&csi, 0, sizeof(csi));
 	csi.exchange = exchange;
-	strncpy(csi.name, roomname, sizeof(csi.name));
+	g_strlcpy(csi.name, roomname, sizeof(csi.name));
 	csi.instance = instance;
 
 	/*
@@ -825,7 +825,7 @@ hostversions(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *
 int
 aim_srv_setextrainfo(OscarData *od,
 		gboolean seticqstatus, guint32 icqstatus,
-		gboolean setavailmsg, const char *availmsg, const char *itmsurl)
+		gboolean setstatusmsg, const char *statusmsg, const char *itmsurl)
 {
 	FlapConnection *conn;
 	ByteStream bs;
@@ -851,30 +851,17 @@ aim_srv_setextrainfo(OscarData *od,
 	}
 #endif
 
-	if (setavailmsg)
+	if (setstatusmsg)
 	{
-		int availmsglen, itmsurllen;
+		size_t statusmsglen, itmsurllen;
 		ByteStream tmpbs;
 
-		availmsglen = (availmsg != NULL) ? strlen(availmsg) : 0;
+		statusmsglen = (statusmsg != NULL) ? strlen(statusmsg) : 0;
 		itmsurllen = (itmsurl != NULL) ? strlen(itmsurl) : 0;
 
-		byte_stream_new(&tmpbs, availmsglen + 8 + itmsurllen + 8);
-		byte_stream_put16(&tmpbs, 0x0002);
-		byte_stream_put8(&tmpbs, 0x04); /* Flags */
-		byte_stream_put8(&tmpbs, availmsglen + 4);
-		byte_stream_put16(&tmpbs, availmsglen);
-		if (availmsglen > 0)
-			byte_stream_putstr(&tmpbs, availmsg);
-		byte_stream_put16(&tmpbs, 0x0000);
-
-		byte_stream_put16(&tmpbs, 0x0009);
-		byte_stream_put8(&tmpbs, 0x04); /* Flags */
-		byte_stream_put8(&tmpbs, itmsurllen + 4);
-		byte_stream_put16(&tmpbs, itmsurllen);
-		if (itmsurllen > 0)
-			byte_stream_putstr(&tmpbs, itmsurl);
-		byte_stream_put16(&tmpbs, 0x0000);
+		byte_stream_new(&tmpbs, statusmsglen + 8 + itmsurllen + 8);
+		byte_stream_put_bart_asset_str(&tmpbs, 0x0002, statusmsg);
+		byte_stream_put_bart_asset_str(&tmpbs, 0x0009, itmsurl);
 
 		aim_tlvlist_add_raw(&tlvlist, 0x001d,
 				byte_stream_curpos(&tmpbs), tmpbs.data);
diff --git a/libpurple/protocols/oscar/flap_connection.c b/libpurple/protocols/oscar/flap_connection.c
index c94224d192..40125a14e0 100644
--- a/libpurple/protocols/oscar/flap_connection.c
+++ b/libpurple/protocols/oscar/flap_connection.c
@@ -46,7 +46,7 @@ flap_connection_send_version(OscarData *od, FlapConnection *conn)
 	FlapFrame *frame;
 
 	frame = flap_frame_new(od, 0x01, 4);
-	byte_stream_put32(&frame->data, 0x00000001);
+	byte_stream_put32(&frame->data, 0x00000001); /* FLAP Version */
 	flap_connection_send(conn, frame);
 }
 
@@ -64,7 +64,7 @@ flap_connection_send_version_with_cookie(OscarData *od, FlapConnection *conn, gu
 	GSList *tlvlist = NULL;
 
 	frame = flap_frame_new(od, 0x01, 4 + 2 + 2 + length);
-	byte_stream_put32(&frame->data, 0x00000001);
+	byte_stream_put32(&frame->data, 0x00000001); /* FLAP Version */
 	aim_tlvlist_add_raw(&tlvlist, 0x0006, length, chipsahoy);
 	aim_tlvlist_write(&frame->data, &tlvlist);
 	aim_tlvlist_free(tlvlist);
@@ -72,6 +72,37 @@ flap_connection_send_version_with_cookie(OscarData *od, FlapConnection *conn, gu
 	flap_connection_send(conn, frame);
 }
 
+void
+flap_connection_send_version_with_cookie_and_clientinfo(OscarData *od, FlapConnection *conn, guint16 length, const guint8 *chipsahoy, ClientInfo *ci)
+{
+	FlapFrame *frame;
+	GSList *tlvlist = NULL;
+
+	frame = flap_frame_new(od, 0x01, 1152 + length);
+
+	byte_stream_put32(&frame->data, 0x00000001); /* FLAP Version */
+	aim_tlvlist_add_raw(&tlvlist, 0x0006, length, chipsahoy);
+
+	if (ci->clientstring != NULL)
+		aim_tlvlist_add_str(&tlvlist, 0x0003, ci->clientstring);
+	else {
+		gchar *clientstring = oscar_get_clientstring();
+		aim_tlvlist_add_str(&tlvlist, 0x0003, clientstring);
+		g_free(clientstring);
+	}
+	aim_tlvlist_add_16(&tlvlist, 0x0017, (guint16)ci->major);
+	aim_tlvlist_add_16(&tlvlist, 0x0018, (guint16)ci->minor);
+	aim_tlvlist_add_16(&tlvlist, 0x0019, (guint16)ci->point);
+	aim_tlvlist_add_16(&tlvlist, 0x001a, (guint16)ci->build);
+	aim_tlvlist_add_8(&tlvlist, 0x004a, 0x01);
+
+	aim_tlvlist_write(&frame->data, &tlvlist);
+
+	aim_tlvlist_free(tlvlist);
+
+	flap_connection_send(conn, frame);
+}
+
 static struct rateclass *
 flap_connection_get_rateclass(FlapConnection *conn, guint16 family, guint16 subtype)
 {
@@ -355,23 +386,9 @@ flap_connection_close(OscarData *od, FlapConnection *conn)
 		}
 	}
 
-	if (conn->fd >= 0)
-	{
-		if (conn->type == SNAC_FAMILY_LOCATE)
-			flap_connection_send_close(od, conn);
-
-		close(conn->fd);
-		conn->fd = -1;
-	}
-
-	if (conn->gsc != NULL)
-	{
-		if (conn->type == SNAC_FAMILY_LOCATE)
-			flap_connection_send_close(od, conn);
-
-		purple_ssl_close(conn->gsc);
-		conn->gsc = NULL;
-	}
+	if ((conn->fd >= 0 || conn->gsc != NULL)
+			&& conn->type == SNAC_FAMILY_LOCATE)
+		flap_connection_send_close(od, conn);
 
 	if (conn->watcher_incoming != 0)
 	{
@@ -385,6 +402,18 @@ flap_connection_close(OscarData *od, FlapConnection *conn)
 		conn->watcher_outgoing = 0;
 	}
 
+	if (conn->fd >= 0)
+	{
+		close(conn->fd);
+		conn->fd = -1;
+	}
+
+	if (conn->gsc != NULL)
+	{
+		purple_ssl_close(conn->gsc);
+		conn->gsc = NULL;
+	}
+
 	g_free(conn->buffer_incoming.data.data);
 	conn->buffer_incoming.data.data = NULL;
 
@@ -445,18 +474,18 @@ flap_connection_destroy_cb(gpointer data)
 
 		if (conn->disconnect_code == 0x0001) {
 			reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE;
-			tmp = g_strdup(_("You have signed on from another location."));
+			tmp = g_strdup(_("You have signed on from another location"));
 			if (!purple_account_get_remember_password(account))
 				purple_account_set_password(account, NULL);
 		} else if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
-			tmp = g_strdup(_("Server closed the connection."));
+			tmp = g_strdup(_("Server closed the connection"));
 		else if (conn->disconnect_reason == OSCAR_DISCONNECT_LOST_CONNECTION)
-			tmp = g_strdup_printf(_("Lost connection with server:\n%s"),
+			tmp = g_strdup_printf(_("Lost connection with server: %s"),
 					conn->error_message);
 		else if (conn->disconnect_reason == OSCAR_DISCONNECT_INVALID_DATA)
-			tmp = g_strdup(_("Received invalid data on connection with server."));
+			tmp = g_strdup(_("Received invalid data on connection with server"));
 		else if (conn->disconnect_reason == OSCAR_DISCONNECT_COULD_NOT_CONNECT)
-			tmp = g_strdup_printf(_("Could not establish a connection with the server:\n%s"),
+			tmp = g_strdup_printf(_("Unable to connect: %s"),
 					conn->error_message);
 		else
 			/*
@@ -476,7 +505,6 @@ flap_connection_destroy_cb(gpointer data)
 
 	g_free(conn->error_message);
 	g_free(conn->cookie);
-	g_free(conn->ssl_cert_cn);
 
 	/*
 	 * Free conn->internal, if necessary
@@ -1029,7 +1057,7 @@ send_cb(gpointer data, gint source, PurpleInputCondition cond)
 		ret = send(conn->fd, conn->buffer_outgoing->outptr, writelen, 0);
 	if (ret <= 0)
 	{
-		if (ret < 0 && ((errno == EAGAIN) || (errno == EWOULDBLOCK)))
+		if (ret < 0 && (errno == EAGAIN || errno == EWOULDBLOCK))
 			/* No worries */
 			return;
 
diff --git a/libpurple/protocols/oscar/libaim.c b/libpurple/protocols/oscar/libaim.c
index ead36b3538..5e8579a0de 100644
--- a/libpurple/protocols/oscar/libaim.c
+++ b/libpurple/protocols/oscar/libaim.c
@@ -95,9 +95,10 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,					/* unregister_user */
 	NULL,					/* send_attention */
 	NULL,					/* get_attention_types */
-
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	NULL,					/* get_account_text_table */
+	NULL,					/* initiate_media */
+	NULL					/* can_do_media */
 };
 
 static PurplePluginInfo info =
diff --git a/libpurple/protocols/oscar/libicq.c b/libpurple/protocols/oscar/libicq.c
index fae6fd2b64..0de97bc145 100644
--- a/libpurple/protocols/oscar/libicq.c
+++ b/libpurple/protocols/oscar/libicq.c
@@ -107,6 +107,8 @@ static PurplePluginProtocolInfo prpl_info =
 
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	icq_get_account_text_table, /* get_account_text_table */
+	NULL,					/* initiate_media */
+	NULL					/* can_do_media */
 };
 
 static PurplePluginInfo info =
diff --git a/libpurple/protocols/oscar/odc.c b/libpurple/protocols/oscar/odc.c
index 8c02578972..d640ea6fa8 100644
--- a/libpurple/protocols/oscar/odc.c
+++ b/libpurple/protocols/oscar/odc.c
@@ -48,7 +48,7 @@ peer_odc_close(PeerConnection *conn)
 	else if (conn->disconnect_reason == OSCAR_DISCONNECT_INVALID_DATA)
 		tmp = g_strdup(_("Received invalid data on connection with remote user."));
 	else if (conn->disconnect_reason == OSCAR_DISCONNECT_COULD_NOT_CONNECT)
-		tmp = g_strdup(_("Could not establish a connection with the remote user."));
+		tmp = g_strdup(_("Unable to establish a connection with the remote user."));
 	else
 		/*
 		 * We shouldn't print a message for some disconnect_reasons.
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index 661c7f9786..df57f4de52 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -145,9 +145,12 @@ static const char * const msgerrreason[] = {
 static const int msgerrreasonlen = G_N_ELEMENTS(msgerrreason);
 
 /* All the libfaim->purple callback functions */
+
+/* Only used when connecting with the old-style BUCP login */
 static int purple_parse_auth_resp  (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_login      (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_auth_securid_request(OscarData *, FlapConnection *, FlapFrame *, ...);
+
 static int purple_handle_redirect  (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_info_change      (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_account_confirm  (OscarData *, FlapConnection *, FlapFrame *, ...);
@@ -157,7 +160,6 @@ static int purple_parse_incoming_im(OscarData *, FlapConnection *, FlapFrame *,
 static int purple_parse_misses     (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_clientauto (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_userinfo   (OscarData *, FlapConnection *, FlapFrame *, ...);
-static int purple_got_infoblock    (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_motd       (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_chatnav_info     (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_conv_chat_join        (OscarData *, FlapConnection *, FlapFrame *, ...);
@@ -204,7 +206,6 @@ static void purple_icons_fetch(PurpleConnection *gc);
 void oscar_set_info(PurpleConnection *gc, const char *info);
 static void oscar_set_info_and_status(PurpleAccount *account, gboolean setinfo, const char *rawinfo, gboolean setstatus, PurpleStatus *status);
 static void oscar_set_extendedstatus(PurpleConnection *gc);
-static void oscar_format_username(PurpleConnection *gc, const char *nick);
 static gboolean purple_ssi_rerequestdata(gpointer data);
 
 static void oscar_free_name_data(struct name_data *data) {
@@ -810,24 +811,24 @@ static void oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUser
 
 	od = purple_connection_get_protocol_data(gc);
 
-	if (userinfo == NULL)
-		userinfo = aim_locate_finduserinfo(od, purple_buddy_get_name(b));
-
-	if ((user_info == NULL) || ((b == NULL) && (userinfo == NULL)))
+	if (b == NULL && userinfo == NULL)
 		return;
 
 	if (b == NULL)
 		b = purple_find_buddy(purple_connection_get_account(gc), userinfo->bn);
+	else
+		userinfo = aim_locate_finduserinfo(od, purple_buddy_get_name(b));
 
 	if (b) {
 		presence = purple_buddy_get_presence(b);
 		status = purple_presence_get_active_status(presence);
+	}
 
-		message = g_strdup(purple_status_get_attr_string(status, "message"));
-		itmsurl = g_strdup(purple_status_get_attr_string(status, "itmsurl"));
-
-	} else {
-		/* This is an OSCAR contact for whom we don't have a PurpleBuddy but do have information. */
+	/* If we have both b and userinfo we favor userinfo, because if we're
+	   viewing someone's profile then we want the HTML away message, and
+	   the "message" attribute of the status contains only the plaintext
+	   message. */
+	if (userinfo) {
 		if ((userinfo->flags & AIM_FLAG_AWAY)) {
 			/* Away message? */
 			if ((userinfo->flags & AIM_FLAG_AWAY) && (userinfo->away_len > 0) && (userinfo->away != NULL) && (userinfo->away_encoding != NULL)) {
@@ -848,6 +849,9 @@ static void oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUser
 												 userinfo->itmsurl, userinfo->itmsurl_len);
 #endif
 		}
+	} else {
+		message = g_strdup(purple_status_get_attr_string(status, "message"));
+		itmsurl = g_strdup(purple_status_get_attr_string(status, "itmsurl"));
 	}
 
 	is_away = ((status && !purple_status_is_available(status)) ||
@@ -870,11 +874,11 @@ static void oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUser
 		if (itmsurl) {
 			tmp = g_strdup_printf("<a href=\"%s\">%s</a>",
 								  itmsurl, message);
-			g_free(itmsurl);
 			g_free(message);
 			message = tmp;
 		}
 	}
+	g_free(itmsurl);
 
 	if (is_away && message) {
 		tmp = purple_str_sub_away_formatters(message, purple_account_get_username(account));
@@ -914,7 +918,6 @@ static void oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUser
 			g_free(message);
 			message = g_strdup(_("Offline"));
 		}
-
 	}
 
 	purple_notify_user_info_add_pair(user_info, _("Status"), message);
@@ -930,7 +933,7 @@ static void oscar_user_info_append_extra_info(PurpleConnection *gc, PurpleNotify
 	PurpleGroup *g = NULL;
 	struct buddyinfo *bi = NULL;
 	char *tmp;
-	const char *bname, *gname = NULL;
+	const char *bname = NULL, *gname = NULL;
 
 	od = purple_connection_get_protocol_data(gc);
 	account = purple_connection_get_account(gc);
@@ -938,14 +941,14 @@ static void oscar_user_info_append_extra_info(PurpleConnection *gc, PurpleNotify
 	if ((user_info == NULL) || ((b == NULL) && (userinfo == NULL)))
 		return;
 
-	bname = purple_buddy_get_name(b);
 	if (userinfo == NULL)
-		userinfo = aim_locate_finduserinfo(od, bname);
+		userinfo = aim_locate_finduserinfo(od, purple_buddy_get_name(b));
 
 	if (b == NULL)
 		b = purple_find_buddy(account, userinfo->bn);
 
 	if (b != NULL) {
+		bname = purple_buddy_get_name(b);
 		g = purple_buddy_get_group(b);
 		gname = purple_group_get_name(g);
 		presence = purple_buddy_get_presence(b);
@@ -1107,8 +1110,9 @@ connection_common_error_cb(FlapConnection *conn, const gchar *error_message)
 
 	if (conn->type == SNAC_FAMILY_AUTH)
 	{
+		/* This only happens when connecting with the old-style BUCP login */
 		gchar *msg;
-		msg = g_strdup_printf(_("Could not connect to authentication server:\n%s"),
+		msg = g_strdup_printf(_("Unable to connect to authentication server: %s"),
 				error_message);
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -1116,7 +1120,7 @@ connection_common_error_cb(FlapConnection *conn, const gchar *error_message)
 	else if (conn->type == SNAC_FAMILY_LOCATE)
 	{
 		gchar *msg;
-		msg = g_strdup_printf(_("Could not connect to BOS server:\n%s"),
+		msg = g_strdup_printf(_("Unable to connect to BOS server: %s"),
 				error_message);
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -1152,14 +1156,26 @@ connection_common_established_cb(FlapConnection *conn)
 		flap_connection_send_version(od, conn);
 	else
 	{
-		flap_connection_send_version_with_cookie(od, conn,
-				conn->cookielen, conn->cookie);
+		if (purple_account_get_bool(account, "use_clientlogin", OSCAR_DEFAULT_USE_CLIENTLOGIN))
+		{
+			ClientInfo aiminfo = CLIENTINFO_PURPLE_AIM;
+			ClientInfo icqinfo = CLIENTINFO_PURPLE_ICQ;
+			flap_connection_send_version_with_cookie_and_clientinfo(od,
+					conn, conn->cookielen, conn->cookie,
+					od->icq ? &icqinfo : &aiminfo);
+		} else {
+			flap_connection_send_version_with_cookie(od, conn,
+					conn->cookielen, conn->cookie);
+		}
+
+
 		g_free(conn->cookie);
 		conn->cookie = NULL;
 	}
 
 	if (conn->type == SNAC_FAMILY_AUTH)
 	{
+		/* This only happens when connecting with the old-style BUCP login */
 		aim_request_login(od, conn, purple_account_get_username(account));
 		purple_debug_info("oscar", "Username sent, waiting for response\n");
 		purple_connection_update_progress(gc, _("Username sent"), 1, OSCAR_CONNECT_STEPS);
@@ -1231,32 +1247,6 @@ ssl_connection_error_cb(PurpleSslConnection *gsc, PurpleSslErrorType error,
 }
 
 static void
-ssl_proxy_conn_established_cb(gpointer data, gint source, const gchar *error_message)
-{
-	OscarData *od;
-	PurpleConnection *gc;
-	PurpleAccount *account;
-	FlapConnection *conn;
-
-	conn = data;
-	od = conn->od;
-	gc = od->gc;
-	account = purple_connection_get_account(gc);
-
-	conn->connect_data = NULL;
-
-	if (source < 0)
-	{
-		connection_common_error_cb(conn, error_message);
-		return;
-	}
-
-	conn->gsc = purple_ssl_connect_with_host_fd(account, source,
-			ssl_connection_established_cb, ssl_connection_error_cb,
-			conn->ssl_cert_cn, conn);
-}
-
-static void
 flap_connection_established_bos(OscarData *od, FlapConnection *conn)
 {
 	PurpleConnection *gc = od->gc;
@@ -1268,7 +1258,7 @@ flap_connection_established_bos(OscarData *od, FlapConnection *conn)
 	aim_ssi_reqdata(od);
 	if (od->getblisttimer > 0)
 		purple_timeout_remove(od->getblisttimer);
-	od->getblisttimer = purple_timeout_add(30000, purple_ssi_rerequestdata, od);
+	od->getblisttimer = purple_timeout_add_seconds(30, purple_ssi_rerequestdata, od);
 
 	aim_locate_reqrights(od);
 	aim_buddylist_reqrights(od, conn);
@@ -1430,7 +1420,6 @@ oscar_login(PurpleAccount *account)
 {
 	PurpleConnection *gc;
 	OscarData *od;
-	FlapConnection *newconn;
 
 	gc = purple_account_get_connection(account);
 	od = oscar_data_new();
@@ -1445,9 +1434,12 @@ oscar_login(PurpleAccount *account)
 	oscar_data_addhandler(od, SNAC_FAMILY_ADMIN, 0x0007, purple_account_confirm, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_ALERT, 0x0001, purple_parse_genericerr, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_ALERT, SNAC_SUBTYPE_ALERT_MAILSTATUS, purple_email_parseupdate, 0);
+
+	/* These are only needed when connecting with the old-style BUCP login */
 	oscar_data_addhandler(od, SNAC_FAMILY_AUTH, 0x0003, purple_parse_auth_resp, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_AUTH, 0x0007, purple_parse_login, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_AUTH, SNAC_SUBTYPE_AUTH_SECURID_REQUEST, purple_parse_auth_securid_request, 0);
+
 	oscar_data_addhandler(od, SNAC_FAMILY_BART, SNAC_SUBTYPE_BART_RESPONSE, purple_icon_parseicon, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_BOS, 0x0001, purple_parse_genericerr, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_BOS, 0x0003, purple_bosrights, 0);
@@ -1487,7 +1479,6 @@ oscar_login(PurpleAccount *account)
 	oscar_data_addhandler(od, SNAC_FAMILY_LOCATE, SNAC_SUBTYPE_LOCATE_RIGHTSINFO, purple_parse_locaterights, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_LOCATE, SNAC_SUBTYPE_LOCATE_USERINFO, purple_parse_userinfo, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_LOCATE, SNAC_SUBTYPE_LOCATE_ERROR, purple_parse_locerr, 0);
-	oscar_data_addhandler(od, SNAC_FAMILY_LOCATE, SNAC_SUBTYPE_LOCATE_GOTINFOBLOCK, purple_got_infoblock, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_OSERVICE, 0x0001, purple_parse_genericerr, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_OSERVICE, 0x000f, purple_selfinfo, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_OSERVICE, 0x001f, purple_memrequest, 0);
@@ -1504,7 +1495,7 @@ oscar_login(PurpleAccount *account)
 
 	if (!oscar_util_valid_name(purple_account_get_username(account))) {
 		gchar *buf;
-		buf = g_strdup_printf(_("Unable to login: Could not sign on as %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."), purple_account_get_username(account));
+		buf = g_strdup_printf(_("Unable to sign on as %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."), purple_account_get_username(account));
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, buf);
 		g_free(buf);
 		return;
@@ -1517,16 +1508,40 @@ oscar_login(PurpleAccount *account)
 		gc->flags |= PURPLE_CONNECTION_AUTO_RESP;
 	}
 
+	od->default_port = purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT);
 	od->use_ssl = purple_account_get_bool(account, "use_ssl", OSCAR_DEFAULT_USE_SSL);
 
 	/* Connect to core Purple signals */
 	purple_prefs_connect_callback(gc, "/purple/away/idle_reporting", idle_reporting_pref_cb, gc);
 	purple_prefs_connect_callback(gc, "/plugins/prpl/oscar/recent_buddies", recent_buddies_pref_cb, gc);
 
-	newconn = flap_connection_new(od, SNAC_FAMILY_AUTH);
-	if (od->use_ssl) {
-		if (purple_ssl_is_supported()) {
-			const char *server = purple_account_get_string(account, "server", OSCAR_DEFAULT_SSL_LOGIN_SERVER);
+	/*
+	 * On 2008-03-05 AOL released some documentation on the OSCAR protocol
+	 * which includes a new login method called clientLogin.  It is similar
+	 * (though not the same?) as what the AIM 6.0 series uses to
+	 * authenticate.
+	 *
+	 * AIM 5.9 and lower use an MD5-based login procedure called "BUCP".
+	 * This authentication method is used for both ICQ and AIM when
+	 * clientLogin is not enabled.
+	 */
+	if (purple_account_get_bool(account, "use_clientlogin", OSCAR_DEFAULT_USE_CLIENTLOGIN)) {
+		send_client_login(od, purple_account_get_username(account));
+	} else {
+		FlapConnection *newconn;
+		const char *server;
+
+		newconn = flap_connection_new(od, SNAC_FAMILY_AUTH);
+
+		if (od->use_ssl) {
+			if (!purple_ssl_is_supported()) {
+				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+						_("SSL support unavailable"));
+				return;
+			}
+
+			server = purple_account_get_string(account, "server", OSCAR_DEFAULT_SSL_LOGIN_SERVER);
+
 			/*
 			 * If the account's server is what the oscar prpl has offered as
 			 * the default login server through the vast eons (all two of
@@ -1544,32 +1559,29 @@ oscar_login(PurpleAccount *account)
 					purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT),
 					ssl_connection_established_cb, ssl_connection_error_cb, newconn);
 		} else {
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
-					_("SSL support unavailable"));
-		}
-	} else {
-		const char *server = purple_account_get_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER);
+			server = purple_account_get_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER);
 
-		/*
-		 * See the comment above. We do the reverse here. If they don't want
-		 * SSL but their server is set to OSCAR_DEFAULT_SSL_LOGIN_SERVER,
-		 * set it back to the default.
-		 */
-		if (!strcmp(server, OSCAR_DEFAULT_SSL_LOGIN_SERVER)) {
-			purple_debug_info("oscar", "Account does not use SSL, so changing server back to non-SSL\n");
-			purple_account_set_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER);
-			server = OSCAR_DEFAULT_LOGIN_SERVER;
-		}
+			/*
+			 * See the comment above. We do the reverse here. If they don't want
+			 * SSL but their server is set to OSCAR_DEFAULT_SSL_LOGIN_SERVER,
+			 * set it back to the default.
+			 */
+			if (!strcmp(server, OSCAR_DEFAULT_SSL_LOGIN_SERVER)) {
+				purple_debug_info("oscar", "Account does not use SSL, so changing server back to non-SSL\n");
+				purple_account_set_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER);
+				server = OSCAR_DEFAULT_LOGIN_SERVER;
+			}
 
-		newconn->connect_data = purple_proxy_connect(NULL, account, server,
-				purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT),
-				connection_established_cb, newconn);
-	}
+			newconn->connect_data = purple_proxy_connect(NULL, account, server,
+					purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT),
+					connection_established_cb, newconn);
+		}
 
-	if (newconn->gsc == NULL && newconn->connect_data == NULL) {
-		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Couldn't connect to host"));
-		return;
+		if (newconn->gsc == NULL && newconn->connect_data == NULL) {
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+					_("Unable to connect"));
+			return;
+		}
 	}
 
 	purple_connection_update_progress(gc, _("Connecting"), 0, OSCAR_CONNECT_STEPS);
@@ -1604,165 +1616,6 @@ oscar_close(PurpleConnection *gc)
 	purple_debug_info("oscar", "Signed off.\n");
 }
 
-static int
-purple_parse_auth_resp(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
-{
-	PurpleConnection *gc = od->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	char *host; int port;
-	int i;
-	FlapConnection *newconn;
-	va_list ap;
-	struct aim_authresp_info *info;
-
-	port = purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT);
-
-	va_start(ap, fr);
-	info = va_arg(ap, struct aim_authresp_info *);
-	va_end(ap);
-
-	purple_debug_info("oscar",
-			   "inside auth_resp (Username: %s)\n", info->bn);
-
-	if (info->errorcode || !info->bosip || !info->cookielen || !info->cookie) {
-		char buf[256];
-		switch (info->errorcode) {
-		case 0x01:
-			/* Unregistered username */
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_INVALID_USERNAME, _("Invalid username."));
-			break;
-		case 0x05:
-			/* Incorrect password */
-			if (!purple_account_get_remember_password(account))
-				purple_account_set_password(account, NULL);
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Incorrect password."));
-			break;
-		case 0x11:
-			/* Suspended account */
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Your account is currently suspended."));
-			break;
-		case 0x02:
-		case 0x14:
-			/* service temporarily unavailable */
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("The AOL Instant Messenger service is temporarily unavailable."));
-			break;
-		case 0x18:
-			/* username connecting too frequently */
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, _("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."));
-			break;
-		case 0x1c:
-		{
-			/* client too old */
-			GHashTable *ui_info = purple_core_get_ui_info();
-			g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"),
-					   ((ui_info && g_hash_table_lookup(ui_info, "website")) ? (char *)g_hash_table_lookup(ui_info, "website") : PURPLE_WEBSITE));
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, buf);
-			break;
-		}
-		case 0x1d:
-			/* IP address connecting too frequently */
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, _("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."));
-			break;
-		default:
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Authentication failed"));
-			break;
-		}
-		purple_debug_info("oscar", "Login Error Code 0x%04hx\n", info->errorcode);
-		purple_debug_info("oscar", "Error URL: %s\n", info->errorurl ? info->errorurl : "");
-		return 1;
-	}
-
-	purple_debug_misc("oscar", "Reg status: %hu\n"
-							   "Email: %s\n"
-							   "BOSIP: %s\n",
-							   info->regstatus,
-							   info->email ? info->email : "null",
-							   info->bosip ? info->bosip : "null");
-	purple_debug_info("oscar", "Closing auth connection...\n");
-	flap_connection_schedule_destroy(conn, OSCAR_DISCONNECT_DONE, NULL);
-
-	for (i = 0; i < strlen(info->bosip); i++) {
-		if (info->bosip[i] == ':') {
-			port = atoi(&(info->bosip[i+1]));
-			break;
-		}
-	}
-	host = g_strndup(info->bosip, i);
-	newconn = flap_connection_new(od, SNAC_FAMILY_LOCATE);
-	newconn->cookielen = info->cookielen;
-	newconn->cookie = g_memdup(info->cookie, info->cookielen);
-
-	if (od->use_ssl)
-	{
-		/*
-		 * This shouldn't be hardcoded except that the server isn't sending
-		 * us a name to use for comparing the certificate common name.
-		 */
-		newconn->ssl_cert_cn = g_strdup("bos.oscar.aol.com");
-		newconn->connect_data = purple_proxy_connect(NULL, account, host, port,
-				ssl_proxy_conn_established_cb, newconn);
-	}
-	else
-	{
-		newconn->connect_data = purple_proxy_connect(NULL, account, host, port,
-				connection_established_cb, newconn);
-	}
-
-	g_free(host);
-	if (newconn->connect_data == NULL)
-	{
-		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could Not Connect"));
-		return 0;
-	}
-
-	purple_connection_update_progress(gc, _("Received authorization"), 3, OSCAR_CONNECT_STEPS);
-	ck[3] = 0x64;
-
-	return 1;
-}
-
-static void
-purple_parse_auth_securid_request_yes_cb(gpointer user_data, const char *msg)
-{
-	PurpleConnection *gc = user_data;
-	OscarData *od = purple_connection_get_protocol_data(gc);
-
-	aim_auth_securid_send(od, msg);
-}
-
-static void
-purple_parse_auth_securid_request_no_cb(gpointer user_data, const char *value)
-{
-	PurpleConnection *gc = user_data;
-
-	/* Disconnect */
-	purple_connection_error_reason(gc,
-		PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
-		_("The SecurID key entered is invalid."));
-}
-
-static int
-purple_parse_auth_securid_request(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
-{
-	PurpleConnection *gc = od->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	gchar *primary;
-
-	purple_debug_info("oscar", "Got SecurID request\n");
-
-	primary = g_strdup_printf("Enter the SecurID key for %s.", purple_account_get_username(account));
-	purple_request_input(gc, NULL, _("Enter SecurID"), primary,
-					   _("Enter the 6 digit number from the digital display."),
-					   FALSE, FALSE, NULL,
-					   _("_OK"), G_CALLBACK(purple_parse_auth_securid_request_yes_cb),
-					   _("_Cancel"), G_CALLBACK(purple_parse_auth_securid_request_no_cb),
-					   account, NULL, NULL,
-					   gc);
-	g_free(primary);
-
-	return 1;
-}
-
 /* XXX - Should use purple_util_fetch_url for the below stuff */
 struct pieceofcrap {
 	PurpleConnection *gc;
@@ -1794,10 +1647,9 @@ static void damn_you(gpointer data, gint source, PurpleInputCondition c)
 	}
 	if (in != '\n') {
 		char buf[256];
-		GHashTable *ui_info = purple_core_get_ui_info();
 		g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly.  "
 				"If so, check %s for updates."),
-				((ui_info && g_hash_table_lookup(ui_info, "website")) ? (char *)g_hash_table_lookup(ui_info, "website") : PURPLE_WEBSITE));
+				oscar_get_ui_info_string("website", PURPLE_WEBSITE));
 		purple_notify_warning(pos->gc, NULL,
 							_("Unable to get a valid AIM login hash."),
 							buf);
@@ -1833,20 +1685,12 @@ straight_to_hell(gpointer data, gint source, const gchar *error_message)
 	gchar *buf;
 	gssize result;
 
-	if (!PURPLE_CONNECTION_IS_VALID(pos->gc))
-	{
-		g_free(pos->modname);
-		g_free(pos);
-		return;
-	}
-
 	pos->fd = source;
 
 	if (source < 0) {
-		GHashTable *ui_info = purple_core_get_ui_info();
 		buf = g_strdup_printf(_("You may be disconnected shortly.  "
-				"Check %s for updates."),
-				((ui_info && g_hash_table_lookup(ui_info, "website")) ? (char *)g_hash_table_lookup(ui_info, "website") : PURPLE_WEBSITE));
+				"If so, check %s for updates."),
+				oscar_get_ui_info_string("website", PURPLE_WEBSITE));
 		purple_notify_warning(pos->gc, NULL,
 							_("Unable to get a valid AIM login hash."),
 							buf);
@@ -1879,7 +1723,8 @@ straight_to_hell(gpointer data, gint source, const gchar *error_message)
 /* size of icbmui.ocm, the largest module in AIM 3.5 */
 #define AIM_MAX_FILE_SIZE 98304
 
-int purple_memrequest(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
+static int purple_memrequest(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
+{
 	va_list ap;
 	struct pieceofcrap *pos;
 	guint32 offset, len;
@@ -1937,18 +1782,16 @@ int purple_memrequest(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
 	pos->len = len;
 	pos->modname = g_strdup(modname);
 
-	/* TODO: Keep track of this return value. */
-	if (purple_proxy_connect(NULL, pos->gc->account, "pidgin.im", 80,
+	if (purple_proxy_connect(pos->gc, pos->gc->account, "pidgin.im", 80,
 			straight_to_hell, pos) == NULL)
 	{
 		char buf[256];
-		GHashTable *ui_info = purple_core_get_ui_info();
 		g_free(pos->modname);
 		g_free(pos);
 
 		g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly.  "
-			"Check %s for updates."),
-			((ui_info && g_hash_table_lookup(ui_info, "website")) ? (char *)g_hash_table_lookup(ui_info, "website") : PURPLE_WEBSITE));
+			"If so, check %s for updates."),
+			oscar_get_ui_info_string("website", PURPLE_WEBSITE));
 		purple_notify_warning(pos->gc, NULL,
 							_("Unable to get a valid login hash."),
 							buf);
@@ -1957,6 +1800,204 @@ int purple_memrequest(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
 	return 1;
 }
 
+int oscar_connect_to_bos(PurpleConnection *gc, OscarData *od, const char *host, guint16 port, guint8 *cookie, guint16 cookielen)
+{
+	FlapConnection *conn;
+
+	conn = flap_connection_new(od, SNAC_FAMILY_LOCATE);
+	conn->cookielen = cookielen;
+	conn->cookie = g_memdup(cookie, cookielen);
+	conn->connect_data = purple_proxy_connect(NULL,
+			purple_connection_get_account(gc), host, port,
+			connection_established_cb, conn);
+	if (conn->connect_data == NULL)
+	{
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Unable to connect"));
+		return 0;
+	}
+
+	od->default_port = port;
+
+	purple_connection_update_progress(gc, _("Received authorization"), 3, OSCAR_CONNECT_STEPS);
+	ck[3] = 0x64;
+
+	return 1;
+}
+
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
+static int
+purple_parse_auth_resp(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
+{
+	PurpleConnection *gc = od->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
+	char *host; int port;
+	int i;
+	FlapConnection *newconn;
+	va_list ap;
+	struct aim_authresp_info *info;
+
+	port = purple_account_get_int(account, "port", od->default_port);
+
+	va_start(ap, fr);
+	info = va_arg(ap, struct aim_authresp_info *);
+	va_end(ap);
+
+	purple_debug_info("oscar",
+			   "inside auth_resp (Username: %s)\n", info->bn);
+
+	if (info->errorcode || !info->bosip || !info->cookielen || !info->cookie) {
+		char buf[256];
+		switch (info->errorcode) {
+		case 0x01:
+			/* Unregistered username */
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_INVALID_USERNAME, _("Username does not exist"));
+			break;
+		case 0x05:
+			/* Incorrect password */
+			if (!purple_account_get_remember_password(account))
+				purple_account_set_password(account, NULL);
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Incorrect password"));
+			break;
+		case 0x11:
+			/* Suspended account */
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Your account is currently suspended"));
+			break;
+		case 0x02:
+		case 0x14:
+			/* service temporarily unavailable */
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("The AOL Instant Messenger service is temporarily unavailable."));
+			break;
+		case 0x18:
+			/* username connecting too frequently */
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, _("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."));
+			break;
+		case 0x1c:
+		{
+			/* client too old */
+			g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"),
+					oscar_get_ui_info_string("website", PURPLE_WEBSITE));
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, buf);
+			break;
+		}
+		case 0x1d:
+			/* IP address connecting too frequently */
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, _("You have been connecting and disconnecting too frequently. Wait a minute and try again. If you continue to try, you will need to wait even longer."));
+			break;
+		default:
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Unknown reason"));
+			break;
+		}
+		purple_debug_info("oscar", "Login Error Code 0x%04hx\n", info->errorcode);
+		purple_debug_info("oscar", "Error URL: %s\n", info->errorurl ? info->errorurl : "");
+		return 1;
+	}
+
+	purple_debug_misc("oscar", "Reg status: %hu\n"
+							   "Email: %s\n"
+							   "BOSIP: %s\n",
+							   info->regstatus,
+							   info->email ? info->email : "null",
+							   info->bosip ? info->bosip : "null");
+	purple_debug_info("oscar", "Closing auth connection...\n");
+	flap_connection_schedule_destroy(conn, OSCAR_DISCONNECT_DONE, NULL);
+
+	for (i = 0; i < strlen(info->bosip); i++) {
+		if (info->bosip[i] == ':') {
+			port = atoi(&(info->bosip[i+1]));
+			break;
+		}
+	}
+	host = g_strndup(info->bosip, i);
+	newconn = flap_connection_new(od, SNAC_FAMILY_LOCATE);
+	newconn->cookielen = info->cookielen;
+	newconn->cookie = g_memdup(info->cookie, info->cookielen);
+
+	if (od->use_ssl)
+	{
+		/*
+		 * This shouldn't be hardcoded to "bos.oscar.aol.com" except that
+		 * the server isn't sending us a name to use for comparing the
+		 * certificate common name.
+		 */
+		newconn->gsc = purple_ssl_connect_with_ssl_cn(account, host, port,
+				ssl_connection_established_cb, ssl_connection_error_cb,
+				"bos.oscar.aol.com", newconn);
+	}
+	else
+	{
+		newconn->connect_data = purple_proxy_connect(NULL, account, host, port,
+				connection_established_cb, newconn);
+	}
+
+	g_free(host);
+	if (newconn->gsc == NULL && newconn->connect_data == NULL)
+	{
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Unable to connect"));
+		return 0;
+	}
+
+	purple_connection_update_progress(gc, _("Received authorization"), 3, OSCAR_CONNECT_STEPS);
+	ck[3] = 0x64;
+
+	return 1;
+}
+
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
+static void
+purple_parse_auth_securid_request_yes_cb(gpointer user_data, const char *msg)
+{
+	PurpleConnection *gc = user_data;
+	OscarData *od = purple_connection_get_protocol_data(gc);
+
+	aim_auth_securid_send(od, msg);
+}
+
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
+static void
+purple_parse_auth_securid_request_no_cb(gpointer user_data, const char *value)
+{
+	PurpleConnection *gc = user_data;
+
+	/* Disconnect */
+	purple_connection_error_reason(gc,
+		PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
+		_("The SecurID key entered is invalid"));
+}
+
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
+static int
+purple_parse_auth_securid_request(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
+{
+	PurpleConnection *gc = od->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
+	gchar *primary;
+
+	purple_debug_info("oscar", "Got SecurID request\n");
+
+	primary = g_strdup_printf("Enter the SecurID key for %s.", purple_account_get_username(account));
+	purple_request_input(gc, NULL, _("Enter SecurID"), primary,
+					   _("Enter the 6 digit number from the digital display."),
+					   FALSE, FALSE, NULL,
+					   _("_OK"), G_CALLBACK(purple_parse_auth_securid_request_yes_cb),
+					   _("_Cancel"), G_CALLBACK(purple_parse_auth_securid_request_no_cb),
+					   account, NULL, NULL,
+					   gc);
+	g_free(primary);
+
+	return 1;
+}
+
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
 static int
 purple_parse_login(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 {
@@ -2002,7 +2043,7 @@ purple_handle_redirect(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 	redir = va_arg(ap, struct aim_redirect_data *);
 	va_end(ap);
 
-	port = purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT);
+	port = od->default_port;
 	separator = strchr(redir->ip, ':');
 	if (separator != NULL)
 	{
@@ -2048,15 +2089,9 @@ purple_handle_redirect(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 
 	if (redir->use_ssl)
 	{
-		/*
-		 * TODO: It should be possible to specify a certificate common name
-		 * distinct from the host we're passing to purple_ssl_connect. The
-		 * way to work around that is to use purple_proxy_connect +
-		 * purple_ssl_connect_with_host_fd
-		 */
-		newconn->ssl_cert_cn = g_strdup(redir->ssl_cert_cn);
-		newconn->connect_data = purple_proxy_connect(NULL, account, host, port,
-				ssl_proxy_conn_established_cb, newconn);
+		newconn->gsc = purple_ssl_connect_with_ssl_cn(account, host, port,
+				ssl_connection_established_cb, ssl_connection_error_cb,
+				redir->ssl_cert_cn, newconn);
 	}
 	else
 	{
@@ -2104,6 +2139,23 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 	g_return_val_if_fail(info != NULL, 1);
 	g_return_val_if_fail(info->bn != NULL, 1);
 
+	/*
+	 * If this is an AIM buddy and their name has formatting, set their
+	 * server alias.
+	 */
+	if (!oscar_util_valid_name_icq(info->bn)) {
+		gboolean bn_has_formatting = FALSE;
+		char *c;
+		for (c = info->bn; *c != '\0'; c++) {
+			if (!islower(*c)) {
+				bn_has_formatting = TRUE;
+				break;
+			}
+		}
+		serv_got_alias(gc, info->bn,
+				bn_has_formatting ? info->bn : NULL);
+	}
+
 	if (info->present & AIM_USERINFO_PRESENT_FLAGS) {
 		if (info->flags & AIM_FLAG_AWAY)
 			buddy_is_away = TRUE;
@@ -2152,7 +2204,7 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 		message = oscar_encoding_to_utf8(account, info->status_encoding,
 										 info->status, info->status_len);
 
-	tmp2 = tmp = (message ? g_markup_escape_text(message, -1) : NULL);
+	tmp2 = tmp = (message ? purple_markup_escape_text(message, -1) : NULL);
 
 	if (strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE) == 0) {
 		if (info->itmsurl_encoding && info->itmsurl && info->itmsurl_len)
@@ -2835,9 +2887,15 @@ incomingim_chan4(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 			/* From libicq2000-0.3.2/src/ICQ.cpp */
 			byte_stream_init(&qbs, (guint8 *)args->msg, args->msglen);
 			byte_stream_advance(&qbs, 21);
+			/* expected:	01 00 00 20 00 0e 28 f6 00 11 e7 d3 11 bc f3 00 04 ac 96 9d c2 | 00 00 | 06 00 00 00 | 49 43 51 53 43 53 ...*/
+			/* unexpected:	00 00 26 00 81 1a 18 bc 0e 6c 18 47 a5 91 6f 18 dc c7 6f 1a | 00 00 | 0d 00 00 00 | 49 43 51 57 65 62 4d 65 73 73 61 67 65 ... */
 			smstype = byte_stream_getle16(&qbs);
+			if (smstype != 0)
+				break;
 			taglen = byte_stream_getle32(&qbs);
 			tagstr = byte_stream_getstr(&qbs, taglen);
+			if (tagstr == NULL)
+				break;
 			byte_stream_advance(&qbs, 3);
 			byte_stream_advance(&qbs, 4);
 			smslen = byte_stream_getle32(&qbs);
@@ -3246,7 +3304,7 @@ static int purple_parse_userinfo(OscarData *od, FlapConnection *conn, FlapFrame
 	oscar_user_info_append_extra_info(gc, user_info, NULL, userinfo);
 
 	if ((userinfo->present & AIM_USERINFO_PRESENT_ONLINESINCE) && !oscar_util_valid_name_sms(userinfo->bn)) {
-		/* An SMS contact is always online; its Online Since valid is not useful */
+		/* An SMS contact is always online; its Online Since value is not useful */
 		time_t t = userinfo->onlinesince;
 		oscar_user_info_add_pair(user_info, _("Online Since"), purple_date_format_full(localtime(&t)));
 	}
@@ -3289,55 +3347,6 @@ static int purple_parse_userinfo(OscarData *od, FlapConnection *conn, FlapFrame
 	return 1;
 }
 
-static int purple_got_infoblock(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
-{
-	PurpleConnection *gc = od->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	PurpleBuddy *b;
-	PurplePresence *presence;
-	PurpleStatus *status;
-	gchar *message = NULL;
-
-	va_list ap;
-	aim_userinfo_t *userinfo;
-
-	va_start(ap, fr);
-	userinfo = va_arg(ap, aim_userinfo_t *);
-	va_end(ap);
-
-	b = purple_find_buddy(account, userinfo->bn);
-	if (b == NULL)
-		return 1;
-
-	if (!oscar_util_valid_name_icq(userinfo->bn))
-	{
-		if (strcmp(purple_buddy_get_name(b), userinfo->bn) != 0)
-			serv_got_alias(gc, purple_buddy_get_name(b), userinfo->bn);
-		else
-			serv_got_alias(gc, purple_buddy_get_name(b), NULL);
-	}
-
-	presence = purple_buddy_get_presence(b);
-	status = purple_presence_get_active_status(presence);
-
-	if (purple_status_is_online(status) && !purple_status_is_available(status) &&
-			userinfo->flags & AIM_FLAG_AWAY && userinfo->away_len > 0 &&
-			userinfo->away != NULL && userinfo->away_encoding != NULL)
-	{
-		gchar *charset = oscar_encoding_extract(userinfo->away_encoding);
-		message = oscar_encoding_to_utf8(account, charset,
-		                                 userinfo->away,
-		                                 userinfo->away_len);
-		g_free(charset);
-		purple_prpl_got_user_status(account, userinfo->bn,
-				purple_status_get_id(status),
-				"message", message, NULL);
-		g_free(message);
-	}
-
-	return 1;
-}
-
 static int purple_parse_motd(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 {
 	char *msg;
@@ -3566,13 +3575,16 @@ static int purple_email_parseupdate(OscarData *od, FlapConnection *conn, FlapFra
 	alerturl  = va_arg(ap, char *);
 	va_end(ap);
 
-	if (account != NULL && emailinfo != NULL && emailinfo->unread && havenewmail) {
+	if (account != NULL && emailinfo != NULL && purple_account_get_check_mail(account) &&
+			emailinfo->unread && havenewmail) {
 		gchar *to = g_strdup_printf("%s%s%s",
 				purple_account_get_username(account),
 				emailinfo->domain ? "@" : "",
 				emailinfo->domain ? emailinfo->domain : "");
+		const char *tos[2] = { to };
+		const char *urls[2] = { emailinfo->url };
 		purple_notify_emails(gc, emailinfo->nummsgs, FALSE, NULL, NULL,
-				(const char **)&to, (const char **)&emailinfo->url, NULL, NULL);
+				tos, urls, NULL, NULL);
 		g_free(to);
 	}
 
@@ -3852,6 +3864,7 @@ static int purple_bosrights(OscarData *od, FlapConnection *conn, FlapFrame *fr,
 	PurpleConnection *gc;
 	PurpleAccount *account;
 	PurpleStatus *status;
+	gboolean is_available;
 	PurplePresence *presence;
 	const char *username, *message, *itmsurl;
 	char *tmp;
@@ -3892,13 +3905,14 @@ static int purple_bosrights(OscarData *od, FlapConnection *conn, FlapFrame *fr,
 
 	/* Set our available message based on the current status */
 	status = purple_account_get_active_status(account);
-	if (purple_status_is_available(status))
+	is_available = purple_status_is_available(status);
+	if (is_available)
 		message = purple_status_get_attr_string(status, "message");
 	else
 		message = NULL;
 	tmp = purple_markup_strip_html(message);
 	itmsurl = purple_status_get_attr_string(status, "itmsurl");
-	aim_srv_setextrainfo(od, FALSE, 0, TRUE, tmp, itmsurl);
+	aim_srv_setextrainfo(od, FALSE, 0, is_available, tmp, itmsurl);
 	g_free(tmp);
 
 	presence = purple_status_get_presence(status);
@@ -3917,20 +3931,9 @@ static int purple_bosrights(OscarData *od, FlapConnection *conn, FlapFrame *fr,
 			purple_account_get_bool(account, "web_aware", OSCAR_DEFAULT_WEB_AWARE));
 	}
 
+	aim_srv_requestnew(od, SNAC_FAMILY_ALERT);
 	aim_srv_requestnew(od, SNAC_FAMILY_CHATNAV);
 
-	/*
-	 * The "if" statement here is a pathetic attempt to not attempt to
-	 * connect to the alerts servce (aka email notification) if this
-	 * username does not support it.  I think mail notification
-	 * works for @mac.com accounts but does not work for the newer
-	 * @anythingelse.com accounts.  If that's true then this change
-	 * breaks mail notification for @mac.com accounts, but it gets rid
-	 * of an annoying error at signon for @anythingelse.com accounts.
-	 */
-	if (od->authinfo->email != NULL && strchr(username, '@') == NULL)
-		aim_srv_requestnew(od, SNAC_FAMILY_ALERT);
-
 	return 1;
 }
 
@@ -4433,7 +4436,8 @@ purple_odc_send_im(PeerConnection *conn, const char *message, PurpleMessageFlags
 	}
 	g_string_free(data, TRUE);
 
-	peer_odc_send_im(conn, msg->str, msg->len, charset, (imflags & PURPLE_MESSAGE_AUTO_RESP));
+	peer_odc_send_im(conn, msg->str, msg->len, charset,
+			imflags & PURPLE_MESSAGE_AUTO_RESP);
 	g_string_free(msg, TRUE);
 }
 
@@ -4738,16 +4742,17 @@ oscar_set_info_and_status(PurpleAccount *account, gboolean setinfo, const char *
 	PurpleStatusType *status_type;
 	PurpleStatusPrimitive primitive;
 
-	char *htmlinfo;
 	char *info_encoding = NULL;
 	char *info = NULL;
 	gsize infolen = 0;
 
-	const char *htmlaway;
 	char *away_encoding = NULL;
 	char *away = NULL;
 	gsize awaylen = 0;
 
+	char *status_text = NULL;
+	const char *itmsurl = NULL;
+
 	status_type = purple_status_get_type(status);
 	primitive = purple_status_type_get_primitive(status_type);
 
@@ -4765,7 +4770,7 @@ oscar_set_info_and_status(PurpleAccount *account, gboolean setinfo, const char *
 	}
 	else if (rawinfo != NULL)
 	{
-		htmlinfo = purple_strdup_withhtml(rawinfo);
+		char *htmlinfo = purple_strdup_withhtml(rawinfo);
 		info = purple_prpl_oscar_convert_to_infotext(htmlinfo, &infolen, &info_encoding);
 		g_free(htmlinfo);
 
@@ -4782,102 +4787,87 @@ oscar_set_info_and_status(PurpleAccount *account, gboolean setinfo, const char *
 		}
 	}
 
-	if (!setstatus)
-	{
-		/* Do nothing! */
-	}
-	else if (primitive == PURPLE_STATUS_AVAILABLE || primitive == PURPLE_STATUS_INVISIBLE)
+	if (setstatus)
 	{
-		const char *status_html, *itmsurl;
-		char *status_text = NULL;
+		const char *status_html;
 
 		status_html = purple_status_get_attr_string(status, "message");
-		if (status_html != NULL)
+
+		if (status_html == NULL || primitive == PURPLE_STATUS_AVAILABLE || primitive == PURPLE_STATUS_INVISIBLE)
 		{
-			status_text = purple_markup_strip_html(status_html);
-			/* If the status_text is longer than 251 characters then truncate it */
-			if (strlen(status_text) > MAXAVAILMSGLEN)
+			/* This is needed for us to un-set any previous away message. */
+			away = g_strdup("");
+		}
+		else
+		{
+			gchar *linkified;
+
+			/* We do this for icq too so that they work for old third party clients */
+			linkified = purple_markup_linkify(status_html);
+			away = purple_prpl_oscar_convert_to_infotext(linkified, &awaylen, &away_encoding);
+			g_free(linkified);
+
+			if (awaylen > od->rights.maxawaymsglen)
 			{
-				char *tmp = g_utf8_find_prev_char(status_text, &status_text[MAXAVAILMSGLEN - 2]);
-				strcpy(tmp, "...");
+				gchar *errstr;
+
+				errstr = g_strdup_printf(dngettext(PACKAGE, "The maximum away message length of %d byte "
+										 "has been exceeded.  It has been truncated for you.",
+										 "The maximum away message length of %d bytes "
+										 "has been exceeded.  It has been truncated for you.",
+										 od->rights.maxawaymsglen), od->rights.maxawaymsglen);
+				purple_notify_warning(gc, NULL, _("Away message too long."), errstr);
+				g_free(errstr);
 			}
 		}
-		itmsurl = purple_status_get_attr_string(status, "itmsurl");
+	}
 
-		aim_srv_setextrainfo(od, FALSE, 0, TRUE, status_text, itmsurl);
-		g_free(status_text);
+	aim_locate_setprofile(od,
+			info_encoding, info, MIN(infolen, od->rights.maxsiglen),
+			away_encoding, away, MIN(awaylen, od->rights.maxawaymsglen));
+	g_free(info);
+	g_free(away);
 
-		/* This is needed for us to un-set any previous away message. */
-		away = g_strdup("");
-	}
-	else
+	if (setstatus)
 	{
-		char *status_text = NULL;
-		
-		htmlaway = purple_status_get_attr_string(status, "message");
-		if ((htmlaway == NULL) || (*htmlaway == '\0'))
-			htmlaway = purple_status_type_get_name(status_type);
-		
-		/* ICQ 6.x seems to use an available message for all statuses so set one */
-		if (od->icq) 
+		const char *status_html;
+
+		status_html = purple_status_get_attr_string(status, "message");
+		if (od->icq && (status_html == NULL || status_html[0] == '\0'))
+			status_html = purple_status_type_get_name(status_type);
+		if (status_html != NULL)
 		{
-			status_text = purple_markup_strip_html(htmlaway);
+			status_text = purple_markup_strip_html(status_html);
 			/* If the status_text is longer than 251 characters then truncate it */
 			if (strlen(status_text) > MAXAVAILMSGLEN)
 			{
 				char *tmp = g_utf8_find_prev_char(status_text, &status_text[MAXAVAILMSGLEN - 2]);
 				strcpy(tmp, "...");
 			}
-			aim_srv_setextrainfo(od, FALSE, 0, TRUE, status_text, NULL);
 		}
-		g_free(status_text);
-
-		/* Set a proper away message for icq too so that they work for old third party clients */
-		
-		away = purple_prpl_oscar_convert_to_infotext(htmlaway, &awaylen, &away_encoding);
-
-		if (awaylen > od->rights.maxawaymsglen)
-		{
-			gchar *errstr;
 
-			errstr = g_strdup_printf(dngettext(PACKAGE, "The maximum away message length of %d byte "
-									 "has been exceeded.  It has been truncated for you.",
-									 "The maximum away message length of %d bytes "
-									 "has been exceeded.  It has been truncated for you.",
-									 od->rights.maxawaymsglen), od->rights.maxawaymsglen);
-			purple_notify_warning(gc, NULL, _("Away message too long."), errstr);
-			g_free(errstr);
-		}
-	}
+		itmsurl = purple_status_get_attr_string(status, "itmsurl");
 
-	if (setstatus)
+		/* TODO: Combine these two calls! */
+		aim_srv_setextrainfo(od, FALSE, 0, TRUE, status_text, itmsurl);
 		oscar_set_extendedstatus(gc);
-
-	aim_locate_setprofile(od, info_encoding, info, MIN(infolen, od->rights.maxsiglen),
-									away_encoding, away, MIN(awaylen, od->rights.maxawaymsglen));
-	g_free(info);
-	g_free(away);
+		g_free(status_text);
+	}
 }
 
 static void
-oscar_set_status_icq(PurpleAccount *account, PurpleStatus *status)
+oscar_set_status_icq(PurpleAccount *account)
 {
 	PurpleConnection *gc = purple_account_get_connection(account);
-	OscarData *od = NULL;
-
-	if (gc)
-		od = purple_connection_get_protocol_data(gc);
-	if (!od)
-		return;
 
-	if (purple_status_type_get_primitive(purple_status_get_type(status)) == PURPLE_STATUS_INVISIBLE)
-		account->perm_deny = PURPLE_PRIVACY_ALLOW_USERS;
-	else
-		account->perm_deny = PURPLE_PRIVACY_DENY_USERS;
-
-	if ((od->ssi.received_data) && (aim_ssi_getpermdeny(od->ssi.local) != account->perm_deny))
-		aim_ssi_setpermdeny(od, account->perm_deny, 0xffffffff);
+	/* Our permit/deny setting affects our invisibility */
+	oscar_set_permit_deny(gc);
 
+	/*
+	 * TODO: I guess we should probably wait and do this after we get
+	 * confirmation from the above SSI call?  Right now other people
+	 * see our status blip to "invisible" before we appear offline.
+	 */
 	oscar_set_extendedstatus(gc);
 }
 
@@ -4897,7 +4887,7 @@ oscar_set_status(PurpleAccount *account, PurpleStatus *status)
 
 	/* Set the ICQ status for ICQ accounts only */
 	if (oscar_util_valid_name_icq(purple_account_get_username(account)))
-		oscar_set_status_icq(account, status);
+		oscar_set_status_icq(account);
 }
 
 #ifdef CRAZY_WARN
@@ -4921,7 +4911,7 @@ oscar_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) {
 
 	if (!oscar_util_valid_name(bname)) {
 		gchar *buf;
-		buf = g_strdup_printf(_("Could not add the buddy %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."), bname);
+		buf = g_strdup_printf(_("Unable to add the buddy %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."), bname);
 		if (!purple_conv_present_error(bname, account, buf))
 			purple_notify_error(gc, NULL, _("Unable to Add"), buf);
 		g_free(buf);
@@ -4932,17 +4922,24 @@ oscar_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) {
 		return;
 	}
 
-	if ((od->ssi.received_data) && !(aim_ssi_itemlist_finditem(od->ssi.local, gname, bname, AIM_SSI_TYPE_BUDDY))) {
-		purple_debug_info("oscar",
-				   "ssi: adding buddy %s to group %s\n", bname, gname);
-		aim_ssi_addbuddy(od, bname, gname, NULL, purple_buddy_get_alias_only(buddy), NULL, NULL, 0);
+	if (od->ssi.received_data) {
+		if (!aim_ssi_itemlist_finditem(od->ssi.local, gname, bname, AIM_SSI_TYPE_BUDDY)) {
+			purple_debug_info("oscar",
+					   "ssi: adding buddy %s to group %s\n", bname, gname);
+			aim_ssi_addbuddy(od, bname, gname, NULL, purple_buddy_get_alias_only(buddy), NULL, NULL, 0);
 
-		/* Mobile users should always be online */
-		if (bname[0] == '+') {
-			purple_prpl_got_user_status(account,
-					bname, OSCAR_STATUS_ID_AVAILABLE, NULL);
-			purple_prpl_got_user_status(account,
-					bname, OSCAR_STATUS_ID_MOBILE, NULL);
+			/* Mobile users should always be online */
+			if (bname[0] == '+') {
+				purple_prpl_got_user_status(account, bname,
+						OSCAR_STATUS_ID_AVAILABLE, NULL);
+				purple_prpl_got_user_status(account, bname,
+						OSCAR_STATUS_ID_MOBILE, NULL);
+			}
+		} else if (aim_ssi_waitingforauth(od->ssi.local,
+		                                  aim_ssi_itemlist_findparentname(od->ssi.local, bname),
+		                                  bname)) {
+			/* Not authorized -- Re-request authorization */
+			purple_auth_sendrequest(gc, bname);
 		}
 	}
 
@@ -5045,15 +5042,20 @@ static int purple_ssi_parseerr(OscarData *od, FlapConnection *conn, FlapFrame *f
 	purple_debug_error("oscar", "ssi: SNAC error %hu\n", reason);
 
 	if (reason == 0x0005) {
-		purple_notify_error(gc, NULL, _("Unable to Retrieve Buddy List"),
-						  _("The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few minutes."));
 		if (od->getblisttimer > 0)
 			purple_timeout_remove(od->getblisttimer);
-		od->getblisttimer = purple_timeout_add(30000, purple_ssi_rerequestdata, od);
+		else
+			/* We only show this error the first time it happens */
+			purple_notify_error(gc, NULL,
+					_("Unable to Retrieve Buddy List"),
+					_("The AIM servers were temporarily unable to send "
+					"your buddy list.  Your buddy list is not lost, and "
+					"will probably become available in a few minutes."));
+		od->getblisttimer = purple_timeout_add_seconds(30, purple_ssi_rerequestdata, od);
 		return 1;
 	}
 
-	oscar_set_extendedstatus(gc);
+	oscar_set_status_icq(purple_connection_get_account(gc));
 
 	return 1;
 }
@@ -5124,58 +5126,43 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 	aim_ssi_cleanlist(od);
 
 	{ /* If not in server list then prune from local list */
-		PurpleBlistNode *gnode, *cnode, *bnode;
-		PurpleBuddyList *blist;
 		GSList *cur, *next;
-
+		GSList *buddies = purple_find_buddies(account, NULL);
+		
 		/* Buddies */
 		cur = NULL;
-		if ((blist = purple_get_blist()) != NULL) {
-			for (gnode = purple_blist_get_root(); gnode;
-					gnode = purple_blist_node_get_sibling_next(gnode)) {
-				const char *gname;
-				if(!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-					continue;
-				g = (PurpleGroup *)gnode;
-				gname = purple_group_get_name(g);
-				for (cnode = purple_blist_node_get_first_child(gnode);
-						cnode;
-						cnode = purple_blist_node_get_sibling_next(cnode)) {
-					if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-						continue;
-					for (bnode = purple_blist_node_get_first_child(cnode);
-							bnode;
-							bnode = purple_blist_node_get_sibling_next(bnode)) {
-						const char *bname;
-						if(!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-							continue;
-						b = (PurpleBuddy *)bnode;
-						bname = purple_buddy_get_name(b);
-						if (purple_buddy_get_account(b) == account) {
-							if (aim_ssi_itemlist_exists(od->ssi.local, bname)) {
-								/* If the buddy is an ICQ user then load his nickname */
-								const char *servernick = purple_blist_node_get_string((PurpleBlistNode*)b, "servernick");
-								char *alias;
-								const char *balias;
-								if (servernick)
-									serv_got_alias(gc, bname, servernick);
-
-								/* Store local alias on server */
-								alias = aim_ssi_getalias(od->ssi.local, gname, bname);
-								balias = purple_buddy_get_local_buddy_alias(b);
-								if (!alias && balias && *balias)
-									aim_ssi_aliasbuddy(od, gname, bname, balias);
-								g_free(alias);
-							} else {
-								purple_debug_info("oscar",
-										"ssi: removing buddy %s from local list\n", bname);
-								/* We can't actually remove now because it will screw up our looping */
-								cur = g_slist_prepend(cur, b);
-							}
-						}
-					}
-				}
+
+		while(buddies) {
+			PurpleGroup *g;
+			const char *gname;
+			const char *bname;
+
+			b = buddies->data;
+			g = purple_buddy_get_group(b);
+			gname = purple_group_get_name(g);
+			bname = purple_buddy_get_name(b);
+
+			if (aim_ssi_itemlist_exists(od->ssi.local, bname)) {
+				/* If the buddy is an ICQ user then load his nickname */
+				const char *servernick = purple_blist_node_get_string((PurpleBlistNode*)b, "servernick");
+				char *alias;
+				const char *balias;
+				if (servernick)
+					serv_got_alias(gc, bname, servernick);
+
+				/* Store local alias on server */
+				alias = aim_ssi_getalias(od->ssi.local, gname, bname);
+				balias = purple_buddy_get_local_buddy_alias(b);
+				if (!alias && balias && *balias)
+					aim_ssi_aliasbuddy(od, gname, bname, balias);
+				g_free(alias);
+			} else {
+				purple_debug_info("oscar",
+						"ssi: removing buddy %s from local list\n", bname);
+				/* We can't actually remove now because it will screw up our looping */
+				cur = g_slist_prepend(cur, b);
 			}
+			buddies = g_slist_delete_link(buddies, buddies);
 		}
 
 		while (cur != NULL) {
@@ -5345,15 +5332,19 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 			} break;
 
 			case 0x0004: { /* Permit/deny setting */
-				if (curitem->data) {
-					guint8 permdeny;
-					if ((permdeny = aim_ssi_getpermdeny(od->ssi.local)) && (permdeny != account->perm_deny)) {
+				/*
+				 * We don't inherit the permit/deny setting from the server
+				 * for ICQ because, for ICQ, this setting controls who can
+				 * see your online status when you are invisible.  Thus it is
+				 * a part of your status and not really related to blocking.
+				 */
+				if (!od->icq && curitem->data) {
+					guint8 perm_deny = aim_ssi_getpermdeny(od->ssi.local);
+					if (perm_deny != 0 && perm_deny != account->perm_deny)
+					{
 						purple_debug_info("oscar",
-								   "ssi: changing permdeny from %d to %hhu\n", account->perm_deny, permdeny);
-						account->perm_deny = permdeny;
-						if (od->icq && account->perm_deny == PURPLE_PRIVACY_ALLOW_USERS) {
-							purple_presence_set_status_active(purple_account_get_presence(account), OSCAR_STATUS_ID_INVISIBLE, TRUE);
-						}
+								   "ssi: changing permdeny from %d to %hhu\n", account->perm_deny, perm_deny);
+						account->perm_deny = perm_deny;
 					}
 				}
 			} break;
@@ -5364,7 +5355,7 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 		} /* End of switch on curitem->type */
 	} /* End of for loop */
 
-	oscar_set_extendedstatus(gc);
+	oscar_set_status_icq(account);
 
 	/* Activate SSI */
 	/* Sending the enable causes other people to be able to see you, and you to see them */
@@ -5405,7 +5396,7 @@ static int purple_ssi_parseack(OscarData *od, FlapConnection *conn, FlapFrame *f
 
 			case 0x000c: { /* you are over the limit, the cheat is to the limit, come on fhqwhgads */
 				gchar *buf;
-				buf = g_strdup_printf(_("Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."), (retval->name ? retval->name : _("(no name)")));
+				buf = g_strdup_printf(_("Unable to add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."), (retval->name ? retval->name : _("(no name)")));
 				if ((retval->name != NULL) && !purple_conv_present_error(retval->name, purple_connection_get_account(gc), buf))
 					purple_notify_error(gc, NULL, _("Unable to Add"), buf);
 				g_free(buf);
@@ -5419,7 +5410,7 @@ static int purple_ssi_parseack(OscarData *od, FlapConnection *conn, FlapFrame *f
 			default: { /* La la la */
 				gchar *buf;
 				purple_debug_error("oscar", "ssi: Action 0x%04hx was unsuccessful with error 0x%04hx\n", retval->action, retval->ack);
-				buf = g_strdup_printf(_("Could not add the buddy %s for an unknown reason."),
+				buf = g_strdup_printf(_("Unable to add the buddy %s for an unknown reason."),
 						(retval->name ? retval->name : _("(no name)")));
 				if ((retval->name != NULL) && !purple_conv_present_error(retval->name, purple_connection_get_account(gc), buf))
 					purple_notify_error(gc, NULL, _("Unable to Add"), buf);
@@ -6045,29 +6036,36 @@ static int oscar_icon_req(OscarData *od, FlapConnection *conn, FlapFrame *fr, ..
 void oscar_set_permit_deny(PurpleConnection *gc) {
 	PurpleAccount *account = purple_connection_get_account(gc);
 	OscarData *od = purple_connection_get_protocol_data(gc);
+	PurplePrivacyType perm_deny;
 
-	if (od->ssi.received_data) {
-		switch (account->perm_deny) {
-			case PURPLE_PRIVACY_ALLOW_ALL:
-				aim_ssi_setpermdeny(od, 0x01, 0xffffffff);
-				break;
-			case PURPLE_PRIVACY_ALLOW_BUDDYLIST:
-				aim_ssi_setpermdeny(od, 0x05, 0xffffffff);
-				break;
-			case PURPLE_PRIVACY_ALLOW_USERS:
-				aim_ssi_setpermdeny(od, 0x03, 0xffffffff);
-				break;
-			case PURPLE_PRIVACY_DENY_ALL:
-				aim_ssi_setpermdeny(od, 0x02, 0xffffffff);
-				break;
-			case PURPLE_PRIVACY_DENY_USERS:
-				aim_ssi_setpermdeny(od, 0x04, 0xffffffff);
-				break;
-			default:
-				aim_ssi_setpermdeny(od, 0x01, 0xffffffff);
-				break;
-		}
-	}
+	/*
+	 * For ICQ the permit/deny setting controls who you can see you
+	 * online when you set your status to "invisible."  If we're ICQ
+	 * and we're invisible then we need to use one of
+	 * PURPLE_PRIVACY_ALLOW_USERS or PURPLE_PRIVACY_ALLOW_BUDDYLIST or
+	 * PURPLE_PRIVACY_DENY_USERS if we actually want to be invisible
+	 * to anyone.
+	 *
+	 * These three permit/deny settings correspond to:
+	 * 1. Invisible to everyone except the people on my "permit" list
+	 * 2. Invisible to everyone except the people on my buddy list
+	 * 3. Invisible only to the people on my "deny" list
+	 *
+	 * It would be nice to allow cases 2 and 3, but our UI doesn't have
+	 * a nice way to do it.  For now we just force case 1.
+	 */
+	if (od->icq && purple_account_is_status_active(account, OSCAR_STATUS_ID_INVISIBLE))
+		perm_deny = PURPLE_PRIVACY_ALLOW_USERS;
+	else
+		perm_deny = account->perm_deny;
+
+	if (od->ssi.received_data)
+		/*
+		 * Conveniently there is a one-to-one mapping between the
+		 * values of libpurple's PurplePrivacyType and the values used
+		 * by the oscar protocol.
+		 */
+		aim_ssi_setpermdeny(od, perm_deny, 0xffffffff);
 }
 
 void oscar_add_permit(PurpleConnection *gc, const char *who) {
@@ -6305,6 +6303,44 @@ oscar_ask_directim(gpointer object, gpointer ignored)
 }
 
 static void
+oscar_close_directim(gpointer object, gpointer ignored)
+{
+	PurpleBlistNode *node;
+	PurpleBuddy *buddy;
+	PurpleAccount *account;
+	PurpleConnection *gc;
+	PurpleConversation *conv;
+	OscarData *od;
+	PeerConnection *conn;
+	const char *name;
+
+	node = object;
+
+	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
+
+	buddy = (PurpleBuddy*)node;
+	name = purple_buddy_get_name(buddy);
+	account = purple_buddy_get_account(buddy);
+	gc = purple_account_get_connection(account);
+	od = gc->proto_data;
+	conn = peer_connection_find_by_type(od, name, OSCAR_CAPABILITY_DIRECTIM);
+
+	if (conn != NULL)
+	{
+		if (!conn->ready)
+			aim_im_sendch2_cancel(conn);
+
+		peer_connection_destroy(conn, OSCAR_DISCONNECT_LOCAL_CLOSED, NULL);
+
+		/* OSCAR_DISCONNECT_LOCAL_CLOSED doesn't write anything to the convo
+		 * window. Let the user know that we canceled the Direct IM. */
+		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
+		purple_conversation_write(conv, NULL, _("You closed the connection."),
+		                          PURPLE_MESSAGE_SYSTEM, time(NULL));
+	}
+}
+
+static void
 oscar_get_aim_info_cb(PurpleBlistNode *node, gpointer ignore)
 {
 	PurpleBuddy *buddy;
@@ -6367,11 +6403,23 @@ oscar_buddy_menu(PurpleBuddy *buddy) {
 		oscar_util_name_compare(purple_account_get_username(account), bname) &&
 		PURPLE_BUDDY_IS_ONLINE(buddy))
 	{
+		PeerConnection *conn;
+		conn = peer_connection_find_by_type(od, bname, OSCAR_CAPABILITY_DIRECTIM);
+
 		if (userinfo->capabilities & OSCAR_CAPABILITY_DIRECTIM)
 		{
-			act = purple_menu_action_new(_("Direct IM"),
-			                           PURPLE_CALLBACK(oscar_ask_directim),
-			                           NULL, NULL);
+			if (conn)
+			{
+				act = purple_menu_action_new(_("Cancel Direct IM"),
+				                          PURPLE_CALLBACK(oscar_close_directim),
+				                          NULL, NULL);
+			}
+			else
+			{
+				act = purple_menu_action_new(_("Direct IM"),
+				                          PURPLE_CALLBACK(oscar_ask_directim),
+				                          NULL, NULL);
+			}
 			menu = g_list_prepend(menu, act);
 		}
 #if 0
@@ -6387,6 +6435,10 @@ oscar_buddy_menu(PurpleBuddy *buddy) {
 
 	if (od->ssi.received_data && purple_buddy_get_group(buddy) != NULL)
 	{
+		/*
+		 * We only do this if the user is in our buddy list and we're
+		 * waiting for authorization.
+		 */
 		char *gname;
 		gname = aim_ssi_itemlist_findparentname(od->ssi.local, bname);
 		if (gname && aim_ssi_waitingforauth(od->ssi.local, gname, bname))
@@ -6466,7 +6518,7 @@ oscar_show_icq_privacy_opts(PurplePluginAction *action)
 						gc);
 }
 
-static void oscar_format_username(PurpleConnection *gc, const char *nick) {
+void oscar_format_username(PurpleConnection *gc, const char *nick) {
 	OscarData *od = purple_connection_get_protocol_data(gc);
 	if (!oscar_util_name_compare(purple_account_get_username(purple_connection_get_account(gc)), nick)) {
 		if (!flap_connection_getbytype(od, SNAC_FAMILY_ADMIN)) {
@@ -6544,47 +6596,35 @@ static void oscar_show_awaitingauth(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
 	OscarData *od = purple_connection_get_protocol_data(gc);
-	gchar *nombre, *text, *tmp;
-	PurpleBlistNode *gnode, *cnode, *bnode;
+	gchar *text, *tmp;
+	GSList *buddies;
 	PurpleAccount *account;
 	int num=0;
 
 	text = g_strdup("");
 	account = purple_connection_get_account(gc);
 
-	for (gnode = purple_blist_get_root(); gnode;
-			gnode = purple_blist_node_get_sibling_next(gnode)) {
-		PurpleGroup *group = (PurpleGroup *)gnode;
-		const char *gname;
-		if(!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-		gname = purple_group_get_name(group);
-		for (cnode = purple_blist_node_get_first_child(gnode);
-				cnode;
-				cnode = purple_blist_node_get_sibling_next(cnode)) {
-			if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-			for (bnode = purple_blist_node_get_first_child(cnode);
-					bnode;
-					bnode = purple_blist_node_get_sibling_next(bnode)) {
-				PurpleBuddy *buddy = (PurpleBuddy *)bnode;
-				const char *bname;
-				if(!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-				bname = purple_buddy_get_name(buddy);
-				if (purple_buddy_get_account(buddy) == account && aim_ssi_waitingforauth(od->ssi.local, gname, bname)) {
-					if (purple_buddy_get_alias_only(buddy))
-						nombre = g_strdup_printf(" %s (%s)", bname, purple_buddy_get_alias_only(buddy));
-					else
-						nombre = g_strdup_printf(" %s", bname);
-					tmp = g_strdup_printf("%s%s<br>", text, nombre);
-					g_free(text);
-					text = tmp;
-					g_free(nombre);
-					num++;
-				}
-			}
+	buddies = purple_find_buddies(account, NULL);
+	while (buddies) {
+		PurpleBuddy *buddy;
+		const gchar *bname, *gname;
+
+		buddy = buddies->data;
+		bname = purple_buddy_get_name(buddy);
+		gname = purple_group_get_name(purple_buddy_get_group(buddy));
+		if (aim_ssi_waitingforauth(od->ssi.local, gname, bname)) {
+			const gchar *alias = purple_buddy_get_alias_only(buddy);
+			if (alias)
+				tmp = g_strdup_printf("%s %s (%s)<br>", text, bname, alias);
+			else
+				tmp = g_strdup_printf("%s %s<br>", text, bname);
+			g_free(text);
+			text = tmp;
+
+			num++;
 		}
+
+		buddies = g_slist_delete_link(buddies, buddies);
 	}
 
 	if (!num) {
@@ -6639,6 +6679,9 @@ static void oscar_change_pass(PurplePluginAction *action)
 	purple_account_request_change_password(purple_connection_get_account(gc));
 }
 
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
 static void oscar_show_chpassurl(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
@@ -6779,12 +6822,16 @@ oscar_actions(PurplePlugin *plugin, gpointer context)
 			oscar_change_pass);
 	menu = g_list_prepend(menu, act);
 
-	if (od->authinfo->chpassurl != NULL)
+	if (od->authinfo != NULL && od->authinfo->chpassurl != NULL)
 	{
+		/* This only happens when connecting with the old-style BUCP login */
 		act = purple_plugin_action_new(_("Change Password (web)"),
 				oscar_show_chpassurl);
 		menu = g_list_prepend(menu, act);
+	}
 
+	if (!od->icq)
+	{
 		act = purple_plugin_action_new(_("Configure IM Forwarding (web)"),
 				oscar_show_imforwardingurl);
 		menu = g_list_prepend(menu, act);
@@ -7021,6 +7068,10 @@ void oscar_init(PurplePluginProtocolInfo *prpl_info)
 			OSCAR_DEFAULT_USE_SSL);
 	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
 
+	option = purple_account_option_bool_new(_("Use clientLogin"), "use_clientlogin",
+			OSCAR_DEFAULT_USE_CLIENTLOGIN);
+	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
+
 	option = purple_account_option_bool_new(
 		_("Always use AIM/ICQ proxy server for\nfile transfers and direct IM (slower,\nbut does not reveal your IP address)"), "always_use_rv_proxy",
 		OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY);
@@ -7037,6 +7088,7 @@ void oscar_init(PurplePluginProtocolInfo *prpl_info)
 	/* Preferences */
 	purple_prefs_add_none("/plugins/prpl/oscar");
 	purple_prefs_add_bool("/plugins/prpl/oscar/recent_buddies", FALSE);
+
 	purple_prefs_remove("/plugins/prpl/oscar/show_idle");
 	purple_prefs_remove("/plugins/prpl/oscar/always_use_rv_proxy");
 
diff --git a/libpurple/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h
index 0b86cee965..80e151de28 100644
--- a/libpurple/protocols/oscar/oscar.h
+++ b/libpurple/protocols/oscar/oscar.h
@@ -307,23 +307,25 @@ struct _ClientInfo
 /*
  * We need to use the major-minor-micro versions from the official
  * AIM and ICQ programs here or AOL won't let us use certain features.
+ *
+ * 0x00000611 is the distid given to us by AOL for use as the default
+ * libpurple distid.
  */
-
 #define CLIENTINFO_PURPLE_AIM { \
-	"Purple/" VERSION, \
+	NULL, \
 	0x0109, \
 	0x0005, 0x0001, \
 	0x0000, 0x0bdc, \
-	0x000000d2, \
+	0x00000611, \
 	"us", "en", \
 }
 
 #define CLIENTINFO_PURPLE_ICQ { \
-	"Purple/" VERSION, \
+	NULL, \
 	0x010a, \
 	0x0014, 0x0034, \
 	0x0000, 0x0c18, \
-	0x0000043d, \
+	0x00000611, \
 	"us", "en", \
 }
 
@@ -427,7 +429,6 @@ struct _FlapConnection
 	guint16 cookielen;
 	guint8 *cookie;
 	gpointer new_conn_data;
-	gchar *ssl_cert_cn;
 
 	int fd;
 	PurpleSslConnection *gsc;
@@ -469,6 +470,9 @@ struct _IcbmCookie
  */
 struct _OscarData
 {
+	/** Only used when connecting with clientLogin */
+	PurpleUtilFetchUrlData *url_data;
+
 	gboolean iconconnecting;
 	gboolean set_icon;
 
@@ -522,12 +526,13 @@ struct _OscarData
 
 	IcbmCookie *msgcookies;
 	struct aim_icq_info *icq_info;
+
+	/** Only used when connecting with the old-style BUCP login. */
 	struct aim_authresp_info *authinfo;
 	struct aim_emailinfo *emailinfo;
 
 	struct {
 		struct aim_userinfo_s *userinfo;
-		struct userinfo_node *requested;
 	} locate;
 
 	/* Server-stored information (ssi) */
@@ -547,6 +552,7 @@ struct _OscarData
 
 	/** A linked list containing FlapConnections. */
 	GSList *oscar_connections;
+	guint16 default_port;
 
 	/** A linked list containing PeerConnections. */
 	GSList *peer_connections;
@@ -568,10 +574,9 @@ struct _OscarData
 #define AIM_ICQ_STATE_DIRECTREQUIREAUTH 0x10000000
 #define AIM_ICQ_STATE_DIRECTCONTACTLIST 0x20000000
 
-typedef int (*aim_rxcallback_t)(OscarData *od, FlapConnection *conn, FlapFrame *frame, ...);
-
-
-/* family_auth.c */
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
 struct aim_clientrelease
 {
 	char *name;
@@ -580,6 +585,9 @@ struct aim_clientrelease
 	char *info;
 };
 
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
 struct aim_authresp_info
 {
 	char *bn;
@@ -611,12 +619,29 @@ struct aim_redirect_data
 	} chat;
 };
 
+int oscar_connect_to_bos(PurpleConnection *gc, OscarData *od, const char *host, guint16 port, guint8 *cookie, guint16 cookielen);
+
+/* family_auth.c */
+
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
 int aim_request_login(OscarData *od, FlapConnection *conn, const char *bn);
+
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
 int aim_send_login(OscarData *od, FlapConnection *conn, const char *bn, const char *password, gboolean truncate_pass, ClientInfo *ci, const char *key, gboolean allow_multiple_logins);
+
+/**
+ * Only used when connecting with the old-style BUCP login.
+ */
 /* 0x000b */ int aim_auth_securid_send(OscarData *od, const char *securid);
 
-void oscar_data_addhandler(OscarData *od, guint16 family, guint16 subtype, aim_rxcallback_t newhandler, guint16 flags);
-aim_rxcallback_t aim_callhandler(OscarData *od, guint16 family, guint16 subtype);
+/**
+ * Only used when connecting with clientLogin.
+ */
+void send_client_login(OscarData *od, const char *username);
 
 /* flap_connection.c */
 FlapConnection *flap_connection_new(OscarData *, int type);
@@ -632,13 +657,19 @@ void flap_connection_recv_cb_ssl(gpointer data, PurpleSslConnection *gsc, Purple
 void flap_connection_send(FlapConnection *conn, FlapFrame *frame);
 void flap_connection_send_version(OscarData *od, FlapConnection *conn);
 void flap_connection_send_version_with_cookie(OscarData *od, FlapConnection *conn, guint16 length, const guint8 *chipsahoy);
+void flap_connection_send_version_with_cookie_and_clientinfo(OscarData *od, FlapConnection *conn, guint16 length, const guint8 *chipsahoy, ClientInfo *ci);
 void flap_connection_send_snac(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, guint16 flags, aim_snacid_t snacid, ByteStream *data);
 void flap_connection_send_snac_with_priority(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, guint16 flags, aim_snacid_t snacid, ByteStream *data, gboolean high_priority);
 void flap_connection_send_keepalive(OscarData *od, FlapConnection *conn);
 FlapFrame *flap_frame_new(OscarData *od, guint16 channel, int datalen);
 
+/* oscar_data.c */
+typedef int (*aim_rxcallback_t)(OscarData *od, FlapConnection *conn, FlapFrame *frame, ...);
+
 OscarData *oscar_data_new(void);
 void oscar_data_destroy(OscarData *);
+void oscar_data_addhandler(OscarData *od, guint16 family, guint16 subtype, aim_rxcallback_t newhandler, guint16 flags);
+aim_rxcallback_t aim_callhandler(OscarData *od, guint16 family, guint16 subtype);
 
 /* misc.c */
 #define AIM_VISIBILITYCHANGE_PERMITADD    0x05
@@ -665,7 +696,7 @@ void oscar_data_destroy(OscarData *);
 /* 0x0014 */ void aim_srv_setprivacyflags(OscarData *od, FlapConnection *conn, guint32);
 /* 0x0016 */ void aim_srv_nop(OscarData *od, FlapConnection *conn);
 /* 0x0017 */ void aim_srv_setversions(OscarData *od, FlapConnection *conn);
-/* 0x001e */ int aim_srv_setextrainfo(OscarData *od, gboolean seticqstatus, guint32 icqstatus, gboolean setavailmsg, const char *availmsg, const char *itmsurl);
+/* 0x001e */ int aim_srv_setextrainfo(OscarData *od, gboolean seticqstatus, guint32 icqstatus, gboolean setstatusmsg, const char *statusmsg, const char *itmsurl);
 
 
 void aim_bos_reqrights(OscarData *od, FlapConnection *conn);
@@ -699,23 +730,27 @@ void aim_ads_requestads(OscarData *od, FlapConnection *conn);
 #define AIM_TRANSFER_DENY_DECLINE	0x0001
 #define AIM_TRANSFER_DENY_NOTACCEPTING	0x0002
 
-#define AIM_IMPARAM_FLAG_CHANMSGS_ALLOWED       0x00000001
-#define AIM_IMPARAM_FLAG_MISSEDCALLS_ENABLED    0x00000002
-#define AIM_IMPARAM_FLAG_SUPPORT_OFFLINEMSGS    0x00000100
+#define AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED   0x00000001
+#define AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED   0x00000002
+#define AIM_IMPARAM_FLAG_EVENTS_ALLOWED         0x00000008
+#define AIM_IMPARAM_FLAG_SMS_SUPPORTED          0x00000010
+#define AIM_IMPARAM_FLAG_OFFLINE_MSGS_ALLOWED   0x00000100
 
 /* This is what the server will give you if you don't set them yourself. */
+/* This is probably out of date. */
 #define AIM_IMPARAM_DEFAULTS { \
 	0, \
-	AIM_IMPARAM_FLAG_CHANMSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSEDCALLS_ENABLED, \
+	AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED, \
 	512, /* !! Note how small this is. */ \
 	(99.9)*10, (99.9)*10, \
 	1000 /* !! And how large this is. */ \
 }
 
 /* This is what most AIM versions use. */
+/* This is probably out of date. */
 #define AIM_IMPARAM_REASONABLE { \
 	0, \
-	AIM_IMPARAM_FLAG_CHANMSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSEDCALLS_ENABLED, \
+	AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED, \
 	8000, \
 	(99.9)*10, (99.9)*10, \
 	0 \
@@ -1097,7 +1132,6 @@ void aim_locate_dorequest(OscarData *od);
 /* 0x000f */ int aim_locate_setinterests(OscarData *od, const char *interest1, const char *interest2, const char *interest3, const char *interest4, const char *interest5, guint16 privacy);
 /* 0x0015 */ int aim_locate_getinfoshort(OscarData *od, const char *bn, guint32 flags);
 
-void aim_locate_autofetch_away_message(OscarData *od, const char *bn);
 guint32 aim_locate_getcaps(OscarData *od, ByteStream *bs, int len);
 guint32 aim_locate_getcaps_short(OscarData *od, ByteStream *bs, int len);
 void aim_info_free(aim_userinfo_t *);
@@ -1496,6 +1530,10 @@ void aim_tlvlist_remove(GSList **list, const guint16 type);
 		(((*((buf)+2)) << 16) & 0x00ff0000) + \
 		(((*((buf)+3)) << 24) & 0xff000000))
 
+int oscar_get_ui_info_int(const char *str, int default_value);
+const char *oscar_get_ui_info_string(const char *str, const char *default_value);
+gchar *oscar_get_clientstring(void);
+
 guint16 aimutil_iconsum(const guint8 *buf, int buflen);
 int aimutil_tokslen(char *toSearch, int theindex, char dl);
 int aimutil_itemcnt(char *toSearch, char dl);
@@ -1594,6 +1632,18 @@ int byte_stream_putbs(ByteStream *bs, ByteStream *srcbs, int len);
 int byte_stream_putuid(ByteStream *bs, OscarData *od);
 int byte_stream_putcaps(ByteStream *bs, guint32 caps);
 
+/**
+ * Inserts a BART asset block into the given byte stream.  The flags
+ * and length are set appropriately based on the value of data.
+ */
+void byte_stream_put_bart_asset(ByteStream *bs, guint16 type, ByteStream *data);
+
+/**
+ * A helper function that calls byte_stream_put_bart_asset with the
+ * appropriate data ByteStream given the datastr.
+ */
+void byte_stream_put_bart_asset_str(ByteStream *bs, guint16 type, const char *datastr);
+
 /*
  * Generic SNAC structure.  Rarely if ever used.
  */
diff --git a/libpurple/protocols/oscar/oscar_data.c b/libpurple/protocols/oscar/oscar_data.c
index 1feadebcaa..dcc43baa5d 100644
--- a/libpurple/protocols/oscar/oscar_data.c
+++ b/libpurple/protocols/oscar/oscar_data.c
@@ -70,6 +70,7 @@ oscar_data_new(void)
 	/* missing 0x14 */
 	aim__registermodule(od, icq_modfirst);
 	/* missing 0x16 */
+	/* auth_modfirst is only needed if we're connecting with the old-style BUCP login */
 	aim__registermodule(od, auth_modfirst);
 	aim__registermodule(od, email_modfirst);
 
@@ -86,6 +87,10 @@ oscar_data_destroy(OscarData *od)
 {
 	aim_cleansnacs(od, -1);
 
+	/* Only used when connecting with clientLogin */
+	if (od->url_data != NULL)
+		purple_util_fetch_url_cancel(od->url_data);
+
 	while (od->requesticon)
 	{
 		g_free(od->requesticon->data);
diff --git a/libpurple/protocols/oscar/oscarcommon.h b/libpurple/protocols/oscar/oscarcommon.h
index c590745335..c7aaaa0455 100644
--- a/libpurple/protocols/oscar/oscarcommon.h
+++ b/libpurple/protocols/oscar/oscarcommon.h
@@ -45,6 +45,7 @@
 #define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE
 #define OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS TRUE
 #define OSCAR_DEFAULT_USE_SSL FALSE
+#define OSCAR_DEFAULT_USE_CLIENTLOGIN FALSE
 
 #ifdef _WIN32
 const char *oscar_get_locale_charset(void);
@@ -91,5 +92,6 @@ gboolean oscar_can_receive_file(PurpleConnection *gc, const char *who);
 void oscar_send_file(PurpleConnection *gc, const char *who, const char *file);
 PurpleXfer *oscar_new_xfer(PurpleConnection *gc, const char *who);
 gboolean oscar_offline_message(const PurpleBuddy *buddy);
+void oscar_format_username(PurpleConnection *gc, const char *nick);
 GList *oscar_actions(PurplePlugin *plugin, gpointer context);
 void oscar_init(PurplePluginProtocolInfo *prpl_info);
diff --git a/libpurple/protocols/oscar/peer.c b/libpurple/protocols/oscar/peer.c
index b8c6f6bf9a..35721572c6 100644
--- a/libpurple/protocols/oscar/peer.c
+++ b/libpurple/protocols/oscar/peer.c
@@ -710,9 +710,18 @@ peer_connection_establish_listener_cb(int listenerfd, gpointer data)
 	}
 	else if (conn->type == OSCAR_CAPABILITY_SENDFILE)
 	{
+		const guchar *ip_atoi = purple_network_ip_atoi(listener_ip);
+		if (ip_atoi == NULL) {
+			purple_debug_error("oscar", "Cannot send file. atoi(%s) failed.\n"
+					"Other possibly useful information: fd = %d, port = %d\n",
+					listener_ip ? listener_ip : "(null!)", conn->listenerfd,
+					listener_port);
+			purple_xfer_cancel_local(conn->xfer);
+			return;
+		}
 		aim_im_sendch2_sendfile_requestdirect(od,
 				conn->cookie, conn->bn,
-				purple_network_ip_atoi(listener_ip),
+				ip_atoi,
 				listener_port, ++conn->lastrequestnumber,
 				(const gchar *)conn->xferdata.name,
 				conn->xferdata.size, conn->xferdata.totfiles);
@@ -812,7 +821,7 @@ peer_connection_trynext(PeerConnection *conn)
 			(conn->client_connect_data != NULL))
 		{
 			/* Connecting... */
-			conn->connect_timeout_timer = purple_timeout_add(5000,
+			conn->connect_timeout_timer = purple_timeout_add_seconds(5,
 					peer_connection_tooktoolong, conn);
 			return;
 		}
diff --git a/libpurple/protocols/oscar/snactypes.h b/libpurple/protocols/oscar/snactypes.h
index 5a697aa827..1ce256babe 100644
--- a/libpurple/protocols/oscar/snactypes.h
+++ b/libpurple/protocols/oscar/snactypes.h
@@ -96,7 +96,6 @@
 #define SNAC_SUBTYPE_LOCATE_USERINFO 0x0006
 #define SNAC_SUBTYPE_LOCATE_WATCHERSUBREQ 0x0007
 #define SNAC_SUBTYPE_LOCATE_WATCHERNOT 0x0008
-#define SNAC_SUBTYPE_LOCATE_GOTINFOBLOCK 0xfffd
 #define SNAC_SUBTYPE_LOCATE_DEFAULT 0xffff
 
 /*
diff --git a/libpurple/protocols/oscar/util.c b/libpurple/protocols/oscar/util.c
index ed06bb74f5..b8b1cf7c2e 100644
--- a/libpurple/protocols/oscar/util.c
+++ b/libpurple/protocols/oscar/util.c
@@ -26,12 +26,53 @@
  */
 
 #include "oscar.h"
+
+#include "core.h"
+
 #include <ctype.h>
 
 #ifdef _WIN32
 #include "win32dep.h"
 #endif
 
+int oscar_get_ui_info_int(const char *str, int default_value)
+{
+	GHashTable *ui_info;
+
+	ui_info = purple_core_get_ui_info();
+	if (ui_info != NULL) {
+		gpointer value;
+		if (g_hash_table_lookup_extended(ui_info, str, NULL, &value))
+			return GPOINTER_TO_INT(value);
+	}
+
+	return default_value;
+}
+
+const char *oscar_get_ui_info_string(const char *str, const char *default_value)
+{
+	GHashTable *ui_info;
+	const char *value = NULL;
+
+	ui_info = purple_core_get_ui_info();
+	if (ui_info != NULL)
+		value = g_hash_table_lookup(ui_info, str);
+	if (value == NULL)
+		value = default_value;
+
+	return value;
+}
+
+gchar *oscar_get_clientstring(void)
+{
+	const char *name, *version;
+
+	name = oscar_get_ui_info_string("name", "Purple");
+	version = oscar_get_ui_info_string("version", VERSION);
+
+	return g_strdup_printf("%s/%s", name, version);;
+}
+
 /*
  * Tokenizing functions.  Used to portably replace strtok/sep.
  *   -- DMP.
diff --git a/libpurple/protocols/qq/ChangeLog b/libpurple/protocols/qq/ChangeLog
index 241f449dc6..cb6d7a1877 100644
--- a/libpurple/protocols/qq/ChangeLog
+++ b/libpurple/protocols/qq/ChangeLog
@@ -1,3 +1,6 @@
+2009.04.23 - flos <lonicerae(at)gmail.com>
+	* Fixed a bug of updating buddy who is not in user's buddy list
+
 2009.02.25 - flos <lonicerae(at)gmail.com>
 	* Changed text 'ZipCode' to 'Postal Code'
 
diff --git a/libpurple/protocols/qq/Makefile.am b/libpurple/protocols/qq/Makefile.am
index 66121c0f76..52d3e66c1b 100644
--- a/libpurple/protocols/qq/Makefile.am
+++ b/libpurple/protocols/qq/Makefile.am
@@ -71,6 +71,10 @@ libqq_la_LIBADD  = $(GLIB_LIBS)
 
 endif
 
+# QQ_BUDDY_ICON_DIR is the path where a bunch of stock icons can be
+# places for users to choose from when setting their buddy icon.  We
+# don't distribute those icons ourselves because of possibly copyright
+# concerns, but distributions might want to put icons here.
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
diff --git a/libpurple/protocols/qq/buddy_info.c b/libpurple/protocols/qq/buddy_info.c
index f84fce81d0..019ac8e41c 100644
--- a/libpurple/protocols/qq/buddy_info.c
+++ b/libpurple/protocols/qq/buddy_info.c
@@ -191,7 +191,7 @@ static void info_display_only(PurpleConnection *gc, gchar **segments)
 		}
 		switch (field_infos[index].type) {
 			case QQ_FIELD_BOOL:
-				purple_notify_user_info_add_pair(user_info, field_infos[index].text,
+				purple_notify_user_info_add_pair(user_info, _(field_infos[index].text),
 					strtol(segments[index], NULL, 10) ? _("True") : _("False"));
 				break;
 			case QQ_FIELD_CHOICE:
@@ -200,7 +200,7 @@ static void info_display_only(PurpleConnection *gc, gchar **segments)
 					choice_num = 0;
 				}
 
-				purple_notify_user_info_add_pair(user_info, field_infos[index].text, field_infos[index].choice[choice_num]);
+				purple_notify_user_info_add_pair(user_info, _(field_infos[index].text), field_infos[index].choice[choice_num]);
 				break;
 			case QQ_FIELD_LABEL:
 			case QQ_FIELD_STRING:
@@ -208,7 +208,7 @@ static void info_display_only(PurpleConnection *gc, gchar **segments)
 			default:
 				if (strlen(segments[index]) != 0) {
 					utf8_value = qq_to_utf8(segments[index], QQ_CHARSET_DEFAULT);
-					purple_notify_user_info_add_pair(user_info, field_infos[index].text, utf8_value);
+					purple_notify_user_info_add_pair(user_info, _(field_infos[index].text), utf8_value);
 					g_free(utf8_value);
 				}
 				break;
@@ -348,18 +348,18 @@ static void field_request_new(PurpleRequestFieldGroup *group, gint index, gchar
 			utf8_value = qq_to_utf8(segments[index], QQ_CHARSET_DEFAULT);
 			if (field_infos[index].type == QQ_FIELD_STRING) {
 				field = purple_request_field_string_new(
-						field_infos[index].id, field_infos[index].text, utf8_value, FALSE);
+					field_infos[index].id, _(field_infos[index].text), utf8_value, FALSE);
 			} else {
 				field = purple_request_field_string_new(
-						field_infos[index].id, field_infos[index].text, utf8_value, TRUE);
+					field_infos[index].id, _(field_infos[index].text), utf8_value, TRUE);
 			}
 			purple_request_field_group_add_field(group, field);
 			g_free(utf8_value);
 			break;
 		case QQ_FIELD_BOOL:
 			field = purple_request_field_bool_new(
-					field_infos[index].id, field_infos[index].text,
-					strtol(segments[index], NULL, 10) ? TRUE : FALSE);
+				field_infos[index].id, _(field_infos[index].text),
+				strtol(segments[index], NULL, 10) ? TRUE : FALSE);
 			purple_request_field_group_add_field(group, field);
 			break;
 		case QQ_FIELD_CHOICE:
@@ -374,7 +374,7 @@ static void field_request_new(PurpleRequestFieldGroup *group, gint index, gchar
 				}
 			}
 			field = purple_request_field_choice_new(
-					field_infos[index].id, field_infos[index].text, choice_num);
+				field_infos[index].id, _(field_infos[index].text), choice_num);
 			for (i = 0; i < field_infos[index].choice_size; i++) {
 				purple_request_field_choice_add(field, field_infos[index].choice[i]);
 			}
@@ -530,6 +530,13 @@ gchar *qq_get_icon_name(gint face)
 	return icon_name;
 }
 
+/*
+ * This function seems to let people set their buddy icon, but it restricts
+ * them to using a small list of stock icons.  Wouldn't it make more sense
+ * to use libpurple's normal icon setting stuff?
+ *
+ * Also it would be nice to unify the icon_dir code for Windows and Linux.
+ */
 gchar *qq_get_icon_path(gchar *icon_name)
 {
 	gchar *icon_path;
@@ -542,6 +549,13 @@ gchar *qq_get_icon_path(gchar *icon_name)
 	}
 #endif
 
+	/*
+	 * TODO: The QQ protocol plugin should probably call
+	 *       purple_prefs_add_string() at startup to initialize this
+	 *       preference.  It is used to allow users or distributions
+	 *       to specify this directory.  We don't include these icons
+	 *       with libpurple because of possible copyright concerns.
+	 */
 	icon_dir = purple_prefs_get_string("/plugins/prpl/qq/icon_dir");
 	if ( icon_dir == NULL || strlen(icon_dir) == 0) {
 #ifdef _WIN32
@@ -606,21 +620,21 @@ void qq_update_buddy_icon(PurpleAccount *account, const gchar *who, gint face)
 /* after getting info or modify myself, refresh the buddy list accordingly */
 static void update_buddy_info(PurpleConnection *gc, gchar **segments)
 {
-	PurpleBuddy *buddy;
-	qq_data *qd;
-	qq_buddy_data *bd;
+	PurpleBuddy *buddy = NULL;
+	qq_data *qd = NULL;
+	qq_buddy_data *bd = NULL;
 	guint32 uid;
 	gchar *who;
 	gchar *alias_utf8;
-	PurpleAccount *account = purple_connection_get_account(gc);
 
+	PurpleAccount *account = purple_connection_get_account(gc);
 	qd = (qq_data *)purple_connection_get_protocol_data(gc);
 
 	uid = strtoul(segments[QQ_INFO_UID], NULL, 10);
 	who = uid_to_purple_name(uid);
-
 	qq_filter_str(segments[QQ_INFO_NICK]);
 	alias_utf8 = qq_to_utf8(segments[QQ_INFO_NICK], QQ_CHARSET_DEFAULT);
+
 	if (uid == qd->uid) {	/* it is me */
 		purple_debug_info("QQ", "Got my info\n");
 		qd->my_icon = strtol(segments[QQ_INFO_FACE], NULL, 10);
@@ -631,12 +645,14 @@ static void update_buddy_info(PurpleConnection *gc, gchar **segments)
 		buddy = qq_buddy_find_or_new(gc, uid);
 	} else {
 		buddy = purple_find_buddy(gc->account, who);
+		/* purple_debug_info("QQ", "buddy=%p\n", (void*)buddy); */
 	}
 
 	/* if the buddy is null, the api will catch it and return null here */
 	bd = purple_buddy_get_protocol_data(buddy);
+	/* purple_debug_info("QQ", "bd=%p\n", (void*)bd); */
 
-	if (buddy == NULL || bd) {
+	if (bd == NULL || buddy == NULL) {
 		g_free(who);
 		g_free(alias_utf8);
 		return;
@@ -646,6 +662,7 @@ static void update_buddy_info(PurpleConnection *gc, gchar **segments)
 	bd->age = strtol(segments[QQ_INFO_AGE], NULL, 10);
 	bd->gender = strtol(segments[QQ_INFO_GENDER], NULL, 10);
 	bd->face = strtol(segments[QQ_INFO_FACE], NULL, 10);
+
 	if (alias_utf8 != NULL) {
 		if (bd->nickname) g_free(bd->nickname);
 		bd->nickname = g_strdup(alias_utf8);
diff --git a/libpurple/protocols/qq/buddy_list.c b/libpurple/protocols/qq/buddy_list.c
index e826354753..a1712f90a9 100644
--- a/libpurple/protocols/qq/buddy_list.c
+++ b/libpurple/protocols/qq/buddy_list.c
@@ -47,7 +47,6 @@
 #define QQ_GET_ONLINE_BUDDY_03          0x03	/* unknown function */
 
 typedef struct _qq_buddy_online {
-	qq_buddy_status bs;
 	guint16 unknown1;
 	guint8 ext_flag;
 	guint8 comm_flag;
diff --git a/libpurple/protocols/qq/buddy_opt.c b/libpurple/protocols/qq/buddy_opt.c
index d2527aa285..f33ec7615b 100644
--- a/libpurple/protocols/qq/buddy_opt.c
+++ b/libpurple/protocols/qq/buddy_opt.c
@@ -1012,7 +1012,6 @@ void qq_process_buddy_check_code(PurpleConnection *gc, guint8 *data, gint data_l
 	guint16 flag1, flag2;
 
 	g_return_if_fail(data != NULL && data_len >= 5);
-	g_return_if_fail(uid != 0);
 
 	qd = (qq_data *) gc->proto_data;
 
diff --git a/libpurple/protocols/qq/group_im.c b/libpurple/protocols/qq/group_im.c
index f3f1bf0ab7..2c4ef4d31c 100644
--- a/libpurple/protocols/qq/group_im.c
+++ b/libpurple/protocols/qq/group_im.c
@@ -52,6 +52,7 @@ PurpleConversation *qq_room_conv_open(PurpleConnection *gc, qq_room_data *rmd)
 	gchar *topic_utf8;
 
 	g_return_val_if_fail(rmd != NULL, NULL);
+	g_return_val_if_fail(rmd->title_utf8, NULL);
 	qd = (qq_data *) gc->proto_data;
 
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
diff --git a/libpurple/protocols/qq/qq.c b/libpurple/protocols/qq/qq.c
index 1fc436d22c..72d28a0e82 100644
--- a/libpurple/protocols/qq/qq.c
+++ b/libpurple/protocols/qq/qq.c
@@ -674,8 +674,8 @@ static void action_about_openq(PurplePluginAction *action)
 	g_string_append(info, "wd<br>\n");
 	g_string_append(info, "x6719620<br>\n");
 	g_string_append(info, "netelk<br>\n");
-	g_string_append(info, "and more, please let me know... thank you!<br>\n");
-	g_string_append(info, "<br>\n");
+	g_string_append(info, _("and more, please let me know... thank you!))"));
+	g_string_append(info, "<br>\n<br>\n");
 	g_string_append(info, _("<p><i>And, all the boys in the backroom...</i><br>\n"));
 	g_string_append(info, _("<i>Feel free to join us!</i> :)"));
 	g_string_append(info, "</body></html>");
@@ -1035,7 +1035,9 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,							/* get attention_types */
 
 	sizeof(PurplePluginProtocolInfo), /* struct_size */
-	NULL
+	NULL,							/* get_account_text_table */
+	NULL,							/* initiate_media */
+	NULL                            /* can_do_media */
 };
 
 static PurplePluginInfo info = {
diff --git a/libpurple/protocols/qq/qq_base.c b/libpurple/protocols/qq/qq_base.c
index 961c5c2b72..511a98e6a3 100644
--- a/libpurple/protocols/qq/qq_base.c
+++ b/libpurple/protocols/qq/qq_base.c
@@ -72,7 +72,7 @@ static gint8 process_login_ok(PurpleConnection *gc, guint8 *data, gint len)
 		qq_show_packet("Login reply OK, but length < 139", data, len);
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
-				_("Cannot decrypt server reply"));
+				_("Unable to decrypt server reply"));
 		return QQ_LOGIN_REPLY_ERR;
 	}
 
@@ -160,7 +160,7 @@ static gint8 process_login_redirect(PurpleConnection *gc, guint8 *data, gint len
 	if (len < 11) {
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
-				_("Cannot decrypt server reply"));
+				_("Unable to decrypt server reply"));
 		return QQ_LOGIN_REPLY_ERR;
 	}
 
@@ -412,7 +412,7 @@ guint8 qq_process_login( PurpleConnection *gc, guint8 *data, gint data_len)
 			if (!purple_account_get_remember_password(gc->account)) {
 				purple_account_set_password(gc->account, NULL);
 			}
-			error = g_strdup( _("Incorrect password."));
+			error = g_strdup( _("Incorrect password"));
 			reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
 			break;
 		case 0x06:		/* need activation */
@@ -655,7 +655,7 @@ guint16 qq_process_get_server(PurpleConnection *gc, guint8 *data, gint data_len)
 	if (data_len < 15) {
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
-				_("Could not decrypt server reply"));
+				_("Unable to decrypt server reply"));
 		return QQ_LOGIN_REPLY_ERR;
 	}
 
@@ -1097,7 +1097,7 @@ guint8 qq_process_check_pwd( PurpleConnection *gc, guint8 *data, gint data_len)
 			if (!purple_account_get_remember_password(gc->account)) {
 				purple_account_set_password(gc->account, NULL);
 			}
-			error = g_strdup(_("Incorrect password."));
+			error = g_strdup(_("Incorrect password"));
 			reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
 			break;
 		case 0x33:		/* need activation */
@@ -1106,7 +1106,7 @@ guint8 qq_process_check_pwd( PurpleConnection *gc, guint8 *data, gint data_len)
 			reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
 			break;
 		case 0xBF:		/* uid is not exist */
-			error = g_strdup(_("Invalid username."));
+			error = g_strdup(_("Username does not exist"));
 			reason = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
 			break;
 		default:
diff --git a/libpurple/protocols/qq/qq_crypt.c b/libpurple/protocols/qq/qq_crypt.c
index 8de97da9e0..c6a0914ef4 100644
--- a/libpurple/protocols/qq/qq_crypt.c
+++ b/libpurple/protocols/qq/qq_crypt.c
@@ -163,9 +163,11 @@ static inline void encrypt_out(guint8 *crypted, const gint crypted_len, const gu
 		c32_prev[0] = crypted32[0]; c32_prev[1] = crypted32[1];
 		
 		/* set next 64 bits want to crypt*/
-		crypted_ptr += 8;
-		memcpy(crypted32, crypted_ptr, sizeof(crypted32));
-		plain32[0] = crypted32[0] ^ c32_prev[0]; plain32[1] = crypted32[1] ^ c32_prev[1];
+		if (count64 > 0) {
+			crypted_ptr += 8;
+			memcpy(crypted32, crypted_ptr, sizeof(crypted32));
+			plain32[0] = crypted32[0] ^ c32_prev[0]; plain32[1] = crypted32[1] ^ c32_prev[1];
+		}
 	}
 }
 
@@ -275,7 +277,7 @@ static inline gint decrypt_out(guint8 *dest, gint crypted_len, const guint8* con
 	}
 	
 	count64 = crypted_len / 8;
-	while (count64-- > 0){
+	while (--count64 > 0){
 		c32_prev[0] = crypted32[0]; c32_prev[1] = crypted32[1];
 		crypted_ptr += 8;
 
diff --git a/libpurple/protocols/qq/qq_network.c b/libpurple/protocols/qq/qq_network.c
index 8579d7b6fb..da3f033d45 100644
--- a/libpurple/protocols/qq/qq_network.c
+++ b/libpurple/protocols/qq/qq_network.c
@@ -208,7 +208,7 @@ gboolean qq_connect_later(gpointer data)
 		if ( set_new_server(qd) != TRUE) {
 			purple_connection_error_reason(gc,
 					PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-					_("Unable to connect."));
+					_("Unable to connect"));
 			return FALSE;
 		}
 		qd->connect_retry = QQ_CONNECT_MAX;
@@ -233,7 +233,7 @@ gboolean qq_connect_later(gpointer data)
 	if ( !connect_to_server(gc, tmp_server, port) ) {
 			purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Unable to connect."));
+				_("Unable to connect"));
 	}
 
 	g_free(tmp_server);
@@ -389,7 +389,7 @@ static void tcp_pending(gpointer data, gint source, PurpleInputCondition cond)
 			/* No worries */
 			return;
 
-		error_msg = g_strdup_printf(_("Lost connection with server:\n%s"), g_strerror(errno));
+		error_msg = g_strdup_printf(_("Lost connection with server: %s"), g_strerror(errno));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 				error_msg);
@@ -397,7 +397,7 @@ static void tcp_pending(gpointer data, gint source, PurpleInputCondition cond)
 		return;
 	} else if (buf_len == 0) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Server closed the connection."));
+				_("Server closed the connection"));
 		return;
 	}
 
@@ -585,9 +585,11 @@ static void tcp_can_write(gpointer data, gint source, PurpleInputCondition cond)
 		return;
 	else if (ret < 0) {
 		/* TODO: what to do here - do we really have to disconnect? */
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+				g_strerror(errno));
 		purple_connection_error_reason(gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-		        _("Write Error"));
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		return;
 	}
 
@@ -629,11 +631,13 @@ static gint tcp_send_out(PurpleConnection *gc, guint8 *data, gint data_len)
 		ret = 0;
 	} else if (ret <= 0) {
 		/* TODO: what to do here - do we really have to disconnect? */
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+				g_strerror(errno));
 		purple_debug_error("TCP_SEND_OUT",
 			"Send to socket %d failed: %d, %s\n", qd->fd, errno, g_strerror(errno));
 		purple_connection_error_reason(gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				g_strerror(errno));
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		return ret;
 	}
 
@@ -663,7 +667,7 @@ static gboolean network_timeout(gpointer data)
 	if (is_lost_conn) {
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Connection lost"));
+			_("Lost connection with server"));
 		return TRUE;
 	}
 
@@ -864,7 +868,7 @@ static void udp_host_resolved(GSList *hosts, gpointer data, const char *error_me
 	if (!hosts || !hosts->data) {
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Couldn't resolve host"));
+				_("Unable to resolve hostname"));
 		return;
 	}
 
@@ -941,7 +945,7 @@ gboolean connect_to_server(PurpleConnection *gc, gchar *server, gint port)
 	account = purple_connection_get_account(gc);
 	qd = (qq_data *) gc->proto_data;
 
-	if (server == NULL || strlen(server) == 0 || port == 0) {
+	if (server == NULL || server[0] == '\0' || port == 0) {
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 				_("Invalid server or port"));
diff --git a/libpurple/protocols/qq/qq_process.c b/libpurple/protocols/qq/qq_process.c
index 2fb0c6b927..14fd6fb846 100644
--- a/libpurple/protocols/qq/qq_process.c
+++ b/libpurple/protocols/qq/qq_process.c
@@ -951,7 +951,7 @@ guint8 qq_proc_login_cmds(PurpleConnection *gc,  guint16 cmd, guint16 seq,
 		qq_show_packet("Can not decrypted", rcved, rcved_len);
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
-				_("Could not decrypt login reply"));
+				_("Unable to decrypt login reply"));
 		return QQ_LOGIN_REPLY_ERR;
 	}
 
diff --git a/libpurple/protocols/qq/send_file.c b/libpurple/protocols/qq/send_file.c
index 38d9504269..d710e6d76a 100644
--- a/libpurple/protocols/qq/send_file.c
+++ b/libpurple/protocols/qq/send_file.c
@@ -152,7 +152,7 @@ static void _qq_xfer_recv_packet(gpointer data, gint source, PurpleInputConditio
 	gint size;
 	/* FIXME: It seems that the transfer never use a packet
 	 * larger than 1500 bytes, so if it happened to be a
-	 * larger packet, either error occured or protocol should
+	 * larger packet, either error occurred or protocol should
 	 * be modified
 	 */
 	ft_info *info;
@@ -730,7 +730,7 @@ void qq_process_recv_file_cancel (guint8 *data, gint data_len,
 	*/
 	filename = g_path_get_basename(purple_xfer_get_local_filename(qd->xfer));
 	msg = g_strdup_printf
-		(_("%d canceled the transfer of %s"),
+		(_("%d cancelled the transfer of %s"),
 		 sender_uid, filename);
 
 	purple_notify_warning (gc, _("File Send"), msg, NULL);
diff --git a/libpurple/protocols/qq/utils.c b/libpurple/protocols/qq/utils.c
index cc8879af8b..178b699ee9 100644
--- a/libpurple/protocols/qq/utils.c
+++ b/libpurple/protocols/qq/utils.c
@@ -222,7 +222,8 @@ static gchar *strstrip(const gchar *const buffer)
  * The return should be freed later. */
 guint8 *hex_str_to_bytes(const gchar *const buffer, gint *out_len)
 {
-	gchar *hex_str, *hex_buffer, *cursor, tmp;
+	gchar *hex_str, *hex_buffer, *cursor;
+	gchar tmp[2];
 	guint8 *bytes, nibble1, nibble2;
 	gint index;
 
@@ -242,7 +243,9 @@ guint8 *hex_str_to_bytes(const gchar *const buffer, gint *out_len)
 	index = 0;
 	for (cursor = hex_str; cursor < hex_str + sizeof(gchar) * (strlen(hex_str)) - 1; cursor++) {
 		if (g_ascii_isdigit(*cursor)) {
-			tmp = *cursor; nibble1 = atoi(&tmp);
+			tmp[0] = *cursor;
+			tmp[1] = '\0';
+			nibble1 = atoi(tmp);
 		} else if (g_ascii_isalpha(*cursor) && (gint) *cursor - 87 < 16) {
 			nibble1 = (gint) *cursor - 87;
 		} else {
@@ -254,7 +257,9 @@ guint8 *hex_str_to_bytes(const gchar *const buffer, gint *out_len)
 		nibble1 = nibble1 << 4;
 		cursor++;
 		if (g_ascii_isdigit(*cursor)) {
-			tmp = *cursor; nibble2 = atoi(&tmp);
+			tmp[0] = *cursor;
+			tmp[1] = '\0';
+			nibble2 = atoi(tmp);
 		} else if (g_ascii_isalpha(*cursor) && (gint) (*cursor - 87) < 16) {
 			nibble2 = (gint) *cursor - 87;
 		} else {
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
index 5e35c3c3fe..c36e27c452 100644
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -28,8 +28,6 @@
 
 /* glib includes */
 #include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
 
 /* purple includes */
 #include "internal.h"
@@ -413,11 +411,14 @@ static int mw_session_io_write(struct mwSession *session,
     pd->outpa = purple_input_add(pd->socket, PURPLE_INPUT_WRITE, write_cb, pd);
 
   } else if(len > 0) {
+	gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+			g_strerror(errno));
     DEBUG_ERROR("write returned %" G_GSSIZE_FORMAT ", %" G_GSIZE_FORMAT
 			" bytes left unwritten\n", ret, len);
     purple_connection_error_reason(pd->gc,
                                    PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-                                   _("Connection closed (writing)"));
+                                   tmp);
+	g_free(tmp);
 
 #if 0
     close(pd->socket);
@@ -810,7 +811,7 @@ static gboolean blist_save_cb(gpointer data) {
 static void blist_schedule(struct mwPurplePluginData *pd) {
   if(pd->save_event) return;
 
-  pd->save_event = purple_timeout_add(BLIST_SAVE_SECONDS * 1000,
+  pd->save_event = purple_timeout_add_seconds(BLIST_SAVE_SECONDS,
 				    blist_save_cb, pd);
 }
 
@@ -1468,7 +1469,7 @@ static void session_loginRedirect(struct mwSession *session,
 
   if(purple_account_get_bool(account, MW_KEY_FORCE, FALSE) ||
      !host || (! strcmp(current_host, host)) ||
-     (purple_proxy_connect(NULL, account, host, port, connect_cb, pd) == NULL)) {
+     (purple_proxy_connect(gc, account, host, port, connect_cb, pd) == NULL)) {
 
     /* if we're configured to force logins, or if we're being
        redirected to the already configured host, or if we couldn't
@@ -1757,11 +1758,10 @@ static void read_cb(gpointer data, gint source, PurpleInputCondition cond) {
   }
 
   if(! ret) {
-    const char *msg = _("Connection reset");
     DEBUG_INFO("connection reset\n");
     purple_connection_error_reason(pd->gc,
                                    PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-                                   msg);
+                                   _("Server closed the connection"));
 
   } else if(ret < 0) {
     const gchar *err_str = g_strerror(err);
@@ -1769,7 +1769,7 @@ static void read_cb(gpointer data, gint source, PurpleInputCondition cond) {
 
     DEBUG_INFO("error in read callback: %s\n", err_str);
 
-    msg = g_strdup_printf(_("Error reading from socket: %s"), err_str);
+    msg = g_strdup_printf(_("Lost connection with server: %s"), err_str);
     purple_connection_error_reason(pd->gc,
                                    PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
                                    msg);
@@ -1794,10 +1794,12 @@ static void connect_cb(gpointer data, gint source, const gchar *error_message) {
 
     } else {
       /* this is a regular connect, error out */
-      const char *msg = _("Unable to connect to host");
+      gchar *tmp = g_strdup_printf(_("Unable to connect: %s"),
+          error_message);
       purple_connection_error_reason(pd->gc,
                                      PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-                                     msg);
+                                     tmp);
+      g_free(tmp);
     }
 
     return;
@@ -3802,7 +3804,7 @@ static void mw_prpl_login(PurpleAccount *account) {
 
   if (purple_proxy_connect(gc, account, host, port, connect_cb, pd) == NULL) {
     purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-                                   _("Unable to connect to host"));
+                                   _("Unable to connect"));
   }
 }
 
@@ -5209,7 +5211,8 @@ static PurplePluginProtocolInfo mw_prpl_info = {
   .new_xfer                  = mw_prpl_new_xfer,
   .offline_message           = NULL,
   .whiteboard_prpl_ops       = NULL,
-  .send_raw                  = NULL
+  .send_raw                  = NULL,
+  .struct_size               = sizeof(PurplePluginProtocolInfo)		
 };
 
 
diff --git a/libpurple/protocols/silc/buddy.c b/libpurple/protocols/silc/buddy.c
index 7b2a055ff2..072509c06b 100644
--- a/libpurple/protocols/silc/buddy.c
+++ b/libpurple/protocols/silc/buddy.c
@@ -1397,40 +1397,26 @@ silcpurple_add_buddy_i(PurpleConnection *gc, PurpleBuddy *b, gboolean init)
 
 void silcpurple_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
-	silcpurple_add_buddy_i(gc, buddy, FALSE);
+	/* Don't add if the buddy is already on the list.
+	 *
+	 * SILC doesn't have groups, so we also don't need to do anything
+	 * for a move. */
+	if (purple_buddy_get_protocol_data(buddy) == NULL)
+		silcpurple_add_buddy_i(gc, buddy, FALSE);
 }
 
 void silcpurple_send_buddylist(PurpleConnection *gc)
 {
-	PurpleBlistNode *gnode, *cnode, *bnode;
-	PurpleBuddy *buddy;
+	GSList *buddies;
 	PurpleAccount *account;
 
 	account = purple_connection_get_account(gc);
 
-	for (gnode = purple_blist_get_root();
-			gnode != NULL;
-			gnode = purple_blist_node_get_sibling_next(gnode))
+	for (buddies = purple_find_buddies(account, NULL); buddies;
+			buddies = g_slist_delete_link(buddies, buddies))
 	{
-		if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-		for (cnode = purple_blist_node_get_first_child(gnode);
-				cnode != NULL;
-				cnode = purple_blist_node_get_sibling_next(cnode))
-		{
-			if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-			for (bnode = purple_blist_node_get_first_child(cnode);
-					bnode != NULL;
-					bnode = purple_blist_node_get_sibling_next(bnode))
-			{
-				if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-				buddy = (PurpleBuddy *)bnode;
-				if (purple_buddy_get_account(buddy) == account)
-					silcpurple_add_buddy_i(gc, buddy, TRUE);
-			}
-		}
+		PurpleBuddy *buddy = buddies->data;
+		silcpurple_add_buddy_i(gc, buddy, TRUE);
 	}
 }
 
diff --git a/libpurple/protocols/silc/ops.c b/libpurple/protocols/silc/ops.c
index 649b9b8afc..e57ba67018 100644
--- a/libpurple/protocols/silc/ops.c
+++ b/libpurple/protocols/silc/ops.c
@@ -71,7 +71,7 @@ void silc_say(SilcClient client, SilcClientConnection conn,
 		gc = client->application;
 
 	if (gc != NULL)
-		purple_connection_error_reason (gc, reason, tmp);
+		purple_connection_error_reason(gc, reason, tmp);
 	else
 		purple_notify_error(NULL, _("Error"), _("Error occurred"), tmp);
 }
@@ -839,7 +839,7 @@ silc_notify(SilcClient client, SilcClientConnection conn,
 
 			b = NULL;
 			if (public_key) {
-				PurpleBlistNode *gnode, *cnode, *bnode;
+				GSList *buddies;
 				const char *f;
 
 				pk = silc_pkcs_public_key_encode(public_key, &pk_len);
@@ -857,29 +857,13 @@ silc_notify(SilcClient client, SilcClientConnection conn,
 				silc_free(pk);
 
 				/* Find buddy by associated public key */
-				for (gnode = purple_blist_get_root(); gnode;
-				     gnode = purple_blist_node_get_sibling_next(gnode)) {
-					if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-						continue;
-					for (cnode = purple_blist_node_get_first_child(gnode);
-							cnode;
-							cnode = purple_blist_node_get_sibling_next(cnode)) {
-						if( !PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-							continue;
-						for (bnode = purple_blist_node_get_first_child(cnode);
-								bnode;
-								bnode = purple_blist_node_get_sibling_next(bnode)) {
-							if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-								continue;
-							b = (PurpleBuddy *)bnode;
-							if (purple_buddy_get_account(b) != account)
-								continue;
-							f = purple_blist_node_get_string(bnode, "public-key");
-							if (f && !strcmp(f, buf))
-								goto cont;
-							b = NULL;
-						}
-					}
+				for (buddies = purple_find_buddies(account, NULL); buddies;
+						buddies = g_slist_delete_link(buddies, buddies)) {
+					b = buddies->data;
+					f = purple_blist_node_get_string(PURPLE_BLIST_NODE(b), "public-key");
+					if (purple_strequal(f, buf))
+						goto cont;
+					b = NULL;
 				}
 			}
 		cont:
diff --git a/libpurple/protocols/silc/silc.c b/libpurple/protocols/silc/silc.c
index 4088f1c078..7680562e6f 100644
--- a/libpurple/protocols/silc/silc.c
+++ b/libpurple/protocols/silc/silc.c
@@ -325,7 +325,7 @@ silcpurple_connect_cb(SilcClient client, SilcClientConnection conn,
 
 	case SILC_CLIENT_CONN_ERROR:
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-		                             _("Error during connecting to SILC Server"));
+		                             _("Error connecting to SILC Server"));
 		g_unlink(silcpurple_session_file(purple_account_get_username(sg->account)));
 		break;
 
@@ -348,7 +348,7 @@ silcpurple_connect_cb(SilcClient client, SilcClientConnection conn,
 
 	case SILC_CLIENT_CONN_ERROR_TIMEOUT:
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-		                             _("Connection Timeout"));
+		                             _("Connection timed out"));
 		break;
 	}
 
@@ -447,7 +447,7 @@ static void silcpurple_continue_running(SilcPurple sg)
 				 silcpurple_login_connected, gc) == NULL)
 	{
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-		                             _("Unable to create connection"));
+		                             _("Unable to connect"));
 		gc->proto_data = NULL;
 		silc_free(sg);
 		return;
@@ -490,7 +490,7 @@ static void silcpurple_got_password_cb(PurpleConnection *gc, PurpleRequestFields
 				password,
 				&sg->public_key, &sg->private_key)) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-		                             _("Could not load SILC key pair"));
+		                             _("Unable to load SILC key pair"));
 		gc->proto_data = NULL;
 		silc_free(sg);
 		return;
@@ -506,7 +506,7 @@ static void silcpurple_no_password_cb(PurpleConnection *gc, PurpleRequestFields
 		return;
 	sg = gc->proto_data;
 	purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-			_("Could not load SILC key pair"));
+			_("Unable to load SILC key pair"));
 	gc->proto_data = NULL;
 	silc_free(sg);
 }
@@ -535,7 +535,7 @@ static void silcpurple_running(SilcClient client, void *context)
 			return;
 		}
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-		                             _("Could not load SILC key pair"));
+		                             _("Unable to load SILC key pair"));
 		gc->proto_data = NULL;
 		silc_free(sg);
 		return;
@@ -617,7 +617,7 @@ silcpurple_login(PurpleAccount *account)
 	if (!silc_client_init(client, username, hostname, realname,
 			      silcpurple_running, sg)) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-		                             _("Cannot initialize SILC protocol"));
+		                             _("Unable to initialize SILC protocol"));
 		gc->proto_data = NULL;
 		silc_free(sg);
 		silc_free(hostname);
@@ -2109,13 +2109,13 @@ static PurplePluginProtocolInfo prpl_info =
 	&silcpurple_wb_ops,			/* whiteboard_prpl_ops */
 	NULL,					/* send_raw */
 	NULL,				        /* roomlist_room_serialize */
-
-	/* padding */
-	NULL,
-	NULL,
-	NULL,
+	NULL,				        /* unregister_user */
+	NULL,				        /* send_attention */
+	NULL,				        /* get_attention_types */
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	NULL,				        /* get_account_text_table */
+	NULL,				        /* initiate_media */
+	NULL                        /* can_do_media */
 };
 
 static PurplePluginInfo info =
diff --git a/libpurple/protocols/silc/util.c b/libpurple/protocols/silc/util.c
index 82e35bbfb2..6aebad8360 100644
--- a/libpurple/protocols/silc/util.c
+++ b/libpurple/protocols/silc/util.c
@@ -213,7 +213,7 @@ gboolean silcpurple_check_silc_dir(PurpleConnection *gc)
 						  ? "" : gc->password,
 						  NULL, NULL, FALSE)) {
 				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-				                             _("Cannot create SILC key pair\n"));
+				                             _("Unable to create SILC key pair"));
 				return FALSE;
 			}
 
@@ -256,7 +256,7 @@ gboolean silcpurple_check_silc_dir(PurpleConnection *gc)
 						  ? "" : gc->password,
 						  NULL, NULL, FALSE)) {
 				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-				                             _("Cannot create SILC key pair\n"));
+				                             _("Unable to create SILC key pair"));
 				return FALSE;
 			}
 
diff --git a/libpurple/protocols/silc10/buddy.c b/libpurple/protocols/silc10/buddy.c
index 67e53f630f..5939ef40a0 100644
--- a/libpurple/protocols/silc10/buddy.c
+++ b/libpurple/protocols/silc10/buddy.c
@@ -1390,7 +1390,12 @@ silcpurple_add_buddy_i(PurpleConnection *gc, PurpleBuddy *b, gboolean init)
 
 void silcpurple_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
-	silcpurple_add_buddy_i(gc, buddy, FALSE);
+	/* Don't add if the buddy is already on the list.
+	 *
+	 * SILC doesn't have groups, so we don't need to do anything
+	 * for a move. */
+	if (purple_buddy_get_protocol_data(buddy) == NULL)
+		silcpurple_add_buddy_i(gc, buddy, FALSE);
 }
 
 void silcpurple_send_buddylist(PurpleConnection *gc)
diff --git a/libpurple/protocols/silc10/ops.c b/libpurple/protocols/silc10/ops.c
index 196c5a7014..f4b42fe3b7 100644
--- a/libpurple/protocols/silc10/ops.c
+++ b/libpurple/protocols/silc10/ops.c
@@ -1722,7 +1722,7 @@ silc_connected(SilcClient client, SilcClientConnection conn,
 
 	case SILC_CLIENT_CONN_ERROR_TIMEOUT:
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Connection Timeout"));
+			_("Connection timed out"));
 		break;
 	}
 
diff --git a/libpurple/protocols/silc10/silc.c b/libpurple/protocols/silc10/silc.c
index 7ea8e9cb4e..faa78b5aa1 100644
--- a/libpurple/protocols/silc10/silc.c
+++ b/libpurple/protocols/silc10/silc.c
@@ -183,7 +183,7 @@ silcpurple_login_connected(gpointer data, gint source, const gchar *error_messag
 			  purple_account_get_int(account, "port", 706), sg);
 	if (!conn) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Cannot initialize SILC Client connection"));
+			_("Unable to initialize SILC Client connection"));
 		gc->proto_data = NULL;
 		return;
 	}
@@ -315,7 +315,7 @@ silcpurple_login(PurpleAccount *account)
 	/* Init SILC client */
 	if (!silc_client_init(client)) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-		                             _("Cannot initialize SILC protocol"));
+		                             _("Unable to initialize SILC protocol"));
 		return;
 	}
 
@@ -336,9 +336,9 @@ silcpurple_login(PurpleAccount *account)
 							(char *)purple_account_get_string(account, "private-key", prd),
 				(gc->password == NULL) ? "" : gc->password, &client->pkcs,
 				&client->public_key, &client->private_key)) {
-		g_snprintf(pkd, sizeof(pkd), _("Could not load SILC key pair: %s"), g_strerror(errno));
+		g_snprintf(pkd, sizeof(pkd), _("Unable to load SILC key pair: %s"), g_strerror(errno));
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-		                             _("Could not load SILC key pair"));
+		                             pkd);
 		return;
 	}
 
@@ -1836,12 +1836,13 @@ static PurplePluginProtocolInfo prpl_info =
 	&silcpurple_wb_ops,			/* whiteboard_prpl_ops */
 	NULL,                       /* send_raw */
 	NULL,                       /* roomlist_room_serialize */
-
-	NULL,
-	NULL,
-	NULL,
+	NULL,                       /* unregister_user */
+	NULL,                       /* send_attention */
+	NULL,                       /* get_attention_types */
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	NULL,                       /* get_account_text_table */
+	NULL,                       /* initiate_media */
+	NULL                       /* can_do_media */
 };
 
 static PurplePluginInfo info =
diff --git a/libpurple/protocols/simple/simple.c b/libpurple/protocols/simple/simple.c
index 8eb9060cb9..b3dabdd452 100644
--- a/libpurple/protocols/simple/simple.c
+++ b/libpurple/protocols/simple/simple.c
@@ -213,27 +213,18 @@ static void simple_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGro
 }
 
 static void simple_get_buddies(PurpleConnection *gc) {
-	PurpleBlistNode *gnode, *cnode, *bnode;
+	GSList *buddies;
 	PurpleAccount *account;
 
 	purple_debug_info("simple", "simple_get_buddies\n");
 
 	account = purple_connection_get_account(gc);
-	for(gnode = purple_blist_get_root(); gnode;
-			gnode = purple_blist_node_get_sibling_next(gnode)) {
-		if(!PURPLE_BLIST_NODE_IS_GROUP(gnode)) continue;
-		for(cnode = purple_blist_node_get_first_child(gnode);
-				cnode;
-				cnode = purple_blist_node_get_sibling_next(cnode)) {
-			if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode)) continue;
-			for(bnode = purple_blist_node_get_first_child(cnode);
-					bnode;
-					bnode = purple_blist_node_get_sibling_next(bnode)) {
-				if(!PURPLE_BLIST_NODE_IS_BUDDY(bnode)) continue;
-				if(purple_buddy_get_account((PurpleBuddy*)bnode) == account)
-					simple_add_buddy(gc, (PurpleBuddy*)bnode, (PurpleGroup *)gnode);
-			}
-		}
+	buddies = purple_find_buddies(account, NULL);
+	while (buddies) {
+		PurpleBuddy *buddy = buddies->data;
+		simple_add_buddy(gc, buddy, purple_buddy_get_group(buddy));
+
+		buddies = g_slist_delete_link(buddies, buddies);
 	}
 }
 
@@ -437,11 +428,13 @@ static void simple_canwrite_cb(gpointer data, gint source, PurpleInputCondition
 
 	if(written < 0 && errno == EAGAIN)
 		written = 0;
-	else if(written <= 0) {
+	else if (written <= 0) {
 		/*TODO: do we really want to disconnect on a failure to write?*/
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+				g_strerror(errno));
 		purple_connection_error_reason(gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Could not write"));
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		return;
 	}
 
@@ -450,22 +443,17 @@ static void simple_canwrite_cb(gpointer data, gint source, PurpleInputCondition
 
 static void simple_input_cb(gpointer data, gint source, PurpleInputCondition cond);
 
-static void send_later_cb(gpointer data, gint source, const gchar *error) {
+static void send_later_cb(gpointer data, gint source, const gchar *error_message) {
 	PurpleConnection *gc = data;
 	struct simple_account_data *sip;
 	struct sip_connection *conn;
 
-	if (!PURPLE_CONNECTION_IS_VALID(gc))
-	{
-		if (source >= 0)
-			close(source);
-		return;
-	}
-
 	if(source < 0) {
+		gchar *tmp = g_strdup_printf(_("Unable to connect: %s"),
+				error_message);
 		purple_connection_error_reason(gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Could not connect"));
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		return;
 	}
 
@@ -491,7 +479,7 @@ static void sendlater(PurpleConnection *gc, const char *buf) {
 	if(!sip->connecting) {
 		purple_debug_info("simple", "connecting to %s port %d\n", sip->realhostname ? sip->realhostname : "{NULL}", sip->realport);
 		if (purple_proxy_connect(gc, sip->account, sip->realhostname, sip->realport, send_later_cb, gc) == NULL) {
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Couldn't create socket"));
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Unable to connect"));
 		}
 		sip->connecting = TRUE;
 	}
@@ -1136,7 +1124,7 @@ gboolean process_register_response(struct simple_account_data *sip, struct sipms
 						purple_account_set_password(sip->gc->account, NULL);
 					purple_connection_error_reason(sip->gc,
 						PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
-						_("Incorrect password."));
+						_("Incorrect password"));
 					return TRUE;
 				}
 				tmp = sipmsg_find_header(msg, "WWW-Authenticate");
@@ -1151,7 +1139,7 @@ gboolean process_register_response(struct simple_account_data *sip, struct sipms
 				if (sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
 					purple_connection_error_reason(sip->gc,
 						PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-						_("Unknown server response."));
+						_("Unknown server response"));
 					return TRUE;
 				}
 				sip->registerstatus = SIMPLE_REGISTER_RETRY;
@@ -1744,17 +1732,12 @@ static void login_cb(gpointer data, gint source, const gchar *error_message) {
 	struct simple_account_data *sip;
 	struct sip_connection *conn;
 
-	if (!PURPLE_CONNECTION_IS_VALID(gc))
-	{
-		if (source >= 0)
-			close(source);
-		return;
-	}
-
 	if(source < 0) {
+		gchar *tmp = g_strdup_printf(_("Unable to connect: %s"),
+				error_message);
 		purple_connection_error_reason(gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Could not connect"));
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 		return;
 	}
 
@@ -1790,7 +1773,7 @@ static void simple_udp_host_resolved_listen_cb(int listenfd, gpointer data) {
 	if(listenfd == -1) {
 		purple_connection_error_reason(sip->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Could not create listen socket"));
+			_("Unable to create listen socket"));
 		return;
 	}
 
@@ -1815,7 +1798,7 @@ static void simple_udp_host_resolved(GSList *hosts, gpointer data, const char *e
 	if (!hosts || !hosts->data) {
 		purple_connection_error_reason(sip->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Couldn't resolve host"));
+			_("Unable to resolve hostname"));
 		return;
 	}
 
@@ -1836,7 +1819,7 @@ static void simple_udp_host_resolved(GSList *hosts, gpointer data, const char *e
 	if (sip->listen_data == NULL) {
 		purple_connection_error_reason(sip->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Could not create listen socket"));
+			_("Unable to create listen socket"));
 		return;
 	}
 }
@@ -1851,7 +1834,7 @@ simple_tcp_connect_listen_cb(int listenfd, gpointer data) {
 	if(sip->listenfd == -1) {
 		purple_connection_error_reason(sip->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Could not create listen socket"));
+			_("Unable to create listen socket"));
 		return;
 	}
 
@@ -1866,7 +1849,7 @@ simple_tcp_connect_listen_cb(int listenfd, gpointer data) {
 			sip->realport, login_cb, sip->gc) == NULL) {
 		purple_connection_error_reason(sip->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Couldn't create socket"));
+			_("Unable to connect"));
 	}
 }
 
@@ -1906,7 +1889,7 @@ static void srvresolved(PurpleSrvResponse *resp, int results, gpointer data) {
 		if (sip->listen_data == NULL) {
 			purple_connection_error_reason(sip->gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Could not create listen socket"));
+				_("Unable to create listen socket"));
 			return;
 		}
 	} else { /* UDP */
@@ -1916,7 +1899,7 @@ static void srvresolved(PurpleSrvResponse *resp, int results, gpointer data) {
 		if (sip->query_data == NULL) {
 			purple_connection_error_reason(sip->gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Could not resolve hostname"));
+				_("Unable to resolve hostname"));
 		}
 	}
 }
@@ -2097,13 +2080,13 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,					/* whiteboard_prpl_ops */
 	simple_send_raw,		/* send_raw */
 	NULL,					/* roomlist_room_serialize */
-
-	/* padding */
-	NULL,
-	NULL,
-	NULL,
+	NULL,					/* unregister_user */
+	NULL,					/* send_attention */
+	NULL,					/* get_attention_types */
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	NULL,					/* get_account_text_table */
+	NULL,					/* initiate_media */
+	NULL					/* can_do_media */
 };
 
 
diff --git a/libpurple/protocols/toc/Makefile.am b/libpurple/protocols/toc/Makefile.am
deleted file mode 100644
index db41dfa9ad..0000000000
--- a/libpurple/protocols/toc/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-EXTRA_DIST = \
-	PROTOCOL \
-	Makefile.mingw
-
-pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
-
-TOCSOURCES = toc.c
-
-AM_CFLAGS = $(st)
-
-libtoc_la_LDFLAGS = -module -avoid-version
-
-if STATIC_TOC
-
-st = -DPURPLE_STATIC_PRPL
-noinst_LTLIBRARIES = libtoc.la
-libtoc_la_SOURCES  = $(TOCSOURCES)
-libtoc_la_CFLAGS   = $(AM_CFLAGS)
-
-else
-
-st =
-pkg_LTLIBRARIES   = libtoc.la
-libtoc_la_SOURCES = $(TOCSOURCES)
-
-endif
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/libpurple \
-	-I$(top_builddir)/libpurple \
-	$(GLIB_CFLAGS) \
-	$(DEBUG_CFLAGS)
diff --git a/libpurple/protocols/toc/Makefile.mingw b/libpurple/protocols/toc/Makefile.mingw
deleted file mode 100644
index 4da3a3dc26..0000000000
--- a/libpurple/protocols/toc/Makefile.mingw
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of libtoc
-#
-
-PIDGIN_TREE_TOP := ../../..
-include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-
-TARGET = libtoc
-TYPE = PLUGIN
-
-# Static or Plugin...
-ifeq ($(TYPE),STATIC)
-  DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
-else
-ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
-endif
-endif
-
-##
-## INCLUDE PATHS
-##
-INCLUDE_PATHS +=	-I$(TOC_ROOT) \
-			-I$(GTK_TOP)/include \
-			-I$(GTK_TOP)/include/glib-2.0 \
-			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(LIBPIDGIN_TREE_TOP) \
-			-I$(LIBPIDGIN_TREE_TOP)/win32 \
-			-I$(PIDGIN_TREE_TOP)
-
-LIB_PATHS +=		-L$(GTK_TOP)/lib \
-			-L$(LIBPIDGIN_TREE_TOP)
-
-##
-##  SOURCES, OBJECTS
-##
-C_SRC =			toc.c
-
-OBJECTS = $(C_SRC:%.c=%.o)
-
-##
-## LIBRARIES
-##
-LIBS =	\
-			-lglib-2.0 \
-			-lws2_32 \
-			-lintl \
-			-lpurple
-
-include $(PIDGIN_COMMON_RULES)
-
-##
-## TARGET DEFINITIONS
-##
-
-.PHONY: all install clean
-
-all: $(TARGET).dll
-
-install: all $(DLL_INSTALL_DIR)
-	cp $(TARGET).dll $(DLL_INSTALL_DIR)
-
-$(OBJECTS): $(PURPLE_CONFIG_H)
-
-$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
-	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
-
-##
-## CLEAN RULES
-##
-clean:
-	rm -f $(OBJECTS)
-	rm -f $(TARGET).dll
-
-include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/toc/PROTOCOL b/libpurple/protocols/toc/PROTOCOL
deleted file mode 100644
index 87672dd55f..0000000000
--- a/libpurple/protocols/toc/PROTOCOL
+++ /dev/null
@@ -1,499 +0,0 @@
-# Copyright (c) 1998-9 America Online, Inc. All Rights Reserved.
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License
-#   as published by the Free Software Foundation; either version 2
-#   of the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301, USA.
-
-# Note from Jim Duchek, former libpurple maintainer -- this may not be
-# the latest version of this document, I provide it as a service.
-# Download a copy of TiK (http://www.aim.aol.com/tik/) for the latest
-# version of this doc.
-
-# Note from Eric Warmenhoven, random guy -- this appears to be the last
-# published version of the protocol, and AOL has stopped hosting the TiK
-# program. TiK is still being maintained and is hosted on sourceforge.net;
-# this appears to be the same version of the protocol they're using.
-
-Version: TOC1.0
-
-This document describes the protocol between TOC and TOC clients.
-The protocol is built on TCP.  Framing is done by SFLAP,
-described at the bottom of this document.  Inside each
-SFLAP frame is a TOC command.
-
-The TOC protocol is ASCII based, and special attention
-must be placed argument separation.  The separator and 
-the rules of separation are different for messages inbound 
-to TOC and outbound to the client.  The rules of separation
-are described in sections below.
-
-The TOC server is built mainly to service the TIC and TiK clients.  Since
-the TIC client is a Java applet, and downloadable, TOC will NOT support
-multiple TOC protocol versions at the same time.   Therefore, TiK
-users will be forced to upgrade if the protocol version changes.  
-TOC sends down the protocol version it expects the client
-to speak and understand.  Note, the protocol version is a string.
-
-Important Notes
-===============
-* TOC will drop the connection if a command exceeds the maximum
-  length, which is currently 2048 bytes.  So the client needs to 
-  spend special attention to im, chat, and config message lengths.
-  There is an 8k length maximum from TOC to the client.
-
-* No commands should be sent to TOC (besides toc_signon) before 
-  a SIGN_ON is received.  If you do send a command before SIGN_ON
-  the command will be ignored, and in some case the connection
-  will be dropped.
-
-* Initial permit/deny items should be sent after receiving SIGN_ON 
-  but before sending toc_init_done, otherwise the user will flash
-  on peoples buddylist who the user has denied.  You will probably
-  want to send the toc_add_buddies at this time also.
-
-* After TOC sends the PAUSE message to a client, all messages sent 
-  to TOC will be ignored, and in some cases the connection will 
-  be dropped.  Another SIGN_ON message will be sent to the client 
-  when it is online again.  The buddy list and permit/deny items must 
-  be sent again, followed by the toc_init_done.  In most cases the 
-  SIGN_ON message will be sent between 1-2 seconds after the 
-  PAUSE message.  Therefore a client could choose to ignore the 
-  PAUSE message and hope nothing bad happens.
-
-
-Client -> TOC
-==============
-The commands and the arguments are usually separated by whitespaces.  Arguments
-with whitespace characters should be enclosed in quotes.  Dollar signs, 
-curly brackets, square brackets, parentheses, quotes, and backslashes 
-must all be backslashed whether in quotes or not.  It is usually 
-a good idea just to use quotes no matter what.  All user names from clients 
-to TOC should be normalized (spaces removed and lowercased), and therefore
-are the one exception to the always use quotes rule.
-
-When sending commands to the server you will not get a response
-back confirming that the command format was correct or not!  However
-in some cases if the command format was incorrect the connection
-will be dropped.
-
-
-RoastingString="Tic/Toc"
-
-toc_signon <authorizer host> <authorizer port> <User Name> <Password> 
-           <language> <version>
-    The password needs to be roasted with the Roasting String if
-    coming over a FLAP connection, CP connections don't use
-    roasted passwords.  The language specified will be used
-    when generating web pages, such as the get info pages.
-    Currently the only supported language is "english".
-    If the language sent isn't found, the default "english"
-    language will be used.  The version string will be used
-    for the client identity, and must be less then 50
-    characters.
-
-    Passwords are roasted when sent to the host.  This is done so they 
-    aren't sent in "clear text" over the wire, although they are still 
-    trivial to decode.  Roasting is performed by first xoring each byte 
-    in the password with the equivalent modulo byte in the roasting 
-    string.  The result is then converted to ascii hex, and prepended 
-    with "0x".  So for example the password "password" roasts to 
-    "0x2408105c23001130"
-
-toc_init_done
-    Tells TOC that we are ready to go online.  TOC clients should first 
-    send TOC the buddy list and any permit/deny lists.  However toc_init_done
-    must be called within 30 seconds after toc_signon, or the connection
-    will be dropped.  Remember, it can't be called until after the SIGN_ON
-    message is received.  Calling this before or multiple times after a
-    SIGN_ON will cause the connection to be dropped.
-
-toc_send_im <Destination User> <Message> [auto]
-    Send a message to a remote user.  Remember to quote and encode the 
-    message.  If the optional string "auto" is the last argument, then the 
-    auto response flag will be turned on for the im. 
-
-toc_add_buddy <Buddy User 1> [<Buddy User2> [<Buddy User 3> [...]]]
-    Add buddies to your buddy list.  This does not change your
-    saved config.
-
-toc_remove_buddy <Buddy User 1> [<Buddy User2> [<Buddy User 3> [...]]]
-    Remove buddies from your buddy list.  This does not change your
-    saved config.
-
-toc_set_config <Config Info>
-    Set the config information for this user.  The config information
-    is line oriented with the first character being the item type,
-    followed by a space, with the rest of the line being the item
-    value.  Only letters, numbers, and spaces should be used.  Remember
-    you will have to enclose the entire config in quotes.
-
-    Item Types:
-    g - Buddy Group (All Buddies until the next g or the end of config 
-		     are in this group.)
-    b - A Buddy 
-    p - Person on permit list
-    d - Person on deny list
-    m - Permit/Deny Mode.  Possible values are
-	1 - Permit All
-	2 - Deny All
-	3 - Permit Some
-	4 - Deny Some
-
-toc_evil <User> <norm|anon>
-    Evil/Warn someone else.  The 2nd argument is either the string
-    "norm" for a normal warning, or "anon" for an anonymous 
-    warning.  You can only evil people who have recently sent you
-    ims.  The higher someones evil level, the slower they can
-    send message.
-
-toc_add_permit [ <User 1> [<User 2> [...]]]
-    ADD the following people to your permit mode.  If
-    you are in deny mode it will switch you to permit
-    mode first.  With no arguments and in deny mode
-    this will switch you to permit none. If already
-    in permit mode, no arguments does nothing
-    and your permit list remains the same.
-
-toc_add_deny [ <User 1> [<User 2> [...]]]
-    ADD the following people to your deny mode. If
-    you are in permit mode it will switch you to
-    deny mode first.  With no arguments and in permit
-    mode, this will switch you to deny none. If
-    already in deny mode, no arguments does nothing
-    and your deny list remains unchanged.
-
-toc_chat_join <Exchange> <Chat Room Name>
-    Join a chat room in the given exchange.  Exchange is
-    an integer that represents a group of chat rooms.
-    Different exchanges have different properties.  For
-    example some exchanges might have room replication (ie
-    a room never fills up, there are just multiple
-    instances.) and some exchanges might have navigational
-    information, and some exchanges might have ...  Currently
-    exchange should always be 4, however this may
-    change in the future.  You will either
-    receive an ERROR if the room couldn't be joined
-    or a CHAT_JOIN message.  The Chat Room Name
-    is case insensitive and consecutive spaces
-    are removed.
-
-toc_chat_send <Chat Room ID> <Message>
-    Send a message in a chat room using the chat room
-    id from CHAT_JOIN.  Since reflection is always on in
-    TOC, you do not need to add the message to your chat UI,
-    since you will get a CHAT_IN with the message.  
-    Remember to quote and encode the message.
-
-toc_chat_whisper <Chat Room ID> <dst_user> <Message>
-    Send a message in a chat room using the chat room
-    id from CHAT_JOIN.  This message is directed at
-    only one person.  (Currently you DO need to add this to
-    your UI.)  Remember to quote and encode the message.  
-    Chat whispering is different from IMs since it is linked
-    to a chat room, and should usually be displayed in the chat
-    room UI.
-
-toc_chat_evil <Chat Room ID> <User> <norm|anon>
-    Evil/Warn someone else inside a chat room.  The 3rd argument is either 
-    the string "norm" for a normal warning, or "anon" for an anonymous 
-    warning.  Currently chat evil is not turned on in the chat complex.
-
-toc_chat_invite <Chat Room ID> <Invite Msg> <buddy1> [<buddy2> [<buddy3> [...]]]
-    Once you are inside a chat room you can invite other people into
-    that room.  Remember to quote and encode the invite message.
-
-toc_chat_leave <Chat Room ID>
-    Leave the chat room.
-
-toc_chat_accept <Chat Room ID>
-    Accept a CHAT_INVITE message from TOC.  The server will send a
-    CHAT_JOIN in response.
-
-toc_get_info <username>
-    Gets a user's info a GOTO_URL or ERROR message will be sent back to the 
-    client.
-
-toc_set_info <info information>
-    Set the LOCATE user information.  This is basic HTML.
-    Remember to encode the info.
-
-toc_set_away [<away message>]
-    if the away message is present, then the unavailable
-    status flag is set for the user.  If the away message
-    is not present, then the unavailable status flag is
-    unset.  The away message is basic HTML, remember to
-    encode the information.
-
-toc_get_dir <username>
-    Gets a user's dir info a GOTO_URL or ERROR message will be sent back to the 
-    client.
-
-toc_set_dir <info information>
-    Set the DIR user information.  This is a colon separated fields as in:
-    "first name":"middle name":"last name":"maiden name":"city":"state":"country":"email":"allow web searches"
-    Should return a DIR_STATUS msg.  Having anything in the "allow web searches"
-    field allows people to use web-searches to find your directory info.
-    Otherwise, they'd have to use the client.  
-
-toc_dir_search <info information>
-    Perform a search of the Oscar Directory, using colon separated fields as in:
-    "first name":"middle name":"last name":"maiden name":"city":"state":"country":"email"
-    Returns either a GOTO_URL or ERROR msg.  
-
-toc_set_idle <idle secs>
-    Set idle information. If <idle secs> is 0 then the user isn't idle at all.
-    If <idle secs> is greater then 0 then the user has already been idle
-    for <idle secs> number of seconds.  The server will automatically
-    keep incrementing this number, so do not repeatedly call with new
-    idle times.
-
-toc_set_caps [ <Capability 1> [<Capability 2> [...]]]
-    Set my capabilities.  All capabilities that we support need to
-    be sent at the same time.  Capabilities are represented by
-    UUIDs.  
-
-toc_rvous_propose  - Not Implemented Yet
-
-toc_rvous_accept <nick> <cookie> <service> <tlvlist>
-    Accept a rendezvous proposal from the user <nick>.
-    <cookie> is the cookie from the RVOUS_PROPOSE
-    message.  <service> is the UUID the proposal was
-    for. <tlvlist> contains a list of tlv tags followed by
-    base64 encoded values.
-
-toc_rvous_cancel <nick> <cookie> <service> <tlvlist>
-    Cancel a rendezvous proposal from the user <nick>.
-    <cookie> is the cookie from the RVOUS_PROPOSE
-    message.  <service> is the UUID the proposal was
-    for. <tlvlist> contains a list of tlv tags followed by
-    base64 encoded values.
-
-toc_format_nickname <new_format>
-    Reformat a user's nickname.  An ADMIN_NICK_STATUS or ERROR message will 
-    be sent back to the client.
-
-toc_change_passwd <existing_passwd new_passwd>
-    Change a user's password.  An ADMIN_PASSWD_STATUS or ERROR message will 
-    be sent back to the client.
-
-
-TOC -> Client
-==============
-All user names from TOC to client are NOT normalized, and are
-sent as they should be displayed.  String are NOT encoded, instead
-we use colons as separators.  So that you can have colons inside
-of messages, everything after the colon before :<Message> should
-be considered part of the message (ie don't just "split" on colons,
-instead split with a max number of results.)
-
-
-SIGN_ON:<Client Version Supported>
-   This is sent after a successful toc_signon command is sent to TOC.
-   If the command was unsuccessful either the FLAP connection will
-   be dropped or you will receive a ERROR message.
-
-CONFIG:<config>
-   A user's config. Config can be empty in which case the host was not able to
-   retrieve it, or a config didn't exist for the user.  See toc_set_config
-   above for the format.
-
-NICK:<Nickname>
-   Tells you your correct nickname (ie how it should be capitalized and
-   spacing)
-
-IM_IN:<Source User>:<Auto Response T/F?>:<Message>
-   Receive an IM from some one.  Everything after the third colon is
-   the incoming message, including other colons.
-
-UPDATE_BUDDY:<Buddy User>:<Online? T/F>:<Evil Amount>:<Signon Time>:<IdleTime>:<UC>
-   This one command handles arrival/depart/updates.  Evil Amount is
-   a percentage, Signon Time is UNIX epoc, idle time is in minutes, UC (User Class)
-   is a two/three character string.
-   uc[0]:
-   ' '  - Ignore
-   'A'  - On AOL
-   uc[1]
-   ' '  - Ignore
-   'A'  - Oscar Admin
-   'U'  - Oscar Unconfirmed
-   'O'  - Oscar Normal
-   uc[2] 
-   '\0' - Ignore
-   ' '  - Ignore
-   'U'  - The user has set their unavailable flag.
-
-
-
-ERROR:<Error Code>:Var args
-   * General Errors *
-   901   - $1 not currently available
-   902   - Warning of $1 not currently available
-   903   - A message has been dropped, you are exceeding
-	   the server speed limit
-
-   * Admin Errors  *
-   911   - Error validating input
-   912   - Invalid account
-   913   - Error encountered while processing request
-   914   - Service unavailable
-
-   * Chat Errors  *
-   950   - Chat in $1 is unavailable.
-
-   * IM & Info Errors *
-   960   - You are sending message too fast to $1
-   961   - You missed an im from $1 because it was too big.
-   962   - You missed an im from $1 because it was sent too fast.
-
-   * Dir Errors *
-   970   - Failure
-   971   - Too many matches
-   972   - Need more qualifiers
-   973   - Dir service temporarily unavailable
-   974   - Email lookup restricted
-   975   - Keyword Ignored
-   976   - No Keywords
-   977   - Language not supported
-   978   - Country not supported
-   979   - Failure unknown $1
-
-   * Auth errors *
-   980   - Incorrect nickname or password.
-   981   - The service is temporarily unavailable.
-   982   - Your warning level is currently too high to sign on.
-   983   - You have been connecting and
-	   disconnecting too frequently.  Wait 10 minutes and try again.
-	   If you continue to try, you will need to wait even longer.
-   989   - An unknown signon error has occurred $1
-
-
-EVILED:<new evil>:<name of eviler, blank if anonymous>
-   The user was just eviled.
-
-CHAT_JOIN:<Chat Room Id>:<Chat Room Name>
-   We were able to join this chat room.  The Chat Room Id is
-   internal to TOC.
-
-CHAT_IN:<Chat Room Id>:<Source User>:<Whisper? T/F>:<Message>
-   A chat message was sent in a chat room.
-
-CHAT_UPDATE_BUDDY:<Chat Room Id>:<Inside? T/F>:<User 1>:<User 2>...
-   This one command handles arrival/departs from a chat room.  The
-   very first message of this type for each chat room contains the
-   users already in the room.
-
-CHAT_INVITE:<Chat Room Name>:<Chat Room Id>:<Invite Sender>:<Message>
-   We are being invited to a chat room.
-
-CHAT_LEFT:<Chat Room Id>
-   Tells tic connection to chat room has been dropped
-
-GOTO_URL:<Window Name>:<Url>
-   Goto a URL.  Window Name is the suggested internal name of the window
-   to use.  (Java supports this.) 
-
-DIR_STATUS:<Return Code>:<Optional args>
-   <Return Code> is always 0 for success status.
-
-ADMIN_NICK_STATUS:<Return Code>:<Optional args>
-   <Return Code> is always 0 for success status.
-
-ADMIN_PASSWD_STATUS:<Return Code>:<Optional args>
-   <Return Code> is always 0 for success status.
-   
-
-PAUSE
-   Tells TIC to pause so we can do migration
-
-RVOUS_PROPOSE:<user>:<uuid>:<cookie>:<seq>:<rip>:<pip>:<vip>:<port>
-              [:tlv tag1:tlv value1[:tlv tag2:tlv value2[:...]]]
-   Another user has proposed that we rendezvous with them to
-   perform the service specified by <uuid>.  They want us
-   to connect to them, we have their rendezvous ip, their 
-   proposer_ip, and their verified_ip. The tlv values are 
-   base64 encoded.
-
-Typical Signon Process
-======================
-Except for the section marked optional this is an sequential
-process.  Each line MUST occur before the following line.
-
-* Client connects to TOC
-* Client sends "FLAPON\r\n\r\n"
-* TOC sends Client FLAP SIGNON
-* Client sends TOC FLAP SIGNON
-* Client sends TOC "toc_signon" message
-* if login fails TOC drops client's connection
-  else TOC sends client SIGN_ON reply
-* if Client doesn't support version it drops the connection
-
-[BEGIN OPTIONAL]
-    * TOC sends Client CONFIG
-    * Client sends TOC permit/deny stuff
-    * Client sends TOC toc_add_buddy message
-[END OPTIONAL]
-
-* Client sends TOC toc_init_done message
-
-
-SFLAP Documentation
-===================
-SFLAP is pretty much a FLAP connection except the DATA frame payload is a null
-terminated string when traveling from client to host, it is NOT null
-terminated when traveling from host to client.  The FLAP Header is binary 
-data, and is in network byte order.  The data portion is at offset 6, after the
-header.  The sequence number is sequential in each direction.  So
-packets from the server to client have one sequence number, while
-the packets from the client to server have an independent
-increasing number.
-
-FLAP Header (6 bytes)
------------
-Offset   Size  Type
-0        1     ASTERISK (literal ASCII '*')
-1        1     Frame Type
-2        2     Sequence Number
-4        2     Data Length
-
-
-Valid Frame Type Values
------------------------
-1   SIGNON
-2   DATA
-3   ERROR     (Not used by TOC)
-4   SIGNOFF   (Not used by TOC)
-5   KEEP_ALIVE
-
-
-TOC SIGNON FRAME TYPE
----------------------
-Sequence Number contains the initial sequence number used in each direction.
-Data Length contains the payload length, with the payload described
-below.  The payload area is NOT null terminated.
-
-Host To Client:
-    4 byte FLAP version (1)
-
-Client To Host:  
-    4 byte FLAP version (1)
-    2 byte TLV Tag (1)
-    2 byte Normalized User Name Length
-    N byte Normalized User Name  (NOT null terminated)
-
-    
-TOC DATA FRAME TYPE
--------------------
-Sequence Number contains the next sequence number.
-Data Length is the length of the payload, including the null termination
-from client to host.
-
diff --git a/libpurple/protocols/toc/toc.c b/libpurple/protocols/toc/toc.c
deleted file mode 100644
index e89a5d7bb0..0000000000
--- a/libpurple/protocols/toc/toc.c
+++ /dev/null
@@ -1,2340 +0,0 @@
-/*
- * purple
- *
- * Copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- *
- */
-#include "internal.h"
-
-#include "account.h"
-#include "accountopt.h"
-#include "conversation.h"
-#include "debug.h"
-#include "notify.h"
-#include "privacy.h"
-#include "proxy.h"
-#include "prpl.h"
-#include "request.h"
-#include "util.h"
-#include "version.h"
-
-static PurplePlugin *my_protocol = NULL;
-
-#define REVISION "penguin"
-
-#define TYPE_SIGNON    1
-#define TYPE_DATA      2
-#define TYPE_ERROR     3
-#define TYPE_SIGNOFF   4
-#define TYPE_KEEPALIVE 5
-
-#define FLAPON "FLAPON\r\n\r\n"
-#define ROAST "Tic/Toc"
-
-#define TOC_HOST "toc.oscar.aol.com"
-#define TOC_PORT 9898
-#define AUTH_HOST "login.oscar.aol.com"
-#define AUTH_PORT 5190
-#define LANGUAGE "english"
-
-#define STATE_OFFLINE 0
-#define STATE_FLAPON 1
-#define STATE_SIGNON_REQUEST 2
-#define STATE_ONLINE 3
-#define STATE_PAUSE 4
-
-#define VOICE_UID     "09461341-4C7F-11D1-8222-444553540000"
-#define FILE_SEND_UID "09461343-4C7F-11D1-8222-444553540000"
-#define IMAGE_UID     "09461345-4C7F-11D1-8222-444553540000"
-#define B_ICON_UID    "09461346-4C7F-11D1-8222-444553540000"
-#define STOCKS_UID    "09461347-4C7F-11D1-8222-444553540000"
-#define FILE_GET_UID  "09461348-4C7F-11D1-8222-444553540000"
-#define GAMES_UID     "0946134a-4C7F-11D1-8222-444553540000"
-
-#define UC_UNAVAILABLE	0x01
-#define UC_AOL			0x02
-#define UC_ADMIN		0x04
-#define UC_UNCONFIRMED	0x08
-#define UC_NORMAL		0x10
-#define UC_WIRELESS		0x20
-
-struct ft_request {
-	PurpleConnection *gc;
-	char *user;
-	char UID[2048];
-	char *cookie;
-	char *ip;
-	int port;
-	char *message;
-	char *filename;
-	int files;
-	int size;
-};
-
-struct buddy_icon {
-	guint32 hash;
-	guint32 len;
-	time_t time;
-	void *data;
-};
-
-struct toc_data {
-	int toc_fd;
-	char toc_ip[20];
-	int seqno;
-	int state;
-};
-
-struct sflap_hdr {
-	unsigned char ast;
-	unsigned char type;
-	unsigned short seqno;
-	unsigned short len;
-};
-
-struct signon {
-	unsigned int ver;
-	unsigned short tag;
-	unsigned short namelen;
-	char username[80];
-};
-
-/* constants to identify proto_opts */
-#define USEROPT_AUTH      0
-#define USEROPT_AUTHPORT  1
-
-#define TOC_CONNECT_STEPS 3
-
-static void toc_login_callback(gpointer, gint, const gchar *);
-static void toc_callback(gpointer, gint, PurpleInputCondition);
-
-/* ok. this function used to take username/password, and return 0 on success.
- * now, it takes username/password, and returns NULL on error or a new purple_connection
- * on success. */
-static void toc_login(PurpleAccount *account)
-{
-	PurpleConnection *gc;
-	struct toc_data *tdt;
-	char buf[80];
-
-	gc = purple_account_get_connection(account);
-	gc->proto_data = tdt = g_new0(struct toc_data, 1);
-	gc->flags |= PURPLE_CONNECTION_HTML;
-	gc->flags |= PURPLE_CONNECTION_AUTO_RESP;
-
-	g_snprintf(buf, sizeof buf, _("Looking up %s"),
-			purple_account_get_string(account, "server", TOC_HOST));
-	purple_connection_update_progress(gc, buf, 0, TOC_CONNECT_STEPS);
-
-	purple_debug(PURPLE_DEBUG_INFO, "toc", "Client connects to TOC\n");
-	if (purple_proxy_connect(gc, account,
-				purple_account_get_string(account, "server", TOC_HOST),
-				purple_account_get_int(account, "port", TOC_PORT),
-				toc_login_callback, gc) != 0 || !account->gc) {
-		g_snprintf(buf, sizeof(buf), _("Connect to %s failed"),
-				purple_account_get_string(account, "server", TOC_HOST));
-		purple_connection_error(gc, buf);
-		return;
-	}
-}
-
-static void toc_login_callback(gpointer data, gint source, const gchar *error_message)
-{
-	PurpleConnection *gc = data;
-	struct toc_data *tdt;
-	char buf[80];
-	struct sockaddr_in name;
-	socklen_t namelen;
-
-	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
-		if (source >= 0)
-			close(source);
-		return;
-	}
-
-	tdt = gc->proto_data;
-
-	if (source == -1) {
-		/* we didn't successfully connect. tdt->toc_fd is valid here */
-		purple_connection_error(gc, _("Unable to connect."));
-		return;
-	}
-	tdt->toc_fd = source;
-
-	/*
-	 * Copy the IP that we're connected to.  We need this because "GOTO_URL"'s 
-	 * should open on the exact server we're connected to.  toc.oscar.aol.com 
-	 * doesn't work because that hostname resolves to multiple IP addresses.
-	 */
-	if (getpeername(tdt->toc_fd, (struct sockaddr *)&name, &namelen) == 0)
-		strncpy(tdt->toc_ip, inet_ntoa(name.sin_addr), sizeof(tdt->toc_ip));
-	else
-		strncpy(tdt->toc_ip, purple_account_get_string(gc->account, "server", TOC_HOST), sizeof(tdt->toc_ip));
-
-	purple_debug(PURPLE_DEBUG_INFO, "toc",
-			   "Client sends \"FLAPON\\r\\n\\r\\n\"\n");
-	if (write(tdt->toc_fd, FLAPON, strlen(FLAPON)) < 0) {
-		purple_connection_error(gc, _("Disconnected."));
-		return;
-	}
-	tdt->state = STATE_FLAPON;
-
-	/* i know a lot of people like to look at purple to see how TOC works. so i'll comment
-	 * on what this does. it's really simple. when there's data ready to be read from the
-	 * toc_fd file descriptor, toc_callback is called, with gc passed as its data arg. */
-	gc->inpa = purple_input_add(tdt->toc_fd, PURPLE_INPUT_READ, toc_callback, gc);
-
-	g_snprintf(buf, sizeof(buf), _("Signon: %s"), purple_account_get_username(gc->account));
-	purple_connection_update_progress(gc, buf, 1, TOC_CONNECT_STEPS);
-}
-
-static void toc_close(PurpleConnection *gc)
-{
-	if (gc->inpa > 0)
-		purple_input_remove(gc->inpa);
-	gc->inpa = 0;
-	close(((struct toc_data *)gc->proto_data)->toc_fd);
-	g_free(gc->proto_data);
-}
-
-static void toc_build_config(PurpleAccount *account, char *s, int len, gboolean show)
-{
-	PurpleBlistNode *gnode, *cnode, *bnode;
-	PurpleGroup *g;
-	PurpleBuddy *b;
-	GSList *plist = account->permit;
-	GSList *dlist = account->deny;
-
-	int pos = 0;
-
-	if (!account->perm_deny)
-		account->perm_deny = 1;
-
-	pos += g_snprintf(&s[pos], len - pos, "m %d\n", account->perm_deny);
-	for(gnode = purple_get_blist()->root; gnode && len > pos; gnode = gnode->next) {
-		g = (PurpleGroup *)gnode;
-		if(!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-		if(purple_group_on_account(g, account)) {
-			pos += g_snprintf(&s[pos], len - pos, "g %s\n", g->name);
-			for(cnode = gnode->child; cnode; cnode = cnode->next) {
-				if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-					continue;
-				for(bnode = gnode->child; bnode && len > pos; bnode = bnode->next) {
-					b = (PurpleBuddy *)bnode;
-					if(!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-						continue;
-					if(b->account == account) {
-						pos += g_snprintf(&s[pos], len - pos, "b %s%s%s\n",
-								b->name,
-								(show && b->alias) ? ":" : "",
-								(show && b->alias) ? b->alias : "");
-					}
-				}
-			}
-		}
-	}
-
-	while (len > pos && plist) {
-		pos += g_snprintf(&s[pos], len - pos, "p %s\n", (char *)plist->data);
-		plist = plist->next;
-	}
-
-	while (len > pos && dlist) {
-		pos += g_snprintf(&s[pos], len - pos, "d %s\n", (char *)dlist->data);
-		dlist = dlist->next;
-	}
-}
-
-static char *
-escape_message(const char *msg)
-{
-	char *ret;
-	int i, j;
-
-	if (!msg)
-		return NULL;
-
-	/* Calculate the length after escaping */
-	for (i=0, j=0; msg[i]; i++)
-		switch (msg[i]) {
-			case '$':
-			case '[':
-			case ']':
-			case '(':
-			case ')':
-				j++;
-			default:
-				j++;
-		}
-
-	/* Allocate a string */
-	ret = (char *)g_malloc((j+1) * sizeof(char));
-
-	/* Copy the string */
-	for (i=0, j=0; msg[i]; i++)
-		switch (msg[i]) {
-			case '$':
-			case '[':
-			case ']':
-			case '(':
-			case ')':
-				ret[j++] = '\\';
-			default:
-				ret[j++] = msg[i];
-			}
-	ret[j] = '\0';
-
-	return ret;
-}
-
-/*
- * Duplicates the input string, replacing each \n with a <BR>, and 
- * escaping a few other characters.
- */
-static char *
-escape_text(const char *msg)
-{
-	char *ret;
-	int i, j;
-
-	if (!msg)
-		return NULL;
-
-	/* Calculate the length after escaping */
-	for (i=0, j=0; msg[i]; i++)
-		switch (msg[i]) {
-			case '\n':
-				j += 4;
-				break;
-			case '{':
-			case '}':
-			case '\\':
-			case '"':
-				j += 1;
-			default:
-				j += 1;
-		}
-
-	/* Allocate a string */
-	ret = (char *)malloc((j+1) * sizeof(char));
-
-	/* Copy the string */
-	for (i=0, j=0; msg[i]; i++)
-		switch (msg[i]) {
-			case '\n':
-				ret[j++] = '<';
-				ret[j++] = 'B';
-				ret[j++] = 'R';
-				ret[j++] = '>';
-				break;
-			case '{':
-			case '}':
-			case '\\':
-			case '"':
-				ret[j++] = '\\';
-			default:
-				ret[j++] = msg[i];
-		}
-	ret[j] = '\0';
-
-	return ret;
-}
-
-static int sflap_send(PurpleConnection *gc, const char *buf, int olen, int type)
-{
-	struct toc_data *tdt = (struct toc_data *)gc->proto_data;
-	int len;
-	int slen = 0;
-	int ret;
-	struct sflap_hdr hdr;
-	char *escaped, *obuf;
-
-	if (tdt->state == STATE_PAUSE)
-		/* TOC has given us the PAUSE message; sending could cause a disconnect
-		 * so we just return here like everything went through fine */
-		return 0;
-
-	if (olen < 0) {
-		escaped = escape_message(buf);
-		len = strlen(escaped);
-	} else {
-		escaped = g_memdup(buf, olen);
-		len = olen;
-	}
-
-	/*
-	 * One _last_ 2048 check here!  This shouldn't ever
-	 * get hit though, hopefully.  If it gets hit on an IM
-	 * It'll lose the last " and the message won't go through,
-	 * but this'll stop a segfault.
-	 */
-	if (len > MSG_LEN) {
-		purple_debug(PURPLE_DEBUG_WARNING, "toc", "message too long, truncating\n");
-		escaped[MSG_LEN - 1] = '\0';
-		len = MSG_LEN;
-	}
-
-	if (olen < 0)
-		purple_debug(PURPLE_DEBUG_INFO, "toc", "C: %s\n", escaped);
-
-	hdr.ast = '*';
-	hdr.type = type;
-	hdr.seqno = htons(tdt->seqno++ & 0xffff);
-	hdr.len = htons(len + (type == TYPE_SIGNON ? 0 : 1));
-
-	obuf = (char *)malloc((sizeof(hdr)+len+1) * sizeof(char));
-	memcpy(obuf, &hdr, sizeof(hdr));
-	slen += sizeof(hdr);
-
-	memcpy(&obuf[slen], escaped, len);
-	slen += len;
-
-	if (type != TYPE_SIGNON) {
-		obuf[slen] = '\0';
-		slen += 1;
-	}
-
-	ret = write(tdt->toc_fd, obuf, slen);
-	free(obuf);
-	g_free(escaped);
-
-	return ret;
-}
-
-static int toc_send_raw(PurpleConnection *gc, const char *buf, int len)
-{
-	return sflap_send(gc, buf, len, 2);
-}
-
-static int wait_reply(PurpleConnection *gc, char *buffer, size_t buflen)
-{
-	struct toc_data *tdt = (struct toc_data *)gc->proto_data;
-	struct sflap_hdr *hdr;
-	int ret;
-
-	if (read(tdt->toc_fd, buffer, sizeof(struct sflap_hdr)) < 0) {
-		purple_debug(PURPLE_DEBUG_ERROR, "toc", "Couldn't read flap header\n");
-		return -1;
-	}
-
-	hdr = (struct sflap_hdr *)buffer;
-
-	if (buflen < ntohs(hdr->len)) {
-		/* fake like there's a read error */
-		purple_debug(PURPLE_DEBUG_ERROR, "toc",
-				   "buffer too small (have %" G_GSIZE_FORMAT ", need %d)\n",
-				   buflen, ntohs(hdr->len));
-		return -1;
-	}
-
-	if (ntohs(hdr->len) > 0) {
-		int count = 0;
-		ret = 0;
-		do {
-			count += ret;
-			ret = read(tdt->toc_fd,
-				   buffer + sizeof(struct sflap_hdr) + count, ntohs(hdr->len) - count);
-		} while (count + ret < ntohs(hdr->len) && ret > 0);
-		buffer[sizeof(struct sflap_hdr) + count + ret] = '\0';
-		return ret;
-	} else
-		return 0;
-}
-
-static unsigned char *roast_password(const char *pass)
-{
-	/* Trivial "encryption" */
-	static unsigned char rp[256];
-	static char *roast = ROAST;
-	int pos = 2;
-	int x;
-	strcpy(rp, "0x");
-	for (x = 0; (x < 150) && pass[x]; x++)
-		pos += sprintf(&rp[pos], "%02x", pass[x] ^ roast[x % strlen(roast)]);
-	rp[pos] = '\0';
-	return rp;
-}
-
-static void toc_got_info(void *data, const char *url_text, size_t len)
-{
-	if (!url_text)
-		return;
-
-	purple_notify_formatted(data, NULL, _("Buddy Information"), NULL,
-						  url_text, NULL, NULL);
-}
-
-static char *show_error_message()
-{
-	int no = atoi(strtok(NULL, ":"));
-	char *w = strtok(NULL, ":");
-	static char buf[256];
-
-	switch(no) {
-		case 69:
-			g_snprintf(buf, sizeof(buf), _("Unable to write file %s."), w);
-			break;
-		case 169:
-			g_snprintf(buf, sizeof(buf), _("Unable to read file %s."), w);
-			break;
-		case 269:
-			g_snprintf(buf, sizeof(buf), _("Message too long, last %s bytes truncated."), w);
-			break;
-		case 901:
-			g_snprintf(buf, sizeof(buf), _("%s not currently logged in."), w);
-			break;
-		case 902:
-			g_snprintf(buf, sizeof(buf), _("Warning of %s not allowed."), w);
-			break;
-		case 903:
-			g_snprintf(buf, sizeof(buf), _("A message has been dropped, you are exceeding the server speed limit."));
-			break;
-		case 950:
-			g_snprintf(buf, sizeof(buf), _("Chat in %s is not available."), w);
-			break;
-		case 960:
-			g_snprintf(buf, sizeof(buf), _("You are sending messages too fast to %s."), w);
-			break;
-		case 961:
-			g_snprintf(buf, sizeof(buf), _("You missed an IM from %s because it was too big."), w);
-			break;
-		case 962:
-			g_snprintf(buf, sizeof(buf), _("You missed an IM from %s because it was sent too fast."), w);
-			break;
-		case 970:
-			g_snprintf(buf, sizeof(buf), _("Failure."));
-			break;
-		case 971:
-			g_snprintf(buf, sizeof(buf), _("Too many matches."));
-			break;
-		case 972:
-			g_snprintf(buf, sizeof(buf), _("Need more qualifiers."));
-			break;
-		case 973:
-			g_snprintf(buf, sizeof(buf), _("Dir service temporarily unavailable."));
-			break;
-		case 974:
-			g_snprintf(buf, sizeof(buf), _("Email lookup restricted."));
-			break;
-		case 975:
-			g_snprintf(buf, sizeof(buf), _("Keyword ignored."));
-			break;
-		case 976:
-			g_snprintf(buf, sizeof(buf), _("No keywords."));
-			break;
-		case 977:
-			g_snprintf(buf, sizeof(buf), _("User has no directory information."));
-			/* g_snprintf(buf, sizeof(buf), _("Language not supported.")); */
-			break;
-		case 978:
-			g_snprintf(buf, sizeof(buf), _("Country not supported."));
-			break;
-		case 979:
-			g_snprintf(buf, sizeof(buf), _("Failure unknown: %s."), w);
-			break;
-		case 980:
-			g_snprintf(buf, sizeof(buf), _("Incorrect username or password."));
-			break;
-		case 981:
-			g_snprintf(buf, sizeof(buf), _("The service is temporarily unavailable."));
-			break;
-		case 982:
-			g_snprintf(buf, sizeof(buf), _("Your warning level is currently too high to log in."));
-			break;
-		case 983:
-			g_snprintf(buf, sizeof(buf), _("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."));
-			break;
-			g_snprintf(buf, sizeof(buf), _("An unknown signon error has occurred: %s."), w);
-			break;
-		default:
-			g_snprintf(buf, sizeof(buf), _("An unknown error, %d, has occurred.  Info: %s"), no, w);
-	}
-
- return buf;
-}
-
-static void
-parse_toc_buddy_list(PurpleAccount *account, char *config)
-{
-	char *c;
-	char current[256];
-	GList *buddies = NULL;
-
-	if (config == NULL)
-		return;
-
-	/* skip "CONFIG:" (if it exists) */
-	c = strncmp(config + 6 /* sizeof(struct sflap_hdr) */ , "CONFIG:", strlen("CONFIG:")) ?
-		strtok(config, "\n") :
-		strtok(config + 6 /* sizeof(struct sflap_hdr) */  + strlen("CONFIG:"), "\n");
-	do {
-		if (c == NULL)
-			break;
-		if (*c == 'g') {
-			char *utf8 = NULL;
-			utf8 = purple_utf8_try_convert(c + 2);
-			if (utf8 == NULL) {
-				g_strlcpy(current, _("Invalid Groupname"), sizeof(current));
-			} else {
-				g_strlcpy(current, utf8, sizeof(current));
-				g_free(utf8);
-			}
-			if (!purple_find_group(current)) {
-				PurpleGroup *g = purple_group_new(current);
-				purple_blist_add_group(g, NULL);
-			}
-		} else if (*c == 'b') { /*&& !purple_find_buddy(user, c + 2)) {*/
-			char nm[80], sw[388], *a, *utf8 = NULL;
-
-			if ((a = strchr(c + 2, ':')) != NULL) {
-				*a++ = '\0';		/* nul the : */
-			}
-
-			g_strlcpy(nm, c + 2, sizeof(nm));
-			if (a) {
-				utf8 = purple_utf8_try_convert(a);
-				if (utf8 == NULL) {
-					purple_debug(PURPLE_DEBUG_ERROR, "toc blist",
-							   "Failed to convert alias for "
-							   "'%s' to UTF-8\n", nm);
-					}
-			}
-			if (utf8 == NULL) {
-				sw[0] = '\0';
-			} else {
-				/* This can leave a partial sequence at the end,
-				 * but who cares? */
-				g_strlcpy(sw, utf8, sizeof(sw));
-				g_free(utf8);
-			}
-
-			if (!purple_find_buddy(account, nm)) {
-				PurpleBuddy *b = purple_buddy_new(account, nm, sw);
-				PurpleGroup *g = purple_find_group(current);
-				purple_blist_add_buddy(b, NULL, g, NULL);
-				buddies = g_list_append(buddies, b);
-			}
-		} else if (*c == 'p') {
-			purple_privacy_permit_add(account, c + 2, TRUE);
-		} else if (*c == 'd') {
-			purple_privacy_deny_add(account, c + 2, TRUE);
-		} else if (!strncmp("toc", c, 3)) {
-			sscanf(c + strlen(c) - 1, "%d", &account->perm_deny);
-			purple_debug(PURPLE_DEBUG_MISC, "toc blist",
-					   "permdeny: %d\n", account->perm_deny);
-			if (account->perm_deny == 0)
-				account->perm_deny = PURPLE_PRIVACY_ALLOW_ALL;
-		} else if (*c == 'm') {
-			sscanf(c + 2, "%d", &account->perm_deny);
-			purple_debug(PURPLE_DEBUG_MISC, "toc blist",
-					   "permdeny: %d\n", account->perm_deny);
-			if (account->perm_deny == 0)
-				account->perm_deny = PURPLE_PRIVACY_ALLOW_ALL;
-		}
-	} while ((c = strtok(NULL, "\n")));
-
-	if (account->gc) {
-		if (buddies != NULL) {
-			purple_account_add_buddies(account, buddies);
-			g_list_free(buddies);
-		}
-		serv_set_permit_deny(account->gc);
-	}
-	g_list_free(buddies);
-}
-
-static void toc_callback(gpointer data, gint source, PurpleInputCondition condition)
-{
-	PurpleConnection *gc = (PurpleConnection *)data;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	struct toc_data *tdt = (struct toc_data *)gc->proto_data;
-	struct sflap_hdr *hdr;
-	struct signon so;
-	char buf[8 * 1024], *c;
-	char snd[BUF_LEN * 2];
-	const char *username = purple_account_get_username(account);
-	char *password;
-	PurpleBuddy *buddy;
-
-	/* there's data waiting to be read, so read it. */
-	if (wait_reply(gc, buf, 8 * 1024) <= 0) {
-		purple_connection_error(gc, _("Connection Closed"));
-		return;
-	}
-
-	if (tdt->state == STATE_FLAPON) {
-		hdr = (struct sflap_hdr *)buf;
-		if (hdr->type != TYPE_SIGNON)
-			purple_debug(PURPLE_DEBUG_ERROR, "toc", "hdr->type != TYPE_SIGNON\n");
-		else
-			purple_debug(PURPLE_DEBUG_INFO, "toc",
-					   "TOC sends Client FLAP SIGNON\n");
-		tdt->seqno = ntohs(hdr->seqno);
-		tdt->state = STATE_SIGNON_REQUEST;
-
-		purple_debug(PURPLE_DEBUG_INFO, "toc", "Client sends TOC FLAP SIGNON\n");
-		g_snprintf(so.username, sizeof(so.username), "%s", username);
-		so.ver = htonl(1);
-		so.tag = htons(1);
-		so.namelen = htons(strlen(so.username));
-		if (sflap_send(gc, (char *)&so, ntohs(so.namelen) + 8, TYPE_SIGNON) < 0) {
-			purple_connection_error(gc, _("Disconnected."));
-			return;
-		}
-
-		purple_debug(PURPLE_DEBUG_INFO, "toc",
-				   "Client sends TOC \"toc_signon\" message\n");
-		/* i hate icq. */
-		if (username[0] >= '0' && username[0] <= '9')
-			password = g_strndup(purple_connection_get_password(gc), 8);
-		else
-			password = g_strdup(purple_connection_get_password(gc));
-		g_snprintf(snd, sizeof snd, "toc_signon %s %d  %s %s %s \"%s\"",
-			   AUTH_HOST, AUTH_PORT, purple_normalize(account, username),
-			   roast_password(password), LANGUAGE, REVISION);
-		g_free(password);
-		if (sflap_send(gc, snd, -1, TYPE_DATA) < 0) {
-			purple_connection_error(gc, _("Disconnected."));
-			return;
-		}
-
-		purple_connection_update_progress(gc, _("Waiting for reply..."), 2, TOC_CONNECT_STEPS);
-		return;
-	}
-
-	if (tdt->state == STATE_SIGNON_REQUEST) {
-		purple_debug(PURPLE_DEBUG_INFO, "toc", "TOC sends client SIGN_ON reply\n");
-		if (g_ascii_strncasecmp(buf + sizeof(struct sflap_hdr), "SIGN_ON", strlen("SIGN_ON"))) {
-			purple_debug(PURPLE_DEBUG_ERROR, "toc",
-					   "Didn't get SIGN_ON! buf was: %s\n",
-				     buf + sizeof(struct sflap_hdr));
-			if (!g_ascii_strncasecmp(buf + sizeof(struct sflap_hdr), "ERROR", 5)) {
-				strtok(buf + sizeof(struct sflap_hdr), ":");
-				purple_connection_error(gc, show_error_message());
-			} else
-				purple_connection_error(gc, _("Authentication failed"));
-			return;
-		}
-		/* we're supposed to check that it's really TOC v1 here but we know it is ;) */
-		purple_debug(PURPLE_DEBUG_INFO, "toc",
-				   "TOC version: %s\n", buf + sizeof(struct sflap_hdr) + 8);
-
-		/* we used to check for the CONFIG here, but we'll wait until we've sent our
-		 * version of the config and then the toc_init_done message. we'll come back to
-		 * the callback in a better state if we get CONFIG anyway */
-
-		tdt->state = STATE_ONLINE;
-
-		purple_connection_set_state(gc, PURPLE_CONNECTED);
-
-		/*
-		 * Add me to my buddy list so that we know the time when
-		 * the server thinks I signed on.
-		 */
-		buddy = purple_buddy_new(account, username, NULL);
-		/* XXX - Pick a group to add to */
-		/* purple_blist_add(buddy, NULL, g, NULL); */
-		purple_account_add_buddy(gc, buddy);
-
-		/* Client sends TOC toc_init_done message */
-		purple_debug(PURPLE_DEBUG_INFO, "toc",
-				   "Client sends TOC toc_init_done message\n");
-		g_snprintf(snd, sizeof snd, "toc_init_done");
-		sflap_send(gc, snd, -1, TYPE_DATA);
-
-		/*
-		g_snprintf(snd, sizeof snd, "toc_set_caps %s %s %s",
-				FILE_SEND_UID, FILE_GET_UID, B_ICON_UID);
-		*/
-		g_snprintf(snd, sizeof snd, "toc_set_caps %s %s", FILE_SEND_UID, FILE_GET_UID);
-		sflap_send(gc, snd, -1, TYPE_DATA);
-
-		return;
-	}
-
-	purple_debug(PURPLE_DEBUG_INFO, "toc", "S: %s\n",
-			   buf + sizeof(struct sflap_hdr));
-
-	c = strtok(buf + sizeof(struct sflap_hdr), ":");	/* Ditch the first part */
-
-	if (!g_ascii_strcasecmp(c, "SIGN_ON")) {
-		/* we should only get here after a PAUSE */
-		if (tdt->state != STATE_PAUSE)
-			purple_debug(PURPLE_DEBUG_ERROR, "toc",
-					   "got SIGN_ON but not PAUSE!\n");
-		else {
-			tdt->state = STATE_ONLINE;
-			g_snprintf(snd, sizeof snd, "toc_signon %s %d %s %s %s \"%s\"",
-				   AUTH_HOST, AUTH_PORT,
-				   purple_normalize(account, purple_account_get_username(account)),
-				   roast_password(purple_connection_get_password(gc)),
-				   LANGUAGE, REVISION);
-			if (sflap_send(gc, snd, -1, TYPE_DATA) < 0) {
-				purple_connection_error(gc, _("Disconnected."));
-				return;
-			}
-			g_snprintf(snd, sizeof snd, "toc_init_done");
-			sflap_send(gc, snd, -1, TYPE_DATA);
-			purple_notify_info(gc, NULL,
-							 _("TOC has come back from its pause. You may "
-							   "now send messages again."), NULL);
-		}
-	} else if (!g_ascii_strcasecmp(c, "CONFIG")) {
-		c = strtok(NULL, ":");
-		parse_toc_buddy_list(account, c);
-	} else if (!g_ascii_strcasecmp(c, "NICK")) {
-		/* ignore NICK so that things get imported/exported properly
-		c = strtok(NULL, ":");
-		g_snprintf(gc->username, sizeof(gc->username), "%s", c);
-		*/
-	} else if (!g_ascii_strcasecmp(c, "IM_IN")) {
-		char *away, *message;
-		int a = 0;
-
-		c = strtok(NULL, ":");
-		away = strtok(NULL, ":");
-
-		message = away;
-		while (*message && (*message != ':'))
-			message++;
-		message++;
-
-		a = (away && (*away == 'T')) ? PURPLE_MESSAGE_AUTO_RESP : 0;
-
-		serv_got_im(gc, c, message, a, time(NULL));
-	} else if (!g_ascii_strcasecmp(c, "UPDATE_BUDDY")) {
-		char *l, *uc, *tmp;
-		gboolean logged_in;
-		int evil, idle, type = 0;
-		time_t signon, time_idle;
-
-		c = strtok(NULL, ":");	/* name */
-		l = strtok(NULL, ":");	/* online */
-		sscanf(strtok(NULL, ":"), "%d", &evil);
-		sscanf(strtok(NULL, ":"), "%ld", &signon);
-		sscanf(strtok(NULL, ":"), "%d", &idle);
-		uc = strtok(NULL, ":");
-
-		logged_in = (l && (*l == 'T')) ? TRUE : FALSE;
-
-		if (uc[0] == 'A')
-			type |= UC_AOL;
-		switch (uc[1]) {
-		case 'A':
-			type |= UC_ADMIN;
-			break;
-		case 'U':
-			type |= UC_UNCONFIRMED;
-			break;
-		case 'O':
-			type |= UC_NORMAL;
-			break;
-		case 'C':
-			type |= UC_WIRELESS;
-			break;
-		default:
-			break;
-		}
-		if (uc[2] == 'U')
-			type |= UC_UNAVAILABLE;
-
-		if (idle) {
-			time(&time_idle);
-			time_idle -= idle * 60;
-		} else
-			time_idle = 0;
-
-		/*
-		 * If we have info for ourselves then set our display name, warning
-		 * level and official time of login.
-		 */
-		tmp = g_strdup(purple_normalize(account, purple_account_get_username(gc->account)));
-		if (!strcmp(tmp, purple_normalize(account, c))) {
-			purple_connection_set_display_name(gc, c);
-			/* XXX - What should the second parameter be here? */
-			/*			purple_prpl_got_account_warning_level(account, NULL, evil);*/
-			purple_prpl_got_account_login_time(account, signon);
-		}
-		g_free(tmp);
-
-		purple_prpl_got_user_status(account, c, (logged_in ? "online" : "offline"), NULL);
-		purple_prpl_got_user_login_time(account, c, signon);
-		if (time_idle > 0)
-			purple_prpl_got_user_idle(account, c, TRUE, time_idle);
-		else
-			purple_prpl_got_user_idle(account, c, FALSE, 0);
-	} else if (!g_ascii_strcasecmp(c, "ERROR")) {
-		purple_notify_error(gc, NULL, show_error_message(), NULL);
-	} else if (!g_ascii_strcasecmp(c, "EVILED")) {
-		int lev;
-		char *name;
-
-		sscanf(strtok(NULL, ":"), "%d", &lev);
-		name = strtok(NULL, ":");
-
-		/*	purple_prpl_got_account_warning_level(account, name, lev); */
-	} else if (!g_ascii_strcasecmp(c, "CHAT_JOIN")) {
-		char *name;
-		int id;
-
-		sscanf(strtok(NULL, ":"), "%d", &id);
-		name = strtok(NULL, ":");
-
-		serv_got_joined_chat(gc, id, name);
-	} else if (!g_ascii_strcasecmp(c, "CHAT_IN")) {
-		int id;
-		PurpleMessageFlags flags;
-		char *m, *who, *whisper;
-
-		sscanf(strtok(NULL, ":"), "%d", &id);
-		who = strtok(NULL, ":");
-		whisper = strtok(NULL, ":");
-		m = whisper;
-		while (*m && (*m != ':'))
-			m++;
-		m++;
-
-		flags = (whisper && (*whisper == 'T')) ? PURPLE_MESSAGE_WHISPER : 0;
-
-		serv_got_chat_in(gc, id, who, flags, m, time((time_t)NULL));
-	} else if (!g_ascii_strcasecmp(c, "CHAT_UPDATE_BUDDY")) {
-		int id;
-		char *in, *buddy;
-		GSList *bcs = gc->buddy_chats;
-		PurpleConversation *b = NULL;
-		PurpleConvChat *chat;
-
-		sscanf(strtok(NULL, ":"), "%d", &id);
-		in = strtok(NULL, ":");
-
-		chat = PURPLE_CONV_CHAT(b);
-
-		while (bcs) {
-			b = (PurpleConversation *)bcs->data;
-			if (id == purple_conv_chat_get_id(chat))
-				break;
-			bcs = bcs->next;
-			b = NULL;
-		}
-
-		if (!b)
-			return;
-
-		if (in && (*in == 'T'))
-			while ((buddy = strtok(NULL, ":")) != NULL)
-				purple_conv_chat_add_user(chat, buddy, NULL, PURPLE_CBFLAGS_NONE, TRUE);
-		else
-			while ((buddy = strtok(NULL, ":")) != NULL)
-				purple_conv_chat_remove_user(chat, buddy, NULL);
-	} else if (!g_ascii_strcasecmp(c, "CHAT_INVITE")) {
-		char *name, *who, *message;
-		int id;
-		GHashTable *components = g_hash_table_new_full(g_str_hash, g_str_equal,
-				g_free, g_free);
-
-		name = strtok(NULL, ":");
-		sscanf(strtok(NULL, ":"), "%d", &id);
-		who = strtok(NULL, ":");
-		message = strtok(NULL, ":");
-
-		g_hash_table_replace(components, g_strdup("id"), g_strdup_printf("%d", id));
-
-		serv_got_chat_invite(gc, name, who, message, components);
-	} else if (!g_ascii_strcasecmp(c, "CHAT_LEFT")) {
-		GSList *bcs = gc->buddy_chats;
-		PurpleConversation *b = NULL;
-		int id;
-
-		sscanf(strtok(NULL, ":"), "%d", &id);
-
-		while (bcs) {
-			b = (PurpleConversation *)bcs->data;
-			if (id == purple_conv_chat_get_id(PURPLE_CONV_CHAT(b)))
-				break;
-			b = NULL;
-			bcs = bcs->next;
-		}
-
-		if (!b)
-			return;
-
-		if (b->window) {
-			char error_buf[BUF_LONG];
-			purple_conversation_set_account(b, NULL);
-			g_snprintf(error_buf, sizeof error_buf, _("You have been disconnected"
-								  " from chat room %s."), b->name);
-			purple_notify_error(gc, NULL, error_buf, NULL);
-		} else
-			serv_got_chat_left(gc, id);
-	} else if (!g_ascii_strcasecmp(c, "GOTO_URL")) {
-		char *name, *url, tmp[256];
-
-		name = strtok(NULL, ":");
-		url = strtok(NULL, ":");
-
-		g_snprintf(tmp, sizeof(tmp), "http://%s:%d/%s", tdt->toc_ip,
-				purple_account_get_int(gc->account, "port", TOC_PORT),
-				url);
-		purple_url_fetch(tmp, FALSE, NULL, FALSE, toc_got_info, gc);
-	} else if (!g_ascii_strcasecmp(c, "DIR_STATUS")) {
-	} else if (!g_ascii_strcasecmp(c, "ADMIN_NICK_STATUS")) {
-	} else if (!g_ascii_strcasecmp(c, "ADMIN_PASSWD_STATUS")) {
-		purple_notify_info(gc, NULL, _("Password Change Successful"), NULL);
-	} else if (!g_ascii_strcasecmp(c, "PAUSE")) {
-		tdt->state = STATE_PAUSE;
-	} else if (!g_ascii_strcasecmp(c, "RVOUS_PROPOSE")) {
-#if 0
-		char *user, *uuid, *cookie;
-		int seq;
-		char *rip, *pip, *vip, *trillian = NULL;
-		int port;
-		
-		user = strtok(NULL, ":");
-		uuid = strtok(NULL, ":");
-		cookie = strtok(NULL, ":");
-		sscanf(strtok(NULL, ":"), "%d", &seq);
-		rip = strtok(NULL, ":");
-		pip = strtok(NULL, ":");
-		vip = strtok(NULL, ":");
-		sscanf(strtok(NULL, ":"), "%d", &port);
-
-		if (!strcmp(uuid, FILE_SEND_UID)) {
-			/* they want us to get a file */
-			int unk[4], i;
-			char *messages[4], *tmp, *name;
-			int subtype, files, totalsize = 0;
-			struct ft_request *ft;
-
-			for (i = 0; i < 4; i++) {
-				trillian = strtok(NULL, ":");
-				sscanf(trillian, "%d", &unk[i]);
-				if (unk[i] == 10001)
-					break;
-				/* Trillian likes to send an empty token as a message, rather than
-				   no message at all. */
-				if (*(trillian + strlen(trillian) +1) != ':')
-					frombase64(strtok(NULL, ":"), &messages[i], NULL);
-			}
-			   
-			frombase64(strtok(NULL, ":"), &tmp, NULL);
-
-			subtype = tmp[1];
-			files = tmp[3];
-
-			totalsize |= (tmp[4] << 24) & 0xff000000;
-			totalsize |= (tmp[5] << 16) & 0x00ff0000;
-			totalsize |= (tmp[6] << 8) & 0x0000ff00;
-			totalsize |= (tmp[7] << 0) & 0x000000ff;
-
-			if (!totalsize) {
-				g_free(tmp);
-				for (i--; i >= 0; i--)
-					g_free(messages[i]);
-				return;
-			}
-
-			name = tmp + 8;
-
-			ft = g_new0(struct ft_request, 1);
-			ft->cookie = g_strdup(cookie);
-			ft->ip = g_strdup(pip);
-			ft->port = port;
-			if (i)
-				ft->message = g_strdup(messages[0]);
-			else
-				ft->message = NULL;
-			ft->filename = g_strdup(name);
-			ft->user = g_strdup(user);
-			ft->size = totalsize;
-			ft->files = files;
-			g_snprintf(ft->UID, sizeof(ft->UID), "%s", FILE_SEND_UID);
-			ft->gc = gc;
-
-			g_free(tmp);
-			for (i--; i >= 0; i--)
-				g_free(messages[i]);
-
-			purple_debug(PURPLE_DEBUG_MISC, "toc",
-					   "English translation of RVOUS_PROPOSE: %s requests "
-					   "Send File (i.e. send a file to you); %s:%d "
-					   "(verified_ip:port), %d files at total size of "
-					   "%d bytes.\n", user, vip, port, files, totalsize);
-			accept_file_dialog(ft);
-		} else if (!strcmp(uuid, FILE_GET_UID)) {
-			/* they want us to send a file */
-			int unk[4], i;
-			char *messages[4], *tmp;
-			struct ft_request *ft;
-
-			for (i = 0; i < 4; i++) {
-				sscanf(strtok(NULL, ":"), "%d", unk + i);
-				if (unk[i] == 10001)
-					break;
-				/* Trillian likes to send an empty token as a message, rather than
-				   no message at all. */
-				if (*(trillian + strlen(trillian) +1) != ':')
-					frombase64(strtok(NULL, ":"), &messages[i], NULL);
-			}
-			frombase64(strtok(NULL, ":"), &tmp, NULL);
-
-			ft = g_new0(struct ft_request, 1);
-			ft->cookie = g_strdup(cookie);
-			ft->ip = g_strdup(pip);
-			ft->port = port;
-			if (i)
-				ft->message = g_strdup(messages[0]);
-			else
-				ft->message = NULL;
-			ft->user = g_strdup(user);
-			g_snprintf(ft->UID, sizeof(ft->UID), "%s", FILE_GET_UID);
-			ft->gc = gc;
-
-			g_free(tmp);
-			for (i--; i >= 0; i--)
-				g_free(messages[i]);
-
-			accept_file_dialog(ft);
-		} else if (!strcmp(uuid, VOICE_UID)) {
-			/* oh goody. voice over ip. fun stuff. */
-		} else if (!strcmp(uuid, B_ICON_UID)) {
-			int unk[4], i;
-			char *messages[4];
-			struct buddy_icon *icon;
-
-			for (i = 0; i < 4; i++) {
-				sscanf(strtok(NULL, ":"), "%d", unk + i);
-				if (unk[i] == 10001)
-					break;
-				frombase64(strtok(NULL, ":"), &messages[i], NULL);
-			}
-			frombase64(strtok(NULL, ":"), (char **)&icon, NULL);
-
-			purple_debug(PURPLE_DEBUG_MISC, "toc",
-			           "received icon of length %d\n", icon->len);
-			g_free(icon);
-			for (i--; i >= 0; i--)
-				g_free(messages[i]);
-		} else if (!strcmp(uuid, IMAGE_UID)) {
-			/* aka Direct IM */
-		} else {
-			purple_debug(PURPLE_DEBUG_ERROR, "toc",
-					   "Don't know what to do with RVOUS UUID %s\n", uuid);
-			/* do we have to do anything here? i think it just times out */
-		}
-#endif
-	} else {
-		purple_debug(PURPLE_DEBUG_ERROR, "toc",
-				   "don't know what to do with %s\n", c);
-	}
-}
-
-static int toc_send_im(PurpleConnection *gc, const char *name, const char *message, PurpleMessageFlags flags)
-{
-	char *buf1, *buf2;
-
-#if 1
-	/* This is the old, non-i18n way */
-	buf1 = escape_text(message);
-	if (strlen(buf1) + 52 > MSG_LEN) {
-		g_free(buf1);
-		return -E2BIG;
-	}
-	buf2 = g_strdup_printf("toc_send_im %s \"%s\"%s", purple_normalize(gc->account, name), buf1,
-						   ((flags & PURPLE_MESSAGE_AUTO_RESP) ? " auto" : ""));
-	g_free(buf1);
-#else
-	/* This doesn't work yet.  See the comments below for details */
-	buf1 = purple_strreplace(message, "\"", "\\\"");
-
-	/*
-	 * We still need to determine what encoding should be used and send the 
-	 * message in that encoding.  This should be done the same as in 
-	 * oscar_encoding_check() in oscar.c.  There is no encoding flag sent 
-	 * along with the message--the TOC to OSCAR proxy server must just 
-	 * use a lil' algorithm to determine what the actual encoding is.
-	 *
-	 * After that, you need to convert buf1 to that encoding, and keep track 
-	 * of the length of the resulting string.  Then you need to make sure 
-	 * that length is passed to sflap_send().
-	 */
-
-	if (strlen(buf1) + 52 > MSG_LEN) {
-		g_free(buf1);
-		return -E2BIG;
-	}
-
-	buf2 = g_strdup_printf("toc2_send_im_enc %s F U en \"%s\" %s", purple_normalize(gc->account, name), buf1, 
-						   ((flags & PURPLE_MESSAGE_AUTO_RESP) ? "auto" : ""));
-	g_free(buf1);
-#endif
-
-	sflap_send(gc, buf2, -1, TYPE_DATA);
-	g_free(buf2);
-
-	return 1;
-}
-
-static void toc_set_config(PurpleConnection *gc)
-{
-	char *buf = g_malloc(MSG_LEN), snd[BUF_LEN * 2];
-	toc_build_config(gc->account, buf, MSG_LEN - strlen("toc_set_config \\{\\}"), FALSE);
-	g_snprintf(snd, MSG_LEN, "toc_set_config {%s}", buf);
-	sflap_send(gc, snd, -1, TYPE_DATA);
-	g_free(buf);
-}
-
-static void toc_get_info(PurpleConnection *gc, const char *name)
-{
-	char buf[BUF_LEN * 2];
-	g_snprintf(buf, MSG_LEN, "toc_get_info %s", purple_normalize(gc->account, name));
-	sflap_send(gc, buf, -1, TYPE_DATA);
-}
-
-/* Should be implemented as an Account Action? */
-static void toc_get_dir(PurpleBlistNode *node, gpointer data)
-{
-	PurpleBuddy *buddy;
-	PurpleConnection *gc;
-	char buf[BUF_LEN * 2];
-
-	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
-
-	buddy = (PurpleBuddy *) node;
-	gc = purple_account_get_connection(buddy->account);
-
-	g_snprintf(buf, MSG_LEN, "toc_get_dir %s",
-			purple_normalize(buddy->account, buddy->name));
-	sflap_send(gc, buf, -1, TYPE_DATA);
-}
-
-#if 0
-/* Should be implemented as an Account Action */
-static void toc_set_dir(PurpleConnection *g, const char *first, const char *middle, const char *last,
-			const char *maiden, const char *city, const char *state, const char *country, int web)
-{
-	char *buf3, buf2[BUF_LEN * 4], buf[BUF_LEN];
-	g_snprintf(buf2, sizeof(buf2), "%s:%s:%s:%s:%s:%s:%s:%s", first,
-		   middle, last, maiden, city, state, country, (web == 1) ? "Y" : "");
-	buf3 = escape_text(buf2);
-	g_snprintf(buf, sizeof(buf), "toc_set_dir %s", buf3);
-	g_free(buf3);
-	sflap_send(g, buf, -1, TYPE_DATA);
-}
-#endif
-
-#if 0
-/* Should be implemented as an Account Action */
-static void toc_dir_search(PurpleConnection *g, const char *first, const char *middle, const char *last,
-			   const char *maiden, const char *city, const char *state, const char *country, const char *email)
-{
-	char buf[BUF_LONG];
-	g_snprintf(buf, sizeof(buf) / 2, "toc_dir_search %s:%s:%s:%s:%s:%s:%s:%s", first, middle,
-		   last, maiden, city, state, country, email);
-	purple_debug(PURPLE_DEBUG_INFO, "toc",
-			   "Searching for: %s,%s,%s,%s,%s,%s,%s\n",
-			   first, middle, last, maiden,
-		     city, state, country);
-	sflap_send(g, buf, -1, TYPE_DATA);
-}
-#endif
-
-static void toc_set_status(PurpleAccount *account, PurpleStatus *status)
-{
-#if 0 /* do we care about TOC any more? */
-	char buf[BUF_LEN * 2];
-	if (gc->away) {
-		g_free(gc->away);
-		gc->away = NULL;
-	}
-	if (message) {
-		char *tmp;
-		gc->away = g_strdup(message);
-		tmp = escape_text(message);
-		g_snprintf(buf, MSG_LEN, "toc_set_away \"%s\"", tmp);
-		g_free(tmp);
-	} else
-		g_snprintf(buf, MSG_LEN, "toc_set_away \"\"");
-	sflap_send(g, buf, -1, TYPE_DATA);
-#endif
-}
-
-static void toc_set_info(PurpleConnection *g, const char *info)
-{
-	char buf[BUF_LEN * 2], *buf2;
-	buf2 = escape_text(info);
-	g_snprintf(buf, sizeof(buf), "toc_set_info \"%s\n\"", buf2);
-	g_free(buf2);
-	sflap_send(g, buf, -1, TYPE_DATA);
-}
-
-static void toc_change_passwd(PurpleConnection *g, const char *orig, const char *new)
-{
-	char buf[BUF_LEN * 2];
-	g_snprintf(buf, BUF_LONG, "toc_change_passwd %s %s", orig, new);
-	sflap_send(g, buf, -1, TYPE_DATA);
-}
-
-static void
-toc_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
-{
-	char buf[BUF_LEN * 2];
-	g_snprintf(buf, sizeof(buf), "toc_add_buddy %s", purple_normalize(gc->account, buddy->name));
-	sflap_send(gc, buf, -1, TYPE_DATA);
-	toc_set_config(gc);
-}
-
-static void toc_add_buddies(PurpleConnection *gc, GList *buddies, GList *groups)
-{
-	char buf[BUF_LEN * 2];
-	int n;
-	GList *cur;
-
-	n = g_snprintf(buf, sizeof(buf), "toc_add_buddy");
-	for (cur = buddies; cur != NULL; cur = cur->next) {
-		PurpleBuddy *buddy = cur->data;
-
-		if (strlen(purple_normalize(gc->account, buddy->name)) + n + 32 > MSG_LEN) {
-			sflap_send(gc, buf, -1, TYPE_DATA);
-			n = g_snprintf(buf, sizeof(buf), "toc_add_buddy");
-		}
-		n += g_snprintf(buf + n, sizeof(buf) - n, " %s", purple_normalize(gc->account, buddy->name));
-	}
-	sflap_send(gc, buf, -1, TYPE_DATA);
-}
-
-static void toc_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
-{
-	char buf[BUF_LEN * 2];
-	g_snprintf(buf, sizeof(buf), "toc_remove_buddy %s", purple_normalize(gc->account, buddy->name));
-	sflap_send(gc, buf, -1, TYPE_DATA);
-	toc_set_config(gc);
-}
-
-static void toc_remove_buddies(PurpleConnection *gc, GList *buddies, GList *groups)
-{
-	char buf[BUF_LEN * 2];
-	int n;
-	GList *cur;
-
-	n = g_snprintf(buf, sizeof(buf), "toc_remove_buddy");
-	for (cur = buddies; cur != NULL; cur = cur->next) {
-		PurpleBuddy *buddy = cur->data;
-
-		if (strlen(purple_normalize(gc->account, buddy->name)) + n + 32 > MSG_LEN) {
-			sflap_send(gc, buf, -1, TYPE_DATA);
-			n = g_snprintf(buf, sizeof(buf), "toc_remove_buddy");
-		}
-		n += g_snprintf(buf + n, sizeof(buf) - n, " %s", purple_normalize(gc->account, buddy->name));
-	}
-	sflap_send(gc, buf, -1, TYPE_DATA);
-	toc_set_config(gc);
-}
-
-static void toc_set_idle(PurpleConnection *g, int time)
-{
-	char buf[BUF_LEN * 2];
-	g_snprintf(buf, sizeof(buf), "toc_set_idle %d", time);
-	sflap_send(g, buf, -1, TYPE_DATA);
-}
-
-static void toc_warn(PurpleConnection *g, const char *name, int anon)
-{
-	char send[BUF_LEN * 2];
-	g_snprintf(send, 255, "toc_evil %s %s", name, ((anon) ? "anon" : "norm"));
-	sflap_send(g, send, -1, TYPE_DATA);
-}
-
-static GList *toc_chat_info(PurpleConnection *gc)
-{
-	GList *m = NULL;
-	struct proto_chat_entry *pce;
-
-	pce = g_new0(struct proto_chat_entry, 1);
-	pce->label = _("_Group:");
-	pce->identifier = "room";
-	m = g_list_append(m, pce);
-
-	pce = g_new0(struct proto_chat_entry, 1);
-	pce->label = _("_Exchange:");
-	pce->identifier = "exchange";
-	pce->is_int = TRUE;
-	pce->min = 4;
-	pce->max = 20;
-	m = g_list_append(m, pce);
-
-	return m;
-}
-
-GHashTable *toc_chat_info_defaults(PurpleConnection *gc, const char *chat_name)
-{
-	GHashTable *defaults;
-
-	defaults = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
-
-	if (chat_name != NULL)
-		g_hash_table_insert(defaults, "room", g_strdup(chat_name));
-
-	return defaults;
-}
-
-static void toc_join_chat(PurpleConnection *g, GHashTable *data)
-{
-	char buf[BUF_LONG];
-	char *name, *exchange;
-	char *id;
-
-	name = g_hash_table_lookup(data, "room");
-	exchange = g_hash_table_lookup(data, "exchange");
-	id = g_hash_table_lookup(data, "id");
-
-	if (id) {
-		g_snprintf(buf, 255, "toc_chat_accept %d", atoi(id));
-	} else {
-		g_snprintf(buf, sizeof(buf) / 2, "toc_chat_join %d \"%s\"", atoi(exchange), name);
-	}
-
-	sflap_send(g, buf, -1, TYPE_DATA);
-}
-
-static void toc_chat_invite(PurpleConnection *gc, int id, const char *message, const char *name)
-{
-	char buf[BUF_LONG];
-	g_snprintf(buf, sizeof(buf) / 2, "toc_chat_invite %d \"%s\" %s", id,
-			message ? message : "", purple_normalize(gc->account, name));
-	sflap_send(gc, buf, -1, TYPE_DATA);
-}
-
-static void toc_chat_leave(PurpleConnection *g, int id)
-{
-	GSList *bcs = g->buddy_chats;
-	PurpleConversation *b = NULL;
-	char buf[BUF_LEN * 2];
-
-	while (bcs) {
-		b = (PurpleConversation *)bcs->data;
-		if (id == purple_conv_chat_get_id(PURPLE_CONV_CHAT(b)))
-			break;
-		b = NULL;
-		bcs = bcs->next;
-	}
-
-	if (!b)
-		return;		/* can this happen? */
-
-	if (purple_conversation_get_account(b) == NULL) {
-		/* TOC already kicked us out of this room */
-		serv_got_chat_left(g, id);
-	}
-	else {
-		g_snprintf(buf, 255, "toc_chat_leave %d", id);
-		sflap_send(g, buf, -1, TYPE_DATA);
-	}
-}
-
-static void toc_chat_whisper(PurpleConnection *gc, int id, const char *who, const char *message)
-{
-	char *buf1, *buf2;
-	buf1 = escape_text(message);
-	buf2 = g_strdup_printf("toc_chat_whisper %d %s \"%s\"", id, purple_normalize(gc->account, who), buf1);
-	g_free(buf1);
-	sflap_send(gc, buf2, -1, TYPE_DATA);
-	g_free(buf2);
-}
-
-static int toc_chat_send(PurpleConnection *g, int id, const char *message, PurpleMessageFlags flags)
-{
-	char *buf1, *buf2;
-	buf1 = escape_text(message);
-	if (strlen(buf1) > 2000) {
-		g_free(buf1);
-		return -E2BIG;
-	}
-	buf2 = g_strdup_printf("toc_chat_send %d \"%s\"", id, buf1);
-	g_free(buf1);
-	sflap_send(g, buf2, -1, TYPE_DATA);
-	g_free(buf2);
-	return 0;
-}
-
-static void toc_keepalive(PurpleConnection *gc)
-{
-	sflap_send(gc, "", 0, TYPE_KEEPALIVE);
-}
-
-static const char *
-toc_normalize(const PurpleAccount *account, const char *str)
-{
-	static char buf[BUF_LEN];
-	char *tmp1, *tmp2;
-	int i, j;
-
-	g_return_val_if_fail(str != NULL, NULL);
-
-	strncpy(buf, str, BUF_LEN);
-	for (i=0, j=0; buf[j]; i++, j++)
-	{
-		while (buf[j] == ' ')
-			j++;
-		buf[i] = buf[j];
-	}
-	buf[i] = '\0';
-
-	tmp1 = g_utf8_strdown(buf, -1);
-	tmp2 = g_utf8_normalize(tmp1, -1, G_NORMALIZE_DEFAULT);
-	g_snprintf(buf, sizeof(buf), "%s", tmp2);
-	g_free(tmp2);
-	g_free(tmp1);
-
-	return buf;
-}
-
-static const char *toc_list_icon(PurpleAccount *a, PurpleBuddy *b)
-{
-	if (!b || (b && b->name && b->name[0] == '+')) {
-		if (a != NULL && isdigit(*purple_account_get_username(a)))
-			return "icq";
-		else
-			return "aim";
-	}
-
-	if (b && b->name && isdigit(b->name[0]))
-		return "icq";
-	return "aim";
-}
-
-static const char* toc_list_emblem(PurpleBuddy *b)
-{
-	if (b->uc & UC_AOL)
-		return "aol";
-	if (b->uc & UC_ADMIN)
-		return "admin";
-	if (b->uc & UC_WIRELESS)
-		return "mobile";
-	return NULL	
-}
-
-static GList *toc_blist_node_menu(PurpleBlistNode *node)
-{
-	GList *m = NULL;
-	PurpleMenuAction *act;
-
-	if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
-		act = purple_menu_action_new(_("Get Dir Info"),
-		                           toc_get_dir, NULL, NULL);
-		m = g_list_append(m, act);
-	}
-
-	return m;
-}
-
-static void toc_add_permit(PurpleConnection *gc, const char *who)
-{
-	char buf2[BUF_LEN * 2];
-	if (gc->account->perm_deny != 3)
-		return;
-	g_snprintf(buf2, sizeof(buf2), "toc_add_permit %s", purple_normalize(gc->account, who));
-	sflap_send(gc, buf2, -1, TYPE_DATA);
-	toc_set_config(gc);
-}
-
-static void toc_add_deny(PurpleConnection *gc, const char *who)
-{
-	char buf2[BUF_LEN * 2];
-	if (gc->account->perm_deny != 4)
-		return;
-	g_snprintf(buf2, sizeof(buf2), "toc_add_deny %s", purple_normalize(gc->account, who));
-	sflap_send(gc, buf2, -1, TYPE_DATA);
-	toc_set_config(gc);
-}
-
-static void toc_set_permit_deny(PurpleConnection *gc)
-{
-	char buf2[BUF_LEN * 2];
-	GSList *list;
-	int at;
-
-	switch (gc->account->perm_deny) {
-	case 1:
-		/* permit all, deny none. to get here reliably we need to have been in permit
-		 * mode, and send an empty toc_add_deny message, which will switch us to deny none */
-		g_snprintf(buf2, sizeof(buf2), "toc_add_permit ");
-		sflap_send(gc, buf2, -1, TYPE_DATA);
-		g_snprintf(buf2, sizeof(buf2), "toc_add_deny ");
-		sflap_send(gc, buf2, -1, TYPE_DATA);
-		break;
-	case 2:
-		/* deny all, permit none. to get here reliably we need to have been in deny
-		 * mode, and send an empty toc_add_permit message, which will switch us to permit none */
-		g_snprintf(buf2, sizeof(buf2), "toc_add_deny ");
-		sflap_send(gc, buf2, -1, TYPE_DATA);
-		g_snprintf(buf2, sizeof(buf2), "toc_add_permit ");
-		sflap_send(gc, buf2, -1, TYPE_DATA);
-		break;
-	case 3:
-		/* permit some. we want to switch to deny mode first, then send the toc_add_permit
-		 * message, which will clear and set our permit list. toc sucks. */
-		g_snprintf(buf2, sizeof(buf2), "toc_add_deny ");
-		sflap_send(gc, buf2, -1, TYPE_DATA);
-
-		at = g_snprintf(buf2, sizeof(buf2), "toc_add_permit ");
-		list = gc->account->permit;
-		while (list) {
-			at += g_snprintf(buf2 + at, sizeof(buf2) - at, "%s ", purple_normalize(gc->account, list->data));
-			if (at > MSG_LEN + 32) {	/* from out my ass comes greatness */
-				sflap_send(gc, buf2, -1, TYPE_DATA);
-				at = g_snprintf(buf2, sizeof(buf2), "toc_add_permit ");
-			}
-			list = list->next;
-		}
-		sflap_send(gc, buf2, -1, TYPE_DATA);
-		break;
-	case 4:
-		/* deny some. we want to switch to permit mode first, then send the toc_add_deny
-		 * message, which will clear and set our deny list. toc sucks. */
-		g_snprintf(buf2, sizeof(buf2), "toc_add_permit ");
-		sflap_send(gc, buf2, -1, TYPE_DATA);
-
-		at = g_snprintf(buf2, sizeof(buf2), "toc_add_deny ");
-		list = gc->account->deny;
-		while (list) {
-			at += g_snprintf(buf2 + at, sizeof(buf2) - at, "%s ", purple_normalize(gc->account, list->data));
-			if (at > MSG_LEN + 32) {	/* from out my ass comes greatness */
-				sflap_send(gc, buf2, -1, TYPE_DATA);
-				at = g_snprintf(buf2, sizeof(buf2), "toc_add_deny ");
-			}
-			list = list->next;
-		}
-		sflap_send(gc, buf2, -1, TYPE_DATA);
-		break;
-	default:
-		break;
-	}
-	toc_set_config(gc);
-}
-
-static void toc_rem_permit(PurpleConnection *gc, const char *who)
-{
-	if (gc->account->perm_deny != 3)
-		return;
-	toc_set_permit_deny(gc);
-}
-
-static void toc_rem_deny(PurpleConnection *gc, const char *who)
-{
-	if (gc->account->perm_deny != 4)
-		return;
-	toc_set_permit_deny(gc);
-}
-
-static GList *toc_away_states(PurpleAccount *account)
-{
-#if 0 /* do we care about TOC any more? */
-	return g_list_append(NULL, PURPLE_AWAY_CUSTOM);
-#else
-	return NULL;
-#endif
-}
-
-static void
-show_set_info(PurplePluginAction *action)
-{
-	PurpleConnection *gc = (PurpleConnection *) action->context;
-	purple_account_request_change_user_info(purple_connection_get_account(gc));
-}
-
-static void
-change_pass(PurplePluginAction *action)
-{
-	PurpleConnection *gc = (PurpleConnection *) action->context;
-	purple_account_request_change_password(purple_connection_get_account(gc));
-}
-
-static GList *toc_actions(PurplePlugin *plugin, gpointer context)
-{
-	GList *m = NULL;
-	PurplePluginAction *act;
-
-	act = purple_plugin_action_new(_("Set User Info"),
-			show_set_info);
-	m = g_list_append(m, act);
-
-#if 0
-	act = purple_plugin_action_new(_("Set Dir Info"),
-			show_set_dir);
-	m = g_list_append(m, act);
-#endif
-
-	act = purple_plugin_action_new(_("Change Password"),
-			change_pass);
-	m = g_list_append(m, act);
-
-	return m;
-}
-
-#if 0
-/*********
- * RVOUS ACTIONS
- ********/
-
-struct file_header {
-	char  magic[4];		/* 0 */
-	short hdrlen;		/* 4 */
-	short hdrtype;		/* 6 */
-	char  bcookie[8];	/* 8 */
-	short encrypt;		/* 16 */
-	short compress;		/* 18 */
-	short totfiles;		/* 20 */
-	short filesleft;	/* 22 */
-	short totparts;		/* 24 */
-	short partsleft;	/* 26 */
-	long  totsize;		/* 28 */
-	long  size;		/* 32 */
-	long  modtime;		/* 36 */
-	long  checksum;		/* 40 */
-	long  rfrcsum;		/* 44 */
-	long  rfsize;		/* 48 */
-	long  cretime;		/* 52 */
-	long  rfcsum;		/* 56 */
-	long  nrecvd;		/* 60 */
-	long  recvcsum;		/* 64 */
-	char  idstring[32];	/* 68 */
-	char  flags;		/* 100 */
-	char  lnameoffset;	/* 101 */
-	char  lsizeoffset;	/* 102 */
-	char  dummy[69];	/* 103 */
-	char  macfileinfo[16];	/* 172 */
-	short nencode;		/* 188 */
-	short nlanguage;	/* 190 */
-	char  name[64];		/* 192 */
-				/* 256 */
-};
-
-struct file_transfer {
-	struct file_header hdr;
-
-	PurpleConnection *gc;
-
-	char *user;
-	char *cookie;
-	char *ip;
-	int port;
-	long size;
-	struct stat st;
-
-	GtkWidget *window;
-	int files;
-	char *filename;
-	FILE *file;
-	int recvsize;
-
-	gint inpa;
-};
-
-static void debug_header(struct file_transfer *ft) {
-	struct file_header *f = (struct file_header *)ft;
-	purple_debug(PURPLE_DEBUG_MISC, "toc", "FT HEADER:\n"
-			"\t%s %d 0x%04x\n"
-			"\t%s %d %d\n"
-			"\t%d %d %d %d %d %d\n"
-			"\t%d %d %d %d %d %d %d %d\n"
-			"\t%s\n"
-			"\t0x%02x, 0x%02x, 0x%02x\n"
-			"\t%s %s\n"
-			"\t%d %d\n"
-			"\t%s\n",
-			f->magic, ntohs(f->hdrlen), f->hdrtype,
-			f->bcookie, ntohs(f->encrypt), ntohs(f->compress),
-			ntohs(f->totfiles), ntohs(f->filesleft), ntohs(f->totparts),
-				ntohs(f->partsleft), ntohl(f->totsize), ntohl(f->size),
-			ntohl(f->modtime), ntohl(f->checksum), ntohl(f->rfrcsum), ntohl(f->rfsize),
-				ntohl(f->cretime), ntohl(f->rfcsum), ntohl(f->nrecvd),
-				ntohl(f->recvcsum),
-			f->idstring,
-			f->flags, f->lnameoffset, f->lsizeoffset,
-			f->dummy, f->macfileinfo,
-			ntohs(f->nencode), ntohs(f->nlanguage),
-			f->name);
-}
-
-static void toc_send_file_callback(gpointer data, gint source, PurpleInputCondition cond)
-{
-	char buf[BUF_LONG];
-	int rt, i;
-
-	struct file_transfer *ft = data;
-
-	if (ft->hdr.hdrtype != 0x202) {
-		char *buf;
-		frombase64(ft->cookie, &buf, NULL);
-
-		read(source, ft, 8);
-		read(source, &ft->hdr.bcookie, MIN(256 - 8, ntohs(ft->hdr.hdrlen) - 8));
-		debug_header(ft);
-
-		ft->hdr.hdrtype = 0x202;
-		memcpy(ft->hdr.bcookie, buf, 8);
-		g_free(buf);
-		ft->hdr.encrypt = 0; ft->hdr.compress = 0;
-		debug_header(ft);
-		write(source, ft, 256);
-
-		if (ft->files == 1) {
-			ft->file = g_fopen(ft->filename, "w");
-			if (!ft->file) {
-				buf = g_strdup_printf(_("Could not open %s for writing!"), ft->filename);
-				purple_notify_error(ft->gc, NULL, buf, g_strerror(errno));
-				g_free(buf);
-				purple_input_remove(ft->inpa);
-				close(source);
-				g_free(ft->filename);
-				g_free(ft->user);
-				g_free(ft->ip);
-				g_free(ft->cookie);
-				g_free(ft);
-			}
-		} else {
-			buf = g_strdup_printf("%s/%s", ft->filename, ft->hdr.name);
-			ft->file = g_fopen(buf, "w");
-			g_free(buf);
-			if (!ft->file) {
-				buf = g_strdup_printf("Could not open %s/%s for writing!", ft->filename,
-						ft->hdr.name);
-				purple_notify_error(ft->gc, NULL, buf, g_strerror(errno));
-				g_free(buf);
-				purple_input_remove(ft->inpa);
-				close(source);
-				g_free(ft->filename);
-				g_free(ft->user);
-				g_free(ft->ip);
-				g_free(ft->cookie);
-				g_free(ft);
-			}
-		}
-
-		return;
-	}
-
-	rt = read(source, buf, MIN(ntohl(ft->hdr.size) - ft->recvsize, 1024));
-	if (rt < 0) {
-		purple_notify_error(ft->gc, NULL,
-						  _("File transfer failed; other side probably "
-							"canceled."), NULL);
-		purple_input_remove(ft->inpa);
-		close(source);
-		g_free(ft->user);
-		g_free(ft->ip);
-		g_free(ft->cookie);
-		if (ft->file)
-			fclose(ft->file);
-		g_free(ft);
-		return;
-	}
-	ft->recvsize += rt;
-	for (i = 0; i < rt; i++)
-		fprintf(ft->file, "%c", buf[i]);
-
-	if (ft->recvsize == ntohl(ft->hdr.size)) {
-		ft->hdr.hdrtype = htons(0x0204);
-		ft->hdr.filesleft = htons(ntohs(ft->hdr.filesleft) - 1);
-		ft->hdr.partsleft = htons(ntohs(ft->hdr.partsleft) - 1);
-		ft->hdr.recvcsum = ft->hdr.checksum; /* uh... */
-		ft->hdr.nrecvd = htons(ntohs(ft->hdr.nrecvd) + 1);
-		ft->hdr.flags = 0;
-		write(source, ft, 256);
-		debug_header(ft);
-		ft->recvsize = 0;
-		fclose(ft->file);
-		if (ft->hdr.filesleft == 0) {
-			purple_input_remove(ft->inpa);
-			close(source);
-			g_free(ft->filename);
-			g_free(ft->user);
-			g_free(ft->ip);
-			g_free(ft->cookie);
-			g_free(ft);
-		}
-	}
-}
-
-static void toc_send_file_connect(gpointer data, gint src, PurpleInputCondition cond)
-{
-	struct file_transfer *ft = data;
-
-	if (src == -1) {
-		purple_notify_error(ft->gc, NULL,
-						  _("Could not connect for transfer."), NULL);
-		g_free(ft->filename);
-		g_free(ft->cookie);
-		g_free(ft->user);
-		g_free(ft->ip);
-		g_free(ft);
-		return;
-	}
-
-	ft->inpa = purple_input_add(src, PURPLE_INPUT_READ, toc_send_file_callback, ft);
-}
-
-static void toc_send_file(gpointer a, struct file_transfer *old_ft)
-{
-	struct file_transfer *ft;
-	const char *dirname = gtk_file_selection_get_filename(GTK_FILE_SELECTION(old_ft->window));
-	PurpleAccount *account;
-	char buf[BUF_LEN * 2];
-
-	if (purple_gtk_check_if_dir(dirname, GTK_FILE_SELECTION(old_ft->window)))
-		return;
-	ft = g_new0(struct file_transfer, 1);
-	if (old_ft->files == 1)
-		ft->filename = g_strdup(dirname);
-	else
-		ft->filename = g_path_get_dirname(dirname);
-	ft->cookie = g_strdup(old_ft->cookie);
-	ft->user = g_strdup(old_ft->user);
-	ft->ip = g_strdup(old_ft->ip);
-	ft->files = old_ft->files;
-	ft->port = old_ft->port;
-	ft->gc = old_ft->gc;
-	account = ft->gc->account;
-	gtk_widget_destroy(old_ft->window);
-
-	g_snprintf(buf, sizeof(buf), "toc_rvous_accept %s %s %s", ft->user, ft->cookie, FILE_SEND_UID);
-	sflap_send(ft->gc, buf, -1, TYPE_DATA);
-
-	if (purple_proxy_connect(ft->gc, account, ft->ip, ft->port, toc_send_file_connect, ft) != 0) {
-		purple_notify_error(ft->gc, NULL,
-						  _("Could not connect for transfer."), NULL);
-		g_free(ft->filename);
-		g_free(ft->cookie);
-		g_free(ft->user);
-		g_free(ft->ip);
-		g_free(ft);
-		return;
-	}
-}
-
-static void toc_get_file_callback(gpointer data, gint source, PurpleInputCondition cond)
-{
-	char buf[BUF_LONG];
-
-	struct file_transfer *ft = data;
-
-	if (cond & PURPLE_INPUT_WRITE) {
-		int remain = MIN(ntohl(ft->hdr.totsize) - ft->recvsize, 1024);
-		int i;
-		for (i = 0; i < remain; i++)
-			fscanf(ft->file, "%c", &buf[i]);
-		write(source, buf, remain);
-		ft->recvsize += remain;
-		if (ft->recvsize == ntohl(ft->hdr.totsize)) {
-			purple_input_remove(ft->inpa);
-			ft->inpa = purple_input_add(source, PURPLE_INPUT_READ,
-						 toc_get_file_callback, ft);
-		}
-		return;
-	}
-
-	if (ft->hdr.hdrtype == htons(0x1108)) {
-		struct tm *fortime;
-		struct stat st;
-		char *basename;
-
-		read(source, ft, 8);
-		read(source, &ft->hdr.bcookie, MIN(256 - 8, ntohs(ft->hdr.hdrlen) - 8));
-		debug_header(ft);
-
-		g_stat(ft->filename, &st);
-		fortime = localtime(&st.st_mtime);
-		basename = g_path_get_basename(ft->filename);
-		g_snprintf(buf, sizeof(buf), "%2d/%2d/%4d %2d:%2d %8ld %s\r\n",
-				fortime->tm_mon + 1, fortime->tm_mday, fortime->tm_year + 1900,
-				fortime->tm_hour + 1, fortime->tm_min + 1, (long)st.st_size,
-				basename);
-		write(source, buf, ntohl(ft->hdr.size));
-		g_free(basename);
-		return;
-	}
-
-	if (ft->hdr.hdrtype == htons(0x1209)) {
-		read(source, ft, 8);
-		read(source, &ft->hdr.bcookie, MIN(256 - 8, ntohs(ft->hdr.hdrlen) - 8));
-		debug_header(ft);
-		return;
-	}
-
-	if (ft->hdr.hdrtype == htons(0x120b)) {
-		read(source, ft, 8);
-		read(source, &ft->hdr.bcookie, MIN(256 - 8, ntohs(ft->hdr.hdrlen) - 8));
-		debug_header(ft);
-
-		if (ft->hdr.hdrtype != htons(0x120c)) {
-			g_snprintf(buf, sizeof(buf), "%s decided to cancel the transfer", ft->user);
-			purple_notify_error(ft->gc, NULL, buf, NULL);
-			purple_input_remove(ft->inpa);
-			close(source);
-			g_free(ft->filename);
-			g_free(ft->user);
-			g_free(ft->ip);
-			g_free(ft->cookie);
-			if (ft->file)
-				fclose(ft->file);
-			g_free(ft);
-			return;
-		}
-
-		ft->hdr.hdrtype = 0x0101;
-		ft->hdr.totfiles = htons(1); ft->hdr.filesleft = htons(1);
-		ft->hdr.flags = 0x20;
-		write(source, ft, 256);
-		return;
-	}
-
-	if (ft->hdr.hdrtype == 0x0101) {
-		read(source, ft, 8);
-		read(source, &ft->hdr.bcookie, MIN(256 - 8, ntohs(ft->hdr.hdrlen) - 8));
-		debug_header(ft);
-
-		purple_input_remove(ft->inpa);
-		ft->inpa = purple_input_add(source, PURPLE_INPUT_WRITE,
-					 toc_get_file_callback, ft);
-		return;
-	}
-
-	if (ft->hdr.hdrtype == 0x0202) {
-		read(source, ft, 8);
-		read(source, &ft->hdr.bcookie, MIN(256 - 8, ntohs(ft->hdr.hdrlen) - 8));
-		debug_header(ft);
-
-		purple_input_remove(ft->inpa);
-		close(source);
-		g_free(ft->filename);
-		g_free(ft->user);
-		g_free(ft->ip);
-		g_free(ft->cookie);
-		if (ft->file)
-			fclose(ft->file);
-		g_free(ft);
-		return;
-	}
-}
-
-static void toc_get_file_connect(gpointer data, gint src, PurpleInputCondition cond)
-{
-	struct file_transfer *ft = data;
-	struct file_header *hdr;
-	char *buf;
-	char *basename;
-
-	if (src == -1) {
-		purple_notify_error(ft->gc, NULL,
-						  _("Could not connect for transfer."), NULL);
-		fclose(ft->file);
-		g_free(ft->filename);
-		g_free(ft->cookie);
-		g_free(ft->user);
-		g_free(ft->ip);
-		g_free(ft);
-		return;
-	}
-
-	hdr = (struct file_header *)ft;
-	hdr->magic[0] = 'O'; hdr->magic[1] = 'F'; hdr->magic[2] = 'T'; hdr->magic[3] = '2';
-	hdr->hdrlen = htons(256);
-	hdr->hdrtype = htons(0x1108);
-	rombase64(ft->cookie, &buf, NULL);
-	g_snprintf(hdr->bcookie, 8, "%s", buf);
-	g_free(buf);
-	hdr->totfiles = htons(1); hdr->filesleft = htons(1);
-	hdr->totparts = htons(1); hdr->partsleft = htons(1);
-	hdr->totsize = htonl((long)ft->st.st_size); /* combined size of all files */
-	/* size = strlen("mm/dd/yyyy hh:mm sizesize 'name'\r\n") */
-	basename = g_path_get_basename(ft->filename);
-	hdr->size = htonl(28 + strlen(basename)); /* size of listing.txt */
-	g_free(basename);
-	hdr->modtime = htonl(ft->st.st_mtime);
-	hdr->checksum = htonl(0x89f70000); /* uh... */
-	g_snprintf(hdr->idstring, 32, "OFT_Windows ICBMFT V1.1 32");
-	hdr->flags = 0x02;
-	hdr->lnameoffset = 0x1A;
-	hdr->lsizeoffset = 0x10;
-	g_snprintf(hdr->name, 64, "listing.txt");
-	if (write(src, hdr, 256) < 0) {
-		purple_notify_error(ft->gc, NULL,
-						  _("Could not write file header.  The file will "
-							"not be transferred."), NULL);
-		fclose(ft->file);
-		g_free(ft->filename);
-		g_free(ft->cookie);
-		g_free(ft->user);
-		g_free(ft->ip);
-		g_free(ft);
-		return;
-	}
-
-	ft->inpa = purple_input_add(src, PURPLE_INPUT_READ, toc_get_file_callback, ft);
-}
-
-static void toc_get_file(gpointer a, struct file_transfer *old_ft)
-{
-	struct file_transfer *ft;
-	const char *dirname = gtk_file_selection_get_filename(GTK_FILE_SELECTION(old_ft->window));
-	PurpleAccount *account;
-	char *buf, buf2[BUF_LEN * 2];
-
-	if (purple_gtk_check_if_dir(dirname, GTK_FILE_SELECTION(old_ft->window)))
-		return;
-	ft = g_new0(struct file_transfer, 1);
-	ft->filename = g_strdup(dirname);
-	ft->file = g_fopen(ft->filename, "r");
-	if (!ft->file) {
-		buf = g_strdup_printf("Unable to open %s for transfer.", ft->filename);
-		purple_notify_error(ft->gc, NULL, buf, NULL);
-		g_free(buf);
-		g_free(ft->filename);
-		g_free(ft);
-		return;
-	}
-	if (g_stat(dirname, &ft->st)) {
-		buf = g_strdup_printf("Unable to examine %s.", dirname);
-		purple_notify_error(ft->gc, NULL, buf, NULL);
-		g_free(buf);
-		g_free(ft->filename);
-		g_free(ft);
-		return;
-	}
-	ft->cookie = g_strdup(old_ft->cookie);
-	ft->user = g_strdup(old_ft->user);
-	ft->ip = g_strdup(old_ft->ip);
-	ft->port = old_ft->port;
-	ft->gc = old_ft->gc;
-	account = ft->gc->account;
-	gtk_widget_destroy(old_ft->window);
-
-	g_snprintf(buf2, sizeof(buf2), "toc_rvous_accept %s %s %s", ft->user, ft->cookie, FILE_GET_UID);
-	sflap_send(ft->gc, buf2, -1, TYPE_DATA);
-
-	if (purple_proxy_connect(ft->gc, account, ft->ip, ft->port, toc_get_file_connect, ft) < 0) {
-		purple_notify_error(ft->gc, NULL,
-						  _("Could not connect for transfer."), NULL);
-		fclose(ft->file);
-		g_free(ft->filename);
-		g_free(ft->cookie);
-		g_free(ft->user);
-		g_free(ft->ip);
-		g_free(ft);
-		return;
-	}
-}
-
-static void cancel_callback(gpointer a, struct file_transfer *ft) {
-	gtk_widget_destroy(ft->window);
-	if (a == ft->window) {
-		g_free(ft->cookie);
-		g_free(ft->user);
-		g_free(ft->ip);
-		g_free(ft);
-	}
-}
-
-static void toc_reject_ft(struct ft_request *ft) {
-	g_free(ft->user);
-	g_free(ft->filename);
-	g_free(ft->ip);
-	g_free(ft->cookie);
-	if (ft->message)
-		g_free(ft->message);
-	g_free(ft);
-}
-
-
-static void toc_accept_ft(struct ft_request *fr) {
-	if(g_list_find(purple_connections_get_all(), fr->gc)) {
-		GtkWidget *window;
-		char buf[BUF_LEN];
-
-		struct file_transfer *ft = g_new0(struct file_transfer, 1);
-		ft->gc = fr->gc;
-		ft->user = g_strdup(fr->user);
-		ft->cookie = g_strdup(fr->cookie);
-		ft->ip = g_strdup(fr->ip);
-		ft->port = fr->port;
-		ft->files = fr->files;
-
-		ft->window = window = gtk_file_selection_new(_("Save As..."));
-		g_snprintf(buf, sizeof(buf), "%s/%s", purple_home_dir(), fr->filename ? fr->filename : "");
-		gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), buf);
-		g_signal_connect(G_OBJECT(window), "destroy",
-				G_CALLBACK(cancel_callback), ft);
-		g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(ft->window)->cancel_button),
-				"clicked", G_CALLBACK(cancel_callback), ft);
-
-		if (!strcmp(fr->UID, FILE_SEND_UID))
-			g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(window)->ok_button),
-					"clicked", G_CALLBACK(toc_send_file), ft);
-		else
-			g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(window)->ok_button),
-					"clicked", G_CALLBACK(toc_get_file), ft);
-
-		gtk_widget_show(window);
-	}
-
-	toc_reject_ft(fr);
-}
-
-static void accept_file_dialog(struct ft_request *ft) {
-	char buf[BUF_LONG];
-	if (!strcmp(ft->UID, FILE_SEND_UID)) {
-		/* holy crap. who the fuck would transfer gigabytes through AIM?! */
-		static char *sizes[4] = { "bytes", "KB", "MB", "GB" };
-		float size = ft->size;
-		int index = 0;
-		while ((index < 4) && (size > 1024)) {
-			size /= 1024;
-			index++;
-		}
-		g_snprintf(buf, sizeof(buf), 
-				dngettext(PACKAGE, 
-				"%s requests %s to accept %d file: %s (%.2f %s)%s%s",
-				"%s requests %s to accept %d files: %s (%.2f %s)%s%s",
-				ft->files),
-				ft->user, purple_account_get_username(ft->gc->account), ft->files,
-				ft->filename, size, sizes[index], (ft->message) ? "\n" : "",
-				(ft->message) ? ft->message : "");
-	} else {
-		g_snprintf(buf, sizeof(buf), _("%s requests you to send them a file"), ft->user);
-	}
-
-	purple_request_accept_cancel(ft->gc, NULL, buf, NULL, 
-							   PURPLE_DEFAULT_ACTION_NONE, ft,
-							   G_CALLBACK(toc_accept_ft),
-							   G_CALLBACK(toc_reject_ft));
-}
-#endif
-
-static PurplePluginProtocolInfo prpl_info =
-{
-	0,
-	NULL,					/* user_splits */
-	NULL,					/* protocol_options */
-	NO_BUDDY_ICONS,			/* icon_spec */
-	toc_list_icon,			/* list_icon */
-	toc_list_emblem,		/* list_emblems */
-	NULL,					/* status_text */
-	NULL,					/* tooltip_text */
-	toc_away_states,		/* away_states */
-	toc_blist_node_menu,	/* blist_node_menu */
-	toc_chat_info,			/* chat_info */
-	toc_chat_info_defaults,	/* chat_info_defaults */
-	toc_login,				/* login */
-	toc_close,				/* close */
-	toc_send_im,			/* send_im */
-	toc_set_info,			/* set_info */
-	NULL,					/* send_typing */
-	toc_get_info,			/* get_info */
-	toc_set_status,			/* set_away */
-	toc_set_idle,			/* set_idle */
-	toc_change_passwd,		/* change_passwd */
-	toc_add_buddy,			/* add_buddy */
-	toc_add_buddies,		/* add_buddies */
-	toc_remove_buddy,		/* remove_buddy */
-	toc_remove_buddies,		/* remove_buddies */
-	toc_add_permit,			/* add_permit */
-	toc_add_deny,			/* add_deny */
-	toc_rem_permit,			/* rem_permit */
-	toc_rem_deny,			/* rem_deny */
-	toc_set_permit_deny,	/* set_permit_deny */
-	toc_join_chat,			/* join_chat */
-	NULL,					/* reject_chat */
-	NULL,				/* get_chat_name */
-	toc_chat_invite,		/* chat_invite */
-	toc_chat_leave,			/* chat_leave */
-	toc_chat_whisper,		/* chat_whisper */
-	toc_chat_send,			/* chat_send */
-	toc_keepalive,			/* keepalive */
-	NULL,					/* register_user */
-	NULL,					/* get_cb_info */
-	NULL,					/* get_cb_away */
-	NULL,					/* alias_buddy */
-	NULL,					/* group_buddy */
-	NULL,					/* rename_group */
-	NULL,					/* buddy_free */
-	NULL,					/* convo_closed */
-	toc_normalize,			/* normalize */
-	NULL,					/* set_buddy_icon */
-	NULL,					/* remove_group */
-	NULL,					/* get_cb_real_name */
-	NULL,					/* set_chat_topic */
-	NULL,					/* find_blist_chat */
-	NULL,					/* roomlist_get_list */
-	NULL,					/* roomlist_cancel */
-	NULL,					/* roomlist_expand_category */
-	NULL,					/* can_receive_file */
-	NULL,					/* send_file */
-	NULL,					/* new_xfer */
-	NULL,					/* offline_message */
-	NULL,					/* whiteboard_prpl_ops */
-	toc_send_raw,				/* send_raw */
-};
-
-static PurplePluginInfo info =
-{
-	PURPLE_PLUGIN_MAGIC,
-	PURPLE_MAJOR_VERSION,
-	PURPLE_MINOR_VERSION,
-	PURPLE_PLUGIN_PROTOCOL,                             /**< type           */
-	NULL,                                             /**< ui_requirement */
-	0,                                                /**< flags          */
-	NULL,                                             /**< dependencies   */
-	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
-
-	"prpl-toc",                                       /**< id             */
-	"TOC",                                            /**< name           */
-	DISPLAY_VERSION,                                  /**< version        */
-	                                                  /**  summary        */
-	N_("TOC Protocol Plugin"),
-	                                                  /**  description    */
-	N_("TOC Protocol Plugin"),
-	NULL,                                             /**< author         */
-	PURPLE_WEBSITE,                                     /**< homepage       */
-
-	NULL,                                             /**< load           */
-	NULL,                                             /**< unload         */
-	NULL,                                             /**< destroy        */
-
-	NULL,                                             /**< ui_info        */
-	&prpl_info,                                       /**< extra_info     */
-	NULL,
-	toc_actions
-};
-
-static void
-init_plugin(PurplePlugin *plugin)
-{
-	PurpleAccountOption *option;
-
-	option = purple_account_option_string_new(_("Server"), "server", TOC_HOST);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);
-
-	option = purple_account_option_int_new(_("Port"), "port", TOC_PORT);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);
-
-	my_protocol = plugin;
-}
-
-PURPLE_INIT_PLUGIN(toc, init_plugin, info);
diff --git a/libpurple/protocols/yahoo/Makefile.am b/libpurple/protocols/yahoo/Makefile.am
index ce1b1355b2..3a010ea33c 100644
--- a/libpurple/protocols/yahoo/Makefile.am
+++ b/libpurple/protocols/yahoo/Makefile.am
@@ -4,17 +4,13 @@ EXTRA_DIST = \
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
 YAHOOSOURCES = \
+	libymsg.c \
+	libymsg.h \
 	util.c \
-	yahoo.c \
-	yahoo.h \
 	yahoochat.h \
 	yahoochat.c \
 	yahoo_aliases.c \
 	yahoo_aliases.h \
-	yahoo_auth.c \
-	yahoo_auth.h \
-	yahoo_crypt.h \
-	yahoo_crypt.c \
 	yahoo_doodle.h \
 	yahoo_doodle.c \
 	yahoo_filexfer.h \
@@ -32,20 +28,28 @@ YAHOOSOURCES = \
 AM_CFLAGS = $(st)
 
 libyahoo_la_LDFLAGS = -module -avoid-version
+libyahoojp_la_LDFLAGS = -module -avoid-version
 
 if STATIC_YAHOO
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LTLIBRARIES  = libyahoo.la
-libyahoo_la_SOURCES = $(YAHOOSOURCES)
-libyahoo_la_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES  = libymsg.la
+libymsg_la_SOURCES = $(YAHOOSOURCES) libyahoo.c libyahoojp.c
+libymsg_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
 st =
-pkg_LTLIBRARIES     = libyahoo.la
-libyahoo_la_SOURCES = $(YAHOOSOURCES)
-libyahoo_la_LIBADD  = $(GLIB_LIBS)
+pkg_LTLIBRARIES     = libymsg.la libyahoo.la libyahoojp.la
+
+libymsg_la_SOURCES = $(YAHOOSOURCES)
+libymsg_la_LIBADD  = $(GLIB_LIBS)
+
+libyahoo_la_SOURCES = libyahoo.c
+libyahoo_la_LIBADD = libymsg.la
+
+libyahoojp_la_SOURCES = libyahoojp.c
+libyahoojp_la_LIBADD = libymsg.la
 
 endif
 
@@ -53,4 +57,4 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
-	$(DEBUG_CFLAGS)
\ No newline at end of file
+	$(DEBUG_CFLAGS)
diff --git a/libpurple/protocols/yahoo/Makefile.mingw b/libpurple/protocols/yahoo/Makefile.mingw
index 34a36491b6..f2aba5bdf6 100644
--- a/libpurple/protocols/yahoo/Makefile.mingw
+++ b/libpurple/protocols/yahoo/Makefile.mingw
@@ -7,7 +7,9 @@
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
-TARGET = libyahoo
+TARGET = libymsg
+YAHOO_TARGET = libyahoo
+YAHOOJP_TARGET = libyahoojp
 TYPE = PLUGIN
 
 # Static or Plugin...
@@ -31,18 +33,17 @@ INCLUDE_PATHS +=	-I. \
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS +=		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L. \
+			-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
 ##  SOURCES, OBJECTS
 ##
 C_SRC =			util.c \
-			yahoo.c \
+			libymsg.c \
 			yahoochat.c \
 			yahoo_aliases.c \
-			yahoo_auth.c \
-			yahoo_crypt.c \
 			yahoo_doodle.c \
 			yahoo_filexfer.c \
 			yahoo_friend.c \
@@ -53,6 +54,12 @@ C_SRC =			util.c \
 
 OBJECTS = $(C_SRC:%.c=%.o)
 
+YAHOO_C_SRC = libyahoo.c
+YAHOO_OBJECTS = $(YAHOO_C_SRC:%.c=%.o)
+
+YAHOOJP_C_SRC = libyahoojp.c
+YAHOOJP_OBJECTS = $(YAHOOJP_C_SRC:%.c=%.o)
+
 ##
 ## LIBRARIES
 ##
@@ -70,21 +77,29 @@ include $(PIDGIN_COMMON_RULES)
 
 .PHONY: all install clean
 
-all: $(TARGET).dll
+all: $(TARGET).dll $(YAHOO_TARGET).dll $(YAHOOJP_TARGET).dll
 
 install: all $(DLL_INSTALL_DIR)
-	cp $(TARGET).dll $(DLL_INSTALL_DIR)
+	cp $(YAHOO_TARGET).dll $(YAHOOJP_TARGET).dll $(DLL_INSTALL_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_DIR)
 
 $(OBJECTS): $(PURPLE_CONFIG_H)
 
-$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
-	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
+$(TARGET).dll.a $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
+
+$(YAHOO_TARGET).dll: $(TARGET).dll.a $(YAHOO_OBJECTS)
+	$(CC) -shared $(YAHOO_OBJECTS) $(LIB_PATHS) $(LIBS) -lymsg $(DLL_LD_FLAGS) -o $(YAHOO_TARGET).dll
+
+$(YAHOOJP_TARGET).dll: $(TARGET).dll.a $(YAHOOJP_OBJECTS)
+	$(CC) -shared $(YAHOOJP_OBJECTS) $(LIB_PATHS) $(LIBS) -lymsg $(DLL_LD_FLAGS) -o $(YAHOOJP_TARGET).dll
 
 ##
 ## CLEAN RULES
 ##
 clean:
-	rm -f $(OBJECTS)
-	rm -f $(TARGET).dll
+	rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a
+	rm -f $(YAHOO_OBJECTS) $(YAHOO_TARGET).dll
+	rm -f $(YAHOOJP_OBJECTS) $(YAHOOJP_TARGET).dll
 
 include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/yahoo/libyahoo.c b/libpurple/protocols/yahoo/libyahoo.c
new file mode 100644
index 0000000000..1cd625dc9f
--- /dev/null
+++ b/libpurple/protocols/yahoo/libyahoo.c
@@ -0,0 +1,350 @@
+/*
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+
+#include "internal.h"
+
+#include <account.h>
+#include <core.h>
+
+#include "libymsg.h"
+#include "yahoochat.h"
+#include "yahoo_aliases.h"
+#include "yahoo_doodle.h"
+#include "yahoo_filexfer.h"
+#include "yahoo_picture.h"
+
+static PurplePlugin *my_protocol = NULL;
+
+static void yahoo_register_commands(void)
+{
+	purple_cmd_register("join", "s", PURPLE_CMD_P_PRPL,
+	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT |
+	                  PURPLE_CMD_FLAG_PRPL_ONLY,
+	                  "prpl-yahoo", yahoopurple_cmd_chat_join,
+	                  _("join &lt;room&gt;:  Join a chat room on the Yahoo network"), NULL);
+	purple_cmd_register("list", "", PURPLE_CMD_P_PRPL,
+	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT |
+	                  PURPLE_CMD_FLAG_PRPL_ONLY,
+	                  "prpl-yahoo", yahoopurple_cmd_chat_list,
+	                  _("list: List rooms on the Yahoo network"), NULL);
+	purple_cmd_register("buzz", "", PURPLE_CMD_P_PRPL,
+	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY,
+	                  "prpl-yahoo", yahoopurple_cmd_buzz,
+	                  _("buzz: Buzz a user to get their attention"), NULL);
+	purple_cmd_register("doodle", "", PURPLE_CMD_P_PRPL,
+	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY,
+	                  "prpl-yahoo", yahoo_doodle_purple_cmd_start,
+	                 _("doodle: Request user to start a Doodle session"), NULL);
+}
+
+static PurpleAccount *find_acct(const char *prpl, const char *acct_id)
+{
+	PurpleAccount *acct = NULL;
+
+	/* If we have a specific acct, use it */
+	if (acct_id) {
+		acct = purple_accounts_find(acct_id, prpl);
+		if (acct && !purple_account_is_connected(acct))
+			acct = NULL;
+	} else { /* Otherwise find an active account for the protocol */
+		GList *l = purple_accounts_get_all();
+		while (l) {
+			if (!strcmp(prpl, purple_account_get_protocol_id(l->data))
+					&& purple_account_is_connected(l->data)) {
+				acct = l->data;
+				break;
+			}
+			l = l->next;
+		}
+	}
+
+	return acct;
+}
+
+/* This may not be the best way to do this, but we find the first key w/o a value
+ * and assume it is the buddy name */
+static void yahoo_find_uri_novalue_param(gpointer key, gpointer value, gpointer user_data)
+{
+	char **retval = user_data;
+
+	if (value == NULL && *retval == NULL) {
+		*retval = key;
+	}
+}
+
+static gboolean yahoo_uri_handler(const char *proto, const char *cmd, GHashTable *params)
+{
+	char *acct_id = g_hash_table_lookup(params, "account");
+	PurpleAccount *acct;
+
+	if (g_ascii_strcasecmp(proto, "ymsgr"))
+		return FALSE;
+
+	acct = find_acct(purple_plugin_get_id(my_protocol), acct_id);
+
+	if (!acct)
+		return FALSE;
+
+	/* ymsgr:SendIM?screename&m=The+Message */
+	if (!g_ascii_strcasecmp(cmd, "SendIM")) {
+		char *sname = NULL;
+		g_hash_table_foreach(params, yahoo_find_uri_novalue_param, &sname);
+		if (sname) {
+			char *message = g_hash_table_lookup(params, "m");
+
+			PurpleConversation *conv = purple_find_conversation_with_account(
+				PURPLE_CONV_TYPE_IM, sname, acct);
+			if (conv == NULL)
+				conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, sname);
+			purple_conversation_present(conv);
+
+			if (message) {
+				/* Spaces are encoded as '+' */
+				g_strdelimit(message, "+", ' ');
+				purple_conv_send_confirm(conv, message);
+			}
+		}
+		/* else
+			**If pidgindialogs_im() was in the core, we could use it here.
+			 * It is all purple_request_* based, but I'm not sure it really belongs in the core
+			pidgindialogs_im(); */
+
+		return TRUE;
+	}
+	/* ymsgr:Chat?roomname */
+	else if (!g_ascii_strcasecmp(cmd, "Chat")) {
+		char *rname = NULL;
+		g_hash_table_foreach(params, yahoo_find_uri_novalue_param, &rname);
+		if (rname) {
+			/* This is somewhat hacky, but the params aren't useful after this command */
+			g_hash_table_insert(params, g_strdup("room"), g_strdup(rname));
+			g_hash_table_insert(params, g_strdup("type"), g_strdup("Chat"));
+			serv_join_chat(purple_account_get_connection(acct), params);
+		}
+		/* else
+			** Same as above (except that this would have to be re-written using purple_request_*)
+			pidgin_blist_joinchat_show(); */
+
+		return TRUE;
+	}
+	/* ymsgr:AddFriend?name */
+	else if (!g_ascii_strcasecmp(cmd, "AddFriend")) {
+		char *name = NULL;
+		g_hash_table_foreach(params, yahoo_find_uri_novalue_param, &name);
+		purple_blist_request_add_buddy(acct, name, NULL, NULL);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static GHashTable *
+yahoo_get_account_text_table(PurpleAccount *account)
+{
+	GHashTable *table;
+	table = g_hash_table_new(g_str_hash, g_str_equal);
+	g_hash_table_insert(table, "login_label", (gpointer)_("Yahoo ID..."));
+	return table;
+}
+
+static gboolean yahoo_unload_plugin(PurplePlugin *plugin)
+{
+	yahoo_dest_colorht();
+
+	return TRUE;
+}
+
+static PurpleWhiteboardPrplOps yahoo_whiteboard_prpl_ops =
+{
+	yahoo_doodle_start,
+	yahoo_doodle_end,
+	yahoo_doodle_get_dimensions,
+	NULL,
+	yahoo_doodle_get_brush,
+	yahoo_doodle_set_brush,
+	yahoo_doodle_send_draw_list,
+	yahoo_doodle_clear,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static PurplePluginProtocolInfo prpl_info =
+{
+	OPT_PROTO_MAIL_CHECK | OPT_PROTO_CHAT_TOPIC,
+	NULL, /* user_splits */
+	NULL, /* protocol_options */
+	{"png,gif,jpeg", 96, 96, 96, 96, 0, PURPLE_ICON_SCALE_SEND},
+	yahoo_list_icon,
+	yahoo_list_emblem,
+	yahoo_status_text,
+	yahoo_tooltip_text,
+	yahoo_status_types,
+	yahoo_blist_node_menu,
+	yahoo_c_info,
+	yahoo_c_info_defaults,
+	yahoo_login,
+	yahoo_close,
+	yahoo_send_im,
+	NULL, /* set info */
+	yahoo_send_typing,
+	yahoo_get_info,
+	yahoo_set_status,
+	yahoo_set_idle,
+	NULL, /* change_passwd*/
+	yahoo_add_buddy,
+	NULL, /* add_buddies */
+	yahoo_remove_buddy,
+	NULL, /* remove_buddies */
+	NULL, /* add_permit */
+	yahoo_add_deny,
+	NULL, /* rem_permit */
+	yahoo_rem_deny,
+	yahoo_set_permit_deny,
+	yahoo_c_join,
+	NULL, /* reject chat invite */
+	yahoo_get_chat_name,
+	yahoo_c_invite,
+	yahoo_c_leave,
+	NULL, /* chat whisper */
+	yahoo_c_send,
+	yahoo_keepalive,
+	NULL, /* register_user */
+	NULL, /* get_cb_info */
+	NULL, /* get_cb_away */
+	yahoo_update_alias, /* alias_buddy */
+	yahoo_change_buddys_group,
+	yahoo_rename_group,
+	NULL, /* buddy_free */
+	NULL, /* convo_closed */
+	purple_normalize_nocase, /* normalize */
+	yahoo_set_buddy_icon,
+	NULL, /* void (*remove_group)(PurpleConnection *gc, const char *group);*/
+	NULL, /* char *(*get_cb_real_name)(PurpleConnection *gc, int id, const char *who); */
+	NULL, /* set_chat_topic */
+	NULL, /* find_blist_chat */
+	yahoo_roomlist_get_list,
+	yahoo_roomlist_cancel,
+	yahoo_roomlist_expand_category,
+	NULL, /* can_receive_file */
+	yahoo_send_file,
+	yahoo_new_xfer,
+	yahoo_offline_message, /* offline_message */
+	&yahoo_whiteboard_prpl_ops,
+	NULL, /* send_raw */
+	NULL, /* roomlist_room_serialize */
+	NULL, /* unregister_user */
+
+	yahoo_send_attention,
+	yahoo_attention_types,
+
+	sizeof(PurplePluginProtocolInfo),       /* struct_size */
+	yahoo_get_account_text_table,    /* get_account_text_table */
+	NULL, /* initiate_media */
+	NULL  /* can_do_media */
+};
+
+static PurplePluginInfo info =
+{
+	PURPLE_PLUGIN_MAGIC,
+	PURPLE_MAJOR_VERSION,
+	PURPLE_MINOR_VERSION,
+	PURPLE_PLUGIN_PROTOCOL,                             /**< type           */
+	NULL,                                             /**< ui_requirement */
+	0,                                                /**< flags          */
+	NULL,                                             /**< dependencies   */
+	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
+	"prpl-yahoo",                                     /**< id             */
+	"Yahoo",	                                      /**< name           */
+	DISPLAY_VERSION,                                  /**< version        */
+	                                                  /**  summary        */
+	N_("Yahoo! Protocol Plugin"),
+	                                                  /**  description    */
+	N_("Yahoo! Protocol Plugin"),
+	NULL,                                             /**< author         */
+	PURPLE_WEBSITE,                                     /**< homepage       */
+	NULL,                                             /**< load           */
+	yahoo_unload_plugin,                              /**< unload         */
+	NULL,                                             /**< destroy        */
+	NULL,                                             /**< ui_info        */
+	&prpl_info,                                       /**< extra_info     */
+	NULL,
+	yahoo_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static void
+init_plugin(PurplePlugin *plugin)
+{
+	PurpleAccountOption *option;
+
+	option = purple_account_option_string_new(_("Pager server"), "server", YAHOO_PAGER_HOST);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_int_new(_("Pager port"), "port", YAHOO_PAGER_PORT);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_string_new(_("File transfer server"), "xfer_host", YAHOO_XFER_HOST);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_int_new(_("File transfer port"), "xfer_port", YAHOO_XFER_PORT);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_string_new(_("Chat room locale"), "room_list_locale", YAHOO_ROOMLIST_LOCALE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_bool_new(_("Ignore conference and chatroom invitations"), "ignore_invites", FALSE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_string_new(_("Encoding"), "local_charset", "UTF-8");
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+
+#if 0
+	option = purple_account_option_string_new(_("Chat room list URL"), "room_list", YAHOO_ROOMLIST_URL);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_string_new(_("Yahoo Chat server"), "ycht-server", YAHOO_YCHT_HOST);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_int_new(_("Yahoo Chat port"), "ycht-port", YAHOO_YCHT_PORT);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#endif
+
+	my_protocol = plugin;
+	yahoo_register_commands();
+	yahoo_init_colorht();
+
+	purple_signal_connect(purple_get_core(), "uri-handler", plugin,
+		PURPLE_CALLBACK(yahoo_uri_handler), NULL);
+}
+
+PURPLE_INIT_PLUGIN(yahoo, init_plugin, info);
diff --git a/libpurple/protocols/yahoo/libyahoojp.c b/libpurple/protocols/yahoo/libyahoojp.c
new file mode 100644
index 0000000000..b69c6c4cfa
--- /dev/null
+++ b/libpurple/protocols/yahoo/libyahoojp.c
@@ -0,0 +1,243 @@
+/*
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+
+#include "internal.h"
+
+#include <account.h>
+
+#include "libymsg.h"
+#include "yahoochat.h"
+#include "yahoo_aliases.h"
+#include "yahoo_doodle.h"
+#include "yahoo_filexfer.h"
+#include "yahoo_picture.h"
+
+static void yahoojp_register_commands(void)
+{
+	purple_cmd_register("join", "s", PURPLE_CMD_P_PRPL,
+	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT |
+	                  PURPLE_CMD_FLAG_PRPL_ONLY,
+	                  "prpl-yahoojp", yahoopurple_cmd_chat_join,
+	                  _("join &lt;room&gt;:  Join a chat room on the Yahoo network"), NULL);
+	purple_cmd_register("list", "", PURPLE_CMD_P_PRPL,
+	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT |
+	                  PURPLE_CMD_FLAG_PRPL_ONLY,
+	                  "prpl-yahoojp", yahoopurple_cmd_chat_list,
+	                  _("list: List rooms on the Yahoo network"), NULL);
+	purple_cmd_register("buzz", "", PURPLE_CMD_P_PRPL,
+	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY,
+	                  "prpl-yahoojp", yahoopurple_cmd_buzz,
+	                  _("buzz: Buzz a user to get their attention"), NULL);
+	purple_cmd_register("doodle", "", PURPLE_CMD_P_PRPL,
+	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY,
+	                  "prpl-yahoojp", yahoo_doodle_purple_cmd_start,
+	                 _("doodle: Request user to start a Doodle session"), NULL);
+}
+
+static GHashTable *
+yahoojp_get_account_text_table(PurpleAccount *account)
+{
+	GHashTable *table;
+	table = g_hash_table_new(g_str_hash, g_str_equal);
+	g_hash_table_insert(table, "login_label", (gpointer)_("Yahoo JAPAN ID..."));
+	return table;
+}
+
+static gboolean yahoojp_unload_plugin(PurplePlugin *plugin)
+{
+	yahoo_dest_colorht();
+
+	return TRUE;
+}
+
+static PurpleWhiteboardPrplOps yahoo_whiteboard_prpl_ops =
+{
+	yahoo_doodle_start,
+	yahoo_doodle_end,
+	yahoo_doodle_get_dimensions,
+	NULL,
+	yahoo_doodle_get_brush,
+	yahoo_doodle_set_brush,
+	yahoo_doodle_send_draw_list,
+	yahoo_doodle_clear,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static PurplePluginProtocolInfo prpl_info =
+{
+	OPT_PROTO_MAIL_CHECK | OPT_PROTO_CHAT_TOPIC,
+	NULL, /* user_splits */
+	NULL, /* protocol_options */
+	{"png,gif,jpeg", 96, 96, 96, 96, 0, PURPLE_ICON_SCALE_SEND},
+	yahoo_list_icon,
+	yahoo_list_emblem,
+	yahoo_status_text,
+	yahoo_tooltip_text,
+	yahoo_status_types,
+	yahoo_blist_node_menu,
+	yahoo_c_info,
+	yahoo_c_info_defaults,
+	yahoo_login,
+	yahoo_close,
+	yahoo_send_im,
+	NULL, /* set info */
+	yahoo_send_typing,
+	yahoo_get_info,
+	yahoo_set_status,
+	yahoo_set_idle,
+	NULL, /* change_passwd*/
+	yahoo_add_buddy,
+	NULL, /* add_buddies */
+	yahoo_remove_buddy,
+	NULL, /* remove_buddies */
+	NULL, /* add_permit */
+	yahoo_add_deny,
+	NULL, /* rem_permit */
+	yahoo_rem_deny,
+	yahoo_set_permit_deny,
+	yahoo_c_join,
+	NULL, /* reject chat invite */
+	yahoo_get_chat_name,
+	yahoo_c_invite,
+	yahoo_c_leave,
+	NULL, /* chat whisper */
+	yahoo_c_send,
+	yahoo_keepalive,
+	NULL, /* register_user */
+	NULL, /* get_cb_info */
+	NULL, /* get_cb_away */
+	yahoo_update_alias, /* alias_buddy */
+	yahoo_change_buddys_group,
+	yahoo_rename_group,
+	NULL, /* buddy_free */
+	NULL, /* convo_closed */
+	purple_normalize_nocase, /* normalize */
+	yahoo_set_buddy_icon,
+	NULL, /* void (*remove_group)(PurpleConnection *gc, const char *group);*/
+	NULL, /* char *(*get_cb_real_name)(PurpleConnection *gc, int id, const char *who); */
+	NULL, /* set_chat_topic */
+	NULL, /* find_blist_chat */
+	yahoo_roomlist_get_list,
+	yahoo_roomlist_cancel,
+	yahoo_roomlist_expand_category,
+	NULL, /* can_receive_file */
+	yahoo_send_file,
+	yahoo_new_xfer,
+	yahoo_offline_message, /* offline_message */
+	&yahoo_whiteboard_prpl_ops,
+	NULL, /* send_raw */
+	NULL, /* roomlist_room_serialize */
+	NULL, /* unregister_user */
+
+	yahoo_send_attention,
+	yahoo_attention_types,
+
+	sizeof(PurplePluginProtocolInfo),       /* struct_size */
+	yahoojp_get_account_text_table,    /* get_account_text_table */
+	NULL, /* initiate_media */
+	NULL  /* can_do_media */
+};
+
+static PurplePluginInfo info =
+{
+	PURPLE_PLUGIN_MAGIC,
+	PURPLE_MAJOR_VERSION,
+	PURPLE_MINOR_VERSION,
+	PURPLE_PLUGIN_PROTOCOL,                             /**< type           */
+	NULL,                                             /**< ui_requirement */
+	0,                                                /**< flags          */
+	NULL,                                             /**< dependencies   */
+	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
+	"prpl-yahoojp",                                     /**< id             */
+	"Yahoo JAPAN",	                                      /**< name           */
+	DISPLAY_VERSION,                                  /**< version        */
+	                                                  /**  summary        */
+	N_("Yahoo! JAPAN Protocol Plugin"),
+	                                                  /**  description    */
+	N_("Yahoo! JAPAN Protocol Plugin"),
+	NULL,                                             /**< author         */
+	PURPLE_WEBSITE,                                     /**< homepage       */
+	NULL,                                             /**< load           */
+	yahoojp_unload_plugin,                              /**< unload         */
+	NULL,                                             /**< destroy        */
+	NULL,                                             /**< ui_info        */
+	&prpl_info,                                       /**< extra_info     */
+	NULL,
+	yahoo_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static void
+init_plugin(PurplePlugin *plugin)
+{
+	PurpleAccountOption *option;
+
+	option = purple_account_option_string_new(_("Pager server"), "server", YAHOOJP_PAGER_HOST);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_int_new(_("Pager port"), "port", YAHOO_PAGER_PORT);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_string_new(_("File transfer server"), "xfer_host", YAHOOJP_XFER_HOST);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_int_new(_("File transfer port"), "xfer_port", YAHOO_XFER_PORT);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_string_new(_("Chat room locale"), "room_list_locale", YAHOOJP_ROOMLIST_LOCALE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_bool_new(_("Ignore conference and chatroom invitations"), "ignore_invites", FALSE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_string_new(_("Encoding"), "local_charset", "UTF-8");
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+
+#if 0
+	option = purple_account_option_string_new(_("Chat room list URL"), "room_list", YAHOO_ROOMLIST_URL);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_string_new(_("Yahoo Chat server"), "ycht-server", YAHOO_YCHT_HOST);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = purple_account_option_int_new(_("Yahoo Chat port"), "ycht-port", YAHOO_YCHT_PORT);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#endif
+
+	yahoojp_register_commands();
+	yahoo_init_colorht();
+}
+
+PURPLE_INIT_PLUGIN(yahoojp, init_plugin, info);
+
diff --git a/libpurple/protocols/yahoo/yahoo.c b/libpurple/protocols/yahoo/libymsg.c
index 166dc0f454..ceb1720e59 100644
--- a/libpurple/protocols/yahoo/yahoo.c
+++ b/libpurple/protocols/yahoo/libymsg.c
@@ -30,6 +30,7 @@
 #include "cmds.h"
 #include "core.h"
 #include "debug.h"
+#include "network.h"
 #include "notify.h"
 #include "privacy.h"
 #include "prpl.h"
@@ -38,12 +39,11 @@
 #include "server.h"
 #include "util.h"
 #include "version.h"
+#include "xmlnode.h"
 
-#include "yahoo.h"
+#include "libymsg.h"
 #include "yahoochat.h"
 #include "yahoo_aliases.h"
-#include "yahoo_auth.h"
-#include "yahoo_crypt.h"
 #include "yahoo_doodle.h"
 #include "yahoo_filexfer.h"
 #include "yahoo_friend.h"
@@ -61,11 +61,14 @@
 /* One minute */
 #define KEEPALIVE_TIMEOUT 60
 
-static void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *, PurpleGroup *);
 #ifdef TRY_WEBMESSENGER_LOGIN
 static void yahoo_login_page_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, size_t len, const gchar *error_message);
-#endif
-static void yahoo_set_status(PurpleAccount *account, PurpleStatus *status);
+#endif /* TRY_WEBMESSENGER_LOGIN */
+
+static gboolean yahoo_is_japan(PurpleAccount *account)
+{
+	return purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoojp");
+}
 
 static void yahoo_update_status(PurpleConnection *gc, const char *name, YahooFriend *f)
 {
@@ -74,12 +77,10 @@ static void yahoo_update_status(PurpleConnection *gc, const char *name, YahooFri
 	if (!gc || !name || !f || !purple_find_buddy(purple_connection_get_account(gc), name))
 		return;
 
-	if (f->status == YAHOO_STATUS_OFFLINE)
-	{
-		return;
-	}
-
 	switch (f->status) {
+	case YAHOO_STATUS_OFFLINE:
+		status = YAHOO_STATUS_TYPE_OFFLINE;
+		break;
 	case YAHOO_STATUS_AVAILABLE:
 		status = YAHOO_STATUS_TYPE_AVAILABLE;
 		break;
@@ -147,18 +148,18 @@ static void yahoo_update_status(PurpleConnection *gc, const char *name, YahooFri
 static void yahoo_process_status(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
-	struct yahoo_data *yd = gc->proto_data;
 	GSList *l = pkt->hash;
 	YahooFriend *f = NULL;
 	char *name = NULL;
 	gboolean unicode = FALSE;
 	char *message = NULL;
+	char *msn_name = NULL;
 
 	if (pkt->service == YAHOO_SERVICE_LOGOFF && pkt->status == -1) {
 		if (!purple_account_get_remember_password(account))
 			purple_account_set_password(account, NULL);
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NAME_IN_USE,
-			_("You have signed on from another location."));
+			_("You have signed on from another location"));
 		return;
 	}
 
@@ -167,29 +168,7 @@ static void yahoo_process_status(PurpleConnection *gc, struct yahoo_packet *pkt)
 
 		switch (pair->key) {
 		case 0: /* we won't actually do anything with this */
-			break;
-		case 1: /* we don't get the full buddy list here. */
-			if (!yd->logged_in) {
-				purple_connection_set_display_name(gc, pair->value);
-				purple_connection_set_state(gc, PURPLE_CONNECTED);
-				yd->logged_in = TRUE;
-				if (yd->picture_upload_todo) {
-					yahoo_buddy_icon_upload(gc, yd->picture_upload_todo);
-					yd->picture_upload_todo = NULL;
-				}
-				yahoo_set_status(account, purple_account_get_active_status(account));
-
-				/* this requests the list. i have a feeling that this is very evil
-				 *
-				 * scs.yahoo.com sends you the list before this packet without  it being
-				 * requested
-				 *
-				 * do_import(gc, NULL);
-				 * newpkt = yahoo_packet_new(YAHOO_SERVICE_LIST, YAHOO_STATUS_OFFLINE, 0);
-				 * yahoo_packet_send_and_free(newpkt, yd);
-				 */
-
-				}
+		case 1: /* we won't actually do anything with this */
 			break;
 		case 8: /* how many online buddies we have */
 			break;
@@ -204,8 +183,28 @@ static void yahoo_process_status(PurpleConnection *gc, struct yahoo_packet *pkt)
 			name = message = NULL;
 			f = NULL;
 			if (pair->value && g_utf8_validate(pair->value, -1, NULL)) {
+				GSList *tmplist;
+				int protocol = 0;
+
 				name = pair->value;
+
+				/* Look ahead to see if we have the protocol info about the buddy */
+				for (tmplist = l->next; tmplist; tmplist = tmplist->next) {
+					struct yahoo_pair *p = tmplist->data;
+					if (p->key == 7)
+						break;
+					if (p->key == 241) {
+						if(strtol(p->value, NULL, 10) == 2) {
+							g_free(msn_name);
+							msn_name = g_strconcat("msn/", name, NULL);
+							name = msn_name;
+							protocol = 2;
+						}
+						break;
+					}
+				}
 				f = yahoo_friend_find_or_new(gc, name);
+				f->protocol = protocol;
 			}
 			break;
 		case 10: /* state */
@@ -235,6 +234,8 @@ static void yahoo_process_status(PurpleConnection *gc, struct yahoo_packet *pkt)
 				message = pair->value;
 			break;
 		case 11: /* this is the buddy's session id */
+			if (f)
+				f->session_id = strtol(pair->value, NULL, 10);
 			break;
 		case 17: /* in chat? */
 			break;
@@ -276,7 +277,7 @@ static void yahoo_process_status(PurpleConnection *gc, struct yahoo_packet *pkt)
 					f->status = YAHOO_STATUS_OFFLINE;
 				if (name) {
 					purple_prpl_got_user_status(account, name, "offline", NULL);
-			                purple_prpl_got_user_status_deactive(account, name, YAHOO_STATUS_TYPE_MOBILE);
+					purple_prpl_got_user_status_deactive(account, name, YAHOO_STATUS_TYPE_MOBILE);
 				}
 				break;
 			}
@@ -350,7 +351,8 @@ static void yahoo_process_status(PurpleConnection *gc, struct yahoo_packet *pkt)
 			if(f && strtol(pair->value, NULL, 10))
 				f->version_id = strtol(pair->value, NULL, 10);
 			break;
-
+		case 241: /* protocol buddy belongs to */
+			break;  /* We process this when get '7' */
 		default:
 			purple_debug_warning("yahoo",
 					   "Unknown status key %d\n", pair->key);
@@ -360,11 +362,16 @@ static void yahoo_process_status(PurpleConnection *gc, struct yahoo_packet *pkt)
 		l = l->next;
 	}
 
-	if (message && f)
-		yahoo_friend_set_status_message(f, yahoo_string_decode(gc, message, unicode));
+	if (f) {
+		if (pkt->service == YAHOO_SERVICE_LOGOFF)
+			f->status = YAHOO_STATUS_OFFLINE;
+		if (message)
+			yahoo_friend_set_status_message(f, yahoo_string_decode(gc, message, unicode));
 
-	if (name && f) /* update the last buddy */
-		yahoo_update_status(gc, name, f);
+		if (name) /* update the last buddy */
+			yahoo_update_status(gc, name, f);
+	}
+	g_free(msn_name);
 }
 
 static void yahoo_do_group_check(PurpleAccount *account, GHashTable *ht, const char *name, const char *group)
@@ -386,7 +393,7 @@ static void yahoo_do_group_check(PurpleAccount *account, GHashTable *ht, const c
 		b = i->data;
 		g = purple_buddy_get_group(b);
 		if (!purple_utf8_strcasecmp(group, purple_group_get_name(g))) {
-			purple_debug(PURPLE_DEBUG_MISC, "yahoo",
+			purple_debug_misc("yahoo",
 				"Oh good, %s is in the right group (%s).\n", name, group);
 			list = g_slist_delete_link(list, i);
 			onlist = 1;
@@ -395,7 +402,7 @@ static void yahoo_do_group_check(PurpleAccount *account, GHashTable *ht, const c
 	}
 
 	if (!onlist) {
-		purple_debug(PURPLE_DEBUG_MISC, "yahoo",
+		purple_debug_misc("yahoo",
 			"Uhoh, %s isn't on the list (or not in this group), adding him to group %s.\n", name, group);
 		if (!(g = purple_find_group(group))) {
 			g = purple_group_new(group);
@@ -423,7 +430,7 @@ static void yahoo_do_group_cleanup(gpointer key, gpointer value, gpointer user_d
 	for (i = list; i; i = i->next) {
 		b = i->data;
 		g = purple_buddy_get_group(b);
-		purple_debug(PURPLE_DEBUG_MISC, "yahoo", "Deleting Buddy %s from group %s.\n", name,
+		purple_debug_misc("yahoo", "Deleting Buddy %s from group %s.\n", name,
 				purple_group_get_name(g));
 		purple_blist_remove_buddy(b);
 	}
@@ -449,7 +456,7 @@ static char *_getcookie(char *rawcookie)
 	return cookie;
 }
 
-static void yahoo_process_cookie(struct yahoo_data *yd, char *c)
+static void yahoo_process_cookie(YahooData *yd, char *c)
 {
 	if (c[0] == 'Y') {
 		if (yd->cookie_y)
@@ -469,14 +476,16 @@ static void yahoo_process_list_15(PurpleConnection *gc, struct yahoo_packet *pkt
 	GSList *l = pkt->hash;
 
 	PurpleAccount *account = purple_connection_get_account(gc);
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	GHashTable *ht;
-	char *norm_bud = NULL;
+	char *norm_bud;
+	char *temp = NULL;
 	YahooFriend *f = NULL; /* It's your friends. They're going to want you to share your StarBursts. */
 	                       /* But what if you had no friends? */
 	PurpleBuddy *b;
 	PurpleGroup *g;
-
+	int protocol = 0;
+	int stealth = 0;
 
 	ht = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_slist_free);
 
@@ -499,6 +508,50 @@ static void yahoo_process_list_15(PurpleConnection *gc, struct yahoo_packet *pkt
 
 			break;
 		case 301: /* This is 319 before all s/n's in a group after the first. It is followed by an identical 300. */
+			if(temp != NULL) {
+				if(protocol == 2)
+					norm_bud = g_strconcat("msn/", temp, NULL);
+				else
+					norm_bud = g_strdup(temp);
+
+				if (yd->current_list15_grp) {
+					/* This buddy is in a group */
+					f = yahoo_friend_find_or_new(gc, norm_bud);
+					if (!(b = purple_find_buddy(account, norm_bud))) {
+						if (!(g = purple_find_group(yd->current_list15_grp))) {
+							g = purple_group_new(yd->current_list15_grp);
+							purple_blist_add_group(g, NULL);
+						}
+						b = purple_buddy_new(account, norm_bud, NULL);
+						purple_blist_add_buddy(b, NULL, g, NULL);
+					}
+					yahoo_do_group_check(account, ht, norm_bud, yd->current_list15_grp);
+					if(protocol != 0) {
+						f->protocol = protocol;
+						purple_debug_info("yahoo", "Setting protocol to %d\n", f->protocol);
+					}
+					if(stealth == 2)
+						f->presence = YAHOO_PRESENCE_PERM_OFFLINE;
+
+					/* set p2p status not connected and no p2p packet sent */
+					if(protocol == 0) {
+						yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_NOT_CONNECTED);
+						f->p2p_packet_sent = 0;
+					} else
+						yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_DO_NOT_CONNECT);
+				} else {
+					/* This buddy is on the ignore list (and therefore in no group) */
+					purple_debug_info("yahoo", "%s adding %s to the deny list because of the ignore list / no group was found\n",account->username, norm_bud);
+					purple_privacy_deny_add(account, norm_bud, 1);
+				}
+
+				g_free(norm_bud);
+
+				protocol = 0;
+				stealth = 0;
+				g_free(temp);
+				temp = NULL;
+			}
 			break;
 		case 300: /* This is 318 before a group, 319 before any s/n in a group, and 320 before any ignored s/n. */
 			break;
@@ -507,42 +560,17 @@ static void yahoo_process_list_15(PurpleConnection *gc, struct yahoo_packet *pkt
 			yd->current_list15_grp = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
 		case 7: /* buddy's s/n */
-			g_free(norm_bud);
-			norm_bud = g_strdup(purple_normalize(account, pair->value));
-
-			if (yd->current_list15_grp) {
-				/* This buddy is in a group */
-				f = yahoo_friend_find_or_new(gc, norm_bud);
-				if (!(b = purple_find_buddy(account, norm_bud))) {
-					if (!(g = purple_find_group(yd->current_list15_grp))) {
-						g = purple_group_new(yd->current_list15_grp);
-						purple_blist_add_group(g, NULL);
-					}
-					b = purple_buddy_new(account, norm_bud, NULL);
-					purple_blist_add_buddy(b, NULL, g, NULL);
-				}
-				yahoo_do_group_check(account, ht, norm_bud, yd->current_list15_grp);
-
-			} else {
-				/* This buddy is on the ignore list (and therefore in no group) */
-				purple_debug_info("yahoo", "%s adding %s to the deny list because of the ignore list / no group was found\n",
-								  account->username, norm_bud);
-				purple_privacy_deny_add(account, norm_bud, 1);
-			}
+			g_free(temp);
+			temp = g_strdup(purple_normalize(account, pair->value));
 			break;
 		case 241: /* another protocol user */
-			if (f) {
-				f->protocol = strtol(pair->value, NULL, 10);
-				purple_debug_info("yahoo", "Setting protocol to %d\n", f->protocol);
-			}
+			protocol = strtol(pair->value, NULL, 10);
 			break;
 		case 59: /* somebody told cookies come here too, but im not sure */
 			yahoo_process_cookie(yd, pair->value);
 			break;
 		case 317: /* Stealth Setting */
-			if (f && (strtol(pair->value, NULL, 10) == 2)) {
-				f->presence = YAHOO_PRESENCE_PERM_OFFLINE;
-			}
+			stealth = strtol(pair->value, NULL, 10);
 			break;
 		/* case 242: */ /* this seems related to 241 */
 			/* break; */
@@ -550,8 +578,25 @@ static void yahoo_process_list_15(PurpleConnection *gc, struct yahoo_packet *pkt
 	}
 
 	g_hash_table_foreach(ht, yahoo_do_group_cleanup, NULL);
+
+	/* The reporter of ticket #9745 determined that we weren't retrieving the
+	 * aliases during buddy list retrieval, so we never updated aliases that
+	 * changed while we were signed off. */
+	yahoo_fetch_aliases(gc);
+
+	/* Now that we have processed the buddy list, we can say yahoo has connected */
+	purple_connection_set_display_name(gc, purple_normalize(account, purple_account_get_username(account)));
+	yd->logged_in = TRUE;
+	purple_debug_info("yahoo","Authentication: Connection established\n");
+	purple_connection_set_state(gc, PURPLE_CONNECTED);
+	if (yd->picture_upload_todo) {
+		yahoo_buddy_icon_upload(gc, yd->picture_upload_todo);
+		yd->picture_upload_todo = NULL;
+	}
+	yahoo_set_status(account, purple_account_get_active_status(account));
+
 	g_hash_table_destroy(ht);
-	g_free(norm_bud);
+	g_free(temp);
 }
 
 static void yahoo_process_list(PurpleConnection *gc, struct yahoo_packet *pkt)
@@ -563,7 +608,7 @@ static void yahoo_process_list(PurpleConnection *gc, struct yahoo_packet *pkt)
 	PurpleGroup *g;
 	YahooFriend *f = NULL;
 	PurpleAccount *account = purple_connection_get_account(gc);
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	GHashTable *ht;
 
 	char **lines;
@@ -592,6 +637,9 @@ static void yahoo_process_list(PurpleConnection *gc, struct yahoo_packet *pkt)
 			else
 				g_string_append(yd->tmp_serv_ilist, pair->value);
 			break;
+		case 89:
+			yd->profiles = g_strsplit(pair->value, ",", -1);
+			break;
 		case 59: /* cookies, yum */
 			yahoo_process_cookie(yd, pair->value);
 			break;
@@ -636,6 +684,10 @@ static void yahoo_process_list(PurpleConnection *gc, struct yahoo_packet *pkt)
 				}
 
 				yahoo_do_group_check(account, ht, norm_bud, grp);
+				/* set p2p status not connected and no p2p packet sent */
+				yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_NOT_CONNECTED);
+				f->p2p_packet_sent = 0;
+
 				g_free(norm_bud);
 			}
 			g_strfreev(buddies);
@@ -692,7 +744,8 @@ static void yahoo_process_list(PurpleConnection *gc, struct yahoo_packet *pkt)
 	yahoo_fetch_aliases(gc);
 }
 
-static void yahoo_process_notify(PurpleConnection *gc, struct yahoo_packet *pkt)
+/* pkt_type is YAHOO_PKT_TYPE_SERVER if pkt arrives from yahoo server, YAHOO_PKT_TYPE_P2P if pkt arrives through p2p */
+static void yahoo_process_notify(PurpleConnection *gc, struct yahoo_packet *pkt, yahoo_pkt_type pkt_type)
 {
 	PurpleAccount *account;
 	char *msg = NULL;
@@ -701,12 +754,15 @@ static void yahoo_process_notify(PurpleConnection *gc, struct yahoo_packet *pkt)
 	char *game = NULL;
 	YahooFriend *f = NULL;
 	GSList *l = pkt->hash;
+	gint val_11 = 0;
+	YahooData *yd = gc->proto_data;
+	gboolean msn = FALSE;
 
 	account = purple_connection_get_account(gc);
 
 	while (l) {
 		struct yahoo_pair *pair = l->data;
-		if (pair->key == 4)
+		if (pair->key == 4 || pair->key == 1)
 			from = pair->value;
 		if (pair->key == 49)
 			msg = pair->value;
@@ -714,26 +770,48 @@ static void yahoo_process_notify(PurpleConnection *gc, struct yahoo_packet *pkt)
 			stat = pair->value;
 		if (pair->key == 14)
 			game = pair->value;
+		if (pair->key == 11)
+			val_11 = strtol(pair->value, NULL, 10);
+		if (pair->key == 241)
+			if(strtol(pair->value, NULL, 10) == 2)
+				msn = TRUE;
 		l = l->next;
 	}
 
 	if (!from || !msg)
 		return;
 
+	/* disconnect the peer if connected through p2p and sends wrong value for session id */
+	if( (pkt_type == YAHOO_PKT_TYPE_P2P) && (val_11 != yd->session_id) ) {
+		purple_debug_warning("yahoo","p2p: %s sent us notify with wrong session id. Disconnecting p2p connection to peer\n", from);
+		/* remove from p2p connection lists, also calls yahoo_p2p_disconnect_destroy_data */
+		g_hash_table_remove(yd->peers, from);
+		return;
+	}
+
 	if (!g_ascii_strncasecmp(msg, "TYPING", strlen("TYPING"))
 		&& (purple_privacy_check(account, from)))
 	{
-		if (*stat == '1')
-			serv_got_typing(gc, from, 0, PURPLE_TYPING);
-		else
-			serv_got_typing_stopped(gc, from);
+		if(msn) {
+			char *msn_from = g_strconcat("msn/", from, NULL);
+			if (*stat == '1')
+				serv_got_typing(gc, msn_from, 0, PURPLE_TYPING);
+			else
+				serv_got_typing_stopped(gc, msn_from);
+			g_free(msn_from);
+		}
+		else	{
+			if (*stat == '1')
+				serv_got_typing(gc, from, 0, PURPLE_TYPING);
+			else
+				serv_got_typing_stopped(gc, from);
+		}
 	} else if (!g_ascii_strncasecmp(msg, "GAME", strlen("GAME"))) {
 		PurpleBuddy *bud = purple_find_buddy(account, from);
 
 		if (!bud) {
-			purple_debug(PURPLE_DEBUG_WARNING, "yahoo",
-					   "%s is playing a game, and doesn't want "
-					   "you to know.\n", from);
+			purple_debug_warning("yahoo",
+					   "%s is playing a game, and doesn't want you to know.\n", from);
 		}
 
 		f = yahoo_friend_find(gc, from);
@@ -753,39 +831,107 @@ static void yahoo_process_notify(PurpleConnection *gc, struct yahoo_packet *pkt)
 		purple_conversation_write(conv, NULL, buf, PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NOTIFY, time(NULL));
 		g_free(buf);
 	}
-
 }
 
 
 struct _yahoo_im {
 	char *from;
+	char *active_id;
 	int time;
 	int utf8;
 	int buddy_icon;
+	char *id;
 	char *msg;
+	gboolean msn;
 };
 
-static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt)
+static void yahoo_process_sms_message(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	PurpleAccount *account;
-	struct yahoo_data *yd = gc->proto_data;
+	GSList *l = pkt->hash;
+	struct _yahoo_im *sms = NULL;
+	YahooData *yd;
+	char *server_msg = NULL;
+	char *m;
+
+	yd = gc->proto_data;
+	account = purple_connection_get_account(gc);
+
+	while (l != NULL) {
+		struct yahoo_pair *pair = l->data;
+		if (pair->key == 4) {
+			sms = g_new0(struct _yahoo_im, 1);
+			sms->from = g_strdup_printf("+%s", pair->value);
+			sms->time = time(NULL);
+			sms->utf8 = TRUE;
+		}
+		if (pair->key == 14) {
+			if (sms)
+				sms->msg = pair->value;
+		}
+		if (pair->key == 68)
+			if(sms)
+				g_hash_table_insert(yd->sms_carrier, g_strdup(sms->from), g_strdup(pair->value));
+		if (pair->key == 16)
+			server_msg = pair->value;
+		l = l->next;
+	}
+
+	if( (pkt->status == -1) || (pkt->status == YAHOO_STATUS_DISCONNECTED) ) {
+		if (server_msg) {
+			PurpleConversation *c;
+			c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, sms->from, account);
+			if (c == NULL)
+				c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sms->from);
+			purple_conversation_write(c, NULL, server_msg, PURPLE_MESSAGE_SYSTEM, time(NULL));
+		}
+		else
+			purple_notify_error(gc, NULL, _("Your SMS was not delivered"), NULL);
+
+		g_free(sms->from);
+		g_free(sms);
+		return ;
+	}
+
+	if (!sms->from || !sms->msg) {
+		g_free(sms);
+		return;
+	}
+
+	m = yahoo_string_decode(gc, sms->msg, sms->utf8);
+	serv_got_im(gc, sms->from, m, 0, sms->time);
+
+	g_free(m);
+	g_free(sms->from);
+	g_free(sms);
+}
+
+/* pkt_type is YAHOO_PKT_TYPE_SERVER if pkt arrives from yahoo server, YAHOO_PKT_TYPE_P2P if pkt arrives through p2p */
+static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt, yahoo_pkt_type pkt_type)
+{
+	PurpleAccount *account;
+	YahooData *yd = gc->proto_data;
 	GSList *l = pkt->hash;
 	GSList *list = NULL;
 	struct _yahoo_im *im = NULL;
 	const char *imv = NULL;
+	gint val_11 = 0;
 
 	account = purple_connection_get_account(gc);
 
-	if (pkt->status <= 1 || pkt->status == 5) {
+	if (pkt->status <= 1 || pkt->status == 5 || pkt->status == YAHOO_STATUS_OFFLINE) {
+	/* messages are received with status YAHOO_STATUS_OFFLINE in case of p2p */
 		while (l != NULL) {
 			struct yahoo_pair *pair = l->data;
-			if (pair->key == 4) {
+			if (pair->key == 4 || pair->key == 1) {
 				im = g_new0(struct _yahoo_im, 1);
 				list = g_slist_append(list, im);
 				im->from = pair->value;
 				im->time = time(NULL);
 				im->utf8 = TRUE;
 			}
+			if (im && pair->key == 5)
+				im->active_id = pair->value;
 			if (pair->key == 97)
 				if (im)
 					im->utf8 = strtol(pair->value, NULL, 10);
@@ -799,11 +945,23 @@ static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt
 				if (im)
 					im->msg = pair->value;
 			}
+			if (im && pair->key == 241) {
+				if(strtol(pair->value, NULL, 10) == 2)
+					im->msn = TRUE;
+			}
+			/* peer session id */
+			if (pair->key == 11) {
+				if (im)
+					val_11 = strtol(pair->value, NULL, 10);
+			}
 			/* IMV key */
 			if (pair->key == 63)
 			{
 				imv = pair->value;
 			}
+			if (pair->key == 429)
+				if (im)
+					im->id = pair->value;
 			l = l->next;
 		}
 	} else if (pkt->status == 2) {
@@ -811,7 +969,15 @@ static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt
 		                  _("Your Yahoo! message did not get sent."), NULL);
 	}
 
-	/** TODO: It seems that this check should be per IM, not global */
+	/* disconnect the peer if connected through p2p and sends wrong value for session id */
+	if( (pkt_type == YAHOO_PKT_TYPE_P2P) && (val_11 != yd->session_id) ) {
+		purple_debug_warning("yahoo","p2p: %s sent us message with wrong session id. Disconnecting p2p connection to peer\n", im ? im->from : "(im was null)");
+		/* remove from p2p connection lists, also calls yahoo_p2p_disconnect_destroy_data */
+		g_hash_table_remove(yd->peers, im->from);
+		return;
+	}
+
+	/* TODO: It seems that this check should be per IM, not global */
 	/* Check for the Doodle IMV */
 	if (im != NULL && imv!= NULL && im->from != NULL)
 	{
@@ -847,6 +1013,9 @@ static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt
 	for (l = list; l; l = l->next) {
 		YahooFriend *f;
 		char *m, *m2;
+		char *msn_from = NULL;
+		const char *from;
+		PurpleConversation *c;
 		im = l->data;
 
 		if (!im->from || !im->msg) {
@@ -859,6 +1028,28 @@ static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt
 			return;
 		}
 
+		/*
+		 * TODO: Is there anything else we should check when determining whether
+		 *       we should send an acknowledgement?
+		 */
+		if (im->id != NULL) {
+			/* Send acknowledgement.  If we don't do this then the official
+			 * Yahoo Messenger client for Windows will send us the same
+			 * message 7 seconds later as an offline message.  This is true
+			 * for at least version 9.0.0.2162 on Windows XP. */
+			struct yahoo_packet *pkt2;
+			pkt2 = yahoo_packet_new(YAHOO_SERVICE_MESSAGE_ACK,
+					YAHOO_STATUS_AVAILABLE, pkt->id);
+			yahoo_packet_hash(pkt2, "ssisii",
+					1, im->active_id,  /* May not always be the connection's display name */
+					5, im->from,
+					302, 430,
+					430, im->id,
+					303, 430,
+					450, 0);
+			yahoo_packet_send_and_free(pkt2, yd);
+		}
+
 		m = yahoo_string_decode(gc, im->msg, im->utf8);
 		/* This may actually not be necessary, but it appears
 		 * that at least at one point some clients were sending
@@ -869,35 +1060,48 @@ static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt
 		m = m2;
 		purple_util_chrreplace(m, '\r', '\n');
 
+		if (im->msn) {
+			msn_from = g_strconcat("msn/", im->from, NULL);
+			from = msn_from;
+		} else {
+			from = im->from;
+		}
+
+		c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, from, account);
+
 		if (!strcmp(m, "<ding>")) {
-			PurpleConversation *c;
 			char *username;
 
-			c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, im->from, account);
-			if (c == NULL)
-				c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, im->from);
-
-			username = g_markup_escape_text(im->from, -1);
+			if (c == NULL) {
+				c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, from);
+			}
+			username = g_markup_escape_text(from, -1);
 			purple_prpl_got_attention(gc, username, YAHOO_BUZZ);
 			g_free(username);
 			g_free(m);
 			g_free(im);
+			g_free(msn_from);
 			continue;
 		}
 
 		m2 = yahoo_codes_to_html(m);
 		g_free(m);
-		serv_got_im(gc, im->from, m2, 0, im->time);
+
+		serv_got_im(gc, from, m2, 0, im->time);
 		g_free(m2);
 
-		if ((f = yahoo_friend_find(gc, im->from)) && im->buddy_icon == 2) {
-			if (yahoo_friend_get_buddy_icon_need_request(f)) {
-				yahoo_send_picture_request(gc, im->from);
-				yahoo_friend_set_buddy_icon_need_request(f, FALSE);
+		/* laters : implement buddy icon for msn friends */
+		if (!im->msn) {
+			if ((f = yahoo_friend_find(gc, im->from)) && im->buddy_icon == 2) {
+				if (yahoo_friend_get_buddy_icon_need_request(f)) {
+					yahoo_send_picture_request(gc, im->from);
+					yahoo_friend_set_buddy_icon_need_request(f, FALSE);
+				}
 			}
 		}
 
 		g_free(im);
+		g_free(msn_from);
 	}
 	g_slist_free(list);
 }
@@ -939,12 +1143,16 @@ yahoo_buddy_add_authorize_cb(gpointer data)
 {
 	struct yahoo_add_request *add_req = data;
 	struct yahoo_packet *pkt;
-	struct yahoo_data *yd = add_req->gc->proto_data;
+	YahooData *yd = add_req->gc->proto_data;
+	const char *who = add_req->who;
+
+	if (add_req->protocol == 2)
+		who += 4;
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH_REQ_15, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH_REQ_15, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "ssiii",
 					  1, add_req->id,
-					  5, add_req->who,
+					  5, who,
 					  241, add_req->protocol,
 					  13, 1,
 					  334, 0);
@@ -958,20 +1166,24 @@ yahoo_buddy_add_authorize_cb(gpointer data)
 static void
 yahoo_buddy_add_deny_cb(struct yahoo_add_request *add_req, const char *msg)
 {
-	struct yahoo_data *yd = add_req->gc->proto_data;
+	YahooData *yd = add_req->gc->proto_data;
 	struct yahoo_packet *pkt;
 	char *encoded_msg = NULL;
-	PurpleAccount *account = purple_connection_get_account(add_req->gc);
+	const char *who = add_req->who;
+
+	if (add_req->protocol == 2)
+		who += 4; /* Skip 'msn/' */
 
 	if (msg && *msg)
 		encoded_msg = yahoo_string_encode(add_req->gc, msg, NULL);
 
 	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH_REQ_15,
-			YAHOO_STATUS_AVAILABLE, 0);
+			YAHOO_STATUS_AVAILABLE, yd->session_id);
 
-	yahoo_packet_hash(pkt, "ssiiis",
-			1, purple_normalize(account, purple_account_get_username(account)),
-			5, add_req->who,
+	yahoo_packet_hash(pkt, "ssiiiis",
+			1, add_req->id,
+			5, who,
+			241, add_req->protocol,
 			13, 2,
 			334, 0,
 			97, 1,
@@ -1006,7 +1218,7 @@ yahoo_buddy_add_deny_reason_cb(gpointer data) {
 static void yahoo_buddy_denied_our_add(PurpleConnection *gc, const char *who, const char *reason)
 {
 	char *notify_msg;
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 
 	if (who == NULL)
 		return;
@@ -1030,12 +1242,14 @@ static void yahoo_buddy_auth_req_15(PurpleConnection *gc, struct yahoo_packet *p
 	PurpleAccount *account;
 	GSList *l = pkt->hash;
 	const char *msg = NULL;
+	int protocol = 0;
 
 	account = purple_connection_get_account(gc);
 
 	/* Buddy authorized/declined our addition */
 	if (pkt->status == 1) {
-		const char *who = NULL;
+		char *temp = NULL;
+		char *who = NULL;
 		int response = 0;
 
 		while (l) {
@@ -1043,7 +1257,7 @@ static void yahoo_buddy_auth_req_15(PurpleConnection *gc, struct yahoo_packet *p
 
 			switch (pair->key) {
 			case 4:
-				who = pair->value;
+				temp = pair->value;
 				break;
 			case 13:
 				response = strtol(pair->value, NULL, 10);
@@ -1051,10 +1265,18 @@ static void yahoo_buddy_auth_req_15(PurpleConnection *gc, struct yahoo_packet *p
 			case 14:
 				msg = pair->value;
 				break;
+			case 241:
+				protocol = strtol(pair->value, NULL, 10);
+				break;
 			}
 			l = l->next;
 		}
 
+		if(protocol == 0)
+			who = g_strdup(temp);
+		else if(protocol == 2)
+			who = g_strconcat("msn/", temp, NULL);
+
 		if (response == 1) /* Authorized */
 			purple_debug_info("yahoo", "Received authorization from buddy '%s'.\n", who ? who : "(Unknown Buddy)");
 		else if (response == 2) { /* Declined */
@@ -1062,12 +1284,13 @@ static void yahoo_buddy_auth_req_15(PurpleConnection *gc, struct yahoo_packet *p
 			yahoo_buddy_denied_our_add(gc, who, msg);
 		} else
 			purple_debug_error("yahoo", "Received unknown authorization response of %d from buddy '%s'.\n", response, who ? who : "(Unknown Buddy)");
-
+	g_free(who);
 	}
 	/* Buddy requested authorization to add us. */
 	else if (pkt->status == 3) {
 		struct yahoo_add_request *add_req;
 		const char *firstname = NULL, *lastname = NULL;
+		char *temp = NULL;
 
 		add_req = g_new0(struct yahoo_add_request, 1);
 		add_req->gc = gc;
@@ -1077,7 +1300,7 @@ static void yahoo_buddy_auth_req_15(PurpleConnection *gc, struct yahoo_packet *p
 
 			switch (pair->key) {
 			case 4:
-				add_req->who = g_strdup(pair->value);
+				temp = pair->value;
 				break;
 			case 5:
 				add_req->id = g_strdup(pair->value);
@@ -1098,6 +1321,10 @@ static void yahoo_buddy_auth_req_15(PurpleConnection *gc, struct yahoo_packet *p
 			}
 			l = l->next;
 		}
+		if(add_req->protocol == 2)
+			add_req->who = g_strconcat("msn/", temp, NULL);
+		else
+			add_req->who = g_strdup(temp);
 
 		if (add_req->id && add_req->who) {
 			char *alias = NULL, *dec_msg = NULL;
@@ -1298,7 +1525,7 @@ static char *yahoo_decode(const char *text)
 static void yahoo_process_mail(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	const char *who = NULL;
 	const char *email = NULL;
 	const char *subj = NULL;
@@ -1334,18 +1561,26 @@ static void yahoo_process_mail(PurpleConnection *gc, struct yahoo_packet *pkt)
 		g_free(dec_subj);
 		g_free(from);
 	} else if (count > 0) {
-		const char *to = purple_account_get_username(account);
-		const char *url = yahoo_mail_url;
+		const char *tos[2] = { purple_account_get_username(account) };
+		const char *urls[2] = { yahoo_mail_url };
 
-		purple_notify_emails(gc, count, FALSE, NULL, NULL, &to, &url,
+		purple_notify_emails(gc, count, FALSE, NULL, NULL, tos, urls,
 						   NULL, NULL);
 	}
 }
+
+/* We use this structure once while we authenticate */
+struct yahoo_auth_data
+{
+	PurpleConnection *gc;
+	char *seed;
+};
+
 /* This is the y64 alphabet... it's like base64, but has a . and a _ */
 static const char base64digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._";
 
-/* This is taken from Sylpheed by Hiroyuki Yamamoto.  We have our own tobase64 function
- * in util.c, but it has a bug I don't feel like finding right now ;) */
+/* This is taken from Sylpheed by Hiroyuki Yamamoto. We have our own tobase64 function
+ * in util.c, but it is different from the one yahoo uses */
 static void to_y64(char *out, const unsigned char *in, gsize inlen)
      /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
 {
@@ -1372,605 +1607,283 @@ static void to_y64(char *out, const unsigned char *in, gsize inlen)
 	*out = '\0';
 }
 
-static void yahoo_process_auth_old(PurpleConnection *gc, const char *seed)
+static void yahoo_auth16_stage3(PurpleConnection *gc, const char *crypt)
 {
-	struct yahoo_packet *pack;
+	YahooData *yd = gc->proto_data;
 	PurpleAccount *account = purple_connection_get_account(gc);
 	const char *name = purple_normalize(account, purple_account_get_username(account));
-	const char *pass = purple_connection_get_password(gc);
-	struct yahoo_data *yd = gc->proto_data;
-
-	/* So, Yahoo has stopped supporting its older clients in India, and undoubtedly
-	 * will soon do so in the rest of the world.
-	 *
-	 * The new clients use this authentication method.  I warn you in advance, it's
-	 * bizarre, convoluted, inordinately complicated.  It's also no more secure than
-	 * crypt() was.  The only purpose this scheme could serve is to prevent third
-	 * party clients from connecting to their servers.
-	 *
-	 * Sorry, Yahoo.
-	 */
-
-	PurpleCipher *cipher;
-	PurpleCipherContext *context;
-	guchar digest[16];
-
-	char *crypt_result;
-	char password_hash[25];
-	char crypt_hash[25];
-	char *hash_string_p = g_malloc(50 + strlen(name));
-	char *hash_string_c = g_malloc(50 + strlen(name));
-
-	char checksum;
-
-	int sv;
-
-	char result6[25];
-	char result96[25];
-
-	sv = seed[15];
-	sv = sv % 8;
-
-	cipher = purple_ciphers_find_cipher("md5");
-	context = purple_cipher_context_new(cipher, NULL);
-
-	purple_cipher_context_append(context, (const guchar *)pass, strlen(pass));
-	purple_cipher_context_digest(context, sizeof(digest), digest, NULL);
-
-	to_y64(password_hash, digest, 16);
-
-	crypt_result = yahoo_crypt(pass, "$1$_2S43d5f$");
-
-	purple_cipher_context_reset(context, NULL);
-	purple_cipher_context_append(context, (const guchar *)crypt_result, strlen(crypt_result));
-	purple_cipher_context_digest(context, sizeof(digest), digest, NULL);
-	to_y64(crypt_hash, digest, 16);
-
-	switch (sv) {
-	case 1:
-	case 6:
-		checksum = seed[seed[9] % 16];
-		g_snprintf(hash_string_p, strlen(name) + 50,
-			   "%c%s%s%s", checksum, name, seed, password_hash);
-		g_snprintf(hash_string_c, strlen(name) + 50,
-			   "%c%s%s%s", checksum, name, seed, crypt_hash);
-		break;
-	case 2:
-	case 7:
-		checksum = seed[seed[15] % 16];
-		g_snprintf(hash_string_p, strlen(name) + 50,
-			   "%c%s%s%s", checksum, seed, password_hash, name);
-		g_snprintf(hash_string_c, strlen(name) + 50,
-			   "%c%s%s%s", checksum, seed, crypt_hash, name);
-		break;
-	case 3:
-		checksum = seed[seed[1] % 16];
-		g_snprintf(hash_string_p, strlen(name) + 50,
-			   "%c%s%s%s", checksum, name, password_hash, seed);
-		g_snprintf(hash_string_c, strlen(name) + 50,
-			   "%c%s%s%s", checksum, name, crypt_hash, seed);
-		break;
-	case 4:
-		checksum = seed[seed[3] % 16];
-		g_snprintf(hash_string_p, strlen(name) + 50,
-			   "%c%s%s%s", checksum, password_hash, seed, name);
-		g_snprintf(hash_string_c, strlen(name) + 50,
-			   "%c%s%s%s", checksum, crypt_hash, seed, name);
-		break;
-	case 0:
-	case 5:
-		checksum = seed[seed[7] % 16];
-			g_snprintf(hash_string_p, strlen(name) + 50,
-                                   "%c%s%s%s", checksum, password_hash, name, seed);
-                        g_snprintf(hash_string_c, strlen(name) + 50,
-				   "%c%s%s%s", checksum, crypt_hash, name, seed);
-			break;
-	}
-
-	purple_cipher_context_reset(context, NULL);
-	purple_cipher_context_append(context, (const guchar *)hash_string_p, strlen(hash_string_p));
-	purple_cipher_context_digest(context, sizeof(digest), digest, NULL);
-	to_y64(result6, digest, 16);
-
-	purple_cipher_context_reset(context, NULL);
-	purple_cipher_context_append(context, (const guchar *)hash_string_c, strlen(hash_string_c));
-	purple_cipher_context_digest(context, sizeof(digest), digest, NULL);
-	purple_cipher_context_destroy(context);
-	to_y64(result96, digest, 16);
-
-	pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP,	YAHOO_STATUS_AVAILABLE, 0);
-
-	if(yd->jp) {
-		yahoo_packet_hash(pack, "sssss",
-						  0, name,
-						  6, result6,
-						  96, result96,
-						  1, name,
-						  135, YAHOOJP_CLIENT_VERSION);
-	} else {
-		yahoo_packet_hash(pack, "ssssss",
-						  0, name,
-						  6, result6,
-						  96, result96,
-						  1, name,
-						  244, YAHOO_CLIENT_VERSION_ID,
-						  135, YAHOO_CLIENT_VERSION);
-	}
-
-	yahoo_packet_send_and_free(pack, yd);
-
-	g_free(hash_string_p);
-	g_free(hash_string_c);
-}
-
-/* I'm dishing out some uber-mad props to Cerulean Studios for cracking this
- * and sending the fix!  Thanks guys. */
+	PurpleCipher *md5_cipher;
+	PurpleCipherContext *md5_ctx;
+	guchar md5_digest[16];
+	gchar base64_string[25];
+	struct yahoo_packet *pkt;
 
-static void yahoo_process_auth_new(PurpleConnection *gc, const char *seed)
-{
-	struct yahoo_packet *pack = NULL;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	const char *name = purple_normalize(account, purple_account_get_username(account));
-	const char *pass = purple_connection_get_password(gc);
-	char *enc_pass;
-	struct yahoo_data *yd = gc->proto_data;
-
-	PurpleCipher		*md5_cipher;
-	PurpleCipherContext	*md5_ctx;
-	guchar				md5_digest[16];
-
-	PurpleCipher		*sha1_cipher;
-	PurpleCipherContext	*sha1_ctx1;
-	PurpleCipherContext	*sha1_ctx2;
-
-	char				*alphabet1			= "FBZDWAGHrJTLMNOPpRSKUVEXYChImkwQ";
-	char				*alphabet2			= "F0E1D2C3B4A59687abcdefghijklmnop";
-
-	char				*challenge_lookup	= "qzec2tb3um1olpar8whx4dfgijknsvy5";
-	char				*operand_lookup		= "+|&%/*^-";
-	char				*delimit_lookup		= ",;";
-
-	char				*password_hash		= (char *)g_malloc(25);
-	char				*crypt_hash			= (char *)g_malloc(25);
-	char				*crypt_result		= NULL;
-
-	unsigned char		pass_hash_xor1[64];
-	unsigned char		pass_hash_xor2[64];
-	unsigned char		crypt_hash_xor1[64];
-	unsigned char		crypt_hash_xor2[64];
-	char				resp_6[100];
-	char				resp_96[100];
-
-	unsigned char		digest1[20];
-	unsigned char		digest2[20];
-	unsigned char		comparison_src[20];
-	unsigned char		magic_key_char[4];
-	const char			*magic_ptr;
-
-	unsigned int		magic[64];
-	unsigned int		magic_work = 0;
-	unsigned int		magic_4 = 0;
-
-	int					x;
-	int					y;
-	int					cnt = 0;
-	int					magic_cnt = 0;
-	int					magic_len;
-
-	memset(password_hash, 0, 25);
-	memset(crypt_hash, 0, 25);
-	memset(&pass_hash_xor1, 0, 64);
-	memset(&pass_hash_xor2, 0, 64);
-	memset(&crypt_hash_xor1, 0, 64);
-	memset(&crypt_hash_xor2, 0, 64);
-	memset(&digest1, 0, 20);
-	memset(&digest2, 0, 20);
-	memset(&magic, 0, 64);
-	memset(&resp_6, 0, 100);
-	memset(&resp_96, 0, 100);
-	memset(&magic_key_char, 0, 4);
-	memset(&comparison_src, 0, 20);
+	purple_debug_info("yahoo","Authentication: In yahoo_auth16_stage3\n");
 
 	md5_cipher = purple_ciphers_find_cipher("md5");
 	md5_ctx = purple_cipher_context_new(md5_cipher, NULL);
+	purple_cipher_context_append(md5_ctx, (guchar *)crypt, strlen(crypt));
+	purple_cipher_context_digest(md5_ctx, sizeof(md5_digest), md5_digest, NULL);
 
-	sha1_cipher = purple_ciphers_find_cipher("sha1");
-	sha1_ctx1 = purple_cipher_context_new(sha1_cipher, NULL);
-	sha1_ctx2 = purple_cipher_context_new(sha1_cipher, NULL);
-
-	/*
-	 * Magic: Phase 1.  Generate what seems to be a 30 byte value (could change if base64
-	 * ends up differently?  I don't remember and I'm tired, so use a 64 byte buffer.
-	 */
-
-	magic_ptr = seed;
-
-	while (*magic_ptr != '\0') {
-		char   *loc;
+	to_y64(base64_string, md5_digest, 16);
 
-		/* Ignore parentheses. */
-
-		if (*magic_ptr == '(' || *magic_ptr == ')') {
-			magic_ptr++;
-			continue;
-		}
-
-		/* Characters and digits verify against the challenge lookup. */
-
-		if (isalpha(*magic_ptr) || isdigit(*magic_ptr)) {
-			loc = strchr(challenge_lookup, *magic_ptr);
-			if (!loc) {
-			  /* SME XXX Error - disconnect here */
-			}
-
-			/* Get offset into lookup table and shl 3. */
-
-			magic_work = loc - challenge_lookup;
-			magic_work <<= 3;
-
-			magic_ptr++;
-			continue;
-		} else {
-			unsigned int	local_store;
-
-			loc = strchr(operand_lookup, *magic_ptr);
-			if (!loc) {
-				/* SME XXX Disconnect */
-			}
-
-			local_store = loc - operand_lookup;
-
-			/* Oops; how did this happen? */
-
-			if (magic_cnt >= 64)
-				break;
-
-			magic[magic_cnt++] = magic_work | local_store;
-			magic_ptr++;
-			continue;
-		}
-			}
-
-	magic_len = magic_cnt;
-	magic_cnt = 0;
-
-	/* Magic: Phase 2.  Take generated magic value and sprinkle fairy
-	 * dust on the values.
-	 */
-
-	for (magic_cnt = magic_len - 2; magic_cnt >= 0; magic_cnt--) {
-		unsigned char	byte1;
-		unsigned char	byte2;
+	purple_debug_info("yahoo", "yahoo status: %d\n", yd->current_status);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, yd->current_status, yd->session_id);
+	
+	yahoo_packet_hash(pkt, "sssssssss",
+				1, name,
+				0, name,
+				277, yd->cookie_y,
+				278, yd->cookie_t,
+				307, base64_string,
+				244, yd->jp ? YAHOOJP_CLIENT_VERSION_ID : YAHOO_CLIENT_VERSION_ID,
+				2, name,
+				2, "1",
+				135, yd->jp ? YAHOOJP_CLIENT_VERSION : YAHOO_CLIENT_VERSION);
 
-		/* Bad.  Abort. */
+	if (yd->picture_checksum)
+		yahoo_packet_hash_int(pkt, 192, yd->picture_checksum);
+	yahoo_packet_send_and_free(pkt, yd);
 
-		if ((magic_cnt + 1 > magic_len) || (magic_cnt > magic_len))
-			break;
+	purple_cipher_context_destroy(md5_ctx);
+}
 
-		byte1 = magic[magic_cnt];
-		byte2 = magic[magic_cnt+1];
+static void yahoo_auth16_stage2(PurpleUtilFetchUrlData *unused, gpointer user_data, const gchar *ret_data, size_t len, const gchar *error_message)
+{
+	struct yahoo_auth_data *auth_data = user_data;
+	PurpleConnection *gc = auth_data->gc;
+	YahooData *yd;
+	gboolean try_login_on_error = FALSE;
 
-		byte1 *= 0xcd;
-		byte1 ^= byte2;
+	purple_debug_info("yahoo","Authentication: In yahoo_auth16_stage2\n");
 
-		magic[magic_cnt+1] = byte1;
+	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
+		g_free(auth_data->seed);
+		g_free(auth_data);
+		g_return_if_reached();
 	}
 
-	/*
-	 * Magic: Phase 3.  This computes 20 bytes.  The first 4 bytes are used as our magic
-	 * key (and may be changed later); the next 16 bytes are an MD5 sum of the magic key
-	 * plus 3 bytes.  The 3 bytes are found by looping, and they represent the offsets
-	 * into particular functions we'll later call to potentially alter the magic key.
-	 *
-	 * %-)
-	 */
-
-	magic_cnt = 1;
-	x = 0;
-
-	do {
-		unsigned int bl = 0;
-		unsigned int cl = magic[magic_cnt++];
+	yd = (YahooData *)gc->proto_data;
 
-		if (magic_cnt >= magic_len)
-			break;
+	if (error_message != NULL) {
+		purple_debug_error("yahoo", "Login Failed, unable to retrieve stage 2 url: %s\n", error_message);
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_message);
+		g_free(auth_data->seed);
+		g_free(auth_data);
+		return;
+	}
+	else if (len > 0 && ret_data && *ret_data) {
+		gchar **split_data = g_strsplit(ret_data, "\r\n", -1);
+		int totalelements = 0;
+		int response_no = -1;
+		char *crumb = NULL;
+		char *crypt = NULL;
+
+#if GLIB_CHECK_VERSION(2,6,0)
+		totalelements = g_strv_length(split_data);
+#else
+		while (split_data[++totalelements] != NULL);
+#endif
+		if (totalelements >= 4) {
+			response_no = strtol(split_data[0], NULL, 10);
+			crumb = g_strdup(split_data[1] + strlen("crumb="));
+			yd->cookie_y = g_strdup(split_data[2] + strlen("Y="));
+			yd->cookie_t = g_strdup(split_data[3] + strlen("T="));
+		}
 
-		if (cl > 0x7F) {
-			if (cl < 0xe0)
-				bl = cl = (cl & 0x1f) << 6;
-			else {
-				bl = magic[magic_cnt++];
-				cl = (cl & 0x0f) << 6;
-				bl = ((bl & 0x3f) + cl) << 6;
+		g_strfreev(split_data);
+
+		if(response_no != 0) {
+			/* Some error in the login process */
+			PurpleConnectionError error;
+			char *error_reason = NULL;
+
+			switch(response_no) {
+				case -1:
+					/* Some error in the received stream */
+					error_reason = g_strdup(_("Received invalid data"));
+					error = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
+					break;
+				case 100:
+					/* Unknown error */
+					error_reason = g_strdup(_("Unknown error"));
+					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
+					break;
+				default:
+					/* if we have everything we need, why not try to login irrespective of response */
+					if((crumb != NULL) && (yd->cookie_y != NULL) && (yd->cookie_t != NULL)) {
+						try_login_on_error = TRUE;
+						break;
+					}
+					error_reason = g_strdup(_("Unknown error"));
+					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
+					break;
 			}
-
-			cl = magic[magic_cnt++];
-			bl = (cl & 0x3f) + bl;
-		} else
-			bl = cl;
-
-		comparison_src[x++] = (bl & 0xff00) >> 8;
-		comparison_src[x++] = bl & 0xff;
-	} while (x < 20);
-
-	/* First four bytes are magic key. */
-	memcpy(&magic_key_char[0], comparison_src, 4);
-	magic_4 = magic_key_char[0] | (magic_key_char[1] << 8) |
-			(magic_key_char[2] << 16) | (magic_key_char[3] << 24);
-
-	/*
-	 * Magic: Phase 4.  Determine what function to use later by getting outside/inside
-	 * loop values until we match our previous buffer.
-	 */
-	for (x = 0; x < 65535; x++) {
-		int leave = 0;
-
-		for (y = 0; y < 5; y++) {
-			unsigned char test[3];
-
-			/* Calculate buffer. */
-			test[0] = x;
-			test[1] = x >> 8;
-			test[2] = y;
-
-			purple_cipher_context_reset(md5_ctx, NULL);
-			purple_cipher_context_append(md5_ctx, magic_key_char, 4);
-			purple_cipher_context_append(md5_ctx, test, 3);
-			purple_cipher_context_digest(md5_ctx, sizeof(md5_digest),
-									   md5_digest, NULL);
-
-			if (!memcmp(md5_digest, comparison_src+4, 16)) {
-				leave = 1;
-				break;
+			if(error_reason) {
+				purple_debug_error("yahoo", "Authentication error: %s. "
+				                   "Code %d\n", error_reason, response_no);
+				purple_connection_error_reason(gc, error, error_reason);
+				g_free(error_reason);
+				g_free(auth_data->seed);
+				g_free(auth_data);
+				return;
 			}
 		}
 
-		if (leave == 1)
-			break;
+		crypt = g_strconcat(crumb, auth_data->seed, NULL);
+		yahoo_auth16_stage3(gc, crypt);
+		g_free(crypt);
+		g_free(crumb);
 	}
+	g_free(auth_data->seed);
+	g_free(auth_data);
+}
 
-	/* If y != 0, we need some help. */
-	if (y != 0) {
-		unsigned int	updated_key;
+static void yahoo_auth16_stage1_cb(PurpleUtilFetchUrlData *unused, gpointer user_data, const gchar *ret_data, size_t len, const gchar *error_message)
+{
+	struct yahoo_auth_data *auth_data = user_data;
+	PurpleConnection *gc = auth_data->gc;
 
-		/* Update magic stuff.
-		 * Call it twice because Yahoo's encryption is super bad ass.
-		 */
-		updated_key = yahoo_auth_finalCountdown(magic_4, 0x60, y, x);
-		updated_key = yahoo_auth_finalCountdown(updated_key, 0x60, y, x);
+	purple_debug_info("yahoo","Authentication: In yahoo_auth16_stage1_cb\n");
 
-		magic_key_char[0] = updated_key & 0xff;
-		magic_key_char[1] = (updated_key >> 8) & 0xff;
-		magic_key_char[2] = (updated_key >> 16) & 0xff;
-		magic_key_char[3] = (updated_key >> 24) & 0xff;
+	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
+		g_free(auth_data->seed);
+		g_free(auth_data);
+		g_return_if_reached();
 	}
 
-	enc_pass = yahoo_string_encode(gc, pass, NULL);
-
-	/* Get password and crypt hashes as per usual. */
-	purple_cipher_context_reset(md5_ctx, NULL);
-	purple_cipher_context_append(md5_ctx, (const guchar *)enc_pass, strlen(enc_pass));
-	purple_cipher_context_digest(md5_ctx, sizeof(md5_digest),
-							   md5_digest, NULL);
-	to_y64(password_hash, md5_digest, 16);
-
-	crypt_result = yahoo_crypt(enc_pass, "$1$_2S43d5f$");
-
-	g_free(enc_pass);
-	enc_pass = NULL;
-
-	purple_cipher_context_reset(md5_ctx, NULL);
-	purple_cipher_context_append(md5_ctx, (const guchar *)crypt_result, strlen(crypt_result));
-	purple_cipher_context_digest(md5_ctx, sizeof(md5_digest),
-							   md5_digest, NULL);
-	to_y64(crypt_hash, md5_digest, 16);
-
-	/* Our first authentication response is based off of the password hash. */
-	for (x = 0; x < (int)strlen(password_hash); x++)
-		pass_hash_xor1[cnt++] = password_hash[x] ^ 0x36;
-
-	if (cnt < 64)
-		memset(&(pass_hash_xor1[cnt]), 0x36, 64-cnt);
-
-	cnt = 0;
-
-	for (x = 0; x < (int)strlen(password_hash); x++)
-		pass_hash_xor2[cnt++] = password_hash[x] ^ 0x5c;
-
-	if (cnt < 64)
-		memset(&(pass_hash_xor2[cnt]), 0x5c, 64-cnt);
-
-	/*
-	 * The first context gets the password hash XORed with 0x36 plus a magic value
-	 * which we previously extrapolated from our challenge.
-	 */
-
-	purple_cipher_context_append(sha1_ctx1, pass_hash_xor1, 64);
-	if (y >= 3)
-		purple_cipher_context_set_option(sha1_ctx1, "sizeLo", GINT_TO_POINTER(0x1ff));
-	purple_cipher_context_append(sha1_ctx1, magic_key_char, 4);
-	purple_cipher_context_digest(sha1_ctx1, sizeof(digest1), digest1, NULL);
-
-	/*
-	 * The second context gets the password hash XORed with 0x5c plus the SHA-1 digest
-	 * of the first context.
-	 */
-
-	purple_cipher_context_append(sha1_ctx2, pass_hash_xor2, 64);
-	purple_cipher_context_append(sha1_ctx2, digest1, 20);
-	purple_cipher_context_digest(sha1_ctx2, sizeof(digest2), digest2, NULL);
-
-	/*
-	 * Now that we have digest2, use it to fetch characters from an alphabet to construct
-	 * our first authentication response.
-	 */
-
-	for (x = 0; x < 20; x += 2) {
-		unsigned int	val = 0;
-		unsigned int	lookup = 0;
-
-		char			byte[6];
-
-		memset(&byte, 0, 6);
-
-		/* First two bytes of digest stuffed together. */
-
-		val = digest2[x];
-		val <<= 8;
-		val += digest2[x+1];
-
-		lookup = (val >> 0x0b);
-		lookup &= 0x1f;
-		if (lookup >= strlen(alphabet1))
-			break;
-		sprintf(byte, "%c", alphabet1[lookup]);
-		strcat(resp_6, byte);
-		strcat(resp_6, "=");
-
-		lookup = (val >> 0x06);
-		lookup &= 0x1f;
-		if (lookup >= strlen(alphabet2))
-			break;
-		sprintf(byte, "%c", alphabet2[lookup]);
-		strcat(resp_6, byte);
-
-		lookup = (val >> 0x01);
-		lookup &= 0x1f;
-		if (lookup >= strlen(alphabet2))
-			break;
-		sprintf(byte, "%c", alphabet2[lookup]);
-		strcat(resp_6, byte);
-
-		lookup = (val & 0x01);
-		if (lookup >= strlen(delimit_lookup))
-			break;
-		sprintf(byte, "%c", delimit_lookup[lookup]);
-		strcat(resp_6, byte);
+	if (error_message != NULL) {
+		purple_debug_error("yahoo", "Login Failed, unable to retrieve login url: %s\n", error_message);
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_message);
+		g_free(auth_data->seed);
+		g_free(auth_data);
+		return;
 	}
+	else if (len > 0 && ret_data && *ret_data) {
+		gchar **split_data = g_strsplit(ret_data, "\r\n", -1);
+		int totalelements = 0;
+		int response_no = -1;
+		char *token = NULL;
+
+#if GLIB_CHECK_VERSION(2,6,0)
+		totalelements = g_strv_length(split_data);
+#else
+		while (split_data[++totalelements] != NULL);
+#endif
+		if(totalelements == 1)
+			response_no = strtol(split_data[0], NULL, 10);
+		else if(totalelements >= 2) {
+			response_no = strtol(split_data[0], NULL, 10);
+			token = g_strdup(split_data[1] + strlen("ymsgr="));
+		}
 
-	/* Our second authentication response is based off of the crypto hash. */
-
-	cnt = 0;
-	memset(&digest1, 0, 20);
-	memset(&digest2, 0, 20);
-
-	for (x = 0; x < (int)strlen(crypt_hash); x++)
-		crypt_hash_xor1[cnt++] = crypt_hash[x] ^ 0x36;
-
-	if (cnt < 64)
-		memset(&(crypt_hash_xor1[cnt]), 0x36, 64-cnt);
-
-	cnt = 0;
-
-	for (x = 0; x < (int)strlen(crypt_hash); x++)
-		crypt_hash_xor2[cnt++] = crypt_hash[x] ^ 0x5c;
-
-	if (cnt < 64)
-		memset(&(crypt_hash_xor2[cnt]), 0x5c, 64-cnt);
-
-	purple_cipher_context_reset(sha1_ctx1, NULL);
-	purple_cipher_context_reset(sha1_ctx2, NULL);
-
-	/*
-	 * The first context gets the password hash XORed with 0x36 plus a magic value
-	 * which we previously extrapolated from our challenge.
-	 */
-
-	purple_cipher_context_append(sha1_ctx1, crypt_hash_xor1, 64);
-	if (y >= 3) {
-		purple_cipher_context_set_option(sha1_ctx1, "sizeLo",
-									   GINT_TO_POINTER(0x1ff));
+		g_strfreev(split_data);
+
+		if(response_no != 0) {
+			/* Some error in the login process */
+			PurpleConnectionError error;
+			char *error_reason;
+
+			switch(response_no) {
+				case -1:
+					/* Some error in the received stream */
+					error_reason = g_strdup(_("Received invalid data"));
+					error = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
+					break;
+				case 1212:
+					/* Password incorrect */
+					/* Set password to NULL. Avoids account locking. Brings dialog to enter password if clicked on Re-enable account */
+					if (!purple_account_get_remember_password(purple_connection_get_account(gc)))
+						purple_account_set_password(purple_connection_get_account(gc), NULL);
+					error_reason = g_strdup(_("Incorrect password"));
+					error = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
+					break;
+				case 1213:
+					/* security lock from too many failed login attempts */
+					error_reason = g_strdup(_("Account locked: Too many failed login attempts.  Logging into the Yahoo! website may fix this."));
+					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
+					break;
+				case 1235:
+					/* the username does not exist */
+					error_reason = g_strdup(_("Username does not exist"));
+					error = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
+					break;
+				case 1214:
+				case 1236:
+					/* indicates a lock of some description */
+					error_reason = g_strdup(_("Account locked: Unknown reason.  Logging into the Yahoo! website may fix this."));
+					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
+					break;
+				case 100:
+					/* username or password missing */
+					error_reason = g_strdup(_("Username or password missing"));
+					error = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
+					break;
+				default:
+					/* Unknown error! */
+					error_reason = g_strdup_printf(_("Unknown error (%d)"), response_no);
+					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
+					break;
+			}
+			purple_debug_error("yahoo", "Authentication error: %s. Code %d\n",
+			                   error_reason, response_no);
+			purple_connection_error_reason(gc, error, error_reason);
+			g_free(error_reason);
+			g_free(auth_data->seed);
+			g_free(auth_data);
+			g_free(token);
+		}
+		else {
+			/* OK to login, correct information provided */
+			PurpleUtilFetchUrlData *url_data = NULL;
+			PurpleAccount *account = purple_connection_get_account(gc);
+			char *url = NULL;
+			gboolean yahoojp = yahoo_is_japan(account);
+
+			url = g_strdup_printf(yahoojp ? YAHOOJP_LOGIN_URL : YAHOO_LOGIN_URL, token);
+			url_data = purple_util_fetch_url_request_len_with_account(account, url,
+					TRUE, YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1,
+					yahoo_auth16_stage2, auth_data);
+			g_free(url);
+			g_free(token);
+		}
 	}
-	purple_cipher_context_append(sha1_ctx1, magic_key_char, 4);
-	purple_cipher_context_digest(sha1_ctx1, sizeof(digest1), digest1, NULL);
-
-	/*
-	 * The second context gets the password hash XORed with 0x5c plus the SHA-1 digest
-	 * of the first context.
-	 */
-
-	purple_cipher_context_append(sha1_ctx2, crypt_hash_xor2, 64);
-	purple_cipher_context_append(sha1_ctx2, digest1, 20);
-	purple_cipher_context_digest(sha1_ctx2, sizeof(digest2), digest2, NULL);
-
-	/*
-	 * Now that we have digest2, use it to fetch characters from an alphabet to construct
-	 * our first authentication response.
-	 */
-
-	for (x = 0; x < 20; x += 2) {
-		unsigned int	val = 0;
-		unsigned int	lookup = 0;
-
-		char			byte[6];
-
-		memset(&byte, 0, 6);
-
-		/* First two bytes of digest stuffed together. */
-
-		val = digest2[x];
-		val <<= 8;
-		val += digest2[x+1];
-
-		lookup = (val >> 0x0b);
-		lookup &= 0x1f;
-		if (lookup >= strlen(alphabet1))
-			break;
-		sprintf(byte, "%c", alphabet1[lookup]);
-		strcat(resp_96, byte);
-		strcat(resp_96, "=");
+}
 
-		lookup = (val >> 0x06);
-		lookup &= 0x1f;
-		if (lookup >= strlen(alphabet2))
-			break;
-		sprintf(byte, "%c", alphabet2[lookup]);
-		strcat(resp_96, byte);
+static void yahoo_auth16_stage1(PurpleConnection *gc, const char *seed)
+{
+	PurpleUtilFetchUrlData *url_data = NULL;
+	struct yahoo_auth_data *auth_data = NULL;
+	char *url = NULL;
+	char *encoded_username;
+	char *encoded_password;
+	gboolean yahoojp;
 
-		lookup = (val >> 0x01);
-		lookup &= 0x1f;
-		if (lookup >= strlen(alphabet2))
-			break;
-		sprintf(byte, "%c", alphabet2[lookup]);
-		strcat(resp_96, byte);
+	purple_debug_info("yahoo", "Authentication: In yahoo_auth16_stage1\n");
 
-		lookup = (val & 0x01);
-		if (lookup >= strlen(delimit_lookup))
-			break;
-		sprintf(byte, "%c", delimit_lookup[lookup]);
-		strcat(resp_96, byte);
-	}
-	purple_debug_info("yahoo", "yahoo status: %d\n", yd->current_status);
-	pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP,	yd->current_status, 0);
-
-	if(yd->jp) {
-		yahoo_packet_hash(pack, "sssss",
-						  0, name,
-						  6, resp_6,
-						  96, resp_96,
-						  1, name,
-						  135, YAHOOJP_CLIENT_VERSION);
-	} else {
-		yahoo_packet_hash(pack, "ssssss",
-						  0, name,
-						  6, resp_6,
-						  96, resp_96,
-						  1, name,
-						  244, YAHOO_CLIENT_VERSION_ID,
-						  135, YAHOO_CLIENT_VERSION);
+	if(!purple_ssl_is_supported()) {
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, _("SSL support unavailable"));
+		return;
 	}
 
-	if (yd->picture_checksum)
-		yahoo_packet_hash_int(pack, 192, yd->picture_checksum);
+	yahoojp = yahoo_is_japan(purple_connection_get_account(gc));
+	auth_data = g_new0(struct yahoo_auth_data, 1);
+	auth_data->gc = gc;
+	auth_data->seed = g_strdup(seed);
 
-	yahoo_packet_send_and_free(pack, yd);
+	encoded_username = g_strdup(purple_url_encode(purple_account_get_username(purple_connection_get_account(gc))));
+	encoded_password = g_strdup(purple_url_encode(purple_connection_get_password(gc)));
+	url = g_strdup_printf(yahoojp ? YAHOOJP_TOKEN_URL : YAHOO_TOKEN_URL,
+			encoded_username, encoded_password, purple_url_encode(seed));
+	g_free(encoded_password);
+	g_free(encoded_username);
 
-	purple_cipher_context_destroy(md5_ctx);
-	purple_cipher_context_destroy(sha1_ctx1);
-	purple_cipher_context_destroy(sha1_ctx2);
+	url_data = purple_util_fetch_url_request_len_with_account(
+			purple_connection_get_account(gc), url, TRUE,
+			YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1,
+			yahoo_auth16_stage1_cb, auth_data);
 
-	g_free(password_hash);
-	g_free(crypt_hash);
+	g_free(url);
 }
 
 static void yahoo_process_auth(PurpleConnection *gc, struct yahoo_packet *pkt)
@@ -1995,11 +1908,10 @@ static void yahoo_process_auth(PurpleConnection *gc, struct yahoo_packet *pkt)
 	if (seed) {
 		switch (m) {
 		case 0:
-			yahoo_process_auth_old(gc, seed);
-			break;
+			/* used to be for really old auth routine, dont support now */
 		case 1:
-		case 2: /* This case seems to work, could probably use testing */
-			yahoo_process_auth_new(gc, seed);
+		case 2: /* Yahoo ver 16 authentication */
+			yahoo_auth16_stage1(gc, seed);
 			break;
 		default:
 			{
@@ -2012,7 +1924,7 @@ static void yahoo_process_auth(PurpleConnection *gc, struct yahoo_packet *pkt)
 				purple_notify_error(gc, "", _("Failed Yahoo! Authentication"),
 							buf);
 				g_free(buf);
-				yahoo_process_auth_new(gc, seed); /* Can't hurt to try it anyway. */
+				yahoo_auth16_stage1(gc, seed); /* Can't hurt to try it anyway. */
 				break;
 			}
 		}
@@ -2031,8 +1943,7 @@ static void ignore_buddy(PurpleBuddy *buddy) {
 	name = g_strdup(purple_buddy_get_name(buddy));
 	account = purple_buddy_get_account(buddy);
 
-	purple_debug(PURPLE_DEBUG_INFO, "blist",
-		"Removing '%s' from buddy list.\n", name);
+	purple_debug_info("yahoo", "blist: Removing '%s' from buddy list.\n", name);
 	purple_account_remove_buddy(account, buddy, group);
 	purple_blist_remove_buddy(buddy);
 
@@ -2117,8 +2028,8 @@ static void yahoo_process_ignore(PurpleConnection *gc, struct yahoo_packet *pkt)
 static void yahoo_process_authresp(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 #ifdef TRY_WEBMESSENGER_LOGIN
-	struct yahoo_data *yd = gc->proto_data;
-#endif
+	YahooData *yd = gc->proto_data;
+#endif /* TRY_WEBMESSENGER_LOGIN */
 	GSList *l = pkt->hash;
 	int err = 0;
 	char *msg;
@@ -2140,11 +2051,11 @@ static void yahoo_process_authresp(PurpleConnection *gc, struct yahoo_packet *pk
 
 	switch (err) {
 	case 0:
-		msg = g_strdup(_("Unknown error."));
+		msg = g_strdup(_("Unknown error"));
 		reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 		break;
 	case 3:
-		msg = g_strdup(_("Invalid username."));
+		msg = g_strdup(_("Username does not exist"));
 		reason = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
 		break;
 	case 13:
@@ -2162,17 +2073,30 @@ static void yahoo_process_authresp(PurpleConnection *gc, struct yahoo_packet *pk
 				yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
 			return;
 		}
-#endif
+#endif /* TRY_WEBMESSENGER_LOGIN */
 		if (!purple_account_get_remember_password(account))
 			purple_account_set_password(account, NULL);
 
-		msg = g_strdup(_("Incorrect password."));
+		msg = g_strdup(_("Invalid username or password"));
 		reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
 		break;
 	case 14:
-		msg = g_strdup(_("Your account is locked, please log in to the Yahoo! website."));
+		msg = g_strdup(_("Your account has been locked due to too many failed login attempts."
+					"  Please try logging into the Yahoo! website."));
 		reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
 		break;
+	case 52:
+		/* See #9660. As much as we know, reconnecting shouldn't hurt */
+		purple_debug_info("yahoo", "Got error 52, Set to autoreconnect\n");
+		msg = g_strdup_printf(_("Unknown error 52.  Reconnecting should fix this."));
+		reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
+		break;
+	case 1013:
+		msg = g_strdup(_("Error 1013: The username you have entered is invalid."
+					"  The most common cause of this error is entering your e-mail"
+					" address instead of your Yahoo! ID."));
+		reason = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
+		break;
 	default:
 		msg = g_strdup_printf(_("Unknown error number %d. Logging into the Yahoo! website may fix this."), err);
 	}
@@ -2191,11 +2115,15 @@ static void yahoo_process_addbuddy(PurpleConnection *gc, struct yahoo_packet *pk
 {
 	int err = 0;
 	char *who = NULL;
+	char *temp = NULL;
 	char *group = NULL;
 	char *decoded_group;
 	char *buf;
 	YahooFriend *f;
 	GSList *l = pkt->hash;
+	YahooData *yd = gc->proto_data;
+	int protocol = 0;
+	gboolean msn = FALSE;
 
 	while (l) {
 		struct yahoo_pair *pair = l->data;
@@ -2205,34 +2133,490 @@ static void yahoo_process_addbuddy(PurpleConnection *gc, struct yahoo_packet *pk
 			err = strtol(pair->value, NULL, 10);
 			break;
 		case 7:
-			who = pair->value;
+			temp = pair->value;
 			break;
 		case 65:
 			group = pair->value;
 			break;
+		case 241:
+			protocol = strtol(pair->value, NULL, 10);
+			if(protocol == 2)
+				msn = TRUE;
+			break;
 		}
 
 		l = l->next;
 	}
 
-	if (!who)
+	if (!temp)
 		return;
 	if (!group)
 		group = "";
 
+	if(msn)
+		who = g_strconcat("msn/", temp, NULL);
+	else
+		who = g_strdup(temp);
+
 	if (!err || (err == 2)) { /* 0 = ok, 2 = already on serv list */
 		f = yahoo_friend_find_or_new(gc, who);
 		yahoo_update_status(gc, who, f);
+		if(protocol)
+			f->protocol = protocol;
+
+		if( !g_hash_table_lookup(yd->peers, who) ) {
+			/* we are not connected as client, so set friend to not connected */
+			if(msn)
+				yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_DO_NOT_CONNECT);
+			else	{
+				yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_NOT_CONNECTED);
+				f->p2p_packet_sent = 0;
+			}
+		}
+		else	/* we are already connected. set friend to YAHOO_P2PSTATUS_WE_ARE_CLIENT */
+			yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_WE_ARE_CLIENT);
+		g_free(who);
 		return;
 	}
 
 	decoded_group = yahoo_string_decode(gc, group, FALSE);
-	buf = g_strdup_printf(_("Could not add buddy %s to group %s to the server list on account %s."),
+	buf = g_strdup_printf(_("Unable to add buddy %s to group %s to the server list on account %s."),
 				who, decoded_group, purple_connection_get_display_name(gc));
 	if (!purple_conv_present_error(who, purple_connection_get_account(gc), buf))
-		purple_notify_error(gc, NULL, _("Could not add buddy to server list"), buf);
+		purple_notify_error(gc, NULL, _("Unable to add buddy to server list"), buf);
 	g_free(buf);
 	g_free(decoded_group);
+	g_free(who);
+}
+
+/* write pkt to the source */
+static void yahoo_p2p_write_pkt(gint source, struct yahoo_packet *pkt)
+{
+	size_t pkt_len;
+	guchar *raw_packet;
+
+	/*build the raw packet and send it to the host*/
+	pkt_len = yahoo_packet_build(pkt, 0, 0, 0, &raw_packet);
+	if(write(source, raw_packet, pkt_len) != pkt_len)
+		purple_debug_warning("yahoo","p2p: couldn't write to the source\n");
+	g_free(raw_packet);
+}
+
+static void yahoo_p2p_keepalive_cb(gpointer key, gpointer value, gpointer user_data)
+{
+	struct yahoo_p2p_data *p2p_data = value;
+	PurpleConnection *gc = user_data;
+	struct yahoo_packet *pkt_to_send;
+	PurpleAccount *account;
+	YahooData *yd = gc->proto_data;
+
+	account = purple_connection_get_account(gc);
+
+	pkt_to_send = yahoo_packet_new(YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, yd->session_id);
+	yahoo_packet_hash(pkt_to_send, "ssisi",
+		4, purple_normalize(account, purple_account_get_username(account)),
+		5, p2p_data->host_username,
+		241, 0,		/* Protocol identifier */
+		49, "PEERTOPEER",
+		13, 7);
+	yahoo_p2p_write_pkt(p2p_data->source, pkt_to_send);
+
+	yahoo_packet_free(pkt_to_send);
+}
+
+static gboolean yahoo_p2p_keepalive(gpointer data)
+{
+	PurpleConnection *gc = data;
+	YahooData *yd = gc->proto_data;
+
+	g_hash_table_foreach(yd->peers, yahoo_p2p_keepalive_cb, gc);
+
+	return TRUE;
+}
+
+/* destroy p2p_data associated with a peer and close p2p connection.
+ * g_hash_table_remove() calls this function to destroy p2p_data associated with the peer,
+ * call g_hash_table_remove() instead of this fucntion if peer has an entry in the table */
+static void yahoo_p2p_disconnect_destroy_data(gpointer data)
+{
+	struct yahoo_p2p_data *p2p_data;
+	YahooFriend *f;
+
+	if(!(p2p_data = data))
+		return ;
+
+	/* If friend, set him not connected */
+	f = yahoo_friend_find(p2p_data->gc, p2p_data->host_username);
+	if (f)
+		yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_NOT_CONNECTED);
+
+	if(p2p_data->source >= 0)
+		close(p2p_data->source);
+	if (p2p_data->input_event > 0)
+		purple_input_remove(p2p_data->input_event);
+	g_free(p2p_data->host_ip);
+	g_free(p2p_data->host_username);
+	g_free(p2p_data);
+}
+
+/* exchange of initial p2pfilexfer packets, service type YAHOO_SERVICE_P2PFILEXFER */
+static void yahoo_p2p_process_p2pfilexfer(gpointer data, gint source, struct yahoo_packet *pkt)
+{
+	struct yahoo_p2p_data *p2p_data;
+	char *who = NULL;
+	GSList *l = pkt->hash;
+	struct yahoo_packet *pkt_to_send;
+	PurpleAccount *account;
+	int val_13_to_send = 0;
+	YahooData *yd;
+	YahooFriend *f;
+
+	if(!(p2p_data = data))
+		return ;
+
+	yd = p2p_data->gc->proto_data;
+
+	/* lets see whats in the packet */
+	while (l) {
+		struct yahoo_pair *pair = l->data;
+
+		switch (pair->key) {
+		case 4:
+			who = pair->value;
+			if(strncmp(who, p2p_data->host_username, strlen(p2p_data->host_username)) != 0) {
+				/* from whom are we receiving the packets ?? */
+				purple_debug_warning("yahoo","p2p: received data from wrong user\n");
+				return;
+			}
+			break;
+		case 13:
+			p2p_data->val_13 = strtol(pair->value, NULL, 10);	/* Value should be 5-7 */
+			break;
+		/* case 5, 49 look laters, no use right now */
+		}
+		l = l->next;
+	}
+
+	account = purple_connection_get_account(p2p_data->gc);
+
+	/* key_13: sort of a counter.
+	 * WHEN WE ARE CLIENT: yahoo server sends val_13 = 0, we send to peer val_13 = 1, receive back val_13 = 5,
+	 * we send val_13=6, receive val_13=7, we send val_13=7, HALT. Keep sending val_13 = 7 as keep alive.
+	 * WHEN WE ARE SERVER: we send val_13 = 0 to yahoo server, peer sends us val_13 = 1, we send val_13 = 5,
+	 * receive val_13 = 6, send val_13 = 7, receive val_13 = 7. HALT. Keep sending val_13 = 7 as keep alive. */
+
+	switch(p2p_data->val_13) {
+		case 1 : val_13_to_send = 5; break;
+		case 5 : val_13_to_send = 6; break;
+		case 6 : val_13_to_send = 7; break;
+		case 7 : if( g_hash_table_lookup(yd->peers, p2p_data->host_username) )
+				return;
+			 val_13_to_send = 7; break;
+		default: purple_debug_warning("yahoo","p2p:Unknown value for key 13\n");
+			 return;
+		}
+
+	/* Build the yahoo packet */
+	pkt_to_send = yahoo_packet_new(YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, yd->session_id);
+	yahoo_packet_hash(pkt_to_send, "ssisi",
+		4, purple_normalize(account, purple_account_get_username(account)),
+		5, p2p_data->host_username,
+		241, 0,		/* Protocol identifier */
+		49, "PEERTOPEER",
+		13, val_13_to_send);
+
+	/* build the raw packet and send it to the host */
+	yahoo_p2p_write_pkt(source, pkt_to_send);
+	yahoo_packet_free(pkt_to_send);
+
+	if( val_13_to_send == 7 )
+		if( !g_hash_table_lookup(yd->peers, p2p_data->host_username) ) {
+			g_hash_table_insert(yd->peers, g_strdup(p2p_data->host_username), p2p_data);
+			/* If the peer is a friend, set him connected */
+			f = yahoo_friend_find(p2p_data->gc, p2p_data->host_username);
+			if (f) {
+				if(p2p_data->connection_type == YAHOO_P2P_WE_ARE_SERVER) {
+					p2p_data->session_id = f->session_id;
+					yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_WE_ARE_SERVER);
+				}
+				else
+					yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_WE_ARE_CLIENT);
+			}
+		}
+}
+
+/* callback function associated with receiving of data, not considering receipt of multiple YMSG packets in a single TCP packet */
+static void yahoo_p2p_read_pkt_cb(gpointer data, gint source, PurpleInputCondition cond)
+{
+	guchar buf[1024];	/* is it safe to assume a fixed array length of 1024 ?? */
+	int len;
+	int pos = 0;
+	int pktlen;
+	struct yahoo_packet *pkt;
+	guchar *start = NULL;
+	struct yahoo_p2p_data *p2p_data;
+	YahooData *yd;
+
+	if(!(p2p_data = data))
+		return ;
+	yd = p2p_data->gc->proto_data;
+
+	len = read(source, buf, sizeof(buf));
+	if ((len < 0) && ((errno == EAGAIN) || (errno == EWOULDBLOCK)))
+		return ; /* No Worries*/
+	else if (len <= 0)
+	{
+		purple_debug_warning("yahoo","p2p: Error in connection, or host disconnected\n");
+		/* remove from p2p connection lists, also calls yahoo_p2p_disconnect_destroy_data */
+		if( g_hash_table_lookup(yd->peers, p2p_data->host_username) )
+			g_hash_table_remove(yd->peers,p2p_data->host_username);
+		else
+			yahoo_p2p_disconnect_destroy_data(data);
+		return;
+	}
+
+	if(len < YAHOO_PACKET_HDRLEN)
+		return;
+
+	if(strncmp((char *)buf, "YMSG", MIN(4, len)) != 0) {
+		/* Not a YMSG packet */
+		purple_debug_warning("yahoo","p2p: Got something other than YMSG packet\n");
+
+		start = memchr(buf + 1, 'Y', len - 1);
+		if (start == NULL)
+			return;
+
+		g_memmove(buf, start, len - (start - buf));
+		len -= start - buf;
+	}
+
+	pos += 4;	/* YMSG */
+	pos += 2;
+	pos += 2;
+
+	pktlen = yahoo_get16(buf + pos); pos += 2;
+	purple_debug_misc("yahoo", "p2p: %d bytes to read\n", len);
+
+	pkt = yahoo_packet_new(0, 0, 0);
+	pkt->service = yahoo_get16(buf + pos); pos += 2;
+	pkt->status = yahoo_get32(buf + pos); pos += 4;
+	pkt->id = yahoo_get32(buf + pos); pos += 4;
+
+	purple_debug_misc("yahoo", "p2p: Yahoo Service: 0x%02x Status: %d\n",pkt->service, pkt->status);
+	yahoo_packet_read(pkt, buf + pos, pktlen);
+
+	/* packet processing */
+	switch(pkt->service) {
+		case YAHOO_SERVICE_P2PFILEXFER:
+			yahoo_p2p_process_p2pfilexfer(data, source, pkt);
+			break;
+		case YAHOO_SERVICE_MESSAGE:
+			yahoo_process_message(p2p_data->gc, pkt, YAHOO_PKT_TYPE_P2P);
+			break;
+		case YAHOO_SERVICE_NOTIFY:
+			yahoo_process_notify(p2p_data->gc, pkt, YAHOO_PKT_TYPE_P2P);
+			break;
+		default:
+			purple_debug_warning("yahoo","p2p: p2p service %d Unhandled\n",pkt->service);
+	}
+
+	yahoo_packet_free(pkt);
+}
+
+static void yahoo_p2p_server_send_connected_cb(gpointer data, gint source, PurpleInputCondition cond)
+{
+	int acceptfd;
+	struct yahoo_p2p_data *p2p_data;
+	YahooData *yd;
+
+	if(!(p2p_data = data))
+		return ;
+	yd = p2p_data->gc->proto_data;
+
+	acceptfd = accept(source, NULL, 0);
+	if(acceptfd == -1 && (errno == EAGAIN || errno == EWOULDBLOCK))
+		return;
+	else if(acceptfd == -1) {
+		purple_debug_warning("yahoo","yahoo_p2p_server_send_connected_cb: accept: %s\n", g_strerror(errno));
+		yahoo_p2p_disconnect_destroy_data(data);
+		return;
+	}
+
+	/* remove timeout */
+	if (yd->yahoo_p2p_server_timeout_handle) {
+		purple_timeout_remove(yd->yahoo_p2p_server_timeout_handle);
+		yd->yahoo_p2p_server_timeout_handle = 0;
+	}
+
+	/* remove watcher and close p2p server */
+	if (yd->yahoo_p2p_server_watcher) {
+		purple_input_remove(yd->yahoo_p2p_server_watcher);
+		yd->yahoo_p2p_server_watcher = 0;
+	}
+	if (yd->yahoo_local_p2p_server_fd >= 0) {
+		close(yd->yahoo_local_p2p_server_fd);
+		yd->yahoo_local_p2p_server_fd = -1;
+	}
+
+	/* Add an Input Read event to the file descriptor */
+	p2p_data->input_event = purple_input_add(acceptfd, PURPLE_INPUT_READ, yahoo_p2p_read_pkt_cb, data);
+	p2p_data->source = acceptfd;
+}
+
+static gboolean yahoo_cancel_p2p_server_listen_cb(gpointer data)
+{
+	struct yahoo_p2p_data *p2p_data;
+	YahooData *yd;
+
+	if(!(p2p_data = data))
+		return FALSE;
+
+	yd = p2p_data->gc->proto_data;
+
+	purple_debug_warning("yahoo","yahoo p2p server timeout, peer failed to connect\n");
+	yahoo_p2p_disconnect_destroy_data(data);
+	purple_input_remove(yd->yahoo_p2p_server_watcher);
+	yd->yahoo_p2p_server_watcher = 0;
+	close(yd->yahoo_local_p2p_server_fd);
+	yd->yahoo_local_p2p_server_fd = -1;
+	yd->yahoo_p2p_server_timeout_handle = 0;
+
+	return FALSE;
+}
+
+static void yahoo_p2p_server_listen_cb(int listenfd, gpointer data)
+{
+	struct yahoo_p2p_data *p2p_data;
+	YahooData *yd;
+
+	if(!(p2p_data = data))
+		return ;
+
+	if(listenfd == -1) {
+		purple_debug_warning("yahoo","p2p: error starting p2p server\n");
+		yahoo_p2p_disconnect_destroy_data(data);
+		return;
+	}
+
+	yd = p2p_data->gc->proto_data;
+
+	/* Add an Input Read event to the file descriptor */
+	yd->yahoo_local_p2p_server_fd = listenfd;
+	yd->yahoo_p2p_server_watcher = purple_input_add(listenfd, PURPLE_INPUT_READ, yahoo_p2p_server_send_connected_cb,data);
+
+	/* add timeout */
+	yd->yahoo_p2p_server_timeout_handle = purple_timeout_add_seconds(YAHOO_P2P_SERVER_TIMEOUT, yahoo_cancel_p2p_server_listen_cb, data);
+}
+
+/* send p2p pkt containing our encoded ip, asking peer to connect to us */
+void yahoo_send_p2p_pkt(PurpleConnection *gc, const char *who, int val_13)
+{
+	const char *public_ip;
+	guint32 temp[4];
+	guint32 ip;
+	char temp_str[100];
+	gchar *base64_ip = NULL;
+	YahooFriend *f;
+	struct yahoo_packet *pkt;
+	PurpleAccount *account;
+	YahooData *yd = gc->proto_data;
+	struct yahoo_p2p_data *p2p_data;
+
+	f = yahoo_friend_find(gc, who);
+	account = purple_connection_get_account(gc);
+
+	/* Do not send invitation if already listening for other connection */
+	if(yd->yahoo_local_p2p_server_fd >= 0)
+		return;
+
+	/* One shouldn't try to connect to self */
+	if( strcmp(purple_normalize(account, purple_account_get_username(account)), who) == 0)
+		return;
+
+	/* send packet to only those friends who arent p2p connected and to whom we havent already sent. Do not send if this condition doesn't hold good */
+	if( !( f && (yahoo_friend_get_p2p_status(f) == YAHOO_P2PSTATUS_NOT_CONNECTED) && (f->p2p_packet_sent == 0)) )
+		return;
+
+	/* Dont send p2p packet to buddies of other protocols */
+	if(f->protocol)
+		return;
+
+	/* Finally, don't try to connect to buddies not online or on sms */
+	if( (f->status == YAHOO_STATUS_OFFLINE) || f->sms )
+		return;
+
+	public_ip = purple_network_get_public_ip();
+	if( (sscanf(public_ip, "%u.%u.%u.%u", &temp[0], &temp[1], &temp[2], &temp[3])) !=4 )
+		return ;
+
+	ip = (temp[3] << 24) | (temp[2] <<16) | (temp[1] << 8) | temp[0];
+	sprintf(temp_str, "%d", ip);
+	base64_ip = purple_base64_encode( (guchar *)temp_str, strlen(temp_str) );
+
+	pkt = yahoo_packet_new(YAHOO_SERVICE_PEERTOPEER, YAHOO_STATUS_AVAILABLE, 0);
+	yahoo_packet_hash(pkt, "sssissis",
+		1, purple_normalize(account, purple_account_get_username(account)),
+		4, purple_normalize(account, purple_account_get_username(account)),
+		12, base64_ip,	/* base64 encode ip */
+		61, 0,		/* To-do : figure out what is 61 for?? */
+		2, "",
+		5, who,
+		13, val_13,
+		49, "PEERTOPEER");
+	yahoo_packet_send_and_free(pkt, yd);
+
+	f->p2p_packet_sent = 1;	/* set p2p_packet_sent to sent */
+
+	p2p_data = g_new0(struct yahoo_p2p_data, 1);
+
+	p2p_data->gc = gc;
+	p2p_data->host_ip = NULL;
+	p2p_data->host_username = g_strdup(who);
+	p2p_data->val_13 = val_13;
+	p2p_data->connection_type = YAHOO_P2P_WE_ARE_SERVER;
+	p2p_data->source = -1;
+
+	purple_network_listen(YAHOO_PAGER_PORT_P2P, SOCK_STREAM, yahoo_p2p_server_listen_cb, p2p_data);
+
+	g_free(base64_ip);
+}
+
+/* function called when connection to p2p host is setup */
+static void yahoo_p2p_init_cb(gpointer data, gint source, const gchar *error_message)
+{
+	struct yahoo_p2p_data *p2p_data;
+	struct yahoo_packet *pkt_to_send;
+	PurpleAccount *account;
+	YahooData *yd;
+
+	p2p_data = data;
+	yd = p2p_data->gc->proto_data;
+
+	if(error_message != NULL) {
+		purple_debug_warning("yahoo","p2p: %s\n",error_message);
+		yahoo_send_p2p_pkt(p2p_data->gc, p2p_data->host_username, 2);/* send p2p init packet with val_13=2 */
+
+		yahoo_p2p_disconnect_destroy_data(p2p_data);
+		return;
+	}
+
+	/* Add an Input Read event to the file descriptor */
+	p2p_data->input_event = purple_input_add(source, PURPLE_INPUT_READ, yahoo_p2p_read_pkt_cb, data);
+	p2p_data->source = source;
+
+	account = purple_connection_get_account(p2p_data->gc);
+
+	/* Build the yahoo packet */
+	pkt_to_send = yahoo_packet_new(YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, yd->session_id);
+	yahoo_packet_hash(pkt_to_send, "ssisi",
+		4, purple_normalize(account, purple_account_get_username(account)),
+		5, p2p_data->host_username,
+		241, 0,		/* Protocol identifier */
+		49, "PEERTOPEER",
+		13, 1);		/* we receive key13= 0 or 2, we send key13=1 */
+
+	yahoo_p2p_write_pkt(source, pkt_to_send);	/* build raw packet and send */
+	yahoo_packet_free(pkt_to_send);
 }
 
 static void yahoo_process_p2p(PurpleConnection *gc, struct yahoo_packet *pkt)
@@ -2242,6 +2626,14 @@ static void yahoo_process_p2p(PurpleConnection *gc, struct yahoo_packet *pkt)
 	char *base64 = NULL;
 	guchar *decoded;
 	gsize len;
+	gint val_13 = 0;
+	gint val_11 = 0;
+	PurpleAccount *account;
+	YahooFriend *f;
+
+	/* if status is not 1 ie YAHOO_STATUS_BRB, the packet bounced back, so contains our own ip */
+	if(!(pkt->status == YAHOO_STATUS_BRB))
+		return ;
 
 	while (l) {
 		struct yahoo_pair *pair = l->data;
@@ -2261,14 +2653,21 @@ static void yahoo_process_p2p(PurpleConnection *gc, struct yahoo_packet *pkt)
 			/* so, this is an ip address. in base64. decoded it's in ascii.
 			   after strtol, it's in reversed byte order. Who thought this up?*/
 			break;
+		case 13:
+			val_13 = strtol(pair->value, NULL, 10);
+			break;
+		case 11:
+			val_11 = strtol(pair->value, NULL, 10);		/* session id of peer */
+			if( (f = yahoo_friend_find(gc, who)) )
+				f->session_id = val_11;
+			break;
 		/*
 			TODO: figure these out
 			yahoo: Key: 61          Value: 0
 			yahoo: Key: 2   Value:
-			yahoo: Key: 13          Value: 0
+			yahoo: Key: 13          Value: 0	packet count ??
 			yahoo: Key: 49          Value: PEERTOPEER
 			yahoo: Key: 140         Value: 1
-			yahoo: Key: 11          Value: -1786225828
 		*/
 
 		}
@@ -2278,8 +2677,9 @@ static void yahoo_process_p2p(PurpleConnection *gc, struct yahoo_packet *pkt)
 
 	if (base64) {
 		guint32 ip;
-		char *tmp2;
 		YahooFriend *f;
+		char *host_ip;
+		struct yahoo_p2p_data *p2p_data;
 
 		decoded = purple_base64_decode(base64, &len);
 		if (len) {
@@ -2288,16 +2688,40 @@ static void yahoo_process_p2p(PurpleConnection *gc, struct yahoo_packet *pkt)
 			g_free(tmp);
 		}
 
-		tmp2 = g_strndup((const gchar *)decoded, len); /* so its \0 terminated...*/
-		ip = strtol(tmp2, NULL, 10);
-		g_free(tmp2);
+		ip = strtol((gchar *)decoded, NULL, 10);
 		g_free(decoded);
-		tmp2 = g_strdup_printf("%u.%u.%u.%u", ip & 0xff, (ip >> 8) & 0xff, (ip >> 16) & 0xff,
+		host_ip = g_strdup_printf("%u.%u.%u.%u", ip & 0xff, (ip >> 8) & 0xff, (ip >> 16) & 0xff,
 		                       (ip >> 24) & 0xff);
 		f = yahoo_friend_find(gc, who);
 		if (f)
-			yahoo_friend_set_ip(f, tmp2);
-		g_free(tmp2);
+			yahoo_friend_set_ip(f, host_ip);
+		purple_debug_info("yahoo", "IP : %s\n", host_ip);
+
+		account = purple_connection_get_account(gc);
+
+		if(val_11==0) {
+			if(!f)
+				return;
+			else
+				val_11 = f->session_id;
+		}
+
+		p2p_data = g_new0(struct yahoo_p2p_data, 1);
+		p2p_data->host_username = g_strdup(who);
+		p2p_data->val_13 = val_13;
+		p2p_data->session_id = val_11;
+		p2p_data->host_ip = host_ip;
+		p2p_data->gc = gc;
+		p2p_data->connection_type = YAHOO_P2P_WE_ARE_CLIENT;
+		p2p_data->source = -1;
+
+		/* connect to host */
+		if((purple_proxy_connect(gc, account, host_ip, YAHOO_PAGER_PORT_P2P, yahoo_p2p_init_cb, p2p_data))==NULL) {
+			purple_debug_info("yahoo","p2p: Connection to %s failed\n", host_ip);
+			g_free(p2p_data->host_ip);
+			g_free(p2p_data->host_username);
+			g_free(p2p_data);
+		}
 	}
 }
 
@@ -2377,12 +2801,12 @@ static void yahoo_packet_process(PurpleConnection *gc, struct yahoo_packet *pkt)
 		yahoo_process_status(gc, pkt);
 		break;
 	case YAHOO_SERVICE_NOTIFY:
-		yahoo_process_notify(gc, pkt);
+		yahoo_process_notify(gc, pkt, YAHOO_PKT_TYPE_SERVER);
 		break;
 	case YAHOO_SERVICE_MESSAGE:
 	case YAHOO_SERVICE_GAMEMSG:
 	case YAHOO_SERVICE_CHATMSG:
-		yahoo_process_message(gc, pkt);
+		yahoo_process_message(gc, pkt, YAHOO_PKT_TYPE_SERVER);
 		break;
 	case YAHOO_SERVICE_SYSMESSAGE:
 		yahoo_process_sysmessage(gc, pkt);
@@ -2459,7 +2883,8 @@ static void yahoo_packet_process(PurpleConnection *gc, struct yahoo_packet *pkt)
 		break;
 	case YAHOO_SERVICE_P2PFILEXFER:
 		/* This case had no break and continued; thus keeping it this way.*/
-		yahoo_process_p2pfilexfer(gc, pkt);
+		yahoo_process_p2p(gc, pkt);	/* P2PFILEXFER handled the same way as process_p2p */
+		yahoo_process_p2pfilexfer(gc, pkt);	/* redundant ??, need to have a break now */
 	case YAHOO_SERVICE_FILETRANSFER:
 		yahoo_process_filetransfer(gc, pkt);
 		break;
@@ -2469,21 +2894,22 @@ static void yahoo_packet_process(PurpleConnection *gc, struct yahoo_packet *pkt)
 	case YAHOO_SERVICE_PICTURE:
 		yahoo_process_picture(gc, pkt);
 		break;
-	case YAHOO_SERVICE_PICTURE_UPDATE:
-		yahoo_process_picture_update(gc, pkt);
-		break;
 	case YAHOO_SERVICE_PICTURE_CHECKSUM:
 		yahoo_process_picture_checksum(gc, pkt);
 		break;
 	case YAHOO_SERVICE_PICTURE_UPLOAD:
 		yahoo_process_picture_upload(gc, pkt);
 		break;
+	case YAHOO_SERVICE_PICTURE_UPDATE:
 	case YAHOO_SERVICE_AVATAR_UPDATE:
 		yahoo_process_avatar_update(gc, pkt);
 		break;
 	case YAHOO_SERVICE_AUDIBLE:
 		yahoo_process_audible(gc, pkt);
 		break;
+	case YAHOO_SERVICE_CONTACT_DETAILS:
+		yahoo_process_contact_details(gc, pkt);
+		break;
 	case YAHOO_SERVICE_FILETRANS_15:
 		yahoo_process_filetrans_15(gc, pkt);
 		break;
@@ -2493,10 +2919,12 @@ static void yahoo_packet_process(PurpleConnection *gc, struct yahoo_packet *pkt)
 	case YAHOO_SERVICE_FILETRANS_ACC_15:
 		yahoo_process_filetrans_acc_15(gc, pkt);
 		break;
+	case YAHOO_SERVICE_SMS_MSG:
+		yahoo_process_sms_message(gc, pkt);
+		break;
 
 	default:
-		purple_debug(PURPLE_DEBUG_ERROR, "yahoo",
-				   "Unhandled service 0x%02x\n", pkt->service);
+		purple_debug_error("yahoo", "Unhandled service 0x%02x\n", pkt->service);
 		break;
 	}
 }
@@ -2504,7 +2932,7 @@ static void yahoo_packet_process(PurpleConnection *gc, struct yahoo_packet *pkt)
 static void yahoo_pending(gpointer data, gint source, PurpleInputCondition cond)
 {
 	PurpleConnection *gc = data;
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	char buf[1024];
 	int len;
 
@@ -2517,14 +2945,14 @@ static void yahoo_pending(gpointer data, gint source, PurpleInputCondition cond)
 			/* No worries */
 			return;
 
-		tmp = g_strdup_printf(_("Lost connection with server:\n%s"),
+		tmp = g_strdup_printf(_("Lost connection with server: %s"),
 				g_strerror(errno));
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
 		return;
 	} else if (len == 0) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Server closed the connection."));
+				_("Server closed the connection"));
 		return;
 	}
 	gc->last_received = time(NULL);
@@ -2565,8 +2993,7 @@ static void yahoo_pending(gpointer data, gint source, PurpleInputCondition cond)
 		pos += 2;
 
 		pktlen = yahoo_get16(yd->rxqueue + pos); pos += 2;
-		purple_debug(PURPLE_DEBUG_MISC, "yahoo",
-				   "%d bytes to read, rxlen is %d\n", pktlen, yd->rxlen);
+		purple_debug_misc("yahoo", "%d bytes to read, rxlen is %d\n", pktlen, yd->rxlen);
 
 		if (yd->rxlen < (YAHOO_PACKET_HDRLEN + pktlen))
 			return;
@@ -2577,8 +3004,7 @@ static void yahoo_pending(gpointer data, gint source, PurpleInputCondition cond)
 
 		pkt->service = yahoo_get16(yd->rxqueue + pos); pos += 2;
 		pkt->status = yahoo_get32(yd->rxqueue + pos); pos += 4;
-		purple_debug(PURPLE_DEBUG_MISC, "yahoo",
-				   "Yahoo Service: 0x%02x Status: %d\n",
+		purple_debug_misc("yahoo", "Yahoo Service: 0x%02x Status: %d\n",
 				   pkt->service, pkt->status);
 		pkt->id = yahoo_get32(yd->rxqueue + pos); pos += 4;
 
@@ -2603,18 +3029,12 @@ static void yahoo_pending(gpointer data, gint source, PurpleInputCondition cond)
 static void yahoo_got_connected(gpointer data, gint source, const gchar *error_message)
 {
 	PurpleConnection *gc = data;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	struct yahoo_packet *pkt;
 
-	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
-		close(source);
-		return;
-	}
-
 	if (source < 0) {
 		gchar *tmp;
-		tmp = g_strdup_printf(_("Could not establish a connection with the server:\n%s"),
-				error_message);
+		tmp = g_strdup_printf(_("Unable to connect: %s"), error_message);
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
 		return;
@@ -2623,7 +3043,7 @@ static void yahoo_got_connected(gpointer data, gint source, const gchar *error_m
 	yd = gc->proto_data;
 	yd->fd = source;
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH, yd->current_status, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH, yd->current_status, yd->session_id);
 
 	yahoo_packet_hash_str(pkt, 1, purple_normalize(gc->account, purple_account_get_username(purple_connection_get_account(gc))));
 	yahoo_packet_send_and_free(pkt, yd);
@@ -2635,18 +3055,12 @@ static void yahoo_got_connected(gpointer data, gint source, const gchar *error_m
 static void yahoo_got_web_connected(gpointer data, gint source, const gchar *error_message)
 {
 	PurpleConnection *gc = data;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	struct yahoo_packet *pkt;
 
-	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
-		close(source);
-		return;
-	}
-
 	if (source < 0) {
 		gchar *tmp;
-		tmp = g_strdup_printf(_("Could not establish a connection with the server:\n%s"),
-				error_message);
+		tmp = g_strdup_printf(_("Unable to connect: %s"), error_message);
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
 		return;
@@ -2655,7 +3069,7 @@ static void yahoo_got_web_connected(gpointer data, gint source, const gchar *err
 	yd = gc->proto_data;
 	yd->fd = source;
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_WEBLOGIN, YAHOO_STATUS_WEBLOGIN, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_WEBLOGIN, YAHOO_STATUS_WEBLOGIN, yd->session_id);
 
 	yahoo_packet_hash(pkt, "sss", 0,
 	                  purple_normalize(gc->account, purple_account_get_username(purple_connection_get_account(gc))),
@@ -2671,7 +3085,7 @@ static void yahoo_web_pending(gpointer data, gint source, PurpleInputCondition c
 {
 	PurpleConnection *gc = data;
 	PurpleAccount *account = purple_connection_get_account(gc);
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	char bufread[2048], *i = bufread, *buf = bufread;
 	int len;
 	GString *s;
@@ -2685,14 +3099,14 @@ static void yahoo_web_pending(gpointer data, gint source, PurpleInputCondition c
 			/* No worries */
 			return;
 
-		tmp = g_strdup_printf(_("Lost connection with server:\n%s"),
+		tmp = g_strdup_printf(_("Lost connection with server: %s"),
 				g_strerror(errno));
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
 		return;
 	} else if (len == 0) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Server closed the connection."));
+				_("Server closed the connection"));
 		return;
 	}
 
@@ -2708,7 +3122,7 @@ static void yahoo_web_pending(gpointer data, gint source, PurpleInputCondition c
 	if ((strncmp(buf, "HTTP/1.0 302", strlen("HTTP/1.0 302")) &&
 			  strncmp(buf, "HTTP/1.1 302", strlen("HTTP/1.1 302")))) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Received unexpected HTTP response from server."));
+			_("Received unexpected HTTP response from server"));
 		purple_debug_misc("yahoo", "Unexpected HTTP response: %s\n", buf);
 		return;
 	}
@@ -2720,7 +3134,7 @@ static void yahoo_web_pending(gpointer data, gint source, PurpleInputCondition c
 		i += strlen("Set-Cookie: ");
 		for (;*i != ';' && *i != '\0'; i++)
 			g_string_append_c(s, *i);
-        
+
 		g_string_append(s, "; ");
 		/* Should these cookies be included too when trying for xfer?
 		 * It seems to work without these
@@ -2738,7 +3152,7 @@ static void yahoo_web_pending(gpointer data, gint source, PurpleInputCondition c
 	                         purple_account_get_int(account, "port", YAHOO_PAGER_PORT),
 	                         yahoo_got_web_connected, gc) == NULL) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-		                               _("Connection problem"));
+		                               _("Unable to connect"));
 		return;
 	}
 }
@@ -2746,7 +3160,7 @@ static void yahoo_web_pending(gpointer data, gint source, PurpleInputCondition c
 static void yahoo_got_cookies_send_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	PurpleConnection *gc;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	int written, remaining;
 
 	gc = data;
@@ -2764,7 +3178,7 @@ static void yahoo_got_cookies_send_cb(gpointer data, gint source, PurpleInputCon
 		if (gc->inpa)
 			purple_input_remove(gc->inpa);
 		gc->inpa = 0;
-		tmp = g_strdup_printf(_("Lost connection with %s:\n%s"),
+		tmp = g_strdup_printf(_("Lost connection with %s: %s"),
 				"login.yahoo.com:80", g_strerror(errno));
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
@@ -2789,7 +3203,7 @@ static void yahoo_got_cookies(gpointer data, gint source, const gchar *error_mes
 
 	if (source < 0) {
 		gchar *tmp;
-		tmp = g_strdup_printf(_("Could not establish a connection with %s:\n%s"),
+		tmp = g_strdup_printf(_("Unable to establish a connection with %s: %s"),
 				"login.yahoo.com:80", error_message);
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
@@ -2860,7 +3274,7 @@ yahoo_login_page_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 {
 	PurpleConnection *gc = (PurpleConnection *)user_data;
 	PurpleAccount *account = purple_connection_get_account(gc);
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	const char *sn = purple_account_get_username(account);
 	const char *pass = purple_connection_get_password(gc);
 	GHashTable *hash = yahoo_login_page_hash(url_text, len);
@@ -2926,13 +3340,13 @@ yahoo_login_page_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 	yd->auth = g_string_free(url, FALSE);
 	if (purple_proxy_connect(gc, account, "login.yahoo.com", 80, yahoo_got_cookies, gc) == NULL) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-		                               _("Connection problem"));
+		                               _("Unable to connect"));
 		return;
 	}
 
 	purple_cipher_context_destroy(context);
 }
-#endif
+#endif /* TRY_WEBMESSENGER_LOGIN */
 
 static void yahoo_server_check(PurpleAccount *account)
 {
@@ -2940,7 +3354,8 @@ static void yahoo_server_check(PurpleAccount *account)
 
 	server = purple_account_get_string(account, "server", YAHOO_PAGER_HOST);
 
-	if (strcmp(server, "scs.yahoo.com") == 0)
+	if (*server == '\0' || g_str_equal(server, "scs.yahoo.com") ||
+			g_str_equal(server, "scs.msg.yahoo.com"))
 		purple_account_set_string(account, "server", YAHOO_PAGER_HOST);
 }
 
@@ -2998,16 +3413,21 @@ static int get_yahoo_status_from_purple_status(PurpleStatus *status)
 	}
 }
 
-static void yahoo_login(PurpleAccount *account) {
+void yahoo_login(PurpleAccount *account) {
 	PurpleConnection *gc = purple_account_get_connection(account);
-	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
+	YahooData *yd = gc->proto_data = g_new0(YahooData, 1);
 	PurpleStatus *status = purple_account_get_active_status(account);
+	const char *server = NULL;
+	int pager_port = 0;
+
 	gc->flags |= PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_NO_URLDESC;
 
 	purple_connection_update_progress(gc, _("Connecting"), 1, 2);
 
 	purple_connection_set_display_name(gc, purple_account_get_username(account));
 
+	yd->gc = gc;
+	yd->yahoo_local_p2p_server_fd = -1;
 	yd->fd = -1;
 	yd->txhandler = 0;
 	/* TODO: Is there a good grow size for the buffer? */
@@ -3015,42 +3435,34 @@ static void yahoo_login(PurpleAccount *account) {
 	yd->friends = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, yahoo_friend_free);
 	yd->imvironments = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 	yd->xfer_peer_idstring_map = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
+	yd->peers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+					yahoo_p2p_disconnect_destroy_data);
+	yd->sms_carrier = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+	yd->yahoo_p2p_timer = purple_timeout_add_seconds(YAHOO_P2P_KEEPALIVE_SECS,
+					yahoo_p2p_keepalive, gc);
 	yd->confs = NULL;
 	yd->conf_id = 2;
 	yd->last_keepalive = yd->last_ping = time(NULL);
 
 	yd->current_status = get_yahoo_status_from_purple_status(status);
+	yd->jp = yahoo_is_japan(account);
 
 	yahoo_server_check(account);
 	yahoo_picture_check(account);
 
-	if (purple_account_get_bool(account, "yahoojp", FALSE)) {
-		yd->jp = TRUE;
-		if (purple_proxy_connect(gc, account,
-		                       purple_account_get_string(account, "serverjp",  YAHOOJP_PAGER_HOST),
-		                       purple_account_get_int(account, "port", YAHOO_PAGER_PORT),
-		                       yahoo_got_connected, gc) == NULL)
-		{
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			                               _("Connection problem"));
-			return;
-		}
-	} else {
-		yd->jp = FALSE;
-		if (purple_proxy_connect(gc, account,
-		                       purple_account_get_string(account, "server",  YAHOO_PAGER_HOST),
-		                       purple_account_get_int(account, "port", YAHOO_PAGER_PORT),
-		                       yahoo_got_connected, gc) == NULL)
-		{
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			                               _("Connection problem"));
-			return;
-		}
-	}
+	server = purple_account_get_string(account, "server",
+					yd->jp ? YAHOOJP_PAGER_HOST : YAHOO_PAGER_HOST);
+	pager_port = purple_account_get_int(account, "port", YAHOO_PAGER_PORT);
+
+	if (purple_proxy_connect(gc, account, server, pager_port, yahoo_got_connected, gc) == NULL)
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+						_("Unable to connect"));
+
+	return;
 }
 
-static void yahoo_close(PurpleConnection *gc) {
-	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
+void yahoo_close(PurpleConnection *gc) {
+	YahooData *yd = (YahooData *)gc->proto_data;
 	GSList *l;
 
 	if (gc->inpa)
@@ -3080,6 +3492,24 @@ static void yahoo_close(PurpleConnection *gc) {
 	if (yd->in_chat)
 		yahoo_c_leave(gc, 1); /* 1 = YAHOO_CHAT_ID */
 
+	purple_timeout_remove(yd->yahoo_p2p_timer);
+	if(yd->yahoo_p2p_server_timeout_handle != 0) {
+		purple_timeout_remove(yd->yahoo_p2p_server_timeout_handle);
+		yd->yahoo_p2p_server_timeout_handle = 0;
+	}
+
+	/* close p2p server if it is waiting for a peer to connect */
+	if (yd->yahoo_p2p_server_watcher) {
+		purple_input_remove(yd->yahoo_p2p_server_watcher);
+		yd->yahoo_p2p_server_watcher = 0;
+	}
+	if (yd->yahoo_local_p2p_server_fd >= 0) {
+		close(yd->yahoo_local_p2p_server_fd);
+		yd->yahoo_local_p2p_server_fd = -1;
+	}
+
+	g_hash_table_destroy(yd->sms_carrier);
+	g_hash_table_destroy(yd->peers);
 	g_hash_table_destroy(yd->friends);
 	g_hash_table_destroy(yd->imvironments);
 	g_hash_table_destroy(yd->xfer_peer_idstring_map);
@@ -3111,6 +3541,9 @@ static void yahoo_close(PurpleConnection *gc) {
 	g_free(yd->pending_chat_id);
 	g_free(yd->pending_chat_topic);
 	g_free(yd->pending_chat_goto);
+	g_strfreev(yd->profiles);
+
+	yahoo_personal_details_reset(&yd->ypd, TRUE);
 
 	g_free(yd->current_list15_grp);
 
@@ -3118,16 +3551,16 @@ static void yahoo_close(PurpleConnection *gc) {
 	gc->proto_data = NULL;
 }
 
-static const char *yahoo_list_icon(PurpleAccount *a, PurpleBuddy *b)
+const char *yahoo_list_icon(PurpleAccount *a, PurpleBuddy *b)
 {
 	return "yahoo";
 }
 
-static const char *yahoo_list_emblem(PurpleBuddy *b)
+const char *yahoo_list_emblem(PurpleBuddy *b)
 {
 	PurpleAccount *account;
 	PurpleConnection *gc;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	YahooFriend *f;
 	PurplePresence *presence;
 
@@ -3190,7 +3623,7 @@ static void yahoo_initiate_conference(PurpleBlistNode *node, gpointer data) {
 	PurpleConnection *gc;
 
 	GHashTable *components;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	int id;
 
 	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
@@ -3227,7 +3660,7 @@ static void yahoo_game(PurpleBlistNode *node, gpointer data) {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
 
-	struct yahoo_data *yd;
+	YahooData *yd;
 	const char *game;
 	char *game2;
 	char *t;
@@ -3238,7 +3671,7 @@ static void yahoo_game(PurpleBlistNode *node, gpointer data) {
 
 	buddy = (PurpleBuddy *) node;
 	gc = purple_account_get_connection(purple_buddy_get_account(buddy));
-	yd = (struct yahoo_data *) gc->proto_data;
+	yd = (YahooData *) gc->proto_data;
 
 	f = yahoo_friend_find(gc, purple_buddy_get_name(buddy));
 	if (!f)
@@ -3257,15 +3690,20 @@ static void yahoo_game(PurpleBlistNode *node, gpointer data) {
 	g_free(game2);
 }
 
-static char *yahoo_status_text(PurpleBuddy *b)
+char *yahoo_status_text(PurpleBuddy *b)
 {
 	YahooFriend *f = NULL;
 	const char *msg;
 	char *msg2;
 	PurpleAccount *account;
+	PurpleConnection *gc;
 
 	account = purple_buddy_get_account(b);
-	f = yahoo_friend_find(purple_account_get_connection(account), purple_buddy_get_name(b));
+	gc = purple_account_get_connection(account);
+	if (!gc || !purple_connection_get_protocol_data(gc))
+		return NULL;
+
+	f = yahoo_friend_find(gc, purple_buddy_get_name(b));
 	if (!f)
 		return g_strdup(_("Not on server list"));
 
@@ -3338,6 +3776,26 @@ void yahoo_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolea
 
 	if (presence != NULL)
 		purple_notify_user_info_add_pair(user_info, _("Presence"), presence);
+
+	if (f && full) {
+		YahooPersonalDetails *ypd = &f->ypd;
+		int i;
+		struct {
+			char *id;
+			char *text;
+			char *value;
+		} yfields[] = {
+			{"hp", N_("Home Phone Number"), ypd->phone.home},
+			{"wp", N_("Work Phone Number"), ypd->phone.work},
+			{"mo", N_("Mobile Phone Number"), ypd->phone.mobile},
+			{NULL, NULL, NULL}
+		};
+		for (i = 0; yfields[i].id; i++) {
+			if (!yfields[i].value || !*yfields[i].value)
+				continue;
+			purple_notify_user_info_add_pair(user_info, _(yfields[i].text), yfields[i].value);
+		}
+	}
 }
 
 static void yahoo_addbuddyfrommenu_cb(PurpleBlistNode *node, gpointer data)
@@ -3370,7 +3828,7 @@ static void yahoo_chat_goto_menu(PurpleBlistNode *node, gpointer data)
 static GList *build_presence_submenu(YahooFriend *f, PurpleConnection *gc) {
 	GList *m = NULL;
 	PurpleMenuAction *act;
-	struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data;
+	YahooData *yd = (YahooData *) gc->proto_data;
 
 	if (yd->current_status == YAHOO_STATUS_INVISIBLE) {
 		if (f->presence != YAHOO_PRESENCE_ONLINE) {
@@ -3414,13 +3872,23 @@ static void yahoo_doodle_blist_node(PurpleBlistNode *node, gpointer data)
 	yahoo_doodle_initiate(gc, purple_buddy_get_name(b));
 }
 
+static void
+yahoo_userinfo_blist_node(PurpleBlistNode *node, gpointer data)
+{
+	PurpleBuddy *b = (PurpleBuddy *)node;
+	PurpleAccount *account = purple_buddy_get_account(b);
+	PurpleConnection *gc = purple_account_get_connection(account);
+
+	yahoo_set_userinfo_for_buddy(gc, b);
+}
+
 static GList *yahoo_buddy_menu(PurpleBuddy *buddy)
 {
 	GList *m = NULL;
 	PurpleMenuAction *act;
 
 	PurpleConnection *gc = purple_account_get_connection(purple_buddy_get_account(buddy));
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	static char buf2[1024];
 	YahooFriend *f;
 
@@ -3475,19 +3943,22 @@ static GList *yahoo_buddy_menu(PurpleBuddy *buddy)
 		act = purple_menu_action_new(_("Presence Settings"), NULL, NULL,
 		                           build_presence_submenu(f, gc));
 		m = g_list_append(m, act);
-	}
 
-	if (f) {
 		act = purple_menu_action_new(_("Start Doodling"),
 		                           PURPLE_CALLBACK(yahoo_doodle_blist_node),
 		                           NULL, NULL);
 		m = g_list_append(m, act);
+
+		act = purple_menu_action_new(_("Set User Info..."),
+		                           PURPLE_CALLBACK(yahoo_userinfo_blist_node),
+		                           NULL, NULL);
+		m = g_list_append(m, act);
 	}
 
 	return m;
 }
 
-static GList *yahoo_blist_node_menu(PurpleBlistNode *node)
+GList *yahoo_blist_node_menu(PurpleBlistNode *node)
 {
 	if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
 		return yahoo_buddy_menu((PurpleBuddy *) node);
@@ -3496,15 +3967,16 @@ static GList *yahoo_blist_node_menu(PurpleBlistNode *node)
 	}
 }
 
-static void yahoo_act_id(PurpleConnection *gc, const char *entry)
+static void yahoo_act_id(PurpleConnection *gc, PurpleRequestFields *fields)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
+	const char *name = yd->profiles[purple_request_fields_get_choice(fields, "id")];
 
-	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_IDACT, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash_str(pkt, 3, entry);
+	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_IDACT, YAHOO_STATUS_AVAILABLE, yd->session_id);
+	yahoo_packet_hash_str(pkt, 3, name);
 	yahoo_packet_send_and_free(pkt, yd);
 
-	purple_connection_set_display_name(gc, entry);
+	purple_connection_set_display_name(gc, name);
 }
 
 static void
@@ -3514,10 +3986,10 @@ yahoo_get_inbox_token_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 	PurpleConnection *gc = user_data;
 	gboolean set_cookie = FALSE;
 	gchar *url;
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 
 	g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc));
-	
+
 	yd->url_datas = g_slist_remove(yd->url_datas, url_data);
 
 	if (error_message != NULL)
@@ -3550,7 +4022,7 @@ static void yahoo_show_inbox(PurplePluginAction *action)
 	/* XXX I have no idea how this will work with Yahoo! Japan. */
 
 	PurpleConnection *gc = action->context;
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 
 	PurpleUtilFetchUrlData *url_data;
 	const char* base_url = "http://login.yahoo.com";
@@ -3559,14 +4031,15 @@ static void yahoo_show_inbox(PurplePluginAction *action)
 	gchar *request = g_strdup_printf(
 		"POST %s/config/cookie_token HTTP/1.0\r\n"
 		"Cookie: T=%s; path=/; domain=.yahoo.com; Y=%s;\r\n"
-		"User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
+		"User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
 		"Host: login.yahoo.com\r\n"
 		"Content-Length: 0\r\n\r\n",
 		use_whole_url ? base_url : "",
 		yd->cookie_t, yd->cookie_y);
 
-	url_data = purple_util_fetch_url_request(base_url, use_whole_url,
-			"Mozilla/4.0 (compatible; MSIE 5.5)", TRUE, request, FALSE,
+	url_data = purple_util_fetch_url_request_len_with_account(
+			purple_connection_get_account(gc), base_url, use_whole_url,
+			YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1,
 			yahoo_get_inbox_token_cb, gc);
 
 	g_free(request);
@@ -3579,15 +4052,38 @@ static void yahoo_show_inbox(PurplePluginAction *action)
 				   "Unable to request mail login token; forwarding to login screen.");
 		purple_notify_uri(gc, yahoo_mail_url);
 	}
-
 }
 
+static void
+yahoo_set_userinfo_fn(PurplePluginAction *action)
+{
+	yahoo_set_userinfo(action->context);
+}
 
 static void yahoo_show_act_id(PurplePluginAction *action)
 {
+	PurpleRequestFields *fields;
+	PurpleRequestFieldGroup *group;
+	PurpleRequestField *field;
 	PurpleConnection *gc = (PurpleConnection *) action->context;
-	purple_request_input(gc, NULL, _("Activate which ID?"), NULL,
-					   purple_connection_get_display_name(gc), FALSE, FALSE, NULL,
+	YahooData *yd = purple_connection_get_protocol_data(gc);
+	const char *name = purple_connection_get_display_name(gc);
+	int iter;
+
+	fields = purple_request_fields_new();
+	group = purple_request_field_group_new(NULL);
+	purple_request_fields_add_group(fields, group);
+	field = purple_request_field_choice_new("id", "Activate which ID?", 0);
+	purple_request_field_group_add_field(group, field);
+
+	for (iter = 0; yd->profiles[iter]; iter++) {
+		purple_request_field_choice_add(field, yd->profiles[iter]);
+		if (purple_strequal(yd->profiles[iter], name))
+			purple_request_field_choice_set_default_value(field, iter);
+	}
+
+	purple_request_fields(gc, NULL, _("Select the ID you want to activate"), NULL,
+					   fields,
 					   _("OK"), G_CALLBACK(yahoo_act_id),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
@@ -3605,10 +4101,14 @@ static void yahoo_show_chat_goto(PurplePluginAction *action)
 					   gc);
 }
 
-static GList *yahoo_actions(PurplePlugin *plugin, gpointer context) {
+GList *yahoo_actions(PurplePlugin *plugin, gpointer context) {
 	GList *m = NULL;
 	PurplePluginAction *act;
 
+	act = purple_plugin_action_new(_("Set User Info..."),
+			yahoo_set_userinfo_fn);
+	m = g_list_append(m, act);
+
 	act = purple_plugin_action_new(_("Activate ID..."),
 			yahoo_show_act_id);
 	m = g_list_append(m, act);
@@ -3625,10 +4125,128 @@ static GList *yahoo_actions(PurplePlugin *plugin, gpointer context) {
 	return m;
 }
 
-static int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what, PurpleMessageFlags flags)
+struct yahoo_sms_carrier_cb_data	{
+	PurpleConnection *gc;
+	char *who;
+	char *what;
+};
+
+static void yahoo_get_sms_carrier_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
+		const gchar *webdata, size_t len, const gchar *error_message)
 {
-	struct yahoo_data *yd = gc->proto_data;
-	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE, 0);
+	struct yahoo_sms_carrier_cb_data *sms_cb_data = user_data;
+	PurpleConnection *gc = sms_cb_data->gc;
+	YahooData *yd = gc->proto_data;
+	char *mobile_no = NULL;
+	char *status = NULL;
+	char *carrier = NULL;
+	PurpleAccount *account = purple_connection_get_account(gc);
+	PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, sms_cb_data->who, account);
+
+	if (error_message != NULL) {
+		purple_conversation_write(conv, NULL, "Cant send SMS, Unable to obtain mobile carrier", PURPLE_MESSAGE_SYSTEM, time(NULL));
+
+		g_free(sms_cb_data->who);
+		g_free(sms_cb_data->what);
+		g_free(sms_cb_data);
+		return ;
+	}
+	else if (len > 0 && webdata && *webdata) {
+		xmlnode *validate_data_root = xmlnode_from_str(webdata, -1);
+		xmlnode *validate_data_child = xmlnode_get_child(validate_data_root, "mobile_no");
+		mobile_no = (char *)xmlnode_get_attrib(validate_data_child, "msisdn");
+
+		validate_data_root = xmlnode_copy(validate_data_child);
+		validate_data_child = xmlnode_get_child(validate_data_root, "status");
+		status = xmlnode_get_data(validate_data_child);
+
+		validate_data_child = xmlnode_get_child(validate_data_root, "carrier");
+		carrier = xmlnode_get_data(validate_data_child);
+
+		purple_debug_info("yahoo","SMS validate data: Mobile:%s, Status:%s, Carrier:%s\n", mobile_no, status, carrier);
+
+		if( strcmp(status, "Valid") == 0) {
+			g_hash_table_insert(yd->sms_carrier, g_strdup_printf("+%s", mobile_no), g_strdup(carrier));
+			yahoo_send_im(sms_cb_data->gc, sms_cb_data->who, sms_cb_data->what, PURPLE_MESSAGE_SEND);
+		}
+		else	{
+			g_hash_table_insert(yd->sms_carrier, g_strdup_printf("+%s", mobile_no), g_strdup("Unknown"));
+			purple_conversation_write(conv, NULL, "Cant send SMS, Unknown mobile carrier", PURPLE_MESSAGE_SYSTEM, time(NULL));
+		}
+
+		xmlnode_free(validate_data_child);
+		xmlnode_free(validate_data_root);
+		g_free(sms_cb_data->who);
+		g_free(sms_cb_data->what);
+		g_free(sms_cb_data);
+		g_free(mobile_no);
+		g_free(status);
+		g_free(carrier);
+	}
+}
+
+static void yahoo_get_sms_carrier(PurpleConnection *gc, gpointer data)
+{
+	YahooData *yd = gc->proto_data;
+	PurpleUtilFetchUrlData *url_data;
+	struct yahoo_sms_carrier_cb_data *sms_cb_data;
+	char *validate_request_str = NULL;
+	char *request = NULL;
+	gboolean use_whole_url = FALSE;
+	xmlnode *validate_request_root = NULL;
+	xmlnode *validate_request_child = NULL;
+
+	if(!(sms_cb_data = data))
+		return;
+
+	validate_request_root = xmlnode_new("validate");
+	xmlnode_set_attrib(validate_request_root, "intl", "us");
+	xmlnode_set_attrib(validate_request_root, "version", YAHOO_CLIENT_VERSION);
+	xmlnode_set_attrib(validate_request_root, "qos", "0");
+
+	validate_request_child = xmlnode_new_child(validate_request_root, "mobile_no");
+	xmlnode_set_attrib(validate_request_child, "msisdn", sms_cb_data->who + 1);
+
+	validate_request_str = xmlnode_to_str(validate_request_root, NULL);
+
+	xmlnode_free(validate_request_child);
+	xmlnode_free(validate_request_root);
+
+	request = g_strdup_printf(
+		"POST /mobileno?intl=us&version=%s HTTP/1.1\r\n"
+		"Cookie: T=%s; path=/; domain=.yahoo.com; Y=%s; path=/; domain=.yahoo.com;\r\n"
+		"User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
+		"Host: validate.msg.yahoo.com\r\n"
+		"Content-Length: %" G_GSIZE_FORMAT "\r\n"
+		"Cache-Control: no-cache\r\n\r\n%s",
+		YAHOO_CLIENT_VERSION, yd->cookie_t, yd->cookie_y, strlen(validate_request_str), validate_request_str);
+
+	/* use whole URL if using HTTP Proxy */
+	if ((gc->account->proxy_info) && (gc->account->proxy_info->type == PURPLE_PROXY_HTTP))
+	    use_whole_url = TRUE;
+
+	url_data = purple_util_fetch_url_request_len_with_account(
+			purple_connection_get_account(gc), YAHOO_SMS_CARRIER_URL, use_whole_url,
+			YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1,
+			yahoo_get_sms_carrier_cb, data);
+
+	g_free(request);
+	g_free(validate_request_str);
+
+	if (!url_data) {
+		PurpleAccount *account = purple_connection_get_account(gc);
+		PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, sms_cb_data->who, account);
+		purple_conversation_write(conv, NULL, "Cant send SMS, Unable to obtain mobile carrier", PURPLE_MESSAGE_SYSTEM, time(NULL));
+		g_free(sms_cb_data->who);
+		g_free(sms_cb_data->what);
+		g_free(sms_cb_data);
+	}
+}
+
+int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what, PurpleMessageFlags flags)
+{
+	YahooData *yd = gc->proto_data;
+	struct yahoo_packet *pkt = NULL;
 	char *msg = yahoo_html_to_codes(what);
 	char *msg2;
 	gboolean utf8 = TRUE;
@@ -3637,9 +4255,10 @@ static int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what
 	YahooFriend *f = NULL;
 	gsize lenb = 0;
 	glong lenc = 0;
-
+	struct yahoo_p2p_data *p2p_data;
+	gboolean msn = FALSE;
 	msg2 = yahoo_string_encode(gc, msg, &utf8);
-	
+
 	if(msg2) {
 		lenb = strlen(msg2);
 		lenc = g_utf8_strlen(msg2, -1);
@@ -3649,16 +4268,71 @@ static int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what
 					" bytes, %ld characters.  Max is %d bytes, %d chars."
 					"  Message is '%s'.\n", lenb, lenc, YAHOO_MAX_MESSAGE_LENGTH_BYTES,
 					YAHOO_MAX_MESSAGE_LENGTH_CHARS, msg2);
-			yahoo_packet_free(pkt);
 			g_free(msg);
 			g_free(msg2);
 			return -E2BIG;
 		}
 	}
 
-	yahoo_packet_hash(pkt, "ss", 1, purple_connection_get_display_name(gc), 5, who);
-	if ((f = yahoo_friend_find(gc, who)) && f->protocol)
-		yahoo_packet_hash_int(pkt, 241, f->protocol);
+	msn = !g_ascii_strncasecmp(who, "msn/", 4);
+
+	if( strncmp(who, "+", 1) == 0 ) {
+		/* we have an sms to be sent */
+		gchar *carrier = NULL;
+		const char *alias = NULL;
+		PurpleAccount *account = purple_connection_get_account(gc);
+		PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, who, account);
+
+		carrier = g_hash_table_lookup(yd->sms_carrier, who);
+		if (!carrier) {
+			struct yahoo_sms_carrier_cb_data *sms_cb_data;
+			sms_cb_data = g_malloc(sizeof(struct yahoo_sms_carrier_cb_data));
+			sms_cb_data->gc = gc;
+			sms_cb_data->who = g_strdup(who);
+			sms_cb_data->what = g_strdup(what);
+
+			purple_conversation_write(conv, NULL, "Getting mobile carrier to send the sms", PURPLE_MESSAGE_SYSTEM, time(NULL));
+
+			yahoo_get_sms_carrier(gc, sms_cb_data);
+
+			g_free(msg);
+			g_free(msg2);
+			return ret;
+		}
+		else if( strcmp(carrier,"Unknown") == 0 ) {
+			purple_conversation_write(conv, NULL, "Cant send SMS, Unknown mobile carrier", PURPLE_MESSAGE_SYSTEM, time(NULL));
+
+			g_free(msg);
+			g_free(msg2);
+			return -1;
+		}
+
+		alias = purple_account_get_alias(account);
+		pkt = yahoo_packet_new(YAHOO_SERVICE_SMS_MSG, YAHOO_STATUS_AVAILABLE, yd->session_id);
+		yahoo_packet_hash(pkt, "sssss",
+			1, purple_connection_get_display_name(gc),
+			69, alias,
+			5, who + 1,
+			68, carrier,
+			14, msg2);
+		yahoo_packet_send_and_free(pkt, yd);
+
+		g_free(msg);
+		g_free(msg2);
+
+		return ret;
+	}
+
+	pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE, yd->session_id);
+	if(msn) {
+		yahoo_packet_hash(pkt, "ss", 1, purple_connection_get_display_name(gc), 5, who+4);
+		yahoo_packet_hash_int(pkt, 241, 2);
+	}
+	else	{
+		yahoo_packet_hash(pkt, "ss", 1, purple_connection_get_display_name(gc), 5, who);
+		if ((f = yahoo_friend_find(gc, who)) && f->protocol)
+			yahoo_packet_hash_int(pkt, 241, f->protocol);
+	}
 
 	if (utf8)
 		yahoo_packet_hash_str(pkt, 97, "1");
@@ -3697,8 +4371,18 @@ static int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what
 		yahoo_packet_hash_str(pkt, 206, "2");
 
 	/* We may need to not send any packets over 2000 bytes, but I'm not sure yet. */
-	if ((YAHOO_PACKET_HDRLEN + yahoo_packet_length(pkt)) <= 2000)
-		yahoo_packet_send(pkt, yd);
+	if ((YAHOO_PACKET_HDRLEN + yahoo_packet_length(pkt)) <= 2000) {
+		/* if p2p link exists, send through it. To-do: key 15, time value to be sent in case of p2p */
+		if( (p2p_data = g_hash_table_lookup(yd->peers, who)) && !msn ) {
+			yahoo_packet_hash_int(pkt, 11, p2p_data->session_id);
+			yahoo_p2p_write_pkt(p2p_data->source, pkt);
+		}
+		else	{
+			yahoo_packet_send(pkt, yd);
+			if(!msn)
+				yahoo_send_p2p_pkt(gc, who, 0);		/* send p2p packet, with val_13=0 */
+		}
+	}
 	else
 		ret = -E2BIG;
 
@@ -3710,15 +4394,38 @@ static int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what
 	return ret;
 }
 
-static unsigned int yahoo_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state)
+unsigned int yahoo_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state)
 {
-	struct yahoo_data *yd = gc->proto_data;
-	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_NOTIFY, YAHOO_STATUS_TYPING, 0);
-	yahoo_packet_hash(pkt, "ssssss", 49, "TYPING", 1, purple_connection_get_display_name(gc),
-	                  14, " ", 13, state == PURPLE_TYPING ? "1" : "0",
-	                  5, who, 1002, "1");
+	YahooData *yd = gc->proto_data;
+	struct yahoo_p2p_data *p2p_data;
+	gboolean msn = !g_ascii_strncasecmp(who, "msn/", 4);
+	struct yahoo_packet *pkt = NULL;
 
-	yahoo_packet_send_and_free(pkt, yd);
+	/* Don't do anything if sms is being typed */
+	if( strncmp(who, "+", 1) == 0 )
+		return 0;
+
+	pkt = yahoo_packet_new(YAHOO_SERVICE_NOTIFY, YAHOO_STATUS_TYPING, yd->session_id);
+
+	/* check to see if p2p link exists, send through it */
+	if( (p2p_data = g_hash_table_lookup(yd->peers, who)) && !msn ) {
+		yahoo_packet_hash(pkt, "sssssis", 49, "TYPING", 1, purple_connection_get_display_name(gc),
+	                  14, " ", 13, state == PURPLE_TYPING ? "1" : "0",
+	                  5, who, 11, p2p_data->session_id, 1002, "1");	/* To-do: key 15 to be sent in case of p2p */
+		yahoo_p2p_write_pkt(p2p_data->source, pkt);
+		yahoo_packet_free(pkt);
+	}
+	else	{	/* send through yahoo server */
+		if(msn)
+			yahoo_packet_hash(pkt, "sssssss", 49, "TYPING", 1, purple_connection_get_display_name(gc),
+	                  14, " ", 13, state == PURPLE_TYPING ? "1" : "0",
+	                  5, who+4, 1002, "1", 241, "2");
+		else
+			yahoo_packet_hash(pkt, "ssssss", 49, "TYPING", 1, purple_connection_get_display_name(gc),
+	                  14, " ", 13, state == PURPLE_TYPING ? "1" : "0",
+	                  5, who+4, 1002, "1");
+		yahoo_packet_send_and_free(pkt, yd);
+	}
 
 	return 0;
 }
@@ -3730,11 +4437,11 @@ static void yahoo_session_presence_remove(gpointer key, gpointer value, gpointer
 		f->presence = YAHOO_PRESENCE_DEFAULT;
 }
 
-static void yahoo_set_status(PurpleAccount *account, PurpleStatus *status)
+void yahoo_set_status(PurpleAccount *account, PurpleStatus *status)
 {
 	PurpleConnection *gc;
 	PurplePresence *presence;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	struct yahoo_packet *pkt;
 	int old_status;
 	const char *msg = NULL;
@@ -3747,7 +4454,7 @@ static void yahoo_set_status(PurpleAccount *account, PurpleStatus *status)
 
 	gc = purple_account_get_connection(account);
 	presence = purple_status_get_presence(status);
-	yd = (struct yahoo_data *)gc->proto_data;
+	yd = (YahooData *)gc->proto_data;
 	old_status = yd->current_status;
 
 	yd->current_status = get_yahoo_status_from_purple_status(status);
@@ -3770,14 +4477,14 @@ static void yahoo_set_status(PurpleAccount *account, PurpleStatus *status)
 	}
 
 	if (yd->current_status == YAHOO_STATUS_INVISIBLE) {
-		pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE, YAHOO_STATUS_AVAILABLE, 0);
+		pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 		yahoo_packet_hash_str(pkt, 13, "2");
 		yahoo_packet_send_and_free(pkt, yd);
 
 		return;
 	}
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_STATUS_UPDATE, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_STATUS_UPDATE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash_int(pkt, 10, yd->current_status);
 
 	if (yd->current_status == YAHOO_STATUS_CUSTOM) {
@@ -3797,7 +4504,7 @@ static void yahoo_set_status(PurpleAccount *account, PurpleStatus *status)
 	yahoo_packet_send_and_free(pkt, yd);
 
 	if (old_status == YAHOO_STATUS_INVISIBLE) {
-		pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE, YAHOO_STATUS_AVAILABLE, 0);
+		pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 		yahoo_packet_hash_str(pkt, 13, "1");
 		yahoo_packet_send_and_free(pkt, yd);
 
@@ -3807,9 +4514,9 @@ static void yahoo_set_status(PurpleAccount *account, PurpleStatus *status)
 	}
 }
 
-static void yahoo_set_idle(PurpleConnection *gc, int idle)
+void yahoo_set_idle(PurpleConnection *gc, int idle)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt = NULL;
 	char *msg = NULL, *msg2 = NULL;
 	PurpleStatus *status = NULL;
@@ -3821,7 +4528,7 @@ static void yahoo_set_idle(PurpleConnection *gc, int idle)
 		yd->current_status = get_yahoo_status_from_purple_status(status);
 	}
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_STATUS_UPDATE, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_STATUS_UPDATE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 
 	yahoo_packet_hash_int(pkt, 10, yd->current_status);
 	if (yd->current_status == YAHOO_STATUS_CUSTOM) {
@@ -3830,8 +4537,10 @@ static void yahoo_set_idle(PurpleConnection *gc, int idle)
 			status = purple_presence_get_active_status(purple_account_get_presence(purple_connection_get_account(gc)));
 		tmp = purple_status_get_attr_string(status, "message");
 		if (tmp != NULL) {
-			msg = yahoo_string_encode(gc, tmp, NULL);
+			gboolean utf8 = TRUE;
+			msg = yahoo_string_encode(gc, tmp, &utf8);
 			msg2 = purple_markup_strip_html(msg);
+			yahoo_packet_hash_str(pkt, 97, utf8 ? "1" : 0);
 			yahoo_packet_hash_str(pkt, 19, msg2);
 		} else {
 			/* get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
@@ -3853,7 +4562,7 @@ static void yahoo_set_idle(PurpleConnection *gc, int idle)
 	g_free(msg2);
 }
 
-static GList *yahoo_status_types(PurpleAccount *account)
+GList *yahoo_status_types(PurpleAccount *account)
 {
 	PurpleStatusType *type;
 	GList *types = NULL;
@@ -3910,10 +4619,10 @@ static GList *yahoo_status_types(PurpleAccount *account)
 	return types;
 }
 
-static void yahoo_keepalive(PurpleConnection *gc)
+void yahoo_keepalive(PurpleConnection *gc)
 {
 	struct yahoo_packet *pkt;
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	time_t now = time(NULL);
 
 	/* We're only allowed to send a ping once an hour or the servers will boot us */
@@ -3925,33 +4634,34 @@ static void yahoo_keepalive(PurpleConnection *gc)
 			if (yd->wm) {
 				ycht_chat_send_keepalive(yd->ycht);
 			} else {
-				pkt = yahoo_packet_new(YAHOO_SERVICE_CHATPING, YAHOO_STATUS_AVAILABLE, 0);
+				pkt = yahoo_packet_new(YAHOO_SERVICE_CHATPING, YAHOO_STATUS_AVAILABLE, yd->session_id);
 				yahoo_packet_hash_str(pkt, 109, purple_connection_get_display_name(gc));
 				yahoo_packet_send_and_free(pkt, yd);
 			}
 		} else {
-			pkt = yahoo_packet_new(YAHOO_SERVICE_PING, YAHOO_STATUS_AVAILABLE, 0);
+			pkt = yahoo_packet_new(YAHOO_SERVICE_PING, YAHOO_STATUS_AVAILABLE, yd->session_id);
 			yahoo_packet_send_and_free(pkt, yd);
 		}
 	}
 
 	if ((now - yd->last_keepalive) >= KEEPALIVE_TIMEOUT) {
 		yd->last_keepalive = now;
-		pkt = yahoo_packet_new(YAHOO_SERVICE_KEEPALIVE, YAHOO_STATUS_AVAILABLE, 0);
+		pkt = yahoo_packet_new(YAHOO_SERVICE_KEEPALIVE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 		yahoo_packet_hash_str(pkt, 0, purple_connection_get_display_name(gc));
 		yahoo_packet_send_and_free(pkt, yd);
 	}
 
 }
 
-static void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g)
+void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g)
 {
-	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
+	YahooData *yd = (YahooData *)gc->proto_data;
 	struct yahoo_packet *pkt;
 	const char *group = NULL;
 	char *group2;
 	YahooFriend *f;
 	const char *bname;
+	gboolean msn = FALSE;
 
 	if (!yd->logged_in)
 		return;
@@ -3961,6 +4671,7 @@ static void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGrou
 		return;
 
 	f = yahoo_friend_find(gc, bname);
+	msn = !g_ascii_strncasecmp(bname, "msn/", 4);
 
 	g = purple_buddy_get_group(buddy);
 	if (g)
@@ -3969,41 +4680,64 @@ static void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGrou
 		group = "Buddies";
 
 	group2 = yahoo_string_encode(gc, group, NULL);
-	pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash(pkt, "ssssssssss",
-	                  14, "",
-	                  65, group2,
-	                  97, "1",
-	                  1, purple_connection_get_display_name(gc),
-	                  302, "319",
-	                  300, "319",
-	                  7, bname,
-	                  334, "0",
-	                  301, "319",
-	                  303, "319"
-	);
-	if (f && f->protocol)
+	pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YAHOO_STATUS_AVAILABLE, yd->session_id);
+	if(msn) {
+		yahoo_packet_hash(pkt, "sssssssssss",
+			14, "",
+			65, group2,
+			97, "1",
+			1, purple_connection_get_display_name(gc),
+			302, "319",
+			300, "319",
+			7, bname + 4,
+			241, "2",
+			334, "0",
+			301, "319",
+			303, "319"
+		);
+	}
+	else	{
+		yahoo_packet_hash(pkt, "ssssssssss",
+			14, "",
+			65, group2,
+			97, "1",
+			1, purple_connection_get_display_name(gc),
+			302, "319",
+			300, "319",
+	                7, bname,
+			334, "0",
+			301, "319",
+			303, "319"
+		);
+	}
+	if (f && f->protocol && !msn)
 		yahoo_packet_hash_int(pkt, 241, f->protocol);
+
 	yahoo_packet_send_and_free(pkt, yd);
 	g_free(group2);
 }
 
-static void yahoo_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
+void yahoo_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
-	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
+	YahooData *yd = (YahooData *)gc->proto_data;
 	struct yahoo_packet *pkt;
 	GSList *buddies, *l;
 	PurpleGroup *g;
 	gboolean remove = TRUE;
 	char *cg;
 	const char *bname, *gname;
+	YahooFriend *f = NULL;
+	gboolean msn = FALSE;
 
 	bname = purple_buddy_get_name(buddy);
-	if (!(yahoo_friend_find(gc, bname)))
+	f = yahoo_friend_find(gc, bname);
+	if (!f)
 		return;
 
 	gname = purple_group_get_name(group);
 	buddies = purple_find_buddies(purple_connection_get_account(gc), bname);
+	if(f->protocol == 2)
+		msn = TRUE;
 	for (l = buddies; l; l = l->next) {
 		g = purple_buddy_get_group(l->data);
 		if (purple_utf8_strcasecmp(gname, purple_group_get_name(g))) {
@@ -4018,15 +4752,22 @@ static void yahoo_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleG
 		g_hash_table_remove(yd->friends, bname);
 
 	cg = yahoo_string_encode(gc, gname, NULL);
-	pkt = yahoo_packet_new(YAHOO_SERVICE_REMBUDDY, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc),
+	pkt = yahoo_packet_new(YAHOO_SERVICE_REMBUDDY, YAHOO_STATUS_AVAILABLE, yd->session_id);
+
+	if(msn)
+		yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc),
+	                  7, bname+4, 65, cg);
+	else
+		yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc),
 	                  7, bname, 65, cg);
+	if(f->protocol)
+		yahoo_packet_hash_int(pkt, 241, f->protocol);
 	yahoo_packet_send_and_free(pkt, yd);
 	g_free(cg);
 }
 
-static void yahoo_add_deny(PurpleConnection *gc, const char *who) {
-	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
+void yahoo_add_deny(PurpleConnection *gc, const char *who) {
+	YahooData *yd = (YahooData *)gc->proto_data;
 	struct yahoo_packet *pkt;
 
 	if (!yd->logged_in)
@@ -4035,14 +4776,14 @@ static void yahoo_add_deny(PurpleConnection *gc, const char *who) {
 	if (!who || who[0] == '\0')
 		return;
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc),
 	                  7, who, 13, "1");
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
-static void yahoo_rem_deny(PurpleConnection *gc, const char *who) {
-	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
+void yahoo_rem_deny(PurpleConnection *gc, const char *who) {
+	YahooData *yd = (YahooData *)gc->proto_data;
 	struct yahoo_packet *pkt;
 
 	if (!yd->logged_in)
@@ -4051,12 +4792,12 @@ static void yahoo_rem_deny(PurpleConnection *gc, const char *who) {
 	if (!who || who[0] == '\0')
 		return;
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc), 7, who, 13, "2");
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
-static void yahoo_set_permit_deny(PurpleConnection *gc)
+void yahoo_set_permit_deny(PurpleConnection *gc)
 {
 	PurpleAccount *account;
 	GSList *deny;
@@ -4080,26 +4821,28 @@ static void yahoo_set_permit_deny(PurpleConnection *gc)
 	}
 }
 
-static gboolean yahoo_unload_plugin(PurplePlugin *plugin)
-{
-	yahoo_dest_colorht();
-
-	return TRUE;
-}
-
-static void yahoo_change_buddys_group(PurpleConnection *gc, const char *who,
+void yahoo_change_buddys_group(PurpleConnection *gc, const char *who,
 				   const char *old_group, const char *new_group)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 	char *gpn, *gpo;
+	YahooFriend *f = yahoo_friend_find(gc, who);
+	gboolean msn = FALSE;
+	const char *temp = NULL;
 
 	/* Step 0:  If they aren't on the server list anyway,
 	 *          don't bother letting the server know.
 	 */
-	if (!yahoo_friend_find(gc, who))
+	if (!f)
 		return;
 
+	if(f->protocol == 2) {
+		msn = TRUE;
+		temp = who+4;
+	} else
+		temp = who;
+
 	/* If old and new are the same, we would probably
 	 * end up deleting the buddy, which would be bad.
 	 * This might happen because of the charset conversation.
@@ -4112,9 +4855,14 @@ static void yahoo_change_buddys_group(PurpleConnection *gc, const char *who,
 		return;
 	}
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHGRP_15, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash(pkt, "ssssssss", 1, purple_connection_get_display_name(gc),
-	                  302, "240", 300, "240", 7, who, 224, gpo, 264, gpn, 301,
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHGRP_15, YAHOO_STATUS_AVAILABLE, yd->session_id);
+	if(f->protocol)
+		yahoo_packet_hash(pkt, "ssssissss", 1, purple_connection_get_display_name(gc),
+	                  302, "240", 300, "240", 7, temp, 241, f->protocol, 224, gpo, 264, gpn, 301,
+	                  "240", 303, "240");
+	else
+		yahoo_packet_hash(pkt, "ssssssss", 1, purple_connection_get_display_name(gc),
+	                  302, "240", 300, "240", 7, temp, 224, gpo, 264, gpn, 301,
 	                  "240", 303, "240");
 	yahoo_packet_send_and_free(pkt, yd);
 
@@ -4122,10 +4870,10 @@ static void yahoo_change_buddys_group(PurpleConnection *gc, const char *who,
 	g_free(gpo);
 }
 
-static void yahoo_rename_group(PurpleConnection *gc, const char *old_name,
+void yahoo_rename_group(PurpleConnection *gc, const char *old_name,
 							   PurpleGroup *group, GList *moved_buddies)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 	char *gpn, *gpo;
 
@@ -4137,7 +4885,7 @@ static void yahoo_rename_group(PurpleConnection *gc, const char *old_name,
 		return;
 	}
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_GROUPRENAME, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_GROUPRENAME, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc),
 	                  65, gpo, 67, gpn);
 	yahoo_packet_send_and_free(pkt, yd);
@@ -4147,7 +4895,7 @@ static void yahoo_rename_group(PurpleConnection *gc, const char *old_name,
 
 /********************************* Commands **********************************/
 
-static PurpleCmdRet
+PurpleCmdRet
 yahoopurple_cmd_buzz(PurpleConversation *c, const gchar *cmd, gchar **args, gchar **error, void *data) {
 	PurpleAccount *account = purple_conversation_get_account(c);
 
@@ -4159,15 +4907,13 @@ yahoopurple_cmd_buzz(PurpleConversation *c, const gchar *cmd, gchar **args, gcha
 	return PURPLE_CMD_RET_OK;
 }
 
-static PurplePlugin *my_protocol = NULL;
-
-static PurpleCmdRet
+PurpleCmdRet
 yahoopurple_cmd_chat_join(PurpleConversation *conv, const char *cmd,
                         char **args, char **error, void *data)
 {
 	GHashTable *comp;
 	PurpleConnection *gc;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	int id;
 
 	if (!args || !args[0])
@@ -4176,8 +4922,7 @@ yahoopurple_cmd_chat_join(PurpleConversation *conv, const char *cmd,
 	gc = purple_conversation_get_gc(conv);
 	yd = gc->proto_data;
 	id = yd->conf_id;
-	purple_debug(PURPLE_DEBUG_INFO, "yahoo",
-	           "Trying to join %s \n", args[0]);
+	purple_debug_info("yahoo", "Trying to join %s \n", args[0]);
 
 	comp = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 	g_hash_table_replace(comp, g_strdup("room"), g_ascii_strdown(args[0], -1));
@@ -4189,7 +4934,7 @@ yahoopurple_cmd_chat_join(PurpleConversation *conv, const char *cmd,
 	return PURPLE_CMD_RET_OK;
 }
 
-static PurpleCmdRet
+PurpleCmdRet
 yahoopurple_cmd_chat_list(PurpleConversation *conv, const char *cmd,
                         char **args, char **error, void *data)
 {
@@ -4200,7 +4945,7 @@ yahoopurple_cmd_chat_list(PurpleConversation *conv, const char *cmd,
 	return PURPLE_CMD_RET_OK;
 }
 
-static gboolean yahoo_offline_message(const PurpleBuddy *buddy)
+gboolean yahoo_offline_message(const PurpleBuddy *buddy)
 {
 	return TRUE;
 }
@@ -4214,8 +4959,8 @@ gboolean yahoo_send_attention(PurpleConnection *gc, const char *username, guint
 
 	g_return_val_if_fail(c != NULL, FALSE);
 
-	purple_debug(PURPLE_DEBUG_INFO, "yahoo",
-	           "Sending <ding> on account %s to buddy %s.\n", username, c->name);
+	purple_debug_info("yahoo", "Sending <ding> on account %s to buddy %s.\n",
+			username, c->name);
 	purple_conv_im_send_with_flags(PURPLE_CONV_IM(c), "<ding>", PURPLE_MESSAGE_INVISIBLE);
 
 	return TRUE;
@@ -4235,318 +4980,3 @@ GList *yahoo_attention_types(PurpleAccount *account)
 	return list;
 }
 
-/************************** Plugin Initialization ****************************/
-static void
-yahoopurple_register_commands(void)
-{
-	purple_cmd_register("join", "s", PURPLE_CMD_P_PRPL,
-	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT |
-	                  PURPLE_CMD_FLAG_PRPL_ONLY,
-	                  "prpl-yahoo", yahoopurple_cmd_chat_join,
-	                  _("join &lt;room&gt;:  Join a chat room on the Yahoo network"), NULL);
-	purple_cmd_register("list", "", PURPLE_CMD_P_PRPL,
-	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT |
-	                  PURPLE_CMD_FLAG_PRPL_ONLY,
-	                  "prpl-yahoo", yahoopurple_cmd_chat_list,
-	                  _("list: List rooms on the Yahoo network"), NULL);
-	purple_cmd_register("buzz", "", PURPLE_CMD_P_PRPL,
-	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY,
-	                  "prpl-yahoo", yahoopurple_cmd_buzz,
-	                  _("buzz: Buzz a user to get their attention"), NULL);
-	purple_cmd_register("doodle", "", PURPLE_CMD_P_PRPL,
-	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY,
-	                  "prpl-yahoo", yahoo_doodle_purple_cmd_start,
-	                 _("doodle: Request user to start a Doodle session"), NULL);
-}
-
-static PurpleAccount *find_acct(const char *prpl, const char *acct_id)
-{
-	PurpleAccount *acct = NULL;
-
-	/* If we have a specific acct, use it */
-	if (acct_id) {
-		acct = purple_accounts_find(acct_id, prpl);
-		if (acct && !purple_account_is_connected(acct))
-			acct = NULL;
-	} else { /* Otherwise find an active account for the protocol */
-		GList *l = purple_accounts_get_all();
-		while (l) {
-			if (!strcmp(prpl, purple_account_get_protocol_id(l->data))
-					&& purple_account_is_connected(l->data)) {
-				acct = l->data;
-				break;
-			}
-			l = l->next;
-		}
-	}
-
-	return acct;
-}
-
-/* This may not be the best way to do this, but we find the first key w/o a value
- * and assume it is the buddy name */
-static void yahoo_find_uri_novalue_param(gpointer key, gpointer value, gpointer user_data)
-{
-	char **retval = user_data;
-
-	if (value == NULL && *retval == NULL) {
-		*retval = key;
-	}
-}
-
-static gboolean yahoo_uri_handler(const char *proto, const char *cmd, GHashTable *params)
-{
-	char *acct_id = g_hash_table_lookup(params, "account");
-	PurpleAccount *acct;
-
-	if (g_ascii_strcasecmp(proto, "ymsgr"))
-		return FALSE;
-
-	acct = find_acct(purple_plugin_get_id(my_protocol), acct_id);
-
-	if (!acct)
-		return FALSE;
-
-	/* ymsgr:SendIM?screename&m=The+Message */
-	if (!g_ascii_strcasecmp(cmd, "SendIM")) {
-		char *sname = NULL;
-		g_hash_table_foreach(params, yahoo_find_uri_novalue_param, &sname);
-		if (sname) {
-			char *message = g_hash_table_lookup(params, "m");
-
-			PurpleConversation *conv = purple_find_conversation_with_account(
-				PURPLE_CONV_TYPE_IM, sname, acct);
-			if (conv == NULL)
-				conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, sname);
-			purple_conversation_present(conv);
-
-			if (message) {
-				/* Spaces are encoded as '+' */
-				g_strdelimit(message, "+", ' ');
-				purple_conv_send_confirm(conv, message);
-			}
-		}
-		/*else
-			**If pidgindialogs_im() was in the core, we could use it here.
-			 * It is all purple_request_* based, but I'm not sure it really belongs in the core
-			pidgindialogs_im();*/
-
-		return TRUE;
-	}
-	/* ymsgr:Chat?roomname */
-	else if (!g_ascii_strcasecmp(cmd, "Chat")) {
-		char *rname = NULL;
-		g_hash_table_foreach(params, yahoo_find_uri_novalue_param, &rname);
-		if (rname) {
-			/* This is somewhat hacky, but the params aren't useful after this command */
-			g_hash_table_insert(params, g_strdup("room"), g_strdup(rname));
-			g_hash_table_insert(params, g_strdup("type"), g_strdup("Chat"));
-			serv_join_chat(purple_account_get_connection(acct), params);
-		}
-		/*else
-			** Same as above (except that this would have to be re-written using purple_request_*)
-			pidgin_blist_joinchat_show(); */
-
-		return TRUE;
-	}
-	/* ymsgr:AddFriend?name */
-	else if (!g_ascii_strcasecmp(cmd, "AddFriend")) {
-		char *name = NULL;
-		g_hash_table_foreach(params, yahoo_find_uri_novalue_param, &name);
-		purple_blist_request_add_buddy(acct, name, NULL, NULL);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static GHashTable *
-yahoo_get_account_text_table(PurpleAccount *account)
-{
-	GHashTable *table;
-	table = g_hash_table_new(g_str_hash, g_str_equal);
-	g_hash_table_insert(table, "login_label", (gpointer)_("Yahoo ID..."));
-	return table;
-}
-
-static PurpleWhiteboardPrplOps yahoo_whiteboard_prpl_ops =
-{
-	yahoo_doodle_start,
-	yahoo_doodle_end,
-	yahoo_doodle_get_dimensions,
-	NULL,
-	yahoo_doodle_get_brush,
-	yahoo_doodle_set_brush,
-	yahoo_doodle_send_draw_list,
-	yahoo_doodle_clear,
-
-	/* padding */
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-static PurplePluginProtocolInfo prpl_info =
-{
-	OPT_PROTO_MAIL_CHECK | OPT_PROTO_CHAT_TOPIC,
-	NULL, /* user_splits */
-	NULL, /* protocol_options */
-	{"png,gif,jpeg", 96, 96, 96, 96, 0, PURPLE_ICON_SCALE_SEND},
-	yahoo_list_icon,
-	yahoo_list_emblem,
-	yahoo_status_text,
-	yahoo_tooltip_text,
-	yahoo_status_types,
-	yahoo_blist_node_menu,
-	yahoo_c_info,
-	yahoo_c_info_defaults,
-	yahoo_login,
-	yahoo_close,
-	yahoo_send_im,
-	NULL, /* set info */
-	yahoo_send_typing,
-	yahoo_get_info,
-	yahoo_set_status,
-	yahoo_set_idle,
-	NULL, /* change_passwd*/
-	yahoo_add_buddy,
-	NULL, /* add_buddies */
-	yahoo_remove_buddy,
-	NULL, /*remove_buddies */
-	NULL, /* add_permit */
-	yahoo_add_deny,
-	NULL, /* rem_permit */
-	yahoo_rem_deny,
-	yahoo_set_permit_deny,
-	yahoo_c_join,
-	NULL, /* reject chat invite */
-	yahoo_get_chat_name,
-	yahoo_c_invite,
-	yahoo_c_leave,
-	NULL, /* chat whisper */
-	yahoo_c_send,
-	yahoo_keepalive,
-	NULL, /* register_user */
-	NULL, /* get_cb_info */
-	NULL, /* get_cb_away */
-	yahoo_update_alias, /* alias_buddy */
-	yahoo_change_buddys_group,
-	yahoo_rename_group,
-	NULL, /* buddy_free */
-	NULL, /* convo_closed */
-	purple_normalize_nocase, /* normalize */
-	yahoo_set_buddy_icon,
-	NULL, /* void (*remove_group)(PurpleConnection *gc, const char *group);*/
-	NULL, /* char *(*get_cb_real_name)(PurpleConnection *gc, int id, const char *who); */
-	NULL, /* set_chat_topic */
-	NULL, /* find_blist_chat */
-	yahoo_roomlist_get_list,
-	yahoo_roomlist_cancel,
-	yahoo_roomlist_expand_category,
-	NULL, /* can_receive_file */
-	yahoo_send_file,
-	yahoo_new_xfer,
-	yahoo_offline_message, /* offline_message */
-	&yahoo_whiteboard_prpl_ops,
-	NULL, /* send_raw */
-	NULL, /* roomlist_room_serialize */
-	NULL, /* unregister_user */
-
-	yahoo_send_attention,
-	yahoo_attention_types,
-
-	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	yahoo_get_account_text_table,    /* get_account_text_table */
-};
-
-static PurplePluginInfo info =
-{
-	PURPLE_PLUGIN_MAGIC,
-	PURPLE_MAJOR_VERSION,
-	PURPLE_MINOR_VERSION,
-	PURPLE_PLUGIN_PROTOCOL,                             /**< type           */
-	NULL,                                             /**< ui_requirement */
-	0,                                                /**< flags          */
-	NULL,                                             /**< dependencies   */
-	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
-	"prpl-yahoo",                                     /**< id             */
-	"Yahoo",	                                      /**< name           */
-	DISPLAY_VERSION,                                  /**< version        */
-	                                                  /**  summary        */
-	N_("Yahoo Protocol Plugin"),
-	                                                  /**  description    */
-	N_("Yahoo Protocol Plugin"),
-	NULL,                                             /**< author         */
-	PURPLE_WEBSITE,                                     /**< homepage       */
-	NULL,                                             /**< load           */
-	yahoo_unload_plugin,                              /**< unload         */
-	NULL,                                             /**< destroy        */
-	NULL,                                             /**< ui_info        */
-	&prpl_info,                                       /**< extra_info     */
-	NULL,
-	yahoo_actions,
-
-	/* padding */
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-static void
-init_plugin(PurplePlugin *plugin)
-{
-	PurpleAccountOption *option;
-
-	option = purple_account_option_bool_new(_("Yahoo Japan"), "yahoojp", FALSE);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_string_new(_("Pager server"), "server", YAHOO_PAGER_HOST);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_string_new(_("Japan Pager server"), "serverjp", YAHOOJP_PAGER_HOST);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_int_new(_("Pager port"), "port", YAHOO_PAGER_PORT);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_string_new(_("File transfer server"), "xfer_host", YAHOO_XFER_HOST);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_string_new(_("Japan file transfer server"), "xferjp_host", YAHOOJP_XFER_HOST);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_int_new(_("File transfer port"), "xfer_port", YAHOO_XFER_PORT);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_string_new(_("Chat room locale"), "room_list_locale", YAHOO_ROOMLIST_LOCALE);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_bool_new(_("Ignore conference and chatroom invitations"), "ignore_invites", FALSE);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_string_new(_("Encoding"), "local_charset", "ISO-8859-1");
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-
-#if 0
-	option = purple_account_option_string_new(_("Chat room list URL"), "room_list", YAHOO_ROOMLIST_URL);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_string_new(_("Yahoo Chat server"), "ycht-server", YAHOO_YCHT_HOST);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_int_new(_("Yahoo Chat port"), "ycht-port", YAHOO_YCHT_PORT);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-#endif
-
-	my_protocol = plugin;
-	yahoopurple_register_commands();
-	yahoo_init_colorht();
-
-	purple_signal_connect(purple_get_core(), "uri-handler", plugin,
-		PURPLE_CALLBACK(yahoo_uri_handler), NULL);
-}
-
-PURPLE_INIT_PLUGIN(yahoo, init_plugin, info);
diff --git a/libpurple/protocols/yahoo/yahoo.h b/libpurple/protocols/yahoo/libymsg.h
index 89ab6f4e68..c636ab48c9 100644
--- a/libpurple/protocols/yahoo/yahoo.h
+++ b/libpurple/protocols/yahoo/libymsg.h
@@ -1,5 +1,5 @@
 /**
- * @file yahoo.h The Yahoo! protocol plugin
+ * @file libymsg.h The Yahoo! and Yahoo! JAPAN Protocol Plugins
  *
  * purple
  *
@@ -22,16 +22,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef _YAHOO_H_
-#define _YAHOO_H_
+#ifndef _LIBYMSG_H_
+#define _LIBYMSG_H_
 
 #include "circbuffer.h"
+#include "cmds.h"
 #include "prpl.h"
 
-#define YAHOO_PAGER_HOST "scs.msg.yahoo.com"
+#define YAHOO_PAGER_HOST "scsa.msg.yahoo.com"
 #define YAHOO_PAGER_PORT 5050
+#define YAHOO_PAGER_PORT_P2P 5101
+#define YAHOO_LOGIN_URL "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%s"
+#define YAHOO_TOKEN_URL "https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=&login=%s&passwd=%s&chal=%s"
+#define YAHOO_P2P_KEEPALIVE_SECS 300
+#define YAHOO_P2P_SERVER_TIMEOUT 10
 #define YAHOO_PROFILE_URL "http://profiles.yahoo.com/"
-#define YAHOO_MAIL_URL "https://login.yahoo.com/config/login?.src=ym"
+#define YAHOO_MAIL_URL "http://rd.yahoo.com/messenger/client/?http://mail.yahoo.com/"
 #define YAHOO_XFER_HOST "filetransfer.msg.yahoo.com"
 #define YAHOO_XFER_PORT 80
 #define YAHOO_XFER_RELAY_HOST "relay.msg.yahoo.com"
@@ -41,12 +47,14 @@
 /* really we should get the list of servers from
  http://update.messenger.yahoo.co.jp/servers.html */
 #define YAHOOJP_PAGER_HOST "cs.yahoo.co.jp"
+#define YAHOOJP_TOKEN_URL "https://login.yahoo.co.jp/config/pwtoken_get?src=ymsgr&ts=&login=%s&passwd=%s&chal=%s"
+#define YAHOOJP_LOGIN_URL "https://login.yahoo.co.jp/config/pwtoken_login?src=ymsgr&ts=&token=%s"
 #define YAHOOJP_PROFILE_URL "http://profiles.yahoo.co.jp/"
 #define YAHOOJP_MAIL_URL "http://mail.yahoo.co.jp/"
 #define YAHOOJP_XFER_HOST "filetransfer.msg.yahoo.co.jp"
 #define YAHOOJP_WEBCAM_HOST "wc.yahoo.co.jp"
-/*not sure, must test:*/
-#define YAHOOJP_XFER_RELAY_HOST "relay.msg.yahoo.co.jp" 
+/* not sure, must test: */
+#define YAHOOJP_XFER_RELAY_HOST "relay.msg.yahoo.co.jp"
 #define YAHOOJP_XFER_RELAY_PORT 80
 #define YAHOOJP_ROOMLIST_URL "http://insider.msg.yahoo.co.jp/ycontent/"
 #define YAHOOJP_ROOMLIST_LOCALE "ja"
@@ -55,6 +63,11 @@
 
 #define WEBMESSENGER_URL "http://login.yahoo.com/config/login?.src=pg"
 
+#define YAHOO_SMS_CARRIER_URL "http://lookup.msg.vip.mud.yahoo.com"
+
+#define YAHOO_USERINFO_URL "http://address.yahoo.com/yab/us?v=XM&sync=1&tags=short&useutf8=1&noclear=1&legenc=codepage-1252"
+#define YAHOOJP_USERINFO_URL "http://address.yahoo.co.jp/yab/jp?v=XM&sync=1&tags=short&useutf8=1&noclear=1&legenc=codepage-1252"
+
 #define YAHOO_PICURL_SETTING "picture_url"
 #define YAHOO_PICCKSUM_SETTING "picture_checksum"
 #define YAHOO_PICEXPIRE_SETTING "picture_expire"
@@ -74,16 +87,27 @@
 #define YAHOO_STATUS_TYPE_INVISIBLE "invisible"
 #define YAHOO_STATUS_TYPE_MOBILE "mobile"
 
-#define YAHOO_CLIENT_VERSION_ID "2097087"
-#define YAHOO_CLIENT_VERSION "8.1.0.421"
+#define YAHOO_CLIENT_VERSION_ID "4194239"
+#define YAHOO_CLIENT_VERSION "9.0.0.2162"
 
-#define YAHOOJP_CLIENT_VERSION_ID "524223"
-#define YAHOOJP_CLIENT_VERSION "7,0,1,1"
+#define YAHOOJP_CLIENT_VERSION_ID "4194239"
+#define YAHOOJP_CLIENT_VERSION "9.0.0.2162"
 
+#define YAHOO_CLIENT_USERAGENT "Mozilla/5.0"
 
 /* Index into attention types list. */
 #define YAHOO_BUZZ 0
 
+typedef enum {
+	YAHOO_PKT_TYPE_SERVER = 0,
+	YAHOO_PKT_TYPE_P2P
+} yahoo_pkt_type;
+
+typedef enum {
+	YAHOO_P2P_WE_ARE_CLIENT =0,
+	YAHOO_P2P_WE_ARE_SERVER
+} yahoo_p2p_connection_type;
+
 enum yahoo_status {
 	YAHOO_STATUS_AVAILABLE = 0,
 	YAHOO_STATUS_BRB,
@@ -113,9 +137,37 @@ struct yahoo_buddy_icon_upload_data {
 	guint watcher;
 };
 
+struct yahoo_p2p_data	{
+	PurpleConnection *gc;
+	char *host_ip;
+	char *host_username;
+	int val_13;
+	guint input_event;
+	gint source;
+	int session_id;
+	yahoo_p2p_connection_type connection_type;
+};
+
 struct _YchtConn;
 
-struct yahoo_data {
+typedef struct _YahooPersonalDetails {
+	char *id;
+
+	struct {
+		char *first;
+		char *last;
+		char *middle;
+		char *nick;
+	} names;
+
+	struct {
+		char *work;
+		char *home;
+		char *mobile;
+	} phone;
+} YahooPersonalDetails;
+
+typedef struct {
 	PurpleConnection *gc;
 	int fd;
 	guchar *rxqueue;
@@ -124,6 +176,9 @@ struct yahoo_data {
 	guint txhandler;
 	GHashTable *friends;
 
+	char **profiles;  /* Multiple profiles can be associated with an account */
+	YahooPersonalDetails ypd;
+
 	/**
 	 * This is used to keep track of the IMVironment chosen
 	 * by people you talk to.  We don't do very much with
@@ -168,9 +223,9 @@ struct yahoo_data {
 	 * for when we lookup people profile or photo information.
 	 */
 	GSList *url_datas;
-	GHashTable *xfer_peer_idstring_map;/*Hey, i dont know, but putting this HashTable next to friends gives a run time fault...*/
-	GSList *cookies;/*contains all cookies, including _y and _t*/
-	
+	GHashTable *xfer_peer_idstring_map;/* Hey, i dont know, but putting this HashTable next to friends gives a run time fault... */
+	GSList *cookies;/* contains all cookies, including _y and _t */
+
 	/**
 	 * We may receive a list15 in multiple packets with no prior warning as to how many we'll be getting;
 	 * the server expects us to keep track of the group for which it is sending us contact names.
@@ -178,7 +233,13 @@ struct yahoo_data {
 	char *current_list15_grp;
 	time_t last_ping;
 	time_t last_keepalive;
-};
+	GHashTable *peers;	/* information about p2p data */
+	int yahoo_p2p_timer;
+	int yahoo_local_p2p_server_fd;
+	int yahoo_p2p_server_watcher;
+	GHashTable *sms_carrier;	/* sms carrier data */
+	guint yahoo_p2p_server_timeout_handle;
+} YahooData;
 
 #define YAHOO_MAX_STATUS_MESSAGE_LENGTH (255)
 
@@ -250,19 +311,49 @@ char *yahoo_string_decode(PurpleConnection *gc, const char *str, gboolean utf8);
 
 char *yahoo_convert_to_numeric(const char *str);
 
-/* previously-static functions, now needed for yahoo_profile.c */
-void yahoo_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full);
 
 /* yahoo_profile.c */
 void yahoo_get_info(PurpleConnection *gc, const char *name);
 
+/* libymsg.h  - these functions were formerly static but need not to be for the
+ * new two-prpl model. */
+const char *yahoo_list_icon(PurpleAccount *a, PurpleBuddy *b);
+const char *yahoo_list_emblem(PurpleBuddy *b);
+char *yahoo_status_text(PurpleBuddy *b);
+void yahoo_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full);
+GList *yahoo_status_types(PurpleAccount *account);
+GList *yahoo_blist_node_menu(PurpleBlistNode *node);
+void yahoo_login(PurpleAccount *account);
+void yahoo_close(PurpleConnection *gc);
+int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what, PurpleMessageFlags flags);
+unsigned int yahoo_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state);
+void yahoo_set_status(PurpleAccount *account, PurpleStatus *status);
+void yahoo_set_idle(PurpleConnection *gc, int idle);
+void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g);
+void yahoo_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group);
+void yahoo_add_deny(PurpleConnection *gc, const char *who);
+void yahoo_rem_deny(PurpleConnection *gc, const char *who);
+void yahoo_set_permit_deny(PurpleConnection *gc);
+void yahoo_keepalive(PurpleConnection *gc);
+void yahoo_change_buddys_group(PurpleConnection *gc, const char *who, const char *old_group, const char *new_group);
+void yahoo_rename_group(PurpleConnection *gc, const char *old_name, PurpleGroup *group, GList *moved_buddies);
+gboolean yahoo_offline_message(const PurpleBuddy *buddy);
+gboolean yahoo_send_attention(PurpleConnection *gc, const char *username, guint type);
+GList *yahoo_attention_types(PurpleAccount *account);
+
+GList *yahoo_actions(PurplePlugin *plugin, gpointer context);
+void yahoopurple_register_commands(void);
+
+PurpleCmdRet yahoopurple_cmd_buzz(PurpleConversation *c, const gchar *cmd, gchar **args, gchar **error, void *data);
+PurpleCmdRet yahoopurple_cmd_chat_join(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data);
+PurpleCmdRet yahoopurple_cmd_chat_list(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data);
 /* needed for xfer, thought theyd be useful for other enhancements later on
    Returns list of cookies stored in yahoo_data formatted as a single null terminated string
    returned value must be g_freed
 */
 gchar* yahoo_get_cookies(PurpleConnection *gc);
 
-gboolean yahoo_send_attention(PurpleConnection *gc, const char *username, guint type);
-GList *yahoo_attention_types(PurpleAccount *account);
+/* send p2p pkt containing our encoded ip, asking peer to connect to us */
+void yahoo_send_p2p_pkt(PurpleConnection *gc, const char *who, int val_13);
 
-#endif /* _YAHOO_H_ */
+#endif /* _LIBYMSG_H_ */
diff --git a/libpurple/protocols/yahoo/util.c b/libpurple/protocols/yahoo/util.c
index bec74be2ab..8f06fb0bbb 100644
--- a/libpurple/protocols/yahoo/util.c
+++ b/libpurple/protocols/yahoo/util.c
@@ -22,13 +22,13 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include "debug.h"
 #include "internal.h"
 #include "prpl.h"
 
-#include "yahoo.h"
+#include "libymsg.h"
 
 #include <string.h>
 
@@ -42,7 +42,7 @@ yahoo_account_use_http_proxy(PurpleConnection *conn)
 /*
  * Returns cookies formatted as a null terminated string for the given connection.
  * Must g_free return value.
- * 
+ *
  * TODO:will work, but must test for strict correctness
  */
 gchar* yahoo_get_cookies(PurpleConnection *gc)
@@ -53,7 +53,7 @@ gchar* yahoo_get_cookies(PurpleConnection *gc)
 	gchar *t1,*t2,*t3;
 	GSList *tmp;
 	GSList *cookies;
-	cookies = ((struct yahoo_data*)(gc->proto_data))->cookies;
+	cookies = ((YahooData*)(gc->proto_data))->cookies;
 	tmp = cookies;
 	while(tmp)
 	{
@@ -118,7 +118,7 @@ gchar* yahoo_get_cookies(PurpleConnection *gc)
  */
 char *yahoo_string_encode(PurpleConnection *gc, const char *str, gboolean *utf8)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	char *ret;
 	const char *to_codeset;
 
@@ -147,7 +147,7 @@ char *yahoo_string_encode(PurpleConnection *gc, const char *str, gboolean *utf8)
  */
 char *yahoo_string_decode(PurpleConnection *gc, const char *str, gboolean utf8)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	char *ret;
 	const char *from_codeset;
 
@@ -172,7 +172,6 @@ char *yahoo_string_decode(PurpleConnection *gc, const char *str, gboolean utf8)
 char *yahoo_convert_to_numeric(const char *str)
 {
 	GString *gstr = NULL;
-	char *retstr;
 	const unsigned char *p;
 
 	gstr = g_string_sized_new(strlen(str) * 6 + 1);
@@ -181,112 +180,172 @@ char *yahoo_convert_to_numeric(const char *str)
 		g_string_append_printf(gstr, "&#%u;", *p);
 	}
 
-	retstr = gstr->str;
-
-	g_string_free(gstr, FALSE);
-
-	return retstr;
+	return g_string_free(gstr, FALSE);
 }
 
 /*
+ * The values in this hash table should probably be lowercase, since that's
+ * what xhtml expects.  Also because yahoo_codes_to_html() does
+ * case-sensitive comparisons.
+ *
  * I found these on some website but i don't know that they actually
  * work (or are supposed to work). I didn't implement them yet.
- * 
-     * [0;30m ---black
-     * [1;37m ---white
-     * [0;37m ---tan
-     * [0;38m ---light black
-     * [1;39m ---dark blue
-     * [0;32m ---green
-     * [0;33m ---yellow
-     * [0;35m ---pink
-     * [1;35m ---purple
-     * [1;30m ---light blue
-     * [0;31m ---red
-     * [0;34m ---blue
-     * [0;36m ---aqua
-         * (shift+comma)lyellow(shift+period) ---light yellow
-     * (shift+comma)lgreen(shift+period) ---light green
-[2;30m <--white out
-*/
-
-static GHashTable *ht = NULL;
+ *
+ * [0;30m ---black
+ * [1;37m ---white
+ * [0;37m ---tan
+ * [0;38m ---light black
+ * [1;39m ---dark blue
+ * [0;32m ---green
+ * [0;33m ---yellow
+ * [0;35m ---pink
+ * [1;35m ---purple
+ * [1;30m ---light blue
+ * [0;31m ---red
+ * [0;34m ---blue
+ * [0;36m ---aqua
+ * (shift+comma)lyellow(shift+period) ---light yellow
+ * (shift+comma)lgreen(shift+period) ---light green
+ * [2;30m <--white out
+ */
+
+static GHashTable *esc_codes_ht = NULL;
+static GHashTable *tags_ht = NULL;
 
 void yahoo_init_colorht()
 {
-	ht = g_hash_table_new(g_str_hash, g_str_equal);
-/* the numbers in comments are what gyach uses, but i think they're incorrect */
-	g_hash_table_insert(ht, "30", "<FONT COLOR=\"#000000\">"); /* black */
-	g_hash_table_insert(ht, "31", "<FONT COLOR=\"#0000FF\">"); /* blue */
-	g_hash_table_insert(ht, "32", "<FONT COLOR=\"#008080\">"); /* cyan */      /* 00b2b2 */
-	g_hash_table_insert(ht, "33", "<FONT COLOR=\"#808080\">"); /* gray */      /* 808080 */
-	g_hash_table_insert(ht, "34", "<FONT COLOR=\"#008000\">"); /* green */     /* 00c200 */
-	g_hash_table_insert(ht, "35", "<FONT COLOR=\"#FF0080\">"); /* pink */      /* ffafaf */
-	g_hash_table_insert(ht, "36", "<FONT COLOR=\"#800080\">"); /* purple */    /* b200b2 */
-	g_hash_table_insert(ht, "37", "<FONT COLOR=\"#FF8000\">"); /* orange */    /* ffff00 */
-	g_hash_table_insert(ht, "38", "<FONT COLOR=\"#FF0000\">"); /* red */
-	g_hash_table_insert(ht, "39", "<FONT COLOR=\"#808000\">"); /* olive */     /* 546b50 */
-
-	g_hash_table_insert(ht,  "1",  "<B>");
-	g_hash_table_insert(ht, "x1", "</B>");
-	g_hash_table_insert(ht,  "2",  "<I>");
-	g_hash_table_insert(ht, "x2", "</I>");
-	g_hash_table_insert(ht,  "4",  "<U>");
-	g_hash_table_insert(ht, "x4", "</U>");
+	if (esc_codes_ht != NULL)
+		/* Hash table has already been initialized */
+		return;
+
+	/* Key is the escape code string.  Value is the HTML that should be
+	 * inserted in place of the escape code. */
+	esc_codes_ht = g_hash_table_new(g_str_hash, g_str_equal);
+
+	/* Key is the name of the HTML tag, for example "font" or "/font"
+	 * value is the HTML that should be inserted in place of the old tag */
+	tags_ht = g_hash_table_new(g_str_hash, g_str_equal);
+
+	/* the numbers in comments are what gyach uses, but i think they're incorrect */
+#ifdef USE_CSS_FORMATTING
+	g_hash_table_insert(esc_codes_ht, "30", "<span style=\"color: #000000\">"); /* black */
+	g_hash_table_insert(esc_codes_ht, "31", "<span style=\"color: #0000FF\">"); /* blue */
+	g_hash_table_insert(esc_codes_ht, "32", "<span style=\"color: #008080\">"); /* cyan */      /* 00b2b2 */
+	g_hash_table_insert(esc_codes_ht, "33", "<span style=\"color: #808080\">"); /* gray */      /* 808080 */
+	g_hash_table_insert(esc_codes_ht, "34", "<span style=\"color: #008000\">"); /* green */     /* 00c200 */
+	g_hash_table_insert(esc_codes_ht, "35", "<span style=\"color: #FF0080\">"); /* pink */      /* ffafaf */
+	g_hash_table_insert(esc_codes_ht, "36", "<span style=\"color: #800080\">"); /* purple */    /* b200b2 */
+	g_hash_table_insert(esc_codes_ht, "37", "<span style=\"color: #FF8000\">"); /* orange */    /* ffff00 */
+	g_hash_table_insert(esc_codes_ht, "38", "<span style=\"color: #FF0000\">"); /* red */
+	g_hash_table_insert(esc_codes_ht, "39", "<span style=\"color: #808000\">"); /* olive */     /* 546b50 */
+#else
+	g_hash_table_insert(esc_codes_ht, "30", "<font color=\"#000000\">"); /* black */
+	g_hash_table_insert(esc_codes_ht, "31", "<font color=\"#0000FF\">"); /* blue */
+	g_hash_table_insert(esc_codes_ht, "32", "<font color=\"#008080\">"); /* cyan */      /* 00b2b2 */
+	g_hash_table_insert(esc_codes_ht, "33", "<font color=\"#808080\">"); /* gray */      /* 808080 */
+	g_hash_table_insert(esc_codes_ht, "34", "<font color=\"#008000\">"); /* green */     /* 00c200 */
+	g_hash_table_insert(esc_codes_ht, "35", "<font color=\"#FF0080\">"); /* pink */      /* ffafaf */
+	g_hash_table_insert(esc_codes_ht, "36", "<font color=\"#800080\">"); /* purple */    /* b200b2 */
+	g_hash_table_insert(esc_codes_ht, "37", "<font color=\"#FF8000\">"); /* orange */    /* ffff00 */
+	g_hash_table_insert(esc_codes_ht, "38", "<font color=\"#FF0000\">"); /* red */
+	g_hash_table_insert(esc_codes_ht, "39", "<font color=\"#808000\">"); /* olive */     /* 546b50 */
+#endif /* !USE_CSS_FORMATTING */
+
+	g_hash_table_insert(esc_codes_ht,  "1",  "<b>");
+	g_hash_table_insert(esc_codes_ht, "x1", "</b>");
+	g_hash_table_insert(esc_codes_ht,  "2",  "<i>");
+	g_hash_table_insert(esc_codes_ht, "x2", "</i>");
+	g_hash_table_insert(esc_codes_ht,  "4",  "<u>");
+	g_hash_table_insert(esc_codes_ht, "x4", "</u>");
 
 	/* these just tell us the text they surround is supposed
 	 * to be a link. purple figures that out on its own so we
 	 * just ignore it.
 	 */
-	g_hash_table_insert(ht, "l", ""); /* link start */
-	g_hash_table_insert(ht, "xl", ""); /* link end */
-
-	g_hash_table_insert(ht, "<black>",  "<FONT COLOR=\"#000000\">");
-	g_hash_table_insert(ht, "<blue>",   "<FONT COLOR=\"#0000FF\">");
-	g_hash_table_insert(ht, "<cyan>",   "<FONT COLOR=\"#008284\">");
-	g_hash_table_insert(ht, "<gray>",   "<FONT COLOR=\"#848284\">");
-	g_hash_table_insert(ht, "<green>",  "<FONT COLOR=\"#008200\">");
-	g_hash_table_insert(ht, "<pink>",   "<FONT COLOR=\"#FF0084\">");
-	g_hash_table_insert(ht, "<purple>", "<FONT COLOR=\"#840084\">");
-	g_hash_table_insert(ht, "<orange>", "<FONT COLOR=\"#FF8000\">");
-	g_hash_table_insert(ht, "<red>",    "<FONT COLOR=\"#FF0000\">");
-	g_hash_table_insert(ht, "<yellow>", "<FONT COLOR=\"#848200\">");
-
-	g_hash_table_insert(ht, "</black>",  "</FONT>");
-	g_hash_table_insert(ht, "</blue>",   "</FONT>");
-	g_hash_table_insert(ht, "</cyan>",   "</FONT>");
-	g_hash_table_insert(ht, "</gray>",   "</FONT>");
-	g_hash_table_insert(ht, "</green>",  "</FONT>");
-	g_hash_table_insert(ht, "</pink>",   "</FONT>");
-	g_hash_table_insert(ht, "</purple>", "</FONT>");
-	g_hash_table_insert(ht, "</orange>", "</FONT>");
-	g_hash_table_insert(ht, "</red>",    "</FONT>");
-	g_hash_table_insert(ht, "</yellow>", "</FONT>");
-
-	/* remove these once we have proper support for <FADE> and <ALT> */
-	g_hash_table_insert(ht, "</fade>", "");
-	g_hash_table_insert(ht, "</alt>", "");
-
-	/* these are the normal html yahoo sends (besides <font>).
-	 * anything else will get turned into &lt;tag&gt;, so if I forgot
-	 * about something, please add it. Why Yahoo! has to send unescaped
-	 * <'s and >'s that aren't supposed to be html is beyond me.
-	 */
-	g_hash_table_insert(ht, "<b>", "<b>");
-	g_hash_table_insert(ht, "<i>", "<i>");
-	g_hash_table_insert(ht, "<u>", "<u>");
-
-	g_hash_table_insert(ht, "</b>", "</b>");
-	g_hash_table_insert(ht, "</i>", "</i>");
-	g_hash_table_insert(ht, "</u>", "</u>");
-	g_hash_table_insert(ht, "</font>", "</font>");
+	g_hash_table_insert(esc_codes_ht, "l", ""); /* link start */
+	g_hash_table_insert(esc_codes_ht, "xl", ""); /* link end */
+
+#ifdef USE_CSS_FORMATTING
+	g_hash_table_insert(tags_ht, "black",  "<span style=\"color: #000000\">");
+	g_hash_table_insert(tags_ht, "blue",   "<span style=\"color: #0000FF\">");
+	g_hash_table_insert(tags_ht, "cyan",   "<span style=\"color: #008284\">");
+	g_hash_table_insert(tags_ht, "gray",   "<span style=\"color: #848284\">");
+	g_hash_table_insert(tags_ht, "green",  "<span style=\"color: #008200\">");
+	g_hash_table_insert(tags_ht, "pink",   "<span style=\"color: #FF0084\">");
+	g_hash_table_insert(tags_ht, "purple", "<span style=\"color: #840084\">");
+	g_hash_table_insert(tags_ht, "orange", "<span style=\"color: #FF8000\">");
+	g_hash_table_insert(tags_ht, "red",    "<span style=\"color: #FF0000\">");
+	g_hash_table_insert(tags_ht, "yellow", "<span style=\"color: #848200\">");
+
+	g_hash_table_insert(tags_ht, "/black",  "</span>");
+	g_hash_table_insert(tags_ht, "/blue",   "</span>");
+	g_hash_table_insert(tags_ht, "/cyan",   "</span>");
+	g_hash_table_insert(tags_ht, "/gray",   "</span>");
+	g_hash_table_insert(tags_ht, "/green",  "</span>");
+	g_hash_table_insert(tags_ht, "/pink",   "</span>");
+	g_hash_table_insert(tags_ht, "/purple", "</span>");
+	g_hash_table_insert(tags_ht, "/orange", "</span>");
+	g_hash_table_insert(tags_ht, "/red",    "</span>");
+	g_hash_table_insert(tags_ht, "/yellow", "</span>");
+#else
+	g_hash_table_insert(tags_ht, "black",  "<font color=\"#000000\">");
+	g_hash_table_insert(tags_ht, "blue",   "<font color=\"#0000FF\">");
+	g_hash_table_insert(tags_ht, "cyan",   "<font color=\"#008284\">");
+	g_hash_table_insert(tags_ht, "gray",   "<font color=\"#848284\">");
+	g_hash_table_insert(tags_ht, "green",  "<font color=\"#008200\">");
+	g_hash_table_insert(tags_ht, "pink",   "<font color=\"#FF0084\">");
+	g_hash_table_insert(tags_ht, "purple", "<font color=\"#840084\">");
+	g_hash_table_insert(tags_ht, "orange", "<font color=\"#FF8000\">");
+	g_hash_table_insert(tags_ht, "red",    "<font color=\"#FF0000\">");
+	g_hash_table_insert(tags_ht, "yellow", "<font color=\"#848200\">");
+
+	g_hash_table_insert(tags_ht, "/black",  "</font>");
+	g_hash_table_insert(tags_ht, "/blue",   "</font>");
+	g_hash_table_insert(tags_ht, "/cyan",   "</font>");
+	g_hash_table_insert(tags_ht, "/gray",   "</font>");
+	g_hash_table_insert(tags_ht, "/green",  "</font>");
+	g_hash_table_insert(tags_ht, "/pink",   "</font>");
+	g_hash_table_insert(tags_ht, "/purple", "</font>");
+	g_hash_table_insert(tags_ht, "/orange", "</font>");
+	g_hash_table_insert(tags_ht, "/red",    "</font>");
+	g_hash_table_insert(tags_ht, "/yellow", "</font>");
+#endif /* !USE_CSS_FORMATTING */
+
+	/* We don't support these tags, so discard them */
+	g_hash_table_insert(tags_ht, "alt", "");
+	g_hash_table_insert(tags_ht, "fade", "");
+	g_hash_table_insert(tags_ht, "snd", "");
+	g_hash_table_insert(tags_ht, "/alt", "");
+	g_hash_table_insert(tags_ht, "/fade", "");
+
+	/* Official clients don't seem to send b, i or u tags.  They use
+	 * the escape codes listed above.  Official clients definitely send
+	 * font tags, though.  I wonder if we can remove the opening and
+	 * closing b, i and u tags from here? */
+	g_hash_table_insert(tags_ht, "b", "<b>");
+	g_hash_table_insert(tags_ht, "i", "<i>");
+	g_hash_table_insert(tags_ht, "u", "<u>");
+	g_hash_table_insert(tags_ht, "font", "<font>");
+
+	g_hash_table_insert(tags_ht, "/b", "</b>");
+	g_hash_table_insert(tags_ht, "/i", "</i>");
+	g_hash_table_insert(tags_ht, "/u", "</u>");
+	g_hash_table_insert(tags_ht, "/font", "</font>");
 }
 
 void yahoo_dest_colorht()
 {
-	g_hash_table_destroy(ht);
+	if (esc_codes_ht == NULL)
+		/* Hash table has already been destroyed */
+		return;
+
+	g_hash_table_destroy(esc_codes_ht);
+	esc_codes_ht = NULL;
+	g_hash_table_destroy(tags_ht);
+	tags_ht = NULL;
 }
 
+#ifndef USE_CSS_FORMATTING
 static int point_to_html(int x)
 {
 	if (x < 9)
@@ -303,128 +362,306 @@ static int point_to_html(int x)
 		return 6;
 	return 7;
 }
+#endif /* !USE_CSS_FORMATTING */
 
-/* The Yahoo size tag is actually an absz tag; convert it to an HTML size, and include both tags */
-static void _font_tags_fix_size(GString *tag, GString *dest)
+static void append_attrs_datalist_foreach_cb(GQuark key_id, gpointer data, gpointer user_data)
 {
-	char *x, *end;
-	int size;
+	const char *key;
+	const char *value;
+	xmlnode *cur;
 
-	if (((x = strstr(tag->str, "size"))) && ((x = strchr(x, '=')))) {
-		while (*x && !g_ascii_isdigit(*x))
-			x++;
-		if (*x) {
-			int htmlsize;
+	key = g_quark_to_string(key_id);
+	value = data;
+	cur = user_data;
 
-			size = strtol(x, &end, 10);
-			htmlsize = point_to_html(size);
-			g_string_append_len(dest, tag->str, x - tag->str);
-			g_string_append_printf(dest, "%d", htmlsize);
-			g_string_append_printf(dest, "\" absz=\"%d", size);
-			g_string_append(dest, end);
-		} else {
-			g_string_append(dest, tag->str);
+	xmlnode_set_attrib(cur, key, value);
+}
+
+/**
+ * @param cur A pointer to the position in the XML tree that we're
+ *        currently building.  This will be modified when opening a tag
+ *        or closing an existing tag.
+ */
+static void yahoo_codes_to_html_add_tag(xmlnode **cur, const char *tag, gboolean is_closing_tag, const gchar *tag_name, gboolean is_font_tag)
+{
+	if (is_closing_tag) {
+		xmlnode *tmp;
+		GSList *dangling_tags = NULL;
+
+		/* Move up the DOM until we find the opening tag */
+		for (tmp = *cur; tmp != NULL; tmp = xmlnode_get_parent(tmp)) {
+			/* Add one to tag_name when doing this comparison because it starts with a / */
+			if (g_str_equal(tmp->name, tag_name + 1))
+				/* Found */
+				break;
+			dangling_tags = g_slist_prepend(dangling_tags, tmp);
+		}
+		if (tmp == NULL) {
+			/* This is a closing tag with no opening tag.  Useless. */
+			purple_debug_error("yahoo", "Ignoring unmatched tag %s", tag);
+			g_slist_free(dangling_tags);
 			return;
 		}
+
+		/* Move our current position up, now that we've closed a tag */
+		*cur = xmlnode_get_parent(tmp);
+
+		/* Re-open any tags that were nested below the tag we just closed */
+		while (dangling_tags != NULL) {
+			tmp = dangling_tags->data;
+			dangling_tags = g_slist_delete_link(dangling_tags, dangling_tags);
+
+			/* Create a copy of this tag+attributes (but not child tags or
+			 * data) at our new location */
+			*cur = xmlnode_new_child(*cur, tmp->name);
+			for (tmp = tmp->child; tmp != NULL; tmp = tmp->next)
+				if (tmp->type == XMLNODE_TYPE_ATTRIB)
+					xmlnode_set_attrib_full(*cur, tmp->name,
+							tmp->xmlns, tmp->prefix, tmp->data);
+		}
 	} else {
-		g_string_append(dest, tag->str);
-		return;
+		const char *start;
+		const char *end;
+		GData *attributes;
+		char *fontsize = NULL;
+
+		purple_markup_find_tag(tag_name, tag, &start, &end, &attributes);
+		*cur = xmlnode_new_child(*cur, tag_name);
+
+		if (is_font_tag) {
+			/* Special case for the font size attribute */
+			fontsize = g_strdup(g_datalist_get_data(&attributes, "size"));
+			if (fontsize != NULL)
+				g_datalist_remove_data(&attributes, "size");
+		}
+
+		/* Add all font tag attributes */
+		g_datalist_foreach(&attributes, append_attrs_datalist_foreach_cb, *cur);
+		g_datalist_clear(&attributes);
+
+		if (fontsize != NULL) {
+#ifdef USE_CSS_FORMATTING
+			/*
+			 * The Yahoo font size value is given in pt, even though the HTML
+			 * standard for <font size="x"> treats the size as a number on a
+			 * scale between 1 and 7.  So we insert the font size as a CSS
+			 * style on a span tag.
+			 */
+			gchar *tmp = g_strdup_printf("font-size: %spt", fontsize);
+			*cur = xmlnode_new_child(*cur, "span");
+			xmlnode_set_attrib(*cur, "style", tmp);
+			g_free(tmp);
+#else
+			/*
+			 * The Yahoo font size value is given in pt, even though the HTML
+			 * standard for <font size="x"> treats the size as a number on a
+			 * scale between 1 and 7.  So we convert it to an appropriate
+			 * value.  This loses precision, which is why CSS formatting is
+			 * preferred.  The "absz" attribute remains here for backward
+			 * compatibility with UIs that might use it, but it is totally
+			 * not standard at all.
+			 */
+			int size, htmlsize;
+			gchar tmp[11];
+			size = strtol(fontsize, NULL, 10);
+			htmlsize = point_to_html(size);
+			sprintf(tmp, "%u", htmlsize);
+			xmlnode_set_attrib(*cur, "size", tmp);
+			xmlnode_set_attrib(*cur, "absz", fontsize);
+#endif /* !USE_CSS_FORMATTING */
+			g_free(fontsize);
+		}
 	}
 }
 
-char *yahoo_codes_to_html(const char *x)
+/**
+ * Similar to purple_markup_get_tag_name(), but works with closing tags.
+ *
+ * @return The lowercase name of the tag.  If this is a closing tag then
+ *         this value starts with a forward slash.  The caller must free
+ *         this string with g_free.
+ */
+static gchar *yahoo_markup_get_tag_name(const char *tag, gboolean *is_closing_tag)
 {
-	GString *s, *tmp;
-	int i, j, xs, nomoreendtags = 0; /* s/endtags/closinganglebrackets */
-	char *match, *ret;
+	size_t len;
 
-	s = g_string_sized_new(strlen(x));
+	*is_closing_tag = (tag[1] == '/');
+	if (*is_closing_tag)
+		len = strcspn(tag + 1, "> ");
+	else
+		len = strcspn(tag + 1, "> /");
 
-	for (i = 0, xs = strlen(x); i < xs; i++) {
+	return g_utf8_strdown(tag + 1, len);
+}
+
+/*
+ * Yahoo! messages generally aren't well-formed.  Their markup is
+ * more of a flow from start to finish rather than a hierarchy from
+ * outer to inner.  They tend to open tags and close them only when
+ * necessary.
+ *
+ * Example: <font size="8">size 8 <font size="16">size 16 <font size="8">size 8 again
+ *
+ * But we want to send well-formed HTML to the core, so we step through
+ * the input string and build an xmlnode tree containing sanitized HTML.
+ */
+char *yahoo_codes_to_html(const char *x)
+{
+	size_t x_len;
+	xmlnode *html, *cur;
+	GString *cdata = g_string_new(NULL);
+	int i, j;
+	gboolean no_more_gt_brackets = FALSE;
+	const char *match;
+	gchar *xmlstr1, *xmlstr2;
+
+	x_len = strlen(x);
+	html = xmlnode_new("html");
+
+	cur = html;
+	for (i = 0; i < x_len; i++) {
 		if ((x[i] == 0x1b) && (x[i+1] == '[')) {
+			/* This escape sequence signifies the beginning of some
+			 * text formatting code */
 			j = i + 1;
 
-			while (j++ < xs) {
+			while (j++ < x_len) {
+				gchar *code;
+
 				if (x[j] != 'm')
+					/* Keep looking for the end of this sequence */
 					continue;
-				else {
-					tmp = g_string_new_len(x + i + 2, j - i - 2);
-					if (tmp->str[0] == '#')
-						g_string_append_printf(s, "<FONT COLOR=\"%s\">", tmp->str);
-					else if ((match = (char *) g_hash_table_lookup(ht, tmp->str)))
-						g_string_append(s, match);
-					else {
-						purple_debug(PURPLE_DEBUG_ERROR, "yahoo",
-							"Unknown ansi code 'ESC[%sm'.\n", tmp->str);
-						g_string_free(tmp, TRUE);
-						break;
+
+				/* We've reached the end of the formatting sequence, yay */
+
+				/* Append any character data that belongs in the current node */
+				if (cdata->len > 0) {
+					xmlnode_insert_data(cur, cdata->str, cdata->len);
+					g_string_truncate(cdata, 0);
+				}
+
+				code = g_strndup(x + i + 2, j - i - 2);
+				if (code[0] == '#') {
+#ifdef USE_CSS_FORMATTING
+					gchar *tmp = g_strdup_printf("color: %s", code);
+					cur = xmlnode_new_child(cur, "span");
+					xmlnode_set_attrib(cur, "style", tmp);
+					g_free(tmp);
+#else
+					cur = xmlnode_new_child(cur, "font");
+					xmlnode_set_attrib(cur, "color", code);
+#endif /* !USE_CSS_FORMATTING */
+
+				} else if ((match = g_hash_table_lookup(esc_codes_ht, code))) {
+					/* Some tags are in the hash table only because we
+					 * want to ignore them */
+					if (match[0] != '\0') {
+						gboolean is_closing_tag;
+						gchar *tag_name;
+						tag_name = yahoo_markup_get_tag_name(match, &is_closing_tag);
+						yahoo_codes_to_html_add_tag(&cur, match, is_closing_tag, tag_name, FALSE);
+						g_free(tag_name);
 					}
 
-					i = j;
-					g_string_free(tmp, TRUE);
-					break;
+				} else {
+					purple_debug_error("yahoo",
+						"Ignoring unknown ansi code 'ESC[%sm'.\n", code);
 				}
+
+				g_free(code);
+				i = j;
+				break;
 			}
 
-		} else if (!nomoreendtags && (x[i] == '<')) {
+		} else if (x[i] == '<' && !no_more_gt_brackets) {
+			/* The start of an HTML tag */
 			j = i;
 
-			while (j++ < xs) {
-				if (x[j] != '>')
-					if (j == xs) {
-						g_string_append(s, "&lt;");
-						nomoreendtags = 1;
+			while (j++ < x_len) {
+				gchar *tag;
+				gboolean is_closing_tag;
+				gchar *tag_name;
+
+				if (x[j] != '>') {
+					if (x[j] == '"') {
+						/* We're inside a quoted attribute value. Skip to the end */
+						j++;
+						while (j != x_len && x[j] != '"')
+							j++;
+					} else if (x[j] == '\'') {
+						/* We're inside a quoted attribute value. Skip to the end */
+						j++;
+						while (j != x_len && x[j] != '\'')
+							j++;
 					}
-					else
+					if (j != x_len)
+						/* Keep looking for the end of this tag */
 						continue;
-				else {
-					tmp = g_string_new_len(x + i, j - i + 1);
-					g_string_ascii_down(tmp);
-
-					if ((match = (char *) g_hash_table_lookup(ht, tmp->str)))
-						g_string_append(s, match);
-					else if (!strncmp(tmp->str, "<fade ", 6) ||
-						!strncmp(tmp->str, "<alt ", 5) ||
-						!strncmp(tmp->str, "<snd ", 5)) {
-
-						/* remove this if gtkimhtml ever supports any of these */
-						i = j;
-						g_string_free(tmp, TRUE);
-						break;
 
-					} else if (!strncmp(tmp->str, "<font ", 6)) {
-						_font_tags_fix_size(tmp, s);
-					} else {
-						g_string_append(s, "&lt;");
-						g_string_free(tmp, TRUE);
-						break;
-					}
+					/* This < has no corresponding > */
+					g_string_append_c(cdata, x[i]);
+					no_more_gt_brackets = TRUE;
+					break;
+				}
 
-					i = j;
-					g_string_free(tmp, TRUE);
+				tag = g_strndup(x + i, j - i + 1);
+				tag_name = yahoo_markup_get_tag_name(tag, &is_closing_tag);
+
+				match = g_hash_table_lookup(tags_ht, tag_name);
+				if (match == NULL) {
+					/* Unknown tag.  The user probably typed a less-than sign */
+					g_string_append_c(cdata, x[i]);
+					no_more_gt_brackets = TRUE;
+					g_free(tag);
+					g_free(tag_name);
 					break;
 				}
 
+				/* Some tags are in the hash table only because we
+				 * want to ignore them */
+				if (match[0] != '\0') {
+					/* Append any character data that belongs in the current node */
+					if (cdata->len > 0) {
+						xmlnode_insert_data(cur, cdata->str, cdata->len);
+						g_string_truncate(cdata, 0);
+					}
+					if (g_str_equal(tag_name, "font"))
+						/* Font tags are a special case.  We don't
+						 * necessarily want to replace the whole thing--
+						 * we just want to fix the size attribute. */
+						yahoo_codes_to_html_add_tag(&cur, tag, is_closing_tag, tag_name, TRUE);
+					else
+						yahoo_codes_to_html_add_tag(&cur, match, is_closing_tag, tag_name, FALSE);
+				}
+
+				i = j;
+				g_free(tag);
+				g_free(tag_name);
+				break;
 			}
 
 		} else {
-			if (x[i] == '<')
-				g_string_append(s, "&lt;");
-			else if (x[i] == '>')
-				g_string_append(s, "&gt;");
-			else if (x[i] == '&')
-				g_string_append(s, "&amp;");
-			else if (x[i] == '"')
-				g_string_append(s, "&quot;");
-			else
-				g_string_append_c(s, x[i]);
+			g_string_append_c(cdata, x[i]);
 		}
 	}
 
-	ret = s->str;
-	g_string_free(s, FALSE);
-	purple_debug(PURPLE_DEBUG_MISC, "yahoo", "yahoo_codes_to_html:  Returning string: '%s'.\n", ret);
-	return ret;
+	/* Append any remaining character data */
+	if (cdata->len > 0)
+		xmlnode_insert_data(cur, cdata->str, cdata->len);
+	g_string_free(cdata, TRUE);
+
+	/* Serialize our HTML */
+	xmlstr1 = xmlnode_to_str(html, NULL);
+	xmlnode_free(html);
+
+	/* Strip off the outter HTML node */
+	/* This probably isn't necessary, especially if we made the outter HTML
+	 * node an empty span.  But the HTML is simpler this way. */
+	xmlstr2 = g_strndup(xmlstr1 + 6, strlen(xmlstr1) - 13);
+	g_free(xmlstr1);
+
+	purple_debug_misc("yahoo", "yahoo_codes_to_html:  Returning string: '%s'.\n", xmlstr2);
+	return xmlstr2;
 }
 
 /* borrowed from gtkimhtml */
@@ -432,8 +669,16 @@ char *yahoo_codes_to_html(const char *x)
 #define POINT_SIZE(x) (_point_sizes [MIN ((x > 0 ? x : 1), MAX_FONT_SIZE) - 1])
 static const gint _point_sizes [] = { 8, 10, 12, 14, 20, 30, 40 };
 
-enum fatype { size, color, face, junk };
-typedef struct {
+enum fatype
+{
+	FATYPE_SIZE,
+	FATYPE_COLOR,
+	FATYPE_FACE,
+	FATYPE_JUNK
+};
+
+typedef struct
+{
 	enum fatype type;
 	union {
 		int size;
@@ -445,28 +690,26 @@ typedef struct {
 
 static void fontattr_free(fontattr *f)
 {
-	if (f->type == color)
+	if (f->type == FATYPE_COLOR)
 		g_free(f->u.color);
-	else if (f->type == face)
+	else if (f->type == FATYPE_FACE)
 		g_free(f->u.face);
 	g_free(f);
 }
 
-static void yahoo_htc_queue_cleanup(GQueue *q)
+static void yahoo_htc_list_cleanup(GSList *l)
 {
-	char *tmp;
-
-	while ((tmp = g_queue_pop_tail(q)))
-		g_free(tmp);
-	g_queue_free(q);
+	while (l != NULL) {
+		g_free(l->data);
+		l = g_slist_delete_link(l, l);
+	}
 }
 
 static void _parse_font_tag(const char *src, GString *dest, int *i, int *j,
-				int len, GQueue *colors, GQueue *tags, GQueue *ftattr)
+				int len, GSList **colors, GSList **tags, GQueue *ftattr)
 {
-
 	int m, n, vstart;
-	gboolean quote = 0, done = 0;
+	gboolean quote = FALSE, done = FALSE;
 
 	m = *j;
 
@@ -491,7 +734,7 @@ static void _parse_font_tag(const char *src, GString *dest, int *i, int *j,
 
 				if (src[n] == '"') {
 					if (!quote) {
-						quote = 1;
+						quote = TRUE;
 						vstart = n;
 						continue;
 					} else {
@@ -500,14 +743,14 @@ static void _parse_font_tag(const char *src, GString *dest, int *i, int *j,
 				}
 
 				if (!quote && ((src[n] == ' ') || (src[n] == '>')))
-					done = 1;
+					done = TRUE;
 
 				if (done) {
 					if (!g_ascii_strncasecmp(&src[*j+1], "FACE", m - *j - 1)) {
 						fontattr *f;
 
 						f = g_new(fontattr, 1);
-						f->type = face;
+						f->type = FATYPE_FACE;
 						f->u.face = g_strndup(&src[vstart+1], n-vstart-1);
 						if (!ftattr)
 							ftattr = g_queue_new();
@@ -518,7 +761,7 @@ static void _parse_font_tag(const char *src, GString *dest, int *i, int *j,
 						fontattr *f;
 
 						f = g_new(fontattr, 1);
-						f->type = size;
+						f->type = FATYPE_SIZE;
 						f->u.size = POINT_SIZE(strtol(&src[vstart+1], NULL, 10));
 						if (!ftattr)
 							ftattr = g_queue_new();
@@ -529,7 +772,7 @@ static void _parse_font_tag(const char *src, GString *dest, int *i, int *j,
 						fontattr *f;
 
 						f = g_new(fontattr, 1);
-						f->type = color;
+						f->type = FATYPE_COLOR;
 						f->u.color = g_strndup(&src[vstart+1], n-vstart-1);
 						if (!ftattr)
 							ftattr = g_queue_new();
@@ -540,7 +783,7 @@ static void _parse_font_tag(const char *src, GString *dest, int *i, int *j,
 						fontattr *f;
 
 						f = g_new(fontattr, 1);
-						f->type = junk;
+						f->type = FATYPE_JUNK;
 						f->u.junk = g_strndup(&src[*j+1], n-*j);
 						if (!ftattr)
 							ftattr = g_queue_new();
@@ -557,56 +800,52 @@ static void _parse_font_tag(const char *src, GString *dest, int *i, int *j,
 			*j = m;
 
 		if (src[m] == '>') {
-			gboolean needendtag = 0;
+			gboolean needendtag = FALSE;
 			fontattr *f;
 			GString *tmp = g_string_new(NULL);
-			char *colorstr;
 
 			if (!g_queue_is_empty(ftattr)) {
 				while ((f = g_queue_pop_tail(ftattr))) {
 					switch (f->type) {
-					case size:
+					case FATYPE_SIZE:
 						if (!needendtag) {
-							needendtag = 1;
+							needendtag = TRUE;
 							g_string_append(dest, "<font ");
 						}
 
 						g_string_append_printf(dest, "size=\"%d\" ", f->u.size);
-						fontattr_free(f);
 						break;
-					case face:
+					case FATYPE_FACE:
 						if (!needendtag) {
-							needendtag = 1;
+							needendtag = TRUE;
 							g_string_append(dest, "<font ");
 						}
 
 						g_string_append_printf(dest, "face=\"%s\" ", f->u.face);
-						fontattr_free(f);
 						break;
-					case junk:
+					case FATYPE_JUNK:
 						if (!needendtag) {
-							needendtag = 1;
+							needendtag = TRUE;
 							g_string_append(dest, "<font ");
 						}
 
 						g_string_append(dest, f->u.junk);
-						fontattr_free(f);
 						break;
 
-					case color:
+					case FATYPE_COLOR:
 						if (needendtag) {
 							g_string_append(tmp, "</font>");
 							dest->str[dest->len-1] = '>';
-							needendtag = 0;
+							needendtag = TRUE;
 						}
 
-						colorstr = g_queue_peek_tail(colors);
-						g_string_append(tmp, colorstr ? colorstr : "\033[#000000m");
+						g_string_append(tmp, *colors ? (*colors)->data : "\033[#000000m");
 						g_string_append_printf(dest, "\033[%sm", f->u.color);
-						g_queue_push_tail(colors, g_strdup_printf("\033[%sm", f->u.color));
-						fontattr_free(f);
+						*colors = g_slist_prepend(*colors,
+								g_strdup_printf("\033[%sm", f->u.color));
 						break;
 					}
+					fontattr_free(f);
 				}
 
 				g_queue_free(ftattr);
@@ -614,10 +853,10 @@ static void _parse_font_tag(const char *src, GString *dest, int *i, int *j,
 
 				if (needendtag) {
 					dest->str[dest->len-1] = '>';
-					g_queue_push_tail(tags, g_strdup("</font>"));
+					*tags = g_slist_prepend(*tags, g_strdup("</font>"));
 					g_string_free(tmp, TRUE);
 				} else {
-					g_queue_push_tail(tags, tmp->str);
+					*tags = g_slist_prepend(*tags, tmp->str);
 					g_string_free(tmp, FALSE);
 				}
 			}
@@ -626,31 +865,31 @@ static void _parse_font_tag(const char *src, GString *dest, int *i, int *j,
 			break;
 		}
 	}
-
 }
 
 char *yahoo_html_to_codes(const char *src)
 {
-	int i, j, len;
+	GSList *colors = NULL;
+	GSList *tags = NULL;
+	size_t src_len;
+	int i, j;
 	GString *dest;
-	char *ret, *esc;
-	GQueue *colors, *tags;
+	char *esc;
 	GQueue *ftattr = NULL;
 	gboolean no_more_specials = FALSE;
 
-	colors = g_queue_new();
-	tags = g_queue_new();
-	dest = g_string_sized_new(strlen(src));
+	src_len = strlen(src);
+	dest = g_string_sized_new(src_len);
 
-	for (i = 0, len = strlen(src); i < len; i++) {
+	for (i = 0; i < src_len; i++) {
 
-		if (!no_more_specials && src[i] == '<') {
+		if (src[i] == '<' && !no_more_specials) {
 			j = i;
 
 			while (1) {
 				j++;
 
-				if (j >= len) { /* no '>' */
+				if (j >= src_len) { /* no '>' */
 					g_string_append_c(dest, src[i]);
 					no_more_specials = TRUE;
 					break;
@@ -679,7 +918,7 @@ char *yahoo_html_to_codes(const char *src)
 						char *t = strchr(&src[j], '>');
 						if (!t) {
 							g_string_append(dest, &src[i]);
-							i = len;
+							i = src_len;
 							break;
 						} else {
 							i = t - src;
@@ -688,17 +927,19 @@ char *yahoo_html_to_codes(const char *src)
 					} else if (!g_ascii_strncasecmp(&src[i+1], "A HREF=\"", j - i - 1)) {
 						j += 7;
 						g_string_append(dest, "\033[lm");
+						if (purple_str_has_prefix(src + j, "mailto:"))
+							j += sizeof("mailto:") - 1;
 						while (1) {
 							g_string_append_c(dest, src[j]);
-							if (++j >= len) {
-								i = len;
+							if (++j >= src_len) {
+								i = src_len;
 								break;
 							}
 							if (src[j] == '"') {
 								g_string_append(dest, "\033[xlm");
 								while (1) {
-									if (++j >= len) {
-										i = len;
+									if (++j >= src_len) {
+										i = src_len;
 										break;
 									}
 									if (!g_ascii_strncasecmp(&src[j], "</A>", 4)) {
@@ -712,9 +953,9 @@ char *yahoo_html_to_codes(const char *src)
 						}
 					} else if (!g_ascii_strncasecmp(&src[i+1], "SPAN", j - i - 1)) { /* drop span tags */
 						while (1) {
-							if (++j >= len) {
+							if (++j >= src_len) {
 								g_string_append(dest, &src[i]);
-								i = len;
+								i = src_len;
 								break;
 							}
 							if (src[j] == '>') {
@@ -724,9 +965,9 @@ char *yahoo_html_to_codes(const char *src)
 						}
 					} else if (g_ascii_strncasecmp(&src[i+1], "FONT", j - i - 1)) { /* not interested! */
 						while (1) {
-							if (++j >= len) {
+							if (++j >= src_len) {
 								g_string_append(dest, &src[i]);
-								i = len;
+								i = src_len;
 								break;
 							}
 							if (src[j] == '>') {
@@ -736,7 +977,7 @@ char *yahoo_html_to_codes(const char *src)
 							}
 						}
 					} else { /* yay we have a font tag */
-						_parse_font_tag(src, dest, &i, &j, len, colors, tags, ftattr);
+						_parse_font_tag(src, dest, &i, &j, src_len, &colors, &tags, ftattr);
 					}
 
 					break;
@@ -770,16 +1011,18 @@ char *yahoo_html_to_codes(const char *src)
 							/* mmm, </body> tags. *BURP* */
 						} else if (!g_ascii_strncasecmp(&src[i+1], "/SPAN", sublen)) {
 							/* </span> tags. dangerously close to </spam> */
-						} else if (!g_ascii_strncasecmp(&src[i+1], "/FONT", sublen) && g_queue_peek_tail(tags)) {
-							char *etag, *cl;
+						} else if (!g_ascii_strncasecmp(&src[i+1], "/FONT", sublen) && tags != NULL) {
+							char *etag;
 
-							etag = g_queue_pop_tail(tags);
+							etag = tags->data;
+							tags = g_slist_delete_link(tags, tags);
 							if (etag) {
 								g_string_append(dest, etag);
 								if (!strcmp(etag, "</font>")) {
-									cl = g_queue_pop_tail(colors);
-									if (cl)
-										g_free(cl);
+									if (colors != NULL) {
+										g_free(colors->data);
+										colors = g_slist_delete_link(colors, colors);
+									}
 								}
 								g_free(etag);
 							}
@@ -797,36 +1040,26 @@ char *yahoo_html_to_codes(const char *src)
 			}
 
 		} else {
-			if (((len - i) >= 4) && !strncmp(&src[i], "&lt;", 4)) {
-				g_string_append_c(dest, '<');
-				i += 3;
-			} else if (((len - i) >= 4) && !strncmp(&src[i], "&gt;", 4)) {
-				g_string_append_c(dest, '>');
-				i += 3;
-			} else if (((len - i) >= 5) && !strncmp(&src[i], "&amp;", 5)) {
-				g_string_append_c(dest, '&');
-				i += 4;
-			} else if (((len - i) >= 6) && !strncmp(&src[i], "&quot;", 6)) {
-				g_string_append_c(dest, '"');
-				i += 5;
-			} else if (((len - i) >= 6) && !strncmp(&src[i], "&apos;", 6)) {
-				g_string_append_c(dest, '\'');
-				i += 5;
-			} else {
+			const char *entity;
+			int length;
+
+			entity = purple_markup_unescape_entity(src + i, &length);
+			if (entity != NULL) {
+				/* src[i] is the start of an HTML entity */
+				g_string_append(dest, entity);
+				i += length - 1;
+			} else
+				/* src[i] is a normal character */
 				g_string_append_c(dest, src[i]);
-			}
 		}
 	}
 
-	ret = dest->str;
-	g_string_free(dest, FALSE);
-
-	esc = g_strescape(ret, NULL);
-	purple_debug(PURPLE_DEBUG_MISC, "yahoo", "yahoo_html_to_codes:  Returning string: '%s'.\n", esc);
+	esc = g_strescape(dest->str, NULL);
+	purple_debug_misc("yahoo", "yahoo_html_to_codes:  Returning string: '%s'.\n", esc);
 	g_free(esc);
 
-	yahoo_htc_queue_cleanup(colors);
-	yahoo_htc_queue_cleanup(tags);
+	yahoo_htc_list_cleanup(colors);
+	yahoo_htc_list_cleanup(tags);
 
-	return ret;
+	return g_string_free(dest, FALSE);
 }
diff --git a/libpurple/protocols/yahoo/yahoo_aliases.c b/libpurple/protocols/yahoo/yahoo_aliases.c
index 927e69120b..fe5286fc87 100644
--- a/libpurple/protocols/yahoo/yahoo_aliases.c
+++ b/libpurple/protocols/yahoo/yahoo_aliases.c
@@ -29,16 +29,17 @@
 #include "blist.h"
 #include "debug.h"
 #include "util.h"
+#include "request.h"
 #include "version.h"
-#include "yahoo.h"
+#include "libymsg.h"
 #include "yahoo_aliases.h"
 #include "yahoo_friend.h"
 #include "yahoo_packet.h"
 
 /* I hate hardcoding this stuff, but Yahoo never sends us anything to use.  Someone in the know may be able to tweak this URL */
-#define YAHOO_ALIAS_FETCH_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=0&tags=short&rt=0&prog-ver=8.1.0.249&useutf8=1&legenc=codepage-1252"
+#define YAHOO_ALIAS_FETCH_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=0&tags=short&rt=0&prog-ver=" YAHOO_CLIENT_VERSION "&useutf8=1&legenc=codepage-1252"
 #define YAHOO_ALIAS_UPDATE_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1&useutf8=1&legenc=codepage-1252"
-#define YAHOOJP_ALIAS_FETCH_URL "http://address.yahoo.co.jp/yab/jp?v=XM&prog=ymsgr&.intl=jp&diffs=1&t=0&tags=short&rt=0&prog-ver=7.0.0.7"
+#define YAHOOJP_ALIAS_FETCH_URL "http://address.yahoo.co.jp/yab/jp?v=XM&prog=ymsgr&.intl=jp&diffs=1&t=0&tags=short&rt=0&prog-ver=" YAHOOJP_CLIENT_VERSION
 #define YAHOOJP_ALIAS_UPDATE_URL "http://address.yahoo.co.jp/yab/jp?v=XM&prog=ymsgr&.intl=jp&sync=1&tags=short&noclear=1"
 
 void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);
@@ -52,6 +53,18 @@ struct callback_data {
 	gchar *who;
 };
 
+void yahoo_personal_details_reset(YahooPersonalDetails *ypd, gboolean all)
+{
+	if (all)
+		g_free(ypd->id);
+	g_free(ypd->names.first);
+	g_free(ypd->names.last);
+	g_free(ypd->names.middle);
+	g_free(ypd->names.nick);
+	g_free(ypd->phone.work);
+	g_free(ypd->phone.home);
+	g_free(ypd->phone.mobile);
+}
 
 /**************************************************************************
  * Alias Fetch Functions
@@ -60,9 +73,8 @@ struct callback_data {
 static void
 yahoo_fetch_aliases_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, size_t len, const gchar *error_message)
 {
-	struct callback_data *cb = user_data;
-	PurpleConnection *gc = cb->gc;
-	struct yahoo_data *yd = gc->proto_data;
+	PurpleConnection *gc = user_data;
+	YahooData *yd = gc->proto_data;
 
 	yd->url_datas = g_slist_remove(yd->url_datas, url_data);
 
@@ -71,19 +83,19 @@ yahoo_fetch_aliases_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, con
 						  error_message ? " Error:" : "", error_message ? error_message : "");
 	} else {
 		gchar *full_name, *nick_name;
-		const char *yid, *id, *fn, *ln, *nn, *alias;
+		const char *yid, *id, *fn, *ln, *nn, *alias, *mn;
+		const char *hp, *wp, *mo;
 		YahooFriend *f;
 		PurpleBuddy *b;
 		xmlnode *item, *contacts;
+		PurpleAccount *account;
 
+		account = purple_connection_get_account(gc);
 		/* Put our web response into a xmlnode for easy management */
 		contacts = xmlnode_from_str(url_text, -1);
 
 		if (contacts == NULL) {
 			purple_debug_error("yahoo", "Badly formed Alias XML\n");
-			g_free(cb->who);
-			g_free(cb->id);
-			g_free(cb);
 			return;
 		}
 		purple_debug_info("yahoo", "Fetched %" G_GSIZE_FORMAT
@@ -93,12 +105,18 @@ yahoo_fetch_aliases_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, con
 		for(item = xmlnode_get_child(contacts, "ct"); item; item = xmlnode_get_next_twin(item)) {
 			/* Yahoo replies with two types of contact (ct) record, we are only interested in the alias ones */
 			if ((yid = xmlnode_get_attrib(item, "yi"))) {
+				YahooPersonalDetails *ypd = NULL;
 				/* Grab all the bits of information we can */
 				fn = xmlnode_get_attrib(item, "fn");
 				ln = xmlnode_get_attrib(item, "ln");
 				nn = xmlnode_get_attrib(item, "nn");
+				mn = xmlnode_get_attrib(item, "mn");
 				id = xmlnode_get_attrib(item, "id");
 
+				hp = xmlnode_get_attrib(item, "hp");
+				wp = xmlnode_get_attrib(item, "wp");
+				mo = xmlnode_get_attrib(item, "mo");
+
 				full_name = nick_name = NULL;
 				alias = NULL;
 
@@ -115,8 +133,8 @@ yahoo_fetch_aliases_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, con
 					alias = full_name;  /* If no Yahoo nickname, we can use the full_name created above */
 
 				/*  Find the local buddy that matches */
-				f = yahoo_friend_find(cb->gc, yid);
-				b = purple_find_buddy(cb->gc->account, yid);
+				f = yahoo_friend_find(gc, yid);
+				b = purple_find_buddy(account, yid);
 
 				/*  If we don't find a matching buddy, ignore the alias !!  */
 				if (f != NULL && b != NULL) {
@@ -125,14 +143,37 @@ yahoo_fetch_aliases_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, con
 
 					/* Finally, if we received an alias, we better update the buddy list */
 					if (alias != NULL) {
-						serv_got_alias(cb->gc, yid, alias);
+						serv_got_alias(gc, yid, alias);
 						purple_debug_info("yahoo", "Fetched alias '%s' (%s)\n", alias, id);
 					} else if (buddy_alias != NULL && strcmp(buddy_alias, "") != 0) {
 					/* Or if we have an alias that Yahoo doesn't, send it up */
-						yahoo_update_alias(cb->gc, yid, buddy_alias);
+						yahoo_update_alias(gc, yid, buddy_alias);
 						purple_debug_info("yahoo", "Sent updated alias '%s'\n", buddy_alias);
 					}
 				}
+				
+				if (f != NULL)
+					ypd = &f->ypd;
+				else {
+					/* May be the alias is for the account? */
+					const char *yidn = purple_normalize(account, yid);
+					if (purple_strequal(yidn, purple_connection_get_display_name(gc))) {
+						ypd = &yd->ypd;
+					}
+				}
+
+				if (ypd) {
+					yahoo_personal_details_reset(ypd, TRUE);
+					ypd->id = g_strdup(id);
+					ypd->names.first = g_strdup(fn);
+					ypd->names.middle = g_strdup(mn);
+					ypd->names.last = g_strdup(ln);
+					ypd->names.nick = g_strdup(nn);
+
+					ypd->phone.work = g_strdup(wp);
+					ypd->phone.home = g_strdup(hp);
+					ypd->phone.mobile = g_strdup(mo);
+				}
 
 				g_free(full_name);
 				g_free(nick_name);
@@ -140,17 +181,12 @@ yahoo_fetch_aliases_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, con
 		}
 		xmlnode_free(contacts);
 	}
-
-	g_free(cb->who);
-	g_free(cb->id);
-	g_free(cb);
 }
 
 void
 yahoo_fetch_aliases(PurpleConnection *gc)
 {
-	struct yahoo_data *yd = gc->proto_data;
-	struct callback_data *cb;
+	YahooData *yd = gc->proto_data;
 	const char *url;
 	gchar *request, *webpage, *webaddress;
 	PurpleUtilFetchUrlData *url_data;
@@ -158,15 +194,11 @@ yahoo_fetch_aliases(PurpleConnection *gc)
 	/* use whole URL if using HTTP Proxy */
 	gboolean use_whole_url = yahoo_account_use_http_proxy(gc);
 
-	/* Using callback_data so I have access to gc in the callback function */
-	cb = g_new0(struct callback_data, 1);
-	cb->gc = gc;
-
 	/*  Build all the info to make the web request */
 	url = yd->jp ? YAHOOJP_ALIAS_FETCH_URL : YAHOO_ALIAS_FETCH_URL;
 	purple_url_parse(url, &webaddress, NULL, &webpage, NULL, NULL);
 	request = g_strdup_printf("GET %s%s/%s HTTP/1.1\r\n"
-				 "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
+				 "User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
 				 "Cookie: T=%s; Y=%s\r\n"
 				 "Host: %s\r\n"
 				 "Cache-Control: no-cache\r\n\r\n",
@@ -175,9 +207,9 @@ yahoo_fetch_aliases(PurpleConnection *gc)
 				  webaddress);
 
 	/* We have a URL and some header information, let's connect and get some aliases  */
-	url_data = purple_util_fetch_url_request(url, use_whole_url, NULL, TRUE,
-						 request, FALSE,
-						 yahoo_fetch_aliases_cb, cb);
+	url_data = purple_util_fetch_url_request_len_with_account(purple_connection_get_account(gc),
+				url, use_whole_url, NULL, TRUE, request, FALSE, -1,
+				yahoo_fetch_aliases_cb, gc);
 	if (url_data != NULL)
 		yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
 
@@ -196,7 +228,7 @@ yahoo_update_alias_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, cons
 	xmlnode *node, *result;
 	struct callback_data *cb = user_data;
 	PurpleConnection *gc = cb->gc;
-	struct yahoo_data *yd;
+	YahooData *yd;
 
 	yd = gc->proto_data;
 	yd->url_datas = g_slist_remove(yd->url_datas, url_data);
@@ -257,7 +289,7 @@ yahoo_update_alias_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, cons
 void
 yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias)
 {
-	struct yahoo_data *yd;
+	YahooData *yd;
 	const char *url;
 	gchar *content, *request, *webpage, *webaddress;
 	struct callback_data *cb;
@@ -334,7 +366,7 @@ yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias)
 	}
 
 	request = g_strdup_printf("POST %s%s/%s HTTP/1.1\r\n"
-				  "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
+				  "User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
 				  "Cookie: T=%s; Y=%s\r\n"
 				  "Host: %s\r\n"
 				  "Content-Length: %" G_GSIZE_FORMAT "\r\n"
@@ -347,7 +379,9 @@ yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias)
 				  content);
 
 	/* We have a URL and some header information, let's connect and update the alias  */
-	url_data = purple_util_fetch_url_request(url, use_whole_url, NULL, TRUE, request, FALSE, yahoo_update_alias_cb, cb);
+	url_data = purple_util_fetch_url_request_len_with_account(
+			purple_connection_get_account(gc), url, use_whole_url, NULL, TRUE,
+			request, FALSE, -1, yahoo_update_alias_cb, cb);
 	if (url_data != NULL)
 		yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
 
@@ -357,3 +391,328 @@ yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias)
 	g_free(request);
 }
 
+
+/**************************************************************************
+ * User Info Update Functions
+ **************************************************************************/
+
+#if 0
+/* This block of code can be used to send our contact details to
+ * everyone in the buddylist. But with the official messenger,
+ * doing this pops a conversation window at the receiver's end,
+ * which is stupid, and thus not really surprising. */
+
+struct yahoo_userinfo {
+	YahooData *yd;
+	char *xml;
+};
+
+static void
+yahoo_send_userinfo_to_user(struct yahoo_userinfo *yui, const char *who)
+{
+	struct yahoo_packet *pkt;
+	PurpleConnection *gc;
+
+	gc = yui->yd->gc;
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CONTACT_DETAILS, 0, 0);
+	yahoo_packet_hash(pkt, "siisis",
+			1, purple_connection_get_display_name(gc),
+			13, 1,    /* This creates a conversation window in the official client */
+			302, 5,
+			5, who,
+			303, 5,
+			280, yui->xml);
+	yahoo_packet_send_and_free(pkt, yui->yd);
+}
+
+static void
+yahoo_send_userinfo_foreach(gpointer key, gpointer value, gpointer data)
+{
+	const char *who = key;
+	YahooFriend *f = value;
+
+	if (f->status != YAHOO_STATUS_OFFLINE) {
+		yahoo_send_userinfo_to_user(data, who);
+	}
+}
+
+static void
+yahoo_sent_userinfo_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, size_t len, const gchar *error_message)
+{
+	struct yahoo_userinfo *yui = user_data;
+	yahoo_fetch_aliases_cb(url_data, yui->yd->gc, url_text, len, error_message);
+	g_hash_table_foreach(yui->yd->friends, yahoo_send_userinfo_foreach, yui);
+	g_free(yui->xml);
+	g_free(yui);
+}
+#endif
+
+static void
+yahoo_set_userinfo_cb(PurpleConnection *gc, PurpleRequestFields *fields)
+{
+	xmlnode *node = xmlnode_new("ab");
+	xmlnode *ct = xmlnode_new_child(node, "ct");
+	YahooData *yd = purple_connection_get_protocol_data(gc);
+	PurpleAccount *account;
+	PurpleUtilFetchUrlData *url_data;
+	char *webaddress, *webpage;
+	char *request, *content;
+	int len;
+	int i;
+	char * yfields[] = { "fn", "ln", "nn", "mn", "hp", "wp", "mo", NULL };
+
+	account = purple_connection_get_account(gc);
+
+	xmlnode_set_attrib(node, "k", purple_connection_get_display_name(gc));
+	xmlnode_set_attrib(node, "cc", "1");		/* XXX: ? */
+
+	xmlnode_set_attrib(ct, "e", "1");
+	xmlnode_set_attrib(ct, "yi", purple_request_fields_get_string(fields, "yname"));
+	xmlnode_set_attrib(ct, "id", purple_request_fields_get_string(fields, "yid"));
+	xmlnode_set_attrib(ct, "pr", "0");
+
+	for (i = 0; yfields[i]; i++) {
+		const char *v = purple_request_fields_get_string(fields, yfields[i]);
+		xmlnode_set_attrib(ct, yfields[i], v ? v : "");
+	}
+
+	content = xmlnode_to_formatted_str(node, &len);
+	xmlnode_free(node);
+	purple_url_parse(yd->jp ? YAHOOJP_USERINFO_URL : YAHOO_USERINFO_URL, &webaddress, NULL, &webpage, NULL, NULL);
+
+	request = g_strdup_printf("POST %s HTTP/1.1\r\n"
+				  "User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
+				  "Cookie: T=%s; path=/; domain=.yahoo.com; Y=%s;\r\n"
+				  "Host: %s\r\n"
+				  "Content-Length: %d\r\n"
+				  "Cache-Control: no-cache\r\n\r\n"
+				  "%s\r\n\r\n",
+				  webpage,
+				  yd->cookie_t, yd->cookie_y,
+				  webaddress,
+				  len + 4,
+				  content);
+
+#if 0
+	{
+		/* This is if we wanted to send our contact details to everyone
+		 * in the buddylist. But this cannot be done now, because in the
+		 * official messenger, doing this pops a conversation window at
+		 * the receiver's end, which is stupid, and thus not really
+		 * surprising. */
+		struct yahoo_userinfo *ui = g_new(struct yahoo_userinfo, 1);
+		node = xmlnode_new("contact");
+
+		for (i = 0; yfields[i]; i++) {
+			const char *v = purple_request_fields_get_string(fields, yfields[i]);
+			if (v) {
+				xmlnode *nd = xmlnode_new_child(node, yfields[i]);
+				xmlnode_insert_data(nd, v, -1);
+			}
+		}
+
+		ui->yd = yd;
+		ui->xml = xmlnode_to_str(node, NULL);
+		xmlnode_free(node);
+	}
+#endif
+
+	url_data = purple_util_fetch_url_request_len_with_account(account, webaddress, FALSE,
+			YAHOO_CLIENT_USERAGENT, TRUE, request, FALSE, -1,
+			yahoo_fetch_aliases_cb, gc);
+	if (url_data != NULL)
+		yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
+
+	g_free(webaddress);
+	g_free(webpage);
+	g_free(content);
+	g_free(request);
+}
+
+static PurpleRequestFields *
+request_fields_from_personal_details(YahooPersonalDetails *ypd, const char *id)
+{
+	PurpleRequestFields *fields;
+	PurpleRequestFieldGroup *group;
+	PurpleRequestField *field;
+	int i;
+	struct {
+		char *id;
+		char *text;
+		char *value;
+	} yfields[] = {
+		{"fn", N_("First Name"), ypd->names.first},
+		{"ln", N_("Last Name"), ypd->names.last},
+		{"nn", N_("Nickname"), ypd->names.nick},
+		{"mn", N_("Middle Name"), ypd->names.middle},
+		{"hp", N_("Home Phone Number"), ypd->phone.home},
+		{"wp", N_("Work Phone Number"), ypd->phone.work},
+		{"mo", N_("Mobile Phone Number"), ypd->phone.mobile},
+		{NULL, NULL, NULL}
+	};
+
+	fields = purple_request_fields_new();
+	group = purple_request_field_group_new(NULL);
+	purple_request_fields_add_group(fields, group);
+
+	field = purple_request_field_string_new("yname", "", id, FALSE);
+	purple_request_field_set_visible(field, FALSE);
+	purple_request_field_group_add_field(group, field);
+
+	field = purple_request_field_string_new("yid", "", ypd->id, FALSE);
+	purple_request_field_set_visible(field, FALSE);
+	purple_request_field_group_add_field(group, field);
+
+	for (i = 0; yfields[i].id; i++) {
+		field = purple_request_field_string_new(yfields[i].id, _(yfields[i].text),
+				yfields[i].value, FALSE);
+		purple_request_field_group_add_field(group, field);
+	}
+
+	return fields;
+}
+
+void yahoo_set_userinfo_for_buddy(PurpleConnection *gc, PurpleBuddy *buddy)
+{
+	PurpleRequestFields *fields;
+	YahooFriend *f;
+	const char *name;
+
+	name = purple_buddy_get_name(buddy);
+	f = yahoo_friend_find(gc, name);
+	if (!f)
+		return;
+
+	fields = request_fields_from_personal_details(&f->ypd, name);
+	purple_request_fields(gc, NULL, _("Set User Info"), NULL, fields,
+			_("OK"), G_CALLBACK(yahoo_set_userinfo_cb),
+			_("Cancel"), NULL,
+			purple_connection_get_account(gc), NULL, NULL, gc);
+}
+
+void yahoo_set_userinfo(PurpleConnection *gc)
+{
+	YahooData *yd = purple_connection_get_protocol_data(gc);
+	PurpleRequestFields *fields = request_fields_from_personal_details(&yd->ypd,
+					purple_connection_get_display_name(gc));
+	purple_request_fields(gc, NULL, _("Set User Info"), NULL, fields,
+			_("OK"), G_CALLBACK(yahoo_set_userinfo_cb),
+			_("Cancel"), NULL,
+			purple_connection_get_account(gc), NULL, NULL, gc);
+}
+
+static gboolean
+parse_contact_details(YahooData *yd, const char *who, const char *xml)
+{
+	xmlnode *node, *nd;
+	YahooFriend *f;
+	char *yid;
+
+	node = xmlnode_from_str(xml, -1);
+	if (!node) {
+		purple_debug_info("yahoo", "Received malformed XML for contact details from '%s':\n%s\n",
+				who, xml);
+		return FALSE;
+	}
+
+	nd = xmlnode_get_child(node, "yi");
+	if (!nd || !(yid = xmlnode_get_data(nd))) {
+		xmlnode_free(node);
+		return FALSE;
+	}
+
+	if (!purple_strequal(yid, who)) {
+		/* The user may not want to set the contact details about folks in the buddylist
+		   to what some random dude might have sent. So it would be good if we popped
+		   up a prompt requiring the user to confirm the details before we set them.
+		   However, someone could send details about hundreds of users at the same time,
+		   which would make things really bad. So for now, until we have a better way of
+		   dealing with this, ignore this details. */
+		purple_debug_info("yahoo", "Ignoring contact details sent by %s about %s\n",
+				who, yid);
+		g_free(yid);
+		xmlnode_free(node);
+		return FALSE;
+	}
+
+	f = yahoo_friend_find(yd->gc, yid);
+	if (!f) {
+		g_free(yid);
+		xmlnode_free(node);
+		return FALSE;
+	} else {
+		int i;
+		YahooPersonalDetails *ypd = &f->ypd;
+		char *alias = NULL;
+		struct {
+			char *id;
+			char **field;
+		} details[] = {
+			{"fn", &ypd->names.first},
+			{"mn", &ypd->names.middle},
+			{"ln", &ypd->names.last},
+			{"nn", &ypd->names.nick},
+			{"wp", &ypd->phone.work},
+			{"hp", &ypd->phone.home},
+			{"mo", &ypd->phone.mobile},
+			{NULL, NULL}
+		};
+
+		yahoo_personal_details_reset(ypd, FALSE);
+
+		for (i = 0; details[i].id; i++) {
+			nd = xmlnode_get_child(node, details[i].id);
+			*details[i].field = nd ? xmlnode_get_data(nd) : NULL;
+		}
+
+		if (ypd->names.nick)
+			alias = ypd->names.nick;
+		else if (ypd->names.first || ypd->names.last) {
+			alias = g_strstrip(g_strdup_printf("%s %s",
+						ypd->names.first ? ypd->names.first : "",
+						ypd->names.last ? ypd->names.last : ""));
+		}
+
+		if (alias) {
+			serv_got_alias(yd->gc, yid, alias);
+			if (alias != ypd->names.nick)
+				g_free(alias);
+		}
+	}
+
+	xmlnode_free(node);
+	g_free(yid);
+	return TRUE;
+}
+
+/* I don't think this happens for MSN buddies. -- sad */
+void yahoo_process_contact_details(PurpleConnection *gc, struct yahoo_packet *pkt)
+{
+	GSList *l = pkt->hash;
+	const char *who = NULL, *xml = NULL;
+	YahooData *yd = purple_connection_get_protocol_data(gc);
+
+	for (; l; l = l->next) {
+		struct yahoo_pair *pair = l->data;
+		switch (pair->key) {
+			case 4:
+				who = pair->value;	/* This is the person who sent us the details.
+									   But not necessarily about himself. */
+				break;
+			case 5:
+				break;
+			case 13:
+				/* This is '1' if 'who' is sending the contact details about herself,
+				   '0' if 'who' is sending the contact details she has about buddies
+				   in her list. However, in all cases, the xml in key 280 always seems
+				   to contain the yid of the person, so we may as well ignore this field
+				   and look into the xml instead to see who the information is about. */
+				break;
+			case 280:
+				xml = pair->value;
+				parse_contact_details(yd, who, xml);
+				break;
+		}
+	}
+}
+
diff --git a/libpurple/protocols/yahoo/yahoo_aliases.h b/libpurple/protocols/yahoo/yahoo_aliases.h
index 049a23345f..0eb7fef1b3 100644
--- a/libpurple/protocols/yahoo/yahoo_aliases.h
+++ b/libpurple/protocols/yahoo/yahoo_aliases.h
@@ -1,38 +1,41 @@
-/*

- * purple

- *

- * Purple is the legal property of its developers, whose names are too numerous

- * to list here.  Please refer to the COPYRIGHT file distributed with this

- * source distribution.

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA

- *

- */

-

-

-#include "internal.h"

-

-#include "account.h"

-#include "accountopt.h"

-#include "blist.h"

-#include "debug.h"

-#include "util.h"

-#include "version.h"

-#include "yahoo.h"

-#include "yahoo_packet.h"

-

-void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);

-void yahoo_fetch_aliases(PurpleConnection *gc);

-

+/*
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+
+
+#include "internal.h"
+
+#include "account.h"
+#include "accountopt.h"
+#include "blist.h"
+#include "debug.h"
+#include "util.h"
+#include "version.h"
+#include "libymsg.h"
+#include "yahoo_packet.h"
+
+void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);
+void yahoo_fetch_aliases(PurpleConnection *gc);
+void yahoo_set_userinfo(PurpleConnection *gc);
+void yahoo_set_userinfo_for_buddy(PurpleConnection *gc, PurpleBuddy *buddy);
+void yahoo_personal_details_reset(YahooPersonalDetails *ypd, gboolean all);
+void yahoo_process_contact_details(PurpleConnection *gc, struct yahoo_packet *pkt);
diff --git a/libpurple/protocols/yahoo/yahoo_auth.c b/libpurple/protocols/yahoo/yahoo_auth.c
deleted file mode 100644
index 845bfb7775..0000000000
--- a/libpurple/protocols/yahoo/yahoo_auth.c
+++ /dev/null
@@ -1,925 +0,0 @@
-/*
- * yahoo_auth.c: Authentication routines.
- *
- * Written by Kevin Kurtz and Scott Werndorfer
- * Copyright(c) 2003 Cerulean Studios
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- *
- */
-
-#include "internal.h"
-
-#include "yahoo.h"
-#include "yahoo_auth.h"
-
-/*************
- * Ugliness  *
- *************/
-static const auth_function_t main_function_list[5][96] = {
-	{
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 },
-		{ 0, 0x0, 0x0 }
-	},
-	{
-		{ 2, 0x36056cd7, 0x4387 },
-		{ 3, 0x538920, 0x0 },
-		{ 3, 0x538a20, 0x0 },
-		{ 4, 0x55f320, 0x0 },
-		{ 3, 0x539320, 0x0 },
-		{ 4, 0x55f340, 0x0 },
-		{ 2, 0x4abb534d, 0x3769 },
-		{ 1, 0x1d242da5, 0x0 },
-		{ 2, 0x3c23132d, 0x339b },
-		{ 1, 0x191265c, 0x0 },
-		{ 1, 0x3db979db, 0x0 },
-		{ 3, 0x539868, 0x0 },
-		{ 1, 0x1a550e1e, 0x0 },
-		{ 1, 0x2f140a2d, 0x0 },
-		{ 2, 0x7c466a4b, 0x29bf },
-		{ 1, 0x2d3f30d3, 0x0 },
-		{ 2, 0x7e823b21, 0x6bb3 },
-		{ 4, 0x55f360, 0x0 },
-		{ 3, 0x5395a8, 0x0 },
-		{ 4, 0x55f604, 0x0 },
-		{ 3, 0x539ba8, 0x0 },
-		{ 4, 0x5628c4, 0x0 },
-		{ 3, 0x547818, 0x0 },
-		{ 4, 0x5628e4, 0x0 },
-		{ 3, 0x547978, 0x0 },
-		{ 4, 0x5628a4, 0x0 },
-		{ 2, 0x5b756ab9, 0x7e9b },
-		{ 3, 0x539d48, 0x0 },
-		{ 1, 0x1d1c4911, 0x0 },
-		{ 3, 0x539f60, 0x0 },
-		{ 3, 0x53a060, 0x0 },
-		{ 1, 0x46bd7771, 0x0 },
-		{ 1, 0x51ae2b42, 0x0 },
-		{ 2, 0x2417591b, 0x177b },
-		{ 2, 0x57f27c5f, 0x2433 },
-		{ 3, 0x53a588, 0x0 },
-		{ 3, 0x53a688, 0x0 },
-		{ 1, 0x71422261, 0x0 },
-		{ 4, 0x55f6a4, 0x0 },
-		{ 2, 0x58e937f9, 0x1075 },
-		{ 3, 0x53a7c8, 0x0 },
-		{ 4, 0x55f6c4, 0x0 },
-		{ 3, 0x53a8c8, 0x0 },
-		{ 3, 0x53aa20, 0x0 },
-		{ 2, 0xb4c3d13, 0x1597 },
-		{ 4, 0x55f6e4, 0x0 },
-		{ 1, 0xfe07d38, 0x0 },
-		{ 2, 0x689b4017, 0x3cfb },
-		{ 4, 0x562928, 0x0 },
-		{ 3, 0x547b00, 0x0 },
-		{ 1, 0x35413df3, 0x0 },
-		{ 2, 0x5b611ab, 0x570b },
-		{ 2, 0xda5334f, 0x3ac7 },
-		{ 1, 0x47706008, 0x0 },
-		{ 4, 0x55f744, 0x0 },
-		{ 3, 0x547548, 0x0 },
-		{ 4, 0x562884, 0x0 },
-		{ 1, 0x57611b36, 0x0 },
-		{ 2, 0x314c2cd1, 0x2b5b },
-		{ 1, 0x1ef33946, 0x0 },
-		{ 2, 0x28ea041f, 0x638f },
-		{ 3, 0x53b1d0, 0x0 },
-		{ 3, 0x53b2d0, 0x0 },
-		{ 3, 0x53b418, 0x0 },
-		{ 2, 0x511537cb, 0x7135 },
-		{ 2, 0x1cf71007, 0x5e17 },
-		{ 1, 0x583d4bcf, 0x0 },
-		{ 3, 0x53b550, 0x0 },
-		{ 1, 0x373e6856, 0x0 },
-		{ 2, 0x4d595519, 0x1a7d },
-		{ 3, 0x53b718, 0x0 },
-		{ 3, 0x53b838, 0x0 },
-		{ 1, 0xe2a36a7, 0x0 },
-		{ 3, 0x53bc10, 0x0 },
-		{ 3, 0x53bd10, 0x0 },
-		{ 4, 0x55f784, 0x0 },
-		{ 4, 0x55f7a4, 0x0 },
-		{ 1, 0x53f3604f, 0x0 },
-		{ 4, 0x55f7c4, 0x0 },
-		{ 4, 0x55f7e4, 0x0 },
-		{ 2, 0x1edc0ba3, 0x7531 },
-		{ 3, 0x53be50, 0x0 },
-		{ 1, 0x10df1038, 0x0 },
-		{ 4, 0x55f804, 0x0 },
-		{ 3, 0x53bf68, 0x0 },
-		{ 1, 0x4ede0cac, 0x0 },
-		{ 2, 0x2f076eeb, 0x5bcf },
-		{ 1, 0x6d86030f, 0x0 },
-		{ 1, 0x3f331713, 0x0 },
-		{ 3, 0x53c0e8, 0x0 },
-		{ 2, 0x41cd726f, 0x3f79 },
-		{ 4, 0x55f824, 0x0 },
-		{ 1, 0xece0054, 0x0 },
-		{ 2, 0x19b32b03, 0x4ad1 },
-		{ 4, 0x55f844, 0x0 },
-		{ 4, 0x55f864, 0x0 }
-	},
-	{
-		{ 2, 0x39731111, 0x419b },
-		{ 1, 0x54f7757a, 0x0 },
-		{ 4, 0x55f884, 0x0 },
-		{ 4, 0x55f8a4, 0x0 },
-		{ 3, 0x53c240, 0x0 },
-		{ 3, 0x53c368, 0x0 },
-		{ 2, 0x3cc0256b, 0x7ce7 },
-		{ 1, 0x79991847, 0x0 },
-		{ 2, 0x228f7fb5, 0x472d },
-		{ 2, 0x32da290b, 0x7745 },
-		{ 1, 0x7a28180d, 0x0 },
-		{ 4, 0x55f91c, 0x0 },
-		{ 4, 0x55f93c, 0x0 },
-		{ 2, 0x5c814f8b, 0x227f },
-		{ 3, 0x53c7b0, 0x0 },
-		{ 2, 0xb496f6d, 0x412d },
-		{ 1, 0x6f4b62da, 0x0 },
-		{ 3, 0x53c8b8, 0x0 },
-		{ 1, 0x64973977, 0x0 },
-		{ 3, 0x53c9e8, 0x0 },
-		{ 3, 0x53cae8, 0x0 },
-		{ 4, 0x55f9d0, 0x0 },
-		{ 3, 0x53cd28, 0x0 },
-		{ 3, 0x547230, 0x0 },
-		{ 1, 0x6dd14c92, 0x0 },
-		{ 3, 0x53ceb0, 0x0 },
-		{ 4, 0x560280, 0x0 },
-		{ 4, 0x56034c, 0x0 },
-		{ 4, 0x56036c, 0x0 },
-		{ 3, 0x53d168, 0x0 },
-		{ 1, 0x5e6324d8, 0x0 },
-		{ 3, 0x53d2d0, 0x0 },
-		{ 3, 0x53d3d0, 0x0 },
-		{ 3, 0x53d798, 0x0 },
-		{ 4, 0x5605b0, 0x0 },
-		{ 1, 0x62745ed0, 0x0 },
-		{ 2, 0x102c215b, 0x581 },
-		{ 3, 0x53d970, 0x0 },
-		{ 3, 0x53da70, 0x0 },
-		{ 3, 0x53dbd0, 0x0 },
-		{ 2, 0x19511111, 0x12c1 },
-		{ 3, 0x53dd70, 0x0 },
-		{ 2, 0x2a6e2953, 0x6977 },
-		{ 3, 0x53e0d0, 0x0 },
-		{ 1, 0x55cd5445, 0x0 },
-		{ 4, 0x560bcc, 0x0 },
-		{ 4, 0x560bec, 0x0 },
-		{ 2, 0x646c21eb, 0x43e5 },
-		{ 1, 0x71dc4898, 0x0 },
-		{ 1, 0x167519cb, 0x0 },
-		{ 1, 0x6d3158f8, 0x0 },
-		{ 1, 0x7ea95bea, 0x0 },
-		{ 4, 0x560c10, 0x0 },
-		{ 1, 0x47377587, 0x0 },
-		{ 1, 0x2d8b6e8f, 0x0 },
-		{ 2, 0x5e6105db, 0x1605 },
-		{ 1, 0x65b543c8, 0x0 },
-		{ 3, 0x540278, 0x0 },
-		{ 4, 0x560d34, 0x0 },
-		{ 2, 0x48af73cb, 0xa67 },
-		{ 1, 0x4fb96154, 0x0 },
-		{ 3, 0x5406e8, 0x0 },
-		{ 4, 0x560e38, 0x0 },
-		{ 1, 0x622c4954, 0x0 },
-		{ 4, 0x561014, 0x0 },
-		{ 1, 0x20d220f3, 0x0 },
-		{ 1, 0x361d4f0d, 0x0 },
-		{ 1, 0x2b2000d1, 0x0 },
-		{ 1, 0x6fb8593e, 0x0 },
-		{ 3, 0x5409e8, 0x0 },
-		{ 4, 0x561074, 0x0 },
-		{ 1, 0x2b7f7dfc, 0x0 },
-		{ 2, 0x5fc41a57, 0x693 },
-		{ 2, 0x17154387, 0x2489 },
-		{ 4, 0x561094, 0x0 },
-		{ 4, 0x5610b4, 0x0 },
-		{ 4, 0x5610d4, 0x0 },
-		{ 3, 0x540d18, 0x0 },
-		{ 1, 0x7e221470, 0x0 },
-		{ 1, 0x7a600061, 0x0 },
-		{ 4, 0x561190, 0x0 },
-		{ 4, 0x5611b0, 0x0 },
-		{ 3, 0x541218, 0x0 },
-		{ 4, 0x5611d0, 0x0 },
-		{ 2, 0xe813a5, 0x2ce5 },
-		{ 2, 0x3d707e25, 0x3827 },
-		{ 2, 0x77a53e07, 0x6a5f },
-		{ 4, 0x562968, 0x0 },
-		{ 3, 0x547d98, 0x0 },
-		{ 3, 0x547f10, 0x0 },
-		{ 1, 0x43a73788, 0x0 },
-		{ 3, 0x5387b0, 0x0 },
-		{ 4, 0x55f214, 0x0 },
-		{ 3, 0x539420, 0x0 },
-		{ 1, 0x55f4606b, 0x0 },
-		{ 4, 0x55f380, 0x0 }
-	},
-	{
-		{ 5, 0x55f3f8, 0x0 },
-		{ 2, 0x32ca58e3, 0x4f9 },
-		{ 1, 0x11756b30, 0x0 },
-		{ 2, 0x218b2569, 0x5db1 },
-		{ 1, 0x77d64b90, 0x0 },
-		{ 5, 0x562948, 0x0 },
-		{ 3, 0x547c10, 0x0 },
-		{ 2, 0x7d1428cb, 0x3d },
-		{ 1, 0x6f872c49, 0x0 },
-		{ 1, 0x2e484655, 0x0 },
-		{ 2, 0x1e3349f7, 0x41f5 },
-		{ 3, 0x541400, 0x0 },
-		{ 5, 0x561258, 0x0 },
-		{ 1, 0x61640311, 0x0 },
-		{ 5, 0x561278, 0x0 },
-		{ 3, 0x541588, 0x0 },
-		{ 3, 0x541688, 0x0 },
-		{ 3, 0x541988, 0x0 },
-		{ 1, 0x7044d3, 0x0 },
-		{ 5, 0x561298, 0x0 },
-		{ 2, 0x5c221625, 0x576f },
-		{ 3, 0x541b30, 0x0 },
-		{ 3, 0x541c30, 0x0 },
-		{ 1, 0x2d406bb1, 0x0 },
-		{ 2, 0x680b1f17, 0x12cd },
-		{ 5, 0x5613a0, 0x0 },
-		{ 2, 0x12564d55, 0x32b9 },
-		{ 2, 0x21a67897, 0x6bab },
-		{ 3, 0x541db8, 0x0 },
-		{ 2, 0x6405119, 0x7143 },
-		{ 1, 0x351d01ed, 0x0 },
-		{ 2, 0x46356f6b, 0xa49 },
-		{ 2, 0x32c77969, 0x72f3 },
-		{ 5, 0x5613c0, 0x0 },
-		{ 3, 0x541fe0, 0x0 },
-		{ 3, 0x5420e0, 0x0 },
-		{ 5, 0x5613e4, 0x0 },
-		{ 3, 0x542220, 0x0 },
-		{ 5, 0x561404, 0x0 },
-		{ 2, 0x74d52c55, 0x5f43 },
-		{ 1, 0x26201ca8, 0x0 },
-		{ 1, 0x7aeb3255, 0x0 },
-		{ 3, 0x53ab20, 0x0 },
-		{ 2, 0x578f1047, 0x640b },
-		{ 3, 0x542738, 0x0 },
-		{ 3, 0x542df8, 0x0 },
-		{ 5, 0x5615a0, 0x0 },
-		{ 5, 0x561628, 0x0 },
-		{ 1, 0x4a1352cf, 0x0 },
-		{ 2, 0x4bfb6ef3, 0x704f },
-		{ 2, 0x1b4c7fe7, 0x5637 },
-		{ 2, 0x4091a3b, 0x4917 },
-		{ 1, 0x270c2f52, 0x0 },
-		{ 3, 0x5430b8, 0x0 },
-		{ 5, 0x561748, 0x0 },
-		{ 3, 0x543220, 0x0 },
-		{ 5, 0x561768, 0x0 },
-		{ 2, 0x127549d5, 0x579b },
-		{ 2, 0xab54121, 0x7a47 },
-		{ 5, 0x5617f0, 0x0 },
-		{ 1, 0x751e6e49, 0x0 },
-		{ 3, 0x543580, 0x0 },
-		{ 3, 0x543680, 0x0 },
-		{ 1, 0x670c3f74, 0x0 },
-		{ 2, 0x6b080851, 0x7e8b },
-		{ 1, 0x71cd789e, 0x0 },
-		{ 1, 0x3eb20b7b, 0x0 },
-		{ 5, 0x561ea0, 0x0 },
-		{ 3, 0x543848, 0x0 },
-		{ 2, 0x58a67753, 0x272b },
-		{ 2, 0x1ab54ad7, 0x4d33 },
-		{ 2, 0x7d30a45, 0x569 },
-		{ 2, 0x737616bf, 0x70c7 },
-		{ 3, 0x543990, 0x0 },
-		{ 2, 0x45c4485d, 0x2063 },
-		{ 5, 0x561f38, 0x0 },
-		{ 1, 0x2598043d, 0x0 },
-		{ 2, 0x223a4fe3, 0x49a7 },
-		{ 1, 0x1eed619f, 0x0 },
-		{ 5, 0x561f58, 0x0 },
-		{ 1, 0x6f477561, 0x0 },
-		{ 5, 0x561f7c, 0x0 },
-		{ 5, 0x561f9c, 0x0 },
-		{ 3, 0x543bf8, 0x0 },
-		{ 2, 0x4bc13c4f, 0x45c1 },
-		{ 1, 0x3b547bfb, 0x0 },
-		{ 3, 0x543d08, 0x0 },
-		{ 2, 0x71406ab3, 0x7a5f },
-		{ 1, 0x2f1467e9, 0x0 },
-		{ 2, 0x9366d1, 0x22d1 },
-		{ 2, 0x587d1b75, 0x2ca5 },
-		{ 2, 0x213a4be7, 0x4499 },
-		{ 2, 0x62653e89, 0x2d5d },
-		{ 5, 0x562198, 0x0 },
-		{ 2, 0x4f5f3257, 0x444f },
-		{ 2, 0x4c0e2b2b, 0x19d3 }
-	},
-	{
-		{ 2, 0x3f867b35, 0x7b3b },
-		{ 2, 0x32d25cb1, 0x3d6d },
-		{ 5, 0x5622f0, 0x0 },
-		{ 2, 0x50fa1c51, 0x5f4f },
-		{ 3, 0x544130, 0x0 },
-		{ 1, 0x5fe7af1, 0x0 },
-		{ 2, 0x14067c29, 0x10c5 },
-		{ 3, 0x544298, 0x0 },
-		{ 2, 0x4a5558c5, 0x271f },
-		{ 1, 0x3c0861b1, 0x0 },
-		{ 5, 0x562864, 0x0 },
-		{ 3, 0x546d50, 0x0 },
-		{ 2, 0x18837c9d, 0x6335 },
-		{ 5, 0x56238c, 0x0 },
-		{ 1, 0x7dab5033, 0x0 },
-		{ 3, 0x544548, 0x0 },
-		{ 2, 0x3b87321, 0x7225 },
-		{ 1, 0x7f906745, 0x0 },
-		{ 3, 0x544700, 0x0 },
-		{ 5, 0x5623ac, 0x0 },
-		{ 1, 0x21c46c2c, 0x0 },
-		{ 2, 0x2b36757d, 0x28d },
-		{ 5, 0x5623cc, 0x0 },
-		{ 3, 0x5448a8, 0x0 },
-		{ 1, 0x106b4a85, 0x0 },
-		{ 1, 0x17640f11, 0x0 },
-		{ 3, 0x544a28, 0x0 },
-		{ 1, 0x69e60486, 0x0 },
-		{ 3, 0x547670, 0x0 },
-		{ 2, 0x3782017d, 0x5bf },
-		{ 5, 0x5623ec, 0x0 },
-		{ 3, 0x5480c8, 0x0 },
-		{ 1, 0x6bca53b0, 0x0 },
-		{ 3, 0x546af0, 0x0 },
-		{ 3, 0x546bf0, 0x0 },
-		{ 3, 0x544d20, 0x0 },
-		{ 3, 0x544e20, 0x0 },
-		{ 1, 0xb8236e3, 0x0 },
-		{ 5, 0x562908, 0x0 },
-		{ 2, 0x5ee51c43, 0x4553 },
-		{ 5, 0x56249c, 0x0 },
-		{ 3, 0x546fd8, 0x0 },
-		{ 3, 0x5470d8, 0x0 },
-		{ 3, 0x546970, 0x0 },
-		{ 2, 0x42b14c6f, 0x5531 },
-		{ 1, 0x4a2548e8, 0x0 },
-		{ 2, 0x5c071d85, 0x2437 },
-		{ 3, 0x5467d8, 0x0 },
-		{ 2, 0x29195861, 0x108b },
-		{ 1, 0x24012258, 0x0 },
-		{ 3, 0x546690, 0x0 },
-		{ 1, 0x63cc2377, 0x0 },
-		{ 1, 0x8d04b59, 0x0 },
-		{ 2, 0x3fd30cf5, 0x7027 },
-		{ 1, 0x7c3e0478, 0x0 },
-		{ 2, 0x457776b7, 0x24b3 },
-		{ 1, 0x86652bc, 0x0 },
-		{ 2, 0x302f5b13, 0x371d },
-		{ 3, 0x546548, 0x0 },
-		{ 2, 0x58692d47, 0x671 },
-		{ 1, 0x6601178e, 0x0 },
-		{ 2, 0xf195b9b, 0x1369 },
-		{ 1, 0x7ba21d8, 0x0 },
-		{ 5, 0x562544, 0x0 },
-		{ 5, 0x562564, 0x0 },
-		{ 1, 0x13ac3d21, 0x0 },
-		{ 2, 0x5bcf3275, 0x6e1b },
-		{ 2, 0x62725c5b, 0x16b9 },
-		{ 2, 0x5b950fdf, 0x2d35 },
-		{ 5, 0x5625a0, 0x0 },
-		{ 5, 0x5625c0, 0x0 },
-		{ 2, 0x73ba5335, 0x1c13 },
-		{ 5, 0x5625e0, 0x0 },
-		{ 5, 0x562600, 0x0 },
-		{ 1, 0x3e144154, 0x0 },
-		{ 2, 0x4eed7b27, 0x38ab },
-		{ 3, 0x545c58, 0x0 },
-		{ 2, 0x627c7e0f, 0x7f01 },
-		{ 2, 0x5d7e1f73, 0x2c0f },
-		{ 3, 0x545aa0, 0x0 },
-		{ 2, 0x55c9525f, 0x4659 },
-		{ 1, 0x3765334c, 0x0 },
-		{ 2, 0x5df66ddf, 0x7c25 },
-		{ 3, 0x545d78, 0x0 },
-		{ 3, 0x545e78, 0x0 },
-		{ 1, 0x16ae5776, 0x0 },
-		{ 3, 0x545ff8, 0x0 },
-		{ 3, 0x546190, 0x0 },
-		{ 5, 0x562620, 0x0 },
-		{ 5, 0x562640, 0x0 },
-		{ 3, 0x546290, 0x0 },
-		{ 2, 0x4392327b, 0x7e0d },
-		{ 3, 0x546398, 0x0 },
-		{ 2, 0x3d8b0cb5, 0x640d },
-		{ 2, 0x32865601, 0x4d43 },
-		{ 5, 0x562660, 0x0 }
-	}
-};
-
-static const struct buffer_t type_three_list[NUM_TYPE_THREES]={
-	{ 0x538920, "\x7a\x61\x31\x57\x9\xbc\x11\x8d\x6a\x12\x3a\x4d\x76\xbf\x19\x86\x2c\xc8\x69\x60\x84\x1\xc9\x21\xb1\xa6\xf\x99\xcd\xa0\x71\x8b\x5f\xb2\xd2\x53\xed\xf9\x55\xa\x50\x14\x15\xad\x88\x52\x5d\xbb\xe\xe5\xd\x56\x3e\x9b\xc7\x17\x9a\x97\x92\x23\x0\x37\xaa\x27\xf6\xb6\x33\xb5\xc5\xd1\x38\x1b\x85\x42\x13\xe1\x64\x1d\x4c\x87\x9f\x3c\x40\xdf\x7b\xd5\xae\xc6\x7c\xec\xd7\x49\x35\x2f\x2b\x9d\x32\xbd\x93\x45\x73\x91\x34\xd4\x39\x1e\x96\x65\xeb\x82\x5a\xf3\xd8\xf1\x41\xce\x9c\xe6\x90\x7d\x6b\x29\x6\xc1\x3d\x4e\xe3\xdb\x48\x6c\x62\x72\x7f\xfe\xdd\xcf\xa1\x24\x4f\xc0\xd0\x3f\x2d\x5c\x78\x6f\x3b\x10\xef\xba\xb\x25\xd6\x1f\x58\x8c\xf8\xcc\xc2\x5\xb3\xfa\xa4\xac\x6e\xf5\x18\x2a\x26\x5e\xf4\x79\xb8\xc3\x16\xe2\xf2\x83\x30\x59\xda\xe9\x36\x7\x46\xa9\xde\x77\xd3\xa3\x98\x8\x1c\xe7\xee\x51\xe8\xfb\x2\xc4\xfd\xff\x22\xaf\x7e\xcb\x68\xc\x28\xe4\x63\xca\x70\x75\xb0\x74\xa7\xea\x20\x4\x4b\xa5\xb7\xf7\xfc\x4a\x47\xf0\xa8\x81\xbe\xe0\x66\x8e\x44\x54\x6d\x80\xb9\x95\x2e\xab\x8a\x1a\x94\xdc\x89\xb4\x5b\x9e\xd9\x8f\xa2\x43\x67\x3" },
-	{ 0x538a20, "\x28\xeb\x74\xef\xb7\x73\x79\xd1\x46\xcc\xfb\x3b\x91\xc2\x16\xcb\x93\xaf\x51\x88\xb0\x5d\xfa\xfc\xc\xf\xc8\x4a\x53\x17\x8e\xec\x81\x36\xc6\xdc\xbc\x89\xa\x1f\x78\xdd\x76\x6c\x85\xd2\x13\xb9\x3a\x97\xde\x86\x3e\x12\xbe\x68\x23\x6a\x58\xce\xea\xe3\xa8\x5a\x8c\x3\x8a\x9d\xfe\xf3\x47\x63\xdf\x44\xaa\xd9\x24\xf0\x5b\xe2\x9c\xd3\xa9\x2e\xfd\x8b\xbd\xa4\x7a\x42\x5f\x4d\xa2\x48\x83\xcd\xe\x27\x61\xcf\xd\x50\x6f\x49\xae\xc7\x2f\x31\x39\x8f\x11\xdb\xad\x6b\x7f\xb6\x55\x62\x4c\x66\xc4\x75\xf6\x1b\xc1\xf1\x90\x95\x65\x9\xe0\xb4\xbf\xf4\x35\x37\x1c\x67\xe8\xf9\xe6\x56\x99\x22\xc0\xe9\x92\x21\xe1\x7d\x6e\x34\xd4\x8d\x96\x20\x52\xd0\x69\x2d\xf8\x7e\x4f\xb\xac\x71\xa3\xe5\x2a\xa5\xc5\x18\x5e\x6\xca\x2\x4b\x26\xf5\xab\x9f\xe7\x15\x3d\xd6\x4\x8\xee\xbb\x57\x0\x40\xd5\xa7\x1d\x45\xa6\x2c\xff\x9a\x32\x84\x1a\x14\xf7\x80\xd8\x43\x72\x7\x98\x38\x87\x33\xb1\x29\xb3\x7c\x30\xba\x94\xc9\x64\xe4\x1\x77\x3c\x2b\x82\x54\x6d\x9e\xf2\x3f\xed\xc3\x4e\x5c\x60\x70\x19\xa0\xb8\xda\x5\xb2\x10\x7b\x25\xb5\x9b\x59\x41\x1e\xa1\xd7" },
-	{ 0x539320, "\x9c\x3b\xec\x3e\x7b\x79\x6f\x88\x42\xe6\xe1\x9b\xa3\xd\x83\x86\x7a\xfc\xc5\xb3\xdb\x7c\xf6\xa\xb7\xe7\x3c\x53\x28\x65\xf2\xa9\x6a\xf4\xef\x2c\x3d\xf8\xed\x6\xaf\x31\x75\xab\xf3\x73\xee\x20\x95\x1b\xe\x19\xa8\x5b\xa5\x66\x74\x85\x11\x60\x1e\x2a\x6c\x48\x50\x2f\x9a\x2e\x55\xaa\xcb\x64\x40\x4c\x25\xe9\xd0\xfd\x2d\x46\x8b\x81\x8d\xd2\x32\x4a\xc6\x7\xd6\xbf\xfb\x98\xd4\x76\x7e\xc\xfa\xde\x14\xa6\xd5\xe2\x90\xd1\xeb\xd3\x58\xbb\x5f\x94\xf7\x78\x54\x27\x52\xb6\x22\xea\x8c\xc8\x7d\x87\x12\x9d\xa1\x63\x38\xd8\x35\x2b\xc9\x56\x10\x9f\x1a\x2\xbe\xf1\x59\x17\x9e\xac\x5a\xb8\x1\xb5\x30\xad\xff\xe0\x49\xe8\x23\x4e\x6b\x16\xdc\x4f\x89\x68\x43\xc1\x99\x4\xa7\x33\x92\x84\xa4\x26\x34\x41\x1d\xb2\x91\x61\xc2\x51\x8f\x36\xfe\x5\xa2\xf9\xb\x13\x71\x82\x6e\x5d\xb4\xdf\xdd\x7f\xa0\xcd\x44\xc7\x70\x4d\xf0\x1c\x4b\x45\x57\x37\x3a\xcc\xf5\x8a\xd9\xe4\xbc\x15\xc3\x62\xc4\x39\x72\x47\x97\xbd\x8\xe5\x67\x18\xb1\x77\x8e\x1f\x9\xba\xf\xd7\xb0\x24\xce\xda\x0\x96\xca\x69\x3\x6d\x93\xae\xe3\x3f\x5c\xcf\xc0\xb9\x29\x80\x21\x5e" },
-	{ 0x539868, "\xf2\xc3\x9\x40\x62\x4b\x94\xd2\xf8\x4a\xdf\xa\xb1\x61\xf9\x9c\x13\x35\x3\xe8\xc4\xf6\x49\x1a\xc\x45\x97\xe\x83\x33\x6d\xa0\x73\xb9\x3d\x9d\xff\x60\xc6\xaf\x68\xb6\x89\x10\xb0\xde\x98\x7f\x8c\x5a\xa5\x1e\x6f\x7c\x17\x12\xd7\xdc\x75\xfc\x20\x1d\x92\xcf\xf1\x16\xd\x50\x41\x39\xab\xeb\x14\x65\xc8\xa4\x99\xb5\x8a\x21\x90\xba\x4d\x3c\xf3\x66\xd1\x96\xf\xac\xa6\x7b\xbc\x8f\xd0\x29\x1f\xb3\xce\xd8\x79\x2\x36\x0\xe5\x91\x5e\xbb\xaa\x52\xc2\x31\x6b\x88\x8b\x9b\x2a\x44\x6c\x2f\x8e\xfb\xa3\x6\x48\xa2\x69\xc9\x28\x43\x47\x37\xef\xb8\x84\xe0\x4f\x30\xae\x56\xb7\x4e\x34\x81\x77\x67\xfd\x74\x93\xcd\x7a\x51\x76\x54\x5b\x2b\x3e\x80\xea\x9f\x15\xe1\x9a\xbf\x38\xfa\x8\x24\x42\xee\x7e\x4\x5f\xa8\xc5\xdb\x4c\x2d\xd9\xca\x19\xcc\xcb\x85\xa1\x32\x25\xec\x64\x57\xad\xf5\xb\x71\x11\x3f\xfe\x58\x1c\xd3\xb2\x72\xf7\x2c\xa9\xf0\x8d\xe9\xbe\x70\xe7\x95\xe6\x6e\x7\x9e\x46\x53\xdd\xed\xe2\xf4\x3b\x22\xc1\x3a\x55\x26\xd6\xc7\xd4\xc0\x27\x5\x7d\x5d\xe4\xd5\x5c\xe3\xb4\x63\xa7\x59\x82\xda\x18\x23\x2e\x1b\x1\xbd\x78\x86\x6a\x87" },
-	{ 0x5395a8, "\xfa\xb9\xda\x78\xde\x7f\x6\xab\xd7\xb1\x5c\x10\x1b\xf5\x62\x85\xf4\x98\xfb\xb2\xff\x5e\x5\x2b\x81\xd1\x7d\x58\xa7\x6b\x23\x7b\x26\x9f\xa9\xe\x59\xb8\xac\xd9\x64\x6e\x4f\x6a\x2d\x3c\x15\xc7\x63\x42\x54\x9\x90\xf6\xa0\x86\x9d\xea\xcf\x7c\xfe\xc5\xd4\x4d\xa6\xd5\xba\xcd\x5d\x9b\x2a\x6c\xb5\x7a\xbe\xf0\x44\x65\x0\x17\x3\xaf\xed\xfd\x1f\xc2\xd8\x5a\x16\xad\xc3\x35\x43\xbb\xa5\x37\x40\xf\x60\x99\x94\x1e\x89\x68\x88\xc8\xc4\x4a\x66\x24\x55\x3d\x4b\xe2\x1d\x1a\xe8\x19\x5b\xbf\x51\x8c\xae\x8a\x87\x8d\x3b\x22\x82\xd6\x80\x95\xef\x50\x21\xd\xd3\x33\x6d\x2c\xf1\xee\x38\xdc\xc1\x6f\x2\x46\xc6\x7e\x18\xb0\xce\x8\xd2\xb6\x53\x73\xe6\xf9\x3a\x4c\x48\x96\x1c\x70\x8b\x93\x69\xf7\x56\x30\x31\xdb\xa1\x1\xb\x77\xbc\xf2\x8e\x27\xa3\x7\xe4\x3f\xfc\x49\xcb\xe0\x45\x12\x67\x13\xb7\x74\xc\x52\xcc\xdd\x76\x29\x32\x57\xe1\xe9\x8f\xca\xaa\xbd\x71\x2e\x4\x97\xa4\xc9\x79\xdf\x83\xb3\x3e\x72\xc0\xb4\xec\x9a\x14\xa\x2f\x5f\x39\x25\x28\x75\xa2\xf8\x9c\xe3\xa8\x11\x9e\x4e\xd0\xe7\x61\x41\x84\xeb\x20\x36\x34\xf3\xe5\x92\x91\x47" },
-	{ 0x539ba8, "\x88\x82\x72\x56\xde\xa5\x45\x91\xf9\xe4\xee\x32\x59\x18\xb8\x6f\x79\xc7\xb0\x8c\x11\xd2\xe7\xef\x48\xe6\x20\xa1\x22\x12\xc8\x15\x6a\x8f\x3b\xd5\x3c\xe8\x63\x28\x10\xe9\x2c\xf5\x69\xa7\xf6\xd0\x83\xe0\x80\x81\x46\x29\x38\x2e\xf8\x34\x5b\x1a\x9d\xfa\xa4\x35\x54\xc1\x7e\xe\xae\x7f\x6e\x57\xb4\xbc\xff\x9b\x4a\xb7\x2b\x0\x5f\x31\x6d\x74\xd8\x36\x5c\xc3\xa2\xdf\x3d\xe2\x86\xfb\x5a\xca\x30\x50\x3e\x73\x4e\x9a\x94\xf0\x7d\xc5\x4f\xe3\x66\x39\xeb\x70\x52\x4b\xe5\x71\xc0\x76\x44\xa9\xa0\x7b\x27\xb1\x6c\xf\xc6\x96\xcb\xba\xda\xea\x37\x1c\xac\xb3\xd6\xb9\xbf\xdb\x1d\x8a\xfe\x9\x21\x75\x5d\x97\xe1\x8e\x25\xbd\x2d\xdd\xf7\xcd\x2a\x1e\x5e\x7a\xc\xfd\x9f\x60\x8\x64\xce\xf4\x61\x8d\x9e\xcf\xd4\x49\xb\x67\x1\xf1\x87\x53\x13\xaf\x2f\xa\xec\x3a\xbb\xa8\xbe\xc9\x90\x43\x6\x7c\xb6\xcc\xc2\x4c\x62\xb5\xc4\x77\x3\xf3\xab\xd3\x33\x24\xf2\x55\x6b\x1b\xa3\x2\x4\x23\x16\x14\x95\x3f\x65\xad\x89\x26\x5\x42\xfc\x98\x7\xaa\x19\x9c\xa6\xd\x93\xed\xb2\x8b\x40\xd7\x47\x1f\x99\x78\x17\x92\xd1\x4d\x51\x58\x84\xdc\x41\xd9\x68\x85" },
-	{ 0x547818, "\x73\x5\xde\x12\xaf\xb4\xaa\x9\x31\xcb\xba\x55\xd3\x1b\xf7\xbe\xd9\x45\x6d\x50\x2d\x74\xfa\x9c\xb3\xb2\xc0\x34\x16\x8d\x3d\x3f\x65\x13\xc8\xe3\xc\xfd\xea\x56\x67\x32\x7b\x24\xd1\xee\xc4\x1f\x3e\x4d\xd7\x33\xd5\xbf\xf\xca\x82\x63\x8b\x60\x86\xfe\x37\x51\x6\xe5\xe8\xe6\x64\x2b\x8a\xbb\xd0\xb8\xb1\xdc\xb9\x8c\x75\x5c\x14\x88\x22\x94\x96\x9d\xb7\x58\x2e\xbc\xc9\xa1\x1\x77\xec\xa2\x2\x6b\xc1\xad\xac\x62\xe1\x9b\x40\xb5\xd6\x78\x80\xc3\x4\x3\x4a\xa0\xeb\x8e\xf5\xc6\xab\xf6\x57\xa5\x8\xcc\x5b\xf2\xff\x2f\xa\x25\xb0\x3a\x7d\xf4\x43\x10\x85\x15\x44\xae\x92\x61\x27\x1c\xce\x19\xf9\xa6\xc5\x48\xe2\x59\xb\x89\xef\xc2\x0\xa8\x5d\x99\x54\xed\x2a\x3b\x4e\x42\xf3\x8f\x2c\x18\x6f\x69\x53\x68\xcd\x29\x6a\x1d\xc7\xf0\xd\x23\x4c\xe\x91\xfc\xe9\xcf\x98\x9a\x52\xfb\x21\x1e\x5f\x30\xda\x9e\x9f\xa9\x7a\x6c\x4b\x39\x7f\x20\x5a\xd2\x83\xdb\x49\x81\x93\x7\x3c\x95\xe0\x70\x26\x41\xa3\x79\x47\xa4\x11\x76\x97\x17\x35\xd8\xf8\x5e\x7e\x71\xbd\xf1\x28\x84\x46\xb6\xa7\xdf\x38\x66\x72\xdd\x90\xe4\x7c\x6e\xe7\x87\x36\x1a\xd4\x4f" },
-	{ 0x547978, "\x4f\xf2\x63\xe9\xdd\x53\x55\xf0\xf6\x86\x76\xab\x8b\x91\x5\xa9\x5c\x92\xc9\xf3\x24\xdc\x3c\x6\xf4\x54\xb\xad\x28\x46\xaf\x60\xc1\xae\xc2\xec\x74\x84\xb3\xcc\x75\x1b\x34\xa6\xf\x6e\x85\xf9\x44\x69\x3d\x4e\x8e\x1f\xed\x15\x12\x62\xdb\xbd\xea\x68\x50\xfc\x30\xde\x5b\x9b\x33\x99\x8d\x61\x98\x56\x78\x19\xc\xb4\x8f\xc8\x10\xb0\x38\x17\x21\x2a\x5e\xe1\xb1\x81\xbc\x2b\xe3\x94\x7b\x6f\x9a\x7e\x48\x3\xc6\xb5\x65\x43\xaa\x23\x1d\x59\x31\xcf\x1\xb7\xfa\xfe\xbf\x1a\x96\xf5\x87\xac\xbb\xfd\xdf\x82\xd1\x13\x8a\x11\xe4\x40\x0\xc5\x7\xa5\xb6\xd9\x4b\xba\x3b\x93\xa0\x9e\x52\x9c\xe\x14\xd2\x3e\x7d\x9f\xd8\x72\x9\xe0\x39\x27\x77\x97\x29\xd5\x88\x95\xee\x22\x3a\x47\xc7\x16\xc4\x25\xb9\x6d\x8\x2c\x35\x6c\xcd\xb2\x5f\xf8\xff\x41\x18\x3f\xe5\x57\x2e\x67\xc3\x49\x89\x90\xcb\xe6\x26\x4\xa8\xbe\xca\x2f\xfb\xd4\x71\xf7\xda\xe8\x6b\x5d\x79\x70\x1c\xce\x7a\xa3\x2d\x4a\xd7\xe2\xb8\x64\x6a\x51\x73\xa\x37\xa2\xd3\x4d\x80\x5a\xa1\x36\x45\x66\xa4\x20\x58\x4c\xd6\x1e\xd\xeb\xe7\x42\x7f\x9d\xf1\xa7\xef\x32\xc0\x2\x8c\x83\x7c\xd0" },
-	{ 0x539d48, "\x29\x0\x10\x9\x37\xc0\xb\xa\x91\xc8\xc9\xb6\x8e\x1\x9f\x64\xae\x13\xa6\xb7\x62\x27\xf7\xd0\x9e\x68\xf1\xf9\x15\xdd\x3a\x56\xca\xde\x96\x89\x8\x90\x38\xeb\x99\x57\xb8\xd7\x65\x94\x77\xb1\x16\x45\x5d\x67\x2f\x79\xd5\xcc\xdf\x44\xbe\x31\x8a\xef\x88\x7a\xfb\xa3\xa5\x39\x78\x84\x3\xe8\xbd\x8c\x85\x6f\xb2\x59\x6d\x93\x7\xaa\x36\xee\xe7\x7c\x21\x2b\xc7\x40\x54\xcd\xb9\x1f\x30\x80\xea\xcb\xfd\x20\xbf\x2c\xd\x6e\x73\x4b\xe5\x74\x18\x9d\x3f\xb4\xb3\x50\x81\x9a\xd4\xf3\xf2\x3e\x6b\x1d\x9b\x12\x49\xa1\xcf\x4f\x51\x41\x71\xc2\xd9\xdb\x5a\x97\x6a\xe0\x87\x6\x5\x2d\xf8\x47\x5b\x1b\x69\xc4\xad\xff\x43\x46\x24\xc\x82\x33\x8d\x26\x86\xab\x5c\x61\xe4\x66\xaf\x11\xa0\x42\xa2\x2e\x34\xdc\x25\x4d\xd6\xd2\x63\x70\x22\x83\x19\xa7\x4e\x92\xb5\xf\xda\x55\xed\x7f\x7b\xa4\xfc\x1a\x1e\x8b\xbc\xb0\xc3\x98\xec\x17\x60\xc1\x3d\x8f\x4c\x48\xac\xce\x7e\x72\xd1\x5e\x35\xa8\x32\x4\x1c\xe\x3b\xfa\xbb\xa9\x2a\xf6\xd8\x2\x6c\x23\x76\xe2\x53\xba\x28\x9c\xe1\xd3\x52\xf0\xe9\x7d\xe6\xfe\x58\x14\x5f\xf4\xe3\xc5\x4a\x3c\xf5\x75\xc6\x95" },
-	{ 0x539f60, "\x5f\xfc\x77\xa1\x39\xa6\x43\xf3\x2b\xbf\xab\x35\x4b\xbe\xad\xcd\xd3\x87\x22\x4f\x62\x3a\x1b\x3c\xef\xb1\x71\xae\x8c\x96\xc4\x86\x38\xf8\xa\xf9\x9b\xfb\x33\x41\xea\x69\x4e\x5c\x42\x58\xcc\x67\xf1\x26\xc9\xf5\xa3\x74\xe4\xbb\x56\x8\x7d\xbd\x99\x72\x80\x5d\xed\x2d\x65\xe6\x9\xa0\xb3\xb5\xc5\xa9\x85\x7\xd\x82\x1f\x9e\xd2\x6f\x2\xaf\x57\x55\x93\x48\x76\xc6\x30\x16\xe0\x60\x51\xf7\x59\x1c\x45\x6c\x4\x92\x32\x7a\xf2\x2f\x4a\x36\x63\x2c\xdd\x70\xd7\x4c\xec\xce\x13\xd9\x89\x97\xc7\x81\x15\xdc\xa5\x7c\x5a\x3\x1a\x2a\x49\xb2\x11\x88\x68\xc1\xb4\x9d\x73\x9a\xc0\x47\x21\x12\xe2\x78\x31\x0\x3e\x6\x6d\xca\xb8\x7f\xcf\x25\xb0\x91\xff\xb\x84\x24\xe9\x8e\xa4\x6b\xc\xac\xe3\x17\xc2\xe7\x6a\xc8\x8d\xf0\x14\xe\x95\xcb\xc3\xd6\x3f\x6e\x64\xfa\xd4\xee\x90\x9f\xe8\xd5\x98\xdf\xeb\xf\x2e\x19\x20\xaa\x44\x46\xbc\x53\x8b\x4d\x3b\x7b\xfd\xa7\x29\x28\x34\xe5\x8f\xb7\xa2\xd8\xa8\x3d\xb9\x5b\x75\xdb\x5\x83\xb6\x50\x5e\x7e\x52\xfe\x37\xe1\x54\x66\x9c\xda\x1d\x40\x10\xba\x1e\x27\xf4\x1\xd0\x18\x94\xde\x8a\x79\x23\x61\xd1\xf6" },
-	{ 0x53a060, "\x1e\x91\xb3\x15\xe7\xc6\x8d\xfe\xc9\xb5\xa6\xdf\x86\xa\x8e\x2b\x54\xbf\x2c\x1d\xbd\x9e\x5f\xcf\x6\x4d\x14\xf\x9c\x2f\x3f\xe8\x49\x1b\xa7\x4a\x10\x88\x7d\xbe\xb0\x35\x11\xe1\xa4\x6d\x30\x2e\x38\x60\xf6\xf7\xdb\xb7\x33\x75\xc\x20\x77\xa9\x9f\xef\xf4\x9b\x79\xfa\x5e\xd5\x3a\x3e\xe6\x44\xd8\x17\xda\xe5\x31\x78\xde\x39\x19\x93\xb4\xa3\xcb\x48\x9d\x45\x21\xf1\x67\xed\xce\x29\x95\xe0\x55\xc1\xfc\x5c\x82\x5\xd3\x80\x76\xab\x72\xb\x97\xd1\xf3\xea\xae\x34\x2d\x98\x73\xc2\xf5\x26\x8a\x1\x37\xfd\x47\xeb\x5d\x0\x56\x8\x66\x36\xd6\x7b\xb2\xe9\x70\xc7\xa5\x7a\x6b\x4c\xdd\x74\x6a\xbc\x43\xc8\x81\x64\x62\xa0\xd2\xfb\x83\x4e\x53\x1c\x52\xcc\x1a\x59\xd0\x99\xf8\x3b\x5a\x28\x41\xf0\xd9\x40\x90\xc0\x69\x7f\x4f\x8f\x8b\x42\x18\xe2\x57\xb6\xb1\xe4\x16\x61\xbb\x23\xa2\xd7\x1f\xc4\x85\xa1\x7c\x9\x65\x8c\xb8\x58\x7\x22\x12\xdc\x13\xcd\xc3\x89\x2a\xee\x27\x7e\xa8\xe\xba\x3d\x4b\x96\x50\x3\xac\x94\xad\xec\x6f\x5b\x87\xb9\xaf\xd4\x63\xf2\x6e\x51\x84\x68\x92\x25\xaa\xe3\x46\x3c\xc5\x24\x4\xd\xff\xf9\x2\xca\x9a\x71\x6c\x32" },
-	{ 0x53a588, "\x87\xca\xb5\xe\xb6\xee\x76\xd4\xda\x6a\x2b\x3b\x46\x9e\x44\x1d\x38\x3\xa\xb3\x1b\xf5\xea\x80\x94\xe6\x33\x43\x95\x0\xe1\x5c\x41\xc8\x97\x36\xaf\x34\x53\xb0\x6d\x29\xf9\x32\x2\xd6\x75\xbe\x7\xae\xe3\x6c\xa8\xe5\x4d\x56\x68\xb\xf4\x5d\x51\xc5\x54\x6b\x85\xba\x65\x86\xa7\xa9\x2f\xf1\x28\x5b\x4\x9c\xe7\x3f\x70\xd\xd5\xbf\xac\x5e\xad\x5a\x6\x2d\x30\x45\xd2\x17\x8d\x25\xed\x16\xc7\xd3\xde\x78\x22\x4a\xa0\x20\xe2\x89\x11\xa6\x2e\xff\xfc\xec\xfe\x9d\x18\xfd\x27\x60\xb1\xc0\x81\x99\x69\xa5\x64\x3d\xf2\x39\x1c\x9b\xc9\xc4\x8a\x21\x1f\x57\x4b\x5\x62\xb2\x14\x59\x2a\x12\x5f\xd1\x50\x90\x52\xcf\x1\x9\x4f\x7d\x74\x10\x42\x19\x8e\xe0\x40\x8f\xc2\xc\x82\x6f\xbb\xa4\x63\x55\xd7\x24\xab\x92\xbd\xf8\xcb\x8\xe9\x26\x49\x58\xf3\x1a\xc1\xd9\xdb\x4c\xbc\xb8\x84\xc3\x88\x8c\x98\x77\xeb\xcc\x3c\x83\xdf\xfa\x79\x15\x91\x7e\x3a\xf\x93\x66\xce\xa2\x7b\x37\x9a\x1e\xd0\xa3\x71\x3e\x47\xaa\xb4\x23\x96\xe4\xb9\x4e\x7f\xf0\xcd\x9f\x61\xf6\xfb\x7a\xdd\x73\xb7\x13\x7c\x35\x2c\xa1\xe8\x8b\x31\xd8\x72\xc6\x67\xdc\x6e\xf7\x48\xef" },
-	{ 0x53a688, "\x62\x6f\x9b\x9c\x31\x48\x4c\xca\xc1\xe6\xa2\x2e\xed\xb4\xe2\xc8\x8f\x45\xc7\x76\x7a\xa5\x40\xb8\x15\x36\x93\x13\xc2\xf6\x17\x2f\xf0\x23\xc5\x95\x79\x1e\xba\xc\x73\x8\x0\x60\xc9\x1f\x54\x58\xc6\xbb\x2c\xb3\x68\x55\xbe\x41\xfa\xc0\x2\xa7\xbd\x78\x57\xa9\x69\x6d\xe4\x12\xe8\x7\x3f\xac\x6c\x16\x4\x87\xb5\xa0\x33\x5e\xe1\x28\xee\x4f\x6b\x50\x99\xaf\x51\xbf\x7c\x7d\x6\x5c\xfe\x6a\x53\x9d\x2a\xd4\x14\x66\xcc\x65\xa3\x3b\xfd\xfc\xf9\x3\xb2\x19\x8e\x91\x49\xdf\x1\x44\xa\x98\x9f\x3a\x80\xf8\xb1\x42\x32\x3d\x22\x37\x8a\x35\xae\xd0\x8c\xdc\xab\xc3\x18\xd9\xe5\x10\x5d\x38\x27\xaa\x52\x3c\xf\x74\xf5\x90\xe7\xec\xd1\x81\x84\x2d\xd5\x8b\x82\x5b\x46\x11\x5\x4a\x4b\xea\x5a\xb\x92\x24\xf4\x1b\x5f\x21\x9e\x7f\xff\x6e\xb6\x8d\xfb\xdd\xcb\x1d\xf2\xe3\xb0\xef\xb7\x4e\x25\x86\xa1\xce\xcd\x72\x34\x64\xd3\xf7\x83\x94\x89\x9a\xd\xd8\x71\x67\xad\xbc\xf1\xa6\x63\x88\xd7\xe\x70\xc4\x20\xde\x3e\xd2\x7b\xb9\x1c\x1a\x39\x30\xda\x59\x47\x43\x29\x9\xe0\xcf\x77\x4d\x75\x97\x56\xdb\x2b\xa4\xa8\x7e\x96\x85\x26\xf3\xd6\xe9\x61\xeb" },
-	{ 0x53a7c8, "\x84\x5c\x65\xae\x56\xa1\xcc\x60\xa9\x28\x29\xf5\x35\x54\x33\xd1\xd6\x48\x44\x68\x34\xef\xee\xf3\x80\xa5\xcf\x2c\x22\xdf\xac\x53\x18\x2a\x19\xdb\xf1\x3d\xbb\x1b\xc4\xf2\xa6\xbf\x32\x2b\xe7\x8c\xb6\xba\xf8\x8b\x1c\xb7\xfe\x11\x75\xf6\xf7\x59\x76\x9c\xb1\x6e\xb4\xc6\xd\xb2\xb8\xc\x1f\x6\x12\x62\xa0\x47\x74\x5e\xd3\xde\x6a\xe\xaf\xc1\x8d\x57\x7\x89\x0\xa8\xbc\x51\x95\x4d\x97\x98\xfb\x9a\xea\x61\x7d\xe5\x50\x4f\xdd\x52\x64\xe4\x16\x8\x70\xff\x40\xd7\x9\x87\xad\xc7\xf4\x4c\x83\xd2\x63\x6c\xeb\x3\x79\xf\x13\x27\x88\xc5\x8e\x20\x3c\xb9\xf0\xc9\x94\xc3\x96\x1\x67\xb\x3e\x7e\xd8\xd5\x2d\x42\x58\x6f\x6b\xcd\x86\xdc\xab\xed\xfc\x24\xa3\x5d\xe9\x9d\x3a\x38\x8f\x55\x30\x46\xca\xc2\x25\x5f\x66\xc8\xe2\x23\x7a\x6d\xfa\xce\xe6\x36\x45\xb3\xb5\xfd\x92\x1a\x39\x21\x31\xaa\x7f\x71\x9b\xbd\x93\x43\x4\xa4\xd0\x81\x41\xf9\x78\x5a\xa7\x17\xcb\x9f\x3b\x90\x2\xe3\x5b\x69\x1e\xec\xe1\x5\x91\xd4\x4b\x7b\x8a\x77\x4a\x7c\xd9\x82\xc0\x26\xbe\x85\xda\x14\x2e\xa\x9e\x72\x4e\xe0\xa2\xe8\x99\x3f\x37\x10\x2f\x15\x73\xb0\x1d\x49" },
-	{ 0x53a8c8, "\xfe\x9b\xe5\x18\xb2\x38\x1d\xd4\x98\xa9\x52\x58\xc3\xe1\xe8\xbf\x39\x4a\x36\x9\x6f\x7e\xb0\x4f\xca\xcd\x3\xe0\x66\x1e\xdf\xd2\x59\x95\x71\x2a\x16\xa2\x86\xcf\x64\xf0\xdb\xf3\x8e\x35\x7f\x19\xb1\x33\x90\xbe\xc0\x8f\x5d\x6e\x51\x56\xda\xaf\xa\x25\x54\xd3\x41\xb9\x7d\x82\x62\x97\xfc\x4d\x88\xe3\x57\xff\xb4\xc7\x1c\xbd\x80\xef\xe6\x1\x23\xce\x17\x44\xdc\x67\x26\x6a\xbc\x8d\x45\xb8\xa3\x1f\x9e\x7\x74\xb3\xc9\x0\x9c\x78\xf4\xf1\x32\x49\x14\x73\xc5\x7a\x65\x5b\xf\x42\xbb\xa4\xb\xcc\xe7\x27\x9a\xfb\x55\xd6\xd\xad\xeb\x10\x79\x1a\x2d\xed\xe4\x2e\x5a\x7c\x3f\x3c\x47\xa6\x20\x92\x46\xb5\x84\x7b\x37\x89\xee\x2b\xf8\xa1\x30\x48\x9f\x87\x68\xb7\xae\xa0\x29\xb6\xc6\xf9\x2f\x22\xf6\x43\x83\x5c\x21\x5\xd1\xfd\x6b\x50\x11\x93\x8c\xe2\x28\xa5\x3b\x2c\xba\xd0\xcb\x91\x4c\xc1\x69\x53\x75\x12\x85\xab\x4\xf2\xd8\x34\xf7\xc2\x40\xec\x3d\xe9\xc\xa7\xd7\x8a\xaa\xac\x99\x15\x2\x31\xea\x6\x60\x4e\x72\x70\x94\x63\xfa\xc8\xc4\x3a\x4b\x13\x3e\xa8\xf5\xde\x24\xd9\x6c\x76\x5e\x96\x5f\x1b\x6d\x9d\xd5\xdd\xe\x77\x61\x8b\x8\x81" },
-	{ 0x53aa20, "\xfc\x7a\xc6\x79\x44\xfa\x78\x60\xb5\xd8\xa\xc0\x19\x5e\x12\xa9\x29\xb3\xcd\x75\xe3\x7b\x3a\xf1\x85\xab\x2f\x33\xe9\xc1\x14\xf0\x96\x82\xf9\x72\x77\xa3\xdd\xc9\x8c\x53\x4e\x1\xd1\x2e\x5\xec\x16\xdb\xd7\xb2\x35\x10\x74\xb1\xf6\xbe\x8a\x15\x50\x92\xe0\x7\xde\x24\x9c\xe7\x22\xda\x5d\xc3\x9e\x42\x59\xb\x11\x4a\xaf\x5f\x76\xd0\x94\x2c\x3f\x48\x97\x99\x2b\x34\x1e\x89\x6b\x23\x30\xce\xc\x8b\xaa\x57\x91\xc7\xea\xf4\xb8\x21\x8d\x3e\x70\x6\xa2\x64\xd3\x9f\xf3\x4b\x13\x2a\x1c\x7d\xee\xa1\xe5\x58\xbf\x98\x3\xfb\x6e\x81\x61\x56\x8e\x71\xa6\x26\x5a\x46\x80\x7e\x9\x37\xa4\x6a\x90\x1b\x1d\x51\x27\x5b\x2d\xba\x4f\xbb\x7c\xa8\x93\xf7\x4\xf5\x68\xd5\xc8\xc4\xef\x36\x84\xe8\xcf\x62\x2\xcc\x67\x49\xb0\x43\xc2\x3b\xa7\xa5\x1f\xfe\xac\x40\xb9\xc5\xae\x6f\xd4\x9a\x95\xbc\x17\x47\x9d\x86\xb7\xfd\xeb\x63\x65\x39\x69\x3c\x55\xe1\x9b\xd2\x66\xdc\x73\xbd\xf8\x83\xff\xf\xcb\x52\xb4\x88\x4d\xe6\x8\x6c\x20\x18\xe2\x45\x25\xe\xf2\x32\xdf\x38\x41\x4c\x5c\x31\x8f\xb6\xed\x0\x54\x28\x3d\xe4\xd9\x6d\xca\xad\xd\x7f\xd6\x87\xa0\x1a" },
-	{ 0x547b00, "\x72\xf0\x14\xcb\x61\xa5\xb2\x2\x75\x22\xc3\x9d\x5a\x63\xfa\x5f\xd9\x55\x58\x43\x24\x7d\x77\x93\xba\x50\x1d\xf7\x49\x18\xb0\x42\xbb\xec\x52\x38\xdc\xc8\x16\x54\x17\x19\x89\x67\x33\x3c\xa\xad\xc9\xde\x81\xed\xbd\xe\xb\x6d\x46\x30\x35\x2b\x8c\xa0\x1c\xd\xfd\xa1\x70\xc6\xd8\x41\xb3\xc0\x44\xeb\x92\xbe\x6b\x98\x1a\x76\x71\xc5\x51\x56\x80\xfc\x1\x53\x4b\xd0\x8b\xd2\x7b\xe7\x15\x5d\xe5\xa6\x8a\xd3\x9b\xf4\x69\x23\xe8\xb6\xc7\xe2\x73\x9f\x88\xdf\xb4\x28\xee\xc2\x94\xb8\xf9\x7f\x4a\x57\x6\xf6\xbf\xc1\xab\xfb\xa4\x8e\xd1\xd7\xf5\x7c\xa3\x1e\x3b\x32\x3\xaa\x90\x5c\x48\xe0\xe3\xcf\xd4\xef\x59\xd5\x1b\x34\x1f\x95\xce\x7a\x20\x26\x87\xb7\x78\x9c\x4f\xa2\x12\x97\x27\x3f\xff\x7\x84\x96\x4\xaf\xa8\xea\x2c\x6c\xae\x37\x91\xa9\x10\xdb\xcd\xda\x8\x99\xf1\x4d\xcc\x68\x79\x2e\xb1\x39\x9e\xe9\x2f\x6a\x3d\xf\x85\x8d\xca\x29\x86\xd6\xdd\x5\x25\x3a\x40\x21\x45\xac\x11\xf3\xa7\x9\x2a\x31\xe4\xc\xf8\x6e\x3e\xb5\x82\xfe\x74\x13\x65\xe1\x2d\x8f\xe6\xc4\x0\x5b\x4e\xb9\x66\xf2\x62\x36\x4c\x83\x5e\x6f\x47\x64\xbc\x9a\x60\x7e" },
-	{ 0x547548, "\x7c\x11\x4d\x5b\x41\x55\x97\x3f\x59\xed\xda\x6f\x85\x33\x16\xc8\xb1\x18\x50\x6c\x9c\x38\x2\x71\x2e\xec\x93\xa1\xa5\x0\x91\xaf\x7a\x92\x1b\xc7\x3a\xa9\xbe\xb6\x9b\xe5\xee\x57\xf1\x99\x47\x4\x6b\xd8\x20\xf4\x3\xd3\x75\xe3\xb8\xdc\x7\x54\x4f\x2d\x37\x49\x14\x9f\x69\xc4\xf7\xc6\xf0\xce\x24\x7b\x7e\x89\x4e\x3c\x7f\xcc\x9\xe6\x2f\x61\xfc\xcd\x86\x62\x83\x56\x29\xd6\x32\xc\x76\xc1\x5c\x68\x51\xf3\xa8\xe2\x87\xcb\xe0\xdb\xb\xba\xe4\x46\x9a\x84\x95\xf\x10\x81\x82\x53\x1c\x26\xc2\x31\xb0\x8c\xb3\x9d\xd9\x96\x5a\x79\xd1\xb2\x25\x80\x1f\xa4\xff\x60\x44\x1a\xb9\x45\xf9\xd2\x6e\xd0\x5e\x35\x98\x66\xc3\x90\xae\xa0\x78\xb5\x34\x2c\x12\xf5\xcf\xaa\xe9\x77\x8b\x70\xde\xeb\x65\xbb\x72\xa6\x88\x58\xa2\x27\xc5\x4b\xbc\x19\xdf\x36\x1e\xa\x74\x15\x17\xbd\x22\xe7\xac\xf6\xf2\x30\xe8\x13\x1\xef\x8f\xd4\x2b\x23\x48\x5f\x21\x3d\x73\x8\xa7\xd\xfd\x63\x67\x4a\x8e\x6a\xd7\xb4\x3b\x40\xc9\xfa\x64\x39\x7d\xea\xab\xfb\xd5\x8d\x42\x8a\x6d\xca\x94\xc0\xe1\xad\xbf\xa3\x9e\x28\x3e\x1d\x43\x6\xb7\x52\xe\x2a\xfe\xf8\x5d\x4c\xdd\x5" },
-	{ 0x53b1d0, "\xf\x8\xef\x6c\x8f\x19\x5e\x9c\xdb\xec\x35\x6f\xe9\x5\xe0\xd\xf3\x17\xa2\xb3\xcf\x28\x46\xe1\xa0\x6\x4e\x38\x4d\x25\x3f\xb5\x12\x80\xb2\xa7\x3\xbc\xca\x41\x6b\x2f\x1d\x4b\x66\x6a\x68\xaa\xc4\x77\xa4\x59\x4\xbe\xc9\xb9\x7b\xd1\xc5\xde\x57\x85\xa9\xcc\xc8\x6e\x78\xb\x82\x2\x5f\xae\x51\x7f\x2d\x8c\xee\xcb\x69\x62\x67\x81\x87\x5c\x1f\x8b\x74\xa5\xe\xf2\x5b\xc0\xc2\x18\xe5\xfd\x95\x65\x20\x97\x58\xc6\x3b\xb7\x9\xdc\x21\x11\xe4\xe3\x16\xa8\x63\xf6\x33\x6d\x8d\x9e\xb6\x34\x7\x14\x36\x71\x60\x45\xfb\x4a\x9a\xea\x1b\x90\x31\xb0\x99\x1c\xd3\x7c\x24\x47\xe2\xdf\xe8\xc7\x29\x30\x1\x2b\xd4\x8e\xb8\xd6\x7e\x2a\x7a\x3d\xf4\xdd\xd0\xb1\xf0\x73\xab\xbb\xa6\xf7\x3a\x1e\xba\x52\x4f\xbd\x4c\xb4\x72\xc1\xe7\xfa\x1a\x54\xf5\xac\xff\x5d\x40\x37\xd9\x43\x23\x93\xa1\x3c\x79\xad\x44\x76\xed\xaf\x84\x94\x49\x50\x91\x10\x70\x5a\xce\xc\xd8\x0\xfe\x92\xd5\x55\x56\x2e\xeb\x89\x13\x88\xc3\x64\xe6\x75\xa3\xf8\xf9\xa\x9f\xcd\x61\x83\x96\xfc\x22\x9d\x7d\x2c\x53\xd2\xbf\xd7\x39\x3e\xf1\x48\x8a\x15\x42\x98\x27\xda\x26\x32\x9b\x86" },
-	{ 0x53b2d0, "\xab\xdf\x86\xff\xce\xfa\xaa\x1\xd2\x41\x9e\xe7\xbc\xc0\x77\x22\xe8\x7c\x4e\xfb\x8e\xf3\x33\xc9\x4b\x26\x60\x89\xc4\x69\x79\x96\x54\xcd\x10\x48\x23\x31\x38\x44\x82\xe5\x6a\x8\xd7\x3f\xe1\x28\xd3\xa6\x4c\x7\x34\x5b\x7f\xb0\xd\x81\xd0\xf\xc1\xaf\xcc\x3d\x99\x19\x24\x57\xb4\x2c\x8d\x7d\x58\x55\x27\x8a\x42\xb\xa2\xca\x53\xc5\xe0\xf4\x4f\x2f\x8b\x21\x2\x2d\x12\x65\xf5\xf2\xc8\xed\x1d\x47\x5c\x1c\xa8\x40\x7a\x8f\xda\x87\xd5\xb1\x4\x70\xea\xe\xeb\x29\xb5\xb8\x9f\xf8\x2a\x3b\xb3\xfd\x5d\x0\x71\x2e\xc2\x46\xec\x92\xf9\x6\x74\xe4\x6d\xa0\x59\x6e\x25\xa9\x7b\x5f\xe2\x64\x3e\x37\xfc\xd4\x9b\x5\x61\x84\x20\xa\xc6\xa7\x76\x83\x62\x32\xa3\x6f\xc7\x78\xa5\xf6\x30\x6c\xdc\xa1\x2b\xbd\xae\x15\x3a\xf1\x4d\x45\x5e\x75\x98\x68\xad\x1b\xd1\x49\x35\x6b\x52\x14\x1a\x11\x88\xbe\x8c\xac\xc\xe3\x66\x13\xd9\x17\xcf\xdd\x93\xbf\x39\x56\xf7\x18\x94\x63\x3\x1f\xd8\xb6\xcb\xf0\x9d\x9\x16\xe6\x90\xa4\xb2\xba\x85\x3c\xd6\xfe\x36\x50\xc3\x43\x80\x1e\xb9\xee\xb7\x9a\x51\x9c\xdb\xef\x67\xde\xe9\x7e\x97\xbb\x5a\x72\x4a\x73\x95\x91" },
-	{ 0x53b418, "\xc6\xcb\x61\x7f\xb\x44\x1c\xea\xc1\x87\x7d\x4e\xd4\x23\xbc\x82\x10\xa7\x3e\xaa\xbf\x46\xb2\xd2\xa3\x33\x20\x27\xc0\x9f\xe2\x45\x6b\x96\x6\x8b\x1d\xb7\x26\x56\x88\xc3\x13\x2b\x15\x37\x9e\x57\xe5\xc8\x21\xa9\x92\x2\x38\xfe\xd7\xba\x9a\xc7\x5a\x84\x28\x58\xfb\xa8\x90\x42\xf4\x3d\xfa\xdc\xa\x4c\x48\x8f\x8e\x39\x3b\x63\x5\x79\x4a\x2c\x65\x71\xe\xdb\x29\xe0\x50\x1\x8d\x19\x31\x94\xd\xb4\x9c\x6c\xb3\x68\xc2\x2e\xce\x97\xe6\x2d\xcf\x36\x91\x1f\x7a\xf\xc4\x8a\x5d\x9b\xad\xfd\x93\xd8\x3f\x9d\x64\x85\x4d\x99\x69\xd5\xd1\x18\x1a\xd9\x12\x2f\xf5\xf2\xda\x80\x51\x1e\x4\x60\x7c\xd6\x86\x54\x62\xac\x5b\x17\xf8\x66\xa4\x43\x49\xff\x0\xe1\x9\xb9\xed\xdf\xd3\x55\x72\x16\x4f\xe9\xe3\xab\x81\xe8\x2a\xcd\xb1\x53\x77\x75\xb0\xdd\xc5\x67\xf3\xa6\xe4\x34\x3a\x40\x1b\x83\x6f\xef\xa5\xa2\xca\x73\xb5\x47\x8\x76\x11\xc9\x3\x3c\xf7\x6a\x25\x41\x30\xf9\xaf\x5c\x95\xa0\xb6\x35\x78\xbe\xd0\x14\xec\x59\xbb\x70\x5e\x74\x6e\xb8\xae\x7e\xfc\x7\x6d\x52\xe7\x32\x8c\xcc\xeb\xf1\x89\x7b\xbd\xa1\xf0\xc\x98\x24\xf6\x5f\xde\x22\x4b\xee" },
-	{ 0x53b550, "\xa0\xb9\x6e\x86\xd9\x98\x97\x73\x25\x76\xf\xcc\x7\xe8\x7a\x79\xb5\xe5\x38\xf4\xc2\x16\x10\x2f\xa2\xec\x3a\xb0\xdf\x5f\xb4\x6a\xb1\x60\xd4\x3e\xd2\xde\x6\x95\x62\xd5\xab\x9\x13\x11\x92\xa6\x37\xa\x2c\x64\xf1\x80\x1b\xfc\x31\x22\x3b\xff\x94\x70\xca\x84\x24\xdd\xd7\xd3\xb2\x32\x3d\xb6\xb7\xa9\x26\x9b\x48\xc0\x1f\xaf\x83\x6c\x58\x29\xc3\x7d\xc5\xf3\x8d\xb\x8a\x2a\x69\x1d\x91\x7e\x9c\x3\xb8\xf2\x9f\x45\x28\x4c\xbb\xcb\x2b\xfd\x61\x7f\xb3\x99\x6b\xbc\x7c\x19\x52\x2\x78\xea\x5c\x49\x74\xa7\xc7\x59\xf6\xf0\x8f\x81\x82\x8c\x1\xf5\xc4\xad\x21\xa5\x0\x5a\x39\x75\xd8\xc\xc1\x85\x17\x5b\x77\x43\xc6\x89\xa1\xf9\x20\x93\xee\x12\x1e\x1a\xe1\x57\xf7\x4\xae\x18\xcf\x33\x47\xfe\xe9\x8\x71\x65\xbd\xd\xcd\x6d\xe4\xac\xba\xdc\xd0\xf8\x4e\xe0\x8e\x5d\x41\x3f\x54\x42\xa4\x40\x34\x5e\x87\x7b\xe3\xdb\xe7\x51\xd6\x9a\xaa\xce\xbe\x36\x67\x35\xd1\x68\x4f\xfa\x23\xfb\xed\x8b\x44\x9d\x50\xeb\xc8\x14\x15\xe6\xc9\xe\x88\x4d\x66\xa8\x5\x3c\x46\x2e\x27\x6f\x72\xbf\xa3\x2d\x96\x9e\xda\xe2\x63\x1c\x53\x55\xef\x56\x4b\x90\x4a\x30" },
-	{ 0x53b718, "\xd4\x58\xf7\x7\xc3\xfd\x69\x49\x23\x17\x65\x84\x9b\xf\x77\x97\xb\xc4\x67\xb1\xbd\xba\x85\xc7\xff\x8f\x32\x28\xea\x6b\xd7\x9f\x31\xab\x9e\x5b\x11\xa8\x36\x8\x96\xa4\x4f\xa2\x70\xed\xd3\x91\x2a\xd9\x73\x6\xb4\xaa\x35\x72\x48\xf3\x0\x1e\xc0\xdf\x2e\x29\xdd\xb7\xa\xd\xaf\x2f\x56\x19\xc\x39\x5c\x46\xec\xac\xfc\x7d\xe6\x92\xf2\x15\xa3\x5d\x93\x3d\x98\x2d\x79\xb0\x52\x5f\xb3\x89\x3\x4\x1d\x55\x42\xcc\xe9\x83\x16\x80\xd2\x8e\x5a\x66\x1b\x47\xfa\x88\xa7\x9a\xd1\x25\xf8\x44\xe2\x26\x59\x9\x61\x40\x3c\x34\xd8\x30\x45\xbb\xc6\x7f\xe7\xbc\x7b\xa9\x3a\x1c\xe5\x68\x21\x5e\xb2\x12\x2c\x74\xcf\x8a\xb9\x24\x1\xcd\xe4\xb5\x9d\x1f\x18\x3b\xe0\x71\x4e\x4b\x4d\x62\xa0\xd0\xc2\xd6\xeb\x43\x51\xf9\xa6\xf4\x2\x90\x1a\xa5\xef\x5\x7c\xb8\x57\xc1\xfb\x8d\xde\x50\x33\xf5\x82\x86\x3e\x76\xc9\x8c\xa1\x8b\xc5\xee\xbe\xe3\xda\xae\x14\xf1\x6f\xe1\xd5\x10\xf6\x27\xfe\x6d\xce\x9c\x6e\x94\xe8\xb6\xca\x60\x37\x53\xe\x54\x3f\x99\x75\x81\x20\xcb\x4c\x7a\x6c\x38\x78\xdb\x64\x95\x6a\x13\x4a\xf0\xbf\x22\x41\xdc\x87\xc8\x7e\x63\x2b\xad" },
-	{ 0x53b838, "\xe3\x57\xc6\x8b\x64\x27\x80\x87\x9b\x49\x29\x6e\xa8\xda\x5b\x20\xbb\x69\x19\xd3\x5e\x30\x9e\x9d\x24\xcd\x2c\x1c\x79\xb\x9f\x8d\xff\x41\x6f\x68\xbd\xd9\x55\xcf\x36\xe6\x5f\x93\x99\x33\xe1\x72\xf2\xe\xd2\xe2\x2e\xd7\xa7\x32\x31\xa2\x25\xfd\xef\x67\x21\xe4\x2d\x3e\xd0\xac\x34\x35\xf1\x44\xee\x5a\x83\x71\xc1\x59\x3f\xa3\x10\xfb\xa6\xcc\x0\x40\x18\x3b\x9a\x47\xfa\xa5\x66\x5d\x6a\x2f\x16\x23\x88\x7a\x84\xc5\xc9\xea\xce\x58\xeb\x11\xaf\x5\x37\x89\x17\x1a\xe5\xb8\xa\xc0\x95\x48\x81\xb7\xf\xf6\x7e\x60\x8f\x8\xd5\x42\xd1\xf8\x45\x2b\x5c\x1b\x76\xf0\xc8\xf4\x3\x7d\x50\xb5\x86\xb3\xe0\x7b\x3a\x1f\xdc\x92\x28\xca\x61\x4a\x78\x1e\x51\xdd\x3d\xbc\x77\xd8\x53\xf9\x94\x74\xc3\x9\x4f\xb6\xec\x2a\x91\x8c\xd4\x38\x4e\x26\x1d\x96\xdf\x4\xd\xab\xa4\xfc\xc4\x15\xa9\x3c\x97\x6b\x7\xde\x9c\xe8\x22\xe7\x2\x6d\xa1\x39\xf3\x54\xba\x6\x65\x90\xb0\x6c\x63\xad\xf5\xb4\xb9\xc\xe9\x1\xc7\xd6\xc2\xb2\x56\xbe\xaa\xb1\xcb\x52\x82\x14\xed\x7c\xfe\xae\x85\x8a\x13\xbf\x4c\x98\x4b\x62\x12\xa0\x4d\x7f\x73\x8e\x43\x75\xf7\x46\x70\xdb" },
-	{ 0x53bc10, "\xf\xc6\xa1\xa3\x50\xbd\xce\xa7\x9\xa4\xf7\x1b\x8c\x3d\xf0\xe5\xdf\x3c\x20\x75\x3f\xdd\x12\x81\xde\x3b\xaf\x68\xf6\xea\x41\x58\xeb\x5d\xae\x61\xa\x46\xed\x91\x23\x65\x99\x86\x27\x92\x8e\x83\x51\x8\x4b\x3e\x32\x1f\xbf\x5b\xa9\xc5\xfe\x7c\xf4\x15\xdc\x89\xf5\x2b\x72\xad\x6b\xba\x5a\xf2\x24\x53\xe7\x29\xee\x4\xd\xf3\xe0\xb7\x67\xcf\xb0\xc3\xbc\xc9\xfa\x66\xcd\xb4\xd5\xd9\x71\xe3\xb8\xa0\x25\xf8\x78\xc4\x5\xe9\x87\xfd\x35\x1a\x98\x9f\x16\xb3\x6\x26\x22\xb2\xd6\x74\xc7\x84\xc2\x7d\x64\xec\x54\x37\x4c\xef\x70\xe\x48\x9b\x4e\xd7\x80\x7\x73\xbe\xd3\x2\x3\x94\xfc\x59\xb5\x8b\x21\x9d\xf1\x69\xe1\x10\x38\x2d\xd2\x45\x30\x42\x85\x6e\x52\xc\x76\x82\x6d\xa6\xd4\xe4\x90\xa2\x62\x7e\x1\xe6\x1d\x4a\xff\x8d\x79\x8a\x55\x77\x2f\xca\x9e\x47\x19\x6c\x28\xb6\x93\x97\x6a\x18\x5c\x4f\x95\x6f\xc0\x14\x40\xdb\xa8\x17\x34\x36\x39\x56\x11\x13\xd1\xc8\xcc\x1e\x2c\x5f\x43\x5e\xa5\xe8\xd0\x9a\xe2\xab\xf9\x4d\x3a\xaa\x1c\xb\x2a\xb9\x31\x7a\x60\xac\xfb\xb1\x44\x0\x88\x8f\x33\xc1\x7b\x49\x2e\xda\x63\xd8\x96\x57\xcb\xbb\x7f\x9c" },
-	{ 0x53bd10, "\xba\x9d\x27\x84\x89\xcd\x60\x67\x68\xd9\x1f\xea\xf2\x15\xd2\x6\x12\x5d\x54\x75\xbc\xa0\x29\xe8\x16\x70\xc8\xf1\x9\xa4\x26\x30\x49\xd\xbd\xf4\xf8\xef\x8d\x1d\x41\x38\xf7\x9c\x1e\x87\xf3\xbe\x7a\x37\x88\xcb\x36\xe6\xfc\xd6\xd0\xad\x78\x71\x93\x96\xf0\x3c\xfe\x57\xe9\x4f\x7d\xaa\xf9\x62\x9a\xab\x18\x39\xbf\xc\xc3\x4d\xe7\x97\x7f\x8a\x3f\x1\xc9\x80\x76\x9e\xfb\xa1\x3e\xfa\xb3\x45\x3b\xdc\x5c\x5b\x58\x61\x2b\xec\xb4\x55\x1a\x9f\x6a\x3\x11\x32\xd1\xe1\xb2\xa8\x6c\xe4\xa3\xa7\x4b\xf5\x17\x40\x6e\x8\xff\x81\x4c\x5\x79\xae\x1c\x83\x46\x25\x6b\xdf\x24\x64\x2e\x4e\x21\x31\x2\x73\x6f\x3a\x8b\xc4\x7b\xac\x23\x72\x20\x65\x7\x33\xa2\xe0\x47\x77\x85\x2d\xdd\x0\xf6\xd8\x9b\xb9\x63\xd4\x53\xaf\xb7\xda\xa5\xc5\xc6\x2f\xa\x6d\x92\xb8\x50\x74\xbb\x14\xd3\xf\xb0\x4a\x95\xe3\xce\xee\xca\xe\x91\x82\x8c\x3d\x8f\x22\xa9\xb1\x86\xc0\x5f\x28\x90\xdb\x7c\x4\x94\xb\xc7\xd5\xfd\xc2\x2a\x1b\x98\xed\xcc\x59\x8e\xe5\xe2\x42\xb6\x34\xd7\xa6\x13\x2c\xc1\x44\x51\xcf\x99\x48\x69\xeb\x7e\xb5\x52\x35\x19\x66\x10\x56\x5e\x43\xde\x5a" },
-	{ 0x53be50, "\x64\xe7\x66\xd5\xf\xc3\xc8\x20\x4e\x9\xd3\x30\x3f\xef\xa9\x80\xe3\x72\x42\x68\xa5\x51\x99\xb\xbf\x4d\xd1\x34\xaa\xdf\x2f\xec\x55\x58\xb0\xdb\xb8\xd6\xc5\x9b\x9a\xa\xbb\x40\xc2\xb2\x2e\x78\x89\x97\x5d\x74\xf7\x52\x5b\xa1\x2b\x83\xae\x7b\xd9\x5e\xfe\xfd\x98\xd2\x29\x13\xc6\x8e\x5c\xca\x7\xd4\xe4\x49\xa8\xa0\xff\xee\xc9\xcf\x16\xb4\x61\x8f\x60\x1\x84\xb5\xac\x62\x54\x6\x2d\x63\xa7\x48\x73\x1e\x92\x2c\x3c\x82\xe1\xcb\x10\xf2\xd8\x50\xf1\xfb\x96\xc\xd7\x6b\x87\x77\x7e\x15\x8a\xde\x31\xe\xab\x59\xd\x3b\xf3\x79\x1f\xfc\x81\x27\x1a\xf9\x94\x2a\x45\x88\xfa\x47\xe9\x7d\xb7\xed\x7c\x32\x7f\xe2\xbd\x6f\x18\x76\x4b\x65\x70\x22\x1d\xaf\xeb\x28\x4f\x9c\xbc\xf8\xcd\xc0\x1b\x43\xb1\xea\xa3\x6c\x12\x35\x44\x8d\x25\xb3\x1c\x24\xc4\x9d\xa2\x36\x56\xb9\x19\xe8\x21\x11\xf0\x75\x5\x17\xc7\xce\x41\x4\x4a\xe0\x6e\x67\x69\x4c\xdd\x53\x3e\xa6\xd0\x3d\xdc\xcc\xe6\x9f\x93\xc1\x33\x90\x57\x37\xb6\xa4\x9e\x6d\x8b\x46\xad\xba\x86\x38\x85\xf6\x5f\x8\x14\x2\xe5\x8c\x5a\x39\x95\xf5\x91\xda\x7a\xbe\x23\x26\x6a\x71\x3\xf4\x0\x3a" },
-	{ 0x53bf68, "\x36\xbe\x8a\x3c\x5d\xaa\xc4\xf5\xfa\xc\x3f\xd\xa0\xc6\x49\xc1\xe1\x20\x7a\x31\x84\x87\xf7\x9f\x71\x6b\xeb\xa8\x11\x35\x22\x78\xe4\x83\x97\xdd\x53\x39\x45\xb9\x3\xad\x4c\x34\x8e\x79\xfc\x57\xb8\x47\x66\xfd\x54\x96\x33\x48\x4b\x88\xf9\x7\xa2\x3e\x64\x1b\xb2\xf\x5f\xcb\xcd\x18\xfb\x74\x70\xb1\x2a\x37\x2c\x98\x9a\x7c\x30\xe2\x75\x28\x26\x63\x1c\xec\x3a\xa3\x8\x85\xc5\xe\x2b\x4\xe9\xc9\x4f\xd1\xd2\x25\x9d\x6c\xd0\xfe\xce\xca\x15\xbc\x82\x2d\x27\x3d\xbb\x56\xe6\x24\xd7\xe3\xf2\x6e\x12\x9c\x6a\xe0\xe8\x4a\x9b\xd5\x10\x86\xc7\x90\x7d\x61\x67\xd8\xb5\xf1\x1a\x8f\xf8\x89\x4d\xa\xe5\xf4\x7b\x60\xa1\x40\x42\x2f\x1\xb6\x1f\xef\xd3\x81\xc2\x5b\x6d\x41\x5c\xff\x95\xc8\x76\x94\xd6\xd9\x19\xf3\x38\xb4\xdf\x59\xb\x52\xb7\xab\x73\x14\x62\xbf\x9e\xb3\x21\x3b\x17\xba\x58\xcc\xdb\x6\xda\x5\xa5\x16\x4e\x80\x1e\xa7\x8d\xa6\x7e\x99\xae\x0\x5e\x2e\x77\x50\x65\x29\x7f\xd4\xee\xf6\x2\x13\xdc\x69\xa4\x44\x8b\x32\xde\x92\x68\x1d\x51\xcf\xa9\xbd\xf0\xc3\x72\xed\xb0\x8c\xac\xc0\x23\x9\x46\x55\x91\x43\x5a\xe7\x93\xaf\x6f\xea" },
-	{ 0x53c0e8, "\x6d\x90\x16\x84\x89\x48\x99\x24\xad\xbc\x92\xe\x6a\xf5\x4e\xea\xaf\x38\xcb\xbd\x8a\x12\x9e\xd6\xb\x8e\x9c\xf8\xb5\xa1\x81\xe3\x9d\xfa\x65\x77\x6\x7b\xb8\x98\xda\x54\xf6\x3b\x7\x93\x5c\x7a\x15\xfe\x2a\x30\x36\x80\x39\x8c\x2b\x4b\x5b\x21\xe0\x13\x6c\x29\xc0\xbb\x27\x3a\xdd\x3f\xa2\xe9\xac\x4c\xef\x44\x70\x19\x5a\x72\x7c\xc5\x3c\xdc\xcf\x88\xf2\x51\x47\x61\x3\x67\x82\xfb\xed\x18\x9f\xb7\xa7\xb0\xc4\xf\x26\x5\x28\xe5\xd2\x4f\xa\xd0\xb3\x1\xd5\x1a\x37\x6e\x8\x9a\x1f\x60\x45\x5f\xf9\x33\x9b\x6f\x2d\xca\x9\xb4\x3e\xbf\x96\x95\x4a\x11\x1d\x74\xcd\x87\xce\xb9\x20\x68\xc3\x40\xf1\x31\x8d\x25\x7f\x2\x17\xb6\xcc\xd3\xa5\x59\xf4\x91\xd1\x83\x4d\xc2\xe1\x22\xec\x4\x52\xf0\xd9\xae\xc8\x56\xf7\xd4\x85\x42\x1e\x35\x1c\x7e\xeb\xe2\x76\x6b\x49\x75\x3d\x58\xff\x57\xbe\x43\x46\xf3\xba\x2e\x69\xa3\x34\x78\xb2\x73\x5e\xe7\x1b\x8f\xd8\x8b\x94\xa8\xe6\x97\x7d\xde\x2c\xa6\xab\x23\xfd\x50\xe8\x79\x62\xa4\x66\xfc\xee\x86\x41\xc6\xd7\xa0\xc7\xe4\x5d\xc9\x53\x32\x63\xaa\xc1\x64\xdb\xb1\x0\x10\x2f\xc\xdf\xd\x14\x55\x71\xa9" },
-	{ 0x53c240, "\x74\x4b\x7\xe3\x16\x70\x33\x94\xb\xb6\xe6\xc0\x62\xd5\xe5\xfb\xbe\x8d\x67\xc8\xc7\x58\xc6\x2e\xf9\x47\x77\x12\x4a\x68\x6c\x84\x35\xe1\x69\x14\xc4\x48\x32\x11\x9d\xb1\xe\x5a\xd0\x17\x60\xed\x28\x21\xef\x10\x2b\x5b\x31\xab\x23\x89\xf0\x18\x66\x0\x87\x99\x30\xe2\xda\x49\x7f\xd2\x4d\xcc\x81\xd6\xdf\x37\xd\x1a\xaa\x51\x97\xb3\x73\xd3\x50\xb2\xdd\xc3\xbf\x3e\x92\x1\x64\xf4\xcd\x1c\x8f\xaf\xa9\x24\x36\x91\x9e\xa4\xd1\x75\xc9\x59\x42\x4e\xb4\x6a\x4f\xa1\xe8\x6d\x61\x63\xea\x3c\x38\x5\xe9\x9c\x46\xb9\x9f\xb7\x43\xeb\xf5\x5c\x76\x3b\xd7\xba\xa5\x7b\x6f\x5f\xde\xad\xe7\x15\x2\x2f\x5e\xf7\xa6\xbb\x52\x95\xd9\x86\x26\xa\xa8\x8\x20\xf1\x45\x13\xca\xf6\x65\xcf\xe4\x98\xdc\x80\x19\x7a\xfd\x9b\x4\x1e\xa3\x9a\x5d\x72\xb5\xfa\x3\x53\xc2\xc\xa7\x57\x55\x7e\x29\x6e\x83\xb0\x1f\xbd\x8e\x93\x8a\x79\x96\x39\x7d\x88\x27\xcb\x71\xf\xf3\xfc\x25\x40\x3a\xd8\x85\x2c\x6b\xd4\x2d\x34\x54\xec\x8c\xe0\x1b\xb8\x8b\x3f\xf2\xac\xff\x7c\xa0\xee\xbc\x22\x44\xce\xc5\x9\xdb\x82\x78\x90\xae\xc1\x6\xa2\x41\x4c\x1d\x3d\xf8\xfe\x2a\x56" },
-	{ 0x53c368, "\x8b\x9c\xe5\x1a\x2d\x5a\xf5\xa6\x77\x3\xd4\xb4\x99\x84\x32\x53\xcd\xca\x43\xb5\xe2\xcb\x1e\x8c\xc7\x81\x89\x49\xb3\xf7\x71\xbb\x4e\xe8\x7d\xaa\x2e\xd0\x7f\x3e\xf1\xe9\x60\xbf\x87\xe6\x6c\x6d\xff\x47\x10\xc5\xc9\x3a\x5e\x30\x3b\x0\x4a\x18\x63\x11\x8e\x92\xab\xf9\x8a\x9f\x9e\x1d\x45\x62\xf8\x83\xce\x5d\xcf\x78\xdd\x93\x8f\xc2\x76\x2b\xd3\x54\xd\x4d\x44\x31\xa\x42\x91\x23\xfd\x36\x48\x79\x2a\x4f\x2c\x80\x7c\x7\xb9\xb0\x68\x52\x33\x70\xe1\x6a\x9\xbe\xad\xf0\xb8\x37\x5c\x41\x95\x59\x72\xa5\x67\xf6\xa2\x13\x82\xfb\x19\x34\x66\x3f\x5b\xac\x5f\x9d\xeb\xd8\xb7\x21\x1c\x3c\x75\x4c\xd1\x7e\x74\x40\xb6\x22\x98\x69\xee\xea\xa4\x7a\xe4\x6e\x58\xc0\x12\x1b\xe\x14\xae\xde\x9a\x7b\xd7\x28\xed\x1f\x61\x55\xf\xb\x57\x17\x9b\xef\xe7\x97\xfa\xaf\x24\x4b\xd2\xa3\xd9\x85\x64\x8\x2f\x96\x50\x35\xa7\xe3\x25\xc1\x46\x8d\xcc\x73\xe0\x56\x15\x90\xa8\xbd\x5\x4\x20\xc4\xf3\x39\x16\x6\x38\x65\xf2\xdb\x86\x6f\x27\x1\xf4\x6b\xb1\xbc\xdc\xba\xc6\x26\x3d\xdf\xa1\x29\x51\x2\xa0\xc8\xda\xa9\xec\x94\xc3\xc\x88\xd6\xb2\xd5\xfe\xfc" },
-	{ 0x53c7b0, "\x5f\xb6\xef\xa1\xfb\xd0\xa3\xb\xc9\x67\x54\xdd\x92\x4\xa5\xe0\x99\xa7\x62\x53\x87\x3c\xf6\xcc\x12\x45\xd5\xa6\x7b\xb4\x8e\x6f\x3e\x6e\xe3\x41\x44\x61\x8b\x5e\x2a\xb9\x2b\xdc\x46\x7c\x4b\xf0\x50\x4d\x9b\xad\xc3\xa8\x7d\x81\x8f\x2e\x1d\x79\xf3\xfe\x29\x8a\x3f\x22\x35\x4c\xa2\xf1\x90\x58\x9a\x70\xac\x88\xc4\xbb\x43\xb5\xbd\xaf\x24\x2c\x1c\xb0\xe9\xbc\x3\x3d\x18\xc5\x7\xd8\x9f\x97\xdf\xd9\xc6\x68\x5c\x15\x2\xda\xa9\xc2\xaa\x6\x55\xc7\x76\xf4\x2d\x7a\x32\x85\x86\xee\x19\x95\x4a\xec\x94\x80\x89\xbe\x9c\xcd\x56\x38\x10\xd3\x8\xdb\xb1\x6d\x6a\x2f\xf5\x33\x52\xcf\xab\xe6\x1f\xa4\x73\xf9\xf\xc8\xc0\xe8\x93\x13\xd\x84\xf7\x9d\xba\x64\x83\xb3\xae\x71\x37\x1e\x8c\x25\x0\xf2\x21\x9\xea\xd1\x1a\x7f\x42\xe1\x16\x48\x6c\xc1\x1b\xf8\xd6\x20\x27\x74\xb8\x49\x60\xcb\x6b\xa\x3b\x72\x75\x9e\x47\xeb\x4f\x91\x31\xe4\x63\xd2\xe7\xfc\xde\xb2\x28\x4e\xce\x57\xc\xb7\x98\xed\x36\x7e\x5a\x34\x40\x51\x23\x30\x59\x77\xfa\x5d\x1\x96\x39\x8d\xff\x17\x11\x66\x5\xfd\xd7\x14\xe5\xa0\xbf\x69\xe2\x82\x26\x65\x5b\xd4\x3a\x78\xca\xe" },
-	{ 0x53c8b8, "\x69\x23\xad\xbe\xc\x4e\x2f\x48\x7e\xe3\x30\xaa\x9d\x42\xc3\xc1\x6e\x13\x64\xff\x3d\xd9\xdf\xb3\x4b\x98\xfc\xeb\x92\x83\x95\x50\xaf\xc9\x7b\xf\xc7\x8d\x53\xa8\xbb\xb5\xd8\x2e\x9f\x3\x81\xe8\x2d\xed\x74\x6c\x97\xe9\xb\xbd\x1d\x15\x4\xa0\x5a\x16\xbf\x3f\x7c\x35\x6\xcf\x7a\xae\x44\x8b\xf4\xf7\x5e\x1e\xef\x27\x8f\x29\x55\xf2\x4f\xd\xea\xc4\x5\x88\x18\x94\x34\x8\xb4\x62\xd7\x26\x56\xfb\xf8\x37\x33\xce\x1c\xd0\x47\xd5\xe0\x71\x41\xd6\x87\xee\x72\xf1\x70\xe5\x75\x7f\x21\x54\xca\x80\xb2\x11\x7d\xbc\xdc\x7\xe\x91\x38\x96\xa1\xb6\x3a\xfd\x2\x6f\xa6\x3e\x10\x60\x9c\x63\x77\x59\xec\xa\x86\xf5\x28\xfa\xe7\xe1\xb7\x76\x36\x1a\x1f\xa5\x9a\x45\x39\xdb\x5d\xd2\x5f\x2b\xf9\xfe\xde\x31\xab\x52\xd1\xa4\x3b\x4a\xb0\x0\xb9\x9b\x9e\x43\xc0\x12\x89\xa9\xa3\x20\x65\x14\x1\x46\x2c\xcc\x17\x8a\x68\xe2\x19\x4c\xd3\x32\x5b\xdd\x66\x73\xcb\x85\x1b\xc6\x67\x6a\xd4\xc2\x8e\x61\xda\xf3\x57\x79\xa7\xb8\x8c\x9\x40\x5c\x6d\xb1\xa2\x22\xc8\xf0\x25\x49\x58\x24\x6b\xe4\xcd\xba\x93\x2a\x99\xc5\x4d\xe6\xf6\x84\x3c\xac\x90\x82\x51\x78" },
-	{ 0x53c9e8, "\x1\x69\x88\x4f\xf0\x48\xe7\xbd\xc3\xba\x8\x63\x75\x6d\x3a\x4b\xd7\x86\x59\x47\xb\xde\xa\xf1\xbe\x58\xe1\x5d\x91\xab\x9\xee\xad\x5e\x28\xca\x6\xa9\x4\xe9\x8e\xc5\x6f\xd0\xfe\xdf\x12\xc1\x7e\x4c\x2b\xcb\xb1\x96\x7a\x90\xf8\xc2\xa4\xe6\x73\xa2\xdd\x1c\xaa\xe4\x30\x3f\xcc\xc4\x35\x66\xb3\x1d\xdb\xa0\x7\x36\xa3\x54\xb9\x43\x94\xc\x8b\x98\x72\x44\xbc\xf5\xcd\x2d\x2\x5b\xed\x1f\x29\xf7\x0\x7f\x53\xda\x85\x2f\xc0\x89\x33\xa5\x9f\x9a\x8d\x64\x68\xd2\x9e\xaf\x40\xeb\xec\xfa\x26\x41\x9d\xd4\xa1\x10\x8c\x37\xbf\x4a\x81\xac\x45\xd6\xa7\xe3\x9c\x8f\x21\xf2\xff\x42\xea\x87\x32\x1a\x2e\xcf\xbb\x3e\x15\x22\x65\x7b\x61\x3d\x83\xa6\x78\x6a\xd8\xf\x2c\x31\x62\x97\x5c\x14\x27\x49\x46\xf4\xd1\xf3\x93\xb6\x60\x95\x3b\x99\xc6\x70\xfb\x67\x24\x6c\x9b\x25\xc9\xe5\xb4\x4d\xd5\x76\x71\x2a\x1b\xdc\xfc\x8a\xae\xe2\xef\xe0\x17\x13\x5f\x57\xb5\x79\x50\x6b\x56\x7c\x52\x11\x3\xd\x23\x7d\xa8\xd9\xe\x6e\x3c\x16\x38\x92\xce\x51\x34\xc7\x55\x18\xb7\xe8\x74\x82\xb2\xd3\x19\x20\x77\x5\xb8\xc8\xfd\xf9\x80\xf6\x1e\x4e\x84\x5a\x39\xb0" },
-	{ 0x53cae8, "\xa4\x6d\xc3\xfc\x24\xa5\xb7\x3f\x26\xc0\x2d\xe3\x49\x71\xe0\x36\xaa\x39\x6a\xb4\x21\x67\x9a\xfa\x23\xe5\xec\x12\x25\xd\x72\x87\x27\x7a\x5d\x60\x6f\x57\x78\x94\x44\x56\xde\xc9\x95\x97\x2f\x77\x9d\x53\x89\xfe\xff\x8b\x46\x2c\xcb\x61\x8\xdf\x79\xb6\x20\xc\x15\x3d\x4a\x2e\xb2\x7\x73\x3e\xcf\x6\x88\xf4\x37\x32\x19\x3a\xf6\xe9\x75\xac\xeb\x30\xf9\xbb\xa7\x84\x63\x5f\xa8\x1a\x91\xc8\x9c\x7f\xd6\xd5\xed\x3c\x98\xd8\xbc\xb1\xf\xfd\x9\x3\x99\x6b\x16\x8e\x59\x4e\x1f\x66\x82\x2\x8d\x96\x4b\x22\xc5\xa3\x50\x74\xdd\x2b\x5e\xa1\xda\xcd\x5b\x58\x9e\x28\x1d\xe8\x62\x47\xf1\x33\x35\xaf\x34\xef\x5a\xa2\xbd\xe\x81\x4\x5\xee\x7c\x51\x4f\xbe\xc4\x42\xb\xca\xd3\x70\x9f\xba\xd4\x8c\x10\xfb\x90\x14\x13\x1b\x3b\x11\xc1\xad\xb9\x64\x48\xd0\x31\x4d\x8a\xd2\x86\x38\x0\x92\xdb\xf5\x5c\x9b\xea\x17\xf8\x68\x83\x18\x4c\x52\x1e\x2a\xe6\xa\x69\xab\x6c\x6e\xf7\xd9\xc7\x41\xf3\xc2\xa6\x1c\x7d\xb3\xd7\xdc\xd1\x93\xe2\xce\x85\xbf\xb8\xe1\x76\x40\x54\xcc\x7b\x8f\xa9\x7e\xe4\xae\x55\x1\x80\xf0\x43\xc6\xb5\xf2\x65\x29\xb0\xa0\x45\xe7" },
-	{ 0x53cd28, "\xed\x8e\xda\x43\x63\x70\xc8\x69\xee\x7\x3b\xd6\xe9\x1c\x17\xc\x38\x97\xa3\xe1\xe\x6\x40\x96\x0\x7c\xbb\x39\x9\x2b\xd7\x78\x19\x59\x4\x44\xb9\xa7\x13\x68\x16\xcd\x8d\xa8\xc2\x54\xb5\x30\xac\x72\x5b\x12\x1b\x6b\x89\x6f\x99\xc6\xd3\x51\x76\x87\x91\x60\x27\xa0\x4d\x4f\x47\xf3\xd\xcc\x98\xaf\xf8\x6e\x9d\x9f\x7b\xfc\x36\x5e\x9c\xb8\xf5\x8b\xdf\x7f\xfa\xe4\x75\xcb\x9b\xf0\x77\x3\x41\x62\xb3\x11\x32\xa5\x2d\xa2\x6c\x3d\x86\xdb\x80\xba\x2a\x83\x90\xf2\x22\x24\xc5\xff\x5f\xb0\x15\x31\xbd\x1e\xcf\x57\x4e\xc7\xae\xf4\xe3\xb4\x4b\xce\x35\x3c\xb2\xa\x95\xfe\xa1\x5\xf9\xd1\x8a\xf6\xdd\x74\xa6\x2\x1\xe2\x52\xa4\x10\xb7\x93\xf7\xc4\x18\x28\xd4\x84\xa9\x9a\xc0\xe8\x8f\x53\x2f\x7a\x5c\x58\x26\x79\x42\x4a\x25\xad\x33\x67\xbe\x7d\x34\x1a\x46\x29\xde\x20\xd5\x3f\x1d\xd8\x3e\xe0\xb\xc1\x71\x14\x1f\x73\x6a\xfb\x61\x55\xab\x50\x85\xbc\xb6\x7e\x9e\xd9\xeb\x5d\xd0\xd2\x21\x64\xf1\xbf\xdc\x56\x45\x94\x65\x4c\xe5\x3a\xb1\x6d\xe6\x49\x8\x23\x88\xaa\xfd\xc9\x5a\x81\x37\x2e\xf\xef\x2c\xca\x92\xe7\x48\x82\x8c\xc3\xec\x66\xea" },
-	{ 0x547230, "\x31\x69\xdc\xcc\x61\xe2\xd4\xad\x9a\x51\xe5\xfa\x53\x6d\xfe\x6\x89\x79\x46\x99\x24\x7c\xa0\x18\x56\x27\x7f\x2e\x2a\x77\x0\xd8\xcd\xb6\x1e\x4b\x4e\xfc\x4\x23\xa4\x75\x8\x44\x19\x80\x7\xf3\x16\x5c\x9\x93\xb9\xdb\x92\x10\x30\xd0\x43\xd7\x85\xfb\xdd\xe\x49\x39\xca\x2\x64\x8a\x35\xa6\xee\x13\xe0\x91\x9b\xce\xc2\x12\x82\xab\x4d\x74\x22\xd\x70\xb2\x90\x98\x3\xec\xc7\xcb\x9c\x71\xba\xac\x50\x21\xf8\xc0\xda\x67\xa\x72\xfd\x2d\xc\xf6\xa7\x52\x65\xaf\xc3\xa3\xa1\xea\x5a\xd5\x17\xbe\x7e\xcf\x94\xb0\x34\xd1\x1b\x6e\xf0\x54\xf2\xe8\x76\xbc\xe4\x3f\xf4\x73\xe9\xae\x7b\x6c\x3a\xbb\x8f\xe7\x4a\xb1\xb\x7a\x68\x86\x11\x2f\xf1\x8d\x81\x47\x42\x2c\x7d\x8c\x95\x55\xf7\xc5\x84\x1d\x59\x41\xd6\xbf\x8b\x33\x9f\xe6\x38\x45\x87\x1\xc4\x1a\x78\x40\x3c\xbd\xe1\xb7\x1f\x26\x6a\x6b\xa8\x96\xf5\xa9\x60\x37\xed\xa2\x15\x58\x3d\x8e\x48\x3b\x9d\xb4\x5b\x29\x62\x4c\xc6\x83\x66\xb3\xb8\xde\x1c\x2b\x5e\x63\x57\xd2\x5f\x25\x36\x20\x28\xb5\xc1\x5d\xc9\xf9\x9e\xf\x88\xa5\x5\xef\xdf\x97\x4f\x14\xc8\xd3\xff\xd9\xeb\xe3\x32\xaa\x3e\x6f" },
-	{ 0x53ceb0, "\xbc\xb2\x5e\x24\x9d\xc6\x26\xc5\x91\x6c\x87\xb3\x70\x47\x6f\x5f\x1\xad\x7f\xa5\xea\x4\x7c\x31\x39\xdb\x15\x9e\xdd\x64\xb8\xf4\x9a\xd0\xe0\xf\xf0\xcd\xef\xd4\x23\xc0\x14\xcf\x79\x5b\xba\x48\x2f\x18\xc\x95\x55\x43\xab\x67\x99\xa3\xbd\xd9\x90\xec\xbf\x21\xff\xd2\xb6\x96\xf1\x5d\x6a\xe3\xd5\x4f\x7d\x8f\x46\xb1\x7e\x12\xb4\x6e\x97\x37\xa\x36\x94\xc8\x1f\x51\x8d\x60\x78\xaf\xfa\x9c\x2a\x40\x7b\x1d\xbb\xe9\x75\xe8\x5a\x3a\x11\xf5\x7\xed\x5\xc7\x9b\xf7\xb5\xb0\x1c\xd1\x4a\x83\xc4\x81\x7a\x92\xf2\x3b\x4e\xb9\x2\xde\xaa\xe\x1a\xcb\x5c\x44\xe1\xd6\x98\xa2\x4c\xee\xd7\x45\x9\x32\x20\x3e\x3d\xa7\x57\x58\x0\x73\xa6\x10\xfb\x6\x4b\xce\x74\x35\xfc\xae\x77\x89\xfe\x19\x53\xfd\x82\xc2\x85\x30\x50\x84\x8\xc3\x28\xf9\x22\x80\x65\x62\x13\xe4\xca\x34\x3f\xdc\x4d\xf3\x8a\x86\x8b\x69\xf8\xda\xa4\xc9\x61\xe7\x38\x6b\x54\x2b\x49\x29\xa0\xc1\x71\xd8\x2e\xa1\x1b\xd\xcc\x8e\x8c\xa8\x2d\x27\x42\x56\x16\x41\xf6\x72\xa9\xb\xe2\x68\x25\x63\x93\x1e\xb7\x9f\x59\xd3\xac\xe5\xdf\x2c\xe6\x88\x76\xeb\x3c\x52\x33\x17\x66\xbe\x3\x6d" },
-	{ 0x53d168, "\x3\x21\xa0\xee\x97\xa8\x35\x87\x9f\x6e\x88\xf0\xc1\x1a\x19\xbd\xd2\x17\x78\xb9\xd6\x29\xf4\x28\x40\xe6\x8d\x1c\x2f\xf6\x56\x14\xdd\xa5\x57\x48\x9a\xce\xb4\xff\x5a\x5\x3a\x9d\x7e\x6d\x96\x6c\x55\x3b\x38\x4b\x51\x1f\x60\x8\x1d\x70\x22\xae\xd3\x8f\x99\xc3\x83\xe0\xde\xea\x6\xf9\x9b\x5c\x52\x2a\x72\xb7\xc9\xdb\xfa\xd7\xdf\x68\xbc\xb6\x59\x98\x74\xb2\x27\x9\xf\x44\x6f\x91\x7d\xcc\x12\x4e\x2d\x42\x7a\xf7\x9c\x7c\xe4\xf8\x94\xad\x23\xef\x8a\xaf\xb8\xe2\x80\xb5\x86\x54\x47\x4a\x2\x3c\x5f\xf3\xec\x4d\xe7\x8b\xbf\xb0\x26\xc5\x67\x24\x3e\xca\xbb\xd8\x1b\x63\xc6\x82\x75\x69\x5e\xdc\x45\xac\x71\x30\x76\xa\x81\xda\x33\x32\xd5\xbe\xd\xfc\xf2\x3d\xa4\xf1\x73\xed\x43\xd4\xe5\x2e\xe9\xd0\xcb\x41\x37\x5d\x34\xd9\x77\x7b\x7f\xa3\x39\x6a\x61\x16\xcf\x1\x7\xfd\x58\x13\xa2\x20\xc7\xc2\x66\x2c\x50\xd1\x65\x79\xc8\xb1\x64\xb3\x90\x0\x5b\x11\x31\xe\x25\x6b\x89\xe1\x8c\x53\x10\xaa\xc\x4\x4f\xa1\xa7\xc4\x85\x92\x36\x46\x1e\x3f\xfb\x84\xe8\xc0\x8e\xa6\xa9\xcd\xf5\xba\xab\x62\x15\x18\x9e\xb\x4c\x2b\x49\xeb\x93\x95\xe3\xfe" },
-	{ 0x53d2d0, "\x43\x2f\x53\xa0\xc2\xfd\xcc\x6\x29\x3e\x1f\x44\xab\x65\x74\x54\x49\x27\xb7\xe2\x2c\x5a\x33\x34\x1e\x16\xa7\xae\xa\x92\x55\x20\xad\x98\xf8\xa9\xe\x8b\x32\xdf\xa5\x15\xfc\x9f\x23\x3c\xc4\xc0\x4c\xbe\x89\x9a\xf0\xe4\x73\x59\x30\x9e\x82\x58\x51\x8f\xbf\xa1\xc7\xeb\xf1\x64\x1b\x4b\xc8\xc3\x38\x31\xd2\xfe\x3d\xd0\x77\xcb\xd6\x24\xf7\xc\xe5\xff\xd8\x4d\xac\x10\xe6\x76\xbb\xf\x9c\x6c\x2e\xb\x75\x78\x5d\xa3\xaf\x17\x5e\xb0\xe1\xb1\x9b\xf9\x7\x39\x6d\x7b\x1c\x2a\x9\x3f\x12\x4\xc9\xc1\xc5\x19\x61\x5\xb4\x47\x37\x5f\xd5\x94\x28\x21\x88\x97\xfa\xd3\xcf\x7f\xdd\xd4\xf3\x68\xf4\x81\x62\x84\x91\x83\x8c\x7e\x67\x63\x66\xed\xe7\xe9\x85\x6f\xdb\xaa\x87\xec\xde\x90\xba\x25\xa2\xd\x6b\x5b\x7a\x96\x70\xe0\x86\xa8\xe8\x6a\x4e\x42\x57\x2b\xb6\x40\xce\x69\x46\xb5\x72\x80\xcd\x13\xf6\xf2\x0\xda\x93\x22\x60\x3b\x7c\xb2\x48\xef\x3\xb9\x71\x4f\xc6\x45\x36\x26\xfb\xf5\xca\x2\x6e\xd9\x8d\x95\x14\x2d\x8a\xd7\xdc\x52\xee\x99\xa4\xbc\xb8\x8e\x1a\x3a\x1d\x4a\x7d\x1\xe3\x56\xa6\x50\x35\x18\x8\x79\x5c\xbd\x41\xb3\xea\x9d\x11\xd1" },
-	{ 0x53d3d0, "\xf1\xbb\x4b\x7e\xc1\x8a\x41\x12\x97\x5e\x57\x56\x9f\x2c\x5f\xb6\x47\xff\xb1\x4c\x8b\x9c\x63\xc4\xa7\x98\xb2\x31\x84\xb4\xd\x1d\xe0\x67\xfd\x2\x13\x10\xdb\x8\x83\x48\xc6\x86\xaa\xe5\x80\x9\x38\xfc\xe2\x85\xc7\x8d\xa9\x3b\x18\xa5\xb7\x32\x9b\x6a\x2e\x87\xc0\x24\xa0\xfa\x6b\x76\xa2\xe6\x7f\x5d\x7b\x40\x33\xfb\x62\xf6\x43\xd1\x6d\xa1\x29\xd5\x17\x50\xf9\x1c\xeb\xf2\x22\xc2\x51\xe4\x26\xca\x5b\xf\xf8\x96\x4e\xba\xf3\x55\xa4\x37\x36\x82\x70\x99\x20\xc9\xf5\x7c\xa8\x92\x6\x72\xe7\xb5\x9d\x44\xd2\xbf\x64\x16\x49\x3\x4a\xe3\x68\xd0\x1a\x34\x95\x7d\xcb\xbc\xd3\x78\xd7\x5a\xb0\xb9\x2f\x27\x77\xf7\x45\x25\x52\x1b\x3c\x3d\x9e\x2b\x74\x89\xa\x1f\xfe\xf0\x2a\xe1\x1\x3a\x9a\x39\x8e\x79\x71\xd8\xcc\x46\xe8\x69\x3e\xaf\x7a\x21\xad\xea\x75\x93\x15\x30\xf4\xe9\xdd\xe\x60\x28\x6e\x88\xae\x81\x4\x59\xc5\x90\xee\x61\xcf\x8f\xb8\xb3\x54\xed\x58\x6c\x91\x3f\x65\x6f\xd6\xbe\x4d\xef\xde\xa6\x8c\xc\xc3\x23\x35\x5c\xac\xd4\xda\x5\xc8\x14\x94\xd9\x19\xcd\x4f\x2d\x0\xdf\xbd\x7\x42\xab\xdc\x73\xa3\xb\x66\x53\x1e\xce\x11\xec" },
-	{ 0x53d798, "\xcc\xbb\x69\x91\x5\x73\xbe\x41\xf4\x59\x24\xa5\xf6\x28\xc7\x7a\xc1\xd5\xd\x62\x40\xb1\x32\x16\x6d\x77\xdb\xee\x65\x95\xd7\x35\x2f\x64\x30\x7\xfa\x5a\xe3\x88\x93\x6a\xeb\x31\xde\xd4\xcb\x4f\x92\xc8\x11\xfb\xd0\x4e\x3a\xdc\x7e\x15\xf1\xb4\x61\x58\xad\x9e\xfe\xb9\x6\x4a\x0\x6f\x3\x7f\x8a\x20\x3d\x22\x78\xe1\xe9\xe6\x14\xbc\x75\xe4\xf8\x19\x5b\xc4\xb3\x7d\x76\x2d\x3c\x9d\x9b\xac\x8e\xb2\x3b\xb5\xa7\x47\x9f\xc3\x36\xdf\xf9\x90\x80\x43\xf5\xa4\xe\x4d\x33\xe0\xc\xdd\xb8\x2\x7c\x8b\xf0\x45\x46\xa9\x8c\xcf\x9a\xca\xce\x84\x83\x71\x48\x39\xba\xfc\x2a\xe2\x57\xc5\x98\x97\x60\xc6\xae\xc0\xd8\x37\x81\xaa\xb6\x2b\xea\x26\x21\x4b\x55\xe5\xd2\x85\xab\xb7\x34\xbf\xd9\x70\xcd\x53\x96\xc2\xef\x63\x13\x1e\xed\x12\xc9\x74\x42\x5e\x3e\x54\x9\xd3\x89\x6e\x72\x49\x2e\xd6\x1a\x9c\xa\xa8\x6c\xbd\x10\x86\x4\x38\x50\xf2\xb\x1f\x87\x2c\x29\x17\xfd\x52\x66\x67\xf\x8d\x1\xb0\x18\xda\xe8\x1d\x94\xa3\x25\x79\x3f\x8f\x51\xa2\x23\xf3\xaf\x68\x5d\xa1\xf7\x99\x1b\xff\xec\x56\x44\x8\xa6\x6b\xe7\x5c\xd1\x1c\xa0\x5f\x7b\x4c\x82\x27" },
-	{ 0x53d970, "\xb9\xd7\x6b\x9c\x5b\xfb\xc0\x9b\xf\x49\x55\xa9\x6d\xa5\x17\xd0\xc3\xdc\x4b\xb8\xf2\xb0\x93\xee\x3c\xeb\xdf\x8d\xe1\xf6\x2f\xe2\xc4\x32\x4c\x35\x62\xb4\x92\x91\x1c\x6f\xb6\x30\xe3\x5a\xb2\x2\x5e\x64\x21\xd5\x0\xcd\xd2\xb7\xd\x81\xef\x14\xb1\x87\xf0\x8f\x20\x39\xfc\x16\x63\x38\x1a\x7a\x56\xe4\xf3\x6e\xf4\xcb\x27\x57\x34\x2b\x12\x86\x79\x3f\x7\x6\x5d\xe\xbd\x7b\x54\x8e\xf1\xc8\x51\xf5\xbf\xd8\x5\x26\x47\x67\xda\x53\x95\x98\xea\xed\x5f\x74\x41\x3a\xc\x8c\xa6\x94\x59\xb3\x8b\x46\x6c\x7c\xbe\x9e\x7d\x83\x36\x88\x31\x7e\x18\xdb\x5c\x19\xe6\xe0\x58\x9d\x72\x13\x77\xdd\xc2\xac\x75\x96\x8\x73\xd4\xa\x2c\x22\xe5\x2d\xf8\x71\xaf\x45\x2e\xc6\x76\x3d\x65\xf9\x29\x4f\x80\xd1\xd3\xe9\x69\x9a\xab\x90\x1b\x1\x1e\xc7\x15\x24\xec\xcc\xe8\xad\x3b\x10\x4d\xcf\x85\xa1\xa7\x89\x25\x11\xd9\xc1\x1d\xae\x9\xde\x6a\x44\x4a\x3e\xbb\x48\xca\xe7\x70\x4\x9f\xa8\x68\x43\xb\x8a\x52\x42\x50\xba\xfa\xce\xd6\x33\x61\x60\xa0\xa3\xf7\x3\x1f\x84\xfd\xbc\x40\x7f\x66\xaa\xc5\xb5\xa4\x37\xfe\x97\x28\xff\x78\x23\x82\xc9\x2a\x4e\x99\xa2" },
-	{ 0x53da70, "\x46\x47\x9d\xa8\xcf\xa7\x62\xc7\x30\x42\x69\x3a\x34\x5a\xbe\xd5\x59\x63\x33\x21\x2c\xa0\x6\x1e\x31\xa6\x92\x3f\xc8\x57\x5e\xbf\xa9\x90\x19\xb0\x29\x7\x12\x1f\x23\x97\xe3\xa4\xdd\xb8\x3c\xb2\x5c\xce\xda\xd0\x52\x8\x64\xc3\xc0\x9a\xca\xea\x43\x6b\x41\x1c\x8c\x7a\x7b\xd1\x94\x5\xc\x93\x15\x51\xd9\xd4\x3e\x4c\x2f\x49\x4\xd2\xee\x73\x0\xa2\x8d\x6d\x55\x2\x3\xfe\xb\xc2\x1a\xe2\xf1\x83\x80\x36\x78\xf5\x96\x40\x75\xe\x9c\x7d\xad\x32\x5f\x2b\xc9\xbb\xf4\x7c\x66\xb7\x54\x8a\x89\xff\x50\xdc\x60\x25\xb3\x6a\xfb\xe4\x4d\xab\xb9\x74\xc5\xbc\xb6\xe8\xc6\xfd\x7f\x4a\x76\x3b\x9f\x45\x18\x4f\x9e\x95\x13\xb5\x10\xf8\x22\x5d\x1d\xdb\xbd\xb4\x6f\x84\xba\x17\xd\x6c\xaa\x44\xae\xf6\xde\x81\x11\x79\x85\x86\x39\x99\x82\x38\x6e\xa3\x26\x68\xeb\xc1\x27\xed\xcb\x2e\xdf\xf7\xef\xfa\xb1\x9\xd7\xd8\x8b\xac\x37\x4e\xe7\xf0\xe1\xd6\xa\xd3\xec\x61\x72\x5b\x28\xa1\x87\x70\xf3\x71\x98\x8e\x20\x53\x16\x3d\xa5\xf2\xf9\x4b\x9b\x91\x88\x2a\x65\xf\xfc\x67\xe6\x58\x2d\x14\x56\x48\x1\x7e\x35\xaf\xc4\xe9\x8f\xe0\x1b\xcc\x24\xe5\xcd\x77" },
-	{ 0x53dbd0, "\x77\x1f\x49\xca\xc3\x17\x39\x14\x66\xde\xc5\xd9\x2f\xf\x6e\xd3\x7d\x21\x60\xec\x9a\x4b\x25\xc2\x71\xfc\xb\x81\x8e\xbf\x36\x99\xf7\x6b\x7e\x86\x10\xdc\xa7\xb0\x8b\xb9\x72\x20\xf4\x5e\x31\x74\x6c\x4f\x80\x4\xb1\xc9\xb7\xd0\xab\x7b\xd\xf6\x1d\xbc\x38\x78\xaa\x43\x3f\xf0\x82\xcf\xcb\x96\xf5\xeb\xce\xb5\x12\x29\xc0\x62\x63\x9\xf1\x2\xc1\x44\x32\x2c\xe8\x4e\xe6\x57\x7a\x83\x95\xb8\xfb\x37\xd7\x2a\x3\x5d\xef\xc7\x11\xd6\xa2\xb2\x5c\x85\xa3\x5a\x19\xfe\x8a\xad\xd2\xbd\x28\x9b\x34\x6f\x3c\x67\xe1\xc\x24\x68\x97\xb4\xda\xe3\x98\x7c\x2b\xd5\xee\xe4\xcc\x47\xcd\xb3\xe7\xfd\x61\x42\x3d\x4d\x9c\x5\x9e\x4a\xdd\xa9\xdf\x6d\x45\x6a\xd8\xfa\x16\xae\x58\x1b\x76\xf9\xa0\xe5\xb6\x1a\x59\xa5\xba\x9f\x65\xbb\xa4\xe\xd1\xd4\x51\x41\x40\xc8\xe2\xdb\xaf\x94\x64\x7f\x22\x3b\xf2\x2d\xc4\x70\x2e\x5b\x69\xc6\x56\x33\x7\xa\x15\xea\x91\x53\x1\xf8\x84\xe0\x30\x90\x75\x87\x5f\x54\x6\x46\xe9\x35\x92\x50\x79\x88\x1e\x8d\x3e\x8f\x73\x0\x18\x89\x93\x9d\x8c\x27\x1c\xa6\xbe\x23\xf3\xed\x55\x52\xa8\x26\xff\x8\x13\xac\x4c\x48\x3a\xa1" },
-	{ 0x53dd70, "\x97\xd5\x40\x91\xed\xf1\xce\xf3\xc2\x6e\x94\x19\x5f\x5b\x7d\x9b\xc\x29\x5d\xda\x71\x7c\xab\x9d\xb4\x9e\x2d\x48\x2\xa8\x0\xbe\x7b\x86\xf\x38\x56\xee\xd3\x34\xa6\xbf\x7f\x1b\x8d\x53\xe8\xdb\x61\xa4\xe2\xe1\x2e\x78\x3d\xb6\x80\xd8\xe\xfa\x6d\xd1\xe7\x6\x4e\x14\x77\x54\xae\x5\xd4\xbc\x6a\x74\x3b\x1c\x8a\xc0\xb7\x45\x92\x26\x11\xd0\x99\x57\xaf\xb3\x95\x84\xfd\xc4\xa3\x22\xa7\x39\xbd\x41\x1e\x4f\x3e\x1a\x2b\x15\xba\x64\x1\x23\xa9\x37\x58\xd\x67\x76\x2c\x8e\xca\xc8\xdc\x65\x98\x90\xea\xad\x6f\xcc\xe5\x32\xbb\x28\x70\xf5\xa5\x12\xb9\xc6\x75\xf0\x3c\x4c\x6c\x85\x73\x88\xe6\x7\x72\x69\x82\x8b\x2f\xb2\xde\x10\x6b\xdd\xff\xb1\x43\xd6\x50\xcf\xd7\xb8\x4\x68\xe0\x93\x18\x79\xa\x9\xc5\xaa\x83\x7e\x16\xf4\xc3\xcb\x96\x87\xc7\xb\x49\x3a\x62\x3f\xb5\x31\x24\xa0\x8f\xf7\x13\x30\xe9\x51\x59\xa2\x4d\x47\x4a\xe3\x8c\x55\x81\xa1\x5c\x1d\xfc\x2a\xfe\xeb\xcd\xdf\x60\x25\x89\xef\x33\x7a\x20\x66\x27\xc1\xb0\x3\xf2\x9f\xf8\x1f\x9a\x5a\x9c\x5e\xf6\x35\x21\x52\xd9\x44\xe4\x4b\xc9\xec\xd2\x63\xf9\x36\x8\xac\x42\xfb\x17\x46" },
-	{ 0x53e0d0, "\xed\xb6\x90\x15\xcd\x25\x37\x67\xfc\xf3\xd9\x12\xb8\x36\x3\x5d\xe5\x44\x43\x20\x93\x47\xfb\x9b\xca\x3b\xd0\x9c\xbf\x34\x42\x3a\x68\x73\x76\x3c\xc1\x8e\xb1\x51\x31\x98\x19\x1b\xb\xfe\xeb\x3d\xe6\x82\xea\x2\x9f\x9e\xf2\x46\x87\xfd\xb2\x83\x1f\x9\x8b\x4f\x5e\xa8\x16\xd7\xad\x71\xd2\x64\x24\x66\xe4\x48\xa\x79\x4\x84\x49\x52\xda\x8\x58\x8d\xec\x0\x7b\xe1\x2b\xd3\xc7\x96\x38\x32\x74\x2f\x60\x7a\x7d\xac\x85\x99\xa5\xbb\xc0\xf4\x10\xd4\x61\x6f\xba\x26\xc5\x3f\x8c\xb0\xf7\xee\xe8\xb3\x11\xa6\x2d\x54\x30\x1d\x2e\xe0\x1e\x6b\xc\xce\xcb\x6c\x65\x39\x4e\x5f\xdd\xef\x41\xc9\xf8\xe7\xf6\x92\xd8\x4a\xdc\x53\x40\xbd\xa4\xb5\x22\x9a\xe\x5b\xb7\xde\x5c\x8f\x29\xaf\x8a\x56\xb9\x95\x94\x5\x27\x35\x5a\x78\x18\xae\xd5\xb4\x3e\xa9\x6e\xaa\xc4\x6\x80\xc8\xf5\x6d\x55\x33\x72\xa0\x1c\x89\xa1\xa7\x2a\x97\x4b\xcf\x4d\x6a\xf9\x9d\x28\xf\x14\xa2\xff\x7e\xd6\x81\x91\x7f\x23\xd\x57\x62\x4c\x17\xc2\xc6\xf0\x77\xf1\xa3\x21\x88\x7\xab\x69\x63\xe2\xd1\x50\xcc\xe9\xdb\xc3\x86\xbc\x59\xe3\xbe\xfa\x75\x1\x45\x13\x70\xdf\x1a\x7c\x2c" },
-	{ 0x540278, "\x6c\x9f\x49\x77\xa9\x27\x95\x66\xde\xf\x58\x2f\x4c\x1c\x4b\x73\x22\xcc\xfb\x1a\x85\xf6\x9c\x8b\xc5\xdd\xb0\x15\x46\x37\x79\x2\xab\x3d\x44\x8a\x10\x87\x9e\xfc\xba\xb9\x2b\xa\xf4\xd9\xbf\x78\xf1\xef\x11\xdc\x80\xd2\xd5\xf7\x5c\xbe\xe2\xd4\x9d\xd3\x13\x1\xe1\x18\x50\x53\x43\xd7\x64\xf8\xdb\xf2\x62\xcd\x99\xe7\xa2\x0\xaf\xbc\xff\x25\x91\x5f\x83\x60\xec\x42\xb6\x47\x8e\x6a\xd\x4f\x16\xe6\x51\x14\x8f\x5\xea\x70\x3a\xca\xc7\x74\xce\x5d\x98\x31\x3b\xe9\xe0\xc3\xa4\x1b\x92\xd0\xc\x40\x4d\xb5\x7f\x8\xf9\x39\xb1\x29\xc4\xd1\x21\xac\xc0\x54\x4\x55\xcb\x17\x69\xfe\xe5\x3e\x88\x1d\xe\x7c\x76\xb2\xc6\x24\x81\x9\xe4\x59\x34\x7a\x86\xf5\xad\x5e\x38\xbb\x4a\xe3\xc8\x26\x30\xbd\xfd\x33\x72\xb4\x20\x2a\x19\x6b\x97\x32\x96\x7b\xa1\xa6\xdf\x61\x71\x7\x23\xee\xc2\x75\xb7\xaa\x7e\x67\xa0\xa3\x94\xd8\xa5\x1e\x68\xda\xa7\x48\x8c\xf0\xb3\x4e\xfa\x9b\xb\x6f\x2d\x6d\x8d\xcf\x5b\xc9\xae\x9a\x3f\x6\x1f\x90\x65\x6e\xf3\x93\xa8\x45\x12\x2c\x52\x36\xeb\x82\x3c\x7d\x57\x28\x56\xed\xd6\x63\x2e\x3\x41\xc1\xb8\x5a\x89\x35\xe8\x84" },
-	{ 0x5406e8, "\xbb\x3b\x8c\x61\x95\x4d\x8e\x4c\xe1\xae\xff\xc4\x47\x64\xc9\xb7\xd3\xca\xb\xed\xef\xc0\xc7\x43\x1c\x66\xb9\xd9\xea\x2f\xa0\xfb\xcc\xfa\x50\xd\x55\x46\x96\x24\x21\x70\xe0\x6\x33\xf3\x0\xd5\x67\x1a\x13\xde\xa5\x7c\x74\xfe\x1f\xaa\x73\xc3\x15\x93\x9f\xd7\x2b\x14\xcb\x7b\xb8\xe4\x91\xf0\xaf\x9\x23\x4f\x5e\x6d\xe\x89\xc5\x30\x77\x68\x1\xfc\xe3\xf4\xa8\x9e\xc2\xcd\xe6\x71\x44\x2c\x3\xc1\xa9\x62\x9b\xee\xbf\x2e\x65\x12\xb2\x25\x8f\x5a\x31\xe2\xf6\x7\xd6\x48\xad\xeb\xcf\x19\xd0\xbc\x29\x92\x16\xba\x9d\x3c\x9c\x94\x3a\x80\x2\xa4\x7f\x11\x1d\x63\xe7\x6c\x40\x86\x76\xf9\x83\x54\xa3\x84\x72\x18\x4b\xf7\x7a\xf1\x4a\xd2\xfd\xec\x2d\x8a\x3d\x7e\x78\xda\x42\x3e\x27\xdd\x5c\x69\xc6\xe9\xf8\xa1\x98\x36\x35\x60\x51\x85\x88\x53\xac\x10\xd4\x4\xdc\x6a\x7d\x9a\xb0\xa6\xc\xe5\x56\x32\x6b\xa2\xe8\x57\x38\x20\xce\x5b\x8d\xf2\x81\x22\x1b\x3f\x87\xbd\xa\x17\xb5\x34\xc8\x1e\x8b\x5\x8\xb1\x75\x59\xf5\x45\x79\x49\x5f\x41\x37\x28\xd1\x39\xab\x26\xa7\xb4\xf\xdf\xb6\xdb\xb3\x4e\x2a\x58\x52\xd8\x82\x90\x5d\x99\xbe\x6f\x97\x6e" },
-	{ 0x5409e8, "\x2e\x94\x26\x55\x6c\xd6\xe3\x30\x16\x24\xae\xb8\x39\x13\x48\x85\x2\xa\xa8\xb9\xfb\x58\x3e\x59\x40\x37\x89\x4c\x68\xc9\x5b\xdb\xee\x83\xb\x64\x49\xf0\x52\xeb\x3f\x65\xbc\xfa\xa4\x6\x76\x27\xec\xc2\xe0\x53\x2a\x3c\x2b\xa2\x3d\x12\xde\xc7\xfc\xd7\x5\xed\xff\xc0\x9d\x14\x4a\xf7\xa3\x87\x79\x96\xa6\x7e\xd3\x1b\xf5\x90\x3\x80\x19\x4f\x77\x2f\xb1\x84\x7a\xe\x8e\xef\x62\xcd\xce\x9a\xd8\xb2\x69\xc4\xb0\xda\x23\x8\x11\xa0\x6b\x73\x4d\x9\x4e\x8c\x17\x21\x67\xbb\xd5\xcc\x20\x36\xea\x95\xe1\x5c\xe2\x7d\xe7\xc\x33\x5f\x99\xa5\xf4\x44\xdd\x25\xc1\x35\x29\x1a\x1c\x28\xb4\x9c\x34\x6f\x15\xa7\xf9\xe6\xb5\xd4\xe9\x9b\x1\x31\xf8\x72\xb3\x2d\x70\xdc\xfd\x46\x1f\x42\x8f\xcb\x54\x63\x93\x8d\x41\x5e\x9f\xe8\xf1\xe4\xb6\x71\x18\xbd\x6e\x7f\x81\x32\xd0\x74\xfe\x0\xcf\x47\xc6\xaf\x82\x38\x91\xac\xad\xc3\xb7\x6d\x1d\x8a\x98\xca\x97\x1e\x60\x7b\x88\xaa\xd2\xd1\xa1\x86\x61\xba\xc8\x10\x22\x3a\x9e\x51\x43\x92\x75\x3b\x56\xf2\x45\xa9\xbe\xd9\x78\x5d\x5a\x4\x4b\xd\x66\xf3\x7\x57\x7c\x2c\xe5\x50\xc5\xbf\xf\x6a\xf6\xdf\x8b\xab" },
-	{ 0x540d18, "\x7a\x2e\x7c\x16\x54\x74\xa6\xd7\x3d\x42\x25\xa\x4c\x87\xff\xbd\xc6\xcf\xaa\x78\x0\x95\x91\x68\x50\x7e\x4\xbe\xf\x83\xc7\x82\x9a\xa1\x36\xe2\x9b\x43\x62\x79\xe4\x73\x93\x56\x17\xb5\x60\xf9\xf0\xd\x2\xef\xbb\x22\x1c\xfb\x28\x94\x1e\xdc\x1d\x2a\x7\x72\xa0\x2f\x40\xed\x6c\x7b\xcc\xb4\xbc\xeb\xf4\xa3\x96\x7d\xb8\xf6\x75\x9\xc5\xf2\x70\x33\xc2\x13\xf7\xdb\x97\x1b\x6f\x3\xe3\x6\x44\xc1\xd3\x2b\x4d\xe9\xb9\xe1\x64\x20\x8d\x18\x76\x9d\xda\x67\xa7\x9c\x32\xb\x6a\x99\xf1\x41\x59\x71\x23\x14\x88\xac\x49\x37\xba\xe6\xe0\x51\x4f\xfd\x8e\xe7\xd5\xcd\xd6\xb2\x58\xa8\x55\xa2\xc3\xdf\x5e\x9e\xc9\xd2\xd8\x7f\x84\x39\xb6\xab\x63\x9f\xfa\x69\xfe\x21\xb0\x3a\x1f\x34\x5c\x4a\xbf\xe8\x52\x8a\x4e\x30\x5b\x92\x46\x4b\x8b\x5f\x8f\x90\x6e\x61\x89\x3e\xd9\x27\xaf\xee\x26\x98\xb1\xde\x19\xca\xf3\x86\x53\xa4\xd0\xad\x1a\x47\x80\x85\x45\x2d\xc8\xe\xa9\x3b\x65\xb7\x8\x24\xb3\xc\x11\x35\x15\xdd\x5\xce\x5a\xea\x2c\x6b\xec\xe5\xf8\x3c\x77\xcb\x6d\xc0\xd4\xae\x81\x57\x31\x12\x10\xfc\x3f\x1\x29\xd1\x38\x8c\x5d\xf5\xc4\xa5\x66\x48" },
-	{ 0x541218, "\x6e\x60\xba\x8c\x16\x67\xc7\xd9\xa1\xf9\x25\x41\x77\x6\x4b\x81\x98\xfb\x39\xe0\x7d\xa0\x10\xa4\x31\xf\xe5\x2b\x2d\xea\x68\xdf\x3d\xc8\xd5\x62\xaf\x83\xbd\xdb\x18\x88\xc4\xa9\x14\x38\x7f\x95\x5b\x51\xeb\x8e\xc\x2\xd0\x1\x6a\xcf\x92\x20\x7e\xc2\xc5\x36\xa6\xcd\x89\x64\x22\x8a\x96\xff\x49\xad\xb0\xc1\x13\x32\xa2\x99\x59\x17\xa5\x56\x29\x3b\x84\x93\x33\x5\x1c\x26\x94\xe8\x5d\xb8\x4\x5c\x4d\x46\xe9\x80\x4c\x45\x85\x9c\xb6\x11\xb1\xdd\x9b\x78\x9e\x8d\xac\xe2\x73\xbf\x82\xd2\x97\x57\x12\x63\xa8\x1a\xf2\xbc\x0\xc3\xcb\x7c\xf3\xe4\xdc\xd1\xed\xce\xd4\x6d\x15\x44\x8b\x52\x75\xd8\x7\x48\xfe\xe\xf6\x1f\xe3\x6c\x4e\x40\x4a\x91\x61\x70\xae\xe6\x19\xcc\x66\x1e\xa7\xd3\x43\xda\xde\x2a\xb4\x3e\x3a\xca\x9a\x5e\x71\xd\x34\xef\xb5\xb\x55\xbb\xee\x35\x50\x69\x4f\x9\x7b\x1d\x47\x86\x53\xb3\xbe\x79\xa3\xb9\x24\x8f\xe1\x1b\x58\xa\xd7\x2f\xfc\x8\x72\xf5\xe7\x7a\x5a\x54\xb7\x87\xfd\xf0\xc0\xc9\x30\x27\x3\xf1\xd6\x74\x3f\x90\xf7\x37\xf8\x28\x9f\x42\x6b\xab\x76\x23\x65\x6f\x2e\xb2\x21\xc6\x3c\x2c\xfa\xf4\x9d\x5f\xec\xaa" },
-	{ 0x547d98, "\x84\xf6\x55\x2c\x2b\xb\x30\xb6\xd7\x91\x7b\xea\xfc\x8b\xb9\x6d\x11\x2a\x4a\xba\xc5\xfb\x8\x5c\xda\x3\x9f\x52\x8e\x81\xc4\xb3\xa5\x38\xf1\xc7\xca\xd9\xfe\x58\xcd\x42\x1a\xd8\xbd\x9a\xa4\x45\x36\x4f\x4e\x43\x9c\xe0\x9d\xd2\xd4\x19\x98\x26\xdd\x5d\xa8\x28\xfd\xc2\x31\xa0\xed\xbe\x1d\xd6\x68\x3a\x9\x12\xcc\x48\xa6\x95\x66\x6a\x92\xbb\xbc\xaf\xaa\x93\x53\x2d\xb0\xf2\xd\xd1\xcb\x2\x76\xb4\x5\x4c\x85\xde\x51\xe1\x54\x47\x8f\x70\xf5\xb1\x96\x18\x78\xfa\x39\x62\x88\x6e\x9b\x59\x8d\x8c\x87\x1\xf\x4d\x6\xa7\xe3\xb7\x77\xb2\xf0\x1b\x7a\x83\x50\x1f\x8a\xe8\x5f\xae\x4b\xeb\x13\xe5\xdf\x7\x41\x63\xf4\xc3\x64\x32\x21\x29\x94\xa9\x16\x6b\xa\x3b\xd3\x69\x5a\xa2\xff\x72\xef\x89\x2e\x7c\x82\xab\x49\x22\x61\x34\xdb\x7d\x5b\x5e\x65\x6c\xdc\xf7\x2f\x10\x3f\x60\xac\xc\xf3\xbf\x46\x86\x44\x99\xf9\xc8\x35\xec\xd5\x1e\x6f\x15\x4\x97\xc6\x25\x90\x1c\x80\x75\x3d\xa1\x33\x0\xd0\x7e\xb5\xe\x57\xe7\x67\x23\x17\x74\x27\x7f\xce\x3c\xad\xee\x3e\x37\x24\xe9\x71\x20\xe6\xe4\x9e\xa3\x73\xf8\xe2\x14\xc1\x56\x79\xcf\xb8\xc0\xc9\x40" },
-	{ 0x547f10, "\x5\x3d\xbf\x26\xdf\xc3\xc0\xfd\xa2\xb\xee\x82\xad\xbd\x48\x1f\x66\x2c\x57\x13\x3e\x5c\x50\xe7\x29\xb7\x62\x32\x85\xe3\x9c\xf0\x69\xa6\x65\x92\x84\x9f\x54\xec\xa0\x15\xf9\x0\x78\xf7\xe1\xb5\xb8\xf2\x7f\xae\xf5\x44\xb2\xd6\xcb\xc\x8e\x7d\x4\xb1\x36\x24\xe\xa\x16\x43\xfe\x77\xb9\x63\xc5\x49\x3f\x71\xf6\x64\xc6\x87\xd0\x1c\xa1\x7e\x7c\x23\xd8\x67\x9b\x59\x53\xf3\xa5\xce\x7a\xb0\x68\x3a\xd9\xe9\x8a\xcc\x80\x45\xe4\x6\x4e\x2f\xd5\x6c\xea\x19\x9e\x97\xe2\x8d\x60\x37\x8b\xd4\xdd\x81\x5b\xa4\x8\xf1\x2d\x4d\x6a\xfa\xe0\x75\xa9\xe6\xd3\x76\x31\x86\xc1\xa8\x46\x72\x58\x38\x2a\x96\x73\xc4\xc7\x51\x9d\x30\xd2\x88\x27\xc8\x95\x52\x1d\x21\x94\x5e\x1\x56\x3b\x9\xdc\xa7\x79\x3\x7b\x39\x28\x6e\x1e\xc2\x2b\x70\x99\x6f\xff\x17\x18\xda\xaf\x2e\xb3\xba\x42\x5a\x55\x10\xd7\xe8\x47\xfb\x83\x8c\x5d\x6b\x3c\xab\xeb\xef\x25\x5f\x22\xb6\x33\x9a\xcd\x2\xb4\x91\x7\xd\xf\xdb\x1a\x61\x12\xbc\xcf\x34\xbb\x6d\x20\x4c\x11\x4a\xaa\xfc\x41\xe5\x1b\x74\xde\xbe\x4b\x40\x90\x98\xf8\x4f\x14\xca\xf4\xac\x93\x35\x8f\xc9\x89\xd1\xed\xa3" },
-	{ 0x5387b0, "\x78\x56\x88\x23\x55\xb3\xa8\xaf\x59\xea\x6\x1f\x73\x25\xb0\xe1\x70\x4d\x82\x58\x26\xe7\x40\x1a\x6c\xc1\x48\xb1\xf0\xba\xff\x0\xab\x2d\xa6\x22\x43\xee\x19\x8c\xe\xda\x17\x53\x85\xbd\x1d\x6b\xf8\x50\xce\x76\x4\xdd\xa7\xf1\x8e\x52\x37\xa2\x51\xe3\x69\x3a\x1c\x16\x68\x4a\x86\xbb\xb6\x6f\xdc\xfe\x14\xc\x79\x5e\xf4\x96\x42\x54\x2e\x84\x5f\xb5\xbf\xcf\x61\x7d\xd7\x98\x71\x3e\xcd\x20\x3f\xd0\xae\xa9\xd\xc7\x8\x65\x8d\x3c\x81\x29\xb8\x6d\xb4\x80\xd1\x4b\x5b\x28\xa5\x4c\xa0\x6e\x90\xa\x11\x3\x64\x21\xdf\x2f\x24\xeb\xf2\x7b\xc5\xac\xb\xec\xed\x66\xd6\xe0\x9\x41\x32\xcb\x83\x93\xfa\x15\xe5\x27\x5a\x87\x44\xd4\xde\xf\x3b\x1\xb7\x2a\xf3\xa1\xd5\x72\xb2\x6a\x2b\x95\x7a\x8b\xca\x7e\x18\x7f\x47\xe6\xdb\x49\xf7\x9a\x9e\xad\x9d\x57\xf6\x60\xd2\xfc\x30\xfb\x9b\x45\xd9\x2c\xf5\x5d\x33\x1b\xc4\x89\x13\x35\x67\xef\x2\x36\x92\x99\x39\xf9\xaa\x74\xe2\x5c\x3d\xc3\x63\xcc\xc9\x62\xa4\xfd\x34\x12\xbe\xc0\xc8\xc2\x7\x10\x75\x31\xe8\xbc\xd8\x97\x4f\x46\x1e\x7c\x38\x4e\x94\x9f\xc6\x8f\xe9\x91\xe4\x8a\xa3\xb9\x9c\x5\x77\xd3" },
-	{ 0x539420, "\xbb\x1a\x8e\x40\x7\x47\x3e\x6e\xb1\xfa\xa5\x63\x7c\xec\xa9\x75\x55\x76\xd2\xa6\xcb\xe4\x2d\xc6\x43\xa8\x18\x79\x48\xf0\x38\xd0\x9a\x8\xd5\xa0\x22\x7b\xc1\x84\x5a\x6b\xae\xd7\xbe\xb9\x50\xcf\x46\x70\x91\xed\xba\x8f\x7f\x1\xc5\x7d\x34\xf4\x14\x2\xe3\x2f\x64\x96\xb2\xee\x94\x4e\x90\x20\xd9\x95\x30\xca\x65\xf\xb\xd4\xd6\xde\xeb\x2a\x62\xd8\xc7\xdd\xe8\xe2\x4c\xbc\x77\x81\x66\x24\xc9\xb7\x60\x12\x39\xda\x71\xf1\x4d\x6c\xa\xf9\xb5\x6\x52\x3b\xa3\xb3\x7a\x35\x13\xe5\x57\x33\xc0\x16\x17\xfb\x87\xe7\xa1\x42\xe1\x67\x44\x54\x3d\xa4\x9\x19\x61\x15\x29\xb0\x0\xbf\xac\x5d\x1e\x27\x99\x56\x26\x83\x11\x5f\x69\x4f\x1d\xf5\x5\x8c\xff\x2b\x1c\x59\x21\xaf\xa2\xe\xdc\xb8\x85\x78\x80\x6a\x5c\x4\xfd\x25\x6d\x32\x9c\x8a\xc2\x8b\xf3\x9f\xb4\xd\x74\x9b\x8d\x97\x4a\xc3\x9d\x7e\xad\x28\x1b\x98\x53\xaa\x36\xf2\x49\xc8\xce\x73\xf8\xfc\x68\xef\xe6\x89\x3a\xea\x37\x31\xcd\xe0\x86\x3f\xb6\xab\xdf\x58\x23\x41\x3c\x88\x1f\xbd\x2e\xe9\xc4\x82\x72\xcc\x6f\xf6\xd3\x4b\xa7\x93\x5e\xfe\xf7\x51\x45\xd1\x10\x2c\x92\x5b\x9e\xdb\x3\xc" },
-	{ 0x547c10, "\xb4\x8f\x68\x29\x2d\x91\x41\x34\x56\x3a\x46\xf8\xcf\x63\xb8\xb2\x1d\xcc\xb5\x5f\xe0\x83\xd0\x66\x28\x60\xa0\x20\x88\x3\x9b\x4\x36\x55\x1f\x6d\x24\x62\x7b\x99\x53\xf2\x86\x4b\xff\x3b\xe9\xce\x92\xa5\x71\x5a\x7\xd2\x4a\xdb\xa2\x9d\xf4\xfc\xc9\x90\xac\x72\x77\x1\xb9\x2a\xf1\xd4\xfa\xc2\x61\xc0\xcb\xf5\x6b\x18\x67\xc6\x0\x9\x58\xfb\xba\x3c\x1c\x49\xae\xe6\x38\x40\x80\x97\xdd\x14\xf\x69\x89\x4c\x59\x16\x9a\x2e\x4f\x4e\x5\x33\x3d\xa6\xb6\x6a\x13\x30\xca\xeb\x25\x65\xd7\x57\xa9\x6c\xb1\xde\xd5\xcd\xed\x7c\x15\xbc\x19\xa4\x85\xc1\xa1\x73\xef\xbe\xc5\x35\xe\x7e\x47\x8\x64\xf6\x3f\x8a\xf7\x52\x75\xe5\x48\x37\x23\x8c\xdf\xa7\xd3\xe1\x2\xd\xa8\xe4\x74\x5d\xc4\xad\xf3\xbb\x54\x70\xbf\xdc\x1a\xec\xc3\x31\x1b\xa\x7d\x93\xb7\x9e\x2c\xd1\xfd\xe3\x3e\x96\xd9\x51\x12\xe7\xd8\x50\xb\xe8\xe2\x17\x4d\x5e\xd6\x39\xc7\x5b\x6e\x21\x84\x22\x11\x82\xf9\x26\x1e\x6f\x95\x6\xea\x10\x98\x2f\x78\x5c\x32\x45\xaf\x8d\xf0\x7a\xbd\xaa\x81\xda\xb3\xc\xfe\xc8\x2b\x76\x79\x8b\x94\xb0\xa3\x7f\xee\x42\x87\xab\x27\x9c\x44\x43\x8e\x9f" },
-	{ 0x541400, "\x7b\x35\x11\x79\x7\x2f\xf6\x82\x8e\xb4\x6e\xd2\x6d\xc5\x8c\x1c\xe0\xd6\x34\xf0\x4f\x25\x59\xe8\xdf\x1d\xeb\x32\x86\x51\xa4\xf2\x5c\xd1\xc8\x41\xec\x9d\x62\xac\xdd\x3e\xb8\x65\x75\x89\x12\x6c\x40\x4e\xc7\x27\xe1\x37\xcf\x9\x16\x78\xaa\x58\xd\xe6\x54\xfe\x8f\xfd\xf9\x61\x26\x3f\x2e\xcd\x2c\x4\xb2\x80\xf\x14\x6f\xc6\xab\xfb\x13\xdb\x9a\x21\xb3\xc0\xa9\x19\x70\xf3\x2b\xae\x9b\x49\xb7\xa8\x24\x1b\x48\xea\xed\xd9\x47\x9e\x9c\x69\x3c\x66\xbb\x6\x46\x38\x17\xb5\xcb\x5\x4a\x5e\x15\x20\xb9\xb6\x33\x4c\x7d\xa3\xd7\xb1\x23\x72\xc3\x4b\x63\xbe\xf7\x5b\x74\x64\x77\xcc\xd3\x85\xde\x1a\x31\x97\xa2\x8b\xfc\x10\x5f\xdc\xd5\xb0\xbd\x55\xc1\xe7\xc\x50\x43\x39\x71\x52\xe5\xaf\x8a\x60\x92\x2d\xd8\x3\xf5\x28\xca\xef\xd0\xc2\x53\x91\xa6\x73\x56\xa5\xf1\x57\x42\xf4\xd4\x36\x8d\xbc\xe9\x7e\x2\x76\x18\xb\x84\x5a\xe2\xbf\x68\x95\x29\x98\xad\x88\x1f\x81\x67\xa1\x3a\xa7\x22\xf8\x1\xa0\xce\x7a\xda\x30\xc4\xe4\xee\x7c\x3b\x4d\x3d\xe3\xfa\x6a\x7f\x99\x0\x93\xe\xff\x90\xa\x2a\x5d\x96\x8\x6b\x83\xba\x1e\x44\x87\x45\x9f\xc9\x94" },
-	{ 0x541588, "\x11\x2b\xc0\x60\xd2\xf5\x1f\x42\xf7\x8e\x13\x8c\x68\x7b\x90\x26\xd1\x28\xa3\x9d\xd\xb6\x9a\x1b\xb5\xa0\xba\x7d\xa8\xd5\xe\x88\x93\xa6\xbe\x98\xd6\xe4\x50\xa1\x3e\xb7\x8d\x94\x46\x4a\xbc\xd7\xd4\xf1\x59\x97\x2a\x66\x2\xe1\x3d\xf\x1e\xe5\xc5\x49\xe9\xa4\x99\x6f\x6\x37\x96\xdb\x58\xd0\xfe\x2c\xe8\x21\x38\x71\x62\xb4\xda\x12\xac\x79\x17\x5b\xc8\x82\xeb\xf0\xe2\x3\x80\xaa\x9e\xb\xe3\x5a\xc1\x91\x35\x75\xea\xfa\x20\xdd\x23\x84\x31\x9b\x5d\x78\x7a\xc\x27\xa7\xf3\xa2\xa9\x87\x52\xb8\xf9\x5e\x9\x6e\x64\xc9\x18\xd8\xee\x86\x2f\x30\x7f\xb2\x3a\x47\xb3\x74\xde\xe7\x4b\x2e\x41\x29\x5\x33\x15\xfd\x7e\x22\xf6\x70\xbb\x67\x34\xf4\xab\x92\x1a\xe6\xa5\x7\x65\x3f\x39\x95\xef\xb1\x24\x85\xfc\x53\xf2\x1c\x8f\x81\x48\x5f\x25\x76\xdc\x19\x56\xcd\x2d\xff\x43\xbf\x4e\xb0\x1\x0\x9f\x51\xc7\x57\xad\x73\x72\xc4\x8\xbd\xa\x7c\x1d\x40\x77\x61\xb9\x89\x9c\x3b\x8a\x16\xc6\xcb\xce\x4f\x63\xd9\x6d\xcf\x3c\x6b\x54\xdf\x4c\x10\x8b\x69\x32\xe0\x45\xaf\x4d\x83\x5c\xec\xc3\x14\xf8\xed\xc2\x6c\xca\x55\x44\x6a\xcc\xfb\x36\xae\x4\xd3" },
-	{ 0x541688, "\x6b\x1d\x53\x81\xa\x82\x7\x16\x41\x54\xa0\xbd\x87\x3\x20\x2d\xf7\xb5\x4\x59\x1b\xdf\x8c\x22\xe2\x10\x9\x55\x9e\xef\xa6\x57\x65\x7f\x3a\x35\x9c\x3e\xfe\x40\xfd\x17\xc0\x26\x33\x38\x7b\x6a\x5c\xd1\x50\x14\xec\x49\xfb\xa9\xe5\x1e\xf3\xea\xde\xdd\x44\x75\x46\xc9\x2b\xcb\xbb\x27\xab\x15\xe7\xed\x91\xda\x25\x4e\x5b\xb7\xee\x77\x58\xb8\xe4\x48\x63\x47\xd9\x0\xb0\xfa\xe1\xff\xb3\x72\x32\x3f\x29\x19\x68\x1\x23\xcc\x93\x8d\xd3\x31\xf9\xcf\xf6\x73\x8a\x4f\x11\xe6\xca\xa8\x18\x97\xc2\xd\x92\x62\x84\x85\x3b\x52\x6f\x9b\x6e\x5f\xe3\x9a\xce\xdb\x3d\x70\x95\xb\xdc\xc1\x2\xae\xc5\x56\x7e\x8b\x2a\xf5\x86\x28\xe0\xf1\x42\x83\xd5\xc8\xc7\x8\x4a\x5e\xf\xf8\x78\x5a\x1a\x66\x36\xfc\xd7\x34\x2c\xc3\x76\xbf\xe8\x21\x8e\x2f\x69\x7d\xa3\x98\x67\xa4\x8f\xe\xf2\xaf\x61\x4d\x24\xba\xaa\x7a\x6d\x5\xb9\x89\xbc\x2e\x30\x4b\xb4\x6c\x80\x1c\x9d\xc6\x3c\xb1\xd0\x88\xb6\xa1\xcd\xb2\xc\xbe\x79\xa2\xd8\x99\x4c\xd2\x74\x37\x51\x71\x9f\x13\x6\x90\xeb\xc4\xa7\xf0\xa5\xd6\x12\x45\xac\x64\xf4\x1f\xe9\x43\x96\x7c\x5d\x39\xd4\xad\x60\x94" },
-	{ 0x541988, "\x4b\x8e\xb4\x43\x5a\xcc\x15\xc0\xa0\x22\x21\x58\xec\xad\xde\x42\x4a\x70\xd4\x26\xc6\xeb\x3a\x61\xbd\x99\x20\x92\xfe\x9d\x68\xae\x1f\x11\x5c\xcb\x8\x66\x49\xe1\x2e\x96\xf2\xca\xdd\xb0\x37\xfd\x86\xa1\x7d\x7b\xbe\xf5\xd9\x60\x6d\x63\xe0\xe8\x84\xf8\x75\x44\x6b\xab\x81\xe5\xa5\xe4\xd6\x3e\x10\x3\x97\xd8\xbc\x5\x98\x1a\xa\xd\x5d\xf1\x8a\x2c\x82\x34\xc8\x4e\x2b\xfa\x7\x4c\x2d\x6c\xc1\x5e\x46\x29\x9a\xc7\xb8\xb9\x56\xa2\x7f\x1d\x3d\x1e\x9c\x80\x6e\xb5\xe\x7a\xcf\xfc\x30\xd5\x95\xa3\xb2\x1b\xf4\xe2\x89\x28\x12\xc5\x3f\xf9\x2f\xc9\x4d\xed\x40\x1\x59\xb6\x85\x50\x77\xe7\xf7\x2a\x76\x51\x78\xc2\x8f\x94\x87\xe6\x8b\x9\x93\x8d\x57\xda\x79\x2\x71\x55\x19\xb3\x5f\x69\xdc\x25\x18\xd2\xf3\x4f\xba\xea\x9e\xaf\x31\xee\xa9\x0\x35\x90\xff\x6\x1c\x4\x13\xce\x14\x39\x5b\xdb\x38\x36\x24\x27\xfb\xac\x52\xd0\x6a\x74\xf0\x62\x45\x72\xbf\x65\x9b\x91\x48\xd1\xb\x32\xb7\xdf\x88\xf6\x41\xa6\x9f\xd3\xc\x7e\x6f\xaa\x73\xd7\xc4\xa4\xe9\x17\xcd\xb1\x3b\x64\x8c\xf\xef\x54\x83\x7c\xa8\x23\xe3\x16\xc3\x47\x3c\xa7\x33\x67\x53\xbb" },
-	{ 0x541b30, "\xc9\x4d\x8e\xe5\xaf\x88\xa5\x73\xeb\x9e\x4e\xdc\x6b\x68\x28\x79\x7b\xad\x2c\xe\x51\xe1\xc6\x1f\x71\xb2\x61\x7\x42\x49\x35\x1a\xf2\x80\xd2\xd7\x82\xc3\x2b\xa2\xb6\x8b\xec\xa0\x2a\x29\xe7\x8a\x1c\x4b\xdf\xf7\xba\xb1\xdb\xee\x43\x7e\x87\xa7\xfa\x19\xb5\xf1\x95\x4f\xce\x66\xd9\xae\x11\x46\xa\xb8\x40\xf6\xe3\xbc\x77\xf8\xb3\x78\xf3\x5a\xac\xb0\x63\x8d\xcd\x64\x39\xa1\xa4\x9a\x4a\x69\x41\xed\x98\x37\xfb\x3f\xd0\xaa\x6\x7c\x7d\x3d\x94\xa6\x5f\x24\x12\x8\x9d\x32\xc4\x3b\xda\xa3\x10\x34\x8c\xd8\x5c\xcb\x20\x5b\x70\x86\x14\x27\x36\x1\xe9\x3\xc5\xa9\x67\xfd\x9b\x57\x6c\x0\x2e\x4\x84\xf\x26\x72\x92\x58\x17\x83\x2d\xdd\x6f\x62\xc7\xc\x55\x6d\xd5\x13\x3c\x5d\xb4\x5e\xea\x47\xc8\x25\xca\x59\xe0\x97\x21\x9c\x96\x93\x2f\x1e\x8f\x7a\xbf\xcc\xde\xf9\x16\x22\xf0\x81\x75\x3e\xd\x4c\xfe\x23\xbe\xa8\x76\x1b\xf5\x56\x18\x2\xe2\x33\xd3\xf4\xab\xb9\x6e\xc0\xff\xb\x1d\x60\x85\x30\x3a\xe6\x65\xd1\x52\x53\x54\xb7\x9f\x48\x89\xc2\x15\x74\xcf\x9\xc1\x38\x7f\x44\x99\xbb\x45\x31\x90\xd4\x5\xbd\x91\xfc\xef\x50\xe8\x6a\xd6\xe4" },
-	{ 0x541c30, "\x76\xad\x9\x82\xbd\xb\x69\x6a\xe0\xac\xd4\x34\x31\xd2\x83\xe2\xe7\x28\x70\xe8\xc1\xdf\xa\x2d\xbe\xd5\xe9\xe3\xfb\x79\x7c\xff\xf0\xe6\x85\x43\x47\xb2\x64\x92\x81\x80\xb4\x6d\xf7\xee\x1\x1f\x60\x48\x8e\xa4\x54\x74\x50\x4a\x2a\x5e\x39\x5f\x8f\x46\xb1\x8\x12\xf3\xde\xbf\xcb\x2\xdd\xa2\x9e\xd6\x6f\x9a\x9c\x3d\x93\x77\x2f\x21\xf1\x19\x9f\xcd\x2c\xeb\x30\x13\x89\x88\xa1\x71\x17\x7\x73\x32\x16\xc6\x4d\x3a\xb5\xa3\xa7\x1e\x10\x65\x23\x7b\x5c\xd7\xcc\x15\xca\xae\x6b\x91\xef\x1c\xe\x8c\xda\x72\x4c\x6\x0\xdb\x8d\xbb\xb7\x26\xd\x6c\x37\x8a\x84\x2b\xf2\xd3\x41\xaa\x6e\x7d\xc2\xfc\x3e\xd1\x4\x45\x68\xb9\x27\xe4\x58\xb0\x1b\x44\x40\xba\x53\xd8\x66\x14\xe1\x67\x5\x5d\xc\x96\xf8\x4e\x98\x7e\xf4\x3\x99\x52\x51\x4f\x11\xa8\x1a\x9d\x86\x97\xc5\xf\x25\x75\xc8\x94\xa5\xb8\xec\xa6\xa0\x38\xab\xc9\x36\x24\x35\xc0\xc7\x90\xd0\x55\xfa\x95\xaf\x49\xfd\x7f\x42\x87\x7a\x3f\x56\xf5\x3c\x62\xc3\x59\xb3\x33\xa9\x2e\x1d\xea\xbc\x63\x18\xed\xd9\x3b\xf9\xc4\x78\x22\x5a\x29\xfe\x9b\x61\xe5\x5b\x8b\xce\x4b\x57\xcf\x20\xdc\xf6\xb6" },
-	{ 0x541db8, "\xf\x3\xdb\xb5\x48\x8b\xe2\xbd\x4a\xc7\xdc\x63\xe9\x71\x94\x3d\xf7\xf9\x1c\xfa\x77\x1e\xea\x97\x9e\x57\x43\x91\xf8\xae\x4f\x55\x9b\xd1\x32\x67\xcf\x90\x2b\xac\x3a\xb4\x6\x85\x98\xc\xc1\x2c\xec\x40\xbf\x9\x59\xde\xcb\x6b\xa1\xad\x47\xbb\xd2\x22\x64\xa4\xb\xe5\xce\xd0\xff\xd4\x41\x45\x51\x65\xb9\xdd\x5\x38\xb6\xc2\x35\x21\xab\xc4\x1d\x1f\xa2\x74\x0\x5e\x93\xa\xe\x68\xda\x95\xf5\x6a\x1\xbc\xfe\x16\x12\xfc\x62\x2a\xf3\xf6\x7c\x5a\x46\x1a\xcd\xc3\x7b\x42\x27\x8f\x25\xa6\xca\x6c\xa7\xf2\x23\x5d\xd5\x54\xe4\xc5\x20\x50\x56\x3e\x69\x70\x52\xed\x7\x17\x66\x8a\xb1\x82\x37\xef\x3b\xfb\xd9\x7e\x36\x2e\x9a\x1b\x2f\x29\xe7\xa9\x83\xe3\xa3\x8c\xf1\x2d\x49\xd7\x31\x10\x78\x8e\xb2\x87\xd8\xe8\x5f\xb0\x76\x9d\x79\xc9\x4e\xe1\xe0\xee\xf4\x13\x9f\x14\xbe\x73\xb8\x88\x3c\x86\x7a\xa5\xba\x58\x7d\x6e\xa0\xc8\x11\x30\x61\x81\x33\xd6\x4c\x9c\x18\xf0\xfd\x99\x3f\xc0\x80\x28\x5b\x72\x4d\x6f\x92\xeb\x24\x75\x89\x8d\x15\xcc\x60\xaa\x4\x26\xd3\xdf\x8\x2\x5c\xa8\xe6\x44\x7f\xb7\x96\x39\xc6\x19\x34\xaf\xd\x53\x6d\x4b\xb3\x84" },
-	{ 0x541fe0, "\x30\x7a\x4b\x48\x47\x3f\xc8\x2e\xde\xb1\x5f\x96\xe3\x40\xb3\xdf\x70\x73\x67\x87\x78\xdd\xa\x6b\xb5\x2f\xf0\x13\xc5\x1c\x7f\xa1\x8b\xb4\x8e\xeb\x63\xd5\x89\x9d\x0\x68\xab\x9\xfe\x76\x71\xb7\x5d\x92\xc1\xdc\x46\x79\x8c\x16\xf3\x1a\xc9\xd\x3b\xf6\xad\xe7\xa5\x45\x3\xee\xd1\x5c\xb6\xbc\x52\xc3\x3a\x94\x1f\xe2\x6f\x14\xca\x29\x69\x4a\xe5\x51\x31\xff\xaf\x50\x9a\xcc\xf4\x39\x7\x86\x82\xfa\xac\x20\x26\x83\x9f\x54\x11\xa3\x1e\x81\x43\x2c\x8\x8d\x5a\x85\xa2\xcb\x2a\x35\xb2\xda\x2d\xfd\xc4\x37\xa7\x3e\x7e\x75\x65\xa8\x66\x1\x25\x32\xd4\x4f\xa0\x1b\x6\xae\x28\x15\x9b\xba\x2b\x34\x77\x8f\xec\x99\x7c\xc0\xb9\xf9\x88\xce\xe9\x84\x93\xb0\x22\xcf\xed\xf\x7d\x74\xe0\x61\x2\xa6\xbf\x58\xea\xf2\x95\xfc\x6c\x56\x91\x4c\xe4\x80\x49\xbb\x18\xd0\xa9\xa4\xaa\x5e\x8a\xb\x33\x38\xd6\x53\xdb\xf7\x60\x44\xc\xc6\x62\x55\xd7\xbd\xfb\xcd\x5\x42\xef\x57\x24\x12\x90\xd9\x19\x27\x5b\x6a\xd2\x98\x23\xbe\x36\x4\xc2\x7b\xf8\x6e\xe\xc7\x6d\xd3\xf1\x97\xe1\xe6\xd8\x10\x9e\xe8\xf5\x59\x9c\x4d\x64\x3d\x21\x1d\x72\x41\x17\x4e\x3c\xb8" },
-	{ 0x5420e0, "\xd8\x40\x46\x1c\x9c\xba\x77\xfd\x1d\xe0\xc0\x42\x92\xf0\xff\xa8\x78\x9e\x3f\xcd\x60\xea\xc7\x3c\x2f\x5f\x72\x74\xb3\x2c\xee\x94\x47\x80\xe8\xf5\x67\x8f\x53\x43\xd\xb9\xe9\xaf\x7e\x7a\xe\x63\xb6\xd2\xd4\x27\xc4\x7\x76\xad\x4e\x3\x5d\x2\xd6\xaa\x56\x6b\x12\x21\x37\xa0\xd1\xab\x3a\x11\x51\x90\x48\x23\x26\x6a\x6\x97\xc1\x9d\x35\xec\xa3\x24\x10\xfb\xf8\x41\x65\x1\x1f\x6d\x5\x8e\x7b\xb1\xfc\x44\xbc\x6e\x89\xa9\xc3\x2d\xb2\x18\xde\x71\xbe\xfe\xc5\x54\x73\x2b\x0\xa7\x5c\xae\xd3\x57\x95\xfa\xf1\x7c\xdf\xc\x31\xa6\x3d\x4a\x58\x79\x66\x87\xb8\x19\xf6\xf7\x8d\xbf\xcb\x45\x33\x6f\xb5\x91\x32\x5a\xbb\xdc\x62\x55\xa1\x4\x70\xa5\x8c\x16\x3e\x49\x64\x82\xf9\xdb\x59\x28\xcc\x50\x96\xb7\x38\xc6\x7d\x69\x29\xb4\x1b\xe7\x2e\xc2\xbd\x84\x85\x4d\xe1\x3b\xf4\xac\xd7\xe3\x8b\x4f\x30\x9f\x7f\x5b\xb\x20\xb0\x86\x88\xeb\xa2\xca\x34\x15\x81\x83\x13\xd9\x5e\x25\xf\xc8\xda\x4b\x99\xe5\x9\xf2\x93\xdd\x52\x6c\x2a\xc9\xef\x14\x9b\xf3\x68\xa4\x22\xce\x1a\x1e\xe4\xd5\x8\xe6\x9a\x98\xed\x61\x17\xa\x39\xcf\xe2\x4c\xd0\x8a\x36\x75" },
-	{ 0x542220, "\xee\xa9\x92\x52\x24\x57\x44\x8e\xa0\xb9\x95\x20\x5b\x70\xbd\xc3\xa7\x17\x4d\x1d\x12\x9a\x0\xd0\xfc\x9d\x41\x6\xf4\x86\x50\x74\xe1\x5d\xa2\xdf\xa1\xa3\xf\xd5\x1b\x62\x28\x7c\x10\x79\x9b\xe2\x13\x7d\xce\x97\xd7\xb\x56\xf0\x63\x3c\x68\xdc\x21\xed\x7\x3d\x7a\xb6\xb5\x23\xe6\x3f\x29\xeb\xd6\x67\x89\xb3\x87\xf2\xfb\x71\x90\x5a\xc6\x42\x2f\x32\x77\xd4\x15\xde\x84\xff\x7b\xd3\x47\xa5\xb8\xc4\x8b\x55\x6c\xc2\x5\x54\x1a\x65\xfe\xcf\x6a\xb7\xa6\x4\xc9\xaf\xf8\xf7\x40\x8d\x16\xae\x3e\x99\x6f\x4b\xac\x26\x3\xb4\x2e\xf3\x69\x34\xb0\x8f\x45\xcc\xd9\x2d\xcd\x4c\x9e\x5f\x85\xe5\xca\x58\xe\x9c\xf5\xfa\x38\xc1\x30\xd\x94\x36\x6b\xc8\xe4\xad\x39\x3b\x22\x46\x96\xc7\xbc\x5c\xe9\x80\xa\x73\x33\xfd\xd8\x88\x2a\x4e\xef\x4f\x5e\xc0\x1e\xc5\x27\xec\x18\xf1\xd2\xc\xba\x8c\xa8\x59\x98\xe8\x9f\x43\x51\x49\x72\x19\xbf\x2\x1f\xbe\x64\xda\x53\x4a\xab\x82\xf6\x3a\xbb\x91\xaa\x6d\x78\x81\x66\x7f\x75\x76\x1\x25\x35\xb2\x8a\xcb\x11\x48\xdb\x61\xe3\x6e\x93\x60\x14\x37\xf9\x9\x1c\x2c\xd1\x2b\x8\xa4\x7e\xea\xdd\x31\x83\xe7\xe0\xb1" },
-	{ 0x53ab20, "\xa5\xff\x5f\x5c\x76\xd0\x2c\x5d\x56\x88\x78\x11\x5\xaa\x2d\x3\x25\x2f\x32\x44\xae\x7d\xd4\xc\x38\xda\x6b\xde\xb1\x9f\xb5\x2b\xd1\xa8\x30\xf8\x1e\x73\xb6\x95\x55\x4\xaf\xf6\x48\x7c\xb3\x3f\x4b\xe2\x8b\xcd\x3e\xe0\x9c\x67\xc9\xf1\xfe\xea\xd6\x42\x63\xcb\x82\x94\x28\xc6\x54\x2e\x81\x52\x46\x41\x1\xe\x12\x43\x9\xf7\x3c\x2\x8c\xc7\x74\xd3\x45\x37\xbf\x58\x59\x6c\xfd\x7\xb0\x16\x39\x64\x23\xf9\x6a\x7a\x14\xd9\xb7\x86\x50\x19\x8\x57\x4e\x97\xac\x22\x7e\xbb\xad\x79\x4f\x85\x27\xc2\x61\x71\xe9\x1c\xc8\xc1\x93\x36\x70\x24\xc3\x3d\x1b\xf2\x6d\x15\x51\xfa\xbe\x87\xc4\xc0\x96\xb\xca\xa4\x75\xd8\x77\x1d\x53\x62\xe6\x2a\xb2\x4a\x8e\xd5\xdc\xf5\x35\x72\x5e\x34\xa1\x33\xc5\x69\x18\xa\xb4\x7b\x83\x31\xab\xa0\x9b\x21\xbc\x84\xfb\xd7\x89\x0\xd2\x3a\xfc\x13\x1a\xcf\xf3\xdd\x10\x90\x3b\xe4\x26\xf4\x4d\xa7\xf\x40\x7f\xe5\x29\x17\x8f\x20\xeb\xbd\x80\x99\x65\xa6\x6f\x4c\x47\xdb\x60\x1f\xec\x98\xe8\xa2\xb8\xb9\x5b\x91\xed\xf0\x9d\x68\x8d\x6\x5a\xba\x66\xdf\xa9\xe7\xe1\xef\x9e\x8a\xcc\x9a\xee\xd\x6e\xa3\xe3\x49\xce\x92" },
-	{ 0x542738, "\xa5\xc3\x4\xb9\x92\x3d\x8a\x86\xe9\x67\x74\xd8\x9b\xcc\xe6\xd\xc6\x23\xf\xa1\xac\x42\x28\x93\xf8\x9c\x8d\xc7\xb7\x3\x8c\x69\x3c\xd1\x81\xf9\xa0\xfd\xba\x0\x75\x49\xc4\xb\xfc\x68\x65\xb0\x80\x64\xa\xda\x83\xf5\x58\x14\xec\x46\x1f\x61\x13\x27\x6b\xce\x1d\xbe\x96\x19\xc2\x9\xef\x37\x2f\xe2\x47\xf1\x7e\x21\x30\x90\xf7\x2b\xf4\x3b\x7\x1a\x56\xd3\x72\x5b\x4b\x85\xe\xd5\x8\x6f\x5d\xc0\x79\x59\x26\x98\xfe\x7d\x6\x4d\x10\xbf\xf3\xee\x2e\xe0\xe7\xd7\xd2\x9f\x60\x88\x25\xde\x7f\x4e\xe1\xae\xdf\xe4\x38\xb8\xe5\x8f\xa2\xd9\xcd\xa4\x73\xdb\x84\xb5\xca\x17\xa7\x54\xab\x97\x91\xfa\x66\x1c\x2d\xea\x31\x35\xe3\x77\xa9\x36\x5c\xc\x76\x95\x5a\x7c\x1b\xbd\x8e\x94\xff\xf2\xbc\xc1\xb4\x87\x2c\x44\xb6\xaa\xc8\x33\xf6\xa8\x45\x48\xa6\x6c\x1\x63\x55\x6a\xd6\x9a\x57\x40\x15\xad\xb3\x3a\x5\x43\x51\xfb\x71\x9d\x22\x1e\xed\x53\xd0\xc5\x8b\xeb\x18\x6d\x20\x3e\xcb\x89\x34\xf0\x3f\x2a\xcf\x39\x16\x4a\xaf\x9e\x29\xb1\x6e\x62\x11\x82\x5f\x7a\xbb\x52\x12\xc9\x99\xa3\xdd\xdc\x4c\x5e\x24\x50\xd4\x78\x70\x4f\xe8\x32\xb2\x2\x7b\x41" },
-	{ 0x542df8, "\x94\x3b\xd0\xd7\xba\xb3\x84\xc4\x36\xdc\x30\xa9\xdd\xc7\xb1\x75\xe6\xa4\x71\xc2\x60\xbf\xf3\xea\x51\x49\x2f\x4e\xa5\x1\xa2\x44\x2\xfe\x85\xf0\x4\xcf\xac\xb7\x2c\x35\x5f\xa6\x18\x6a\x7a\xae\x9\xd3\x3c\x1a\xd1\x12\xcd\xaf\xcb\xb6\xe2\xef\x73\x7d\x47\x2d\xe0\x4b\xf5\x89\xbd\x79\x4c\xdf\x29\x19\x7\xbc\x66\x5c\xed\x62\x68\x3f\x81\x1b\xb4\x11\xc5\x93\xd\xc\x16\x52\x23\xff\xf1\x37\x83\x6d\x58\xab\x77\x59\x65\x46\x97\x56\x6e\xbe\xa1\xf9\x7c\x34\xc3\x76\xf\xb5\x96\x24\x10\xce\x82\x1d\x45\x1f\x67\xd4\xaa\x53\xad\xeb\xe5\x3\xa0\x64\x27\x38\xc8\x8b\x9f\xc1\x8c\x2b\xe9\x2a\xf6\xd8\x4f\xfa\x41\xe4\x7e\x8e\xe8\x90\x63\x9b\xb0\x72\x4a\x40\x57\xde\x61\xfc\x48\x1c\x17\x13\x14\x95\x99\x39\x28\xc0\x31\xe1\x98\x50\x5e\x0\x78\x3d\xfb\xf7\xda\xd5\x70\xca\x8f\x88\x6\xf4\xc9\xb8\xa7\x15\x5d\x6b\xbb\x8\x74\x1e\xcc\xd9\x21\x3a\x20\x3e\x92\x2e\x33\x54\x8d\x4d\x80\xf2\x5b\x91\xee\x42\xa8\xd2\xb9\x7b\xe\x9c\xf8\x9d\x86\x25\xa3\x22\xec\x5\xc6\x87\x32\x9e\xb2\xe7\x5a\x55\xa\xdb\x43\x8a\xb\x6c\x9a\xe3\x26\x69\x7f\x6f\xfd\xd6" },
-	{ 0x5430b8, "\x18\xde\x60\xb0\x52\x81\xc0\x13\xd9\xf6\x7f\x69\x1b\xa4\x27\x73\xa1\xe9\xad\x2a\x9b\x45\xc5\xa5\x2d\x16\xb6\x33\x5e\xc7\x3e\xd5\xbe\x5\x98\xa7\x82\x5c\xec\x29\xd1\x6b\x5b\x85\xf5\x89\xf1\x1c\xf9\x4b\x58\xa9\xac\x23\x2e\xe2\x7c\x36\x8c\x63\x2\x3b\x61\x39\x17\xe0\x32\xc1\xab\x4\x3d\x8f\x26\xd4\xef\xc9\x35\x2f\xe7\xd7\xa6\xcc\x9f\x44\xe4\xc2\xdc\x3f\x4d\x7e\x4a\xf7\x66\x38\x12\x3c\x96\x64\x5f\xf8\xcd\x7d\xb\x70\x76\x99\xba\xdf\xf\xa8\xff\xd2\x56\xeb\x94\xae\xbd\x78\xdb\xf4\xb5\x3\x7b\x80\xfe\xd0\xc6\x41\x0\xc\x86\x8e\x6d\x54\xb3\x4e\x8b\xb2\xb7\xe3\x43\xfd\x53\x11\xd6\xd3\x77\xed\x21\x14\x9a\x6\x9\x1a\x87\x9d\xcf\x37\xc4\x49\x6c\xe1\x10\x5d\x6f\x72\x19\x2b\x51\x15\x4f\x2c\x57\x55\x84\x92\x30\xd\x8d\x25\x24\x8a\xe6\xe\xf0\x22\xc3\x9e\xe8\x28\xbc\x1f\x65\xb1\x1\x20\xa\x46\x67\xfc\x31\x91\xe5\x5a\xca\x71\x90\xbb\xfb\x34\xea\xa0\x79\xee\xa3\xa2\xb9\xdd\x62\x7\xbf\x47\xce\x50\x88\x1d\xf2\x1e\xaa\xda\x9c\xd8\xf3\xcb\xb4\x48\x42\xfa\x4c\xb8\x6a\x68\x6e\x83\x7a\x97\x59\x93\xc8\x40\xaf\x75\x8\x74\x3a\x95" },
-	{ 0x543220, "\xbd\x7f\xc8\xb9\x77\x27\x36\x86\xbf\x96\xfe\xcd\xd\x93\xe0\xae\xec\x69\xee\x90\x3b\x91\x5a\xc0\xcb\x8\xfb\x5d\xa8\xe8\x26\x4c\x22\xf0\xa5\x5e\xff\xd5\x58\xc5\x89\x51\xf9\xfd\xfc\xce\xac\x74\x80\xa6\xde\x2e\x75\xd7\x61\x67\x3d\x35\xf6\x84\xdf\x3f\x5\xd8\x32\xc9\x54\x5b\x24\xc6\x6c\x11\x82\x9e\x2c\x99\x37\x9d\x1d\xd0\xbe\x6d\x6e\x92\xc7\x60\xe9\xaa\x47\x7e\x39\x2f\x97\x2\xad\x9a\xdc\xb3\x34\xca\xdd\x2d\xf5\x18\x81\xa4\x3c\x15\x40\x17\x63\xbc\xef\xcf\x1a\x52\xd2\x41\x55\x4a\x62\x8c\xf3\x68\x57\xe5\x9\xd6\x78\x59\xda\x7d\xe7\x50\x73\xba\x4f\xe1\x2a\xb0\xaf\x1e\x1b\xab\xcc\x9c\x0\x7\xe3\x46\x1f\x13\x85\x64\xe\x12\x45\x38\xdb\x79\x72\x70\xc2\x43\xb\xed\x44\xeb\xf2\x48\x30\x87\x8e\x31\x88\xb6\x49\x8f\xe2\x14\x7c\x76\xc3\xd9\xfa\x71\xa1\x6a\x25\x20\x98\x5c\x10\xf\x66\x94\xe6\xa7\x6b\xb4\xa0\xd4\x5f\x1c\x6\xd1\x7b\x8b\xb1\x4e\x28\x56\xb8\xf1\xc1\x16\x1\xea\xf8\x4\xbb\x19\x9b\x8d\x33\x42\xb7\x3a\x4d\xc\x7a\xe4\xf4\x83\x23\x9f\x3e\xc4\xd3\xb5\x3\x53\xb2\x95\x21\xa3\xa2\x8a\x29\x65\x4b\xf7\x2b\xa9\x6f\xa" },
-	{ 0x543580, "\xb3\xd\xc5\xef\x7f\x75\x36\xd3\xbb\x73\x87\x24\x17\x6b\xeb\x25\x53\x5c\xfb\xf9\x13\x67\x77\xe7\x1c\xcf\x8\x79\xba\xab\xa7\xc8\xc7\x98\x74\x2d\x34\xf\xaa\xf6\x97\x69\x9f\xc0\x8c\xd9\x51\xcc\xa0\xb1\xf3\xd4\x4d\xe8\x88\xd2\x90\xe2\xbd\x52\xf7\x72\x57\xb0\x4a\x96\x81\xd0\x1f\xbf\xf5\x6d\x10\xea\xb4\x4e\x85\xf8\xde\x56\x5\x4c\xa9\x38\x41\x8d\x4b\x0\xae\x84\x80\xc4\xb2\x15\x3f\x7e\xee\xfc\x7d\x27\xbc\xdc\x70\x6c\x2c\x78\x39\x40\x9b\xbe\x68\xe6\xdd\x5e\xc9\xf1\x2a\x2f\xa1\xe4\xa8\xa\xce\x18\xd8\x22\xa3\x4f\x1e\xe3\xe1\x11\x92\x46\xc\x99\x28\x54\x47\x5d\x7c\x3d\xb8\x5f\x6a\xad\xfe\xfd\x63\x60\x43\x59\xb\x91\x71\xcd\x48\x35\xd5\x2e\x61\x9\x65\x33\x3c\xe9\x1d\x26\x89\x1a\xf4\xb5\x9a\x7b\xa4\x37\x93\x94\x14\x8a\x6\x8f\xe0\xd1\x30\x4\xa2\xdb\x7\xc3\xd7\x8b\xaf\xdf\x82\x50\x3b\x23\x49\xfa\x3e\x42\xa6\xc6\x5b\x9e\x9d\x12\x62\x32\xb7\xed\x55\xca\x8e\xcb\xe\x45\xc2\x19\x6e\x64\x31\x86\x2b\xda\xd6\xc1\xe5\x3a\x7a\x3\x95\x5a\xf2\x21\x1\x9c\x29\xb6\xa5\x16\xec\xb9\x2\x66\xac\x1b\x44\xff\x20\x58\x6f\x83\xf0\x76" },
-	{ 0x543680, "\x82\x70\x6d\x44\x64\xe7\xe0\xb\x73\xf7\x12\x60\x5\x13\x9e\xe\x1a\xb8\xe1\xa0\x37\xe8\x61\xde\x55\xe3\x29\x25\x3e\xb6\x92\xcd\x6\x96\x56\x31\xa3\xe4\xcf\xe2\x7c\x23\x53\x84\xfd\xc\x62\x7f\xdd\xb0\x75\x15\x9b\xdf\xf3\x2a\x68\x87\x7\x5c\xd4\xfc\x6e\x80\x38\x5e\xd5\x3a\x50\xd0\x3b\x9\x9c\x4c\x8e\x40\xc2\x91\x58\x22\xae\xb3\x7e\xa6\x54\x90\x5a\x45\x7b\x2f\x18\xf8\x35\x3d\x48\xd\xc6\x20\x51\xfb\x3c\xf5\x2b\xa5\x32\xc3\xd7\x36\x6c\x74\xe6\x85\x1c\x88\xd3\x0\x6a\xa1\xac\xec\x97\xf1\x52\xf0\xf6\x1e\xeb\xfa\xd8\x27\x3f\xa9\x83\x9f\x86\x41\x5d\xaf\xdc\x8b\x8d\xa\x8a\x4b\x4a\xef\x99\xea\x7a\x77\x28\x21\x6b\x8\xc4\x2c\x81\xce\xd9\x14\xf2\xab\x69\x8f\xa2\x1b\xa7\xb7\xc1\x79\x72\x63\x6f\x33\x59\xaa\xb1\x42\x8c\x95\x10\x94\x76\x3\x7d\x16\x1d\xff\x24\xb9\x67\xbf\x66\x47\x4d\x9a\x4f\xc8\xbc\xd1\xed\xdb\xf4\x43\x49\x89\xbd\x1f\x5b\xb2\xc0\x98\x57\x4e\xe9\xc9\xba\x71\x39\xd6\x11\x19\x4\xa4\xfe\xb4\xcb\x26\xc7\x34\xee\x5f\xe5\xbb\x2d\xc5\x93\x46\x1\x78\xca\xad\xf\xcc\x17\xa8\xbe\x65\xda\xb5\x30\x2e\x2\xf9\x9d\xd2" },
-	{ 0x543848, "\x5c\x7c\xa2\x4a\x63\x12\x58\x19\xbb\xc7\x60\xfa\x18\xc3\x49\x84\xc8\x5d\x61\xa\xbc\x55\xb3\xf3\x57\xb\xc4\x5f\x56\xc9\x4c\xd0\xe\x90\x9d\x2d\x4\x54\x93\x8\x17\x52\x79\x3c\xb9\x2c\x51\x4d\xb4\xb8\x3b\xfe\x6b\x3f\xd4\x86\x38\xa7\x92\xa8\xea\x30\xcc\xa3\xd6\x8d\xdd\xeb\xbe\x82\xe5\x1a\x98\x77\x1c\xef\x7b\xe1\x41\x22\xc1\x36\x3d\xe0\x9e\x31\xd7\xe3\xc6\x59\x46\x73\xe2\xae\xcd\x1b\x42\x11\xa4\xdc\x9f\x9\xce\x35\x67\x8f\x96\x4e\x83\x5b\xf2\x10\x80\x81\x4f\x2f\x37\xed\xfc\x64\x0\x24\xf0\x99\x78\x9b\x7d\x7\xc0\x6e\xdb\x7a\x39\x76\x75\xbf\x25\x4b\xa5\xc2\x7e\x1d\xd3\x2e\xc5\x6f\x34\xb1\xee\x8b\x68\x21\x2\xab\xd1\x14\xf4\xd\x5e\x23\xf1\x1\xca\xb7\xf5\x95\xa1\x44\x9c\xc\xb5\x6a\xad\xe4\x29\x8c\xd8\xf\x7f\x3a\xec\x32\x6c\x5\x13\x5a\x70\xda\xcf\x53\xa9\xe8\xd9\x74\xa6\x27\x89\x47\x1e\x8a\xd2\xb0\x50\xa0\x9a\x94\x3\x87\x71\xbd\xb6\x62\x65\xd5\xe9\xb2\xaf\xf7\x26\xac\x66\xfb\x85\xaa\xe7\x33\x88\x20\xdf\xfd\x15\xff\x69\x1f\xcb\x3e\xf9\xe6\x16\x45\xde\x6\x40\x8e\x43\x97\x72\xf8\x48\x2b\x91\xf6\xba\x28\x6d\x2a" },
-	{ 0x543990, "\x43\x8a\x90\x7d\xc9\xb4\x33\x62\x2a\xc8\xdc\xcc\xe5\xd8\x8\x20\x5f\x53\x67\x18\xe0\x23\xad\xae\x93\x69\x59\x6d\x10\xd4\xef\xab\x5\xcf\xa1\xd7\x85\x97\x28\x98\x5e\x4a\xe1\xf\x13\x21\xc5\x86\x76\x22\x57\x2e\xc4\x77\xbe\x1d\x82\xb1\xd1\xf9\x6e\xb8\x81\xc6\xca\x4d\x26\x17\xe8\x12\xdd\xeb\xc0\xa\xe\xf2\x68\x9a\xf4\x61\xde\xa3\x3d\x2b\xe9\xe6\x48\x5d\x16\xa4\xb9\x45\xed\xe2\x55\x51\x4f\x99\xda\x24\x42\xea\x60\x5c\x9f\x37\x46\xbb\xb0\xb6\x7f\x3b\xe4\x8e\x73\xe7\x5b\xec\xe3\xce\xfb\x9d\xf5\x36\xa0\x6b\x40\x27\x3a\x4\xd\x15\x83\x88\x38\x63\x70\x2c\xd5\x5a\x58\x4c\x72\xac\xb3\x75\x29\x0\xd9\x35\x74\xa6\x6c\xc3\x66\x78\x56\xbc\x92\xb5\x50\x1f\xf1\x34\xa9\x1c\xcd\x3e\xb2\x8c\xbf\x44\xfc\x41\xc1\x7a\xdf\xee\x30\x65\xfa\xa2\x32\x91\x25\x80\xba\x3c\x39\x96\x54\x1\xf8\x71\x2d\x84\xa8\x6a\xfe\xaf\xa7\xf6\x4b\xc7\xd3\x8b\xf7\x3f\x8f\x9b\xfd\xbd\x19\x94\xdb\xc2\x52\x2f\x31\x2\x9\xff\xf3\x11\xb7\x95\x6\xaa\x7c\x9e\x7\x49\x4e\xd6\xa5\x1b\x1e\x1a\x64\x6f\xf0\x47\x79\x87\x7b\xc\x14\x9c\x3\x8d\xb\xcb\xd0\x7e\xd2\x89" },
-	{ 0x543bf8, "\x19\xf2\xd0\x35\x72\xe6\xde\xe8\x38\x97\xfe\xd4\x0\xa9\x94\x77\x50\x74\xb9\xc\x15\xce\x54\x71\x45\x65\xba\xa8\x6d\xff\xd2\x63\x86\x5b\x93\xc8\x8a\xb6\x46\x20\x73\xa3\xe2\xae\xfd\x17\x16\x9c\x7\x5\x6b\x4d\x2e\xfc\xaf\x56\xb5\x95\xd7\x42\xb8\x18\x23\xa\x34\xf0\xcd\xfa\x3c\x9d\x9e\x8e\x59\x6f\x67\x92\x68\x5f\xcc\xe3\xe0\x41\x5a\x26\xdb\xe7\x33\x1e\x53\x37\x55\xb2\xf\xdc\x28\x10\x75\xb1\x12\xf7\x6c\xda\x2b\x8c\x89\xf5\xd9\xec\xc1\xb3\xee\xdd\xa2\x4f\xef\x9f\xa1\xbf\xdf\xb7\xca\xc3\x9b\xf4\x8\xb\x83\x3f\x32\xc2\x62\x1a\x2d\x2\x69\x4\x7e\x79\x61\x4c\x44\x84\x3d\x47\x39\xd\x8f\x5c\x81\xe9\x76\x8d\xad\xc5\x80\xd8\xcf\xc6\x7d\x1c\xd6\x7a\x51\x82\xc9\x31\x4b\x6\xb4\x85\x3b\x58\xf6\x6e\xa4\x3e\xe4\xa7\x2f\x25\x7b\x30\x66\x14\xc7\x57\xc0\x64\x21\x4e\x22\x2c\x99\xbc\xbb\x52\x49\x36\x1f\x7c\xf8\xf3\x3\x90\x3a\xc4\xa0\x4a\x91\x87\xcb\xd3\x78\xfb\x11\x70\xd1\xea\xf9\x96\x9a\x9\x5e\x1\xa5\x2a\x1b\xab\xf1\xd5\x43\xed\x13\xeb\x5d\xe\x8b\xe1\x98\x48\x29\xb0\x6a\xe5\xaa\xa6\xbd\x88\x60\xac\x40\x24\xbe\x27\x7f\x1d" },
-	{ 0x543d08, "\x98\x9c\xb6\x1c\x91\xe3\x4d\x7\x3c\x42\xeb\x71\xda\x6c\x45\x61\x99\xd6\xb1\x14\x51\x28\x64\x3\x1e\xcf\x15\x10\xa\x75\x1b\xba\x73\x89\xc7\x69\xab\x3b\x8\x7b\x52\x82\xa9\xa0\x39\xa4\xf8\x6f\xa6\xad\x22\x9e\x50\xfc\xbf\x6\xe9\x5c\x2f\x8b\x1\x8d\xf0\x8c\xe2\xa5\xe\xe5\x4b\xf7\xaa\x66\x60\x4e\x7c\x4f\x34\xa2\xb4\x5d\xaf\xcb\x8a\xd4\xb7\x30\x88\x1d\xfe\xbb\x9a\x74\x9b\x37\xe1\x44\x3d\x38\x3a\xfb\x80\xc8\x41\x65\xc6\x4a\xd7\xf5\x70\x62\x2c\xc2\xb0\xf4\xae\x57\x21\xf6\x4\x54\x5\x2b\x83\x95\xdc\xb\x24\x94\x7f\xd0\x31\x84\x5f\xdd\xe8\x87\xce\xb8\xc5\x40\xc1\xa8\xd2\xc0\xd9\x53\xa3\x3f\x55\x6b\xa7\xf1\x1f\x13\xed\xf9\x3e\xc9\xc\x2e\x67\x96\xd1\x27\x77\xbd\x32\xde\xee\x48\xf\xc3\x76\x36\xcd\x2a\xe4\xea\xdb\x46\x6d\x25\x78\xef\x18\x11\xd8\xe7\xb5\xca\x4c\xbc\xff\xac\x5b\x97\x8e\xf2\xe0\x43\x20\x35\x93\x5e\x81\x63\x2d\x79\x68\x19\x92\x56\x12\x5a\x0\x47\xb9\xd5\xb3\x90\xf3\x1a\x33\x2\x26\xd3\x6a\x85\xcc\x7d\xa1\x23\xec\x9f\x7a\xfd\xe6\xfa\xbe\x29\xb2\x72\x7e\x49\x58\x6e\xd\x86\xc4\x16\x8f\xdf\x9\x17\x59\x9d" },
-	{ 0x544130, "\xc9\x1c\x8\x44\xea\x55\xb5\x3e\x8a\x54\xeb\xd3\x86\xbb\x3b\x6e\x31\x3f\x22\xbc\xe4\xfc\x81\x4b\xd7\x8c\x1e\xb7\xb4\xb\xc8\x7c\xbe\x69\x1d\x9a\xfe\x18\x2b\xde\x4f\x6c\xcb\x52\x35\xe9\xed\xad\x79\x56\xb2\x41\xe2\xf7\xdb\xff\x6b\x71\x15\xf8\x5c\xcf\x48\xa7\x3c\x92\x60\x4a\x9f\x1f\x80\x4e\x8b\x43\x90\xab\x39\xee\x5\xd9\x6a\x40\x66\xf5\xb1\x29\x65\x9b\xf1\x84\x1a\x0\x64\x5f\xe\x76\x6d\x7\xc5\x67\x5b\x4c\x73\xd1\x7a\xf\x82\x7b\x47\x85\x74\xe6\xa1\x21\x42\xd8\x8e\x95\x98\xe3\xaa\x27\xb6\xb8\x26\xc\x6\xe8\x5e\x37\xbd\x6f\xca\xc1\x14\x4d\x10\x50\x3d\xb9\xf9\x19\x97\x1b\x7e\x20\xaf\xd5\x51\x2\xa\x8f\xa3\xd6\xc3\x62\xb0\xf4\x32\x12\x94\x8d\xc0\x78\x61\xc2\xe7\x3\x30\x63\xa8\xdc\x77\x9\x89\xa0\x46\x7f\x58\xd\xac\xa2\xe5\x88\x9e\xe0\xc4\x57\x68\xf0\x36\x38\x24\x1\xec\x91\x25\xef\xfa\xd2\x13\xce\xd4\xbf\x3a\xcc\xba\x93\xf6\xfd\x5a\x45\xcd\x72\x87\x49\xa6\x2d\x53\x28\x99\x2c\xb3\x5d\xd0\x4\x34\x96\x23\x9c\xe1\xc7\x16\xf3\x2f\x17\x75\xa5\xfb\x11\xdd\x2a\xae\xa9\xda\x70\xa4\x7d\x59\xc6\xdf\xf2\x9d\x33\x83\x2e" },
-	{ 0x544298, "\x84\x6d\x8e\x4a\x54\x44\x86\xb1\x7b\x8f\xa3\xfe\xf2\x6f\x9b\x2a\xa\xdd\xd5\x4e\x94\xc6\x7e\x99\x46\x56\x1b\x62\xad\x9a\x1d\x5c\xb6\x11\x15\x7f\xa8\xb\x45\xe8\x18\x41\xf5\x19\x9f\x16\x31\x3e\xc7\x51\x6b\x5\xfd\x70\x10\x93\xd1\x32\x2f\xf4\x89\x64\xf7\x3b\x60\xca\x96\x4c\x90\xbd\xbf\xab\xb7\x68\xb3\xdf\x42\xd4\xa1\xcc\x21\x59\x72\xe4\xdc\x73\x9e\x79\x14\x3\xec\xda\xd7\x92\xf1\xb2\xb5\x39\x81\x4d\x5b\x1f\xf0\x67\x74\x7c\x1e\x57\x6e\xe1\xac\x30\xea\x6c\x13\x37\x3d\x98\x22\xc4\xbb\x20\x50\xc1\x27\xf6\x53\xb8\x87\xcb\xf\xd3\x48\xcd\xc3\x47\x12\x75\x2\xfa\x5d\x4f\x80\x1a\x5f\x8a\x8d\x83\x58\xa0\x52\xbe\x43\x36\x61\x8\x82\x6a\xce\xaa\xb9\xa4\xdb\x76\x3c\x8b\xc\x3a\xde\xef\x24\x2e\x4\x95\x55\xaf\xfb\xf8\xf3\xa2\xa6\x3f\x40\x66\x63\x77\xff\x65\x35\x69\x91\x85\x71\xc9\x2c\xd\xed\x97\x2b\x4b\x33\xba\x23\xf9\xe7\xc2\xc0\xe3\xeb\x5a\x9d\x78\x8c\x7a\x34\x9\x26\xd6\x5e\xe2\x1c\xc8\xb0\xa7\x28\x9c\xe6\x49\xd8\x25\x7d\xe9\x29\xe0\xd9\x6\xcf\xfc\x17\xbc\xd2\x7\xa5\xa9\xae\xc5\x38\xb4\xe5\xe\xee\x1\x2d\xd0\x0\x88" },
-	{ 0x546d50, "\xab\x73\xec\xa\xdc\x52\x12\x6b\xc5\x5c\x71\x5e\x44\x8f\x41\x90\x8b\xe\x83\xba\x9e\xe4\x62\x42\x20\x38\xf3\x75\xb\x1b\x17\xf5\xd4\xcb\xaa\x81\xb1\x6c\x70\xc3\x11\x76\xd1\x69\x47\xf4\x9f\xe9\x95\xf\x4c\xe3\xd8\x92\xc2\x60\x5a\xe8\xf0\xb2\x0\x7b\x18\x4e\x85\x43\x97\x16\xce\x7a\xa7\x2e\xb8\xd2\x30\x2a\x66\xc7\x5f\xdf\xdb\xd0\xb0\xbb\xe1\x96\x3e\xfe\xc0\x26\xf7\x61\xee\xcc\x48\x3d\xfb\x3c\x2b\xae\x32\x55\xb9\x36\x7e\x68\xe5\xe2\xad\xac\x2f\xb3\xf1\xa1\xc9\x1d\x29\x72\x82\x67\x79\x51\x4\x50\xed\x1\x4b\x57\x5b\x1a\xbe\x7\x8a\x4a\x56\x9a\x9b\xca\x99\x2d\xb4\x8c\xb5\xdd\x25\x1f\xa6\xf2\x35\x2c\x89\xcd\x53\x77\x7d\x1c\x19\x84\xd\x6e\xea\x4d\x88\xc1\x24\x40\xa8\x8e\xbf\xa0\x3a\x54\x22\x58\x28\x6a\x3\x94\x64\xa2\x34\xff\xd6\x93\xa3\x23\x37\x9c\x8\xa4\xc6\xfc\x6d\xb7\x45\xde\x49\x31\xa9\xe6\x9d\xd7\xfa\xe0\x4f\x3f\xfd\x78\x98\x39\x6\x91\x21\xbd\xb6\xc8\x3b\x9\xe7\xa5\x7c\xbc\xf8\xc4\xd9\xeb\xf9\x87\x7f\xda\x1e\x86\x63\x46\x5d\xd3\xc\x2\xd5\xf6\x10\x15\xcf\x14\x33\x65\x27\xaf\x59\x13\xef\x80\x5\x8d\x6f\x74" },
-	{ 0x544548, "\x1f\xf4\xd5\xe\x5c\x98\xdc\xdd\x53\x5a\xf0\x9c\x1b\x3b\xcb\xae\x3d\xa9\x99\x45\x97\x6b\x5b\x8\xb9\x44\xe8\x89\x6a\x92\xa0\xb3\xad\x8c\x5e\xd4\x77\x8b\x30\x72\x4e\x8f\xe0\x31\xec\xfb\x1d\xc0\xe1\xca\xab\x20\xb4\x73\x6e\xc9\xfc\x42\x35\xde\x93\x64\xaa\x85\xda\x14\xa5\x46\xa\xd0\xf6\xff\x2b\x6d\x33\x91\xa7\x59\xf1\xeb\xb2\x48\x62\xd9\x39\xf7\xfa\x75\x68\x4\xf8\xc4\x74\x6f\xe7\x41\x58\x15\x63\x55\xf5\x3\x1c\x9b\xe3\x52\xaf\xb0\x1e\x2d\xed\xe5\xa4\x5f\xd\x60\x82\xa2\x49\xbd\x7c\xcc\xb\xc3\x4b\x4a\xd8\x23\x28\x86\x51\xce\x7\x40\x7d\xd2\xe6\x4f\xa8\xfe\x9e\x65\x9a\xc1\x17\xee\x3a\x4d\x7e\xfd\x88\x12\x5\x9f\x78\x7f\xcf\x18\xea\x0\x61\xe4\x96\xdb\x6c\x26\x56\xbf\x1a\x16\x9\x80\xa3\x79\x36\xa1\x2f\x32\xf\xcd\xc5\x3c\xd6\x2c\x70\xd3\xf2\x84\xd7\xc6\xa6\x47\xf9\x34\x22\xf3\x66\x10\x38\x37\x6\x2\x54\x13\xb8\xe9\x29\xbe\x5d\x7b\xac\xb1\x67\x2a\x57\x3e\x7a\x83\x1\xb6\xc7\x9d\x94\x2e\x43\x76\x8d\x69\x8e\x24\x50\x8a\x25\xb7\x19\xd1\x87\xb5\x11\xef\xe2\xc2\xba\x21\x71\x27\x3f\x95\xdf\x81\xbb\x4c\x90\xbc\xc8\xc" },
-	{ 0x544700, "\x78\x6c\xc5\xc\x2d\xa7\x97\x9c\x22\x76\x3e\x81\x51\x47\x59\x71\xb1\xa2\x4a\x3c\xb5\x16\x6\x95\xb9\x1\xe6\x91\x96\x1c\x1b\xad\x61\x64\xb2\xe7\x29\x19\x52\x3b\xfa\xaf\x30\xdb\xd4\xb\xfe\x75\x1f\xbe\xcb\xf6\xea\x31\xf8\xd8\xa3\x82\x73\x1d\x99\xf0\xcc\xb6\x46\x26\xaa\x8c\x87\x90\x24\x8f\x7a\x13\xee\xd1\xa9\x5\xb3\xf7\x2\x7c\x4c\x1e\xff\xe5\x77\xab\xd6\x98\x20\x4d\xc4\x23\xf4\xa4\x85\x9a\x8e\x1a\xe\xf5\x15\x60\x38\x72\xe9\xf1\xc3\x68\xf2\x93\xd3\x2a\x48\x74\xc2\x57\xa1\x7d\x94\x37\x92\x5c\xe1\x41\x83\xd5\x65\x14\xa6\xdc\x44\x27\xef\xd7\x25\x10\x2c\x7f\x40\xa5\x55\xbd\x2b\xd\xd0\xfc\xdf\xa0\x4\x0\x62\xb4\x5a\xeb\x6b\x84\x7e\x6a\xde\xed\x66\x3\xfb\x2e\x4f\x4e\xbb\x36\x5b\x18\xe3\x69\x3f\xec\xe4\xd2\xa\x34\x63\xcf\xa8\xf9\x9b\x7b\x6f\xe8\x49\xc1\x9\x54\xf3\x50\x67\x79\xc0\x9f\x8d\x5f\x17\x70\x11\xc8\xbc\xc6\xe0\x35\x39\xc7\x6e\x21\xbf\xda\x6d\x28\xf\xdd\x33\xac\x8a\x12\xc9\xcd\xb8\x45\xae\x32\xce\xe2\x56\xfd\x42\x89\x86\xca\x4b\x3d\x5e\xba\x8b\x5d\xb0\xb7\xd9\x58\x2f\x8\x43\x3a\x53\x9e\x80\x88\x7\x9d" },
-	{ 0x5448a8, "\x8f\xf2\xa0\xf3\x5c\x91\xbb\xc7\xcf\x42\x8a\x62\xf4\x67\xb0\xd4\xad\x2f\xc8\x64\xe8\x6e\x40\xc5\x5d\x82\x85\xa\x24\x2a\x41\x74\x7e\xcd\xdc\x26\xea\xe7\x96\xfd\x57\x6f\x35\xa7\x29\x4a\xe4\x4e\x43\xe5\xd8\x79\xe1\xeb\x95\xc1\xa4\xed\x80\xa8\x31\x6\x44\x10\x6b\xbf\x3b\x25\x9e\x94\xee\x83\x81\x6d\x1c\x19\x78\xa5\x5\x56\x4d\x0\x93\xb2\x84\x77\xaf\x2e\x18\x7b\xd2\xf1\xd1\x23\x69\x32\x98\x73\x8c\x5b\x70\xac\x8d\x6a\xb\x30\x3e\xd3\xd9\xe6\xf6\xf0\xd\xf9\x20\x72\x50\x68\xd5\x5e\x99\xf7\xa1\xbe\x89\xca\xa9\xcc\x33\x92\x87\xc9\xb1\x9\x1f\x48\x11\xba\x8\x12\xc6\x22\x53\x71\x90\xb3\x7d\x1b\xb8\x45\x4c\xc2\x9a\x15\xdd\x7c\xb4\x55\xdb\xdf\xfc\x60\x3f\xef\x9d\x3c\x4b\x65\xc3\x13\x51\x4\xb9\xbc\x7\xd0\x97\x66\x8e\xec\x46\x54\xbd\xce\xe3\xe\x88\x8b\x16\x2c\xb5\xd6\xa3\xfe\x3a\xa2\x52\x5f\xe0\x9b\x36\x27\x3\xf5\xe9\xf8\xc\xd7\x28\xe2\xc0\xae\x86\xc4\x6c\xaa\xa6\xcb\x58\x61\x39\x1a\x7a\xab\x9f\x47\x34\x38\x2b\xde\xb6\x1\x2d\x1e\xff\x7f\x5a\x59\x4f\x76\x63\x2\x17\x21\xb7\xf\x14\x37\xfb\x49\x75\xda\x3d\xfa\x9c\x1d" },
-	{ 0x544a28, "\x5d\x70\xed\x8d\xab\x3e\xdb\x57\xbc\xf6\x88\xde\xd5\xa1\x80\x2e\xb0\x29\xf1\x41\x9f\x27\xc2\x5b\x1a\xd8\x61\x97\x2a\xcf\xa\x17\xf3\x18\x77\x8\x42\xbb\x2f\x94\x21\x25\x1f\xc\xb8\x3d\xa8\x87\xa7\x71\x0\xd7\x45\x36\x7a\x4a\xca\xf5\xad\x60\x9d\x83\x40\x84\x56\xe\x4\xd1\x2\x96\x73\xe6\xaf\x35\xbe\x95\xc7\x1\x81\xeb\xb5\x7f\x51\x43\x52\xaa\x50\x22\xb9\xda\x54\xea\xd\xa0\xcb\x6f\x4c\x6e\xa5\x31\xdc\xce\xd9\x7b\xb4\x7c\xb\x85\x8b\xae\x12\x2c\x4f\x34\xdd\x6b\x2d\x6a\xfe\x63\xd3\xfc\x3\x20\x6d\xf0\xe5\xc3\x19\x62\x72\x1c\xb3\xc4\x65\x9c\xee\xd6\xfd\x76\xe9\x11\xa9\xe7\x2b\x46\xbd\x78\x89\x13\x9b\xcd\x15\x99\x9a\x69\x3f\x7\x6\xcc\x37\xf4\x98\x9e\x30\x47\x6c\x3a\x23\xe4\x66\xe8\x79\x3c\x5e\x14\x91\xb7\x8c\xfb\x8f\xc0\x3b\x7d\xe0\xa4\xfa\xc6\x4d\x90\x82\x44\x5\x67\x7e\xd2\x49\x64\xc8\x74\x8e\x32\xf9\x10\xff\x5a\x48\x5c\xc9\x92\xac\x16\x68\xd0\xef\x1e\xf\x24\x58\xbf\xb2\x55\x1d\x59\xe2\x33\xb1\xa6\x86\x4e\x4b\xc1\xe1\x39\xa2\x9\xba\x75\x5f\x38\xf8\xec\xdf\x53\xb6\xe3\xc5\x26\xa3\x1b\xd4\x93\x28\x8a\xf7\xf2" },
-	{ 0x547670, "\x41\x55\xc1\xa3\xdf\xde\xf4\x5c\x1\x2e\xa8\xf0\x1f\x4e\x38\xf6\x9d\x24\x1a\xb3\xcc\xcf\x7e\x9a\x60\xd2\xed\xe1\x42\x92\xe\x6b\x39\x57\x8f\xad\xfa\x5f\xfd\x48\x8a\x4c\x73\x64\x7f\xf9\xbc\x77\x6a\xd0\xe7\x47\xd6\xa6\x13\xf7\xd1\xb2\x3b\x49\xbb\xbf\x19\x3e\xb9\x58\x6c\xcb\x32\x5b\xd9\x8\x2b\x86\x90\xa0\x2f\x36\xe8\xbe\x6f\xa\x44\xfb\x8d\xeb\x9f\x4\x75\x82\x72\xb6\xaf\x3\x2c\xfe\xae\xf8\x27\x4b\xf5\xcd\xb0\x4a\x35\x3d\x5d\x2\x7c\x10\xba\x2d\x76\x74\x4d\x21\x65\xdd\x98\x17\xca\x33\xd\x88\xc2\x96\xdb\x84\x53\x1e\x80\x1b\x7b\x5e\xb8\xb4\x3f\xd8\x1d\x56\x99\xec\x52\xc7\x70\xc3\x7a\xc\x34\x25\x5\xa5\xda\x16\x26\x54\xf3\xe0\xd4\x85\xbd\x9c\x68\xac\x8e\xe6\xd3\x87\xa2\x8b\xa1\x15\xb5\x78\xb\x0\x66\xea\x50\x79\x59\xaa\x22\x2a\x29\xc4\x7\x12\xee\x69\xf\xf2\x3c\xc6\x7d\x28\x9e\x6d\xc9\xe3\x20\xa9\x40\x94\x63\x71\x46\xff\x23\x4f\x14\xd5\xc5\xa7\xf1\x31\x67\x95\xe4\x93\x89\x11\x6\x91\xef\x8c\x6e\x62\xab\x51\x9\x5a\xdc\x83\x1c\xb1\xe5\xe2\x9b\xd7\x61\xb7\xc8\x3a\x43\xc0\xe9\x97\x81\x18\xce\x45\x30\xfc\xa4\x37" },
-	{ 0x5480c8, "\xa0\xee\x48\xc3\x70\x1d\x44\x7f\xad\x27\x74\x5c\xe0\x71\x7a\x1a\x5a\x6c\x9d\xef\x28\x88\xa4\x89\xed\x75\x67\x22\x79\xd1\x6d\x1\xc6\x25\x7c\x31\x43\xa2\x66\x10\xac\x4b\x9\x1b\xcc\x3c\x32\xb\x8e\xe4\x60\x73\xf2\x8f\xfb\x47\x9a\x4e\xc0\x55\xd5\x91\x46\x59\xfa\x7\xa3\xbd\x78\xb7\xf\xec\xcd\xa7\xc8\xd4\xe5\x64\x12\x8d\xbb\x7b\xf6\x1e\x9c\xa9\xcb\xbf\x30\x11\x2a\x83\x37\x3a\xc4\x87\x5b\xb9\x6f\xf5\xae\x40\x50\x39\x7e\xb2\xe3\x5\x8c\xf4\xff\x92\x5e\xeb\x57\x77\xb5\x96\xe2\xfd\xba\xb1\x29\x6b\x4c\x51\xf0\x81\x0\x13\xf8\x14\x65\xf7\x3e\xc1\xa1\x5d\x2d\xaf\x69\x35\x3f\xd3\x24\xdf\x1c\x23\xe1\xfe\xf3\xdd\x16\xe6\xd\xb8\xa5\x9b\x9e\x63\x8\x8b\xa\x2f\xf9\x2e\x6e\xb0\x94\xb4\x80\xd8\x4f\x4\x56\xb6\x97\x21\xcf\x93\x3d\x26\x7d\x2\xaa\xd0\x76\xe8\xde\x17\xdb\x86\xb3\xca\xd9\x84\x99\x4d\xc5\xea\x3b\xdc\xab\xbe\x18\xc7\x2c\x3\x6\x68\x4a\x2b\xc9\x62\x95\x82\x85\x33\xf1\x42\xe7\x15\x20\xce\xd2\x58\x49\x98\x45\x41\x5f\xd6\x34\xa8\xda\x8a\x54\x38\xfc\x1f\x19\xd7\xc2\xe9\x61\xa6\xc\x72\x52\x9f\x6a\xbc\xe\x36\x53\x90" },
-	{ 0x546af0, "\x15\x4f\x74\xa6\x26\xb3\xce\x55\x94\x77\xb4\x93\xba\xbc\x7d\xd4\xec\x2a\x79\xa2\x70\xbf\x14\x4c\x35\x4\xd7\x85\x6c\x0\x11\xf6\x69\xb8\x2\xa7\xc4\x6a\x58\x92\x39\x25\xe6\x9d\xa5\xa\xc7\xaa\xda\x36\xb5\x2d\xeb\x86\xa0\x12\x99\xb1\x9c\x34\xcc\xb7\x59\x62\xf0\xcd\x9f\x17\x8a\xca\xc3\xa3\x7\xf3\x57\x41\xe5\x88\xfb\x97\xde\xd1\x1\x24\x43\x68\x90\xa8\x4b\x72\xee\x80\xfa\x52\xf2\xe7\xf\x6f\x22\x5f\x37\x2c\x98\x73\xb2\x3a\xf8\xc9\xd0\x1c\x87\x66\xab\x5d\xf9\x9b\xb0\x32\x61\xa1\xe0\x29\x9\x31\x45\x2f\x2b\x30\x8d\x5b\x5e\xa4\xc5\x3\x51\x16\x1a\xe4\x4a\xc\x18\x1b\x6\x4d\x7c\x82\xef\x19\xb\x8c\x3f\xb9\x13\x53\xd2\x6d\xb6\x81\x64\xc1\xdd\x95\xdb\xc2\xe8\x46\x60\x8\xe1\xaf\x50\x1f\x1d\xea\xd5\xdc\xcb\xd\xdf\x83\x49\x8e\x2e\x44\x67\xff\x8f\x76\x63\xf7\xe9\x3e\x10\x47\x1e\xd6\x21\xf1\xa9\xac\x33\x89\x7b\x23\xbb\xf4\x20\xd9\xfd\xcf\x42\xc0\x3c\xc6\xe\x40\x5\x7e\x56\x7a\x38\x28\xf5\x48\xe2\x4e\x71\xbd\xc8\x5c\xed\x6e\x96\xae\x8b\x9e\xfc\x3d\x9a\x78\x5a\xfe\x91\xad\x65\xbe\x27\x84\x3b\x6b\xe3\x7f\x54\xd8\xd3\x75" },
-	{ 0x546bf0, "\xc5\xb4\xfe\x62\x85\x73\x6d\xa3\x55\x60\x8\x7\xa4\x84\x2f\xcd\xaa\x5a\x36\xd6\x8a\xc\x89\x9c\xa6\x43\xc2\x13\xec\x9\x2c\x16\x52\x63\x81\xf\xed\x1b\x42\xf4\x66\xb6\xfc\xdb\xe7\x1e\xd8\xd5\x29\x5e\xe1\x57\xb0\xb5\xb\x70\xe8\x1\x3b\xde\xd4\x3\x1c\xbf\x5b\x27\x24\x34\xd\xbb\x5d\x39\xbc\xf8\x5c\x4\x3d\x47\x2\xe5\xf2\xdf\xe6\xc4\x95\x7a\x77\x3c\xa0\xff\x6b\x32\x38\x8b\x1a\x7e\x14\x26\x67\xc0\x58\x50\x64\x35\x18\xe2\xd7\x3e\x74\x2d\x41\xb7\x8e\x17\x11\xca\xc7\xd1\xdd\xcb\xd0\x90\xee\xeb\x72\x4e\x53\x80\x68\x4f\x56\xbd\x86\x76\xb2\x6f\x3f\x10\xe4\xba\xfb\x44\xc6\x5\x75\x48\x30\x9a\x19\x8d\x4d\xbe\x7f\xa1\xfd\xab\x9b\xa8\xaf\xf3\x9f\x4c\xad\xef\x8f\x2b\xf0\x31\xe3\x0\x21\xa\x2a\xf5\xc9\x23\xc8\x22\x79\x12\x78\xae\xac\x9d\x3a\x40\xf1\x93\x7b\xa9\x54\x20\x88\xe9\x45\x92\xea\x99\x7d\x6c\xd2\xcf\x6e\xc3\x82\xda\xb1\xd9\xe\x6\x94\x8c\x96\x46\x5f\xd3\x7c\x98\x9e\xb9\xf7\x69\x87\xce\x6a\x83\x28\xa5\xfa\xcc\x4a\x59\xa2\x1d\x61\xf9\x65\x37\xb3\x25\xa7\x91\x71\x1f\xf6\x2e\xb8\xc1\x4b\xdc\x15\x33\x97\x51\xe0\x49" },
-	{ 0x544d20, "\xaf\x3a\xa1\x82\xc\x76\x4d\xed\x6a\x13\x70\xc9\xc0\x32\x7a\x63\xd\x6f\xca\xb5\xdd\x69\x8b\x83\x59\x62\x2b\x98\xa9\x60\x51\x34\xa0\x75\x8f\xef\x1e\x44\xab\x54\x9f\xbc\x4\xb7\xf1\x9a\x68\xf2\x28\x3f\xfd\x87\xfc\xb2\x10\x55\x11\x17\x47\x26\x48\x52\x4f\x25\xaa\x5c\x6c\x1c\x39\x8\xa6\x1d\xb3\xfa\xd4\xe7\x37\xa5\x8c\x22\x58\x24\x8d\x23\xad\x31\xe5\xbd\x1a\x53\xa2\x79\x71\xbf\x7\x67\xc7\xcd\x3e\xdf\x14\x21\x7b\x6b\xea\x4c\x49\x9b\x1b\xe4\x7f\xff\x29\x4b\x5d\xe9\xa8\x65\x77\xf3\xa\x6e\xd1\xe2\x89\x96\x38\xf4\x80\x3c\x6d\x2e\xc5\xc1\xf7\x92\x2c\x1f\x20\x41\x36\x2d\x12\x42\x78\x43\xce\xcf\xf\x7d\x90\x0\x5a\x30\xc6\x81\xd9\xf8\x4e\xeb\xd0\xbb\xa4\xae\xd2\xde\xe8\x5f\x9d\xd8\x27\xe6\x19\x9c\xec\x2\x74\x35\xba\x84\xe1\xb\x3b\x5\xfe\x4a\xfb\xb0\xcb\x97\xf0\x64\x86\x99\x91\x3\xbe\x45\xa3\xda\xb6\x95\x2f\xd6\xf6\xc8\x73\x33\x56\xf5\x15\xa7\xc3\x18\xd5\x8e\x93\xee\xc2\x50\xf9\x46\x7c\x6\xe3\xdc\xd7\xb4\xd3\xcc\xdb\xb9\xb1\x57\x94\x66\x85\xb8\x5b\x3d\x72\xe\x88\x40\x7e\x9\x1\x5e\x9e\x2a\x16\x61\xe0\xac\xc4\x8a" },
-	{ 0x544e20, "\xd7\x3b\xe0\x11\x7a\x3\xca\xc9\xdb\x34\x4a\xc8\x24\x45\x7b\xc\x61\xf9\xcb\xc4\xad\x3d\xea\xaf\x7e\x63\x8f\x66\x2a\x21\x2c\x94\xb5\x72\xb2\xc0\x30\x77\x2f\x51\x91\x6\xf8\x25\x49\x1c\x74\xff\xdf\xbd\x71\x80\x81\x2b\xe1\x0\x4d\xda\x67\x35\x29\xf3\xc1\x89\x46\x32\x7c\x69\x3e\x1b\xf0\xab\x42\x9d\x26\xc5\x20\xb8\x6e\x12\x90\xd\xa\x5f\x23\xf5\xb9\x5e\x8b\x2\xe6\xe3\xf\x6c\x13\x65\xc3\x1f\xd9\x92\xde\x16\xc7\xd8\x75\x2d\x76\x3f\x6b\xc6\x70\xa1\xee\xa0\xed\x47\x4b\xef\xe\xbb\x9c\x9e\x31\x55\x6d\x8c\x79\x60\xa5\x2e\xe9\x37\x83\x40\xcd\x36\x84\xfd\xce\xb6\x57\xa3\x14\xf2\xeb\xdc\x4c\x28\xcc\x15\xd2\x4f\x1a\x5b\x1\x6a\x50\xcf\x8d\xfe\xb0\xbe\x5d\x44\xb\x59\xd5\xd3\x33\x3c\x5a\x27\x6f\x58\xa9\x96\xb7\xd1\xf7\x5c\x68\x8e\x19\x88\x86\xa6\x1e\x7\xa7\x53\xa2\x4\x10\x54\x7f\xf1\xbf\xbc\x3a\xac\x62\x4e\x8\x99\xd0\xe4\x48\x5\xe5\xfc\x98\x9\xf6\xa4\x1d\x9b\xa8\x56\xdd\x41\xb4\xb1\xfa\x97\x52\x9a\xe2\xfb\x95\x85\xc2\x38\xd6\x8a\xaa\x39\x43\xba\x87\xe8\xf4\x22\xae\x17\xd4\x93\x82\x73\x18\xec\x78\x64\x9f\xb3\x7d\xe7" },
-	{ 0x546fd8, "\x40\x2d\xc5\x23\xcb\xf8\x99\x7b\x3b\xae\x91\xa6\xb8\x0\xb0\xe8\x50\x9d\xd\xaf\xd8\x1b\xd1\xe9\x9c\xc0\xc\xcc\x10\xc3\x53\xe0\xd0\x8a\x9\x2b\xb1\x47\x2\xb9\xce\xc4\x3c\xa5\x36\x1\x86\x94\x7f\x72\x7e\x2e\x17\x78\x62\xc8\x3a\x6\xd7\x32\x64\xea\xbb\x18\x8c\x1d\x66\xa9\x58\x8e\x84\x7c\x75\xcd\x45\xc9\x9b\xbf\x4d\x76\x1e\x1c\x49\x44\x3d\xef\x39\xa2\x3\x37\xdb\xbd\x5e\xbe\xf2\x6d\x67\x6c\xd5\x6b\xf\xf5\xd9\x33\x54\x2a\x82\xf6\xbc\xfd\xda\x13\x92\x68\x16\xed\x70\x9f\x5d\xeb\xec\xfc\xfb\xa3\x6e\x90\x5b\x98\x5f\x8f\xe4\xe\x15\xf4\xb5\x3f\x63\x35\x59\x85\x8d\x9e\x5\xb\xa8\x65\x60\xad\x8b\xb6\x8\x41\x12\x80\x1f\x93\xe5\x7d\x88\xa4\x4b\x89\x6f\x25\xdd\xe2\x30\x57\xf0\xac\xe1\x28\xa7\x97\xde\xee\x6a\xc1\xf7\xc7\x55\xd4\x61\x24\x51\xf9\xca\x2f\xe7\x4c\xb7\x4\xe6\x96\xe3\x11\xdf\x43\xcf\x42\xab\xb2\x83\x79\xc6\x52\xdc\xaa\xb4\x7a\x34\x4e\x26\x20\x5c\x19\xa1\xd6\xba\x48\x56\x2c\x9a\xf1\x4a\x46\x74\x5a\x95\x77\xf3\xb3\x71\x27\xd2\x73\xfa\x87\x7\xa\xd3\xa0\x29\x3e\x81\xff\x1a\x38\xc2\xfe\x14\x69\x21\x22\x4f\x31" },
-	{ 0x5470d8, "\x13\x32\xf2\xee\xb5\x4b\x96\xd\x64\xb2\xc\xb0\x2f\xc0\x73\x53\xbe\x4d\x4c\xbc\x6f\xd8\x95\x4f\xe0\x6b\x24\x39\x63\xbb\x2b\xc7\xb3\xf4\xf7\x86\x7c\xa6\x23\x2c\x70\x52\xbd\x8b\x48\x80\x98\xb8\xf0\x56\xed\x91\x35\x65\xc3\xd3\x62\x60\xb9\x88\x31\xe1\x37\x1b\xac\x6e\x9e\x55\x1\xea\x4a\x42\xe8\xd9\x2a\x99\x61\x3f\xe2\x68\x58\xcd\x6\xa5\xa7\xd1\x1a\xae\x20\xca\x81\x5\xc5\x3e\xad\x66\x7b\xdc\x12\xa0\xa3\x74\x0\xa8\xb\x19\xfd\xb7\xdb\xb4\xcc\x9d\x3d\xf3\x5f\x5b\x72\xaf\x87\x92\x44\xff\xd4\xc8\x76\x8e\x5d\xd5\x3b\x22\xa9\x36\x47\xf9\x18\x15\x25\x4\x83\xc9\xda\xd7\x4e\xe5\xe4\xfe\x33\xd0\xa2\x5a\x7f\xc1\xf\x1d\x2e\x8a\x8f\x50\x27\x9f\x57\x1e\xeb\x6d\xf6\x54\x59\x49\x9c\x7e\xcf\x28\x93\x45\xec\xab\xaa\xbf\xa\xd6\x78\x41\x7d\x77\x26\x46\xb6\x2\xe3\x3a\xfb\xe\x8\xcb\x51\x82\x9a\x40\x84\x9\x5e\xfc\x7\xef\x21\x14\x2d\x71\xf5\x67\x85\x29\xb1\x30\x7a\xde\x90\x1f\x3\xf1\x3c\x75\xe6\x79\x11\x94\xc2\x16\xba\x97\xa4\x10\xdd\x1c\x69\xc6\xa1\x8d\x5c\x6a\xf8\xe9\x43\x34\x6c\x17\x8c\xfa\xc4\x38\x89\xce\x9b\xdf\xd2\xe7" },
-	{ 0x546970, "\xe1\x9a\x3f\x1a\x1e\x5d\x57\x52\x34\xd5\x1d\x93\x35\x76\x92\xf7\xea\xb9\x5c\x3a\xe3\x1f\x70\x9b\xc\xf\xd2\x8e\x30\x4c\x4f\xb0\xb7\x8b\xfb\xaf\xd3\x58\x8\x38\x36\xa5\x0\x2c\x45\x3e\xa7\x4a\x32\x37\x2b\x56\xfe\x90\x51\xc1\x7\x6e\x23\x3b\xbc\x95\x15\x86\x16\x5a\xd0\x2e\x4e\xdd\xd8\xe5\x6b\x7d\xfa\x75\x18\x29\x7c\x48\x68\xb3\xf1\xd4\x8d\x63\x20\xba\x98\xad\xa9\x6\xfc\xb5\x84\x67\xc4\x4d\x9c\x7b\x17\xb6\xfd\x91\xcb\xe\xbb\x60\xe9\x99\x49\x83\x5\x8a\xdc\x66\x24\x21\xcc\x54\x28\x78\xd7\x7f\x2d\xcf\xca\x97\xed\x5b\xc5\x59\x94\xbd\x47\x40\x25\xde\x6d\x3d\xe4\x44\xe2\x6c\x1b\xce\x22\xb\x43\xc0\x7a\x2a\x73\x53\x31\x39\x11\x14\x3\xe7\xb2\xef\x2f\x77\x74\x88\xb1\x8c\x4\x72\x7e\x10\xee\xa4\xf5\xf8\xb4\x85\xe0\x41\x87\x9e\xeb\xc9\x50\x96\xd6\x13\x9\x26\x12\x80\x5f\xa8\x3c\xf3\x89\x46\x4b\xf4\xae\x27\xc8\xc7\x61\x82\xb8\xa3\xa1\xe6\x69\x5e\x2\xec\xab\xc3\xd1\xda\xbe\x79\xe8\x9d\xd9\xaa\xdf\xf6\xa0\x62\x8f\xac\x6f\xa6\x71\x81\xa2\xf0\x33\xa\x1\xf2\xc6\xdb\xf9\xcd\xff\x9f\xd\xc2\x64\x65\x55\x42\x1c\x19\x6a\xbf" },
-	{ 0x5467d8, "\xf0\x36\x69\x25\x6b\x37\xee\x56\x5d\x85\xc4\x8b\xc6\x2\x62\xe4\x70\x48\x41\x91\x9d\x38\xff\x55\xfa\x3c\x89\xe6\x73\x30\xa8\x2d\x59\x3e\xec\xf1\x2b\xc9\x9e\x87\x84\x78\x9\x3b\xcd\xb0\xe2\xd9\x31\xf\xfc\x82\xc0\xce\x50\xe3\xbc\x79\x3\x67\x72\x9b\x32\xc1\x7a\xd\xa3\x65\xf2\xd6\x97\x6d\x93\x6f\x83\xab\x11\x74\xc3\xbf\x1f\x6c\xb1\xd8\x64\xb5\x19\xdc\x2c\xac\xe\x8\xb8\x76\xcf\x26\xbb\x6e\x51\x99\xa4\x9c\x53\x4\x88\x3d\xa1\xaf\x9f\x47\x7e\xe5\xd1\x52\xf7\x18\xd7\x15\xf3\x95\xd5\x1a\x86\x68\x8f\xba\x77\xc2\xf9\x5a\x90\x46\xe0\x61\x60\x2a\xef\xdf\x12\x1d\x5c\x7\x21\x34\x9a\xb3\x57\xb4\xe7\x1c\x4c\x35\xa2\xf5\x7b\x5b\x1\x8d\xda\x42\x71\xad\xc8\xf4\x13\x4d\x63\xb6\xfb\xbd\xed\x4f\x8e\x75\x16\x20\x28\xd4\x3a\x8a\xdd\x49\x14\x10\xa0\xde\x4e\x96\xdb\xb\x40\x7f\xcb\x80\x4b\xc\x5\x1e\x24\xfd\x44\x5e\xc7\x17\xae\x7c\xb2\x22\xd3\x92\x8c\x98\x81\x0\xb9\x27\xa7\x58\xb7\xa5\x29\x54\x4a\x6\x45\x1b\x6a\x3f\x23\xf8\xe9\xaa\xca\x66\xc5\x2e\x43\xcc\xfe\xd2\x33\x2f\xa9\xe1\xe8\x7d\x5f\xa\xbe\xf6\xd0\xea\x94\xeb\xa6\x39" },
-	{ 0x546690, "\x34\xa1\x39\xaf\x83\xdd\x8b\xb9\xe3\xd3\x61\x77\xc\x52\x66\x5d\x31\x4\x9d\xb7\x6e\xeb\xb\x9b\x19\x2a\xb3\x7c\xe6\x53\xfc\x48\x1d\x68\x69\xed\xf8\xcb\xf1\x17\xb8\x84\xc5\x9c\x6c\x49\x97\x78\xa6\x18\xf7\xdc\x7a\x2d\x65\xd\x26\x56\xb4\xa2\x3\x93\xe9\x1c\x82\x14\x6f\xee\xd2\x74\xac\x62\xc0\x7b\x8f\xd7\x20\x35\x21\xe1\xa0\xcf\xcc\xc3\x67\x80\x55\xfe\x70\x4e\x58\xc8\x27\x0\x36\x5\xe0\x1f\x6d\x51\xd8\x25\x89\x2\x2c\x85\xde\x76\x81\x4d\x11\x9e\x2b\xe5\xcd\xda\x3b\xbd\x92\xc4\xdb\xf6\x46\xbb\xba\x75\xb6\x71\x7e\x79\x1b\xfa\xea\x64\xc1\xa9\x8c\x59\x5f\xe7\x90\x63\xb5\x5c\x98\x6b\x9f\xae\x5e\x7d\xad\xc6\x7f\x8d\x15\x6\xc2\x38\x43\x5b\x73\xa3\x96\xec\x3e\xe2\x99\x94\x1\x54\xca\xf9\x8\x24\xd0\x4f\xef\xf\x3a\x13\x72\xe8\xe4\xb0\x3d\xfd\x4c\x44\x5a\xf0\x60\xa5\xa7\x40\x88\x8a\xf4\xaa\x9\x4b\xf2\xd4\xbc\x12\x1e\x47\x41\x6a\x86\x45\xd6\x2f\x37\x50\xbe\xab\x91\xf3\x22\x8e\x95\xb1\x28\x87\xb2\x7\x3f\xdf\x16\xa4\x4a\x57\x33\x30\x23\xbf\x3c\xd9\x42\xc7\xff\xa\xf5\x29\xd1\x2e\x1a\x32\xfb\x9a\xc9\xe\xce\xa8\xd5\x10" },
-	{ 0x546548, "\xab\x48\xd1\x4b\xbe\x95\x99\x9\x10\x36\x91\xe\x4c\xe7\x14\xb\x96\x16\xb4\xdf\x75\x20\x80\x7f\x74\xb3\x47\x12\xf6\xb2\x4\xca\x44\xe8\x42\x9c\xd5\x86\x30\xe0\x1d\x1e\x28\xe2\x81\xde\x2a\xa2\x45\xf0\xaa\xcc\x5f\xe6\x63\x64\xd9\x1f\x70\x49\xe1\x85\x7c\xf2\xc5\x88\x9e\xb7\xba\x9b\x17\x6e\x82\xd3\x69\x3d\x6\x1\x68\x11\x71\xf7\xd8\x24\xb6\xc7\x67\x50\x7e\x9f\xfc\xe4\xf5\xbb\x55\x7\xeb\x3c\x13\xc\x4d\xd4\x25\x23\x56\xa0\x6d\x5e\xc8\x84\x61\x8f\xdc\x2\xbd\xbc\x6f\xcd\xf3\x6c\x92\xfd\x3e\x21\xed\x1c\x6b\x79\x59\xec\x41\xac\x2c\x58\x8d\x89\x35\xaf\xda\xb0\xd6\x22\x5d\xc3\xd0\xa\x1a\x2e\x43\xe9\x7d\x52\x5c\x34\xa9\xd7\x60\xb9\x53\xee\x39\x3b\xc9\xe3\xae\xdd\x4e\x57\x8e\xf8\x19\x46\xa6\x3f\xb8\x90\x8a\xc1\x33\x4f\xea\xff\x51\x2f\x66\xc6\xf\xef\xa7\x7a\x9a\xdb\x94\xd2\xfa\xa5\xd\x8c\x18\x77\xad\x87\xc0\x54\x32\x31\xa3\x38\x62\x37\xf4\x93\x98\xf9\x83\x40\xce\x15\x1b\x3a\xfe\x3\xfb\x6a\x8b\x27\xf1\x9d\x73\x5b\x65\xe5\x7b\xb5\x4a\x8\xc2\x72\xbf\xa8\xc4\x76\x29\x26\xa1\x2b\xb1\xa4\x0\x78\xcf\xcb\x5a\x5\x2d\x97" },
-	{ 0x545c58, "\x6\x15\x2e\xa6\xed\x8\xdb\x7b\x2a\x85\xcb\x50\x31\xf5\xb4\x63\x53\xc2\x6e\x91\x92\xe6\xaf\x68\x41\x61\x74\xf3\xbb\x23\xe4\x6a\xf8\xbc\xfe\xee\x93\x90\x6f\x5f\x8a\xf9\x81\xae\xe7\xad\xd0\x59\xcd\x57\x5b\xa5\xbe\x30\xc8\x39\x79\x35\x64\x3a\x6c\x73\x29\x13\x1c\x3c\x2d\xfa\x32\xa7\x71\xe5\x6d\x4d\xa1\x99\x51\x1d\xea\xaa\x67\x96\xe8\x98\xe0\x58\x5d\x8f\x49\x9e\x20\xb\xc6\xeb\xb5\xe\x7a\x4\xc5\x34\xc1\x1b\x77\xf6\xb3\x18\xd4\x47\x9a\x87\xca\x3d\x37\x21\x5\x3\xf2\x83\xa9\xce\x8c\xac\xd3\x9\x8d\xba\xe3\xd8\x4f\x24\x72\x36\x86\xb2\xcc\x69\xfc\x75\x9b\xd5\xd\x4c\xc3\x56\x25\x9c\x5e\x6b\x2b\xb1\x22\x60\x7\xd1\xdc\x8e\xf0\x4b\xb0\x97\x1e\x88\x27\x7c\xd7\xa0\xdf\x43\x1f\x5a\x54\xcf\xa\xa3\xd6\x78\x28\x66\x26\x89\xbd\xb6\x94\xc9\x2c\x95\x1a\x5c\xd2\xb7\xb9\x48\x17\x44\x70\xc7\x80\x52\x40\x11\xc4\x4e\xab\xda\xf\x45\x7e\x3e\x7f\xde\xbf\x1\xa2\x7d\xc\x55\xc0\x84\xa8\x65\x3b\x46\x2f\x62\x82\xef\x33\x76\x10\x14\xe2\x9f\x38\xf4\x42\xe1\xa4\xfb\xff\xfd\xec\x3f\xf1\xd9\xe9\x4a\x8b\xdd\x2\x9d\xb8\x0\x19\x16\x12\xf7" },
-	{ 0x545aa0, "\x93\x1a\x38\x7a\xa7\x8c\x82\x3b\x40\x4d\x17\x1\x33\x4b\x7c\xe9\x7f\x41\xcc\x62\xc4\xf2\x70\x2f\x2\xe8\x86\x81\xce\xfe\xab\xdc\xad\x30\x4\x6e\x55\xff\x59\xbd\xf5\x23\x2d\x5b\x98\x13\x52\xc7\x7e\xaa\x1e\x4c\xfb\x95\xa8\xf0\x47\xf6\xea\xa2\x1c\xfa\x1d\xe3\xcf\xd9\x12\x57\xc0\x49\x0\xbb\x68\x7d\x3d\x3\xfc\xc1\xd7\xd2\x3c\x91\xae\xa5\xbe\xb2\x51\x69\xd8\xee\xb5\xdd\xf4\x6b\xd3\x4a\x65\x8b\xaf\xde\xe2\x36\x66\xd4\xa9\xc5\x94\x46\xc3\x6\xd0\x73\x87\x27\x9a\xb6\xdb\xb3\xa6\xe0\xe6\xc9\xd\x28\x21\x60\x97\xf8\x71\x2a\x2e\x3a\xfd\xcd\x67\x63\x72\x54\x9f\xf7\x9c\xef\x9\xca\x32\x5\x37\xac\x8a\x96\xe7\x7b\x2c\x4e\xa3\x29\xdf\x31\x84\x20\x8f\xc2\x44\xf\xb7\x39\x76\x6d\x5e\xd6\xbc\x74\x9e\x5f\x78\x64\x99\x92\x6f\x42\x43\xf3\x77\x6c\x79\xb1\xa\xbf\xa1\x9b\xf1\x15\x34\xeb\x88\x50\xc\xe4\xb4\xec\x19\x7\x18\xba\x75\x6a\x48\x22\x3f\x8d\xb\x8e\x89\x5d\xc8\x11\xc6\x61\xda\x5a\xd1\xa4\x8\x10\xf9\xb8\xe\x85\x9d\x45\x56\xe1\x26\xd5\xcb\x1b\x5c\x24\x2b\x25\xb0\x83\x16\x53\xb9\x90\x80\xed\x35\x3e\x1f\x4f\x58\xe5\xa0\x14" },
-	{ 0x545d78, "\x28\x45\x39\x3a\x7e\x23\xae\x4c\xe5\x44\x3\x6c\x9a\xe3\xf8\x6d\x29\x79\x12\x48\xaf\x84\x19\x33\xf2\x94\x40\x9\x8\x56\x64\xa\x1\x5e\x34\x30\x95\xd5\x5d\x2b\x7b\xa1\xcd\x75\xf6\x61\xb4\xc6\x99\xe9\x1c\xde\x59\xb6\xe\xd3\xe7\xa9\xce\x5b\x15\xc8\xe8\xc5\x71\x42\x26\xa8\xb\x68\x3c\x70\x87\xc0\x5c\x20\xa3\x1d\xed\xd2\x91\xbc\x4a\x53\xfc\xb1\xbf\xc9\x37\x74\xb3\x69\x36\x5a\x32\x6e\xa6\xc4\x96\x10\x6b\x82\xbb\xe0\x93\x51\x3b\xe2\xd9\x98\x88\x47\x57\x63\xba\x1e\x4d\x8d\xb0\xa0\x22\x9d\xff\x3f\xab\x2\x9e\x41\xf\xf9\x8a\x76\xfb\x6\x6f\x14\xcb\x24\x90\xaa\xb8\xdc\x81\xfe\xb5\x83\x2c\x4\xc7\x55\xfa\xa2\xee\xc\xef\xbd\x5\x5f\x2f\x2e\xa4\xc2\x11\xf4\xe4\xf0\xcc\xf5\x4f\x92\x43\x4b\x54\xca\x3d\x8f\xb9\x66\x3e\x7a\x13\x46\xdf\xad\x7d\x72\xd1\x65\xdb\x35\xd6\x17\x31\xa5\xf7\x97\xc3\x1f\x73\x38\xe6\x89\x0\x50\xa7\x2a\x8c\xea\xec\x77\xc1\xeb\x8e\x67\xd7\xd0\xb2\x9c\x21\x7\xfd\xd\xbe\x85\x78\xcf\x2d\x86\xf3\x1a\x27\x6a\x80\xac\xf1\xd8\x58\x9f\xb7\x18\x25\xd4\x62\x4e\x1b\xe1\x49\x8b\x52\x7c\x60\xdd\xda\x16\x7f\x9b" },
-	{ 0x545e78, "\xa2\xb4\xa\xde\x9f\x7f\x85\x5d\xea\x41\x31\x7a\xae\x71\xd0\x1d\x56\x14\xd9\x61\xc7\x59\x69\xbf\x47\xe7\x8c\x29\xd7\xf4\x86\xb5\x2\x93\x22\x8f\x60\x11\xc1\x95\x4f\x3d\x6b\xcc\xd2\xd\x3f\x3a\xdb\xf9\xf0\x8\xb9\x4e\xb\x65\x43\x5a\xce\x4d\x91\x49\x2e\x5b\x99\x8d\xd5\x3e\xe1\x4a\x9c\x38\x78\x77\x7d\xbe\x4b\xfc\x3\x35\x33\x5\xe9\x45\xb6\x1c\xf\x2d\xaf\x53\x57\x54\xc0\xab\xfd\xa9\xcd\x12\x81\x39\x70\xc3\xff\x94\x0\x98\x96\xf5\x79\x20\x6d\xf7\x7e\x88\xf3\x5f\x75\x73\x15\xc5\xb2\x52\xda\x9e\xa5\xc4\x36\x25\xc\x7c\x42\xee\x1e\x6a\x66\x8a\x8e\xbc\xd6\x44\x74\xe8\x10\xa0\x5c\x26\x1\x68\xd4\xa7\xe3\xbd\x3c\xbb\x28\x24\xdd\xf1\x18\x27\x30\x6f\x4c\xdf\x9a\x8b\xa1\x46\xe4\xcf\x4\x67\xd1\xac\xdc\x76\xf6\x34\xa4\x80\x89\xe0\xa6\x55\x19\xb3\xad\x3b\xfe\x5e\xc8\x7\x6\x87\xd3\xfb\x6c\xe2\xf8\x6e\x48\xd8\x2b\xef\x2a\xe6\xc9\x63\xa8\x62\xb0\x2f\xc2\x16\x82\xec\x90\x1b\x23\x51\x97\x9\xf2\x7b\xcb\xe\xb1\xaa\xc6\x9d\xfa\x64\xed\xe5\x32\x50\x92\x72\xb8\x9b\x17\x58\x2c\x83\xeb\x84\x13\x40\x1a\x37\xb7\xca\xba\x21\xa3\x1f" },
-	{ 0x545ff8, "\xd3\x15\xec\xfd\x78\x34\xa2\x0\xbb\x4f\x7e\x3e\x16\x5e\x2f\x2e\x58\x3c\xd9\xcc\x49\x74\x1\xc\x84\xab\xfe\x2c\x93\xc7\x19\xea\x92\x36\x37\x47\x8c\xc6\x2d\x33\x6f\xf9\x5a\xd5\x56\xf\xef\xd1\xbf\xfb\xf6\x11\x7a\xbe\x6c\x57\xd2\x68\x6\xb2\x86\xf4\x89\x4e\x5d\xa\x9f\xb9\x42\x3a\x72\x65\xce\x7\xa8\xd6\x3b\x69\x64\xcf\x9e\x55\x4a\xe7\x1c\x1b\x67\x25\x7f\x38\x1e\x17\xeb\x88\xa3\x26\xa4\x8d\x87\xb7\xbc\x32\xad\xaf\x8\xde\x5f\x3f\xe8\xa9\xf8\x4b\xa5\x61\x79\xc3\x41\xe4\x9c\x83\x3\x21\x75\xb6\x54\xdd\x43\x91\x27\xfa\x66\xd4\x53\xb\x9d\xf1\x5b\x94\x39\x8e\xaa\xc8\x20\xc2\xb8\xe0\xa1\x28\x1d\x4c\xa7\xcb\x90\x6a\xd7\x40\x6b\x29\x13\x5c\x4\x8f\xe1\x9a\x31\xb1\x7c\xe2\x62\x1f\xc9\x10\x1a\xa0\x9\xb3\xe6\xf3\xc1\x5\xba\x82\x71\xc0\xe9\x60\x9b\xf0\x18\x12\x46\x48\xbd\xe3\xb4\xac\x30\xdf\xc5\x8b\xfc\x77\x81\x44\x97\xf5\xf7\x59\x98\x24\x3d\x2\x76\x22\xed\x6e\x2b\xff\xd\xc4\x70\x8a\xe5\xb5\x73\x99\xf2\x23\x52\xd8\xdb\x14\x96\xda\xb0\xd0\x45\x51\xae\xa6\x7d\x50\x6d\x95\xee\x80\x4d\xe\xca\xdc\x85\x63\x2a\x7b\xcd\x35" },
-	{ 0x546190, "\x96\xef\xf6\x25\x2a\x8e\x6d\xc1\x11\x1d\xb8\x33\x85\xa7\x4c\xc8\x76\xad\x24\x29\xbe\x30\xbf\x54\x5b\x21\xb5\x2f\x51\xde\xca\x74\x9f\x80\xec\xc2\x37\xb9\xe6\xc5\x3a\xe0\xf2\xc4\xd3\x3\xaa\xed\xcb\xc6\xa3\xf4\xe4\xba\x49\xb\x18\x50\xac\xf3\x4e\x64\xe3\x4f\xe\x22\x38\xdf\x94\xc7\xd7\x17\x84\x6c\xb7\xc3\x13\x4b\x47\xb0\x6\xa1\x40\x5f\xa0\x89\xf9\x8a\x3e\xab\x81\x9c\x36\x5\x1a\x62\x8b\x5c\xe8\x7f\x23\xe1\x14\x32\x61\xea\x2\xf1\x5a\x0\x4\x19\xf8\x7e\x7\xa8\x9d\x69\x8f\x1e\x79\xb6\x2d\x59\x6f\xdc\xd4\x8d\x8\x75\x16\x63\x88\x26\x99\x42\xee\x55\x77\xbb\x1c\x1b\xf0\xaf\xbc\xfa\x98\x9e\xc0\xa2\xf\x60\xa\x52\xa9\x2e\x7a\x82\x86\x2b\xce\xf7\x73\x28\xe9\xd6\x4a\x90\x43\x2c\x5e\x8c\x10\x6a\x3b\xf5\xda\x68\x3c\xe2\x91\x56\xa5\x15\xae\xcc\x31\x95\x35\x39\x71\xd0\x7b\x78\xcf\x65\x53\x41\xa4\x6b\x7c\x67\xc\x57\x4d\xfc\xa6\xd\xd2\xc9\x9\xcd\x48\x12\x97\xb4\xfd\x3d\x83\xd8\xfb\xfe\xe5\xdd\x45\x92\x7d\x6e\x1\x5d\xe7\x20\x66\x58\xff\xb3\x3f\x27\xbd\x46\x34\x72\xd5\x1f\xb1\x70\xd9\xb2\xeb\x87\x9b\x9a\xd1\x93\x44\xdb" },
-	{ 0x546290, "\x35\x7e\xbe\xb8\x37\x3c\x49\x22\xfe\x94\x24\x93\x78\x2\xcf\xdd\xe3\xb0\xe1\x70\xd3\xc3\xaf\x68\x6\x31\xb4\x7\x3d\xeb\x75\x76\x62\x5e\x73\xe6\xbf\x32\xd8\x9e\xdb\xda\x1b\xca\x11\xbc\x2f\x47\x6b\xed\xdc\x86\x64\x90\x65\xd0\xf4\xe4\x39\xa7\x16\x43\x8b\x5d\x61\x8a\x0\xf\xc4\xe9\xb9\x53\xe7\x15\x92\x21\xe0\x6e\xcb\x4a\xfb\x91\x9c\x97\x28\xc8\xd7\xd2\x99\x74\xb7\x4d\x63\x8e\x80\xe\xd9\xa0\x95\x2e\xc9\x7b\x42\x3a\x58\xd\x1c\xce\x84\xc6\x1e\x67\xa8\xc5\x17\x33\xcd\xd1\xdf\x8f\x66\x9f\xc7\x1\x3e\x2a\x23\x5\xb\xf9\x51\x81\x40\xb5\xef\xab\xf2\x5f\x50\x30\x6c\x26\x82\xfc\x60\x83\x3\x3b\x56\xe8\xfd\x18\xb2\x98\xba\x72\x27\xf5\xa1\xaa\x36\xec\x69\x4c\x77\x34\x59\xf3\x38\x9b\x7d\xc0\xa6\x48\xae\x20\xfa\xcc\xd5\xde\xb3\x14\xa4\xa\x5c\xad\x25\x7a\x4e\xe5\x46\x6f\xff\x52\x4b\x1d\xea\x8c\x79\xf1\x9a\x8d\xa2\xc2\xac\x89\x6a\x41\x44\xf8\x57\x9d\x9\x13\x7f\x10\x12\x2d\x45\xee\xa9\xe2\xc1\x3f\x1a\xbd\x29\x19\x54\xf7\xa5\x71\xd4\x96\x7c\x5b\x1f\x87\x4f\x4\xf0\x5a\xb6\x6d\xa3\xd6\xb1\x2b\xbb\x55\x8\x88\xf6\x85\xc\x2c" },
-	{ 0x546398, "\x2f\x62\x9b\xe4\xee\xdb\x3f\x8d\xd3\xd7\x9c\x32\xd6\x4a\xca\x50\xe1\x8e\x6e\xf9\x99\xc5\x4e\xdf\x46\x5d\xd5\xb7\x6d\xb1\xb9\x7e\xf\xad\x44\x96\x13\x6c\x97\x26\xa8\x9f\x85\xde\xed\x56\xce\xda\xb0\xb\x1c\xb8\x3d\x5a\x1f\xdd\x84\xf3\xcd\x9e\x73\x28\x61\x8c\xbb\x69\x64\x4f\x0\x49\x3c\x75\xc3\x29\x8a\xe2\x4d\xc7\xcb\x10\xd\xe9\x7f\xc4\x60\x1b\x5f\xd1\x45\x42\x93\x59\xe8\x74\xff\x7a\x72\xea\xd4\xa\x3e\x7d\xc1\x31\xa4\x66\x92\xfd\xf6\x6b\x3b\xba\xbc\x19\x6a\x54\x4b\x38\x47\x43\x33\x91\x8b\xe\xae\x4\x76\x4c\xab\xc6\xbe\x36\xd0\xa0\x67\x90\x87\xf5\x9a\x77\xe6\xcf\xb2\x12\x22\x8\x37\x30\xaf\x16\x3\x58\xf1\xaa\x1e\x25\xeb\xf4\x21\xa9\xfe\x27\x83\xdc\x6\x2a\x48\x78\x68\xb4\xa7\x79\x9\x80\x81\xc8\x52\x17\xcc\x2d\x15\x94\x8f\xa1\x14\x98\xe7\xd9\x7b\xb6\x82\x5\xbf\x39\x88\xac\x86\xa2\xf8\xef\x23\x2e\x95\xd2\xa6\xf2\x2c\x3a\x2b\x65\x55\x18\xc9\x35\x57\x24\xd8\xec\xf7\xf0\xb3\x5b\x6f\xfb\x20\xbd\x5c\xfa\x71\x63\xc0\x1d\xe0\x53\x2\xa5\x7c\x51\x11\xb5\xfc\x1a\x5e\x9d\x40\x34\x1\x7\x89\xa3\xc\x70\xe5\xe3\x41\xc2" },
-};
-
-static const struct buffer_t type_four_list[NUM_TYPE_FOURS]={
-	{ 0x55f320, "\x39\x25\x29\x3c\x2b\x3a\x32\x23\x26\x24\x2d\x3d\x35\x2e\x3b\x38\x20\x27\x28\x22\x33\x3f\x2c\x3e\x36\x2a\x30\x2f\x21\x34\x31\x37\x00" },
-	{ 0x55f340, "\x5f\x4b\x40\x5e\x43\x4e\x55\x41\x5a\x57\x5d\x5b\x51\x4f\x4a\x52\x53\x58\x42\x44\x49\x46\x4d\x47\x48\x45\x50\x59\x4c\x54\x56\x5c\x00" },
-	{ 0x55f360, "\x7a\x7c\x6f\x6c\x60\x62\x73\x69\x71\x65\x6d\x72\x78\x6b\x64\x70\x74\x7b\x7e\x76\x67\x68\x63\x77\x79\x7f\x61\x6e\x75\x66\x6a\x7d\x00" },
-	{ 0x55f604, "\x17\xc\x1a\x19\x13\x12\x3\x1b\xa\x7\x1e\x1d\x5\x16\x15\x14\xd\x8\xb\x10\xf\x1\x4\x0\x18\x1c\xe\x11\x6\x1f\x2\x9\x00" },
-	{ 0x5628c4, "\xd9\xd6\xd5\xc9\xda\xdd\xd2\xdf\xdc\xd7\xc3\xd3\xc8\xc6\xc4\xd1\xca\xcc\xc1\xc5\xd4\xc2\xc0\xcb\xdb\xde\xcf\xcd\xce\xd0\xd8\xc7\x00" },
-	{ 0x5628e4, "\xf0\xff\xfc\xe4\xfb\xf1\xf3\xe3\xf5\xfe\xea\xf7\xf6\xe2\xe5\xe7\xf8\xe8\xef\xf9\xf4\xeb\xed\xfd\xe9\xfa\xe0\xe1\xec\xf2\xee\xe6\x00" },
-	{ 0x5628a4, "\xa0\xb0\xb7\xb1\xbe\xbf\xab\xb2\xa6\xa9\xa8\xa2\xb4\xb3\xa5\xaf\xba\xac\xb8\xbc\xbd\xae\xbb\xa1\xb5\xad\xb9\xa3\xaa\xb6\xa7\xa4\x00" },
-	{ 0x55f6a4, "\xa9\xaf\xb5\xa6\xa1\xbf\xac\xb9\xa0\xb0\xa5\xad\xa4\xbd\xba\xb1\xbb\xae\xab\xb8\xb4\xb2\xa8\xa3\xb7\xbe\xa2\xb3\xaa\xb6\xbc\xa7\x00" },
-	{ 0x55f6c4, "\xcf\xd1\xd8\xc8\xc2\xce\xd9\xd2\xd6\xca\xc0\xd5\xdb\xcb\xc3\xc6\xd3\xd7\xdd\xdc\xc9\xd4\xde\xc1\xc7\xc4\xc5\xcc\xcd\xd0\xdf\xda\x00" },
-	{ 0x55f6e4, "\xee\xf5\xf3\xe7\xe1\xef\xfc\xf7\xed\xe6\xe4\xf8\xe8\xec\xff\xf0\xe2\xea\xe5\xe9\xf2\xfa\xf9\xfd\xeb\xfe\xf4\xe0\xf6\xf1\xe3\xfb\x00" },
-	{ 0x562928, "\x31\x3b\x33\x29\x34\x25\x24\x3d\x23\x28\x32\x27\x3a\x3e\x20\x22\x2b\x2e\x3c\x38\x30\x2c\x39\x35\x37\x2f\x3f\x2d\x2a\x26\x36\x21\x00" },
-	{ 0x55f744, "\x51\x41\x4c\x5d\x46\x5c\x5a\x43\x49\x48\x5e\x42\x53\x47\x54\x4d\x45\x55\x58\x40\x4b\x5b\x56\x4f\x5f\x57\x4e\x52\x4a\x44\x59\x50\x00" },
-	{ 0x562884, "\x84\x98\x8a\x88\x82\x92\x8d\x96\x85\x97\x8f\x90\x95\x8c\x80\x9c\x94\x9f\x91\x87\x86\x9d\x9e\x93\x9a\x9b\x8b\x83\x89\x81\x99\x8e\x00" },
-	{ 0x55f784, "\x96\x9c\x8a\x8c\x92\x81\x82\x84\x95\x93\x91\x9f\x90\x85\x9b\x9d\x80\x89\x8e\x8b\x94\x83\x99\x87\x8f\x97\x88\x8d\x9a\x86\x9e\x98\x00" },
-	{ 0x55f7a4, "\xb2\xa6\xa2\xaa\xa9\xb8\xac\xae\xab\xb7\xaf\xbc\xa3\xa0\xb0\xa5\xbf\xa1\xb3\xba\xb5\xbe\xb4\xbb\xb6\xbd\xb9\xa7\xa8\xa4\xad\xb1\x00" },
-	{ 0x55f7c4, "\xd7\xdc\xc0\xdb\xd9\xd5\xc7\xc4\xd4\xd6\xc2\xce\xd8\xc3\xd1\xca\xcc\xc1\xc8\xcd\xc5\xc6\xd2\xcf\xde\xd3\xd0\xda\xc9\xcb\xdd\xdf\x00" },
-	{ 0x55f7e4, "\xe4\xec\xf1\xf9\xe1\xfc\xe2\xe3\xfb\xe5\xef\xe7\xfd\xf7\xe6\xf8\xf3\xf5\xea\xfa\xe8\xeb\xed\xfe\xff\xf2\xf4\xe9\xee\xf0\xf6\xe0\x00" },
-	{ 0x55f804, "\x1e\xa\xe\x13\x1b\xc\x14\x10\x8\xb\xd\x18\x2\x1c\x1a\x16\x11\x4\x15\x17\x9\x5\xf\x7\x12\x1d\x1\x19\x6\x3\x0\x1f\x00" },
-	{ 0x55f824, "\x3c\x39\x32\x34\x35\x20\x3a\x2c\x3d\x2a\x2b\x26\x30\x38\x23\x33\x29\x2d\x36\x3e\x21\x25\x2f\x2e\x37\x31\x28\x24\x22\x3b\x27\x3f\x00" },
-	{ 0x55f844, "\x57\x4c\x51\x45\x53\x54\x4b\x5b\x59\x49\x56\x47\x42\x4e\x58\x5d\x5e\x40\x5f\x46\x52\x5a\x55\x44\x50\x4d\x48\x5c\x41\x43\x4a\x4f\x00" },
-	{ 0x55f864, "\x7b\x6b\x7d\x63\x7c\x61\x7a\x79\x71\x6c\x73\x74\x6e\x6a\x68\x7f\x66\x77\x67\x69\x60\x7e\x62\x6d\x76\x78\x6f\x72\x70\x65\x75\x64\x00" },
-	{ 0x55f884, "\x92\x9c\x98\x8a\x96\x84\x80\x9f\x9b\x97\x93\x8e\x9a\x87\x88\x85\x8b\x94\x86\x8c\x90\x8d\x9d\x91\x82\x89\x8f\x99\x81\x83\x95\x9e\x00" },
-	{ 0x55f8a4, "\xb8\xa9\xbf\xa3\xb3\xaa\xa2\xa5\xb6\xbd\xa7\xaf\xb4\xac\xa4\xba\xae\xa0\xbe\xb9\xa8\xbc\xa6\xb7\xab\xb5\xa1\xad\xb1\xb2\xbb\xb0\x00" },
-	{ 0x55f91c, "\x1d\x1e\x1\xc\x12\xd\x14\x8\xe\x15\x9\xb\xa\x18\x1a\x7\x1b\x6\x4\xf\x16\x2\x0\x3\x10\x17\x11\x19\x13\x1c\x5\x1f\x00" },
-	{ 0x55f93c, "\x3d\x2e\x2f\x35\x37\x25\x3f\x32\x3e\x23\x21\x27\x22\x2d\x3a\x39\x3c\x2a\x3b\x30\x29\x31\x26\x34\x24\x2c\x33\x2b\x20\x36\x38\x28\x00" },
-	{ 0x55f9d0, "\xcc\xd6\xce\xc0\xcd\xd5\xd0\xde\xdc\xd2\xc1\xc9\xc5\xc8\xc6\xd7\xcf\xdb\xc4\xd1\xdf\xd9\xdd\xc3\xd3\xd8\xc2\xd4\xcb\xda\xc7\xca\x00" },
-	{ 0x560280, "\x83\x85\x8d\x89\x9a\x96\x88\x90\x86\x9e\x9c\x95\x82\x84\x97\x8c\x98\x8b\x99\x91\x9b\x94\x93\x8a\x8e\x80\x9d\x9f\x81\x8f\x87\x92\x00" },
-	{ 0x56034c, "\x4d\x46\x52\x58\x5c\x51\x41\x5b\x42\x40\x43\x5e\x48\x56\x49\x4e\x44\x50\x45\x53\x47\x5f\x55\x57\x5d\x4c\x5a\x4a\x4f\x54\x59\x4b\x00" },
-	{ 0x56036c, "\x70\x74\x60\x65\x69\x6f\x79\x7e\x61\x6e\x64\x62\x75\x6b\x7f\x7b\x72\x71\x73\x7d\x6a\x66\x67\x78\x63\x7c\x6d\x77\x6c\x68\x76\x7a\x00" },
-	{ 0x5605b0, "\xa7\xa3\xbe\xaa\xbd\xa8\xa9\xa0\xa4\xa1\xa6\xb5\xb4\xb0\xa2\xba\xb2\xb7\xb3\xbb\xb9\xaf\xac\xbf\xbc\xb6\xab\xb8\xad\xb1\xa5\xae\x00" },
-	{ 0x560bcc, "\xd0\xc1\xd2\xcd\xca\xda\xd4\xdb\xc7\xd3\xc8\xc3\xcc\xd5\xc4\xc6\xdd\xcf\xc9\xcb\xc5\xc0\xd9\xd8\xd6\xde\xdf\xc2\xd1\xdc\xce\xd7\x00" },
-	{ 0x560bec, "\xe2\xee\xfb\xfe\xf2\xe5\xf9\xef\xed\xe7\xe3\xfd\xfc\xe6\xfa\xea\xeb\xec\xf0\xf1\xf3\xe0\xf4\xe8\xff\xe1\xf7\xe4\xf5\xf8\xe9\xf6\x00" },
-	{ 0x560c10, "\x2\x1b\x1\x11\x17\x1e\xa\x1d\xe\x8\x4\xf\x1a\x7\x9\xb\x10\x0\x1c\x18\x3\x12\x1f\xd\x19\x16\x14\x6\x5\xc\x15\x13\x00" },
-	{ 0x560d34, "\x37\x36\x29\x3a\x3d\x2e\x38\x25\x28\x39\x3c\x26\x2d\x24\x30\x23\x21\x31\x3e\x34\x27\x22\x2f\x2c\x2a\x3f\x3b\x35\x33\x20\x2b\x32\x00" },
-	{ 0x560e38, "\x23\x32\x27\x39\x28\x30\x36\x20\x3e\x3c\x38\x24\x34\x21\x35\x2e\x3a\x3b\x31\x3f\x2b\x37\x3d\x2a\x2f\x26\x22\x25\x33\x29\x2c\x2d\x00" },
-	{ 0x561014, "\x16\xe\x19\x1\x15\x2\xa\x14\x1c\xf\x10\x4\x8\xc\xd\x0\x18\x5\x1f\x1a\x17\x1e\x13\x6\x9\x3\x7\x12\x1b\x11\x1d\xb\x00" },
-	{ 0x561074, "\x65\x73\x7b\x7e\x6d\x69\x7f\x7d\x68\x6a\x60\x72\x78\x62\x67\x70\x61\x6c\x74\x79\x66\x71\x7c\x76\x64\x6e\x6b\x75\x63\x7a\x77\x6f\x00" },
-	{ 0x561094, "\x83\x9a\x89\x87\x9f\x8d\x97\x92\x9d\x95\x99\x81\x88\x82\x8c\x8f\x85\x84\x94\x8a\x8b\x9c\x86\x9b\x96\x90\x93\x8e\x80\x9e\x98\x91\x00" },
-	{ 0x5610b4, "\xbd\xbc\xa3\xa4\xbe\xb3\xa8\xab\xb0\xba\xb5\xb8\xb9\xaf\xb7\xa1\xb6\xaa\xac\xad\xbb\xb2\xae\xbf\xb1\xa5\xa0\xb4\xa2\xa9\xa6\xa7\x00" },
-	{ 0x5610d4, "\xc1\xc8\xc9\xc0\xdb\xce\xd1\xd6\xd3\xdd\xd2\xdc\xcb\xd4\xc4\xc7\xd9\xd7\xd8\xcc\xda\xc2\xcf\xca\xc6\xd0\xc5\xde\xd5\xdf\xc3\xcd\x00" },
-	{ 0x561190, "\x93\x94\x9c\x88\x80\x9d\x83\x8b\x8f\x97\x81\x87\x8c\x8d\x95\x96\x9a\x82\x92\x8a\x9b\x91\x9e\x98\x84\x86\x90\x85\x89\x99\x9f\x8e\x00" },
-	{ 0x5611b0, "\xae\xa0\xb1\xb7\xa1\xa6\xa5\xa7\xaf\xa4\xbc\xac\xb6\xb3\xb0\xa8\xb8\xbe\xb2\xab\xb9\xbd\xa9\xb5\xbf\xa2\xbb\xa3\xba\xb4\xad\xaa\x00" },
-	{ 0x5611d0, "\xcc\xd7\xd5\xca\xc0\xcd\xc4\xc2\xd8\xdf\xdc\xd1\xd4\xcb\xc6\xda\xc1\xd2\xcf\xc3\xdd\xce\xc7\xd6\xde\xd9\xc5\xc9\xd3\xc8\xd0\xdb\x00" },
-	{ 0x562968, "\x7a\x78\x79\x7d\x6b\x62\x7c\x6d\x75\x6f\x7f\x65\x61\x60\x73\x77\x63\x6e\x71\x66\x70\x6c\x68\x6a\x76\x74\x69\x64\x72\x67\x7b\x7e\x00" },
-	{ 0x55f214, "\xd\x14\x4\xc\x1d\x5\x7\x9\x1c\xe\x16\x11\x17\x3\x6\x15\xb\x0\x12\x13\x1\x19\x1b\x1f\x1a\x2\xa\x10\xf\x1e\x18\x8\x00" },
-	{ 0x55f380, "\x98\x88\x94\x97\x83\x90\x99\x84\x8d\x9c\x86\x9d\x9e\x92\x91\x8b\x8f\x82\x8e\x9b\x93\x85\x87\x96\x95\x8a\x8c\x9a\x80\x81\x9f\x89\x00" }
-};
-
-static const struct buffer_t type_five_list[NUM_TYPE_FIVES]={
-	{ 0x55f3f8, "\xef\xe7\xf6\xfd\xeb\xf4\xec\xe2\xf7\xf9\xea\xe4\xf8\xff\xf5\xfa\xe8\xee\xfc\xe9\xe5\xfb\xe6\xe0\xfe\xed\xf2\xe1\xf1\xf0\xe3\xf3\x00" },
-	{ 0x562948, "\x47\x41\x56\x59\x45\x40\x58\x48\x49\x57\x55\x54\x5a\x4c\x4f\x4d\x51\x5c\x53\x4a\x52\x5d\x5f\x5e\x50\x43\x42\x5b\x44\x46\x4b\x4e\x00" },
-	{ 0x561258, "\x5b\x49\x5f\x43\x57\x4c\x54\x59\x5c\x5a\x51\x52\x5d\x4a\x5e\x47\x44\x56\x55\x4d\x40\x50\x58\x48\x46\x45\x4f\x41\x4b\x4e\x53\x42\x00" },
-	{ 0x561278, "\x6b\x63\x7e\x69\x64\x7f\x70\x76\x68\x7d\x71\x60\x7c\x6d\x66\x77\x67\x6a\x7a\x78\x6f\x61\x62\x75\x7b\x74\x72\x65\x6c\x79\x6e\x73\x00" },
-	{ 0x561298, "\x91\x97\x98\x8d\x8a\x8f\x82\x95\x84\x93\x99\x92\x9d\x86\x85\x94\x83\x90\x81\x80\x8c\x9f\x96\x9b\x88\x8e\x89\x87\x9c\x9e\x9a\x8b\x00" },
-	{ 0x5613a0, "\xb1\xb0\xa4\xbd\xa8\xb5\xba\xbb\xb4\xb8\xaf\xb7\xb6\xa7\xbe\xae\xb2\xaa\xb3\xab\xac\xa0\xa6\xa2\xbf\xb9\xa9\xbc\xa1\xad\xa3\xa5\x00" },
-	{ 0x5613c0, "\xc0\xc5\xd0\xdc\xcc\xda\xc4\xdb\xca\xcd\xd4\xcb\xc7\xc3\xd2\xde\xc6\xd1\xc1\xc8\xd5\xc9\xdf\xcf\xd9\xd8\xd6\xc2\xd3\xce\xd7\xdd\x00" },
-	{ 0x5613e4, "\xf0\xee\xf8\xe4\xe8\xfb\xfa\xef\xf6\xf9\xf3\xec\xe3\xe0\xed\xf4\xe7\xff\xea\xfe\xe1\xe9\xf5\xf1\xfc\xe6\xe2\xe5\xfd\xf2\xf7\xeb\x00" },
-	{ 0x561404, "\x1a\x16\x2\x19\x11\x1b\x17\xf\x14\x9\x18\x5\xe\xa\x6\x1d\x0\x1e\x7\x15\x4\x12\x8\x13\x10\xc\x1c\x1\xd\xb\x1f\x3\x00" },
-	{ 0x5615a0, "\xba\xb8\xb2\xb5\xa0\xbc\xa1\xab\xb9\xbb\xbf\xb1\xa7\xb0\xbe\xa6\xb7\xa4\xaa\xae\xad\xac\xb6\xa8\xa2\xa3\xb3\xb4\xa9\xbd\xa5\xaf\x00" },
-	{ 0x561628, "\x34\x35\x2f\x3a\x30\x32\x31\x21\x27\x3c\x37\x23\x3b\x2c\x26\x36\x24\x25\x29\x3f\x33\x3e\x22\x2d\x3d\x38\x39\x20\x28\x2b\x2e\x2a\x00" },
-	{ 0x561748, "\x52\x54\x41\x5f\x53\x43\x5e\x56\x5c\x44\x5a\x46\x4d\x4b\x57\x5d\x51\x45\x58\x5b\x42\x49\x48\x59\x4a\x40\x47\x50\x4f\x4c\x55\x4e\x00" },
-	{ 0x561768, "\x6f\x6b\x7d\x63\x6a\x79\x7f\x7c\x6d\x78\x62\x67\x69\x74\x75\x66\x7a\x6e\x70\x7e\x72\x61\x7b\x71\x73\x68\x60\x65\x64\x76\x6c\x77\x00" },
-	{ 0x5617f0, "\xed\xe3\xeb\xe0\xf7\xf3\xfa\xf2\xf0\xfc\xfe\xfb\xfd\xe8\xe2\xef\xea\xf4\xe5\xe1\xee\xf8\xec\xe4\xe9\xf5\xff\xe7\xf6\xf1\xf9\xe6\x00" },
-	{ 0x561ea0, "\xa9\xaf\xb0\xac\xa3\xb5\xa7\xb7\xae\xab\xbd\xa8\xb9\xb1\xa0\xaa\xa1\xa6\xb8\xb6\xad\xb3\xb4\xb2\xa2\xbb\xba\xa4\xa5\xbf\xbc\xbe\x00" },
-	{ 0x561f38, "\x37\x31\x3a\x3e\x20\x33\x26\x3d\x29\x25\x2e\x39\x2b\x28\x36\x22\x23\x38\x35\x30\x2d\x2c\x21\x2f\x3b\x27\x32\x2a\x34\x3f\x3c\x24\x00" },
-	{ 0x561f58, "\x55\x44\x47\x4d\x57\x4c\x43\x4a\x51\x53\x41\x5f\x49\x4e\x54\x5c\x4b\x5d\x45\x5b\x56\x52\x50\x46\x59\x5e\x40\x4f\x48\x42\x5a\x58\x00" },
-	{ 0x561f7c, "\x79\x69\x61\x7e\x73\x7f\x6b\x66\x76\x7c\x63\x6e\x72\x6d\x67\x6f\x77\x71\x75\x64\x62\x74\x68\x7b\x70\x78\x6a\x65\x60\x7a\x6c\x7d\x00" },
-	{ 0x561f9c, "\x9a\x82\x90\x8d\x8f\x94\x89\x9d\x81\x9f\x93\x85\x84\x98\x9c\x88\x8e\x86\x97\x92\x9e\x87\x9b\x99\x83\x8b\x95\x96\x91\x8a\x8c\x80\x00" },
-	{ 0x562198, "\x96\x8e\x80\x89\x94\x99\x8a\x87\x90\x8d\x92\x9e\x84\x86\x9a\x82\x8f\x9b\x9f\x8b\x9d\x81\x88\x97\x95\x8c\x91\x93\x83\x98\x85\x9c\x00" },
-	{ 0x5622f0, "\xf0\xeb\xe7\xe9\xed\xe1\xfd\xea\xe3\xf3\xee\xf9\xe0\xfe\xe5\xf5\xfb\xec\xef\xf8\xfa\xf6\xf1\xff\xe6\xe4\xf2\xf4\xf7\xe8\xe2\xfc\x00" },
-	{ 0x562864, "\x73\x63\x69\x72\x64\x7f\x7b\x6d\x74\x75\x70\x6e\x66\x62\x77\x68\x6c\x7a\x6b\x76\x61\x71\x7d\x65\x78\x7e\x67\x7c\x60\x6f\x79\x6a\x00" },
-	{ 0x56238c, "\x97\x87\x80\x8a\x93\x9b\x88\x96\x92\x8e\x83\x9a\x82\x85\x9c\x8d\x9f\x95\x9d\x8c\x86\x89\x8f\x90\x94\x91\x98\x81\x8b\x84\x99\x9e\x00" },
-	{ 0x5623ac, "\xae\xb6\xbb\xb1\xad\xaf\xbf\xb2\xa9\xb4\xaa\xa6\xa0\xa8\xb7\xac\xb0\xa5\xb3\xba\xab\xa3\xa7\xa2\xb8\xbe\xa1\xbc\xb5\xbd\xa4\xb9\x00" },
-	{ 0x5623cc, "\xc2\xd8\xde\xd2\xd0\xce\xca\xda\xd4\xc1\xdb\xc0\xd1\xdd\xc4\xd5\xcb\xc3\xdf\xc8\xcf\xd7\xc7\xd3\xd6\xc6\xc9\xdc\xcc\xcd\xd9\xc5\x00" },
-	{ 0x5623ec, "\xec\xe1\xef\xee\xfd\xe8\xf4\xe7\xf8\xf1\xf0\xff\xf7\xfb\xfc\xf9\xed\xf5\xeb\xe5\xf6\xfa\xfe\xf2\xe4\xea\xe0\xe2\xf3\xe3\xe6\xe9\x00" },
-	{ 0x562908, "\x13\x1c\x1a\x1d\x19\x15\x1f\x11\x18\x1\x0\xe\x12\x1e\xf\x1b\x17\x3\x14\xd\x6\x8\x10\x2\xc\x9\xb\x4\x5\x16\xa\x7\x00" },
-	{ 0x56249c, "\x89\x9c\x8c\x97\x81\x96\x9a\x80\x91\x83\x8b\x93\x9f\x88\x8f\x8e\x87\x84\x94\x82\x8a\x95\x86\x98\x9e\x90\x92\x9d\x9b\x85\x8d\x99\x00" },
-	{ 0x562544, "\x43\x42\x55\x4c\x48\x5b\x5d\x46\x50\x40\x49\x5c\x5e\x41\x53\x57\x58\x5f\x51\x47\x45\x4b\x52\x5a\x59\x54\x44\x56\x4f\x4a\x4d\x4e\x00" },
-	{ 0x562564, "\x75\x65\x7b\x62\x7e\x60\x66\x6d\x61\x69\x6f\x7c\x6a\x76\x7f\x73\x63\x6c\x79\x7a\x70\x7d\x72\x71\x67\x68\x64\x74\x6e\x78\x6b\x77\x00" },
-	{ 0x5625a0, "\xbf\xab\xb3\xa0\xb6\xb5\xb4\xaa\xbd\xa5\xbe\xba\xaf\xa4\xae\xa1\xb9\xa7\xa2\xb2\xac\xb7\xa8\xa9\xa3\xb1\xb8\xb0\xbc\xbb\xa6\xad\x00" },
-	{ 0x5625c0, "\xc2\xdb\xcc\xd7\xdf\xc5\xd5\xde\xd6\xc9\xda\xd2\xcf\xdc\xd8\xca\xd9\xd0\xcd\xd3\xc4\xd1\xc8\xd4\xdd\xce\xc6\xc0\xc1\xc7\xcb\xc3\x00" },
-	{ 0x5625e0, "\xe0\xe6\xeb\xe8\xec\xe4\xfa\xfc\xe5\xfe\xf4\xe3\xea\xf8\xf2\xfd\xf6\xff\xe7\xe9\xef\xee\xf7\xf3\xf1\xf9\xf0\xed\xfb\xe2\xe1\xf5\x00" },
-	{ 0x562600, "\x12\x3\x1a\x15\x4\x19\xb\x1b\x17\x1e\xd\x5\x11\x14\x1c\x0\x18\x10\xa\x6\xe\x8\x2\x7\x13\x9\x16\x1d\xf\xc\x1\x1f\x00" },
-	{ 0x562620, "\x3e\x3b\x31\x27\x28\x26\x38\x37\x2d\x2f\x32\x23\x3d\x24\x2a\x3a\x2c\x33\x34\x3f\x2b\x39\x30\x21\x36\x25\x3c\x2e\x22\x20\x29\x35\x00" },
-	{ 0x562640, "\x4f\x5d\x57\x56\x4d\x45\x53\x5f\x5b\x49\x5c\x5e\x55\x41\x46\x48\x4c\x50\x4b\x42\x44\x4a\x47\x5a\x58\x4e\x43\x51\x52\x54\x59\x40\x00" },
-	{ 0x562660, "\x6f\x64\x7d\x7b\x75\x70\x61\x6b\x60\x77\x73\x67\x7e\x7f\x68\x6a\x79\x69\x65\x66\x6c\x7a\x74\x76\x6e\x78\x63\x7c\x72\x71\x6d\x62\x00" }
-};
-
-static unsigned int yahoo_auth_fibonacci(unsigned int challenge, int divisor, int outer_loop, int inner_loop);
-static unsigned char yahoo_auth_read45(unsigned int buffer, int offset);
-static unsigned char yahoo_auth_read3(unsigned int buffer, int offset);
-static unsigned int yahoo_auth_typefourfive(unsigned int challenge, int divisor, int outer_loop, int inner_loop, int initial);
-static unsigned int yahoo_auth_typethree(unsigned int challenge, int divisor, int outer_loop, int inner_loop, int offset);
-static unsigned int yahoo_auth_typetwo(unsigned int challenge, int divisor, int outer_loop, int inner_loop, int type_two_variable, int type_two_variable2);
-static unsigned int yahoo_auth_typeone(unsigned int challenge, int divisor, int outer_loop, int inner_loop, int type_one_variable);
-
-/******************************************************************************
- y a h o o _ a u t h _ f i b o n a c c i ()
-******************************************************************************/
-
-static unsigned int yahoo_auth_fibonacci(unsigned int challenge, int divisor, int outer_loop, int inner_loop)
-{
-	unsigned int	hash = (challenge & 0xff) * 0x9e3779b1;
-
-	hash ^= (challenge & 0xff00) >> 0x8;
-	hash *= 0x9e3779b1;
-	hash ^= (challenge & 0xff0000) >> 0x10;
-	hash *= 0x9e3779b1;
-	hash ^= (challenge & 0xff000000) >> 0x18;
-	hash *= 0x9e3779b1;
-		
-	if (outer_loop > 1) {
-		const auth_function_t		*ft;
-
-		int					remainder;
-
-		hash = ((((hash ^ (hash >> 0x8)) >> 0x10) ^ hash) ^ (hash >> 0x8)) & 0xff;
-
-		remainder = hash % divisor;
-
-		outer_loop--;
-		challenge *= 0x10dcd;
-
-		ft = &main_function_list[inner_loop][remainder];
-
-		if (ft) {
-
-			switch (ft->type) {
-
-				case 0:
-					return challenge;
-				case 1:
-					return yahoo_auth_typeone(challenge, divisor, outer_loop, inner_loop, ft->var1);
-
-				case 2:
-					return yahoo_auth_typetwo(challenge, divisor, outer_loop, inner_loop, ft->var1, ft->var2);
-
-				case 3:
-					return yahoo_auth_typethree(challenge, divisor, outer_loop, inner_loop, ft->var1);
-
-				case 4:
-				case 5:
-					return yahoo_auth_typefourfive(challenge, divisor, outer_loop, inner_loop, ft->var1);
-
-				default:
-					break;
-			}
-		}
-	}
-
-	return challenge;
-}
-
-/******************************************************************************
- y a h o o _ a u t h _ r e a d 4 5 ()
-******************************************************************************/
-
-static unsigned char yahoo_auth_read45(unsigned int buffer, int offset)
-{
-	int		i;
-
-	if (offset > 32)
-		return 0;
-
-	for (i = 0; i < NUM_TYPE_FOURS; i++) {
-		if (type_four_list[i].buffer_start == buffer)
-			return type_four_list[i].buffer[offset] ^ (buffer & 0xff);
-	}
-
-	for (i = 0; i < NUM_TYPE_FIVES; i++) {
-		if (type_five_list[i].buffer_start == buffer)
-			return type_five_list[i].buffer[offset] ^ (buffer & 0xff);
-	}
-
-	return 0;
-}
-
-/******************************************************************************
- y a h o o _ a u t h _ r e a d 3 ()
-******************************************************************************/
-
-static unsigned char yahoo_auth_read3(unsigned int buffer, int offset)
-{
-	int		i;
-
-	if (offset > 256)
-		return 0;
-
-	for (i = 0; i < NUM_TYPE_THREES; i++) {
-		if (type_three_list[i].buffer_start == buffer)
-			return type_three_list[i].buffer[offset] ^ (buffer & 0xff);
-	}
-
-	return 0;
-}
-
-/******************************************************************************
- y a h o o _ a u t h _ t y p e f o u r f i v e ()
-******************************************************************************/
-
-static unsigned int yahoo_auth_typefourfive(unsigned int challenge, int divisor, int outer_loop, int inner_loop, int initial)
-{
-	unsigned int	final_value = 0;
-
-	int				i;
-
-	/* Run through each bit. */
-
-	for (i = 0; i < 32; i++)
-	{
-		unsigned char	buffer = yahoo_auth_read45(initial, i);		/* Find the location in the challenge to put the 1/0 bit */
-		int				mask = ~(1 << buffer);						/* so that we can do a replace of our current value. */
-		int				new_value = (challenge >> i) & 1;			/* Is this bit 1 or 0? */
-
-		final_value = (final_value & mask) | (new_value << buffer);
-	}
-
-	return yahoo_auth_fibonacci(final_value, divisor, outer_loop, inner_loop);
-}
-
-/******************************************************************************
- y a h o o _ a u t h _ t y p e t h r e e ()
-******************************************************************************/
-
-static unsigned int yahoo_auth_typethree(unsigned int challenge, int divisor, int outer_loop, int inner_loop, int offset)
-{
-	int				new_challenge = yahoo_auth_read3(offset, (challenge & 0xff000000) >> 0x18) << 0x18;
-
-	new_challenge |= yahoo_auth_read3(offset, (challenge & 0x00ff0000) >> 0x10) << 0x10;
-	new_challenge |= yahoo_auth_read3(offset, (challenge & 0x0000ff00) >> 0x8) << 0x8;
-	new_challenge |= yahoo_auth_read3(offset, (challenge & 0x000000ff));
-	
-	return yahoo_auth_fibonacci(new_challenge, divisor, outer_loop, inner_loop);
-}
-
-/******************************************************************************
- y a h o o _ a u t h _ t y p e t w o ()
-******************************************************************************/
-
-static unsigned int yahoo_auth_typetwo(unsigned int challenge, int divisor, int outer_loop, int inner_loop, int type_two_variable, int type_two_variable2)
-{
-	return yahoo_auth_fibonacci((challenge * type_two_variable) + type_two_variable2, divisor, outer_loop, inner_loop);
-}
-
-/******************************************************************************
- y a h o o _ a u t h _ t y p e o n e ()
-******************************************************************************/
-
-static unsigned int yahoo_auth_typeone(unsigned int challenge, int divisor, int outer_loop, int inner_loop, int type_one_variable)
-{
-	return yahoo_auth_fibonacci(challenge ^ type_one_variable, divisor, outer_loop, inner_loop);
-}
-
-/******************************************************************************
- y a h o o _ a u t h _ f i n a l C o u n t d o w n ()
-******************************************************************************/
-
-unsigned int yahoo_auth_finalCountdown(unsigned int challenge, int divisor, int inner_loop, int outer_loop)
-{
-	const auth_function_t		*ft;
-
-	int					remainder = challenge % divisor;
-
-	ft = &main_function_list[inner_loop][remainder];
-
-	if (ft) {
-
-		switch(ft->type) {
-
-			case 0:
-				break;
-
-			case 1:
-				challenge = yahoo_auth_typeone(challenge, divisor, outer_loop, inner_loop, ft->var1);
-				break;
-
-			case 2:
-				challenge = yahoo_auth_typetwo(challenge, divisor, outer_loop, inner_loop, ft->var1, ft->var2);
-				break;
-
-			case 3:
-				challenge = yahoo_auth_typethree(challenge, divisor, outer_loop, inner_loop, ft->var1);
-				break;
-
-			case 4:
-			case 5:
-				challenge = yahoo_auth_typefourfive(challenge, divisor, outer_loop, inner_loop, ft->var1);
-				break;
-		}
-	}
-
-	return challenge;
-}
diff --git a/libpurple/protocols/yahoo/yahoo_auth.h b/libpurple/protocols/yahoo/yahoo_auth.h
deleted file mode 100644
index 2fd3565ca1..0000000000
--- a/libpurple/protocols/yahoo/yahoo_auth.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * yahoo_auth.h: Header for Yahoo Messenger authentication schemes.  Eew.
- *
- * Copyright(c) 2003 Cerulean Studios
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- *
- */
-
-#ifndef _YAHOO_AUTH_H_
-#define _YAHOO_AUTH_H_ 
-
-#define NUM_TYPE_THREES 105
-#define NUM_TYPE_FOURS 56
-#define NUM_TYPE_FIVES 37
-
-unsigned int yahoo_auth_finalCountdown(unsigned int challenge, int divisor, int inner_loop, int outer_loop);
-
-/* We've defined the Yahoo authentication functions as having types 1-5; all take either 1 or 2 arguments.
- */
-
-typedef struct _auth {
-	int				type;
-	int				var1; 
-	int				var2;
-} auth_function_t;
-
-/* Type 3, 4 and 5 require lookups into ypager.exe's many static chunks of 256 bytes.  Store them here.
- */
-
-struct buffer_t {
-	unsigned int	buffer_start;
-	unsigned char	buffer[257];
-};
-
-#endif /* _YAHOO_AUTH_H_ */
diff --git a/libpurple/protocols/yahoo/yahoo_crypt.c b/libpurple/protocols/yahoo/yahoo_crypt.c
deleted file mode 100644
index 92436f1aa6..0000000000
--- a/libpurple/protocols/yahoo/yahoo_crypt.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* One way encryption based on MD5 sum.
-   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02111-1301 USA.  */
-
-/* warmenhoven took this file and made it work with the md5.[ch] we
- * already had. isn't that lovely. people should just use linux or
- * freebsd, crypt works properly on those systems. i hate solaris */
-
-#include <string.h>
-#include <stdlib.h>
-#include <glib.h>
-
-#include "cipher.h"
-#include "yahoo_crypt.h"
-
-/* Define our magic string to mark salt for MD5 "encryption"
-   replacement.  This is meant to be the same as for other MD5 based
-   encryption implementations.  */
-static const char md5_salt_prefix[] = "$1$";
-
-/* Table with characters for base64 transformation.  */
-static const char b64t[64] =
-"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-char *yahoo_crypt(const char *key, const char *salt)
-{
-	PurpleCipher *cipher;
-	PurpleCipherContext *context1, *context2;
-	guchar digest[16];
-	static char *buffer = NULL;
-	static int buflen = 0;
-	int needed = 3 + strlen (salt) + 1 + 26 + 1;
-
-	size_t salt_len;
-	size_t key_len;
-	size_t cnt;
-
-	char *cp;
-
-	if (buflen < needed) {
-		buflen = needed;
-		if ((buffer = g_realloc(buffer, buflen)) == NULL)
-			return NULL;
-	}
-
-	cipher = purple_ciphers_find_cipher("md5");
-	context1 = purple_cipher_context_new(cipher, NULL);
-	context2 = purple_cipher_context_new(cipher, NULL);
-
-	/* Find beginning of salt string.  The prefix should normally always
-	 * be present.  Just in case it is not.
-	 */
-	if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0)
-		/* Skip salt prefix.  */
-		salt += sizeof (md5_salt_prefix) - 1;
-
-	salt_len = MIN (strcspn (salt, "$"), 8);
-	key_len = strlen (key);
-
-	/* Add the key string.  */
-	purple_cipher_context_append(context1, (const guchar *)key, key_len);
-
-	/* Because the SALT argument need not always have the salt prefix we
-	 * add it separately.
-	 */
-	purple_cipher_context_append(context1, (const guchar *)md5_salt_prefix,
-							   sizeof(md5_salt_prefix) - 1);
-
-	/* The last part is the salt string.  This must be at most 8
-	 * characters and it ends at the first `$' character (for
-	 * compatibility which existing solutions).
-	 */
-	purple_cipher_context_append(context1, (const guchar *)salt, salt_len);
-
-	/* Compute alternate MD5 sum with input KEY, SALT, and KEY.  The
-	 * final result will be added to the first context.
-	 */
-
-	/* Add key.  */
-	purple_cipher_context_append(context2, (const guchar *)key, key_len);
-
-	/* Add salt.  */
-	purple_cipher_context_append(context2, (const guchar *)salt, salt_len);
-
-	/* Add key again.  */
-	purple_cipher_context_append(context2, (const guchar *)key, key_len);
-
-	/* Now get result of this (16 bytes) and add it to the other context.  */
-	purple_cipher_context_digest(context2, sizeof(digest), digest, NULL);
-
-	/* Add for any character in the key one byte of the alternate sum.  */
-	for (cnt = key_len; cnt > 16; cnt -= 16)
-		purple_cipher_context_append(context1, digest, 16);
-	purple_cipher_context_append(context1, digest, cnt);
-
-	/* For the following code we need a NUL byte.  */
-	digest[0] = '\0';
-
-	/* The original implementation now does something weird: for every 1
-	 * bit in the key the first 0 is added to the buffer, for every 0
-	 * bit the first character of the key.  This does not seem to be
-	 * what was intended but we have to follow this to be compatible.
-	 */
-	for (cnt = key_len; cnt > 0; cnt >>= 1)
-		purple_cipher_context_append(context1,
-								   (cnt & 1) != 0 ? digest : (guchar *)key, 1);
-
-	/* Create intermediate result.  */
-	purple_cipher_context_digest(context1, sizeof(digest), digest, NULL);
-
-	/* Now comes another weirdness.  In fear of password crackers here
-	 * comes a quite long loop which just processes the output of the
-	 * previous round again.  We cannot ignore this here.
-	 */
-	for (cnt = 0; cnt < 1000; ++cnt) {
-		/* New context.  */
-		purple_cipher_context_reset(context2, NULL);
-
-		/* Add key or last result.  */
-		if ((cnt & 1) != 0)
-			purple_cipher_context_append(context2, (const guchar *)key, key_len);
-		else
-			purple_cipher_context_append(context2, digest, 16);
-
-		/* Add salt for numbers not divisible by 3.  */
-		if (cnt % 3 != 0)
-			purple_cipher_context_append(context2, (const guchar *)salt, salt_len);
-
-		/* Add key for numbers not divisible by 7.  */
-		if (cnt % 7 != 0)
-			purple_cipher_context_append(context2, (const guchar *)key, key_len);
-
-		/* Add key or last result.  */
-		if ((cnt & 1) != 0)
-			purple_cipher_context_append(context2, digest, 16);
-		else
-			purple_cipher_context_append(context2, (const guchar *)key, key_len);
-
-		/* Create intermediate result.  */
-		purple_cipher_context_digest(context2, sizeof(digest), digest, NULL);
-	}
-
-	/* Now we can construct the result string.  It consists of three parts. */
-	strncpy(buffer, md5_salt_prefix, MAX (0, buflen));
-	cp = buffer + strlen(buffer);
-	buflen -= sizeof (md5_salt_prefix);
-
-	strncpy(cp, salt, MIN ((size_t) buflen, salt_len));
-	cp = cp + strlen(cp);
-	buflen -= MIN ((size_t) buflen, salt_len);
-
-	if (buflen > 0) {
-		*cp++ = '$';
-		--buflen;
-	}
-
-#define b64_from_24bit(B2, B1, B0, N) \
-	do { \
-		unsigned int w = ((B2) << 16) | ((B1) << 8) | (B0); \
-		int n = (N); \
-		while (n-- > 0 && buflen > 0) { \
-			*cp++ = b64t[w & 0x3f]; \
-			--buflen; \
-			w >>= 6; \
-		}\
-	} while (0)
-
-	b64_from_24bit (digest[0], digest[6], digest[12], 4);
-	b64_from_24bit (digest[1], digest[7], digest[13], 4);
-	b64_from_24bit (digest[2], digest[8], digest[14], 4);
-	b64_from_24bit (digest[3], digest[9], digest[15], 4);
-	b64_from_24bit (digest[4], digest[10], digest[5], 4);
-	b64_from_24bit (0, 0, digest[11], 2);
-	if (buflen <= 0) {
-		g_free(buffer);
-		buffer = NULL;
-	} else
-		*cp = '\0';	/* Terminate the string.  */
-
-	/* Clear the buffer for the intermediate result so that people
-	 * attaching to processes or reading core dumps cannot get any
-	 * information.  We do it in this way to clear correct_words[]
-	 * inside the MD5 implementation as well.
-	 */
-	purple_cipher_context_reset(context1, NULL);
-	purple_cipher_context_digest(context1, sizeof(digest), digest, NULL);
-	purple_cipher_context_destroy(context1);
-	purple_cipher_context_destroy(context2);
-
-	return buffer;
-}
diff --git a/libpurple/protocols/yahoo/yahoo_doodle.c b/libpurple/protocols/yahoo/yahoo_doodle.c
index 49747c863e..277adb74fa 100644
--- a/libpurple/protocols/yahoo/yahoo_doodle.c
+++ b/libpurple/protocols/yahoo/yahoo_doodle.c
@@ -41,12 +41,11 @@
 #include "util.h"
 #include "version.h"
 
-#include "yahoo.h"
+#include "libymsg.h"
 #include "yahoo_packet.h"
 #include "yahoo_friend.h"
 #include "yahoochat.h"
 #include "ycht.h"
-#include "yahoo_auth.h"
 #include "yahoo_filexfer.h"
 #include "yahoo_picture.h"
 
@@ -385,7 +384,7 @@ static void yahoo_doodle_command_send_generic(const char *type,
 											  const char *imv,
 											  const char *sixtyfour)
 {
-	struct yahoo_data *yd;
+	YahooData *yd;
 	struct yahoo_packet *pkt;
 
 	purple_debug_info("yahoo", "doodle: Sent %s (%s)\n", type, to);
@@ -393,7 +392,7 @@ static void yahoo_doodle_command_send_generic(const char *type,
 	yd = gc->proto_data;
 
 	/* Make and send an acknowledge (ready) Doodle packet */
-	pkt = yahoo_packet_new(YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash_str(pkt, 49,  "IMVIRONMENT");
 	yahoo_packet_hash_str(pkt, 1,    purple_account_get_username(gc->account));
 	yahoo_packet_hash_str(pkt, 14,   message);
diff --git a/libpurple/protocols/yahoo/yahoo_filexfer.c b/libpurple/protocols/yahoo/yahoo_filexfer.c
index 03af732d3e..53797a49dd 100644
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c
@@ -26,10 +26,11 @@
 #include "prpl.h"
 #include "util.h"
 #include "debug.h"
+#include "network.h"
 #include "notify.h"
 #include "proxy.h"
 #include "ft.h"
-#include "yahoo.h"
+#include "libymsg.h"
 #include "yahoo_packet.h"
 #include "yahoo_filexfer.h"
 #include "yahoo_doodle.h"
@@ -50,7 +51,7 @@ struct yahoo_xfer_data {
 	guint rxlen;
 	gchar *xfer_peer_idstring;
 	gchar *xfer_idstring_for_relay;
-	int version; /*0 for old, 15 for Y7(YMSG 15)*/
+	int version; /* 0 for old, 15 for Y7(YMSG 15) */
 	int info_val_249;
 
 	enum {
@@ -58,34 +59,42 @@ struct yahoo_xfer_data {
 		HEAD_REQUESTED,
 		HEAD_REPLY_RECEIVED,
 		TRANSFER_PHASE,
-		ACCEPTED
+		ACCEPTED,
+		P2P_HEAD_REQUESTED,
+		P2P_HEAD_REPLIED,
+		P2P_GET_REQUESTED
 	} status_15;
 
 	/* contains all filenames, in case of multiple transfers, with the first
 	 * one in the list being the current file's name (ymsg15) */
 	GSList *filename_list;
-	GSList *size_list; /*corresponds to filename_list, with size as **STRING** */
+	GSList *size_list; /* corresponds to filename_list, with size as **STRING** */
 	gboolean firstoflist;
+	gchar *xfer_url;	/* url of the file, used when we are p2p server */
+	int yahoo_local_p2p_ft_server_fd;
+	int yahoo_local_p2p_ft_server_port;
+	int yahoo_p2p_ft_server_watcher;
+	int input_event;
 };
 
 static void yahoo_xfer_data_free(struct yahoo_xfer_data *xd)
 {
 	PurpleConnection *gc;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	PurpleXfer *xfer;
 	GSList *l;
 
 	gc = xd->gc;
 	yd = gc->proto_data;
 
-	/*remove entry from map*/
+	/* remove entry from map */
 	if(xd->xfer_peer_idstring) {
 		xfer = g_hash_table_lookup(yd->xfer_peer_idstring_map, xd->xfer_peer_idstring);
 		if(xfer)
 			g_hash_table_remove(yd->xfer_peer_idstring_map, xd->xfer_peer_idstring);
 	}
 
-	/*empty file & filesize list*/
+	/* empty file & filesize list */
 	for (l = xd->filename_list; l; l = l->next) {
 		g_free(l->data);
 		l->data=NULL;
@@ -147,8 +156,8 @@ static void yahoo_receivefile_connected(gpointer data, gint source, const gchar
 	PurpleXfer *xfer;
 	struct yahoo_xfer_data *xd;
 
-	purple_debug(PURPLE_DEBUG_INFO, "yahoo",
-			   "AAA - in yahoo_receivefile_connected\n");
+	purple_debug_info("yahoo", "in yahoo_receivefile_connected\n");
+
 	if (!(xfer = data))
 		return;
 	if (!(xd = xfer->data))
@@ -224,10 +233,10 @@ static void yahoo_sendfile_connected(gpointer data, gint source, const gchar *er
 	size_t content_length, header_len, pkt_buf_len;
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	struct yahoo_data *yd;
+	YahooData *yd;
+
+	purple_debug_info("yahoo", "in yahoo_sendfile_connected\n");
 
-	purple_debug(PURPLE_DEBUG_INFO, "yahoo",
-			   "AAA - in yahoo_sendfile_connected\n");
 	if (!(xfer = data))
 		return;
 	if (!(xd = xfer->data))
@@ -302,7 +311,7 @@ static void yahoo_xfer_init(PurpleXfer *xfer)
 	struct yahoo_xfer_data *xfer_data;
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	struct yahoo_data *yd;
+	YahooData *yd;
 
 	xfer_data = xfer->data;
 	gc = xfer_data->gc;
@@ -311,7 +320,7 @@ static void yahoo_xfer_init(PurpleXfer *xfer)
 
 	if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND) {
 		if (yd->jp) {
-			if (purple_proxy_connect(NULL, account, purple_account_get_string(account, "xferjp_host",  YAHOOJP_XFER_HOST),
+			if (purple_proxy_connect(gc, account, purple_account_get_string(account, "xferjp_host",  YAHOOJP_XFER_HOST),
 			                       purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
 			                       yahoo_sendfile_connected, xfer) == NULL)
 			{
@@ -320,7 +329,7 @@ static void yahoo_xfer_init(PurpleXfer *xfer)
 				purple_xfer_cancel_remote(xfer);
 			}
 		} else {
-			if (purple_proxy_connect(NULL, account, purple_account_get_string(account, "xfer_host",  YAHOO_XFER_HOST),
+			if (purple_proxy_connect(gc, account, purple_account_get_string(account, "xfer_host",  YAHOO_XFER_HOST),
 			                       purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
 			                       yahoo_sendfile_connected, xfer) == NULL)
 			{
@@ -331,7 +340,7 @@ static void yahoo_xfer_init(PurpleXfer *xfer)
 		}
 	} else {
 		xfer->fd = -1;
-		if (purple_proxy_connect(NULL, account, xfer_data->host, xfer_data->port,
+		if (purple_proxy_connect(gc, account, xfer_data->host, xfer_data->port,
 		                              yahoo_receivefile_connected, xfer) == NULL) {
 			purple_notify_error(gc, NULL, _("File Transfer Failed"),
 			             _("Unable to establish file descriptor."));
@@ -345,7 +354,7 @@ static void yahoo_xfer_init_15(PurpleXfer *xfer)
 	struct yahoo_xfer_data *xfer_data;
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	struct yahoo_packet *pkt;
 
 	xfer_data = xfer->data;
@@ -371,12 +380,12 @@ static void yahoo_xfer_init_15(PurpleXfer *xfer)
 			28,  xfer->size,
 			301, 268,
 			303, 268);
-		g_free(filename); 
+		g_free(filename);
 	} else {
 		if(xfer_data->firstoflist == TRUE) {
 			pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_15,
 				YAHOO_STATUS_AVAILABLE, yd->session_id);
-	
+
 			yahoo_packet_hash(pkt, "sssi",
 				1, purple_normalize(account, purple_account_get_username(account)),
 				5, xfer->who,
@@ -385,7 +394,7 @@ static void yahoo_xfer_init_15(PurpleXfer *xfer)
 		} else {
 			pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_ACC_15,
 				YAHOO_STATUS_AVAILABLE, yd->session_id);
-	
+
 			yahoo_packet_hash(pkt, "sssi",
 				1, purple_normalize(account, purple_account_get_username(account)),
 				5, xfer->who,
@@ -516,7 +525,7 @@ static void yahoo_xfer_cancel_send(PurpleXfer *xfer)
 	{
 		PurpleConnection *gc;
 		PurpleAccount *account;
-		struct yahoo_data *yd;
+		YahooData *yd;
 		struct yahoo_packet *pkt;
 
 		gc = xfer_data->gc;
@@ -564,7 +573,7 @@ static void yahoo_xfer_cancel_recv(PurpleXfer *xfer)
 
 		PurpleConnection *gc;
 		PurpleAccount *account;
-		struct yahoo_data *yd;
+		YahooData *yd;
 		struct yahoo_packet *pkt;
 
 		gc = xfer_data->gc;
@@ -600,25 +609,49 @@ static void yahoo_xfer_cancel_recv(PurpleXfer *xfer)
 	xfer->data = NULL;
 }
 
+/* Send HTTP OK after receiving file */
+static void yahoo_p2p_ft_server_send_OK(PurpleXfer *xfer)
+{
+	char *tx = NULL;
+	int written;
+
+	tx = g_strdup_printf("HTTP/1.1 200 OK\r\nContent-Length: 0\r\nContent-Type: application/octet-stream\r\nConnection: close\r\n\r\n");
+	written = write(xfer->fd, tx, strlen(tx));
+
+	if (written < 0 && errno == EAGAIN)
+		written = 0;
+	else if (written <= 0)
+		purple_debug_info("yahoo", "p2p filetransfer: Unable to write HTTP OK");
+
+	/* close connection */
+	close(xfer->fd);
+	xfer->fd = -1;
+	g_free(tx);
+}
+
 static void yahoo_xfer_end(PurpleXfer *xfer_old)
 {
 	struct yahoo_xfer_data *xfer_data;
 	PurpleXfer *xfer = NULL;
 	PurpleConnection *gc;
-	struct yahoo_data *yd;
+	YahooData *yd;
 
 	xfer_data = xfer_old->data;
 	if(xfer_data && xfer_data->version == 15
 	   && purple_xfer_get_type(xfer_old) == PURPLE_XFER_RECEIVE
 	   && xfer_data->filename_list) {
-		
+
+		/* Send HTTP OK in case of p2p transfer, when we act as server */
+		if((xfer_data->xfer_url != NULL) && (xfer_old->fd >=0) && (purple_xfer_get_status(xfer_old) == PURPLE_XFER_STATUS_DONE))
+			yahoo_p2p_ft_server_send_OK(xfer_old);
+
 		/* removing top of filename & size list completely */
 		g_free( xfer_data->filename_list->data );
 		g_free( xfer_data->size_list->data );
-		   
+
 		xfer_data->filename_list->data = NULL;
 		xfer_data->size_list->data = NULL;
-		   
+
 		xfer_data->filename_list = g_slist_delete_link(xfer_data->filename_list, xfer_data->filename_list);
 		xfer_data->size_list = g_slist_delete_link(xfer_data->size_list, xfer_data->size_list);
 
@@ -664,16 +697,16 @@ static void yahoo_xfer_end(PurpleXfer *xfer_old)
 			/* Build the file transfer handle. */
 			xfer = purple_xfer_new(gc->account, PURPLE_XFER_RECEIVE, xfer_old->who);
 
-			
+
 			if (xfer) {
 				/* Set the info about the incoming file. */
 				char *utf8_filename = yahoo_string_decode(gc, filename, TRUE);
 				purple_xfer_set_filename(xfer, utf8_filename);
 				g_free(utf8_filename);
 				purple_xfer_set_size(xfer, filesize);
-		
+
 				xfer->data = xfer_data;
-	
+
 				/* Setup our I/O op functions */
 				purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init_15);
 				purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
@@ -684,7 +717,7 @@ static void yahoo_xfer_end(PurpleXfer *xfer_old)
 				purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
 				purple_xfer_set_request_denied_fnc(xfer,yahoo_xfer_cancel_recv);
 
-				/*update map to current xfer*/
+				/* update map to current xfer */
 				g_hash_table_remove(yd->xfer_peer_idstring_map, xfer_data->xfer_peer_idstring);
 				g_hash_table_insert(yd->xfer_peer_idstring_map, xfer_data->xfer_peer_idstring, xfer);
 
@@ -769,7 +802,7 @@ void yahoo_process_filetransfer(PurpleConnection *gc, struct yahoo_packet *pkt)
 	char *imv = NULL;
 	long expires = 0;
 	PurpleXfer *xfer;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	struct yahoo_xfer_data *xfer_data;
 	char *service = NULL;
 	char *filename = NULL;
@@ -851,46 +884,48 @@ void yahoo_process_filetransfer(PurpleConnection *gc, struct yahoo_packet *pkt)
 
 	/* Build the file transfer handle. */
 	xfer = purple_xfer_new(gc->account, PURPLE_XFER_RECEIVE, from);
-	if (xfer)
-	{
-		xfer->data = xfer_data;
+	if (xfer == NULL) {
+		g_free(xfer_data);
+		g_return_if_reached();
+	}
 
-		/* Set the info about the incoming file. */
-		if (filename) {
-			char *utf8_filename = yahoo_string_decode(gc, filename, TRUE);
+	xfer->data = xfer_data;
+
+	/* Set the info about the incoming file. */
+	if (filename) {
+		char *utf8_filename = yahoo_string_decode(gc, filename, TRUE);
+		purple_xfer_set_filename(xfer, utf8_filename);
+		g_free(utf8_filename);
+	} else {
+		gchar *start, *end;
+		start = g_strrstr(xfer_data->path, "/");
+		if (start)
+			start++;
+		end = g_strrstr(xfer_data->path, "?");
+		if (start && *start && end) {
+			char *utf8_filename;
+			filename = g_strndup(start, end - start);
+			utf8_filename = yahoo_string_decode(gc, filename, TRUE);
+			g_free(filename);
 			purple_xfer_set_filename(xfer, utf8_filename);
 			g_free(utf8_filename);
-		} else {
-			gchar *start, *end;
-			start = g_strrstr(xfer_data->path, "/");
-			if (start)
-				start++;
-			end = g_strrstr(xfer_data->path, "?");
-			if (start && *start && end) {
-				char *utf8_filename;
-				filename = g_strndup(start, end - start);
-				utf8_filename = yahoo_string_decode(gc, filename, TRUE);
-				g_free(filename);
-				purple_xfer_set_filename(xfer, utf8_filename);
-				g_free(utf8_filename);
-				filename = NULL;
-			}
+			filename = NULL;
 		}
+	}
 
-		purple_xfer_set_size(xfer, filesize);
+	purple_xfer_set_size(xfer, filesize);
 
-		/* Setup our I/O op functions */
-		purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init);
-		purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
-		purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
-		purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
-		purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
-		purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
-		purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
+	/* Setup our I/O op functions */
+	purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init);
+	purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
+	purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
+	purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
+	purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
+	purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
+	purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
 
-		/* Now perform the request */
-		purple_xfer_request(xfer);
-	}
+	/* Now perform the request */
+	purple_xfer_request(xfer);
 }
 
 PurpleXfer *yahoo_new_xfer(PurpleConnection *gc, const char *who)
@@ -905,20 +940,23 @@ PurpleXfer *yahoo_new_xfer(PurpleConnection *gc, const char *who)
 
 	/* Build the file transfer handle. */
 	xfer = purple_xfer_new(gc->account, PURPLE_XFER_SEND, who);
-	if (xfer)
+	if (xfer == NULL)
 	{
-		xfer->data = xfer_data;
-
-		/* Setup our I/O op functions */
-		purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init);
-		purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
-		purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
-		purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
-		purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
-		purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
-		purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
+		g_free(xfer_data);
+		g_return_val_if_reached(NULL);
 	}
 
+	xfer->data = xfer_data;
+
+	/* Setup our I/O op functions */
+	purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init);
+	purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
+	purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
+	purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
+	purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
+	purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
+	purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
+
 	return xfer;
 }
 
@@ -952,7 +990,7 @@ static void yahoo_xfer_dns_connected_15(GSList *hosts, gpointer data, const char
 	long a,b,c,d;
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	gchar *url;
 	gchar *filename;
 
@@ -970,7 +1008,7 @@ static void yahoo_xfer_dns_connected_15(GSList *hosts, gpointer data, const char
 		purple_xfer_cancel_remote(xfer);
 		return;
 	}
-	
+
 	/* Discard the length... */
 	hosts = g_slist_remove(hosts, hosts->data);
 	if(!hosts)
@@ -979,8 +1017,8 @@ static void yahoo_xfer_dns_connected_15(GSList *hosts, gpointer data, const char
 		purple_xfer_cancel_remote(xfer);
 		return;
 	}
-	
-	/*TODO:actually, u must try with addr no.1 , if its not working addr no.2 .....*/
+
+	/* TODO:actually, u must try with addr no.1 , if its not working addr no.2 ..... */
 	addr = hosts->data;
 	actaddr = addr->sin_addr.s_addr;
 	d = actaddr % 256;
@@ -996,12 +1034,7 @@ static void yahoo_xfer_dns_connected_15(GSList *hosts, gpointer data, const char
 		xd->port = YAHOO_XFER_RELAY_PORT;
 
 	url = g_strdup_printf("%ld.%ld.%ld.%ld", d, c, b, a);
-	if (!purple_url_parse(url, &(xd->host), &(xd->port), &(xd->path), NULL, NULL)) {
-		purple_xfer_cancel_remote(xfer);
-		g_free(url);
-		return;
-	}
-	g_free(url);
+
 	/* Free the address... */
 	g_free(hosts->data);
 	hosts = g_slist_remove(hosts, hosts->data);
@@ -1015,6 +1048,13 @@ static void yahoo_xfer_dns_connected_15(GSList *hosts, gpointer data, const char
 		hosts = g_slist_remove(hosts, hosts->data);
 	}
 
+	if (!purple_url_parse(url, &(xd->host), &(xd->port), &(xd->path), NULL, NULL)) {
+		purple_xfer_cancel_remote(xfer);
+		g_free(url);
+		return;
+	}
+	g_free(url);
+
 	pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_INFO_15, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	filename = g_path_get_basename(purple_xfer_get_local_filename(xfer));
 
@@ -1030,30 +1070,24 @@ static void yahoo_xfer_dns_connected_15(GSList *hosts, gpointer data, const char
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
-
 void yahoo_send_file(PurpleConnection *gc, const char *who, const char *file)
 {
 	struct yahoo_xfer_data *xfer_data;
-	struct yahoo_data *yd = gc->proto_data;
-	int ver = 0;
+	YahooData *yd = gc->proto_data;
 	PurpleXfer *xfer = yahoo_new_xfer(gc, who);
-	YahooFriend *yf = yahoo_friend_find(gc, who);
-
-	/* To determine if we should use yahoo p15 for transfer.  Check other user's
-	 * reported version, but if we're on Yahoo Japan, ignore it. */
-	if(yf && yf->version_id > 500000 && !yd->jp)
-		ver = 15; 
 
 	g_return_if_fail(xfer != NULL);
 
-	if(ver == 15) {
-		xfer_data = xfer->data;
-		xfer_data->status_15 = STARTED;
-		purple_xfer_set_init_fnc(xfer, yahoo_xfer_init_15);
-		xfer_data->version = 15;
-		xfer_data->xfer_peer_idstring = yahoo_xfer_new_xfer_id();
-		g_hash_table_insert(yd->xfer_peer_idstring_map, xfer_data->xfer_peer_idstring, xfer);
-	}
+	/* if we don't have a p2p connection, try establishing it now */
+	if( !g_hash_table_lookup(yd->peers, who) )
+		yahoo_send_p2p_pkt(gc, who, 0);
+
+	xfer_data = xfer->data;
+	xfer_data->status_15 = STARTED;
+	purple_xfer_set_init_fnc(xfer, yahoo_xfer_init_15);
+	xfer_data->version = 15;
+	xfer_data->xfer_peer_idstring = yahoo_xfer_new_xfer_id();
+	g_hash_table_insert(yd->xfer_peer_idstring_map, xfer_data->xfer_peer_idstring, xfer);
 
 	/* Now perform the request */
 	if (file)
@@ -1062,7 +1096,9 @@ void yahoo_send_file(PurpleConnection *gc, const char *who, const char *file)
 		purple_xfer_request(xfer);
 }
 
-static void yahoo_xfer_connected_15(gpointer data, gint source, const gchar *error_message);/*using this in recv_cb*/
+static void yahoo_p2p_ft_server_listen_cb(int listenfd, gpointer data);	/* using this in yahoo_xfer_send_cb_15 */
+static void yahoo_xfer_connected_15(gpointer data, gint source, const gchar *error_message);/* using this in recv_cb */
+
 static void yahoo_xfer_recv_cb_15(gpointer data, gint source, PurpleInputCondition condition)
 {
 	PurpleXfer *xfer;
@@ -1082,14 +1118,15 @@ static void yahoo_xfer_recv_cb_15(gpointer data, gint source, PurpleInputConditi
 	while((did = read(source, buf, 998)) > 0)
 	{
 		xd->txbuflen += did;
-		buf[did] = '\0';  
+		buf[did] = '\0';
 		t = xd->txbuf;
 		xd->txbuf = g_strconcat(t,buf,NULL);
 		g_free(t);
 	}
 	g_free(buf);
 
-	if (did < 0 && errno == EAGAIN) return;
+	if (did < 0 && errno == EAGAIN)
+		return;
 	else if (did < 0) {
 		purple_debug_error("yahoo", "Unable to write in order to start ft errno = %d\n", errno);
 		purple_xfer_cancel_remote(xfer);
@@ -1102,10 +1139,10 @@ static void yahoo_xfer_recv_cb_15(gpointer data, gint source, PurpleInputConditi
 
 	if(xd->status_15 == HEAD_REQUESTED) {
 		xd->status_15 = HEAD_REPLY_RECEIVED;
-		close(source);/*Is this required?*/
+		close(source);/* Is this required? */
 		g_free(xd->txbuf);
 		xd->txbuf = NULL;
-		if (purple_proxy_connect(NULL, account, xd->host, xd->port, yahoo_xfer_connected_15, xfer) == NULL)
+		if (purple_proxy_connect(gc, account, xd->host, xd->port, yahoo_xfer_connected_15, xfer) == NULL)
 		{
 			purple_notify_error(gc, NULL, _("File Transfer Failed"),
 				_("Unable to establish file descriptor."));
@@ -1151,7 +1188,7 @@ static void yahoo_xfer_send_cb_15(gpointer data, gint source, PurpleInputConditi
 	xd->txbuf_written = 0;
 
 	if(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE && xd->status_15 == STARTED)
-	{	
+	{
 		xd->status_15 = HEAD_REQUESTED;
 		xd->tx_handler = purple_input_add(source, PURPLE_INPUT_READ, yahoo_xfer_recv_cb_15, xfer);
 		yahoo_xfer_recv_cb_15(xfer, source, PURPLE_INPUT_READ);
@@ -1162,27 +1199,39 @@ static void yahoo_xfer_send_cb_15(gpointer data, gint source, PurpleInputConditi
 		xfer->fd = source;
 		purple_xfer_start(xfer, source, NULL, 0);
 	}
-	else if(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && xd->status_15 == ACCEPTED)
+	else if(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && (xd->status_15 == ACCEPTED || xd->status_15 == P2P_GET_REQUESTED) )
 	{
 		xd->status_15 = TRANSFER_PHASE;
 		xfer->fd = source;
+		/* Remove Read event */
+		purple_input_remove(xd->input_event);
+		xd->input_event = 0;
 		purple_xfer_start(xfer, source, NULL, 0);
 	}
+	else if(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && xd->status_15 == P2P_HEAD_REQUESTED)
+	{
+		xd->status_15 = P2P_HEAD_REPLIED;
+		/* Remove Read event and close descriptor */
+		purple_input_remove(xd->input_event);
+		xd->input_event = 0;
+		close(source);
+		xfer->fd = -1;
+		/* start local server, listen for connections */
+		purple_network_listen(xd->yahoo_local_p2p_ft_server_port, SOCK_STREAM, yahoo_p2p_ft_server_listen_cb, xfer);
+	}
 	else
 	{
 		purple_debug_error("yahoo", "Unrecognized yahoo file transfer mode and stage (ymsg15):%d,%d\n", purple_xfer_get_type(xfer), xd->status_15);
 		return;
 	}
-
 }
 
-
 static void yahoo_xfer_connected_15(gpointer data, gint source, const gchar *error_message)
 {
 	PurpleXfer *xfer;
 	struct yahoo_xfer_data *xd;
 	PurpleAccount *account;
-	struct yahoo_data* yd;
+	YahooData* yd;
 
 	if (!(xfer = data))
 		return;
@@ -1203,31 +1252,90 @@ static void yahoo_xfer_connected_15(gpointer data, gint source, const gchar *err
 		cookies = yahoo_get_cookies(xd->gc);
 		if(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && xd->status_15 == ACCEPTED)
 		{
-			xd->txbuf = g_strdup_printf("POST /relay?token=%s&sender=%s&recver=%s HTTP/1.1\r\nCookie:%s\r\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\nHost: %s\r\nContent-Length: %ld\r\nCache-Control: no-cache\r\n\r\n",
+			if(xd->info_val_249 == 2)
+				{
+				/* sending file via p2p, we are connected as client */
+				xd->txbuf = g_strdup_printf("POST /%s HTTP/1.1\r\n"
+						"User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
+						"Host: %s\r\n"
+						"Content-Length: %ld\r\n"
+						"Cache-Control: no-cache\r\n\r\n",
+										xd->path,
+										xd->host,
+										(long int)xfer->size);	/* to do, add Referer */
+				}
+			else
+				{
+				/* sending file via relaying */
+				xd->txbuf = g_strdup_printf("POST /relay?token=%s&sender=%s&recver=%s HTTP/1.1\r\n"
+						"Cookie:%s\r\n"
+						"User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
+						"Host: %s\r\n"
+						"Content-Length: %ld\r\n"
+						"Cache-Control: no-cache\r\n\r\n",
 										purple_url_encode(xd->xfer_idstring_for_relay),
 										purple_normalize(account, purple_account_get_username(account)),
 										xfer->who,
 										cookies,
 										xd->host,
 										(long int)xfer->size);
+				}
 		}
 		else if(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE && xd->status_15 == STARTED)
-		{	
-			xd->txbuf = g_strdup_printf("HEAD /relay?token=%s&sender=%s&recver=%s HTTP/1.1\r\nAccept:*/*\r\nCookie:%s\r\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\nHost:%s\r\nContent-Length: 0\r\nCache-Control: no-cache\r\n\r\n",
+		{
+			if(xd->info_val_249 == 1)
+				{
+				/* receiving file via p2p, connected as client */
+				xd->txbuf = g_strdup_printf("HEAD /%s HTTP/1.1\r\n"
+						"Accept: */*\r\n"
+						"User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
+						"Host: %s\r\n"
+						"Content-Length: 0\r\n"
+						"Cache-Control: no-cache\r\n\r\n",
+						xd->path,xd->host);
+			}
+			else
+				{
+				/* receiving file via relaying */
+				xd->txbuf = g_strdup_printf("HEAD /relay?token=%s&sender=%s&recver=%s HTTP/1.1\r\n"
+						"Accept: */*\r\n"
+						"Cookie: %s\r\n"
+						"User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
+						"Host: %s\r\n"
+						"Content-Length: 0\r\n"
+						"Cache-Control: no-cache\r\n\r\n",
 										purple_url_encode(xd->xfer_idstring_for_relay),
 										purple_normalize(account, purple_account_get_username(account)),
 										xfer->who,
 										cookies,
 										xd->host);
+			}
 		}
 		else if(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE && xd->status_15 == HEAD_REPLY_RECEIVED)
 		{
-			xd->txbuf = g_strdup_printf("GET /relay?token=%s&sender=%s&recver=%s HTTP/1.1\r\nCookie:%s\r\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\nHost:%s\r\nConnection: Keep-Alive\r\n\r\n",
+			if(xd->info_val_249 == 1)
+				{
+				/* receiving file via p2p, connected as client */
+				xd->txbuf = g_strdup_printf("GET /%s HTTP/1.1\r\n"
+						"User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
+						"Host: %s\r\n"
+						"Connection: Keep-Alive\r\n\r\n",
+						xd->path, xd->host);
+			}
+			else
+				{
+				/* receiving file via relaying */
+				xd->txbuf = g_strdup_printf("GET /relay?token=%s&sender=%s&recver=%s HTTP/1.1\r\n"
+						"Cookie: %s\r\n"
+						"User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
+						"Host: %s\r\n"
+						"Connection: Keep-Alive\r\n\r\n",
 										purple_url_encode(xd->xfer_idstring_for_relay),
 										purple_normalize(account, purple_account_get_username(account)),
 										xfer->who,
 										cookies,
 										xd->host);
+			}
 		}
 		else
 		{
@@ -1248,6 +1356,231 @@ static void yahoo_xfer_connected_15(gpointer data, gint source, const gchar *err
 	}
 }
 
+static void yahoo_p2p_ft_POST_cb(gpointer data, gint source, PurpleInputCondition cond)
+{
+	PurpleXfer *xfer;
+	struct yahoo_xfer_data *xd;
+
+	xfer = data;
+	if (!(xd = xfer->data))	{
+		purple_input_remove(xd->input_event);
+		purple_xfer_cancel_remote(xfer);
+		return;
+	}
+
+	purple_input_remove(xd->input_event);
+	xd->status_15 = TRANSFER_PHASE;
+	xfer->fd = source;
+	purple_xfer_start(xfer, source, NULL, 0);
+}
+
+static void yahoo_p2p_ft_HEAD_GET_cb(gpointer data, gint source, PurpleInputCondition cond)
+{
+	PurpleXfer *xfer;
+	struct yahoo_xfer_data *xd;
+	guchar buf[1024];
+	int len;
+	char *url_head;
+	char *url_get;
+	time_t unix_time;
+	char *time_str;
+
+	xfer = data;
+	if (!(xd = xfer->data))	{
+		purple_input_remove(xd->input_event);
+		purple_xfer_cancel_remote(xfer);
+		return;
+	}
+
+	len = read(source, buf, sizeof(buf));
+	if ((len < 0) && ((errno == EAGAIN) || (errno == EWOULDBLOCK)))
+		return ; /* No Worries*/
+	else if (len <= 0)	{
+		purple_debug_warning("yahoo","p2p-ft: Error in connection, or host disconnected\n");
+		purple_input_remove(xd->input_event);
+		purple_xfer_cancel_remote(xfer);
+		return;
+	}
+
+	url_head = g_strdup_printf("HEAD %s", xd->xfer_url);
+	url_get = g_strdup_printf("GET %s", xd->xfer_url);
+
+	if( strncmp(url_head, (char *)buf, strlen(url_head)) == 0 )
+		xd->status_15 = P2P_HEAD_REQUESTED;
+	else if( strncmp(url_get, (char *)buf, strlen(url_get)) == 0 )
+		xd->status_15 = P2P_GET_REQUESTED;
+	else	{
+		purple_debug_warning("yahoo","p2p-ft: Wrong HEAD/GET request from peer, disconnecting host\n");
+		purple_input_remove(xd->input_event);
+		purple_xfer_cancel_remote(xfer);
+		g_free(url_head);
+		return;
+	}
+
+	unix_time = time(NULL);
+	time_str = ctime(&unix_time);
+	strcpy(time_str + strlen(time_str) - 1, "\0");
+
+	if (xd->txbuflen == 0)	{
+		xd->txbuf = g_strdup_printf("HTTP/1.0 200 OK\r\n"
+		                            "Date: %s GMT\r\n"
+		                            "Server: Y!/1.0\r\n"
+		                            "MIME-version: 1.0\r\n"
+		                            "Last-modified: %s GMT\r\n"
+		                            "Content-length: %" G_GSIZE_FORMAT "\r\n\r\n",
+		                            time_str, time_str, xfer->size);
+		xd->txbuflen = strlen(xd->txbuf);
+		xd->txbuf_written = 0;
+	}
+
+	if (!xd->tx_handler)	{
+		xd->tx_handler = purple_input_add(source, PURPLE_INPUT_WRITE, yahoo_xfer_send_cb_15, xfer);
+		yahoo_xfer_send_cb_15(xfer, source, PURPLE_INPUT_WRITE);
+	}
+
+	g_free(url_head);
+	g_free(url_get);
+}
+
+static void yahoo_p2p_ft_server_send_connected_cb(gpointer data, gint source, PurpleInputCondition cond)
+{
+	int acceptfd;
+	PurpleXfer *xfer;
+	struct yahoo_xfer_data *xd;
+
+	xfer = data;
+	if (!(xd = xfer->data))	{
+		purple_xfer_cancel_remote(xfer);
+		return;
+	}
+
+	acceptfd = accept(source, NULL, 0);
+	if(acceptfd == -1 && (errno == EAGAIN || errno == EWOULDBLOCK))
+		return;
+	else if(acceptfd == -1) {
+		purple_debug_warning("yahoo","yahoo_p2p_server_send_connected_cb: accept: %s\n", g_strerror(errno));
+		purple_xfer_cancel_remote(xfer);
+		/* remove watcher and close p2p ft server */
+		purple_input_remove(xd->yahoo_p2p_ft_server_watcher);
+		close(xd->yahoo_local_p2p_ft_server_fd);
+		return;
+	}
+
+	/* remove watcher and close p2p ft server */
+	purple_input_remove(xd->yahoo_p2p_ft_server_watcher);
+	close(xd->yahoo_local_p2p_ft_server_fd);
+
+	/* Add an Input Read event to the file descriptor */
+	xfer->fd = acceptfd;
+	if(xfer->type == PURPLE_XFER_RECEIVE)
+		xd->input_event = purple_input_add(acceptfd, PURPLE_INPUT_READ, yahoo_p2p_ft_POST_cb, data);
+	else
+		xd->input_event = purple_input_add(acceptfd, PURPLE_INPUT_READ, yahoo_p2p_ft_HEAD_GET_cb, data);
+}
+
+static void yahoo_p2p_ft_server_listen_cb(int listenfd, gpointer data)
+{
+	PurpleXfer *xfer;
+	struct yahoo_xfer_data *xd;
+	struct yahoo_packet *pkt;
+	PurpleAccount *account;
+	YahooData *yd;
+	gchar *filename;
+	const char *local_ip;
+	gchar *url_to_send = NULL;
+	char *filename_without_spaces = NULL;
+
+	xfer = data;
+	if ( !( (xd = xfer->data) || (listenfd != -1) ) )	{
+		purple_debug_warning("yahoo","p2p: error starting server for p2p file transfer\n");
+		purple_xfer_cancel_remote(xfer);
+		return;
+	}
+
+	if( (xfer->type == PURPLE_XFER_RECEIVE) || (xd->status_15 != P2P_HEAD_REPLIED) )	{
+		yd = xd->gc->proto_data;
+		account = purple_connection_get_account(xd->gc);
+		local_ip = purple_network_get_my_ip(listenfd);
+		xd->yahoo_local_p2p_ft_server_port = purple_network_get_port_from_fd(listenfd);
+
+		filename = g_path_get_basename(purple_xfer_get_local_filename(xfer));
+		filename_without_spaces = g_strdup(filename);
+		purple_util_chrreplace(filename_without_spaces, ' ', '+');
+		xd->xfer_url = g_strdup_printf("/Messenger.%s.%d000%s?AppID=Messenger&UserID=%s&K=lc9lu2u89gz1llmplwksajkjx", xfer->who, (int)time(NULL), filename_without_spaces, xfer->who);
+		url_to_send = g_strdup_printf("http://%s:%d%s", local_ip, xd->yahoo_local_p2p_ft_server_port, xd->xfer_url);
+
+		if(xfer->type == PURPLE_XFER_RECEIVE)	{
+			xd->info_val_249 = 2;	/* 249=2: we are p2p server, and receiving file */
+			pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_ACC_15,
+				YAHOO_STATUS_AVAILABLE, yd->session_id);
+			yahoo_packet_hash(pkt, "ssssis",
+				1, purple_normalize(account, purple_account_get_username(account)),
+				5, xfer->who,
+				265, xd->xfer_peer_idstring,
+				27, xfer->filename,
+				249, 2,
+				250, url_to_send);
+		}
+		else	{
+			xd->info_val_249 = 1;	/* 249=1: we are p2p server, and sending file */
+			pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_INFO_15, YAHOO_STATUS_AVAILABLE, yd->session_id);
+			yahoo_packet_hash(pkt, "ssssis",
+				1, purple_normalize(account, purple_account_get_username(account)),
+				5, xfer->who,
+				265, xd->xfer_peer_idstring,
+				27,  filename,
+				249, 1,
+				250, url_to_send);
+		}
+
+		yahoo_packet_send_and_free(pkt, yd);
+
+		g_free(filename);
+		g_free(url_to_send);
+		g_free(filename_without_spaces);
+	}
+
+	/* Add an Input Read event to the file descriptor */
+	xd->yahoo_local_p2p_ft_server_fd = listenfd;
+	xd->yahoo_p2p_ft_server_watcher = purple_input_add(listenfd, PURPLE_INPUT_READ, yahoo_p2p_ft_server_send_connected_cb, data);
+}
+
+/* send (p2p) file transfer information */
+static void yahoo_p2p_client_send_ft_info(PurpleConnection *gc, PurpleXfer *xfer)
+{
+	struct yahoo_xfer_data *xd;
+	struct yahoo_packet *pkt;
+	PurpleAccount *account;
+	YahooData *yd;
+	gchar *filename;
+	struct yahoo_p2p_data *p2p_data;
+
+	if (!(xd = xfer->data))
+		return;
+
+	account = purple_connection_get_account(gc);
+	yd = gc->proto_data;
+
+	p2p_data = g_hash_table_lookup(yd->peers, xfer->who);
+	if( p2p_data->connection_type == YAHOO_P2P_WE_ARE_SERVER )
+		if(purple_network_listen_range(0, 0, SOCK_STREAM, yahoo_p2p_ft_server_listen_cb, xfer))
+			return;
+
+	pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_INFO_15, YAHOO_STATUS_AVAILABLE, yd->session_id);
+	filename = g_path_get_basename(purple_xfer_get_local_filename(xfer));
+
+	yahoo_packet_hash(pkt, "ssssi",
+		1, purple_normalize(account, purple_account_get_username(account)),
+		5, xfer->who,
+		265, xd->xfer_peer_idstring,
+		27,  filename,
+		249, 2);	/* 249=2: we are p2p client */
+	xd->info_val_249 = 2;
+	yahoo_packet_send_and_free(pkt, yd);
+
+	g_free(filename);
+}
+
 void yahoo_process_filetrans_15(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	char *from = NULL;
@@ -1255,17 +1588,18 @@ void yahoo_process_filetrans_15(PurpleConnection *gc, struct yahoo_packet *pkt)
 	char *imv = NULL;
 	long val_222 = 0L;
 	PurpleXfer *xfer;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	struct yahoo_xfer_data *xfer_data;
 	char *service = NULL;
 	char *filename = NULL;
 	char *xfer_peer_idstring = NULL;
+	char *utf8_filename;
 	unsigned long filesize = 0L;
 	GSList *l;
 	GSList *filename_list = NULL;
 	GSList *size_list = NULL;
 	int nooffiles = 0;
-	
+
 	yd = gc->proto_data;
 
 	for (l = pkt->hash; l; l = l->next) {
@@ -1290,17 +1624,17 @@ void yahoo_process_filetrans_15(PurpleConnection *gc, struct yahoo_packet *pkt)
 			break;
 		case 222:
 			val_222 = atol(pair->value);
-			/* 1=send, 2=cancel, 3=accept, 4=reject */ 
+			/* 1=send, 2=cancel, 3=accept, 4=reject */
 			break;
 
-		/*check for p2p and imviron .... not sure it comes by this service packet. Since it was bundled with filexfer in old ymsg version, still keeping it.*/
+		/* check for p2p and imviron .... not sure it comes by this service packet. Since it was bundled with filexfer in old ymsg version, still keeping it. */
 		case 49:
 			service = pair->value;
 			break;
 		case 63:
 			imv = pair->value;
 			break;
-		/*end check*/
+		/* end check */
 
 		}
 	}
@@ -1328,6 +1662,14 @@ void yahoo_process_filetrans_15(PurpleConnection *gc, struct yahoo_packet *pkt)
 		*	so, purple dnsquery is used... but retries, trying with next ip
 		*	address etc. is not implemented..TODO
 		*/
+
+		/* To send through p2p */
+		if( g_hash_table_lookup(yd->peers, from) )	{
+			/* send p2p file transfer information */
+			yahoo_p2p_client_send_ft_info(gc, xfer);
+			return;
+		}
+
 		if (yd->jp)
 		{
 			purple_dnsquery_a(YAHOOJP_XFER_RELAY_HOST, YAHOOJP_XFER_RELAY_PORT,
@@ -1341,7 +1683,7 @@ void yahoo_process_filetrans_15(PurpleConnection *gc, struct yahoo_packet *pkt)
 		return;
 	}
 
-	/*processing for p2p and imviron .... not sure it comes by this service packet. Since it was bundled with filexfer in old ymsg version, still keeping it.*/
+	/* processing for p2p and imviron .... not sure it comes by this service packet. Since it was bundled with filexfer in old ymsg version, still keeping it. */
 	/*
 	* The remote user has changed their IMVironment.  We
 	* record it for later use.
@@ -1350,14 +1692,14 @@ void yahoo_process_filetrans_15(PurpleConnection *gc, struct yahoo_packet *pkt)
 		g_hash_table_replace(yd->imvironments, g_strdup(from), g_strdup(imv));
 		return;
 	}
-	
+
 	if (pkt->service == YAHOO_SERVICE_P2PFILEXFER) {
 		if (service && (strcmp("FILEXFER", service) != 0)) {
 			purple_debug_misc("yahoo", "unhandled service 0x%02x\n", pkt->service);
 			return;
 		}
 	}
-	/*end processing*/
+	/* end processing */
 
 	if(!filename_list)
 		return;
@@ -1375,45 +1717,47 @@ void yahoo_process_filetrans_15(PurpleConnection *gc, struct yahoo_packet *pkt)
 	xfer_data->xfer_peer_idstring = g_strdup(xfer_peer_idstring);
 	xfer_data->filename_list = filename_list;
 	xfer_data->size_list = size_list;
-	
+
 	/* Build the file transfer handle. */
 	xfer = purple_xfer_new(gc->account, PURPLE_XFER_RECEIVE, from);
+	if (xfer == NULL)
+	{
+		g_free(xfer_data);
+		g_return_if_reached();
+	}
+
 	xfer->message = NULL;
 
-	if (xfer)
-	{
-		/* Set the info about the incoming file. */
-		char *utf8_filename = yahoo_string_decode(gc, filename, TRUE);
-		purple_xfer_set_filename(xfer, utf8_filename);
-		g_free(utf8_filename);
-		purple_xfer_set_size(xfer, filesize);
-
-		xfer->data = xfer_data;
-
-
-		/* Setup our I/O op functions */
-		purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init_15);
-		purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
-		purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
-		purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
-		purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
-		purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
-		purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
-		purple_xfer_set_request_denied_fnc(xfer,yahoo_xfer_cancel_recv);
-
-		g_hash_table_insert(yd->xfer_peer_idstring_map,
-							xfer_data->xfer_peer_idstring,
-							xfer);
-		
-		if(nooffiles > 1) {
-			gchar* message;
-			message = g_strdup_printf(_("%s is trying to send you a group of %d files.\n"), xfer->who, nooffiles);
-			purple_xfer_conversation_write(xfer, message, FALSE);
-			g_free(message);
-		}
-		/* Now perform the request */
-		purple_xfer_request(xfer);
+	/* Set the info about the incoming file. */
+	utf8_filename = yahoo_string_decode(gc, filename, TRUE);
+	purple_xfer_set_filename(xfer, utf8_filename);
+	g_free(utf8_filename);
+	purple_xfer_set_size(xfer, filesize);
+
+	xfer->data = xfer_data;
+
+	/* Setup our I/O op functions */
+	purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init_15);
+	purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
+	purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
+	purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
+	purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
+	purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
+	purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
+	purple_xfer_set_request_denied_fnc(xfer,yahoo_xfer_cancel_recv);
+
+	g_hash_table_insert(yd->xfer_peer_idstring_map,
+						xfer_data->xfer_peer_idstring,
+						xfer);
+
+	if(nooffiles > 1) {
+		gchar* message;
+		message = g_strdup_printf(_("%s is trying to send you a group of %d files.\n"), xfer->who, nooffiles);
+		purple_xfer_conversation_write(xfer, message, FALSE);
+		g_free(message);
 	}
+	/* Now perform the request */
+	purple_xfer_request(xfer);
 }
 
 void yahoo_process_filetrans_info_15(PurpleConnection *gc, struct yahoo_packet *pkt)
@@ -1424,7 +1768,7 @@ void yahoo_process_filetrans_info_15(PurpleConnection *gc, struct yahoo_packet *
 	long val_249 = 0;
 	long val_66 = 0;
 	PurpleXfer *xfer;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	struct yahoo_xfer_data *xfer_data;
 	char *filename = NULL;
 	char *xfer_peer_idstring = NULL;
@@ -1432,6 +1776,7 @@ void yahoo_process_filetrans_info_15(PurpleConnection *gc, struct yahoo_packet *
 	GSList *l;
 	struct yahoo_packet *pkt_to_send;
 	PurpleAccount *account;
+	struct yahoo_p2p_data *p2p_data;
 
 	yd = gc->proto_data;
 
@@ -1455,13 +1800,8 @@ void yahoo_process_filetrans_info_15(PurpleConnection *gc, struct yahoo_packet *
 			val_66 = strtol(pair->value, NULL, 10);
 			break;
 		case 249:
-			val_249 = strtol(pair->value, NULL, 10); /*
-					* really pissed off with this- i hv seen 2 occurences of this
-					* being 1(its normally 3) - and in those cases, the url
-					* format and corresponding processing seems to be different
-					* (i havent tested - couldnt reproduce a 1), although i 
-					* guess its easier.
-					*/
+			val_249 = strtol(pair->value, NULL, 10);
+			/* 249 has value 1 or 2 when doing p2p transfer and value 3 when relaying through yahoo server */
 			break;
 		case 250:
 			url = pair->value;
@@ -1489,45 +1829,59 @@ void yahoo_process_filetrans_info_15(PurpleConnection *gc, struct yahoo_packet *
 
 	xfer_data->info_val_249 = val_249;
 	xfer_data->xfer_idstring_for_relay = g_strdup(xfer_idstring_for_relay);
-	if (!purple_url_parse(url, &(xfer_data->host), &(xfer_data->port), &(xfer_data->path), NULL, NULL)) {
-		purple_xfer_cancel_remote(xfer);
-		return;
-	}
+	if(val_249 == 1 || val_249 == 3)	{
+		if (!purple_url_parse(url, &(xfer_data->host), &(xfer_data->port), &(xfer_data->path), NULL, NULL)) {
+			purple_xfer_cancel_remote(xfer);
+			return;
+		}
 
-	account = purple_connection_get_account(xfer_data->gc);
+		account = purple_connection_get_account(xfer_data->gc);
 
-	pkt_to_send = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_ACC_15,
-		YAHOO_STATUS_AVAILABLE, yd->session_id);
+		pkt_to_send = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_ACC_15,
+			YAHOO_STATUS_AVAILABLE, yd->session_id);
+		yahoo_packet_hash(pkt_to_send, "ssssis",
+			1, purple_normalize(account, purple_account_get_username(account)),
+			5, xfer->who,
+			265, xfer_data->xfer_peer_idstring,
+			27, xfer->filename,
+			249, xfer_data->info_val_249,
+			251, xfer_data->xfer_idstring_for_relay);
 
-	yahoo_packet_hash(pkt_to_send, "ssssisi",
-		1, purple_normalize(account, purple_account_get_username(account)),
-		5, xfer->who,
-		265, xfer_data->xfer_peer_idstring,
-		27, xfer->filename,
-		249, xfer_data->info_val_249,
-		251, xfer_data->xfer_idstring_for_relay,
-		222, 3);
-
-	yahoo_packet_send_and_free(pkt_to_send, yd);
-	if (purple_proxy_connect(NULL, account, xfer_data->host, xfer_data->port,
-		yahoo_xfer_connected_15, xfer) == NULL) {
-		purple_notify_error(gc, NULL, _("File Transfer Failed"),
-			_("Unable to establish file descriptor."));
-		purple_xfer_cancel_remote(xfer);
-		}
+		yahoo_packet_send_and_free(pkt_to_send, yd);
 
+		if (purple_proxy_connect(gc, account, xfer_data->host, xfer_data->port,
+			yahoo_xfer_connected_15, xfer) == NULL) {
+			purple_notify_error(gc, NULL, _("File Transfer Failed"),
+				_("Unable to establish file descriptor."));
+			purple_xfer_cancel_remote(xfer);
+		}
+	}
+	else if(val_249 == 2)	{
+		p2p_data = g_hash_table_lookup(yd->peers, xfer->who);
+		if( !( p2p_data && (p2p_data->connection_type == YAHOO_P2P_WE_ARE_SERVER) ) )	{
+			purple_xfer_cancel_remote(xfer);
+			return;
+		}
+		if(!purple_network_listen_range(0, 0, SOCK_STREAM, yahoo_p2p_ft_server_listen_cb, xfer)) {
+			purple_xfer_cancel_remote(xfer);
+			return;
+		}
+	}
 }
-/*TODO: Check filename etc. No probs till some hacker comes in the way*/
+
+/* TODO: Check filename etc. No probs till some hacker comes in the way */
 void yahoo_process_filetrans_acc_15(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	gchar *xfer_peer_idstring = NULL;
 	gchar *xfer_idstring_for_relay = NULL;
 	PurpleXfer *xfer;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	struct yahoo_xfer_data *xfer_data;
 	GSList *l;
 	PurpleAccount *account;
 	long val_66 = 0;
+	gchar *url = NULL;
+	int val_249 = 0;
 
 	yd = gc->proto_data;
 	for (l = pkt->hash; l; l = l->next) {
@@ -1542,24 +1896,40 @@ void yahoo_process_filetrans_acc_15(PurpleConnection *gc, struct yahoo_packet *p
 			break;
 		case 66:
 			val_66 = atol(pair->value);
+			break;
+		case 249:
+			val_249 = atol(pair->value);
+			break;
+		case 250:
+			url = pair->value;	/* we get a p2p url here when sending file, connected as client */
+			break;
 		}
 	}
 
 	xfer = g_hash_table_lookup(yd->xfer_peer_idstring_map, xfer_peer_idstring);
 	if(!xfer) return;
 
-	if(val_66 == -1 || !(xfer_idstring_for_relay))
+	if(val_66 == -1 || ( (!(xfer_idstring_for_relay)) && (val_249 != 2) ))
+	{
+		purple_xfer_cancel_remote(xfer);
+		return;
+	}
+
+	if( (val_249 == 2) && (!(url)) )
 	{
 		purple_xfer_cancel_remote(xfer);
 		return;
 	}
 
 	xfer_data = xfer->data;
+	if(url)
+		purple_url_parse(url, &(xfer_data->host), &(xfer_data->port), &(xfer_data->path), NULL, NULL);
+
 	xfer_data->xfer_idstring_for_relay = g_strdup(xfer_idstring_for_relay);
 	xfer_data->status_15 = ACCEPTED;
 	account = purple_connection_get_account(gc);
 
-	if (purple_proxy_connect(NULL, account, xfer_data->host, xfer_data->port,
+	if (purple_proxy_connect(gc, account, xfer_data->host, xfer_data->port,
 		yahoo_xfer_connected_15, xfer) == NULL)
 	{
 		purple_notify_error(gc, NULL, _("File Transfer Failed"),_("Unable to connect"));
diff --git a/libpurple/protocols/yahoo/yahoo_friend.c b/libpurple/protocols/yahoo/yahoo_friend.c
index d0e348da52..342502c9dd 100644
--- a/libpurple/protocols/yahoo/yahoo_friend.c
+++ b/libpurple/protocols/yahoo/yahoo_friend.c
@@ -27,6 +27,7 @@
 #include "debug.h"
 
 #include "yahoo_friend.h"
+#include "yahoo_aliases.h"
 
 static YahooFriend *yahoo_friend_new(void)
 {
@@ -41,7 +42,7 @@ static YahooFriend *yahoo_friend_new(void)
 
 YahooFriend *yahoo_friend_find(PurpleConnection *gc, const char *name)
 {
-	struct yahoo_data *yd;
+	YahooData *yd;
 	const char *norm;
 
 	g_return_val_if_fail(gc != NULL, NULL);
@@ -56,7 +57,7 @@ YahooFriend *yahoo_friend_find(PurpleConnection *gc, const char *name)
 YahooFriend *yahoo_friend_find_or_new(PurpleConnection *gc, const char *name)
 {
 	YahooFriend *f;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	const char *norm;
 
 	g_return_val_if_fail(gc != NULL, NULL);
@@ -124,13 +125,13 @@ gboolean yahoo_friend_get_buddy_icon_need_request(YahooFriend *f)
 
 void yahoo_friend_set_alias_id(YahooFriend *f, const char *alias_id)
 {
-	g_free(f->alias_id);
-	f->alias_id = g_strdup(alias_id);
+	g_free(f->ypd.id);
+	f->ypd.id = g_strdup(alias_id);
 }
 
 const char *yahoo_friend_get_alias_id(YahooFriend *f)
 {
-	return f->alias_id;
+	return f->ypd.id;
 }
 
 void yahoo_friend_free(gpointer p)
@@ -139,7 +140,7 @@ void yahoo_friend_free(gpointer p)
 	g_free(f->msg);
 	g_free(f->game);
 	g_free(f->ip);
-	g_free(f->alias_id);
+	yahoo_personal_details_reset(&f->ypd, TRUE);
 	g_free(f);
 }
 
@@ -147,19 +148,26 @@ void yahoo_process_presence(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	GSList *l = pkt->hash;
 	YahooFriend *f;
+	char *temp = NULL;
 	char *who = NULL;
 	int value = 0;
+	int protocol = 0;
+	gboolean msn = FALSE;
 
 	while (l) {
 		struct yahoo_pair *pair = l->data;
 
 		switch (pair->key) {
 			case 7:
-				who = pair->value;
+				temp = pair->value;
 				break;
 			case 31:
 				value = strtol(pair->value, NULL, 10);
 				break;
+			case 241:
+				protocol = strtol(pair->value, NULL, 10);
+				msn = TRUE;
+				break;
 		}
 
 		l = l->next;
@@ -170,11 +178,18 @@ void yahoo_process_presence(PurpleConnection *gc, struct yahoo_packet *pkt)
 		return;
 	}
 
+	if(msn)
+		who = g_strconcat("msn/", temp, NULL);
+	else
+		who = g_strdup(temp);
+
 	g_return_if_fail(who != NULL);
 
 	f = yahoo_friend_find(gc, who);
-	if (!f)
+	if (!f)	{
+		g_free(who);
 		return;
+	}
 
 	if (pkt->service == YAHOO_SERVICE_PRESENCE_PERM) {
 		purple_debug_info("yahoo", "Setting permanent presence for %s to %d.\n", who, (value == 1));
@@ -194,16 +209,18 @@ void yahoo_process_presence(PurpleConnection *gc, struct yahoo_packet *pkt)
 		else
 			f->presence = YAHOO_PRESENCE_DEFAULT;
 	}
+	g_free(who);
 }
 
 void yahoo_friend_update_presence(PurpleConnection *gc, const char *name,
 		YahooPresenceVisibility presence)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt = NULL;
 	YahooFriend *f;
 	const char *thirtyone, *thirteen;
 	int service = -1;
+	const char *temp = NULL;
 
 	if (!yd->logged_in)
 		return;
@@ -212,6 +229,11 @@ void yahoo_friend_update_presence(PurpleConnection *gc, const char *name,
 	if (!f)
 		return;
 
+	if(f->protocol == 2)
+		temp = name+4;
+	else
+		temp = name;
+
 	/* No need to change the value if it is already correct */
 	if (f->presence == presence) {
 		purple_debug_info("yahoo", "Not setting presence because there are no changes.\n");
@@ -236,12 +258,21 @@ void yahoo_friend_update_presence(PurpleConnection *gc, const char *name,
 		if (f->presence == YAHOO_PRESENCE_PERM_OFFLINE) {
 			pkt = yahoo_packet_new(YAHOO_SERVICE_PRESENCE_PERM,
 					YAHOO_STATUS_AVAILABLE, yd->session_id);
-			yahoo_packet_hash(pkt, "ssssssss",
+			if(f->protocol)
+				yahoo_packet_hash(pkt, "ssssssiss",
+					1, purple_connection_get_display_name(gc),
+					31, "2", 13, "2",
+					302, "319", 300, "319",
+					7, temp, 241, f->protocol,
+					301, "319", 303, "319");
+			else
+				yahoo_packet_hash(pkt, "ssssssss",
 					1, purple_connection_get_display_name(gc),
 					31, "2", 13, "2",
 					302, "319", 300, "319",
-					7, name,
+					7, temp,
 					301, "319", 303, "319");
+
 			yahoo_packet_send_and_free(pkt, yd);
 		}
 
@@ -254,13 +285,31 @@ void yahoo_friend_update_presence(PurpleConnection *gc, const char *name,
 		pkt = yahoo_packet_new(service,
 				YAHOO_STATUS_AVAILABLE, yd->session_id);
 
-		yahoo_packet_hash(pkt, "ssssssss",
+		if(f->protocol)
+			yahoo_packet_hash(pkt, "ssssssiss",
+				1, purple_connection_get_display_name(gc),
+				31, thirtyone, 13, thirteen,
+				302, "319", 300, "319",
+				7, temp, 241, f->protocol,
+				301, "319", 303, "319");
+		else
+			yahoo_packet_hash(pkt, "ssssssss",
 				1, purple_connection_get_display_name(gc),
 				31, thirtyone, 13, thirteen,
 				302, "319", 300, "319",
-				7, name,
+				7, temp,
 				301, "319", 303, "319");
 
 		yahoo_packet_send_and_free(pkt, yd);
 	}
 }
+
+void yahoo_friend_set_p2p_status(YahooFriend *f, YahooP2PStatus p2p_status)
+{
+	f->p2p_status = p2p_status;
+}
+
+YahooP2PStatus yahoo_friend_get_p2p_status(YahooFriend *f)
+{
+	return f->p2p_status;
+}
diff --git a/libpurple/protocols/yahoo/yahoo_friend.h b/libpurple/protocols/yahoo/yahoo_friend.h
index 6aa103f682..d2642e3a85 100644
--- a/libpurple/protocols/yahoo/yahoo_friend.h
+++ b/libpurple/protocols/yahoo/yahoo_friend.h
@@ -25,7 +25,7 @@
 #ifndef _YAHOO_FRIEND_H_
 #define _YAHOO_FRIEND_H_
 
-#include "yahoo.h"
+#include "libymsg.h"
 #include "yahoo_packet.h"
 
 typedef enum {
@@ -34,6 +34,13 @@ typedef enum {
 	YAHOO_PRESENCE_PERM_OFFLINE
 } YahooPresenceVisibility;
 
+typedef enum {
+	YAHOO_P2PSTATUS_NOT_CONNECTED = 0,
+	YAHOO_P2PSTATUS_DO_NOT_CONNECT,
+	YAHOO_P2PSTATUS_WE_ARE_SERVER,
+	YAHOO_P2PSTATUS_WE_ARE_CLIENT
+} YahooP2PStatus;
+
 /* these are called friends instead of buddies mainly so I can use variables
  * named f and not confuse them with variables named b
  */
@@ -49,7 +56,10 @@ typedef struct _YahooFriend {
 	YahooPresenceVisibility presence;
 	int protocol; /* 1=LCS, 2=MSN*/
 	long int version_id;
-	gchar *alias_id;
+	YahooPersonalDetails ypd;
+	YahooP2PStatus p2p_status;
+	gboolean p2p_packet_sent;	/* 0:not sent, 1=sent */
+	gint session_id;	/* session id of friend */
 } YahooFriend;
 
 YahooFriend *yahoo_friend_find(PurpleConnection *gc, const char *name);
@@ -76,4 +86,7 @@ void yahoo_process_presence(PurpleConnection *gc, struct yahoo_packet *pkt);
 void yahoo_friend_update_presence(PurpleConnection *gc, const char *name,
 		YahooPresenceVisibility presence);
 
+void yahoo_friend_set_p2p_status(YahooFriend *f, YahooP2PStatus p2p_status);
+YahooP2PStatus yahoo_friend_get_p2p_status(YahooFriend *f);
+
 #endif /* _YAHOO_FRIEND_H_ */
diff --git a/libpurple/protocols/yahoo/yahoo_packet.c b/libpurple/protocols/yahoo/yahoo_packet.c
index c1226a4c44..f029575782 100644
--- a/libpurple/protocols/yahoo/yahoo_packet.c
+++ b/libpurple/protocols/yahoo/yahoo_packet.c
@@ -24,7 +24,7 @@
 #include "internal.h"
 #include "debug.h"
 
-#include "yahoo.h"
+#include "libymsg.h"
 #include "yahoo_packet.h"
 
 struct yahoo_packet *yahoo_packet_new(enum yahoo_service service, enum yahoo_status status, int id)
@@ -187,20 +187,19 @@ void yahoo_packet_read(struct yahoo_packet *pkt, const guchar *data, int len)
 			pos = x;
 			pkt->hash = g_slist_prepend(pkt->hash, pair);
 
-#ifdef DEBUG
-			{
+			if (purple_debug_is_verbose() || g_getenv("PURPLE_YAHOO_DEBUG")) {
 				char *esc;
 				esc = g_strescape(pair->value, NULL);
-				purple_debug(PURPLE_DEBUG_MISC, "yahoo",
-						   "Key: %d  \tValue: %s\n", pair->key, esc);
+				purple_debug_misc("yahoo", "Key: %d  \tValue: %s\n", pair->key, esc);
 				g_free(esc);
 			}
-#endif
 		} else {
 			g_free(pair);
 		}
 		pos += 2;
 
+		if (pos + 1 > len) break;
+
 		/* Skip over garbage we've noticed in the mail notifications */
 		if (data[0] == '9' && data[pos] == 0x01)
 			pos++;
@@ -251,42 +250,42 @@ void yahoo_packet_dump(guchar *data, int len)
 #ifdef YAHOO_DEBUG
 	int i;
 
-	purple_debug(PURPLE_DEBUG_MISC, "yahoo", "");
+	purple_debug_misc("yahoo", "");
 
 	for (i = 0; i + 1 < len; i += 2) {
 		if ((i % 16 == 0) && i) {
-			purple_debug(PURPLE_DEBUG_MISC, NULL, "\n");
-			purple_debug(PURPLE_DEBUG_MISC, "yahoo", "");
+			purple_debug_misc(NULL, "\n");
+			purple_debug_misc("yahoo", "");
 		}
 
-		purple_debug(PURPLE_DEBUG_MISC, NULL, "%02x%02x ", data[i], data[i + 1]);
+		purple_debug_misc(NULL, "%02x%02x ", data[i], data[i + 1]);
 	}
 	if (i < len)
-		purple_debug(PURPLE_DEBUG_MISC, NULL, "%02x", data[i]);
+		purple_debug_misc(NULL, "%02x", data[i]);
 
-	purple_debug(PURPLE_DEBUG_MISC, NULL, "\n");
-	purple_debug(PURPLE_DEBUG_MISC, "yahoo", "");
+	purple_debug_misc(NULL, "\n");
+	purple_debug_misc("yahoo", "");
 
 	for (i = 0; i < len; i++) {
 		if ((i % 16 == 0) && i) {
-			purple_debug(PURPLE_DEBUG_MISC, NULL, "\n");
-			purple_debug(PURPLE_DEBUG_MISC, "yahoo", "");
+			purple_debug_misc(NULL, "\n");
+			purple_debug_misc("yahoo", "");
 		}
 
 		if (g_ascii_isprint(data[i]))
-			purple_debug(PURPLE_DEBUG_MISC, NULL, "%c ", data[i]);
+			purple_debug_misc(NULL, "%c ", data[i]);
 		else
-			purple_debug(PURPLE_DEBUG_MISC, NULL, ". ");
+			purple_debug_misc(NULL, ". ");
 	}
 
-	purple_debug(PURPLE_DEBUG_MISC, NULL, "\n");
-#endif
+	purple_debug_misc(NULL, "\n");
+#endif /* YAHOO_DEBUG */
 }
 
 static void
 yahoo_packet_send_can_write(gpointer data, gint source, PurpleInputCondition cond)
 {
-	struct yahoo_data *yd = data;
+	YahooData *yd = data;
 	int ret, writelen;
 
 	writelen = purple_circ_buffer_get_max_read(yd->txbuf);
@@ -327,7 +326,7 @@ size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm,
 	if (wm)
 		pos += yahoo_put16(data + pos, YAHOO_WEBMESSENGER_PROTO_VER);
 	else if (jp)
-		pos += yahoo_put16(data + pos, YAHOO_PROTO_VER_JAPAN);		
+		pos += yahoo_put16(data + pos, YAHOO_PROTO_VER_JAPAN);
 	else
 		pos += yahoo_put16(data + pos, YAHOO_PROTO_VER);
 	pos += yahoo_put16(data + pos, 0x0000);
@@ -343,7 +342,7 @@ size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm,
 	return len;
 }
 
-int yahoo_packet_send(struct yahoo_packet *pkt, struct yahoo_data *yd)
+int yahoo_packet_send(struct yahoo_packet *pkt, YahooData *yd)
 {
 	size_t len;
 	gssize ret;
@@ -383,7 +382,7 @@ int yahoo_packet_send(struct yahoo_packet *pkt, struct yahoo_data *yd)
 	return ret;
 }
 
-int yahoo_packet_send_and_free(struct yahoo_packet *pkt, struct yahoo_data *yd)
+int yahoo_packet_send_and_free(struct yahoo_packet *pkt, YahooData *yd)
 {
 	int ret;
 
@@ -398,7 +397,7 @@ void yahoo_packet_free(struct yahoo_packet *pkt)
 		struct yahoo_pair *pair = pkt->hash->data;
 		g_free(pair->value);
 		g_free(pair);
-		pkt->hash = g_slist_remove(pkt->hash, pair);
+		pkt->hash = g_slist_delete_link(pkt->hash, pkt->hash);
 	}
 	g_free(pkt);
 }
diff --git a/libpurple/protocols/yahoo/yahoo_packet.h b/libpurple/protocols/yahoo/yahoo_packet.h
index f90a71a4be..f214351b26 100644
--- a/libpurple/protocols/yahoo/yahoo_packet.h
+++ b/libpurple/protocols/yahoo/yahoo_packet.h
@@ -98,15 +98,20 @@ enum yahoo_service { /* these are easier to see in hex */
 	YAHOO_SERVICE_AVATAR_UPDATE = 0xc7,
 	YAHOO_SERVICE_VERIFY_ID_EXISTS = 0xc8,
 	YAHOO_SERVICE_AUDIBLE = 0xd0,
+	YAHOO_SERVICE_CONTACT_DETAILS = 0xd3,
+	/* YAHOO_SERVICE_CHAT_SESSION = 0xd4,?? Reports start of chat session, gets an id from server */
 	YAHOO_SERVICE_AUTH_REQ_15 = 0xd6,
-	YAHOO_SERVICE_CHGRP_15 = 0xe7,
-	YAHOO_SERVICE_STATUS_15 = 0xf0,
-	YAHOO_SERVICE_LIST_15 = 0xf1,
 	YAHOO_SERVICE_FILETRANS_15 = 0xdc,
 	YAHOO_SERVICE_FILETRANS_INFO_15 = 0xdd,
 	YAHOO_SERVICE_FILETRANS_ACC_15 = 0xde,
+	/* photo sharing services ?? - 0xd2, 0xd7, 0xd8, 0xda */
+	YAHOO_SERVICE_CHGRP_15 = 0xe7,
+	YAHOO_SERVICE_STATUS_15 = 0xf0,
+	YAHOO_SERVICE_LIST_15 = 0xf1,
+	YAHOO_SERVICE_MESSAGE_ACK = 0xfb,
 	YAHOO_SERVICE_WEBLOGIN = 0x0226,
 	YAHOO_SERVICE_SMS_MSG = 0x02ea
+	/* YAHOO_SERVICE_DISCONNECT = 0x07d1 Server forces us to disconnect. Is sent with TCP FIN flag set */
 };
 
 struct yahoo_pair {
@@ -122,8 +127,8 @@ struct yahoo_packet {
 };
 
 #define YAHOO_WEBMESSENGER_PROTO_VER 0x0065
-#define YAHOO_PROTO_VER 0x000f
-#define YAHOO_PROTO_VER_JAPAN 0x000f
+#define YAHOO_PROTO_VER 0x0010
+#define YAHOO_PROTO_VER_JAPAN 0x0010
 
 #define YAHOO_PACKET_HDRLEN (4 + 2 + 2 + 2 + 2 + 4 + 4)
 
@@ -132,8 +137,8 @@ struct yahoo_packet *yahoo_packet_new(enum yahoo_service service,
 void yahoo_packet_hash(struct yahoo_packet *pkt, const char *fmt, ...);
 void yahoo_packet_hash_str(struct yahoo_packet *pkt, int key, const char *value);
 void yahoo_packet_hash_int(struct yahoo_packet *pkt, int key, int value);
-int yahoo_packet_send(struct yahoo_packet *pkt, struct yahoo_data *yd);
-int yahoo_packet_send_and_free(struct yahoo_packet *pkt, struct yahoo_data *yd);
+int yahoo_packet_send(struct yahoo_packet *pkt, YahooData *yd);
+int yahoo_packet_send_and_free(struct yahoo_packet *pkt, YahooData *yd);
 size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, gboolean jp,
 guchar **buf);
 void yahoo_packet_read(struct yahoo_packet *pkt, const guchar *data, int len);
diff --git a/libpurple/protocols/yahoo/yahoo_picture.c b/libpurple/protocols/yahoo/yahoo_picture.c
index 0f006fa442..eefca0686f 100644
--- a/libpurple/protocols/yahoo/yahoo_picture.c
+++ b/libpurple/protocols/yahoo/yahoo_picture.c
@@ -32,7 +32,7 @@
 #include "proxy.h"
 #include "util.h"
 
-#include "yahoo.h"
+#include "libymsg.h"
 #include "yahoo_packet.h"
 #include "yahoo_friend.h"
 #include "yahoo_picture.h"
@@ -49,7 +49,7 @@ yahoo_fetch_picture_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 		const gchar *pic_data, size_t len, const gchar *error_message)
 {
 	struct yahoo_fetch_picture_data *d;
-	struct yahoo_data *yd;
+	YahooData *yd;
 
 	d = user_data;
 	yd = d->gc->proto_data;
@@ -71,7 +71,7 @@ yahoo_fetch_picture_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 
 void yahoo_process_picture(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
-	struct yahoo_data *yd;
+	YahooData *yd;
 	GSList *l = pkt->hash;
 	char *who = NULL, *us = NULL;
 	gboolean got_icon_info = FALSE, send_icon_info = FALSE;
@@ -110,6 +110,9 @@ void yahoo_process_picture(PurpleConnection *gc, struct yahoo_packet *pkt)
 		l = l->next;
 	}
 
+	if (!who)
+		return;
+
 	if (!purple_privacy_check(purple_connection_get_account(gc), who)) {
 		purple_debug_info("yahoo", "Picture packet from %s dropped.\n", who);
 		return;
@@ -126,7 +129,7 @@ void yahoo_process_picture(PurpleConnection *gc, struct yahoo_packet *pkt)
 		gboolean use_whole_url = yahoo_account_use_http_proxy(gc);
 
 		/* FIXME: Cleanup this strtol() stuff if possible. */
-		if (b && (locksum = purple_buddy_icons_get_checksum_for_user(b)) != NULL && 
+		if (b && (locksum = purple_buddy_icons_get_checksum_for_user(b)) != NULL &&
 				(checksum == strtol(locksum, NULL, 10)))
 			return;
 
@@ -134,8 +137,9 @@ void yahoo_process_picture(PurpleConnection *gc, struct yahoo_packet *pkt)
 		data->gc = gc;
 		data->who = g_strdup(who);
 		data->checksum = checksum;
+		/* TODO: Does this need to be MSIE 5.0? */
 		url_data = purple_util_fetch_url(url, use_whole_url,
-				"Mozilla/4.0 (compatible; MSIE 5.0)", FALSE,
+				"Mozilla/4.0 (compatible; MSIE 5.5)", FALSE,
 				yahoo_fetch_picture_cb, data);
 		if (url_data != NULL) {
 			yd = gc->proto_data;
@@ -149,45 +153,6 @@ void yahoo_process_picture(PurpleConnection *gc, struct yahoo_packet *pkt)
 	}
 }
 
-void yahoo_process_picture_update(PurpleConnection *gc, struct yahoo_packet *pkt)
-{
-	GSList *l = pkt->hash;
-	char *who = NULL;
-	int icon = 0;
-
-	while (l) {
-		struct yahoo_pair *pair = l->data;
-
-		switch (pair->key) {
-		case 4:
-			who = pair->value;
-			break;
-		case 5:
-			/* us */
-			break;
-		/* NOTE: currently the server seems to only send 213; 206 was used
-		 * in older versions. Check whether it's still needed. */
-		case 206:
-		case 213:
-			icon = strtol(pair->value, NULL, 10);
-			break;
-		}
-		l = l->next;
-	}
-
-	if (who) {
-		if (icon == 2)
-			yahoo_send_picture_request(gc, who);
-		else if ((icon == 0) || (icon == 1)) {
-			YahooFriend *f;
-			purple_buddy_icons_set_for_user(gc->account, who, NULL, 0, NULL);
-			if ((f = yahoo_friend_find(gc, who)))
-				yahoo_friend_set_buddy_icon_need_request(f, TRUE);
-			purple_debug_misc("yahoo", "Setting user %s's icon to NULL.\n", who);
-		}
-	}
-}
-
 void yahoo_process_picture_checksum(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	GSList *l = pkt->hash;
@@ -227,7 +192,7 @@ void yahoo_process_picture_checksum(PurpleConnection *gc, struct yahoo_packet *p
 void yahoo_process_picture_upload(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	GSList *l = pkt->hash;
 	char *url = NULL;
 
@@ -275,7 +240,8 @@ void yahoo_process_avatar_update(PurpleConnection *gc, struct yahoo_packet *pkt)
 		case 5:
 			/* us */
 			break;
-		case 206:
+		case 206:   /* Older versions. Still needed? */
+		case 213:   /* Newer versions */
 			/*
 			 * 0 - No icon or avatar
 			 * 1 - Using an avatar
@@ -302,7 +268,7 @@ void yahoo_process_avatar_update(PurpleConnection *gc, struct yahoo_packet *pkt)
 
 void yahoo_send_picture_info(PurpleConnection *gc, const char *who)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 
 	if (!yd->picture_url) {
@@ -310,20 +276,20 @@ void yahoo_send_picture_info(PurpleConnection *gc, const char *who)
 		return;
 	}
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash(pkt, "sssssi", 1, purple_connection_get_display_name(gc),
-	                  4, purple_connection_get_display_name(gc), 5, who,
+	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, yd->session_id);
+	yahoo_packet_hash(pkt, "ssssi", 1, purple_connection_get_display_name(gc),
+	                  5, who,
 	                  13, "2", 20, yd->picture_url, 192, yd->picture_checksum);
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
 void yahoo_send_picture_request(PurpleConnection *gc, const char *who)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash_str(pkt, 4, purple_connection_get_display_name(gc)); /* me */
+	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, yd->session_id);
+	yahoo_packet_hash_str(pkt, 1, purple_connection_get_display_name(gc)); /* me */
 	yahoo_packet_hash_str(pkt, 5, who); /* the other guy */
 	yahoo_packet_hash_str(pkt, 13, "1"); /* 1 = request, 2 = reply */
 	yahoo_packet_send_and_free(pkt, yd);
@@ -331,10 +297,10 @@ void yahoo_send_picture_request(PurpleConnection *gc, const char *who)
 
 void yahoo_send_picture_checksum(PurpleConnection *gc)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE_CHECKSUM, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE_CHECKSUM, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "ssi", 1, purple_connection_get_display_name(gc),
 			  212, "1", 192, yd->picture_checksum);
 	yahoo_packet_send_and_free(pkt, yd);
@@ -342,11 +308,11 @@ void yahoo_send_picture_checksum(PurpleConnection *gc)
 
 void yahoo_send_picture_update_to_user(PurpleConnection *gc, const char *who, int type)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE_UPDATE, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash(pkt, "ssi", 1, purple_connection_get_display_name(gc), 5, who, 206, type);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_AVATAR_UPDATE, YAHOO_STATUS_AVAILABLE, yd->session_id);
+	yahoo_packet_hash(pkt, "si", 3, who, 213, type);
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
@@ -367,7 +333,7 @@ static void yahoo_send_picture_update_foreach(gpointer key, gpointer value, gpoi
 
 void yahoo_send_picture_update(PurpleConnection *gc, int type)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yspufe data;
 
 	data.gc = gc;
@@ -461,7 +427,7 @@ static void yahoo_buddy_icon_upload_connected(gpointer data, gint source, const
 	gsize pkt_buf_len;
 	PurpleConnection *gc = d->gc;
 	PurpleAccount *account;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	/* use whole URL if using HTTP Proxy */
 	gboolean use_whole_url = yahoo_account_use_http_proxy(gc);
 
@@ -495,17 +461,17 @@ static void yahoo_buddy_icon_upload_connected(gpointer data, gint source, const
 
 	/* header + packet + "29" + 0xc0 + 0x80) + pictureblob */
 
-	host = purple_account_get_string(account, "xfer_host", YAHOO_XFER_HOST);
+	host = purple_account_get_string(account, "xfer_host", yd->jp? YAHOOJP_XFER_HOST : YAHOO_XFER_HOST);
 	port = purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT);
 	tmp = g_strdup_printf("%s:%d", host, port);
 	header = g_strdup_printf("POST %s%s/notifyft HTTP/1.1\r\n"
-		"User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
+		"User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
 		"Cookie: T=%s; Y=%s\r\n"
 		"Host: %s\r\n"
 		"Content-Length: %" G_GSIZE_FORMAT "\r\n"
 		"Cache-Control: no-cache\r\n\r\n",
 		use_whole_url ? "http://" : "", use_whole_url ? tmp : "",
-		yd->cookie_t, yd->cookie_y, 
+		yd->cookie_t, yd->cookie_y,
 		tmp,
 		pkt_buf_len + 4 + d->str->len);
 	g_free(tmp);
@@ -531,7 +497,7 @@ static void yahoo_buddy_icon_upload_connected(gpointer data, gint source, const
 void yahoo_buddy_icon_upload(PurpleConnection *gc, struct yahoo_buddy_icon_upload_data *d)
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 
 	if (yd->buddy_icon_connect_data != NULL) {
 		/* Cancel any in-progress buddy icon upload */
@@ -540,8 +506,8 @@ void yahoo_buddy_icon_upload(PurpleConnection *gc, struct yahoo_buddy_icon_uploa
 	}
 
 	yd->buddy_icon_connect_data = purple_proxy_connect(NULL, account,
-			yd->jp ? purple_account_get_string(account, "xferjp_host",  YAHOOJP_XFER_HOST)
-			       : purple_account_get_string(account, "xfer_host",  YAHOO_XFER_HOST),
+			purple_account_get_string(account, "xfer_host",
+				yd->jp? YAHOOJP_XFER_HOST : YAHOO_XFER_HOST),
 			purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
 			yahoo_buddy_icon_upload_connected, d);
 
@@ -572,11 +538,11 @@ static int yahoo_buddy_icon_calculate_checksum(const guchar *data, gsize len)
 	purple_debug_misc("yahoo", "Calculated buddy icon checksum: %d\n", checksum);
 
 	return checksum;
-} 
+}
 
 void yahoo_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	PurpleAccount *account = gc->account;
 
 	if (img == NULL) {
diff --git a/libpurple/protocols/yahoo/yahoo_picture.h b/libpurple/protocols/yahoo/yahoo_picture.h
index 152f75c18c..cf030f12f3 100644
--- a/libpurple/protocols/yahoo/yahoo_picture.h
+++ b/libpurple/protocols/yahoo/yahoo_picture.h
@@ -31,7 +31,6 @@ void yahoo_send_picture_update(PurpleConnection *gc, int type);
 void yahoo_send_picture_update_to_user(PurpleConnection *gc, const char *who, int type);
 
 void yahoo_process_picture(PurpleConnection *gc, struct yahoo_packet *pkt);
-void yahoo_process_picture_update(PurpleConnection *gc, struct yahoo_packet *pkt);
 void yahoo_process_picture_checksum(PurpleConnection *gc, struct yahoo_packet *pkt);
 void yahoo_process_picture_upload(PurpleConnection *gc, struct yahoo_packet *pkt);
 
diff --git a/libpurple/protocols/yahoo/yahoo_profile.c b/libpurple/protocols/yahoo/yahoo_profile.c
index 3abd1d950d..e0f600aa07 100644
--- a/libpurple/protocols/yahoo/yahoo_profile.c
+++ b/libpurple/protocols/yahoo/yahoo_profile.c
@@ -29,9 +29,9 @@
 #include "util.h"
 #if PHOTO_SUPPORT
 #include "imgstore.h"
-#endif
+#endif /* PHOTO_SUPPORT */
 
-#include "yahoo.h"
+#include "libymsg.h"
 #include "yahoo_friend.h"
 
 typedef struct {
@@ -40,11 +40,11 @@ typedef struct {
 } YahooGetInfoData;
 
 typedef enum profile_lang_id {
-	XX, DA, DE, EL, 
-	EN, EN_GB, 
+	XX, DA, DE, EL,
+	EN, EN_GB,
 	ES_AR, ES_ES, ES_MX, ES_US,
-	FR_CA, FR_FR, 
-	IT, JA, KO, NO, PT, SV, 
+	FR_CA, FR_FR,
+	IT, JA, KO, NO, PT, SV,
 	ZH_CN, ZH_HK, ZH_TW, ZH_US, PT_BR
 } profile_lang_id_t;
 
@@ -702,7 +702,7 @@ static void yahoo_extract_user_info_text(PurpleNotifyUserInfo *user_info, YahooG
 		const char *balias = purple_buddy_get_local_buddy_alias(b);
 		if(balias && balias[0]) {
 			char *aliastext = g_markup_escape_text(balias, -1);
-			purple_notify_user_info_add_pair(user_info, _("Alias"), aliastext); 
+			purple_notify_user_info_add_pair(user_info, _("Alias"), aliastext);
 			g_free(aliastext);
 		}
 		#if 0
@@ -777,14 +777,14 @@ static void yahoo_got_info(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 	char *stripped;
 	int stripped_len;
 	char *last_updated_utf8_string = NULL;
-#endif
+#endif /* !PHOTO_SUPPORT */
 	const char *last_updated_string = NULL;
 	char *url_buffer;
 	GString *s;
 	char *tmp;
 	char *profile_url_text = NULL;
 	int lang, strid;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	const profile_strings_node_t *strings = NULL;
 	const char *title;
 	profile_state_t profile_state = PROFILE_STATE_DEFAULT;
@@ -899,7 +899,7 @@ static void yahoo_got_info(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 
 #if PHOTO_SUPPORT
 	photo_url_text = yahoo_get_photo_url(url_text, info_data->name);
-#endif
+#endif /* PHOTO_SUPPORT */
 
 	url_buffer = g_strdup(url_text);
 
@@ -956,7 +956,7 @@ yahoo_got_photo(PurpleUtilFetchUrlData *url_data, gpointer data,
 		const gchar *url_text, size_t len, const gchar *error_message)
 {
 	YahooGetInfoStepTwoData *info2_data = (YahooGetInfoStepTwoData *)data;
-	struct yahoo_data *yd;
+	YahooData *yd;
 	gboolean found = FALSE;
 	int id = -1;
 
@@ -1048,7 +1048,7 @@ yahoo_got_photo(PurpleUtilFetchUrlData *url_data, gpointer data,
 			purple_debug_info("yahoo", "%s is %" G_GSIZE_FORMAT
 					" bytes\n", photo_url_text, len);
 			id = purple_imgstore_add_with_id(g_memdup(url_text, len), len, NULL);
-			
+
 			tmp = g_strdup_printf("<img id=\"%d\"><br>", id);
 			purple_notify_user_info_add_pair(user_info, NULL, tmp);
 			g_free(tmp);
@@ -1259,12 +1259,12 @@ yahoo_got_photo(PurpleUtilFetchUrlData *url_data, gpointer data,
 	g_free(info2_data);
 	if (id != -1)
 		purple_imgstore_unref_by_id(id);
-#endif
+#endif /* PHOTO_SUPPORT */
 }
 
 void yahoo_get_info(PurpleConnection *gc, const char *name)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	YahooGetInfoData *data;
 	char *url;
 	PurpleUtilFetchUrlData *url_data;
diff --git a/libpurple/protocols/yahoo/yahoochat.c b/libpurple/protocols/yahoo/yahoochat.c
index 7abfc868e1..7453990ea5 100644
--- a/libpurple/protocols/yahoo/yahoochat.c
+++ b/libpurple/protocols/yahoo/yahoochat.c
@@ -30,7 +30,7 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include "debug.h"
 #include "privacy.h"
@@ -40,7 +40,7 @@
 #include "notify.h"
 #include "util.h"
 
-#include "yahoo.h"
+#include "libymsg.h"
 #include "yahoo_packet.h"
 #include "yahoochat.h"
 #include "ycht.h"
@@ -53,7 +53,7 @@ static void yahoo_chat_leave(PurpleConnection *gc, const char *room, const char
 /* special function to log us on to the yahoo chat service */
 static void yahoo_chat_online(PurpleConnection *gc)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 	const char *rll;
 
@@ -65,14 +65,14 @@ static void yahoo_chat_online(PurpleConnection *gc)
 	rll = purple_account_get_string(purple_connection_get_account(gc),
 								  "room_list_locale", YAHOO_ROOMLIST_LOCALE);
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATONLINE, YAHOO_STATUS_AVAILABLE,0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATONLINE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sssss",
 					  109, purple_connection_get_display_name(gc),
 					  1, purple_connection_get_display_name(gc),
 					  6, "abcde",
 					/* I'm not sure this is the correct way to set this. */
 					  98, rll,
-					  135, "ym8.1.0.415");
+					  135, yd->jp ? YAHOO_CLIENT_VERSION : YAHOOJP_CLIENT_VERSION);
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
@@ -98,7 +98,7 @@ void yahoo_chat_add_user(PurpleConvChat *chat, const char *user, const char *rea
 
 static PurpleConversation *yahoo_find_conference(PurpleConnection *gc, const char *name)
 {
-	struct yahoo_data *yd;
+	YahooData *yd;
 	GSList *l;
 
 	yd = gc->proto_data;
@@ -121,12 +121,29 @@ void yahoo_process_conference_invite(PurpleConnection *gc, struct yahoo_packet *
 	char *msg = NULL;
 	GString *members = NULL;
 	GHashTable *components;
+	PurpleConversation *c = NULL;
 
-	if (pkt->status == 2)
-		return; /* XXX */
+	if ( (pkt->status == 2) || (pkt->status == 11) )
+		return; /* Status is 11 when we are being notified about invitation being sent to someone else */
 
 	account = purple_connection_get_account(gc);
 
+	for (l = pkt->hash; l; l = l->next) {
+		struct yahoo_pair *pair = l->data;
+		if (pair->key == 57)
+		{
+			room = yahoo_string_decode(gc, pair->value, FALSE);
+			if((c = yahoo_find_conference(gc, room)))
+			{
+				/* Looks like we got invited to an already open conference. */
+				/* Laters: Should we accept this conference rather than ignoring the invitation ? */
+				purple_debug_info("yahoo","Ignoring invitation for an already existing chat, room:%s\n",room);
+				g_free(room);
+				return;
+			}
+		}
+	}
+
 	members = g_string_sized_new(512);
 
 	for (l = pkt->hash; l; l = l->next) {
@@ -143,8 +160,11 @@ void yahoo_process_conference_invite(PurpleConnection *gc, struct yahoo_packet *
 			who = pair->value;
 			g_string_append_printf(members, "%s\n", who);
 			break;
-		case 52: /* invitee (me) */
-		case 53: /* members */
+		case 51: /* This user is being invited to the conference. Comes with status = 11, so we wont reach here */
+			break;
+		case 52: /* Invited users. Assuming us invited, since we got this packet */
+			break; /* break needed, or else we add the users to the conference before they accept the invitation */
+		case 53: /* members who have already joined the conference */
 			g_string_append_printf(members, "%s\n", pair->value);
 			break;
 		case 58:
@@ -189,6 +209,8 @@ void yahoo_process_conference_decline(PurpleConnection *gc, struct yahoo_packet
 	char *room = NULL;
 	char *who = NULL;
 	char *msg = NULL;
+	PurpleConversation *c = NULL;
+	int utf8 = 0;
 
 	for (l = pkt->hash; l; l = l->next) {
 		struct yahoo_pair *pair = l->data;
@@ -205,6 +227,9 @@ void yahoo_process_conference_decline(PurpleConnection *gc, struct yahoo_packet
 			g_free(msg);
 			msg = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
+		case 97:
+			utf8 = strtol(pair->value, NULL, 10);
+			break;
 		}
 	}
 	if (!purple_privacy_check(purple_connection_get_account(gc), who))
@@ -216,17 +241,24 @@ void yahoo_process_conference_decline(PurpleConnection *gc, struct yahoo_packet
 
 	if (who && room) {
 		/* make sure we're in the room before we process a decline message for it */
-		if(yahoo_find_conference(gc, room)) {
-			char *tmp;
+		if((c = yahoo_find_conference(gc, room))) {
+			char *tmp = NULL, *msg_tmp = NULL;
+			if(msg)
+			{
+				msg_tmp = yahoo_string_decode(gc, msg, utf8);
+				msg = yahoo_codes_to_html(msg_tmp);
+				serv_got_chat_in(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(c)), who, 0, msg, time(NULL));
+				g_free(msg_tmp);
+				g_free(msg);
+			}
 
-			tmp = g_strdup_printf(_("%s declined your conference invitation to room \"%s\" because \"%s\"."),
-							who, room, msg?msg:"");
-			purple_notify_info(gc, NULL, _("Invitation Rejected"), tmp);
+			tmp = g_strdup_printf(_("%s has declined to join."), who);
+			purple_conversation_write(c, NULL, tmp, PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY, time(NULL));
+			
 			g_free(tmp);
 		}
 
 		g_free(room);
-		g_free(msg);
 	}
 }
 
@@ -254,7 +286,10 @@ void yahoo_process_conference_logon(PurpleConnection *gc, struct yahoo_packet *p
 	if (who && room) {
 		c = yahoo_find_conference(gc, room);
 		if (c)
-			yahoo_chat_add_user(PURPLE_CONV_CHAT(c), who, NULL);
+		{	/* Prevent duplicate users in the chat */
+			if( !purple_conv_chat_find_user(PURPLE_CONV_CHAT(c), who) )
+				yahoo_chat_add_user(PURPLE_CONV_CHAT(c), who, NULL);
+		}
 		g_free(room);
 	}
 }
@@ -338,7 +373,7 @@ void yahoo_process_conference_message(PurpleConnection *gc, struct yahoo_packet
 
 static void yahoo_chat_join(PurpleConnection *gc, const char *dn, const char *room, const char *topic, const char *id)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 	char *room2;
 	gboolean utf8 = TRUE;
@@ -353,7 +388,7 @@ static void yahoo_chat_join(PurpleConnection *gc, const char *dn, const char *ro
 	 * so we don't have to actually pass the flag in the packet. Or something. */
 	room2 = yahoo_string_encode(gc, room, &utf8);
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATJOIN, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATJOIN, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "ssss",
 						1, purple_connection_get_display_name(gc),
 						104, room2,
@@ -366,14 +401,14 @@ static void yahoo_chat_join(PurpleConnection *gc, const char *dn, const char *ro
 /* this is a confirmation of yahoo_chat_online(); */
 void yahoo_process_chat_online(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
-	struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data;
+	YahooData *yd = (YahooData *) gc->proto_data;
 
 	if (pkt->status == 1) {
 		yd->chat_online = TRUE;
 
 		/* We need to goto a user in chat */
 		if (yd->pending_chat_goto) {
-			struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_CHATGOTO, YAHOO_STATUS_AVAILABLE, 0);
+			struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_CHATGOTO, YAHOO_STATUS_AVAILABLE, yd->session_id);
 			yahoo_packet_hash(pkt, "sss",
 				109, yd->pending_chat_goto,
 				1, purple_connection_get_display_name(gc),
@@ -398,7 +433,7 @@ void yahoo_process_chat_online(PurpleConnection *gc, struct yahoo_packet *pkt)
 /* this is basicly the opposite of chat_online */
 void yahoo_process_chat_logout(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
-	struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data;
+	YahooData *yd = (YahooData *) gc->proto_data;
 	GSList *l;
 
 	for (l = pkt->hash; l; l = l->next) {
@@ -428,7 +463,7 @@ void yahoo_process_chat_logout(PurpleConnection *gc, struct yahoo_packet *pkt)
 void yahoo_process_chat_join(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
-	struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data;
+	YahooData *yd = (YahooData *) gc->proto_data;
 	PurpleConversation *c = NULL;
 	GSList *l;
 	GList *members = NULL;
@@ -583,7 +618,7 @@ void yahoo_process_chat_exit(PurpleConnection *gc, struct yahoo_packet *pkt)
 	char *who = NULL;
 	char *room = NULL;
 	GSList *l;
-	struct yahoo_data *yd;
+	YahooData *yd;
 
 	yd = gc->proto_data;
 
@@ -648,7 +683,7 @@ void yahoo_process_chat_message(PurpleConnection *gc, struct yahoo_packet *pkt)
 	}
 
 	if (!msg) {
-		purple_debug(PURPLE_DEBUG_MISC, "yahoo", "Got a message packet with no message.\nThis probably means something important, but we're ignoring it.\n");
+		purple_debug_misc("yahoo", "Got a message packet with no message.\nThis probably means something important, but we're ignoring it.\n");
 		return;
 	}
 	msg2 = yahoo_string_decode(gc, msg, utf8);
@@ -734,14 +769,14 @@ void yahoo_process_chat_goto(PurpleConnection *gc, struct yahoo_packet *pkt)
  * I think conference names are always ascii.
  */
 
-void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, GList *who)
+void yahoo_conf_leave(YahooData *yd, const char *room, const char *dn, GList *who)
 {
 	struct yahoo_packet *pkt;
 	GList *w;
 
 	purple_debug_misc("yahoo", "leaving conference %s\n", room);
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGOFF, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGOFF, YAHOO_STATUS_AVAILABLE, yd->session_id);
 
 	yahoo_packet_hash_str(pkt, 1, dn);
 	for (w = who; w; w = w->next) {
@@ -756,7 +791,7 @@ void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, G
 static int yahoo_conf_send(PurpleConnection *gc, const char *dn, const char *room,
 							GList *members, const char *what)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 	GList *who;
 	char *msg, *msg2;
@@ -765,7 +800,7 @@ static int yahoo_conf_send(PurpleConnection *gc, const char *dn, const char *roo
 	msg = yahoo_html_to_codes(what);
 	msg2 = yahoo_string_encode(gc, msg, &utf8);
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFMSG, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFMSG, YAHOO_STATUS_AVAILABLE, yd->session_id);
 
 	yahoo_packet_hash_str(pkt, 1, dn);
 	for (who = members; who; who = who->next) {
@@ -783,7 +818,7 @@ static int yahoo_conf_send(PurpleConnection *gc, const char *dn, const char *roo
 	return 0;
 }
 
-static void yahoo_conf_join(struct yahoo_data *yd, PurpleConversation *c, const char *dn, const char *room,
+static void yahoo_conf_join(YahooData *yd, PurpleConversation *c, const char *dn, const char *room,
 						const char *topic, const char *members)
 {
 	struct yahoo_packet *pkt;
@@ -793,7 +828,7 @@ static void yahoo_conf_join(struct yahoo_data *yd, PurpleConversation *c, const
 	if (members)
 		memarr = g_strsplit(members, "\n", 0);
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGON, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGON, YAHOO_STATUS_AVAILABLE, yd->session_id);
 
 	yahoo_packet_hash(pkt, "sss", 1, dn, 3, dn, 57, room);
 	if (memarr) {
@@ -813,7 +848,7 @@ static void yahoo_conf_join(struct yahoo_data *yd, PurpleConversation *c, const
 static void yahoo_conf_invite(PurpleConnection *gc, PurpleConversation *c,
 		const char *dn, const char *buddy, const char *room, const char *msg)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 	GList *members;
 	char *msg2 = NULL;
@@ -823,7 +858,7 @@ static void yahoo_conf_invite(PurpleConnection *gc, PurpleConversation *c,
 
 	members = purple_conv_chat_get_users(PURPLE_CONV_CHAT(c));
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFADDINVITE, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFADDINVITE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 
 	yahoo_packet_hash(pkt, "sssss", 1, dn, 51, buddy, 57, room, 58, msg?msg2:"", 13, "0");
 	for(; members; members = members->next) {
@@ -843,7 +878,7 @@ static void yahoo_conf_invite(PurpleConnection *gc, PurpleConversation *c,
 
 static void yahoo_chat_leave(PurpleConnection *gc, const char *room, const char *dn, gboolean logout)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 	PurpleConversation *c;
 
@@ -859,7 +894,7 @@ static void yahoo_chat_leave(PurpleConnection *gc, const char *room, const char
 
 	eroom = yahoo_string_encode(gc, room, &utf8);
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATEXIT, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATEXIT, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sss", 104, eroom, 109, dn, 108, "1");
 	yahoo_packet_hash_str(pkt, 112, "0"); /* what does this one mean? */
 	yahoo_packet_send_and_free(pkt, yd);
@@ -877,7 +912,7 @@ static void yahoo_chat_leave(PurpleConnection *gc, const char *room, const char
 		return;
 
 	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATLOGOUT,
-			YAHOO_STATUS_AVAILABLE, 0);
+			YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash_str(pkt, 1, dn);
 	yahoo_packet_send_and_free(pkt, yd);
 
@@ -895,7 +930,7 @@ static void yahoo_chat_leave(PurpleConnection *gc, const char *room, const char
 
 static int yahoo_chat_send(PurpleConnection *gc, const char *dn, const char *room, const char *what, PurpleMessageFlags flags)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 	int me = 0;
 	char *msg1, *msg2, *room2;
@@ -918,7 +953,7 @@ static int yahoo_chat_send(PurpleConnection *gc, const char *dn, const char *roo
 	g_free(msg2);
 	room2 = yahoo_string_encode(gc, room, NULL);
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_COMMENT, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_COMMENT, YAHOO_STATUS_AVAILABLE, yd->session_id);
 
 	yahoo_packet_hash(pkt, "sss", 1, dn, 104, room2, 117, msg1);
 	if (me)
@@ -940,7 +975,7 @@ static int yahoo_chat_send(PurpleConnection *gc, const char *dn, const char *roo
 static void yahoo_chat_invite(PurpleConnection *gc, const char *dn, const char *buddy,
 							const char *room, const char *msg)
 {
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 	char *room2, *msg2 = NULL;
 	gboolean utf8 = TRUE;
@@ -955,7 +990,7 @@ static void yahoo_chat_invite(PurpleConnection *gc, const char *dn, const char *
 	if (msg)
 		msg2 = yahoo_string_encode(gc, msg, NULL);
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATADDINVITE, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATADDINVITE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sssss", 1, dn, 118, buddy, 104, room2, 117, (msg2?msg2:""), 129, "0");
 	yahoo_packet_send_and_free(pkt, yd);
 
@@ -965,7 +1000,7 @@ static void yahoo_chat_invite(PurpleConnection *gc, const char *dn, const char *
 
 void yahoo_chat_goto(PurpleConnection *gc, const char *name)
 {
-	struct yahoo_data *yd;
+	YahooData *yd;
 	struct yahoo_packet *pkt;
 
 	yd = gc->proto_data;
@@ -989,7 +1024,7 @@ void yahoo_chat_goto(PurpleConnection *gc, const char *name)
 		return;
 	}
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATGOTO, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATGOTO, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sss", 109, name, 1, purple_connection_get_display_name(gc), 62, "2");
 	yahoo_packet_send_and_free(pkt, yd);
 }
@@ -1000,7 +1035,7 @@ void yahoo_chat_goto(PurpleConnection *gc, const char *name)
 
 void yahoo_c_leave(PurpleConnection *gc, int id)
 {
-	struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data;
+	YahooData *yd = (YahooData *) gc->proto_data;
 	PurpleConversation *c;
 
 	if (!yd)
@@ -1025,9 +1060,9 @@ int yahoo_c_send(PurpleConnection *gc, int id, const char *what, PurpleMessageFl
 {
 	PurpleConversation *c;
 	int ret;
-	struct yahoo_data *yd;
+	YahooData *yd;
 
-	yd = (struct yahoo_data *) gc->proto_data;
+	yd = (YahooData *) gc->proto_data;
 	if (!yd)
 		return -1;
 
@@ -1081,11 +1116,11 @@ char *yahoo_get_chat_name(GHashTable *data)
 
 void yahoo_c_join(PurpleConnection *gc, GHashTable *data)
 {
-	struct yahoo_data *yd;
+	YahooData *yd;
 	char *room, *topic, *type;
 	PurpleConversation *c;
 
-	yd = (struct yahoo_data *) gc->proto_data;
+	yd = (YahooData *) gc->proto_data;
 	if (!yd)
 		return;
 
@@ -1445,7 +1480,7 @@ static void yahoo_roomlist_got_connected(gpointer data, gint source, const gchar
 {
 	struct yahoo_roomlist *yrl = data;
 	PurpleRoomlist *list = yrl->list;
-	struct yahoo_data *yd = purple_account_get_connection(list->account)->proto_data;
+	YahooData *yd = purple_account_get_connection(list->account)->proto_data;
 
 	if (source < 0) {
 		purple_notify_error(purple_account_get_connection(list->account), NULL, _("Unable to connect"), _("Fetching the room list failed."));
@@ -1519,7 +1554,7 @@ PurpleRoomlist *yahoo_roomlist_get_list(PurpleConnection *gc)
 
 	purple_roomlist_set_fields(rl, fields);
 
-	if (purple_proxy_connect(NULL, account, yrl->host, 80,
+	if (purple_proxy_connect(gc, account, yrl->host, 80,
 	                       yahoo_roomlist_got_connected, yrl) == NULL)
 	{
 		purple_notify_error(gc, NULL, _("Connection problem"), _("Unable to fetch room list."));
@@ -1588,8 +1623,9 @@ void yahoo_roomlist_expand_category(PurpleRoomlist *list, PurpleRoomlistRoom *ca
 	yrl->ucat = purple_roomlist_room_new(PURPLE_ROOMLIST_ROOMTYPE_CATEGORY, _("User Rooms"), yrl->cat);
 	purple_roomlist_room_add(list, yrl->ucat);
 
-	if (purple_proxy_connect(NULL, list->account, yrl->host, 80,
-	                       yahoo_roomlist_got_connected, yrl) == NULL)
+	if (purple_proxy_connect(purple_account_get_connection(list->account),
+			list->account, yrl->host, 80,
+			yahoo_roomlist_got_connected, yrl) == NULL)
 	{
 		purple_notify_error(purple_account_get_connection(list->account),
 		                  NULL, _("Connection problem"), _("Unable to fetch room list."));
diff --git a/libpurple/protocols/yahoo/yahoochat.h b/libpurple/protocols/yahoo/yahoochat.h
index cafef8b995..061be7760f 100644
--- a/libpurple/protocols/yahoo/yahoochat.h
+++ b/libpurple/protocols/yahoo/yahoochat.h
@@ -50,7 +50,7 @@ void yahoo_c_join(PurpleConnection *gc, GHashTable *data);
 char *yahoo_get_chat_name(GHashTable *data);
 void yahoo_c_invite(PurpleConnection *gc, int id, const char *msg, const char *name);
 
-void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, GList *who);
+void yahoo_conf_leave(YahooData *yd, const char *room, const char *dn, GList *who);
 
 void yahoo_chat_goto(PurpleConnection *gc, const char *name);
 
diff --git a/libpurple/protocols/yahoo/ycht.c b/libpurple/protocols/yahoo/ycht.c
index 17722dd0e1..0668e6dab9 100644
--- a/libpurple/protocols/yahoo/ycht.c
+++ b/libpurple/protocols/yahoo/ycht.c
@@ -36,7 +36,7 @@
 #include "conversation.h"
 #include "util.h"
 
-#include "yahoo.h"
+#include "libymsg.h"
 #include "yahoo_packet.h"
 #include "ycht.h"
 #include "yahoochat.h"
@@ -55,7 +55,7 @@
 static void ycht_process_login(YchtConn *ycht, YchtPkt *pkt)
 {
 	PurpleConnection *gc = ycht->gc;
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 
 	if (ycht->logged_in)
 		return;
@@ -70,7 +70,7 @@ static void ycht_process_login(YchtConn *ycht, YchtPkt *pkt)
 static void ycht_process_logout(YchtConn *ycht, YchtPkt *pkt)
 {
 	PurpleConnection *gc = ycht->gc;
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 
 	yd->chat_online = FALSE;
 	ycht->logged_in = FALSE;
@@ -175,7 +175,7 @@ static void ycht_progress_online_friends(YchtConn *ycht, YchtPkt *pkt)
 {
 #if 0
 	PurpleConnection *gc = ycht->gc;
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 
 	if (ycht->logged_in)
 		return;
@@ -196,36 +196,36 @@ static void ycht_packet_dump(const guchar *data, int len)
 #ifdef YAHOO_YCHT_DEBUG
 	int i;
 
-	purple_debug(PURPLE_DEBUG_MISC, "yahoo", "");
+	purple_debug_misc("yahoo", "");
 
 	for (i = 0; i + 1 < len; i += 2) {
 		if ((i % 16 == 0) && i) {
-			purple_debug(PURPLE_DEBUG_MISC, NULL, "\n");
-			purple_debug(PURPLE_DEBUG_MISC, "yahoo", "");
+			purple_debug_misc(NULL, "\n");
+			purple_debug_misc("yahoo", "");
 		}
 
-		purple_debug(PURPLE_DEBUG_MISC, NULL, "%02hhx%02hhx ", data[i], data[i + 1]);
+		purple_debug_misc(NULL, "%02hhx%02hhx ", data[i], data[i + 1]);
 	}
 	if (i < len)
-		purple_debug(PURPLE_DEBUG_MISC, NULL, "%02hhx", data[i]);
+		purple_debug_misc(NULL, "%02hhx", data[i]);
 
-	purple_debug(PURPLE_DEBUG_MISC, NULL, "\n");
-	purple_debug(PURPLE_DEBUG_MISC, "yahoo", "");
+	purple_debug_misc(NULL, "\n");
+	purple_debug_misc("yahoo", "");
 
 	for (i = 0; i < len; i++) {
 		if ((i % 16 == 0) && i) {
-			purple_debug(PURPLE_DEBUG_MISC, NULL, "\n");
-			purple_debug(PURPLE_DEBUG_MISC, "yahoo", "");
+			purple_debug_misc(NULL, "\n");
+			purple_debug_misc("yahoo", "");
 		}
 
 		if (g_ascii_isprint(data[i]))
-			purple_debug(PURPLE_DEBUG_MISC, NULL, "%c ", data[i]);
+			purple_debug_misc(NULL, "%c ", data[i]);
 		else
-			purple_debug(PURPLE_DEBUG_MISC, NULL, ". ");
+			purple_debug_misc(NULL, ". ");
 	}
 
-	purple_debug(PURPLE_DEBUG_MISC, NULL, "\n");
-#endif
+	purple_debug_misc(NULL, "\n");
+#endif /* YAHOO_YCHT_DEBUG */
 }
 
 static YchtPkt *ycht_packet_new(guint version, guint service, int status)
@@ -285,9 +285,11 @@ static void ycht_packet_send_write_cb(gpointer data, gint source, PurpleInputCon
 	else if (ret <= 0) {
 		/* TODO: error handling */
 /*
+		gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
+				g_strerror(errno));
 		purple_connection_error_reason(purple_account_get_connection(irc->account),
-			      PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			      _("Server has disconnected"));
+			      PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
+		g_free(tmp);
 */
 		return;
 	}
@@ -429,7 +431,7 @@ static void ycht_packet_free(YchtPkt *pkt)
 
 void ycht_connection_close(YchtConn *ycht)
 {
-	struct yahoo_data *yd = ycht->gc->proto_data;
+	YahooData *yd = ycht->gc->proto_data;
 
 	if (yd) {
 		yd->ycht = NULL;
@@ -454,7 +456,7 @@ void ycht_connection_close(YchtConn *ycht)
 static void ycht_connection_error(YchtConn *ycht, const gchar *error)
 {
 
-	purple_notify_info(ycht->gc, NULL, _("Connection problem with the YCHT server."), error);
+	purple_notify_info(ycht->gc, NULL, _("Connection problem with the YCHT server"), error);
 	ycht_connection_close(ycht);
 }
 
@@ -473,13 +475,13 @@ static void ycht_pending(gpointer data, gint source, PurpleInputCondition cond)
 			/* No worries */
 			return;
 
-		tmp = g_strdup_printf(_("Lost connection with server\n%s"),
+		tmp = g_strdup_printf(_("Lost connection with server: %s"),
 				g_strerror(errno));
 		ycht_connection_error(ycht, tmp);
 		g_free(tmp);
 		return;
 	} else if (len == 0) {
-		ycht_connection_error(ycht, _("Server closed the connection."));
+		ycht_connection_error(ycht, _("Server closed the connection"));
 		return;
 	}
 
@@ -507,16 +509,15 @@ static void ycht_pending(gpointer data, gint source, PurpleInputCondition cond)
 		service = yahoo_get32(ycht->rxqueue + pos); pos += 4;
 		status = yahoo_get16(ycht->rxqueue + pos); pos += 2;
 		pktlen  = yahoo_get16(ycht->rxqueue + pos); pos += 2;
-		purple_debug(PURPLE_DEBUG_MISC, "yahoo",
-				   "ycht: %d bytes to read, rxlen is %d\n", pktlen, ycht->rxlen);
+		purple_debug_misc("yahoo", "ycht: %d bytes to read, rxlen is %d\n",
+				pktlen, ycht->rxlen);
 
 		if (ycht->rxlen < (YCHT_HEADER_LEN + pktlen))
 			return;
 
 		purple_debug_misc("yahoo", "--==Incoming YCHT packet==--\n");
-		purple_debug(PURPLE_DEBUG_MISC, "yahoo",
-			   "YCHT Service: 0x%02x Version: 0x%02x Status: 0x%02x\n",
-			   service, version, status);
+		purple_debug_misc("yahoo", "YCHT Service: 0x%02x Version: 0x%02x Status: 0x%02x\n",
+				service, version, status);
 		ycht_packet_dump(ycht->rxqueue, YCHT_HEADER_LEN + pktlen);
 
 		pkt = ycht_packet_new(version, service, status);
@@ -542,12 +543,12 @@ static void ycht_got_connected(gpointer data, gint source, const gchar *error_me
 {
 	YchtConn *ycht = data;
 	PurpleConnection *gc = ycht->gc;
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	YchtPkt *pkt;
 	char *buf;
 
 	if (source < 0) {
-		ycht_connection_error(ycht, _("Unable to connect."));
+		ycht_connection_error(ycht, _("Unable to connect"));
 		return;
 	}
 
@@ -569,7 +570,7 @@ static void ycht_got_connected(gpointer data, gint source, const gchar *error_me
 void ycht_connection_open(PurpleConnection *gc)
 {
 	YchtConn *ycht;
-	struct yahoo_data *yd = gc->proto_data;
+	YahooData *yd = gc->proto_data;
 	PurpleAccount *account = purple_connection_get_account(gc);
 
 	ycht = g_new0(YchtConn, 1);
@@ -578,12 +579,12 @@ void ycht_connection_open(PurpleConnection *gc)
 
 	yd->ycht = ycht;
 
-	if (purple_proxy_connect(NULL, account,
+	if (purple_proxy_connect(gc, account,
 	                       purple_account_get_string(account, "ycht-server",  YAHOO_YCHT_HOST),
 	                       purple_account_get_int(account, "ycht-port", YAHOO_YCHT_PORT),
 	                       ycht_got_connected, ycht) == NULL)
 	{
-		ycht_connection_error(ycht, _("Connection problem"));
+		ycht_connection_error(ycht, _("Unable to connect"));
 		return;
 	}
 }
diff --git a/libpurple/protocols/zephyr/ZVariables.c b/libpurple/protocols/zephyr/ZVariables.c
index f433e45ddb..f11ba9d91c 100644
--- a/libpurple/protocols/zephyr/ZVariables.c
+++ b/libpurple/protocols/zephyr/ZVariables.c
@@ -18,27 +18,32 @@
 #include <pwd.h>
 #endif
 
-static int get_localvarfile __P((char *bfr));
+static char *get_localvarfile __P((void));
 static char *get_varval __P((char *fn, char *val));
 static int varline __P((char *bfr, char *var));
 
 char *ZGetVariable(var)
     char *var;
 {
-    char varfile[128], *ret;
+	char *varfile, *ret;
 
-    if (get_localvarfile(varfile))
-	return ((char *)0);
+	if ((varfile = get_localvarfile()) == NULL)
+		return ((char *)0);
 
-    if ((ret = get_varval(varfile, var)) != ZERR_NONE)
-	return (ret);
+	if ((ret = get_varval(varfile, var)) != ZERR_NONE) {
+		g_free(varfile);
+		return ret;
+	}
 
 #ifdef WIN32
-    sprintf(varfile, "C:\\zephyr\\zephyr.var");
+	varfile = g_strdup("C:\\zephyr\\zephyr.var");
 #else
-    sprintf(varfile, "%s/zephyr.vars", CONFDIR);
+	varfile = g_strdup_printf("%s/zephyr.vars", CONFDIR);
 #endif
-    return (get_varval(varfile, var));
+	ret = get_varval(varfile, var);
+	g_free(varfile);
+
+	return ret;
 }
 
 Code_t ZSetVariable(var, value)
@@ -47,18 +52,20 @@ Code_t ZSetVariable(var, value)
 {
     int written;
     FILE *fpin, *fpout;
-    char varfile[128], varfilebackup[128], varbfr[512];
+    char *varfile, *varfilebackup, varbfr[512];
 
     written = 0;
 	
-    if (get_localvarfile(varfile))
+    if ((varfile = get_localvarfile()) == NULL)
 	return (ZERR_INTERNAL);
 
-    (void) strcpy(varfilebackup, varfile);
-    (void) strcat(varfilebackup, ".backup");
+    varfilebackup = g_strconcat(varfile, ".backup", NULL);
 	
-    if (!(fpout = fopen(varfilebackup, "w")))
+    if (!(fpout = fopen(varfilebackup, "w"))) {
+	g_free(varfile);
+	g_free(varfilebackup);
 	return (errno);
+    }
     if ((fpin = fopen(varfile, "r")) != NULL) {
 	while (fgets(varbfr, sizeof varbfr, fpin) != (char *) 0) {
 	    if (varbfr[strlen(varbfr)-1] < ' ')
@@ -74,10 +81,18 @@ Code_t ZSetVariable(var, value)
     } 
     if (!written)
 	fprintf(fpout, "%s = %s\n", var, value);
-    if (fclose(fpout) == EOF)
-	    return(EIO);		/* can't rely on errno */
-    if (rename(varfilebackup, varfile))
+    if (fclose(fpout) == EOF) {
+    	g_free(varfilebackup);
+    	g_free(varfile);
+	return(EIO);		/* can't rely on errno */
+    }
+    if (rename(varfilebackup, varfile)) {
+	g_free(varfilebackup);
+	g_free(varfile);
 	return (errno);
+    }
+    g_free(varfilebackup);
+    g_free(varfile);
     return (ZERR_NONE);
 }	
 
@@ -85,16 +100,18 @@ Code_t ZUnsetVariable(var)
     char *var;
 {
     FILE *fpin, *fpout;
-    char varfile[128], varfilebackup[128], varbfr[512];
+    char *varfile, *varfilebackup, varbfr[512];
 
-    if (get_localvarfile(varfile))
+    if ((varfile = get_localvarfile()) == NULL)
 	return (ZERR_INTERNAL);
 
-    (void) strcpy(varfilebackup, varfile);
-    (void) strcat(varfilebackup, ".backup");
+    varfilebackup = g_strconcat(varfile, ".backup", NULL);
 	
-    if (!(fpout = fopen(varfilebackup, "w")))
+    if (!(fpout = fopen(varfilebackup, "w"))) {
+	g_free(varfile);
+	g_free(varfilebackup);
 	return (errno);
+    }
     if ((fpin = fopen(varfile, "r")) != NULL) {
 	while (fgets(varbfr, sizeof varbfr, fpin) != (char *) 0) {
 	    if (varbfr[strlen(varbfr)-1] < ' ')
@@ -104,42 +121,45 @@ Code_t ZUnsetVariable(var)
 	}
 	(void) fclose(fpin);		/* don't care about read close errs */
     } 
-    if (fclose(fpout) == EOF)
-	    return(EIO);		/* errno isn't reliable */
-    if (rename(varfilebackup, varfile))
+    if (fclose(fpout) == EOF) {
+	g_free(varfilebackup);
+	g_free(varfile);
+	return(EIO);		/* errno isn't reliable */
+    }
+    if (rename(varfilebackup, varfile)) {
+	g_free(varfilebackup);
+	g_free(varfile);
 	return (errno);
+    }
+    g_free(varfilebackup);
+    g_free(varfile);
     return (ZERR_NONE);
 }	
 
-static int get_localvarfile(bfr)
-    char *bfr;
+static char *get_localvarfile(void)
 {
-    const char *envptr;
+    const char *base;
 #ifndef WIN32
     struct passwd *pwd;
-    envptr = purple_home_dir();
+    base = purple_home_dir();
 #else
-    envptr = getenv("HOME");
-    if (!envptr)
-        envptr = getenv("HOMEPATH");
-    if (!envptr) 
-        envptr = "C:\\";
+    base = getenv("HOME");
+    if (!base)
+        base = getenv("HOMEPATH");
+    if (!base) 
+        base = "C:\\";
 #endif
-    if (envptr)
-	(void) strcpy(bfr, envptr);
-    else {
+    if (!base) {
 #ifndef WIN32
 	if (!(pwd = getpwuid((int) getuid()))) {
 	    fprintf(stderr, "Zephyr internal failure: Can't find your entry in /etc/passwd\n");
-	    return (1);
+	    return NULL;
 	}
-	(void) strcpy(bfr, pwd->pw_dir);
+	base = pwd->pw_dir;
 #endif
     }
 
-    (void) strcat(bfr, "/");
-    (void) strcat(bfr, ".zephyr.vars");
-    return (0);
+    return g_strconcat(base, "/.zephyr.vars", NULL);
 } 
 	
 static char *get_varval(fn, var)
@@ -186,7 +206,7 @@ static int varline(bfr, var)
 #define max(a,b) ((a > b) ? (a) : (b))
 #endif
 
-    if (g_strncasecmp(bfr, var, max(strlen(var), cp - bfr)))
+    if (g_ascii_strncasecmp(bfr, var, max(strlen(var), cp - bfr)))
 	return(0);			/* var is not the var in
 					   bfr ==> no match */
 
diff --git a/libpurple/protocols/zephyr/internal.h b/libpurple/protocols/zephyr/internal.h
index 1df52f47aa..14c06b1703 100644
--- a/libpurple/protocols/zephyr/internal.h
+++ b/libpurple/protocols/zephyr/internal.h
@@ -23,6 +23,12 @@
 
 #define ETIMEDOUT WSAETIMEDOUT
 #define EADDRINUSE WSAEADDRINUSE
+#else /* !WIN32 */
+
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 4096
+#endif
+
 #endif
 
 #ifdef ZEPHYR_USES_HESIOD
diff --git a/libpurple/protocols/zephyr/zephyr.c b/libpurple/protocols/zephyr/zephyr.c
index cc549e5ae2..b3089625ba 100644
--- a/libpurple/protocols/zephyr/zephyr.c
+++ b/libpurple/protocols/zephyr/zephyr.c
@@ -960,7 +960,7 @@ static parse_tree *find_node(parse_tree* ptree,gchar* key)
 	tc = tree_child(ptree,0)->contents;
 
 	/* g_strcasecmp() is deprecated.  What is the encoding here??? */
-	if (ptree->num_children > 0  &&	tc && !g_strcasecmp(tc, key)) {
+	if (ptree->num_children > 0  &&	tc && !g_ascii_strcasecmp(tc, key)) {
 		return ptree;
 	} else {
 		parse_tree *result = &null_parse_tree;
@@ -1254,45 +1254,32 @@ static gint check_notify_zeph02(gpointer data)
 
 #ifdef WIN32
 
-static gint check_loc(gpointer_data)
+static gint check_loc(gpointer data)
 {
-	PurpleBlistNode *gnode, *cnode, *bnode;
+	GSList *buddies;
 	ZLocations_t locations;
+	PurpleConnection *gc = data;
+	zephyr_account *zephyr = gc->proto_data;
+	PurpleAccount *account = purple_connection_get_account(gc);
 	int numlocs;
 	int one = 1;
 
-	for (gnode = purple_blist_get_root(); gnode;
-			gnode = purple_blist_node_get_sibling_next(gnode)) {
-		if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-		for (cnode = purple_blist_node_get_first_child(gnode);
-				cnode;
-				cnode = purple_blist_node_get_sibling_next(cnode)) {
-			if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-			for (bnode = purple_blist_node_get_first_child(cnode);
-					bnode;
-					bnode = purple_blist_node_get_sibling_next(bnode)) {
-				PurpleBuddy *b = (PurpleBuddy *) bnode;
-
-				if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-				if (purple_buddy_get_account(b)->gc == zgc) {
-					char *chk;
-					const char *bname = purple_buddy_get_name(b);
-					chk = local_zephyr_normalize(bname);
-					ZLocateUser(chk,&numlocs, ZAUTH);
-					if (numlocs) {
-						int i;
-						for(i=0;i<numlocs;i++) {
-							ZGetLocations(&locations,&one);
-							serv_got_update(zgc,bname,1,0,0,0,0);
-						}
-					}
-				}
+	for (buddies = purple_find_buddies(account, NULL); buddies;
+			buddies = g_slist_delete_link(buddies, buddies)) {
+		PurpleBuddy *b = buddies->data;
+		char *chk;
+		const char *bname = purple_buddy_get_name(b);
+		chk = local_zephyr_normalize(bname);
+		ZLocateUser(chk,&numlocs, ZAUTH);
+		if (numlocs) {
+			int i;
+			for(i=0;i<numlocs;i++) {
+				ZGetLocations(&locations,&one);
+				serv_got_update(zgc,bname,1,0,0,0,0);
 			}
 		}
 	}
+
 	return TRUE;
 }
 
@@ -1300,7 +1287,7 @@ static gint check_loc(gpointer_data)
 
 static gint check_loc(gpointer data)
 {
-	PurpleBlistNode *gnode, *cnode, *bnode;
+	GSList *buddies;
 	ZAsyncLocateData_t ald;
 	PurpleConnection *gc = (PurpleConnection *)data;
 	zephyr_account *zephyr = gc->proto_data;
@@ -1312,65 +1299,49 @@ static gint check_loc(gpointer data)
 		ald.version = NULL;
 	}
 
-	for (gnode = purple_blist_get_root(); gnode;
-			gnode = purple_blist_node_get_sibling_next(gnode)) {
-		if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-		for (cnode = purple_blist_node_get_first_child(gnode);
-				cnode;
-				cnode = purple_blist_node_get_sibling_next(cnode)) {
-			if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-			for (bnode = purple_blist_node_get_first_child(cnode);
-					bnode;
-					bnode = purple_blist_node_get_sibling_next(bnode)) {
-				PurpleBuddy *b = (PurpleBuddy *) bnode;
-
-				if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-				if (purple_buddy_get_account(b) == account) {
-					const char *chk;
-					const char *name = purple_buddy_get_name(b);
-
-					chk = local_zephyr_normalize(zephyr,name);
-					purple_debug_info("zephyr","chk: %s b->name %s\n",chk,name);
-					/* XXX add real error reporting */
-					/* doesn't matter if this fails or not; we'll just move on to the next one */
-					if (use_zeph02(zephyr)) {
+	for (buddies = purple_find_buddies(account, NULL); buddies;
+			buddies = g_slist_delete_link(buddies, buddies)) {
+		PurpleBuddy *b = buddies->data;
+
+		const char *chk;
+		const char *name = purple_buddy_get_name(b);
+
+		chk = local_zephyr_normalize(zephyr,name);
+		purple_debug_info("zephyr","chk: %s b->name %s\n",chk,name);
+		/* XXX add real error reporting */
+		/* doesn't matter if this fails or not; we'll just move on to the next one */
+		if (use_zeph02(zephyr)) {
 #ifdef WIN32
-						int numlocs;
-						int one=1;
-						ZLocateUser(chk,&numlocs,ZAUTH);
-						if (numlocs) {
-							int i;
-							for(i=0;i<numlocs;i++) {
-								ZGetLocations(&locations,&one);
-								if (nlocs>0) 
-									purple_prpl_got_user_status(account,name,"available",NULL);
-								else 
-									purple_prpl_got_user_status(account,name,"offline",NULL);
-							}
-						}
+			int numlocs;
+			int one=1;
+			ZLocateUser(chk,&numlocs,ZAUTH);
+			if (numlocs) {
+				int i;
+				for(i=0;i<numlocs;i++) {
+					ZGetLocations(&locations,&one);
+					if (nlocs>0) 
+						purple_prpl_got_user_status(account,name,"available",NULL);
+					else 
+						purple_prpl_got_user_status(account,name,"offline",NULL);
+				}
+			}
 #else
-						ZRequestLocations(chk, &ald, UNACKED, ZAUTH);
-						g_free(ald.user);
-						g_free(ald.version);
+			ZRequestLocations(chk, &ald, UNACKED, ZAUTH);
+			g_free(ald.user);
+			g_free(ald.version);
 #endif /* WIN32 */
-					} else 
-						if (use_tzc(zephyr)) {
-							gchar *zlocstr = g_strdup_printf("((tzcfodder . zlocate) \"%s\")\n",chk);
-							size_t len = strlen(zlocstr);
-							size_t result = write(zephyr->totzc[ZEPHYR_FD_WRITE],zlocstr,len);
-							if (result != len) {
-								purple_debug_error("zephyr", "Unable to write a message: %s\n", g_strerror(errno));
-							}
-							g_free(zlocstr);
-						}
+		} else 
+			if (use_tzc(zephyr)) {
+				gchar *zlocstr = g_strdup_printf("((tzcfodder . zlocate) \"%s\")\n",chk);
+				size_t len = strlen(zlocstr);
+				size_t result = write(zephyr->totzc[ZEPHYR_FD_WRITE],zlocstr,len);
+				if (result != len) {
+					purple_debug_error("zephyr", "Unable to write a message: %s\n", g_strerror(errno));
 				}
+				g_free(zlocstr);
 			}
-		}
 	}
-	
+
 	return TRUE;
 }
 
@@ -1880,7 +1851,7 @@ static void zephyr_login(PurpleAccount * account)
 	} else if (use_tzc(zephyr)) {
 		zephyr->nottimer = purple_timeout_add(100, check_notify_tzc, gc);
 	} 
-	zephyr->loctimer = purple_timeout_add(20000, check_loc, gc); 
+	zephyr->loctimer = purple_timeout_add_seconds(20, check_loc, gc); 
 
 }
 
@@ -1955,8 +1926,7 @@ static void write_zsubs(zephyr_account *zephyr)
 
 static void write_anyone(PurpleConnection *gc)
 {
-	PurpleBlistNode *gnode, *cnode, *bnode;
-	PurpleBuddy *b;
+	GSList *buddies;
 	char *fname;
 	FILE *fd;
 	PurpleAccount *account;
@@ -1969,29 +1939,12 @@ static void write_anyone(PurpleConnection *gc)
 	}
 
 	account = purple_connection_get_account(gc);
-	for (gnode = purple_blist_get_root();
-			gnode;
-			gnode = purple_blist_node_get_sibling_next(gnode)) {
-		if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-		for (cnode = purple_blist_node_get_first_child(gnode);
-				cnode;
-				cnode = purple_blist_node_get_sibling_next(cnode)) {
-			if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-			for (bnode = purple_blist_node_get_first_child(cnode);
-					bnode;
-					bnode = purple_blist_node_get_sibling_next(bnode)) {
-				if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-					continue;
-				b = (PurpleBuddy *) bnode;
-				if (purple_buddy_get_account(b) == account) {
-					gchar *stripped_user = zephyr_strip_local_realm(zephyr, purple_buddy_get_name(b));
-					fprintf(fd, "%s\n", stripped_user);
-					g_free(stripped_user);
-				}
-			}
-		}
+	for (buddies = purple_find_buddies(account, NULL); buddies;
+			buddies = g_slist_delete_link(buddies, buddies)) {
+		PurpleBuddy *b = buddies->data;
+		gchar *stripped_user = zephyr_strip_local_realm(zephyr, purple_buddy_get_name(b));
+		fprintf(fd, "%s\n", stripped_user);
+		g_free(stripped_user);
 	}
 
 	fclose(fd);
@@ -2953,7 +2906,9 @@ static PurplePluginProtocolInfo prpl_info = {
 	NULL,
 	NULL,
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	NULL,					/* get_account_text_table */
+	NULL,					/* initate_media */
+	NULL					/* can_do_media */
 };
 
 static PurplePluginInfo info = {
diff --git a/libpurple/proxy.c b/libpurple/proxy.c
index fb51fe14c5..ed1a6edbf3 100644
--- a/libpurple/proxy.c
+++ b/libpurple/proxy.c
@@ -47,6 +47,7 @@ struct _PurpleProxyConnectData {
 	gchar *host;
 	int port;
 	int fd;
+	int socket_type;
 	guint inpa;
 	PurpleProxyInfo *gpi;
 	PurpleDnsQueryData *query_data;
@@ -402,7 +403,7 @@ purple_win32_proxy_get_info(void)
 		MyWinHttpGetIEProxyConfig = (LPFNWINHTTPGETIEPROXYCONFIG)
 			wpurple_find_and_loadproc("winhttp.dll", "WinHttpGetIEProxyConfigForCurrentUser");
 		if (!MyWinHttpGetIEProxyConfig)
-			purple_debug_info("proxy", "Unable to read Windows Proxy Settings.\n");
+			purple_debug_warning("proxy", "Unable to read Windows Proxy Settings.\n");
 	}
 
 	if (!MyWinHttpGetIEProxyConfig)
@@ -571,7 +572,7 @@ purple_proxy_connect_data_disconnect(PurpleProxyConnectData *connect_data, const
 
 	if (error_message != NULL)
 	{
-		purple_debug_info("proxy", "Connection attempt failed: %s\n",
+		purple_debug_error("proxy", "Connection attempt failed: %s\n",
 				error_message);
 		if (connect_data->hosts != NULL)
 			try_connect(connect_data);
@@ -605,6 +606,9 @@ purple_proxy_connect_data_disconnect_formatted(PurpleProxyConnectData *connect_d
 static void
 purple_proxy_connect_data_connected(PurpleProxyConnectData *connect_data)
 {
+	purple_debug_info("proxy", "Connected to %s:%d.\n",
+	                  connect_data->host, connect_data->port);
+
 	connect_data->connect_cb(connect_data->data, connect_data->fd, NULL);
 
 	/*
@@ -657,7 +661,7 @@ socket_ready_cb(gpointer data, gint source, PurpleInputCondition cond)
 	if (ret != 0 || error != 0) {
 		if (ret != 0)
 			error = errno;
-		purple_debug_info("proxy", "Error connecting to %s:%d (%s).\n",
+		purple_debug_error("proxy", "Error connecting to %s:%d (%s).\n",
 						connect_data->host, connect_data->port, g_strerror(error));
 
 		purple_proxy_connect_data_disconnect(connect_data, g_strerror(error));
@@ -676,6 +680,68 @@ clean_connect(gpointer data)
 }
 
 static void
+proxy_connect_udp_none(PurpleProxyConnectData *connect_data, struct sockaddr *addr, socklen_t addrlen)
+{
+	int flags;
+
+	purple_debug_info("proxy", "UDP Connecting to %s:%d with no proxy\n",
+			connect_data->host, connect_data->port);
+
+	connect_data->fd = socket(addr->sa_family, SOCK_DGRAM, 0);
+	if (connect_data->fd < 0)
+	{
+		purple_proxy_connect_data_disconnect_formatted(connect_data,
+				_("Unable to create socket: %s"), g_strerror(errno));
+		return;
+	}
+
+	flags = fcntl(connect_data->fd, F_GETFL);
+	fcntl(connect_data->fd, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(connect_data->fd, F_SETFD, FD_CLOEXEC);
+#endif
+
+	if (connect(connect_data->fd, addr, addrlen) != 0)
+	{
+		if ((errno == EINPROGRESS) || (errno == EINTR))
+		{
+			purple_debug_info("proxy", "UDP Connection in progress\n");
+			connect_data->inpa = purple_input_add(connect_data->fd,
+					PURPLE_INPUT_WRITE, socket_ready_cb, connect_data);
+		}
+		else
+		{
+			purple_proxy_connect_data_disconnect(connect_data, g_strerror(errno));
+		}
+	}
+	else
+	{
+		/*
+		 * The connection happened IMMEDIATELY... strange, but whatever.
+		 */
+		int error = ETIMEDOUT;
+		int ret;
+
+		purple_debug_info("proxy", "UDP Connected immediately.\n");
+
+		ret = purple_input_get_error(connect_data->fd, &error);
+		if ((ret != 0) || (error != 0))
+		{
+			if (ret != 0)
+				error = errno;
+			purple_proxy_connect_data_disconnect(connect_data, g_strerror(error));
+			return;
+		}
+
+		/*
+		 * We want to call the "connected" callback eventually, but we
+		 * don't want to call it before we return, just in case.
+		 */
+		purple_timeout_add(10, clean_connect, connect_data);
+	}
+}
+
+static void
 proxy_connect_none(PurpleProxyConnectData *connect_data, struct sockaddr *addr, socklen_t addrlen)
 {
 	int flags;
@@ -687,7 +753,7 @@ proxy_connect_none(PurpleProxyConnectData *connect_data, struct sockaddr *addr,
 	if (connect_data->fd < 0)
 	{
 		purple_proxy_connect_data_disconnect_formatted(connect_data,
-				_("Unable to create socket:\n%s"), g_strerror(errno));
+				_("Unable to create socket: %s"), g_strerror(errno));
 		return;
 	}
 
@@ -808,7 +874,7 @@ http_canread(gpointer data, gint source, PurpleInputCondition cond)
 
 	if (len == 0) {
 		purple_proxy_connect_data_disconnect(connect_data,
-				_("Server closed the connection."));
+				_("Server closed the connection"));
 		return;
 	}
 
@@ -819,7 +885,7 @@ http_canread(gpointer data, gint source, PurpleInputCondition cond)
 
 		/* Error! */
 		purple_proxy_connect_data_disconnect_formatted(connect_data,
-				_("Lost connection with server:\n%s"), g_strerror(errno));
+				_("Lost connection with server: %s"), g_strerror(errno));
 		return;
 	}
 
@@ -882,7 +948,7 @@ http_canread(gpointer data, gint source, PurpleInputCondition cond)
 
 	if (error) {
 		purple_proxy_connect_data_disconnect_formatted(connect_data,
-				_("Unable to parse response from HTTP proxy: %s\n"),
+				_("Unable to parse response from HTTP proxy: %s"),
 				connect_data->read_buffer);
 		return;
 	}
@@ -1002,7 +1068,7 @@ http_canread(gpointer data, gint source, PurpleInputCondition cond)
 		if (status == 403) {
 			/* Forbidden */
 			purple_proxy_connect_data_disconnect_formatted(connect_data,
-					_("Access denied: HTTP proxy server forbids port %d tunneling."),
+					_("Access denied: HTTP proxy server forbids port %d tunneling"),
 					connect_data->port);
 		} else {
 			purple_proxy_connect_data_disconnect_formatted(connect_data,
@@ -1128,7 +1194,7 @@ proxy_connect_http(PurpleProxyConnectData *connect_data, struct sockaddr *addr,
 	if (connect_data->fd < 0)
 	{
 		purple_proxy_connect_data_disconnect_formatted(connect_data,
-				_("Unable to create socket:\n%s"), g_strerror(errno));
+				_("Unable to create socket: %s"), g_strerror(errno));
 		return;
 	}
 
@@ -1321,7 +1387,7 @@ proxy_connect_socks4(PurpleProxyConnectData *connect_data, struct sockaddr *addr
 	if (connect_data->fd < 0)
 	{
 		purple_proxy_connect_data_disconnect_formatted(connect_data,
-				_("Unable to create socket:\n%s"), g_strerror(errno));
+				_("Unable to create socket: %s"), g_strerror(errno));
 		return;
 	}
 
@@ -1390,7 +1456,7 @@ s5_canread_again(gpointer data, gint source, PurpleInputCondition cond)
 	if (len == 0)
 	{
 		purple_proxy_connect_data_disconnect(connect_data,
-				_("Server closed the connection."));
+				_("Server closed the connection"));
 		return;
 	}
 
@@ -1402,7 +1468,7 @@ s5_canread_again(gpointer data, gint source, PurpleInputCondition cond)
 
 		/* Error! */
 		purple_proxy_connect_data_disconnect_formatted(connect_data,
-				_("Lost connection with server:\n%s"), g_strerror(errno));
+				_("Lost connection with server: %s"), g_strerror(errno));
 		return;
 	}
 
@@ -1419,7 +1485,7 @@ s5_canread_again(gpointer data, gint source, PurpleInputCondition cond)
 		} else {
 			purple_debug_error("socks5 proxy", "Bad data.\n");
 			purple_proxy_connect_data_disconnect(connect_data,
-					_("Received invalid data on connection with server."));
+					_("Received invalid data on connection with server"));
 		}
 		return;
 	}
@@ -1449,7 +1515,7 @@ s5_canread_again(gpointer data, gint source, PurpleInputCondition cond)
 		default:
 			purple_debug_error("socks5 proxy", "Invalid ATYP received (0x%X)\n", buf[3]);
 			purple_proxy_connect_data_disconnect(connect_data,
-					_("Received invalid data on connection with server."));
+					_("Received invalid data on connection with server"));
 			return;
 	}
 
@@ -1504,7 +1570,7 @@ s5_readauth(gpointer data, gint source, PurpleInputCondition cond)
 	if (len == 0)
 	{
 		purple_proxy_connect_data_disconnect(connect_data,
-				_("Server closed the connection."));
+				_("Server closed the connection"));
 		return;
 	}
 
@@ -1516,7 +1582,7 @@ s5_readauth(gpointer data, gint source, PurpleInputCondition cond)
 
 		/* Error! */
 		purple_proxy_connect_data_disconnect_formatted(connect_data,
-				_("Lost connection with server:\n%s"), g_strerror(errno));
+				_("Lost connection with server: %s"), g_strerror(errno));
 		return;
 	}
 
@@ -1529,7 +1595,7 @@ s5_readauth(gpointer data, gint source, PurpleInputCondition cond)
 
 	if ((connect_data->read_buffer[0] != 0x01) || (connect_data->read_buffer[1] != 0x00)) {
 		purple_proxy_connect_data_disconnect(connect_data,
-				_("Received invalid data on connection with server."));
+				_("Received invalid data on connection with server"));
 		return;
 	}
 
@@ -1600,7 +1666,7 @@ s5_parse_chap_msg(PurpleProxyConnectData *connect_data)
 
 	if (*cmdbuf != 0x01) {
 		purple_proxy_connect_data_disconnect(connect_data,
-				_("Received invalid data on connection with server."));
+				_("Received invalid data on connection with server"));
 		return -1;
 	}
 	cmdbuf++;
@@ -1701,7 +1767,7 @@ s5_parse_chap_msg(PurpleProxyConnectData *connect_data)
 						"of the socks5 CHAP specification.  "
 						"Disconnecting...");
 					purple_proxy_connect_data_disconnect(connect_data,
-							_("Received invalid data on connection with server."));
+							_("Received invalid data on connection with server"));
 					return -1;
 				}
 				break;
@@ -1740,7 +1806,7 @@ s5_readchap(gpointer data, gint source, PurpleInputCondition cond)
 
 	if (len == 0) {
 		purple_proxy_connect_data_disconnect(connect_data,
-				_("Server closed the connection."));
+				_("Server closed the connection"));
 		return;
 	}
 
@@ -1751,7 +1817,7 @@ s5_readchap(gpointer data, gint source, PurpleInputCondition cond)
 
 		/* Error! */
 		purple_proxy_connect_data_disconnect_formatted(connect_data,
-				_("Lost connection with server:\n%s"), g_strerror(errno));
+				_("Lost connection with server: %s"), g_strerror(errno));
 		return;
 	}
 
@@ -1815,7 +1881,7 @@ s5_canread(gpointer data, gint source, PurpleInputCondition cond)
 	if (len == 0)
 	{
 		purple_proxy_connect_data_disconnect(connect_data,
-				_("Server closed the connection."));
+				_("Server closed the connection"));
 		return;
 	}
 
@@ -1827,7 +1893,7 @@ s5_canread(gpointer data, gint source, PurpleInputCondition cond)
 
 		/* Error! */
 		purple_proxy_connect_data_disconnect_formatted(connect_data,
-				_("Lost connection with server:\n%s"), g_strerror(errno));
+				_("Lost connection with server: %s"), g_strerror(errno));
 		return;
 	}
 
@@ -1840,7 +1906,7 @@ s5_canread(gpointer data, gint source, PurpleInputCondition cond)
 
 	if ((connect_data->read_buffer[0] != 0x05) || (connect_data->read_buffer[1] == 0xff)) {
 		purple_proxy_connect_data_disconnect(connect_data,
-				_("Received invalid data on connection with server."));
+				_("Received invalid data on connection with server"));
 		return;
 	}
 
@@ -1981,7 +2047,7 @@ proxy_connect_socks5(PurpleProxyConnectData *connect_data, struct sockaddr *addr
 	if (connect_data->fd < 0)
 	{
 		purple_proxy_connect_data_disconnect_formatted(connect_data,
-				_("Unable to create socket:\n%s"), g_strerror(errno));
+				_("Unable to create socket: %s"), g_strerror(errno));
 		return;
 	}
 
@@ -2042,6 +2108,12 @@ static void try_connect(PurpleProxyConnectData *connect_data)
 #endif
 	purple_debug_info("proxy", "Attempting connection to %s\n", ipaddr);
 
+	if (connect_data->socket_type == SOCK_DGRAM) {
+		proxy_connect_udp_none(connect_data, addr, addrlen);
+		g_free(addr);
+		return;
+	}
+
 	switch (purple_proxy_info_get_type(connect_data->gpi)) {
 		case PURPLE_PROXY_NONE:
 			proxy_connect_none(connect_data, addr, addrlen);
@@ -2087,7 +2159,7 @@ connection_host_resolved(GSList *hosts, gpointer data,
 
 	if (hosts == NULL)
 	{
-		purple_proxy_connect_data_disconnect(connect_data, _("Could not resolve host name"));
+		purple_proxy_connect_data_disconnect(connect_data, _("Unable to resolve hostname"));
 		return;
 	}
 
@@ -2193,6 +2265,7 @@ purple_proxy_connect(void *handle, PurpleAccount *account,
 
 	connect_data = g_new0(PurpleProxyConnectData, 1);
 	connect_data->fd = -1;
+	connect_data->socket_type = SOCK_STREAM;
 	connect_data->handle = handle;
 	connect_data->connect_cb = connect_cb;
 	connect_data->data = data;
@@ -2243,6 +2316,71 @@ purple_proxy_connect(void *handle, PurpleAccount *account,
 	return connect_data;
 }
 
+PurpleProxyConnectData *
+purple_proxy_connect_udp(void *handle, PurpleAccount *account,
+				   const char *host, int port,
+				   PurpleProxyConnectFunction connect_cb, gpointer data)
+{
+	const char *connecthost = host;
+	int connectport = port;
+	PurpleProxyConnectData *connect_data;
+
+	g_return_val_if_fail(host       != NULL, NULL);
+	g_return_val_if_fail(port       >  0,    NULL);
+	g_return_val_if_fail(connect_cb != NULL, NULL);
+
+	connect_data = g_new0(PurpleProxyConnectData, 1);
+	connect_data->fd = -1;
+	connect_data->socket_type = SOCK_DGRAM;
+	connect_data->handle = handle;
+	connect_data->connect_cb = connect_cb;
+	connect_data->data = data;
+	connect_data->host = g_strdup(host);
+	connect_data->port = port;
+	connect_data->gpi = purple_proxy_get_setup(account);
+
+	if ((purple_proxy_info_get_type(connect_data->gpi) != PURPLE_PROXY_NONE) &&
+		(purple_proxy_info_get_host(connect_data->gpi) == NULL ||
+		 purple_proxy_info_get_port(connect_data->gpi) <= 0)) {
+
+		purple_notify_error(NULL, NULL, _("Invalid proxy settings"), _("Either the host name or port number specified for your given proxy type is invalid."));
+		purple_proxy_connect_data_destroy(connect_data);
+		return NULL;
+	}
+
+	switch (purple_proxy_info_get_type(connect_data->gpi))
+	{
+		case PURPLE_PROXY_NONE:
+			break;
+
+		case PURPLE_PROXY_HTTP:
+		case PURPLE_PROXY_SOCKS4:
+		case PURPLE_PROXY_SOCKS5:
+		case PURPLE_PROXY_USE_ENVVAR:
+			purple_debug_info("proxy", "Ignoring Proxy type (%d) for UDP.\n",
+			                  purple_proxy_info_get_type(connect_data->gpi));
+			break;
+
+		default:
+			purple_debug_error("proxy", "Invalid Proxy type (%d) specified.\n",
+			                   purple_proxy_info_get_type(connect_data->gpi));
+			purple_proxy_connect_data_destroy(connect_data);
+			return NULL;
+	}
+
+	connect_data->query_data = purple_dnsquery_a(connecthost,
+			connectport, connection_host_resolved, connect_data);
+	if (connect_data->query_data == NULL)
+	{
+		purple_proxy_connect_data_destroy(connect_data);
+		return NULL;
+	}
+
+	handles = g_slist_prepend(handles, connect_data);
+
+	return connect_data;
+}
+
 /*
  * Combine some of this code with purple_proxy_connect()
  */
@@ -2260,6 +2398,7 @@ purple_proxy_connect_socks5(void *handle, PurpleProxyInfo *gpi,
 
 	connect_data = g_new0(PurpleProxyConnectData, 1);
 	connect_data->fd = -1;
+	connect_data->socket_type = SOCK_STREAM;
 	connect_data->handle = handle;
 	connect_data->connect_cb = connect_cb;
 	connect_data->data = data;
@@ -2392,4 +2531,9 @@ purple_proxy_uninit(void)
 		purple_proxy_connect_data_disconnect(handles->data, NULL);
 		purple_proxy_connect_data_destroy(handles->data);
 	}
+
+	purple_prefs_disconnect_by_handle(purple_proxy_get_handle());
+
+	purple_proxy_info_destroy(global_proxy_info);
+	global_proxy_info = NULL;
 }
diff --git a/libpurple/proxy.h b/libpurple/proxy.h
index 6cff7b46e7..bf9db8d7f2 100644
--- a/libpurple/proxy.h
+++ b/libpurple/proxy.h
@@ -257,6 +257,35 @@ PurpleProxyConnectData *purple_proxy_connect(void *handle,
 			PurpleProxyConnectFunction connect_cb, gpointer data);
 
 /**
+ * Makes a connection to the specified host and port.  Note that this
+ * function name can be misleading--although it is called "proxy
+ * connect," it is used for establishing any outgoing UDP connection,
+ * whether through a proxy or not.
+ *
+ * @param handle     A handle that should be associated with this
+ *                   connection attempt.  The handle can be used
+ *                   to cancel the connection attempt using the
+ *                   purple_proxy_connect_cancel_with_handle()
+ *                   function.
+ * @param account    The account making the connection.
+ * @param host       The destination host.
+ * @param port       The destination port.
+ * @param connect_cb The function to call when the connection is
+ *                   established.  If the connection failed then
+ *                   fd will be -1 and error message will be set
+ *                   to something descriptive (hopefully).
+ * @param data       User-defined data.
+ *
+ * @return NULL if there was an error, or a reference to an
+ *         opaque data structure that can be used to cancel
+ *         the pending connection, if needed.
+ */
+PurpleProxyConnectData *purple_proxy_connect_udp(void *handle,
+			PurpleAccount *account,
+			const char *host, int port,
+			PurpleProxyConnectFunction connect_cb, gpointer data);
+
+/**
  * Makes a connection through a SOCKS5 proxy.
  *
  * @param handle     A handle that should be associated with this
diff --git a/libpurple/prpl.c b/libpurple/prpl.c
index de44d2765a..e7f9697c66 100644
--- a/libpurple/prpl.c
+++ b/libpurple/prpl.c
@@ -182,6 +182,17 @@ purple_prpl_got_account_status(PurpleAccount *account, const char *status_id, ..
 }
 
 void
+purple_prpl_got_account_actions(PurpleAccount *account)
+{
+
+	g_return_if_fail(account != NULL);
+	g_return_if_fail(purple_account_is_connected(account));
+
+	purple_signal_emit(purple_accounts_get_handle(), "account-actions-changed",
+	                   account);
+}
+
+void
 purple_prpl_got_user_idle(PurpleAccount *account, const char *name,
 		gboolean idle, time_t idle_time)
 {
@@ -258,6 +269,10 @@ purple_prpl_got_user_status(PurpleAccount *account, const char *name,
 		status   = purple_presence_get_status(presence, status_id);
 
 		if(NULL == status)
+			/*
+			 * TODO: This should never happen, right?  We should call
+			 *       g_warning() or something.
+			 */
 			continue;
 
 		old_status = purple_presence_get_active_status(presence);
@@ -271,7 +286,8 @@ purple_prpl_got_user_status(PurpleAccount *account, const char *name,
 
 	g_slist_free(list);
 
-	/* we get to re-use the last status we found */
+	/* The buddy is no longer online, they are therefore by definition not
+	 * still typing to us. */
 	if (!purple_status_is_online(status))
 		serv_got_typing_stopped(purple_account_get_connection(account), name);
 }
@@ -496,6 +512,54 @@ purple_prpl_got_attention_in_chat(PurpleConnection *gc, int id, const char *who,
 	got_attention(gc, id, who, type_code);
 }
 
+gboolean
+purple_prpl_initiate_media(PurpleAccount *account,
+			   const char *who,
+			   PurpleMediaSessionType type)
+{
+#ifdef USE_VV
+	PurpleConnection *gc = NULL;
+	PurplePlugin *prpl = NULL;
+	PurplePluginProtocolInfo *prpl_info = NULL;
+
+	if (account)
+		gc = purple_account_get_connection(account);
+	if (gc)
+		prpl = purple_connection_get_prpl(gc);
+	if (prpl)
+		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+
+	if (prpl_info && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, initiate_media)) {
+		/* should check that the protocol supports this media type here? */
+		return prpl_info->initiate_media(account, who, type);
+	} else
+#endif
+	return FALSE;
+}
+
+PurpleMediaCaps
+purple_prpl_get_media_caps(PurpleAccount *account, const char *who)
+{
+#ifdef USE_VV
+	PurpleConnection *gc = NULL;
+	PurplePlugin *prpl = NULL;
+	PurplePluginProtocolInfo *prpl_info = NULL;
+	
+	if (account)
+		gc = purple_account_get_connection(account);
+	if (gc)
+		prpl = purple_connection_get_prpl(gc);
+	if (prpl)
+		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+	
+	if (prpl_info && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info,
+			get_media_caps)) {
+		return prpl_info->get_media_caps(account, who);
+	}
+#endif
+	return PURPLE_MEDIA_CAPS_NONE;
+}
+
 /**************************************************************************
  * Protocol Plugin Subsystem API
  **************************************************************************/
diff --git a/libpurple/prpl.h b/libpurple/prpl.h
index c43e003759..5d46075269 100644
--- a/libpurple/prpl.h
+++ b/libpurple/prpl.h
@@ -65,6 +65,7 @@ typedef struct _PurpleBuddyIconSpec PurpleBuddyIconSpec;
 #include "conversation.h"
 #include "ft.h"
 #include "imgstore.h"
+#include "media.h"
 #include "notify.h"
 #include "proxy.h"
 #include "plugin.h"
@@ -125,10 +126,10 @@ struct _PurpleAttentionType
 typedef enum
 {
 	/**
-	 * Use a unique name, not an alias, for chat rooms.
+	 * User names are unique to a chat and are not shared between rooms.
 	 *
-	 * XMPP lets you choose what name you want for chat.
-	 * So it shouldn't be pulling the alias for when you're in chat;
+	 * XMPP lets you choose what name you want in chats, so it shouldn't
+	 * be pulling the aliases from the buddy list for the chat list;
 	 * it gets annoying.
 	 */
 	OPT_PROTO_UNIQUE_CHATNAME = 0x00000004,
@@ -296,6 +297,14 @@ struct _PurplePluginProtocolInfo
 	void (*set_idle)(PurpleConnection *, int idletime);
 	void (*change_passwd)(PurpleConnection *, const char *old_pass,
 						  const char *new_pass);
+	/**
+	 * Add a buddy to a group on the server.
+	 *
+	 * This PRPL function may be called in situations in which the buddy is
+	 * already in the specified group. If the protocol supports
+	 * authorization and the user is not already authorized to see the
+	 * status of \a buddy, \a add_buddy should request authorization.
+	 */
 	void (*add_buddy)(PurpleConnection *, PurpleBuddy *buddy, PurpleGroup *group);
 	void (*add_buddies)(PurpleConnection *, GList *buddies, GList *groups);
 	void (*remove_buddy)(PurpleConnection *, PurpleBuddy *buddy, PurpleGroup *group);
@@ -451,6 +460,27 @@ struct _PurplePluginProtocolInfo
 	 *         destroyed by the caller when it's no longer needed.
 	 */
 	GHashTable *(*get_account_text_table)(PurpleAccount *account);
+
+	/**
+	 * Initiate a media session with the given contact.
+	 *
+	 * @param account The account to initiate the media session on.
+	 * @param who The remote user to initiate the session with.
+	 * @param type The type of media session to initiate.
+	 * @return TRUE if the call succeeded else FALSE. (Doesn't imply the media session or stream will be successfully created)
+	 */
+	gboolean (*initiate_media)(PurpleAccount *account, const char *who,
+					PurpleMediaSessionType type);
+
+	/**
+	 * Checks to see if the given contact supports the given type of media session.
+	 *
+	 * @param account The account the contact is on.
+	 * @param who The remote user to check for media capability with.
+	 * @return The media caps the contact supports.
+	 */
+	PurpleMediaCaps (*get_media_caps)(PurpleAccount *account,
+					  const char *who);
 };
 
 #define PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl, member) \
@@ -631,6 +661,20 @@ void purple_prpl_got_account_status(PurpleAccount *account,
 								  const char *status_id, ...) G_GNUC_NULL_TERMINATED;
 
 /**
+ * Notifies Purple that our account's actions have changed. This is only
+ * called after the initial connection. Emits the account-actions-changed
+ * signal.
+ *
+ * This is meant to be called from protocol plugins.
+ *
+ * @param account   The account.
+ *
+ * @see account-actions-changed
+ * @since 2.6.0
+ */
+void purple_prpl_got_account_actions(PurpleAccount *account);
+
+/**
  * Notifies Purple that a buddy's idle state and time have changed.
  *
  * This is meant to be called from protocol plugins.
@@ -747,6 +791,30 @@ void purple_prpl_got_attention(PurpleConnection *gc, const char *who, guint type
  */
 void purple_prpl_got_attention_in_chat(PurpleConnection *gc, int id, const char *who, guint type_code);
 
+/**
+ * Determines if the contact supports the given media session type.
+ *
+ * @param account The account the user is on.
+ * @param who The name of the contact to check capabilities for.
+ *
+ * @return The media caps the contact supports.
+ */
+PurpleMediaCaps purple_prpl_get_media_caps(PurpleAccount *account,
+				  const char *who);
+
+/**
+ * Initiates a media session with the given contact.
+ *
+ * @param account The account the user is on.
+ * @param who The name of the contact to start a session with.
+ * @param type The type of media session to start.
+ *
+ * @return TRUE if the call succeeded else FALSE. (Doesn't imply the media session or stream will be successfully created)
+ */
+gboolean purple_prpl_initiate_media(PurpleAccount *account,
+					const char *who,
+					PurpleMediaSessionType type);
+
 /*@}*/
 
 /**************************************************************************/
diff --git a/libpurple/purple-remote b/libpurple/purple-remote
index 89fa0a1714..498a5a5f8a 100755
--- a/libpurple/purple-remote
+++ b/libpurple/purple-remote
@@ -161,7 +161,6 @@ def execute(uri):
                 purple.PurpleSavedstatusSetSubstatus(current, account, type, message)
                 purple.PurpleSavedstatusActivateForAccount(current, account)
         else:
-            accounts = purple.PurpleAccountsGetAllActive()
             saved = purple.PurpleSavedstatusNew("", status_type)
             purple.PurpleSavedstatusSetMessage(saved, message)
             purple.PurpleSavedstatusActivate(saved)
diff --git a/libpurple/purple-send b/libpurple/purple-send
index a8450704b5..ca701fcd41 100755
--- a/libpurple/purple-send
+++ b/libpurple/purple-send
@@ -29,4 +29,3 @@ fi
 shift
 dbus-send --dest=im.pidgin.purple.PurpleService --print-reply --type=method_call /im/pidgin/purple/PurpleObject im.pidgin.purple.PurpleInterface.$METHOD_NAME "$@"
 
-echo 
diff --git a/libpurple/purple-send-async b/libpurple/purple-send-async
index e15340eb07..c2e1ab64f6 100755
--- a/libpurple/purple-send-async
+++ b/libpurple/purple-send-async
@@ -27,4 +27,3 @@ fi
 shift
 dbus-send --dest=im.pidgin.purple.PurpleService --type=method_call /im/pidgin/purple/PurpleObject im.pidgin.purple.PurpleInterface.$METHOD_NAME "$@"
 
-echo
diff --git a/libpurple/purple-url-handler b/libpurple/purple-url-handler
index fdec81984e..083070b1ae 100755
--- a/libpurple/purple-url-handler
+++ b/libpurple/purple-url-handler
@@ -207,11 +207,7 @@ def irc(uri):
 
     def correct_server(account):
         username = cpurple.PurpleAccountGetUsername(account)
-        user_split = (username.split("@"))
-        # Not all accounts have a split, so append an empty string so the
-        # [1] doesn't throw an IndexError.
-        user_split.append("")
-        return (server == user_split[1])
+        return ("@" in username) and (server == (username.split("@"))[1])
 
     account = findaccount(protocol, matcher=correct_server)
 
diff --git a/libpurple/purple.h.in b/libpurple/purple.h.in
index e050257de6..a96b2537ec 100644
--- a/libpurple/purple.h.in
+++ b/libpurple/purple.h.in
@@ -65,11 +65,13 @@
 #include <idle.h>
 #include <imgstore.h>
 #include <log.h>
+#include <media.h>
+#include <mediamanager.h>
 #include <mime.h>
 #include <nat-pmp.h>
 #include <network.h>
-#include <ntlm.h>
 #include <notify.h>
+#include <ntlm.h>
 #include <plugin.h>
 #include <pluginpref.h>
 #include <pounce.h>
@@ -82,16 +84,22 @@
 #include <savedstatuses.h>
 #include <server.h>
 #include <signals.h>
+#include <smiley.h>
+#include <sound.h>
+#include <sound-theme.h>
+#include <sound-theme-loader.h>
+#include <sslconn.h>
 #include <status.h>
 #include <stringref.h>
 #include <stun.h>
-#include <sound.h>
-#include <sslconn.h>
+#include <theme.h>
+#include <theme-loader.h>
+#include <theme-manager.h>
 #include <upnp.h>
 #include <util.h>
 #include <value.h>
 #include <version.h>
-#include <xmlnode.h>
 #include <whiteboard.h>
+#include <xmlnode.h>
 
 #endif
diff --git a/libpurple/savedstatuses.c b/libpurple/savedstatuses.c
index 2f7baf1a3a..4a83a12e44 100644
--- a/libpurple/savedstatuses.c
+++ b/libpurple/savedstatuses.c
@@ -285,13 +285,13 @@ status_to_xmlnode(PurpleSavedStatus *status)
 		xmlnode_set_attrib(node, "transient", "true");
 	}
 
-	snprintf(buf, sizeof(buf), "%lu", status->creation_time);
+	g_snprintf(buf, sizeof(buf), "%lu", status->creation_time);
 	xmlnode_set_attrib(node, "created", buf);
 
-	snprintf(buf, sizeof(buf), "%lu", status->lastused);
+	g_snprintf(buf, sizeof(buf), "%lu", status->lastused);
 	xmlnode_set_attrib(node, "lastused", buf);
 
-	snprintf(buf, sizeof(buf), "%u", status->usage_count);
+	g_snprintf(buf, sizeof(buf), "%u", status->usage_count);
 	xmlnode_set_attrib(node, "usage_count", buf);
 
 	child = xmlnode_new_child(node, "state");
@@ -870,15 +870,15 @@ purple_savedstatus_set_idleaway(gboolean idleaway)
 		/* Don't need to do anything */
 		return;
 
-	/* Changing our status makes us un-idle */
-	if (!idleaway)
-		purple_idle_touch();
-
 	old = purple_savedstatus_get_current();
 	saved_status = idleaway ? purple_savedstatus_get_idleaway()
 			: purple_savedstatus_get_default();
 	purple_prefs_set_bool("/purple/savedstatus/isidleaway", idleaway);
 
+	/* Changing our status makes us un-idle */
+	if (!idleaway)
+		purple_idle_touch();
+
 	if (idleaway && (purple_savedstatus_get_type(old) != PURPLE_STATUS_AVAILABLE))
 		/* Our global status is already "away," so don't change anything */
 		return;
@@ -1235,6 +1235,8 @@ purple_savedstatuses_init(void)
 void
 purple_savedstatuses_uninit(void)
 {
+	gpointer handle = purple_savedstatuses_get_handle();
+
 	remove_old_transient_statuses();
 
 	if (save_timer != 0)
@@ -1253,6 +1255,7 @@ purple_savedstatuses_uninit(void)
 	g_hash_table_destroy(creation_times);
 	creation_times = NULL;
 
-	purple_signals_unregister_by_instance(purple_savedstatuses_get_handle());
+	purple_signals_unregister_by_instance(handle);
+	purple_signals_disconnect_by_handle(handle);
 }
 
diff --git a/libpurple/server.c b/libpurple/server.c
index 6b04e1f495..351e6d0888 100644
--- a/libpurple/server.c
+++ b/libpurple/server.c
@@ -587,13 +587,15 @@ void serv_got_im(PurpleConnection *gc, const char *who, const char *msg,
 
 	account  = purple_connection_get_account(gc);
 
-	if (PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc))->set_permit_deny == NULL) {
-		/* protocol does not support privacy, handle it ourselves */
-		if (!purple_privacy_check(account, who)) {
-			purple_signal_emit(purple_conversations_get_handle(), "blocked-im-msg",
-					account, who, msg, flags, (unsigned int)mtime);
-			return;
-		}
+	/*
+	 * XXX: Should we be setting this here, or relying on prpls to set it?
+	 */
+	flags |= PURPLE_MESSAGE_RECV;
+
+	if (!purple_privacy_check(account, who)) {
+		purple_signal_emit(purple_conversations_get_handle(), "blocked-im-msg",
+				account, who, msg, flags, (unsigned int)mtime);
+		return;
 	}
 
 	/*
@@ -630,11 +632,6 @@ void serv_got_im(PurpleConnection *gc, const char *who, const char *msg,
 	if (conv == NULL)
 		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, name, gc->account);
 
-	/*
-	 * XXX: Should we be setting this here, or relying on prpls to set it?
-	 */
-	flags |= PURPLE_MESSAGE_RECV;
-
 	if (conv == NULL)
 		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
 
@@ -728,7 +725,6 @@ void serv_got_typing(PurpleConnection *gc, const char *name, int timeout,
 		im = PURPLE_CONV_IM(conv);
 
 		purple_conv_im_set_typing_state(im, state);
-		purple_conv_im_update_typing(im);
 	} else {
 		switch (state)
 		{
@@ -766,7 +762,6 @@ void serv_got_typing_stopped(PurpleConnection *gc, const char *name) {
 
 		purple_conv_im_stop_typing_timeout(im);
 		purple_conv_im_set_typing_state(im, PURPLE_NOT_TYPING);
-		purple_conv_im_update_typing(im);
 	}
 	else
 	{
@@ -864,7 +859,12 @@ PurpleConversation *serv_got_joined_chat(PurpleConnection *gc,
 
 	account = purple_connection_get_account(gc);
 
+	g_return_val_if_fail(account != NULL, NULL);
+	g_return_val_if_fail(name != NULL, NULL);
+
 	conv = purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name);
+	g_return_val_if_fail(conv != NULL, NULL);
+
 	chat = PURPLE_CONV_CHAT(conv);
 
 	if (!g_slist_find(gc->buddy_chats, conv))
@@ -939,6 +939,15 @@ void serv_got_chat_in(PurpleConnection *g, int id, const char *who,
 	if (!conv)
 		return;
 
+	/* Did I send the message? */
+	if (purple_strequal(purple_conv_chat_get_nick(chat),
+				purple_normalize(purple_conversation_get_account(conv), who))) {
+		flags |= PURPLE_MESSAGE_SEND;
+		flags &= ~PURPLE_MESSAGE_RECV; /* Just in case some prpl sets it! */
+	} else {
+		flags |= PURPLE_MESSAGE_RECV;
+	}
+
 	/*
 	 * Make copies of the message and the sender in case plugins want
 	 * to free these strings and replace them with a modifed version.
diff --git a/libpurple/signals.c b/libpurple/signals.c
index f3f4b19856..dbd4ed0361 100644
--- a/libpurple/signals.c
+++ b/libpurple/signals.c
@@ -363,8 +363,8 @@ purple_signal_disconnect(void *instance, const char *signal,
 		{
 			g_free(handler_data);
 
-			signal_data->handlers = g_list_remove(signal_data->handlers,
-												  handler_data);
+			signal_data->handlers = g_list_delete_link(signal_data->handlers,
+												       l);
 			signal_data->handler_count--;
 
 			found = TRUE;
@@ -398,8 +398,8 @@ disconnect_handle_from_signals(const char *signal,
 			g_free(handler_data);
 
 			signal_data->handler_count--;
-			signal_data->handlers = g_list_remove(signal_data->handlers,
-												  handler_data);
+			signal_data->handlers = g_list_delete_link(signal_data->handlers,
+			                                           l);
 		}
 	}
 }
@@ -975,6 +975,26 @@ purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT(
 }
 
 void
+purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER(
+		PurpleCallback cb, va_list args, void *data, void **return_val)
+{
+	gboolean ret_val;
+	void *arg1 = va_arg(args, void *);
+	void *arg2 = va_arg(args, void *);
+	void *arg3 = va_arg(args, void *);
+	void *arg4 = va_arg(args, void *);
+	void *arg5 = va_arg(args, void *);
+	void *arg6 = va_arg(args, void *);
+
+	ret_val =
+		((gboolean (*)(void *, void *, void *, void *, void *, void *, void *))cb)(
+			arg1, arg2, arg3, arg4, arg5, arg6, data);
+
+	if (return_val != NULL)
+		*return_val = GINT_TO_POINTER(ret_val);
+}
+
+void
 purple_marshal_BOOLEAN__INT_POINTER(PurpleCallback cb, va_list args, void *data,
                                   void **return_val)
 {
diff --git a/libpurple/signals.h b/libpurple/signals.h
index 77352a042b..57bb7e90f3 100644
--- a/libpurple/signals.h
+++ b/libpurple/signals.h
@@ -349,6 +349,8 @@ void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER(
+		PurpleCallback cb, va_list args, void *data, void **return_val);
 
 void purple_marshal_BOOLEAN__INT_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
diff --git a/libpurple/smiley.h b/libpurple/smiley.h
index ecb4385b6b..8d96fddd0e 100644
--- a/libpurple/smiley.h
+++ b/libpurple/smiley.h
@@ -61,44 +61,41 @@ extern "C" {
 /*@{*/
 
 /**
- * GObject foo.
+ * GObject-fu.
  * @internal.
  */
 GType purple_smiley_get_type(void);
 
 /**
- * Creates a new custom smiley structure and populates it.
+ * Creates a new custom smiley from a PurpleStoredImage.
  *
- * If a custom smiley with the informed shortcut already exist, it
+ * If a custom smiley with the given shortcut already exists, it
  * will be automaticaly returned.
  *
  * @param img         The image associated with the smiley.
- * @param shortcut    The custom smiley associated shortcut.
+ * @param shortcut    The associated shortcut (e.g. "(homer)").
  *
- * @return The custom smiley structure filled up.
+ * @return The custom smiley.
  */
 PurpleSmiley *
 purple_smiley_new(PurpleStoredImage *img, const char *shortcut);
 
 /**
- * Creates a new custom smiley structure and populates it.
+ * Creates a new custom smiley, reading the image data from a file.
  *
- * The data is retrieved from an already existent file.
- *
- * If a custom smiley with the informed shortcut already exist, it
+ * If a custom smiley with the given shortcut already exists, it
  * will be automaticaly returned.
  *
- * @param shortcut           The custom smiley associated shortcut.
- * @param filepath           The image file to be imported to a
- *                           new custom smiley.
+ * @param shortcut           The associated shortcut (e.g. "(homer)").
+ * @param filepath           The image file.
  *
- * @return The custom smiley structure filled up.
+ * @return The custom smiley.
  */
 PurpleSmiley *
 purple_smiley_new_from_file(const char *shortcut, const char *filepath);
 
 /**
- * Destroy the custom smiley and release the associated resources.
+ * Destroys the custom smiley and release the associated resources.
  *
  * @param smiley    The custom smiley.
  */
@@ -109,32 +106,28 @@ purple_smiley_delete(PurpleSmiley *smiley);
  * Changes the custom smiley's shortcut.
  *
  * @param smiley    The custom smiley.
- * @param shortcut  The custom smiley associated shortcut.
+ * @param shortcut  The new shortcut. A custom smiley with this shortcut
+ *                  cannot already be in use.
  *
- * @return TRUE whether the shortcut is not associated with another
- *         custom smiley and the parameters are valid. FALSE otherwise.
+ * @return TRUE if the shortcut was changed. FALSE otherwise.
  */
 gboolean
 purple_smiley_set_shortcut(PurpleSmiley *smiley, const char *shortcut);
 
 /**
- * Changes the custom smiley's data.
- *
- * When the filename controling is made outside this API, the param
- * #keepfilename must be TRUE.
- * Otherwise, the file and filename will be regenerated, and the
- * old one will be removed.
+ * Changes the custom smiley's image data.
  *
  * @param smiley             The custom smiley.
- * @param smiley_data        The custom smiley data.
- * @param smiley_data_len    The custom smiley data length.
+ * @param smiley_data        The custom smiley data, which the smiley code
+ *                           takes ownership of and will free.
+ * @param smiley_data_len    The length of the data in @a smiley_data.
  */
 void
 purple_smiley_set_data(PurpleSmiley *smiley, guchar *smiley_data,
                                            size_t smiley_data_len);
 
 /**
- * Returns the custom smiley's associated shortcut.
+ * Returns the custom smiley's associated shortcut (e.g. "(homer)").
  *
  * @param smiley   The custom smiley.
  *
@@ -155,11 +148,11 @@ const char *purple_smiley_get_checksum(const PurpleSmiley *smiley);
  * Returns the PurpleStoredImage with the reference counter incremented.
  *
  * The returned PurpleStoredImage reference counter must be decremented
- * after use.
+ * when the caller is done using it.
  *
  * @param smiley   The custom smiley.
  *
- * @return A PurpleStoredImage reference.
+ * @return A PurpleStoredImage.
  */
 PurpleStoredImage *purple_smiley_get_stored_image(const PurpleSmiley *smiley);
 
@@ -167,7 +160,7 @@ PurpleStoredImage *purple_smiley_get_stored_image(const PurpleSmiley *smiley);
  * Returns the custom smiley's data.
  *
  * @param smiley  The custom smiley.
- * @param len     If not @c NULL, the length of the icon data returned
+ * @param len     If not @c NULL, the length of the image data returned
  *                will be set in the location pointed to by this.
  *
  * @return A pointer to the custom smiley data.
@@ -194,6 +187,8 @@ const char *purple_smiley_get_extension(const PurpleSmiley *smiley);
  * directly.  If you find yourself wanting to use this function, think
  * very long and hard about it, and then don't.
  *
+ * Think some more.
+ *
  * @param smiley  The custom smiley.
  *
  * @return A full path to the file, or @c NULL under various conditions.
@@ -210,7 +205,8 @@ char *purple_smiley_get_full_path(PurpleSmiley *smiley);
 /*@{*/
 
 /**
- * Returns a list of all custom smileys. The caller should free the list.
+ * Returns a list of all custom smileys. The caller is responsible for freeing
+ * the list.
  *
  * @return A list of all custom smileys.
  */
@@ -218,23 +214,21 @@ GList *
 purple_smileys_get_all(void);
 
 /**
- * Returns the custom smiley given it's shortcut.
+ * Returns a custom smiley given its shortcut.
  *
  * @param shortcut The custom smiley's shortcut.
  *
- * @return The custom smiley (with a reference for the caller) if found,
- *         or @c NULL if not found.
+ * @return The custom smiley if found, or @c NULL if not found.
  */
 PurpleSmiley *
 purple_smileys_find_by_shortcut(const char *shortcut);
 
 /**
- * Returns the custom smiley given it's checksum.
+ * Returns a custom smiley given its checksum.
  *
  * @param checksum The custom smiley's checksum.
  *
- * @return The custom smiley (with a reference for the caller) if found,
- *         or @c NULL if not found.
+ * @return The custom smiley if found, or @c NULL if not found.
  */
 PurpleSmiley *
 purple_smileys_find_by_checksum(const char *checksum);
@@ -242,10 +236,9 @@ purple_smileys_find_by_checksum(const char *checksum);
 /**
  * Returns the directory used to store custom smiley cached files.
  *
- * The default directory is PURPLEDIR/smileys, unless otherwise specified
- * by purple_buddy_icons_set_cache_dir().
+ * The default directory is PURPLEDIR/custom_smiley.
  *
- * @return The directory to store custom smyles cached files to.
+ * @return The directory in which to store custom smileys cached files.
  */
 const char *purple_smileys_get_storing_dir(void);
 
diff --git a/libpurple/sound-theme-loader.c b/libpurple/sound-theme-loader.c
index 8a9d7fe875..ea85881053 100644
--- a/libpurple/sound-theme-loader.c
+++ b/libpurple/sound-theme-loader.c
@@ -25,6 +25,7 @@
 #include "sound-theme.h"
 #include "util.h"
 #include "xmlnode.h"
+#include "debug.h"
 
 /*****************************************************************************
  * Sound Theme Builder
@@ -34,8 +35,9 @@ static PurpleTheme *
 purple_sound_loader_build(const gchar *dir)
 {
 	xmlnode *root_node = NULL, *sub_node;
-	gchar *filename_full, *data;
+	gchar *filename_full, *data = NULL;
 	PurpleSoundTheme *theme = NULL;
+	const gchar *name;
 
 	/* Find the theme file */
 	g_return_val_if_fail(dir != NULL, NULL);
@@ -45,30 +47,35 @@ purple_sound_loader_build(const gchar *dir)
 		root_node = xmlnode_from_file(dir, "theme.xml", "sound themes", "sound-theme-loader");
 
 	g_free(filename_full);
-	g_return_val_if_fail(root_node != NULL, NULL);
-
-	/* Parse the tree */
-	sub_node = xmlnode_get_child(root_node, "description");
-	data = xmlnode_get_data(sub_node);
-
-	if (xmlnode_get_attrib(root_node, "name") != NULL) {
-		theme = g_object_new(PURPLE_TYPE_SOUND_THEME,
-				"type", "sound",
-				"name", xmlnode_get_attrib(root_node, "name"),
-				"author", xmlnode_get_attrib(root_node, "author"),
-				"image", xmlnode_get_attrib(root_node, "image"),
-				"directory", dir,
-				"description", data, NULL);
-
-		sub_node = xmlnode_get_child(root_node, "event");
-
-		while (sub_node) {
-			purple_sound_theme_set_file(theme,
-					xmlnode_get_attrib(sub_node, "name"),
-					xmlnode_get_attrib(sub_node, "file"));
-			sub_node = xmlnode_get_next_twin(sub_node);
+	if (root_node == NULL)
+		return NULL;
+
+	name = xmlnode_get_attrib(root_node, "name");
+
+	if (name && purple_strequal(xmlnode_get_attrib(root_node, "type"), "sound")) {
+		/* Parse the tree */
+		sub_node = xmlnode_get_child(root_node, "description");
+		data = xmlnode_get_data(sub_node);
+
+		if (xmlnode_get_attrib(root_node, "name") != NULL) {
+			theme = g_object_new(PURPLE_TYPE_SOUND_THEME,
+					"type", "sound",
+					"name", name,
+					"author", xmlnode_get_attrib(root_node, "author"),
+					"image", xmlnode_get_attrib(root_node, "image"),
+					"directory", dir,
+					"description", data, NULL);
+
+			sub_node = xmlnode_get_child(root_node, "event");
+
+			while (sub_node) {
+				purple_sound_theme_set_file(theme,
+						xmlnode_get_attrib(sub_node, "name"),
+						xmlnode_get_attrib(sub_node, "file"));
+				sub_node = xmlnode_get_next_twin(sub_node);
+			}
 		}
-	}
+	} else purple_debug_warning("sound-theme-loader", "Missing attribute or problem with the root element\n");
 
 	xmlnode_free(root_node);
 	g_free(data);
diff --git a/libpurple/sound-theme.h b/libpurple/sound-theme.h
index 3c40a462c2..3814e4527f 100644
--- a/libpurple/sound-theme.h
+++ b/libpurple/sound-theme.h
@@ -73,6 +73,7 @@ GType purple_sound_theme_get_type(void);
 /**
  * Returns a copy of the filename for the sound event.
  *
+ * @param theme The theme.
  * @param event The purple sound event to look up.
  *
  * @returns The filename of the sound event.
@@ -83,6 +84,7 @@ const gchar *purple_sound_theme_get_file(PurpleSoundTheme *theme,
 /**
  * Returns a copy of the directory and filename for the sound event
  *
+ * @param theme The theme.
  * @param event The purple sound event to look up
  *
  * @returns The directory + '/' + filename of the sound event.  This is
@@ -94,8 +96,9 @@ gchar *purple_sound_theme_get_file_full(PurpleSoundTheme *theme,
 /**
  * Sets the filename for a given sound event
  *
- * @param event		the purple sound event to look up
- * @param filename		the name of the file to be used for the event
+ * @param theme    The theme.
+ * @param event    the purple sound event to look up
+ * @param filename the name of the file to be used for the event
  */
 void purple_sound_theme_set_file(PurpleSoundTheme *theme,
 		const gchar *event,
diff --git a/libpurple/sslconn.c b/libpurple/sslconn.c
index c44bb54c06..e6365d390e 100644
--- a/libpurple/sslconn.c
+++ b/libpurple/sslconn.c
@@ -100,6 +100,15 @@ purple_ssl_connect(PurpleAccount *account, const char *host, int port,
 				 PurpleSslInputFunction func, PurpleSslErrorFunction error_func,
 				 void *data)
 {
+	return purple_ssl_connect_with_ssl_cn(account, host, port, func, error_func,
+	                                  NULL, data);
+}
+
+PurpleSslConnection *
+purple_ssl_connect_with_ssl_cn(PurpleAccount *account, const char *host, int port,
+				 PurpleSslInputFunction func, PurpleSslErrorFunction error_func,
+				 const char *ssl_cn, void *data)
+{
 	PurpleSslConnection *gsc;
 
 	g_return_val_if_fail(host != NULL,            NULL);
@@ -116,7 +125,7 @@ purple_ssl_connect(PurpleAccount *account, const char *host, int port,
 	gsc = g_new0(PurpleSslConnection, 1);
 
 	gsc->fd              = -1;
-	gsc->host            = g_strdup(host);
+	gsc->host            = ssl_cn ? g_strdup(ssl_cn) : g_strdup(host);
 	gsc->port            = port;
 	gsc->connect_cb_data = data;
 	gsc->connect_cb      = func;
diff --git a/libpurple/sslconn.h b/libpurple/sslconn.h
index d7378f8e42..0bceccd57a 100644
--- a/libpurple/sslconn.h
+++ b/libpurple/sslconn.h
@@ -186,6 +186,31 @@ PurpleSslConnection *purple_ssl_connect(PurpleAccount *account, const char *host
 									PurpleSslErrorFunction error_func,
 									void *data);
 
+/**
+ * Makes a SSL connection to the specified host and port, using the separate
+ * name to verify with the certificate.  The caller should keep track of the
+ * returned value and use it to cancel the connection, if needed.
+ *
+ * @param account    The account making the connection.
+ * @param host       The destination host.
+ * @param port       The destination port.
+ * @param func       The SSL input handler function.
+ * @param error_func The SSL error handler function.  This function
+ *                   should <strong>NOT</strong> call purple_ssl_close().  In
+ *                   the event of an error the #PurpleSslConnection will be
+ *                   destroyed for you.
+ * @param ssl_host   The hostname of the other peer (to verify the CN)
+ * @param data       User-defined data.
+ *
+ * @return The SSL connection handle.
+ * @since 2.6.0
+ */
+PurpleSslConnection *purple_ssl_connect_with_ssl_cn(PurpleAccount *account, const char *host,
+									int port, PurpleSslInputFunction func,
+									PurpleSslErrorFunction error_func,
+									const char *ssl_host,
+									void *data);
+
 #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_SSLCONN_C_)
 /**
  * Makes a SSL connection using an already open file descriptor.
diff --git a/libpurple/status.c b/libpurple/status.c
index 7d91ddd5e4..2040db1aff 100644
--- a/libpurple/status.c
+++ b/libpurple/status.c
@@ -1533,7 +1533,8 @@ purple_presence_is_status_primitive_active(const PurplePresence *presence,
 	g_return_val_if_fail(primitive != PURPLE_STATUS_UNSET, FALSE);
 
 	for (l = purple_presence_get_statuses(presence);
-	     l != NULL; l = l->next)	{
+	     l != NULL; l = l->next)
+	{
 		PurpleStatus *temp_status = l->data;
 		PurpleStatusType *type = purple_status_get_type(temp_status);
 
@@ -1659,7 +1660,7 @@ purple_status_get_handle(void) {
 void
 purple_status_init(void)
 {
-	void *handle = purple_status_get_handle;
+	void *handle = purple_status_get_handle();
 
 	purple_prefs_add_none("/purple/status");
 	purple_prefs_add_none("/purple/status/scores");
@@ -1713,4 +1714,5 @@ purple_status_init(void)
 void
 purple_status_uninit(void)
 {
+	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
 }
diff --git a/libpurple/status.h b/libpurple/status.h
index f79a1958cc..f4cbbc34dd 100644
--- a/libpurple/status.h
+++ b/libpurple/status.h
@@ -50,25 +50,25 @@
  * your accounts are saved so that the next time you start Purple,
  * your accounts will be set to their last known statuses.  There
  * is also a list of saved statuses that are written to the
- * status.xml file.  Also, each PurpleStatus has a "savable" boolean.
- * If "savable" is set to FALSE then the status is NEVER saved.
+ * status.xml file.  Also, each PurpleStatus has a "saveable" boolean.
+ * If "saveable" is set to FALSE then the status is NEVER saved.
  * All PurpleStatuses should be inside a PurplePresence.
  *
  *
- * A PurpleStatus is either "indepedent" or "exclusive."
- * Independent statuses can be active or inactive and it doesn't
+ * A PurpleStatus is either "independent" or "exclusive."
+ * Independent statuses can be active or inactive and they don't
  * affect anything else.  However, you can only have one exclusive
- * status per PurplePresence.  If you activate one exlusive status,
+ * status per PurplePresence.  If you activate one exclusive status,
  * then the previous exclusive status is automatically deactivated.
  *
  * A PurplePresence is like a collection of PurpleStatuses (plus some
  * other random info).  For any buddy, or for any one of your accounts,
- * or for any person you're chatting with, you may know various
+ * or for any person with which you're chatting, you may know various
  * amounts of information.  This information is all contained in
  * one PurplePresence.  If one of your buddies is away and idle,
  * then the presence contains the PurpleStatus for their awayness,
  * and it contains their current idle time.  PurplePresences are
- * never saved to disk.  The information they contain is only relevent
+ * never saved to disk.  The information they contain is only relevant
  * for the current PurpleSession.
  */
 
@@ -80,7 +80,7 @@ typedef struct _PurpleStatus          PurpleStatus;
 /**
  * A context for a presence.
  *
- * The context indicates what the presence applies to.
+ * The context indicates to what the presence applies.
  */
 typedef enum
 {
@@ -134,7 +134,7 @@ extern "C" {
 #endif
 
 /**************************************************************************/
-/** @name PurpleStatusPrimitive API                                         */
+/** @name PurpleStatusPrimitive API                                       */
 /**************************************************************************/
 /*@{*/
 
@@ -172,7 +172,7 @@ PurpleStatusPrimitive purple_primitive_get_type_from_id(const char *id);
 /*@}*/
 
 /**************************************************************************/
-/** @name PurpleStatusType API                                              */
+/** @name PurpleStatusType API                                            */
 /**************************************************************************/
 /*@{*/
 
diff --git a/libpurple/stun.c b/libpurple/stun.c
index 9e39601241..c6f71da0b4 100644
--- a/libpurple/stun.c
+++ b/libpurple/stun.c
@@ -116,7 +116,7 @@ static void do_callbacks(void) {
 static gboolean timeoutfunc(gpointer data) {
 	struct stun_conn *sc = data;
 	if(sc->retry >= 2) {
-		purple_debug_info("stun", "request timed out, giving up.\n");
+		purple_debug_warning("stun", "request timed out, giving up.\n");
 		if(sc->test == 2)
 			nattype.type = PURPLE_STUN_NAT_TYPE_SYMMETRIC;
 
@@ -176,19 +176,19 @@ static void reply_cb(gpointer data, gint source, PurpleInputCondition cond) {
 
 	len = recv(source, buffer, sizeof(buffer) - 1, 0);
 	if (!len) {
-		purple_debug_info("stun", "unable to read stun response\n");
+		purple_debug_warning("stun", "unable to read stun response\n");
 		return;
 	}
 	buffer[len] = '\0';
 
 	if (len < sizeof(struct stun_header)) {
-		purple_debug_info("stun", "got invalid response\n");
+		purple_debug_warning("stun", "got invalid response\n");
 		return;
 	}
 
 	hdr = (struct stun_header*) buffer;
 	if (len != (ntohs(hdr->len) + sizeof(struct stun_header))) {
-		purple_debug_info("stun", "got incomplete response\n");
+		purple_debug_warning("stun", "got incomplete response\n");
 		return;
 	}
 
@@ -197,13 +197,13 @@ static void reply_cb(gpointer data, gint source, PurpleInputCondition cond) {
 			|| hdr->transid[1] != sc->packet->transid[1]
 			|| hdr->transid[2] != sc->packet->transid[2]
 			|| hdr->transid[3] != sc->packet->transid[3]) {
-		purple_debug_info("stun", "got wrong transid\n");
+		purple_debug_warning("stun", "got wrong transid\n");
 		return;
 	}
 
 	if(sc->test==1) {
 		if (hdr->type != MSGTYPE_BINDINGRESPONSE) {
-			purple_debug_info("stun",
+			purple_debug_warning("stun",
 				"Expected Binding Response, got %d\n",
 				hdr->type);
 			return;
@@ -341,6 +341,12 @@ static void hbn_cb(GSList *hosts, gpointer data, const char *error_message) {
 	}
 
 	if (!purple_network_listen_range(12108, 12208, SOCK_DGRAM, hbn_listen_cb, hosts)) {
+		while(hosts) {
+			hosts = g_slist_remove(hosts, hosts->data);
+			g_free(hosts->data);
+			hosts = g_slist_remove(hosts, hosts->data);
+		}
+
 		nattype.status = PURPLE_STUN_STATUS_UNKNOWN;
 		nattype.lookup_time = time(NULL);
 		do_callbacks();
diff --git a/libpurple/tests/Makefile.am b/libpurple/tests/Makefile.am
index 552be4cbfb..efc6285618 100644
--- a/libpurple/tests/Makefile.am
+++ b/libpurple/tests/Makefile.am
@@ -11,6 +11,7 @@ check_libpurple_SOURCES=\
 	    tests.h \
 		test_cipher.c \
 		test_jabber_jutil.c \
+		test_yahoo_util.c \
 		test_util.c \
 		$(top_builddir)/libpurple/util.h
 
@@ -18,6 +19,7 @@ check_libpurple_CFLAGS=\
         @CHECK_CFLAGS@ \
 		$(GLIB_CFLAGS) \
 		$(DEBUG_CFLAGS) \
+		$(LIBXML_CFLAGS) \
 		-I.. \
 		-I$(top_srcdir)/libpurple \
 		-DBUILDDIR=\"$(top_builddir)\"
@@ -26,6 +28,7 @@ check_libpurple_LDADD=\
         @CHECK_LIBS@ \
 		$(GLIB_LIBS) \
 		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
 		$(top_builddir)/libpurple/libpurple.la
 
 endif
diff --git a/libpurple/tests/check_libpurple.c b/libpurple/tests/check_libpurple.c
index 4c927745f2..afc297ab63 100644
--- a/libpurple/tests/check_libpurple.c
+++ b/libpurple/tests/check_libpurple.c
@@ -76,6 +76,7 @@ int main(void)
 
 	srunner_add_suite(sr, cipher_suite());
 	srunner_add_suite(sr, jabber_jutil_suite());
+	srunner_add_suite(sr, yahoo_util_suite());
 	srunner_add_suite(sr, util_suite());
 
 	/* make this a libpurple "ui" */
diff --git a/libpurple/tests/test_cipher.c b/libpurple/tests/test_cipher.c
index 5e59464455..38853d5bdd 100644
--- a/libpurple/tests/test_cipher.c
+++ b/libpurple/tests/test_cipher.c
@@ -168,6 +168,11 @@ END_TEST
 	purple_cipher_context_destroy(context); \
 }
 
+START_TEST(test_sha1_empty_string) {
+	SHA1_TEST("", "da39a3ee5e6b4b0d3255bfef95601890afd80709");
+}
+END_TEST
+
 START_TEST(test_sha1_a) {
 	SHA1_TEST("a", "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8");
 }
@@ -190,6 +195,66 @@ START_TEST(test_sha1_1000_as_1000_times) {
 END_TEST
 
 /******************************************************************************
+ * SHA-256 Tests
+ *****************************************************************************/
+#define SHA256_TEST(data, digest) { \
+	PurpleCipher *cipher = NULL; \
+	PurpleCipherContext *context = NULL; \
+	gchar cdigest[65]; \
+	gboolean ret = FALSE; \
+	\
+	cipher = purple_ciphers_find_cipher("sha256"); \
+	context = purple_cipher_context_new(cipher, NULL); \
+	\
+	if((data)) { \
+		purple_cipher_context_append(context, (guchar *)(data), strlen((data))); \
+	} else { \
+		gint j; \
+		guchar buff[1000]; \
+		\
+		memset(buff, 'a', 1000); \
+		\
+		for(j = 0; j < 1000; j++) \
+			purple_cipher_context_append(context, buff, 1000); \
+	} \
+	\
+	ret = purple_cipher_context_digest_to_str(context, sizeof(cdigest), cdigest, \
+	                                        NULL); \
+	\
+	fail_unless(ret == TRUE, NULL); \
+	\
+	fail_unless(strcmp((digest), cdigest) == 0, NULL); \
+	\
+	purple_cipher_context_destroy(context); \
+}
+
+START_TEST(test_sha256_empty_string) {
+	SHA256_TEST("", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855");
+}
+END_TEST
+
+START_TEST(test_sha256_a) {
+	SHA256_TEST("a", "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb");
+}
+END_TEST
+
+START_TEST(test_sha256_abc) {
+	SHA256_TEST("abc", "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad");
+}
+END_TEST
+
+START_TEST(test_sha256_abcd_gibberish) {
+	SHA256_TEST("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+			  "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1");
+}
+END_TEST
+
+START_TEST(test_sha256_1000_as_1000_times) {
+	SHA256_TEST(NULL, "cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0");
+}
+END_TEST
+
+/******************************************************************************
  * DES Tests
  *****************************************************************************/
 #define DES_TEST(in, keyz, out, len) { \
@@ -726,12 +791,22 @@ cipher_suite(void) {
 
 	/* sha1 tests */
 	tc = tcase_create("SHA1");
+	tcase_add_test(tc, test_sha1_empty_string);
 	tcase_add_test(tc, test_sha1_a);
 	tcase_add_test(tc, test_sha1_abc);
 	tcase_add_test(tc, test_sha1_abcd_gibberish);
 	tcase_add_test(tc, test_sha1_1000_as_1000_times);
 	suite_add_tcase(s, tc);
 
+	/* sha256 tests */
+	tc = tcase_create("SHA256");
+	tcase_add_test(tc, test_sha256_empty_string);
+	tcase_add_test(tc, test_sha256_a);
+	tcase_add_test(tc, test_sha256_abc);
+	tcase_add_test(tc, test_sha256_abcd_gibberish);
+	tcase_add_test(tc, test_sha256_1000_as_1000_times);
+	suite_add_tcase(s, tc);
+
 	/* des tests */
 	tc = tcase_create("DES");
 	tcase_add_test(tc, test_des_12345678);
diff --git a/libpurple/tests/test_jabber_jutil.c b/libpurple/tests/test_jabber_jutil.c
index f5c5fa3c33..e540e269a1 100644
--- a/libpurple/tests/test_jabber_jutil.c
+++ b/libpurple/tests/test_jabber_jutil.c
@@ -44,6 +44,10 @@ START_TEST(test_nodeprep_validate)
 	longnode = g_strnfill(1023, 'a');
 	fail_unless(jabber_nodeprep_validate(longnode));
 	g_free(longnode);
+
+	longnode = g_strnfill(1024, 'a');
+	fail_if(jabber_nodeprep_validate(longnode));
+	g_free(longnode);
 }
 END_TEST
 
@@ -68,6 +72,87 @@ START_TEST(test_nodeprep_validate_too_long)
 }
 END_TEST
 
+#define assert_valid_jid(str) { \
+	JabberID *jid = jabber_id_new(str); \
+	fail_if(jid == NULL, "JID '%s' is valid but jabber_id_new() rejected it", str); \
+	jabber_id_free(jid); \
+}
+
+#define assert_invalid_jid(str) { \
+	JabberID *jid = jabber_id_new(str); \
+	fail_if(jid != NULL, "JID '%s' is invalid but jabber_id_new() allowed it", str); \
+	jabber_id_free(jid); \
+}
+
+#define assert_jid_parts(expect_node, expect_domain, str) { \
+	JabberID *jid = jabber_id_new(str); \
+	fail_if(jid == NULL, "JID '%s' is valid but jabber_id_new() rejected it", str); \
+	fail_if(jid->node == NULL,     "JID '%s' is valid but jabber_id_new() didn't return a node", str); \
+	fail_if(jid->domain == NULL,   "JID '%s' is valid but jabber_id_new() didn't return a domain", str); \
+	fail_if(jid->resource != NULL, "JID '%s' doesn't contain a resource", str); \
+	assert_string_equal(expect_node, jid->node); \
+	assert_string_equal(expect_domain, jid->domain); \
+	jabber_id_free(jid); \
+}
+
+START_TEST(test_jabber_id_new)
+{
+	assert_valid_jid("gmail.com");
+	assert_valid_jid("gmail.com/Test");
+	assert_valid_jid("gmail.com/Test@");
+	assert_valid_jid("gmail.com/@");
+	assert_valid_jid("gmail.com/Test@alkjaweflkj");
+	assert_valid_jid("mark.doliner@gmail.com");
+	assert_valid_jid("mark.doliner@gmail.com/Test12345");
+	assert_valid_jid("mark.doliner@gmail.com/Test@12345");
+	assert_valid_jid("mark.doliner@gmail.com/Te/st@12@//345");
+	assert_valid_jid("わいど@conference.jabber.org");
+	assert_valid_jid("まりるーむ@conference.jabber.org");
+	assert_valid_jid("mark.doliner@gmail.com/まりるーむ");
+	assert_valid_jid("mark.doliner@gmail/stuff.org");
+	assert_valid_jid("stuart@nödåtXäYZ.se");
+	assert_valid_jid("stuart@nödåtXäYZ.se/まりるーむ");
+	assert_valid_jid("mark.doliner@わいど.org");
+	assert_valid_jid("nick@まつ.おおかみ.net");
+	assert_valid_jid("paul@10.0.42.230/s");
+	assert_valid_jid("paul@[::1]"); /* IPv6 */
+	assert_valid_jid("paul@[2001:470:1f05:d58::2]");
+	assert_valid_jid("paul@[2001:470:1f05:d58::2]/foo");
+
+	assert_invalid_jid("@gmail.com");
+	assert_invalid_jid("@@gmail.com");
+	assert_invalid_jid("mark.doliner@@gmail.com/Test12345");
+	assert_invalid_jid("mark@doliner@gmail.com/Test12345");
+	assert_invalid_jid("@gmail.com/Test@12345");
+	assert_invalid_jid("/Test@12345");
+	assert_invalid_jid("mark.doliner@");
+	assert_invalid_jid("mark.doliner/");
+	assert_invalid_jid("mark.doliner@gmail_stuff.org");
+	assert_invalid_jid("mark.doliner@gmail[stuff.org");
+	assert_invalid_jid("mark.doliner@gmail\\stuff.org");
+	assert_invalid_jid("paul@[::1]124");
+	assert_invalid_jid("paul@2[::1]124/as");
+
+	/* Ensure that jabber_id_new is properly lowercasing node and domains */
+	assert_jid_parts("paul", "darkrain42.org", "PaUL@darkrain42.org");
+	assert_jid_parts("paul", "darkrain42.org", "paul@DaRkRaIn42.org");
+
+	/* These case-mapping tests culled from examining RFC3454 B.2 */
+
+	/* Cyrillic capital EF (U+0424) maps to lowercase EF (U+0444) */
+	assert_jid_parts("ф", "darkrain42.org", "Ф@darkrain42.org");
+	/*
+	 * These character (U+A664 and U+A665) are not mapped to anything in
+	 * RFC3454 B.2. This first test *fails* when not using IDN because glib's
+	 * case-folding/utf8_strdown improperly lowercases the character.
+	 */
+	assert_jid_parts("Ꙥ", "darkrain42.org", "Ꙥ@darkrain42.org");
+	assert_jid_parts("ꙥ", "darkrain42.org", "ꙥ@darkrain42.org");
+	/* U+04E9 to U+04E9 */
+	assert_jid_parts("paul", "өarkrain42.org", "paul@Өarkrain42.org");
+}
+END_TEST
+
 Suite *
 jabber_jutil_suite(void)
 {
@@ -82,10 +167,11 @@ jabber_jutil_suite(void)
 	tcase_add_test(tc, test_get_bare_jid);
 	suite_add_tcase(s, tc);
 
-	tc = tcase_create("Nodeprep validate");
+	tc = tcase_create("JID validate");
 	tcase_add_test(tc, test_nodeprep_validate);
 	tcase_add_test(tc, test_nodeprep_validate_illegal_chars);
 	tcase_add_test(tc, test_nodeprep_validate_too_long);
+	tcase_add_test(tc, test_jabber_id_new);
 	suite_add_tcase(s, tc);
 
 	return s;
diff --git a/libpurple/tests/test_util.c b/libpurple/tests/test_util.c
index de56591afb..8339017ac5 100644
--- a/libpurple/tests/test_util.c
+++ b/libpurple/tests/test_util.c
@@ -5,7 +5,7 @@
 
 START_TEST(test_util_base16_encode)
 {
-	assert_string_equal_free("68656c6c6f2c20776f726c642100", purple_base16_encode("hello, world!", 14));
+	assert_string_equal_free("68656c6c6f2c20776f726c642100", purple_base16_encode((const unsigned char *)"hello, world!", 14));
 }
 END_TEST
 
@@ -14,14 +14,13 @@ START_TEST(test_util_base16_decode)
 	gsize sz = 0;
 	guchar *out = purple_base16_decode("21646c726f77202c6f6c6c656800", &sz);
 	fail_unless(sz == 14, NULL);
-	fail_unless(strcmp("!dlrow ,olleh", out) == 0, NULL);
-	g_free(out);
+	assert_string_equal_free("!dlrow ,olleh", (char *)out);
 }
 END_TEST
 
 START_TEST(test_util_base64_encode)
 {
-	assert_string_equal_free("Zm9ydHktdHdvAA==", purple_base64_encode("forty-two", 10));
+	assert_string_equal_free("Zm9ydHktdHdvAA==", purple_base64_encode((const unsigned char *)"forty-two", 10));
 }
 END_TEST
 
@@ -30,8 +29,7 @@ START_TEST(test_util_base64_decode)
 	gsize sz;
 	guchar *out = purple_base64_decode("b3d0LXl0cm9mAA==", &sz);
 	fail_unless(sz == 10, NULL);
-	fail_unless(strcmp("owt-ytrof", out) == 0, NULL);
-	g_free(out);
+	assert_string_equal_free("owt-ytrof", (char *)out);
 }
 END_TEST
 
@@ -82,6 +80,25 @@ START_TEST(test_util_email_is_valid)
 }
 END_TEST
 
+START_TEST(test_util_ipv6_is_valid)
+{
+	fail_unless(purple_ipv6_address_is_valid("2001:0db8:85a3:0000:0000:8a2e:0370:7334"));
+	fail_unless(purple_ipv6_address_is_valid("2001:db8:85a3:0:0:8a2e:370:7334"));
+	fail_unless(purple_ipv6_address_is_valid("2001:db8:85a3::8a2e:370:7334"));
+	fail_unless(purple_ipv6_address_is_valid("2001:0db8:0:0::1428:57ab"));
+	fail_unless(purple_ipv6_address_is_valid("::1"));
+	fail_unless(purple_ipv6_address_is_valid("1::"));
+	fail_unless(purple_ipv6_address_is_valid("1::1"));
+	fail_unless(purple_ipv6_address_is_valid("::"));
+	fail_if(purple_ipv6_address_is_valid(""));
+	fail_if(purple_ipv6_address_is_valid(":"));
+	fail_if(purple_ipv6_address_is_valid("1.2.3.4"));
+	fail_if(purple_ipv6_address_is_valid("2001::FFD3::57ab"));
+	fail_if(purple_ipv6_address_is_valid("200000000::1"));
+	fail_if(purple_ipv6_address_is_valid("QWERTY::1"));
+}
+END_TEST
+
 START_TEST(test_util_str_to_time)
 {
 	fail_unless(377182200 == purple_str_to_time("19811214T12:50:00", TRUE, NULL, NULL, NULL));
@@ -94,10 +111,15 @@ START_TEST(test_markup_html_to_xhtml)
 	gchar *xhtml = NULL;
 	gchar *plaintext = NULL;
 	purple_markup_html_to_xhtml("<a>", &xhtml, &plaintext);
-	fail_unless(strcmp("<a href=''></a>", xhtml) == 0, NULL);
-	g_free(xhtml);
-	fail_unless(strcmp("", plaintext) == 0, NULL);
-	g_free(plaintext);
+	assert_string_equal_free("<a href=\"\"></a>", xhtml);
+	assert_string_equal_free("", plaintext);
+}
+END_TEST
+
+START_TEST(test_mime_decode_field)
+{
+	gchar *result = purple_mime_decode_field("=?ISO-8859-1?Q?Keld_J=F8rn_Simonsen?=");
+	assert_string_equal_free("Keld Jørn Simonsen", result);
 }
 END_TEST
 
@@ -129,6 +151,10 @@ util_suite(void)
 	tcase_add_test(tc, test_util_email_is_valid);
 	suite_add_tcase(s, tc);
 
+	tc = tcase_create("IPv6");
+	tcase_add_test(tc, test_util_ipv6_is_valid);
+	suite_add_tcase(s, tc);
+
 	tc = tcase_create("Time");
 	tcase_add_test(tc, test_util_str_to_time);
 	suite_add_tcase(s, tc);
@@ -137,5 +163,9 @@ util_suite(void)
 	tcase_add_test(tc, test_markup_html_to_xhtml);
 	suite_add_tcase(s, tc);
 
+	tc = tcase_create("MIME");
+	tcase_add_test(tc, test_mime_decode_field);
+	suite_add_tcase(s, tc);
+
 	return s;
 }
diff --git a/libpurple/tests/test_yahoo_util.c b/libpurple/tests/test_yahoo_util.c
new file mode 100644
index 0000000000..4f623316f0
--- /dev/null
+++ b/libpurple/tests/test_yahoo_util.c
@@ -0,0 +1,171 @@
+#include <string.h>
+
+#include "tests.h"
+#include "../protocols/yahoo/libymsg.h"
+
+static void setup_codes_to_html(void)
+{
+	yahoo_init_colorht();
+}
+
+static void teardown_codes_to_html(void)
+{
+	yahoo_dest_colorht();
+}
+
+START_TEST(test_codes_to_html)
+{
+	assert_string_equal_free("plain",
+			yahoo_codes_to_html("plain"));
+	assert_string_equal_free("unknown  ansi code",
+			yahoo_codes_to_html("unknown \x1B[12345m ansi code"));
+	assert_string_equal_free("plain &lt;peanut&gt;",
+			yahoo_codes_to_html("plain <peanut>"));
+	assert_string_equal_free("plain &lt;peanut",
+			yahoo_codes_to_html("plain <peanut"));
+	assert_string_equal_free("plain&gt; peanut",
+			yahoo_codes_to_html("plain> peanut"));
+	assert_string_equal_free("<font face='inva&gt;lid'>test</font>",
+			yahoo_codes_to_html("<font face='inva>lid'>test"));
+	assert_string_equal_free("&lt;font face=&apos;inva&gt;lid",
+			yahoo_codes_to_html("<font face='inva>lid"));
+
+	/* bold/italic/underline */
+	assert_string_equal_free("<b>bold</b>",
+			yahoo_codes_to_html("\x1B[1mbold"));
+	assert_string_equal_free("<i>italic</i>",
+			yahoo_codes_to_html("\x1B[2mitalic"));
+	assert_string_equal_free("<u>underline</u>",
+			yahoo_codes_to_html("\x1B[4munderline"));
+	assert_string_equal_free("no markup",
+			yahoo_codes_to_html("no\x1B[x4m markup"));
+	assert_string_equal_free("<b>bold</b> <i>italic</i> <u>underline</u>",
+			yahoo_codes_to_html("\x1B[1mbold\x1B[x1m \x1B[2mitalic\x1B[x2m \x1B[4munderline"));
+	assert_string_equal_free("<b>bold <i>bolditalic</i></b><i> italic</i>",
+			yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic\x1B[x1m italic"));
+	assert_string_equal_free("<b>bold <i>bolditalic</i></b><i> <u>italicunderline</u></i>",
+			yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic\x1B[x1m \x1B[4mitalicunderline"));
+	assert_string_equal_free("<b>bold <i>bolditalic <u>bolditalicunderline</u></i><u> boldunderline</u></b>",
+			yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic \x1B[4mbolditalicunderline\x1B[x2m boldunderline"));
+	assert_string_equal_free("<b>bold <i>bolditalic <u>bolditalicunderline</u></i></b><i><u> italicunderline</u></i>",
+			yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic \x1B[4mbolditalicunderline\x1B[x1m italicunderline"));
+
+	/* link */
+	assert_string_equal_free("http://pidgin.im/",
+			yahoo_codes_to_html("\x1B[lmhttp://pidgin.im/\x1B[xlm"));
+
+#ifdef USE_CSS_FORMATTING
+	/* font color */
+	assert_string_equal_free("<span style='color: #0000FF'>blue</span>",
+			yahoo_codes_to_html("\x1B[31mblue"));
+	assert_string_equal_free("<span style='color: #70ea15'>custom color</span>",
+			yahoo_codes_to_html("\x1B[#70ea15mcustom color"));
+
+	/* font face */
+	assert_string_equal_free("<font face='Georgia'>test</font>",
+			yahoo_codes_to_html("<font face='Georgia'>test</font>"));
+
+	/* font size */
+	assert_string_equal_free("<font><span style='font-size: 15pt'>test</span></font>",
+			yahoo_codes_to_html("<font size='15'>test"));
+	assert_string_equal_free("<font><span style='font-size: 32pt'>size 32</span></font>",
+			yahoo_codes_to_html("<font size='32'>size 32"));
+
+	/* combinations */
+	assert_string_equal_free("<font face='Georgia'><span style='font-size: 32pt'>test</span></font>",
+			yahoo_codes_to_html("<font face='Georgia' size='32'>test"));
+	assert_string_equal_free("<span style='color: #FF0080'><font><span style='font-size: 15pt'>test</span></font></span>",
+			yahoo_codes_to_html("\x1B[35m<font size='15'>test"));
+#else
+	/* font color */
+	assert_string_equal_free("<font color='#0000FF'>blue</font>",
+			yahoo_codes_to_html("\x1B[31mblue"));
+	assert_string_equal_free("<font color='#70ea15'>custom color</font>",
+			yahoo_codes_to_html("\x1B[#70ea15mcustom color"));
+	assert_string_equal_free("test",
+			yahoo_codes_to_html("<ALT #ff0000,#00ff00,#0000ff>test</ALT>"));
+
+	/* font face */
+	assert_string_equal_free("<font face='Georgia'>test</font>",
+			yahoo_codes_to_html("<font face='Georgia'>test"));
+
+	/* font size */
+	assert_string_equal_free("<font size='4' absz='15'>test</font>",
+			yahoo_codes_to_html("<font size='15'>test"));
+	assert_string_equal_free("<font size='6' absz='32'>size 32</font>",
+			yahoo_codes_to_html("<font size='32'>size 32"));
+
+	/* combinations */
+	assert_string_equal_free("<font face='Georgia' size='6' absz='32'>test</font>",
+			yahoo_codes_to_html("<font face='Georgia' size='32'>test"));
+	assert_string_equal_free("<font color='#FF0080'><font size='4' absz='15'>test</font></font>",
+			yahoo_codes_to_html("\x1B[35m<font size='15'>test"));
+#endif /* !USE_CSS_FORMATTING */
+}
+END_TEST
+
+#if 0
+START_TEST(test_html_to_codes)
+{
+	assert_string_equal_free("plain",
+			yahoo_html_to_codes("plain"));
+	assert_string_equal_free("plain <peanut>",
+			yahoo_html_to_codes("plain &lt;peanut&gt;"));
+	assert_string_equal_free("plain <peanut",
+			yahoo_html_to_codes("plain &lt;peanut"));
+	assert_string_equal_free("plain> peanut",
+			yahoo_html_to_codes("plain&gt; peanut"));
+	assert_string_equal_free("plain >",
+			yahoo_html_to_codes("plain &gt;"));
+	assert_string_equal_free("plain > ",
+			yahoo_html_to_codes("plain &gt; "));
+	assert_string_equal_free("plain <",
+			yahoo_html_to_codes("plain &lt;"));
+	assert_string_equal_free("plain < ",
+			yahoo_html_to_codes("plain &lt; "));
+	assert_string_equal_free("plain &lt",
+			yahoo_html_to_codes("plain &lt"));
+	assert_string_equal_free("plain &",
+			yahoo_html_to_codes("plain &amp;"));
+
+	/* bold/italic/underline */
+	// MARK: This isn't correct.  Should not have the closing bold escape code
+	assert_string_equal_free("\x1B[1mbold\x1B[x1m",
+			yahoo_html_to_codes("<b>bold</b>"));
+	assert_string_equal_free("\x1B[2mitalic\x1B[x2m",
+			yahoo_html_to_codes("<i>italic</i>"));
+	assert_string_equal_free("\x1B[4munderline\x1B[x4m",
+			yahoo_html_to_codes("<u>underline</u>"));
+	assert_string_equal_free("no markup",
+			yahoo_html_to_codes("no</u> markup"));
+	assert_string_equal_free("\x1B[1mbold\x1B[x1m \x1B[2mitalic\x1B[x2m \x1B[4munderline\x1B[x4m",
+			yahoo_html_to_codes("<b>bold</b> <i>italic</i> <u>underline</u>"));
+	assert_string_equal_free("\x1B[1mbold \x1B[2mbolditalic\x1B[x1m italic\x1B[x1m",
+			yahoo_html_to_codes("<b>bold <i>bolditalic</i></b><i> italic</i>"));
+	assert_string_equal_free("\x1B[1mbold \x1B[2mbolditalic\x1B[x1m \x1B[4mitalicunderline",
+			yahoo_html_to_codes("<b>bold <i>bolditalic</i></b><i> <u>italicunderline</u></i>"));
+}
+END_TEST
+#endif
+
+Suite *
+yahoo_util_suite(void)
+{
+	Suite *s;
+	TCase *tc;
+
+	s = suite_create("Yahoo Utility Functions");
+
+	tc = tcase_create("Convert IM from network format to HTML");
+	tcase_add_unchecked_fixture(tc, setup_codes_to_html, teardown_codes_to_html);
+	tcase_add_test(tc, test_codes_to_html);
+	suite_add_tcase(s, tc);
+
+#if 0
+	tc = tcase_create("Convert IM from HTML to network format");
+	tcase_add_test(tc, test_html_to_codes);
+	suite_add_tcase(s, tc);
+#endif
+
+	return s;
+}
diff --git a/libpurple/tests/tests.h b/libpurple/tests/tests.h
index dfd292ce6e..8ac8508538 100644
--- a/libpurple/tests/tests.h
+++ b/libpurple/tests/tests.h
@@ -10,6 +10,7 @@
 Suite * master_suite(void);
 Suite * cipher_suite(void);
 Suite * jabber_jutil_suite(void);
+Suite * yahoo_util_suite(void);
 Suite * util_suite(void);
 
 /* helper macros */
diff --git a/libpurple/theme-loader.h b/libpurple/theme-loader.h
index 8cd82155c3..5496f2c7e2 100644
--- a/libpurple/theme-loader.h
+++ b/libpurple/theme-loader.h
@@ -82,7 +82,8 @@ const gchar *purple_theme_loader_get_type_string(PurpleThemeLoader *self);
 /**
  * Creates a new PurpleTheme
  *
- * @param dir The directory containing the theme
+ * @param loader The theme loader
+ * @param dir    The directory containing the theme
  *
  * @returns A PurpleTheme containing the information from the directory
  */
diff --git a/libpurple/theme-manager.c b/libpurple/theme-manager.c
index 1843692f28..c46d260a1b 100644
--- a/libpurple/theme-manager.c
+++ b/libpurple/theme-manager.c
@@ -130,6 +130,7 @@ purple_theme_manager_build_dir(const gchar *root)
 				theme_dir = g_build_filename(purple_dir, type, NULL);
 
 				theme = purple_theme_loader_build(loader, theme_dir);
+				g_free(theme_dir);
 
 				if (PURPLE_IS_THEME(theme))
 					purple_theme_manager_add_theme(theme);
@@ -293,3 +294,16 @@ purple_theme_manager_for_each_theme(PTFunc func)
 	g_hash_table_foreach(theme_table,
 			(GHFunc) purple_theme_manager_function_wrapper, func);
 }
+
+PurpleTheme *
+purple_theme_manager_load_theme(const gchar *theme_dir, const gchar *type)
+{
+	PurpleThemeLoader *loader;	
+
+	g_return_val_if_fail(theme_dir != NULL && type != NULL, NULL);
+
+	loader = g_hash_table_lookup(theme_table, type);
+	g_return_val_if_fail(PURPLE_IS_THEME_LOADER(loader), NULL);
+
+	return purple_theme_loader_build(loader, theme_dir);
+}
diff --git a/libpurple/theme-manager.h b/libpurple/theme-manager.h
index 96e0a6986d..f7273394c0 100644
--- a/libpurple/theme-manager.h
+++ b/libpurple/theme-manager.h
@@ -1,5 +1,5 @@
 /**
- * @file thememanager.h  Theme Manager API
+ * @file theme-manager.h  Theme Manager API
  */
 
 /*
@@ -127,5 +127,13 @@ void purple_theme_manager_unregister_type(PurpleThemeLoader *loader);
  */
 void purple_theme_manager_for_each_theme(PTFunc func);
 
+/**
+ * Loads a theme of the given type without adding it to the manager
+ *
+ * @param theme_dir	the directory of the theme to load
+ * @param type		the type of theme to load
+ */
+PurpleTheme *purple_theme_manager_load_theme(const gchar *theme_dir, const gchar *type);
+
 G_END_DECLS
 #endif /* PURPLE_THEME_MANAGER_H */
diff --git a/libpurple/theme.c b/libpurple/theme.c
index 2560cf2548..384a44a945 100644
--- a/libpurple/theme.c
+++ b/libpurple/theme.c
@@ -241,9 +241,12 @@ purple_theme_get_type(void)
 static gchar *
 theme_clean_text(const gchar *text)
 {
-	gchar *clean_text = g_markup_escape_text(text, -1);
-	g_strdelimit(clean_text, "\n", ' ');
-	purple_str_strip_char(clean_text, '\r');
+	gchar *clean_text = NULL;
+	if (text != NULL) {
+		clean_text = g_markup_escape_text(text, -1);
+		g_strdelimit(clean_text, "\n", ' ');
+		purple_str_strip_char(clean_text, '\r');
+	}
 	return clean_text;
 }
 
@@ -389,9 +392,10 @@ purple_theme_get_image_full(PurpleTheme *theme)
 {
 	const gchar *filename = purple_theme_get_image(theme);
 
-	g_return_val_if_fail(filename, NULL);
-
-	return g_build_filename(purple_theme_get_dir(PURPLE_THEME(theme)), filename, NULL);
+	if (filename)
+		return g_build_filename(purple_theme_get_dir(PURPLE_THEME(theme)), filename, NULL);
+	else
+		return NULL;
 }
 
 void
diff --git a/libpurple/upnp.c b/libpurple/upnp.c
index 6d91061db8..20e7244fbe 100644
--- a/libpurple/upnp.c
+++ b/libpurple/upnp.c
@@ -130,7 +130,7 @@ typedef struct {
 	guint tima;	/* purple_timeout_add handle */
 	int fd;
 	struct sockaddr_in server;
-	gchar service_type[25];
+	gchar service_type[20];
 	int retry_count;
 	gchar *full_url;
 } UPnPDiscoveryData;
@@ -807,7 +807,7 @@ looked_up_internal_ip_cb(gpointer data, gint source, const gchar *error_message)
 				control_info.internalip);
 		close(source);
 	} else
-		purple_debug_info("upnp", "Unable to look up local IP\n");
+		purple_debug_error("upnp", "Unable to look up local IP\n");
 
 }
 
diff --git a/libpurple/util.c b/libpurple/util.c
index ac7598e317..beeffff64f 100644
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -65,9 +65,10 @@ struct _PurpleUtilFetchUrlData
 	gboolean got_headers;
 	gboolean has_explicit_data_len;
 	char *webdata;
-	unsigned long len;
+	gsize len;
 	unsigned long data_len;
 	gssize max_len;
+	gboolean chunked;
 };
 
 static char *custom_user_dir = NULL;
@@ -129,7 +130,7 @@ purple_base16_encode(const guchar *data, gsize len)
 	ascii = g_malloc(len * 2 + 1);
 
 	for (i = 0; i < len; i++)
-		snprintf(&ascii[i * 2], 3, "%02hhx", data[i]);
+		g_snprintf(&ascii[i * 2], 3, "%02hhx", data[i]);
 
 	return ascii;
 }
@@ -219,6 +220,9 @@ static const char xdigits[] =
 gchar *
 purple_base64_encode(const guchar *data, gsize len)
 {
+#if GLIB_CHECK_VERSION(2,12,0)
+	return g_base64_encode(data, len);
+#else
 	char *out, *rv;
 
 	g_return_val_if_fail(data != NULL, NULL);
@@ -253,11 +257,21 @@ purple_base64_encode(const guchar *data, gsize len)
 	*out = '\0';
 
 	return rv;
+#endif /* GLIB < 2.12.0 */
 }
 
 guchar *
 purple_base64_decode(const char *str, gsize *ret_len)
 {
+#if GLIB_CHECK_VERSION(2,12,0)
+	/*
+	 * We want to allow ret_len to be NULL for backward compatibility,
+	 * but g_base64_decode() requires a valid length variable.  So if
+	 * ret_len is NULL then pass in a dummy variable.
+	 */
+	gsize unused;
+	return g_base64_decode(str, ret_len != NULL ? ret_len : &unused);
+#else
 	guchar *out = NULL;
 	char tmp = 0;
 	const char *c;
@@ -319,6 +333,7 @@ purple_base64_decode(const char *str, gsize *ret_len)
 		*ret_len = len;
 
 	return out;
+#endif /* GLIB < 2.12.0 */
 }
 
 /**************************************************************************
@@ -390,7 +405,7 @@ purple_mime_decode_field(const char *str)
 	encoded_word_state_t state = state_start;
 	const char *cur, *mark;
 	const char *charset0 = NULL, *encoding0 = NULL, *encoded_text0 = NULL;
-	char *n, *new;
+	GString *new;
 
 	/* token can be any CHAR (supposedly ISO8859-1/ISO2022), not just ASCII */
 	#define token_char_p(c) \
@@ -400,16 +415,9 @@ purple_mime_decode_field(const char *str)
 	#define encoded_text_char_p(c) \
 		((c & 0x80) == 0 && c != '?' && c != ' ' && isgraph(c))
 
-	#define RECOVER_MARKED_TEXT strncpy(n, mark, cur - mark + 1); \
-		n += cur - mark + 1
-
 	g_return_val_if_fail(str != NULL, NULL);
 
-	/* NOTE: Assuming that we need just strlen(str)+1 *may* be wrong.
-	 * It would be wrong if one byte (in some unknown encoding) could
-	 * expand to >=4 bytes of UTF-8; I don't know if there are such things.
-	 */
-	n = new = g_malloc(strlen(str) + 1);
+	new = g_string_new(NULL);
 
 	/* Here we will be looking for encoded words and if they seem to be
 	 * valid then decode them.
@@ -422,7 +430,7 @@ purple_mime_decode_field(const char *str)
 			if (*cur == '?') {
 				state = state_question1;
 			} else {
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -431,7 +439,7 @@ purple_mime_decode_field(const char *str)
 				charset0 = cur;
 				state = state_charset;
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -439,7 +447,7 @@ purple_mime_decode_field(const char *str)
 			if (*cur == '?') {
 				state = state_question2;
 			} else if (!token_char_p(*cur)) { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -448,7 +456,7 @@ purple_mime_decode_field(const char *str)
 				encoding0 = cur;
 				state = state_encoding;
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -456,7 +464,7 @@ purple_mime_decode_field(const char *str)
 			if (*cur == '?') {
 				state = state_question3;
 			} else if (!token_char_p(*cur)) { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -468,7 +476,7 @@ purple_mime_decode_field(const char *str)
 				encoded_text0 = cur;
 				state = state_question4;
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -476,7 +484,7 @@ purple_mime_decode_field(const char *str)
 			if (*cur == '?') {
 				state = state_question4;
 			} else if (!encoded_text_char_p(*cur)) {
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -498,7 +506,7 @@ purple_mime_decode_field(const char *str)
 					char *converted = g_convert((const gchar *)decoded, dec_len, "utf-8", charset, NULL, &len, NULL);
 
 					if (converted) {
-						n = strncpy(n, converted, len) + len;
+						g_string_append_len(new, converted, len);
 						g_free(converted);
 					}
 					g_free(decoded);
@@ -508,7 +516,7 @@ purple_mime_decode_field(const char *str)
 				g_free(encoded_text);
 				state = state_equal2; /* Restart the FSM */
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -518,19 +526,16 @@ purple_mime_decode_field(const char *str)
 				state = state_equal1;
 			} else {
 				/* Some unencoded text. */
-				*n = *cur;
-				n += 1;
+				g_string_append_c(new, *cur);
 			}
 			break;
 		} /* switch */
 	} /* for */
 
-	if (state != state_start) {
-		RECOVER_MARKED_TEXT;
-	}
-	*n = '\0';
+	if (state != state_start)
+		g_string_append_len(new, mark, cur - mark + 1);
 
-	return new;
+	return g_string_free(new, FALSE);;
 }
 
 
@@ -927,6 +932,77 @@ purple_str_to_time(const char *timestamp, gboolean utc,
  * Markup Functions
  **************************************************************************/
 
+/*
+ * This function is stolen from glib's gmarkup.c and modified to not
+ * replace ' with &apos;
+ */
+static void append_escaped_text(GString *str,
+		const gchar *text, gssize length)
+{
+	const gchar *p;
+	const gchar *end;
+	gunichar c;
+
+	p = text;
+	end = text + length;
+
+	while (p != end)
+	{
+		const gchar *next;
+		next = g_utf8_next_char (p);
+
+		switch (*p)
+		{
+			case '&':
+				g_string_append (str, "&amp;");
+				break;
+
+			case '<':
+				g_string_append (str, "&lt;");
+				break;
+
+			case '>':
+				g_string_append (str, "&gt;");
+				break;
+
+			case '"':
+				g_string_append (str, "&quot;");
+				break;
+
+			default:
+				c = g_utf8_get_char (p);
+				if ((0x1 <= c && c <= 0x8) ||
+						(0xb <= c && c <= 0xc) ||
+						(0xe <= c && c <= 0x1f) ||
+						(0x7f <= c && c <= 0x84) ||
+						(0x86 <= c && c <= 0x9f))
+					g_string_append_printf (str, "&#x%x;", c);
+				else
+					g_string_append_len (str, p, next - p);
+				break;
+		}
+
+		p = next;
+	}
+}
+
+/* This function is stolen from glib's gmarkup.c */
+gchar *purple_markup_escape_text(const gchar *text, gssize length)
+{
+	GString *str;
+
+	g_return_val_if_fail(text != NULL, NULL);
+
+	if (length < 0)
+		length = strlen(text);
+
+	/* prealloc at least as long as original text */
+	str = g_string_sized_new(length);
+	append_escaped_text(str, text, length);
+
+	return g_string_free(str, FALSE);
+}
+
 const char *
 purple_markup_unescape_entity(const char *text, int *length)
 {
@@ -964,8 +1040,8 @@ purple_markup_unescape_entity(const char *text, int *length)
 		buf[buflen] = '\0';
 		pln = buf;
 
-		len = 2;
-		while(isdigit((gint) text[len])) len++;
+		len = (*(text+2) == 'x' ? 3 : 2);
+		while(isxdigit((gint) text[len])) len++;
 		if(text[len] == ';') len++;
 	}
 	else
@@ -1041,6 +1117,35 @@ purple_markup_get_css_property(const gchar *style,
 	return ret;
 }
 
+gboolean purple_markup_is_rtl(const char *html)
+{
+	GData *attributes;
+	const gchar *start, *end;
+	gboolean res = FALSE;
+
+	if (purple_markup_find_tag("span", html, &start, &end, &attributes))
+	{
+		/* tmp is a member of attributes and is free with g_datalist_clear call */
+		const char *tmp = g_datalist_get_data(&attributes, "dir");
+		if (tmp && !g_ascii_strcasecmp(tmp, "RTL"))
+			res = TRUE;
+		if (!res)
+		{
+			tmp = g_datalist_get_data(&attributes, "style");
+			if (tmp)
+			{
+				char *tmp2 = purple_markup_get_css_property(tmp, "direction");
+				if (tmp2 && !g_ascii_strcasecmp(tmp2, "RTL"))
+					res = TRUE;
+				g_free(tmp2);
+			}
+
+		}
+		g_datalist_clear(&attributes);
+	}
+	return res;
+}
+
 gboolean
 purple_markup_find_tag(const char *needle, const char *haystack,
 					 const char **start, const char **end, GData **attributes)
@@ -1294,6 +1399,12 @@ struct purple_parse_tag {
 	gboolean ignore;
 };
 
+/* NOTE: Do not put `do {} while(0)` around this macro (as this is the method
+         recommended in the GCC docs). It contains 'continue's that should
+         affect the while-loop in purple_markup_html_to_xhtml and doing the
+         above would break that.
+         Also, remember to put braces in constructs that require them for
+         multiple statements when using this macro. */
 #define ALLOW_TAG_ALT(x, y) if(!g_ascii_strncasecmp(c, "<" x " ", strlen("<" x " "))) { \
 						const char *o = c + strlen("<" x); \
 						const char *p = NULL, *q = NULL, *r = NULL; \
@@ -1345,26 +1456,27 @@ struct purple_parse_tag {
 						g_string_free(innards, TRUE); \
 						continue; \
 					} \
-						if(!g_ascii_strncasecmp(c, "<" x, strlen("<" x)) && \
-								(*(c+strlen("<" x)) == '>' || \
-								 !g_ascii_strncasecmp(c+strlen("<" x), "/>", 2))) { \
+					if(!g_ascii_strncasecmp(c, "<" x, strlen("<" x)) && \
+							(*(c+strlen("<" x)) == '>' || \
+							 !g_ascii_strncasecmp(c+strlen("<" x), "/>", 2))) { \
+						if(xhtml) \
+							xhtml = g_string_append(xhtml, "<" y); \
+						c += strlen("<" x); \
+						if(*c != '/') { \
+							struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1); \
+							pt->src_tag = x; \
+							pt->dest_tag = y; \
+							tags = g_list_prepend(tags, pt); \
 							if(xhtml) \
-								xhtml = g_string_append(xhtml, "<" y); \
-							c += strlen("<" x); \
-							if(*c != '/') { \
-								struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1); \
-								pt->src_tag = x; \
-								pt->dest_tag = y; \
-								tags = g_list_prepend(tags, pt); \
-								if(xhtml) \
-									xhtml = g_string_append_c(xhtml, '>'); \
-							} else { \
-								if(xhtml) \
-									xhtml = g_string_append(xhtml, "/>");\
-							} \
-							c = strchr(c, '>') + 1; \
-							continue; \
-						}
+								xhtml = g_string_append_c(xhtml, '>'); \
+						} else { \
+							if(xhtml) \
+								xhtml = g_string_append(xhtml, "/>");\
+						} \
+						c = strchr(c, '>') + 1; \
+						continue; \
+					}
+/* Don't forget to check the note above for ALLOW_TAG_ALT. */
 #define ALLOW_TAG(x) ALLOW_TAG_ALT(x, x)
 void
 purple_markup_html_to_xhtml(const char *html, char **xhtml_out,
@@ -1457,8 +1569,9 @@ purple_markup_html_to_xhtml(const char *html, char **xhtml_out,
 				ALLOW_TAG("h5");
 				ALLOW_TAG("h6");
 				/* we only allow html to start the message */
-				if(c == html)
+				if(c == html) {
 					ALLOW_TAG("html");
+				}
 				ALLOW_TAG_ALT("i", "em");
 				ALLOW_TAG_ALT("italic", "em");
 				ALLOW_TAG("li");
@@ -1623,7 +1736,7 @@ purple_markup_html_to_xhtml(const char *html, char **xhtml_out,
 					pt->dest_tag = "a";
 					tags = g_list_prepend(tags, pt);
 					if(xhtml)
-						g_string_append_printf(xhtml, "<a href='%s'>", url ? g_strstrip(url->str) : "");
+						g_string_append_printf(xhtml, "<a href=\"%s\">", url ? g_strstrip(url->str) : "");
 					continue;
 				}
 				if(!g_ascii_strncasecmp(c, "<font", 5) && (*(c+5) == '>' || *(c+5) == ' ')) {
@@ -2017,7 +2130,6 @@ badchar(char c)
 	case '<':
 	case '>':
 	case '"':
-	case '\'':
 		return TRUE;
 	default:
 		return FALSE;
@@ -2356,30 +2468,32 @@ purple_markup_linkify(const char *text)
 	return g_string_free(ret, FALSE);
 }
 
-char *
-purple_unescape_html(const char *html) {
-	if (html != NULL) {
-		const char *c = html;
-		GString *ret = g_string_new("");
-		while (*c) {
-			int len;
-			const char *ent;
-
-			if ((ent = purple_markup_unescape_entity(c, &len)) != NULL) {
-				ret = g_string_append(ret, ent);
-				c += len;
-			} else if (!strncmp(c, "<br>", 4)) {
-				ret = g_string_append_c(ret, '\n');
-				c += 4;
-			} else {
-				ret = g_string_append_c(ret, *c);
-				c++;
-			}
+char *purple_unescape_html(const char *html)
+{
+	GString *ret;
+	const char *c = html;
+
+	if (html == NULL)
+		return NULL;
+
+	ret = g_string_new("");
+	while (*c) {
+		int len;
+		const char *ent;
+
+		if ((ent = purple_markup_unescape_entity(c, &len)) != NULL) {
+			g_string_append(ret, ent);
+			c += len;
+		} else if (!strncmp(c, "<br>", 4)) {
+			g_string_append_c(ret, '\n');
+			c += 4;
+		} else {
+			g_string_append_c(ret, *c);
+			c++;
 		}
-		return g_string_free(ret, FALSE);
 	}
 
-	return NULL;
+	return g_string_free(ret, FALSE);
 }
 
 char *
@@ -2850,6 +2964,12 @@ purple_util_get_image_extension(gconstpointer data, size_t len)
 	return "icon";
 }
 
+/*
+ * We thought about using non-cryptographic hashes like CRC32 here.
+ * They would be faster, but we think using something more secure is
+ * important, so that it is more difficult for someone to maliciously
+ * replace one buddy's icon with something else.
+ */
 char *
 purple_util_get_image_checksum(gconstpointer image_data, size_t image_len)
 {
@@ -2977,13 +3097,15 @@ purple_fd_get_ip(int fd)
 {
 	struct sockaddr addr;
 	socklen_t namelen = sizeof(addr);
+	struct in_addr in;
 
 	g_return_val_if_fail(fd != 0, NULL);
 
 	if (getsockname(fd, &addr, &namelen))
 		return NULL;
 
-	return g_strdup(inet_ntoa(((struct sockaddr_in *)&addr)->sin_addr));
+	in = ((struct sockaddr_in *)&addr)->sin_addr;
+	return g_strdup(inet_ntoa(in));
 }
 
 
@@ -3387,6 +3509,7 @@ purple_str_binary_to_ascii(const unsigned char *binary, guint len)
 void purple_got_protocol_handler_uri(const char *uri)
 {
 	char proto[11];
+	char delimiter;
 	const char *tmp, *param_string;
 	char *cmd;
 	GHashTable *params = NULL;
@@ -3402,7 +3525,13 @@ void purple_got_protocol_handler_uri(const char *uri)
 	proto[len] = '\0';
 
 	tmp++;
-	purple_debug_info("util", "Processing message '%s' for protocol '%s'.\n", tmp, proto);
+
+	if (g_str_equal(proto, "xmpp"))
+		delimiter = ';';
+	else
+		delimiter = '&';
+
+	purple_debug_info("util", "Processing message '%s' for protocol '%s' using delimiter '%c'.\n", tmp, proto, delimiter);
 
 	if ((param_string = strchr(tmp, '?'))) {
 		const char *keyend = NULL, *pairstart;
@@ -3415,7 +3544,7 @@ void purple_got_protocol_handler_uri(const char *uri)
 		pairstart = tmp = param_string;
 
 		while (*tmp || *pairstart) {
-			if (*tmp == '&' || !(*tmp)) {
+			if (*tmp == delimiter || !(*tmp)) {
 				/* If there is no explicit value */
 				if (keyend == NULL)
 					keyend = tmp;
@@ -3680,41 +3809,43 @@ parse_redirect(const char *data, size_t data_len,
 	return TRUE;
 }
 
-static size_t
-parse_content_len(const char *data, size_t data_len)
+static const char *
+find_header_content(const char *data, size_t data_len, const char *header, size_t header_len)
 {
-	size_t content_len = 0;
 	const char *p = NULL;
 
-	/* This is still technically wrong, since headers are case-insensitive
-	 * [RFC 2616, section 4.2], though this ought to catch the normal case.
-	 * Note: data is _not_ nul-terminated.
-	 */
-	if(data_len > 16) {
-		p = (strncmp(data, "Content-Length: ", 16) == 0) ? data : NULL;
-		if(!p)
-			p = (strncmp(data, "CONTENT-LENGTH: ", 16) == 0)
-				? data : NULL;
-		if(!p) {
-			p = g_strstr_len(data, data_len, "\nContent-Length: ");
-			if (p)
-				p++;
-		}
-		if(!p) {
-			p = g_strstr_len(data, data_len, "\nCONTENT-LENGTH: ");
-			if (p)
-				p++;
-		}
+	if (header_len <= 0)
+		header_len = strlen(header);
 
-		if(p)
-			p += 16;
+	/* Note: data is _not_ nul-terminated.  */
+	if (data_len > header_len) {
+		if (header[0] == '\n')
+			p = (g_ascii_strncasecmp(data, header + 1, header_len - 1) == 0) ? data : NULL;
+		if (!p)
+			p = purple_strcasestr(data, header);
+		if (p)
+			p += header_len;
 	}
 
-	/* If we can find a Content-Length header at all, try to sscanf it.
+	/* If we can find the header at all, try to sscanf it.
 	 * Response headers should end with at least \r\n, so sscanf is safe,
 	 * if we make sure that there is indeed a \n in our header.
 	 */
 	if (p && g_strstr_len(p, data_len - (p - data), "\n")) {
+		return p;
+	}
+
+	return NULL;
+}
+
+static size_t
+parse_content_len(const char *data, size_t data_len)
+{
+	size_t content_len = 0;
+	const char *p = NULL;
+
+	p = find_header_content(data, data_len, "\nContent-Length: ", sizeof("\nContent-Length: ") - 1);
+	if (p) {
 		sscanf(p, "%" G_GSIZE_FORMAT, &content_len);
 		purple_debug_misc("util", "parsed %" G_GSIZE_FORMAT "\n", content_len);
 	}
@@ -3722,6 +3853,74 @@ parse_content_len(const char *data, size_t data_len)
 	return content_len;
 }
 
+static gboolean
+content_is_chunked(const char *data, size_t data_len)
+{
+	const char *p = find_header_content(data, data_len, "\nTransfer-Encoding: ", sizeof("\nTransfer-Encoding: ") - 1);
+	if (p && g_ascii_strncasecmp(p, "chunked", 7) == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+/* Process in-place */
+static void
+process_chunked_data(char *data, gsize *len)
+{
+	gsize sz;
+	gsize newlen = 0;
+	char *p = data;
+	char *s = data;
+
+	while (*s) {
+		/* Read the size of this chunk */
+		if (sscanf(s, "%" G_GSIZE_MODIFIER "x", &sz) != 1)
+		{
+			purple_debug_error("util", "Error processing chunked data: "
+					"Expected data length, found: %s\n", s);
+			break;
+		}
+		if (sz == 0) {
+			/* We've reached the last chunk */
+			/*
+			 * TODO: The spec allows "footers" to follow the last chunk.
+			 *       If there is more data after this line then we should
+			 *       treat it like a header.
+			 */
+			break;
+		}
+
+		/* Advance to the start of the data */
+		s = strstr(s, "\r\n");
+		if (s == NULL)
+			break;
+		s += 2;
+
+		if (s + sz > data + *len) {
+			purple_debug_error("util", "Error processing chunked data: "
+					"Chunk size %" G_GSIZE_FORMAT " bytes was longer "
+					"than the data remaining in the buffer (%"
+					G_GSIZE_FORMAT " bytes)\n", sz, data + *len - s);
+		}
+
+		/* Move all data overtop of the chunk length that we read in earlier */
+		g_memmove(p, s, sz);
+		p += sz;
+		s += sz;
+		newlen += sz;
+		if (*s != '\r' && *(s + 1) != '\n') {
+			purple_debug_error("util", "Error processing chunked data: "
+					"Expected \\r\\n, found: %s\n", s);
+			break;
+		}
+		s += 2;
+	}
+
+	/* NULL terminate the data */
+	*p = 0;
+
+	*len = newlen;
+}
 
 static void
 url_fetch_recv_cb(gpointer url_data, gint source, PurpleInputCondition cond)
@@ -3782,6 +3981,7 @@ url_fetch_recv_cb(gpointer url_data, gint source, PurpleInputCondition cond)
 
 				/* No redirect. See if we can find a content length. */
 				content_len = parse_content_len(gfud->webdata, header_len);
+				gfud->chunked = content_is_chunked(gfud->webdata, header_len);
 
 				if(content_len == 0) {
 					/* We'll stick with an initial 8192 */
@@ -3854,6 +4054,11 @@ url_fetch_recv_cb(gpointer url_data, gint source, PurpleInputCondition cond)
 		gfud->webdata = g_realloc(gfud->webdata, gfud->len + 1);
 		gfud->webdata[gfud->len] = '\0';
 
+		if (!gfud->include_headers && gfud->chunked) {
+			/* Process only if we don't want the headers. */
+			process_chunked_data(gfud->webdata, &gfud->len);
+		}
+
 		gfud->callback(gfud, gfud->user_data, gfud->webdata, gfud->len, NULL);
 		purple_util_fetch_url_cancel(gfud);
 	}
@@ -3864,7 +4069,7 @@ static void ssl_url_fetch_recv_cb(gpointer data, PurpleSslConnection *ssl_connec
 	url_fetch_recv_cb(data, -1, cond);
 }
 
-/*
+/**
  * This function is called when the socket is available to be written
  * to.
  *
@@ -3914,7 +4119,10 @@ url_fetch_send_cb(gpointer data, gint source, PurpleInputCondition cond)
 		}
 	}
 
-	purple_debug_misc("util", "Request: '%s'\n", gfud->request);
+	if(purple_debug_is_unsafe())
+		purple_debug_misc("util", "Request: '%s'\n", gfud->request);
+	else
+		purple_debug_misc("util", "request constructed\n");
 
 	total_len = strlen(gfud->request);
 
@@ -4000,7 +4208,7 @@ purple_util_fetch_url_request(const char *url, gboolean full,
 		const char *request, gboolean include_headers,
 		PurpleUtilFetchUrlCallback callback, void *user_data)
 {
-	return purple_util_fetch_url_request_len(url, full,
+	return purple_util_fetch_url_request_len_with_account(NULL, url, full,
 					     user_agent, http11,
 					     request, include_headers, -1,
 					     callback, user_data);
@@ -4012,14 +4220,28 @@ purple_util_fetch_url_request_len(const char *url, gboolean full,
 		const char *request, gboolean include_headers, gssize max_len,
 		PurpleUtilFetchUrlCallback callback, void *user_data)
 {
+	return purple_util_fetch_url_request_len_with_account(NULL, url, full,
+			user_agent, http11, request, include_headers, max_len, callback,
+			user_data);
+}
+
+PurpleUtilFetchUrlData *
+purple_util_fetch_url_request_len_with_account(PurpleAccount *account,
+		const char *url, gboolean full,	const char *user_agent, gboolean http11,
+		const char *request, gboolean include_headers, gssize max_len,
+		PurpleUtilFetchUrlCallback callback, void *user_data)
+{
 	PurpleUtilFetchUrlData *gfud;
 
 	g_return_val_if_fail(url      != NULL, NULL);
 	g_return_val_if_fail(callback != NULL, NULL);
 
-	purple_debug_info("util",
-			 "requested to fetch (%s), full=%d, user_agent=(%s), http11=%d\n",
-			 url, full, user_agent?user_agent:"(null)", http11);
+	if(purple_debug_is_unsafe())
+		purple_debug_info("util",
+				 "requested to fetch (%s), full=%d, user_agent=(%s), http11=%d\n",
+				 url, full, user_agent?user_agent:"(null)", http11);
+	else
+		purple_debug_info("util", "requesting to fetch a URL\n");
 
 	gfud = g_new0(PurpleUtilFetchUrlData, 1);
 
@@ -4038,12 +4260,20 @@ purple_util_fetch_url_request_len(const char *url, gboolean full,
 				   &gfud->website.page, &gfud->website.user, &gfud->website.passwd);
 
 	if (purple_strcasestr(url, "https://") != NULL) {
+		if (!purple_ssl_is_supported()) {
+			purple_util_fetch_url_error(gfud,
+					_("Unable to connect to %s: %s"),
+					gfud->website.address,
+					_("Server requires TLS/SSL, but no TLS/SSL support was found."));
+			return NULL;
+		}
+
 		gfud->is_ssl = TRUE;
-		gfud->ssl_connection = purple_ssl_connect(NULL,
+		gfud->ssl_connection = purple_ssl_connect(account,
 				gfud->website.address, gfud->website.port,
 				ssl_url_fetch_connect_cb, ssl_url_fetch_error_cb, gfud);
 	} else {
-		gfud->connect_data = purple_proxy_connect(NULL, NULL,
+		gfud->connect_data = purple_proxy_connect(NULL, account,
 				gfud->website.address, gfud->website.port,
 				url_fetch_connect_cb, gfud);
 	}
@@ -4222,7 +4452,7 @@ purple_email_is_valid(const char *address)
 }
 
 gboolean
-purple_ip_address_is_valid(const char *ip)
+purple_ipv4_address_is_valid(const char *ip)
 {
 	int c, o1, o2, o3, o4;
 	char end;
@@ -4235,6 +4465,58 @@ purple_ip_address_is_valid(const char *ip)
 	return TRUE;
 }
 
+gboolean
+purple_ipv6_address_is_valid(const gchar *ip)
+{
+	const gchar *c;
+	gboolean double_colon = FALSE;
+	gint chunks = 1;
+	gint in = 0;
+
+	g_return_val_if_fail(ip != NULL, FALSE);
+
+	if (*ip == '\0')
+		return FALSE;
+
+	for (c = ip; *c; ++c) {
+		if ((*c >= '0' && *c <= '9') ||
+		        (*c >= 'a' && *c <= 'f') ||
+		        (*c >= 'A' && *c <= 'F')) {
+			if (++in > 4)
+				/* Only four hex digits per chunk */
+				return FALSE;
+			continue;
+		} else if (*c == ':') {
+			/* The start of a new chunk */
+			++chunks;
+			in = 0;
+			if (*(c + 1) == ':') {
+				/*
+				 * '::' indicates a consecutive series of chunks full
+				 * of zeroes. There can be only one of these per address.
+				 */
+				if (double_colon)
+					return FALSE;
+				double_colon = TRUE;
+			}
+		} else
+			return FALSE;
+	}
+
+	/*
+	 * Either we saw a '::' and there were fewer than 8 chunks -or-
+	 * we didn't see a '::' and saw exactly 8 chunks.
+	 */
+	return (double_colon && chunks < 8) || (!double_colon && chunks == 8);
+}
+
+/* TODO 3.0.0: Add ipv6 check, too */
+gboolean
+purple_ip_address_is_valid(const char *ip)
+{
+	return purple_ipv4_address_is_valid(ip);
+}
+
 /* Stolen from gnome_uri_list_extract_uris */
 GList *
 purple_uri_list_extract_uris(const gchar *uri_list)
@@ -4366,6 +4648,37 @@ purple_utf8_salvage(const char *str)
 	return g_string_free(workstr, FALSE);
 }
 
+gchar *
+purple_utf8_strip_unprintables(const gchar *str)
+{
+	gchar *workstr, *iter;
+
+	if (str == NULL)
+		/* Act like g_strdup */
+		return NULL;
+
+	g_return_val_if_fail(g_utf8_validate(str, -1, NULL), NULL);
+
+	workstr = iter = g_new(gchar, strlen(str) + 1);
+	while (*str) {
+		gunichar c = g_utf8_get_char(str);
+		const gchar *next = g_utf8_next_char(str);
+		size_t len = next - str;
+
+		if (g_unichar_isprint(c)) {
+			memcpy(iter, str, len);
+			iter += len;
+		}
+
+		str = next;
+	}
+
+	/* nul-terminate the new string */
+	*iter = '\0';
+
+	return workstr;
+}
+
 /*
  * This function is copied from g_strerror() but changed to use
  * gai_strerror().
diff --git a/libpurple/util.h b/libpurple/util.h
index b68c746706..e1be673e24 100644
--- a/libpurple/util.h
+++ b/libpurple/util.h
@@ -31,23 +31,26 @@
 
 #include <stdio.h>
 
+typedef struct _PurpleUtilFetchUrlData PurpleUtilFetchUrlData;
+typedef struct _PurpleMenuAction PurpleMenuAction;
+typedef struct _PurpleKeyValuePair PurpleKeyValuePair;
+
 #include "account.h"
 #include "xmlnode.h"
 #include "notify.h"
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct _PurpleUtilFetchUrlData PurpleUtilFetchUrlData;
-
-typedef struct _PurpleMenuAction
+struct _PurpleMenuAction
 {
 	char *label;
 	PurpleCallback callback;
 	gpointer data;
 	GList *children;
-} PurpleMenuAction;
+};
 
 typedef char *(*PurpleInfoFieldFormatCallback)(const char *field, size_t len);
 
@@ -57,12 +60,12 @@ typedef char *(*PurpleInfoFieldFormatCallback)(const char *field, size_t len);
  * This is used by, among other things, purple_gtk_combo* functions to pass in a
  * list of key-value pairs so it can display a user-friendly value.
  */
-typedef struct _PurpleKeyValuePair
+struct _PurpleKeyValuePair
 {
 	gchar *key;
 	void *value;
 
-} PurpleKeyValuePair;
+};
 
 /**
  * Creates a new PurpleMenuAction.
@@ -412,6 +415,19 @@ time_t purple_str_to_time(const char *timestamp, gboolean utc,
 /*@{*/
 
 /**
+ * Escapes special characters in a plain-text string so they display
+ * correctly as HTML.  For example, & is replaced with &amp; and < is
+ * replaced with &lt;
+ *
+ * This is exactly the same as g_markup_escape_text(), except that it
+ * does not change ' to &apos; because &apos; is not a valid HTML 4 entity,
+ * and is displayed literally in IE7.
+ *
+ * @since 2.6.0
+ */
+gchar *purple_markup_escape_text(const gchar *text, gssize length);
+
+/**
  * Finds an HTML tag matching the given name.
  *
  * This locates an HTML tag's start and end, and stores its attributes
@@ -493,7 +509,8 @@ char *purple_markup_strip_html(const char *str);
 char *purple_markup_linkify(const char *str);
 
 /**
- * Unescapes HTML entities to their literal characters.
+ * Unescapes HTML entities to their literal characters. Also translates
+ * "<br>" to "\n".
  * For example "&amp;" is replaced by '&' and so on.
  * Actually only "&amp;", "&quot;", "&lt;" and "&gt;" are currently
  * supported.
@@ -575,6 +592,16 @@ const char * purple_markup_unescape_entity(const char *text, int *length);
  */
 char * purple_markup_get_css_property(const gchar *style, const gchar *opt);
 
+/**
+ * Check if the given HTML contains RTL text.
+ *
+ * @param html  The HTML text.
+ *
+ * @return  TRUE if the text contains RTL text, FALSE otherwise.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_markup_is_rtl(const char *html);
 
 /*@}*/
 
@@ -1100,7 +1127,7 @@ PurpleUtilFetchUrlData *purple_util_fetch_url_request(const gchar *url,
  * @param max_len    The maximum number of bytes to retrieve (-1 for unlimited)
  * @param callback   The callback function.
  * @param data       The user data to pass to the callback function.
- * @deprecated       In 3.0.0, we'll rename this to "purple_util_fetch_url_request" and get rid of the old one
+ * @deprecated       In 3.0.0, this will go away.
  */
 PurpleUtilFetchUrlData *purple_util_fetch_url_request_len(const gchar *url,
 		gboolean full, const gchar *user_agent, gboolean http11,
@@ -1108,6 +1135,30 @@ PurpleUtilFetchUrlData *purple_util_fetch_url_request_len(const gchar *url,
 		PurpleUtilFetchUrlCallback callback, gpointer data);
 
 /**
+ * Fetches the data from a URL, and passes it to a callback function.
+ *
+ * @param account    The account for which the request is needed, or NULL.
+ * @param url        The URL.
+ * @param full       TRUE if this is the full URL, or FALSE if it's a
+ *                   partial URL.
+ * @param user_agent The user agent field to use, or NULL.
+ * @param http11     TRUE if HTTP/1.1 should be used to download the file.
+ * @param request    A HTTP request to send to the server instead of the
+ *                   standard GET
+ * @param include_headers
+ *                   If TRUE, include the HTTP headers in the response.
+ * @param max_len    The maximum number of bytes to retrieve (-1 for unlimited)
+ * @param callback   The callback function.
+ * @param data       The user data to pass to the callback function.
+ * @deprecated       In 3.0.0, we'll rename this to "purple_util_fetch_url_request" and get rid of the old one
+ */
+PurpleUtilFetchUrlData *purple_util_fetch_url_request_len_with_account(
+		PurpleAccount *account, const gchar *url,
+		gboolean full, const gchar *user_agent, gboolean http11,
+		const gchar *request, gboolean include_headers, gssize max_len,
+		PurpleUtilFetchUrlCallback callback, gpointer data);
+
+/**
  * Cancel a pending URL request started with either
  * purple_util_fetch_url_request() or purple_util_fetch_url().
  *
@@ -1152,10 +1203,33 @@ gboolean purple_email_is_valid(const char *address);
  * @param ip The IP address to validate.
  *
  * @return True if the IP address is syntactically correct.
+ * @deprecated This function will be replaced with one that validates
+ *             as either IPv4 or IPv6 in 3.0.0. If you don't want this,
+ *             behavior, use one of the more specific functions.
  */
 gboolean purple_ip_address_is_valid(const char *ip);
 
 /**
+ * Checks if the given IP address is a syntactically valid IPv4 address.
+ *
+ * @param ip The IP address to validate.
+ *
+ * @return True if the IP address is syntactically correct.
+ * @since 2.6.0
+ */
+gboolean purple_ipv4_address_is_valid(const char *ip);
+
+/**
+ * Checks if the given IP address is a syntactically valid IPv6 address.
+ *
+ * @param ip The IP address to validate.
+ *
+ * @return True if the IP address is syntactically correct.
+ * @since 2.6.0
+ */
+gboolean purple_ipv6_address_is_valid(const char *ip);
+
+/**
  * This function extracts a list of URIs from the a "text/uri-list"
  * string.  It was "borrowed" from gnome_uri_list_extract_uris
  *
@@ -1210,6 +1284,22 @@ gchar *purple_utf8_try_convert(const char *str);
 gchar *purple_utf8_salvage(const char *str);
 
 /**
+ * Removes unprintable characters from a UTF-8 string. These characters
+ * (in particular low-ASCII characters) are invalid in XML 1.0 and thus
+ * are not allowed in XMPP and are rejected by libxml2 by default. This
+ * function uses g_unichar_isprint to determine what characters should
+ * be stripped. The returned string must be freed by the caller.
+ *
+ * @param str A valid UTF-8 string.
+ *
+ * @return A newly allocated UTF-8 string without the unprintable characters.
+ * @since 2.6.0
+ *
+ * @see g_unichar_isprint
+ */
+gchar *purple_utf8_strip_unprintables(const gchar *str);
+
+/**
  * Return the UTF-8 version of gai_strerror().  It calls gai_strerror()
  * then converts the result to UTF-8.  This function is analogous to
  * g_strerror().
diff --git a/libpurple/valgrind.h b/libpurple/valgrind.h
new file mode 100644
index 0000000000..577c59ab0c
--- /dev/null
+++ b/libpurple/valgrind.h
@@ -0,0 +1,3924 @@
+/* -*- c -*-
+   ----------------------------------------------------------------
+
+   Notice that the following BSD-style license applies to this one
+   file (valgrind.h) only.  The rest of Valgrind is licensed under the
+   terms of the GNU General Public License, version 2, unless
+   otherwise indicated.  See the COPYING file in the source
+   distribution for details.
+
+   ----------------------------------------------------------------
+
+   This file is part of Valgrind, a dynamic binary instrumentation
+   framework.
+
+   Copyright (C) 2000-2008 Julian Seward.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. The origin of this software must not be misrepresented; you must 
+      not claim that you wrote the original software.  If you use this 
+      software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   3. Altered source versions must be plainly marked as such, and must
+      not be misrepresented as being the original software.
+
+   4. The name of the author may not be used to endorse or promote 
+      products derived from this software without specific prior written 
+      permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+   ----------------------------------------------------------------
+
+   Notice that the above BSD-style license applies to this one file
+   (valgrind.h) only.  The entire rest of Valgrind is licensed under
+   the terms of the GNU General Public License, version 2.  See the
+   COPYING file in the source distribution for details.
+
+   ---------------------------------------------------------------- 
+*/
+
+
+/* This file is for inclusion into client (your!) code.
+
+   You can use these macros to manipulate and query Valgrind's 
+   execution inside your own programs.
+
+   The resulting executables will still run without Valgrind, just a
+   little bit more slowly than they otherwise would, but otherwise
+   unchanged.  When not running on valgrind, each client request
+   consumes very few (eg. 7) instructions, so the resulting performance
+   loss is negligible unless you plan to execute client requests
+   millions of times per second.  Nevertheless, if that is still a
+   problem, you can compile with the NVALGRIND symbol defined (gcc
+   -DNVALGRIND) so that client requests are not even compiled in.  */
+
+#ifndef __VALGRIND_H
+#define __VALGRIND_H
+
+#include <stdarg.h>
+
+/* Nb: this file might be included in a file compiled with -ansi.  So
+   we can't use C++ style "//" comments nor the "asm" keyword (instead
+   use "__asm__"). */
+
+/* Derive some tags indicating what the target platform is.  Note
+   that in this file we're using the compiler's CPP symbols for
+   identifying architectures, which are different to the ones we use
+   within the rest of Valgrind.  Note, __powerpc__ is active for both
+   32 and 64-bit PPC, whereas __powerpc64__ is only active for the
+   latter (on Linux, that is). */
+#undef PLAT_x86_linux
+#undef PLAT_amd64_linux
+#undef PLAT_ppc32_linux
+#undef PLAT_ppc64_linux
+#undef PLAT_ppc32_aix5
+#undef PLAT_ppc64_aix5
+
+#if !defined(_AIX) && defined(__i386__)
+#  define PLAT_x86_linux 1
+#elif !defined(_AIX) && defined(__x86_64__)
+#  define PLAT_amd64_linux 1
+#elif !defined(_AIX) && defined(__powerpc__) && !defined(__powerpc64__)
+#  define PLAT_ppc32_linux 1
+#elif !defined(_AIX) && defined(__powerpc__) && defined(__powerpc64__)
+#  define PLAT_ppc64_linux 1
+#elif defined(_AIX) && defined(__64BIT__)
+#  define PLAT_ppc64_aix5 1
+#elif defined(_AIX) && !defined(__64BIT__)
+#  define PLAT_ppc32_aix5 1
+#endif
+
+
+/* If we're not compiling for our target platform, don't generate
+   any inline asms.  */
+#if !defined(PLAT_x86_linux) && !defined(PLAT_amd64_linux) \
+    && !defined(PLAT_ppc32_linux) && !defined(PLAT_ppc64_linux) \
+    && !defined(PLAT_ppc32_aix5) && !defined(PLAT_ppc64_aix5)
+#  if !defined(NVALGRIND)
+#    define NVALGRIND 1
+#  endif
+#endif
+
+
+/* ------------------------------------------------------------------ */
+/* ARCHITECTURE SPECIFICS for SPECIAL INSTRUCTIONS.  There is nothing */
+/* in here of use to end-users -- skip to the next section.           */
+/* ------------------------------------------------------------------ */
+
+#if defined(NVALGRIND)
+
+/* Define NVALGRIND to completely remove the Valgrind magic sequence
+   from the compiled code (analogous to NDEBUG's effects on
+   assert()) */
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+   {                                                              \
+      (_zzq_rlval) = (_zzq_default);                              \
+   }
+
+#else  /* ! NVALGRIND */
+
+/* The following defines the magic code sequences which the JITter
+   spots and handles magically.  Don't look too closely at them as
+   they will rot your brain.
+
+   The assembly code sequences for all architectures is in this one
+   file.  This is because this file must be stand-alone, and we don't
+   want to have multiple files.
+
+   For VALGRIND_DO_CLIENT_REQUEST, we must ensure that the default
+   value gets put in the return slot, so that everything works when
+   this is executed not under Valgrind.  Args are passed in a memory
+   block, and so there's no intrinsic limit to the number that could
+   be passed, but it's currently five.
+   
+   The macro args are: 
+      _zzq_rlval    result lvalue
+      _zzq_default  default value (result returned when running on real CPU)
+      _zzq_request  request code
+      _zzq_arg1..5  request params
+
+   The other two macros are used to support function wrapping, and are
+   a lot simpler.  VALGRIND_GET_NR_CONTEXT returns the value of the
+   guest's NRADDR pseudo-register and whatever other information is
+   needed to safely run the call original from the wrapper: on
+   ppc64-linux, the R2 value at the divert point is also needed.  This
+   information is abstracted into a user-visible type, OrigFn.
+
+   VALGRIND_CALL_NOREDIR_* behaves the same as the following on the
+   guest, but guarantees that the branch instruction will not be
+   redirected: x86: call *%eax, amd64: call *%rax, ppc32/ppc64:
+   branch-and-link-to-r11.  VALGRIND_CALL_NOREDIR is just text, not a
+   complete inline asm, since it needs to be combined with more magic
+   inline asm stuff to be useful.
+*/
+
+/* ------------------------- x86-linux ------------------------- */
+
+#if defined(PLAT_x86_linux)
+
+typedef
+   struct { 
+      unsigned int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "roll $3,  %%edi ; roll $13, %%edi\n\t"      \
+                     "roll $29, %%edi ; roll $19, %%edi\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+  { volatile unsigned int _zzq_args[6];                           \
+    volatile unsigned int _zzq_result;                            \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %EDX = client_request ( %EAX ) */         \
+                     "xchgl %%ebx,%%ebx"                          \
+                     : "=d" (_zzq_result)                         \
+                     : "a" (&_zzq_args[0]), "0" (_zzq_default)    \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    volatile unsigned int __addr;                                 \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %EAX = guest_NRADDR */                    \
+                     "xchgl %%ecx,%%ecx"                          \
+                     : "=a" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_CALL_NOREDIR_EAX                                 \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* call-noredir *%EAX */                     \
+                     "xchgl %%edx,%%edx\n\t"
+#endif /* PLAT_x86_linux */
+
+/* ------------------------ amd64-linux ------------------------ */
+
+#if defined(PLAT_amd64_linux)
+
+typedef
+   struct { 
+      unsigned long long int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rolq $3,  %%rdi ; rolq $13, %%rdi\n\t"      \
+                     "rolq $61, %%rdi ; rolq $51, %%rdi\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+  { volatile unsigned long long int _zzq_args[6];                 \
+    volatile unsigned long long int _zzq_result;                  \
+    _zzq_args[0] = (unsigned long long int)(_zzq_request);        \
+    _zzq_args[1] = (unsigned long long int)(_zzq_arg1);           \
+    _zzq_args[2] = (unsigned long long int)(_zzq_arg2);           \
+    _zzq_args[3] = (unsigned long long int)(_zzq_arg3);           \
+    _zzq_args[4] = (unsigned long long int)(_zzq_arg4);           \
+    _zzq_args[5] = (unsigned long long int)(_zzq_arg5);           \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %RDX = client_request ( %RAX ) */         \
+                     "xchgq %%rbx,%%rbx"                          \
+                     : "=d" (_zzq_result)                         \
+                     : "a" (&_zzq_args[0]), "0" (_zzq_default)    \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    volatile unsigned long long int __addr;                       \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %RAX = guest_NRADDR */                    \
+                     "xchgq %%rcx,%%rcx"                          \
+                     : "=a" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_CALL_NOREDIR_RAX                                 \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* call-noredir *%RAX */                     \
+                     "xchgq %%rdx,%%rdx\n\t"
+#endif /* PLAT_amd64_linux */
+
+/* ------------------------ ppc32-linux ------------------------ */
+
+#if defined(PLAT_ppc32_linux)
+
+typedef
+   struct { 
+      unsigned int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rlwinm 0,0,3,0,0  ; rlwinm 0,0,13,0,0\n\t"  \
+                     "rlwinm 0,0,29,0,0 ; rlwinm 0,0,19,0,0\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned int  _zzq_args[6];                          \
+             unsigned int  _zzq_result;                           \
+             unsigned int* _zzq_ptr;                              \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 3,%1\n\t" /*default*/                    \
+                     "mr 4,%2\n\t" /*ptr*/                        \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"     /*result*/                     \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_default), "b" (_zzq_ptr)         \
+                     : "cc", "memory", "r3", "r4");               \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    unsigned int __addr;                                          \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory", "r3"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+#endif /* PLAT_ppc32_linux */
+
+/* ------------------------ ppc64-linux ------------------------ */
+
+#if defined(PLAT_ppc64_linux)
+
+typedef
+   struct { 
+      unsigned long long int nraddr; /* where's the code? */
+      unsigned long long int r2;  /* what tocptr do we need? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rotldi 0,0,3  ; rotldi 0,0,13\n\t"          \
+                     "rotldi 0,0,61 ; rotldi 0,0,51\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned long long int  _zzq_args[6];                \
+    register unsigned long long int  _zzq_result __asm__("r3");   \
+    register unsigned long long int* _zzq_ptr __asm__("r4");      \
+    _zzq_args[0] = (unsigned long long int)(_zzq_request);        \
+    _zzq_args[1] = (unsigned long long int)(_zzq_arg1);           \
+    _zzq_args[2] = (unsigned long long int)(_zzq_arg2);           \
+    _zzq_args[3] = (unsigned long long int)(_zzq_arg3);           \
+    _zzq_args[4] = (unsigned long long int)(_zzq_arg4);           \
+    _zzq_args[5] = (unsigned long long int)(_zzq_arg5);           \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1"                                   \
+                     : "=r" (_zzq_result)                         \
+                     : "0" (_zzq_default), "r" (_zzq_ptr)         \
+                     : "cc", "memory");                           \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    register unsigned long long int __addr __asm__("r3");         \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2"                                   \
+                     : "=r" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR_GPR2 */                \
+                     "or 4,4,4"                                   \
+                     : "=r" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->r2 = __addr;                                       \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+
+#endif /* PLAT_ppc64_linux */
+
+/* ------------------------ ppc32-aix5 ------------------------- */
+
+#if defined(PLAT_ppc32_aix5)
+
+typedef
+   struct { 
+      unsigned int nraddr; /* where's the code? */
+      unsigned int r2;  /* what tocptr do we need? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rlwinm 0,0,3,0,0  ; rlwinm 0,0,13,0,0\n\t"  \
+                     "rlwinm 0,0,29,0,0 ; rlwinm 0,0,19,0,0\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned int  _zzq_args[7];                          \
+    register unsigned int  _zzq_result;                           \
+    register unsigned int* _zzq_ptr;                              \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    _zzq_args[6] = (unsigned int)(_zzq_default);                  \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 4,%1\n\t"                                \
+                     "lwz 3, 24(4)\n\t"                           \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_ptr)                             \
+                     : "r3", "r4", "cc", "memory");               \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    register unsigned int __addr;                                 \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR_GPR2 */                \
+                     "or 4,4,4\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->r2 = __addr;                                       \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+
+#endif /* PLAT_ppc32_aix5 */
+
+/* ------------------------ ppc64-aix5 ------------------------- */
+
+#if defined(PLAT_ppc64_aix5)
+
+typedef
+   struct { 
+      unsigned long long int nraddr; /* where's the code? */
+      unsigned long long int r2;  /* what tocptr do we need? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rotldi 0,0,3  ; rotldi 0,0,13\n\t"          \
+                     "rotldi 0,0,61 ; rotldi 0,0,51\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST(                               \
+        _zzq_rlval, _zzq_default, _zzq_request,                   \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  {          unsigned long long int  _zzq_args[7];                \
+    register unsigned long long int  _zzq_result;                 \
+    register unsigned long long int* _zzq_ptr;                    \
+    _zzq_args[0] = (unsigned int long long)(_zzq_request);        \
+    _zzq_args[1] = (unsigned int long long)(_zzq_arg1);           \
+    _zzq_args[2] = (unsigned int long long)(_zzq_arg2);           \
+    _zzq_args[3] = (unsigned int long long)(_zzq_arg3);           \
+    _zzq_args[4] = (unsigned int long long)(_zzq_arg4);           \
+    _zzq_args[5] = (unsigned int long long)(_zzq_arg5);           \
+    _zzq_args[6] = (unsigned int long long)(_zzq_default);        \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 4,%1\n\t"                                \
+                     "ld 3, 48(4)\n\t"                            \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_ptr)                             \
+                     : "r3", "r4", "cc", "memory");               \
+    _zzq_rlval = _zzq_result;                                     \
+  }
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    register unsigned long long int __addr;                       \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR_GPR2 */                \
+                     "or 4,4,4\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "r3", "cc", "memory"                       \
+                    );                                            \
+    _zzq_orig->r2 = __addr;                                       \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+
+#endif /* PLAT_ppc64_aix5 */
+
+/* Insert assembly code for other platforms here... */
+
+#endif /* NVALGRIND */
+
+
+/* ------------------------------------------------------------------ */
+/* PLATFORM SPECIFICS for FUNCTION WRAPPING.  This is all very        */
+/* ugly.  It's the least-worst tradeoff I can think of.               */
+/* ------------------------------------------------------------------ */
+
+/* This section defines magic (a.k.a appalling-hack) macros for doing
+   guaranteed-no-redirection macros, so as to get from function
+   wrappers to the functions they are wrapping.  The whole point is to
+   construct standard call sequences, but to do the call itself with a
+   special no-redirect call pseudo-instruction that the JIT
+   understands and handles specially.  This section is long and
+   repetitious, and I can't see a way to make it shorter.
+
+   The naming scheme is as follows:
+
+      CALL_FN_{W,v}_{v,W,WW,WWW,WWWW,5W,6W,7W,etc}
+
+   'W' stands for "word" and 'v' for "void".  Hence there are
+   different macros for calling arity 0, 1, 2, 3, 4, etc, functions,
+   and for each, the possibility of returning a word-typed result, or
+   no result.
+*/
+
+/* Use these to write the name of your wrapper.  NOTE: duplicates
+   VG_WRAP_FUNCTION_Z{U,Z} in pub_tool_redir.h. */
+
+#define I_WRAP_SONAME_FNNAME_ZU(soname,fnname)                    \
+   _vgwZU_##soname##_##fnname
+
+#define I_WRAP_SONAME_FNNAME_ZZ(soname,fnname)                    \
+   _vgwZZ_##soname##_##fnname
+
+/* Use this macro from within a wrapper function to collect the
+   context (address and possibly other info) of the original function.
+   Once you have that you can then use it in one of the CALL_FN_
+   macros.  The type of the argument _lval is OrigFn. */
+#define VALGRIND_GET_ORIG_FN(_lval)  VALGRIND_GET_NR_CONTEXT(_lval)
+
+/* Derivatives of the main macros below, for calling functions
+   returning void. */
+
+#define CALL_FN_v_v(fnptr)                                        \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_v(_junk,fnptr); } while (0)
+
+#define CALL_FN_v_W(fnptr, arg1)                                  \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_W(_junk,fnptr,arg1); } while (0)
+
+#define CALL_FN_v_WW(fnptr, arg1,arg2)                            \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_WW(_junk,fnptr,arg1,arg2); } while (0)
+
+#define CALL_FN_v_WWW(fnptr, arg1,arg2,arg3)                      \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_WWW(_junk,fnptr,arg1,arg2,arg3); } while (0)
+
+/* ------------------------- x86-linux ------------------------- */
+
+#if defined(PLAT_x86_linux)
+
+/* These regs are trashed by the hidden call.  No need to mention eax
+   as gcc can already see that, plus causes gcc to bomb. */
+#define __CALLER_SAVED_REGS /*"eax"*/ "ecx", "edx"
+
+/* These CALL_FN_ macros assume that on x86-linux, sizeof(unsigned
+   long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      __asm__ volatile(                                           \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $4, %%esp\n"                                       \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      __asm__ volatile(                                           \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $8, %%esp\n"                                       \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      __asm__ volatile(                                           \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $12, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      __asm__ volatile(                                           \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $16, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      __asm__ volatile(                                           \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $20, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      __asm__ volatile(                                           \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $24, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      __asm__ volatile(                                           \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $28, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      __asm__ volatile(                                           \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $32, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      __asm__ volatile(                                           \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $36, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      __asm__ volatile(                                           \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $40, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11)                          \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      __asm__ volatile(                                           \
+         "pushl 44(%%eax)\n\t"                                    \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $44, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11,arg12)                    \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      _argvec[12] = (unsigned long)(arg12);                       \
+      __asm__ volatile(                                           \
+         "pushl 48(%%eax)\n\t"                                    \
+         "pushl 44(%%eax)\n\t"                                    \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         "addl $48, %%esp\n"                                      \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_x86_linux */
+
+/* ------------------------ amd64-linux ------------------------ */
+
+#if defined(PLAT_amd64_linux)
+
+/* ARGREGS: rdi rsi rdx rcx r8 r9 (the rest on stack in R-to-L order) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS /*"rax",*/ "rcx", "rdx", "rsi",       \
+                            "rdi", "r8", "r9", "r10", "r11"
+
+/* These CALL_FN_ macros assume that on amd64-linux, sizeof(unsigned
+   long) == 8. */
+
+/* NB 9 Sept 07.  There is a nasty kludge here in all these CALL_FN_
+   macros.  In order not to trash the stack redzone, we need to drop
+   %rsp by 128 before the hidden call, and restore afterwards.  The
+   nastyness is that it is only by luck that the stack still appears
+   to be unwindable during the hidden call - since then the behaviour
+   of any routine using this macro does not match what the CFI data
+   says.  Sigh.
+
+   Why is this important?  Imagine that a wrapper has a stack
+   allocated local, and passes to the hidden call, a pointer to it.
+   Because gcc does not know about the hidden call, it may allocate
+   that local in the redzone.  Unfortunately the hidden call may then
+   trash it before it comes to use it.  So we must step clear of the
+   redzone, for the duration of the hidden call, to make it safe.
+
+   Probably the same problem afflicts the other redzone-style ABIs too
+   (ppc64-linux, ppc32-aix5, ppc64-aix5); but for those, the stack is
+   self describing (none of this CFI nonsense) so at least messing
+   with the stack pointer doesn't give a danger of non-unwindable
+   stack. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         "addq $128,%%rsp\n\t"                                    \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $8, %%rsp\n"                                       \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $16, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $24, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 80(%%rax)\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $32, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 88(%%rax)\n\t"                                    \
+         "pushq 80(%%rax)\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $40, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      _argvec[12] = (unsigned long)(arg12);                       \
+      __asm__ volatile(                                           \
+         "subq $128,%%rsp\n\t"                                    \
+         "pushq 96(%%rax)\n\t"                                    \
+         "pushq 88(%%rax)\n\t"                                    \
+         "pushq 80(%%rax)\n\t"                                    \
+         "pushq 72(%%rax)\n\t"                                    \
+         "pushq 64(%%rax)\n\t"                                    \
+         "pushq 56(%%rax)\n\t"                                    \
+         "movq 48(%%rax), %%r9\n\t"                               \
+         "movq 40(%%rax), %%r8\n\t"                               \
+         "movq 32(%%rax), %%rcx\n\t"                              \
+         "movq 24(%%rax), %%rdx\n\t"                              \
+         "movq 16(%%rax), %%rsi\n\t"                              \
+         "movq 8(%%rax), %%rdi\n\t"                               \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */            \
+         VALGRIND_CALL_NOREDIR_RAX                                \
+         "addq $48, %%rsp\n"                                      \
+         "addq $128,%%rsp\n\t"                                    \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_amd64_linux */
+
+/* ------------------------ ppc32-linux ------------------------ */
+
+#if defined(PLAT_ppc32_linux)
+
+/* This is useful for finding out about the on-stack stuff:
+
+   extern int f9  ( int,int,int,int,int,int,int,int,int );
+   extern int f10 ( int,int,int,int,int,int,int,int,int,int );
+   extern int f11 ( int,int,int,int,int,int,int,int,int,int,int );
+   extern int f12 ( int,int,int,int,int,int,int,int,int,int,int,int );
+
+   int g9 ( void ) {
+      return f9(11,22,33,44,55,66,77,88,99);
+   }
+   int g10 ( void ) {
+      return f10(11,22,33,44,55,66,77,88,99,110);
+   }
+   int g11 ( void ) {
+      return f11(11,22,33,44,55,66,77,88,99,110,121);
+   }
+   int g12 ( void ) {
+      return f12(11,22,33,44,55,66,77,88,99,110,121,132);
+   }
+*/
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* These CALL_FN_ macros assume that on ppc32-linux, 
+   sizeof(unsigned long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-16\n\t"                                       \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,16\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-16\n\t"                                       \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,16\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      _argvec[11] = (unsigned long)arg11;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-32\n\t"                                       \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,16(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,32\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      _argvec[11] = (unsigned long)arg11;                         \
+      _argvec[12] = (unsigned long)arg12;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-32\n\t"                                       \
+         /* arg12 */                                              \
+         "lwz 3,48(11)\n\t"                                       \
+         "stw 3,20(1)\n\t"                                        \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,16(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "addi 1,1,32\n\t"                                        \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc32_linux */
+
+/* ------------------------ ppc64-linux ------------------------ */
+
+#if defined(PLAT_ppc64_linux)
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* These CALL_FN_ macros assume that on ppc64-linux, sizeof(unsigned
+   long) == 8. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+0];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1] = (unsigned long)_orig.r2;                       \
+      _argvec[2] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+1];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+2];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+3];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+4];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+5];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+6];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+7];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+8];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)" /* restore tocptr */                      \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+9];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-128\n\t"  /* expand stack frame */            \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,128"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+10];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-128\n\t"  /* expand stack frame */            \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,128"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+11];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-144\n\t"  /* expand stack frame */            \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,144"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+12];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      _argvec[2+12] = (unsigned long)arg12;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-144\n\t"  /* expand stack frame */            \
+         /* arg12 */                                              \
+         "ld  3,96(11)\n\t"                                       \
+         "std 3,136(1)\n\t"                                       \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         "addi 1,1,144"     /* restore frame */                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc64_linux */
+
+/* ------------------------ ppc32-aix5 ------------------------- */
+
+#if defined(PLAT_ppc32_aix5)
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* Expand the stack frame, copying enough info that unwinding
+   still works.  Trashes r3. */
+
+#define VG_EXPAND_FRAME_BY_trashes_r3(_n_fr)                      \
+         "addi 1,1,-" #_n_fr "\n\t"                               \
+         "lwz  3," #_n_fr "(1)\n\t"                               \
+         "stw  3,0(1)\n\t"
+
+#define VG_CONTRACT_FRAME_BY(_n_fr)                               \
+         "addi 1,1," #_n_fr "\n\t"
+
+/* These CALL_FN_ macros assume that on ppc32-aix5, sizeof(unsigned
+   long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+0];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1] = (unsigned long)_orig.r2;                       \
+      _argvec[2] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+1];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+2];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+3];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+4];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+5];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t" /* arg2->r4 */                       \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+6];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+7];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+8];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+9];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(64)                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(64)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+10];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(64)                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,60(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(64)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+11];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(72)                        \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,64(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,60(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(72)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+12];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      _argvec[2+12] = (unsigned long)arg12;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "stw  2,-8(11)\n\t"  /* save tocptr */                   \
+         "lwz  2,-4(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(72)                        \
+         /* arg12 */                                              \
+         "lwz 3,48(11)\n\t"                                       \
+         "stw 3,68(1)\n\t"                                        \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,64(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,60(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,56(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "lwz  3, 4(11)\n\t"  /* arg1->r3 */                      \
+         "lwz  4, 8(11)\n\t"  /* arg2->r4 */                      \
+         "lwz  5, 12(11)\n\t" /* arg3->r5 */                      \
+         "lwz  6, 16(11)\n\t" /* arg4->r6 */                      \
+         "lwz  7, 20(11)\n\t" /* arg5->r7 */                      \
+         "lwz  8, 24(11)\n\t" /* arg6->r8 */                      \
+         "lwz  9, 28(11)\n\t" /* arg7->r9 */                      \
+         "lwz 10, 32(11)\n\t" /* arg8->r10 */                     \
+         "lwz 11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "lwz 2,-8(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(72)                                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc32_aix5 */
+
+/* ------------------------ ppc64-aix5 ------------------------- */
+
+#if defined(PLAT_ppc64_aix5)
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* Expand the stack frame, copying enough info that unwinding
+   still works.  Trashes r3. */
+
+#define VG_EXPAND_FRAME_BY_trashes_r3(_n_fr)                      \
+         "addi 1,1,-" #_n_fr "\n\t"                               \
+         "ld   3," #_n_fr "(1)\n\t"                               \
+         "std  3,0(1)\n\t"
+
+#define VG_CONTRACT_FRAME_BY(_n_fr)                               \
+         "addi 1,1," #_n_fr "\n\t"
+
+/* These CALL_FN_ macros assume that on ppc64-aix5, sizeof(unsigned
+   long) == 8. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+0];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1] = (unsigned long)_orig.r2;                       \
+      _argvec[2] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+1];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+2];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+3];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+4];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+5];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+6];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+7];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+8];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+9];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(128)                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(128)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+10];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(128)                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(128)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+11];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(144)                       \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(144)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+12];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      _argvec[2+12] = (unsigned long)arg12;                       \
+      __asm__ volatile(                                           \
+         "mr 11,%1\n\t"                                           \
+         VG_EXPAND_FRAME_BY_trashes_r3(512)                       \
+         "std  2,-16(11)\n\t" /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         VG_EXPAND_FRAME_BY_trashes_r3(144)                       \
+         /* arg12 */                                              \
+         "ld  3,96(11)\n\t"                                       \
+         "std 3,136(1)\n\t"                                       \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld  2,-16(11)\n\t" /* restore tocptr */                 \
+         VG_CONTRACT_FRAME_BY(144)                                \
+         VG_CONTRACT_FRAME_BY(512)                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS          \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc64_aix5 */
+
+
+/* ------------------------------------------------------------------ */
+/* ARCHITECTURE INDEPENDENT MACROS for CLIENT REQUESTS.               */
+/*                                                                    */
+/* ------------------------------------------------------------------ */
+
+/* Some request codes.  There are many more of these, but most are not
+   exposed to end-user view.  These are the public ones, all of the
+   form 0x1000 + small_number.
+
+   Core ones are in the range 0x00000000--0x0000ffff.  The non-public
+   ones start at 0x2000.
+*/
+
+/* These macros are used by tools -- they must be public, but don't
+   embed them into other programs. */
+#define VG_USERREQ_TOOL_BASE(a,b) \
+   ((unsigned int)(((a)&0xff) << 24 | ((b)&0xff) << 16))
+#define VG_IS_TOOL_USERREQ(a, b, v) \
+   (VG_USERREQ_TOOL_BASE(a,b) == ((v) & 0xffff0000))
+
+/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !! 
+   This enum comprises an ABI exported by Valgrind to programs
+   which use client requests.  DO NOT CHANGE THE ORDER OF THESE
+   ENTRIES, NOR DELETE ANY -- add new ones at the end. */
+typedef
+   enum { VG_USERREQ__RUNNING_ON_VALGRIND  = 0x1001,
+          VG_USERREQ__DISCARD_TRANSLATIONS = 0x1002,
+
+          /* These allow any function to be called from the simulated
+             CPU but run on the real CPU.  Nb: the first arg passed to
+             the function is always the ThreadId of the running
+             thread!  So CLIENT_CALL0 actually requires a 1 arg
+             function, etc. */
+          VG_USERREQ__CLIENT_CALL0 = 0x1101,
+          VG_USERREQ__CLIENT_CALL1 = 0x1102,
+          VG_USERREQ__CLIENT_CALL2 = 0x1103,
+          VG_USERREQ__CLIENT_CALL3 = 0x1104,
+
+          /* Can be useful in regression testing suites -- eg. can
+             send Valgrind's output to /dev/null and still count
+             errors. */
+          VG_USERREQ__COUNT_ERRORS = 0x1201,
+
+          /* These are useful and can be interpreted by any tool that
+             tracks malloc() et al, by using vg_replace_malloc.c. */
+          VG_USERREQ__MALLOCLIKE_BLOCK = 0x1301,
+          VG_USERREQ__FREELIKE_BLOCK   = 0x1302,
+          /* Memory pool support. */
+          VG_USERREQ__CREATE_MEMPOOL   = 0x1303,
+          VG_USERREQ__DESTROY_MEMPOOL  = 0x1304,
+          VG_USERREQ__MEMPOOL_ALLOC    = 0x1305,
+          VG_USERREQ__MEMPOOL_FREE     = 0x1306,
+          VG_USERREQ__MEMPOOL_TRIM     = 0x1307,
+          VG_USERREQ__MOVE_MEMPOOL     = 0x1308,
+          VG_USERREQ__MEMPOOL_CHANGE   = 0x1309,
+          VG_USERREQ__MEMPOOL_EXISTS   = 0x130a,
+
+          /* Allow printfs to valgrind log. */
+          VG_USERREQ__PRINTF           = 0x1401,
+          VG_USERREQ__PRINTF_BACKTRACE = 0x1402,
+
+          /* Stack support. */
+          VG_USERREQ__STACK_REGISTER   = 0x1501,
+          VG_USERREQ__STACK_DEREGISTER = 0x1502,
+          VG_USERREQ__STACK_CHANGE     = 0x1503
+   } Vg_ClientRequest;
+
+#if !defined(__GNUC__)
+#  define __extension__ /* */
+#endif
+
+/* Returns the number of Valgrinds this code is running under.  That
+   is, 0 if running natively, 1 if running under Valgrind, 2 if
+   running under Valgrind which is running under another Valgrind,
+   etc. */
+#define RUNNING_ON_VALGRIND  __extension__                        \
+   ({unsigned int _qzz_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* if not */,          \
+                               VG_USERREQ__RUNNING_ON_VALGRIND,   \
+                               0, 0, 0, 0, 0);                    \
+    _qzz_res;                                                     \
+   })
+
+
+/* Discard translation of code in the range [_qzz_addr .. _qzz_addr +
+   _qzz_len - 1].  Useful if you are debugging a JITter or some such,
+   since it provides a way to make sure valgrind will retranslate the
+   invalidated area.  Returns no value. */
+#define VALGRIND_DISCARD_TRANSLATIONS(_qzz_addr,_qzz_len)         \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__DISCARD_TRANSLATIONS,  \
+                               _qzz_addr, _qzz_len, 0, 0, 0);     \
+   }
+
+
+/* These requests are for getting Valgrind itself to print something.
+   Possibly with a backtrace.  This is a really ugly hack. */
+
+#if defined(NVALGRIND)
+
+#  define VALGRIND_PRINTF(...)
+#  define VALGRIND_PRINTF_BACKTRACE(...)
+
+#else /* NVALGRIND */
+
+/* Modern GCC will optimize the static routine out if unused,
+   and unused attribute will shut down warnings about it.  */
+static int VALGRIND_PRINTF(const char *format, ...)
+   __attribute__((format(__printf__, 1, 2), __unused__));
+static int
+VALGRIND_PRINTF(const char *format, ...)
+{
+   unsigned long _qzz_res;
+   va_list vargs;
+   va_start(vargs, format);
+   VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, VG_USERREQ__PRINTF,
+                              (unsigned long)format, (unsigned long)vargs, 
+                              0, 0, 0);
+   va_end(vargs);
+   return (int)_qzz_res;
+}
+
+static int VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
+   __attribute__((format(__printf__, 1, 2), __unused__));
+static int
+VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
+{
+   unsigned long _qzz_res;
+   va_list vargs;
+   va_start(vargs, format);
+   VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, VG_USERREQ__PRINTF_BACKTRACE,
+                              (unsigned long)format, (unsigned long)vargs, 
+                              0, 0, 0);
+   va_end(vargs);
+   return (int)_qzz_res;
+}
+
+#endif /* NVALGRIND */
+
+
+/* These requests allow control to move from the simulated CPU to the
+   real CPU, calling an arbitary function.
+   
+   Note that the current ThreadId is inserted as the first argument.
+   So this call:
+
+     VALGRIND_NON_SIMD_CALL2(f, arg1, arg2)
+
+   requires f to have this signature:
+
+     Word f(Word tid, Word arg1, Word arg2)
+
+   where "Word" is a word-sized type.
+
+   Note that these client requests are not entirely reliable.  For example,
+   if you call a function with them that subsequently calls printf(),
+   there's a high chance Valgrind will crash.  Generally, your prospects of
+   these working are made higher if the called function does not refer to
+   any global variables, and does not refer to any libc or other functions
+   (printf et al).  Any kind of entanglement with libc or dynamic linking is
+   likely to have a bad outcome, for tricky reasons which we've grappled
+   with a lot in the past.
+*/
+#define VALGRIND_NON_SIMD_CALL0(_qyy_fn)                          \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL0,          \
+                               _qyy_fn,                           \
+                               0, 0, 0, 0);                       \
+    _qyy_res;                                                     \
+   })
+
+#define VALGRIND_NON_SIMD_CALL1(_qyy_fn, _qyy_arg1)               \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL1,          \
+                               _qyy_fn,                           \
+                               _qyy_arg1, 0, 0, 0);               \
+    _qyy_res;                                                     \
+   })
+
+#define VALGRIND_NON_SIMD_CALL2(_qyy_fn, _qyy_arg1, _qyy_arg2)    \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL2,          \
+                               _qyy_fn,                           \
+                               _qyy_arg1, _qyy_arg2, 0, 0);       \
+    _qyy_res;                                                     \
+   })
+
+#define VALGRIND_NON_SIMD_CALL3(_qyy_fn, _qyy_arg1, _qyy_arg2, _qyy_arg3) \
+   __extension__                                                  \
+   ({unsigned long _qyy_res;                                      \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__CLIENT_CALL3,          \
+                               _qyy_fn,                           \
+                               _qyy_arg1, _qyy_arg2,              \
+                               _qyy_arg3, 0);                     \
+    _qyy_res;                                                     \
+   })
+
+
+/* Counts the number of errors that have been recorded by a tool.  Nb:
+   the tool must record the errors with VG_(maybe_record_error)() or
+   VG_(unique_error)() for them to be counted. */
+#define VALGRIND_COUNT_ERRORS                                     \
+   __extension__                                                  \
+   ({unsigned int _qyy_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */,  \
+                               VG_USERREQ__COUNT_ERRORS,          \
+                               0, 0, 0, 0, 0);                    \
+    _qyy_res;                                                     \
+   })
+
+/* Mark a block of memory as having been allocated by a malloc()-like
+   function.  `addr' is the start of the usable block (ie. after any
+   redzone) `rzB' is redzone size if the allocator can apply redzones;
+   use '0' if not.  Adding redzones makes it more likely Valgrind will spot
+   block overruns.  `is_zeroed' indicates if the memory is zeroed, as it is
+   for calloc().  Put it immediately after the point where a block is
+   allocated. 
+   
+   If you're using Memcheck: If you're allocating memory via superblocks,
+   and then handing out small chunks of each superblock, if you don't have
+   redzones on your small blocks, it's worth marking the superblock with
+   VALGRIND_MAKE_MEM_NOACCESS when it's created, so that block overruns are
+   detected.  But if you can put redzones on, it's probably better to not do
+   this, so that messages for small overruns are described in terms of the
+   small block rather than the superblock (but if you have a big overrun
+   that skips over a redzone, you could miss an error this way).  See
+   memcheck/tests/custom_alloc.c for an example.
+
+   WARNING: if your allocator uses malloc() or 'new' to allocate
+   superblocks, rather than mmap() or brk(), this will not work properly --
+   you'll likely get assertion failures during leak detection.  This is
+   because Valgrind doesn't like seeing overlapping heap blocks.  Sorry.
+
+   Nb: block must be freed via a free()-like function specified
+   with VALGRIND_FREELIKE_BLOCK or mismatch errors will occur. */
+#define VALGRIND_MALLOCLIKE_BLOCK(addr, sizeB, rzB, is_zeroed)    \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MALLOCLIKE_BLOCK,      \
+                               addr, sizeB, rzB, is_zeroed, 0);   \
+   }
+
+/* Mark a block of memory as having been freed by a free()-like function.
+   `rzB' is redzone size;  it must match that given to
+   VALGRIND_MALLOCLIKE_BLOCK.  Memory not freed will be detected by the leak
+   checker.  Put it immediately after the point where the block is freed. */
+#define VALGRIND_FREELIKE_BLOCK(addr, rzB)                        \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__FREELIKE_BLOCK,        \
+                               addr, rzB, 0, 0, 0);               \
+   }
+
+/* Create a memory pool. */
+#define VALGRIND_CREATE_MEMPOOL(pool, rzB, is_zeroed)             \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__CREATE_MEMPOOL,        \
+                               pool, rzB, is_zeroed, 0, 0);       \
+   }
+
+/* Destroy a memory pool. */
+#define VALGRIND_DESTROY_MEMPOOL(pool)                            \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__DESTROY_MEMPOOL,       \
+                               pool, 0, 0, 0, 0);                 \
+   }
+
+/* Associate a piece of memory with a memory pool. */
+#define VALGRIND_MEMPOOL_ALLOC(pool, addr, size)                  \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_ALLOC,         \
+                               pool, addr, size, 0, 0);           \
+   }
+
+/* Disassociate a piece of memory from a memory pool. */
+#define VALGRIND_MEMPOOL_FREE(pool, addr)                         \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_FREE,          \
+                               pool, addr, 0, 0, 0);              \
+   }
+
+/* Disassociate any pieces outside a particular range. */
+#define VALGRIND_MEMPOOL_TRIM(pool, addr, size)                   \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_TRIM,          \
+                               pool, addr, size, 0, 0);           \
+   }
+
+/* Resize and/or move a piece associated with a memory pool. */
+#define VALGRIND_MOVE_MEMPOOL(poolA, poolB)                       \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MOVE_MEMPOOL,          \
+                               poolA, poolB, 0, 0, 0);            \
+   }
+
+/* Resize and/or move a piece associated with a memory pool. */
+#define VALGRIND_MEMPOOL_CHANGE(pool, addrA, addrB, size)         \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_CHANGE,        \
+                               pool, addrA, addrB, size, 0);      \
+   }
+
+/* Return 1 if a mempool exists, else 0. */
+#define VALGRIND_MEMPOOL_EXISTS(pool)                             \
+   ({unsigned int _qzz_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__MEMPOOL_EXISTS,        \
+                               pool, 0, 0, 0, 0);                 \
+    _qzz_res;                                                     \
+   })
+
+/* Mark a piece of memory as being a stack. Returns a stack id. */
+#define VALGRIND_STACK_REGISTER(start, end)                       \
+   ({unsigned int _qzz_res;                                       \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__STACK_REGISTER,        \
+                               start, end, 0, 0, 0);              \
+    _qzz_res;                                                     \
+   })
+
+/* Unmark the piece of memory associated with a stack id as being a
+   stack. */
+#define VALGRIND_STACK_DEREGISTER(id)                             \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__STACK_DEREGISTER,      \
+                               id, 0, 0, 0, 0);                   \
+   }
+
+/* Change the start and end address of the stack id. */
+#define VALGRIND_STACK_CHANGE(id, start, end)                     \
+   {unsigned int _qzz_res;                                        \
+    VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                       \
+                               VG_USERREQ__STACK_CHANGE,          \
+                               id, start, end, 0, 0);             \
+   }
+
+
+#undef PLAT_x86_linux
+#undef PLAT_amd64_linux
+#undef PLAT_ppc32_linux
+#undef PLAT_ppc64_linux
+#undef PLAT_ppc32_aix5
+#undef PLAT_ppc64_aix5
+
+#endif   /* __VALGRIND_H */
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
index e188be16b6..16171dc8b9 100644
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -27,10 +27,10 @@ GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13
 # Where we installing this stuff to?
 PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
 PURPLE_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
-PIDGIN_INSTALL_PERLMOD_DIR := $(PIDGIN_INSTALL_DIR)/perlmod
 PIDGIN_INSTALL_PLUGINS_DIR := $(PIDGIN_INSTALL_DIR)/plugins
-PURPLE_INSTALL_PERLMOD_DIR := $(PURPLE_INSTALL_DIR)/perlmod
+PIDGIN_INSTALL_PERL_DIR := $(PIDGIN_INSTALL_PLUGINS_DIR)/perl
 PURPLE_INSTALL_PLUGINS_DIR := $(PURPLE_INSTALL_DIR)/plugins
+PURPLE_INSTALL_PERL_DIR := $(PURPLE_INSTALL_PLUGINS_DIR)/perl
 PURPLE_INSTALL_PO_DIR := $(PURPLE_INSTALL_DIR)/locale
 
 # Important (enough) locations in our source code
@@ -47,6 +47,8 @@ PURPLE_PROTOS_TOP := $(PURPLE_TOP)/protocols
 # Locations of important (in-tree) build targets
 PIDGIN_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h
 PURPLE_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h
+PIDGIN_REVISION_H := $(PIDGIN_TREE_TOP)/package_revision.h
+PIDGIN_REVISION_RAW_TXT := $(PIDGIN_TREE_TOP)/package_revision_raw.txt
 PIDGIN_IDLETRACK_DLL := $(PIDGIN_IDLETRACK_TOP)/idletrack.dll
 PURPLE_PURPLE_H := $(PURPLE_TOP)/purple.h
 PURPLE_VERSION_H := $(PURPLE_TOP)/version.h
@@ -103,6 +105,7 @@ ifeq "$(origin CC)" "default"
 endif
 GMSGFMT ?= $(GTK_BIN)/msgfmt
 MAKENSIS ?= makensis.exe
+MAKENSISOPT ?= /
 PERL ?= /cygdrive/c/perl/bin/perl
 WINDRES ?= windres
 STRIP ?= strip
diff --git a/libpurple/win32/libc_internal.h b/libpurple/win32/libc_internal.h
index 9e4fe17393..e140b929e0 100644
--- a/libpurple/win32/libc_internal.h
+++ b/libpurple/win32/libc_internal.h
@@ -120,10 +120,14 @@ struct ifconf
 # define ifc_req ifc_ifcu.ifcu_req /* Array of structures.  */
 
 /* sys/time.h */
+#if __MINGW32_MAJOR_VERSION < 3 || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION < 10)
 struct timezone {
 	int tz_minuteswest;
 	int tz_dsttime;
 };
+#else
+#    include <sys/time.h>
+#endif
 int wpurple_gettimeofday(struct timeval *p, struct timezone *z);
 
 /* time.h */
diff --git a/libpurple/win32/targets.mak b/libpurple/win32/targets.mak
index ee02dde011..67b402f819 100644
--- a/libpurple/win32/targets.mak
+++ b/libpurple/win32/targets.mak
@@ -17,6 +17,16 @@ $(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac
 	  /^m4_define..purple_minor_version/ {system("sed -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@");} \
 	  /^m4_define..purple_micro_version/ {system("sed -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac
 
+$(PIDGIN_REVISION_RAW_TXT):
+	(cd $(PIDGIN_TREE_TOP) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
+	|| rm -f $@
+
+$(PIDGIN_REVISION_H): $(PIDGIN_REVISION_RAW_TXT)
+	if [ -f $< ]; then \
+		sed 's/^\(.\+\)$$/#define REVISION "\1"/' $< > $@; \
+	fi
+	[ -f $@ ] || echo "#define REVISION \"unknown\"" > $@
+
 $(PURPLE_DLL) $(PURPLE_DLL).a: $(PURPLE_VERSION_H)
 	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) libpurple.dll
 
@@ -36,8 +46,8 @@ $(PIDGIN_EXE):
 $(PIDGIN_INSTALL_DIR):
 	mkdir -p $(PIDGIN_INSTALL_DIR)
 
-$(PIDGIN_INSTALL_PERLMOD_DIR):
-	mkdir -p $(PURPLE_INSTALL_PERLMOD_DIR)
+$(PIDGIN_INSTALL_PERL_DIR):
+	mkdir -p $(PIDGIN_INSTALL_PERL_DIR)
 
 $(PIDGIN_INSTALL_PLUGINS_DIR):
 	mkdir -p $(PIDGIN_INSTALL_PLUGINS_DIR)
@@ -45,3 +55,8 @@ $(PIDGIN_INSTALL_PLUGINS_DIR):
 $(PURPLE_INSTALL_PO_DIR):
 	mkdir -p $(PURPLE_INSTALL_PO_DIR)
 
+#$(PURPLE_INSTALL_PLUGINS_DIR):
+#	mkdir -p $(PURPLE_INSTALL_PLUGINS_DIR)
+
+#$(PURPLE_INSTALL_PERL_DIR):
+#	mkdir -p $(PURPLE_INSTALL_PERL_DIR)
diff --git a/libpurple/win32/win32dep.c b/libpurple/win32/win32dep.c
index d91f6cc12c..38f76e46f2 100644
--- a/libpurple/win32/win32dep.c
+++ b/libpurple/win32/win32dep.c
@@ -326,7 +326,7 @@ static HKEY _reg_open_key(HKEY rootkey, const char *subkey, REGSAM access) {
 
 	if (rv != ERROR_SUCCESS) {
 		char *errmsg = g_win32_error_message(rv);
-		purple_debug_info("wpurple", "Could not open reg key '%s' subkey '%s'.\nMessage: (%ld) %s\n",
+		purple_debug_error("wpurple", "Could not open reg key '%s' subkey '%s'.\nMessage: (%ld) %s\n",
 					((rootkey == HKEY_LOCAL_MACHINE) ? "HKLM" :
 					 (rootkey == HKEY_CURRENT_USER) ? "HKCU" :
 					  (rootkey == HKEY_CLASSES_ROOT) ? "HKCR" : "???"),
@@ -356,7 +356,7 @@ static gboolean _reg_read(HKEY reg_key, const char *valname, LPDWORD type, LPBYT
 
 	if (rv != ERROR_SUCCESS) {
 		char *errmsg = g_win32_error_message(rv);
-		purple_debug_info("wpurple", "Could not read from reg key value '%s'.\nMessage: (%ld) %s\n",
+		purple_debug_error("wpurple", "Could not read from reg key value '%s'.\nMessage: (%ld) %s\n",
 					valname, rv, errmsg);
 		g_free(errmsg);
 	}
@@ -419,8 +419,6 @@ char *wpurple_read_reg_string(HKEY rootkey, const char *subkey, const char *valn
 void wpurple_init(void) {
 	WORD wVersionRequested;
 	WSADATA wsaData;
-	const char *perlenv;
-	char *newenv;
 
 	if (!g_thread_supported())
 		g_thread_init(NULL);
@@ -444,17 +442,6 @@ void wpurple_init(void) {
 		WSACleanup();
 	}
 
-	/* Set Environmental Variables */
-	/* Tell perl where to find Purple's perl modules */
-	perlenv = g_getenv("PERL5LIB");
-	newenv = g_strdup_printf("%s%s%s" G_DIR_SEPARATOR_S "perlmod;",
-		perlenv ? perlenv : "",
-		perlenv ? ";" : "",
-		wpurple_install_dir());
-	if (!g_setenv("PERL5LIB", newenv, TRUE))
-		purple_debug_warning("wpurple", "putenv failed for PERL5LIB\n");
-	g_free(newenv);
-
 	purple_debug_info("wpurple", "wpurple_init end\n");
 }
 
@@ -467,7 +454,14 @@ void wpurple_cleanup(void) {
 	WSACleanup();
 
 	g_free(app_data_dir);
+	g_free(install_dir);
+	g_free(lib_dir);
+	g_free(locale_dir);
+
 	app_data_dir = NULL;
+	install_dir = NULL;
+	lib_dir = NULL;
+	locale_dir = NULL;
 
 	libpurpledll_hInstance = NULL;
 }
diff --git a/libpurple/xmlnode.c b/libpurple/xmlnode.c
index fc2fc37b36..ae59687321 100644
--- a/libpurple/xmlnode.c
+++ b/libpurple/xmlnode.c
@@ -27,6 +27,7 @@
  * libxode uses memory pools that we simply have no need for, I decided to
  * write my own stuff.  Also, re-writing this lets me be as lightweight
  * as I want to be.  Thank you libxode for giving me a good starting point */
+#define _PURPLE_XMLNODE_C_
 
 #include "debug.h"
 #include "internal.h"
@@ -126,21 +127,28 @@ xmlnode_remove_attrib(xmlnode *node, const char *attr)
 	g_return_if_fail(node != NULL);
 	g_return_if_fail(attr != NULL);
 
-	for(attr_node = node->child; attr_node; attr_node = attr_node->next)
-	{
+	attr_node = node->child;
+	while (attr_node) {
 		if(attr_node->type == XMLNODE_TYPE_ATTRIB &&
 				purple_strequal(attr_node->name, attr))
 		{
-			if(sibling == NULL) {
+			if (node->lastchild == attr_node) {
+				node->lastchild = sibling;
+			}
+			if (sibling == NULL) {
 				node->child = attr_node->next;
+				xmlnode_free(attr_node);
+				attr_node = node->child;
 			} else {
 				sibling->next = attr_node->next;
+				sibling = attr_node->next;
+				xmlnode_free(attr_node);
+				attr_node = sibling;
 			}
-			if (node->lastchild == attr_node) {
-				node->lastchild = sibling;
-			}
-			xmlnode_free(attr_node);
-			return;
+		}
+		else
+		{
+			attr_node = attr_node->next;
 		}
 		sibling = attr_node;
 	}
@@ -178,51 +186,36 @@ xmlnode_remove_attrib_with_namespace(xmlnode *node, const char *attr, const char
 void
 xmlnode_set_attrib(xmlnode *node, const char *attr, const char *value)
 {
-	xmlnode *attrib_node;
-
-	g_return_if_fail(node != NULL);
-	g_return_if_fail(attr != NULL);
-	g_return_if_fail(value != NULL);
-
 	xmlnode_remove_attrib(node, attr);
-
-	attrib_node = new_node(attr, XMLNODE_TYPE_ATTRIB);
-
-	attrib_node->data = g_strdup(value);
-
-	xmlnode_insert_child(node, attrib_node);
+	xmlnode_set_attrib_full(node, attr, NULL, NULL, value);
 }
 
 void
 xmlnode_set_attrib_with_namespace(xmlnode *node, const char *attr, const char *xmlns, const char *value)
 {
-	xmlnode *attrib_node;
-
-	g_return_if_fail(node != NULL);
-	g_return_if_fail(attr != NULL);
-	g_return_if_fail(value != NULL);
-
-	xmlnode_remove_attrib_with_namespace(node, attr, xmlns);
-	attrib_node = new_node(attr, XMLNODE_TYPE_ATTRIB);
-
-	attrib_node->data = g_strdup(value);
-	attrib_node->xmlns = g_strdup(xmlns);
-
-	xmlnode_insert_child(node, attrib_node);
+	xmlnode_set_attrib_full(node, attr, xmlns, NULL, value);
 }
 
 void
 xmlnode_set_attrib_with_prefix(xmlnode *node, const char *attr, const char *prefix, const char *value)
 {
+	xmlnode_set_attrib_full(node, attr, NULL, prefix, value);
+}
+
+void
+xmlnode_set_attrib_full(xmlnode *node, const char *attr, const char *xmlns, const char *prefix, const char *value)
+{
 	xmlnode *attrib_node;
 
 	g_return_if_fail(node != NULL);
 	g_return_if_fail(attr != NULL);
 	g_return_if_fail(value != NULL);
 
+	xmlnode_remove_attrib_with_namespace(node, attr, xmlns);
 	attrib_node = new_node(attr, XMLNODE_TYPE_ATTRIB);
 
 	attrib_node->data = g_strdup(value);
+	attrib_node->xmlns = g_strdup(xmlns);
 	attrib_node->prefix = g_strdup(prefix);
 
 	xmlnode_insert_child(node, attrib_node);
@@ -295,6 +288,12 @@ const char *xmlnode_get_prefix(const xmlnode *node)
 	return node->prefix;
 }
 
+xmlnode *xmlnode_get_parent(const xmlnode *child)
+{
+	g_return_val_if_fail(child != NULL, NULL);
+	return child->parent;
+}
+
 void
 xmlnode_free(xmlnode *node)
 {
@@ -383,7 +382,7 @@ xmlnode_get_child_with_namespace(const xmlnode *parent, const char *name, const
 }
 
 char *
-xmlnode_get_data(xmlnode *node)
+xmlnode_get_data(const xmlnode *node)
 {
 	GString *str = NULL;
 	xmlnode *c;
@@ -406,7 +405,7 @@ xmlnode_get_data(xmlnode *node)
 }
 
 char *
-xmlnode_get_data_unescaped(xmlnode *node)
+xmlnode_get_data_unescaped(const xmlnode *node)
 {
 	char *escaped = xmlnode_get_data(node);
 
@@ -585,7 +584,8 @@ xmlnode_parser_element_start_libxml(void *user_data,
 		}
 
 		for(i=0; i < nb_attributes * 5; i+=5) {
-			const char *prefix = (const char *)attributes[i + 1];
+			const char *name = (const char *)attributes[i];
+			const char *prefix = (const char *)attributes[i+1];
 			char *txt;
 			int attrib_len = attributes[i+4] - attributes[i+3];
 			char *attrib = g_malloc(attrib_len + 1);
@@ -594,11 +594,7 @@ xmlnode_parser_element_start_libxml(void *user_data,
 			txt = attrib;
 			attrib = purple_unescape_html(txt);
 			g_free(txt);
-			if (prefix && *prefix) {
-				xmlnode_set_attrib_with_prefix(node, (const char*) attributes[i], prefix, attrib);
-			} else {
-				xmlnode_set_attrib(node, (const char*) attributes[i], attrib);
-			}
+			xmlnode_set_attrib_full(node, name, NULL, prefix, attrib);
 			g_free(attrib);
 		}
 
@@ -651,6 +647,28 @@ xmlnode_parser_error_libxml(void *user_data, const char *msg, ...)
 	purple_debug_error("xmlnode", "Error parsing xml file: %s", errmsg);
 }
 
+static void
+xmlnode_parser_structural_error_libxml(void *user_data, xmlErrorPtr error)
+{
+	struct _xmlnode_parser_data *xpd = user_data;
+
+	if (error && (error->level == XML_ERR_ERROR ||
+	              error->level == XML_ERR_FATAL)) {
+		xpd->error = TRUE;
+		purple_debug_error("xmlnode", "XML parser error for xmlnode %p: "
+		                   "Domain %i, code %i, level %i: %s",
+		                   user_data, error->domain, error->code, error->level,
+		                   error->message ? error->message : "(null)\n");
+	} else if (error)
+		purple_debug_warning("xmlnode", "XML parser error for xmlnode %p: "
+		                     "Domain %i, code %i, level %i: %s",
+		                     user_data, error->domain, error->code, error->level,
+		                     error->message ? error->message : "(null)\n");
+	else
+		purple_debug_warning("xmlnode", "XML parser error for xmlnode %p\n",
+		                     user_data);
+}
+
 static xmlSAXHandler xmlnode_parser_libxml = {
 	NULL, /* internalSubset */
 	NULL, /* isStandalone */
@@ -683,7 +701,7 @@ static xmlSAXHandler xmlnode_parser_libxml = {
 	NULL, /* _private */
 	xmlnode_parser_element_start_libxml, /* startElementNs */
 	xmlnode_parser_element_end_libxml,   /* endElementNs   */
-	NULL, /* serror */
+	xmlnode_parser_structural_error_libxml, /* serror */
 };
 
 xmlnode *
diff --git a/libpurple/xmlnode.h b/libpurple/xmlnode.h
index bab8192d13..737bab8443 100644
--- a/libpurple/xmlnode.h
+++ b/libpurple/xmlnode.h
@@ -53,10 +53,10 @@ struct _xmlnode
 	XMLNodeType type;		/**< The type of the node. */
 	char *data;			/**< The data for the node. */
 	size_t data_sz;			/**< The size of the data. */
-	struct _xmlnode *parent;	/**< The parent node or @c NULL.*/
-	struct _xmlnode *child;		/**< The child node or @c NULL.*/
-	struct _xmlnode *lastchild;	/**< The last child node or @c NULL.*/
-	struct _xmlnode *next;		/**< The next node or @c NULL. */
+	xmlnode *parent;            /**< The parent node or @c NULL.*/
+	xmlnode *child;             /**< The child node or @c NULL.*/
+	xmlnode *lastchild;         /**< The last child node or @c NULL.*/
+	xmlnode *next;              /**< The next node or @c NULL. */
 	char *prefix;               /**< The namespace prefix if any. */
 	GHashTable *namespace_map;  /**< The namespace map. */
 };
@@ -136,7 +136,7 @@ void xmlnode_insert_data(xmlnode *node, const char *data, gssize size);
  * @return The data from the node or NULL. This data is in raw escaped format.
  *         You must g_free this string when finished using it.
  */
-char *xmlnode_get_data(xmlnode *node);
+char *xmlnode_get_data(const xmlnode *node);
 
 /**
  * Gets unescaped data from a node.
@@ -146,7 +146,7 @@ char *xmlnode_get_data(xmlnode *node);
  * @return The data from the node, in unescaped form.   You must g_free
  *         this string when finished using it.
  */
-char *xmlnode_get_data_unescaped(xmlnode *node);
+char *xmlnode_get_data_unescaped(const xmlnode *node);
 
 /**
  * Sets an attribute for a node.
@@ -157,6 +157,7 @@ char *xmlnode_get_data_unescaped(xmlnode *node);
  */
 void xmlnode_set_attrib(xmlnode *node, const char *attr, const char *value);
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_XMLNODE_C_)
 /**
  * Sets a prefixed attribute for a node
  *
@@ -164,6 +165,8 @@ void xmlnode_set_attrib(xmlnode *node, const char *attr, const char *value);
  * @param attr   The name of the attribute to set
  * @param prefix The prefix of the attribute to ste
  * @param value  The value of the attribute
+ *
+ * @deprecated Use xmlnode_set_attrib_full instead.
  */
 void xmlnode_set_attrib_with_prefix(xmlnode *node, const char *attr, const char *prefix, const char *value);
 
@@ -174,8 +177,25 @@ void xmlnode_set_attrib_with_prefix(xmlnode *node, const char *attr, const char
  * @param attr  The name of the attribute to set
  * @param xmlns The namespace of the attribute to ste
  * @param value The value of the attribute
+ *
+ * @deprecated Use xmlnode_set_attrib_full instead.
  */
 void xmlnode_set_attrib_with_namespace(xmlnode *node, const char *attr, const char *xmlns, const char *value);
+#endif /* PURPLE_DISABLE_DEPRECATED */
+
+/**
+ * Sets a namespaced attribute for a node
+ *
+ * @param node   The node to set an attribute for.
+ * @param attr   The name of the attribute to set
+ * @param xmlns  The namespace of the attribute to ste
+ * @param prefix The prefix of the attribute to ste
+ * @param value  The value of the attribute
+ *
+ * @since 2.6.0
+ */
+void xmlnode_set_attrib_full(xmlnode *node, const char *attr, const char *xmlns,
+	const char *prefix, const char *value);
 
 /**
  * Gets an attribute from a node.
@@ -248,6 +268,17 @@ void xmlnode_set_prefix(xmlnode *node, const char *prefix);
 const char *xmlnode_get_prefix(const xmlnode *node);
 
 /**
+ * Gets the parent node.
+ *
+ * @param child The child node.
+ *
+ * @return The parent or NULL.
+ *
+ * @since 2.6.0
+ */
+xmlnode *xmlnode_get_parent(const xmlnode *child);
+
+/**
  * Returns the node in a string of xml.
  *
  * @param node The starting node to output.
@@ -304,11 +335,14 @@ void xmlnode_free(xmlnode *node);
  * root node of an XML document will parse the entire document
  * into a tree of nodes, and return the xmlnode of the root.
  *
- * @param str  The string of xml.
- * @param description  The description of the file being parsed
- * @process  The utility that is calling xmlnode_from_file
+ * @param dir  The directory where the file is located
+ * @param filename  The filename
+ * @param description  A description of the file being parsed. Displayed to
+ * 			the user if the file cannot be read.
+ * @param process  The subsystem that is calling xmlnode_from_file. Used as
+ * 			the category for debugging.
  *
- * @return The new node.
+ * @return The new node or NULL if an error occurred.
  *
  * @since 2.6.0
  */
diff --git a/pidgin.desktop.in b/pidgin.desktop.in
index de07ce538b..fbbab51089 100644
--- a/pidgin.desktop.in
+++ b/pidgin.desktop.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 _Name=Pidgin Internet Messenger
 _GenericName=Internet Messenger
 _Comment=Send instant messages over multiple protocols
diff --git a/pidgin.spec.in b/pidgin.spec.in
index 8ea743600f..2b86ae3796 100644
--- a/pidgin.spec.in
+++ b/pidgin.spec.in
@@ -234,8 +234,6 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
                                     %{?_without_nm:--disable-nm} \
                                     %{!?_without_gevolution:--enable-gevolution} \
                                     %{?_with_mono:--enable-mono} \
-                                    %{?_with_perlmakehack:--with-perl-lib=%{buildroot}%{_prefix}} \
-                                    %{!?_with_perlmakehack:--with-perl-lib=%{_prefix}} \
                                     %{?_with_sasl:--enable-cyrus-sasl} \
                                     %{?_without_tcl:--disable-tcl} \
                                     %{?_without_text:--disable-consoleui}
@@ -244,15 +242,7 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf %{buildroot}
-%if 0%{?_with_perlmakehack:1}
-make prefix=%{buildroot}%{_prefix} bindir=%{buildroot}%{_bindir} \
-     datadir=%{buildroot}%{_datadir} includedir=%{buildroot}%{_includedir} \
-     libdir=%{buildroot}%{_libdir} mandir=%{buildroot}%{_mandir} \
-     sysconfdir=%{buildroot}%{_sysconfdir} \
-     install
-%else
 make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
-%endif
 
 # Delete files that we don't want to put in any of the RPMs
 rm -f $RPM_BUILD_ROOT%{_libdir}/finch/*.la
@@ -261,6 +251,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
@@ -374,9 +365,9 @@ fi
 %doc %{_mandir}/man3*/*
 
 %dir %{_libdir}/pidgin
-%attr(755, root, root) %{perl_vendorarch}/Pidgin.pm
-%attr(755, root, root) %{perl_vendorarch}/auto/Pidgin
-
+%dir %{_libdir}/pidgin/perl
+%dir %{_libdir}/pidgin/perl/auto
+%dir %{_libdir}/pidgin/perl/auto/Pidgin
 %{_bindir}/pidgin
 %{_datadir}/pixmaps/pidgin
 %{_datadir}/icons/hicolor/*/apps/pidgin.*
@@ -389,10 +380,11 @@ fi
 
 %{_libdir}/libpurple.so.*
 %dir %{_libdir}/purple-2
+%dir %{_libdir}/purple-2/perl
+%dir %{_libdir}/purple-2/perl/auto
+%dir %{_libdir}/purple-2/perl/auto/Purple
 %{_datadir}/purple
 %{_datadir}/sounds/purple
-%attr(755, root, root) %{perl_vendorarch}/Purple.pm
-%attr(755, root, root) %{perl_vendorarch}/auto/Purple
 
 %if 0%{?_with_dbus:1}
 %{_bindir}/purple-client-example
@@ -473,6 +465,9 @@ fi
 %endif
 
 %changelog
+* Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+- Update to reflect changes in perl module installation directories
+
 * Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
 - Fix building without meanwhile support
 
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
index b56f48bfb0..058be59c2a 100644
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -103,6 +103,7 @@ pidgin_SOURCES = \
 	gtkimhtmltoolbar.c \
 	gtklog.c \
 	gtkmain.c \
+	gtkmedia.c \
 	gtkmenutray.c \
 	gtknotify.c \
 	gtkplugin.c \
@@ -139,8 +140,6 @@ pidgin_headers = \
 	gtkcellrendererprogress.h \
 	gtkcellview.h \
 	gtkcellviewmenuitem.h \
-	gtkcellview.h \
-	gtkcellviewmenuitem.h \
 	gtkcertmgr.h \
 	pidgincombobox.h \
 	gtkconn.h \
@@ -160,6 +159,7 @@ pidgin_headers = \
 	gtkimhtml.h \
 	gtkimhtmltoolbar.h \
 	gtklog.h \
+	gtkmedia.h \
 	gtkmenutray.h \
 	gtknickcolors.h \
 	gtknotify.h \
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
index dbe6a35c7d..e1b7231581 100644
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -77,6 +77,7 @@ PIDGIN_C_SRC =	\
 			gtkimhtmltoolbar.c \
 			gtklog.c \
 			gtkmain.c \
+			gtkmedia.c \
 			gtkmenutray.c \
 			gtknotify.c \
 			gtkplugin.c \
diff --git a/pidgin/eggtrayicon.c b/pidgin/eggtrayicon.c
index d246c49028..c39127ecb1 100644
--- a/pidgin/eggtrayicon.c
+++ b/pidgin/eggtrayicon.c
@@ -400,9 +400,35 @@ egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
 static gboolean
 transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
 {
-	gdk_window_clear_area (widget->window, event->area.x, event->area.y,
-	                      event->area.width, event->area.height);
-	return FALSE;
+  GtkWidget *focus_child = NULL;
+  gint border_width, x, y, width, height;
+  gboolean retval = FALSE;
+
+  gdk_window_clear_area (widget->window, event->area.x, event->area.y,
+                         event->area.width, event->area.height);
+
+  if (GTK_WIDGET_CLASS (parent_class)->expose_event)
+    retval = GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+
+  if (GTK_CONTAINER (widget)->focus_child)
+    focus_child = GTK_CONTAINER (GTK_CONTAINER (widget)->focus_child)->focus_child;
+  if (focus_child && GTK_WIDGET_HAS_FOCUS (focus_child))
+    {
+      border_width = GTK_CONTAINER (widget)->border_width;
+
+      x = widget->allocation.x + border_width;
+      y = widget->allocation.y + border_width;
+
+      width  = widget->allocation.width  - 2 * border_width;
+      height = widget->allocation.height - 2 * border_width;
+
+      gtk_paint_focus (widget->style, widget->window,
+                       GTK_WIDGET_STATE (widget),
+                       &event->area, widget, "tray_icon",
+                       x, y, width, height);
+    }
+
+  return retval;
 }
 
 static void
diff --git a/pidgin/eggtrayicon.h b/pidgin/eggtrayicon.h
index 01475a9a48..f5649f727a 100644
--- a/pidgin/eggtrayicon.h
+++ b/pidgin/eggtrayicon.h
@@ -21,8 +21,7 @@
 #ifndef __EGG_TRAY_ICON_H__
 #define __EGG_TRAY_ICON_H__
 
-#include <gtk/gtkplug.h>
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 G_BEGIN_DECLS
diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
index a5f0a85fe9..81d5932bb3 100644
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -106,8 +106,8 @@ typedef struct
 	GtkSizeGroup *sg;
 	GtkWidget *window;
 
+	GtkWidget *notebook;
 	GtkWidget *top_vbox;
-	GtkWidget *bottom_vbox;
 	GtkWidget *ok_button;
 	GtkWidget *register_button;
 
@@ -157,8 +157,7 @@ static void set_account(GtkListStore *store, GtkTreeIter *iter,
  **************************************************************************/
 static void add_login_options(AccountPrefsDialog *dialog, GtkWidget *parent);
 static void add_user_options(AccountPrefsDialog *dialog, GtkWidget *parent);
-static void add_protocol_options(AccountPrefsDialog *dialog,
-								 GtkWidget *parent);
+static void add_protocol_options(AccountPrefsDialog *dialog);
 static void add_proxy_options(AccountPrefsDialog *dialog, GtkWidget *parent);
 
 static GtkWidget *
@@ -237,7 +236,7 @@ set_account_protocol_cb(GtkWidget *item, const char *id,
 
 	add_login_options(dialog,    dialog->top_vbox);
 	add_user_options(dialog,     dialog->top_vbox);
-	add_protocol_options(dialog, dialog->bottom_vbox);
+	add_protocol_options(dialog);
 
 	gtk_widget_grab_focus(dialog->protocol_menu);
 
@@ -414,7 +413,11 @@ add_login_options(AccountPrefsDialog *dialog, GtkWidget *parent)
 
 	if (dialog->protocol_menu != NULL)
 	{
+#if GTK_CHECK_VERSION(2,12,0)
+		g_object_ref(G_OBJECT(dialog->protocol_menu));
+#else
 		gtk_widget_ref(dialog->protocol_menu);
+#endif
 		hbox = g_object_get_data(G_OBJECT(dialog->protocol_menu), "container");
 		gtk_container_remove(GTK_CONTAINER(hbox), dialog->protocol_menu);
 	}
@@ -441,13 +444,21 @@ add_login_options(AccountPrefsDialog *dialog, GtkWidget *parent)
 	{
 		dialog->protocol_menu = pidgin_protocol_option_menu_new(
 				dialog->protocol_id, G_CALLBACK(set_account_protocol_cb), dialog);
+#if GTK_CHECK_VERSION(2,12,0)
+		g_object_ref(G_OBJECT(dialog->protocol_menu));
+#else
 		gtk_widget_ref(dialog->protocol_menu);
+#endif
 	}
 
 	hbox = add_pref_box(dialog, vbox, _("Pro_tocol:"), dialog->protocol_menu);
 	g_object_set_data(G_OBJECT(dialog->protocol_menu), "container", hbox);
 
+#if GTK_CHECK_VERSION(2,12,0)
+	g_object_unref(G_OBJECT(dialog->protocol_menu));
+#else
 	gtk_widget_unref(dialog->protocol_menu);
+#endif
 
 	/* Username */
 	dialog->username_entry = gtk_entry_new();
@@ -733,11 +744,11 @@ add_user_options(AccountPrefsDialog *dialog, GtkWidget *parent)
 }
 
 static void
-add_protocol_options(AccountPrefsDialog *dialog, GtkWidget *parent)
+add_protocol_options(AccountPrefsDialog *dialog)
 {
 	PurpleAccountOption *option;
 	PurpleAccount *account;
-	GtkWidget *frame, *vbox, *check, *entry, *combo;
+	GtkWidget *vbox, *check, *entry, *combo;
 	GList *list, *node;
 	gint i, idx, int_value;
 	GtkListStore *model;
@@ -752,14 +763,10 @@ add_protocol_options(AccountPrefsDialog *dialog, GtkWidget *parent)
 	ProtocolOptEntry *opt_entry;
 
 	if (dialog->protocol_frame != NULL) {
-		gtk_widget_destroy(dialog->protocol_frame);
+		gtk_notebook_remove_page (GTK_NOTEBOOK(dialog->notebook), 1);
 		dialog->protocol_frame = NULL;
 	}
 
-	if (dialog->prpl_info == NULL ||
-			dialog->prpl_info->protocol_options == NULL)
-		return;
-
 	while (dialog->protocol_opt_entries != NULL) {
 		ProtocolOptEntry *opt_entry = dialog->protocol_opt_entries->data;
 		g_free(opt_entry->setting);
@@ -767,21 +774,17 @@ add_protocol_options(AccountPrefsDialog *dialog, GtkWidget *parent)
 		dialog->protocol_opt_entries = g_list_delete_link(dialog->protocol_opt_entries, dialog->protocol_opt_entries);
 	}
 
-	account = dialog->account;
-
-	/* Build the protocol options frame. */
-	g_snprintf(buf, sizeof(buf), _("%s Options"), dialog->plugin->info->name);
-
-	frame = pidgin_make_frame(parent, buf);
-	dialog->protocol_frame =
-		gtk_widget_get_parent(gtk_widget_get_parent(frame));
+	if (dialog->prpl_info == NULL ||
+			dialog->prpl_info->protocol_options == NULL)
+		return;
 
-	gtk_box_reorder_child(GTK_BOX(parent), dialog->protocol_frame, 0);
-	gtk_widget_show(dialog->protocol_frame);
+	account = dialog->account;
 
 	/* Main vbox */
-	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-	gtk_container_add(GTK_CONTAINER(frame), vbox);
+	dialog->protocol_frame = vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER);
+	gtk_notebook_insert_page(GTK_NOTEBOOK(dialog->notebook), vbox,
+			gtk_label_new_with_mnemonic(_("Ad_vanced")), 1);
 	gtk_widget_show(vbox);
 
 	for (l = dialog->prpl_info->protocol_options; l != NULL; l = l->next)
@@ -1046,22 +1049,15 @@ static void
 add_proxy_options(AccountPrefsDialog *dialog, GtkWidget *parent)
 {
 	PurpleProxyInfo *proxy_info;
-	GtkWidget *frame;
 	GtkWidget *vbox;
 	GtkWidget *vbox2;
 
 	if (dialog->proxy_frame != NULL)
 		gtk_widget_destroy(dialog->proxy_frame);
 
-	frame = pidgin_make_frame(parent, _("Proxy Options"));
-	dialog->proxy_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame));
-
-	gtk_box_reorder_child(GTK_BOX(parent), dialog->proxy_frame, 1);
-	gtk_widget_show(dialog->proxy_frame);
-
 	/* Main vbox */
-	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-	gtk_container_add(GTK_CONTAINER(frame), vbox);
+	dialog->proxy_frame = vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+	gtk_container_add(GTK_CONTAINER(parent), vbox);
 	gtk_widget_show(vbox);
 
 	/* Proxy Type drop-down. */
@@ -1496,15 +1492,15 @@ pidgin_account_dialog_show(PidginAccountDialogType type,
 		dialog->prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(dialog->plugin);
 
 	dialog->window = win = pidgin_create_dialog((type == PIDGIN_ADD_ACCOUNT_DIALOG) ? _("Add Account") : _("Modify Account"),
-		PIDGIN_HIG_BORDER, "account", FALSE);
+		PIDGIN_HIG_BOX_SPACE, "account", FALSE);
 
 	g_signal_connect(G_OBJECT(win), "delete_event",
 					 G_CALLBACK(account_win_destroy_cb), dialog);
 
 	/* Setup the vbox */
-	main_vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
+	main_vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BOX_SPACE);
 
-	notebook = gtk_notebook_new();
+	dialog->notebook = notebook = gtk_notebook_new();
 	gtk_box_pack_start(GTK_BOX(main_vbox), notebook, FALSE, FALSE, 0);
 	gtk_widget_show(GTK_WIDGET(notebook));
 
@@ -1530,15 +1526,15 @@ pidgin_account_dialog_show(PidginAccountDialogType type,
 	if (!dialog->prpl_info || !dialog->prpl_info->register_user)
 		gtk_widget_hide(button);
 
-	/* Setup the page with 'Advanced'. */
-	dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
+	/* Setup the page with 'Advanced' (protocol options). */
+	add_protocol_options(dialog);
+
+	/* Setup the page with 'Proxy'. */
+	dbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
 	gtk_container_set_border_width(GTK_CONTAINER(dbox), PIDGIN_HIG_BORDER);
 	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox,
-			gtk_label_new_with_mnemonic(_("_Advanced")));
+			gtk_label_new_with_mnemonic(_("P_roxy")));
 	gtk_widget_show(dbox);
-
-	/** Setup the bottom frames. */
-	add_protocol_options(dialog, dbox);
 	add_proxy_options(dialog, dbox);
 
 	/* Cancel button */
@@ -1994,8 +1990,9 @@ set_account(GtkListStore *store, GtkTreeIter *iter, PurpleAccount *account, GdkP
 				/* This is for when set_account() is called for a single account */
 				const char *path;
 				path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon");
-				if (path != NULL)
+				if ((path != NULL) && (*path != '\0')) {
 					img = purple_imgstore_new_from_file(path);
+				}
 			}
 		} else {
 			img = purple_buddy_icons_find_account_icon(account);
diff --git a/pidgin/gtkblist-theme-loader.c b/pidgin/gtkblist-theme-loader.c
index 8571a53f37..5e0c393c4f 100644
--- a/pidgin/gtkblist-theme-loader.c
+++ b/pidgin/gtkblist-theme-loader.c
@@ -20,9 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
+
 #include <stdlib.h>
+#include <string.h>
 
 #include "xmlnode.h"
+#include "debug.h"
+#include "util.h"
 
 #include "gtkblist-theme-loader.h"
 #include "gtkblist-theme.h"
@@ -37,18 +42,59 @@
  * Buddy List Theme Builder
  *****************************************************************************/
 
+static PidginThemeFont *
+pidgin_theme_font_parse(xmlnode *node)
+{
+	const char *font;
+	const char *colordesc;
+	GdkColor color;
+
+	font = xmlnode_get_attrib(node, "font");
+
+	if ((colordesc = xmlnode_get_attrib(node, "color")) == NULL ||
+			!gdk_color_parse(colordesc, &color))
+		gdk_color_parse(DEFAULT_TEXT_COLOR, &color);
+
+	return pidgin_theme_font_new(font, &color);
+}
+
 static PurpleTheme *
 pidgin_blist_loader_build(const gchar *dir)
 {
 	xmlnode *root_node = NULL, *sub_node, *sub_sub_node;
-	gchar *filename_full, *data;
-	const gchar *temp;
+	gchar *filename_full, *data = NULL;
+	const gchar *temp, *name;
 	gboolean success = TRUE;
-	GdkColor *bgcolor, *expanded_bgcolor, *collapsed_bgcolor, *contact_color;
-	GdkColor color;
-	FontColorPair *expanded, *collapsed, *contact, *online, *away, *offline, *idle, *message, *message_nick_said, *status;
-	PidginBlistLayout *layout;
+	GdkColor bgcolor, expanded_bgcolor, collapsed_bgcolor, contact_color;
+	PidginThemeFont *expanded, *collapsed, *contact, *online, *away, *offline, *idle, *message, *message_nick_said, *status;
+	PidginBlistLayout layout;
 	PidginBlistTheme *theme;
+	int i;
+	struct {
+		const char *tag;
+		PidginThemeFont **font;
+	} lookups[] = {
+		{"contact_text", &contact},
+		{"online_text", &online},
+		{"away_text", &away},
+		{"offline_text", &offline},
+		{"idle_text", &idle},
+		{"message_text", &message},
+		{"message_nick_said_text", &message_nick_said},
+		{"status_text", &status},
+		{NULL, NULL}
+	};
+
+	expanded          = NULL;
+	collapsed         = NULL;
+	contact           = NULL;
+	online            = NULL;
+	away              = NULL;
+	offline           = NULL;
+	idle              = NULL;
+	message           = NULL;
+	message_nick_said = NULL;
+	status            = NULL;
 
 	/* Find the theme file */
 	g_return_val_if_fail(dir != NULL, NULL);
@@ -58,150 +104,90 @@ pidgin_blist_loader_build(const gchar *dir)
 		root_node = xmlnode_from_file(dir, "theme.xml", "buddy list themes", "blist-loader");
 
 	g_free(filename_full);
-	g_return_val_if_fail(root_node != NULL, NULL);
+	if (root_node == NULL)
+		return NULL;
 
 	sub_node = xmlnode_get_child(root_node, "description");
 	data = xmlnode_get_data(sub_node);
 
-	/* init all structs and colors */
-	bgcolor = g_new0(GdkColor, 1);
-	expanded_bgcolor = g_new0(GdkColor, 1);
-	collapsed_bgcolor = g_new0(GdkColor, 1);
-
-	layout = g_new0(PidginBlistLayout, 1);
-
-	contact_color = g_new0(GdkColor, 1);
-
-	expanded = g_new0(FontColorPair, 1);
-	collapsed = g_new0(FontColorPair, 1);
-	contact = g_new0(FontColorPair, 1);
-	online = g_new0(FontColorPair, 1);
-	away = g_new0(FontColorPair, 1);
-	offline = g_new0(FontColorPair, 1);
-	idle = g_new0(FontColorPair, 1);
-	message = g_new0(FontColorPair, 1);
-	message_nick_said = g_new0(FontColorPair, 1);
-	status = g_new0(FontColorPair, 1);
+	name = xmlnode_get_attrib(root_node, "name");
 
 	/* <blist> */
-	if ((success = (sub_node = xmlnode_get_child(root_node, "blist")) != NULL)) {
-		if ((temp = xmlnode_get_attrib(sub_node, "color")) != NULL && gdk_color_parse(temp, bgcolor))
-			gdk_colormap_alloc_color(gdk_colormap_get_system(), bgcolor, FALSE, TRUE);
-		else {
-			g_free(bgcolor);
-			bgcolor = NULL;
-		}
-	}
+	success = name && purple_strequal(xmlnode_get_attrib(root_node, "type"), "pidgin buddy list");
 
-	/* <groups> */
-	if ((success = (success && (sub_node = xmlnode_get_child(root_node, "groups")) != NULL
-		     && (sub_sub_node = xmlnode_get_child(sub_node, "expanded")) != NULL)))
-	{
-		expanded->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font"));
-
-		if ((temp = xmlnode_get_attrib(sub_sub_node, "text_color")) != NULL && gdk_color_parse(temp, &color))
-			expanded->color = g_strdup(temp);
-		else expanded->color = g_strdup(DEFAULT_TEXT_COLOR);
-
-		if ((temp = xmlnode_get_attrib(sub_sub_node, "background")) != NULL && gdk_color_parse(temp, expanded_bgcolor))
-			gdk_colormap_alloc_color(gdk_colormap_get_system(), expanded_bgcolor, FALSE, TRUE);
-		else {
-			g_free(expanded_bgcolor);
-			expanded_bgcolor = NULL;
-		}
-	}
+	if (!success)
+		purple_debug_warning("gtkblist-theme-loader", "Missing attribute or problem with the root element\n");
 
-	if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "collapsed")) != NULL)))
-	{
-		collapsed->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font"));
+	if (success) {
+		if ((success = (sub_node = xmlnode_get_child(root_node, "blist")) != NULL)) {
 
-		if((temp = xmlnode_get_attrib(sub_sub_node, "text_color")) != NULL && gdk_color_parse(temp, &color))
-			collapsed->color = g_strdup(temp);
-		else collapsed->color = g_strdup(DEFAULT_TEXT_COLOR);
+			if ((temp = xmlnode_get_attrib(sub_node, "color")) != NULL && gdk_color_parse(temp, &bgcolor))
+				gdk_colormap_alloc_color(gdk_colormap_get_system(), &bgcolor, FALSE, TRUE);
+			else
+				memset(&bgcolor, 0, sizeof(GdkColor));
 
-		if ((temp = xmlnode_get_attrib(sub_sub_node, "background")) != NULL && gdk_color_parse(temp, collapsed_bgcolor))
-			gdk_colormap_alloc_color(gdk_colormap_get_system(), collapsed_bgcolor, FALSE, TRUE);
-		else {
-			g_free(collapsed_bgcolor);
-			collapsed_bgcolor = NULL;
-		}
+		} else purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <blist>.\n");
 	}
 
-	/* <buddys> */
-	if ((success = (success && (sub_node = xmlnode_get_child(root_node, "buddys")) != NULL &&
-		     (sub_sub_node = xmlnode_get_child(sub_node, "placement")) != NULL)))
-	{
-		layout->status_icon = (temp = xmlnode_get_attrib(sub_sub_node, "status_icon")) != NULL ? atoi(temp) : 0;
-		layout->text = (temp = xmlnode_get_attrib(sub_sub_node, "name")) != NULL ? atoi(temp) : 1;
-		layout->emblem = (temp = xmlnode_get_attrib(sub_sub_node, "emblem")) != NULL ? atoi(temp) : 2;
-		layout->protocol_icon = (temp = xmlnode_get_attrib(sub_sub_node, "protocol_icon")) != NULL ? atoi(temp) : 3;
-		layout->buddy_icon = (temp = xmlnode_get_attrib(sub_sub_node, "buddy_icon")) != NULL ? atoi(temp) : 4;
-		layout->show_status = (temp = xmlnode_get_attrib(sub_sub_node, "status_icon")) != NULL ? atoi(temp) != 0 : 1;
-	}
+	/* <groups> */
+	if (success) {
+		if ((success = (sub_node = xmlnode_get_child(root_node, "groups")) != NULL
+			     && (sub_sub_node = xmlnode_get_child(sub_node, "expanded")) != NULL)) {
+			expanded = pidgin_theme_font_parse(sub_sub_node);
 
-	if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "background")) != NULL))) {
-		if(gdk_color_parse(xmlnode_get_attrib(sub_sub_node, "color"), contact_color))
-			gdk_colormap_alloc_color(gdk_colormap_get_system(), contact_color, FALSE, TRUE);
-		else {
-			g_free(contact_color);
-			contact_color = NULL;
-		}
-	}
+			if ((temp = xmlnode_get_attrib(sub_sub_node, "background")) != NULL && gdk_color_parse(temp, &expanded_bgcolor))
+				gdk_colormap_alloc_color(gdk_colormap_get_system(), &expanded_bgcolor, FALSE, TRUE);
+			else
+				memset(&expanded_bgcolor, 0, sizeof(GdkColor));
 
-	if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "contact_text")) != NULL))) {
-		contact->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font"));
-		if(gdk_color_parse(temp = xmlnode_get_attrib(sub_sub_node, "color"), &color))
-			contact->color = g_strdup(temp);
-		else contact->color = g_strdup(DEFAULT_TEXT_COLOR);
+		} else purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <groups> <expanded>.\n");
 	}
 
-	if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "online_text")) != NULL))) {
-		online->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font"));
-		if(gdk_color_parse(temp = xmlnode_get_attrib(sub_sub_node, "color"), &color))
-			online->color = g_strdup(temp);
-		else online->color = g_strdup(DEFAULT_TEXT_COLOR);
-	}
+	if (success) {
+		if ((success = sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "collapsed")) != NULL)) {
 
-	if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "away_text")) != NULL))) {
-		away->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font"));
-		if(gdk_color_parse(temp = xmlnode_get_attrib(sub_sub_node, "color"), &color))
-			away->color = g_strdup(temp);
-		else away->color = g_strdup(DEFAULT_TEXT_COLOR);
-	}
+			collapsed = pidgin_theme_font_parse(sub_sub_node);
 
-	if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "offline_text")) != NULL))) {
-		offline->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font"));
-		if(gdk_color_parse(temp = xmlnode_get_attrib(sub_sub_node, "color"), &color))
-			online->color = g_strdup(temp);
-		else online->color = g_strdup(DEFAULT_TEXT_COLOR);
-	}
+			if ((temp = xmlnode_get_attrib(sub_sub_node, "background")) != NULL && gdk_color_parse(temp, &collapsed_bgcolor))
+				gdk_colormap_alloc_color(gdk_colormap_get_system(), &collapsed_bgcolor, FALSE, TRUE);
+			else
+				memset(&collapsed_bgcolor, 0, sizeof(GdkColor));
 
-	if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "idle_text")) != NULL))) {
-		idle->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font"));
-		if(gdk_color_parse(temp = xmlnode_get_attrib(sub_sub_node, "color"), &color))
-			idle->color = g_strdup(temp);
-		else online->color = g_strdup(DEFAULT_TEXT_COLOR);
+		} else purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <groups> <collapsed>.\n");
 	}
 
-	if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "message_text")) != NULL))) {
-		message->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font"));
-		if(gdk_color_parse(temp = xmlnode_get_attrib(sub_sub_node, "color"), &color))
-			message->color = g_strdup(temp);
-		else message->color = g_strdup(DEFAULT_TEXT_COLOR);
+	/* <buddys> */
+	if (success) {
+		if ((success = (sub_node = xmlnode_get_child(root_node, "buddys")) != NULL &&
+			     (sub_sub_node = xmlnode_get_child(sub_node, "placement")) != NULL)) {
+
+			layout.status_icon = (temp = xmlnode_get_attrib(sub_sub_node, "status_icon")) != NULL ? atoi(temp) : 0;
+			layout.text = (temp = xmlnode_get_attrib(sub_sub_node, "name")) != NULL ? atoi(temp) : 1;
+			layout.emblem = (temp = xmlnode_get_attrib(sub_sub_node, "emblem")) != NULL ? atoi(temp) : 2;
+			layout.protocol_icon = (temp = xmlnode_get_attrib(sub_sub_node, "protocol_icon")) != NULL ? atoi(temp) : 3;
+			layout.buddy_icon = (temp = xmlnode_get_attrib(sub_sub_node, "buddy_icon")) != NULL ? atoi(temp) : 4;
+			layout.show_status = (temp = xmlnode_get_attrib(sub_sub_node, "status_icon")) != NULL ? atoi(temp) != 0 : 1;
+
+		} else purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <buddys> <placement>.\n");
 	}
 
-	if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "message_nick_said_text")) != NULL))) {
-		message_nick_said->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font"));
-		if(gdk_color_parse(temp = xmlnode_get_attrib(sub_sub_node, "color"), &color))
-			message_nick_said->color = g_strdup(temp);
-		else message_nick_said->color = g_strdup(DEFAULT_TEXT_COLOR);
+	if (success) {
+		if ((success = (sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "background")) != NULL))) {
+			if(gdk_color_parse(xmlnode_get_attrib(sub_sub_node, "color"), &contact_color))
+				gdk_colormap_alloc_color(gdk_colormap_get_system(), &contact_color, FALSE, TRUE);
+			else
+				memset(&contact_color, 0, sizeof(GdkColor));
+
+		} else purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <buddys> <background>.\n");
 	}
 
-	if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "status_text")) != NULL))) {
-		status->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font"));
-		if(gdk_color_parse(temp = xmlnode_get_attrib(sub_sub_node, "color"), &color))
-			status->color = g_strdup(temp);
-		else status->color = g_strdup(DEFAULT_TEXT_COLOR);
+	for (i = 0; success && lookups[i].tag; i++) {
+		if ((success = (sub_node != NULL &&
+						(sub_sub_node = xmlnode_get_child(sub_node, lookups[i].tag)) != NULL))) {
+			*(lookups[i].font) = pidgin_theme_font_parse(sub_sub_node);
+		} else {
+			*(lookups[i].font) = NULL;
+		}
 	}
 
 	/* name is required for theme manager */
@@ -210,18 +196,18 @@ pidgin_blist_loader_build(const gchar *dir)
 	/* the new theme */
 	theme = g_object_new(PIDGIN_TYPE_BLIST_THEME,
 			"type", "blist",
-			"name", xmlnode_get_attrib(root_node, "name"),
+			"name", name,
 			"author", xmlnode_get_attrib(root_node, "author"),
 			"image", xmlnode_get_attrib(root_node, "image"),
 			"directory", dir,
 			"description", data,
-			"background-color", bgcolor,
-			"layout", layout,
-			"expanded-color", expanded_bgcolor,
+			"background-color", &bgcolor,
+			"layout", &layout,
+			"expanded-color", &expanded_bgcolor,
 			"expanded-text", expanded,
-			"collapsed-color", collapsed_bgcolor,
+			"collapsed-color", &collapsed_bgcolor,
 			"collapsed-text", collapsed,
-			"contact-color", contact_color,
+			"contact-color", &contact_color,
 			"contact", contact,
 			"online", online,
 			"away", away,
@@ -231,6 +217,15 @@ pidgin_blist_loader_build(const gchar *dir)
 			"message_nick_said", message_nick_said,
 			"status", status, NULL);
 
+	for (i = 0; lookups[i].tag; i++) {
+		if (*lookups[i].font) {
+			pidgin_theme_font_free(*lookups[i].font);
+		}
+	}
+
+	pidgin_theme_font_free(expanded);
+	pidgin_theme_font_free(collapsed);
+
 	xmlnode_free(root_node);
 	g_free(data);
 
diff --git a/pidgin/gtkblist-theme-loader.h b/pidgin/gtkblist-theme-loader.h
index a5a40621e3..049c1c6ceb 100644
--- a/pidgin/gtkblist-theme-loader.h
+++ b/pidgin/gtkblist-theme-loader.h
@@ -1,5 +1,5 @@
 /**
- * @file gtkblist-loader.h  Pidgin Buddy List Theme Loader Class API
+ * @file gtkblist-theme-loader.h  Pidgin Buddy List Theme Loader Class API
  */
 
 /* pidgin
diff --git a/pidgin/gtkblist-theme.c b/pidgin/gtkblist-theme.c
index 86ab512420..0eca73d027 100644
--- a/pidgin/gtkblist-theme.c
+++ b/pidgin/gtkblist-theme.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "gtkblist-theme.h"
 
 #define PIDGIN_BLIST_THEME_GET_PRIVATE(Gobject) \
@@ -37,27 +38,34 @@ typedef struct {
 
 	/* groups */
 	GdkColor *expanded_color;
-	FontColorPair *expanded;
+	PidginThemeFont *expanded;
 
 	GdkColor *collapsed_color;
-	FontColorPair *collapsed;
+	PidginThemeFont *collapsed;
 
 	/* buddy */
 	GdkColor *contact_color;
 
-	FontColorPair *contact;
+	PidginThemeFont *contact;
 
-	FontColorPair *online;
-	FontColorPair *away;
-	FontColorPair *offline;
-	FontColorPair *idle;
-	FontColorPair *message;
-	FontColorPair *message_nick_said;
+	PidginThemeFont *online;
+	PidginThemeFont *away;
+	PidginThemeFont *offline;
+	PidginThemeFont *idle;
+	PidginThemeFont *message;
+	PidginThemeFont *message_nick_said;
 
-	FontColorPair *status;
+	PidginThemeFont *status;
 
 } PidginBlistThemePrivate;
 
+struct _PidginThemeFont
+{
+	gchar *font;
+	gchar color[10];
+	GdkColor *gdkcolor;
+};
+
 /******************************************************************************
  * Globals
  *****************************************************************************/
@@ -92,18 +100,90 @@ enum {
  * Helpers
  *****************************************************************************/
 
+PidginThemeFont *
+pidgin_theme_font_new(const gchar *face, GdkColor *color)
+{
+	PidginThemeFont *font = g_new0(PidginThemeFont, 1);
+	font->font = g_strdup(face);
+	if (color)
+		pidgin_theme_font_set_color(font, color);
+	return font;
+}
+
 void
-free_font_and_color(FontColorPair *pair)
+pidgin_theme_font_free(PidginThemeFont *pair)
 {
 	if (pair != NULL) {
-		if (pair->font)
-			g_free(pair->font);
-		if (pair->color)
-			g_free(pair->color);
+		g_free(pair->font);
+		if (pair->gdkcolor)
+			gdk_color_free(pair->gdkcolor);
 		g_free(pair);
 	}
 }
 
+static PidginThemeFont *
+copy_font_and_color(const PidginThemeFont *pair)
+{
+	PidginThemeFont *copy;
+
+	if (pair == NULL)
+		return NULL;
+
+	copy = g_new0(PidginThemeFont, 1);
+	copy->font  = g_strdup(pair->font);
+	strncpy(copy->color, pair->color, sizeof(copy->color) - 1);
+	if (pair->gdkcolor)
+		copy->gdkcolor = gdk_color_copy(pair->gdkcolor);
+	return copy;
+}
+
+void
+pidgin_theme_font_set_font_face(PidginThemeFont *font, const gchar *face)
+{
+	g_return_if_fail(font);
+	g_return_if_fail(face);
+
+	g_free(font->font);
+	font->font = g_strdup(face);
+}
+
+void
+pidgin_theme_font_set_color(PidginThemeFont *font, const GdkColor *color)
+{
+	g_return_if_fail(font);
+
+	if (font->gdkcolor)
+		gdk_color_free(font->gdkcolor);
+
+	font->gdkcolor = color ? gdk_color_copy(color) : NULL;
+	if (color)
+		g_snprintf(font->color, sizeof(font->color),
+				"#%02x%02x%02x", color->red >> 8, color->green >> 8, color->blue >> 8);
+	else
+		font->color[0] = '\0';
+}
+
+const gchar *
+pidgin_theme_font_get_font_face(PidginThemeFont *font)
+{
+	g_return_val_if_fail(font, NULL);
+	return font->font;
+}
+
+const GdkColor *
+pidgin_theme_font_get_color(PidginThemeFont *font)
+{
+	g_return_val_if_fail(font, NULL);
+	return font->gdkcolor;
+}
+
+const gchar *
+pidgin_theme_font_get_color_describe(PidginThemeFont *font)
+{
+	g_return_val_if_fail(font, NULL);
+	return font->color[0] ? font->color : NULL;
+}
+
 /******************************************************************************
  * GObject Stuff
  *****************************************************************************/
@@ -123,7 +203,7 @@ pidgin_blist_theme_get_property(GObject *obj, guint param_id, GValue *value,
 
 	switch (param_id) {
 		case PROP_BACKGROUND_COLOR:
-			g_value_set_pointer(value, pidgin_blist_theme_get_background_color(theme));
+			g_value_set_boxed(value, pidgin_blist_theme_get_background_color(theme));
 			break;
 		case PROP_OPACITY:
 			g_value_set_double(value, pidgin_blist_theme_get_opacity(theme));
@@ -132,19 +212,19 @@ pidgin_blist_theme_get_property(GObject *obj, guint param_id, GValue *value,
 			g_value_set_pointer(value, pidgin_blist_theme_get_layout(theme));
 			break;
 		case PROP_EXPANDED_COLOR:
-			g_value_set_pointer(value, pidgin_blist_theme_get_expanded_background_color(theme));
+			g_value_set_boxed(value, pidgin_blist_theme_get_expanded_background_color(theme));
 			break;
 		case PROP_EXPANDED_TEXT:
 			g_value_set_pointer(value, pidgin_blist_theme_get_expanded_text_info(theme));
 			break;
 		case PROP_COLLAPSED_COLOR:
-			g_value_set_pointer(value, pidgin_blist_theme_get_collapsed_background_color(theme));
+			g_value_set_boxed(value, pidgin_blist_theme_get_collapsed_background_color(theme));
 			break;
 		case PROP_COLLAPSED_TEXT:
 			g_value_set_pointer(value, pidgin_blist_theme_get_collapsed_text_info(theme));
 			break;
 		case PROP_CONTACT_COLOR:
-			g_value_set_pointer(value, pidgin_blist_theme_get_contact_color(theme));
+			g_value_set_boxed(value, pidgin_blist_theme_get_contact_color(theme));
 			break;
 		case PROP_CONTACT:
 			g_value_set_pointer(value, pidgin_blist_theme_get_contact_text_info(theme));
@@ -184,7 +264,7 @@ pidgin_blist_theme_set_property(GObject *obj, guint param_id, const GValue *valu
 
 	switch (param_id) {
 		case PROP_BACKGROUND_COLOR:
-			pidgin_blist_theme_set_background_color(theme, g_value_get_pointer(value));
+			pidgin_blist_theme_set_background_color(theme, g_value_get_boxed(value));
 			break;
 		case PROP_OPACITY:
 			pidgin_blist_theme_set_opacity(theme, g_value_get_double(value));
@@ -193,19 +273,19 @@ pidgin_blist_theme_set_property(GObject *obj, guint param_id, const GValue *valu
 			pidgin_blist_theme_set_layout(theme, g_value_get_pointer(value));
 			break;
 		case PROP_EXPANDED_COLOR:
-			pidgin_blist_theme_set_expanded_background_color(theme, g_value_get_pointer(value));
+			pidgin_blist_theme_set_expanded_background_color(theme, g_value_get_boxed(value));
 			break;
 		case PROP_EXPANDED_TEXT:
 			pidgin_blist_theme_set_expanded_text_info(theme, g_value_get_pointer(value));
 			break;
 		case PROP_COLLAPSED_COLOR:
-			pidgin_blist_theme_set_collapsed_background_color(theme, g_value_get_pointer(value));
+			pidgin_blist_theme_set_collapsed_background_color(theme, g_value_get_boxed(value));
 			break;
 		case PROP_COLLAPSED_TEXT:
 			pidgin_blist_theme_set_collapsed_text_info(theme, g_value_get_pointer(value));
 			break;
 		case PROP_CONTACT_COLOR:
-			pidgin_blist_theme_set_contact_color(theme, g_value_get_pointer(value));
+			pidgin_blist_theme_set_contact_color(theme, g_value_get_boxed(value));
 			break;
 		case PROP_CONTACT:
 			pidgin_blist_theme_set_contact_text_info(theme, g_value_get_pointer(value));
@@ -245,20 +325,29 @@ pidgin_blist_theme_finalize(GObject *obj)
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(obj);
 
 	/* Buddy List */
+	if (priv->bgcolor)
+		gdk_color_free(priv->bgcolor);
 	g_free(priv->layout);
 
 	/* Group */
-	free_font_and_color(priv->expanded);
-	free_font_and_color(priv->collapsed);
+	if (priv->expanded_color)
+		gdk_color_free(priv->expanded_color);
+	pidgin_theme_font_free(priv->expanded);
+	if (priv->collapsed_color)
+		gdk_color_free(priv->collapsed_color);
+	pidgin_theme_font_free(priv->collapsed);
 
 	/* Buddy */
-	free_font_and_color(priv->contact);
-	free_font_and_color(priv->online);
-	free_font_and_color(priv->away);
-	free_font_and_color(priv->offline);
-	free_font_and_color(priv->message);
-	free_font_and_color(priv->message_nick_said);
-	free_font_and_color(priv->status);
+	if (priv->contact_color)
+		gdk_color_free(priv->contact_color);
+	pidgin_theme_font_free(priv->contact);
+	pidgin_theme_font_free(priv->online);
+	pidgin_theme_font_free(priv->away);
+	pidgin_theme_font_free(priv->offline);
+	pidgin_theme_font_free(priv->idle);
+	pidgin_theme_font_free(priv->message);
+	pidgin_theme_font_free(priv->message_nick_said);
+	pidgin_theme_font_free(priv->status);
 
 	g_free(priv);
 
@@ -278,81 +367,81 @@ pidgin_blist_theme_class_init(PidginBlistThemeClass *klass)
 	obj_class->finalize = pidgin_blist_theme_finalize;
 
 	/* Buddy List */
-	pspec = g_param_spec_pointer("background-color", "Background Color",
-			"The background color for the buddy list",
-			G_PARAM_READWRITE);
+	pspec = g_param_spec_boxed("background-color", _("Background Color"),
+			_("The background color for the buddy list"),
+			GDK_TYPE_COLOR, G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_BACKGROUND_COLOR, pspec);
 
-	pspec = g_param_spec_pointer("layout", "Layout",
-			"The layout of icons, name, and status of the blist",
+	pspec = g_param_spec_pointer("layout", _("Layout"),
+			_("The layout of icons, name, and status of the buddy list"),
 			G_PARAM_READWRITE);
 
 	g_object_class_install_property(obj_class, PROP_LAYOUT, pspec);
 
 	/* Group */
-	pspec = g_param_spec_pointer("expanded-color", "Expanded Background Color",
-			"The background color of an expanded group",
-			G_PARAM_READWRITE);
+	pspec = g_param_spec_boxed("expanded-color", _("Expanded Background Color"),
+			_("The background color of an expanded group"),
+			GDK_TYPE_COLOR, G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_EXPANDED_COLOR, pspec);
 
-	pspec = g_param_spec_pointer("expanded-text", "Expanded Text",
-			"The text information for when a group is expanded",
+	pspec = g_param_spec_pointer("expanded-text", _("Expanded Text"),
+			_("The text information for when a group is expanded"),
 			G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_EXPANDED_TEXT, pspec);
 
-	pspec = g_param_spec_pointer("collapsed-color", "Collapsed Background Color",
-			"The background color of a collapsed group",
-			G_PARAM_READWRITE);
+	pspec = g_param_spec_boxed("collapsed-color", _("Collapsed Background Color"),
+			_("The background color of a collapsed group"),
+			GDK_TYPE_COLOR, G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_COLLAPSED_COLOR, pspec);
 
-	pspec = g_param_spec_pointer("collapsed-text", "Collapsed Text",
-			"The text information for when a group is collapsed",
+	pspec = g_param_spec_pointer("collapsed-text", _("Collapsed Text"),
+			_("The text information for when a group is collapsed"),
 			G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_COLLAPSED_TEXT, pspec);
 
 	/* Buddy */
-	pspec = g_param_spec_pointer("contact-color", "Contact/Chat Background Color",
-			"The background color of a contact or chat",
-			G_PARAM_READWRITE);
+	pspec = g_param_spec_boxed("contact-color", _("Contact/Chat Background Color"),
+			_("The background color of a contact or chat"),
+			GDK_TYPE_COLOR, G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_CONTACT_COLOR, pspec);
 
-	pspec = g_param_spec_pointer("contact", "Contact Text",
-			"The text information for when a contact is expanded",
+	pspec = g_param_spec_pointer("contact", _("Contact Text"),
+			_("The text information for when a contact is expanded"),
 			G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_CONTACT, pspec);
 
-	pspec = g_param_spec_pointer("online", "On-line Text",
-			"The text information for when a buddy is online",
+	pspec = g_param_spec_pointer("online", _("On-line Text"),
+			_("The text information for when a buddy is online"),
 			G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_ONLINE, pspec);
 
-	pspec = g_param_spec_pointer("away", "Away Text",
-			"The text information for when a buddy is away",
+	pspec = g_param_spec_pointer("away", _("Away Text"),
+			_("The text information for when a buddy is away"),
 			G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_AWAY, pspec);
 
-	pspec = g_param_spec_pointer("offline", "Off-line Text",
-			"The text information for when a buddy is off-line",
+	pspec = g_param_spec_pointer("offline", _("Off-line Text"),
+			_("The text information for when a buddy is off-line"),
 			G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_OFFLINE, pspec);
 
-	pspec = g_param_spec_pointer("idle", "Idle Text",
-			"The text information for when a buddy is idle",
+	pspec = g_param_spec_pointer("idle", _("Idle Text"),
+			_("The text information for when a buddy is idle"),
 			G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_IDLE, pspec);
 
-	pspec = g_param_spec_pointer("message", "Message Text",
-			"The text information for when a buddy has an unread message",
+	pspec = g_param_spec_pointer("message", _("Message Text"),
+			_("The text information for when a buddy has an unread message"),
 			G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_MESSAGE, pspec);
 
-	pspec = g_param_spec_pointer("message_nick_said", "Message (Nick Said) Text",
-			"The text information for when a chat has an unread message that mentions your nick",
+	pspec = g_param_spec_pointer("message_nick_said", _("Message (Nick Said) Text"),
+			_("The text information for when a chat has an unread message that mentions your nick"),
 			G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_MESSAGE_NICK_SAID, pspec);
 
-	pspec = g_param_spec_pointer("status", "Status Text",
-			"The text information for a buddy's status",
+	pspec = g_param_spec_pointer("status", _("Status Text"),
+			_("The text information for a buddy's status"),
 			G_PARAM_READWRITE);
 	g_object_class_install_property(obj_class, PROP_STATUS, pspec);
 }
@@ -435,7 +524,7 @@ pidgin_blist_theme_get_expanded_background_color(PidginBlistTheme *theme)
 	return priv->expanded_color;
 }
 
-FontColorPair *
+PidginThemeFont *
 pidgin_blist_theme_get_expanded_text_info(PidginBlistTheme *theme)
 {
 	PidginBlistThemePrivate *priv;
@@ -459,7 +548,7 @@ pidgin_blist_theme_get_collapsed_background_color(PidginBlistTheme *theme)
 	return priv->collapsed_color;
 }
 
-FontColorPair *
+PidginThemeFont *
 pidgin_blist_theme_get_collapsed_text_info(PidginBlistTheme *theme)
 {
 	PidginBlistThemePrivate *priv;
@@ -483,7 +572,7 @@ pidgin_blist_theme_get_contact_color(PidginBlistTheme *theme)
 	return priv->contact_color;
 }
 
-FontColorPair *
+PidginThemeFont *
 pidgin_blist_theme_get_contact_text_info(PidginBlistTheme *theme)
 {
 	PidginBlistThemePrivate *priv;
@@ -495,7 +584,7 @@ pidgin_blist_theme_get_contact_text_info(PidginBlistTheme *theme)
 	return priv->contact;
 }
 
-FontColorPair *
+PidginThemeFont *
 pidgin_blist_theme_get_online_text_info(PidginBlistTheme *theme)
 {
 	PidginBlistThemePrivate *priv;
@@ -507,7 +596,7 @@ pidgin_blist_theme_get_online_text_info(PidginBlistTheme *theme)
 	return priv->online;
 }
 
-FontColorPair *
+PidginThemeFont *
 pidgin_blist_theme_get_away_text_info(PidginBlistTheme *theme)
 {
 	PidginBlistThemePrivate *priv;
@@ -519,7 +608,7 @@ pidgin_blist_theme_get_away_text_info(PidginBlistTheme *theme)
 	return priv->away;
 }
 
-FontColorPair *
+PidginThemeFont *
 pidgin_blist_theme_get_offline_text_info(PidginBlistTheme *theme)
 {
 	PidginBlistThemePrivate *priv;
@@ -531,7 +620,7 @@ pidgin_blist_theme_get_offline_text_info(PidginBlistTheme *theme)
 	return priv->offline;
 }
 
-FontColorPair *
+PidginThemeFont *
 pidgin_blist_theme_get_idle_text_info(PidginBlistTheme *theme)
 {
 	PidginBlistThemePrivate *priv;
@@ -543,7 +632,7 @@ pidgin_blist_theme_get_idle_text_info(PidginBlistTheme *theme)
 	return priv->idle;
 }
 
-FontColorPair *
+PidginThemeFont *
 pidgin_blist_theme_get_unread_message_text_info(PidginBlistTheme *theme)
 {
 	PidginBlistThemePrivate *priv;
@@ -555,7 +644,7 @@ pidgin_blist_theme_get_unread_message_text_info(PidginBlistTheme *theme)
 	return priv->message;
 }
 
-FontColorPair *
+PidginThemeFont *
 pidgin_blist_theme_get_unread_message_nick_said_text_info(PidginBlistTheme *theme)
 {
 	PidginBlistThemePrivate *priv;
@@ -567,7 +656,7 @@ pidgin_blist_theme_get_unread_message_nick_said_text_info(PidginBlistTheme *them
 	return priv->message_nick_said;
 }
 
-FontColorPair *
+PidginThemeFont *
 pidgin_blist_theme_get_status_text_info(PidginBlistTheme *theme)
 {
 	PidginBlistThemePrivate *priv;
@@ -581,7 +670,7 @@ pidgin_blist_theme_get_status_text_info(PidginBlistTheme *theme)
 
 /* Set Methods */
 void
-pidgin_blist_theme_set_background_color(PidginBlistTheme *theme, GdkColor *color)
+pidgin_blist_theme_set_background_color(PidginBlistTheme *theme, const GdkColor *color)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -589,7 +678,9 @@ pidgin_blist_theme_set_background_color(PidginBlistTheme *theme, GdkColor *color
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	priv->bgcolor = color;
+	if (priv->bgcolor)
+		gdk_color_free(priv->bgcolor);
+	priv->bgcolor = gdk_color_copy(color);
 }
 
 void
@@ -605,7 +696,7 @@ pidgin_blist_theme_set_opacity(PidginBlistTheme *theme, gdouble opacity)
 }
 
 void
-pidgin_blist_theme_set_layout(PidginBlistTheme *theme, PidginBlistLayout *layout)
+pidgin_blist_theme_set_layout(PidginBlistTheme *theme, const PidginBlistLayout *layout)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -614,11 +705,11 @@ pidgin_blist_theme_set_layout(PidginBlistTheme *theme, PidginBlistLayout *layout
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
 	g_free(priv->layout);
-	priv->layout = layout;
+	priv->layout = g_memdup(layout, sizeof(PidginBlistLayout));
 }
 
 void
-pidgin_blist_theme_set_expanded_background_color(PidginBlistTheme *theme, GdkColor *color)
+pidgin_blist_theme_set_expanded_background_color(PidginBlistTheme *theme, const GdkColor *color)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -626,11 +717,13 @@ pidgin_blist_theme_set_expanded_background_color(PidginBlistTheme *theme, GdkCol
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	priv->expanded_color = color;
+	if (priv->expanded_color)
+		gdk_color_free(priv->expanded_color);
+	priv->expanded_color = gdk_color_copy(color);
 }
 
 void
-pidgin_blist_theme_set_expanded_text_info(PidginBlistTheme *theme, FontColorPair *pair)
+pidgin_blist_theme_set_expanded_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -638,12 +731,12 @@ pidgin_blist_theme_set_expanded_text_info(PidginBlistTheme *theme, FontColorPair
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	free_font_and_color(priv->expanded);
-	priv->expanded = pair;
+	pidgin_theme_font_free(priv->expanded);
+	priv->expanded = copy_font_and_color(pair);
 }
 
 void
-pidgin_blist_theme_set_collapsed_background_color(PidginBlistTheme *theme, GdkColor *color)
+pidgin_blist_theme_set_collapsed_background_color(PidginBlistTheme *theme, const GdkColor *color)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -651,11 +744,13 @@ pidgin_blist_theme_set_collapsed_background_color(PidginBlistTheme *theme, GdkCo
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	priv->collapsed_color = color;
+	if (priv->collapsed_color)
+		gdk_color_free(priv->collapsed_color);
+	priv->collapsed_color = gdk_color_copy(color);
 }
 
 void
-pidgin_blist_theme_set_collapsed_text_info(PidginBlistTheme *theme, FontColorPair *pair)
+pidgin_blist_theme_set_collapsed_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -663,12 +758,12 @@ pidgin_blist_theme_set_collapsed_text_info(PidginBlistTheme *theme, FontColorPai
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	free_font_and_color(priv->collapsed);
-	priv->collapsed = pair;
+	pidgin_theme_font_free(priv->collapsed);
+	priv->collapsed = copy_font_and_color(pair);
 }
 
 void
-pidgin_blist_theme_set_contact_color(PidginBlistTheme *theme, GdkColor *color)
+pidgin_blist_theme_set_contact_color(PidginBlistTheme *theme, const GdkColor *color)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -676,11 +771,13 @@ pidgin_blist_theme_set_contact_color(PidginBlistTheme *theme, GdkColor *color)
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	priv->contact_color = color;
+	if (priv->contact_color)
+		gdk_color_free(priv->contact_color);
+	priv->contact_color = gdk_color_copy(color);
 }
 
 void
-pidgin_blist_theme_set_contact_text_info(PidginBlistTheme *theme, FontColorPair *pair)
+pidgin_blist_theme_set_contact_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -688,12 +785,12 @@ pidgin_blist_theme_set_contact_text_info(PidginBlistTheme *theme, FontColorPair
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	free_font_and_color(priv->contact);
-	priv->contact = pair;
+	pidgin_theme_font_free(priv->contact);
+	priv->contact = copy_font_and_color(pair);
 }
 
 void
-pidgin_blist_theme_set_online_text_info(PidginBlistTheme *theme, FontColorPair *pair)
+pidgin_blist_theme_set_online_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -701,12 +798,12 @@ pidgin_blist_theme_set_online_text_info(PidginBlistTheme *theme, FontColorPair *
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	free_font_and_color(priv->online);
-	priv->online = pair;
+	pidgin_theme_font_free(priv->online);
+	priv->online = copy_font_and_color(pair);
 }
 
 void
-pidgin_blist_theme_set_away_text_info(PidginBlistTheme *theme, FontColorPair *pair)
+pidgin_blist_theme_set_away_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -714,12 +811,12 @@ pidgin_blist_theme_set_away_text_info(PidginBlistTheme *theme, FontColorPair *pa
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	free_font_and_color(priv->away);
-	priv->away = pair;
+	pidgin_theme_font_free(priv->away);
+	priv->away = copy_font_and_color(pair);
 }
 
 void
-pidgin_blist_theme_set_offline_text_info(PidginBlistTheme *theme, FontColorPair *pair)
+pidgin_blist_theme_set_offline_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -727,12 +824,12 @@ pidgin_blist_theme_set_offline_text_info(PidginBlistTheme *theme, FontColorPair
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	free_font_and_color(priv->offline);
-	priv->offline = pair;
+	pidgin_theme_font_free(priv->offline);
+	priv->offline = copy_font_and_color(pair);
 }
 
 void
-pidgin_blist_theme_set_idle_text_info(PidginBlistTheme *theme, FontColorPair *pair)
+pidgin_blist_theme_set_idle_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -740,12 +837,12 @@ pidgin_blist_theme_set_idle_text_info(PidginBlistTheme *theme, FontColorPair *pa
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	free_font_and_color(priv->idle);
-	priv->idle = pair;
+	pidgin_theme_font_free(priv->idle);
+	priv->idle = copy_font_and_color(pair);
 }
 
 void
-pidgin_blist_theme_set_unread_message_text_info(PidginBlistTheme *theme, FontColorPair *pair)
+pidgin_blist_theme_set_unread_message_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -753,12 +850,12 @@ pidgin_blist_theme_set_unread_message_text_info(PidginBlistTheme *theme, FontCol
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	free_font_and_color(priv->message);
-	priv->message = pair;
+	pidgin_theme_font_free(priv->message);
+	priv->message = copy_font_and_color(pair);
 }
 
 void
-pidgin_blist_theme_set_unread_message_nick_said_text_info(PidginBlistTheme *theme, FontColorPair *pair)
+pidgin_blist_theme_set_unread_message_nick_said_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -766,12 +863,12 @@ pidgin_blist_theme_set_unread_message_nick_said_text_info(PidginBlistTheme *them
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	free_font_and_color(priv->message_nick_said);
-	priv->message_nick_said = pair;
+	pidgin_theme_font_free(priv->message_nick_said);
+	priv->message_nick_said = copy_font_and_color(pair);
 }
 
 void
-pidgin_blist_theme_set_status_text_info(PidginBlistTheme *theme, FontColorPair *pair)
+pidgin_blist_theme_set_status_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair)
 {
 	PidginBlistThemePrivate *priv;
 
@@ -779,6 +876,6 @@ pidgin_blist_theme_set_status_text_info(PidginBlistTheme *theme, FontColorPair *
 
 	priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
 
-	free_font_and_color(priv->status);
-	priv->status = pair;
+	pidgin_theme_font_free(priv->status);
+	priv->status = copy_font_and_color(pair);
 }
diff --git a/pidgin/gtkblist-theme.h b/pidgin/gtkblist-theme.h
index bcfb4649b4..2c4fb07fb0 100644
--- a/pidgin/gtkblist-theme.h
+++ b/pidgin/gtkblist-theme.h
@@ -59,12 +59,15 @@ struct _PidginBlistThemeClass
 	PurpleThemeClass parent_class;
 };
 
+#if 0
 typedef struct
 {
-	gchar *font;
-	gchar *color;
+	const gchar *font;
+	const gchar *color;
 
-} FontColorPair;
+} PidginThemeFont;
+#endif
+typedef struct _PidginThemeFont PidginThemeFont;
 
 typedef struct
 {
@@ -78,13 +81,68 @@ typedef struct
 } PidginBlistLayout;
 
 /**************************************************************************/
-/** @name FontColorPair API                                               */
+/** @name PidginThemeFont API                                               */
 /**************************************************************************/
 
 /**
+ * Create a new PidginThemeFont.
+ *
+ * @param face  The font face
+ * @param color The color of the font
+ *
+ * @return A newly created PidginThemeFont
+ */
+PidginThemeFont * pidgin_theme_font_new(const gchar *face, GdkColor *color);
+
+/**
  * Frees a font and color pair
+ *
+ * @param font The theme font
  */
-void free_font_and_color(FontColorPair *pair);
+void pidgin_theme_font_free(PidginThemeFont *font);
+
+/**
+ * Set the font-face of a PidginThemeFont.
+ *
+ * @param font  The PidginThemeFont
+ * @param face  The font-face
+ */
+void pidgin_theme_font_set_font_face(PidginThemeFont *font, const gchar *face);
+
+/**
+ * Set the color of a PidginThemeFont.
+ *
+ * @param font  The PidginThemeFont
+ * @param color The color
+ */
+void pidgin_theme_font_set_color(PidginThemeFont *font, const GdkColor *color);
+
+/**
+ * Get the font-face of a PidginThemeFont.
+ *
+ * @param font  The PidginThemeFont
+ *
+ * @return The font-face, or NULL if none is set.
+ */
+const gchar * pidgin_theme_font_get_font_face(PidginThemeFont *font);
+
+/**
+ * Get the color of a PidginThemeFont as a GdkColor object.
+ *
+ * @param font  The PidginThemeFont
+ *
+ * @return The color, or NULL if none is set.
+ */
+const GdkColor * pidgin_theme_font_get_color(PidginThemeFont *font);
+
+/**
+ * Get the color of a PidginThemeFont.
+ *
+ * @param font  The PidginThemeFont
+ *
+ * @return The color, or NULL if none is set.
+ */
+const gchar * pidgin_theme_font_get_color_describe(PidginThemeFont *font);
 
 /**************************************************************************/
 /** @name Purple Buddy List Theme API                                     */
@@ -102,6 +160,8 @@ GType pidgin_blist_theme_get_type(void);
 /**
  * Returns the background color of the buddy list.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A gdk color.
  */
  GdkColor *pidgin_blist_theme_get_background_color(PidginBlistTheme *theme);
@@ -110,6 +170,8 @@ GType pidgin_blist_theme_get_type(void);
  * Returns the opacity of the buddy list window
  * (0.0 or clear to 1.0 fully opaque).
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns The opacity
  */
 gdouble pidgin_blist_theme_get_opacity(PidginBlistTheme *theme);
@@ -117,6 +179,8 @@ gdouble pidgin_blist_theme_get_opacity(PidginBlistTheme *theme);
 /**
  * Returns the layout to be used with the buddy list.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns The buddy list layout.
  */
  PidginBlistLayout *pidgin_blist_theme_get_layout(PidginBlistTheme *theme);
@@ -124,6 +188,8 @@ gdouble pidgin_blist_theme_get_opacity(PidginBlistTheme *theme);
 /**
  * Returns the background color to be used with expanded groups.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A gdk color.
  */
  GdkColor *pidgin_blist_theme_get_expanded_background_color(PidginBlistTheme *theme);
@@ -131,13 +197,17 @@ gdouble pidgin_blist_theme_get_opacity(PidginBlistTheme *theme);
 /**
  * Returns the text font and color to be used with expanded groups.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A font and color pair.
  */
- FontColorPair *pidgin_blist_theme_get_expanded_text_info(PidginBlistTheme *theme);
+ PidginThemeFont *pidgin_blist_theme_get_expanded_text_info(PidginBlistTheme *theme);
 
 /**
  * Returns the background color to be used with collapsed groups.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A gdk color.
  */
  GdkColor *pidgin_blist_theme_get_collapsed_background_color(PidginBlistTheme *theme);
@@ -145,13 +215,17 @@ gdouble pidgin_blist_theme_get_opacity(PidginBlistTheme *theme);
 /**
  * Returns the text font and color to be used with collapsed groups.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A font and color pair.
  */
- FontColorPair *pidgin_blist_theme_get_collapsed_text_info(PidginBlistTheme *theme);
+ PidginThemeFont *pidgin_blist_theme_get_collapsed_text_info(PidginBlistTheme *theme);
 
 /**
  * Returns the colors to be used for contacts and chats.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A gdkcolor for contacts and chats.
  */
  GdkColor *pidgin_blist_theme_get_contact_color(PidginBlistTheme *theme);
@@ -159,72 +233,90 @@ gdouble pidgin_blist_theme_get_opacity(PidginBlistTheme *theme);
 /**
  * Returns the text font and color to be used for expanded contacts.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A font and color pair.
  */
- FontColorPair *pidgin_blist_theme_get_contact_text_info(PidginBlistTheme *theme);
+ PidginThemeFont *pidgin_blist_theme_get_contact_text_info(PidginBlistTheme *theme);
 
 /**
  * Returns the text font and color to be used for online buddies.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A font and color pair.
  */
- FontColorPair *pidgin_blist_theme_get_online_text_info(PidginBlistTheme *theme);
+ PidginThemeFont *pidgin_blist_theme_get_online_text_info(PidginBlistTheme *theme);
 
 /**
  * Returns the text font and color to be used for away and idle buddies.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A font and color pair.
  */
- FontColorPair *pidgin_blist_theme_get_away_text_info(PidginBlistTheme *theme);
+ PidginThemeFont *pidgin_blist_theme_get_away_text_info(PidginBlistTheme *theme);
 
 /**
  * Returns the text font and color to be used for offline buddies.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A font and color pair.
  */
- FontColorPair *pidgin_blist_theme_get_offline_text_info(PidginBlistTheme *theme);
+ PidginThemeFont *pidgin_blist_theme_get_offline_text_info(PidginBlistTheme *theme);
 
 /**
  * Returns the text font and color to be used for idle buddies.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A font and color pair.
  */
- FontColorPair *pidgin_blist_theme_get_idle_text_info(PidginBlistTheme *theme);
+ PidginThemeFont *pidgin_blist_theme_get_idle_text_info(PidginBlistTheme *theme);
 
 /**
  * Returns the text font and color to be used for buddies with unread messages.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A font and color pair.
  */
- FontColorPair *pidgin_blist_theme_get_unread_message_text_info(PidginBlistTheme *theme);
+ PidginThemeFont *pidgin_blist_theme_get_unread_message_text_info(PidginBlistTheme *theme);
 
 /**
  * Returns the text font and color to be used for chats with unread messages
  * that mention your nick.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A font and color pair.
  */
- FontColorPair *pidgin_blist_theme_get_unread_message_nick_said_text_info(PidginBlistTheme *theme);
+ PidginThemeFont *pidgin_blist_theme_get_unread_message_nick_said_text_info(PidginBlistTheme *theme);
 
 /**
  * Returns the text font and color to be used for a buddy's status message.
  *
+ * @param theme  The PidginBlist theme.
+ *
  * @returns A font and color pair.
  */
- FontColorPair *pidgin_blist_theme_get_status_text_info(PidginBlistTheme *theme);
+ PidginThemeFont *pidgin_blist_theme_get_status_text_info(PidginBlistTheme *theme);
 
 /* Set Methods */
 
 /**
  * Sets the background color to be used for this buddy list theme.
  *
+ * @param theme  The PidginBlist theme.
  * @param color The new background color.
  */
-void pidgin_blist_theme_set_background_color(PidginBlistTheme *theme, GdkColor *color);
+void pidgin_blist_theme_set_background_color(PidginBlistTheme *theme, const GdkColor *color);
 
 /**
  * Sets the opacity to be used for this buddy list theme.
  *
+ * @param theme  The PidginBlist theme.
  * @param opacity The new opacity setting.
  */
 void pidgin_blist_theme_set_opacity(PidginBlistTheme *theme, gdouble opacity);
@@ -232,101 +324,115 @@ void pidgin_blist_theme_set_opacity(PidginBlistTheme *theme, gdouble opacity);
 /**
  * Sets the buddy list layout to be used for this buddy list theme.
  *
+ * @param theme  The PidginBlist theme.
  * @param layout The new layout.
  */
-void pidgin_blist_theme_set_layout(PidginBlistTheme *theme, PidginBlistLayout *layout);
+void pidgin_blist_theme_set_layout(PidginBlistTheme *theme, const PidginBlistLayout *layout);
 
 /**
  * Sets the background color to be used for expanded groups.
  *
+ * @param theme  The PidginBlist theme.
  * @param color The new background color.
  */
-void pidgin_blist_theme_set_expanded_background_color(PidginBlistTheme *theme, GdkColor *color);
+void pidgin_blist_theme_set_expanded_background_color(PidginBlistTheme *theme, const GdkColor *color);
 
 /**
  * Sets the text color and font to be used for expanded groups.
  *
- * @param pair The new text font at color pair.
+ * @param theme  The PidginBlist theme.
+ * @param pair The new text font and color pair.
  */
-void pidgin_blist_theme_set_expanded_text_info(PidginBlistTheme *theme, FontColorPair *pair);
+void pidgin_blist_theme_set_expanded_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 /**
  * Sets the background color to be used for collapsed groups.
  *
+ * @param theme  The PidginBlist theme.
  * @param color The new background color.
  */
-void pidgin_blist_theme_set_collapsed_background_color(PidginBlistTheme *theme, GdkColor *color);
+void pidgin_blist_theme_set_collapsed_background_color(PidginBlistTheme *theme, const GdkColor *color);
 
 /**
  * Sets the text color and font to be used for expanded groups.
  *
- * @param pair The new text font at color pair.
+ * @param theme  The PidginBlist theme.
+ * @param pair The new text font and color pair.
  */
-void pidgin_blist_theme_set_collapsed_text_info(PidginBlistTheme *theme, FontColorPair *pair);
+void pidgin_blist_theme_set_collapsed_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 /**
  * Sets the background color to be used for contacts and chats.
  *
+ * @param theme  The PidginBlist theme.
  * @param color The color to use for contacts and chats.
  */
-void pidgin_blist_theme_set_contact_color(PidginBlistTheme *theme, GdkColor *color);
+void pidgin_blist_theme_set_contact_color(PidginBlistTheme *theme, const GdkColor *color);
 
 /**
  * Sets the text color and font to be used for expanded contacts.
  *
- * @param pair The new text font at color pair.
+ * @param theme  The PidginBlist theme.
+ * @param pair The new text font and color pair.
  */
-void pidgin_blist_theme_set_contact_text_info(PidginBlistTheme *theme, FontColorPair *pair);
+void pidgin_blist_theme_set_contact_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 /**
  * Sets the text color and font to be used for online buddies.
  *
- * @param pair The new text font at color pair.
+ * @param theme  The PidginBlist theme.
+ * @param pair The new text font and color pair.
  */
-void pidgin_blist_theme_set_online_text_info(PidginBlistTheme *theme, FontColorPair *pair);
+void pidgin_blist_theme_set_online_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 /**
  * Sets the text color and font to be used for away and idle buddies.
  *
- * @param pair The new text font at color pair.
+ * @param theme  The PidginBlist theme.
+ * @param pair The new text font and color pair.
  */
-void pidgin_blist_theme_set_away_text_info(PidginBlistTheme *theme, FontColorPair *pair);
+void pidgin_blist_theme_set_away_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 /**
  * Sets the text color and font to be used for offline buddies.
  *
- * @param pair The new text font at color pair.
+ * @param theme  The PidginBlist theme.
+ * @param pair The new text font and color pair.
  */
-void pidgin_blist_theme_set_offline_text_info(PidginBlistTheme *theme, FontColorPair *pair);
+void pidgin_blist_theme_set_offline_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 /**
  * Sets the text color and font to be used for idle buddies.
  *
- * @param pair The new text font at color pair.
+ * @param theme  The PidginBlist theme.
+ * @param pair The new text font and color pair.
  */
-void pidgin_blist_theme_set_idle_text_info(PidginBlistTheme *theme, FontColorPair *pair);
+void pidgin_blist_theme_set_idle_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 /**
  * Sets the text color and font to be used for buddies with unread messages.
  *
- * @param pair The new text font at color pair.
+ * @param theme  The PidginBlist theme.
+ * @param pair The new text font and color pair.
  */
-void pidgin_blist_theme_set_unread_message_text_info(PidginBlistTheme *theme, FontColorPair *pair);
+void pidgin_blist_theme_set_unread_message_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 /**
  * Sets the text color and font to be used for a chat with unread messages
  * that mention your nick.
  *
- * @param pair The new text font at color pair.
+ * @param theme  The PidginBlist theme.
+ * @param pair The new text font and color pair.
  */
-void pidgin_blist_theme_set_unread_message_nick_said_text_info(PidginBlistTheme *theme, FontColorPair *pair);
+void pidgin_blist_theme_set_unread_message_nick_said_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 /**
  * Sets the text color and font to be used for buddy status messages.
  *
- * @param pair The new text font at color pair.
+ * @param theme  The PidginBlist theme.
+ * @param pair The new text font and color pair.
  */
-void pidgin_blist_theme_set_status_text_info(PidginBlistTheme *theme, FontColorPair *pair);
+void pidgin_blist_theme_set_status_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 G_END_DECLS
 #endif /* PIDGIN_BLIST_THEME_H */
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index 2e169acb3a..84f76f0d6a 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -75,47 +75,40 @@
 typedef struct
 {
 	PurpleAccount *account;
-
 	GtkWidget *window;
+	GtkBox *vbox;
+	GtkWidget *account_menu;
+	GtkSizeGroup *sg;
+} PidginBlistRequestData;
+
+typedef struct
+{
+	PidginBlistRequestData rq_data;
 	GtkWidget *combo;
 	GtkWidget *entry;
 	GtkWidget *entry_for_alias;
-	GtkWidget *account_box;
 
 } PidginAddBuddyData;
 
 typedef struct
 {
-	PurpleAccount *account;
+	PidginBlistRequestData rq_data;
 	gchar *default_chat_name;
+	GList *entries;
+} PidginChatData;
+
+typedef struct
+{
+	PidginChatData chat_data;
 
-	GtkWidget *window;
-	GtkWidget *account_menu;
 	GtkWidget *alias_entry;
 	GtkWidget *group_combo;
-	GtkWidget *entries_box;
-	GtkSizeGroup *sg;
 	GtkWidget *autojoin;
 	GtkWidget *persistent;
-
-	GList *entries;
-
 } PidginAddChatData;
 
 typedef struct
 {
-	PurpleAccount *account;
-
-	GtkWidget *window;
-	GtkWidget *account_menu;
-	GtkWidget *entries_box;
-	GtkSizeGroup *sg;
-
-	GList *entries;
-} PidginJoinChatData;
-
-typedef struct
-{
 	/** Used to hold error minidialogs.  Gets packed
 	 *  inside PidginBuddyList.error_buttons
 	 */
@@ -338,6 +331,30 @@ static void gtk_blist_menu_im_cb(GtkWidget *w, PurpleBuddy *b)
 	                            purple_buddy_get_name(b));
 }
 
+#ifdef USE_VV
+static void gtk_blist_menu_audio_call_cb(GtkWidget *w, PurpleBuddy *b)
+{
+	purple_prpl_initiate_media(purple_buddy_get_account(b),
+		purple_buddy_get_name(b), PURPLE_MEDIA_AUDIO);
+}
+
+static void gtk_blist_menu_video_call_cb(GtkWidget *w, PurpleBuddy *b)
+{
+	/* if the buddy supports both audio and video, start a combined call,
+	 otherwise start a pure video session */
+	if (purple_prpl_get_media_caps(purple_buddy_get_account(b),
+			purple_buddy_get_name(b)) &
+			PURPLE_MEDIA_CAPS_AUDIO_VIDEO) {
+		purple_prpl_initiate_media(purple_buddy_get_account(b),
+			purple_buddy_get_name(b), PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO);
+	} else {
+		purple_prpl_initiate_media(purple_buddy_get_account(b),
+			purple_buddy_get_name(b), PURPLE_MEDIA_VIDEO);
+	}
+}
+
+#endif
+
 static void gtk_blist_menu_send_file_cb(GtkWidget *w, PurpleBuddy *b)
 {
 	PurpleAccount *account = purple_buddy_get_account(b);
@@ -605,7 +622,14 @@ static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *a
 				struct _pidgin_blist_node *gtknode =
 					(struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node);
 
-				if (purple_contact_get_alias(contact) || gtknode->contact_expanded) {
+				/*
+				 * XXX Using purple_contact_get_alias here breaks because we
+				 * specifically want to check the contact alias only (i.e. not
+				 * the priority buddy, which purple_contact_get_alias does).
+				 * Adding yet another get_alias is evil, so figure this out
+				 * later :-P
+				 */
+				if (contact->alias || gtknode->contact_expanded) {
 					purple_blist_alias_contact(contact, arg2);
 					gtk_blist_auto_personize(purple_blist_node_get_parent(node), arg2);
 				} else {
@@ -844,7 +868,7 @@ static void gtk_blist_show_onlinehelp_cb(void)
 }
 
 static void
-do_join_chat(PidginJoinChatData *data)
+do_join_chat(PidginChatData *data)
 {
 	if (data)
 	{
@@ -870,14 +894,14 @@ do_join_chat(PidginJoinChatData *data)
 			}
 		}
 
-		chat = purple_chat_new(data->account, NULL, components);
+		chat = purple_chat_new(data->rq_data.account, NULL, components);
 		gtk_blist_join_chat(chat);
 		purple_blist_remove_chat(chat);
 	}
 }
 
 static void
-do_joinchat(GtkWidget *dialog, int id, PidginJoinChatData *info)
+do_joinchat(GtkWidget *dialog, int id, PidginChatData *info)
 {
 	switch(id)
 	{
@@ -886,7 +910,7 @@ do_joinchat(GtkWidget *dialog, int id, PidginJoinChatData *info)
 			break;
 
 		case 1:
-			pidgin_roomlist_dialog_show_with_account(info->account);
+			pidgin_roomlist_dialog_show_with_account(info->rq_data.account);
 			return;
 
 		break;
@@ -902,11 +926,11 @@ do_joinchat(GtkWidget *dialog, int id, PidginJoinChatData *info)
  * strings are empty then don't allow the user to click on "OK."
  */
 static void
-joinchat_set_sensitive_if_input_cb(GtkWidget *entry, gpointer user_data)
+set_sensitive_if_input_cb(GtkWidget *entry, gpointer user_data)
 {
 	PurplePluginProtocolInfo *prpl_info;
 	PurpleConnection *gc;
-	PidginJoinChatData *data;
+	PidginChatData *data;
 	GList *tmp;
 	const char *text;
 	gboolean required;
@@ -925,13 +949,13 @@ joinchat_set_sensitive_if_input_cb(GtkWidget *entry, gpointer user_data)
 		}
 	}
 
-	gtk_dialog_set_response_sensitive(GTK_DIALOG(data->window), GTK_RESPONSE_OK, sensitive);
+	gtk_dialog_set_response_sensitive(GTK_DIALOG(data->rq_data.window), GTK_RESPONSE_OK, sensitive);
 
-	gc = purple_account_get_connection(data->account);
+	gc = purple_account_get_connection(data->rq_data.account);
 	prpl_info = (gc != NULL) ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL;
 	sensitive = (prpl_info != NULL && prpl_info->roomlist_get_list != NULL);
 
-	gtk_dialog_set_response_sensitive(GTK_DIALOG(data->window), 1, sensitive);
+	gtk_dialog_set_response_sensitive(GTK_DIALOG(data->rq_data.window), 1, sensitive);
 }
 
 static void
@@ -943,8 +967,100 @@ pidgin_blist_update_privacy_cb(PurpleBuddy *buddy)
 	pidgin_blist_update_buddy(purple_get_blist(), PURPLE_BLIST_NODE(buddy), TRUE);
 }
 
+static gboolean
+chat_account_filter_func(PurpleAccount *account)
+{
+	PurpleConnection *gc = purple_account_get_connection(account);
+	PurplePluginProtocolInfo *prpl_info = NULL;
+
+	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
+
+	return (prpl_info->chat_info != NULL);
+}
+
+gboolean
+pidgin_blist_joinchat_is_showable()
+{
+	GList *c;
+	PurpleConnection *gc;
+
+	for (c = purple_connections_get_all(); c != NULL; c = c->next) {
+		gc = c->data;
+
+		if (chat_account_filter_func(purple_connection_get_account(gc)))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+static GtkWidget *
+make_blist_request_dialog(PidginBlistRequestData *data, PurpleAccount *account,
+	const char *title, const char *window_role, const char *label_text, 
+	GCallback callback_func, PurpleFilterAccountFunc filter_func,
+	GCallback response_cb)
+{
+	GtkWidget *label;
+	GtkWidget *img;
+	GtkWidget *hbox;
+	GtkWidget *vbox;
+	GtkWindow *blist_window;
+	PidginBuddyList *gtkblist;
+
+	data->account = account;
+
+	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
+		gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
+
+	gtkblist = PIDGIN_BLIST(purple_get_blist());
+	blist_window = gtkblist ? GTK_WINDOW(gtkblist->window) : NULL;
+
+	data->window = gtk_dialog_new_with_buttons(title,
+		blist_window, GTK_DIALOG_NO_SEPARATOR,
+		NULL);
+
+	gtk_window_set_transient_for(GTK_WINDOW(data->window), blist_window);
+	gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
+	gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE);
+	gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
+	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BORDER);
+	gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BOX_SPACE);
+	gtk_window_set_role(GTK_WINDOW(data->window), window_role);
+
+	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
+	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
+	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
+	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_container_add(GTK_CONTAINER(hbox), vbox);
+
+	label = gtk_label_new(label_text);
+
+	gtk_widget_set_size_request(label, 400, -1);
+	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+
+	data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
+	data->account_menu = pidgin_account_option_menu_new(account, FALSE,
+			callback_func, filter_func, data);
+	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("A_ccount"), data->sg, data->account_menu, TRUE, NULL);
+
+	data->vbox = GTK_BOX(gtk_vbox_new(FALSE, 5));
+	gtk_container_set_border_width(GTK_CONTAINER(data->vbox), 0);
+	gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(data->vbox), FALSE, FALSE, 0);
+
+	g_signal_connect(G_OBJECT(data->window), "response", response_cb, data);
+
+	g_object_unref(data->sg);
+
+	return vbox;
+}
+
 static void
-rebuild_joinchat_entries(PidginJoinChatData *data)
+rebuild_chat_entries(PidginChatData *data, const char *default_chat_name)
 {
 	PurpleConnection *gc;
 	GList *list = NULL, *tmp;
@@ -952,11 +1068,11 @@ rebuild_joinchat_entries(PidginJoinChatData *data)
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
 
-	g_return_if_fail(data->account != NULL);
+	g_return_if_fail(data->rq_data.account != NULL);
 
-	gc = purple_account_get_connection(data->account);
+	gc = purple_account_get_connection(data->rq_data.account);
 
-	gtk_container_foreach(GTK_CONTAINER(data->entries_box), (GtkCallback)gtk_widget_destroy, NULL);
+	gtk_container_foreach(GTK_CONTAINER(data->rq_data.vbox), (GtkCallback)gtk_widget_destroy, NULL);
 
 	g_list_free(data->entries);
 	data->entries = NULL;
@@ -965,7 +1081,7 @@ rebuild_joinchat_entries(PidginJoinChatData *data)
 		list = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info(gc);
 
 	if (PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL)
-		defaults = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, NULL);
+		defaults = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, default_chat_name);
 
 	for (tmp = list; tmp; tmp = tmp->next)
 	{
@@ -980,7 +1096,7 @@ rebuild_joinchat_entries(PidginJoinChatData *data)
 										1, 10, 10);
 			input = gtk_spin_button_new(GTK_ADJUSTMENT(adjust), 1, 0);
 			gtk_widget_set_size_request(input, 50, -1);
-			pidgin_add_widget_to_vbox(GTK_BOX(data->entries_box), pce->label, data->sg, input, FALSE, NULL);
+			pidgin_add_widget_to_vbox(GTK_BOX(data->rq_data.vbox), pce->label, data->rq_data.sg, input, FALSE, NULL);
 		}
 		else
 		{
@@ -998,9 +1114,9 @@ rebuild_joinchat_entries(PidginJoinChatData *data)
 					gtk_entry_set_invisible_char(GTK_ENTRY(input), PIDGIN_INVISIBLE_CHAR);
 #endif /* Less than GTK+ 2.16 */
 			}
-			pidgin_add_widget_to_vbox(GTK_BOX(data->entries_box), pce->label, data->sg, input, TRUE, NULL);
+			pidgin_add_widget_to_vbox(data->rq_data.vbox, pce->label, data->rq_data.sg, input, TRUE, NULL);
 			g_signal_connect(G_OBJECT(input), "changed",
-							 G_CALLBACK(joinchat_set_sensitive_if_input_cb), data);
+							 G_CALLBACK(set_sensitive_if_input_cb), data);
 		}
 
 		/* Do the following for any type of input widget */
@@ -1021,110 +1137,52 @@ rebuild_joinchat_entries(PidginJoinChatData *data)
 	g_hash_table_destroy(defaults);
 
 	/* Set whether the "OK" button should be clickable initially */
-	joinchat_set_sensitive_if_input_cb(NULL, data);
+	set_sensitive_if_input_cb(NULL, data);
 
-	gtk_widget_show_all(data->entries_box);
+	gtk_widget_show_all(GTK_WIDGET(data->rq_data.vbox));
 }
 
 static void
-joinchat_select_account_cb(GObject *w, PurpleAccount *account,
-                           PidginJoinChatData *data)
+chat_select_account_cb(GObject *w, PurpleAccount *account,
+                       PidginChatData *data)
 {
-    data->account = account;
-    rebuild_joinchat_entries(data);
-}
-
-static gboolean
-chat_account_filter_func(PurpleAccount *account)
-{
-	PurpleConnection *gc = purple_account_get_connection(account);
-	PurplePluginProtocolInfo *prpl_info = NULL;
-
-	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
-
-	return (prpl_info->chat_info != NULL);
-}
-
-gboolean
-pidgin_blist_joinchat_is_showable()
-{
-	GList *c;
-	PurpleConnection *gc;
-
-	for (c = purple_connections_get_all(); c != NULL; c = c->next) {
-		gc = c->data;
-
-		if (chat_account_filter_func(purple_connection_get_account(gc)))
-			return TRUE;
+	if (strcmp(purple_account_get_protocol_id(data->rq_data.account),
+	           purple_account_get_protocol_id(account)) == 0)
+	{
+		data->rq_data.account = account;
+	}
+	else
+	{
+		data->rq_data.account = account;
+		rebuild_chat_entries(data, data->default_chat_name);
 	}
-
-	return FALSE;
 }
 
 void
 pidgin_blist_joinchat_show(void)
 {
-	GtkWidget *hbox, *vbox;
-	GtkWidget *label;
-	PidginBuddyList *gtkblist;
-	GtkWidget *img = NULL;
-	PidginJoinChatData *data = NULL;
+	PidginChatData *data = NULL;
 
-	gtkblist = purple_blist_get_ui_data();
-	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
-					gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
-	data = g_new0(PidginJoinChatData, 1);
+	data = g_new0(PidginChatData, 1);
 
-	data->window = gtk_dialog_new_with_buttons(_("Join a Chat"),
-		NULL, GTK_DIALOG_NO_SEPARATOR,
+	make_blist_request_dialog((PidginBlistRequestData *)data, NULL,
+		_("Join a Chat"), "join_chat",
+		_("Please enter the appropriate information about the chat "
+			"you would like to join.\n"),
+		G_CALLBACK(chat_select_account_cb),
+		chat_account_filter_func, (GCallback)do_joinchat);
+	gtk_dialog_add_buttons(GTK_DIALOG(data->rq_data.window),
 		_("Room _List"), 1,
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		PIDGIN_STOCK_CHAT, GTK_RESPONSE_OK, NULL);
-	gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
-	gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE);
-	gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
-	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BORDER);
-	gtk_container_set_border_width(
-		GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BOX_SPACE);
-	gtk_window_set_role(GTK_WINDOW(data->window), "join_chat");
-
-	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
-	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-
-	vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(vbox), 0);
-	gtk_container_add(GTK_CONTAINER(hbox), vbox);
-
-	label = gtk_label_new(_("Please enter the appropriate information "
-							"about the chat you would like to join.\n"));
-	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-
-	data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+	gtk_dialog_set_default_response(GTK_DIALOG(data->rq_data.window),
+		GTK_RESPONSE_OK);
+	data->default_chat_name = NULL;
+	data->rq_data.account = pidgin_account_option_menu_get_selected(data->rq_data.account_menu);
 
-	data->account_menu = pidgin_account_option_menu_new(NULL, FALSE,
-			G_CALLBACK(joinchat_select_account_cb),
-			chat_account_filter_func, data);
+	rebuild_chat_entries(data, NULL);
 
-	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Account:"), data->sg, data->account_menu, TRUE, NULL);
-
-	data->entries_box = gtk_vbox_new(FALSE, 5);
-	gtk_container_add(GTK_CONTAINER(vbox), data->entries_box);
-	gtk_container_set_border_width(GTK_CONTAINER(data->entries_box), 0);
-
-	data->account =	pidgin_account_option_menu_get_selected(data->account_menu);
-
-	rebuild_joinchat_entries(data);
-
-	g_signal_connect(G_OBJECT(data->window), "response",
-					 G_CALLBACK(do_joinchat), data);
-
-	g_object_unref(data->sg);
-
-	gtk_widget_show_all(data->window);
+	gtk_widget_show_all(data->rq_data.window);
 }
 
 static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data)
@@ -1456,7 +1514,6 @@ pidgin_blist_make_buddy_menu(GtkWidget *menu, PurpleBuddy *buddy, gboolean sub)
 	PurpleContact *contact;
 	PurpleBlistNode *node;
 	gboolean contact_expanded = FALSE;
-	gboolean show_offline = FALSE;
 
 	g_return_if_fail(menu);
 	g_return_if_fail(buddy);
@@ -1476,6 +1533,30 @@ pidgin_blist_make_buddy_menu(GtkWidget *menu, PurpleBuddy *buddy, gboolean sub)
 	}
 	pidgin_new_item_from_stock(menu, _("I_M"), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW,
 			G_CALLBACK(gtk_blist_menu_im_cb), buddy, 0, 0, NULL);
+	
+#ifdef USE_VV
+	if (prpl_info && prpl_info->get_media_caps) {
+		PurpleAccount *account = purple_buddy_get_account(buddy);
+		const gchar *who = purple_buddy_get_name(buddy);
+		PurpleMediaCaps caps = purple_prpl_get_media_caps(account, who);
+		if (caps & PURPLE_MEDIA_CAPS_AUDIO) {
+			pidgin_new_item_from_stock(menu, _("_Audio Call"),
+				PIDGIN_STOCK_TOOLBAR_AUDIO_CALL,
+				G_CALLBACK(gtk_blist_menu_audio_call_cb), buddy, 0, 0, NULL);
+		}
+		if (caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO) {
+			pidgin_new_item_from_stock(menu, _("Audio/_Video Call"),
+				PIDGIN_STOCK_TOOLBAR_VIDEO_CALL,
+				G_CALLBACK(gtk_blist_menu_video_call_cb), buddy, 0, 0, NULL);
+		} else if (caps & PURPLE_MEDIA_CAPS_VIDEO) {
+			pidgin_new_item_from_stock(menu, _("_Video Call"),
+				PIDGIN_STOCK_TOOLBAR_VIDEO_CALL,
+				G_CALLBACK(gtk_blist_menu_video_call_cb), buddy, 0, 0, NULL);
+		}
+	}
+	
+#endif
+	
 	if (prpl_info && prpl_info->send_file) {
 		if (!prpl_info->can_receive_file ||
 			prpl_info->can_receive_file(buddy->account->gc, buddy->name))
@@ -1500,9 +1581,9 @@ pidgin_blist_make_buddy_menu(GtkWidget *menu, PurpleBuddy *buddy, gboolean sub)
 				G_CALLBACK(gtk_blist_menu_showlog_cb), buddy, 0, 0, NULL);
 	}
 
-	if (!(purple_blist_node_get_flags(node) & PURPLE_BLIST_NODE_FLAG_NO_SAVE)) {
-		show_offline = purple_blist_node_get_bool(node, "show_offline");
-		pidgin_new_item_from_stock(menu, show_offline ? _("Hide when offline") : _("Show when offline"),
+	if (!PURPLE_BLIST_NODE_HAS_FLAG(node, PURPLE_BLIST_NODE_FLAG_NO_SAVE)) {
+		gboolean show_offline = purple_blist_node_get_bool(node, "show_offline");
+		pidgin_new_item_from_stock(menu, show_offline ? _("Hide When Offline") : _("Show When Offline"),
 				NULL, G_CALLBACK(gtk_blist_menu_showoffline_cb), node, 0, 0, NULL);
 	}
 
@@ -1538,8 +1619,9 @@ gtk_blist_key_press_cb(GtkWidget *tv, GdkEventKey *event, gpointer data)
 {
 	PurpleBlistNode *node;
 	GValue val;
-	GtkTreeIter iter;
+	GtkTreeIter iter, parent;
 	GtkTreeSelection *sel;
+	GtkTreePath *path;
 
 	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv));
 	if(!gtk_tree_selection_get_selected(sel, NULL, &iter))
@@ -1563,8 +1645,62 @@ gtk_blist_key_press_cb(GtkWidget *tv, GdkEventKey *event, gpointer data)
 		}
 		if(buddy)
 			pidgin_retrieve_user_info(buddy->account->gc, buddy->name);
-	} else if (event->keyval == GDK_F2) {
-		gtk_blist_menu_alias_cb(tv, node);
+	} else {
+		switch (event->keyval) {
+			case GDK_F2:
+				gtk_blist_menu_alias_cb(tv, node);
+				break;
+
+			case GDK_Left:
+				path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter);
+				if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(tv), path)) {
+					/* Collapse the Group */
+					gtk_tree_view_collapse_row(GTK_TREE_VIEW(tv), path);
+					gtk_tree_path_free(path);
+					return TRUE;
+				} else {
+					/* Select the Parent */
+					if (gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path)) {
+						if (gtk_tree_model_iter_parent(GTK_TREE_MODEL(gtkblist->treemodel), &parent, &iter)) {
+							gtk_tree_path_free(path);
+							path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &parent);
+							gtk_tree_view_set_cursor(GTK_TREE_VIEW(tv), path, NULL, FALSE);
+							gtk_tree_path_free(path);
+							return TRUE;
+						}
+					}
+				}
+				gtk_tree_path_free(path);
+				break;
+
+			case GDK_Right:
+				path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter);
+				if (!gtk_tree_view_row_expanded(GTK_TREE_VIEW(tv), path)) {
+					/* Expand the Group */
+					if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
+						pidgin_blist_expand_contact_cb(NULL, node);
+						gtk_tree_path_free(path);
+						return TRUE;
+					} else if (!PURPLE_BLIST_NODE_IS_BUDDY(node)) {
+						gtk_tree_view_expand_row(GTK_TREE_VIEW(tv), path, FALSE);
+						gtk_tree_path_free(path);
+						return TRUE;
+					}
+				} else {
+					/* Select the First Child */
+					if (gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &parent, path)) {
+						if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(gtkblist->treemodel), &iter, &parent, 0)) {
+							gtk_tree_path_free(path);
+							path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter);
+							gtk_tree_view_set_cursor(GTK_TREE_VIEW(tv), path, NULL, FALSE);
+							gtk_tree_path_free(path);
+							return TRUE;
+						}
+					}
+				}
+				gtk_tree_path_free(path);
+				break;
+		}
 	}
 
 	return FALSE;
@@ -1631,7 +1767,7 @@ create_group_menu (PurpleBlistNode *node, PurpleGroup *g)
 				 G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL);
 	if (!(purple_blist_node_get_flags(node) & PURPLE_BLIST_NODE_FLAG_NO_SAVE)) {
 		gboolean show_offline = purple_blist_node_get_bool(node, "show_offline");
-		pidgin_new_item_from_stock(menu, show_offline ? _("Hide when offline") : _("Show when offline"),
+		pidgin_new_item_from_stock(menu, show_offline ? _("Hide When Offline") : _("Show When Offline"),
 				NULL, G_CALLBACK(gtk_blist_menu_showoffline_cb), node, 0, 0, NULL);
 	}
 
@@ -3431,7 +3567,7 @@ static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full)
 			}
 
 			g_free(pce);
-			cur = g_list_remove(cur, pce);
+			cur = g_list_delete_link(cur, cur);
 		}
 	}
 	else if (PURPLE_BLIST_NODE_IS_CONTACT(node) || PURPLE_BLIST_NODE_IS_BUDDY(node))
@@ -3854,6 +3990,24 @@ pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size)
 	return ret;
 }
 
+static const char *
+theme_font_get_color_default(PidginThemeFont *font, const char *def)
+{
+	const char *ret;
+	if (!font || !(ret = pidgin_theme_font_get_color_describe(font)))
+		ret = def;
+	return ret;
+}
+
+static const char *
+theme_font_get_face_default(PidginThemeFont *font, const char *def)
+{
+	const char *ret;
+	if (!font || !(ret = pidgin_theme_font_get_font_face(font)))
+		ret = def;
+	return ret;
+}
+
 gchar *
 pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected, gboolean aliased)
 {
@@ -3868,7 +4022,7 @@ pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected, gboolean aliased
 	PurpleConversation *conv = find_conversation_with_buddy(b);
 	gboolean hidden_conv = FALSE;
 	gboolean biglist = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
-	FontColorPair *pair = NULL;
+	PidginThemeFont *statusfont = NULL, *namefont = NULL;
 	PidginBlistTheme *theme;
 
 	if (conv != NULL) {
@@ -3898,7 +4052,7 @@ pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected, gboolean aliased
 	presence = purple_buddy_get_presence(b);
 
 	/* Name is all that is needed */
-	if (aliased && biglist) {
+	if (!aliased || biglist) {
 
 		/* Status Info */
 		prpl = purple_find_prpl(purple_account_get_protocol_id(b->account));
@@ -3943,7 +4097,7 @@ pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected, gboolean aliased
 				else
 					g_snprintf(buf, sizeof(buf), "%%s ");
 
-				statustext = g_strdup_printf(buf, tmp);purple_presence_is_idle(presence)
+				statustext = g_strdup_printf(buf, tmp);
 
 				g_free(tmp);
 			}
@@ -3986,65 +4140,74 @@ pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected, gboolean aliased
 
 	/* choose the colors of the text */
 	theme = pidgin_blist_get_theme();
+	name_color = NULL;
+
+	if (theme) {
+		if (purple_presence_is_idle(presence)) {
+			namefont = statusfont = pidgin_blist_theme_get_idle_text_info(theme);
+			name_color = "dim grey";
+		} else if (!purple_presence_is_online(presence)) {
+			namefont = pidgin_blist_theme_get_offline_text_info(theme);
+			statusfont = pidgin_blist_theme_get_status_text_info(theme);
+		} else if (purple_presence_is_available(presence)) {
+			namefont = pidgin_blist_theme_get_online_text_info(theme);
+			statusfont = pidgin_blist_theme_get_status_text_info(theme);
+		} else {
+			namefont = pidgin_blist_theme_get_away_text_info(theme);
+			statusfont = pidgin_blist_theme_get_status_text_info(theme);
+		}
+	}
 
-	if (purple_presence_is_idle(presence)) {
-		if (theme)
-			pair = pidgin_blist_theme_get_idle_text_info(theme);
-		status_color = name_color = (pair != NULL && pair->color != NULL) ? pair->color : "dim grey";
-		status_font = name_font = (pair != NULL && pair->font != NULL) ? pair->font : "";
-
-	} else if (!purple_presence_is_online(presence)) {
-		if (theme)
-			pair = pidgin_blist_theme_get_offline_text_info(theme);
-		name_color = (pair != NULL && pair->color != NULL) ? pair->color : "black";
-		name_font = (pair != NULL && pair->font != NULL) ? pair->font : "";
-
-		if (theme)
-			pair = pidgin_blist_theme_get_status_text_info(theme);
-		status_color = (pair != NULL && pair->color != NULL) ? pair->color : "dim grey";
-		status_font = (pair != NULL && pair->font != NULL) ? pair->font : "";
-
-	} else if (purple_presence_is_available(presence)) {
-		if (theme)
-			pair = pidgin_blist_theme_get_online_text_info(theme);
-		name_color = (pair != NULL && pair->color != NULL) ? pair->color : "black";
-		name_font = (pair != NULL && pair->font != NULL) ? pair->font : "";
-
-		if (theme)
-			pair = pidgin_blist_theme_get_status_text_info(theme);
-		status_color = (pair != NULL && pair->color != NULL) ? pair->color : "dim grey";
-		status_font = (pair != NULL && pair->font != NULL) ? pair->font : "";
-
-	} else {
-		if (theme)
-			pair = pidgin_blist_theme_get_away_text_info(theme);
-		name_color = (pair != NULL && pair->color != NULL) ? pair->color : "black";
-		name_font = (pair != NULL && pair->font != NULL) ? pair->font : "";
+	name_color = theme_font_get_color_default(namefont, name_color);
+	name_font = theme_font_get_face_default(namefont, "");
 
-		if (theme)
-			pair = pidgin_blist_theme_get_status_text_info(theme);
-		status_color = (pair != NULL && pair->color != NULL) ? pair->color : "dim grey";
-		status_font = (pair != NULL && pair->font != NULL) ? pair->font : "";
-	}
+	status_color = theme_font_get_color_default(statusfont, "dim grey");
+	status_font = theme_font_get_face_default(statusfont, "");
 
 	if (aliased && selected) {
-		name_color = "black";
-		status_color = "black";
+		if (theme) {
+			name_color = "black";
+			status_color = "black";
+		} else {
+			name_color = NULL;
+			status_color = NULL;
+		}
 	}
 
 	/* Put it all together */
-	if (aliased && biglist && (statustext || idletime)) {
+	if ((!aliased || biglist) && (statustext || idletime)) {
 		/* using <span size='smaller'> breaks the status, so it must be seperated into <small><span>*/
-		text = g_strdup_printf("<span font_desc='%s' foreground='%s'>%s</span>\n"
-				 	"<small><span font_desc='%s' foreground='%s'>%s%s%s</span></small>",
-					name_font, name_color, nametext, status_font, status_color,
-					idletime != NULL ? idletime : "",
-				        (idletime != NULL && statustext != NULL) ? " - " : "",
-				        statustext != NULL ? statustext : "");
-
-	} else
-		text = g_strdup_printf("<span font_desc='%s' color='%s'>%s</span>", name_font, name_color, nametext);
-
+		if (name_color) {
+			text = g_strdup_printf("<span font_desc='%s' foreground='%s'>%s</span>\n"
+				 		"<small><span font_desc='%s' foreground='%s'>%s%s%s</span></small>",
+						name_font, name_color, nametext, status_font, status_color,
+						idletime != NULL ? idletime : "",
+				    		(idletime != NULL && statustext != NULL) ? " - " : "",
+				    		statustext != NULL ? statustext : "");
+		} else if (status_color) {
+			text = g_strdup_printf("<span font_desc='%s'>%s</span>\n"
+				 		"<small><span font_desc='%s' foreground='%s'>%s%s%s</span></small>",
+						name_font, nametext, status_font, status_color,
+						idletime != NULL ? idletime : "",
+				    		(idletime != NULL && statustext != NULL) ? " - " : "",
+				    		statustext != NULL ? statustext : "");
+		} else {
+			text = g_strdup_printf("<span font_desc='%s'>%s</span>\n"
+				 		"<small><span font_desc='%s'>%s%s%s</span></small>",
+						name_font, nametext, status_font,
+						idletime != NULL ? idletime : "",
+				    		(idletime != NULL && statustext != NULL) ? " - " : "",
+				    		statustext != NULL ? statustext : "");
+		}
+	} else {
+		if (name_color) {
+			text = g_strdup_printf("<span font_desc='%s' color='%s'>%s</span>", 
+				name_font, name_color, nametext);
+		} else {
+			text = g_strdup_printf("<span font_desc='%s'>%s</span>", name_font,
+				nametext);
+		}
+	}
 	g_free(nametext);
 	g_free(statustext);
 	g_free(idletime);
@@ -4486,13 +4649,21 @@ item_factory_translate_func (const char *path, gpointer func_data)
 
 void pidgin_blist_setup_sort_methods()
 {
+	const char *id;
+
 	pidgin_blist_sort_method_reg("none", _("Manually"), sort_method_none);
 #if GTK_CHECK_VERSION(2,2,1)
 	pidgin_blist_sort_method_reg("alphabetical", _("Alphabetically"), sort_method_alphabetical);
 	pidgin_blist_sort_method_reg("status", _("By status"), sort_method_status);
 	pidgin_blist_sort_method_reg("log_size", _("By recent log activity"), sort_method_log_activity);
 #endif
-	pidgin_blist_sort_method_set(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/sort_type"));
+
+	id = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/sort_type");
+	if (id == NULL) {
+		purple_debug_warning("gtkblist", "Sort method was NULL, resetting to alphabetical\n");
+		id = "alphabetical";
+	}
+	pidgin_blist_sort_method_set(id);
 }
 
 static void _prefs_change_redo_list(const char *name, PurplePrefType type,
@@ -4577,6 +4748,12 @@ static void account_modified(PurpleAccount *account, PidginBuddyList *gtkblist)
 }
 
 static void
+account_actions_changed(PurpleAccount *account, gpointer data)
+{
+	pidgin_blist_update_accounts_menu();
+}
+
+static void
 account_status_changed(PurpleAccount *account, PurpleStatus *old,
 					   PurpleStatus *new, PidginBuddyList *gtkblist)
 {
@@ -4812,8 +4989,9 @@ generic_error_destroy_cb(GtkObject *dialog,
 #define SSL_FAQ_URI "http://d.pidgin.im/wiki/FAQssl"
 
 static void
-ssl_faq_clicked_cb(GtkButton *button,
-                   PurpleAccount *account)
+ssl_faq_clicked_cb(PidginMiniDialog *mini_dialog,
+                   GtkButton *button,
+                   gpointer ignored)
 {
 	purple_notify_uri(NULL, SSL_FAQ_URI);
 }
@@ -4846,25 +5024,9 @@ add_generic_error_dialog(PurpleAccount *account,
 	g_object_set_data(G_OBJECT(mini_dialog), OBJECT_DATA_KEY_ACCOUNT,
 		account);
 
-	if(err->type == PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT) {
-		GtkWidget *faq_button = gtk_button_new();
-		GtkWidget *faq_label = gtk_label_new(NULL);
-		gtk_label_set_markup(GTK_LABEL(faq_label),
-			"<span underline=\"single\" foreground=\"blue\""
-			" size=\"smaller\">" SSL_FAQ_URI "</span>");
-#if GTK_CHECK_VERSION(2,6,0)
-		g_object_set(G_OBJECT(faq_label), "ellipsize",
-			PANGO_ELLIPSIZE_MIDDLE, NULL);
-#endif
-		gtk_container_add(GTK_CONTAINER(faq_button), faq_label);
-		gtk_button_set_relief(GTK_BUTTON(faq_button), GTK_RELIEF_NONE);
-
-		g_signal_connect(faq_button, "clicked",
-			(GCallback)ssl_faq_clicked_cb, account);
-
-		gtk_box_pack_start(PIDGIN_MINI_DIALOG(mini_dialog)->contents,
-			faq_button, FALSE, FALSE, 0);
-	}
+	 if(err->type == PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT)
+		pidgin_mini_dialog_add_button(PIDGIN_MINI_DIALOG(mini_dialog),
+				_("SSL FAQs"), ssl_faq_clicked_cb, NULL);
 
 	g_signal_connect_after(mini_dialog, "destroy",
 		(GCallback)generic_error_destroy_cb,
@@ -5446,6 +5608,7 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 	GtkWidget *sep;
 	GtkWidget *label;
 	char *pretty, *tmp;
+	const char *theme_name;
 	GtkAccelGroup *accel_group;
 	GtkTreeSelection *selection;
 	GtkTargetEntry dte[] = {{"PURPLE_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
@@ -5464,7 +5627,14 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 	gtkblist = PIDGIN_BLIST(list);
 	priv = PIDGIN_BUDDY_LIST_GET_PRIVATE(gtkblist);
 
-	priv->current_theme = PIDGIN_BLIST_THEME(purple_theme_manager_find_theme(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/theme"), "blist"));
+	if (priv->current_theme)
+		g_object_unref(priv->current_theme);
+
+	theme_name = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/theme");
+	if (theme_name && *theme_name)
+		priv->current_theme = g_object_ref(PIDGIN_BLIST_THEME(purple_theme_manager_find_theme(theme_name, "blist")));
+	else
+		priv->current_theme = NULL;
 
 	gtkblist->empty_avatar = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 32, 32);
 	gdk_pixbuf_fill(gtkblist->empty_avatar, 0x00000000);
@@ -5731,7 +5901,7 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 	purple_blist_set_visible(purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/list_visible"));
 
 	/* start the refresh timer */
-	gtkblist->refresh_timer = g_timeout_add(30000, (GSourceFunc)pidgin_blist_refresh_timer, list);
+	gtkblist->refresh_timer = purple_timeout_add_seconds(30, (GSourceFunc)pidgin_blist_refresh_timer, list);
 
 	handle = pidgin_blist_get_handle();
 
@@ -5772,6 +5942,8 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 	purple_signal_connect(handle, "account-error-changed", gtkblist,
 	                      PURPLE_CALLBACK(update_account_error_state),
 	                      gtkblist);
+	purple_signal_connect(handle, "account-actions-changed", gtkblist,
+	                      PURPLE_CALLBACK(account_actions_changed), NULL);
 
 	handle = pidgin_account_get_handle();
 	purple_signal_connect(handle, "account-modified", gtkblist,
@@ -5852,7 +6024,7 @@ pidgin_blist_update_refresh_timeout()
 	blist = purple_get_blist();
 	gtkblist = PIDGIN_BLIST(purple_get_blist());
 
-	gtkblist->refresh_timer = g_timeout_add(30000,(GSourceFunc)pidgin_blist_refresh_timer, blist);
+	gtkblist->refresh_timer = purple_timeout_add_seconds(30,(GSourceFunc)pidgin_blist_refresh_timer, blist);
 }
 
 static gboolean get_iter_from_node(PurpleBlistNode *node, GtkTreeIter *iter) {
@@ -6066,10 +6238,9 @@ static void pidgin_blist_update_group(PurpleBuddyList *list,
 
 	if (count > 0 || purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_empty_groups"))
 		show = TRUE;
-	else if (PURPLE_BLIST_NODE_IS_BUDDY(node)) { /* Or chat? */
-		if (buddy_is_displayable((PurpleBuddy*)node))
-			show = TRUE;
-	} else if (!show_offline && PURPLE_BLIST_NODE_IS_GROUP(node)) {
+	else if (PURPLE_BLIST_NODE_IS_BUDDY(node) && buddy_is_displayable((PurpleBuddy*)node)) { /* Or chat? */
+		show = TRUE;
+	} else if (!show_offline) {
 		show = pidgin_blist_group_has_show_offline_buddy(group);
 	}
 
@@ -6132,8 +6303,8 @@ static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded)
 	char *mark, *esc;
 	PurpleBlistNode *selected_node = NULL;
 	GtkTreeIter iter;
-	FontColorPair *pair;
-	gchar *text_color, *text_font;
+	PidginThemeFont *pair;
+	gchar const *text_color, *text_font;
 	PidginBlistTheme *theme;
 
 	group = (PurpleGroup*)gnode;
@@ -6145,7 +6316,7 @@ static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded)
 	selected = (gnode == selected_node);
 
 	if (!expanded) {
-		g_snprintf(group_count, sizeof(group_count), " (%d/%d)",
+		g_snprintf(group_count, sizeof(group_count), "%d/%d",
 		           purple_blist_get_group_online_count(group),
 		           purple_blist_get_group_size(group, FALSE));
 	}
@@ -6159,12 +6330,24 @@ static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded)
 		pair = pidgin_blist_theme_get_collapsed_text_info(theme);
 
 
-	text_color = (selected || pair == NULL || pair->color == NULL) ? "black" : pair->color;
-	text_font = (pair == NULL || pair->font == NULL) ? "" : pair->font;
+	text_color = selected ? NULL : theme_font_get_color_default(pair, NULL);
+	text_font = theme_font_get_face_default(pair, "");
 
 	esc = g_markup_escape_text(group->name, -1);
-	mark = g_strdup_printf("<span foreground='%s' font_desc='%s'><b>%s</b>%s</span>",
-							text_color, text_font, esc ? esc : "", group_count);
+	if (text_color) {
+		mark = g_strdup_printf("<span foreground='%s' font_desc='%s'><b>%s</b>%s%s%s</span>",
+		                       text_color, text_font,
+		                       esc ? esc : "",
+		                       !expanded ? " <span weight='light'>(</span>" : "",
+		                       group_count,
+		                       !expanded ? "<span weight='light'>)</span>" : "");
+	} else {
+		mark = g_strdup_printf("<span font_desc='%s'><b>%s</b>%s%s%s</span>",
+		                       text_font, esc ? esc : "",
+		                       !expanded ? " <span weight='light'>(</span>" : "",
+		                       group_count,
+		                       !expanded ? "<span weight='light'>)</span>" : "");
+	}
 
 	g_free(esc);
 	return mark;
@@ -6213,7 +6396,7 @@ static void buddy_node(PurpleBuddy *buddy, GtkTreeIter *iter, PurpleBlistNode *n
 
 		if (idle_secs > 0)
 		{
-			FontColorPair *pair = NULL;
+			PidginThemeFont *pair = NULL;
 			const gchar *textcolor;
 			time_t t;
 			int ihrs, imin;
@@ -6222,13 +6405,20 @@ static void buddy_node(PurpleBuddy *buddy, GtkTreeIter *iter, PurpleBlistNode *n
 			ihrs = (t - idle_secs) / 3600;
 			imin = ((t - idle_secs) / 60) % 60;
 
-			if (!selected && theme != NULL && (pair = pidgin_blist_theme_get_idle_text_info(theme)) != NULL && pair->color != NULL)
-				textcolor = pair->color;
+			if (!selected && theme != NULL && (pair = pidgin_blist_theme_get_idle_text_info(theme)) != NULL)
+				textcolor = pidgin_theme_font_get_color_describe(pair);
 			else
-				textcolor = "black";
+				textcolor = NULL;
 
-			idle = g_strdup_printf("<span color='%s' font_desc='%s'>%d:%02d</span>", textcolor,
-					      (pair == NULL || pair->font == NULL) ? "" : pair->font, ihrs, imin);
+			if (textcolor) {
+				idle = g_strdup_printf("<span color='%s' font_desc='%s'>%d:%02d</span>",
+					textcolor, theme_font_get_face_default(pair, ""),
+					ihrs, imin);
+			} else {
+				idle = g_strdup_printf("<span font_desc='%s'>%d:%02d</span>",
+					theme_font_get_face_default(pair, ""), 
+					ihrs, imin);
+			}
 		}
 	}
 
@@ -6311,7 +6501,7 @@ static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBlistNode *
 			const gchar *fg_color, *font;
 			GdkColor *color = NULL;
 			PidginBlistTheme *theme = pidgin_blist_get_theme();
-			FontColorPair *pair;
+			PidginThemeFont *pair;
 			gboolean selected = (gtkblist->selected_node == cnode);
 
 			mark = g_markup_escape_text(purple_contact_get_alias(contact), -1);
@@ -6324,11 +6514,16 @@ static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBlistNode *
 				color = pidgin_blist_theme_get_contact_color(theme);
 			}
 
-			font = (pair == NULL || pair->font == NULL) ? "" : pair->font;
-			fg_color = (selected || pair == NULL || pair->color == NULL) ? "black" : pair->color;
+			font = theme_font_get_face_default(pair, "");
+			fg_color = selected ? NULL : theme_font_get_color_default(pair, NULL);
 
-			tmp = g_strdup_printf("<span font_desc='%s' color='%s'>%s</span>",
+			if (fg_color) {
+				tmp = g_strdup_printf("<span font_desc='%s' color='%s'>%s</span>",
 						font, fg_color, mark);
+			} else {
+				tmp = g_strdup_printf("<span font_desc='%s'>%s</span>", font, 
+					mark);
+			}
 			g_free(mark);
 			mark = tmp;
 
@@ -6415,9 +6610,9 @@ static void pidgin_blist_update_chat(PurpleBuddyList *list, PurpleBlistNode *nod
 		gboolean biglist = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
 		PidginBlistNode *ui;
 		PurpleConversation *conv;
-		gboolean hidden;
+		gboolean hidden = FALSE;
 		GdkColor *bgcolor = NULL;
-		FontColorPair *pair;
+		PidginThemeFont *pair;
 		PidginBlistTheme *theme;
 		gboolean selected = (gtkblist->selected_node == node);
 		gboolean nick_said = FALSE;
@@ -6455,16 +6650,18 @@ static void pidgin_blist_update_chat(PurpleBuddyList *list, PurpleBlistNode *nod
 		else pair = pidgin_blist_theme_get_online_text_info(theme);
 
 
-		font = (pair == NULL || pair->font == NULL) ? "" : pair->font;
-		if (selected || pair == NULL || pair->color == NULL)
+		font = theme_font_get_face_default(pair, "");
+		if (selected || !(color = theme_font_get_color_default(pair, NULL)))
 			/* nick_said color is the same as gtkconv:tab-label-attention */
-			color = (nick_said ? "#006aff" : "black");
-		else
-			color = pair->color;
-
-		tmp = g_strdup_printf("<span font_desc='%s' color='%s' weight='%s'>%s</span>",
-				      font, color, hidden ? "bold" : "normal", mark);
+			color = (nick_said ? "#006aff" : NULL);
 
+		if (color) {
+			tmp = g_strdup_printf("<span font_desc='%s' color='%s' weight='%s'>%s</span>",
+				  	  font, color, hidden ? "bold" : "normal", mark);
+		} else {
+			tmp = g_strdup_printf("<span font_desc='%s' weight='%s'>%s</span>",
+				  	  font, hidden ? "bold" : "normal", mark);
+		}
 		g_free(mark);
 		mark = tmp;
 
@@ -6534,25 +6731,26 @@ static void pidgin_blist_update(PurpleBuddyList *list, PurpleBlistNode *node)
 #endif
 }
 
-
 static void pidgin_blist_destroy(PurpleBuddyList *list)
 {
 	PidginBuddyListPrivate *priv;
 
-	if (!gtkblist)
+	if (!list || !list->ui_data)
 		return;
 
+	g_return_if_fail(list->ui_data == gtkblist);
+
 	purple_signals_disconnect_by_handle(gtkblist);
 
 	if (gtkblist->headline_close)
-		gdk_pixbuf_unref(gtkblist->headline_close);
+		g_object_unref(G_OBJECT(gtkblist->headline_close));
 
 	gtk_widget_destroy(gtkblist->window);
 
 	pidgin_blist_tooltip_destroy();
 
 	if (gtkblist->refresh_timer)
-		g_source_remove(gtkblist->refresh_timer);
+		purple_timeout_remove(gtkblist->refresh_timer);
 	if (gtkblist->timeout)
 		g_source_remove(gtkblist->timeout);
 	if (gtkblist->drag_timeout)
@@ -6574,6 +6772,8 @@ static void pidgin_blist_destroy(PurpleBuddyList *list)
 	gtkblist->arrow_cursor = NULL;
 
 	priv = PIDGIN_BUDDY_LIST_GET_PRIVATE(gtkblist);
+	if (priv->current_theme)
+		g_object_unref(priv->current_theme);
 	g_free(priv);
 
 	g_free(gtkblist);
@@ -6642,7 +6842,7 @@ add_buddy_select_account_cb(GObject *w, PurpleAccount *account,
 							PidginAddBuddyData *data)
 {
 	/* Save our account */
-	data->account = account;
+	data->rq_data.account = account;
 }
 
 static void
@@ -6655,6 +6855,7 @@ static void
 add_buddy_cb(GtkWidget *w, int resp, PidginAddBuddyData *data)
 {
 	const char *grp, *who, *whoalias;
+	PurpleAccount *account;
 	PurpleGroup *g;
 	PurpleBuddy *b;
 	PurpleConversation *c;
@@ -6668,16 +6869,31 @@ add_buddy_cb(GtkWidget *w, int resp, PidginAddBuddyData *data)
 		if (*whoalias == '\0')
 			whoalias = NULL;
 
+		account = data->rq_data.account;
+
 		g = NULL;
-		if ((grp != NULL) && (*grp != '\0') && ((g = purple_find_group(grp)) == NULL))
+		if ((grp != NULL) && (*grp != '\0'))
 		{
-			g = purple_group_new(grp);
-			purple_blist_add_group(g, NULL);
+			if ((g = purple_find_group(grp)) == NULL)
+			{
+				g = purple_group_new(grp);
+				purple_blist_add_group(g, NULL);
+			}
+
+			b = purple_find_buddy_in_group(account, who, g);
+		}
+		else if ((b = purple_find_buddy(account, who)) != NULL)
+		{
+			g = purple_buddy_get_group(b);
 		}
 
-		b = purple_buddy_new(data->account, who, whoalias);
-		purple_blist_add_buddy(b, NULL, g, NULL);
-		purple_account_add_buddy(data->account, b);
+		if (b == NULL)
+		{
+			b = purple_buddy_new(account, who, whoalias);
+			purple_blist_add_buddy(b, NULL, g, NULL);
+		}
+
+		purple_account_add_buddy(account, b);
 
 		/* Offer to merge people with the same alias. */
 		if (whoalias != NULL && g != NULL)
@@ -6698,7 +6914,7 @@ add_buddy_cb(GtkWidget *w, int resp, PidginAddBuddyData *data)
 		 * Or something.  --Mark
 		 */
 
-		c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, who, data->account);
+		c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, who, data->rq_data.account);
 		if (c != NULL) {
 			icon = purple_conv_im_get_icon(PURPLE_CONV_IM(c));
 			if (icon != NULL)
@@ -6706,103 +6922,54 @@ add_buddy_cb(GtkWidget *w, int resp, PidginAddBuddyData *data)
 		}
 	}
 
-	gtk_widget_destroy(data->window);
+	gtk_widget_destroy(data->rq_data.window);
 }
 
 static void
 pidgin_blist_request_add_buddy(PurpleAccount *account, const char *username,
 								 const char *group, const char *alias)
 {
-	GtkWidget *table;
-	GtkWidget *label;
-	GtkWidget *hbox;
-	GtkWidget *vbox;
-	GtkWidget *img;
-	PidginBuddyList *gtkblist;
 	PidginAddBuddyData *data = g_new0(PidginAddBuddyData, 1);
 
-	data->account =
+	make_blist_request_dialog((PidginBlistRequestData *)data,
 		(account != NULL
-		 ? account
-		 : purple_connection_get_account(purple_connections_get_all()->data));
-
-	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
-					gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
-
-	gtkblist = PIDGIN_BLIST(purple_get_blist());
-
-	data->window = gtk_dialog_new_with_buttons(_("Add Buddy"),
-			gtkblist ? GTK_WINDOW(gtkblist->window) : NULL, GTK_DIALOG_NO_SEPARATOR,
+			? account : purple_connection_get_account(purple_connections_get_all()->data)),
+		_("Add Buddy"), "add_buddy",
+		_("Add a buddy.\n"),
+		G_CALLBACK(add_buddy_select_account_cb), NULL,
+		G_CALLBACK(add_buddy_cb));
+	gtk_dialog_add_buttons(GTK_DIALOG(data->rq_data.window),
 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 			GTK_STOCK_ADD, GTK_RESPONSE_OK,
 			NULL);
+	gtk_dialog_set_default_response(GTK_DIALOG(data->rq_data.window),
+			GTK_RESPONSE_OK);
 
-	if (gtkblist)
-		gtk_window_set_transient_for(GTK_WINDOW(data->window), GTK_WINDOW(gtkblist->window));
-	gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
-	gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE);
-	gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
-	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BORDER);
-	gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BOX_SPACE);
-	gtk_window_set_role(GTK_WINDOW(data->window), "add_buddy");
-	gtk_window_set_type_hint(GTK_WINDOW(data->window),
-							 GDK_WINDOW_TYPE_HINT_DIALOG);
-
-	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
-	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(hbox), vbox);
-
-	g_signal_connect(G_OBJECT(data->window), "destroy",
+	g_signal_connect(G_OBJECT(data->rq_data.window), "destroy",
 	                 G_CALLBACK(destroy_add_buddy_dialog_cb), data);
 
-	label = gtk_label_new(_("Add a buddy.\n"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-
-	table = gtk_table_new(4, 2, FALSE);
-	gtk_table_set_row_spacings(GTK_TABLE(table), 5);
-	gtk_table_set_col_spacings(GTK_TABLE(table), 5);
-	gtk_container_set_border_width(GTK_CONTAINER(table), 0);
-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
-
-	data->account_box = pidgin_account_option_menu_new(account, FALSE,
-			G_CALLBACK(add_buddy_select_account_cb), NULL, data);
-
-	gtk_table_attach_defaults(GTK_TABLE(table), data->account_box, 0, 2, 0, 1);
-
-	label = gtk_label_new_with_mnemonic(_("Buddy's _username:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
-
 	data->entry = gtk_entry_new();
-	gtk_table_attach_defaults(GTK_TABLE(table), data->entry, 1, 2, 1, 2);
+
+	pidgin_add_widget_to_vbox(data->rq_data.vbox, _("Buddy's _username:"),
+		data->rq_data.sg, data->entry, TRUE, NULL);
 	gtk_widget_grab_focus(data->entry);
 
 	if (username != NULL)
 		gtk_entry_set_text(GTK_ENTRY(data->entry), username);
 	else
-		gtk_dialog_set_response_sensitive(GTK_DIALOG(data->window),
+		gtk_dialog_set_response_sensitive(GTK_DIALOG(data->rq_data.window),
 		                                  GTK_RESPONSE_OK, FALSE);
 
 	gtk_entry_set_activates_default (GTK_ENTRY(data->entry), TRUE);
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->entry);
-	pidgin_set_accessible_label (data->entry, label);
 
 	g_signal_connect(G_OBJECT(data->entry), "changed",
 	                 G_CALLBACK(pidgin_set_sensitive_if_input),
-	                 data->window);
-
-	label = gtk_label_new_with_mnemonic(_("(Optional) A_lias:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3);
+	                 data->rq_data.window);
 
 	data->entry_for_alias = gtk_entry_new();
-	gtk_table_attach_defaults(GTK_TABLE(table),
-	                          data->entry_for_alias, 1, 2, 2, 3);
+	pidgin_add_widget_to_vbox(data->rq_data.vbox, _("(Optional) A_lias:"),
+	                          data->rq_data.sg, data->entry_for_alias, TRUE,
+	                          NULL);
 
 	if (alias != NULL)
 		gtk_entry_set_text(GTK_ENTRY(data->entry_for_alias), alias);
@@ -6810,39 +6977,24 @@ pidgin_blist_request_add_buddy(PurpleAccount *account, const char *username,
 	if (username != NULL)
 		gtk_widget_grab_focus(GTK_WIDGET(data->entry_for_alias));
 
-	gtk_entry_set_activates_default (GTK_ENTRY(data->entry_for_alias), TRUE);
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->entry_for_alias);
-	pidgin_set_accessible_label (data->entry_for_alias, label);
-
-	label = gtk_label_new_with_mnemonic(_("Add buddy to _group:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
-
 	data->combo = pidgin_text_combo_box_entry_new(group, groups_tree());
-	gtk_table_attach_defaults(GTK_TABLE(table), data->combo, 1, 2, 3, 4);
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_BIN(data->combo)->child);
-	pidgin_set_accessible_label (data->combo, label);
-
-	g_signal_connect(G_OBJECT(data->window), "response",
-					 G_CALLBACK(add_buddy_cb), data);
+	pidgin_add_widget_to_vbox(data->rq_data.vbox, _("Add buddy to _group:"),
+	                          data->rq_data.sg, data->combo, TRUE, NULL);
 
-	gtk_widget_show_all(data->window);
+	gtk_widget_show_all(data->rq_data.window);
 }
 
 static void
 add_chat_cb(GtkWidget *w, PidginAddChatData *data)
 {
-	GHashTable *components;
 	GList *tmp;
 	PurpleChat *chat;
-	PurpleGroup *group;
-	const char *group_name;
-	const char *value;
+	GHashTable *components;
 
 	components = g_hash_table_new_full(g_str_hash, g_str_equal,
 									   g_free, g_free);
 
-	for (tmp = data->entries; tmp; tmp = tmp->next)
+	for (tmp = data->chat_data.entries; tmp; tmp = tmp->next)
 	{
 		if (g_object_get_data(tmp->data, "is_spin"))
 		{
@@ -6853,7 +7005,8 @@ add_chat_cb(GtkWidget *w, PidginAddChatData *data)
 		}
 		else
 		{
-			value = gtk_entry_get_text(tmp->data);
+			const char *value = gtk_entry_get_text(tmp->data);
+
 			if (*value != '\0')
 				g_hash_table_replace(components,
 						g_strdup(g_object_get_data(tmp->data, "identifier")),
@@ -6861,33 +7014,36 @@ add_chat_cb(GtkWidget *w, PidginAddChatData *data)
 		}
 	}
 
-	chat = purple_chat_new(data->account,
-							   gtk_entry_get_text(GTK_ENTRY(data->alias_entry)),
-							   components);
+	chat = purple_chat_new(data->chat_data.rq_data.account,
+	                       gtk_entry_get_text(GTK_ENTRY(data->alias_entry)),
+	                       components);
 
-	group_name = pidgin_text_combo_box_entry_get_text(data->group_combo);
+	if (chat != NULL) {
+		PurpleGroup *group;
+		const char *group_name;
 
-	group = NULL;
-	if ((group_name != NULL) && (*group_name != '\0') && ((group = purple_find_group(group_name)) == NULL))
-	{
-		group = purple_group_new(group_name);
-		purple_blist_add_group(group, NULL);
-	}
+		group_name = pidgin_text_combo_box_entry_get_text(data->group_combo);
+
+		group = NULL;
+		if ((group_name != NULL) && (*group_name != '\0') &&
+		    ((group = purple_find_group(group_name)) == NULL))
+		{
+			group = purple_group_new(group_name);
+			purple_blist_add_group(group, NULL);
+		}
 
-	if (chat != NULL)
-	{
 		purple_blist_add_chat(chat, group, NULL);
-	}
 
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->autojoin)))
-		purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-autojoin", TRUE);
+		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->autojoin)))
+			purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-autojoin", TRUE);
 
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->persistent)))
-		purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-persistent", TRUE);
+		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->persistent)))
+			purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-persistent", TRUE);
+	}
 
-	gtk_widget_destroy(data->window);
-	g_free(data->default_chat_name);
-	g_list_free(data->entries);
+	gtk_widget_destroy(data->chat_data.rq_data.window);
+	g_free(data->chat_data.default_chat_name);
+	g_list_free(data->chat_data.entries);
 	g_free(data);
 }
 
@@ -6900,166 +7056,25 @@ add_chat_resp_cb(GtkWidget *w, int resp, PidginAddChatData *data)
 	}
 	else if (resp == 1)
 	{
-		pidgin_roomlist_dialog_show_with_account(data->account);
+		pidgin_roomlist_dialog_show_with_account(data->chat_data.rq_data.account);
 	}
 	else
 	{
-		gtk_widget_destroy(data->window);
-		g_free(data->default_chat_name);
-		g_list_free(data->entries);
+		gtk_widget_destroy(data->chat_data.rq_data.window);
+		g_free(data->chat_data.default_chat_name);
+		g_list_free(data->chat_data.entries);
 		g_free(data);
 	}
 }
 
-/*
- * Check the values of all the text entry boxes.  If any required input
- * strings are empty then don't allow the user to click on "OK."
- */
-static void
-addchat_set_sensitive_if_input_cb(GtkWidget *entry, gpointer user_data)
-{
-	PurplePluginProtocolInfo *prpl_info;
-	PurpleConnection *gc;
-	PidginAddChatData *data;
-	GList *tmp;
-	const char *text;
-	gboolean required;
-	gboolean sensitive = TRUE;
-
-	data = user_data;
-
-	for (tmp = data->entries; tmp != NULL; tmp = tmp->next)
-	{
-		if (!g_object_get_data(tmp->data, "is_spin"))
-		{
-			required = GPOINTER_TO_INT(g_object_get_data(tmp->data, "required"));
-			text = gtk_entry_get_text(tmp->data);
-			if (required && (*text == '\0'))
-				sensitive = FALSE;
-		}
-	}
-
-	gtk_dialog_set_response_sensitive(GTK_DIALOG(data->window), GTK_RESPONSE_OK, sensitive);
-
-	gc = purple_account_get_connection(data->account);
-	prpl_info = (gc != NULL) ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL;
-	sensitive = (prpl_info != NULL && prpl_info->roomlist_get_list != NULL);
-
-	gtk_dialog_set_response_sensitive(GTK_DIALOG(data->window), 1, sensitive);
-}
-
-static void
-rebuild_addchat_entries(PidginAddChatData *data)
-{
-	PurpleConnection *gc;
-	GList *list = NULL, *tmp;
-	GHashTable *defaults = NULL;
-	struct proto_chat_entry *pce;
-	gboolean focus = TRUE;
-
-	g_return_if_fail(data->account != NULL);
-
-	gc = purple_account_get_connection(data->account);
-
-	gtk_container_foreach(GTK_CONTAINER(data->entries_box), (GtkCallback)gtk_widget_destroy, NULL);
-
-	g_list_free(data->entries);
-
-	data->entries = NULL;
-
-	if (PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info != NULL)
-		list = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info(gc);
-
-	if (PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL)
-		defaults = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, data->default_chat_name);
-
-	for (tmp = list; tmp; tmp = tmp->next)
-	{
-		GtkWidget *input;
-
-		pce = tmp->data;
-
-		if (pce->is_int)
-		{
-			GtkObject *adjust;
-			adjust = gtk_adjustment_new(pce->min, pce->min, pce->max,
-										1, 10, 10);
-			input = gtk_spin_button_new(GTK_ADJUSTMENT(adjust), 1, 0);
-			gtk_widget_set_size_request(input, 50, -1);
-			pidgin_add_widget_to_vbox(GTK_BOX(data->entries_box), pce->label, data->sg, input, FALSE, NULL);
-		}
-		else
-		{
-			char *value;
-			input = gtk_entry_new();
-			gtk_entry_set_activates_default(GTK_ENTRY(input), TRUE);
-			value = g_hash_table_lookup(defaults, pce->identifier);
-			if (value != NULL)
-				gtk_entry_set_text(GTK_ENTRY(input), value);
-			if (pce->secret)
-			{
-				gtk_entry_set_visibility(GTK_ENTRY(input), FALSE);
-#if !GTK_CHECK_VERSION(2,16,0)
-				if (gtk_entry_get_invisible_char(GTK_ENTRY(input)) == '*')
-					gtk_entry_set_invisible_char(GTK_ENTRY(input), PIDGIN_INVISIBLE_CHAR);
-#endif /* Less than GTK+ 2.16 */
-			}
-			pidgin_add_widget_to_vbox(GTK_BOX(data->entries_box), pce->label, data->sg, input, TRUE, NULL);
-			g_signal_connect(G_OBJECT(input), "changed",
-							 G_CALLBACK(addchat_set_sensitive_if_input_cb), data);
-		}
-
-		/* Do the following for any type of input widget */
-		if (focus)
-		{
-			gtk_widget_grab_focus(input);
-			focus = FALSE;
-		}
-		g_object_set_data(G_OBJECT(input), "identifier", (gpointer)pce->identifier);
-		g_object_set_data(G_OBJECT(input), "is_spin", GINT_TO_POINTER(pce->is_int));
-		g_object_set_data(G_OBJECT(input), "required", GINT_TO_POINTER(pce->required));
-		data->entries = g_list_append(data->entries, input);
-
-		g_free(pce);
-	}
-
-	g_list_free(list);
-	g_hash_table_destroy(defaults);
-
-	/* Set whether the "OK" button should be clickable initially */
-	addchat_set_sensitive_if_input_cb(NULL, data);
-
-	gtk_widget_show_all(data->entries_box);
-}
-
-static void
-addchat_select_account_cb(GObject *w, PurpleAccount *account,
-						   PidginAddChatData *data)
-{
-	if (strcmp(purple_account_get_protocol_id(data->account),
-		purple_account_get_protocol_id(account)) == 0)
-	{
-		data->account = account;
-	}
-	else
-	{
-		data->account = account;
-		rebuild_addchat_entries(data);
-	}
-}
-
 static void
 pidgin_blist_request_add_chat(PurpleAccount *account, PurpleGroup *group,
 								const char *alias, const char *name)
 {
 	PidginAddChatData *data;
-	PidginBuddyList *gtkblist;
 	GList *l;
 	PurpleConnection *gc;
-	GtkWidget *label;
-	GtkWidget *hbox;
-	GtkWidget *vbox;
-	GtkWidget *img;
+	GtkBox *vbox;
 
 	if (account != NULL) {
 		gc = purple_account_get_connection(account);
@@ -7088,82 +7103,46 @@ pidgin_blist_request_add_chat(PurpleAccount *account, PurpleGroup *group,
 	}
 
 	data = g_new0(PidginAddChatData, 1);
-	data->account = account;
-	data->default_chat_name = g_strdup(name);
-
-	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
-					gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
-
-	gtkblist = PIDGIN_BLIST(purple_get_blist());
-
-	data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
-	data->window = gtk_dialog_new_with_buttons(_("Add Chat"),
-		gtkblist ? GTK_WINDOW(gtkblist->window) : NULL, GTK_DIALOG_NO_SEPARATOR,
-		_("Room _List"), 1,
+	vbox = GTK_BOX(make_blist_request_dialog((PidginBlistRequestData *)data, account,
+			_("Add Chat"), "add_chat",
+			_("Please enter an alias, and the appropriate information "
+			  "about the chat you would like to add to your buddy list.\n"),
+			G_CALLBACK(chat_select_account_cb), chat_account_filter_func,
+			G_CALLBACK(add_chat_resp_cb)));
+	gtk_dialog_add_buttons(GTK_DIALOG(data->chat_data.rq_data.window),
+		_("Room List"), 1,
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_ADD, GTK_RESPONSE_OK,
 		NULL);
+	gtk_dialog_set_default_response(GTK_DIALOG(data->chat_data.rq_data.window),
+			GTK_RESPONSE_OK);
 
-	if (gtkblist)
-		gtk_window_set_transient_for(GTK_WINDOW(data->window), GTK_WINDOW(gtkblist->window));
-	gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
-	gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE);
-	gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
-	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BORDER);
-	gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BOX_SPACE);
-	gtk_window_set_role(GTK_WINDOW(data->window), "add_chat");
-	gtk_window_set_type_hint(GTK_WINDOW(data->window),
-							 GDK_WINDOW_TYPE_HINT_DIALOG);
+	data->chat_data.default_chat_name = g_strdup(name);
 
-	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
-	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-
-	vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_add(GTK_CONTAINER(hbox), vbox);
-
-	label = gtk_label_new(
-		_("Please enter an alias, and the appropriate information "
-		  "about the chat you would like to add to your buddy list.\n"));
-	gtk_widget_set_size_request(label, 400, -1);
-	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-
-	data->account_menu = pidgin_account_option_menu_new(account, FALSE,
-			G_CALLBACK(addchat_select_account_cb),
-			chat_account_filter_func, data);
-	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Account:"), data->sg, data->account_menu, TRUE, NULL);
-
-	data->entries_box = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(data->entries_box), 0);
-	gtk_box_pack_start(GTK_BOX(vbox), data->entries_box, TRUE, TRUE, 0);
-
-	rebuild_addchat_entries(data);
+	rebuild_chat_entries((PidginChatData *)data, name);
 
 	data->alias_entry = gtk_entry_new();
 	if (alias != NULL)
 		gtk_entry_set_text(GTK_ENTRY(data->alias_entry), alias);
 	gtk_entry_set_activates_default(GTK_ENTRY(data->alias_entry), TRUE);
 
-	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("A_lias:"), data->sg, data->alias_entry, TRUE, NULL);
+	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("A_lias:"),
+	                          data->chat_data.rq_data.sg, data->alias_entry,
+	                          TRUE, NULL);
 	if (name != NULL)
 		gtk_widget_grab_focus(data->alias_entry);
 
 	data->group_combo = pidgin_text_combo_box_entry_new(group ? group->name : NULL, groups_tree());
-	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Group:"), data->sg, data->group_combo, TRUE, NULL);
+	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Group:"),
+	                          data->chat_data.rq_data.sg, data->group_combo,
+	                          TRUE, NULL);
 
-	data->autojoin = gtk_check_button_new_with_mnemonic(_("Auto_join when account becomes online."));
+	data->autojoin = gtk_check_button_new_with_mnemonic(_("Auto_join when account connects."));
 	data->persistent = gtk_check_button_new_with_mnemonic(_("_Remain in chat after window is closed."));
 	gtk_box_pack_start(GTK_BOX(vbox), data->autojoin, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), data->persistent, FALSE, FALSE, 0);
 
-	g_signal_connect(G_OBJECT(data->window), "response",
-					 G_CALLBACK(add_chat_resp_cb), data);
-
-	gtk_widget_show_all(data->window);
+	gtk_widget_show_all(data->chat_data.rq_data.window);
 }
 
 static void
@@ -7259,7 +7238,7 @@ pidgin_blist_set_headline(const char *text, GdkPixbuf *pixbuf, GCallback callbac
 static void
 set_urgent(void)
 {
-	if (!GTK_WIDGET_HAS_FOCUS(gtkblist->window))
+	if (gtkblist->window && !GTK_WIDGET_HAS_FOCUS(gtkblist->window))
 		pidgin_set_urgent(GTK_WINDOW(gtkblist->window), TRUE);
 }
 
@@ -7354,7 +7333,7 @@ static void buddy_signonoff_cb(PurpleBuddy *buddy)
 
 	if(gtknode->recent_signonoff_timer > 0)
 		purple_timeout_remove(gtknode->recent_signonoff_timer);
-	gtknode->recent_signonoff_timer = purple_timeout_add(10000,
+	gtknode->recent_signonoff_timer = purple_timeout_add_seconds(10,
 			(GSourceFunc)buddy_signonoff_timeout_cb, buddy);
 }
 
@@ -7370,7 +7349,10 @@ pidgin_blist_set_theme(PidginBlistTheme *theme)
 	else
 		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/blist/theme", "");
 
-	priv->current_theme = theme;
+	if (priv->current_theme)
+		g_object_unref(priv->current_theme);
+
+	priv->current_theme = theme ? g_object_ref(theme) : NULL;
 
 	pidgin_blist_build_layout(list);
 
@@ -7466,7 +7448,13 @@ GList *pidgin_blist_get_sort_methods()
 
 void pidgin_blist_sort_method_reg(const char *id, const char *name, pidgin_blist_sort_function func)
 {
-	struct pidgin_blist_sort_method *method = g_new0(struct pidgin_blist_sort_method, 1);
+	struct pidgin_blist_sort_method *method;
+
+	g_return_if_fail(id != NULL);
+	g_return_if_fail(name != NULL);
+	g_return_if_fail(func != NULL);
+
+	method = g_new0(struct pidgin_blist_sort_method, 1);
 	method->id = g_strdup(id);
 	method->name = g_strdup(name);
 	method->func = func;
@@ -7478,6 +7466,8 @@ void pidgin_blist_sort_method_unreg(const char *id)
 {
 	GList *l = pidgin_blist_sort_methods;
 
+	g_return_if_fail(id != NULL);
+
 	while(l) {
 		struct pidgin_blist_sort_method *method = l->data;
 		if(!strcmp(method->id, id)) {
@@ -7915,8 +7905,10 @@ pidgin_blist_update_accounts_menu(void)
 		}
 	}
 
-	if (!enabled_accounts)
+	if (!enabled_accounts) {
+		gtk_widget_show_all(accountmenu);
 		return;
+	}
 
 	pidgin_separator(accountmenu);
 	accel_group = gtk_menu_get_accel_group(GTK_MENU(accountmenu));
@@ -8065,6 +8057,8 @@ pidgin_blist_update_sort_methods(void)
 	if ((gtkblist == NULL) || (gtkblist->ift == NULL))
 		return;
 
+	g_return_if_fail(m != NULL);
+
 	sortmenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Buddies/Sort Buddies"));
 
 	if (sortmenu == NULL)
@@ -8079,7 +8073,7 @@ pidgin_blist_update_sort_methods(void)
 	for (l = pidgin_blist_sort_methods; l; l = l->next) {
 		method = (PidginBlistSortMethod *) l->data;
 		menuitem = gtk_radio_menu_item_new_with_label(sl, _(method->name));
-		if (!strcmp(m, method->id))
+		if (g_str_equal(m, method->id))
 			activeitem = menuitem;
 		sl = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
 		gtk_menu_shell_append(GTK_MENU_SHELL(sortmenu), menuitem);
@@ -8090,4 +8084,3 @@ pidgin_blist_update_sort_methods(void)
 	if (activeitem)
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(activeitem), TRUE);
 }
-
diff --git a/pidgin/gtkcellrendererexpander.c b/pidgin/gtkcellrendererexpander.c
index dda5578f16..06d0f384f7 100644
--- a/pidgin/gtkcellrendererexpander.c
+++ b/pidgin/gtkcellrendererexpander.c
@@ -30,7 +30,6 @@
  */
 
 #include <gtk/gtk.h>
-#include <gtk/gtktreeview.h>
 #include "gtkcellrendererexpander.h"
 
 static void pidgin_cell_renderer_expander_get_property  (GObject                    *object,
diff --git a/pidgin/gtkcellrendererexpander.h b/pidgin/gtkcellrendererexpander.h
index 7b1aa4a2dc..983a9bd84a 100644
--- a/pidgin/gtkcellrendererexpander.h
+++ b/pidgin/gtkcellrendererexpander.h
@@ -21,7 +21,7 @@
 #ifndef _PIDGINCELLRENDEREREXPANDER_H_
 #define _PIDGINCELLRENDEREREXPANDER_H_
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/pidgin/gtkcellrendererprogress.h b/pidgin/gtkcellrendererprogress.h
index 9fc147d21a..d2853eef38 100644
--- a/pidgin/gtkcellrendererprogress.h
+++ b/pidgin/gtkcellrendererprogress.h
@@ -21,7 +21,7 @@
 #ifndef _PIDGINCELLRENDERERPROGRESS_H_
 #define _PIDGINCELLRENDERERPROGRESS_H_
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/pidgin/gtkcertmgr.c b/pidgin/gtkcertmgr.c
index c3d57ab1b0..66489946c8 100644
--- a/pidgin/gtkcertmgr.c
+++ b/pidgin/gtkcertmgr.c
@@ -144,12 +144,12 @@ static void
 tls_peers_mgmt_import_ok2_cb(gpointer data, const char *result)
 {
 	PurpleCertificate *crt = (PurpleCertificate *) data;
-	const char *id = result;
 
 	/* TODO: Perhaps prompt if you're overwriting a cert? */
 
 	/* Drop the certificate into the pool */
-	purple_certificate_pool_store(tpm_dat->tls_peers, id, crt);
+	if (result && *result)
+		purple_certificate_pool_store(tpm_dat->tls_peers, result, crt);
 
 	/* And this certificate is not needed any more */
 	purple_certificate_destroy(crt);
@@ -187,7 +187,7 @@ tls_peers_mgmt_import_ok_cb(gpointer data, const char *filename)
 		purple_request_input(tpm_dat,
 				     _("Certificate Import"),
 				     _("Specify a hostname"),
-				     _("Type the host name this certificate is for."),
+				     _("Type the host name for this certificate."),
 				     default_hostname,
 				     FALSE, /* Not multiline */
 				     FALSE, /* Not masked? */
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index d821ce3f43..5bde87410b 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -44,6 +44,7 @@
 
 #include "account.h"
 #include "cmds.h"
+#include "core.h"
 #include "debug.h"
 #include "idle.h"
 #include "imgstore.h"
@@ -329,7 +330,8 @@ debug_command_cb(PurpleConversation *conv,
 	PurpleCmdStatus status;
 
 	if (!g_ascii_strcasecmp(args[0], "version")) {
-		tmp = g_strdup_printf("me is using %s v%s.", "Pidgin", DISPLAY_VERSION);
+		tmp = g_strdup_printf("me is using Pidgin v%s with libpurple v%s.",
+				DISPLAY_VERSION, purple_core_get_version());
 		markup = g_markup_escape_text(tmp, -1);
 
 		status = purple_cmd_do_command(conv, tmp, markup, error);
@@ -957,6 +959,12 @@ menu_new_conv_cb(gpointer data, guint action, GtkWidget *widget)
 }
 
 static void
+menu_join_chat_cb(gpointer data, guint action, GtkWidget *widget)
+{
+	pidgin_blist_joinchat_show();
+}
+
+static void
 savelog_writefile_cb(void *user_data, const char *filename)
 {
 	PurpleConversation *conv = (PurpleConversation *)user_data;
@@ -1199,6 +1207,23 @@ menu_find_cb(gpointer data, guint action, GtkWidget *widget)
 	gtk_widget_grab_focus(s->entry);
 }
 
+#ifdef USE_VV
+static void 
+menu_initiate_media_call_cb(gpointer data, guint action, GtkWidget *widget)
+{
+	PidginWindow *win = (PidginWindow *)data;
+	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
+	PurpleAccount *account = purple_conversation_get_account(conv);
+
+	purple_prpl_initiate_media(account,
+			purple_conversation_get_name(conv),
+			action == 0 ? PURPLE_MEDIA_AUDIO :
+			action == 1 ? PURPLE_MEDIA_VIDEO :
+			action == 2 ? PURPLE_MEDIA_AUDIO |
+			PURPLE_MEDIA_VIDEO : PURPLE_MEDIA_NONE);
+}
+#endif
+
 static void
 menu_send_file_cb(gpointer data, guint action, GtkWidget *widget)
 {
@@ -1751,7 +1776,7 @@ create_chat_menu(PurpleConversation *conv, const char *who, PurpleConnection *gc
 			g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free);
 	}
 
-	button = pidgin_new_item_from_stock(menu, _("Last said"), GTK_STOCK_INDEX,
+	button = pidgin_new_item_from_stock(menu, _("Last Said"), GTK_STOCK_INDEX,
 						G_CALLBACK(menu_last_said_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 	g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free);
 	if (!get_mark_for_user(PIDGIN_CONVERSATION(conv), who))
@@ -2493,13 +2518,49 @@ pidgin_conv_get_tab_icons(PurpleConversation *conv)
 	return get_prpl_icon_list(account);
 }
 
+static const char *
+pidgin_conv_get_icon_stock(PurpleConversation *conv)
+{
+	PurpleAccount *account = NULL;
+	const char *stock = NULL;
+
+	g_return_val_if_fail(conv != NULL, NULL);
+
+	account = purple_conversation_get_account(conv);
+	g_return_val_if_fail(account != NULL, NULL);
+
+	/* Use the buddy icon, if possible */
+	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
+		const char *name = NULL;
+		PurpleBuddy *b;
+		name = purple_conversation_get_name(conv);
+		b = purple_find_buddy(account, name);
+		if (b != NULL) {
+			PurplePresence *p = purple_buddy_get_presence(b);
+			PurpleStatus *active = purple_presence_get_active_status(p);
+			PurpleStatusType *type = purple_status_get_type(active);
+			PurpleStatusPrimitive prim = purple_status_type_get_primitive(type);
+			stock = pidgin_stock_id_from_status_primitive(prim);
+		} else {
+			stock = PIDGIN_STOCK_STATUS_PERSON;
+		}
+	} else {
+		stock = PIDGIN_STOCK_STATUS_CHAT;
+	}
+
+	return stock;
+}
+
 static GdkPixbuf *
 pidgin_conv_get_icon(PurpleConversation *conv, GtkWidget *parent, const char *icon_size)
 {
 	PurpleAccount *account = NULL;
 	const char *name = NULL;
+	const char *stock = NULL;
 	GdkPixbuf *status = NULL;
 	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+	GtkIconSize size;
+
 	g_return_val_if_fail(conv != NULL, NULL);
 
 	account = purple_conversation_get_account(conv);
@@ -2512,40 +2573,17 @@ pidgin_conv_get_icon(PurpleConversation *conv, GtkWidget *parent, const char *ic
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
 		PurpleBuddy *b = purple_find_buddy(account, name);
 		if (b != NULL) {
-			PurplePresence *p = purple_buddy_get_presence(b);
 			/* I hate this hack.  It fixes a bug where the pending message icon
 			 * displays in the conv tab even though it shouldn't.
 			 * A better solution would be great. */
 			if (ops && ops->update)
 				ops->update(NULL, (PurpleBlistNode*)b);
-
-			/* XXX Seanegan: We really need a util function to return a pixbuf for a Presence to avoid all this switching */
-			if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AWAY))
-				status = pidgin_create_status_icon(PURPLE_STATUS_AWAY, parent, icon_size);
-			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_EXTENDED_AWAY))
-				status = pidgin_create_status_icon(PURPLE_STATUS_EXTENDED_AWAY, parent, icon_size);
-			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_OFFLINE))
-				status = pidgin_create_status_icon(PURPLE_STATUS_OFFLINE, parent, icon_size);
-			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AVAILABLE))
-				status = pidgin_create_status_icon(PURPLE_STATUS_AVAILABLE, parent, icon_size);
-			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_INVISIBLE))
-				status = pidgin_create_status_icon(PURPLE_STATUS_INVISIBLE, parent, icon_size);
-			else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_UNAVAILABLE))
-				status = pidgin_create_status_icon(PURPLE_STATUS_UNAVAILABLE, parent, icon_size);
 		}
 	}
 
-	/* If they don't have a buddy icon, then use the PRPL icon */
-	if (status == NULL) {
-		GtkIconSize size = gtk_icon_size_from_name(icon_size);
-		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
-			status = gtk_widget_render_icon (parent, PIDGIN_STOCK_STATUS_PERSON,
-					size, "GtkWidget");
-		} else {
-			status = gtk_widget_render_icon (parent, PIDGIN_STOCK_STATUS_CHAT,
-					size, "GtkWidget");
-		}
-	}
+	stock = pidgin_conv_get_icon_stock(conv);
+	size = gtk_icon_size_from_name(icon_size);
+	status = gtk_widget_render_icon (parent, stock, size, "GtkWidget");
 	return status;
 }
 
@@ -2563,9 +2601,9 @@ update_tab_icon(PurpleConversation *conv)
 	PidginConversation *gtkconv;
 	PidginWindow *win;
 	GList *l;
-	GdkPixbuf *status = NULL;
-	GdkPixbuf *infopane_status = NULL;
 	GdkPixbuf *emblem = NULL;
+	const char *status = NULL;
+	const char *infopane_status = NULL;
 
 	g_return_if_fail(conv != NULL);
 
@@ -2574,8 +2612,7 @@ update_tab_icon(PurpleConversation *conv)
 	if (conv != gtkconv->active_conv)
 		return;
 
-	status = pidgin_conv_get_tab_icon(conv, TRUE);
-	infopane_status = pidgin_conv_get_tab_icon(conv, FALSE);
+	status = infopane_status = pidgin_conv_get_icon_stock(conv);
 
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
 		PurpleBuddy *b = purple_find_buddy(conv->account, conv->name);
@@ -2585,8 +2622,8 @@ update_tab_icon(PurpleConversation *conv)
 
 	g_return_if_fail(status != NULL);
 
-	gtk_image_set_from_pixbuf(GTK_IMAGE(gtkconv->icon), status);
-	gtk_image_set_from_pixbuf(GTK_IMAGE(gtkconv->menu_icon), status);
+	g_object_set(G_OBJECT(gtkconv->icon), "stock", status, NULL);
+	g_object_set(G_OBJECT(gtkconv->menu_icon), "stock", status, NULL);
 
 	gtk_list_store_set(GTK_LIST_STORE(gtkconv->infopane_model),
 			&(gtkconv->infopane_iter),
@@ -2614,9 +2651,6 @@ update_tab_icon(PurpleConversation *conv)
 	gtk_widget_queue_resize(gtkconv->infopane);
 	gtk_widget_queue_draw(gtkconv->infopane);
 
-	if (status != NULL)
-		g_object_unref(status);
-
 	if (pidgin_conv_window_is_active_conversation(conv) &&
 		(purple_conversation_get_type(conv) != PURPLE_CONV_TYPE_IM ||
 		 gtkconv->u.im->anim == NULL))
@@ -2672,7 +2706,7 @@ redraw_icon(gpointer data)
 	scale_width = gdk_pixbuf_get_width(buf);
 	scale_height = gdk_pixbuf_get_height(buf);
 
-	gtk_widget_get_size_request(gtkconv->infopane_hbox, NULL, &size);
+	gtk_widget_get_size_request(gtkconv->u.im->icon_container, NULL, &size);
 	size = MIN(size, MIN(scale_width, scale_height));
 	size = CLAMP(size, BUDDYICON_SIZE_MIN, BUDDYICON_SIZE_MAX);
 
@@ -2730,13 +2764,22 @@ start_anim(GtkObject *obj, PidginConversation *gtkconv)
 static void
 remove_icon(GtkWidget *widget, PidginConversation *gtkconv)
 {
+	GList *children;
+	GtkWidget *event;
 	PurpleConversation *conv = gtkconv->active_conv;
 	PidginWindow *gtkwin;
 
 	g_return_if_fail(conv != NULL);
 
-	if (gtkconv->u.im->icon_container != NULL)
-		gtk_widget_destroy(gtkconv->u.im->icon_container);
+	gtk_widget_set_size_request(gtkconv->u.im->icon_container, -1, BUDDYICON_SIZE_MIN);
+	children = gtk_container_get_children(GTK_CONTAINER(gtkconv->u.im->icon_container));
+	if (children) {
+		/* We know there's only one child here. It'd be nice to shortcut to the
+		   event box, but we can't change the PidginConversation until 3.0 */
+		event = (GtkWidget *)children->data;
+		gtk_container_remove(GTK_CONTAINER(gtkconv->u.im->icon_container), event);
+		g_list_free(children);
+	}
 
 	if (gtkconv->u.im->anim != NULL)
 		g_object_unref(G_OBJECT(gtkconv->u.im->anim));
@@ -2751,7 +2794,6 @@ remove_icon(GtkWidget *widget, PidginConversation *gtkconv)
 	gtkconv->u.im->icon = NULL;
 	gtkconv->u.im->anim = NULL;
 	gtkconv->u.im->iter = NULL;
-	gtkconv->u.im->icon_container = NULL;
 	gtkconv->u.im->show_icon = FALSE;
 
 	gtkwin = gtkconv->win;
@@ -2812,7 +2854,7 @@ change_size_cb(GtkWidget *widget, PidginConversation *gtkconv)
 	PurpleConversation *conv = gtkconv->active_conv;
 	GSList *buddies;
 
-	gtk_widget_get_size_request(gtkconv->infopane_hbox, NULL, &size);
+	gtk_widget_get_size_request(gtkconv->u.im->icon_container, NULL, &size);
 
 	if (size == BUDDYICON_SIZE_MAX) {
 		size = BUDDYICON_SIZE_MIN;
@@ -2820,7 +2862,7 @@ change_size_cb(GtkWidget *widget, PidginConversation *gtkconv)
 		size = BUDDYICON_SIZE_MAX;
 	}
 
-	gtk_widget_set_size_request(gtkconv->infopane_hbox, -1, size);
+	gtk_widget_set_size_request(gtkconv->u.im->icon_container, -1, size);
 	pidgin_conv_update_buddy_icon(conv);
 
 	buddies = purple_find_buddies(purple_conversation_get_account(conv),
@@ -3052,16 +3094,13 @@ pidgin_conversations_fill_menu(GtkWidget *menu, GList *convs)
 		PurpleConversation *conv = (PurpleConversation*)l->data;
 		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 
-		GtkWidget *icon = gtk_image_new();
-		GdkPixbuf *pbuf = pidgin_conv_get_icon(conv, icon, PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC);
+		GtkWidget *icon = gtk_image_new_from_stock(pidgin_conv_get_icon_stock(conv),
+				gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC));
 		GtkWidget *item;
 		gchar *text = g_strdup_printf("%s (%d)",
 				gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)),
 				gtkconv->unseen_count);
 
-		gtk_image_set_from_pixbuf(GTK_IMAGE(icon), pbuf);
-		g_object_unref(pbuf);
-
 		item = gtk_image_menu_item_new_with_label(text);
 		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), icon);
 		g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(unseen_conv_menu_cb), conv);
@@ -3100,6 +3139,8 @@ static GtkItemFactoryEntry menu_items[] =
 
 	{ N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb,
 			0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW },
+	{ N_("/Conversation/Join a _Chat..."), "<CTL>C", menu_join_chat_cb,
+			0, "<StockItem>", PIDGIN_STOCK_CHAT },
 
 	{ "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL },
 
@@ -3112,6 +3153,17 @@ static GtkItemFactoryEntry menu_items[] =
 
 	{ "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL },
 
+#ifdef USE_VV
+	{ N_("/Conversation/M_edia"), NULL, NULL, 0, "<Branch>", NULL },
+
+	{ N_("/Conversation/Media/_Audio Call"), NULL, menu_initiate_media_call_cb, 0,
+		"<StockItem>", PIDGIN_STOCK_TOOLBAR_AUDIO_CALL },
+	{ N_("/Conversation/Media/_Video Call"), NULL, menu_initiate_media_call_cb, 1,
+		"<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL },
+	{ N_("/Conversation/Media/Audio\\/Video _Call"), NULL, menu_initiate_media_call_cb, 2,
+		"<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL },
+#endif
+
 	{ N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE },
 	{ N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb,
 			0, "<Item>", NULL },
@@ -3249,7 +3301,7 @@ populate_menu_with_options(GtkWidget *menu, PidginConversation *gtkconv, gboolea
 				purple_blist_node_set_flags((PurpleBlistNode *)buddy,
 						PURPLE_BLIST_NODE_FLAG_NO_SAVE);
 				g_object_set_data_full(G_OBJECT(gtkconv->imhtml), "transient_buddy",
-						buddy, (GDestroyNotify)purple_blist_remove_buddy);
+						buddy, (GDestroyNotify)purple_buddy_destroy);
 			}
 		}
 	}
@@ -3282,6 +3334,62 @@ populate_menu_with_options(GtkWidget *menu, PidginConversation *gtkconv, gboolea
 }
 
 static void
+regenerate_media_items(PidginWindow *win)
+{
+#ifdef USE_VV
+	PurpleAccount *account;
+	PurpleConversation *conv;
+
+	conv = pidgin_conv_window_get_active_conversation(win);
+
+	if (conv == NULL) {
+		purple_debug_error("gtkconv", "couldn't get active conversation"
+				" when regenerating media items\n");
+		return;
+	}
+
+	account = purple_conversation_get_account(conv);
+
+	if (account == NULL) {
+		purple_debug_error("gtkconv", "couldn't get account when"
+				" regenerating media items\n");
+		return;
+	}
+
+	/*
+	 * Check if account support voice and/or calls, and
+	 * if the current buddy	supports it.
+	 */
+	if (account != NULL && purple_conversation_get_type(conv)
+			== PURPLE_CONV_TYPE_IM) {
+		PurpleMediaCaps caps =
+				purple_prpl_get_media_caps(account,
+				purple_conversation_get_name(conv));
+
+		gtk_widget_set_sensitive(win->audio_call,
+				caps & PURPLE_MEDIA_CAPS_AUDIO
+				? TRUE : FALSE);
+		gtk_widget_set_sensitive(win->video_call,
+				caps & PURPLE_MEDIA_CAPS_VIDEO
+				? TRUE : FALSE);
+		gtk_widget_set_sensitive(win->audio_video_call, 
+				caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO
+				? TRUE : FALSE);
+	} else if (purple_conversation_get_type(conv)
+			== PURPLE_CONV_TYPE_CHAT) {
+		/* for now, don't care about chats... */
+		gtk_widget_set_sensitive(win->audio_call, FALSE);
+		gtk_widget_set_sensitive(win->video_call, FALSE);
+		gtk_widget_set_sensitive(win->audio_video_call, FALSE);
+	} else {
+		gtk_widget_set_sensitive(win->audio_call, FALSE);
+		gtk_widget_set_sensitive(win->video_call, FALSE);
+		gtk_widget_set_sensitive(win->audio_video_call, FALSE);
+	}							
+#endif
+}
+
+static void
 regenerate_options_items(PidginWindow *win)
 {
 	GtkWidget *menu;
@@ -3366,6 +3474,7 @@ regenerate_plugins_items(PidginWindow *win)
 static void menubar_activated(GtkWidget *item, gpointer data)
 {
 	PidginWindow *win = data;
+	regenerate_media_items(win);
 	regenerate_options_items(win);
 	regenerate_plugins_items(win);
 
@@ -3422,6 +3531,18 @@ setup_menubar(PidginWindow *win)
 		gtk_item_factory_get_widget(win->menu.item_factory,
 		                            N_("/Conversation/View Log"));
 
+#ifdef USE_VV
+	win->audio_call =
+		gtk_item_factory_get_widget(win->menu.item_factory,
+					    N_("/Conversation/Media/Audio Call"));
+	win->video_call =
+		gtk_item_factory_get_widget(win->menu.item_factory,
+					    N_("/Conversation/Media/Video Call"));
+	win->audio_video_call =
+		gtk_item_factory_get_widget(win->menu.item_factory,
+					    N_("/Conversation/Media/Audio\\/Video Call"));
+#endif
+	
 	/* --- */
 
 	win->menu.send_file =
@@ -3899,12 +4020,9 @@ generate_send_to_items(PidginWindow *win)
 	update_send_to_selection(win);
 }
 
-static GdkPixbuf *
+static const char *
 get_chat_buddy_status_icon(PurpleConvChat *chat, const char *name, PurpleConvChatBuddyFlags flags)
 {
-        PidginConversation *gtkconv = PIDGIN_CONVERSATION(chat->conv);
-	GdkPixbuf *pixbuf, *scale, *scale2;
-	char *filename;
 	const char *image = NULL;
 
 	if (flags & PURPLE_CBFLAGS_FOUNDER) {
@@ -3920,28 +4038,7 @@ get_chat_buddy_status_icon(PurpleConvChat *chat, const char *name, PurpleConvCha
 	} else {
 		return NULL;
 	}
-
-	pixbuf = gtk_widget_render_icon (gtkconv->tab_cont, image, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL),
-				 	 "GtkTreeView");
-
-	if (!pixbuf)
-		return NULL;
-
-	scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
-	g_object_unref(pixbuf);
-
-	if (flags && purple_conv_chat_is_user_ignored(chat, name)) {
-/* TODO: the .../status/default directory isn't installed, should it be? */
-		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", "default", "ignored.png", NULL);
-		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-		g_free(filename);
-		scale2 = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
-		g_object_unref(pixbuf);
-		gdk_pixbuf_composite(scale2, scale, 0, 0, 16, 16, 0, 0, 1, 1, GDK_INTERP_BILINEAR, 192);
-		g_object_unref(scale2);
-	}
-
-	return scale;
+	return image;
 }
 
 static void
@@ -3953,7 +4050,7 @@ add_chat_buddy_common(PurpleConversation *conv, PurpleConvChatBuddy *cb, const c
 	PurpleConnection *gc;
 	PurplePluginProtocolInfo *prpl_info;
 	GtkListStore *ls;
-	GdkPixbuf *pixbuf;
+	const char *stock;
 	GtkTreeIter iter;
 	gboolean is_me = FALSE;
 	gboolean is_buddy;
@@ -3975,7 +4072,7 @@ add_chat_buddy_common(PurpleConversation *conv, PurpleConvChatBuddy *cb, const c
 
 	ls = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list)));
 
-	pixbuf = get_chat_buddy_status_icon(chat, name, flags);
+	stock = get_chat_buddy_status_icon(chat, name, flags);
 
 	if (!strcmp(chat->nick, purple_normalize(conv->account, old_name != NULL ? old_name : name)))
 		is_me = TRUE;
@@ -3992,6 +4089,11 @@ add_chat_buddy_common(PurpleConversation *conv, PurpleConvChatBuddy *cb, const c
 				"send-name");
 		g_object_get(tag, "foreground-gdk", &color, NULL);
 	} else {
+		GtkTextTag *tag;
+		if ((tag = get_buddy_tag(conv, name, 0, FALSE)))
+			g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_NORMAL, NULL);
+		if ((tag = get_buddy_tag(conv, name, PURPLE_MESSAGE_NICK, FALSE)))
+			g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_NORMAL, NULL);
 		color = (GdkColor*)get_nick_color(gtkconv, name);
 	}
 
@@ -4005,7 +4107,7 @@ add_chat_buddy_common(PurpleConversation *conv, PurpleConvChatBuddy *cb, const c
 * Inserting in the "wrong" location has no visible ill effects. - F.P.
 */
 			-1, /* "row" */
-			CHAT_USERS_ICON_COLUMN,  pixbuf,
+			CHAT_USERS_ICON_STOCK_COLUMN,  stock,
 			CHAT_USERS_ALIAS_COLUMN, alias,
 			CHAT_USERS_ALIAS_KEY_COLUMN, alias_key,
 			CHAT_USERS_NAME_COLUMN,  name,
@@ -4016,7 +4118,7 @@ add_chat_buddy_common(PurpleConversation *conv, PurpleConvChatBuddy *cb, const c
 #else
 	gtk_list_store_append(ls, &iter);
 	gtk_list_store_set(ls, &iter,
-			CHAT_USERS_ICON_COLUMN,  pixbuf,
+			CHAT_USERS_ICON_STOCK_COLUMN,  stock,
 			CHAT_USERS_ALIAS_COLUMN, alias,
 			CHAT_USERS_ALIAS_KEY_COLUMN, alias_key,
 			CHAT_USERS_NAME_COLUMN,  name,
@@ -4026,8 +4128,6 @@ add_chat_buddy_common(PurpleConversation *conv, PurpleConvChatBuddy *cb, const c
 			-1);
 #endif
 
-	if (pixbuf)
-		g_object_unref(pixbuf);
 	if (is_me && color)
 		gdk_color_free(color);
 	g_free(alias_key);
@@ -4273,7 +4373,11 @@ static void topic_callback(GtkWidget *w, PidginConversation *gtkconv)
 		return;
 	}
 
-	gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), current_topic);
+	if (current_topic)
+		gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), current_topic);
+	else
+		gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), "");
+
 	prpl_info->set_chat_topic(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)),
 			new_topic);
 
@@ -4469,19 +4573,26 @@ buddy_cb_common(PurpleBuddy *buddy, PurpleConversation *conv, gboolean is_buddy)
 }
 
 static void
-buddy_added_cb(PurpleBuddy *buddy, PurpleConversation *conv)
+buddy_added_cb(PurpleBlistNode *node, PurpleConversation *conv)
 {
-	buddy_cb_common(buddy, conv, TRUE);
+	if (!PURPLE_BLIST_NODE_IS_BUDDY(node))
+		return;
+
+	buddy_cb_common(PURPLE_BUDDY(node), conv, TRUE);
 }
 
 static void
-buddy_removed_cb(PurpleBuddy *buddy, PurpleConversation *conv)
+buddy_removed_cb(PurpleBlistNode *node, PurpleConversation *conv)
 {
+	if (!PURPLE_BLIST_NODE_IS_BUDDY(node))
+		return;
+
 	/* If there's another buddy for the same "dude" on the list, do nothing. */
-	if (purple_find_buddy(buddy->account, buddy->name) != NULL)
+	if (purple_find_buddy(purple_buddy_get_account(PURPLE_BUDDY(node)),
+		                  purple_buddy_get_name(PURPLE_BUDDY(node))) != NULL)
 		return;
 
-	buddy_cb_common(buddy, conv, FALSE);
+	buddy_cb_common(PURPLE_BUDDY(node), conv, FALSE);
 }
 
 static void send_menu_cb(GtkWidget *widget, PidginConversation *gtkconv)
@@ -4595,6 +4706,7 @@ setup_chat_topic(PidginConversation *gtkconv, GtkWidget *vbox)
 		gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
 		gtkchat->topic_text = gtk_entry_new();
+		gtk_widget_set_size_request(gtkchat->topic_text, -1, BUDDYICON_SIZE_MIN);
 
 		if(prpl_info->set_chat_topic == NULL) {
 			gtk_editable_set_editable(GTK_EDITABLE(gtkchat->topic_text), FALSE);
@@ -4674,16 +4786,18 @@ setup_chat_userlist(PidginConversation *gtkconv, GtkWidget *hpaned)
 
 	ls = gtk_list_store_new(CHAT_USERS_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING,
 							G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT,
-							GDK_TYPE_COLOR, G_TYPE_INT);
+							GDK_TYPE_COLOR, G_TYPE_INT, G_TYPE_STRING);
 	gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(ls), CHAT_USERS_ALIAS_KEY_COLUMN,
 									sort_chat_users, NULL, NULL);
 
 	list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(ls));
 
 	rend = gtk_cell_renderer_pixbuf_new();
-
+	g_object_set(G_OBJECT(rend),
+				 "stock-size", gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL),
+				 NULL);
 	col = gtk_tree_view_column_new_with_attributes(NULL, rend,
-												   "pixbuf", CHAT_USERS_ICON_COLUMN, NULL);
+			"stock-id", CHAT_USERS_ICON_STOCK_COLUMN, NULL);
 	gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list), col);
 	ul_width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/userlist_width");
@@ -4710,7 +4824,7 @@ setup_chat_userlist(PidginConversation *gtkconv, GtkWidget *hpaned)
 				 "foreground-set", TRUE,
 				 "weight-set", TRUE,
 				 NULL);
-        g_object_set(G_OBJECT(rend), "editable", TRUE, NULL);
+	g_object_set(G_OBJECT(rend), "editable", TRUE, NULL);
 
 	col = gtk_tree_view_column_new_with_attributes(NULL, rend,
 	                                               "text", CHAT_USERS_ALIAS_COLUMN,
@@ -4718,9 +4832,9 @@ setup_chat_userlist(PidginConversation *gtkconv, GtkWidget *hpaned)
 	                                               "weight", CHAT_USERS_WEIGHT_COLUMN,
 	                                               NULL);
 
-	purple_signal_connect(blist_handle, "buddy-added",
+	purple_signal_connect(blist_handle, "blist-node-added",
 						gtkchat, PURPLE_CALLBACK(buddy_added_cb), conv);
-	purple_signal_connect(blist_handle, "buddy-removed",
+	purple_signal_connect(blist_handle, "blist-node-removed",
 						gtkchat, PURPLE_CALLBACK(buddy_removed_cb), conv);
 	purple_signal_connect(blist_handle, "blist-node-aliased",
 						gtkchat, PURPLE_CALLBACK(blist_node_aliased_cb), conv);
@@ -4801,7 +4915,7 @@ setup_common_pane(PidginConversation *gtkconv)
 		pidgin_conv_create_tooltip, NULL);
 
 	gtkconv->infopane = gtk_cell_view_new();
-	gtkconv->infopane_model = gtk_list_store_new(CONV_NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF);
+	gtkconv->infopane_model = gtk_list_store_new(CONV_NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF);
 	gtk_cell_view_set_model(GTK_CELL_VIEW(gtkconv->infopane),
 				GTK_TREE_MODEL(gtkconv->infopane_model));
 	g_object_unref(gtkconv->infopane_model);
@@ -4811,21 +4925,45 @@ setup_common_pane(PidginConversation *gtkconv)
 	gtk_cell_view_set_displayed_row(GTK_CELL_VIEW(gtkconv->infopane), path);
 	gtk_tree_path_free(path);
 
-	if ((buddy = purple_find_buddy(purple_conversation_get_account(conv),
-					purple_conversation_get_name(conv))) != NULL) {
-		PurpleContact *contact = purple_buddy_get_contact(buddy);
-		if (contact) {
-			buddyicon_size = purple_blist_node_get_int((PurpleBlistNode*)contact, "pidgin-infopane-iconsize");
+	if (chat) {
+		/* This empty widget is used to ensure that the infopane is consistently
+		   sized for chat windows. The correct fix is to put an icon in the chat
+		   window as well, because that would make "Set Custom Icon" consistent
+		   for both the buddy list and the chat window, but PidginConversation
+		   is pretty much stuck until 3.0. */
+		GtkWidget *sizing_vbox;
+		sizing_vbox = gtk_vbox_new(FALSE, 0);
+		gtk_widget_set_size_request(sizing_vbox, -1, BUDDYICON_SIZE_MIN);
+		gtk_box_pack_start(GTK_BOX(gtkconv->infopane_hbox), sizing_vbox, FALSE, FALSE, 0);
+		gtk_widget_show(sizing_vbox);
+	}
+	else {
+		gtkconv->u.im->icon_container = gtk_vbox_new(FALSE, 0);
+
+		if ((buddy = purple_find_buddy(purple_conversation_get_account(conv),
+						purple_conversation_get_name(conv))) != NULL) {
+			PurpleContact *contact = purple_buddy_get_contact(buddy);
+			if (contact) {
+				buddyicon_size = purple_blist_node_get_int((PurpleBlistNode*)contact, "pidgin-infopane-iconsize");
+			}
 		}
+		buddyicon_size = CLAMP(buddyicon_size, BUDDYICON_SIZE_MIN, BUDDYICON_SIZE_MAX);
+		gtk_widget_set_size_request(gtkconv->u.im->icon_container, -1, buddyicon_size);
+
+		gtk_box_pack_start(GTK_BOX(gtkconv->infopane_hbox),
+				   gtkconv->u.im->icon_container, FALSE, FALSE, 0);
+
+		gtk_widget_show(gtkconv->u.im->icon_container);
 	}
-	buddyicon_size = CLAMP(buddyicon_size, BUDDYICON_SIZE_MIN, BUDDYICON_SIZE_MAX);
-	gtk_widget_set_size_request(gtkconv->infopane_hbox, -1, buddyicon_size);
+
 	gtk_widget_show(gtkconv->infopane);
 
 	rend = gtk_cell_renderer_pixbuf_new();
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, FALSE);
-	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "pixbuf", CONV_ICON_COLUMN, NULL);
-	g_object_set(rend, "xalign", 0.0, "xpad", 6, "ypad", 0, NULL);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "stock-id", CONV_ICON_COLUMN, NULL);
+	g_object_set(rend, "xalign", 0.0, "xpad", 6, "ypad", 0,
+			"stock-size", gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL),
+			NULL);
 
 	rend = gtk_cell_renderer_text_new();
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, TRUE);
@@ -4870,6 +5008,7 @@ setup_common_pane(PidginConversation *gtkconv)
 
 	gtk_widget_set_name(gtkconv->imhtml, "pidgin_conv_imhtml");
 	gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml),TRUE);
+	g_object_set_data(G_OBJECT(gtkconv->imhtml), "gtkconv", gtkconv);
 
 	gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw),
 	                               &imhtml_sw_hscroll, NULL);
@@ -4939,11 +5078,17 @@ conv_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
 	PurpleConversation *conv = gtkconv->active_conv;
 	PidginWindow *win = gtkconv->win;
 	PurpleConversation *c;
+	PurpleAccount *convaccount = purple_conversation_get_account(conv);
+	PurpleConnection *gc = purple_account_get_connection(convaccount);
+	PurplePluginProtocolInfo *prpl_info = gc ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL;
+
 	if (sd->target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE))
 	{
 		PurpleBlistNode *n = NULL;
 		PurpleBuddy *b;
 		PidginConversation *gtkconv = NULL;
+		PurpleAccount *buddyaccount;
+		const char *buddyname;
 
 		n = *(PurpleBlistNode **)sd->data;
 
@@ -4954,32 +5099,44 @@ conv_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
 		else
 			return;
 
+		buddyaccount = purple_buddy_get_account(b);
+		buddyname = purple_buddy_get_name(b);
 		/*
-		 * If we already have an open conversation with this buddy, then
-		 * just move the conv to this window.  Otherwise, create a new
-		 * conv and add it to this window.
+		 * If a buddy is dragged to a chat window of the same protocol,
+		 * invite him to the chat.
 		 */
-		c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, b->account);
-		if (c != NULL) {
-			PidginWindow *oldwin;
-			gtkconv = PIDGIN_CONVERSATION(c);
-			oldwin = gtkconv->win;
-			if (oldwin != win) {
-				pidgin_conv_window_remove_gtkconv(oldwin, gtkconv);
-				pidgin_conv_window_add_gtkconv(win, gtkconv);
-			}
+		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT &&
+				prpl_info && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, chat_invite) &&
+				strcmp(purple_account_get_protocol_id(convaccount),
+					purple_account_get_protocol_id(buddyaccount)) == 0) {
+		    purple_conv_chat_invite_user(PURPLE_CONV_CHAT(conv), buddyname, NULL, TRUE);
 		} else {
-			c = purple_conversation_new(PURPLE_CONV_TYPE_IM, b->account, b->name);
-			gtkconv = PIDGIN_CONVERSATION(c);
-			if (gtkconv->win != win)
-			{
-				pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
-				pidgin_conv_window_add_gtkconv(win, gtkconv);
+			/*
+			 * If we already have an open conversation with this buddy, then
+			 * just move the conv to this window.  Otherwise, create a new
+			 * conv and add it to this window.
+			 */
+			c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, buddyname, buddyaccount);
+			if (c != NULL) {
+				PidginWindow *oldwin;
+				gtkconv = PIDGIN_CONVERSATION(c);
+				oldwin = gtkconv->win;
+				if (oldwin != win) {
+					pidgin_conv_window_remove_gtkconv(oldwin, gtkconv);
+					pidgin_conv_window_add_gtkconv(win, gtkconv);
+				}
+			} else {
+				c = purple_conversation_new(PURPLE_CONV_TYPE_IM, buddyaccount, buddyname);
+				gtkconv = PIDGIN_CONVERSATION(c);
+				if (gtkconv->win != win) {
+					pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
+					pidgin_conv_window_add_gtkconv(win, gtkconv);
+				}
 			}
-		}
 
-		/* Make this conversation the active conversation */
-		pidgin_conv_window_switch_gtkconv(win, gtkconv);
+			/* Make this conversation the active conversation */
+			pidgin_conv_window_switch_gtkconv(win, gtkconv);
+		}
 
 		gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
 	}
@@ -4998,15 +5155,22 @@ conv_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
 				purple_notify_error(win, NULL,
 					_("You are not currently signed on with an account that "
 					  "can add that buddy."), NULL);
-			}
-			else
-			{
-				c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username);
-				gtkconv = PIDGIN_CONVERSATION(c);
-				if (gtkconv->win != win)
-				{
-					pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
-					pidgin_conv_window_add_gtkconv(win, gtkconv);
+			} else {
+				/*
+				 * If a buddy is dragged to a chat window of the same protocol,
+				 * invite him to the chat.
+				 */
+				if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT &&
+						prpl_info && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, chat_invite) &&
+						strcmp(purple_account_get_protocol_id(convaccount), protocol) == 0) {
+					purple_conv_chat_invite_user(PURPLE_CONV_CHAT(conv), username, NULL, TRUE);
+				} else {
+					c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username);
+					gtkconv = PIDGIN_CONVERSATION(c);
+					if (gtkconv->win != win) {
+						pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
+						pidgin_conv_window_add_gtkconv(win, gtkconv);
+					}
 				}
 			}
 		}
@@ -5018,7 +5182,7 @@ conv_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
 	}
 	else if (sd->target == gdk_atom_intern("text/uri-list", FALSE)) {
 		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
-			pidgin_dnd_file_manage(sd, purple_conversation_get_account(conv), purple_conversation_get_name(conv));
+			pidgin_dnd_file_manage(sd, convaccount, purple_conversation_get_name(conv));
 		gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
 	}
 	else
@@ -5065,7 +5229,8 @@ buddy_update_cb(PurpleBlistNode *bnode, gpointer null)
 	GList *list;
 
 	g_return_if_fail(bnode);
-	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(bnode));
+	if (!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
+		return;
 
 	for (list = pidgin_conv_windows_get_list(); list; list = list->next)
 	{
@@ -5280,6 +5445,7 @@ received_im_msg_cb(PurpleAccount *account, char *sender, char *message,
 {
 	PurpleConversationUiOps *ui_ops = pidgin_conversations_get_conv_ui_ops();
 	gboolean hide = FALSE;
+	guint timer;
 
 	/* create hidden conv if hide_new pref is always */
 	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always") == 0)
@@ -5303,6 +5469,13 @@ received_im_msg_cb(PurpleAccount *account, char *sender, char *message,
 		purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
 		ui_ops->create_conversation = pidgin_conv_new;
 	}
+
+	/* Somebody wants to keep this conversation around, so don't time it out */
+	timer = GPOINTER_TO_INT(purple_conversation_get_data(conv, "close-timer"));
+	if (timer) {
+		purple_timeout_remove(timer);
+		purple_conversation_set_data(conv, "close-timer", GINT_TO_POINTER(0));
+	}
 }
 
 static void
@@ -5534,38 +5707,6 @@ str_embed_direction_chars(char **str)
 #endif
 }
 
-/* Returns true if the given HTML contains RTL text */
-static gboolean
-html_is_rtl(const char *html)
-{
-	GData *attributes;
-	const gchar *start, *end;
-	gboolean res = FALSE;
-
-	if (purple_markup_find_tag("span", html, &start, &end, &attributes))
-	{
-		/* tmp is a member of attributes and is free with g_datalist_clear call */
-		const char *tmp = g_datalist_get_data(&attributes, "dir");
-		if (tmp && !g_ascii_strcasecmp(tmp, "RTL"))
-			res = TRUE;
-		if (!res)
-		{
-			tmp = g_datalist_get_data(&attributes, "style");
-			if (tmp)
-			{
-				char *tmp2 = purple_markup_get_css_property(tmp, "direction");
-				if (tmp2 && !g_ascii_strcasecmp(tmp2, "RTL"))
-					res = TRUE;
-				g_free(tmp2);
-			}
-
-		}
-		g_datalist_clear(&attributes);
-	}
-	return res;
-}
-
-
 static void
 pidgin_conv_write_conv(PurpleConversation *conv, const char *name, const char *alias,
 						const char *message, PurpleMessageFlags flags,
@@ -5727,7 +5868,7 @@ pidgin_conv_write_conv(PurpleConversation *conv, const char *name, const char *a
 	}
 
 	/* Bi-Directional support - set timestamp direction using unicode characters */
-	is_rtl_message = html_is_rtl(message);
+	is_rtl_message = purple_markup_is_rtl(message);
 	/* Enforce direction only if message is RTL - doesn't effect LTR users */
 	if (is_rtl_message)
 		str_embed_direction_chars(&mdate);
@@ -5996,6 +6137,7 @@ pidgin_conv_chat_rename_user(PurpleConversation *conv, const char *old_name,
 	PurpleConvChatBuddy *cbuddy;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
+	GtkTextTag *tag;
 	int f = 1;
 
 	chat    = PURPLE_CONV_CHAT(conv);
@@ -6023,6 +6165,11 @@ pidgin_conv_chat_rename_user(PurpleConversation *conv, const char *old_name,
 		g_free(val);
 	}
 
+	if ((tag = get_buddy_tag(conv, old_name, 0, FALSE)))
+		g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, NULL);
+	if ((tag = get_buddy_tag(conv, old_name, PURPLE_MESSAGE_NICK, FALSE)))
+		g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, NULL);
+
 	if (!purple_conv_chat_find_user(chat, old_name))
 		return;
 
@@ -6045,6 +6192,7 @@ pidgin_conv_chat_remove_users(PurpleConversation *conv, GList *users)
 	char tmp[BUF_LONG];
 	int num_users;
 	gboolean f;
+	GtkTextTag *tag;
 
 	chat    = PURPLE_CONV_CHAT(conv);
 	gtkconv = PIDGIN_CONVERSATION(conv);
@@ -6077,6 +6225,11 @@ pidgin_conv_chat_remove_users(PurpleConversation *conv, GList *users)
 
 			g_free(val);
 		} while (f);
+
+		if ((tag = get_buddy_tag(conv, l->data, 0, FALSE)))
+			g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, NULL);
+		if ((tag = get_buddy_tag(conv, l->data, PURPLE_MESSAGE_NICK, FALSE)))
+			g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, NULL);
 	}
 
 	g_snprintf(tmp, sizeof(tmp),
@@ -6233,6 +6386,10 @@ pidgin_conv_custom_smiley_write(PurpleConversation *conv, const char *smile,
 	if (!smiley)
 		return;
 
+	smiley->data = g_realloc(smiley->data, smiley->datasize + size);
+	g_memmove((guchar *)smiley->data + smiley->datasize, data, size);
+	smiley->datasize += size;
+
 	loader = smiley->loader;
 	if (!loader)
 		return;
@@ -6404,7 +6561,7 @@ gray_stuff_out(PidginConversation *gtkconv)
 			buttons |= GTK_IMHTML_CUSTOM_SMILEY;
 		else
 			buttons &= ~GTK_IMHTML_CUSTOM_SMILEY;
-
+		
 		gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->entry), buttons);
 		if (account != NULL)
 			gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(gtkconv->toolbar), purple_account_get_protocol_id(account));
@@ -6729,7 +6886,8 @@ static void
 wrote_msg_update_unseen_cb(PurpleAccount *account, const char *who, const char *message,
 		PurpleConversation *conv, PurpleMessageFlags flags, gpointer null)
 {
-	if (conv == NULL || PIDGIN_IS_PIDGIN_CONVERSATION(conv))
+	PidginConversation *gtkconv = conv ? PIDGIN_CONVERSATION(conv) : NULL;
+	if (conv == NULL || (gtkconv && gtkconv->win != hidden_convwin))
 		return;
 	if (flags & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV)) {
 		PidginUnseenState unseen = PIDGIN_UNSEEN_NONE;
@@ -6798,6 +6956,7 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 
 	GdkPixbuf *buf;
 
+	GList *children;
 	GtkWidget *event;
 	GdkPixbuf *scale;
 	int scale_width, scale_height;
@@ -6825,9 +6984,14 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
 
 	/* Remove the current icon stuff */
-	if (gtkconv->u.im->icon_container != NULL)
-		gtk_widget_destroy(gtkconv->u.im->icon_container);
-	gtkconv->u.im->icon_container = NULL;
+	children = gtk_container_get_children(GTK_CONTAINER(gtkconv->u.im->icon_container));
+	if (children) {
+		/* We know there's only one child here. It'd be nice to shortcut to the
+		   event box, but we can't change the PidginConversation until 3.0 */
+		event = (GtkWidget *)children->data;
+		gtk_container_remove(GTK_CONTAINER(gtkconv->u.im->icon_container), event);
+		g_list_free(children);
+	}
 
 	if (gtkconv->u.im->anim != NULL)
 		g_object_unref(G_OBJECT(gtkconv->u.im->anim));
@@ -6868,12 +7032,20 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 		icon = purple_conv_im_get_icon(PURPLE_CONV_IM(conv));
 
 		if (icon == NULL)
+		{
+			gtk_widget_set_size_request(gtkconv->u.im->icon_container,
+			                            -1, BUDDYICON_SIZE_MIN);
 			return;
+		}
 
 		data = purple_buddy_icon_get_data(icon, &len);
 
 		if (data == NULL)
+		{
+			gtk_widget_set_size_request(gtkconv->u.im->icon_container,
+			                            -1, BUDDYICON_SIZE_MIN);
 			return;
+		}
 	}
 
 	loader = gdk_pixbuf_loader_new();
@@ -6915,7 +7087,7 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 	scale_width = gdk_pixbuf_get_width(buf);
 	scale_height = gdk_pixbuf_get_height(buf);
 
-	gtk_widget_get_size_request(gtkconv->infopane_hbox, NULL, &size);
+	gtk_widget_get_size_request(gtkconv->u.im->icon_container, NULL, &size);
 	size = MIN(size, MIN(scale_width, scale_height));
 
 	/* Some sanity checks */
@@ -6934,7 +7106,6 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 	g_object_unref(buf);
 	if (pidgin_gdk_pixbuf_is_opaque(scale))
 		pidgin_gdk_pixbuf_make_round(scale);
-	gtkconv->u.im->icon_container = gtk_vbox_new(FALSE, 0);
 
 	event = gtk_event_box_new();
 	gtk_container_add(GTK_CONTAINER(gtkconv->u.im->icon_container), event);
@@ -6955,11 +7126,6 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 
 	g_object_unref(G_OBJECT(scale));
 
-	gtk_box_pack_start(GTK_BOX(gtkconv->infopane_hbox),
-			   gtkconv->u.im->icon_container, FALSE, FALSE, 0);
-
-	gtk_widget_show(gtkconv->u.im->icon_container);
-
 	/* The buddy icon code needs badly to be fixed. */
 	if(pidgin_conv_window_is_active_conversation(conv))
 	{
@@ -7442,7 +7608,7 @@ update_buddy_status_changed(PurpleBuddy *buddy, PurpleStatus *old, PurpleStatus
 	}
 
 	/* In case a conversation is started after the buddy has signed-on/off */
-	g_timeout_add(11000, (GSourceFunc)update_buddy_status_timeout, buddy);
+	purple_timeout_add_seconds(11, (GSourceFunc)update_buddy_status_timeout, buddy);
 }
 
 static void
@@ -7918,9 +8084,9 @@ pidgin_conversations_init(void)
                         handle, PURPLE_CALLBACK(account_status_changed_cb), NULL);
 
 	/* Callbacks to update a conversation */
-	purple_signal_connect(blist_handle, "buddy-added", handle,
+	purple_signal_connect(blist_handle, "blist-node-added", handle,
 						G_CALLBACK(buddy_update_cb), NULL);
-	purple_signal_connect(blist_handle, "buddy-removed", handle,
+	purple_signal_connect(blist_handle, "blist-node-removed", handle,
 						G_CALLBACK(buddy_update_cb), NULL);
 	purple_signal_connect(blist_handle, "buddy-signed-on",
 						handle, PURPLE_CALLBACK(update_buddy_sign), "on");
@@ -8086,15 +8252,11 @@ do_close(GtkWidget *w, int resp, PidginWindow *win)
 static void
 build_warn_close_dialog(PidginWindow *gtkwin)
 {
-	GtkWidget *label;
-	GtkWidget *vbox, *hbox;
-	GtkWidget *img;
+	GtkWidget *label, *vbox, *hbox, *img;
 
 	g_return_if_fail(warn_close_dialog == NULL);
 
-
-	warn_close_dialog = gtk_dialog_new_with_buttons(
-							_("Confirm close"),
+	warn_close_dialog = gtk_dialog_new_with_buttons(_("Confirm close"),
 							GTK_WINDOW(gtkwin->window), GTK_DIALOG_MODAL,
 							GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 							GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
@@ -8217,6 +8379,9 @@ gtkconv_set_unseen(PidginConversation *gtkconv, PidginUnseenState state)
 			gtkconv->unseen_state = state;
 	}
 
+	purple_conversation_set_data(gtkconv->active_conv, "unseen-count", GINT_TO_POINTER(gtkconv->unseen_count));
+	purple_conversation_set_data(gtkconv->active_conv, "unseen-state", GINT_TO_POINTER(gtkconv->unseen_state));
+
 	purple_conversation_update(gtkconv->active_conv, PURPLE_CONV_UPDATE_UNSEEN);
 }
 
@@ -9319,6 +9484,12 @@ pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 	/* Status icon. */
 	gtkconv->icon = gtk_image_new();
 	gtkconv->menu_icon = gtk_image_new();
+	g_object_set(G_OBJECT(gtkconv->icon),
+			"icon-size", gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC),
+			NULL);
+	g_object_set(G_OBJECT(gtkconv->menu_icon),
+			"icon-size", gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC),
+			NULL);
 	gtk_widget_show(gtkconv->icon);
 	update_tab_icon(conv);
 
diff --git a/pidgin/gtkconv.h b/pidgin/gtkconv.h
index f94b6efc4a..afe2a21651 100644
--- a/pidgin/gtkconv.h
+++ b/pidgin/gtkconv.h
@@ -51,6 +51,7 @@ enum {
 	CHAT_USERS_FLAGS_COLUMN,
 	CHAT_USERS_COLOR_COLUMN,
 	CHAT_USERS_WEIGHT_COLUMN,
+	CHAT_USERS_ICON_STOCK_COLUMN,   /** @since 2.6.0 */
 	CHAT_USERS_COLUMNS
 };
 
diff --git a/pidgin/gtkconvwin.h b/pidgin/gtkconvwin.h
index 73107d2971..986b1ca28f 100644
--- a/pidgin/gtkconvwin.h
+++ b/pidgin/gtkconvwin.h
@@ -96,6 +96,11 @@ struct _PidginWindow
 
 	gint drag_motion_signal;
 	gint drag_leave_signal;
+
+	/* Media menu options. */
+	GtkWidget *audio_call;
+	GtkWidget *video_call;
+	GtkWidget *audio_video_call;
 };
 
 /*@}*/
diff --git a/pidgin/gtkdebug.c b/pidgin/gtkdebug.c
index 084c06169e..07e8872dcd 100644
--- a/pidgin/gtkdebug.c
+++ b/pidgin/gtkdebug.c
@@ -94,7 +94,7 @@ debug_window_destroy(GtkWidget *w, GdkEvent *event, void *unused)
 	if(debug_win->timer != 0) {
 		const gchar *text;
 
-		g_source_remove(debug_win->timer);
+		purple_timeout_remove(debug_win->timer);
 
 		text = gtk_entry_get_text(GTK_ENTRY(debug_win->expression));
 		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/debug/regex", text);
@@ -552,7 +552,7 @@ regex_changed_cb(GtkWidget *w, DebugWindow *win) {
 	}
 
 	if(win->timer == 0)
-		win->timer = purple_timeout_add(5000, (GSourceFunc)regex_timer_cb, win);
+		win->timer = purple_timeout_add_seconds(5, (GSourceFunc)regex_timer_cb, win);
 
 	regex_compile(win);
 }
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
index ec8cccb091..cb2b939108 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -27,12 +27,14 @@
 
 #include "internal.h"
 #include "pidgin.h"
+#include "package_revision.h"
 
 #include "debug.h"
 #include "notify.h"
 #include "prpl.h"
 #include "request.h"
 #include "util.h"
+#include "core.h"
 
 #include "gtkblist.h"
 #include "gtkdialogs.h"
@@ -72,9 +74,10 @@ struct artist {
 /* Order: Alphabetical by Last Name */
 static const struct developer developers[] = {
 	{"Daniel 'datallah' Atallah",	NULL, NULL},
-	{"John 'rekkanoryo' Bailey",	N_("bug master"), "rekkanoryo@pidgin.im"},
+	{"Paul 'darkrain42' Aurich",	NULL, NULL },
+	{"John 'rekkanoryo' Bailey",	N_("bug master"), NULL},
 	{"Ethan 'Paco-Paco' Blanton",	NULL, NULL},
-	{"Hylke Bons",			N_("artist"), "h.bons@student.rug.nl"},
+	{"Hylke Bons",			N_("artist"), "hylkebons@gmail.com"},
 	{"Thomas Butter",				NULL, NULL},
 	/* feel free to not translate this */
 	{N_("Ka-Hing Cheung"),			NULL, NULL},
@@ -89,6 +92,7 @@ static const struct developer developers[] = {
 	{"Bartosz Oler",		NULL, NULL},
 	{"Etan 'deryni' Reisner",       NULL, NULL},
 	{"Tim 'marv' Ringenbach",		NULL, NULL},
+	{"Michael 'Maiku' Ruprecht",	N_("voice and video"), NULL},
 	{"Elliott 'QuLogic' Sales de Andrade",	NULL,	NULL},
 	{"Luke 'LSchiere' Schierer",	N_("support"), "lschiere@users.sf.net"},
 	{"Evan Schoenberg",		NULL, NULL},
@@ -100,7 +104,6 @@ static const struct developer developers[] = {
 
 /* Order: Alphabetical by Last Name */
 static const struct developer patch_writers[] = {
-	{"Paul 'darkrain42' Aurich", NULL, NULL },
 	{"Marcus 'malu' Lundblad", NULL, NULL},
 	{"Dennis 'EvilDennisR' Ristuccia",	N_("Senior Contributor/QA"),	NULL},
 	{"Peter 'Fmoo' Ruibal",		NULL,	NULL},
@@ -145,10 +148,8 @@ static const struct translator translators[] = {
 	{N_("Bulgarian"),           "bg", "Vladimira Girginova", "missing@here.is"},
 	{N_("Bulgarian"),           "bg", "Vladimir (Kaladan) Petkov", "vpetkov@i-space.org"},
 	{N_("Bengali"),             "bn", "Israt Jahan", "israt@ankur.org.bd"},
-	{N_("Bengali"),             "bn", "INDRANIL DAS GUPTA", "indradg@l2c2.org"},
 	{N_("Bengali"),             "bn", "Jamil Ahmed", "jamil@bengalinux.org"},
 	{N_("Bengali"),             "bn", "Samia Nimatullah", "mailsamia2001@yahoo.com"},
-	{N_("Bengali"),             "bn", "Tisa Nafisa", "tisa_nafisa@yahoo.com"},
 	{N_("Bosnian"),             "bs", "Lejla Hadzialic", "lejlah@gmail.com"},
 	{N_("Catalan"),             "ca", "Josep Puigdemont", "josep.puigdemont@gmail.com"},
 	{N_("Valencian-Catalan"),   "ca@valencia", "Toni Hermoso", "toniher@softcatala.org"},
@@ -169,8 +170,7 @@ static const struct translator translators[] = {
 	{N_("Esperanto"),           "eo", "Stéphane Fillod", "fillods@users.sourceforge.net"},
 	{N_("Spanish"),             "es", "Javier Fernández-Sanguino Peña", "jfs@debian.org"},
 	{N_("Estonian"),            "et", "Ivar Smolin", "okul@linux.ee"},
-	{N_("Euskera(Basque)"),     "eu", "Hizkuntza Politikarako Sailburuordetza", "hizkpol@ej-gv.es"},
-	{N_("Euskera(Basque)"),     "eu", "Iñaki Larrañaga Murgoitio", "dooteo@zundan.com"},
+	{N_("Basque"),              "eu", "Mikel Pascual Aldabaldetreku", "mikel.paskual@gmail.com"},
 	{N_("Persian"),             "fa", "Elnaz Sarbar", "elnaz@farsiweb.info"},
 	{N_("Persian"),             "fa", "Meelad Zakaria", "meelad@farsiweb.info"},
 	{N_("Persian"),             "fa", "Roozbeh Pournader ", "roozbeh@farsiweb.info"},
@@ -184,11 +184,12 @@ static const struct translator translators[] = {
 	{N_("Hebrew"),              "he", "Shalom Craimer", "scraimer@gmail.com"},
 	{N_("Hindi"),               "hi", "Ravishankar Shrivastava", "raviratlami@yahoo.com"},
 	{N_("Hungarian"),           "hu", "Kelemen Gábor", "kelemeng@gnome.hu"},
+	{N_("Armenian"),            "hy", "David Avsharyan", "avsharyan@gmail.com"},
 	{N_("Indonesian"),          "id", "Rai S. Regawa", "raireg@yahoo.com"},
 	{N_("Italian"),             "it", "Claudio Satriano", "satriano@na.infn.it"},
 	{N_("Japanese"),            "ja", "Takashi Aihana", "aihana@gnome.gr.jp"},
 	{N_("Georgian"),            "ka", N_("Ubuntu Georgian Translators"), "alexander.didebulidze@stusta.mhn.de"},
-	{"Khmer",                   "km", "Khoem Sokhem", "khoemsokhem@khmeros.info"},
+	{N_("Khmer"),               "km", "Khoem Sokhem", "khoemsokhem@khmeros.info"},
 	{N_("Kannada"),             "kn", N_("Kannada Translation team"), "translation@sampada.info"},
 	{N_("Korean"),              "ko", "Sushizang", "sushizang@empal.com"},
 	{N_("Kurdish"),             "ku", "Erdal Ronahi", "erdal.ronahi@gmail.com"},
@@ -211,6 +212,7 @@ static const struct translator translators[] = {
 	{N_("Portuguese-Brazil"),   "pt_BR", "Rodrigo Luiz Marques Flores", "rodrigomarquesflores@gmail.com"},
 	{N_("Pashto"),              "ps", "Kashif Masood", "masudmails@yahoo.com"},
 	{N_("Romanian"),            "ro", "Mişu Moldovan", "dumol@gnome.ro"},
+	{N_("Romanian"),            "ro", "Andrei Popescu", "andreimpopescu@gmail.com"},
 	{N_("Russian"),             "ru", "Антон Самохвалов", "samant.ua@mail.ru"},
 	{N_("Slovak"),              "sk", "Jozef Káčer", "quickparser@gmail.com"},
 	{N_("Slovak"),              "sk", "loptosko", "loptosko@gmail.com"},
@@ -221,13 +223,14 @@ static const struct translator translators[] = {
 	{N_("Sinhala"),             "si", "Danishka Navin", "snavin@redhat.com"},
 	{N_("Sinhala"),             "si", "Yajith Ajantha Dayarathna", "yajith@gmail.com"},
 	{N_("Swedish"),             "sv", "Peter Hjalmarsson", "xake@telia.com"},
+	{N_("Swahili"),             "sw", "Paul Msegeya", "msegeya@gmail.com"},
 	{N_("Tamil"),               "ta", "Viveka Nathan K", "vivekanathan@users.sourceforge.net"},
 	{N_("Telugu"),              "te", "Mr. Subbaramaih", "info.gist@cdac.in"},
 	{N_("Thai"),                "th", "Isriya Paireepairit", "markpeak@gmail.com"},
 	{N_("Turkish"),             "tr", "Serdar Soytetir", "tulliana@gmail.com"},
 	{N_("Urdu"),                "ur", "RKVS Raman", "rkvsraman@gmail.com"},
 	{N_("Vietnamese"),          "vi", N_("T.M.Thanh and the Gnome-Vi Team"), "gnomevi-list@lists.sf.net"},
-	{N_("Simplified Chinese"),  "zh_CN", "Funda Wang", "fundawang@linux.net.cn"},
+	{N_("Simplified Chinese"),  "zh_CN", "Aron Xu", "aronmalache@163.com"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Abel Cheung", "abelindsay@gmail.com"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Ambrose C. Li", "acli@ada.dhs.org"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Paladin R. Liu", "paladin@ms1.hinet.net"},
@@ -241,6 +244,8 @@ static const struct translator past_translators[] = {
 	{N_("Amharic"),             "am", "Daniel Yacob", NULL},
 	{N_("Arabic"),              "ar", "Mohamed Magdy", "alnokta@yahoo.com"},
 	{N_("Bulgarian"),           "bg", "Hristo Todorov", NULL},
+	{N_("Bengali"),             "bn", "INDRANIL DAS GUPTA", "indradg@l2c2.org"},
+	{N_("Bengali"),             "bn", "Tisa Nafisa", "tisa_nafisa@yahoo.com"},
 	{N_("Catalan"),             "ca", "JM Pérez Cáncer", NULL},
 	{N_("Catalan"),             "ca", "Robert Millan", NULL},
 	{N_("Czech"),               "cs", "Honza Král", NULL},
@@ -250,6 +255,8 @@ static const struct translator past_translators[] = {
 	{N_("Spanish"),             "es", "Nicolás Lichtmaier", NULL},
 	{N_("Spanish"),             "es", "Amaya Rodrigo", NULL},
 	{N_("Spanish"),             "es", "Alejandro G Villar", NULL},
+	{N_("Basque"),              "eu", "Iñaki Larrañaga Murgoitio", "dooteo@zundan.com"},
+	{N_("Basque"),              "eu", "Hizkuntza Politikarako Sailburuordetza", "hizkpol@ej-gv.es"},
 	{N_("Finnish"),             "fi", "Arto Alakulju", NULL},
 	{N_("Finnish"),             "fi", "Tero Kuusela", NULL},
 	{N_("French"),              "fr", "Sébastien François", NULL},
@@ -290,6 +297,7 @@ static const struct translator past_translators[] = {
 	{N_("Swedish"),             "sv", "Christian Rose", NULL},
 	{N_("Turkish"),             "tr", "Ahmet Alp BALKAN", NULL},
 	{N_("Simplified Chinese"),  "zh_CN", "Hashao, Rocky S. Lee", NULL},
+	{N_("Simplified Chinese"),  "zh_CN", "Funda Wang", "fundawang@linux.net.cn"},
 	{N_("Traditional Chinese"), "zh_TW", "Hashao, Rocky S. Lee", NULL},
 	{NULL, NULL, NULL, NULL}
 };
@@ -426,7 +434,7 @@ void pidgin_dialogs_about()
 #endif
 	gtk_widget_destroy(logo);
 	logo = gtk_image_new_from_pixbuf(pixbuf);
-	gdk_pixbuf_unref(pixbuf);
+	g_object_unref(G_OBJECT(pixbuf));
 	/* Insert the logo */
 	obj = gtk_widget_get_accessible(logo);
 	tmp = g_strconcat(PIDGIN_NAME, " " DISPLAY_VERSION, NULL);
@@ -441,7 +449,7 @@ void pidgin_dialogs_about()
 	str = g_string_sized_new(4096);
 
 	g_string_append_printf(str,
-		"<CENTER><FONT SIZE=\"4\"><B>%s %s</B></FONT></CENTER><BR><BR>", PIDGIN_NAME, DISPLAY_VERSION);
+		"<CENTER><FONT SIZE=\"4\"><B>%s %s</B></FONT></CENTER><BR>(libpurple %s)<BR>%s<BR><BR>", PIDGIN_NAME, DISPLAY_VERSION, purple_core_get_version(), REVISION);
 
 	g_string_append_printf(str,
 		_("%s is a graphical modular messaging client based on "
@@ -464,7 +472,13 @@ void pidgin_dialogs_about()
 				"http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"));
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">Help via e-mail:</FONT>"
 				" <A HREF=\"mailto:support@pidgin.im\">support@pidgin.im</A>"
-				"<BR/><BR/>"));
+				" (This is a"
+				" <A HREF=\"http://pidgin.im/cgi-bin/mailman/listinfo/support\">"
+				"mailing list</A>, and messages sent here are"
+				" <A HREF=\"http://pidgin.im/pipermail/support/\">publicly"
+				" archived!</A>  Furthermore, we do <I><B>not</B></I> support"
+				" MXit, Facebook, Skype, or any other third-party plugins on"
+				" this list.<BR/><BR/>"));
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC Channel:</FONT> "
 				"#pidgin on irc.freenode.net<BR><BR>"));
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">XMPP MUC:</FONT> "
@@ -643,6 +657,12 @@ if (purple_plugins_find_with_id("core-tcl") != NULL) {
 	g_string_append(str, "    <b>Tk:</b> Disabled<br/>");
 }
 
+#ifdef USE_VV
+	g_string_append(str, "    <b>Voice and Video:</b> Enabled<br/>");
+#else
+	g_string_append(str, "    <b>Voice and Video:</b> Disabled<br/>");
+#endif
+
 #ifndef _WIN32
 #ifdef USE_SM
 	g_string_append(str, "    <b>X Session Management:</b> Enabled<br/>");
diff --git a/pidgin/gtkdnd-hints.h b/pidgin/gtkdnd-hints.h
index c67ef17fed..a53b9b5835 100644
--- a/pidgin/gtkdnd-hints.h
+++ b/pidgin/gtkdnd-hints.h
@@ -25,7 +25,7 @@
 #define _PIDGIN_DND_HINTS_H_
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 /**
  * Conversation drag-and-drop arrow types.
diff --git a/pidgin/gtkdocklet-x11.c b/pidgin/gtkdocklet-x11.c
index 8a07edf8ca..0790b1defa 100644
--- a/pidgin/gtkdocklet-x11.c
+++ b/pidgin/gtkdocklet-x11.c
@@ -32,6 +32,7 @@
 
 #include "eggtrayicon.h"
 #include "gtkdocklet.h"
+#include <gdk/gdkkeysyms.h>
 
 #define SHORT_EMBED_TIMEOUT 5000
 #define LONG_EMBED_TIMEOUT 15000
@@ -89,6 +90,33 @@ docklet_x11_clicked_cb(GtkWidget *button, GdkEventButton *event, void *data)
 	return TRUE;
 }
 
+static gboolean
+docklet_x11_pressed_cb(GtkWidget *button, GdkEventKey *event)
+{
+	guint state, keyval;
+
+	state = event->state & gtk_accelerator_get_default_mod_mask();
+	keyval = event->keyval;
+	if (state == 0 &&
+	    (keyval == GDK_Return ||
+	     keyval == GDK_KP_Enter ||
+	     keyval == GDK_ISO_Enter ||
+	     keyval == GDK_space ||
+	     keyval == GDK_KP_Space))
+	{
+		pidgin_docklet_clicked(1);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static void
+docklet_x11_popup_cb(GtkWidget *button)
+{
+	pidgin_docklet_clicked(3);
+}
+
 static void
 docklet_x11_update_icon(PurpleStatusPrimitive status, gboolean connecting, gboolean pending)
 {
@@ -259,11 +287,14 @@ docklet_x11_create(gboolean recreate)
 	docklet = egg_tray_icon_new(PIDGIN_NAME);
 	box = gtk_event_box_new();
 	image = gtk_image_new();
+	GTK_WIDGET_SET_FLAGS (image, GTK_CAN_FOCUS);
 
 	g_signal_connect(G_OBJECT(docklet), "embedded", G_CALLBACK(docklet_x11_embedded_cb), NULL);
 	g_signal_connect(G_OBJECT(docklet), "destroy", G_CALLBACK(docklet_x11_destroyed_cb), NULL);
 	g_signal_connect(G_OBJECT(docklet), "size-allocate", G_CALLBACK(docklet_x11_resize_icon), NULL);
 	g_signal_connect(G_OBJECT(box), "button-press-event", G_CALLBACK(docklet_x11_clicked_cb), NULL);
+	g_signal_connect(G_OBJECT(box), "key-press-event", G_CALLBACK(docklet_x11_pressed_cb), NULL);
+	g_signal_connect(G_OBJECT(box), "popup-menu", G_CALLBACK(docklet_x11_popup_cb), NULL);
 	gtk_container_add(GTK_CONTAINER(box), image);
 	gtk_container_add(GTK_CONTAINER(docklet), box);
 
diff --git a/pidgin/gtkdocklet.c b/pidgin/gtkdocklet.c
index 32e2444aa7..571222e017 100644
--- a/pidgin/gtkdocklet.c
+++ b/pidgin/gtkdocklet.c
@@ -482,7 +482,7 @@ activate_saved_status_cb(GtkMenuItem *menuitem, gpointer user_data)
 }
 
 static GtkWidget *
-new_menu_item_with_status_icon(GtkWidget *menu, const char *str, PurpleStatusPrimitive primitive, GtkSignalFunc sf, gpointer data, guint accel_key, guint accel_mods, char *mod)
+new_menu_item_with_status_icon(GtkWidget *menu, const char *str, PurpleStatusPrimitive primitive, GCallback cb, gpointer data, guint accel_key, guint accel_mods, char *mod)
 {
 	GtkWidget *menuitem;
 	GdkPixbuf *pixbuf;
@@ -493,8 +493,8 @@ new_menu_item_with_status_icon(GtkWidget *menu, const char *str, PurpleStatusPri
 	if (menu)
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-	if (sf)
-		g_signal_connect(G_OBJECT(menuitem), "activate", sf, data);
+	if (cb)
+		g_signal_connect(G_OBJECT(menuitem), "activate", cb, data);
 
 	pixbuf = pidgin_create_status_icon(primitive, menu, PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
 	image = gtk_image_new_from_pixbuf(pixbuf);
diff --git a/pidgin/gtkft.c b/pidgin/gtkft.c
index 49890981db..cd4e21610a 100644
--- a/pidgin/gtkft.c
+++ b/pidgin/gtkft.c
@@ -75,8 +75,6 @@ struct _PidginXferDialog
 
 	/* Buttons */
 	GtkWidget *open_button;
-	GtkWidget *pause_button;
-	GtkWidget *resume_button;
 	GtkWidget *remove_button;
 	GtkWidget *stop_button;
 	GtkWidget *close_button;
@@ -330,8 +328,6 @@ update_buttons(PidginXferDialog *dialog, PurpleXfer *xfer)
 	if (dialog->selected_xfer == NULL) {
 		gtk_widget_set_sensitive(dialog->expander, FALSE);
 		gtk_widget_set_sensitive(dialog->open_button, FALSE);
-		gtk_widget_set_sensitive(dialog->pause_button, FALSE);
-		gtk_widget_set_sensitive(dialog->resume_button, FALSE);
 		gtk_widget_set_sensitive(dialog->stop_button, FALSE);
 
 		gtk_widget_show(dialog->stop_button);
@@ -361,8 +357,6 @@ update_buttons(PidginXferDialog *dialog, PurpleXfer *xfer)
 			gtk_widget_set_sensitive (dialog->open_button, FALSE);
 		}
 #endif
-		gtk_widget_set_sensitive(dialog->pause_button,  FALSE);
-		gtk_widget_set_sensitive(dialog->resume_button, FALSE);
 
 		gtk_widget_set_sensitive(dialog->remove_button, TRUE);
 	} else if (purple_xfer_is_canceled(xfer)) {
@@ -370,8 +364,6 @@ update_buttons(PidginXferDialog *dialog, PurpleXfer *xfer)
 		gtk_widget_show(dialog->remove_button);
 
 		gtk_widget_set_sensitive(dialog->open_button,  FALSE);
-		gtk_widget_set_sensitive(dialog->pause_button,  FALSE);
-		gtk_widget_set_sensitive(dialog->resume_button, FALSE);
 
 		gtk_widget_set_sensitive(dialog->remove_button, TRUE);
 	} else {
@@ -379,10 +371,6 @@ update_buttons(PidginXferDialog *dialog, PurpleXfer *xfer)
 		gtk_widget_hide(dialog->remove_button);
 
 		gtk_widget_set_sensitive(dialog->open_button,  FALSE);
-
-		/* TODO: If the transfer can pause, blah blah */
-		gtk_widget_set_sensitive(dialog->pause_button,  FALSE);
-		gtk_widget_set_sensitive(dialog->resume_button, FALSE);
 		gtk_widget_set_sensitive(dialog->stop_button,   TRUE);
 	}
 }
@@ -559,16 +547,6 @@ open_button_cb(GtkButton *button, PidginXferDialog *dialog)
 }
 
 static void
-pause_button_cb(GtkButton *button, PidginXferDialog *dialog)
-{
-}
-
-static void
-resume_button_cb(GtkButton *button, PidginXferDialog *dialog)
-{
-}
-
-static void
 remove_button_cb(GtkButton *button, PidginXferDialog *dialog)
 {
 	pidgin_xfer_dialog_remove_xfer(dialog, dialog->selected_xfer);
@@ -705,12 +683,12 @@ make_info_table(PidginXferDialog *dialog)
 	};
 
 	/* Setup the initial table */
-	dialog->table = table = gtk_table_new(9, 2, FALSE);
+	dialog->table = table = gtk_table_new(G_N_ELEMENTS(labels) + 1, 2, FALSE);
 	gtk_table_set_row_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE);
 	gtk_table_set_col_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE);
 
 	/* Setup the labels */
-	for (i = 0; i < sizeof(labels) / sizeof(*labels); i++) {
+	for (i = 0; i < G_N_ELEMENTS(labels); i++) {
 		GtkWidget *label;
 		char buf[256];
 
@@ -734,7 +712,9 @@ make_info_table(PidginXferDialog *dialog)
 
 	/* Setup the progress bar */
 	dialog->progress = gtk_progress_bar_new();
-	gtk_table_attach(GTK_TABLE(table), dialog->progress, 0, 2, 8, 9,
+	gtk_table_attach(GTK_TABLE(table), dialog->progress,
+					 0, 2,
+					 G_N_ELEMENTS(labels), G_N_ELEMENTS(labels) + 1,
 					 GTK_FILL, GTK_FILL, 0, 0);
 	gtk_widget_show(dialog->progress);
 
@@ -761,6 +741,7 @@ pidgin_xfer_dialog_new(void)
 
 	/* Create the window. */
 	dialog->window = window = pidgin_create_dialog(_("File Transfers"), PIDGIN_HIG_BORDER, "file transfer", TRUE);
+	gtk_window_set_default_size(GTK_WINDOW(window), 450, 250);
 
 	g_signal_connect(G_OBJECT(window), "delete_event",
 					 G_CALLBACK(delete_win_cb), dialog);
@@ -816,16 +797,6 @@ pidgin_xfer_dialog_new(void)
 	gtk_widget_set_sensitive(button, FALSE);
 	dialog->open_button = button;
 
-	/* Pause button */
-	button = pidgin_dialog_add_button(GTK_DIALOG(window), _("_Pause"), G_CALLBACK(pause_button_cb), dialog);
-	gtk_widget_set_sensitive(button, FALSE);
-	dialog->pause_button = button;
-
-	/* Resume button */
-	button = pidgin_dialog_add_button(GTK_DIALOG(window), _("_Resume"), G_CALLBACK(resume_button_cb), dialog);
-	gtk_widget_set_sensitive(button, FALSE);
-	dialog->resume_button = button;
-
 	/* Remove button */
 	button = pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_REMOVE, G_CALLBACK(remove_button_cb), dialog);
 	gtk_widget_hide(button);
diff --git a/pidgin/gtkicon-theme-loader.c b/pidgin/gtkicon-theme-loader.c
index 5ddbd4f5e9..e5818da667 100644
--- a/pidgin/gtkicon-theme-loader.c
+++ b/pidgin/gtkicon-theme-loader.c
@@ -24,6 +24,7 @@
 #include "gtkstatus-icon-theme.h"
 
 #include "xmlnode.h"
+#include "debug.h"
 
 /*****************************************************************************
  * Icon Theme Builder
@@ -33,39 +34,45 @@ static PurpleTheme *
 pidgin_icon_loader_build(const gchar *dir)
 {
 	xmlnode *root_node = NULL, *sub_node;
-	gchar *filename_full, *data;
+	gchar *filename_full, *data = NULL;
 	PidginIconTheme *theme = NULL;
+	const gchar *name;
 
 	/* Find the theme file */
 	g_return_val_if_fail(dir != NULL, NULL);
 	filename_full = g_build_filename(dir, "theme.xml", NULL);
 
 	if (g_file_test(filename_full, G_FILE_TEST_IS_REGULAR))
-		root_node = xmlnode_from_file(dir, "theme.xml", "sound themes", "sound-theme-loader");
+		root_node = xmlnode_from_file(dir, "theme.xml", "icon themes", "icon-theme-loader");
 
 	g_free(filename_full);
-	g_return_val_if_fail(root_node != NULL, NULL);
-
-	/* Parse the tree */
-	sub_node = xmlnode_get_child(root_node, "description");
-	data = xmlnode_get_data(sub_node);
-
-	if (xmlnode_get_attrib(root_node, "name") != NULL) {
-		theme = g_object_new(PIDGIN_TYPE_STATUS_ICON_THEME,
-				"type", "status-icon",
-				"name", xmlnode_get_attrib(root_node, "name"),
-				"author", xmlnode_get_attrib(root_node, "author"),
-				"image", xmlnode_get_attrib(root_node, "image"),
-				"directory", dir,
-				"description", data, NULL);
-
-		sub_node = xmlnode_get_child(root_node, "icon");
-
-		while (sub_node) {
-			pidgin_icon_theme_set_icon(theme,
-					xmlnode_get_attrib(sub_node, "id"),
-					xmlnode_get_attrib(sub_node, "file"));
-			sub_node = xmlnode_get_next_twin(sub_node);
+	if (root_node == NULL)
+		return NULL;
+
+	name = xmlnode_get_attrib(root_node, "name");
+
+	if (name) {
+		/* Parse the tree */
+		sub_node = xmlnode_get_child(root_node, "description");
+		data = xmlnode_get_data(sub_node);
+
+		if (xmlnode_get_attrib(root_node, "name") != NULL) {
+			theme = g_object_new(PIDGIN_TYPE_STATUS_ICON_THEME,
+					"type", "status-icon",
+					"name", name,
+					"author", xmlnode_get_attrib(root_node, "author"),
+					"image", xmlnode_get_attrib(root_node, "image"),
+					"directory", dir,
+					"description", data, NULL);
+
+			sub_node = xmlnode_get_child(root_node, "icon");
+
+			while (sub_node) {
+				pidgin_icon_theme_set_icon(theme,
+						xmlnode_get_attrib(sub_node, "id"),
+						xmlnode_get_attrib(sub_node, "file"));
+				sub_node = xmlnode_get_next_twin(sub_node);
+			}
 		}
 	}
 
diff --git a/pidgin/gtkicon-theme-loader.h b/pidgin/gtkicon-theme-loader.h
index 57ab2b53a3..eccb85dc32 100644
--- a/pidgin/gtkicon-theme-loader.h
+++ b/pidgin/gtkicon-theme-loader.h
@@ -1,5 +1,5 @@
 /**
- * @file gtkicon-loader.h  Pidgin Icon Theme Loader Class API
+ * @file gtkicon-theme-loader.h  Pidgin Icon Theme Loader Class API
  */
 
 /* purple
diff --git a/pidgin/gtkicon-theme.h b/pidgin/gtkicon-theme.h
index 0ba669d349..ce67048ba8 100644
--- a/pidgin/gtkicon-theme.h
+++ b/pidgin/gtkicon-theme.h
@@ -1,5 +1,5 @@
 /**
- * @file icon-theme.h  Pidgin Icon Theme  Class API
+ * @file gtkicon-theme.h  Pidgin Icon Theme  Class API
  */
 
 /* pidgin
@@ -72,6 +72,7 @@ GType pidgin_icon_theme_get_type(void);
 /**
  * Returns a copy of the filename for the icon event or NULL if it is not set
  *
+ * @param theme     the theme
  * @param event		the pidgin icon event to look up
  *
  * @returns the filename of the icon event
@@ -82,6 +83,7 @@ const gchar *pidgin_icon_theme_get_icon(PidginIconTheme *theme,
 /**
  * Sets the filename for a given icon id, setting the icon to NULL will remove the icon from the theme
  *
+ * @param theme         the theme
  * @param icon_id		a string representing what the icon is to be used for
  * @param filename		the name of the file to be used for the given id
  */
diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c
index f90f0b8996..3ef25461b8 100644
--- a/pidgin/gtkimhtml.c
+++ b/pidgin/gtkimhtml.c
@@ -45,7 +45,7 @@
 #include "gtksourceundomanager.h"
 #include "gtksourceview-marshal.h"
 #include <gtk/gtk.h>
-#include <glib/gerror.h>
+#include <glib.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
 #include <ctype.h>
@@ -82,6 +82,11 @@ struct scalable_data {
 	GtkTextMark *mark;
 };
 
+typedef struct {
+	GtkIMHtmlScalable *image;
+	gpointer data;
+	gsize datasize;
+} GtkIMHtmlImageSave;
 
 struct im_image_data {
 	int id;
@@ -782,7 +787,7 @@ gtk_imhtml_expose_event (GtkWidget      *widget,
 				   gc,
 				   TRUE,
 				   visible_rect.x, visible_rect.y, visible_rect.width, visible_rect.height);
-		gdk_gc_unref(gc);
+		g_object_unref(G_OBJECT(gc));
 
 		if (GTK_WIDGET_CLASS (parent_class)->expose_event)
 			return (* GTK_WIDGET_CLASS (parent_class)->expose_event)
@@ -873,7 +878,7 @@ gtk_imhtml_expose_event (GtkWidget      *widget,
 		       !gtk_text_iter_begins_tag(&cur, NULL));
 	}
 
-	gdk_gc_unref(gc);
+	g_object_unref(G_OBJECT(gc));
 
 	if (GTK_WIDGET_CLASS (parent_class)->expose_event)
 		return (* GTK_WIDGET_CLASS (parent_class)->expose_event)
@@ -1384,7 +1389,7 @@ gtk_imhtml_finalize (GObject *object)
 		gtk_widget_destroy(imhtml->tip_window);
 	}
 	if(imhtml->tip_timer)
-		gtk_timeout_remove(imhtml->tip_timer);
+		g_source_remove(imhtml->tip_timer);
 
 	for(scalables = imhtml->scalables; scalables; scalables = scalables->next) {
 		struct scalable_data *sd = scalables->data;
@@ -1451,7 +1456,7 @@ static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
 	GObjectClass   *gobject_class;
 	object_class = (GtkObjectClass*) klass;
 	gobject_class = (GObjectClass*) klass;
-	parent_class = gtk_type_class(GTK_TYPE_TEXT_VIEW);
+	parent_class = g_type_class_ref(GTK_TYPE_TEXT_VIEW);
 	signals[URL_CLICKED] = g_signal_new("url_clicked",
 						G_TYPE_FROM_CLASS(gobject_class),
 						G_SIGNAL_RUN_FIRST,
@@ -1544,7 +1549,7 @@ static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("hyperlink-visited-color",
 	                                        _("Hyperlink visited color"),
-	                                        _("Color to draw hyperlinks after it has been visited (or activated)."),
+	                                        _("Color to draw hyperlink after it has been visited (or activated)."),
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("hyperlink-prelight-color",
 	                                        _("Hyperlink prelight color"),
@@ -1568,11 +1573,11 @@ static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("whisper-action-name-color",
 	                                        _("Action Message Name Color for Whispered Message"),
-	                                        _("Color to draw the name of an action message."),
+	                                        _("Color to draw the name of a whispered action message."),
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("whisper-name-color",
 	                                        _("Whisper Message Name Color"),
-	                                        _("Color to draw the name of an action message."),
+	                                        _("Color to draw the name of a whispered message."),
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 
 	/* Customizable typing notification ... sort of. Example:
@@ -1582,7 +1587,7 @@ static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
 	 */
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("typing-notification-color",
 	                                        _("Typing notification color"),
-	                                        _("The color to use for the typing notification font"),
+	                                        _("The color to use for the typing notification"),
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_string("typing-notification-font",
 	                                        _("Typing notification font"),
@@ -2948,7 +2953,7 @@ void gtk_imhtml_insert_html_at_iter(GtkIMHtml        *imhtml,
 							font->size = oldfont->size;
 						else
 							font->size = 3;
-						if ((imhtml->format_functions & (GTK_IMHTML_GROW|GTK_IMHTML_SHRINK)))
+						if ((imhtml->format_functions & (GTK_IMHTML_GROW|GTK_IMHTML_SHRINK)) && (font->size != 3 || (oldfont && oldfont->size == 3)))
 							gtk_imhtml_font_set_size(imhtml, font->size);
 						g_free(size);
 						fonts = g_slist_prepend (fonts, font);
@@ -2991,10 +2996,21 @@ void gtk_imhtml_insert_html_at_iter(GtkIMHtml        *imhtml,
 							break;
 
 						id = gtk_imhtml_get_html_opt(tag, "ID=");
-						if (!id)
-							break;
-						gtk_imhtml_insert_image_at_iter(imhtml, atoi(id), iter);
-						g_free(id);
+						if (id) {
+							gtk_imhtml_insert_image_at_iter(imhtml, atoi(id), iter);
+							g_free(id);
+						} else {
+							char *src, *alt;
+							src = gtk_imhtml_get_html_opt(tag, "SRC=");
+							alt = gtk_imhtml_get_html_opt(tag, "ALT=");
+							if (src) {
+								gtk_imhtml_toggle_link(imhtml, src);
+								gtk_text_buffer_insert(imhtml->text_buffer, iter, alt ? alt : src, -1);
+								gtk_imhtml_toggle_link(imhtml, NULL);
+							}
+							g_free (src);
+							g_free (alt);
+						}
 						break;
 					}
 				case 47:	/* P (opt) */
@@ -3320,7 +3336,8 @@ void gtk_imhtml_insert_html_at_iter(GtkIMHtml        *imhtml,
 			pos++;
 		} else if ((pos == 0 || wpos == 0 || isspace(*(c - 1))) &&
 		           (len_protocol = gtk_imhtml_is_protocol(c)) > 0 &&
-				   c[len_protocol] && !isspace(c[len_protocol])) {
+				   c[len_protocol] && !isspace(c[len_protocol]) &&
+				   (c[len_protocol] != '<' || !gtk_imhtml_is_tag(c + 1, NULL, NULL, NULL))) {
 			br = FALSE;
 			if (wpos > 0) {
 				gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos);
@@ -3640,95 +3657,108 @@ void gtk_imhtml_image_scale(GtkIMHtmlScalable *scale, int width, int height)
 }
 
 static void
-image_save_yes_cb(GtkIMHtmlImage *image, const char *filename)
+image_save_yes_cb(GtkIMHtmlImageSave *save, const char *filename)
 {
-	gchar *type = NULL;
 	GError *error = NULL;
-#if GTK_CHECK_VERSION(2,2,0)
-	GSList *formats = gdk_pixbuf_get_formats();
-#else
-	char *basename = g_path_get_basename(filename);
-	char *ext = strrchr(basename, '.');
-#endif
-	char *newfilename;
+	GtkIMHtmlImage *image = (GtkIMHtmlImage *)save->image;
 
 	gtk_widget_destroy(image->filesel);
 	image->filesel = NULL;
 
+	if (save->data && save->datasize) {
+#if GLIB_CHECK_VERSION(2,8,0)
+		g_file_set_contents(filename, save->data, save->datasize, &error);
+#else
+		purple_util_write_data_to_file_absolute(filename, save->data, save->datasize);
+#endif
+	} else {
+		gchar *type = NULL;
 #if GTK_CHECK_VERSION(2,2,0)
-	while (formats) {
-		GdkPixbufFormat *format = formats->data;
-		gchar **extensions = gdk_pixbuf_format_get_extensions(format);
-		gpointer p = extensions;
+		GSList *formats = gdk_pixbuf_get_formats();
+#else
+		char *basename = g_path_get_basename(filename);
+		char *ext = strrchr(basename, '.');
+#endif
+		char *newfilename;
 
-		while(gdk_pixbuf_format_is_writable(format) && extensions && extensions[0]){
-			gchar *fmt_ext = extensions[0];
-			const gchar* file_ext = filename + strlen(filename) - strlen(fmt_ext);
+#if GTK_CHECK_VERSION(2,2,0)
+		while (formats) {
+			GdkPixbufFormat *format = formats->data;
+			gchar **extensions = gdk_pixbuf_format_get_extensions(format);
+			gpointer p = extensions;
 
-			if(!g_ascii_strcasecmp(fmt_ext, file_ext)){
-				type = gdk_pixbuf_format_get_name(format);
-				break;
-			}
+			while(gdk_pixbuf_format_is_writable(format) && extensions && extensions[0]){
+				gchar *fmt_ext = extensions[0];
+				const gchar* file_ext = filename + strlen(filename) - strlen(fmt_ext);
 
-			extensions++;
-		}
+				if(!g_ascii_strcasecmp(fmt_ext, file_ext)){
+					type = gdk_pixbuf_format_get_name(format);
+					break;
+				}
 
-		g_strfreev(p);
+				extensions++;
+			}
 
-		if (type)
-			break;
+			g_strfreev(p);
 
-		formats = formats->next;
-	}
+			if (type)
+				break;
+
+			formats = formats->next;
+		}
 
-	g_slist_free(formats);
+		g_slist_free(formats);
 #else
-	/* this is really ugly code, but I think it will work */
-	if (ext) {
-		ext++;
-		if (!g_ascii_strcasecmp(ext, "jpeg") || !g_ascii_strcasecmp(ext, "jpg"))
-			type = g_strdup("jpeg");
-		else if (!g_ascii_strcasecmp(ext, "png"))
-			type = g_strdup("png");
-	}
+		/* this is really ugly code, but I think it will work */
+		if (ext) {
+			ext++;
+			if (!g_ascii_strcasecmp(ext, "jpeg") || !g_ascii_strcasecmp(ext, "jpg"))
+				type = g_strdup("jpeg");
+			else if (!g_ascii_strcasecmp(ext, "png"))
+				type = g_strdup("png");
+		}
 
-	g_free(basename);
+		g_free(basename);
 #endif
 
-	/* If I can't find a valid type, I will just tell the user about it and then assume
-	   it's a png */
-	if (!type){
-		char *basename, *tmp;
+		/* If I can't find a valid type, I will just tell the user about it and then assume
+		   it's a png */
+		if (!type){
+			char *basename, *tmp;
+			char *dirname;
 #if GTK_CHECK_VERSION(2,4,0)
-		GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-						_("<span size='larger' weight='bold'>Unrecognized file type</span>\n\nDefaulting to PNG."));
+			GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+							_("<span size='larger' weight='bold'>Unrecognized file type</span>\n\nDefaulting to PNG."));
 #else
-		GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-						_("Unrecognized file type\n\nDefaulting to PNG."));
+			GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+							_("Unrecognized file type\n\nDefaulting to PNG."));
 #endif
 
-		g_signal_connect_swapped(dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
-		gtk_widget_show(dialog);
+			g_signal_connect_swapped(dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
+			gtk_widget_show(dialog);
 
-		type = g_strdup("png");
-		basename = g_path_get_basename(filename);
-		tmp = strrchr(basename, '.');
-		if (tmp != NULL)
-			tmp[0] = '\0';
-		newfilename = g_strdup_printf("%s.png", basename);
-		g_free(basename);
-	} else {
-		/*
-		 * We're able to save the file in it's original format, so we
-		 * can use the original file name.
-		 */
-		newfilename = g_strdup(filename);
-	}
+			type = g_strdup("png");
+			dirname = g_path_get_dirname(filename);
+			basename = g_path_get_basename(filename);
+			tmp = strrchr(basename, '.');
+			if (tmp != NULL)
+				tmp[0] = '\0';
+			newfilename = g_strdup_printf("%s" G_DIR_SEPARATOR_S  "%s.png", dirname, basename);
+			g_free(dirname);
+			g_free(basename);
+		} else {
+			/*
+			 * We're able to save the file in it's original format, so we
+			 * can use the original file name.
+			 */
+			newfilename = g_strdup(filename);
+		}
 
-	gdk_pixbuf_save(image->pixbuf, newfilename, type, &error, NULL);
+		gdk_pixbuf_save(image->pixbuf, newfilename, type, &error, NULL);
 
-	g_free(newfilename);
-	g_free(type);
+		g_free(newfilename);
+		g_free(type);
+	}
 
 	if (error){
 #if GTK_CHECK_VERSION(2,4,0)
@@ -3746,9 +3776,10 @@ image_save_yes_cb(GtkIMHtmlImage *image, const char *filename)
 
 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
-image_save_check_if_exists_cb(GtkWidget *widget, gint response, GtkIMHtmlImage *image)
+image_save_check_if_exists_cb(GtkWidget *widget, gint response, GtkIMHtmlImageSave *save)
 {
 	gchar *filename;
+	GtkIMHtmlImage *image = (GtkIMHtmlImage *)save->image;
 
 	if (response != GTK_RESPONSE_ACCEPT) {
 		gtk_widget_destroy(widget);
@@ -3759,9 +3790,10 @@ image_save_check_if_exists_cb(GtkWidget *widget, gint response, GtkIMHtmlImage *
 	filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
 #else /* FILECHOOSER */
 static void
-image_save_check_if_exists_cb(GtkWidget *button, GtkIMHtmlImage *image)
+image_save_check_if_exists_cb(GtkWidget *button, GtkIMHtmlImageSave *save)
 {
 	gchar *filename;
+	GtkIMHtmlImage *image = (GtkIMHtmlImage *)save->image;
 
 	filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(image->filesel)));
 
@@ -3794,7 +3826,7 @@ image_save_check_if_exists_cb(GtkWidget *button, GtkIMHtmlImage *image)
 		image_save_yes_cb(image, filename);
 	*/
 
-	image_save_yes_cb(image, filename);
+	image_save_yes_cb(save, filename);
 
 	g_free(filename);
 }
@@ -3809,8 +3841,10 @@ image_save_cancel_cb(GtkIMHtmlImage *image)
 #endif /* FILECHOOSER */
 
 static void
-gtk_imhtml_image_save(GtkWidget *w, GtkIMHtmlImage *image)
+gtk_imhtml_image_save(GtkWidget *w, GtkIMHtmlImageSave *save)
 {
+	GtkIMHtmlImage *image = (GtkIMHtmlImage *)save->image;
+
 	if (image->filesel != NULL) {
 		gtk_window_present(GTK_WINDOW(image->filesel));
 		return;
@@ -3827,7 +3861,7 @@ gtk_imhtml_image_save(GtkWidget *w, GtkIMHtmlImage *image)
 	if (image->filename != NULL)
 		gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(image->filesel), image->filename);
 	g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(image->filesel)), "response",
-					 G_CALLBACK(image_save_check_if_exists_cb), image);
+					 G_CALLBACK(image_save_check_if_exists_cb), save);
 #else /* FILECHOOSER */
 	image->filesel = gtk_file_selection_new(_("Save Image"));
 	if (image->filename != NULL)
@@ -3837,19 +3871,22 @@ gtk_imhtml_image_save(GtkWidget *w, GtkIMHtmlImage *image)
 	g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(image->filesel)->cancel_button),
 							 "clicked", G_CALLBACK(image_save_cancel_cb), image);
 	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(image->filesel)->ok_button), "clicked",
-					 G_CALLBACK(image_save_check_if_exists_cb), image);
+					 G_CALLBACK(image_save_check_if_exists_cb), save);
 #endif /* FILECHOOSER */
 
 	gtk_widget_show(image->filesel);
 }
 
 static void
-gtk_imhtml_custom_smiley_save(GtkWidget *w, GtkIMHtmlImage *image)
+gtk_imhtml_custom_smiley_save(GtkWidget *w, GtkIMHtmlImageSave *save)
 {
+	GtkIMHtmlImage *image = (GtkIMHtmlImage *)save->image;
+	
 	/* Create an add dialog */
 	PidginSmiley *editor = pidgin_smiley_edit(NULL, NULL);
 	pidgin_smiley_editor_set_shortcut(editor, image->filename);
 	pidgin_smiley_editor_set_image(editor, image->pixbuf);
+	pidgin_smiley_editor_set_data(editor, save->data, save->datasize);
 }
 
 /*
@@ -3859,33 +3896,32 @@ gtk_imhtml_custom_smiley_save(GtkWidget *w, GtkIMHtmlImage *image)
  * embedded in the conversation.  Someone should make the Purple core handle
  * all of that.
  */
-static gboolean gtk_imhtml_image_clicked(GtkWidget *w, GdkEvent *event, GtkIMHtmlImage *image)
+static gboolean gtk_imhtml_image_clicked(GtkWidget *w, GdkEvent *event, GtkIMHtmlImageSave *save)
 {
 	GdkEventButton *event_button = (GdkEventButton *) event;
+	GtkIMHtmlImage *image = (GtkIMHtmlImage *)save->image;
 
 	if (event->type == GDK_BUTTON_RELEASE) {
 		if(event_button->button == 3) {
 			GtkWidget *img, *item, *menu;
-			gchar *text = g_strdup_printf(_("_Save Image..."));
 			menu = gtk_menu_new();
 
 			/* buttons and such */
 			img = gtk_image_new_from_stock(GTK_STOCK_SAVE, GTK_ICON_SIZE_MENU);
-			item = gtk_image_menu_item_new_with_mnemonic(text);
+			item = gtk_image_menu_item_new_with_mnemonic(_("_Save Image..."));
 			gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
-			g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(gtk_imhtml_image_save), image);
+			g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(gtk_imhtml_image_save), save);
 			gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
 			/* Add menu item for adding custom smiley to local smileys */
 			/* we only add the menu if the image is of "custom smiley size"
 			  <= 96x96 pixels */
 			if (image->width <= 96 && image->height <= 96) {
-				text = g_strdup_printf(_("_Add Custom Smiley..."));
 				img = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
-				item = gtk_image_menu_item_new_with_mnemonic(text);
+				item = gtk_image_menu_item_new_with_mnemonic(_("_Add Custom Smiley..."));
 				gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
 				g_signal_connect(G_OBJECT(item), "activate",
-								 G_CALLBACK(gtk_imhtml_custom_smiley_save), image);
+								 G_CALLBACK(gtk_imhtml_custom_smiley_save), save);
 				gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 			}
 
@@ -3893,7 +3929,6 @@ static gboolean gtk_imhtml_image_clicked(GtkWidget *w, GdkEvent *event, GtkIMHtm
 			gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
 							event_button->button, event_button->time);
 
-			g_free(text);
 			return TRUE;
 		}
 	}
@@ -3908,7 +3943,7 @@ static gboolean gtk_imhtml_image_clicked(GtkWidget *w, GdkEvent *event, GtkIMHtm
 static gboolean gtk_imhtml_smiley_clicked(GtkWidget *w, GdkEvent *event, GtkIMHtmlSmiley *smiley)
 {
 	GdkPixbufAnimation *anim = NULL;
-	GtkIMHtmlScalable *image = NULL;
+	GtkIMHtmlImageSave *save = NULL;
 	gboolean ret;
 
 	if (event->type != GDK_BUTTON_RELEASE || ((GdkEventButton*)event)->button != 3)
@@ -3918,9 +3953,14 @@ static gboolean gtk_imhtml_smiley_clicked(GtkWidget *w, GdkEvent *event, GtkIMHt
 	if (!anim)
 		return FALSE;
 
-	image = gtk_imhtml_animation_new(anim, smiley->smile, 0);
-	ret = gtk_imhtml_image_clicked(w, event, (GtkIMHtmlImage*)image);
-	g_object_set_data_full(G_OBJECT(w), "image-data", image, (GDestroyNotify)gtk_imhtml_animation_free);
+	save = g_new0(GtkIMHtmlImageSave, 1);
+	save->image = (GtkIMHtmlScalable *)gtk_imhtml_animation_new(anim, smiley->smile, 0);
+	save->data = smiley->data;        /* Do not need to memdup here, since the smiley is not
+	                                     destroyed before this GtkIMHtmlImageSave */
+	save->datasize = smiley->datasize;
+	ret = gtk_imhtml_image_clicked(w, event, save);
+	g_object_set_data_full(G_OBJECT(w), "image-data", save->image, (GDestroyNotify)gtk_imhtml_animation_free);
+	g_object_set_data_full(G_OBJECT(w), "image-save-data", save, (GDestroyNotify)g_free);
 	return ret;
 }
 
@@ -3954,6 +3994,7 @@ void gtk_imhtml_image_add_to(GtkIMHtmlScalable *scale, GtkIMHtml *imhtml, GtkTex
 	GtkWidget *box = gtk_event_box_new();
 	char *tag;
 	GtkTextChildAnchor *anchor = gtk_text_buffer_create_child_anchor(imhtml->text_buffer, iter);
+	GtkIMHtmlImageSave *save;
 
 	gtk_container_add(GTK_CONTAINER(box), GTK_WIDGET(image->image));
 
@@ -3968,7 +4009,11 @@ void gtk_imhtml_image_add_to(GtkIMHtmlScalable *scale, GtkIMHtml *imhtml, GtkTex
 	g_object_set_data(G_OBJECT(anchor), "gtkimhtml_plaintext", "[Image]");
 
 	gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(imhtml), box, anchor);
-	g_signal_connect(G_OBJECT(box), "event", G_CALLBACK(gtk_imhtml_image_clicked), image);
+
+	save = g_new0(GtkIMHtmlImageSave, 1);
+	save->image = scale;
+	g_signal_connect(G_OBJECT(box), "event", G_CALLBACK(gtk_imhtml_image_clicked), save);
+	g_object_set_data_full(G_OBJECT(box), "image-save-data", save, (GDestroyNotify)g_free);
 }
 
 GtkIMHtmlScalable *gtk_imhtml_hr_new()
@@ -4419,15 +4464,19 @@ void gtk_imhtml_set_editable(GtkIMHtml *imhtml, gboolean editable)
 	 * people can highlight stuff.
 	 */
 	/* gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(imhtml), editable); */
-	imhtml->editable = editable;
-	imhtml->format_functions = GTK_IMHTML_ALL;
-
-	if (editable)
-	{
+	if (editable && !imhtml->editable) {
 		g_signal_connect_after(G_OBJECT(GTK_IMHTML(imhtml)->text_buffer), "mark-set",
 				G_CALLBACK(mark_set_cb), imhtml);
 		g_signal_connect(G_OBJECT(imhtml), "backspace", G_CALLBACK(smart_backspace_cb), NULL);
+	} else if (!editable && imhtml->editable) {
+		g_signal_handlers_disconnect_by_func(G_OBJECT(GTK_IMHTML(imhtml)->text_buffer),
+			mark_set_cb, imhtml);
+		g_signal_handlers_disconnect_by_func(G_OBJECT(imhtml),
+			smart_backspace_cb, NULL);
 	}
+
+	imhtml->editable = editable;
+	imhtml->format_functions = GTK_IMHTML_ALL;
 }
 
 void gtk_imhtml_set_whole_buffer_formatting_only(GtkIMHtml *imhtml, gboolean wbfo)
@@ -5027,6 +5076,7 @@ void gtk_imhtml_insert_smiley_at_iter(GtkIMHtml *imhtml, const char *sml, char *
 			gtk_widget_show(img);
 			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", text, g_free);
 			g_object_set_data(G_OBJECT(anchor), "gtkimhtml_tiptext", text);
+			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_htmltext", g_strdup(smiley), g_free);
 			gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(imhtml), ebox, anchor);
 		}
 	} else {
@@ -5768,6 +5818,7 @@ void gtk_imhtml_smiley_destroy(GtkIMHtmlSmiley *smiley)
 		g_object_unref(smiley->icon);
 	if (smiley->loader)
 		g_object_unref(smiley->loader);
+	g_free(smiley->data);
 	g_free(smiley);
 }
 
@@ -5787,9 +5838,9 @@ gboolean gtk_imhtml_class_register_protocol(const char *name,
 		if (activate) {
 			return FALSE;
 		}
+		klass->protocols = g_list_remove(klass->protocols, proto);
 		g_free(proto->name);
 		g_free(proto);
-		klass->protocols = g_list_remove(klass->protocols, proto);
 		return TRUE;
 	} else if (!activate) {
 		return FALSE;
@@ -5879,3 +5930,28 @@ void gtk_imhtml_set_return_inserts_newline(GtkIMHtml *imhtml)
 	g_signal_connect(G_OBJECT(imhtml), "message_send",
 		G_CALLBACK(return_add_newline_cb), NULL);
 }
+
+void gtk_imhtml_set_populate_primary_clipboard(GtkIMHtml *imhtml, gboolean populate)
+{
+	gulong signal_id;
+	signal_id = g_signal_handler_find(imhtml->text_buffer,
+			G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_UNBLOCKED, 0, 0, NULL,
+			mark_set_so_update_selection_cb, NULL);
+	if (populate) {
+		if (!signal_id) {
+			/* We didn't find an unblocked signal handler, which means there
+			   is a blocked handler. Now unblock it.
+			   This is necessary to avoid a mutex-lock when the debug message
+			   saying 'no handler is blocked' is printed in the debug window.
+				-- sad
+			 */
+			g_signal_handlers_unblock_matched(imhtml->text_buffer,
+					G_SIGNAL_MATCH_FUNC, 0, 0, NULL,
+					mark_set_so_update_selection_cb, NULL);
+		}
+	} else {
+		/* Block only if we found an unblocked handler */
+		if (signal_id)
+			g_signal_handler_block(imhtml->text_buffer, signal_id);
+	}
+}
diff --git a/pidgin/gtkimhtml.h b/pidgin/gtkimhtml.h
index f3bdc5d2d2..31dee5bb42 100644
--- a/pidgin/gtkimhtml.h
+++ b/pidgin/gtkimhtml.h
@@ -26,9 +26,7 @@
 #define _PIDGINIMHTML_H_
 
 #include <gdk/gdk.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 #include "gtksourceundomanager.h"
 
 #include "connection.h"
@@ -42,13 +40,13 @@ extern "C" {
  **************************************************************************/
 /*@{*/
 
-#define GTK_TYPE_IMHTML            (gtk_imhtml_get_type ())
-#define GTK_IMHTML(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_IMHTML, GtkIMHtml))
-#define GTK_IMHTML_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMHTML, GtkIMHtmlClass))
-#define GTK_IS_IMHTML(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_IMHTML))
-#define GTK_IS_IMHTML_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMHTML))
+#define GTK_TYPE_IMHTML            (gtk_imhtml_get_type())
+#define GTK_IMHTML(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_IMHTML, GtkIMHtml))
+#define GTK_IMHTML_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_IMHTML, GtkIMHtmlClass))
+#define GTK_IS_IMHTML(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_IMHTML))
+#define GTK_IS_IMHTML_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_IMHTML))
 #define GTK_IMHTML_SCALABLE(obj)   ((GtkIMHtmlScalable *)obj)
-#define GTK_IMHTML_ANIMATION(obj)   ((GtkIMHtmlAnimation *)obj)
+#define GTK_IMHTML_ANIMATION(obj)  ((GtkIMHtmlAnimation *)obj)
 
 typedef struct _GtkIMHtml			GtkIMHtml;
 typedef struct _GtkIMHtmlClass		GtkIMHtmlClass;
@@ -190,6 +188,8 @@ struct _GtkIMHtmlSmiley {
 	GSList *anchors;
 	GtkIMHtmlSmileyFlags flags;
 	GtkIMHtml *imhtml;
+	gpointer data;       /** @Since 2.6.0 */
+	gsize datasize;      /** @Since 2.6.0 */
 };
 
 struct _GtkIMHtmlScalable {
@@ -959,6 +959,16 @@ gboolean gtk_imhtml_link_activate(GtkIMHtmlLink *link);
  */
 void gtk_imhtml_set_return_inserts_newline(GtkIMHtml *imhtml);
 
+/**
+ * By default this widget populates the PRIMARY clipboard with any selected
+ * text (as you would expect).  For scenarios (e.g. select-on-focus) where this
+ * would be problematic, this function can disable the PRIMARY population.
+ *
+ * @param imhtml The GtkIMHtml to enable/disable populating PRIMARY
+ * @param populate enable/disable PRIMARY population
+ */
+void gtk_imhtml_set_populate_primary_clipboard(GtkIMHtml *imhtml, gboolean populate);
+
 /*@}*/
 
 #ifdef __cplusplus
diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
index 39e0ce475c..fcc0ac77c0 100644
--- a/pidgin/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
@@ -1198,7 +1198,7 @@ static void gtk_imhtmltoolbar_class_init (GtkIMHtmlToolbarClass *class)
 	GObjectClass   *gobject_class;
 	object_class = (GtkObjectClass*) class;
 	gobject_class = (GObjectClass*) class;
-	parent_class = gtk_type_class(GTK_TYPE_HBOX);
+	parent_class = g_type_class_ref(GTK_TYPE_HBOX);
 	gobject_class->finalize = gtk_imhtmltoolbar_finalize;
 
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations/toolbar");
diff --git a/pidgin/gtkimhtmltoolbar.h b/pidgin/gtkimhtmltoolbar.h
index f7de106c49..ad3285eeca 100644
--- a/pidgin/gtkimhtmltoolbar.h
+++ b/pidgin/gtkimhtmltoolbar.h
@@ -23,7 +23,7 @@
 #ifndef _PIDGINIMHTMLTOOLBAR_H_
 #define _PIDGINIMHTMLTOOLBAR_H_
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include "gtkimhtml.h"
 
 #ifdef __cplusplus
@@ -32,11 +32,11 @@ extern "C" {
 
 #define DEFAULT_FONT_FACE "Helvetica 12"
 
-#define GTK_TYPE_IMHTMLTOOLBAR            (gtk_imhtmltoolbar_get_type ())
-#define GTK_IMHTMLTOOLBAR(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_IMHTMLTOOLBAR, GtkIMHtmlToolbar))
-#define GTK_IMHTMLTOOLBAR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMHTMLTOOLBAR, GtkIMHtmlToolbarClass))
-#define GTK_IS_IMHTMLTOOLBAR(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_IMHTMLTOOLBAR))
-#define GTK_IS_IMHTMLTOOLBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMHTMLTOOLBAR))
+#define GTK_TYPE_IMHTMLTOOLBAR            (gtk_imhtmltoolbar_get_type())
+#define GTK_IMHTMLTOOLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_IMHTMLTOOLBAR, GtkIMHtmlToolbar))
+#define GTK_IMHTMLTOOLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_IMHTMLTOOLBAR, GtkIMHtmlToolbarClass))
+#define GTK_IS_IMHTMLTOOLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_IMHTMLTOOLBAR))
+#define GTK_IS_IMHTMLTOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_IMHTMLTOOLBAR))
 
 typedef struct _GtkIMHtmlToolbar		GtkIMHtmlToolbar;
 typedef struct _GtkIMHtmlToolbarClass		GtkIMHtmlToolbarClass;
@@ -76,6 +76,7 @@ struct _GtkIMHtmlToolbar {
 	char *sml;
 	GtkWidget *strikethrough;
 	GtkWidget *insert_hr;
+	GtkWidget *call;
 };
 
 struct _GtkIMHtmlToolbarClass {
diff --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c
index e8e8f9c3f8..d1990ca7c3 100644
--- a/pidgin/gtkmain.c
+++ b/pidgin/gtkmain.c
@@ -53,6 +53,7 @@
 #include "gtkft.h"
 #include "gtkidle.h"
 #include "gtklog.h"
+#include "gtkmedia.h"
 #include "gtknotify.h"
 #include "gtkplugin.h"
 #include "gtkpounce.h"
@@ -311,6 +312,8 @@ pidgin_ui_init(void)
 	pidgin_docklet_init();
 	pidgin_smileys_init();
 	pidgin_utils_init();
+	pidgin_medias_init();
+	pidgin_notify_init();
 }
 
 static GHashTable *ui_info = NULL;
@@ -325,6 +328,7 @@ pidgin_quit(void)
 
 	/* Uninit */
 	pidgin_utils_uninit();
+	pidgin_notify_uninit();
 	pidgin_smileys_uninit();
 	pidgin_conversations_uninit();
 	pidgin_status_uninit();
@@ -351,6 +355,26 @@ static GHashTable *pidgin_ui_get_info(void)
 		g_hash_table_insert(ui_info, "version", VERSION);
 		g_hash_table_insert(ui_info, "website", "http://pidgin.im");
 		g_hash_table_insert(ui_info, "dev_website", "http://developer.pidgin.im");
+		g_hash_table_insert(ui_info, "client_type", "pc");
+
+		/*
+		 * This is the client key for "Pidgin."  It is owned by the AIM
+		 * account "markdoliner."  Please don't use this key for other
+		 * applications.  You can either not specify a client key, in
+		 * which case the default "libpurple" key will be used, or you
+		 * can register for your own client key at
+		 * http://developer.aim.com/manageKeys.jsp
+		 */
+		g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma1cSASNCKFtrdv9");
+		g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma1cSASNCKFtrdv9");
+
+		/*
+		 * This is the distid for Pidgin, given to us by AOL.  Please
+		 * don't use this for other applications.  You can just not
+		 * specify a distid and libpurple will use a default.
+		 */
+		g_hash_table_insert(ui_info, "prpl-aim-distid", GINT_TO_POINTER(1550));
+		g_hash_table_insert(ui_info, "prpl-icq-distid", GINT_TO_POINTER(1550));
 	}
 
 	return ui_info;
@@ -382,34 +406,34 @@ show_usage(const char *name, gboolean terse)
 	if (terse) {
 		text = g_strdup_printf(_("%s %s. Try `%s -h' for more information.\n"), PIDGIN_NAME, DISPLAY_VERSION, name);
 	} else {
+		GString *str = g_string_new(NULL);
+		g_string_append_printf(str, "%s %s\n", PIDGIN_NAME, DISPLAY_VERSION);
+		g_string_append_printf(str, _("Usage: %s [OPTION]...\n\n"), name);
+		g_string_append_printf(str, "  -c, --config=DIR    %s\n",
+				_("use DIR for config files"));
+		g_string_append_printf(str, "  -d, --debug         %s\n",
+				_("print debugging messages to stdout"));
+		g_string_append_printf(str, "  -f, --force-online  %s\n",
+				_("force online, regardless of network status"));
+		g_string_append_printf(str, "  -h, --help          %s\n",
+				_("display this help and exit"));
+		g_string_append_printf(str, "  -m, --multiple      %s\n",
+				_("allow multiple instances"));
+		g_string_append_printf(str, "  -n, --nologin       %s\n",
+				_("don't automatically login"));
+		g_string_append_printf(str, "  -l, --login[=NAME]  %s\n",
+				_("enable specified account(s) (optional argument NAME\n"
+				  "                      "
+				  "specifies account(s) to use, separated by commas."));
+		g_string_append_printf(str, "                      %s\n",
+				_("Without this only the first account will be enabled)."));
 #ifndef WIN32
-		text = g_strdup_printf(_("%s %s\n"
-		       "Usage: %s [OPTION]...\n\n"
-		       "  -c, --config=DIR    use DIR for config files\n"
-		       "  -d, --debug         print debugging messages to stdout\n"
-		       "  -f, --force-online  force online, regardless of network status\n"
-		       "  -h, --help          display this help and exit\n"
-		       "  -m, --multiple      do not ensure single instance\n"
-		       "  -n, --nologin       don't automatically login\n"
-		       "  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-		       "                      specifies account(s) to use, separated by commas.\n"
-		       "                      Without this only the first account will be enabled).\n"
-		       "  --display=DISPLAY   X display to use\n"
-		       "  -v, --version       display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name);
-#else
-		text = g_strdup_printf(_("%s %s\n"
-		       "Usage: %s [OPTION]...\n\n"
-		       "  -c, --config=DIR    use DIR for config files\n"
-		       "  -d, --debug         print debugging messages to stdout\n"
-		       "  -f, --force-online  force online, regardless of network status\n"
-		       "  -h, --help          display this help and exit\n"
-		       "  -m, --multiple      do not ensure single instance\n"
-		       "  -n, --nologin       don't automatically login\n"
-		       "  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-		       "                      specifies account(s) to use, separated by commas.\n"
-		       "                      Without this only the first account will be enabled).\n"
-		       "  -v, --version       display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name);
-#endif
+		g_string_append_printf(str, "  --display=DISPLAY   %s\n",
+				_("X display to use"));
+#endif /* !WIN32 */
+		g_string_append_printf(str, "  -v, --version       %s\n",
+				_("display the current version and exit"));
+		text = g_string_free(str, FALSE);
 	}
 
 	purple_print_utf8_to_console(stdout, text);
@@ -669,7 +693,8 @@ int main(int argc, char *argv[])
 	}
 	/* show version message */
 	if (opt_version) {
-		printf("%s %s\n", PIDGIN_NAME, DISPLAY_VERSION);
+		printf("%s %s (libpurple %s)\n", PIDGIN_NAME, DISPLAY_VERSION,
+		                                 purple_core_get_version());
 #ifdef HAVE_SIGNAL_H
 		g_free(segfault_message);
 #endif
@@ -784,7 +809,7 @@ int main(int argc, char *argv[])
 		DBusMessage *message = dbus_message_new_method_call(DBUS_SERVICE_PURPLE, DBUS_PATH_PURPLE,
 				DBUS_INTERFACE_PURPLE, "PurpleBlistSetVisible");
 		gboolean tr = TRUE;
-		dbus_message_append_args(message, DBUS_TYPE_UINT32, &tr, DBUS_TYPE_INVALID);
+		dbus_message_append_args(message, DBUS_TYPE_INT32, &tr, DBUS_TYPE_INVALID);
 		dbus_connection_send_with_reply_and_block(conn, message, -1, NULL);
 		dbus_message_unref(message);
 #endif
diff --git a/pidgin/gtkmedia.c b/pidgin/gtkmedia.c
new file mode 100644
index 0000000000..1db31fdfb1
--- /dev/null
+++ b/pidgin/gtkmedia.c
@@ -0,0 +1,1038 @@
+/**
+ * @file media.c Account API
+ * @ingroup core
+ *
+ * Pidgin
+ *
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <string.h>
+#include "debug.h"
+#include "internal.h"
+#include "connection.h"
+#include "media.h"
+#include "mediamanager.h"
+#include "pidgin.h"
+#include "request.h"
+
+#include "gtkmedia.h"
+#include "gtkutils.h"
+
+#ifdef USE_VV
+#include "media-gst.h"
+
+#ifdef _WIN32
+#include <gdk/gdkwin32.h>
+#endif
+
+#include <gst/interfaces/xoverlay.h>
+
+#define PIDGIN_TYPE_MEDIA            (pidgin_media_get_type())
+#define PIDGIN_MEDIA(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_MEDIA, PidginMedia))
+#define PIDGIN_MEDIA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PIDGIN_TYPE_MEDIA, PidginMediaClass))
+#define PIDGIN_IS_MEDIA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PIDGIN_TYPE_MEDIA))
+#define PIDGIN_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PIDGIN_TYPE_MEDIA))
+#define PIDGIN_MEDIA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PIDGIN_TYPE_MEDIA, PidginMediaClass))
+
+typedef struct _PidginMedia PidginMedia;
+typedef struct _PidginMediaClass PidginMediaClass;
+typedef struct _PidginMediaPrivate PidginMediaPrivate;
+
+typedef enum
+{
+	/* Waiting for response */
+	PIDGIN_MEDIA_WAITING = 1,
+	/* Got request */
+	PIDGIN_MEDIA_REQUESTED,
+	/* Accepted call */
+	PIDGIN_MEDIA_ACCEPTED,
+	/* Rejected call */
+	PIDGIN_MEDIA_REJECTED,
+} PidginMediaState;
+
+struct _PidginMediaClass
+{
+	GtkWindowClass parent_class;
+};
+
+struct _PidginMedia
+{
+	GtkWindow parent;
+	PidginMediaPrivate *priv;
+};
+
+struct _PidginMediaPrivate
+{
+	PurpleMedia *media;
+	gchar *screenname;
+	gulong level_handler_id;
+
+	GtkItemFactory *item_factory;
+	GtkWidget *menubar;
+	GtkWidget *statusbar;
+
+	GtkWidget *mute;
+	GtkWidget *pause;
+
+	GtkWidget *send_progress;
+	GtkWidget *recv_progress;
+
+	PidginMediaState state;
+
+	GtkWidget *display;
+	GtkWidget *send_widget;
+	GtkWidget *recv_widget;
+	GtkWidget *button_widget;
+	GtkWidget *local_video;
+	GtkWidget *remote_video;
+
+	guint timeout_id;
+	PurpleMediaSessionType request_type;
+};
+
+#define PIDGIN_MEDIA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PIDGIN_TYPE_MEDIA, PidginMediaPrivate))
+
+static void pidgin_media_class_init (PidginMediaClass *klass);
+static void pidgin_media_init (PidginMedia *media);
+static void pidgin_media_dispose (GObject *object);
+static void pidgin_media_finalize (GObject *object);
+static void pidgin_media_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void pidgin_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+static void pidgin_media_set_state(PidginMedia *gtkmedia, PidginMediaState state);
+
+static GtkWindowClass *parent_class = NULL;
+
+
+#if 0
+enum {
+	LAST_SIGNAL
+};
+static guint pidgin_media_signals[LAST_SIGNAL] = {0};
+#endif
+
+enum {
+	PROP_0,
+	PROP_MEDIA,
+	PROP_SCREENNAME
+};
+
+static GType
+pidgin_media_get_type(void)
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof(PidginMediaClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) pidgin_media_class_init,
+			NULL,
+			NULL,
+			sizeof(PidginMedia),
+			0,
+			(GInstanceInitFunc) pidgin_media_init,
+			NULL
+		};
+		type = g_type_register_static(GTK_TYPE_WINDOW, "PidginMedia", &info, 0);
+	}
+	return type;
+}
+
+
+static void
+pidgin_media_class_init (PidginMediaClass *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+/*	GtkContainerClass *container_class = (GtkContainerClass*)klass; */
+	parent_class = g_type_class_peek_parent(klass);
+
+	gobject_class->dispose = pidgin_media_dispose;
+	gobject_class->finalize = pidgin_media_finalize;
+	gobject_class->set_property = pidgin_media_set_property;
+	gobject_class->get_property = pidgin_media_get_property;
+
+	g_object_class_install_property(gobject_class, PROP_MEDIA,
+			g_param_spec_object("media",
+			"PurpleMedia",
+			"The PurpleMedia associated with this media.",
+			PURPLE_TYPE_MEDIA,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+	g_object_class_install_property(gobject_class, PROP_SCREENNAME,
+			g_param_spec_string("screenname",
+			"Screenname",
+			"The screenname of the user this session is with.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	g_type_class_add_private(klass, sizeof(PidginMediaPrivate));
+}
+
+static void
+pidgin_media_mute_toggled(GtkToggleButton *toggle, PidginMedia *media)
+{
+	purple_media_stream_info(media->priv->media,
+			gtk_toggle_button_get_active(toggle) ?
+			PURPLE_MEDIA_INFO_MUTE : PURPLE_MEDIA_INFO_UNMUTE,
+			NULL, NULL, TRUE);
+}
+
+static void
+pidgin_media_pause_toggled(GtkToggleButton *toggle, PidginMedia *media)
+{
+	purple_media_stream_info(media->priv->media,
+			gtk_toggle_button_get_active(toggle) ?
+			PURPLE_MEDIA_INFO_PAUSE : PURPLE_MEDIA_INFO_UNPAUSE,
+			NULL, NULL, TRUE);
+}
+
+static gboolean
+pidgin_media_delete_event_cb(GtkWidget *widget,
+		GdkEvent *event, PidginMedia *media)
+{
+	if (media->priv->media)
+		purple_media_stream_info(media->priv->media,
+				PURPLE_MEDIA_INFO_HANGUP, NULL, NULL, TRUE);
+	return FALSE;
+}
+
+#ifdef HAVE_X11
+static int
+pidgin_x_error_handler(Display *display, XErrorEvent *event)
+{
+	const gchar *error_type;
+	switch (event->error_code) {
+#define XERRORCASE(type) case type: error_type = #type; break
+		XERRORCASE(BadAccess);
+		XERRORCASE(BadAlloc);
+		XERRORCASE(BadAtom);
+		XERRORCASE(BadColor);
+		XERRORCASE(BadCursor);
+		XERRORCASE(BadDrawable);
+		XERRORCASE(BadFont);
+		XERRORCASE(BadGC);
+		XERRORCASE(BadIDChoice);
+		XERRORCASE(BadImplementation);
+		XERRORCASE(BadLength);
+		XERRORCASE(BadMatch);
+		XERRORCASE(BadName);
+		XERRORCASE(BadPixmap);
+		XERRORCASE(BadRequest);
+		XERRORCASE(BadValue);
+		XERRORCASE(BadWindow);
+#undef XERRORCASE
+		default:
+			error_type = "unknown";
+			break;
+	}
+	purple_debug_error("media", "A %s Xlib error has occurred. "
+			"The program would normally crash now.\n",
+			error_type);
+	return 0;
+}
+#endif
+
+static void
+menu_hangup(gpointer data, guint action, GtkWidget *item)
+{
+	PidginMedia *gtkmedia = PIDGIN_MEDIA(data);
+	purple_media_stream_info(gtkmedia->priv->media,
+			PURPLE_MEDIA_INFO_HANGUP, NULL, NULL, TRUE);
+}
+
+static GtkItemFactoryEntry menu_items[] = {
+	{ N_("/_Media"), NULL, NULL, 0, "<Branch>", NULL },
+	{ N_("/Media/_Hangup"), NULL, menu_hangup, 0, "<Item>", NULL },
+};
+
+static gint menu_item_count = sizeof(menu_items) / sizeof(menu_items[0]);
+
+static const char *
+item_factory_translate_func (const char *path, gpointer func_data)
+{
+	return _(path);
+}
+
+static GtkWidget *
+setup_menubar(PidginMedia *window)
+{
+	GtkAccelGroup *accel_group;
+	GtkWidget *menu;
+
+	accel_group = gtk_accel_group_new ();
+	gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
+	g_object_unref(accel_group);
+
+	window->priv->item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR,
+			"<main>", accel_group);
+
+	gtk_item_factory_set_translate_func(window->priv->item_factory,
+			(GtkTranslateFunc)item_factory_translate_func,
+			NULL, NULL);
+
+	gtk_item_factory_create_items(window->priv->item_factory,
+			menu_item_count, menu_items, window);
+	g_signal_connect(G_OBJECT(accel_group), "accel-changed",
+			G_CALLBACK(pidgin_save_accels_cb), NULL);
+
+	menu = gtk_item_factory_get_widget(
+			window->priv->item_factory, "<main>");
+
+	gtk_widget_show(menu);
+	return menu;
+}
+
+static void
+pidgin_media_init (PidginMedia *media)
+{
+	GtkWidget *vbox;
+	media->priv = PIDGIN_MEDIA_GET_PRIVATE(media);
+
+#ifdef HAVE_X11
+	XSetErrorHandler(pidgin_x_error_handler);
+#endif
+
+	vbox = gtk_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(media), vbox);
+
+	media->priv->statusbar = gtk_statusbar_new();
+	gtk_box_pack_end(GTK_BOX(vbox), media->priv->statusbar,
+			FALSE, FALSE, 0);
+	gtk_statusbar_push(GTK_STATUSBAR(media->priv->statusbar),
+			0, _("Calling..."));
+	gtk_widget_show(media->priv->statusbar);
+
+	media->priv->menubar = setup_menubar(media);
+	gtk_box_pack_start(GTK_BOX(vbox), media->priv->menubar,
+			FALSE, TRUE, 0);
+
+	media->priv->display = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+	gtk_container_set_border_width(GTK_CONTAINER(media->priv->display),
+			PIDGIN_HIG_BOX_SPACE);
+	gtk_box_pack_start(GTK_BOX(vbox), media->priv->display,
+			TRUE, TRUE, PIDGIN_HIG_BOX_SPACE);
+	gtk_widget_show(vbox);
+
+	g_signal_connect(G_OBJECT(media), "delete-event",
+			G_CALLBACK(pidgin_media_delete_event_cb), media);
+}
+
+static void
+level_message_cb(PurpleMedia *media, gchar *session_id, gchar *participant,
+		double level, PidginMedia *gtkmedia)
+{
+	GtkWidget *progress;
+	if (participant == NULL)
+		progress = gtkmedia->priv->send_progress;
+	else
+		progress = gtkmedia->priv->recv_progress;
+	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress), level);
+}
+
+
+static void
+pidgin_media_disconnect_levels(PurpleMedia *media, PidginMedia *gtkmedia)
+{
+	PurpleMediaManager *manager = purple_media_get_manager(media);
+	GstElement *element = purple_media_manager_get_pipeline(manager);
+	gulong handler_id = g_signal_handler_find(G_OBJECT(gst_pipeline_get_bus(GST_PIPELINE(element))),
+						  G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, 
+						  NULL, G_CALLBACK(level_message_cb), gtkmedia);
+	if (handler_id)
+		g_signal_handler_disconnect(G_OBJECT(gst_pipeline_get_bus(GST_PIPELINE(element))),
+					    handler_id);
+}
+
+static void
+pidgin_media_dispose(GObject *media)
+{
+	PidginMedia *gtkmedia = PIDGIN_MEDIA(media);
+	purple_debug_info("gtkmedia", "pidgin_media_dispose\n");
+
+	if (gtkmedia->priv->media) {
+		purple_request_close_with_handle(gtkmedia);
+		purple_media_remove_output_windows(gtkmedia->priv->media);
+		pidgin_media_disconnect_levels(gtkmedia->priv->media, gtkmedia);
+		g_object_unref(gtkmedia->priv->media);
+		gtkmedia->priv->media = NULL;
+	}
+
+	if (gtkmedia->priv->item_factory) {
+		g_object_unref(gtkmedia->priv->item_factory);
+		gtkmedia->priv->item_factory = NULL;
+	}
+
+	G_OBJECT_CLASS(parent_class)->dispose(media);
+}
+
+static void
+pidgin_media_finalize(GObject *media)
+{
+	/* PidginMedia *gtkmedia = PIDGIN_MEDIA(media); */
+	purple_debug_info("gtkmedia", "pidgin_media_finalize\n");
+
+	G_OBJECT_CLASS(parent_class)->finalize(media);
+}
+
+static void
+pidgin_media_emit_message(PidginMedia *gtkmedia, const char *msg)
+{
+	PurpleConversation *conv = purple_find_conversation_with_account(
+			PURPLE_CONV_TYPE_ANY, gtkmedia->priv->screenname,
+			purple_media_get_account(gtkmedia->priv->media));
+	if (conv != NULL)
+		purple_conversation_write(conv, NULL, msg,
+				PURPLE_MESSAGE_SYSTEM, time(NULL));
+}
+
+typedef struct
+{
+	PidginMedia *gtkmedia;
+	gchar *session_id;
+	gchar *participant;
+} PidginMediaRealizeData;
+
+static gboolean
+realize_cb_cb(PidginMediaRealizeData *data)
+{
+	PidginMediaPrivate *priv = data->gtkmedia->priv;
+	gulong window_id;
+
+#ifdef _WIN32
+	if (data->participant == NULL)
+		window_id = GDK_WINDOW_HWND(priv->local_video->window);
+	else
+		window_id = GDK_WINDOW_HWND(priv->remote_video->window);
+#elif defined(HAVE_X11)
+	if (data->participant == NULL)
+		window_id = GDK_WINDOW_XWINDOW(priv->local_video->window);
+	else
+		window_id = GDK_WINDOW_XWINDOW(priv->remote_video->window);
+#else
+#	error "Unsupported windowing system"
+#endif
+
+	purple_media_set_output_window(priv->media, data->session_id,
+			data->participant, window_id);
+
+	g_free(data->session_id);
+	g_free(data->participant);
+	g_free(data);
+	return FALSE;
+}
+
+static void
+realize_cb(GtkWidget *widget, PidginMediaRealizeData *data)
+{
+	g_timeout_add(0, (GSourceFunc)realize_cb_cb, data);
+}
+
+static void
+pidgin_media_error_cb(PidginMedia *media, const char *error, PidginMedia *gtkmedia)
+{
+	PurpleConversation *conv = purple_find_conversation_with_account(
+			PURPLE_CONV_TYPE_ANY, gtkmedia->priv->screenname,
+			purple_media_get_account(gtkmedia->priv->media));
+	if (conv != NULL)
+		purple_conversation_write(conv, NULL, error,
+				PURPLE_MESSAGE_ERROR, time(NULL));
+	gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
+			0, error);
+}
+
+static void
+pidgin_media_accept_cb(PurpleMedia *media, int index)
+{
+	purple_media_stream_info(media, PURPLE_MEDIA_INFO_ACCEPT,
+			NULL, NULL, TRUE);
+}
+
+static void
+pidgin_media_reject_cb(PurpleMedia *media, int index)
+{
+	purple_media_stream_info(media, PURPLE_MEDIA_INFO_REJECT,
+			NULL, NULL, TRUE);
+}
+
+static gboolean
+pidgin_request_timeout_cb(PidginMedia *gtkmedia)
+{
+	PurpleAccount *account;
+	PurpleBuddy *buddy;
+	const gchar *alias;
+	PurpleMediaSessionType type;
+	gchar *message = NULL;
+
+	account = purple_media_get_account(gtkmedia->priv->media);
+	buddy = purple_find_buddy(account, gtkmedia->priv->screenname);
+	alias = buddy ? purple_buddy_get_contact_alias(buddy) :
+			gtkmedia->priv->screenname;
+	type = gtkmedia->priv->request_type;
+	gtkmedia->priv->timeout_id = 0;
+
+	if (type & PURPLE_MEDIA_AUDIO && type & PURPLE_MEDIA_VIDEO) {
+		message = g_strdup_printf(_("%s wishes to start an audio/video session with you."),
+				alias);
+	} else if (type & PURPLE_MEDIA_AUDIO) {
+		message = g_strdup_printf(_("%s wishes to start an audio session with you."),
+				alias);
+	} else if (type & PURPLE_MEDIA_VIDEO) {
+		message = g_strdup_printf(_("%s wishes to start a video session with you."),
+				alias);
+	}
+
+	gtkmedia->priv->request_type = PURPLE_MEDIA_NONE;
+
+	purple_request_accept_cancel(gtkmedia, _("Incoming Call"),
+			message, NULL, PURPLE_DEFAULT_ACTION_NONE,
+			(void*)account, gtkmedia->priv->screenname, NULL,
+			gtkmedia->priv->media,
+			pidgin_media_accept_cb,
+			pidgin_media_reject_cb);
+	pidgin_media_emit_message(gtkmedia, message);
+	g_free(message);
+	return FALSE;
+}
+
+static void
+#if GTK_CHECK_VERSION(2,12,0)
+pidgin_media_input_volume_changed(GtkScaleButton *range, double value,
+		PurpleMedia *media)
+{
+	double val = (double)value * 100.0;
+#else
+pidgin_media_input_volume_changed(GtkRange *range, PurpleMedia *media)
+{
+	double val = (double)gtk_range_get_value(GTK_RANGE(range));
+#endif
+	purple_media_set_input_volume(media, NULL, val);
+}
+
+static void
+#if GTK_CHECK_VERSION(2,12,0)
+pidgin_media_output_volume_changed(GtkScaleButton *range, double value,
+		PurpleMedia *media)
+{
+	double val = (double)value * 100.0;
+#else
+pidgin_media_output_volume_changed(GtkRange *range, PurpleMedia *media)
+{
+	double val = (double)gtk_range_get_value(GTK_RANGE(range));
+#endif
+	purple_media_set_output_volume(media, NULL, NULL, val);
+}
+
+static GtkWidget *
+pidgin_media_add_audio_widget(PidginMedia *gtkmedia,
+		PurpleMediaSessionType type)
+{
+	GtkWidget *volume_widget, *progress_parent, *volume, *progress;
+	double value;
+
+	if (type & PURPLE_MEDIA_SEND_AUDIO) {
+		value = purple_prefs_get_int(
+			"/purple/media/audio/volume/input");
+	} else if (type & PURPLE_MEDIA_RECV_AUDIO) {
+		value = purple_prefs_get_int(
+			"/purple/media/audio/volume/output");
+	} else
+		g_return_val_if_reached(NULL);
+
+#if GTK_CHECK_VERSION(2,12,0)
+	/* Setup widget structure */
+	volume_widget = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+	progress_parent = gtk_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(volume_widget),
+			progress_parent, TRUE, TRUE, 0);
+
+	/* Volume button */
+	volume = gtk_volume_button_new();
+	gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume), value/100.0);
+	gtk_box_pack_end(GTK_BOX(volume_widget),
+			volume, FALSE, FALSE, 0);
+#else
+	/* Setup widget structure */
+	volume_widget = gtk_vbox_new(FALSE, 0);
+	progress_parent = volume_widget;
+
+	/* Volume slider */
+	volume = gtk_hscale_new_with_range(0.0, 100.0, 5.0);
+	gtk_range_set_increments(GTK_RANGE(volume), 5.0, 25.0);
+	gtk_range_set_value(GTK_RANGE(volume), value);
+	gtk_scale_set_draw_value(GTK_SCALE(volume), FALSE);
+	gtk_box_pack_end(GTK_BOX(volume_widget),
+			volume, TRUE, FALSE, 0);
+#endif
+
+	/* Volume level indicator */
+	progress = gtk_progress_bar_new();
+	gtk_widget_set_size_request(progress, 250, 10);
+	gtk_box_pack_end(GTK_BOX(progress_parent), progress, TRUE, FALSE, 0);
+
+	if (type & PURPLE_MEDIA_SEND_AUDIO) {
+		g_signal_connect (G_OBJECT(volume), "value-changed",
+				G_CALLBACK(pidgin_media_input_volume_changed),
+				gtkmedia->priv->media);
+		gtkmedia->priv->send_progress = progress;
+	} else if (type & PURPLE_MEDIA_RECV_AUDIO) {
+		g_signal_connect (G_OBJECT(volume), "value-changed",
+				G_CALLBACK(pidgin_media_output_volume_changed),
+				gtkmedia->priv->media);
+		gtkmedia->priv->recv_progress = progress;
+	}
+
+	gtk_widget_show_all(volume_widget);
+
+	return volume_widget;
+}
+
+static void
+pidgin_media_ready_cb(PurpleMedia *media, PidginMedia *gtkmedia, const gchar *sid)
+{
+	GtkWidget *send_widget = NULL, *recv_widget = NULL, *button_widget = NULL;
+	PurpleMediaSessionType type =
+			purple_media_get_session_type(media, sid);
+
+	if (gtkmedia->priv->recv_widget == NULL
+			&& type & (PURPLE_MEDIA_RECV_VIDEO |
+			PURPLE_MEDIA_RECV_AUDIO)) {
+		recv_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);	
+		gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
+				recv_widget, TRUE, TRUE, 0);
+		gtk_widget_show(recv_widget);
+	} else
+		recv_widget = gtkmedia->priv->recv_widget;
+	if (gtkmedia->priv->send_widget == NULL
+			&& type & (PURPLE_MEDIA_SEND_VIDEO |
+			PURPLE_MEDIA_SEND_AUDIO)) {
+		send_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+		gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
+				send_widget, TRUE, TRUE, 0);
+		button_widget = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+		gtk_box_pack_end(GTK_BOX(send_widget), button_widget,
+				FALSE, FALSE, 0);
+		gtk_widget_show(GTK_WIDGET(button_widget));
+		gtk_widget_show(send_widget);
+	} else {
+		send_widget = gtkmedia->priv->send_widget;
+		button_widget = gtkmedia->priv->button_widget;
+	}
+
+	if (type & PURPLE_MEDIA_RECV_VIDEO) {
+		PidginMediaRealizeData *data;
+		GtkWidget *aspect;
+		GtkWidget *remote_video;
+		GdkColor color = {0, 0, 0, 0};
+
+		aspect = gtk_aspect_frame_new(NULL, 0.5, 0.5, 4.0/3.0, FALSE);
+		gtk_frame_set_shadow_type(GTK_FRAME(aspect), GTK_SHADOW_IN);
+		gtk_box_pack_start(GTK_BOX(recv_widget), aspect, TRUE, TRUE, 0);
+
+		data = g_new0(PidginMediaRealizeData, 1);
+		data->gtkmedia = gtkmedia;
+		data->session_id = g_strdup(sid);
+		data->participant = g_strdup(gtkmedia->priv->screenname);
+
+		remote_video = gtk_drawing_area_new();
+		gtk_widget_modify_bg(remote_video, GTK_STATE_NORMAL, &color);
+		g_signal_connect(G_OBJECT(remote_video), "realize",
+				G_CALLBACK(realize_cb), data);
+		gtk_container_add(GTK_CONTAINER(aspect), remote_video);
+		gtk_widget_set_size_request (GTK_WIDGET(remote_video), 320, 240);
+		gtk_widget_show(remote_video);
+		gtk_widget_show(aspect);
+
+		gtkmedia->priv->remote_video = remote_video;
+	}
+	if (type & PURPLE_MEDIA_SEND_VIDEO) {
+		PidginMediaRealizeData *data;
+		GtkWidget *aspect;
+		GtkWidget *local_video;
+		GdkColor color = {0, 0, 0, 0};
+
+		aspect = gtk_aspect_frame_new(NULL, 0.5, 0.5, 4.0/3.0, FALSE);
+		gtk_frame_set_shadow_type(GTK_FRAME(aspect), GTK_SHADOW_IN);
+		gtk_box_pack_start(GTK_BOX(send_widget), aspect, TRUE, TRUE, 0);
+
+		data = g_new0(PidginMediaRealizeData, 1);
+		data->gtkmedia = gtkmedia;
+		data->session_id = g_strdup(sid);
+		data->participant = NULL;
+
+		local_video = gtk_drawing_area_new();
+		gtk_widget_modify_bg(local_video, GTK_STATE_NORMAL, &color);
+		g_signal_connect(G_OBJECT(local_video), "realize",
+				G_CALLBACK(realize_cb), data);
+		gtk_container_add(GTK_CONTAINER(aspect), local_video);
+		gtk_widget_set_size_request (GTK_WIDGET(local_video), 160, 120);
+
+		gtk_widget_show(local_video);
+		gtk_widget_show(aspect);
+
+		gtkmedia->priv->pause =
+				gtk_toggle_button_new_with_mnemonic(_("_Pause"));
+		g_signal_connect(gtkmedia->priv->pause, "toggled",
+				G_CALLBACK(pidgin_media_pause_toggled),
+				gtkmedia);
+		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->pause,
+				FALSE, FALSE, 0);
+		gtk_widget_show(gtkmedia->priv->pause);
+
+		gtkmedia->priv->local_video = local_video;
+	}
+
+	if (type & PURPLE_MEDIA_RECV_AUDIO) {
+		gtk_box_pack_end(GTK_BOX(recv_widget),
+				pidgin_media_add_audio_widget(gtkmedia,
+				PURPLE_MEDIA_RECV_AUDIO), FALSE, FALSE, 0);
+	}
+	if (type & PURPLE_MEDIA_SEND_AUDIO) {
+		gtkmedia->priv->mute =
+				gtk_toggle_button_new_with_mnemonic("_Mute");
+		g_signal_connect(gtkmedia->priv->mute, "toggled",
+				G_CALLBACK(pidgin_media_mute_toggled),
+				gtkmedia);
+		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->mute,
+				FALSE, FALSE, 0);
+		gtk_widget_show(gtkmedia->priv->mute);
+
+		gtk_box_pack_end(GTK_BOX(send_widget),
+				pidgin_media_add_audio_widget(gtkmedia,
+				PURPLE_MEDIA_SEND_AUDIO), FALSE, FALSE, 0);
+	}
+
+
+	if (type & PURPLE_MEDIA_AUDIO &&
+			gtkmedia->priv->level_handler_id == 0) {
+		gtkmedia->priv->level_handler_id = g_signal_connect(
+				media, "level", G_CALLBACK(level_message_cb),
+				gtkmedia);
+	}
+
+	if (send_widget != NULL)
+		gtkmedia->priv->send_widget = send_widget;
+	if (recv_widget != NULL)
+		gtkmedia->priv->recv_widget = recv_widget;
+	if (button_widget != NULL)
+		gtkmedia->priv->button_widget = button_widget;
+
+	if (purple_media_is_initiator(media, sid, NULL) == FALSE) {
+		if (gtkmedia->priv->timeout_id != 0)
+			g_source_remove(gtkmedia->priv->timeout_id);
+		gtkmedia->priv->request_type |= type;
+		gtkmedia->priv->timeout_id = g_timeout_add(500,
+				(GSourceFunc)pidgin_request_timeout_cb,
+				gtkmedia);
+	}
+
+	gtk_widget_show(gtkmedia->priv->display);
+}
+
+static void
+pidgin_media_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
+		gchar *sid, gchar *name, PidginMedia *gtkmedia)
+{
+	purple_debug_info("gtkmedia", "state: %d sid: %s name: %s\n",
+			state, sid ? sid : "(null)", name ? name : "(null)");
+	if (sid == NULL && name == NULL) {
+		if (state == PURPLE_MEDIA_STATE_END) {
+			pidgin_media_emit_message(gtkmedia,
+					_("The call has been terminated."));
+			gtk_widget_destroy(GTK_WIDGET(gtkmedia));
+		}
+	} else if (state == PURPLE_MEDIA_STATE_NEW &&
+			sid != NULL && name != NULL) {
+		pidgin_media_ready_cb(media, gtkmedia, sid);
+	}
+}
+
+static void
+pidgin_media_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
+		gchar *sid, gchar *name, gboolean local,
+		PidginMedia *gtkmedia)
+{
+	if (type == PURPLE_MEDIA_INFO_REJECT) {
+		pidgin_media_emit_message(gtkmedia,
+				_("You have rejected the call."));
+	} else if (type == PURPLE_MEDIA_INFO_ACCEPT) {
+		pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED);
+		pidgin_media_emit_message(gtkmedia, _("Call in progress."));
+		gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
+				0, _("Call in progress."));
+		gtk_widget_show(GTK_WIDGET(gtkmedia));
+	}
+}
+
+static void
+pidgin_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	PidginMedia *media;
+	g_return_if_fail(PIDGIN_IS_MEDIA(object));
+
+	media = PIDGIN_MEDIA(object);
+	switch (prop_id) {
+		case PROP_MEDIA:
+		{
+			if (media->priv->media)
+				g_object_unref(media->priv->media);
+			media->priv->media = g_value_get_object(value);
+			g_object_ref(media->priv->media);
+
+			if (purple_media_is_initiator(media->priv->media,
+					 NULL, NULL) == TRUE)
+				pidgin_media_set_state(media, PIDGIN_MEDIA_WAITING);
+			else
+				pidgin_media_set_state(media, PIDGIN_MEDIA_REQUESTED);
+
+			g_signal_connect(G_OBJECT(media->priv->media), "error",
+				G_CALLBACK(pidgin_media_error_cb), media);
+			g_signal_connect(G_OBJECT(media->priv->media), "state-changed",
+				G_CALLBACK(pidgin_media_state_changed_cb), media);
+			g_signal_connect(G_OBJECT(media->priv->media), "stream-info",
+				G_CALLBACK(pidgin_media_stream_info_cb), media);
+			break;
+		}
+		case PROP_SCREENNAME:
+			if (media->priv->screenname)
+				g_free(media->priv->screenname);
+			media->priv->screenname = g_value_dup_string(value);
+			break;
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+pidgin_media_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	PidginMedia *media;
+	g_return_if_fail(PIDGIN_IS_MEDIA(object));
+
+	media = PIDGIN_MEDIA(object);
+
+	switch (prop_id) {
+		case PROP_MEDIA:
+			g_value_set_object(value, media->priv->media);
+			break;
+		case PROP_SCREENNAME:
+			g_value_set_string(value, media->priv->screenname);
+			break;
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+			break;
+	}
+}
+
+static GtkWidget *
+pidgin_media_new(PurpleMedia *media, const gchar *screenname)
+{
+	PidginMedia *gtkmedia = g_object_new(pidgin_media_get_type(),
+					     "media", media,
+					     "screenname", screenname, NULL);
+	return GTK_WIDGET(gtkmedia);
+}
+
+static void
+pidgin_media_set_state(PidginMedia *gtkmedia, PidginMediaState state)
+{
+	gtkmedia->priv->state = state;
+}
+
+static gboolean
+pidgin_media_new_cb(PurpleMediaManager *manager, PurpleMedia *media,
+		PurpleAccount *account, gchar *screenname, gpointer nul)
+{
+	PidginMedia *gtkmedia = PIDGIN_MEDIA(
+			pidgin_media_new(media, screenname));
+	PurpleBuddy *buddy = purple_find_buddy(account, screenname);
+	const gchar *alias = buddy ? 
+			purple_buddy_get_contact_alias(buddy) : screenname; 
+	gtk_window_set_title(GTK_WINDOW(gtkmedia), alias);
+
+	if (purple_media_is_initiator(media, NULL, NULL) == TRUE)
+		gtk_widget_show(GTK_WIDGET(gtkmedia));
+
+	return TRUE;
+}
+
+static GstElement *
+create_default_video_src(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant)
+{
+	GstElement *sendbin, *src, *videoscale, *capsfilter;
+	GstPad *pad;
+	GstPad *ghost;
+	GstCaps *caps;
+
+#ifdef _WIN32
+	/* autovideosrc doesn't pick ksvideosrc for some reason */
+	src = gst_element_factory_make("ksvideosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("dshowvideosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("autovideosrc", NULL);
+#else
+	src = gst_element_factory_make("gconfvideosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("autovideosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("v4l2src", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("v4lsrc", NULL);
+#endif
+	if (src == NULL) {
+		purple_debug_error("gtkmedia", "Unable to find a suitable "
+				"element for the default video source.\n");
+		return NULL;
+	}
+
+	sendbin = gst_bin_new("pidgindefaultvideosrc");
+	videoscale = gst_element_factory_make("videoscale", NULL);
+	capsfilter = gst_element_factory_make("capsfilter", NULL);
+
+	/* It was recommended to set the size <= 352x288 and framerate <= 20 */
+	caps = gst_caps_from_string("video/x-raw-yuv , width=[250,352] , "
+			"height=[200,288] , framerate=[1/1,20/1]");
+	g_object_set(G_OBJECT(capsfilter), "caps", caps, NULL);
+
+	gst_bin_add_many(GST_BIN(sendbin), src,
+			videoscale, capsfilter, NULL);
+	gst_element_link_many(src, videoscale, capsfilter, NULL);
+
+	pad = gst_element_get_static_pad(capsfilter, "src");
+	ghost = gst_ghost_pad_new("ghostsrc", pad);
+	gst_object_unref(pad);
+	gst_element_add_pad(sendbin, ghost);
+
+	return sendbin;
+}
+
+static GstElement *
+create_default_video_sink(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant)
+{
+	GstElement *sink = gst_element_factory_make("gconfvideosink", NULL);
+	if (sink == NULL)
+		sink = gst_element_factory_make("autovideosink", NULL);
+	if (sink == NULL)
+		purple_debug_error("gtkmedia", "Unable to find a suitable "
+				"element for the default video sink.\n");
+	return sink;
+}
+
+static GstElement *
+create_default_audio_src(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant)
+{
+	GstElement *src;
+	src = gst_element_factory_make("gconfaudiosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("autoaudiosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("alsasrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("osssrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("dshowaudiosrc", NULL);
+	if (src == NULL) {
+		purple_debug_error("gtkmedia", "Unable to find a suitable "
+				"element for the default audio source.\n");
+		return NULL;
+	}
+	gst_element_set_name(src, "pidgindefaultaudiosrc");
+	return src;
+}
+
+static GstElement *
+create_default_audio_sink(PurpleMedia *media,
+		const gchar *session_id, const gchar *participant)
+{
+	GstElement *sink;
+	sink = gst_element_factory_make("gconfaudiosink", NULL);
+	if (sink == NULL)
+		sink = gst_element_factory_make("autoaudiosink",NULL);
+	if (sink == NULL) {
+		purple_debug_error("gtkmedia", "Unable to find a suitable "
+				"element for the default audio sink.\n");
+		return NULL;
+	}
+	return sink;
+}
+#endif  /* USE_VV */
+
+void
+pidgin_medias_init(void)
+{
+#ifdef USE_VV
+	PurpleMediaManager *manager = purple_media_manager_get();
+	PurpleMediaElementInfo *default_video_src =
+			g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
+			"id", "pidgindefaultvideosrc",
+			"name", "Pidgin Default Video Source",
+			"type", PURPLE_MEDIA_ELEMENT_VIDEO
+					| PURPLE_MEDIA_ELEMENT_SRC
+					| PURPLE_MEDIA_ELEMENT_ONE_SRC
+					| PURPLE_MEDIA_ELEMENT_UNIQUE,
+			"create-cb", create_default_video_src, NULL);
+	PurpleMediaElementInfo *default_video_sink =
+			g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
+			"id", "pidgindefaultvideosink",
+			"name", "Pidgin Default Video Sink",
+			"type", PURPLE_MEDIA_ELEMENT_VIDEO
+					| PURPLE_MEDIA_ELEMENT_SINK
+					| PURPLE_MEDIA_ELEMENT_ONE_SINK,
+			"create-cb", create_default_video_sink, NULL);
+	PurpleMediaElementInfo *default_audio_src =
+			g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
+			"id", "pidgindefaultaudiosrc",
+			"name", "Pidgin Default Audio Source",
+			"type", PURPLE_MEDIA_ELEMENT_AUDIO
+					| PURPLE_MEDIA_ELEMENT_SRC
+					| PURPLE_MEDIA_ELEMENT_ONE_SRC
+					| PURPLE_MEDIA_ELEMENT_UNIQUE,
+			"create-cb", create_default_audio_src, NULL);
+	PurpleMediaElementInfo *default_audio_sink =
+			g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
+			"id", "pidgindefaultaudiosink",
+			"name", "Pidgin Default Audio Sink",
+			"type", PURPLE_MEDIA_ELEMENT_AUDIO
+					| PURPLE_MEDIA_ELEMENT_SINK
+					| PURPLE_MEDIA_ELEMENT_ONE_SINK,
+			"create-cb", create_default_audio_sink, NULL);
+
+	g_signal_connect(G_OBJECT(manager), "init-media",
+			 G_CALLBACK(pidgin_media_new_cb), NULL);
+
+	purple_media_manager_set_ui_caps(manager, 
+			PURPLE_MEDIA_CAPS_AUDIO |
+			PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION |
+			PURPLE_MEDIA_CAPS_VIDEO |
+			PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION |
+			PURPLE_MEDIA_CAPS_AUDIO_VIDEO);
+
+	purple_debug_info("gtkmedia", "Registering media element types\n");
+	purple_media_manager_set_active_element(manager, default_video_src);
+	purple_media_manager_set_active_element(manager, default_video_sink);
+	purple_media_manager_set_active_element(manager, default_audio_src);
+	purple_media_manager_set_active_element(manager, default_audio_sink);
+#endif
+}
+
diff --git a/pidgin/gtkmedia.h b/pidgin/gtkmedia.h
new file mode 100644
index 0000000000..a87af78b6d
--- /dev/null
+++ b/pidgin/gtkmedia.h
@@ -0,0 +1,36 @@
+/**
+ * @file gtkmedia.h Pidgin Media API
+ * @ingroup pidgin
+ */
+
+/* Pidgin
+ *
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __GTKMEDIA_H_
+#define __GTKMEDIA_H_
+
+G_BEGIN_DECLS
+
+void pidgin_medias_init(void);
+
+G_END_DECLS
+
+#endif  /* __GTKMEDIA_H_ */
diff --git a/pidgin/gtkmenutray.c b/pidgin/gtkmenutray.c
index e1fa249e15..d74f9ced4f 100644
--- a/pidgin/gtkmenutray.c
+++ b/pidgin/gtkmenutray.c
@@ -21,9 +21,7 @@
 
 #include "gtkmenutray.h"
 
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
 
 /******************************************************************************
  * Enums
diff --git a/pidgin/gtkmenutray.h b/pidgin/gtkmenutray.h
index 3e94bcdc22..0661ef8425 100644
--- a/pidgin/gtkmenutray.h
+++ b/pidgin/gtkmenutray.h
@@ -24,16 +24,14 @@
 #ifndef PIDGIN_MENU_TRAY_H
 #define PIDGIN_MENU_TRAY_H
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtktooltips.h>
+#include <gtk/gtk.h>
 
-#define PIDGIN_TYPE_MENU_TRAY				(pidgin_menu_tray_get_gtype())
-#define PIDGIN_MENU_TRAY(obj)				(GTK_CHECK_CAST((obj), PIDGIN_TYPE_MENU_TRAY, PidginMenuTray))
-#define PIDGIN_MENU_TRAY_CLASS(klass)		(GTK_CHECK_CLASS_CAST((klass), PIDGIN_TYPE_MENU_TRAY, PidginMenuTrayClass))
-#define PIDGIN_IS_MENU_TRAY(obj)			(GTK_CHECK_TYPE((obj), PIDGIN_TYPE_MENU_TRAY))
-#define PIDGIN_IS_MENU_TRAY_CLASS(klass)	(GTK_CHECK_CLASS_TYPE((klass), PIDGIN_TYPE_MENU_TRAY))
-#define PIDGIN_MENU_TRAY_GET_CLASS(obj)	(GTK_CHECK_GET_CLASS((obj), PIDGIN_TYPE_MENU_TRAY, PidginMenuTrayClass))
+#define PIDGIN_TYPE_MENU_TRAY            (pidgin_menu_tray_get_gtype())
+#define PIDGIN_MENU_TRAY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_MENU_TRAY, PidginMenuTray))
+#define PIDGIN_MENU_TRAY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PIDGIN_TYPE_MENU_TRAY, PidginMenuTrayClass))
+#define PIDGIN_IS_MENU_TRAY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PIDGIN_TYPE_MENU_TRAY))
+#define PIDGIN_IS_MENU_TRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PIDGIN_TYPE_MENU_TRAY))
+#define PIDGIN_MENU_TRAY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PIDGIN_TYPE_MENU_TRAY, PidginMenuTrayClass))
 
 typedef struct _PidginMenuTray				PidginMenuTray;
 typedef struct _PidginMenuTrayClass		PidginMenuTrayClass;
diff --git a/pidgin/gtknotify.c b/pidgin/gtknotify.c
index 288bc83d4a..b12669316b 100644
--- a/pidgin/gtknotify.c
+++ b/pidgin/gtknotify.c
@@ -28,6 +28,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
+#include "account.h"
 #include "connection.h"
 #include "debug.h"
 #include "prefs.h"
@@ -37,6 +38,7 @@
 #include "gtkblist.h"
 #include "gtkimhtml.h"
 #include "gtknotify.h"
+#include "gtkpounce.h"
 #include "gtkutils.h"
 
 typedef struct
@@ -57,6 +59,13 @@ typedef struct
 typedef struct
 {
 	PurpleAccount *account;
+	PurplePounce *pounce;
+} PidginNotifyPounceData;
+
+
+typedef struct
+{
+	PurpleAccount *account;
 	GtkListStore *model;
 	GtkWidget *treeview;
 	GtkWidget *window;
@@ -80,21 +89,46 @@ enum
 	COLUMNS_PIDGIN_MAIL
 };
 
-typedef struct _PidginMailDialog PidginMailDialog;
+enum
+{
+	PIDGIN_POUNCE_ICON,
+	PIDGIN_POUNCE_ALIAS,
+	PIDGIN_POUNCE_EVENT,
+	PIDGIN_POUNCE_TEXT,
+	PIDGIN_POUNCE_DATE,
+	PIDGIN_POUNCE_DATA,
+	COLUMNS_PIDGIN_POUNCE
+};
+
 
-struct _PidginMailDialog
+typedef struct _PidginNotifyDialog
 {
+	/*
+	 * This must be first so PidginNotifyDialog can masquerade as the
+	 * dialog widget.
+	 */
 	GtkWidget *dialog;
 	GtkWidget *treeview;
 	GtkTreeStore *treemodel;
 	GtkLabel *label;
 	GtkWidget *open_button;
+	GtkWidget *dismiss_button;
+	GtkWidget *edit_button;
 	int total_count;
 	gboolean in_use;
-};
+} PidginNotifyDialog;
+
+typedef enum
+{
+	PIDGIN_NOTIFY_MAIL,
+	PIDGIN_NOTIFY_POUNCE,
+	PIDGIN_NOTIFY_TYPES
+} PidginNotifyType;
 
-static PidginMailDialog *mail_dialog = NULL;
+static PidginNotifyDialog *mail_dialog = NULL;
+static PidginNotifyDialog *pounce_dialog = NULL;
 
+static PidginNotifyDialog *pidgin_create_notification_dialog(PidginNotifyType type);
 static void *pidgin_notify_emails(PurpleConnection *gc, size_t count, gboolean detailed,
 									const char **subjects,
 									const char **froms, const char **tos,
@@ -109,30 +143,194 @@ message_response_cb(GtkDialog *dialog, gint id, GtkWidget *widget)
 }
 
 static void
-email_response_cb(GtkDialog *dlg, gint id, PidginMailDialog *dialog)
+pounce_response_close(PidginNotifyDialog *dialog)
+{
+	GtkTreeIter iter;
+	PidginNotifyPounceData *pounce_data;
+
+	while (gtk_tree_model_get_iter_first(
+				GTK_TREE_MODEL(pounce_dialog->treemodel), &iter)) {
+		gtk_tree_model_get(GTK_TREE_MODEL(pounce_dialog->treemodel), &iter,
+				PIDGIN_POUNCE_DATA, &pounce_data,
+				-1);
+		gtk_tree_store_remove(dialog->treemodel, &iter);
+
+		g_free(pounce_data);
+	}
+
+	gtk_widget_destroy(pounce_dialog->dialog);
+	g_free(pounce_dialog);
+	pounce_dialog = NULL;
+}
+
+static void
+delete_foreach(GtkTreeModel *model, GtkTreePath *path,
+		GtkTreeIter *iter, gpointer data)
+{
+	PidginNotifyPounceData *pounce_data;
+
+	gtk_tree_model_get(model, iter,
+			PIDGIN_POUNCE_DATA, &pounce_data,
+			-1);
+
+	if (pounce_data != NULL)
+		g_free(pounce_data);
+}
+
+static void
+append_to_list(GtkTreeModel *model, GtkTreePath *path,
+		GtkTreeIter *iter, gpointer data)
+{
+	GList **list = data;
+	*list = g_list_prepend(*list, gtk_tree_path_copy(path));
+}
+static void
+pounce_response_dismiss()
+{
+	GtkTreeSelection *selection;
+	GList *list = NULL;
+
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(pounce_dialog->treeview));
+	gtk_tree_selection_selected_foreach(selection, delete_foreach, pounce_dialog);
+	gtk_tree_selection_selected_foreach(selection, append_to_list, &list);
+
+	while (list) {
+		GtkTreeIter iter;
+		if (gtk_tree_model_get_iter(GTK_TREE_MODEL(pounce_dialog->treemodel), &iter,
+					list->data)) {
+			gtk_tree_store_remove(GTK_TREE_STORE(pounce_dialog->treemodel), &iter);
+		}
+		gtk_tree_path_free(list->data);
+		list = g_list_delete_link(list, list);
+	}
+}
+
+static void
+pounce_response_edit_cb(GtkTreeModel *model, GtkTreePath *path,
+		GtkTreeIter *iter, gpointer data)
+{
+	PidginNotifyPounceData *pounce_data;
+	PidginNotifyDialog *dialog = (PidginNotifyDialog*)data;
+	PurplePounce *pounce;
+	GList *list;
+
+	list = purple_pounces_get_all();
+
+	gtk_tree_model_get(GTK_TREE_MODEL(dialog->treemodel), iter,
+			PIDGIN_POUNCE_DATA, &pounce_data,
+			-1);
+
+	for (; list != NULL; list = list->next) {
+		pounce = list->data;
+		if (pounce == pounce_data->pounce) {
+			pidgin_pounce_editor_show(pounce_data->account, NULL, pounce_data->pounce);
+			return;
+		}
+	}
+
+	purple_debug_warning("gtknotify", "Pounce was destroyed.\n");
+}
+
+static void
+pounce_response_cb(GtkDialog *dlg, gint id, PidginNotifyDialog *dialog)
+{
+	GtkTreeSelection *selection = NULL;
+
+	switch (id) {
+		case GTK_RESPONSE_CLOSE:
+		case GTK_RESPONSE_DELETE_EVENT:
+			pounce_response_close(dialog);
+			break;
+		case GTK_RESPONSE_NO:
+			pounce_response_dismiss();
+			break;
+		case GTK_RESPONSE_APPLY:
+			selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview));
+			gtk_tree_selection_selected_foreach(selection, pounce_response_edit_cb,
+					dialog);
+			break;
+	}
+}
+
+static void
+pounce_row_selected_cb(GtkTreeView *tv, GtkTreePath *path,
+	GtkTreeViewColumn *col, gpointer data)
+{
+	GtkTreeIter iter;
+	GtkTreeSelection *selection;
+	gboolean selected;
+	GList *list;
+
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(pounce_dialog->treeview));
+
+	selected = gtk_tree_selection_get_selected(selection,
+			NULL, &iter);
+
+	if (selected) {
+		PurplePounce *pounce;
+		PidginNotifyPounceData *pounce_data;
+
+		list = purple_pounces_get_all();
+
+		gtk_tree_model_get(GTK_TREE_MODEL(pounce_dialog->treemodel), &iter,
+				PIDGIN_POUNCE_DATA, &pounce_data,
+				-1);
+
+		gtk_widget_set_sensitive(pounce_dialog->edit_button, FALSE);
+
+		for (; list != NULL; list = list->next) {
+			pounce = list->data;
+			if (pounce == pounce_data->pounce) {
+				gtk_widget_set_sensitive(pounce_dialog->edit_button, TRUE);
+				break;
+			}
+		}
+
+		gtk_widget_set_sensitive(pounce_dialog->dismiss_button, TRUE);
+	} else {
+		gtk_widget_set_sensitive(pounce_dialog->edit_button, FALSE);
+		gtk_widget_set_sensitive(pounce_dialog->dismiss_button, FALSE);
+	}
+
+
+}
+
+static void
+reset_mail_dialog(GtkDialog *unused)
+{
+	if (mail_dialog->in_use)
+		return;
+	gtk_widget_destroy(mail_dialog->dialog);
+	g_free(mail_dialog);
+	mail_dialog = NULL;
+}
+
+static void
+email_response_cb(GtkDialog *unused, gint id, PidginNotifyDialog *unused2)
 {
 	PidginNotifyMailData *data = NULL;
+	GtkTreeModel *model = GTK_TREE_MODEL(mail_dialog->treemodel);
 	GtkTreeIter iter;
 
 	if (id == GTK_RESPONSE_YES)
 	{
+		/* A single row activated. Remove that row. */
 		GtkTreeSelection *selection;
 
-		selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview));
+		selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(mail_dialog->treeview));
 
 		if (gtk_tree_selection_get_selected(selection, NULL, &iter))
 		{
-			gtk_tree_model_get(GTK_TREE_MODEL(dialog->treemodel), &iter,
-								PIDGIN_MAIL_DATA, &data, -1);
+			gtk_tree_model_get(model, &iter, PIDGIN_MAIL_DATA, &data, -1);
 			purple_notify_uri(NULL, data->url);
 
-			gtk_tree_store_remove(dialog->treemodel, &iter);
+			gtk_tree_store_remove(mail_dialog->treemodel, &iter);
 			if (data->purple_has_handle)
 				purple_notify_close(PURPLE_NOTIFY_EMAILS, data);
 			else
 				pidgin_close_notify(PURPLE_NOTIFY_EMAILS, data);
 
-			if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(mail_dialog->treemodel), &iter))
+			if (gtk_tree_model_get_iter_first(model, &iter))
 				return;
 		}
 		else
@@ -140,38 +338,30 @@ email_response_cb(GtkDialog *dlg, gint id, PidginMailDialog *dialog)
 	}
 	else
 	{
-		while (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(mail_dialog->treemodel), &iter))
+		/* Remove all the rows */
+		while (gtk_tree_model_get_iter_first(model, &iter))
 		{
-			gtk_tree_model_get(GTK_TREE_MODEL(dialog->treemodel), &iter,
-								PIDGIN_MAIL_DATA, &data, -1);
+			gtk_tree_model_get(model, &iter, PIDGIN_MAIL_DATA, &data, -1);
 
 			if (id == GTK_RESPONSE_ACCEPT)
 				purple_notify_uri(NULL, data->url);
 
-			gtk_tree_store_remove(dialog->treemodel, &iter);
+			gtk_tree_store_remove(mail_dialog->treemodel, &iter);
 			if (data->purple_has_handle)
 				purple_notify_close(PURPLE_NOTIFY_EMAILS, data);
 			else
 				pidgin_close_notify(PURPLE_NOTIFY_EMAILS, data);
 		}
 	}
-	gtk_widget_destroy(dialog->dialog);
-	g_free(dialog);
-	mail_dialog = NULL;
-}
 
-static void email_row_activated_cb(GtkTreeView *tv, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data) {
-	email_response_cb(GTK_DIALOG(mail_dialog->dialog), GTK_RESPONSE_YES, mail_dialog);
+	reset_mail_dialog(NULL);
 }
 
 static void
-reset_mail_dialog(GtkDialog *dialog)
+email_row_activated_cb(GtkTreeView *tv, GtkTreePath *path,
+                       GtkTreeViewColumn *col, gpointer data)
 {
-	if (mail_dialog->in_use)
-		return;
-	gtk_widget_destroy(mail_dialog->dialog);
-	g_free(mail_dialog);
-	mail_dialog = NULL;
+	email_response_cb(NULL, GTK_RESPONSE_YES, NULL);
 }
 
 static gboolean
@@ -302,7 +492,7 @@ pidgin_notify_message(PurpleNotifyMsgType type, const char *title,
 }
 
 static void
-selection_changed_cb(GtkTreeSelection *sel, PidginMailDialog *dialog)
+selection_changed_cb(GtkTreeSelection *sel, PidginNotifyDialog *dialog)
 {
 	GtkTreeIter iter;
 	GtkTreeModel *model;
@@ -339,94 +529,6 @@ mail_window_focus_cb(GtkWidget *widget, GdkEventFocus *focus, gpointer null)
 	return 0;
 }
 
-static GtkWidget *
-pidgin_get_mail_dialog(void)
-{
-	if (mail_dialog == NULL) {
-		GtkWidget *dialog = NULL;
-		GtkWidget *label;
-		GtkWidget *sw;
-		GtkCellRenderer *rend;
-		GtkTreeViewColumn *column;
-		GtkWidget *button = NULL;
-		GtkWidget *vbox = NULL;
-
-		dialog = gtk_dialog_new_with_buttons(_("New Mail"), NULL, 0,
-						     GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-						     NULL);
-		gtk_window_set_role(GTK_WINDOW(dialog), "new_mail_detailed");
-		g_signal_connect(G_OBJECT(dialog), "focus-in-event",
-					G_CALLBACK(mail_window_focus_cb), NULL);
-
-		gtk_dialog_add_button(GTK_DIALOG(dialog),
-					 _("Open All Messages"), GTK_RESPONSE_ACCEPT);
-
-		button = gtk_dialog_add_button(GTK_DIALOG(dialog),
-						 PIDGIN_STOCK_OPEN_MAIL, GTK_RESPONSE_YES);
-
-		/* make "Open All Messages" the default response */
-		gtk_dialog_set_default_response(GTK_DIALOG(dialog),
-						GTK_RESPONSE_ACCEPT);
-
-		/* Setup the dialog */
-		gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BOX_SPACE);
-		gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BOX_SPACE);
-		gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-		gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER);
-
-		/* Vertical box */
-		vbox = GTK_DIALOG(dialog)->vbox;
-
-		/* Golden ratio it up! */
-		gtk_widget_set_size_request(dialog, 550, 400);
-
-		sw = gtk_scrolled_window_new(NULL, NULL);
-		gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
-		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-
-		mail_dialog = g_new0(PidginMailDialog, 1);
-		mail_dialog->dialog = dialog;
-		mail_dialog->open_button = button;
-
-		mail_dialog->treemodel = gtk_tree_store_new(COLUMNS_PIDGIN_MAIL,
-						GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER);
-		mail_dialog->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(mail_dialog->treemodel));
-		g_object_unref(G_OBJECT(mail_dialog->treemodel));
-		gtk_tree_view_set_search_column(GTK_TREE_VIEW(mail_dialog->treeview), PIDGIN_MAIL_TEXT);
-		gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(mail_dialog->treeview),
-			             pidgin_tree_view_search_equal_func, NULL, NULL);
-
-		g_signal_connect(G_OBJECT(dialog), "response",
-						 G_CALLBACK(email_response_cb), mail_dialog);
-		g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(mail_dialog->treeview))),
-						 "changed", G_CALLBACK(selection_changed_cb), mail_dialog);
-		g_signal_connect(G_OBJECT(mail_dialog->treeview), "row-activated", G_CALLBACK(email_row_activated_cb), NULL);
-
-		gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(mail_dialog->treeview), FALSE);
-		gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(mail_dialog->treeview), TRUE);
-		gtk_container_add(GTK_CONTAINER(sw), mail_dialog->treeview);
-
-		column = gtk_tree_view_column_new();
-		gtk_tree_view_column_set_resizable(column, TRUE);
-		rend = gtk_cell_renderer_pixbuf_new();
-		gtk_tree_view_column_pack_start(column, rend, FALSE);
-		gtk_tree_view_column_set_attributes(column, rend, "pixbuf", PIDGIN_MAIL_ICON, NULL);
-		rend = gtk_cell_renderer_text_new();
-		gtk_tree_view_column_pack_start(column, rend, TRUE);
-		gtk_tree_view_column_set_attributes(column, rend, "markup", PIDGIN_MAIL_TEXT, NULL);
-		gtk_tree_view_append_column(GTK_TREE_VIEW(mail_dialog->treeview), column);
-
-		label = gtk_label_new(NULL);
-		gtk_label_set_markup(GTK_LABEL(label), _("<span weight=\"bold\" size=\"larger\">You have mail!</span>"));
-		gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-		gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-		gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
-	}
-
-	return mail_dialog->dialog;
-}
-
 /* count == 0 means this is a detailed mail notification.
  * count > 0 mean non-detailed.
  */
@@ -446,7 +548,7 @@ pidgin_notify_add_mail(GtkTreeStore *treemodel, PurpleAccount *account, char *no
 				advanced = FALSE;
 				gtk_tree_model_get(GTK_TREE_MODEL(treemodel), &iter,
 						PIDGIN_MAIL_DATA, &data, -1);
-				if (data->account == account) {
+				if (data && data->account == account) {
 					if (clear) {
 #if GTK_CHECK_VERSION(2,2,0)
 						advanced = gtk_tree_store_remove(treemodel, &iter);
@@ -454,7 +556,12 @@ pidgin_notify_add_mail(GtkTreeStore *treemodel, PurpleAccount *account, char *no
 						gtk_tree_store_remove(treemodel, &iter);
 						advanced = (iter.stamp == 0) ? FALSE : TRUE;
 #endif
-						purple_notify_close(PURPLE_NOTIFY_EMAILS, data);
+						mail_dialog->total_count -= data->count;
+
+						if (data->purple_has_handle)
+							purple_notify_close(PURPLE_NOTIFY_EMAILS, data);
+						else
+							pidgin_close_notify(PURPLE_NOTIFY_EMAILS, data);
 						/* We're completely done if we've processed all entries */
 						if (!advanced)
 							return NULL;
@@ -490,7 +597,8 @@ pidgin_notify_add_mail(GtkTreeStore *treemodel, PurpleAccount *account, char *no
 								PIDGIN_MAIL_DATA, data,
 								-1);
 	data->account = account;
-	data->count = count;
+	/* count == 0 indicates we're adding a single detailed e-mail */
+	data->count = count > 0 ? count : 1;
 
 	if (icon)
 		g_object_unref(icon);
@@ -505,22 +613,22 @@ pidgin_notify_emails(PurpleConnection *gc, size_t count, gboolean detailed,
 					   const char **subjects, const char **froms,
 					   const char **tos, const char **urls)
 {
-	GtkWidget *dialog = NULL;
 	char *notification;
 	PurpleAccount *account;
 	PidginNotifyMailData *data = NULL, *data2;
-	gboolean new_data;
+	gboolean new_data = FALSE;
 
 	/* Don't bother updating if there aren't new emails and we don't have any displayed currently */
 	if (count == 0 && mail_dialog == NULL)
 		return NULL;
 
 	account = purple_connection_get_account(gc);
-	dialog = pidgin_get_mail_dialog();  /* This creates mail_dialog if necessary */
+	if (mail_dialog == NULL)
+		mail_dialog = pidgin_create_notification_dialog(PIDGIN_NOTIFY_MAIL);
 
 	mail_dialog->total_count += count;
 	if (detailed) {
-		while (count--) {
+		for ( ; count; --count) {
 			char *to_text = NULL;
 			char *from_text = NULL;
 			char *subject_text = NULL;
@@ -557,7 +665,7 @@ pidgin_notify_emails(PurpleConnection *gc, size_t count, gboolean detailed,
 
 			/* If we don't keep track of this, will leak "data" for each of the notifications except the last */
 			data2 = pidgin_notify_add_mail(mail_dialog->treemodel, account, notification, urls ? *urls : NULL, 0, FALSE, &new_data);
-			if (new_data) {
+			if (data2 && new_data) {
 				if (data)
 					data->purple_has_handle = FALSE;
 				data = data2;
@@ -574,29 +682,29 @@ pidgin_notify_emails(PurpleConnection *gc, size_t count, gboolean detailed,
 							   (int)count),
 							   *tos, (int)count);
 			data2 = pidgin_notify_add_mail(mail_dialog->treemodel, account, notification, urls ? *urls : NULL, count, FALSE, &new_data);
-			if (new_data) {
+			if (data2 && new_data) {
 				if (data)
 					data->purple_has_handle = FALSE;
 				data = data2;
 			}
 			g_free(notification);
 		} else {
-			GtkTreeIter iter;
-
 			/* Clear out all mails for the account */
 			pidgin_notify_add_mail(mail_dialog->treemodel, account, NULL, NULL, 0, TRUE, NULL);
 
-			if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(mail_dialog->treemodel), &iter)) {
-				/* There is no API to clear the headline specifically */
-				/* This will trigger reset_mail_dialog() */
+			if (mail_dialog->total_count == 0) {
+				/*
+				 * There is no API to clear the headline specifically
+				 * This will trigger reset_mail_dialog()
+				 */
 				pidgin_blist_set_headline(NULL, NULL, NULL, NULL, NULL);
 				return NULL;
 			}
 		}
 	}
 
-	if (!GTK_WIDGET_VISIBLE(dialog)) {
-		GdkPixbuf *pixbuf = gtk_widget_render_icon(dialog, PIDGIN_STOCK_DIALOG_MAIL,
+	if (!GTK_WIDGET_VISIBLE(mail_dialog->dialog)) {
+		GdkPixbuf *pixbuf = gtk_widget_render_icon(mail_dialog->dialog, PIDGIN_STOCK_DIALOG_MAIL,
 							   gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL), NULL);
 		char *label_text = g_strdup_printf(ngettext("<b>%d new email.</b>",
 							    "<b>%d new emails.</b>",
@@ -605,14 +713,14 @@ pidgin_notify_emails(PurpleConnection *gc, size_t count, gboolean detailed,
 										   remove the notifications when replacing an
 										   old notification. */
 		pidgin_blist_set_headline(label_text,
-					    pixbuf, G_CALLBACK(gtk_widget_show_all), dialog,
+					    pixbuf, G_CALLBACK(gtk_widget_show_all), mail_dialog->dialog,
 					    (GDestroyNotify)reset_mail_dialog);
 		mail_dialog->in_use = FALSE;
 		g_free(label_text);
 		if (pixbuf)
 			g_object_unref(pixbuf);
-	} else if (!GTK_WIDGET_HAS_FOCUS(dialog))
-		pidgin_set_urgent(GTK_WINDOW(dialog), TRUE);
+	} else if (!GTK_WIDGET_HAS_FOCUS(mail_dialog->dialog))
+		pidgin_set_urgent(GTK_WINDOW(mail_dialog->dialog), TRUE);
 
 	return data;
 }
@@ -1001,8 +1109,10 @@ pidgin_close_notify(PurpleNotifyType type, void *ui_handle)
 	{
 		PidginNotifyMailData *data = (PidginNotifyMailData *)ui_handle;
 
-		g_free(data->url);
-		g_free(data);
+		if (data) {
+			g_free(data->url);
+			g_free(data);
+		}
 	}
 	else if (type == PURPLE_NOTIFY_SEARCHRESULTS)
 	{
@@ -1234,6 +1344,241 @@ pidgin_notify_uri(const char *uri)
 	return NULL;
 }
 
+void
+pidgin_notify_pounce_add(PurpleAccount *account, PurplePounce *pounce,
+		const char *alias, const char *event, const char *message, const char *date)
+{
+	GdkPixbuf *icon;
+	GtkTreeIter iter;
+	PidginNotifyPounceData *pounce_data;
+
+	if (pounce_dialog == NULL)
+		pounce_dialog = pidgin_create_notification_dialog(PIDGIN_NOTIFY_POUNCE);
+
+	icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);
+
+	pounce_data = g_new(PidginNotifyPounceData, 1);
+
+	pounce_data->account = account;
+	pounce_data->pounce = pounce;
+
+	gtk_tree_store_append(pounce_dialog->treemodel, &iter, NULL);
+
+	gtk_tree_store_set(pounce_dialog->treemodel, &iter,
+			PIDGIN_POUNCE_ICON, icon,
+			PIDGIN_POUNCE_ALIAS, alias,
+			PIDGIN_POUNCE_EVENT, event,
+			PIDGIN_POUNCE_TEXT, (message != NULL)? message : _("No message"),
+			PIDGIN_POUNCE_DATE, date,
+			PIDGIN_POUNCE_DATA, pounce_data,
+			-1);
+
+	if (icon)
+		g_object_unref(icon);
+
+	gtk_widget_show_all(pounce_dialog->dialog);
+
+	return;
+}
+
+static PidginNotifyDialog *
+pidgin_create_notification_dialog(PidginNotifyType type)
+{
+	GtkTreeStore *model = NULL;
+	GtkWidget *dialog = NULL;
+	GtkWidget *label = NULL;
+	GtkWidget *sw;
+	GtkCellRenderer *rend;
+	GtkTreeViewColumn *column;
+	GtkWidget *button = NULL;
+	GtkWidget *vbox = NULL;
+	GtkTreeSelection *sel;
+	PidginNotifyDialog *spec_dialog = NULL;
+
+	g_return_val_if_fail(type < PIDGIN_NOTIFY_TYPES, NULL);
+
+	if (type == PIDGIN_NOTIFY_MAIL) {
+		g_return_val_if_fail(mail_dialog == NULL, mail_dialog);
+
+		model = gtk_tree_store_new(COLUMNS_PIDGIN_MAIL,
+						GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER);
+
+	} else if (type == PIDGIN_NOTIFY_POUNCE) {
+		g_return_val_if_fail(pounce_dialog == NULL, pounce_dialog);
+
+		model = gtk_tree_store_new(COLUMNS_PIDGIN_POUNCE,
+				GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+				G_TYPE_STRING, G_TYPE_POINTER);
+	}
+
+	dialog = gtk_dialog_new_with_buttons(NULL, NULL, 0,
+			GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+			NULL);
+
+	/* Setup the dialog */
+	gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BOX_SPACE);
+	gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BOX_SPACE);
+	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER);
+
+	/* Vertical box */
+	vbox = GTK_DIALOG(dialog)->vbox;
+
+	/* Golden ratio it up! */
+	gtk_widget_set_size_request(dialog, 550, 400);
+
+	sw = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+
+	spec_dialog = g_new0(PidginNotifyDialog, 1);
+	spec_dialog->dialog = dialog;
+
+	spec_dialog->treemodel = model;
+	spec_dialog->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+	g_object_unref(G_OBJECT(model));
+
+	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(spec_dialog->treeview), TRUE);
+	gtk_container_add(GTK_CONTAINER(sw), spec_dialog->treeview);
+
+	if (type == PIDGIN_NOTIFY_MAIL) {
+		gtk_window_set_title(GTK_WINDOW(dialog), _("New Mail"));
+		gtk_window_set_role(GTK_WINDOW(dialog), "new_mail_detailed");
+		g_signal_connect(G_OBJECT(dialog), "focus-in-event",
+					G_CALLBACK(mail_window_focus_cb), NULL);
+
+		gtk_dialog_add_button(GTK_DIALOG(dialog),
+					 _("Open All Messages"), GTK_RESPONSE_ACCEPT);
+
+		button = gtk_dialog_add_button(GTK_DIALOG(dialog),
+						 PIDGIN_STOCK_OPEN_MAIL, GTK_RESPONSE_YES);
+		spec_dialog->open_button = button;
+
+		gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(spec_dialog->treeview), FALSE);
+
+		gtk_tree_view_set_search_column(GTK_TREE_VIEW(spec_dialog->treeview), PIDGIN_MAIL_TEXT);
+		gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(spec_dialog->treeview),
+			             pidgin_tree_view_search_equal_func, NULL, NULL);
+
+		g_signal_connect(G_OBJECT(dialog), "response",
+						 G_CALLBACK(email_response_cb), spec_dialog);
+		g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(spec_dialog->treeview))),
+						 "changed", G_CALLBACK(selection_changed_cb), spec_dialog);
+		g_signal_connect(G_OBJECT(spec_dialog->treeview), "row-activated", G_CALLBACK(email_row_activated_cb), NULL);
+
+		column = gtk_tree_view_column_new();
+		gtk_tree_view_column_set_resizable(column, TRUE);
+		rend = gtk_cell_renderer_pixbuf_new();
+		gtk_tree_view_column_pack_start(column, rend, FALSE);
+
+		gtk_tree_view_column_set_attributes(column, rend, "pixbuf", PIDGIN_MAIL_ICON, NULL);
+		rend = gtk_cell_renderer_text_new();
+		gtk_tree_view_column_pack_start(column, rend, TRUE);
+		gtk_tree_view_column_set_attributes(column, rend, "markup", PIDGIN_MAIL_TEXT, NULL);
+		gtk_tree_view_append_column(GTK_TREE_VIEW(spec_dialog->treeview), column);
+
+		label = gtk_label_new(NULL);
+		gtk_label_set_markup(GTK_LABEL(label), _("<span weight=\"bold\" size=\"larger\">You have mail!</span>"));
+
+	} else if (type == PIDGIN_NOTIFY_POUNCE) {
+		gtk_window_set_title(GTK_WINDOW(dialog), _("New Pounces"));
+
+		button = gtk_dialog_add_button(GTK_DIALOG(dialog),
+						_("Dismiss"), GTK_RESPONSE_NO);
+		gtk_widget_set_sensitive(button, FALSE);
+		spec_dialog->dismiss_button = button;
+
+		button = gtk_dialog_add_button(GTK_DIALOG(dialog),
+						PIDGIN_STOCK_EDIT, GTK_RESPONSE_APPLY);
+		gtk_widget_set_sensitive(button, FALSE);
+		spec_dialog->edit_button = button;
+
+		g_signal_connect(G_OBJECT(dialog), "response",
+						 G_CALLBACK(pounce_response_cb), spec_dialog);
+
+		column = gtk_tree_view_column_new();
+		gtk_tree_view_column_set_title(column, _("Buddy"));
+		gtk_tree_view_column_set_resizable(column, TRUE);
+		rend = gtk_cell_renderer_pixbuf_new();
+		gtk_tree_view_column_pack_start(column, rend, FALSE);
+
+		gtk_tree_view_column_set_attributes(column, rend, "pixbuf", PIDGIN_POUNCE_ICON, NULL);
+		rend = gtk_cell_renderer_text_new();
+		gtk_tree_view_column_pack_start(column, rend, FALSE);
+		gtk_tree_view_column_add_attribute(column, rend, "text", PIDGIN_POUNCE_ALIAS);
+		gtk_tree_view_append_column(GTK_TREE_VIEW(spec_dialog->treeview), column);
+
+		column = gtk_tree_view_column_new();
+		gtk_tree_view_column_set_title(column, _("Event"));
+		gtk_tree_view_column_set_resizable(column, TRUE);
+		rend = gtk_cell_renderer_text_new();
+		gtk_tree_view_column_pack_start(column, rend, FALSE);
+		gtk_tree_view_column_add_attribute(column, rend, "text", PIDGIN_POUNCE_EVENT);
+		gtk_tree_view_append_column(GTK_TREE_VIEW(spec_dialog->treeview), column);
+
+		column = gtk_tree_view_column_new();
+		gtk_tree_view_column_set_title(column, _("Message"));
+		gtk_tree_view_column_set_resizable(column, TRUE);
+		rend = gtk_cell_renderer_text_new();
+		gtk_tree_view_column_pack_start(column, rend, FALSE);
+		gtk_tree_view_column_add_attribute(column, rend, "text", PIDGIN_POUNCE_TEXT);
+		gtk_tree_view_append_column(GTK_TREE_VIEW(spec_dialog->treeview), column);
+
+		column = gtk_tree_view_column_new();
+		gtk_tree_view_column_set_title(column, _("Date"));
+		gtk_tree_view_column_set_resizable(column, TRUE);
+		rend = gtk_cell_renderer_text_new();
+		gtk_tree_view_column_pack_start(column, rend, FALSE);
+		gtk_tree_view_column_add_attribute(column, rend, "text", PIDGIN_POUNCE_DATE);
+		gtk_tree_view_append_column(GTK_TREE_VIEW(spec_dialog->treeview), column);
+
+		label = gtk_label_new(NULL);
+		gtk_label_set_markup(GTK_LABEL(label), _("<span weight=\"bold\" size=\"larger\">You have pounced!</span>"));
+
+		sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(spec_dialog->treeview));
+		gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
+		g_signal_connect(G_OBJECT(sel), "changed",
+			G_CALLBACK(pounce_row_selected_cb), NULL);
+	}
+
+	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 2);
+
+	return spec_dialog;
+}
+
+static void
+signed_off_cb(PurpleConnection *gc, gpointer unused)
+{
+	/* Clear any pending emails for this account */
+	pidgin_notify_emails(gc, 0, FALSE, NULL, NULL, NULL, NULL);
+
+	if (mail_dialog != NULL && mail_dialog->total_count == 0)
+		reset_mail_dialog(NULL);
+}
+
+static void*
+pidgin_notify_get_handle(void)
+{
+	static int handle;
+	return &handle;
+}
+
+void pidgin_notify_init(void)
+{
+	void *handle = pidgin_notify_get_handle();
+
+	purple_signal_connect(purple_connections_get_handle(), "signed-off",
+			handle, PURPLE_CALLBACK(signed_off_cb), NULL);
+}
+
+void pidgin_notify_uninit(void)
+{
+	purple_signals_disconnect_by_handle(pidgin_notify_get_handle());
+}
+
 static PurpleNotifyUiOps ops =
 {
 	pidgin_notify_message,
diff --git a/pidgin/gtknotify.h b/pidgin/gtknotify.h
index d134d9957b..b5973a4995 100644
--- a/pidgin/gtknotify.h
+++ b/pidgin/gtknotify.h
@@ -27,6 +27,20 @@
 #define _PIDGINNOTIFY_H_
 
 #include "notify.h"
+#include "pounce.h"
+
+/**
+ * Adds a buddy pounce to the buddy pounce dialog
+ *
+ * @param account	The account
+ * @param pounce	The pounce
+ * @param alias		The buddy alias
+ * @param event		Event description
+ * @param message	Pounce message
+ * @param date		Pounce date
+ */
+void pidgin_notify_pounce_add(PurpleAccount *account, PurplePounce *pounce,
+		const char *alias, const char *event, const char *message, const char *date);
 
 /**
  * Returns the UI operations structure for GTK+ notification functions.
@@ -35,4 +49,14 @@
  */
 PurpleNotifyUiOps *pidgin_notify_get_ui_ops(void);
 
+/**
+ * Initializes the GTK+ notifications subsystem.
+ */
+void pidgin_notify_init(void);
+
+/**
+ * Uninitialized the GTK+ notifications subsystem.
+ */
+void pidgin_notify_uninit(void);
+
 #endif /* _PIDGINNOTIFY_H_ */
diff --git a/pidgin/gtkplugin.c b/pidgin/gtkplugin.c
index fe2d3e9bde..68be3f7e6d 100644
--- a/pidgin/gtkplugin.c
+++ b/pidgin/gtkplugin.c
@@ -135,7 +135,13 @@ update_plugin_list(void *data)
 
 		gtk_list_store_append (ls, &iter);
 
-		name = g_markup_escape_text(plug->info->name ? _(plug->info->name) : g_basename(plug->path), -1);
+		if (plug->info->name) {
+			name = g_markup_escape_text(_(plug->info->name), -1);
+		} else {
+			char *tmp = g_path_get_basename(plug->path);
+			name = g_markup_escape_text(tmp, -1);
+			g_free(tmp);
+		}
 		version = g_markup_escape_text(purple_plugin_get_version(plug), -1);
 		summary = g_markup_escape_text(purple_plugin_get_summary(plug), -1);
 
diff --git a/pidgin/gtkpounce.c b/pidgin/gtkpounce.c
index a8b2096014..e2ee53335c 100644
--- a/pidgin/gtkpounce.c
+++ b/pidgin/gtkpounce.c
@@ -30,7 +30,6 @@
 #include "account.h"
 #include "conversation.h"
 #include "debug.h"
-#include "notify.h"
 #include "prpl.h"
 #include "request.h"
 #include "server.h"
@@ -41,6 +40,7 @@
 #include "gtkdialogs.h"
 #include "gtkimhtml.h"
 #include "gtkpounce.h"
+#include "gtknotify.h"
 #include "pidginstock.h"
 #include "gtkutils.h"
 
@@ -1275,7 +1275,6 @@ create_pounces_list(PouncesManager *dialog)
 	/* Handle double-clicking */
 	g_signal_connect(G_OBJECT(treeview), "button_press_event",
 					 G_CALLBACK(pounce_double_click_cb), dialog);
-
 	gtk_container_add(GTK_CONTAINER(sw), treeview);
 	gtk_widget_show(treeview);
 
@@ -1458,27 +1457,27 @@ pounce_cb(PurplePounce *pounce, PurplePounceEvent events, void *data)
 		 */
 		tmp = g_strdup_printf(
 				   (events & PURPLE_POUNCE_TYPING) ?
-				   _("%s has started typing to you (%s)") :
+				   _("Started typing") :
 				   (events & PURPLE_POUNCE_TYPED) ?
-				   _("%s has paused while typing to you (%s)") :
+				   _("Paused while typing") :
 				   (events & PURPLE_POUNCE_SIGNON) ?
-				   _("%s has signed on (%s)") :
+				   _("Signed on") :
 				   (events & PURPLE_POUNCE_IDLE_RETURN) ?
-				   _("%s has returned from being idle (%s)") :
+				   _("Returned from being idle") :
 				   (events & PURPLE_POUNCE_AWAY_RETURN) ?
-				   _("%s has returned from being away (%s)") :
+				   _("Returned from being away") :
 				   (events & PURPLE_POUNCE_TYPING_STOPPED) ?
-				   _("%s has stopped typing to you (%s)") :
+				   _("Stopped typing") :
 				   (events & PURPLE_POUNCE_SIGNOFF) ?
-				   _("%s has signed off (%s)") :
+				   _("Signed off") :
 				   (events & PURPLE_POUNCE_IDLE) ?
-				   _("%s has become idle (%s)") :
+				   _("Became idle") :
 				   (events & PURPLE_POUNCE_AWAY) ?
-				   _("%s has gone away. (%s)") :
+				   _("Went away") :
 				   (events & PURPLE_POUNCE_MESSAGE_RECEIVED) ?
-				   _("%s has sent you a message. (%s)") :
-				   _("Unknown pounce event. Please report this!"),
-				   alias, purple_account_get_protocol_name(account));
+				   _("Sent a message") :
+				   _("Unknown.... Please report this!")
+				   );
 
 		/*
 		 * Ok here is where I change the second argument, title, from
@@ -1488,16 +1487,9 @@ pounce_cb(PurplePounce *pounce, PurplePounceEvent events, void *data)
 		if ((name_shown = purple_account_get_alias(account)) == NULL)
 			name_shown = purple_account_get_username(account);
 
-		if (reason == NULL)
-		{
-			purple_notify_info(NULL, name_shown, tmp, purple_date_format_full(NULL));
-		}
-		else
-		{
-			char *tmp2 = g_strdup_printf("%s\n\n%s", reason, purple_date_format_full(NULL));
-			purple_notify_info(NULL, name_shown, tmp, tmp2);
-			g_free(tmp2);
-		}
+		pidgin_notify_pounce_add(account, pounce, alias, tmp, reason,
+				purple_date_format_full(NULL));
+
 		g_free(tmp);
 	}
 
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index 44f05ea794..690bc0fa3c 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -28,6 +28,7 @@
 #include "pidgin.h"
 
 #include "debug.h"
+#include "nat-pmp.h"
 #include "notify.h"
 #include "prefs.h"
 #include "proxy.h"
@@ -36,7 +37,9 @@
 #include "savedstatuses.h"
 #include "sound.h"
 #include "sound-theme.h"
+#include "stun.h"
 #include "theme-manager.h"
+#include "upnp.h"
 #include "util.h"
 #include "network.h"
 
@@ -61,6 +64,12 @@
 
 #define PREFS_OPTIMAL_ICON_SIZE 32
 
+struct theme_info {
+	gchar *type;
+	gchar *extension;
+	gchar *original_name;
+};
+
 static int sound_row_sel = 0;
 static GtkWidget *prefsnotebook;
 
@@ -74,11 +83,13 @@ static GtkWidget *debugbutton = NULL;
 static int notebook_page = 0;
 static GtkTreeRowReference *previous_smiley_row = NULL;
 
-static gboolean prefs_themes_unsorted = TRUE;
 static GtkListStore *prefs_sound_themes;
 static GtkListStore *prefs_blist_themes;
 static GtkListStore *prefs_status_icon_themes;
 
+static GtkWidget *prefs_sound_themes_combo_box;
+static GtkWidget *prefs_blist_themes_combo_box;
+static GtkWidget *prefs_status_themes_combo_box;
 
 /*
  * PROTOTYPES
@@ -106,7 +117,7 @@ pidgin_prefs_labeled_spin_button(GtkWidget *box, const gchar *title,
 
 	val = purple_prefs_get_int(key);
 
-	adjust = gtk_adjustment_new(val, min, max, 1, 1, 1);
+	adjust = gtk_adjustment_new(val, min, max, 1, 1, 0);
 	spin = gtk_spin_button_new(GTK_ADJUSTMENT(adjust), 1, 0);
 	g_object_set_data(G_OBJECT(spin), "val", (char *)key);
 	if (max < 10000)
@@ -121,7 +132,8 @@ pidgin_prefs_labeled_spin_button(GtkWidget *box, const gchar *title,
 }
 
 static void
-entry_set(GtkEntry *entry, gpointer data) {
+entry_set(GtkEntry *entry, gpointer data)
+{
 	const char *key = (const char*)data;
 
 	purple_prefs_set_string(key, gtk_entry_get_text(entry));
@@ -145,6 +157,26 @@ pidgin_prefs_labeled_entry(GtkWidget *page, const gchar *title,
 	return pidgin_add_widget_to_vbox(GTK_BOX(page), title, sg, entry, TRUE, NULL);
 }
 
+GtkWidget *
+pidgin_prefs_labeled_password(GtkWidget *page, const gchar *title,
+							 const char *key, GtkSizeGroup *sg)
+{
+	GtkWidget *entry;
+	const gchar *value;
+
+	value = purple_prefs_get_string(key);
+
+	entry = gtk_entry_new();
+	gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+	gtk_entry_set_text(GTK_ENTRY(entry), value);
+	g_signal_connect(G_OBJECT(entry), "changed",
+					 G_CALLBACK(entry_set), (char*)key);
+	gtk_widget_show(entry);
+
+	return pidgin_add_widget_to_vbox(GTK_BOX(page), title, sg, entry, TRUE, NULL);
+}
+
+
 static void
 dropdown_set(GObject *w, const char *key)
 {
@@ -313,7 +345,9 @@ delete_prefs(GtkWidget *asdf, void *gdsa)
 
 }
 
-static void smiley_sel(GtkTreeSelection *sel, GtkTreeModel *model) {
+static void
+smiley_sel(GtkTreeSelection *sel, GtkTreeModel *model)
+{
 	GtkTreeIter  iter;
 	const char *themename;
 	char *description;
@@ -364,7 +398,8 @@ static void smiley_sel(GtkTreeSelection *sel, GtkTreeModel *model) {
 	gtk_tree_path_free(path);
 }
 
-static GtkTreeRowReference *theme_refresh_theme_list(void)
+static GtkTreeRowReference *
+theme_refresh_theme_list(void)
 {
 	GdkPixbuf *pixbuf;
 	GSList *themes;
@@ -422,144 +457,9 @@ static GtkTreeRowReference *theme_refresh_theme_list(void)
 	return row_ref;
 }
 
-static void theme_install_theme(char *path, char *extn) {
-#ifndef _WIN32
-	gchar *command;
-#endif
-	gchar *destdir;
-	gchar *tail;
-	GtkTreeRowReference *theme_rowref;
-
-	/* Just to be safe */
-	g_strchomp(path);
-
-	/* I dont know what you are, get out of here */
-	if (extn != NULL)
-		tail = extn;
-	else if ((tail = strrchr(path, '.')) == NULL)
-		return;
-
-	destdir = g_strconcat(purple_user_dir(), G_DIR_SEPARATOR_S "smileys", NULL);
-
-	/* We'll check this just to make sure. This also lets us do something different on
-	 * other platforms, if need be */
-	if (!g_ascii_strcasecmp(tail, ".gz") || !g_ascii_strcasecmp(tail, ".tgz")) {
-#ifndef _WIN32
-		gchar *path_escaped = g_shell_quote(path);
-		gchar *destdir_escaped = g_shell_quote(destdir);
-		command = g_strdup_printf("tar > /dev/null xzf %s -C %s", path_escaped, destdir_escaped);
-		g_free(path_escaped);
-		g_free(destdir_escaped);
-#else
-		if(!winpidgin_gz_untar(path, destdir)) {
-			g_free(destdir);
-			return;
-		}
-#endif
-	}
-	else {
-		g_free(destdir);
-		return;
-	}
-
-#ifndef _WIN32
-	/* Fire! */
-	if (system(command))
-	{
-		purple_notify_error(NULL, NULL, _("Smiley theme failed to unpack."), NULL);
-	}
-
-	g_free(command);
-#endif
-	g_free(destdir);
-
-	theme_rowref = theme_refresh_theme_list();
-	if (theme_rowref != NULL) {
-		GtkTreePath *tp = gtk_tree_row_reference_get_path(theme_rowref);
-
-		if (tp)
-			gtk_tree_selection_select_path(smiley_theme_sel, tp);
-		gtk_tree_row_reference_free(theme_rowref);
-	}
-}
-
-static void
-theme_got_url(PurpleUtilFetchUrlData *url_data, gpointer user_data,
-		const gchar *themedata, size_t len, const gchar *error_message)
-{
-	FILE *f;
-	gchar *path;
-	size_t wc;
-
-	if ((error_message != NULL) || (len == 0))
-		return;
-
-	f = purple_mkstemp(&path, TRUE);
-	wc = fwrite(themedata, len, 1, f);
-	if (wc != 1) {
-		purple_debug_warning("theme_got_url", "Unable to write theme data.\n");
-		fclose(f);
-		g_unlink(path);
-		g_free(path);
-		return;
-	}
-	fclose(f);
-
-	theme_install_theme(path, user_data);
-
-	g_unlink(path);
-	g_free(path);
-}
-
-static void
-theme_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
-		GtkSelectionData *sd, guint info, guint t, gpointer data)
-{
-	gchar *name = (gchar *)sd->data;
-
-	if ((sd->length >= 0) && (sd->format == 8)) {
-		/* Well, it looks like the drag event was cool.
-		 * Let's do something with it */
-
-		if (!g_ascii_strncasecmp(name, "file://", 7)) {
-			GError *converr = NULL;
-			gchar *tmp;
-			/* It looks like we're dealing with a local file. Let's
-			 * just untar it in the right place */
-			if(!(tmp = g_filename_from_uri(name, NULL, &converr))) {
-				purple_debug(PURPLE_DEBUG_ERROR, "theme dnd", "%s\n",
-						   (converr ? converr->message :
-							"g_filename_from_uri error"));
-				return;
-			}
-			theme_install_theme(tmp, NULL);
-			g_free(tmp);
-		} else if (!g_ascii_strncasecmp(name, "http://", 7)) {
-			/* Oo, a web drag and drop. This is where things
-			 * will start to get interesting */
-			purple_util_fetch_url(name, TRUE, NULL, FALSE, theme_got_url, ".tgz");
-		} else if (!g_ascii_strncasecmp(name, "https://", 8)) {
-			/* purple_util_fetch_url() doesn't support HTTPS, but we want users
-			 * to be able to drag and drop links from the SF trackers, so
-			 * we'll try it as an HTTP URL. */
-			char *tmp = g_strdup(name + 1);
-			tmp[0] = 'h';
-			tmp[1] = 't';
-			tmp[2] = 't';
-			tmp[3] = 'p';
-			purple_util_fetch_url(tmp, TRUE, NULL, FALSE, theme_got_url, ".tgz");
-			g_free(tmp);
-		}
-
-		gtk_drag_finish(dc, TRUE, FALSE, t);
-	}
-
-	gtk_drag_finish(dc, FALSE, FALSE, t);
-}
-
 /* Rebuild the markup for the sound theme selection for "(Custom)" themes */
 static void
-pref_sound_generate_markup()
+pref_sound_generate_markup(void)
 {
 	gboolean print_custom, customized;
 	const gchar *name, *author, *description, *current_theme;
@@ -576,7 +476,7 @@ pref_sound_generate_markup()
 
 			print_custom = customized && g_str_equal(current_theme, name);
 
-			if (g_str_equal(name, ""))
+			if (!name || *name == '\0')
 				markup = g_strdup_printf("<b>(Default)</b>%s%s - None\n<span foreground='dim grey'>The default Pidgin sound theme</span>",
 							 print_custom ? " " : "", print_custom ? "(Custom)" : "");
 			else {
@@ -597,7 +497,7 @@ pref_sound_generate_markup()
 	}
 }
 
-/* adds the themes to the theme list from the manager so they can be sisplayed in prefs */
+/* adds the themes to the theme list from the manager so they can be displayed in prefs */
 static void
 prefs_themes_sort(PurpleTheme *theme)
 {
@@ -618,7 +518,7 @@ prefs_themes_sort(PurpleTheme *theme)
 		gtk_list_store_set(prefs_sound_themes, &iter, 0, pixbuf, 2, purple_theme_get_name(theme), -1);
 
 		if (pixbuf != NULL)
-			gdk_pixbuf_unref(pixbuf);
+			g_object_unref(G_OBJECT(pixbuf));
 
 	} else if (PIDGIN_IS_BLIST_THEME(theme) || PIDGIN_IS_STATUS_ICON_THEME(theme)){
 		GtkListStore *store;
@@ -645,55 +545,392 @@ prefs_themes_sort(PurpleTheme *theme)
 
 		g_free(markup);
 		if (pixbuf != NULL)
-			gdk_pixbuf_unref(pixbuf);
+			g_object_unref(G_OBJECT(pixbuf));
 	}
+}
 
+static void
+prefs_set_active_theme_combo(GtkWidget *combo_box, GtkListStore *store, const gchar *current_theme)
+{
+	GtkTreeIter iter;
+	gchar *theme = NULL;
+	gboolean unset = TRUE;
+
+	if (current_theme && *current_theme && gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
+		do {
+			gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 2, &theme, -1);
+
+			if (g_str_equal(current_theme, theme)) {
+				gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo_box), &iter);
+				unset = FALSE;
+			}
+
+			g_free(theme);
+		} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
+	}
+
+	if (unset)
+		gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
 }
 
-/* init all the theme variables so that the themes can be sorted later and used by pref pages */
 static void
-prefs_themes_init()
+prefs_themes_refresh(void)
 {
 	GdkPixbuf *pixbuf = NULL;
 	gchar *filename;
 	GtkTreeIter iter;
 
+	/* refresh the list of themes in the manager */
+	purple_theme_manager_refresh();
+
 	filename = g_build_filename(DATADIR, "icons", "hicolor", "32x32", "apps", "pidgin.png", NULL);
 	pixbuf = gdk_pixbuf_new_from_file_at_scale(filename, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE, NULL);
 	g_free(filename);
 
 	/* sound themes */
-	prefs_sound_themes = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
-
+	gtk_list_store_clear(prefs_sound_themes);
 	gtk_list_store_append(prefs_sound_themes, &iter);
 	gtk_list_store_set(prefs_sound_themes, &iter, 0, pixbuf, 2, "", -1);
 
 	/* blist themes */
-	prefs_blist_themes = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
-
+	gtk_list_store_clear(prefs_blist_themes);
 	gtk_list_store_append(prefs_blist_themes, &iter);
-	gtk_list_store_set(prefs_blist_themes, &iter, 0, pixbuf, 1, "<b>(Default)</b> - None\n<span color='dim grey'>"
-								    "The default Pidgin buddy list theme</span>", 2, "", -1);
+	gtk_list_store_set(prefs_blist_themes, &iter, 0, pixbuf, 1,
+	                   "<b>(Default)</b> - None\n<span color='dim grey'>"
+	                   "The default Pidgin buddy list theme</span>", 2, "", -1);
 
 	/* status icon themes */
+	gtk_list_store_clear(prefs_status_icon_themes);
+	gtk_list_store_append(prefs_status_icon_themes, &iter);
+	gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1,
+	                   "<b>(Default)</b> - None\n<span color='dim grey'>"
+	                   "The default Pidgin status icon theme</span>", 2, "", -1);
+	g_object_unref(G_OBJECT(pixbuf));
+
+	purple_theme_manager_for_each_theme(prefs_themes_sort);
+	pref_sound_generate_markup();
+
+	/* set active */
+	prefs_set_active_theme_combo(prefs_sound_themes_combo_box, prefs_sound_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme"));
+	prefs_set_active_theme_combo(prefs_blist_themes_combo_box, prefs_blist_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/theme"));
+	prefs_set_active_theme_combo(prefs_status_themes_combo_box, prefs_status_icon_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/status/icon-theme"));
+}
+
+/* init all the theme variables so that the themes can be sorted later and used by pref pages */
+static void
+prefs_themes_init(void)
+{
+	prefs_sound_themes = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
+
+	prefs_blist_themes = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
+
 	prefs_status_icon_themes = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
+}
 
-	gtk_list_store_append(prefs_status_icon_themes, &iter);
-	gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1, "<b>(Default)</b> - None\n<span color='dim grey'>"
-								    "The default Pidgin status icon theme</span>", 2, "", -1);
+static PurpleTheme *
+prefs_theme_find_theme(const gchar *path, const gchar *type)
+{
+	PurpleTheme *theme = purple_theme_manager_load_theme(path, type);
+	GDir *dir = g_dir_open(path, 0, NULL);
+	const gchar *next;
+
+	while (!PURPLE_IS_THEME(theme) && (next = g_dir_read_name(dir))) {
+		gchar *next_path = g_build_filename(path, next, NULL);
+
+		if (g_file_test(next_path, G_FILE_TEST_IS_DIR))
+			theme = prefs_theme_find_theme(next_path, type);
+
+		g_free(next_path);
+	}
+
+	g_dir_close(dir);
+
+	return theme;
+}
+
+/* Eww. Seriously ewww. But thanks, grim! This is taken from guifications2 */
+static gboolean
+purple_theme_file_copy(const gchar *source, const gchar *destination)
+{
+	FILE *src, *dest;
+	gint chr = EOF;
+
+	if(!(src = g_fopen(source, "rb")))
+		return FALSE;
+	if(!(dest = g_fopen(destination, "wb"))) {
+		fclose(src);
+		return FALSE;
+	}
+
+	while((chr = fgetc(src)) != EOF) {
+		fputc(chr, dest);
+	}
+
+	fclose(dest);
+	fclose(src);
+
+	return TRUE;
+}
+
+/* installs a theme, info is freed by function */
+static void
+theme_install_theme(char *path, struct theme_info *info)
+{
+#ifndef _WIN32
+	gchar *command;
+#endif
+	gchar *destdir, *tail, *type, *original_name;
+	GtkTreeRowReference *theme_rowref;
+	gboolean is_smiley_theme, is_archive;
+	PurpleTheme *theme = NULL;
+
+	if (info == NULL)
+		return;
+
+	original_name = info->original_name;
+	type = info->type;
+
+	/* check the extension */
+	tail = info->extension ? info->extension : g_strdup(strrchr(path, '.'));
+
+	if (!tail) {
+		g_free(type);
+		g_free(original_name);
+		g_free(info);
+		return;
+	} else
+		g_free(info);
+
+	is_archive = !g_ascii_strcasecmp(tail, ".gz") || !g_ascii_strcasecmp(tail, ".tgz");
+
+	g_free(tail);
+
+	/* Just to be safe */
+	g_strchomp(path);
+
+	if ((is_smiley_theme = g_str_equal(type, "smiley")))
+		destdir = g_build_filename(purple_user_dir(), "smileys", NULL);
+	else destdir = g_build_filename(purple_user_dir(), "themes", "temp", NULL);
+
+	/* We'll check this just to make sure. This also lets us do something different on
+	 * other platforms, if need be */
+	if (is_archive) {
+#ifndef _WIN32
+		gchar *path_escaped = g_shell_quote(path);
+		gchar *destdir_escaped = g_shell_quote(destdir);
+
+		if (!g_file_test(destdir, G_FILE_TEST_IS_DIR))
+			purple_build_dir(destdir, S_IRUSR | S_IWUSR | S_IXUSR);
+
+		command = g_strdup_printf("tar > /dev/null xzf %s -C %s", path_escaped, destdir_escaped);
+		g_free(path_escaped);
+		g_free(destdir_escaped);
+
+		/* Fire! */
+		if (system(command)) {
+			purple_notify_error(NULL, NULL, _("Theme failed to unpack."), NULL);
+			g_free(command);
+			g_free(destdir);
+			g_free(type);
+			g_free(original_name);
+			return;
+		}
+#else
+		if(!winpidgin_gz_untar(path, destdir)) {
+			g_free(destdir);
+			g_free(type);
+			g_free(original_name);
+			return;
+		}
+#endif
+	}
+
+	if (is_smiley_theme) {
+		/* just extract the folder to the smiley directory */
+		theme_rowref = theme_refresh_theme_list();
+
+		if (theme_rowref != NULL) {
+			GtkTreePath *tp = gtk_tree_row_reference_get_path(theme_rowref);
+
+			if (tp)
+				gtk_tree_selection_select_path(smiley_theme_sel, tp);
+
+			gtk_tree_row_reference_free(theme_rowref);
+		}
+
+	} else if (is_archive) {
+		theme = prefs_theme_find_theme(destdir, type);
+
+		if (PURPLE_IS_THEME(theme)) {
+			/* create the location for the theme */
+			gchar *theme_dest = g_build_filename(purple_user_dir(), "themes",
+						 purple_theme_get_name(theme),
+						 "purple", type, NULL);
+
+			if (!g_file_test(theme_dest, G_FILE_TEST_IS_DIR))
+				purple_build_dir(theme_dest, S_IRUSR | S_IWUSR | S_IXUSR);
+
+			g_free(theme_dest);
+			theme_dest = g_build_filename(purple_user_dir(), "themes",
+						 purple_theme_get_name(theme),
+						 "purple", type, NULL);
+
+			/* move the entire directory to new location */
+			g_rename(purple_theme_get_dir(theme), theme_dest);
+
+			g_free(theme_dest);
+			g_remove(destdir);
+			g_object_unref(theme);
+
+			prefs_themes_refresh();
+
+		} else {
+			/* something was wrong with the theme archive */
+			g_unlink(destdir);
+			purple_notify_error(NULL, NULL, _("Theme failed to load."), NULL);
+		}
+
+	} else { /* just a single file so copy it to a new temp directory and attempt to load it*/
+		gchar *temp_path, *temp_file;
+
+		temp_path = g_build_filename(purple_user_dir(), "themes", "temp", "sub_folder", NULL);
+
+		if (original_name != NULL) {
+			/* name was changed from the original (probably a dnd) change it back before loading */
+			temp_file = g_build_filename(temp_path, original_name, NULL);
+
+		} else {
+			gchar *source_name = g_path_get_basename(path);
+			temp_file = g_build_filename(temp_path, source_name, NULL);
+			g_free(source_name);
+		}
+
+		if (!g_file_test(temp_path, G_FILE_TEST_IS_DIR))
+			purple_build_dir(temp_path, S_IRUSR | S_IWUSR | S_IXUSR);
+
+		if (purple_theme_file_copy(path, temp_file)) {
+			/* find the theme, could be in subfolder */
+			theme = prefs_theme_find_theme(temp_path, type);
+
+			if (PURPLE_IS_THEME(theme)) {
+				gchar *theme_dest = g_build_filename(purple_user_dir(), "themes",
+							 purple_theme_get_name(theme),
+							 "purple", type, NULL);
+
+				if(!g_file_test(theme_dest, G_FILE_TEST_IS_DIR))
+					purple_build_dir(theme_dest, S_IRUSR | S_IWUSR | S_IXUSR);
+
+				g_rename(purple_theme_get_dir(theme), theme_dest);
+
+				g_free(theme_dest);
+				g_object_unref(theme);
 
-	gdk_pixbuf_unref(pixbuf);
+				prefs_themes_refresh();
+			} else {
+				g_remove(temp_path);
+				purple_notify_error(NULL, NULL, _("Theme failed to load."), NULL);
+			}
+		} else {
+			purple_notify_error(NULL, NULL, _("Theme failed to copy."), NULL);
+		}
+
+		g_free(temp_file);
+		g_free(temp_path);
+	}
+
+	g_free(type);
+	g_free(original_name);
+	g_free(destdir);
+}
+
+static void
+theme_got_url(PurpleUtilFetchUrlData *url_data, gpointer user_data,
+		const gchar *themedata, size_t len, const gchar *error_message)
+{
+	FILE *f;
+	gchar *path;
+	size_t wc;
+
+	if ((error_message != NULL) || (len == 0))
+		return;
+
+	f = purple_mkstemp(&path, TRUE);
+	wc = fwrite(themedata, len, 1, f);
+	if (wc != 1) {
+		purple_debug_warning("theme_got_url", "Unable to write theme data.\n");
+		fclose(f);
+		g_unlink(path);
+		g_free(path);
+		return;
+	}
+	fclose(f);
+
+	theme_install_theme(path, user_data);
+
+	g_unlink(path);
+	g_free(path);
+}
+
+static void
+theme_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
+		GtkSelectionData *sd, guint info, guint t, gpointer user_data)
+{
+	gchar *name = g_strchomp((gchar *)sd->data);
+
+	if ((sd->length >= 0) && (sd->format == 8)) {
+		/* Well, it looks like the drag event was cool.
+		 * Let's do something with it */
+		gchar *temp;
+		struct theme_info *info =  g_new0(struct theme_info, 1);
+		info->type = g_strdup((gchar *)user_data);
+		info->extension = g_strdup(g_strrstr(name,"."));
+		temp = g_strrstr(name, "/");
+		info->original_name = temp ? g_strdup(++temp) : NULL;
+
+		if (!g_ascii_strncasecmp(name, "file://", 7)) {
+			GError *converr = NULL;
+			gchar *tmp;
+			/* It looks like we're dealing with a local file. Let's
+			 * just untar it in the right place */
+			if(!(tmp = g_filename_from_uri(name, NULL, &converr))) {
+				purple_debug(PURPLE_DEBUG_ERROR, "theme dnd", "%s\n",
+						   (converr ? converr->message :
+							"g_filename_from_uri error"));
+				return;
+			}
+			theme_install_theme(tmp, info);
+			g_free(tmp);
+		} else if (!g_ascii_strncasecmp(name, "http://", 7)) {
+			/* Oo, a web drag and drop. This is where things
+			 * will start to get interesting */
+			purple_util_fetch_url(name, TRUE, NULL, FALSE, theme_got_url, info);
+		} else if (!g_ascii_strncasecmp(name, "https://", 8)) {
+			/* purple_util_fetch_url() doesn't support HTTPS, but we want users
+			 * to be able to drag and drop links from the SF trackers, so
+			 * we'll try it as an HTTP URL. */
+			char *tmp = g_strdup(name + 1);
+			tmp[0] = 'h';
+			tmp[1] = 't';
+			tmp[2] = 't';
+			tmp[3] = 'p';
+
+			purple_util_fetch_url(tmp, TRUE, NULL, FALSE, theme_got_url, info);
+			g_free(tmp);
+		}
+
+		gtk_drag_finish(dc, TRUE, FALSE, t);
+	}
+
+	gtk_drag_finish(dc, FALSE, FALSE, t);
 }
 
 /* builds a theme combo box from a list store with colums: icon preview, markup, theme name */
 static GtkWidget *
-prefs_build_theme_combo_box(GtkListStore *store, const gchar *current_theme)
+prefs_build_theme_combo_box(GtkListStore *store, const gchar *current_theme, gchar *type)
 {
-	GtkWidget *combo_box;
 	GtkCellRenderer *cell_rend;
-	GtkTreeIter iter;
-	gchar *theme = NULL;
-	gboolean unset = TRUE;
+	GtkWidget *combo_box;
+	GtkTargetEntry te[3] = {{"text/plain", 0, 0},{"text/uri-list", 0, 1},{"STRING", 0, 2}};
 
 	g_return_val_if_fail(store != NULL && current_theme != NULL, NULL);
 
@@ -711,21 +948,10 @@ prefs_build_theme_combo_box(GtkListStore *store, const gchar *current_theme)
 			g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 #endif*/
 
-	if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
-		do {
-			gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 2, &theme, -1);
-
-			if (g_str_equal(current_theme, theme)) {
-				gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo_box), &iter);
-				unset = FALSE;
-			}
-
-			g_free(theme);
-		} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
-	}
+	gtk_drag_dest_set(combo_box, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, te,
+					sizeof(te) / sizeof(GtkTargetEntry) , GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
-	if (unset)
-		gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
+	g_signal_connect(G_OBJECT(combo_box), "drag_data_received", G_CALLBACK(theme_dnd_recv), type);
 
 	return combo_box;
 }
@@ -737,32 +963,32 @@ prefs_set_sound_theme_cb(GtkComboBox *combo_box, gpointer user_data)
 	gint i;
 	gchar *pref;
 	gchar *new_theme;
-	gboolean success;
 	GtkTreeIter new_iter;
 
-	success = gtk_combo_box_get_active_iter(combo_box, &new_iter);
-	g_return_if_fail(success);
+	if(gtk_combo_box_get_active_iter(combo_box, &new_iter)) {
 
-	gtk_tree_model_get(GTK_TREE_MODEL(prefs_sound_themes), &new_iter, 2, &new_theme, -1);
+		gtk_tree_model_get(GTK_TREE_MODEL(prefs_sound_themes), &new_iter, 2, &new_theme, -1);
 
-	purple_prefs_set_string(PIDGIN_PREFS_ROOT "/sound/theme", new_theme);
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/sound/theme", new_theme);
 
-	/* New theme removes all customization */
-	for(i=0; i <  PURPLE_NUM_SOUNDS; i++){
-		pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s",
-					pidgin_sound_get_event_option(i));
-		purple_prefs_set_path(pref, "");
-		g_free(pref);
-	}
+		/* New theme removes all customization */
+		for(i=0; i <  PURPLE_NUM_SOUNDS; i++){
+			pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s",
+						pidgin_sound_get_event_option(i));
+			purple_prefs_set_path(pref, "");
+			g_free(pref);
+		}
 
-	/* gets rid of the "(Custom)" from the last selection */
-	pref_sound_generate_markup();
+		/* gets rid of the "(Custom)" from the last selection */
+		pref_sound_generate_markup();
 
-	gtk_entry_set_text(GTK_ENTRY(sound_entry), _("(default)"));
+		gtk_entry_set_text(GTK_ENTRY(sound_entry), _("(default)"));
 
-	g_free(new_theme);
+		g_free(new_theme);
+	}
 }
 
+
 /* Does same as normal sort, except "none" is sorted first */
 static gint pidgin_sort_smileys (GtkTreeModel	*model,
 						GtkTreeIter		*a,
@@ -801,13 +1027,18 @@ static gint pidgin_sort_smileys (GtkTreeModel	*model,
 static void
 request_theme_file_name_cb(gpointer data, char *theme_file_name)
 {
-	theme_install_theme(theme_file_name, NULL) ;
+	struct theme_info *info = g_new0(struct theme_info, 1);
+	info->type = g_strdup("smiley");
+	info->extension = NULL;
+	info->original_name = NULL;
+
+	theme_install_theme(theme_file_name, info);
 }
 
 static void
-add_theme_button_clicked_cb(GtkWidget *widget, gpointer null)
+add_theme_button_clicked_cb(GtkWidget *widget, gpointer user_data)
 {
-	purple_request_file(NULL, _("Install Theme"), NULL, FALSE, (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, NULL) ;
+	purple_request_file(NULL, _("Install Theme"), NULL, FALSE, (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, NULL);
 }
 
 static void
@@ -883,7 +1114,7 @@ theme_page(void)
 	gtk_drag_dest_set(view, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, te,
 					sizeof(te) / sizeof(GtkTargetEntry) , GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
-	g_signal_connect(G_OBJECT(view), "drag_data_received", G_CALLBACK(theme_dnd_recv), smiley_theme_store);
+	g_signal_connect(G_OBJECT(view), "drag_data_received", G_CALLBACK(theme_dnd_recv), "smiley");
 
 	rend = gtk_cell_renderer_pixbuf_new();
 	smiley_theme_sel = sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
@@ -1143,34 +1374,42 @@ keyboard_shortcuts(GtkWidget *page)
 static void
 prefs_set_blist_theme_cb(GtkComboBox *combo_box, gpointer user_data)
 {
-	PidginBlistTheme *theme;
+	PidginBlistTheme *theme =  NULL;
 	GtkTreeIter iter;
 	gchar *name = NULL;
 
-	g_return_if_fail(gtk_combo_box_get_active_iter(combo_box, &iter));
-	gtk_tree_model_get(GTK_TREE_MODEL(prefs_blist_themes), &iter, 2, &name, -1);
+	if(gtk_combo_box_get_active_iter(combo_box, &iter)) {
 
-	theme = PIDGIN_BLIST_THEME(purple_theme_manager_find_theme(name, "blist"));
-	g_free(name);
+		gtk_tree_model_get(GTK_TREE_MODEL(prefs_blist_themes), &iter, 2, &name, -1);
 
-	pidgin_blist_set_theme(theme);
+		if(!name || !g_str_equal(name, ""))
+			theme = PIDGIN_BLIST_THEME(purple_theme_manager_find_theme(name, "blist"));
+
+		g_free(name);
+
+		pidgin_blist_set_theme(theme);
+	}
 }
 
 /* sets the current icon theme */
 static void
 prefs_set_status_icon_theme_cb(GtkComboBox *combo_box, gpointer user_data)
 {
-	PidginStatusIconTheme *theme;
+	PidginStatusIconTheme *theme = NULL;
 	GtkTreeIter iter;
 	gchar *name = NULL;
 
-	g_return_if_fail(gtk_combo_box_get_active_iter(combo_box, &iter));
-	gtk_tree_model_get(GTK_TREE_MODEL(prefs_status_icon_themes), &iter, 2, &name, -1);
+	if(gtk_combo_box_get_active_iter(combo_box, &iter)) {
+
+		gtk_tree_model_get(GTK_TREE_MODEL(prefs_status_icon_themes), &iter, 2, &name, -1);
 
-	theme = PIDGIN_STATUS_ICON_THEME(purple_theme_manager_find_theme(name, "status-icon"));
-	g_free(name);
+		if(!name || !g_str_equal(name, ""))
+			theme = PIDGIN_STATUS_ICON_THEME(purple_theme_manager_find_theme(name, "status-icon"));
 
-	pidgin_stock_load_status_icon_theme(theme);
+		g_free(name);
+
+		pidgin_stock_load_status_icon_theme(theme);
+	}
 }
 
 static GtkWidget *
@@ -1180,7 +1419,6 @@ interface_page(void)
 	GtkWidget *vbox;
 	GtkWidget *vbox2;
 	GtkWidget *label;
-	GtkWidget *combo_box;
 	GtkSizeGroup *sg;
 	GList *names = NULL;
 
@@ -1192,14 +1430,20 @@ interface_page(void)
 	/* Buddy List Themes */
 	vbox = pidgin_make_frame(ret, _("Buddy List Theme"));
 
-	combo_box = prefs_build_theme_combo_box(prefs_blist_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/theme"));
-	gtk_box_pack_start(GTK_BOX (vbox), combo_box, FALSE, FALSE, 0);
-	g_signal_connect(G_OBJECT(combo_box), "changed", (GCallback)prefs_set_blist_theme_cb, NULL);
+	prefs_blist_themes_combo_box = prefs_build_theme_combo_box(prefs_blist_themes,
+						purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/theme"),
+						"blist");
+
+	gtk_box_pack_start(GTK_BOX (vbox), prefs_blist_themes_combo_box, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(prefs_blist_themes_combo_box), "changed", (GCallback)prefs_set_blist_theme_cb, NULL);
 
 	/* Status Icon Themes */
-	combo_box = prefs_build_theme_combo_box(prefs_status_icon_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/status/icon-theme"));
-	gtk_box_pack_start(GTK_BOX (vbox), combo_box, FALSE, FALSE, 0);
-	g_signal_connect(G_OBJECT(combo_box), "changed", (GCallback)prefs_set_status_icon_theme_cb, NULL);
+	prefs_status_themes_combo_box = prefs_build_theme_combo_box(prefs_status_icon_themes,
+						purple_prefs_get_string(PIDGIN_PREFS_ROOT "/status/icon-theme"),
+						"icon");
+
+	gtk_box_pack_start(GTK_BOX (vbox), prefs_status_themes_combo_box, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(prefs_status_themes_combo_box), "changed", (GCallback)prefs_set_status_icon_theme_cb, NULL);
 
 	/* System Tray */
 	vbox = pidgin_make_frame(ret, _("System Tray Icon"));
@@ -1210,9 +1454,9 @@ interface_page(void)
 					_("Never"), "never",
 					NULL);
 	gtk_size_group_add_widget(sg, label);
-        gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 
-	vbox = pidgin_make_frame(ret, _("Conversation Window Hiding"));
+	vbox = pidgin_make_frame(ret, _("Conversation Window"));
 	label = pidgin_prefs_dropdown(vbox, _("_Hide new IM conversations:"),
 					PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/im/hide_new",
 					_("Never"), "never",
@@ -1220,8 +1464,11 @@ interface_page(void)
 					_("Always"), "always",
 					NULL);
 	gtk_size_group_add_widget(sg, label);
-        gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 
+#ifdef _WIN32
+	pidgin_prefs_checkbox(_("Minimi_ze new conversation windows"), PIDGIN_PREFS_ROOT "/win32/minimize_new_convs", vbox);
+#endif
 
 	/* All the tab options! */
 	vbox = pidgin_make_frame(ret, _("Tabs"));
@@ -1238,7 +1485,7 @@ interface_page(void)
 	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/conversations/tabs",
 	                            conversation_usetabs_cb, vbox2);
 	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs"))
-	  gtk_widget_set_sensitive(vbox2, FALSE);
+		gtk_widget_set_sensitive(vbox2, FALSE);
 
 	pidgin_prefs_checkbox(_("Show close b_utton on tabs"),
 				PIDGIN_PREFS_ROOT "/conversations/close_on_tabs", vbox2);
@@ -1255,7 +1502,7 @@ interface_page(void)
 #endif
 					NULL);
 	gtk_size_group_add_widget(sg, label);
-        gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 
 	names = pidgin_conv_placement_get_options();
 	label = pidgin_prefs_dropdown_from_list(vbox2, _("N_ew conversations:"),
@@ -1266,10 +1513,8 @@ interface_page(void)
 
 	g_list_free(names);
 
-
 	keyboard_shortcuts(ret);
 
-
 	gtk_widget_show_all(ret);
 	g_object_unref(sg);
 	return ret;
@@ -1332,8 +1577,6 @@ conv_page(void)
 
 #ifdef _WIN32
 	pidgin_prefs_checkbox(_("F_lash window when IMs are received"), PIDGIN_PREFS_ROOT "/win32/blink_im", vbox);
-
-	pidgin_prefs_checkbox(_("Minimi_ze new conversation windows"), PIDGIN_PREFS_ROOT "/win32/minimize_new_convs", vbox);
 #endif
 
 	pidgin_prefs_labeled_spin_button(vbox,
@@ -1341,7 +1584,6 @@ conv_page(void)
 		PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines",
 		1, 8, NULL);
 
-
 #if GTK_CHECK_VERSION(2,4,0)
 	vbox = pidgin_make_frame(ret, _("Font"));
 	if (purple_running_gnome())
@@ -1350,7 +1592,11 @@ conv_page(void)
 		fontpref = pidgin_prefs_checkbox(_("Use font from _theme"), PIDGIN_PREFS_ROOT "/conversations/use_theme_font", vbox);
 
 	font_name = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/custom_font");
-	font_button = gtk_font_button_new_with_font(font_name ? font_name : NULL);
+	if ((font_name == NULL) || (*font_name == '\0')) {
+		font_button = gtk_font_button_new();
+	} else {
+		font_button = gtk_font_button_new_with_font(font_name);
+	}
 
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(font_button), TRUE);
 	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("Conversation _font:"), NULL, font_button, FALSE, NULL);
@@ -1396,14 +1642,55 @@ conv_page(void)
 	return ret;
 }
 
-static void network_ip_changed(GtkEntry *entry, gpointer data)
+static void
+network_ip_changed(GtkEntry *entry, gpointer data)
 {
-	/*
-	 * TODO: It would be nice if we could validate this and show a
-	 *       red background in the box when the IP address is invalid
-	 *       and a green background when the IP address is valid.
-	 */
-	purple_network_set_public_ip(gtk_entry_get_text(entry));
+	const gchar *text = gtk_entry_get_text(entry);
+	GdkColor color;
+
+	if (text && *text) {
+		if (purple_ip_address_is_valid(text)) {
+			color.red = 0xAFFF;
+			color.green = 0xFFFF;
+			color.blue = 0xAFFF;
+
+			purple_network_set_public_ip(text);
+		} else {
+			color.red = 0xFFFF;
+			color.green = 0xAFFF;
+			color.blue = 0xAFFF;
+		}
+
+		gtk_widget_modify_base(GTK_WIDGET(entry), GTK_STATE_NORMAL, &color);
+
+	} else {
+		purple_network_set_public_ip("");
+		gtk_widget_modify_base(GTK_WIDGET(entry), GTK_STATE_NORMAL, NULL);
+	}
+}
+
+static gboolean
+network_stun_server_changed_cb(GtkWidget *widget,
+                               GdkEventFocus *event, gpointer data)
+{
+	GtkEntry *entry = GTK_ENTRY(widget);
+	purple_prefs_set_string("/purple/network/stun_server",
+		gtk_entry_get_text(entry));
+	purple_network_set_stun_server(gtk_entry_get_text(entry));
+
+	return FALSE;
+}
+
+static gboolean
+network_turn_server_changed_cb(GtkWidget *widget,
+                               GdkEventFocus *event, gpointer data)
+{
+	GtkEntry *entry = GTK_ENTRY(widget);
+	purple_prefs_set_string("/purple/network/turn_server",
+		gtk_entry_get_text(entry));
+	purple_network_set_turn_server(gtk_entry_get_text(entry));
+
+	return FALSE;
 }
 
 static void
@@ -1419,7 +1706,8 @@ proxy_changed_cb(const char *name, PurplePrefType type,
 		gtk_widget_hide(frame);
 }
 
-static void proxy_print_option(GtkEntry *entry, int entrynum)
+static void
+proxy_print_option(GtkEntry *entry, int entrynum)
 {
 	if (entrynum == PROXYHOST)
 		purple_prefs_set_string("/purple/proxy/host", gtk_entry_get_text(entry));
@@ -1465,14 +1753,25 @@ network_page(void)
 	GtkWidget *proxy_button = NULL, *browser_button = NULL;
 	GtkSizeGroup *sg;
 	PurpleProxyInfo *proxy_info = NULL;
+	const char *ip;
+	PurpleStunNatDiscovery *stun;
+	char *auto_ip_text;
 
 	ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
 	gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER);
 
 	vbox = pidgin_make_frame (ret, _("IP Address"));
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-	pidgin_prefs_labeled_entry(vbox,_("ST_UN server:"),
-			"/purple/network/stun_server", sg);
+
+	entry = gtk_entry_new();
+	gtk_entry_set_text(GTK_ENTRY(entry), purple_prefs_get_string(
+			"/purple/network/stun_server"));
+	g_signal_connect(G_OBJECT(entry), "focus-out-event",
+			G_CALLBACK(network_stun_server_changed_cb), NULL);
+	gtk_widget_show(entry);
+
+	pidgin_add_widget_to_vbox(GTK_BOX(vbox), "ST_UN server:",
+			sg, entry, TRUE, NULL);
 
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 	gtk_container_add(GTK_CONTAINER(vbox), hbox);
@@ -1487,8 +1786,30 @@ network_page(void)
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 	gtk_container_add(GTK_CONTAINER(hbox), label);
 
-	auto_ip_checkbox = pidgin_prefs_checkbox(_("_Autodetect IP address"),
-			"/purple/network/auto_ip", vbox);
+	/* purple_network_get_my_ip will return the IP that was set by the user with
+	   purple_network_set_public_ip, so make a lookup for the auto-detected IP
+	   ourselves. */
+
+	/* Check if STUN discovery was already done */
+	stun = purple_stun_discover(NULL);
+	if ((stun != NULL) && (stun->status == PURPLE_STUN_STATUS_DISCOVERED)) {
+		ip = stun->publicip;
+	} else {
+		/* Attempt to get the IP from a NAT device using UPnP */
+		ip = purple_upnp_get_public_ip();
+		if (ip == NULL) {
+			/* Attempt to get the IP from a NAT device using NAT-PMP */
+			ip = purple_pmp_get_public_ip();
+			if (ip == NULL) {
+				/* Just fetch the IP of the local system */
+				ip = purple_network_get_local_system_ip(-1);
+			}
+		}
+	}
+
+	auto_ip_text = g_strdup_printf(_("Use _automatically detected IP address: %s"), ip);
+	auto_ip_checkbox = pidgin_prefs_checkbox(auto_ip_text, "/purple/network/auto_ip", vbox);
+	g_free(auto_ip_text);
 
 	table = gtk_table_new(2, 2, FALSE);
 	gtk_container_set_border_width(GTK_CONTAINER(table), 0);
@@ -1507,16 +1828,9 @@ network_page(void)
 	g_signal_connect(G_OBJECT(entry), "changed",
 					 G_CALLBACK(network_ip_changed), NULL);
 
-	/*
-	 * TODO: This could be better by showing the autodeteced
-	 * IP separately from the user-specified IP.
-	 */
-	if (purple_network_get_my_ip(-1) != NULL)
-		gtk_entry_set_text(GTK_ENTRY(entry),
-		                   purple_network_get_my_ip(-1));
-
-	pidgin_set_accessible_label (entry, label);
+	gtk_entry_set_text(GTK_ENTRY(entry), purple_network_get_public_ip());
 
+	pidgin_set_accessible_label(entry, label);
 
 	if (purple_prefs_get_bool("/purple/network/auto_ip")) {
 		gtk_widget_set_sensitive(GTK_WIDGET(table), FALSE);
@@ -1550,6 +1864,29 @@ network_page(void)
 	g_signal_connect(G_OBJECT(ports_checkbox), "clicked",
 					 G_CALLBACK(pidgin_toggle_sensitive), spin_button);
 
+	g_object_unref(sg);
+
+	/* TURN server */
+	vbox = pidgin_make_frame(ret, _("Relay Server (TURN)"));
+	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
+	entry = gtk_entry_new();
+	gtk_entry_set_text(GTK_ENTRY(entry), purple_prefs_get_string(
+			"/purple/network/turn_server"));
+	g_signal_connect(G_OBJECT(entry), "focus-out-event",
+			G_CALLBACK(network_turn_server_changed_cb), NULL);
+	gtk_widget_show(entry);
+
+	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), "_TURN server:",
+			sg, entry, TRUE, NULL);
+
+	pidgin_prefs_labeled_spin_button(hbox, _("_Port:"),
+		"/purple/network/turn_port", 0, 65535, NULL);
+	hbox = pidgin_prefs_labeled_entry(vbox, "_Username:",
+		"/purple/network/turn_username", sg);
+	pidgin_prefs_labeled_password(hbox, "_Password:",
+		"/purple/network/turn_password", NULL);
+
 	if (purple_running_gnome()) {
 		vbox = pidgin_make_frame(ret, _("Proxy Server &amp; Browser"));
 		prefs_proxy_frame = gtk_vbox_new(FALSE, 0);
@@ -1727,7 +2064,9 @@ network_page(void)
 }
 
 #ifndef _WIN32
-static gboolean manual_browser_set(GtkWidget *entry, GdkEventFocus *event, gpointer data) {
+static gboolean
+manual_browser_set(GtkWidget *entry, GdkEventFocus *event, gpointer data)
+{
 	const char *program = gtk_entry_get_text(GTK_ENTRY(entry));
 
 	purple_prefs_set_path(PIDGIN_PREFS_ROOT "/browsers/command", program);
@@ -1736,7 +2075,8 @@ static gboolean manual_browser_set(GtkWidget *entry, GdkEventFocus *event, gpoin
 	return FALSE;
 }
 
-static GList *get_available_browsers(void)
+static GList *
+get_available_browsers(void)
 {
 	struct browser {
 		char *name;
@@ -1903,7 +2243,8 @@ logging_page(void)
 }
 
 #ifndef _WIN32
-static gint sound_cmd_yeah(GtkEntry *entry, gpointer d)
+static gint
+sound_cmd_yeah(GtkEntry *entry, gpointer d)
 {
 	purple_prefs_set_path(PIDGIN_PREFS_ROOT "/sound/command",
 			gtk_entry_get_text(GTK_ENTRY(entry)));
@@ -2035,7 +2376,8 @@ sound_chosen_cb(void *user_data, const char *filename)
 	pref_sound_generate_markup();
 }
 
-static void select_sound(GtkWidget *button, gpointer being_NULL_is_fun)
+static void
+select_sound(GtkWidget *button, gpointer being_NULL_is_fun)
 {
 	gchar *pref;
 	const char *filename;
@@ -2055,7 +2397,8 @@ static void select_sound(GtkWidget *button, gpointer being_NULL_is_fun)
 }
 
 #ifdef USE_GSTREAMER
-static gchar* prefs_sound_volume_format(GtkScale *scale, gdouble val)
+static gchar *
+prefs_sound_volume_format(GtkScale *scale, gdouble val)
 {
 	if(val < 15) {
 		return g_strdup_printf(_("Quietest"));
@@ -2074,14 +2417,17 @@ static gchar* prefs_sound_volume_format(GtkScale *scale, gdouble val)
 	}
 }
 
-static void prefs_sound_volume_changed(GtkRange *range)
+static void
+prefs_sound_volume_changed(GtkRange *range)
 {
 	int val = (int)gtk_range_get_value(GTK_RANGE(range));
 	purple_prefs_set_int(PIDGIN_PREFS_ROOT "/sound/volume", val);
 }
 #endif
 
-static void prefs_sound_sel(GtkTreeSelection *sel, GtkTreeModel *model) {
+static void
+prefs_sound_sel(GtkTreeSelection *sel, GtkTreeModel *model)
+{
 	GtkTreeIter  iter;
 	GValue val;
 	const char *file;
@@ -2128,7 +2474,7 @@ static GtkWidget *
 sound_page(void)
 {
 	GtkWidget *ret;
-	GtkWidget *vbox, *sw, *button, *combo_box;
+	GtkWidget *vbox, *sw, *button;
 	GtkSizeGroup *sg;
 	GtkTreeIter iter;
 	GtkWidget *event_view;
@@ -2234,11 +2580,14 @@ sound_page(void)
 			vbox->parent->parent, TRUE, TRUE, 0, GTK_PACK_START);
 
 	/* SOUND THEMES */
-	combo_box = prefs_build_theme_combo_box(prefs_sound_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme"));
-	pref_sound_generate_markup();
-	gtk_box_pack_start(GTK_BOX (vbox), combo_box, FALSE, FALSE, 0);
+	prefs_sound_themes_combo_box = prefs_build_theme_combo_box(prefs_sound_themes,
+						purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme"),
+						"sound");
 
-	g_signal_connect(G_OBJECT(combo_box), "changed", (GCallback)prefs_set_sound_theme_cb, NULL);
+
+	gtk_box_pack_start(GTK_BOX (vbox), prefs_sound_themes_combo_box, FALSE, FALSE, 0);
+
+	g_signal_connect(G_OBJECT(prefs_sound_themes_combo_box), "changed", (GCallback)prefs_set_sound_theme_cb, NULL);
 
 	/* SOUND SELECTION */
 	sw = gtk_scrolled_window_new(NULL,NULL);
@@ -2385,14 +2734,12 @@ away_page(void)
 	/* Auto-away stuff */
 	vbox = pidgin_make_frame(ret, _("Auto-away"));
 
-	button = pidgin_prefs_checkbox(_("Change status when _idle"),
-						   "/purple/away/away_when_idle", vbox);
-
 	select = pidgin_prefs_labeled_spin_button(vbox,
 			_("_Minutes before becoming idle:"), "/purple/away/mins_before_away",
 			1, 24 * 60, sg);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(pidgin_toggle_sensitive), select);
+
+	button = pidgin_prefs_checkbox(_("Change status when _idle"),
+						   "/purple/away/away_when_idle", vbox);
 
 	/* TODO: Show something useful if we don't have any saved statuses. */
 	menu = pidgin_status_menu(purple_savedstatus_get_idleaway(), G_CALLBACK(set_idle_away));
@@ -2404,7 +2751,6 @@ away_page(void)
 
 	if (!purple_prefs_get_bool("/purple/away/away_when_idle")) {
 		gtk_widget_set_sensitive(GTK_WIDGET(menu), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
 		gtk_widget_set_sensitive(GTK_WIDGET(label), FALSE);
 	}
 
@@ -2434,10 +2780,8 @@ away_page(void)
 }
 
 static int
-prefs_notebook_add_page(const char *text,
-  		        GtkWidget *page,
-			int ind) {
-
+prefs_notebook_add_page(const char *text, GtkWidget *page, int ind)
+{
 #if GTK_CHECK_VERSION(2,4,0)
 	return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
 #else
@@ -2446,7 +2790,9 @@ prefs_notebook_add_page(const char *text,
 #endif
 }
 
-static void prefs_notebook_init(void) {
+static void
+prefs_notebook_init(void)
+{
 	prefs_notebook_add_page(_("Interface"), interface_page(), notebook_page++);
 	prefs_notebook_add_page(_("Conversations"), conv_page(), notebook_page++);
 	prefs_notebook_add_page(_("Smiley Themes"), theme_page(), notebook_page++);
@@ -2463,7 +2809,8 @@ static void prefs_notebook_init(void) {
 	prefs_notebook_add_page(_("Status / Idle"), away_page(), notebook_page++);
 }
 
-void pidgin_prefs_show(void)
+void
+pidgin_prefs_show(void)
 {
 	GtkWidget *vbox;
 	GtkWidget *notebook;
@@ -2474,14 +2821,6 @@ void pidgin_prefs_show(void)
 		return;
 	}
 
-	/* Refresh the list of themes before showing the preferences window */
-	purple_theme_manager_refresh();
-
-	/* add everything in the theme manager before the window is loaded */
-	if (prefs_themes_unsorted) {
-		purple_theme_manager_for_each_theme(prefs_themes_sort);
-		prefs_themes_unsorted = FALSE;
-	}
 	/* copy the preferences to tmp values...
 	 * I liked "take affect immediately" Oh well :-( */
 	/* (that should have been "effect," right?) */
@@ -2506,6 +2845,9 @@ void pidgin_prefs_show(void)
 
 	prefs_notebook_init();
 
+	/* Refresh the list of themes before showing the preferences window */
+	prefs_themes_refresh();
+
 	/* Show everything. */
 	gtk_widget_show(prefs);
 }
@@ -2590,7 +2932,8 @@ pidgin_prefs_init(void)
 	pidgin_prefs_update_old();
 }
 
-void pidgin_prefs_update_old()
+void
+pidgin_prefs_update_old(void)
 {
 	const char *str;
 
diff --git a/pidgin/gtkprefs.h b/pidgin/gtkprefs.h
index e8b7945a53..d07c968b8a 100644
--- a/pidgin/gtkprefs.h
+++ b/pidgin/gtkprefs.h
@@ -81,6 +81,24 @@ GtkWidget *pidgin_prefs_labeled_entry(GtkWidget *page, const gchar *title,
 										const char *key, GtkSizeGroup *sg);
 
 /**
+ * Add a new entry representing a password (string) preference
+ * The entry will use a password-style text entry (the text is substituded)
+ *
+ * @param page  The page to which the entry will be added
+ * @param title The text to be displayed as the entry label
+ * @param key   The key of the string pref that will be represented by the entry
+ * @param sg    If not NULL, the size group to which the entry will be added
+ *
+ * @return      An hbox containing both the label and the entry.  Can be used to set
+ *               the widgets to sensitive or insensitive based on the value of a
+ *               checkbox.
+ *
+ * @since 2.6.0
+ */
+GtkWidget *pidgin_prefs_labeled_password(GtkWidget *page, const gchar *title,
+										const char *key, GtkSizeGroup *sg);
+
+/**
  * Add a new dropdown representing a preference of the specified type
  *
  * @param page  The page to which the dropdown will be added
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
index 7fc4b97a04..2c3088f034 100644
--- a/pidgin/gtkrequest.c
+++ b/pidgin/gtkrequest.c
@@ -717,12 +717,16 @@ setup_entry_field(GtkWidget *entry, PurpleRequestField *field)
 			GtkWidget *optmenu = NULL;
 			PurpleRequestFieldGroup *group = purple_request_field_get_group(field);
 			GList *fields = group->fields;
+
+			/* Ensure the account option menu is created (if the widget hasn't
+			 * been initialized already) for username auto-completion. */
 			while (fields)
 			{
 				PurpleRequestField *fld = fields->data;
 				fields = fields->next;
 
-				if (purple_request_field_get_type(fld) == PURPLE_REQUEST_FIELD_ACCOUNT)
+				if (purple_request_field_get_type(fld) == PURPLE_REQUEST_FIELD_ACCOUNT &&
+						purple_request_field_is_visible(fld))
 				{
 					const char *type_hint = purple_request_field_get_type_hint(fld);
 					if (type_hint != NULL && strcmp(type_hint, "account") == 0)
@@ -730,7 +734,7 @@ setup_entry_field(GtkWidget *entry, PurpleRequestField *field)
 						optmenu = GTK_WIDGET(purple_request_field_get_ui_data(fld));
 						if (optmenu == NULL) {
 							optmenu = GTK_WIDGET(create_account_field(fld));
-							purple_request_field_set_ui_data(field, optmenu);
+							purple_request_field_set_ui_data(fld, optmenu);
 						}
 						break;
 					}
diff --git a/pidgin/gtkroomlist.c b/pidgin/gtkroomlist.c
index 5302481e87..82bac84809 100644
--- a/pidgin/gtkroomlist.c
+++ b/pidgin/gtkroomlist.c
@@ -64,7 +64,6 @@ typedef struct _PidginRoomlist {
 	gint num_rooms, total_rooms;
 	GtkWidget *tipwindow;
 	GdkRectangle tip_rect;
-	guint timeout;
 	PangoLayout *tip_layout;
 	PangoLayout *tip_name_layout;
 	int tip_height;
diff --git a/pidgin/gtksavedstatuses.c b/pidgin/gtksavedstatuses.c
index 9df26bf30b..f157d133bd 100644
--- a/pidgin/gtksavedstatuses.c
+++ b/pidgin/gtksavedstatuses.c
@@ -390,7 +390,7 @@ status_selected_cb(GtkTreeSelection *sel, gpointer user_data)
 
 	gtk_widget_set_sensitive(dialog->use_button, (num_selected == 1) && can_use);
 	gtk_widget_set_sensitive(dialog->modify_button, (num_selected > 0));
-	gtk_widget_set_sensitive(dialog->delete_button, can_delete);
+	gtk_widget_set_sensitive(dialog->delete_button, num_selected > 0 && can_delete);
 
     g_list_free(sel_paths);
 }
@@ -398,23 +398,7 @@ status_selected_cb(GtkTreeSelection *sel, gpointer user_data)
 static const gchar *
 get_stock_icon_from_primitive(PurpleStatusPrimitive type)
 {
-	switch (type) {
-		case PURPLE_STATUS_AVAILABLE:
-			return PIDGIN_STOCK_STATUS_AVAILABLE;
-		case PURPLE_STATUS_AWAY:
-			return PIDGIN_STOCK_STATUS_AWAY;
-		case PURPLE_STATUS_EXTENDED_AWAY:
-			return PIDGIN_STOCK_STATUS_XA;
-		case PURPLE_STATUS_INVISIBLE:
-			return PIDGIN_STOCK_STATUS_INVISIBLE;
-		case PURPLE_STATUS_OFFLINE:
-			return PIDGIN_STOCK_STATUS_OFFLINE;
-		case PURPLE_STATUS_UNAVAILABLE:
-			return PIDGIN_STOCK_STATUS_BUSY;
-		default:
-			/* this shouldn't happen */
-			return NULL;
-	}
+	return pidgin_stock_id_from_status_primitive(type);
 }
 
 static void
@@ -664,6 +648,7 @@ pidgin_status_window_show(void)
 	button = pidgin_dialog_add_button(GTK_DIALOG(win), PIDGIN_STOCK_MODIFY,
 			G_CALLBACK(status_window_modify_cb), dialog);
 	dialog->modify_button = button;
+	gtk_widget_set_sensitive(button, FALSE);
 
 	/* Delete button */
 	button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_DELETE,
@@ -1503,16 +1488,19 @@ edit_substatus(StatusEditor *status_editor, PurpleAccount *account)
 	gtk_size_group_add_widget(sg, label);
 
 	dialog->model = gtk_list_store_new(SUBSTATUS_NUM_COLUMNS,
-									   GDK_TYPE_PIXBUF,
+									   G_TYPE_STRING,
 									   G_TYPE_STRING,
 									   G_TYPE_STRING);
 	combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(dialog->model));
 	dialog->box = GTK_COMBO_BOX(combo);
 
 	rend = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new());
+	g_object_set(G_OBJECT(rend),
+			"stock-size", gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL),
+			NULL);
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), rend, FALSE);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), rend,
-						"pixbuf", SUBSTATUS_COLUMN_ICON, NULL);
+						"stock-id", SUBSTATUS_COLUMN_ICON, NULL);
 
 	rend = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), rend, TRUE);
@@ -1574,8 +1562,8 @@ edit_substatus(StatusEditor *status_editor, PurpleAccount *account)
 	for (list = purple_account_get_status_types(account); list; list = list->next)
 	{
 		PurpleStatusType *status_type;
-		GdkPixbuf *pixbuf;
 		const char *id, *name;
+		PurpleStatusPrimitive prim;
 
 		status_type = list->data;
 
@@ -1588,17 +1576,15 @@ edit_substatus(StatusEditor *status_editor, PurpleAccount *account)
 			continue;
 
 		id = purple_status_type_get_id(status_type);
-		pixbuf = pidgin_create_status_icon(purple_status_type_get_primitive(status_type), combo, PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
+		prim = purple_status_type_get_primitive(status_type);
 		name = purple_status_type_get_name(status_type);
 
 		gtk_list_store_append(dialog->model, &iter);
 		gtk_list_store_set(dialog->model, &iter,
-						   SUBSTATUS_COLUMN_ICON, pixbuf,
+						   SUBSTATUS_COLUMN_ICON, pidgin_stock_id_from_status_primitive(prim),
 						   SUBSTATUS_COLUMN_STATUS_ID, id,
 						   SUBSTATUS_COLUMN_STATUS_NAME, name,
 						   -1);
-		if (pixbuf != NULL)
-			g_object_unref(pixbuf);
 		if ((status_id != NULL) && !strcmp(status_id, id))
 		{
 			gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter);
@@ -1705,18 +1691,15 @@ static gboolean pidgin_status_menu_add_primitive(GtkListStore *model, GtkWidget
 {
 	GtkTreeIter iter;
 	gboolean currently_selected = FALSE;
-	GdkPixbuf *pixbuf = pidgin_create_status_icon(primitive, w, PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
 
 	gtk_list_store_append(model, &iter);
 	gtk_list_store_set(model, &iter,
 			   SS_MENU_TYPE_COLUMN, SS_MENU_ENTRY_TYPE_PRIMITIVE,
-			   SS_MENU_ICON_COLUMN, pixbuf,
+			   SS_MENU_ICON_COLUMN, pidgin_stock_id_from_status_primitive(primitive),
 			   SS_MENU_TEXT_COLUMN, purple_primitive_get_name_from_type(primitive),
 			   SS_MENU_DATA_COLUMN, GINT_TO_POINTER(primitive),
 			   SS_MENU_EMBLEM_VISIBLE_COLUMN, FALSE,
 			   -1);
-	if (pixbuf != NULL)
-		g_object_unref(pixbuf);
 
 	if (purple_savedstatus_is_transient(current_status)
 			&& !purple_savedstatus_has_substatuses(current_status)
@@ -1730,23 +1713,20 @@ static void
 pidgin_status_menu_update_iter(GtkWidget *combobox, GtkListStore *store, GtkTreeIter *iter,
 		PurpleSavedStatus *status)
 {
-	GdkPixbuf *pixbuf;
+	PurpleStatusPrimitive primitive;
 
 	if (store == NULL)
 		store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combobox)));
 
-	pixbuf = pidgin_create_status_icon(purple_savedstatus_get_type(status),
-			combobox, PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
+	primitive = purple_savedstatus_get_type(status);
 	gtk_list_store_set(store, iter,
 			SS_MENU_TYPE_COLUMN, SS_MENU_ENTRY_TYPE_SAVEDSTATUS,
-			SS_MENU_ICON_COLUMN, pixbuf,
+			SS_MENU_ICON_COLUMN, pidgin_stock_id_from_status_primitive(primitive),
 			SS_MENU_TEXT_COLUMN, purple_savedstatus_get_title(status),
 			SS_MENU_DATA_COLUMN, GINT_TO_POINTER(purple_savedstatus_get_creation_time(status)),
 			SS_MENU_EMBLEM_COLUMN, GTK_STOCK_SAVE,
 			SS_MENU_EMBLEM_VISIBLE_COLUMN, TRUE,
 			-1);
-	if (pixbuf)
-		g_object_unref(G_OBJECT(pixbuf));
 }
 
 static gboolean
@@ -1828,7 +1808,7 @@ GtkWidget *pidgin_status_menu(PurpleSavedStatus *current_status, GCallback callb
 	GtkCellRenderer *icon_rend;
 	GtkCellRenderer *emblem_rend;
 
-	model = gtk_list_store_new(SS_MENU_NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF,
+	model = gtk_list_store_new(SS_MENU_NUM_COLUMNS, G_TYPE_INT, G_TYPE_STRING,
 				   G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
 	combobox = gtk_combo_box_new();
@@ -1875,10 +1855,13 @@ GtkWidget *pidgin_status_menu(PurpleSavedStatus *current_status, GCallback callb
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combobox), icon_rend, FALSE);
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combobox), text_rend, TRUE);
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combobox), emblem_rend, FALSE);
-	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combobox), icon_rend, "pixbuf", SS_MENU_ICON_COLUMN, NULL);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combobox), icon_rend, "stock-id", SS_MENU_ICON_COLUMN, NULL);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combobox), text_rend, "markup", SS_MENU_TEXT_COLUMN, NULL);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combobox), emblem_rend,
 					"stock-id", SS_MENU_EMBLEM_COLUMN, "visible", SS_MENU_EMBLEM_VISIBLE_COLUMN, NULL);
+	g_object_set(G_OBJECT(icon_rend),
+			"stock-size", gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL),
+			NULL);
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), index);
 	g_signal_connect(G_OBJECT(combobox), "changed", G_CALLBACK(status_menu_cb), callback);
diff --git a/pidgin/gtksmiley.c b/pidgin/gtksmiley.c
index d8f0b3e422..e1b10a4197 100644
--- a/pidgin/gtksmiley.c
+++ b/pidgin/gtksmiley.c
@@ -47,6 +47,9 @@ struct _PidginSmiley
 	GtkWidget *smiley_image;
 	gchar *filename;
 	GdkPixbuf *custom_pixbuf;
+	gpointer data; /** @since 2.6.0 */
+	gsize datasize; /** @since 2.6.0 */
+	gint entry_len; /** @since 2.6.0 */
 };
 
 typedef struct
@@ -71,10 +74,11 @@ static GSList *gtk_smileys = NULL;
 static void
 pidgin_smiley_destroy(PidginSmiley *smiley)
 {
+	g_object_set_data(G_OBJECT(smiley->smiley), "edit-dialog", NULL);
 	gtk_widget_destroy(smiley->parent);
 	g_free(smiley->filename);
 	if (smiley->custom_pixbuf)
-		gdk_pixbuf_unref(smiley->custom_pixbuf);
+		g_object_unref(G_OBJECT(smiley->custom_pixbuf));
 	g_free(smiley);
 }
 
@@ -224,18 +228,6 @@ static void do_add(GtkWidget *widget, PidginSmiley *s)
 	PurpleSmiley *emoticon;
 
 	entry = gtk_entry_get_text(GTK_ENTRY(s->smile));
-	if (!entry || !*entry) {
-		/*
-		 * TODO: We should enable/disable the add button based on
-		 *       whether the user has entered all required data.  That
-		 *       would eliminate the need for this check and provide a
-		 *       better user experience.
-		 */
-		purple_notify_error(s->parent, _("Custom Smiley"),
-				_("More Data needed"),
-				_("Please provide a shortcut to associate with the smiley."));
-		return;
-	}
 
 	emoticon = purple_smileys_find_by_shortcut(entry);
 	if (emoticon && emoticon != s->smiley) {
@@ -265,19 +257,9 @@ static void do_add(GtkWidget *widget, PidginSmiley *s)
 		}
 		purple_smiley_set_shortcut(s->smiley, entry);
 	} else {
-		if ((s->filename == NULL && s->custom_pixbuf == NULL)
-				|| *entry == 0) {
-			purple_notify_error(s->parent, _("Custom Smiley"),
-					_("More Data needed"),
-					s->filename ? _("Please provide a shortcut to associate with the smiley.")
-					: _("Please select an image for the smiley."));
-			return;
-		}
-
 		purple_debug_info("gtksmiley", "adding a new smiley\n");
 
 		if (s->filename == NULL) {
-			/* Get the smiley from the custom pixbuf */
 			gchar *buffer = NULL;
 			gsize size = 0;
 			gchar *filename;
@@ -296,8 +278,16 @@ static void do_add(GtkWidget *widget, PidginSmiley *s)
 				}
 			}
 
-			gdk_pixbuf_save_to_buffer(s->custom_pixbuf, &buffer, &size,
-				"png", NULL, "compression", "9", NULL, NULL);
+			if (s->data && s->datasize) {
+				/* Cached data & size in memory */
+				buffer = s->data;
+				size = s->datasize;
+			}
+			else {
+				/* Get the smiley from the custom pixbuf */
+				gdk_pixbuf_save_to_buffer(s->custom_pixbuf, &buffer, &size,
+					"png", NULL, "compression", "9", NULL, NULL);
+			}
 			filename = purple_util_get_image_filename(buffer, size);
 			s->filename = g_build_filename(dirname, filename, NULL);
 			purple_util_write_data_to_file_absolute(s->filename, buffer, size);
@@ -344,8 +334,11 @@ static void do_add_file_cb(const char *filename, gpointer data)
 	pixbuf = gdk_pixbuf_new_from_file_at_scale(filename, 64, 64, FALSE, NULL);
 	gtk_image_set_from_pixbuf(GTK_IMAGE(s->smiley_image), pixbuf);
 	if (pixbuf)
-		gdk_pixbuf_unref(pixbuf);
+		g_object_unref(G_OBJECT(pixbuf));
 	gtk_widget_grab_focus(s->smile);
+
+	if (s->entry_len > 0)
+		gtk_dialog_set_response_sensitive(GTK_DIALOG(s->parent), GTK_RESPONSE_ACCEPT, TRUE);
 }
 
 static void
@@ -359,6 +352,36 @@ open_image_selector(GtkWidget *widget, PidginSmiley *psmiley)
 	gtk_widget_show_all(file_chooser);
 }
 
+static void
+smiley_name_insert_cb(GtkEditable *editable,
+                      gchar       *new_text,
+                      gint         new_text_length,
+                      gint        *position,
+                      gpointer     user_data)
+{
+	PidginSmiley *s = user_data;
+	if (new_text_length != -1)
+		s->entry_len += new_text_length;
+	else
+		s->entry_len += strlen(new_text);
+
+	if (s->filename != NULL || s->custom_pixbuf != NULL || s->smiley != NULL)
+		gtk_dialog_set_response_sensitive(GTK_DIALOG(s->parent), GTK_RESPONSE_ACCEPT, TRUE);
+}
+
+static void
+smiley_name_delete_cb(GtkEditable *editable,
+                      gint         start_pos,
+                      gint         end_pos,
+                      gpointer     user_data)
+{
+	PidginSmiley *s = user_data;
+	s->entry_len -= end_pos - start_pos;
+
+	if (s->entry_len <= 0)
+		gtk_dialog_set_response_sensitive(GTK_DIALOG(s->parent), GTK_RESPONSE_ACCEPT, FALSE);
+}
+
 PidginSmiley *
 pidgin_smiley_edit(GtkWidget *widget, PurpleSmiley *smiley)
 {
@@ -380,9 +403,11 @@ pidgin_smiley_edit(GtkWidget *widget, PurpleSmiley *smiley)
 			smiley ? GTK_STOCK_SAVE : GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
 			NULL);
 	s->parent = window;
+	g_object_set_data(G_OBJECT(smiley), "edit-dialog", window);
 
 	gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER);
 
+	gtk_dialog_set_default_response(GTK_DIALOG(window), GTK_RESPONSE_ACCEPT);
 	g_signal_connect(window, "response", G_CALLBACK(do_add_select_cb), s);
 
 	/* The vbox */
@@ -432,10 +457,17 @@ pidgin_smiley_edit(GtkWidget *widget, PurpleSmiley *smiley)
 	s->smile = gtk_entry_new();
 	gtk_entry_set_activates_default(GTK_ENTRY(s->smile), TRUE);
 	pidgin_set_accessible_label(s->smile, label);
-	if (smiley)
-		gtk_entry_set_text(GTK_ENTRY(s->smile), purple_smiley_get_shortcut(smiley));
+	if (smiley) {
+		const char *shortcut = purple_smiley_get_shortcut(smiley);
+		gtk_entry_set_text(GTK_ENTRY(s->smile), shortcut);
+		s->entry_len = strlen(shortcut);
+	}
+	else
+		gtk_dialog_set_response_sensitive(GTK_DIALOG(window), GTK_RESPONSE_ACCEPT, FALSE);
 
-	g_signal_connect(s->smile, "activate", G_CALLBACK(do_add), s);
+	/* gtk_entry_get_text_length is 2.14+, so we'll just keep track ourselves */
+	g_signal_connect(G_OBJECT(s->smile), "insert-text", G_CALLBACK(smiley_name_insert_cb), s);
+	g_signal_connect(G_OBJECT(s->smile), "delete-text", G_CALLBACK(smiley_name_delete_cb), s);
 
 	gtk_box_pack_end(GTK_BOX(hbox), s->smile, FALSE, FALSE, 0);
 	gtk_widget_show(s->smile);
@@ -459,10 +491,24 @@ void
 pidgin_smiley_editor_set_image(PidginSmiley *editor, GdkPixbuf *image)
 {
 	if (editor->custom_pixbuf)
-		gdk_pixbuf_unref(editor->custom_pixbuf);
-	editor->custom_pixbuf = image ? gdk_pixbuf_ref(image) : NULL;
-	if (image)
+		g_object_unref(G_OBJECT(editor->custom_pixbuf));
+	editor->custom_pixbuf = image ? g_object_ref(G_OBJECT(image)) : NULL;
+	if (image) {
 		gtk_image_set_from_pixbuf(GTK_IMAGE(editor->smiley_image), image);
+		if (editor->entry_len > 0)
+			gtk_dialog_set_response_sensitive(GTK_DIALOG(editor->parent),
+			                                  GTK_RESPONSE_ACCEPT, TRUE);
+	}
+	else
+		gtk_dialog_set_response_sensitive(GTK_DIALOG(editor->parent),
+		                                  GTK_RESPONSE_ACCEPT, FALSE);
+}
+
+void
+pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer *data, gsize datasize)
+{
+	editor->data = data;
+	editor->datasize = datasize;
 }
 
 /******************************************************************************
@@ -606,8 +652,12 @@ static void
 smiley_edit_iter(SmileyManager *dialog, GtkTreeIter *iter)
 {
 	PurpleSmiley *smiley = NULL;
+	GtkWidget *window = NULL;
 	gtk_tree_model_get(GTK_TREE_MODEL(dialog->model), iter, SMILEY, &smiley, -1);
-	pidgin_smiley_edit(gtk_widget_get_toplevel(GTK_WIDGET(dialog->treeview)), smiley);
+	if ((window = g_object_get_data(G_OBJECT(smiley), "edit-dialog")) != NULL)
+		gtk_window_present(GTK_WINDOW(window));
+	else
+		pidgin_smiley_edit(gtk_widget_get_toplevel(GTK_WIDGET(dialog->treeview)), smiley);
 	g_object_unref(G_OBJECT(smiley));
 }
 
diff --git a/pidgin/gtksmiley.h b/pidgin/gtksmiley.h
index 46f68541a9..06d0dc2868 100644
--- a/pidgin/gtksmiley.h
+++ b/pidgin/gtksmiley.h
@@ -100,4 +100,15 @@ void pidgin_smiley_editor_set_shortcut(PidginSmiley *editor, const gchar *shortc
  */
 void pidgin_smiley_editor_set_image(PidginSmiley *editor, GdkPixbuf *image);
 
+/**
+ * Sets the image data in a smiley add dialog
+ *
+ * @param editor A smiley editor dialog
+ * @param data A pointer to smiley's data
+ * @param datasize The size of smiley's data
+ *
+ * @since 2.6.0
+ */
+void pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer *data, gsize datasize);
+
 #endif /* PIDGIN_GTKSMILEY_H */
diff --git a/pidgin/gtksound.c b/pidgin/gtksound.c
index 5e89167819..d90bd8812a 100644
--- a/pidgin/gtksound.c
+++ b/pidgin/gtksound.c
@@ -158,7 +158,7 @@ im_msg_sent_cb(PurpleAccount *account, const char *receiver,
 			   const char *message, PurpleSoundEventID event)
 {
 	PurpleConversation *conv = purple_find_conversation_with_account(
-		PURPLE_CONV_TYPE_ANY, receiver, account);
+		PURPLE_CONV_TYPE_IM, receiver, account);
 	play_conv_event(conv, event);
 }
 
@@ -226,9 +226,9 @@ static void
 account_signon_cb(PurpleConnection *gc, gpointer data)
 {
 	if (mute_login_sounds_timeout != 0)
-		g_source_remove(mute_login_sounds_timeout);
+		purple_timeout_remove(mute_login_sounds_timeout);
 	mute_login_sounds = TRUE;
-	mute_login_sounds_timeout = purple_timeout_add(10000, unmute_login_sounds_cb, NULL);
+	mute_login_sounds_timeout = purple_timeout_add_seconds(10, unmute_login_sounds_cb, NULL);
 }
 
 const char *
diff --git a/pidgin/gtksourceiter.h b/pidgin/gtksourceiter.h
index 33d6c46ccb..2be2737c9b 100644
--- a/pidgin/gtksourceiter.h
+++ b/pidgin/gtksourceiter.h
@@ -28,7 +28,7 @@
 #ifndef _PIDGINSOURCEITER_H_
 #define _PIDGINSOURCEITER_H_
 
-#include <gtk/gtktextiter.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/pidgin/gtksourceundomanager.h b/pidgin/gtksourceundomanager.h
index 2084dfc0e1..0148455476 100644
--- a/pidgin/gtksourceundomanager.h
+++ b/pidgin/gtksourceundomanager.h
@@ -26,14 +26,14 @@
 #ifndef __GTK_SOURCE_UNDO_MANAGER_H__
 #define __GTK_SOURCE_UNDO_MANAGER_H__
 
-#include <gtk/gtktextbuffer.h>
-
-#define GTK_SOURCE_TYPE_UNDO_MANAGER             	(gtk_source_undo_manager_get_type ())
-#define GTK_SOURCE_UNDO_MANAGER(obj)			(GTK_CHECK_CAST ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))
-#define GTK_SOURCE_UNDO_MANAGER_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
-#define GTK_SOURCE_IS_UNDO_MANAGER(obj)			(GTK_CHECK_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))
-#define GTK_SOURCE_IS_UNDO_MANAGER_CLASS(klass)  	(GTK_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER))
-#define GTK_SOURCE_UNDO_MANAGER_GET_CLASS(obj)  	(GTK_CHECK_GET_CLASS ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
+#include <gtk/gtk.h>
+
+#define GTK_SOURCE_TYPE_UNDO_MANAGER            (gtk_source_undo_manager_get_type())
+#define GTK_SOURCE_UNDO_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))
+#define GTK_SOURCE_UNDO_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
+#define GTK_SOURCE_IS_UNDO_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))
+#define GTK_SOURCE_IS_UNDO_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_SOURCE_TYPE_UNDO_MANAGER))
+#define GTK_SOURCE_UNDO_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
 
 
 typedef struct _GtkSourceUndoManager        	GtkSourceUndoManager;
diff --git a/pidgin/gtkstatus-icon-theme.h b/pidgin/gtkstatus-icon-theme.h
index 9dbc14c02d..ba8269a778 100644
--- a/pidgin/gtkstatus-icon-theme.h
+++ b/pidgin/gtkstatus-icon-theme.h
@@ -1,5 +1,5 @@
 /**
- * @file status_icon-theme.h  Pidgin Icon Theme  Class API
+ * @file gtkstatus-icon-theme.h  Pidgin Icon Theme  Class API
  */
 
 /* pidgin
diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c
index e7c061d931..e0af5bb8d7 100644
--- a/pidgin/gtkstatusbox.c
+++ b/pidgin/gtkstatusbox.c
@@ -67,7 +67,8 @@
 #  endif
 #endif
 
-#define TYPING_TIMEOUT 4000
+/* Timeout for typing notifications in seconds */
+#define TYPING_TIMEOUT 4
 
 static void imhtml_changed_cb(GtkTextBuffer *buffer, void *data);
 static void imhtml_format_changed_cb(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons, void *data);
@@ -92,11 +93,15 @@ static void pidgin_status_box_popdown(PidginStatusBox *box);
 static void do_colorshift (GdkPixbuf *dest, GdkPixbuf *src, int shift);
 static void icon_choose_cb(const char *filename, gpointer data);
 static void remove_buddy_icon_cb(GtkWidget *w, PidginStatusBox *box);
+static void choose_buddy_icon_cb(GtkWidget *w, PidginStatusBox *box);
 
 enum {
 	/** A PidginStatusBoxItemType */
 	TYPE_COLUMN,
 
+	/** This is the stock-id for the icon. */
+	ICON_STOCK_COLUMN,
+
 	/**
 	 * This is a GdkPixbuf (the other columns are strings).
 	 * This column is visible.
@@ -141,7 +146,51 @@ enum {
 	PROP_ICON_SEL,
 };
 
-GtkContainerClass *parent_class = NULL;
+static char *typing_stock_ids[7] = {
+	PIDGIN_STOCK_ANIMATION_TYPING0,
+	PIDGIN_STOCK_ANIMATION_TYPING1,
+	PIDGIN_STOCK_ANIMATION_TYPING2,
+	PIDGIN_STOCK_ANIMATION_TYPING3,
+	PIDGIN_STOCK_ANIMATION_TYPING4,
+	NULL
+};
+
+static char *connecting_stock_ids[] = {
+	PIDGIN_STOCK_ANIMATION_CONNECT0,
+	PIDGIN_STOCK_ANIMATION_CONNECT1,
+	PIDGIN_STOCK_ANIMATION_CONNECT2,
+	PIDGIN_STOCK_ANIMATION_CONNECT3,
+	PIDGIN_STOCK_ANIMATION_CONNECT4,
+	PIDGIN_STOCK_ANIMATION_CONNECT5,
+	PIDGIN_STOCK_ANIMATION_CONNECT6,
+	PIDGIN_STOCK_ANIMATION_CONNECT7,
+	PIDGIN_STOCK_ANIMATION_CONNECT8,
+	PIDGIN_STOCK_ANIMATION_CONNECT9,
+	PIDGIN_STOCK_ANIMATION_CONNECT10,
+	PIDGIN_STOCK_ANIMATION_CONNECT11,
+	PIDGIN_STOCK_ANIMATION_CONNECT12,
+	PIDGIN_STOCK_ANIMATION_CONNECT13,
+	PIDGIN_STOCK_ANIMATION_CONNECT14,
+	PIDGIN_STOCK_ANIMATION_CONNECT15,
+	PIDGIN_STOCK_ANIMATION_CONNECT16,
+	PIDGIN_STOCK_ANIMATION_CONNECT17,
+	PIDGIN_STOCK_ANIMATION_CONNECT18,
+	PIDGIN_STOCK_ANIMATION_CONNECT19,
+	PIDGIN_STOCK_ANIMATION_CONNECT20,
+	PIDGIN_STOCK_ANIMATION_CONNECT21,
+	PIDGIN_STOCK_ANIMATION_CONNECT22,
+	PIDGIN_STOCK_ANIMATION_CONNECT23,
+	PIDGIN_STOCK_ANIMATION_CONNECT24,
+	PIDGIN_STOCK_ANIMATION_CONNECT25,
+	PIDGIN_STOCK_ANIMATION_CONNECT26,
+	PIDGIN_STOCK_ANIMATION_CONNECT27,
+	PIDGIN_STOCK_ANIMATION_CONNECT28,
+	PIDGIN_STOCK_ANIMATION_CONNECT29,
+	PIDGIN_STOCK_ANIMATION_CONNECT30,
+	NULL
+};
+
+static GtkContainerClass *parent_class = NULL;
 
 static void pidgin_status_box_class_init (PidginStatusBoxClass *klass);
 static void pidgin_status_box_init (PidginStatusBox *status_box);
@@ -217,6 +266,9 @@ update_to_reflect_account_status(PidginStatusBox *status_box, PurpleAccount *acc
 			break;
 	}
 
+	gtk_imhtml_set_populate_primary_clipboard(
+		GTK_IMHTML(status_box->imhtml), TRUE);
+
 	if (status_no != -1) {
 		GtkTreePath *path;
 		gtk_widget_set_sensitive(GTK_WIDGET(status_box), FALSE);
@@ -266,6 +318,10 @@ icon_box_press_cb(GtkWidget *widget, GdkEventButton *event, PidginStatusBox *box
 
 		box->icon_box_menu = gtk_menu_new();
 
+		menu_item = pidgin_new_item_from_stock(box->icon_box_menu, _("Select Buddy Icon"), GTK_STOCK_ADD,
+						     G_CALLBACK(choose_buddy_icon_cb),
+						     box, 0, 0, NULL);
+
 		menu_item = pidgin_new_item_from_stock(box->icon_box_menu, _("Remove"), GTK_STOCK_REMOVE,
 						     G_CALLBACK(remove_buddy_icon_cb),
 						     box, 0, 0, NULL);
@@ -276,13 +332,7 @@ icon_box_press_cb(GtkWidget *widget, GdkEventButton *event, PidginStatusBox *box
 			       event->button, event->time);
 
 	} else {
-		if (box->buddy_icon_sel) {
-			gtk_window_present(GTK_WINDOW(box->buddy_icon_sel));
-			return FALSE;
-		}
-
-		box->buddy_icon_sel = pidgin_buddy_icon_chooser_new(GTK_WINDOW(gtk_widget_get_toplevel(widget)), icon_choose_cb, box);
-		gtk_widget_show_all(box->buddy_icon_sel);
+		choose_buddy_icon_cb(widget, box);
 	}
 	return FALSE;
 }
@@ -416,17 +466,16 @@ setup_icon_box(PidginStatusBox *status_box)
 		const char *filename = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon");
 		PurpleStoredImage *img = NULL;
 
-		if (filename != NULL)
-		{
-			gchar *contents;
-			gsize size;
-			if (g_file_get_contents(filename, &contents, &size, NULL))
-			{
-				img = purple_imgstore_add(contents, size, filename);
-			}
-		}
+		if (filename && *filename)
+			img = purple_imgstore_new_from_file(filename);
 
 		pidgin_status_box_set_buddy_icon(status_box, img);
+		if (img)
+			/*
+			 * purple_imgstore_new gives us a reference and
+			 * pidgin_status_box_set_buddy_icon also takes one.
+			 */
+			purple_imgstore_unref(img);
 	}
 
 	status_box->hand_cursor = gdk_cursor_new (GDK_HAND2);
@@ -535,12 +584,12 @@ pidgin_status_box_finalize(GObject *obj)
 
 	for (i = 0; i < G_N_ELEMENTS(statusbox->connecting_pixbufs); i++) {
 		if (statusbox->connecting_pixbufs[i] != NULL)
-			gdk_pixbuf_unref(statusbox->connecting_pixbufs[i]);
+			g_object_unref(G_OBJECT(statusbox->connecting_pixbufs[i]));
 	}
 
 	for (i = 0; i < G_N_ELEMENTS(statusbox->typing_pixbufs); i++) {
 		if (statusbox->typing_pixbufs[i] != NULL)
-			gdk_pixbuf_unref(statusbox->typing_pixbufs[i]);
+			g_object_unref(G_OBJECT(statusbox->typing_pixbufs[i]));
 	}
 
 	g_object_unref(G_OBJECT(statusbox->store));
@@ -598,32 +647,6 @@ pidgin_status_box_class_init (PidginStatusBoxClass *klass)
 	                               );
 }
 
-static GdkPixbuf *
-pidgin_status_box_get_pixbuf(PidginStatusBox *status_box, PurpleStatusPrimitive prim)
-{
-	GdkPixbuf *pixbuf;
-	GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
-	if (prim == PURPLE_STATUS_UNAVAILABLE)
-		pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_BUSY,
-						 icon_size, "PidginStatusBox");
-	else if (prim == PURPLE_STATUS_AWAY)
-		pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AWAY,
-						 icon_size, "PidginStatusBox");
-	else if (prim == PURPLE_STATUS_EXTENDED_AWAY)
-		pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_XA,
-						 icon_size, "PidginStatusBox");
-	else if (prim == PURPLE_STATUS_INVISIBLE)
-		pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_INVISIBLE,
-						 icon_size, "PidginStatusBox");
-	else if (prim == PURPLE_STATUS_OFFLINE)
-		pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_OFFLINE,
-						 icon_size, "PidginStatusBox");
-	else
-		pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AVAILABLE,
-						 icon_size, "PidginStatusBox");
-	return pixbuf;
-}
-
 /**
  * This updates the text displayed on the status box so that it shows
  * the current status.  This is the only function in this file that
@@ -637,7 +660,8 @@ pidgin_status_box_refresh(PidginStatusBox *status_box)
 	char aa_color[8];
 	PurpleSavedStatus *saved_status;
 	char *primary, *secondary, *text;
-	GdkPixbuf *pixbuf, *emblem = NULL;
+	const char *stock = NULL;
+	GdkPixbuf *emblem = NULL;
 	GtkTreePath *path;
 	gboolean account_status = FALSE;
 	PurpleAccount *acct = (status_box->account) ? status_box->account : status_box->token_status_account;
@@ -713,21 +737,21 @@ pidgin_status_box_refresh(PidginStatusBox *status_box)
 
 	/* Pixbuf */
 	if (status_box->typing != 0)
-		pixbuf = status_box->typing_pixbufs[status_box->typing_index];
+		stock = typing_stock_ids[status_box->typing_index];
 	else if (status_box->connecting)
-		pixbuf = status_box->connecting_pixbufs[status_box->connecting_index];
+		stock = connecting_stock_ids[status_box->connecting_index];
 	else
 	  {
 	    PurpleStatusType *status_type;
 	    PurpleStatusPrimitive prim;
 	    if (account_status) {
-	    	status_type = purple_status_get_type(purple_account_get_active_status(acct));
+			status_type = purple_status_get_type(purple_account_get_active_status(acct));
 	        prim = purple_status_type_get_primitive(status_type);
 	    } else {
-	    	prim = purple_savedstatus_get_type(saved_status);
+			prim = purple_savedstatus_get_type(saved_status);
 	    }
 
-		pixbuf = pidgin_status_box_get_pixbuf(status_box, prim);
+		stock = pidgin_stock_id_from_status_primitive(prim);
 	}
 
 	if (status_box->account != NULL) {
@@ -749,13 +773,11 @@ pidgin_status_box_refresh(PidginStatusBox *status_box)
 	 * really need to be a list store?)
 	 */
 	gtk_list_store_set(status_box->store, &(status_box->iter),
-			   ICON_COLUMN, pixbuf,
+			   ICON_STOCK_COLUMN, (gpointer)stock,
 			   TEXT_COLUMN, text,
 			   EMBLEM_COLUMN, emblem,
 			   EMBLEM_VISIBLE_COLUMN, (emblem != NULL),
 			   -1);
-	if ((status_box->typing == 0) && (!status_box->connecting))
-		g_object_unref(pixbuf);
 	g_free(text);
 	if (emblem)
 		g_object_unref(emblem);
@@ -923,7 +945,6 @@ static void
 add_popular_statuses(PidginStatusBox *statusbox)
 {
 	GList *list, *cur;
-	GdkPixbuf *pixbuf;
 
 	list = purple_savedstatuses_get_popular(6);
 	if (list == NULL)
@@ -943,9 +964,6 @@ add_popular_statuses(PidginStatusBox *statusbox)
 		/* Get an appropriate status icon */
 		prim = purple_savedstatus_get_type(saved);
 
-
-		pixbuf = pidgin_status_box_get_pixbuf(statusbox, prim);
-
 		if (purple_savedstatus_is_transient(saved))
 		{
 			/*
@@ -966,11 +984,9 @@ add_popular_statuses(PidginStatusBox *statusbox)
 		}
 
 		pidgin_status_box_add(statusbox, type,
-				pixbuf, purple_savedstatus_get_title(saved), stripped,
+				NULL, purple_savedstatus_get_title(saved), stripped,
 				GINT_TO_POINTER(purple_savedstatus_get_creation_time(saved)));
 		g_free(stripped);
-		if (pixbuf != NULL)
-			g_object_unref(G_OBJECT(pixbuf));
 	}
 
 	g_list_free(list);
@@ -1031,7 +1047,6 @@ add_account_statuses(PidginStatusBox *status_box, PurpleAccount *account)
 {
 	/* Per-account */
 	GList *l;
-	GdkPixbuf *pixbuf;
 
 	for (l = purple_account_get_status_types(account); l != NULL; l = l->next)
 	{
@@ -1044,22 +1059,17 @@ add_account_statuses(PidginStatusBox *status_box, PurpleAccount *account)
 
 		prim = purple_status_type_get_primitive(status_type);
 
-		pixbuf = pidgin_status_box_get_pixbuf(status_box, prim);
-
 		pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box),
-					PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf,
+					PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, NULL,
 					purple_status_type_get_name(status_type),
 					NULL,
 					GINT_TO_POINTER(purple_status_type_get_primitive(status_type)));
-		if (pixbuf != NULL)
-			g_object_unref(pixbuf);
 	}
 }
 
 static void
 pidgin_status_box_regenerate(PidginStatusBox *status_box)
 {
-	GdkPixbuf *pixbuf, *pixbuf2, *pixbuf3, *pixbuf4, *pixbuf5;
 	GtkIconSize icon_size;
 
 	icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
@@ -1074,8 +1084,6 @@ pidgin_status_box_regenerate(PidginStatusBox *status_box)
 
 	if (status_box->account == NULL)
 	{
-		pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_AVAILABLE,
-		                                 icon_size, "PidginStatusBox");
 		/* Do all the currently enabled accounts have the same statuses?
 		 * If so, display them instead of our global list.
 		 */
@@ -1083,25 +1091,11 @@ pidgin_status_box_regenerate(PidginStatusBox *status_box)
 			add_account_statuses(status_box, status_box->token_status_account);
 		} else {
 			/* Global */
-			pixbuf2 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_AWAY,
-			                                  icon_size, "PidginStatusBox");
-			pixbuf3 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_OFFLINE,
-			                                  icon_size, "PidginStatusBox");
-			pixbuf4 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_INVISIBLE,
-			                                  icon_size, "PidginStatusBox");
-			pixbuf5 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_BUSY,
-							  icon_size, "PidginStatusBox");
-
-			pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, _("Available"), NULL, GINT_TO_POINTER(PURPLE_STATUS_AVAILABLE));
-			pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf2, _("Away"), NULL, GINT_TO_POINTER(PURPLE_STATUS_AWAY));
-			pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf5, _("Do not disturb"), NULL, GINT_TO_POINTER(PURPLE_STATUS_UNAVAILABLE));
-			pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf4, _("Invisible"), NULL, GINT_TO_POINTER(PURPLE_STATUS_INVISIBLE));
-			pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf3, _("Offline"), NULL, GINT_TO_POINTER(PURPLE_STATUS_OFFLINE));
-
-			if (pixbuf2)	g_object_unref(G_OBJECT(pixbuf2));
-			if (pixbuf3)	g_object_unref(G_OBJECT(pixbuf3));
-			if (pixbuf4)	g_object_unref(G_OBJECT(pixbuf4));
-			if (pixbuf5)	g_object_unref(G_OBJECT(pixbuf5));
+			pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, NULL, _("Available"), NULL, GINT_TO_POINTER(PURPLE_STATUS_AVAILABLE));
+			pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, NULL, _("Away"), NULL, GINT_TO_POINTER(PURPLE_STATUS_AWAY));
+			pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, NULL, _("Do not disturb"), NULL, GINT_TO_POINTER(PURPLE_STATUS_UNAVAILABLE));
+			pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, NULL, _("Invisible"), NULL, GINT_TO_POINTER(PURPLE_STATUS_INVISIBLE));
+			pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, NULL, _("Offline"), NULL, GINT_TO_POINTER(PURPLE_STATUS_OFFLINE));
 		}
 
 		add_popular_statuses(status_box);
@@ -1109,7 +1103,6 @@ pidgin_status_box_regenerate(PidginStatusBox *status_box)
 		pidgin_status_box_add_separator(PIDGIN_STATUS_BOX(status_box));
 		pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_CUSTOM, NULL, _("New status..."), NULL, NULL);
 		pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_SAVED, NULL, _("Saved statuses..."), NULL, NULL);
-		if (pixbuf)	g_object_unref(G_OBJECT(pixbuf));
 
 		status_menu_refresh_iter(status_box);
 		pidgin_status_box_refresh(status_box);
@@ -1155,8 +1148,10 @@ static gboolean imhtml_remove_focus(GtkWidget *w, GdkEventKey *event, PidginStat
 	/* Reset the status if Escape was pressed */
 	if (event->keyval == GDK_Escape)
 	{
-		g_source_remove(status_box->typing);
+		purple_timeout_remove(status_box->typing);
 		status_box->typing = 0;
+		gtk_imhtml_set_populate_primary_clipboard(
+			GTK_IMHTML(status_box->imhtml), TRUE);
 		if (status_box->account != NULL)
 			update_to_reflect_account_status(status_box, status_box->account,
 							purple_account_get_active_status(status_box->account));
@@ -1168,8 +1163,8 @@ static gboolean imhtml_remove_focus(GtkWidget *w, GdkEventKey *event, PidginStat
 	}
 
 	pidgin_status_box_pulse_typing(status_box);
-	g_source_remove(status_box->typing);
-	status_box->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box);
+	purple_timeout_remove(status_box->typing);
+	status_box->typing = purple_timeout_add_seconds(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box);
 
 	return FALSE;
 }
@@ -1201,45 +1196,26 @@ cache_pixbufs(PidginStatusBox *status_box)
 
 	for (i = 0; i < G_N_ELEMENTS(status_box->connecting_pixbufs); i++) {
 		if (status_box->connecting_pixbufs[i] != NULL)
-			gdk_pixbuf_unref(status_box->connecting_pixbufs[i]);
+			g_object_unref(G_OBJECT(status_box->connecting_pixbufs[i]));
+		if (connecting_stock_ids[i])
+			status_box->connecting_pixbufs[i] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox),
+					connecting_stock_ids[i], icon_size, "PidginStatusBox");
+		else
+			status_box->connecting_pixbufs[i] = NULL;
 	}
-
 	status_box->connecting_index = 0;
 
-#define CACHE_ANIMATION_CONNECT(index) \
-	status_box->connecting_pixbufs[index] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox),\
-			PIDGIN_STOCK_ANIMATION_CONNECT ## index, icon_size, "PidginStatusBox")
-
-	CACHE_ANIMATION_CONNECT(0);
-	CACHE_ANIMATION_CONNECT(1);
-	CACHE_ANIMATION_CONNECT(2);
-	CACHE_ANIMATION_CONNECT(3);
-	CACHE_ANIMATION_CONNECT(4);
-	CACHE_ANIMATION_CONNECT(5);
-	CACHE_ANIMATION_CONNECT(6);
-	CACHE_ANIMATION_CONNECT(7);
-	CACHE_ANIMATION_CONNECT(8);
-
-#undef CACHE_ANIMATION_CONNECT
 
 	for (i = 0; i < G_N_ELEMENTS(status_box->typing_pixbufs); i++) {
 		if (status_box->typing_pixbufs[i] != NULL)
-			gdk_pixbuf_unref(status_box->typing_pixbufs[i]);
+			g_object_unref(G_OBJECT(status_box->typing_pixbufs[i]));
+		if (typing_stock_ids[i])
+			status_box->typing_pixbufs[i] =  gtk_widget_render_icon (GTK_WIDGET(status_box->vbox),
+					typing_stock_ids[i], icon_size, "PidginStatusBox");
+		else
+			status_box->typing_pixbufs[i] = NULL;
 	}
-
 	status_box->typing_index = 0;
-
-#define CACHE_ANIMATION_TYPING(index) \
-	status_box->typing_pixbufs[index] =  gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), \
-			PIDGIN_STOCK_ANIMATION_TYPING ## index, icon_size, "PidginStatusBox")
-
-	CACHE_ANIMATION_TYPING(0);
-	CACHE_ANIMATION_TYPING(1);
-	CACHE_ANIMATION_TYPING(2);
-	CACHE_ANIMATION_TYPING(3);
-	CACHE_ANIMATION_TYPING(4);
-
-#undef CACHE_ANIMATION_TYPING
 }
 
 static void account_enabled_cb(PurpleAccount *acct, PidginStatusBox *status_box)
@@ -1496,6 +1472,13 @@ buddy_icon_set_cb(const char *filename, PidginStatusBox *box)
 				if (filename)
 					data = pidgin_convert_buddy_icon(plug, filename, &len);
 				img = purple_buddy_icons_set_account_icon(box->account, data, len);
+				if (img)
+					/*
+					 * set_account_icon doesn't give us a reference, but we
+					 * unref one below (for the other code path)
+					 */
+					purple_imgstore_ref(img);
+
 				purple_account_set_buddy_icon_path(box->account, filename);
 
 				purple_account_set_bool(box->account, "use-global-buddyicon", (filename != NULL));
@@ -1515,7 +1498,7 @@ buddy_icon_set_cb(const char *filename, PidginStatusBox *box)
 					size_t len = 0;
 					if (filename)
 						data = pidgin_convert_buddy_icon(plug, filename, &len);
-					img = purple_buddy_icons_set_account_icon(account, data, len);
+					purple_buddy_icons_set_account_icon(account, data, len);
 					purple_account_set_buddy_icon_path(account, filename);
 				}
 			}
@@ -1523,17 +1506,12 @@ buddy_icon_set_cb(const char *filename, PidginStatusBox *box)
 
 		/* Even if no accounts were processed, load the icon that was set. */
 		if (filename != NULL)
-		{
-			gchar *contents;
-			gsize size;
-			if (g_file_get_contents(filename, &contents, &size, NULL))
-			{
-				img = purple_imgstore_add(contents, size, filename);
-			}
-		}
+			img = purple_imgstore_new_from_file(filename);
 	}
 
 	pidgin_status_box_set_buddy_icon(box, img);
+	if (img)
+		purple_imgstore_unref(img);
 }
 
 static void
@@ -1550,6 +1528,17 @@ remove_buddy_icon_cb(GtkWidget *w, PidginStatusBox *box)
 }
 
 static void
+choose_buddy_icon_cb(GtkWidget *w, PidginStatusBox *box)
+{
+	if (box->buddy_icon_sel) {
+		gtk_window_present(GTK_WINDOW(box->buddy_icon_sel));
+	} else {
+		box->buddy_icon_sel = pidgin_buddy_icon_chooser_new(GTK_WINDOW(gtk_widget_get_toplevel(w)), icon_choose_cb, box);
+		gtk_widget_show_all(box->buddy_icon_sel);
+	}
+}
+
+static void
 icon_choose_cb(const char *filename, gpointer data)
 {
 	PidginStatusBox *box = data;
@@ -1777,9 +1766,9 @@ pidgin_status_box_init (PidginStatusBox *status_box)
 	status_box->vsep = gtk_vseparator_new();
 	status_box->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
 
-	status_box->store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING,
+	status_box->store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING,
 					       G_TYPE_STRING, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_BOOLEAN);
-	status_box->dropdown_store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING,
+	status_box->dropdown_store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_STRING,
 							G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
 	gtk_cell_view_set_model(GTK_CELL_VIEW(status_box->cell_view), GTK_TREE_MODEL(status_box->store));
@@ -1854,7 +1843,7 @@ pidgin_status_box_init (PidginStatusBox *status_box)
 	gtk_tree_view_column_pack_start(status_box->column, icon_rend, FALSE);
 	gtk_tree_view_column_pack_start(status_box->column, text_rend, TRUE);
 	gtk_tree_view_column_pack_start(status_box->column, emblem_rend, FALSE);
-	gtk_tree_view_column_set_attributes(status_box->column, icon_rend, "pixbuf", ICON_COLUMN, NULL);
+	gtk_tree_view_column_set_attributes(status_box->column, icon_rend, "stock-id", ICON_STOCK_COLUMN, NULL);
 	gtk_tree_view_column_set_attributes(status_box->column, text_rend, "markup", TEXT_COLUMN, NULL);
 	gtk_tree_view_column_set_attributes(status_box->column, emblem_rend, "stock-id", EMBLEM_COLUMN, "visible", EMBLEM_VISIBLE_COLUMN, NULL);
 	gtk_container_add(GTK_CONTAINER(status_box->scrolled_window), status_box->tree_view);
@@ -1873,7 +1862,7 @@ pidgin_status_box_init (PidginStatusBox *status_box)
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(status_box->cell_view), status_box->icon_rend, FALSE);
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(status_box->cell_view), status_box->text_rend, TRUE);
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(status_box->cell_view), emblem_rend, FALSE);
-	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), status_box->icon_rend, "pixbuf", ICON_COLUMN, NULL);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), status_box->icon_rend, "stock-id", ICON_STOCK_COLUMN, NULL);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), status_box->text_rend, "markup", TEXT_COLUMN, NULL);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), emblem_rend, "pixbuf", EMBLEM_COLUMN, "visible", EMBLEM_VISIBLE_COLUMN, NULL);
 #if GTK_CHECK_VERSION(2, 6, 0)
@@ -1903,7 +1892,7 @@ pidgin_status_box_init (PidginStatusBox *status_box)
 	g_signal_connect(G_OBJECT(status_box->imhtml), "key_press_event",
 			 G_CALLBACK(imhtml_remove_focus), status_box);
 	g_signal_connect_swapped(G_OBJECT(status_box->imhtml), "message_send", G_CALLBACK(remove_typing_cb), status_box);
-	gtk_imhtml_set_editable(GTK_IMHTML(status_box->imhtml), TRUE);
+
 #ifdef USE_GTKSPELL
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck"))
 		pidgin_setup_gtkspell(GTK_TEXT_VIEW(status_box->imhtml));
@@ -2056,17 +2045,11 @@ pidgin_status_box_size_allocate(GtkWidget *widget,
 
 	if (status_box->icon_box)
 	{
-		GtkTextDirection dir = gtk_widget_get_direction(widget);
 		parent_alc.width -= (parent_alc.height + border_width);
 		icon_alc = parent_alc;
 		icon_alc.height = MAX(1, icon_alc.height) - 2;
 		icon_alc.width = icon_alc.height;
-		if (dir == GTK_TEXT_DIR_RTL) {
-			icon_alc.x = parent_alc.x;
-			parent_alc.x += icon_alc.width + border_width;
-		} else {
-			icon_alc.x = allocation->width - (icon_alc.width + border_width + 1);
-		}
+		icon_alc.x = allocation->width - (icon_alc.width + border_width + 1);
 		icon_alc.y += 1;
 
 		if (status_box->icon_size != icon_alc.height)
@@ -2132,7 +2115,8 @@ pidgin_status_box_new_with_account(PurpleAccount *account)
  *
  * @param status_box The status box itself.
  * @param type       A PidginStatusBoxItemType.
- * @param pixbuf     The icon to associate with this row in the menu.
+ * @param pixbuf     The icon to associate with this row in the menu. The
+ *                   function will try to decide a pixbuf if none is given.
  * @param title      The title of this item.  For the primitive entries,
  *                   this is something like "Available" or "Away."  For
  *                   the saved statuses, this is something like
@@ -2148,10 +2132,12 @@ pidgin_status_box_new_with_account(PurpleAccount *account)
  *                   creation timestamp.
  */
 void
-pidgin_status_box_add(PidginStatusBox *status_box, PidginStatusBoxItemType type, GdkPixbuf *pixbuf, const char *title, const char *desc, gpointer data)
+pidgin_status_box_add(PidginStatusBox *status_box, PidginStatusBoxItemType type, GdkPixbuf *pixbuf,
+		const char *title, const char *desc, gpointer data)
 {
 	GtkTreeIter iter;
 	char *text;
+	const char *stock = NULL;
 
 	if (desc == NULL)
 	{
@@ -2178,10 +2164,25 @@ pidgin_status_box_add(PidginStatusBox *status_box, PidginStatusBoxItemType type,
 		g_free(escaped_desc);
 	}
 
+	if (!pixbuf) {
+		PurpleStatusPrimitive prim = PURPLE_STATUS_UNSET;
+		if (type == PIDGIN_STATUS_BOX_TYPE_PRIMITIVE) {
+			prim = GPOINTER_TO_INT(data);
+		} else if (type == PIDGIN_STATUS_BOX_TYPE_SAVED_POPULAR ||
+				type == PIDGIN_STATUS_BOX_TYPE_POPULAR) {
+			PurpleSavedStatus *saved = purple_savedstatus_find_by_creation_time(GPOINTER_TO_INT(data));
+			if (saved) {
+				prim = purple_savedstatus_get_type(saved);
+			}
+		}
+
+		stock = pidgin_stock_id_from_status_primitive(prim);
+	}
+
 	gtk_list_store_append(status_box->dropdown_store, &iter);
 	gtk_list_store_set(status_box->dropdown_store, &iter,
 			TYPE_COLUMN, type,
-			ICON_COLUMN, pixbuf,
+			ICON_STOCK_COLUMN, stock,
 			TEXT_COLUMN, text,
 			TITLE_COLUMN, title,
 			DESC_COLUMN, desc,
@@ -2257,14 +2258,22 @@ pidgin_status_box_redisplay_buddy_icon(PidginStatusBox *status_box)
 
 	if (status_box->buddy_icon_img != NULL)
 	{
+		GdkPixbuf *buf, *scale;
+		int scale_width, scale_height;
 		GdkPixbufLoader *loader = gdk_pixbuf_loader_new();
 		g_signal_connect(G_OBJECT(loader), "size-prepared", G_CALLBACK(pixbuf_size_prepared_cb), NULL);
 		gdk_pixbuf_loader_write(loader, purple_imgstore_get_data(status_box->buddy_icon_img),
 		                        purple_imgstore_get_size(status_box->buddy_icon_img), NULL);
 		gdk_pixbuf_loader_close(loader, NULL);
-		status_box->buddy_icon = gdk_pixbuf_loader_get_pixbuf(loader);
-		if (status_box->buddy_icon)
-			g_object_ref(status_box->buddy_icon);
+		buf = gdk_pixbuf_loader_get_pixbuf(loader);
+		scale_width = gdk_pixbuf_get_width(buf);
+		scale_height = gdk_pixbuf_get_height(buf);
+		scale = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, scale_width, scale_height);
+		gdk_pixbuf_fill(scale, 0x00000000);
+		gdk_pixbuf_copy_area(buf, 0, 0, scale_width, scale_height, scale, 0, 0);
+		if (pidgin_gdk_pixbuf_is_opaque(scale))
+			pidgin_gdk_pixbuf_make_round(scale);
+		status_box->buddy_icon = scale;
 		g_object_unref(loader);
 	}
 
@@ -2302,20 +2311,16 @@ pidgin_status_box_pulse_connecting(PidginStatusBox *status_box)
 {
 	if (!status_box)
 		return;
-	if (status_box->connecting_index == 8)
+	if (!connecting_stock_ids[++status_box->connecting_index])
 		status_box->connecting_index = 0;
-	else
-		status_box->connecting_index++;
 	pidgin_status_box_refresh(status_box);
 }
 
 static void
 pidgin_status_box_pulse_typing(PidginStatusBox *status_box)
 {
-	if (status_box->typing_index == 4)
+	if (!typing_stock_ids[++status_box->typing_index])
 		status_box->typing_index = 0;
-	else
-		status_box->typing_index++;
 	pidgin_status_box_refresh(status_box);
 }
 
@@ -2596,7 +2601,10 @@ static void remove_typing_cb(PidginStatusBox *status_box)
 		return;
 	}
 
-	g_source_remove(status_box->typing);
+	gtk_imhtml_set_populate_primary_clipboard(
+		GTK_IMHTML(status_box->imhtml), TRUE);
+
+	purple_timeout_remove(status_box->typing);
 	status_box->typing = 0;
 
 	activate_currently_selected_status(status_box);
@@ -2624,7 +2632,7 @@ static void pidgin_status_box_changed(PidginStatusBox *status_box)
 			   DATA_COLUMN, &data,
 			   -1);
 	if (status_box->typing != 0)
-		g_source_remove(status_box->typing);
+		purple_timeout_remove(status_box->typing);
 	status_box->typing = 0;
 
 	if (GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(status_box)))
@@ -2692,9 +2700,13 @@ static void pidgin_status_box_changed(PidginStatusBox *status_box)
 			GtkTextIter start, end;
 			GtkTextBuffer *buffer;
 			gtk_widget_show_all(status_box->vbox);
-			status_box->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box);
+			status_box->typing = purple_timeout_add_seconds(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box);
 			gtk_widget_grab_focus(status_box->imhtml);
 			buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(status_box->imhtml));
+
+			gtk_imhtml_set_populate_primary_clipboard(
+				GTK_IMHTML(status_box->imhtml), FALSE);
+
 			gtk_text_buffer_get_bounds(buffer, &start, &end);
 			gtk_text_buffer_move_mark(buffer, gtk_text_buffer_get_mark(buffer, "insert"), &end);
 			gtk_text_buffer_move_mark(buffer, gtk_text_buffer_get_mark(buffer, "selection_bound"), &start);
@@ -2741,9 +2753,9 @@ static void imhtml_changed_cb(GtkTextBuffer *buffer, void *data)
 	{
 		if (status_box->typing != 0) {
 			pidgin_status_box_pulse_typing(status_box);
-			g_source_remove(status_box->typing);
+			purple_timeout_remove(status_box->typing);
 		}
-		status_box->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box);
+		status_box->typing = purple_timeout_add_seconds(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box);
 	}
 	pidgin_status_box_refresh(status_box);
 }
diff --git a/pidgin/gtkstatusbox.h b/pidgin/gtkstatusbox.h
index bd116b72b1..37b536788f 100644
--- a/pidgin/gtkstatusbox.h
+++ b/pidgin/gtkstatusbox.h
@@ -34,8 +34,6 @@
 #include "imgstore.h"
 #include "savedstatuses.h"
 #include "status.h"
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
 
 G_BEGIN_DECLS
 
diff --git a/pidgin/gtkthemes.c b/pidgin/gtkthemes.c
index c194a70ecc..afdfa07abe 100644
--- a/pidgin/gtkthemes.c
+++ b/pidgin/gtkthemes.c
@@ -183,7 +183,7 @@ pidgin_themes_destroy_smiley_theme_smileys(struct smiley_theme *theme)
 			}
 			g_free(uio->smile);
 			g_free(uio);
-			wer->smileys = g_slist_remove(wer->smileys, uio);
+			wer->smileys = g_slist_delete_link(wer->smileys, wer->smileys);
 		}
 		theme->list = wer->next;
 		g_free(wer->sml);
@@ -229,7 +229,6 @@ void pidgin_themes_load_smiley_theme(const char *file, gboolean load)
 	struct smiley_list *list = NULL;
 	GSList *lst = smiley_themes;
 	char *dirname;
-	gboolean new_theme = FALSE;
 
 	if (!f)
 		return;
@@ -243,16 +242,18 @@ void pidgin_themes_load_smiley_theme(const char *file, gboolean load)
 		lst = lst->next;
 	}
 
-	if (!theme) {
-		new_theme = TRUE;
-		theme = g_new0(struct smiley_theme, 1);
-		theme->path = g_strdup(file);
-	} else if (theme == current_smiley_theme) {
+	if (theme != NULL && theme == current_smiley_theme) {
 		/* Don't reload the theme if it is already loaded */
 		fclose(f);
 		return;
 	}
 
+	if (theme == NULL) {
+		theme = g_new0(struct smiley_theme, 1);
+		theme->path = g_strdup(file);
+		smiley_themes = g_slist_prepend(smiley_themes, theme);
+	}
+
 	dirname = g_path_get_dirname(file);
 
 	while (!feof(f)) {
@@ -341,14 +342,11 @@ void pidgin_themes_load_smiley_theme(const char *file, gboolean load)
 	if (!theme->name || !theme->desc || !theme->author) {
 		purple_debug_error("gtkthemes", "Invalid file format, not loading smiley theme from '%s'\n", file);
 
+		smiley_themes = g_slist_remove(smiley_themes, theme);
 		pidgin_themes_destroy_smiley_theme(theme);
 		return;
 	}
 
-	if (new_theme) {
-		smiley_themes = g_slist_prepend(smiley_themes, theme);
-	}
-
 	if (load) {
 		GList *cnv;
 
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index 77ff10fa18..55f106aa52 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -54,6 +54,7 @@
 #include "prpl.h"
 #include "request.h"
 #include "signals.h"
+#include "sound.h"
 #include "util.h"
 
 #include "gtkaccount.h"
@@ -358,7 +359,7 @@ GtkWidget *pidgin_new_item(GtkWidget *menu, const char *str)
 }
 
 GtkWidget *pidgin_new_check_item(GtkWidget *menu, const char *str,
-		GtkSignalFunc sf, gpointer data, gboolean checked)
+		GCallback cb, gpointer data, gboolean checked)
 {
 	GtkWidget *menuitem;
 	menuitem = gtk_check_menu_item_new_with_mnemonic(str);
@@ -368,8 +369,8 @@ GtkWidget *pidgin_new_check_item(GtkWidget *menu, const char *str,
 
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), checked);
 
-	if (sf)
-		g_signal_connect(G_OBJECT(menuitem), "activate", sf, data);
+	if (cb)
+		g_signal_connect(G_OBJECT(menuitem), "activate", cb, data);
 
 	gtk_widget_show_all(menuitem);
 
@@ -439,7 +440,7 @@ pidgin_pixbuf_button_from_stock(const char *text, const char *icon,
 }
 
 
-GtkWidget *pidgin_new_item_from_stock(GtkWidget *menu, const char *str, const char *icon, GtkSignalFunc sf, gpointer data, guint accel_key, guint accel_mods, char *mod)
+GtkWidget *pidgin_new_item_from_stock(GtkWidget *menu, const char *str, const char *icon, GCallback cb, gpointer data, guint accel_key, guint accel_mods, char *mod)
 {
 	GtkWidget *menuitem;
 	/*
@@ -456,8 +457,8 @@ GtkWidget *pidgin_new_item_from_stock(GtkWidget *menu, const char *str, const ch
 	if (menu)
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-	if (sf)
-		g_signal_connect(G_OBJECT(menuitem), "activate", sf, data);
+	if (cb)
+		g_signal_connect(G_OBJECT(menuitem), "activate", cb, data);
 
 	if (icon != NULL) {
 		image = gtk_image_new_from_stock(icon, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL));
@@ -525,7 +526,7 @@ aop_option_menu_get_selected(GtkWidget *optmenu, GtkWidget **p_item)
 	GtkWidget *item = gtk_menu_get_active(GTK_MENU(menu));
 	if (p_item)
 		(*p_item) = item;
-	return g_object_get_data(G_OBJECT(item), "aop_per_item_data");
+	return item ? g_object_get_data(G_OBJECT(item), "aop_per_item_data") : NULL;
 }
 
 static void
@@ -950,7 +951,7 @@ pidgin_save_accels_cb(GtkAccelGroup *accel_group, guint arg1,
 	           "accel changed, scheduling save.\n");
 
 	if (!accels_save_timer)
-		accels_save_timer = g_timeout_add(5000, pidgin_save_accels,
+		accels_save_timer = purple_timeout_add_seconds(5, pidgin_save_accels,
 		                                  NULL);
 }
 
@@ -1464,7 +1465,7 @@ static void dnd_image_ok_callback(_DndData *data, int choice)
 					  str);
 			g_free(str);
 
-			return;
+			break;
 		}
 
 		buddy = purple_find_buddy(data->account, data->who);
@@ -1494,7 +1495,7 @@ static void dnd_image_ok_callback(_DndData *data, int choice)
 			g_error_free(err);
 			g_free(str);
 
-			return;
+			break;
 		}
 		id = purple_imgstore_add_with_id(filedata, size, data->filename);
 
@@ -1627,7 +1628,7 @@ pidgin_dnd_file_manage(GtkSelectionData *sd, PurpleAccount *account, const char
 						    _("Set as buddy icon"), DND_BUDDY_ICON,
 						    (ft ? _("Send image file") : _("Insert in message")), (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE),
 							NULL);
-			gdk_pixbuf_unref(pb);
+			g_object_unref(G_OBJECT(pb));
 			return;
 		}
 
@@ -1677,9 +1678,11 @@ pidgin_dnd_file_manage(GtkSelectionData *sd, PurpleAccount *account, const char
 				 * 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 */
-				purple_notify_error(NULL, NULL, _("Cannot send launcher"), _("You dragged a desktop launcher. "
-											   "Most likely you wanted to send whatever this launcher points to instead of this launcher"
-											   " itself."));
+				purple_notify_error(NULL, NULL, _("Cannot send launcher"),
+				                    _("You dragged a desktop launcher. Most "
+				                      "likely you wanted to send the target "
+				                      "of this launcher instead of this "
+				                      "launcher itself."));
 				break;
 			}
 			purple_desktop_item_unref(item);
@@ -1715,29 +1718,67 @@ GdkPixbuf * pidgin_create_status_icon(PurpleStatusPrimitive prim, GtkWidget *w,
 {
 	GtkIconSize icon_size = gtk_icon_size_from_name(size);
 	GdkPixbuf *pixbuf = NULL;
+	const char *stock = pidgin_stock_id_from_status_primitive(prim);
 
-	if (prim == PURPLE_STATUS_UNAVAILABLE)
-		pixbuf = gtk_widget_render_icon (w, PIDGIN_STOCK_STATUS_BUSY,
-				icon_size, "GtkWidget");
-	else if (prim == PURPLE_STATUS_AWAY)
-		pixbuf = gtk_widget_render_icon (w, PIDGIN_STOCK_STATUS_AWAY,
-				icon_size, "GtkWidget");
-	else if (prim == PURPLE_STATUS_EXTENDED_AWAY)
-		pixbuf = gtk_widget_render_icon (w, PIDGIN_STOCK_STATUS_XA,
-				icon_size, "GtkWidget");
-	else if (prim == PURPLE_STATUS_INVISIBLE)
-		pixbuf = gtk_widget_render_icon (w, PIDGIN_STOCK_STATUS_INVISIBLE,
-				icon_size, "GtkWidget");
-	else if (prim == PURPLE_STATUS_OFFLINE)
-		pixbuf = gtk_widget_render_icon (w, PIDGIN_STOCK_STATUS_OFFLINE,
-				icon_size, "GtkWidget");
-	else
-		pixbuf = gtk_widget_render_icon (w, PIDGIN_STOCK_STATUS_AVAILABLE,
-				icon_size, "GtkWidget");
+	pixbuf = gtk_widget_render_icon (w, stock ? stock : PIDGIN_STOCK_STATUS_AVAILABLE,
+			icon_size, "GtkWidget");
 	return pixbuf;
+}
 
+static const char *
+stock_id_from_status_primitive_idle(PurpleStatusPrimitive prim, gboolean idle)
+{
+	const char *stock = NULL;
+	switch (prim) {
+		case PURPLE_STATUS_UNSET:
+			stock = NULL;
+			break;
+		case PURPLE_STATUS_UNAVAILABLE:
+			stock = idle ? PIDGIN_STOCK_STATUS_BUSY_I : PIDGIN_STOCK_STATUS_BUSY;
+			break;
+		case PURPLE_STATUS_AWAY:
+			stock = idle ? PIDGIN_STOCK_STATUS_AWAY_I : PIDGIN_STOCK_STATUS_AWAY;
+			break;
+		case PURPLE_STATUS_EXTENDED_AWAY:
+			stock = idle ? PIDGIN_STOCK_STATUS_XA_I : PIDGIN_STOCK_STATUS_XA;
+			break;
+		case PURPLE_STATUS_INVISIBLE:
+			stock = PIDGIN_STOCK_STATUS_INVISIBLE;
+			break;
+		case PURPLE_STATUS_OFFLINE:
+			stock = idle ? PIDGIN_STOCK_STATUS_OFFLINE_I : PIDGIN_STOCK_STATUS_OFFLINE;
+			break;
+		default:
+			stock = idle ? PIDGIN_STOCK_STATUS_AVAILABLE_I : PIDGIN_STOCK_STATUS_AVAILABLE;
+			break;
+	}
+	return stock;
+}
+
+const char *
+pidgin_stock_id_from_status_primitive(PurpleStatusPrimitive prim)
+{
+	return stock_id_from_status_primitive_idle(prim, FALSE);
 }
 
+const char *
+pidgin_stock_id_from_presence(PurplePresence *presence)
+{
+	PurpleStatus *status;
+	PurpleStatusType *type;
+	PurpleStatusPrimitive prim;
+	gboolean idle;
+
+	g_return_val_if_fail(presence, NULL);
+
+	status = purple_presence_get_active_status(presence);
+	type = purple_status_get_type(status);
+	prim = purple_status_type_get_primitive(type);
+
+	idle = purple_presence_is_idle(presence);
+
+	return stock_id_from_status_primitive_idle(prim, idle);
+}
 
 GdkPixbuf *
 pidgin_create_prpl_icon(PurpleAccount *account, PidginPrplIconSize size)
@@ -2451,11 +2492,6 @@ GtkWidget *pidgin_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(cons
 	dialog->callback = callback;
 	dialog->data = data;
 
-	if (dialog->icon_filesel != NULL) {
-		gtk_window_present(GTK_WINDOW(dialog->icon_filesel));
-		return NULL;
-	}
-
 	current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder");
 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 
@@ -2948,7 +2984,7 @@ void pidgin_set_urgent(GtkWindow *window, gboolean urgent)
 #endif
 }
 
-GSList *minidialogs = NULL;
+static GSList *minidialogs = NULL;
 
 static void *
 pidgin_utils_get_handle(void)
@@ -3543,6 +3579,219 @@ copy_email_address(GtkIMHtml *imhtml, GtkIMHtmlLink *link, GtkWidget *menu)
 	return TRUE;
 }
 
+static void
+file_open_uri(GtkIMHtml *imhtml, const char *uri)
+{
+	/* Copied from gtkft.c:open_button_cb */
+#ifdef _WIN32
+	/* If using Win32... */
+	int code;
+	if (G_WIN32_HAVE_WIDECHAR_API()) {
+		wchar_t *wc_filename = g_utf8_to_utf16(
+				uri, -1, NULL, NULL, NULL);
+
+		code = (int)ShellExecuteW(NULL, NULL, wc_filename, NULL, NULL,
+				SW_SHOW);
+
+		g_free(wc_filename);
+	} else {
+		char *l_filename = g_locale_from_utf8(
+				uri, -1, NULL, NULL, NULL);
+
+		code = (int)ShellExecuteA(NULL, NULL, l_filename, NULL, NULL,
+				SW_SHOW);
+
+		g_free(l_filename);
+	}
+
+	if (code == SE_ERR_ASSOCINCOMPLETE || code == SE_ERR_NOASSOC)
+	{
+		purple_notify_error(imhtml, NULL,
+				_("There is no application configured to open this type of file."), NULL);
+	}
+	else if (code < 32)
+	{
+		purple_notify_error(imhtml, NULL,
+				_("An error occurred while opening the file."), NULL);
+		purple_debug_warning("gtkutils", "filename: %s; code: %d\n", uri, code);
+	}
+#else
+	char *command = NULL;
+	char *tmp = NULL;
+	GError *error = NULL;
+
+	if (purple_running_gnome())
+	{
+		char *escaped = g_shell_quote(uri);
+		command = g_strdup_printf("gnome-open %s", escaped);
+		g_free(escaped);
+	}
+	else if (purple_running_kde())
+	{
+		char *escaped = g_shell_quote(uri);
+
+		if (purple_str_has_suffix(uri, ".desktop"))
+			command = g_strdup_printf("kfmclient openURL %s 'text/plain'", escaped);
+		else
+			command = g_strdup_printf("kfmclient openURL %s", escaped);
+		g_free(escaped);
+	}
+	else
+	{
+		purple_notify_uri(NULL, uri);
+		return;
+	}
+
+	if (purple_program_is_valid(command))
+	{
+		gint exit_status;
+		if (!g_spawn_command_line_sync(command, NULL, NULL, &exit_status, &error))
+		{
+			tmp = g_strdup_printf(_("Error launching %s: %s"),
+							uri, error->message);
+			purple_notify_error(imhtml, NULL, _("Unable to open file."), tmp);
+			g_free(tmp);
+			g_error_free(error);
+		}
+		if (exit_status != 0)
+		{
+			char *primary = g_strdup_printf(_("Error running %s"), command);
+			char *secondary = g_strdup_printf(_("Process returned error code %d"),
+									exit_status);
+			purple_notify_error(imhtml, NULL, primary, secondary);
+			g_free(tmp);
+		}
+	}
+#endif
+}
+
+#define FILELINKSIZE  (sizeof("file://") - 1)
+static gboolean
+file_clicked_cb(GtkIMHtml *imhtml, GtkIMHtmlLink *link)
+{
+	const char *uri = gtk_imhtml_link_get_url(link) + FILELINKSIZE;
+	file_open_uri(imhtml, uri);
+	return TRUE;
+}
+
+static gboolean
+open_containing_cb(GtkIMHtml *imhtml, const char *url)
+{
+	char *dir = g_path_get_dirname(url + FILELINKSIZE);
+	file_open_uri(imhtml, dir);
+	g_free(dir);
+	return TRUE;
+}
+
+static gboolean
+file_context_menu(GtkIMHtml *imhtml, GtkIMHtmlLink *link, GtkWidget *menu)
+{
+	GtkWidget *img, *item;
+	const char *url;
+
+	url = gtk_imhtml_link_get_url(link);
+
+	/* Open File */
+	img = gtk_image_new_from_stock(GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_MENU);
+	item = gtk_image_menu_item_new_with_mnemonic(_("_Open File"));
+	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
+	g_signal_connect_swapped(G_OBJECT(item), "activate", G_CALLBACK(gtk_imhtml_link_activate), link);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+
+	/* Open Containing Directory */
+#if GTK_CHECK_VERSION(2,6,0)
+	img = gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU);
+	item = gtk_image_menu_item_new_with_mnemonic(_("Open _Containing Directory"));
+	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
+#else
+	item = gtk_menu_item_new_with_mnemonic(_("Open _Containing Directory"));
+#endif
+	g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(open_containing_cb), (gpointer)url);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+
+	return TRUE;
+}
+
+#define AUDIOLINKSIZE  (sizeof("audio://") - 1)
+static gboolean
+audio_clicked_cb(GtkIMHtml *imhtml, GtkIMHtmlLink *link)
+{
+	const char *uri;
+	PidginConversation *conv = g_object_get_data(G_OBJECT(imhtml), "gtkconv");
+	if (!conv) /* no playback in debug window */
+		return TRUE;
+	uri = gtk_imhtml_link_get_url(link) + AUDIOLINKSIZE;
+	purple_sound_play_file(uri, NULL);
+	return TRUE;
+}
+
+static void
+savefile_write_cb(gpointer user_data, char *file)
+{
+	char *temp_file = user_data;
+	gchar *contents;
+	gsize length;
+	GError *error;
+
+	if (!g_file_get_contents(temp_file, &contents, &length, &error)) {
+		purple_debug_error("gtkutils", "Unable to read contents of %s: %s\n",
+		                   temp_file, error->message);
+		g_error_free(error);
+		return;
+	}
+
+	if (!purple_util_write_data_to_file_absolute(file, contents, length)) {
+		purple_debug_error("gtkutils", "Unable to write contents to %s\n",
+		                   file);
+	}
+}
+
+static gboolean
+save_file_cb(GtkWidget *item, const char *url)
+{
+	PidginConversation *conv = g_object_get_data(G_OBJECT(item), "gtkconv");
+	if (!conv)
+		return TRUE;
+	purple_request_file(conv->active_conv, _("Save File"), NULL, TRUE,
+	                    G_CALLBACK(savefile_write_cb), NULL,
+	                    conv->active_conv->account, NULL, conv->active_conv,
+	                    (void *)url);
+	return TRUE;
+}
+
+static gboolean
+audio_context_menu(GtkIMHtml *imhtml, GtkIMHtmlLink *link, GtkWidget *menu)
+{
+	GtkWidget *img, *item;
+	const char *url;
+	PidginConversation *conv = g_object_get_data(G_OBJECT(imhtml), "gtkconv");
+	if (!conv) /* No menu in debug window */
+		return TRUE;
+
+	url = gtk_imhtml_link_get_url(link);
+
+	/* Play Sound */
+#if GTK_CHECK_VERSION(2,6,0)
+	img = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU);
+	item = gtk_image_menu_item_new_with_mnemonic(_("_Play Sound"));
+	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
+#else
+	item = gtk_menu_item_new_with_mnemonic(_("_Play Sound"));
+#endif
+	g_signal_connect_swapped(G_OBJECT(item), "activate", G_CALLBACK(gtk_imhtml_link_activate), link);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+
+	/* Save File */
+	img = gtk_image_new_from_stock(GTK_STOCK_SAVE, GTK_ICON_SIZE_MENU);
+	item = gtk_image_menu_item_new_with_mnemonic(_("_Save File"));
+	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
+	g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(save_file_cb), (gpointer)(url+AUDIOLINKSIZE));
+	g_object_set_data(G_OBJECT(item), "gtkconv", conv);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+
+	return TRUE;
+}
+
 /* XXX: The following two functions are for demonstration purposes only! */
 static gboolean
 open_dialog(GtkIMHtml *imhtml, GtkIMHtmlLink *link)
@@ -3583,7 +3832,9 @@ register_gnome_url_handlers(void)
 	if (tmp == NULL)
 		return FALSE;
 
+	g_free(tmp);
 	tmp = NULL;
+
 	if (!g_spawn_command_line_sync("gconftool-2 --all-dirs /desktop/gnome/url-handlers",
 	                               &tmp, &err, NULL, NULL))
 	{
@@ -3647,6 +3898,9 @@ void pidgin_utils_init(void)
 	gtk_imhtml_class_register_protocol("gopher://", url_clicked_cb, link_context_menu);
 	gtk_imhtml_class_register_protocol("mailto:", url_clicked_cb, copy_email_address);
 
+	gtk_imhtml_class_register_protocol("file://", file_clicked_cb, file_context_menu);
+	gtk_imhtml_class_register_protocol("audio://", audio_clicked_cb, audio_context_menu);
+
 	/* Example custom URL handler. */
 	gtk_imhtml_class_register_protocol("open://", open_dialog, dummy);
 
@@ -3673,6 +3927,9 @@ void pidgin_utils_uninit(void)
 		return;
 	}
 
+	gtk_imhtml_class_register_protocol("audio://", NULL, NULL);
+	gtk_imhtml_class_register_protocol("file://", NULL, NULL);
+
 	gtk_imhtml_class_register_protocol("http://", NULL, NULL);
 	gtk_imhtml_class_register_protocol("https://", NULL, NULL);
 	gtk_imhtml_class_register_protocol("ftp://", NULL, NULL);
diff --git a/pidgin/gtkutils.h b/pidgin/gtkutils.h
index fb03cec1d0..305512ede9 100644
--- a/pidgin/gtkutils.h
+++ b/pidgin/gtkutils.h
@@ -233,14 +233,14 @@ GtkWidget *pidgin_new_item(GtkWidget *menu, const char *str);
  *
  * @param menu     The menu to which to append the check menu item.
  * @param str      The title to use for the newly created menu item.
- * @param sf       A function to call when the menu item is activated.
+ * @param cb       A function to call when the menu item is activated.
  * @param data     Data to pass to the signal function.
  * @param checked  The initial state of the check item
  *
  * @return The newly created menu item.
  */
 GtkWidget *pidgin_new_check_item(GtkWidget *menu, const char *str,
-		GtkSignalFunc sf, gpointer data, gboolean checked);
+		GCallback cb, gpointer data, gboolean checked);
 
 /**
  * Creates a menu item.
@@ -249,7 +249,7 @@ GtkWidget *pidgin_new_check_item(GtkWidget *menu, const char *str,
  * @param str        The title for the menu item.
  * @param icon       An icon to place to the left of the menu item,
  *                   or @c NULL for no icon.
- * @param sf         A function to call when the menu item is activated.
+ * @param cb         A function to call when the menu item is activated.
  * @param data       Data to pass to the signal function.
  * @param accel_key  Something.
  * @param accel_mods Something.
@@ -258,7 +258,7 @@ GtkWidget *pidgin_new_check_item(GtkWidget *menu, const char *str,
  * @return The newly created menu item.
  */
 GtkWidget *pidgin_new_item_from_stock(GtkWidget *menu, const char *str,
-									const char *icon, GtkSignalFunc sf,
+									const char *icon, GCallback cb,
 									gpointer data, guint accel_key,
 									guint accel_mods, char *mod);
 
@@ -569,6 +569,27 @@ GdkPixbuf *pidgin_create_prpl_icon(PurpleAccount *account, PidginPrplIconSize si
  */
 GdkPixbuf * pidgin_create_status_icon(PurpleStatusPrimitive primitive, GtkWidget *w, const char *size);
 
+/**
+ * Returns an appropriate stock-id for a status primitive.
+ *
+ * @param prim   The status primitive
+ *
+ * @return The stock-id
+ *
+ * @since 2.6.0
+ */
+const char *pidgin_stock_id_from_status_primitive(PurpleStatusPrimitive prim);
+
+/**
+ * Returns an appropriate stock-id for a PurplePresence.
+ *
+ * @param presence   The presence.
+ *
+ * @return The stock-id
+ *
+ * @since 2.6.0
+ */
+const char *pidgin_stock_id_from_presence(PurplePresence *presence);
 
 /**
  * Append a PurpleMenuAction to a menu.
diff --git a/pidgin/gtkwhiteboard.c b/pidgin/gtkwhiteboard.c
index 38c045f5de..80564c88e5 100644
--- a/pidgin/gtkwhiteboard.c
+++ b/pidgin/gtkwhiteboard.c
@@ -273,6 +273,7 @@ static void pidgin_whiteboard_create(PurpleWhiteboard *wb)
 static void pidgin_whiteboard_destroy(PurpleWhiteboard *wb)
 {
 	PidginWhiteboard *gtkwb;
+	GtkWidget *colour_dialog;
 
 	g_return_if_fail(wb != NULL);
 	gtkwb = wb->ui_data;
@@ -287,6 +288,12 @@ static void pidgin_whiteboard_destroy(PurpleWhiteboard *wb)
 		gtkwb->pixmap = NULL;
 	}
 
+	colour_dialog = g_object_get_data(G_OBJECT(gtkwb->window), "colour-dialog");
+	if (colour_dialog) {
+		gtk_widget_destroy(colour_dialog);
+		g_object_set_data(G_OBJECT(gtkwb->window), "colour-dialog", NULL);
+	}
+
 	if(gtkwb->window)
 	{
 		gtk_widget_destroy(gtkwb->window);
@@ -624,7 +631,7 @@ static void pidgin_whiteboard_draw_brush_point(PurpleWhiteboard *wb, int x, int
 							   update_rect.x, update_rect.y,
 							   update_rect.width, update_rect.height);
 
-	gdk_gc_unref(gfx_con);
+	g_object_unref(G_OBJECT(gfx_con));
 }
 
 /* Uses Bresenham's algorithm (as provided by Wikipedia) */
@@ -804,7 +811,7 @@ static void pidgin_whiteboard_button_save_press(GtkWidget *widget, gpointer data
 	{
 		gtk_widget_destroy(dialog);
 
-		purple_debug_info("gtkwhiteboard", "File not Saved... Canceled\n");
+		purple_debug_info("gtkwhiteboard", "File not Saved... Cancelled\n");
 	}
 }
 
@@ -848,9 +855,11 @@ change_color_cb(GtkColorSelection *selection, PidginWhiteboard *gtkwb)
 	purple_whiteboard_send_brush(wb, old_size, new_color);
 }
 
-static void color_selection_dialog_destroy(GtkWidget *w, GtkWidget *destroy)
+static void color_selection_dialog_destroy(GtkWidget *w, PidginWhiteboard *gtkwb)
 {
-	gtk_widget_destroy(destroy);
+	GtkWidget *dialog = g_object_get_data(G_OBJECT(gtkwb->window), "colour-dialog");
+	gtk_widget_destroy(dialog);
+	g_object_set_data(G_OBJECT(gtkwb->window), "colour-dialog", NULL);
 }
 
 static void color_select_dialog(GtkWidget *widget, PidginWhiteboard *gtkwb)
@@ -859,6 +868,7 @@ static void color_select_dialog(GtkWidget *widget, PidginWhiteboard *gtkwb)
 	GtkColorSelectionDialog *dialog;
 
 	dialog = (GtkColorSelectionDialog *)gtk_color_selection_dialog_new(_("Select color"));
+	g_object_set_data(G_OBJECT(gtkwb->window), "colour-dialog", dialog);
 
 	g_signal_connect(G_OBJECT(dialog->colorsel), "color-changed",
 					G_CALLBACK(change_color_cb), gtkwb);
@@ -867,7 +877,7 @@ static void color_select_dialog(GtkWidget *widget, PidginWhiteboard *gtkwb)
 	gtk_widget_destroy(dialog->help_button);
 
 	g_signal_connect(G_OBJECT(dialog->ok_button), "clicked",
-					G_CALLBACK(color_selection_dialog_destroy), dialog);
+					G_CALLBACK(color_selection_dialog_destroy), gtkwb);
 
 	gtk_color_selection_set_has_palette(GTK_COLOR_SELECTION(dialog->colorsel), TRUE);
 
diff --git a/pidgin/minidialog.c b/pidgin/minidialog.c
index 2b40577914..453cffccd1 100644
--- a/pidgin/minidialog.c
+++ b/pidgin/minidialog.c
@@ -26,8 +26,7 @@
 
 #include "internal.h"
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "libpurple/prefs.h"
 
diff --git a/pidgin/minidialog.h b/pidgin/minidialog.h
index 2b5e6a4d1c..386084c8e8 100644
--- a/pidgin/minidialog.h
+++ b/pidgin/minidialog.h
@@ -28,8 +28,7 @@
 #define __PIDGIN_MINI_DIALOG_H__
 
 #include <glib-object.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/pidgin/pidginstock.c b/pidgin/pidginstock.c
index 7d7f394571..ede2d539b7 100644
--- a/pidgin/pidginstock.c
+++ b/pidgin/pidginstock.c
@@ -114,115 +114,121 @@ static const GtkStockItem stock_items[] =
 };
 
 typedef struct {
-  const char *name;
-  const char *dir;
-  const char *filename;
-  gboolean microscopic;
-  gboolean extra_small;
-  gboolean small;
-  gboolean medium;
-  gboolean large;
-  gboolean huge;
-  gboolean rtl;
-  const char *translucent_name;
+	const char *name;
+ 	const char *dir;
+	const char *filename;
+	gboolean microscopic;
+	gboolean extra_small;
+	gboolean small;
+	gboolean medium;
+	gboolean large;
+	gboolean huge;
+	gboolean rtl;
+	const char *translucent_name;
 } SizedStockIcon;
 
 const SizedStockIcon sized_stock_icons [] = {
 
-	{ PIDGIN_STOCK_STATUS_IGNORED,	"emblems", "blocked.png",	FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_STATUS_FOUNDER,	"emblems", "founder.png",	FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_STATUS_OPERATOR,	"emblems", "operator.png",	FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_STATUS_HALFOP, 	"emblems", "half-operator.png",	FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_STATUS_VOICE, 	"emblems", "voice.png",		FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-
-	{ PIDGIN_STOCK_DIALOG_AUTH,	"dialogs", "auth.png",		FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
-	{ PIDGIN_STOCK_DIALOG_COOL,	"dialogs", "cool.png", 		FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
-	{ PIDGIN_STOCK_DIALOG_ERROR,	"dialogs", "error.png",		FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
-	{ PIDGIN_STOCK_DIALOG_INFO,	"dialogs", "info.png",		FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
-	{ PIDGIN_STOCK_DIALOG_MAIL,	"dialogs", "mail.png",		FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
-	{ PIDGIN_STOCK_DIALOG_QUESTION,	"dialogs", "question.png",	FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
-	{ PIDGIN_STOCK_DIALOG_WARNING,	"dialogs", "warning.png",	FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
-
-	{ PIDGIN_STOCK_ANIMATION_CONNECT0, "animations", "process-working0.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT1, "animations", "process-working1.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT2, "animations", "process-working2.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT3, "animations", "process-working3.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT4, "animations", "process-working4.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT5, "animations", "process-working5.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT6, "animations", "process-working6.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT7, "animations", "process-working7.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT8, "animations", "process-working8.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT9, "animations", "process-working9.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT10, "animations", "process-working10.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT11, "animations", "process-working11.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT12, "animations", "process-working12.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT13, "animations", "process-working13.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT14, "animations", "process-working14.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT15, "animations", "process-working15.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT16, "animations", "process-working16.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT17, "animations", "process-working17.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT18, "animations", "process-working18.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT19, "animations", "process-working19.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT20, "animations", "process-working20.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT21, "animations", "process-working21.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT22, "animations", "process-working22.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT23, "animations", "process-working23.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT24, "animations", "process-working24.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT25, "animations", "process-working25.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT26, "animations", "process-working26.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT27, "animations", "process-working27.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT28, "animations", "process-working28.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT29, "animations", "process-working29.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_CONNECT30, "animations", "process-working30.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_TYPING0,  "animations", "typing0.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_TYPING1,  "animations", "typing1.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_TYPING2,  "animations", "typing2.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_TYPING3,  "animations", "typing3.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_TYPING4,  "animations", "typing4.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_ANIMATION_TYPING5,  "animations", "typing5.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-
-	{ PIDGIN_STOCK_TOOLBAR_BGCOLOR,		"toolbar", "change-bgcolor.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_BLOCK,		"emblems", "blocked.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_FGCOLOR,		"toolbar", "change-fgcolor.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_SMILEY,		"toolbar", "emote-select.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_FONT_FACE,	"toolbar", "font-face.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER,	"toolbar", "font-size-down.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_TEXT_LARGER,	"toolbar", "font-size-up.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_INSERT,		"toolbar", "insert.png", 	 FALSE,	TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE,	"toolbar", "insert-image.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_INSERT_LINK,	"toolbar", "insert-link.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW,	"toolbar", "message-new.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_PENDING,		"toolbar", "message-new.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_PLUGINS,		"toolbar", "plugins.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_UNBLOCK,		"toolbar", "unblock.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR,	"toolbar", "select-avatar.png",	 FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_SEND_FILE,	"toolbar", "send-file.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_TRANSFER,	"toolbar", "transfer.png",	 FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  }
+	{ PIDGIN_STOCK_STATUS_IGNORED,  "emblems", "blocked.png",       FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_FOUNDER,  "emblems", "founder.png",       FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_OPERATOR, "emblems", "operator.png",      FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_HALFOP,   "emblems", "half-operator.png",	FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_VOICE,    "emblems", "voice.png",         FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+
+	{ PIDGIN_STOCK_DIALOG_AUTH,     "dialogs", "auth.png",      FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE,  FALSE, NULL },
+	{ PIDGIN_STOCK_DIALOG_COOL,     "dialogs", "cool.png",      FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  FALSE, NULL },
+	{ PIDGIN_STOCK_DIALOG_ERROR,    "dialogs", "error.png",     FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE,  FALSE, NULL },
+	{ PIDGIN_STOCK_DIALOG_INFO,     "dialogs", "info.png",      FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE,  FALSE, NULL },
+	{ PIDGIN_STOCK_DIALOG_MAIL,     "dialogs", "mail.png",      FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE,  FALSE, NULL },
+	{ PIDGIN_STOCK_DIALOG_QUESTION, "dialogs", "question.png",  FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE,  FALSE, NULL },
+	{ PIDGIN_STOCK_DIALOG_WARNING,  "dialogs", "warning.png",   FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  FALSE, NULL },
+
+	{ PIDGIN_STOCK_ANIMATION_CONNECT0,  "animations", "process-working0.png",  FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT1,  "animations", "process-working1.png",  FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT2,  "animations", "process-working2.png",  FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT3,  "animations", "process-working3.png",  FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT4,  "animations", "process-working4.png",  FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT5,  "animations", "process-working5.png",  FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT6,  "animations", "process-working6.png",  FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT7,  "animations", "process-working7.png",  FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT8,  "animations", "process-working8.png",  FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT9,  "animations", "process-working9.png",  FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT10, "animations", "process-working10.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT11, "animations", "process-working11.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT12, "animations", "process-working12.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT13, "animations", "process-working13.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT14, "animations", "process-working14.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT15, "animations", "process-working15.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT16, "animations", "process-working16.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT17, "animations", "process-working17.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT18, "animations", "process-working18.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT19, "animations", "process-working19.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT20, "animations", "process-working20.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT21, "animations", "process-working21.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT22, "animations", "process-working22.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT23, "animations", "process-working23.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT24, "animations", "process-working24.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT25, "animations", "process-working25.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT26, "animations", "process-working26.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT27, "animations", "process-working27.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT28, "animations", "process-working28.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT29, "animations", "process-working29.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT30, "animations", "process-working30.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+
+	{ PIDGIN_STOCK_ANIMATION_TYPING0,  "animations", "typing0.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_TYPING1,  "animations", "typing1.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_TYPING2,  "animations", "typing2.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_TYPING3,  "animations", "typing3.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_TYPING4,  "animations", "typing4.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_ANIMATION_TYPING5,  "animations", "typing5.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+
+	{ PIDGIN_STOCK_TOOLBAR_BGCOLOR,         "toolbar", "change-bgcolor.png", FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_BLOCK,           "emblems", "blocked.png",        FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_FGCOLOR,         "toolbar", "change-fgcolor.png", FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_SMILEY,          "toolbar", "emote-select.png",   FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_FONT_FACE,       "toolbar", "font-face.png",      FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER,    "toolbar", "font-size-down.png", FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_TEXT_LARGER,     "toolbar", "font-size-up.png",	 FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_INSERT,          "toolbar", "insert.png",         FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE,    "toolbar", "insert-image.png",	 FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_INSERT_LINK,     "toolbar", "insert-link.png",	 FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW,     "toolbar", "message-new.png",	 FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_PENDING,         "toolbar", "message-new.png",	 FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_PLUGINS,         "toolbar", "plugins.png",        FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_UNBLOCK,         "toolbar", "unblock.png",        FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR,   "toolbar", "select-avatar.png",  FALSE, FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_SEND_FILE,       "toolbar", "send-file.png",      FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_TRANSFER,        "toolbar", "transfer.png",       FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+#ifdef USE_VV
+	{ PIDGIN_STOCK_TOOLBAR_AUDIO_CALL,       "toolbar", "audio-call.png",       FALSE, TRUE,  TRUE,  TRUE,  TRUE,  FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_VIDEO_CALL,       "toolbar", "video-call.png",       FALSE, TRUE,  TRUE,  TRUE,  TRUE,  FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_AUDIO_VIDEO_CALL, "toolbar", "audio-video-call.png", FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+#endif
 };
 
 const SizedStockIcon sized_status_icons [] = {
 
-	{ PIDGIN_STOCK_STATUS_AVAILABLE, "status", "available.png", 	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AVAILABLE_I },
-	{ PIDGIN_STOCK_STATUS_AWAY, 	 "status", "away.png",		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AWAY_I },
-	{ PIDGIN_STOCK_STATUS_BUSY, 	 "status", "busy.png", 		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_BUSY_I },
-	{ PIDGIN_STOCK_STATUS_CHAT, 	 "status", "chat.png",		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
-	{ PIDGIN_STOCK_STATUS_INVISIBLE, "status", "invisible.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
-	{ PIDGIN_STOCK_STATUS_XA, 	 "status", "extended-away.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE,  PIDGIN_STOCK_STATUS_XA_I },
-	{ PIDGIN_STOCK_STATUS_LOGIN, 	 "status", "log-in.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE,  NULL },
-	{ PIDGIN_STOCK_STATUS_LOGOUT, 	 "status", "log-out.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE,  NULL },
-	{ PIDGIN_STOCK_STATUS_OFFLINE, 	 "status", "offline.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I  },
-	{ PIDGIN_STOCK_STATUS_PERSON, 	 "status", "person.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_STATUS_MESSAGE, 	 "toolbar", "message-new.png",  TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-
-	{ PIDGIN_STOCK_TRAY_AVAILABLE,	"tray", "tray-online.png",	  FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_INVISIBLE,	"tray", "tray-invisible.png",	  FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_AWAY,	"tray", "tray-away.png",	  FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_BUSY,	"tray", "tray-busy.png", 	  FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_XA,		"tray", "tray-extended-away.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_OFFLINE,	"tray", "tray-offline.png",	  FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_CONNECT,	"tray", "tray-connecting.png",	  FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_PENDING,	"tray", "tray-new-im.png", 	  FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_EMAIL,	"tray", "tray-message.png",	  FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  }
+	{ PIDGIN_STOCK_STATUS_AVAILABLE, "status",  "available.png",     TRUE, TRUE, TRUE,  TRUE,  TRUE,  FALSE, FALSE, PIDGIN_STOCK_STATUS_AVAILABLE_I },
+	{ PIDGIN_STOCK_STATUS_AWAY,      "status",  "away.png",          TRUE, TRUE, TRUE,  TRUE,  TRUE,  FALSE, FALSE, PIDGIN_STOCK_STATUS_AWAY_I },
+	{ PIDGIN_STOCK_STATUS_BUSY,      "status",  "busy.png",          TRUE, TRUE, TRUE,  TRUE,  TRUE,  FALSE, FALSE, PIDGIN_STOCK_STATUS_BUSY_I },
+	{ PIDGIN_STOCK_STATUS_CHAT,      "status",  "chat.png",          TRUE, TRUE, TRUE,  TRUE,  TRUE,  FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_INVISIBLE, "status",  "invisible.png",     TRUE, TRUE, TRUE,  TRUE,  TRUE,  FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_XA,        "status",  "extended-away.png", TRUE, TRUE, TRUE,  TRUE,  TRUE,  FALSE, TRUE,  PIDGIN_STOCK_STATUS_XA_I },
+	{ PIDGIN_STOCK_STATUS_LOGIN,     "status",  "log-in.png",        TRUE, TRUE, TRUE,  TRUE,  TRUE,  FALSE, TRUE,  NULL },
+	{ PIDGIN_STOCK_STATUS_LOGOUT,    "status",  "log-out.png",       TRUE, TRUE, TRUE,  TRUE,  TRUE,  FALSE, TRUE,  NULL },
+	{ PIDGIN_STOCK_STATUS_OFFLINE,   "status",  "offline.png",       TRUE, TRUE, TRUE,  TRUE,  TRUE,  FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I  },
+	{ PIDGIN_STOCK_STATUS_PERSON,    "status",  "person.png",        TRUE, TRUE, TRUE,  TRUE,  TRUE,  FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_MESSAGE,   "toolbar", "message-new.png",   TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+
+	{ PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png",        FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png",     FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TRAY_AWAY,      "tray", "tray-away.png",          FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TRAY_BUSY,      "tray", "tray-busy.png",          FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TRAY_XA,        "tray", "tray-extended-away.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TRAY_OFFLINE,   "tray", "tray-offline.png",       FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TRAY_CONNECT,   "tray", "tray-connecting.png",    FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TRAY_PENDING,   "tray", "tray-new-im.png",        FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_TRAY_EMAIL,     "tray", "tray-message.png",       FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }
 };
 
 /*****************************************************************************
@@ -282,40 +288,40 @@ find_file(const char *dir, const char *base)
 static void
 do_alphashift(GdkPixbuf *dest, GdkPixbuf *src)
 {
-        gint i, j;
-        gint width, height, has_alpha, srcrowstride, destrowstride;
-        guchar *target_pixels;
-        guchar *original_pixels;
-        guchar *pixsrc;
-        guchar *pixdest;
-        guchar a;
-
-        has_alpha = gdk_pixbuf_get_has_alpha (src);
-        if (!has_alpha)
-          return;
-
-        width = gdk_pixbuf_get_width (src);
-        height = gdk_pixbuf_get_height (src);
-        srcrowstride = gdk_pixbuf_get_rowstride (src);
-        destrowstride = gdk_pixbuf_get_rowstride (dest);
-        target_pixels = gdk_pixbuf_get_pixels (dest);
-        original_pixels = gdk_pixbuf_get_pixels (src);
-
-        for (i = 0; i < height; i++) {
-                pixdest = target_pixels + i*destrowstride;
-                pixsrc = original_pixels + i*srcrowstride;
-                for (j = 0; j < width; j++) {
-                        *(pixdest++) = *(pixsrc++);
-                        *(pixdest++) = *(pixsrc++);
-                        *(pixdest++) = *(pixsrc++);
-                        a = *(pixsrc++);
-                        *(pixdest++) = a / 2;
-                }
-        }
+	gint i, j;
+	gint width, height, has_alpha, srcrowstride, destrowstride;
+	guchar *target_pixels;
+	guchar *original_pixels;
+	guchar *pixsrc;
+	guchar *pixdest;
+	guchar a;
+
+	has_alpha = gdk_pixbuf_get_has_alpha (src);
+	if (!has_alpha)
+		return;
+
+	width = gdk_pixbuf_get_width (src);
+	height = gdk_pixbuf_get_height (src);
+	srcrowstride = gdk_pixbuf_get_rowstride (src);
+	destrowstride = gdk_pixbuf_get_rowstride (dest);
+	target_pixels = gdk_pixbuf_get_pixels (dest);
+	original_pixels = gdk_pixbuf_get_pixels (src);
+
+	for (i = 0; i < height; i++) {
+		pixdest = target_pixels + i*destrowstride;
+		pixsrc = original_pixels + i*srcrowstride;
+		for (j = 0; j < width; j++) {
+			*(pixdest++) = *(pixsrc++);
+			*(pixdest++) = *(pixsrc++);
+			*(pixdest++) = *(pixsrc++);
+			a = *(pixsrc++);
+			*(pixdest++) = a / 2;
+		}
+	}
 }
 
 static gchar *
-find_icon_file(PidginStatusIconTheme *theme, const gchar *size, SizedStockIcon sized_icon, gboolean rtl)
+find_icon_file(PidginIconTheme *theme, const gchar *size, SizedStockIcon sized_icon, gboolean rtl)
 {
 	const gchar *file, *dir;
 	gchar *file_full = NULL;
@@ -347,7 +353,7 @@ find_icon_file(PidginStatusIconTheme *theme, const gchar *size, SizedStockIcon s
 }
 
 static void
-add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, PidginStatusIconTheme *theme,
+add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, PidginIconTheme *theme,
 		const char *size, SizedStockIcon sized_icon, gboolean translucent)
 {
 	char *filename;
@@ -404,6 +410,16 @@ add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, PidginStatusIconTheme *t
 	}
 }
 
+static void
+reload_settings(void)
+{
+#if GTK_CHECK_VERSION(2,4,0)
+	GtkSettings *setting = NULL;
+	setting = gtk_settings_get_default();
+	gtk_rc_reset_styles(setting);
+#endif
+}
+
 /*****************************************************************************
  * Public API functions
  *****************************************************************************/
@@ -419,9 +435,9 @@ pidgin_stock_load_status_icon_theme(PidginStatusIconTheme *theme)
 
 	if (theme != NULL) {
 		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/status/icon-theme",
-				        purple_theme_get_name(PURPLE_THEME(theme)));
+		                        purple_theme_get_name(PURPLE_THEME(theme)));
 		purple_prefs_set_path(PIDGIN_PREFS_ROOT "/status/icon-theme-dir",
-				      purple_theme_get_dir(PURPLE_THEME(theme)));
+		                      purple_theme_get_dir(PURPLE_THEME(theme)));
 	}
 	else {
 		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/status/icon-theme", "");
@@ -441,11 +457,12 @@ pidgin_stock_load_status_icon_theme(PidginStatusIconTheme *theme)
 		if (sized_status_icons[i].translucent_name)
 			translucent = gtk_icon_set_new();
 
-#define ADD_SIZED_ICON(name, size) if (sized_status_icons[i].name) { \
-					add_sized_icon(normal, name, theme, size, sized_status_icons[i], FALSE); \
-					if (sized_status_icons[i].translucent_name) \
-						add_sized_icon(translucent, name, theme, size, sized_status_icons[i], TRUE); \
-				   }
+#define ADD_SIZED_ICON(name, size) \
+		if (sized_status_icons[i].name) { \
+			add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], FALSE); \
+			if (sized_status_icons[i].translucent_name) \
+				add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_status_icons[i], TRUE); \
+		}
 		ADD_SIZED_ICON(microscopic, "11");
 		ADD_SIZED_ICON(extra_small, "16");
 		ADD_SIZED_ICON(small, "22");
@@ -463,55 +480,47 @@ pidgin_stock_load_status_icon_theme(PidginStatusIconTheme *theme)
 		}
 	}
 
-
 	gtk_widget_destroy(win);
 	g_object_unref(G_OBJECT(icon_factory));
+	reload_settings();
 }
 
 void
-pidgin_stock_init(void)
+pidgin_stock_load_stock_icon_theme(PidginStockIconTheme *theme)
 {
 	GtkIconFactory *icon_factory;
-	size_t i;
+	gint i;
 	GtkWidget *win;
-	PidginIconThemeLoader *loader;
-	const gchar *path = NULL;
-
-	if (stock_initted)
-		return;
 
-	stock_initted = TRUE;
-
-	/* Setup the status icon theme */
-	loader = g_object_new(PIDGIN_TYPE_ICON_THEME_LOADER, "type", "status-icon", NULL);
-	purple_theme_manager_register_type(PURPLE_THEME_LOADER(loader));
-	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/status/icon-theme", "");
-	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/status/icon-theme-dir", "");
+	if (theme != NULL) {
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/stock/icon-theme",
+		                        purple_theme_get_name(PURPLE_THEME(theme)));
+		purple_prefs_set_path(PIDGIN_PREFS_ROOT "/stock/icon-theme-dir",
+		                      purple_theme_get_dir(PURPLE_THEME(theme)));
+	}
+	else {
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/stock/icon-theme", "");
+		purple_prefs_set_path(PIDGIN_PREFS_ROOT "/stock/icon-theme-dir", "");
+	}
 
-	/* Setup the icon factory. */
 	icon_factory = gtk_icon_factory_new();
 
 	gtk_icon_factory_add_default(icon_factory);
 
-	/* Er, yeah, a hack, but it works. :) */
 	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_widget_realize(win);
 
 	/* All non-sized icons */
-	for (i = 0; i < G_N_ELEMENTS(stock_icons); i++)
-	{
+	for (i = 0; i < G_N_ELEMENTS(stock_icons); i++) {
 		GtkIconSource *source;
 		GtkIconSet *iconset;
 		gchar *filename;
 
-		if (stock_icons[i].dir == NULL)
-		{
+		if (stock_icons[i].dir == NULL) {
 			/* GTK+ Stock icon */
 			iconset = gtk_style_lookup_icon_set(gtk_widget_get_style(win),
 					stock_icons[i].filename);
-		}
-		else
-		{
+		} else {
 			filename = find_file(stock_icons[i].dir, stock_icons[i].filename);
 
 			if (filename == NULL)
@@ -535,21 +544,14 @@ pidgin_stock_init(void)
 		gtk_icon_set_unref(iconset);
 	}
 
-	/* register custom icon sizes */
-	microscopic =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC, 11, 11);
-	extra_small =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL, 16, 16);
-	small =        gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_SMALL, 22, 22);
-	medium =       gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MEDIUM, 32, 32);
-	large =        gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_LARGE, 48, 48);
-	huge =         gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_HUGE, 64, 64);
-
 	/* All non-status sized icons */
 	for (i = 0; i < G_N_ELEMENTS(sized_stock_icons); i++)
 	{
 		GtkIconSet *iconset = gtk_icon_set_new();
 
-#define ADD_SIZED_ICON(name, size) if (sized_stock_icons[i].name) \
-					add_sized_icon(iconset, name, NULL, size, sized_stock_icons[i], FALSE);
+#define ADD_SIZED_ICON(name, size) \
+		if (sized_stock_icons[i].name) \
+			add_sized_icon(iconset, name, PIDGIN_ICON_THEME(theme), size, sized_stock_icons[i], FALSE);
 		ADD_SIZED_ICON(microscopic, "11");
 		ADD_SIZED_ICON(extra_small, "16");
 		ADD_SIZED_ICON(small, "22");
@@ -564,6 +566,40 @@ pidgin_stock_init(void)
 
 	gtk_widget_destroy(win);
 	g_object_unref(G_OBJECT(icon_factory));
+	reload_settings();
+}
+
+void
+pidgin_stock_init(void)
+{
+	PidginIconThemeLoader *loader, *stockloader;
+	const gchar *path = NULL;
+
+	if (stock_initted)
+		return;
+
+	stock_initted = TRUE;
+
+	/* Setup the status icon theme */
+	loader = g_object_new(PIDGIN_TYPE_ICON_THEME_LOADER, "type", "status-icon", NULL);
+	purple_theme_manager_register_type(PURPLE_THEME_LOADER(loader));
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/status/icon-theme", "");
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/status/icon-theme-dir", "");
+
+	stockloader = g_object_new(PIDGIN_TYPE_ICON_THEME_LOADER, "type", "stock-icon", NULL);
+	purple_theme_manager_register_type(PURPLE_THEME_LOADER(stockloader));
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/stock/icon-theme", "");
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/stock/icon-theme-dir", "");
+
+	/* register custom icon sizes */
+	microscopic =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC, 11, 11);
+	extra_small =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL, 16, 16);
+	small       =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_SMALL, 22, 22);
+	medium      =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MEDIUM, 32, 32);
+	large       =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_LARGE, 48, 48);
+	huge        =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_HUGE, 64, 64);
+
+	pidgin_stock_load_stock_icon_theme(NULL);
 
 	/* Pre-load Status icon theme - this avoids a bug with displaying the correct icon in the tray, theme is destroyed after*/
 	if (purple_prefs_get_string(PIDGIN_PREFS_ROOT "/icon/status/theme") &&
@@ -573,8 +609,38 @@ pidgin_stock_init(void)
 		pidgin_stock_load_status_icon_theme(theme);
 		g_object_unref(G_OBJECT(theme));
 
-	} else pidgin_stock_load_status_icon_theme(NULL);
+	}
+	else
+		pidgin_stock_load_status_icon_theme(NULL);
 
 	/* Register the stock items. */
 	gtk_stock_add_static(stock_items, G_N_ELEMENTS(stock_items));
 }
+
+static void
+pidgin_stock_icon_theme_class_init(PidginStockIconThemeClass *klass)
+{
+}
+
+GType
+pidgin_stock_icon_theme_get_type(void)
+{
+	static GType type = 0;
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof (PidginStockIconThemeClass),
+			NULL, /* base_init */
+			NULL, /* base_finalize */
+			(GClassInitFunc)pidgin_stock_icon_theme_class_init, /* class_init */
+			NULL, /* class_finalize */
+			NULL, /* class_data */
+			sizeof (PidginStockIconTheme),
+			0, /* n_preallocs */
+			NULL,
+			NULL, /* value table */
+		};
+		type = g_type_register_static(PIDGIN_TYPE_ICON_THEME,
+				"PidginStockIconTheme", &info, 0);
+	}
+	return type;
+}
diff --git a/pidgin/pidginstock.h b/pidgin/pidginstock.h
index ae0b3c34b1..45fd0027dd 100644
--- a/pidgin/pidginstock.h
+++ b/pidgin/pidginstock.h
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include "gtkstatus-icon-theme.h"
 
 #ifndef _PIDGIN_STOCK_H_
@@ -154,6 +154,11 @@
 #define PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR "pidgin-select-avatar"
 #define PIDGIN_STOCK_TOOLBAR_SEND_FILE    "pidgin-send-file"
 #define PIDGIN_STOCK_TOOLBAR_TRANSFER     "pidgin-transfer"
+#ifdef USE_VV
+#define PIDGIN_STOCK_TOOLBAR_AUDIO_CALL   "pidgin-audio-call"
+#define PIDGIN_STOCK_TOOLBAR_VIDEO_CALL   "pidgin-video-call"
+#define PIDGIN_STOCK_TOOLBAR_AUDIO_VIDEO_CALL "pidgin-audio-video-call"
+#endif
 
 /* Tray icons */
 #define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-available"
@@ -180,15 +185,54 @@
 #define PIDGIN_ICON_SIZE_TANGO_HUGE           "pidgin-icon-size-tango-huge"
 
 /**
+ * extends PidginIconTheme (gtkicon-theme.h)
+ * A pidgin stock icon theme.
+ * This object represents a Pidgin stock icon theme.
+ *
+ * PidginStockIconTheme is a PidginIconTheme Object.
+ */
+typedef struct _PidginStockIconTheme        PidginStockIconTheme;
+typedef struct _PidginStockIconThemeClass   PidginStockIconThemeClass;
+
+#define PIDGIN_TYPE_STOCK_ICON_THEME            (pidgin_stock_icon_theme_get_type ())
+#define PIDGIN_STOCK_ICON_THEME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_STOCK_ICON_THEME, PidginStockIconTheme))
+#define PIDGIN_STOCK_ICON_THEME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_STOCK_ICON_THEME, PidginStockIconThemeClass))
+#define PIDGIN_IS_STOCK_ICON_THEME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_STOCK_ICON_THEME))
+#define PIDGIN_IS_STOCK_ICON_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_STOCK_ICON_THEME))
+#define PIDGIN_STOCK_ICON_THEME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_STOCK_ICON_THEME, PidginStockIconThemeClass))
+
+struct _PidginStockIconTheme
+{
+	PidginIconTheme parent;
+};
+
+struct _PidginStockIconThemeClass
+{
+	PidginIconThemeClass parent_class;
+};
+
+G_BEGIN_DECLS
+
+/**
+ * GObject foo.
+ * @internal.
+ */
+GType pidgin_stock_icon_theme_get_type(void);
+
+/**
  * Loades all of the icons from the status icon theme into Pidgin stock
  *
  * @param theme		the theme to load, or null to load all the default icons
  */
 void pidgin_stock_load_status_icon_theme(PidginStatusIconTheme *theme);
 
+
+void pidgin_stock_load_stock_icon_theme(PidginStockIconTheme *theme);
+
 /**
  * Sets up the purple stock repository.
  */
 void pidgin_stock_init(void);
 
+G_END_DECLS
 #endif /* _PIDGIN_STOCK_H_ */
diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am
index 7408dae766..e96ebff8d2 100644
--- a/pidgin/pixmaps/Makefile.am
+++ b/pidgin/pixmaps/Makefile.am
@@ -69,15 +69,6 @@ DIALOGS_16 = \
 		dialogs/16/mail.png \
 		dialogs/16/question.png
 
-DIALOGS_64_SCALABLE = \
-		dialogs/64/scalable/auth.svg \
-		dialogs/64/scalable/cool.svg \
-		dialogs/64/scalable/dialog.svg \
-		dialogs/64/scalable/error.svg \
-		dialogs/64/scalable/info.svg \
-		dialogs/64/scalable/question.svg \
-		dialogs/64/scalable/warning.svg
-
 DIALOGS_64 = \
 		dialogs/64/auth.png \
 		dialogs/64/cool.png \
@@ -88,23 +79,14 @@ DIALOGS_64 = \
 		dialogs/64/question.png \
 		dialogs/64/warning.png
 
-EMBLEMS_16_SCALABLE = \
-		emblems/16/scalable/aol-client.svg \
-		emblems/16/scalable/blocked.svg \
-		emblems/16/scalable/bot.svg \
-		emblems/16/scalable/external.svg \
-		emblems/16/scalable/female.svg \
-		emblems/16/scalable/free-for-chat.svg \
-		emblems/16/scalable/game.svg \
-		emblems/16/scalable/male.svg \
-		emblems/16/scalable/mobile.svg \
-		emblems/16/scalable/music.svg \
-		emblems/16/scalable/not-authorized.svg \
-		emblems/16/scalable/qq-member.svg \
-		emblems/16/scalable/secure.svg \
-		emblems/16/scalable/unavailable.svg \
-		emblems/16/scalable/video.svg \
-		emblems/16/scalable/voice.svg
+DIALOGS_SCALABLE = \
+		dialogs/scalable/auth.svg \
+		dialogs/scalable/cool.svg \
+		dialogs/scalable/dialog.svg \
+		dialogs/scalable/error.svg \
+		dialogs/scalable/info.svg \
+		dialogs/scalable/question.svg \
+		dialogs/scalable/warning.svg
 
 EMBLEMS_16 = \
 		emblems/16/aol-client.png \
@@ -129,6 +111,24 @@ EMBLEMS_16 = \
 		emblems/16/video.png \
 		emblems/16/voice.png
 
+EMBLEMS_SCALABLE = \
+		emblems/scalable/aol-client.svg \
+		emblems/scalable/blocked.svg \
+		emblems/scalable/bot.svg \
+		emblems/scalable/external.svg \
+		emblems/scalable/female.svg \
+		emblems/scalable/free-for-chat.svg \
+		emblems/scalable/game.svg \
+		emblems/scalable/male.svg \
+		emblems/scalable/mobile.svg \
+		emblems/scalable/music.svg \
+		emblems/scalable/not-authorized.svg \
+		emblems/scalable/qq-member.svg \
+		emblems/scalable/secure.svg \
+		emblems/scalable/unavailable.svg \
+		emblems/scalable/video.svg \
+		emblems/scalable/voice.svg
+
 EMOTES_DEFAULT_24_SCALABLE = \
 		emotes/default/24/scalable/airplane.svg \
 		emotes/default/24/scalable/bad.svg \
@@ -260,11 +260,10 @@ ICONS_32_SCALABLE = \
 
 ICONS_32 = icons/hicolor/32x32/apps/pidgin.png
 
-ICONS_48_SCALABLE = \
-		icons/hicolor/48x48/apps/scalable/pidgin.svg
-
 ICONS_48 = icons/hicolor/48x48/apps/pidgin.png
 
+ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+
 PROTOCOLS_22_SCALABLE = \
 		protocols/22/scalable/aim.svg \
 		protocols/22/scalable/bonjour.svg \
@@ -299,23 +298,6 @@ PROTOCOLS_22 = \
 		protocols/22/yahoo.png \
 		protocols/22/zephyr.png
 
-PROTOCOLS_48_SCALABLE = \
-		protocols/48/scalable/aim.svg \
-		protocols/48/scalable/bonjour.svg \
-		protocols/48/scalable/gadu-gadu.svg \
-		protocols/48/scalable/google-talk.svg \
-		protocols/48/scalable/novell.svg \
-		protocols/48/scalable/icq.svg \
-		protocols/48/scalable/irc.svg \
-		protocols/48/scalable/jabber.svg \
-		protocols/48/scalable/meanwhile.svg \
-		protocols/48/scalable/msn.svg \
-		protocols/48/scalable/qq.svg \
-		protocols/48/scalable/silc.svg \
-		protocols/48/scalable/simple.svg \
-		protocols/48/scalable/yahoo.svg \
-		protocols/48/scalable/zephyr.svg
-
 PROTOCOLS_48 = \
 		protocols/48/aim.png \
 		protocols/48/bonjour.png \
@@ -333,6 +315,23 @@ PROTOCOLS_48 = \
 		protocols/48/yahoo.png \
 		protocols/48/zephyr.png
 
+PROTOCOLS_SCALABLE = \
+		protocols/scalable/aim.svg \
+		protocols/scalable/bonjour.svg \
+		protocols/scalable/gadu-gadu.svg \
+		protocols/scalable/google-talk.svg \
+		protocols/scalable/novell.svg \
+		protocols/scalable/icq.svg \
+		protocols/scalable/irc.svg \
+		protocols/scalable/jabber.svg \
+		protocols/scalable/meanwhile.svg \
+		protocols/scalable/msn.svg \
+		protocols/scalable/qq.svg \
+		protocols/scalable/silc.svg \
+		protocols/scalable/simple.svg \
+		protocols/scalable/yahoo.svg \
+		protocols/scalable/zephyr.svg
+
 STATUS_11 = \
 		status/11/available.png \
 		status/11/away.png \
@@ -429,6 +428,7 @@ TOOLBAR_16_SCALABLE = \
 		toolbar/16/scalable/font-size-up.svg
 
 TOOLBAR_16 = \
+		toolbar/16/audio-call.png \
 		toolbar/16/change-bgcolor.png \
 		toolbar/16/change-fgcolor.png \
 		toolbar/16/emote-select.png \
@@ -442,13 +442,34 @@ TOOLBAR_16 = \
 		toolbar/16/plugins.png \
 		toolbar/16/send-file.png \
 		toolbar/16/transfer.png \
-		toolbar/16/unblock.png
+		toolbar/16/unblock.png \
+		toolbar/16/video-call.png
 
 TOOLBAR_22_SCALABLE = \
-		toolbar/22/scalable/select-avatar.svg
+		toolbar/22/scalable/select-avatar.svg \
+		toolbar/22/scalable/video-call.svg \
+		toolbar/22/scalable/voice-call.svg
 
 TOOLBAR_22 = \
-		toolbar/22/select-avatar.png
+		toolbar/22/select-avatar.png \
+		toolbar/22/video-call.png \
+		toolbar/22/voice-call.png
+
+TOOLBAR_32_SCALABLE = \
+		toolbar/32/scalable/video-call.svg \
+		toolbar/32/scalable/voice-call.svg
+
+TOOLBAR_32 = \
+		toolbar/32/video-call.png \
+		toolbar/32/voice-call.png
+
+TOOLBAR_48_SCALABLE = \
+		toolbar/48/scalable/video-call.svg \
+		toolbar/48/scalable/voice-call.svg
+
+TOOLBAR_48 = \
+		toolbar/48/video-call.png \
+		toolbar/48/voice-call.png
 
 TRAY_16_ICO = \
 		tray/16/available_4bit.ico \
@@ -508,6 +529,8 @@ EXTRA_DIST = \
 		edit.png			\
 		info.png			\
 		logo.png			\
+		logo.svg			\
+		logo-nonvv.png		\
 		pause.png			\
 		arrow-down.xpm		\
 		arrow-up.xpm		\
@@ -517,18 +540,16 @@ EXTRA_DIST = \
 		pidgin.ico		\
 		$(MAKEFILE_MINGW)	\
 		$(DIALOGS_16_SCALABLE)	\
-		$(DIALOGS_64_SCALABLE)	\
 		$(ICONS_16_SCALABLE)	\
 		$(ICONS_24_SCALABLE)	\
 		$(ICONS_32_SCALABLE)	\
-		$(ICONS_48_SCALABLE)	\
-		$(EMBLEMS_16_SCALABLE)	\
 		$(EMOTES_DEFAULT_24_SCALABLE)	\
 		$(PROTOCOLS_16_SCALABLE)	\
 		$(PROTOCOLS_22_SCALABLE)	\
-		$(PROTOCOLS_48_SCALABLE)	\
 		$(TOOLBAR_16_SCALABLE)	\
-		$(TOOLBAR_22_SCALABLE)
+		$(TOOLBAR_22_SCALABLE)	\
+		$(TOOLBAR_32_SCALABLE)	\
+		$(TOOLBAR_48_SCALABLE)
 
 pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
 pidginbuttonpix_DATA = edit.png pause.png info.png
@@ -540,10 +561,13 @@ nobase_dist_pidginpixmap_DATA = \
 		$(ANIMATIONS_16) \
 		$(DIALOGS_16) \
 		$(DIALOGS_64) \
+		$(DIALOGS_SCALABLE)	\
 		$(EMBLEMS_16) \
+		$(EMBLEMS_SCALABLE)	\
 		$(PROTOCOLS_16) \
 		$(PROTOCOLS_22) \
 		$(PROTOCOLS_48) \
+		$(PROTOCOLS_SCALABLE)	\
 		$(STATUS_11) \
 		$(STATUS_11_RTL) \
 		$(STATUS_16) \
@@ -557,6 +581,8 @@ nobase_dist_pidginpixmap_DATA = \
 		$(TOOLBAR_11) \
 		$(TOOLBAR_16) \
 		$(TOOLBAR_22) \
+		$(TOOLBAR_32) \
+		$(TOOLBAR_48) \
 		$(TRAY_16) \
 		$(TRAY_16_ICO) \
 		$(TRAY_22) \
@@ -568,5 +594,6 @@ nobase_dist_pidginicons_DATA = \
 		$(ICONS_22) \
 		$(ICONS_24) \
 		$(ICONS_32) \
-		$(ICONS_48)
+		$(ICONS_48) \
+		$(ICONS_SCALABLE)
 endif
diff --git a/pidgin/pixmaps/dialogs/64/scalable/auth.svg b/pidgin/pixmaps/dialogs/scalable/auth.svg
index 1c3bd63e42..1c3bd63e42 100644
--- a/pidgin/pixmaps/dialogs/64/scalable/auth.svg
+++ b/pidgin/pixmaps/dialogs/scalable/auth.svg
diff --git a/pidgin/pixmaps/dialogs/64/scalable/cool.svg b/pidgin/pixmaps/dialogs/scalable/cool.svg
index f2241c1ec0..f2241c1ec0 100644
--- a/pidgin/pixmaps/dialogs/64/scalable/cool.svg
+++ b/pidgin/pixmaps/dialogs/scalable/cool.svg
diff --git a/pidgin/pixmaps/dialogs/64/scalable/dialog.svg b/pidgin/pixmaps/dialogs/scalable/dialog.svg
index b0b9fcb7ea..b0b9fcb7ea 100644
--- a/pidgin/pixmaps/dialogs/64/scalable/dialog.svg
+++ b/pidgin/pixmaps/dialogs/scalable/dialog.svg
diff --git a/pidgin/pixmaps/dialogs/64/scalable/error.svg b/pidgin/pixmaps/dialogs/scalable/error.svg
index 704ed483c3..704ed483c3 100644
--- a/pidgin/pixmaps/dialogs/64/scalable/error.svg
+++ b/pidgin/pixmaps/dialogs/scalable/error.svg
diff --git a/pidgin/pixmaps/dialogs/64/scalable/info.svg b/pidgin/pixmaps/dialogs/scalable/info.svg
index 3d92690b88..3d92690b88 100644
--- a/pidgin/pixmaps/dialogs/64/scalable/info.svg
+++ b/pidgin/pixmaps/dialogs/scalable/info.svg
diff --git a/pidgin/pixmaps/dialogs/64/scalable/mail.svg b/pidgin/pixmaps/dialogs/scalable/mail.svg
index 3249b8eb1c..3249b8eb1c 100644
--- a/pidgin/pixmaps/dialogs/64/scalable/mail.svg
+++ b/pidgin/pixmaps/dialogs/scalable/mail.svg
diff --git a/pidgin/pixmaps/dialogs/64/scalable/question.svg b/pidgin/pixmaps/dialogs/scalable/question.svg
index 0390e6f85f..0390e6f85f 100644
--- a/pidgin/pixmaps/dialogs/64/scalable/question.svg
+++ b/pidgin/pixmaps/dialogs/scalable/question.svg
diff --git a/pidgin/pixmaps/dialogs/64/scalable/warning.svg b/pidgin/pixmaps/dialogs/scalable/warning.svg
index d4492adef1..d4492adef1 100644
--- a/pidgin/pixmaps/dialogs/64/scalable/warning.svg
+++ b/pidgin/pixmaps/dialogs/scalable/warning.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/aol-client.svg b/pidgin/pixmaps/emblems/scalable/aol-client.svg
index 48392e0bdc..48392e0bdc 100644
--- a/pidgin/pixmaps/emblems/16/scalable/aol-client.svg
+++ b/pidgin/pixmaps/emblems/scalable/aol-client.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/birthday.svg b/pidgin/pixmaps/emblems/scalable/birthday.svg
index 87713dc637..87713dc637 100644
--- a/pidgin/pixmaps/emblems/16/scalable/birthday.svg
+++ b/pidgin/pixmaps/emblems/scalable/birthday.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/blocked.svg b/pidgin/pixmaps/emblems/scalable/blocked.svg
index bc1053b4b2..bc1053b4b2 100644
--- a/pidgin/pixmaps/emblems/16/scalable/blocked.svg
+++ b/pidgin/pixmaps/emblems/scalable/blocked.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/bot.svg b/pidgin/pixmaps/emblems/scalable/bot.svg
index fba387de11..fba387de11 100644
--- a/pidgin/pixmaps/emblems/16/scalable/bot.svg
+++ b/pidgin/pixmaps/emblems/scalable/bot.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/external.svg b/pidgin/pixmaps/emblems/scalable/external.svg
index 8894bfbf06..8894bfbf06 100644
--- a/pidgin/pixmaps/emblems/16/scalable/external.svg
+++ b/pidgin/pixmaps/emblems/scalable/external.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/female.svg b/pidgin/pixmaps/emblems/scalable/female.svg
index 6946827ad2..6946827ad2 100644
--- a/pidgin/pixmaps/emblems/16/scalable/female.svg
+++ b/pidgin/pixmaps/emblems/scalable/female.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/free-for-chat.svg b/pidgin/pixmaps/emblems/scalable/free-for-chat.svg
index d0cf4ba87f..d0cf4ba87f 100644
--- a/pidgin/pixmaps/emblems/16/scalable/free-for-chat.svg
+++ b/pidgin/pixmaps/emblems/scalable/free-for-chat.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/game.svg b/pidgin/pixmaps/emblems/scalable/game.svg
index ed81efb721..ed81efb721 100644
--- a/pidgin/pixmaps/emblems/16/scalable/game.svg
+++ b/pidgin/pixmaps/emblems/scalable/game.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/male.svg b/pidgin/pixmaps/emblems/scalable/male.svg
index f59f685beb..f59f685beb 100644
--- a/pidgin/pixmaps/emblems/16/scalable/male.svg
+++ b/pidgin/pixmaps/emblems/scalable/male.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/mobile.svg b/pidgin/pixmaps/emblems/scalable/mobile.svg
index 239d2c38f5..239d2c38f5 100644
--- a/pidgin/pixmaps/emblems/16/scalable/mobile.svg
+++ b/pidgin/pixmaps/emblems/scalable/mobile.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/music.svg b/pidgin/pixmaps/emblems/scalable/music.svg
index 29f0acfda6..29f0acfda6 100644
--- a/pidgin/pixmaps/emblems/16/scalable/music.svg
+++ b/pidgin/pixmaps/emblems/scalable/music.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/not-authorized.svg b/pidgin/pixmaps/emblems/scalable/not-authorized.svg
index fc9710261d..fc9710261d 100644
--- a/pidgin/pixmaps/emblems/16/scalable/not-authorized.svg
+++ b/pidgin/pixmaps/emblems/scalable/not-authorized.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/qq-member.svg b/pidgin/pixmaps/emblems/scalable/qq-member.svg
index cf18049aeb..cf18049aeb 100644
--- a/pidgin/pixmaps/emblems/16/scalable/qq-member.svg
+++ b/pidgin/pixmaps/emblems/scalable/qq-member.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/secure.svg b/pidgin/pixmaps/emblems/scalable/secure.svg
index d763814a1e..d763814a1e 100644
--- a/pidgin/pixmaps/emblems/16/scalable/secure.svg
+++ b/pidgin/pixmaps/emblems/scalable/secure.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/unavailable.svg b/pidgin/pixmaps/emblems/scalable/unavailable.svg
index e78891a04d..e78891a04d 100644
--- a/pidgin/pixmaps/emblems/16/scalable/unavailable.svg
+++ b/pidgin/pixmaps/emblems/scalable/unavailable.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/video.svg b/pidgin/pixmaps/emblems/scalable/video.svg
index 2a16555b98..2a16555b98 100644
--- a/pidgin/pixmaps/emblems/16/scalable/video.svg
+++ b/pidgin/pixmaps/emblems/scalable/video.svg
diff --git a/pidgin/pixmaps/emblems/16/scalable/voice.svg b/pidgin/pixmaps/emblems/scalable/voice.svg
index 9fa3a2d169..9fa3a2d169 100644
--- a/pidgin/pixmaps/emblems/16/scalable/voice.svg
+++ b/pidgin/pixmaps/emblems/scalable/voice.svg
diff --git a/pidgin/pixmaps/emotes/default/24/default.theme.in b/pidgin/pixmaps/emotes/default/24/default.theme.in
index ff9deb3ffa..5dab7d2c6e 100644
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in
@@ -364,6 +364,98 @@ male-fighter2.png   o=>     O=>
 female-fighter.png  o-+     O-+
 yin-yang.png        (%)
 
+# Following Yahoo! Messenger 8.1
+[Yahoo JAPAN]
+smile.png           :)      :-)
+question.png        :-/     :-\\
+shock.png           :-O     :O      :-o     :o 
+devil.png           >:)
+angel.png           O:-)    o:-)    0:-)
+sick.png            :-&
+yawn.png            (:|
+hypnotized.png      @-)
+on-the-phone.png    :)]
+sad.png             :(      :-(
+in-love.png         :x      :-x     :X      :-X
+angry.png           X-(     x-(     X(      x(
+crying.png          :((
+glasses-nerdy.png   :-B     :-b
+quiet.png           :-$
+drool.png           =P~     =p~
+lying.png           :^O     :^o
+call-me.png         :-c
+wink.png            ;)      ;-)
+embarrassed.png     :">
+mean.png            :->     :>
+laugh.png           :))     :-))
+bye.png             =;
+arrogant.png        [-(
+thinking.png        :-?
+waiting.png         :-w     :-W
+at-wits-end.png     ~x(     ~X(
+smile-big.png       :D      :-D     :d      :-d
+tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    B-)     b-)
+neutral.png         :|      :-|
+sleepy.png          I-)     i-)     |-)
+clown.png           :o)     :O)
+doh.png             #-o     #-O
+weep.png            :-<
+go-away.png         :-h
+lashes.png          ;;)
+kiss.png            :-*     :*
+confused.png        :-S     :-s
+sarcastic.png       /:)
+eyeroll.png         8-|
+silly.png           8-}
+clap.png            =D>     =d>
+mad-tongue.png      >:P     >:p
+time-out.png        :-t     :-T
+hug-left.png        >:D<    >:d<
+love-over.png       =((
+sweat.png           #:-S    #:-s
+rotfl.png           =)) :-j :-J 
+loser.png           L-)     l-)
+party.png           <:-P    <:-p
+nailbiting.png      :-SS	:-Ss	:-sS	:-ss
+cowboy.png          <):)
+desire.png          8->
+! skywalker.png     C:-)    c:-)    C:)     c:)
+! monkey.png        :-(|)  :(|)
+
+# Hidden Yahoo emotes
+alien.png           =:)     >-)
+beat-up.png         b-(     B-(
+chicken.png         ~:>
+coffee.png          ~o)     ~O)
+cow.png             3:-O    3:-o
+dance.png           \\:D/   \\:d/
+rose.png            @};-
+dont-know.png       :-L     :-l
+skeleton.png        8-X     8-x
+lamp.png            *-:)
+monkey.png          :(|)
+coins.png           $-)
+peace.png           :)>-
+pig.png             :@)
+pray.png            [-o<    [-O<
+pumpkin.png         (~~)
+shame.png           [-X     [-x
+flag.png            **==
+clover.png          %%-
+musical-note.png    :-"
+giggle.png          ;))
+worship.png         ^:)^
+star.png            (*)
+waving.png          >:/
+talktohand.png      :-@
+
+# Only available after activating the Yahoo! Fighter IMVironment
+male-fighter1.png   o->     O->
+male-fighter2.png   o=>     O=>
+female-fighter.png  o-+     O-+
+yin-yang.png        (%)
+
 
 # Following MySpaceIM Beta 1.0.697.0
 [MySpaceIM]
@@ -399,13 +491,16 @@ smile.png                 :)    :-)    =)
 smile-big.png             :D    :-D    =D
 wink.png                  ;)    ;-)    ;^)
 shock.png                 :-o
-tongue.png                :P    :-P
+tongue.png                :P    :-P    :-p
 glasses-cool.png          B-)
 angry.png                 X-(
-sad.png                   :(
+sad.png                   :(    :-(    =(
 crying.png                :'(
 neutral.png               :-|
 thinking.png              :-/
 love.png                  <3
 monkey.png                :(|)
 victory.png               \\m/
+! skywalker.png     C:-)    c:-)    C:)     c:)
+! monkey.png        :-(|)  :(|)     8-|)
+! cyclops.png       O-) o-)
diff --git a/pidgin/pixmaps/emotes/small/16/small.theme.in b/pidgin/pixmaps/emotes/small/16/small.theme.in
index 897a2383a0..f9dd3713b8 100644
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in
@@ -139,7 +139,34 @@ dont-know.png       :-L     :-l
 shame.png           [-X     [-x
 musical-note.png    :-"
 
-# Only available after activating the Yahoo! Fighter IMVironment
+# Following Yahoo! Messenger 8.1
+[Yahoo JAPAN]
+smile.png           :)      :-)
+question.png        :-/     :-\\
+shock.png           :-O     :O      :-o     :o 
+devil.png           >:)
+angel.png           O:-)    o:-)    0:-)
+sick.png            :-&
+yawn.png            (:|
+sad.png             :(      :-(
+angry.png           X-(     x-(     X(      x(
+crying.png          :((
+wink.png            ;)      ;-)
+thinking.png        :-?
+smile-big.png       :D      :-D     :d      :-d
+tongue.png          :-P     :P      :-p     :p
+neutral.png         :|      :-|
+sleepy.png          I-)     i-)     |-)
+kiss.png            :-*     :*
+confused.png        :-S     :-s
+hug-left.png        >:D<    >:d<
+party.png           <:-P    <:-p
+
+# Hidden Yahoo emotes
+coffee.png          ~o)     ~O)
+dont-know.png       :-L     :-l
+shame.png           [-X     [-x
+musical-note.png    :-"
 
 
 # Following MySpaceIM Beta 1.0.697.0
@@ -161,10 +188,10 @@ smile.png                 :)    :-)    =)
 smile-big.png             :D    :-D    =D
 wink.png                  ;)    ;-)    ;^)
 shock.png                 :-o
-tongue.png                :P    :-P
+tongue.png                :P    :-P    :-p
 glasses-cool.png          B-)
 angry.png                 X-(
-sad.png                   :(
+sad.png                   :(    :-(    =(
 crying.png                :'(
 neutral.png               :-|
 thinking.png              :-/
diff --git a/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/scalable/apps/pidgin.svg
index ede1897348..ede1897348 100644
--- a/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg
+++ b/pidgin/pixmaps/icons/hicolor/scalable/apps/pidgin.svg
diff --git a/pidgin/pixmaps/logo-nonvv.png b/pidgin/pixmaps/logo-nonvv.png
new file mode 100644
index 0000000000..f16a50ec28
--- /dev/null
+++ b/pidgin/pixmaps/logo-nonvv.png
diff --git a/pidgin/pixmaps/logo.png b/pidgin/pixmaps/logo.png
index f16a50ec28..debb092fc6 100644
--- a/pidgin/pixmaps/logo.png
+++ b/pidgin/pixmaps/logo.png
diff --git a/pidgin/pixmaps/logo.svg b/pidgin/pixmaps/logo.svg
new file mode 100644
index 0000000000..4288a5127d
--- /dev/null
+++ b/pidgin/pixmaps/logo.svg
@@ -0,0 +1,2084 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="330"
+   height="90"
+   id="svg4909"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20974"
+   version="1.0"
+   sodipodi:docname="logo.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/graphic.png"
+   inkscape:export-xdpi="90.002045"
+   inkscape:export-ydpi="90.002045">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="336.98097"
+     inkscape:cy="2.5199598"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="752"
+     inkscape:window-x="0"
+     inkscape:window-y="0">
+    <inkscape:grid
+       enabled="true"
+       visible="true"
+       empspacing="5"
+       id="grid3839"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4911">
+    <inkscape:perspective
+       id="perspective246"
+       inkscape:persp3d-origin="165 : 30 : 1"
+       inkscape:vp_z="330 : 45 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 45 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       height="1.502086"
+       y="-0.25104305"
+       width="1.2255775"
+       x="-0.11278874"
+       id="filter4170-6"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur4172-6"
+         stdDeviation="0.72968781"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       y2="10.832565"
+       x2="3.5010808"
+       y1="5.5247211"
+       x1="8.8108797"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6823"
+       xlink:href="#linearGradient4190-9"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4190-9">
+      <stop
+         style="stop-color:#a2bfe4;stop-opacity:1"
+         offset="0"
+         id="stop4192-8" />
+      <stop
+         style="stop-color:#396fb5;stop-opacity:1"
+         offset="1"
+         id="stop4194-7" />
+    </linearGradient>
+    <radialGradient
+       r="4.5"
+       fy="7.1003194"
+       fx="9.8137703"
+       cy="7.1003194"
+       cx="9.8137703"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6825"
+       xlink:href="#linearGradient3563-4"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3563-4"
+       inkscape:collect="always">
+      <stop
+         id="stop3565-3"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3567-7"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="4.5"
+       fy="5.3842082"
+       fx="8.7242012"
+       cy="5.3842082"
+       cx="8.7242012"
+       gradientTransform="matrix(0.26666722,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6827"
+       xlink:href="#linearGradient3563-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="10.598598"
+       x2="3.4842527"
+       y1="5.485971"
+       x1="8.5987625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6817"
+       xlink:href="#linearGradient3837-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3837-9"
+       inkscape:collect="always">
+      <stop
+         id="stop3839-1"
+         offset="0"
+         style="stop-color:#a40000;stop-opacity:1;" />
+      <stop
+         id="stop3841-06"
+         offset="1"
+         style="stop-color:#4f0000;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       r="4.5"
+       fy="7.1003194"
+       fx="9.8137703"
+       cy="7.1003194"
+       cx="9.8137703"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6819"
+       xlink:href="#linearGradient3563-4"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.5"
+       fy="4.2809825"
+       fx="8.7327385"
+       cy="4.2809825"
+       cx="8.7327385"
+       gradientTransform="matrix(0.26666722,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6821"
+       xlink:href="#linearGradient3563-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="10.4171"
+       x2="3.4777882"
+       y1="5.1950126"
+       x1="8.7017984"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3978-2"
+       xlink:href="#linearGradient3829-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3829-6"
+       inkscape:collect="always">
+      <stop
+         id="stop3831-0"
+         offset="0"
+         style="stop-color:#204a87;stop-opacity:1;" />
+      <stop
+         id="stop3833-9"
+         offset="1"
+         style="stop-color:#132f57;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       r="4.5"
+       fy="7.1003194"
+       fx="9.8137703"
+       cy="7.1003194"
+       cx="9.8137703"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3980-6"
+       xlink:href="#linearGradient3563-4"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.5"
+       fy="4.2809825"
+       fx="8.7327385"
+       cy="4.2809825"
+       cx="8.7327385"
+       gradientTransform="matrix(0.26666722,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3998-1"
+       xlink:href="#linearGradient3563-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="10.832565"
+       x2="3.5010808"
+       y1="5.5247211"
+       x1="8.8108797"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6771"
+       xlink:href="#linearGradient3821-8"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3821-8"
+       inkscape:collect="always">
+      <stop
+         id="stop3823-8"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1;" />
+      <stop
+         id="stop3825-9"
+         offset="1"
+         style="stop-color:#1e3e00;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       r="4.5"
+       fy="7.1003194"
+       fx="9.8137703"
+       cy="7.1003194"
+       cx="9.8137703"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6773"
+       xlink:href="#linearGradient3563-4"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.5"
+       fy="4.2809825"
+       fx="8.7327385"
+       cy="4.2809825"
+       cx="8.7327385"
+       gradientTransform="matrix(0.26666722,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6775"
+       xlink:href="#linearGradient3563-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="-52.451519"
+       x2="-244.26472"
+       y1="-75.571808"
+       x1="-244.26472"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6991"
+       xlink:href="#linearGradient5701"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5701">
+      <stop
+         style="stop-color:#429eff;stop-opacity:1"
+         offset="0"
+         id="stop5703" />
+      <stop
+         style="stop-color:#7b009b;stop-opacity:0;"
+         offset="1"
+         id="stop5705" />
+    </linearGradient>
+    <filter
+       height="1.1018234"
+       y="-0.050911687"
+       width="1.4916466"
+       x="-0.24582335"
+       id="filter7079"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur7081"
+         stdDeviation="0.78699188"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="-41.439236"
+       x2="-272.36716"
+       y1="-41.439236"
+       x1="-244.61783"
+       id="linearGradient6979"
+       xlink:href="#linearGradient6973"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6973"
+       inkscape:collect="always">
+      <stop
+         id="stop6975"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop6977"
+         offset="1"
+         style="stop-color:#7b009b;stop-opacity:0;" />
+    </linearGradient>
+    <filter
+       height="1.4916466"
+       y="-0.24582337"
+       width="1.1018234"
+       x="-0.050911687"
+       id="filter7075"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur7077"
+         stdDeviation="0.78699188"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       y2="-67.993256"
+       x2="-281.96188"
+       y1="-41.052509"
+       x1="-281.96188"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6987"
+       xlink:href="#linearGradient5689"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5689">
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="0"
+         id="stop5691" />
+      <stop
+         style="stop-color:#7b009b;stop-opacity:0;"
+         offset="1"
+         id="stop5693" />
+    </linearGradient>
+    <filter
+       height="1.1018234"
+       y="-0.050911687"
+       width="1.4916468"
+       x="-0.24582338"
+       id="filter7071"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur7073"
+         stdDeviation="0.78699188"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       y2="-78.547897"
+       x2="-254.71599"
+       y1="-78.547897"
+       x1="-281.07074"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6989"
+       xlink:href="#linearGradient5695"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5695">
+      <stop
+         style="stop-color:#8aff17;stop-opacity:1"
+         offset="0"
+         id="stop5697" />
+      <stop
+         style="stop-color:#7b009b;stop-opacity:0;"
+         offset="1"
+         id="stop5699" />
+    </linearGradient>
+    <filter
+       height="1.4916466"
+       y="-0.24582337"
+       width="1.1018234"
+       x="-0.050911687"
+       id="filter7083"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur7085"
+         stdDeviation="0.78699188"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       height="1.8570966"
+       y="-0.42854825"
+       width="1.1345726"
+       x="-0.06728632"
+       id="filter6071-2"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur6073-6"
+         stdDeviation="1.0645658"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="-27.845135"
+       x2="-176.44347"
+       y1="-42.398266"
+       x1="-179.45006"
+       id="linearGradient5789-3"
+       xlink:href="#linearGradient5783-9"
+       inkscape:collect="always"
+       gradientTransform="translate(-244.56059,33.58355)" />
+    <linearGradient
+       id="linearGradient5783-9"
+       inkscape:collect="always">
+      <stop
+         id="stop5785-2"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1" />
+      <stop
+         id="stop5787-2"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="-29.403404"
+       x2="-191.55763"
+       y1="-31.478365"
+       x1="-203.06625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6005-6"
+       xlink:href="#linearGradient5827-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5827-7"
+       inkscape:collect="always">
+      <stop
+         id="stop5829-5"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop5831-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <filter
+       height="1.2631843"
+       y="-0.13159215"
+       width="1.2631843"
+       x="-0.13159215"
+       id="filter5867-1"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur5869-0"
+         stdDeviation="2.8767211"
+         inkscape:collect="always" />
+    </filter>
+    <radialGradient
+       gradientTransform="matrix(2.2689136,-0.7557538,0.46722378,1.4051413,361.24185,-169.10186)"
+       gradientUnits="userSpaceOnUse"
+       r="26.905991"
+       fy="-59.058826"
+       fx="-263.10712"
+       cy="-59.058826"
+       cx="-263.10712"
+       id="radialGradient5881-2"
+       xlink:href="#linearGradient5873-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5873-3"
+       inkscape:collect="always">
+      <stop
+         id="stop5875-4"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop5877-7"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="-86.628036"
+       x2="-259.48315"
+       y1="-37.043636"
+       x1="-260.28085"
+       id="linearGradient5736-6"
+       xlink:href="#linearGradient5730-8"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5730-8"
+       inkscape:collect="always">
+      <stop
+         id="stop5732-3"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1" />
+      <stop
+         id="stop5734-25"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-215.56059,33.58355)"
+       y2="-50.5"
+       x2="-194"
+       y1="-50.5"
+       x1="-208.07692"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5923-2"
+       xlink:href="#linearGradient5913-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5913-3"
+       inkscape:collect="always">
+      <stop
+         id="stop5915-3"
+         offset="0"
+         style="stop-color:#787878;stop-opacity:1;" />
+      <stop
+         id="stop5917-3"
+         offset="1"
+         style="stop-color:#787878;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1,0,0,1.7174974,-244.56059,74.45477)"
+       gradientUnits="userSpaceOnUse"
+       y2="-39.513264"
+       x2="-183.87694"
+       y1="-38.634178"
+       x1="-183.87694"
+       id="linearGradient5993-8"
+       xlink:href="#linearGradient5987-8"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5987-8"
+       inkscape:collect="always">
+      <stop
+         id="stop5989-4"
+         offset="0"
+         style="stop-color:#8ae234;stop-opacity:1;" />
+      <stop
+         id="stop5991-3"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1,0,0,1.7174974,-244.56059,74.45477)"
+       gradientUnits="userSpaceOnUse"
+       y2="-39.290829"
+       x2="-184.21419"
+       y1="-37.343178"
+       x1="-184.21419"
+       id="linearGradient6001-7"
+       xlink:href="#linearGradient5995-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5995-1"
+       inkscape:collect="always">
+      <stop
+         id="stop5997-5"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1;" />
+      <stop
+         id="stop5999-5"
+         offset="1"
+         style="stop-color:#72eb00;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="-58.743122"
+       x2="-264.87021"
+       y1="-35.930092"
+       x1="-247.54591"
+       id="linearGradient5893-1"
+       xlink:href="#linearGradient5887-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5887-2"
+       inkscape:collect="always">
+      <stop
+         id="stop5889-9"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop5891-3"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <filter
+       id="filter5903-2"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur5905-7"
+         stdDeviation="1.5089815"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       gradientTransform="translate(641.62863,33.58355)"
+       gradientUnits="userSpaceOnUse"
+       y2="-50.5"
+       x2="-194"
+       y1="-50.5"
+       x1="-208.07692"
+       id="linearGradient5919-6"
+       xlink:href="#linearGradient5913-3"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="-34.32909"
+       x2="-255.64305"
+       y1="-62.28437"
+       x1="-269.95532"
+       id="linearGradient5654-4"
+       xlink:href="#linearGradient5648-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5648-6"
+       inkscape:collect="always">
+      <stop
+         id="stop5650-6"
+         offset="0"
+         style="stop-color:#ce5c00;stop-opacity:1;" />
+      <stop
+         id="stop5652-9"
+         offset="1"
+         style="stop-color:#4d2100;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(1.3813297,0,0,1.3813297,107.2216,30.072312)"
+       gradientUnits="userSpaceOnUse"
+       r="29.214298"
+       fy="-78.86171"
+       fx="-281.17819"
+       cy="-78.86171"
+       cx="-281.17819"
+       id="radialGradient5620-6"
+       xlink:href="#linearGradient5614-4"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5614-4"
+       inkscape:collect="always">
+      <stop
+         id="stop5616-2"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop5618-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(1.4937663,0,0,1.493766,135.56448,35.312572)"
+       gradientUnits="userSpaceOnUse"
+       r="27.622614"
+       fy="-71.143715"
+       fx="-273.07968"
+       cy="-71.143715"
+       cx="-273.07968"
+       id="radialGradient5591-4"
+       xlink:href="#linearGradient5585-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5585-6"
+       inkscape:collect="always">
+      <stop
+         id="stop5587-9"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop5589-5"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="29.214298"
+       fy="-78.911339"
+       fx="-280.78116"
+       cy="-78.911339"
+       cx="-280.78116"
+       gradientTransform="matrix(1.1093921,0,0,1.1093921,30.866652,8.6133536)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5624-0"
+       xlink:href="#linearGradient5614-4"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(2.1576192,0,0,2.1576196,320.68789,86.658003)"
+       gradientUnits="userSpaceOnUse"
+       r="28.001333"
+       fy="-76.807457"
+       fx="-278.76022"
+       cy="-76.807457"
+       cx="-278.76022"
+       id="radialGradient5646-6"
+       xlink:href="#linearGradient5636-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5636-0"
+       inkscape:collect="always">
+      <stop
+         id="stop5638-8"
+         offset="0"
+         style="stop-color:#ce5c00;stop-opacity:1" />
+      <stop
+         id="stop5640-2"
+         offset="1"
+         style="stop-color:#ce5c00;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="27.622614"
+       fy="-82.264709"
+       fx="-277.8414"
+       cy="-82.264709"
+       cx="-277.8414"
+       gradientTransform="matrix(1.4937663,0,0,1.493766,135.56448,35.312572)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5681-0"
+       xlink:href="#linearGradient5585-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="-66.937424"
+       x2="-251.85565"
+       y1="-54.745949"
+       x1="-265.00021"
+       id="linearGradient5801-6"
+       xlink:href="#linearGradient5795-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5795-5"
+       inkscape:collect="always">
+      <stop
+         id="stop5797-9"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop5799-7"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.94234189,0,0,1,-255.11454,33.58355)"
+       gradientUnits="userSpaceOnUse"
+       y2="-27.740944"
+       x2="-186.73495"
+       y1="-31.514177"
+       x1="-187.10881"
+       id="linearGradient5843-4"
+       xlink:href="#linearGradient5837-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5837-6"
+       inkscape:collect="always">
+      <stop
+         id="stop5839-6"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop5841-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="28.001333"
+       fy="-83.346062"
+       fx="-287.39545"
+       cy="-83.346062"
+       cx="-287.39545"
+       gradientTransform="matrix(2.1576192,0,0,2.1576196,320.68789,86.658003)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5953-2"
+       xlink:href="#linearGradient5636-0"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="-23.3778"
+       x2="-193.64967"
+       y1="-38.305504"
+       x1="-206.31369"
+       gradientTransform="matrix(0.57152873,0,0,1,527.47423,33.58355)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6047-7"
+       xlink:href="#linearGradient5837-6"
+       inkscape:collect="always" />
+    <filter
+       height="2.0083683"
+       y="-0.50418413"
+       width="2.1625869"
+       x="-0.58129352"
+       id="filter5849"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur5851"
+         stdDeviation="9.4456698"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       height="1.24"
+       y="-0.12"
+       width="1.24"
+       x="-0.12"
+       id="filter7035"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur7037"
+         stdDeviation="2.6233063"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       height="1.7964602"
+       y="-0.39823008"
+       width="1.7964602"
+       x="-0.39823008"
+       id="filter7017"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur7019"
+         stdDeviation="8.7056624"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter3768"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur3770"
+         stdDeviation="0.52466125"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter3772"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur3774"
+         stdDeviation="0.52466128"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter3776"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur3778"
+         stdDeviation="0.52466125"
+         inkscape:collect="always" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata4914">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(28.535366,76.035367)"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1">
+    <rect
+       transform="translate(-28.535366,-76.035367)"
+       y="-3.2249322"
+       x="30.627371"
+       height="99.685638"
+       width="304.99728"
+       id="rect3758"
+       style="fill:#440050;fill-opacity:1;stroke:none" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       transform="matrix(6.1569306,0,0,6.1569306,1657.3961,335.01017)"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path3795"
+       style="fill:#4b0058;fill-opacity:1;stroke:none;filter:url(#filter3776)"
+       sodipodi:type="arc" />
+    <path
+       id="path3793"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       style="fill:#3e0048;fill-opacity:1;stroke:none;filter:url(#filter3772)"
+       transform="matrix(5.1751125,0,0,5.1751125,1398.2919,276.78756)" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       transform="matrix(4.0858175,0,0,4.0858175,1110.8243,212.19148)"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path3791"
+       style="fill:#31003a;fill-opacity:1;stroke:none;filter:url(#filter3768)"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#200026;fill-opacity:1;stroke:none"
+       id="path7335"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       transform="matrix(2.9708095,0,0,2.9708095,816.57093,146.0706)"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       sodipodi:type="arc"
+       style="fill:#af00cb;fill-opacity:1;stroke:none;filter:url(#filter7017)"
+       id="path6760"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       transform="matrix(1.6664746,0,0,1.6664746,472.35379,68.72249)" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       transform="matrix(1.2980822,0,0,1.2980822,375.13413,46.876517)"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path7021"
+       style="fill:#df13ff;fill-opacity:1;stroke:none;filter:url(#filter7035)"
+       sodipodi:type="arc" />
+    <g
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       transform="translate(573.77945,7.952687)"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1;filter:url(#filter5849)"
+       id="g7243">
+      <path
+         sodipodi:nodetypes="ccssccssc"
+         id="path7137"
+         d="m -553.17051,-28.751474 23.07421,0.02567 c 0,0 5.89999,5.954475 5.89999,5.954475 0.63134,0.631336 1.02079,1.504553 1.02079,2.472078 0,1.935049 -1.55782,3.492869 -3.49286,3.492869 l -29.96012,0 c -1.93505,0 -3.49287,-1.55782 -3.49287,-3.492869 0,-0.967525 0.38945,-1.840742 1.02079,-2.472078 0,0 5.93007,-5.980141 5.93007,-5.980141 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:220" />
+      <path
+         d="m -194.71875,-38.3125 a 0.81435323,0.81435323 0 0 0 -0.5,0.25 c 0,0 -5.8125,6.03125 -5.8125,6.03125 L -201,-32 c -0.50698,0.516344 -0.84375,1.202669 -0.84375,1.96875 0,1.565438 1.27831,2.84375 2.84375,2.84375 l 11.96875,0 c 1.56543,0 2.84375,-1.278306 2.84375,-2.84375 0,-0.775138 -0.32601,-1.482268 -0.84375,-2 a 0.81435323,0.81435323 0 0 0 -0.125,-0.125 c 0,0 -9.03125,-6.03125 -9.03125,-6.03125 a 0.81435323,0.81435323 0 0 0 -0.53125,-0.125 z"
+         id="path7139"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+         inkscape:original="M -194.625 -37.5 C -194.625 -37.5 -200.4375 -31.46875 -200.4375 -31.46875 C -200.81227 -31.093985 -201.03125 -30.595841 -201.03125 -30.03125 C -201.03125 -28.884593 -200.14666 -28 -199 -28 L -187.03125 -28 C -185.88461 -28 -185 -28.884598 -185 -30.03125 C -185 -30.595841 -185.21898 -31.093985 -185.59375 -31.46875 C -185.59375 -31.46875 -194.625 -37.5 -194.625 -37.5 z "
+         inkscape:radius="0.81427181"
+         sodipodi:type="inkscape:offset"
+         transform="translate(-357.63635,9.729715)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1;filter:url(#filter5867-1)"
+         id="path7141"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(0.42980324,0,0,-0.19537277,-427.07015,-37.561511)" />
+      <path
+         transform="matrix(0.64375722,-0.37167341,-0.37134943,-0.64319609,-393.75381,-178.50614)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path7143"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.34585381;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(-0.55980337,0.32320262,0.25819179,0.4472013,-676.32384,65.704419)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path7145"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <rect
+         style="opacity:0.3918919;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+         id="rect7147"
+         width="9.0680408"
+         height="0.99999887"
+         x="-531.70441"
+         y="-41.270287" />
+      <rect
+         transform="scale(1,-1)"
+         ry="1.4749401"
+         rx="1.4749399"
+         y="28.765366"
+         x="-543.13843"
+         height="5.066411"
+         width="2.9923346"
+         id="rect7149"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-opacity:1" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.27365565;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter5903-2)"
+         id="path7151"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(0.43982036,0,0,0.43982036,-425.60342,-17.121882)" />
+      <rect
+         transform="scale(-1,1)"
+         y="-41.270287"
+         x="551.63635"
+         height="0.99999887"
+         width="9.0680408"
+         id="rect7153"
+         style="opacity:0.3918919;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         transform="matrix(0.39949774,0,0,0.39949774,-436.24466,-19.513046)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path7155"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.50314307;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:4.80897188;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path7157"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(0.20794468,0,0,0.20794468,-486.79597,-30.872298)" />
+      <path
+         transform="matrix(0.16771563,0,0,0.16771563,-497.41251,-33.257913)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path7159"
+         style="opacity:0.96846846;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.96247339;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.77910304;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path7161"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(0.35982832,0,0,0.35982832,-446.71351,-21.865475)" />
+      <path
+         transform="matrix(0.06727433,0,0,0.06727433,-523.9192,-39.237159)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path7163"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:14.86451149;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.96846846;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+         id="path7165"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(0.05704758,0,0,0.05704758,-528.05337,-41.263577)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.96846846;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.96247339;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path7167"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(-0.16771563,0,0,-0.16771563,-585.93364,-53.149259)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.52252251;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.53654051;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path7169"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(0.28276221,0,0,0.28276221,-467.05145,-26.435558)" />
+      <path
+         transform="matrix(0.24536551,0,0,0.24536551,-476.92053,-28.653212)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path7171"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:4.07555246;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.41892862;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path7173"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(-0.7050649,0,0,0.7044495,-727.68993,-0.504149)" />
+      <rect
+         ry="1.00449"
+         rx="1.00449"
+         y="-20.258709"
+         x="-557.64362"
+         height="2.00898"
+         width="31.996775"
+         id="rect7175"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         transform="matrix(-0.28276221,0,0,-0.28276221,-616.29472,-59.971615)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path7177"
+         style="opacity:0.52252251;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.53654051;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <rect
+         transform="scale(-1,1)"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+         id="rect7179"
+         width="19.405989"
+         height="2.00898"
+         x="525.64685"
+         y="-20.258709"
+         rx="1.00449"
+         ry="1.00449" />
+    </g>
+    <g
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       transform="translate(460.68151,-15.925009)"
+       id="g7087">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect6075-0"
+         width="48"
+         height="48"
+         x="-452.50671"
+         y="-38.381157"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963" />
+      <rect
+         style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter6071-2)"
+         id="rect6053-0"
+         width="37.971432"
+         height="5.9618907"
+         x="-201.937"
+         y="-31.972912"
+         rx="3.0037909"
+         ry="2.7536142"
+         transform="matrix(0.9923944,0,0,1.0825574,-246.50776,35.509479)" />
+      <path
+         style="fill:#555753;fill-opacity:1;stroke:url(#linearGradient5789-3);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:220"
+         d="m -440.09475,-4.8976386 23.07421,0.02567 c 0,0 5.89999,5.954475 5.89999,5.954475 0.63134,0.631336 1.02079,1.504553 1.02079,2.472078 0,1.935049 -1.55782,3.492869 -3.49286,3.492869 l -29.96012,0 c -1.93505,0 -3.49287,-1.55782 -3.49287,-3.492869 0,-0.967525 0.38945,-1.840742 1.02079,-2.472078 0,0 5.93007,-5.980141 5.93007,-5.980141 z"
+         id="rect5738-4"
+         sodipodi:nodetypes="ccssccssc" />
+      <path
+         transform="translate(-244.56059,33.58355)"
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0.81427181"
+         inkscape:original="M -194.625 -37.5 C -194.625 -37.5 -200.4375 -31.46875 -200.4375 -31.46875 C -200.81227 -31.093985 -201.03125 -30.595841 -201.03125 -30.03125 C -201.03125 -28.884593 -200.14666 -28 -199 -28 L -187.03125 -28 C -185.88461 -28 -185 -28.884598 -185 -30.03125 C -185 -30.595841 -185.21898 -31.093985 -185.59375 -31.46875 C -185.59375 -31.46875 -194.625 -37.5 -194.625 -37.5 z "
+         style="fill:url(#linearGradient6005-6);fill-opacity:1;stroke:none"
+         id="path6003-6"
+         d="m -194.71875,-38.3125 a 0.81435323,0.81435323 0 0 0 -0.5,0.25 c 0,0 -5.8125,6.03125 -5.8125,6.03125 L -201,-32 c -0.50698,0.516344 -0.84375,1.202669 -0.84375,1.96875 0,1.565438 1.27831,2.84375 2.84375,2.84375 l 11.96875,0 c 1.56543,0 2.84375,-1.278306 2.84375,-2.84375 0,-0.775138 -0.32601,-1.482268 -0.84375,-2 a 0.81435323,0.81435323 0 0 0 -0.125,-0.125 c 0,0 -9.03125,-6.03125 -9.03125,-6.03125 a 0.81435323,0.81435323 0 0 0 -0.53125,-0.125 z" />
+      <path
+         transform="matrix(0.42980324,0,0,-0.19537277,-313.99439,-13.707676)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path5849-5"
+         style="fill:#080a0a;fill-opacity:1;stroke:none;filter:url(#filter5867-1)"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#radialGradient5881-2);fill-opacity:1;stroke:url(#linearGradient5736-6);stroke-width:1.34585381;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path5557-4"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(0.64375722,-0.37167341,-0.37134943,-0.64319609,-280.67805,-154.65231)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="path5871-9"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(-0.55980337,0.32320262,0.25819179,0.4472013,-563.24808,89.558254)" />
+      <rect
+         y="-17.416451"
+         x="-418.62863"
+         height="0.99999887"
+         width="9.0680408"
+         id="rect5921-0"
+         style="opacity:0.3918919;fill:url(#linearGradient5923-2);fill-opacity:1;stroke:none" />
+      <rect
+         style="fill:url(#linearGradient5993-8);fill-opacity:1;stroke:url(#linearGradient6001-7);stroke-width:1"
+         id="rect5955-1"
+         width="2.9923346"
+         height="5.066411"
+         x="-430.06265"
+         y="4.9115305"
+         rx="1.4749399"
+         ry="1.4749401"
+         transform="scale(1,-1)" />
+      <path
+         transform="matrix(0.43982036,0,0,0.43982036,-312.52766,6.7319534)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path5883-1"
+         style="fill:none;stroke:url(#linearGradient5893-1);stroke-width:2.27365565;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter5903-2)"
+         sodipodi:type="arc" />
+      <rect
+         style="opacity:0.3918919;fill:url(#linearGradient5919-6);fill-opacity:1;stroke:none"
+         id="rect5911-3"
+         width="9.0680408"
+         height="0.99999887"
+         x="438.56058"
+         y="-17.416451"
+         transform="scale(-1,1)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffb03b;fill-opacity:1;stroke:url(#linearGradient5654-4);stroke-width:2.50314307;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path5563-5"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(0.39949774,0,0,0.39949774,-323.1689,4.3407894)" />
+      <path
+         transform="matrix(0.20794468,0,0,0.20794468,-373.72021,-7.0184626)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path5561-6"
+         style="fill:#555753;fill-opacity:1;stroke:#080808;stroke-width:4.80897188;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.96846846;fill:none;stroke:url(#radialGradient5620-6);stroke-width:5.96247339;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path5565-2"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(0.16771563,0,0,0.16771563,-384.33675,-9.4040776)" />
+      <path
+         transform="matrix(0.35982832,0,0,0.35982832,-333.63775,1.9883604)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path5583-1"
+         style="fill:none;stroke:url(#radialGradient5591-4);stroke-width:2.77910304;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:0.48584906;stroke:#000000;stroke-width:14.86451149;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path5599-6"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(0.06727433,0,0,0.06727433,-410.84344,-15.383324)" />
+      <path
+         transform="matrix(0.05704758,0,0,0.05704758,-414.97761,-17.409742)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path5597-7"
+         style="opacity:0.96846846;fill:#ffffff;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(-0.16771563,0,0,-0.16771563,-472.85788,-29.295424)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path5622-3"
+         style="opacity:0.96846846;fill:none;stroke:url(#radialGradient5624-0);stroke-width:5.96247339;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.28276221,0,0,0.28276221,-353.97569,-2.5817226)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path5626-1"
+         style="opacity:0.52252251;fill:none;stroke:url(#radialGradient5646-6);stroke-width:3.53654051;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:url(#radialGradient5681-0);stroke-width:4.07555246;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path5679-0"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(0.24536551,0,0,0.24536551,-363.84477,-4.7993766)" />
+      <path
+         transform="matrix(-0.7050649,0,0,0.7044495,-614.61417,23.349686)"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         sodipodi:ry="26.233063"
+         sodipodi:rx="26.233063"
+         sodipodi:cy="-59.300812"
+         sodipodi:cx="-263.90244"
+         id="path5791-5"
+         style="fill:none;stroke:url(#linearGradient5801-6);stroke-width:1.41892862;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <rect
+         style="fill:url(#linearGradient5843-4);fill-opacity:1;stroke:none"
+         id="rect5835-8"
+         width="31.996775"
+         height="2.00898"
+         x="-444.56787"
+         y="3.5951259"
+         rx="1.00449"
+         ry="1.00449" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.52252251;fill:none;stroke:url(#radialGradient5953-2);stroke-width:3.53654051;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path5951-9"
+         sodipodi:cx="-263.90244"
+         sodipodi:cy="-59.300812"
+         sodipodi:rx="26.233063"
+         sodipodi:ry="26.233063"
+         d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+         transform="matrix(-0.28276221,0,0,-0.28276221,-503.21896,-36.11778)" />
+      <rect
+         ry="1.00449"
+         rx="1.00449"
+         y="3.5951259"
+         x="412.57111"
+         height="2.00898"
+         width="19.405989"
+         id="rect6045-0"
+         style="fill:url(#linearGradient6047-7);fill-opacity:1;stroke:none"
+         transform="scale(-1,1)" />
+    </g>
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       sodipodi:open="true"
+       sodipodi:end="5.4977871"
+       sodipodi:start="3.9269908"
+       transform="matrix(1.7613652,-0.47195637,0.47195637,1.7613652,525.38303,-50.200866)"
+       d="m -282.45201,-77.850388 c 10.24465,-10.244648 26.8545,-10.244649 37.09915,-1e-6"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path6845"
+       style="fill:none;stroke:url(#linearGradient6989);stroke-width:1.94541681;stroke-opacity:1;filter:url(#filter7083)"
+       sodipodi:type="arc" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       sodipodi:type="arc"
+       style="fill:none;stroke:url(#linearGradient6987);stroke-width:1.94541681;stroke-opacity:1;filter:url(#filter7071)"
+       id="path6981"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -282.45201,-40.751235 c -10.24465,-10.244649 -10.24465,-26.854505 0,-37.099153"
+       transform="matrix(1.7613652,-0.47195637,0.47195637,1.7613652,525.38303,-50.200866)"
+       sodipodi:start="2.3561945"
+       sodipodi:end="3.9269908"
+       sodipodi:open="true" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       sodipodi:open="true"
+       sodipodi:end="2.3561945"
+       sodipodi:start="0.78539816"
+       transform="matrix(1.7613652,-0.47195637,0.47195637,1.7613652,525.38303,-50.200866)"
+       d="m -245.35286,-40.751235 c -10.24465,10.244648 -26.8545,10.244648 -37.09915,0 0,0 0,0 0,0"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path6983"
+       style="fill:none;stroke:url(#linearGradient6979);stroke-width:1.94541681;stroke-opacity:1;filter:url(#filter7075)"
+       sodipodi:type="arc" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       sodipodi:type="arc"
+       style="fill:none;stroke:url(#linearGradient6991);stroke-width:1.94541681;stroke-opacity:1;filter:url(#filter7079)"
+       id="path6985"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -245.35286,-77.850389 c 10.24465,10.244648 10.24465,26.854504 0,37.099153 0,0 0,10e-7 0,10e-7"
+       transform="matrix(1.7613652,-0.47195637,0.47195637,1.7613652,525.38303,-50.200866)"
+       sodipodi:start="5.4977871"
+       sodipodi:end="7.0685835"
+       sodipodi:open="true" />
+    <g
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       transform="matrix(0.96592583,-0.25881905,0.25881905,0.96592583,491.00495,-75.539049)"
+       id="g6764">
+      <path
+         sodipodi:type="arc"
+         style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-6)"
+         id="path4150-5"
+         sodipodi:cx="6.5"
+         sodipodi:cy="7.5"
+         sodipodi:rx="4.5"
+         sodipodi:ry="4.5"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         transform="matrix(1.0775549,-0.5414093,1.0779516,0.54160869,-500.46314,-100.87344)"
+         inkscape:export-filename="/home/hbons/Desktop/path3595.png"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/path3595.png"
+         transform="matrix(1.649612,-1.649612,1.6502196,1.6502196,-509.53302,-109.43247)"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.5"
+         sodipodi:cy="7.5"
+         sodipodi:cx="6.5"
+         id="path3928-0"
+         style="fill:#73d216;fill-opacity:1;stroke:url(#linearGradient6771);stroke-width:0.42857152;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/path3595.png"
+         sodipodi:type="arc"
+         style="fill:url(#radialGradient6773);fill-opacity:1;stroke:none"
+         id="path3930-8"
+         sodipodi:cx="6.5"
+         sodipodi:cy="7.5"
+         sodipodi:rx="4.5"
+         sodipodi:ry="4.5"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         transform="matrix(-1.579109,-1.579109,-1.5854864,1.5854864,-464.26103,-109.34926)" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         transform="matrix(1.4244979,1.428323,1.4302509,-1.4340914,-506.41976,-106.26032)"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.5"
+         sodipodi:cy="7.5"
+         sodipodi:cx="6.5"
+         id="path3936-7"
+         style="fill:url(#radialGradient6775);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.4701004;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path3970-1"
+         sodipodi:cx="6.5"
+         sodipodi:cy="7.5"
+         sodipodi:rx="4.5"
+         sodipodi:ry="4.5"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         transform="matrix(1.5011331,1.5011331,1.5071955,-1.5071955,-507.47773,-106.17572)"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963" />
+    </g>
+    <g
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       transform="matrix(0.96592583,-0.25881905,0.25881905,0.96592583,531.77934,-86.959048)"
+       id="g6777">
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/path3595.png"
+         transform="matrix(1.0775549,-0.5414093,1.0779516,0.54160869,-476.54695,-100.87344)"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.5"
+         sodipodi:cy="7.5"
+         sodipodi:cx="6.5"
+         id="path4198-1"
+         style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-6)"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/rect3809.png"
+         sodipodi:type="arc"
+         style="fill:#729fcf;fill-opacity:1;stroke:url(#linearGradient3978-2);stroke-width:0.42857152;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path3932-5"
+         sodipodi:cx="6.5"
+         sodipodi:cy="7.5"
+         sodipodi:rx="4.5"
+         sodipodi:ry="4.5"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         transform="matrix(1.649612,-1.649612,1.6502196,1.6502196,-485.53839,-109.39554)" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/rect3809.png"
+         transform="matrix(-1.5756231,-1.5756231,-1.5819864,1.5819864,-440.31531,-109.30874)"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.5"
+         sodipodi:cy="7.5"
+         sodipodi:cx="6.5"
+         id="path3934-4"
+         style="fill:url(#radialGradient3980-6);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/rect3809.png"
+         sodipodi:type="arc"
+         style="fill:url(#radialGradient3998-1);fill-opacity:1;stroke:none"
+         id="path3938-5"
+         sodipodi:cx="6.5"
+         sodipodi:cy="7.5"
+         sodipodi:rx="4.5"
+         sodipodi:ry="4.5"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         transform="matrix(1.2586376,1.252928,1.2637207,-1.257988,-480.10734,-106.49032)" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/rect3809.png"
+         transform="matrix(1.1859334,-1.1859334,1.1863702,1.1863702,-479.05914,-108.91704)"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.5"
+         sodipodi:cy="7.5"
+         sodipodi:cx="6.5"
+         id="path3954-4"
+         style="fill:#ffffff;fill-opacity:1;stroke:#5e94cd;stroke-width:0.5961352;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.47058824;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/rect3809.png"
+         transform="matrix(0.90652304,0,0,0.8115515,-491.69091,-119.05223)"
+         d="m 33.384909,13.925035 c 0,0.686989 -0.498675,1.243903 -1.113821,1.243903 -0.615147,0 -1.113822,-0.556914 -1.113822,-1.243903 0,-0.686988 0.498675,-1.243902 1.113822,-1.243902 0.615146,0 1.113821,0.556914 1.113821,1.243902 z"
+         sodipodi:ry="1.2439024"
+         sodipodi:rx="1.1138211"
+         sodipodi:cy="13.925035"
+         sodipodi:cx="32.271088"
+         id="path3956-1"
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <rect
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/rect3809.png"
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="rect3960-1"
+         width="1.0000036"
+         height="0.99999994"
+         x="-462.4614"
+         y="-108.76189" />
+      <rect
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         y="-110.76325"
+         x="-460.46683"
+         height="0.99999988"
+         width="0.99999881"
+         id="rect3968-8"
+         style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none" />
+      <rect
+         y="-109.76189"
+         x="-461.4614"
+         height="0.99999994"
+         width="1.0000036"
+         id="rect4000-9"
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         inkscape:export-filename="/home/hbons/Desktop/rect3809.png"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963" />
+      <rect
+         style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none"
+         id="rect4004-9"
+         width="0.99999881"
+         height="0.99999988"
+         x="465.4614"
+         y="-111.76189"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963"
+         transform="scale(-1,1)" />
+      <rect
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/rect3809.png"
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="rect4006-5"
+         width="1.0000036"
+         height="0.99999994"
+         x="463.4614"
+         y="-109.76189"
+         transform="scale(-1,1)" />
+      <rect
+         y="-110.76189"
+         x="464.4614"
+         height="0.99999994"
+         width="1.0000036"
+         id="rect4008-5"
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         inkscape:export-filename="/home/hbons/Desktop/rect3809.png"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963"
+         transform="scale(-1,1)" />
+      <rect
+         y="-108.76189"
+         x="-463.4614"
+         height="0.99999994"
+         width="1.0000036"
+         id="rect4010-3"
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         inkscape:export-filename="/home/hbons/Desktop/rect3809.png"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963" />
+      <rect
+         style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+         id="rect4004-6-48"
+         width="0.99999881"
+         height="0.99999988"
+         x="463.4614"
+         y="-110.76189"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963"
+         transform="scale(-1,1)" />
+      <rect
+         style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+         id="rect4004-6-9-2"
+         width="0.99999881"
+         height="0.99999988"
+         x="464.4614"
+         y="-109.76189"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963"
+         transform="scale(-1,1)" />
+      <rect
+         style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+         id="rect4004-6-4-3"
+         width="0.99999881"
+         height="0.99999988"
+         x="463.4614"
+         y="-108.76189"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963"
+         transform="scale(-1,1)" />
+      <rect
+         style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+         id="rect4004-6-0-6"
+         width="0.99999881"
+         height="0.99999988"
+         x="462.4614"
+         y="-109.76189"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963"
+         transform="scale(-1,1)" />
+      <rect
+         style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+         id="rect4004-6-3-0"
+         width="0.99999881"
+         height="0.99999988"
+         x="464.4614"
+         y="-111.76189"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963"
+         transform="scale(-1,1)" />
+      <rect
+         style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+         id="rect4004-6-7-3"
+         width="0.99999881"
+         height="0.99999988"
+         x="465.4614"
+         y="-110.76189"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963"
+         transform="scale(-1,1)" />
+      <rect
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         y="-108.76189"
+         x="-461.4614"
+         height="0.99999988"
+         width="0.99999881"
+         id="rect4096-7"
+         style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none" />
+      <rect
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         y="-109.76189"
+         x="-462.4614"
+         height="0.99999988"
+         width="0.99999881"
+         id="rect4098-8"
+         style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none" />
+      <rect
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         y="-110.76325"
+         x="-461.46683"
+         height="0.99999988"
+         width="0.99999881"
+         id="rect4100-4"
+         style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none" />
+      <rect
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         y="-109.76325"
+         x="-460.46683"
+         height="0.99999988"
+         width="0.99999881"
+         id="rect4102-2"
+         style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/g6810.png"
+       transform="matrix(0.96592583,-0.25881905,0.25881905,0.96592583,461.13338,0.41510692)"
+       id="g6802">
+      <path
+         sodipodi:type="arc"
+         style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-6)"
+         id="path4196-5"
+         sodipodi:cx="6.5"
+         sodipodi:cy="7.5"
+         sodipodi:rx="4.5"
+         sodipodi:ry="4.5"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         transform="matrix(1.0775549,-0.5414093,1.0779516,0.54160869,-452.51443,-100.87344)"
+         inkscape:export-filename="/home/hbons/Desktop/path3595.png"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/rect3664.png"
+         sodipodi:type="arc"
+         style="fill:#ef2929;fill-opacity:1;stroke:url(#linearGradient6817);stroke-width:0.42857152;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path3940-1"
+         sodipodi:cx="6.5"
+         sodipodi:cy="7.5"
+         sodipodi:rx="4.5"
+         sodipodi:ry="4.5"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         transform="matrix(1.649612,-1.649612,1.6502196,1.6502196,-461.54714,-109.44296)" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/rect3664.png"
+         transform="matrix(-1.5758699,-1.5758699,-1.5822342,1.5822342,-416.3206,-109.35641)"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.5"
+         sodipodi:cy="7.5"
+         sodipodi:cx="6.5"
+         id="path3942-5"
+         style="fill:url(#radialGradient6819);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/rect3664.png"
+         sodipodi:type="arc"
+         style="fill:url(#radialGradient6821);fill-opacity:1;stroke:none"
+         id="path3944-4"
+         sodipodi:cx="6.5"
+         sodipodi:cy="7.5"
+         sodipodi:rx="4.5"
+         sodipodi:ry="4.5"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         transform="matrix(1.5538791,1.5538791,1.5601547,-1.5601547,-460.23189,-106.13186)" />
+      <rect
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         ry="1.9409533"
+         rx="1.9409533"
+         y="-110.22289"
+         x="-446.94452"
+         height="4.9422016"
+         width="16.961893"
+         id="rect3952-1"
+         style="fill:#ffffff;fill-opacity:1;stroke:#cc0000;stroke-width:0.99999994;stroke-opacity:0.47029706" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         transform="matrix(1.490698,1.4864482,1.4967183,-1.4924513,-459.39302,-106.29889)"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.5"
+         sodipodi:cy="7.5"
+         sodipodi:cx="6.5"
+         id="path3972-8"
+         style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.47406736;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       transform="translate(489.21077,98.986117)"
+       id="g6810">
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-filename="/home/hbons/Desktop/path3595.png"
+         transform="matrix(1.0775549,-0.5414093,1.0779516,0.54160869,-428.44939,-100.87344)"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.5"
+         sodipodi:cy="7.5"
+         sodipodi:cx="6.5"
+         id="path4174-2"
+         style="opacity:0.5;fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-6)"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#a0bedf;fill-opacity:1;stroke:url(#linearGradient6823);stroke-width:0.42857152;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4176-0"
+         sodipodi:cx="6.5"
+         sodipodi:cy="7.5"
+         sodipodi:rx="4.5"
+         sodipodi:ry="4.5"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         transform="matrix(1.649612,-1.649612,1.6502196,1.6502196,-437.51927,-109.43247)"
+         inkscape:export-filename="/home/hbons/Desktop/path3595.png"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963" />
+      <path
+         transform="matrix(-1.579109,-1.579109,-1.5854864,1.5854864,-392.24728,-109.34926)"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.5"
+         sodipodi:cy="7.5"
+         sodipodi:cx="6.5"
+         id="path4178-2"
+         style="fill:url(#radialGradient6825);fill-opacity:1;stroke:none"
+         sodipodi:type="arc"
+         inkscape:export-filename="/home/hbons/Desktop/path3595.png"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#radialGradient6827);fill-opacity:1;stroke:none"
+         id="path4180-1"
+         sodipodi:cx="6.5"
+         sodipodi:cy="7.5"
+         sodipodi:rx="4.5"
+         sodipodi:ry="4.5"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         transform="matrix(1.4244979,1.428323,1.4302509,-1.4340914,-434.40601,-106.26032)"
+         inkscape:export-xdpi="90.108963"
+         inkscape:export-ydpi="90.108963" />
+      <path
+         inkscape:export-ydpi="90.108963"
+         inkscape:export-xdpi="90.108963"
+         transform="matrix(1.5011331,1.5011331,1.5071955,-1.5071955,-435.46398,-106.17572)"
+         d="M 11,7.5 C 11,9.9852814 8.9852814,12 6.5,12 4.0147186,12 2,9.9852814 2,7.5 2,5.0147186 4.0147186,3 6.5,3 8.9852814,3 11,5.0147186 11,7.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.5"
+         sodipodi:cy="7.5"
+         sodipodi:cx="6.5"
+         id="path4182-5"
+         style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.4701004;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <rect
+       ry="0.50398123"
+       rx="0.50398123"
+       y="-143.70517"
+       x="-61.583187"
+       height="67.044205"
+       width="378.14563"
+       id="rect2980"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3754"
+       width="378.14563"
+       height="67.044205"
+       x="-61.583187"
+       y="15.320398"
+       rx="0.50398123"
+       ry="0.50398123" />
+    <rect
+       transform="matrix(0,-1,1,0,0,0)"
+       ry="0.50398123"
+       rx="0.50398123"
+       y="-96.178406"
+       x="-239.70386"
+       height="67.044205"
+       width="378.14563"
+       id="rect3756"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <image
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGUAAAArCAYAAABhLkbTAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A
+/wD/oL2nkwAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9kECwsmBv2MD3YAABxRSURBVHja
+rZt7dBxXnec/t6pbpZKlFq0YLNkosUwCnpg42CsybhkWSFheBzDJLnM2ZCcwSZPMwJGTyRyWxxJ2
+JwMzO4cBxTbYQn4EQyIvYbBDzPI4GELGWHYixw8Fk4E4lkPiWHbsyJJb1Wp1d333j3u7JSWy8/DW
+OT/drqpb997f6/v73aqf0P2qkbpQN0gRegSkhfa3Ftrr3SBuRPwCnXS/u0FXgtQ15bkupJ2oFdSd
+s303ymg79neX0HahhJtLO5F+gPRvk3PtAmk/ugNLuzBSZPSofK1SQte5cdhpn9ksxDJ0CHQDqDtC
+t4HeAWKVneMRLG2UsXw4qsx5q7t/0j3Pjah7zK3vx3Z9J0E7ZNtfYnm8CsT9du4rQTRNjl2RWzfo
+fdg+h0B8dZKmXj/k+r0P0ARIx5EOW0GxzDET2Wv7nZL+yi2k1U2kLkSE+DzS56yQaEK61z0bGTvm
+YaN1OYSP7gSty6H1MvpXkL6LumWknUY6nFCvZmkCo9VKSl2e1OVpAqNezZLuNepVjVbLMrBdVnmP
+VIymaVI5tzoGuyNLrVjhnnSCv83xcRtWqbe5MQ5NESTvRnzZjnmrM7IKnXRzENm+FbmwyJ7fWTGI
+hU5Ji5x8Frkxv2qVWX3u/1pqBXWPgf4naIuM9LRV0CZZQd/qGFgEWjdmz9VlhVA55xm0WUY/l9FJ
+kD7kLPB3Rg8o0FUY3a9ZOipfR+U5ZaHDWCVvki/tNJrA6A6MNOJHPaqTjvhSfEs8rndJXUY9Y+io
+PHUroV3OQtflrMfRZNejhVa43O8s3M3FIvRRJukG5+k3YAW0XtYruscs363OCB8BfdzJQB+yBtqN
+ayNrFDcwee2XTslXuWs3VOZqQv8oSzRZL6/MwSpHzmudEm3HLfK02bnmA3Iw9BhVWPtnTVrEx53V
+bJbRRhntkrHCudEK6hDoUSXVjfUArvV0EiPda0STUTfoYRlNgFXEQiOt8KQuIzpMNKQwltZJkhTn
+VdL1UpepKkddiMvQfbJWri60nUnYvNKtc43sXNxvacIJTDtRt+x5tzu/T5OQswgL09vd/XU5J7Tv
+GgtX70b3yegBGX1fRtzvhN+G1spY2f3YKWfMykP32vZIZc6F6MdO9voBetgp9Dbr0RZndQfaJbTR
+KWaTswI9Zs9vYNL1+erktcQUt6cfPSrPKmOFbTerVg8pKS001lNGfGnEt8Jd4UVbFWrtCaJ+JaN+
++dLRIJZ+oulHLMVf1ABG2uNJI1aha89ahTwgJ/ivWmPRTvR9WS/pngK16nK4f6NVCjfa824HQ5UY
+dxL0pONpvXzxbqTTRtpvLDTfizapRtqJjspI3zW600HlogocLXMwdaM7v9964VXYlmUOytosfZTJ
+9fBu0J1CRx0TutcuSF2I7zlPiRDvcB6CZWhTRRAuTtwvY92v23pEhDephC4TbVUYbVUodZmoX8mo
+R8moX0lplSet8qJ+ebvV6Uvq1TmOssobhzSSkPZ46hlDm+VZIXUh3eDiQeS8puLpO6fTrUw/3+Jg
+txuUcxZ9HYj/gDQH6Z0uRnYZqcvy9H7ZWPewasUqiwZHZbReRhtkbKx71M5/K3Y9lXg8RfDV2HzV
+FMj7nKVJTOzVJGkn0u+QnrPtu50b/zPW3dblrDIOuQxJkQ26v5YNzBZmjEqaI8Uflkqfkcr/SRqr
+i/rlZdVpKsTG0CcIk8M60CDFh3SeI1b8L7t1wI/6FUiH7VyV+FGJMzphlfOkE/L9TjDbZfG7gvV3
+ukxwu6zB3cEk/HbLeeJ+z0Jsly/FN0nxz1XWQ/G4PiUd9pTCxkPda6R3WhjUD+wa1OUU+ugUI7ll
+ilF0TXrzL10i0m0TL6eE39nBuNHCwSGoZjmPyjLcip30KoeJ3ZrE5IrFPiS0zcLMrh4lJf32RUJd
+TRAm52UIyFxeS7OjYEEdQVh3TM/OlfT0+RRTLut2fQQjdZlos+qlLlM1pG7ZjI4bbbyp0Loc0h9t
+HNQPrEFVfusHLgP9rkUMIuv5m2WUsvOoqM/NsJT/YuH0sPUgmqxhLnKWf7+bF995341uK3DvZCio
+ZHL6nMtkv4xO4ix/lWPmPqEfaBKLezTd3bkMbcO2m2Qn6JVVxj+BVo8ifcIMaSRR0PhcGw+mHccI
+FtQxP6xj/oKAIPQJQo90q5+kLUE6DM9o+O2xVDqPu5SLKr8/uku+g8JaK0zfrmezHOxEk3svRdZo
+NspUz6ux5J2O9k8al7qQRky01cJsLJ15yTLK+p6Nczt8DWC0bUrs0gorr1556hb6exmtlmdjr0uI
+uuTb0LAK/aOM+EV1TzVpId1u07bZCVv3Tg+S6kJ/6TKnv3T5/R24eDSCdARpgCGNeFl1mglFl80A
+P0+QDhscJUmHPsHlvm3n+gRhDUHYWFTpCzr/8fSwnm2oesxW1URb5EldKGIya7yqGgcDaadRr5J6
+WN5LEgB1WW9ZLaItMlGPTNQrTwOYaEz154hx3yQT+tIsY5XTZaKt8l36bsfrrcwl38LhTmsAR2V0
+n4wOVSD3sE27nfdYq+kV+lFFMb+yAx51Qu8ZQ3reeohGbOtS02h7JX3eQ9QvpFVk1cniDMk/6Q8p
+SYUXB2uCsJEgbEySSiRJ+UlSFYX4pObUQHMTC8PGWOWHzh9fyuvIhH5Wnb4GMFGvEtIRu2HtGaus
+18a3njEsFNnML9qs+up1HUZ63kQ903gx0irDxtAjEyalePuLp49UXE5zWEsmTGYzeC7W+VGvalxi
+YDfOVkkm6lGgzUraeztNVUlHXZioKOcGXPrbLaJ7hPQzZ/WHiXpkoq3ypD12grUnkAbMVOsa6HVW
+1S926wBsDCETesxfUEe6taGk4mdixSecl+zarh0NpOY0EcxtpDmsoTn0G2lOOIUkCObWEISN0Nx0
+SieueBlviSNNLCEIk1l1mt064Ek7jOgg6pUX9cqTBvyBXgXVfY6Dm2nXbEaYiHqcZ9wlk1UnZDo9
+gjDJ/LBuRKcujaXH3bwTEyp+iea5jaTDBoKwjuawliBMZjOduLX40g4/6lfSym2P3YetHrUxt5LB
+qctlkDsn9z46jJH2w2/eBisM+ftkOALhyruV33u7HwYm3nPFAQ82AjezjOVxfm/OhO31yu/NmZXt
+K2OADR0bAGAf0NLiM1KsAyAqe7TB7id+WpMxHygz9QhGCgSpIhBTGBXgUWisJaUkowaAWMd6Dd77
+OccRww/9tjd9iuPHiyxdSpalRQD6MKs7VrOy76AHG+PVE6vnhUmuBWpk8CRygocmHuOPB9sPmo0d
+G8v0YTZ04MEG5h3OJ475lxtqxz04DiP4/MvS8RdueuDNJ4meX1i7sECQ8in4ZdLA8HCR7NLigW9t
+Cr/Ft8Yq8siSLdOHWb13teFnWKaa8cLSySLvmGPYMybeV+cxPxHDAuBDwIJKTLCWH/UrOaSRRNQv
+T5plshk8o05/RKeaTitqe1LP1hCESYIwuYj2BJkwQXPo0xyaFM00XQwEoSEd1k2odEtJ5c1lxT+L
+pcdi6ZikiXuq3rJgNjQ3TaNU2ATNTQ1von5M0TVllXfoZTDsOQ1dRrDAWquzWDLLk2TC5At64WJJ
+a14Mo1Ni3LNFFf8uq87EZDboxkm3NiRpazil4SsUa1zS07Hi/ljln5RV2jSu/LXQbL0+uLzxtIan
+xNA4L8UnFOuIFB+UlcE6qfz5kkrXT2iiQzpVG1U9dqGRfmUq2wuLY2tPYF17lZfN4OWUe2Ms/S8p
+HlSs8lQhxNLhssrbcipcbYWwoI506yyXQUEw1xCENbHi38wkiLu1rZ5gQROpOY2kwteRmtNUoX/V
+7tSEil+KFQ/pFR4llb6eJNVAutVCSRDWkV7SUNDEB2Jp5JWNEh8a1vhbKmMkaWtIkmqgOWw8peEr
+ZlZo6dvWuMIGgrmzntNwm17NYRX2gahfyWirQvWMVd49ekh7kHaY3Trgkwn9oko3SXHplY2rXw5p
+aJ7F1rl1BHM9Um/2SM1Jxop/PbNSds2CcJbdmyxIESyYTbBg9kmdfesrF+K0VfzeJg9zGyuCLGji
+xmnG9Ip4iZ85pmfnunjXSGpOEzQ3PXcOpZRUXgfNjRDWQXPdoJ6e9+rXrlJRxb+QdvjSHk/bMHpY
+xoPd7GG2yXRkKPflVibwN4DxeQWHgffO4Q0/X/vC2jIMJwnKSUZHPRgFGDlnKAhaShSiEoXjRQrH
+4yfGtydmM+vnBlK86sP82YHxPzRQiP1iKkz++/HHghoS38LgvapRMG9sYd52AIYafccDCWLN1F/E
+cFEcc1FDGSgnmFV89WvH95W4F96zEHaLj3XBfxzFy++93WzseBulvrPtHt43rKxfFTtv/Ws++XXq
+G5IwKoIYCg0YqJmpd4lnRH1OBHUiaIGgxXsLf7bWYObxGo+38PoMQZ1HYZb3Ji77ApiG1zKOgaWF
+8SPXEMSe0wnnYAMfP+a0V+L0WXFRrBJj5dc0pyEJ5h6A/Jbba+B5vJVPGrOxr9P4+N969QqpWtmn
+dpz6zjijjZq0JNpm6vsCgfWW+pyoz+mx8Z94YD7KBRxWobmKsJZdyFhJgv8BwEUNHhfFXonInF+P
+jXDaI8Gsc/XLFSneHRN/Q2irmFT3lGHeDiv/lsso5be9yfM2rAlNxNevAdovgJe6dq5ZzkUx1AM1
+sQHmzNTxDRCTw8owd5bFXHqTAf9CBOnjt1AT+tTnAHP5hSmYJb3j3xknVw+5ehLUaWYMjiGIDYFr
+KfgzI0N8d03twq/5tZf9b292863P8PxS4OmXwqH3XkCMIw/waki8hws8EiSTVWFPeDKY2nNvLypH
+g3wS11/o3IISNfmyE+qZCxzOfJgPTPG2ifP1rfCimLKZuUPpJBXB5OCS2mUjRUrfnaHrm1euXBmH
+bzWxB20+eO+6UMEYSE4TlKYK/8VdkSMDSl7o3DHx09ayISZ+/kLHS2IuqQgyz1j+PF2ryUSOUmHm
+tWl00nbsERH9+qVC0fyb+25O7rnigPHcyI0XrhQvmH5BE+dRSpUEYxc6d4HyU5WYAvoDF36UKj+O
+8NwLr+SBh3l47ByudNaNN1EZ9wyjMxiO8QcZ1LKPvk0eg4MIU75QLopMnKEeKmQwEzNzWzCuj6xD
+zRT4XhV0DTfe2b6LghdT8OICxV9cOByauMLIe/7zJwrndpJ64/rpM43/5DMDOsSQg/oi1JdsCyW8
+4gx8jH6i4xPKf0XGow0M5C+Qj2gJy3Zw2hOnPTmjnZGZubQaTp+t9IkLjH/nwqCrvIWvvlAH1t1/
+wyMPgi4oroyRP0x9Dupz8HCuDoheKsSyR33Or/ZLnhFGoy81wvE89bm4SoBh/CUGa8TpSXUPQpl4
+3wVi+vePNJ4KSY1AagSCs0ZQnBlqnrFoWfCgcFazamf/ArT/tVm0Tj7N4F0EXpnAK4+kUnyo9oNM
+UP7iBXhe+fUHWvaSA06fjTl9NhYaniENn5JFUkHPmY0hh1wfEYyVh2dQCkaDAAfbD3qeXUip7wKY
+eP5hHv3vQIlkC3ZTnvI4h1Jgtg14KUGACFr9M0S3zWSNLzNzOSL/8YXmfRF1w3GyEMT4zxSTheY4
+qL1kS5Hil6YG11fOT7yfd6UaCM7GXNTgwq15YcYIXzhbonBWFM5C4azRDEpJkMDdjymcjYHY52xh
+Bo9/CODKvVfiQRsnGXv4tTGgE6c58/6rzbUJRk1McawSIgxoRviaDZBKGZfWGwq5crr2zQOnidr1
+yoP0UI6J99Y3LdxXnD+UJyJXDEwOZkdwugjENS3z10aMvqNM/JNXw1tM/H/srxSNp73Y8Tn80n7G
+I5USqRSkUtbAzgWbqRSkWi0VRkv7ODL+4i5l4l+QzTqFDw+W57XNOxWjX72a4Fqi1PU4h5e+vnbu
+EYKRMsFImYIvSEHB9wymMDN8FTwKuQR1wyQLzeVkIXeWOj8/u2nhn37Jb5fEaPO5NwcqC217mpOL
+G9ouf5TgVJ5xSqTblCpEIjpVLqaLBRiOkkO58qzWt/97orb+vx3m2IIJil8UPP4yjBV+y1ObrHc0
+MhJ4ZZpHysDwzFtmP6bOF3W+II1mhK+E3VfW5URdTpCOv8bXii+S5w8/0xE8lr2JeLR91EBmeZL5
+C+oKGv/Iy73SLCv+ZU75j/Ply2vd6/bXEYS1pOb4BHOhOTSkQ490a/1ZjSyW9G+KNTx1jF9rdwPp
+1nqC0BCEECyA+SFNF2OYv6CWIKz7tXanCpq4sax4vaVy94RKt4zoVJP93nF5LUHoz8sAQUilpTm0
+bRBCOvRJh3Wk3lz9XlNSecPLvCn+nv0+Eto3zumwgXRrw7gKfxUrflCK90vxYKx4V0ETt5JurRR/
++ARhzYSKn4ylh6a+7c5r/J3uG5RPujXB/LCGIKyT1C9pIpbuH9LIRdlMJ7YgscsYMqHPIEnaKMd9
+Y38wmLZzGdIEpTuC2fO+T9HY1K8wOg7pAunhcnLI7gGLlzUa/nQqoAWPkdk+0anyjvEd3mw8r4km
+Lu54W55B/Hnl/Pix0RDSbfYt2SDAoIG2Ghg0DFMmjT+vnNexSy+HQWKGB8ssXepWs29K+lm9BoOQ
+GmpkNJ00BGWfqJyiMFo+M356WSPhz8/j/aN/4uTi+S1LzlDw7djRKbtVaIHU0UaNzq8zjB+Pp6EO
+xI4Bj8rrojbKB/oOhE3AJSwZU4tgmJg0HrT589p+b44Rxt/u281nOzJxti8br+dSwwO3wRFki+E+
+g9dUyidOlorv9Uk8eL6FP8HBtkXmAw4rNU7BzycLORXTRYhaoOW4gRYYP56ktiUBx6GFIoNtPm2D
+ZQbbfIbTJdhXqspyqlBZati3zywqLOJQ5hDsQyxFsNTAPmXJsoENHOzMs+b6Tjq3rGHN9Z2Tn6QH
+gVpgZLaBU4aIhnvGt8ef5OonzvcmeoLiJ4Kmxp8QUQLKqcKi8mhzFNM2KGgz7Bu0cL+0ujs3k7Fq
+KYvZZQYIVVXMvipbcsoDMIvJ+0A8QBiTzZJdvJrVLncIAxNzxR5jyHT68w6vSRzzQ0NhdjJ+4en7
+DOYj51p8GW1INLZ8HkahwDik89T5dvIoaWg5DscR6TYzr+33CcB73e728qHMIbmkJc6SjzfQqWwf
+0LGG9X2z+DQ3QQdQyQO3rIHrO2Hvata31/NpbmI9m/h0Rw76VrJ6r2UlbK8nvzfHypUr2cAG2LcU
+OA4XNxpOnUoSlcPy+DPf9PBuOg9P3080XfJZomSRFiYYr41pG3RStbuFbF8WOtYAncAa6OucPkjH
+1JM1ptINOrUBTNY+Izpgfd8mAPJ7c/AzCD9mYHEHrN0Gj8wxJqtOf0PHPg+GfY4PescGj82eS/oJ
+oO5cOeOwGV3SVNv8NKRj0kTUDsfQYu+PH4c2NIUhDzDZzry4vlMAq/euFsDPfgYf/CBOuM5ePnob
+ex48wDKW20VPvQec4GJSez/G/v2wZIm9l9+7EsAqZt8GSGOoJUgeTSaHNdQx6zywBTy1jYOLr6u9
+LiZ9vDBt7dks2ZvgZm4G4Ll/uJLr7lzNHg6zjEunDbJ170rmth9kGQ9X11NZ+x7e5VBtkEH392qu
+tmCzNwVLMKH/iPLb/twjiU+2X97iDMnFHkmaw1rmh3V5TXz8ZQLiI1zW2mA/wbbVMT80NDvKhJBZ
+DpmQrDphY8hudbJbB9BHQF/Atm8EXQvSKiolSlG/iO4SUb/Y1WNbDeBqynZM+z21jfpFtl92vkwI
+mTBBsKBuh3bVx4qfOc/n7NKYcm+33+YX+O5ZsplOsm7cH90lhjRi1zNlTRpw66/QGbe2M/a3tGNq
+Qcq035XzqFcm2ipjP8kfsaVdP5VHVtsSWXWaxRmnFFsI0VBU6a7zKWZChdtovrxS+1TrKlpsRmXr
+n9itA67tnC7gSkvH5AJ7nJB73X13Lu1AdODquSapUjw3gC28+whke7FKsdlZXVnl9S9TdPFF0q0N
+zF9ea9cdku2F7NT19oiBXlXq3KxQe6tCnaQpwq7SN7BUKVZce8LVz+2Z8tv1/aQr++0Zs5YqzbJK
+CZYnydhiay5rbSirvO08PJ09pucuJt3akKI5JLPcq3pIprNaMblbB6reUF20U0pFsJV7VeqtMDfg
+yBYDRndNve4s8FprtRUPIxMaMmFygbYlYun350nwf0jGGuG81+NNXXfFCwd6J6smK94RbXVr3qpp
+VPWEF11/0T0jHXFtF1GPLb6LtstEm2Win8qoZ8wK52AvZG2unyAIk00XE5Jubciqs6as8k/OA2M/
+sgXbC+rmvR6ziHbYOOklUb/o1baqAqpKuMsKfqBX1pLWnpj0Cuf2L7a6qrKcpdnatC7rXQ5WHFwa
+MmGS5rD2mF6YK+noDOViD2XVmbDVjZfXVGCrYkjToKdXk0pRF9JRa9WV+1P4mqQjVaoooKqET0K0
+3SnHKaVSahttltE2mBmPqzC2pIGNYbKk0pYZ8PjJkzq7kPkL6tzmyCzO4JRivWNIIwxVlNJvlRCV
+nDIcHNn/aLLwpGuxrfZUYWE6s5Xy2WrJKQWnfA3YeJXNdEJmeaJSVDekE5fEig9OWfq+Ae2qd5X/
+dWRCj8xysplOq5CByhq6+MMqTUIMD05vX0IrLH0Sp7QpvyvnWuFqnFe4GubKeZc9d/XaZkgjDDII
+bCSzaQNsWGoYHE7CoEctNhuYvZBS395v+nhZ935oy+M8+tdva/oLpYaLpdFMk4Ai+9Jlli5FfZvg
+o2PkvyJG2x/gqb0fo6P9bvJ7bydsvwHMUfI9u+jLwzUlA3cMuFzlpEsVr4EnZ/5AFl7/CKxrs/uD
+v+kFrgAOsXXvSq67y/DpBzvZ0LHPwD6fQRLU4v1icKOu4b9uMihxhMdvuqz2ujLpWrcZpZQlq5v7
+bubKvVfCfvdNqBbCa++GdZ+Avxkjv63Nnr+W41N/O/XbBfkOmfDDT4k1b4CNKThw2N6771K4YQVT
+sL+zmi3x2dCQWR5MDfwEYV1Jpb8vaPw6W4Vor6VoDl2pqF/JuKJ+8SNH33bQEvVMzUymwNMqZynX
+Mi2bmhZT3HMDvTKiw3rJNzBV7xqAXT2yWZ1mVSr/zbwM1mPmW4hlvi1vra45WJ7IZiZlMKSR6XGN
+Bx00Hal6Q7TdFrVPg9YeV+g+lbbPcG3acyssvG2XkVa4/+2xGZiRdtC3/hqWLIGVACsNj/45DDwS
+GvbhkyZBbYvH8eNQZ1+b2FcPLTB+PKYNLSZfHli6PF707UKcUYbVe1cTttezdn2O9KdHuWRviiVA
+2G7feT7+D9dwaTOEtywn37+LsH01J7jYmdLVNnef4Tj8JIbD1PBBuKL98fLjW64oX/FWI56C/Bsn
+XwSvXLmSR1nDAKHdKqXbzKKhF8yZzJCOEbKYPAOEypJlfd8mPs1Nds2BIV+Q21/8ij+uvobWVgiH
+TpJvfoMJr9uu/KqPmPA9Zua3zld0ASvIb2urFlGE1w66vj+e4YEVUz8GGIgFdcbs6hdDwHV3GfJf
+ESvbV7JhE7AB+2cQjzYMg20eteMJxo+L2hYYP16EtpjhQdnXCUuBpWT74GbgObfjntt+0MKC27nm
+94j9B2DJ29yil00WgVQFEkwpDLlixySk2Y2oH15myvkn5YWBKVWeu+ce2N8MuM3ohoEpe98NlR9t
+QBrYR7YzD2s6Wb97K/n+Z+1t96ktvGU5fKMP/m4Rf9z6O/Pma+8WQH7b7cnw2rvP8Z0o8/+hNGA3
+kOH/AZJdWXp02ErCAAAAAElFTkSuQmCC
+"
+       width="101"
+       height="43"
+       id="image3835"
+       x="182.46463"
+       y="-53.035366" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/protocols/48/scalable/aim.svg b/pidgin/pixmaps/protocols/scalable/aim.svg
index 0fe6910fc0..0fe6910fc0 100644
--- a/pidgin/pixmaps/protocols/48/scalable/aim.svg
+++ b/pidgin/pixmaps/protocols/scalable/aim.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/bonjour.svg b/pidgin/pixmaps/protocols/scalable/bonjour.svg
index 0bd9aadd65..0bd9aadd65 100644
--- a/pidgin/pixmaps/protocols/48/scalable/bonjour.svg
+++ b/pidgin/pixmaps/protocols/scalable/bonjour.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/gadu-gadu.svg b/pidgin/pixmaps/protocols/scalable/gadu-gadu.svg
index 701a689cf4..701a689cf4 100644
--- a/pidgin/pixmaps/protocols/48/scalable/gadu-gadu.svg
+++ b/pidgin/pixmaps/protocols/scalable/gadu-gadu.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/google-talk.svg b/pidgin/pixmaps/protocols/scalable/google-talk.svg
index 3e91ca08f2..3e91ca08f2 100644
--- a/pidgin/pixmaps/protocols/48/scalable/google-talk.svg
+++ b/pidgin/pixmaps/protocols/scalable/google-talk.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/icq.svg b/pidgin/pixmaps/protocols/scalable/icq.svg
index e2f3a3ee7a..e2f3a3ee7a 100644
--- a/pidgin/pixmaps/protocols/48/scalable/icq.svg
+++ b/pidgin/pixmaps/protocols/scalable/icq.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/irc.svg b/pidgin/pixmaps/protocols/scalable/irc.svg
index 28e8cb6ee4..28e8cb6ee4 100644
--- a/pidgin/pixmaps/protocols/48/scalable/irc.svg
+++ b/pidgin/pixmaps/protocols/scalable/irc.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/jabber.svg b/pidgin/pixmaps/protocols/scalable/jabber.svg
index c534d5ebac..c534d5ebac 100644
--- a/pidgin/pixmaps/protocols/48/scalable/jabber.svg
+++ b/pidgin/pixmaps/protocols/scalable/jabber.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/meanwhile.svg b/pidgin/pixmaps/protocols/scalable/meanwhile.svg
index 92244096a9..92244096a9 100644
--- a/pidgin/pixmaps/protocols/48/scalable/meanwhile.svg
+++ b/pidgin/pixmaps/protocols/scalable/meanwhile.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/msn.svg b/pidgin/pixmaps/protocols/scalable/msn.svg
index 5619694161..5619694161 100644
--- a/pidgin/pixmaps/protocols/48/scalable/msn.svg
+++ b/pidgin/pixmaps/protocols/scalable/msn.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/novell.svg b/pidgin/pixmaps/protocols/scalable/novell.svg
index 168b2f42f1..168b2f42f1 100644
--- a/pidgin/pixmaps/protocols/48/scalable/novell.svg
+++ b/pidgin/pixmaps/protocols/scalable/novell.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/qq.svg b/pidgin/pixmaps/protocols/scalable/qq.svg
index e741f980d8..e741f980d8 100644
--- a/pidgin/pixmaps/protocols/48/scalable/qq.svg
+++ b/pidgin/pixmaps/protocols/scalable/qq.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/silc.svg b/pidgin/pixmaps/protocols/scalable/silc.svg
index aa3dad08d3..aa3dad08d3 100644
--- a/pidgin/pixmaps/protocols/48/scalable/silc.svg
+++ b/pidgin/pixmaps/protocols/scalable/silc.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/simple.svg b/pidgin/pixmaps/protocols/scalable/simple.svg
index 4934a5c288..4934a5c288 100644
--- a/pidgin/pixmaps/protocols/48/scalable/simple.svg
+++ b/pidgin/pixmaps/protocols/scalable/simple.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/yahoo.svg b/pidgin/pixmaps/protocols/scalable/yahoo.svg
index 674d74dfeb..674d74dfeb 100644
--- a/pidgin/pixmaps/protocols/48/scalable/yahoo.svg
+++ b/pidgin/pixmaps/protocols/scalable/yahoo.svg
diff --git a/pidgin/pixmaps/protocols/48/scalable/zephyr.svg b/pidgin/pixmaps/protocols/scalable/zephyr.svg
index 17aab4e9b4..17aab4e9b4 100644
--- a/pidgin/pixmaps/protocols/48/scalable/zephyr.svg
+++ b/pidgin/pixmaps/protocols/scalable/zephyr.svg
diff --git a/pidgin/pixmaps/status/11/invisible.png b/pidgin/pixmaps/status/11/invisible.png
index 3d22438aba..3ccc4a7045 100644
--- a/pidgin/pixmaps/status/11/invisible.png
+++ b/pidgin/pixmaps/status/11/invisible.png
diff --git a/pidgin/pixmaps/status/16/available.png b/pidgin/pixmaps/status/16/available.png
index 34bacb712b..9e5eda236b 100644
--- a/pidgin/pixmaps/status/16/available.png
+++ b/pidgin/pixmaps/status/16/available.png
diff --git a/pidgin/pixmaps/status/16/away.png b/pidgin/pixmaps/status/16/away.png
index b0df165d75..331828ba2f 100644
--- a/pidgin/pixmaps/status/16/away.png
+++ b/pidgin/pixmaps/status/16/away.png
diff --git a/pidgin/pixmaps/status/16/busy.png b/pidgin/pixmaps/status/16/busy.png
index 0b0ce85a4d..0472fbe9cb 100644
--- a/pidgin/pixmaps/status/16/busy.png
+++ b/pidgin/pixmaps/status/16/busy.png
diff --git a/pidgin/pixmaps/status/16/invisible.png b/pidgin/pixmaps/status/16/invisible.png
index 7f2bcfdd58..9ab7fcd8c1 100644
--- a/pidgin/pixmaps/status/16/invisible.png
+++ b/pidgin/pixmaps/status/16/invisible.png
diff --git a/pidgin/pixmaps/status/22/available.png b/pidgin/pixmaps/status/22/available.png
index aadb6509dd..616579a45d 100644
--- a/pidgin/pixmaps/status/22/available.png
+++ b/pidgin/pixmaps/status/22/available.png
diff --git a/pidgin/pixmaps/status/22/away.png b/pidgin/pixmaps/status/22/away.png
index 72dfaab7d0..5cc15edb1e 100644
--- a/pidgin/pixmaps/status/22/away.png
+++ b/pidgin/pixmaps/status/22/away.png
diff --git a/pidgin/pixmaps/status/22/busy.png b/pidgin/pixmaps/status/22/busy.png
index 9d79a78f7a..b070779d6f 100644
--- a/pidgin/pixmaps/status/22/busy.png
+++ b/pidgin/pixmaps/status/22/busy.png
diff --git a/pidgin/pixmaps/status/22/invisible.png b/pidgin/pixmaps/status/22/invisible.png
index 036aef45ce..9165e2ca6f 100644
--- a/pidgin/pixmaps/status/22/invisible.png
+++ b/pidgin/pixmaps/status/22/invisible.png
diff --git a/pidgin/pixmaps/status/32/available.png b/pidgin/pixmaps/status/32/available.png
index 0e47d3f974..6d8d72cfe0 100644
--- a/pidgin/pixmaps/status/32/available.png
+++ b/pidgin/pixmaps/status/32/available.png
diff --git a/pidgin/pixmaps/status/32/away.png b/pidgin/pixmaps/status/32/away.png
index fc5eb67b9a..63a388a4a5 100644
--- a/pidgin/pixmaps/status/32/away.png
+++ b/pidgin/pixmaps/status/32/away.png
diff --git a/pidgin/pixmaps/status/32/busy.png b/pidgin/pixmaps/status/32/busy.png
index 09b26f7391..9dccd17740 100644
--- a/pidgin/pixmaps/status/32/busy.png
+++ b/pidgin/pixmaps/status/32/busy.png
diff --git a/pidgin/pixmaps/status/32/invisible.png b/pidgin/pixmaps/status/32/invisible.png
index c03f1d1010..f071fbe116 100644
--- a/pidgin/pixmaps/status/32/invisible.png
+++ b/pidgin/pixmaps/status/32/invisible.png
diff --git a/pidgin/pixmaps/status/48/available.png b/pidgin/pixmaps/status/48/available.png
index 3245b1a5bf..a751b1e4aa 100644
--- a/pidgin/pixmaps/status/48/available.png
+++ b/pidgin/pixmaps/status/48/available.png
diff --git a/pidgin/pixmaps/status/48/away.png b/pidgin/pixmaps/status/48/away.png
index 30c1dc05ed..7711762c51 100644
--- a/pidgin/pixmaps/status/48/away.png
+++ b/pidgin/pixmaps/status/48/away.png
diff --git a/pidgin/pixmaps/status/48/busy.png b/pidgin/pixmaps/status/48/busy.png
index 701e85ae93..1aaf614b62 100644
--- a/pidgin/pixmaps/status/48/busy.png
+++ b/pidgin/pixmaps/status/48/busy.png
diff --git a/pidgin/pixmaps/status/48/invisible.png b/pidgin/pixmaps/status/48/invisible.png
index cc5991ad89..6262681031 100644
--- a/pidgin/pixmaps/status/48/invisible.png
+++ b/pidgin/pixmaps/status/48/invisible.png
diff --git a/pidgin/pixmaps/status/svg/status.svg b/pidgin/pixmaps/status/svg/status.svg
new file mode 100644
index 0000000000..c1d549cb8c
--- /dev/null
+++ b/pidgin/pixmaps/status/svg/status.svg
@@ -0,0 +1,3780 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="193.13428"
+   height="135.04771"
+   id="svg2759"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="status.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/hbons/Desktop/empathy-offline.png"
+   inkscape:export-xdpi="90.108963"
+   inkscape:export-ydpi="90.108963">
+  <defs
+     id="defs2761">
+    <linearGradient
+       id="linearGradient5237"
+       inkscape:collect="always">
+      <stop
+         id="stop5239"
+         offset="0"
+         style="stop-color:#a2bfe4;stop-opacity:1" />
+      <stop
+         id="stop5241"
+         offset="1"
+         style="stop-color:#396fb5;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4681"
+       inkscape:collect="always">
+      <stop
+         id="stop4683"
+         offset="0"
+         style="stop-color:#a2bfe4;stop-opacity:1" />
+      <stop
+         id="stop4685"
+         offset="1"
+         style="stop-color:#396fb5;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4190"
+       inkscape:collect="always">
+      <stop
+         id="stop4192"
+         offset="0"
+         style="stop-color:#a2bfe4;stop-opacity:1" />
+      <stop
+         id="stop4194"
+         offset="1"
+         style="stop-color:#396fb5;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3845">
+      <stop
+         style="stop-color:#396fb5;stop-opacity:1"
+         offset="0"
+         id="stop3847" />
+      <stop
+         style="stop-color:#a2bfe4;stop-opacity:1"
+         offset="1"
+         id="stop3849" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3837">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1;"
+         offset="0"
+         id="stop3839" />
+      <stop
+         style="stop-color:#4f0000;stop-opacity:1"
+         offset="1"
+         id="stop3841" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3829">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="0"
+         id="stop3831" />
+      <stop
+         style="stop-color:#132f57;stop-opacity:1"
+         offset="1"
+         id="stop3833" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3821">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop3823" />
+      <stop
+         style="stop-color:#1e3e00;stop-opacity:1"
+         offset="1"
+         id="stop3825" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3890">
+      <stop
+         style="stop-color:#793600;stop-opacity:1"
+         offset="0"
+         id="stop3892" />
+      <stop
+         style="stop-color:#fa9e1a;stop-opacity:1"
+         offset="1"
+         id="stop3894" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587">
+      <stop
+         style="stop-color:#ef641f;stop-opacity:1"
+         offset="0"
+         id="stop3589" />
+      <stop
+         style="stop-color:#3b1401;stop-opacity:1"
+         offset="1"
+         id="stop3591" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3563">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3565" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3567" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective2767" />
+    <inkscape:perspective
+       id="perspective3555"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3569"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3585"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3597"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7327385"
+       cy="4.2809825"
+       fx="8.7327385"
+       fy="4.2809825"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3601"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7327385"
+       cy="4.2809825"
+       fx="8.7327385"
+       fy="4.2809825"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3611"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3613"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7327385"
+       cy="4.2809825"
+       fx="8.7327385"
+       fy="4.2809825"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3629"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="8.7416792"
+       cy="7.1275907"
+       fx="8.7416792"
+       fy="7.1275907"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3631"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.9372473"
+       cy="5.9579206"
+       fx="8.9372473"
+       fy="5.9579206"
+       r="4.5" />
+    <inkscape:perspective
+       id="perspective3789"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3827"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="8.7416792"
+       cy="7.1275907"
+       fx="8.7416792"
+       fy="7.1275907"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3829"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.9038744"
+       cy="7.1581287"
+       fx="8.9038744"
+       fy="7.1581287"
+       r="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3890"
+       id="linearGradient3896"
+       x1="3.551121"
+       y1="10.91353"
+       x2="9.8384857"
+       y2="4.62848"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective3611"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3640"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3685"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3744-7"
+       id="linearGradient3750-7"
+       x1="6.3445182"
+       y1="7.5"
+       x2="13.957041"
+       y2="7.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3744-7">
+      <stop
+         style="stop-color:#febf00;stop-opacity:1;"
+         offset="0"
+         id="stop3746-7" />
+      <stop
+         style="stop-color:#e87208;stop-opacity:1"
+         offset="1"
+         id="stop3748-6" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3747"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3772"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3836"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3910"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3940"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3995"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3821"
+       id="linearGradient3827"
+       x1="8.8108797"
+       y1="5.5247211"
+       x2="3.5010808"
+       y2="10.832565"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3829"
+       id="linearGradient3835"
+       x1="8.7017984"
+       y1="5.1950126"
+       x2="3.4777882"
+       y2="10.4171"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3837"
+       id="linearGradient3843"
+       x1="8.5987625"
+       y1="5.485971"
+       x2="3.4842527"
+       y2="10.598598"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3845"
+       id="linearGradient3851"
+       x1="3.2768242"
+       y1="10.580347"
+       x2="8.5049772"
+       y2="5.3541193"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective3861"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3821-1"
+       id="linearGradient3827-7"
+       x1="8.8108797"
+       y1="5.5247211"
+       x2="3.5010808"
+       y2="10.832565"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3821-1">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop3823-0" />
+      <stop
+         style="stop-color:#1e3e00;stop-opacity:1"
+         offset="1"
+         id="stop3825-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3821"
+       id="linearGradient3974"
+       gradientUnits="userSpaceOnUse"
+       x1="8.8108797"
+       y1="5.5247211"
+       x2="3.5010808"
+       y2="10.832565" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3976"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3829"
+       id="linearGradient3978"
+       gradientUnits="userSpaceOnUse"
+       x1="8.7017984"
+       y1="5.1950126"
+       x2="3.4777882"
+       y2="10.4171" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3980"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3982"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7327385"
+       cy="4.2809825"
+       fx="8.7327385"
+       fy="4.2809825"
+       r="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3837"
+       id="linearGradient3986"
+       gradientUnits="userSpaceOnUse"
+       x1="8.5987625"
+       y1="5.485971"
+       x2="3.4842527"
+       y2="10.598598" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3988"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3990"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7327385"
+       cy="4.2809825"
+       fx="8.7327385"
+       fy="4.2809825"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient3998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7327385"
+       cy="4.2809825"
+       fx="8.7327385"
+       fy="4.2809825"
+       r="4.5" />
+    <inkscape:perspective
+       id="perspective4020"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4042"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4042-5"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4042-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4042-7"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4042-8"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4112"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter4170"
+       x="-0.11278874"
+       width="1.2255775"
+       y="-0.25104305"
+       height="1.502086">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.72968781"
+         id="feGaussianBlur4172" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4190"
+       id="linearGradient4184"
+       gradientUnits="userSpaceOnUse"
+       x1="8.8108797"
+       y1="5.5247211"
+       x2="3.5010808"
+       y2="10.832565" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient4186"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient4188"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7242012"
+       cy="5.3842082"
+       fx="8.7242012"
+       fy="5.3842082"
+       r="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3821"
+       id="linearGradient4284"
+       gradientUnits="userSpaceOnUse"
+       x1="8.8108797"
+       y1="5.5247211"
+       x2="3.5010808"
+       y2="10.832565" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient4286"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3829"
+       id="linearGradient4288"
+       gradientUnits="userSpaceOnUse"
+       x1="8.7017984"
+       y1="5.1950126"
+       x2="3.4777882"
+       y2="10.4171" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient4290"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient4294"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7327385"
+       cy="4.2809825"
+       fx="8.7327385"
+       fy="4.2809825"
+       r="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3837"
+       id="linearGradient4296"
+       gradientUnits="userSpaceOnUse"
+       x1="8.5987625"
+       y1="5.485971"
+       x2="3.4842527"
+       y2="10.598598" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient4298"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient4300"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7327385"
+       cy="4.2809825"
+       fx="8.7327385"
+       fy="4.2809825"
+       r="4.5" />
+    <inkscape:perspective
+       id="perspective4316"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563-5"
+       id="radialGradient4292-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7327385"
+       cy="4.2809825"
+       fx="8.7327385"
+       fy="4.2809825"
+       r="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3563-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3565-9" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3567-3" />
+    </linearGradient>
+    <radialGradient
+       r="4.5"
+       fy="4.2809825"
+       fx="8.7327385"
+       cy="4.2809825"
+       cx="8.7327385"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4325"
+       xlink:href="#linearGradient3563-5"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective4354"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4398"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4398-2"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4429"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4429-5"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4429-4"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4429-7"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4429-1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4429-6"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4520"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4574"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4681"
+       id="linearGradient4596"
+       gradientUnits="userSpaceOnUse"
+       x1="8.8108797"
+       y1="5.5247211"
+       x2="3.5010808"
+       y2="10.832565" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="radialGradient4598"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563-5"
+       id="radialGradient4600"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7582912"
+       cy="5.6183777"
+       fx="8.7582912"
+       fy="5.6183777"
+       r="4.5" />
+    <inkscape:perspective
+       id="perspective4610"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4695"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter4170-2"
+       x="-0.11278874"
+       width="1.2255775"
+       y="-0.25104305"
+       height="1.502086">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.72968781"
+         id="feGaussianBlur4172-3" />
+    </filter>
+    <inkscape:perspective
+       id="perspective4741"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3563-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3565-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3567-6" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563-6"
+       id="radialGradient4298-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563-6"
+       id="radialGradient4300-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7327385"
+       cy="4.2809825"
+       fx="8.7327385"
+       fy="4.2809825"
+       r="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3837-6"
+       id="linearGradient4296-9"
+       gradientUnits="userSpaceOnUse"
+       x1="8.5987625"
+       y1="5.485971"
+       x2="3.4842527"
+       y2="10.598598" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3837-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1;"
+         offset="0"
+         id="stop3839-6" />
+      <stop
+         style="stop-color:#4f0000;stop-opacity:1"
+         offset="1"
+         id="stop3841-0" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563-6"
+       id="radialGradient4294-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.7327385"
+       cy="4.2809825"
+       fx="8.7327385"
+       fy="4.2809825"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563-6"
+       id="radialGradient4290-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3829-5"
+       id="linearGradient4288-5"
+       gradientUnits="userSpaceOnUse"
+       x1="8.7017984"
+       y1="5.1950126"
+       x2="3.4777882"
+       y2="10.4171" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3829-5">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="0"
+         id="stop3831-7" />
+      <stop
+         style="stop-color:#132f57;stop-opacity:1"
+         offset="1"
+         id="stop3833-7" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563-6"
+       id="radialGradient4286-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3821-0"
+       id="linearGradient4284-7"
+       gradientUnits="userSpaceOnUse"
+       x1="8.8108797"
+       y1="5.5247211"
+       x2="3.5010808"
+       y2="10.832565" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3821-0">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop3823-07" />
+      <stop
+         style="stop-color:#1e3e00;stop-opacity:1"
+         offset="1"
+         id="stop3825-1" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5117"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="4.5"
+       fy="4.2809825"
+       fx="8.7327385"
+       cy="4.2809825"
+       cx="8.7327385"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4325-0-0"
+       xlink:href="#linearGradient3563-5-8-7"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3563-5-8-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3565-9-9-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3567-3-2-8" />
+    </linearGradient>
+    <radialGradient
+       r="4.5"
+       fy="4.2809825"
+       fx="8.7327385"
+       cy="4.2809825"
+       cx="8.7327385"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5126"
+       xlink:href="#linearGradient3563-5-8-7"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5237"
+       id="linearGradient5155"
+       gradientUnits="userSpaceOnUse"
+       x1="8.8108797"
+       y1="5.5247211"
+       x2="3.5010808"
+       y2="10.832565" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563-6"
+       id="radialGradient5157"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6612624,0,0,1.6612624,-5.3953817,-4.6366729)"
+       cx="9.8137703"
+       cy="7.1003194"
+       fx="9.8137703"
+       fy="7.1003194"
+       r="4.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563-5-8-7"
+       id="radialGradient5159"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2666672,2.4582466,-1.332397,0.1433762,16.281718,-15.256026)"
+       cx="8.8544598"
+       cy="5.8371043"
+       fx="8.8544598"
+       fy="5.8371043"
+       r="4.5" />
+    <inkscape:perspective
+       id="perspective5169"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5343"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5437"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5465"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5493"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5531"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter4170-2-0"
+       x="-0.11278874"
+       width="1.2255775"
+       y="-0.25104305"
+       height="1.502086">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.72968781"
+         id="feGaussianBlur4172-3-8" />
+    </filter>
+    <inkscape:perspective
+       id="perspective5665"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5693"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5716"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5751"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5730-4"
+       id="linearGradient5736-4"
+       x1="-264.89468"
+       y1="-57.315815"
+       x2="-257.90823"
+       y2="-71.371346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7433468,0,0,-0.7426989,12.185793,-96.050938)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5730-4">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop5732-4" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop5734-2" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5973"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6085"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6437"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective7311"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3641"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-9"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-93"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-8"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-2"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-20"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-23"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-81"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-26"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-3"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-84"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-33"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-0"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4814-95"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5099"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5079-7"
+       id="linearGradient5089-3"
+       gradientUnits="userSpaceOnUse"
+       x1="305.45203"
+       y1="-120.46718"
+       x2="306.04715"
+       y2="-120.46718"
+       gradientTransform="translate(-44.074406,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5079-7">
+      <stop
+         style="stop-color:#fcaf3e;stop-opacity:1"
+         offset="0"
+         id="stop5081-1" />
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="1"
+         id="stop5083-2" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5250"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5021-1"
+       id="linearGradient5232-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9900233,0,0,1,-0.9767553,0)"
+       x1="-302.31421"
+       y1="-123.57119"
+       x2="-302.31421"
+       y2="-116.72435" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5021-1">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop5023-7" />
+      <stop
+         style="stop-color:#0e1011;stop-opacity:1"
+         offset="1"
+         id="stop5025-0" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5459"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5412-8"
+       id="linearGradient5441-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9900233,0,0,1.0052362,-565.01541,1.6752236)"
+       x1="-302.31421"
+       y1="-123.57119"
+       x2="-302.31421"
+       y2="-113.95161" />
+    <linearGradient
+       id="linearGradient5412-8"
+       inkscape:collect="always">
+      <stop
+         id="stop5414-7"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1" />
+      <stop
+         id="stop5416-9"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4993-1-2">
+      <stop
+         style="stop-color:#dadedf;stop-opacity:1"
+         offset="0"
+         id="stop4995-0-1" />
+      <stop
+         style="stop-color:#707e83;stop-opacity:0;"
+         offset="1"
+         id="stop4997-8-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5043-9-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5045-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5047-1-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5214-2-3"
+       inkscape:collect="always">
+      <stop
+         id="stop5216-7-1"
+         offset="0"
+         style="stop-color:#ffb03b;stop-opacity:1" />
+      <stop
+         id="stop5218-6-1"
+         offset="1"
+         style="stop-color:#ce5c00;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4993-1-2"
+       id="linearGradient5604"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0886292,44.842421,89.524029)"
+       x1="-300.82822"
+       y1="-126.31032"
+       x2="-300.82822"
+       y2="-114.83224" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5043-9-6"
+       id="radialGradient5606"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8357992,1.6646101,-1.8779766,0.9748523,-228.84575,581.86393)"
+       cx="-306.03387"
+       cy="-120.8595"
+       fx="-306.03387"
+       fy="-120.8595"
+       r="3.03685" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5214-2-3"
+       id="linearGradient5608"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-45.919701,78.19396)"
+       x1="305.45203"
+       y1="-120.46718"
+       x2="306.04715"
+       y2="-120.46718" />
+    <inkscape:perspective
+       id="perspective5733"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5661-8"
+       id="linearGradient5717-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.1341053,0,0,1.0632786,-506.86144,3.1324492)"
+       x1="-219.25159"
+       y1="-43.842201"
+       x2="-219.25159"
+       y2="-36.569096" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5661-8">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop5663-1" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop5665-5" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5823"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter5849"
+       x="-0.58129352"
+       width="2.1625869"
+       y="-0.50418413"
+       height="2.0083683">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="9.4456698"
+         id="feGaussianBlur5851" />
+    </filter>
+    <inkscape:perspective
+       id="perspective4605"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4684"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4817"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4905"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="66.099876"
+     inkscape:cy="62.058303"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:snap-global="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="752"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2769"
+       empspacing="5"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2764">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(3.2012939e-2,-5.9542937)">
+    <rect
+       style="opacity:0;fill:#8800a0;fill-opacity:1;stroke:none"
+       id="rect4668"
+       width="48"
+       height="48"
+       x="-0.032012939"
+       y="93.002007"
+       inkscape:export-filename="/home/hbons/Desktop/48-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="93.002007"
+       x="47.951599"
+       height="48"
+       width="48"
+       id="rect4670"
+       style="opacity:0;fill:#8800a0;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="opacity:0;fill:#8800a0;fill-opacity:1;stroke:none"
+       id="rect4672"
+       width="48"
+       height="48"
+       x="95.942886"
+       y="93.002007"
+       inkscape:export-filename="/home/hbons/Desktop/48-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="93.002007"
+       x="145.10226"
+       height="48"
+       width="48"
+       id="rect4674"
+       style="opacity:0;fill:#8800a0;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-offline.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="opacity:0;fill:#8800a0;fill-opacity:1;stroke:none"
+       id="rect4660"
+       width="32"
+       height="32"
+       x="4.0494385"
+       y="57.017082"
+       inkscape:export-filename="/home/hbons/Desktop/32-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="57.017082"
+       x="35.897667"
+       height="32"
+       width="32"
+       id="rect4662"
+       style="opacity:0;fill:#8800a0;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="opacity:0;fill:#8800a0;fill-opacity:1;stroke:none"
+       id="rect4664"
+       width="32"
+       height="32"
+       x="67.924774"
+       y="57.017082"
+       inkscape:export-filename="/home/hbons/Desktop/32-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="57.017082"
+       x="99.870567"
+       height="32"
+       width="32"
+       id="rect4666"
+       style="opacity:0;fill:#8800a0;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/32-offline.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="opacity:0;fill:#4b0058;fill-opacity:1;stroke:none"
+       id="rect3880"
+       width="24"
+       height="24"
+       x="4.102562"
+       y="29.005341"
+       inkscape:export-filename="/home/hbons/Desktop/24-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="29.005341"
+       x="28.086708"
+       height="24"
+       width="24"
+       id="rect3882"
+       style="opacity:0;fill:#4b0058;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="opacity:0;fill:#4b0058;fill-opacity:1;stroke:none"
+       id="rect3884"
+       width="24"
+       height="24"
+       x="52.032524"
+       y="29.005341"
+       inkscape:export-filename="/home/hbons/Desktop/24-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="29.005341"
+       x="76.02433"
+       height="24"
+       width="24"
+       id="rect3886"
+       style="opacity:0;fill:#4b0058;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/24-offline.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       transform="matrix(2.0805553,-0.9834018,2.0813214,0.983764,43.17642,130.75679)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path5551"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-2-0)"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-2-0)"
+       id="path5553"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(2.0805553,-0.9834018,2.0813214,0.983764,90.16357,130.75679)"
+       inkscape:export-filename="/home/hbons/Desktop/48-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-offline.png"
+       transform="matrix(2.0805553,-0.9834018,2.0813214,0.983764,139.17464,130.75679)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path5555"
+       style="opacity:0.5;fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-2-0)"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-2-0)"
+       id="path4150-2-7"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(2.0805553,-0.9834018,2.0813214,0.983764,-3.87065,130.75679)"
+       inkscape:export-filename="/home/hbons/Desktop/48-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-2)"
+       id="path4150-2"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.5177993,-0.7174078,1.5183582,0.717672,-0.58146,81.777092)"
+       inkscape:export-filename="/home/hbons/Desktop/32-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       transform="matrix(1.5177993,-0.7174078,1.5183582,0.717672,31.28412,81.777092)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4715"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-2)"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-2)"
+       id="path4717"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.5177993,-0.7174078,1.5183582,0.717672,63.414578,81.777092)"
+       inkscape:export-filename="/home/hbons/Desktop/32-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-offline.png"
+       transform="matrix(1.5177993,-0.7174078,1.5183582,0.717672,95.339779,81.777092)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4719"
+       style="opacity:0.5;fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170-2)"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170)"
+       id="path4196"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.0775549,-0.5414093,1.0779516,0.5416087,49.946956,47.888453)"
+       inkscape:export-filename="/home/hbons/Desktop/24-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       transform="matrix(1.0775549,-0.5414093,1.0779516,0.5416087,25.914436,47.888453)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4198"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170)"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170)"
+       id="path4150"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.0775549,-0.5414093,1.0779516,0.5416087,1.99825,47.888453)"
+       inkscape:export-filename="/home/hbons/Desktop/24-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#73d216;fill-opacity:1;stroke:url(#linearGradient3827);stroke-width:0.60000008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2773"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.1782943,-1.1782943,1.1787283,1.1787283,-2.3976764,12.892666)"
+       inkscape:export-filename="/home/hbons/Desktop/16-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(-1.0953086,-1.0953086,-1.0997321,1.0997321,29.481698,12.985715)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3561"
+       style="fill:url(#radialGradient3569);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/16-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(1.1782943,-1.1782943,1.1787283,1.1787283,15.572157,12.771612)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3579"
+       style="fill:#729fcf;fill-opacity:1;stroke:url(#linearGradient3835);stroke-width:0.60000008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/16-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3585);fill-opacity:1;stroke:none"
+       id="path3581"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(-1.1001167,-1.1001167,-1.1045596,1.1045596,47.51899,12.859707)"
+       inkscape:export-filename="/home/hbons/Desktop/16-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3597);fill-opacity:1;stroke:none"
+       id="path3595"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(0.9142668,0.9142668,0.9179592,-0.9179592,1.2867724,15.05616)"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/16-available.png" />
+    <path
+       transform="matrix(0.9142668,0.9142668,0.9179592,-0.9179592,19.263659,14.935106)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3599"
+       style="fill:url(#radialGradient3601);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/16-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(1.1782943,-1.1782943,1.1787283,1.1787283,33.515577,12.771612)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3603"
+       style="fill:#ef2929;fill-opacity:1;stroke:url(#linearGradient3843);stroke-width:0.60000008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/16-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3611);fill-opacity:1;stroke:none"
+       id="path3605"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(-1.0953086,-1.0953086,-1.0997321,1.0997321,65.394951,12.864661)"
+       inkscape:export-filename="/home/hbons/Desktop/16-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(1.0030192,1.0030192,1.00707,-1.00707,35.954805,15.026547)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3607"
+       style="fill:url(#radialGradient3613);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/16-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#a0bedf;fill-opacity:1;stroke:url(#linearGradient3851);stroke-width:0.60000008;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3621"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.1782943,-1.1782943,1.1787283,1.1787283,50.946047,12.771612)"
+       inkscape:export-filename="/home/hbons/Desktop/16-offline.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(-1.0953086,-1.0953086,-1.0997321,1.0997321,82.825421,12.864661)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3623"
+       style="fill:url(#radialGradient3629);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/16-offline.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3631);fill-opacity:1;stroke:none"
+       id="path3625"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.011631,1.011631,1.0157166,-1.0157166,53.264449,15.035419)"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/16-offline.png" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#cc0000;stroke-width:1;stroke-opacity:0.47029706"
+       id="rect3664"
+       width="11.004202"
+       height="3.0052931"
+       x="44.504047"
+       y="12.496305"
+       rx="1.5026466"
+       ry="1.5026466"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/16-busy.png" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:#5e94cd;stroke-width:0.83037329;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.47058824"
+       id="path3676"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(0.8513962,-0.8513962,0.8517097,0.8517097,20.139963,13.109084)"
+       inkscape:export-filename="/home/hbons/Desktop/16-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path3795"
+       sodipodi:cx="32.271088"
+       sodipodi:cy="13.925035"
+       sodipodi:rx="1.1138211"
+       sodipodi:ry="1.2439024"
+       d="M 33.384909,13.925035 A 1.1138211,1.2439024 0 1 1 31.157266,13.925035 A 1.1138211,1.2439024 0 1 1 33.384909,13.925035 z"
+       transform="matrix(0.8978103,0,0,0.8037515,3.0266867,2.8079433)"
+       inkscape:export-filename="/home/hbons/Desktop/16-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3799"
+       width="1.0121797"
+       height="1.0104886"
+       x="31.987822"
+       y="13"
+       inkscape:export-filename="/home/hbons/Desktop/16-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="12"
+       x="32.987823"
+       height="1.0104886"
+       width="1.0121797"
+       id="rect3801"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/16-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="13"
+       x="-32"
+       height="1.0104886"
+       width="1.0121797"
+       id="rect3803"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/16-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3805"
+       width="1.0121797"
+       height="1.0104886"
+       x="30"
+       y="11.989511"
+       inkscape:export-filename="/home/hbons/Desktop/16-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="10.989511"
+       x="28.98782"
+       height="1.0104886"
+       width="1.0121797"
+       id="rect3807"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/16-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3809"
+       width="1.0121797"
+       height="1.0104886"
+       x="34"
+       y="11"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/16-away.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       transform="matrix(0.9984087,0.9984087,1.0024409,-1.0024409,0.1062375,15.14285)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3043"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.70680797;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/16-available.png" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.34070794;fill:none;stroke:#ffffff;stroke-width:0.70680797;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3817"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(0.9984087,0.9984087,1.0024409,-1.0024409,35.935175,15.021796)"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/16-busy.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-available.png"
+       transform="matrix(1.649612,-1.649612,1.6502196,1.6502196,-7.07163,39.329428)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3928"
+       style="fill:#73d216;fill-opacity:1;stroke:url(#linearGradient3974);stroke-width:0.42857152;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-available.png"
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3976);fill-opacity:1;stroke:none"
+       id="path3930"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(-1.579109,-1.579109,-1.5854864,1.5854864,38.200355,39.412636)" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       sodipodi:type="arc"
+       style="fill:#729fcf;fill-opacity:1;stroke:url(#linearGradient3978);stroke-width:0.42857152;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3932"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.649612,-1.649612,1.6502196,1.6502196,16.923,39.36636)" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       transform="matrix(-1.5756231,-1.5756231,-1.5819864,1.5819864,62.14608,39.453159)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3934"
+       style="fill:url(#radialGradient3980);fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       transform="matrix(1.4244979,1.428323,1.4302509,-1.4340914,-3.95837,42.501581)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3936"
+       style="fill:url(#radialGradient3982);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/24-available.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3998);fill-opacity:1;stroke:none"
+       id="path3938"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.2586376,1.252928,1.2637207,-1.257988,22.354047,42.271573)" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-busy.png"
+       sodipodi:type="arc"
+       style="fill:#ef2929;fill-opacity:1;stroke:url(#linearGradient3986);stroke-width:0.42857152;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3940"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.649612,-1.649612,1.6502196,1.6502196,40.914245,39.31894)" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-busy.png"
+       transform="matrix(-1.5758699,-1.5758699,-1.5822342,1.5822342,86.140784,39.405485)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3942"
+       style="fill:url(#radialGradient3988);fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-busy.png"
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3990);fill-opacity:1;stroke:none"
+       id="path3944"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.5538791,1.5538791,1.5601547,-1.5601547,42.229498,42.630033)" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       ry="1.9409533"
+       rx="1.9409533"
+       y="38.539009"
+       x="55.516884"
+       height="4.9422016"
+       width="16.961893"
+       id="rect3952"
+       style="fill:#ffffff;fill-opacity:1;stroke:#cc0000;stroke-width:0.99999994;stroke-opacity:0.47029706"
+       inkscape:export-filename="/home/hbons/Desktop/24-busy.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       transform="matrix(1.1859334,-1.1859334,1.1863702,1.1863702,23.402246,39.844858)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3954"
+       style="fill:#ffffff;fill-opacity:1;stroke:#5e94cd;stroke-width:0.5961352;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.47058824"
+       sodipodi:type="arc" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       transform="matrix(0.906523,0,0,0.8115515,10.77048,29.709666)"
+       d="M 33.384909,13.925035 A 1.1138211,1.2439024 0 1 1 31.157266,13.925035 A 1.1138211,1.2439024 0 1 1 33.384909,13.925035 z"
+       sodipodi:ry="1.2439024"
+       sodipodi:rx="1.1138211"
+       sodipodi:cy="13.925035"
+       sodipodi:cx="32.271088"
+       id="path3956"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3960"
+       width="1.0000036"
+       height="0.99999994"
+       x="40"
+       y="40" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="37.998646"
+       x="41.994576"
+       height="0.99999988"
+       width="0.99999881"
+       id="rect3968"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.4701004;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3970"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.5011331,1.5011331,1.5071955,-1.5071955,-5.01634,42.586177)"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-available.png" />
+    <rect
+       y="39"
+       x="41"
+       height="0.99999994"
+       width="1.0000036"
+       id="rect4000"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4004"
+       width="0.99999881"
+       height="0.99999988"
+       x="-37"
+       y="37"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4006"
+       width="1.0000036"
+       height="0.99999994"
+       x="-39"
+       y="39"
+       transform="scale(-1,1)" />
+    <rect
+       y="38"
+       x="-38"
+       height="0.99999994"
+       width="1.0000036"
+       id="rect4008"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)" />
+    <rect
+       y="40"
+       x="39"
+       height="0.99999994"
+       width="1.0000036"
+       id="rect4010"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4004-6"
+       width="0.99999881"
+       height="0.99999988"
+       x="-39"
+       y="38"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4004-6-9"
+       width="0.99999881"
+       height="0.99999988"
+       x="-38"
+       y="39"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4004-6-4"
+       width="0.99999881"
+       height="0.99999988"
+       x="-39"
+       y="40"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4004-6-0"
+       width="0.99999881"
+       height="0.99999988"
+       x="-40"
+       y="39"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <rect
+       style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4004-6-3"
+       width="0.99999881"
+       height="0.99999988"
+       x="-38"
+       y="37"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <rect
+       style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4004-6-7"
+       width="0.99999881"
+       height="0.99999988"
+       x="-37"
+       y="38"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="40"
+       x="41"
+       height="0.99999988"
+       width="0.99999881"
+       id="rect4096"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="39"
+       x="40"
+       height="0.99999988"
+       width="0.99999881"
+       id="rect4098"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="37.998646"
+       x="40.994576"
+       height="0.99999988"
+       width="0.99999881"
+       id="rect4100"
+       style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="38.998646"
+       x="41.994576"
+       height="0.99999988"
+       width="0.99999881"
+       id="rect4102"
+       style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/24-away.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       transform="matrix(1.490698,1.4864482,1.4967183,-1.4924513,43.068366,42.463001)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path3972"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.47406736;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/24-busy.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-offline.png"
+       transform="matrix(1.0775549,-0.5414093,1.0779516,0.5416087,74.011997,47.888453)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4174"
+       style="opacity:0.5;fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter4170)"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#a0bedf;fill-opacity:1;stroke:url(#linearGradient4184);stroke-width:0.42857152;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4176"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.649612,-1.649612,1.6502196,1.6502196,64.942117,39.329428)"
+       inkscape:export-filename="/home/hbons/Desktop/24-offline.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(-1.579109,-1.579109,-1.5854864,1.5854864,110.2141,39.412636)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4178"
+       style="fill:url(#radialGradient4186);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/24-offline.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient4188);fill-opacity:1;stroke:none"
+       id="path4180"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.4244979,1.428323,1.4302509,-1.4340914,68.055377,42.501581)"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/24-offline.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       transform="matrix(1.5011331,1.5011331,1.5071955,-1.5071955,66.997407,42.586177)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4182"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.4701004;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/24-offline.png" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#73d216;fill-opacity:1;stroke:url(#linearGradient4284);stroke-width:0.3103449;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4206"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(2.2780356,-2.2780356,2.2788747,2.2788747,-11.90792,69.718864)"
+       inkscape:export-filename="/home/hbons/Desktop/32-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(-2.0447823,-2.0447823,-2.0530404,2.0530404,48.703929,69.973778)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4208"
+       style="fill:url(#radialGradient4286);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/32-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(2.2780356,-2.2780356,2.2788747,2.2788747,20.10903,69.752009)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4210"
+       style="fill:#729fcf;fill-opacity:1;stroke:url(#linearGradient4288);stroke-width:0.3103449;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient4290);fill-opacity:1;stroke:none"
+       id="path4212"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(-2.2095171,-2.2095171,-2.2184406,2.2184406,83.032166,69.837198)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(1.7381186,1.7302339,1.7451381,-1.7372215,27.60905,73.763969)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4216"
+       style="fill:url(#radialGradient4294);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(2.2780356,-2.2780356,2.2788747,2.2788747,52.144645,69.735449)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4218"
+       style="fill:#ef2929;fill-opacity:1;stroke:url(#linearGradient4296);stroke-width:0.3103449;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/32-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(2.1987222,2.1945151,2.2076021,-2.203378,53.134579,74.246925)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4222"
+       style="fill:url(#radialGradient4300);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/32-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient4298);fill-opacity:1;stroke:none"
+       id="path4220"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(-2.2020449,-2.2020449,-2.210938,2.210938,114.96293,69.828337)"
+       inkscape:export-filename="/home/hbons/Desktop/32-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#cc0000;stroke-width:0.99999988;stroke-opacity:0.47029706"
+       id="rect4224"
+       width="22.984543"
+       height="6.9956765"
+       x="72.513435"
+       y="68.501228"
+       rx="2.5524006"
+       ry="2.5524006"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-busy.png" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:#5e94cd;stroke-width:0.39009234;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.47058824"
+       id="path4226"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(1.8123316,-1.8123316,1.8129991,1.8129991,26.61149,70.237696)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       transform="matrix(2.1120134,2.1120134,2.1205428,-2.1205428,-9.66694,74.153001)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4234"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.3341282;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/32-available.png" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient4325);fill-opacity:1;stroke:none"
+       id="path4214"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(2.0177554,2.0231735,2.0259044,-2.0313443,-8.31847,74.151718)"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-available.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       transform="matrix(2.1179632,2.1179632,2.1265165,-2.1265165,22.28828,74.17208)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4234-3"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.33318958;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       y="71.026642"
+       x="51.010094"
+       height="1.0000023"
+       width="0.9999997"
+       id="rect4368"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4370"
+       width="0.9999997"
+       height="1.0000023"
+       x="50.010094"
+       y="70.026642" />
+    <rect
+       y="69.026642"
+       x="49.010094"
+       height="1.0000023"
+       width="0.9999997"
+       id="rect4380"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4382"
+       width="0.9999997"
+       height="1.0000023"
+       x="48.010094"
+       y="68.026642" />
+    <rect
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4384"
+       width="0.99999982"
+       height="1.000001"
+       x="-47.010094"
+       y="66.026642"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="69.026642"
+       x="-51.010094"
+       height="1.000001"
+       width="0.99999982"
+       id="rect4488"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="70.026642"
+       x="-50.010094"
+       height="1.000001"
+       width="0.99999982"
+       id="rect4490"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="66.026642"
+       x="-48.010094"
+       height="1.000001"
+       width="0.99999982"
+       id="rect4492"
+       style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="67.026642"
+       x="-47.010094"
+       height="1.000001"
+       width="0.99999982"
+       id="rect4494"
+       style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="68.026642"
+       x="-50.010094"
+       height="1.000001"
+       width="0.99999982"
+       id="rect4500"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="69.026642"
+       x="-49.010094"
+       height="1.000001"
+       width="0.99999982"
+       id="rect4502"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="71.026642"
+       x="-51.010094"
+       height="1.000001"
+       width="0.99999982"
+       id="rect4504"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="70.026642"
+       x="-52.010094"
+       height="1.000001"
+       width="0.99999982"
+       id="rect4506"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path4228"
+       sodipodi:cx="32.271088"
+       sodipodi:cy="13.925035"
+       sodipodi:rx="1.1138211"
+       sodipodi:ry="1.2439024"
+       d="M 33.384909,13.925035 A 1.1138211,1.2439024 0 1 1 31.157266,13.925035 A 1.1138211,1.2439024 0 1 1 33.384909,13.925035 z"
+       transform="matrix(0.9066992,0,0,0.8117092,22.74765,60.733258)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4536"
+       width="0.9999997"
+       height="1.0000023"
+       x="-53.010094"
+       y="71.026642"
+       transform="scale(-1,1)" />
+    <rect
+       y="70.026642"
+       x="-54.010094"
+       height="1.0000023"
+       width="0.9999997"
+       id="rect4538"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4540"
+       width="0.9999997"
+       height="1.0000023"
+       x="-55.010094"
+       y="69.026642"
+       transform="scale(-1,1)" />
+    <rect
+       y="68.026642"
+       x="-56.010094"
+       height="1.0000023"
+       width="0.9999997"
+       id="rect4542"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="66.996277"
+       x="56.007881"
+       height="1.000001"
+       width="0.99999982"
+       id="rect4544"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4546"
+       width="0.99999982"
+       height="1.000001"
+       x="53.010094"
+       y="69.026642"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4548"
+       width="0.99999982"
+       height="1.000001"
+       x="54.010094"
+       y="70.026642"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4550"
+       width="0.99999982"
+       height="1.000001"
+       x="55.007881"
+       y="66.996277"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4552"
+       width="0.99999982"
+       height="1.000001"
+       x="56.007881"
+       y="67.996277"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4558"
+       width="0.99999982"
+       height="1.000001"
+       x="54.010094"
+       y="68.026642"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4560"
+       width="0.99999982"
+       height="1.000001"
+       x="55.010094"
+       y="69.026642"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4562"
+       width="0.99999982"
+       height="1.000001"
+       x="53.010094"
+       y="71.026642"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4564"
+       width="0.99999982"
+       height="1.000001"
+       x="52.010094"
+       y="70.026642"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.33385664;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4272"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(2.1156791,2.1117853,2.1242236,-2.1203138,54.383459,74.216675)"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-busy.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-offline.png"
+       transform="matrix(2.2780356,-2.2780356,2.2788747,2.2788747,84.110957,69.718864)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4588"
+       style="fill:#a0bedf;fill-opacity:1;stroke:url(#linearGradient4596);stroke-width:0.3103449;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-offline.png"
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient4598);fill-opacity:1;stroke:none"
+       id="path4590"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(-2.0447823,-2.0447823,-2.0530404,2.0530404,144.72281,69.973778)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.3341282;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4592"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(2.1120134,2.1120134,2.1205428,-2.1205428,86.351937,74.153001)"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/32-offline.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       transform="matrix(2.0177554,2.0231735,2.0259044,-2.0313443,87.700407,74.151718)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4594"
+       style="fill:url(#radialGradient4600);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/32-offline.png" />
+    <rect
+       y="67"
+       x="47"
+       height="1.0000023"
+       width="0.9999997"
+       id="rect4727"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4729"
+       width="0.99999982"
+       height="1.000001"
+       x="-49"
+       y="67"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4731"
+       width="0.99999982"
+       height="1.000001"
+       x="-48"
+       y="68"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/32-away.png" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#73d216;fill-opacity:1;stroke:url(#linearGradient4284-7);stroke-width:0.20454551;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4206-8"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(3.4563298,-3.4563298,3.457603,3.457603,-23.89824,111.97435)"
+       inkscape:export-filename="/home/hbons/Desktop/48-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(-3.2202269,-3.2202269,-3.2332322,3.2332322,69.71731,112.23976)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4208-3"
+       style="fill:url(#radialGradient4286-4);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/48-available.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(3.4563298,-3.4563298,3.457603,3.457603,23.14643,111.99166)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4210-6"
+       style="fill:#729fcf;fill-opacity:1;stroke:url(#linearGradient4288-5);stroke-width:0.20454551;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient4290-5);fill-opacity:1;stroke:none"
+       id="path4212-1"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(-3.3812694,-3.3812694,-3.3949252,3.3949252,119.02148,112.09114)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(2.6371454,2.6251824,2.6477957,-2.6357843,34.52577,118.07877)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4216-5"
+       style="fill:url(#radialGradient4294-9);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:#5e94cd;stroke-width:0.25104249;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.47058824"
+       id="path4226-3"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(2.8161633,-2.8161633,2.8172004,2.8172004,32.08218,112.66195)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       transform="matrix(3.2825658,3.2825658,3.2958226,-3.2958226,-21.59435,118.78251)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4234-2"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.21497916;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/48-available.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       transform="matrix(3.2831582,3.2831582,3.2964171,-3.2964171,25.475,118.76978)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4234-3-5"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.21494038;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path4228-9"
+       sodipodi:cx="32.271088"
+       sodipodi:cy="13.925035"
+       sodipodi:rx="1.1138211"
+       sodipodi:ry="1.2439024"
+       d="M 33.384909,13.925035 A 1.1138211,1.2439024 0 1 1 31.157266,13.925035 A 1.1138211,1.2439024 0 1 1 33.384909,13.925035 z"
+       transform="matrix(1.3467162,0,0,1.2058815,28.08838,98.64726)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/rect3809.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4536-4"
+       width="0"
+       height="0.48275831"
+       x="-163"
+       y="216.51724"
+       transform="scale(1,-1)" />
+    <rect
+       y="113.00839"
+       x="-74.00502"
+       height="0.98637545"
+       width="0.98309225"
+       id="rect4538-9"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4540-8"
+       width="0.99999899"
+       height="1.0000015"
+       x="-75.00502"
+       y="111.99477"
+       transform="scale(-1,1)" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4564-4"
+       width="1.0169059"
+       height="0.98637414"
+       x="72.00502"
+       y="112.99477"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient5126);fill-opacity:1;stroke:none"
+       id="path4214-0"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(3.1944897,3.2030675,3.2073911,-3.2160034,-20.31916,118.83754)"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-available.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-offline.png"
+       transform="matrix(3.4563298,-3.4563298,3.457603,3.457603,119.09986,111.97435)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path5147"
+       style="fill:#a0bedf;fill-opacity:1;stroke:url(#linearGradient5155);stroke-width:0.20454551;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-offline.png"
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient5157);fill-opacity:1;stroke:none"
+       id="path5149"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(-3.2202269,-3.2202269,-3.2332322,3.2332322,212.71541,112.23976)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.21497916;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5151"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(3.2825658,3.2825658,3.2958226,-3.2958226,121.40375,118.78251)"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-offline.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       transform="matrix(3.1944897,3.2030675,3.2073911,-3.2160034,122.67894,118.83754)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path5153"
+       style="fill:url(#radialGradient5159);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/48-offline.png" />
+    <rect
+       transform="scale(-1,1)"
+       y="110.99477"
+       x="-76.00502"
+       height="1.0000015"
+       width="0.99999899"
+       id="rect5243"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5245"
+       width="0.99999899"
+       height="1.0000015"
+       x="-77.00502"
+       y="109.99477"
+       transform="scale(-1,1)" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="111.99477"
+       x="73.00502"
+       height="0.98637414"
+       width="1.0169059"
+       id="rect5251"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5253"
+       width="1.0169059"
+       height="0.98637414"
+       x="73.988113"
+       y="110.99477"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="109.99477"
+       x="74.988113"
+       height="0.98637414"
+       width="1.0169059"
+       id="rect5255"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="109.01645"
+       x="76.007736"
+       height="0.98637414"
+       width="1.0169059"
+       id="rect5261"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5263"
+       width="1.0169059"
+       height="0.98637414"
+       x="76.990829"
+       y="110.03008"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5267"
+       width="1.0169059"
+       height="0.98637414"
+       x="75.988113"
+       y="111.00839"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="112.00839"
+       x="74.988113"
+       height="0.98637414"
+       width="1.0169059"
+       id="rect5269"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5271"
+       width="1.0169059"
+       height="0.98637414"
+       x="73.988113"
+       y="113.00839"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="114.00839"
+       x="72.988113"
+       height="0.98637414"
+       width="1.0169059"
+       id="rect5273"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5275"
+       width="0.99999917"
+       height="1.0000002"
+       x="77.007736"
+       y="109.01645"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       transform="scale(-1,1)"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5281"
+       width="0.98309225"
+       height="0.98637545"
+       x="-73.00502"
+       y="113.99477" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5285"
+       width="0.98309225"
+       height="0.98637545"
+       x="68.983566"
+       y="113.01874" />
+    <rect
+       y="112.00511"
+       x="67.983566"
+       height="1.0000015"
+       width="0.99999899"
+       id="rect5287"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="113.00511"
+       x="-70.983566"
+       height="0.98637414"
+       width="1.0169059"
+       id="rect5293"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5295"
+       width="0.99999899"
+       height="1.0000015"
+       x="66.983566"
+       y="111.00511" />
+    <rect
+       y="110.00511"
+       x="65.983566"
+       height="1.0000015"
+       width="0.99999899"
+       id="rect5297"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5299"
+       width="0.99999899"
+       height="1.0000015"
+       x="64.983566"
+       y="109.00511" />
+    <rect
+       y="108.00511"
+       x="63.983566"
+       height="1.0000015"
+       width="0.99999899"
+       id="rect5301"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5303"
+       width="1.0169059"
+       height="0.98637414"
+       x="-69.983566"
+       y="112.00511"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="111.00511"
+       x="-69.000473"
+       height="0.98637414"
+       width="1.0169059"
+       id="rect5305"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5307"
+       width="1.0169059"
+       height="0.98637414"
+       x="-68.000473"
+       y="110.00511"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="109.00511"
+       x="-67.000473"
+       height="0.98637414"
+       width="1.0169059"
+       id="rect5309"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5313"
+       width="1.0169059"
+       height="0.98637414"
+       x="-65.983566"
+       y="108.00511"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="109.01874"
+       x="-65.000473"
+       height="0.98637414"
+       width="1.0169059"
+       id="rect5315"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5317"
+       width="1.0169059"
+       height="0.98637414"
+       x="-66.000473"
+       y="110.01874"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="111.01874"
+       x="-67.000473"
+       height="0.98637414"
+       width="1.0169059"
+       id="rect5319"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5321"
+       width="1.0169059"
+       height="0.98637414"
+       x="-68.000473"
+       y="112.01874"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="113.01874"
+       x="-69.000473"
+       height="0.98637414"
+       width="1.0169059"
+       id="rect5323"
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       style="opacity:0.25;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5325"
+       width="1.0169059"
+       height="0.98637414"
+       x="-70.000473"
+       y="114.01874"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="107.01308"
+       x="-63.993439"
+       height="1.0000002"
+       width="0.99999917"
+       id="rect5327"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+       id="rect5329"
+       width="0.99999917"
+       height="1.0000002"
+       x="-63.993439"
+       y="-109.01308"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       transform="scale(-1,-1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       y="107.01308"
+       x="-64.993439"
+       height="1.0000002"
+       width="0.99999917"
+       id="rect5331"
+       style="opacity:0.125;fill:#000000;fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png" />
+    <rect
+       y="114.00511"
+       x="69.983566"
+       height="0.98637545"
+       width="0.98309225"
+       id="rect5333"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/48-away.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(3.4563298,-3.4563298,3.457603,3.457603,70.0976,112.01894)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4218-7"
+       style="fill:#ef2929;fill-opacity:1;stroke:url(#linearGradient4296-9);stroke-width:0.20454551;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/48-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       transform="matrix(3.3962784,3.3897799,3.4099948,-3.40347,70.75374,118.92592)"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       sodipodi:ry="4.5"
+       sodipodi:rx="4.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="6.5"
+       id="path4222-4"
+       style="fill:url(#radialGradient4300-3);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/hbons/Desktop/48-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient4298-9);fill-opacity:1;stroke:none"
+       id="path4220-4"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(-3.3914783,-3.3914783,-3.4051751,3.4051751,166.11585,112.1079)"
+       inkscape:export-filename="/home/hbons/Desktop/48-busy.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#cc0000;stroke-width:0.99999988;stroke-opacity:0.47029706"
+       id="rect4224-2"
+       width="35.995052"
+       height="9.1348553"
+       x="100.56293"
+       y="110.42937"
+       rx="3.0678229"
+       ry="3.0678229"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-busy.png" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.340708;fill:none;stroke:#ffffff;stroke-width:0.21397926;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4272-0"
+       sodipodi:cx="6.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5"
+       d="M 11,7.5 A 4.5,4.5 0 1 1 2,7.5 A 4.5,4.5 0 1 1 11,7.5 z"
+       transform="matrix(3.3009417,3.2948705,3.3142731,-3.3081769,72.21843,118.91156)"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/48-busy.png" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/toolbar/16/audio-call.png b/pidgin/pixmaps/toolbar/16/audio-call.png
new file mode 100644
index 0000000000..7f71ff234a
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/16/audio-call.png
diff --git a/pidgin/pixmaps/toolbar/16/video-call.png b/pidgin/pixmaps/toolbar/16/video-call.png
new file mode 100644
index 0000000000..514cbc9568
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/16/video-call.png
diff --git a/pidgin/pixmaps/toolbar/22/scalable/video-call.svg b/pidgin/pixmaps/toolbar/22/scalable/video-call.svg
new file mode 100644
index 0000000000..99b39805b6
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/22/scalable/video-call.svg
@@ -0,0 +1,658 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg3879"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20974"
+   version="1.0"
+   sodipodi:docname="video-24.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3881">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5837"
+       id="linearGradient6047"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.27327593,0,0,0.5106555,44.789807,49.484667)"
+       x1="-206.31369"
+       y1="-38.305504"
+       x2="-193.64967"
+       y2="-23.3778" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5837">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5839" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5841" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5636">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="0"
+         id="stop5638" />
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:0;"
+         offset="1"
+         id="stop5640" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5795"
+       id="linearGradient5801"
+       x1="-265.00021"
+       y1="-54.745949"
+       x2="-251.85565"
+       y2="-66.937424"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5795">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5797" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5799" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5585">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5587" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5589" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5636"
+       id="radialGradient5646"
+       cx="-278.76022"
+       cy="-76.807457"
+       fx="-278.76022"
+       fy="-76.807457"
+       r="28.001333"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1576192,0,0,2.1576196,320.68789,86.658003)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5614"
+       id="radialGradient5624"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1093921,0,0,1.1093921,30.866652,8.6133536)"
+       cx="-280.78116"
+       cy="-78.911339"
+       fx="-280.78116"
+       fy="-78.911339"
+       r="29.214298" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5614">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5616" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5618" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5614"
+       id="radialGradient5620"
+       cx="-281.17819"
+       cy="-78.86171"
+       fx="-281.17819"
+       fy="-78.86171"
+       r="29.214298"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3813297,0,0,1.3813297,107.2216,30.072312)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5648"
+       id="linearGradient5654"
+       x1="-269.95532"
+       y1="-62.28437"
+       x2="-255.64305"
+       y2="-34.32909"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5648">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1;"
+         offset="0"
+         id="stop5650" />
+      <stop
+         style="stop-color:#4d2100;stop-opacity:1"
+         offset="1"
+         id="stop5652" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5913"
+       id="linearGradient5919"
+       x1="-202.7368"
+       y1="-50.5"
+       x2="-192.7444"
+       y2="-50.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.48663471,0,0,0.98440078,100.58757,73.387419)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5913">
+      <stop
+         style="stop-color:#787878;stop-opacity:1;"
+         offset="0"
+         id="stop5915" />
+      <stop
+         style="stop-color:#787878;stop-opacity:0;"
+         offset="1"
+         id="stop5917" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5887"
+       id="linearGradient5893"
+       x1="-247.54591"
+       y1="-35.930092"
+       x2="-264.87021"
+       y2="-58.743122"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5887">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop5889" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop5891" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5903">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5089815"
+         id="feGaussianBlur5905" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5987"
+       id="linearGradient5993"
+       x1="-183.87694"
+       y1="-38.634178"
+       x2="-183.87694"
+       y2="-39.513264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.97774563,0,0,0.99602169,183.04365,9.675542)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5987">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1;"
+         offset="0"
+         id="stop5989" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop5991" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5995"
+       id="linearGradient6001"
+       x1="-184.21419"
+       y1="-37.343178"
+       x2="-184.21419"
+       y2="-39.290829"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.97774563,0,0,0.99602169,183.04365,9.675542)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5995">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop5997" />
+      <stop
+         style="stop-color:#72eb00;stop-opacity:1"
+         offset="1"
+         id="stop5999" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5913"
+       id="linearGradient5923"
+       gradientUnits="userSpaceOnUse"
+       x1="-203.15808"
+       y1="-50.5"
+       x2="-192.52609"
+       y2="-50.5"
+       gradientTransform="matrix(0.48663471,0,0,0.98809756,106.75193,73.554055)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="radialGradient5881"
+       cx="-263.10712"
+       cy="-59.058826"
+       fx="-263.10712"
+       fy="-59.058826"
+       r="26.905991"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.2689136,-0.7557538,0.46722378,1.4051413,361.24185,-169.10186)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5873">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop5875" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop5877" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5730"
+       id="linearGradient5736"
+       x1="-260.28085"
+       y1="-37.043636"
+       x2="-259.48315"
+       y2="-86.628036"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5730">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop5732" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="1"
+         id="stop5734" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5867"
+       x="-0.13159215"
+       width="1.2631843"
+       y="-0.13159215"
+       height="1.2631843">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.8767211"
+         id="feGaussianBlur5869" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5827"
+       id="linearGradient6005"
+       gradientUnits="userSpaceOnUse"
+       x1="-203.06625"
+       y1="-31.478365"
+       x2="-191.55763"
+       y2="-29.403404" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5827">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5829" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5831" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.46156008,0,0,0.58576055,88.067347,51.202607)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient5783"
+       id="linearGradient5789"
+       x1="-179.45006"
+       y1="-42.398266"
+       x2="-176.44347"
+       y2="-27.845135"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5783">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop5785" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop5787" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter6071"
+       x="-0.06728632"
+       width="1.1345726"
+       y="-0.42854825"
+       height="1.8570966">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.0645658"
+         id="feGaussianBlur6073" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5585"
+       id="radialGradient2984"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4937663,0,0,1.493766,135.56448,35.312572)"
+       cx="-273.07968"
+       cy="-71.143715"
+       fx="-273.07968"
+       fy="-71.143715"
+       r="27.622614" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5837-6-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5839-6-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5841-0-7" />
+    </linearGradient>
+    <linearGradient
+       y2="-27.740944"
+       x2="-186.73495"
+       y1="-31.514177"
+       x1="-187.10881"
+       gradientTransform="matrix(0.4138933,0,0,0.53848247,79.333978,50.324729)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3016"
+       xlink:href="#linearGradient5837-6-7"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="18.289061"
+     inkscape:cy="6.762927"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="752"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2847"
+       empspacing="5"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3884">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(8.8571424,-13.162344)">
+    <rect
+       style="fill:none;stroke:none"
+       id="rect6075"
+       width="23.358467"
+       height="23.366125"
+       x="-8.554285"
+       y="13.424244"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter6071)"
+       id="rect6053"
+       width="37.971432"
+       height="5.9618907"
+       x="-201.937"
+       y="-31.972912"
+       rx="7.3285885"
+       ry="5.6566281"
+       transform="matrix(0.40675575,0,0,0.52698275,77.694152,49.393783)" />
+    <path
+       style="fill:#555753;fill-opacity:1;stroke:url(#linearGradient5789);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:220"
+       d="m -2.1834145,28.661845 10.6501347,0.01504 c 0,0 2.7231988,3.487896 2.7231988,3.487896 0.291402,0.369812 0.471157,0.881308 0.471157,1.448047 0,1.133475 -0.719028,2.045984 -1.612165,2.045984 l -13.8283956,0 c -0.8931418,0 -1.6121692,-0.912509 -1.6121692,-2.045984 0,-0.566739 0.1797546,-1.078235 0.4711558,-1.448047 0,0 2.7370835,-3.50293 2.7370835,-3.50293 z"
+       id="rect5738"
+       sodipodi:nodetypes="ccssccssc" />
+    <path
+       transform="matrix(0.43506265,0,0,0.56909357,82.906459,50.822997)"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.81427181"
+       inkscape:original="M -194.625 -37.5 C -194.625 -37.5 -200.4375 -31.46875 -200.4375 -31.46875 C -200.81227 -31.093985 -201.03125 -30.595841 -201.03125 -30.03125 C -201.03125 -28.884593 -200.14666 -28 -199 -28 L -187.03125 -28 C -185.88461 -28 -185 -28.884598 -185 -30.03125 C -185 -30.595841 -185.21898 -31.093985 -185.59375 -31.46875 C -185.59375 -31.46875 -194.625 -37.5 -194.625 -37.5 z "
+       style="fill:url(#linearGradient6005);fill-opacity:1;stroke:none"
+       id="path6003"
+       d="m -194.71875,-38.3125 a 0.81435323,0.81435323 0 0 0 -0.5,0.25 c 0,0 -5.8125,6.03125 -5.8125,6.03125 L -201,-32 c -0.50698,0.516344 -0.84375,1.202669 -0.84375,1.96875 0,1.565438 1.27831,2.84375 2.84375,2.84375 l 11.96875,0 c 1.56543,0 2.84375,-1.278306 2.84375,-2.84375 0,-0.775138 -0.32601,-1.482268 -0.84375,-2 a 0.81435323,0.81435323 0 0 0 -0.125,-0.125 c 0,0 -9.03125,-6.03125 -9.03125,-6.03125 a 0.81435323,0.81435323 0 0 0 -0.53125,-0.125 z" />
+    <path
+       transform="matrix(0.2236391,0,0,-0.10169145,62.64793,25.033509)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5849"
+       style="fill:#080a0a;fill-opacity:1;stroke:none;filter:url(#filter5867)"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient5881);fill-opacity:1;stroke:url(#linearGradient5736);stroke-width:2.75551581;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5557"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(0.3148221,-0.18130438,-0.1816042,-0.31375467,75.500607,-43.264727)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path5871"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(-0.27241976,0.15733319,0.12564509,0.21769503,-62.422849,75.705835)" />
+    <rect
+       y="23.161077"
+       x="7.9319654"
+       height="0.98809648"
+       width="4.4128237"
+       id="rect5921"
+       style="opacity:0.3918919;fill:url(#linearGradient5923);fill-opacity:1;stroke:none"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:url(#linearGradient5993);fill-opacity:1;stroke:url(#linearGradient6001);stroke-width:0.99999994"
+       id="rect5955"
+       width="2.9257419"
+       height="2.9381447"
+       x="1.6698172"
+       y="-30.654408"
+       rx="1.462871"
+       ry="1.462871"
+       transform="scale(1,-1)" />
+    <path
+       transform="matrix(0.21403186,0,0,0.21410204,59.564381,35.385048)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5883"
+       style="fill:none;stroke:url(#linearGradient5893);stroke-width:4.67143583;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter5903)"
+       sodipodi:type="arc" />
+    <rect
+       style="opacity:0.3918919;fill:url(#linearGradient5919);fill-opacity:1;stroke:none"
+       id="rect5911"
+       width="4.4128237"
+       height="0.98439986"
+       x="1.7676187"
+       y="23.182978"
+       transform="scale(-1,1)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffb03b;fill-opacity:1;stroke:url(#linearGradient5654);stroke-width:4.76298714;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5563"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(0.20996158,0,0,0.20994299,58.546832,35.59668)" />
+    <path
+       transform="matrix(0.09569947,0,0,0.09514232,28.384809,28.784988)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5561"
+       style="fill:#555753;fill-opacity:1;stroke:#080808;stroke-width:10.47993088;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.96846846;fill:none;stroke:url(#radialGradient5620);stroke-width:17.36606979;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5565"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(0.05727448,0,0,0.0578943,18.265279,26.552913)" />
+    <path
+       transform="matrix(0.17164741,0,0,0.1708975,48.419042,33.280513)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5583"
+       style="fill:none;stroke:url(#radialGradient2984);stroke-width:5.83866453;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:0.48584906;stroke:#000000;stroke-width:17.92076111;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5599"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(0.05509224,0,0,0.0565193,17.658035,26.461464)" />
+    <path
+       transform="matrix(-0.0571877,0,0,-0.05761426,-11.940794,19.725413)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5622"
+       style="opacity:0.96846846;fill:none;stroke:url(#radialGradient5624);stroke-width:17.42142296;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.15422242,0,0,0.15457884,43.81605,32.031328)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5626"
+       style="opacity:0.52252251;fill:none;stroke:url(#radialGradient5646);stroke-width:6.47666168;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(-0.32688719,0,0,0.32259571,-83.091337,42.311042)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5791"
+       style="fill:none;stroke:url(#linearGradient5801);stroke-width:3.07943988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <rect
+       ry="0.51294839"
+       rx="0.51294839"
+       y="34.170914"
+       x="-10.151012"
+       height="1.0258968"
+       width="9.2789555"
+       id="rect6045"
+       style="fill:url(#linearGradient6047);fill-opacity:1;stroke:none"
+       transform="scale(-1,1)" />
+    <path
+       transform="matrix(0.03786458,0,0,0.0382486,12.141381,24.44307)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5597"
+       style="opacity:0.96846846;fill:#ffffff;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       style="fill:url(#linearGradient3016);fill-opacity:1;stroke:none"
+       id="rect5835"
+       width="14.053552"
+       height="1.0818006"
+       x="-3.8772981"
+       y="34.176491"
+       rx="0.54090029"
+       ry="0.54090029" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/toolbar/22/scalable/voice-call.svg b/pidgin/pixmaps/toolbar/22/scalable/voice-call.svg
new file mode 100644
index 0000000000..c906775e50
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/22/scalable/voice-call.svg
@@ -0,0 +1,795 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg3879"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20974"
+   version="1.0"
+   sodipodi:docname="voice-24.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3881">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3617">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3619" />
+      <stop
+         style="stop-color:#0b0c0d;stop-opacity:1"
+         offset="1"
+         id="stop3621" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.0338738,0,0,1.022703,49.113708,-252.03388)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4976"
+       id="linearGradient4984"
+       x1="-24.687374"
+       y1="245.84587"
+       x2="-24.687374"
+       y2="247.61009"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4976">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop4978" />
+      <stop
+         style="stop-color:#808080;stop-opacity:1"
+         offset="1"
+         id="stop4980" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5677-7"
+       id="linearGradient5723-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0038316,0,0,0.67291737,-299.60391,95.209072)"
+       x1="305.89481"
+       y1="-120.46718"
+       x2="306.04715"
+       y2="-120.46718" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5677-7">
+      <stop
+         style="stop-color:#ff2de7;stop-opacity:1"
+         offset="0"
+         id="stop5679-1" />
+      <stop
+         style="stop-color:#7b009b;stop-opacity:1"
+         offset="1"
+         id="stop5681-4" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5043-9-6-1"
+       id="radialGradient5721-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.48374104,0.92161718,-1.0869289,0.53973041,10.51482,359.09454)"
+       cx="-306.03387"
+       cy="-120.8595"
+       fx="-306.03387"
+       fy="-120.8595"
+       r="3.03685" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5043-9-6-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5045-4-8-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5047-1-2-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5655-9"
+       id="linearGradient5719-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52563657,0,0,0.74896722,153.12631,104.25845)"
+       x1="-300.82822"
+       y1="-126.31032"
+       x2="-300.82822"
+       y2="-114.83224" />
+    <linearGradient
+       id="linearGradient5655-9"
+       inkscape:collect="always">
+      <stop
+         id="stop5657-5"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop5659-1"
+         offset="1"
+         style="stop-color:#707e83;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="-36.569096"
+       x2="-219.25159"
+       y1="-43.842201"
+       x1="-219.25159"
+       gradientTransform="matrix(-0.78353222,0,0,0.63823472,-176.89854,41.230437)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5758"
+       xlink:href="#linearGradient5853"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5853"
+       inkscape:collect="always">
+      <stop
+         id="stop5855"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1" />
+      <stop
+         id="stop5857"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5626"
+       id="linearGradient5632"
+       x1="-25.743168"
+       y1="-243.09763"
+       x2="-23.90864"
+       y2="-240.62437"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.34459514,0,0,0.65761929,31.073819,161.60062)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5626">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop5628" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:0;"
+         offset="1"
+         id="stop5630" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4971"
+       id="linearGradient4977"
+       x1="-105.74262"
+       y1="-282.20282"
+       x2="-102.94624"
+       y2="-282.20282"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4971">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4973" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4975" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4786"
+       id="linearGradient4792"
+       x1="-106.91152"
+       y1="280.91522"
+       x2="-101.28181"
+       y2="282.32028"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.40915917,0,0,0.50230701,64.794864,-139.49239)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4786">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop4788" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop4790" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5206"
+       id="linearGradient5212"
+       x1="-304.49771"
+       y1="-142.89493"
+       x2="-262.4259"
+       y2="-143.92334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5206">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop5208" />
+      <stop
+         style="stop-color:#dededd;stop-opacity:0;"
+         offset="1"
+         id="stop5210" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5388"
+       id="linearGradient5394"
+       x1="-283.80222"
+       y1="-143.74782"
+       x2="-283.80222"
+       y2="-141.12897"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52812148,0,0,0.55524807,152.92759,81.21193)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5388">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop5390" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop5392" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5376"
+       id="radialGradient5382"
+       cx="-284.44626"
+       cy="-153.18155"
+       fx="-284.44626"
+       fy="-153.18155"
+       r="17.449057"
+       gradientTransform="matrix(0.39680407,0.00462157,-0.0039183,0.50203811,114.94145,79.306255)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5376">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop5378" />
+      <stop
+         style="stop-color:#434542;stop-opacity:1"
+         offset="1"
+         id="stop5380" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3617"
+       id="linearGradient3623"
+       x1="1.421198"
+       y1="19.01931"
+       x2="1.421198"
+       y2="34.927505"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0323022,0,0,0.62872826,-5.0367759,-2.8264081)" />
+    <linearGradient
+       id="linearGradient5853-9"
+       inkscape:collect="always">
+      <stop
+         id="stop5855-9"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1" />
+      <stop
+         id="stop5857-6"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5655-9-5"
+       id="linearGradient2892-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.77127394,0,0,0.69309231,220.91736,97.227704)"
+       x1="-300.82822"
+       y1="-126.31032"
+       x2="-300.82822"
+       y2="-114.83224" />
+    <linearGradient
+       id="linearGradient5655-9-5"
+       inkscape:collect="always">
+      <stop
+         id="stop5657-5-8"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop5659-1-7"
+         offset="1"
+         style="stop-color:#707e83;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3617-3"
+       id="linearGradient2894-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.77739212,0,0,0.56621027,-10.810779,-1.5472934)"
+       x1="1.421198"
+       y1="19.01931"
+       x2="1.421198"
+       y2="34.927505" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3617-3">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3619-4" />
+      <stop
+         style="stop-color:#0b0c0d;stop-opacity:1"
+         offset="1"
+         id="stop3621-6" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5043-9-6-1-1"
+       id="radialGradient2896-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.48374104,0.92161718,1.0869289,0.53973041,-4.6726884,359.09453)"
+       cx="-306.03387"
+       cy="-120.8595"
+       fx="-306.03387"
+       fy="-120.8595"
+       r="3.03685" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5043-9-6-1-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5045-4-8-8-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5047-1-2-6-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5677-7-2"
+       id="linearGradient2898-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.74926868,0,0,0.67528296,-215.80931,95.061921)"
+       x1="305.89481"
+       y1="-120.46718"
+       x2="306.04715"
+       y2="-120.46718" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5677-7-2">
+      <stop
+         style="stop-color:#ff2de7;stop-opacity:1"
+         offset="0"
+         id="stop5679-1-6" />
+      <stop
+         style="stop-color:#7b009b;stop-opacity:1"
+         offset="1"
+         id="stop5681-4-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4555-8"
+       id="linearGradient2900-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69961638,0,0,0.83812243,167.85054,51.827596)"
+       x1="-257.51324"
+       y1="-50.301723"
+       x2="-257.49792"
+       y2="-51.439991" />
+    <linearGradient
+       id="linearGradient4555-8"
+       inkscape:collect="always">
+      <stop
+         id="stop4557-5"
+         offset="0"
+         style="stop-color:#545652;stop-opacity:1;" />
+      <stop
+         id="stop4559-4"
+         offset="1"
+         style="stop-color:#80837d;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="-36.569096"
+       x2="-219.25159"
+       y1="-43.842201"
+       x1="-219.25159"
+       gradientTransform="matrix(0.736656,0,0,0.58794323,172.57296,38.700092)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2944"
+       xlink:href="#linearGradient5853-9"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4555-8"
+       id="linearGradient3017"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99999661,0,0,0.84879369,263.57748,52.023106)"
+       x1="-257.51324"
+       y1="-50.301723"
+       x2="-257.49792"
+       y2="-51.439991" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5853"
+       id="linearGradient3052"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.78353222,0,0,0.63823472,182.7448,41.268763)"
+       x1="-219.25159"
+       y1="-43.842201"
+       x2="-219.25159"
+       y2="-36.569096" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5655-9"
+       id="linearGradient3054"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52563657,0,0,0.74896722,147.28005,104.29678)"
+       x1="-300.82822"
+       y1="-126.31032"
+       x2="-300.82822"
+       y2="-114.83224" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3617"
+       id="linearGradient3056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0323022,0,0,0.62872826,-10.883035,-2.7880825)"
+       x1="1.421198"
+       y1="19.01931"
+       x2="1.421198"
+       y2="34.927505" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5043-9-6-1"
+       id="radialGradient3058"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.48374104,0.92161718,1.0869289,0.53973041,-4.6685612,359.13287)"
+       cx="-306.03387"
+       cy="-120.8595"
+       fx="-306.03387"
+       fy="-120.8595"
+       r="3.03685" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5677-7"
+       id="linearGradient3060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0038316,0,0,0.67291737,-293.75765,95.247398)"
+       x1="305.89481"
+       y1="-120.46718"
+       x2="306.04715"
+       y2="-120.46718" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4555-8"
+       id="linearGradient3062"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.97519982,0,0,0.84415901,263.06047,51.763511)"
+       x1="-257.51324"
+       y1="-50.301723"
+       x2="-257.49792"
+       y2="-51.439991" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="11.202323"
+     inkscape:cy="4.1597985"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="752"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2855"
+       empspacing="5"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3884">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(8.5714283,-0.14285715)">
+    <rect
+       style="fill:#cc0000;fill-opacity:0;stroke:none"
+       id="rect5861"
+       width="24.790443"
+       height="24.790268"
+       x="-9.2806616"
+       y="-0.527372"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       d="m -0.48273876,1.0629519 c -3.52465864,0 -6.05863694,2.8300983 -6.05863694,6.3428228 l 0,3.3085963 c 0,0.37141 0.035895,0.72774 0.097163,1.081347 l 0.9991275,0 c -0.065659,-0.350767 -0.097169,-0.710737 -0.097169,-1.081347 l 0,-3.3085963 c 0,-3.2355382 2.6134218,-5.8263589 5.85995222,-5.8263589 l 5.78571128,0 c 3.2465298,0 5.3244047,2.5908207 5.3244047,5.8263589 l 0,3.3085963 c 0,0.37061 -0.03151,0.73058 -0.09716,1.081347 l 1.009535,0 c 0.06128,-0.353607 0.09717,-0.709937 0.09717,-1.081347 l 0,-3.3085963 c 0,-3.5127245 -2.5943893,-6.3428228 -6.1190468,-6.3428228 l -6.80105096,0 z"
+       id="rect5549"
+       sodipodi:nodetypes="ccccccccccccccccc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="fill:url(#radialGradient5382);fill-opacity:1;stroke:none"
+       d="M -6.1124165,5.0092681 C -6.2937011,4.857301 -6.3656082,4.6552646 -6.3508656,4.3393305 c 0.015145,-0.3246281 0.074427,-0.4224572 0.5782217,-0.9542902 2.4612924,-2.59830661 7.0821101,-3.80012252 11.4352585,-2.9741749 1.9884343,0.37728499 3.8595526,1.2045329 5.1621134,2.2822431 0.700934,0.5799423 1.227547,1.2049406 1.287114,1.5275892 0.08117,0.4396387 -0.165477,0.8816512 -0.492195,0.8820587 C 11.511915,5.1028987 11.414663,5.0482236 11.192716,4.8627671 8.7626236,2.8321186 4.9304322,2.0520483 1.1786312,2.4838271 -1.3654872,2.7766089 -3.5952197,3.4219776 -5.3219525,4.7999737 -5.7481258,5.1400754 -5.9063913,5.1819745 -6.1124165,5.0092681 l 0,0 z"
+       id="path5202"
+       sodipodi:nodetypes="cssssssssscc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:url(#linearGradient5394);fill-opacity:1;stroke:none;stroke-width:1.36950052;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       d="M 2.2314285,0.15982254 C 1.5681819,0.18486471 0.90718512,0.24568013 0.26747679,0.33930091 -2.2757235,0.71150594 -4.5645706,1.6180373 -6.0369733,2.9956022 c -0.00903,0.00844 -0.024029,0.00944 -0.033007,0.017935 -0.012792,0.016513 -0.023888,0.034598 -0.033008,0.053804 -0.4403793,0.3375798 -0.5877622,0.9911622 -0.3135721,1.5076317 0.2695585,0.5077469 0.8359264,0.8666088 1.3203037,0.6391068 0.00871,-0.00389 0.024399,0.00444 0.033008,0 0.023394,-0.00852 0.045687,-0.020622 0.066015,-0.035869 0.00423,-0.00222 0.012306,0.00278 0.016478,0 0.00998,-0.00699 0.022974,-0.010993 0.033007,-0.017935 0.00618,-0.00389 0.010301,-0.013659 0.016478,-0.017935 3.3537088,-2.3260348 9.7006937,-2.6339833 14.0447311,-0.7955125 0.6082274,0.2574074 1.1553506,0.4018799 1.6338756,0.7237182 0.0052,0.00623 0.01073,0.012223 0.01649,0.017935 0.0063,0.00389 0.01023,0.013659 0.01649,0.017935 0.01419,0.020208 0.0309,0.038354 0.04948,0.053804 0.502483,0.3154924 1.162228,-0.038811 1.452335,-0.5852639 0.247807,-0.4667638 0.146702,-1.0421673 -0.198045,-1.399947 -0.0047,-0.012372 -0.01023,-0.024385 -0.01649,-0.035924 -0.0032,-0.00278 -0.01325,0.00278 -0.01648,0 -0.0052,-0.00623 -0.01075,-0.012222 -0.01649,-0.017935 -0.01451,-0.013159 -0.01774,-0.041477 -0.03301,-0.053804 1.69e-4,-0.00598 1.69e-4,-0.011958 0,-0.017935 C 11.063525,2.1438018 9.7288832,1.420058 8.123231,0.9136051 6.881406,0.52191092 5.5618524,0.2860859 4.2283351,0.19568594 3.5615763,0.15048887 2.8946224,0.13475869 2.2313757,0.15981702 l 5.28e-5,5.52e-6 z M 3.2216546,1.118851 C 4.8434103,1.1445592 6.47508,1.381683 7.9747488,1.8547154 l 0.016477,0 c 1.4589832,0.4622162 2.6653182,0.7504142 3.5153102,1.5177947 0.02512,0.053659 0.06618,0.098318 0.115525,0.1256361 0.255306,0.1602946 0.345445,0.5120662 0.198047,0.7897126 -0.125292,0.2360026 -0.381595,0.5148033 -0.610642,0.4416827 -0.02417,-0.023244 -0.05231,-0.041582 -0.08252,-0.053803 C 10.586764,4.2971254 9.9816422,3.6699592 9.2950271,3.3793701 7.0201121,2.4165922 4.2797424,2.0800172 1.6537692,2.2613612 -0.92727635,2.439607 -3.385666,3.4217546 -5.1622985,4.6398355 c -0.00423,0.00278 -0.012516,-0.00278 -0.016478,0 -0.011369,0.00513 -0.022407,0.011131 -0.033007,0.017935 -0.011368,0.00513 -0.022407,0.011131 -0.033008,0.017935 -0.00629,0.00444 -0.010248,0.013549 -0.016478,0.017935 -0.2519456,0.1440146 -0.5659508,-0.1350971 -0.709663,-0.4057859 -0.1414944,-0.2665301 -0.066845,-0.6038212 0.165038,-0.7717671 0.011365,-0.00513 0.022402,-0.011131 0.033007,-0.017935 0.039117,-0.020455 0.073468,-0.051585 0.099022,-0.089739 C -4.3207441,2.1583496 -2.1238168,1.6579803 0.33351644,1.2983351 1.2668605,1.1617328 2.2486277,1.1033985 3.2216811,1.1188565 l -2.65e-5,-5.5e-6 z"
+       id="path5194"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       sodipodi:nodetypes="csssssssssssssssssssssscssccccccsssssssssssssscscc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:url(#linearGradient5212);stroke-width:1.91763961;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       id="path5204"
+       sodipodi:cx="-285.49203"
+       sodipodi:cy="-135.7495"
+       sodipodi:rx="18.775068"
+       sodipodi:ry="9.3875341"
+       d="m -300.83968,-141.15673 a 18.775068,9.3875341 0 0 1 30.74554,0.0358"
+       transform="matrix(-0.53178943,0,0,0.51135941,-148.92763,75.903492)"
+       sodipodi:start="3.7554218"
+       sodipodi:end="5.6740176"
+       sodipodi:open="true"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       d="m -6.5611649,17.801468 0,0.01611 c 0,3.512724 2.8301183,6.342822 6.34286708,6.342822 L 4.5590266,23.541443 4.7566141,22.863449 0.3433825,23.189216 c -3.2355607,0 -5.8263995,-2.470095 -5.8263995,-5.705633 l 0,-0.01611 -1.0781479,0.333995 z"
+       id="rect5551"
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       ry="1.0211699"
+       rx="1.0211699"
+       y="-0.10164929"
+       x="21.63047"
+       height="5.0177956"
+       width="2.0423398"
+       id="rect4784"
+       style="fill:#555753;fill-opacity:1;stroke:url(#linearGradient4792);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       transform="matrix(0,1,1,0,0,0)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0081301"
+       inkscape:original="M -103.46875 -287.5 C -104.58751 -287.5 -105.5 -286.58751 -105.5 -285.46875 L -105.5 -279.53125 C -105.5 -278.41249 -104.58751 -277.5 -103.46875 -277.5 L -102.53125 -277.5 C -101.41249 -277.5 -100.5 -278.41249 -100.5 -279.53125 L -100.5 -285.46875 C -100.5 -286.58751 -101.41249 -287.5 -102.53125 -287.5 L -103.46875 -287.5 z "
+       style="opacity:0.6081081;fill:none;stroke:url(#linearGradient4977);stroke-width:3.76500607;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       id="path4967"
+       d="m -103.46875,-286.5 c -0.57059,0 -1.03125,0.46066 -1.03125,1.03125 l 0,5.9375 c 0,0.57059 0.46066,1.03125 1.03125,1.03125 l 0.9375,0 c 0.57059,0 1.03125,-0.46066 1.03125,-1.03125 l 0,-5.9375 c 0,-0.57059 -0.46066,-1.03125 -1.03125,-1.03125 l -0.9375,0 z"
+       transform="matrix(0,0.1801693,0.39155051,0,113.06595,41.440494)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       transform="matrix(0,1,1,0,0,0)"
+       style="fill:url(#linearGradient5632);fill-opacity:1;stroke:none"
+       id="rect5572"
+       width="1.0458575"
+       height="3.8989625"
+       x="22.13949"
+       y="0.49657452"
+       rx="0.99727494"
+       ry="0.99727511"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient5758);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       d="m -5.3765984,9.6362166 c -1.49077,0 -2.6907551,1.0642814 -2.6907551,2.3864794 l 0,4.192469 c 0,1.322192 1.1999851,2.38648 2.6907551,2.38648 l 1.2651311,0.0013 0.015891,-8.9736896 c -0.9561106,0.024323 -0.3962926,0.00686 -1.2810216,0.00686 l 0,-5.62e-5 1e-7,6.63e-5 z"
+       id="path5707"
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient5719-5);fill-opacity:1;stroke:none"
+       id="rect5709"
+       width="0.98004872"
+       height="8.9388952"
+       x="-5.5517335"
+       y="9.1426477"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient3623);fill-opacity:1;stroke:none"
+       id="rect5711"
+       width="2.0254388"
+       height="10.001933"
+       x="-4.5823889"
+       y="9.1315699"
+       rx="1.0133103"
+       ry="1.0133103"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       id="path5713"
+       d="m -5.8661826,9.9499715 c -0.9407715,0 -1.698042,0.8558425 -1.698042,1.9190855 l 0,3.371356 c 0,1.063237 0.7572705,1.919079 1.698042,1.919079 l 1.2401832,-0.01722 0,-7.19223 c -0.6033633,0.019548 -0.6818611,0 -1.2401832,0 l 0,-7.25e-5 z"
+       style="opacity:0.5;fill:url(#radialGradient5721-4);fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient5723-8);fill-opacity:1;stroke:none"
+       id="rect5715"
+       width="2.0024893"
+       height="5.9961619"
+       x="6.5585375"
+       y="11.146509"
+       rx="0.99742299"
+       ry="0.99742311"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#dee1e3;fill-opacity:1;stroke:none"
+       id="path5859"
+       sodipodi:cx="-244.01906"
+       sodipodi:cy="-24.045986"
+       sodipodi:rx="0.83739835"
+       sodipodi:ry="1.3739837"
+       d="m -243.18166,-24.045986 a 0.83739835,1.3739837 0 1 1 -1.6748,0 0.83739835,1.3739837 0 1 1 1.6748,0 z"
+       transform="matrix(0.62336294,0,0,0.3800951,153.07483,31.796377)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient4984);fill-opacity:1;stroke:none"
+       id="rect5811-4"
+       width="1.042106"
+       height="2.3800838"
+       x="23.119368"
+       y="-1.4279883"
+       rx="0.50398123"
+       ry="0.50398123"
+       transform="matrix(0,1,-1,0,0,0)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="-0.527372"
+       x="-9.2806616"
+       height="24.790268"
+       width="24.790443"
+       id="rect5863"
+       style="fill:#ffffff;fill-opacity:0;stroke:none"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png" />
+    <rect
+       transform="scale(-1,1)"
+       style="fill:url(#linearGradient3017);fill-opacity:1;stroke:none"
+       id="rect3015"
+       width="1.0079591"
+       height="3.0484221"
+       x="5.5438328"
+       y="8.1219101"
+       rx="0.50398123"
+       ry="0.50398123"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       sodipodi:nodetypes="ccccccccc"
+       id="path3040"
+       d="m 11.222858,9.6745422 c 1.49077,0 2.690755,1.0642818 2.690755,2.3864798 l 0,4.192469 c 0,1.322192 -1.199985,2.38648 -2.690755,2.38648 l -1.2651315,0.0013 -0.015891,-8.97369 c 0.9561105,0.024323 0.3962925,0.00686 1.2810215,0.00686 l 0,-5.62e-5 0,6.63e-5 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient3052);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       y="9.1809731"
+       x="-11.397993"
+       height="8.9388952"
+       width="0.98004872"
+       id="rect3042"
+       style="fill:url(#linearGradient3054);fill-opacity:1;stroke:none"
+       transform="scale(-1,1)" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       ry="1.0133103"
+       rx="1.0133103"
+       y="9.1698952"
+       x="-10.428648"
+       height="10.001933"
+       width="2.0254388"
+       id="rect3044"
+       style="fill:url(#linearGradient3056);fill-opacity:1;stroke:none"
+       transform="scale(-1,1)" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       style="opacity:0.5;fill:url(#radialGradient3058);fill-opacity:1;stroke:none"
+       d="m 11.712442,9.9882971 c 0.940771,0 1.698042,0.8558429 1.698042,1.9190859 l 0,3.371356 c 0,1.063237 -0.757271,1.919079 -1.698042,1.919079 l -1.240183,-0.01722 0,-7.1922304 c 0.603363,0.019548 0.681861,0 1.240183,0 l 0,-7.25e-5 z"
+       id="path3046"
+       sodipodi:nodetypes="cccccccc" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       ry="0.99742311"
+       rx="0.99742299"
+       y="11.184834"
+       x="12.404797"
+       height="5.9961619"
+       width="2.0024893"
+       id="rect3048"
+       style="fill:url(#linearGradient3060);fill-opacity:1;stroke:none" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       ry="0.50398123"
+       rx="0.50398123"
+       y="8.1020288"
+       x="11.425255"
+       height="3.0317767"
+       width="0.98296487"
+       id="rect3050"
+       style="fill:url(#linearGradient3062);fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/toolbar/22/video-call.png b/pidgin/pixmaps/toolbar/22/video-call.png
new file mode 100644
index 0000000000..4105e09852
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/22/video-call.png
diff --git a/pidgin/pixmaps/toolbar/22/voice-call.png b/pidgin/pixmaps/toolbar/22/voice-call.png
new file mode 100644
index 0000000000..3a49a985cd
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/22/voice-call.png
diff --git a/pidgin/pixmaps/toolbar/32/scalable/video-call.svg b/pidgin/pixmaps/toolbar/32/scalable/video-call.svg
new file mode 100644
index 0000000000..2a55fc62f3
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/32/scalable/video-call.svg
@@ -0,0 +1,745 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg3879"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20974"
+   version="1.0"
+   sodipodi:docname="video-32.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3881">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5837"
+       id="linearGradient6047"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.41358665,0,0,0.98688214,65.009684,70.746264)"
+       x1="-206.31369"
+       y1="-38.305504"
+       x2="-193.64967"
+       y2="-23.3778" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5837">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5839" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5841" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5636">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="0"
+         id="stop5638" />
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:0;"
+         offset="1"
+         id="stop5640" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5837"
+       id="linearGradient5843"
+       x1="-187.10881"
+       y1="-31.514177"
+       x2="-186.73495"
+       y2="-27.740944"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64618052,0,0,0.98071549,126.1045,70.579917)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5795"
+       id="linearGradient5801"
+       x1="-265.00021"
+       y1="-54.745949"
+       x2="-251.85565"
+       y2="-66.937424"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5795">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5797" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5799" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5585"
+       id="radialGradient5681"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4937663,0,0,1.493766,135.56448,35.312572)"
+       cx="-277.8414"
+       cy="-82.264709"
+       fx="-277.8414"
+       fy="-82.264709"
+       r="27.622614" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5585">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5587" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5589" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5636"
+       id="radialGradient5646"
+       cx="-278.76022"
+       cy="-76.807457"
+       fx="-278.76022"
+       fy="-76.807457"
+       r="28.001333"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1576192,0,0,2.1576196,320.68789,86.658003)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5614"
+       id="radialGradient5624"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1093921,0,0,1.1093921,30.866652,8.6133536)"
+       cx="-280.78116"
+       cy="-78.911339"
+       fx="-280.78116"
+       fy="-78.911339"
+       r="29.214298" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5614">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5616" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5618" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5585"
+       id="radialGradient5591"
+       cx="-273.07968"
+       cy="-71.143715"
+       fx="-273.07968"
+       fy="-71.143715"
+       r="27.622614"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4937663,0,0,1.493766,135.56448,35.312572)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5614"
+       id="radialGradient5620"
+       cx="-281.17819"
+       cy="-78.86171"
+       fx="-281.17819"
+       fy="-78.86171"
+       r="29.214298"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3813297,0,0,1.3813297,107.2216,30.072312)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5648"
+       id="linearGradient5654"
+       x1="-269.95532"
+       y1="-62.28437"
+       x2="-255.64305"
+       y2="-34.32909"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5648">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1;"
+         offset="0"
+         id="stop5650" />
+      <stop
+         style="stop-color:#4d2100;stop-opacity:1"
+         offset="1"
+         id="stop5652" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5913"
+       id="linearGradient5919"
+       x1="-202.7368"
+       y1="-50.5"
+       x2="-192.7444"
+       y2="-50.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.65996985,0,0,0.96357258,133.50189,76.334933)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5913">
+      <stop
+         style="stop-color:#787878;stop-opacity:1;"
+         offset="0"
+         id="stop5915" />
+      <stop
+         style="stop-color:#787878;stop-opacity:0;"
+         offset="1"
+         id="stop5917" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5887"
+       id="linearGradient5893"
+       x1="-247.54591"
+       y1="-35.930092"
+       x2="-264.87021"
+       y2="-58.743122"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5887">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop5889" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop5891" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5903">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5089815"
+         id="feGaussianBlur5905" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5987"
+       id="linearGradient5993"
+       x1="-183.87694"
+       y1="-38.634178"
+       x2="-183.87694"
+       y2="-39.513264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.97563279,0,0,1.3505158,186.62098,19.061979)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5987">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1;"
+         offset="0"
+         id="stop5989" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop5991" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5995"
+       id="linearGradient6001"
+       x1="-184.21419"
+       y1="-37.343178"
+       x2="-184.21419"
+       y2="-39.290829"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.97563279,0,0,1.3505158,186.62098,19.061979)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5995">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop5997" />
+      <stop
+         style="stop-color:#72eb00;stop-opacity:1"
+         offset="1"
+         id="stop5999" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5913"
+       id="linearGradient5923"
+       gradientUnits="userSpaceOnUse"
+       x1="-203.15808"
+       y1="-50.5"
+       x2="-192.52609"
+       y2="-50.5"
+       gradientTransform="matrix(0.65996985,0,0,1.0131274,147.69017,78.862229)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="radialGradient5881"
+       cx="-263.10712"
+       cy="-59.058826"
+       fx="-263.10712"
+       fy="-59.058826"
+       r="26.905991"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.2689136,-0.7557538,0.46722378,1.4051413,361.24185,-169.10186)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5873">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop5875" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop5877" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5730"
+       id="linearGradient5736"
+       x1="-260.28085"
+       y1="-37.043636"
+       x2="-259.48315"
+       y2="-86.628036"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5730">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop5732" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="1"
+         id="stop5734" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5867"
+       x="-0.13159215"
+       width="1.2631843"
+       y="-0.13159215"
+       height="1.2631843">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.8767211"
+         id="feGaussianBlur5869" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5827"
+       id="linearGradient6005"
+       gradientUnits="userSpaceOnUse"
+       x1="-203.06625"
+       y1="-31.478365"
+       x2="-191.55763"
+       y2="-29.403404" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5827">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5829" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5831" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.67480777,0,0,0.67611232,131.29224,61.609793)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient5783"
+       id="linearGradient5789"
+       x1="-179.45006"
+       y1="-42.398266"
+       x2="-176.44347"
+       y2="-27.845135"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5783">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop5785" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop5787" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter6071"
+       x="-0.06728632"
+       width="1.1345726"
+       y="-0.42854825"
+       height="1.8570966">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.0645658"
+         id="feGaussianBlur6073" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5636-1">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="0"
+         id="stop5638-3" />
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:0;"
+         offset="1"
+         id="stop5640-1" />
+    </linearGradient>
+    <radialGradient
+       r="28.001333"
+       fy="-83.346062"
+       fx="-287.39545"
+       cy="-83.346062"
+       cx="-287.39545"
+       gradientTransform="matrix(2.1576192,0,0,2.1576196,320.68789,86.658003)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2866"
+       xlink:href="#linearGradient5636-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5585-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5587-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5589-8" />
+    </linearGradient>
+    <radialGradient
+       r="27.622614"
+       fy="-82.264709"
+       fx="-277.8414"
+       cy="-82.264709"
+       cx="-277.8414"
+       gradientTransform="matrix(1.4937663,0,0,1.493766,135.56448,35.312572)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2925"
+       xlink:href="#linearGradient5585-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5837-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5839-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5841-0" />
+    </linearGradient>
+    <linearGradient
+       y2="-27.740944"
+       x2="-186.73495"
+       y1="-31.514177"
+       x1="-187.10881"
+       gradientTransform="matrix(0.64618052,0,0,0.98071549,126.1045,70.579917)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2963"
+       xlink:href="#linearGradient5837-6"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.79899"
+     inkscape:cx="27.584929"
+     inkscape:cy="14.370291"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="752"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2847"
+       empspacing="5"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3884">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(8.8571424,-13.162344)">
+    <rect
+       style="fill:none;stroke:none"
+       id="rect6075"
+       width="31.678553"
+       height="31.682362"
+       x="-8.6871271"
+       y="13.354993"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter6071)"
+       id="rect6053"
+       width="37.971432"
+       height="5.9618907"
+       x="-201.937"
+       y="-31.972912"
+       rx="4.5514064"
+       ry="4.1718316"
+       transform="matrix(0.65495039,0,0,0.71454115,127.26597,62.126448)" />
+    <path
+       style="fill:#555753;fill-opacity:1;stroke:url(#linearGradient5789);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:220"
+       d="m -0.65573086,35.592188 15.57065686,0.01735 c 0,0 3.981358,4.025893 3.981358,4.025893 0.426034,0.426854 0.688838,1.017248 0.688838,1.671404 0,1.30831 -1.051229,2.361571 -2.357009,2.361571 l -20.2173223,0 c -1.3057868,0 -2.3570157,-1.053261 -2.3570157,-2.361571 0,-0.654156 0.2628038,-1.24455 0.688837,-1.671404 0,0 4.00165714,-4.043246 4.00165714,-4.043246 z"
+       id="rect5738"
+       sodipodi:nodetypes="ccssccssc" />
+    <path
+       transform="matrix(0.65996985,0,0,0.66004921,128.42096,61.078237)"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.81427181"
+       inkscape:original="M -194.625 -37.5 C -194.625 -37.5 -200.4375 -31.46875 -200.4375 -31.46875 C -200.81227 -31.093985 -201.03125 -30.595841 -201.03125 -30.03125 C -201.03125 -28.884593 -200.14666 -28 -199 -28 L -187.03125 -28 C -185.88461 -28 -185 -28.884598 -185 -30.03125 C -185 -30.595841 -185.21898 -31.093985 -185.59375 -31.46875 C -185.59375 -31.46875 -194.625 -37.5 -194.625 -37.5 z "
+       style="fill:url(#linearGradient6005);fill-opacity:1;stroke:none"
+       id="path6003"
+       d="m -194.71875,-38.3125 a 0.81435323,0.81435323 0 0 0 -0.5,0.25 c 0,0 -5.8125,6.03125 -5.8125,6.03125 L -201,-32 c -0.50698,0.516344 -0.84375,1.202669 -0.84375,1.96875 0,1.565438 1.27831,2.84375 2.84375,2.84375 l 11.96875,0 c 1.56543,0 2.84375,-1.278306 2.84375,-2.84375 0,-0.775138 -0.32601,-1.482268 -0.84375,-2 a 0.81435323,0.81435323 0 0 0 -0.125,-0.125 c 0,0 -9.03125,-6.03125 -9.03125,-6.03125 a 0.81435323,0.81435323 0 0 0 -0.53125,-0.125 z" />
+    <path
+       transform="matrix(0.30329744,0,0,-0.13788445,87.876709,29.09611)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5849"
+       style="fill:#080a0a;fill-opacity:1;stroke:none;filter:url(#filter5867)"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient5881);fill-opacity:1;stroke:url(#linearGradient5736);stroke-width:2.01394916;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5557"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(0.42970463,-0.2486637,-0.24787384,-0.43032274,106.34198,-64.482558)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path5871"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(-0.36945335,0.21332963,0.1703988,0.29517486,-81.523427,97.512211)" />
+    <rect
+       y="27.192732"
+       x="13.671385"
+       height="1.0131263"
+       width="5.9846334"
+       id="rect5921"
+       style="opacity:0.3918919;fill:url(#linearGradient5923);fill-opacity:1;stroke:none"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:url(#linearGradient5993);fill-opacity:1;stroke:url(#linearGradient6001);stroke-width:1"
+       id="rect5955"
+       width="2.9194198"
+       height="3.9838595"
+       x="5.6390796"
+       y="-35.621799"
+       rx="1.4597099"
+       ry="1.4597099"
+       transform="scale(1,-1)" />
+    <path
+       transform="matrix(0.29026818,0,0,0.29030308,83.694827,43.131865)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5883"
+       style="fill:none;stroke:url(#linearGradient5893);stroke-width:3.44488311;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter5903)"
+       sodipodi:type="arc" />
+    <rect
+       style="opacity:0.3918919;fill:url(#linearGradient5919);fill-opacity:1;stroke:none"
+       id="rect5911"
+       width="5.9846334"
+       height="0.96357155"
+       x="-0.51689219"
+       y="27.192732"
+       transform="scale(-1,1)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffb03b;fill-opacity:1;stroke:url(#linearGradient5654);stroke-width:3.5092566;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5563"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(0.28486132,0,0,0.28505999,82.294223,43.039948)" />
+    <path
+       transform="matrix(0.13363627,0,0,0.13347568,42.410394,34.081195)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5561"
+       style="fill:#555753;fill-opacity:1;stroke:#080808;stroke-width:7.48749876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.96846846;fill:none;stroke:url(#radialGradient5620);stroke-width:10.50450611;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5565"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(0.09480768,0,0,0.09558841,32.154146,31.815867)" />
+    <path
+       transform="matrix(0.24682601,0,0,0.24643715,72.269758,40.764913)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5583"
+       style="fill:none;stroke:url(#radialGradient5591);stroke-width:4.05463219;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:0.48584906;stroke:#000000;stroke-width:17.71681404;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5599"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(0.05617589,0,0,0.05671252,21.949064,29.53016)" />
+    <path
+       transform="matrix(0.03812194,0,0,0.03765421,16.214869,27.401572)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5597"
+       style="opacity:0.96846846;fill:#ffffff;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(-0.09525042,0,0,-0.09496858,-17.987943,20.516457)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5622"
+       style="opacity:0.96846846;fill:none;stroke:url(#radialGradient5624);stroke-width:10.51420879;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.20915513,0,0,0.20959499,62.337075,38.584523)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5626"
+       style="opacity:0.52252251;fill:none;stroke:url(#radialGradient5646);stroke-width:4.77612066;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(-0.45747411,0,0,0.45812567,-113.08973,53.843356)"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5791"
+       style="fill:none;stroke:url(#linearGradient5801);stroke-width:2.18436098;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <rect
+       ry="0.99131328"
+       rx="0.99131328"
+       y="41.151222"
+       x="-18.139938"
+       height="1.9826266"
+       width="14.043139"
+       id="rect6045"
+       style="fill:url(#linearGradient6047);fill-opacity:1;stroke:none"
+       transform="scale(-1,1)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.52252251;fill:none;stroke:url(#radialGradient2866);stroke-width:4.82624292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5951"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(-0.20848725,0,0,-0.2059217,-47.871007,13.860824)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:url(#radialGradient2925);stroke-width:5.84374952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5679"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 a 26.233063,26.233063 0 1 1 -52.46613,0 26.233063,26.233063 0 1 1 52.46613,0 z"
+       transform="matrix(0.17117233,0,0,0.17107373,52.309275,36.300725)" />
+    <rect
+       style="fill:url(#linearGradient2963);fill-opacity:1;stroke:none"
+       id="rect5835"
+       width="21.940756"
+       height="1.9702379"
+       x="-3.8070128"
+       y="41.169807"
+       rx="1.00449"
+       ry="1.00449" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/toolbar/32/scalable/voice-call.svg b/pidgin/pixmaps/toolbar/32/scalable/voice-call.svg
new file mode 100644
index 0000000000..c6697f332b
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/32/scalable/voice-call.svg
@@ -0,0 +1,990 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg3879"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20974"
+   version="1.0"
+   sodipodi:docname="voice-32.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3881">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3617">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3619" />
+      <stop
+         style="stop-color:#0b0c0d;stop-opacity:1"
+         offset="1"
+         id="stop3621" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective96" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4555"
+       id="linearGradient4563"
+       gradientUnits="userSpaceOnUse"
+       x1="-257.51324"
+       y1="-50.301723"
+       x2="-257.49792"
+       y2="-51.439991"
+       gradientTransform="matrix(0.66407978,0,0,0.75715849,190.43006,50.728904)" />
+    <linearGradient
+       id="linearGradient4555"
+       inkscape:collect="always">
+      <stop
+         id="stop4557"
+         offset="0"
+         style="stop-color:#545652;stop-opacity:1;" />
+      <stop
+         id="stop4559"
+         offset="1"
+         style="stop-color:#80837d;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.0450411,0,0,1.0014371,56.421478,-248.82007)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4976"
+       id="linearGradient4984"
+       x1="-24.687374"
+       y1="245.84587"
+       x2="-24.687374"
+       y2="247.61009"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4976">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop4978" />
+      <stop
+         style="stop-color:#808080;stop-opacity:1"
+         offset="1"
+         id="stop4980" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4555"
+       id="linearGradient4553"
+       x1="-257.51324"
+       y1="-50.301723"
+       x2="-257.49792"
+       y2="-51.439991"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.68621958,0,0,0.68621958,170.73384,47.327606)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5677-7"
+       id="linearGradient5723-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99553756,0,0,0.89724059,-297.05952,126.21271)"
+       x1="305.89481"
+       y1="-120.46718"
+       x2="306.04715"
+       y2="-120.46718" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5677-7">
+      <stop
+         style="stop-color:#ff2de7;stop-opacity:1"
+         offset="0"
+         id="stop5679-1" />
+      <stop
+         style="stop-color:#7b009b;stop-opacity:1"
+         offset="1"
+         id="stop5681-4" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5043-9-6-1"
+       id="radialGradient5721-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64273656,1.224542,-1.4441796,0.7171335,16.526738,477.02976)"
+       cx="-306.03387"
+       cy="-120.8595"
+       fx="-306.03387"
+       fy="-120.8595"
+       r="3.03685" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5043-9-6-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5045-4-8-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5047-1-2-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5655-9"
+       id="linearGradient5719-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0247755,0,0,0.92090367,303.84649,129.09036)"
+       x1="-300.82822"
+       y1="-126.31032"
+       x2="-300.82822"
+       y2="-114.83224" />
+    <linearGradient
+       id="linearGradient5655-9"
+       inkscape:collect="always">
+      <stop
+         id="stop5657-5"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop5659-1"
+         offset="1"
+         style="stop-color:#707e83;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="-36.569096"
+       x2="-219.25159"
+       y1="-43.842201"
+       x1="-219.25159"
+       gradientTransform="matrix(-0.97877933,0,0,0.78119332,-218.97584,51.325392)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5758"
+       xlink:href="#linearGradient5853"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5853"
+       inkscape:collect="always">
+      <stop
+         id="stop5855"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1" />
+      <stop
+         id="stop5857"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5626"
+       id="linearGradient5632"
+       x1="-25.743168"
+       y1="-243.09763"
+       x2="-23.90864"
+       y2="-240.62437"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6571758,0,0,1.0085905,46.149483,249.53936)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5626">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop5628" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:0;"
+         offset="1"
+         id="stop5630" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4971"
+       id="linearGradient4977"
+       x1="-105.74262"
+       y1="-282.20282"
+       x2="-102.94624"
+       y2="-282.20282"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4971">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4973" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4975" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4786"
+       id="linearGradient4792"
+       x1="-106.91152"
+       y1="280.91522"
+       x2="-101.28181"
+       y2="282.32028"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.60027296,0,0,0.696962,91.940589,-191.45315)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4786">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop4788" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop4790" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5677"
+       id="linearGradient5449-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.68621958,0,0,0.76218683,-188.89688,109.60097)"
+       x1="305.89481"
+       y1="-120.46718"
+       x2="306.04715"
+       y2="-120.46718" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5677">
+      <stop
+         style="stop-color:#ff2de7;stop-opacity:1"
+         offset="0"
+         id="stop5679" />
+      <stop
+         style="stop-color:#7b009b;stop-opacity:1"
+         offset="1"
+         id="stop5681" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5043-9-6"
+       id="radialGradient5447-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.64273656,1.224542,1.4441796,0.7171335,-3.1640994,476.83323)"
+       cx="-306.03387"
+       cy="-120.8595"
+       fx="-306.03387"
+       fy="-120.8595"
+       r="3.03685" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5043-9-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5045-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5047-1-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5655"
+       id="linearGradient5443-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75005399,0,0,0.85573606,208.06197,120.96548)"
+       x1="-300.82822"
+       y1="-126.31032"
+       x2="-300.82822"
+       y2="-114.83224" />
+    <linearGradient
+       id="linearGradient5655"
+       inkscape:collect="always">
+      <stop
+         id="stop5657"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop5659"
+         offset="1"
+         style="stop-color:#707e83;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5661"
+       id="linearGradient5667"
+       x1="-219.25159"
+       y1="-43.842201"
+       x2="-219.25159"
+       y2="-36.569096"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.77824526,0,0,0.72964259,189.11899,48.738021)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5661">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop5663" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop5665" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5206"
+       id="linearGradient5212"
+       x1="-304.49771"
+       y1="-142.89493"
+       x2="-262.4259"
+       y2="-143.92334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5206">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop5208" />
+      <stop
+         style="stop-color:#dededd;stop-opacity:0;"
+         offset="1"
+         id="stop5210" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5388"
+       id="linearGradient5394"
+       x1="-283.80222"
+       y1="-143.74782"
+       x2="-283.80222"
+       y2="-141.12897"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69617626,0,0,0.77539869,204.63341,113.36017)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5388">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop5390" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop5392" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5376"
+       id="radialGradient5382"
+       cx="-284.44626"
+       cy="-153.18155"
+       fx="-284.44626"
+       fy="-153.18155"
+       r="17.449057"
+       gradientTransform="matrix(0.52159422,0.00570372,-0.00515056,0.61959156,154.17873,98.370923)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5376">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop5378" />
+      <stop
+         style="stop-color:#434542;stop-opacity:1"
+         offset="1"
+         id="stop5380" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3617"
+       id="linearGradient3623"
+       x1="1.421198"
+       y1="19.01931"
+       x2="1.421198"
+       y2="34.927505"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0329046,0,0,0.75231698,-4.0458192,-2.1508414)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3617"
+       id="linearGradient3627"
+       gradientUnits="userSpaceOnUse"
+       x1="1.421198"
+       y1="19.01931"
+       x2="1.421198"
+       y2="34.927505"
+       gradientTransform="translate(27.998451,0)" />
+    <inkscape:perspective
+       id="perspective3637"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3617-8"
+       id="linearGradient3627-1"
+       gradientUnits="userSpaceOnUse"
+       x1="1.421198"
+       y1="19.01931"
+       x2="1.421198"
+       y2="34.927505"
+       gradientTransform="translate(27.998451,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3617-8">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3619-2" />
+      <stop
+         style="stop-color:#0b0c0d;stop-opacity:1"
+         offset="1"
+         id="stop3621-4" />
+    </linearGradient>
+    <linearGradient
+       y2="34.927505"
+       x2="1.421198"
+       y1="19.01931"
+       x1="1.421198"
+       gradientTransform="matrix(0.68621958,0,0,0.68621958,15.319865,-0.89371418)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3646"
+       xlink:href="#linearGradient3617-8"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5853"
+       id="linearGradient2890"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.97877933,0,0,0.78119332,232.83687,51.325392)"
+       x1="-219.25159"
+       y1="-43.842201"
+       x2="-219.25159"
+       y2="-36.569096" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5655-9"
+       id="linearGradient2892"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0247755,0,0,0.92090367,289.98546,129.09036)"
+       x1="-300.82822"
+       y1="-126.31032"
+       x2="-300.82822"
+       y2="-114.83224" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3617"
+       id="linearGradient2894"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0329046,0,0,0.75231698,-17.906854,-2.1508414)"
+       x1="1.421198"
+       y1="19.01931"
+       x2="1.421198"
+       y2="34.927505" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5043-9-6-1"
+       id="radialGradient2896"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.64273656,1.224542,1.4441796,0.7171335,-2.6657025,477.02976)"
+       cx="-306.03387"
+       cy="-120.8595"
+       fx="-306.03387"
+       fy="-120.8595"
+       r="3.03685" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5677-7"
+       id="linearGradient2898"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99553756,0,0,0.89724059,-283.19849,126.21271)"
+       x1="305.89481"
+       y1="-120.46718"
+       x2="306.04715"
+       y2="-120.46718" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4555"
+       id="linearGradient2900"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.68621958,0,0,0.68621958,156.87281,47.327606)"
+       x1="-257.51324"
+       y1="-50.301723"
+       x2="-257.49792"
+       y2="-51.439991" />
+    <inkscape:perspective
+       id="perspective2910"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5853-9"
+       id="linearGradient2890-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.97877933,0,0,0.78119332,232.83687,51.325392)"
+       x1="-219.25159"
+       y1="-43.842201"
+       x2="-219.25159"
+       y2="-36.569096" />
+    <linearGradient
+       id="linearGradient5853-9"
+       inkscape:collect="always">
+      <stop
+         id="stop5855-9"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1" />
+      <stop
+         id="stop5857-6"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5655-9-5"
+       id="linearGradient2892-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0247755,0,0,0.92090367,290.97234,129.09035)"
+       x1="-300.82822"
+       y1="-126.31032"
+       x2="-300.82822"
+       y2="-114.83224" />
+    <linearGradient
+       id="linearGradient5655-9-5"
+       inkscape:collect="always">
+      <stop
+         id="stop5657-5-8"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop5659-1-7"
+         offset="1"
+         style="stop-color:#707e83;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3617-3"
+       id="linearGradient2894-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0329046,0,0,0.75231698,-16.919972,-2.1508407)"
+       x1="1.421198"
+       y1="19.01931"
+       x2="1.421198"
+       y2="34.927505" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3617-3">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3619-4" />
+      <stop
+         style="stop-color:#0b0c0d;stop-opacity:1"
+         offset="1"
+         id="stop3621-6" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5043-9-6-1-1"
+       id="radialGradient2896-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.64273656,1.224542,1.4441796,0.7171335,-3.6525853,477.02975)"
+       cx="-306.03387"
+       cy="-120.8595"
+       fx="-306.03387"
+       fy="-120.8595"
+       r="3.03685" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5043-9-6-1-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5045-4-8-8-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5047-1-2-6-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5677-7-2"
+       id="linearGradient2898-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99553756,0,0,0.89724059,-284.18537,126.2127)"
+       x1="305.89481"
+       y1="-120.46718"
+       x2="306.04715"
+       y2="-120.46718" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5677-7-2">
+      <stop
+         style="stop-color:#ff2de7;stop-opacity:1"
+         offset="0"
+         id="stop5679-1-6" />
+      <stop
+         style="stop-color:#7b009b;stop-opacity:1"
+         offset="1"
+         id="stop5681-4-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4555-8"
+       id="linearGradient2900-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9295656,0,0,1.1136035,220.46357,68.767752)"
+       x1="-257.51324"
+       y1="-50.301723"
+       x2="-257.49792"
+       y2="-51.439991" />
+    <linearGradient
+       id="linearGradient4555-8"
+       inkscape:collect="always">
+      <stop
+         id="stop4557-5"
+         offset="0"
+         style="stop-color:#545652;stop-opacity:1;" />
+      <stop
+         id="stop4559-4"
+         offset="1"
+         style="stop-color:#80837d;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="-36.569096"
+       x2="-219.25159"
+       y1="-43.842201"
+       x1="-219.25159"
+       gradientTransform="matrix(0.97877933,0,0,0.78119332,231.84999,51.325392)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2944"
+       xlink:href="#linearGradient5853-9"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4555-8"
+       id="linearGradient3017"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9295656,0,0,1.1136035,245.41352,68.767752)"
+       x1="-257.51324"
+       y1="-50.301723"
+       x2="-257.49792"
+       y2="-51.439991" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="30.024929"
+     inkscape:cy="6.5961333"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="752"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2855"
+       empspacing="5"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3884">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(8.5714283,-0.14285715)">
+    <rect
+       style="fill:#cc0000;fill-opacity:0;stroke:none"
+       id="rect5861"
+       width="32.938541"
+       height="32.938541"
+       x="-9.7751017"
+       y="-0.79568303"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       d="m 1.9145026,1.3173618 c -4.6831399,0 -8.4777215,3.7603186 -8.4777215,8.4276345 l 0,4.3960947 c 0,0.493488 0.047692,0.966938 0.1290984,1.436772 l 1.0219853,0 c -0.087239,-0.46606 -0.1291054,-0.944348 -0.1291054,-1.436772 l 0,-4.3960947 c 0,-4.2990218 4.2056809,-7.7414149 8.5192778,-7.7414149 l 7.6873528,0 c 4.313596,0 7.789175,3.4423931 7.789175,7.7414149 l 0,4.3960947 c 0,0.492424 -0.04186,0.970712 -0.129105,1.436772 l 0.974072,0 c 0.08141,-0.469834 0.129105,-0.943284 0.129105,-1.436772 l 0,-4.3960947 c 0,-4.6673159 -3.794582,-8.4276345 -8.477721,-8.4276345 l -9.0364134,0 z"
+       id="rect5549"
+       sodipodi:nodetypes="ccccccccccccccccc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="fill:url(#radialGradient5382);fill-opacity:1;stroke:none"
+       d="m -4.9451328,6.6771159 c -0.2382967,-0.1875506 -0.3328176,-0.4368942 -0.3134387,-0.826805 0.019908,-0.4006407 0.097834,-0.5213766 0.7600657,-1.1777397 3.2353396,-3.2067063 9.3093493,-4.6899303 15.0315108,-3.670585 2.613773,0.4656271 5.073336,1.4865771 6.785537,2.8166358 0.921369,0.7157372 1.613595,1.4870802 1.691896,1.8852778 0.106689,0.542581 -0.217518,1.088092 -0.646986,1.0885949 C 18.22184,6.7926704 18.094005,6.725193 17.802257,6.4963114 14.60793,3.9901815 9.5705605,3.0274559 4.6388625,3.5603368 1.2946491,3.9216742 -1.6363077,4.7181575 -3.9060775,6.4188147 -4.4662772,6.8385521 -4.6743153,6.8902619 -4.9451328,6.6771159 l 0,0 z"
+       id="path5202"
+       sodipodi:nodetypes="cssssssssscc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:url(#linearGradient5394);fill-opacity:1;stroke:none;stroke-width:1.36950052;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       d="M 5.9838584,0.17166026 C 5.1095585,0.20663073 4.2382243,0.29156016 3.394953,0.42230013 0.04247471,0.94208089 -2.9747116,2.2080433 -4.915651,4.1317997 c -0.011904,0.011787 -0.031676,0.013182 -0.043511,0.025045 -0.016864,0.023062 -0.031489,0.048317 -0.043511,0.075137 -0.5805135,0.4714269 -0.7747954,1.3841486 -0.4133546,2.1053935 0.3553353,0.7090636 1.1019287,0.9693649 1.7404406,0.6516606 0.011487,-0.00543 0.032163,0.00621 0.043511,0 0.030839,-0.011883 0.060226,-0.028799 0.087022,-0.050091 0.00557,-0.0031 0.016221,0.00388 0.021721,0 0.013158,-0.00977 0.030284,-0.015352 0.043511,-0.025045 0.00815,-0.00543 0.013575,-0.019075 0.021721,-0.025045 4.42090043,-3.2482857 12.7875743,-3.6783329 18.513938,-1.1109257 0.801771,0.359467 1.522996,0.5612214 2.153794,1.0106657 0.0069,0.00871 0.01416,0.01707 0.02172,0.025045 0.0083,0.00543 0.0135,0.019075 0.02172,0.025045 0.01873,0.028221 0.04073,0.053561 0.06523,0.075137 0.662378,0.4405821 1.532062,0.1866468 1.914485,-0.5764698 0.32666,-0.6518311 0.193384,-1.4553767 -0.261066,-1.9550127 -0.0062,-0.017277 -0.01349,-0.034053 -0.02172,-0.050168 -0.0042,-0.00388 -0.01747,0.00388 -0.02172,0 -0.0069,-0.00871 -0.01417,-0.017069 -0.02172,-0.025045 -0.01914,-0.018377 -0.02339,-0.057923 -0.04351,-0.075137 2.23e-4,-0.00835 2.23e-4,-0.016699 0,-0.025045 C 17.626438,2.9422684 15.867096,1.9315671 13.750505,1.2243105 12.113516,0.67731325 10.374064,0.34798591 8.6162053,0.22174326 7.7372758,0.15862581 6.8580887,0.13665877 5.9837888,0.1716525 l 6.96e-5,7.76e-6 z M 7.2891889,1.1336088 c 2.1378181,0.035901 4.2887031,0.3670427 6.2655851,1.0276281 l 0.02172,0 c 1.92325,0.6454806 3.513456,1.4252715 4.633924,2.4969112 0.03311,0.074934 0.08725,0.1372993 0.152288,0.1754495 0.336545,0.2238499 0.455369,0.7150959 0.261066,1.1028263 -0.16516,0.3295754 -0.503022,0.478072 -0.804953,0.3759598 -0.03188,-0.03246 -0.06896,-0.058069 -0.108777,-0.075136 C 16.997965,5.7085187 16.200286,5.2394489 15.295181,4.833644 12.29636,3.4891337 8.6839711,2.9762928 5.2223808,3.229538 1.8200146,3.4784567 -1.420665,4.4860717 -3.7626438,6.1871102 c -0.00557,0.00388 -0.016499,-0.00388 -0.021721,0 -0.014986,0.00717 -0.029537,0.015544 -0.043511,0.025045 -0.014986,0.00717 -0.029537,0.015544 -0.043511,0.025045 -0.00829,0.00621 -0.013506,0.01892 -0.021721,0.025045 -0.3321179,0.2011152 -0.7460434,0.052185 -0.9354868,-0.3258303 -0.1865196,-0.3722068 -0.088115,-0.8432306 0.2175551,-1.0777654 0.014982,-0.00717 0.029532,-0.015544 0.043511,-0.025045 0.051565,-0.028565 0.096846,-0.072038 0.130533,-0.1253199 1.7837016,-1.7457008 4.67971835,-2.821787 7.9190054,-3.3240282 1.2303452,-0.1907636 2.524523,-0.272227 3.8072138,-0.2506399 l -3.48e-5,-7.7e-6 z"
+       id="path5194"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       sodipodi:nodetypes="csssssssssssssssssssssscssccccccsssssssssssssscscc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:url(#linearGradient5212);stroke-width:1.41199458;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       id="path5204"
+       sodipodi:cx="-285.49203"
+       sodipodi:cy="-135.7495"
+       sodipodi:rx="18.775068"
+       sodipodi:ry="9.3875341"
+       d="m -300.83968,-141.15673 a 18.775068,9.3875341 0 0 1 30.74554,0.0358"
+       transform="matrix(-0.70657745,0,0,0.70986232,-194.81186,105.68217)"
+       sodipodi:start="3.7554218"
+       sodipodi:end="5.6740176"
+       sodipodi:open="true"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       d="m -6.5233133,22.735232 0,0.02141 c 0,4.667316 3.7603187,8.427634 8.4276344,8.427634 l 6.3475307,0 0.2625302,-0.900842 -6.3475307,0 c -4.2990216,0 -7.7414148,-3.442393 -7.7414148,-7.741415 l 0,-0.02141 -0.9487498,0.214623 z"
+       id="rect5551"
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       ry="1.4981471"
+       rx="1.4981471"
+       y="1.9545606"
+       x="28.614576"
+       height="6.9623013"
+       width="2.9962943"
+       id="rect4784"
+       style="fill:#555753;fill-opacity:1;stroke:url(#linearGradient4792);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       transform="matrix(0,1,1,0,0,0)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0081301"
+       inkscape:original="M -103.46875 -287.5 C -104.58751 -287.5 -105.5 -286.58751 -105.5 -285.46875 L -105.5 -279.53125 C -105.5 -278.41249 -104.58751 -277.5 -103.46875 -277.5 L -102.53125 -277.5 C -101.41249 -277.5 -100.5 -278.41249 -100.5 -279.53125 L -100.5 -285.46875 C -100.5 -286.58751 -101.41249 -287.5 -102.53125 -287.5 L -103.46875 -287.5 z "
+       style="opacity:0.6081081;fill:none;stroke:url(#linearGradient4977);stroke-width:2.1435864;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       id="path4967"
+       d="m -103.46875,-286.5 c -0.57059,0 -1.03125,0.46066 -1.03125,1.03125 l 0,5.9375 c 0,0.57059 0.46066,1.03125 1.03125,1.03125 l 0.9375,0 c 0.57059,0 1.03125,-0.46066 1.03125,-1.03125 l 0,-5.9375 c 0,-0.57059 -0.46066,-1.03125 -1.03125,-1.03125 l -0.9375,0 z"
+       transform="matrix(0,0.35041293,0.62106611,0,180.86297,66.235476)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       transform="matrix(0,1,1,0,0,0)"
+       style="fill:url(#linearGradient5632);fill-opacity:1;stroke:none"
+       id="rect5572"
+       width="1.99455"
+       height="5.9798374"
+       x="29.110865"
+       y="2.4541459"
+       rx="0.99727499"
+       ry="0.99727499"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient5758);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       d="m -4.7126309,12.654361 c -1.8622525,0 -3.3612598,1.30267 -3.3612598,2.921028 l 0,5.131543 c 0,1.618351 1.4990073,2.921029 3.3612598,2.921029 l 1.5803872,0.0017 0.01985,-10.983712 c -1.1943624,0.02977 -0.4950442,0.0084 -1.6002373,0.0084 l 0,-6.9e-5 1e-7,8.1e-5 z"
+       id="path5707"
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient5719-5);fill-opacity:1;stroke:none"
+       id="rect5709"
+       width="1.9106927"
+       height="10.99095"
+       x="-5.5105519"
+       y="12.139328"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient3623);fill-opacity:1;stroke:none"
+       id="rect5711"
+       width="2.0266206"
+       height="11.968007"
+       x="-3.5911674"
+       y="12.157709"
+       rx="1.0133103"
+       ry="1.0133103"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       id="path5713"
+       d="m -5.238356,13.125441 c -1.2499833,0 -2.2561527,1.137149 -2.2561527,2.549866 l 0,4.479482 c 0,1.41271 1.0061694,2.549858 2.2561527,2.549858 l 1.6478054,-0.02288 0,-9.556232 c -0.8016761,0.02597 -0.9059746,0 -1.6478054,0 l 0,-9.6e-5 z"
+       style="opacity:0.5;fill:url(#radialGradient5721-4);fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient5723-8);fill-opacity:1;stroke:none"
+       id="rect5715"
+       width="1.9859439"
+       height="7.995038"
+       x="6.5732913"
+       y="14.12711"
+       rx="0.99742299"
+       ry="0.99742305"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#dee1e3;fill-opacity:1;stroke:none"
+       id="path5859"
+       sodipodi:cx="-244.01906"
+       sodipodi:cy="-24.045986"
+       sodipodi:rx="0.83739835"
+       sodipodi:ry="1.3739837"
+       d="m -243.18166,-24.045986 a 0.83739835,1.3739837 0 1 1 -1.6748,0 0.83739835,1.3739837 0 1 1 1.6748,0 z"
+       transform="matrix(0.8690986,0,0,0.73826906,214.78423,47.887046)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient4984);fill-opacity:1;stroke:none"
+       id="rect5811-4"
+       width="1.0533623"
+       height="2.3305926"
+       x="30.146362"
+       y="-3.4252403"
+       rx="0.50398123"
+       ry="0.50398123"
+       transform="matrix(0,1,-1,0,0,0)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="-0.79568303"
+       x="-9.7751017"
+       height="32.938541"
+       width="32.938541"
+       id="rect5863"
+       style="fill:#ffffff;fill-opacity:0;stroke:none"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       sodipodi:nodetypes="ccccccccc"
+       id="path2878"
+       d="m 17.586784,12.654361 c 1.862252,0 3.36126,1.30267 3.36126,2.921028 l 0,5.131543 c 0,1.618351 -1.499008,2.921029 -3.36126,2.921029 l -1.580387,0.0017 -0.01985,-10.983712 c 1.194362,0.02977 0.495044,0.0084 1.600237,0.0084 l 0,-6.9e-5 0,8.1e-5 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient2944);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       y="12.139328"
+       x="-18.384705"
+       height="10.99095"
+       width="1.9106927"
+       id="rect2880"
+       style="fill:url(#linearGradient2892-5);fill-opacity:1;stroke:none"
+       transform="scale(-1,1)" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       ry="1.0133103"
+       rx="1.0133103"
+       y="12.157709"
+       x="-16.465319"
+       height="11.968007"
+       width="2.0266206"
+       id="rect2882"
+       style="fill:url(#linearGradient2894-1);fill-opacity:1;stroke:none"
+       transform="scale(-1,1)" />
+    <path
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       style="opacity:0.5;fill:url(#radialGradient2896-0);fill-opacity:1;stroke:none"
+       d="m 18.112509,13.125441 c 1.249983,0 2.256153,1.137149 2.256153,2.549866 l 0,4.479482 c 0,1.41271 -1.00617,2.549858 -2.256153,2.549858 l -1.647805,-0.02288 0,-9.556232 c 0.801676,0.02597 0.905974,0 1.647805,0 l 0,-9.6e-5 z"
+       id="path2884"
+       sodipodi:nodetypes="cccccccc" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       ry="0.99742305"
+       rx="0.99742299"
+       y="14.12711"
+       x="19.447443"
+       height="7.995038"
+       width="1.9859439"
+       id="rect2886"
+       style="fill:url(#linearGradient2898-1);fill-opacity:1;stroke:none" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       ry="0.50398123"
+       rx="0.50398123"
+       y="11.170098"
+       x="-19.396423"
+       height="3.9994802"
+       width="0.93696725"
+       id="rect2888"
+       style="fill:url(#linearGradient2900-3);fill-opacity:1;stroke:none"
+       transform="scale(-1,1)" />
+    <rect
+       transform="scale(-1,1)"
+       style="fill:url(#linearGradient3017);fill-opacity:1;stroke:none"
+       id="rect3015"
+       width="0.93696725"
+       height="3.9994802"
+       x="5.5535235"
+       y="11.170098"
+       rx="0.50398123"
+       ry="0.50398123"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/toolbar/32/video-call.png b/pidgin/pixmaps/toolbar/32/video-call.png
new file mode 100644
index 0000000000..dcc956977e
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/32/video-call.png
diff --git a/pidgin/pixmaps/toolbar/32/voice-call.png b/pidgin/pixmaps/toolbar/32/voice-call.png
new file mode 100644
index 0000000000..4a2b6a4171
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/32/voice-call.png
diff --git a/pidgin/pixmaps/toolbar/48/scalable/video-call.svg b/pidgin/pixmaps/toolbar/48/scalable/video-call.svg
new file mode 100644
index 0000000000..2ec4812862
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/48/scalable/video-call.svg
@@ -0,0 +1,680 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48.532452"
+   id="svg3879"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20974"
+   version="1.0"
+   sodipodi:docname="video.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3881">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5837"
+       id="linearGradient6047"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.57152873,0,0,1,83.824661,85.161402)"
+       x1="-206.31369"
+       y1="-38.305504"
+       x2="-193.64967"
+       y2="-23.3778" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5837">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5839" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5841" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5636"
+       id="radialGradient5953"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1576192,0,0,2.1576196,320.68789,86.658003)"
+       cx="-287.39545"
+       cy="-83.346062"
+       fx="-287.39545"
+       fy="-83.346062"
+       r="28.001333" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5636">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="0"
+         id="stop5638" />
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:0;"
+         offset="1"
+         id="stop5640" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5837"
+       id="linearGradient5843"
+       x1="-187.10881"
+       y1="-31.514177"
+       x2="-186.73495"
+       y2="-27.740944"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.94234189,0,0,1,188.53503,85.161402)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5795"
+       id="linearGradient5801"
+       x1="-265.00021"
+       y1="-54.745949"
+       x2="-251.85565"
+       y2="-66.937424"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5795">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5797" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5799" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5585"
+       id="radialGradient5681"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4937663,0,0,1.493766,135.56448,35.312572)"
+       cx="-277.8414"
+       cy="-82.264709"
+       fx="-277.8414"
+       fy="-82.264709"
+       r="27.622614" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5585">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5587" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5589" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5636"
+       id="radialGradient5646"
+       cx="-278.76022"
+       cy="-76.807457"
+       fx="-278.76022"
+       fy="-76.807457"
+       r="28.001333"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1576192,0,0,2.1576196,320.68789,86.658003)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5614"
+       id="radialGradient5624"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1093921,0,0,1.1093921,30.866652,8.6133536)"
+       cx="-280.78116"
+       cy="-78.911339"
+       fx="-280.78116"
+       fy="-78.911339"
+       r="29.214298" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5614">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5616" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5618" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5585"
+       id="radialGradient5591"
+       cx="-273.07968"
+       cy="-71.143715"
+       fx="-273.07968"
+       fy="-71.143715"
+       r="27.622614"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4937663,0,0,1.493766,135.56448,35.312572)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5614"
+       id="radialGradient5620"
+       cx="-281.17819"
+       cy="-78.86171"
+       fx="-281.17819"
+       fy="-78.86171"
+       r="29.214298"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3813297,0,0,1.3813297,107.2216,30.072312)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5648"
+       id="linearGradient5654"
+       x1="-269.95532"
+       y1="-62.28437"
+       x2="-255.64305"
+       y2="-34.32909"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5648">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1;"
+         offset="0"
+         id="stop5650" />
+      <stop
+         style="stop-color:#4d2100;stop-opacity:1"
+         offset="1"
+         id="stop5652" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5913"
+       id="linearGradient5919"
+       x1="-202.7368"
+       y1="-50.5"
+       x2="-192.7444"
+       y2="-50.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(197.97906,85.161402)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5913">
+      <stop
+         style="stop-color:#787878;stop-opacity:1;"
+         offset="0"
+         id="stop5915" />
+      <stop
+         style="stop-color:#787878;stop-opacity:0;"
+         offset="1"
+         id="stop5917" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5887"
+       id="linearGradient5893"
+       x1="-247.54591"
+       y1="-35.930092"
+       x2="-264.87021"
+       y2="-58.743122"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5887">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop5889" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop5891" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5903">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5089815"
+         id="feGaussianBlur5905" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5987"
+       id="linearGradient5993"
+       x1="-183.87694"
+       y1="-38.634178"
+       x2="-183.87694"
+       y2="-39.513264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.7174974,199.08898,22.876918)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5987">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1;"
+         offset="0"
+         id="stop5989" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop5991" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5995"
+       id="linearGradient6001"
+       x1="-184.21419"
+       y1="-37.343178"
+       x2="-184.21419"
+       y2="-39.290829"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.7174974,199.08898,22.876918)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5995">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop5997" />
+      <stop
+         style="stop-color:#72eb00;stop-opacity:1"
+         offset="1"
+         id="stop5999" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5913"
+       id="linearGradient5923"
+       gradientUnits="userSpaceOnUse"
+       x1="-203.15808"
+       y1="-50.5"
+       x2="-192.52609"
+       y2="-50.5"
+       gradientTransform="translate(228.08898,85.161402)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="radialGradient5881"
+       cx="-263.10712"
+       cy="-59.058826"
+       fx="-263.10712"
+       fy="-59.058826"
+       r="26.905991"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.2689136,-0.7557538,0.46722378,1.4051413,361.24185,-169.10186)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5873">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop5875" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop5877" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5730"
+       id="linearGradient5736"
+       x1="-260.28085"
+       y1="-37.043636"
+       x2="-259.48315"
+       y2="-86.628036"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5730">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop5732" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="1"
+         id="stop5734" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5867"
+       x="-0.13159215"
+       width="1.2631843"
+       y="-0.13159215"
+       height="1.2631843">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.8767211"
+         id="feGaussianBlur5869" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5827"
+       id="linearGradient6005"
+       gradientUnits="userSpaceOnUse"
+       x1="-203.06625"
+       y1="-31.478365"
+       x2="-191.55763"
+       y2="-29.403404" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5827">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5829" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5831" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(199.08898,85.161402)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient5783"
+       id="linearGradient5789"
+       x1="-179.45006"
+       y1="-42.398266"
+       x2="-176.44347"
+       y2="-27.845135"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5783">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop5785" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop5787" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter6071"
+       x="-0.06728632"
+       width="1.1345726"
+       y="-0.42854825"
+       height="1.8570966">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.0645658"
+         id="feGaussianBlur6073" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="33.886953"
+     inkscape:cy="28.96425"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="752"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata3884">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(8.8571424,-13.162344)">
+    <rect
+       style="fill:none;stroke:none"
+       id="rect6075"
+       width="48"
+       height="48"
+       x="-8.8571424"
+       y="13.196694"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter6071)"
+       id="rect6053"
+       width="37.971432"
+       height="5.9618907"
+       x="-201.937"
+       y="-31.972912"
+       rx="3.0037909"
+       ry="2.7536142"
+       transform="matrix(0.9923944,0,0,1.0825574,197.14181,87.087331)" />
+    <path
+       style="fill:#555753;fill-opacity:1;stroke:url(#linearGradient5789);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:220"
+       d="m 3.5548184,46.680213 23.0742106,0.02567 c 0,0 5.89999,5.954475 5.89999,5.954475 0.63134,0.631336 1.02079,1.504553 1.02079,2.472078 0,1.935049 -1.55782,3.492869 -3.49286,3.492869 l -29.96012039,0 c -1.93505001,0 -3.49287001,-1.55782 -3.49287001,-3.492869 0,-0.967525 0.38945,-1.840742 1.02079,-2.472078 0,0 5.9300698,-5.980141 5.9300698,-5.980141 z"
+       id="rect5738"
+       sodipodi:nodetypes="ccssccssc" />
+    <path
+       transform="translate(199.08898,85.161402)"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.81427181"
+       inkscape:original="M -194.625 -37.5 C -194.625 -37.5 -200.4375 -31.46875 -200.4375 -31.46875 C -200.81227 -31.093985 -201.03125 -30.595841 -201.03125 -30.03125 C -201.03125 -28.884593 -200.14666 -28 -199 -28 L -187.03125 -28 C -185.88461 -28 -185 -28.884598 -185 -30.03125 C -185 -30.595841 -185.21898 -31.093985 -185.59375 -31.46875 C -185.59375 -31.46875 -194.625 -37.5 -194.625 -37.5 z "
+       style="fill:url(#linearGradient6005);fill-opacity:1;stroke:none"
+       id="path6003"
+       d="m -194.71875,-38.3125 a 0.81435323,0.81435323 0 0 0 -0.5,0.25 c 0,0 -5.8125,6.03125 -5.8125,6.03125 L -201,-32 c -0.50698,0.516344 -0.84375,1.202669 -0.84375,1.96875 0,1.565438 1.27831,2.84375 2.84375,2.84375 l 11.96875,0 c 1.56543,0 2.84375,-1.278306 2.84375,-2.84375 0,-0.775138 -0.32601,-1.482268 -0.84375,-2 a 0.81435323,0.81435323 0 0 0 -0.125,-0.125 c 0,0 -9.03125,-6.03125 -9.03125,-6.03125 a 0.81435323,0.81435323 0 0 0 -0.53125,-0.125 z" />
+    <path
+       transform="matrix(0.42980324,0,0,-0.19537277,129.65518,37.870176)"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5849"
+       style="fill:#080a0a;fill-opacity:1;stroke:none;filter:url(#filter5867)"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient5881);fill-opacity:1;stroke:url(#linearGradient5736);stroke-width:1.34585381;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5557"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       transform="matrix(0.64375722,-0.37167341,-0.37134943,-0.64319609,162.97152,-103.07446)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path5871"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       transform="matrix(-0.55980337,0.32320262,0.25819179,0.4472013,-119.59851,141.1361)" />
+    <rect
+       y="34.161404"
+       x="25.020939"
+       height="0.99999887"
+       width="9.0680408"
+       id="rect5921"
+       style="opacity:0.3918919;fill:url(#linearGradient5923);fill-opacity:1;stroke:none"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:url(#linearGradient5993);fill-opacity:1;stroke:url(#linearGradient6001);stroke-width:1"
+       id="rect5955"
+       width="2.9923346"
+       height="5.066411"
+       x="13.586904"
+       y="-46.666321"
+       rx="1.4749399"
+       ry="1.4749401"
+       transform="scale(1,-1)" />
+    <path
+       transform="matrix(0.43982036,0,0,0.43982036,131.12191,58.309805)"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5883"
+       style="fill:none;stroke:url(#linearGradient5893);stroke-width:2.27365565;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter5903)"
+       sodipodi:type="arc" />
+    <rect
+       style="opacity:0.3918919;fill:url(#linearGradient5919);fill-opacity:1;stroke:none"
+       id="rect5911"
+       width="9.0680408"
+       height="0.99999887"
+       x="-5.0889788"
+       y="34.161404"
+       transform="scale(-1,1)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffb03b;fill-opacity:1;stroke:url(#linearGradient5654);stroke-width:2.50314307;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5563"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       transform="matrix(0.39949774,0,0,0.39949774,120.48067,55.918641)" />
+    <path
+       transform="matrix(0.20794468,0,0,0.20794468,69.929359,44.559389)"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5561"
+       style="fill:#555753;fill-opacity:1;stroke:#080808;stroke-width:4.80897188;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.96846846;fill:none;stroke:url(#radialGradient5620);stroke-width:5.96247339;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5565"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       transform="matrix(0.16771563,0,0,0.16771563,59.312819,42.173774)" />
+    <path
+       transform="matrix(0.35982832,0,0,0.35982832,110.01182,53.566212)"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5583"
+       style="fill:none;stroke:url(#radialGradient5591);stroke-width:2.77910304;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:0.48584906;stroke:#000000;stroke-width:14.86451149;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5599"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       transform="matrix(0.06727433,0,0,0.06727433,32.806129,36.194528)" />
+    <path
+       transform="matrix(0.05704758,0,0,0.05704758,28.671959,34.16811)"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5597"
+       style="opacity:0.96846846;fill:#ffffff;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(-0.16771563,0,0,-0.16771563,-29.208311,22.282427)"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5622"
+       style="opacity:0.96846846;fill:none;stroke:url(#radialGradient5624);stroke-width:5.96247339;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.28276221,0,0,0.28276221,89.673879,48.996129)"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5626"
+       style="opacity:0.52252251;fill:none;stroke:url(#radialGradient5646);stroke-width:3.53654051;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:url(#radialGradient5681);stroke-width:4.07555246;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5679"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       transform="matrix(0.24536551,0,0,0.24536551,79.804799,46.778475)" />
+    <path
+       transform="matrix(-0.7050649,0,0,0.7044495,-170.9646,74.927538)"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       sodipodi:ry="26.233063"
+       sodipodi:rx="26.233063"
+       sodipodi:cy="-59.300812"
+       sodipodi:cx="-263.90244"
+       id="path5791"
+       style="fill:none;stroke:url(#linearGradient5801);stroke-width:1.41892862;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <rect
+       style="fill:url(#linearGradient5843);fill-opacity:1;stroke:none"
+       id="rect5835"
+       width="31.996775"
+       height="2.00898"
+       x="-0.91831505"
+       y="55.172977"
+       rx="1.00449"
+       ry="1.00449" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.52252251;fill:none;stroke:url(#radialGradient5953);stroke-width:3.53654051;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5951"
+       sodipodi:cx="-263.90244"
+       sodipodi:cy="-59.300812"
+       sodipodi:rx="26.233063"
+       sodipodi:ry="26.233063"
+       d="m -237.66937,-59.300812 c 0,14.488121 -11.74494,26.233063 -26.23307,26.233063 -14.48812,0 -26.23306,-11.744942 -26.23306,-26.233063 0,-14.48812 11.74494,-26.233063 26.23306,-26.233063 14.48813,0 26.23307,11.744943 26.23307,26.233063 z"
+       transform="matrix(-0.28276221,0,0,-0.28276221,-59.569391,15.460071)" />
+    <rect
+       ry="1.00449"
+       rx="1.00449"
+       y="55.172977"
+       x="-31.078465"
+       height="2.00898"
+       width="19.405989"
+       id="rect6045"
+       style="fill:url(#linearGradient6047);fill-opacity:1;stroke:none"
+       transform="scale(-1,1)" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/toolbar/48/scalable/voice-call.svg b/pidgin/pixmaps/toolbar/48/scalable/voice-call.svg
new file mode 100644
index 0000000000..75dc32c6e6
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/48/scalable/voice-call.svg
@@ -0,0 +1,756 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg3879"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20974"
+   version="1.0"
+   sodipodi:docname="voice.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3881">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3617">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3619" />
+      <stop
+         style="stop-color:#0b0c0d;stop-opacity:1"
+         offset="1"
+         id="stop3621" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective96" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4555"
+       id="linearGradient4563"
+       gradientUnits="userSpaceOnUse"
+       x1="-257.51324"
+       y1="-50.301723"
+       x2="-257.49792"
+       y2="-51.439991"
+       gradientTransform="matrix(0.96773657,0,0,1.1033764,283.17944,75.227551)" />
+    <linearGradient
+       id="linearGradient4555"
+       inkscape:collect="always">
+      <stop
+         id="stop4557"
+         offset="0"
+         style="stop-color:#545652;stop-opacity:1;" />
+      <stop
+         id="stop4559"
+         offset="1"
+         style="stop-color:#80837d;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(70.143605,-254.44307)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4976"
+       id="linearGradient4984"
+       x1="-24.687374"
+       y1="245.84587"
+       x2="-24.687374"
+       y2="247.61009"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4976">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop4978" />
+      <stop
+         style="stop-color:#808080;stop-opacity:1"
+         offset="1"
+         id="stop4980" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4555"
+       id="linearGradient4553"
+       x1="-257.51324"
+       y1="-50.301723"
+       x2="-257.49792"
+       y2="-51.439991"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(254.47694,70.270976)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5677-7"
+       id="linearGradient5723-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.110704,-300.45156,160.82553)"
+       x1="305.89481"
+       y1="-120.46718"
+       x2="306.04715"
+       y2="-120.46718" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5677-7">
+      <stop
+         style="stop-color:#ff2de7;stop-opacity:1"
+         offset="0"
+         id="stop5679-1" />
+      <stop
+         style="stop-color:#7b009b;stop-opacity:1"
+         offset="1"
+         id="stop5681-4" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5043-9-6-1"
+       id="radialGradient5721-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93663395,1.7844755,-2.1045445,1.0450496,29.790687,695.97821)"
+       cx="-306.03387"
+       cy="-120.8595"
+       fx="-306.03387"
+       fy="-120.8595"
+       r="3.03685" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5043-9-6-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5045-4-8-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5047-1-2-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5655-9"
+       id="linearGradient5719-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0739995,0,0,1.2558918,322.6417,178.48569)"
+       x1="-300.82822"
+       y1="-126.31032"
+       x2="-300.82822"
+       y2="-114.83224" />
+    <linearGradient
+       id="linearGradient5655-9"
+       inkscape:collect="always">
+      <stop
+         id="stop5657-5"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop5659-1"
+         offset="1"
+         style="stop-color:#707e83;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="-36.569096"
+       x2="-219.25159"
+       y1="-43.842201"
+       x1="-219.25159"
+       gradientTransform="matrix(-1.1341053,0,0,1.0684624,-250.41566,72.38903)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5758"
+       xlink:href="#linearGradient5853"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5853"
+       inkscape:collect="always">
+      <stop
+         id="stop5855"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1" />
+      <stop
+         id="stop5857"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5626"
+       id="linearGradient5632"
+       x1="-25.743168"
+       y1="-243.09763"
+       x2="-23.90864"
+       y2="-240.62437"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.4970962,69.91678,375.11023)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5626">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop5628" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:0;"
+         offset="1"
+         id="stop5630" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4971"
+       id="linearGradient4977"
+       x1="-105.74262"
+       y1="-282.20282"
+       x2="-102.94624"
+       y2="-282.20282"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4971">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4973" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4975" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4786"
+       id="linearGradient4792"
+       x1="-106.91152"
+       y1="280.91522"
+       x2="-101.28181"
+       y2="282.32028"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.81265471,0,0,1,129.18772,-269.64677)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4786">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop4788" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop4790" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5677"
+       id="linearGradient5449-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.110704,-269.59835,161.01943)"
+       x1="305.89481"
+       y1="-120.46718"
+       x2="306.04715"
+       y2="-120.46718" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5677">
+      <stop
+         style="stop-color:#ff2de7;stop-opacity:1"
+         offset="0"
+         id="stop5679" />
+      <stop
+         style="stop-color:#7b009b;stop-opacity:1"
+         offset="1"
+         id="stop5681" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5043-9-6"
+       id="radialGradient5447-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.93663395,1.7844755,2.1045445,1.0450496,1.0625172,696.17212)"
+       cx="-306.03387"
+       cy="-120.8595"
+       fx="-306.03387"
+       fy="-120.8595"
+       r="3.03685" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5043-9-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5045-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5047-1-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5655"
+       id="linearGradient5443-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0930233,0,0,1.2470295,297.52685,177.58046)"
+       x1="-300.82822"
+       y1="-126.31032"
+       x2="-300.82822"
+       y2="-114.83224" />
+    <linearGradient
+       id="linearGradient5655"
+       inkscape:collect="always">
+      <stop
+         id="stop5657"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop5659"
+         offset="1"
+         style="stop-color:#707e83;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5661"
+       id="linearGradient5667"
+       x1="-219.25159"
+       y1="-43.842201"
+       x2="-219.25159"
+       y2="-36.569096"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1341053,0,0,1.0632786,281.26887,72.326317)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5661">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop5663" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop5665" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5206"
+       id="linearGradient5212"
+       x1="-304.49771"
+       y1="-142.89493"
+       x2="-262.4259"
+       y2="-143.92334"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5206">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop5208" />
+      <stop
+         style="stop-color:#dededd;stop-opacity:0;"
+         offset="1"
+         id="stop5210" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5388"
+       id="linearGradient5394"
+       x1="-283.80222"
+       y1="-143.74782"
+       x2="-283.80222"
+       y2="-141.12897"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(299.49582,147.12151)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5388">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop5390" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop5392" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5376"
+       id="radialGradient5382"
+       cx="-284.44626"
+       cy="-153.18155"
+       fx="-284.44626"
+       fy="-153.18155"
+       r="17.449057"
+       gradientTransform="matrix(0.7493289,0.0071443,-0.00739936,0.77608101,227.05992,124.25584)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5376">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop5378" />
+      <stop
+         style="stop-color:#434542;stop-opacity:1"
+         offset="1"
+         id="stop5380" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3617"
+       id="linearGradient3623"
+       x1="1.421198"
+       y1="19.01931"
+       x2="1.421198"
+       y2="34.927505"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3617"
+       id="linearGradient3627"
+       gradientUnits="userSpaceOnUse"
+       x1="1.421198"
+       y1="19.01931"
+       x2="1.421198"
+       y2="34.927505"
+       gradientTransform="translate(27.998451,0)" />
+    <inkscape:perspective
+       id="perspective3637"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3617-8"
+       id="linearGradient3627-1"
+       gradientUnits="userSpaceOnUse"
+       x1="1.421198"
+       y1="19.01931"
+       x2="1.421198"
+       y2="34.927505"
+       gradientTransform="translate(27.998451,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3617-8">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3619-2" />
+      <stop
+         style="stop-color:#0b0c0d;stop-opacity:1"
+         offset="1"
+         id="stop3621-4" />
+    </linearGradient>
+    <linearGradient
+       y2="34.927505"
+       x2="1.421198"
+       y1="19.01931"
+       x1="1.421198"
+       gradientTransform="translate(27.998451,2.9924335e-7)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3646"
+       xlink:href="#linearGradient3617-8"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="275.47836"
+     inkscape:cy="12.04013"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="752"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata3884">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(8.5714283,-0.14285715)">
+    <rect
+       style="fill:#cc0000;fill-opacity:0;stroke:none"
+       id="rect5861"
+       width="48"
+       height="48"
+       x="-8.5714283"
+       y="0.14285715"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       d="m 8.7956674,3.2221118 c -6.82455,0 -12.3542402,5.47976 -12.3542402,12.2812502 l 0,6.40625 c 0,0.71914 0.0695,1.40908 0.18813,2.09375 l 1.0034,0 c -0.12713,-0.67917 -0.18814,-1.37616 -0.18814,-2.09375 l 0,-6.40625 c 0,-6.2647902 5.0648202,-11.2812502 11.3508502,-11.2812502 l 13.2912696,0 c 6.28603,0 11.35085,5.01646 11.35085,11.2812502 l 0,6.40625 c 0,0.71759 -0.061,1.41458 -0.18814,2.09375 l 1.00339,0 c 0.11864,-0.68467 0.18814,-1.37461 0.18814,-2.09375 l 0,-6.40625 c 0,-6.8014902 -5.52969,-12.2812502 -12.35424,-12.2812502 l -13.2912696,0 z"
+       id="rect5549"
+       sodipodi:nodetypes="ccccccccccccccccc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="fill:url(#radialGradient5382);fill-opacity:1;stroke:none"
+       d="m -1.5394328,9.4030418 c -0.34234,-0.23492 -0.47813,-0.54724 -0.45029,-1.03563 0.0286,-0.50183 0.14055,-0.65306 1.09192003,-1.4752 4.64793017,-4.01662 13.37392977,-5.87446 21.59445977,-4.59766 3.75498,0.58323 7.28842,1.86204 9.74819,3.52803 1.32365,0.89651 2.31811,1.86267 2.4306,2.36144 0.15327,0.67962 -0.31249,1.36291 -0.92947,1.36354 -0.20344,2.2e-4 -0.38709,-0.0843 -0.80622,-0.37099 -4.58901,-3.1391 -11.82576,-4.34498 -18.9107,-3.67751 -4.8043396,0.4526 -9.0149896,1.45025 -12.27576977,3.58044 -0.80479,0.52575 -1.10366003,0.59052 -1.49272003,0.32354 l 0,0 z"
+       id="path5202"
+       sodipodi:nodetypes="cssssssssscc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:url(#linearGradient5394);fill-opacity:1;stroke:none;stroke-width:1.36950052;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       d="m 14.152067,1.1469218 c -1.25586,0.0451 -2.50746,0.15463 -3.71875,0.32324 -4.8155596,0.67034 -9.1494998,2.303 -11.9374998,4.78399 -0.0171,0.0152 -0.0455,0.017 -0.0625,0.0323 a 0.50262213,0.52231753 0 0 0 -0.0625,0.0969 c -0.83386,0.60798 -1.11293,1.78508 -0.59375,2.71524 0.51041,0.9144502 1.58283003,1.2501502 2.50000003,0.84042 0.0165,-0.007 0.0462,0.008 0.0625,0 a 0.4997817,0.5193658 0 0 0 0.125,-0.0646 c 0.008,-0.004 0.0233,0.005 0.0312,0 0.0189,-0.0126 0.0435,-0.0198 0.0625,-0.0323 0.0117,-0.007 0.0195,-0.0246 0.0312,-0.0323 6.35026017,-4.18918 18.36829977,-4.99194 26.59374977,-1.68086 1.15168,0.46359 2.18766,0.97193 3.09375,1.55156 a 0.50097,0.51819158 0 0 0 0.0312,0.0323 c 0.0119,0.007 0.0194,0.0246 0.0312,0.0323 a 0.50097,0.51819158 0 0 0 0.0937,0.0969 c 0.95145,0.5682002 2.20068,0.2407102 2.75,-0.74345 0.46922,-0.84064 0.27778,-1.87694 -0.375,-2.5213 a 0.50262213,0.52231753 0 0 0 -0.0312,-0.0647 c -0.006,-0.005 -0.0251,0.005 -0.0312,0 a 0.50262213,0.52231753 0 0 0 -0.0312,-0.0323 c -0.0275,-0.0237 -0.0336,-0.0747 -0.0625,-0.0969 a 0.50262213,0.52231753 0 0 0 0,-0.0323 c -1.77629,-1.631 -4.30344,-2.93446 -7.34375,-3.84658 -2.3514,-0.70544 -4.84998,-1.13016 -7.375,-1.29297 -1.26251,-0.0814 -2.52539,-0.10973 -3.78125,-0.0646 z m 1.875,1.03438 c 3.0708,0.0463 6.16037,0.47336 9,1.32529 l 0.0312,0 c 2.76259,0.83245 5.04679,2.04432 6.65625,3.42637 a 0.50005001,0.51723997 0 0 0 0.21875,0.22627 c 0.48342,0.28869 0.6541,0.92223 0.375,1.42227 -0.23724,0.42504 -0.72255,0.61655 -1.15625,0.48486 a 0.49889166,0.51844088 0 0 0 -0.15625,-0.0969 c -1.02284,-0.68188 -2.16864,-1.28682 -3.46875,-1.81017 -4.30756,-1.73396 -9.49646,-2.39535 -14.46875,-2.06875 -4.8872196,0.32102 -9.5421896,1.6205 -12.90624977,3.81426 -0.008,0.005 -0.0237,-0.005 -0.0312,0 a 0.50097251,0.51819418 0 0 0 -0.0625,0.0323 0.50097251,0.51819418 0 0 0 -0.0625,0.0323 c -0.0119,0.008 -0.0194,0.0244 -0.0312,0.0323 -0.47706,0.25937 -1.07163003,0.0673 -1.34375003,-0.42021 -0.26792,-0.48002 -0.12657,-1.08748 0.3125,-1.38995 a 0.50262213,0.52231753 0 0 0 0.0625,-0.0323 0.50005001,0.51723997 0 0 0 0.18750003,-0.16162 c 2.56214017,-2.25136 6.72203017,-3.84535 11.37499977,-4.49307 1.76729,-0.24602 3.62627,-0.35108 5.46875,-0.32324 z"
+       id="path5194"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:url(#linearGradient5212);stroke-width:0.96893835;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       id="path5204"
+       sodipodi:cx="-285.49203"
+       sodipodi:cy="-135.7495"
+       sodipodi:rx="18.775068"
+       sodipodi:ry="9.3875341"
+       d="m -300.83968,-141.15673 c 5.97266,-4.23814 17.68585,-5.25293 26.16212,-2.26659 1.7838,0.62846 3.33482,1.4076 4.58342,2.30242"
+       transform="matrix(-1.0296667,0,0,1.0344536,-278.49445,154.74398)"
+       sodipodi:start="3.7554218"
+       sodipodi:end="5.6740176"
+       sodipodi:open="true"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       d="m -3.5925728,33.735378 0,0.0312 c 0,6.80149 5.4797602,12.28125 12.2812502,12.28125 l 9.2499996,0 0,-1 -9.2499996,0 c -6.26479,0 -11.2812502,-5.01646 -11.2812502,-11.28125 l 0,-0.0312 -1,0 z"
+       id="rect5551"
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       id="path5431"
+       d="m 33.003467,19.691354 c 2.15778,0 3.89467,1.77306 3.89467,3.975801 l 0,6.984518 c 0,2.20273 -1.73689,3.9758 -3.89467,3.9758 l -3.07307,0.04092 -0.0268,-14.992278 c 1.3839,0.04051 1.81932,0.01533 3.0999,0.01533 l 0,-9.2e-5 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient5667);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="19.212761"
+       x="-32.432659"
+       height="14.883246"
+       width="2.0379403"
+       id="rect5433"
+       style="fill:url(#linearGradient5443-6);fill-opacity:1;stroke:none"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="opacity:0.5;fill:url(#radialGradient5447-5);fill-opacity:1;stroke:none"
+       d="m 32.779907,20.143134 c 1.82155,0 3.2878,1.657121 3.2878,3.715816 l 0,6.527768 c 0,2.058685 -1.46625,3.715805 -3.2878,3.715805 l -2.40128,-0.03334 0,-13.925911 c 1.16825,0.03784 1.32024,0 2.40128,0 l 0,-1.39e-4 z"
+       id="path5437"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       ry="0.99742299"
+       rx="0.99742299"
+       y="22.267445"
+       x="35.395443"
+       height="9.8971453"
+       width="1.994846"
+       id="rect5439"
+       style="fill:url(#linearGradient5449-8);fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       ry="2.0194242"
+       rx="2.0194242"
+       y="7.854322"
+       x="43.456417"
+       height="9.9894991"
+       width="4.0564089"
+       id="rect4784"
+       style="fill:#555753;fill-opacity:1;stroke:url(#linearGradient4792);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       transform="matrix(0,1,1,0,0,0)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0081301"
+       inkscape:original="M -103.46875 -287.5 C -104.58751 -287.5 -105.5 -286.58751 -105.5 -285.46875 L -105.5 -279.53125 C -105.5 -278.41249 -104.58751 -277.5 -103.46875 -277.5 L -102.53125 -277.5 C -101.41249 -277.5 -100.5 -278.41249 -100.5 -279.53125 L -100.5 -285.46875 C -100.5 -286.58751 -101.41249 -287.5 -102.53125 -287.5 L -103.46875 -287.5 z "
+       style="opacity:0.6081081;fill:none;stroke:url(#linearGradient4977);stroke-width:1.22016776;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       id="path4967"
+       d="m -103.46875,-286.5 c -0.57059,0 -1.03125,0.46066 -1.03125,1.03125 l 0,5.9375 c 0,0.57059 0.46066,1.03125 1.03125,1.03125 l 0.9375,0 c 0.57059,0 1.03125,-0.46066 1.03125,-1.03125 l 0,-5.9375 c 0,-0.57059 -0.46066,-1.03125 -1.03125,-1.03125 l -0.9375,0 z"
+       transform="matrix(0,0.67167761,1,0,295.34493,114.69191)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       transform="matrix(0,1,1,0,0,0)"
+       style="fill:url(#linearGradient5632);fill-opacity:1;stroke:none"
+       id="rect5572"
+       width="3.0350325"
+       height="8.8761415"
+       x="43.98975"
+       y="8.3505688"
+       rx="1.5175163"
+       ry="1.5023295"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient5758);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:220"
+       d="m -2.1502628,19.497458 c -2.15778,0 -3.89467,1.781702 -3.89467,3.995182 l 0,7.01857 c 0,2.213469 1.73689,3.995183 3.89467,3.995183 l 3.05582003,0.0024 0.023,-15.022765 c -1.3839,0.04071 -1.79824,0.0115 -3.07882003,0.0115 l 0,-9.6e-5 z"
+       id="path5707"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient5719-5);fill-opacity:1;stroke:none"
+       id="rect5709"
+       width="2.0024707"
+       height="14.989019"
+       x="-1.5749686"
+       y="18.992523"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient3623);fill-opacity:1;stroke:none"
+       id="rect5711"
+       width="1.9620597"
+       height="15.908196"
+       x="0.44016811"
+       y="19.01931"
+       rx="0.98102987"
+       ry="0.98102987"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       id="path5713"
+       d="m -1.9267028,19.949234 c -1.82155,0 -3.2878,1.657121 -3.2878,3.715816 l 0,6.527768 c 0,2.058685 1.46625,3.715805 3.2878,3.715805 l 2.40128003,-0.03334 0,-13.925911 c -1.16825,0.03784 -1.32024,0 -2.40128003,0 l 0,-1.39e-4 z"
+       style="opacity:0.5;fill:url(#radialGradient5721-4);fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient5723-8);fill-opacity:1;stroke:none"
+       id="rect5715"
+       width="1.994846"
+       height="9.8971453"
+       x="4.542254"
+       y="22.073544"
+       rx="0.99742299"
+       ry="0.99742299"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient4553);fill-opacity:1;stroke:none"
+       id="rect5811"
+       width="1.0079625"
+       height="3.591476"
+       x="-3.557543"
+       y="18.549107"
+       rx="0.50398123"
+       ry="0.50398123"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#dee1e3;fill-opacity:1;stroke:none"
+       id="path5859"
+       sodipodi:cx="-244.01906"
+       sodipodi:cy="-24.045986"
+       sodipodi:rx="0.83739835"
+       sodipodi:ry="1.3739837"
+       d="m -243.18166,-24.045986 c 0,0.75883 -0.37492,1.373984 -0.8374,1.373984 -0.46248,0 -0.8374,-0.615154 -0.8374,-1.373984 0,-0.75883 0.37492,-1.373984 0.8374,-1.373984 0.46248,0 0.8374,0.615154 0.8374,1.373984 z"
+       transform="matrix(1.2048093,0,0,1.0941414,303.39913,71.819285)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       style="fill:url(#linearGradient4984);fill-opacity:1;stroke:none"
+       id="rect5811-4"
+       width="1.0079625"
+       height="2.3272483"
+       x="45.000946"
+       y="-9.4003887"
+       rx="0.50398123"
+       ry="0.50398123"
+       transform="matrix(0,1,-1,0,0,0)"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963" />
+    <rect
+       y="0.14285715"
+       x="-8.5714283"
+       height="48"
+       width="48"
+       id="rect5863"
+       style="fill:#ffffff;fill-opacity:0;stroke:none"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png" />
+    <rect
+       ry="0.50398123"
+       rx="0.50398123"
+       y="18.158859"
+       x="33.470028"
+       height="3.9627495"
+       width="0.97544211"
+       id="rect4561"
+       style="fill:url(#linearGradient4563);fill-opacity:1;stroke:none"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png" />
+    <rect
+       inkscape:export-ydpi="90.108963"
+       inkscape:export-xdpi="90.108963"
+       inkscape:export-filename="/home/hbons/Desktop/Pidgin VV/voice.png"
+       ry="0.98102987"
+       rx="0.98102987"
+       y="19.01931"
+       x="28.43862"
+       height="15.908196"
+       width="1.9620597"
+       id="rect3625"
+       style="fill:url(#linearGradient3646);fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/toolbar/48/video-call.png b/pidgin/pixmaps/toolbar/48/video-call.png
new file mode 100644
index 0000000000..3d5d101811
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/48/video-call.png
diff --git a/pidgin/pixmaps/toolbar/48/voice-call.png b/pidgin/pixmaps/toolbar/48/voice-call.png
new file mode 100644
index 0000000000..2724434285
--- /dev/null
+++ b/pidgin/pixmaps/toolbar/48/voice-call.png
diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am
index 6d3957931d..eec8ea2c61 100644
--- a/pidgin/plugins/Makefile.am
+++ b/pidgin/plugins/Makefile.am
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = cap gestures gevolution musicmessaging perl ticker
+DIST_SUBDIRS = cap disco gestures gevolution musicmessaging perl ticker
 
 if BUILD_GEVOLUTION
 GEVOLUTION_DIR = gevolution
@@ -26,6 +26,7 @@ SUBDIRS = \
 	$(GEVOLUTION_DIR) \
 	$(MUSICMESSAGING_DIR) \
 	$(PERL_DIR) \
+	disco \
 	ticker
 
 plugindir = $(libdir)/pidgin
@@ -43,6 +44,7 @@ pidginrc_la_LDFLAGS         = -module -avoid-version
 relnot_la_LDFLAGS           = -module -avoid-version
 sendbutton_la_LDFLAGS       = -module -avoid-version
 spellchk_la_LDFLAGS         = -module -avoid-version
+themeedit_la_LDFLAGS        = -module -avoid-version
 timestamp_la_LDFLAGS        = -module -avoid-version
 timestamp_format_la_LDFLAGS = -module -avoid-version
 xmppconsole_la_LDFLAGS      = -module -avoid-version
@@ -61,6 +63,7 @@ plugin_LTLIBRARIES = \
 	relnot.la           \
 	sendbutton.la       \
 	spellchk.la         \
+	themeedit.la         \
 	timestamp.la        \
 	timestamp_format.la \
 	xmppconsole.la
@@ -82,6 +85,7 @@ pidginrc_la_SOURCES         = pidginrc.c
 relnot_la_SOURCES           = relnot.c
 sendbutton_la_SOURCES       = sendbutton.c
 spellchk_la_SOURCES         = spellchk.c
+themeedit_la_SOURCES        = themeedit.c themeedit-icon.c themeedit-icon.h
 timestamp_la_SOURCES        = timestamp.c
 timestamp_format_la_SOURCES = timestamp_format.c
 xmppconsole_la_SOURCES      = xmppconsole.c
@@ -99,6 +103,7 @@ pidginrc_la_LIBADD          = $(GTK_LIBS)
 relnot_la_LIBADD            = $(GLIB_LIBS)
 sendbutton_la_LIBADD        = $(GTK_LIBS)
 spellchk_la_LIBADD          = $(GTK_LIBS)
+themeedit_la_LIBADD         = $(GTK_LIBS)
 timestamp_la_LIBADD         = $(GTK_LIBS)
 timestamp_format_la_LIBADD  = $(GTK_LIBS)
 xmppconsole_la_LIBADD       = $(GTK_LIBS)
@@ -135,5 +140,5 @@ SUFFIXES = .c .so
 	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
 	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
 	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
-	@cp .libs/libtmp$@.so* $@
-	@rm -f .libs/libtmp$@.*
+	@cp .libs/libtmp$@*.so $@
+	@rm -rf .libs/libtmp$@.*
diff --git a/pidgin/plugins/Makefile.mingw b/pidgin/plugins/Makefile.mingw
index bad7c0bef3..ab8fcbc129 100644
--- a/pidgin/plugins/Makefile.mingw
+++ b/pidgin/plugins/Makefile.mingw
@@ -7,6 +7,7 @@
 PIDGIN_TREE_TOP := ../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+DISCO_PLUGIN := ./disco
 GTKPERL_PLUGIN := ./perl
 TICKER_PLUGIN := ./ticker
 TRANSPARENCY_PLUGIN := ./win32/transparency
@@ -58,12 +59,14 @@ LIBS =			-lgtk-win32-2.0 \
 .PHONY: all clean plugins install
 
 all: plugins
+	$(MAKE) -C $(DISCO_PLUGIN) -f $(MINGW_MAKEFILE)
 	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE)
 	$(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE)
 	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE)
 	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE)
 
 install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
+	$(MAKE) -C $(DISCO_PLUGIN) -f $(MINGW_MAKEFILE) install
 	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE) install
 	$(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE) install
 	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE) install
@@ -95,6 +98,7 @@ plugins: \
 ##
 clean:
 	rm -f *.o *.dll
+	$(MAKE) -C $(DISCO_PLUGIN) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE) clean
diff --git a/pidgin/plugins/cap/cap.c b/pidgin/plugins/cap/cap.c
index 01bb60f7a4..b1a4a5c4fa 100644
--- a/pidgin/plugins/cap/cap.c
+++ b/pidgin/plugins/cap/cap.c
@@ -135,7 +135,7 @@ static void destroy_stats(gpointer data) {
 	/* g_free(stats->hourly_usage); */
 	/* g_free(stats->daily_usage); */
 	if (stats->timeout_source_id != 0)
-		g_source_remove(stats->timeout_source_id);
+		purple_timeout_remove(stats->timeout_source_id);
 	g_free(stats);
 }
 
@@ -352,7 +352,7 @@ static void sent_im_msg(PurpleAccount *account, const char *receiver, const char
 	if (buddy == NULL)
 		return;
 
-	interval = purple_prefs_get_int("/plugins/gtk/cap/max_msg_difference") * 1000 * 60;
+	interval = purple_prefs_get_int("/plugins/gtk/cap/max_msg_difference") * 60;
 	words = word_count(message);
 
 	stats = get_stats_for(buddy);
@@ -361,9 +361,9 @@ static void sent_im_msg(PurpleAccount *account, const char *receiver, const char
 	stats->last_message = time(NULL);
 	stats->last_message_status_id = purple_status_get_id(get_status_for(buddy));
 	if(stats->timeout_source_id != 0)
-		g_source_remove(stats->timeout_source_id);
+		purple_timeout_remove(stats->timeout_source_id);
 
-	stats->timeout_source_id = g_timeout_add(interval, max_message_difference_cb, stats);
+	stats->timeout_source_id = purple_timeout_add_seconds(interval, max_message_difference_cb, stats);
 }
 
 /* received-im-msg */
@@ -373,6 +373,9 @@ received_im_msg(PurpleAccount *account, char *sender, char *message, PurpleConve
 	CapStatistics *stats;
 	/* guint words = word_count(message); */
 
+	if (flags & PURPLE_MESSAGE_AUTO_RESP)
+		return;
+
 	buddy = purple_find_buddy(account, sender);
 
 	if (buddy == NULL)
@@ -386,7 +389,7 @@ received_im_msg(PurpleAccount *account, char *sender, char *message, PurpleConve
 	 * then cancel the timeout callback. */
 	if(stats->timeout_source_id != 0) {
 		purple_debug_info("cap", "Cancelling timeout callback\n");
-		g_source_remove(stats->timeout_source_id);
+		purple_timeout_remove(stats->timeout_source_id);
 		stats->timeout_source_id = 0;
 	}
 
@@ -697,7 +700,7 @@ static void add_plugin_functionality(PurplePlugin *plugin) {
 static void cancel_conversation_timeouts(gpointer key, gpointer value, gpointer user_data) {
 	CapStatistics *stats = value;
 	if(stats->timeout_source_id != 0) {
-		g_source_remove(stats->timeout_source_id);
+		purple_timeout_remove(stats->timeout_source_id);
 		stats->timeout_source_id = 0;
 	}
 }
diff --git a/pidgin/plugins/contact_priority.c b/pidgin/plugins/contact_priority.c
index 2b3c7c66b9..e59566b481 100644
--- a/pidgin/plugins/contact_priority.c
+++ b/pidgin/plugins/contact_priority.c
@@ -31,7 +31,7 @@ static void
 select_account(GtkWidget *widget, PurpleAccount *account, gpointer data)
 {
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(data),
-														(gdouble)purple_account_get_int(account, "score", 0));
+	                          (gdouble)purple_account_get_int(account, "score", 0));
 }
 
 static void
@@ -142,18 +142,18 @@ get_config_frame(PurplePlugin *plugin)
 	spin = gtk_spin_button_new((GtkAdjustment *)adj, 1, 0);
 
 	optmenu = pidgin_account_option_menu_new(NULL, TRUE,
-																						 G_CALLBACK(select_account),
-																						 NULL, spin);
+	                                         G_CALLBACK(select_account),
+	                                         NULL, spin);
 	gtk_box_pack_start(GTK_BOX(hbox), optmenu, FALSE, FALSE, 0);
 
 	/* this is where we set up the spin button we made above */
 	account = g_object_get_data(G_OBJECT(gtk_menu_get_active(GTK_MENU(gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu))))),
-															"account");
+	                            "account");
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
-														(gdouble)purple_account_get_int(account, "score", 0));
+	                          (gdouble)purple_account_get_int(account, "score", 0));
 	gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(spin), GTK_ADJUSTMENT(adj));
 	g_signal_connect(G_OBJECT(spin), "value-changed",
-									 G_CALLBACK(account_update), optmenu);
+	                 G_CALLBACK(account_update), optmenu);
 	gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0);
 
 	gtk_widget_show_all(ret);
@@ -178,29 +178,29 @@ static PurplePluginInfo info =
 	PURPLE_PLUGIN_MAGIC,
 	PURPLE_MAJOR_VERSION,
 	PURPLE_MINOR_VERSION,
-	PURPLE_PLUGIN_STANDARD,                             /**< type           */
+	PURPLE_PLUGIN_STANDARD,                         /**< type           */
 	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
-	0,                                                /**< flags          */
-	NULL,                                             /**< dependencies   */
-	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
+	0,                                              /**< flags          */
+	NULL,                                           /**< dependencies   */
+	PURPLE_PRIORITY_DEFAULT,                        /**< priority       */
 
-	CONTACT_PRIORITY_PLUGIN_ID,                       /**< id             */
-	N_("Contact Priority"),                           /**< name           */
-	DISPLAY_VERSION,                                  /**< version        */
+	CONTACT_PRIORITY_PLUGIN_ID,                     /**< id             */
+	N_("Contact Priority"),                         /**< name           */
+	DISPLAY_VERSION,                                /**< version        */
                                                     /**< summary        */
 	N_("Allows for controlling the values associated with different buddy states."),
                                                     /**< description    */
 	N_("Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."),
-	"Etan Reisner <deryni@eden.rutgers.edu>",         /**< author         */
-	PURPLE_WEBSITE,                                     /**< homepage       */
-
-	NULL,                                             /**< load           */
-	NULL,                                             /**< unload         */
-	NULL,                                             /**< destroy        */
-	&ui_info,                                         /**< ui_info        */
-	NULL,                                             /**< extra_info     */
-	NULL,                                             /**< prefs_info     */
-	NULL,                                             /**< actions        */
+	"Etan Reisner <deryni@eden.rutgers.edu>",       /**< author         */
+	PURPLE_WEBSITE,                                 /**< homepage       */
+
+	NULL,                                           /**< load           */
+	NULL,                                           /**< unload         */
+	NULL,                                           /**< destroy        */
+	&ui_info,                                       /**< ui_info        */
+	NULL,                                           /**< extra_info     */
+	NULL,                                           /**< prefs_info     */
+	NULL,                                           /**< actions        */
 
 	/* padding */
 	NULL,
diff --git a/pidgin/plugins/convcolors.c b/pidgin/plugins/convcolors.c
index 9aa923b3bf..24c5b6889b 100644
--- a/pidgin/plugins/convcolors.c
+++ b/pidgin/plugins/convcolors.c
@@ -101,6 +101,7 @@ displaying_msg(PurpleAccount *account, const char *who, char **displaying,
 	gboolean bold, italic, underline;
 	int f;
 	const char *color;
+	gboolean rtl = FALSE;
 
 	for (i = 0; formats[i].prefix; i++)
 		if (flags & formats[i].flag)
@@ -126,6 +127,7 @@ displaying_msg(PurpleAccount *account, const char *who, char **displaying,
 	bold = (f & FONT_BOLD);
 	italic = (f & FONT_ITALIC);
 	underline = (f & FONT_UNDERLINE);
+	rtl = purple_markup_is_rtl(*displaying);
 
 	if (purple_prefs_get_bool(PREF_IGNORE))
 	{
@@ -156,11 +158,13 @@ displaying_msg(PurpleAccount *account, const char *who, char **displaying,
 	}
 
 	t = *displaying;
-	*displaying = g_strdup_printf("%s%s%s%s%s%s%s",
+	*displaying = g_strdup_printf("%s%s%s%s%s%s%s%s%s",
 						bold ? "<B>" : "</B>",
 						italic ? "<I>" : "</I>",
 						underline ? "<U>" : "</U>",
-						t, 
+						rtl ? "<SPAN style=\"direction:rtl;text-align:right;\">" : "",
+						t,
+						rtl ? "</SPAN>" : "",
 						bold ? "</B>" : "<B>",
 						italic ? "</I>" : "<I>",
 						underline ? "</U>" : "<U>"
diff --git a/pidgin/plugins/crazychat/glm.c b/pidgin/plugins/crazychat/glm.c
index d4e3aad9e7..2f68234c55 100644
--- a/pidgin/plugins/crazychat/glm.c
+++ b/pidgin/plugins/crazychat/glm.c
@@ -543,6 +543,8 @@ glmWriteMTL(GLMmodel* model, char* modelpath, char* mtllibname)
     fprintf(file, "Ns %f\n", material->shininess / 128.0 * 1000.0);
     fprintf(file, "\n");
   }
+
+  fclose(file);
 }
 
 
diff --git a/pidgin/plugins/disco/Makefile.am b/pidgin/plugins/disco/Makefile.am
new file mode 100644
index 0000000000..36f6ba3a7a
--- /dev/null
+++ b/pidgin/plugins/disco/Makefile.am
@@ -0,0 +1,28 @@
+plugindir = $(libdir)/pidgin
+
+xmppdisco_la_LDFLAGS = -module -avoid-version
+
+EXTRA_DIST = \
+        Makefile.mingw
+
+if PLUGINS
+
+plugin_LTLIBRARIES = xmppdisco.la
+
+xmppdisco_la_SOURCES = \
+	gtkdisco.c \
+	gtkdisco.h \
+	xmppdisco.c \
+	xmppdisco.h
+
+xmppdisco_la_LIBADD = $(GTK_LIBS)
+
+endif
+
+AM_CPPFLAGS = \
+	-DDATADIR=\"$(datadir)\" \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
+	-I$(top_srcdir)/pidgin \
+	$(DEBUG_CFLAGS) \
+	$(GTK_CFLAGS)
diff --git a/pidgin/plugins/disco/Makefile.mingw b/pidgin/plugins/disco/Makefile.mingw
new file mode 100644
index 0000000000..c07993839f
--- /dev/null
+++ b/pidgin/plugins/disco/Makefile.mingw
@@ -0,0 +1,79 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for xmppdisco plugin.
+#
+
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+TARGET = xmppdisco
+
+##
+## INCLUDE PATHS
+##
+INCLUDE_PATHS +=	-I. \
+			-I$(GTK_TOP)/include \
+			-I$(GTK_TOP)/include/gtk-2.0 \
+			-I$(GTK_TOP)/include/glib-2.0 \
+			-I$(GTK_TOP)/include/pango-1.0 \
+			-I$(GTK_TOP)/include/atk-1.0 \
+			-I$(GTK_TOP)/include/cairo \
+			-I$(GTK_TOP)/lib/glib-2.0/include \
+			-I$(GTK_TOP)/lib/gtk-2.0/include \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)
+
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP)
+
+##
+##  SOURCES, OBJECTS
+##
+C_SRC =			xmppdisco.c \
+			gtkdisco.c
+
+OBJECTS = $(C_SRC:%.c=%.o)
+
+##
+## LIBRARIES
+##
+LIBS =			-lgtk-win32-2.0 \
+			-lglib-2.0 \
+			-lgdk-win32-2.0 \
+			-lgobject-2.0 \
+			-lpango-1.0 \
+			-lgdk_pixbuf-2.0 \
+			-lintl \
+			-lpurple \
+			-lpidgin
+
+include $(PIDGIN_COMMON_RULES)
+
+##
+## TARGET DEFINITIONS
+##
+.PHONY: all install clean
+
+all: $(TARGET).dll
+
+install: $(PIDGIN_INSTALL_PLUGINS_DIR) all
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR)
+
+$(OBJECTS): $(PIDGIN_CONFIG_H)
+
+$(TARGET).dll: $(PURPLE_DLL).a $(PIDGIN_DLL).a $(OBJECTS)
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
+
+##
+## CLEAN RULES
+##
+clean:
+	rm -rf $(OBJECTS)
+	rm -rf $(TARGET).dll
+
+include $(PIDGIN_COMMON_TARGETS)
diff --git a/pidgin/plugins/disco/gtkdisco.c b/pidgin/plugins/disco/gtkdisco.c
new file mode 100644
index 0000000000..d324482476
--- /dev/null
+++ b/pidgin/plugins/disco/gtkdisco.c
@@ -0,0 +1,767 @@
+/**
+ * @file gtkdisco.c GTK+ Service Discovery UI
+ * @ingroup pidgin
+ */
+
+/* pidgin
+ *
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+#include "debug.h"
+#include "gtkutils.h"
+#include "pidgin.h"
+#include "request.h"
+#include "pidgintooltip.h"
+
+#include "gtkdisco.h"
+#include "xmppdisco.h"
+
+GList *dialogs = NULL;
+
+enum {
+	PIXBUF_COLUMN = 0,
+	NAME_COLUMN,
+	DESCRIPTION_COLUMN,
+	SERVICE_COLUMN,
+	NUM_OF_COLUMNS
+};
+
+static void
+pidgin_disco_list_destroy(PidginDiscoList *list)
+{
+	g_hash_table_destroy(list->services);
+	if (list->dialog && list->dialog->discolist == list)
+		list->dialog->discolist = NULL;
+
+	if (list->tree) {
+		gtk_widget_destroy(list->tree);
+		list->tree = NULL;
+	}
+
+	g_free((gchar*)list->server);
+	g_free(list);
+}
+
+PidginDiscoList *pidgin_disco_list_ref(PidginDiscoList *list)
+{
+	g_return_val_if_fail(list != NULL, NULL);
+
+	++list->ref;
+	purple_debug_misc("xmppdisco", "reffing list, ref count now %d\n", list->ref);
+
+	return list;
+}
+
+void pidgin_disco_list_unref(PidginDiscoList *list)
+{
+	g_return_if_fail(list != NULL);
+
+	--list->ref;
+
+	purple_debug_misc("xmppdisco", "unreffing list, ref count now %d\n", list->ref);
+	if (list->ref == 0)
+		pidgin_disco_list_destroy(list);
+}
+
+void pidgin_disco_list_set_in_progress(PidginDiscoList *list, gboolean in_progress)
+{
+	PidginDiscoDialog *dialog = list->dialog;
+
+	if (!dialog)
+		return;
+
+	list->in_progress = in_progress;
+
+	if (in_progress) {
+		gtk_widget_set_sensitive(dialog->account_widget, FALSE);
+		gtk_widget_set_sensitive(dialog->stop_button, TRUE);
+		gtk_widget_set_sensitive(dialog->browse_button, FALSE);
+	} else {
+		gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(dialog->progress), 0.0);
+
+		gtk_widget_set_sensitive(dialog->account_widget, TRUE);
+
+		gtk_widget_set_sensitive(dialog->stop_button, FALSE);
+		gtk_widget_set_sensitive(dialog->browse_button, TRUE);
+/*
+		gtk_widget_set_sensitive(dialog->register_button, FALSE);
+		gtk_widget_set_sensitive(dialog->add_button, FALSE);
+*/
+	}
+}
+
+static GdkPixbuf *
+pidgin_disco_load_icon(XmppDiscoService *service, const char *size)
+{
+	GdkPixbuf *pixbuf = NULL;
+	char *filename = NULL;
+
+	g_return_val_if_fail(service != NULL, NULL);
+	g_return_val_if_fail(size != NULL, NULL);
+
+	if (service->type == XMPP_DISCO_SERVICE_TYPE_GATEWAY && service->gateway_type) {
+		char *tmp = g_strconcat(service->gateway_type, ".png", NULL);
+		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", size, tmp, NULL);
+		g_free(tmp);
+#if 0
+	} else if (service->type == XMPP_DISCO_SERVICE_TYPE_USER) {
+		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", size, "person.png", NULL);
+#endif
+	} else if (service->type == XMPP_DISCO_SERVICE_TYPE_CHAT)
+		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", size, "chat.png", NULL);
+
+	if (filename) {
+		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
+		g_free(filename);
+	}
+
+	return pixbuf;
+}
+
+static void pidgin_disco_create_tree(PidginDiscoList *pdl);
+
+static void dialog_select_account_cb(GObject *w, PurpleAccount *account,
+                                     PidginDiscoDialog *dialog)
+{
+	dialog->account = account;
+	gtk_widget_set_sensitive(dialog->browse_button, account != NULL);
+}
+
+static void register_button_cb(GtkWidget *unused, PidginDiscoDialog *dialog)
+{
+	xmpp_disco_service_register(dialog->selected);
+}
+
+static void discolist_cancel_cb(PidginDiscoList *pdl, const char *server)
+{
+	pidgin_disco_list_set_in_progress(pdl, FALSE);
+	pidgin_disco_list_unref(pdl);
+}
+
+static void discolist_ok_cb(PidginDiscoList *pdl, const char *server)
+{
+	gtk_widget_set_sensitive(pdl->dialog->browse_button, TRUE);
+
+	if (!server || !*server) {
+		purple_notify_error(my_plugin, _("Invalid Server"), _("Invalid Server"),
+		                    NULL);
+
+		pidgin_disco_list_set_in_progress(pdl, FALSE);
+		pidgin_disco_list_unref(pdl);
+		return;
+	}
+
+	pdl->server = g_strdup(server);
+	pidgin_disco_list_set_in_progress(pdl, TRUE);
+	xmpp_disco_start(pdl);
+}
+
+static void browse_button_cb(GtkWidget *button, PidginDiscoDialog *dialog)
+{
+	PurpleConnection *pc;
+	PidginDiscoList *pdl;
+	const char *username;
+	const char *at, *slash;
+	char *server = NULL;
+
+	pc = purple_account_get_connection(dialog->account);
+	if (!pc)
+		return;
+
+	gtk_widget_set_sensitive(dialog->browse_button, FALSE);
+	gtk_widget_set_sensitive(dialog->add_button, FALSE);
+	gtk_widget_set_sensitive(dialog->register_button, FALSE);
+
+	if (dialog->discolist != NULL) {
+		if (dialog->discolist->tree) {
+			gtk_widget_destroy(dialog->discolist->tree);
+			dialog->discolist->tree = NULL;
+		}
+		pidgin_disco_list_unref(dialog->discolist);
+	}
+
+	pdl = dialog->discolist = g_new0(PidginDiscoList, 1);
+	pdl->services = g_hash_table_new_full(NULL, NULL, NULL,
+			(GDestroyNotify)gtk_tree_row_reference_free);
+	pdl->pc = pc;
+	/* We keep a copy... */
+	pidgin_disco_list_ref(pdl);
+
+	pdl->dialog = dialog;
+	pidgin_disco_create_tree(pdl);
+
+	if (dialog->account_widget)
+		gtk_widget_set_sensitive(dialog->account_widget, FALSE);
+
+	username = purple_account_get_username(dialog->account);
+	at = g_utf8_strchr(username, -1, '@');
+	slash = g_utf8_strchr(username, -1, '/');
+	if (at && !slash) {
+		server = g_strdup_printf("%s", at + 1);
+	} else if (at && slash && at + 1 < slash) {
+		server = g_strdup_printf("%.*s", (int)(slash - (at + 1)), at + 1);
+	}
+
+	if (server == NULL)
+		/* This shouldn't ever happen since the account is connected */
+		server = g_strdup("jabber.org");
+
+	purple_request_input(my_plugin, _("Server name request"), _("Enter an XMPP Server"),
+			_("Select an XMPP server to query"),
+			server, FALSE, FALSE, NULL,
+			_("Find Services"), PURPLE_CALLBACK(discolist_ok_cb),
+			_("Cancel"), PURPLE_CALLBACK(discolist_cancel_cb),
+			purple_connection_get_account(pc), NULL, NULL, pdl);
+
+	g_free(server);
+}
+
+static void add_to_blist_cb(GtkWidget *unused, PidginDiscoDialog *dialog)
+{
+	XmppDiscoService *service = dialog->selected;
+	PurpleAccount *account;
+	const char *jid;
+
+	g_return_if_fail(service != NULL);
+
+	account = purple_connection_get_account(service->list->pc);
+	jid = service->jid;
+
+	if (service->type == XMPP_DISCO_SERVICE_TYPE_CHAT)
+		purple_blist_request_add_chat(account, NULL, NULL, jid);
+	else
+		purple_blist_request_add_buddy(account, jid, NULL, NULL);
+}
+
+static gboolean
+service_click_cb(GtkTreeView *tree, GdkEventButton *event, gpointer user_data)
+{
+	PidginDiscoList *pdl;
+	XmppDiscoService *service;
+	GtkWidget *menu;
+
+	GtkTreePath *path;
+	GtkTreeIter iter;
+	GValue val;
+
+	if (event->button != 3 || event->type != GDK_BUTTON_PRESS)
+		return FALSE;
+
+	pdl = user_data;
+
+	/* Figure out what was clicked */
+	if (!gtk_tree_view_get_path_at_pos(tree, event->x, event->y, &path,
+		                               NULL, NULL, NULL))
+		return FALSE;
+	gtk_tree_model_get_iter(GTK_TREE_MODEL(pdl->model), &iter, path);
+	gtk_tree_path_free(path);
+	val.g_type = 0;
+	gtk_tree_model_get_value(GTK_TREE_MODEL(pdl->model), &iter, SERVICE_COLUMN,
+	                         &val);
+	service = g_value_get_pointer(&val);
+
+	if (!service)
+		return FALSE;
+
+	menu = gtk_menu_new();
+
+	if (service->flags & XMPP_DISCO_ADD)
+		pidgin_new_item_from_stock(menu, _("Add to Buddy List"), GTK_STOCK_ADD,
+		                           G_CALLBACK(add_to_blist_cb), pdl->dialog,
+		                           0, 0, NULL);
+
+	if (service->flags & XMPP_DISCO_REGISTER) {
+		GtkWidget *item = pidgin_new_item(menu, _("Register"));
+		g_signal_connect(G_OBJECT(item), "activate",
+		                 G_CALLBACK(register_button_cb), pdl->dialog);
+	}
+
+	gtk_widget_show_all(menu);
+	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button,
+	               event->time);
+	return FALSE;
+}
+
+static void
+selection_changed_cb(GtkTreeSelection *selection, PidginDiscoList *pdl)
+{
+	GtkTreeIter iter;
+	GValue val;
+	PidginDiscoDialog *dialog = pdl->dialog;
+
+	if (gtk_tree_selection_get_selected(selection, NULL, &iter)) {
+		val.g_type = 0;
+		gtk_tree_model_get_value(GTK_TREE_MODEL(pdl->model), &iter, SERVICE_COLUMN, &val);
+		dialog->selected = g_value_get_pointer(&val);
+		if (!dialog->selected) {
+			gtk_widget_set_sensitive(dialog->add_button, FALSE);
+			gtk_widget_set_sensitive(dialog->register_button, FALSE);
+			return;
+		}
+
+		gtk_widget_set_sensitive(dialog->add_button, dialog->selected->flags & XMPP_DISCO_ADD);
+		gtk_widget_set_sensitive(dialog->register_button, dialog->selected->flags & XMPP_DISCO_REGISTER);
+	} else {
+		gtk_widget_set_sensitive(dialog->add_button, FALSE);
+		gtk_widget_set_sensitive(dialog->register_button, FALSE);
+	}
+}
+
+static void
+row_expanded_cb(GtkTreeView *tree, GtkTreeIter *arg1, GtkTreePath *rg2,
+                gpointer user_data)
+{
+	PidginDiscoList *pdl;
+	XmppDiscoService *service;
+	GValue val;
+
+	pdl = user_data;
+
+	val.g_type = 0;
+	gtk_tree_model_get_value(GTK_TREE_MODEL(pdl->model), arg1, SERVICE_COLUMN,
+	                         &val);
+	service = g_value_get_pointer(&val);
+	xmpp_disco_service_expand(service);
+}
+
+static void
+row_activated_cb(GtkTreeView       *tree_view,
+                 GtkTreePath       *path,
+                 GtkTreeViewColumn *column,
+                 gpointer           user_data)
+{
+	PidginDiscoList *pdl = user_data;
+	GtkTreeIter iter;
+	XmppDiscoService *service;
+	GValue val;
+
+	if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(pdl->model), &iter, path))
+		return;
+
+	val.g_type = 0;
+	gtk_tree_model_get_value(GTK_TREE_MODEL(pdl->model), &iter, SERVICE_COLUMN,
+	                         &val);
+	service = g_value_get_pointer(&val);
+
+	if (service->flags & XMPP_DISCO_BROWSE)
+		if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(pdl->tree), path))
+			gtk_tree_view_collapse_row(GTK_TREE_VIEW(pdl->tree), path);
+		else
+			gtk_tree_view_expand_row(GTK_TREE_VIEW(pdl->tree), path, FALSE);
+	else if (service->flags & XMPP_DISCO_REGISTER)
+		register_button_cb(NULL, pdl->dialog);
+	else if (service->flags & XMPP_DISCO_ADD)
+		add_to_blist_cb(NULL, pdl->dialog);
+}
+
+static void
+destroy_win_cb(GtkWidget *window, gpointer d)
+{
+	PidginDiscoDialog *dialog = d;
+	PidginDiscoList *list = dialog->discolist;
+
+	if (list) {
+		list->dialog = NULL;
+
+		if (list->in_progress)
+			list->in_progress = FALSE;
+
+		pidgin_disco_list_unref(list);
+	}
+
+	dialogs = g_list_remove(dialogs, d);
+	g_free(dialog);
+}
+
+static void stop_button_cb(GtkButton *button, PidginDiscoDialog *dialog)
+{
+	pidgin_disco_list_set_in_progress(dialog->discolist, FALSE);
+}
+
+static void close_button_cb(GtkButton *button, PidginDiscoDialog *dialog)
+{
+	GtkWidget *window = dialog->window;
+
+	gtk_widget_destroy(window);
+}
+
+static gboolean account_filter_func(PurpleAccount *account)
+{
+	return purple_strequal(purple_account_get_protocol_id(account), XMPP_PLUGIN_ID);
+}
+
+static gboolean
+disco_paint_tooltip(GtkWidget *tipwindow, gpointer data)
+{
+	PangoLayout *layout = g_object_get_data(G_OBJECT(tipwindow), "tooltip-plugin");
+	gtk_paint_layout(tipwindow->style, tipwindow->window, GTK_STATE_NORMAL, FALSE,
+			NULL, tipwindow, "tooltip",
+			6, 6, layout);
+	return TRUE;
+}
+
+static gboolean
+disco_create_tooltip(GtkWidget *tipwindow, GtkTreePath *path,
+		gpointer data, int *w, int *h)
+{
+	PidginDiscoList *pdl = data;
+	GtkTreeIter iter;
+	PangoLayout *layout;
+	int width, height;
+	XmppDiscoService *service;
+	GValue val;
+	const char *type = NULL;
+	char *markup, *jid, *name, *desc = NULL;
+
+	if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(pdl->model), &iter, path))
+		return FALSE;
+
+	val.g_type = 0;
+	gtk_tree_model_get_value(GTK_TREE_MODEL(pdl->model), &iter, SERVICE_COLUMN,
+	                         &val);
+	service = g_value_get_pointer(&val);
+
+	switch (service->type) {
+		case XMPP_DISCO_SERVICE_TYPE_UNSET:
+			type = _("Unknown");
+			break;
+
+		case XMPP_DISCO_SERVICE_TYPE_GATEWAY:
+			type = _("Gateway");
+			break;
+
+		case XMPP_DISCO_SERVICE_TYPE_DIRECTORY:
+			type = _("Directory");
+			break;
+
+		case XMPP_DISCO_SERVICE_TYPE_CHAT:
+			type = _("Chat");
+			break;
+
+		case XMPP_DISCO_SERVICE_TYPE_PUBSUB_COLLECTION:
+			type = _("PubSub Collection");
+			break;
+
+		case XMPP_DISCO_SERVICE_TYPE_PUBSUB_LEAF:
+			type = _("PubSub Leaf");
+			break;
+
+		case XMPP_DISCO_SERVICE_TYPE_OTHER:
+			type = _("Other");
+			break;
+	}
+
+	markup = g_strdup_printf("<span size='x-large' weight='bold'>%s</span>\n<b>%s:</b> %s%s%s",
+	                         name = g_markup_escape_text(service->name, -1),
+	                         type,
+	                         jid = g_markup_escape_text(service->jid, -1),
+	                         service->description ? _("\n<b>Description:</b> ") : "",
+	                         service->description ? desc = g_markup_escape_text(service->description, -1) : "");
+
+	layout = gtk_widget_create_pango_layout(tipwindow, NULL);
+	pango_layout_set_markup(layout, markup, -1);
+	pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
+	pango_layout_set_width(layout, 500000);
+	pango_layout_get_size(layout, &width, &height);
+	g_object_set_data_full(G_OBJECT(tipwindow), "tooltip-plugin", layout, g_object_unref);
+
+	if (w)
+		*w = PANGO_PIXELS(width) + 12;
+	if (h)
+		*h = PANGO_PIXELS(height) + 12;
+
+	g_free(markup);
+	g_free(jid);
+	g_free(name);
+	g_free(desc);
+
+	return TRUE;
+}
+
+static void pidgin_disco_create_tree(PidginDiscoList *pdl)
+{
+	GtkCellRenderer *text_renderer, *pixbuf_renderer;
+	GtkTreeViewColumn *column;
+	GtkTreeSelection *selection;
+
+	pdl->model = gtk_tree_store_new(NUM_OF_COLUMNS,
+			GDK_TYPE_PIXBUF,	/* PIXBUF_COLUMN */
+			G_TYPE_STRING,		/* NAME_COLUMN */
+			G_TYPE_STRING,		/* DESCRIPTION_COLUMN */
+			G_TYPE_POINTER		/* SERVICE_COLUMN */
+	);
+
+	pdl->tree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(pdl->model));
+	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(pdl->tree), TRUE);
+
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(pdl->tree));
+	g_signal_connect(G_OBJECT(selection), "changed",
+					 G_CALLBACK(selection_changed_cb), pdl);
+
+	g_object_unref(pdl->model);
+
+	gtk_container_add(GTK_CONTAINER(pdl->dialog->sw), pdl->tree);
+	gtk_widget_show(pdl->tree);
+
+	text_renderer = gtk_cell_renderer_text_new();
+	pixbuf_renderer = gtk_cell_renderer_pixbuf_new();
+
+	column = gtk_tree_view_column_new();
+	gtk_tree_view_column_set_title(column, _("Name"));
+
+	gtk_tree_view_column_pack_start(column, pixbuf_renderer, FALSE);
+	gtk_tree_view_column_set_attributes(column, pixbuf_renderer,
+			"pixbuf", PIXBUF_COLUMN, NULL);
+
+	gtk_tree_view_column_pack_start(column, text_renderer, TRUE);
+	gtk_tree_view_column_set_attributes(column, text_renderer,
+			"text", NAME_COLUMN, NULL);
+
+	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
+	                                GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+	gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
+	gtk_tree_view_column_set_sort_column_id(GTK_TREE_VIEW_COLUMN(column), NAME_COLUMN);
+	gtk_tree_view_column_set_reorderable(GTK_TREE_VIEW_COLUMN(column), TRUE);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(pdl->tree), column);
+
+	column = gtk_tree_view_column_new_with_attributes(_("Description"), text_renderer,
+				"text", DESCRIPTION_COLUMN, NULL);
+	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
+	                                GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+	gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
+	gtk_tree_view_column_set_sort_column_id(GTK_TREE_VIEW_COLUMN(column), DESCRIPTION_COLUMN);
+	gtk_tree_view_column_set_reorderable(GTK_TREE_VIEW_COLUMN(column), TRUE);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(pdl->tree), column);
+
+	g_signal_connect(G_OBJECT(pdl->tree), "button-press-event", G_CALLBACK(service_click_cb), pdl);
+	g_signal_connect(G_OBJECT(pdl->tree), "row-expanded", G_CALLBACK(row_expanded_cb), pdl);
+	g_signal_connect(G_OBJECT(pdl->tree), "row-activated", G_CALLBACK(row_activated_cb), pdl);
+
+	pidgin_tooltip_setup_for_treeview(pdl->tree, pdl,
+	                                  disco_create_tooltip,
+	                                  disco_paint_tooltip);
+}
+
+void pidgin_disco_signed_off_cb(PurpleConnection *pc)
+{
+	GList *node;
+
+	for (node = dialogs; node; node = node->next) {
+		PidginDiscoDialog *dialog = node->data;
+		PidginDiscoList *list = dialog->discolist;
+
+		if (list && list->pc == pc) {
+			if (list->in_progress)
+				pidgin_disco_list_set_in_progress(list, FALSE);
+
+			if (list->tree) {
+				gtk_widget_destroy(list->tree);
+				list->tree = NULL;
+			}
+
+			pidgin_disco_list_unref(list);
+			dialog->discolist = NULL;
+
+			gtk_widget_set_sensitive(dialog->browse_button,
+					pidgin_account_option_menu_get_selected(dialog->account_widget) != NULL);
+
+			gtk_widget_set_sensitive(dialog->register_button, FALSE);
+			gtk_widget_set_sensitive(dialog->add_button, FALSE);
+		}
+	}
+}
+
+void pidgin_disco_dialogs_destroy_all(void)
+{
+	while (dialogs) {
+		PidginDiscoDialog *dialog = dialogs->data;
+
+		gtk_widget_destroy(dialog->window);
+		/* destroy_win_cb removes the dialog from the list */
+	}
+}
+
+PidginDiscoDialog *pidgin_disco_dialog_new(void)
+{
+	PidginDiscoDialog *dialog;
+	GtkWidget *window, *vbox, *vbox2, *bbox;
+
+	dialog = g_new0(PidginDiscoDialog, 1);
+	dialogs = g_list_prepend(dialogs, dialog);
+
+	/* Create the window. */
+	dialog->window = window = pidgin_create_dialog(_("Service Discovery"), PIDGIN_HIG_BORDER, "service discovery", TRUE);
+
+	g_signal_connect(G_OBJECT(window), "destroy",
+					 G_CALLBACK(destroy_win_cb), dialog);
+
+	/* Create the parent vbox for everything. */
+	vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(window), FALSE, PIDGIN_HIG_BORDER);
+
+	vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
+	gtk_container_add(GTK_CONTAINER(vbox), vbox2);
+	gtk_widget_show(vbox2);
+
+	/* accounts dropdown list */
+	dialog->account_widget = pidgin_account_option_menu_new(NULL, FALSE,
+	                         G_CALLBACK(dialog_select_account_cb), account_filter_func, dialog);
+	dialog->account = pidgin_account_option_menu_get_selected(dialog->account_widget);
+	pidgin_add_widget_to_vbox(GTK_BOX(vbox2), _("_Account:"), NULL, dialog->account_widget, TRUE, NULL);
+
+	/* scrolled window */
+	dialog->sw = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(dialog->sw),
+	                                    GTK_SHADOW_IN);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dialog->sw),
+	                               GTK_POLICY_AUTOMATIC,
+	                               GTK_POLICY_AUTOMATIC);
+	gtk_box_pack_start(GTK_BOX(vbox2), dialog->sw, TRUE, TRUE, 0);
+	gtk_widget_set_size_request(dialog->sw, -1, 250);
+	gtk_widget_show(dialog->sw);
+
+	/* progress bar */
+	dialog->progress = gtk_progress_bar_new();
+	gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(dialog->progress), 0.1);
+	gtk_box_pack_start(GTK_BOX(vbox2), dialog->progress, FALSE, FALSE, 0);
+	gtk_widget_show(dialog->progress);
+
+	/* button box */
+	bbox = pidgin_dialog_get_action_area(GTK_DIALOG(window));
+	gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
+	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
+
+	/* stop button */
+	dialog->stop_button =
+		pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_STOP,
+		                         G_CALLBACK(stop_button_cb), dialog);
+	gtk_widget_set_sensitive(dialog->stop_button, FALSE);
+
+	/* browse button */
+	dialog->browse_button =
+		pidgin_pixbuf_button_from_stock(_("_Browse"), GTK_STOCK_REFRESH,
+		                                PIDGIN_BUTTON_HORIZONTAL);
+	gtk_box_pack_start(GTK_BOX(bbox), dialog->browse_button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(dialog->browse_button), "clicked",
+	                 G_CALLBACK(browse_button_cb), dialog);
+	gtk_widget_set_sensitive(dialog->browse_button, dialog->account != NULL);
+	gtk_widget_show(dialog->browse_button);
+
+	/* register button */
+	dialog->register_button =
+		pidgin_dialog_add_button(GTK_DIALOG(dialog->window), _("Register"),
+		                         G_CALLBACK(register_button_cb), dialog);
+	gtk_widget_set_sensitive(dialog->register_button, FALSE);
+
+	/* add button */
+	dialog->add_button =
+		pidgin_pixbuf_button_from_stock(_("_Add"), GTK_STOCK_ADD,
+	                                    PIDGIN_BUTTON_HORIZONTAL);
+	gtk_box_pack_start(GTK_BOX(bbox), dialog->add_button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(dialog->add_button), "clicked",
+	                 G_CALLBACK(add_to_blist_cb), dialog);
+	gtk_widget_set_sensitive(dialog->add_button, FALSE);
+	gtk_widget_show(dialog->add_button);
+
+	/* close button */
+	dialog->close_button =
+		pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_CLOSE,
+		                         G_CALLBACK(close_button_cb), dialog);
+
+	/* show the dialog window and return the dialog */
+	gtk_widget_show(dialog->window);
+
+	return dialog;
+}
+
+void pidgin_disco_add_service(PidginDiscoList *pdl, XmppDiscoService *service, XmppDiscoService *parent)
+{
+	PidginDiscoDialog *dialog;
+	GtkTreeIter iter, parent_iter, child;
+	GdkPixbuf *pixbuf = NULL;
+	gboolean append = TRUE;
+
+	dialog = pdl->dialog;
+	g_return_if_fail(dialog != NULL);
+
+	if (service != NULL)
+		purple_debug_info("xmppdisco", "Adding service \"%s\"\n", service->name);
+	else
+		purple_debug_info("xmppdisco", "Service \"%s\" has no childrens\n", parent->name);
+
+	gtk_progress_bar_pulse(GTK_PROGRESS_BAR(dialog->progress));
+
+	if (parent) {
+		GtkTreeRowReference *rr;
+		GtkTreePath *path;
+
+		rr = g_hash_table_lookup(pdl->services, parent);
+		path = gtk_tree_row_reference_get_path(rr);
+		if (path) {
+			gtk_tree_model_get_iter(GTK_TREE_MODEL(pdl->model), &parent_iter, path);
+			gtk_tree_path_free(path);
+
+			if (gtk_tree_model_iter_children(GTK_TREE_MODEL(pdl->model), &child,
+			                                 &parent_iter)) {
+				PidginDiscoList *tmp;
+				gtk_tree_model_get(GTK_TREE_MODEL(pdl->model), &child,
+				                   SERVICE_COLUMN, &tmp, -1);
+				if (!tmp)
+					append = FALSE;
+			}
+		}
+	}
+
+	if (service == NULL) {
+		if (parent != NULL && !append)
+			gtk_tree_store_remove(pdl->model, &child);
+		return;
+	}
+
+	if (append)
+		gtk_tree_store_append(pdl->model, &iter, (parent ? &parent_iter : NULL));
+	else
+		iter = child;
+
+	if (service->flags & XMPP_DISCO_BROWSE) {
+		GtkTreeRowReference *rr;
+		GtkTreePath *path;
+
+		gtk_tree_store_append(pdl->model, &child, &iter);
+
+		path = gtk_tree_model_get_path(GTK_TREE_MODEL(pdl->model), &iter);
+		rr = gtk_tree_row_reference_new(GTK_TREE_MODEL(pdl->model), path);
+		g_hash_table_insert(pdl->services, service, rr);
+		gtk_tree_path_free(path);
+	}
+
+	pixbuf = pidgin_disco_load_icon(service, "16");
+
+	gtk_tree_store_set(pdl->model, &iter,
+			PIXBUF_COLUMN, pixbuf,
+			NAME_COLUMN, service->name,
+			DESCRIPTION_COLUMN, service->description,
+			SERVICE_COLUMN, service,
+			-1);
+
+	if (pixbuf)
+		g_object_unref(pixbuf);
+}
+
diff --git a/pidgin/plugins/disco/gtkdisco.h b/pidgin/plugins/disco/gtkdisco.h
new file mode 100644
index 0000000000..8f2fa5b20b
--- /dev/null
+++ b/pidgin/plugins/disco/gtkdisco.h
@@ -0,0 +1,80 @@
+/* pidgin
+ *
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301 USA
+ */
+
+#ifndef PIDGIN_XMPP_DISCO_UI_H
+#define PIDGIN_XMPP_DISCO_UI_H
+
+typedef struct _PidginDiscoDialog PidginDiscoDialog;
+typedef struct _PidginDiscoList PidginDiscoList;
+
+#include "xmppdisco.h"
+
+struct _PidginDiscoDialog {
+	GtkWidget *window;
+	GtkWidget *account_widget;
+
+	GtkWidget *sw;
+	GtkWidget *progress;
+
+	GtkWidget *stop_button;
+	GtkWidget *browse_button;
+	GtkWidget *register_button;
+	GtkWidget *add_button;
+	GtkWidget *close_button;
+	XmppDiscoService *selected;
+
+	PurpleAccount *account;
+	PidginDiscoList *discolist;
+};
+
+struct _PidginDiscoList {
+	PurpleConnection *pc;
+	gboolean in_progress;
+	const gchar *server;
+
+	gint ref;
+	guint fetch_count;
+
+	PidginDiscoDialog *dialog;
+	GtkTreeStore *model;
+	GtkWidget *tree;
+	GHashTable *services;
+};
+
+/**
+ * Shows a new service discovery dialog.
+ */
+PidginDiscoDialog *pidgin_disco_dialog_new(void);
+
+/**
+ * Destroy all the open dialogs (called when unloading the plugin).
+ */
+void pidgin_disco_dialogs_destroy_all(void);
+void pidgin_disco_signed_off_cb(PurpleConnection *pc);
+
+void pidgin_disco_add_service(PidginDiscoList *list, XmppDiscoService *service,
+                              XmppDiscoService *parent);
+
+PidginDiscoList *pidgin_disco_list_ref(PidginDiscoList *list);
+void pidgin_disco_list_unref(PidginDiscoList *list);
+
+void pidgin_disco_list_set_in_progress(PidginDiscoList *list, gboolean in_progress);
+#endif /* PIDGIN_XMPP_DISCO_UI_H */
diff --git a/pidgin/plugins/disco/xmppdisco.c b/pidgin/plugins/disco/xmppdisco.c
new file mode 100644
index 0000000000..07efa34fc4
--- /dev/null
+++ b/pidgin/plugins/disco/xmppdisco.c
@@ -0,0 +1,686 @@
+/*
+ * Purple - XMPP Service Disco Browser
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301 USA
+ *
+ */
+
+/* TODO list (a little bit of a brain dump):
+	* Support more actions than "register" and "add" based on context.
+		- Subscribe to pubsub nodes (just...because?)
+		- Execute ad-hoc commands
+		- Change 'Register' to 'Unregister' if we're registered?
+		- Administer MUCs
+	* Enumerate pubsub node contents.
+		- PEP too? (useful development tool at times)
+	* See if we can better handle the ad-hoc commands that ejabberd returns
+	  when disco'ing a server as an administrator:
+from disco#items:
+	<item jid='darkrain42.org' node='announce' name='Announcements'/>
+disco#info:
+	<iq from='darkrain42.org' type='result'>
+		<query xmlns='http://jabber.org/protocol/disco#info' node='announce'/>
+	</iq>
+	* For services that are a JID w/o a node, handle fetching ad-hoc commands?
+*/
+
+#include "internal.h"
+#include "pidgin.h"
+
+#include "debug.h"
+#include "signals.h"
+#include "version.h"
+
+#include "gtkconv.h"
+#include "gtkimhtml.h"
+#include "gtkplugin.h"
+
+#include "xmppdisco.h"
+#include "gtkdisco.h"
+
+/* Variables */
+PurplePlugin *my_plugin = NULL;
+static GHashTable *iq_callbacks = NULL;
+static gboolean iq_listening = FALSE;
+
+typedef void (*XmppIqCallback)(PurpleConnection *pc, const char *type,
+                               const char *id, const char *from, xmlnode *iq,
+                               gpointer data);
+
+struct item_data {
+	PidginDiscoList *list;
+	XmppDiscoService *parent;
+	char *name;
+	char *node; /* disco#info replies don't always include the node */
+};
+
+struct xmpp_iq_cb_data
+{
+	/*
+	 * Every IQ callback in this plugin uses the same structure for the
+	 * callback data. It's a hack (it wouldn't scale), but it's used so that
+	 * it's easy to clean up all the callbacks when the account disconnects
+	 * (see remove_iq_callbacks_by_pc below).
+	 */
+	struct item_data *context;
+	PurpleConnection *pc;
+	XmppIqCallback cb;
+};
+
+
+static char*
+generate_next_id()
+{
+	static guint32 index = 0;
+
+	if (index == 0) {
+		do {
+			index = g_random_int();
+		} while (index == 0);
+	}
+
+	return g_strdup_printf("purpledisco%x", index++);
+}
+
+static gboolean
+remove_iq_callbacks_by_pc(gpointer key, gpointer value, gpointer user_data)
+{
+	struct xmpp_iq_cb_data *cb_data = value;
+
+	if (cb_data && cb_data->pc == user_data) {
+		struct item_data *item_data = cb_data->context;
+
+		if (item_data) {
+			pidgin_disco_list_unref(item_data->list);
+			g_free(item_data->name);
+			g_free(item_data->node);
+			g_free(item_data);
+		}
+
+		return TRUE;
+	} else
+		return FALSE;
+}
+
+static gboolean
+xmpp_iq_received(PurpleConnection *pc, const char *type, const char *id,
+                 const char *from, xmlnode *iq)
+{
+	struct xmpp_iq_cb_data *cb_data;
+
+	cb_data = g_hash_table_lookup(iq_callbacks, id);
+	if (!cb_data)
+		return FALSE;
+
+	cb_data->cb(cb_data->pc, type, id, from, iq, cb_data->context);
+
+	g_hash_table_remove(iq_callbacks, id);
+	if (g_hash_table_size(iq_callbacks) == 0) {
+		PurplePlugin *prpl = purple_connection_get_prpl(pc);
+		iq_listening = FALSE;
+		purple_signal_disconnect(prpl, "jabber-receiving-iq", my_plugin,
+		                         PURPLE_CALLBACK(xmpp_iq_received));
+	}
+
+	/* Om nom nom nom */
+	return TRUE;
+}
+
+static void
+xmpp_iq_register_callback(PurpleConnection *pc, gchar *id, gpointer data,
+                          XmppIqCallback cb)
+{
+	struct xmpp_iq_cb_data *cbdata = g_new0(struct xmpp_iq_cb_data, 1);
+
+	cbdata->context = data;
+	cbdata->cb = cb;
+	cbdata->pc = pc;
+
+	g_hash_table_insert(iq_callbacks, id, cbdata);
+
+	if (!iq_listening) {
+		PurplePlugin *prpl = purple_plugins_find_with_id(XMPP_PLUGIN_ID);
+		iq_listening = TRUE;
+		purple_signal_connect(prpl, "jabber-receiving-iq", my_plugin,
+		                      PURPLE_CALLBACK(xmpp_iq_received), NULL);
+	}
+}
+
+static void
+xmpp_disco_info_do(PurpleConnection *pc, gpointer cbdata, const char *jid,
+                   const char *node, XmppIqCallback cb)
+{
+	xmlnode *iq, *query;
+	char *id = generate_next_id();
+
+	iq = xmlnode_new("iq");
+	xmlnode_set_attrib(iq, "type", "get");
+	xmlnode_set_attrib(iq, "to", jid);
+	xmlnode_set_attrib(iq, "id", id);
+
+	query = xmlnode_new_child(iq, "query");
+	xmlnode_set_namespace(query, NS_DISCO_INFO);
+	if (node)
+		xmlnode_set_attrib(query, "node", node);
+
+	/* Steals id */
+	xmpp_iq_register_callback(pc, id, cbdata, cb);
+
+	purple_signal_emit(purple_connection_get_prpl(pc), "jabber-sending-xmlnode",
+	                   pc, &iq);
+	if (iq != NULL)
+		xmlnode_free(iq);
+}
+
+static void
+xmpp_disco_items_do(PurpleConnection *pc, gpointer cbdata, const char *jid,
+                    const char *node, XmppIqCallback cb)
+{
+	xmlnode *iq, *query;
+	char *id = generate_next_id();
+
+	iq = xmlnode_new("iq");
+	xmlnode_set_attrib(iq, "type", "get");
+	xmlnode_set_attrib(iq, "to", jid);
+	xmlnode_set_attrib(iq, "id", id);
+
+	query = xmlnode_new_child(iq, "query");
+	xmlnode_set_namespace(query, NS_DISCO_ITEMS);
+	if (node)
+		xmlnode_set_attrib(query, "node", node);
+
+	/* Steals id */
+	xmpp_iq_register_callback(pc, id, cbdata, cb);
+
+	purple_signal_emit(purple_connection_get_prpl(pc), "jabber-sending-xmlnode",
+	                   pc, &iq);
+	if (iq != NULL)
+		xmlnode_free(iq);
+}
+
+static XmppDiscoServiceType
+disco_service_type_from_identity(xmlnode *identity)
+{
+	const char *category, *type;
+
+	if (!identity)
+		return XMPP_DISCO_SERVICE_TYPE_OTHER;
+
+	category = xmlnode_get_attrib(identity, "category");
+	type = xmlnode_get_attrib(identity, "type");
+
+	if (!category)
+		return XMPP_DISCO_SERVICE_TYPE_OTHER;
+
+	if (g_str_equal(category, "conference"))
+		return XMPP_DISCO_SERVICE_TYPE_CHAT;
+	else if (g_str_equal(category, "directory"))
+		return XMPP_DISCO_SERVICE_TYPE_DIRECTORY;
+	else if (g_str_equal(category, "gateway"))
+		return XMPP_DISCO_SERVICE_TYPE_GATEWAY;
+	else if (g_str_equal(category, "pubsub")) {
+		if (!type || g_str_equal(type, "collection"))
+			return XMPP_DISCO_SERVICE_TYPE_PUBSUB_COLLECTION;
+		else if (g_str_equal(type, "leaf"))
+			return XMPP_DISCO_SERVICE_TYPE_PUBSUB_LEAF;
+		else if (g_str_equal(type, "service"))
+			return XMPP_DISCO_SERVICE_TYPE_OTHER;
+		else {
+			purple_debug_warning("xmppdisco", "Unknown pubsub type '%s'\n", type);
+			return XMPP_DISCO_SERVICE_TYPE_OTHER;
+		}
+	}
+
+	return XMPP_DISCO_SERVICE_TYPE_OTHER;
+}
+
+static const struct {
+	const char *from;
+	const char *to;
+} disco_type_mappings[] = {
+	{ "gadu-gadu", "gadu-gadu" }, /* the prpl is prpl-gg, but list_icon returns "gadu-gadu" */
+	{ "sametime",  "meanwhile" },
+	{ "myspaceim", "myspace" },
+	{ "xmpp",      "jabber" }, /* prpl-jabber (mentioned in case the prpl is renamed so this line will match) */
+	{ NULL,        NULL }
+};
+
+static const gchar *
+disco_type_from_string(const gchar *str)
+{
+	int i = 0;
+
+	g_return_val_if_fail(str != NULL, "");
+
+	for ( ; disco_type_mappings[i].from; ++i) {
+		if (!strcasecmp(str, disco_type_mappings[i].from))
+			return disco_type_mappings[i].to;
+	}
+
+	/* fallback to the string itself */
+	return str;
+}
+
+static void
+got_info_cb(PurpleConnection *pc, const char *type, const char *id,
+            const char *from, xmlnode *iq, gpointer data)
+{
+	struct item_data *item_data = data;
+	PidginDiscoList *list = item_data->list;
+	xmlnode *query;
+
+	--list->fetch_count;
+
+	if (!list->in_progress)
+		goto out;
+
+	if (g_str_equal(type, "result") &&
+			(query = xmlnode_get_child(iq, "query"))) {
+		xmlnode *identity = xmlnode_get_child(query, "identity");
+		XmppDiscoService *service;
+		xmlnode *feature;
+
+		service = g_new0(XmppDiscoService, 1);
+		service->list = item_data->list;
+		purple_debug_info("xmppdisco", "parent for %s is %p\n", from, item_data->parent);
+		service->parent = item_data->parent;
+		service->flags = 0;
+		service->type = disco_service_type_from_identity(identity);
+
+		if (item_data->node) {
+			if (item_data->name) {
+				service->name = item_data->name;
+				item_data->name = NULL;
+			} else
+				service->name = g_strdup(item_data->node);
+
+			service->node = item_data->node;
+			item_data->node = NULL;
+
+			if (service->type == XMPP_DISCO_SERVICE_TYPE_PUBSUB_COLLECTION)
+				service->flags |= XMPP_DISCO_BROWSE;
+		} else
+			service->name = g_strdup(from);
+
+		if (!service->node)
+			/* Only support adding JIDs, not JID+node combos */
+			service->flags |= XMPP_DISCO_ADD;
+
+		if (item_data->name) {
+			service->description = item_data->name;
+			item_data->name = NULL;
+		} else if (identity)
+			service->description = g_strdup(xmlnode_get_attrib(identity, "name"));
+
+		/* TODO: Overlap with service->name a bit */
+		service->jid = g_strdup(from);
+
+		for (feature = xmlnode_get_child(query, "feature"); feature;
+				feature = xmlnode_get_next_twin(feature)) {
+			const char *var;
+			if (!(var = xmlnode_get_attrib(feature, "var")))
+				continue;
+
+			if (g_str_equal(var, NS_REGISTER))
+				service->flags |= XMPP_DISCO_REGISTER;
+			else if (g_str_equal(var, NS_DISCO_ITEMS))
+				service->flags |= XMPP_DISCO_BROWSE;
+			else if (g_str_equal(var, NS_MUC)) {
+				service->flags |= XMPP_DISCO_BROWSE;
+				service->type = XMPP_DISCO_SERVICE_TYPE_CHAT;
+			}
+		}
+
+		if (service->type == XMPP_DISCO_SERVICE_TYPE_GATEWAY)
+			service->gateway_type = g_strdup(disco_type_from_string(
+					xmlnode_get_attrib(identity, "type")));
+
+		pidgin_disco_add_service(list, service, service->parent);
+	}
+
+out:
+	if (list->fetch_count == 0)
+		pidgin_disco_list_set_in_progress(list, FALSE);
+
+	g_free(item_data->name);
+	g_free(item_data->node);
+	g_free(item_data);
+	pidgin_disco_list_unref(list);
+}
+
+static void
+got_items_cb(PurpleConnection *pc, const char *type, const char *id,
+             const char *from, xmlnode *iq, gpointer data)
+{
+	struct item_data *item_data = data;
+	PidginDiscoList *list = item_data->list;
+	xmlnode *query;
+	gboolean has_items = FALSE;
+
+	--list->fetch_count;
+
+	if (!list->in_progress)
+		goto out;
+
+	if (g_str_equal(type, "result") &&
+			(query = xmlnode_get_child(iq, "query"))) {
+		xmlnode *item;
+
+		for (item = xmlnode_get_child(query, "item"); item;
+				item = xmlnode_get_next_twin(item)) {
+			const char *jid = xmlnode_get_attrib(item, "jid");
+			const char *name = xmlnode_get_attrib(item, "name");
+			const char *node = xmlnode_get_attrib(item, "node");
+
+			has_items = TRUE;
+
+			if (item_data->parent->type == XMPP_DISCO_SERVICE_TYPE_CHAT) {
+				/* This is a hacky first-order approximation. Any MUC
+				 * component that has a >1 level hierarchy (a Yahoo MUC
+				 * transport component probably does) will violate this.
+				 *
+				 * On the other hand, this is better than querying all the
+				 * chats at conference.jabber.org to enumerate them.
+				 */
+				XmppDiscoService *service = g_new0(XmppDiscoService, 1);
+				service->list = item_data->list;
+				service->parent = item_data->parent;
+				service->flags = XMPP_DISCO_ADD;
+				service->type = XMPP_DISCO_SERVICE_TYPE_CHAT;
+
+				service->name = g_strdup(name);
+				service->jid = g_strdup(jid);
+				service->node = g_strdup(node);
+				pidgin_disco_add_service(list, service, item_data->parent);
+			} else {
+				struct item_data *item_data2 = g_new0(struct item_data, 1);
+
+				item_data2->list = item_data->list;
+				item_data2->parent = item_data->parent;
+				item_data2->name = g_strdup(name);
+				item_data2->node = g_strdup(node);
+
+				++list->fetch_count;
+				pidgin_disco_list_ref(list);
+				xmpp_disco_info_do(pc, item_data2, jid, node, got_info_cb);
+			}
+		}
+	}
+
+	if (!has_items)
+		pidgin_disco_add_service(list, NULL, item_data->parent);
+
+out:
+	if (list->fetch_count == 0)
+		pidgin_disco_list_set_in_progress(list, FALSE);
+
+	g_free(item_data);
+	pidgin_disco_list_unref(list);
+}
+
+static void
+server_items_cb(PurpleConnection *pc, const char *type, const char *id,
+                const char *from, xmlnode *iq, gpointer data)
+{
+	struct item_data *cb_data = data;
+	PidginDiscoList *list = cb_data->list;
+	xmlnode *query;
+
+	g_free(cb_data);
+	--list->fetch_count;
+
+	if (g_str_equal(type, "result") &&
+			(query = xmlnode_get_child(iq, "query"))) {
+		xmlnode *item;
+
+		for (item = xmlnode_get_child(query, "item"); item;
+				item = xmlnode_get_next_twin(item)) {
+			const char *jid = xmlnode_get_attrib(item, "jid");
+			const char *name = xmlnode_get_attrib(item, "name");
+			const char *node = xmlnode_get_attrib(item, "node");
+			struct item_data *item_data;
+
+			if (!jid)
+				continue;
+
+			item_data = g_new0(struct item_data, 1);
+			item_data->list = list;
+			item_data->name = g_strdup(name);
+			item_data->node = g_strdup(node);
+
+			++list->fetch_count;
+			pidgin_disco_list_ref(list);
+			xmpp_disco_info_do(pc, item_data, jid, node, got_info_cb);
+		}
+	}
+
+	if (list->fetch_count == 0)
+		pidgin_disco_list_set_in_progress(list, FALSE);
+
+	pidgin_disco_list_unref(list);
+}
+
+static void
+server_info_cb(PurpleConnection *pc, const char *type, const char *id,
+               const char *from, xmlnode *iq, gpointer data)
+{
+	struct item_data *cb_data = data;
+	PidginDiscoList *list = cb_data->list;
+	xmlnode *query;
+	xmlnode *error;
+	gboolean items = FALSE;
+
+	--list->fetch_count;
+
+	if (g_str_equal(type, "result") &&
+			(query = xmlnode_get_child(iq, "query"))) {
+		xmlnode *feature;
+
+		for (feature = xmlnode_get_child(query, "feature"); feature;
+				feature = xmlnode_get_next_twin(feature)) {
+			const char *var = xmlnode_get_attrib(feature, "var");
+			if (purple_strequal(var, NS_DISCO_ITEMS)) {
+				items = TRUE;
+				break;
+			}
+		}
+
+		if (items) {
+			xmpp_disco_items_do(pc, cb_data, from, NULL /* node */, server_items_cb);
+			++list->fetch_count;
+			pidgin_disco_list_ref(list);
+		}
+		else {
+			pidgin_disco_list_set_in_progress(list, FALSE);
+			g_free(cb_data);
+		}
+	}
+	else {
+		error = xmlnode_get_child(iq, "error");
+		if (xmlnode_get_child(error, "remote-server-not-found")
+		 || xmlnode_get_child(error, "jid-malformed")) {
+			purple_notify_error(my_plugin, _("Error"),
+			                    _("Server does not exist"),
+ 			                    NULL);
+		}
+		else {
+			purple_notify_error(my_plugin, _("Error"),
+			                    _("Server does not support service discovery"),
+			                    NULL);
+		}
+		pidgin_disco_list_set_in_progress(list, FALSE);
+		g_free(cb_data);
+	}
+
+	pidgin_disco_list_unref(list);
+}
+
+void xmpp_disco_start(PidginDiscoList *list)
+{
+	struct item_data *cb_data;
+
+	g_return_if_fail(list != NULL);
+
+	++list->fetch_count;
+	pidgin_disco_list_ref(list);
+
+	cb_data = g_new0(struct item_data, 1);
+	cb_data->list = list;
+
+	xmpp_disco_info_do(list->pc, cb_data, list->server, NULL, server_info_cb);
+}
+
+void xmpp_disco_service_expand(XmppDiscoService *service)
+{
+	struct item_data *item_data;
+
+	g_return_if_fail(service != NULL);
+
+	if (service->expanded)
+		return;
+
+	item_data = g_new0(struct item_data, 1);
+	item_data->list = service->list;
+	item_data->parent = service;
+
+	++service->list->fetch_count;
+	pidgin_disco_list_ref(service->list);
+
+	pidgin_disco_list_set_in_progress(service->list, TRUE);
+
+	xmpp_disco_items_do(service->list->pc, item_data, service->jid, service->node,
+	                    got_items_cb);
+	service->expanded = TRUE;
+}
+
+void xmpp_disco_service_register(XmppDiscoService *service)
+{
+	xmlnode *iq, *query;
+	char *id = generate_next_id();
+
+	iq = xmlnode_new("iq");
+	xmlnode_set_attrib(iq, "type", "get");
+	xmlnode_set_attrib(iq, "to", service->jid);
+	xmlnode_set_attrib(iq, "id", id);
+
+	query = xmlnode_new_child(iq, "query");
+	xmlnode_set_namespace(query, NS_REGISTER);
+
+	purple_signal_emit(purple_connection_get_prpl(service->list->pc),
+			"jabber-sending-xmlnode", service->list->pc, &iq);
+	if (iq != NULL)
+		xmlnode_free(iq);
+	g_free(id);
+}
+
+static void
+create_dialog(PurplePluginAction *action)
+{
+	pidgin_disco_dialog_new();
+}
+
+static GList *
+actions(PurplePlugin *plugin, gpointer context)
+{
+	GList *l = NULL;
+	PurplePluginAction *action = NULL;
+
+	action = purple_plugin_action_new(_("XMPP Service Discovery"),
+	                                  create_dialog);
+	l = g_list_prepend(l, action);
+
+	return l;
+}
+
+static void
+signed_off_cb(PurpleConnection *pc, gpointer unused)
+{
+	/* Deal with any dialogs */
+	pidgin_disco_signed_off_cb(pc);
+
+	/* Remove all the IQ callbacks for this connection */
+	g_hash_table_foreach_remove(iq_callbacks, remove_iq_callbacks_by_pc, pc);
+}
+
+static gboolean
+plugin_load(PurplePlugin *plugin)
+{
+	PurplePlugin *xmpp_prpl;
+
+	my_plugin = plugin;
+
+	xmpp_prpl = purple_plugins_find_with_id(XMPP_PLUGIN_ID);
+	if (NULL == xmpp_prpl)
+		return FALSE;
+
+	purple_signal_connect(purple_connections_get_handle(), "signing-off",
+	                      plugin, PURPLE_CALLBACK(signed_off_cb), NULL);
+
+	iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+
+	return TRUE;
+}
+
+static gboolean
+plugin_unload(PurplePlugin *plugin)
+{
+	g_hash_table_destroy(iq_callbacks);
+	iq_callbacks = NULL;
+
+	purple_signals_disconnect_by_handle(plugin);
+	pidgin_disco_dialogs_destroy_all();
+
+	return TRUE;
+}
+
+static PurplePluginInfo info =
+{
+	PURPLE_PLUGIN_MAGIC,
+	PURPLE_MAJOR_VERSION,
+	PURPLE_MINOR_VERSION,
+	PURPLE_PLUGIN_STANDARD,
+	PIDGIN_PLUGIN_TYPE,
+	0,
+	NULL,
+	PURPLE_PRIORITY_DEFAULT,
+	"gtk-xmppdisco",
+	N_("XMPP Service Discovery"),
+	DISPLAY_VERSION,
+	N_("Allows browsing and registering services."),
+	N_("This plugin is useful for registering with legacy transports or other "
+	   "XMPP services."),
+	"Paul Aurich <paul@darkrain42.org>",
+	PURPLE_WEBSITE,
+	plugin_load,
+	plugin_unload,
+	NULL,               /**< destroy    */
+	NULL,               /**< ui_info    */
+	NULL,               /**< extra_info */
+	NULL,               /**< prefs_info */
+	actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static void
+init_plugin(PurplePlugin *plugin)
+{
+}
+
+PURPLE_INIT_PLUGIN(xmppdisco, init_plugin, info)
diff --git a/pidgin/plugins/disco/xmppdisco.h b/pidgin/plugins/disco/xmppdisco.h
new file mode 100644
index 0000000000..51b546f3fe
--- /dev/null
+++ b/pidgin/plugins/disco/xmppdisco.h
@@ -0,0 +1,107 @@
+/* pidgin
+ *
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301 USA
+ */
+
+#ifndef PIDGIN_XMPP_DISCO_H
+#define PIDGIN_XMPP_DISCO_H
+
+typedef struct _XmppDiscoService XmppDiscoService;
+
+#include "gtkdisco.h"
+
+#define XMPP_PLUGIN_ID      "prpl-jabber"
+#define NS_DISCO_INFO       "http://jabber.org/protocol/disco#info"
+#define NS_DISCO_ITEMS      "http://jabber.org/protocol/disco#items"
+#define NS_MUC              "http://jabber.org/protocol/muc"
+#define NS_REGISTER         "jabber:iq:register"
+
+#include "plugin.h"
+extern PurplePlugin *my_plugin;
+
+/**
+ * The types of services.
+ */
+typedef enum
+{
+	XMPP_DISCO_SERVICE_TYPE_UNSET,
+	/**
+	 * A registerable gateway to another protocol. An example would be
+	 * XMPP legacy transports.
+	 */
+	XMPP_DISCO_SERVICE_TYPE_GATEWAY,
+
+	/**
+	 * A directory (e.g. allows the user to search for other users).
+	 */
+	XMPP_DISCO_SERVICE_TYPE_DIRECTORY,
+
+	/**
+	 * A chat (multi-user conversation).
+	 */
+	XMPP_DISCO_SERVICE_TYPE_CHAT,
+
+	/**
+	 * A pubsub collection (contains nodes)
+	 */
+	XMPP_DISCO_SERVICE_TYPE_PUBSUB_COLLECTION,
+
+	/**
+	 * A pubsub leaf (contains stuff, not nodes).
+	 */
+	XMPP_DISCO_SERVICE_TYPE_PUBSUB_LEAF,
+
+	/**
+	 * Something else. Do we need more categories?
+	 */
+	XMPP_DISCO_SERVICE_TYPE_OTHER
+} XmppDiscoServiceType;
+
+/**
+ * The flags of services.
+ */
+typedef enum
+{
+	XMPP_DISCO_NONE          = 0x0000,
+	XMPP_DISCO_ADD           = 0x0001, /**< Supports an 'add' operation */
+	XMPP_DISCO_BROWSE        = 0x0002, /**< Supports browsing */
+	XMPP_DISCO_REGISTER      = 0x0004  /**< Supports a 'register' operation */
+} XmppDiscoServiceFlags;
+
+struct _XmppDiscoService {
+	PidginDiscoList *list;
+	gchar *name;
+	gchar *description;
+
+	gchar *gateway_type;
+	XmppDiscoServiceType type;
+	XmppDiscoServiceFlags flags;
+
+	XmppDiscoService *parent;
+	gchar *jid;
+	gchar *node;
+	gboolean expanded;
+};
+
+void xmpp_disco_start(PidginDiscoList *list);
+
+void xmpp_disco_service_expand(XmppDiscoService *service);
+void xmpp_disco_service_register(XmppDiscoService *service);
+
+#endif /* PIDGIN_XMPP_DISCO_H */
diff --git a/pidgin/plugins/gevolution/add_buddy_dialog.c b/pidgin/plugins/gevolution/add_buddy_dialog.c
index 9346795799..d9f7f613cc 100644
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c
@@ -234,6 +234,7 @@ populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uri)
 	EBook *book;
 	gboolean status;
 	GList *cards, *c;
+	GError *err = NULL;
 
 	if (dialog->book != NULL)
 	{
@@ -250,10 +251,11 @@ populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uri)
 
 	gtk_list_store_clear(dialog->model);
 
-	if (!gevo_load_addressbook(uri, &book, NULL))
+	if (!gevo_load_addressbook(uri, &book, &err))
 	{
 		purple_debug_error("evolution",
-						 "Error retrieving default addressbook\n");
+						 "Error retrieving default addressbook: %s\n", err->message);
+		g_error_free(err);
 
 		return;
 	}
diff --git a/pidgin/plugins/gevolution/assoc-buddy.c b/pidgin/plugins/gevolution/assoc-buddy.c
index ed9adf2395..7e5b074a9e 100644
--- a/pidgin/plugins/gevolution/assoc-buddy.c
+++ b/pidgin/plugins/gevolution/assoc-buddy.c
@@ -138,6 +138,7 @@ populate_treeview(GevoAssociateBuddyDialog *dialog, const gchar *uri)
 	const char *prpl_id;
 	gboolean status;
 	GList *cards, *c;
+	GError *err = NULL;
 
 	if (dialog->book != NULL)
 	{
@@ -154,10 +155,11 @@ populate_treeview(GevoAssociateBuddyDialog *dialog, const gchar *uri)
 
 	gtk_list_store_clear(dialog->model);
 
-	if (!gevo_load_addressbook(uri, &book, NULL))
+	if (!gevo_load_addressbook(uri, &book, &err))
 	{
 		purple_debug_error("evolution",
-						 "Error retrieving addressbook\n");
+						 "Error retrieving addressbook: %s\n", err->message);
+		g_error_free(err);
 
 		return;
 	}
diff --git a/pidgin/plugins/gevolution/eds-utils.c b/pidgin/plugins/gevolution/eds-utils.c
index a9a2b0eea0..3daa18822a 100644
--- a/pidgin/plugins/gevolution/eds-utils.c
+++ b/pidgin/plugins/gevolution/eds-utils.c
@@ -119,11 +119,13 @@ gevo_run_query_in_uri(const gchar *uri, EBookQuery *query)
 	EBook *book;
 	gboolean status;
 	GList *cards;
+	GError *err = NULL;
 
-	if (!gevo_load_addressbook(uri, &book, NULL))
+	if (!gevo_load_addressbook(uri, &book, &err))
 	{
 		purple_debug_error("evolution",
-						 "Error retrieving addressbook\n");
+						 "Error retrieving addressbook: %s\n", err->message);
+		g_error_free(err);
 		return NULL;
 	}
 
diff --git a/pidgin/plugins/gevolution/gevo-util.c b/pidgin/plugins/gevolution/gevo-util.c
index 54f54abf53..529e5d339d 100644
--- a/pidgin/plugins/gevolution/gevo-util.c
+++ b/pidgin/plugins/gevolution/gevo-util.c
@@ -41,8 +41,12 @@ gevo_add_buddy(PurpleAccount *account, const char *group_name,
 		purple_blist_add_group(group, NULL);
 	}
 
-	buddy = purple_buddy_new(account, buddy_name, alias);
-	purple_blist_add_buddy(buddy, NULL, group, NULL);
+	if ((buddy = purple_find_buddy_in_group(account, buddy_name, group)))
+	{	
+		buddy = purple_buddy_new(account, buddy_name, alias);
+		purple_blist_add_buddy(buddy, NULL, group, NULL);
+	}
+
 	purple_account_add_buddy(account, buddy);
 
 	if (conv != NULL)
@@ -139,11 +143,16 @@ gevo_load_addressbook(const gchar* uri, EBook **book, GError **error)
 	g_return_val_if_fail(book != NULL, FALSE);
 
 	if (uri == NULL)
-		*book = e_book_new_system_addressbook(NULL);
+		*book = e_book_new_system_addressbook(error);
 	else
 		*book = e_book_new_from_uri(uri, error);
 
-	result = e_book_open(*book, FALSE, NULL);
+	if (*book == NULL)
+		return FALSE;
+
+	*error = NULL;
+
+	result = e_book_open(*book, FALSE, error);
 
 	if (!result && *book != NULL)
 	{
diff --git a/pidgin/plugins/gevolution/gevolution.c b/pidgin/plugins/gevolution/gevolution.c
index 2d807c523d..93d13234a3 100644
--- a/pidgin/plugins/gevolution/gevolution.c
+++ b/pidgin/plugins/gevolution/gevolution.c
@@ -39,6 +39,7 @@
 #include <libedata-book/Evolution-DataServer-Addressbook.h>
 
 #include <libedata-book/e-data-book-factory.h>
+/* TODO: bonobo is going away eventually, we'll need to find an alternative */
 #include <bonobo/bonobo-main.h>
 
 #include <glib.h>
@@ -297,12 +298,18 @@ load_timeout(gpointer data)
 {
 	PurplePlugin *plugin = (PurplePlugin *)data;
 	EBookQuery *query;
+	GError *err = NULL;
 
 	timer = 0;
 
 	/* Maybe this is it? */
-	if (!gevo_load_addressbook(NULL, &book, NULL))
+	if (!gevo_load_addressbook(NULL, &book, &err))
+	{
+		purple_debug_error("evolution",
+						 "Error retrieving addressbook: %s\n", err->message);
+		g_error_free(err);
 		return FALSE;
+	}
 
 	query = e_book_query_any_field_contains("");
 
diff --git a/pidgin/plugins/gevolution/gevolution.h b/pidgin/plugins/gevolution/gevolution.h
index 7046070277..1b92b2b940 100644
--- a/pidgin/plugins/gevolution/gevolution.h
+++ b/pidgin/plugins/gevolution/gevolution.h
@@ -75,7 +75,7 @@ typedef struct
 
 	GtkWidget *win;
 	GtkWidget *accounts_menu;
-	GtkWidget *screenname;
+	GtkWidget *username;
 	GtkWidget *firstname;
 	GtkWidget *lastname;
 	GtkWidget *email;
diff --git a/pidgin/plugins/mailchk.c b/pidgin/plugins/mailchk.c
index fd30e3ce4f..cd0b677034 100644
--- a/pidgin/plugins/mailchk.c
+++ b/pidgin/plugins/mailchk.c
@@ -13,7 +13,7 @@
 #define UNREAD_MAIL 0x02
 #define NEW_MAIL    0x04
 
-static guint32 timer = 0;
+static guint timer = 0;
 static GtkWidget *mail = NULL;
 
 static gint
@@ -93,7 +93,7 @@ signon_cb(PurpleConnection *gc)
 	PurpleBuddyList *list = purple_get_blist();
 	if (list && PURPLE_IS_GTK_BLIST(list) && !timer) {
 		check_timeout(NULL); /* we want the box to be drawn immediately */
-		timer = g_timeout_add(2000, check_timeout, NULL);
+		timer = purple_timeout_add_seconds(2, check_timeout, NULL);
 	}
 }
 
@@ -102,7 +102,7 @@ signoff_cb(PurpleConnection *gc)
 {
 	PurpleBuddyList *list = purple_get_blist();
 	if ((!list || !PURPLE_IS_GTK_BLIST(list) || !PIDGIN_BLIST(list)->vbox) && timer) {
-		g_source_remove(timer);
+		purple_timeout_remove(timer);
 		timer = 0;
 	}
 }
@@ -123,7 +123,7 @@ plugin_load(PurplePlugin *plugin)
 	}
 
 	if (list && PURPLE_IS_GTK_BLIST(list) && PIDGIN_BLIST(list)->vbox)
-		timer = g_timeout_add(2000, check_timeout, NULL);
+		timer = purple_timeout_add_seconds(2, check_timeout, NULL);
 
 	purple_signal_connect(conn_handle, "signed-on",
 						plugin, PURPLE_CALLBACK(signon_cb), NULL);
@@ -137,7 +137,7 @@ static gboolean
 plugin_unload(PurplePlugin *plugin)
 {
 	if (timer)
-		g_source_remove(timer);
+		purple_timeout_remove(timer);
 	timer = 0;
 	if (mail)
 		gtk_widget_destroy(mail);
diff --git a/pidgin/plugins/markerline.c b/pidgin/plugins/markerline.c
index 9d0d11a2e1..214994a906 100644
--- a/pidgin/plugins/markerline.c
+++ b/pidgin/plugins/markerline.c
@@ -84,7 +84,7 @@ imhtml_expose_cb(GtkWidget *widget, GdkEventExpose *event, PidginConversation *g
 		gdk_gc_set_rgb_fg_color(gc, &red);
 		gdk_draw_line(event->window, gc,
 					0, y, visible_rect.width, y);
-		gdk_gc_unref(gc);
+		g_object_unref(G_OBJECT(gc));
 	}
 	return FALSE;
 }
diff --git a/pidgin/plugins/musicmessaging/musicmessaging.c b/pidgin/plugins/musicmessaging/musicmessaging.c
index cf71bf4117..71fc8ff141 100644
--- a/pidgin/plugins/musicmessaging/musicmessaging.c
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c
@@ -529,7 +529,7 @@ static void run_editor (MMConversation *mmconv)
 	
 	args[1] = "-session_id";
 	session_id = g_string_new("");
-	g_string_sprintfa(session_id, "%d", mmconv_from_conv_loc(mmconv->conv));
+	g_string_append_printf(session_id, "%d", mmconv_from_conv_loc(mmconv->conv));
 	args[2] = session_id->str;
 	
 	args[3] = NULL;
@@ -684,7 +684,8 @@ static PurplePluginInfo info = {
     DISPLAY_VERSION,                                     /**< version        */
     N_("Music Messaging Plugin for collaborative composition."),
                                                          /**  summary        */
-    N_("The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."),
+    N_("The Music Messaging Plugin allows a number of users to simultaneously "
+       "work on a piece of music by editing a common score in real-time."),
 	                                                 /**  description    */
     "Christian Muise <christian.muise@gmail.com>",       /**< author         */
     PURPLE_WEBSITE,                                        /**< homepage       */
diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c
index 1fb867b914..42435fce81 100644
--- a/pidgin/plugins/notify.c
+++ b/pidgin/plugins/notify.c
@@ -572,6 +572,9 @@ handle_raise(PidginWindow *purplewin)
 static void
 handle_present(PurpleConversation *conv)
 {
+	if (pidgin_conv_is_hidden(PIDGIN_CONVERSATION(conv)))
+		return;
+
 	purple_conversation_present(conv);
 }
 
diff --git a/pidgin/plugins/perl/Makefile.am b/pidgin/plugins/perl/Makefile.am
index 85895b9c8c..014b208170 100644
--- a/pidgin/plugins/perl/Makefile.am
+++ b/pidgin/plugins/perl/Makefile.am
@@ -44,7 +44,7 @@ common/Makefile: common/Makefile.PL
 			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
-	@cd common && $(perlpath) Makefile.PL $(PERL_MM_PARAMS)
+	@cd common && $(perlpath) Makefile.PL
 
 common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
@@ -53,7 +53,7 @@ all-local: common/Makefile
 	@for dir in $(perl_dirs); do \
 		cd $$dir && \
 		if [ ! -f Makefile ]; then \
-			$(perlpath) Makefile.PL $(PERL_MM_PARAMS); \
+			$(perlpath) Makefile.PL; \
 		fi && \
 		($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
 		$(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
diff --git a/pidgin/plugins/perl/common/Makefile.PL.in b/pidgin/plugins/perl/common/Makefile.PL.in
index 27f679ca87..fb867f8119 100644
--- a/pidgin/plugins/perl/common/Makefile.PL.in
+++ b/pidgin/plugins/perl/common/Makefile.PL.in
@@ -13,4 +13,15 @@ WriteMakefile(
     'OBJECT'        => '$(O_FILES)', # link all the C files too
     'TYPEMAPS'      => ["@top_srcdir@/libpurple/plugins/perl/common/typemap"],
 #    'OPTIMIZE'      => '-g', # For debugging.
+    'INSTALLDIRS'          => 'vendor',
+    'INSTALL_BASE'         => '$(prefix)',
+    'INSTALLVENDORARCH'    => '$(libdir)/pidgin/perl',
+    'INSTALLVENDORMAN3DIR' => '$(mandir)/man3',
+    'macro'                => {
+        'prefix'      => '@prefix@',
+        'exec_prefix' => '@exec_prefix@',
+        'libdir'      => '@libdir@',
+        'mandir'      => '@mandir@',
+        'datarootdir' => '@datarootdir@',
+    },
 );
diff --git a/pidgin/plugins/perl/common/Makefile.mingw b/pidgin/plugins/perl/common/Makefile.mingw
index 1c2b145fab..70fad73fe5 100644
--- a/pidgin/plugins/perl/common/Makefile.mingw
+++ b/pidgin/plugins/perl/common/Makefile.mingw
@@ -86,14 +86,15 @@ include $(PIDGIN_COMMON_RULES)
 
 all: $(TARGET).dll
 
-$(PURPLE_INSTALL_PERLMOD_DIR)/Purple.pm:
+$(PURPLE_INSTALL_PERL_DIR)/Purple.pm:
 	$(MAKE) -C $(PURPLE_PERL_TOP)/common -f $(MINGW_MAKEFILE) install
 
-install: all $(PURPLE_INSTALL_PERLMOD_DIR)/Purple.pm
-	rm -f $(PIDGIN_INSTALL_PERLMOD_DIR)/$(TARGET).dll $(PIDGIN_INSTALL_PERLMOD_DIR)/Pidgin/$(TARGET).pm
-	mkdir -p $(PIDGIN_INSTALL_PERLMOD_DIR)
-	cp $(TARGET).pm $(PIDGIN_INSTALL_PERLMOD_DIR)
-	cp $(TARGET).dll $(PIDGIN_INSTALL_PERLMOD_DIR)
+install: all $(PURPLE_INSTALL_PERL_DIR)/Purple.pm
+	rm -f $(PIDGIN_INSTALL_PERL_DIR)/$(TARGET).dll $(PIDGIN_INSTALL_PERL_DIR)/auto/Pidgin/$(TARGET).pm
+	mkdir -p $(PIDGIN_INSTALL_PERL_DIR)
+	cp $(TARGET).pm $(PIDGIN_INSTALL_PERL_DIR)
+	mkdir -p $(PIDGIN_INSTALL_PERL_DIR)/auto/Pidgin
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PERL_DIR)/auto/Pidgin
 
 $(C_FILES): $(PIDGIN_CONFIG_H)
 
diff --git a/pidgin/plugins/pidginrc.c b/pidgin/plugins/pidginrc.c
index 7fbaf17bb5..7994ca1e13 100644
--- a/pidgin/plugins/pidginrc.c
+++ b/pidgin/plugins/pidginrc.c
@@ -1,7 +1,13 @@
 /**
- * @file purplerc.c Purple gtk resource control plugin.
+ * @file pidginrc.c Pidgin GTK+ resource control plugin.
+ * @ingroup pidgin
+ */
+
+/* pidgin
  *
- * Copyright (C) 2005 Etan Reisner <deryni@eden.rutgers.edu>
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,34 +34,31 @@
 static guint pref_callback;
 
 static const gchar *color_prefs[] = {
-	"/plugins/gtk/purplerc/color/GtkWidget::cursor-color",
-	"/plugins/gtk/purplerc/color/GtkWidget::secondary-cursor-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::hyperlink-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::hyperlink-visited-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::send-name-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::receive-name-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::highlight-name-color",
-	"/plugins/gtk/purplerc/color/GtkIMHtml::action-name-color"
+	"/plugins/gtk/purplerc/color/GtkIMHtml::action-name-color",
+	"/plugins/gtk/purplerc/color/GtkIMHtml::typing-notification-color"
 };
 static const gchar *color_prefs_set[] = {
-	"/plugins/gtk/purplerc/set/color/GtkWidget::cursor-color",
-	"/plugins/gtk/purplerc/set/color/GtkWidget::secondary-cursor-color",
 	"/plugins/gtk/purplerc/set/color/GtkIMHtml::hyperlink-color",
 	"/plugins/gtk/purplerc/set/color/GtkIMHtml::hyperlink-visited-color",
 	"/plugins/gtk/purplerc/set/color/GtkIMHtml::send-name-color",
 	"/plugins/gtk/purplerc/set/color/GtkIMHtml::receive-name-color",
 	"/plugins/gtk/purplerc/set/color/GtkIMHtml::highlight-name-color",
-	"/plugins/gtk/purplerc/set/color/GtkIMHtml::action-name-color"
+	"/plugins/gtk/purplerc/set/color/GtkIMHtml::action-name-color",
+	"/plugins/gtk/purplerc/set/color/GtkIMHtml::typing-notification-color"
 };
 static const gchar *color_names[] = {
-	N_("Cursor Color"),
-	N_("Secondary Cursor Color"),
 	N_("Hyperlink Color"),
 	N_("Visited Hyperlink Color"),
 	N_("Sent Message Name Color"),
 	N_("Received Message Name Color"),
 	N_("Highlighted Message Name Color"),
-	N_("Action Message Name Color")
+	N_("Action Message Name Color"),
+	N_("Typing Notification Color")
 };
 static GtkWidget *color_widgets[G_N_ELEMENTS(color_prefs)];
 
@@ -126,6 +129,10 @@ make_gtkrc_string(void)
 
 	g_string_append(style_string, "style \"purplerc_style\"\n{");
 
+	if(purple_prefs_get_bool("/plugins/gtk/purplerc/set/disable-typing-notification")) {
+		g_string_append(style_string, "\tGtkIMHtml::typing-notification-enable = 0\n");
+	}
+
 	for (i = 0; i < G_N_ELEMENTS(color_prefs); i++) {
 		if (purple_prefs_get_bool(color_prefs_set[i])) {
 			const gchar *pref;
@@ -349,33 +356,58 @@ purplerc_plugin_unload(PurplePlugin *plugin)
 }
 
 static GtkWidget *
-purplerc_get_config_frame(PurplePlugin *plugin)
+purplerc_make_interface_vbox(void)
 {
-	/* Note: Intentionally not using the size group argument to the
-	 * pidgin_prefs_labeled_* functions they only add the text label to
-	 * the size group not the whole thing, which isn't what I want. */
+	GtkWidget *vbox = NULL, *hbox = NULL, *check = NULL;
+	GtkSizeGroup *labelsg = NULL;
 	gint i;
-	gchar *tmp;
-	GtkWidget *check = NULL, *widget = NULL;
-	GtkWidget *ret = NULL, *hbox = NULL, *frame = NULL;
-	GtkSizeGroup *labelsg = NULL, *widgetsg = NULL, *buttonsg = NULL;
-#ifndef _WIN32
-	const gchar *homepath = "$HOME";
-#else
-	const gchar *homepath = "\%APPDATA\%";
-#endif
 
-	ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-	gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
+	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+	labelsg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
-	labelsg  = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-	widgetsg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-	buttonsg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER);
+
+	for (i = 0; i < G_N_ELEMENTS(color_prefs); i++) {
+		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+		check = pidgin_prefs_checkbox(_(color_names[i]),
+		                              color_prefs_set[i], hbox);
+		gtk_size_group_add_widget(labelsg, check);
+
+		color_widgets[i] = pidgin_pixbuf_button_from_stock("",
+				GTK_STOCK_SELECT_COLOR, PIDGIN_BUTTON_HORIZONTAL);
+		gtk_box_pack_start(GTK_BOX(hbox), color_widgets[i], FALSE,
+		                   FALSE, 0);
+		gtk_widget_set_sensitive(color_widgets[i],
+		                         purple_prefs_get_bool(color_prefs_set[i]));
+		g_signal_connect(G_OBJECT(check), "toggled",
+		                 G_CALLBACK(pidgin_toggle_sensitive),
+		                 color_widgets[i]);
+		g_signal_connect(G_OBJECT(color_widgets[i]), "clicked",
+		                 G_CALLBACK(purplerc_set_color),
+		                 GINT_TO_POINTER(i));
+	}
+
+	g_object_unref(labelsg);
+
+	return vbox;
+}
+
+static GtkWidget *
+purplerc_make_fonts_vbox(void)
+{
+	GtkWidget *vbox = NULL, *hbox = NULL, *check = NULL, *widget = NULL;
+	GtkSizeGroup *labelsg = NULL;
+	int i;
+
+	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+	labelsg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER);
 
-	frame = pidgin_make_frame(ret, _("General"));
-	/* interface font */
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-	gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	check = pidgin_prefs_checkbox(_("GTK+ Interface Font"),
 	                              "/plugins/gtk/purplerc/set/gtk-font-name",
@@ -385,7 +417,6 @@ purplerc_get_config_frame(PurplePlugin *plugin)
 	widget = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_FONT,
 	                                         PIDGIN_BUTTON_HORIZONTAL);
 	gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 0);
-	gtk_size_group_add_widget(widgetsg, widget);
 	gtk_widget_set_sensitive(widget,
 	                         purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-font-name"));
 	g_signal_connect(G_OBJECT(check), "toggled",
@@ -393,9 +424,50 @@ purplerc_get_config_frame(PurplePlugin *plugin)
 	g_signal_connect(G_OBJECT(widget), "clicked",
 	                 G_CALLBACK(purplerc_set_font), GINT_TO_POINTER(-1));
 
-	/* key theme name */
+	for (i = 0; i < G_N_ELEMENTS(font_prefs); i++) {
+		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+		check = pidgin_prefs_checkbox(_(font_names[i]),
+		                              font_prefs_set[i], hbox);
+		gtk_size_group_add_widget(labelsg, check);
+
+		font_widgets[i] = pidgin_pixbuf_button_from_stock("",
+				GTK_STOCK_SELECT_FONT, PIDGIN_BUTTON_HORIZONTAL);
+		gtk_box_pack_start(GTK_BOX(hbox), font_widgets[i], FALSE,
+		                   FALSE, 0);
+		gtk_widget_set_sensitive(font_widgets[i],
+		                         purple_prefs_get_bool(font_prefs_set[i]));
+		g_signal_connect(G_OBJECT(check), "toggled",
+		                 G_CALLBACK(pidgin_toggle_sensitive),
+		                 font_widgets[i]);
+		g_signal_connect(G_OBJECT(font_widgets[i]), "clicked",
+		                 G_CALLBACK(purplerc_set_font),
+		                 GINT_TO_POINTER(i));
+	}
+
+	g_object_unref(labelsg);
+
+	return vbox;
+}
+
+static GtkWidget *
+purplerc_make_misc_vbox(void)
+{
+	/* Note: Intentionally not using the size group argument to the
+	 * pidgin_prefs_labeled_* functions they only add the text label to
+	 * the size group not the whole thing, which isn't what I want. */
+	GtkWidget *vbox = NULL, *hbox = NULL, *check = NULL, *widget = NULL;
+	GtkSizeGroup *labelsg = NULL;
+	int i;
+
+	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+	labelsg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER);
+
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-	gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	check = pidgin_prefs_checkbox(_("GTK+ Text Shortcut Theme"),
 	                              "/plugins/gtk/purplerc/set/gtk-key-theme-name",
@@ -405,27 +477,45 @@ purplerc_get_config_frame(PurplePlugin *plugin)
 	widget = pidgin_prefs_labeled_entry(hbox, "",
 	                                    "/plugins/gtk/purplerc/gtk-key-theme-name",
 	                                    NULL);
-	/*
-	gtk_size_group_add_widget(widgetsg, widget);
-	*/
 	gtk_widget_set_sensitive(widget,
 	                         purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-key-theme-name"));
 	g_signal_connect(G_OBJECT(check), "toggled",
 	                 G_CALLBACK(pidgin_toggle_sensitive), widget);
 
+	for (i = 0; i < G_N_ELEMENTS(widget_size_prefs); i++) {
+		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+		check = pidgin_prefs_checkbox(_(widget_size_names[i]),
+		                              widget_size_prefs_set[i], hbox);
+		gtk_size_group_add_widget(labelsg, check);
+
+		widget_size_widgets[i] = pidgin_prefs_labeled_spin_button(hbox, "", widget_size_prefs[i], 0, 50, NULL);
+		gtk_widget_set_sensitive(widget_size_widgets[i],
+		                         purple_prefs_get_bool(widget_size_prefs_set[i]));
+		g_signal_connect(G_OBJECT(check), "toggled",
+		                 G_CALLBACK(pidgin_toggle_sensitive),
+		                 widget_size_widgets[i]);
+	}
+
+	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+	check = pidgin_prefs_checkbox(_("Disable Typing Notification Text"),
+			"/plugins/gtk/purplerc/set/disable-typing-notification", hbox);
+
+	/* Widget boolean stuff */
 	/*
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 		check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
 		                              widget_bool_prefs_set[i], hbox);
 		gtk_size_group_add_widget(labelsg, check);
 
 		widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-		*
-		gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-		*
+
 		gtk_widget_set_sensitive(widget_bool_widgets[i],
 		                         purple_prefs_get_bool(widget_bool_prefs_set[i]));
 		g_signal_connect(G_OBJECT(check), "toggled",
@@ -434,74 +524,48 @@ purplerc_get_config_frame(PurplePlugin *plugin)
 	}
 	*/
 
-	frame = pidgin_make_frame(ret, _("Interface colors"));
-	/* imhtml stuff */
-	for (i = 0; i < G_N_ELEMENTS(color_prefs); i++) {
-		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+	g_object_unref(labelsg);
 
-		check = pidgin_prefs_checkbox(_(color_names[i]),
-		                              color_prefs_set[i], hbox);
-		gtk_size_group_add_widget(labelsg, check);
+	return vbox;
+}
 
-		color_widgets[i] = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_COLOR, PIDGIN_BUTTON_HORIZONTAL);
-		gtk_size_group_add_widget(widgetsg, color_widgets[i]);
-		gtk_box_pack_start(GTK_BOX(hbox), color_widgets[i], FALSE,
-		                   FALSE, 0);
-		gtk_widget_set_sensitive(color_widgets[i],
-		                         purple_prefs_get_bool(color_prefs_set[i]));
-		g_signal_connect(G_OBJECT(check), "toggled",
-		                 G_CALLBACK(pidgin_toggle_sensitive),
-		                 color_widgets[i]);
-		g_signal_connect(G_OBJECT(color_widgets[i]), "clicked",
-		                 G_CALLBACK(purplerc_set_color),
-		                 GINT_TO_POINTER(i));
-	}
+static GtkWidget *
+purplerc_get_config_frame(PurplePlugin *plugin)
+{
+	gchar *tmp;
+	GtkWidget *check = NULL, *label = NULL;
+	GtkWidget *ret = NULL, *hbox = NULL, *frame = NULL, *note = NULL;
+#ifndef _WIN32
+	const gchar *homepath = "$HOME";
+#else
+	const gchar *homepath = "\%APPDATA\%";
+#endif
 
-	frame = pidgin_make_frame(ret, _("Widget Sizes"));
-	/* widget size stuff */
-	for (i = 0; i < G_N_ELEMENTS(widget_size_prefs); i++) {
-		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+	ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+	note = gtk_notebook_new();
+	label = gtk_label_new(NULL);
+	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
 
-		check = pidgin_prefs_checkbox(_(widget_size_names[i]),
-		                              widget_size_prefs_set[i], hbox);
-		gtk_size_group_add_widget(labelsg, check);
+	gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
 
-		widget_size_widgets[i] = pidgin_prefs_labeled_spin_button(hbox, "", widget_size_prefs[i], 0, 50, NULL);
-		/*
-		gtk_size_group_add_widget(widgetsg, widget_size_widgets[i]);
-		*/
-		gtk_widget_set_sensitive(widget_size_widgets[i],
-		                         purple_prefs_get_bool(widget_size_prefs_set[i]));
-		g_signal_connect(G_OBJECT(check), "toggled",
-		                 G_CALLBACK(pidgin_toggle_sensitive),
-		                 widget_size_widgets[i]);
-	}
+	tmp = g_strdup_printf("<span weight=\"bold\">%s</span>", _("GTK+ Theme Control Settings"));
+	gtk_label_set_markup(GTK_LABEL(label), tmp);
+	g_free(tmp);
 
-	frame = pidgin_make_frame(ret, _("Fonts"));
-	/* imhtml font stuff */
-	for (i = 0; i < G_N_ELEMENTS(font_prefs); i++) {
-		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(ret), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(ret), note, FALSE, FALSE, 0);
 
-		check = pidgin_prefs_checkbox(_(font_names[i]),
-		                              font_prefs_set[i], hbox);
-		gtk_size_group_add_widget(labelsg, check);
+	label = gtk_label_new(_("Colors"));
+	gtk_notebook_insert_page(GTK_NOTEBOOK(note), purplerc_make_interface_vbox(), label, -1);
 
-		font_widgets[i] = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_FONT, PIDGIN_BUTTON_HORIZONTAL);
-		gtk_size_group_add_widget(widgetsg, font_widgets[i]);
-		gtk_box_pack_start(GTK_BOX(hbox), font_widgets[i], FALSE,
-		                   FALSE, 0);
-		gtk_widget_set_sensitive(font_widgets[i],
-		                         purple_prefs_get_bool(font_prefs_set[i]));
-		g_signal_connect(G_OBJECT(check), "toggled",
-		                 G_CALLBACK(pidgin_toggle_sensitive),
-		                 font_widgets[i]);
-		g_signal_connect(G_OBJECT(font_widgets[i]), "clicked",
-		                 G_CALLBACK(purplerc_set_font),
-		                 GINT_TO_POINTER(i));
-	}
+	label = gtk_label_new(_("Fonts"));
+	gtk_notebook_insert_page(GTK_NOTEBOOK(note), purplerc_make_fonts_vbox(), label, -1);
+
+	label = gtk_label_new(_("Miscellaneous"));
+	gtk_notebook_insert_page(GTK_NOTEBOOK(note), purplerc_make_misc_vbox(), label, -1);
+
+	gtk_box_pack_start(GTK_BOX(ret), gtk_hseparator_new(), TRUE, TRUE, 0);
 
 	frame = pidgin_make_frame(ret, _("Gtkrc File Tools"));
 
@@ -512,22 +576,17 @@ purplerc_get_config_frame(PurplePlugin *plugin)
 	                      homepath, G_DIR_SEPARATOR_S ".purple" G_DIR_SEPARATOR_S);
 	check = gtk_button_new_with_label(tmp);
 	g_free(tmp);
-	gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 0);
-	gtk_size_group_add_widget(buttonsg, check);
+	gtk_box_pack_start(GTK_BOX(hbox), check, TRUE, TRUE, 0);
 	g_signal_connect(G_OBJECT(check), "clicked",
 	                 G_CALLBACK(purplerc_write), NULL);
 
 	check = gtk_button_new_with_label(_("Re-read gtkrc files"));
-	gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 0);
-	gtk_size_group_add_widget(buttonsg, check);
+	gtk_box_pack_start(GTK_BOX(hbox), check, TRUE, TRUE, 0);
 	g_signal_connect(G_OBJECT(check), "clicked",
 	                 G_CALLBACK(purplerc_reread), NULL);
 
 	gtk_widget_show_all(ret);
 
-	g_object_unref(labelsg);
-	g_object_unref(widgetsg);
-	g_object_unref(buttonsg);
 
 	return ret;
 }
@@ -559,7 +618,7 @@ static PurplePluginInfo purplerc_info =
 	DISPLAY_VERSION,
 	N_("Provides access to commonly used gtkrc settings."),
 	N_("Provides access to commonly used gtkrc settings."),
-	"Etan Reisner <deryni@eden.rutgers.edu>",
+	"Etan Reisner <deryni@pidgin.im>",
 	PURPLE_WEBSITE,
 	purplerc_plugin_load,
 	purplerc_plugin_unload,
@@ -621,6 +680,15 @@ purplerc_init(PurplePlugin *plugin)
 		purple_prefs_add_bool(widget_bool_prefs_set[i], FALSE);
 	}
 	*/
+
+	purple_prefs_add_bool("/plugins/gtk/purplerc/disable-typing-notification", FALSE);
+	purple_prefs_add_bool("/plugins/gtk/purplerc/set/disable-typing-notification", FALSE);
+
+	/* remove old cursor color prefs */
+	purple_prefs_remove("/plugins/gtk/purplerc/color/GtkWidget::cursor-color");
+	purple_prefs_remove("/plugins/gtk/purplerc/color/GtkWidget::secondary-cursor-color");
+	purple_prefs_remove("/plugins/gtk/purplerc/set/color/GtkWidget::cursor-color");
+	purple_prefs_remove("/plugins/gtk/purplerc/set/color/GtkWidget::secondary-cursor-color");
 }
 
 PURPLE_INIT_PLUGIN(purplerc, purplerc_init, purplerc_info)
diff --git a/pidgin/plugins/sendbutton.c b/pidgin/plugins/sendbutton.c
index 4b917bad76..042cd53b66 100644
--- a/pidgin/plugins/sendbutton.c
+++ b/pidgin/plugins/sendbutton.c
@@ -177,8 +177,8 @@ static PurplePluginInfo info =
 	DISPLAY_VERSION,                                /**< version */
 	N_("Conversation Window Send Button."),         /**< summary */
 	N_("Adds a Send button to the entry area of "
-	   "the conversation window. Intended for when "
-	   "no physical keyboard is present."),         /**< description */
+	   "the conversation window. Intended for use "
+	   "when no physical keyboard is present."),    /**< description */
 	"Etan Reisner <deryni@pidgin.im>",              /**< author */
 	PURPLE_WEBSITE,                                 /**< homepage */
 	plugin_load,                                    /**< load */
diff --git a/pidgin/plugins/themeedit-icon.c b/pidgin/plugins/themeedit-icon.c
new file mode 100644
index 0000000000..8b074fb150
--- /dev/null
+++ b/pidgin/plugins/themeedit-icon.c
@@ -0,0 +1,318 @@
+/* Pidgin
+ *
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+#include "internal.h"
+#include "pidgin.h"
+#include "debug.h"
+#include "version.h"
+
+#include "theme-manager.h"
+
+#include "gtkblist.h"
+#include "gtkblist-theme.h"
+#include "gtkutils.h"
+#include "gtkplugin.h"
+
+#include "pidginstock.h"
+#include "themeedit-icon.h"
+
+typedef enum
+{
+	FLAG_SIZE_MICROSOPIC = 0,
+	FLAG_SIZE_EXTRA_SMALL,
+	FLAG_SIZE_SMALL,
+	FLAG_SIZE_MEDIUM,
+	FLAG_SIZE_LARGE,
+	FLAG_SIZE_HUGE,
+	FLAG_SIZE_NONE,
+} SectionFlags;
+
+#define SECTION_FLAGS_ALL (0x3f)
+
+static const char *stocksizes [] = {
+	[FLAG_SIZE_MICROSOPIC] = PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC,
+	[FLAG_SIZE_EXTRA_SMALL] = PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL,
+	[FLAG_SIZE_SMALL] = PIDGIN_ICON_SIZE_TANGO_SMALL,
+	[FLAG_SIZE_MEDIUM] = PIDGIN_ICON_SIZE_TANGO_MEDIUM,
+	[FLAG_SIZE_LARGE] = PIDGIN_ICON_SIZE_TANGO_LARGE,
+	[FLAG_SIZE_HUGE] = PIDGIN_ICON_SIZE_TANGO_HUGE,
+	[FLAG_SIZE_NONE] = NULL,
+};
+
+static const struct options {
+	const char *stockid;
+	const char *text;
+} statuses[] = {
+	{PIDGIN_STOCK_STATUS_AVAILABLE, N_("Available")},
+	{PIDGIN_STOCK_STATUS_AWAY, N_("Away")},
+	{PIDGIN_STOCK_STATUS_XA, N_("Extended Away")},
+	{PIDGIN_STOCK_STATUS_BUSY, N_("Busy")},
+	{PIDGIN_STOCK_STATUS_OFFLINE, N_("Offline")},
+	{PIDGIN_STOCK_STATUS_LOGIN, N_("Just logged in")},
+	{PIDGIN_STOCK_STATUS_LOGOUT, N_("Just logged out")},
+	{PIDGIN_STOCK_STATUS_PERSON, N_("Icon for Contact/\nIcon for Unknown person")},
+	{PIDGIN_STOCK_STATUS_CHAT, N_("Icon for Chat")},
+	{NULL, NULL}
+}, chatemblems[] = {
+	{PIDGIN_STOCK_STATUS_IGNORED, N_("Ignored")},
+	{PIDGIN_STOCK_STATUS_FOUNDER, N_("Founder")},
+	/* A user in a chat room who has special privileges. */
+	{PIDGIN_STOCK_STATUS_OPERATOR, N_("Operator")},
+	/* A half operator is someone who has a subset of the privileges
+	   that an operator has. */
+	{PIDGIN_STOCK_STATUS_HALFOP, N_("Half Operator")},
+	{PIDGIN_STOCK_STATUS_VOICE, N_("Voice")},
+	{NULL, NULL}
+}, dialogicons[] = {
+	{PIDGIN_STOCK_DIALOG_AUTH, N_("Authorization dialog")},
+	{PIDGIN_STOCK_DIALOG_ERROR, N_("Error dialog")},
+	{PIDGIN_STOCK_DIALOG_INFO, N_("Information dialog")},
+	{PIDGIN_STOCK_DIALOG_MAIL, N_("Mail dialog")},
+	{PIDGIN_STOCK_DIALOG_QUESTION, N_("Question dialog")},
+	{PIDGIN_STOCK_DIALOG_WARNING, N_("Warning dialog")},
+	{NULL, NULL},
+	{PIDGIN_STOCK_DIALOG_COOL, N_("What kind of dialog is this?")},
+};
+
+static const struct {
+	const char *heading;
+	const struct options *options;
+	SectionFlags flags;
+} sections[] = {
+	{N_("Status Icons"), statuses, SECTION_FLAGS_ALL ^ (1 << FLAG_SIZE_HUGE)},
+	{N_("Chatroom Emblems"), chatemblems, FLAG_SIZE_SMALL},
+	{N_("Dialog Icons"), dialogicons, (1 << FLAG_SIZE_EXTRA_SMALL) | (1 << FLAG_SIZE_HUGE)},
+	{NULL, NULL, 0}
+};
+
+static PidginStatusIconTheme *
+create_icon_theme(GtkWidget *window)
+{
+	int s, i, j;
+	char *dirname = "/tmp";   /* FIXME */
+	PidginStatusIconTheme *theme = g_object_new(PIDGIN_TYPE_STATUS_ICON_THEME, "type", "status-icon",
+				"author", getlogin(),
+				"directory", dirname,
+				NULL);
+
+	for (s = 0; sections[s].heading; s++) {
+		GtkWidget *vbox = g_object_get_data(G_OBJECT(window), sections[s].heading);
+		for (i = 0; sections[s].options[i].stockid; i++) {
+			GtkWidget *image = g_object_get_data(G_OBJECT(vbox), sections[s].options[i].stockid);
+			GdkPixbuf *pixbuf = g_object_get_data(G_OBJECT(image), "pixbuf");
+			if (!pixbuf)
+				continue;
+			pidgin_icon_theme_set_icon(PIDGIN_ICON_THEME(theme), sections[s].options[i].stockid,
+					sections[s].options[i].stockid);
+			for (j = 0; stocksizes[j]; j++) {
+				int width, height;
+				GtkIconSize iconsize;
+				char size[8];
+				char *name;
+				GdkPixbuf *scale;
+				GError *error = NULL;
+
+				if (!(sections[s].flags & (1 << j)))
+					continue;
+
+				iconsize = gtk_icon_size_from_name(stocksizes[j]);
+				gtk_icon_size_lookup(iconsize, &width, &height);
+				g_snprintf(size, sizeof(size), "%d", width);
+
+				if (i == 0) {
+					name = g_build_filename(dirname, size, NULL);
+					purple_build_dir(name, S_IRUSR | S_IWUSR | S_IXUSR);
+					g_free(name);
+				}
+
+				name = g_build_filename(dirname, size, sections[s].options[i].stockid, NULL);
+				scale = gdk_pixbuf_scale_simple(pixbuf, width, height, GDK_INTERP_BILINEAR);
+				gdk_pixbuf_save(scale, name, "png", &error, "compression", "9", NULL);
+				g_free(name);
+				g_object_unref(G_OBJECT(scale));
+				if (error)
+					g_error_free(error);
+			}
+		}
+	}
+	return theme;
+}
+
+static void
+use_icon_theme(GtkWidget *w, GtkWidget *window)
+{
+	/* I don't quite understand the icon-theme stuff. For example, I don't
+	 * know why PidginIconTheme needs to be abstract, or how PidginStatusIconTheme
+	 * would be different from other PidginIconTheme's (e.g. PidginStockIconTheme)
+	 * etc., but anyway, this works for now.
+	 *
+	 * Here's an interesting note: A PidginStatusIconTheme can be used for both
+	 * stock and status icons. Like I said, I don't quite know how they could be
+	 * different. So I am going to just keep it as it is, for now anyway, until I
+	 * have the time to dig through this, or someone explains this stuff to me
+	 * clearly.
+	 *		-- Sad
+	 */
+	PidginStatusIconTheme *theme = create_icon_theme(window);
+	pidgin_stock_load_status_icon_theme(PIDGIN_STATUS_ICON_THEME(theme));
+	pidgin_stock_load_stock_icon_theme((PidginStockIconTheme *)theme);
+	pidgin_blist_refresh(purple_get_blist());
+	g_object_unref(theme);
+}
+
+#ifdef NOT_SADRUL
+static void
+save_icon_theme(GtkWidget *w, GtkWidget *window)
+{
+	/* TODO: SAVE! */
+	gtk_widget_destroy(window);
+}
+#endif
+
+static void
+close_icon_theme(GtkWidget *w, GtkWidget *window)
+{
+	gtk_widget_destroy(window);
+}
+
+static void
+stock_icon_selected(const char *filename, gpointer image)
+{
+	GError *error = NULL;
+	GdkPixbuf *scale;
+	int i;
+	GdkPixbuf *pixbuf;
+
+	if (!filename)
+		return;
+
+	pixbuf = gdk_pixbuf_new_from_file(filename, &error);
+	if (error || !pixbuf) {
+		purple_debug_error("theme-editor-icon", "Unable to load icon file '%s' (%s)\n",
+				filename, error ? error->message : "Reason unknown");
+		if (error)
+			g_error_free(error);
+		return;
+	}
+
+	scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
+	gtk_image_set_from_pixbuf(GTK_IMAGE(image), scale);
+	g_object_unref(G_OBJECT(scale));
+
+	/* Update the size previews */
+	for (i = 0; stocksizes[i]; i++) {
+		int width, height;
+		GtkIconSize iconsize;
+		GtkWidget *prev = g_object_get_data(G_OBJECT(image), stocksizes[i]);
+		if (!prev)
+			continue;
+		iconsize = gtk_icon_size_from_name(stocksizes[i]);
+		gtk_icon_size_lookup(iconsize, &width, &height);
+		scale = gdk_pixbuf_scale_simple(pixbuf, width, height, GDK_INTERP_BILINEAR);
+		gtk_image_set_from_pixbuf(GTK_IMAGE(prev), scale);
+		g_object_unref(G_OBJECT(scale));
+	}
+
+	/* Save the original pixbuf so we can use it for resizing later */
+	g_object_set_data_full(G_OBJECT(image), "pixbuf", pixbuf,
+			(GDestroyNotify)g_object_unref);
+}
+
+static gboolean
+change_stock_image(GtkWidget *widget, GdkEventButton *event, GtkWidget *image)
+{
+	GtkWidget *win = pidgin_buddy_icon_chooser_new(GTK_WINDOW(gtk_widget_get_toplevel(widget)),
+			stock_icon_selected, image);
+	gtk_window_set_title(GTK_WINDOW(win),
+	                     g_object_get_data(G_OBJECT(image), "localized-name"));
+	gtk_widget_show_all(win);
+
+	return TRUE;
+}
+
+void pidgin_icon_theme_edit(PurplePluginAction *unused)
+{
+	GtkWidget *dialog;
+	GtkWidget *box, *vbox;
+	GtkWidget *notebook;
+	GtkSizeGroup *sizegroup;
+	int s, i, j;
+	dialog = pidgin_create_dialog(_("Pidgin Icon Theme Editor"), 0, "theme-editor-icon", FALSE);
+	box = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(dialog), FALSE, PIDGIN_HIG_BOX_SPACE);
+
+	notebook = gtk_notebook_new();
+	gtk_box_pack_start(GTK_BOX(box), notebook, TRUE, TRUE, PIDGIN_HIG_BOX_SPACE);
+	sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
+	for (s = 0; sections[s].heading; s++) {
+		const char *heading = sections[s].heading;
+
+		box = gtk_vbox_new(FALSE, 0);
+		gtk_notebook_append_page(GTK_NOTEBOOK(notebook), box, gtk_label_new(heading));
+
+		vbox = pidgin_make_frame(box, heading);
+		g_object_set_data(G_OBJECT(dialog), heading, vbox);
+
+		for (i = 0; sections[s].options[i].stockid; i++) {
+			const char *id = sections[s].options[i].stockid;
+			const char *text = _(sections[s].options[i].text);
+
+			GtkWidget *hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+			GtkWidget *label = gtk_label_new(text);
+			GtkWidget *image = gtk_image_new_from_stock(id,
+					gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL));
+			GtkWidget *ebox = gtk_event_box_new();
+			gtk_container_add(GTK_CONTAINER(ebox), image);
+			gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+
+			g_signal_connect(G_OBJECT(ebox), "button-press-event", G_CALLBACK(change_stock_image), image);
+			g_object_set_data(G_OBJECT(image), "property-name", (gpointer)id);
+			g_object_set_data(G_OBJECT(image), "localized-name", (gpointer)text);
+
+			gtk_size_group_add_widget(sizegroup, label);
+			gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+			gtk_box_pack_start(GTK_BOX(hbox), ebox, FALSE, FALSE, 0);
+
+			for (j = 0; stocksizes[j]; j++) {
+				GtkWidget *sh;
+
+				if (!(sections[s].flags & (1 << j)))
+					continue;
+
+				sh = gtk_image_new_from_stock(id, gtk_icon_size_from_name(stocksizes[j]));
+				gtk_box_pack_start(GTK_BOX(hbox), sh, FALSE, FALSE, 0);
+				g_object_set_data(G_OBJECT(image), stocksizes[j], sh);
+			}
+
+			gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+			g_object_set_data(G_OBJECT(vbox), id, image);
+		}
+	}
+
+#ifdef NOT_SADRUL
+	pidgin_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_SAVE, G_CALLBACK(save_icon_theme), dialog);
+#endif
+	pidgin_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_APPLY, G_CALLBACK(use_icon_theme), dialog);
+	pidgin_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, G_CALLBACK(close_icon_theme), dialog);
+	gtk_widget_show_all(dialog);
+	g_object_unref(sizegroup);
+}
+
diff --git a/libpurple/protocols/yahoo/yahoo_crypt.h b/pidgin/plugins/themeedit-icon.h
index 1ec052874e..fbc8e4ad5c 100644
--- a/libpurple/protocols/yahoo/yahoo_crypt.h
+++ b/pidgin/plugins/themeedit-icon.h
@@ -1,7 +1,6 @@
-/*
- * purple
+/* Pidgin
  *
- * Purple is the legal property of its developers, whose names are too numerous
+ * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
@@ -19,9 +18,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _YAHOO_CRYPT_H_
-#define _YAHOO_CRYPT_H_
 
-char *yahoo_crypt(const char *key, const char *salt);
+#ifndef _THEMEEDIT_ICON_H_
+#define _THEMEEDIT_ICON_H_
+
+void pidgin_icon_theme_edit(PurplePluginAction *);
+
+#endif
 
-#endif /* _YAHOO_CRYPT_H */
diff --git a/pidgin/plugins/themeedit.c b/pidgin/plugins/themeedit.c
new file mode 100644
index 0000000000..f87892cca7
--- /dev/null
+++ b/pidgin/plugins/themeedit.c
@@ -0,0 +1,362 @@
+/* Pidgin
+ *
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+#include "internal.h"
+#include "pidgin.h"
+#include "version.h"
+
+#include "theme-manager.h"
+
+#include "gtkblist.h"
+#include "gtkblist-theme.h"
+#include "gtkutils.h"
+#include "gtkplugin.h"
+
+#define PLUGIN_ID "gtk-theme-editor"
+
+#include "themeedit-icon.h"
+
+static gboolean
+prop_type_is_color(PidginBlistTheme *theme, const char *prop)
+{
+	PidginBlistThemeClass *klass = PIDGIN_BLIST_THEME_GET_CLASS(theme);
+	GParamSpec *spec = g_object_class_find_property(G_OBJECT_CLASS(klass), prop);
+
+	return G_IS_PARAM_SPEC_BOXED(spec);
+}
+
+#ifdef NOT_SADRUL
+static void
+save_blist_theme(GtkWidget *w, GtkWidget *window)
+{
+	/* TODO: SAVE! */
+	gtk_widget_destroy(window);
+}
+#endif
+
+static void
+close_blist_theme(GtkWidget *w, GtkWidget *window)
+{
+	gtk_widget_destroy(window);
+}
+
+static void
+theme_color_selected(GtkDialog *dialog, gint response, const char *prop)
+{
+	if (response == GTK_RESPONSE_OK) {
+		GdkColor color;
+		PidginBlistTheme *theme;
+
+		gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel), &color);
+
+		theme = pidgin_blist_get_theme();
+
+		if (prop_type_is_color(theme, prop)) {
+			g_object_set(G_OBJECT(theme), prop, &color, NULL);
+		} else {
+			PidginThemeFont *font = NULL;
+			g_object_get(G_OBJECT(theme), prop, &font, NULL);
+			if (!font) {
+				font = pidgin_theme_font_new(NULL, &color);
+				g_object_set(G_OBJECT(theme), prop, font, NULL);
+				pidgin_theme_font_free(font);
+			} else {
+				pidgin_theme_font_set_color(font, &color);
+			}
+		}
+		pidgin_blist_set_theme(theme);
+	}
+
+	gtk_widget_destroy(GTK_WIDGET(dialog));
+}
+
+static void
+theme_font_face_selected(GtkWidget *dialog, gint response, gpointer font)
+{
+	if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) {
+		const char *fontname = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(dialog));
+		pidgin_theme_font_set_font_face(font, fontname);
+		pidgin_blist_refresh(purple_get_blist());
+	}
+	gtk_widget_destroy(dialog);
+}
+
+static void
+theme_font_select_face(GtkWidget *widget, gpointer prop)
+{
+	GtkWidget *dialog;
+	PidginBlistTheme *theme;
+	PidginThemeFont *font = NULL;
+	const char *face;
+
+	theme = pidgin_blist_get_theme();
+	g_object_get(G_OBJECT(theme), prop, &font, NULL);
+
+	if (!font) {
+		font = pidgin_theme_font_new(NULL, NULL);
+		g_object_set(G_OBJECT(theme), prop, font, NULL);
+		pidgin_theme_font_free(font);
+		g_object_get(G_OBJECT(theme), prop, &font, NULL);
+	}
+
+	face = pidgin_theme_font_get_font_face(font);
+	dialog = gtk_font_selection_dialog_new(_("Select Font"));
+	if (face && *face)
+		gtk_font_selection_set_font_name(GTK_FONT_SELECTION(GTK_FONT_SELECTION_DIALOG(dialog)->fontsel),
+				face);
+	g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(theme_font_face_selected),
+			font);
+	gtk_widget_show_all(dialog);
+}
+
+static void
+theme_color_select(GtkWidget *widget, gpointer prop)
+{
+	GtkWidget *dialog;
+	PidginBlistTheme *theme;
+	const GdkColor *color = NULL;
+
+	theme = pidgin_blist_get_theme();
+
+	if (prop_type_is_color(theme, prop)) {
+		g_object_get(G_OBJECT(theme), prop, &color, NULL);
+	} else {
+		PidginThemeFont *pair = NULL;
+		g_object_get(G_OBJECT(theme), prop, &pair, NULL);
+		if (pair)
+			color = pidgin_theme_font_get_color(pair);
+	}
+
+	dialog = gtk_color_selection_dialog_new(_("Select Color"));
+	if (color)
+		gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel),
+				color);
+	g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(theme_color_selected),
+			prop);
+
+	gtk_widget_show_all(dialog);
+}
+
+static GtkWidget *
+pidgin_theme_create_color_selector(const char *text, const char *blurb, const char *prop,
+		GtkSizeGroup *sizegroup)
+{
+	GtkWidget *color;
+	GtkWidget *hbox, *label;
+
+	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+
+	label = gtk_label_new(_(text));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+	gtk_size_group_add_widget(sizegroup, label);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#if GTK_CHECK_VERSION(2, 12, 0)
+	gtk_widget_set_tooltip_text(label, blurb);
+#endif
+
+	color = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_COLOR,
+			PIDGIN_BUTTON_HORIZONTAL);
+	g_signal_connect(G_OBJECT(color), "clicked", G_CALLBACK(theme_color_select),
+			(gpointer)prop);
+	gtk_box_pack_start(GTK_BOX(hbox), color, FALSE, FALSE, 0);
+
+	return hbox;
+}
+
+static GtkWidget *
+pidgin_theme_create_font_selector(const char *text, const char *blurb, const char *prop,
+		GtkSizeGroup *sizegroup)
+{
+	GtkWidget *color, *font;
+	GtkWidget *hbox, *label;
+
+	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+
+	label = gtk_label_new(_(text));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+	gtk_size_group_add_widget(sizegroup, label);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#if GTK_CHECK_VERSION(2, 12, 0)
+	gtk_widget_set_tooltip_text(label, blurb);
+#endif
+
+	font = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_FONT,
+			PIDGIN_BUTTON_HORIZONTAL);
+	g_signal_connect(G_OBJECT(font), "clicked", G_CALLBACK(theme_font_select_face),
+			(gpointer)prop);
+	gtk_box_pack_start(GTK_BOX(hbox), font, FALSE, FALSE, 0);
+
+	color = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_COLOR,
+			PIDGIN_BUTTON_HORIZONTAL);
+	g_signal_connect(G_OBJECT(color), "clicked", G_CALLBACK(theme_color_select),
+			(gpointer)prop);
+	gtk_box_pack_start(GTK_BOX(hbox), color, FALSE, FALSE, 0);
+
+	return hbox;
+}
+
+static void
+pidgin_blist_theme_edit(PurplePluginAction *unused)
+{
+	GtkWidget *dialog;
+	GtkWidget *box;
+	GtkSizeGroup *group;
+	PidginBlistTheme *theme;
+	GObjectClass *klass;
+	int i, j;
+	static struct {
+		const char *header;
+		const char *props[12];
+	} sections[] = {
+		{N_("Contact"), {
+					"contact-color",
+					"contact",
+					"online",
+					"away",
+					"offline",
+					"idle",
+					"message",
+					"message_nick_said",
+					"status",
+					NULL
+				}
+		},
+		{N_("Group"), {
+				      "expanded-color",
+				      "expanded-text",
+				      "collapsed-color",
+				      "collapsed-text",
+				      NULL
+			      }
+		},
+		{ NULL, { } }
+	};
+
+	dialog = pidgin_create_dialog(_("Pidgin Buddylist Theme Editor"), 0, "theme-editor-blist", FALSE);
+	box = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(dialog), FALSE, PIDGIN_HIG_BOX_SPACE);
+
+	theme = pidgin_blist_get_theme();
+	if (!theme) {
+		theme = g_object_new(PIDGIN_TYPE_BLIST_THEME, "type", "blist",
+				"author", getlogin(),
+				NULL);
+		pidgin_blist_set_theme(theme);
+	}
+	klass = G_OBJECT_CLASS(PIDGIN_BLIST_THEME_GET_CLASS(theme));
+
+	group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+	for (i = 0; sections[i].header; i++) {
+		GtkWidget *vbox;
+		GtkWidget *hbox;
+		GParamSpec *spec;
+
+		vbox = pidgin_make_frame(box, _(sections[i].header));
+		for (j = 0; sections[i].props[j]; j++) {
+			const char *label;
+			const char *blurb;
+			spec = g_object_class_find_property(klass, sections[i].props[j]);
+			label = g_param_spec_get_nick(spec);
+			blurb = g_param_spec_get_blurb(spec);
+			if (G_IS_PARAM_SPEC_BOXED(spec)) {
+				hbox = pidgin_theme_create_color_selector(label, blurb,
+						sections[i].props[j], group);
+				gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+			} else {
+				hbox = pidgin_theme_create_font_selector(label, blurb,
+						sections[i].props[j], group);
+				gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+			}
+		}
+	}
+
+	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), TRUE);
+#ifdef NOT_SADRUL
+	pidgin_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_SAVE, G_CALLBACK(save_blist_theme), dialog);
+#endif
+	pidgin_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, G_CALLBACK(close_blist_theme), dialog);
+
+	gtk_widget_show_all(dialog);
+
+	g_object_unref(group);
+}
+
+static gboolean
+plugin_load(PurplePlugin *plugin)
+{
+	return TRUE;
+}
+
+static GList *
+actions(PurplePlugin *plugin, gpointer context)
+{
+	GList *l = NULL;
+	PurplePluginAction *act = NULL;
+
+	act = purple_plugin_action_new(_("Edit Buddylist Theme"), pidgin_blist_theme_edit);
+	l = g_list_append(l, act);
+	act = purple_plugin_action_new(_("Edit Icon Theme"), pidgin_icon_theme_edit);
+	l = g_list_append(l, act);
+
+	return l;
+}
+
+static PurplePluginInfo info =
+{
+	PURPLE_PLUGIN_MAGIC,
+	PURPLE_MAJOR_VERSION,
+	PURPLE_MINOR_VERSION,
+	PURPLE_PLUGIN_STANDARD,                /**< type           */
+	PIDGIN_PLUGIN_TYPE,                    /**< ui_requirement */
+	0,                                     /**< flags          */
+	NULL,                                  /**< dependencies   */
+	PURPLE_PRIORITY_DEFAULT,               /**< priority       */
+
+	PLUGIN_ID,                             /**< id             */
+	N_("Pidgin Theme Editor"),             /**< name           */
+	DISPLAY_VERSION,                       /**< version        */
+	/**  summary        */
+	N_("Pidgin Theme Editor."),
+	/**  description    */
+	N_("Pidgin Theme Editor"),
+	"Sadrul Habib Chowdhury <imadil@gmail.com>",        /**< author         */
+	PURPLE_WEBSITE,                        /**< homepage       */
+
+	plugin_load,                           /**< load           */
+	NULL,                                  /**< unload         */
+	NULL,                                  /**< destroy        */
+
+	NULL,                                  /**< ui_info        */
+	NULL,                                  /**< extra_info     */
+	NULL,
+	actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static void
+init_plugin(PurplePlugin *plugin)
+{
+}
+
+PURPLE_INIT_PLUGIN(themeeditor, init_plugin, info)
diff --git a/pidgin/plugins/ticker/gtkticker.c b/pidgin/plugins/ticker/gtkticker.c
index 1cdf7ad132..35ea02c239 100644
--- a/pidgin/plugins/ticker/gtkticker.c
+++ b/pidgin/plugins/ticker/gtkticker.c
@@ -41,7 +41,7 @@ static void gtk_ticker_forall        (GtkContainer     *container,
 		gboolean	       include_internals,
 		GtkCallback       callback,
 		gpointer          callback_data);
-static GtkType gtk_ticker_child_type (GtkContainer     *container);
+static GType gtk_ticker_child_type   (GtkContainer     *container);
 
 
 static GtkContainerClass *parent_class = NULL;
@@ -97,7 +97,7 @@ static void gtk_ticker_class_init (GtkTickerClass *class)
 	widget_class = (GtkWidgetClass*) class;
 	container_class = (GtkContainerClass*) class;
 
-	parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
+	parent_class = g_type_class_ref (GTK_TYPE_CONTAINER);
 
 	gobject_class->finalize = gtk_ticker_finalize;
 
@@ -112,7 +112,7 @@ static void gtk_ticker_class_init (GtkTickerClass *class)
 	container_class->child_type = gtk_ticker_child_type;
 }
 
-static GtkType gtk_ticker_child_type (GtkContainer *container)
+static GType gtk_ticker_child_type (GtkContainer *container)
 {
 	return GTK_TYPE_WIDGET;
 }
diff --git a/pidgin/plugins/ticker/gtkticker.h b/pidgin/plugins/ticker/gtkticker.h
index 7f803d15c8..7fc4f476e1 100644
--- a/pidgin/plugins/ticker/gtkticker.h
+++ b/pidgin/plugins/ticker/gtkticker.h
@@ -26,19 +26,18 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#define GTK_TYPE_TICKER                  (gtk_ticker_get_type ())
-#define GTK_TICKER(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_TICKER, GtkTicker))
-#define GTK_TICKER_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TICKER, GtkTickerClass))
-#define GTK_IS_TICKER(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_TICKER))
-#define GTK_IS_TICKER_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TICKER))
+#define GTK_TYPE_TICKER            (gtk_ticker_get_type())
+#define GTK_TICKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_TICKER, GtkTicker))
+#define GTK_TICKER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_TICKER, GtkTickerClass))
+#define GTK_IS_TICKER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_TICKER))
+#define GTK_IS_TICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_TICKER))
 
 
 typedef struct _GtkTicker        GtkTicker;
@@ -73,7 +72,7 @@ struct _GtkTickerChild
 };
 
 
-GtkType    gtk_ticker_get_type          (void);
+GType      gtk_ticker_get_type          (void);
 GtkWidget* gtk_ticker_new               (void);
 void       gtk_ticker_add               (GtkTicker       *ticker,
                                         GtkWidget      *widget);
diff --git a/pidgin/plugins/ticker/ticker.c b/pidgin/plugins/ticker/ticker.c
index 9a0ffcc7fa..9682e50425 100644
--- a/pidgin/plugins/ticker/ticker.c
+++ b/pidgin/plugins/ticker/ticker.c
@@ -37,6 +37,7 @@
 #include "gtkblist.h"
 #include "gtkplugin.h"
 #include "gtkutils.h"
+#include "pidginstock.h"
 
 #include "gtkticker.h"
 
@@ -53,7 +54,7 @@ typedef struct {
 	guint timeout;
 } TickerData;
 
-GList *tickerbuds = NULL;
+static GList *tickerbuds = NULL;
 
 static void buddy_ticker_update_contact(PurpleContact *contact);
 
@@ -91,9 +92,10 @@ static gboolean buddy_click_cb(GtkWidget *widget, GdkEventButton *event, gpointe
 	PurpleContact *contact = user_data;
 	PurpleBuddy *b = purple_contact_get_priority_buddy(contact);
 
-	purple_conversation_new(PURPLE_CONV_TYPE_IM,
-	                        purple_buddy_get_account(b),
-							purple_buddy_get_name(b));
+	PurpleConversation *conv = purple_conversation_new(PURPLE_CONV_TYPE_IM,
+	                                purple_buddy_get_account(b),
+	                                purple_buddy_get_name(b));
+	purple_conversation_present(conv);
 	return TRUE;
 }
 
@@ -107,20 +109,27 @@ static TickerData *buddy_ticker_find_contact(PurpleContact *c) {
 	return NULL;
 }
 
-static void buddy_ticker_set_pixmap(PurpleContact *c) {
+static void buddy_ticker_set_pixmap(PurpleContact *c)
+{
 	TickerData *td = buddy_ticker_find_contact(c);
-	GdkPixbuf *pixbuf;
+	PurpleBuddy *buddy;
+	PurplePresence *presence;
+	const char *stock;
 
 	if(!td)
 		return;
 
-	if(!td->icon)
+	buddy = purple_contact_get_priority_buddy(c);
+	presence = purple_buddy_get_presence(buddy);
+	stock = pidgin_stock_id_from_presence(presence);
+	if(!td->icon) {
 		td->icon = gtk_image_new();
-
-	pixbuf = pidgin_blist_get_status_icon((PurpleBlistNode*)c,
-			PIDGIN_STATUS_ICON_SMALL);
-	gtk_image_set_from_pixbuf(GTK_IMAGE(td->icon), pixbuf);
-	g_object_unref(G_OBJECT(pixbuf));
+		g_object_set(G_OBJECT(td->icon), "stock", stock,
+				"icon-size", gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC),
+				NULL);
+	} else {
+		g_object_set(G_OBJECT(td->icon), "stock", stock, NULL);
+	}
 }
 
 static gboolean buddy_ticker_set_pixmap_cb(gpointer data) {
diff --git a/pidgin/plugins/win32/transparency/win2ktrans.c b/pidgin/plugins/win32/transparency/win2ktrans.c
index bec1f1f3b4..9b31e7d3c1 100644
--- a/pidgin/plugins/win32/transparency/win2ktrans.c
+++ b/pidgin/plugins/win32/transparency/win2ktrans.c
@@ -182,7 +182,7 @@ static GtkWidget *wintrans_slider(GtkWidget *win) {
 
 	/* On slider val change, update window's transparency level */
 	g_signal_connect(GTK_OBJECT(slider), "value-changed",
-		GTK_SIGNAL_FUNC(change_alpha), win);
+		G_CALLBACK(change_alpha), win);
 
 	gtk_box_pack_start(GTK_BOX(hbox), slider, FALSE, TRUE, 5);
 
@@ -563,7 +563,7 @@ static GtkWidget *get_config_frame(PurplePlugin *plugin) {
 	button = pidgin_prefs_checkbox(_("_IM window transparency"),
 		OPT_WINTRANS_IM_ENABLED, imtransbox);
 	g_signal_connect(GTK_OBJECT(button), "clicked",
-		GTK_SIGNAL_FUNC(update_convs_wintrans),
+		G_CALLBACK(update_convs_wintrans),
 		(gpointer) OPT_WINTRANS_IM_ENABLED);
 
 	trans_box = gtk_vbox_new(FALSE, 18);
@@ -572,12 +572,12 @@ static GtkWidget *get_config_frame(PurplePlugin *plugin) {
 	gtk_widget_show(trans_box);
 
 	g_signal_connect(GTK_OBJECT(button), "clicked",
-		GTK_SIGNAL_FUNC(pidgin_toggle_sensitive), trans_box);
+		G_CALLBACK(pidgin_toggle_sensitive), trans_box);
 
 	button = pidgin_prefs_checkbox(_("_Show slider bar in IM window"),
 		OPT_WINTRANS_IM_SLIDER, trans_box);
 	g_signal_connect(GTK_OBJECT(button), "clicked",
-		GTK_SIGNAL_FUNC(update_convs_wintrans),
+		G_CALLBACK(update_convs_wintrans),
 		(gpointer) OPT_WINTRANS_IM_SLIDER);
 
 	button = pidgin_prefs_checkbox(
@@ -587,7 +587,7 @@ static GtkWidget *get_config_frame(PurplePlugin *plugin) {
 	button = pidgin_prefs_checkbox(_("Always on top"), OPT_WINTRANS_IM_ONTOP,
 		trans_box);
 	g_signal_connect(GTK_OBJECT(button), "clicked",
-		GTK_SIGNAL_FUNC(update_convs_wintrans),
+		G_CALLBACK(update_convs_wintrans),
 		(gpointer) OPT_WINTRANS_IM_ONTOP);
 
 	gtk_box_pack_start(GTK_BOX(imtransbox), trans_box, FALSE, FALSE, 5);
@@ -604,9 +604,9 @@ static GtkWidget *get_config_frame(PurplePlugin *plugin) {
 	gtk_widget_set_usize(GTK_WIDGET(slider), 200, -1);
 
 	g_signal_connect(GTK_OBJECT(slider), "value-changed",
-		GTK_SIGNAL_FUNC(alpha_change), NULL);
+		G_CALLBACK(alpha_change), NULL);
 	g_signal_connect(GTK_OBJECT(slider), "focus-out-event",
-		GTK_SIGNAL_FUNC(alpha_pref_set_int),
+		G_CALLBACK(alpha_pref_set_int),
 		(gpointer) OPT_WINTRANS_IM_ALPHA);
 
 	gtk_box_pack_start(GTK_BOX(hbox), slider, FALSE, TRUE, 5);
@@ -620,7 +620,7 @@ static GtkWidget *get_config_frame(PurplePlugin *plugin) {
 	button = pidgin_prefs_checkbox(_("_Buddy List window transparency"),
 		OPT_WINTRANS_BL_ENABLED, bltransbox);
 	g_signal_connect(GTK_OBJECT(button), "clicked",
-		GTK_SIGNAL_FUNC(set_blist_trans),
+		G_CALLBACK(set_blist_trans),
 		(gpointer) OPT_WINTRANS_BL_ENABLED);
 
 	trans_box = gtk_vbox_new(FALSE, 18);
@@ -628,14 +628,14 @@ static GtkWidget *get_config_frame(PurplePlugin *plugin) {
 		gtk_widget_set_sensitive(GTK_WIDGET(trans_box), FALSE);
 	gtk_widget_show(trans_box);
 	g_signal_connect(GTK_OBJECT(button), "clicked",
-		GTK_SIGNAL_FUNC(pidgin_toggle_sensitive), trans_box);
+		G_CALLBACK(pidgin_toggle_sensitive), trans_box);
 	button = pidgin_prefs_checkbox(
 		_("Remove Buddy List window transparency on focus"),
 		OPT_WINTRANS_BL_ONFOCUS, trans_box);
 	button = pidgin_prefs_checkbox(_("Always on top"), OPT_WINTRANS_BL_ONTOP,
 		trans_box);
 	g_signal_connect(GTK_OBJECT(button), "clicked",
-		GTK_SIGNAL_FUNC(set_blist_trans),
+		G_CALLBACK(set_blist_trans),
 		(gpointer) OPT_WINTRANS_BL_ONTOP);
 	gtk_box_pack_start(GTK_BOX(bltransbox), trans_box, FALSE, FALSE, 5);
 
@@ -652,9 +652,9 @@ static GtkWidget *get_config_frame(PurplePlugin *plugin) {
 	gtk_widget_set_usize(GTK_WIDGET(slider), 200, -1);
 
 	g_signal_connect(GTK_OBJECT(slider), "value-changed",
-		GTK_SIGNAL_FUNC(bl_alpha_change), NULL);
+		G_CALLBACK(bl_alpha_change), NULL);
 	g_signal_connect(GTK_OBJECT(slider), "focus-out-event",
-		GTK_SIGNAL_FUNC(alpha_pref_set_int),
+		G_CALLBACK(alpha_pref_set_int),
 		(gpointer) OPT_WINTRANS_BL_ALPHA);
 
 	gtk_box_pack_start(GTK_BOX(hbox), slider, FALSE, TRUE, 5);
diff --git a/pidgin/plugins/win32/winprefs/winprefs.c b/pidgin/plugins/win32/winprefs/winprefs.c
index d2cd3b5ae4..e44571a831 100644
--- a/pidgin/plugins/win32/winprefs/winprefs.c
+++ b/pidgin/plugins/win32/winprefs/winprefs.c
@@ -350,7 +350,7 @@ static PurplePluginInfo info =
 	N_("Windows Pidgin Options"),
 	DISPLAY_VERSION,
 	N_("Options specific to Pidgin for Windows."),
-	N_("Provides options specific to Pidgin for Windows , such as buddy list docking."),
+	N_("Provides options specific to Pidgin for Windows, such as buddy list docking."),
 	"Herman Bloggs <hermanator12002@yahoo.com>",
 	PURPLE_WEBSITE,
 	plugin_load,
diff --git a/pidgin/plugins/xmppconsole.c b/pidgin/plugins/xmppconsole.c
index 1de520e082..19aedd44a4 100644
--- a/pidgin/plugins/xmppconsole.c
+++ b/pidgin/plugins/xmppconsole.c
@@ -62,58 +62,62 @@ xmlnode_to_pretty_str(xmlnode *node, int *len, int depth)
 
 	g_return_val_if_fail(node != NULL, NULL);
 
-	if(pretty && depth) {
+	if (pretty && depth) {
 		tab = g_strnfill(depth, '\t');
 		text = g_string_append(text, tab);
 	}
 
 	node_name = g_markup_escape_text(node->name, -1);
-	g_string_append_printf(text, "<font color='"
-			       BRACKET_COLOR "'>&lt;</font><font color='"
-			       TAG_COLOR "'><b>%s</b></font>", node_name);
+	g_string_append_printf(text,
+	                       "<font color='" BRACKET_COLOR "'>&lt;</font>"
+	                       "<font color='" TAG_COLOR "'><b>%s</b></font>",
+	                       node_name);
 
 	if (node->xmlns) {
-		if((!node->parent || 
-		    !node->parent->xmlns || 
-		    strcmp(node->xmlns, node->parent->xmlns)) &&
-		   strcmp(node->xmlns, "jabber:client"))
+		if ((!node->parent ||
+		     !node->parent->xmlns ||
+		     strcmp(node->xmlns, node->parent->xmlns)) &&
+		    strcmp(node->xmlns, "jabber:client"))
 		{
 			char *xmlns = g_markup_escape_text(node->xmlns, -1);
-			g_string_append_printf(text, " <font color='"
-					       ATTR_NAME_COLOR "'><b>xmlns</b></font>='<font color='"
-					       XMLNS_COLOR "'><b>%s</b></font>'", xmlns);
+			g_string_append_printf(text,
+			                       " <font color='" ATTR_NAME_COLOR "'><b>xmlns</b></font>="
+			                       "'<font color='" XMLNS_COLOR "'><b>%s</b></font>'",
+			                       xmlns);
 			g_free(xmlns);
 		}
 	}
-	for(c = node->child; c; c = c->next)
+	for (c = node->child; c; c = c->next)
 	{
-		if(c->type == XMLNODE_TYPE_ATTRIB) {
+		if (c->type == XMLNODE_TYPE_ATTRIB) {
 			esc = g_markup_escape_text(c->name, -1);
 			esc2 = g_markup_escape_text(c->data, -1);
-			g_string_append_printf(text, " <font color='"
-					       ATTR_NAME_COLOR "'><b>%s</b></font>='<font color='"
-					       ATTR_VALUE_COLOR "'>%s</font>'", esc, esc2);
+			g_string_append_printf(text,
+			                       " <font color='" ATTR_NAME_COLOR "'><b>%s</b></font>="
+			                       "'<font color='" ATTR_VALUE_COLOR "'>%s</font>'",
+			                       esc, esc2);
 			g_free(esc);
 			g_free(esc2);
-		} else if(c->type == XMLNODE_TYPE_TAG || c->type == XMLNODE_TYPE_DATA) {
-			if(c->type == XMLNODE_TYPE_DATA)
+		} else if (c->type == XMLNODE_TYPE_TAG || c->type == XMLNODE_TYPE_DATA) {
+			if (c->type == XMLNODE_TYPE_DATA)
 				pretty = FALSE;
 			need_end = TRUE;
 		}
 	}
 
-	if(need_end) {
-		g_string_append_printf(text, 
-			       "<font color='"BRACKET_COLOR"'>&gt;</font>%s", pretty ? "<br>" : "");
+	if (need_end) {
+		g_string_append_printf(text,
+		                       "<font color='"BRACKET_COLOR"'>&gt;</font>%s",
+		                       pretty ? "<br>" : "");
 
-		for(c = node->child; c; c = c->next)
+		for (c = node->child; c; c = c->next)
 		{
-			if(c->type == XMLNODE_TYPE_TAG) {
+			if (c->type == XMLNODE_TYPE_TAG) {
 				int esc_len;
 				esc = xmlnode_to_pretty_str(c, &esc_len, depth+1);
 				text = g_string_append_len(text, esc, esc_len);
 				g_free(esc);
-			} else if(c->type == XMLNODE_TYPE_DATA && c->data_sz > 0) {
+			} else if (c->type == XMLNODE_TYPE_DATA && c->data_sz > 0) {
 				esc = g_markup_escape_text(c->data, c->data_sz);
 				text = g_string_append(text, esc);
 				g_free(esc);
@@ -122,11 +126,14 @@ xmlnode_to_pretty_str(xmlnode *node, int *len, int depth)
 
 		if(tab && pretty)
 			text = g_string_append(text, tab);
-		g_string_append_printf(text, "<font color='"BRACKET_COLOR"'>&lt;</font>/<font color='"
-				       TAG_COLOR"'><b>%s</b></font><font color='"BRACKET_COLOR
-				       "'>&gt;</font><br>", node_name);
+		g_string_append_printf(text,
+		                       "<font color='" BRACKET_COLOR "'>&lt;</font>/"
+		                       "<font color='" TAG_COLOR "'><b>%s</b></font>"
+		                       "<font color='" BRACKET_COLOR "'>&gt;</font><br>",
+		                       node_name);
 	} else {
-		g_string_append_printf(text, "/<font color='"BRACKET_COLOR"'>&gt;</font><br>");
+		g_string_append_printf(text,
+		                       "/<font color='" BRACKET_COLOR "'>&gt;</font><br>");
 	}
 
 	g_free(node_name);
@@ -163,10 +170,10 @@ xmlnode_sent_cb(PurpleConnection *gc, char **packet, gpointer null)
 	if (!console || console->gc != gc)
 		return;
 	node = xmlnode_from_str(*packet, -1);
-		
+
 	if (!node)
 		return;
-	
+
 	str = xmlnode_to_pretty_str(node, NULL, 0);
 	formatted = g_strdup_printf("<body bgcolor='#dcecc4'><pre>%s</pre></body>", str);
 	gtk_imhtml_append_text(GTK_IMHTML(console->imhtml), formatted, 0);
@@ -204,37 +211,35 @@ static void message_send_cb(GtkWidget *widget, gpointer p)
 static void entry_changed_cb(GtkTextBuffer *buffer, void *data)
 {
 	char *xmlstr, *str;
-        GtkTextIter iter;
-        int wrapped_lines;
-        int lines;
-        GdkRectangle oneline;
-        int height;
-        int pad_top, pad_inside, pad_bottom;
+	GtkTextIter iter;
+	int wrapped_lines;
+	int lines;
+	GdkRectangle oneline;
+	int height;
+	int pad_top, pad_inside, pad_bottom;
 	GtkTextIter start, end;
 	xmlnode *node;
-	
-        wrapped_lines = 1;
-        gtk_text_buffer_get_start_iter(buffer, &iter);
-        gtk_text_view_get_iter_location(GTK_TEXT_VIEW(console->entry), &iter, &oneline);
-        while (gtk_text_view_forward_display_line(GTK_TEXT_VIEW(console->entry), &iter))
-                wrapped_lines++;
 
-        lines = gtk_text_buffer_get_line_count(buffer);
+	wrapped_lines = 1;
+	gtk_text_buffer_get_start_iter(buffer, &iter);
+	gtk_text_view_get_iter_location(GTK_TEXT_VIEW(console->entry), &iter, &oneline);
+	while (gtk_text_view_forward_display_line(GTK_TEXT_VIEW(console->entry), &iter))
+		wrapped_lines++;
 
-        /* Show a maximum of 64 lines */
-        lines = MIN(lines, 6);
-        wrapped_lines = MIN(wrapped_lines, 6);
+	lines = gtk_text_buffer_get_line_count(buffer);
 
-        pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(console->entry));
-        pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(console->entry));
-        pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(console->entry));
+	/* Show a maximum of 64 lines */
+	lines = MIN(lines, 6);
+	wrapped_lines = MIN(wrapped_lines, 6);
 
-        height = (oneline.height + pad_top + pad_bottom) * lines;
-        height += (oneline.height + pad_inside) * (wrapped_lines - lines);
-
-        gtk_widget_set_size_request(console->sw, -1, height+6);
+	pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(console->entry));
+	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(console->entry));
+	pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(console->entry));
 
+	height = (oneline.height + pad_top + pad_bottom) * lines;
+	height += (oneline.height + pad_inside) * (wrapped_lines - lines);
 
+	gtk_widget_set_size_request(console->sw, -1, height + 6);
 
 	gtk_text_buffer_get_start_iter(buffer, &start);
 	gtk_text_buffer_get_end_iter(buffer, &end);
@@ -287,7 +292,7 @@ static void iq_clicked_cb(GtkWidget *w, gpointer nul)
 	to_entry = gtk_entry_new();
 	gtk_entry_set_activates_default (GTK_ENTRY (to_entry), TRUE);
 	gtk_box_pack_start(GTK_BOX(hbox), to_entry, FALSE, FALSE, 0);
-	
+
 	hbox = gtk_hbox_new(FALSE, 3);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0);
 	label = gtk_label_new("Type:");
@@ -302,7 +307,7 @@ static void iq_clicked_cb(GtkWidget *w, gpointer nul)
 	gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "error");
 	gtk_combo_box_set_active(GTK_COMBO_BOX(type_combo), 0);
 	gtk_box_pack_start(GTK_BOX(hbox), type_combo, FALSE, FALSE, 0);
-	
+
 	gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
 
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -310,16 +315,16 @@ static void iq_clicked_cb(GtkWidget *w, gpointer nul)
 		gtk_widget_destroy(dialog);
 		return;
 	}
-	
+
 	to = gtk_entry_get_text(GTK_ENTRY(to_entry));
 
-	stanza = g_strdup_printf("<iq %s%s%s id='console%x' type='%s'></iq>", 
+	stanza = g_strdup_printf("<iq %s%s%s id='console%x' type='%s'></iq>",
 				 to && *to ? "to='" : "",
 				 to && *to ? to : "",
 				 to && *to ? "'" : "",
 				 g_random_int(),
 				 gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_combo)));
-	
+
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(console->entry));
 	gtk_text_buffer_set_text(buffer, stanza, -1);
 	gtk_text_buffer_get_iter_at_offset(buffer, &iter, strstr(stanza, "</iq>") - stanza);
@@ -328,25 +333,24 @@ static void iq_clicked_cb(GtkWidget *w, gpointer nul)
 
 	gtk_widget_destroy(dialog);
 	g_object_unref(sg);
-
 }
 
 static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 {
-	GtkWidget *hbox, 
-  		  *to_entry, 
-		  *status_entry,
-		  *priority_entry,
-		  *label,
-   		  *show_combo,
-		  *type_combo;
+	GtkWidget *hbox;
+	GtkWidget *to_entry;
+	GtkWidget *status_entry;
+	GtkWidget *priority_entry;
+	GtkWidget *label;
+	GtkWidget *show_combo;
+	GtkWidget *type_combo;
 	GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 	GtkTextIter iter;
 	GtkTextBuffer *buffer;
 	const char *to, *type, *status, *show, *priority;
 	int result;
 	char *stanza;
-	
+
 	GtkWidget *dialog = gtk_dialog_new_with_buttons("<presence/>",
 							GTK_WINDOW(console->window),
 							GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -370,7 +374,7 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 	to_entry = gtk_entry_new();
 	gtk_entry_set_activates_default (GTK_ENTRY (to_entry), TRUE);
 	gtk_box_pack_start(GTK_BOX(hbox), to_entry, FALSE, FALSE, 0);
-	
+
 	hbox = gtk_hbox_new(FALSE, 3);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0);
 	label = gtk_label_new("Type:");
@@ -417,7 +421,6 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 	gtk_entry_set_activates_default (GTK_ENTRY (status_entry), TRUE);
 	gtk_box_pack_start(GTK_BOX(hbox), status_entry, FALSE, FALSE, 0);
 
-
 	hbox = gtk_hbox_new(FALSE, 3);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0);
 
@@ -430,7 +433,6 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(priority_entry), 0);
 	gtk_box_pack_start(GTK_BOX(hbox), priority_entry, FALSE, FALSE, 0);
 
-	
 	gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
 
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -438,7 +440,7 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 		gtk_widget_destroy(dialog);
 		return;
 	}
-	
+
 	to = gtk_entry_get_text(GTK_ENTRY(to_entry));
 	type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_combo));
 	if (!strcmp(type, "default"))
@@ -451,32 +453,30 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 	if (!strcmp(priority, "0"))
 		priority = "";
 
+	stanza = g_strdup_printf("<presence %s%s%s id='console%x' %s%s%s>"
+	                         "%s%s%s%s%s%s%s%s%s"
+	                         "</presence>",
+	                         *to ? "to='" : "",
+	                         *to ? to : "",
+	                         *to ? "'" : "",
+	                         g_random_int(),
 
+	                         *type ? "type='" : "",
+	                         *type ? type : "",
+	                         *type ? "'" : "",
+
+	                         *show ? "<show>" : "",
+	                         *show ? show : "",
+	                         *show ? "</show>" : "",
+
+	                         *status ? "<status>" : "",
+	                         *status ? status : "",
+	                         *status ? "</status>" : "",
+
+	                         *priority ? "<priority>" : "",
+	                         *priority ? priority : "",
+	                         *priority ? "</priority>" : "");
 
-	stanza = g_strdup_printf("<presence %s%s%s id='console%x' %s%s%s>"
-				 "%s%s%s%s%s%s%s%s%s"
-				 "</presence>", 
-				 *to ? "to='" : "",
-				 *to ? to : "",
-				 *to ? "'" : "",
-				 g_random_int(),
-				 
-				 *type ? "type='" : "",
-				 *type ? type : "",
-				 *type ? "'" : "",
-				 
-				 *show ? "<show>" : "",
-				 *show ? show : "",
-				 *show ? "</show>" : "",
-
-				 *status ? "<status>" : "",
-				 *status ? status : "",
-				 *status ? "</status>" : "",
-				       
-				 *priority ? "<priority>" : "",
-				 *priority ? priority : "",
-				 *priority ? "</priority>" : "");
-	
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(console->entry));
 	gtk_text_buffer_set_text(buffer, stanza, -1);
 	gtk_text_buffer_get_iter_at_offset(buffer, &iter, strstr(stanza, "</presence>") - stanza);
@@ -489,13 +489,13 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 
 static void message_clicked_cb(GtkWidget *w, gpointer nul)
 {
-	GtkWidget *hbox, 
-		  *to_entry, 
-		  *body_entry, 
-   		  *thread_entry,
-		  *subject_entry,
-		  *label, 
-		  *type_combo;
+	GtkWidget *hbox;
+	GtkWidget *to_entry;
+	GtkWidget *body_entry;
+	GtkWidget *thread_entry;
+	GtkWidget *subject_entry;
+	GtkWidget *label;
+	GtkWidget *type_combo;
 	GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 	GtkTextIter iter;
 	GtkTextBuffer *buffer;
@@ -554,7 +554,6 @@ static void message_clicked_cb(GtkWidget *w, gpointer nul)
 	gtk_entry_set_activates_default (GTK_ENTRY (body_entry), TRUE);
 	gtk_box_pack_start(GTK_BOX(hbox), body_entry, FALSE, FALSE, 0);
 
-
 	hbox = gtk_hbox_new(FALSE, 3);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0);
 
@@ -578,7 +577,7 @@ static void message_clicked_cb(GtkWidget *w, gpointer nul)
 	thread_entry = gtk_entry_new();
 	gtk_entry_set_activates_default (GTK_ENTRY (thread_entry), TRUE);
 	gtk_box_pack_start(GTK_BOX(hbox), thread_entry, FALSE, FALSE, 0);
-	
+
 	gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
 
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -586,34 +585,34 @@ static void message_clicked_cb(GtkWidget *w, gpointer nul)
 		gtk_widget_destroy(dialog);
 		return;
 	}
-	
+
 	to = gtk_entry_get_text(GTK_ENTRY(to_entry));
 	body = gtk_entry_get_text(GTK_ENTRY(body_entry));
 	thread = gtk_entry_get_text(GTK_ENTRY(thread_entry));
 	subject = gtk_entry_get_text(GTK_ENTRY(subject_entry));
 
 	stanza = g_strdup_printf("<message %s%s%s id='console%x' type='%s'>"
-				 "%s%s%s%s%s%s%s%s%s"
-				 "</message>",
-				 
-				 *to ? "to='" : "",
-				 *to ? to : "",
-				 *to ? "'" : "",
-				 g_random_int(),
-				 gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_combo)),
-				 
-				 *body ? "<body>" : "",
-				 *body ? body : "",
-				 *body ? "</body>" : "",
-				 
-				 *subject ? "<subject>" : "",
-				 *subject ? subject : "",
-				 *subject ? "</subject>" : "",
-				 
-				 *thread ? "<thread>" : "",
-				 *thread ? thread : "",
-				 *thread ? "</thread>" : "");
-	
+	                         "%s%s%s%s%s%s%s%s%s"
+	                         "</message>",
+
+	                         *to ? "to='" : "",
+	                         *to ? to : "",
+	                         *to ? "'" : "",
+	                         g_random_int(),
+	                         gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_combo)),
+
+	                         *body ? "<body>" : "",
+	                         *body ? body : "",
+	                         *body ? "</body>" : "",
+
+	                         *subject ? "<subject>" : "",
+	                         *subject ? subject : "",
+	                         *subject ? "</subject>" : "",
+
+	                         *thread ? "<thread>" : "",
+	                         *thread ? thread : "",
+	                         *thread ? "</thread>" : "");
+
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(console->entry));
 	gtk_text_buffer_set_text(buffer, stanza, -1);
 	gtk_text_buffer_get_iter_at_offset(buffer, &iter, strstr(stanza, "</message>") - stanza);
@@ -629,11 +628,11 @@ signed_on_cb(PurpleConnection *gc)
 {
 	if (!console)
 		return;
-	
+
 	gtk_combo_box_append_text(GTK_COMBO_BOX(console->dropdown), purple_account_get_username(gc->account));
 	console->accounts = g_list_append(console->accounts, gc);
 	console->count++;
-	
+
 	if (console->count > 1)
 		gtk_widget_show_all(console->hbox);
 }
@@ -666,7 +665,7 @@ signed_off_cb(PurpleConnection *gc)
 
 	if (gc == console->gc) {
 		console->gc = NULL;
-		gtk_imhtml_append_text(GTK_IMHTML(console->imhtml), 
+		gtk_imhtml_append_text(GTK_IMHTML(console->imhtml),
 				       _("<font color='#777777'>Logged out.</font>"), 0);
 	}
 }
@@ -689,7 +688,7 @@ plugin_load(PurplePlugin *plugin)
 			    plugin, PURPLE_CALLBACK(signed_on_cb), NULL);
 	purple_signal_connect(purple_connections_get_handle(), "signed-off",
 			    plugin, PURPLE_CALLBACK(signed_off_cb), NULL);
-	
+
 	return TRUE;
 }
 
@@ -716,18 +715,18 @@ dropdown_changed_cb(GtkComboBox *widget, gpointer nul)
 
 	if (!console)
 		return;
-	
-	account = purple_accounts_find(gtk_combo_box_get_active_text(GTK_COMBO_BOX(console->dropdown)), 
+
+	account = purple_accounts_find(gtk_combo_box_get_active_text(GTK_COMBO_BOX(console->dropdown)),
 				    "prpl-jabber");
 	if (!account || !account->gc)
 		return;
-	
+
 	console->gc = account->gc;
 	gtk_imhtml_clear(GTK_IMHTML(console->imhtml));
 }
 
-static void 
-create_console(PurplePluginAction *action) 
+static void
+create_console(PurplePluginAction *action)
 {
 	GtkWidget *vbox = gtk_vbox_new(FALSE, 6);
 	GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL);
@@ -743,7 +742,7 @@ create_console(PurplePluginAction *action)
 		gtk_window_present(GTK_WINDOW(console->window));
 		return;
 	}
-	
+
 	console = g_new0(XmppConsole, 1);
 
 	console->window = pidgin_create_window(_("XMPP Console"), PIDGIN_HIG_BORDER, NULL, TRUE);
@@ -773,32 +772,32 @@ create_console(PurplePluginAction *action)
 	g_signal_connect(G_OBJECT(console->dropdown), "changed", G_CALLBACK(dropdown_changed_cb), NULL);
 
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_ETCHED_IN);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), 
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
 				       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
 	console->imhtml = gtk_imhtml_new(NULL, NULL);
 	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 	if (console->count == 0)
-		gtk_imhtml_append_text(GTK_IMHTML(console->imhtml), 
+		gtk_imhtml_append_text(GTK_IMHTML(console->imhtml),
 				       _("<font color='#777777'>Not connected to XMPP</font>"), 0);
 	gtk_container_add(GTK_CONTAINER(sw), console->imhtml);
-	
+
 	toolbar = gtk_toolbar_new();
-#if GTK_CHECK_VERSION(2,4,0)	
+#if GTK_CHECK_VERSION(2,4,0)
 	button = gtk_tool_button_new(NULL, "<iq/>");
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(iq_clicked_cb), NULL);
 	gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
 #else
-	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<iq/>", 
+	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<iq/>",
 			           _("Insert an <iq/> stanza."), "foo", NULL, GTK_SIGNAL_FUNC(iq_clicked_cb), NULL);
 #endif
 
-#if GTK_CHECK_VERSION(2,4,0)	
+#if GTK_CHECK_VERSION(2,4,0)
 	button = gtk_tool_button_new(NULL, "<presence/>");
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(presence_clicked_cb), NULL);
 	gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
 #else
-	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<presence/>", 
+	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<presence/>",
 			           _("Insert a <presence/> stanza."), NULL, gtk_label_new(NULL), GTK_SIGNAL_FUNC(presence_clicked_cb), NULL);
 #endif
 
@@ -807,17 +806,17 @@ create_console(PurplePluginAction *action)
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(message_clicked_cb), NULL);
 	gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
 #else
-	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<message/>", 
+	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<message/>",
 			           _("Insert a <message/> stanza."), "foo", gtk_label_new(NULL), GTK_SIGNAL_FUNC(message_clicked_cb), NULL);
 #endif
-	
+
 	gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
-	
+
 	sw = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_ETCHED_IN);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), 
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
 				       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	
+
 	console->entry = gtk_imhtml_new(NULL, NULL);
 	gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(console->entry), TRUE);
 	g_signal_connect(G_OBJECT(console->entry),"message_send", G_CALLBACK(message_send_cb), console);
@@ -843,7 +842,7 @@ actions(PurplePlugin *plugin, gpointer context)
 
 	act = purple_plugin_action_new(_("XMPP Console"), create_console);
 	l = g_list_append(l, act);
-	
+
 	return l;
 }
 
@@ -853,28 +852,28 @@ static PurplePluginInfo info =
 	PURPLE_PLUGIN_MAGIC,
 	PURPLE_MAJOR_VERSION,
 	PURPLE_MINOR_VERSION,
-	PURPLE_PLUGIN_STANDARD,                             /**< type           */
-	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
-	0,                                                /**< flags          */
-	NULL,                                             /**< dependencies   */
-	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
-
-	"gtk-xmpp",                                       /**< id             */
-	N_("XMPP Console"),                                  /**< name           */
-	DISPLAY_VERSION,                                  /**< version        */
-	                                                  /**  summary        */
+	PURPLE_PLUGIN_STANDARD,                       /**< type           */
+	PIDGIN_PLUGIN_TYPE,                           /**< ui_requirement */
+	0,                                            /**< flags          */
+	NULL,                                         /**< dependencies   */
+	PURPLE_PRIORITY_DEFAULT,                      /**< priority       */
+
+	"gtk-xmpp",                                   /**< id             */
+	N_("XMPP Console"),                           /**< name           */
+	DISPLAY_VERSION,                              /**< version        */
+	                                              /**  summary        */
 	N_("Send and receive raw XMPP stanzas."),
-	                                                  /**  description    */
+	                                              /**  description    */
 	N_("This plugin is useful for debbuging XMPP servers or clients."),
-	"Sean Egan <seanegan@gmail.com>",                 /**< author         */
-	PURPLE_WEBSITE,                                     /**< homepage       */
+	"Sean Egan <seanegan@gmail.com>",             /**< author         */
+	PURPLE_WEBSITE,                               /**< homepage       */
 
-	plugin_load,                                      /**< load           */
-	plugin_unload,                                    /**< unload         */
-	NULL,                                             /**< destroy        */
+	plugin_load,                                  /**< load           */
+	plugin_unload,                                /**< unload         */
+	NULL,                                         /**< destroy        */
 
 	NULL,                                         /**< ui_info        */
-	NULL,                                             /**< extra_info     */
+	NULL,                                         /**< extra_info     */
 	NULL,
 	actions,
 
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
index f39078a162..338767cfce 100644
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -2,7 +2,7 @@
 ; Original Author: Herman Bloggs <hermanator12002@yahoo.com>
 ; Updated By: Daniel Atallah <daniel_atallah@yahoo.com>
 
-; NOTE: this .NSI script is intended for NSIS 2.27
+; NOTE: this .NSI script is intended for NSIS 2.27+
 ;
 
 ;--------------------------------
@@ -567,6 +567,7 @@ SectionGroup /e $(URI_HANDLERS_SECTION_TITLE) SecURIHandlers
   !insertmacro URI_SECTION "msnim"
   !insertmacro URI_SECTION "myim"
   !insertmacro URI_SECTION "ymsgr"
+  !insertmacro URI_SECTION "xmpp"
 SectionGroupEnd
 
 ;--------------------------------
@@ -708,24 +709,30 @@ Section Uninstall
     Call un.UnregisterURIHandler
     Push "ymsgr"
     Call un.UnregisterURIHandler
+    Push "xmpp"
+    Call un.UnregisterURIHandler
 
     Delete "$INSTDIR\ca-certs\America_Online_Root_Certification_Authority_1.pem"
     Delete "$INSTDIR\ca-certs\AOL_Member_CA.pem"
     Delete "$INSTDIR\ca-certs\CAcert_Class3.pem"
     Delete "$INSTDIR\ca-certs\CAcert_Root.pem"
     Delete "$INSTDIR\ca-certs\Equifax_Secure_CA.pem"
+    Delete "$INSTDIR\ca-certs\Equifax_Secure_Global_eBusiness_CA-1.pem"
     Delete "$INSTDIR\ca-certs\GTE_CyberTrust_Global_Root.pem"
     Delete "$INSTDIR\ca-certs\Microsoft_Internet_Authority.pem"
     Delete "$INSTDIR\ca-certs\Microsoft_Secure_Server_Authority.pem"
+    Delete "$INSTDIR\ca-certs\StartCom_Certification_Authority.pem"
     Delete "$INSTDIR\ca-certs\StartCom_Free_SSL_CA.pem"
+    Delete "$INSTDIR\ca-certs\Thawte_Premium_Server_CA.pem"
+    Delete "$INSTDIR\ca-certs\VeriSign_Class3_Extended_Validation_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_Class3_Primary_CA.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem"
+    Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_International_Server_Class_3_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_RSA_Secure_Server_CA.pem"
     RMDir "$INSTDIR\ca-certs"
     RMDir /r "$INSTDIR\locale"
     RMDir /r "$INSTDIR\pixmaps"
-    RMDir /r "$INSTDIR\perlmod"
     Delete "$INSTDIR\plugins\autoaccept.dll"
     Delete "$INSTDIR\plugins\buddynote.dll"
     Delete "$INSTDIR\plugins\convcolors.dll"
@@ -750,6 +757,7 @@ Section Uninstall
     Delete "$INSTDIR\plugins\libsimple.dll"
     Delete "$INSTDIR\plugins\libtoc.dll"
     Delete "$INSTDIR\plugins\libyahoo.dll"
+    Delete "$INSTDIR\plugins\libyahoojp.dll"
     Delete "$INSTDIR\plugins\libxmpp.dll"
     Delete "$INSTDIR\plugins\log_reader.dll"
     Delete "$INSTDIR\plugins\markerline.dll"
@@ -772,6 +780,8 @@ Section Uninstall
     Delete "$INSTDIR\plugins\win2ktrans.dll"
     Delete "$INSTDIR\plugins\winprefs.dll"
     Delete "$INSTDIR\plugins\xmppconsole.dll"
+    Delete "$INSTDIR\plugins\xmppdisco.dll"
+    RMDir /r "$INSTDIR\plugins\perl"
     RMDir "$INSTDIR\plugins"
     RMDir /r "$INSTDIR\sasl2"
     Delete "$INSTDIR\sounds\purple\alert.wav"
@@ -792,6 +802,7 @@ Section Uninstall
     Delete "$INSTDIR\libsilc-1-1-2.dll"
     Delete "$INSTDIR\libsilcclient-1-1-2.dll"
     Delete "$INSTDIR\libxml2.dll"
+    Delete "$INSTDIR\libymsg.dll"
     Delete "$INSTDIR\nspr4.dll"
     Delete "$INSTDIR\nss3.dll"
     Delete "$INSTDIR\nssckbi.dll"
@@ -813,6 +824,7 @@ Section Uninstall
 
     ; Shortcuts..
     Delete "$DESKTOP\Pidgin.lnk"
+    Delete "$SMPROGRAMS\Pidgin.lnk"
 
     Goto done
 
diff --git a/pidgin/win32/nsis/translations/italian.nsh b/pidgin/win32/nsis/translations/italian.nsh
index ee2a56d045..94db272ec1 100644
--- a/pidgin/win32/nsis/translations/italian.nsh
+++ b/pidgin/win32/nsis/translations/italian.nsh
@@ -4,33 +4,79 @@
 ;;  Italian language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
-;;  Author: Claudio Satriano <satriano@na.infn.it>, 2003.
-;;  Version 2
+;;  Author: Claudio Satriano <satriano@na.infn.it>, 2003-2009.
+;;  Version 3
 ;;
 
-; Startup GTK+ check
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Il programma di installazione � gi� in esecuzione"
+!define PIDGIN_IS_RUNNING			"� attualmente in esecuzione un'istanza di Pidgin. Esci da Pidgin e riprova."
 !define GTK_INSTALLER_NEEDED			"L'ambiente di runtime GTK+ non � presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_MIN_VERSION} o maggiore"
 
 ; License Page
 !define PIDGIN_LICENSE_BUTTON			"Avanti >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) � distribuito sotto licenza GPL. La licenza � mostrata qui solamente a scopo informativo. $_CLICK" 
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) � distribuito sotto la GNU General Public License (GPL). La licenza � mostrata qui solamente a scopo informativo. $_CLICK"
 
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin - Client per Messaggi Immediati (richiesto)"
-!define GTK_SECTION_TITLE			"Ambiente di Runtime GTK+ (richiesto)"
+!define GTK_SECTION_TITLE			"Ambiente di Runtime GTK+ (richiesto se non presente)"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Collegamenti"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Avvio"
 !define PIDGIN_SECTION_DESCRIPTION		"File principali di Pidgin e dll"
 !define GTK_SECTION_DESCRIPTION		"Un toolkit multipiattaforma per interfacce grafiche, usato da Pidgin"
 
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Collegamenti per avviare Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Crea un collegamento a Pidgin sul desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Crea una voce per Pidgin nel Menu Avvio"
+
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"� stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: $(^Name) potrebbe non funzionare senza l'aggiornamento."
+!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me non � incompatible con GTK+ 2.8.0 o successivo. GTK+ ${GTK_INSTALL_VERSION} non sar� installato.$\rSe non hai GTK+ ${GTK_MIN_VERSION} o successivo gi� installato sul tuo computer, questa installazione sar� interrotta."
 
 ; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin per Windows"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin"
+
+; Pidgin Section Prompts and Texts
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Impossibile rimuovere la versione di Pidgin attualmente presente sul tuo computer. La nuova versione sar� installata senza rimuovere la versione precedente."
 
 ; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Errore di installazione di GTK+."
+!define GTK_INSTALL_ERROR			"Error nell'installazione del runtime GTK+."
 !define GTK_BAD_INSTALL_PATH			"Il percorso scelto non pu� essere raggiunto o creato."
 
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"Gestori degli URI"
+
 ; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1         "Il programma di rimozione non � in grado di trovare le voci di registro per Pidgin.$\rProbabilmente un altro utente ha installato questa applicazione."
-!define un.PIDGIN_UNINSTALL_ERROR_2         "Non hai il permesso per rimuovere questa applicazione."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Il programma di rimozione non � in grado di trovare le voci di registro per Pidgin.$\rProbabilmente questa applicazione � stata installata da un altro utente."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Non hai il permesso per rimuovere questa applicazione."
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE	"Supporto per il correttore ortografico"
+!define PIDGIN_SPELLCHECK_ERROR		"Errore nell'installazione del correttore ortografico"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Errore nell'installazione del dizionario per il correttore ortografico"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Supporto per il correttore ortografico.  (� richiesta una connessione a internet per l'installazione)"
+!define ASPELL_INSTALL_FAILED			"Installazione fallita"
+!define PIDGIN_SPELLCHECK_BRETON		"Bretone"
+!define PIDGIN_SPELLCHECK_CATALAN		"Catalano"
+!define PIDGIN_SPELLCHECK_CZECH		"Ceco"
+!define PIDGIN_SPELLCHECK_WELSH		"Gallese"
+!define PIDGIN_SPELLCHECK_DANISH		"Danese"
+!define PIDGIN_SPELLCHECK_GERMAN		"Tedesco"
+!define PIDGIN_SPELLCHECK_GREEK		"Greco"
+!define PIDGIN_SPELLCHECK_ENGLISH		"Inglese"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!define PIDGIN_SPELLCHECK_SPANISH		"Spagnolo"
+!define PIDGIN_SPELLCHECK_FAROESE		"Faroese"
+!define PIDGIN_SPELLCHECK_FRENCH		"Francese"
+!define PIDGIN_SPELLCHECK_ITALIAN		"Italiano"
+!define PIDGIN_SPELLCHECK_DUTCH		"Olandese"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norvegese"
+!define PIDGIN_SPELLCHECK_POLISH		"Polacco"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portoghese"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Rumeno"
+!define PIDGIN_SPELLCHECK_RUSSIAN		"Russo"
+!define PIDGIN_SPELLCHECK_SLOVAK		"Slovacco"
+!define PIDGIN_SPELLCHECK_SWEDISH		"Svedese"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ucraino"
+
diff --git a/pidgin/win32/pidgin_dll_rc.rc.in b/pidgin/win32/pidgin_dll_rc.rc.in
index 47157453a2..2b447d7158 100644
--- a/pidgin/win32/pidgin_dll_rc.rc.in
+++ b/pidgin/win32/pidgin_dll_rc.rc.in
@@ -2,8 +2,6 @@
 #include "version.h"
 #include "resource.h"
 
-#define PIXMAPDIR "pixmaps/tray/16/"
-
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
   PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
@@ -33,11 +31,11 @@ VS_VERSION_INFO VERSIONINFO
     END
   END
 
-PIDGIN_TRAY_AVAILABLE_4BIT	ICON PIXMAPDIR "available_4bit.ico"
-PIDGIN_TRAY_AWAY_4BIT		ICON PIXMAPDIR "away_4bit.ico"
-PIDGIN_TRAY_BUSY_4BIT		ICON PIXMAPDIR "busy_4bit.ico"
-PIDGIN_TRAY_XA_4BIT		ICON PIXMAPDIR "extended-away_4bit.ico"
-PIDGIN_TRAY_OFFLINE_4BIT	ICON PIXMAPDIR "offline_4bit.ico"
-PIDGIN_TRAY_CONNECTING_4BIT	ICON PIXMAPDIR "connecting_4bit.ico"
-PIDGIN_TRAY_PENDING_4BIT	ICON PIXMAPDIR "message_4bit.ico"
-PIDGIN_TRAY_INVISIBLE_4BIT	ICON PIXMAPDIR "invisible_4bit.ico"
+PIDGIN_TRAY_AVAILABLE_4BIT	ICON "pixmaps/tray/16/available_4bit.ico"
+PIDGIN_TRAY_AWAY_4BIT		ICON "pixmaps/tray/16/away_4bit.ico"
+PIDGIN_TRAY_BUSY_4BIT		ICON "pixmaps/tray/16/busy_4bit.ico"
+PIDGIN_TRAY_XA_4BIT		ICON "pixmaps/tray/16/extended-away_4bit.ico"
+PIDGIN_TRAY_OFFLINE_4BIT	ICON "pixmaps/tray/16/offline_4bit.ico"
+PIDGIN_TRAY_CONNECTING_4BIT	ICON "pixmaps/tray/16/connecting_4bit.ico"
+PIDGIN_TRAY_PENDING_4BIT	ICON "pixmaps/tray/16/message_4bit.ico"
+PIDGIN_TRAY_INVISIBLE_4BIT	ICON "pixmaps/tray/16/invisible_4bit.ico"
diff --git a/pidgin/win32/pidgin_exe_rc.rc.in b/pidgin/win32/pidgin_exe_rc.rc.in
index 6afbda377a..2e8b26ec75 100644
--- a/pidgin/win32/pidgin_exe_rc.rc.in
+++ b/pidgin/win32/pidgin_exe_rc.rc.in
@@ -2,8 +2,6 @@
 #include "resource.h"
 #include "version.h"
 
-#define PIXMAPDIR "pixmaps/"
-
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
   PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
@@ -33,4 +31,4 @@ VS_VERSION_INFO VERSIONINFO
     END
   END
 
-PIDGIN_ICON			ICON PIXMAPDIR "pidgin.ico"
+PIDGIN_ICON			ICON "pixmaps/pidgin.ico"
diff --git a/pidgin/win32/untar.c b/pidgin/win32/untar.c
index 0ec2e09ccc..7121513485 100644
--- a/pidgin/win32/untar.c
+++ b/pidgin/win32/untar.c
@@ -212,9 +212,11 @@ static void linkorcopy(src, dst, sym)
 	 * make sure the directory path exists.
 	 */
 	fpdst = createpath(dst);
-	if (!fpdst)
+	if (!fpdst) {
 		/* error message already given */
+		fclose(fpsrc);
 		return;
+	}
 
 #ifdef _POSIX_SOURCE
 # ifndef _WEAK_POSIX
diff --git a/pidgin/win32/winpidgin.c b/pidgin/win32/winpidgin.c
index c954ab299e..ad2c83b20c 100644
--- a/pidgin/win32/winpidgin.c
+++ b/pidgin/win32/winpidgin.c
@@ -586,7 +586,7 @@ static void handle_protocol(char *cmd) {
 		return;
 	}
 
-	printf("Trying to handle protocol message:\n'%*s'\n", len, tmp1);
+	printf("Trying to handle protocol message:\n'%.*s'\n", len, tmp1);
 
 	/* MEM_COMMIT initializes the memory to zero,
 	 * so we don't need to worry that our section of tmp1 isn't nul-terminated */
diff --git a/po/ChangeLog b/po/ChangeLog
index 34ddbb3250..cdcbe0579c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -3,6 +3,53 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 version 2.7.0
 
 version 2.6.0
+	* Afrikaans translation updated (Friedel Wolff)
+	* Armenian translation added (David Avsharyan)
+	* Basque translation updated under new translator (Mikel Pascual
+	  Aldabaldetreku)
+	* Bengali translation updated (Samia Niamatullah)
+	* Catalan translation updated (Josep Puigdemont)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li)
+	* Chinese (Simplified) translation updated under new
+	  translator (Aron Xu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* Czech translation updated (David Vachulka)
+	* Dutch translation updated (Daniël Heres)
+	* English (British) translation updated (Luke Ross)
+	* Esperanto translation updated (Stéphane Fillod)
+	* Finnish translation updated (Timo Jyrinki)
+	* French translation updated (Éric Boumaour)
+	* Galician translation updated (Frco. Javier Rial Rodríguez)
+	* German translation updated (Jochen Kemnade and Björn Voigt)
+	* Greek translation updated (Bouklis Panos)
+	* Hebrew translation updated (Shalom Craimer)
+	* Italian translation updated (Claudio Satriano)
+	* Khmer translation added (Khoem Sokhem)
+	* Lao translation updated (Anousak Souphavah)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Portuguese (Brazilian) translation updated (Rodrigo Luiz
+	  Marques Flores)
+	* Punjabi translation updated (Amanpreet Singh Alam)
+	* Romanian translation updated (Mişu Moldovan and new translator Andrei
+	  Popescu)
+	* Russian translation updated (Антон Самохвалов)
+	* Slovak translation updated (loptosko)
+	* Slovenian translation updated (Martin Srebotnjak)
+	* Spanish translation updated (Javier Fernández-Sanguino)
+	* Swahili translation added (Paul Msegeya)
+	* Swedish translation updated (Peter Hjalmarsson)
+
+version 2.5.9
+	* No changes
+
+version 2.5.8
+	* No changes
+
+version 2.5.7
+	* No changes
+
+version 2.5.6
+	* German translation updated (Björn Vogt)
 
 version 2.5.5
 	* Afrikaans translation updated (Friedel Wolff)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b221f12ced..8eabf1a6bc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,7 @@ finch/gntconv.c
 finch/gntdebug.c
 finch/gntft.c
 finch/gntlog.c
+finch/gntmedia.c
 finch/gntnotify.c
 finch/gntplugin.c
 finch/gntpounce.c
@@ -36,6 +37,7 @@ finch/plugins/gntgf.c
 finch/plugins/gnthistory.c
 finch/plugins/grouping.c
 finch/plugins/lastlog.c
+finch/plugins/gnttinyurl.c
 libpurple/account.c
 libpurple/blist.c
 libpurple/certificate.c
@@ -48,6 +50,7 @@ libpurple/dnsquery.c
 libpurple/ft.c
 libpurple/gconf/purple.schemas.in
 libpurple/log.c
+libpurple/mediamanager.c
 libpurple/plugin.c
 libpurple/plugins/autoaccept.c
 libpurple/plugins/buddynote.c
@@ -62,6 +65,7 @@ libpurple/plugins/log_reader.c
 libpurple/plugins/mono/loader/mono.c
 libpurple/plugins/newline.c
 libpurple/plugins/offlinemsg.c
+libpurple/plugins/one_time_password.c
 libpurple/plugins/perl/perl.c
 libpurple/plugins/psychic.c
 libpurple/plugins/signals-test.c
@@ -83,6 +87,7 @@ libpurple/protocols/irc/msgs.c
 libpurple/protocols/irc/parse.c
 libpurple/protocols/jabber/adhoccommands.c
 libpurple/protocols/jabber/auth.c
+libpurple/protocols/jabber/bosh.c
 libpurple/protocols/jabber/buddy.c
 libpurple/protocols/jabber/chat.c
 libpurple/protocols/jabber/jabber.c
@@ -99,12 +104,14 @@ libpurple/protocols/msn/contact.c
 libpurple/protocols/msn/dialog.c
 libpurple/protocols/msn/error.c
 libpurple/protocols/msn/group.h
+libpurple/protocols/msn/msg.c
 libpurple/protocols/msn/msn.c
 libpurple/protocols/msn/nexus.c
 libpurple/protocols/msn/notification.c
 libpurple/protocols/msn/oim.c
 libpurple/protocols/msn/servconn.c
 libpurple/protocols/msn/session.c
+libpurple/protocols/msn/slp.c
 libpurple/protocols/msn/state.c
 libpurple/protocols/msn/switchboard.c
 libpurple/protocols/msn/userlist.c
@@ -123,6 +130,7 @@ libpurple/protocols/myspace/user.c
 libpurple/protocols/myspace/zap.c
 libpurple/protocols/novell/nmuser.c
 libpurple/protocols/novell/novell.c
+libpurple/protocols/oscar/clientlogin.c
 libpurple/protocols/oscar/family_chatnav.c
 libpurple/protocols/oscar/flap_connection.c
 libpurple/protocols/oscar/libaim.c
@@ -165,8 +173,10 @@ libpurple/protocols/silc10/silc.c
 libpurple/protocols/silc10/util.c
 libpurple/protocols/silc10/wb.c
 libpurple/protocols/simple/simple.c
-libpurple/protocols/toc/toc.c
-libpurple/protocols/yahoo/yahoo.c
+libpurple/protocols/yahoo/libyahoo.c
+libpurple/protocols/yahoo/libyahoojp.c
+libpurple/protocols/yahoo/libymsg.c
+libpurple/protocols/yahoo/yahoo_aliases.c
 libpurple/protocols/yahoo/yahoo_doodle.c
 libpurple/protocols/yahoo/yahoo_filexfer.c
 libpurple/protocols/yahoo/yahoo_packet.c
@@ -189,6 +199,7 @@ pidgin.desktop.in
 pidgin/eggtrayicon.c
 pidgin/gtkaccount.c
 pidgin/gtkblist.c
+pidgin/gtkblist-theme.c
 pidgin/gtkcellview.c
 pidgin/gtkcertmgr.c
 pidgin/gtkconn.c
@@ -202,6 +213,7 @@ pidgin/gtkimhtml.c
 pidgin/gtkimhtmltoolbar.c
 pidgin/gtklog.c
 pidgin/gtkmain.c
+pidgin/gtkmedia.c
 pidgin/gtknotify.c
 pidgin/gtkplugin.c
 pidgin/gtkpounce.c
@@ -223,6 +235,8 @@ pidgin/pixmaps/emotes/default/24/default.theme.in
 pidgin/pixmaps/emotes/none/none.theme.in
 pidgin/pixmaps/emotes/small/16/small.theme.in
 pidgin/plugins/cap/cap.c
+pidgin/plugins/disco/gtkdisco.c
+pidgin/plugins/disco/xmppdisco.c
 pidgin/plugins/contact_priority.c
 pidgin/plugins/convcolors.c
 pidgin/plugins/extplacement.c
@@ -247,6 +261,8 @@ pidgin/plugins/raw.c
 pidgin/plugins/relnot.c
 pidgin/plugins/sendbutton.c
 pidgin/plugins/spellchk.c
+pidgin/plugins/themeedit-icon.c
+pidgin/plugins/themeedit.c
 pidgin/plugins/ticker/ticker.c
 pidgin/plugins/timestamp.c
 pidgin/plugins/timestamp_format.c
diff --git a/po/af.po b/po/af.po
index fcb7076520..84275d58e4 100644
--- a/po/af.po
+++ b/po/af.po
@@ -1,15 +1,14 @@
 # Afrikaans translations for pidgin
 # Copyright (C) 2006-2008
 # This file is distributed under the same license as the pidgin package.
-# Friedel Wolff <friedel BY translate.org.za>, 2006-2008.
 # Samuel Murray <afrikaans BY gmail.com>, 2007
-# F Wolff <friedel@translate.org.za>, 2009
+# F Wolff <friedel@translate.org.za>, 2006-2009
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-27 10:14-0800\n"
-"PO-Revision-Date: 2009-02-23 19:54+0200\n"
+"POT-Creation-Date: 2009-07-28 19:30-0700\n"
+"PO-Revision-Date: 2009-07-28 22:48+0200\n"
 "Last-Translator: F Wolff <friedel@translate.org.za>\n"
 "Language-Team: translate-discuss-af@lists.sourceforge.net\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.3.1\n"
+"X-Generator: Virtaal 0.4.0-rc1\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -613,19 +612,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Stuur na"
 
-msgid "Invite message"
-msgstr "Uitnodigingsboodskap"
-
-msgid "Invite"
-msgstr "Nooi uit"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Tik gerus die naam van die gebruiker om uit te nooi,\n"
-"saam met 'n opsionele uitnodigingsboodskap."
-
 msgid "Conversation"
 msgstr "Gesprek"
 
@@ -882,6 +868,39 @@ msgstr "Alle gesprekke"
 msgid "System Log"
 msgstr "Stelselstaaflêer"
 
+msgid "Calling ... "
+msgstr "Bel tans ... "
+
+msgid "Hangup"
+msgstr "Sit neer"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Aanvaar"
+
+msgid "Reject"
+msgstr "Weier"
+
+msgid "Call in progress."
+msgstr "Oproep onderweg."
+
+msgid "The call has been terminated."
+msgstr "Die oproep is beëindig."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s wil 'n oudiosessie met u begin."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s probeer om 'n niegesteunde mediasessietipe met u te begin."
+
+msgid "You have rejected the call."
+msgstr "U het die oproep geweier."
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "E-posse"
 
@@ -916,6 +935,9 @@ msgstr "Gaan voort"
 msgid "IM"
 msgstr "Kitsboodskap"
 
+msgid "Invite"
+msgstr "Nooi uit"
+
 msgid "(none)"
 msgstr "(geen)"
 
@@ -1119,7 +1141,6 @@ msgstr "%s het weggegaan. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s het u 'n boodskap gestuur. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Onbekende vriendwag-gebeurtenis. Rapporteer dit, asseblief!"
 
@@ -1530,6 +1551,31 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Laastestaaf-inprop."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Kry tans TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Skep 'n TinyURL slegs vir URL'e van dié lengte of langer"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (of ander) adresvoorvoegsel"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL-inprop"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"By ontvangs van 'n boodskap met URL(e), gebruik TinyURL vir makliker "
+"kopiëring"
+
 msgid "accounts"
 msgstr "rekeninge"
 
@@ -1630,13 +1676,6 @@ msgstr "Aanvaar sertifikaat vir %s?"
 msgid "SSL Certificate Verification"
 msgstr "SSL-sertifikaatverifikasie"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Aanvaar"
-
-msgid "Reject"
-msgstr "Weier"
-
 msgid "_View Certificate..."
 msgstr "_Bekyk sertifikaat..."
 
@@ -1650,6 +1689,7 @@ msgstr ""
 "Die sertifikaat wat voorgelê word deur \"%s\", is selfonderteken. Dit kan "
 "nie outomaties gekontroleer word nie."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Die sertifikaatketting wat vir %s voorgelê word, is nie geldig nie."
@@ -1659,6 +1699,7 @@ msgstr "Die sertifikaatketting wat vir %s voorgelê word, is nie geldig nie."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL-sertifikaatfout"
 
@@ -1741,6 +1782,7 @@ msgstr "+++ %s het aangemeld"
 msgid "+++ %s signed off"
 msgstr "+++ %s het afgemeld"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -1787,6 +1829,17 @@ msgstr "%s het die kamer verlaat."
 msgid "%s left the room (%s)."
 msgstr "%s het die kamer verlaat (%s)."
 
+msgid "Invite to chat"
+msgstr "Nooi na geselsie"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Tik gerus die naam van die gebruiker om uit te nooi, saam met 'n opsionele "
+"uitnodigingsboodskap."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kry van verbinding het misluk: %s"
@@ -1919,6 +1972,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Begin nou met oordrag van %s vanaf %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Oordrag van lêer <A HREF=\"file://%s\">%s</A> voltooi"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Oordrag van lêer %s voltooi"
 
@@ -2139,6 +2196,9 @@ msgstr "<font color=\"red\"><b>Kon nie lêer lees nie: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Fout met skep van konferensie."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "U gebruik tans %s, maar hierdie inprop vereis %s."
@@ -2539,17 +2599,17 @@ msgstr "Sluit ander kitsboodskappers se staaflêers in in die staaflêerleser."
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Wanneer staaflêers bekyk word, sal hierdie inprop staaflêers uit ander "
-"kitsboodskappers insluit. Dit sluit tans Adium, MSN Messenger en Trillian "
-"in.\n"
+"kitsboodskappers insluit. Dit sluit tans Adium, MSN Messenger, aMSN en "
+"Trillian in.\n"
 "\n"
-"LET WEL: Hierdie inprop is nog in alfakode en kan dalk gereeld omval.  "
-"Gebruik op eie risiko!"
+"LET WEL: Hierdie inprop is nog alfakode en kan dalk gereeld omval.  Gebruik "
+"op eie risiko!"
 
 msgid "Mono Plugin Loader"
 msgstr "Laaier vir Mono-inproppe"
@@ -2595,10 +2655,10 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "Stoor boodskappe gestuur aan 'n vanlynvriend as 'n vriendwag."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Die res van die boodskappe sal as 'n vriendwag gestoor word. Dié wag kan "
+"Die res van die boodskappe sal as vriendwagte gestoor word. Dié wagte kan "
 "gewysig/verwyder word vanuit die `Vriendwag'-dialoog."
 
 #, c-format
@@ -2627,6 +2687,31 @@ msgstr "Stoor vanlyn boodskappe in vriendwag"
 msgid "Do not ask. Always save in pounce."
 msgstr "Moenie vra nie. Stoor altyd in vriendwag."
 
+msgid "One Time Password"
+msgstr "Eenmalige wagwoord"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Steun vir eenmalige wagwoorde"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2820,14 +2905,14 @@ msgstr ""
 "gebruik, installeerActiveTCL vanaf http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Die Apple Bonjour For Windows-nutspak kon nie gevind word nie; kyk kwelvrae "
-"by: http://d.pidgin.im/wiki/BonjourWindows vir meer inligting."
+"Kan nie Apple se \"Bonjour vir Windows\"-nutspak vind nie; sien http://d."
+"pidgin.im/wiki/BonjourWindows vir meer inligting."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Kon nie vir inkomende kitsboodskap-verbindings luister nie\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Kan nie vir inkomende kitsboodskap-verbindings luister nie"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2867,7 +2952,6 @@ msgid "Purple Person"
 msgstr "Pers persoon"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
 msgstr "Plaaslike poort"
 
@@ -2881,14 +2965,17 @@ msgstr "%s het die gesprek afgesluit."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kon nie die boodskap stuur nie, die gesprek kon nie begin word nie."
 
-msgid "Cannot open socket"
-msgstr "Kan nie sok open nie"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Kan nie sok skep nie: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Kon nie sok aan poort verbind nie"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Kan nie sok aan poort verbind nie: %s"
 
-msgid "Could not listen on socket"
-msgstr "Kon nie op sok luister nie"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Kan nie op sok luister nie: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Kon nie met plaaslike mDNSResponder kommunikeer nie."
@@ -2937,14 +3024,15 @@ msgstr "Stoor vriendelys..."
 msgid "Load buddylist from file..."
 msgstr "Laai vriendelys van lêer..."
 
-msgid "Fill in the registration fields."
-msgstr "Vul die registrasievelde in."
+msgid "You must fill in all registration fields"
+msgstr "Alle registrasievelde moet ingevul word"
 
-msgid "Passwords do not match."
-msgstr "Wagwoorde stem nie ooreen nie."
+msgid "Passwords do not match"
+msgstr "Wagwoorde stem nie ooreen nie"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Kan nie nuwe rekening registreer nie. 'n Fout het voorgekom.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+"Kan nie nuwe rekening registreer nie.  'n Onbekende fout het voorgekom."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nuwe Gadu-Gadu-rekening geregistreer"
@@ -2955,14 +3043,14 @@ msgstr "Registrasie suksesvol voltooi!"
 msgid "Password"
 msgstr "Wagwoord"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Wagwoord (weer)"
 
-msgid "Enter current token"
-msgstr "Tik huidige teken"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Huidige teken"
+msgid "Captcha"
+msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registreer nuwe Gadu-Gadu-rekening"
@@ -3015,6 +3103,15 @@ msgstr "Wagwoord is suksesvol verander!"
 msgid "Current password"
 msgstr "Huidige wagwoord"
 
+msgid "Password (retype)"
+msgstr "Wagwoord (weer)"
+
+msgid "Enter current token"
+msgstr "Tik huidige teken"
+
+msgid "Current token"
+msgstr "Huidige teken"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Tik gerus u huidige wagwoord en u nuwe wagwoord vir UIN: "
 
@@ -3028,6 +3125,7 @@ msgstr "Kies 'n geselsie vir vriend: %s"
 msgid "Add to chat..."
 msgstr "Voeg by geselsie..."
 
+#. Global
 msgid "Available"
 msgstr "Beskikbaar"
 
@@ -3061,8 +3159,8 @@ msgstr "Geen passende gebruikers gevind nie"
 msgid "There are no users matching your search criteria."
 msgstr "Daar is geen gebruikers wat by u soekkriteria pas nie."
 
-msgid "Unable to read socket"
-msgstr "Kan nie sok lees nie"
+msgid "Unable to read from socket"
+msgstr "Kan nie van sok lees nie"
 
 msgid "Buddy list downloaded"
 msgstr "Vriendelys afgelaai"
@@ -3076,8 +3174,14 @@ msgstr "Vriendelys opgelaai"
 msgid "Your buddy list was stored on the server."
 msgstr "U vriendelys is na die bediener opgelaai."
 
-msgid "Connection failed."
-msgstr "Verbinding het misluk."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Koppel"
+
+msgid "Connection failed"
+msgstr "Verbinding het misluk"
 
 msgid "Add to chat"
 msgstr "Voeg by geselsie"
@@ -3085,14 +3189,23 @@ msgstr "Voeg by geselsie"
 msgid "Chat _name:"
 msgstr "Geselsie_naam:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Kon nie gasheernaam '%s' vasstel nie: %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Koppel tans"
+
 msgid "Chat error"
 msgstr "Geselsiefout"
 
 msgid "This chat name is already in use"
 msgstr "Hierdie geselsienaam word reeds gebruik"
 
-msgid "Not connected to the server."
-msgstr "Nie aan die bediener koppel nie."
+msgid "Not connected to the server"
+msgstr "Nie aan die bediener gekoppel nie"
 
 msgid "Find buddies..."
 msgstr "Vind vriende..."
@@ -3133,6 +3246,9 @@ msgstr "Gewilde Poolse stelsel vir kitsboodskappe"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-gebruiker"
 
+msgid "GG server"
+msgstr "GG-bediener"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Onbekende bevel: %s"
@@ -3147,8 +3263,8 @@ msgstr "Geen onderwerp gestel nie"
 msgid "File Transfer Failed"
 msgstr "Lêeroordrag het misluk"
 
-msgid "Could not open a listening port."
-msgstr "Kon nie 'n luisterpoort open nie."
+msgid "Unable to open a listening port."
+msgstr "Kan nie 'n luisterpoort open nie."
 
 msgid "Error displaying MOTD"
 msgstr "Kon nie dagboodskap wys nie"
@@ -3163,8 +3279,16 @@ msgstr "Daar is geen dagboodskap met hierdie verbinding geassosieer nie."
 msgid "MOTD for %s"
 msgstr "Dagboodskap vir %s"
 
-msgid "Server has disconnected"
-msgstr "Bediener is ontkoppel"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Verbinding met bediener verloor: %s"
 
 msgid "View MOTD"
 msgstr "Bekyk dagboodskap"
@@ -3175,25 +3299,23 @@ msgstr "_Kanaal:"
 msgid "_Password:"
 msgstr "_Wagwoord:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC-byname kan nie spasies bevat nie"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Koppel tans"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC-bynaam en bediener mag nie spasies bevat nie"
 
 msgid "SSL support unavailable"
 msgstr "SSL-steun nie beskikbaar nie"
 
-msgid "Couldn't create socket"
-msgstr "Kon nie netwerksok skep nie"
+msgid "Unable to connect"
+msgstr "Kon nie koppel nie"
 
-msgid "Couldn't connect to host"
-msgstr "Kon nie aan gasheer koppel nie"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Kan nie koppel nie: %s"
 
-msgid "Read error"
-msgstr "Leesfout"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Bediener het die verbinding toegemaak"
 
 msgid "Users"
 msgstr "Gebruikers"
@@ -3249,7 +3371,7 @@ msgstr "Ban op %s deur %s, %s sekondes gelede gestel"
 
 #, c-format
 msgid "Ban on %s"
-msgstr "Kan nie by %s aansluit nie:"
+msgstr "Ban op %s"
 
 msgid "End of ban list"
 msgstr "Einde van banlys"
@@ -3374,6 +3496,16 @@ msgstr ""
 "U gekose rekeningnaam is geweier deur die bediener.  Dit bevat waarskynlik "
 "ongeldige karakters."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Die bynaam \"%s\" is reeds in gebruik."
+
+msgid "Nickname in use"
+msgstr "Bynaam in gebruik"
+
 msgid "Cannot change nick"
 msgstr "Kan nie bynaam verander nie"
 
@@ -3613,11 +3745,10 @@ msgstr "Ad hoc-bevel het misluk"
 msgid "execute"
 msgstr "uitvoer"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"Bediener vereis TLS/SSL vir aanmelding.  Geen TLS/SSL-steun gevind nie."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Bediener vereis TLS/SSL, maar geen TLS/SSL-steun is gevind nie."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "U vereis enkripsie, maar geen TLS/SSL-steun is gevind nie."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3634,17 +3765,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Skoonteksstawing"
 
-msgid "Invalid response from server."
-msgstr "Ongeldige respons van die bediener."
+msgid "SASL authentication failed"
+msgstr "SASL-stawing het misluk"
+
+msgid "Invalid response from server"
+msgstr "Ongeldige respons van die bediener"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Bediener gebruik nie enige gesteunde stawingmetode nie"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "U vereis enkripsie, maar dis nie op hierdie bediener beskikbaar nie."
+
 msgid "Invalid challenge from server"
 msgstr "Ongeldige uitdaging vanaf bediener"
 
-msgid "SASL error"
-msgstr "SASL-fout"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL-fout: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "Die BOSH-verbindingbestuurder het u sessie beëindig."
+
+msgid "No session ID given"
+msgstr "Geen sessie-ID is gegee nie"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Niegesteunde weergawe van die BOSH-protokol"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Kan nie 'n verbinding met die bediener bewerkstellig nie"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Kan nie 'n verbinding met die bediener bewerkstellig nie: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Kan nie SSL-verbinding bewerkstellig nie"
 
 msgid "Full Name"
 msgstr "Volle name"
@@ -3712,158 +3869,8 @@ msgstr "Kliënt"
 msgid "Operating System"
 msgstr "Bedryfstelsel"
 
-msgid "Last Activity"
-msgstr "Vorige aktiwiteit"
-
-msgid "Service Discovery Info"
-msgstr "Diensbespeuring-inligting"
-
-msgid "Service Discovery Items"
-msgstr "Diensbespeuring-items"
-
-msgid "Extended Stanza Addressing"
-msgstr "Uitgebreide stanza-adressering"
-
-msgid "Multi-User Chat"
-msgstr "Veelgebruiker-geselsies"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Inligting oor verlengde teenwoordigheid van veelgebruiker-geselsies"
-
-msgid "In-Band Bytestreams"
-msgstr "Inband-greepstrome"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad hoc-bevele"
-
-msgid "PubSub Service"
-msgstr "PubSub-diens"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5-greepstrome"
-
-msgid "Out of Band Data"
-msgstr "Te min banddata"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Inband-registrasie"
-
-msgid "User Location"
-msgstr "Gebruikerligging"
-
-msgid "User Avatar"
-msgstr "Gebruikeravatar"
-
-msgid "Chat State Notifications"
-msgstr "Geselsiestatuskennisgewing"
-
-msgid "Software Version"
-msgstr "Sagtewareweergawe"
-
-msgid "Stream Initiation"
-msgstr "Stroominisiasie"
-
-msgid "File Transfer"
-msgstr "Lêeroordrag"
-
-msgid "User Mood"
-msgstr "Gebruikerstemming"
-
-msgid "User Activity"
-msgstr "Gebruikeraktiwiteit"
-
-msgid "Entity Capabilities"
-msgstr "Entiteitvermoëns"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Geënkripteerde sessieonderhandelings"
-
-msgid "User Tune"
-msgstr "Gebruikerdeuntjie"
-
-msgid "Roster Item Exchange"
-msgstr "Roosteritem-ruiling"
-
-msgid "Reachability Address"
-msgstr "Bereikbaarheid-adres"
-
-msgid "User Profile"
-msgstr "Gebruikerprofiel"
-
-msgid "Jingle"
-msgstr "Kenwysie"
-
-msgid "Jingle Audio"
-msgstr "Kenwysie-klank"
-
-msgid "User Nickname"
-msgstr "Gebruiker se bynaam"
-
-msgid "Jingle ICE UDP"
-msgstr "Kenwysie ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Kenwysie ICE TPC"
-
-msgid "Jingle Raw UDP"
-msgstr "Kenwysie rou UDP"
-
-msgid "Jingle Video"
-msgstr "Kenwysievideo"
-
-msgid "Jingle DTMF"
-msgstr "Kenwysie DTMF"
-
-msgid "Message Receipts"
-msgstr "Boodskap-ontvangste"
-
-msgid "Public Key Publishing"
-msgstr "Publiekesleutel-publisering"
-
-msgid "User Chatting"
-msgstr "Gebruikergeselsery"
-
-msgid "User Browsing"
-msgstr "Gebruikerblaaiery"
-
-msgid "User Gaming"
-msgstr "Gebruikerspelery"
-
-msgid "User Viewing"
-msgstr "Gebruikerbekyking"
-
-msgid "Ping"
-msgstr "Pieng"
-
-msgid "Stanza Encryption"
-msgstr "Stanzaenkriptering"
-
-msgid "Entity Time"
-msgstr "Entiteittyd"
-
-msgid "Delayed Delivery"
-msgstr "Vertraagde lewering"
-
-msgid "Collaborative Data Objects"
-msgstr "Samewerkende dataobjekte"
-
-msgid "File Repository and Sharing"
-msgstr "Lêerbewaarplek en deling"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-diensbespeuring vir kenwysie"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Vereenvoudigde onderhandeling vir geënkripteerde sessies"
-
-msgid "Hop Check"
-msgstr "Hop-kontrole"
-
-msgid "Capabilities"
-msgstr "Vermoëns"
+msgid "Local Time"
+msgstr "Plaaslike tyd"
 
 msgid "Priority"
 msgstr "Prioriteit"
@@ -3871,6 +3878,13 @@ msgstr "Prioriteit"
 msgid "Resource"
 msgstr "Hulpbron"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s gelede"
+
+msgid "Logged Off"
+msgstr "Afgemeld"
+
 msgid "Middle Name"
 msgstr "Tweede naam"
 
@@ -4037,28 +4051,24 @@ msgstr "Kies 'n konferensiebediener om te vra"
 msgid "Find Rooms"
 msgstr "Vind kamers"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "U vereis enkripsie, maar dis nie op hierdie bediener beskikbaar nie."
+msgid "Affiliations:"
+msgstr "Affiliasies:"
 
-msgid "Write error"
-msgstr "Skryffout"
+msgid "No users found"
+msgstr "Geen gebruikers gevind nie"
 
-msgid "Ping timeout"
-msgstr "Pieng-uittelling"
+msgid "Roles:"
+msgstr "Rolle:"
 
-msgid "Read Error"
-msgstr "Leesfout"
+msgid "Ping timed out"
+msgstr "Pieng het uitgetel"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Kon nie 'n verbinding met die bediener bewerkstellig nie:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Kan nie sok skep nie"
+"Kan nie alternatiewe metodes vind vir XMPP-verbinding nadat direkte "
+"verbinding gefaal het nie."
 
 msgid "Invalid XMPP ID"
 msgstr "Ongeldige XMPP-ID"
@@ -4066,6 +4076,9 @@ msgstr "Ongeldige XMPP-ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ongeldige XMPP-ID. Domein moet ingestel word."
 
+msgid "Malformed BOSH URL"
+msgstr "Wanvormde BOSH-URL"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrasie van %s@%s suksesvol"
@@ -4090,9 +4103,6 @@ msgstr "Deregistrasie suksesvol"
 msgid "Unregistration Failed"
 msgstr "Deregistrasie het misluk"
 
-msgid "Already Registered"
-msgstr "Reeds geregistreer"
-
 msgid "State"
 msgstr "Staat"
 
@@ -4105,6 +4115,9 @@ msgstr "Foon"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Reeds geregistreer"
+
 msgid "Unregister"
 msgstr "Deregistreer"
 
@@ -4158,6 +4171,12 @@ msgstr "Bediener ondersteun nie blokkering nie"
 msgid "Not Authorized"
 msgstr "Nie gemagtig nie"
 
+msgid "Mood"
+msgstr "Stemming"
+
+msgid "Now Listening"
+msgstr "Luister tans"
+
 msgid "Both"
 msgstr "Beide"
 
@@ -4179,12 +4198,6 @@ msgstr "Geen"
 msgid "Subscription"
 msgstr "Inskrywing"
 
-msgid "Mood"
-msgstr "Stemming"
-
-msgid "Now Listening"
-msgstr "Luister tans"
-
 msgid "Mood Text"
 msgstr "Stemmingteks"
 
@@ -4227,9 +4240,6 @@ msgstr "U wagwoord is verander."
 msgid "Error changing password"
 msgstr "Kon nie wagwoord verander nie"
 
-msgid "Password (again)"
-msgstr "Wagwoord (weer)"
-
 msgid "Change XMPP Password"
 msgstr "Verander XMPP-wagwoord"
 
@@ -4423,18 +4433,24 @@ msgid "Unable to ping user %s"
 msgstr "Kan nie gebruiker %s pieng nie"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
-"Kon nie zoempie stuur nie omdat daar niks oor gebruiker %s bekend is nie."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Kan nie zoempie stuur nie omdat daar niks oor %s bekend is nie."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "Kon nie zoempie stuur nie omdat gebruiker %s dalk vanlyn is."
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Kan nie zoempie stuur nie omdat %s dalk vanlyn is."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
-"Kon nie zoempie stuur nie omdat die gebruiker %s dit nie ondersteun nie."
+"Kan nie zoempie stuur nie omdat %s dit nie ondersteun nie of nie nou zoepies "
+"wil ontvang nie."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Stuur zoempie aan %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4446,8 +4462,33 @@ msgid "%s has buzzed you!"
 msgstr "%s het u 'n zoempie gestuur!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Stuur zoempie aan %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Kan nie media inisieer met %s nie: ongeldige JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Kan nie media inisieer met %s nie: gebruiker is nie aanlyn nie"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Kan nie media inisieer met %s nie: nie by gebruikerteenwoordigheid ingeteken "
+"nie"
+
+msgid "Media Initiation Failed"
+msgstr "Mediainisialisering het misluk"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Kies gerus die hulpbron van %s waarmee u 'n mediasessie wil begin."
+
+msgid "Select a Resource"
+msgstr "Kies 'n hulpbron"
+
+msgid "Initiate Media"
+msgstr "Inisieer media"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfigureer 'n geselsiekamer."
@@ -4468,18 +4509,19 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;gebruiker&gt; [rede]:  Verban 'n gebruiker uit die kamer."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;gebruiker&gt; &lt;eienaar|admin|lid|verworpene|geen&gt;: Stel "
-"'n gebruiker se affiliasie met die kamer in."
+"affiliate &lt;eienaar|admin|lid|verworpene|geen&gt; [bynaam1] [bynaam2] ...: "
+"Kry die gebruikers met 'n affiliasie of stel gebruikers se affiliasie met "
+"die kamer in."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;gebruiker&gt; &lt;moderator|deelnemer|besoeker|geen&gt;: Stel 'n "
-"gebruiker se rol in die kamer in."
+"role &lt;moderator|deelnemer|besoeker|geen&gt; [bynaam1] [bynaam2] ...: Kry "
+"die gebruikers met 'n rol of stel gebruikers se rol in die kamer in."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
@@ -4543,6 +4585,9 @@ msgstr "Koppel bediener"
 msgid "File transfer proxies"
 msgstr "Lêeroordraginstaanbediener"
 
+msgid "BOSH URL"
+msgstr "BOSH-URL"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4581,6 +4626,14 @@ msgstr "XML-ontleedfout"
 msgid "Unknown Error in presence"
 msgstr "Onbekende fout in teenwoordigheid"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Kon nie by geselsie %s aansluit nie"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Fout in geselsie %s"
+
 msgid "Create New Room"
 msgstr "Skep nuwe kamer"
 
@@ -4596,13 +4649,29 @@ msgstr "_Stel kamer op"
 msgid "_Accept Defaults"
 msgstr "_Aanvaar verstek"
 
+msgid "No reason"
+msgstr "Geen rede nie"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Kon nie by geselsie %s aansluit nie"
+msgid "You have been kicked: (%s)"
+msgstr "U is geskop: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Fout in geselsie %s"
+msgid "Kicked (%s)"
+msgstr "Geskop (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Kon nie die lêer open nie."
+
+msgid "Transfer was closed."
+msgstr "Oordrag is gesluit."
+
+msgid "Failed to open the file"
+msgstr "Kon nie die lêer open nie"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4628,9 +4697,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Kies gerus aan watter hulpbron van %s u 'n lêer wil stuur"
 
-msgid "Select a Resource"
-msgstr "Kies 'n hulpbron"
-
 msgid "Edit User Mood"
 msgstr "Redigeer gebruikerstemming"
 
@@ -4927,6 +4993,29 @@ msgstr "Ander kontakte"
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s het 'n stemopname gestuur. <a href='audio://%s'>Klik hier om dit te "
+"speel</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s het 'n stemopname gestuur, maar dit kon nie gestoor word nie"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s het 'n stemgesels-uitnodiging gestuur, wat nog nie ondersteun word nie."
+
 msgid "Nudge"
 msgstr "Stootjie"
 
@@ -5078,8 +5167,28 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "SSL-steun is nodig vir MSN. Installeer gerus 'n gesteunde SSL-programmateek."
 
-msgid "Failed to connect to server."
-msgstr "Verbind aan bediener het misluk."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Kon nie die vriend %s byvoeg nie omdat die gebruikernaam ongeldig is.  'n "
+"Gebruikernaam moet 'n geldige e-posadres wees."
+
+msgid "Unable to Add"
+msgstr "Kan nie byvoeg nie"
+
+msgid "Authorization Request Message:"
+msgstr "Magtigingversoek:"
+
+msgid "Please authorize me!"
+msgstr "Magtig my asseblief!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "Regs_o"
 
 msgid "Error retrieving profile"
 msgstr "Kon nie profiel haal nie"
@@ -5270,63 +5379,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live-ID-stawing: Ongeldige antwoord"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s is nie 'n geldige groep nie."
-
-msgid "Unknown error."
-msgstr "Onbekende fout."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s op %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s het u so pas 'n stootjie gestuur!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Onbekende fout (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Onbekende fout (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Kan nie gebruiker byvoeg nie"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Die volgende gebruikers is nie in die adresboek nie."
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kan nie gebruiker by %s byvoeg nie (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Kan nie gebruiker op %s blokkeer nie (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Kan nie gebruiker op %s toelaat nie (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s kon nie bygevoeg word nie omdat u vriendelys vol is."
-
+#. Unknown error!
 #, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is nie 'n geldige paspoortrekening nie."
+msgid "Unknown error (%d)"
+msgstr "Onbekende fout (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Diens tydelik nie beskikbaar nie."
+msgid "The following users are missing from your addressbook"
+msgstr "Die volgende gebruikers is nie in die adresboek nie"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiele boodskap is nie gestuur nie omdat dit te lank was."
 
-msgid "Unable to rename group"
-msgstr "Kan nie groep hernoem nie"
-
-msgid "Unable to delete group"
-msgstr "Kan nie groep uitvee nie"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5370,9 +5443,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Boodskap is nie gestuur nie omdat 'n onbekende fout voorgekom het."
 
-msgid "Unable to connect"
-msgstr "Kon nie koppel nie"
-
 msgid "Writing error"
 msgstr "Skryffout"
 
@@ -5387,21 +5457,21 @@ msgstr ""
 "Verbindingfout vanaf %s bediener:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Ons protokol word nie deur die bediener ondersteun nie."
+msgid "Our protocol is not supported by the server"
+msgstr "Ons protokol word nie deur die bediener ondersteun nie"
 
-msgid "Error parsing HTTP."
-msgstr "Kon nie HTTP ontleed nie."
+msgid "Error parsing HTTP"
+msgstr "Kon nie HTTP ontleed nie"
 
-msgid "You have signed on from another location."
-msgstr "U het van 'n ander plek aangemeld."
+msgid "You have signed on from another location"
+msgstr "U het van 'n ander plek aangemeld"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Die MSN-bedieners is tydelik nie beskikbaar nie. Wag gerus en probeer weer."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "Die MSN-bedieners sal tydelik afskakel."
+msgid "The MSN servers are going down temporarily"
+msgstr "Die MSN-bedieners gaan tydelik afskakel"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5430,6 +5500,15 @@ msgstr "Stuur tans koekie"
 msgid "Retrieving buddy list"
 msgstr "Kry tans vriendelys"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s vra om u webkamera te sien, wat nog nie ondersteun word nie."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s het u 'n webkamera-uitnodiging gestuur, wat nog nie ondersteun word nie."
+
 msgid "Away From Computer"
 msgstr "Weg van rekenaar"
 
@@ -5473,14 +5552,6 @@ msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Boodskap is dalk nie gestuur nie omdat 'n onbekende fout voorgekom het:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s het u by sy of haar vriendelys gevoeg."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s het u van sy of haar vriendelys verwyder."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Skrap vriend uit adresboek?"
 
@@ -5510,6 +5581,54 @@ msgid "MSN Protocol Plugin"
 msgstr "MSN-protokolinprop"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s is nie 'n geldige groep nie."
+
+msgid "Unknown error."
+msgstr "Onbekende fout."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s op %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kan nie gebruiker by %s byvoeg nie (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Kan nie gebruiker op %s blokkeer nie (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Kan nie gebruiker op %s toelaat nie (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s kon nie bygevoeg word nie omdat u vriendelys vol is."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is nie 'n geldige paspoortrekening nie."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Diens tydelik nie beskikbaar nie."
+
+msgid "Unable to rename group"
+msgstr "Kan nie groep hernoem nie"
+
+msgid "Unable to delete group"
+msgstr "Kan nie groep uitvee nie"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s het u by sy of haar vriendelys gevoeg."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s het u van sy of haar vriendelys verwyder."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Geen so 'n gebruiker nie: %s"
 
@@ -5538,6 +5657,8 @@ msgid "Lost connection with server"
 msgstr "Verbinding met bediener verloor"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nuwe posboodskappe"
 
@@ -5576,26 +5697,22 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Voeg kontakte van bediener by"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Koppel"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokolfout, kode %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s U wagwoord is %d karakters, meer as die verwagte maksimum lengte van %d "
-"vir MySpaceIM. Maak u wagwoord korter by http://profileedit.myspace.com/"
-"index.cfm?fuseaction=accountSettings.changePassword en probeer weer."
+"%s U wagwoord is %zu karakters; meer as die verwagte maksimum lengte van %"
+"d.  Maak u wagwoord korter by http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings.changePassword en probeer weer."
+
+msgid "Incorrect username or password"
+msgstr "Verkeerde gebruikernaam of wagwoord"
 
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-fout"
@@ -5603,16 +5720,6 @@ msgstr "MySpaceIM-fout"
 msgid "Invalid input condition"
 msgstr "Ongeldige toevoertoestand"
 
-msgid "Read buffer full (2)"
-msgstr "Leesbuffer vol (2)"
-
-msgid "Unparseable message"
-msgstr "Onontleedbare boodskap"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Kon nie aan gasheer koppel nie: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Byvoeg van vriend het misluk"
 
@@ -5698,6 +5805,15 @@ msgstr "Totale vriende"
 msgid "Client Version"
 msgstr "Kliëntweergawe"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"'n Fout het voorgekom met die poging om die gebruikernaam te stel.  Probeer "
+"asb. weer, of besoek http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username om u gebruikernaam te stel."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Gebruikernaam beskikbaar"
 
@@ -5914,9 +6030,6 @@ msgstr "Kan nie uself byvoeg nie"
 msgid "Master archive is misconfigured"
 msgstr "Meesterargief is gewankonfigureer"
 
-msgid "Incorrect username or password"
-msgstr "Verkeerde gebruikernaam of wagwoord"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Kon nie die gasheer van die gebruikernaam herken wat u getik het nie"
 
@@ -5958,8 +6071,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Onbekende fout: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Aanmelding het misluk (%s)."
+msgid "Unable to login: %s"
+msgstr "Kan nie aanmeld nie: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6063,9 +6176,6 @@ msgstr "GroupWise-konferensie %d"
 msgid "Authenticating..."
 msgstr "Staaf tans..."
 
-msgid "Unable to connect to server."
-msgstr "Kan nie aan bediener koppel nie."
-
 msgid "Waiting for response..."
 msgstr "Wag vir respons..."
 
@@ -6089,9 +6199,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Wil u by die gesprek aansluit?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "U is afgemeld omdat u by 'n ander werkstasie aangemeld het."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6100,15 +6207,12 @@ msgstr ""
 "gestuur het nie."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Kan nie aan bediener koppel nie. Tik gerus die adres van die bediener "
 "waaraan u wil koppel."
 
-msgid "Error. SSL support is not installed."
-msgstr "Fout. SSL-steun nie geïnstalleer nie."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Hierdie konferensie is gesluit. Geen verdere boodskappe kan gestuur word nie."
@@ -6132,25 +6236,32 @@ msgstr "Bedieneradres"
 msgid "Server port"
 msgstr "Bedienerpoort"
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+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 ""
+"U het nou te gereeld gekoppel en ontkoppel. Wag tien minute en probeer weer. "
+"Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Kon nie aanmeldteken aanvra nie"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Kon nie by geselsie aansluit nie"
 
 msgid "Invalid chat room name"
 msgstr "Ongeldige kletskamernaam"
 
-msgid "Server closed the connection."
-msgstr "Bediener het die verbinding toegemaak."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Verbinding met bediener verloor:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Het ongeldige data ontvang tydens verbinding met bediener."
+msgid "Received invalid data on connection with server"
+msgstr "Het ongeldige data ontvang tydens verbinding met bediener"
 
 #. *< type
 #. *< ui_requirement
@@ -6197,8 +6308,8 @@ msgstr "Verbinding met die afgeleë gebruiker verloor:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Het ongeldige data ontvang tydens verbinding met afgeleë gebruiker."
 
-msgid "Could not establish a connection with the remote user."
-msgstr "Kon nie 'n verbinding met die afgeleë gebruiker bewerkstellig nie."
+msgid "Unable to establish a connection with the remote user."
+msgstr "Kan nie 'n verbinding met die afgeleë gebruiker bewerkstellig nie."
 
 msgid "Direct IM established"
 msgstr "Direkte kitsboodskap bewerkstellig"
@@ -6398,20 +6509,12 @@ msgid "Buddy Comment"
 msgstr "Vriendkommentaar"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Kon nie aan stawingbediener koppel nie:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Kan nie aan stawingbediener koppel nie: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Kon nie aan BOS-bediener koppel nie:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Kan nie aan BOS-bediener koppel nie: %s"
 
 msgid "Username sent"
 msgstr "Gebruikernaam gestuur"
@@ -6425,51 +6528,58 @@ msgstr "Finaliseer verbinding"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Kan nie aanmeld nie: Kon nie op %s aanmeld nie omdat die skermnaam ongeldig "
-"is.  Skermname moet geldige e-posadresse wees, of met 'n letter begin en net "
+"Kan nie as %s aanmeld nie omdat die gebruikernaam ongeldig is.  "
+"Gebruikername moet geldige e-posadresse wees, of met 'n letter begin en net "
 "letters, syfers en spasies bevat, of net syfers bevat."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Ongeldige gebruikernaam."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"U kan dalk binnekort ontkoppel word.  As dit gebeur, kontroleer %s vir "
+"bywerkings."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kan nie 'n geldige AIM-aanmeldhutswaarde kry nie."
+
+msgid "Unable to get a valid login hash."
+msgstr "Kan nie geldige aanmeldhutswaarde kry nie."
 
-msgid "Incorrect password."
-msgstr "Verkeerde wagwoord."
+msgid "Received authorization"
+msgstr "Magtiging ontvang"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Gebruikernaam bestaan nie"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "U rekening is tans opgeskort."
+msgid "Your account is currently suspended"
+msgstr "U rekening is tans opgeskort"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Die AOL-kitsboodskapdiens is tydelik nie beskikbaar nie."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"U het nou te gereeld gekoppel en ontkoppel. Wag tien minute en probeer weer. "
-"Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Die kliëntweergawe wat u gebruik, is te oud. Gradeer gerus op by %s"
 
-msgid "Could Not Connect"
-msgstr "Kon nie koppel nie"
-
-msgid "Received authorization"
-msgstr "Magtiging ontvang"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"U het nou te gereeld gekoppel en ontkoppel. Wag 'n minuut en probeer weer. "
+"Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
 
-msgid "The SecurID key entered is invalid."
-msgstr "Die SecurID-sleutel wat getik is, is ongeldig."
+msgid "The SecurID key entered is invalid"
+msgstr "Die SecurID-sleutel wat getik is, is ongeldig"
 
 msgid "Enter SecurID"
 msgstr "Tik SecurID"
@@ -6477,28 +6587,6 @@ msgstr "Tik SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Tik die 6-syfer-nommer vanaf die digitale skerm."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_Regso"
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"U kan dalk binnekort ontkoppel word.  As dit gebeur, kontroleer %s vir "
-"bywerkings."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Kan nie 'n geldige AIM-aanmeldhutswaarde kry nie."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "U kan dalk binnekort ontkoppel word.  Kontroleer %s vir bywerkings."
-
-msgid "Unable to get a valid login hash."
-msgstr "Kan nie geldige aanmeldhutswaarde kry nie."
-
 msgid "Password sent"
 msgstr "Wagwoord gestuur"
 
@@ -6508,12 +6596,6 @@ msgstr "Kan nie verbinding inisialiseer nie"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Magtig my gerus sodat ek u by my vriendelys kan voeg."
 
-msgid "Authorization Request Message:"
-msgstr "Magtigingversoek:"
-
-msgid "Please authorize me!"
-msgstr "Magtig my asseblief!"
-
 msgid "No reason given."
 msgstr "Geen rede gegee nie."
 
@@ -6637,7 +6719,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "U het %hu kitsboodskap vanaf %s gemis vir 'n onbekende rede."
 msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis vir 'n onbekende rede."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan nie boodskap stuur nie: %s"
@@ -6659,6 +6741,9 @@ msgstr "Aanlyn sedert"
 msgid "Member Since"
 msgstr "Lid sedert"
 
+msgid "Capabilities"
+msgstr "Vermoëns"
+
 msgid "Profile"
 msgstr "Profiel"
 
@@ -6841,16 +6926,13 @@ msgstr "Weg-boodskap te lank."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Kon nie die vriend %s byvoeg nie omdat die skermnaam ongeldig is.  Skermname "
-"moet geldige e-posadresse wees, of met 'n letter begin en net letters, "
-"syfers en spasies bevat, of net syfers bevat."
-
-msgid "Unable to Add"
-msgstr "Kan nie byvoeg nie"
+"Kon nie die vriend %s byvoeg nie omdat die gebruikernaam ongeldig is.  "
+"Gebruikername moet geldige e-posadresse wees, of met 'n letter begin en net "
+"letters, syfers en spasies bevat, of net syfers bevat."
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "Kan nie vriendelys haal nie"
@@ -6867,18 +6949,18 @@ msgstr "Wesies"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"Kon nie die vriend %s byvoeg nie omdat u te veel vriende in u vriendelys "
+"Kan nie die vriend %s byvoeg nie omdat u te veel vriende in u vriendelys "
 "het.  Verwyder gerus een en probeer weer."
 
 msgid "(no name)"
 msgstr "(geen naam)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr "Kon nie die vriend %s byvoeg nie, om 'n onbekende rede."
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "Kan nie die vriend %s byvoeg nie, om 'n onbekende rede."
 
 #, c-format
 msgid ""
@@ -7008,6 +7090,7 @@ msgstr "_Soek"
 msgid "Set User Info (web)..."
 msgstr "Stel gebruikerinligting (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Verander wagwoord (web)"
 
@@ -7037,6 +7120,10 @@ msgstr "Soek vir vriend met e-posadres..."
 msgid "Search for Buddy by Information"
 msgstr "Soek vir vriend met inligting"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Gebruiker is nie aangemeld nie"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7227,6 +7314,38 @@ msgstr "Werk by"
 msgid "Could not change buddy information."
 msgstr "Kon nie vriendinligting verander nie."
 
+msgid "Mobile"
+msgstr "Mobiel"
+
+msgid "Note"
+msgstr "Nota"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Wysig adres"
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "Wysig"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Wysig"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Bediener besig"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u vereis magtiging"
@@ -7551,6 +7670,9 @@ msgstr "<b>Gestuur</b>: %lu<br>\n"
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<b>Vorige verfrissing</b>: %s<br>\n"
 
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7632,7 +7754,7 @@ msgid "Update interval (seconds)"
 msgstr "Opdateringsinterval(le)"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Kan nie bedienerinligting kry nie"
 
 #, c-format
@@ -7659,10 +7781,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Ongeldige teken-antwoordkode, 0x%02X"
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Kan nie bedienerinligting kry nie"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Vra %s se aandag aan..."
 
@@ -7700,22 +7818,9 @@ msgid ""
 "%s"
 msgstr "Ongeldige teken-antwoordkode, 0x%02X"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Kan nie koppel nie."
-
 msgid "Socket error"
 msgstr "Sokfout"
 
-msgid "Unable to read from socket"
-msgstr "Kan nie van sok lees nie"
-
-msgid "Write Error"
-msgstr "Skryffout"
-
-msgid "Connection lost"
-msgstr "Verbinding verloor"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Stel gebruikerinligting..."
@@ -7724,16 +7829,16 @@ msgstr "Stel gebruikerinligting..."
 msgid "Requesting token"
 msgstr "Versoek geweier"
 
-msgid "Couldn't resolve host"
-msgstr "Kon nie gasheer oplos nie"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Kan nie aan bediener koppel nie."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Ongeldige fout"
 
-#, fuzzy
 msgid "Connecting to server"
-msgstr "Koppel tans aan SILC-bediener"
+msgstr "Koppel tans bediener"
 
 msgid "QQ Error"
 msgstr "QQ-fout"
@@ -7778,7 +7883,7 @@ msgid "QQ Qun Command"
 msgstr "Bevel"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Kan nie bedienerinligting kry nie"
 
 #, fuzzy
@@ -7800,9 +7905,6 @@ msgstr "Lêer stuur"
 msgid "%d canceled the transfer of %s"
 msgstr "%d het die oordrag van %s gekanselleer"
 
-msgid "Connection closed (writing)"
-msgstr "Verbinding gesluit (skrif)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Groeptitel:</b> %s<br>"
@@ -7858,17 +7960,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-administrateur se aankondiging"
 
-msgid "Connection reset"
-msgstr "Verbinding teruggestel"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Kon nie vanaf sok lees nie: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Kon nie aan gasheer koppel nie"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aankondiging van %s"
@@ -7891,6 +7982,9 @@ msgstr "Luidsprekers"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Lêeroordrag"
+
 msgid "Supports"
 msgstr "Ondersteun"
 
@@ -8611,9 +8705,6 @@ msgstr "Organisasie"
 msgid "Unit"
 msgstr "Eenheid"
 
-msgid "Note"
-msgstr "Nota"
-
 msgid "Join Chat"
 msgstr "Sluit by geselsie aan"
 
@@ -8713,6 +8804,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Netwerk statistiek"
 
+msgid "Ping"
+msgstr "Pieng"
+
 msgid "Ping failed"
 msgstr "Pieng het misluk"
 
@@ -8777,8 +8871,8 @@ msgstr "Niegesteunde publiekesleutel-tipe"
 msgid "Disconnected by server"
 msgstr "Ontkoppel van bediener"
 
-msgid "Error during connecting to SILC Server"
-msgstr "Kon nie volledig aan SILC-bediener koppel nie"
+msgid "Error connecting to SILC Server"
+msgstr "Fout tydens verbinding aan SILC-bediener"
 
 msgid "Key Exchange failed"
 msgstr "Sleutelruiling het misluk"
@@ -8789,27 +8883,21 @@ msgstr ""
 "Hervat van onthegte sessie het misluk. Druk 'Koppel weer' om 'n nuwe "
 "verbinding te skep."
 
-msgid "Connection failed"
-msgstr "Verbinding het misluk"
-
 msgid "Performing key exchange"
 msgstr "Verrig tans sleutelruiling"
 
-msgid "Unable to create connection"
-msgstr "Kon nie verbinding skep nie"
-
-msgid "Could not load SILC key pair"
-msgstr "Kon nie SILC-sleutelpaar laai nie"
+msgid "Unable to load SILC key pair"
+msgstr "Kan nie SILC-sleutelpaar laai nie"
 
 #. Progress
 msgid "Connecting to SILC Server"
-msgstr "Koppel tans aan SILC-bediener"
+msgstr "Verbind tans aan SILC-bediener"
 
 msgid "Out of memory"
 msgstr "Onvoldoende geheue"
 
-msgid "Cannot initialize SILC protocol"
-msgstr "Kon nie SILC-protokol inisialiseer nie"
+msgid "Unable to initialize SILC protocol"
+msgstr "Kan nie SILC-protokol inisialiseer nie"
 
 msgid "Error loading SILC key pair"
 msgstr "Kon nie SILC-sleutelpaar volledig laai nie"
@@ -9106,8 +9194,8 @@ msgstr "Onder digitaal en verifieer alle boodskappe"
 msgid "Creating SILC key pair..."
 msgstr "Skep tans SILC-sleutelpaar..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Kan nie SILC-sleutelpaar skep nie\n"
+msgid "Unable to create SILC key pair"
+msgstr "Kan nie SILC-sleutelpaar skep nie"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9201,6 +9289,9 @@ msgstr "Witbord"
 msgid "No server statistics available"
 msgstr "Geen bedienerstatistiek beskikbaar nie"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Kon nie volledig aan SILC-bediener koppel nie"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Mislukking: Weergawe pas nie, gradeer u kliënt op"
@@ -9242,30 +9333,24 @@ msgstr "Mislukking: Ongeldige koekie"
 msgid "Failure: Authentication failed"
 msgstr "Mislukking: Stawing het misluk"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "Kon nie SILC-kliëntverbinding inisialiseer nie"
+msgid "Unable to initialize SILC Client connection"
+msgstr "Kan nie SILC-kliëntverbinding inisialiseer nie"
 
 msgid "John Noname"
 msgstr "Naamloos Niemand"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Kon nie SILC-sleutelpaar laai nie: %s"
+msgid "Unable to load SILC key pair: %s"
+msgstr "Kan nie SILC-sleutelpaar laai nie: %s"
 
-msgid "Could not write"
-msgstr "Kon nie skryf nie"
-
-msgid "Could not connect"
-msgstr "Kon nie koppel nie"
-
-msgid "Unknown server response."
-msgstr "Onbekende bedienerrespons."
+msgid "Unable to create connection"
+msgstr "Kon nie verbinding skep nie"
 
-msgid "Could not create listen socket"
-msgstr "Kon nie luistersok skep nie"
+msgid "Unknown server response"
+msgstr "Onbekende bedienerrespons"
 
-msgid "Could not resolve hostname"
-msgstr "Kon nie gasheernaam oplos nie"
+msgid "Unable to create listen socket"
+msgstr "Kan nie luistersok skep nie"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-gebruikername mag nie spasies of @-simbole bevat nie"
@@ -9306,175 +9391,61 @@ msgstr "Magtig gebruiker"
 msgid "Auth Domain"
 msgstr "Magtig domein"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Soek tans %s op"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Verbinding na %s het misluk"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Aanmelding: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Kan nie lêer %s skryf nie."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Kan nie lêer %s lees nie."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Boodskap te lank, laaste %s grepe afgekap."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s nie tans aanmeld nie."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Waarskuwing indien %s nie toegelaat nie."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "'n Boodskap is laat val, u oorskry die bediener se spoedlimiet."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Geselsie in %s is nie beskikbaar nie."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "U stuur te vinnig boodskappe aan %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "U het 'n kitsboodskap vanaf %s gemis omdat dit te groot was."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "U het 'n kitsboodskap vanaf %s gemis omdat dit te vinnig gestuur is."
-
-#, c-format
-msgid "Failure."
-msgstr "Mislukking."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Te veel wat pas."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Benodig méér kwalifiseerders."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Gidsdiens is tydelik nie beskikbaar nie."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "E-posopsoek ingeperk."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Sleutelwoord geïgnoreer."
-
-#, c-format
-msgid "No keywords."
-msgstr "Geen sleutelwoorde."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Gebruiker het geen gidsinliging nie."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Land nie ondersteun nie."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Onbekende mislukking: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Verkeerde gebruikernaam of wagwoord."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Die diens is tydelik nie beskikbaar nie."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "U waarskuwingsvlak is tans te hoog om aan te meld."
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
-"U het nou te gereeld gekoppel en ontkoppel.  Wag tien minute en probeer "
-"weer.  Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "'n Onbekende aanmeldfout het voorgekom: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "'n Onbekende fout, %d, het voorgekom.  Inligting: %s"
-
-msgid "Invalid Groupname"
-msgstr "Ongeldige groepnaam"
+"join &lt;kamer&gt;:  Sluit by 'n geselsiekamers op die Yahoo-netwerk aan"
 
-msgid "Connection Closed"
-msgstr "Verbinding gesluit"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Lys kamers op die Yahoo-netwerk"
 
-msgid "Waiting for reply..."
-msgstr "Wag vir antwoord..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Versoek gebruiker om 'n krabbelsessie te begin"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC is terug ná sy blaaskans. U kan u weer boodskappe stuur."
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID..."
 
-msgid "Password Change Successful"
-msgstr "Wagwoord suksesvol verander"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Inprop vir die Yahoo!-protokol"
 
-msgid "_Group:"
-msgstr "_Groep:"
+msgid "Pager server"
+msgstr "Roeper-bediener"
 
-msgid "Get Dir Info"
-msgstr "Kry gidsinligting"
+msgid "Pager port"
+msgstr "Roeper-poort"
 
-msgid "Set Dir Info"
-msgstr "Stel gidsinligting"
+msgid "File transfer server"
+msgstr "Lêeroordragbediener"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Kon nie %s vir skryf open nie!"
+msgid "File transfer port"
+msgstr "Lêeroordragpoort"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Lêeroordrag het misluk; ander kant het waarskynlik gekanselleer."
+msgid "Chat room locale"
+msgstr "Geselsiekamer-lokaliteit"
 
-msgid "Could not connect for transfer."
-msgstr "Kon nie vir oordrag koppel nie."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignoreer konferensie- en geselsiekamer-uitnodigings"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Kon nie lêerkop skryf nie.  Die lêer sal nie oorgedra word nie."
+msgid "Chat room list URL"
+msgstr "Geselsiekamer-lys-URL"
 
-msgid "Save As..."
-msgstr "Stoor as..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo-geselsiebediener"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s versoek dat %s %d lêer aanvaar: %s (%.2f %s)%s%s"
-msgstr[1] "%s versoek dat %s %d lêers aanvaar: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo-geselsiepoort"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s vra dat u hulle 'n lêer stuur"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN-ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9486,13 +9457,11 @@ msgstr "%s vra dat u hulle 'n lêer stuur"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC-protokolinprop"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Inprop vir die Yahoo! JAPAN-protokol"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s het u 'n webkamera-uitnodiging gestuur, wat nog nie ondersteun word nie."
+msgid "Your SMS was not delivered"
+msgstr "U SMS is nie afgelewer nie"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "U Yahoo!-boodskap is nie gestuur nie."
@@ -9516,6 +9485,30 @@ msgstr "%s het (retroaktief) u versoek om hulle by u lys te voeg, geweier."
 msgid "Add buddy rejected"
 msgstr "Vriend byvoeg geweier"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Het ongeldige data ontvang"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Rekening gesluit: te veel mislukte aanmeldpogings.  As u by die Yahoo!-"
+"webwerf aanmeld, kan dit dalk die probleem oplos."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Rekening gesluit: onbekende rede.  As u by die Yahoo!-webwerf aanmeld, kan "
+"dit dalk die probleem oplos."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Gebruikernaam of wagwoord ontbreek"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9550,38 +9543,27 @@ msgstr ""
 "die probleem oplos."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Kon nie vriend %s by groep %s op die bedienerlys op rekening %s voeg nie."
+"Kan nie vriend %s by groep %s op die bedienerlys op rekening %s voeg nie."
 
-msgid "Could not add buddy to server list"
-msgstr "Kon nie vriend by bedienerlys voeg nie"
+msgid "Unable to add buddy to server list"
+msgstr "Kan nie vriend by bedienerlys voeg nie"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hoorbaar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Onverwagte HTTP-respons van die bediener ontvang."
-
-msgid "Connection problem"
-msgstr "Verbindingprobleem"
+msgid "Received unexpected HTTP response from server"
+msgstr "Onverwagte HTTP-respons van die bediener ontvang"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Verbinding met %s verloor:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Verbinding met %s verloor: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Kon nie 'n verbinding met %s bewerkstellig nie:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Kan nie 'n verbinding met die %s bewerkstellig nie: %s"
 
 msgid "Not at Home"
 msgstr "Nie tuis nie"
@@ -9628,8 +9610,8 @@ msgstr "Teenwoordigheid-stellings"
 msgid "Start Doodling"
 msgstr "Begin krabbel"
 
-msgid "Activate which ID?"
-msgstr "Aktiveer watter ID?"
+msgid "Select the ID you want to activate"
+msgstr "Kies die ID wat u wil aktiveer"
 
 msgid "Join whom in chat?"
 msgstr "Sluit by wie in geselsie aan?"
@@ -9643,74 +9625,15 @@ msgstr "Sluit gebruiker by geselsie aan..."
 msgid "Open Inbox"
 msgstr "Open inkassie"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join &lt;kamer&gt;:  Sluit by 'n geselsiekamers op die Yahoo-netwerk aan"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Lys kamers op die Yahoo-netwerk"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Versoek gebruiker om 'n krabbelsessie te begin"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Inprop vir die Yahoo-protokol"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Roeper-bediener"
-
-msgid "Japan Pager server"
-msgstr "Japannese roeper-bediener"
-
-msgid "Pager port"
-msgstr "Roeper-poort"
-
-msgid "File transfer server"
-msgstr "Lêeroordragbediener"
-
-msgid "Japan file transfer server"
-msgstr "Japannese lêeroordragbediener"
-
-msgid "File transfer port"
-msgstr "Lêeroordragpoort"
-
-msgid "Chat room locale"
-msgstr "Geselsiekamer-lokaliteit"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignoreer konferensie- en geselsiekamer-uitnodigings"
-
-msgid "Chat room list URL"
-msgstr "Geselsiekamer-lys-URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo-geselsiebediener"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo-geselsiepoort"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Krabbelversoek gestuur."
 
+msgid "Unable to connect."
+msgstr "Kan nie koppel nie."
+
 msgid "Unable to establish file descriptor."
 msgstr "Kon nie lêerbeskrywer bewerkstellig nie."
 
@@ -9718,6 +9641,9 @@ msgstr "Kon nie lêerbeskrywer bewerkstellig nie."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s probeer om groep van %d lêers aan u te stuur.\n"
 
+msgid "Write Error"
+msgstr "Skryffout"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profiel"
 
@@ -9785,14 +9711,9 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "Die gebruiker se profiel is leeg."
 
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s het u konferensie-uitnodiging na kamer \"%s\" van die hand gewys omdat \"%"
-"s\"."
-
-msgid "Invitation Rejected"
-msgstr "Uitnodiging geweier"
+#, fuzzy, c-format
+msgid "%s has declined to join."
+msgstr "%s het aangemeld."
 
 msgid "Failed to join chat"
 msgstr "Aansluit by geselsie het misluk"
@@ -9835,22 +9756,17 @@ msgstr "Stemme"
 msgid "Webcams"
 msgstr "Webkameras"
 
+msgid "Connection problem"
+msgstr "Verbindingprobleem"
+
 msgid "Unable to fetch room list."
 msgstr "Kon nie die kamerlys haal nie."
 
 msgid "User Rooms"
 msgstr "Gebruikerkamers"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Verbindingprobleem met die YCHT-bediener."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Verbinding met bediener verloor\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Verbindingprobleem met die YCHT-bediener"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9982,32 +9898,21 @@ msgid "Exposure"
 msgstr "Blootstelling"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Kan nie sok skep nie:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Kon nie respons van HTTP-instaanbediener ontleed nie: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Kon nie respons van HTTP-instaanbediener ontleed nie: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-instaanverbinding-fout %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Toegang geweier: HTTP-instaanbediener verbied poort %d om te tonnel."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "Toegang geweier: HTTP-instaanbediener verbied poort %d om te tonnel"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Kon nie %s oplos nie"
 
-msgid "Could not resolve host name"
-msgstr "Kon nie gasheernaam oplos nie"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Vra %s se aandag aan..."
@@ -10094,9 +9999,6 @@ msgstr "Moenie steur nie"
 msgid "Extended away"
 msgstr "Vir lank weg"
 
-msgid "Mobile"
-msgstr "Mobiel"
-
 msgid "Listening to music"
 msgstr "Luister na musiek"
 
@@ -10138,18 +10040,6 @@ msgstr "+++ %s is nie meer ledig nie"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Kon nie %s lees nie"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Kon nie volledig u %s lees nie.  Dit is nie gelaai nie, en die ou lêer is "
-"hernoem na %s~."
-
 msgid "Calculating..."
 msgstr "Bereken..."
 
@@ -10257,6 +10147,18 @@ msgstr "Verbinding geweier."
 msgid "Address already in use."
 msgstr "Adres word reeds gebruik."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Kon nie %s lees nie"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Kon nie volledig u %s lees nie.  Die lêer is nie gelaai nie, en die ou lêer "
+"is hernoem na %s~."
+
 msgid "Internet Messenger"
 msgstr "Internetboodskapper"
 
@@ -10299,10 +10201,8 @@ msgstr "Kennis_gewings vir nuwe pos"
 msgid "Use this buddy _icon for this account:"
 msgstr "Gebruik hierdie vriend_ikoon vir hierdie rekening:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s-opsies"
+msgid "Ad_vanced"
+msgstr "Ge_vorderd"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Gebruik GNOME se instaaninstellings"
@@ -10337,9 +10237,6 @@ msgstr "As mens stip kyk,"
 msgid "you can see the butterflies mating"
 msgstr "kan mens skoenlappers sien paar"
 
-msgid "Proxy Options"
-msgstr "Instaanopsies"
-
 msgid "Proxy _type:"
 msgstr "Instaan_tipes:"
 
@@ -10367,8 +10264,8 @@ msgstr "_Eenvoudig"
 msgid "Create _this new account on the server"
 msgstr "Skep _hierdie nuwe rekening op die bediener"
 
-msgid "_Advanced"
-msgstr "_Gevorderd"
+msgid "P_roxy"
+msgstr "I_nstaanbediener"
 
 msgid "Enabled"
 msgstr "Geaktiveer"
@@ -10412,13 +10309,13 @@ msgid ""
 msgstr ""
 "As u hierdie kontakte saamvoeg, sal hulle 'n enkele inskrywing in die "
 "vriendelys hê en 'n enkele gespreksvenster gebruik. U kan hulle weer skei "
-"met 'Uitbrei' op die kontak-kontekskielys"
+"met 'Vou oop' op die kontak-kontekskielys"
 
 msgid "Please update the necessary fields."
 msgstr "Werk gerus die nodige velde by."
 
-msgid "Room _List"
-msgstr "Kamer_lys"
+msgid "A_ccount"
+msgstr "_Rekening"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10426,8 +10323,8 @@ msgid ""
 msgstr ""
 "Tik gerus die gepaste inligting vir die geselsie waarby u wil aansluit.\n"
 
-msgid "_Account:"
-msgstr "_Rekening:"
+msgid "Room _List"
+msgstr "Kamer_lys"
 
 msgid "_Block"
 msgstr "_Blokkeer"
@@ -10444,6 +10341,15 @@ msgstr "_Inligting"
 msgid "I_M"
 msgstr "_Kitsklets"
 
+msgid "_Audio Call"
+msgstr "_Stemoproep"
+
+msgid "Audio/_Video Call"
+msgstr "Oudio/_Video-oproep"
+
+msgid "_Video Call"
+msgstr "_Video-oproep"
+
 msgid "_Send File..."
 msgstr "_Stuur lêer..."
 
@@ -10453,9 +10359,12 @@ msgstr "Voeg vriend_wag by..."
 msgid "View _Log"
 msgstr "Bekyk _staaflêer"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Versteek terwyl vanlyn"
 
+msgid "Show When Offline"
+msgstr "Wys terwyl aanlyn"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -10578,6 +10487,9 @@ msgstr "Vriend_wagte"
 msgid "/Tools/_Certificates"
 msgstr "_Sertifikate"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "_Eie gesiggies"
+
 msgid "/Tools/Plu_gins"
 msgstr "_Inproppe"
 
@@ -10587,9 +10499,6 @@ msgstr "_Voorkeure"
 msgid "/Tools/Pr_ivacy"
 msgstr "_Privaatheid"
 
-msgid "/Tools/Smile_y"
-msgstr "_Gesiggie"
-
 msgid "/Tools/_File Transfers"
 msgstr "_Lêeroordragte"
 
@@ -10707,8 +10616,8 @@ msgstr "Handmatig"
 msgid "By status"
 msgstr "Volgens status"
 
-msgid "By log size"
-msgstr "Volgens staaflêergrootte"
+msgid "By recent log activity"
+msgstr "Volgens onlangse staaflêeraktiwiteit"
 
 #, c-format
 msgid "%s disconnected"
@@ -10724,6 +10633,9 @@ msgstr "Herkoppel"
 msgid "Re-enable"
 msgstr "Heraktiveer"
 
+msgid "SSL FAQs"
+msgstr "SSL-vrae"
+
 msgid "Welcome back!"
 msgstr "Welkom terug!"
 
@@ -10782,10 +10694,10 @@ msgid "/Buddies/Show/Protocol Icons"
 msgstr "Protokolikone"
 
 msgid "Add a buddy.\n"
-msgstr "Voeg 'n _vriend by.\n"
+msgstr "Voeg 'n vriend by.\n"
 
 msgid "Buddy's _username:"
-msgstr "Vriend se gebruikernaam:"
+msgstr "Vriend se gebr_uikernaam:"
 
 msgid "(Optional) A_lias:"
 msgstr "(Opsionele) a_lias:"
@@ -10811,6 +10723,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Groep:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Sluit _outomaties aan waneer rekening aanlyn kom."
 
@@ -10844,6 +10759,101 @@ msgstr "Nutsgoed"
 msgid "/Buddies/Sort Buddies"
 msgstr "Rangskik vriende"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Agtergrondkleur"
+
+msgid "The background color for the buddy list"
+msgstr "Die agtergrondkleur van die vriendelys"
+
+msgid "Layout"
+msgstr "Uitleg"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Die uitleg van ikone, name en status van die vriendelys"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Oopgevoude agtergrondkleur"
+
+msgid "The background color of an expanded group"
+msgstr "Die agtergrondkleur van 'n oopgevoude groep"
+
+msgid "Expanded Text"
+msgstr "Oopgevoude teks"
+
+msgid "The text information for when a group is expanded"
+msgstr "Die teksinligting vir wanneer 'n groep oopgevou is"
+
+msgid "Collapsed Background Color"
+msgstr "Toegevoude agtergrondkleur"
+
+msgid "The background color of a collapsed group"
+msgstr "Die agtergrondkleur van 'n toegevoude groep"
+
+msgid "Collapsed Text"
+msgstr "Toegevoude teks"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Die teksinligting vir wanneer 'n groep toegevou is"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Geselsie se agtergrondkleur"
+
+msgid "The background color of a contact or chat"
+msgstr "Die agtergrondkleur van 'n kontak of geselsie"
+
+msgid "Contact Text"
+msgstr "Kontakteks"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Die teksinligting vir wanneer 'n kontak oopgevou is"
+
+msgid "On-line Text"
+msgstr "Aanlynteks"
+
+msgid "The text information for when a buddy is online"
+msgstr "Die teksinligting vir wanneer 'n vriend aanlyn is"
+
+msgid "Away Text"
+msgstr "Wegteks"
+
+msgid "The text information for when a buddy is away"
+msgstr "Die teksinligting vir wanneer 'n vriend weg is"
+
+msgid "Off-line Text"
+msgstr "Vanlynteks"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Die teksinligting vir wanneer 'n vriend vanlyn is"
+
+msgid "Idle Text"
+msgstr "Ledige teks"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Die teksinligting vir wanneer 'n vriend ledig is"
+
+msgid "Message Text"
+msgstr "Boodskapteks"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Die teksinligting vir wanneer 'n vriend 'n ongelese boodskap het"
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr "Die teksinligting vir 'n vriend se status"
+
+msgid "Type the host name for this certificate."
+msgstr "Tik die gasheernaam vir hierdie sertifikaat in."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-bedieners"
@@ -10862,14 +10872,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Nooi vriend na geselsiekamer"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Tik gerus die naam van die gebruiker om uit te nooi, saam met 'n opsionele "
-"uitnodigingsboodskap."
-
 msgid "_Buddy:"
 msgstr "_Vriend:"
 
@@ -10898,7 +10900,7 @@ msgstr "Ignoreer"
 msgid "Get Away Message"
 msgstr "Kry Weg-boodskap"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Laaste gesê"
 
 msgid "Unable to save icon file to disk."
@@ -10944,6 +10946,18 @@ msgstr "_Stoor as..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "Maak gesprekvenster skoo_n"
 
+msgid "/Conversation/M_edia"
+msgstr "M_edia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "_Oudio-oproep"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "_Video-oproep"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "Oudio/Video-_oproep"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "S_tuur lêer..."
 
@@ -11016,6 +11030,15 @@ msgstr "Gesprek"
 msgid "/Conversation/View Log"
 msgstr "Bekyk staaflêer"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "Oudio-oproep"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "Video-oproep"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "Oudio/Video-oproep"
+
 msgid "/Conversation/Send File..."
 msgstr "Stuur lêer..."
 
@@ -11189,7 +11212,7 @@ msgid "Fatal Error"
 msgstr "Fatale fout"
 
 msgid "bug master"
-msgstr ""
+msgstr "goggameester"
 
 msgid "artist"
 msgstr "kunstenaar"
@@ -11198,6 +11221,9 @@ msgstr "kunstenaar"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "stem en video"
+
 msgid "support"
 msgstr "steun"
 
@@ -11322,6 +11348,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Hongaars"
 
+msgid "Armenian"
+msgstr "Armeens"
+
 msgid "Indonesian"
 msgstr "Indonesies"
 
@@ -11337,6 +11366,9 @@ msgstr "Georgies"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu- Georgiese vertalers"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11358,7 +11390,6 @@ msgstr "Litous"
 msgid "Macedonian"
 msgstr "Masedonies"
 
-#, fuzzy
 msgid "Mongolian"
 msgstr "Mongools"
 
@@ -11416,6 +11447,9 @@ msgstr "Sinhalees"
 msgid "Swedish"
 msgstr "Sweeds"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11724,14 +11758,6 @@ msgstr "_Verwyder afgehandelde oordragte van lys"
 msgid "File transfer _details"
 msgstr "_Details oor lêeroordrag"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Pouseer"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Hervat"
-
 msgid "Paste as Plain _Text"
 msgstr "Plak as gewone _teks"
 
@@ -11750,7 +11776,7 @@ msgstr "Kleur om hiperskakels mee te teken."
 msgid "Hyperlink visited color"
 msgstr "Besoekte hiperskakelkleur"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Kleur om hiperskakels mee te teken ná dit besoek is (of geaktiveer is)."
 
@@ -11789,13 +11815,22 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr "Kleur van aksieboodskapnaam"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Kleur vir die naam van 'n aksieboodskap."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "Kleur van gestuurde boodskapnaam"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Kleur vir die naam van 'n aksieboodskap."
+
 msgid "Typing notification color"
 msgstr "Kleur van tikkennisgewing"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Die kleur vir die tikkennisgewing"
 
 msgid "Typing notification font"
@@ -11807,15 +11842,6 @@ msgstr "Die font vir die tikkennisgewing"
 msgid "Enable typing notification"
 msgstr "Aktiveer tikkennisgewings"
 
-msgid "_Copy Email Address"
-msgstr "_Kopieer e-posadres"
-
-msgid "_Open Link in Browser"
-msgstr "_Open skakel in blaaier"
-
-msgid "_Copy Link Location"
-msgstr "_Kopieer skakelligging"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11857,11 +11883,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Stoor prent"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Stoor prent..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Voeg pasgemaakte gesiggie by..."
 
@@ -11951,9 +11975,6 @@ msgstr "Verklein font"
 msgid "Font Face"
 msgstr "Fonttipe"
 
-msgid "Background Color"
-msgstr "Agtergrondkleur"
-
 msgid "Foreground Color"
 msgstr "Voorgrondkleur"
 
@@ -12069,6 +12090,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12083,14 +12105,16 @@ msgstr ""
 "\n"
 "  -c, --config=GIDS   gebruik GIDS vir konfigurasielêers\n"
 "  -d, --debug         skryf ontfoutboodskappe na stdout\n"
+"  -f, --force-online  forseer aanlyn, ongeag die netwerkstatus\n"
 "  -h, --help          wys hierdie hulp, en sluit af\n"
-"  -m, --multiple      moenie enkele uittrekking verseker nie\n"
+"  -m, --multiple      moenie enkele instansie verseker nie\n"
 "  -n, --nologin       moenie outomaties aanmeld nie\n"
-"  -l, --login[=NAAM]  aktiveer spesifieke rekening(e) (opsionele NAAM-"
+"  -l, --login[=NAAM]  aktiveer spesifieke rekening(e) (Opsionele NAAM-"
 "argument\n"
-"           spesifiseer rekening(e) om te gebruik, geskei met kommas).\n"
-"           Hiersonder word net die eerste rekening geaktiveer).\n"
-"  --display=VERTOON   X vertoon om te gebruik\n"
+"                      spesifiseer rekening(e) om te gebruik, geskei met "
+"kommas.\n"
+"                      Hiersonder word net die eerste rekening geaktiveer).\n"
+"  --display=VERTOON   X-vertoon om te gebruik\n"
 "  -v, --version       wys die huidige weergawe, en sluit af\n"
 
 #, c-format
@@ -12100,6 +12124,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12113,13 +12138,15 @@ msgstr ""
 "\n"
 "  -c, --config=GIDS   gebruik GIDS vir konfigurasielêers\n"
 "  -d, --debug         skryf ontfoutboodskappe na stdout\n"
+"  -f, --force-online  forseer aanlyn, ongeag die netwerkstatus\n"
 "  -h, --help          wys hierdie hulp, en sluit af\n"
 "  -m, --multiple      moenie enkele uittrekking verseker nie\n"
 "  -n, --nologin       moenie outomaties aanmeld nie\n"
-"  -l, --login[=NAAM]  aktiveer spesifieke rekening(e) (opsionele NAAM-"
+"  -l, --login[=NAAM]  aktiveer spesifieke rekening(e) (Opsionele NAAM-"
 "argument\n"
-"           spesifiseer rekening(e) om te gebruik, geskei met kommas).\n"
-"           Hiersonder word net die eerste rekening geaktiveer).\n"
+"                      spesifiseer rekening(e) om te gebruik, geskei met "
+"kommas.\n"
+"                      Hiersonder word net die eerste rekening geaktiveer).\n"
 "  -v, --version       wys die huidige weergawe, en sluit af\n"
 
 #, c-format
@@ -12158,11 +12185,22 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Sluit af omdat 'n ander libpurple-kliënt reeds loop.\n"
 
-msgid "Open All Messages"
-msgstr "Open alle boodskappe"
+msgid "/_Media"
+msgstr "_Media"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">U het pos!</span>"
+msgid "/Media/_Hangup"
+msgstr "Sit _neer"
+
+msgid "Calling..."
+msgstr "Bel tans..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s wil 'n oudio-/videosessie met u begin."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s wil 'n videosessie met u begin."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12192,6 +12230,25 @@ msgid ""
 msgstr ""
 "Die 'Handmatige' blaaier-bevel is gekies, maar geen bevel is gestel nie."
 
+msgid "No message"
+msgstr "Geen boodskap"
+
+msgid "Open All Messages"
+msgstr "Open alle boodskappe"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">U het pos!</span>"
+
+msgid "New Pounces"
+msgstr "Nuwe vriendwagte"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">U het pos!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Die volgende inproppe gaan ontlaai word."
 
@@ -12240,10 +12297,16 @@ msgstr "<b>Inpropdetails</b>"
 msgid "Select a file"
 msgstr "Kies 'n lêer"
 
+msgid "Modify Buddy Pounce"
+msgstr "Wysig vriendwag"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Hou wie dop"
 
+msgid "_Account:"
+msgstr "_Rekening:"
+
 msgid "_Buddy name:"
 msgstr "_Vriendnaam:"
 
@@ -12310,7 +12373,60 @@ msgstr "_Herhalend"
 msgid "Pounce Target"
 msgstr "Dophou-teiken"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Begin tik"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Wag tydens tik"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Aanmeld"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s het teruggekeer na ledigheid (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Terugkeer"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Het opgehou tik"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Afmeld"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Ledig raak"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Terwyl weg"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Stuur 'n boodskap"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Onbekende... Rapporteer dit, asseblief!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Uitpak van gesiggie-tema het misluk."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Uitpak van gesiggie-tema het misluk."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Uitpak van gesiggie-tema het misluk."
 
 msgid "Install Theme"
@@ -12332,6 +12448,11 @@ msgstr "Sleutelbordkortpaaie"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Sl_uit gesprekke met die Escape-sleutel"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Vriendelystema"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Stelsellaai-ikoon"
 
@@ -12341,8 +12462,8 @@ msgstr "_Wys ikoon in stelsellaai"
 msgid "On unread messages"
 msgstr "Met ongelese boodskappe"
 
-msgid "Conversation Window Hiding"
-msgstr "Versteking van gesprekvenster"
+msgid "Conversation Window"
+msgstr "Gesprekvenster"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Versteek nuwe kitsboodskappe:"
@@ -12350,6 +12471,9 @@ msgstr "_Versteek nuwe kitsboodskappe:"
 msgid "When away"
 msgstr "Terwyl weg"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minim_eer nuwe gesprekvensters"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Oortjies"
@@ -12408,9 +12532,6 @@ msgstr "Gebruik gladde rol"
 msgid "F_lash window when IMs are received"
 msgstr "_Flits boodskap wanneer 'n kitsboodskap ontvang word"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minim_eer nuwe gesprekvensters"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimum intikareahoogte in reëls:"
 
@@ -12442,14 +12563,12 @@ msgstr "Kan nie instaanopstellingsprogram begin nie."
 msgid "Cannot start browser configuration program."
 msgstr "Kan nie blaaieropstellingsprogram begin nie."
 
-msgid "ST_UN server:"
-msgstr "ST_UN-bediener:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Voorbeeld: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Outospeur IP-adres"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Gebruik _outomaties bespeurde IP-adres: %s"
 
 msgid "Public _IP:"
 msgstr "Publieke _IP:"
@@ -12469,6 +12588,10 @@ msgstr "_Beginpoort:"
 msgid "_End port:"
 msgstr "_Endpoort:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Instaanbediener en blaaier"
 
@@ -12659,12 +12782,12 @@ msgstr "Terwyl weg en ledig"
 msgid "Auto-away"
 msgstr "Outoweg"
 
-msgid "Change status when _idle"
-msgstr "Verander status terwyl _ledig"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minute voor ledig word:"
 
+msgid "Change status when _idle"
+msgstr "Verander status terwyl _ledig"
+
 msgid "Change _status to:"
 msgstr "Verander _status na:"
 
@@ -12812,47 +12935,43 @@ msgstr "S_toor en gebruik"
 msgid "Status for %s"
 msgstr "Status vir %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"'n Eie gesiggie vir '%s' bestaan reeds. Gee asseblief 'n ander kortpad."
+
 msgid "Custom Smiley"
 msgstr "Eie gesiggie"
 
-msgid "More Data needed"
-msgstr "Meer data benodig"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Verskaf gerus 'n kortpad om met die gesiggie te assosieer."
-
 msgid "Duplicate Shortcut"
 msgstr "Duplikaatkortpad"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"'n Eie gesiggie vir die gekose kortpad bestaan reeds. Gee asseblief 'n ander "
-"kortpad."
-
-msgid "Please select an image for the smiley."
-msgstr "Kies asseblief 'n prent vir die gesiggie."
-
 msgid "Edit Smiley"
 msgstr "Wysig gesiggie"
 
 msgid "Add Smiley"
 msgstr "Voeg gesiggie by"
 
-msgid "Smiley _Image"
-msgstr "Gesiggie_prent"
+msgid "_Image:"
+msgstr "_Prent:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Gesiggie_kortpad"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "_Kortpadteks:"
 
 msgid "Smiley"
 msgstr "Gesiggie"
 
+msgid "Shortcut Text"
+msgstr "Kortpadteks"
+
 msgid "Custom Smiley Manager"
 msgstr "Bestuurder van eie gesiggies"
 
+msgid "Select Buddy Icon"
+msgstr "Kies vriendikoon"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klik hier om die vriend_ikoon vir hierdie rekening te verander."
 
@@ -12938,11 +13057,11 @@ msgid "Cannot send launcher"
 msgstr "Kan nie laaier stuur nie"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
-"U het 'n werkskermlaaier gesleep. U wou waarskynlik dit stuur waarna die "
-"laaier wys, in plaas van die laaier sélf."
+"U het 'n werkskermlaaier gesleep. U wou waarskynlik die teiken van die "
+"laaier stuur in plaas van die laaier sélf."
 
 #, c-format
 msgid ""
@@ -12974,9 +13093,30 @@ msgid ""
 msgstr ""
 "Kon nie prent '%s' laai nie: rede onbekend, waarskynlik 'n korrupte prentlêer"
 
+msgid "_Open Link"
+msgstr "_Open skakel"
+
+msgid "_Copy Link Location"
+msgstr "_Kopieer skakelligging"
+
+msgid "_Copy Email Address"
+msgstr "_Kopieer e-posadres"
+
+msgid "_Open File"
+msgstr "_Open lêer"
+
+msgid "Open _Containing Directory"
+msgstr "Open houer_gids"
+
 msgid "Save File"
 msgstr "Stoor lêer"
 
+msgid "_Play Sound"
+msgstr "S_peel 'n klank"
+
+msgid "_Save File"
+msgstr "_Stoor lêer"
+
 msgid "Select color"
 msgstr "Kies kleur"
 
@@ -13001,6 +13141,9 @@ msgstr "_Voeg by..."
 msgid "_Open Mail"
 msgstr "_Open pos"
 
+msgid "_Pause"
+msgstr "_Pouseer"
+
 msgid "_Edit"
 msgstr "_Wysig"
 
@@ -13064,6 +13207,68 @@ msgstr "Kontakbeskikbaarheid-voorspelling-inprop."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Wys statistiese inligting oor u vriende se beskikbaarheid"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Bedieneradres"
+
+msgid "Enter an XMPP Server"
+msgstr "Gee 'n XMPP-bediener"
+
+msgid "Select an XMPP server to query"
+msgstr "Kies 'n XMPP-bediener om te vra"
+
+msgid "Find Services"
+msgstr "Vind dienste"
+
+msgid "Add to Buddy List"
+msgstr "Voeg by vriendelys"
+
+msgid "Gateway"
+msgstr "Deurgang"
+
+msgid "Directory"
+msgstr "Gids"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Klankkeuse"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub-diens"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Beskrywing:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Diensbespeuring"
+
+msgid "_Browse"
+msgstr "_Blaai"
+
+msgid "Server does not exist"
+msgstr "Bediener bestaan nie"
+
+msgid "Server does not support service discovery"
+msgstr "Bediener ondersteun nie diensbespeuring nie"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP-diensbespeuring"
+
+msgid "Allows browsing and registering services."
+msgstr "Laat die blaai en registrasie van dienste toe."
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
+
 msgid "Buddy is idle"
 msgstr "Vriend is ledig"
 
@@ -13453,7 +13658,7 @@ msgstr "Musiekboodskap-inprop vir saamwerk-komponering."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Die musiekboodskap-inprop stel 'n getal gebruikers in staat om gelyktydig "
 "aan 'n musiekstuk te werk deur gedeelde bladmusiek intyds te redigeer."
@@ -13566,12 +13771,6 @@ msgstr ""
 "- Dit keer alle teks agterstevoorom\n"
 "- Dit stuur 'n boodksap aan mense op u lys die oomblik wat hulle aanmeld"
 
-msgid "Cursor Color"
-msgstr "Porkleur"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekondêre porkleur"
-
 msgid "Hyperlink Color"
 msgstr "Hiperskakelkleur"
 
@@ -13581,6 +13780,9 @@ msgstr "Besoekte hiperskakelkleur"
 msgid "Highlighted Message Name Color"
 msgstr "Kleur van gemerkte boodskapnaam"
 
+msgid "Typing Notification Color"
+msgstr "Kleur van tikkennisgewing"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView- horisontale skeiding"
 
@@ -13610,35 +13812,21 @@ msgstr "GTK+-koppelvlakfont"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekskortpadtema"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Koppelvlakkleure"
+msgid "Disable Typing Notification Text"
+msgstr "Deaktiveer tikkennisgewingsteks"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Instellings vir GTK+-temabeheer"
 
-msgid "Widget Sizes"
-msgstr "Dingessie-groottes"
+msgid "Colors"
+msgstr "Kleure"
 
 msgid "Fonts"
 msgstr "Fonte"
 
+msgid "Miscellaneous"
+msgstr "Allerlei"
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc-lêernutsgoed"
 
@@ -13723,7 +13911,7 @@ msgstr "Knoppie om gesprekvenster te stuur."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Voeg 'n Stuur-knoppie by die intikarea van die gesprekvenster. Bedoel vir "
 "wanneer daar geen fisiese sleutelbord is nie."
@@ -13780,6 +13968,110 @@ msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Vervang teks in uitgaande boodskappe volgens gebruikergespesifiseerde reëls."
 
+msgid "Just logged in"
+msgstr "Pas aangemeld"
+
+msgid "Just logged out"
+msgstr "Pas afgemeld"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+msgid "Icon for Chat"
+msgstr "Ikoon vir geselsie"
+
+msgid "Ignored"
+msgstr "Geïgnoreer"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Harder"
+
+#. A user in a chat room who has special privileges.
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Magtiging gegee"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Fout "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Inligting"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Versoek-dialoog"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Waarskuwingvlak"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status vir %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Geselsiekamer-lokaliteit"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Verander ikoon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+-temabeheer"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakinligting"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Vriendelys"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Vriendelys"
+
+msgid "Edit Icon Theme"
+msgstr "Wysig ikoontema"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin se temaredigeerder"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin se temaredigeerder."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13948,7 +14240,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Opsies spesifiek aan Pidgin vir Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Verskaf opsies spesifiek vir Pidgin op Windows, soos vriendelysdokking."
 
@@ -13989,6 +14281,517 @@ msgstr "Stuur en ontvang rou XMPP-stanzas."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Kan nie SILC-sleutelpaar laai nie"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s het u konferensie-uitnodiging na kamer \"%s\" van die hand gewys omdat "
+#~ "\"%s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Uitnodiging geweier"
+
+#~ msgid "_Resume"
+#~ msgstr "_Hervat"
+
+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "Instaanbediener"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Kan nie sok open nie"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Kon nie op sok luister nie"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Kan nie sok lees nie"
+
+#~ msgid "Connection failed."
+#~ msgstr "Verbinding het misluk."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Bediener is ontkoppel"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Kon nie netwerksok skep nie"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Kon nie aan gasheer koppel nie"
+
+#~ msgid "Read error"
+#~ msgstr "Leesfout"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kon nie 'n verbinding met die bediener bewerkstellig nie:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Skryffout"
+
+#~ msgid "Last Activity"
+#~ msgstr "Vorige aktiwiteit"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Diensbespeuring-inligting"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Diensbespeuring-items"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Uitgebreide stanza-adressering"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Veelgebruiker-geselsies"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Inligting oor verlengde teenwoordigheid van veelgebruiker-geselsies"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Inband-greepstrome"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad hoc-bevele"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub-diens"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5-greepstrome"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Te min banddata"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Inband-registrasie"
+
+#~ msgid "User Location"
+#~ msgstr "Gebruikerligging"
+
+#~ msgid "User Avatar"
+#~ msgstr "Gebruikeravatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Geselsiestatuskennisgewing"
+
+#~ msgid "Software Version"
+#~ msgstr "Sagtewareweergawe"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Stroominisiasie"
+
+#~ msgid "User Mood"
+#~ msgstr "Gebruikerstemming"
+
+#~ msgid "User Activity"
+#~ msgstr "Gebruikeraktiwiteit"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Entiteitvermoëns"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Geënkripteerde sessieonderhandelings"
+
+#~ msgid "User Tune"
+#~ msgstr "Gebruikerdeuntjie"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Roosteritem-ruiling"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Bereikbaarheid-adres"
+
+#~ msgid "User Profile"
+#~ msgstr "Gebruikerprofiel"
+
+#~ msgid "Jingle"
+#~ msgstr "Kenwysie"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Kenwysie-klank"
+
+#~ msgid "User Nickname"
+#~ msgstr "Gebruiker se bynaam"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Kenwysie ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Kenwysie ICE TPC"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Kenwysie rou UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Kenwysievideo"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Kenwysie DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Boodskap-ontvangste"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publiekesleutel-publisering"
+
+#~ msgid "User Chatting"
+#~ msgstr "Gebruikergeselsery"
+
+#~ msgid "User Browsing"
+#~ msgstr "Gebruikerblaaiery"
+
+#~ msgid "User Gaming"
+#~ msgstr "Gebruikerspelery"
+
+#~ msgid "User Viewing"
+#~ msgstr "Gebruikerbekyking"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanzaenkriptering"
+
+#~ msgid "Entity Time"
+#~ msgstr "Entiteittyd"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Vertraagde lewering"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Samewerkende dataobjekte"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Lêerbewaarplek en deling"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN-diensbespeuring vir kenwysie"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Vereenvoudigde onderhandeling vir geënkripteerde sessies"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hop-kontrole"
+
+#~ msgid "Read Error"
+#~ msgstr "Leesfout"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Verbind aan bediener het misluk."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Leesbuffer vol (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Onontleedbare boodskap"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Kon nie aan gasheer koppel nie: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Aanmelding het misluk (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "U is afgemeld omdat u by 'n ander werkstasie aangemeld het."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Fout. SSL-steun nie geïnstalleer nie."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Verkeerde wagwoord."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kon nie aan BOS-bediener koppel nie:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "U kan dalk binnekort ontkoppel word.  Kontroleer %s vir bywerkings."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Kon nie koppel nie"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ongeldige gebruikernaam."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Kan nie bedienerinligting kry nie"
+
+#~ msgid "Connection lost"
+#~ msgstr "Verbinding verloor"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Kon nie gasheer oplos nie"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Verbinding gesluit (skrif)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Verbinding teruggestel"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Kon nie vanaf sok lees nie: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Kon nie aan gasheer koppel nie"
+
+#~ msgid "Could not write"
+#~ msgstr "Kon nie skryf nie"
+
+#~ msgid "Could not connect"
+#~ msgstr "Kon nie koppel nie"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kon nie luistersok skep nie"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Kon nie gasheernaam oplos nie"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Verkeerde wagwoord"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kon nie 'n verbinding met %s bewerkstellig nie:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japannese roeper-bediener"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japannese lêeroordragbediener"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Verbinding met bediener verloor\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Kon nie gasheernaam oplos nie"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Bediener vereis TLS/SSL vir aanmelding.  Geen TLS/SSL-steun gevind nie."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Versteking van gesprekvenster"
+
+#~ msgid "More Data needed"
+#~ msgstr "Meer data benodig"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Verskaf gerus 'n kortpad om met die gesiggie te assosieer."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Kies asseblief 'n prent vir die gesiggie."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktiveer watter ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Porkleur"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Sekondêre porkleur"
+
+#~ msgid "Interface colors"
+#~ msgstr "Koppelvlakkleure"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Dingessie-groottes"
+
+#~ msgid "Invite message"
+#~ msgstr "Uitnodigingsboodskap"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Tik gerus die naam van die gebruiker om uit te nooi,\n"
+#~ "saam met 'n opsionele uitnodigingsboodskap."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Soek tans %s op"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Verbinding na %s het misluk"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Aanmelding: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Kan nie lêer %s skryf nie."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Kan nie lêer %s lees nie."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Boodskap te lank, laaste %s grepe afgekap."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s nie tans aanmeld nie."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Waarskuwing indien %s nie toegelaat nie."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "'n Boodskap is laat val, u oorskry die bediener se spoedlimiet."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Geselsie in %s is nie beskikbaar nie."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "U stuur te vinnig boodskappe aan %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "U het 'n kitsboodskap vanaf %s gemis omdat dit te groot was."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "U het 'n kitsboodskap vanaf %s gemis omdat dit te vinnig gestuur is."
+
+#~ msgid "Failure."
+#~ msgstr "Mislukking."
+
+#~ msgid "Too many matches."
+#~ msgstr "Te veel wat pas."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Benodig méér kwalifiseerders."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Gidsdiens is tydelik nie beskikbaar nie."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "E-posopsoek ingeperk."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Sleutelwoord geïgnoreer."
+
+#~ msgid "No keywords."
+#~ msgstr "Geen sleutelwoorde."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Gebruiker het geen gidsinliging nie."
+
+#~ msgid "Country not supported."
+#~ msgstr "Land nie ondersteun nie."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Onbekende mislukking: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Verkeerde gebruikernaam of wagwoord."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Die diens is tydelik nie beskikbaar nie."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "U waarskuwingsvlak is tans te hoog om aan te meld."
+
+#~ 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 ""
+#~ "U het nou te gereeld gekoppel en ontkoppel.  Wag tien minute en probeer "
+#~ "weer.  Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "'n Onbekende aanmeldfout het voorgekom: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "'n Onbekende fout, %d, het voorgekom.  Inligting: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Ongeldige groepnaam"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Verbinding gesluit"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Wag vir antwoord..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC is terug ná sy blaaskans. U kan u weer boodskappe stuur."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Wagwoord suksesvol verander"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Kry gidsinligting"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Stel gidsinligting"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Kon nie %s vir skryf open nie!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Lêeroordrag het misluk; ander kant het waarskynlik gekanselleer."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Kon nie vir oordrag koppel nie."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Kon nie lêerkop skryf nie.  Die lêer sal nie oorgedra word nie."
+
+#~ msgid "Save As..."
+#~ msgstr "Stoor as..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s versoek dat %s %d lêer aanvaar: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s versoek dat %s %d lêers aanvaar: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s vra dat u hulle 'n lêer stuur"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC-protokolinprop"
+
+#~ msgid "%s Options"
+#~ msgstr "%s-opsies"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Instaanopsies"
+
+#~ msgid "By log size"
+#~ msgstr "Volgens staaflêergrootte"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Open skakel in blaaier"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN-bediener:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Gesiggie_prent"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Gesiggie_kortpad"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Kan nie MSN-adresboek haal nie"
 
@@ -14254,9 +15057,6 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "U versoek om by groep %d aan te sluit, is deur admin %d goed gekeur"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Hierdie groep is by u vriendelys gevoeg"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Ek doen aansoek om aan te sluit"
 
@@ -14286,9 +15086,6 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Kon nie aanmeld nie. Kontroleer ontfoutstaaflêer."
 
-#~ msgid "Unable to login"
-#~ msgstr "Kan nie aanmeld nie"
-
 #, fuzzy
 #~ msgid "Failed room reply"
 #~ msgstr "Aanmelding het misluk, geen antwoord nie"
@@ -14336,9 +15133,6 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ msgid "Group Operation Error"
 #~ msgstr "Groepbewerkingsfout"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Kon nie aanmeldteken aanvra nie"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP-adres"
 
diff --git a/po/am.po b/po/am.po
index 878bbc0c86..5a8eda8755 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 0.60 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2003-04-08 09:23:11+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -31,7 +31,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -627,19 +627,6 @@ msgid "Send To"
 msgstr "ላክ"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "(1 መልዕክት)"
-
-#, fuzzy
-msgid "Invite"
-msgstr "አስገባ"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-
-#, fuzzy
 msgid "Conversation"
 msgstr "ተገናኝቷል"
 
@@ -890,6 +877,40 @@ msgstr "ተገናኝቷል"
 msgid "System Log"
 msgstr ""
 
+msgid "Calling ... "
+msgstr ""
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr ""
+
+#, fuzzy
+msgid "Reject"
+msgstr "እንደነበረ አድረግ"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+msgid "You have rejected the call."
+msgstr ""
+
+msgid "call: Make an audio call."
+msgstr ""
+
 #, fuzzy
 msgid "Emails"
 msgstr "ኢሜይል"
@@ -931,6 +952,10 @@ msgid "IM"
 msgstr ""
 
 #, fuzzy
+msgid "Invite"
+msgstr "አስገባ"
+
+#, fuzzy
 msgid "(none)"
 msgstr "(ስም የለም)"
 
@@ -1137,7 +1162,6 @@ msgstr ""
 msgid "%s has sent you a message. (%s)"
 msgstr "ጌም -  ምልክትን አስቀምጥ"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1190,7 +1214,6 @@ msgstr ""
 msgid "Change status to"
 msgstr "የቤት አድራሻ፦"
 
-#. Conversations
 msgid "Conversations"
 msgstr ""
 
@@ -1527,7 +1550,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr ""
 
-#, c-format
 msgid "Online"
 msgstr "ኦንላይን"
 
@@ -1577,6 +1599,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 #, fuzzy
 msgid "accounts"
 msgstr ""
@@ -1685,14 +1729,6 @@ msgstr ""
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr ""
-
-#, fuzzy
-msgid "Reject"
-msgstr "እንደነበረ አድረግ"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1781,6 +1817,8 @@ msgstr "ጌም -  ምልክትን አስቀምጥ"
 msgid "+++ %s signed off"
 msgstr "ጌም -  ምልክትን አስቀምጥ"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "ያልታወቀ ስህተት"
 
@@ -1830,6 +1868,16 @@ msgstr ""
 msgid "%s left the room (%s)."
 msgstr ""
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "የጌም ማውሪያ"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "ተገናኝቷል"
@@ -1955,7 +2003,6 @@ msgstr ""
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#, c-format
 msgid "File transfer complete"
 msgstr ""
 
@@ -1963,7 +2010,6 @@ msgstr ""
 msgid "You canceled the transfer of %s"
 msgstr ""
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr ""
 
@@ -2144,11 +2190,14 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "ተገናኝቷል"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2546,7 +2595,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2596,7 +2645,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2625,6 +2674,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "ሚስጢራዊ ቃልን ለውጥ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2813,18 +2888,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "ተገናኝቷል"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 #, fuzzy
 msgid "First name"
 msgstr "ስም"
@@ -2866,6 +2941,11 @@ msgstr ""
 msgid "Purple Person"
 msgstr "<አዲስ ተጠቃሚ>"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "አካባቢ"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2877,14 +2957,17 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "ተገናኝቷል"
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ተገናኝቷል"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "ተገናኝቷል"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "ተገናኝቷል"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2936,13 +3019,13 @@ msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
 msgid "Load buddylist from file..."
 msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr ""
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2956,14 +3039,15 @@ msgid "Password"
 msgstr "ሚስጢራዊ ቃል፦"
 
 #, fuzzy
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "ሚስጢራዊ ቃል፦"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "ምስሉን አስቀምጥ... (_S)"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -3020,6 +3104,16 @@ msgstr "ሚስጢራዊ ቃል፦"
 msgid "Current password"
 msgstr "አዲስ ሚስጢራዊ ቃል"
 
+#, fuzzy
+msgid "Password (retype)"
+msgstr "ሚስጢራዊ ቃል፦"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3035,13 +3129,13 @@ msgstr ""
 msgid "Add to chat..."
 msgstr "ውሪ"
 
+#. Global
 msgid "Available"
 msgstr ""
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr ""
 
@@ -3071,8 +3165,9 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
-msgstr ""
+#, fuzzy
+msgid "Unable to read from socket"
+msgstr "ተገናኝቷል"
 
 msgid "Buddy list downloaded"
 msgstr ""
@@ -3086,8 +3181,15 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "አገናኝ"
+
+#, fuzzy
+msgid "Connection failed"
 msgstr "መድረክን አስወግድ"
 
 #, fuzzy
@@ -3098,6 +3200,15 @@ msgstr "ውሪ"
 msgid "Chat _name:"
 msgstr "የአባት ስም፦"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "ተገናኝቷል"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
 #, fuzzy
 msgid "Chat error"
 msgstr "የIRC ስህተት"
@@ -3106,7 +3217,7 @@ msgid "This chat name is already in use"
 msgstr ""
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "ተገናኝቷል"
 
 #, fuzzy
@@ -3152,6 +3263,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "የጌም ተጠቃሚ"
 
+#, fuzzy
+msgid "GG server"
+msgstr "ተገናኝቷል"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -3168,7 +3283,7 @@ msgid "File Transfer Failed"
 msgstr "ፋይልን ላክ"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "መድረክን አስወግድ"
 
 msgid "Error displaying MOTD"
@@ -3184,8 +3299,15 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-#, fuzzy
-msgid "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
 msgstr "ተገናኝቷል"
 
 msgid "View MOTD"
@@ -3199,26 +3321,23 @@ msgstr "ጣቢያ፦"
 msgid "_Password:"
 msgstr "ሚስጢራዊ ቃል (_P)"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr ""
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "ተገናኝቷል"
 
-#, fuzzy
-msgid "Read error"
-msgstr "የIRC ስህተት"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
 msgid "Users"
@@ -3405,6 +3524,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "ቅጽል ስም"
+
 msgid "Cannot change nick"
 msgstr ""
 
@@ -3606,10 +3736,10 @@ msgstr "ትእዛዝ"
 msgid "execute"
 msgstr "አጥፉ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3624,19 +3754,48 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "ተገናኝቷል"
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "የIRC ስህተት"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr ""
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "ተገናኝቷል"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "ተገናኝቷል"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "ተገናኝቷል"
+
 msgid "Full Name"
 msgstr "ሙሉ ስም"
 
@@ -3702,190 +3861,27 @@ msgstr "ከተማ"
 msgid "Operating System"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "የጌም ማውሪያ"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "ትእዛዝ"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr ""
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "የIRC ስህተት"
-
 #, fuzzy
-msgid "User Location"
+msgid "Local Time"
 msgstr "አካባቢ"
 
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "የቢሮ መረጃ፦"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "ፋይልን ላክ"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "ተጠቃሚ መርጫዎች"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "ተጠቃሚ (_U)"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "ተጠቃሚ፦ (_U)"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ኢሜያል አድራሻ"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "የJabber ስህተት %s"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "ቅጽል ስም"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "መልእክት፦ (_M)"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "የቢሮ መረጃ፦"
-
 #, fuzzy
-msgid "User Chatting"
-msgstr "ተጠቃሚ መርጫዎች"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "ተጠቃሚ መርጫዎች"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "ተጠቃሚ (_U)"
+msgid "Priority"
+msgstr "ፖርት"
 
 #, fuzzy
-msgid "User Viewing"
-msgstr "ተጠቃሚ (_U)"
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgid "Resource"
+msgstr "ቀጥል (_R)"
 
-msgid "Hop Check"
+#, c-format
+msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Capabilities"
+msgid "Logged Off"
 msgstr ""
 "\n"
-"<b>ሁኔታ፦</b>"
-
-#, fuzzy
-msgid "Priority"
-msgstr "ፖርት"
-
-#, fuzzy
-msgid "Resource"
-msgstr "ቀጥል (_R)"
+"<b>ቅጽል ስም፦</b>"
 
 msgid "Middle Name"
 msgstr ""
@@ -3938,7 +3934,6 @@ msgstr ""
 msgid "Extended Away"
 msgstr ""
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
@@ -4071,27 +4066,24 @@ msgstr ""
 msgid "Find Rooms"
 msgstr "የውሪ ቤቶች"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "አካባቢ"
+
+#, fuzzy
+msgid "No users found"
+msgstr "ድምፆች"
 
-msgid "Write error"
+msgid "Roles:"
 msgstr ""
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "መድረክን አስወግድ"
 
-#, fuzzy
-msgid "Read Error"
-msgstr "የIRC ስህተት"
-
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-
-msgid "Unable to create socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4100,6 +4092,10 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "ተገናኝቷል"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
@@ -4126,9 +4122,6 @@ msgstr "የIRC ስህተት"
 msgid "Unregistration Failed"
 msgstr "መድረክን አስወግድ"
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr "ሁኔታ"
 
@@ -4142,6 +4135,9 @@ msgstr "ምንም"
 msgid "Date"
 msgstr "ቀን"
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -4170,6 +4166,10 @@ msgstr ""
 msgid "Change Registration"
 msgstr "የቤት አድራሻ፦"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "ተገናኝቷል"
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4188,9 +4188,18 @@ msgstr ""
 msgid "Re-initializing Stream"
 msgstr ""
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr ""
 
+msgid "Mood"
+msgstr ""
+
+msgid "Now Listening"
+msgstr ""
+
 #, fuzzy
 msgid "Both"
 msgstr "ወደ ታች"
@@ -4215,12 +4224,6 @@ msgstr "ምንም"
 msgid "Subscription"
 msgstr "መግለጫ"
 
-msgid "Mood"
-msgstr ""
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "ጽሑፍ"
@@ -4270,10 +4273,6 @@ msgid "Error changing password"
 msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
 #, fuzzy
-msgid "Password (again)"
-msgstr "ሚስጢራዊ ቃል፦"
-
-#, fuzzy
 msgid "Change XMPP Password"
 msgstr "ሚስጢራዊ ቃልን ለውጥ"
 
@@ -4479,15 +4478,21 @@ msgid "Unable to ping user %s"
 msgstr "ተገናኝቷል"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4499,11 +4504,37 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "ተገናኝቷል"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "ተገናኝቷል"
+
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "መድረክን አስወግድ"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
 msgstr ""
 
 #, fuzzy
+msgid "Select a Resource"
+msgstr "ቀጥል (_R)"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "የጌም ማውሪያ"
+
+#, fuzzy
 msgid "config:  Configure a chat room."
 msgstr "የውሪ ቤትን አገጣጥም"
 
@@ -4524,13 +4555,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4594,6 +4625,9 @@ msgstr "ተገናኝቷል"
 msgid "File transfer proxies"
 msgstr "ፋይልን ላክ"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4633,6 +4667,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 #, fuzzy
 msgid "Create New Room"
 msgstr "የውሪ ቤቶች"
@@ -4649,12 +4691,32 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr "አጥፉ"
 
+#, fuzzy
+msgid "No reason"
+msgstr "ያልታወቀ ስህተት"
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
-#, c-format
-msgid "Error in chat %s"
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr ""
+"%s\n"
+"%s፦ %s"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "ፋይልን ላክ"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "ተገናኝቷል"
+
+msgid "Failed to open in-band bytestream"
 msgstr ""
 
 #, c-format
@@ -4682,10 +4744,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "ቀጥል (_R)"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "ተጠቃሚ መርጫዎች"
 
@@ -4723,10 +4781,19 @@ msgstr "አካባቢ"
 msgid "Select an action"
 msgstr "የፊደል ቅርጽ ምረጡ"
 
-#, fuzzy
-msgid "Unable to retrieve MSN Address Book"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
 msgstr "ተገናኝቷል"
 
+msgid "Buddy Add error"
+msgstr ""
+
+msgid "The username specified does not exist."
+msgstr ""
+
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
@@ -4951,7 +5018,6 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4975,6 +5041,10 @@ msgstr "አስወግድ"
 msgid "Non-IM Contacts"
 msgstr "አስወግድ"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5044,6 +5114,13 @@ msgstr ""
 msgid "Page"
 msgstr "ድረ-ገጽ፦"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
+
 msgid "Has you"
 msgstr ""
 
@@ -5085,6 +5162,14 @@ msgid "Album"
 msgstr ""
 
 #, fuzzy
+msgid "Game Title"
+msgstr "አርእስት"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "አርእስት"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "እስክሪን ስም"
 
@@ -5123,10 +5208,6 @@ msgstr "የጌም ማውሪያ"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#, fuzzy
-msgid "Failed to connect to server."
-msgstr "ተገናኝቷል"
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5302,8 +5383,9 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
-msgstr ""
+#, fuzzy
+msgid "View web profile"
+msgstr "ኦንላይን"
 
 #. *< type
 #. *< ui_requirement
@@ -5338,69 +5420,28 @@ msgstr "መድረክን አስወግድ"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "መድረክን አስወግድ"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-#, fuzzy
-msgid "Unknown error."
-msgstr "ያልታወቀ ስህተት"
-
-#, fuzzy, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-"%s\n"
-"%s፦ %s"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "[መልዕክት የለም]"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "ያልታወቀ ስህተት"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "ተገናኝቷል"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "ተገናኝቷል"
-
 #, fuzzy, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "ተገናኝቷል"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
+msgid "Unknown error (%d)"
+msgstr "ያልታወቀ ስህተት"
 
-msgid "Service Temporarily Unavailable."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-#, fuzzy
-msgid "Unable to rename group"
-msgstr "ተገናኝቷል"
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5433,9 +5474,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 #, fuzzy
 msgid "Writing error"
 msgstr "የIRC ስህተት"
@@ -5450,19 +5488,20 @@ msgid ""
 "%s"
 msgstr "ያልታወቀ የስህተት ኮድ"
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, fuzzy, c-format
@@ -5493,6 +5532,14 @@ msgstr "ፋይልን ላክ"
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5529,33 +5576,21 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 msgid "Delete Buddy from Address Book?"
 msgstr ""
 
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr ""
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, fuzzy, c-format
-msgid "Unable to add \"%s\"."
-msgstr "ተገናኝቷል"
-
 msgid "The username specified is invalid."
 msgstr ""
 
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5569,18 +5604,67 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+#, fuzzy
+msgid "Unknown error."
+msgstr "ያልታወቀ ስህተት"
+
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
 msgstr ""
+"%s\n"
+"%s፦ %s"
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, fuzzy, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "ተገናኝቷል"
+
+#, fuzzy, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "ተገናኝቷል"
+
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "ተገናኝቷል"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
 msgstr ""
 
 #, fuzzy
+msgid "Unable to rename group"
+msgstr "ተገናኝቷል"
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+#, fuzzy
+msgid "User lookup"
+msgstr "ተጠቃሚ መርጫዎች"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "የIRC ስህተት"
 
@@ -5591,13 +5675,23 @@ msgstr ""
 msgid "Logging in"
 msgstr "የዝምብለህ ይግባ መርጫዎች"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "ተጠቃሚ፦ (_U)"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "ተገናኝቷል"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "[መልዕክት የለም]"
@@ -5617,22 +5711,22 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-#, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "ተጠቃሚ፦ (_U)"
-
-msgid "You appear to have no MySpace username."
+msgid "IM Friends"
 msgstr ""
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connected"
-msgstr "አገናኝ"
+msgid "Add contacts from server"
+msgstr "ተገናኝቷል"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5640,15 +5734,22 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "አዲስ ሚስጢራዊ ቃል"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
+#, fuzzy
+msgid "Invalid input condition"
+msgstr "ሰርቨር፦"
+
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5658,14 +5759,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "ተጠቃሚ መርጫዎች"
-
 msgid "Failed to remove buddy"
 msgstr ""
 
@@ -5675,37 +5768,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "ሰርቨር፦"
-
-msgid "Read buffer full (2)"
-msgstr ""
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "አዲስ መልእክት"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
+msgid "Missing Cipher"
 msgstr ""
 
-msgid "IM Friends"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "ተገናኝቷል"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5751,10 +5823,6 @@ msgid "User"
 msgstr "ተጠቃሚ (_U)"
 
 #, fuzzy
-msgid "Profile"
-msgstr "የJabber ስህተት %s"
-
-#, fuzzy
 msgid "Headline"
 msgstr "እንደገና ሰይም (_R)"
 
@@ -5769,15 +5837,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "የCTCP ዝርያ"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "ተጠቃሚ፦ (_U)"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 msgid "MySpaceIM - Username Available"
@@ -5789,6 +5852,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "ሰርቨርን የለም"
@@ -5796,6 +5862,14 @@ msgstr "ሰርቨርን የለም"
 msgid "Please try another username:"
 msgstr ""
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "ተጠቃሚ፦ (_U)"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5994,10 +6068,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "አዲስ ሚስጢራዊ ቃል"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6036,9 +6106,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr "ያልታወቀ ስህተት"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "ተገናኝቷል"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6141,9 +6211,6 @@ msgstr "የጌም ማውሪያ"
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -6164,23 +6231,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -6205,6 +6265,22 @@ msgstr "የቤት አድራሻ፦"
 msgid "Server port"
 msgstr "ሰርቨር፦"
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+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 ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "መድረክን አስወግድ"
@@ -6214,17 +6290,7 @@ msgid "Invalid chat room name"
 msgstr "የውስጥ ብልሽት"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "ተገናኝቷል"
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "ተገናኝቷል"
 
 #. *< type
@@ -6274,8 +6340,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "ተገናኝቷል"
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6449,23 +6516,18 @@ msgstr "ስም"
 msgid "Screen Sharing"
 msgstr "እስክሪን ስም"
 
-#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#, c-format
 msgid "Not Available"
 msgstr ""
 
-#, c-format
 msgid "Occupied"
 msgstr ""
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr ""
 
@@ -6481,15 +6543,11 @@ msgid "Buddy Comment"
 msgstr "የቢሮ መረጃ፦"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "ተገናኝቷል"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr "ተገናኝቷል"
 
 #, fuzzy
@@ -6505,46 +6563,50 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
-#, fuzzy
-msgid "Invalid username."
-msgstr "እስክሪን ስም"
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
 
-msgid "Incorrect password."
+msgid "Unable to get a valid AIM login hash."
 msgstr ""
 
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "ተጠቃሚ፦ (_U)"
+
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr ""
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6560,22 +6622,6 @@ msgstr ""
 msgid "_OK"
 msgstr "እሺ"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -6693,7 +6739,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, fuzzy, c-format
 msgid "Unable to send message: %s"
 msgstr "ተገናኝቷል"
@@ -6717,6 +6763,16 @@ msgstr "ኦንላይን"
 msgid "Member Since"
 msgstr ""
 
+#, fuzzy
+msgid "Capabilities"
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#, fuzzy
+msgid "Profile"
+msgstr "የJabber ስህተት %s"
+
 msgid "Your AIM connection may be lost."
 msgstr ""
 
@@ -6877,7 +6933,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6900,16 +6956,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
 msgid "(no name)"
 msgstr "(ስም የለም)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "ተገናኝቷል"
 
 #, c-format
 msgid ""
@@ -6973,6 +7029,7 @@ msgstr "አገናኝ"
 msgid "Get AIM Info"
 msgstr "መረጃ አግኝ"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr ""
 
@@ -7032,6 +7089,7 @@ msgstr ""
 msgid "Set User Info (web)..."
 msgstr "አዲስ መልእክት..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "ሚስጢራዊ ቃልን ለውጥ"
@@ -7065,6 +7123,9 @@ msgstr "የቢሮ መረጃ፦"
 msgid "Search for Buddy by Information"
 msgstr "የቢሮ መረጃ፦"
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7082,7 +7143,7 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr "ተገናኝቷል"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "ተገናኝቷል"
 
@@ -7188,7 +7249,7 @@ msgstr "ኦፔራ"
 msgid "Visible"
 msgstr ""
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7282,18 +7343,53 @@ msgstr "የአባት ስም"
 msgid "Could not change buddy information."
 msgstr "የቢሮ መረጃ፦"
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "የሞቢል ስልክ፦"
+
+#, fuzzy
+msgid "Note"
+msgstr "ምንም"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "የቢሮ መረጃ፦"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+msgid "_Modify"
+msgstr "ለውጡ (_M)"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "ለውጡ (_M)"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "ሰርቨር፦"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
 
-msgid "Input answer here"
+#, c-format
+msgid "%u requires verification"
 msgstr ""
 
 #, fuzzy
+msgid "Add buddy question"
+msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "የጌም ማውሪያ"
+
+#, fuzzy
 msgid "Send"
 msgstr "ላክ"
 
@@ -7304,19 +7400,20 @@ msgstr "እስክሪን ስም"
 msgid "Authorization denied message:"
 msgstr ""
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "መድረክን አስወግድ"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "የቢሮ መረጃ፦"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "የጌም ማውሪያ"
 
 msgid "Would you be my friend?"
 msgstr ""
@@ -7338,7 +7435,7 @@ msgid "Failed sending authorize"
 msgstr "ፋይልን ላክ"
 
 #, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr ""
 
 #, c-format
@@ -7381,6 +7478,9 @@ msgstr "የቢሮ መረጃ፦"
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
 msgid "Not member"
 msgstr ""
 
@@ -7419,15 +7519,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "ውሪን አገጣጥም"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "ስልክ"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7438,7 +7541,7 @@ msgstr "የድምፅ ምርጫዎች"
 msgid "Failed:"
 msgstr "ሴት"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7450,11 +7553,11 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "ስልክ"
 
 #, fuzzy
@@ -7465,7 +7568,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "የቢሮ መረጃ፦"
 
 #, fuzzy
@@ -7473,28 +7576,28 @@ msgid "Setup"
 msgstr "አድርግ"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr ""
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "አስወግድ (_R)"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "አስወግድ (_R)"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7614,6 +7717,13 @@ msgstr "<b>ሁኔታ፦</b> %s"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>ሁኔታ፦</b> %s"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>ሁኔታ፦</b> %s"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7621,7 +7731,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr ""
 
 #, fuzzy
@@ -7641,6 +7751,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr ""
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "የቤት አድራሻ፦"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7671,7 +7785,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "ተገናኝቷል"
@@ -7684,6 +7797,9 @@ msgstr "ሰርቨር፦"
 msgid "Show server news"
 msgstr "የቤት አድራሻ፦"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "የIRC ስህተት"
@@ -7693,13 +7809,9 @@ msgid "Update interval (seconds)"
 msgstr "የIRC ስህተት"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "ተገናኝቷል"
 
-#, fuzzy
-msgid "Can not decrypt get server reply"
-msgstr "ሰርቨርን የለም"
-
 #, c-format
 msgid "Failed requesting token, 0x%02X"
 msgstr ""
@@ -7719,20 +7831,16 @@ msgid "Activation required"
 msgstr ""
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-#, fuzzy
-msgid "Keep alive error"
-msgstr "የIRC ስህተት"
-
-msgid "Requesting captcha ..."
+msgid "Requesting captcha"
 msgstr ""
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
+msgid "Failed captcha verification"
 msgstr ""
 
 #, fuzzy
@@ -7743,7 +7851,7 @@ msgstr "ምስሉን አስቀምጥ... (_S)"
 msgid "Enter code"
 msgstr "ሚስጢራዊ ቃልን ለውጥ"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7751,68 +7859,42 @@ msgid "Enter the text from the image"
 msgstr "ተገናኝቷል"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr ""
-
 #, fuzzy
 msgid "Socket error"
 msgstr "ያልታወቀ ስህተት"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "ተገናኝቷል"
-
 #, fuzzy
-msgid "Unable to read from socket"
+msgid "Getting server"
 msgstr "ተገናኝቷል"
 
-#, fuzzy
-msgid "Write Error"
-msgstr "የIRC ስህተት"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "ተገናኝቷል"
-
-#, fuzzy
-msgid "Get server ..."
-msgstr "ተገናኝቷል"
-
-msgid "Request token"
+msgid "Requesting token"
 msgstr ""
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "መድረክን አስወግድ"
+msgid "Unable to resolve hostname"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "ሰርቨር፦"
 
 #, fuzzy
-msgid "Connecting server ..."
+msgid "Connecting to server"
 msgstr "ተገናኝቷል"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "የIRC ስህተት"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "ተገናኝቷል"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7821,6 +7903,12 @@ msgid ""
 "%s"
 msgstr "የቤት አድራሻ፦"
 
+#, fuzzy, c-format
+msgid "%s:%s"
+msgstr ""
+"%s\n"
+"%s፦ %s"
+
 #, c-format
 msgid "From %s:"
 msgstr ""
@@ -7831,32 +7919,30 @@ msgid ""
 "%s"
 msgstr "የቢሮ መረጃ፦"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "ያልታወቀ ስህተት"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "ትእዛዝ"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "ያልታወቀ ስህተት"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "ያልታወቀ ስህተት"
 
 #, fuzzy, c-format
@@ -7871,10 +7957,6 @@ msgstr "ፋይልን ላክ"
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "መድረክን አስወግድ"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>ሁኔታ፦</b> %s"
@@ -7934,19 +8016,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "ተገናኝቷል"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7974,6 +8043,10 @@ msgid "Video Camera"
 msgstr "ውሪ"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "ፋይልን ላክ"
+
+#, fuzzy
 msgid "Supports"
 msgstr "ፖርት"
 
@@ -8699,10 +8772,6 @@ msgid "Unit"
 msgstr ""
 
 #, fuzzy
-msgid "Note"
-msgstr "ምንም"
-
-#, fuzzy
 msgid "Join Chat"
 msgstr "ውሪን አገጣጥም"
 
@@ -8795,6 +8864,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8854,8 +8926,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr "ተገናኝቷል"
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "ተገናኝቷል"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8864,30 +8937,28 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-#, fuzzy
-msgid "Connection failed"
-msgstr "መድረክን አስወግድ"
-
 msgid "Performing key exchange"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to create connection"
+msgid "Unable to load SILC key pair"
 msgstr "ተገናኝቷል"
 
-msgid "Could not load SILC key pair"
-msgstr ""
-
 #. Progress
 #, fuzzy
 msgid "Connecting to SILC Server"
 msgstr "ተገናኝቷል"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "ተገናኝቷል"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "ተገናኝቷል"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -9174,8 +9245,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "ተገናኝቷል"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9268,6 +9340,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "ሰርቨርን የለም"
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9308,38 +9383,37 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "የአባት ስም፦"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-#, fuzzy
-msgid "Could not write"
-msgstr "መድረክን አስወግድ"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
-msgid "Could not connect"
-msgstr "መድረክን አስወግድ"
+msgid "Unable to create connection"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "ያልታወቀ ስህተት"
 
-msgid "Could not create listen socket"
-msgstr ""
-
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "ተገናኝቷል"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "ሰርቨር፦"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9376,175 +9450,67 @@ msgstr ""
 msgid "Auth Domain"
 msgstr "አውቶማቲክ"
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr ""
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr ""
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr ""
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr ""
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr ""
-
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
-
-#, c-format
-msgid "No keywords."
-msgstr ""
-
-#, c-format
-msgid "User has no directory information."
-msgstr ""
-
-#, c-format
-msgid "Country not supported."
-msgstr ""
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "አዲስ ሚስጢራዊ ቃል"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
 #, fuzzy
-msgid "Invalid Groupname"
-msgstr "እስክሪን ስም"
-
-msgid "Connection Closed"
-msgstr ""
+msgid "Yahoo ID..."
+msgstr "ምረጡ..."
 
-msgid "Waiting for reply..."
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "የJabber ስህተት %s"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
+#, fuzzy
+msgid "Pager server"
+msgstr "ሰርቨርን የለም"
 
-msgid "Password Change Successful"
+msgid "Pager port"
 msgstr ""
 
-msgid "_Group:"
-msgstr "መድረክ፦ (_G)"
+#, fuzzy
+msgid "File transfer server"
+msgstr "ፋይልን ላክ"
 
-msgid "Get Dir Info"
+msgid "File transfer port"
 msgstr ""
 
-msgid "Set Dir Info"
-msgstr ""
+#, fuzzy
+msgid "Chat room locale"
+msgstr "የውሪ ቤቶች"
 
-#, c-format
-msgid "Could not open %s for writing!"
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "የውሪ ቤቶች"
 
-msgid "Could not connect for transfer."
+msgid "Yahoo Chat server"
 msgstr ""
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat port"
 msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
-
-#, 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] ""
-
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr ""
+msgid "Yahoo JAPAN ID..."
+msgstr "ምረጡ..."
 
 #. *< type
 #. *< ui_requirement
@@ -9556,11 +9522,10 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
+msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9583,6 +9548,28 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "ተገናኝቷል"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "አዲስ ሚስጢራዊ ቃል"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9611,35 +9598,28 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "ተገናኝቷል"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-#, fuzzy
-msgid "Connection problem"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr "ተገናኝቷል"
 
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr "ተገናኝቷል"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-
 #, fuzzy
 msgid "Not at Home"
 msgstr "የአባት ስም፦"
@@ -9694,7 +9674,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 #, fuzzy
@@ -9711,78 +9691,15 @@ msgstr "ውሪ አገጣጥም..."
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ምረጡ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-#, fuzzy
-msgid "Pager server"
-msgstr "ሰርቨርን የለም"
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "ፋይልን ላክ"
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "የውሪ ቤቶች"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "የውሪ ቤቶች"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9790,6 +9707,10 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "ተገናኝቷል"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "የIRC ስህተት"
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9834,13 +9755,8 @@ msgstr ""
 msgid "Last Update"
 msgstr "የአባት ስም"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr ""
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9905,6 +9821,10 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
+#, fuzzy
+msgid "Connection problem"
+msgstr "ተገናኝቷል"
+
 msgid "Unable to fetch room list."
 msgstr ""
 
@@ -9913,13 +9833,7 @@ msgid "User Rooms"
 msgstr "ተጠቃሚ መርጫዎች"
 
 #, fuzzy
-msgid "Connection problem with the YCHT server."
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
+msgid "Connection problem with the YCHT server"
 msgstr "ተገናኝቷል"
 
 msgid ""
@@ -10042,30 +9956,21 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "ተገናኝቷል"
 
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "ተገናኝቷል"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10158,10 +10063,6 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-#, fuzzy
-msgid "Mobile"
-msgstr "የሞቢል ስልክ፦"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10203,16 +10104,6 @@ msgstr ""
 msgid "%x %X"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr ""
 
@@ -10320,6 +10211,16 @@ msgstr "ተገናኝቷል"
 msgid "Address already in use."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "አዲስ መልእክት"
@@ -10368,10 +10269,9 @@ msgstr "አያያዝ ቦታ ቅጂ"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s ምርጫዎች"
+#, fuzzy
+msgid "_Advanced"
+msgstr "ተወው"
 
 msgid "Use GNOME Proxy Settings"
 msgstr ""
@@ -10406,9 +10306,6 @@ msgstr ""
 msgid "you can see the butterflies mating"
 msgstr ""
 
-msgid "Proxy Options"
-msgstr ""
-
 msgid "Proxy _type:"
 msgstr ""
 
@@ -10440,8 +10337,8 @@ msgid "Create _this new account on the server"
 msgstr ""
 
 #, fuzzy
-msgid "_Advanced"
-msgstr "ተወው"
+msgid "_Proxy"
+msgstr "ፖርት"
 
 #, fuzzy
 msgid "Enabled"
@@ -10480,16 +10377,19 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "የIRC ስህተት"
+msgid "A_ccount"
+msgstr ""
+"\n"
+"<b>ቅጽል ስም፦</b>"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr ""
+#, fuzzy
+msgid "Room _List"
+msgstr "የIRC ስህተት"
 
 #, fuzzy
 msgid "_Block"
@@ -10510,6 +10410,17 @@ msgid "I_M"
 msgstr ""
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "ውሪ"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "ውሪ"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "ፋይልን ላክ"
 
@@ -10521,7 +10432,11 @@ msgid "View _Log"
 msgstr ""
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "ኦንላይን"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "ኦንላይን"
 
 msgid "_Alias..."
@@ -10671,6 +10586,10 @@ msgid "/Tools/_Certificates"
 msgstr "ምርጫዎች"
 
 #, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "ምርጫዎች"
+
+#, fuzzy
 msgid "/Tools/Plu_gins"
 msgstr "ምርጫዎች"
 
@@ -10682,10 +10601,6 @@ msgid "/Tools/Pr_ivacy"
 msgstr ""
 
 #, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "ምርጫዎች"
-
-#, fuzzy
 msgid "/Tools/_File Transfers"
 msgstr "ምርጫዎች"
 
@@ -10812,7 +10727,7 @@ msgstr ""
 msgid "By status"
 msgstr "ሁኔታ፦"
 
-msgid "By log size"
+msgid "By recent log activity"
 msgstr ""
 
 #, fuzzy, c-format
@@ -10831,6 +10746,9 @@ msgstr "አገናኝ"
 msgid "Re-enable"
 msgstr "እንደገና ሰይም (_R)"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10924,6 +10842,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "የጌም ማውሪያ"
 
+msgid "_Group:"
+msgstr "መድረክ፦ (_G)"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10964,6 +10885,113 @@ msgstr "/መሣሪያዎች (_T)"
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "የመደቡ ቀለም"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "ዝምብለህ ይግባ"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "የመደቡ ቀለም"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "የመደቡ ቀለም"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "ጽሑፍ"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "የመደቡ ቀለም"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "አቋራጮች"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "ኦንላይን"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "ሁኔታ፦"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "ኦንላይን"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "ጽሑፍ"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "መልእክት፦ (_M)"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -10983,12 +11011,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
 msgid "_Buddy:"
 msgstr ""
 
@@ -11020,7 +11042,7 @@ msgid "Get Away Message"
 msgstr "አዲስ መልእክት"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "የአባት ስም፦"
 
 #, fuzzy
@@ -11071,6 +11093,22 @@ msgstr ""
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "መድረክን አስወግድ"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "ተገናኝቷል"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "ተገናኝቷል"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "ተገናኝቷል"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "ተገናኝቷል"
+
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
@@ -11150,6 +11188,18 @@ msgid "/Conversation/View Log"
 msgstr ""
 
 #, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "ተገናኝቷል"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "ተገናኝቷል"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "ተገናኝቷል"
+
+#, fuzzy
 msgid "/Conversation/Send File..."
 msgstr "መድረክን አስወግድ"
 
@@ -11344,6 +11394,9 @@ msgstr "አድራሻ፦"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr ""
 
@@ -11477,6 +11530,10 @@ msgstr ""
 msgid "Hungarian"
 msgstr ""
 
+#, fuzzy
+msgid "Armenian"
+msgstr "የጌም ማውሪያ"
+
 msgid "Indonesian"
 msgstr ""
 
@@ -11494,6 +11551,10 @@ msgstr "ዝምብለህ ይግባ"
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
+#, fuzzy
+msgid "Khmer"
+msgstr "ኦፔራ"
+
 msgid "Kannada"
 msgstr ""
 
@@ -11516,6 +11577,9 @@ msgstr ""
 msgid "Macedonian"
 msgstr ""
 
+msgid "Mongolian"
+msgstr ""
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11573,6 +11637,9 @@ msgstr ""
 msgid "Swedish"
 msgstr ""
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "አርእስት"
@@ -11628,7 +11695,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 
 msgid "Current Developers"
@@ -11897,7 +11981,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11935,15 +12019,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "አያያዝ ቦታ ቅጂ"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "አያያዝ ቦታ ቅጂ"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11956,16 +12047,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "አያያዝ ቦታ ቅጂ"
 
-#, fuzzy
-msgid "_Copy Email Address"
-msgstr "ኢሜያል አድራሻ"
-
-msgid "_Open Link in Browser"
-msgstr ""
-
-msgid "_Copy Link Location"
-msgstr "አያያዝ ቦታ ቅጂ"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11996,11 +12077,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "ምስሉን አስቀምጥ... (_S)"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "ምስሉን አስቀምጥ... (_S)"
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12093,10 +12172,6 @@ msgid "Font Face"
 msgstr "የፊደል ቅርጽ ዘይቤ"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "የመደቡ ቀለም"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "የመደቡ ቀለም"
 
@@ -12221,6 +12296,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12238,6 +12314,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12269,11 +12346,25 @@ msgstr ""
 msgid "Pidgin"
 msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
 
-#, fuzzy
-msgid "Open All Messages"
-msgstr "አዲስ መልእክት"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+msgid "Calling..."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
 
 #, c-format
@@ -12303,6 +12394,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "(1 መልዕክት)"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "አዲስ መልእክት"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "የቢሮ መረጃ፦"
+
+msgid "Dismiss"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12352,10 +12464,17 @@ msgstr ""
 msgid "Select a file"
 msgstr ""
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "የቢሮ መረጃ፦"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr ""
+
 #, fuzzy
 msgid "_Buddy name:"
 msgstr "የቢሮ መረጃ፦"
@@ -12430,7 +12549,57 @@ msgstr ""
 msgid "Pounce Target"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "ጌም -  ምልክትን አስቀምጥ"
+
+#, c-format
+msgid "Paused while typing"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "ጌም -  ምልክትን አስቀምጥ"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr ""
+
+#, c-format
+msgid "Returned from being away"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "ጌም -  ምልክትን አስቀምጥ"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "ጌም -  ምልክትን አስቀምጥ"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "ድረ-ገጽ፦"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "[መልዕክት የለም]"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12452,6 +12621,12 @@ msgstr "አቋራጮች"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "ተገናኝቷል"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "የቢሮ መረጃ፦"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr ""
 
@@ -12463,7 +12638,7 @@ msgid "On unread messages"
 msgstr "[መልዕክት የለም]"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "ተገናኝቷል"
 
 #, fuzzy
@@ -12473,6 +12648,10 @@ msgstr "<አዲስ ተጠቃሚ>"
 msgid "When away"
 msgstr ""
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "<አዲስ ተጠቃሚ>"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "መክፈቻዎች"
@@ -12533,10 +12712,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "<አዲስ ተጠቃሚ>"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12570,15 +12745,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "የቢሮ መረጃ፦"
 
-#, fuzzy
-msgid "ST_UN server:"
-msgstr "ሰርቨር፦"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "አድራሻ፦"
 
 msgid "Public _IP:"
@@ -12602,6 +12773,10 @@ msgstr "ፖርት፦"
 msgid "_End port:"
 msgstr "ፖርት፦"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr ""
 
@@ -12630,6 +12805,10 @@ msgstr ""
 msgid "No proxy"
 msgstr ""
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 #, fuzzy
 msgid "_User:"
 msgstr "ተጠቃሚ (_U)"
@@ -12797,10 +12976,10 @@ msgstr ""
 msgid "Auto-away"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-msgid "_Minutes before becoming idle:"
+msgid "Change status when _idle"
 msgstr ""
 
 #, fuzzy
@@ -12962,28 +13141,19 @@ msgstr "አስቀምጥ እና ተጠቀም"
 msgid "Status for %s"
 msgstr "ሁኔታ፦ %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "ምስል አስገባ"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "የቢሮ መረጃ፦"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-msgid "Please select an image for the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "ምስል አስገባ"
@@ -12993,21 +13163,29 @@ msgid "Add Smiley"
 msgstr "ምስል አስገባ"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "ምስሉን አስቀምጥ... (_S)"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "አቋራጮች"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "ምስል አስገባ"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "አቋራጮች"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "የፊደል ቅርጽ ምረጡ"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13091,8 +13269,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13124,6 +13302,17 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "ኦንላይን"
+
+msgid "_Copy Link Location"
+msgstr "አያያዝ ቦታ ቅጂ"
+
+#, fuzzy
+msgid "_Copy Email Address"
+msgstr "ኢሜያል አድራሻ"
+
+#, fuzzy
 msgid "Save File"
 msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
 
@@ -13226,6 +13415,72 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "የቤት አድራሻ፦"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "የጌም ማውሪያ"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "የፊደል ቅርጽ ምረጡ"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "ኦንላይን"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+
+msgid "Gateway"
+msgstr ""
+
+#, fuzzy
+msgid "Directory"
+msgstr "ሰርቨር፦"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "መግለጫ"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "መቃኛ (_B)"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "የቤት አድራሻ፦"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "የJabber ስህተት %s"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -13619,7 +13874,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13728,12 +13983,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13744,6 +13993,10 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr "አዲስ መልእክት"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "አያያዝ ቦታ ቅጂ"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13775,36 +14028,23 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "የውስጥ ብልሽት"
+msgid "Disable Typing Notification Text"
+msgstr "አያያዝ ቦታ ቅጂ"
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "ቀለም"
+
 msgid "Fonts"
 msgstr "የፊደል ቅርጾች"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13888,7 +14128,7 @@ msgstr "ተገናኝቷል"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13940,6 +14180,110 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr ""
+"\n"
+"<b>ቅጽል ስም፦</b>"
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "ውሪን አገጣጥም"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "ተዉት"
+
+#, fuzzy
+msgid "Founder"
+msgstr "ሰዓት"
+
+#, fuzzy
+msgid "Operator"
+msgstr "ኦፔራ"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "ተዉት"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "የIRC ስህተት"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "የቢሮ መረጃ፦"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "ሁኔታ፦ %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "የውሪ ቤቶች"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "መረጃ አግኝ"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "የቢሮ መረጃ፦"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14099,9 +14443,6 @@ msgstr ""
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr ""
-
 #, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "የዝምብለህ ይግባ መርጫዎች"
@@ -14110,7 +14451,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14155,6 +14496,221 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+#~ msgid "Server has disconnected"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Read error"
+#~ msgstr "የIRC ስህተት"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "የጌም ማውሪያ"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "ትእዛዝ"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "የIRC ስህተት"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "አካባቢ"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "ተጠቃሚ መርጫዎች"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "ተጠቃሚ (_U)"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>ሁኔታ፦</b>"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "ተጠቃሚ፦ (_U)"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ኢሜያል አድራሻ"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "የJabber ስህተት %s"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "ቅጽል ስም"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "መልእክት፦ (_M)"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "ተጠቃሚ መርጫዎች"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "ተጠቃሚ መርጫዎች"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "ተጠቃሚ (_U)"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "ተጠቃሚ (_U)"
+
+#, fuzzy
+#~ msgid "Read Error"
+#~ msgstr "የIRC ስህተት"
+
+#, fuzzy
+#~ msgid "Failed to connect to server."
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "አዲስ መልእክት"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "እስክሪን ስም"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+#~ msgid "Could not connect"
+#~ msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "አዲስ ሚስጢራዊ ቃል"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "የውስጥ ብልሽት"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "(1 መልዕክት)"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "ሰርቨርን የለም"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "የIRC ስህተት"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "አዲስ ሚስጢራዊ ቃል"
+
+#, fuzzy
+#~ msgid "Invalid Groupname"
+#~ msgstr "እስክሪን ስም"
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+
+#~ msgid "%s Options"
+#~ msgstr "%s ምርጫዎች"
+
+#, fuzzy
+#~ msgid "ST_UN server:"
+#~ msgstr "ሰርቨር፦"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "ምስሉን አስቀምጥ... (_S)"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "አቋራጮች"
+
+#, fuzzy
 #~ msgid "Primary Information"
 #~ msgstr "የቢሮ መረጃ፦"
 
@@ -14187,15 +14743,6 @@ msgstr ""
 #~ msgstr "መድረክን አስወግድ"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "%s፦ %s"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "አዲስ መልእክት"
 
@@ -14232,10 +14779,6 @@ msgstr ""
 #~ msgstr "ተገናኝቷል"
 
 #, fuzzy
-#~ msgid "XMPP developer"
-#~ msgstr "የJabber ስህተት %s"
-
-#, fuzzy
 #~ msgid "<b>ChangeLog:</b><br>%s"
 #~ msgstr "<b>ሁኔታ፦</b> %s"
 
@@ -14338,20 +14881,10 @@ msgstr ""
 #~ msgstr "አዲስ ሚስጢራዊ ቃል"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "ተገናኝቷል"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "መልእክት፦ (_M)"
 
 #, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>ቅጽል ስም፦</b>"
-
-#, fuzzy
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "ተገናኝቷል"
 
@@ -14481,10 +15014,6 @@ msgstr ""
 #~ msgstr "<B>UIN:</B> %s<BR><B>ሁኔታ:</B> %s<HR>%s"
 
 #, fuzzy
-#~ msgid "Web aware"
-#~ msgstr "ድረ-ገጽ፦"
-
-#, fuzzy
 #~ msgid "EMail"
 #~ msgstr "ኢሜይል"
 
@@ -14510,9 +15039,6 @@ msgstr ""
 #~ msgstr[0] "(%d መልዕክቶች)"
 #~ msgstr[1] "(%d መልዕክቶች)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 መልዕክት)"
-
 #, fuzzy
 #~ msgid "Mail Server"
 #~ msgstr "ሰርቨር፦"
@@ -14616,14 +15142,6 @@ msgstr ""
 #~ msgid "_Preferences"
 #~ msgstr "ምርጫዎች"
 
-#, fuzzy
-#~ msgid "Initiate Chat"
-#~ msgstr "የጌም ማውሪያ"
-
-#, fuzzy
-#~ msgid "_Browse"
-#~ msgstr "መቃኛ (_B)"
-
 #~ msgid "Style"
 #~ msgstr "ዓይነት"
 
@@ -14633,9 +15151,6 @@ msgstr ""
 #~ msgid "Face"
 #~ msgstr "የፊደል ቅርጽ ዘይቤ"
 
-#~ msgid "Color"
-#~ msgstr "ቀለም"
-
 #~ msgid "Window"
 #~ msgstr "መስኮት"
 
diff --git a/po/ar.po b/po/ar.po
index b68ed8c6ac..818173221e 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-01 09:57+0000\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-11-01 17:41+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -21,7 +21,8 @@ msgstr ""
 "X-Poedit-Language: Arabic\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -32,13 +33,13 @@ msgstr "فِنْش"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. جرّب `%s -h' لمزيد من المعلومات.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -593,25 +594,13 @@ msgstr "لقد فارقت هذه الدردشة."
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "بدأ التسجيل. الرسائل اللاحقة في هذه المحادثة ستسجل."
 
-msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
 msgstr "أُوقِف التسجيل. الرسائل اللاحقة في هذه المحادثة لن تسجل."
 
 msgid "Send To"
 msgstr "أرسل إلى"
 
-msgid "Invite message"
-msgstr "رسالة الدعوة"
-
-msgid "Invite"
-msgstr "ادعُ"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"أدخل اسم المستخدم الذي ترغب في دعوته،\n"
-"مع رسالة دعوة اختيارية."
-
 msgid "Conversation"
 msgstr "محادثة"
 
@@ -680,7 +669,8 @@ msgstr "me &lt;إجراء&gt;: يرسل فعلا على نمط آي‌آر‌س�
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "debug &lt;option&gt;:  يرسل معلومات متنوعة للتنقيح إلى المحادثة الحالية."
+msgstr ""
+"debug &lt;option&gt;:  يرسل معلومات متنوعة للتنقيح إلى المحادثة الحالية."
 
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: يمسح ما سبق في نافذة المحادثة."
@@ -831,9 +821,11 @@ msgstr ""
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
-msgstr "الرسائل الفورية ستسجل فقط إذا كان خيار \"سجل جميع الرسائل الفورية\" مفعلا."
+msgstr ""
+"الرسائل الفورية ستسجل فقط إذا كان خيار \"سجل جميع الرسائل الفورية\" مفعلا."
 
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "الدردشات ستسجل فقط إذا كان خيار \"سجل جميع الدردشات\" مفعلا.."
 
 msgid "No logs were found"
@@ -860,6 +852,41 @@ msgstr "كل المحادثات"
 msgid "System Log"
 msgstr "سجل النظام"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "يجري حسابات..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "اقبل"
+
+msgid "Reject"
+msgstr "ارفض"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "لقد فارقت القناة%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "بريد إلكتروني"
 
@@ -898,6 +925,9 @@ msgstr "استمر"
 msgid "IM"
 msgstr "رسالة فورية"
 
+msgid "Invite"
+msgstr "ادعُ"
+
 msgid "(none)"
 msgstr "(بدون)"
 
@@ -941,7 +971,8 @@ msgstr "عطل أثناء تحميل الملحقة"
 msgid "The selected file is not a valid plugin."
 msgstr "الملف المختار ليس ملحقة سليمة."
 
-msgid "Please open the debug window and try again to see the exact error message."
+msgid ""
+"Please open the debug window and try again to see the exact error message."
 msgstr "من فضلك افتح نافذة التنقيح وحاول أن ترى رسالة العطل بدقّة."
 
 msgid "Select plugin to install"
@@ -1143,7 +1174,6 @@ msgstr "الدقائق المنقضية قبل تغيير الحالة"
 msgid "Change status to"
 msgstr "غيّر الحالة إلى"
 
-#. Conversations
 msgid "Conversations"
 msgstr "محادثات"
 
@@ -1310,7 +1340,7 @@ msgstr "النّوع"
 #. PurpleStatusPrimitive
 #. id - use default
 #. name - use default
-#. savable
+#. saveable
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
@@ -1504,6 +1534,28 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "ملحقة آخر سجل."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "مسار اللحن"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "الحسابات"
 
@@ -1604,13 +1656,6 @@ msgstr "أتقبل شهادة %s؟"
 msgid "SSL Certificate Verification"
 msgstr "التّحقّق من شهادة SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "اقبل"
-
-msgid "Reject"
-msgstr "ارفض"
-
 msgid "_View Certificate..."
 msgstr "اعرض ال_شهادة..."
 
@@ -1641,10 +1686,12 @@ msgstr "سلسلة شهادات غير صحيحة"
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
-msgstr "ليست لديك قاعدة بيانات بالشهادات الجذر، لذا لا يمكن التحقق من هذه الشهادة."
+msgstr ""
+"ليست لديك قاعدة بيانات بالشهادات الجذر، لذا لا يمكن التحقق من هذه الشهادة."
 
 #. vrq will be completed by user_auth
-msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "الشهادة الجذر التي تزعم هذه أنها أُصدِرت منها مجهولة لبِدْجِن."
 
 #, c-format
@@ -1706,6 +1753,8 @@ msgstr "+++ %s ولج"
 msgid "+++ %s signed off"
 msgstr "+++ %s خرج"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "عُطل مجهول"
 
@@ -1752,6 +1801,16 @@ msgstr "%s ترك الغرفة."
 msgid "%s left the room (%s)."
 msgstr "%s ترك الغرفة (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "ادعُ إلى الاجتماع"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "أدخل اسم المستخدم الذي ترغب في دعوته، مع رسالة دعوة اختيارية."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "تعذَّر الاتصال: %s"
@@ -1796,6 +1855,7 @@ msgstr ""
 "عطل في القراءة من صيرورة الاستجلاء:\n"
 "%s"
 
+#, c-format
 msgid "Resolver process exited without answering our request"
 msgstr ""
 
@@ -2021,7 +2081,8 @@ msgstr ""
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
-msgstr "صحيح إذا كان الأمر المستخدم لمعالجة هذا النوع من المسارات سيشتغل في مرقاب."
+msgstr ""
+"صحيح إذا كان الأمر المستخدم لمعالجة هذا النوع من المسارات سيشتغل في مرقاب."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "إذا ما كان الأمر المحدّد سيستخدم لمعالجة مسارات \"aim\""
@@ -2092,6 +2153,10 @@ msgstr "<font color=\"red\"><b>تعذَّرت قراءة الملف: %s</b></fon
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <رد-تلقائي>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "خطأ في إنشاء الاتصال"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "أنت تستخدم %s، بينما هذه الملحقة تتطلب %s."
@@ -2107,7 +2172,8 @@ msgstr "لا يتطابق الرقم السحري للملحقة %d (المطل�
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "لا تتطابق الواجهة التنفيذية للتطبيق %d.%d.x (المطلوب %d.%d.x)"
 
-msgid "Plugin does not implement all required functions (list_icon, login and close)"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
 msgstr "الملحقة لا تطبق جميع الوظائف المطلوبة ((list_icon، الولوج والغلق)"
 
 #, c-format
@@ -2317,7 +2383,8 @@ msgstr "ملحقة اختبار دعم IPC كعميل."
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
-msgstr "ملحقة اختبارية لدعم IPC. تحدد موضع النركيبة الخادوم ويستدعي الأوامر المسجلة."
+msgstr ""
+"ملحقة اختبارية لدعم IPC. تحدد موضع النركيبة الخادوم ويستدعي الأوامر المسجلة."
 
 #. *< type
 #. *< ui_requirement
@@ -2479,9 +2546,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "يُضمِّن سجلات عملاء التراسل الأخرى في عارض السجلات."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2535,8 +2603,9 @@ msgstr "محاكاة الرسائل بلا اتصال"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "احفظ الرسائل المرسلة إلى مستخدم غير متصل كإشعار."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "المتبقي من الرسائل سيحفظ كإشعار. يمكنك تحرير/حذف الإشعار من مربع حوار `إشعار "
@@ -2568,6 +2637,32 @@ msgstr "احفظ الرسائل بلا اتصال في الإشعار"
 msgid "Do not ask. Always save in pounce."
 msgstr "لاتسأل. دائمًا احفظ في إشعارات."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "أدخل كلمة السر"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2758,21 +2853,22 @@ msgstr ""
 "تعذّر اكتشاف تثبيت ActiveTCL. إذا كنت ترغب في استخدام ملحقات TCL، ثبِّت "
 "ActiveTCL من   http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"لم يُعثر على عدة أدوات أبل بونجور لويندوز، راجع الأسئلة الشائعة في: "
-"http://d.pidgin.im/BonjourWindows "
-"لمزيد من المعلومات."
+"لم يُعثر على عدة أدوات أبل بونجور لويندوز، راجع الأسئلة الشائعة في: http://d."
+"pidgin.im/BonjourWindows لمزيد من المعلومات."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "تعذّر الاستماع إلى اتصالات التراسل الفوري الواردة\n"
 
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "تعذر الاتصال بخادوم mDNS المحلّي. هل يعمل؟"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "الاسم الأول"
 
@@ -2804,6 +2900,11 @@ msgstr "ملحقة بروتوكول بونجور"
 msgid "Purple Person"
 msgstr "شخص أرجواني"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "المحلية"
+
 msgid "Bonjour"
 msgstr "بونجور"
 
@@ -2814,14 +2915,21 @@ msgstr "%s أغلق المحادثة."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "تعذّر إرسال الرسالة، لا يمكن أن تبدأ المحادثة."
 
-msgid "Cannot open socket"
-msgstr "لا يمكن فتح المقبس"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"تعذّر إنشاء مقبس:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "لا يمكن ربط المقبس بالمنفذ"
 
-msgid "Could not listen on socket"
-msgstr "لا يمكن الاستماع إلى المقبس"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"تعذّر إنشاء مقبس:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "عطل أثناء التواصل مع mDNSResponder."
@@ -2868,13 +2976,16 @@ msgstr "احفظ قائمة الأصدقاء..."
 msgid "Load buddylist from file..."
 msgstr "حمّل قائمة الأصدقاء من ملف..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "املأ حقول التسجيل."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "كلمة السر غير متطابقة."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "تعذّر تسجيل حساب جديد. حدث خطأ.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2886,14 +2997,15 @@ msgstr "اكتمل التسجيل بنجاح!"
 msgid "Password"
 msgstr "كلمة السّر"
 
-msgid "Password (retype)"
-msgstr "أعد كتابة كلمة السر"
+msgid "Password (again)"
+msgstr "كلمة السر (مجددًا)"
 
-msgid "Enter current token"
-msgstr "أدخل الرمز الحالي"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "الرمز الحالي"
+#, fuzzy
+msgid "Captcha"
+msgstr "صورة كابتشا"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "سجّل حساب Gadu-Gadu جديد"
@@ -2946,6 +3058,15 @@ msgstr "غيّرت كلمة السر بنجاح"
 msgid "Current password"
 msgstr "كلمة السر الحالية"
 
+msgid "Password (retype)"
+msgstr "أعد كتابة كلمة السر"
+
+msgid "Enter current token"
+msgstr "أدخل الرمز الحالي"
+
+msgid "Current token"
+msgstr "الرمز الحالي"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "من فضلك، أدخل كلمة السر الحالية وكلمة السر الجديدة لـ UIN: "
 
@@ -2959,6 +3080,7 @@ msgstr "اختر دردشة للصديق: %s"
 msgid "Add to chat..."
 msgstr "أشرك في الدردشة..."
 
+#. Global
 msgid "Available"
 msgstr "متاح"
 
@@ -2992,8 +3114,8 @@ msgstr "لا يوجد مستخدمون مطابقون"
 msgid "There are no users matching your search criteria."
 msgstr "لا يوجد مستخدمون يطابقون معيار البحث."
 
-msgid "Unable to read socket"
-msgstr "تعذّرت قراءة المقبس"
+msgid "Unable to read from socket"
+msgstr "تعذّرت القراءة من المقبس"
 
 msgid "Buddy list downloaded"
 msgstr "جُلِبَت قائمة الأصدقاء"
@@ -3007,8 +3129,14 @@ msgstr "حُفِظت قائمة الأصدقاء"
 msgid "Your buddy list was stored on the server."
 msgstr "تم حفظ قائمة أصدقائك على الخادوم."
 
-msgid "Connection failed."
-msgstr "فشل الاتصال."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "متَّصل"
+
+msgid "Connection failed"
+msgstr "فشل الاتصال"
 
 msgid "Add to chat"
 msgstr "أضف إلى الدردشة"
@@ -3016,13 +3144,23 @@ msgstr "أضف إلى الدردشة"
 msgid "Chat _name:"
 msgstr "ا_سم الدردشة:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "تعذّر الاتصال بالخادوم."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "يتّصل"
+
 msgid "Chat error"
 msgstr "عُطل في الدردشة"
 
 msgid "This chat name is already in use"
 msgstr "اسم الدردشة هذا مستخدم بالفعلً"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "غير متصل بالخادوم."
 
 msgid "Find buddies..."
@@ -3064,6 +3202,10 @@ msgstr "مرسال فوري بولندي شهير"
 msgid "Gadu-Gadu User"
 msgstr "مستخدم Gadu-Gadu "
 
+#, fuzzy
+msgid "GG server"
+msgstr "اجلب الخادوم ..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "أمر مجهول: %s"
@@ -3078,7 +3220,8 @@ msgstr "لم يُحدد أي موضوع"
 msgid "File Transfer Failed"
 msgstr "فشل إرسال الملف"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "لا يمكن فتح منفذ استماع."
 
 msgid "Error displaying MOTD"
@@ -3094,8 +3237,18 @@ msgstr "لا توجد \"رسالة يوم\" مرتبطة بهذا الاتصال
 msgid "MOTD for %s"
 msgstr "\"رسالة اليوم\" لأجل %s "
 
-msgid "Server has disconnected"
-msgstr "قطع الخادومُ الاتصال"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"فُقد الاتصال بالخادوم:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "اعرض \"رسالة اليوم\""
@@ -3106,25 +3259,24 @@ msgstr "ال_قناة:"
 msgid "_Password:"
 msgstr "كلمة ال_سر:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "لا يمكن للاسم المستعار في IRC أن يحوي مسافة خاوية"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "يتّصل"
-
 msgid "SSL support unavailable"
 msgstr "لا يتوفر دعم SSL"
 
-msgid "Couldn't create socket"
-msgstr "تعذَّر إنشاء مقبس"
+msgid "Unable to connect"
+msgstr "تعذّر الاتصال"
 
-msgid "Couldn't connect to host"
-msgstr "لا يمكن الاتصال بالخادوم"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "تعذّر الاتصال ب%s"
 
-msgid "Read error"
-msgstr "خطأ في القراءة"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "أَغلقَ الخادومُ الاتصال"
 
 msgid "Users"
 msgstr "المستخدمون"
@@ -3299,7 +3451,19 @@ msgstr "رفض الخادوم الكنية التي اخترتها. من الم�
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr "رفض الخادوم اسم الحساب الذي اخترته.  من المحتمل أنها تحتوي محارف غير صالحة."
+msgstr ""
+"رفض الخادوم اسم الحساب الذي اخترته.  من المحتمل أنها تحتوي محارف غير صالحة."
+
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "اسم الدردشة هذا مستخدم بالفعلً"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "الاسم المستعار"
 
 msgid "Cannot change nick"
 msgstr "تعذّر تغيير الكنية"
@@ -3570,10 +3734,12 @@ msgstr "فشل الأمر اللحظي"
 msgid "execute"
 msgstr "نفِّذ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "يتطلب الخادوم TLS/SSL للولوج. لا يوجد دعم TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "تطلب تعمية، لكن لا يوجد دعم TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3590,18 +3756,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "استيثاق بالنص الصريح"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "فشل الاستيثاق"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "استجابة غير صحيحة من الخادوم."
 
 msgid "Server does not use any supported authentication method"
 msgstr "لا يستخدم الخادوم أي طريقة استيثاق مدعومة"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "أنت تتطلب استخدام التعمية لكنها غير متاحة على الخادوم."
+
 msgid "Invalid challenge from server"
 msgstr "تحدٍ غير صحيح من الخادوم"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "عطل في SASL"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "لا سبب معطى"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "إصدارة غير مدعومة"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"تعذَّر الاتصال بالخادوم:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"تعذَّر الاتصال بالخادوم:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "تعذّر استبداء الاتصال"
+
 msgid "Full Name"
 msgstr "الاسم الكامل"
 
@@ -3658,7 +3860,8 @@ msgstr "حرِّر XMPP vCard"
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
-msgstr "جميع العناصر التالية اختيارية. أدخل فقط المعلومات التي لا يزعجك الإفصاح عنها."
+msgstr ""
+"جميع العناصر التالية اختيارية. أدخل فقط المعلومات التي لا يزعجك الإفصاح عنها."
 
 msgid "Client"
 msgstr "العميل"
@@ -3666,158 +3869,9 @@ msgstr "العميل"
 msgid "Operating System"
 msgstr "نظام التشغيل"
 
-msgid "Last Activity"
-msgstr "آخر نشاط"
-
-msgid "Service Discovery Info"
-msgstr "معلومات اكتشاف الخدمة"
-
-msgid "Service Discovery Items"
-msgstr "عناصر اكتشاف الخدمة"
-
-msgid "Extended Stanza Addressing"
-msgstr "عنونة الأبيات الممتدّة"
-
-msgid "Multi-User Chat"
-msgstr "دردشة متعددة المستخدمين"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "معلومات التواجد الممتدة للدردشة متعددة المستخدمين"
-
-msgid "In-Band Bytestreams"
-msgstr "تيار بايتات داخل الحزمة"
-
-msgid "Ad-Hoc Commands"
-msgstr "أوامر لحظية"
-
-msgid "PubSub Service"
-msgstr "خدمة PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "تيار بايتات SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "بيانات خارج الحزمة"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "التسجيل داخل الحزمة"
-
-msgid "User Location"
-msgstr "موضع المستخدم"
-
-msgid "User Avatar"
-msgstr "أيقونة المستخدم"
-
-msgid "Chat State Notifications"
-msgstr "تنويه حالة الدردشة"
-
-msgid "Software Version"
-msgstr "إصدارة البرمجية"
-
-msgid "Stream Initiation"
-msgstr "بدأ التيار"
-
-msgid "File Transfer"
-msgstr "نقل الملفّات "
-
-msgid "User Mood"
-msgstr "مزاج المستخدم"
-
-msgid "User Activity"
-msgstr "نشاط المستخدم"
-
-msgid "Entity Capabilities"
-msgstr "إمكانات الكيان"
-
-msgid "Encrypted Session Negotiations"
-msgstr "مفاوضات الجلسات المعمّاة"
-
-msgid "User Tune"
-msgstr "نغمة المستخدم"
-
-msgid "Roster Item Exchange"
-msgstr "تبادل دوراني للعناصر"
-
-msgid "Reachability Address"
-msgstr "عنوان الوصولية"
-
-msgid "User Profile"
-msgstr "لاحة المستخدم"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
-
-msgid "User Nickname"
-msgstr "كنية المستخدم"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "فيديو Jingle"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "إيصالات الرسائل"
-
-msgid "Public Key Publishing"
-msgstr "نشر المفتاح العلني"
-
-msgid "User Chatting"
-msgstr "المستخدم يدردش"
-
-msgid "User Browsing"
-msgstr "المستخدم يتصفّح"
-
-msgid "User Gaming"
-msgstr "المستخدم يلعب"
-
-msgid "User Viewing"
-msgstr "المستخدم يطالع"
-
-msgid "Ping"
-msgstr "بِنْج"
-
-msgid "Stanza Encryption"
-msgstr "تعمية الأبيات"
-
-msgid "Entity Time"
-msgstr "وقت الكيان"
-
-msgid "Delayed Delivery"
-msgstr "تسليم متأخر"
-
-msgid "Collaborative Data Objects"
-msgstr "عناصر البيانات التشاركيّة"
-
-msgid "File Repository and Sharing"
-msgstr "مستودع الملفات والمشاركة"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "اكتشاف خدمة STUN لـ Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "التفاوض المبسط لجلسة معمّاة"
-
-msgid "Hop Check"
-msgstr "تدقيق القفزات"
-
-msgid "Capabilities"
-msgstr "الإمكانات"
+#, fuzzy
+msgid "Local Time"
+msgstr "الملف المحلي:"
 
 msgid "Priority"
 msgstr "الأولويّة"
@@ -3825,6 +3879,14 @@ msgstr "الأولويّة"
 msgid "Resource"
 msgstr "مورد"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "والِج بالفعل"
+
 msgid "Middle Name"
 msgstr "الاسم الأوسط"
 
@@ -3991,28 +4053,26 @@ msgstr "اختر خادوم اجتماع للاستعلام"
 msgid "Find Rooms"
 msgstr "ابحث عن الغرف"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "أنت تتطلب استخدام التعمية لكنها غير متاحة على الخادوم."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "الكنية:"
 
-msgid "Write error"
-msgstr "عطل في الكتابة"
+#, fuzzy
+msgid "No users found"
+msgstr "لا يوجد مستخدمون مطابقون"
 
-msgid "Ping timeout"
-msgstr "مهلة بِنْج"
+#, fuzzy
+msgid "Roles:"
+msgstr "الدّور"
 
-msgid "Read Error"
-msgstr "عطل في القراءة"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "مهلة بِنْج"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"تعذَّر الاتصال بالخادوم:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "تعذّر إنشاء مقبس"
 
 msgid "Invalid XMPP ID"
 msgstr "هوية XMPP غير صحيحة"
@@ -4020,6 +4080,10 @@ msgstr "هوية XMPP غير صحيحة"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "هوية XMPP غير صحيحة. يجب تحديد النطاق."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "فشل الاتصال بالخادوم."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "نجح تسجيل %s@%s"
@@ -4044,9 +4108,6 @@ msgstr "نجح إلغاء التسجيل"
 msgid "Unregistration Failed"
 msgstr "فشل إلغاء التسجيل"
 
-msgid "Already Registered"
-msgstr "مسجل بالفعل"
-
 msgid "State"
 msgstr "الإقليم"
 
@@ -4059,10 +4120,14 @@ msgstr "هاتف"
 msgid "Date"
 msgstr "التاريخ"
 
+msgid "Already Registered"
+msgstr "مسجل بالفعل"
+
 msgid "Unregister"
 msgstr "ألغ التسجيل"
 
-msgid "Please fill out the information below to change your account registration."
+msgid ""
+"Please fill out the information below to change your account registration."
 msgstr "من فضلك املأ المعلومات أدناه لتغير تسجيل حسابك."
 
 msgid "Please fill out the information below to register your new account."
@@ -4085,6 +4150,10 @@ msgstr "سجّل حسابا جديد في %s"
 msgid "Change Registration"
 msgstr "غيّر التسجيل"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "فشل الاتصال بالخادوم."
+
 msgid "Error unregistering account"
 msgstr "عطل في إلغاء تسجيل الحساب"
 
@@ -4103,9 +4172,18 @@ msgstr "يجري الاستيثاق"
 msgid "Re-initializing Stream"
 msgstr "تجري إعادة استبداء التيار"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "غير مصرح"
 
+msgid "Mood"
+msgstr "المزاج"
+
+msgid "Now Listening"
+msgstr "الآن يستمع"
+
 msgid "Both"
 msgstr "كلاهما"
 
@@ -4127,12 +4205,6 @@ msgstr "لا شيء"
 msgid "Subscription"
 msgstr "الاشتراك"
 
-msgid "Mood"
-msgstr "المزاج"
-
-msgid "Now Listening"
-msgstr "الآن يستمع"
-
 msgid "Mood Text"
 msgstr "نص المزاج"
 
@@ -4175,9 +4247,6 @@ msgstr "تم تغيير كلمة السرّ."
 msgid "Error changing password"
 msgstr "عطل أثناء تغيير كلمة السر"
 
-msgid "Password (again)"
-msgstr "كلمة السر (مجددًا)"
-
 msgid "Change XMPP Password"
 msgstr "غيّر كلمة سر XMPP"
 
@@ -4370,18 +4439,24 @@ msgstr "تعذّر ركل المستخدم %s"
 msgid "Unable to ping user %s"
 msgstr "تعذّر إرسال ping للمستخدم %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "تعذّر الرنّ، لأنه لا يُعرف أي شيء عن المستخدم %s."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr "تعذّر الرنّ، لأن المستخدم %s قد لا يكون متصلا."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "تعذّر الرنّ، لأن المستخدم %s لا يدعمه."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "يرن على %s..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4391,9 +4466,34 @@ msgstr "رن"
 msgid "%s has buzzed you!"
 msgstr "‏%s رنّ عليك"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "يرن على %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "تعذّر إرسال ملف إلى %s، JID غير صحيحة"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "تعذّر إرسال ملف إلى %s، المستخدم ليس متصلا"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "تعذّر إرسال ملف إلى %s، ليس مشتركا في تواجد المستخدم"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "فشل التسجيل"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "من فضلك حدد موْرِد %s الذي تود إرسال ملف إليه"
+
+msgid "Select a Resource"
+msgstr "اختر مَوْرِدا"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "ابدأ _دردشة"
 
 msgid "config:  Configure a chat room."
 msgstr ""
@@ -4425,16 +4525,18 @@ msgstr ""
 "ban &lt;user&gt; [reason]:\n"
 "اطرد مستخدما من الغرفة."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;:\n"
 "حدّد علاقة المُستخدم بالغرفة."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;:\n"
 "حدد دور مستخدم في غرفة."
@@ -4454,7 +4556,8 @@ msgstr ""
 "kick &lt;user&gt; [reason]:\n"
 "اركل مستخدما خارج الغرفة."
 
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;user&gt; &lt;message&gt;:\n"
 "ارسل رسالة خاصة إلى مستخدم آخر."
@@ -4505,6 +4608,9 @@ msgstr "اتصل بالخادوم"
 msgid "File transfer proxies"
 msgstr "وسطاء نقل الملفات"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4543,6 +4649,14 @@ msgstr "خطأ في تحليل XML"
 msgid "Unknown Error in presence"
 msgstr "خطأ مجهول في التواجد"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "عطل أثناء الانضمام للدردشة %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "عطل في دردشة %s"
+
 msgid "Create New Room"
 msgstr "أنشئ غرفة جديدة"
 
@@ -4557,13 +4671,32 @@ msgstr "ا_عدّ الغرفة"
 msgid "_Accept Defaults"
 msgstr "ا_قبل المبدئية"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "عطل أثناء الانضمام للدردشة %s"
+#, fuzzy
+msgid "No reason"
+msgstr "لا سبب معطى"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "عطل في دردشة %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "لقد طردك %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "طردك %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "حدث عطل أثناء فتح الملف."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "فشل إرسال الملف"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "فشل فتح ملف '%s': %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4588,9 +4721,6 @@ msgstr "تعذّر إرسال ملف إلى %s، ليس مشتركا في توا
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "من فضلك حدد موْرِد %s الذي تود إرسال ملف إليه"
 
-msgid "Select a Resource"
-msgstr "اختر مَوْرِدا"
-
 msgid "Edit User Mood"
 msgstr "حرر مزاج المستخدم"
 
@@ -4623,8 +4753,19 @@ msgstr "أفعال"
 msgid "Select an action"
 msgstr "اختر فعلا"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "تعذّر جلب دفتر عناوين MSN "
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "تعذّرت إضافة \"%s\"."
+
+msgid "Buddy Add error"
+msgstr ""
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "اسم المستخدم المحدد غير صالح."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4646,165 +4787,218 @@ msgstr ""
 "‏%s مدرج في القائمة المحلية لكن ليس على قائمة الخادوم. هل تريد أن يضاف هذا "
 "الصديق؟"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "تعذّر تحليل الرسالة"
 
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "خطأ نحوي (غالبا علة في العميل)"
 
+#, c-format
 msgid "Invalid email address"
 msgstr "عنوان بريد إلكترونى غير صالح"
 
+#, c-format
 msgid "User does not exist"
 msgstr "المستخدم غير موجود"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "يفتقد اسم نطاق كامل"
 
+#, c-format
 msgid "Already logged in"
 msgstr "والج بالفعل"
 
+#, c-format
 msgid "Invalid username"
 msgstr "اسم مستخدم غير صالح"
 
+#, c-format
 msgid "Invalid friendly name"
 msgstr "اسم ودّي غير صالح"
 
+#, c-format
 msgid "List full"
 msgstr "القائمة ممتلئة"
 
+#, c-format
 msgid "Already there"
 msgstr "هنا بالفعل"
 
+#, c-format
 msgid "Not on list"
 msgstr "ليس في القائمة"
 
+#, c-format
 msgid "User is offline"
 msgstr "المستخدم غير متصل"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "في هذا الطور بالفعل"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "بالفعل في القائمة المقابلة"
 
+#, c-format
 msgid "Too many groups"
 msgstr "مجموعات كثيرة جدا"
 
+#, c-format
 msgid "Invalid group"
 msgstr "المجموعة غير صالحة"
 
+#, c-format
 msgid "User not in group"
 msgstr "المستخدم ليس في المجموعة"
 
+#, c-format
 msgid "Group name too long"
 msgstr "اسم المجموعة طويل جدًا"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "لايمكن إزالة المجموعة صفر"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "حاولت إضافة مستخدم إلى مجموعة لا وجود لها"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "عطل في لوحة التحويل"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "فشل تنبيه النقل"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "حقول مطلوبة خاوية"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr ""
 
+#, c-format
 msgid "Not logged in"
 msgstr "لم يلج"
 
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "الخدمة غير متوفّرة مُؤقّتًا"
 
+#, c-format
 msgid "Database server error"
 msgstr "خطأ في خادوم قاعدة البيانات"
 
+#, c-format
 msgid "Command disabled"
 msgstr "عُطِّل الأمر"
 
+#, c-format
 msgid "File operation error"
 msgstr "خطأ في عملية الملف"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "خطأ في تخصيص الذاكرة"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "أُرسِلت قيمة CHL خطأ للخادوم"
 
+#, c-format
 msgid "Server busy"
 msgstr "الخادوم مشغول"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "الخادوم غير متاح"
 
+#, c-format
 msgid "Peer notification server down"
 msgstr "خادوم تنبيهات الأنداد مطفأ"
 
+#, c-format
 msgid "Database connect error"
 msgstr "خطأ في الاتصال بقاعدة البيانات"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "الخادوم سيُطفأ (سنفروا بحياتكم)"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "خطأ في إنشاء الاتصال"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "معاملات CVR إما مجهولة أو ممنوعة"
 
+#, c-format
 msgid "Unable to write"
 msgstr "تعذّرت الكتابة"
 
+#, c-format
 msgid "Session overload"
 msgstr "تحميل زائد في الجلسة"
 
+#, c-format
 msgid "User is too active"
 msgstr "المستخدم نشط أكثر من اللازم"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "جلسات أكثر من المحتمل"
 
+#, c-format
 msgid "Passport not verified"
 msgstr "جواز مرور غير مُوثّق"
 
+#, c-format
 msgid "Bad friend file"
 msgstr "ملف صديق سيء"
 
+#, c-format
 msgid "Not expected"
 msgstr "غير متوقع"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "الاسم الودّي يتغير أسرع من اللازم"
 
+#, c-format
 msgid "Server too busy"
 msgstr "الخادوم مشغول جدًا"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "فشل الاستيثاق"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "غير مسموح عندم لا تكون متصلا"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "لا يقبل المستخدمين الجدد"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "جواز مرور أطفال بدون موافقة الأبوين"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "حساب جواز المرور لم يُوثّق"
 
 msgid "Passport account suspended"
 msgstr "عُلّق حساب جواز المرور"
 
+#, c-format
 msgid "Bad ticket"
 msgstr "تذكرة سيّئة"
 
@@ -4822,6 +5016,10 @@ msgstr "مراسلون آخرون"
 msgid "Non-IM Contacts"
 msgstr "مراسلين غير التراسل الفوري"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "أرسل إليك %s دعوة كاميرا وب، لكنها ليست مدعومة بعد."
+
 msgid "Nudge"
 msgstr "لكزة"
 
@@ -4878,7 +5076,8 @@ msgid "No text is blocked for this account."
 msgstr "لا نص محجوب من هذا الحساب."
 
 #, c-format
-msgid "MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr "خواديم MSN تحظر حاليا هذه التعابير النمطية:<br/>%s"
 
 msgid "This account does not have email enabled."
@@ -4890,6 +5089,13 @@ msgstr "أرسل رسالة إلى محمول."
 msgid "Page"
 msgstr "صفحة"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "العمل"
+
 msgid "Has you"
 msgstr "أنت لديه"
 
@@ -4917,7 +5123,7 @@ msgstr "خرجت للغداء"
 #. primitive
 #. ID
 #. name - use default
-#. savable
+#. saveable
 #. should be user_settable some day
 #. independent
 msgid "Artist"
@@ -4926,6 +5132,14 @@ msgstr "الفنانون"
 msgid "Album"
 msgstr "ألبوم"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "عنوان اللحن"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "عنوان اللحن"
+
 msgid "Set Friendly Name..."
 msgstr "أدخل اسما ودّيا..."
 
@@ -4959,9 +5173,6 @@ msgstr "ابدأ _دردشة"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN تتطلب دعم SSL. رجاءً ثبت مكتبة SSL مدعومة."
 
-msgid "Failed to connect to server."
-msgstr "فشل الاتصال بالخادوم."
-
 msgid "Error retrieving profile"
 msgstr "عطل في جلب اللاحة"
 
@@ -5112,10 +5323,12 @@ msgstr ""
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
-msgstr "تعذّر العثور على أية معلومات في لاحة المستخدم. المستخدم غالبًا لا وجود له."
+msgstr ""
+"تعذّر العثور على أية معلومات في لاحة المستخدم. المستخدم غالبًا لا وجود له."
 
-msgid "Profile URL"
-msgstr "مسار اللاحة"
+#, fuzzy
+msgid "View web profile"
+msgstr "اخفِ عندما لا تكون متصلا"
 
 #. *< type
 #. *< ui_requirement
@@ -5125,8 +5338,7 @@ msgstr "مسار اللاحة"
 #. *< id
 #. *< name
 #. *< version
-#. *  summary
-#. *  description
+#. *< summary
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "ملحقة بروتوكول Windows Live Messenger"
 
@@ -5151,63 +5363,26 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "استيثاق هويّة Windows Live: رد غير سليم"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ليست مجموعة صالحة."
-
-msgid "Unknown error."
-msgstr "خطأ مجهول."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s على %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s أرسل لك لكزة"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "عُطل مجهول (%d)"
 
 msgid "Unable to add user"
 msgstr "تعذّرت إضافة مستخدم"
 
-msgid "The following users are missing from your addressbook"
-msgstr "المستخدمين التاليين ناقصين في دفتر عناوينك"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "تعذّرت إضافة مستخدم على %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "تعذّر حظر مستخدم على %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "تعذّر السماح لمستخدم على %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "لا يمكن إضافة %s لأن قائمة اصدقائك ممتلئة."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ليس حساب جواز مرور صالح."
+msgid "Unknown error (%d)"
+msgstr "عُطل مجهول (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "الخدمة غير متاحة مؤقتًا."
+msgid "The following users are missing from your addressbook"
+msgstr "المستخدمين التاليين ناقصين في دفتر عناوينك"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "لم تُرسل رسالة المحمول لأنها طويلة جدا."
 
-msgid "Unable to rename group"
-msgstr "تعذّر تغيير اسم المجموعة"
-
-msgid "Unable to delete group"
-msgstr "تعذّر حذف المجموعة"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5257,7 +5432,9 @@ msgstr[5] ""
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
-msgstr "لم ترسل الرسالة لأن النظام غير متاح. يحدث هذا طبيعيا إذا كان المستخدم محظورا أو لا وجود له."
+msgstr ""
+"لم ترسل الرسالة لأن النظام غير متاح. يحدث هذا طبيعيا إذا كان المستخدم محظورا "
+"أو لا وجود له."
 
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr "تعذّر إرسال الرسالة لأننا نرسل بسرعة جدًا."
@@ -5268,9 +5445,6 @@ msgstr "الرسالة ربما تكون لم ترسل لحدوث عطل ترم�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "الرسالة ربما تكون لم ترسل لحدوث عطل مجهول."
 
-msgid "Unable to connect"
-msgstr "تعذّر الاتصال"
-
 msgid "Writing error"
 msgstr "عطل في الكتابة"
 
@@ -5285,26 +5459,31 @@ msgstr ""
 "خطأ اتصال من خادوم %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "لا يدعم الخادوم هذا البروتوكول."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "خطأ في تحليل HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "قمت بالدخول من موقع آخر."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "خواديم MSN غير متاحة مؤقتًا. من فضلك انتظر و حاول مرة ثانية."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "خادوم MSN سيطفأ مؤقتا."
 
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "تعذّر الاستيثاق: %s"
 
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "قائمة أصدقائك في MSN غير متاحة مؤقتًا. من فضلك انتظر و حاول مرة ثانية."
 
 msgid "Handshaking"
@@ -5325,6 +5504,14 @@ msgstr "يجري إرسال الكوكي"
 msgid "Retrieving buddy list"
 msgstr "يجري جلب قائمة الأصدقاء"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "أرسل إليك %s دعوة كاميرا وب، لكنها ليست مدعومة بعد."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "أرسل إليك %s دعوة كاميرا وب، لكنها ليست مدعومة بعد."
+
 msgid "Away From Computer"
 msgstr "بعيد عن الحاسوب"
 
@@ -5356,39 +5543,28 @@ msgstr ""
 "تعذّر إرسال الرسالة لتعذّر الإتصال بالخادوم. في الأغلب هذه مشكلة في الخادوم، "
 "حاول مجددا بعد بضع دقائق:"
 
-msgid "Message could not be sent because an error with the switchboard occurred:"
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
 msgstr "تعذّر إرسال الرسالة لحدوث عطل في لوحة التحويل:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "الرسالة ربما تكون لم ترسل لحدوث عطل مجهول:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s أضافك إلى قائمة أصدقائه."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s حذفك من قائمة أصدقائه."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "أأحذف الصديق من دفتر العناوين؟"
 
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "أتريد حذف هذا الصديق من دفتر عناوينك أيضا؟"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "تعذّرت إضافة \"%s\"."
-
 msgid "The username specified is invalid."
 msgstr "اسم المستخدم المحدد غير صالح."
 
 msgid "This Hotmail account may not be active."
 msgstr "حساب هوتميل هذا قد لا يكون مُفعلا."
 
+msgid "Profile URL"
+msgstr "مسار اللاحة"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5402,16 +5578,60 @@ msgstr "حساب هوتميل هذا قد لا يكون مُفعلا."
 msgid "MSN Protocol Plugin"
 msgstr "ملحقة بروتوكول MSN"
 
-msgid "Missing Cipher"
-msgstr "شفرة مفقودة"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s ليست مجموعة صالحة."
 
-msgid "The RC4 cipher could not be found"
-msgstr "لم يُعثر على شفرة RC4"
+msgid "Unknown error."
+msgstr "خطأ مجهول."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr "رقِّ إلى libpurple تدعم RC4 (>= 2.0.1). لن يُحمّل ملحق  MySpaceIM."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s على %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "تعذّرت إضافة مستخدم على %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "تعذّر حظر مستخدم على %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "تعذّر السماح لمستخدم على %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "لا يمكن إضافة %s لأن قائمة اصدقائك ممتلئة."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ليس حساب جواز مرور صالح."
+
+msgid "Service Temporarily Unavailable."
+msgstr "الخدمة غير متاحة مؤقتًا."
+
+msgid "Unable to rename group"
+msgstr "تعذّر تغيير اسم المجموعة"
+
+msgid "Unable to delete group"
+msgstr "تعذّر حذف المجموعة"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s أضافك إلى قائمة أصدقائه."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s حذفك من قائمة أصدقائه."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "لا مستخدِم باسم: %s"
+
+msgid "User lookup"
+msgstr "البحث عن مستخدمين"
 
 msgid "Reading challenge"
 msgstr "تجري قراءة التحدي"
@@ -5422,17 +5642,24 @@ msgstr "طول تحدٍ غير متوقع من الخادوم"
 msgid "Logging in"
 msgstr "يجري الولوج"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال %d ثانية)"
-msgstr[1] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال ثانية واحدة)"
-msgstr[2] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال ثانيتين)"
-msgstr[3] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال %d ثوان)"
-msgstr[4] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال %d ثانية)"
-msgstr[5] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال %d ثانية)"
+msgid "MySpaceIM - No Username Set"
+msgstr "‏MySpaceIM - لم تحدد اسم مستخدم"
+
+msgid "You appear to have no MySpace username."
+msgstr "يظهر أنك لا تملك اسم مستخدم MySpace."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "أتريد عمل واحد الآن؟ (ملحوظة: هذا لا يمكن تغييره!)"
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"انقطع الاتصال بالخادوم\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "رسالة بريد جديدة"
 
@@ -5451,39 +5678,61 @@ msgstr "تعليقات صورة جديدة"
 msgid "MySpace"
 msgstr "MySpace"
 
-msgid "MySpaceIM - No Username Set"
-msgstr "‏MySpaceIM - لم تحدد اسم مستخدم"
-
-msgid "You appear to have no MySpace username."
-msgstr "يظهر أنك لا تملك اسم مستخدم MySpace."
+msgid "IM Friends"
+msgstr "أصدقاء التراسل الفوري"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr "أتريد عمل واحد الآن؟ (ملحوظة: هذا لا يمكن تغييره!)"
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"تمت إضافة أو تحديث %d صديق من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء على "
+"الخادوم)"
+msgstr[1] ""
+"تمت إضافة أو تحديث صديق من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء على "
+"الخادوم)"
+msgstr[2] ""
+"تمت إضافة أو تحديث صديقين من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء على "
+"الخادوم)"
+msgstr[3] ""
+"تمت إضافة أو تحديث %d أصدقاء من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء "
+"على الخادوم)"
+msgstr[4] ""
+"تمت إضافة أو تحديث %d صديقا من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء "
+"على الخادوم)"
+msgstr[5] ""
+"تمت إضافة أو تحديث %d صديق من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء على "
+"الخادوم)"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "متَّصل"
+msgid "Add contacts from server"
+msgstr "أضف معارف من الخادوم"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "عطل بروتوكول، رمز %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "‏%s كلمة السر مكونة من %d حرف، أطول من %d وهو الطول المُتوقّع ل MySpaceIM. من "
 "فضلك قصّر كلمة سرّك مِن http://profileedit.myspace.com/index.cfm?"
 "fuseaction=accountSettings.changePassword ثم أعِد المحاولة."
 
+msgid "Incorrect username or password"
+msgstr "اسم شاشة أو كلمة سر غير صحيحة"
+
 msgid "MySpaceIM Error"
 msgstr "عطل في MySpaceIM"
 
+msgid "Invalid input condition"
+msgstr "حالة دخل غير صحيحة"
+
 msgid "Failed to add buddy"
 msgstr "فشلت إضافة صديق"
 
@@ -5493,13 +5742,6 @@ msgstr "فشل أمر 'addbuddy'"
 msgid "persist command failed"
 msgstr "فشل أمر persist"
 
-#, c-format
-msgid "No such user: %s"
-msgstr "لا مستخدِم باسم: %s"
-
-msgid "User lookup"
-msgstr "البحث عن مستخدمين"
-
 msgid "Failed to remove buddy"
 msgstr "فشلت إزالة الصديق"
 
@@ -5509,50 +5751,16 @@ msgstr "فشل أمر 'delbuddy' "
 msgid "blocklist command failed"
 msgstr "فشل أمر blocklist"
 
-msgid "Invalid input condition"
-msgstr "حالة دخل غير صحيحة"
-
-msgid "Read buffer full (2)"
-msgstr "براح القراءة ممتليء (2)"
-
-msgid "Unparseable message"
-msgstr "رسالة يتعذّر تحليلها"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "تعذّر الاتصال بالخادوم: %s (%d)"
+msgid "Missing Cipher"
+msgstr "شفرة مفقودة"
 
-msgid "IM Friends"
-msgstr "أصدقاء التراسل الفوري"
+msgid "The RC4 cipher could not be found"
+msgstr "لم يُعثر على شفرة RC4"
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-"تمت إضافة أو تحديث %d صديق من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء على "
-"الخادوم)"
-msgstr[1] ""
-"تمت إضافة أو تحديث صديق من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء على "
-"الخادوم)"
-msgstr[2] ""
-"تمت إضافة أو تحديث صديقين من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء على "
-"الخادوم)"
-msgstr[3] ""
-"تمت إضافة أو تحديث %d أصدقاء من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء على "
-"الخادوم)"
-msgstr[4] ""
-"تمت إضافة أو تحديث %d صديقا من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء على "
-"الخادوم)"
-msgstr[5] ""
-"تمت إضافة أو تحديث %d صديق من الخادوم (بمن فيهم أصدقاء من قائمة الأصدقاء على "
-"الخادوم)"
-
-msgid "Add contacts from server"
-msgstr "أضف معارف من الخادوم"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr "رقِّ إلى libpurple تدعم RC4 (>= 2.0.1). لن يُحمّل ملحق  MySpaceIM."
 
 msgid "Add friends from MySpace.com"
 msgstr "أضف أصدقاء من MySpaces.com"
@@ -5594,9 +5802,6 @@ msgstr "حجم الخط الأساس (نقاط)"
 msgid "User"
 msgstr "مستخدم"
 
-msgid "Profile"
-msgstr "لاحة"
-
 msgid "Headline"
 msgstr "عنوان رئيسي"
 
@@ -5609,15 +5814,11 @@ msgstr "مجموع الأصدقاء"
 msgid "Client Version"
 msgstr "إصدارة العميل"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "لم تحدد اسم مستخدم"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr "‏MySpaceIM - من فضلك ضع اسم مُستخدم"
-
-msgid "Please enter a username to check its availability:"
-msgstr "من فضلك أدخِل اسم مُستخدم لتحقق من وجوده:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
 
 msgid "MySpaceIM - Username Available"
 msgstr "‏MySpaceIM - الاسم غير مُتاح"
@@ -5628,12 +5829,22 @@ msgstr "اسم المستخدم متاح. أتريد استخدامه؟"
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "بمجرّد تحديده، لا يُمكن تغييره!"
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr "‏MySpaceIM - من فضلك ضع اسم مُستخدم"
+
 msgid "This username is unavailable."
 msgstr "اسم المستخدم هذا غير متاح."
 
 msgid "Please try another username:"
 msgstr "من فضلك جرّب اسم مستخدم آخر:"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "لم تحدد اسم مستخدم"
+
+msgid "Please enter a username to check its availability:"
+msgstr "من فضلك أدخِل اسم مُستخدم لتحقق من وجوده:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5825,9 +6036,6 @@ msgstr "لا يمكنك إضافة نفسك"
 msgid "Master archive is misconfigured"
 msgstr "الأرشيف الرئيسي غير مضبوط"
 
-msgid "Incorrect username or password"
-msgstr "اسم شاشة أو كلمة سر غير صحيحة"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr " لا يمكن تعرُّف خادوم اسم المستخدم المدخل"
 
@@ -5866,9 +6074,9 @@ msgstr "المستخدم إما أن يكون غير متصل أو أنك قد �
 msgid "Unknown error: 0x%X"
 msgstr "خطأ مجهول: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "فشل الولوج (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "تعذّر إرسال ping للمستخدم %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5907,7 +6115,8 @@ msgstr ""
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
-msgstr "تعذّرت إضافة %s إلى قائمة أصدقائك. عطل في إنشاء مجلد في قائمة الخادوم (%s)."
+msgstr ""
+"تعذّرت إضافة %s إلى قائمة أصدقائك. عطل في إنشاء مجلد في قائمة الخادوم (%s)."
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
@@ -5968,9 +6177,6 @@ msgstr "اجتماع GroupWise %d"
 msgid "Authenticating..."
 msgstr "يجري الاستيثاق..."
 
-msgid "Unable to connect to server."
-msgstr "تعذّر الاتصال بالخادوم."
-
 msgid "Waiting for response..."
 msgstr "في انتظار رد..."
 
@@ -5994,21 +6200,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "هل تود الانضمام للمحادثة؟"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "أولجت خارجا لأنك ولجت من حاسوب آخر."
-
 #, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr "يبدو أن %s غير متصل و لم يتسلم الرسالة التي أرسلتها توا.."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "تعذّر الاتصال بالخادوم. من فضلك أدخل عنوان الخادوم الذي تود الاتصال به."
 
-msgid "Error. SSL support is not installed."
-msgstr "عطل. دعم SSL غير مثبت."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "لقد فُضَّ هذا الاجتماع. لا يمكن إرسال المزيد من الرسائل."
 
@@ -6031,24 +6233,33 @@ msgstr "عنوان الخادوم"
 msgid "Server port"
 msgstr "منفذ الخادوم"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "تلقيت استجابة غير متوقّعة من خادوم HTTP."
+
+#. username connecting too frequently
+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 ""
+"قمت بالاتصال و قطعته مرات عديدة في وقت قصير جدا. انتظر عشر دقائق وحاول "
+"مجددا. إذا استمريت في المحاولة الآن فسينبغي لك الانتظار مدة أطول."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "خطأ أثناء استجلاء %s"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "تعذّر الانضمام لقناة الدردشة"
 
 msgid "Invalid chat room name"
 msgstr "اسم غرفة دردشة غير صالح"
 
-msgid "Server closed the connection."
-msgstr "أَغلقَ الخادومُ الاتصال"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"فُقد الاتصال بالخادوم:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "استقبلت بيانات غير صالحة عند الاتصال بالخادوم."
 
 #. *< type
@@ -6096,7 +6307,8 @@ msgstr "فقد الاتصال مع المستخدم البعيد:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "استقبلت بيانات غير صالحة عند الاتصال بمستخدم بعيد."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "لا يمكن عمل اتصال بالمستخدم البعيد"
 
 msgid "Direct IM established"
@@ -6295,21 +6507,15 @@ msgstr "مستوى التحذير"
 msgid "Buddy Comment"
 msgstr "تعليق الصديق"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "تعذّر الاتصال بخادوم الاستيثاق:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"تعذّر الاتصال بخادوم BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "تعذّر الاتصال بالخادوم."
 
 msgid "Username sent"
 msgstr "حُدِّد اسم المُستخدم"
@@ -6321,51 +6527,60 @@ msgstr "أُنشئ الاتصال، أرسلت الكوكي"
 msgid "Finalizing connection"
 msgstr "يُنهي الاتصال"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "تعذّر الولوج: لم يمكن الولوج باسم %s لأنه اسم غير صحيح. يجب أن يكون الاسم "
 "عنوان بريد صحيح، أو أن يبدأ بحرف و يحوي فقط أحرفا و أرقاما و مسافات، أو "
 "أرقاما فقط."
 
-#. Unregistered screen name
-msgid "Invalid username."
-msgstr "اسم مستخدم غير صالح"
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "قد ينقطع اتصالك قريبا. طالع %s للتحديثات."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "تعذّر جلب تلبيدة ولوج صحيحة إلى AIM."
+
+msgid "Unable to get a valid login hash."
+msgstr "تعذّر جلب تلبيدة ولوج صحيحة."
+
+msgid "Received authorization"
+msgstr "استُقبِل الاستيثاق"
 
-msgid "Incorrect password."
-msgstr "كلمة سر خطأ."
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "المستخدم غير موجود"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "حسابك مُعَلّق حاليا."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "خدمة مِرسال AOL الفوري غير متاحة مؤقتًا."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "إصدارة العميل التي تستخدمها قديمة جدًا. من فضلك رقها من %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "قمت بالاتصال و قطعته مرات عديدة في وقت قصير جدا. انتظر عشر دقائق وحاول "
 "مجددا. إذا استمريت في المحاولة الآن فسينبغي لك الانتظار مدة أطول."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "إصدارة العميل التي تستخدمها قديمة جدًا. من فضلك رقها من %s"
-
-msgid "Could Not Connect"
-msgstr "تعذّر الاتصال"
-
-msgid "Received authorization"
-msgstr "استُقبِل الاستيثاق"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "مفتاح SecurID المدخل غير صالح."
 
 msgid "Enter SecurID"
@@ -6380,24 +6595,6 @@ msgstr "أدخل الرقم الذي يتألف من 6 أرقام من العر�
 msgid "_OK"
 msgstr "_موافق"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"قد ينقطع اتصالك قريبا. قد ترغب في استخدام TOC إلى أن يتم إصلاح هذا. طالع %s "
-"للتحديثات."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "تعذّر جلب تلبيدة ولوج صحيحة إلى AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "قد ينقطع اتصالك قريبا. طالع %s للتحديثات."
-
-msgid "Unable to get a valid login hash."
-msgstr "تعذّر جلب تلبيدة ولوج صحيحة."
-
 msgid "Password sent"
 msgstr "أُرسِلت كلمة السر"
 
@@ -6506,8 +6703,10 @@ msgstr[4] "فقدت %hu رسالة من %s لكونها أكبر من اللاز
 msgstr[5] "فقدت %hu رسالة من %s لكونها أكبر من اللازم."
 
 #, c-format
-msgid "You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "لم تفقد أي رسائل (%hu) من %s لتجاوز حد المنسوب"
 msgstr[1] "فقدت رسالة واحدة (%hu) من %s لتجاوز حدّ المنسوب."
 msgstr[2] "فقدت رسالتين (%hu) من %s لتجاوز حدّ المنسوب."
@@ -6516,8 +6715,10 @@ msgstr[4] "فقدت %hu رسالة من %s لتجاوز حدّ المنسوب."
 msgstr[5] "فقدت %hu رسالة من %s لتجاوز حدّ المنسوب."
 
 #, c-format
-msgid "You missed %hu message from %s because his/her warning level is too high."
-msgid_plural "You missed %hu messages from %s because his/her warning level is too high."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] "لم تفقد أي رسائل (%hu) من %s لأن مستوى تحذيره مرتفع جدا."
 msgstr[1] "فقدت رسالة واحدة (%hu) من %s لأن مستوى تحذيره مرتفع جدا."
 msgstr[2] "فقدت رسالتين (%hu) من %s لأن مستوى تحذيره مرتفع جدا."
@@ -6527,7 +6728,8 @@ msgstr[5] "فقدت %hu رسالة من %s لأن مستوى تحذيره مرت
 
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
-msgid_plural "You missed %hu messages from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
 msgstr[0] " لم تفقد أي رسائل (%hu) من %s لأن مستوى تحذيرك مرتفع جدا."
 msgstr[1] "فقدت رسالة واحدة (%hu) من %s لأن مستوى تحذيرك مرتفع جدا."
 msgstr[2] "فقدت رسالتين (%hu) من %s لأن مستوى تحذيرك مرتفع جدا."
@@ -6545,7 +6747,7 @@ msgstr[3] "فقدت %hu رسائل من %s لسبب مجهول."
 msgstr[4] "فقدت %hu رسالة من %s لسبب مجهول."
 msgstr[5] "فقدت %hu رسالة من %s لسبب مجهول."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "تعذّر إرسال رسالة: %s"
@@ -6567,6 +6769,12 @@ msgstr "متصل منذ"
 msgid "Member Since"
 msgstr "عضو منذ"
 
+msgid "Capabilities"
+msgstr "الإمكانات"
+
+msgid "Profile"
+msgstr "لاحة"
+
 msgid "Your AIM connection may be lost."
 msgstr "قد ينقطع اتصالك مع AIM."
 
@@ -6641,7 +6849,8 @@ msgstr "تم طلب توكيد الحساب"
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
-msgstr "خطأ 0x%04x: تعذّر تنسيق اسم المستخدم لأن اسم المستخدم المطلوب مختلف عن الأصلي."
+msgstr ""
+"خطأ 0x%04x: تعذّر تنسيق اسم المستخدم لأن اسم المستخدم المطلوب مختلف عن الأصلي."
 
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
@@ -6657,7 +6866,8 @@ msgstr "خطأ 0x%04x: تعذّر تنسيق اسم المستخدم لأن اس
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
-msgstr "خطأ 0x%04x: تعذّر تغيير عنوان البريد الإلكتروني لوجود طلب سابق لهذا الاسم."
+msgstr ""
+"خطأ 0x%04x: تعذّر تغيير عنوان البريد الإلكتروني لوجود طلب سابق لهذا الاسم."
 
 #, c-format
 msgid ""
@@ -6671,7 +6881,8 @@ msgstr ""
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
-msgstr "خطأ 0x%04x: تعذّر تغيير عنوان البريد الإلكتروني لأن العنوان المعطى غير صالح."
+msgstr ""
+"خطأ 0x%04x: تعذّر تغيير عنوان البريد الإلكتروني لأن العنوان المعطى غير صالح."
 
 #, c-format
 msgid "Error 0x%04x: Unknown error."
@@ -6687,7 +6898,8 @@ msgstr "عنوان البريد الإلكتروني لـ %s هو %s"
 msgid "Account Info"
 msgstr "معلومات الحساب"
 
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "صورة رسالتك الفورية لم ترسل. يجب ان تكون متصلا مباشرة لإرسال صور الرسالة "
 "الفورية."
@@ -6737,9 +6949,9 @@ msgstr[5] "لقد تجاوز طول رسالة الغياب الحد الأقص�
 msgid "Away message too long."
 msgstr "رسالة \"غياب\" أطول من المسموح."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6747,10 +6959,12 @@ msgstr ""
 "تكون عناوين بريد سليمة، أو أن تبدأ بحرف و أن تحوي فقط أحرفا و أرقاما و "
 "مسافات، أو أرقاما فقط."
 
-msgid "Unable To Add"
+#, fuzzy
+msgid "Unable to Add"
 msgstr "تعذّرت الإضافة"
 
-msgid "Unable To Retrieve Buddy List"
+#, fuzzy
+msgid "Unable to Retrieve Buddy List"
 msgstr "تعذّر جلب قائمة الأصدقاء"
 
 msgid ""
@@ -6763,9 +6977,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "أيتام"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "تعذّرت إضافة الصديق %s لأن لديك أصدقاء أكثر من المسموح به في قائمة أصدقائك. "
@@ -6774,8 +6988,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(بلا اسم)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "تعذّرت إضافة الصديق %s لسبب مجهول."
 
 #, c-format
@@ -6812,7 +7026,8 @@ msgid "_Exchange:"
 msgstr "_بادل:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "صورة رسالتك الفورية لم ترسل. لا يمكنك إرسال صور التراسل الفوري في دردشات AIM."
+msgstr ""
+"صورة رسالتك الفورية لم ترسل. لا يمكنك إرسال صور التراسل الفوري في دردشات AIM."
 
 msgid "iTunes Music Store Link"
 msgstr "رابط إلى متجر موسيقى iTunes"
@@ -6839,6 +7054,7 @@ msgstr "ا_تّصل"
 msgid "Get AIM Info"
 msgstr "اجلب معلومات AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "حرِّر تعليق صديق"
 
@@ -6897,6 +7113,7 @@ msgstr "ا_بحث"
 msgid "Set User Info (web)..."
 msgstr "ضع معلومات المستخدم (وِب)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "غيّر كلمة السر (وِب)"
 
@@ -6926,6 +7143,10 @@ msgstr "ابحث عن صديق بواسطة عنوان البريد الإلكت
 msgid "Search for Buddy by Information"
 msgstr "ابحث عن صديق بواسطة المعلومات"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "لم يلِج المستخدم"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7039,7 +7260,7 @@ msgstr "أخرى"
 msgid "Visible"
 msgstr "مرئي"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 msgid "Private"
@@ -7102,7 +7323,8 @@ msgstr "عدّل المراسل"
 msgid "Modify Address"
 msgstr "عدّل العنوان"
 
-msgid "Modify Extend Information"
+#, fuzzy
+msgid "Modify Extended Information"
 msgstr "عدّل المعلومات المزيدة"
 
 msgid "Modify Information"
@@ -7111,27 +7333,51 @@ msgstr "عدّل المعلومات"
 msgid "Update"
 msgstr "حدّث"
 
-msgid "Failed changing buddy information."
+#, fuzzy
+msgid "Could not change buddy information."
 msgstr "فشل تغيير معلومات الصديق."
 
-#, c-format
-msgid "Can not get face number in file name (%s)"
+msgid "Mobile"
+msgstr "محمول"
+
+msgid "Note"
+msgstr "ملاحظة"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "أيقونة الصديق"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
-msgid "QQ Buddy"
-msgstr "صديق QQ"
+msgid "_Modify"
+msgstr "_عدِّل"
 
-msgid "Failed change icon"
-msgstr "فشل تغيير الأيقونة"
+#, fuzzy
+msgid "Memo Modify"
+msgstr "عدّل"
 
-#, c-format
-msgid "%d needs Q&A"
-msgstr "%d يحتاج س/ج"
+#, fuzzy
+msgid "Server says:"
+msgstr "الخادوم مشغول"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "اشترط التصريح"
 
-msgid "Add buddy Q&A"
-msgstr "أضف س/ج الصديق"
+#, fuzzy
+msgid "Add buddy question"
+msgstr "أضِف تصريح الصديق"
 
-msgid "Input answer here"
+#, fuzzy
+msgid "Enter answer here"
 msgstr "أدخل الإجابة هنا"
 
 msgid "Send"
@@ -7143,22 +7389,27 @@ msgstr "إجابة غير صالحة."
 msgid "Authorization denied message:"
 msgstr "رسالة منع التصريح:"
 
-msgid "Sorry, You are not my style."
+#, fuzzy
+msgid "Sorry, you're not my style."
 msgstr "آسف، لست النوع الذي أفضله."
 
-#, c-format
-msgid "%d needs authentication"
+#, fuzzy, c-format
+msgid "%u needs authorization"
 msgstr "%d بحاجة لتصريح"
 
 msgid "Add buddy authorize"
 msgstr "أضِف تصريح الصديق"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "أدخل الطلب هنا"
 
 msgid "Would you be my friend?"
 msgstr "هل تود أن تكون صديقي؟"
 
+msgid "QQ Buddy"
+msgstr "صديق QQ"
+
 msgid "Add buddy"
 msgstr "أضف صديقا"
 
@@ -7168,8 +7419,8 @@ msgstr "رقم QQ غير صالح"
 msgid "Failed sending authorize"
 msgstr "من فضلك صرّح لي"
 
-#, c-format
-msgid "Failed removing buddy %d"
+#, fuzzy, c-format
+msgid "Failed removing buddy %u"
 msgstr "فشلت إزالة الصديق %d"
 
 #, c-format
@@ -7210,21 +7461,64 @@ msgstr "من فضلك أدخل رقم Qun"
 msgid "You can only search for permanent Qun\n"
 msgstr "يمكنك فقط البحث عن Qun الدائمة\n"
 
+#, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "خصائص الوسيط غير صالحة"
+
+#, fuzzy
+msgid "Not member"
+msgstr "عضو"
+
+msgid "Member"
+msgstr "عضو"
+
+#, fuzzy
+msgid "Requesting"
+msgstr "حوار الطلب"
+
+#, fuzzy
+msgid "Admin"
+msgstr "Adium"
+
+#, fuzzy
+msgid "Notice"
+msgstr "ملاحظة"
+
+#, fuzzy
+msgid "Detail"
+msgstr "المبدئي"
+
+#, fuzzy
+msgid "Creator"
+msgstr "أنشئ"
+
+#, fuzzy
+msgid "About me"
+msgstr "عن %s"
+
+#, fuzzy
+msgid "Category"
+msgstr "عُطل في الدردشة"
+
 msgid "The Qun does not allow others to join"
 msgstr "هذه الQun لا تسمح بالانضمام إليها"
 
 msgid "Join QQ Qun"
 msgstr "انضم إلى QQ Qun"
 
-#, c-format
-msgid "Successed join to Qun %s (%d)"
+msgid "Input request here"
+msgstr "أدخل الطلب هنا"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
 msgstr "نجه الانضمام إلى Qun %s (%d)"
 
-msgid "Successed join to Qun"
+#, fuzzy
+msgid "Successfully joined Qun"
 msgstr "نجح الانضمام إلى Qun"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7233,7 +7527,7 @@ msgstr "عملية QQ Qun"
 msgid "Failed:"
 msgstr "فشل:"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 msgid "Quit Qun"
@@ -7246,47 +7540,51 @@ msgstr ""
 "ملاحظة، إذا كنت المنشئ، \n"
 "هذه العملية فعليا ستزيل Qun."
 
-msgid "Sorry, you are not our style ..."
+#, fuzzy
+msgid "Sorry, you are not our style"
 msgstr "آسف، لست النوع الذي نفضله..."
 
-msgid "Successed changing Qun member"
+#, fuzzy
+msgid "Successfully changed Qun members"
 msgstr "نجح تغيير رقم Qun"
 
-msgid "Successed changing Qun information"
+#, fuzzy
+msgid "Successfully changed Qun information"
 msgstr "نج تغيير معلومات Qun"
 
 msgid "You have successfully created a Qun"
 msgstr "أنشأتَ Qun بنجاح"
 
-msgid "Would you like to set up the detail information now?"
+#, fuzzy
+msgid "Would you like to set up detailed information now?"
 msgstr "هل تود إدخال البيانات التفصيلية الآن؟"
 
 msgid "Setup"
 msgstr "الإعداد"
 
-#, c-format
-msgid "%d requested to join Qun %d for %s"
+#, fuzzy, c-format
+msgid "%u requested to join Qun %u for %s"
 msgstr "يطلب المستخدم %d الانضمام إلى Qun %d ل %s"
 
-#, c-format
-msgid "%d request to join Qun %d"
+#, fuzzy, c-format
+msgid "%u request to join Qun %u"
 msgstr "يطلب %d الانضمام إلى %d"
 
-#, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
-msgstr ""
+#, fuzzy, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "فشل ضم صديق للدردشة"
 
 #, c-format
-msgid "<b>Joinning Qun %d is approved by Admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
-#, c-format
-msgid "<b>Removed buddy %d.</b>"
+#, fuzzy, c-format
+msgid "<b>Removed buddy %u.</b>"
 msgstr "<b>أُزِيل الصديق %d.</b>"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>أُزِيل الصديق %d.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7295,9 +7593,6 @@ msgstr "%d مجهول"
 msgid "Level"
 msgstr "مستوى"
 
-msgid "Member"
-msgstr "عضو"
-
 msgid " VIP"
 msgstr " شخص مهم جدا"
 
@@ -7399,14 +7694,21 @@ msgstr "<p><b>كتاب الرقع الرائعين</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>شكر</b>:<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>المؤلف الأصلي</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>وكل الشباب وراء الكواليس...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
 msgstr "<i>لا تتردد في الانضمام إلينا</i> :)"
 
-#, c-format
-msgid "About OpenQ r%s"
+#, fuzzy, c-format
+msgid "About OpenQ %s"
 msgstr "عن OpenQ r%s"
 
 msgid "Change Icon"
@@ -7424,6 +7726,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "عن OpenQ"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "عدّل العنوان"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7434,7 +7740,8 @@ msgstr "عن OpenQ"
 #. *< version
 #. *  summary
 #. *  description
-msgid "QQ Protocol\tPlugin"
+#, fuzzy
+msgid "QQ Protocol Plugin"
 msgstr "ملحقة بروتوكول QQ"
 
 msgid "Auto"
@@ -7452,7 +7759,6 @@ msgstr "QQ2007"
 msgid "QQ2008"
 msgstr "QQ2008"
 
-#. #endif
 msgid "Connect by TCP"
 msgstr "اتّصل باستخدام TCP"
 
@@ -7462,13 +7768,19 @@ msgstr "أظهر تنبيه الخادوم"
 msgid "Show server news"
 msgstr "أظهر أخبار الخادوم"
 
-msgid "Keep alive interval(s)"
+msgid "Show chat room when msg comes"
 msgstr ""
 
-msgid "Update interval(s)"
+#, fuzzy
+msgid "Keep alive interval (seconds)"
+msgstr "فترات التحديث"
+
+#, fuzzy
+msgid "Update interval (seconds)"
 msgstr "فترات التحديث"
 
-msgid "Can not decrypt get server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "تعذّر تظهير رد الخادوم المُستَلَم"
 
 #, c-format
@@ -7480,32 +7792,30 @@ msgid "Invalid token len, %d"
 msgstr ""
 
 #. extend redirect used in QQ2006
-msgid "Not support Redirect_EX now"
+msgid "Redirect_EX is not currently supported"
 msgstr ""
 
-msgid "Error password"
-msgstr "عطل كلمة سر"
-
 #. need activation
 #. need activation
 #. need activation
-msgid "Need active"
-msgstr ""
+#, fuzzy
+msgid "Activation required"
+msgstr "تتطلب التسجيل"
 
-#, c-format
-msgid "Unknow reply code when login (0x%02X)"
+#, fuzzy, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "رمز رد غير معروف أثناء الولوج (0x%02X)"
 
-msgid "Keep alive error"
-msgstr "عطل في الإبقاء على الاتصال"
-
-msgid "Requesting captcha ..."
+#, fuzzy
+msgid "Requesting captcha"
 msgstr "يسجّل كابتشا ..."
 
-msgid "Checking code of  captcha ..."
+#, fuzzy
+msgid "Checking captcha"
 msgstr "يفحص من رمز كابتشا ..."
 
-msgid "Failed captcha verify"
+#, fuzzy
+msgid "Failed captcha verification"
 msgstr "فشل تحقق كاباتشا"
 
 msgid "Captcha Image"
@@ -7514,76 +7824,51 @@ msgstr "صورة كابتشا"
 msgid "Enter code"
 msgstr "أدخل الرمز"
 
-msgid "QQ Captcha Verifing"
+#, fuzzy
+msgid "QQ Captcha Verification"
 msgstr "تحقق كابتشا QQ"
 
-msgid "Please fill code according to image"
-msgstr "من فضلك اكتب طبقا للصورة"
-
-#. uid is not exist
-msgid "invalid user name"
-msgstr "اسم مستخدم غير صالح"
+#, fuzzy
+msgid "Enter the text from the image"
+msgstr "أدخل اسم المجموعة"
 
-#, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+#, fuzzy, c-format
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr "رمز رد غير معروف أثناء فحص كلمة السر (0x%02X)"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 "رمز رد غير معروف أثناء الولوج (0x%02X):\n"
 "%s"
 
-msgid "Failed to connect all servers"
-msgstr "فشل الاتصال بكل الخواديم"
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "تعذّر الاتصال."
-
 msgid "Socket error"
 msgstr "عطل في المقبس"
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"فُقد الاتصال بالخادوم:\n"
-"%d، %s"
-
-msgid "Unable to read from socket"
-msgstr "تعذّرت القراءة من المقبس"
-
-msgid "Write Error"
-msgstr "عطل في الكتابة"
-
-msgid "Connection lost"
-msgstr "قُطع الاتصال"
-
-msgid "Get server ..."
+#, fuzzy
+msgid "Getting server"
 msgstr "اجلب الخادوم ..."
 
-msgid "Request token"
-msgstr ""
+#, fuzzy
+msgid "Requesting token"
+msgstr "مُنِع الطلب"
 
-msgid "Couldn't resolve host"
-msgstr "لا يمكن استجلاء المضيف"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "تعذّر الاتصال بالخادوم."
 
 msgid "Invalid server or port"
 msgstr "خادوم أو منفذ غير صحيح"
 
-msgid "Connecting server ..."
-msgstr "يتصل بالخادوم..."
+#, fuzzy
+msgid "Connecting to server"
+msgstr "يجري الاتصال بخادوم SILC"
 
 msgid "QQ Error"
 msgstr "خطأ QQ"
 
-msgid "Failed to send IM."
-msgstr "تعذّر إرسال رسالة فورية."
-
 #, c-format
 msgid ""
 "Server News:\n"
@@ -7596,6 +7881,10 @@ msgstr ""
 "%s\n"
 "%s"
 
+#, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
 #, c-format
 msgid "From %s:"
 msgstr "مِن %s:"
@@ -7608,32 +7897,26 @@ msgstr ""
 "تنبيهات الخادوم من %s: \n"
 "%s"
 
-msgid "Unknow SERVER CMD"
+msgid "Unknown SERVER CMD"
 msgstr ""
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 msgid "QQ Qun Command"
 msgstr ""
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr "ليس عضوا في الغرفة \"%s\"\n"
-
-msgid "Can not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "تعذر تظهير رد الولوج"
 
-msgid "Logined"
-msgstr "ولج"
-
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr ""
 
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr ""
 
 #, c-format
@@ -7647,9 +7930,6 @@ msgstr "أُرسِل الملف"
 msgid "%d canceled the transfer of %s"
 msgstr "ألغى %d نقل %s"
 
-msgid "Connection closed (writing)"
-msgstr "أُغلِق الاتصال (تدري الكتابة)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>عنوان المجموعة:</b> %s<br>"
@@ -7696,23 +7976,13 @@ msgid "Starting Services"
 msgstr "يجري بدء الخدمات"
 
 #, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
 msgstr "وضع مدير Sametime الإعلان التالي على الخادوم %s"
 
 msgid "Sametime Administrator Announcement"
 msgstr "إعلان من مدير Sametime"
 
-msgid "Connection reset"
-msgstr "صُفِّر الاتصال"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "عطل في القراءة من المقبس: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "تعذّر الاتصال بالخادوم"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "إعلان من %s"
@@ -7735,6 +8005,9 @@ msgstr "سماعات"
 msgid "Video Camera"
 msgstr "كاميرا فيديو"
 
+msgid "File Transfer"
+msgstr "نقل الملفّات "
+
 msgid "Supports"
 msgstr "الدعم"
 
@@ -7913,7 +8186,8 @@ msgstr "تعذّرت إضافة مجموعة: المجموعة غير موجود
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
-msgstr "لم يطابق المعرف '%s' أي مجموعة دفتر عناوين ملاحظات في مجتمعك في Sametime."
+msgstr ""
+"لم يطابق المعرف '%s' أي مجموعة دفتر عناوين ملاحظات في مجتمعك في Sametime."
 
 msgid "Notes Address Book Group"
 msgstr "مجموعة دفتر عناوين الملاحظات"
@@ -8228,6 +8502,7 @@ msgstr "<br><b>HMAC للقناة</b> %s"
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>موضوع القناة:</b><br>%s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>أطوار القناة:</b> "
 
@@ -8252,6 +8527,7 @@ msgstr "عبارة سر القناة"
 msgid "Channel Public Keys List"
 msgstr "قائمة المفاتيح العلنية للقناة"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8326,8 +8602,10 @@ msgid "Set Secret Channel"
 msgstr "حددها قناةً سريةً"
 
 #, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
-msgstr "يجب عليك الانضمام إلى القناة %s قبل أن تتمكن من الانضمام إلى المجموعة الخاصة"
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+"يجب عليك الانضمام إلى القناة %s قبل أن تتمكن من الانضمام إلى المجموعة الخاصة"
 
 msgid "Join Private Group"
 msgstr "انضم إلى لمجموعة الخاصة"
@@ -8436,9 +8714,6 @@ msgstr "المنظّمة"
 msgid "Unit"
 msgstr "الوحدة"
 
-msgid "Note"
-msgstr "ملاحظة"
-
 msgid "Join Chat"
 msgstr "انضم للدردشة"
 
@@ -8538,6 +8813,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "إحصائيات الشبكة"
 
+msgid "Ping"
+msgstr "بِنْج"
+
 msgid "Ping failed"
 msgstr "فشل بِنْج"
 
@@ -8597,35 +8875,37 @@ msgstr "نوع مفتاح علني غير مدعوم"
 msgid "Disconnected by server"
 msgstr "قطع الخادوم الاتصال"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "خطأ أثناء الاتصال بخادوم SILC"
 
 msgid "Key Exchange failed"
 msgstr "فشل تبادل المفتاح"
 
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "فشلت متابعة الجلسة المفصولة. اضغط \"أعِد الاتصال\" لتُنشئ اتصالا جديدا."
 
-msgid "Connection failed"
-msgstr "فشل الاتصال"
-
 msgid "Performing key exchange"
 msgstr "يجري تبادل المفاتيح"
 
-msgid "Unable to create connection"
-msgstr "تعذّر إنشاء اتصال"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "تعذّر تحميل زوج مفاتيح SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "يجري الاتصال بخادوم SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "تعذّر تحميل زوج مفاتيح SILC"
+
 msgid "Out of memory"
 msgstr "نفدت الذّاكرة"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "لا يمكن استبداء بروتوكول SILC"
 
 msgid "Error loading SILC key pair"
@@ -8638,6 +8918,7 @@ msgstr "نزّل %s: %s"
 msgid "Your Current Mood"
 msgstr "مزاجك الحالي"
 
+#, c-format
 msgid "Normal"
 msgstr "عادي"
 
@@ -8961,7 +9242,8 @@ msgstr "وقع و تحقق من كل الرسائل"
 msgid "Creating SILC key pair..."
 msgstr "يجري توليد زوج مفاتيح SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "تعذّر توليد زوج مفاتيح SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9053,64 +9335,78 @@ msgstr "السبورة"
 msgid "No server statistics available"
 msgstr "لا تتوفر إحصائيات للخادوم"
 
+msgid "Error during connecting to SILC Server"
+msgstr "خطأ أثناء الاتصال بخادوم SILC"
+
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "فشل: إصدارة قديمة. رقّ العميل."
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "فشل: لا يدعم البعيد أو لا يثق في مفتاحك العلني"
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "فشل: لا يدعم البعيد مجموعة KE المقترحة"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "فشل: لا يدعم البعيد الشفرة المقترحة"
 
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "فشل: لا يدعم البعيد PKCS المقترحة"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "فشل: لا يدعم البعيد دالة التلبيد المقترحة"
 
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "فشل: لا يدعم البعيد HMAC المقترحة"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "فشل: توقيع غير صحيح"
 
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "فشل: كوكي غير صالحة"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "فشل: فشل الاستيثاق"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "تعذّر استبداء اتصال عميل SILC"
 
 msgid "John Noname"
 msgstr "اللهو الخفي"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "تعذّر تحميل زوج مفاتيح SILC: %s"
 
-msgid "Could not write"
-msgstr "تعذّرت الكتابة"
-
-msgid "Could not connect"
-msgstr "تعذّر الاتصال"
+msgid "Unable to create connection"
+msgstr "تعذّر إنشاء اتصال"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "استجابة خادوم مجهولة."
 
-msgid "Could not create listen socket"
-msgstr "لايمكن إنشاء مقبس استماع"
-
-msgid "Could not resolve hostname"
-msgstr "لا يمكن استجلاء اسم المضيف"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "تعذّر إنشاء مقبس"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "لا يمكن أن تحوي أسماء مستخدمي SIP فراغات أو رمز @"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "أظهر تنبيه الخادوم"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9144,169 +9440,68 @@ msgstr "استوثق من المستخدم"
 msgid "Auth Domain"
 msgstr "استوثق من النطاق"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "يبحث عن %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "فشل الاتصال بـ %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "ولج: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "تعذّرت كتابة الملف %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "تعذّرت قراءة الملف %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "الرسالة أطول من المسموح به، بتر آخر %s بايت."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "غير والج %s حاليًا."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "تحذير أن %s غير مسموح به."
-
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "أُسقِطت رسالة، أنت تتجاوز حدّ سرعة الخادوم."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "الدردشة في %s غير متوفرة."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "أرسلتَ رسائل بسرعة جدًا إلى %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "فقدت رسالة فورية من %s لكونها أكبر من اللازم."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "فقدت رسالة فورية من %s لأنها أرسلت بسرعة جدًا."
-
-msgid "Failure."
-msgstr "فشل."
-
-msgid "Too many matches."
-msgstr "الكثير جدا من التطابقات"
-
-msgid "Need more qualifiers."
-msgstr "تحتاج لمزيد من المحددات."
-
-msgid "Dir service temporarily unavailable."
-msgstr "خدمة الدليل غير متاحة مؤقتا."
-
-msgid "Email lookup restricted."
-msgstr "البحث في البريد مقيد."
-
-msgid "Keyword ignored."
-msgstr "الكلمة المفتاحية تم تجاهلها."
-
-msgid "No keywords."
-msgstr "لا كلمات مفتاحية."
-
-msgid "User has no directory information."
-msgstr "ليس للمستخدم معلومات في الدليل."
-
-msgid "Country not supported."
-msgstr "البلد غير مدعومة."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "فشل مجهول: %s."
-
-msgid "Incorrect username or password."
-msgstr "اسم مستخدم أو كلمة سر غير صحيحة."
-
-msgid "The service is temporarily unavailable."
-msgstr "الخدمة غير متاحة مؤقتًا."
-
-msgid "Your warning level is currently too high to log in."
-msgstr "مستوى تحذيراتك حاليًا أعلى من أن يسمح لك بالولوج."
-
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
-"أنت توالي الاتصال و الفصل سريعا. انتظر عشر دقائق ثم حاول مجددا. لو عدت "
-"للمحاولة فورا فستضطر إلى أن تنتظر أطول."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "حدث عطل ولوج غير معروف: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "حدث عطل مجهول، %d.  معلومات: %s"
-
-msgid "Invalid Groupname"
-msgstr "اسم مجموعة غير صالح"
+"join &lt;room&gt;: \n"
+"انضم إلي غرفة دردشة في شبكة ياهو"
 
-msgid "Connection Closed"
-msgstr "أُغلق الاتصال"
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+"list: \n"
+"اسرد الغرف في شبكة ياهو"
 
-msgid "Waiting for reply..."
-msgstr "في انتظار الرد..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+"doodle: \n"
+"اطلب من المستخدم أن يبدأ جلسة Doodle"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "عاد TOC من توقفه المؤقت. يمكنك الآن إرسال الرسائل ثانية."
+msgid "Yahoo ID..."
+msgstr "هويّة ياهو..."
 
-msgid "Password Change Successful"
-msgstr "تغيّرت كلمة السر بنجاح"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "ملحقة بروتوكول ياهو"
 
-msgid "_Group:"
-msgstr "_مجموعة:"
+msgid "Pager server"
+msgstr "خادوم الاستدعاء"
 
-msgid "Get Dir Info"
-msgstr "اجلب معلومات الدليل"
+msgid "Pager port"
+msgstr "منفذ الاستدعاء"
 
-msgid "Set Dir Info"
-msgstr "اضبط معلومات الدليل"
+msgid "File transfer server"
+msgstr "خادوم نقل الملفات"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "لايمكن فتح %s للكتابة!"
+msgid "File transfer port"
+msgstr "منفذ نقل الملفات"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "فشل ارسال الملف: من المحتمل أن المستقبِل ألغى العملية."
+msgid "Chat room locale"
+msgstr "محليّة غرفة الدردشة"
 
-msgid "Could not connect for transfer."
-msgstr "لايمكن الاتصال للنقل."
+msgid "Ignore conference and chatroom invitations"
+msgstr "تجاهل دعوات الاجتماعات و غرف الدردشة"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "تعذرت كتابة ترويسة الملف، لن يُنقل الملف."
+msgid "Chat room list URL"
+msgstr "مسار قائمة غرفة المحادثة."
 
-msgid "Save As..."
-msgstr "احفظ باسم..."
+msgid "Yahoo Chat server"
+msgstr "خادوم دردشة ياهو"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s يطلب من %s قبول %d ملف: %s (%.2f %s)%s%s"
-msgstr[1] ""
-"%s "
-" يطلب من %s قبول %0.sملف واحد: %s (%.2f %s)%s%s"
-msgstr[2] ""
-"%s "
-" يطلب من %s قبول %0.sملفين: %s (%.2f %s)%s%s"
-msgstr[3] "%s يطلب من %s قبول %d ملفات: %s (%.2f %s)%s%s"
-msgstr[4] "%s يطلب من %s قبول %d ملفا: %s (%.2f %s)%s%s"
-msgstr[5] "%s يطلب من %s قبول %d ملف: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "منفذ دردشة ياهو"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s يطلب منك أن ترسل إليه ملفا"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "هويّة ياهو..."
 
 #. *< type
 #. *< ui_requirement
@@ -9318,12 +9513,12 @@ msgstr "%s يطلب منك أن ترسل إليه ملفا"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "ملحقة بروتوكول TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "ملحقة بروتوكول ياهو"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "أرسل إليك %s دعوة كاميرا وب، لكنها ليست مدعومة بعد."
+msgid "Your SMS was not delivered"
+msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "لم تُرسل رسالة ياهوو!"
@@ -9345,6 +9540,30 @@ msgstr "رفض %s (بأثر رجعي) طلبك إضافته إلى قائمتك.
 msgid "Add buddy rejected"
 msgstr "رفضت إضافة صديق"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "استقبلت بيانات غير صالحة عند الاتصال بالخادوم."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "خطأ مجهول رقم %d. الولوج في موقع ياهوو! على الوب قد يصحح هذه المشكلة."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "خطأ مجهول رقم %d. الولوج في موقع ياهوو! على الوب قد يصحح هذه المشكلة."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "اسم شاشة أو كلمة سر غير صحيحة"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9375,37 +9594,32 @@ msgstr "حسابك مقفل، من فضلك لُج في موقع ياهوو! ع�
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "خطأ مجهول رقم %d. الولوج في موقع ياهوو! على الوب قد يصحح هذه المشكلة."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "تعذرت إضافة الصديق %s إلى المجموعة %s على قائمة الخادوم للحساب %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "تعذرت إضافة الصديق إلى قائمة الخادوم."
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ %s/%s/%s.swf مسموع] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "تلقيت استجابة غير متوقّعة من خادوم HTTP."
 
-msgid "Connection problem"
-msgstr "مشكلة في الاتصال"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "انقطع الاتصال مع %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"تعذّر إقامة اتصال مع %s:\n"
+"تعذَّر الاتصال بالخادوم:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9453,8 +9667,8 @@ msgstr "خصائص التواجد"
 msgid "Start Doodling"
 msgstr "إبدأ Doodling"
 
-msgid "Activate which ID?"
-msgstr "أي هوية أُنشّط؟"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "من أضم إلى الدردشة؟"
@@ -9468,79 +9682,15 @@ msgstr "ضمّ مستخدما إلى الدردشة..."
 msgid "Open Inbox"
 msgstr "افتح صندوق الوارد"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join &lt;room&gt;: \n"
-"انضم إلي غرفة دردشة في شبكة ياهو"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-"list: \n"
-"اسرد الغرف في شبكة ياهو"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-"doodle: \n"
-"اطلب من المستخدم أن يبدأ جلسة Doodle"
-
-msgid "Yahoo ID..."
-msgstr "هويّة ياهو..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "ملحقة بروتوكول ياهو"
-
-msgid "Yahoo Japan"
-msgstr "ياهو اليابان"
-
-msgid "Pager server"
-msgstr "خادوم الاستدعاء"
-
-msgid "Japan Pager server"
-msgstr "خادوم استدعاء اليابان"
-
-msgid "Pager port"
-msgstr "منفذ الاستدعاء"
-
-msgid "File transfer server"
-msgstr "خادوم نقل الملفات"
-
-msgid "Japan file transfer server"
-msgstr "خادوم نقل ملفّات ياباني"
-
-msgid "File transfer port"
-msgstr "منفذ نقل الملفات"
-
-msgid "Chat room locale"
-msgstr "محليّة غرفة الدردشة"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "تجاهل دعوات الاجتماعات و غرف الدردشة"
-
-msgid "Chat room list URL"
-msgstr "مسار قائمة غرفة المحادثة."
-
-msgid "Yahoo Chat server"
-msgstr "خادوم دردشة ياهو"
-
-msgid "Yahoo Chat port"
-msgstr "منفذ دردشة ياهو"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "أُرسِل طلب Doodle."
 
+msgid "Unable to connect."
+msgstr "تعذّر الاتصال."
+
 msgid "Unable to establish file descriptor."
 msgstr "تعذّر إنشاء موصّف ملف."
 
@@ -9548,6 +9698,9 @@ msgstr "تعذّر إنشاء موصّف ملف."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "‏%s يحاول أن يرسل لك مجموعة من %d ملفات.\n"
 
+msgid "Write Error"
+msgstr "عطل في الكتابة"
+
 msgid "Yahoo! Japan Profile"
 msgstr "لاحة ياهو! اليابان"
 
@@ -9557,7 +9710,8 @@ msgstr "لاحة ياهو!"
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "عذرا، اللاحات المؤشرة بأنها محتواها للبالغين فقط غير مدعومة في الوقت الحالي."
+msgstr ""
+"عذرا، اللاحات المؤشرة بأنها محتواها للبالغين فقط غير مدعومة في الوقت الحالي."
 
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
@@ -9588,13 +9742,9 @@ msgstr "رابط رائع 3"
 msgid "Last Update"
 msgstr "التحديث الأخير"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "معلومات المستخدم %s غير متاحة"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr "عذرا، يبدو أن اللاحة مكتوبة بلغة أو صيغة غير مدعومة في الوقت الحالي."
 
 msgid ""
@@ -9664,27 +9814,24 @@ msgstr "الأصوات"
 msgid "Webcams"
 msgstr "كاميرا وِب"
 
+msgid "Connection problem"
+msgstr "مشكلة في الاتصال"
+
 msgid "Unable to fetch room list."
 msgstr "تعذّر احضار قائمة الغرف."
 
 msgid "User Rooms"
 msgstr "غرف المستخدمين"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "مشكلة اتصال مع خادوم YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"انقطع الاتصال بالخادوم\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
-msgstr "(حدث عطل أثناء تحويل الرسالة. \t افحص خيارات 'الترميز' في محرر الحسابات)"
+msgstr ""
+"(حدث عطل أثناء تحويل الرسالة. \t افحص خيارات 'الترميز' في محرر الحسابات)"
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
@@ -9737,7 +9884,8 @@ msgstr ""
 "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;:\n"
 "انضم لدردشة جديدة"
 
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instance&gt;: \n"
 "أرسل رسالة إلى &lt;message,<i>instance</i>,*&gt;"
@@ -9811,33 +9959,22 @@ msgstr "عالم"
 msgid "Exposure"
 msgstr "التعرّض"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"تعذّر إنشاء مقبس:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "تعذّر تحليل استجابة من خادوم وسيط HTTP: %s \n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "خطأ في اتصال وسيط HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "الوصول ممنوع: لا يسمح خادوم وسيط HTTP بأنفقة المنفذ %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "خطأ أثناء استجلاء %s"
 
-msgid "Could not resolve host name"
-msgstr "لايمكن استجلاء اسم المضيف"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "يجري طلب انتباه %s..."
@@ -9924,9 +10061,6 @@ msgstr "الرجاء عدم الإزعاج"
 msgid "Extended away"
 msgstr "غائب طويلًا"
 
-msgid "Mobile"
-msgstr "محمول"
-
 msgid "Listening to music"
 msgstr "يستمع إلى الموسيقى"
 
@@ -9968,16 +10102,6 @@ msgstr "+++ %s يصبح غير ساكن"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "عطل في قراءة %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr "حدث عطل أثناء قراءة %s. لم يتم تحميلها، وحُفِظ الملف القديم باسم %s~"
-
 msgid "Calculating..."
 msgstr "يجري حسابات..."
 
@@ -10085,25 +10209,40 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "قُوطع الاتصال من برمجيات على حاسوبك."
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "المستضيف البعيد أغلق الاتصال."
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "انتهت مهلة الاتصال."
 
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "رُفِض الاتصال."
 
 #. 10048
+#, c-format
 msgid "Address already in use."
 msgstr "العنوان مستخدم بالفعل."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "عطل في قراءة %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr "حدث عطل أثناء قراءة %s. لم يتم تحميلها، وحُفِظ الملف القديم باسم %s~"
+
 msgid "Internet Messenger"
 msgstr "مرسال إنترنت"
 
@@ -10146,10 +10285,8 @@ msgstr "تنبيهات _بريديّة جديدة"
 msgid "Use this buddy _icon for this account:"
 msgstr "استخدم هذه الأ_يقونة لهذا الحساب:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "خيارات %s"
+msgid "_Advanced"
+msgstr "م_تقدم"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "استخدم إعدادات وسيط جنوم"
@@ -10184,9 +10321,6 @@ msgstr "إذا نظرت بتمعن"
 msgid "you can see the butterflies mating"
 msgstr "يمكنك أن ترى الفراشات تتزاوج"
 
-msgid "Proxy Options"
-msgstr "خيارات الوسيط"
-
 msgid "Proxy _type:"
 msgstr "نوع ال_وسيط:"
 
@@ -10214,8 +10348,9 @@ msgstr "أ_ساسي"
 msgid "Create _this new account on the server"
 msgstr "أنشئ _هذا الحساب الجديد على الخادوم"
 
-msgid "_Advanced"
-msgstr "م_تقدم"
+#, fuzzy
+msgid "_Proxy"
+msgstr "الوسيط"
 
 msgid "Enabled"
 msgstr "مُفعّل"
@@ -10223,27 +10358,31 @@ msgstr "مُفعّل"
 msgid "Protocol"
 msgstr "البروتوكول"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
 "You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add</b> button below and configure your first account. If you want %s to "
-"connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
+"<b>Add...</b> button below and configure your first account. If you want %s "
+"to connect to multiple IM accounts, press <b>Add...</b> again to configure "
+"them all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>مرحبا بك في %s!</span>\n"
 "\n"
-"ليست لديك أية حسابات تراسل معدّة. لكي تبدأ التواصل باستخدام %s اضغط  زر <b>أضف</b> أدناه و أعِدّ أول حساب لك.إذا كنت تريد أن يتصل %s بعدة حسابات تراسل فوري فاضغط <b>أضف</b> مجددا لإعدادها جميعا.\n"
+"ليست لديك أية حسابات تراسل معدّة. لكي تبدأ التواصل باستخدام %s اضغط  زر "
+"<b>أضف</b> أدناه و أعِدّ أول حساب لك.إذا كنت تريد أن يتصل %s بعدة حسابات تراسل "
+"فوري فاضغط <b>أضف</b> مجددا لإعدادها جميعا.\n"
 "\n"
-"يمكنك دائما الرجوع إلى هذه النافذة لإضافة أو تحرير أو إزالة الحسابات عن طريق <b>حسابات⇦أدِر الحسابات</b> في نافذة قائمة الأصدقاء"
+"يمكنك دائما الرجوع إلى هذه النافذة لإضافة أو تحرير أو إزالة الحسابات عن طريق "
+"<b>حسابات⇦أدِر الحسابات</b> في نافذة قائمة الأصدقاء"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "لا مراسلين%0.s لديك باسم %s. أتريد دمجهم؟"
 msgstr[1] "لديك مراسل واحد%0.s باسم %s. أتريد دمجه؟"
 msgstr[2] "لديك مراسليْن%0.s باسم %s. أتريد دمجهما؟"
@@ -10262,16 +10401,17 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "من فضلك حدِّث الحقول الضروريّة."
 
-msgid "Room _List"
-msgstr "قائمة ال_غرف"
+#, fuzzy
+msgid "A_ccount"
+msgstr "الحساب"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "من فضلك أدخل المعلومات المناسبة حول الدردشة التي تود الانضمام لها.\n"
 
-msgid "_Account:"
-msgstr "_حساب:"
+msgid "Room _List"
+msgstr "قائمة ال_غرف"
 
 msgid "_Block"
 msgstr "اح_ظر"
@@ -10288,6 +10428,17 @@ msgstr "اجلب _معلومات"
 msgid "I_M"
 msgstr "_تراسل فوري"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "أ_ضف دردشة"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "دردشة بالفيديو"
+
 msgid "_Send File..."
 msgstr "أرسل _ملفا..."
 
@@ -10297,9 +10448,14 @@ msgstr "أضف إ_شعار صديق..."
 msgid "View _Log"
 msgstr "اعرض ال_سجل"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "اخفِ عندما لا تكون متصلا"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "أظهر عندما لا تكون متصلا"
+
 msgid "_Alias..."
 msgstr "_كنية..."
 
@@ -10346,7 +10502,8 @@ msgstr "_مدّد"
 msgid "/Tools/Mute Sounds"
 msgstr "/الأدوات/أكتم الأصوات"
 
-msgid "You are not currently signed on with an account that can add that buddy."
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
 msgstr "لست والجا بحساب يمكّنك من إضافة هذا الصديق."
 
 #. I don't believe this can happen currently, I think
@@ -10421,6 +10578,10 @@ msgstr "/الأدوات/إشعارات الأ_صدقاء"
 msgid "/Tools/_Certificates"
 msgstr "/الأدوات/ال_شهادات"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/الأدوات/الاب_تسامات"
+
 msgid "/Tools/Plu_gins"
 msgstr "/الأدوات/ال_ملحقات"
 
@@ -10430,9 +10591,6 @@ msgstr "/الأدوات/ال_تفضيلات"
 msgid "/Tools/Pr_ivacy"
 msgstr "/الأدوات/ال_خصوصيّة"
 
-msgid "/Tools/Smile_y"
-msgstr "/الأدوات/الاب_تسامات"
-
 msgid "/Tools/_File Transfers"
 msgstr "/الأدوات/نقل ا_لملفات"
 
@@ -10552,8 +10710,8 @@ msgstr "يدويا"
 msgid "By status"
 msgstr "حسب الحالة"
 
-msgid "By log size"
-msgstr "حسب حجم السجل"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10569,12 +10727,16 @@ msgstr "أعد الاتصال"
 msgid "Re-enable"
 msgstr "أعِد التفعيل"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "مرحبا بعودتك"
 
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
-msgid_plural "%d accounts were disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
 msgstr[0] "لم تُعطّل أية حسابات لأنك دخلت من موقع آخر:"
 msgstr[1] "عُطّل حساب واحد لأنك دخلت من موقع آخر:"
 msgstr[2] "عُطّل حسابين واحد لأنك دخلت من موقع آخر:"
@@ -10605,7 +10767,9 @@ msgid ""
 msgstr ""
 "<span weight='bold' size='larger'>مرحبًا بك في %s!</span>\n"
 "\n"
-"لم تُفعِّل أي حسابات. فعِّل حساباتك من نافذة <b>الحسابات</b> في <b>الحسابات⇦أدِر الحسابات</b>. متى فعلت حسابك ، ستتمكن من الولوج، ضبط حالتك، والتحدث مع أصدقائك."
+"لم تُفعِّل أي حسابات. فعِّل حساباتك من نافذة <b>الحسابات</b> في <b>الحسابات⇦أدِر "
+"الحسابات</b>. متى فعلت حسابك ، ستتمكن من الولوج، ضبط حالتك، والتحدث مع "
+"أصدقائك."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10655,10 +10819,14 @@ msgstr ""
 msgid "A_lias:"
 msgstr "الك_نية:"
 
+msgid "_Group:"
+msgstr "_مجموعة:"
+
 msgid "Auto_join when account becomes online."
 msgstr "انضم تلقائيا عندما يتصل الحساب."
 
-msgid "_Hide chat when the window is closed."
+#, fuzzy
+msgid "_Remain in chat after window is closed."
 msgstr "ا_خفِ الدردشة عند غلق النافذة."
 
 msgid "Please enter the name of the group to be added."
@@ -10688,6 +10856,115 @@ msgstr "/أدوات"
 msgid "/Buddies/Sort Buddies"
 msgstr "/الأصدقاء/رتّب الأصدقاء"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "لون الخلفية"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "لاو"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "لون الخلفية"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_مدّد"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "اختر لون الخلفية"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "قلّ_ص"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "اختر لون الخلفية"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "اختصار"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "متصل"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "غائب"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "غير متصل"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "نص المزاج"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "أُرسِلت الرسالة"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "غيّر معلومات المستخدم لأجل %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "أدخل اسم المضيف صاحب هذه الشهادة."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "خادوم SSL"
@@ -10698,18 +10975,13 @@ msgstr "أمرٌ مجهول."
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "هذا الصديق لا يستخدم ذات البروتوكول الذي تستخدمه هذه الدردشة."
 
-msgid "You are not currently signed on with an account that can invite that buddy."
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
 msgstr "لست والجا حاليًا بحساب يمكنك من دعوة ذلك الصديق."
 
 msgid "Invite Buddy Into Chat Room"
 msgstr "ادعُ صديقا إلى غرفة الدردشة"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "أدخل اسم المستخدم الذي ترغب في دعوته، مع رسالة دعوة اختيارية."
-
 msgid "_Buddy:"
 msgstr "ال_صديق:"
 
@@ -10738,7 +11010,8 @@ msgstr "تجاهل"
 msgid "Get Away Message"
 msgstr "اجلب رسالة \"الغياب\""
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "آخر ماقيل"
 
 msgid "Unable to save icon file to disk."
@@ -10784,6 +11057,22 @@ msgstr "/محادثة/ا_حفظ باسم..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/محادثة/ام_ح نافذة المحادثة"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/محادثة/ال_مزيد"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/محادثة/ال_مزيد"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/محادثة/ال_مزيد"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/محادثة/استعرض ال_سجل"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/محادثة/أر_سل ملفا..."
 
@@ -10856,6 +11145,18 @@ msgstr "/محادثة"
 msgid "/Conversation/View Log"
 msgstr "/محادثة/استعرض السجل"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/محادثة/المزيد"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/محادثة/استعرض السجل"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/محادثة/المزيد"
+
 msgid "/Conversation/Send File..."
 msgstr "/محادثة/أرسل ملفا..."
 
@@ -11044,6 +11345,9 @@ msgstr "الفنانون"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "دعم"
 
@@ -11168,6 +11472,10 @@ msgstr "هندية"
 msgid "Hungarian"
 msgstr "مجرية"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "رومانية"
+
 msgid "Indonesian"
 msgstr "إندونيسية"
 
@@ -11183,6 +11491,10 @@ msgstr "جورجية"
 msgid "Ubuntu Georgian Translators"
 msgstr "مترجمو أوبونتو الجورجيون "
 
+#, fuzzy
+msgid "Khmer"
+msgstr "أخرى"
+
 msgid "Kannada"
 msgstr "كانادا"
 
@@ -11204,6 +11516,10 @@ msgstr "لتوانية"
 msgid "Macedonian"
 msgstr "مقدونية"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "مقدونية"
+
 msgid "Bokmål Norwegian"
 msgstr "نرويجية بوكمال"
 
@@ -11258,6 +11574,9 @@ msgstr "صنهالا"
 msgid "Swedish"
 msgstr "سويدية"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "تاميلية"
 
@@ -11316,7 +11635,25 @@ msgstr ""
 "'COPYRIGHT' لترى القائمة الكاملة بالمساهمين. لا نقدم أي ضمان على هذه "
 "البرمجية.<BR><BR> "
 
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin على irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin على irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11435,7 +11772,8 @@ msgid "_Remove Group"
 msgstr "أزِل _مجموعة"
 
 #, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "أنت بصدد إزالة %s من قائمة أصدقائك.  هل تريد الاستمرار؟"
 
 msgid "Remove Buddy"
@@ -11574,7 +11912,7 @@ msgid "Hyperlink visited color"
 msgstr "لون الرابط الفائق المزار"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "لون لرسم الروابط الفائقة عندما تكون الفأرة فوقها."
 
 msgid "Hyperlink prelight color"
@@ -11612,15 +11950,24 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr "لون اسم رسالة الإجراء"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "لون رسم اسم رسالة إجراء."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "أرسل لون اسم الرسالة"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "لون رسم اسم رسالة إجراء."
+
+#, fuzzy
 msgid "Typing notification color"
 msgstr "إزالة التنبيه"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "تنبيهات بريديّة جديدة"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11633,15 +11980,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "تنبيهات بريديّة جديدة"
 
-msgid "_Copy Email Address"
-msgstr "ا_نسخ عنوان البريد الإلكتروني"
-
-msgid "_Open Link in Browser"
-msgstr "ا_فتح الرابط في المتصفح"
-
-msgid "_Copy Link Location"
-msgstr "ا_نسخ موقع الرابط"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11770,9 +12108,6 @@ msgstr "صغّر الخط"
 msgid "Font Face"
 msgstr "نوع الخط"
 
-msgid "Background Color"
-msgstr "لون الخلفية"
-
 msgid "Foreground Color"
 msgstr "لون المقدمة"
 
@@ -11876,13 +12211,14 @@ msgstr "_تصفّح مجلد السجلات"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. جرب `%s -h' لمزيد من المعلومات.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11906,13 +12242,14 @@ msgstr ""
 "  --display=DISPLAY   اسم معراض س ليُستخدم\n"
 "  -v, --version       اعرض النسخة الحالية واخرج\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11934,7 +12271,7 @@ msgstr ""
 "                             بدون هذا لن يُفعّل سوى الحساب الأول).\n"
 "  -v, --version       اعرض النسخة الحالية واخرج\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
@@ -11948,11 +12285,6 @@ msgid ""
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
-"\n"
-"If you need further assistance, please IM either SeanEgn or \n"
-"LSchiere (via AIM).  Contact information for Sean and Luke \n"
-"on other protocols is at\n"
-"%swiki/DeveloperPages\n"
 msgstr ""
 "حدث خطأ في %s %s وقام بطرْح ملف لُب.\n"
 "هذه علّة في البرمجية وليست خطأ منك.\n"
@@ -11976,11 +12308,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "بِدْجِن"
 
-msgid "Open All Messages"
-msgstr "افتح جميع الرسائل"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">لديك رسالة!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "يجري حسابات..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12013,9 +12361,31 @@ msgstr "تعذّر فتح المسار"
 msgid "Error launching \"%s\": %s"
 msgstr "خطأ في إطلاق \"%s\": %s"
 
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "أمر المتصفح \"اليدوي\" تم اختياره، ولكن لم يُحدد أي أمر."
 
+#, fuzzy
+msgid "No message"
+msgstr "رسالة مجهولة"
+
+msgid "Open All Messages"
+msgstr "افتح جميع الرسائل"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">لديك رسالة!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "إشعار صديق جديد"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">لديك رسالة!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "الملحقات التالية ستفرغ."
 
@@ -12062,10 +12432,17 @@ msgstr "<b>بيانات الملحقة</b>"
 msgid "Select a file"
 msgstr "اختر ملفًا"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "حرِّر إشعار الصديق"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "إشعار على من"
 
+msgid "_Account:"
+msgstr "_حساب:"
+
 msgid "_Buddy name:"
 msgstr "ا_سم الصديق:"
 
@@ -12132,7 +12509,60 @@ msgstr "_متكرر"
 msgid "Pounce Target"
 msgstr "أشعر الهدف"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "يبدأ في الكتابة"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "يلبث أثناء الكتابة"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "يلج"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s عاد من السكون (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "يعود من غيابه"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "أوقَفَ الكتابة"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "يخرج"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "يصبح ساكنا"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "عند الغياب"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "أرسل رسالة"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "حدث إشعار مجهول. من فضلك أبلغ عن هذا!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "فشل فك ضغط تيمة البسمات."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "فشل فك ضغط تيمة البسمات."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "فشل فك ضغط تيمة البسمات."
 
 msgid "Install Theme"
@@ -12154,6 +12584,12 @@ msgstr "اختصارات لوحة المفاتيح"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "أ_غلق المحادثات بزر Escape"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "قائمة الأصدقاء"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "أيقونة لوحة النظام"
 
@@ -12163,8 +12599,9 @@ msgstr "ا_عرض أيقونة لوحة النظام:"
 msgid "On unread messages"
 msgstr "عند الرسائل غير المقروءة"
 
-msgid "Conversation Window Hiding"
-msgstr "إخفاء نافذة المحادثة"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "نوافذ المحادثة الفورية"
 
 msgid "_Hide new IM conversations:"
 msgstr "ا_خفِ محادثات التراسل الفوري الجديدة"
@@ -12172,6 +12609,9 @@ msgstr "ا_خفِ محادثات التراسل الفوري الجديدة"
 msgid "When away"
 msgstr "عند الغياب"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_صغّر نوافذ المحادثات الجديدة"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "الألسنة"
@@ -12230,9 +12670,6 @@ msgstr "استخدم التدحرج السلس"
 msgid "F_lash window when IMs are received"
 msgstr "أ_ومض النافذة عند استقبال الرسائل الفورية"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_صغّر نوافذ المحادثات الجديدة"
-
 msgid "Minimum input area height in lines:"
 msgstr "أقل ارتفاع لمنطقة الإدخال بالسطور:"
 
@@ -12262,13 +12699,11 @@ msgstr "تعذّر بدأ برنامج إعداد الوسيط."
 msgid "Cannot start browser configuration program."
 msgstr "تعذّر بدأ برنامج إعداد المتصفح."
 
-msgid "ST_UN server:"
-msgstr "خادوم ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">مثال: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_تحرّى عنوان IP تلقائيا"
 
 msgid "Public _IP:"
@@ -12289,6 +12724,10 @@ msgstr "_منفذ البداية:"
 msgid "_End port:"
 msgstr "_منفذ النهاية:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "الخادوم الوسيط والمتصفح"
 
@@ -12317,6 +12756,10 @@ msgstr "خادوم وسيط"
 msgid "No proxy"
 msgstr "بلا وسيط"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_مستخدم:"
 
@@ -12397,21 +12840,27 @@ msgstr "سجّل جميع تغيرات ال_حالة إلى سجل النظام"
 msgid "Sound Selection"
 msgstr "اختيار الصّوت"
 
+#, c-format
 msgid "Quietest"
 msgstr "هادئ جدًا"
 
+#, c-format
 msgid "Quieter"
 msgstr "أهدأ"
 
+#, c-format
 msgid "Quiet"
 msgstr "هادئ"
 
+#, c-format
 msgid "Loud"
 msgstr "عال"
 
+#, c-format
 msgid "Louder"
 msgstr "أعلى"
 
+#, c-format
 msgid "Loudest"
 msgstr "صاخب"
 
@@ -12469,12 +12918,12 @@ msgstr "عند الغياب و السكون معًا"
 msgid "Auto-away"
 msgstr "غياب تلقائي"
 
-msgid "Change status when _idle"
-msgstr "غير الحالة عند ال_سكون"
-
 msgid "_Minutes before becoming idle:"
 msgstr "عدد ال_دقائق قبل تغيير الحالة:"
 
+msgid "Change status when _idle"
+msgstr "غير الحالة عند ال_سكون"
+
 msgid "Change _status to:"
 msgstr "غيّر ال_حالة إلى:"
 
@@ -12622,29 +13071,19 @@ msgstr "احف_ظ و استخدم"
 msgid "Status for %s"
 msgstr "حالة %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "أدرِج بسمة"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "تصوِيب مكرر"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "من فضلك اختر مزاجك من القائمة."
-
 msgid "Edit Smiley"
 msgstr "حرّرجال بسمة"
 
@@ -12652,21 +13091,30 @@ msgid "Add Smiley"
 msgstr "أضف بسمة"
 
 #, fuzzy
-msgid "Smiley _Image"
-msgstr "احفظ الصورة"
+msgid "_Image:"
+msgstr "_صورة"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "ا_ختصار الابتسامة"
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "اختصار"
 
 msgid "Smiley"
 msgstr "بسمة"
 
 #, fuzzy
+msgid "Shortcut Text"
+msgstr "اختصار"
+
+#, fuzzy
 msgid "Custom Smiley Manager"
 msgstr "مدير الشّهادات"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "اختر صديقا"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "استخدم هذه الأ_يقونة لهذا الحساب:"
 
@@ -12747,9 +13195,10 @@ msgstr "يمكنك إدراج هذه الصورة داخل الرسالة، أو
 msgid "Cannot send launcher"
 msgstr "تعذّر إرسال المشغل"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "قمت بسحب مشغل سطح مكتب. على الأغلب قصدت أن ترسل الشيء الذي يشير اليه هذا "
 "المشغل و ليس المشغل ذاته."
@@ -12779,9 +13228,20 @@ msgid "Failed to open file '%s': %s"
 msgstr "فشل فتح ملف '%s': %s"
 
 #, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "فشل تحميل الصورة '%s': السبب مجهول، ربما يكون ملف الصورة تالفًا"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "ا_فتح الرابط في:"
+
+msgid "_Copy Link Location"
+msgstr "ا_نسخ موقع الرابط"
+
+msgid "_Copy Email Address"
+msgstr "ا_نسخ عنوان البريد الإلكتروني"
+
 msgid "Save File"
 msgstr "احفظ الملف"
 
@@ -12800,9 +13260,14 @@ msgstr "ا_جلب معلومات"
 msgid "_Invite"
 msgstr "ادعُ"
 
-msgid "_Modify"
+#, fuzzy
+msgid "_Modify..."
 msgstr "_عدِّل"
 
+#, fuzzy
+msgid "_Add..."
+msgstr "أ_ضف"
+
 msgid "_Open Mail"
 msgstr "ا_فتح البريد"
 
@@ -12824,6 +13289,13 @@ msgstr "اختيار هذا يُعطِّل البسمات الرسومية."
 msgid "none"
 msgstr "بدون"
 
+#, fuzzy
+msgid "Small"
+msgstr "البريد الإلكتروني"
+
+msgid "Smaller versions of the default smilies"
+msgstr ""
+
 msgid "Response Probability:"
 msgstr "احتمالية الرد:"
 
@@ -12863,6 +13335,78 @@ msgstr "ملحقة توقع تواجد المراسل."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "تعرض معلومات إحصائية عن تواجد أصدقائك"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "عنوان الخادوم"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "أدخل اسم خادوم اجتماع"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "اختر خادوم اجتماع للاستعلام"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "الخدمات على الخط"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "أرسل قائمة الأصدقاء"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "يذهب بعيدا"
+
+#, fuzzy
+msgid "Directory"
+msgstr "دليل السجل"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "اختيار الصّوت"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "خدمة PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "الوصف"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "معلومات اكتشاف الخدمة"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "ال_متصفح:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "المستخدم غير موجود"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "لا يستخدم الخادوم أي طريقة استيثاق مدعومة"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "معلومات اكتشاف الخدمة"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "تفيد هذه الملحقة في تنقيح خواديم و عملاء XMPXMPPP."
+
 msgid "Buddy is idle"
 msgstr "الصديق ساكن"
 
@@ -12885,7 +13429,8 @@ msgstr "قيم النقاط لتستخدم عندما..."
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
-msgstr "الصديق ذو <i>الحاصل الأكبر</i> هو الصديق الذي لديه أولوية في الاتصال.\n"
+msgstr ""
+"الصديق ذو <i>الحاصل الأكبر</i> هو الصديق الذي لديه أولوية في الاتصال.\n"
 
 msgid "Use last buddy when scores are equal"
 msgstr "استخدم الصديق الأخير عندما تكون النقاط متعادلة"
@@ -12905,7 +13450,8 @@ msgstr "أولوية الاتصال"
 #. *< name
 #. *< version
 #. *< summary
-msgid "Allows for controlling the values associated with different buddy states."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
 msgstr "يسمح بالتحكم بالقيم المرتبطة مع حالات الأصدقاء المختلفة."
 
 #. *< description
@@ -12960,7 +13506,8 @@ msgstr "موضع المحادثة"
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
-msgstr "ملحوظة: تفضيل \"محادثات جديدة\" يجب أن يكون مضبوطا على \"بتعداد المحادثة\"."
+msgstr ""
+"ملحوظة: تفضيل \"محادثات جديدة\" يجب أن يكون مضبوطا على \"بتعداد المحادثة\"."
 
 msgid "Number of conversations per window"
 msgstr "عدد المحادثات لكل نافذة"
@@ -12987,7 +13534,8 @@ msgstr "خيارات إضافية لموضع المحادثة"
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
-msgstr "قيد عدد المحادثات لكل نافذة، اختياريًا مع فصل الرسائل الفورية عن الدردشات"
+msgstr ""
+"قيد عدد المحادثات لكل نافذة، اختياريًا مع فصل الرسائل الفورية عن الدردشات"
 
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
@@ -13238,9 +13786,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "ملحقة تراسل موسيقي للتأليف الجماعي."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "تتيح ملحقة التراسل الموسيقي لمجموعة من المستخدمين العمل معا على مقطوعة "
 "موسيقية بتحرير نوتة مشتركة في الوقت الحقيقي."
@@ -13354,12 +13903,6 @@ msgstr ""
 "- تعكس كل النص الوارد.\n"
 "- ترسل رسالة إلى اصدقائك في لحظة ولوجهم."
 
-msgid "Cursor Color"
-msgstr "لون المؤشّر"
-
-msgid "Secondary Cursor Color"
-msgstr "لون المؤشر الثانوي"
-
 msgid "Hyperlink Color"
 msgstr "لون الروابط الفائقة"
 
@@ -13369,6 +13912,10 @@ msgstr "لون الروابط الفائقة المزارة"
 msgid "Highlighted Message Name Color"
 msgstr "لون اسم الرسائل المُبرزة"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "إزالة التنبيه"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "فصْل GtkTreeView الأفقي"
 
@@ -13384,6 +13931,7 @@ msgstr "حوار التذكير"
 msgid "Select Color"
 msgstr "اختر لونا"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "حدد خط الواجهة"
 
@@ -13397,35 +13945,24 @@ msgstr "خط واجهة جتك+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "تيمة اختصارات جتك+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "ألوان الواجهة"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "تنبيهات بريديّة جديدة"
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "تحكمات تيمات جتك+ لبِدْجِن"
 
-msgid "Widget Sizes"
-msgstr "أحجام الوِدج"
+#, fuzzy
+msgid "Colors"
+msgstr "أغلق"
 
 msgid "Fonts"
 msgstr "الخطوط"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "أدوات ملف Gtkrc"
 
@@ -13456,20 +13993,20 @@ msgstr ""
 "'Enter' في صندوق الإدخال للإرسال. راقب نافذة التنقيح."
 
 #, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
+msgid "You can upgrade to %s %s today."
 msgstr ""
-"تستخدم %s إصدارة %s.  الإصدارة الحالية هي %s. يمكنك الحصول عليها من <a href="
-"\"%s\">%s</a><hr>"
-
-#, c-format
-msgid "<b>ChangeLog:</b><br>%s"
-msgstr "<b>سجل التغييرات:</b><br>%s"
 
 msgid "New Version Available"
 msgstr "توجد إصدارة جديدة"
 
+#, fuzzy
+msgid "Later"
+msgstr "التاريخ"
+
+#, fuzzy
+msgid "Download Now"
+msgstr "نزّل %s: %s"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13510,7 +14047,7 @@ msgstr "زر إرسال نافذة المحادثة."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13562,6 +14099,113 @@ msgstr "استبدال نص"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "يستبدل النص في الرسائل الصادرة تبعا لقواعد المستخدم المحددة."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "لم يلج"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "لم يلج"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "انضم لدردشة"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "تجاهل"
+
+#, fuzzy
+msgid "Founder"
+msgstr "أعلى"
+
+#, fuzzy
+msgid "Operator"
+msgstr "أوبرا"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "منح التصريح"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "عطل"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "معلومات"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "حوار الطلب"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "مستوى التحذير"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "حالة %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "محليّة غرفة الدردشة"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "غيّر الأيقونة"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "تحكمات تيمات جتك+ لبِدْجِن"
+
+#, fuzzy
+msgid "Contact"
+msgstr "معلومات الاتصال"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "قائمة الأصدقاء"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "قائمة الأصدقاء"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "تحكمات تيمات جتك+ لبِدْجِن"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "تحكمات تيمات جتك+ لبِدْجِن"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13603,6 +14247,7 @@ msgstr "اعرض أختام زمنية بأسلوب iChat كل N دقيقة."
 msgid "Timestamp Format Options"
 msgstr "خيارات تنسيق الخاتم الزمني"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "أ_جبر على تنسيق 24 ساعة للوقت"
 
@@ -13722,16 +14367,15 @@ msgstr "_حافظ على قائمة الأصدقاء في الأعلى:"
 msgid "Only when docked"
 msgstr "فقط عند الإرساء"
 
-msgid "_Flash window when chat messages are received"
-msgstr "أو_مض النافذة عند استقبال رسائل الدردشة"
-
 msgid "Windows Pidgin Options"
 msgstr "خيارات بِدْجِن لويندوز"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "خيارات خاصة لبِدْجِن من أجل ويندوز"
 
-msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+#, fuzzy
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "يتيح خيارات خاصة بويندوز، مثل إرساء قائمة الأصدقاء."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13771,3 +14415,571 @@ msgstr "أرسِل و استقبل أبيات XMPP خام."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "تفيد هذه الملحقة في تنقيح خواديم و عملاء XMPXMPPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "لا يمكن فتح المقبس"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "لا يمكن الاستماع إلى المقبس"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "تعذّرت قراءة المقبس"
+
+#~ msgid "Connection failed."
+#~ msgstr "فشل الاتصال."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "قطع الخادومُ الاتصال"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "تعذَّر إنشاء مقبس"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "لا يمكن الاتصال بالخادوم"
+
+#~ msgid "Read error"
+#~ msgstr "خطأ في القراءة"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "تعذَّر الاتصال بالخادوم:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "عطل في الكتابة"
+
+#~ msgid "Last Activity"
+#~ msgstr "آخر نشاط"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "معلومات اكتشاف الخدمة"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "عناصر اكتشاف الخدمة"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "عنونة الأبيات الممتدّة"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "دردشة متعددة المستخدمين"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "معلومات التواجد الممتدة للدردشة متعددة المستخدمين"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "تيار بايتات داخل الحزمة"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "أوامر لحظية"
+
+#~ msgid "PubSub Service"
+#~ msgstr "خدمة PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "تيار بايتات SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "بيانات خارج الحزمة"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "التسجيل داخل الحزمة"
+
+#~ msgid "User Location"
+#~ msgstr "موضع المستخدم"
+
+#~ msgid "User Avatar"
+#~ msgstr "أيقونة المستخدم"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "تنويه حالة الدردشة"
+
+#~ msgid "Software Version"
+#~ msgstr "إصدارة البرمجية"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "بدأ التيار"
+
+#~ msgid "User Mood"
+#~ msgstr "مزاج المستخدم"
+
+#~ msgid "User Activity"
+#~ msgstr "نشاط المستخدم"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "إمكانات الكيان"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "مفاوضات الجلسات المعمّاة"
+
+#~ msgid "User Tune"
+#~ msgstr "نغمة المستخدم"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "تبادل دوراني للعناصر"
+
+#~ msgid "Reachability Address"
+#~ msgstr "عنوان الوصولية"
+
+#~ msgid "User Profile"
+#~ msgstr "لاحة المستخدم"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle Audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "كنية المستخدم"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "فيديو Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "إيصالات الرسائل"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "نشر المفتاح العلني"
+
+#~ msgid "User Chatting"
+#~ msgstr "المستخدم يدردش"
+
+#~ msgid "User Browsing"
+#~ msgstr "المستخدم يتصفّح"
+
+#~ msgid "User Gaming"
+#~ msgstr "المستخدم يلعب"
+
+#~ msgid "User Viewing"
+#~ msgstr "المستخدم يطالع"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "تعمية الأبيات"
+
+#~ msgid "Entity Time"
+#~ msgstr "وقت الكيان"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "تسليم متأخر"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "عناصر البيانات التشاركيّة"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "مستودع الملفات والمشاركة"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "اكتشاف خدمة STUN لـ Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "التفاوض المبسط لجلسة معمّاة"
+
+#~ msgid "Hop Check"
+#~ msgstr "تدقيق القفزات"
+
+#~ msgid "Read Error"
+#~ msgstr "عطل في القراءة"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "فشل الاتصال بالخادوم."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "براح القراءة ممتليء (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "رسالة يتعذّر تحليلها"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "تعذّر الاتصال بالخادوم: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "فشل الولوج (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "أولجت خارجا لأنك ولجت من حاسوب آخر."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "عطل. دعم SSL غير مثبت."
+
+#~ msgid "Incorrect password."
+#~ msgstr "كلمة سر خطأ."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "تعذّر الاتصال بخادوم BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "قد ينقطع اتصالك قريبا. طالع %s للتحديثات."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "تعذّر الاتصال"
+
+#~ msgid "Invalid username."
+#~ msgstr "اسم مستخدم غير صالح"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "تعذّر تظهير رد الخادوم المُستَلَم"
+
+#~ msgid "Connection lost"
+#~ msgstr "قُطع الاتصال"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "لا يمكن استجلاء المضيف"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "أُغلِق الاتصال (تدري الكتابة)"
+
+#~ msgid "Connection reset"
+#~ msgstr "صُفِّر الاتصال"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "عطل في القراءة من المقبس: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "تعذّر الاتصال بالخادوم"
+
+#~ msgid "Could not write"
+#~ msgstr "تعذّرت الكتابة"
+
+#~ msgid "Could not connect"
+#~ msgstr "تعذّر الاتصال"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "لايمكن إنشاء مقبس استماع"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "لا يمكن استجلاء اسم المضيف"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "كلمة السر غير صحيحة"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "تعذّر إقامة اتصال مع %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "ياهو اليابان"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "خادوم استدعاء اليابان"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "خادوم نقل ملفّات ياباني"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "انقطع الاتصال بالخادوم\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "لايمكن استجلاء اسم المضيف"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "يتطلب الخادوم TLS/SSL للولوج. لا يوجد دعم TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "إخفاء نافذة المحادثة"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "من فضلك اختر مزاجك من القائمة."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "أي هوية أُنشّط؟"
+
+#~ msgid "Cursor Color"
+#~ msgstr "لون المؤشّر"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "لون المؤشر الثانوي"
+
+#~ msgid "Interface colors"
+#~ msgstr "ألوان الواجهة"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "أحجام الوِدج"
+
+#~ msgid "Invite message"
+#~ msgstr "رسالة الدعوة"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "أدخل اسم المستخدم الذي ترغب في دعوته،\n"
+#~ "مع رسالة دعوة اختيارية."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "تعذّر جلب دفتر عناوين MSN "
+
+#~ msgid "Connection to server lost (no data received within %d second)"
+#~ msgid_plural ""
+#~ "Connection to server lost (no data received within %d seconds)"
+#~ msgstr[0] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال %d ثانية)"
+#~ msgstr[1] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال ثانية واحدة)"
+#~ msgstr[2] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال ثانيتين)"
+#~ msgstr[3] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال %d ثوان)"
+#~ msgstr[4] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال %d ثانية)"
+#~ msgstr[5] "فُقِد الاتصال بالخادوم (لم تُستقبل أي بيانات خلال %d ثانية)"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "قد ينقطع اتصالك قريبا. قد ترغب في استخدام TOC إلى أن يتم إصلاح هذا. طالع %"
+#~ "s للتحديثات."
+
+#~ msgid "Failed change icon"
+#~ msgstr "فشل تغيير الأيقونة"
+
+#~ msgid "%d needs Q&A"
+#~ msgstr "%d يحتاج س/ج"
+
+#~ msgid "Add buddy Q&A"
+#~ msgstr "أضف س/ج الصديق"
+
+#~ msgid "Error password"
+#~ msgstr "عطل كلمة سر"
+
+#~ msgid "Keep alive error"
+#~ msgstr "عطل في الإبقاء على الاتصال"
+
+#~ msgid "Please fill code according to image"
+#~ msgstr "من فضلك اكتب طبقا للصورة"
+
+#~ msgid "invalid user name"
+#~ msgstr "اسم مستخدم غير صالح"
+
+#~ msgid "Failed to connect all servers"
+#~ msgstr "فشل الاتصال بكل الخواديم"
+
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "فُقد الاتصال بالخادوم:\n"
+#~ "%d، %s"
+
+#~ msgid "Connecting server ..."
+#~ msgstr "يتصل بالخادوم..."
+
+#~ msgid "Failed to send IM."
+#~ msgstr "تعذّر إرسال رسالة فورية."
+
+#~ msgid "Not a member of room \"%s\"\n"
+#~ msgstr "ليس عضوا في الغرفة \"%s\"\n"
+
+#~ msgid "Logined"
+#~ msgstr "ولج"
+
+#~ msgid "Looking up %s"
+#~ msgstr "يبحث عن %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "فشل الاتصال بـ %s"
+
+#~ msgid "Signon: %s"
+#~ msgstr "ولج: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "تعذّرت كتابة الملف %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "تعذّرت قراءة الملف %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "الرسالة أطول من المسموح به، بتر آخر %s بايت."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "غير والج %s حاليًا."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "تحذير أن %s غير مسموح به."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "أُسقِطت رسالة، أنت تتجاوز حدّ سرعة الخادوم."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "الدردشة في %s غير متوفرة."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "أرسلتَ رسائل بسرعة جدًا إلى %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "فقدت رسالة فورية من %s لكونها أكبر من اللازم."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "فقدت رسالة فورية من %s لأنها أرسلت بسرعة جدًا."
+
+#~ msgid "Failure."
+#~ msgstr "فشل."
+
+#~ msgid "Too many matches."
+#~ msgstr "الكثير جدا من التطابقات"
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "تحتاج لمزيد من المحددات."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "خدمة الدليل غير متاحة مؤقتا."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "البحث في البريد مقيد."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "الكلمة المفتاحية تم تجاهلها."
+
+#~ msgid "No keywords."
+#~ msgstr "لا كلمات مفتاحية."
+
+#~ msgid "User has no directory information."
+#~ msgstr "ليس للمستخدم معلومات في الدليل."
+
+#~ msgid "Country not supported."
+#~ msgstr "البلد غير مدعومة."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "فشل مجهول: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "اسم مستخدم أو كلمة سر غير صحيحة."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "الخدمة غير متاحة مؤقتًا."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "مستوى تحذيراتك حاليًا أعلى من أن يسمح لك بالولوج."
+
+#~ 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 ""
+#~ "أنت توالي الاتصال و الفصل سريعا. انتظر عشر دقائق ثم حاول مجددا. لو عدت "
+#~ "للمحاولة فورا فستضطر إلى أن تنتظر أطول."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "حدث عطل ولوج غير معروف: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "حدث عطل مجهول، %d.  معلومات: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "اسم مجموعة غير صالح"
+
+#~ msgid "Connection Closed"
+#~ msgstr "أُغلق الاتصال"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "في انتظار الرد..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "عاد TOC من توقفه المؤقت. يمكنك الآن إرسال الرسائل ثانية."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "تغيّرت كلمة السر بنجاح"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "اجلب معلومات الدليل"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "اضبط معلومات الدليل"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "لايمكن فتح %s للكتابة!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "فشل ارسال الملف: من المحتمل أن المستقبِل ألغى العملية."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "لايمكن الاتصال للنقل."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "تعذرت كتابة ترويسة الملف، لن يُنقل الملف."
+
+#~ msgid "Save As..."
+#~ msgstr "احفظ باسم..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s يطلب من %s قبول %d ملف: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s  يطلب من %s قبول %0.sملف واحد: %s (%.2f %s)%s%s"
+#~ msgstr[2] "%s  يطلب من %s قبول %0.sملفين: %s (%.2f %s)%s%s"
+#~ msgstr[3] "%s يطلب من %s قبول %d ملفات: %s (%.2f %s)%s%s"
+#~ msgstr[4] "%s يطلب من %s قبول %d ملفا: %s (%.2f %s)%s%s"
+#~ msgstr[5] "%s يطلب من %s قبول %d ملف: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s يطلب منك أن ترسل إليه ملفا"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "ملحقة بروتوكول TOC"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "معلومات المستخدم %s غير متاحة"
+
+#~ msgid "%s Options"
+#~ msgstr "خيارات %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "خيارات الوسيط"
+
+#~ msgid "By log size"
+#~ msgstr "حسب حجم السجل"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "ا_فتح الرابط في المتصفح"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "خادوم ST_UN:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "احفظ الصورة"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "ا_ختصار الابتسامة"
+
+#~ msgid ""
+#~ "You are using %s version %s.  The current version is %s.  You can get it "
+#~ "from <a href=\"%s\">%s</a><hr>"
+#~ msgstr ""
+#~ "تستخدم %s إصدارة %s.  الإصدارة الحالية هي %s. يمكنك الحصول عليها من <a "
+#~ "href=\"%s\">%s</a><hr>"
+
+#~ msgid "<b>ChangeLog:</b><br>%s"
+#~ msgstr "<b>سجل التغييرات:</b><br>%s"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "أو_مض النافذة عند استقبال رسائل الدردشة"
diff --git a/po/az.po b/po/az.po
index 5eded06fdd..3650bbf545 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2004-06-28 14:03+0300\n"
 "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -33,7 +33,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -623,19 +623,6 @@ msgid "Send To"
 msgstr "_Fərqli Yolla"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "(1 ismarış)"
-
-#, fuzzy
-msgid "Invite"
-msgstr "_Daxil Et"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-
-#, fuzzy
 msgid "Conversation"
 msgstr "/_Danışıq"
 
@@ -888,6 +875,42 @@ msgid "System Log"
 msgstr "Sistem Qeydi"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "Hesablanır..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Qəbul Et"
+
+#, fuzzy
+msgid "Reject"
+msgstr "Sıfırla"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Bu söhbət üçün bir alias bildir."
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "Epoçt"
 
@@ -925,6 +948,10 @@ msgid "IM"
 msgstr "IM"
 
 #, fuzzy
+msgid "Invite"
+msgstr "_Daxil Et"
+
+#, fuzzy
 msgid "(none)"
 msgstr "Hər kimsə"
 
@@ -1140,7 +1167,6 @@ msgstr ""
 msgid "%s has sent you a message. (%s)"
 msgstr "%s sizə %s yollamaq istəyir (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1193,7 +1219,6 @@ msgstr ""
 msgid "Change status to"
 msgstr "Səhv şifrə."
 
-#. Conversations
 msgid "Conversations"
 msgstr ""
 
@@ -1534,7 +1559,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr ""
 
-#, c-format
 msgid "Online"
 msgstr "Xətdə"
 
@@ -1583,6 +1607,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 #, fuzzy
 msgid "accounts"
 msgstr "Hesablar"
@@ -1685,14 +1731,6 @@ msgstr "Söhbət dəvəti qəbul edilsin?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Qəbul Et"
-
-#, fuzzy
-msgid "Reject"
-msgstr "Sıfırla"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1780,6 +1818,8 @@ msgstr "%s xətdə girdi"
 msgid "+++ %s signed off"
 msgstr "%s xətdən çıxdı"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Naməlum xəta"
 
@@ -1829,6 +1869,16 @@ msgstr ""
 msgid "%s left the room (%s)."
 msgstr ""
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Dəvət Rədd Edildi"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "Transfer üçün bağlana bilmədi."
@@ -1955,7 +2005,7 @@ msgstr "%s əlaqəsinin fayl transfer istəyi qəbul edilsin?"
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "File transfer complete"
 msgstr "Fayl transfer qovşağı"
 
@@ -1963,7 +2013,7 @@ msgstr "Fayl transfer qovşağı"
 msgid "You canceled the transfer of %s"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "File transfer cancelled"
 msgstr "Fayl transfer qovşağı"
 
@@ -2144,11 +2194,14 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "MOTD göstərilə bilmir"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2553,7 +2606,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2603,7 +2656,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2632,6 +2685,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Şifrə"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2825,18 +2904,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "Bağlanıla bilmədi"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 #, fuzzy
 msgid "First name"
 msgstr "Ad:"
@@ -2874,6 +2953,11 @@ msgstr "Yahoo Protokol Əlavəsi"
 msgid "Purple Person"
 msgstr "Yeni Şəxs"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Yerli İstifadəçilər"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2885,15 +2969,17 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Soket açıla bilmədi"
 
-#, fuzzy
-msgid "Cannot open socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
 msgstr "Soket açıla bilmədi"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Bağlanıla bilmədi"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Soket açıla bilmədi"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2947,13 +3033,13 @@ msgstr "Fərqli Qeyd Et..."
 msgid "Load buddylist from file..."
 msgstr "_Alias..."
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr ""
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2965,14 +3051,13 @@ msgstr ""
 msgid "Password"
 msgstr "Şifrə"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Şifrə"
+msgid "Password (again)"
+msgstr ""
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
+msgid "Captcha"
 msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
@@ -3030,6 +3115,16 @@ msgstr ""
 msgid "Current password"
 msgstr "Səhv şifrə."
 
+#, fuzzy
+msgid "Password (retype)"
+msgstr "Şifrə"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3044,13 +3139,13 @@ msgstr ""
 msgid "Add to chat..."
 msgstr "_Söhbət Əlavə Et"
 
+#. Global
 msgid "Available"
 msgstr ""
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Uzaqda"
 
@@ -3083,8 +3178,9 @@ msgstr "Yeni istifadəçilər qəbul edilmir"
 msgid "There are no users matching your search criteria."
 msgstr "Xahiş edirik şəxs haqqında məlumatı aşağıda bildirin."
 
-msgid "Unable to read socket"
-msgstr ""
+#, fuzzy
+msgid "Unable to read from socket"
+msgstr "Soket açıla bilmədi"
 
 #, fuzzy
 msgid "Buddy list downloaded"
@@ -3100,8 +3196,14 @@ msgstr "Əlaqə hərəkətsizdir:"
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Bağlantı bacarılmadı"
+
+msgid "Connection failed"
 msgstr "Bağlantı bacarılmadı"
 
 #, fuzzy
@@ -3112,6 +3214,15 @@ msgstr "Söhbət Əlavə Et"
 msgid "Chat _name:"
 msgstr "Soyad:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Oxuna bilmədi"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Oxuma xətası"
@@ -3121,7 +3232,7 @@ msgid "This chat name is already in use"
 msgstr "O fayl onsuz da mövcuddur"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "Transfer üçün bağlana bilmədi."
 
 #, fuzzy
@@ -3168,6 +3279,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Pidgin İstifadəçisi"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Peycer qovşağı"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Naməlum aəmr: %s"
@@ -3184,7 +3299,7 @@ msgid "File Transfer Failed"
 msgstr "Fayl transfer qovşağı"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Soket açıla bilmədi"
 
 msgid "Error displaying MOTD"
@@ -3200,8 +3315,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr "%s üçün MOTD"
 
-msgid "Server has disconnected"
-msgstr ""
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Transfer üçün bağlana bilmədi."
 
 msgid "View MOTD"
 msgstr "MOTD-u Göstər"
@@ -3212,25 +3335,23 @@ msgstr "_Kanal:"
 msgid "_Password:"
 msgstr "Ş_ifrə:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr ""
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
-msgstr ""
+msgid "Unable to connect"
+msgstr "Bağlanıla bilmədi"
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Bağlanıla bilmədi"
 
-msgid "Read error"
-msgstr "Oxuma xətası"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "_Yenidən bağlan"
 
 msgid "Users"
 msgstr "İstifadəçilər"
@@ -3416,6 +3537,16 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "O fayl onsuz da mövcuddur"
+
+msgid "Nickname in use"
+msgstr ""
+
 msgid "Cannot change nick"
 msgstr ""
 
@@ -3615,10 +3746,10 @@ msgstr ""
 msgid "execute"
 msgstr "Sil"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3633,19 +3764,49 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Bağlantı bacarılmadı"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Transfer üçün bağlana bilmədi."
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Oxuma xətası"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Otaq adı bildirilməyib."
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Bağlanıla bilmədi"
+
 msgid "Full Name"
 msgstr ""
 
@@ -3710,176 +3871,9 @@ msgstr ""
 msgid "Operating System"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Söhbət Aliası"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Əmr"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-msgid "In-Band Registration"
-msgstr ""
-
-#, fuzzy
-msgid "User Location"
-msgstr "Mövqe"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Əlaqə Vəziyyəti Bildirişi"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Danışığı Qeyd Et"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Tətildə"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "Fayl Transferləri"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "İstifadəçi Otaqları"
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "_İstifadəçi Adı:"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Epoçt Ünvanı"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Profili Seç"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "_İstifadəçi Adı:"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "İsmarış Mətni"
-
-msgid "Public Key Publishing"
-msgstr ""
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "İstifadəçi Seçimləri"
-
 #, fuzzy
-msgid "User Browsing"
-msgstr "İstifadəçi Otaqları"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "İstifadəçi Seçimləri"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "İstifadəçi yazır..."
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
+msgid "Local Time"
+msgstr "Yerli İstifadəçilər"
 
 #, fuzzy
 msgid "Priority"
@@ -3888,6 +3882,14 @@ msgstr "Port"
 msgid "Resource"
 msgstr "Mənbə"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "%s xətdə girdi."
+
 msgid "Middle Name"
 msgstr "Orta Ad"
 
@@ -3936,7 +3938,6 @@ msgstr ""
 msgid "Extended Away"
 msgstr ""
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
@@ -4060,26 +4061,25 @@ msgstr ""
 msgid "Find Rooms"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
-msgid "Write error"
-msgstr ""
+#, fuzzy
+msgid "No users found"
+msgstr "Yeni istifadəçilər qəbul edilmir"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Bağlantı bacarılmadı"
+msgid "Roles:"
+msgstr "Rolu"
 
-msgid "Read Error"
-msgstr ""
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Bağlantı bacarılmadı"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-
-msgid "Unable to create socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4089,6 +4089,10 @@ msgstr "Səhv AIM URI-si"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Transfer üçün bağlana bilmədi."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
@@ -4114,9 +4118,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr "Bağlantı bacarılmadı"
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr ""
 
@@ -4129,6 +4130,9 @@ msgstr ""
 msgid "Date"
 msgstr "Tarix"
 
+msgid "Already Registered"
+msgstr ""
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Qeyd Et"
@@ -4158,6 +4162,10 @@ msgstr ""
 msgid "Change Registration"
 msgstr "Səhv şifrə."
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Transfer üçün bağlana bilmədi."
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4176,9 +4184,18 @@ msgstr ""
 msgid "Re-initializing Stream"
 msgstr ""
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr ""
 
+msgid "Mood"
+msgstr ""
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr ""
 
@@ -4200,12 +4217,6 @@ msgstr "Heç biri"
 msgid "Subscription"
 msgstr ""
 
-msgid "Mood"
-msgstr ""
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "Mətn"
@@ -4251,9 +4262,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Səhv şifrə."
@@ -4449,15 +4457,21 @@ msgid "Unable to ping user %s"
 msgstr "Soket açıla bilmədi"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4470,8 +4484,33 @@ msgstr "Oyan!!"
 msgid "%s has buzzed you!"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Soket açıla bilmədi"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Soket açıla bilmədi"
+
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Bağlantı bacarılmadı"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Xahiş edirik altda əlaqənin ləqəbi və hesan bövünü bildirin."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "Mənbə"
+
+msgid "Initiate Media"
 msgstr ""
 
 msgid "config:  Configure a chat room."
@@ -4493,13 +4532,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4563,6 +4602,9 @@ msgstr ""
 msgid "File transfer proxies"
 msgstr "Fayl transfer portu"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4601,6 +4643,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4616,12 +4666,30 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr "Sil"
 
+#, fuzzy
+msgid "No reason"
+msgstr "Otaq adı bildirilməyib."
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
-#, c-format
-msgid "Error in chat %s"
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s sizə %s yollamaq istəyir (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Fayl transfer qovşağı"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Soket açıla bilmədi"
+
+msgid "Failed to open in-band bytestream"
 msgstr ""
 
 #, c-format
@@ -4648,10 +4716,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Xahiş edirik altda əlaqənin ləqəbi və hesan bövünü bildirin."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "Mənbə"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "İstifadəçi Otaqları"
 
@@ -4689,9 +4753,19 @@ msgstr "Hesablar"
 msgid "Select an action"
 msgstr "Ara Üz Seçimləri"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Oxuna bilmədi"
+
+msgid "Buddy Add error"
+msgstr ""
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Ünvan Kitabçasına Əlavə Et"
+msgid "The username specified does not exist."
+msgstr "Bu fayl mövcud deyil."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4917,7 +4991,6 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4941,6 +5014,10 @@ msgstr "Uzaqdan İdarə"
 msgid "Non-IM Contacts"
 msgstr "Uzaqdan İdarə"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5009,6 +5086,13 @@ msgstr ""
 msgid "Page"
 msgstr "Səhifə"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "_Xəbərdarlıq Göstər"
+
 msgid "Has you"
 msgstr ""
 
@@ -5050,6 +5134,14 @@ msgid "Album"
 msgstr ""
 
 #, fuzzy
+msgid "Game Title"
+msgstr "Başlıq"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Başlıq"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "Fərqli Qeyd Et..."
 
@@ -5086,10 +5178,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#, fuzzy
-msgid "Failed to connect to server."
-msgstr "Transfer üçün bağlana bilmədi."
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5254,8 +5342,9 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
-msgstr ""
+#, fuzzy
+msgid "View web profile"
+msgstr "Daha az seçim göstər"
 
 #. *< type
 #. *< ui_requirement
@@ -5291,68 +5380,28 @@ msgstr "Bağlantı bacarılmadı"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Bağlantı bacarılmadı"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-#, fuzzy
-msgid "Unknown error."
-msgstr "Naməlum xəta"
-
-#, fuzzy, c-format
-msgid "%s on %s (%s)"
-msgstr "%s sizə %s yollamaq istəyir (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s sizə %s yollamaq istəyir (%s)"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Naməlum xəta"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Oxuna bilmədi"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Naməlum xəta"
 
-msgid "Service Temporarily Unavailable."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-#, fuzzy
-msgid "Unable to rename group"
-msgstr "Oxuna bilmədi"
-
-#, fuzzy
-msgid "Unable to delete group"
-msgstr "Otaq siyahısı alına bilmədi."
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5385,9 +5434,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "Bağlanıla bilmədi"
-
 msgid "Writing error"
 msgstr ""
 
@@ -5401,20 +5447,20 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
 #, fuzzy
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr "MOTD göstərilə bilmir"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, fuzzy, c-format
@@ -5446,6 +5492,14 @@ msgstr "Faylı Göndər"
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5482,14 +5536,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Ünvan Kitabçasına Əlavə Et"
@@ -5497,19 +5543,15 @@ msgstr "Ünvan Kitabçasına Əlavə Et"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr ""
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, fuzzy, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Oxuna bilmədi"
-
 msgid "The username specified is invalid."
 msgstr ""
 
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5524,17 +5566,65 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "AIM/ICQ Protokol Əlavəsi"
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+#, fuzzy
+msgid "Unknown error."
+msgstr "Naməlum xəta"
+
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
+msgstr "%s sizə %s yollamaq istəyir (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to rename group"
+msgstr "Oxuna bilmədi"
+
+#, fuzzy
+msgid "Unable to delete group"
+msgstr "Otaq siyahısı alına bilmədi."
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
 msgstr ""
 
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+#, fuzzy
+msgid "User lookup"
+msgstr "İstifadəçi Otaqları"
+
 #, fuzzy
 msgid "Reading challenge"
 msgstr "Oxuma xətası"
@@ -5546,13 +5636,23 @@ msgstr ""
 msgid "Logging in"
 msgstr "Giriş Seçimləri"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "Ləqəb bildirilməyib."
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "Transfer üçün bağlana bilmədi."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Uzaqdayam İsmarışları"
@@ -5573,21 +5673,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "Ləqəb bildirilməyib."
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_Cİ pəncərələri"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connected"
-msgstr "Bağlantı bacarılmadı"
+msgid "Add contacts from server"
+msgstr "Transfer üçün bağlana bilmədi."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5595,16 +5696,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Səhv şifrə."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "Səhv istifadəçi adı."
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Söhbətdəki əlaqəyə qoşula bilmədi"
 
@@ -5614,14 +5722,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "İstifadəçi Otaqları"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Söhbətdəki əlaqəyə qoşula bilmədi"
@@ -5632,38 +5732,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "Səhv istifadəçi adı."
-
-msgid "Read buffer full (2)"
+msgid "Missing Cipher"
 msgstr ""
 
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Soket açıla bilmədi"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Transfer üçün bağlana bilmədi."
-
-#, fuzzy
-msgid "IM Friends"
-msgstr "_Cİ pəncərələri"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "Transfer üçün bağlana bilmədi."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5707,9 +5785,6 @@ msgstr "Daha böyük yazı növü"
 msgid "User"
 msgstr "İstifadəçilər"
 
-msgid "Profile"
-msgstr "Profil"
-
 msgid "Headline"
 msgstr ""
 
@@ -5723,15 +5798,10 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "Ləqəb bildirilməyib."
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 msgid "MySpaceIM - Username Available"
@@ -5743,6 +5813,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 msgid "This username is unavailable."
 msgstr ""
 
@@ -5750,6 +5823,14 @@ msgstr ""
 msgid "Please try another username:"
 msgstr "Xahiş edirik seçili qrup üçün yeni ad bildirin."
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "Ləqəb bildirilməyib."
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5946,10 +6027,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "Səhv şifrə."
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5988,9 +6065,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Soket açıla bilmədi"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6090,9 +6167,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -6113,23 +6187,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
-msgid "Error. SSL support is not installed."
-msgstr ""
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -6152,6 +6219,22 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+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 ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "MOTD göstərilə bilmir"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Transfer üçün bağlana bilmədi."
@@ -6160,17 +6243,8 @@ msgstr "Transfer üçün bağlana bilmədi."
 msgid "Invalid chat room name"
 msgstr "Səhv istifadəçi adı."
 
-msgid "Server closed the connection."
-msgstr ""
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Transfer üçün bağlana bilmədi."
-
 #, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Transfer üçün bağlana bilmədi."
 
 #. *< type
@@ -6221,8 +6295,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Transfer üçün bağlana bilmədi."
 
 msgid "Direct IM established"
 msgstr ""
@@ -6390,23 +6465,18 @@ msgstr "Kamera"
 msgid "Screen Sharing"
 msgstr "Ləqəb"
 
-#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#, c-format
 msgid "Not Available"
 msgstr ""
 
-#, c-format
 msgid "Occupied"
 msgstr ""
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr ""
 
@@ -6420,16 +6490,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Transfer üçün bağlana bilmədi."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Transfer üçün bağlana bilmədi."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Bağlanıla bilmədi"
 
 #, fuzzy
 msgid "Username sent"
@@ -6444,46 +6510,51 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Səhv istifadəçi adı."
+msgid "Unable to get a valid login hash."
+msgstr "Otaq siyahısı alına bilmədi."
 
-msgid "Incorrect password."
-msgstr "Səhv şifrə."
+msgid "Received authorization"
+msgstr ""
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Bu fayl mövcud deyil."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr ""
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6499,23 +6570,6 @@ msgstr ""
 msgid "_OK"
 msgstr "Oldu"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Otaq siyahısı alına bilmədi."
-
 msgid "Password sent"
 msgstr ""
 
@@ -6633,7 +6687,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, fuzzy, c-format
 msgid "Unable to send message: %s"
 msgstr "Soket açıla bilmədi"
@@ -6656,6 +6710,12 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
+msgid "Profile"
+msgstr "Profil"
+
 msgid "Your AIM connection may be lost."
 msgstr ""
 
@@ -6809,7 +6869,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6832,7 +6892,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6840,7 +6900,7 @@ msgid "(no name)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Əlaqə verici siyahısına əlavə edilə bilmədi"
 
 #, c-format
@@ -6904,6 +6964,7 @@ msgstr "_Yenidən bağlan"
 msgid "Get AIM Info"
 msgstr "_Məlumat Al"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr ""
 
@@ -6962,6 +7023,7 @@ msgstr "Axtar"
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Səhv şifrə."
@@ -6993,6 +7055,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7010,7 +7075,7 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr "Transfer üçün bağlana bilmədi."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "Transfer üçün bağlana bilmədi."
 
@@ -7113,7 +7178,7 @@ msgstr "Opera"
 msgid "Visible"
 msgstr ""
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7206,18 +7271,52 @@ msgstr "Soyad:"
 msgid "Could not change buddy information."
 msgstr "Xahiş edirik şəxs haqqında məlumatı aşağıda bildirin."
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "Mozilla"
+
+msgid "Note"
+msgstr "Qeyd"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Əlaqə Timsalı"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Əlaqə Əlavə Et"
+msgid "_Modify"
+msgstr "_Təkmilləşdir"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "_Təkmilləşdir"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Verici"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
 
-msgid "Input answer here"
+#, c-format
+msgid "%u requires verification"
 msgstr ""
 
 #, fuzzy
+msgid "Add buddy question"
+msgstr "Əlaqə siyahınıza əlavə edilsin?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "0 bayt böyüklüyündə fayl göndərilə bilməz."
+
+#, fuzzy
 msgid "Send"
 msgstr "_Fərqli Yolla"
 
@@ -7228,18 +7327,18 @@ msgstr "Səhv istifadəçi adı."
 msgid "Authorization denied message:"
 msgstr ""
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Yahoo! Təsstiqlənməsi Bacarılmadı"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Əlaqə siyahınıza əlavə edilsin?"
 
-msgid "Input request here"
+msgid "Enter request here"
 msgstr ""
 
 #, fuzzy
@@ -7262,7 +7361,7 @@ msgid "Failed sending authorize"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Söhbətdəki əlaqəyə qoşula bilmədi"
 
 #, fuzzy, c-format
@@ -7307,6 +7406,10 @@ msgstr "Xahiş edirik seçili qrup üçün yeni ad bildirin."
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
+#, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Səhv vəkil qurğuları"
+
 msgid "Not member"
 msgstr ""
 
@@ -7346,15 +7449,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr ""
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Telefon"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7364,7 +7470,7 @@ msgstr ""
 msgid "Failed:"
 msgstr "Bacarılmadı"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7376,11 +7482,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
-msgstr ""
+#, fuzzy
+msgid "Sorry, you are not our style"
+msgstr "Bağışlayın, başqa yerdə biraz işim var!"
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Telefon"
 
 #, fuzzy
@@ -7391,7 +7498,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Üstündən yazmaq istəyirsiniz?"
 
 #, fuzzy
@@ -7399,28 +7506,28 @@ msgid "Setup"
 msgstr "_Seç"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Söhbətdəki əlaqəyə qoşula bilmədi"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "_Sil"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "_Sil"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7539,6 +7646,13 @@ msgstr "<b>İstifadəçi:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>İstifadəçi:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>İstifadəçi:</b> %s<br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7546,7 +7660,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Hesablar"
 
 #, fuzzy
@@ -7567,6 +7681,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Hesablar"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Ünvan"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7598,7 +7716,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Bağlanılır..."
@@ -7610,6 +7727,9 @@ msgstr ""
 msgid "Show server news"
 msgstr "Naməlum xəta"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Oxuma xətası"
@@ -7619,11 +7739,7 @@ msgid "Update interval (seconds)"
 msgstr "Oxuma xətası"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Verici siyahısında deyil"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Verici siyahısında deyil"
 
 #, c-format
@@ -7645,21 +7761,19 @@ msgid "Activation required"
 msgstr ""
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "Oxuma xətası"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "Qalan"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Yahoo! Təsstiqlənməsi Bacarılmadı"
 
 msgid "Captcha Image"
 msgstr ""
@@ -7668,7 +7782,7 @@ msgstr ""
 msgid "Enter code"
 msgstr "Şifrə"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7676,68 +7790,43 @@ msgid "Enter the text from the image"
 msgstr "Xahiş edirik seçili qrup üçün yeni ad bildirin."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr ""
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Xəta"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "Transfer üçün bağlana bilmədi."
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "Soket açıla bilmədi"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Xəta"
-
 #, fuzzy
-msgid "Connection lost"
-msgstr "Bağlantı bacarılmadı"
-
-#, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Peycer qovşağı"
 
-msgid "Request token"
-msgstr ""
+#, fuzzy
+msgid "Requesting token"
+msgstr "Qalan"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Soket açıla bilmədi"
+msgid "Unable to resolve hostname"
+msgstr "Oxuna bilmədi"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Səhv istifadəçi adı."
 
 #, fuzzy
-msgid "Connecting server ..."
+msgid "Connecting to server"
 msgstr "Bağlantı problemi"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Xəta"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "Söhbətə qoşula bilmədi"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7746,6 +7835,10 @@ msgid ""
 "%s"
 msgstr "Verici"
 
+#, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s sizə %s yollamaq istəyir (%s)"
+
 #, c-format
 msgid "From %s:"
 msgstr ""
@@ -7756,32 +7849,30 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Naməlum xəta"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Əmr"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Verici siyahısında deyil"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Naməlum xəta"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Naməlum xəta"
 
 #, c-format
@@ -7796,10 +7887,6 @@ msgstr "Bacarılmadı"
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Bağlantı bacarılmadı"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>İstifadəçi:</b> %s<br>"
@@ -7858,19 +7945,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Bağlantı problemi"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "MOTD göstərilə bilmir"
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Bağlanıla bilmədi"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7895,6 +7969,10 @@ msgstr ""
 msgid "Video Camera"
 msgstr "Kamera"
 
+#, fuzzy
+msgid "File Transfer"
+msgstr "Fayl Transferləri"
+
 msgid "Supports"
 msgstr ""
 
@@ -8593,9 +8671,6 @@ msgstr ""
 msgid "Unit"
 msgstr ""
 
-msgid "Note"
-msgstr "Qeyd"
-
 msgid "Join Chat"
 msgstr ""
 
@@ -8684,6 +8759,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 #, fuzzy
 msgid "Ping failed"
 msgstr "Bağlantı bacarılmadı"
@@ -8744,8 +8822,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "Bağlantı problemi"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8754,28 +8833,27 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "Bağlantı bacarılmadı"
-
 msgid "Performing key exchange"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Bağlanıla bilmədi"
-
-msgid "Could not load SILC key pair"
-msgstr ""
+msgid "Unable to load SILC key pair"
+msgstr "Soket açıla bilmədi"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Soket açıla bilmədi"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "Bağlanıla bilmədi"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -9054,8 +9132,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "Bağlanıla bilmədi"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9143,6 +9222,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9183,38 +9265,37 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "Bağlanıla bilmədi"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "Soyad:"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-#, fuzzy
-msgid "Could not write"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Soket açıla bilmədi"
 
 #, fuzzy
-msgid "Could not connect"
-msgstr "Transfer üçün bağlana bilmədi."
+msgid "Unable to create connection"
+msgstr "Bağlanıla bilmədi"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Naməlum xəta"
 
-msgid "Could not create listen socket"
-msgstr ""
-
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Soket açıla bilmədi"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Transfer üçün bağlana bilmədi."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9255,175 +9336,68 @@ msgstr "Təstiqlənmə qovşağı"
 msgid "Auth Domain"
 msgstr "Avtomatik"
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Bağlan: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr ""
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr ""
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr ""
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr ""
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr ""
-
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
-
-#, c-format
-msgid "No keywords."
-msgstr ""
-
-#, c-format
-msgid "User has no directory information."
-msgstr ""
-
-#, c-format
-msgid "Country not supported."
-msgstr ""
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Səhv şifrə."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
 #, fuzzy
-msgid "Invalid Groupname"
-msgstr "Səhv istifadəçi adı."
-
-msgid "Connection Closed"
-msgstr ""
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID-si"
 
-msgid "Waiting for reply..."
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protokol Əlavəsi"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
+#, fuzzy
+msgid "Pager server"
+msgstr "Peycer qovşağı"
 
-msgid "Password Change Successful"
-msgstr ""
+msgid "Pager port"
+msgstr "Peycer portu"
 
-msgid "_Group:"
-msgstr ""
+#, fuzzy
+msgid "File transfer server"
+msgstr "Fayl transfer qovşağı"
 
-msgid "Get Dir Info"
-msgstr ""
+msgid "File transfer port"
+msgstr "Fayl transfer portu"
 
-msgid "Set Dir Info"
-msgstr ""
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Söhbət Otağı Siyahısı Ünvanı"
 
-#, c-format
-msgid "Could not open %s for writing!"
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Fayl transferi bacarılmadı, güman ki digər tərəfdən ləğv edildi."
-
-msgid "Could not connect for transfer."
-msgstr "Transfer üçün bağlana bilmədi."
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Söhbət Otağı Siyahısı Ünvanı"
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat server"
 msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "Timsalı Fərqli Qeyd Et..."
-
-#, 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] ""
+msgid "Yahoo Chat port"
+msgstr "Yahoo Yaponiya"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s sizdən ona fayl göndərmənizi istəyir"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID-si"
 
 #. *< type
 #. *< ui_requirement
@@ -9435,11 +9409,11 @@ msgstr "%s sizdən ona fayl göndərmənizi istəyir"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC Protokol Əlavəsi"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protokol Əlavəsi"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9462,6 +9436,28 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Əlaqə əlavə edilişi rədd edildi"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Transfer üçün bağlana bilmədi."
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Səhv şifrə."
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9489,33 +9485,27 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Əlaqə verici siyahısına əlavə edilə bilmədi"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-msgid "Connection problem"
-msgstr "Bağlantı problemi"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Söhbət edilən əlaqə"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Transfer üçün bağlana bilmədi."
 
 #, fuzzy
 msgid "Not at Home"
@@ -9568,9 +9558,8 @@ msgstr "Mühit Qurğularını İşlət"
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Hansı ID fəallaşdırılsın?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Söhbəttə kimə qoşulsun?"
@@ -9585,81 +9574,15 @@ msgstr "Söhbətdəki əlaqəyə qoşul..."
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID-si"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protokol Əlavəsi"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Yaponiya"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Peycer qovşağı"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Yaponiya Peycer Portu"
-
-msgid "Pager port"
-msgstr "Peycer portu"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Fayl transfer qovşağı"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Yaponiya fayl transfer qovşağı"
-
-msgid "File transfer port"
-msgstr "Fayl transfer portu"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Söhbət Otağı Siyahısı Ünvanı"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Söhbət Otağı Siyahısı Ünvanı"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Yaponiya"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9668,6 +9591,10 @@ msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s sizə %s yollamaq istəyir (%s)"
 
 #, fuzzy
+msgid "Write Error"
+msgstr "Xəta"
+
+#, fuzzy
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo Yaponiya"
 
@@ -9710,13 +9637,8 @@ msgstr "Sevdiyim Sayt 3"
 msgid "Last Update"
 msgstr "Soyad:"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s istifadəçisi haqqında məlumat mövcud deyil"
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9782,6 +9704,9 @@ msgstr "Səslər"
 msgid "Webcams"
 msgstr "Veb kameraları"
 
+msgid "Connection problem"
+msgstr "Bağlantı problemi"
+
 msgid "Unable to fetch room list."
 msgstr "Otaq siyahısı alına bilmədi."
 
@@ -9789,15 +9714,9 @@ msgid "User Rooms"
 msgstr "İstifadəçi Otaqları"
 
 #, fuzzy
-msgid "Connection problem with the YCHT server."
+msgid "Connection problem with the YCHT server"
 msgstr "Bağlantı problemi"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Transfer üçün bağlana bilmədi."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9921,30 +9840,21 @@ msgid "Exposure"
 msgstr "İxrac"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Soket açıla bilmədi"
 
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Vəkil bağlantısı xətası %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "MOTD göstərilə bilmir"
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10041,10 +9951,6 @@ msgstr ""
 msgid "Extended away"
 msgstr "%s uzaqlaşdı"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Mozilla"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10086,16 +9992,6 @@ msgstr "%s fəal oldu"
 msgid "%x %X"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr "MOTD göstərilə bilmir"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr "Hesablanır..."
 
@@ -10201,6 +10097,16 @@ msgstr "Bağlantı problemi"
 msgid "Address already in use."
 msgstr "O fayl onsuz da mövcuddur"
 
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr "MOTD göstərilə bilmir"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "Canlı İsmarışlaşma"
@@ -10249,10 +10155,9 @@ msgstr "Yeni məktub bildirişləri"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Seçimləri"
+#, fuzzy
+msgid "_Advanced"
+msgstr "_Ləğv Et"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10288,9 +10193,6 @@ msgstr ""
 msgid "you can see the butterflies mating"
 msgstr ""
 
-msgid "Proxy Options"
-msgstr "Vəkil Vericisi Seçimləri"
-
 msgid "Proxy _type:"
 msgstr "Vəkil _növü:"
 
@@ -10321,8 +10223,8 @@ msgid "Create _this new account on the server"
 msgstr ""
 
 #, fuzzy
-msgid "_Advanced"
-msgstr "_Ləğv Et"
+msgid "_Proxy"
+msgstr "Vəkil İşlətmə"
 
 #, fuzzy
 msgid "Enabled"
@@ -10361,16 +10263,17 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "/Vasitələr/_Otaq Siyahısı"
+msgid "A_ccount"
+msgstr "Hesab:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "_Hesab:"
+#, fuzzy
+msgid "Room _List"
+msgstr "/Vasitələr/_Otaq Siyahısı"
 
 #, fuzzy
 msgid "_Block"
@@ -10389,6 +10292,17 @@ msgid "I_M"
 msgstr "I_M"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "Söhbət Əlavə Et"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Kamera"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "Faylı Göndər"
 
@@ -10400,7 +10314,11 @@ msgid "View _Log"
 msgstr "_Qeydi Göstər"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Daha az seçim göstər"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Daha az seçim göstər"
 
 msgid "_Alias..."
@@ -10544,6 +10462,10 @@ msgid "/Tools/_Certificates"
 msgstr "/Vasitələr/_Seçimlər"
 
 #, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Vasitələr/_Uzaqda"
+
+#, fuzzy
 msgid "/Tools/Plu_gins"
 msgstr "/Vasitələr/_Hesablar"
 
@@ -10553,10 +10475,6 @@ msgstr "/Vasitələr/_Seçimlər"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Vasitələr/_Gizlilik"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Vasitələr/_Uzaqda"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Vasitələr/Fayl _Transferləri"
 
@@ -10686,8 +10604,8 @@ msgstr ""
 msgid "By status"
 msgstr "Vəziyyətə görə"
 
-msgid "By log size"
-msgstr "Qeyd böyüklüyünə görə"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10705,6 +10623,9 @@ msgstr "_Hamısını Yenidən Bağla"
 msgid "Re-enable"
 msgstr "Yeni_dən Adlandır"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s geri gəldi"
@@ -10800,6 +10721,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Alias:"
 
+msgid "_Group:"
+msgstr ""
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10837,6 +10761,114 @@ msgstr "/_Vasitələr"
 msgid "/Buddies/Sort Buddies"
 msgstr "_Alias..."
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Arxa plan rəngi"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Giriş Seçimləri"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Arxa plan rəngi"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Genişlət"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Arxa plan rəngi"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Yığcamlaşdır"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Arxa plan rəngi"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Qısa Yollar"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Xətdə"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Uzaqda"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Əlaqələr"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Mətn"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "İsmarış"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -10856,12 +10888,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
 msgid "_Buddy:"
 msgstr "Əla_qə:"
 
@@ -10892,7 +10918,7 @@ msgid "Get Away Message"
 msgstr "Uzaqda İsmarışı Al"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Soyad:"
 
 #, fuzzy
@@ -10943,6 +10969,22 @@ msgid "/Conversation/Clea_r Scrollback"
 msgstr "/_Danışıq"
 
 #, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/_Danışıq"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/_Danışıq"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/_Danışıq"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/_Danışıq"
+
+#, fuzzy
 msgid "/Conversation/Se_nd File..."
 msgstr "/_Danışıq"
 
@@ -11023,6 +11065,18 @@ msgid "/Conversation/View Log"
 msgstr ""
 
 #, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/_Danışıq"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/_Danışıq"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/_Danışıq"
+
+#, fuzzy
 msgid "/Conversation/Send File..."
 msgstr "/_Danışıq"
 
@@ -11215,6 +11269,9 @@ msgstr "Ünvan"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr ""
 
@@ -11346,6 +11403,10 @@ msgid "Hungarian"
 msgstr "Macar Dili"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Rumın Dili"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Makedon Dili"
 
@@ -11363,6 +11424,10 @@ msgstr "Alman Dili"
 msgid "Ubuntu Georgian Translators"
 msgstr "Köhnə Tərcüməçilər"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Opera"
+
 msgid "Kannada"
 msgstr ""
 
@@ -11385,6 +11450,10 @@ msgid "Macedonian"
 msgstr "Makedon Dili"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "Makedon Dili"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norveç Dili"
 
@@ -11443,6 +11512,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "İsveç Dili"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Terminal"
@@ -11495,7 +11567,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 
 msgid "Current Developers"
@@ -11763,7 +11852,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11801,15 +11890,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Bildirişin Sonlandırılması"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Yeni məktub bildirişləri"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11822,15 +11918,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Yeni məktub bildirişləri"
 
-msgid "_Copy Email Address"
-msgstr ""
-
-msgid "_Open Link in Browser"
-msgstr ""
-
-msgid "_Copy Link Location"
-msgstr ""
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11863,11 +11950,9 @@ msgstr ""
 msgid "Save Image"
 msgstr ""
 
-#, c-format
 msgid "_Save Image..."
 msgstr ""
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11954,10 +12039,6 @@ msgid "Font Face"
 msgstr "Yazı Növü"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Arxa plan rəngi"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Mətn rəngi"
 
@@ -12090,6 +12171,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12107,6 +12189,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12138,16 +12221,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Əlavələr"
 
-#, fuzzy
-msgid "Open All Messages"
-msgstr "Uzaqda İsmarışı Al"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
 
 #, fuzzy
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "Calling..."
+msgstr "Hesablanır..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Məktubunuz var!</span>\n"
-"\n"
-"%s"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12176,6 +12270,35 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "(1 ismarış)"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "Uzaqda İsmarışı Al"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Məktubunuz var!</span>\n"
+"\n"
+"%s"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Əlaqə Timsalı"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Məktubunuz var!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12233,10 +12356,17 @@ msgstr ""
 msgid "Select a file"
 msgstr ""
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Əlaqə Əlavə Et"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "_Hesab:"
+
 msgid "_Buddy name:"
 msgstr ""
 
@@ -12313,7 +12443,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "İstifadəçi yazır..."
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "İstifadəçi yazır..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "_Bağlan"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr ""
+
+#, c-format
+msgid "Returned from being away"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "%s uzaqlaşdı."
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Xətdən çıx"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s qeyri-fəal oldu"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "%s uzaqlaşdı"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Uzaqdayam ismarışı seç"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Söhbətə qoşula bilmədi"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12335,6 +12516,12 @@ msgstr "Qısa Yollar"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Söhbət edilən əlaqə"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Əlaqə hərəkətsizdir:"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Bildiriş Sahəsi Timsalı"
 
@@ -12347,7 +12534,7 @@ msgid "On unread messages"
 msgstr "Rəsm daxil et"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "Söhbət edilən əlaqə"
 
 #, fuzzy
@@ -12358,6 +12545,10 @@ msgstr "/_Danışıq"
 msgid "When away"
 msgstr "%s uzaqlaşdı"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Pəncərə başına danışıq ədədi"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12419,10 +12610,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Pəncərə başına danışıq ədədi"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12455,14 +12642,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-#, fuzzy
-msgid "ST_UN server:"
-msgstr "Verici"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -12485,6 +12669,10 @@ msgstr "_Bunu axtar:"
 msgid "_End port:"
 msgstr "_Port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr ""
 
@@ -12513,6 +12701,10 @@ msgstr ""
 msgid "No proxy"
 msgstr ""
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr ""
 
@@ -12675,10 +12867,10 @@ msgstr ""
 msgid "Auto-away"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-msgid "_Minutes before becoming idle:"
+msgid "Change status when _idle"
 msgstr ""
 
 #, fuzzy
@@ -12837,28 +13029,18 @@ msgstr "_Qeyd Et & İşlət"
 msgid "Status for %s"
 msgstr "Vəziyyət"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Emosiya daxil et"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 msgid "Duplicate Shortcut"
 msgstr ""
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Xahiş edirik seçili qrup üçün yeni ad bildirin."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Emosiya daxil et"
@@ -12868,21 +13050,29 @@ msgid "Add Smiley"
 msgstr "Emosiya!"
 
 #, fuzzy
-msgid "Smiley _Image"
-msgstr "Emosiya Örtükləri"
+msgid "_Image:"
+msgstr "Səhifə"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "Qısa Yollar"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Emosiya!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Qısa Yollar"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Əlaqəni Seç"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -12968,8 +13158,8 @@ msgid "Cannot send launcher"
 msgstr "0 bayt böyüklüyündə fayl göndərilə bilməz."
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13004,6 +13194,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "Poçtu _Aç"
+
+msgid "_Copy Link Location"
+msgstr ""
+
+msgid "_Copy Email Address"
+msgstr ""
+
+#, fuzzy
 msgid "Save File"
 msgstr "Fərqli Qeyd Et..."
 
@@ -13103,6 +13303,72 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+msgid "Server name request"
+msgstr ""
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "0 bayt böyüklüyündə fayl göndərilə bilməz."
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Yahoo! Təsstiqlənməsi Bacarılmadı"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "_Alias..."
+
+#, fuzzy
+msgid "Gateway"
+msgstr "%s uzaqlaşdı"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Bunu axtar:"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "İzahat"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "_Bunu axtar:"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "Səyyah"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Fayl transfer qovşağı"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Jabber Profili"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 #, fuzzy
 msgid "Buddy is idle"
 msgstr "Əlaqə hərəkətsizdir:"
@@ -13505,7 +13771,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13617,12 +13883,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13632,6 +13892,10 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Bildirişin Sonlandırılması"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13664,37 +13928,25 @@ msgstr "Ara Üz Seçimləri"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ara Üz"
+msgid "Disable Typing Notification Text"
+msgstr "Yeni məktub bildirişləri"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin Fayl İdarəsi"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Bağla"
 
 #, fuzzy
 msgid "Fonts"
 msgstr "Hesablar"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin Fayl İdarəsi"
@@ -13782,7 +14034,7 @@ msgstr "Söhbət edilən əlaqə"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13837,6 +14089,112 @@ msgstr ""
 "Bildirdiyiniz qaydalara görə göndərilən ismarışlardakı bəzi mətnləri əvəz "
 "edər."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Zephyr ilə onsuz da xətdəsiniz"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s xətdən çıxdı."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Söhbət Qoşul"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Nəzər Alma"
+
+#, fuzzy
+msgid "Founder"
+msgstr "saat"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Əlaqə rədd edilsin?"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Xəta"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Şəxsi Məlumat"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "_Xəbərdarlıq Göstər"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Vəziyyət"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Söhbət Otağı Siyahısı Ünvanı"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Səhv şifrə."
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin Fayl İdarəsi"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Əlaqə Növbəsi"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Əlaqə hərəkətsizdir:"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Əlaqə hərəkətsizdir:"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin Fayl İdarəsi"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin Fayl İdarəsi"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14001,9 +14359,6 @@ msgstr ""
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr ""
-
 #, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "Giriş Seçimləri"
@@ -14012,7 +14367,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14055,6 +14410,260 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Soket açıla bilmədi"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Bağlantı bacarılmadı"
+
+#~ msgid "Read error"
+#~ msgstr "Oxuma xətası"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Söhbət Aliası"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Əmr"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Mövqe"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Əlaqə Vəziyyəti Bildirişi"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Danışığı Qeyd Et"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Tətildə"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "İstifadəçi Otaqları"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "_İstifadəçi Adı:"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Epoçt Ünvanı"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Profili Seç"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "_İstifadəçi Adı:"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "İsmarış Mətni"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "İstifadəçi Seçimləri"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "İstifadəçi Otaqları"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "İstifadəçi Seçimləri"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "İstifadəçi yazır..."
+
+#, fuzzy
+#~ msgid "Failed to connect to server."
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Soket açıla bilmədi"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Səhv şifrə."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Səhv istifadəçi adı."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Verici siyahısında deyil"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Bağlantı bacarılmadı"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Soket açıla bilmədi"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Bağlantı bacarılmadı"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Bağlantı problemi"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "MOTD göstərilə bilmir"
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Bağlanıla bilmədi"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Soket açıla bilmədi"
+
+#, fuzzy
+#~ msgid "Could not connect"
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Səhv şifrə."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Yaponiya"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Yaponiya Peycer Portu"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Yaponiya fayl transfer qovşağı"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Xahiş edirik seçili qrup üçün yeni ad bildirin."
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Hansı ID fəallaşdırılsın?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ara Üz"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "(1 ismarış)"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Ünvan Kitabçasına Əlavə Et"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Əlaqə Əlavə Et"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Verici siyahısında deyil"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "Oxuma xətası"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "Söhbətə qoşula bilmədi"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Bağlan: %s"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Səhv şifrə."
+
+#, fuzzy
+#~ msgid "Invalid Groupname"
+#~ msgstr "Səhv istifadəçi adı."
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Fayl transferi bacarılmadı, güman ki digər tərəfdən ləğv edildi."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Timsalı Fərqli Qeyd Et..."
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s sizdən ona fayl göndərmənizi istəyir"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC Protokol Əlavəsi"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%s istifadəçisi haqqında məlumat mövcud deyil"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Seçimləri"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Vəkil Vericisi Seçimləri"
+
+#~ msgid "By log size"
+#~ msgstr "Qeyd böyüklüyünə görə"
+
+#, fuzzy
+#~ msgid "ST_UN server:"
+#~ msgstr "Verici"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Emosiya Örtükləri"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Qısa Yollar"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "Bu fayl onsuz da mövcuddur."
 
@@ -14095,13 +14704,6 @@ msgstr ""
 #~ msgstr "Qrupu Yenidən Adlandır"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s sizə %s yollamaq istəyir (%s)"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Sistem Qeydi"
 
@@ -14152,10 +14754,6 @@ msgstr ""
 #~ msgstr "_Yenidən bağlan"
 
 #, fuzzy
-#~ msgid "XMPP developer"
-#~ msgstr "Jabber Profili"
-
-#, fuzzy
 #~ msgid ""
 #~ "You are using %s version %s.  The current version is %s.  You can get it "
 #~ "from <a href=\"%s\">%s</a><hr>"
@@ -14314,17 +14912,9 @@ msgstr ""
 #~ msgstr "Səhv şifrə."
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Transfer üçün bağlana bilmədi."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_İsmarış:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Hesab:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Xətdən Çıxış Xətalarını Gizlət"
 
@@ -14540,9 +15130,6 @@ msgstr ""
 #~ msgstr[0] "(%d ismarış)"
 #~ msgstr[1] "(%d ismarış)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 ismarış)"
-
 #~ msgid "g003: Error opening connection.\n"
 #~ msgstr "g003: Bağlantı açıla bilmədi.\n"
 
@@ -14692,18 +15279,12 @@ msgstr ""
 #~ msgid "Visit Homepage"
 #~ msgstr "Veb Səhifəsini Ziyarət Et"
 
-#~ msgid "Local Users"
-#~ msgstr "Yerli İstifadəçilər"
-
 #~ msgid "Trepia Protocol Plugin"
 #~ msgstr "Trepia Protokol Əlavəsi"
 
 #~ msgid "Please enter your password"
 #~ msgstr "Xahiş edirik şifrənizi bildirin"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s xətdən çıxdı."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -14723,9 +15304,6 @@ msgstr ""
 #~ "edir\n"
 #~ "%s"
 
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Bağışlayın, başqa yerdə biraz işim var!"
-
 #~ msgid "Local Addressbook"
 #~ msgstr "yerli Ünvan Kitabçası"
 
@@ -14735,9 +15313,6 @@ msgstr ""
 #~ msgid "boring default"
 #~ msgstr "ön qurğulusu"
 
-#~ msgid "That file does not exist."
-#~ msgstr "Bu fayl mövcud deyil."
-
 #~ msgid "_Preferences"
 #~ msgstr "_Seçimlər"
 
diff --git a/po/be@latin.po b/po/be@latin.po
index c68b5ceda7..093dde27bd 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-03-29 21:08+0200\n"
 "Last-Translator: YOUR NAME <E-MAIL@ADDRESS>\n"
 "Language-Team: Belarusian Latin <be-latin.open-tran.eu>\n"
@@ -26,13 +26,13 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Pasprabuj `%s -h' dla padrabiaźniejšych źviestak.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -611,21 +611,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Dašli da"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "Ustaŭ u paviedamleńnie"
-
-msgid "Invite"
-msgstr "Zaprasi"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Akreśl nazvu karystalnika, jakoha ty chočaš zaprasić, razam ź "
-"nieabaviazkovym tekstam zaprašeńnia."
-
 msgid "Conversation"
 msgstr "Razmova"
 
@@ -881,6 +866,41 @@ msgstr "Razmovy"
 msgid "System Log"
 msgstr "Systemny log"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Padlik..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Pryjmi"
+
+msgid "Reject"
+msgstr "Admoŭ"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Ty ŭvachodziš na kanał%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "Listy"
 
@@ -916,6 +936,9 @@ msgstr "Praciahvaj"
 msgid "IM"
 msgstr "Razmova"
 
+msgid "Invite"
+msgstr "Zaprasi"
+
 msgid "(none)"
 msgstr "(niama)"
 
@@ -1119,7 +1142,6 @@ msgstr "%s adyjšoŭ. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s dasłaŭ tabie paviedamleńnie. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Nieviadomaja padzieja dla začepki. Kali łaska, adrapartuj ab hetym!"
 
@@ -1165,7 +1187,6 @@ msgstr "Chvilin da źmieny statusu"
 msgid "Change status to"
 msgstr "Źmiani status na"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Razmovy"
 
@@ -1487,7 +1508,6 @@ msgstr ""
 "Kali adčyniajecca novaja razmova, hety plugin ustaŭlaje tekst apošniaje "
 "razmovy ŭ dziejnuju."
 
-#, c-format
 msgid "Online"
 msgstr "Spałučany"
 
@@ -1531,6 +1551,28 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Plugin apošniaha logu."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "Adras pieśni"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "accounts"
 
@@ -1631,13 +1673,6 @@ msgstr "Pryniać sertyfikat dla %s?"
 msgid "SSL Certificate Verification"
 msgstr "Pravierka sertyfikatu SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Pryjmi"
-
-msgid "Reject"
-msgstr "Admoŭ"
-
 msgid "_View Certificate..."
 msgstr "_Pakažy sertyfikat..."
 
@@ -1738,6 +1773,8 @@ msgstr "+++ %s uvachodzić"
 msgid "+++ %s signed off"
 msgstr "+++ %s vychodzić"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nieviadomaja pamyłka"
 
@@ -1784,6 +1821,18 @@ msgstr "%s pakidaje pakoj."
 msgid "%s left the room (%s)."
 msgstr "%s pakidaje pakoj (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Zaprasi na kanferencyju"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Akreśl nazvu karystalnika, jakoha ty chočaš zaprasić, razam ź "
+"nieabaviazkovym tekstam zaprašeńnia."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Pamyłka atrymańnia spałučeńnia: %s"
@@ -1920,7 +1969,6 @@ msgstr "Pačynajecca pieradača %s dla %s"
 msgid "Transfer of file %s complete"
 msgstr "Pieradača fajłu %s skončanaja"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Pieradača fajłu skončanaja"
 
@@ -1928,7 +1976,6 @@ msgstr "Pieradača fajłu skončanaja"
 msgid "You canceled the transfer of %s"
 msgstr "Ty anulavaŭ pieradaču %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Pieradača fajłu anulavanaja"
 
@@ -2131,11 +2178,14 @@ msgstr "<font color=\"red\"><b>Niemahčyma pračytać fajł: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AŬTA-ADKAZ>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Pamyłka stvareńnia spałučeńnia"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Ty karystajeśsia %s, ale hety plugin vymahaje %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Hety plugin nie akreśliŭ ID."
 
@@ -2533,9 +2583,10 @@ msgstr ""
 "Ułučaje logi ad inšych klijentaŭ chutkich paviedamleńniaŭ u ahlad logaŭ."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2591,8 +2642,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Zachoŭvaj paviedamleńni, dasyłanyja adłučanamu karystalniku, jak začepki."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Astatnija paviedamleńni buduć zachavanyja jak začepki. Ty možaš redahavać/"
@@ -2626,6 +2678,32 @@ msgstr "Zachavaj adłučanyja paviedamleńni ŭ začepcy"
 msgid "Do not ask. Always save in pounce."
 msgstr "Nie pytajsia. Zaŭsiody zachoŭvaj u začepcy."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Uviadzi parol"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2820,21 +2898,21 @@ msgstr ""
 
 #, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Toolkit Apple Bonjour dla Windowsa nia znojdzieny, hladzi FAQ na: http://"
 "developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
 "LocalMessaging pa padrabiaznyja źviestki."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Niemahčyma słuchać uvachodnyja spałučeńni\n"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Niemahčyma spałučycca z lakalnym serveram mDNS. Ci jon pracuje?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Imia"
 
@@ -2866,6 +2944,11 @@ msgstr "Plugin pratakołu Bonjour"
 msgid "Purple Person"
 msgstr "Asoba Purple"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Miascovaść"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2876,14 +2959,21 @@ msgstr "%s začyniaje razmovu."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Niemahčyma dasłać paviedamleńnie, niemahčyma pačać razmovu."
 
-msgid "Cannot open socket"
-msgstr "Niemahčyma adčynić sokiet"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Niemahčyma stvaryć sokiet:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Niemahčyma pryviazać sokiet da portu"
 
-msgid "Could not listen on socket"
-msgstr "Niemahčyma słuchać sokiet"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Niemahčyma stvaryć sokiet:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Pamyłka kamunikacyi ź lakalnaj pasłuhaj mDNSResponder."
@@ -2932,13 +3022,16 @@ msgstr "Zachavaj śpis siabroŭ..."
 msgid "Load buddylist from file..."
 msgstr "Zahruzi śpis siabroŭ z fajłu..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Zapoŭni pali rehistracyi."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Paroli roznyja."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Niemahčyma zarehistravać novy kont. Adbyłasia pamyłka.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2950,14 +3043,15 @@ msgstr "Rehistracyja paśpiachova skončanaja!"
 msgid "Password"
 msgstr "Parol"
 
-msgid "Password (retype)"
-msgstr "Parol (paŭtary)"
+msgid "Password (again)"
+msgstr "Parol (znoŭ)"
 
-msgid "Enter current token"
-msgstr "Uviadzi dziejny znak"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Dziejny znak"
+#, fuzzy
+msgid "Captcha"
+msgstr "Zapišy vyjavu"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Zarehistruj novy kont Gadu-Gadu"
@@ -3010,6 +3104,15 @@ msgstr "Parol paśpiachova źmienieny!"
 msgid "Current password"
 msgstr "Dziejny parol"
 
+msgid "Password (retype)"
+msgstr "Parol (paŭtary)"
+
+msgid "Enter current token"
+msgstr "Uviadzi dziejny znak"
+
+msgid "Current token"
+msgstr "Dziejny znak"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Uviadzi dziejny parol i tvoj novy parol dla UIN'a: "
 
@@ -3023,13 +3126,13 @@ msgstr "Abiary hutarku dla siabra: %s"
 msgid "Add to chat..."
 msgstr "Dadaj u hutarku..."
 
+#. Global
 msgid "Available"
 msgstr "Dastupny"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Adyjšoŭ"
 
@@ -3057,7 +3160,7 @@ msgstr "Nia znojdziena takich karystalnikaŭ"
 msgid "There are no users matching your search criteria."
 msgstr "Niama karystalnikaŭ, jakija adpaviadajuć tvaim kryteram pošuku."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Niemahčyma pračytać z sokieta"
 
 msgid "Buddy list downloaded"
@@ -3072,8 +3175,14 @@ msgstr "Śpis siabroŭ zahružany na server"
 msgid "Your buddy list was stored on the server."
 msgstr "Tvoj śpis siabroŭ zachavany na servery."
 
-msgid "Connection failed."
-msgstr "Pamyłka spałučeńnia."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Spałučany"
+
+msgid "Connection failed"
+msgstr "Pamyłka spałučeńnia"
 
 msgid "Add to chat"
 msgstr "Dadaj da hutarki"
@@ -3081,13 +3190,23 @@ msgstr "Dadaj da hutarki"
 msgid "Chat _name:"
 msgstr "Nazva _hutarki:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Niemahčyma spałučycca z serveram."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Spałučeńnie"
+
 msgid "Chat error"
 msgstr "Pamyłka hutarki"
 
 msgid "This chat name is already in use"
 msgstr "Hetaja nazva hutarki ŭžo zaniataja"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Niama spałučeńnia z serveram."
 
 msgid "Find buddies..."
@@ -3129,6 +3248,10 @@ msgstr "Papularnaja polskaja systema paviedamleńniaŭ"
 msgid "Gadu-Gadu User"
 msgstr "Karystalnik Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Akreśl źviestki karystalnika..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nieviadomy zahad: %s"
@@ -3143,7 +3266,8 @@ msgstr "Tema nie akreślenaja"
 msgid "File Transfer Failed"
 msgstr "Pamyłka pieradačy fajłu"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Niemahčyma adčynić port dziela słuchańnia."
 
 msgid "Error displaying MOTD"
@@ -3159,8 +3283,18 @@ msgstr "Z hetym spałučeńniem nie źviazany MOTD."
 msgid "MOTD for %s"
 msgstr "MOTD dla %s"
 
-msgid "Server has disconnected"
-msgstr "Server adłučyŭsia"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Spałučeńnie z serversm stračanaje:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Pakažy MOTD"
@@ -3171,25 +3305,24 @@ msgstr "_Kanał:"
 msgid "_Password:"
 msgstr "_Parol:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Mianuški IRC nia mohuć utrymvać prabiełaŭ"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Spałučeńnie"
-
 msgid "SSL support unavailable"
 msgstr "Niama padtrymki SSL"
 
-msgid "Couldn't create socket"
-msgstr "Niemahčyma stvaryć sokiet"
+msgid "Unable to connect"
+msgstr "Niemahčyma spałučycca"
 
-msgid "Couldn't connect to host"
-msgstr "Niemahčyma spałučycca z hostam"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Niemahčyma spałučycca z %s"
 
-msgid "Read error"
-msgstr "Pamyłka čytańnia"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server začyniŭ spałučeńnie."
 
 msgid "Users"
 msgstr "Karystalniki"
@@ -3370,6 +3503,17 @@ msgstr ""
 "Abranaja taboju nazva kontu nie pryjmalnaja dla servera. Mabyć, jana "
 "ŭtrymvaje niedazvolenyja znaki."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Hetaja nazva hutarki ŭžo zaniataja"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Mianuška"
+
 msgid "Cannot change nick"
 msgstr "Niemahčyma źmianić mianušku"
 
@@ -3608,10 +3752,12 @@ msgstr "Niaŭdałaje vykanańnie zahadu Ad-Hoc"
 msgid "execute"
 msgstr "vykanaj"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server vymahaje TLS/SSL, kab uvajści. Niama padtrymki TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Ty vymahaješ šyfravańnia, ale padtrymki TLS/SSL niama."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3628,18 +3774,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Aŭtaryzacyja prostym tekstam"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Pamyłka aŭtaryzacyi"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Niapravilny adkaz ad servera."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server nie ŭžyvaje nivodzin z padtrymanych metadaŭ aŭtaryzacyi"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Ty vymahaješ šyfravańnia, ale server nia ŭmieje hetaha."
+
 msgid "Invalid challenge from server"
 msgstr "Niapravilny vyklik ad servera"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Pamyłka SASL"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Pryčyna nie akreślenaja."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Niepadtrymanaja versija"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Niemahčyma spałučycca z serveram:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Niemahčyma spałučycca z serveram:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Niemahčyma inicyjavać spałučeńnie"
+
 msgid "Full Name"
 msgstr "Poŭnaje imia"
 
@@ -3706,158 +3888,9 @@ msgstr "Klijent"
 msgid "Operating System"
 msgstr "Aperacyjnaja systema"
 
-msgid "Last Activity"
-msgstr "Apošniaja dziejnaść"
-
-msgid "Service Discovery Info"
-msgstr "Źviestki ad znojdzienych pasłuhach"
-
-msgid "Service Discovery Items"
-msgstr "Znojdzienyja pasłuhi"
-
-msgid "Extended Stanza Addressing"
-msgstr "Pašyranaja adrasacyja frazaŭ"
-
-msgid "Multi-User Chat"
-msgstr "Ludnaja hutarka"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Pašyranyja źviestki ab udziele ŭ ludnaj hutarcy"
-
-msgid "In-Band Bytestreams"
-msgstr "Bajtavyja płyni In-Band"
-
-msgid "Ad-Hoc Commands"
-msgstr "Zahady Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Pasłuha PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Bajtavyja płyni SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Źviestki Out of Band"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Rehistracyja In-Band"
-
-msgid "User Location"
-msgstr "Pałažeńnie karystalnika"
-
-msgid "User Avatar"
-msgstr "Avatar karystalnika"
-
-msgid "Chat State Notifications"
-msgstr "Infarmavańni ab statusie hutarki"
-
-msgid "Software Version"
-msgstr "Versija prahramy"
-
-msgid "Stream Initiation"
-msgstr "Inicyjacyja płyni"
-
-msgid "File Transfer"
-msgstr "Pieradača fajłu"
-
-msgid "User Mood"
-msgstr "Nastroj karystalnika"
-
-msgid "User Activity"
-msgstr "Dziejnaść karystalnika"
-
-msgid "Entity Capabilities"
-msgstr "Mahčymaści siabra"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Uzhadnieńnie šyfravanaj sesii"
-
-msgid "User Tune"
-msgstr "Pieśnia karystalnika"
-
-msgid "Roster Item Exchange"
-msgstr "Abmieńvańnie elementaŭ śpisu siabroŭ"
-
-msgid "Reachability Address"
-msgstr "Adras dasiahalnaści"
-
-msgid "User Profile"
-msgstr "Profil karystalnika"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
-
-msgid "User Nickname"
-msgstr "Mianuška karystalnika"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Suvory UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Atrymańnie paviedamleńniaŭ"
-
-msgid "Public Key Publishing"
-msgstr "Supolny dostup da publičnaha kluča"
-
-msgid "User Chatting"
-msgstr "Karystalnik hutaryć"
-
-msgid "User Browsing"
-msgstr "Karystalnik u Siecivie"
-
-msgid "User Gaming"
-msgstr "Karystalnik hulajecca"
-
-msgid "User Viewing"
-msgstr "Karystalnik hladzić"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Šyfravańnie frazy"
-
-msgid "Entity Time"
-msgstr "Čas isnavańnia"
-
-msgid "Delayed Delivery"
-msgstr "Adterminavanaja dastaŭka"
-
-msgid "Collaborative Data Objects"
-msgstr "Supolnyja infarmacyjnyja abjekty"
-
-msgid "File Repository and Sharing"
-msgstr "Schovišča fajłaŭ i supolny dostup"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Pošuk pasłuh STUN dla Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Uzhadnieńnie sproščana šyfravanaj sesii"
-
-msgid "Hop Check"
-msgstr "Pravierka Hop"
-
-msgid "Capabilities"
-msgstr "Mahčymaści"
+#, fuzzy
+msgid "Local Time"
+msgstr "Lakalny fajł:"
 
 msgid "Priority"
 msgstr "Pryjarytet"
@@ -3865,6 +3898,14 @@ msgstr "Pryjarytet"
 msgid "Resource"
 msgstr "Resurs"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Uvajšoŭ/Uvajšła"
+
 msgid "Middle Name"
 msgstr "Siaredniaje imia"
 
@@ -3911,7 +3952,6 @@ msgstr "Chaču pahavaryć"
 msgid "Extended Away"
 msgstr "Pašyrany adychod"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Nie turbuj mianie"
 
@@ -4033,28 +4073,26 @@ msgstr "Abiary server kanferencyj dziela zapytaŭ"
 msgid "Find Rooms"
 msgstr "Šukaj pakoi"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Ty vymahaješ šyfravańnia, ale server nia ŭmieje hetaha."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
-msgid "Write error"
-msgstr "Pamyłka zapisu"
+#, fuzzy
+msgid "No users found"
+msgstr "Nia znojdziena takich karystalnikaŭ"
 
-msgid "Ping timeout"
-msgstr "Termin čakańnia pingu"
+#, fuzzy
+msgid "Roles:"
+msgstr "Rola"
 
-msgid "Read Error"
-msgstr "Pamyłka čytańnia"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Termin čakańnia pingu"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Niemahčyma spałučycca z serveram:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Niemahčyma stvaryć sokiet"
 
 msgid "Invalid XMPP ID"
 msgstr "Niapravilny XMPP ID"
@@ -4062,6 +4100,10 @@ msgstr "Niapravilny XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Niapravilny XMPP ID. Treba akreślić damen."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Pamyłka spałučeńnia z serveram."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Paśpiachovaja rehistracyja %s@%s"
@@ -4086,9 +4128,6 @@ msgstr "Paśpiachovaje skasavańnie rehistracyi"
 msgid "Unregistration Failed"
 msgstr "Pamyłka skasavańnia rehistracyi"
 
-msgid "Already Registered"
-msgstr "Užo zarehistravany"
-
 msgid "State"
 msgstr "Stan"
 
@@ -4101,6 +4140,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Užo zarehistravany"
+
 msgid "Unregister"
 msgstr "Skasuj rehistracyju"
 
@@ -4128,6 +4170,10 @@ msgstr "Zarehistruj novy kont na %s"
 msgid "Change Registration"
 msgstr "Źmiani rehistracyju"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Pamyłka spałučeńnia z serveram."
+
 msgid "Error unregistering account"
 msgstr "Pamyłka skasavańnia rehistracyi"
 
@@ -4146,9 +4192,18 @@ msgstr "Aŭtaryzacyja"
 msgid "Re-initializing Stream"
 msgstr "Paŭtornaja inicyjalizacyja płyni"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Nie aŭtaryzavany"
 
+msgid "Mood"
+msgstr "Nastroj"
+
+msgid "Now Listening"
+msgstr "Ciapier hraje"
+
 msgid "Both"
 msgstr "Dvuchbakovaja"
 
@@ -4170,12 +4225,6 @@ msgstr "Niama"
 msgid "Subscription"
 msgstr "Padpiska"
 
-msgid "Mood"
-msgstr "Nastroj"
-
-msgid "Now Listening"
-msgstr "Ciapier hraje"
-
 msgid "Mood Text"
 msgstr "Tekst nastroju"
 
@@ -4218,9 +4267,6 @@ msgstr "Tvoj parol źmianiŭsia."
 msgid "Error changing password"
 msgstr "Pamyłka źmieny parolu"
 
-msgid "Password (again)"
-msgstr "Parol (znoŭ)"
-
 msgid "Change XMPP Password"
 msgstr "Źmiani parol XMPP"
 
@@ -4413,18 +4459,24 @@ msgstr "Niemahčyma kiknuć karystalnika %s"
 msgid "Unable to ping user %s"
 msgstr "Niemahčyma pingnuć karystalnika %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Niemahčyma pazvanić, bo pra karystalnika %s aničoha nie viadoma."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Niemahčyma pazvanić, bo karystalnik %s moža być adłučanym."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Niemahčyma pazvanić, bo karystalnik %s nia ŭmieje hetaha."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Zvanok da %s..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4434,9 +4486,35 @@ msgstr "Pazvani"
 msgid "%s has buzzed you!"
 msgstr "%s pazvaniŭ tabie!"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Zvanok da %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Niemahčyma dasłać fajł da %s, niapravilny JID"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Niemahčyma dasłać fajł da %s, karystalnik adłučany"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Niemahčyma dasłać fajł da %s, niama padpiski na prysutnaść karystalnika"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Pamyłka rehistracyi"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Abiary resurs dla %s, jakomu chočaš dasłać fajł"
+
+msgid "Select a Resource"
+msgstr "Abiary resurs"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Inicyjuj _hutarku"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Skanfihuruj pakoj hutarki."
@@ -4456,16 +4534,18 @@ msgstr "topic [novaja tema]:  Pakažy albo źmiani temu."
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;karystalnik&gt; [pryčyna]:  Zabań karystalnika ŭ pakoi."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;karystalnik&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Akreśl suviaź karystalnika z pakojem."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;karystalnik&gt; &lt;moderator|participant|visitor|none&gt;: Akreśl "
 "rolu karystalnika ŭ pakoi."
@@ -4530,6 +4610,9 @@ msgstr "Spałučysia z serveram"
 msgid "File transfer proxies"
 msgstr "Proxy dla pieradačy fajłaŭ"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4569,6 +4652,14 @@ msgstr "Pamyłka razboru XML"
 msgid "Unknown Error in presence"
 msgstr "Jość nieviadomaja pamyłka"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Pamyłka dałučeńnia da hutarki %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Pamyłka ŭ hutarcy %s"
+
 msgid "Create New Room"
 msgstr "Stvary novy pakoj"
 
@@ -4585,13 +4676,32 @@ msgstr "_Skanfihuruj pakoj"
 msgid "_Accept Defaults"
 msgstr "_Pryjmi zmoŭčanyja nałady"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Pamyłka dałučeńnia da hutarki %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Pryčyna nie akreślenaja."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Pamyłka ŭ hutarcy %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Ciabie kiknuli z %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s kiknuŭ/kiknuła (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Pry adčynieńni fajłu adbyłasia pamyłka."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Pamyłka pieradačy fajłu"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Pamyłka adčynieńnia fajłu '%s': %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4618,9 +4728,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Abiary resurs dla %s, jakomu chočaš dasłać fajł"
 
-msgid "Select a Resource"
-msgstr "Abiary resurs"
-
 msgid "Edit User Mood"
 msgstr "Redahuj nastroj karystalnika"
 
@@ -4655,8 +4762,19 @@ msgstr "Dziejańni"
 msgid "Select an action"
 msgstr "Abiary dziejańnie"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Niemahčyma atrymać adrasnuju knihu MSN"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Niemahčyma dadać \"%s\"."
+
+msgid "Buddy Add error"
+msgstr ""
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Akreślenaja nazva karystalnika niapravilnaja."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4886,7 +5004,7 @@ msgstr "Dziciačy pašpart biaz baćkoŭskaj zhody"
 msgid "Passport account not yet verified"
 msgstr "Kont pašpartu jašče nie pravierany"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Kont pašpartu jašče nie pravierany"
 
@@ -4910,6 +5028,11 @@ msgstr "Pieravažny kantakt"
 msgid "Non-IM Contacts"
 msgstr "Vydali kantakt"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s zaprašaje ciabie ŭ Web-kamernuju hutarku, jakaja pakul nie padtrymvajecca."
+
 msgid "Nudge"
 msgstr "Šturchni"
 
@@ -4982,6 +5105,13 @@ msgstr "Dašli mabilnaje paviedamleńnie."
 msgid "Page"
 msgstr "Staronka"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Praca"
+
 msgid "Has you"
 msgstr "Maju ciabie"
 
@@ -5018,6 +5148,14 @@ msgstr "Vykanaŭca"
 msgid "Album"
 msgstr "Albom"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "Nazva pieśni"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Nazva pieśni"
+
 msgid "Set Friendly Name..."
 msgstr "Akreśl pryjaznuju nazvu..."
 
@@ -5053,9 +5191,6 @@ msgstr ""
 "MSN vymahaje padtrymki SSL. Kali łaska, zainstaluj padtrmvanuju biblijateku "
 "SSL."
 
-msgid "Failed to connect to server."
-msgstr "Pamyłka spałučeńnia z serveram."
-
 msgid "Error retrieving profile"
 msgstr "Pamyłka atrymańnia profilu"
 
@@ -5210,8 +5345,9 @@ msgstr ""
 "Niemahčyma znajści choć jakoj infarmacyi ŭ profili karystalnika. Mabyć, "
 "karystalnik nie isnuje."
 
-msgid "Profile URL"
-msgstr "Spasyłka na profil"
+#, fuzzy
+msgid "View web profile"
+msgstr "Chavaj, kali adłučany"
 
 #. *< type
 #. *< ui_requirement
@@ -5245,65 +5381,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Aŭtaryzacyja Windows Live ID: Niemahčyma spałučycca"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s nie źjaŭlajecca pravilnaj hrupaj."
-
-msgid "Unknown error."
-msgstr "Nieviadomaja pamyłka."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s šturchaje ciabie!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Nieviadomaja pamyłka (%d)"
 
 msgid "Unable to add user"
 msgstr "Niemahčyma dadać karystalnika"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Nieviadomaja pamyłka (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Voś vyniki tvajho pošuku"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Niemahčyma dadać karystalnika na %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Niemahčyma zablakavać karystalnika na %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Niemahčyma dać dazvoł karystalniku na %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Niemahčyma dadać %s, bo tvoj śpis siabroŭ zapoŭnieny."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nie źjaŭlajecca pravilnym kontam pašpartu."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Servis časova niedastupny."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Paviedamleńnie nie dasłanaje, bo ty nie ŭvajšoŭ."
 
-msgid "Unable to rename group"
-msgstr "Niemahčyma źmianić nazvu dla hrupy"
-
-msgid "Unable to delete group"
-msgstr "Niemahčyma vydalić hrupu"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5357,9 +5456,6 @@ msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 "Paviedamleńnie moža być nie dasłanym, bo adbyłasia nieviadomaja pamyłka:"
 
-msgid "Unable to connect"
-msgstr "Niemahčyma spałučycca"
-
 msgid "Writing error"
 msgstr "Pamyłka zapisu"
 
@@ -5374,19 +5470,23 @@ msgstr ""
 "Pamyłka spałučeńnia ad serveru %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Naš pratakoł nie padtrymvajecca serveram."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Pamyłka razboru HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Ty ŭvajšoŭ ź inšaha miesca."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Servery MSN časova niedastupnyja. Kali łaska, pačakaj i paŭtary znoŭ."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Servery MSN časova vyklučajucca."
 
 #, c-format
@@ -5416,6 +5516,16 @@ msgstr "Dasyłańnie ciestka"
 msgid "Retrieving buddy list"
 msgstr "Atrymańnie śpisu siabroŭ"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s zaprašaje ciabie ŭ Web-kamernuju hutarku, jakaja pakul nie padtrymvajecca."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s zaprašaje ciabie ŭ Web-kamernuju hutarku, jakaja pakul nie padtrymvajecca."
+
 msgid "Away From Computer"
 msgstr "Adyjšoŭ ad kamputara"
 
@@ -5458,14 +5568,6 @@ msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Paviedamleńnie moža być nie dasłanym, bo adbyłasia nieviadomaja pamyłka:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s dadaje ciabie ŭ svoj śpis siabroŭ."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s vydalaje ciabie sa svajho śpisu siabroŭ."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Dadaj u adrasnuju knihu"
@@ -5474,19 +5576,15 @@ msgstr "Dadaj u adrasnuju knihu"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Chočaš dadać hetaha siabra da svajho śpisu siabroŭ?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Niemahčyma dadać \"%s\"."
-
 msgid "The username specified is invalid."
 msgstr "Akreślenaja nazva karystalnika niapravilnaja."
 
 msgid "This Hotmail account may not be active."
 msgstr "Hety kont Hotmail moža być niezadziejničanym."
 
+msgid "Profile URL"
+msgstr "Spasyłka na profil"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5500,18 +5598,60 @@ msgstr "Hety kont Hotmail moža być niezadziejničanym."
 msgid "MSN Protocol Plugin"
 msgstr "Plugin pratakołu MSN"
 
-msgid "Missing Cipher"
-msgstr "Niastača šyfru"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s nie źjaŭlajecca pravilnaj hrupaj."
 
-msgid "The RC4 cipher could not be found"
-msgstr "Niemahčyma znajści šyfar RC4"
+msgid "Unknown error."
+msgstr "Nieviadomaja pamyłka."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"Aktualizuj libpurple da versii z padtrymkaj RC4 (>= 2.0.1). Plugin dla "
-"MySpaceIM nia budzie zahružany."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Niemahčyma dadać karystalnika na %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Niemahčyma zablakavać karystalnika na %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Niemahčyma dać dazvoł karystalniku na %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Niemahčyma dadać %s, bo tvoj śpis siabroŭ zapoŭnieny."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nie źjaŭlajecca pravilnym kontam pašpartu."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Servis časova niedastupny."
+
+msgid "Unable to rename group"
+msgstr "Niemahčyma źmianić nazvu dla hrupy"
+
+msgid "Unable to delete group"
+msgstr "Niemahčyma vydalić hrupu"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s dadaje ciabie ŭ svoj śpis siabroŭ."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s vydalaje ciabie sa svajho śpisu siabroŭ."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "Niama takoha karystalnika: %s"
+
+msgid "User lookup"
+msgstr "Pošuk karystalnika"
 
 msgid "Reading challenge"
 msgstr "Čytańnie vyklika"
@@ -5522,17 +5662,24 @@ msgstr "Niečakanaja daŭžynia vyklika ad servera"
 msgid "Logging in"
 msgstr "Uvachod"
 
-#, fuzzy, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-"Spałučeńnie z serveram stračanaje (niama źviestak ciaham %d sekundaŭ)"
-msgstr[1] ""
-"Spałučeńnie z serveram stračanaje (niama źviestak ciaham %d sekundaŭ)"
-msgstr[2] ""
-"Spałučeńnie z serveram stračanaje (niama źviestak ciaham %d sekundaŭ)"
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Nazva karystalnika nie akreślenaja"
+
+msgid "You appear to have no MySpace username."
+msgstr "U ciabie niama kontu na MySpace."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Chočaš zaniać novy kont? (Uvaha: POTYM HETA NIELHA ANULAVAĆ!)"
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"Spałučeńnie z serveram zhublenaje\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Novyja paštovyja paviedamleńni"
 
@@ -5551,40 +5698,53 @@ msgstr "Novyja kamentary da vyjavaŭ"
 msgid "MySpace"
 msgstr "MySpace"
 
-msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM - Nazva karystalnika nie akreślenaja"
-
-msgid "You appear to have no MySpace username."
-msgstr "U ciabie niama kontu na MySpace."
+msgid "IM Friends"
+msgstr "Siabry"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr "Chočaš zaniać novy kont? (Uvaha: POTYM HETA NIELHA ANULAVAĆ!)"
+#, fuzzy, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d siabroŭ byli dadadzienyja albo aktualizavanyja z servera (taksama siabry, "
+"jakija ŭžo zachoŭvajucca ŭ śpisie na servery)"
+msgstr[1] ""
+"%d siabroŭ byli dadadzienyja albo aktualizavanyja z servera (taksama siabry, "
+"jakija ŭžo zachoŭvajucca ŭ śpisie na servery)"
+msgstr[2] ""
+"%d siabroŭ byli dadadzienyja albo aktualizavanyja z servera (taksama siabry, "
+"jakija ŭžo zachoŭvajucca ŭ śpisie na servery)"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Spałučany"
+msgid "Add contacts from server"
+msgstr "Dadaj kantakty z servera"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Pamyłka pratakołu, kod %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Tvoj parol składajecca z %d znakaŭ, a heta bolej za mahčymuju daŭžyniu "
 "parolu dla kontu MySpaceIM z %d znakaŭ. Skaraci svoj parol praz http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
 "i znoŭ paŭtary sprobu."
 
+msgid "Incorrect username or password"
+msgstr "Niapravilnyja nazva karystalnika albo parol"
+
 msgid "MySpaceIM Error"
 msgstr "Pamyłka MySpaceIM"
 
+msgid "Invalid input condition"
+msgstr "Niapravilnaja ŭmova ŭvodu"
+
 msgid "Failed to add buddy"
 msgstr "Pamyłka dadańnia siabra"
 
@@ -5594,13 +5754,6 @@ msgstr "Niaŭdałaje vykanańnie zahadu \"addbuddy\"."
 msgid "persist command failed"
 msgstr "Niaŭdałaje vykanańnie zahadu \"persist\""
 
-#, c-format
-msgid "No such user: %s"
-msgstr "Niama takoha karystalnika: %s"
-
-msgid "User lookup"
-msgstr "Pošuk karystalnika"
-
 msgid "Failed to remove buddy"
 msgstr "Niaŭdałaje vydaleńnie siabra"
 
@@ -5610,41 +5763,18 @@ msgstr "Niaŭdałaje vykanańnie zahadu \"delbuddy\""
 msgid "blocklist command failed"
 msgstr "Niaŭdałaje vykanańnie zahadu \"blocklist\""
 
-msgid "Invalid input condition"
-msgstr "Niapravilnaja ŭmova ŭvodu"
-
-msgid "Read buffer full (2)"
-msgstr "Bufer čytańnia zapoŭnieny (2)"
-
-msgid "Unparseable message"
-msgstr "Paviedamleńnie, jakoje niemahčyma razabrać"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Niemahčyma spałučycca z hostam: %s (%d)"
+msgid "Missing Cipher"
+msgstr "Niastača šyfru"
 
-msgid "IM Friends"
-msgstr "Siabry"
+msgid "The RC4 cipher could not be found"
+msgstr "Niemahčyma znajści šyfar RC4"
 
-#, fuzzy, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-"%d siabroŭ byli dadadzienyja albo aktualizavanyja z servera (taksama siabry, "
-"jakija ŭžo zachoŭvajucca ŭ śpisie na servery)"
-msgstr[1] ""
-"%d siabroŭ byli dadadzienyja albo aktualizavanyja z servera (taksama siabry, "
-"jakija ŭžo zachoŭvajucca ŭ śpisie na servery)"
-msgstr[2] ""
-"%d siabroŭ byli dadadzienyja albo aktualizavanyja z servera (taksama siabry, "
-"jakija ŭžo zachoŭvajucca ŭ śpisie na servery)"
-
-msgid "Add contacts from server"
-msgstr "Dadaj kantakty z servera"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Aktualizuj libpurple da versii z padtrymkaj RC4 (>= 2.0.1). Plugin dla "
+"MySpaceIM nia budzie zahružany."
 
 msgid "Add friends from MySpace.com"
 msgstr "Dadaj siabroŭ z MySpace.com"
@@ -5687,9 +5817,6 @@ msgstr "Pamier asnoŭnaha šryftu (u punktach)"
 msgid "User"
 msgstr "Karystalnik"
 
-msgid "Profile"
-msgstr "Profil"
-
 msgid "Headline"
 msgstr "Zahałovak"
 
@@ -5702,15 +5829,11 @@ msgstr "Usich siabroŭ"
 msgid "Client Version"
 msgstr "Versija klijenta"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "Nazva karystalnika nie akreślenaja"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM - Akreśl nazvu karystalnika"
-
-msgid "Please enter a username to check its availability:"
-msgstr "Uviadzi nazvu karystalnika dla pravierki jaje volnaści:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Volnaja nazva karystalnika"
@@ -5721,12 +5844,22 @@ msgstr "Hetaja nazva karystalnika volnaja. Chočaš jaje ŭžyć?"
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "PAŚLA ŬŽYĆCIA JAJE ŬŽO NIELHA BUDZIE ŹMIANIĆ!"
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Akreśl nazvu karystalnika"
+
 msgid "This username is unavailable."
 msgstr "Hetaja nazva karystalnika zaniataja."
 
 msgid "Please try another username:"
 msgstr "Pasprabuj inšuju nazvu karystalnika:"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Nazva karystalnika nie akreślenaja"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Uviadzi nazvu karystalnika dla pravierki jaje volnaści:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5918,9 +6051,6 @@ msgstr "Niemahčyma dadać samoha siabie"
 msgid "Master archive is misconfigured"
 msgstr "Hałoŭny archiŭ kiepska skanfihuravany"
 
-msgid "Incorrect username or password"
-msgstr "Niapravilnyja nazva karystalnika albo parol"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Niemahčyma paznać host dla ŭviedzienaj taboju nazvy karystalnika"
 
@@ -5962,9 +6092,9 @@ msgstr "Karystalnik adłučany, albo ty zablakavany"
 msgid "Unknown error: 0x%X"
 msgstr "Nieviadomaja pamyłka: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Pamyłka ŭvachodu (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Niemahčyma ŭvajści"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6070,9 +6200,6 @@ msgstr "Kanferencyja GroupWise %d"
 msgid "Authenticating..."
 msgstr "Aŭtaryzacyja..."
 
-msgid "Unable to connect to server."
-msgstr "Niemahčyma spałučycca z serveram."
-
 msgid "Waiting for response..."
 msgstr "Čakańnie adkazu..."
 
@@ -6096,9 +6223,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Chočaš dałučycca da razmovy?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Ty vyjšaŭ, bo ŭvajšoŭ ź inšaha kamputara."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6106,17 +6230,14 @@ msgstr ""
 "%s adłučany/adłučanaja i nie atrymaŭ/atrymała paviedamleńnie, jakoje ty "
 "tolkišto dasłaŭ."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Niemahčyma spałučycca z serveram. Akreśl adras servera, ź jakim chočaš "
 "spałučycca."
 
-msgid "Error. SSL support is not installed."
-msgstr "Pamyłka. Padtrymka SSL nie zainstalavanaja."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Hetaja kanferencyja začynienaja. Bolš nielha dasyłać paviedamleńni."
 
@@ -6139,24 +6260,33 @@ msgstr "Adras servera"
 msgid "Server port"
 msgstr "Port servera"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Atrymany niečakany adkaz HTTP ad servera."
+
+#. username connecting too frequently
+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 ""
+"Ty spałučaŭsia j adłučaŭsia nadta časta. Pačakaj dziesiać chvilin i paŭtary "
+"znoŭ. Kali ty praciahnieš svaje sproby, tabie pryjdziecca pačakać jašče bolš."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Pamyłka zapytu znaku ŭvachodu"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Niemahčyma dałučycca da hutarki ŭ pakoi"
 
 msgid "Invalid chat room name"
 msgstr "Niapravilnaja nazva pakoju dla hutarki"
 
-msgid "Server closed the connection."
-msgstr "Server začyniŭ spałučeńnie."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Spałučeńnie z serversm stračanaje:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Pry spałučeńni z serveram atrymanyja niapravilnyja źviestki."
 
 #. *< type
@@ -6205,7 +6335,8 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 "Pry spałučeńni z addalenym karystalnikam atrymanyja niapravilnyja źviestki."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Niemahčyma spałučycca z addalenym karystalnikam."
 
 msgid "Direct IM established"
@@ -6382,23 +6513,18 @@ msgstr "Kamera"
 msgid "Screen Sharing"
 msgstr "Nazva karystalnika"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Volny dla hutarki"
 
-#, c-format
 msgid "Not Available"
 msgstr "Niedastupny"
 
-#, c-format
 msgid "Occupied"
 msgstr "Zaniaty"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Ahladaju sieciva"
 
-#, c-format
 msgid "Invisible"
 msgstr "Niabačny"
 
@@ -6411,21 +6537,15 @@ msgstr "Uzrovień aściarohi"
 msgid "Buddy Comment"
 msgstr "Kamentar siabra"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Niemahčyma spałučycca z serveram aŭtaryzacyi:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Niemahčyma spałučycca z serveram BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Niemahčyma spałučycca z serveram."
 
 msgid "Username sent"
 msgstr "Nazva karystalnika vysłanaja"
@@ -6437,53 +6557,61 @@ msgstr "Spałučeńnie ŭstalavanaje, ciestka dasłanaje"
 msgid "Finalizing connection"
 msgstr "Zakančeńnie spałučeńnia"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Niemahčyma ŭvajści: niemahčyma ŭvajści jak %s, bo nazva karystalnika "
 "niapravilnaja. Nazvy karystalnikaŭ musiać być pravilnymi adrasami email albo "
 "pačynacca ź litary i ŭtrymlivać tolki litary, ličby j prabieły, albo tolki "
 "ličby."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Niapravilnaja nazva."
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Ty možaš być chutka adłučany. Pravier aktualnaść na %s."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Niemahčyma atrymać pravilny hash uvachodu dla AIM."
+
+msgid "Unable to get a valid login hash."
+msgstr "Niemahčyma atrymać pravilny hash uvachodu."
 
-msgid "Incorrect password."
-msgstr "Niapravilny parol."
+msgid "Received authorization"
+msgstr "Atrymanaja aŭtaryzacyja"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Karystalnik nie isnuje"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Tvoj kont dziejna ŭsypleny."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Servis AOL Instant Messenger'a časova niedastupny."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Versija tvajho klijenta nadta staraja. Kali łaska, abnavisia na %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Ty spałučaŭsia j adłučaŭsia nadta časta. Pačakaj dziesiać chvilin i paŭtary "
 "znoŭ. Kali ty praciahnieš svaje sproby, tabie pryjdziecca pačakać jašče bolš."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Versija tvajho klijenta nadta staraja. Kali łaska, abnavisia na %s"
-
-msgid "Could Not Connect"
-msgstr "Niemahčyma spałučycca"
-
-msgid "Received authorization"
-msgstr "Atrymanaja aŭtaryzacyja"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Akreśleny kluč SecurID niapravilny."
 
 msgid "Enter SecurID"
@@ -6498,24 +6626,6 @@ msgstr "Uviadzi 6-ličbavy numar ź ličbavaha displaju."
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Ty možaš być chutka adłučany. Ty možaš užyć TOC, pakul heta nia budzie "
-"vypraŭlena. Pravier aktualnaść na %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Niemahčyma atrymać pravilny hash uvachodu dla AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Ty možaš być chutka adłučany. Pravier aktualnaść na %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Niemahčyma atrymać pravilny hash uvachodu."
-
 msgid "Password sent"
 msgstr "Parol dasłany"
 
@@ -6655,7 +6765,7 @@ msgstr[0] "Ty zhubiŭ %hu paviedamleńnie ad %s ź nieviadomaj pryčyny."
 msgstr[1] "Ty zhubiŭ %hu paviedamleńni ad %s ź nieviadomaj pryčyny."
 msgstr[2] "Ty zhubiŭ %hu paviedamleńniaŭ ad %s ź nieviadomaj pryčyny."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Niemahčyma dasłać paviedamleńnie: %s"
@@ -6677,6 +6787,12 @@ msgstr "Spałučany ad"
 msgid "Member Since"
 msgstr "Udzielničaje ad"
 
+msgid "Capabilities"
+msgstr "Mahčymaści"
+
+msgid "Profile"
+msgstr "Profil"
+
 msgid "Your AIM connection may be lost."
 msgstr "Tvajo spałučeńnie AIM moža zhubicca."
 
@@ -6864,9 +6980,9 @@ msgstr[2] ""
 msgid "Away message too long."
 msgstr "Paviedamleńnie ab adychodzie nadta vialikaje."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6893,9 +7009,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Siroty"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Niemahčyma dadać siabra %s, bo ŭ tvaim śpisie siabroŭ nadta šmat siabroŭ. "
@@ -6904,8 +7020,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(biaz nazvy)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Niemahčyma dadać siabra %s ź nieviadomaje pryčyny."
 
 #, c-format
@@ -6976,6 +7092,7 @@ msgstr "_Spałučysia"
 msgid "Get AIM Info"
 msgstr "Atrymaj źviestki AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Redahuj kamentar siabra"
 
@@ -7036,6 +7153,7 @@ msgstr "Š_ukaj"
 msgid "Set User Info (web)..."
 msgstr "Akreśli źviestki karystalnika (u siecivie)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Źmiani parol (u siecivie)"
 
@@ -7065,6 +7183,10 @@ msgstr "Šukaj siabra pavodle adrasu email..."
 msgid "Search for Buddy by Information"
 msgstr "Šukaj siabra pavodle źviestak"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Karystalnik nie ŭvajšoŭ"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7085,7 +7207,6 @@ msgstr "Prapanova dla %s spałučycca z nami na %s:%hu dziela Prostaha IM."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Sproba spałučycca z %s:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Sproba spałučycca praz proxy-server."
 
@@ -7180,7 +7301,7 @@ msgstr "Inšaje"
 msgid "Visible"
 msgstr "Niabačny"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7271,16 +7392,48 @@ msgstr "Apošniaja aktualizacyja"
 msgid "Could not change buddy information."
 msgstr "Kali łaska, uviadzi źviestki ab siabry."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "Mabilnik"
+
+msgid "Note"
+msgstr "Natatki"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Ikona siabra"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Dadaj siabra"
+msgid "_Modify"
+msgstr "Madyfikuj"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Madyfikuj"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Server zaniaty"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Vymahaj aŭtaryzacyi"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Dadać siabra ŭ tvoj śpis?"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Enter answer here"
 msgstr "Akreśl zapyt tut"
 
 msgid "Send"
@@ -7294,18 +7447,19 @@ msgid "Authorization denied message:"
 msgstr "Paviedamleńnie admovy aŭtaryzacyi:"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "Prabač, ale ty nie majho typu..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Karystalnik %d vymahaje aŭtaryzacyi"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Dadać siabra ŭ tvoj śpis?"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "Akreśl zapyt tut"
 
 msgid "Would you be my friend?"
@@ -7328,7 +7482,7 @@ msgid "Failed sending authorize"
 msgstr "Kali łaska, aŭtaryzuj mianie!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Niaŭdałaje vydaleńnie siabra"
 
 #, fuzzy, c-format
@@ -7373,6 +7527,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr "Ty možaš šukać tolki stałyja hrupy QQ\n"
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Niapravilnyja nałady proxy"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Ja nia ŭdzielnik"
 
@@ -7415,16 +7573,19 @@ msgstr "Hetaja hrupa nie dazvalaje dałučeńnia inšych"
 msgid "Join QQ Qun"
 msgstr "Dałučysia da hutarki"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "Akreśl zapyt tut"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Ty paśpiachova madyfikavaŭ udzielnika Quna"
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "Ty paśpiachova madyfikavaŭ udzielnika Quna"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7434,7 +7595,7 @@ msgstr "Aperacyja QQ Qun"
 msgid "Failed:"
 msgstr "Pamyłka"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7449,11 +7610,11 @@ msgstr ""
 "hetaja aperacyja całkam vydalić hety Qun."
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "Prabač, ale ty nie majho typu..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Ty paśpiachova madyfikavaŭ udzielnika Quna"
 
 #, fuzzy
@@ -7464,35 +7625,35 @@ msgid "You have successfully created a Qun"
 msgstr "Ty paśpiachova stvaryŭ Qun"
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Chočaš zaraz akreślić padrabiaznaści Quna?"
 
 msgid "Setup"
 msgstr "Akreśl"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "Karystalnik %d choča dałučycca da hrupy %d"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "Karystalnik %d choča dałučycca da hrupy %d"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Pamyłka dałučeńnia siabra da hutarki"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Vydali siabra"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Vydali siabra"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7609,6 +7770,13 @@ msgstr "<b>Apošniaja aktualizacyja</b>: %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Dziejna spałučany</b>: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Apošniaja aktualizacyja</b>: %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7616,7 +7784,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Ab %s"
 
 #, fuzzy
@@ -7637,6 +7805,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Ab %s"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Chatni adras"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7668,7 +7840,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Spałučysia praz TCP"
@@ -7681,6 +7852,9 @@ msgstr "Port servera"
 msgid "Show server news"
 msgstr "Adras servera"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Pamyłka padtrymki aktyŭnaha stanu"
@@ -7690,11 +7864,7 @@ msgid "Update interval (seconds)"
 msgstr "Pamyłka padtrymki aktyŭnaha stanu"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Niemahčyma atrymać źviestki ab servery"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Niemahčyma atrymać źviestki ab servery"
 
 #, c-format
@@ -7717,21 +7887,20 @@ msgid "Activation required"
 msgstr "Vymahaje rehistracyi"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Keep alive error"
-msgstr "Pamyłka padtrymki aktyŭnaha stanu"
-
 #, fuzzy
-msgid "Requesting captcha ..."
+msgid "Requesting captcha"
 msgstr "Vymahańnie ŭvahi %s..."
 
-msgid "Checking code of captcha ..."
-msgstr ""
+#, fuzzy
+msgid "Checking captcha"
+msgstr "Vymahańnie ŭvahi %s..."
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Pamyłka aŭtaryzacyi Yahoo!"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7741,73 +7910,51 @@ msgstr "Zapišy vyjavu"
 msgid "Enter code"
 msgstr "Uviadzi parol"
 
-msgid "QQ Captcha Verifing"
-msgstr ""
+#, fuzzy
+msgid "QQ Captcha Verification"
+msgstr "Pravierka sertyfikatu SSL"
 
 #, fuzzy
 msgid "Enter the text from the image"
 msgstr "Uviadzi nazvu hrupy"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Niemahčyma spałučycca."
-
 msgid "Socket error"
 msgstr "Pamyłka sokieta"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"Spałučeńnie z serversm stračanaje:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "Niemahčyma pračytać z sokieta"
-
-msgid "Write Error"
-msgstr "Pamyłka zapisu"
-
-msgid "Connection lost"
-msgstr "Spałučeńnie zhublenaje"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Akreśl źviestki karystalnika..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Zapyt admoŭleny"
 
-msgid "Couldn't resolve host"
-msgstr "Niemahčyma vyjaśnić host"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Niemahčyma spałučycca z serveram."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Niapravilnaja pamyłka"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Spałučysia z serveram"
+msgid "Connecting to server"
+msgstr "Spałučeńnia z serveram SILC"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Pamyłka QQid"
 
-msgid "Failed to send IM."
-msgstr "Pamyłka dasyłańnia IM."
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7817,6 +7964,10 @@ msgid ""
 msgstr "Retranślacyja servera ICQ"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Ad"
 
@@ -7826,32 +7977,30 @@ msgid ""
 "%s"
 msgstr "Instrukcyi servera: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Nieviadomaja pryčyna"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Zahad"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Niemahčyma atrymać źviestki ab servery"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Nieviadomaja pryčyna"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Nieviadomaja pryčyna"
 
 #, c-format
@@ -7865,9 +8014,6 @@ msgstr "Dasyłańnie fajłu"
 msgid "%d canceled the transfer of %s"
 msgstr "%d anulavaj pieradaču fajłu %s"
 
-msgid "Connection closed (writing)"
-msgstr "Spałučeńnie začynienaje (zapis)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Nazva hrupy:<b> %s<br>"
@@ -7921,17 +8067,6 @@ msgstr "Administratar Sametime pakinuŭ nastupnuju abviestku na servery %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Abviestka ad administratara Sametime"
 
-msgid "Connection reset"
-msgstr "Pieraŭruchamleńie spałučeńnia"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Pamyłka čytańnia z sokietu: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Niemahčyma spałučycca z hostam"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Abviestka ad %s"
@@ -7954,6 +8089,9 @@ msgstr "Kalonki"
 msgid "Video Camera"
 msgstr "Videakamera"
 
+msgid "File Transfer"
+msgstr "Pieradača fajłu"
+
 msgid "Supports"
 msgstr "Padtrymvaje"
 
@@ -8672,9 +8810,6 @@ msgstr "Arhanizacyja"
 msgid "Unit"
 msgstr "Addzieł"
 
-msgid "Note"
-msgstr "Natatki"
-
 msgid "Join Chat"
 msgstr "Dałučysia da hutarki"
 
@@ -8774,6 +8909,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statystyka sietki"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Pamyłka pingu"
 
@@ -8837,7 +8975,8 @@ msgstr "Niepadtrymany typ publičnaha kluča"
 msgid "Disconnected by server"
 msgstr "Adłučany serveram"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Pamyłka ŭ časie spałučeńnia z serveram SILC"
 
 msgid "Key Exchange failed"
@@ -8849,26 +8988,26 @@ msgstr ""
 "Pamyłka praciahu adłučanaj sesii. Naciśni \"Pierałučysia\", kab stvaryć "
 "novaje spałučeńnie."
 
-msgid "Connection failed"
-msgstr "Pamyłka spałučeńnia"
-
 msgid "Performing key exchange"
 msgstr "Abmieńvańnie klučami"
 
-msgid "Unable to create connection"
-msgstr "Niemahčyma stvaryć spałučeńnie"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Niemahčyma zahruzić paru klučoŭ SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Spałučeńnia z serveram SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Niemahčyma zahruzić paru klučoŭ SILC"
+
 msgid "Out of memory"
 msgstr "Nie staje pamiaci"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Niemahčyma inicyjalizavać pratakoł SILC"
 
 msgid "Error loading SILC key pair"
@@ -9168,7 +9307,8 @@ msgstr "Ličbava padpisvaj i praviaraj usie paviedamleńni"
 msgid "Creating SILC key pair..."
 msgstr "Stvareńnie pary klučoŭ SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Niemahčyma stvaryć paru klučoŭ SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9262,6 +9402,9 @@ msgstr "Doška"
 msgid "No server statistics available"
 msgstr "Niama statystyki servera"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Pamyłka ŭ časie spałučeńnia z serveram SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Pamyłka: Nieadpaviednaść versij, aktualizuj svajho klijenta"
@@ -9303,35 +9446,36 @@ msgstr "Pamyłka: Niapravilnaje ciestka"
 msgid "Failure: Authentication failed"
 msgstr "Pamyłka: Pamyłka aŭtaryzacyi"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Niamahčyma inicyjalizavać spałučeńnie klijenta SILC"
 
 msgid "John Noname"
 msgstr "John Biezymienny"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Niemahčyma zahruzić paru klučoŭ SILC: %s"
 
-msgid "Could not write"
-msgstr "Niemahyma zapisać"
-
-msgid "Could not connect"
-msgstr "Niemahčyma spałučycca"
+msgid "Unable to create connection"
+msgstr "Niemahčyma stvaryć spałučeńnie"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Nieviadomy adkaz ad servera."
 
-msgid "Could not create listen socket"
-msgstr "Niemahčyma stvaryć sokiet dziela słuchańnia"
-
-msgid "Could not resolve hostname"
-msgstr "Niemahčyma vyjaśnić nazvu hostu"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Niemahčyma stvaryć sokiet"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 "Nazvy karystalnikaŭ SIP nia mohuć utrymlivać prabiełaŭ albo znakaŭ \"@\""
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Port servera"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9365,177 +9509,63 @@ msgstr "Aŭtaryzuj karystalnika"
 msgid "Auth Domain"
 msgstr "Aŭtaryzuj damen"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Pošuk %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Pamyłka spałučeńnia z %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Uvachod: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Niemahčyma zapisać fajł %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Niemahčyma pračytać fajł %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Paviedamleńnie nadta daŭhoje, apošnija %s bajtaŭ abatnutyja."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s dziejna nia spałučany/spałučanaja."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Aściaroha dla %s nie dazvolenaja."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Paviedamleńnie nie pryniataje, ty pieravysiŭ limit chutkaści servera."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Hutarka ŭ %s niedastupnaja."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Ty dasyłaješ paviedamleńni da %s nadta chutka."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Ty zhubiŭ paviedamleńnie ad %s, bo jano było nadta daŭhim."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Ty zhubiŭ paviedamleńnie ad %s, bo jano buło dasłanaje nadta chutka."
-
-#, c-format
-msgid "Failure."
-msgstr "Pamyłka."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Nadta šmat adpaviednikaŭ."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Treba bolš udakładnieńniaŭ."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Servis katalohu časova niedastupny."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Pošuk pavodle e-maiłu abmiežavany."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Klučavoje słova ihnaravanaje."
-
-#, c-format
-msgid "No keywords."
-msgstr "Niama klučavych słovaŭ."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Karystalnik nia maje źviestak z katalohu."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Kraina nie padtrymvajecca."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Nieviadomaja pamyłka: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Niapravilnaja nazva karystalnika albo parol."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Servis časova niedastupny."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Tvoj uzrovień aściarohi nadta vysoki, kab uvachodzić."
-
-#, c-format
-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 ""
-"Ty spałučajeśsia j adłučajeśsia nadta časta. Pačakaj 10 chvilin i pasprabuj "
-"znoŭ. Kali ty praciahnieš tak rabić, tabie pryjdziecca pačakać jašče daŭžej."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Adbyłasia nieviadomaja pamyłka ŭvachodu: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Adbyłasia nieviadomaja pamyłka %d. Źviestki: %s"
-
-msgid "Invalid Groupname"
-msgstr "Niapravilnaja nazva hrupy"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;pakoj&gt;:  Uvajdzi ŭ pakoj hutarki ŭ sietcy Yahoo"
 
-msgid "Connection Closed"
-msgstr "Spałučeńnie začynienaje."
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Pakažy śpis pakojaŭ u sietcy Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Čakańnie adkazu..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Prapanuj karystalniku pačać sesiju Durnoty"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"TOC viarnuŭsia paśla pierapynku. Ciapier ty znoŭ možaš dasyłać paviedamleńni."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-msgid "Password Change Successful"
-msgstr "Parol paśpiachova źmienieny"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Plugin pratakołu Yahoo"
 
-msgid "_Group:"
-msgstr "_Hrupa:"
+msgid "Pager server"
+msgstr "Server pagera"
 
-msgid "Get Dir Info"
-msgstr "Atrymaj źviestki z katalohu"
+msgid "Pager port"
+msgstr "Port pagera"
 
-msgid "Set Dir Info"
-msgstr "Akreśl źviestki dla katalohu"
+msgid "File transfer server"
+msgstr "Server pieradačy fajłaŭ"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Niemahčyma adčynić %s dziela zapisu!"
+msgid "File transfer port"
+msgstr "Port pieradačy fajłaŭ"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Pamyłka pieradačy fajłu; aperacyja, mabyć, anulavanaja z taho boku."
+msgid "Chat room locale"
+msgstr "Lakalnaść pakoju hutarki"
 
-msgid "Could not connect for transfer."
-msgstr "Niemahčyma spałučycca dziela pieradačy."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ihnaruj zaprašeńni na kanferencyi i ŭ pakoi hutarak"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Niemahčyma zapisać zahałovak fajłu. Fajł nia budzie pieradadzieny."
+msgid "Chat room list URL"
+msgstr "Spasyłka na śpis pakojaŭ hutarak"
 
-msgid "Save As..."
-msgstr "Zapišy jak..."
+msgid "Yahoo Chat server"
+msgstr "Server hutarak Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s prosić %s pryniać %d fajł: %s (%.2f %s)%s%s"
-msgstr[1] "%s prosić %s pryniać %d fajły: %s (%.2f %s)%s%s"
-msgstr[2] "%s prosić %s pryniać %d fajłaŭ: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Port hutarak Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s prosić ciabie dasłać jamu fajł"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9547,13 +9577,12 @@ msgstr "%s prosić ciabie dasłać jamu fajł"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Plugin pratakołu TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Plugin pratakołu Yahoo"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
-"%s zaprašaje ciabie ŭ Web-kamernuju hutarku, jakaja pakul nie padtrymvajecca."
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Tvajo paviedamleńnie Yahoo! nie dasłanaje."
@@ -9576,6 +9605,34 @@ msgstr "%s (zvarotna) zabaraniŭ tabie dadać siabie da śpisu."
 msgid "Add buddy rejected"
 msgstr "Dadańnie siabra nie dazvolenaje"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Pry spałučeńni z serveram atrymanyja niapravilnyja źviestki."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Numar %d nieviadomaj pamyłki. Naviedvańnie sajtu Yahoo! moža vypravić hetuju "
+"prablemu."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Numar %d nieviadomaj pamyłki. Naviedvańnie sajtu Yahoo! moža vypravić hetuju "
+"prablemu."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Niapravilnyja nazva karystalnika albo parol"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9608,37 +9665,32 @@ msgstr ""
 "Numar %d nieviadomaj pamyłki. Naviedvańnie sajtu Yahoo! moža vypravić hetuju "
 "prablemu."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Niemahčyma dadać siabra %s u hrupu %s ŭ śpis z servera dla kontu %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Niemahčyma dadać siabra ŭ śpis z servera"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hukavy %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Atrymany niečakany adkaz HTTP ad servera."
 
-msgid "Connection problem"
-msgstr "Pamyłka spałučeńnia"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Spałučeńnie z %s zhublenaje:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Niemahčyma spałučycca z %s:\n"
+"Niemahčyma spałučycca z serveram:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9686,8 +9738,8 @@ msgstr "Nałady prysutnaści"
 msgid "Start Doodling"
 msgstr "Pačni durnotu"
 
-msgid "Activate which ID?"
-msgstr "Jaki ID aktyvizavać?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Da kaho dałučycca ŭ hutarcy?"
@@ -9701,74 +9753,15 @@ msgstr "Dałučysia da karystalnika ŭ hutarcy..."
 msgid "Open Inbox"
 msgstr "Adčyni Ŭvachodnyja"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;pakoj&gt;:  Uvajdzi ŭ pakoj hutarki ŭ sietcy Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Pakažy śpis pakojaŭ u sietcy Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Prapanuj karystalniku pačać sesiju Durnoty"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Plugin pratakołu Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonija"
-
-msgid "Pager server"
-msgstr "Server pagera"
-
-msgid "Japan Pager server"
-msgstr "Japonski server pagera"
-
-msgid "Pager port"
-msgstr "Port pagera"
-
-msgid "File transfer server"
-msgstr "Server pieradačy fajłaŭ"
-
-msgid "Japan file transfer server"
-msgstr "Japonski server pieradačy fajłaŭ"
-
-msgid "File transfer port"
-msgstr "Port pieradačy fajłaŭ"
-
-msgid "Chat room locale"
-msgstr "Lakalnaść pakoju hutarki"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ihnaruj zaprašeńni na kanferencyi i ŭ pakoi hutarak"
-
-msgid "Chat room list URL"
-msgstr "Spasyłka na śpis pakojaŭ hutarak"
-
-msgid "Yahoo Chat server"
-msgstr "Server hutarak Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Port hutarak Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Dašli zapyt Durnoty."
 
+msgid "Unable to connect."
+msgstr "Niemahčyma spałučycca."
+
 msgid "Unable to establish file descriptor."
 msgstr "Niemahčyma atrymać fajłavy deskryptar."
 
@@ -9776,6 +9769,9 @@ msgstr "Niemahčyma atrymać fajłavy deskryptar."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s choča vysłać tabie %d fajłaŭ.\n"
 
+msgid "Write Error"
+msgstr "Pamyłka zapisu"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil japonskaha Yahoo!"
 
@@ -9820,13 +9816,9 @@ msgstr "Fajnaja spasyłka 3"
 msgid "Last Update"
 msgstr "Apošniaja aktualizacyja"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Źviestki ab karystalniku %s niedastupnyja"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Hety profil zachoŭvajecca na movie albo ŭ farmacie, jaki pakul nie "
 "padtrymvajecca."
@@ -9899,23 +9891,19 @@ msgstr "Hałasy"
 msgid "Webcams"
 msgstr "Webkamery"
 
+msgid "Connection problem"
+msgstr "Pamyłka spałučeńnia"
+
 msgid "Unable to fetch room list."
 msgstr "Niemahčyma atrymać śpis pakojaŭ."
 
 msgid "User Rooms"
 msgstr "Pakoi karystalnikaŭ"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Prablema spałučeńnia z serveram YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Spałučeńnie z serveram zhublenaje\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10046,33 +10034,22 @@ msgstr "Vaładarstva"
 msgid "Exposure"
 msgstr "Vykryćcio"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Niemahčyma stvaryć sokiet:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Niemahčyma razabrać adkaz ad HTTP proxy: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Pamyłka spałučeńnia %d z HTTP proxy"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Dostup niedazvoleny: HTTP proxy-server zabaraniaje tunelavać port %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Pamyłka vyjaśnieńnia %s."
 
-msgid "Could not resolve host name"
-msgstr "Niemahčyma vyjaśnić nazvu hostu"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Vymahańnie ŭvahi %s..."
@@ -10162,9 +10139,6 @@ msgstr "Nie turbuj mianie"
 msgid "Extended away"
 msgstr "Pašyrany adychod"
 
-msgid "Mobile"
-msgstr "Mabilnik"
-
 msgid "Listening to music"
 msgstr "Słuhaju muzyku"
 
@@ -10206,18 +10180,6 @@ msgstr "+++ %s pierapyniaje biaździejańnie"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Pamyłka čytańnia %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Pry čytańni tvajho %s adbyłasia pamyłka. Jany nie byli zahružanyja, a stary "
-"fajł pieranazvany ŭ %s~."
-
 msgid "Calculating..."
 msgstr "Padlik..."
 
@@ -10331,6 +10293,18 @@ msgstr "Admoŭlenaje spałučeńnie."
 msgid "Address already in use."
 msgstr "Hetaja nazva hutarki ŭžo zaniataja"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Pamyłka čytańnia %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Pry čytańni tvajho %s adbyłasia pamyłka. Jany nie byli zahružanyja, a stary "
+"fajł pieranazvany ŭ %s~."
+
 msgid "Internet Messenger"
 msgstr "Internet-kamunikatar"
 
@@ -10373,10 +10347,8 @@ msgstr "Nahadvańni ab novaj pošcie"
 msgid "Use this buddy _icon for this account:"
 msgstr "Užyj hetuju siabroŭskuju _ikonu dziela hetaha kontu:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Opcyi %s"
+msgid "_Advanced"
+msgstr "_Prasunuty"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Užyj nałady proxy GNOME"
@@ -10411,9 +10383,6 @@ msgstr "Kali budzieš hladzieć uvažliviej, "
 msgid "you can see the butterflies mating"
 msgstr "ty ŭbačyš matylkoŭ"
 
-msgid "Proxy Options"
-msgstr "Opcyi proxy"
-
 msgid "Proxy _type:"
 msgstr "_Typ proxy:"
 
@@ -10442,8 +10411,9 @@ msgstr "_Prosty"
 msgid "Create _this new account on the server"
 msgstr "Stvary hety novy kont na servery"
 
-msgid "_Advanced"
-msgstr "_Prasunuty"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Proxy"
 
 msgid "Enabled"
 msgstr "Uklučany"
@@ -10493,8 +10463,9 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Kali łaska, aktualizuj patrebnyja pali."
 
-msgid "Room _List"
-msgstr "Śpis _pakojaŭ"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Kont"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10502,8 +10473,8 @@ msgid ""
 msgstr ""
 "Akreśl adpaviednyja źviestki ab hutarcy, u jakoj ty chočaš paŭdzielničać.\n"
 
-msgid "_Account:"
-msgstr "_Kont:"
+msgid "Room _List"
+msgstr "Śpis _pakojaŭ"
 
 msgid "_Block"
 msgstr "_Blakuj"
@@ -10520,6 +10491,17 @@ msgstr "Atrymaj ź_viestki"
 msgid "I_M"
 msgstr "_Razmova"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "_Dadaj hutarku"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Videahutarka"
+
 msgid "_Send File..."
 msgstr "_Dašli fajł..."
 
@@ -10529,9 +10511,14 @@ msgstr "Dadaj siabroŭskuju _začepku..."
 msgid "View _Log"
 msgstr "Pakažy _logi"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Chavaj, kali adłučany"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Pakazvaj, kali adłučany"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -10657,6 +10644,10 @@ msgstr "/Pryładździe/Siabroŭskija _začepki"
 msgid "/Tools/_Certificates"
 msgstr "/Pryładździe/_Sertyfikaty"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Pryładździe/Tajemnaść"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Pryładździe/Plu_giny"
 
@@ -10666,10 +10657,6 @@ msgstr "/Pryładździe/_Nałady"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Pryładździe/_Tajemnaść"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Pryładździe/Tajemnaść"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Pryładździe/_Pieradačy fajłaŭ"
 
@@ -10788,8 +10775,8 @@ msgstr "Samastojna"
 msgid "By status"
 msgstr "Pavodle statusu"
 
-msgid "By log size"
-msgstr "Pavodle pamieru logaŭ"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10805,6 +10792,9 @@ msgstr "Spałučy znoŭ"
 msgid "Re-enable"
 msgstr "Uklučy znoŭ"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Ty viarnuŭsia!"
 
@@ -10893,6 +10883,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Hrupa:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Aŭtamatyčna _dałučajsia, kali kont uvachodzić."
 
@@ -10927,6 +10920,116 @@ msgstr "/Pryładździe"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Siabry/Sartuj siabroŭ"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Fonavy koler"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Hetaja hrupa dadadzienaja ŭ tvoj śpis siabroŭ"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Laoskaja"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Fonavy koler"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Razharni"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Abiary fonavy koler"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Zharni"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Abiary fonavy koler"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Paradkuj"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Spałučany"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Adyjšoŭ"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Adłučany"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Tekst nastroju"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Dasłanaje paviedamleńnie"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Źmiani źviestki karystalnika dla %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Uviadzi nazvu kamputara, dla jakoha vydadzieny hety sertyfikat."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servery SSL"
@@ -10946,14 +11049,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Zaprasi siabra ŭ pakoj dla hutarak"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Akreśl nazvu karystalnika, jakoha ty chočaš zaprasić, razam ź "
-"nieabaviazkovym tekstam zaprašeńnia."
-
 msgid "_Buddy:"
 msgstr "_Siabra:"
 
@@ -10982,7 +11077,8 @@ msgstr "Ihnaruj"
 msgid "Get Away Message"
 msgstr "Atrymaj paviedamleńnie adychodu"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Apošnija replika"
 
 msgid "Unable to save icon file to disk."
@@ -11028,6 +11124,22 @@ msgstr "/Razmova/_Zapišy jak..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Razmova/_Ačyść bufer prakrutki"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Razmova/_Jašče"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Razmova/_Jašče"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Razmova/_Jašče"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Razmova/Pakažy _log"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Razmova/_Dašli fajł..."
 
@@ -11100,6 +11212,18 @@ msgstr "/Razmova"
 msgid "/Conversation/View Log"
 msgstr "/Razmova/Pakažy log"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Razmova/Jašče"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Razmova/Pakažy log"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Razmova/Jašče"
+
 msgid "/Conversation/Send File..."
 msgstr "/Razmova/Dašli fajł..."
 
@@ -11285,6 +11409,9 @@ msgstr "Vykanaŭca"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "padtrymka"
 
@@ -11411,6 +11538,10 @@ msgstr "Hindzi"
 msgid "Hungarian"
 msgstr "Vuhorskaja"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumynskaja"
+
 msgid "Indonesian"
 msgstr "Indanezijskaja"
 
@@ -11426,6 +11557,10 @@ msgstr "Hruzinskaja"
 msgid "Ubuntu Georgian Translators"
 msgstr "Hruzinskija pierakładčyki Ubuntu"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Inšaje"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11447,6 +11582,10 @@ msgstr "Litoŭskaja"
 msgid "Macedonian"
 msgstr "Makiedonskaja"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "Makiedonskaja"
+
 msgid "Bokmål Norwegian"
 msgstr "Narveskaja Bokmål"
 
@@ -11501,6 +11640,9 @@ msgstr "Sinhaleskaja"
 msgid "Swedish"
 msgstr "Švedzkaja"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamilskaja"
 
@@ -11561,7 +11703,24 @@ msgstr ""
 "prahramu.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11826,7 +11985,7 @@ msgid "Hyperlink visited color"
 msgstr "Koler hiperspasyłak"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Koler padśviatleńnia hiperspasyłak, kali kursor naviedzieny na ich."
 
 msgid "Hyperlink prelight color"
@@ -11865,13 +12024,22 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr "Koler dla nazvy dziejnasnaha paviedamleńnia"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Koler dla nazvy dziejnasnaha paviedamleńnia."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "Dasłany koler dla nazvy paviedamleńnia"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Koler dla nazvy dziejnasnaha paviedamleńnia."
+
 msgid "Typing notification color"
 msgstr "Koler infarmavańnia pra nabor tekstu"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Koler šryftu dziela infarmavańnia pra nabor tekstu"
 
 msgid "Typing notification font"
@@ -11883,15 +12051,6 @@ msgstr "Šryft dziela infarmavańnia pra nabor tekstu"
 msgid "Enable typing notification"
 msgstr "Uklučy infarmavańni pra nabor tekstu"
 
-msgid "_Copy Email Address"
-msgstr "_Skapijuj adras email"
-
-msgid "_Open Link in Browser"
-msgstr "_Adčyni spasyłku ŭ hartačy"
-
-msgid "_Copy Link Location"
-msgstr "_Skapijuj adras spasyłki"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11933,11 +12092,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "Zapišy vyjavu"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Zapišy vyjavu..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Pakazvaj asablivyja ŭśmieški"
 
@@ -12025,9 +12183,6 @@ msgstr "Pamienš pamier šryftu"
 msgid "Font Face"
 msgstr "Vyhlad šryftu"
 
-msgid "Background Color"
-msgstr "Fonavy koler"
-
 msgid "Foreground Color"
 msgstr "Koler tekstu"
 
@@ -12134,13 +12289,14 @@ msgstr "_Ahladaj kataloh logaŭ"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Pasprabuj `%s -h' dla padrabiaźniejšych źviestak.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12165,13 +12321,14 @@ msgstr ""
 "  --display=EKRAN      patrebny ekran X\n"
 "  -v, --version        pakažy dziejnuju versiju i vyjdzi\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12232,11 +12389,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Adčyni ŭsie paviedamleńni"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Majem novuju poštu!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Padlik..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12267,6 +12440,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Abrany 'Admysłovy' hartač, ale zahad nie akreśleny."
 
+#, fuzzy
+msgid "No message"
+msgstr "Nieviadomaje paviedamleńnie"
+
+msgid "Open All Messages"
+msgstr "Adčyni ŭsie paviedamleńni"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Majem novuju poštu!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Novaja siabroŭskaja začepka"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Majem novuju poštu!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Nastupnyja pluginy buduć adhružanyja."
 
@@ -12315,10 +12509,17 @@ msgstr "<b>Padrabiaznaści ab pluginie</b>"
 msgid "Select a file"
 msgstr "Abiary fajł"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Redahuj siabroŭskuju začepku"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Čyja začepka"
 
+msgid "_Account:"
+msgstr "_Kont:"
+
 msgid "_Buddy name:"
 msgstr "Nazva _siabra:"
 
@@ -12385,7 +12586,60 @@ msgstr "_Paŭtarajecca"
 msgid "Pounce Target"
 msgstr "Meta začepki"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Pačynaje pisać"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Prypyniajecca pisać"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Uvachodzić"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s viarnuŭsia ź biaździejańnia (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Viartajecca"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Spynijsia pisać"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Vychodzić"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Biaździejničaje"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Kali adyjšoŭ"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Dašli paviedamleńnie"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Nieviadomaja padzieja dla začepki. Kali łaska, adrapartuj ab hetym!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Pamyłka raspakavańnia matyvu smajłaŭ."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Pamyłka raspakavańnia matyvu smajłaŭ."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Pamyłka raspakavańnia matyvu smajłaŭ."
 
 msgid "Install Theme"
@@ -12407,6 +12661,12 @@ msgstr "Klavijaturnyja skaroty"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Začyniaj razmovy klavišaj Escape"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Śpis siabroŭ"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ikona systemnaha treju"
 
@@ -12416,8 +12676,9 @@ msgstr "_Pakazvaj ikonu systemnaha treju:"
 msgid "On unread messages"
 msgstr "Kali jość niepračytanyja paviedamleńni"
 
-msgid "Conversation Window Hiding"
-msgstr "Chavańnie vakna razmovy"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Vokny razmovaŭ"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Chavaj novyja pryvatnyja razmovy:"
@@ -12425,6 +12686,9 @@ msgstr "_Chavaj novyja pryvatnyja razmovy:"
 msgid "When away"
 msgstr "Kali adyjšoŭ"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_Minimalizuj novyja vokny razmovaŭ"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Kartki"
@@ -12483,9 +12747,6 @@ msgstr "Užyj miakkuju prakrutku"
 msgid "F_lash window when IMs are received"
 msgstr "Mir_haj vaknom, kali atrymanyja novyja paviedamleńni"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_Minimalizuj novyja vokny razmovaŭ"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimalnaja vyšynia absiahu ŭvodu, radkoŭ:"
 
@@ -12517,13 +12778,11 @@ msgstr "Niemahčyma ŭklučyć prahramu dziela kanfihuravańnie proxy."
 msgid "Cannot start browser configuration program."
 msgstr "Niemahčyma ŭklučyć prahramu dziela kanfihuravańnia hartača."
 
-msgid "ST_UN server:"
-msgstr "ST_UN server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Prykład: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Aŭtamatyčna vyznačaj IP adras"
 
 msgid "Public _IP:"
@@ -12544,6 +12803,10 @@ msgstr "_Pačatkovy port:"
 msgid "_End port:"
 msgstr "_Kancavy port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy-server & hartač"
 
@@ -12572,6 +12835,10 @@ msgstr "Proxy-server"
 msgid "No proxy"
 msgstr "Biaz proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Karystalnik:"
 
@@ -12735,12 +13002,12 @@ msgstr "Kali i adyjšoŭ, i biaździejny"
 msgid "Auto-away"
 msgstr "Aŭtamatyčny adychod"
 
-msgid "Change status when _idle"
-msgstr "Źmianiaj status, kali _biaździejničaju"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Chvilin da biaździejnaści:"
 
+msgid "Change status when _idle"
+msgstr "Źmianiaj status, kali _biaździejničaju"
+
 msgid "Change _status to:"
 msgstr "Źmianiaj _status na:"
 
@@ -12888,29 +13155,19 @@ msgstr "_Zapišy i ŭžyj"
 msgid "Status for %s"
 msgstr "Status dla %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Ustaŭ smajł"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Padvojnaje vypraŭleńnie."
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Abiary sabie nastroj sa śpisu."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Ustaŭ smajł"
@@ -12920,23 +13177,31 @@ msgid "Add Smiley"
 msgstr "Uśmichnisia!"
 
 #, fuzzy
-msgid "Smiley _Image"
-msgstr "Zapišy vyjavu"
+msgid "_Image:"
+msgstr "_Vyjava"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
-msgstr "Klavijaturnyja skaroty"
+msgid "S_hortcut text:"
+msgstr "Paradkuj"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Uśmichnisia!"
 
 #, fuzzy
+msgid "Shortcut Text"
+msgstr "Paradkuj"
+
+#, fuzzy
 msgid "Custom Smiley Manager"
 msgstr "Kiraŭnik sertyfikataŭ"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Abiary siabra"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Užyj hetuju siabroŭskuju _ikonu dziela hetaha kontu:"
 
@@ -13020,9 +13285,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Niemahčyma dasłać uruchamlalnik"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Ty pieraciahnuŭ uruchamlalnik prahramy sa stała. Chutčej za ŭsio, ty chočaš "
 "dasłać toje, na što jon pakazvaje, a nia sam uruchamlalnik."
@@ -13058,6 +13324,16 @@ msgstr ""
 "Niemahčyma zahruzić vyjavu '%s': pryčyna nieviadomaja, mahčyma, fajł vyjavy "
 "sapsavany"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Adčyniaj spasyłki ŭ:"
+
+msgid "_Copy Link Location"
+msgstr "_Skapijuj adras spasyłki"
+
+msgid "_Copy Email Address"
+msgstr "_Skapijuj adras email"
+
 msgid "Save File"
 msgstr "Zapišy fajł"
 
@@ -13152,6 +13428,78 @@ msgstr "Plugin praroctva dastupnaści kantaktu."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Pakazvaje statystyku dastupnaści tvaich siabroŭ"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Adras servera"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Akreśl server kanferencyj"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Abiary server kanferencyj dziela zapytaŭ"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online servisy"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Dašli śpis siabroŭ"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Adychodzić"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Kataloh logaŭ"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Vybar huku"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Pasłuha PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Apisańnie"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Źviestki ad znojdzienych pasłuhach"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Hartač:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Karystalnik nie isnuje"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server nie ŭžyvaje nivodzin z padtrymanych metadaŭ aŭtaryzacyi"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Źviestki ad znojdzienych pasłuhach"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP."
+
 msgid "Buddy is idle"
 msgstr "Siabra biaździejničaje"
 
@@ -13540,9 +13888,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plugin muzyčnych paviedamleńniaŭ dziela supolnaha pisańnia muzyki."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Plugin muzyčnych paviedamleńniaŭ dazvalaje niekalkim karystalnikam "
 "adnačasova pracavać nad adnym muzyčnym frahmentam, redahujučy ahulnyja noty "
@@ -13657,12 +14006,6 @@ msgstr ""
 "- Pieravaročvaje ŭsie ŭvachodnyja paviedamleńni\n"
 "- Dasyłaje paviedamleńnie ludziam z tvajho śpisu adrazu pa ichnym uvachodzie"
 
-msgid "Cursor Color"
-msgstr "Koler kursora"
-
-msgid "Secondary Cursor Color"
-msgstr "Druhi koler kursora"
-
 msgid "Hyperlink Color"
 msgstr "Koler hiperspasyłki"
 
@@ -13673,6 +14016,10 @@ msgstr "Koler hiperspasyłki"
 msgid "Highlighted Message Name Color"
 msgstr "Koler dla nazvaŭ padśvietlenych paviedamleńniaŭ"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Koler infarmavańnia pra nabor tekstu"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Haryzantalny padzieł GtkTreeView"
 
@@ -13702,35 +14049,24 @@ msgstr "Šryft interfejsu GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Matyŭ tekstavych skarotaŭ GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Kolery interfejsu"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Uklučy infarmavańni pra nabor tekstu"
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Kiravańnie matyvam GTK+ dla Pidgin'a"
 
-msgid "Widget Sizes"
-msgstr "Pamiery widgetaŭ"
+#, fuzzy
+msgid "Colors"
+msgstr "Začyni"
 
 msgid "Fonts"
 msgstr "Šryfty"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Fajłavaje pryładździe Gtkrc"
 
@@ -13815,9 +14151,10 @@ msgid "Conversation Window Send Button."
 msgstr "Knopka vysyłańnia dla voknaŭ razmovaŭ."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Dadaje knopku vysyłańnia da abšaru naboru tekstu akna razmovy. Zručna, kali "
 "niama sapraŭdnaj klavijatury."
@@ -13875,6 +14212,113 @@ msgstr ""
 "Zamianiaje tekst u vychodnych paviedamleńniach zhodna z akreślenymi "
 "karystalnikam praviłami."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Nie ŭvajšoŭ/uvajšła"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Nie ŭvajšoŭ/uvajšła"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Dałučysia da hutarki"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ihnaruj"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Hučniejšaja"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Aŭtaryzacyja dadzienaja"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Pamyłka"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Źviestki"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Dyjaloh zapytu"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Uzrovień aściarohi"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status dla %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Lakalnaść pakoju hutarki"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Zapišy ikonu"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Kiravańnie matyvam GTK+ dla Pidgin'a"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kantaktnaja infarmacyja"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Śpis siabroŭ"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Śpis siabroŭ"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Kiravańnie matyvam GTK+ dla Pidgin'a"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Kiravańnie matyvam GTK+ dla Pidgin'a"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14036,17 +14480,15 @@ msgstr "_Trymaj vakno sa śpisam siabroŭ naviersie:"
 msgid "Only when docked"
 msgstr "Tolki kali ŭbudavanaje"
 
-msgid "_Flash window when chat messages are received"
-msgstr "Mir_haj vaknom, kali atrymanyja novyja paviedamleńni ŭ hutarcy"
-
 msgid "Windows Pidgin Options"
 msgstr "Opcyi Pidgina dla Windowsa"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcyi Pidgina, admysłovyja dla Windowsa."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Daje opcyi Pidgina, admysłovyja dla Windowsa, naprykład, ubudoŭvańnie śpisu "
 "siabroŭ."
@@ -14088,6 +14530,554 @@ msgstr "Dasyłaj i atrymvaj suvoryja strofy XMPP."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Niemahčyma adčynić sokiet"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Niemahčyma słuchać sokiet"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Niemahčyma pračytać z sokieta"
+
+#~ msgid "Connection failed."
+#~ msgstr "Pamyłka spałučeńnia."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server adłučyŭsia"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Niemahčyma stvaryć sokiet"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Niemahčyma spałučycca z hostam"
+
+#~ msgid "Read error"
+#~ msgstr "Pamyłka čytańnia"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Niemahčyma spałučycca z serveram:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Pamyłka zapisu"
+
+#~ msgid "Last Activity"
+#~ msgstr "Apošniaja dziejnaść"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Źviestki ad znojdzienych pasłuhach"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Znojdzienyja pasłuhi"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Pašyranaja adrasacyja frazaŭ"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Ludnaja hutarka"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Pašyranyja źviestki ab udziele ŭ ludnaj hutarcy"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Bajtavyja płyni In-Band"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Zahady Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Pasłuha PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Bajtavyja płyni SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Źviestki Out of Band"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Rehistracyja In-Band"
+
+#~ msgid "User Location"
+#~ msgstr "Pałažeńnie karystalnika"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar karystalnika"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Infarmavańni ab statusie hutarki"
+
+#~ msgid "Software Version"
+#~ msgstr "Versija prahramy"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Inicyjacyja płyni"
+
+#~ msgid "User Mood"
+#~ msgstr "Nastroj karystalnika"
+
+#~ msgid "User Activity"
+#~ msgstr "Dziejnaść karystalnika"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Mahčymaści siabra"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Uzhadnieńnie šyfravanaj sesii"
+
+#~ msgid "User Tune"
+#~ msgstr "Pieśnia karystalnika"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Abmieńvańnie elementaŭ śpisu siabroŭ"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Adras dasiahalnaści"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil karystalnika"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle Audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "Mianuška karystalnika"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Suvory UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Atrymańnie paviedamleńniaŭ"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Supolny dostup da publičnaha kluča"
+
+#~ msgid "User Chatting"
+#~ msgstr "Karystalnik hutaryć"
+
+#~ msgid "User Browsing"
+#~ msgstr "Karystalnik u Siecivie"
+
+#~ msgid "User Gaming"
+#~ msgstr "Karystalnik hulajecca"
+
+#~ msgid "User Viewing"
+#~ msgstr "Karystalnik hladzić"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Šyfravańnie frazy"
+
+#~ msgid "Entity Time"
+#~ msgstr "Čas isnavańnia"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Adterminavanaja dastaŭka"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Supolnyja infarmacyjnyja abjekty"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Schovišča fajłaŭ i supolny dostup"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Pošuk pasłuh STUN dla Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Uzhadnieńnie sproščana šyfravanaj sesii"
+
+#~ msgid "Hop Check"
+#~ msgstr "Pravierka Hop"
+
+#~ msgid "Read Error"
+#~ msgstr "Pamyłka čytańnia"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Pamyłka spałučeńnia z serveram."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Bufer čytańnia zapoŭnieny (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Paviedamleńnie, jakoje niemahčyma razabrać"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Niemahčyma spałučycca z hostam: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Pamyłka ŭvachodu (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Ty vyjšaŭ, bo ŭvajšoŭ ź inšaha kamputara."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Pamyłka. Padtrymka SSL nie zainstalavanaja."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Niapravilny parol."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Niemahčyma spałučycca z serveram BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Ty možaš być chutka adłučany. Pravier aktualnaść na %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Niemahčyma spałučycca"
+
+#~ msgid "Invalid username."
+#~ msgstr "Niapravilnaja nazva."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Niemahčyma atrymać źviestki ab servery"
+
+#~ msgid "Connection lost"
+#~ msgstr "Spałučeńnie zhublenaje"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Niemahčyma vyjaśnić host"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Spałučeńnie začynienaje (zapis)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Pieraŭruchamleńie spałučeńnia"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Pamyłka čytańnia z sokietu: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Niemahčyma spałučycca z hostam"
+
+#~ msgid "Could not write"
+#~ msgstr "Niemahyma zapisać"
+
+#~ msgid "Could not connect"
+#~ msgstr "Niemahčyma spałučycca"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Niemahčyma stvaryć sokiet dziela słuchańnia"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Niemahčyma vyjaśnić nazvu hostu"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Niapravilny parol"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Niemahčyma spałučycca z %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonija"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japonski server pagera"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japonski server pieradačy fajłaŭ"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Spałučeńnie z serveram zhublenaje\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Niemahčyma vyjaśnić nazvu hostu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server vymahaje TLS/SSL, kab uvajści. Niama padtrymki TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Chavańnie vakna razmovy"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Abiary sabie nastroj sa śpisu."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Jaki ID aktyvizavać?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Koler kursora"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Druhi koler kursora"
+
+#~ msgid "Interface colors"
+#~ msgstr "Kolery interfejsu"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Pamiery widgetaŭ"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "Ustaŭ u paviedamleńnie"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Akreśl nazvu karystalnika, jakoha ty chočaš zaprasić, razam ź "
+#~ "nieabaviazkovym tekstam zaprašeńnia."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Niemahčyma atrymać adrasnuju knihu MSN"
+
+#, fuzzy
+#~ msgid "Connection to server lost (no data received within %d second)"
+#~ msgid_plural ""
+#~ "Connection to server lost (no data received within %d seconds)"
+#~ msgstr[0] ""
+#~ "Spałučeńnie z serveram stračanaje (niama źviestak ciaham %d sekundaŭ)"
+#~ msgstr[1] ""
+#~ "Spałučeńnie z serveram stračanaje (niama źviestak ciaham %d sekundaŭ)"
+#~ msgstr[2] ""
+#~ "Spałučeńnie z serveram stračanaje (niama źviestak ciaham %d sekundaŭ)"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Ty možaš być chutka adłučany. Ty možaš užyć TOC, pakul heta nia budzie "
+#~ "vypraŭlena. Pravier aktualnaść na %s."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Dadaj siabra"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Niemahčyma atrymać źviestki ab servery"
+
+#~ msgid "Keep alive error"
+#~ msgstr "Pamyłka padtrymki aktyŭnaha stanu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "Spałučeńnie z serversm stračanaje:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Spałučysia z serveram"
+
+#~ msgid "Failed to send IM."
+#~ msgstr "Pamyłka dasyłańnia IM."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Pošuk %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Pamyłka spałučeńnia z %s"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Uvachod: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Niemahčyma zapisać fajł %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Niemahčyma pračytać fajł %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Paviedamleńnie nadta daŭhoje, apošnija %s bajtaŭ abatnutyja."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s dziejna nia spałučany/spałučanaja."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Aściaroha dla %s nie dazvolenaja."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "Paviedamleńnie nie pryniataje, ty pieravysiŭ limit chutkaści servera."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Hutarka ŭ %s niedastupnaja."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Ty dasyłaješ paviedamleńni da %s nadta chutka."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Ty zhubiŭ paviedamleńnie ad %s, bo jano było nadta daŭhim."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Ty zhubiŭ paviedamleńnie ad %s, bo jano buło dasłanaje nadta chutka."
+
+#~ msgid "Failure."
+#~ msgstr "Pamyłka."
+
+#~ msgid "Too many matches."
+#~ msgstr "Nadta šmat adpaviednikaŭ."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Treba bolš udakładnieńniaŭ."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Servis katalohu časova niedastupny."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Pošuk pavodle e-maiłu abmiežavany."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Klučavoje słova ihnaravanaje."
+
+#~ msgid "No keywords."
+#~ msgstr "Niama klučavych słovaŭ."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Karystalnik nia maje źviestak z katalohu."
+
+#~ msgid "Country not supported."
+#~ msgstr "Kraina nie padtrymvajecca."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Nieviadomaja pamyłka: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Niapravilnaja nazva karystalnika albo parol."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Servis časova niedastupny."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Tvoj uzrovień aściarohi nadta vysoki, kab uvachodzić."
+
+#~ 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 ""
+#~ "Ty spałučajeśsia j adłučajeśsia nadta časta. Pačakaj 10 chvilin i "
+#~ "pasprabuj znoŭ. Kali ty praciahnieš tak rabić, tabie pryjdziecca pačakać "
+#~ "jašče daŭžej."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Adbyłasia nieviadomaja pamyłka ŭvachodu: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Adbyłasia nieviadomaja pamyłka %d. Źviestki: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Niapravilnaja nazva hrupy"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Spałučeńnie začynienaje."
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Čakańnie adkazu..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "TOC viarnuŭsia paśla pierapynku. Ciapier ty znoŭ možaš dasyłać "
+#~ "paviedamleńni."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Parol paśpiachova źmienieny"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Atrymaj źviestki z katalohu"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Akreśl źviestki dla katalohu"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Niemahčyma adčynić %s dziela zapisu!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Pamyłka pieradačy fajłu; aperacyja, mabyć, anulavanaja z taho boku."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Niemahčyma spałučycca dziela pieradačy."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Niemahčyma zapisać zahałovak fajłu. Fajł nia budzie pieradadzieny."
+
+#~ msgid "Save As..."
+#~ msgstr "Zapišy jak..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s prosić %s pryniać %d fajł: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s prosić %s pryniać %d fajły: %s (%.2f %s)%s%s"
+#~ msgstr[2] "%s prosić %s pryniać %d fajłaŭ: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s prosić ciabie dasłać jamu fajł"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Plugin pratakołu TOC"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Źviestki ab karystalniku %s niedastupnyja"
+
+#~ msgid "%s Options"
+#~ msgstr "Opcyi %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Opcyi proxy"
+
+#~ msgid "By log size"
+#~ msgstr "Pavodle pamieru logaŭ"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Adčyni spasyłku ŭ hartačy"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN server:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Zapišy vyjavu"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Klavijaturnyja skaroty"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "Mir_haj vaknom, kali atrymanyja novyja paviedamleńni ŭ hutarcy"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "Hrupa z takoj nazvaj užo isnuje."
 
@@ -14189,13 +15179,6 @@ msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP
 #~ msgid "Change Qun information"
 #~ msgstr "Źviestki ab kanale"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "Systemnaje paviedamleńnie"
 
@@ -14342,9 +15325,6 @@ msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP
 #~ msgstr ""
 #~ "Tvaja prośba dałučycca da hrupy %d była zadavolenaja administrataram %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Hetaja hrupa dadadzienaja ŭ tvoj śpis siabroŭ"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Ja prašu dałučeńnia"
 
@@ -14366,15 +15346,9 @@ msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP
 #~ msgid "Enter your reason:"
 #~ msgstr "Akreśl pryčynu:"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Pamyłka zapytu znaku ŭvachodu"
-
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Niemahčyma ŭvajści. Pravier debugavy log."
 
-#~ msgid "Unable to login"
-#~ msgstr "Niemahčyma ŭvajści"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP adras"
 
diff --git a/po/bg.po b/po/bg.po
index 01a9d30454..b955bfe312 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin-1.30\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-02-12 00:46+0200\n"
 "Last-Translator: Vladimir \"Kaladan\" Petkov <kaladan@gmail.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -32,7 +32,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -630,21 +630,6 @@ msgid "Send To"
 msgstr "_Изпращане до"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "Вмъкване в съобщение"
-
-msgid "Invite"
-msgstr "Покана"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Въведете името на потребителя, който желаете да поканите заедно със "
-"съобщение за покана."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "Разговори"
 
@@ -900,6 +885,43 @@ msgid "System Log"
 msgstr "Дневник на системата"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "Изчисляване..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "Прием_ане"
+
+#, fuzzy
+msgid "Reject"
+msgstr "Изчистване"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Вие напуснахте канал%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "Е-поща"
 
@@ -936,6 +958,9 @@ msgstr "Свързване"
 msgid "IM"
 msgstr "Съобщение"
 
+msgid "Invite"
+msgstr "Покана"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(без име)"
@@ -1160,7 +1185,6 @@ msgstr "%s премина в състояние „Няма ме“. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s иска да ви изпрати %s (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1216,7 +1240,6 @@ msgstr "_Минути преди преминаване в състояние �
 msgid "Change status to"
 msgstr "Промяна на адреса До:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Разговори"
 
@@ -1562,7 +1585,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr ""
 
-#, c-format
 msgid "Online"
 msgstr "Включен"
 
@@ -1611,6 +1633,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "акаунти"
 
@@ -1709,15 +1753,6 @@ msgstr "Да се приеме ли поканата за разговор?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "Прием_ане"
-
-#, fuzzy
-msgid "Reject"
-msgstr "Изчистване"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1808,6 +1843,8 @@ msgstr "%s влезе"
 msgid "+++ %s signed off"
 msgstr "%s излезе"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
@@ -1856,6 +1893,18 @@ msgstr "%s напусна стаята."
 msgid "%s left the room (%s)."
 msgstr "%s напусна стаята (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Канене в конференция"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Въведете името на потребителя, който желаете да поканите заедно със "
+"съобщение за покана."
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "Не може да бъде установена нова връзка."
@@ -1990,7 +2039,6 @@ msgstr ""
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Изпращането на файл завърши"
 
@@ -1998,7 +2046,6 @@ msgstr "Изпращането на файл завърши"
 msgid "You canceled the transfer of %s"
 msgstr "Отказахте получаването на файл от %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Прехвърлянето на файл е прекъснато"
 
@@ -2179,11 +2226,14 @@ msgstr "<font color=\"red\"><b>Файлът не може да бъде проч
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <автоматичен отговор>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Грешка при установяването на връзката"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2593,7 +2643,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2644,7 +2694,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2673,6 +2723,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Въведете парола"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2868,19 +2944,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Не може да бъде установена нова връзка."
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Първо име"
 
@@ -2915,6 +2990,11 @@ msgstr "Приставка за протокола Bonjour"
 msgid "Purple Person"
 msgstr "Нов потребител"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "_Форматиране на дневника:"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2926,16 +3006,16 @@ msgstr "%s затвори прозореца за разговор."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Съобщението не може да бъде изпратено: Твърде е голямо."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Не мога да вляза в %s:"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Грешка при създаване на сокет"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Грешка при създаване на сокет"
 
-#, fuzzy
-msgid "Could not listen on socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
 msgstr "Грешка при създаване на сокет"
 
 #, fuzzy
@@ -2986,14 +3066,16 @@ msgstr "Запазване на списъка с приятели..."
 msgid "Load buddylist from file..."
 msgstr "Зареждане на списък с приятели от файл..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Попълнете полетата за регистрация."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Паролите не съвпадат."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Не може да бъде установена нова връзка."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3006,16 +3088,15 @@ msgstr "Регистрацията успешна"
 msgid "Password"
 msgstr "Парола"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Парола (отново)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s в момента не е свързан."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "В момента е в"
+msgid "Captcha"
+msgstr "Запазване на изображение"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Регистриране на нов акаунт за Gadu-Gadu"
@@ -3069,6 +3150,17 @@ msgstr "Паролата е променена успешно!"
 msgid "Current password"
 msgstr "Текуща парола"
 
+msgid "Password (retype)"
+msgstr "Парола (отново)"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s в момента не е свързан."
+
+#, fuzzy
+msgid "Current token"
+msgstr "В момента е в"
+
 #, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Въведете настоящата и новата си парола."
@@ -3083,13 +3175,13 @@ msgstr "Избор на шрифт"
 msgid "Add to chat..."
 msgstr "Добавяне към разговор..."
 
+#. Global
 msgid "Available"
 msgstr "На разположение"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Няма ме"
 
@@ -3118,8 +3210,9 @@ msgstr "Няма съвпадащи потребители"
 msgid "There are no users matching your search criteria."
 msgstr "Няма потребители, които да отговарят на вашите изисквания."
 
-msgid "Unable to read socket"
-msgstr ""
+#, fuzzy
+msgid "Unable to read from socket"
+msgstr "Грешка при четене през мрежата"
 
 msgid "Buddy list downloaded"
 msgstr "Списъкът с приятели е изтеглен"
@@ -3133,8 +3226,14 @@ msgstr "Списъкът с приятели е качен"
 msgid "Your buddy list was stored on the server."
 msgstr "Списъкът ви с приятели вече се съхранява на сървъра."
 
-msgid "Connection failed."
-msgstr "Неуспешен опит за връзка."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Свързване"
+
+msgid "Connection failed"
+msgstr "Неуспешен опит за връзка"
 
 msgid "Add to chat"
 msgstr "Добавяне за разговор"
@@ -3142,13 +3241,23 @@ msgstr "Добавяне за разговор"
 msgid "Chat _name:"
 msgstr "Име:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Неуспешно свързване със сървъра."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Свързване"
+
 msgid "Chat error"
 msgstr "Грешка при разговора"
 
 msgid "This chat name is already in use"
 msgstr "Това име вече се използва от някой друг"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Не сте свързван със сървъра."
 
 msgid "Find buddies..."
@@ -3190,6 +3299,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Потребител на Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Задаване данни на потребител..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Непозната команда: %s"
@@ -3205,7 +3318,7 @@ msgid "File Transfer Failed"
 msgstr "Преноса на файла е неуспешен"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin не може да отвори порт за слушане."
 
 msgid "Error displaying MOTD"
@@ -3221,8 +3334,16 @@ msgstr "Няма съобщение за деня, свързано с тази
 msgid "MOTD for %s"
 msgstr "Съобщение за деня за %s"
 
-msgid "Server has disconnected"
-msgstr "Сървъра се изключи"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Не сте свързван със сървъра."
 
 msgid "View MOTD"
 msgstr "Показване съобщението за деня"
@@ -3233,25 +3354,24 @@ msgstr "_Канал:"
 msgid "_Password:"
 msgstr "_Парола:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Потребителските имена в IRC не може да съдържат интервали"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Свързване"
-
 msgid "SSL support unavailable"
 msgstr "Няма поддръжка на SSL"
 
-msgid "Couldn't create socket"
-msgstr "Грешка при създаване на сокет"
+msgid "Unable to connect"
+msgstr "Неуспешно свързване"
 
-msgid "Couldn't connect to host"
-msgstr "Неуспешна връзка със сървъра"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Невъзможност за връзка със сървъра"
 
-msgid "Read error"
-msgstr "Грешка при четенето"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Грешка при установяването на връзката"
 
 msgid "Users"
 msgstr "Потребители"
@@ -3432,6 +3552,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Това име вече се използва от някой друг"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Псевдоним"
+
 msgid "Cannot change nick"
 msgstr "Потребителското име не може да бъде променено"
 
@@ -3632,11 +3763,12 @@ msgstr "Командата е изключена"
 msgid "execute"
 msgstr "Неочакван"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Сървърът изисква TLS или SSL за влизане. Нямаме поддръжка на TLS/SSL."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Сървърът изисква TLS или SSL за влизане. Нямаме поддръжка на TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3653,19 +3785,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Парола в чист текст"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Неуспешна идентификация"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Неправилен отговор от сървъра."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Сървърът не използва никой поддържан метод за идентификация"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Грешка при четенето"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Няма посочена причина."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Тази версия не е поддържана"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "Неуспено свързване със сървъра."
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Неуспено свързване със сървъра."
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Не може да бъде установена нова връзка."
+
 msgid "Full Name"
 msgstr "Пълно име"
 
@@ -3732,186 +3895,9 @@ msgstr "Град"
 msgid "Operating System"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Задаване данните на директорията"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Разширен адрес"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Заглавие за разговор"
-
 #, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "В директорията няма данни за този потребител."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Команда"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Грешка при регистрацията"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Местонахождение"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "Търсене за потребители"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Известяване за състоянието на потребител"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Тази версия не е поддържана"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Ориентация"
-
-msgid "File Transfer"
-msgstr "Пренос на файлове"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Режими на потребителя"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Ограничение на потребителите"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Възможности"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Потребителско име"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Е-поща"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Профил в MSN"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "_Включване"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Потребителско име"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Живо видео"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Съобщението е получено"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Файл с публичния ключ"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Настройки за потребител"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Режими на потребителя"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Потребителско име"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Ограничение на потребителите"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Криптиране на Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Възможности"
+msgid "Local Time"
+msgstr "Локален файл:"
 
 msgid "Priority"
 msgstr "Приоритет"
@@ -3919,6 +3905,14 @@ msgstr "Приоритет"
 msgid "Resource"
 msgstr "Име на ресурса"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Вече сте свързан в"
+
 msgid "Middle Name"
 msgstr "Второ име"
 
@@ -3967,7 +3961,6 @@ msgstr ""
 msgid "Extended Away"
 msgstr "Продължително състояние „Няма ме“"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Не ме безпокойте"
 
@@ -4091,28 +4084,27 @@ msgstr ""
 msgid "Find Rooms"
 msgstr "Търсене за стаи"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Псевдоним:"
 
-msgid "Write error"
-msgstr "Грешка при запис"
+#, fuzzy
+msgid "No users found"
+msgstr "Няма съвпадащи потребители"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Обикновен текст"
+msgid "Roles:"
+msgstr "Описание на длъжността"
 
-msgid "Read Error"
-msgstr "Грешка при четене"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Обикновен текст"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "Грешка при създаване на сокет"
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "Невалиден ID"
@@ -4120,6 +4112,10 @@ msgstr "Невалиден ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Неуспешно свързване със сървъра."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Успешна регистрация на %s@%s"
@@ -4146,9 +4142,6 @@ msgstr "Регистрацията успешна"
 msgid "Unregistration Failed"
 msgstr "Неуспешна регистрация"
 
-msgid "Already Registered"
-msgstr "Вече сте регистриран"
-
 msgid "State"
 msgstr "Състояние"
 
@@ -4162,6 +4155,9 @@ msgstr "Телефон"
 msgid "Date"
 msgstr "Дата"
 
+msgid "Already Registered"
+msgstr "Вече сте регистриран"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Регистрация"
@@ -4194,6 +4190,10 @@ msgid "Change Registration"
 msgstr "Промяна на адреса До:"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Неуспешно свързване със сървъра."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Грешка при промяна данните абонамента"
 
@@ -4213,9 +4213,18 @@ msgstr "Идентификация"
 msgid "Re-initializing Stream"
 msgstr "Повторно инициализиране на поток"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Не е разрешено"
 
+msgid "Mood"
+msgstr "Настроение"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Всички"
 
@@ -4237,12 +4246,6 @@ msgstr "Няма"
 msgid "Subscription"
 msgstr "Абонамент"
 
-msgid "Mood"
-msgstr "Настроение"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "Настроение"
@@ -4289,9 +4292,6 @@ msgstr "Вашата парола беше сменена."
 msgid "Error changing password"
 msgstr "Грешка при смяна на паролата"
 
-msgid "Password (again)"
-msgstr "Парола (отново)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Смяна на парола"
@@ -4488,15 +4488,21 @@ msgid "Unable to ping user %s"
 msgstr "Неуспех при забраната на потребителя %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4508,9 +4514,36 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr "%s влезе в (%s)"
 
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Неуспех при изпращането на съобщение до %s."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Неуспех при добавянето на потребител в %s (%s)"
+
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Неуспешна регистрация"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
 msgstr ""
+"Моля, въведете име на лицето, за което искате да видите повече информация."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "Избор на файл"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Покана за раз_говор"
 
 #, fuzzy
 msgid "config:  Configure a chat room."
@@ -4533,13 +4566,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4603,6 +4636,9 @@ msgstr "Сървър"
 msgid "File transfer proxies"
 msgstr "Порт за преност на файлове"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4642,6 +4678,14 @@ msgstr "Грешка при обработката на XML"
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Грешка при присъединяването към чат %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Грешка в чат %s"
+
 msgid "Create New Room"
 msgstr "Създаване на нова стая"
 
@@ -4658,13 +4702,32 @@ msgstr "_Настройване на стая"
 msgid "_Accept Defaults"
 msgstr "Прием_ане на стандартните настройки"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Грешка при присъединяването към чат %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Няма посочена причина."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Грешка в чат %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s ви изрита: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Изритан от %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Получи се грешка при отварянето на файла."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Преноса на файла е неуспешен"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Неуспешно запазване на изображение: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4691,10 +4754,6 @@ msgstr ""
 "Моля, въведете име на лицето, за което искате да видите повече информация."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "Избор на файл"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "Режими на потребителя"
 
@@ -4734,9 +4793,19 @@ msgstr "Действие"
 msgid "Select an action"
 msgstr "Избор на файл"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Неуспех при добавянето на \"%s\"."
+
+msgid "Buddy Add error"
+msgstr ""
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Добавяне към адресника"
+msgid "The username specified does not exist."
+msgstr "Новото форматиране е неправилно."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4962,7 +5031,7 @@ msgstr "Детски паспорт без родителско съгласие
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Абонаментът временно спрян."
 
@@ -4986,6 +5055,10 @@ msgstr "Предпочитан контакт"
 msgid "Non-IM Contacts"
 msgstr "Изтриване на контакт"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5054,6 +5127,13 @@ msgstr "Изпращане на мобилно съобщение."
 msgid "Page"
 msgstr "Страница"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Нива на предупреждение"
+
 msgid "Has you"
 msgstr "Ви има"
 
@@ -5096,6 +5176,14 @@ msgid "Album"
 msgstr "Adium"
 
 #, fuzzy
+msgid "Game Title"
+msgstr "Длъжност"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Длъжност"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "Име или номер в ICQ"
 
@@ -5133,9 +5221,6 @@ msgstr ""
 "Поддръжка на SSL е необходима за MNS. Инсталирайте SSL-библиотека. За повече "
 "информация вижте на адрес: http://Pidgin.sf.net/faq-ssl.php("
 
-msgid "Failed to connect to server."
-msgstr "Неуспешно свързване със сървъра."
-
 #, fuzzy
 msgid "Error retrieving profile"
 msgstr "Грешка при четене от сървъра"
@@ -5306,8 +5391,9 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
-msgstr "URL на профил"
+#, fuzzy
+msgid "View web profile"
+msgstr "Не е разрешено при състояние „Изключен“"
 
 #. *< type
 #. *< ui_requirement
@@ -5343,66 +5429,29 @@ msgstr "Неуспешна идентификация"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Неуспешна идентификация"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s не е валидна група."
-
-msgid "Unknown error."
-msgstr "Непозната грешка:"
-
-#, fuzzy, c-format
-msgid "%s on %s (%s)"
-msgstr "%s иска да ви изпрати %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s иска да ви изпрати файл"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Непозната грешка"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Неуспех при забраната на потребителя %s"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Неуспех при добавянето на потребител в %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Неуспех при блокирането на потребител в %s (%s)"
-
 #, fuzzy, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Файлът %s не може да бъде записан."
+msgid "Unknown error (%d)"
+msgstr "Непозната грешка"
 
-#, c-format
-msgid "%s could not be added because your buddy list is full."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s е невалидно име на сървър"
-
-msgid "Service Temporarily Unavailable."
-msgstr "Временно услугата не е налична."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Вие пропуснахте %hu съобщение от %s, тъй като то беше много голямо."
 
-msgid "Unable to rename group"
-msgstr "Групата не може да бъде преименувана"
-
-msgid "Unable to delete group"
-msgstr "Неуспех при изтриването на групата"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5435,9 +5484,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "Неуспешно свързване"
-
 msgid "Writing error"
 msgstr "Грешка при запис"
 
@@ -5450,13 +5496,16 @@ msgid ""
 "%s"
 msgstr "Непозната грешка номер %d."
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Нашия протокол не се поддържа от сървъра."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Грешка при прегледа на HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Връзката ви беше прекъсната, тъй като сте се включили от друго място."
 
 #, fuzzy
@@ -5464,7 +5513,7 @@ msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Услугата е временно недостъпна."
 
 #, fuzzy
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr "Връзката ви беше прекъсната. Понякога MSN-сървърите"
 
 #, fuzzy, c-format
@@ -5493,6 +5542,14 @@ msgstr "Изпращане на бисквитка"
 msgid "Retrieving buddy list"
 msgstr "Получаване на списъкът с приятели"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Няма ме на компютъра"
 
@@ -5529,14 +5586,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Потребителят %s (%s) иска да добави %s в списъка с приятелите си."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "Потребителят %s (%s) иска да добави %s в списъка с приятелите си."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Добавяне към адресника"
@@ -5545,13 +5594,6 @@ msgstr "Добавяне към адресника"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Искате ли да добавите този потребител към списъка с познатите си?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Неуспех при добавянето на \"%s\"."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "Новото форматиране е неправилно."
@@ -5559,6 +5601,9 @@ msgstr "Новото форматиране е неправилно."
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "URL на профил"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5573,18 +5618,63 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "Приставка за протокола AIM/ICQ"
 
-msgid "Missing Cipher"
-msgstr ""
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s не е валидна група."
 
-msgid "The RC4 cipher could not be found"
+msgid "Unknown error."
+msgstr "Непозната грешка:"
+
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
+msgstr "%s иска да ви изпрати %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Неуспех при добавянето на потребител в %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Неуспех при блокирането на потребител в %s (%s)"
+
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Файлът %s не може да бъде записан."
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, fuzzy, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s е невалидно име на сървър"
+
+msgid "Service Temporarily Unavailable."
+msgstr "Временно услугата не е налична."
+
+msgid "Unable to rename group"
+msgstr "Групата не може да бъде преименувана"
+
+msgid "Unable to delete group"
+msgstr "Неуспех при изтриването на групата"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Потребителят %s (%s) иска да добави %s в списъка с приятелите си."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Потребителят %s (%s) иска да добави %s в списъка с приятелите си."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "Стаи на потребителя"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "Грешка при четенето"
 
@@ -5595,13 +5685,23 @@ msgstr ""
 msgid "Logging in"
 msgstr "Записване в дневник"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "Без име"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "Не сте свързван със сървъра."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Изпращане на _съобщение"
@@ -5622,20 +5722,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "Без име"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_IM прозорци"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Свързване"
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "Неправилен отговор от сървъра."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5643,16 +5745,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Неправилно потребителско име или парола."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "Приключване на връзката"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Неуспешен опит за присъединяване към приятелски чат"
 
@@ -5663,14 +5772,6 @@ msgstr "Зареждане на списък с приятели от файл..
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "Стаи на потребителя"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Неуспешен опит за присъединяване към приятелски чат"
@@ -5681,39 +5782,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "Приключване на връзката"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Опашката е запълнена"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Съобщението не може да бъде прегледано"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Неуспешна връзка със сървъра"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "_IM прозорци"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "Неправилен отговор от сървъра."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5762,10 +5840,6 @@ msgid "User"
 msgstr "Потребители"
 
 #, fuzzy
-msgid "Profile"
-msgstr "Профил в MSN"
-
-#, fuzzy
 msgid "Headline"
 msgstr "_Отказ"
 
@@ -5780,15 +5854,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "Затваряне на разговор"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "Без име"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5801,6 +5870,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "В тази тема няма налични картинки за усмивки."
@@ -5809,6 +5881,14 @@ msgstr "В тази тема няма налични картинки за ус�
 msgid "Please try another username:"
 msgstr "Въведете новата парола"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "Без име"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6005,10 +6085,6 @@ msgstr "Не можете да се добавите"
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "Неправилно потребителско име или парола."
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6051,9 +6127,9 @@ msgstr "Потребителят е или в режим \"изключен\" и
 msgid "Unknown error: 0x%X"
 msgstr "Непозната грешка: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Неуспешна идентификация (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Неуспех при забраната на потребителя %s"
 
 #, fuzzy, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6154,9 +6230,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr "Идентификация..."
 
-msgid "Unable to connect to server."
-msgstr "Неуспешно свързване със сървъра."
-
 msgid "Waiting for response..."
 msgstr "Изчакване за отговор..."
 
@@ -6178,9 +6251,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Искате ли да запишете новия на негово място?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Връзката беше прекъсната, тъй като се включихте от друга машина."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6188,15 +6258,11 @@ msgstr ""
 
 #, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Моля, напишете името на потребителя, на когото искате да забраните достъпа."
 
-msgid "Error. SSL support is not installed."
-msgstr ""
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -6220,6 +6286,26 @@ msgid "Server port"
 msgstr "Порт"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Неправилен отговор от сървъра."
+
+#. username connecting too frequently
+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 ""
+"Влизахте и излизахте твърде често. Изчакайте десет минути и опитайте  "
+"отново. Ако продължите с опитите си да влезете сега, ще трябва да чакате още "
+"по-дълго."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Грешка при установяването на връзката"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Неуспех при свързването"
 
@@ -6228,17 +6314,7 @@ msgid "Invalid chat room name"
 msgstr "Невалидно име на стая"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Грешка при установяването на връзката"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Не сте свързван със сървъра."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Неуспено свързване със сървъра."
 
 #. *< type
@@ -6290,8 +6366,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Неуспено свързване със сървъра."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6460,23 +6537,18 @@ msgstr "Камера"
 msgid "Screen Sharing"
 msgstr "Име или номер в ICQ"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Свободен за разговор"
 
-#, c-format
 msgid "Not Available"
 msgstr "Не съм свободен"
 
-#, c-format
 msgid "Occupied"
 msgstr "Зает"
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr "Невидим"
 
@@ -6490,15 +6562,11 @@ msgid "Buddy Comment"
 msgstr "Коментар за приятел"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Не може да бъде установена връзка за трансфер."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr "Неуспешно свързване със сървъра."
 
 #, fuzzy
@@ -6514,52 +6582,61 @@ msgstr "Приключване на връзката"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Връзката със сървъра беше прекъсната."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "Невалидно потребителско име"
+msgid "Unable to get a valid AIM login hash."
+msgstr "Файлът %s не може да бъде прочетен."
 
-msgid "Incorrect password."
-msgstr "Невярна парола."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Файлът %s не може да бъде прочетен."
+
+msgid "Received authorization"
+msgstr "Получено е разрешение"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Няма такъв потребител"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Абонаментът временно спрян."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Влизахте и излизахте твърде често. Изчакайте десет минути и опитайте  "
-"отново. Ако продължите с опитите си да влезете сега, ще трябва да чакате още "
-"по-дълго."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Версията на програмата, която използвате е твърде стара. Актуализирайте я от "
 "%s"
 
-msgid "Could Not Connect"
-msgstr "Неуспех при свързването"
-
-msgid "Received authorization"
-msgstr "Получено е разрешение"
-
-msgid "The SecurID key entered is invalid."
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
+"Влизахте и излизахте твърде често. Изчакайте десет минути и опитайте  "
+"отново. Ако продължите с опитите си да влезете сега, ще трябва да чакате още "
+"по-дълго."
+
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "Новото форматиране е неправилно."
 
 msgid "Enter SecurID"
 msgstr ""
@@ -6574,24 +6651,6 @@ msgstr ""
 msgid "_OK"
 msgstr "Да"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Файлът %s не може да бъде прочетен."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Връзката със сървъра беше прекъсната."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Файлът %s не може да бъде прочетен."
-
 msgid "Password sent"
 msgstr "Паролата е изпратена"
 
@@ -6718,7 +6777,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Вие пропуснахте %hu от %s съобщение по неизвестни причини."
 msgstr[1] "Вие пропуснахте %hu от %s съобщения по неизвестни причини."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Съобщението не може да бъде изпратено: %s"
@@ -6740,6 +6799,13 @@ msgstr "Включен от"
 msgid "Member Since"
 msgstr "Член от"
 
+msgid "Capabilities"
+msgstr "Възможности"
+
+#, fuzzy
+msgid "Profile"
+msgstr "Профил в MSN"
+
 msgid "Your AIM connection may be lost."
 msgstr "Връзката ви с AIM по всяка вероятност прекъсна."
 
@@ -6923,7 +6989,7 @@ msgstr "Съобщението за състояние е твърде дълг�
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6941,16 +7007,16 @@ msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
 msgstr ""
-"Pidgin не успя да изтегли списъкът с познатите ви от сървъра на AIM. Списъкът "
-"ви обаче не е загубен. Той по всяка вероятност ще бъде достъпен след няколко "
-"часа."
+"Pidgin не успя да изтегли списъкът с познатите ви от сървъра на AIM. "
+"Списъкът ви обаче не е загубен. Той по всяка вероятност ще бъде достъпен "
+"след няколко часа."
 
 msgid "Orphans"
 msgstr "Сираци"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "%s не може да бъде добавен в списъка, защото имате твърде много познати в "
@@ -6960,7 +7026,7 @@ msgid "(no name)"
 msgstr "(без име)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Бяхте изключен по неизвестни причини."
 
 #, fuzzy, c-format
@@ -7026,6 +7092,7 @@ msgstr "Свързване"
 msgid "Get AIM Info"
 msgstr "Показване на данни"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Редактиране на коментар"
 
@@ -7086,6 +7153,7 @@ msgstr "Търсене"
 msgid "Set User Info (web)..."
 msgstr "Задаване данни на потребител (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Смяна на паролата (URL)"
@@ -7121,6 +7189,10 @@ msgstr "Търсене на потребител по електронен ад�
 msgid "Search for Buddy by Information"
 msgstr "Търсене на потребител по неговите данни"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Потребителят не е влязъл"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7138,7 +7210,7 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr "Опит за пренасочване на връзката..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "Опит за пренасочване на връзката..."
 
@@ -7247,7 +7319,7 @@ msgstr "Opera"
 msgid "Visible"
 msgstr "Невидим"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7342,17 +7414,51 @@ msgstr "Последно актуализиране"
 msgid "Could not change buddy information."
 msgstr "Въведете име на потребител"
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "Длъжност"
+
+msgid "Note"
+msgstr "Бележка"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Икона на познат"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Добавяне на приятел"
+msgid "_Modify"
+msgstr "_Промяна"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "_Промяна"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Сървърът е зает"
+
+msgid "Your request was accepted."
+msgstr ""
 
-msgid "Input answer here"
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Запитване за разрешение"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Да се добави ли потребителят в списъка ви?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Папката не може да бъде изпратена."
+
 #, fuzzy
 msgid "Send"
 msgstr "_Изпращане"
@@ -7365,19 +7471,20 @@ msgstr "Невалидно потребителско име"
 msgid "Authorization denied message:"
 msgstr "Съобщение за отказано разрешение:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Стартиране на идентификация"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Да се добави ли потребителят в списъка ви?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "Задаване на сървър за конференции"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7400,7 +7507,7 @@ msgid "Failed sending authorize"
 msgstr "Моля, разрешете ми!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Неуспешен опит за присъединяване към приятелски чат"
 
 #, fuzzy, c-format
@@ -7446,6 +7553,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Невалидни настройки на прокси-сървъра."
+
+#, fuzzy
 msgid "Not member"
 msgstr "Член от"
 
@@ -7488,15 +7599,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "Включване в разговор"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Телефонен номер"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7507,7 +7621,7 @@ msgstr "Настройки на звуците"
 msgid "Failed:"
 msgstr "Прекъснал"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7519,11 +7633,11 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Телефонен номер"
 
 #, fuzzy
@@ -7534,7 +7648,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Искате ли да запишете новия на негово място?"
 
 #, fuzzy
@@ -7542,28 +7656,28 @@ msgid "Setup"
 msgstr "Зареждане при стартиране"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "Потребителят не е в групата"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "Потребителят не е в групата"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Неуспешен опит за присъединяване към приятелски чат"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Изтриване на потребител"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Изтриване на потребител"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7683,6 +7797,13 @@ msgstr "<b>Потребител:<b> %s<b>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Потребител:<b> %s<b>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Потребител:<b> %s<b>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7690,7 +7811,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Относно Pidgin"
 
 #, fuzzy
@@ -7711,6 +7832,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Относно Pidgin"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Домашен адрес"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7742,7 +7867,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Свързване"
@@ -7755,6 +7879,9 @@ msgstr "Порт"
 msgid "Show server news"
 msgstr "Сървър"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Грешка при четенето"
@@ -7764,11 +7891,7 @@ msgid "Update interval (seconds)"
 msgstr "Грешка при четенето"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Грешка при получаване данните на сървъра"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Грешка при получаване данните на сървъра"
 
 #, c-format
@@ -7791,21 +7914,19 @@ msgid "Activation required"
 msgstr "Изисква се регистрация"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "Грешка при четенето"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "Отговорът е отказан"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Провалена Yahoo!-идентификация"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7815,7 +7936,7 @@ msgstr "Запазване на изображение"
 msgid "Enter code"
 msgstr "Въведете парола"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7823,69 +7944,43 @@ msgid "Enter the text from the image"
 msgstr "Въведете име на групата, която искате да добавите."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Неуспешно свързване."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Непозната грешка"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "Не сте свързван със сървъра."
-
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Грешка при четене през мрежата"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Грешка при запис"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Връзката е прекъсната"
-
-#, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Задаване данни на потребител..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Отговорът е отказан"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Неуспешна връзка със сървъра"
+msgid "Unable to resolve hostname"
+msgstr "Неуспешно свързване със сървъра."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Невалидна грешка"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Сървър"
+msgid "Connecting to server"
+msgstr "Свързване към сървър"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Грешка при четене"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "Неуспешно запазване на изображение: %s\n"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7895,6 +7990,10 @@ msgid ""
 msgstr "Сървър"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s иска да ви изпрати %s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "От"
 
@@ -7904,32 +8003,30 @@ msgid ""
 "%s"
 msgstr "Данни за сървъра"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Причината е неизвестна."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Команда"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Грешка при получаване данните на сървъра"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Причината е неизвестна."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Причината е неизвестна."
 
 #, fuzzy, c-format
@@ -7944,10 +8041,6 @@ msgstr "Неуспешно изпращане на файл"
 msgid "%d canceled the transfer of %s"
 msgstr "%s прекъсна прехвърлянето на файл %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Връзката е прекъсната"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Потребител:<b> %s<b>"
@@ -8007,19 +8100,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Връзката е прекъсната"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Грешка при четенето от socket."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Невъзможност за връзка със сървъра"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8043,6 +8123,9 @@ msgstr "Говорители"
 msgid "Video Camera"
 msgstr "Видео камера"
 
+msgid "File Transfer"
+msgstr "Пренос на файлове"
+
 #, fuzzy
 msgid "Supports"
 msgstr "поддръжка"
@@ -8750,9 +8833,6 @@ msgstr "Организация"
 msgid "Unit"
 msgstr "Единица"
 
-msgid "Note"
-msgstr "Бележка"
-
 msgid "Join Chat"
 msgstr "Включване в разговор"
 
@@ -8839,6 +8919,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Статистика на мрежата"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Неуспешен ping"
 
@@ -8900,7 +8983,7 @@ msgid "Disconnected by server"
 msgstr "Изключен от сървъра"
 
 #, fuzzy
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Грешка при установяването на връзката"
 
 msgid "Key Exchange failed"
@@ -8910,18 +8993,11 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "Неуспешен опит за връзка"
-
 msgid "Performing key exchange"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Не може да бъде установена нова връзка."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Потребителското име не може да бъде променено"
 
 #. Progress
@@ -8929,11 +9005,15 @@ msgstr "Потребителското име не може да бъде про
 msgid "Connecting to SILC Server"
 msgstr "Свързване към сървър"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Потребителското име не може да бъде променено"
+
 msgid "Out of memory"
 msgstr "Няма достатъчно памет"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Приключване на връзката"
 
 #, fuzzy
@@ -9227,7 +9307,7 @@ msgid "Creating SILC key pair..."
 msgstr ""
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Потребителското име не може да бъде променено"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9320,6 +9400,10 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Няма възможни действия"
 
+#, fuzzy
+msgid "Error during connecting to SILC Server"
+msgstr "Грешка при установяването на връзката"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9361,7 +9445,7 @@ msgid "Failure: Authentication failed"
 msgstr "Неуспешна идентификация"
 
 #, fuzzy
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "Приключване на връзката"
 
 #, fuzzy
@@ -9369,33 +9453,29 @@ msgid "John Noname"
 msgstr "Без име"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Потребителското име не може да бъде променено"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Невъзможност за изпращане"
-
-#, fuzzy
-msgid "Could not connect"
-msgstr "Неуспех при свързването"
+msgid "Unable to create connection"
+msgstr "Не може да бъде установена нова връзка."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Причината е неизвестна."
 
 #, fuzzy
-msgid "Could not create listen socket"
+msgid "Unable to create listen socket"
 msgstr "Грешка при създаване на сокет"
 
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Неуспешна връзка със сървъра"
-
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Потребителските имена в IRC не може да съдържат интервали"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Порт"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9433,175 +9513,67 @@ msgstr "Потребител на Gadu-Gadu"
 msgid "Auth Domain"
 msgstr "Автоматично"
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Свързването с %s се провали"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Влизане: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Файлът %s не може да бъде записан."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Файлът %s не може да бъде прочетен."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Твърде дълго съобщение, последните %s байта бяха отрязани."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s в момента не е свързан."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Чата в %s не е достъпен."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Изпращате твърде бързо съобщения към %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Пропуснахте съобщение от %s, тъй като то беше твърде голямо."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Пропуснахте съобщение от %s, тъй като то беше изпратено твърде бързо."
-
-#, c-format
-msgid "Failure."
-msgstr "Грешка."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Твърде много съвпадения."
-
-#, c-format
-msgid "Need more qualifiers."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "Dir service temporarily unavailable."
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "Email lookup restricted."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-#, c-format
-msgid "Keyword ignored."
-msgstr "Ключовите думи са игнорирани."
-
-#, c-format
-msgid "No keywords."
-msgstr "Няма ключови думи."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "В директорията няма данни за този потребител."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Име в Yahoo!"
 
-#, c-format
-msgid "Country not supported."
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Модул за протокола Yahoo"
 
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
+#, fuzzy
+msgid "Pager server"
+msgstr "Сървър "
 
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Неправилно потребителско име или парола."
+msgid "Pager port"
+msgstr "Порт за пейджър"
 
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Услугата е временно недостъпна."
+#, fuzzy
+msgid "File transfer server"
+msgstr "Порт за преност на файлове"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
+msgid "File transfer port"
+msgstr "Порт за преност на файлове"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "Chat room locale"
 msgstr ""
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Получи се непозната грешка при влизането: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Получи се непозната грешка, %d. Подробности: %s"
-
-msgid "Invalid Groupname"
-msgstr "Невалидно име на група"
-
-msgid "Connection Closed"
-msgstr "Връзката е прекъсната"
-
-msgid "Waiting for reply..."
-msgstr "Изчакване за отговор..."
-
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC отново работи. Сега отново можете да изпращате съобщения."
-
-msgid "Password Change Successful"
-msgstr "Успешна смяна на паролата"
-
-msgid "_Group:"
-msgstr "_Група:"
-
-msgid "Get Dir Info"
-msgstr "Данни за директория"
-
-msgid "Set Dir Info"
-msgstr "Задаване данните на директорията"
-
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "%s не може да бъде отворен за запис!"
-
-msgid "File transfer failed; other side probably canceled."
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
-"Неуспешен пренос на файла. Получателят вероятно е отказал получаването."
 
-msgid "Could not connect for transfer."
-msgstr "Не може да бъде установена връзка за трансфер."
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Грешка при получаване списъка със стаите"
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat server"
 msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "Запазване на икона като..."
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s пита %s дали ще приеме %d файл: %s (%.2f %s)%s%s"
-msgstr[1] "%s питат %s дали ще приемат %d файлове: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s иска да им изпратите файл"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Име в Yahoo!"
 
 #. *< type
 #. *< ui_requirement
@@ -9613,11 +9585,11 @@ msgstr "%s иска да им изпратите файл"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Модул за протокола TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Модул за протокола Yahoo"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9642,6 +9614,30 @@ msgstr "%s отказа молбата ви да го/я добавите в л�
 msgid "Add buddy rejected"
 msgstr "Отказ за добавяне на потребител"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Неуспено свързване със сървъра."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "Абонаментът ви е заключен, моля влезте в страницата на Yahoo!"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "Абонаментът ви е заключен, моля влезте в страницата на Yahoo!"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Неправилно потребителско име или парола."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9673,13 +9669,14 @@ msgstr "Абонаментът ви е заключен, моля влезте �
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Потребителят %s не може да бъде добавен в група %s от списъка на сървърите "
 "на абонамент %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Потребителят не може да бъде добавен в списъка"
 
 #, c-format
@@ -9687,23 +9684,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Неправилен отговор от сървъра."
 
-msgid "Connection problem"
-msgstr "Проблем с връзката"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Не сте свързван със сървъра."
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr "Не сте свързван със сървъра."
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Неуспено свързване със сървъра."
 
 msgid "Not at Home"
 msgstr "Не е вкъщи"
@@ -9756,9 +9746,8 @@ msgstr "Използване на настройките от средата"
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Активиране на коя идентификация?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Присъединяване към кого в чата?"
@@ -9775,80 +9764,15 @@ msgstr "Присъедини се към потребителя в чата..."
 msgid "Open Inbox"
 msgstr "Отваряне на пощенската кутия в Hotmail"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Име в Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Модул за протокола Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Сървър "
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Порт за пейджър"
-
-msgid "Pager port"
-msgstr "Порт за пейджър"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Порт за преност на файлове"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Порт за трансфер на файлове"
-
-msgid "File transfer port"
-msgstr "Порт за преност на файлове"
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Грешка при получаване списъка със стаите"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Неуспешно свързване."
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9856,6 +9780,10 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Съобщението не може да бъде изпратено."
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Грешка при запис"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Профил в Yahoo! Japan"
 
@@ -9901,14 +9829,9 @@ msgstr "Готина връзка 3"
 msgid "Last Update"
 msgstr "Последно актуализиране"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Няма налични данни за %s"
-
 #, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr "Извиняваме се, но не-английски профили засега не се поддържат."
 
 msgid ""
@@ -9975,6 +9898,9 @@ msgstr "Гласoве"
 msgid "Webcams"
 msgstr "Уеб камери"
 
+msgid "Connection problem"
+msgstr "Проблем с връзката"
+
 #, fuzzy
 msgid "Unable to fetch room list."
 msgstr "Неуспешно свързване."
@@ -9983,15 +9909,9 @@ msgid "User Rooms"
 msgstr "Стаи на потребителя"
 
 #, fuzzy
-msgid "Connection problem with the YCHT server."
+msgid "Connection problem with the YCHT server"
 msgstr "Проблем с връзката"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Не сте свързван със сървъра."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10113,31 +10033,21 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Грешка при създаване на сокет"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Съобщението не може да бъде изпратено: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Грешка при свързването с прокси-сървъра %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Достъпът отказан: сървърът-посредник отказва свързване през порт %d."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Грешка при четенето на %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Неуспешна връзка със сървъра"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10232,10 +10142,6 @@ msgstr "Не ме безпокойте"
 msgid "Extended away"
 msgstr "Продължително състояние „Няма ме“"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Длъжност"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10277,16 +10183,6 @@ msgstr "%s премина в състояние „Активен“"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Грешка при четенето на %s"
-
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr "Грешка при на вашият списък с познати. Списъкът не беше зареден."
-
 msgid "Calculating..."
 msgstr "Изчисляване..."
 
@@ -10392,6 +10288,16 @@ msgstr "Връзката е прекъсната"
 msgid "Address already in use."
 msgstr "Това име вече се използва от някой друг"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Грешка при четенето на %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr "Грешка при на вашият списък с познати. Списъкът не беше зареден."
+
 msgid "Internet Messenger"
 msgstr "Бързи съобщения"
 
@@ -10439,10 +10345,8 @@ msgstr "Известяване за нова е-поща"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s настройки"
+msgid "_Advanced"
+msgstr "_Допълнителни"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10478,9 +10382,6 @@ msgstr "Ако погледнете достатъчно близо"
 msgid "you can see the butterflies mating"
 msgstr "можете да видите пеперудите да се съчетават"
 
-msgid "Proxy Options"
-msgstr "Настройки за сървър-посредник"
-
 msgid "Proxy _type:"
 msgstr "_Вид сървър-посредник:"
 
@@ -10509,8 +10410,9 @@ msgstr "_Основни"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_Допълнителни"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Сървър-посредник"
 
 msgid "Enabled"
 msgstr "Активиран"
@@ -10548,8 +10450,8 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Списък със стаи"
+msgid "A_ccount"
+msgstr "Акаунт:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10557,8 +10459,9 @@ msgid ""
 msgstr ""
 "Въведете подходящите данни за разговора, в който искате да се включите.\n"
 
-msgid "_Account:"
-msgstr "_Акаунт:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Списък със стаи"
 
 msgid "_Block"
 msgstr "_Блокиране"
@@ -10577,6 +10480,17 @@ msgid "I_M"
 msgstr "_Съобщение"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "Доб_авяне на разговор"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Видео разговор"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "_Изпращане на файл"
 
@@ -10588,7 +10502,11 @@ msgid "View _Log"
 msgstr "Преглед на _дневник"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Не е разрешено при състояние „Изключен“"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Не е разрешено при състояние „Изключен“"
 
 msgid "_Alias..."
@@ -10729,6 +10647,10 @@ msgstr "/Инструменти/Познат"
 msgid "/Tools/_Certificates"
 msgstr "/Инструменти/На_стройки"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Инструменти/Уединение"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Инструменти/П_риставки"
 
@@ -10738,10 +10660,6 @@ msgstr "/Инструменти/На_стройки"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Инструменти/_Уединение"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Инструменти/Уединение"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Инструменти/Пренос на _файлове"
 
@@ -10866,8 +10784,8 @@ msgstr "Ръчно"
 msgid "By status"
 msgstr "По състояние"
 
-msgid "By log size"
-msgstr "По размер на дневника"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10885,6 +10803,9 @@ msgstr "Свързване"
 msgid "Re-enable"
 msgstr "Активиране на акаунт"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10982,6 +10903,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Псевдоним:"
 
+msgid "_Group:"
+msgstr "_Група:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11016,6 +10940,116 @@ msgstr "/Инструменти"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Познати/Подреждане на познатите"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Цвят на фона"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Потребителят %s (%s) иска да добави %s в списъка с приятелите си."
+
+#, fuzzy
+msgid "Layout"
+msgstr "Записване на всички _разговори"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Цвят на фона"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Разширяван_е"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Избор за цвят на фона"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Разгръщане"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Избор за цвят на фона"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Порт"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Включен"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Няма ме"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Изключен"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Настроение"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Съобщението е изпратено"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Промяна на данните за потребител %s"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11035,14 +11069,6 @@ msgstr "Не сте включени с абонамент, който може
 msgid "Invite Buddy Into Chat Room"
 msgstr "Покана към потребител в стая за разговори"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Въведете името на потребителя, който желаете да поканите заедно със "
-"съобщение за покана."
-
 msgid "_Buddy:"
 msgstr "_Приятел:"
 
@@ -11071,7 +11097,8 @@ msgstr "Игнориране"
 msgid "Get Away Message"
 msgstr "Съобщение за състоянието „Няма ме“"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Последно съобщение"
 
 msgid "Unable to save icon file to disk."
@@ -11120,6 +11147,22 @@ msgstr "/Разговор/_Запазване като..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Разговор/Изчистване"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Разговор/Затвар_яне"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Разговор/Затвар_яне"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Разговор/Затвар_яне"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Разговор/Преглед на _история"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Разговор/Изпращане _на файл..."
 
@@ -11197,6 +11240,18 @@ msgstr "/_Разговор"
 msgid "/Conversation/View Log"
 msgstr "/Разговори/Преглед на историята"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Разговор/Затвар_яне"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Разговори/Преглед на историята"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Разговор/Затвар_яне"
+
 msgid "/Conversation/Send File..."
 msgstr "/Разговори/Изпращане на файл..."
 
@@ -11393,6 +11448,9 @@ msgstr "Адрес"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "поддръжка"
 
@@ -11526,6 +11584,10 @@ msgid "Hungarian"
 msgstr "унгарски"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "румънски"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "македонски"
 
@@ -11543,6 +11605,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "Настоящи преводачи"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "Opera"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "Забранено"
 
@@ -11565,6 +11631,10 @@ msgid "Macedonian"
 msgstr "македонски"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "македонски"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "норвежки"
 
@@ -11623,6 +11693,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "шведски"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "тамил"
 
@@ -11679,12 +11752,29 @@ msgstr ""
 "Gadu-Gadu едновременно. Написан е чрез Gtk+.<BR><BR> Имате право да "
 "променяте и разпространявате  програмата под условията на лиценза GPL "
 "(версия 1 или по-нова) Копие на GPL може да бъде намерен във файла \"COPYING"
-"\", разпространяван с Pidgin. Правата за копиране на Pidgin са собственост на "
-"хората, които допринасят за неговото развитие. Програмата се разпространява "
-"без никакви гаранции.<BR><BR>"
+"\", разпространяван с Pidgin. Правата за копиране на Pidgin са собственост "
+"на хората, които допринасят за неговото развитие. Програмата се "
+"разпространява без никакви гаранции.<BR><BR>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin на irc.freenode.net<BR><BR>"
 
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin на irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11956,7 +12046,7 @@ msgid "Hyperlink visited color"
 msgstr "Цвят на хипер-връзките"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Цвят за оцветяване на хипер-връзките."
 
 #, fuzzy
@@ -11996,15 +12086,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Премахване на известяванията"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Известяване за нова е-поща"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12017,15 +12114,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Известяване за нова е-поща"
 
-msgid "_Copy Email Address"
-msgstr "_Копиране на адреса на ел. поща"
-
-msgid "_Open Link in Browser"
-msgstr "_Отваряне на връзката в браузър"
-
-msgid "_Copy Link Location"
-msgstr "_Копиране адреса на връзката"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12062,11 +12150,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Запазване на изображение"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Запазване на изображение..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12161,10 +12247,6 @@ msgid "Font Face"
 msgstr "Начертание на буквите"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Цвят на фона"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Цвят на шрифта на преден план"
 
@@ -12302,6 +12384,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12319,6 +12402,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12350,11 +12434,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Ping"
 
-msgid "Open All Messages"
-msgstr "Отваряне на всички съобщения"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Имате поща!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Изчисляване..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12383,6 +12483,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "Непознато съобщение"
+
+msgid "Open All Messages"
+msgstr "Отваряне на всички съобщения"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Имате поща!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Нов потребител"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Имате поща!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Следните приставки ще бъдат деактивирани."
 
@@ -12432,10 +12553,17 @@ msgstr "<b>Настройки на приставката</b>"
 msgid "Select a file"
 msgstr "Избор на файл"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Редакция"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Кога"
 
+msgid "_Account:"
+msgstr "_Акаунт:"
+
 msgid "_Buddy name:"
 msgstr "_Име на потребителя:"
 
@@ -12507,7 +12635,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr "Кога"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Събеседникът _започна да пише"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Потребителят пише..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Влизане"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s излезе от състояние „Бездействам“ (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Зав_ръщане от състояние „Няма ме“"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Събеседникът _престана да пише"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Излизане"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s премина в състояние „Бездействам“"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "При състояние \"Няма ме\""
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Изпращане на _съобщение"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Неуспех при зареждането на изображението"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12530,6 +12709,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Разговори с %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Списък с приятели"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Икона в системната лента"
 
@@ -12542,7 +12727,7 @@ msgid "On unread messages"
 msgstr "Непрочетени съобщения"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM прозорци за разговор"
 
 #, fuzzy
@@ -12552,6 +12737,10 @@ msgstr "Нови разговори:"
 msgid "When away"
 msgstr "При състояние \"Няма ме\""
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM прозорци за разговор"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12614,10 +12803,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Прозореца да примигва при получаване на ново съобщение"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM прозорци за разговор"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12651,13 +12836,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Грешка при получаване данните на потребителя"
 
-msgid "ST_UN server:"
-msgstr "ST_UN сървър:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Автоматично откриване на IP адрес"
 
 msgid "Public _IP:"
@@ -12678,6 +12861,10 @@ msgstr "_Начален порт:"
 msgid "_End port:"
 msgstr "Кра_ен порт:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "Сървър-посредник"
@@ -12707,6 +12894,10 @@ msgstr "Сървър-посредник"
 msgid "No proxy"
 msgstr "Без сървър-посредник"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Потребител:"
 
@@ -12875,14 +13066,14 @@ msgid "Auto-away"
 msgstr "Автоматично преминаване в „Няма ме“"
 
 #, fuzzy
-msgid "Change status when _idle"
-msgstr "Преминаване в състояние „Няма ме“ след активно състояние „Бездействам“"
-
-#, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Минути преди преминаване в състояние „Няма ме“:"
 
 #, fuzzy
+msgid "Change status when _idle"
+msgstr "Преминаване в състояние „Няма ме“ след активно състояние „Бездействам“"
+
+#, fuzzy
 msgid "Change _status to:"
 msgstr "Промяна на адреса До:"
 
@@ -13039,29 +13230,19 @@ msgstr "Запаз_ване и използване"
 msgid "Status for %s"
 msgstr "Състояние за %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Вмъкване на усмивка"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Файл с публичния ключ"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Въведете новата парола"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Вмъкване на усмивка"
@@ -13071,20 +13252,29 @@ msgid "Add Smiley"
 msgstr "Усмивка!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "Запазване на изображение"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Порт"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Усмивка!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Порт"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Избор на приятел"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13169,8 +13359,8 @@ msgid "Cannot send launcher"
 msgstr "Неуспех при изпращането на стартер"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13205,6 +13395,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "_Отваряне на връзката в:"
+
+msgid "_Copy Link Location"
+msgstr "_Копиране адреса на връзката"
+
+msgid "_Copy Email Address"
+msgstr "_Копиране на адреса на ел. поща"
+
+#, fuzzy
 msgid "Save File"
 msgstr "Запазване на файл..."
 
@@ -13304,6 +13504,76 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Сървър"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Задаване на сървър за конференции"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Избор на правилен потребител"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Интернет услуги"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Изпращане на списъка с познати"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Потребителят премина в състояние \"Няма ме\""
+
+#, fuzzy
+msgid "Directory"
+msgstr "Директория на дневниците"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Избор на звуци"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Описание"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Задаване данните на директорията"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Браузър:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Няма такъв потребител"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Сървърът не използва никой поддържан метод за идентификация"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Задаване данните на директорията"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "Потребителят е в състояние „Бездействам“"
 
@@ -13700,7 +13970,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13816,12 +14086,6 @@ msgstr ""
 "- Обръща всички входящи текстове\n"
 "- Изпраща съобщения на потребители от вашият лист веднага щом се появят."
 
-msgid "Cursor Color"
-msgstr "Цвят на показалеца"
-
-msgid "Secondary Cursor Color"
-msgstr "Втори цвят на показалеца"
-
 msgid "Hyperlink Color"
 msgstr "Цвят на връзките"
 
@@ -13833,6 +14097,10 @@ msgstr "Цвят на връзките"
 msgid "Highlighted Message Name Color"
 msgstr "Съобщения от разговор:"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Премахване на известяванията"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13865,35 +14133,24 @@ msgstr "Настройки на интерфейса GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Цветове на интерфейса"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Известяване за нова е-поща"
 
-msgid "Widget Sizes"
-msgstr "Размери на приспособлението"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin - контрол на файловете"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Затваряне"
 
 msgid "Fonts"
 msgstr "Шрифтове"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin - контрол на файловете"
@@ -13987,7 +14244,7 @@ msgstr "IM прозорци за разговор"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14042,6 +14299,113 @@ msgstr ""
 "Заменя текст в изходящите съобщения, според дефинирани от потребителя "
 "правила."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Не сте свързан с"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Не сте свързан с"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Включване в разговор"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Игнориране"
+
+#, fuzzy
+msgid "Founder"
+msgstr "По-шумно"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Получихте разрешение"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Грешка"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Служебна информация"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Отговорът е отказан"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Нива на предупреждение"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Състояние за %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Грешка при получаване списъка със стаите"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Запазване на икона"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin - контрол на файловете"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Данни за абонамента"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Списък с приятели"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Списък с приятели"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin - контрол на файловете"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin - контрол на файловете"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14211,10 +14575,6 @@ msgid "Only when docked"
 msgstr ""
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "_Прозореца да примигва при получаване на ново съобщение"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "Настройки за влизане"
 
@@ -14224,7 +14584,7 @@ msgstr "Специфични настройки на Windows Pidgin."
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "Специфични настройки на Windows Pidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14267,6 +14627,471 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Не мога да вляза в %s:"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Грешка при създаване на сокет"
+
+#~ msgid "Connection failed."
+#~ msgstr "Неуспешен опит за връзка."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Сървъра се изключи"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Грешка при създаване на сокет"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Неуспешна връзка със сървъра"
+
+#~ msgid "Read error"
+#~ msgstr "Грешка при четенето"
+
+#~ msgid "Write error"
+#~ msgstr "Грешка при запис"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Задаване данните на директорията"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Разширен адрес"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Заглавие за разговор"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "В директорията няма данни за този потребител."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Команда"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Грешка при регистрацията"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Местонахождение"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "Търсене за потребители"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Известяване за състоянието на потребител"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Тази версия не е поддържана"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Ориентация"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Режими на потребителя"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Ограничение на потребителите"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Възможности"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Потребителско име"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Е-поща"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Профил в MSN"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "_Включване"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Потребителско име"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Живо видео"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Съобщението е получено"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Файл с публичния ключ"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Настройки за потребител"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Режими на потребителя"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Потребителско име"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Ограничение на потребителите"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Криптиране на Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "Грешка при четене"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Неуспешно свързване със сървъра."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Опашката е запълнена"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Съобщението не може да бъде прегледано"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Неуспешна връзка със сървъра"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Неуспешна идентификация (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Неуспешно свързване със сървъра."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Връзката беше прекъсната, тъй като се включихте от друга машина."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Невярна парола."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Неуспешно свързване със сървъра."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Връзката със сървъра беше прекъсната."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Неуспех при свързването"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Невалидно потребителско име"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Грешка при получаване данните на сървъра"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Връзката е прекъсната"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Неуспешна връзка със сървъра"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Връзката е прекъсната"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Връзката е прекъсната"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Грешка при четенето от socket."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Невъзможност за връзка със сървъра"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Невъзможност за изпращане"
+
+#, fuzzy
+#~ msgid "Could not connect"
+#~ msgstr "Неуспех при свързването"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Грешка при създаване на сокет"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Неуспешна връзка със сървъра"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Невярна парола."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr "Не сте свързван със сървъра."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Порт за пейджър"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Порт за трансфер на файлове"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Не сте свързван със сървъра."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Неуспешна връзка със сървъра"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Сървърът изисква TLS или SSL за влизане. Нямаме поддръжка на TLS/SSL."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM прозорци за разговор"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Въведете новата парола"
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Активиране на коя идентификация?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Цвят на показалеца"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Втори цвят на показалеца"
+
+#~ msgid "Interface colors"
+#~ msgstr "Цветове на интерфейса"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Размери на приспособлението"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "Вмъкване в съобщение"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Въведете името на потребителя, който желаете да поканите заедно със "
+#~ "съобщение за покана."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Добавяне към адресника"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Добавяне на приятел"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Грешка при получаване данните на сървъра"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "Грешка при четенето"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "Не сте свързван със сървъра."
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Сървър"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "Неуспешно запазване на изображение: %s\n"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Свързването с %s се провали"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Влизане: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Файлът %s не може да бъде записан."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Файлът %s не може да бъде прочетен."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Твърде дълго съобщение, последните %s байта бяха отрязани."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s в момента не е свързан."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Чата в %s не е достъпен."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Изпращате твърде бързо съобщения към %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Пропуснахте съобщение от %s, тъй като то беше твърде голямо."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Пропуснахте съобщение от %s, тъй като то беше изпратено твърде бързо."
+
+#~ msgid "Failure."
+#~ msgstr "Грешка."
+
+#~ msgid "Too many matches."
+#~ msgstr "Твърде много съвпадения."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Ключовите думи са игнорирани."
+
+#~ msgid "No keywords."
+#~ msgstr "Няма ключови думи."
+
+#~ msgid "User has no directory information."
+#~ msgstr "В директорията няма данни за този потребител."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Неправилно потребителско име или парола."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Услугата е временно недостъпна."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Получи се непозната грешка при влизането: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Получи се непозната грешка, %d. Подробности: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Невалидно име на група"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Връзката е прекъсната"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Изчакване за отговор..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC отново работи. Сега отново можете да изпращате съобщения."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Успешна смяна на паролата"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Данни за директория"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Задаване данните на директорията"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "%s не може да бъде отворен за запис!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Неуспешен пренос на файла. Получателят вероятно е отказал получаването."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Не може да бъде установена връзка за трансфер."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Запазване на икона като..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s пита %s дали ще приеме %d файл: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s питат %s дали ще приемат %d файлове: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s иска да им изпратите файл"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Модул за протокола TOC"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Няма налични данни за %s"
+
+#~ msgid "%s Options"
+#~ msgstr "%s настройки"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Настройки за сървър-посредник"
+
+#~ msgid "By log size"
+#~ msgstr "По размер на дневника"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Отваряне на връзката в браузър"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN сървър:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Запазване на изображение"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Прозореца да примигва при получаване на ново съобщение"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "Вече съществува папка с това име"
 
@@ -14339,13 +15164,6 @@ msgstr ""
 #~ msgstr "Сигурни ли сте, че искате да изтриете %s?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s иска да ви изпрати %s (%s)"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Съобщение"
 
@@ -14484,10 +15302,6 @@ msgstr ""
 #~ msgid "Invalid screen name"
 #~ msgstr "Невалидно потребителско име"
 
-#, fuzzy
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Неуспено свързване със сървъра."
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "Твърде зъл (изпращач)"
 
@@ -14548,10 +15362,6 @@ msgstr ""
 #~ msgstr "Потребители в %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Потребителят %s (%s) иска да добави %s в списъка с приятелите си."
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "Грешка при регистрацията"
 
@@ -14560,10 +15370,6 @@ msgstr ""
 #~ msgstr "%s в момента не е свързан."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Грешка при установяването на връзката"
-
-#, fuzzy
 #~ msgid "TCP Address"
 #~ msgstr "IP адрес"
 
@@ -14670,18 +15476,10 @@ msgstr ""
 #~ msgstr "В момента е в"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Неуспешно свързване със сървъра."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Съобщение"
 
 #, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Акаунт:"
-
-#, fuzzy
 #~ msgid ""
 #~ "%s was disconnected due to the following error:\n"
 #~ "%s"
@@ -14918,8 +15716,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "Когато това се случи, TOC игнорира всички съобщения, изпращани до него. "
 #~ "Ако изпратите съобщение, може да ви изхвърли. Pidgin ще възпрепятства "
diff --git a/po/bn.po b/po/bn.po
index c2f0dc3ac2..f0988f07f9 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -4,31 +4,37 @@
 # Samia Nimatullah <mailsamia2001@yahoo.com>, 2005.
 # Tisa Nafisa <tisa_nafisa@yahoo.com>, 2007.
 # Jamil Ahmed <jamil@bengalinux.org>, 2007.
-# Israt Jahan <israt@ankur.org.bd>, 2008.
+# Israt Jahan <israt@ankur.org.bd>, 2008-2009.
+# Samia Niamatullah <samia@ankur.org.bd>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-27 10:17-0800\n"
-"PO-Revision-Date: 2008-11-13 17:07+0600\n"
-"Last-Translator: Israt Jahan <israt@ankur.org.bd>\n"
-"Language-Team: Bengali <core@bengalinux.org>\n"
+"POT-Creation-Date: 2009-07-22 14:13-0700\n"
+"PO-Revision-Date: 2009-07-21 18:20+0700\n"
+"Last-Translator: Samia <samia@ankur.org.bd>\n"
+"Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Language: Bengali\n"
+"X-Poedit-Country: BANGLADESH\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,213,212,-1\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 msgid "Finch"
-msgstr "Finch"
+msgstr "Finch "
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s। আরও তথ্য জানাতে `%s -h' দ্বারা চেষ্টা করুন।\n"
+msgstr "%s। আরও তথ্য জানতে `%s -h' দিয়ে চেষ্টা করুন।\n"
 
-#, fuzzy, c-format
+# Not sure if [OPTION] is a variable or not
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -40,13 +46,13 @@ msgid ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s\n"
-"ব্যবহার: %s [অপশন]...\n"
+"ব্যবহার: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    পছন্দসই ফাইলের জন্য DIR ব্যবহার করুন\n"
-"  -d, --debug         stdout এ ডিবাগিং বার্তা মুদ্রণ করুন\n"
-"  -h, --help          এই সহায়িকা প্রদর্শন করুন এবং ত্যাগ করুন\n"
-"  -n, --nologin       স্বয়ংক্রিয়ভাবে লগইন করবেন না\n"
-"  -v, --version       বর্তমান সংস্করণ প্রদর্শন করুন এবং ত্যাগ করুন\n"
+"  -c, --config=DIR    কনফিগারেশন ফাইলের জন্য DIR ব্যবহার করুন\n"
+"  -d, --debug         stderr এ ডিবাগিং বার্তা প্রিন্ট করুন\n"
+"  -h, --help          এই সহায়িকা প্রদর্শন করে প্রস্থান করুন\n"
+"  -n, --nologin       স্বয়ংক্রিয়ভাবে লগইন করা হবে না\n"
+"  -v, --version       বর্তমান সংস্করণ প্রদর্শন করে প্রস্থান করুন\n"
 
 # tithi
 #, c-format
@@ -55,55 +61,54 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%2s থেকে %3s এ আপনার বিন্যাসনসমূহ পরিবর্তন করতে %1s ত্রুটির সম্মুখীন হয়েছে। অনুগ্রহ "
-"করে তদন্ত করুন এবং নিজের হাতে পরিবর্তন শেষ করুন। অনুগ্রহ করে http://developer."
-"pidgin.im এ এই ত্রুটিটির প্রতিবেদন পাঠান"
+"আপনার সেটিং %2$s থেকে %3$s তে স্থানান্তর করতে %1$s ত্রুটির সম্মুখীন হয়েছে। অনুগ্রহ "
+"করে তদন্ত করুন এবং নিজ হাতে স্থানান্তর শেষ করুন। অনুগ্রহ করে এই ত্রুটিটির রিপোর্ট "
+"http://developer.pidgin.im এ পাঠান।"
 
 msgid "Error"
 msgstr "ত্রুটি"
 
 msgid "Account was not added"
-msgstr "একাউন্ট যুক্ত করা হয়নি"
+msgstr "একাউন্ট যোগ করা যায়নি"
 
 # তিথি
 msgid "Username of an account must be non-empty."
 msgstr "একটি একাউন্টের ব্যবহারকারীর নাম ফাঁকা থাকতে পারবে না।"
 
 msgid "New mail notifications"
-msgstr "নতুন মেইলের প্রজ্ঞাপণ"
+msgstr "নতুন মেইলের ঘোষণা"
 
 msgid "Remember password"
-msgstr "গুপ্তসংকেত স্মরণ রাখুন"
+msgstr "পাসওয়ার্ড মনে রাখা হবে"
 
 # তিথি
 msgid "There are no protocol plugins installed."
-msgstr "এখানে কোনো প্রটোকল প্লাগইন সংস্থাপিত করা নেই।"
+msgstr "এখানে কোনো প্রোটোকল প্লাগইন ইনস্টল করা নেই।"
 
-# তিথি
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(আপনি সম্ভবত 'সংস্থাপন করতে' ভুলে গেছেন।)"
+msgstr "(আপনি সম্ভবত 'make install' করতে ভুলে গেছেন।)"
 
 msgid "Modify Account"
-msgstr "একাউন্ট পরিবর্তন করুন"
+msgstr "একাউন্ট পরিবর্তন"
 
 msgid "New Account"
 msgstr "নতুন একাউন্ট"
 
 msgid "Protocol:"
-msgstr "প্রটোকল:"
+msgstr "প্রোটোকল:"
 
 msgid "Username:"
 msgstr "ব্যবহারকারীর নাম:"
 
 msgid "Password:"
-msgstr "গুপ্তসংকেত:"
+msgstr "পাসওয়ার্ড:"
 
 msgid "Alias:"
 msgstr "উপনাম:"
 
 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "সার্ভারে এই একাউন্টটি তৈরী করুন।"
+msgstr "সার্ভারে এই একাউন্টটি তৈরী করা হবে।"
 
 #. Cancel button
 #. Cancel
@@ -117,24 +122,24 @@ msgstr "সংরক্ষণ"
 
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "আপনি কি নিশ্চিত আপনি %s মুছে ফেলতে চান?"
+msgstr "আপনি কি নিশ্চিতভাবে %s মুছে ফেলতে চান?"
 
 msgid "Delete Account"
 msgstr "একাউন্ট মুছে ফেলুন"
 
 #. Delete button
 msgid "Delete"
-msgstr "মুছুন"
+msgstr "অপসারণ"
 
 msgid "Accounts"
 msgstr "একাউন্টসমূহ"
 
 msgid "You can enable/disable accounts from the following list."
-msgstr "আপনি নিম্নোক্ত তালিকা হতে একাউন্টসমূহকে সক্রিয়/নিষ্ক্রিয় করতে পারেন।"
+msgstr "আপনি নিম্নোক্ত তালিকা থেকে যেকোন একাউন্ট সক্রিয়/নিষ্ক্রিয় করতে পারেন।"
 
 #. Add button
 msgid "Add"
-msgstr "যুক্ত"
+msgstr "যোগ"
 
 #. Modify button
 msgid "Modify"
@@ -142,24 +147,24 @@ msgstr "পরিবর্তন"
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%1s%2s%3s%4s, %5s-কে তার বন্ধু করেছেন%6s%7s"
+msgstr "%1$s%2$s%3$s%4$s, %5$s কে তার বন্ধু করেছেন%6$s%7$s"
 
 msgid "Add buddy to your list?"
-msgstr "আপনার তালিকায় বন্ধু যোগ করতে চান কি?"
+msgstr "আপনার তালিকায় বন্ধু যোগ করতে চান?"
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%1s%2s%3s%4s তার বন্ধু তালিকা %s6%7s তে %5s কে যুক্ত করতে চায়"
+msgstr "%1$s%2$s%3$s%4$s তার বন্ধু তালিকা তে %5$s কে যোগ করতে চায় %6$s%7$s"
 
 msgid "Authorize buddy?"
-msgstr "বন্ধুকে কি প্রাধিকার দিতে চান?"
+msgstr "বন্ধুকে অনুমোদন দিতে চান?"
 
 # তিথি
 msgid "Authorize"
-msgstr "অনুমোদিত"
+msgstr "অনুমোদন"
 
 msgid "Deny"
-msgstr "প্রত্যাখ্যান করুন"
+msgstr "প্রত্যাখ্যান"
 
 #, c-format
 msgid ""
@@ -171,7 +176,7 @@ msgstr ""
 
 #, c-format
 msgid "Account: %s (%s)"
-msgstr "একাউন্ট: %1s (%2s)"
+msgstr "একাউন্ট: %1$s (%2$s)"
 
 #, c-format
 msgid ""
@@ -182,14 +187,14 @@ msgstr ""
 "শেষ দেখা: %s আগে"
 
 msgid "Default"
-msgstr "পূর্বনির্ধারিত"
+msgstr "ডিফল্ট"
 
 msgid "You must provide a username for the buddy."
 msgstr "আপনাকে অবশ্যই  বন্ধুর জন্য একটি নাম দিতে হবে।"
 
 # tithi
 msgid "You must provide a group."
-msgstr "আপনাকে অবশ্যই একটি গ্রুপ প্রদান করতে হবে।"
+msgstr "আপনাকে অবশ্যই একটি দল উল্লেখ করতে হবে।"
 
 msgid "You must select an account."
 msgstr "আপনাকে অবশ্যই একটি একাউন্ট নির্বাচন করতে হবে।"
@@ -199,7 +204,7 @@ msgid "The selected account is not online."
 msgstr "নির্বাচিত একাউন্টটি অনলাইনে নেই।"
 
 msgid "Error adding buddy"
-msgstr "বন্ধুকে যুক্ত করতে ত্রুটি"
+msgstr "বন্ধু যোগ করতে ত্রুটি"
 
 msgid "Username"
 msgstr "ব্যবহারকারীর নাম"
@@ -208,16 +213,16 @@ msgid "Alias (optional)"
 msgstr "উপনাম (ঐচ্ছিক)"
 
 msgid "Add in group"
-msgstr "গ্রুপে যোগ দিন"
+msgstr "দলে যোগ"
 
 msgid "Account"
 msgstr "একাউন্ট"
 
 msgid "Add Buddy"
-msgstr "বন্ধু যোগ করুন"
+msgstr "বন্ধু যোগ"
 
 msgid "Please enter buddy information."
-msgstr "অনুগ্রহ করে বন্ধুর তথ্য প্রবেশ করান।"
+msgstr "অনুগ্রহ করে বন্ধুর তথ্য দিন।"
 
 msgid "Chats"
 msgstr "আড্ডা"
@@ -230,108 +235,110 @@ msgid "Alias"
 msgstr "উপনাম"
 
 msgid "Group"
-msgstr "গ্রুপ"
+msgstr "দল"
 
 msgid "Auto-join"
-msgstr "স্বয়ং-যোগদান"
+msgstr "স্বয়ংক্রিয় যোগদান"
 
 msgid "Add Chat"
-msgstr "আড্ডায় যোগ দিন"
+msgstr "আড্ডা যোগ"
 
 # tihi
 msgid "You can edit more information from the context menu later."
-msgstr "আপনি পরবর্তীতে প্রসঙ্গ তালিকা হতে আরও তথ্য সম্পাদনা করতে পারেন।"
+msgstr "আপনি পরবর্তীতে প্রাসঙ্গিক-মেনু থেকে আরও তথ্য সম্পাদনা করতে পারেন।"
 
 msgid "Error adding group"
-msgstr "গ্রুপ যুক্ত করতে ত্রুটি"
+msgstr "দল যোগ করতে ত্রুটি"
 
 msgid "You must give a name for the group to add."
-msgstr "আপনাকে অবশ্যই  গ্রুপটি যোগ করার জন্য একটি নাম দিতে হবে।"
+msgstr "আপনাকে অবশ্যই  দলটি যোগ করার জন্য একটি নাম দিতে হবে।"
 
 msgid "Add Group"
-msgstr "গ্রুপ যুক্ত করুন"
+msgstr "দল যোগ"
 
 msgid "Enter the name of the group"
-msgstr "গ্রুপের নাম প্রবেশ করান"
+msgstr "দলের নাম দিন"
 
 msgid "Edit Chat"
-msgstr "আড্ডা সম্পাদনা করা"
+msgstr "আড্ডা সম্পাদনা"
 
 # tihi
 msgid "Please Update the necessary fields."
 msgstr "অনুগ্রহ করে প্রয়োজনীয় ক্ষেত্রগুলো হালনাগাদ করুন।"
 
 msgid "Edit"
-msgstr "সম্পাদন"
+msgstr "সম্পাদনা"
 
 msgid "Edit Settings"
-msgstr "বিন্যাসনসমূহ সম্পাদন করুন"
+msgstr "সেটিং সম্পাদনা"
 
 msgid "Information"
 msgstr "তথ্য"
 
 msgid "Retrieving..."
-msgstr "উদ্ধার করছে..."
+msgstr "খুঁজে আনা হচ্ছে..."
 
 msgid "Get Info"
-msgstr "তথ্য গ্রহণ করুন"
+msgstr "তথ্য সংগ্রহ"
 
 msgid "Add Buddy Pounce"
-msgstr "বন্ধু পাউন্স যুক্ত করুন"
+msgstr "বন্ধু পাউন্স যোগ"
 
 msgid "Send File"
-msgstr "ফাইল পাঠান"
+msgstr "ফাইল প্রেরণ"
 
+# Samia: Complete
 msgid "Blocked"
-msgstr "আবদ্ধ"
+msgstr "ব্লক করা"
 
 msgid "Show when offline"
-msgstr "অফলাইনে থাকলে প্রদর্শন করুন"
+msgstr "অফলাইন হলে প্রদর্শন করা হবে"
 
 #, c-format
 msgid "Please enter the new name for %s"
-msgstr "অনুগ্রহ করে %s এর জন্য নতুন নাম প্রবেশ করান"
+msgstr "অনুগ্রহ করে %s এর জন্য নতুন নাম দিন"
 
 msgid "Rename"
-msgstr "পুনঃ নামকরণ করুন"
+msgstr "নামান্তর"
 
 msgid "Set Alias"
-msgstr "উপনাম নির্ধারন করুন"
+msgstr "উপনাম নির্ধারণ"
 
 # tithi
 msgid "Enter empty string to reset the name."
-msgstr "নামটি পুনঃনির্ধারণ করতে খালি স্ট্রিং প্রবেশ করান।"
+msgstr "নামটি পুনঃনির্ধারণ করতে ফাঁকা স্ট্রিং দিন।"
 
-# tithi
+# ***
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "এই যোগাযোগটি অপসারণ করার কারণে যোগাযোগের সকল বন্ধুও অপসারিত হবে।"
+msgstr "এই পরিচিতি অপসারণ করার কারণে পরিচিতির সব বন্ধুও অপসারিত হবে।"
 
 # tihi
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "এই গ্রুপটি অপসারণ করার কারণে গ্রুপের সকল বন্ধুও অপসারিত হবে।"
+msgstr "এই দলটি অপসারণ করলে দলের সব বন্ধুও অপসারিত হবে।"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "আপনি কি নিশ্চিত আপনি %s অপসারণ করতে চান?"
+msgstr "আপনি কি নিশ্চিতভাবে %s অপসারণ করতে চান?"
 
 #. XXX: anything to do with the returned ui-handle?
 msgid "Confirm Remove"
-msgstr "অপসারণ নিশ্চিত করুন"
+msgstr "অপসারণ নিশ্চিতকরণ "
 
 msgid "Remove"
 msgstr "অপসারণ"
 
 #. Buddy List
 msgid "Buddy List"
-msgstr "Buddy List"
+msgstr "বন্ধু তালিকা"
 
 msgid "Place tagged"
-msgstr "স্থান চিহ্নিত করা হয়েছে"
+msgstr "স্থান ট্যাগ করা হয়েছে"
 
-# tithi
+# ***
 msgid "Toggle Tag"
-msgstr "টোগল ট্যাগ"
+msgstr "ট্যাগ টগল করুন"
 
+# ***
 msgid "View Log"
 msgstr "লগ প্রদর্শন"
 
@@ -342,7 +349,7 @@ msgstr "ডাকনাম"
 #. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
-msgstr "অলস"
+msgstr "নিষ্ক্রিয়"
 
 msgid "On Mobile"
 msgstr "মোবাইলে"
@@ -357,20 +364,20 @@ msgid "Plugins"
 msgstr "প্লাগইন"
 
 msgid "Block/Unblock"
-msgstr "ব্লক/ব্লক সরান"
+msgstr "ব্লক/আনব্লক"
 
 msgid "Block"
 msgstr "ব্লক"
 
 msgid "Unblock"
-msgstr "ব্লক সরান"
+msgstr "আনব্লক"
 
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"অনুগ্রহ করে আপনি যে ব্যাক্তিকে ব্লক/ব্লকমুক্ত করতে চান তার ব্যবহারকারী-নাম বা ডাকনাম "
-"প্রবেশ করান।"
+"অনুগ্রহ করে আপনি যে ব্যাক্তিকে ব্লক/আনব্লক করতে চান তার ব্যবহারকারী নাম বা উপনাম "
+"দিন।"
 
 #. Not multiline
 #. Not masked?
@@ -379,21 +386,21 @@ msgid "OK"
 msgstr "ঠিক আছে"
 
 msgid "New Instant Message"
-msgstr "নতুন তাৎক্ষণিক বার্তা"
+msgstr "নতুন বার্তা"
 
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"অনুগ্রহ করে আপনি যে ব্যাক্তিকে তাৎক্ষণিক বার্তা পাঠাতে চান তার ব্যবহারকারী-নাম বা "
-"ডাকনাম প্রবেশ করান।"
+"অনুগ্রহ করে আপনি যে ব্যাক্তিকে তাৎক্ষণিক বার্তা পাঠাতে চান তার ব্যবহারকারী নাম বা "
+"উপনাম দিন।"
 
 msgid "Channel"
 msgstr "চ্যানেল"
 
 msgid "Join a Chat"
-msgstr "আড্ডায় যোগ দিন"
+msgstr "আড্ডায় যোগদান"
 
 msgid "Please enter the name of the chat you want to join."
-msgstr "অনুগ্রহ করে আপনি যে আড্ডায় যোগ দিতে চান তার নাম প্রবেশ করান।"
+msgstr "অনুগ্রহ করে আপনি যে আড্ডায় যোগ দিতে চান তার নাম দিন।"
 
 msgid "Join"
 msgstr "যোগ দিন"
@@ -402,40 +409,39 @@ msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"অনুগ্রহ করে আপনি যে ব্যাক্তির লগ দেখতে চান তার ব্যবহারকারী-নাম বা ডাকনাম প্রবেশ "
-"করান।"
+"অনুগ্রহ করে আপনি যে ব্যাক্তির কথোপকথন দেখতে চান তার ব্যবহারকারী নাম বা উপনাম দিন।"
 
 #. Create the "Options" frame.
 msgid "Options"
-msgstr "পছন্দসমূহ"
+msgstr "অপশন"
 
 msgid "Send IM..."
-msgstr "তাৎক্ষনিক বার্তা প্রেরণ..."
+msgstr "IM প্রেরণ..."
 
 msgid "Block/Unblock..."
-msgstr "ব্লক করুন/ব্লক সরান..."
+msgstr "ব্লক/আনব্লক"
 
 msgid "Join Chat..."
-msgstr "আড্ডায় যোগ দিন..."
+msgstr "আড্ডায় যোগ..."
 
 msgid "View Log..."
 msgstr "লগ প্রদর্শন..."
 
 msgid "View All Logs"
-msgstr "সব লগ প্রদর্শন করুন"
+msgstr "লগ প্রদর্শন"
 
 # tithi
 msgid "Show"
-msgstr "প্রদর্শন করুন"
+msgstr "প্রদর্শন"
 
 msgid "Empty groups"
-msgstr "ফাঁকা গ্রুপগুলো"
+msgstr "ফাঁকা দল"
 
 msgid "Offline buddies"
-msgstr "অফলাইন বন্ধুরা"
+msgstr "অফলাইন বন্ধু"
 
 msgid "Sort"
-msgstr "সাজান"
+msgstr "সাজানো"
 
 msgid "By Status"
 msgstr "অবস্থা অনুসারে"
@@ -444,7 +450,7 @@ msgid "Alphabetically"
 msgstr "বর্ণানুক্রমিকভাবে"
 
 msgid "By Log Size"
-msgstr "লগের আকার অনুসারে"
+msgstr "লগের পরিমাণ অনুসারে"
 
 msgid "Buddy"
 msgstr "বন্ধু"
@@ -456,7 +462,7 @@ msgid "Grouping"
 msgstr "দলগতকরণ"
 
 msgid "Certificate Import"
-msgstr "প্রত্যয়নপত্র আমদানি করুন"
+msgstr "সার্টিফিকেট ইমপোর্ট"
 
 # তিথি
 msgid "Specify a hostname"
@@ -464,52 +470,53 @@ msgstr "হোস্টনাম উল্লেখ করুন।"
 
 # tithi
 msgid "Type the host name this certificate is for."
-msgstr "এই প্রত্যয়ণপত্রের হোস্ট নাম টাইপ করুন।"
+msgstr "এই সার্টিফিকেটের হোস্ট নাম টাইপ করুন।"
 
-# tithi
+# mark2
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
-"%s ফাইল আমদানি করা সম্ভব নয়।\n"
+"%s ফাইল ইমপোর্ট করা সম্ভব হয়নি।\n"
 "নিশ্চিত করুন যে ফাইলটি পঠনযোগ্য এবং PEM বিন্যাসের।\n"
 
 # tithi
 msgid "Certificate Import Error"
-msgstr "প্রত্যয়ণপত্র আমদানি করার ত্রুটি"
+msgstr "সার্টিফিকেট ইমপোর্ট করায় ত্রুটি"
 
 # tithi
 msgid "X.509 certificate import failed"
-msgstr "X.৫০৯ প্রত্যয়ণপত্র আমদানি করতে ব্যর্থ"
+msgstr "X.509 সার্টিফিকেট ইমপোর্ট করতে ব্যর্থ"
 
 msgid "Select a PEM certificate"
-msgstr "একটি PEM প্রত্যয়ণপত্র নির্বাচন করুন"
+msgstr "একটি PEM সার্টিফিকেট নির্বাচন করুন"
 
 # tithi
+# ***
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
-"%s ফাইলে রপ্তানি করতে ব্যর্থ।\n"
-"পরীক্ষা করুন যে আপনার উদ্দিষ্ট পথে লিখন অনুমতি আছে\n"
+"%s ফাইলে এক্সপোর্ট করতে ব্যর্থ।\n"
+"পরীক্ষা করুন আপনার টার্গেট পাথে লেখার অনুমতি আছে কি না\n"
 
 # tithi
 msgid "Certificate Export Error"
-msgstr "প্রত্যয়ণপত্র রপ্তানি করার ত্রুটি"
+msgstr "সার্টিফিকেট এক্সপোর্ট করায় ত্রুটি"
 
 # tithi
 msgid "X.509 certificate export failed"
-msgstr "X.৫০৯ প্রত্যয়ণপত্র রপ্তানি করতে ব্যর্থ"
+msgstr "X.509 সার্টিফিকেট এক্সপোর্ট করতে ব্যর্থ"
 
 # tithi
 msgid "PEM X.509 Certificate Export"
-msgstr "PEM X.৫০৯ প্রত্যয়ণপত্র রপ্তানি করুন"
+msgstr "PEM X.509 সার্টিফিকেট এক্সপোর্ট"
 
 #, c-format
 msgid "Certificate for %s"
-msgstr "%s-এর প্রত্যয়ণপত্র"
+msgstr "%s-এর সার্টিফিকেট"
 
 # tithi
 #, c-format
@@ -521,25 +528,25 @@ msgid ""
 msgstr ""
 "সাধারণ নাম: %s\n"
 "\n"
-"SHA1 হস্তাঙ্গুলির-ছাপ:\n"
+"SHA1 ফিঙ্গারপ্রিন্ট:\n"
 "%s"
 
 # tithi
 msgid "SSL Host Certificate"
-msgstr "SSL হোস্ট প্রত্যয়ণপত্র"
+msgstr "SSL হোস্ট সার্টিফিকেট"
 
 # tithi
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr "%s এর জন্য প্রত্যায়নপত্র কি সত্যিই মুছে ফেলতে চান?"
+msgstr "%s এর জন্য সার্টিফিকেট কি সত্যিই মুছে ফেলতে চান?"
 
 # tithi
 msgid "Confirm certificate delete"
-msgstr "প্রত্যায়নপত্র মুছে ফেলা নিশ্চিত করুন"
+msgstr "সার্টিফিকেট মুছে ফেলা নিশ্চিত করুন"
 
 # tithi
 msgid "Certificate Manager"
-msgstr "প্রত্যায়নপত্র ব্যবস্থাপক"
+msgstr "সার্টিফিকেট ব্যবস্থাপক"
 
 #. Creating the user splits
 msgid "Hostname"
@@ -554,7 +561,7 @@ msgstr "বন্ধ"
 
 #, c-format
 msgid "%s (%s)"
-msgstr "%1s (%2s)"
+msgstr "%1$s (%2$s)"
 
 #, c-format
 msgid "%s disconnected."
@@ -570,10 +577,10 @@ msgstr ""
 "%s\n"
 "\n"
 "যতক্ষন পর্যন্ত না আপনি অ্যাকাউন্টটি ত্রুটিমুক্ত এবং পুনরায় সক্রিয় না করছেন ততক্ষন পর্যন্ত "
-"ফিঞ্চ পুনঃ সংযোগ করার চেষ্টা করবে না।"
+"Finch পুনরায় সংযোগ করার চেষ্টা করবে না।"
 
 msgid "Re-enable Account"
-msgstr "একাউন্ট পুনঃ সক্রিয় করুন"
+msgstr "একাউন্ট পুনরায় সক্রিয়করণ "
 
 # tithi
 msgid ""
@@ -581,36 +588,38 @@ msgid ""
 "automatically rejoined in the chat when the account reconnects."
 msgstr ""
 "এই একাউন্টটি বিচ্ছিন্ন হয়েছে এবং আপনি আর আড্ডায় নেই। একাউন্টটি পুনরায় সংযোজিত হলে "
-"আপনি স্বয়ংক্রিয় ভাবে পুনরায় আড্ডায় যুক্ত হবেন।"
+"আপনি স্বয়ংক্রিয় ভাবে আড্ডায় যুক্ত হবেন।"
 
+# ***
 msgid "No such command."
-msgstr "এমন কোনো নির্দেশ নেই।"
+msgstr "এমন কোনো কমান্ড নেই।"
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "বাক্যরীতি ত্রুটি:  আপনি ঐ নির্দেশে ভূল সংখ্যক যুক্তি টাইপ করেছেন।"
+msgstr "সিনট্যাক্স ত্রুটি:  আপনি ঐ কমান্ডে ভুল সংখ্যক আর্গুমেন্ট টাইপ করেছেন।"
 
+# ***
 msgid "Your command failed for an unknown reason."
-msgstr "একটি অজানা কারণে আপনার নির্দেশ ব্যর্থ হয়েছে।"
+msgstr "একটি অজানা কারণে আপনার কমান্ড ব্যর্থ হয়েছে।"
 
 msgid "That command only works in chats, not IMs."
-msgstr "ঐ নির্দেশ শুধুমাত্র আড্ডাতেই প্রযোজ্য, তাৎক্ষণিক বার্তায় নয়।"
+msgstr "ঐ কমান্ড শুধুমাত্র আড্ডাতেই প্রযোজ্য, তাৎক্ষণিক বার্তায় নয়।"
 
 msgid "That command only works in IMs, not chats."
-msgstr "ঐ নির্দেশটি শুধুমাত্র তাৎক্ষণিক বার্তাতেই প্রযোজ্য, আড্ডার ক্ষেত্রে নয়।"
+msgstr "ঐ কমান্ডটি শুধুমাত্র তাৎক্ষণিক বার্তাতেই প্রযোজ্য, আড্ডার ক্ষেত্রে নয়।"
 
 msgid "That command doesn't work on this protocol."
-msgstr "ঐ নির্দেশটি এই প্রোটোকলে কাজ করে না।"
+msgstr "ঐ কমান্ডটি এই প্রোটোকলে কাজ করে না।"
 
 msgid "Message was not sent, because you are not signed on."
-msgstr "বার্তা পাঠানো হয়নি, কারণ আপনি স্বাক্ষরিত নন।"
+msgstr "বার্তা পাঠানো যায়নি, কারণ আপনি লগইন নন।"
 
 #, c-format
 msgid "%s (%s -- %s)"
-msgstr "%1s (%2s -- %3s)"
+msgstr "%1$s (%2$s -- %3$s)"
 
 #, c-format
 msgid "%s [%s]"
-msgstr "%1s [%2s]"
+msgstr "%1$s [%2$s]"
 
 #, c-format
 msgid ""
@@ -624,48 +633,37 @@ msgid "You have left this chat."
 msgstr "আপনি এই  আড্ডা ত্যাগ করেছেন।"
 
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "লগ করা শুরু হয়েছে। এই কথোপকথনের ভবিষৎ বার্তাসমূহ লগ করা হবে।"
+msgstr "কথোপকথন সংরক্ষণ করা শুরু হয়েছে। ভবিষ্যতে বার্তা লগ করা হবে।"
 
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "লগ করা বন্ধ করা হয়েছে। এই কথোপকথনের ভবিষৎ বার্তাসমূহ লগ করা হবে।"
+msgstr "কথোপকথন সংরক্ষণ বন্ধ করা হয়েছে। ভবিষ্যতে বার্তা লগ করা হবে না।"
 
+# ***
 msgid "Send To"
-msgstr "এখানে প্রেরণ করুন"
-
-msgid "Invite message"
-msgstr "আমন্ত্রণ বার্তা"
-
-msgid "Invite"
-msgstr "আমন্ত্রণ"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"একটি ঐচ্ছিক আমন্ত্রণ বার্তার সাথে,\n"
-"অনুগ্রহ করে আপনি যে ব্যবহারকারীকে আমন্ত্রণ করতে চান তার নামটি প্রবেশ করান।"
+msgstr "এখানে প্রেরণ"
 
 msgid "Conversation"
 msgstr "কথোপকথন"
 
 msgid "Clear Scrollback"
-msgstr "স্ক্রলবেক পরিস্কার করুন"
+msgstr "স্ক্রলব্যাক অপসারন"
 
 msgid "Show Timestamps"
-msgstr "সময়ছাপ প্রদর্শন করুন"
+msgstr "সময় প্রদর্শন"
 
 msgid "Add Buddy Pounce..."
-msgstr "বন্ধু পাউন্স যুক্ত করুন..."
+msgstr "বন্ধু পাউন্স যোগ..."
 
 msgid "Invite..."
 msgstr "আমন্ত্রণ..."
 
+# mark3
 msgid "Enable Logging"
-msgstr "লগকরণ সক্রিয় করুন"
+msgstr "লগ সক্রিয়করণ"
 
 msgid "Enable Sounds"
-msgstr "শব্দ সক্রিয় করুন"
+msgstr "শব্দ সক্রিয়করণ"
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY>"
@@ -677,73 +675,74 @@ msgstr[0] "%d ব্যবহারকারীর তালিকা:...\n"
 msgstr[1] "%d ব্যবহারকারীগণের তালিকা:\n"
 
 msgid "Supported debug options are:  version"
-msgstr "সমর্থিত ডিবাগ পছন্দসমূহ হল: সংস্করণ"
+msgstr "সমর্থিত ডিবাগ অপশন: সংস্করণ"
 
+# ***
 msgid "No such command (in this context)."
-msgstr "এমন কোনো নির্দেশ নেই (এই প্রসঙ্গে)।"
+msgstr "এমন কোনো কমান্ড নেই (এই প্রসঙ্গে)।"
 
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"যেকোনো সুনির্দিষ্ট নির্দেশ সম্পর্কে সহায়তা নিতে \"/help &১lt;command&২gt;\" ব্যবহার "
+"যেকোনো সুনির্দিষ্ট কমান্ড সম্পর্কে সহায়তা নিতে \"/help &lt;command&gt;\" ব্যবহার "
 "করুন।\n"
-"এই ক্ষেত্রে নিম্নোক্ত নির্দেশসমূহ সহজলভ্য:\n"
+"এই ক্ষেত্রে নিম্নোক্ত কমান্ড বিদ্যমান:\n"
 
 # tithi
 #, c-format
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
-msgstr "%s বার্তার বৈধ শ্রেণী নয়। বার্তাসমূহের বৈধ শ্রেণীর '/সহায়ক বার্তা-রং' দেখুন।"
+msgstr "%s বার্তার শ্রেণী কার্যকর নয়। বার্তার শ্রেণীর জন্য '/help msgcolor' দেখুন।"
 
 # tithi
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
-msgstr "%s বৈধ রং নয়। বৈধ রং এর জন্য '/সহায়ক বার্তা-রং' দেখুন।"
+msgstr "%s কার্যকর রং নয়। বৈধ রং এর জন্য '/help msgcolor' দেখুন।"
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"বলুন &lt;বার্তা&gt;:  একটি বার্তা সাধারণত এমন ভাবে পাঠান যেন আপনি নির্দেশ ব্যবহার "
-"করেন নি।"
+"say &lt;message&gt;:  একটি বার্তা সাধারণত এমন ভাবে পাঠান যেন আপনি কমান্ড "
+"ব্যবহার করেন নি।"
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "আমি &lt;কার্য&gt;: কোনো বন্ধুকে বা আড্ডায় আইআরসি শৈলীর কার্য পাঠান।"
+msgstr "me &lt;action&gt;: কোনো বন্ধুকে বা আড্ডায় IRC এর মত প্রতিক্রিয়া পাঠান।"
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "ডিবাগ &lt;পছন্দ&gt;:  বর্তমান কথোপকথনে বিভিন্ন ডিবাগ তথ্য পাঠান।"
+msgstr "debug &lt;option&gt;:  বর্তমান কথোপকথনে বিভিন্ন ডিবাগ তথ্য পাঠানো হবে।"
 
 msgid "clear: Clears the conversation scrollback."
-msgstr "পরিস্কার: কথোপকথনের স্ক্রলবেক পরিস্কার করে।"
+msgstr "clear: কথোপকথনের স্ক্রলব্যাক অপসারন করে।"
 
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "সহায়তা &lt;নির্দেশ&gt;: একটি সুনির্দিষ্ট নির্দেশের সহায়িকা।"
+msgstr "help &lt;command&gt;: একটি নির্দিষ্ট কমান্ডের সহায়িকা।"
 
 # tithi
 msgid "users:  Show the list of users in the chat."
-msgstr "ব্যবহারকারীগণ: আড্ডায় ব্যবহারকারীদের তালিকা দেখান।"
+msgstr "users: আড্ডায় ব্যবহারকারীদের তালিকা দেখানো হবে।"
 
 msgid "plugins: Show the plugins window."
-msgstr "প্লাগইন: প্লাগইনের উইন্ডো দেখান।"
+msgstr "plugins: প্লাগইনের উইন্ডো দেখান।"
 
 msgid "buddylist: Show the buddylist."
-msgstr "বন্ধু-তালিকা: বন্ধু-তালিকা দেখান।"
+msgstr "buddylist: বন্ধু-তালিকা দেখান।"
 
 msgid "accounts: Show the accounts window."
-msgstr "অ্যাকাউন্ট: অ্যাকাউন্টের উইন্ডো দেখান।"
+msgstr "accounts: অ্যাকাউন্টের উইন্ডো দেখান।"
 
 msgid "debugwin: Show the debug window."
-msgstr "ত্রুটিমুক্তকরণ উইন্ডো: ডিবাগ উইন্ডো দেখান।"
+msgstr "debugwin: ডিবাগ উইন্ডো দেখান।"
 
 msgid "prefs: Show the preference window."
-msgstr "পছন্দ: পছন্দের উইন্ডো দেখান।"
+msgstr "prefs: পছন্দসমূহের উইন্ডো দেখান।"
 
 msgid "statuses: Show the savedstatuses window."
-msgstr "অবস্থাসমূহ: সংরক্ষিত-অবস্থাসমূহের উইন্ডো দেখান।"
+msgstr "statuses: savedstatuses উইন্ডোটি দেখান।"
 
 # fix me tithi
 msgid ""
@@ -753,14 +752,14 @@ msgid ""
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
-"বার্তা-রং &1lt;শ্রেণী&2gt; &3lt;পুরোভূমি&4gt; &5lt;প্রেক্ষাপট&6gt;:  কথোপকথন "
-"উইন্ডোতে বিভিন্ন প্রকার বার্তার জন্য রং নির্ধারন করুন ।<br>    &7lt;শ্রেণী&8gt;: "
-"গ্রহণ করুন, প্রেরণ করুন, প্রনির্দেশন, কার্য, টাইমস্ট্যাম্প<br>    &9lt;পুরোভূমি/"
-"প্রেক্ষাপট&10gt;: কালো, লাল, সবুজ, নীল, সাদা, ধূসর, গাঢ় ধূসর, ম্যাজেন্ডা, সায়ান, "
-"পূর্বনির্ধারিত<br><br>উদাহরণ:<br>    বার্তা-রং পূর্বনির্ধারিতভাবে সায়ান প্রেরণ করে"
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;:  কথোপকথন "
+"উইন্ডোতে বিভিন্ন প্রকার বার্তার জন্য রং নির্ধারন করুন ।<br>   &lt;class&gt;: গ্রহন, "
+"প্রেরণ, হাইলাইট, কাজ, টাইমস্ট্যাম্প<br>    &lt;foreground/background&gt;: কালো, "
+"লাল, সবুজ, নীল, সাদা, ধূসর, কালচেধূসর, ম্যাজেন্টা, সায়ান, ডিফল্ট<br><br>উদাহরণ:"
+"<br>    msgcolor ডিফল্ট হিসেবে সায়ান প্রদান করে"
 
 msgid "Unable to open file."
-msgstr "ফাইল খুলতে সমর্থ নয়।"
+msgstr "ফাইল খুলতে ব্যর্থ।"
 
 msgid "Debug Window"
 msgstr "ডিবাগ উইন্ডো"
@@ -770,10 +769,10 @@ msgstr "ডিবাগ উইন্ডো"
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
 msgid "Clear"
-msgstr "মুছে ফেলো"
+msgstr "মুছে ফেলুন"
 
 msgid "Filter:"
-msgstr "পরিশ্রুতক:"
+msgstr "পরিশোধক:"
 
 msgid "Pause"
 msgstr "বিরতি"
@@ -782,18 +781,18 @@ msgstr "বিরতি"
 #, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "ফাইল স্থানান্তর করে - %d ফাইলের %d%%"
-msgstr[1] "ফাইল স্থানান্তর করে - %d ফাইলসমূহের %d%%"
+msgstr[0] "ফাইল স্থানান্তর - %d টি ফাইলের %d%%"
+msgstr[1] "ফাইল স্থানান্তর - %d টি ফাইলের %d%%"
 
 #. Create the window.
 msgid "File Transfers"
-msgstr "ফাইল স্থানান্তর করে"
+msgstr "ফাইল স্থানান্তর"
 
 msgid "Progress"
 msgstr "অগ্রগতি"
 
 msgid "Filename"
-msgstr "ফাইল-নাম"
+msgstr "ফাইলের নাম"
 
 msgid "Size"
 msgstr "আকার"
@@ -809,20 +808,21 @@ msgid "Status"
 msgstr "অবস্থা"
 
 msgid "Close this window when all transfers finish"
-msgstr "সব স্থানান্তর শেষ হলে এই উইন্ডোটি বন্ধ করুন"
+msgstr "সব স্থানান্তর শেষ হলে এই উইন্ডোটি বন্ধ করে দেয়া হবে"
 
 msgid "Clear finished transfers"
-msgstr "সমাপ্তকৃত স্থানান্তরসমূহ পরিস্কার করুন"
+msgstr "সম্পন্ন স্থানান্তর সরিয়ে ফেলা হবে"
 
 msgid "Stop"
-msgstr "থামুন"
+msgstr "স্থগিত"
 
 msgid "Waiting for transfer to begin"
-msgstr "স্থানান্তর শুরু করার জন্য অপেক্ষা করছে"
+msgstr "স্থানান্তর শুরু করার জন্য অপেক্ষা করা হচ্ছে"
 
 msgid "Canceled"
 msgstr "বাতিল করা হয়েছে"
 
+# mark6
 msgid "Failed"
 msgstr "ব্যর্থ হয়েছে"
 
@@ -841,21 +841,21 @@ msgstr "শেষ"
 
 #, c-format
 msgid "The file was saved as %s."
-msgstr "ফাইলটি %s হিসেবে সংরক্ষণ করা হয়েছিল।"
+msgstr "ফাইলটি %s হিসেবে সংরক্ষিত হয়েছে।"
 
 msgid "Sending"
-msgstr "পাঠাচ্ছে"
+msgstr "পাঠানো হচ্ছে"
 
 msgid "Receiving"
-msgstr "গ্রহণ করছে"
+msgstr "গ্রহণ করা হচ্ছে"
 
 #, c-format
 msgid "Conversation in %s on %s"
-msgstr "%1s এ %2s এর উপর কথোপকথন"
+msgstr "%1$s এ %2$s এর উপর কথোপকথন"
 
 #, c-format
 msgid "Conversation with %s on %s"
-msgstr "%2s এর উপর %1s-এর সঙ্গে কথোপকথন"
+msgstr "%2$s এর উপর %1$s-এর সঙ্গে কথোপকথন"
 
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -864,31 +864,30 @@ msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"\"সকল অবস্থার পরিবর্তনসমূহ সিস্টেমের লগে লগ করুন\" প্রাধিকার যদি সক্রিয় থাকে তবে "
-"শুধুমাত্র সিস্টেমের ইভেন্টগুলো লগ করা হবে।"
+"শুধুমাত্র  \"সব অবস্থার পরিবর্তন সিস্টেম লগে লেখা হবে\" অপশনটি সক্রিয় থাকলে "
+"সিস্টেমের ইভেন্টগুলো লগ করা হবে।"
 
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"\"সব তাৎক্ষণিক বার্তা লগ করুন\" প্রাধিকার যদি সক্রিয় থাকে তবে শুধুমাত্র তাৎক্ষণিক "
-"বার্তাগুলো লগ করা হবে।"
+"অপশনে \"সব তাৎক্ষণিক বার্তা লগ করা হবে\" সক্রিয় থাকলে তবেই তাৎক্ষণিক বার্তাগুলো লগ "
+"করা হবে।"
 
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"\"সব আড্ডা লগ করুন\" প্রাধিকার যদি সক্রিয় থাকে তবে শুধুমাত্র আড্ডাগুলো লগ করা হবে।"
+msgstr "অপশনে \"সব আড্ডা লগ করা হবে\" সক্রিয় থাকলে তবেই আড্ডাগুলো লগ করা হবে।"
 
 msgid "No logs were found"
 msgstr "কোনো লগ খুঁজে পাওয়া যায়নি।"
 
 msgid "Total log size:"
-msgstr "মোট লগ আকার:"
+msgstr "মোট কথোপকথনের পরিমাণ:"
 
 # fix me tithi
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr "স্ক্রল করুন/খুঁজুন:"
+msgstr "স্ক্রল/অনুসন্ধান:"
 
 #, c-format
 msgid "Conversations in %s"
@@ -899,13 +898,47 @@ msgid "Conversations with %s"
 msgstr "%s-এর সঙ্গে কথোপকথন"
 
 msgid "All Conversations"
-msgstr "সকল কথোপকথন"
+msgstr "সব কথোপকথন"
 
+# mark4
 msgid "System Log"
 msgstr "সিস্টেম লগ"
 
+msgid "Calling ... "
+msgstr "কল করা হচ্ছে..."
+
+msgid "Hangup"
+msgstr "কল শেষ করুন"
+
+#. Number of actions
+msgid "Accept"
+msgstr "গ্রহণ"
+
+msgid "Reject"
+msgstr "প্রত্যাখান"
+
+msgid "Call in progress."
+msgstr "কলের অগ্রগতি হচ্ছে"
+
+msgid "The call has been terminated."
+msgstr "কল সমাপ্ত করা হয়েছে।"
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "আপনার সাথে %s একটি অডিও সেশন শুরু করতে চায়।"
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "আপনার সাথে %s একটি অসমর্থিত ধরণের মিডিয়া সেশন শুরু করার চেষ্টা করছে।"
+
+msgid "You have rejected the call."
+msgstr "আপনি কলটি প্রত্যাখ্যান করেছেন।"
+
+msgid "call: Make an audio call."
+msgstr "call: একটি অডিও কল করুন।"
+
 msgid "Emails"
-msgstr "ই-মেইলসমূহ"
+msgstr "ইমেইল"
 
 msgid "You have mail!"
 msgstr "আপনার মেইল আছে!"
@@ -919,8 +952,8 @@ msgstr "বিষয়"
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%1s (%2s) এর  %3dটি নতুন বার্তা আছে।"
-msgstr[1] "%1s (%2s)-এর  %3dগুলো নতুন বার্তা আছে।"
+msgstr[0] "%1$s (%2$s) এর  %3$d টি নতুন বার্তা আছে।"
+msgstr[1] "%1$s (%2$s) এর  %3$d টি নতুন বার্তা আছে।"
 
 msgid "New Mail"
 msgstr "নতুন মেইল"
@@ -933,10 +966,13 @@ msgid "Buddy Information"
 msgstr "বন্ধুর তথ্য"
 
 msgid "Continue"
-msgstr "অব্যাহত"
+msgstr "পরবর্তী"
 
 msgid "IM"
-msgstr "তাৎক্ষণিক বার্তা"
+msgstr "IM"
+
+msgid "Invite"
+msgstr "আমন্ত্রণ জানান"
 
 msgid "(none)"
 msgstr "(কোনটি না)"
@@ -946,14 +982,14 @@ msgstr "URI"
 
 # tithi
 msgid "ERROR"
-msgstr "ত্রুটি"
+msgstr "ERROR"
 
 msgid "loading plugin failed"
 msgstr "প্লাগইন লোড করতে ব্যর্থ"
 
 # tithi
 msgid "unloading plugin failed"
-msgstr "প্লাগইন লোডহীন করতে ব্যর্থ।"
+msgstr "প্লাগইন আনলোড করতে ব্যর্থ।"
 
 # tithi
 #, c-format
@@ -965,47 +1001,47 @@ msgid ""
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
-"নাম: %1s\n"
-"সংস্করণ: %2s\n"
-"বর্ণনা: %3s\n"
-"লেখক: %4s\n"
-"ওয়েবসাইট: %5s\n"
-"ফাইলের নাম: %6s\n"
+"নাম: %1$s\n"
+"সংস্করণ: %2$s\n"
+"বর্ণনা: %3$s\n"
+"লেখক: %4$s\n"
+"ওয়েবসাইট: %5$s\n"
+"ফাইলের নাম: %6$s\n"
 
 # tithi
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "প্লাগইন বিন্যাস করার পূর্বে আপনার এটা  লোড করা প্রয়োজন।"
+msgstr "প্লাগইন কনফিগার করার পূর্বে আপনার এটি লোড করতে হবে।"
 
 # tithi
 msgid "No configuration options for this plugin."
-msgstr "এই প্লাগইনের জন্য কোনো বিন্যাসন পছন্দ নেই।"
+msgstr "এই প্লাগইনের জন্য কোনো কনফিগারেশন অপশন নেই।"
 
 msgid "Error loading plugin"
-msgstr "প্লাগইনটি লোডে ত্রুটি"
+msgstr "প্লাগইন লোড করতে ত্রুটি"
 
 # tithi
+# mark5
 msgid "The selected file is not a valid plugin."
-msgstr "নির্বাচিত ফাইলটি বৈধ প্লাগইন নয়।"
+msgstr "নির্বাচিত ফাইলটি কার্যকর প্লাগইন নয়।"
 
 # tithi
 msgid ""
 "Please open the debug window and try again to see the exact error message."
-msgstr ""
-"অনুগ্রহপূর্বক ত্রুটিমুক্তকরণ উইন্ডো খুলুন এবং সঠিক ত্রুটি বার্তাটি দেখতে পুনরায় চেষ্টা করুন।"
+msgstr "অনুগ্রহপূর্বক ডিবাগ উইন্ডো খুলুন এবং সঠিক ত্রুটি বার্তাটি পুনরায় দেখার চেষ্টা করুন।"
 
 msgid "Select plugin to install"
-msgstr "সংস্থাপনে জন্য প্লাগইন নির্বাচন করুন"
+msgstr "ইনস্টল করার জন্য প্লাগইন নির্বাচন করুন"
 
 # tithi
 msgid "You can (un)load plugins from the following list."
-msgstr "আপনি নিম্নোক্ত তালিকা হতে প্লাগইনগুলোকে লোড(মুক্ত) করতে পারেন।"
+msgstr "আপনি নিম্নোক্ত তালিকা থেকে প্লাগইনগুলোকে লোড/আনলোড করতে পারেন।"
 
 # tithi
 msgid "Install Plugin..."
-msgstr "প্লাগইন সংস্থাপন করুন..."
+msgstr "প্লাগইন ইনস্টল..."
 
 msgid "Configure Plugin"
-msgstr "প্লাগইন পছন্দসই বিন্যাস করুন"
+msgstr "প্লাগইন কনফিগারেশন "
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1013,19 +1049,19 @@ msgstr "প্লাগইন পছন্দসই বিন্যাস কর
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 msgid "Preferences"
-msgstr "প্রাধিকারসমূহ"
+msgstr "পছন্দসমূহ"
 
 msgid "Please enter a buddy to pounce."
-msgstr "অনুগ্রহ করে পাউন্স করার জন্য একজন বন্ধু প্রবেশ করান।"
+msgstr "অনুগ্রহ করে পাউন্স করার জন্য একজন বন্ধুর নাম দিন।"
 
 msgid "New Buddy Pounce"
-msgstr "নতুন বন্ধু পাউন্স করুন"
+msgstr "নতুন বন্ধু পাউন্স"
 
 msgid "Edit Buddy Pounce"
-msgstr "বন্ধু পাউন্স সম্পাদন করুন"
+msgstr "বন্ধু পাউন্স সম্পাদনা"
 
 msgid "Pounce Who"
-msgstr "কাকে পাউন্স"
+msgstr "যাকে পাউন্স করা হবে"
 
 #. Account:
 msgid "Account:"
@@ -1039,28 +1075,28 @@ msgid "Pounce When Buddy..."
 msgstr "পাউন্স করুন যখন বন্ধু..."
 
 msgid "Signs on"
-msgstr "সাইন অন"
+msgstr "লগইন করে"
 
 msgid "Signs off"
-msgstr "সাইন অফ"
+msgstr "লগআউট করে"
 
 msgid "Goes away"
-msgstr "অনুপস্থিত"
+msgstr "অন্যত্র যায়"
 
 msgid "Returns from away"
-msgstr "দূর হতে ফিরে আসে"
+msgstr "অন্যত্র থেকে ফিরে আসে"
 
 msgid "Becomes idle"
-msgstr "অলস হয়ে যায়"
+msgstr "নিষ্ক্রিয় হয়"
 
 msgid "Is no longer idle"
-msgstr "আর অলস থাকবে না"
+msgstr "সষ্ক্রিয় হয়"
 
 msgid "Starts typing"
-msgstr "টাইপ শুরু করছে"
+msgstr "টাইপ শুরু করে"
 
 msgid "Pauses while typing"
-msgstr "টাইপ করার সময় বিরতি দিন"
+msgstr "টাইপ করার সময় থামে"
 
 msgid "Stops typing"
 msgstr "টাইপ বন্ধ করে"
@@ -1070,94 +1106,95 @@ msgstr "বার্তা পাঠায়"
 
 #. Create the "Action" frame.
 msgid "Action"
-msgstr "কার্য"
+msgstr "প্রতিক্রিয়া"
 
 msgid "Open an IM window"
-msgstr "তাৎক্ষনিক বার্তার উইন্ডো খুলুন"
+msgstr "IM উইন্ডো খোলা হবে"
 
 msgid "Pop up a notification"
-msgstr "একটি ঘোষণা পপআপ করুন"
+msgstr "একটি ঘোষণা পপআপ করা হবে"
 
 msgid "Send a message"
-msgstr "একটি বার্তা পাঠান"
+msgstr "একটি বার্তা পাঠানো হবে"
 
 msgid "Execute a command"
-msgstr "একটি নির্দেশ কার্যকর করুন"
+msgstr "একটি কমান্ড কার্যকর করা হবে"
 
 msgid "Play a sound"
-msgstr "শব্দ বাজান"
+msgstr "শব্দ বাজানো হবে"
 
+# mark7
 msgid "Pounce only when my status is not Available"
-msgstr "আমার অবস্থা সহজলভ্য না থাকলে শুধুমাত্র পাউন্স করুন"
+msgstr "শুধুমাত্র আমার অবস্থা অনুপস্থিত থাকলে পাউন্স করা হবে"
 
 # tithi
 msgid "Recurring"
-msgstr "পুনরাবৃত্তি"
+msgstr "পুনরাবৃত্ত"
 
 msgid "Cannot create pounce"
-msgstr "পাউন্স তৈরী করতে পারে না"
+msgstr "পাউন্স তৈরী করা সম্ভব হয়নি"
 
 msgid "You do not have any accounts."
 msgstr "আপনার কোনো একাউন্ট নেই।"
 
 # tithi
 msgid "You must create an account first before you can create a pounce."
-msgstr "আপনি একটি পাউন্স তৈরি করার পূর্বে আপনাকে অবশ্যই একটি একাউন্ট তৈরি করতে হবে।"
+msgstr "পাউন্স তৈরি করার পূর্বে আপনাকে অবশ্যই একটি একাউন্ট তৈরি করতে হবে।"
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "আপনি কি নিশ্চিত আপনি %2s এর জন্য %1s এর পাউন্স মুছে ফেলতে চান?"
+msgstr "আপনি কি নিশ্চিতভাবে %2$s এর জন্য %1$s এর পাউন্স মুছে ফেলতে চান?"
 
 msgid "Buddy Pounces"
-msgstr "বন্ধু পাউন্স করে"
+msgstr "বন্ধু পাউন্স"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%1s আপনার কাছে টাইপ করা শুরু করেছে (%2s)"
+msgstr "%1$s আপনার কাছে টাইপ করা শুরু করেছে (%2$s)"
 
 #, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%1s আপনার কাছে টাইপ করার সময় বিরতি নিয়েছে (%2s)"
+msgstr "%1$s আপনার কাছে টাইপ করার সময় বিরতি নিচ্ছে (%2$s)"
 
+# mark8
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr "%1s সাইন অন করেছে (%2s)"
+msgstr "%1$s লগইন করেছে (%2$s)"
 
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%1s অলস অবস্থা থেকে ফিরে এসেছে (%2s)"
+msgstr "%1$s নিষ্ক্রিয় অবস্থা থেকে ফিরে এসেছে (%2$s)"
 
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%1s দূর হতে ফিরে এসেছে (%2s)"
+msgstr "%1$s অন্যত্র থেকে ফিরেছে (%2$s)"
 
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%1s আপনার কাছে টাইপ করা বন্ধ করে দিয়েছে (%2s)"
+msgstr "%1$s আপনার কাছে টাইপ করা বন্ধ করেছে (%2$s)"
 
 #, c-format
 msgid "%s has signed off (%s)"
-msgstr "%1s অখলাইনে আছে (%2s)"
+msgstr "%1$s লগআউট করেছে (%2$s)"
 
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%1s অলস আছে (%2s)"
+msgstr "%1$s নিষ্ক্রিয় হয়েছে (%2$s)"
 
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%1s এখন অনুপস্থিত। (%2s)"
+msgstr "%1$s অন্যত্র গিয়েছে। (%2$s)"
 
 #, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%1s আপনাকে একটি বার্তা পাঠিয়েছে। (%2s)"
+msgstr "%1$s আপনাকে একটি বার্তা পাঠিয়েছে। (%2$s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "অজানা পাউন্স ইভেন্ট। অনুগ্রহ করে এটি রিপোর্ট করুন!"
 
 # tithi
 msgid "Based on keyboard use"
-msgstr "কী-বোর্ডের ব্যবহারের উপর নির্ভর করে"
+msgstr "কীবোর্ডের ব্যবহার অনুসারে"
 
 msgid "From last sent message"
 msgstr "সর্বশেষ পাঠানো বার্তা থেকে"
@@ -1166,34 +1203,34 @@ msgid "Never"
 msgstr "কখনো নয়"
 
 msgid "Show Idle Time"
-msgstr "অলস সময় প্রদর্শন করুন"
+msgstr "নিষ্ক্রিয় সময় প্রদর্শন করা হবে"
 
 msgid "Show Offline Buddies"
-msgstr "অফলাইন বন্ধুগণদের প্রদর্শন করুন"
+msgstr "অফলাইন বন্ধুদের প্রদর্শন করা হবে"
 
 msgid "Notify buddies when you are typing"
-msgstr "আপনার টাইপ করার সময় বন্ধুদের অবগত করুন"
+msgstr "আপনি টাইপ করলে বন্ধুদের তা অবগত করা হবে"
 
 msgid "Log format"
-msgstr "লগ বিন্যাস"
+msgstr "লগ প্রদর্শনের বিন্যাস"
 
 msgid "Log IMs"
-msgstr "তাৎক্ষণিক বার্তাগুলো লগ করুন"
+msgstr "IM সংরক্ষণ করা হবে"
 
 msgid "Log chats"
-msgstr "আড্ডাসমূহ লগ করুন"
+msgstr "কথোপকথন সংরক্ষণ করা হবে"
 
 msgid "Log status change events"
-msgstr "লগ অবস্থা ইভেন্ট পরিবর্তন করে"
+msgstr "অবস্থা পরিবর্তনের ঘটনা লগ করা হবে"
 
 msgid "Report Idle time"
-msgstr "অলস সময় রিপোর্ট করুন"
+msgstr "নিষ্ক্রিয় সময় রিপোর্ট করা হবে"
 
 msgid "Change status when idle"
-msgstr "অলস থাকলে অবস্থা পরিবর্তন করুন"
+msgstr "নিষ্ক্রিয় থাকলে অবস্থা পরিবর্তন করা হবে"
 
 msgid "Minutes before changing status"
-msgstr "অবস্থা পরিবর্তন করার পূর্বের মিনিট"
+msgstr "অবস্থা পরিবর্তনের মিনিটখানেক আগে"
 
 msgid "Change status to"
 msgstr "অবস্থা পরিবর্তন করুন"
@@ -1202,37 +1239,38 @@ msgid "Conversations"
 msgstr "কথোপকথন"
 
 msgid "Logging"
-msgstr "লগ করছে"
+msgstr "কথোপকথন সংরক্ষন"
 
 msgid "You must fill all the required fields."
-msgstr "আপনাকে অবশ্যই প্রয়োজনীয় ক্ষেত্রসমূহ পূরণ করতে হবে।"
+msgstr "আপনাকে সব আবশ্যকীয় ক্ষেত্র পূরণ করতে হবে।"
 
 msgid "The required fields are underlined."
-msgstr "প্রয়োজনীয় ক্ষেত্রসমূহকে নিম্নরেখাঙ্কিত করা হয়েছে।"
+msgstr "আবশ্যকীয় ক্ষেত্র নিম্নরেখাঙ্কিত করা রয়েছে।"
 
 # tithi
 msgid "Not implemented yet."
 msgstr "এখনও বাস্তবায়িত হয়নি।"
 
 msgid "Save File..."
-msgstr "ফাইল সংরক্ষণ করুন..."
+msgstr "ফাইল সংরক্ষণ..."
 
 msgid "Open File..."
 msgstr "ফাইল খুলুন..."
 
 msgid "Choose Location..."
-msgstr "স্থান পছন্দ করুন..."
+msgstr "অবস্থান নির্বাচন..."
 
 # tithi
+# samia: I am assuming these are chat rooms
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr "এই শ্রেণীবিভাগের আরও কিছু কক্ষ খুঁজে পেতে 'Enter' চাপুন।"
+msgstr "এই শ্রেণীর আরও কিছু আসর খুঁজে পেতে 'Enter' চাপুন।"
 
 msgid "Get"
-msgstr "গ্রহণ করুন"
+msgstr "সংগ্রহ"
 
 #. Create the window.
 msgid "Room List"
-msgstr "কক্ষের তালিকা"
+msgstr "আসরের তালিকা"
 
 msgid "Buddy logs in"
 msgstr "বন্ধু লগইন করে"
@@ -1241,28 +1279,28 @@ msgid "Buddy logs out"
 msgstr "বন্ধু লগআউট করে"
 
 msgid "Message received"
-msgstr "বার্তা গ্রহণ করা হয়েছে"
+msgstr "বার্তা গৃহীত হয়"
 
 msgid "Message received begins conversation"
-msgstr "বার্তা গ্রহন করায় কথাবার্তা শুরু হয়েছে"
+msgstr "বার্তা গ্রহন করে কথোপকথন শুরু হয়"
 
 msgid "Message sent"
-msgstr "বার্তা পাঠানো হয়েছে"
+msgstr "বার্তা পাঠানো হয়"
 
 msgid "Person enters chat"
-msgstr "ব্যক্তি আড্ডায় প্রবেশ করেছে"
+msgstr "ব্যক্তি আড্ডায় প্রবেশ করে"
 
 msgid "Person leaves chat"
-msgstr "ব্যক্তি আড্ডা ত্যাগ করেছে"
+msgstr "ব্যক্তি আড্ডা ত্যাগ করে"
 
 msgid "You talk in chat"
-msgstr "আপনি আড্ডায় কথা বলছেন"
+msgstr "আপনি আড্ডায় কথা বলেন"
 
 msgid "Others talk in chat"
-msgstr "অন্যান্যরা আড্ডায় কথা বলছে"
+msgstr "অন্যান্যরা আড্ডায় কথা বলে"
 
 msgid "Someone says your username in chat"
-msgstr "কেউ একজন আড্ডায় আপনার ব্যবহারকারীর নাম বলছে"
+msgstr "কেউ আড্ডায় আপনার নাম উল্লেখ করে"
 
 # tithi
 msgid "GStreamer Failure"
@@ -1271,70 +1309,74 @@ msgstr "GStreamer ব্যর্থতা"
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer আরম্ভ হতে ব্যর্থ।"
 
-# tithi
+# tithi mark
 msgid "(default)"
-msgstr "(পূর্বনির্ধারিত)"
+msgstr "(ডিফল্ট)"
 
 msgid "Select Sound File ..."
-msgstr "সাউন্ড ফাইল নির্বাচন করুন..."
+msgstr "শব্দ ফাইল নির্বাচন..."
 
+# ***
 msgid "Sound Preferences"
-msgstr "সাউন্ডের অগ্রাধিকারসমুহ"
+msgstr "শব্দের পছন্দসমূহ"
 
+# ***
 msgid "Profiles"
-msgstr "ব্যাক্তিগত বিবরণীসমূহ"
+msgstr "বৃত্তান্ত"
 
 msgid "Automatic"
 msgstr "স্বয়ংক্রিয়"
 
 msgid "Console Beep"
-msgstr "কনসোল বীপ করছে"
+msgstr "কনসোল বীপ"
 
+# ***
 msgid "Command"
-msgstr "নির্দেশ"
+msgstr "কমান্ড"
 
 msgid "No Sound"
-msgstr "কোনো শব্দ নাই"
+msgstr "কোনো শব্দ নয়"
 
 msgid "Sound Method"
-msgstr "শব্দের প্রক্রিয়া"
+msgstr "শব্দের নিয়ম"
 
 msgid "Method: "
-msgstr "প্রক্রিয়া:"
+msgstr "প্রক্রিয়া:"
 
+# ***
 #, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"শব্দের নির্দেশ \n"
+"শব্দের কমান্ড \n"
 "(ফাইলের নামের জন্য %s)"
 
 #. Sound options
 msgid "Sound Options"
-msgstr "শব্দের পছন্দসমূহ"
+msgstr "শব্দের অপশন"
 
 msgid "Sounds when conversation has focus"
-msgstr "কথোপকথন ফোকাস করলে শব্দ করে"
+msgstr "কথোপকথনে ফোকাস করলে যে শব্দ করে"
 
 msgid "Always"
-msgstr "সর্বদা"
+msgstr "সব সময়"
 
 msgid "Only when available"
-msgstr "শুধুমাত্র যখন সহজলভ্য"
+msgstr "শুধুমাত্র যখন উপস্থিত"
 
 msgid "Only when not available"
-msgstr "শুধুমাত্র যখন সহজলভ্য নয়"
+msgstr "শুধুমাত্র যখন অনুপস্থিত"
 
 msgid "Volume(0-100):"
 msgstr "ভলিউম(০-১০০):"
 
 #. Sound events
 msgid "Sound Events"
-msgstr "শব্দ ইভেন্টসমূহ"
+msgstr "শব্দ ঘটনাসমূহ"
 
 msgid "Event"
-msgstr "ইভেন্ট"
+msgstr "ঘটনা"
 
 msgid "File"
 msgstr "ফাইল"
@@ -1343,26 +1385,26 @@ msgid "Test"
 msgstr "পরীক্ষা"
 
 msgid "Reset"
-msgstr "পুনঃ বিন্যাস করুন"
+msgstr "রিসেট"
 
 msgid "Choose..."
-msgstr "পছন্দ করুন..."
+msgstr "বাছাই করুন..."
 
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "আপনি কি  নিশ্চিত আপনি \"%s\" মুছে ফেলতে চান"
+msgstr "আপনি কি  নিশ্চিতভাবে \"%s\" মুছে ফেলতে চান"
 
 msgid "Delete Status"
-msgstr "অবস্থা মুছুন"
+msgstr "অবস্থা মুছে ফেলুন"
 
 msgid "Saved Statuses"
-msgstr "সংরক্ষিত অবস্থাসমূহ"
+msgstr "সংরক্ষিত অবস্থা"
 
 msgid "Title"
 msgstr "শিরোনাম"
 
 msgid "Type"
-msgstr "ধরন"
+msgstr "ধরণ"
 
 #. Statuses are almost all the same. Define a macro to reduce code repetition.
 #. PurpleStatusPrimitive
@@ -1377,23 +1419,24 @@ msgstr "বার্তা"
 
 #. Use
 msgid "Use"
-msgstr "ব্যবহার করুন"
+msgstr "ব্যবহার"
 
+# mark
 msgid "Invalid title"
-msgstr "অবৈধ শিরোনাম"
+msgstr "অকার্যকর শিরোনাম"
 
 # tithi
 msgid "Please enter a non-empty title for the status."
-msgstr "অনুগ্রহ করে অবস্থার জন্য খালি নয় এমন শিরোনাম প্রবেশ করান।"
+msgstr "অনুগ্রহ করে অবস্থার জন্য একটি শিরোনাম দিন।"
 
 msgid "Duplicate title"
-msgstr "অনুরুপ শিরোনাম"
+msgstr "পুনঃব্যবহৃত শিরোনাম"
 
 msgid "Please enter a different title for the status."
-msgstr "অনুগ্রহ করে অবস্থাটির জন্য একটি ভিন্ন শিরোনাম প্রবেশ করান।"
+msgstr "অনুগ্রহ করে অবস্থাটির জন্য একটি ভিন্ন শিরোনাম দিন।"
 
 msgid "Substatus"
-msgstr "উপঅবস্থা"
+msgstr "উপ-অবস্থা"
 
 msgid "Status:"
 msgstr "অবস্থা:"
@@ -1402,37 +1445,37 @@ msgid "Message:"
 msgstr "বার্তা:"
 
 msgid "Edit Status"
-msgstr "অবস্থা সম্পাদন করুন"
+msgstr "অবস্থা সম্পাদনা"
 
 msgid "Use different status for following accounts"
-msgstr "নিম্নোক্ত একাউন্টসমুহের জন্য ভিন্ন অবস্থা ব্যবহার করুন"
+msgstr "নিম্নোক্ত একাউন্টসমুহের জন্য ভিন্ন অবস্থা ব্যবহার করা হবে"
 
 #. Save & Use
 msgid "Save & Use"
-msgstr "সংরক্ষণ এবং ব্যবহার করুন"
+msgstr "সংরক্ষণ & ব্যবহার"
 
 # tithi
 msgid "Certificates"
-msgstr "প্রত্যয়ন পত্র"
+msgstr "সার্টিফিকেট"
 
 msgid "Sounds"
-msgstr "শব্দসমূহ"
+msgstr "শব্দ"
 
 msgid "Statuses"
-msgstr "অবস্থাসমূহ"
+msgstr "অবস্থা"
 
 msgid "Error loading the plugin."
-msgstr "প্লাগইন লোড করার ত্রুটি।"
+msgstr "প্লাগইন লোড করায় ত্রুটি।"
 
 msgid "Couldn't find X display"
-msgstr "X প্রদর্শন খুঁজে পাবে না"
+msgstr "X ডিসপ্লে খুঁজে পাওয়া যায়নি"
 
 msgid "Couldn't find window"
-msgstr "উইন্ডো খুঁজে পাবে না"
+msgstr "উইন্ডো খুঁজে পাওয়া যায়নি"
 
 # tithi
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr "এই প্লাগইনটি লোড করা যায় না কারণ এটি X11 সমর্থনে তৈরী হয়নি।"
+msgstr "এই প্লাগইনটি লোড করা সম্ভব নয় কারণ এটিতে X11 সাপোর্ট নেই।"
 
 # tithi
 msgid "GntClipboard"
@@ -1441,21 +1484,20 @@ msgstr "GntClipboard"
 msgid "Clipboard plugin"
 msgstr "ক্লিপবোর্ড প্লাগইন"
 
-# tithi
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
-"যদি সম্ভব হয় , যখন gnt ক্লিপবোর্ডের বিষয়বস্তুসমূহ পরিবর্তন হয়, তখন X এ বিষয়বস্তুসমূহ "
-"সহজলভ্য করুন।"
+"যদি সম্ভব হয়, যখন gnt ক্লিপবোর্ডে ধারণকৃত মান পরিবর্তন হয় তখন তা X দ্বারা "
+"ব্যবহারোপযোগী করা হবে।"
 
 #, c-format
 msgid "%s just signed on"
-msgstr "%s অনলাইনে"
+msgstr "%s এইমাত্র লগইন করেছে"
 
 #, c-format
 msgid "%s just signed off"
-msgstr "%s অফলাইনে"
+msgstr "%s এইমাত্র লগআউট করেছে"
 
 #, c-format
 msgid "%s sent you a message"
@@ -1464,35 +1506,36 @@ msgstr "%s আপনাকে একটি বার্তা পাঠিয়
 # tithi
 #, c-format
 msgid "%s said your nick in %s"
-msgstr "%1s আপনার ডাক নাম %2s এ বলছে"
+msgstr "%1$s আপনার ডাক নাম %2$s বলেছে"
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%1s %2s এ একটি বার্তা পাঠিয়েছে"
+msgstr "%1$s %2$s এ একটি বার্তা পাঠিয়েছে"
 
 msgid "Buddy signs on/off"
-msgstr "বন্ধু সাইন চালু/বন্ধ"
+msgstr "বন্ধু লগইন/লগআউট করে"
 
 msgid "You receive an IM"
-msgstr "আপনার একটি তাৎক্ষনিক বার্তা গ্রহণ করেছেন"
+msgstr "আপনি একটি IM গ্রহন করেন"
 
 msgid "Someone speaks in a chat"
-msgstr "কেউ একজন আড্ডায় কথা বলছে"
+msgstr "কেউ আড্ডায় কথা বলে"
 
 msgid "Someone says your name in a chat"
-msgstr "কেউ একজন আড্ডায় আপনার নাম ধরে ডাকছে"
+msgstr "কেউ আড্ডায় আপনার নাম উল্লেখ করে"
 
 # tithi
 msgid "Notify with a toaster when"
-msgstr "টোস্টার দ্বারা অবগতি করুন যখন"
+msgstr "টোস্টার দ্বারা অবগত করুন যখন"
 
 # tithi
 msgid "Beep too!"
-msgstr "শব্দও করবে!"
+msgstr "শব্দ সংকেতও দিবে!"
 
 # tithi
+# ***
 msgid "Set URGENT for the terminal window."
-msgstr "টারমিনাল উইন্ডোর জন্য জরুরী নির্ধারণ করুন।"
+msgstr "টারমিনাল উইন্ডোর জন্য URGENT নির্ধারণ করুন।"
 
 # tithi
 msgid "GntGf"
@@ -1504,34 +1547,34 @@ msgstr "টোস্টার প্লাগইন"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>%2s এ %2s এর সাথে কথোপকথন:</b><br>"
+msgstr "<b>%2$s এ %1$s এর সাথে কথোপকথন:</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr "ইতিহাস প্লাগইনের লগ করা প্রয়োজন"
+msgstr "ইতিহাস প্লাগইন ব্যবহারের জন্য কথোপকথন সংরক্ষণ করা প্রয়োজন"
 
+# ***
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"টুলসমূহ -> অগ্রাধিকারসমূহ -> লগকরণ থেকে লগকরণ সক্রিয় করা যায়।\n"
+"টুল -> পছন্দসমূহ -> কথোপকথন সংরক্ষন থেকে কথোপকথন প্রদর্শন প্রক্রিয়া সক্রিয় করা যাবে।\n"
 "\n"
-"তাৎক্ষণিক বার্তার জন্য কার্যবিবরণীসমূহ সক্রিয় করছে এবং/বা একই ধরনের কথাবার্তার জন্য "
-"আড্ডা ইতিহাস সক্রিয় করবে।"
+"তাৎক্ষণিক বার্তা বা আড্ডার রেকর্ড শুরু করা হলে আড্ডা ইতিহাস সক্রিয় করা হবে।"
 
 msgid "GntHistory"
 msgstr "GntHistory"
 
 msgid "Shows recently logged conversations in new conversations."
-msgstr "নতুন কথোপকথনসমূহে সাম্প্রতিক লগকৃত কথোপকথনসমূহ প্রদর্শন করে।"
+msgstr "সম্প্রতি সংরক্ষিত কথোপকথন নতুন আড্ডায় প্রদর্শন করা হবে"
 
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"যখন একটি নতুন কথোপকথন খোলা হয় তখন এই প্লাগ-ইনটি নতুন কথোপকথনে সর্বশেষ কথোপকথন "
-"প্রবেশ করবে।"
+"নতুন কথোপকথন শুরু করার সময় এই প্লাগইনটি নতুন কথোপকথনের উইন্ডোতে সর্বশেষ কথোপকথন "
+"প্রবেশ করাবে।"
 
 msgid "Online"
 msgstr "অনলাইন"
@@ -1540,7 +1583,7 @@ msgid "Offline"
 msgstr "অফলাইন "
 
 msgid "Online Buddies"
-msgstr "অফলাইন বন্ধু"
+msgstr "অনলাইন বন্ধু"
 
 msgid "Offline Buddies"
 msgstr "অফলাইন বন্ধু"
@@ -1553,7 +1596,7 @@ msgid "Meebo"
 msgstr "Meebo"
 
 msgid "No Grouping"
-msgstr "দলগত নয়"
+msgstr "দলভুক্ত নয়"
 
 # tithi
 msgid "Nested Subgroup"
@@ -1564,16 +1607,16 @@ msgid "Nested Grouping (experimental)"
 msgstr "নেস্টেড দলগতকরণ (পরীক্ষামূলক)"
 
 msgid "Provides alternate buddylist grouping options."
-msgstr "পর্যাক্রমিক বন্ধু-তালিকার দলগতকরণ পছন্দসমূহ প্রদান করে।"
+msgstr "বন্ধু-তালিকার বিকল্প দলগতকরণ অপশন প্রদান করে।"
 
 # tithi
 msgid "Lastlog"
-msgstr "সর্বশেষ-লগ"
+msgstr "Lastlog"
 
 # tithi
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr "সর্বশেষ-লগ: ব্যাকলগে উপস্ট্রিং খুঁজছে।"
+msgstr "lastlog: backlog এ সাবস্ট্রিং অনুসন্ধান করা হয়।"
 
 # tithi
 msgid "GntLastlog"
@@ -1581,59 +1624,84 @@ msgstr "GntLastlog"
 
 # tithi
 msgid "Lastlog plugin."
-msgstr "সর্বশেষ-লগ প্লাগইন।"
+msgstr "Lastlog প্লাগইন।"
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"TinyURL  আনা হচ্ছে..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "শুধুমাত্র এইরকম অথবা এর চাইতে বড় দৈর্ঘ্যের URL এর জন্য TinyURL তৈরি করুন।"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (অথবা অন্যান্য) ঠিকানার উপসর্গ"
+
+# tithi
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL প্লাগইন"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"URL সহ একটি বার্তা গ্রহন করার সময় সহজভাবে অনুলিপি করার জন্য TinyURL ব্যবহৃত হয়"
 
 msgid "accounts"
-msgstr "একাউন্টসমূহ"
+msgstr "একাউন্ট"
 
 msgid "Password is required to sign on."
-msgstr "যোগদানের জন্য গুপ্তসংকেত আবশ্যক।"
+msgstr "লগইনের জন্য পাসওয়ার্ড আবশ্যক।"
 
 #, c-format
 msgid "Enter password for %s (%s)"
-msgstr "%1s (%2s) এর জন্য গুপ্তসংকেত প্রবেশ করান"
+msgstr "%1$s (%2$s) এর জন্য পাসওয়ার্ড দিন"
 
 msgid "Enter Password"
-msgstr "গুপ্তসংকেত প্রবেশ করান"
+msgstr "পাসওয়ার্ড দিন"
 
 msgid "Save password"
-msgstr "গুপ্তসংকেত সংরক্ষণ করুন"
+msgstr "পাসওয়ার্ড সংরক্ষণ"
 
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "%s এর জন্য নিরুদ্দিষ্ট প্রটোকল প্লাগইন"
+msgstr "%s এর জন্য নিখোঁজ প্রোটোকল প্লাগইন"
 
 msgid "Connection Error"
-msgstr "সংযোগ ত্রুটি"
+msgstr "সংযোগে ত্রুটি"
 
 msgid "New passwords do not match."
-msgstr "নতুন গুপ্তসংকেতসমূহ মিলছে না।"
+msgstr "নতুন পাসওয়ার্ডগুলো মিলছে না।"
 
 msgid "Fill out all fields completely."
-msgstr "সব ক্ষেত্র সম্পূর্ণরুপে পূরণ করুন।"
+msgstr "সব ক্ষেত্র সম্পূর্ণভাবে পূরণ করুন।"
 
 msgid "Original password"
-msgstr "মূল গুপ্তসংকেত"
+msgstr "মূল পাসওয়ার্ড"
 
 msgid "New password"
-msgstr "নতুন গুপ্তসংকেত"
+msgstr "নতুন পাসওয়ার্ড"
 
 msgid "New password (again)"
-msgstr "নতুন গুপ্তসংকেত (আবার)"
+msgstr "নতুন পাসওয়ার্ড (আবার)"
 
 #, c-format
 msgid "Change password for %s"
-msgstr "%s এর জন্য গুপ্তসংকেত পরিবর্তন করুন"
+msgstr "%s এর জন্য পাসওয়ার্ড পরিবর্তন করুন"
 
 msgid "Please enter your current password and your new password."
-msgstr "অনুগ্রহ করে আপনার বর্তমান গুপ্তসংকেত এবং নতুন গুপ্তসংকেত প্রবেশ করান।"
+msgstr "অনুগ্রহ করে আপনার বর্তমান পাসওয়ার্ড এবং নতুন পাসওয়ার্ড দিন।"
 
 #, c-format
 msgid "Change user information for %s"
-msgstr "%s এর জন্য ব্যবহাকারীর তথ্য পরিবর্তন করুন"
+msgstr "%s এর জন্য ব্যবহাকারী তথ্য পরিবর্তন করুন"
 
 msgid "Set User Info"
-msgstr "ব্যবহারকারীর তথ্য নির্ধারণ করুন"
+msgstr "ব্যবহারকারীর তথ্য নির্ধারণ"
 
 msgid "Unknown"
 msgstr "অজানা"
@@ -1652,7 +1720,7 @@ msgstr "(মিলে না)"
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr "শুধুমাত্র-এটি-একবার ব্যবহারের জন্য %s নিম্নলিখিত প্রত্যয়ন পত্র উপস্থাপন করেছে:"
+msgstr "শুধুমাত্র একবার ব্যবহারের জন্য %s নিম্নলিখিত সার্টিফিকেট উপস্থাপন করেছে:"
 
 # tithi
 #, c-format
@@ -1660,48 +1728,40 @@ msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
-"সাধারণ নাম: %1s %2s\n"
-"ফিঙ্গারপ্রিন্ট (SHA1): %3s"
+"সাধারণ নাম: %1$s %2$s\n"
+"ফিঙ্গারপ্রিন্ট (SHA1): %3$s"
 
 # tithi
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr "একক-ব্যবহারের প্রত্যয়ন পত্রের সত্যতা যাচাই"
+msgstr "একক-ব্যবহার সার্টিফিকেটের সত্যতা যাচাই"
 
 # tithi
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr "প্রত্যয়ন পত্রের কর্তৃপক্ষ"
+msgstr "সার্টিফিকেটের কর্তৃপক্ষ"
 
 # tithi
 #. Scheme name
 #. Pool name
 msgid "SSL Peers Cache"
-msgstr "SSL পিয়ার্স ক্যাশে"
+msgstr "SSL পিয়ার্স ক্যাশ"
 
 #. Make messages
 #, c-format
 msgid "Accept certificate for %s?"
-msgstr "%s এর জন্য কি প্রত্যয়ন পত্র গ্রহণ করবেন?"
+msgstr "%s এর জন্য কি সার্টিফিকেট গ্রহণ করা হবে?"
 
 # tithi
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr "SSL প্রত্যয়ন পত্রের সত্যতা যাচাই"
-
-#. Number of actions
-msgid "Accept"
-msgstr "গ্রহণ করুন"
-
-msgid "Reject"
-msgstr "প্রত্যাখান করুন"
+msgstr "SSL সার্টিফিকেটের সত্যতা যাচাই"
 
 # tithi
 msgid "_View Certificate..."
-msgstr "প্রত্যয়ন পত্র দেখুন...(_V)"
+msgstr "সার্টিফিকেট প্রদর্শন... (_V)"
 
-# tithi
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1709,24 +1769,25 @@ msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
-"\"%s\" দ্বারা উপস্থাপিত প্রত্যয়ন পত্রটি স্ব-সাক্ষরিত। এটি স্বয়ংক্রিয়ভাবে পরীক্ষা করা "
+"\"%s\" দ্বারা উপস্থাপিত সার্টিফিকেটটি স্ব-স্বাক্ষরিত। এটি স্বয়ংক্রিয়ভাবে পরীক্ষা করা "
 "যাবে না।"
 
-# tithi
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr "%s এর জন্য উপস্থাপিত প্রত্যয়ন পত্রের শৃঙ্খল বৈধ নয়।"
+msgstr "%s এর জন্য উপস্থাপিত সার্টিফিকেট চেইন কার্যকর নয়।"
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
-msgstr "SSL প্রত্যয়ন পত্রের ত্রুটি"
+msgstr "SSL সার্টিফিকেট ত্রুটি"
 
 msgid "Invalid certificate chain"
-msgstr "অবৈধ প্রত্যয়ন পত্রের শৃঙ্খল"
+msgstr "অকার্যকর সার্টিফিকেট চেইন"
 
 # tithi
 #. vrq will be completed by user_auth
@@ -1734,29 +1795,27 @@ msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
-"আপনার মূল প্রত্যয়ন পত্রের কোনো উপাত্তধার নেই, সুতরাং এই প্রত্যয়ন পত্রটি বৈধ করা যাবে "
-"না।"
+"আপনার মূল সার্টিফিকেটের কোনো ডাটাবেস নেই, সুতরাং এই সার্টিফিকেটটির কার্যকারিতা "
+"পরীক্ষা করা যাবে না।"
 
 # tithi
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "মূল প্রত্যয়ন পত্রটি যার দ্বারা প্রদান করা হয়েছে তা পিজিনের কাছে অপরিচিত।"
+msgstr "মূল সার্টিফিকেটটি যার দ্বারা প্রদান করা হয়েছে তা পিজিনের কাছে অপরিচিত।"
 
-# tithi
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
 msgstr ""
-"%s দ্বারা উপস্থাপিত প্রত্যয়ন পত্র শৃঙ্খলের প্রত্যয়ন পত্রের কর্তৃপক্ষ হতে প্রাপ্ত বৈধ "
-"ডিজিটাল স্বাক্ষর নেই যা দ্বারা এটি দাবী করে যে এর স্বাক্ষর আছে।"
+"%s দ্বারা উপস্থাপিত সার্টিফিকেট চেইনটির তার নিজের দ্বারা দাবিকৃত কর্তৃপক্ষ থেকে কোন "
+"বৈধ ডিজিটাল স্বাক্ষর নেই।"
 
 msgid "Invalid certificate authority signature"
-msgstr "অবৈধ প্রত্যয়ন পত্র কতৃপক্ষের স্বাক্ষর"
+msgstr "অকার্যকর সার্টিফিকেট কতৃপক্ষের স্বাক্ষর"
 
-# tithi
 #. Prompt the user to authenticate the certificate
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
@@ -1766,9 +1825,9 @@ msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
 "could mean that you are not connecting to the service you believe you are."
 msgstr ""
-"প্রত্যয়ন পত্রটি দাবি করে যে এটি \"%2s\" এর পরিবর্তে \"%1s\" দ্বারা উপস্থাপিত "
-"হয়েছে।  এটি বোঝাতে পার যে আপনি এমন সেবার সাথে সংযুক্ত নন যাতে আপনি আছেন বলে "
-"বিশ্বাস করেন।"
+"সার্টিফিকেটটি দাবি করে যে এটি \"%1$s\" এর পরিবর্তে \"%2$s\" দ্বারা উপস্থাপিত "
+"হয়েছে। এর অর্থ হতে পার যে, আপনি যে সার্ভিসের সাথে সংযুক্ত বলে মনে করছেন আসলে তা "
+"নয়।"
 
 # tithi
 #. Make messages
@@ -1781,60 +1840,61 @@ msgid ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
-"সাধারণ নাম: %s\n"
+"সাধারণ নাম: %1$s\n"
 " \n"
-"হস্তাঙ্গুলির ছাপ (SHA1): %s\n"
+"ফিঙ্গারপ্রিন্ট (SHA1): %2$s\n"
 "\n"
-"সক্রিয়করণ তারিখ: %s\n"
-"মেয়াদ উত্তীর্ণের তারিখ: %s\n"
+"সক্রিয়করণ তারিখ: %3$s\n"
+"মেয়াদ উত্তীর্ণের তারিখ: %4$s\n"
 
 #. TODO: Find what the handle ought to be
 msgid "Certificate Information"
-msgstr "প্রত্যদন পত্রের তথ্য"
+msgstr "সার্টিফিকেটের তথ্য"
 
 msgid "Registration Error"
 msgstr "নিবন্ধন ত্রুটি"
 
 msgid "Unregistration Error"
-msgstr "নিবন্ধনহীন ত্রুটি"
+msgstr "অনিবন্ধন ত্রুটি"
 
 #, c-format
 msgid "+++ %s signed on"
-msgstr "+++ %s এখন অনলাইন "
+msgstr "+++ %s লগইন করেছে"
 
 #, c-format
 msgid "+++ %s signed off"
-msgstr "+++ %s এখন অফলাইন"
+msgstr "+++ %s লগআউট করেছে"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "অজানা ত্রুটি"
 
 msgid "Unable to send message: The message is too large."
-msgstr "বার্তা পাঠাতে সমর্থ নয়: বার্তাটি খুবই বড়।"
+msgstr "বার্তা পাঠাতে ব্যর্থ: বার্তাটি খুবই বড়।"
 
 #, c-format
 msgid "Unable to send message to %s."
-msgstr "%s-এ বার্তাটি পাঠাতে সমর্থ নয়।"
+msgstr "%s-কে বার্তা পাঠানো যায়নি।"
 
 msgid "The message is too large."
 msgstr "বার্তাটি খুবই বড়।"
 
 msgid "Unable to send message."
-msgstr "বার্তা পাঠাতে সমর্থ নয়।"
+msgstr "বার্তা পাঠানো যায়নি।"
 
 msgid "Send Message"
-msgstr "বার্তা প্রেরণ করুন"
+msgstr "বার্তা পাঠান"
 
 msgid "_Send Message"
-msgstr "বার্তা প্রেরণ করুন (_S)"
+msgstr "বার্তা পাঠান (_S)"
 
 #, c-format
 msgid "%s entered the room."
-msgstr "%s এই কক্ষে প্রবেশ করেছে।"
+msgstr "%s  আসরে প্রবেশ করেছে।"
 
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
-msgstr "%1s [<I>%2s</I>] এই কক্ষে প্রবেশ করেছে।"
+msgstr "%1$s [<I>%2$s</I>] আসরে প্রবেশ করেছে।"
 
 #, c-format
 msgid "You are now known as %s"
@@ -1842,15 +1902,27 @@ msgstr "আপনি এখন %s নামে পরিচিত"
 
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%1s এখন %2s নামে পরিচিত"
+msgstr "%1$s এখন %2$s নামে পরিচিত"
 
 #, c-format
 msgid "%s left the room."
-msgstr "%s এই কক্ষে ত্যাগ করেছে।"
+msgstr "%s আসর ত্যাগ করেছে।"
 
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%1s (%2s) এই কক্ষে ত্যাগ করেছে।"
+msgstr "%1$s (%2$s) আসর ত্যাগ করেছে।"
+
+# tithi
+msgid "Invite to chat"
+msgstr "আড্ডায় আমন্ত্রন জানান"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"একটি ঐচ্ছিক আমন্ত্রণ বার্তা সহ, অনুগ্রহ করে আপনি যে ব্যবহারকারীকে আমন্ত্রণ জানাতে চান "
+"তার নামটি দিন।"
 
 #, c-format
 msgid "Failed to get connection: %s"
@@ -1864,48 +1936,48 @@ msgstr "নাম পেতে ব্যর্থ: %s"
 msgid "Failed to get serv name: %s"
 msgstr "সার্ভার নাম পেতে ব্যর্থ: %s"
 
-# tithi
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr "Purple-এর D-BUS সার্ভার নিচের তালিকাভুক্ত কারণের জন্য চলছে না"
+msgstr "Purple-এর D-BUS সার্ভার নিম্নল্লিখিত কারণে চলছে না"
 
 msgid "No name"
 msgstr "কোনো নাম নেই"
 
+# ***
 msgid "Unable to create new resolver process\n"
-msgstr "নতুন সমাধান পদ্ধতি তৈরী করতে অক্ষম\n"
+msgstr "নতুন রিসলভার প্রসেস তৈরী করতে ব্যর্থ\n"
 
 msgid "Unable to send request to resolver process\n"
-msgstr "সমাধানকারীর পদ্ধতিতে অনুরোধ পাঠাতে অক্ষম\n"
+msgstr "রিসলভার প্রসেসে অনুরোধ পাঠাতে ব্যর্থ\n"
 
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"%1s সমাধানে ত্রুটি: \n"
-"%2s"
+"%1$s নিরূপণে ত্রুটি: \n"
+"%2$s"
 
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr "%1s সমাধানে ত্রুটি: %2d"
+msgstr "%1$s নিরূপণে ত্রুটি: %2$d"
 
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
-"সমাধানকারীর পদ্ধতি হতে পড়ায় ত্রুটি:\n"
+"রিসলভার প্রসেস থেকে পড়ায় ত্রুটি:\n"
 "%s"
 
 # tithi
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr "সমাধানকারী পদ্ধতি আমাদের অনুরোধের উত্তর না দিয়ে প্রস্থান করেছে"
+msgstr "রিসলভার প্রসেস অনুরোধের উত্তর না দিয়ে প্রস্থান করেছে"
 
 # tithi
 #, c-format
 msgid "Thread creation failure: %s"
-msgstr "থ্রেড সৃষ্টি ব্যর্থ: %s"
+msgstr "থ্রেড তৈরি করতে ব্যর্থ: %s"
 
 msgid "Unknown reason"
 msgstr "অজানা কারণ"
@@ -1915,42 +1987,42 @@ msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
-"%1s পড়ায় ত্রুটি: \n"
-"%2s।\n"
+"%1$s পড়ায় ত্রুটি: \n"
+"%2$s।\n"
 
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
-"%1s লেখায় ত্রুটি: \n"
-"%2s।\n"
+"%1$s লেখায় ত্রুটি: \n"
+"%2$s।\n"
 
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
-"%s-এ প্রবেশে ত্রুটি: \n"
-"%s।\n"
+"%1$s-এ প্রবেশে ত্রুটি: \n"
+"%2$s।\n"
 
-# tithi
 msgid "Directory is not writable."
-msgstr "নির্দেশিকা লিখনযোগ্য নয়।"
+msgstr "ডিরেক্টরি লিখনযোগ্য নয়।"
 
 msgid "Cannot send a file of 0 bytes."
-msgstr "০ বাইটের কোনো ফাইল পাঠাতে পারে না।"
+msgstr "০ বাইটের কোনো ফাইল পাঠানো সম্ভব নয়।"
 
 msgid "Cannot send a directory."
-msgstr "নির্দেশিকা পাঠাতে পারে না।"
+msgstr "ডিরেক্টরি পাঠানো সম্ভব নয়।"
 
+# ***
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s নিয়মিত কোনো ফাইল নয়। কাপুরুষোচিত ভাবে উপরিলেখ করতে প্রত্যাখ্যান করছে।\n"
+msgstr "%s কোনো স্বাভাবিক ফাইল নয়। অতিসন্তর্পণে উপরিলেখন প্রত্যাখ্যান করা হয়েছে।\n"
 
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr "%1s আপনাকে %2s (%3s) পাঠাতে চায়"
+msgstr "%1$s আপনাকে %2$s (%3$s) পাঠাতে চায়"
 
 #, c-format
 msgid "%s wants to send you a file"
@@ -1958,7 +2030,7 @@ msgstr "%s আপনাকে একটি ফাইল পাঠাতে চ�
 
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr "%s এর ফাইল স্থানান্তর করার অনুরোধ গ্রহন করবেন কি?"
+msgstr "%s এর ফাইল স্থানান্তরের অনুরোধ গ্রহন করা হবে কি?"
 
 #, c-format
 msgid ""
@@ -1966,13 +2038,13 @@ msgid ""
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"একটি ফাইল যেখান থেকে ডাউনলোড করার জন্য সহজলভ্য:\n"
+"নিম্নবর্তী স্থান থেকে একটি ফাইল ডাউনলোডযোগ্য:\n"
 "দূরবর্তী হোস্ট: %s\n"
 "দূরবর্তী পোর্ট: %d"
 
 #, c-format
 msgid "%s is offering to send file %s"
-msgstr "%1s %2s ফাইলটি পাঠানোর প্রস্তাব দিচ্ছে"
+msgstr "%1$s %2$s ফাইলটি পাঠানোর প্রস্তাব দিচ্ছে"
 
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1980,18 +2052,22 @@ msgstr "%s বৈধ ফাইল নাম নয়।\n"
 
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "%2s এ %1s পাঠানোর প্রস্তাব দিচ্ছে"
+msgstr "%2$s এ %1$s পাঠানোর প্রস্তাব দিচ্ছে"
 
 #, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "%2s হতে %1s-এর স্থানান্তর শুরু হচ্ছে"
+msgstr "%2$s থেকে %1$s-এর স্থানান্তর শুরু হচ্ছে"
+
+#, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "<A HREF=\"file://%s\">%s</A> ফাইলের স্থানান্তর সম্পন্ন"
 
 #, c-format
 msgid "Transfer of file %s complete"
-msgstr "%s ফাইলের স্থানান্তর সম্পূর্ণ"
+msgstr "%s ফাইলের স্থানান্তর সম্পন্ন"
 
 msgid "File transfer complete"
-msgstr "ফাইল স্থানান্তর সম্পূর্ণ"
+msgstr "ফাইল স্থানান্তর সম্পন্ন"
 
 #, c-format
 msgid "You canceled the transfer of %s"
@@ -2002,7 +2078,7 @@ msgstr "ফাইল স্থানান্তর বাতিল করা �
 
 #, c-format
 msgid "%s canceled the transfer of %s"
-msgstr "%1s %2s-এর স্থানান্তর বাতিল করেছে"
+msgstr "%1$s %2$s-এর স্থানান্তর বাতিল করেছে"
 
 #, c-format
 msgid "%s canceled the file transfer"
@@ -2010,49 +2086,46 @@ msgstr "%s ফাইল স্থানান্তর বাতিল করে
 
 #, c-format
 msgid "File transfer to %s failed."
-msgstr "%s এ ফাইলের স্থানান্তর ব্যর্থ হয়েছে।"
+msgstr "%s এ ফাইল স্থানান্তর ব্যর্থ হয়েছে।"
 
 #, c-format
 msgid "File transfer from %s failed."
-msgstr "%s থেকে ফাইলের স্থানান্তর ব্যর্থ হয়েছে।"
+msgstr "%s থেকে ফাইল স্থানান্তর ব্যর্থ হয়েছে।"
 
 msgid "Run the command in a terminal"
-msgstr "নির্দেশটি টার্মিনালে চালান"
+msgstr "কমান্ডটি টার্মিনালে চালান"
 
 # tithi
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "যদি সক্রিয় থাকে, এই নির্দেশটি ‌‌\"aim\" এর URL নিয়ন্ত্রণ করতে ব্যবহার করা হয়।"
+msgstr "যদি সক্রিয় থাকে, ‌‌\"aim\" এর URL নিয়ন্ত্রণ করতে ব্যবহৃত কমান্ড।"
 
 # tithi
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "যদি সক্রিয় থাকে, এই নির্দেশটি ‌‌\"gg\" এর URL নিয়ন্ত্রণ করতে ব্যবহার করা হয়।"
+msgstr "যদি সক্রিয় থাকে,  \"gg\" এর URL নিয়ন্ত্রণ করতে ব্যবহৃত কমান্ড।"
 
 # tithi
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "যদি সক্রিয় থাকে, এই নির্দেশটি ‌‌\"icq\" এর URL নিয়ন্ত্রণ করতে ব্যবহার করা হয়।"
+msgstr "যদি সক্রিয় থাকে,  \"icq\" এর URL নিয়ন্ত্রণ করতে ব্যবহৃত কমান্ড।"
 
 # tithi
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "যদি সক্রিয় থাকে, এই নির্দেশটি ‌‌\"irc\" এর URL নিয়ন্ত্রণ করতে ব্যবহার করা হয়।"
+msgstr "যদি সক্রিয় থাকে,  \"irc\" এর URL নিয়ন্ত্রণ করতে ব্যবহৃত কমান্ড।"
 
 # tithi
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
-"যদি সক্রিয় থাকে, এই নির্দেশটি ‌‌\"msnim\" এর URL নিয়ন্ত্রণ করতে ব্যবহার করা হয়।"
+msgstr "যদি সক্রিয় থাকে,  \"msnim\" এর URL নিয়ন্ত্রণ করতে ব্যবহৃত কমান্ড।"
 
 # tithi
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "যদি সক্রিয় থাকে, এই নির্দেশটি ‌‌\"sip\" এর URL নিয়ন্ত্রণ করতে ব্যবহার করা হয়।"
+msgstr "যদি সক্রিয় থাকে, \"sip\" এর URL নিয়ন্ত্রণ করতে ব্যবহৃত কমান্ড।"
 
 # tithi
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
-"যদি সক্রিয় থাকে, এই নির্দেশটি ‌‌\"xmpp\" এর URL নিয়ন্ত্রণ করতে ব্যবহার করা হয়।"
+msgstr "যদি সক্রিয় থাকে,  \"xmpp\" এর URL নিয়ন্ত্রণ করতে ব্যবহৃত কমান্ড।"
 
 # tithi
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
-"যদি সক্রিয় থাকে, এই নির্দেশটি ‌‌\"ymsgr\" এর URL নিয়ন্ত্রণ করতে ব্যবহার করা হয়।"
+msgstr "যদি সক্রিয় থাকে, \"ymsgr\" এর URL নিয়ন্ত্রণ করতে ব্যবহৃত কমান্ড।"
 
 # tithi
 msgid "The handler for \"aim\" URLs"
@@ -2090,203 +2163,208 @@ msgstr "\"ymsgr\" এর URL-এর জন্য নিয়ন্ত্রণক�
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
-msgstr "সত্য যদি \"নির্দেশ\" কী-তে উল্লেখিত নির্দেশটি \"aim\" এর URL নিয়ন্ত্রণ করে।"
+msgstr "সত্য, যদি \"command\" কী-তে উল্লেখিত কমান্ডটি \"aim\" এর URL নিয়ন্ত্রণ করে।"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
-msgstr "সত্য যদি \"নির্দেশ\" কী-তে উল্লেখিত নির্দেশটি \"gg\" এর URL নিয়ন্ত্রণ করে।"
+msgstr "সত্য, যদি \"command\" কী-তে উল্লেখিত কমান্ডটি \"gg\" এর URL নিয়ন্ত্রণ করে।"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
-msgstr "সত্য যদি \"নির্দেশ\" কী-তে উল্লেখিত নির্দেশটি \"icq\" এর URL নিয়ন্ত্রণ করে।"
+msgstr "সত্য, যদি \"command\" কী-তে উল্লেখিত কমান্ডটি \"icq\" এর URL নিয়ন্ত্রণ করে।"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
-msgstr "সত্য যদি \"নির্দেশ\" কী-তে উল্লেখিত নির্দেশটি \"irc\" এর URL নিয়ন্ত্রণ করে।"
+msgstr "সত্য, যদি \"command\" কী-তে উল্লেখিত কমান্ডটি \"irc\" এর URL নিয়ন্ত্রণ করে।"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"সত্য যদি \"নির্দেশ\" কী-তে উল্লেখিত নির্দেশটি \"msnim\" এর URL নিয়ন্ত্রণ করে।"
+"সত্য, যদি \"command\" কী-তে উল্লেখিত কমান্ডটি \"msnim\" এর URL নিয়ন্ত্রণ করে।"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
-msgstr "সত্য যদি \"নির্দেশ\" কী-তে উল্লেখিত নির্দেশটি \"sip\" এর URL নিয়ন্ত্রণ করে।"
+msgstr "সত্য, যদি \"command\" কী-তে উল্লেখিত কমান্ডটি \"sip\" এর URL নিয়ন্ত্রণ করে।"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
-msgstr "সত্য যদি \"নির্দেশ\" কী-তে উল্লেখিত নির্দেশটি \"xmpp\" এর URL নিয়ন্ত্রণ করে।"
+msgstr ""
+"সত্য, যদি \"command\" কী-তে উল্লেখিত কমান্ডটি \"xmpp\" এর URL নিয়ন্ত্রণ করে।"
 
 # tithi
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"সত্য যদি \"নির্দেশ\" কী-তে উল্লেখিত নির্দেশটি \"ymsgr\" এর URL নিয়ন্ত্রণ করে।"
+"সত্য, যদি \"command\" কী-তে উল্লেখিত কমান্ডটি \"ymsgr\" এর URL নিয়ন্ত্রণ করে।"
 
 # tithi
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
-msgstr "সত্য হবে যদি এই ধরনের URL নিয়ন্ত্রণ করতে ব্যবহৃত নির্দেশটি টার্মিনালে চলে। "
+msgstr "সত্য, হবে যদি এই ধরনের URL নিয়ন্ত্রণ করতে ব্যবহৃত কমান্ডটি টার্মিনালে চলে। "
 
 # tithi
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "উল্লেখিত নির্দেশটি \"aim\" এর URL নিয়ন্ত্রণ করবে কিনা"
+msgstr "উল্লেখিত কমান্ডটি \"aim\" এর URL নিয়ন্ত্রণ করবে কিনা"
 
 # tithi
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "উল্লেখিত নির্দেশটি \"gg\" এর URL নিয়ন্ত্রণ করবে কিনা"
+msgstr "উল্লেখিত কমান্ডটি \"gg\" এর URL নিয়ন্ত্রণ করবে কিনা"
 
 # tithi
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "উল্লেখিত নির্দেশটি \"icq\" এর URL নিয়ন্ত্রণ করবে কিনা"
+msgstr "উল্লেখিত কমান্ডটি \"icq\" এর URL নিয়ন্ত্রণ করবে কিনা"
 
 # tithi
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "উল্লেখিত নির্দেশটি \"irc\" এর URL নিয়ন্ত্রণ করবে কিনা"
+msgstr "উল্লেখিত কমান্ডটি \"irc\" এর URL নিয়ন্ত্রণ করবে কিনা"
 
 # tithi
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "উল্লেখিত নির্দেশটি \"msnim\" এর URL নিয়ন্ত্রণ করবে কিনা"
+msgstr "উল্লেখিত কমান্ডটি \"msnim\" এর URL নিয়ন্ত্রণ করবে কিনা"
 
 # tithi
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "উল্লেখিত নির্দেশটি \"sip\" এর URL নিয়ন্ত্রণ করবে কিনা"
+msgstr "উল্লেখিত কমান্ডটি \"sip\" এর URL নিয়ন্ত্রণ করবে কিনা"
 
 # tithi
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "উল্লেখিত নির্দেশটি \"xmpp\" এর URL নিয়ন্ত্রণ করবে কিনা"
+msgstr "উল্লেখিত কমান্ডটি \"xmpp\" এর URL নিয়ন্ত্রণ করবে কিনা"
 
 # tithi
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "উল্লেখিত নির্দেশটি \"ymsgr\" এর URL নিয়ন্ত্রণ করবে কিনা"
+msgstr "উল্লেখিত কমান্ডটি \"ymsgr\" এর URL নিয়ন্ত্রণ করবে কিনা"
 
+# ***
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr "<b><font color=\"red\">এই লগাকারীর পাঠ করার কোনো  ফাংশন নেই</font></b>"
+msgstr "<b><font color=\"red\">এই লগারের কোনো read ফাংশন নেই</font></b>"
 
 msgid "HTML"
-msgstr "এইচটিএমএল"
+msgstr "HTML"
 
 msgid "Plain text"
-msgstr "সরল পাঠ"
+msgstr "সরল টেক্সট"
 
 # tithi
 msgid "Old flat format"
-msgstr "পুরাতন সম্পূর্ণ বিন্যাস"
+msgstr "পুরাতন সরল বিন্যাস"
 
 msgid "Logging of this conversation failed."
-msgstr "এই কথোপকথোনে সংযুক্তকরণ ব্যর্থ।"
+msgstr "এই কথোপকথন লগ করতে ব্যর্থ।"
 
 msgid "XML"
-msgstr "এক্সএমএল"
+msgstr "XML"
 
+# ***
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%1s)</font> <b>%2s &3lt;স্বয়ংক্রিয়-"
-"উত্তর&4gt;:</b></font> %5s<br/>\n"
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
 
+# ***
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%1s)</font> <b>%2s &3lt;স্বয়ংক্রিয়-"
-"উত্তর&4gt;:</b></font> %5s<br/>\n"
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
 
+# ***
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>লগ পথ খুঁজতে অক্ষম</b></font>"
+msgstr "<font color=\"red\"><b>লগ পাথ খুঁজে পাওয়া যায়নি!</b></font>"
 
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr "<font color=\"red\"><b>ফাইল পড়তে পারেনি: %s</b></font>"
+msgstr "<font color=\"red\"><b>ফাইল পড়া সম্ভব হয়নি: %s</b></font>"
 
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr "(%1s) %2s <AUTO-REPLY>: %3s\n"
+msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
 # tithi
+msgid "Error creating conference."
+msgstr "অধিবেশন তৈরিতে ত্রুটি"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr "আপনি %1s ব্যবহার করছেন, কিন্তু এই প্লাগইনের %2s প্রয়োজন।"
+msgstr "আপনি %1$s ব্যবহার করছেন, কিন্তু এই প্লাগইনের %2$s প্রয়োজন।"
 
-# tithi
 msgid "This plugin has not defined an ID."
-msgstr "এই প্লাগইন একটি আইডি নির্ধারণ করেনি।"
+msgstr "এই প্লাগইন কোন ID নির্ধারণ করেনি।"
 
-# tithi
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr "প্লাগইন ম্যাজিক %1d এর সাথে মিলে না (%2d প্রয়োজন)"
+msgstr "প্লাগইন ম্যাজিকের সাথে অমিল %1$d (%2$d প্রয়োজন)"
 
-# tithi
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "ABI সংস্করণ %1d এর সাথে মিলে না।%2d.x (%3d.%4d.x প্রয়োজন)"
+msgstr "ABI সংস্করণ এ অমিল %d.%d.x (%d.%d.x প্রয়োজন)"
 
 # tithi
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr ""
-"প্লাগইন সকল প্রয়োজনীয় ফাংশন বাস্তবায়ন করে না (লিস্ট-আইকন (_i), লগইন এবং বন্ধ করুন)"
+msgstr "প্লাগইন সব প্রয়োজনীয় ফাংশন বাস্তবায়ন করে না (list_icon, login and close)"
 
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"প্রয়োজনীয় প্লাগইন %s খুঁজে পাওয়া যায়নি। অনুগ্রহ করে এই প্লাগইনটি সংস্থাপন করুন এবং "
+"প্রয়োজনীয় প্লাগইন %s খুঁজে পাওয়া যায়নি। অনুগ্রহ করে এই প্লাগইনটি ইনস্টল করুন এবং "
 "পুনরায় চেষ্টা করুন।"
 
 msgid "Unable to load the plugin"
-msgstr "প্লাগইনটি লোড করতে অক্ষম"
+msgstr "প্লাগইনটি লোড করতে ব্যর্থ"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "প্রয়োজনীয় প্লাগইন %s লোড করতে অক্ষম।"
+msgstr "প্রয়োজনীয় প্লাগইন %s লোড হতে ব্যর্থ।"
 
 msgid "Unable to load your plugin."
-msgstr "আপনার প্লাগইনটি লোড করতে অক্ষম।"
+msgstr "আপনার প্লাগইনটি লোড করতে ব্যর্থ।"
 
 #, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "%1s এর %2s প্রয়োজন, কিন্তু এটি লোডহীন করতে ব্যর্থ।"
+msgstr "%1$s এর %2$s প্রয়োজন, কিন্তু এটি আনলোড করতে ব্যর্থ হয়েছে।"
 
+# ***
 msgid "Autoaccept"
-msgstr "স্বয়ংক্রিয়-গ্রহণ"
+msgstr "স্বয়ংক্রিয়ভাবে গ্রহন"
 
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "নির্বাচিত ব্যবহারকারীর কাছ থেকে স্বয়ং-গ্রহণ ফাইলের স্থানান্তর অনুরোধ করছে।"
+msgstr "নির্বাচিত ব্যবহারকারী থেকে ফাইল স্থানান্তরের অনুরোধ স্বয়ংক্রিয়ভাবে গৃহীত হবে।"
 
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "\"%1s\" হতে \"%2s\" স্বয়ং-গৃহীত ফাইল স্থানান্তর সম্পূর্ণ হয়েছে।"
+msgstr "\"%2$s\" থেকে স্বয়ংক্রিয়ভাবে গৃহীত \"%1$s\" ফাইল স্থানান্তর সম্পন্ন।"
 
 msgid "Autoaccept complete"
-msgstr "স্বয়ং-গ্রহণ সম্পন্ন"
+msgstr "স্বয়ংক্রিয়ভাবে গ্রহন সম্পন্ন"
 
 #, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "যখন %s থেকে ফাইল-স্থানান্তর অনুরোধ পৌছায়"
+msgstr "যখন %s থেকে ফাইল স্থানান্তরের অনুরোধ আসে"
 
 # tithi
 msgid "Set Autoaccept Setting"
-msgstr "স্বয়ং-গ্রহণ বিন্যাসন নির্ধারণ করুন"
+msgstr "স্বয়ংক্রিয়ভাবে গ্রহনের সেটিং নির্ধারণ"
 
 msgid "_Save"
 msgstr "সংরক্ষণ (_S)"
@@ -2296,48 +2374,47 @@ msgstr "বাতিল (_C)"
 
 # tithi
 msgid "Ask"
-msgstr "জিজ্ঞাসা করুন"
+msgstr "জিজ্ঞাসা করা হবে"
 
 msgid "Auto Accept"
-msgstr "স্বয়ং গ্রহণ করুন"
+msgstr "স্বয়ংক্রিয়ভাবে গৃহীত হবে"
 
 msgid "Auto Reject"
-msgstr "স্বয়ং প্রত্যাখ্যান করুন"
+msgstr "স্বয়ংক্রিয়ভাবে প্রত্যাখ্যাত হবে"
 
 msgid "Autoaccept File Transfers..."
-msgstr "স্বয়ংক্রিয়-গ্রহণ ফাইল স্থানান্তর করে..."
+msgstr "স্বয়ংক্রিয় ফাইল স্থানান্তর..."
 
-# tithi
 #. XXX: Is there a better way than this? There really should be.
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
-"ফাইলটি সংরক্ষণ করার পথ\n"
-"(অনুগ্রহ করে সম্পূর্ণ পথ প্রদান করুন)"
+"ফাইল সংরক্ষণের ‍‍পাথ\n"
+"(অনুগ্রহ করে সম্পূর্ণ পাথ প্রদান করুন)"
 
 msgid "Automatically reject from users not in buddy list"
-msgstr "বন্ধু তালিকার বহির্ভুত ব্যবহারকারীগণ হতে স্বয়ংক্রিয় ভাবে বাতিল করুন"
+msgstr "বন্ধু তালিকার বহির্ভূত ব্যবহারকারী থেকে স্বয়ংক্রিয় ভাবে বাতিল করা হবে"
 
 # tithi
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"একটি স্বয়ং-গৃহীত ফাইল স্থানান্তর সম্পূর্ণ হলে পপ-আপ দ্বারা অবগত করুন\n"
-"(শুধুমাত্র যখন প্রেরকের সঙ্গে কোনো কথোপকথন হয় না)"
+"স্বয়ংক্রিয়ভাবে ফাইল গ্রহন সম্পন্ন হলে একটি পপ-আপ দ্বারা অবগত করা হবে\n"
+"(শুধুমাত্র যখন প্রেরকের সঙ্গে কোনো কথোপকথন হয়নি)"
 
 msgid "Create a new directory for each user"
-msgstr "প্রত্যেক ব্যবহারকারীর জন্য একটি নির্দেশিকা তৈরী করুন"
+msgstr "প্রত্যেক ব্যবহারকারীর জন্য একটি নতুন ডিরেক্টরি তৈরী করা হবে"
 
 msgid "Notes"
 msgstr "নোট"
 
 msgid "Enter your notes below..."
-msgstr "আপনার নোটগুলো নীচে প্রবেশ করান..."
+msgstr "আপনার নোটগুলো নিচে লিখুন..."
 
 msgid "Edit Notes..."
-msgstr "নোট সম্পাদন করুন..."
+msgstr "নোট সম্পাদনা..."
 
 #. *< major version
 #. *< minor version
@@ -2354,13 +2431,13 @@ msgstr "বন্ধু নোট"
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr "নির্দিষ্ট বন্ধুদের কাছে নোট সলরক্ষণ করুন"
+msgstr "নির্দিষ্ট বন্ধু সম্পর্কে নোট সংরক্ষণ"
 
-# tithi
 #. *< summary
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "আপনার বন্ধু তালিকায় বন্ধুদের জন্য নোট সংরক্ষণ করতে পছন্দ যোগ করে।"
+msgstr "আপনার বন্ধু তালিকার বন্ধুদের সম্পর্কে নোট সংরক্ষণ করার অপশন যোগ করে।"
 
+# ***
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2370,13 +2447,13 @@ msgstr "আপনার বন্ধু তালিকায় বন্ধুদ
 msgid "Cipher Test"
 msgstr "সাইফার পরীক্ষা"
 
-# fix me tithi
+# ***
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr "লিবপার্পল সহ সিপ করে এমন সাইফারগুলো পরীক্ষা করে।"
+msgstr "libpurple সাথে প্রেরিত সাইফারগুলো পরীক্ষা করে।"
 
 #. *< type
 #. *< ui_requirement
@@ -2401,14 +2478,15 @@ msgstr "DBus প্লাগইন এর উদাহরণ"
 #. *< priority
 #. *< id
 msgid "File Control"
-msgstr "ফাইল নিয়ন্ত্রণ করুন"
+msgstr "ফাইল নিয়ন্ত্রণ"
 
+# ***
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Allows control by entering commands in a file."
-msgstr "ফাইলে নির্দেশসমূহ প্রবেশ করার মাধ্যমে নিয়ন্ত্রণ অনুমোদন করুন।"
+msgstr "ফাইলে কমান্ড লিখে নিয়ন্ত্রণ করতে সাহায্য করে।"
 
 msgid "Minutes"
 msgstr "মিনিট"
@@ -2416,31 +2494,32 @@ msgstr "মিনিট"
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
 msgid "I'dle Mak'er"
-msgstr "অ'লস তৈরীকার'ক"
+msgstr "I'dle Mak'er"
 
 msgid "Set Account Idle Time"
-msgstr "একাউন্টের অলস সময় নির্ধারণ করুন"
+msgstr "একাউন্টের নিষ্ক্রিয় সময় নির্ধারণ"
 
 msgid "_Set"
 msgstr "নির্ধারণ (_S)"
 
 msgid "None of your accounts are idle."
-msgstr "আপনার কোনো একাউন্ট অলস নেই।"
+msgstr "আপনার কোনো একাউন্ট নিষ্ক্রিয় নয়।"
 
 msgid "Unset Account Idle Time"
-msgstr "একাউন্টের অলস সময় অপসারণ করুন"
+msgstr "একাউন্টের নিষ্ক্রিয় সময় অপসারণ"
 
+# ***
 msgid "_Unset"
-msgstr "অনির্ধারণ করুন (_U)"
+msgstr "আনসেট (_U)"
 
 msgid "Set Idle Time for All Accounts"
-msgstr "সব একাউন্টের জন্য অলস সময় নির্ধারণ করুন"
+msgstr "সব একাউন্টের জন্য নিষ্ক্রিয় সময় নির্ধারণ"
 
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "সব অলস একাউন্টের জন্য অলস সময় অপসারণ করুন"
+msgstr "সব নিষ্ক্রিয় একাউন্টের জন্য নিষ্ক্রিয় সময় অপসারণ"
 
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "আপনি কতক্ষণ অলস থাকবেন তা আপনাকে নিজ হাতে-বিন্যাস করতে অনুমোদন করে"
+msgstr "আপনি কতক্ষণ নিষ্ক্রিয় তা আপনি নিজেই কনফিগার করতে পারবেন"
 
 #. *< type
 #. *< ui_requirement
@@ -2455,15 +2534,16 @@ msgstr "IPC পরীক্ষণ ক্লায়েন্ট"
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "ক্লায়েন্ট হিসেবে, প্লাগইনের IPC সমর্থন পরীক্ষা করুন।"
+msgstr "ক্লায়েন্ট হিসেবে, প্লাগইনের IPC সাপোর্ট পরীক্ষা করা হবে।"
 
+# ***
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"ক্লায়েন্ট হিসেবে, প্লাগইনের IPC সমর্থন পরীক্ষা করুন। এটি সার্ভার প্লাগইন চিহ্নিত করে "
-"এবং নিবন্ধিত নির্দেশগুলো পরীক্ষা করে।"
+"ক্লায়েন্ট হিসেবে, প্লাগইনের IPC সাপোর্ট পরীক্ষা করা হবে। এটি সার্ভার প্লাগইন চিহ্নিত "
+"করে এবং নিবন্ধিত কমান্ডগুলো চালায়।"
 
 #. *< type
 #. *< ui_requirement
@@ -2478,27 +2558,28 @@ msgstr "IPC পরীক্ষণ সার্ভার"
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "সার্ভার হিসেবে, প্লাগইনের IPC সমর্থন পরীক্ষা করুন।"
+msgstr "সার্ভার হিসেবে, প্লাগইনের IPC সাপোর্ট পরীক্ষা করা হবে।"
 
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"সার্ভার হিসেবে, প্লাগইনের IPC সমর্থন পরীক্ষা করুন। এটি IPC নির্দেশগুলো নিবন্ধন করে।"
+"সার্ভার হিসেবে, প্লাগইনের IPC সাপোর্ট পরীক্ষা করা হবে। এটি IPC কমান্ডগুলো নিবন্ধন "
+"করে।"
 
+# ***
 msgid "Join/Part Hiding Configuration"
-msgstr "লুকানো বিন্যাসকরণ যুক্ত/বিভক্ত করুন"
+msgstr "লুকানো কনফিগারেশন যুক্ত/বিভক্ত করা হবে"
 
 # tithi
 msgid "Minimum Room Size"
-msgstr "নূন্যতম কক্ষের আকার"
+msgstr "আসরের নূন্যতম আকার"
 
 # tithi
 msgid "User Inactivity Timeout (in minutes)"
-msgstr "ব্যবহারকারীর নিষ্ক্রয়তার সময়সীমা উত্তীর্ণ (মিনিটে)"
+msgstr "ব্যবহারকারীর মিথস্ক্রিয়তার সময়সীমা উত্তীর্ণ (মিনিটে)"
 
-# tithi
 msgid "Apply hiding rules to buddies"
-msgstr "বন্ধুদের উপর লুকানোর নিয়ম প্রয়োগ করুন"
+msgstr "বন্ধুদের লুকানোর নিয়ম প্রয়োগ করুন"
 
 # tithi
 #. *< type
@@ -2515,16 +2596,16 @@ msgstr "যুক্ত/বিভক্ত গোপনকরণ"
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr "অসংশ্লিষ্ট যুক্ত/বিভক্ত বার্তাগুলো গোপন করে।"
+msgstr "যুক্ত/বিভক্ত এর অতিরিক্ত বার্তাগুলো লুকিয়ে রাখে।"
 
-# tithi
+# ***
 #. *  description
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
-"এই প্লাগইন যুক্ত/বিভক্ত বার্তাগুলোকে বৃহৎ কক্ষে লুকিয়ে রাখে, কথোপকথনে সক্রিয়ভাবে "
-"অংশগ্রহনকারী ঐসব ব্যবহারকারী ব্যতীত।"
+"এই প্লাগইন বড় আসরের যুক্ত/বিভক্ত বার্তাগুলোকে লুকিয়ে রাখে, শুধুমাত্র কথোপকথনে "
+"সক্রিয়ভাবে অংশগ্রহনকারী ব্যবহারকারী ব্যতীত।"
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2537,26 +2618,27 @@ msgid "User is offline."
 msgstr "ব্যবহারকারী অফলাইনে।"
 
 msgid "Auto-response sent:"
-msgstr "স্বয়ং-জবাব পাঠানো হয়েছে:"
+msgstr "স্বয়ংক্রিয় জবাব পাঠানো হয়েছে:"
 
 #, c-format
 msgid "%s has signed off."
-msgstr "%s অফলাইনে।"
+msgstr "%s লগআউট করেছে।"
 
 msgid "One or more messages may have been undeliverable."
-msgstr "এক বা একাধিক বার্তা পাঠানো যাচ্ছে না।"
+msgstr "এক বা একাধিক বার্তা পাঠানো সম্ভব হয়নি।"
 
 msgid "You were disconnected from the server."
-msgstr "আপনি সার্ভার থেকে বিচ্ছিন্ন ছিলেন।"
+msgstr "আপনি সার্ভার থেকে বিচ্ছিন্ন হয়ে গেছেন।"
 
+# mark9
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
-"আপনি বর্তমানে বিচ্ছিন্ন। আপনি লগ ইন না করা পর্যন্ত বার্তাসমূহ গ্রহণ করা হবে না।"
+"আপনার সংযোগ বর্তমানে বিচ্ছিন্ন। আপনি লগইন না করা পর্যন্ত বার্তা গ্রহণ করা যাবে না।"
 
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "সর্বোচ্চ সীমা অতিক্রান্ত হওয়ায় বার্তা পাঠানো যাচ্ছে না।"
+msgstr "সর্বোচ্চ সীমা অতিক্রম করায় বার্তা পাঠানো সম্ভব হয়নি।"
 
 msgid "Message could not be sent."
 msgstr "বার্তা পাঠানো সম্ভব হয়নি।"
@@ -2565,19 +2647,19 @@ msgstr "বার্তা পাঠানো সম্ভব হয়নি।
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Adium"
-msgstr "অডিয়াম"
+msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Fire"
-msgstr "আগুন"
+msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Messenger Plus!"
-msgstr "বার্তাবাহক প্লাস!"
+msgstr "Messenger Plus!"
 
 # tithi
 #. The names of IM clients are marked for translation at the request of
@@ -2590,13 +2672,13 @@ msgstr "QIP"
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "MSN Messenger"
-msgstr "এমএসএন বার্তাবাহক"
+msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Trillian"
-msgstr "ট্রিলিয়ান"
+msgstr "Trillian"
 
 # tithi
 #. The names of IM clients are marked for translation at the request of
@@ -2605,20 +2687,22 @@ msgstr "ট্রিলিয়ান"
 msgid "aMSN"
 msgstr "aMSN"
 
+# ***
 #. Add general preferences.
 msgid "General Log Reading Configuration"
-msgstr "সাধারণ লগ পড়ার বিন্যাসন"
+msgstr "লগ পড়ার সাধারণ কনফিগারেশন"
 
+# ***
 msgid "Fast size calculations"
-msgstr "দ্রুত আকার গণনাসমূহ"
+msgstr "দ্রুত আকার পরিমাপ"
 
 # fix me- tithi
 msgid "Use name heuristics"
-msgstr "নাম হিউরিস্টিক ব্যবহার করুন"
+msgstr "নামের হিউরিস্টিক ব্যবহার করা হবে"
 
 #. Add Log Directory preferences.
 msgid "Log Directory"
-msgstr "লগ নির্দেশিকা"
+msgstr "লগ ডিরেক্টরি"
 
 #. *< type
 #. *< ui_requirement
@@ -2633,35 +2717,37 @@ msgstr "লগ পাঠক"
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "লগ প্রদর্শকে অন্যান্য আইএম ক্লায়েন্টদের লগসমূহ অন্তর্ভুক্ত করে।"
+msgstr "লগ প্রদর্শকে অন্যান্য IM ক্লায়েন্টদের লগ অন্তর্ভুক্ত করে।"
 
+# ***
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"যখন লগ প্রদর্শন‌ করে, তখন এই প্লাগইন অন্যান্য আইএম ক্লায়েন্টদের লগ অন্তর্ভুক্ত করবে। "
-"বর্তমানে, এটা অডিয়াম, এমএসএন ম্যাসেঞ্জার, এবং ট্রিলিয়ান অন্তর্ভুক্ত করে।\n"
+"লগ প্রদর্শন‌ করার সময় এই প্লাগইন অন্যান্য IM ক্লায়েন্টদের লগ অন্তর্ভুক্ত করবে। বর্তমানে, "
+"এটা Adium, MSN Messenger,aMSN এবং Trillian অন্তর্ভুক্ত করে।\n"
 "\n"
-"সতর্কতা: এই প্লাগইনটি এখনও আলফা কোড এবং প্রায়সই নষ্ট হতে পারে।  আপনার নিজ "
-"দ্বায়িত্বে ব্যবহার করুন!"
+"সতর্কবানী: এই প্লাগইনটি এখনও আলফা কোড এবং প্রায়ই ক্র্যাশ করতে পারে। নিজ দ্বায়িত্বে "
+"ব্যবহার করুন!"
 
+# ***
 msgid "Mono Plugin Loader"
-msgstr "মোনো প্লাগইন লোডকারী"
+msgstr "Mono প্লাগইন লোডার"
 
 # sam: mono?
 msgid "Loads .NET plugins with Mono."
-msgstr "মোনো এর সাথে .NET প্লাগইন লোড করে"
+msgstr "Mono এর সাথে .NET প্লাগইন লোড করে"
 
 # tithi
 msgid "Add new line in IMs"
-msgstr "আইএম এ নতুন লাইন যোগ করুন"
+msgstr "IM এ নতুন লাইন যোগ করা হবে"
 
 msgid "Add new line in Chats"
-msgstr "আড্ডায় নতুন লাইন যোগ করুন"
+msgstr "আড্ডায় নতুন লাইন যোগ করা হবে"
 
 #. *< magic
 #. *< major version
@@ -2678,31 +2764,27 @@ msgstr "নতুন লাইন"
 #. *< name
 #. *< version
 msgid "Prepends a newline to displayed message."
-msgstr "প্রদর্শিত বার্তায় নতুন-লাইন যোগ করে।"
+msgstr "প্রদর্শিত বার্তার শুরুতে নতুন-লাইন যোগ করে।"
 
-# tithi
 #. *< summary
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
-"বার্তাসমূহে একটি নতুন লাইন যোগ করার ফলে কথোপকথন উইন্ডোর ব্যবহারকারীর নামের অধীনে "
-"অবশিষ্ট বার্তাসমূহ উপস্থিত হয়।"
+"কথোপকথন উইন্ডোর শুরুতে একটি নতুন লাইন যোগ করে যাতে অবশিষ্ট বার্তা ব্যবহারকারীর "
+"নামের নীচে থাকে।"
 
-# tithi
 msgid "Offline Message Emulation"
-msgstr "অফলাইন বার্তা অনুকরন করুন"
+msgstr "অফলাইন বার্তা অনুকরণ"
 
-# tithi
 msgid "Save messages sent to an offline user as pounce."
-msgstr "অফলাইন ব্যবহারকারীকে পাঠানো বার্তা পাউন্স হিসেবে সংরক্ষণ করুন।"
+msgstr "অফলাইন ব্যবহারকারীকে পাঠানো বার্তা পাউন্স হিসেবে সংরক্ষিত হবে।"
 
-# tithi
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"অবশিষ্ট বার্তাগুলো পাউন্স হিসেবে সংরক্ষিত হবে। আপনি 'বন্ধু পাউন্স' সংলাপ হতে পাউন্স "
+"অবশিষ্ট বার্তাগুলো পাউন্স হিসেবে সংরক্ষিত হবে। আপনি 'বন্ধু পাউন্স' ডায়ালগ থেকে পাউন্স "
 "সম্পাদনা/মুছে ফেলতে পারেন।"
 
 #, c-format
@@ -2710,15 +2792,15 @@ msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
-"\"%s\" বর্তমানে অফলাইনে আছেন। আপনি কি অবশিষ্ট বার্তাগুলো পাউন্সে সংরক্ষণ করতে চান "
-"এবং \"%s\" যখন পুনরায় লগইন করে তখন তাদেরকে স্বয়ংক্রিয় ভাবে পাঠাতে চান?"
+"\"%s\" বর্তমানে অফলাইন। আপনি কি \"%s\" যখন পুনরায় লগইন করে তখন অবশিষ্ট বার্তাগুলো "
+"পাউন্সে সংরক্ষণ করে তাদেরকে স্বয়ংক্রিয় ভাবে পাঠাতে চান?"
 
 msgid "Offline Message"
 msgstr "অফলাইন বার্তা"
 
-# tithi
+# mark10
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "আপনি 'বন্ধু পাউন্স' সংলাপ হতে পাউন্স সম্পাদনা/মুছে ফেলতে পারেন।"
+msgstr "আপনি 'বন্ধু পাউন্স' ডায়ালগ থেকে পাউন্স সম্পাদনা করতে বা মুছে ফেলতে পারেন।"
 
 msgid "Yes"
 msgstr "হ্যাঁ"
@@ -2728,12 +2810,42 @@ msgstr "না"
 
 # tithi
 msgid "Save offline messages in pounce"
-msgstr "অফলাইন বার্তা পাউন্সে সংরক্ষণ করুন"
+msgstr "অফলাইন বার্তা পাউন্সে সংরক্ষণ করা হবে"
 
-# tithi
 msgid "Do not ask. Always save in pounce."
-msgstr "জিজ্ঞাসা করবেন না। সবসময় পাউন্সে সংরক্ষণ করুন।"
+msgstr "জিজ্ঞাসা করা হবে না। সবসময় পাউন্সে সংরক্ষণ করা হবে।"
+
+# বা একবার ব্যবহারযোগ্য পাসওয়ার্ড
+msgid "One Time Password"
+msgstr "এককালীন পাসওয়ার্ড"
 
+# Context?
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "এককালীন পাসওয়ার্ড সাপোর্ট"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "পাসওয়ার্ড যেনো মাত্র একবারই ব্যবহৃত হয় তা নিশ্চিত করা হবে।"
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"প্রতি একাউন্টের জন্য আপনি আলাদাভাবে নিশ্চিত করতে পারেন যে, অসংরক্ষিত পাসওয়ার্ড "
+"শুধুমাত্র একটি সফল সংযোগের জন্য ব্যবহৃত হবে।\n"
+"নোট: এটি কাজ করার জন্য একাউন্টের পাসওয়ার্ডটি সংরক্ষিত হওয়া জরুরি নয়।"
+
+# ***
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2741,45 +2853,46 @@ msgstr "জিজ্ঞাসা করবেন না। সবসময় �
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "পার্ল প্লাগইন লোডকারী"
+msgstr "পার্ল প্লাগইন লোডার"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "পার্ল প্লাগইন লোড করার জন্য সমর্থন করে।"
+msgstr "পার্ল প্লাগইন লোড করার জন্য সাপোর্ট প্রদান করে।"
 
 # tithi
 msgid "Psychic Mode"
-msgstr "সাইকিক পরিমন্ডল"
+msgstr "সাইকিক মোড"
 
 # fix me tithi
 msgid "Psychic mode for incoming conversation"
-msgstr "আগত কথোপকথোনের জন্য সাইকিক পরিমন্ডল"
+msgstr "আগত কথোপকথনের জন্য সাইকিক মোড"
 
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
-"অন্যান্য ব্যবহারকারীরা আপনাকে বার্তা পাঠাতে শুরু করার কারণে কথোপকথন উইন্ডোজ উপস্থিত "
-"হয়।  এটি AIM, ICQ, XMPP, Sametime, এবং Yahoo এর জন্য কাজ করে!"
+"অন্যান্য ব্যবহারকারীরা বার্তা পাঠাতে শুরু করলে কথোপকথনের উইন্ডো খুলতে শুরু করে। এটি "
+"AIM, ICQ, XMPP, Sametime, এবং Yahoo! এর জন্য কাজ করে।"
 
 # tithi
 msgid "You feel a disturbance in the force..."
-msgstr "আপনি গতিতে একটি অসুবিধা অনুভব করছেন..."
+msgstr "আপনি গতিতে একটি উত্তেজনা অনুভব করছেন..."
 
 msgid "Only enable for users on the buddy list"
-msgstr "শুধুমাত্র বন্ধু তালিকার ব্যবহারকারীর জন্য সক্রিয় করুন"
+msgstr "শুধুমাত্র বন্ধু তালিকার ব্যবহারকারীদের জন্য সক্রিয় করা হবে"
 
 msgid "Disable when away"
-msgstr "দূরে থাকার সময় নিষ্ক্রিয় করুন"
+msgstr "অন্যত্র থাকলে নিষ্ক্রিয় করা হবে"
 
-# tithi
+# mark11
 msgid "Display notification message in conversations"
-msgstr "কথোপকথনে বিজ্ঞপ্তি বার্তা প্রদর্শন করুন"
+msgstr "কথোপকথনে ঘোষণা প্রদর্শিত হবে"
 
+# ***
 msgid "Raise psychic conversations"
-msgstr "সাইকিক কথাবার্তা হচ্ছে"
+msgstr "সাইকিক কথাবার্তা উপাস্থাপন করা হবে"
 
 #. *< type
 #. *< ui_requirement
@@ -2788,14 +2901,14 @@ msgstr "সাইকিক কথাবার্তা হচ্ছে"
 #. *< priority
 #. *< id
 msgid "Signals Test"
-msgstr "সংকেতসমূহের পরীক্ষা"
+msgstr "সংকেত পরীক্ষা"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all signals are working properly."
-msgstr "সকল সংকেত সঠিকভাবে কাজ করছে কিনা তা দেখতে পরীক্ষা করুন।"
+msgstr "সব সংকেত সঠিকভাবে কাজ করছে কিনা তা পরীক্ষা করা হবে।"
 
 #. *< type
 #. *< ui_requirement
@@ -2804,19 +2917,19 @@ msgstr "সকল সংকেত সঠিকভাবে কাজ করছ�
 #. *< priority
 #. *< id
 msgid "Simple Plugin"
-msgstr "সহজ প্লাগইন"
+msgstr "সরল প্লাগইন"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests to see that most things are working."
-msgstr "অধিকাংশ জিনিস সঠিকভাবে কাজ করছে কিনা তা দেখতে পরীক্ষা করুন।"
+msgstr "অধিকাংশ জিনিস সঠিকভাবে কাজ করছে কিনা তা পরীক্ষা করে।"
 
 # tithi
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr "X.৫০৯ প্রত্যয়ন পত্র"
+msgstr "X.509 সার্টিফিকেট"
 
 #. *< type
 #. *< ui_requirement
@@ -2832,7 +2945,7 @@ msgstr "GNUTLS"
 #. *  summary
 #. *  description
 msgid "Provides SSL support through GNUTLS."
-msgstr "GNUTLS এর মাধ্যমে এসএসএল সমর্থন প্রদান করে।"
+msgstr "GNUTLS এর মাধ্যমে SSL সাপোর্ট প্রদান করে।"
 
 #. *< type
 #. *< ui_requirement
@@ -2848,7 +2961,7 @@ msgstr "NSS"
 #. *  summary
 #. *  description
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "মজিলা NSS এর মাধ্যমে SSL সমর্থন প্রদান করে।"
+msgstr "Mozilla NSS এর মাধ্যমে SSL সাপোর্ট প্রদান করে।"
 
 #. *< type
 #. *< ui_requirement
@@ -2859,44 +2972,45 @@ msgstr "মজিলা NSS এর মাধ্যমে SSL সমর্থন
 msgid "SSL"
 msgstr "SSL"
 
+# ***
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "এসএসএল সমর্থন লাইব্রেরিসমূহের চারদিকে মোড়ক প্রদান করে।"
+msgstr "SSL সাপোর্ট লাইব্রেরীর চারদিকে র‌্যাপার প্রদান করে।"
 
 #, c-format
 msgid "%s is no longer away."
-msgstr "%s আর দূরে থাকবে না।"
+msgstr "%s আর অন্যত্র নন।"
 
 #, c-format
 msgid "%s has gone away."
-msgstr "%s দূরে চলে গেছে।"
+msgstr "%s অন্যত্র আছেন।"
 
 #, c-format
 msgid "%s has become idle."
-msgstr "%s এখন অলস।"
+msgstr "%s এখন নিষ্ক্রিয়।"
 
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s আর অলস থাকবে না।"
+msgstr "%s আর নিষ্ক্রিয় নন।"
 
 #, c-format
 msgid "%s has signed on."
-msgstr "%s এখন অনলাইন।"
+msgstr "%s লগইন করেছেন।"
 
 msgid "Notify When"
-msgstr "জানাবে যখন"
+msgstr "ঘোষণা দেয়া হবে যখন"
 
 msgid "Buddy Goes _Away"
-msgstr "বন্ধু অনুপস্থিত (_A)"
+msgstr "বন্ধু অন্যত্র যায় (_A)"
 
 msgid "Buddy Goes _Idle"
-msgstr "বন্ধু অলস (_I)"
+msgstr "বন্ধু নিষ্ক্রিয় হয় (_I)"
 
 msgid "Buddy _Signs On/Off"
-msgstr "বন্ধু সাইন অন/অফ (_S)"
+msgstr "বন্ধু লগইন/লগআউট করে (_S)"
 
 #. *< type
 #. *< ui_requirement
@@ -2905,8 +3019,9 @@ msgstr "বন্ধু সাইন অন/অফ (_S)"
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "বন্ধুর অবস্থার প্রজ্ঞাপন"
+msgstr "বন্ধুর অবস্থা ঘোষণা"
 
+# mark12
 #. *< name
 #. *< version
 #. *  summary
@@ -2914,38 +3029,37 @@ msgstr "বন্ধুর অবস্থার প্রজ্ঞাপন"
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr ""
-"যখন বন্ধু অনুপস্থিত বা অলস থাকে বা এইসব থেকে ফিরে আসে তখন কথোপকথন উইন্ডোতে "
-"প্রজ্ঞাপন পাঠায়।"
+msgstr "বন্ধুর অন্যত্র বা নিষ্ক্রিয়তার অবস্থান পরিবর্তন হলে, আড্ডার উইন্ডোতে জানান দেয়"
 
 msgid "Tcl Plugin Loader"
-msgstr "টিসিএল প্লাগইন লোডকারী"
+msgstr "Tcl প্লাগইন লোডার"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "টিসিএল প্লাগইন লোড করার জন্য সমর্থন প্রদান করে"
+msgstr "Tcl প্লাগইন লোড করার জন্য সমর্থন প্রদান করে"
 
 # tithi
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
-"সক্রিয় TCL সংস্থাপন শনাক্ত করতে অক্ষম। আপনি যদি TCL প্লাগইন ব্যবহার করতে চান, তবে "
-"http://www.activestate.com থেকে সক্রিয় TCL সংস্থাপন করুন\n"
+"ActiveTCL ইনস্টলেশন শনাক্ত করতে ব্যর্থ। আপনি যদি TCL প্লাগইন ব্যবহার করতে চান, তবে "
+"http://www.activestate.com থেকে ActiveTCL ইনস্টল করুন\n"
 
 # tithi
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"উইন্ডোজ টুলকিটের জন্য অ্যাপল বোনজুর খুঁজে পাওয়া যায়নি, আরও তথ্যের জন্য http://d."
-"pidgin.im/BonjourWindows এর FAQ দেখুন।"
+"Apple এর \"Bonjour for Windows\" টুলকিটটি খুঁজে পাওয়া যায়নি, আরও তথ্যের জন্য  "
+"http://d.pidgin.im/BonjourWindows দেখুন।"
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "আগত আইএম সংযোগসূমহের জন্য শুনতে অক্ষম\n"
+# ***
+msgid "Unable to listen for incoming IM connections"
+msgstr "আগত IM সংযোগের জন্য লিসেন করতে ব্যর্থ"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr "স্থানীয় এমডিএনএস সার্ভারের সাথে সংযোগ স্থাপনে ব্যর্থ। এটা কি চলছে?"
+msgstr "স্থানীয় mDNS সার্ভারের সাথে সংযোগ স্থাপনে ব্যর্থ। এটা কি চালু আছে?"
 
 msgid "First name"
 msgstr "প্রথম নাম"
@@ -2954,10 +3068,10 @@ msgid "Last name"
 msgstr "শেষ নাম"
 
 msgid "Email"
-msgstr "ই-মেইল"
+msgstr "ইমেইল"
 
 msgid "AIM Account"
-msgstr "এআইএম একাউন্ট"
+msgstr "AIM একাউন্ট"
 
 msgid "XMPP Account"
 msgstr "XMPP একাউন্ট"
@@ -2973,125 +3087,130 @@ msgstr "XMPP একাউন্ট"
 #. *  summary
 #. *  description
 msgid "Bonjour Protocol Plugin"
-msgstr "Bonjour প্রটোকল প্লাগইন"
+msgstr "Bonjour প্রোটোকল প্লাগইন"
 
+# ***
 msgid "Purple Person"
 msgstr "পার্পেল ব্যক্তি"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "এলাকা"
+msgstr "স্থানীয় পোর্ট"
 
 msgid "Bonjour"
 msgstr "Bonjour"
 
 #, c-format
 msgid "%s has closed the conversation."
-msgstr "%s কথোপকথন বন্ধ করে দিয়েছে।"
+msgstr "%s কথোপকথন বন্ধ করেছে।"
 
+# mark13
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "বার্তা পাঠাতে অক্ষম, কথোপকথন শুরু হতে পারে নি।"
+msgstr "বার্তা পাঠাতে ব্যর্থ, কথোপকথন শুরু করা সম্ভব হয়নি।"
 
-msgid "Cannot open socket"
-msgstr "সকেট খোলা যাচ্ছে না"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "সকেট তৈরী করতে ব্যর্থ: %s"
 
-msgid "Could not bind socket to port"
-msgstr "পোর্টের সাথে সকেটকে সংযুক্ত করা যায়নি"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "পোর্টের সাথে সকেট সংযুক্ত করতে ব্যর্থ: %s"
 
-msgid "Could not listen on socket"
-msgstr "সকেট এ শোনা যাচ্ছে না"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "সকেটে লিসেন করতে ব্যর্থ: %s"
 
-# tithi
 msgid "Error communicating with local mDNSResponder."
 msgstr "স্থানীয় mDNSResponder এর সঙ্গে যোগাযোগে ত্রুটি।"
 
 msgid "Invalid proxy settings"
-msgstr "অবৈধ প্রক্সি বিন্যাসনসমূহ"
+msgstr "অকার্যকর প্রক্সি সেটিং"
 
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
-msgstr "আপনার প্রদত্ত প্রক্সির ধরনের জন্য উল্লেখিত হোস্ট নাম বা পোর্ট নম্বর অবৈধ।"
+msgstr "আপনার প্রক্সির ধরনের জন্য উল্লেখিত হোস্ট নাম বা পোর্ট নম্বরটি অকার্যকর।"
 
 msgid "Token Error"
 msgstr "টোকেন ত্রুটি"
 
 msgid "Unable to fetch the token.\n"
-msgstr "টোকেন আনতে অক্ষম।\n"
+msgstr "টোকেন আনতে ব্যর্থ।\n"
 
 msgid "Save Buddylist..."
-msgstr "বন্ধুর তালিকা সংরক্ষণ করুন..."
+msgstr "বন্ধুর তালিকা সংরক্ষণ করা হবে..."
 
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "আপনার বন্ধু তালিকাটি ফাঁকা, ফাইলে কিছুই লেখা ছিল না।"
+msgstr "আপনার বন্ধু তালিকাটি ফাঁকা, ফাইলে কিছুই লেখা হয়নি।"
 
 msgid "Buddylist saved successfully!"
 msgstr "বন্ধু তালিকা সফলভাবে সংরক্ষিত হয়েছে!"
 
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "%1s এর জন্য %2s এ বন্ধুর তালিকা লিখতে পারেনি।"
+msgstr "%1$s এর জন্য %2$s এ বন্ধুর তালিকা লেখা সম্ভব হয়নি।"
 
 msgid "Couldn't load buddylist"
-msgstr "বন্ধু-তালিকা লোড করা যায়নি।"
+msgstr "বন্ধু তালিকা লোড করা যায়নি।"
 
 msgid "Load Buddylist..."
-msgstr "বন্ধুর-তালিকা লোড করুন..."
+msgstr "বন্ধু তালিকা লোড করা হবে..."
 
 msgid "Buddylist loaded successfully!"
-msgstr "বন্ধু-তালিকা সফলভাবে লোড করা হয়েছে।"
+msgstr "বন্ধু তালিকা সফলভাবে লোড করা হয়েছে!"
 
 msgid "Save buddylist..."
-msgstr "বন্ধু-তালিকা সংরক্ষণ করুন..."
+msgstr "বন্ধু তালিকা সংরক্ষণ করা হবে..."
 
 msgid "Load buddylist from file..."
-msgstr "ফাইল থেকে বন্ধু-তালিকা লোড করুন..."
+msgstr "ফাইল থেকে বন্ধু তালিকা লোড করা হবে..."
 
-msgid "Fill in the registration fields."
-msgstr "নিবন্ধন ক্ষেত্রে পূরণ করুন।"
+msgid "You must fill in all registration fields"
+msgstr "আপনাকে নিবন্ধনের সব ক্ষেত্র পূরণ করতে হবে"
 
-msgid "Passwords do not match."
-msgstr "গুপ্তসংকেত মিলে না।"
+msgid "Passwords do not match"
+msgstr "পাসওয়ার্ডগুলো মিলছে না"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "নতুন একাউন্ট নিবন্ধন করতে ব্যর্থ। ত্রুটি দেখা দিয়েছে।\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "নতুন একাউন্ট নিবন্ধন করতে ব্যর্থ। একটি অজানা ত্রুটি দেখা দিয়েছে।"
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr "নতুন গাদু-গাদু একাউন্ট নিবন্ধন করা হয়েছে"
+msgstr "নতুন Gadu-Gadu একাউন্ট নিবন্ধন করা হয়েছে"
 
 msgid "Registration completed successfully!"
 msgstr "নিবন্ধন সফলভাবে শেষ হয়েছে!"
 
 msgid "Password"
-msgstr "গুপ্তসংকেত"
+msgstr "পাসওয়ার্ড"
 
-msgid "Password (retype)"
-msgstr "গুপ্তসংকেত (পুনরায় টাইপ করুন)"
+msgid "Password (again)"
+msgstr "পাসওয়ার্ড (আবার)"
 
-msgid "Enter current token"
-msgstr "বর্তমান টোকেন প্রবেশ করান"
+msgid "Enter captcha text"
+msgstr "ক্যাপচাতে দেখানো পাঠ্য প্রবেশ করান  "
 
-msgid "Current token"
-msgstr "বর্তমান টোকেন"
+# fix me tithi
+msgid "Captcha"
+msgstr "ক্যাপচা"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "নতুন গাদু-গাদু একাউন্ট নিবন্ধন করুন"
+msgstr "নতুন Gadu-Gadu একাউন্ট নিবন্ধন করুন"
 
 msgid "Please, fill in the following fields"
-msgstr "অনুগ্রহ করে, নিচের ক্ষেত্রসমূহে পূরণ করুন"
+msgstr "অনুগ্রহ করে, নিচের ক্ষেত্রগুলো পূরণ করুন"
 
 msgid "City"
 msgstr "শহর"
 
+# ***
 msgid "Year of birth"
-msgstr "জন্ম সন"
+msgstr "জন্ম সাল"
 
 msgid "Gender"
 msgstr "লিঙ্গ"
 
 msgid "Male or female"
-msgstr "পুরুষ অথবা মহিলা"
+msgstr "পুরুষ বা মহিলা"
 
 msgid "Male"
 msgstr "পুরুষ"
@@ -3103,36 +3222,43 @@ msgid "Only online"
 msgstr "শুধুমাত্র অনলাইন"
 
 msgid "Find buddies"
-msgstr "বন্ধু খোঁজ করুন"
+msgstr "বন্ধু খোঁজ "
 
 msgid "Please, enter your search criteria below"
-msgstr "অনুগ্রহ করে, আপনার অনুসন্ধান শর্তাবলী নীচে প্রবেশ করান"
+msgstr "অনুগ্রহ করে, আপনার অনুসন্ধানের শর্তাবলী নিচে দিন"
 
 msgid "Fill in the fields."
-msgstr "ক্ষেত্রসমূহে পূরণ করুন।"
+msgstr "ক্ষেত্রগুলো পূরণ করুন।"
 
 msgid "Your current password is different from the one that you specified."
-msgstr "আপনার বর্তমান গুপ্তসংকেতটি আপনার উল্লেখিত একটি গুপ্তসংকেত থেকে পৃথক"
+msgstr "আপনার বর্তমান পাসওয়ার্ডটি আপনার উল্লেখিত পাসওয়ার্ড থেকে আলাদা।"
 
 msgid "Unable to change password. Error occurred.\n"
-msgstr "গুপ্তসংকেত পরিবর্তনে অক্ষম। ত্রুটি দেখা দিয়েছে।\n"
+msgstr "পাসওয়ার্ড পরিবর্তন সফল হয়নি। ত্রুটি হয়েছে।\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "গাদু-গাদু একাউন্টের জন্য গুপ্তসংকেত পরিবর্তন করুন"
+msgstr "Gadu-Gadu একাউন্টের জন্য পাসওয়ার্ড পরিবর্তন"
 
 msgid "Password was changed successfully!"
-msgstr "গুপ্তসংকেত সফলভাবে পরিবর্তিত হয়েছিল!"
+msgstr "পাসওয়ার্ড সফলভাবে পরিবর্তিত হয়েছে!"
 
 msgid "Current password"
-msgstr "বর্তমান গুপ্তসংকেত"
+msgstr "বর্তমান পাসওয়ার্ড"
+
+msgid "Password (retype)"
+msgstr "পাসওয়ার্ড (পুনরায় টাইপ করুন)"
+
+msgid "Enter current token"
+msgstr "বর্তমান টোকেন দিন"
+
+msgid "Current token"
+msgstr "বর্তমান টোকেন"
 
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr ""
-"অনুগ্রহ করে, UIN-এর জন্য আপনার বর্তমান গুপ্তসংকেত এবং আপনার নতুন গুপ্তসংকেত প্রবেশ "
-"করান:"
+msgstr "অনুগ্রহ করে, UIN-এর জন্য আপনার বর্তমান পাসওয়ার্ড এবং নতুন পাসওয়ার্ড দিন:"
 
 msgid "Change Gadu-Gadu Password"
-msgstr "গাদু-গাদু গুপ্তসংকেত পরিবর্তন করুন"
+msgstr "Gadu-Gadu এর পাসওয়ার্ড পরিবর্তন করুন"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
@@ -3141,14 +3267,16 @@ msgstr "বন্ধুর জন্য আড্ডা নির্বাচন
 msgid "Add to chat..."
 msgstr "আড্ডায় যোগ দিন..."
 
+# ***
+#. Global
 msgid "Available"
-msgstr "সহজলভ্য"
+msgstr "উপস্থিত"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 msgid "Away"
-msgstr "এখানে নেই"
+msgstr "অন্যত্র"
 
 msgid "UIN"
 msgstr "UIN"
@@ -3160,22 +3288,22 @@ msgid "Birth Year"
 msgstr "জন্ম সাল"
 
 msgid "Unable to display the search results."
-msgstr "অনুসন্ধান ফলাফল প্রদর্শন করতে অক্ষম।"
+msgstr "অনুসন্ধান ফলাফল প্রদর্শন করতে ব্যর্থ।"
 
 msgid "Gadu-Gadu Public Directory"
-msgstr "গাদু-গাদু জনসাধারণ নির্দেশিকা"
+msgstr "Gadu-Gadu পাবলিক ডিরেক্টরি"
 
 msgid "Search results"
-msgstr "অনুসন্ধান ফলাফল"
+msgstr "অনুসন্ধানের ফলাফল"
 
 msgid "No matching users found"
-msgstr "কোনো সমন্বয়কারী ব্যবহারকারী পাওয়া যায়নি।"
+msgstr "একইরকম কোনো ব্যবহারকারী পাওয়া যায়নি।"
 
 msgid "There are no users matching your search criteria."
-msgstr "আপনার অনুসন্ধানের শর্তাবলী সাথে মেলে এমন কোনো ব্যবহারকারী নেই।"
+msgstr "অনুসন্ধানের শর্তানুযায়ী কোনো ব্যবহারকারী পাওয়া যায়নি।"
 
-msgid "Unable to read socket"
-msgstr "সকেট পড়তে ব্যর্থ"
+msgid "Unable to read from socket"
+msgstr "সকেট থেকে পড়তে ব্যর্থ"
 
 msgid "Buddy list downloaded"
 msgstr "বন্ধু তালিকা ডাউনলোড করা হয়েছে"
@@ -3187,31 +3315,46 @@ msgid "Buddy list uploaded"
 msgstr "বন্ধু তালিকা আপলোড করা হয়েছে"
 
 msgid "Your buddy list was stored on the server."
-msgstr "আপনার বন্ধু তালিকাটি সার্ভারে সংরক্ষণ করা হয়েছিল।"
+msgstr "আপনার বন্ধু তালিকাটি সার্ভারে সংরক্ষণ করা হয়েছে।"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "সংযুক্ত"
 
-msgid "Connection failed."
-msgstr "সংযোগ ব্যর্থ।"
+msgid "Connection failed"
+msgstr "সংযোগ ব্যর্থ হয়েছে"
 
 msgid "Add to chat"
-msgstr "আড্ডার যোগ দিন"
+msgstr "আড্ডায় যোগ দিন"
 
 msgid "Chat _name:"
 msgstr "আড্ডার নাম (_n):"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr " '%1$s' হোস্টের নামটি নিরূপণ করতে ব্যর্থ: %2$s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "সংযুক্ত করা হচ্ছে"
+
 msgid "Chat error"
 msgstr "আড্ডা ত্রুটি"
 
 msgid "This chat name is already in use"
-msgstr "এই আড্ডা নামটি ইতোমধ্যে ব্যবহৃত হচ্ছে"
+msgstr "এই আড্ডার নামটি ইতিমধ্যে ব্যবহৃত হচ্ছে"
 
-msgid "Not connected to the server."
-msgstr "সার্ভারের সাথে সংযুক্ত নয়।"
+msgid "Not connected to the server"
+msgstr "সার্ভারের সাথে সংযুক্ত নয়"
 
 msgid "Find buddies..."
 msgstr "বন্ধু খুঁজুন..."
 
 msgid "Change password..."
-msgstr "গুপ্তসঙ্কেত পরিবর্তন করুন..."
+msgstr "পাসওয়ার্ড পরিবর্তন..."
 
 msgid "Upload buddylist to Server"
 msgstr "সার্ভারে বন্ধু তালিকা আপলোড করুন"
@@ -3220,7 +3363,7 @@ msgid "Download buddylist from Server"
 msgstr "সার্ভার থেকে বন্ধু তালিকা ডাউনলোড করুন"
 
 msgid "Delete buddylist from Server"
-msgstr "সার্ভার থেকে বন্ধু তালিকা মুছে ফেলুন"
+msgstr "সার্ভার থেকে বন্ধু তালিকা অপসারণ করুন"
 
 msgid "Save buddylist to file..."
 msgstr "ফাইলে বন্ধুর তালিকা সংরক্ষণ করুন..."
@@ -3237,18 +3380,22 @@ msgstr "ফাইলে বন্ধুর তালিকা সংরক্ষ
 #. name
 #. version
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu প্রটোকল প্লাগইন"
+msgstr "Gadu-Gadu প্রোটোকল প্লাগইন"
 
 #. summary
 msgid "Polish popular IM"
-msgstr "জনপ্রিয় আইএম পরিমার্জন করুন"
+msgstr "জনপ্রিয় পোলিশ IM"
 
 msgid "Gadu-Gadu User"
-msgstr "গাদু-গাদু ব্যবহারকারী"
+msgstr "Gadu-Gadu ব্যবহারকারী"
+
+msgid "GG server"
+msgstr "GG সার্ভার"
 
+# ***
 #, c-format
 msgid "Unknown command: %s"
-msgstr "অজানা নির্দেশ: %s"
+msgstr "অজানা কমান্ড: %s"
 
 #, c-format
 msgid "current topic is: %s"
@@ -3258,16 +3405,16 @@ msgid "No topic is set"
 msgstr "কোনো বিষয় নির্ধারণ করা হয়নি"
 
 msgid "File Transfer Failed"
-msgstr "ফাইল বিনিময় ব্যর্থ"
+msgstr "ফাইল স্থানান্তর ব্যর্থ"
 
-msgid "Could not open a listening port."
-msgstr "শোনার কোনো পোর্ট খুলতে পারছে না।"
+msgid "Unable to open a listening port."
+msgstr "লিসেনিংয়ের জন্য কোনো পোর্ট খোলা সম্ভব হয়নি"
 
 msgid "Error displaying MOTD"
-msgstr "MOTD দেখানোর সময় ত্রুটি দেখা দিয়েছে"
+msgstr "MOTD দেখানোর সময় ত্রুটি হয়েছে"
 
 msgid "No MOTD available"
-msgstr "কোনো MOTD সহজলভ্য নয়"
+msgstr "কোনো MOTD নেই"
 
 msgid "There is no MOTD associated with this connection."
 msgstr "এই সংযোগের সাথে সম্পর্কিত কোনো MOTD নেই।"
@@ -3276,41 +3423,46 @@ msgstr "এই সংযোগের সাথে সম্পর্কিত �
 msgid "MOTD for %s"
 msgstr "%s এর জন্য MOTD"
 
-msgid "Server has disconnected"
-msgstr "সার্ভার বিচ্ছিন্ন হয়েছে"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "সার্ভারের সাথে সংযোগ বিচ্ছিন্ন হয়েছে: %s"
 
 msgid "View MOTD"
-msgstr "MOTD প্রদর্শন করুন"
+msgstr "MOTD প্রদর্শন"
 
 msgid "_Channel:"
 msgstr "চ্যানেল (_C):"
 
 msgid "_Password:"
-msgstr "গুপ্তসংকেত (_P):"
-
-# tithi
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC এর ডাকনামসমূহ ফাঁকা স্থান ধারণ নাও করতে পারে"
+msgstr "পাসওয়ার্ড (_P):"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "সংযোগ করছে"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC ডাকনাম এবং সার্ভারে ফাঁকা অক্ষর থাকতে পারবে না"
 
 msgid "SSL support unavailable"
-msgstr "এসএসএল সমর্থন অপ্রাপ্য"
+msgstr "SSL সাপোর্ট পাওয়া যায়না"
 
-msgid "Couldn't create socket"
-msgstr "সকেট তৈরী করা যাচ্ছে না"
+msgid "Unable to connect"
+msgstr "সংযোগ করতে ব্যর্থ"
 
-msgid "Couldn't connect to host"
-msgstr "হোস্টের সাথে সংযুক্ত করা যাচ্ছে না"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "সংযুক্ত হতে ব্যর্থ: %s"
 
-msgid "Read error"
-msgstr "পড়ায় ত্রুটি"
+#, c-format
+msgid "Server closed the connection"
+msgstr "সার্ভার সংযোগটি বন্ধ করে দিয়েছে"
 
 msgid "Users"
-msgstr "ব্যবহারকারীরা"
+msgstr "ব্যবহারকারী"
 
 msgid "Topic"
 msgstr "বিষয়"
@@ -3324,12 +3476,12 @@ msgstr "বিষয়"
 #. *< name
 #. *< version
 msgid "IRC Protocol Plugin"
-msgstr "আইআরসি প্রটোকল প্লাগইন"
+msgstr "IRC প্রোটোকল প্লাগইন"
 
 # tithi
 #. *  summary
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "IRC প্রটোকল প্লাগইন যা কম সমস্য়া তৈরি করে"
+msgstr "IRC প্রোটোকল প্লাগইন যা কম সমস্যা তৈরি করে"
 
 #. host to connect to
 msgid "Server"
@@ -3339,12 +3491,12 @@ msgstr "সার্ভার"
 msgid "Port"
 msgstr "পোর্ট"
 
+# ***
 msgid "Encodings"
-msgstr "সঙ্কেতায়নসমূহ"
+msgstr "এনকোডিং"
 
-# tithi
 msgid "Auto-detect incoming UTF-8"
-msgstr "আসন্ন UTF-8 স্বয়ং-শনাক্ত করে"
+msgstr "আসন্ন UTF-8 স্বয়ংক্রিয়ভাবে শনাক্ত করা হবে"
 
 msgid "Real name"
 msgstr "আসল নাম"
@@ -3354,22 +3506,22 @@ msgstr "আসল নাম"
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
 msgid "Use SSL"
-msgstr "SSL ব্যবহার করুন"
+msgstr "SSL ব্যবহার করা হবে"
 
+# ***
 msgid "Bad mode"
-msgstr "খারাপ মেজাজ"
+msgstr "ত্রুটিযুক্ত মোড"
 
-# tithi
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr "%2s দ্বারা %1s এ বাধা, %3s আগে নির্ধারণ করুন"
+msgstr "%2$s দ্বারা %1$s কে নিষিদ্ধ করা হয়েছে, %3$s আগে নির্ধারিত "
 
 #, c-format
 msgid "Ban on %s"
-msgstr "%s এ বাধা দিচ্ছে"
+msgstr "%s কে নিষিদ্ধকরণ"
 
 msgid "End of ban list"
-msgstr "নিষিদ্ধ তালিকার শেষে"
+msgstr "নিষিদ্ধ তালিকা সমাপ্ত"
 
 #, c-format
 msgid "You are banned from %s."
@@ -3380,29 +3532,30 @@ msgstr "নিষিদ্ধ করা হয়েছে"
 
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "%s নিষিদ্ধ করা যাচ্ছে না: নিষিদ্ধ তালিকা পূর্ণ"
+msgstr "%s কে নিষিদ্ধ করা যাচ্ছে না: নিষিদ্ধ তালিকা পরিপূর্ণ"
 
 msgid " <i>(ircop)</i>"
 msgstr "<i>(ircop)</i>"
 
+# ***
 msgid " <i>(identified)</i>"
-msgstr "<i>(শনাক্তকৃত)</i>"
+msgstr " <i>(শনাক্তকৃত)</i>"
 
 msgid "Nick"
 msgstr "ডাকনাম"
 
 # tithi
 msgid "Currently on"
-msgstr "বর্তমানে"
+msgstr "বর্তমানে চালু আছে"
 
 msgid "Idle for"
-msgstr "এর জন্য অলস"
+msgstr "যতক্ষন নিষ্ক্রিয়"
 
 msgid "Online since"
-msgstr "যখন থেকে অনলাইন "
+msgstr "যতক্ষন অনলাইনে"
 
 msgid "<b>Defining adjective:</b>"
-msgstr "<b>বিশেষন নির্ধারন করছে:</b>"
+msgstr "<b>বিশেষন নির্ধারন:</b>"
 
 # tithi
 msgid "Glorious"
@@ -3410,15 +3563,15 @@ msgstr "চমৎকার"
 
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%1s বিষয় পরিবর্তন করছে: %2s"
+msgstr "%1$s বিষয় পরিবর্তন করেছে, এখন বিষয়: %2$s"
 
 #, c-format
 msgid "%s has cleared the topic."
-msgstr "%s বিষয়টি পরিস্কার করেছে।"
+msgstr "%s বিষয়টি অপসারন করেছে।"
 
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "%1s এর জন্য বিষয় হলো: %2s"
+msgstr "%1$s এর জন্য বিষয় হলো: %2$s"
 
 #, c-format
 msgid "Unknown message '%s'"
@@ -3432,13 +3585,14 @@ msgstr "IRC সার্ভার এমন একটি বার্তা প�
 
 #, c-format
 msgid "Users on %s: %s"
-msgstr "%1s এর ব্যবহারকারী: %2s"
+msgstr "%1$s এর ব্যবহারকারী: %2$s"
 
+# ***
 msgid "Time Response"
 msgstr "সাড়া দেওয়ার সময়"
 
 msgid "The IRC server's local time is:"
-msgstr "আইআরসি সার্ভারের স্থানীয় সময় হলো:"
+msgstr "IRC সার্ভারের স্থানীয় সময়:"
 
 msgid "No such channel"
 msgstr "এমন কোনো চ্যানেল নেই"
@@ -3448,7 +3602,7 @@ msgid "no such channel"
 msgstr "এমন কোনো চ্যানেল নেই"
 
 msgid "User is not logged in"
-msgstr "ব্যবহারকারী লগইন অবস্থায় নেই"
+msgstr "ব্যবহারকারী লগইন করা নেই"
 
 msgid "No such nick or channel"
 msgstr "এমন কোনো ডাকনাম বা চ্যানেল নেই"
@@ -3458,67 +3612,78 @@ msgstr "পাঠানো সম্ভব হয়নি"
 
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "%s এর অংশগ্রহনের জন্যে আমন্ত্রণ প্রয়োজন"
+msgstr "%s এর অংশগ্রহনের জন্যে আমন্ত্রণ প্রয়োজন।"
 
 msgid "Invitation only"
 msgstr "শুধুমাত্র আমন্ত্রণ"
 
+# Kick =  তিরস্কার
+# OR  পদাঘাত
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "%1s দ্বারা আপনাকে বের করে দেয়া হয়েছে: (%2s)"
+msgstr "%1$s আপনাকে তিরস্কার করেছেন: (%2$s)"
 
 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "%1s (%2s) দ্বারা বহিষ্কৃত"
+msgstr "%1$s (%2$s) দ্বারা তিরস্কৃত"
 
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr "%s দ্বারা (%s %s) পরিমন্ডল"
+msgstr "%s দ্বারা (%s %s) মোড"
 
 msgid "Invalid nickname"
-msgstr "অবৈধ ডাকনাম"
+msgstr "অকার্যকর ডাকনাম"
 
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"আপনার নির্বাচিত ডাকনামটি সার্ভার দ্বারা বাতিল করা হয়েছে। এটি সম্ভবত অবৈধ বর্ণচিহ্ন "
-"ধারণ করে।"
+"আপনার নির্বাচিত ডাকনামটি সার্ভার বাতিল করে দিয়েছে। সম্ভবত এতে অবৈধ বর্ণচিহ্ন ছিল।"
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"আপনার নির্বাচিত একাউন্ট নাম সার্ভার থেকে বাতিল করা হয়েছে। এটি সম্ভবত অবৈধ "
-"বর্ণচিহ্ন ধারণ করে।"
+"আপনার নির্বাচিত একাউন্ট নামটি সার্ভার বাতিল করে দিয়েছে। সম্ভবত এতে অবৈধ বর্ণচিহ্ন "
+"ছিল।"
+
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "\"%s\" ডাকনামটি ইতোমধ্যেই ব্যবহৃত হয়েছে।"
+
+msgid "Nickname in use"
+msgstr "প্রচলিত ডাকনাম"
 
 msgid "Cannot change nick"
-msgstr "ডাকনাম পরিবর্তন করতে পারে না"
+msgstr "ডাকনাম পরিবর্তন করা সম্ভব নয়"
 
 msgid "Could not change nick"
-msgstr "ডাকনাম পরিবর্তন করতে পারেনি"
+msgstr "ডাকনাম পরিবর্তন করা সম্ভব হয়নি"
 
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "আপনি চ্যানেল%s%s বিভক্ত করেছেন"
 
 msgid "Error: invalid PONG from server"
-msgstr "ত্রুটি: সার্ভার থেকে অবৈধ PONG"
+msgstr "ত্রুটি: সার্ভার থেকে অকার্যকর PONG"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "PING উত্তর ‌‌-- পরে: %lu সেকেন্ড"
+msgstr "PING reply -- Lag: %lu seconds"
 
 #, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "%s যুক্ত করতে পারে না: নিবন্ধন আবশ্যক।"
+msgstr "%s এ যোগদান করা সম্ভব হয়নি: নিবন্ধন আবশ্যক।"
 
 msgid "Cannot join channel"
-msgstr "চ্যানেলে অংশগ্রহণ করতে পারে না"
+msgstr "চ্যানেলে অংশগ্রহণ করা সম্ভব হয়নি"
 
 msgid "Nick or channel is temporarily unavailable."
-msgstr "ডাকনাম বা চ্যানেল সাময়িকভাবে অপ্রাপ্য"
+msgstr "ডাকনাম বা চ্যানেল সাময়িকভাবে অনুপস্থিত"
 
 #, c-format
 msgid "Wallops from %s"
@@ -3526,215 +3691,207 @@ msgstr "%s থেকে Wallop"
 
 # tithi
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "কর্ম &1lt;&2gt সম্পন্ন করার কাজ;:  একটি কাজ সম্পন্ন করেন।"
+msgstr "action &lt;action to perform&gt;:  একটি ক্রিয়া সম্পাদন করুন।"
 
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"অনুপস্থিত [বার্তা]: একটি অনুপস্থিত বার্তা নির্ধারণ করুন, বা কোনো বার্তা ব্যবহার না করে "
-"অনুপস্থিত আবস্থা থেকে ফিরে আসুন।"
+"away [message]: একটি অন্যত্র অবস্থানের বার্তা নির্ধারণ করুন, বা কোনো বার্তা ব্যবহার "
+"না করে অন্যত্র অবস্থা থেকে ফিরে আসুন।"
 
-# tithi
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
 msgstr "ctcp <nick> <msg>: ডাকনামকে ctcp বার্তা পাঠায়।"
 
 msgid "chanserv: Send a command to chanserv"
-msgstr "chanserv: chanserv এ নির্দেশ পাঠান"
+msgstr "chanserv: chanserv এ কমান্ড পাঠান"
 
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &1lt;ডাকনাম১&2gt; [ডাকনাম২] ...: কারও কাছ থেকে চ্যনেল অপারেটর অবস্থা মুছে "
-"ফেলুন। এটি করতে আপনাকে অবশ্যই চ্যানেল পরিচালক হতে হবে।"
+"deop &lt;nick1&gt; [nick2] ...: কারও চ্যনেল অপারেটরের অবস্থা মুছে ফেলুন। এটি "
+"করতে আপনাকে অবশ্যই চ্যানেল অপারেটর হতে হবে।"
 
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &1lt;ডাকনাম১&2gt; [ডাকনাম২] ...: চ্যানেলটি যদি পরিমিত (+m) হয় তবে "
-"কোনো একজনকে কথা বলা থেকে বিরত রেখে, চ্যানেলের স্বর অবস্থা অপসারণ করুন। এটা করতে "
-"আপনাকে অবশ্যই চ্যানেল অপারেটর হতে হবে।"
+"devoice &lt;nick1&gt; [nick2] ...: চ্যানেলটি যদি সমন্বিত হয় (+m) তবে "
+"ব্যবহারকারীকে কথা বলা থেকে বিরত রাখতে চ্যানেলের ভয়েস অবস্থা অপসারণ করুন। এটি "
+"করতে আপনাকে অবশ্যই চ্যানেল অপারেটর হতে হবে।"
 
-# tithi
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"আমন্ত্রন জানান &1lt;ডাকনাম&2gt; [রুম]:  আপনাকে সুনির্দিষ্ট চ্যানেলে বা বর্তমান "
-"চ্যানেলে যুক্ত করাতে কাউকে আমন্ত্রন জানান।"
+"invite &lt;nick&gt; [room]:  নির্বাচিত বা বর্তমান চ্যানেলে আপনার সাথে যুক্ত হতে "
+"কাউকে আমন্ত্রন জানান।"
 
 # tithi
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &1lt;রুম১&2gt;[,রুম২][,...] [কী১[,কী২][,...]]:  যদি প্রয়োজন হয় তবে প্রত্যেককে "
-"ঐচ্ছিকভাবে একটি চ্যানেল কী প্রদান করে এক বা একাধিক চ্যানেল প্রবেশ করান।"
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  এক বা একাধিক চ্যানেল দিন, "
+"প্রয়োজনে প্রত্যেককে একটি চ্যানেল কী প্রদান করুন।"
 
 # tithi
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"যোগদান করুন &1lt;রুম১&2gt;[,রুম২][,...] [কী১[,কী২][,...]]:  যদি প্রয়োজন হয় তবে "
-"প্রত্যেককে ঐচ্ছিকভাবে একটি চ্যানেল কী প্রদান করে এক বা একাধিক চ্যানেল প্রবেশ করান।"
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  এক বা একাধিক চ্যানেল "
+"দিন, প্রয়োজনে প্রত্যেককে একটি চ্যানেল কী প্রদান করুন।"
 
 # tithi
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"মুছে ফেলা &1lt;ডাকনাম&2gt; [বার্তা]:  একটি চ্যানেল থেকে কাউকে অপসারণ করুন। এটা "
-"করতে আপনাকে অবশ্যই চ্যানেলে অপারেটর হতে হবে।"
+"kick &lt;nick&gt; [message]:  একটি চ্যানেল থেকে কাউকে অপসারণ করুন। এটি করতে "
+"আপনাকে অবশ্যই চ্যানেলে অপারেটর হতে হবে।"
 
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"তালিকা: নেটওয়ার্কে আড্ডা ঘরের তালিকা প্রদর্শন করুন। <i>Warning, some servers may "
-"disconnect you upon doing this</i>"
+"list: নেটওয়ার্কে আড্ডার আসরের তালিকা প্রদর্শন করা হবে। <i>সতর্কবানী: এটি করলে কিছু "
+"সার্ভার আপনাকে বিচ্ছিন্ন করে দিতে পারে।</i>   "
 
 # tithi
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "আমাকে &1lt;সম্পাদনার কাজ&2gt;:  একটি কাজ সম্পাদন করুন।"
+msgstr "me &lt;action to perform&gt;: একটি ক্রিয়া সম্পাদন করুন।"
 
 # tithi
 msgid "memoserv: Send a command to memoserv"
-msgstr "স্মৃতি সার্ভার: স্মৃতি সার্ভারে একটি নির্দেশ পাঠান"
+msgstr "memoserv: memoservএ একটি কমান্ড পাঠানো হবে"
 
-# tithi
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"অবস্থা &1lt;+|-&2gt;&3lt;A-Za-z&4gt; &5lt;ডাকনাম|চ্যানেল&6gt;:  একটি চ্যানেল বা "
-"ব্যবহারকারীর মোড নির্ধারন বা অনির্ধারণ করুন।"
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  একটি চ্যানেল বা "
+"ব্যবহারকারীর মোড নির্ধারন করুন বা সরিয়ে ফেলুন।"
 
-# tithi
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"বার্তা &1lt;ডাকনাম&2gt; &3lt;বার্তা&4gt;:  একজন ব্যবহারকারীকে একটি ব্যক্তিগত "
-"বার্তা পাঠান (একটি চ্যানেলের বিপরীতে)।"
+"msg &lt;nick&gt; &lt;message&gt;:  একজন ব্যবহারকারীকে (চ্যানেলে নয়) একটি "
+"ব্যক্তিগত বার্তা পাঠান ।"
 
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "নামসমূহ [চ্যানেল১]: চ্যানেলে বর্তমান ব্যবহারকারীদের তালিকা করুন।"
+msgstr "names [channel]: চ্যানেলে বর্তমান ব্যবহারকারীদের তালিকা করুন।"
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "ডাকনাম &1lt;নতুন ডাকনাম&2gt;: আপনার ডাকনাম পরিবর্তন করুন।"
+msgstr "nick &lt;new nickname&gt;: আপনার ডাকনাম পরিবর্তন করুন।"
 
 # tithi
 msgid "nickserv: Send a command to nickserv"
-msgstr "ডাকনাম-সার্ভার: ডাকনাম-সার্ভারে একটি নির্দেশ পাঠান"
+msgstr "nickserv: nickservএ একটি কমান্ড পাঠানো হবে"
 
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "ঘোষণা &1lt;লক্ষ্য&2lt;: ব্যবহারকারীর কাছে বা চ্যানেলে একটি ঘোষণা পাঠান।"
+msgstr "notice &lt;target&lt;: ব্যবহারকারীরকে বা চ্যানেলে একটি ঘোষণা পাঠান।"
 
-# tithi
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"অপারেটর &1lt;ডাকনাম১&2gt; [ডাকনাম২] ...:  চ্যানেল অপারেটরের অবস্থা কারো কাছে "
-"মেমে নিন। এটা করতে আপনাকে অবশ্যই একজন চ্যানেল অপারেটর হতে হবে।"
+"op &lt;nick1&gt; [nick2] ...:  কাউকে চ্যানেল অপারেটরের পদমর্যাদা দিন। এটি করতে "
+"আপনাকে অবশ্যই একজন চ্যানেল অপারেটর হতে হবে।"
 
-# tithi
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-"operwall &1lt;বার্তা&2gt;:  এটা কি তা যদি আপনি না জানেন, আপনি সম্ভবত এটা "
+"operwall &lt;message&gt;:  এটি কি তা যদি আপনি না জানেন, আপনি সম্ভবত এটি "
 "ব্যবহার করতে পারবেন না।"
 
 # tithi
 msgid "operserv: Send a command to operserv"
-msgstr "অপারেটর-সার্ভার: অপারেটর-সার্ভারে একটি নির্দেশ পাঠান"
+msgstr "operserv: operserv একটি কমান্ড পাঠানো হবে"
 
 # tithi
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-"অংশ [রুম] [বার্তা]:  একটি ঐচ্ছিক বার্তার সহ, বর্তমান চ্যানেল, বা উল্লেখিত চ্যানেল "
-"ত্যাগ করুন।"
+"part [room] [message]:  একটি ঐচ্ছিক বার্তা সহ, বর্তমান চ্যানেল বা নির্বাচিত "
+"চ্যানেল ত্যাগ করুন।"
 
 # tithi
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"পিঙ্গ [ডাকনাম]: একটি ব্যবহারকারী কত পেছনে আছে তা জিজ্ঞাসা (বা সার্ভার যদি কোনো "
-"ব্যবহারকারী উল্লেখিত না থাকে) করুন।"
+"ping [nick]: একটি ব্যবহারকারী (বা সার্ভার যদি কোনো ব্যবহারকারী উল্লেখিত না থাকে) "
+"কত পেছনে আছে তা জিজ্ঞাসা করুন।"
 
-# tithi
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"জিজ্ঞাসা &1lt;ডাকনাম&2gt; &3lt;বার্তা&4gt;: একজন ব্যবহারকারীকে একটি ব্যক্তিগত "
-"বার্তা পাঠান (একটি চ্যানেলের বিপরীত হিসেবে)।"
+"query &lt;nick&gt; &lt;message&gt;: একজন ব্যবহারকারীকে (চ্যানেলে নয়) একটি "
+"ব্যক্তিগত বার্তা পাঠান।"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "প্রস্থান করুন [বার্তা]: একটি ঐচ্ছিক বার্তাসহ, সার্ভারের থেকে বিচ্ছিন্ন করুন।"
+msgstr "quit [message]: একটি ঐচ্ছিক বার্তা সহ, সার্ভারের থেকে বিচ্ছিন্ন হোন।"
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "উক্তি [...]: সার্ভারে একটি অরুপান্তরিত বার্তা পাঠান"
+msgstr "quote [...]: সার্ভারে একটি অশোধিত বার্তা পাঠান।"
 
 # tithi
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
-"অপসারণ করুন &1lt;ডাকনাম&2gt; [বার্তা]: একটি রুম থেকে কোনও একজন অপসারণ করুন। এটা "
-"করতে আপনাকে অবশ্যই একজন চ্যানেল অপারেটর হতে হবে।"
+"remove &lt;nick&gt; [message]: কাউকে আড্ডা থেকে অপসারণ করুন। এটি করতে আপনাকে "
+"অবশ্যই একজন চ্যানেল অপারেটর হতে হবে।"
 
 msgid "time: Displays the current local time at the IRC server."
-msgstr "সময়: আইআরসি সার্ভারে বর্তমান স্থানীয় সময় প্রদর্শন করে।"
+msgstr "time: IRC সার্ভারের বর্তমান স্থানীয় সময় প্রদর্শন করে।"
 
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "বিষয়বস্তু [নতুন বিষয়বস্তু]: চ্যানেলের বিষয়বস্তু প্রদর্শন বা পরিবর্তন করুন।"
+msgstr "topic [new topic]:  চ্যানেলের বিষয় প্রদর্শন বা পরিবর্তন করুন।"
 
 # tithi
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
-"ব্যবহারকারী মোড &1lt;+|-&2gt;&3lt;A-Za-z&4gt;: ব্যবহারকারীr মোড নির্ধারণ বা "
-"অনির্ধারণ করুন।"
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;: ব্যবহারকারী মোড নির্ধারণ করুন বা মুছে ফেলুন।"
 
-# tithi
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "সংস্করণ [ডাকনাম]: একজন ব্যবহারকারীকে CTCP সংস্করণ অনুরোধ পাঠান"
+msgstr "version [nick]: একজন ব্যবহারকারীকে CTCP VERSION অনুরোধ পাঠান।"
 
 # tithi
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"স্বর &1lt;ডাকনাম১&2gt; [ডাকনাম২] ...:  কোন একজনের কাছে চ্যানেলের স্বর অবস্থা "
-"মেনে নিন। এটা করতে আপনাকে অবশ্যই চ্যানেল অপারেটর হতে হবে।"
+"voice &lt;nick1&gt; [nick2] ...:  কাউকে চ্যানেলের ভয়েসের অনুমোদন দিন। এটি করতে "
+"আপনাকে অবশ্যই চ্যানেল অপারেটর হতে হবে।"
 
 # tithi
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
-"wallops &1lt;বার্তা&2gt;:  আপনি যদি না জানেন এটা কি, আপনি সম্ভবত এটা ব্যবহার "
-"করতে পারবেন না।"
+"wallops &lt;message&gt;:  এটি কি তা না জানলে, আপনি সম্ভবত এটি ব্যবহার করতে "
+"পারবেন না।"
 
 # tithi
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "কে [সার্ভার] &1lt;ডাকনাম&2gt;: একজন ব্যবহারকারীর তথ্য গ্রহণ করুন।"
+msgstr "whois [server] &lt;nick&gt;: একজন ব্যবহারকারীর তথ্য সংগ্রহ করুন।"
 
 # tithi
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "কে ছিল&1lt;ডাকনাম&2gt;: বন্ধ রয়েছে এমন একজন ব্যবহারকারীর তথ্য গ্রহণ করুন।"
+msgstr "whowas &lt;nick&gt;: লগআউট করেছেন এমন একজন ব্যবহারকারীর তথ্য সংগ্রহ করুন।"
 
+# mark15
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "%1s হতে উত্তর দেয়ার সময়: %2lu সেকেন্ড"
+msgstr "%1$s থেকে উত্তর দেয়ার সময়: %2$lu সেকেন্ড"
 
 msgid "PONG"
 msgstr "PONG"
@@ -3749,45 +3906,74 @@ msgid "Unknown Error"
 msgstr "অজানা ত্রুটি"
 
 msgid "Ad-Hoc Command Failed"
-msgstr "এড-হক নির্দেশ ব্যর্থ"
+msgstr "Ad-Hoc কমান্ড ব্যর্থ"
 
 msgid "execute"
 msgstr "কার্যকর করুন"
 
-# tithi
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"সার্ভারের লগইন করার জন্য TSL/SSL আবশ্যক,  কোনো TLS/SSL সমর্থন খুঁজে পাওয়া যায়নি।"
+"সার্ভারে লগইন করার জন্য TSL/SSL আবশ্যক,  কোনো TLS/SSL সাপোর্ট খুঁজে পাওয়া যায়নি।"
 
 # tithi
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "আপনার এনক্রিপশন প্রয়োজন, কিন্তু কোনো TLS/SSL সমর্থন খুঁজে পাওয়া যায়নি।"
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "আপনার এনক্রিপশন প্রয়োজন, কিন্তু কোনো TLS/SSL সাপোর্ট খুঁজে পাওয়া যায়নি।"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "একটি এনক্রিপশনবিহীন স্ট্রীমে সার্ভারের সরল-পাঠ প্রমাণীকরণ প্রয়োজন"
+msgstr "একটি এনক্রিপশনবিহীন স্ট্রীমে সার্ভারের সরল-টেক্সট প্রমাণীকরণ প্রয়োজন"
 
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"একটি এনক্রিপশনবিহীন সংযোগে %s এর সরল-পাঠ প্রমাণীকরণ প্রয়োজন। এটি অনুমোদন করুন এবং "
-"প্রমাণীকরণ কি অব্যাহত রাখতে চান?"
+"একটি এনক্রিপশনবিহীন সংযোগে %s এর সরল-টেক্সট প্রমাণীকরণ প্রয়োজন। এটি অনুমোদন করে "
+"প্রমাণীকরণ অব্যাহত রাখতে চান?"
 
+# ***
 msgid "Plaintext Authentication"
-msgstr "সরল-পাঠ প্রমাণীকরণ"
+msgstr "সরল-টেক্সট প্রমাণীকরণ"
+
+# tithi
+msgid "SASL authentication failed"
+msgstr "SASL প্রমাণীকরণ ব্যর্থ"
 
-msgid "Invalid response from server."
-msgstr "সার্ভার থেকে অবৈধ সাড়া।"
+msgid "Invalid response from server"
+msgstr "সার্ভার থেকে অকার্যকর উত্তর"
 
 msgid "Server does not use any supported authentication method"
 msgstr "সার্ভার কোনো সমর্থিত প্রমাণীকরণ প্রক্রিয়া ব্যবহার করে না।"
 
+# tithi
+msgid "You require encryption, but it is not available on this server."
+msgstr "আপনার এনক্রিপশন প্রয়োজন, কিন্তু এটি এই সার্ভারটিতে নেই।"
+
 msgid "Invalid challenge from server"
-msgstr "সার্ভার থেকে অবৈধ চ্যালেঞ্জ"
+msgstr "সার্ভার থেকে অকার্যকর চ্যালেঞ্জ"
+
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL ত্রুটি: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "আপনার সেশনটি BOSH সংযোগ ব্যবস্থাপক সমাপ্ত করেছে।"
+
+msgid "No session ID given"
+msgstr "কোনো সেশন ID প্রদান করা হয়নি"
+
+# tithi
+msgid "Unsupported version of BOSH protocol"
+msgstr "BOSH প্রোটোকলের অসমর্থিত সংস্করণ"
 
-msgid "SASL error"
-msgstr "SASL ত্রুটি"
+msgid "Unable to establish a connection with the server"
+msgstr "সার্ভারের সাথে সংযোগ স্থাপনে ব্যর্থ"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "সার্ভারের সাথে সংযোগ স্থাপনে ব্যর্থ: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "SSL সংযোগ স্থাপনে ব্যর্থ"
 
 msgid "Full Name"
 msgstr "পুরো নাম"
@@ -3808,13 +3994,13 @@ msgid "Extended Address"
 msgstr "বর্ধিত ঠিকানা"
 
 msgid "Locality"
-msgstr "এলাকা"
+msgstr "জনপদ"
 
 msgid "Region"
 msgstr "এলাকা"
 
 msgid "Postal Code"
-msgstr "পোষ্টাল কোড"
+msgstr "পোস্টাল কোড"
 
 msgid "Country"
 msgstr "দেশ"
@@ -3828,7 +4014,7 @@ msgid "Organization Name"
 msgstr "সংগঠনের নাম"
 
 msgid "Organization Unit"
-msgstr "সংগঠন একক"
+msgstr "সংগঠনের বিভাগ"
 
 msgid "Role"
 msgstr "ভূমিকা"
@@ -3837,209 +4023,38 @@ msgid "Birthday"
 msgstr "জন্মদিন"
 
 msgid "Description"
-msgstr "বিবরণ"
+msgstr "বর্ণনা"
 
 msgid "Edit XMPP vCard"
-msgstr "XMPP vCard সম্পাদনা করুন"
+msgstr "XMPP vCard সম্পাদনা"
 
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"নিচের সব বিষয়গুলো ঐচ্ছিক। আপনি যে তথ্য প্রবেশ করাতে স্বাচ্ছন্দবোধ করেন শুধুমাত্র তা "
-"প্রবেশ করান।"
+"নিচের সব বিষয়গুলো ঐচ্ছিক। আপনি যেসব তথ্য দিতে স্বাচ্ছন্দ্য বোধ করেন তা লিখতে পারেন।"
 
 msgid "Client"
 msgstr "ক্লায়েন্ট"
 
-# tithi
 msgid "Operating System"
 msgstr "অপারেটিং সিস্টেম"
 
-# tithi
-msgid "Last Activity"
-msgstr "শেষ সক্রিয়তা"
-
-msgid "Service Discovery Info"
-msgstr "সেবা আবিষ্কারের তথ্য"
-
-# tithi
-msgid "Service Discovery Items"
-msgstr "সেবা আবিষ্কারের বিষয়োপকরনসমূহ"
-
-msgid "Extended Stanza Addressing"
-msgstr "বর্ধিত স্ট্যানজা উদ্দেশ করছে"
-
-msgid "Multi-User Chat"
-msgstr "একাধিক-ব্যবহারকারী সম্বলিত আড্ডা"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "একাধিক-ব্যবহারকারীর বর্ধিত উপস্থিতি তথ্য"
-
-# tithi
-msgid "In-Band Bytestreams"
-msgstr "In-Band বাইট-প্রবাহ"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc নির্দেশসমূহ"
-
-# tithi
-msgid "PubSub Service"
-msgstr "PubSub সেবা"
-
-# tithi
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 বাইট-প্রবাহ"
-
-# tithi
-msgid "Out of Band Data"
-msgstr "ব্যান্ড তথ্যের বাইরে"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "ইন ব্যান্ড নিবন্ধন"
-
-msgid "User Location"
-msgstr "ব্যবহারকারীর অবস্থান"
-
-# fix me tithi
-msgid "User Avatar"
-msgstr "ব্যবহারকারী অ্যাভাটার"
-
-msgid "Chat State Notifications"
-msgstr "আড্ডার অবস্থার প্রজ্ঞাপন"
-
-msgid "Software Version"
-msgstr "সফটওয়্যায় সংস্করণ"
-
-# fix me tithi
-msgid "Stream Initiation"
-msgstr "প্রবাহ শুরু করুন"
-
-msgid "File Transfer"
-msgstr "ফাইল স্থানান্তর করুন"
-
-msgid "User Mood"
-msgstr "ব্যবহাকারীরর পরিমন্ডল"
-
-msgid "User Activity"
-msgstr "ব্যবহারকারীর কাজকর্ম"
-
-# tithi
-msgid "Entity Capabilities"
-msgstr "সত্তার সক্ষমতা"
-
-# tithi
-msgid "Encrypted Session Negotiations"
-msgstr "সঙ্কেতায়িত অধিবেশনের আলোচনা"
-
-msgid "User Tune"
-msgstr "ব্যবহারকারীর সুর"
-
-# tithi
-msgid "Roster Item Exchange"
-msgstr "রোস্টার বিষয়োপকরণ পরিবর্তন করুন"
-
-msgid "Reachability Address"
-msgstr "পৌঁছানোর মতো ঠিকানা"
-
-msgid "User Profile"
-msgstr "ব্যবহারকারীর প্রোফাইল"
-
-msgid "Jingle"
-msgstr "ছন্দ"
-
-# tithi
-msgid "Jingle Audio"
-msgstr "ছন্দময় অডিও"
-
-msgid "User Nickname"
-msgstr "ব্যবহারকারীর ডাকনাম"
-
-# tithi
-msgid "Jingle ICE UDP"
-msgstr "ছন্দময় ICE UDP"
-
-# tithi
-msgid "Jingle ICE TCP"
-msgstr "ছন্দময়  ICE TCP"
-
-# tithi
-msgid "Jingle Raw UDP"
-msgstr "ছন্দময় Raw UDP"
-
-# tithi
-msgid "Jingle Video"
-msgstr "ছন্দময় ভিডিও"
-
-# tithi
-msgid "Jingle DTMF"
-msgstr "ছন্দময় DTMF"
-
-msgid "Message Receipts"
-msgstr "বার্তা গ্রহণ করা হয়েছে"
-
-msgid "Public Key Publishing"
-msgstr "সর্বসাধারণের কী প্রকাশ করা হচ্ছে"
-
-msgid "User Chatting"
-msgstr "ব্যবহারকারী আড্ডা দিচ্ছে"
-
-msgid "User Browsing"
-msgstr "ব্যবহাকারী ব্রাউজ করছে"
-
-msgid "User Gaming"
-msgstr "ব্যবহারকারীরা খেলছে"
-
-msgid "User Viewing"
-msgstr "ব্যবহারকারীরা দেখছে"
-
-msgid "Ping"
-msgstr "পিঙ্গ করুন"
-
-# tithi
-msgid "Stanza Encryption"
-msgstr "স্ট্যানজা সঙ্কেতায়ন"
-
-# tithi
-msgid "Entity Time"
-msgstr "সত্ত্বার সময়"
-
-# tithi
-msgid "Delayed Delivery"
-msgstr "বিলম্বিত সরবরাহ"
-
-# tithi
-msgid "Collaborative Data Objects"
-msgstr "সহযোগি উপাত্ত অবজেক্ট"
-
-# tithi
-msgid "File Repository and Sharing"
-msgstr "ফাইল ভান্ডার এবং শেয়ার করছে"
-
-# tithi
-msgid "STUN Service Discovery for Jingle"
-msgstr "ছন্দময়তার জন্য STUN সেবা আবিষ্কার"
-
-# tithi
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "সহজবোধ্য সঙ্কেতায়িত অধিবেশনের আলোচনা"
-
-# tithi
-msgid "Hop Check"
-msgstr "হপ পরীক্ষা করুন"
-
-# tithi
-msgid "Capabilities"
-msgstr "সক্ষমতা"
+msgid "Local Time"
+msgstr "স্থানীয় সময়"
 
 msgid "Priority"
 msgstr "অগ্রাধিকার"
 
 msgid "Resource"
-msgstr "সম্পদ"
+msgstr "রিসোর্স"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s আগে"
+
+msgid "Logged Off"
+msgstr "লগ আউট হয়েছে"
 
 msgid "Middle Name"
 msgstr "মধ্য নাম"
@@ -4048,7 +4063,7 @@ msgid "Address"
 msgstr "ঠিকানা"
 
 msgid "P.O. Box"
-msgstr "পি.ও. বক্স"
+msgstr "P.O. বাক্স"
 
 msgid "Photo"
 msgstr "ছবি"
@@ -4058,39 +4073,39 @@ msgstr "লোগো"
 
 # tithi
 msgid "Un-hide From"
-msgstr "এর হতে উন্মোচিত"
+msgstr "এর থেকে উন্মোচিত"
 
 # tithi
 msgid "Temporarily Hide From"
-msgstr "এর হতে সাময়িকভাবে লুকান"
+msgstr "এর থেকে সাময়িকভাবে লুকানো"
 
 #. && NOT ME
 msgid "Cancel Presence Notification"
-msgstr "উপস্থিতির প্রজ্ঞাপন বাতিল করুন"
+msgstr "উপস্থিতির ঘোষণা বাতিল"
 
 # tithi
 msgid "(Re-)Request authorization"
-msgstr "(পুনরায়-)অনুরোধের প্রাপ্তাধিকার"
+msgstr "(পুনরায়) অনুমোদন অনুরোধ"
 
 # tithi
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
-msgstr "অংশীদারী ত্যাগ করুন"
+msgstr "আনসাবস্ক্রাইব"
 
 msgid "Log In"
-msgstr "লগইন করুন"
+msgstr "লগইন"
 
 msgid "Log Out"
-msgstr "লগ আউট করুন"
+msgstr "লগ আউট"
 
 msgid "Chatty"
 msgstr "আড্ডাবাজ"
 
 # tithi
 msgid "Extended Away"
-msgstr "আরও বর্ধিত করুন"
+msgstr "অনেকক্ষন যাবত অন্যত্র"
 
 msgid "Do Not Disturb"
 msgstr "বিরক্ত করবেন না"
@@ -4103,56 +4118,55 @@ msgid "Last Name"
 msgstr "শেষ নাম"
 
 msgid "The following are the results of your search"
-msgstr "নিম্নোক্ত আপনার অনুসন্ধানের ফলাফল"
+msgstr "আপনার অনুসন্ধানের ফলাফল নিম্নরূপ"
 
-# fix-me tithi
 #. current comment from Jabber User Directory users.jabber.org
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-"প্রদত্ত ক্ষেত্রে সন্ধান বৈশিষ্ট্য প্রবেশ করার মাধ্যমে একটি যোগাযোগ খুঁজুন। নোট: প্রত্যেক "
-"ক্ষেত্র ওয়াইল্ড কার্ড অনুসন্ধানসমূহ সমর্থন করে (%)"
+"অনুসন্ধানের ক্ষেত্রে মান প্রবেশ করে একটি পরিচিতি অনুসন্ধান করুন। নোট: প্রত্যেকটি ক্ষেত্র "
+"ওয়াইল্ড কার্ড অনুসন্ধান সমর্থন করে (%)"
 
 msgid "Directory Query Failed"
-msgstr "নির্দেশিকা জিজ্ঞাসা ব্যর্থ হয়েছে"
+msgstr "ডিরেক্টরি কোয়েরি ব্যর্থ"
 
 msgid "Could not query the directory server."
-msgstr "নির্দেশক সার্ভার সম্পর্কে প্রশ্ন করেনি"
+msgstr "নির্দেশক সার্ভার কোয়েরি করতে পারেনি"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
 #, c-format
 msgid "Server Instructions: %s"
-msgstr "সার্ভার নিয়মাবলী: %s"
+msgstr "সার্ভার ইনস্ট্রাকশন: %s"
 
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "যেকোনো সমন্বয়করণ XMPP ব্যবহারকারীর জন্য খুঁজতে এক বা একাধিক ক্ষেত্র পূরন করুন।"
+msgstr "যেকোনো XMPP ব্যবহারকারীর জন্য অনুসন্ধান করতে এক বা একাধিক ক্ষেত্র পূরন করুন।"
 
 msgid "Email Address"
-msgstr "ই-মেইল ঠিকানা"
+msgstr "ইমেইল ঠিকানা"
 
 msgid "Search for XMPP users"
-msgstr "XMPP ব্যবহারকারীর জন্য অনুসন্ধান করুন"
+msgstr "XMPP ব্যবহারকারী অনুসন্ধান"
 
 #. "Search"
 msgid "Search"
-msgstr "খুঁজুন"
+msgstr "অনুসন্ধান"
 
 msgid "Invalid Directory"
-msgstr "অবৈধ নির্দেশিকা"
+msgstr "অকার্যকর ডিরেক্টরি"
 
 msgid "Enter a User Directory"
-msgstr "একটি ব্যবহারকারীর নির্দেশিকা প্রবেশ করান"
+msgstr "একটি ব্যবহারকারী ডিরেক্টরি দিন"
 
 msgid "Select a user directory to search"
-msgstr "খোঁজার জন্য একটি ব্যবহারকারী নির্দেশিকা নির্বাচন করুন"
+msgstr "অনুসন্ধানের জন্য একটি ব্যবহারকারী ডিরেক্টরি নির্বাচন করুন"
 
 msgid "Search Directory"
-msgstr "অনুসন্ধান নির্দেশিকা"
+msgstr "অনুসন্ধান ডিরেক্টরি "
 
 msgid "_Room:"
-msgstr "কক্ষ: (_R)"
+msgstr "আসর (_R):"
 
 msgid "_Server:"
 msgstr "সার্ভার: (_S)"
@@ -4162,109 +4176,105 @@ msgstr "হ্যান্ডেল: (_H)"
 
 #, c-format
 msgid "%s is not a valid room name"
-msgstr "%s বৈধ কক্ষের নাম নয়"
+msgstr "%s কার্যকর আসরের নাম নয়"
 
 msgid "Invalid Room Name"
-msgstr "অবৈধ কক্ষের নাম"
+msgstr "অকার্যকর আসরের নাম"
 
 #, c-format
 msgid "%s is not a valid server name"
-msgstr "%s বৈধ সার্ভার নাম নয়"
+msgstr "%s কার্যকর সার্ভার নাম নয়"
 
 msgid "Invalid Server Name"
-msgstr "অবৈধ সার্ভার নাম"
+msgstr "অকার্যকর সার্ভার নাম"
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s বৈধ কক্ষ নিয়ন্ত্রণ নয়"
+msgstr "%s কোন কার্যকর আসর হ্যান্ডেল নয়"
 
 msgid "Invalid Room Handle"
-msgstr "অবৈধ কক্ষ নিয়ন্ত্রণ"
+msgstr "অকার্যকর আসর হ্যান্ডেল"
 
 msgid "Configuration error"
-msgstr "বিন্যাসন ত্রুটি"
+msgstr "কনফিগারেশন ত্রুটি"
 
 msgid "Unable to configure"
-msgstr "বিন্যাস করতে অক্ষম"
+msgstr "কনফিগার করতে ব্যর্থ"
 
 msgid "Room Configuration Error"
-msgstr "কক্ষ বিন্যাসন ত্রুটি"
+msgstr "আসর কনফিগারেশনে ত্রুটি"
 
 # tithi
 msgid "This room is not capable of being configured"
-msgstr "এই কক্ষটি বিন্যাসিত হতে সক্ষম নয়"
+msgstr "এই আসরটি কনফিগার করা সম্ভব নয়"
 
 msgid "Registration error"
-msgstr "নিবন্ধণ ত্রুটি"
+msgstr "নিবন্ধন ত্রুটি"
 
 # tithi
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "ডাকনাম পরিবর্তন MUC-বহিঃস্থ আড্ডারুমে সমর্থিত নয়"
+msgstr "MUC-বহিঃস্থ আড্ডার আসরে ডাকনাম পরিবর্তন সমর্থিত নয়"
 
 msgid "Error retrieving room list"
-msgstr "রুম তালিকা উদ্ধার করার ত্রুটি"
+msgstr "আসরের তালিকা উদ্ধার করায় ত্রুটি"
 
 msgid "Invalid Server"
-msgstr "অবৈধ সার্ভার"
+msgstr "অকার্যকর সার্ভার"
 
 msgid "Enter a Conference Server"
-msgstr "একটি কনফারেন্স সার্ভার প্রবেশ করান"
+msgstr "অধিবেশন সার্ভারের নাম দিন"
 
 msgid "Select a conference server to query"
-msgstr "অনুসন্ধানের জন্য একটি কনফারেন্স সার্ভার প্রবেশ করান"
+msgstr "খোঁজার জন্য একটি অধিবেশন সার্ভারের নাম দিন"
 
 msgid "Find Rooms"
-msgstr "কক্ষ খুঁজুন"
+msgstr "আসর খুঁজুন"
 
-# tithi
-msgid "You require encryption, but it is not available on this server."
-msgstr "আপনার সঙ্কেতায়ন প্রয়োজন, কিন্তু এটি এই সার্ভারটিতে সহজলভ্য নয়।"
+msgid "Affiliations:"
+msgstr "অধিভুক্তি:"
 
-msgid "Write error"
-msgstr "লিখন ত্রুটি"
+msgid "No users found"
+msgstr "কোনো ব্যবহারকারী পাওয়া যায়নি"
 
-msgid "Ping timeout"
-msgstr "পিঙ্গ সময়-উত্তীর্ণ হয়েছে"
+msgid "Roles:"
+msgstr "ভূমিকা:"
 
-msgid "Read Error"
-msgstr "পাঠ ত্রুটি"
+msgid "Ping timed out"
+msgstr "পিং এর সময় উত্তীর্ণ হয়েছে"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"সার্ভারের সাথে সংযোগ স্থাপন করতে পারে না:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "সকেট তৈরী করতে অক্ষম"
+"সরাসরি সংযোগ স্থাপনে ব্যর্থ হওয়ার পর বিকল্প XMPP সংযোগ প্রক্রিয়া খুঁজে পাওয়া যায়নি।"
 
 msgid "Invalid XMPP ID"
-msgstr "অবৈধ XMPP ID"
+msgstr "অকার্যকর XMPP ID"
 
-# tithi
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "অবৈধ XMPP ID। ডোমেইন অবশ্যই নির্ধারণ করতে হবে।"
+msgstr "অকার্যকর XMPP ID। অবশ্যই ডোমেইন নির্ধারণ করতে হবে।"
 
 # tithi
+msgid "Malformed BOSH URL"
+msgstr "ত্রুটিপূর্ণ BOSH URL"
+
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "%1s@%2s এর নিবন্ধন সফল"
+msgstr "%1$s@%2$s এর নিবন্ধন সফল"
 
 #, c-format
 msgid "Registration to %s successful"
-msgstr "%s এ নিবন্ধন সফল হয়েছে"
+msgstr "%s এ নিবন্ধন সফল"
 
 msgid "Registration Successful"
-msgstr "নিবন্ধন সফল হয়েছে"
+msgstr "নিবন্ধন সফল"
 
 msgid "Registration Failed"
 msgstr "নিবন্ধন ব্যর্থ হয়েছে"
 
 #, c-format
 msgid "Registration from %s successfully removed"
-msgstr "%s হতে নিবন্ধন সফলভাবে অপসারণ করা হয়েছে"
+msgstr "%s থেকে নিবন্ধন সফলভাবে অপসারণ করা হয়েছে"
 
 msgid "Unregistration Successful"
 msgstr "অনিবন্ধন সফল হয়েছে"
@@ -4272,14 +4282,11 @@ msgstr "অনিবন্ধন সফল হয়েছে"
 msgid "Unregistration Failed"
 msgstr "অনিবন্ধন ব্যর্থ হয়েছে"
 
-msgid "Already Registered"
-msgstr "ইতোমধ্যে নিবন্ধিত"
-
 msgid "State"
-msgstr "রাজ্য"
+msgstr "অঙ্গরাজ্য"
 
 msgid "Postal code"
-msgstr "ডাক সংকেত"
+msgstr "পোস্টাল কোড"
 
 msgid "Phone"
 msgstr "ফোন"
@@ -4287,6 +4294,9 @@ msgstr "ফোন"
 msgid "Date"
 msgstr "তারিখ"
 
+msgid "Already Registered"
+msgstr "ইতিমধ্যেই নিবন্ধিত"
+
 msgid "Unregister"
 msgstr "অনিবন্ধন"
 
@@ -4295,13 +4305,13 @@ msgid ""
 msgstr "আপনার একাউন্ট নিবন্ধন পরিবর্তন করতে অনুগ্রহ করে নিচের তথ্য পূরণ করুন।"
 
 msgid "Please fill out the information below to register your new account."
-msgstr "আপনার নতুন একাউন্ট নিবন্ধন পরিবর্তন করতে অনুগ্রহ করে নিচের তথ্য পূরণ করুন।"
+msgstr "আপনার নতুন একাউন্ট নিবন্ধন করতে অনুগ্রহ করে নিচের তথ্য পূরণ করুন।"
 
 msgid "Register New XMPP Account"
-msgstr "নতুন XMPP একাউন্ট নিবন্ধন করুন"
+msgstr "নতুন XMPP একাউন্ট নিবন্ধন"
 
 msgid "Register"
-msgstr "নিবন্ধন করুন"
+msgstr "নিবন্ধন"
 
 #, c-format
 msgid "Change Account Registration at %s"
@@ -4312,145 +4322,141 @@ msgid "Register New Account at %s"
 msgstr "%s এ নতুন একাউন্ট নিবন্ধন করুন"
 
 msgid "Change Registration"
-msgstr "নিবন্ধন পরিবর্তন করুন"
+msgstr "নিবন্ধন পরিবর্তন"
 
 msgid "Error unregistering account"
-msgstr "একাউন্ট নিবন্ধনহীন করার ত্রুটি"
+msgstr "একাউন্ট অনিবন্ধনে ত্রুটি"
 
 # tithi
 msgid "Account successfully unregistered"
-msgstr "একাউন্ট সফলভাবে অনিবন্ধীত করা হয়েছে"
+msgstr "একাউন্ট সফলভাবে অনিবন্ধীত হয়েছে"
 
 msgid "Initializing Stream"
-msgstr "স্ট্রীম প্রস্তুত করছে"
+msgstr "স্ট্রীম আরম্ভ করা হচ্ছে"
 
 msgid "Initializing SSL/TLS"
-msgstr "SSL/TLS প্রস্তুত করছে"
+msgstr "SSL/TLS প্রস্তুত করা হচ্ছে"
 
 # tithi
 msgid "Authenticating"
-msgstr "প্রমাণীকরণ"
+msgstr "প্রমাণীকরণ করা হচ্ছে"
 
 # tithi
 msgid "Re-initializing Stream"
-msgstr "স্ট্রীম পুনরায় প্রস্তুত করছে"
+msgstr "স্ট্রীম পুনরায় প্রস্তুত করা হচ্ছে"
 
 msgid "Server doesn't support blocking"
-msgstr "সার্ভার আবদ্ধকরণ সমর্থন করে না"
+msgstr "সার্ভার ব্লক করা সমর্থন করে না"
 
-# tithi
 msgid "Not Authorized"
 msgstr "অনুমোদিত নয়"
 
+msgid "Mood"
+msgstr "মনমেজাজ"
+
+# tithi
+msgid "Now Listening"
+msgstr "এখন লিসেন করা হচ্ছে"
+
 msgid "Both"
 msgstr "উভয়"
 
 # tithi
 msgid "From (To pending)"
-msgstr "হতে (অমীমাংসিত)"
+msgstr "প্রেরক (প্রাপক অমীমাংসিত)"
 
 msgid "From"
-msgstr "হতে"
+msgstr "প্রেরক"
 
 msgid "To"
-msgstr "প্রতি"
+msgstr "প্রাপক"
 
 # tithi
 msgid "None (To pending)"
-msgstr "কোনটি নয় (অমীমাংসিত)"
+msgstr "কোনটি নয় (প্রাপক অমীমাংসিত)"
 
 msgid "None"
-msgstr "কোনটি না"
+msgstr "কোনটি নয়"
 
 msgid "Subscription"
-msgstr "শেয়ারকরণ"
-
-msgid "Mood"
-msgstr "অবস্থা"
-
-# tithi
-msgid "Now Listening"
-msgstr "এখন শুনছে"
+msgstr "সাবস্ক্রিপশন"
 
 msgid "Mood Text"
-msgstr "মোড পাঠ"
+msgstr "মনমেজাজের টেক্সট"
 
 msgid "Allow Buzz"
-msgstr "বাজ অনুমোদন করুন"
+msgstr "বাজ! অনুমোদন করা হবে"
 
 # tithi
 msgid "Tune Artist"
-msgstr "টিউন শিল্পী"
+msgstr "সুরের শিল্পী"
 
 msgid "Tune Title"
-msgstr "টিউন শিরোনাম"
+msgstr "সুরের শিরোনাম"
 
 # tithi
 msgid "Tune Album"
-msgstr "টিউন অ্যালবাম"
+msgstr "সুরের অ্যালবাম"
 
 # tithi
 msgid "Tune Genre"
-msgstr "টিউনের ধরন"
+msgstr "সুরের শাখা"
 
 msgid "Tune Comment"
-msgstr "টিউনের মন্তব্য"
+msgstr "সুরের মন্তব্য"
 
 # tithi
 msgid "Tune Track"
-msgstr "টিউন গতিপথ"
+msgstr "সুরের ট্র্যাক"
 
 # tithi
 msgid "Tune Time"
-msgstr "টিউন সময়"
+msgstr "সুরের সময়"
 
 # tithi
 msgid "Tune Year"
-msgstr "টিউন সন"
+msgstr "সুরের সন"
 
 # tithi
 msgid "Tune URL"
-msgstr "টিউন URL"
+msgstr "সুরের URL"
 
 msgid "Password Changed"
-msgstr "গুপ্তসংকেত পরিবর্তিত হয়েছে"
+msgstr "পাসওয়ার্ড পরিবর্তিত হয়েছে"
 
 msgid "Your password has been changed."
-msgstr "আপনার গুপ্তসংকেত পরিবর্তিত হয়েছে।"
+msgstr "আপনার পাসওয়ার্ড পরিবর্তিত হয়েছে।"
 
 msgid "Error changing password"
-msgstr "গুপ্তসংকেত পরিবর্তনে ত্রুটি"
-
-msgid "Password (again)"
-msgstr "গুপ্তসংকেত (আবার)"
+msgstr "পাসওয়ার্ড পরিবর্তনে ত্রুটি"
 
 msgid "Change XMPP Password"
-msgstr "XMPP গুপ্তসংকেত পরিবর্তন করুন"
+msgstr "XMPP পাসওয়ার্ড পরিবর্তন"
 
 msgid "Please enter your new password"
-msgstr "আপনার নতুন গুপ্তসংকেতটি প্রবেশ করান"
+msgstr "আপনার নতুন পাসওয়ার্ড দিন"
 
 msgid "Set User Info..."
-msgstr "ব্যবহারকারীর তথ্য নির্ধারণ করুন..."
+msgstr "ব্যবহারকারীর তথ্য নির্ধারণ..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password..."
-msgstr "গুপ্তসংকেত পরিবর্তন করুন..."
+msgstr "পাসওয়ার্ড পরিবর্তন..."
 
 #. }
 msgid "Search for Users..."
-msgstr "ব্যবহারকারীর জন্য খুঁজুন..."
+msgstr "ব্যবহারকারীর অনুসন্ধান..."
 
 # tithi
 msgid "Bad Request"
-msgstr "খারাপ অনুরোধ"
+msgstr "ত্রুটিযুক্ত অনুরোধ"
 
 msgid "Conflict"
 msgstr "দ্বন্দ্ব"
 
 # tithi
 msgid "Feature Not Implemented"
-msgstr "বৈশিষ্ট্য এখনও বাস্তবায়িত হয়নি"
+msgstr "ফিচার এখনও বাস্তবায়িত হয়নি"
 
 msgid "Forbidden"
 msgstr "নিষিদ্ধ"
@@ -4463,11 +4469,11 @@ msgstr "অভ্যন্তরীণ সার্ভার ত্রুটি"
 
 # tithi
 msgid "Item Not Found"
-msgstr "বিষয়োপকরণ খুঁজে পাওয়া যায়নি"
+msgstr "আইটেম খুঁজে পাওয়া যায়নি"
 
 # tithi
 msgid "Malformed XMPP ID"
-msgstr "বিকৃত XMPP ID"
+msgstr "ত্রুটিযুক্ত XMPP ID"
 
 msgid "Not Acceptable"
 msgstr "গ্রহণযোগ্য নয়"
@@ -4477,10 +4483,10 @@ msgstr "অনুমোদিত নয়"
 
 # tithi
 msgid "Payment Required"
-msgstr "অর্থপ্রদান প্রয়োজন"
+msgstr "অর্থপ্রদান আবশ্যক"
 
 msgid "Recipient Unavailable"
-msgstr "প্রাপক অপ্রাপ্য"
+msgstr "প্রাপক উপস্থিত নেই"
 
 msgid "Registration Required"
 msgstr "নিবন্ধন প্রয়োজন"
@@ -4490,45 +4496,45 @@ msgstr "দূরবর্তী সার্ভার খুঁজে পাও
 
 # tithi
 msgid "Remote Server Timeout"
-msgstr "দূরবর্তী সার্ভারের সময় উত্তীর্ণ হয়েছে"
+msgstr "দূরবর্তী সার্ভারের টাইমআউট হয়েছে"
 
 # tithi
 msgid "Server Overloaded"
-msgstr "সার্ভার অতিরিক্ত বোঝাইকৃত"
+msgstr "সার্ভার অতিরিক্ত লোড হয়েছে"
 
 msgid "Service Unavailable"
-msgstr "পরিসেবা অপ্রাপ্য"
+msgstr "সার্ভিস পাওয়া যায়নি"
 
 # tithi
 msgid "Subscription Required"
-msgstr "শেয়ারকরণ প্রয়োজন"
+msgstr "সাবস্ক্রিপশন প্রয়োজন"
 
 msgid "Unexpected Request"
 msgstr "অপ্রত্যাশিত অনুরোধ"
 
 # tithi
 msgid "Authorization Aborted"
-msgstr "প্রাপ্তাধিকার বাতিলকৃত"
+msgstr "অনুমোদন প্রদান বাতিল"
 
 # tithi
 msgid "Incorrect encoding in authorization"
-msgstr "প্রাপ্তাধিকারে ত্রুটিপূর্ণ সঙ্কেতায়ন"
+msgstr "অনুমোদনে ত্রুটিপূর্ণ এনকোডিং"
 
 # tithi
 msgid "Invalid authzid"
-msgstr "অবৈধ প্রাপ্তাধিকার"
+msgstr "অকার্যকর authzid"
 
 # tithi
 msgid "Invalid Authorization Mechanism"
-msgstr "অবৈধ প্রাপ্তাধিকার কৌশল"
+msgstr "অকার্যকর অনুমোদন কৌশল"
 
 # tithi
 msgid "Authorization mechanism too weak"
-msgstr "প্রাপ্তাধিকার কৌশল খুব দূর্বল"
+msgstr "অনুমোদন কৌশল খুব দুর্বল"
 
 # tithi
 msgid "Temporary Authentication Failure"
-msgstr "সাময়িক প্রমাণীকরণ ব্যর্থ"
+msgstr "সাময়িক প্রমাণীকরণ ব্যর্থতা"
 
 # tithi
 msgid "Authentication Failure"
@@ -4536,16 +4542,16 @@ msgstr "প্রমাণীকরণ ব্যর্থ"
 
 # tithi
 msgid "Bad Format"
-msgstr "খারাপ বিন্যাস"
+msgstr "ত্রুটিযুক্ত বিন্যাস"
 
 msgid "Bad Namespace Prefix"
-msgstr "খারাপ নাম-পরিসরের উপপদ"
+msgstr "ত্রুটিযুক্ত নেমস্পেস উপসর্গ"
 
 msgid "Resource Conflict"
-msgstr "সম্পদ দ্বন্দ্ব তৈরি করে"
+msgstr "রিসোর্স দ্বন্দ্ব"
 
 msgid "Connection Timeout"
-msgstr "সংযোগ সময় উত্তীর্ণ হয়েছে"
+msgstr "সংযোগ সময়কাল উত্তীর্ণ"
 
 # tithi
 msgid "Host Gone"
@@ -4555,23 +4561,20 @@ msgid "Host Unknown"
 msgstr "অজানা হোস্ট"
 
 msgid "Improper Addressing"
-msgstr "অনুপযুক্ত নির্দেশকরণ"
+msgstr "অশুদ্ধ ঠিকানা"
 
 msgid "Invalid ID"
-msgstr "অবৈধ আইডি"
+msgstr "অকার্যকর ID"
 
-# tithi
 msgid "Invalid Namespace"
-msgstr "অবৈধ নামপরিসর"
+msgstr "অকার্যকর নেমস্পেস"
 
 msgid "Invalid XML"
-msgstr "অবৈধ এক্সএমএল"
+msgstr "অকার্যকর XML"
 
-# tithi
 msgid "Non-matching Hosts"
-msgstr "সমন্বয়হীন হোস্ট"
+msgstr "হোস্টে একই রকম নয়"
 
-# tithi
 msgid "Policy Violation"
 msgstr "নীতিমালা লঙ্ঘন"
 
@@ -4579,54 +4582,50 @@ msgid "Remote Connection Failed"
 msgstr "দূরবর্তী সংযোগ ব্যর্থ হয়েছে"
 
 msgid "Resource Constraint"
-msgstr "সম্পদের  সীমাবদ্ধতা"
+msgstr "রিসোর্স সীমাবদ্ধতা"
 
-# tithi
 msgid "Restricted XML"
-msgstr "নিয়ন্ত্রিত XML"
+msgstr "সীমিত XML"
 
 msgid "See Other Host"
-msgstr "অন্যান্য হোষ্ট দেখুন"
+msgstr "অন্যান্য হোস্ট দেখুন"
 
 msgid "System Shutdown"
-msgstr "সিস্টেম বন্ধ করুন"
+msgstr "সিস্টেম বন্ধ"
 
-# tithi
 msgid "Undefined Condition"
 msgstr "অনির্ধারিত শর্ত"
 
-# tithi
+# mark20
 msgid "Unsupported Encoding"
-msgstr "অসমর্থিত সঙ্কেতায়ন"
+msgstr "অসমর্থিত এনকোডিং"
 
-# tithi
 msgid "Unsupported Stanza Type"
-msgstr "অসমর্থিত স্ট্যানজা ধরন"
+msgstr "অসমর্থিত ধরণের স্তবক"
 
 # tithi
 msgid "Unsupported Version"
 msgstr "অসমর্থিত সংস্করণ"
 
-# tithi
 msgid "XML Not Well Formed"
-msgstr "XMLসঠিক ভাবে গঠিত নয়"
+msgstr "XML সঠিকভাবে গঠিত নয়"
 
 msgid "Stream Error"
 msgstr "স্ট্রীম ত্রুটি"
 
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "%s ব্যবহারকারীকে নিষিদ্ধ করতে অক্ষম"
+msgstr "%s ব্যবহারকারীকে নিষিদ্ধ করতে ব্যর্থ"
 
 # tithi
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "অজানা সম্পর্ক: \"%s\""
+msgstr "অজানা অধিভুক্তি: \"%s\""
 
 # tithi
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "%1s ব্যবহারকারীকে \"%2s\" হিসেবে সম্পর্কিত করতে অসমর্থ"
+msgstr "%1$s ব্যবহারকারীকে \"%2$s\" হিসেবে অধিভুক্ত করতে ব্যর্থ"
 
 #, c-format
 msgid "Unknown role: \"%s\""
@@ -4634,108 +4633,137 @@ msgstr "অজানা ভূমিকা: \"%s\""
 
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "ব্যবহারকারীর জন্য \"%1s\" ভূমিকা নির্ধারণ করতে ব্যর্থ: %2s"
+msgstr "ব্যবহারকারীর জন্য \"%1$s\" ভূমিকা নির্ধারণ করতে ব্যর্থ: %2$s"
 
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "%s ব্যবহারকারীকে বের করে দিতে অক্ষম"
+msgstr "%s ব্যবহারকারীকে তিরস্কার করতে ব্যর্থ"
 
 #, c-format
 msgid "Unable to ping user %s"
-msgstr "%s ব্যবহারকারীকে পিঙ্গ করতে অক্ষম"
+msgstr "%s ব্যবহারকারীকে পিং করতে ব্যর্থ"
+
+#, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "বাজ! করতে ব্যর্থ, কারণ %s  সম্পর্কে কোনো কিছু জানা নেই।"
 
 # tithi
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "বাজ দিতে ব্যর্থ, কারণ %s ব্যবহারকারীর সম্পর্কে কোনো কিছু জানা নেই।"
+msgid "Unable to buzz, because %s might be offline."
+msgstr "বাজ! করতে ব্যর্থ, কারণ %s সম্ভবত অফলাইন।"
 
 # tithi
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "বাজ দিতে ব্যর্থ, কারণ %s ব্যবহারকারীরা সম্ভবত অফলাইনে।"
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr "বাজ! করতে ব্যর্থ, কারণ %s এটি সমর্থন করেন না বা এখন তা গ্রহন করতে ইচ্ছুক নন।"
 
 # tithi
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "বাজ দিতে ব্যর্থ, কারণ %s ব্যবহারকারী এটি সমর্থন করে না।"
+msgid "Buzzing %s..."
+msgstr "%s কে বাজ! দেয়া হচ্ছে..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr "বাজ"
+msgstr "বাজ!"
 
 #, c-format
 msgid "%s has buzzed you!"
-msgstr "%s আপনাকে বাজ দিয়েছে!"
+msgstr "%s আপনাকে বাজ! দিয়েছেন!"
 
-# tithi
 #, c-format
-msgid "Buzzing %s..."
-msgstr "%s বাজ দিচ্ছে..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "%s দ্বারা মিডিয়া শুরু করতে ব্যর্থ: অকার্যকর JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "%s দ্বারা মিডিয়া শুরু করতে ব্যর্থ: ব্যবহারকারী অনলাইনে নেই"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "%s দ্বারা মিডিয়া শুরু করতে ব্যর্থ: ব্যবহারকারী উপস্থিতিতে সাবস্ক্রাইব করা নেই"
+
+msgid "Media Initiation Failed"
+msgstr "মিডিয়া আরম্ভ করা ব্যর্থ হয়েছে"
+
+# fix me tithi
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"অনুগ্রহ করে %s এর একটি রিসোর্স নির্বাচন করুন যার মাধ্যমে আপনি একটি মিডিয়া সেশন শুরু "
+"করতে চান।"
+
+msgid "Select a Resource"
+msgstr "একটি রিসোর্স নির্বাচন করুন"
+
+# tithi
+msgid "Initiate Media"
+msgstr "মিডিয়া শুরু করুন"
 
 msgid "config:  Configure a chat room."
-msgstr "বিন্যাস: একটি আড্ডার কক্ষ পছন্দসই বিন্যাস করুন।"
+msgstr "config: একটি আড্ডার আসর কনফিগার করে।"
 
 msgid "configure:  Configure a chat room."
-msgstr "বিন্যাসন: একটি আড্ডার কক্ষ পছন্দসই বিন্যাস করুন।"
+msgstr "configure: একটি আড্ডার আসর কনফিগার করে।"
 
 msgid "part [room]:  Leave the room."
-msgstr "অংশ [কক্ষ]:  কক্ষ ত্যাগ করুন।"
+msgstr "part [room]:  আসর ত্যাগ করুন।"
 
 # tithi
 msgid "register:  Register with a chat room."
-msgstr "নিবন্ধন করুন: আড্ডা রুমের সাথে নিবন্ধন করুন।"
+msgstr "register: আড্ডার আসরে নিবন্ধিত হোন।"
 
 msgid "topic [new topic]:  View or change the topic."
-msgstr "বিষয়বস্তু [নতুন বিষয়বস্তু]:  বিষয়বস্তু প্রদর্শন অথবা পরিবর্তন করুন।"
+msgstr "topic [new topic]:  বিষয় প্রদর্শন অথবা পরিবর্তন করুন।"
 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr ""
-"নিষিদ্ধ &lt;ব্যবহারকারী&2gt; [কারণ]: একজন ব্যবহারকারীকে কক্ষ থেকে নিষিদ্ধ করুন।"
+msgstr "ban &lt;user&gt; [reason]: একজন ব্যবহারকারীকে আসর থেকে নিষিদ্ধ করুন।"
 
 # tithi
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"সম্পর্ক &1lt;ব্যবহারকারী&2gt; &3lt;মালিক|প্রশাসন|সদস্য|বাইরের|কেউনা&4gt;:কক্ষের "
-"সঙ্গে একটি ব্যবহারকারীর সম্পর্ক নির্ধারণ করুন।"
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: অধিভুক্তি "
+"সহকারে ব্যবহারকারী গ্রহন করুন অথবা আসরের সঙ্গে ব্যবহারকারীর অধিভুক্তি নির্ধারণ করুন।"
 
 # tithi
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"ভূমিকা &1lt;ব্যবহারকারী&2gt; &3lt;সমন্বয়জ্ঞ|অংশগ্রহনকারী|পরিদর্শক|কেউনা&4gt;: কক্ষে "
-"ব্যবহারকারীর ভূমিকা নির্ধারণ করুন।"
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ভূমিকা সহকারে "
+"ব্যবহারকারী গ্রহন করুন অথবা আসরের সঙ্গে ব্যবহারকারীর ভূমিকা নির্ধারণ করুন।"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr ""
-"আমন্ত্রণ &1lt;ব্যবহাকারী&2gt; [বার্তা]: একজন ব্যবহারকারীকে কক্ষে আমন্ত্রণ জানান"
+msgstr "invite &lt;user&gt; [message]: একজন ব্যবহারকারীকে আসরে আমন্ত্রণ জানান"
 
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "যোগ দিন: &1lt;কক্ষ&2gt; [গুপ্তসঙ্কেত]:  এই সার্ভারের একটি আড্ডায় অংশ নিন।"
+msgstr "join: &lt;room&gt; [password]: এই সার্ভারের একটি আড্ডায় অংশ নিন।"
 
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr ""
-"বের করে দিন &1lt;ব্যবহারকারী&2gt; [কারণ]:  কক্ষ থেকে একজন ব্যবহারকারীকে বের করে "
-"দিন।"
+msgstr "kick &lt;user&gt; [reason]:  আসর থেকে ব্যবহারকারীকে বের করে দিন।"
 
 # tithi
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"বার্তা &1lt;ব্যবহারকারী&2gt; &3lt;বার্তা&4gt;: অন্যান্য ব্যবহারকারীকে একটি ব্যক্তিগত "
-"বার্তা পাঠান।"
+"msg &lt;user&gt; &lt;message&gt;: অন্যান্য ব্যবহারকারীকে একটি ব্যক্তিগত বার্তা "
+"পাঠান।"
 
 # tithi
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
-"ping &lt;jid&gt;:                    একজন ব্যবহারকারী/উপকরণ/সার্ভারকে পিঙ্গ করুন।"
+"ping &lt;jid&gt;:                    একজন ব্যবহারকারী/কম্পোনেন্ট/সার্ভারকে পিং "
+"করুন।"
 
 # tithi
 msgid "buzz: Buzz a user to get their attention"
-msgstr "বাজ: ব্যবহারকারীকে তার মনযোগ পেতে বাজ দিন"
+msgstr "buzz: ব্যবহারকারীর মনযোগ পেতে বাজ! ব্যবহার করুন"
 
 #. *< type
 #. *< ui_requirement
@@ -4748,7 +4776,7 @@ msgstr "বাজ: ব্যবহারকারীকে তার মনয�
 #. *  summary
 #. *  description
 msgid "XMPP Protocol Plugin"
-msgstr "XMPP প্রটোকল প্লাগইন"
+msgstr "XMPP প্রোটোকল প্লাগইন"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
 msgid "Domain"
@@ -4760,29 +4788,31 @@ msgstr "SSL/TSL প্রয়োজন"
 
 # tithi
 msgid "Force old (port 5223) SSL"
-msgstr "পুরাতন (পোর্ট ৫২২৩) SSL কে চাপ দিন"
+msgstr "পুরাতন (পোর্ট 5223) SSL প্রয়োগ বাধ্য করা হবে"
 
 # tithi
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "অসঙ্কেতায়িত স্ট্রীমে সরল-পাঠ অধিকার অনুমোদন করুন"
+msgstr "এনক্রিপ্ট না করা স্ট্রীমে সরল টেক্সট দ্বারা প্রমাণীকরণ অনুমোদন করা হবে"
 
 msgid "Connect port"
-msgstr "সংযোগ পোর্ট"
+msgstr "পোর্টে সংযোগ দিন"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 msgid "Connect server"
-msgstr "সংযোগ সার্ভার"
+msgstr "সার্ভারে সংযোগ দিন"
 
 msgid "File transfer proxies"
-msgstr "ফাইল স্থানান্তরণ প্রক্সি"
+msgstr "ফাইল স্থানান্তরের প্রক্সি"
+
+msgid "BOSH URL"
+msgstr "BOSH URL"
 
-# tithi
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
-msgstr "স্বনির্বাচিত স্মাইলিগুলো প্রদর্শন করুন"
+msgstr "স্বনির্বাচিত স্মাইলি প্রদর্শন করা হবে"
 
 #, c-format
 msgid "%s has left the conversation."
@@ -4790,11 +4820,11 @@ msgstr "%s কথোপকথন ত্যাগ করেছে।"
 
 #, c-format
 msgid "Message from %s"
-msgstr "%s হতে বার্তা"
+msgstr "%s থেকে বার্তা"
 
 #, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%1s বিষয়বস্তু নির্ধারণ করেছেন: %2s"
+msgstr "%1$s বিষয়বস্তু নির্ধারণ করেছেন: %2$s"
 
 #, c-format
 msgid "The topic is: %s"
@@ -4802,10 +4832,10 @@ msgstr "বিষয়বস্তু হলো: %s"
 
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "%1s এ বার্তা পাঠানো ব্যর্থ হয়েছে: %2s"
+msgstr "%1$s এ বার্তা পাঠানো ব্যর্থ হয়েছে: %2$s"
 
 msgid "XMPP Message Error"
-msgstr "XMPP বার্তা ত্রুটি"
+msgstr "XMPP বার্তায় ত্রুটি"
 
 # tithi
 #, c-format
@@ -4818,44 +4848,68 @@ msgstr "XML পার্স ত্রুটি"
 
 # tithi
 msgid "Unknown Error in presence"
-msgstr "বর্তমানে অজানা ত্রুটি"
+msgstr "উপস্থিতিতে অজানা ত্রুটি"
+
+#, c-format
+msgid "Error joining chat %s"
+msgstr "%s আড্ডায় অংশগ্রহনে ত্রুটি"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "%s আড্ডায় ত্রুটি"
 
 msgid "Create New Room"
-msgstr "নতুন কক্ষ তৈরী করুন"
+msgstr "নতুন আসর তৈরী"
 
 # tithi
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
-"আপনি একটি নতুন কক্ষ তৈরি করছেন।  আপনি কি এটি বিন্যাস করতে আগ্রহী, বা পূর্বনির্ধারিত "
-"বিন্যাসনসমূহ গ্রহণ করবেন?"
+"আপনি একটি নতুন আসর তৈরি করতে যাচ্ছেন। আপনি কি এটি কনফিগার করতে আগ্রহী, নাকি "
+"পূর্বনির্ধারিত বিন্যাস গ্রহণ করবেন?"
 
 msgid "_Configure Room"
-msgstr "কক্ষ বিন্যাস করুন (_C)"
+msgstr "আসর কনফিগারেশন  (_C)"
 
 msgid "_Accept Defaults"
-msgstr "পূর্বনির্ধারিত গ্রহণ (_A)"
+msgstr "পূর্বনির্ধারিত বিন্যাস গ্রহণ করা হবে (_A)"
+
+msgid "No reason"
+msgstr "কোনো কারন নেই"
 
+# Kick =  তিরস্কার
+# OR  পদাঘাত
 #, c-format
-msgid "Error joining chat %s"
-msgstr "%s আড্ডায় অংশগ্রহনের ত্রুটি"
+msgid "You have been kicked: (%s)"
+msgstr "আপনাকে তিরস্কার করা হয়েছে: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "%s আড্ডায় ত্রুটি"
+msgid "Kicked (%s)"
+msgstr "(%s) তিরস্কৃত"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "ইন-ব্যান্ড বাইটস্ট্রিম বিনিময়ে ত্রুটি হয়েছে\n"
+
+msgid "Transfer was closed."
+msgstr "স্থানান্তর বন্ধ করে দেয়া হয়েছে।"
+
+msgid "Failed to open the file"
+msgstr "ফাইলটি খুলতে ব্যর্থ"
+
+msgid "Failed to open in-band bytestream"
+msgstr "ইন-ব্যান্ড বাইটস্ট্রিম খুলতে ব্যর্থ"
 
-# tithi
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "%s এ ফাইল পাঠাতে অক্ষম, ব্যবহাকারীরা ফাইল স্থানান্তর সমর্থন করে না"
+msgstr "%s এ ফাইল পাঠাতে ব্যর্থ, ব্যবহাকারী ফাইল স্থানান্তর সমর্থন করে না"
 
 msgid "File Send Failed"
 msgstr "ফাইল পাঠানো ব্যর্থ হয়েছে"
 
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "%s এ ফাইল পাঠাতে সমর্থ ছিল না, অবৈধ JID"
+msgstr "%s এ ফাইল পাঠাতে ব্যর্থ, অকার্যকর JID"
 
 #, c-format
 msgid "Unable to send file to %s, user is not online"
@@ -4863,69 +4917,65 @@ msgstr "%s এ ফাইল পাঠাতে সমর্থ ছিল না,
 
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "%s এ ফাইল পাঠাতে সমর্থ ছিল না, ব্যবহারকারী উপস্থিতিতে সম্মত নয়"
+msgstr "%s এ ফাইল পাঠাতে ব্যর্থ, ব্যবহারকারী উপস্থিতিতে সাবস্ক্রাইব করা নেই"
 
 # fix me tithi
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr ""
-"অনুগ্রহ করে আপনি %s এর এমন একটি সম্পদ নির্বাচন করুন যাতে আপনি একটি ফাইল পাঠাতে চান"
-
-msgid "Select a Resource"
-msgstr "একটি সম্পদ নির্বাচন করুন"
+msgstr "অনুগ্রহ করে %s এর একটি রিসোর্স নির্বাচন করুন যাতে আপনি ফাইল পাঠাতে চান"
 
 msgid "Edit User Mood"
-msgstr "ব্যবহাকারীরর মোড সম্পাদন করুন"
+msgstr "ব্যবহাকারীর মনমেজাজ সম্পাদন"
 
 # tithi
 msgid "Please select your mood from the list."
-msgstr "অনুগ্রহ করে তালিকা থেকে আপনার মোড নির্বাচন করুন।"
+msgstr "অনুগ্রহ করে তালিকা থেকে আপনার মনমেজাজ নির্বাচন করুন।"
 
 msgid "Set"
 msgstr "নির্ধারন করুন"
 
 msgid "Set Mood..."
-msgstr "মোড নির্ধারন করুন..."
+msgstr "মনমেজাজ নির্ধারন..."
 
 msgid "Set User Nickname"
-msgstr "ব্যবহারকারীর ডাকনাম নির্ধারন করুন"
+msgstr "ব্যবহারকারীর ডাকনাম নির্ধারন"
 
 msgid "Please specify a new nickname for you."
-msgstr "অনুগ্রহ করে আপনার জন্য নতুন ডাকনাম নির্দিষ্ট করুন।"
+msgstr "অনুগ্রহ করে আপনার জন্য নতুন ডাকনাম দিন।"
 
 # tithi
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
-"এই তথ্যটি আপনার যোগাযোগ তালিকার সকল যোগাযোগে দৃশ্যমান, সুতরাং উপযুক্ত কিছু পছন্দ করুন।"
+"এই তথ্যটি আপনার পরিচিতি তালিকার সব বন্ধুর কাছে দৃশ্যমান, সুতরাং উপযুক্ত কিছু পছন্দ করুন।"
 
 msgid "Set Nickname..."
-msgstr "ডাকনাম নির্ধারণ করুন..."
+msgstr "ডাকনাম নির্ধারণ..."
 
 msgid "Actions"
-msgstr "কার্যসমূহ"
+msgstr "প্রতিক্রিয়া"
 
 msgid "Select an action"
-msgstr "একটি কার্য নির্বাচন করুন"
+msgstr "একটি প্রতিক্রিয়া নির্বাচন করুন"
 
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
 #, c-format
 msgid "Unable to add \"%s\"."
-msgstr "\"%s\" যোগ করতে সমর্থ নয়।"
+msgstr "\"%s\" যোগ করতে ব্যর্থ।"
 
 msgid "Buddy Add error"
 msgstr "বন্ধু যোগ করতে ত্রুটি"
 
 msgid "The username specified does not exist."
-msgstr "উল্লেখিত ব্য়বহারকারীর নামটি বিদ্যমান নয়।"
+msgstr "উল্লেখিত ব্যবহারকারীর নামটি বিদ্যমান নয়।"
 
 # fix me tithi
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "%1s (%2s) এ বন্ধু তালিকার এককালবর্তীকরণ বিষয়"
+msgstr "%1$s (%2$s) এ বন্ধু তালিকার অভিন্নকরণ ইস্যু"
 
 # tithi
 #, c-format
@@ -4933,8 +4983,8 @@ msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"স্থানীয় তালিকার %1s \"%2s\" শ্রেণীর ভেতরে কিন্তু সার্ভার তালিকায় নয়। আপনি কি এই "
-"বন্ধুটি যোগ করতে চান?"
+"%1$s স্থানীয় তালিকায় এবং \"%2$s\" দলে অন্তর্ভুক্ত কিন্তু সার্ভার তালিকায় নেই। আপনি "
+"কি এই বন্ধুটি যোগ করতে চান?"
 
 # msgstr ""
 # "স্থানীয় তালিকার %s গ্রুপ এ আছেন কিন্তু সার্ভার তালিকায় নেই।আপনি কি এই বন্ধুটিকে যোগ "
@@ -4944,8 +4994,7 @@ msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
-"%s স্থানীয় তালিকায় আছে কিন্তু সার্ভার তালিকায় নেই। আপনি কি এই বন্ধুটিকে যোগ করতে "
-"চান?"
+"%s স্থানীয় তালিকায় আছে কিন্তু সার্ভার তালিকায় নেই। আপনি কি এই বন্ধুকে যোগ করতে চান?"
 
 #, c-format
 msgid "Unable to parse message"
@@ -4953,11 +5002,11 @@ msgstr "বার্তা পার্স করা সম্ভব হয়�
 
 #, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "বাক্যরীতি ত্রুটি (সম্ভবত ক্লায়েন্টের ভূল)"
+msgstr "সিনট্যাক্স ত্রুটি (সম্ভবত ক্লায়েন্ট বাগ)"
 
 #, c-format
 msgid "Invalid email address"
-msgstr "অবৈধ ই‌-মেইল ঠিকানা"
+msgstr "অকার্যকর ই‌মেইল ঠিকানা"
 
 #, c-format
 msgid "User does not exist"
@@ -4966,27 +5015,27 @@ msgstr "ব্যবহারকারী বিদ্যমান নয়"
 # tithi
 #, c-format
 msgid "Fully qualified domain name missing"
-msgstr "সম্পূর্ণভাবে যোগ্য ডোমেইন নাম নিরুদ্দিষ্ট"
+msgstr "সম্পূর্ণ কার্যকর ডোমেইন নাম নেই"
 
 #, c-format
 msgid "Already logged in"
-msgstr "ইতোমধ্যে লগইন করেছে"
+msgstr "ইতিমধ্যে লগইন আছে"
 
 #, c-format
 msgid "Invalid username"
-msgstr "অবৈধ ব্যবহারকারীর নাম"
+msgstr "অকার্যকর ব্যবহারকারীর নাম"
 
 #, c-format
 msgid "Invalid friendly name"
-msgstr "অবৈধ বন্ধুসুলভ নাম"
+msgstr "অকার্যকর বন্ধুসুলভ নাম"
 
 #, c-format
 msgid "List full"
-msgstr "তালিকা পূর্ণ"
+msgstr "তালিকা পরিপূর্ণ"
 
 #, c-format
 msgid "Already there"
-msgstr "ইতোমধ্যে সেখানে আছে"
+msgstr "ইতিমধ্যে সেখানে আছে"
 
 #, c-format
 msgid "Not on list"
@@ -4998,57 +5047,57 @@ msgstr "ব্যবহারকারী অফলাইনে"
 
 #, c-format
 msgid "Already in the mode"
-msgstr "ইতোমধ্যে পরিমন্ডলে আছে"
+msgstr "ইতিমধ্যে এই মোডে আছে"
 
 #, c-format
 msgid "Already in opposite list"
-msgstr "ইতোমধ্যে বিপরীত তালিকায় আছে"
+msgstr "ইতিমধ্যে বিপরীত তালিকায় আছে"
 
 #, c-format
 msgid "Too many groups"
-msgstr "অতিরিক্ত গ্রুপ"
+msgstr "অনেক বেশী দল"
 
 #, c-format
 msgid "Invalid group"
-msgstr "অবৈধ গ্রুপ"
+msgstr "অকার্যকর দল"
 
 #, c-format
 msgid "User not in group"
-msgstr "ব্যবহারকারী গ্রুপে নেই"
+msgstr "ব্যবহারকারী দলে নেই"
 
 #, c-format
 msgid "Group name too long"
-msgstr "গ্রুপ নামটি অত্যন্ত দীর্ঘ"
+msgstr "দলের নামটি অত্যন্ত দীর্ঘ"
 
 #, c-format
 msgid "Cannot remove group zero"
-msgstr "গ্রুপ জিরো মুছে ফেলতে পারে না"
+msgstr "শূণ্যস্থানীয় দল মুছে ফেলা যায় না"
 
 #, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "ব্যবহারকারীকে এমন একটি গ্রুপে যোগদানের চেষ্টা করা হয়েছে যা বিদ্যমান নেই"
+msgstr "ব্যবহারকারীকে এমন একটি দলে যোগদানের চেষ্টা করা হয়েছে যা বিদ্যমান নেই"
 
 #, c-format
 msgid "Switchboard failed"
-msgstr "সুইচবোর্ড ব্যর্থ"
+msgstr "সুইচবোর্ড ব্যর্থ হয়েছে"
 
 #, c-format
 msgid "Notify transfer failed"
-msgstr "প্রজ্ঞাপন স্থানান্তর ব্যর্থ"
+msgstr "স্থানান্তরের ঘোষণা ব্যর্থ হয়েছে"
 
 # tithi
 #, c-format
 msgid "Required fields missing"
-msgstr "প্রয়োজনীয় ক্ষেত্র নিরুদ্দিষ্ট"
+msgstr "প্রয়োজনীয় ক্ষেত্র নেই"
 
 # tithi
 #, c-format
 msgid "Too many hits to a FND"
-msgstr "একটি FND এ খুব বেশি আঘাত করা হয়েছে"
+msgstr "একটি FND খুব বেশি পরিদর্শিত হয়েছে"
 
 #, c-format
 msgid "Not logged in"
-msgstr "লগইন করা হয়নি"
+msgstr "লগইন করা নেই"
 
 #, c-format
 msgid "Service temporarily unavailable"
@@ -5056,11 +5105,11 @@ msgstr "সাময়িকভাবে সেবা পাওয়া যা
 
 #, c-format
 msgid "Database server error"
-msgstr "উপাত্তধার সার্ভারের ত্রুটি"
+msgstr "ডাটাবেস সার্ভারের ত্রুটি"
 
 #, c-format
 msgid "Command disabled"
-msgstr "নির্দেশ নিষ্ক্রিয়"
+msgstr "কমান্ড নিষ্ক্রিয়"
 
 #, c-format
 msgid "File operation error"
@@ -5069,12 +5118,12 @@ msgstr "ফাইল পরিচালনের ত্রুটি"
 # tithi
 #, c-format
 msgid "Memory allocation error"
-msgstr "মেমোরি বরাদ্দে ত্রুটি"
+msgstr "মেমরি বরাদ্দে ত্রুটি"
 
 # tithi
 #, c-format
 msgid "Wrong CHL value sent to server"
-msgstr "ভূল CHL মান সার্ভারে পাঠিয়েছিল"
+msgstr "সার্ভারে ভুল CHL মান পাঠানো হয়েছে"
 
 #, c-format
 msgid "Server busy"
@@ -5082,21 +5131,21 @@ msgstr "সার্ভার ব্যস্ত"
 
 #, c-format
 msgid "Server unavailable"
-msgstr "সার্ভার অপ্রাপ্য "
+msgstr "সার্ভার বিদ্যমান নয়"
 
 # fix me tithi
 #, c-format
 msgid "Peer notification server down"
-msgstr "পিয়ার প্রজ্ঞাপন সার্ভার নিস্ক্রিয়"
+msgstr "পিয়ার ঘোষনা সার্ভার নিস্ক্রিয়"
 
 #, c-format
 msgid "Database connect error"
-msgstr "উপাত্তধার সংযোগে ত্রুটি"
+msgstr "ডাটাবেস সংযোগে ত্রুটি"
 
 # tithi
 #, c-format
 msgid "Server is going down (abandon ship)"
-msgstr "সার্ভার নিস্ক্রিয় হয়ে যাচ্ছে (ত্যাগ করুন)"
+msgstr "সার্ভার নিষ্ক্রিয় হয়ে যাচ্ছে (হাল ছাড়ে দিন)"
 
 # tithi
 #, c-format
@@ -5106,26 +5155,26 @@ msgstr "সংযোগ তৈরিতে ত্রুটি"
 # tithi
 #, c-format
 msgid "CVR parameters are either unknown or not allowed"
-msgstr "CVR প্যারামিটারসমূহ হয় অজানা বা অনুমোদিত নয়"
+msgstr "CVR প্যারামিটার হয় অজানা অথবা অনুমোদিত নয়"
 
 #, c-format
 msgid "Unable to write"
-msgstr "লিখতে সমর্থ নয়"
+msgstr "লিখতে ব্যর্থ"
 
 # tithi
 #, c-format
 msgid "Session overload"
-msgstr "অধিবেশন অতিরিক্ত"
+msgstr "সেশন ওভারলোড"
 
 # tithi
 #, c-format
 msgid "User is too active"
-msgstr "ব্যবহারকারী অনেক বেশি সক্রিয়"
+msgstr "ব্যবহারকারী অতি সক্রিয়"
 
 # tithi
 #, c-format
 msgid "Too many sessions"
-msgstr "অনেক বেশি অধিবেশন"
+msgstr "অতিরিক্ত সংখ্যক সেশন"
 
 # tithi
 #, c-format
@@ -5135,17 +5184,17 @@ msgstr "পাসপোর্ট পরীক্ষা করা হয়নি
 # tithi
 #, c-format
 msgid "Bad friend file"
-msgstr "খারাপ বন্ধু ফাইল"
+msgstr "ত্রুটিযুক্ত বন্ধু ফাইল"
 
 # tithi
 #, c-format
 msgid "Not expected"
-msgstr "প্রত্যাশিত ছিল না"
+msgstr "প্রত্যাশিত নয়"
 
 # tithi
 #, c-format
 msgid "Friendly name changes too rapidly"
-msgstr "বন্ধুভাবাপন্ন নাম খুব দ্রুত পরিবর্তন হয়"
+msgstr "বন্ধুসুলভ নাম খুব দ্রুত পরিবর্তিত হয়"
 
 #, c-format
 msgid "Server too busy"
@@ -5159,7 +5208,7 @@ msgstr "প্রমাণীকরণ ব্যর্থ"
 # tithi
 #, c-format
 msgid "Not allowed when offline"
-msgstr "অফলাইনে অনুমোদিত নয়"
+msgstr "অফলাইন থাকলে অনুমোদিত নয়"
 
 # tithi
 #, c-format
@@ -5195,38 +5244,63 @@ msgid "MSN Error: %s\n"
 msgstr "MSN ত্রুটি: %s\n"
 
 msgid "Other Contacts"
-msgstr "অন্যান্য যোগাযোগসমূহ"
+msgstr "অন্যান্য পরিচিতি"
 
 msgid "Non-IM Contacts"
-msgstr "IM নয় এমন যোগাযোগসমূহ"
+msgstr "IM এ নেই এমন পরিচিতি"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s একটি উইন্ক পাঠিয়েছে। <a href='msn-wink://%s'>দেখার জন্য এখানে ক্লিক করুন</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s একটি উইন্ক পাঠিয়েছে, কিন্তু তা সংরক্ষণ করা সম্ভব হয়নি"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s একটি কন্ঠের ক্লিপ পাঠিয়েছে। <a href='audio://%s'>শোনার জন্য এখানে ক্লিক করুন</"
+"a>"
+
+# tithi
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s একটি কন্ঠের ক্লিপ পাঠিয়েছে, কিন্তু তা সংরক্ষণ করা সম্ভব হয়নি"
+
+# tithi
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "আপনাকে %s একটি ভয়েস আড্ডার আমন্ত্রন পাঠিয়েছেন, যা এখনও সমর্থিত হয়নি।"
 
 # tithi
 msgid "Nudge"
-msgstr "একান্তে"
+msgstr "ধাক্কা"
 
 #, c-format
 msgid "%s has nudged you!"
-msgstr "%s আপনাকে একান্তে যোগ করেছেন!"
+msgstr "%s আপনাকে ধাক্কা দিয়েছেন!"
 
 # fix-me tithi
 #, c-format
 msgid "Nudging %s..."
-msgstr "%s মনোযোগ আকর্ষন করছে..."
+msgstr "%s কে ধাক্কা দেয়া হচ্ছে..."
 
 msgid "Email Address..."
-msgstr "ই-মেইল ঠিকানা..."
+msgstr "ইমেইল ঠিকানা..."
 
 # tithi
 msgid "Your new MSN friendly name is too long."
-msgstr "আপনার নতুন MSN বন্ধুভাবাপন্ন নাম খুব দীর্ঘ।"
+msgstr "আপনার নতুন MSN বন্ধুসুলভ নাম অতি দীর্ঘ।"
 
 # tithi
 msgid "Set your friendly name."
-msgstr "আপনার বন্ধুভাবাপন্ন নাম নির্ধারণ করুন।"
+msgstr "আপনার বন্ধুসুলভ নাম নির্ধারণ।"
 
 # tithi
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "এটি এমন নাম যা দ্বারা অন্যান্য MSN বন্ধুরা আপনাকে দেখবে।"
+msgstr "অন্যান্য MSN বন্ধুরা আপনাকে এই নামে দেখবে"
 
 # tithi
 msgid "Set your home phone number."
@@ -5234,7 +5308,7 @@ msgstr "আপনার বাসার ফোন নাম্বার দি�
 
 # tithi
 msgid "Set your work phone number."
-msgstr "আপনার কাজের ফোন নাম্বার দিন।"
+msgstr "আপনার কর্মস্থলের ফোন নাম্বার দিন।"
 
 # tithi
 msgid "Set your mobile phone number."
@@ -5242,39 +5316,39 @@ msgstr "আপনার মোবাইল ফোন নাম্বার দ�
 
 # tithi
 msgid "Allow MSN Mobile pages?"
-msgstr "MSN মোবাইল পেজগুলো কি অনুমোদন করবেন?"
+msgstr "MSN মোবাইল পৃষ্ঠাগুলো কি অনুমোদন করা হবে?"
 
 # tithi
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
-"আপনি কি আপনার বন্ধু তালিকার জনগণকে আপনার সেল ফোন বা অন্যান্য মোবাইল ডিভাইসে MSN "
-"মোবাইল পৃষ্ঠাসমূহ পাঠাতে অনুমোদন দিতে চান বা চান না?"
+"আপনি কি তালিকার বন্ধুদেরকে আপনার মোবাইল ফোন বা অন্যান্য মোবাইল ডিভাইসে MSN "
+"মোবাইল পৃষ্ঠা পাঠাতে অনুমোদন দিতে ইচ্ছুক?"
 
 msgid "Allow"
-msgstr "অনুমোদন করুন"
+msgstr "অনুমোদন করা হবে"
 
 msgid "Disallow"
-msgstr "অনুমোদন করবিন না"
+msgstr "অনুমোদন করা হবে না"
 
 #, c-format
 msgid "Blocked Text for %s"
-msgstr "%s এর জন্য ব্লককৃত পাঠ"
+msgstr "%s এর জন্য ব্লককৃত টেক্সট"
 
 # tithi
 msgid "No text is blocked for this account."
-msgstr "এই একাউন্টটির জন্য কোনো পাঠ আবদ্ধ নয়।"
+msgstr "এই একাউন্টটির জন্য কোনো টেক্সট ব্লক করা নেই।"
 
 # tithi
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr "MSN সার্ভার বর্তমানে নিম্নলিখিত নিয়মিত রাশিসমূহ আবদ্ধ করছে:<br/>%s"
+msgstr "MSN সার্ভার বর্তমানে নিম্নলিখিত রেগুলার এক্সপ্রেশনগুলো ব্লক করছে:<br/>%s"
 
 # tithi
 msgid "This account does not have email enabled."
-msgstr "এই একাউন্টটি ই-মেইল সক্রিয় নেই।"
+msgstr "এই একাউন্টটির কোন ইমেইল সক্রিয় নেই।"
 
 msgid "Send a mobile message."
 msgstr "মোবাইল বার্তা পাঠান।"
@@ -5290,13 +5364,13 @@ msgstr "কাজ করছে"
 
 # tithi
 msgid "Has you"
-msgstr "আপনার কি"
+msgstr "আপনি কি তার বন্ধু"
 
 msgid "Home Phone Number"
 msgstr "বাসার ফোন নম্বর"
 
 msgid "Work Phone Number"
-msgstr "অফিসের ফোন নম্বর "
+msgstr "কর্মস্থলের ফোন নম্বর"
 
 msgid "Mobile Phone Number"
 msgstr "মোবাইল ফোন নম্বর"
@@ -5308,11 +5382,11 @@ msgid "Busy"
 msgstr "ব্যস্ত"
 
 msgid "On the Phone"
-msgstr "ফোন এ কথা বলছি"
+msgstr "ফোনে কথা বলছি"
 
 # tithi
 msgid "Out to Lunch"
-msgstr "দুপুরে খাবার জন্য বাইরে"
+msgstr "দুপুরে খাওয়ার জন্য বাইরে"
 
 #. primitive
 #. ID
@@ -5333,48 +5407,71 @@ msgid "Office Title"
 msgstr "অফিসের শিরোনাম"
 
 msgid "Set Friendly Name..."
-msgstr "বন্ধুসুলভ নাম নির্ধারন করুন..."
+msgstr "বন্ধুসুলভ নাম নির্ধারণ..."
 
 msgid "Set Home Phone Number..."
-msgstr "বাসার ফোন নম্বর নির্ধারন করুন..."
+msgstr "বাসার ফোন নম্বর নির্ধারণ..."
 
 msgid "Set Work Phone Number..."
-msgstr "অফিসের ফোন নম্বর নির্ধারন করুন..."
+msgstr "কর্মস্থলের ফোন নম্বর নির্ধারণ..."
 
 msgid "Set Mobile Phone Number..."
-msgstr "মোবাইল ফোন নম্বর নির্ধারন করুন..."
+msgstr "মোবাইল ফোন নম্বর নির্ধারণ..."
 
 msgid "Enable/Disable Mobile Devices..."
-msgstr "মোবাইল ডিভাইসসমূহ সক্রিয়/নিষ্ক্রিয় করুন..."
+msgstr "মোবাইল ডিভাইস সক্রিয়/নিষ্ক্রিয়করণ..."
 
 # tithi
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "মোবাইল পৃষ্ঠাগুলোকে অনুমোদন করুন/করবেন না..."
+msgstr "মোবাইল পৃষ্ঠা অনুমোদন..."
 
 # tithi
 msgid "View Blocked Text..."
-msgstr "ব্লককৃত পাঠ দেখান..."
+msgstr "ব্লক করা টেক্সট প্রদর্শন..."
 
 msgid "Open Hotmail Inbox"
 msgstr "হটমেইল ইনবক্স খুলুন"
 
 msgid "Send to Mobile"
-msgstr "মোবাইলে পাঠান"
+msgstr "মোবাইলে প্রেরণ"
 
 # tithi
 msgid "Initiate _Chat"
-msgstr "আড্ডা প্রস্তুত করুন (_C)"
+msgstr "আড্ডা শুরু করুন (_C)"
 
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"MSN এর জন্য SSL সমর্থন প্রয়োজন। অনুগ্রহ করে একটি সমর্থিত SSL লাইব্রেরী সংস্থাপন করুন।"
+"MSN এর জন্য SSL সমর্থন প্রয়োজন। অনুগ্রহ করে একটি সমর্থিত SSL লাইব্রেরী ইনস্টল করুন।"
+
+# tithi
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"বন্ধু %s কে যোগ করা সম্ভব হয়নি কারণ ব্যবহারকারীর নামটি অকার্যকর। ব্যবহারকারী নাম "
+"অবশ্যই একটি কার্যকর ইমেইল ঠিকানা হতে হবে।"
+
+msgid "Unable to Add"
+msgstr "যোগ করতে ব্যর্থ"
 
-msgid "Failed to connect to server."
-msgstr "সার্ভারে সংযোগ দিতে ব্যর্থ হয়েছে।"
+# tithi
+msgid "Authorization Request Message:"
+msgstr "অনুমোদনের অনুরোধ:"
+
+# tithi
+msgid "Please authorize me!"
+msgstr "অনুগ্রহ করে আমাকে অনুমোদন দিন!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "ঠিক আছে (_O)"
 
 # tithi
 msgid "Error retrieving profile"
-msgstr "বৃত্তান্ত উদ্ধারে ত্রুটি"
+msgstr "প্রোফাইল উদ্ধারে ত্রুটি"
 
 msgid "General"
 msgstr "সাধারন"
@@ -5392,7 +5489,7 @@ msgid "Hobbies and Interests"
 msgstr "শখ এবং আগ্রহ"
 
 msgid "A Little About Me"
-msgstr "আমার সম্পর্কে অল্প কিছু"
+msgstr "আমার সম্পর্কে কিছু কথা"
 
 msgid "Social"
 msgstr "সামাজিক"
@@ -5401,16 +5498,16 @@ msgid "Marital Status"
 msgstr "বৈবাহিক অবস্থা"
 
 msgid "Interests"
-msgstr "আগ্রহসমূহ"
+msgstr "আগ্রহ"
 
 msgid "Pets"
-msgstr "পোষা প্রাণীসমূহ"
+msgstr "পোষা প্রাণী"
 
 msgid "Hometown"
-msgstr "শহুরে-বাড়ি"
+msgstr "গ্রামের বাড়ি"
 
 msgid "Places Lived"
-msgstr "বসবাসরত অবস্থান"
+msgstr "যেসব যায়গায় থেকেছি"
 
 msgid "Fashion"
 msgstr "ফ্যাশন"
@@ -5426,14 +5523,14 @@ msgid "Favorite Quote"
 msgstr "প্রিয় উক্তি"
 
 msgid "Contact Info"
-msgstr "যোগাযোগের তথ্য"
+msgstr "পরিচিতির তথ্য"
 
 msgid "Personal"
 msgstr "ব্যক্তিগত"
 
 # tithi
 msgid "Significant Other"
-msgstr "গুরুত্বপূর্ণ অন্যান্য"
+msgstr "গুরুত্বপূর্ণ মানুষ"
 
 msgid "Home Phone"
 msgstr "বাসার ফোন"
@@ -5451,10 +5548,10 @@ msgid "Home Fax"
 msgstr "বাসার ফ্যাক্স"
 
 msgid "Personal Email"
-msgstr "ব্যক্তিগত ই-মেইল"
+msgstr "ব্যক্তিগত ইমেইল"
 
 msgid "Personal IM"
-msgstr "ব্যক্তিগত আইএম"
+msgstr "ব্যক্তিগত IM"
 
 # tithi
 msgid "Anniversary"
@@ -5462,11 +5559,11 @@ msgstr "বার্ষিকী"
 
 #. Business
 msgid "Work"
-msgstr "অফিস"
+msgstr "কাজ"
 
 # tithi
 msgid "Job Title"
-msgstr "কাজের শিরোনাম"
+msgstr "পদমর্যাদা"
 
 msgid "Company"
 msgstr "কোম্পানী"
@@ -5478,63 +5575,61 @@ msgid "Profession"
 msgstr "পেশা"
 
 msgid "Work Phone"
-msgstr "অফিস ফোন"
+msgstr "কর্মস্থলের ফোন"
 
 msgid "Work Phone 2"
-msgstr "অফিস ফোন ২"
+msgstr "কর্মস্থলের ফোন ২"
 
 msgid "Work Address"
-msgstr "অফিস ঠিকানা"
+msgstr "কর্মস্থলের ঠিকানা"
 
 msgid "Work Mobile"
-msgstr "অফিস মোবাইল"
+msgstr "কর্মস্থলের মোবাইল"
 
 msgid "Work Pager"
-msgstr "অফিস পেইজার"
+msgstr "কর্মস্থলের পেইজার"
 
 msgid "Work Fax"
-msgstr "অফিস ফ্যাক্স"
+msgstr "কর্মস্থলের ফ্যাক্স"
 
 msgid "Work Email"
-msgstr "অফিস ই-মেইল"
+msgstr "কর্মস্থলের ইমেইল"
 
 msgid "Work IM"
-msgstr "অফিস আইএম"
+msgstr "কর্মস্থলের IM"
 
 msgid "Start Date"
 msgstr "শুরুর তারিখ"
 
 msgid "Favorite Things"
-msgstr "প্রিয় জিনিসসমূহ"
+msgstr "প্রিয় জিনিস"
 
 msgid "Last Updated"
-msgstr "সর্বশেষ হালনাগাদকৃত"
+msgstr "সর্বশেষ হালনাগাদ করা"
 
 msgid "Homepage"
-msgstr "হোমপেজ"
+msgstr "হোমপেইজ"
 
 msgid "The user has not created a public profile."
-msgstr "ব্যবহারকারী কোনো জনসাধারণের প্রোফাইল তৈরী করেনি।"
+msgstr "ব্যবহারকারী কোনো পাবলিক প্রোফাইল তৈরী করেনি।"
 
-# tithi
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
-"MSN ব্যবহারকারীর বৃত্তান্ত খুঁজে পেতে সক্ষম না থাকায় প্রতিবেদন করেছিল।  এটি হয়ত "
-"বোঝায় যে ব্যবহারকারী বিদ্যমান নেই, বা ব্যবহারকারী রয়েছেন কিন্তু একটি পাবলিক "
-"বৃত্তান্ত তৈরি করেনি।"
+"MSN, ব্যবহারকারীর প্রোফাইল খুঁজে পায়নি। এর অর্থ এই যে, হয় এমন কোন ব্যবহারকারী নেই, "
+"অথবা ব্যবহারকারী তার প্রকাশ্য বৃত্তান্ত তৈরি করেনি।"
 
 # tithi
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"ব্যবহারকারীর বৃত্তান্তে কোনো তথ্য খুঁজে পায়নি। ব্যবহারকারী সম্ভবত বিদ্যমান থাকবে না।"
+"ব্যবহারকারীর প্রোফাইলে কোনো তথ্য খুঁজে পাওয়া যায়নি। সম্ভবত এমন কোন ব্যবহারকারী নেই।"
 
 msgid "View web profile"
-msgstr "ওয়েব প্রোফাইল দেখুন"
+msgstr "ওয়েব প্রোফাইল প্রদর্শন"
 
 #. *< type
 #. *< ui_requirement
@@ -5546,89 +5641,53 @@ msgstr "ওয়েব প্রোফাইল দেখুন"
 #. *< version
 #. *< summary
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "উইন্ডোজের সরাসরি মেসেনজার প্রোটোকল প্লাগইন"
+msgstr "Windows Live Messenger প্রোটোকল প্লাগইন"
 
 # tithi
 msgid "Use HTTP Method"
-msgstr "HTTP পদ্ধতি ব্যবহার করুন"
+msgstr "HTTP পদ্ধতি ব্যবহার করা হবে"
 
 msgid "HTTP Method Server"
 msgstr "HTTP পদ্ধতির সার্ভার"
 
 # tithi
 msgid "Show custom smileys"
-msgstr "স্বনির্বাচিত স্মাইলীগুলো দেখান"
+msgstr "স্বনির্বাচিত স্মাইলি দেখানো হবে"
 
 # fix -me tithi
 msgid "nudge: nudge a user to get their attention"
-msgstr "নাজ: ব্যবহারকারীদের মনোযোগ পেতে তাদেরকে নাজ দিন"
+msgstr "nudge: ব্যবহারকারীদের মনোযোগ পেতে তাদেরকে ধাক্কা দিন"
 
 # tithi
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "উইন্ডোজ সরাসরি আইডি প্রমাণীকরণ:সংযোগ করতে অক্ষম"
+msgstr "Windows Live ID প্রমাণীকরণ:সংযোগ করতে ব্যর্থ"
 
 # tithi
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "উইন্ডোজ সরাসরি  আইডি প্রমাণীকরণ:অবৈধ সাড়া"
+msgstr "Windows Live ID প্রমাণীকরণ: অকার্যকর উত্তর"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s কোনো বৈধ গ্রুপ নয়।"
-
-msgid "Unknown error."
-msgstr "অজানা ত্রুটি।"
+msgid "%s just sent you a Nudge!"
+msgstr "%s আপনাকে ধাক্কা দিয়েছে!"
 
 #, c-format
-msgid "%s on %s (%s)"
-msgstr "%2s (%3s) এ %1s"
+msgid "Unknown error (%d): %s"
+msgstr "অজানা ত্রুটি (%d): %s"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s আপনার দৃষ্টি আকর্ষন করছে!"
+msgid "Unable to add user"
+msgstr "ব্যবহারকারী যোগ করতে ব্যর্থ"
 
-#. char *adl = g_strndup(payload, len);
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "অজানা ত্রুটি (%d)"
 
-msgid "Unable to add user"
-msgstr "ব্যবহারকারী যোগ করতে সমর্থ নয়"
-
 msgid "The following users are missing from your addressbook"
-msgstr "আপনার ঠিকানা বই থেকে নিম্নোক্ত ব্যবহারকারীরা হারিয়ে গেছে"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%1s (%2s) এ ব্যবহারকারী যোগ করতে সমর্থ নয়"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%1s (%2s) এ ব্যবহারকারী আবদ্ধ করতে সমর্থ নয়"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%1s (%2s) ব্যবহারকারীকে অনুমতি প্রদান করতে সমর্থ নয়"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "আপনার বন্ধু তালিকা পূর্ণ থাকার কারণে %s কে যোগ করা যাচ্ছে না।"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s বৈধ পাসপোর্ট একাউন্ট নয়।"
-
-msgid "Service Temporarily Unavailable."
-msgstr "সাময়িকভাবে সেবা পাওয়া যাচ্ছে না।"
+msgstr "আপনার ঠিকানা বইয়ে নিম্নোক্ত ব্যবহারকারীরা নেই"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "মোবাইল বার্তাটি অনেক বড় বিধায় পাঠানো হয়নি।"
 
-msgid "Unable to rename group"
-msgstr "গ্রুপ পুনরায় নামকরণ করতে সমর্থ নয়"
-
-msgid "Unable to delete group"
-msgstr "গ্রুপ মুছে ফেলতে অক্ষম"
-
 # tithi
 #, c-format
 msgid ""
@@ -5646,42 +5705,39 @@ msgid_plural ""
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"MSN সার্ভার রক্ষনাবেক্ষনের জন্য %d মিনিটে বন্ধ হয়ে যাবে। আপনি এই  সময় "
-"স্বয়ংক্রিয়ভাবে সাইন আউট হয়ে যাবেন।  অনুগ্রহ করে চলমান যেকোনো কথোপকথন শেষ করুন।\n"
+"MSN সার্ভার রক্ষনাবেক্ষনের জন্য %d মিনিটে বন্ধ হয়ে যাবে। আপনি এই সময় স্বয়ংক্রিয়ভাবে "
+"লগআউট হয়ে যাবেন। অনুগ্রহ করে চলমান কথোপকথন শেষ করুন।\n"
 "\n"
-"রক্ষনাবেক্ষন সম্পূর্ন হবার পর, আপনি সফলভাবে সাইন ইন করতে পারবেন।"
+"রক্ষনাবেক্ষন সম্পূর্ন হবার পর, আপনি সফলভাবে লগইন করতে পারবেন।"
 msgstr[1] ""
-"MSN সার্ভার রক্ষনাবেক্ষনের জন্য %d মিনিটে বন্ধ হয়ে যাবে। আপনি এই  সময় "
-"স্বয়ংক্রিয়ভাবে সাইন আউট হয়ে যাবেন।  অনুগ্রহ করে চলমান যেকোনো কথোপকথন শেষ করুন।\n"
+"MSN সার্ভার রক্ষনাবেক্ষনের জন্য %d মিনিটে বন্ধ হয়ে যাবে। আপনি এই সময় স্বয়ংক্রিয়ভাবে "
+"লগআউট হয়ে যাবেন। অনুগ্রহ করে চলমান কোনো কথোপকথন শেষ করুন।\n"
 "\n"
-"রক্ষনাবেক্ষন সম্পূর্ন হবার পর, আপনি সফলভাবে সাইন ইন করতে পারবেন।"
+"রক্ষনাবেক্ষন সম্পূর্ন হবার পর, আপনি সফলভাবে লগইন করতে পারবেন।"
 
 # tithi
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
-"বার্তা পাঠানো হয়নি কারণ সিস্টেম সহজলভ্য  নয়। এইটি সাধারণত ঘটে যখন ব্যবহারকারী "
-"আবদ্ধ বা ব্যবহারকারী বিদ্যমান থাকে না।"
+"বার্তা পাঠানো হয়নি কারণ সিস্টেম কার্যকর নয়। এইটি সাধারণত ঘটে যখন ব্যবহারকারী ব্লক "
+"করা থাকে বা এরকম কোন ব্যবহারকারী না থাকে।"
 
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr "বার্তা পাঠানো যায়নি কারণ বার্তাগুলো খুব তাড়াতাড়ি পাঠানো হচ্ছিল।"
 
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "অজানা সঙ্কেতায়ন ত্রুটি সংঘটিত হওয়ার কারণে বার্তা পাঠানো যায়নি।"
+msgstr "অজানা এনকোডিং ত্রুটি সংঘটিত হওয়ায় বার্তা পাঠানো যায়নি।"
 
 msgid "Message was not sent because an unknown error occurred."
-msgstr "অজানা ত্রুটি সংঘটিত হওয়ার কারণে বার্তা পাঠানো যায়নি।"
-
-msgid "Unable to connect"
-msgstr "সংযোগ করতে সমর্থ নয়"
+msgstr "অজানা ত্রুটি সংঘটিত হওয়ায় বার্তা পাঠানো যায়নি।"
 
 # tithi
 msgid "Writing error"
-msgstr "লিখন ত্রুটি"
+msgstr "লিখতে ত্রুটি"
 
 msgid "Reading error"
-msgstr "পাঠ ত্রুটি"
+msgstr "পড়তে ত্রুটি"
 
 # tithi
 #, c-format
@@ -5689,35 +5745,35 @@ msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"%1s সার্ভার হতে সংযোগের ত্রুটি:\n"
-"%2s"
+"%1$s সার্ভার থেকে সংযোগের ত্রুটি:\n"
+"%2$s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "আমাদের প্রটোকল সার্ভার সমর্থন করে না।"
+msgid "Our protocol is not supported by the server"
+msgstr "আমাদের প্রোটোকলটি সার্ভার সমর্থন করে না।"
 
-msgid "Error parsing HTTP."
-msgstr "HTTP পার্স করতে ত্রুটি।"
+msgid "Error parsing HTTP"
+msgstr "HTTP পার্স করতে ত্রুটি"
 
-msgid "You have signed on from another location."
-msgstr "আপনি অন্য স্থান থেকে সাইন অন করেছেন।"
+msgid "You have signed on from another location"
+msgstr "আপনি অন্য স্থান থেকে লগইন করেছেন"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
-"সাময়িকভাবে এমএসএন সার্ভার পাওয়া যাচ্ছে না। অনুগ্রহ করে অপেক্ষা করুন এবং পুনরায় "
-"চেষ্টা করুন"
+"MSN সার্ভার সাময়িকভাবে পাওয়া যাচ্ছে না। অনুগ্রহ করে অপেক্ষা করুন এবং পুনরায় চেষ্টা "
+"করুন।"
 
 # tithi
-msgid "The MSN servers are going down temporarily."
-msgstr "MSN সার্ভার সাময়িকভাবে নিস্ক্রিয় হচ্ছে।"
+msgid "The MSN servers are going down temporarily"
+msgstr "MSN সার্ভারগুলো সাময়িকভাবে নিষ্ক্রিয় করা হচ্ছে।"
 
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "প্রমাণীকরণ করতে অক্ষম: %s"
+msgstr "প্রমাণীকরণ করতে ব্যর্থ: %s"
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"সাময়িকভাবে আপনার এমএসএন বন্ধু-তালিকা পাওয়া যাচ্ছে না। অনুগ্রহ করে অপেক্ষা করুন এবং "
+"সাময়িকভাবে আপনার MSN বন্ধু-তালিকা পাওয়া যাচ্ছে না। অনুগ্রহ করে অপেক্ষা করুন এবং "
 "পুনরায় চেষ্টা করুন।"
 
 # tithi
@@ -5725,78 +5781,81 @@ msgid "Handshaking"
 msgstr "হ্যান্ডসেকিং"
 
 msgid "Transferring"
-msgstr "স্থানান্তর করছে"
+msgstr "স্থানান্তর করা হচ্ছে"
 
 # tithi
 msgid "Starting authentication"
-msgstr "প্রমাণীকরণ শুরু করছে"
+msgstr "প্রমাণীকরণ শুরু হচ্ছে"
 
 # tithi
 msgid "Getting cookie"
-msgstr "কুকি গ্রহণ করছে"
+msgstr "কুকি গ্রহণ করা হচ্ছে"
 
 msgid "Sending cookie"
-msgstr "কুকি পাঠাচ্ছে"
+msgstr "কুকি পাঠানো হচ্ছে"
 
 msgid "Retrieving buddy list"
-msgstr "বন্ধু তালিকা উদ্ধার করছে"
+msgstr "বন্ধু তালিকা উদ্ধার করা হচ্ছে"
+
+# tithi
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"আপনার ওয়েবক্যাম প্রদর্শনের জন্য %s অনুরোধ করেছেন কিন্তু এই অনুরোধটি এখনও সমর্থিত হয়নি।"
+
+# tithi
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s আপনাকে ওয়েবক্যাম আমন্ত্রন পাঠিয়েছেন, যা এখনও সমর্থিত নয়।"
 
 msgid "Away From Computer"
 msgstr "কম্পিউটার থেকে দূরে"
 
 msgid "On The Phone"
-msgstr "ফোন এ কথা বলছে"
+msgstr "ফোনে কথা বলছে"
 
 msgid "Out To Lunch"
-msgstr "লাঞ্চ এর জন্য বাইরে"
+msgstr "খাবারের জন্য বাইরে"
 
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "সময় শেষ হয়ে যাওযার কারণে বার্তা সম্ভবত পাঠানো হয়নি:"
+msgstr "সময়সীমা অতিক্রম করার কারণে বার্তা সম্ভবত পাঠানো হয়নি:"
 
 # tithi
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "বার্তা পাঠানো যাবে না, অদৃশ্য অবস্থায় অনুমোদিত নয়:"
+msgstr "অদৃশ্য অবস্থায় বার্তা পাঠানো অনুমোদিত নয়:"
 
 msgid "Message could not be sent because the user is offline:"
-msgstr "বার্তা পাঠানো যাচ্ছে না কারণ ব্যবহারকারী অফলাইনে:"
+msgstr "বার্তা পাঠানো যাচ্ছে না কারণ ব্যবহারকারী অফলাইন:"
 
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "বার্তা পাঠানো যাচ্ছে না কারণ সংযোগে ত্রুটি সংঘটিত হয়েছে:"
+msgstr "বার্তা পাঠানো যাচ্ছে না কারণ সংযোগে ত্রুটি হয়েছে:"
 
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "বার্তা পাঠানো যাচ্ছে না কারন আমরা খুব তাড়াতাড়ি পাঠাচ্ছি:"
+msgstr "বার্তা পাঠানো যাচ্ছে না কারন খুব তাড়াতাড়ি পাঠানো হচ্ছে:"
 
 # tithi
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
-"বার্তা পাঠানো যাচ্ছে না কারণ আমরা সার্ভারের সাথে একটি অধিবেশন প্রতিষ্ঠিত করতে "
-"অক্ষম ছিলাম। এটি সম্ভবত সার্ভার সমস্যা, কয়েক মিনিটের মধ্যে পুনরায় একটি চেষ্টা করুন:"
+"বার্তা পাঠানো যাচ্ছে না কারণ সার্ভারের সাথে সেশন প্রতিষ্ঠা করা ব্যর্থ হয়েছে। এটি "
+"সম্ভবত সার্ভারের সমস্যা, কয়েক মিনিটের মধ্যে পুনরায় চেষ্টা করা হবে:"
 
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "সুইচবোর্ডে ত্রুটি থাকার কারনে বার্তা পাঠানো যায়নি:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "একটি অজানা ত্রুটির সংঘটিত হওয়ার কারণে বার্তা হয়ত পাঠানো যায়নি:"
-
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s আপনাকে তার বন্ধু তালিকায় যোগ করেছেন।"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s আপনাকে তার বন্ধু তালিকা থেকে অপসারণ করেছে।"
+msgstr "একটি অজানা ত্রুটির সংঘটিত হওয়ার কারণে সম্ভবত বার্তা পাঠানো যায়নি:"
 
 msgid "Delete Buddy from Address Book?"
 msgstr "ঠিকানার বই থেকে কি বন্ধু মুছে ফেলতে চান?"
 
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "আপনি কি এই বন্ধুটিকেও আপনার ঠিকানা বই থেকে মুছে ফেলতে চান?"
+msgstr "আপনি কি এই বন্ধুকে আপনার ঠিকানা বই থেকেও মুছে ফেলতে চান?"
 
 msgid "The username specified is invalid."
-msgstr "উল্লেখিত ব্য়বহারকারীর নামটি অবৈধ।"
+msgstr "উল্লেখিত ব্যবহারকারীর নামটি অকার্যকর।"
 
 # tithi
 msgid "This Hotmail account may not be active."
@@ -5819,41 +5878,91 @@ msgstr "প্রোফাইল URL"
 msgid "MSN Protocol Plugin"
 msgstr "MSN প্রোটোকল প্লাগইন"
 
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s কোনো কার্যকর দল নয়।"
+
+msgid "Unknown error."
+msgstr "অজানা ত্রুটি।"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s (%3$s) এ %1$s"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%1$s (%2$s) এ ব্যবহারকারী যোগ করতে ব্যর্থ"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%1$s (%2$s) এ ব্যবহারকারী ব্লক করতে ব্যর্থ"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%1$s (%2$s) ব্যবহারকারীকে অনুমতি প্রদান করতে ব্যর্থ"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "আপনার বন্ধু তালিকা পূর্ণ থাকার কারণে %s কে যোগ করা যাচ্ছে না।"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s বৈধ পাসপোর্ট একাউন্ট নয়।"
+
+msgid "Service Temporarily Unavailable."
+msgstr "সাময়িকভাবে সেবা পাওয়া যাচ্ছে না।"
+
+msgid "Unable to rename group"
+msgstr "দলের নামান্তর করতে ব্যর্থ"
+
+msgid "Unable to delete group"
+msgstr "দল মুছে ফেলতে ব্যর্থ"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s আপনাকে তার বন্ধু তালিকায় যোগ করেছেন।"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s আপনাকে তার বন্ধু তালিকা থেকে অপসারণ করেছেন।"
+
 # tithi
 #, c-format
 msgid "No such user: %s"
 msgstr "এমন কোনো ব্যবহারকারী নেই: %s"
 
 msgid "User lookup"
-msgstr "ব্যবহারকারী দেখছে"
+msgstr "ব্যবহারকারী অনুসন্ধান"
 
 msgid "Reading challenge"
-msgstr "পড়তে সমস্যা হচ্ছে"
+msgstr "পড়ার চ্যালেঞ্জ"
 
 # fix me tithi
 msgid "Unexpected challenge length from server"
-msgstr "সার্ভারের অপ্রত্যাশিত চ্যালেঞ্জ সীমা"
+msgstr "অপ্রত্যাশিত দৈর্ঘ্যের সার্ভার চ্যালেঞ্জ "
 
 msgid "Logging in"
-msgstr "সংযুক্ত হচ্ছে"
+msgstr "লগইন হচ্ছে"
 
 msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM - কোনো ব্যবহারকারীর নাম বিন্যাস করা হয়নি"
+msgstr "MySpaceIM - কোনো ব্যবহারকারীর নাম দেয়া হয়নি"
 
 # tithi
 msgid "You appear to have no MySpace username."
-msgstr "আপনি MySpace ব্যবহারকারীর-নাম ব্যতিত উপস্থিত হয়েছেন।"
+msgstr "সম্ভবত আপনার MySpace ব্যবহারকারীর-নাম নেই।"
 
 # tithi
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr "আপনি কি এখন একটি নির্ধারণ করতে আগ্রহী? (নোট: এটি পরিবর্তন করা যায় না!)"
+msgstr "আপনি কি এখন নির্ধারণ করতে আগ্রহী? (নোট: এটি পরিবর্তন করা যায় না!)"
 
 msgid "Lost connection with server"
 msgstr "সার্ভারের সাথে সংযোগ বিচ্ছিন্ন হয়েছে"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
-msgstr "নতুন মেইল বার্তাসমূহ"
+msgstr "নতুন মেইল"
 
 # tithi
 msgid "New blog comments"
@@ -5876,7 +5985,7 @@ msgid "MySpace"
 msgstr "MySpace"
 
 msgid "IM Friends"
-msgstr "IM বন্ধুসমূহ"
+msgstr "IM বন্ধু"
 
 # tithi
 #, c-format
@@ -5887,110 +5996,94 @@ msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
-"সার্ভার থেকে  %d বন্ধু যোগ বা হালনাগাদ করা  হয়েছিল ( সার্ভার-পার্শ্বের তালিকায় "
-"বিদ্যমান বন্ধুরা সহ)"
+"সার্ভার থেকে  %d জন বন্ধু যোগ বা হালনাগাদ করা হয়েছে (সার্ভার-পার্শ্বের তালিকার "
+"বন্ধুরা সহ)"
 msgstr[1] ""
-"সার্ভার থেকে  %d বন্ধুসমূহ যোগ বা হালনাগাদ করা  হয়েছিল ( সার্ভার-পার্শ্বের তালিকায় "
-"বিদ্যমান বন্ধুরা সহ)"
+"সার্ভার থেকে %d জন বন্ধু যোগ বা হালনাগাদ করা  হয়েছে (সার্ভার-পার্শ্বের তালিকার "
+"বন্ধুরা সহ)"
 
 msgid "Add contacts from server"
-msgstr "সার্ভার থেকে যোগাযোগগুলো যোগ করুন"
-
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "সংযুক্ত"
+msgstr "সার্ভার থেকে পরিচিতিগুলো যোগ করুন"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "প্রোটকল ত্রুটি, কোড %1d: %2s"
+msgstr "প্রোটোকল ত্রুটি, কোড %1$d: %2$s"
 
-# tithi
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s আপনার গুপ্তসংকেত %d বর্ণচিহ্নের, MySpaceIM এর জন্য %d এর প্রত্যাশিত সর্বোচ্চ দৈর্ঘ্য "
-"অপেক্ষা বৃহত্তর। অনুগ্রহ করে আপনার গুপ্তসংকেত http://profileedit.myspace.com/index."
-"cfm?fuseaction=accountSettings। গুপ্তসংকেত সংক্ষিপ্ত করুন এবং পুনরায় চেষ্টা করুন।"
+"%s আপনার পাসওয়ার্ডটি %zu অক্ষরের, যা দৈর্ঘ্য %d এর সর্বোচ্চ দৈর্ঘ্যের চাইতে বড়। "
+"অনুগ্রহ করে আপনার পাসওয়ার্ড http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings ঠিকানায় গিয়ে সংক্ষিপ্ত করুন এবং পুনরায় চেষ্টা করুন।"
+
+msgid "Incorrect username or password"
+msgstr "ভুল ব্যবহারকারীর নাম বা পাসওয়ার্ড"
 
 # tithi
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM ত্রুটি"
 
 msgid "Invalid input condition"
-msgstr "অবৈধ ইনপুট শর্ত"
-
-# tithi
-msgid "Read buffer full (2)"
-msgstr "পাঠ বাফার পূর্ণ (২)"
-
-msgid "Unparseable message"
-msgstr "পার্স অযোগ্য বার্তা"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "হোস্টের সাথে সংযুক্ত করা যায়নি: %1s (%2d)"
+msgstr "অকার্যকর ইনপুট শর্ত"
 
 msgid "Failed to add buddy"
 msgstr "বন্ধু যোগ করতে ব্যর্থ"
 
 msgid "'addbuddy' command failed."
-msgstr "\"বন্ধু যোগ করুন\" নির্দেশটি ব্যর্থ হয়েছে।"
+msgstr "'addbuddy' কমান্ডটি ব্যর্থ হয়েছে।"
 
 msgid "persist command failed"
-msgstr "যুক্তির নির্দেশ ব্যর্থ হয়েছে"
+msgstr "persist কমান্ড ব্যর্থ হয়েছে"
 
 msgid "Failed to remove buddy"
-msgstr "বন্ধু অপসারণ করতে ব্যর্থ হয়েছে"
+msgstr "বন্ধু অপসারণ করতে ব্যর্থ"
 
 # tithi
 msgid "'delbuddy' command failed"
-msgstr "'বন্ধু মুছে ফেলুন' নির্দেশ ব্যর্থ হয়েছে"
+msgstr "'delbuddy' কমান্ড ব্যর্থ হয়েছে"
 
 msgid "blocklist command failed"
-msgstr "ব্লক-লিস্ট নির্দেশ ব্যর্থ হয়েছে"
+msgstr "blocklist কমান্ড ব্যর্থ হয়েছে"
 
 msgid "Missing Cipher"
-msgstr "হারিয়ে যাওয়া সাইফার"
+msgstr "সাইফার অনুপস্থিত"
 
 # tithi
 msgid "The RC4 cipher could not be found"
-msgstr "RC4 ছাইফারকে খুঁজে পাওয়া যায়নি"
+msgstr "RC4 সাইফার খুঁজে পাওয়া যায়নি"
 
-# tithi
+# mark25
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
-"RC4 সমর্থন (>= 2.0.1) সহ libpurpleএ উন্নততর করুন। MySpaceIM প্লাগইন লোড করা হবে "
-"না।"
+"RC4 সমর্থিত (>= 2.0.1) libpurpleএ আপগ্রেড করা হবে। MySpaceIM প্লাগইন লোড করা "
+"হবে না।"
 
 # tithi
 msgid "Add friends from MySpace.com"
 msgstr "MySpace.com থেকে বন্ধু যোগ করুন"
 
 msgid "Importing friends failed"
-msgstr "বন্ধুদের আনতে ব্যর্থ হয়েছে"
+msgstr "বন্ধুদের ইমপোর্ট করা ব্যর্থ হয়েছে"
 
 #. TODO: find out how
 msgid "Find people..."
-msgstr "জনগণ খুঁজুন..."
+msgstr "কোন ব্যক্তিকে‍ খুঁজুন..."
 
 msgid "Change IM name..."
-msgstr "IM নাম পরিবর্তন করুন..."
+msgstr "IM নাম পরিবর্তন..."
 
 # tithi
 msgid "myim URL handler"
-msgstr "myim URL নিয়ন্ত্রক"
+msgstr "myim URL হ্যান্ডলার"
 
 # tithi
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr "এই myim URL খুলতে কোনো উপযুক্ত MySpaceIM একাউন্ট খুঁজে পাওয়া যাবে না।"
+msgstr "এই myim URL খুলতে কোনো উপযুক্ত MySpaceIM একাউন্ট খুঁজে পাওয়া যায়নি।"
 
 # tithi
 msgid "Enable the proper MySpaceIM account and try again."
@@ -5998,23 +6091,23 @@ msgstr "উপযুক্ত MySpaceIM একাউন্ট সক্রিয
 
 # tithi
 msgid "Show display name in status text"
-msgstr "অবস্থা পাঠে প্রদর্শন নাম দেখান"
+msgstr "অবস্থা টেক্সটে নাম দেখান"
 
 # tithi
 msgid "Show headline in status text"
-msgstr "অবস্থা পাঠে শিরোনাম দেখান"
+msgstr "অবস্থা টেক্সটে শিরোনাম দেখান"
 
 # fix me tithi
 msgid "Send emoticons"
-msgstr "আবেগীয় প্রতীকগুলো পাঠান"
+msgstr "অনুভূতিচিহ্ন পাঠান"
 
 # tithi
 msgid "Screen resolution (dots per inch)"
-msgstr "পর্দার রিসোলিউশন (প্রতি ইঞ্চির ডট)"
+msgstr "পর্দার রেজল্যুশন (ইঞ্চি প্রতি ডট)"
 
 # fix me tithi
 msgid "Base font size (points)"
-msgstr "ভিত্তির ফন্ট আকার (বিন্দু)"
+msgstr "মূল ফন্টের আকার (পয়েন্টে)"
 
 msgid "User"
 msgstr "ব্যবহারকারী"
@@ -6027,17 +6120,26 @@ msgstr "গান"
 
 # tithi
 msgid "Total Friends"
-msgstr "সব বন্ধু"
+msgstr "মোট বন্ধু"
 
 msgid "Client Version"
 msgstr "ক্লায়েন্ট সংস্করণ"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"ব্যবহারকারীর নাম নির্ধারণ করার সময় একটি ত্রুটি হয়েছে। আবার চেষ্টা করুন বা এই "
+"ঠিকানায় http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"গিয়ে ব্যবহারকারীর নাম নির্ধারণ করুন।"
+
 msgid "MySpaceIM - Username Available"
-msgstr "MySpaceIM -ব্যবহারকারীর নাম সহজলভ্য"
+msgstr "MySpaceIM - নামটি অব্যবহৃত"
 
 # tithi
 msgid "This username is available. Would you like to set it?"
-msgstr "এই ব্যবহারকারীর-নামটি সহজলভ্য। আপনি কি এটি নির্ধারন করতে আগ্রহী?"
+msgstr "এই নামটি অব্যবহৃত। আপনি কি এটি নির্ধারন করতে আগ্রহী?"
 
 # tithi
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
@@ -6045,13 +6147,13 @@ msgstr "একবার নির্ধারণ করলে, এটি আর
 
 # tithi
 msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM- অনুগ্রহ করে একটি ব্যবহারকারীর নাম নির্ধারন করুন"
+msgstr "MySpaceIM- অনুগ্রহ করে একটি ব্যবহারকারীর নাম নির্ধারণ করুন"
 
 msgid "This username is unavailable."
-msgstr "এই ব্যহারকারীর নামটি অপ্রাপ্য।"
+msgstr "এই ব্যহারকারীর নামটি অনুপস্থিত।"
 
 msgid "Please try another username:"
-msgstr "অনুগ্রহ করে অন্য একটি ব্যবহারকারীর নাম চেষ্টা করুন:"
+msgstr "অনুগ্রহ করে অন্য একটি নাম চেষ্টা করুন:"
 
 #. Protocol won't log in now without a username set.. Disconnect
 msgid "No username set"
@@ -6059,7 +6161,7 @@ msgstr "কোনো ব্যবহারকারীর নাম নির্
 
 # tithi
 msgid "Please enter a username to check its availability:"
-msgstr "অনুগ্রহ করে এর সহজলভ্যতা পরীক্ষা করতে একটি ব্যবহারকারীর নাম প্রবেশ করান:"
+msgstr "অনুগ্রহ করে একটি ব্যবহারকারীর নাম দিন যা অব্যবহৃত কিনা পরীক্ষা করার হবে:"
 
 # tithi
 #. TODO: icons for each zap
@@ -6069,77 +6171,77 @@ msgstr "অনুগ্রহ করে এর সহজলভ্যতা প�
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr "আক্রমণ করুন"
+msgstr "ঝটকা"
 
 #, c-format
 msgid "%s has zapped you!"
-msgstr "%s আপনাকে আক্রমণ করেছে! "
+msgstr "%s আপনাকে ঝটকা! দিয়েছে! "
 
 # tithi
 #, c-format
 msgid "Zapping %s..."
-msgstr "%s আক্রমণ করছে ..."
+msgstr "%s কে ঝটকা! দেয়া হচ্ছে..."
 
 # tithi
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr "সজোরে আঘাত করুন"
+msgstr "ঘুষি"
 
 #, c-format
 msgid "%s has whacked you!"
-msgstr "%s আপনাকে আঘাত করেছে!"
+msgstr "%s আপনাকে ঘুষি দিয়েছে!"
 
 # tithi
 #, c-format
 msgid "Whacking %s..."
-msgstr "%s সজোরে আঘাত করছে..."
+msgstr "%s কে ঘুষি দেয়া হচ্ছে..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
 msgid "Torch"
-msgstr "আলোকপাত করুন"
+msgstr "টর্চ"
 
 #, c-format
 msgid "%s has torched you!"
-msgstr "%s আপনার উপর আলোকপাত করেছে!"
+msgstr "%s আপনার টর্চ করেছে!"
 
 # tithi
 #, c-format
 msgid "Torching %s..."
-msgstr "%s আলোকপাত করছে..."
+msgstr "%s কে  টর্চ  করা হচ্ছে..."
 
 # fix me tithi
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr "অন্তরঙ্গতা"
+msgstr "চুমু"
 
 #, c-format
 msgid "%s has smooched you!"
-msgstr "%s আপনার সাথে অন্তরঙ্গ হয়েছে!"
+msgstr "%s আপনাকে চুমু খেয়েছে!"
 
 # fix me tithi
 #, c-format
 msgid "Smooching %s..."
-msgstr "%s অন্তরঙ্গ করছে..."
+msgstr "%s কে চুমু দিচ্ছে..."
 
 # tithi
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr "জড়িয়ে ধরুন"
+msgstr "আলিঙ্গন"
 
 #, c-format
 msgid "%s has hugged you!"
-msgstr "%s আপনাকে জড়িয়ে ধরেছে!"
+msgstr "%s আপনাকে আলিঙ্গন করেছে!"
 
 # tithi
 #, c-format
 msgid "Hugging %s..."
-msgstr "%s জড়িয়ে ধরছে..."
+msgstr "%s কে আলিঙ্গন করছে..."
 
 #. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
-msgstr "চড় মারুন"
+msgstr "চড়"
 
 #, c-format
 msgid "%s has slapped you!"
@@ -6148,20 +6250,20 @@ msgstr "%s আপনাকে চড় মেরেছে!"
 # tithi
 #, c-format
 msgid "Slapping %s..."
-msgstr "%s চড় মারছে..."
+msgstr "%s কে চড় মারা হচ্ছে..."
 
 # fix me tithi
 #. Goose means "to pinch someone on their butt"
 msgid "Goose"
-msgstr "আঘাত করুন"
+msgstr "চিমটি"
 
 #, c-format
 msgid "%s has goosed you!"
-msgstr "%s আপনাকে আঘাত করেছে!"
+msgstr "%s আপনাকে চিমটি কেটেছে!"
 
 #, c-format
 msgid "Goosing %s..."
-msgstr "%s আঘাত করছে..."
+msgstr "%s কে চিমটি কাটছে..."
 
 # tithi
 #. A high-five is when two people's hands slap each other
@@ -6177,23 +6279,23 @@ msgstr "%s আপনার সাথে হাই-ফাইভ করেছে!"
 # tithi
 #, c-format
 msgid "High-fiving %s..."
-msgstr "%s হাই-ফাইভ করেছে..."
+msgstr "%s এর সাথে হাই-ফাইভ করছে..."
 
 # tithi
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
 msgid "Punk"
-msgstr "মজা"
+msgstr "পাংক"
 
 #, c-format
 msgid "%s has punk'd you!"
-msgstr "%s আপনার সাথে মজা করেছে!"
+msgstr "%s আপনাকে পাংক করেছে!"
 
 # tithi
 #, c-format
 msgid "Punking %s..."
-msgstr "%s মজা করছে..."
+msgstr "%s কে পাংক করা হচ্ছে..."
 
 # tithi
 #. Raspberry is a slang term for the vibrating sound made
@@ -6204,21 +6306,21 @@ msgstr "%s মজা করছে..."
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr "অঙ্গভঙ্গি"
+msgstr "ভেংচি"
 
 # fix me tithi
 #, c-format
 msgid "%s has raspberried you!"
-msgstr "%s আপনাকে অঙ্গভঙ্গি দিয়েছে!"
+msgstr "%s আপনাকে ভেংচি কেটেছে!"
 
 # tithi
 #, c-format
 msgid "Raspberrying %s..."
-msgstr "%s অঙ্গভঙ্গি করছে..."
+msgstr "%s কে ভেংচি কাটছে..."
 
 # tithi
 msgid "Required parameters not passed in"
-msgstr "প্রয়োজনীয় মানসমূহ প্রবেশ করা হয়নি"
+msgstr "প্রয়োজনীয় প্যারামিটার দেয়া হয়নি"
 
 msgid "Unable to write to network"
 msgstr "নেটওয়ার্কে লিখতে ব্যর্থ"
@@ -6226,29 +6328,26 @@ msgstr "নেটওয়ার্কে লিখতে ব্যর্থ"
 msgid "Unable to read from network"
 msgstr "নেটওয়ার্ক থেকে পড়তে ব্যর্থ"
 
-# tithi
 msgid "Error communicating with server"
 msgstr "সার্ভারের সাথে যোগাযোগের ত্রুটি"
 
-# tithi
 msgid "Conference not found"
-msgstr "অধিবেশন পাওয়া যাচ্ছে না"
+msgstr "অধিবেশন পাওয়া যায়নি"
 
-# tithi
 msgid "Conference does not exist"
-msgstr "অধিবেশন বিদ্যমান নয়"
+msgstr "এমন কোন অধিবেশন নেই"
 
 msgid "A folder with that name already exists"
-msgstr "ইতোমধ্যে ঐ নামের একটি ফোল্ডার বিদ্যমান"
+msgstr "ইতিমধ্যে ঐ নামের একটি ফোল্ডার বিদ্যমান"
 
 msgid "Not supported"
 msgstr "সমর্থিত নয়"
 
 msgid "Password has expired"
-msgstr "গুপ্তসঙ্কেতের মেয়াদ শেষ"
+msgstr "পাসওয়ার্ডের মেয়াদ শেষ"
 
 msgid "Incorrect password"
-msgstr "ভুল গুপ্তসঙ্কেতে"
+msgstr "ভুল পাসওয়ার্ড"
 
 msgid "User not found"
 msgstr "ব্যবহারকারী খুঁজে পাওয়া যায়নি"
@@ -6257,51 +6356,45 @@ msgid "Account has been disabled"
 msgstr "একাউন্টটি নিষ্ক্রিয় করা হয়েছে"
 
 msgid "The server could not access the directory"
-msgstr "সার্ভার নির্দেশিকায় প্রবেশ করতে পারে না"
+msgstr "সার্ভার ডিরেক্টরিতে প্রবেশ করতে পারে না"
 
-# tithi
 msgid "Your system administrator has disabled this operation"
 msgstr "আপনার সিস্টেম প্রশাসক এই অপারেশনটি নিষ্ক্রিয় করেছে"
 
 # tithi
 msgid "The server is unavailable; try again later"
-msgstr "সার্ভার অপ্রাপ্য; পরবর্তীতে আবার চেষ্টা করুন"
+msgstr "সার্ভার বিদ্যমান নয়; পরবর্তীতে আবার চেষ্টা করুন"
 
 msgid "Cannot add a contact to the same folder twice"
-msgstr "একই ফোল্ডারে একটি যোগাযোগ দুইবার যোগ করা যাবে না"
+msgstr "একই ফোল্ডারে একটি পরিচিতি দুইবার যোগ করা যাবে না"
 
 msgid "Cannot add yourself"
 msgstr "আপনি নিজেকে যোগ করতে পারবেন না"
 
 # tithi
 msgid "Master archive is misconfigured"
-msgstr "মাস্টার আর্কাইভ ভূলভাবে-বিন্যাসিত"
-
-msgid "Incorrect username or password"
-msgstr "ভুল ব্যবহারকারীর নাম বা গুপ্তসংকেত"
+msgstr "মাস্টার আর্কাইভ ভুলভাবে-কনফিগার করা হয়েছে "
 
 # tithi
 msgid "Could not recognize the host of the username you entered"
-msgstr "আপনার প্রবেশকৃত ব্যবহারকারীর-নামের হোস্ট শনাক্ত করতে পারে না"
+msgstr "আপনার প্রবেশকৃত ব্যবহারকারীর নামের হোস্ট শনাক্ত করা যায়নি"
 
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr ""
-"আপনার একাউন্টটি নিষ্ক্রিয় করা হয়েছে কারণ অনেকগুলো ভুল গুপ্তসংকেত প্রবেশ করা হয়েছিল"
+msgstr "আপনার একাউন্টটি নিষ্ক্রিয় করা হয়েছে কারণ অনেকবার ভুল পাসওয়ার্ড দেয়া হয়েছিল"
 
 msgid "You cannot add the same person twice to a conversation"
 msgstr "আপনি একটি কথোপকথনে একই ব্যক্তিকে দুইবার যোগ করতে পারেন না"
 
-# tithi
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr "আপনি আপনার অনুমোদিত যোগাযোগ সংখ্যার সীমায় পৌঁছেছেন"
+msgstr "আপনি আপনার অনুমোদিত পরিচিতি সংখ্যার সীমায় পৌঁছেছেন"
 
 msgid "You have entered an incorrect username"
 msgstr "আপনি একটি ভুল ব্যবহারকারীর নাম প্রবেশ করেছেন"
 
 msgid "An error occurred while updating the directory"
-msgstr "নির্দেশিকাটি হালনাগাদ করার সময় একটি ত্রুটি দেখা দিয়েছে"
+msgstr "ডিরেক্টরিটি হালনাগাদ করার সময় একটি ত্রুটি দেখা দিয়েছে"
 
 # tithi
 msgid "Incompatible protocol version"
@@ -6315,7 +6408,7 @@ msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-"এই মূল্যায়ন সংস্করণটি একই সময়ে দশজন ব্যবহারকারীর অধিক লগইন করতে অনুমোদন করে না"
+"এই মূল্যায়ন সংস্করণটি একই সময়ে দশজনের বেশী ব্যবহারকারীরকে লগইন করতে অনুমোদন করে না"
 
 msgid "The user is either offline or you are blocked"
 msgstr "এই ব্যবহারকারী হয় অফলাইনে বা আপনাকে ব্লক করে রেখেছে"
@@ -6325,8 +6418,8 @@ msgid "Unknown error: 0x%X"
 msgstr "অজানা ত্রুটি: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "লগইন ব্যর্থ হয়েছে (%s)।"
+msgid "Unable to login: %s"
+msgstr "লগইন করতে ব্যর্থ: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6335,45 +6428,44 @@ msgstr ""
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "%s কে আপনার বন্ধুতালিকায় (%s) যোগ করতে সমর্থ নয়।"
+msgstr "%s কে আপনার বন্ধুতালিকায় (%s) যোগ করতে ব্যর্থ।"
 
 #. TODO: Improve this! message to who or for what conference?
 #, c-format
 msgid "Unable to send message (%s)."
-msgstr "বার্তা (%s) পাঠাতে সমর্থ নয়।"
+msgstr "বার্তা (%s) পাঠাতে ব্যর্থ।"
 
 #, c-format
 msgid "Unable to invite user (%s)."
-msgstr "ব্যবহারকারীকে (%s) আমন্ত্রন জানাতে সমর্থ নয়।"
+msgstr "ব্যবহারকারীকে (%s) আমন্ত্রন জানাতে ব্যর্থ।"
 
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr "%s এ বার্তা পাঠাতে সমর্থ নয়। অধিবেশন (%s) তৈরি করতে পারে না। "
+msgstr "%s কে বার্তা পাঠাতে ব্যর্থ। অধিবেশন (%s) তৈরি করা সম্ভব হয়নি।"
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "বার্তা পাঠাতে সমর্থ নয়। অধিবেশন (%s) তৈরি করতে পারে না। "
+msgstr "বার্তা পাঠাতে ব্যর্থ। অধিবেশন (%s) তৈরি করা সম্ভব হয়নি।"
 
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"ব্যবহারকারী %s কে সার্ভারের পার্শ্বের তালিকার %s ফোল্ডারে সরিয়ে নিতে সমর্থ নয়। "
-"ফোল্ডার (%s) তৈরীর সময় ত্রুটি দেখা দিয়েছে।"
+"ব্যবহারকারী %1s কে সার্ভার প্রান্তের তালিকার %s ফোল্ডারে সরিয়ে নিতে ব্যর্থ। ফোল্ডার "
+"(%s) তৈরীর সময় ত্রুটি দেখা দিয়েছে।"
 
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"আপনার বন্ধু তালিকায় %s কে যোগ করতে ব্যর্থ। সার্ভারের পার্শ্বের তালিকায় (%s) ফোল্ডার "
+"আপনার বন্ধু তালিকায় %s কে যোগ করতে ব্যর্থ। সার্ভার প্রান্তের তালিকায় (%s) ফোল্ডার "
 "তৈরীর সময় ত্রুটি দেখা দিয়েছে।"
 
-# tithi
 #, c-format
 msgid "Could not get details for user %s (%s)."
-msgstr "%1s (%2s) ব্যবহারকারীর জন্য বিস্তারিত বর্ণনা পাবে না।"
+msgstr "%1$s (%2$s) ব্যবহারকারীর প্রোফাইল পাওয়া যায়নি।"
 
 # msgstr "ব্যবহারকারী %s এর বিবরন পাওয়া যাচ্ছে না"
 #, c-format
@@ -6390,19 +6482,19 @@ msgstr "অনুমোদিত তালিকায় (%s) %s যোগ ক�
 
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr "%s কে ব্যক্তিগত তালিকা (%s) থেকে মুছে ফেলতে সমর্থ হয়নি।"
+msgstr "%s কে ব্যক্তিগত তালিকা (%s) থেকে মুছে ফেলা সম্ভব হয়নি।"
 
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr "সার্ভার পার্শ্বের ব্যাক্তিগত বিন্যাসনসমূহ (%s) পরিবর্তন করতে সমর্থ হয়নি।"
+msgstr "সার্ভার প্রান্তের গোপনতা সেটিং (%s) পরিবর্তন করা সম্ভব হয়নি।"
 
 #, c-format
 msgid "Unable to create conference (%s)."
-msgstr "অধিবেশন (%s) শুরু করতে সমর্থ হয়নি।"
+msgstr "অধিবেশন (%s) শুরু করা সম্ভব হয়নি।"
 
 # tithi
 msgid "Error communicating with server. Closing connection."
-msgstr "সার্ভারের সঙ্গে যোগাযোগে ত্রুটি। সংযোগ বন্ধ করছে।"
+msgstr "সার্ভারের সঙ্গে যোগাযোগে ত্রুটি। সংযোগ বন্ধ করা হচ্ছে।"
 
 msgid "Telephone Number"
 msgstr "টেলিফোন নম্বর"
@@ -6410,12 +6502,11 @@ msgstr "টেলিফোন নম্বর"
 msgid "Personal Title"
 msgstr "ব্যক্তিগত শিরোনাম"
 
-# tithi
 msgid "Mailstop"
-msgstr "মেইল-বন্ধ"
+msgstr "মেইলস্টপ"
 
 msgid "User ID"
-msgstr "ব্যবহারকারী আইডি"
+msgstr "ব্যবহারকারী ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -6424,7 +6515,7 @@ msgstr "ব্যবহারকারী আইডি"
 #. }
 #.
 msgid "Full name"
-msgstr "সম্পূর্ন নাম"
+msgstr "পূর্ণ নাম"
 
 #, c-format
 msgid "GroupWise Conference %d"
@@ -6432,13 +6523,10 @@ msgstr "GroupWise অধিবেশন %d"
 
 # tithi
 msgid "Authenticating..."
-msgstr "প্রমাণীকরণ..."
-
-msgid "Unable to connect to server."
-msgstr "সার্ভারের সাথে সংযোগ স্থাপনে অসমর্থ।"
+msgstr "প্রমাণীকরণ করা হচ্ছে..."
 
 msgid "Waiting for response..."
-msgstr "উত্তরের জন্য অপেক্ষা করছে..."
+msgstr "উত্তরের জন্য অপেক্ষা করা হচ্ছে..."
 
 #, c-format
 msgid "%s has been invited to this conversation."
@@ -6454,33 +6542,25 @@ msgid ""
 "\n"
 "Sent: %s"
 msgstr ""
-"এর হতে আমন্ত্রণ: %1s \n"
+"এর থেকে আমন্ত্রণ: %1$s \n"
 "\n"
-"প্রেরিত: %2s"
+"প্রেরিত: %2$s"
 
 msgid "Would you like to join the conversation?"
 msgstr "আপনি কি কথোপকথনে অংশগ্রহন করতে ইচ্ছুক?"
 
 # tithi
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "আপনাকে প্রস্থান করছেন কারণ আপনি অন্য একটি ওয়ার্ক-ষ্টেশনে সংযুক্ত হয়েছেন।"
-
-# tithi
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
-msgstr "%s অফলাইনে উপস্থিত এবং আপনার প্রেরিত বার্তাটি গ্রহণ করেনি।"
+msgstr "%s অফলাইন এবং আপনার প্রেরিত বার্তাটি পায়নি।"
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
-"সার্ভারে সংযোগ দিতে অসমর্থ। অনুগ্রহ করে আপনি যে সার্ভারে সংযোগ দিতে চান সেই "
-"ঠিকানা প্রবেশ করান।"
-
-# tithi
-msgid "Error. SSL support is not installed."
-msgstr "ত্রুটি। SSL সমর্থন সংস্থাপিত নয়।"
+"সার্ভারে সংযোগ দিতে ব্যর্থ। অনুগ্রহ করে আপনি যে সার্ভারে সংযোগ দিতে চান তার ঠিকানা "
+"দিন।"
 
 # tithi
 msgid "This conference has been closed. No more messages can be sent."
@@ -6498,7 +6578,7 @@ msgstr "এই অধিবেশনটি বন্ধ করা হয়ে�
 #. *  summary
 #. *  description
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "নোভেল GroupWise বার্তাবাহক প্রোটোকল প্লাগইন"
+msgstr "Novell GroupWise Messenger প্রোটোকল প্লাগইন"
 
 msgid "Server address"
 msgstr "সার্ভারের ঠিকানা"
@@ -6506,25 +6586,33 @@ msgstr "সার্ভারের ঠিকানা"
 msgid "Server port"
 msgstr "সার্ভারের পোর্ট"
 
-msgid "Could not join chat room"
-msgstr "আড্ডার রুমে যুক্ত হতে পারেনি"
-
-msgid "Invalid chat room name"
-msgstr "অবৈধ আড্ডার রুমের নাম"
-
-msgid "Server closed the connection."
-msgstr "সার্ভার সংযোগটি বন্ধ করে দিয়েছে।"
+msgid "Received unexpected response from "
+msgstr "এটি থেকে অপ্রত্যাশিত উত্তর পাওয়া গেছে।"
 
-#, c-format
+# tithi
+#. username connecting too frequently
 msgid ""
-"Lost connection with server:\n"
-"%s"
+"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 ""
-"সার্ভারের সাথে সংযুক্ত হারিয়েছে:\n"
-"%s"
+"আপনি খুব ঘনঘন সংযোগ স্থাপন এবং বিচ্ছিন্ন করছেন। দশ মিনিট অপেক্ষা করে পুনরায় চেষ্টা "
+"করুন। আপনি যদি চেষ্টা অব্যাহত রাখতে চান, আপনাকে আরও বেশী অপেক্ষা করতে হবে।"
+
+#, c-format
+msgid "Error requesting "
+msgstr "অনুরোধ করতে ত্রুটি"
 
-msgid "Received invalid data on connection with server."
-msgstr "সার্ভারের সাথে সংযুক্ত অবস্থায় অবৈধ উপাত্ত গ্রহণ করেছে।"
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL এখানে আপনার স্ক্রিন নামের প্রমাণীকরণ অনুমোদন করে না।"
+
+msgid "Could not join chat room"
+msgstr "আড্ডার আসরে যুক্ত হওয়া সম্ভব হয়নি"
+
+msgid "Invalid chat room name"
+msgstr "অকার্যকর আড্ডার আসরের নাম"
+
+msgid "Received invalid data on connection with server"
+msgstr "সার্ভারের সাথে সংযোগের সময় অকার্যকর ডাটা গৃহীত হয়ে‌ছে"
 
 #. *< type
 #. *< ui_requirement
@@ -6537,7 +6625,7 @@ msgstr "সার্ভারের সাথে সংযুক্ত অবস
 #. *  summary
 #. *  description
 msgid "AIM Protocol Plugin"
-msgstr "এআইএম প্রোটোকল প্লাগইন"
+msgstr "AIM প্রোটোকল প্লাগইন"
 
 # tithi
 msgid "ICQ UIN..."
@@ -6554,14 +6642,14 @@ msgstr "ICQ UIN..."
 #. *  summary
 #. *  description
 msgid "ICQ Protocol Plugin"
-msgstr "আইসিকিউ প্রোটোকল প্লাগইন"
+msgstr "ICQ প্রোটোকল প্লাগইন"
 
 # tithi
 msgid "Encoding"
-msgstr "সঙ্কেতায়ন"
+msgstr "এনকোডিং"
 
 msgid "The remote user has closed the connection."
-msgstr "দূরবর্তী ব্যবহারকারী যোগাযোগটি বন্ধ করে দিয়েছে।"
+msgstr "দূরবর্তী ব্যবহারকারী সংযোগটি বন্ধ করে দিয়েছে।"
 
 msgid "The remote user has declined your request."
 msgstr "দূরবর্তী ব্যবহারকারী আপনার অনুরোধ অস্বীকার করেছে।"
@@ -6569,14 +6657,14 @@ msgstr "দূরবর্তী ব্যবহারকারী আপনা�
 # tithi
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
-msgstr "দূরবর্তী ব্যবহারকারীর সঙ্গে সংযোগ হারিয়েছে:<br>%s"
+msgstr "দূরবর্তী ব্যবহারকারীর সঙ্গে সংযোগ বিচ্ছিন্ন হয়েছে:<br>%s"
 
 # tithi
 msgid "Received invalid data on connection with remote user."
-msgstr "দূরবর্তী ব্যবহারকারীর সাথে সংযুক্ত অবস্থায় অবৈধ উপাত্ত গ্রহণ করেছে।"
+msgstr "দূরবর্তী ব্যবহারকারীর সাথে সংযোগের সময় অকার্যকর ডাটা গৃহীত হয়ে‌ছে।"
 
-msgid "Could not establish a connection with the remote user."
-msgstr "দূরবর্তী ব্য়বহারকারীর সাথে সংযোগ স্থাপন করতে পারেনি।"
+msgid "Unable to establish a connection with the remote user."
+msgstr "দূরবর্তী ব্যবহারকারীর সাথে সংযোগ স্থাপন করা সম্ভব হয়নি।"
 
 msgid "Direct IM established"
 msgstr "সরাসরি IM স্থাপন করা হয়েছে"
@@ -6587,31 +6675,31 @@ msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
 msgstr ""
-"%1s আপনাকে একটি %2s ফাইল পাঠাতে চেষ্টা করেছিল, কিন্তু আমরা সরাসরি IM এর ওপর "
-"শুধুমাত্র %3s পর্যন্ত ফাইল অনুমোদন করি।  বিকল্প হিসেবে ফাইল স্থানান্তর ব্যবহার করার "
-"চেষ্টা করুন।\n"
+"%1$s আপনাকে একটি %2$s ফাইল পাঠাতে চেষ্টা করেছিল, কিন্তু আমরা সরাসরি IM এ শুধুমাত্র "
+"%3$s পর্যন্ত ফাইল অনুমোদন করি। বিকল্প হিসেবে ফাইল স্থানান্তর ব্যবহার করার চেষ্টা "
+"করুন।\n"
 
 # tithi
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "ফাইল %1s হলো %2s, যা %3s এর সর্বোচ্চ আকার অপেক্ষা বৃহত্তর।"
+msgstr "ফাইল %1$s হলো %2$s, যা সর্বোচ্চ আকার %3$s থেকে বেশী।"
 
 msgid "Invalid error"
-msgstr "অবৈধ ত্রুটি"
+msgstr "অকার্যকর ত্রুটি"
 
 msgid "Invalid SNAC"
-msgstr "অবৈধ SNAC"
+msgstr "অকার্যকর SNAC"
 
 # tithi
 msgid "Rate to host"
-msgstr "হোস্টের হার"
+msgstr "হোস্টে পাঠানোর হার"
 
 # tithi
 msgid "Rate to client"
-msgstr "গ্রাহকের হার"
+msgstr "ক্লায়েন্টে পাঠানোর হার"
 
 msgid "Service unavailable"
-msgstr "সেবা অপ্রাপ্য"
+msgstr "সার্ভিস বিদ্যমান নয়"
 
 # tithi
 msgid "Service not defined"
@@ -6627,26 +6715,26 @@ msgstr "হোস্ট দ্বারা সমর্থিত নয়"
 
 # tithi
 msgid "Not supported by client"
-msgstr "গ্রাহক দ্বারা সমর্থিত নয়"
+msgstr "ক্লায়েন্ট দ্বারা সমর্থিত নয়"
 
 # tithi
 msgid "Refused by client"
-msgstr "গ্রাহক দ্বারা অস্বীকৃত"
+msgstr "ক্লায়েন্ট দ্বারা প্রত্যাখ্যাত"
 
 # tithi
 msgid "Reply too big"
-msgstr "উত্তর অনেক বেশি বড়"
+msgstr "অতিরিক্ত বড় উত্তর"
 
 # tithi
 msgid "Responses lost"
-msgstr "সাড়াসমূহ হারিয়েছে"
+msgstr "প্রতিক্রিয়া হারিয়ে গেছে"
 
 msgid "Request denied"
-msgstr "অনুরোধ প্রত্যাখ্যান করা হয়েছে"
+msgstr "অনুরোধ প্রত্যাখ্যাত"
 
 # tithi
 msgid "Busted SNAC payload"
-msgstr "বাস্টেড SNAC পেলোড"
+msgstr "ব্যর্থ SNAC পেলোড"
 
 # tithi
 msgid "Insufficient rights"
@@ -6654,7 +6742,7 @@ msgstr "অপর্যাপ্ত অধিকার"
 
 # tithi
 msgid "In local permit/deny"
-msgstr "স্থানীয় অনুমতি/অস্বীকার এ"
+msgstr "স্থানীয় অনুমতি/অস্বীকারে"
 
 # tithi
 msgid "Warning level too high (sender)"
@@ -6666,7 +6754,7 @@ msgstr "সতর্কতা স্তর খুব উচ্চ (গ্রা�
 
 # tithi
 msgid "User temporarily unavailable"
-msgstr "ব্যবহারকারী সাময়িকভাবে অপ্রাপ্য"
+msgstr "ব্যবহারকারীকে সাময়িকভাবে পাওয়া যায়না"
 
 # tithi
 msgid "No match"
@@ -6674,18 +6762,17 @@ msgstr "কোনো মিল নেই"
 
 # tithi
 msgid "List overflow"
-msgstr "তালিকা অতিরিক্ত"
+msgstr "লিস্ট ওভার‌ফ্লো"
 
 msgid "Request ambiguous"
 msgstr "অনুরোধ অস্পষ্ট"
 
 # tithi
 msgid "Queue full"
-msgstr "সারি পূর্ণ"
+msgstr "কিউ পরিপূর্ণ"
 
-# tithi
 msgid "Not while on AOL"
-msgstr "এই সময়ে AOL এ নেই"
+msgstr "AOL এ থাকা অবস্থায় নয়"
 
 # tithi
 msgid ""
@@ -6694,10 +6781,9 @@ msgid ""
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
-"(এই বার্তাটি গ্রহণে একটি ত্রুটি ছিল।  আপনি যে বন্ধুর সঙ্গে কথা বলছেন সে সম্ভবত "
-"প্রত্যাশার চেয়ে ভিন্ন একটি সঙ্কেতায়ন ব্যবহার করছে।  যদি আপনি জানেন যে সে কি "
-"সঙ্কেতায়ন ব্যবহার করছে, আপনি আপনার AIM/ICQ একাউন্টের জন্য এটা উন্নততর একাউন্ট "
-"পছন্দসমূহে উল্লেখ করতে পারেন।)"
+"(এই বার্তাটি গ্রহণে ত্রুটি হয়েছে। আপনি যে বন্ধুর সঙ্গে কথা বলছেন তিনি সম্ভবত ভিন্ন "
+"একটি এনকোডিং ব্যবহার করছেন। যদি আপনি জানেন তিনি কি এনকোডিং ব্যবহার করছেন, আপনি "
+"আপনার AIM/ICQ একাউন্টের উচ্চপর্যায়ের অপশনে তা উল্লেখ করতে পারেন।)"
 
 # tithi
 #, c-format
@@ -6705,8 +6791,8 @@ msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"(এই বার্তাটি গ্রহণে একটি ত্রুটি ছিল।  হয় আপনার এবং %s এর পৃথক সঙ্কেতায়ন নির্বাচিত "
-"আছে, বা %s এর একটি ত্রুটিপূর্ণ গ্রাহক রয়েছে।)"
+"(এই বার্তাটি গ্রহণে একটি ত্রুটি হয়েছে। হয় আপনার এবং %s এর পৃথক এনকোডিং নির্বাচিত "
+"আছে, বা %s এর ক্লায়েন্টটি ত্রুটিপূর্ণ।)"
 
 #. Label
 msgid "Buddy Icon"
@@ -6721,16 +6807,16 @@ msgid "AIM Direct IM"
 msgstr "AIM সরাসরি IM"
 
 msgid "Get File"
-msgstr "ফাইল গ্রহণ করুন"
+msgstr "ফাইল সংগ্রহ"
 
 msgid "Games"
 msgstr "খেলা"
 
 msgid "Add-Ins"
-msgstr "অন্তর্যোগসমূহ"
+msgstr "এ্যাড-ইন"
 
 msgid "Send Buddy List"
-msgstr "বন্ধু তালিকা পাঠান"
+msgstr "বন্ধু তালিকা প্রেরণ করা হবে"
 
 msgid "ICQ Direct Connect"
 msgstr "ICQ সরাসরি সংযোগ"
@@ -6742,13 +6828,12 @@ msgstr "AP ব্যবহারকারী"
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-# tithi
 msgid "Nihilist"
 msgstr "নাস্তিবাদী"
 
 # tithi
 msgid "ICQ Server Relay"
-msgstr "ICQ সার্ভার সম্প্রচার"
+msgstr "ICQ সার্ভার রিলে"
 
 # tithi
 msgid "Old ICQ UTF8"
@@ -6756,7 +6841,7 @@ msgstr "পুরাতন ICQ UTF8"
 
 # tithi
 msgid "Trillian Encryption"
-msgstr "ট্রিলিয়ন সঙ্কেতায়ন"
+msgstr "Trillian এনক্রিপশন"
 
 # tithi
 msgid "ICQ UTF8"
@@ -6766,13 +6851,13 @@ msgid "Hiptop"
 msgstr "হিপটপ"
 
 msgid "Security Enabled"
-msgstr "নিরাপত্তা সক্রিয়কৃত"
+msgstr "নিরাপত্তা সক্রিয়"
 
 msgid "Video Chat"
 msgstr "ভিডিও আড্ডা"
 
 msgid "iChat AV"
-msgstr "আইআড্ডা AV"
+msgstr "iChat AV"
 
 # tithi
 msgid "Live Video"
@@ -6786,14 +6871,14 @@ msgstr "স্ক্রীন শেয়ারকরণ"
 
 # tithi
 msgid "Free For Chat"
-msgstr "আড্ডার জন্য মুক্ত"
+msgstr "মোটেই ব্যস্ত নয়, আড্ডা দেয়া যায়"
 
 msgid "Not Available"
-msgstr "বিদ্যমান নেই "
+msgstr "অনুপস্থিত"
 
 # tithi
 msgid "Occupied"
-msgstr "অধিষ্টিত"
+msgstr "ব্যস্ত"
 
 # tithi
 msgid "Web Aware"
@@ -6803,7 +6888,7 @@ msgid "Invisible"
 msgstr "অদৃশ্য"
 
 msgid "IP Address"
-msgstr "আইপি ঠিকানা"
+msgstr "IP ঠিকানা"
 
 # tithi
 msgid "Warning Level"
@@ -6814,20 +6899,12 @@ msgstr "বন্ধুর মন্তব্য"
 
 # fix me tithi
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"প্রমাণীকরণ সাথে সংযুক্ত করা যায়নি:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "প্রমাণীকরণ সার্ভারের সাথে সংযোগ স্থাপন করা সম্ভব হয়নি: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS সার্ভারের সাথে সংযুক্ত করা যায়নি:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "BOS সার্ভারের সাথে সংযোগ স্থাপনে ব্যর্থ: %s"
 
 msgid "Username sent"
 msgstr "ব্যবহারকারীর-নাম পাঠানো হয়েছে"
@@ -6844,112 +6921,88 @@ msgstr "সংযোগ চূড়ান্ত করা হচ্ছে"
 # tithi
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"লগইন করতে অক্ষম: ব্যবহারকারীর-নাম অবৈধ থাকার কারণে %s হিসেবে যুক্ত হতে পারেন না। "
-"ব্যবহারকারীর অবশ্যই একটি বৈধ ই-মেইল ঠিকানা থাকতে হবে, বা একটি বর্ণ দ্বারা শুরু হবে "
-"এবং শুধুমাত্র বর্ণ, সংখ্যা এবং স্পেস ধারণ করবে, বা শুধুমাত্র সংখ্যা ধারণ করবে।"
+"ব্যবহারকারীর নাম অকার্যকর থাকার কারণে %s হিসেবে লগইন করা সম্ভব হয়নি। "
+"ব্যবহারকারীর নাম অবশ্যই একটি কার্যকর ইমেইল ঠিকানা হতে হবে, বা একটি বর্ণ দ্বারা শুরু "
+"হলে, শুধুমাত্র বর্ণ, সংখ্যা এবং স্পেস দ্বারা গঠিত হবে, বা শুধুমাত্র সংখ্যা দ্বারা গঠিত "
+"হবে।"
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "অবৈধ ব্যবহারকারীর নাম।"
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "আপনি সাময়িকভাবে বিচ্ছিন্ন হতে পারেন। হালানাগাদের জন্য %s পরীক্ষা করুন."
 
-msgid "Incorrect password."
-msgstr "ভুল গুপ্তসংকেত।"
+msgid "Unable to get a valid AIM login hash."
+msgstr "একটি কার্যকর AIM লগইন হ্যাশ পেতে ব্যর্থ।"
+
+msgid "Unable to get a valid login hash."
+msgstr "একটি কার্যকর লগইন হ্যাশ পেতে ব্যর্থ।"
+
+msgid "Received authorization"
+msgstr "অনুমোদন গৃহীত হয়েছে"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "ব্যবহারকারীর নাম বিদ্যমান নয়"
 
 # tithi
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "আপনার একাউন্টটি বর্তমানে স্থগিত।"
+msgid "Your account is currently suspended"
+msgstr "আপনার একাউন্টটি সাময়িকভাবে বরখাস্ত করা হয়েছে"
 
 # tithi
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "AOL তাৎক্ষণিক বার্তাবাহক সার্ভিস সাময়িকভাবে অপ্রাপ্য।"
-
-# tithi
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"আপনি খুব ঘনঘন সংযোগ করছেন এবং সংযোগ বিচ্ছিন্ন করছেন। দশ মিনিট অপেক্ষা করুন এবং "
-"পুনরায় চেষ্টা করুন। আপনি যদি চেষ্টা অব্যাহত রাখতে চান, আপনাকে আরও বেশী অপেক্ষা "
-"করতে হবে।"
+msgstr "AOL তাৎক্ষণিক বার্তাবাহক সার্ভিস সাময়িকভাবে পাওয়া যায়না।"
 
 # tithi
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "আপনার ব্যবহৃত গ্রাহক সংস্করণ খুব পুরনো। অনুগ্রহ করে %s এ উন্নততর করুন"
-
-msgid "Could Not Connect"
-msgstr "সংযোগ দিতে পারে না"
+msgstr "আপনার ব্যবহৃত ক্লায়েন্ট সংস্করণটি খুব পুরনো। অনুগ্রহ করে %s এ হালনাহাদ করুন"
 
 # tithi
-msgid "Received authorization"
-msgstr "গৃহীত অনুমোদন প্রাপ্ত"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"আপনি খুব ঘনঘন সংযোগ স্থাপন এবং বিচ্ছিন্ন করছেন। কিছুক্ষন অপেক্ষা করে পুনরায় চেষ্টা "
+"করুন। আপনি যদি চেষ্টা অব্যাহত রাখতে চান, আপনাকে আরও বেশী সময় অপেক্ষা করতে হবে।"
 
 # tithi
-msgid "The SecurID key entered is invalid."
-msgstr "অবৈধ নিরাপদ-আইডি কী প্রবেশ করা হয়েছে।"
+msgid "The SecurID key entered is invalid"
+msgstr "অকার্যকর SecurID কী দেয়া হয়েছে"
 
 # tithi
 msgid "Enter SecurID"
-msgstr "নিরাপদ-আইডি প্রবেশ করান"
+msgstr "SecurID দিন"
 
 # tithi
 msgid "Enter the 6 digit number from the digital display."
-msgstr "ডিজিটাল প্রদর্শন থেকে ৬ ডিজিটের সংখ্যা প্রবেশ করান।"
-
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "ঠিক আছে (_O)"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "আপনি সাময়িকভাবে বিচ্ছিন্ন থাকতে পারেন।  হালনাগাদের জন্য %s পরীক্ষা করুন."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "একটি বৈধ AIM লগইন হ্যাশ পেতে ব্যর্থ।"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "আপনি সাময়িকভাবে বিচ্ছিন্ন থাকতে পারেন।  হালনাগাদের জন্য %s পরীক্ষা করুন।"
-
-msgid "Unable to get a valid login hash."
-msgstr "একটি বৈধ লগইন হ্যাশ পেতে ব্যর্থ।"
+msgstr "ডিজিটাল ডিসপ্লে থেকে ৬ ডিজিটের সংখ্যাটি দিন।"
 
 msgid "Password sent"
-msgstr "গুপ্তসঙ্কেত পাঠানো হয়েছে"
+msgstr "পাসওয়ার্ড পাঠানো হয়েছে"
 
 msgid "Unable to initialize connection"
-msgstr "সংযোগ প্রস্তুত করতে ব্যর্থ"
+msgstr "সংযোগ আরম্ভ করতে ব্যর্থ"
 
 # tithi
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "অনুগ্রহ করে আমাকে অনুমোদন দিন যেন আমি আপনাকে আমার বন্ধু তালিকায় যুক্ত করতে পারি।"
 
-# tithi
-msgid "Authorization Request Message:"
-msgstr "প্রাপ্তাধিকার অনুরোধ বার্তা:"
-
-# tithi
-msgid "Please authorize me!"
-msgstr "অনুগ্রহ করে আমাকে অনুমোদন দিন!"
-
 msgid "No reason given."
 msgstr "কোনো কারন দর্শানো হয়নি।"
 
 # tithi
 msgid "Authorization Denied Message:"
-msgstr "প্রাপ্তাধিকার অগ্রাহ্য বার্তা:"
+msgstr "অনুমোদন প্রত্যাখ্যান:"
 
 # tithi
 #, c-format
@@ -6958,20 +7011,19 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"ব্যবহারকারী %1u নিম্নলিখিত কারণের জন্য আপনার বন্ধু তালিকাতে তাদেরকে যোগ করতে "
-"আপনার অনুরোধ অস্বীকার করেছে: \n"
-"%2s"
+"ব্যবহারকারী %1$u নিম্নলিখিত কারণে আপনার বন্ধু তালিকাতে তাদেরকে যোগ করার অনুরোধ "
+"প্রত্যাখ্যান করেছে: \n"
+"%2$s"
 
 # tithi
 msgid "ICQ authorization denied."
-msgstr "ICQ প্রাপ্তাধিকার অগ্রাহ্য।"
+msgstr "ICQ অনুমোদন প্রত্যাখ্যাত।"
 
 # tithi
 #. Someone has granted you authorization
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr ""
-"%u ব্যবহারকারী আপনার বন্ধু তালিকাতে তাদেরকে যোগ করতে আপনার অনুরোধ গ্রহণ করেছে।"
+msgstr "%u ব্যবহারকারী আপনার বন্ধু তালিকাতে তাদেরকে যোগ করার অনুরোধ গ্রহণ করেছে।"
 
 # tithi
 #, c-format
@@ -6983,8 +7035,8 @@ msgid ""
 msgstr ""
 "আপনি একটি বিশেষ বার্তা গ্রহণ করেছেন\n"
 "\n"
-"হতে: %1s [%2s]\n"
-"%3s "
+"প্রেরক: %1$s [%2$s]\n"
+"%3$s "
 
 # tithi
 #, c-format
@@ -6994,10 +7046,10 @@ msgid ""
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"আপনি একটি ICQ পৃষ্টা গ্রহণ করেছেন\n"
+"আপনি একটি ICQ পেইজ গ্রহণ করেছেন\n"
 "\n"
-"হতে: %1s [%2s]\n"
-"%3s"
+"প্রেরক: %1$s [%2$s]\n"
+"%3$s"
 
 # tithi
 #, c-format
@@ -7007,37 +7059,37 @@ msgid ""
 "Message is:\n"
 "%s"
 msgstr ""
-"আপনি %1s [%2s] থেকে একটি ICQ ই-মেইল গ্রহণ করেছেন\n"
+"আপনি %1$s [%2$s] থেকে একটি ICQ ইমেইল গ্রহণ করেছেন\n"
 " \n"
 "বার্তাটি হল:\n"
-"%3s"
+"%3$s"
 
 # tithi
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "ICQ %1u ব্যবহারকারী আপনাকে একটি বন্ধু পাঠিয়েছে: %2s (%3s)"
+msgstr "ICQ %1$u ব্যবহারকারী আপনাকে একটি বন্ধু পাঠিয়েছে: %2$s (%3$s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "আপনি কি এই বন্ধুকে আপনার বন্ধু তালিকায় যোগ করতে চান?"
 
 msgid "_Add"
-msgstr "যোগ করুন (_A)"
+msgstr "যোগ (_A)"
 
 msgid "_Decline"
-msgstr "প্রত্যাখান করুন (_D)"
+msgstr "প্রত্যাখান (_D)"
 
 # tithi
 #, 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] "আপনি %2$s এর %1$hu বার্তাটি হারিয়েছেন কারণ এটি অবৈধ ছিল।"
-msgstr[1] "আপনি %2$s এর %1$hu বার্তাসমূহ হারিয়েছেন কারণ এটি অবৈধ ছিল।"
+msgstr[0] "আপনি %2$s এর %1$huটি বার্তা হারিয়েছেন কারণ এটি অকার্যকর ছিল।"
+msgstr[1] "আপনি %2$s এর %1$huটি বার্তা হারিয়েছেন কারণ এটি অকার্যকর ছিল।"
 
 #, 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] "আপনি %1hu বার্তাটি %2s হতে  হারিয়েছেন কারণ এটি অনেক বড় ছিল।"
-msgstr[1] "আপনি %1hu বার্তাসমূহ %2s হতে  হারিয়েছেন কারণ তারা অনেক বড় ছিল।"
+msgstr[0] "আপনি %2$s থেকে %1$huটি বার্তা হারিয়েছেন কারণ এটি অনেক বড় ছিল।"
+msgstr[1] "আপনি %2$s থেকে %1$huটি বার্তা হারিয়েছেন কারণ তা অনেক বড় ছিল।"
 
 # tithi
 #, c-format
@@ -7046,9 +7098,9 @@ msgid ""
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
-"আপনি %1hu বার্তাটি  %2s হতে হারিয়েছেন কারণ হারের সীমা অতিক্রম করা হয়েছিল।"
+"আপনি %2$s থেকে %1$huটি বার্তা হারিয়েছেন কারণ হারের সীমা অতিক্রান্ত হয়েছিল।"
 msgstr[1] ""
-"আপনি %1hu বার্তাসমূহ %2s হতে  হারিয়েছেন কারণ হারের সীমা অতিক্রম করা হয়েছিল।"
+"%2$s থেকে আপনি %1$huটি বার্তা হারিয়েছেন কারণ হারের সীমা অতিক্রান্ত হয়েছিল।"
 
 # fix me tithi
 #, c-format
@@ -7056,38 +7108,38 @@ msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "আপনি %1hu বার্তাটি %2s হতে হারিয়েছেন কারণ তার সতর্কতা স্তর খুব উচ্চ।"
-msgstr[1] "আপনি %1hu বার্তাসমূহ %2s হতে হারিয়েছেন কারণ তার সতর্কতা স্তর খুব উচ্চ।"
+msgstr[0] "আপনি %2$s থেকে %1$huটি বার্তা হারিয়েছেন কারণ তার সতর্কতা স্তর খুব উঁচু।"
+msgstr[1] "আপনি %2$s থেকে %1$huটি বার্তা হারিয়েছেন কারণ তার সতর্কতা স্তর খুব উঁচু।"
 
 # fix me tithi
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "আপনি %1hu বার্তাটি %2s হতে হারিয়েছেন কারণ আপনার সতর্কতা স্তর খুব উচ্চ।"
-msgstr[1] "আপনি %1hu বার্তাসমূহ %2s হতে হারিয়েছেন কারণ আপনার সতর্কতা স্তর খুব উচ্চ।"
+msgstr[0] "আপনি %2$s থেকে %1$huটি বার্তা হারিয়েছেন কারণ আপনার সতর্কতা স্তর খুব উঁচু।"
+msgstr[1] "আপনি %2$s থেকে %1$huটি বার্তা হারিয়েছেন কারণ আপনার সতর্কতা স্তর খুব উঁচু।"
 
 #, 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] "আপনি অজ্ঞাত কারণে %1hu বার্তাটি %2s হতে হারিয়েছেন।"
-msgstr[1] "আপনি অজ্ঞাত কারণে %1hu বার্তাসমূহ %2s হতে হারিয়েছেন।"
+msgstr[0] "আপনি অজ্ঞাত কারণে %2$s থেকে %1$huটি বার্তা হারিয়েছেন।"
+msgstr[1] "আপনি অজ্ঞাত কারণে %2$s থেকে %1$huটি বার্তা হারিয়েছেন।"
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
-msgstr "বার্তা পাঠানো অসমর্থ: %s।"
+msgstr "বার্তা পাঠাতে ব্যর্থ: %s।"
 
 msgid "Unknown reason."
 msgstr "অজ্ঞাত কারণ।"
 
 #, c-format
 msgid "Unable to send message to %s:"
-msgstr "%s এ বার্তা পাঠাতে সমর্থ নয়:"
+msgstr "%s এ বার্তা পাঠাতে ব্যর্থ:"
 
 #, c-format
 msgid "User information not available: %s"
-msgstr "ব্যবহারকারীর তথ্য সহজলভ্য় নয়: %s"
+msgstr "ব্যবহারকারীর তথ্য পাওয়া যাচ্ছে না: %s"
 
 msgid "Online Since"
 msgstr "যখন থেকে অনলাইনে"
@@ -7096,12 +7148,16 @@ msgstr "যখন থেকে অনলাইনে"
 msgid "Member Since"
 msgstr "যখন থেকে সদস্য"
 
+# tithi
+msgid "Capabilities"
+msgstr "ক্ষমতা"
+
 msgid "Profile"
 msgstr "প্রোফাইল"
 
 # tithi
 msgid "Your AIM connection may be lost."
-msgstr "আপনার AIM সংযোগ হয়ত নষ্ট হয়ে গেছে।"
+msgstr "আপনার AIM সংযোগ হয়তো বিচ্ছিন্ন হয়েছে।"
 
 # tithi
 #. The conversion failed!
@@ -7109,20 +7165,19 @@ msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
-"[এই ব্যবহারকারী থেকে একটি বার্তা প্রদর্শন করতে অক্ষম কারণ এটি অবৈধ বর্ণচিহ্ন ধারণ "
-"করেছিল।]"
+"[এই ব্যবহারকারী থেকে একটি বার্তা প্রদর্শন করতে ব্যর্থ কারণ এটি অকার্যকর বর্ণচিহ্ন "
+"ধারণ করেছিল।]"
 
-# tithi
 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 ""
-"আপনি সর্বশেষ যে কার্যটে চেষ্টা করেছেন তা সম্পাদন করা যায়নি কারণ আপনি হারের সীমা "
-"অতিক্রম করেছেন। অনুগ্রহ করে ১০ সেকেন্ড অপেক্ষা করুন এবং পুনরায় চেষ্টা করুন।"
+"আপনি সর্বশেষ যে কাজটি করার চেষ্টা করেছেন তা সম্পাদন করা যায়নি কারণ আপনি দ্রুততার "
+"সীমা অতিক্রম করেছেন। অনুগ্রহ করে ১০ সেকেন্ড অপেক্ষা করুন এবং পুনরায় চেষ্টা করুন।"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "আপনাকে %s আড্ডার রুম থেকে বিচ্ছিন্ন করা হয়েছে।"
+msgstr "আপনাকে %s আড্ডার আসর থেকে বিচ্ছিন্ন করা হয়েছে।"
 
 # tithi
 msgid "Mobile Phone"
@@ -7130,7 +7185,7 @@ msgstr "মোবাইল ফোন"
 
 # tithi
 msgid "Personal Web Page"
-msgstr "ব্যক্তিগত ওয়েব পেজ"
+msgstr "ব্যক্তিগত ওয়েব পেইজ"
 
 #. aim_userinfo_t
 #. strip_html_tags
@@ -7153,7 +7208,7 @@ msgstr "অবস্থান"
 
 # tithi
 msgid "Web Page"
-msgstr "ওয়েব পেজ"
+msgstr "ওয়েব পেইজ"
 
 msgid "Pop-Up Message"
 msgstr "পপ-আপ বার্তা"
@@ -7162,17 +7217,17 @@ msgstr "পপ-আপ বার্তা"
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] "নিম্নবর্ণিত ব্যবহারকারীর-নাম %s এর সাথে সম্পর্কিত"
-msgstr[1] "নিম্নবর্ণিত ব্যবহারকারীর-নামসমূহ  %s এর সাথে সম্পর্কিত"
+msgstr[1] "নিম্নবর্ণিত ব্যবহারকারীর-নাম %s এর সাথে সম্পর্কিত"
 
 # tithi
 #, c-format
 msgid "No results found for email address %s"
-msgstr "%s ই-মেইল ঠিকানার জন্য কোনো ফলাফল খুঁজে পায়নি"
+msgstr "%s ইমেইল ঠিকানার জন্য কোনো ফলাফল খুঁজে পায়নি"
 
 # tithi
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "আপনি %s নিশ্চিত করতে একটি ই-মেইল গ্রহণ করবেন।"
+msgstr "আপনি %s নিশ্চিত করতে একটি ইমেইল গ্রহণ করবেন।"
 
 # tithi
 msgid "Account Confirmation Requested"
@@ -7184,13 +7239,13 @@ msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
-"ত্রুটি 0x%04x: ব্যবহারকারীর নাম বিন্যাস করতে অক্ষম কারণ অনুরোধকৃত নাম মূল নাম থেকে "
+"ত্রুটি 0x%04x: ব্যবহারকারীর নাম বিন্যাস করতে ব্যর্থ কারণ অনুরোধকৃত নাম মূল নাম থেকে "
 "ভিন্ন।"
 
 # tithi
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
-msgstr "ত্রুটি 0x%04x: ব্যবহারকারীর নাম বিন্যাস করতে অক্ষম কারণ এটি অবৈধ।"
+msgstr "ত্রুটি 0x%04x: ব্যবহারকারীর নাম বিন্যাস করতে ব্যর্থ কারণ এটি অকার্যকর।"
 
 # tithi
 #, c-format
@@ -7198,7 +7253,7 @@ msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr ""
-"ত্রুটি 0x%04x: ব্যবহারকারীর নাম বিন্যাস করতে অক্ষম কারণ অনুরোধকৃত নাম খুব দীর্ঘ।"
+"ত্রুটি 0x%04x: ব্যবহারকারীর নাম বিন্যাস করতে ব্যর্থ কারণ অনুরোধকৃত নাম খুব দীর্ঘ।"
 
 # tithi
 #, c-format
@@ -7206,8 +7261,8 @@ msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"ত্রুটি 0x%04x: ই-মেইল ঠিকানা পরিবর্তন করতে অক্ষম কারণ এই ব্যবহারকারীর নামটির জন্য "
-"ইতোমধ্যে একটি অনুরোধ অমীমাংসিত রয়েছে।"
+"ত্রুটি 0x%04x: ইমেইল ঠিকানা পরিবর্তন করতে ব্যর্থ কারণ এই ব্যবহারকারীর নামটির জন্য "
+"ইতিমধ্যে একটি অনুরোধ অমীমাংসিত রয়েছে।"
 
 # tithi
 #, c-format
@@ -7215,7 +7270,7 @@ msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"ত্রুটি 0x%04x: ই-মেইল ঠিকানা পরিবর্তন করতে অক্ষম কারণ প্রদত্ত ঠিকানার সাথে সম্পর্কিত "
+"ত্রুটি 0x%04x: ইমেইল ঠিকানা পরিবর্তন করতে ব্যর্থ কারণ প্রদত্ত ঠিকানার সাথে সম্পর্কিত "
 "অনেক বেশি ব্যবহারকারী নাম রয়েছে।"
 
 # tithi
@@ -7223,7 +7278,7 @@ msgstr ""
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
-msgstr "ত্রুটি 0x%04x: ই-মেইল ঠিকানা পরিবর্তন করতে অক্ষম কারণ প্রদত্ত ঠিকানা অবৈধ।"
+msgstr "ত্রুটি 0x%04x: ইমেইল ঠিকানা পরিবর্তন করতে ব্যর্থ কারণ প্রদত্ত ঠিকানা অকার্যকর।"
 
 # tithi
 #, c-format
@@ -7237,7 +7292,7 @@ msgstr "একাউন্ট তথ্য পরিবর্তনের ত্
 # tithi
 #, c-format
 msgid "The email address for %s is %s"
-msgstr "%1s এর ই-মেইল ঠিকানা %2s"
+msgstr "%1$s এর ইমেইল ঠিকানা %2$s"
 
 msgid "Account Info"
 msgstr "একাউন্ট তথ্য"
@@ -7257,9 +7312,9 @@ msgid ""
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-"আপনি সম্ভবত লগইন পদ্ধতি সম্পন্ন হওয়ার পূর্বে আপনার বৃত্তান্ত নির্ধারণ করার অনুরোধ "
+"আপনি সম্ভবত লগইন পদ্ধতি সম্পন্ন হওয়ার পূর্বে আপনার প্রোফাইল নির্ধারণ করার অনুরোধ "
 "করেছেন।  আপনার বৃত্তান্ত অবিন্যাসিত আছে; এটি পুনরায় বিন্যাস করার চেষ্টা করুন যখন "
-"আপনাকে সম্পূর্ণভাবে সংযুক্ত।"
+"আপনি সম্পূর্ণভাবে সংযুক্ত।"
 
 # tithi
 #, c-format
@@ -7270,8 +7325,7 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"%d বাইটের সর্বোচ্চ বৃত্তান্ত দৈর্ঘ্য অতিক্রম করা হয়েছে।  এটা আপনার জন্য হ্রাস করা "
-"হয়েছে।"
+"%d বাইটের সর্বোচ্চ বৃত্তান্ত দৈর্ঘ্য অতিক্রম করা হয়েছে। এটা আপনার জন্য হ্রাস করা হয়েছে।"
 msgstr[1] ""
 "%d গুলো বাইটের সর্বোচ্চ বৃত্তান্ত দৈর্ঘ্য অতিক্রম করা হয়েছে।  এটা আপনার জন্য হ্রাস করা "
 "হয়েছে।"
@@ -7289,37 +7343,34 @@ msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"সর্বোচ্চ %d বাইট দৈর্ঘ্যের বার্তা অতিক্রম করা হয়েছে।  আপনার জন্য এটা হ্রাস করা হয়েছে।"
+"বার্তার সর্বোচ্চ দৈর্ঘ্যে %d বাইট অতিক্রম করা হয়েছে। আপনার জন্য এটা ছেঁটে দেয়া হয়েছে।"
 msgstr[1] ""
-"সর্বোচ্চ %d বাইট দৈর্ঘ্যের বার্তা অতিক্রম করা হয়েছে।  আপনার জন্য এটা হ্রাস করা হয়েছে।"
+"বার্তার সর্বোচ্চ দৈর্ঘ্যে %d বাইট অতিক্রম করা হয়েছে। আপনার জন্য এটা ছেঁটে দেয়া হয়েছে।"
 
 msgid "Away message too long."
-msgstr "দূরের বার্তাটি খুব দীর্ঘ।"
+msgstr "অন্যত্র অবস্থার বার্তাটি খুব দীর্ঘ।"
 
 # tithi
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"%s বন্ধু যোগ করতে পারেনি কারণ ব্যবহারকারীর নাম অবৈধ।  ব্যবহারকারীর অবশ্যই একটি "
-"বৈধ ই-মেইল ঠিকানা থাকতে হবে, বা একটি বর্ণ দ্বারা শুরু হবে এবং শুধুমাত্র বর্ণ, সংখ্যা "
-"এবং স্পেস ধারণ করবে, বা শুধুমাত্র সংখ্যা ধারণ করবে।"
-
-msgid "Unable to Add"
-msgstr "যোগ করতে সমর্থ নয়"
+"বন্ধু %s কে যোগ করা সম্ভব হয়নি কারণ ব্যবহারকারীর নামটি অকার্যকর। ব্যবহারকারী নাম "
+"অবশ্যই একটি কার্যকর ইমেইল ঠিকানা হতে হবে, বা একটি বর্ণ দ্বারা শুরু হবে এবং শুধুমাত্র "
+"বর্ণ, সংখ্যা এবং স্পেস ধারণ করবে, বা শুধুমাত্র সংখ্যা ধারণ করবে।"
 
 msgid "Unable to Retrieve Buddy List"
-msgstr "বন্ধু তালিকা উদ্ধার করতে সমর্থ নয়"
+msgstr "বন্ধু তালিকা উদ্ধার করতে ব্যর্থ"
 
 # tithi
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
 msgstr ""
-"আপনার বন্ধু তালিকা পাঠাতে AIM সার্ভার সাময়িকভাবে অক্ষম ছিল।  আপনার বন্ধু তালিকা "
-"নষ্ট হয়নি, এবং সম্ভবত কয়েক মিনিটের মধ্যে সহজলভ্য হবে।"
+"আপনার বন্ধু তালিকা পাঠাতে AIM সার্ভার সাময়িকভাবে ব্যর্থ ছিল।  আপনার বন্ধু তালিকা "
+"নষ্ট হয়নি, এবং সম্ভবত কয়েক মিনিটের মধ্যে পাওয়া যাবে।"
 
 # tithi
 msgid "Orphans"
@@ -7328,19 +7379,19 @@ msgstr "অনাথ"
 # tithi
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"আপনার বন্ধু তালিকাতে খুব বেশি বন্ধু থাকার কারণে %s বন্ধু যোগ করতে পারে না। অনুগ্রহ "
-"করে একজনকে অপসারণ করুন এবং পুনরায় চেষ্টা করুন।"
+"আপনার বন্ধু তালিকাতে খুব বেশি বন্ধু থাকার কারণে বন্ধু %s কে যোগ করা সম্ভব হয়নি। "
+"অনুগ্রহ করে একজনকে অপসারণ করুন এবং পুনরায় চেষ্টা করুন।"
 
 # tithi
 msgid "(no name)"
 msgstr "(কোনো নাম নেই)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr "একটি অজানা কারণে %s বন্ধুকে যুক্ত করা যায়নি।"
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "একটি অজানা কারণে বন্ধু %s কে যুক্ত করা যায়নি।"
 
 #, c-format
 msgid ""
@@ -7352,7 +7403,7 @@ msgstr ""
 
 # tithi
 msgid "Authorization Given"
-msgstr "প্রাপ্তাধিকার দেওয়া হয়েছে"
+msgstr "অনুমোদন দেয়া হয়েছে"
 
 # tithi
 #. Granted
@@ -7363,7 +7414,7 @@ msgstr ""
 
 # tithi
 msgid "Authorization Granted"
-msgstr "প্রাপ্তাধিকার গ্রহণ করা হয়েছে"
+msgstr "অনুমোদন দেয়া হয়েছে"
 
 # tithi
 #. Denied
@@ -7373,26 +7424,25 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"%1s ব্যবহারকারী নিম্নলিখিত কারণের জন্য আপনার বন্ধু তালিকাতে তাদেরকে যোগ করতে "
-"আপনার অনুরোধ অস্বীকার করেছে: \n"
-"%2s"
+"%1$s ব্যবহারকারী নিম্নলিখিত কারণের জন্য আপনার বন্ধু তালিকাতে তাদেরকে যোগ করতে "
+"আপনার অনুরোধ প্রত্যাখ্যান করেছে: \n"
+"%2$s"
 
 # tithi
 msgid "Authorization Denied"
-msgstr "প্রাপ্তাধিকার বাতিল করেছে"
+msgstr "অনুমোদন প্রত্যাখ্যাত"
 
 # tithi
 msgid "_Exchange:"
-msgstr "বিনিময় করুন: (_E)"
+msgstr "বিনিময় (_E):"
 
 # tithi
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"আপনার আইএম চিত্র পাঠানো হয়নি।  আপনি AIM আড্ডাতে আইএম চিত্র পাঠাতে পারেন না।"
+msgstr "আপনার IM চিত্র পাঠানো হয়নি। আপনি AIM আড্ডাতে IM চিত্র পাঠাতে পারেন না।"
 
 # tithi
 msgid "iTunes Music Store Link"
-msgstr "আই-টিউন সঙ্গীত সংরক্ষণ লিংক"
+msgstr "iTunes সঙ্গীত স্টোরের লিংক "
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7404,55 +7454,54 @@ msgstr "বন্ধুর মন্তব্য:"
 # tithi
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "আপনি %s এর সঙ্গে একটি সরাসরি IM সংযোগ খুলতে নির্বাচন করেছেন।"
+msgstr "আপনি %s এর সঙ্গে একটি Direct IM সংযোগ খুলতে যাচ্ছেন।"
 
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
-"এটি আপনার IP ঠিকানা প্রকাশ করার কারণে, এতে গোপনীয়তার ঝুঁকি থাকতে পারে।  আপনি কি "
-"অব্যাহত রাখতে চান? "
+"যেহেতু এটি আপনার IP ঠিকানা প্রকাশ করে, এতে নিরাপত্তার ঝুঁকি থাকতে পারে। আপনি কি "
+"নিশ্চিত? "
 
 msgid "C_onnect"
-msgstr "সংযোগ দিন (_o)"
+msgstr "সংযোগ (_O)"
 
 msgid "Get AIM Info"
-msgstr "এআইএম তথ্য গ্রহণ করুন"
+msgstr "AIM তথ্য গ্রহণ"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "বন্ধুর মন্তব্য সম্পাদন করুন"
+msgstr "বন্ধুর মন্তব্য সম্পাদন"
 
+# mark30
 msgid "Get Status Msg"
-msgstr "অবস্থার বার্তা গ্রহণ করুন"
+msgstr "অবস্থার বার্তা খুঁজুন"
 
 # tithi
 msgid "Direct IM"
-msgstr "সরাসরি IM"
+msgstr "Direct IM"
 
 # tithi
 msgid "Re-request Authorization"
-msgstr "পুনঃ-অনুরোধ প্রাপ্তাধিকার"
+msgstr "অনুমোদনের জন্য পুনরায় অনুরোধ"
 
 # tithi
 msgid "Require authorization"
-msgstr "প্রাপ্তাধিকার প্রয়োজন"
+msgstr "অনুমোদন প্রয়োজন"
 
 # tithi
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "ওয়েব সচেতন (এইটি সক্রিয় করার কারণে আপনি SPAM গ্রহণ করবেন!)"
+msgstr "ওয়েব সচেতন (এটি সক্রিয় করলে আপনি SPAM গ্রহণ করবেন!)"
 
 msgid "ICQ Privacy Options"
-msgstr "ICQ ব্যক্তিগত পছন্দসমূহ"
+msgstr "ICQ গোপনতার অপশন"
 
 msgid "The new formatting is invalid."
-msgstr "নতুন বিন্যাসকরণটি অবৈধ।"
+msgstr "নতুন বিন্যাসটি অকার্যকর।"
 
 # tithi
 msgid "Username formatting can change only capitalization and whitespace."
-msgstr ""
-"ব্যবহারকারীর-নাম বিন্যাসকরণ শুধুমাত্র ঊর্ধ্ববর্ণানুক্রমিক এবং ফাঁকা জায়গা পরিবর্তন করতে "
-"পারে।"
+msgstr "ব্যবহারকারীর নামের শুধুমাত্র অক্ষরের ছাঁদ এবং ফাঁকা জায়গা পরিবর্তন করা যাবে।"
 
 # tithi
 msgid "Change Address To:"
@@ -7460,72 +7509,76 @@ msgstr "ঠিকানা পরিবর্তন করুন:"
 
 # tithi
 msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>আপনি প্রাপ্তাধিকারের জন্য অপেক্ষা করছেন না</i>"
+msgstr "<i>আপনি অনুমোদনের জন্য অপেক্ষা করছেন না</i>"
 
 # tithi
 msgid "You are awaiting authorization from the following buddies"
-msgstr "আপনি নিম্নোক্ত বন্ধু থেকে প্রাপ্তাধিকারের জন্য অপেক্ষা করছেন"
+msgstr "আপনি নিম্নোক্ত বন্ধু থেকে অনুমোদনের জন্য অপেক্ষা করছেন"
 
 # tithi
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"আপনি বন্ধু তলিকায় ডান ক্লিক করে এবং‌ \"প্রাপ্তাধিকার পুনরায় অনুরোধ করুন\" নির্বাচন করে "
-"তাদের থেকে প্রাপ্তাধিকার পুনরায় অনুরোধ করতে পারেন।"
+"আপনি বন্ধু তলিকায় ডান ক্লিক করে এবং‌ \"অনুমোদনের জন্য পুনরায় অনুরোধ\" নির্বাচন করে "
+"তাদের থেকে আবার অনুমোদন চাইতে পারেন।"
 
 # tithi
 msgid "Find Buddy by Email"
-msgstr "ই-মেইলের মাধ্যমে বন্ধু খুঁজুন"
+msgstr "ইমেইলের মাধ্যমে বন্ধু খুঁজুন"
 
 # tithi
 msgid "Search for a buddy by email address"
-msgstr "ই-মেইল ঠিকানার মাধ্যমে বন্ধু খুঁজুন"
+msgstr "ইমেইল ঠিকানার মাধ্যমে বন্ধুর অনুসন্ধান করুন"
 
 # tithi
 msgid "Type the email address of the buddy you are searching for."
-msgstr "আপনি যে বন্ধু খুঁজছেন তার ই-মেইল ঠিকানা টাইপ করুন।"
+msgstr "আপনি যে বন্ধুর অনুসন্ধান করছেন তার ইমেইল ঠিকানা টাইপ করুন।"
 
 msgid "_Search"
-msgstr "খুঁজুন (_S)"
+msgstr "অনুসন্ধান (_S)"
 
 msgid "Set User Info (web)..."
-msgstr "ব্যবহারকারী তথ্য নির্ধারণ করুন (ওয়েব)..."
+msgstr "ব্যবহারকারী তথ্য নির্ধারণ (ওয়েব)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
-msgstr "গুপ্তসংকেত পরিবর্তন করুন (ওয়েব)"
+msgstr "পাসওয়ার্ড পরিবর্তন (ওয়েব)"
 
 # tithi
 msgid "Configure IM Forwarding (web)"
-msgstr "IM অগ্রবর্তীকরণ বিন্যাসন করুন (ওয়েব)"
+msgstr "IM ফরওয়ার্ডিং কনফিগারেশন (ওয়েব)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "ব্যক্তিগত পছন্দসমূহ নির্ধারণ করুন..."
+msgstr "গোপনতার অপশন নির্ধারণ ..."
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr "একাউন্ট নিশ্চিত করুন"
+msgstr "একাউন্ট নিশ্চিতকরণ"
 
 # tithi
 msgid "Display Currently Registered Email Address"
-msgstr "বর্তমানে নিবন্ধণকৃত ই-মেইল ঠিকানা প্রদর্শন করুন"
+msgstr "বর্তমানে নিবন্ধনকৃত ইমেইল ঠিকানা প্রদর্শন"
 
 # tithi
 msgid "Change Currently Registered Email Address..."
-msgstr "বর্তমানে নিবন্ধণকৃত ই-মেইল ঠিকানা পরিবর্তন করুন..."
+msgstr "বর্তমানে নিবন্ধনকৃত ইমেইল ঠিকানা পরিবর্তন..."
 
 # tithi
 msgid "Show Buddies Awaiting Authorization"
-msgstr "বন্ধুদের অপেক্ষমান প্রাপ্তাধিকার প্রদর্শন করুন"
+msgstr "অনুমোদন অপেক্ষমান বন্ধুদের প্রদর্শন"
 
 # tithi
 msgid "Search for Buddy by Email Address..."
-msgstr "ই-মেইল ঠিকানার মাধ্যমে বন্ধুদের খুঁজুন..."
+msgstr "ইমেইল ঠিকানার মাধ্যমে বন্ধু অনুসন্ধান..."
 
 # tithi
 msgid "Search for Buddy by Information"
-msgstr "তথ্য দ্বারা বন্ধুদের খুঁজুন"
+msgstr "তথ্য মাধ্যমে বন্ধু অনুসন্ধান "
+
+msgid "Use clientLogin"
+msgstr "clientLogin ব্যবহার"
 
 # tithi
 msgid ""
@@ -7533,40 +7586,39 @@ msgid ""
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
-"ফাইল স্থানান্তর এবং সরাসরি আইএম এর জন্য \n"
-"সবসময় AIM/ICQ প্রক্সি সার্ভার ব্যবহার করুন\n"
-"(অপেক্ষাকৃত ধীর, কিন্তু আপনার আইপি ঠিকানা প্রকাশ করে না)"
+"ফাইল স্থানান্তর এবং সরাসরি IM এর জন্য \n"
+"সবসময় AIM/ICQ প্রক্সি সার্ভার ব্যবহার করা হবে\n"
+"(অপেক্ষাকৃত ধীর, কিন্তু আপনার IP ঠিকানা প্রকাশ করে না)"
 
 # tithi
 msgid "Allow multiple simultaneous logins"
-msgstr "একাধিক যুগপৎ লগইন অনুমোদন করুন"
+msgstr "একসাথে একাধিক লগইন অনুমোদন করা হবে"
 
 # tithi
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
-"%2s এ আমাদের সাথে সংযোগ করতে %1s কে জিজ্ঞাসা করছে: সরাসরি আইএম এর জন্য %3hu।"
+"%2$s এ আমাদের সাথে সংযোগ করতে %1$s কে অনুরোধ করা হচ্ছে: সরাসরি IM এর জন্য %3$hu।"
 
 #, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "%1s এর সাথে সংযোগ স্থাপনের চেষ্টা করছে:%2hu।"
+msgstr "%1$s এর সাথে সংযোগ স্থাপনের চেষ্টা করা হচ্ছে:%2$hu।"
 
 msgid "Attempting to connect via proxy server."
-msgstr "প্রক্সি সার্ভারের মাধ্যমে সংযোগ স্থাপনের চেষ্টা করছে।"
+msgstr "প্রক্সি সার্ভারের মাধ্যমে সংযোগ স্থাপনের চেষ্টা করা হচ্ছে।"
 
 # tithi
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%1s এইমাত্র %2s এর সাথে সরাসরি সংযোগ করতে জিজ্ঞাসা করেছে"
+msgstr "%1$s এইমাত্র %2$s এর সাথে সরাসরি সংযোগ করতে বলেছে"
 
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
-"এটির জন্য দুটি কম্পিউটারের মধ্যে সরাসরি সংযোগ প্রয়োজন এবং এটা আইএম এর ছবির জন্য "
-"প্রয়োজন।  যেহেতু এটি আপনার আইপি ঠিকানা প্রকাশ করবে, তাই এতে গোপনীয়তার ঝুকি থাকতে "
-"পারে।"
+"এটির জন্য দুটি কম্পিউটারের মধ্যে সরাসরি সংযোগ প্রয়োজন যা কিনা IM এর ছবির জন্য "
+"আবশ্যক। যেহেতু আপনার IP ঠিকানা প্রকাশিত হবে, তাই এতে গোপনীয়তার ঝুঁকি থাকতে পারে।"
 
 # tithi
 msgid "Aquarius"
@@ -7613,7 +7665,7 @@ msgid "Capricorn"
 msgstr "মকর রাশি"
 
 msgid "Rat"
-msgstr "ইদুর"
+msgstr "ইঁদুর"
 
 # tithi
 msgid "Ox"
@@ -7685,22 +7737,22 @@ msgid "Phone Number"
 msgstr "টেলিফোন নম্বর"
 
 msgid "Authorize adding"
-msgstr "অনুমোদিত সংযুক্তকরণ"
+msgstr "যোগ করা অনুমোদন করা হবে"
 
 msgid "Cellphone Number"
-msgstr "সেলফোন নম্বর"
+msgstr "মোবাইলফোন নম্বর"
 
 msgid "Personal Introduction"
-msgstr "ব্যক্তিগত ভূমিকা"
+msgstr "ব্যক্তিগত পরিচিতি"
 
 msgid "City/Area"
 msgstr "শহর/এলাকা"
 
 msgid "Publish Mobile"
-msgstr "মোবাইল প্রকাশ করুন"
+msgstr "মোবাইল প্রকাশ"
 
 msgid "Publish Contact"
-msgstr "যোগাযোগ প্রকাশ করুন"
+msgstr "পরিচিতি প্রকাশ"
 
 msgid "College"
 msgstr "কলেজ"
@@ -7710,7 +7762,7 @@ msgstr "রাশি চক্র"
 
 # tithi
 msgid "Zodiac"
-msgstr "জোডিয়াক"
+msgstr "যোডিয়াক"
 
 msgid "Blood"
 msgstr "রক্ত"
@@ -7723,22 +7775,50 @@ msgid "False"
 msgstr "মিথ্যা"
 
 msgid "Modify Contact"
-msgstr "যোগাযোগ পরিবর্তন করুন"
+msgstr "পরিচিতি পরিবর্তন"
 
 msgid "Modify Address"
-msgstr "ঠিকানা পরিবর্তন করুন"
+msgstr "ঠিকানা পরিবর্তন"
 
 msgid "Modify Extended Information"
-msgstr "বর্ধিত তথ্য পরিবর্তন করুন"
+msgstr "বর্ধিত তথ্য পরিবর্তন"
 
 msgid "Modify Information"
-msgstr "তথ্য পরিবর্তন করুন"
+msgstr "তথ্য পরিবর্তন"
 
 msgid "Update"
-msgstr "হালনাগাদ করুন"
+msgstr "হালনাগাদ"
 
 msgid "Could not change buddy information."
-msgstr "বন্ধুর তথ্য পরিবর্তন করতে পারে না।"
+msgstr "বন্ধুর তথ্য পরিবর্তন করা সম্ভব হয়নি।"
+
+msgid "Mobile"
+msgstr "মোবাইল"
+
+msgid "Note"
+msgstr "নোট"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "বন্ধুলিপি"
+
+msgid "Change his/her memo as you like"
+msgstr "তার লিপি ইচ্ছামত পরিবর্তন করুন"
+
+msgid "_Modify"
+msgstr "পরিবর্তন (M)"
+
+msgid "Memo Modify"
+msgstr "লিপি পরিবর্তন"
+
+msgid "Server says:"
+msgstr "সার্ভার বলছে:"
+
+msgid "Your request was accepted."
+msgstr "আপনার অনুরোধটি অনুমোদন করা হয়েছে।"
+
+msgid "Your request was rejected."
+msgstr "আপনার অনুরোধটি অনুমোদন করা যায়নি।"
 
 # tithi
 #, c-format
@@ -7746,35 +7826,35 @@ msgid "%u requires verification"
 msgstr "%u এর সত্যতা যাচাই করা প্রয়োজন"
 
 msgid "Add buddy question"
-msgstr "বন্ধুর প্রশ্ন যোগ করুন"
+msgstr "বন্ধুর প্রশ্ন যোগ"
 
 # tithi
 msgid "Enter answer here"
-msgstr "এখানে উত্তর প্রবেশ করান"
+msgstr "এখানে উত্তর লিখুন"
 
 msgid "Send"
-msgstr "প্রেরণ করুন"
+msgstr "প্রেরণ"
 
 msgid "Invalid answer."
-msgstr "অবৈধ উত্তর।"
+msgstr "অকার্যকর উত্তর।"
 
 msgid "Authorization denied message:"
-msgstr "প্রাপ্তাধিকার বার্তা অস্বীকার করেছে:"
+msgstr "অনুমোদন প্রত্যাখ্যান বার্তা:"
 
 # tithi
 msgid "Sorry, you're not my style."
-msgstr "দুঃখিত,আপনি আমার শৈলী নয়।"
+msgstr "দুঃখিত, আপনি আমার ধাঁচের নন।"
 
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u এর প্রাপ্তাধিকার প্রয়োজন"
+msgstr "%u এর অনুমোদন প্রয়োজন"
 
 msgid "Add buddy authorize"
-msgstr "বন্ধুর অনুমোদন যোগ করুন"
+msgstr "বন্ধুর অনুমোদন যোগ"
 
 # tithi
 msgid "Enter request here"
-msgstr "এখানে অনুরোধ প্রবেশ করান"
+msgstr "এখানে অনুরোধ লিখুন"
 
 msgid "Would you be my friend?"
 msgstr "আপনি কি আমার বন্ধু হবেন?"
@@ -7783,21 +7863,21 @@ msgid "QQ Buddy"
 msgstr "QQ বন্ধু"
 
 msgid "Add buddy"
-msgstr "বন্ধু যোগ করুন"
+msgstr "বন্ধু যোগ"
 
 msgid "Invalid QQ Number"
-msgstr "অবৈধ QQ নম্বর"
+msgstr "অকার্যকর QQ নম্বর"
 
 msgid "Failed sending authorize"
-msgstr "অনুমোদন পাঠাতে ব্যর্থ হয়েছে"
+msgstr "অনুমোদন পাঠাতে ব্যর্থ"
 
 #, c-format
 msgid "Failed removing buddy %u"
-msgstr "%u বন্ধুকে অপসারণ করতে ব্যর্থ হয়েছে"
+msgstr "%u বন্ধুকে অপসারণ করতে ব্যর্থ"
 
 #, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%d এর বন্ধু তালিকা থেকে আমাকে অপসারণ করতে ব্যর্থ হয়েছে"
+msgstr "%d এর বন্ধু তালিকা থেকে আমাকে অপসারণ করতে ব্যর্থ"
 
 msgid "No reason given"
 msgstr "কোনো কারন দর্শানো হয়নি"
@@ -7805,14 +7885,14 @@ msgstr "কোনো কারন দর্শানো হয়নি"
 #. only need to get value
 #, c-format
 msgid "You have been added by %s"
-msgstr "আপনি %s দ্বারা সংযুক্ত হয়েছেন"
+msgstr "আপনাকে %s যোগ করেছেন"
 
 msgid "Would you like to add him?"
 msgstr "আপনি কি তাকে যোগ করতে চান?"
 
 #, c-format
 msgid "Rejected by %s"
-msgstr "%s দ্বারা বাতিল করা হয়েছে"
+msgstr "%s দ্বারা প্রত্যাখ্যাত"
 
 #, c-format
 msgid "Message: %s"
@@ -7820,24 +7900,24 @@ msgstr "বার্তা: %s"
 
 # tithi
 msgid "ID: "
-msgstr "আইডি:"
+msgstr "ID: "
 
 msgid "Group ID"
-msgstr "দলের আইডি"
+msgstr "দলের ID"
 
 # tithi
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
 msgid "Please enter Qun number"
-msgstr "অনুগ্রহ করে Qun নম্বর প্রবেশ করান"
+msgstr "অনুগ্রহ করে Qun নম্বর দিন"
 
 # tithi
 msgid "You can only search for permanent Qun\n"
-msgstr "আপনি শুধুমাত্র স্থায়ী Qun খুঁজতে পারেন\n"
+msgstr "আপনি শুধুমাত্র স্থায়ী Qun অনুসন্ধান করতে পারেন\n"
 
 msgid "(Invalid UTF-8 string)"
-msgstr "(অবৈধ UTF-8 স্ট্রিং)"
+msgstr "(অকার্যকর UTF-8 স্ট্রিং)"
 
 # tithi
 msgid "Not member"
@@ -7848,10 +7928,10 @@ msgid "Member"
 msgstr "সদস্য"
 
 msgid "Requesting"
-msgstr "অনুরোধ করছে"
+msgstr "অনুরোধ করা হচ্ছে"
 
 msgid "Admin"
-msgstr "প্রশাসন"
+msgstr "প্রশাসক"
 
 msgid "Notice"
 msgstr "বিজ্ঞপ্তি"
@@ -7861,7 +7941,7 @@ msgstr "বিস্তারিত"
 
 # tithi
 msgid "Creator"
-msgstr "তৈরীকারক"
+msgstr "নির্মাতা"
 
 msgid "About me"
 msgstr "আমার সম্পর্কে"
@@ -7871,10 +7951,10 @@ msgstr "শ্রেণী"
 
 # tithi
 msgid "The Qun does not allow others to join"
-msgstr "Qun অন্যদের যুক্ত করতে অনুমতি দেয় না"
+msgstr "Qun অন্যদের যুক্ত হতে অনুমতি দেয় না"
 
 msgid "Join QQ Qun"
-msgstr "QQ Qun যুক্ত করুন"
+msgstr "QQ Qun এ যোগ দিন"
 
 # tithi
 msgid "Input request here"
@@ -7883,15 +7963,15 @@ msgstr "এখানে অনুরোধ ইনপুট দিন"
 # tithi
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "%s (%u) Qun সফলভাবে যুক্ত করেছে"
+msgstr "%s (%u) Qun এ সফলভাবে যুক্ত হয়েছে"
 
 msgid "Successfully joined Qun"
-msgstr "Qun সফলভাবে যুক্ত করেছে"
+msgstr "Qun এ সফলভাবে যুক্ত হয়েছে"
 
 # tithi
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr "%u Qun যুক্তকরণ বাতিল করেছে"
+msgstr "%u Qunএ যুক্তকরণ প্রত্যাখ্যন করা হয়েছে"
 
 msgid "QQ Qun Operation"
 msgstr "QQ Qun অপারেশন"
@@ -7901,22 +7981,22 @@ msgstr "ব্যর্থ:"
 
 # tithi
 msgid "Join Qun, Unknown Reply"
-msgstr "Qun যুক্ত করুন, অজানা উত্তর"
+msgstr "Qun এ যোগদান, অজানা উত্তর"
 
 msgid "Quit Qun"
-msgstr "Qun ত্যাগ করুন"
+msgstr "Qun প্রস্থান"
 
 # tithi
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-"নোট, আপনি যদি প্রস্তুতকারক হোন, \n"
-"এই অপারেশনটি সবশেষে এই Qunটি অপসারণ করবে।"
+"নোট, আপনি যদি এটি তৈরী করে থাকেন, \n"
+"এই অপারেশনটি অবশেষে এই Qunটি অপসারণ করবে।"
 
 # tithi
 msgid "Sorry, you are not our style"
-msgstr "দুঃখিত,আপনি আমাদের শৈলী নন"
+msgstr "দুঃখিত,আপনি আমাদের ধাঁচের  নন"
 
 msgid "Successfully changed Qun members"
 msgstr "Qun সদস্যদের সফলভাবে পরিবর্তন করা হয়েছে"
@@ -7926,39 +8006,39 @@ msgstr "Qun তথ্য সফলভাবে পরিবর্তন কর�
 
 # tithi
 msgid "You have successfully created a Qun"
-msgstr "আপনি Qun সফলভাবে তৈরি করেছেন"
+msgstr "আপনি সফলভাবে একটি Qun তৈরি করেছেন"
 
 msgid "Would you like to set up detailed information now?"
-msgstr "আপনি কি এখন বিস্তারিত তথ্য সংস্থাপন করতে চান?"
+msgstr "আপনি কি এখন বিস্তারিত তথ্য দিতে চান?"
 
 msgid "Setup"
-msgstr "সংস্থাপন করুন"
+msgstr "সেটআপ"
 
 #, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "%1$u %3$s এর জন্য %2$u Qun যোগ করতে অনুরোধ করছে"
+msgstr "%1$u %3$s এর জন্য %2$u Qunএ যুক্ত হতে অনুরোধ করছে"
 
 #, c-format
 msgid "%u request to join Qun %u"
-msgstr "%1u %2u Qun যোগ করতে অনুরোধ করছে"
+msgstr "%1u %2u Qunএ যুক্ত হতে অনুরোধ করছে"
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "%u প্রশাসন দ্বারা পরিচালিত, Qun %u যোগ করতে ব্যর্থ হয়েছে"
+msgstr "%u প্রশাসক দ্বারা পরিচালিত, Qun %u যুক্ত হতে ব্যর্থ"
 
 # tithi
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr "<b>%3$s এর জন্য %2$u প্রশাসন দ্বারা %1$u Qun যুক্ত করার অনুমোদন দিয়েছে</b>"
+msgstr "<b>%3$s এর জন্য %2$u প্রশাসক %1$u Qunএ যুক্ত হওয়ার অনুমোদন দিয়েছে</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "<b>%u বন্ধু অপসারণ করা হয়েছে।</b>"
+msgstr "<b>%u বন্ধুকে অপসারণ করা হয়েছে।</b>"
 
 # tithi
 #, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "<b>নতুন %u বন্ধু যোগদান করেছে।</b>"
+msgstr "<b>নতুন বন্ধু %u যোগদান করেছে।</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7996,23 +8076,23 @@ msgid "Ver"
 msgstr "Ver"
 
 msgid "Invalid name"
-msgstr "অবৈধ নাম"
+msgstr "অকার্যকর নাম"
 
 msgid "Select icon..."
-msgstr "আইকন নির্বাচন করুন..."
+msgstr "আইকন নির্বাচন..."
 
 #, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>লগইন সময়</b>: %1d-%2d-%3d, %4d:%5d:%6d<br>\n"
+msgstr "<b>লগইন সময়</b>: %1$d-%2$d-%3$d, %4$d:%5$d:%6$d<br>\n"
 
 #, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>সর্বমোট অনলাইন বন্ধু</b>: %d<br>\n"
+msgstr "<b>মোট অনলাইন বন্ধু</b>: %d<br>\n"
 
 # fix me tithi
 #, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>সর্বশেষ রিফ্রেশ</b>: %1d-%2d-%3d, %4d:%5d:%6d<br>\n"
+msgstr "<b>সর্বশেষ রিফ্রেশ</b>: %1$d-%2$d-%3$d, %4$d:%5$d:%6$d<br>\n"
 
 #, c-format
 msgid "<b>Server</b>: %s<br>\n"
@@ -8028,19 +8108,19 @@ msgstr "<b>সংযোগ মোড</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>আমার ইন্টারনেট IP</b>: %1s:%2d<br>\n"
+msgstr "<b>আমার ইন্টারনেট IP</b>: %1$s:%2$d<br>\n"
 
 #, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>পাঠানো হয়েছে</b>: %lu<br>\n"
+msgstr "<b>প্রেরিত</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>পুনরায় পাঠানো হয়েছে</b>: %lu<br>\n"
+msgstr "<b>পুনরায় প্রেরণ</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>হারিয়ে গেছে</b>: %lu<br>\n"
+msgstr "<b>হারিয়েছে</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Received</b>: %lu<br>\n"
@@ -8048,41 +8128,43 @@ msgstr "<b>গৃহীত</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>অনুরুপ গৃহীত হয়েছে</b>: %lu<br>\n"
+msgstr "<b>অবিকল গৃহীত</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>সময়</b>: %1d-%2d-%3d, %4d:%5d:%6d<br>\n"
+msgstr "<b>সময়</b>: %1$d-%2$d-%3$d, %4$d:%5$d:%6$d<br>\n"
 
 #, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>আইপি</b>: %s<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
 msgstr "লগইন তথ্য"
 
 # tithi
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr "<p><b> মূল লেখক</b>:<br>\n"
+msgstr "<p><b>মূল লেখক</b>:<br>\n"
 
 # tithi
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr "<p><b> কোড অংশগ্রহণকারীগণ</b>:<br>\n"
+msgstr "<p><b>কোডিং-এ অংশগ্রহণকারীগণ</b>:<br>\n"
 
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
 msgstr "<p><b>প্রিয় প্যাচ লেখকগণ </b>:<br>\n"
 
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<p><b>প্রাপ্তিস্বীকার</b>:<br>\n"
+msgstr "<p><b>কৃতজ্ঞতা</b>:<br>\n"
 
 # tithi
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b> মূল লেখক</b>:<br>\n"
+msgstr "<p><b>পারদর্শী পরীক্ষকগন</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "এবং আরও, অনুগ্রহ করে আমাকে জানান... ধন্যবাদ!))"
 
 # fix me tithi
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr "<p><i>এবং, সমস্ত ছেলে পিছন-কামরায়...</i><br>\n"
+msgstr "<p><i>এবং, সমস্ত পেছনের কামরার ছেলেরা...</i><br>\n"
 
 # tithi
 msgid "<i>Feel free to join us!</i> :)"
@@ -8090,27 +8172,26 @@ msgstr "<i>আমাদের সাথে উন্মুক্তভাবে
 
 #, c-format
 msgid "About OpenQ %s"
-msgstr "%s ওপেনQ সম্পর্কে"
+msgstr "%s OpenQ সম্পর্কে"
 
 msgid "Change Icon"
-msgstr "আইকন পরিবর্তন করুন"
+msgstr "আইকন পরিবর্তন"
 
 msgid "Change Password"
-msgstr "গুপ্তসংকেত পরিবর্তন করুন"
+msgstr "পাসওয়ার্ড পরিবর্তন"
 
 msgid "Account Information"
 msgstr "একাউন্ট তথ্য"
 
 # tithi
 msgid "Update all QQ Quns"
-msgstr "সব QQ Quns হালনাগাদ করুন"
+msgstr "সব QQ Quns হালনাগাদ"
 
 msgid "About OpenQ"
-msgstr "ওপেনQ সম্বন্ধে"
+msgstr "OpenQ সম্পর্কে"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "ঠিকানা পরিবর্তন করুন"
+msgstr "বন্ধুলিপি পরিবর্তন"
 
 #. *< type
 #. *< ui_requirement
@@ -8123,49 +8204,49 @@ msgstr "ঠিকানা পরিবর্তন করুন"
 #. *  summary
 #. *  description
 msgid "QQ Protocol Plugin"
-msgstr "QQ প্রটোকল প্লাগইন"
+msgstr "QQ প্রোটোকল প্লাগইন"
 
 msgid "Auto"
 msgstr "স্বয়ংক্রিয়"
 
 msgid "Select Server"
-msgstr "সার্ভার নির্বাচন করুন"
+msgstr "সার্ভার নির্বাচন"
 
 # tithi
 msgid "QQ2005"
-msgstr "QQ২০০৫"
+msgstr "QQ2005"
 
 # tithi
 msgid "QQ2007"
-msgstr "QQ২০০৭"
+msgstr "QQ2007"
 
 # tithi
 msgid "QQ2008"
-msgstr "QQ২০০৮"
+msgstr "QQ2008"
 
 msgid "Connect by TCP"
-msgstr "TCP দ্বারা সংযোগ করুন"
+msgstr "TCP দ্বারা সংযোগ করা হবে"
 
 msgid "Show server notice"
-msgstr "সার্ভারের নোটিশ প্রদর্শন করুন"
+msgstr "সার্ভারের নোটিশ প্রদর্শন করা হবে"
 
 msgid "Show server news"
-msgstr "সার্ভারের খবর প্রদর্শন করুন"
+msgstr "সার্ভারের খবর প্রদর্শন করা হবে"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "বার্তা আসলে আড্ডার আসর প্রদর্শিত হবে "
 
 # fix me tithi
 msgid "Keep alive interval (seconds)"
-msgstr "বিরতি সক্রিয় রাখুন (সেকেন্ড)"
+msgstr "সক্রিয় রাখার সময়ের ব্যবধান (সেকেন্ড)"
 
 # tithi
 msgid "Update interval (seconds)"
-msgstr "বিরতি হালনাগাদ করুন (সেকেন্ড)"
+msgstr "হালনাগাদের সময়ের ব্যবধান (সেকেন্ড)"
 
 # fix me tithi
-msgid "Cannot decrypt server reply"
-msgstr "সার্ভার জবাব অসঙ্কেতায়ন করে না"
+msgid "Unable to decrypt server reply"
+msgstr "সার্ভারের উত্তর ডিক্রিপ্ট করা যাচ্ছে না"
 
 # tithi
 #, c-format
@@ -8174,12 +8255,12 @@ msgstr "টোকেন চাইতে ব্যর্থ, 0x%02X"
 
 #, c-format
 msgid "Invalid token len, %d"
-msgstr "অবৈধ টোকেন দৈর্ঘ্য, %d"
+msgstr "অকার্যকর টোকেন দৈর্ঘ্য, %d"
 
 # Fix me tithi
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr "পুনঃনির্দেশিতEX বর্তমানে সমর্থিত নয় (_E)"
+msgstr "RedirectEX বর্তমানে সমর্থিত নয় (_E)"
 
 #. need activation
 #. need activation
@@ -8190,42 +8271,38 @@ msgstr "সক্রিয়করণ আবশ্যক"
 # tithi
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr "(0x%02X) এ লগইন করার সময় অজানা উত্তর কোড"
-
-# fix me tithi
-msgid "Could not decrypt server reply"
-msgstr "সার্ভার জবাব অসঙ্কেতায়ন করতে পারেনি"
+msgstr "লগইন করার সময় অজানা উত্তর কোড (0x%02X)"
 
 # tithi
 msgid "Requesting captcha"
-msgstr "captcha অনুরোধ করছে"
+msgstr "ক্যাপচা অনুরোধ করা হচ্ছে"
 
 # tithi
 msgid "Checking captcha"
-msgstr "captcha পরীক্ষা করছে"
+msgstr "ক্যাপচা পরীক্ষা করা হচ্ছে"
 
 # tithi
 msgid "Failed captcha verification"
-msgstr "captcha যাচাইকরণ ব্যর্থ হয়েছে"
+msgstr "ক্যাপচা যাচাইকরণ ব্যর্থ হয়েছে"
 
 # fix me tithi
 msgid "Captcha Image"
-msgstr "Captcha চিত্র"
+msgstr "ক্যাপচা চিত্র"
 
 msgid "Enter code"
-msgstr "কোড প্রবেশ করান"
+msgstr "কোড দিন"
 
 # tithi
 msgid "QQ Captcha Verification"
-msgstr "QQ Captcha যাচাইকরণ"
+msgstr "QQ ক্যাপচা যাচাইকরণ"
 
 msgid "Enter the text from the image"
-msgstr "চিত্র হতে পাঠ প্রবেশ করান"
+msgstr "চিত্রে যে টেক্সটটি আছে তা লিখুন"
 
 # tithi
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr "গুপ্তসঙ্কেত পরীক্ষণ করার সময় অজানা উত্তর (0x%02X)"
+msgstr "পাসওয়ার্ড পরীক্ষা করার সময় অজানা উত্তর (0x%02X)"
 
 # tithi
 #, c-format
@@ -8233,40 +8310,27 @@ msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
-"(0x%02X) এ লগইন করার সময় অজানা উত্তর কোড:\n"
+"লগইন করার সময় অজানা উত্তর কোড (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "সংযুক্ত করতে ব্যর্থ।"
-
 msgid "Socket error"
 msgstr "সকেট ত্রুটি"
 
-msgid "Unable to read from socket"
-msgstr "সকেট থেকে পাঠ করতে ব্যর্থ"
-
-msgid "Write Error"
-msgstr "লিখন ত্রুটি"
-
-msgid "Connection lost"
-msgstr "সংযোগ হারিয়ে গেছে"
-
 msgid "Getting server"
-msgstr "সার্ভার পাচ্ছে"
+msgstr "সার্ভার খোঁজা হচ্ছে"
 
 msgid "Requesting token"
-msgstr "টোকেন অনুরোধ করছে"
+msgstr "টোকেন অনুরোধ করা হচ্ছে"
 
-msgid "Couldn't resolve host"
-msgstr "হোস্ট সমাধান করা সম্ভব হয়নি"
+msgid "Unable to resolve hostname"
+msgstr "হোস্টের নাম নিরূপণ করতে ব্যর্থ"
 
 msgid "Invalid server or port"
-msgstr "অবৈধ সার্ভার বা পোর্ট"
+msgstr "অকার্যকর সার্ভার বা পোর্ট"
 
 # tithi
 msgid "Connecting to server"
-msgstr "সার্ভারে সংযোজিত হচ্ছে"
+msgstr "সার্ভারে সংযুক্ত করা হচ্ছে"
 
 msgid "QQ Error"
 msgstr "QQ ত্রুটি"
@@ -8279,13 +8343,13 @@ msgid ""
 "%s"
 msgstr ""
 "সার্ভারের খবর:\n"
-"%1s\n"
-"%2s\n"
-"%3s"
+"%1$s\n"
+"%2$s\n"
+"%3$s"
 
 #, c-format
 msgid "%s:%s"
-msgstr "%1s:%2s"
+msgstr "%1$s:%2$s"
 
 #, c-format
 msgid "From %s:"
@@ -8296,12 +8360,12 @@ msgid ""
 "Server notice From %s: \n"
 "%s"
 msgstr ""
-"%1s থেকে সার্ভার সংক্রান্ত বিজ্ঞপ্তি:\n"
-"%2s"
+"%1$s থেকে সার্ভার সংক্রান্ত বিজ্ঞপ্তি:\n"
+"%2$s"
 
 # tithi
 msgid "Unknown SERVER CMD"
-msgstr "অজানা সার্ভার CMD"
+msgstr "অজানা SERVER CMD"
 
 # tithi
 #, c-format
@@ -8309,36 +8373,33 @@ msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
-"%1s(0x%02X) এর ত্রুটিপূর্ণ উত্তর\n"
-"রুম %2u, উত্তর 0x%02X"
+"%1$s এর ত্রুটিপূর্ণ উত্তর (0x%2$02X)\n"
+"আসর %3$u, উত্তর 0x%4$02X"
 
 msgid "QQ Qun Command"
-msgstr "QQ Qun নির্দেশ"
+msgstr "QQ Qun কমান্ড"
 
 # tithi
-msgid "Could not decrypt login reply"
-msgstr "লগইন উত্তর অসঙ্কেতায়ন করতে পারে না"
+msgid "Unable to decrypt login reply"
+msgstr "লগইন উত্তর ডিক্রিপ্ট করা সম্ভব হয়নি"
 
 # fix me tithi
 msgid "Unknown LOGIN CMD"
-msgstr "অজানা লগইন CMD"
+msgstr "অজানা LOGIN CMD"
 
 msgid "Unknown CLIENT CMD"
-msgstr "অজানা ক্লায়েন্ট CMD"
+msgstr "অজানা CLIENT CMD"
 
 #, c-format
 msgid "%d has declined the file %s"
-msgstr "%1d %2s ফাইলটি প্রত্যাখ্যান করেছে"
+msgstr "%1$d %2$s ফাইলটি প্রত্যাখ্যান করেছে"
 
 msgid "File Send"
-msgstr "ফাইল প্রেরণ করা হয়েছে"
+msgstr "ফাইল প্রেরণ"
 
 #, c-format
 msgid "%d canceled the transfer of %s"
-msgstr "%1d %2s-এর স্থানান্তর বাতিল করেছেন"
-
-msgid "Connection closed (writing)"
-msgstr "সংযোগ বন্ধ করা হয়েছে (লিখছে)"
+msgstr "%1$d %2$s-এর স্থানান্তর বাতিল করেছে"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8346,7 +8407,7 @@ msgstr "<b>দলের শিরোনাম:</b> %s<br>"
 
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>নোটের দল আইডি:</b> %s<br>"
+msgstr "<b>নোট দলের ID:</b> %s<br>"
 
 # tithi
 #, c-format
@@ -8355,78 +8416,67 @@ msgstr "%s দলের জন্য তথ্য"
 
 # tithi
 msgid "Notes Address Book Information"
-msgstr "নোটের ঠিকানা বইয়ের তথ্য"
+msgstr "Notes Address Book তথ্য"
 
 # tithi
 msgid "Invite Group to Conference..."
-msgstr "অধিবেশনে গ্রুপকে আমন্ত্রণ জানান..."
+msgstr "অধিবেশনে দলকে আমন্ত্রণ..."
 
 msgid "Get Notes Address Book Info"
-msgstr "নোটের ঠিকানা বইয়ের তথ্য গ্রহণ করুন"
+msgstr "Notes Address Book তথ্য গ্রহণ"
 
 # tithi
 msgid "Sending Handshake"
-msgstr "হ্যান্ডসেক পাঠাচ্ছে"
+msgstr "হ্যান্ডসেক পাঠানো হচ্ছে"
 
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "হ্যান্ডশেকের সাড়া পাওয়ার জন্য অপেক্ষা করছে"
+msgstr "হ্যান্ডশেকের প্রাপ্তিস্বীকারের অপেক্ষা করা হচ্ছে"
 
 # tithi
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "হ্যান্ডসেক সাড়া দিয়েছে, লগইন পাঠাচ্ছে"
+msgstr "হ্যান্ডশেকের প্রাপ্তিস্বীকার করা হয়েছে, লগইন পাঠানো হচ্ছে"
 
 # tithi
 msgid "Waiting for Login Acknowledgement"
-msgstr "লগইন সাড়ার জন্য অপেক্ষা করছে"
+msgstr "লগইন প্রাপ্তিস্বীকারের জন্য অপেক্ষা করা হচ্ছে"
 
 # tithi
 msgid "Login Redirected"
-msgstr "লগইন পুনঃ নির্দেশিত"
+msgstr "লগইন রিডিরেক্ট করা হয়েছে"
 
 # tithi
 msgid "Forcing Login"
-msgstr "লগইন বাধ্য করছে"
+msgstr "লগইন করতে বাধ্য করা হচ্ছে"
 
 # tithi
 msgid "Login Acknowledged"
-msgstr "লগইন সাড়া দিয়েছে"
+msgstr "লগইনের প্রাপ্তিস্বীকার করা হয়েছে"
 
 # tithi
 msgid "Starting Services"
-msgstr "সেবা শুরু করছে"
+msgstr "সেবা শুরু করা হচ্ছে"
 
 # tithi
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
-msgstr "একটি এককালীন প্রশাসক %s সার্ভারে নিম্নলিখিত ঘোষণা প্রচার করেছে"
+msgstr "একটি Sametime প্রশাসক %s সার্ভারে নিম্নলিখিত ঘোষণা প্রচার করেছে"
 
 # tithi
 msgid "Sametime Administrator Announcement"
-msgstr "এককালীন প্রশাসকের ঘোষণা"
-
-msgid "Connection reset"
-msgstr "সংযোগ পুনরায় বিন্যাস করুন"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "সকেট থেকে পড়ায় ত্রুটি: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "হোস্টের সাথে সংযোগে ব্যর্থ"
+msgstr "Sametime প্রশাসকের ঘোষণা"
 
 # tithi
 #, c-format
 msgid "Announcement from %s"
-msgstr "%s হতে ঘোষণা"
+msgstr "%s থেকে ঘোষণা"
 
 # tithi
 msgid "Conference Closed"
 msgstr "অধিবেশন বন্ধ"
 
 msgid "Unable to send message: "
-msgstr "বার্তা পাঠাতে অসমর্থ:"
+msgstr "বার্তা পাঠাতে ব্যর্থ:"
 
 msgid "Place Closed"
 msgstr "স্থান বন্ধ"
@@ -8437,22 +8487,25 @@ msgstr "মাইক্রোফোন"
 
 # tithi
 msgid "Speakers"
-msgstr "স্পিকারসমূহ"
+msgstr "স্পিকার"
 
 # tithi
 msgid "Video Camera"
 msgstr "ভিডিও ক্যামেরা"
 
+msgid "File Transfer"
+msgstr "ফাইল স্থানান্তর"
+
 msgid "Supports"
-msgstr "সমর্থনসমূহ"
+msgstr "সমর্থন"
 
 # tithi
 msgid "External User"
-msgstr "বাহ্যিক ব্যবহারকারী"
+msgstr "বহিরাগত ব্যবহারকারী"
 
 # tithi
 msgid "Create conference with user"
-msgstr "ব্যবহারকারীর সাথে অধিবেশন তৈরি করুন"
+msgstr "ব্যবহারকারীর সাথে অধিবেশন তৈরি"
 
 # tithi
 #, c-format
@@ -8460,27 +8513,25 @@ msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"অনুগ্রহ করে নতুন অধিবেশনের জন্য একটি বিষয় প্রবেশ করান, এবং %s এ একটি আমন্ত্রণ বার্তা "
-"পাঠাতে হবে"
+"অনুগ্রহ করে নতুন অধিবেশনের বিষয় এবং %s কে পাঠানোর জন্য একটি আমন্ত্রণ বার্তা দিন "
 
 msgid "New Conference"
 msgstr "নতুন অধিবেশন"
 
 # tithi
 msgid "Create"
-msgstr "তৈরি করুন "
+msgstr "তৈরি"
 
-# tithi
 msgid "Available Conferences"
-msgstr "সহজলভ্য অধিবেশনসমূহ"
+msgstr "বিদ্যমান অধিবেশন"
 
 # tithi
 msgid "Create New Conference..."
-msgstr "নতুন অধিবেশন তৈরি করুন..."
+msgstr "নতুন অধিবেশন তৈরি..."
 
 # tithi
 msgid "Invite user to a conference"
-msgstr "ব্যবহারকারীকে অধিবেশনে আমন্ত্রন জানান"
+msgstr "ব্যবহারকারীকে অধিবেশনে আমন্ত্রন"
 
 # tithi
 #, c-format
@@ -8489,28 +8540,28 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"%s ব্যবহারকারীকে একটি আমন্ত্রন পাঠাতে নিচের তালিকা থেকে একটি অধিবেশন নির্বাচন "
-"করুন। আপনি যদি এই ব্যবহারকারীকে আমন্ত্রণ জানাতে একটি নতুন অধিবেশন তৈরি করতে চান "
-"তবে \"নতুন অধিবেশন তৈরি করুন\" নির্বাচন করুন।"
+"%s ব্যবহারকারীকে আমন্ত্রন পাঠাতে নিচের তালিকা থেকে একটি অধিবেশন নির্বাচন করুন। "
+"আপনি যদি এই ব্যবহারকারীকে একটি নতুন অধিবেশনে আমন্ত্রণ জানাতে চান তবে \"নতুন "
+"অধিবেশন তৈরি\" নির্বাচন করুন।"
 
 # tithi
 msgid "Invite to Conference"
-msgstr "অধিবেশনে আমন্ত্রন জানান"
+msgstr "অধিবেশনে আমন্ত্রন"
 
 # tithi
 msgid "Invite to Conference..."
-msgstr "অধিবেশনে আমন্ত্রন জানান..."
+msgstr "অধিবেশনে আমন্ত্রন..."
 
 # tithi
 msgid "Send TEST Announcement"
-msgstr "পরীক্ষণ ঘোষণা পাঠান"
+msgstr "পরীক্ষমূলক ঘোষণা প্রেরণ"
 
 msgid "Topic:"
 msgstr "বিষয়:"
 
 # tithi
 msgid "No Sametime Community Server specified"
-msgstr "কোনো এককালীন সম্প্রদায় সার্ভার উল্লেখ করা হয়নি"
+msgstr "কোনো Sametime Community সার্ভার উল্লেখ করা হয়নি"
 
 # tithi
 #, c-format
@@ -8518,19 +8569,19 @@ msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"ইতোমধ্যে %s একাউন্টের জন্য কোনো হোস্ট বা আইপি ঠিকানা বিন্যাস করা হয়নি। অনুগ্রহ করে "
-"লগইন অব্যাহত রাখতে নিচে একটি প্রবেশ করান।"
+"Meanwhile একাউন্ট %sএর জন্য কোনো হোস্ট বা আইপি ঠিকানা কনফিগার করা হয়নি। অনুগ্রহ "
+"করে লগইন অব্যাহত রাখতে নিচে এই তথ্য দিন।"
 
 # tithi
 msgid "Meanwhile Connection Setup"
-msgstr "ইতোমধ্যে সংযোগ সংস্থাপন করুন"
+msgstr "Meanwhile সংযোগ সেটআপ"
 
 # tithi
 msgid "No Sametime Community Server Specified"
-msgstr "কোনো এককালীন সম্প্রদায় সার্ভার উল্লেখিত নয়"
+msgstr "কোনো Sametime Community সার্ভার উল্লেখিত নয়"
 
 msgid "Connect"
-msgstr "সংযোগ দিন"
+msgstr "সংযোগ স্থাপন"
 
 # tithi
 #, c-format
@@ -8538,18 +8589,18 @@ msgid "Unknown (0x%04x)<br>"
 msgstr "অজানা (0x%04x)<br>"
 
 msgid "Last Known Client"
-msgstr "সর্বশেষ পরিচিত গ্রাহক"
+msgstr "সর্বশেষ জানা ক্লায়েন্ট"
 
 msgid "User Name"
 msgstr "ব্যবহারকারীর নাম"
 
 # tithi
 msgid "Sametime ID"
-msgstr "এককালীন আইডি"
+msgstr "Sametime ID"
 
 # tithi
 msgid "An ambiguous user ID was entered"
-msgstr "একটি অনিশ্চিত ব্যবহারকারী আইডি প্রবেশ করা হয়েছিল"
+msgstr "একটি দুর্বোদ্ধ্য ব্যবহারকারী ID প্রবেশ করা হয়েছিল"
 
 # tithi
 #, c-format
@@ -8557,16 +8608,15 @@ msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"'%s' শনাক্তকারী সম্ভবত নিম্নলিখিত যেকোনো ব্যবহারকারীকে উল্লেখ করতে পারে। অনুগ্রহ "
-"করে নিচের তালিকা থেকে সঠিক ব্যবহারকারী নির্বাচন করে আপনার বন্ধু তালিকাতে তাদেরকে "
-"যোগ করুন।"
+"'%s' নিম্নলিখিত যেকোনো ব্যবহারকারীকে বোঝাতে পারে। অনুগ্রহ করে নিচের তালিকা থেকে "
+"সঠিক ব্যবহারকারী নির্বাচন করে আপনার বন্ধু তালিকাতে যোগ করুন।"
 
 msgid "Select User"
-msgstr "ব্যবহারকারী নির্বাচন করুন"
+msgstr "ব্যবহারকারী নির্বাচন"
 
 # tithi
 msgid "Unable to add user: user not found"
-msgstr "ব্যবহারকারী যোগ করতে অক্ষম: ব্যবহারকারী খুঁজে পায়নি"
+msgstr "ব্যবহারকারী যোগ করতে ব্যর্থ: ব্যবহারকারী খুঁজে পাওয়া যায়নি"
 
 # tithi
 #, c-format
@@ -8574,66 +8624,67 @@ msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"'%s' শনাক্তকারী আপনার এককালীন সম্প্রদায়ের কোনো ব্যবহারকারীর সাথে সমন্বয় করে না। "
-"এই এন্ট্রিটি আপনার বন্ধু তালিকা থেকে অপসারণ করা হয়েছে।"
+"'%s' আপনার  Sametime সম্প্রদায়ের কোনো ব্যবহারকারীর সাথে মেলেনি। এই এন্ট্রিটি "
+"আপনার বন্ধু তালিকা থেকে অপসারণ করা হয়েছে।"
 
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
-"%1s ফাইল পড়ায় ত্রুটি: \n"
-"%2s\n"
+"%1$s ফাইল পড়ায় ত্রুটি: \n"
+"%2$s\n"
 
 msgid "Remotely Stored Buddy List"
-msgstr "দূর হতে সংরক্ষিত বন্ধু তালিকা"
+msgstr "দূরে সংরক্ষিত বন্ধু তালিকা"
 
 msgid "Buddy List Storage Mode"
-msgstr "বন্ধু তালিকার সংরক্ষন পদ্ধতি"
+msgstr "বন্ধু তালিকা সংরক্ষণ পদ্ধতি"
 
 msgid "Local Buddy List Only"
 msgstr "শুধুমাত্র স্থানীয় বন্ধু তালিকা"
 
 # tithi
 msgid "Merge List from Server"
-msgstr "সার্ভারের তালিকা একত্রিত করুন"
+msgstr "সার্ভারের তালিকা একত্রিকরণ"
 
 # tithi
 msgid "Merge and Save List to Server"
-msgstr "সার্ভারে তালিকা একত্রিত এবং সংরক্ষণ করুন"
+msgstr "সার্ভারে তালিকা একত্রিকরণ ও সংরক্ষণ"
 
 # tithi
 msgid "Synchronize List with Server"
-msgstr "সার্ভারের সঙ্গে সমকালীন তালিকা"
+msgstr "সার্ভারের সঙ্গে তালিকা অভিন্ন করা হবে"
 
 # tithi
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "%s একাউন্টের জন্য এককালীন তালিকা আমদানি করুন"
+msgstr "%s একাউন্টের জন্য Sametime তালিকা ইমপোর্ট করুন"
 
 # tithi
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "%s একাউন্টের জন্য এককালীন তালিকা রপ্তানি করুন"
+msgstr "%s একাউন্টের জন্য Sametime তালিকা এক্সপোর্ট করুন"
 
 # tithi
 msgid "Unable to add group: group exists"
-msgstr "দল যোগ করতে অক্ষম: দল বিদ্যমান"
+msgstr "দল যোগ করতে ব্যর্থ: দল বিদ্যমান"
 
 # tithi
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "'%s' নামের একটি দল আপনার বন্ধু তালিকায় ইতোমধ্যে বিদ্যমান রয়েছে।"
+msgstr "'%s' নামের একটি দল আপনার বন্ধু তালিকায় ইতিমধ্যে বিদ্যমান।"
 
 msgid "Unable to add group"
 msgstr "দল যোগ করতে ব্যর্থ"
 
 # tithi
 msgid "Possible Matches"
-msgstr "সম্ভাব্য মিলসমূহ"
+msgstr "সম্ভাব্য মিল"
 
+# ***
 msgid "Notes Address Book group results"
-msgstr "নোটের ঠিকানা বইয়ের দলগত ফলাফল"
+msgstr "Notes Address Book দলের ফলাফল"
 
 # tithi
 #, c-format
@@ -8642,16 +8693,15 @@ msgid ""
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"'%s' শনাক্তকারী সম্ভবত নিম্নলিখিত নোট ঠিকানা বইয়ের দলের যেকোনোটি উল্লেখ করতে "
-"পারে। অনুগ্রহ করে নিচের তালিকা থেকে সঠিক গ্রুপ নির্বাচন করে আপনার বন্ধু তালিকায় এটি "
-"যোগ করুন।"
+"'%s' নিম্নলিখিত যেকোন Notes Address Book দলকে বোঝাতে পারে। অনুগ্রহ করে নিচের "
+"তালিকা থেকে সঠিক দল নির্বাচন করে আপনার বন্ধু তালিকায় যোগ করুন।"
 
 msgid "Select Notes Address Book"
-msgstr "নোটের ঠিকানা বই নির্বাচন করুন"
+msgstr "Notes Address Book নির্বাচন"
 
 # tithi
 msgid "Unable to add group: group not found"
-msgstr "দল যোগ করতে অক্ষম: দল খুঁজে পায়নি"
+msgstr "দল যোগ করতে ব্যর্থ: দল খুঁজে পাওয়া যায়নি"
 
 # tithi
 #, c-format
@@ -8659,23 +8709,23 @@ msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-"'%s' শনাক্তকারী আপনার এককালীন সম্প্রদায়ের কোনো নোট ঠিকানা বইয়ের দলের সাথে সমন্বয় "
-"করেনি।"
+"'%s' আপনার Sametime সম্প্রদায়ের কোনো Notes Address Book দলের সাথে মেলেনি।"
 
+# ***
 msgid "Notes Address Book Group"
-msgstr "নোটের ঠিকানা বইয়ের দল"
+msgstr "Notes Address Book দল"
 
 # tithi
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
-"নিচের ক্ষেত্রে নোটের ঠিকানা বইয়ের গ্রুপের নাম প্রবেশ করে আপনার বন্ধু তালিকায় শ্রেণী "
-"এবং এর সদসদের যোগ করুন।"
+"নিচের ক্ষেত্রে Notes Address Book দলের নাম প্রবেশ করে দল এবং এর সদস্যদের আপনার "
+"বন্ধু তালিকায় যোগ করুন।"
 
 #, c-format
 msgid "Search results for '%s'"
-msgstr "'%s' এর সন্ধান ফলাফল"
+msgstr "'%s' অনুসন্ধানের ফলাফল"
 
 # tithi
 #, c-format
@@ -8684,9 +8734,9 @@ msgid ""
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
-"'%s' শনাক্তকারী সম্ভবত নিম্নলিখিত যেকোনো ব্যবহারকারীকে উল্লেখ করতে পারে। আপনি "
-"সম্ভবত নিচের কার্য বোতাম দ্বারা আপনার বন্ধু তালিকাতে এই ব্যবহারকারীসমূহ যোগ করতে "
-"পারেন বা তাদেরকে বার্তা পাঠাতে পারেন।"
+"'%s' শনাক্তকারী নিম্নলিখিত যেকোনো ব্যবহারকারীকে বোঝাতে পারে। আপনি আপনার বন্ধু "
+"তালিকাতে এই ব্যবহারকারীসমূহ যোগ করতে পারেন বা তাদেরকে নিচের বোতাম দ্বারা বার্তা "
+"পাঠাতে পারেন।"
 
 msgid "Search Results"
 msgstr "অনুসন্ধানের ফলাফল"
@@ -8697,47 +8747,47 @@ msgstr "কোনে মিল নেই"
 # tithi
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr "'%s' শনাক্তকারী আপনার এককালীন সম্প্রদায়ের কোনো ব্যবহারকারীর সাথে মিলেনি।"
+msgstr "'%s' শনাক্তকারী আপনার Sametime সম্প্রদায়ের কোনো ব্যবহারকারীর সাথে মিলেনি।"
 
 msgid "No Matches"
 msgstr "কোনো মিল নেই"
 
 msgid "Search for a user"
-msgstr "একজন ব্যবহারকারীর জন্য অনুসন্ধান করুন"
+msgstr "ব্যবহারকারী অনুসন্ধান"
 
 # tithi
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
-"আপনার এককালীন সম্প্রদায়ের সমন্বয়করণ ব্যবহারকারীর জন্য অনুসন্ধান করতে নিচের ক্ষেত্রে "
-"একটি নাম বা আংশিক আইডি প্রবেশ করান।"
+"আপনার Sametime সম্প্রদায়ের ব্যবহারকারী অনুসন্ধান করতে নিচের ক্ষেত্রে একটি নাম বা "
+"আংশিক ID দিন।"
 
 msgid "User Search"
-msgstr "ব্যবহারকারী অনুসন্ধান করুন"
+msgstr "ব্যবহারকারী অনুসন্ধান"
 
 # tithi
 msgid "Import Sametime List..."
-msgstr "এককালীন তালিকা আমদানি করুন..."
+msgstr "Sametime তালিকা ইমপোর্ট..."
 
 # tithi
 msgid "Export Sametime List..."
-msgstr "এককালীন তালিকা রপ্তানি করুন..."
+msgstr "Sametime তালিকা এক্সপোর্ট..."
 
 msgid "Add Notes Address Book Group..."
-msgstr "নোটের ঠিকানা বইয়ের দল যোগ করুন..."
+msgstr "Notes Address Book দল যোগ..."
 
 msgid "User Search..."
-msgstr "ব্যবহারকারী অনুসন্ধান করুন..."
+msgstr "ব্যবহারকারী অনুসন্ধান..."
 
 # tithi
 msgid "Force login (ignore server redirects)"
-msgstr "লগইন বাধ্য করুন  (সার্ভারের পুনঃ নির্দেশনাগুলো উপেক্ষা করুন)"
+msgstr "লগইন বাধ্য করা হবে (সার্ভারের রিডিরেক্টগুলো উপেক্ষা করে)"
 
 # tithi
 #. pretend to be Sametime Connect
 msgid "Hide client identity"
-msgstr "গ্রাহক পরিচয় গোপন করুন"
+msgstr "ক্লায়েন্টের পরিচয় গোপন করা হবে"
 
 # tithi
 #, c-format
@@ -8749,42 +8799,42 @@ msgstr "মূল চুক্তি"
 
 # tithi
 msgid "Cannot perform the key agreement"
-msgstr "মূল চুক্তি সম্পাদন করতে পারে না"
+msgstr "মূল চুক্তি সম্পাদন করা সম্ভব হয়নি"
 
 # tithi
 msgid "Error occurred during key agreement"
-msgstr "মূল চুক্তির সময় ত্রুটি ঘটেছিল"
+msgstr "মূল চুক্তির সময় ত্রুটি হয়েছে"
 
 # tithi
 msgid "Key Agreement failed"
-msgstr "মূং চুক্তি ব্যর্থ হয়েছে"
+msgstr "মূল চুক্তি ব্যর্থ হয়েছে"
 
 # tithi
 msgid "Timeout during key agreement"
-msgstr "মূল চুক্তির সময় মেয়াদ উত্তীর্ণ হয়েছে"
+msgstr "মূল চুক্তির সময় উত্তীর্ণ হয়ে গেছে"
 
 # tithi
 msgid "Key agreement was aborted"
-msgstr "মূল চুক্তি বাতিল করা হয়েছিল"
+msgstr "মূল চুক্তি বাতিল করা হয়েছে"
 
 # tithi
 msgid "Key agreement is already started"
-msgstr "মূল চুক্তি ইতোমধ্যে শুরু হয়েছে"
+msgstr "মূল চুক্তি ইতিমধ্যে শুরু হয়েছে"
 
 # tithi
 msgid "Key agreement cannot be started with yourself"
-msgstr "মূল চুক্তি আপনার সঙ্গে শুরু করা যায় না"
+msgstr "মূল চুক্তি আপনার নিজের সঙ্গে শুরু করা যাবে না"
 
 # tithi
 msgid "The remote user is not present in the network any more"
-msgstr "দূরবর্তী ব্যবহারকারী আর নেটওয়ার্কে উপস্থিত থাকবে না"
+msgstr "দূরবর্তী ব্যবহারকারী নেটওয়ার্কে আর উপস্থিত নেই"
 
 # tithi
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
-msgstr "মূল চুক্তির অনুরোধ %s থেকে গ্রহণ করেছে। আপনি কি মূল চুক্তি সম্পাদন করতে আগ্রহী?"
+msgstr "%s থেকে মূল চুক্তির অনুরোধ গৃহীত হয়েছে। আপনি কি মূল চুক্তি সম্পাদন করতে আগ্রহী?"
 
 #, c-format
 msgid ""
@@ -8801,35 +8851,35 @@ msgid "Key Agreement Request"
 msgstr "মূল চুক্তির অনুরোধ"
 
 msgid "IM With Password"
-msgstr "গুপ্তসঙ্কেত যুক্ত আইএম"
+msgstr "পাসওয়ার্ড যুক্ত IM"
 
 msgid "Cannot set IM key"
-msgstr "আইএম কী বিন্যাস করতে পারে না"
+msgstr "IM কী বিন্যাস নির্ধারণ করা সম্ভব হয়নি"
 
 msgid "Set IM Password"
-msgstr "আইএম গুপ্তসঙ্কেত বিন্যাস করুন"
+msgstr "IM পাসওয়ার্ড নির্ধারণ"
 
 # tithi
 msgid "Get Public Key"
-msgstr "সর্বসাধারণ কী গ্রহণ করুন"
+msgstr "পাবলিক কী খোঁজা হবে"
 
 # tithi
 msgid "Cannot fetch the public key"
-msgstr "সর্বসাধারণ কী পুনরুদ্ধার করতে পারে না"
+msgstr "পাবলিক কী আনা সম্ভব হয়নি"
 
 # tithi
 msgid "Show Public Key"
-msgstr "সর্বসাধারণ কী দেখান"
+msgstr "পাবলিক কী প্রদর্শন"
 
 # tithi
 msgid "Could not load public key"
-msgstr "সর্বসাধারণ কী লোড করতে পারেনি"
+msgstr "পাবলিক কী লোড করা সম্ভব হয়নি"
 
 msgid "User Information"
 msgstr "ব্যবহারকারী তথ্য"
 
 msgid "Cannot get user information"
-msgstr "ব্যবহারকারীর তথ্য গ্রহণ করতে পারে না"
+msgstr "ব্যবহারকারীর তথ্য পাওয়া যায়নি"
 
 # fix me tithi
 #, c-format
@@ -8841,9 +8891,8 @@ msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"আপনি যতক্ষণ পর্যন্ত না বন্ধুর সর্বসাধারণ কী আমদানি করেন ততক্ষন পর্যন্ত তার বিজ্ঞপ্তি "
-"গ্রহণ করতে পাবেন না। আপনি পাবলিক কী গ্রহণ করতে 'পাবলিক কী গ্রহণ করুন' নির্দেশ "
-"ব্যবহার করতে পারেন না।"
+"আপনি যতক্ষণ পর্যন্ত না বন্ধুর পাবলিক কী ইমপোর্ট করবেন ততক্ষন পর্যন্ত তার ঘোষণা গ্রহণ "
+"করবেন না। আপনি পাবলিক কী পেতে Get Public Key কমান্ডটি ব্যবহার করতে পারেন।"
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -8859,30 +8908,30 @@ msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
-"বন্ধু যোগ করতে আপনাকে অবশ্যই তার সর্বসাধারণ কী আমদানি করতে হবে। সর্বসাধারণ কী "
-"আমদানি করতে 'আমদানি করুন' চাপুন।"
+"বন্ধু যোগ করতে আপনাকে অবশ্যই তার পাবলিক কী ইমপোর্ট করতে হবে। পাবলিক কী ইমপোর্ট "
+"করতে 'ইমপোর্ট' চাপুন।"
 
 # tithi
 msgid "_Import..."
-msgstr "আমদানি করুন... (_I)"
+msgstr "ইমপোর্ট... (_I)"
 
 msgid "Select correct user"
-msgstr "সঠিক ব্যবহারকারী নির্বাচন করুন"
+msgstr "সঠিক ব্যবহারকারী নির্বাচন"
 
 # tithi
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
-"একই সর্বসাধারণ কী দ্বারা একাধিক ব্যবহারকারীর খুঁজে পেয়েছিল। বন্ধু তালিকাতে যোগ করতে "
-"তালিকা থেকে সঠিক ব্যবহারকারী নির্বাচন করুন।"
+"একই পাবলিক কী সহ একাধিক ব্যবহারকারী পাওয়া গেছে। বন্ধু তালিকাতে যোগ করতে তালিকা "
+"থেকে সঠিক ব্যবহারকারী নির্বাচন করুন।"
 
 # tithi
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
-"একই নামে একাধিক ব্যবহারকারীর খুঁজে পেয়েছিল। বন্ধু তালিকাতে যোগ করতে তালিকা থেকে "
+"একই নামে একাধিক ব্যবহারকারী পাওয়া গেছে। বন্ধু তালিকাতে যোগ করতে তালিকা থেকে "
 "সঠিক ব্যবহারকারী নির্বাচন করুন।"
 
 # tithi
@@ -8895,11 +8944,11 @@ msgstr "অক্ষম"
 
 # tithi
 msgid "Wake Me Up"
-msgstr "আমাকে জাগান"
+msgstr "আমাকে ঘুম থেকে জাগান"
 
 # tithi
 msgid "Hyper Active"
-msgstr "অতিমাত্রায় সক্রিয়"
+msgstr "অতিসক্রিয়"
 
 msgid "Robot"
 msgstr "যন্ত্রমানব"
@@ -8908,7 +8957,7 @@ msgid "Happy"
 msgstr "সুখী"
 
 msgid "Sad"
-msgstr "দু:খী"
+msgstr "দুঃখী"
 
 msgid "Angry"
 msgstr "রাগী"
@@ -8925,7 +8974,7 @@ msgstr "অজেয়"
 
 # tithi
 msgid "In Love"
-msgstr "ভালবাসাতে"
+msgstr "প্রেমময়"
 
 msgid "Sleepy"
 msgstr "ঘুমন্ত"
@@ -8940,10 +8989,10 @@ msgid "Anxious"
 msgstr "উদ্বিগ্ন"
 
 msgid "User Modes"
-msgstr "ব্যবহাকারীর পরিমন্ডলসমূহ"
+msgstr "ব্যবহারকারী মোড"
 
 msgid "Preferred Contact"
-msgstr "পছন্দের যোগাযোগ"
+msgstr "পছন্দের ব্যক্তি"
 
 msgid "Preferred Language"
 msgstr "পছন্দের ভাষা"
@@ -8953,7 +9002,7 @@ msgid "Device"
 msgstr "ডিভাইস"
 
 msgid "Timezone"
-msgstr "সময়-এলাকা"
+msgstr "সময় অঞ্চল"
 
 # tithi
 msgid "Geolocation"
@@ -8961,30 +9010,30 @@ msgstr "ভৌগলিক-অবস্থান"
 
 # tithi
 msgid "Reset IM Key"
-msgstr "IM কী পুনঃ বিন্যাস করুন"
+msgstr "IM কী রিসেট করা হবে"
 
 # tithi
 msgid "IM with Key Exchange"
 msgstr "কী বিনিময় সহ IM"
 
 msgid "IM with Password"
-msgstr "গুপ্তসঙ্কেত যুক্ত আইএম"
+msgstr "পাসওয়ার্ডযুক্ত IM"
 
 # tithi
 msgid "Get Public Key..."
-msgstr "সর্বসাধারণ কী গ্রহণ করুন..."
+msgstr "পাবলিক কী গ্রহণ করা হবে..."
 
 # tithi
 msgid "Kill User"
-msgstr "ব্যবহারকারীকে মুছে ফেলুন"
+msgstr "ব্যবহারকারী নিষ্ক্রিয় করুন"
 
 # tithi
 msgid "Draw On Whiteboard"
-msgstr "সাদা-বোর্ডে অংকন করুন"
+msgstr "হোয়াইটবোর্ডে অংকন করুন"
 
 # tithi
 msgid "_Passphrase:"
-msgstr "প্যাস-ফ্রেজ (_P):"
+msgstr "পাসফ্রেজ (_P):"
 
 # tithi
 #, c-format
@@ -8995,7 +9044,7 @@ msgid "Channel Information"
 msgstr "চ্যানেল তথ্য"
 
 msgid "Cannot get channel information"
-msgstr "চ্যানেলের তথ্য পায় না"
+msgstr "চ্যানেলের তথ্য পাওয়া যায়নি"
 
 #, c-format
 msgid "<b>Channel Name:</b> %s"
@@ -9003,7 +9052,7 @@ msgstr "<b>চ্যানেলের নাম:</b> %s"
 
 #, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<br><b>ব্যবহারকারী গণনা করুন:</b> %d"
+msgstr "<br><b>মোট ব্যবহারকারী:</b> %d"
 
 # tithi
 #, c-format
@@ -9032,28 +9081,28 @@ msgstr "<br><b>চ্যানেল মোড:</b>"
 # tithi
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b> প্রতিষ্ঠাতার মূল হস্তাঙ্গুলির-ছাপ:</b><br>%s"
+msgstr "<br><b> Founder মূল ফিঙ্গারপ্রিন্ট:</b><br>%s"
 
 # tithi
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>প্রতিষ্ঠাতার মূল ব্যাবলপ্রিন্ট:</b><br>%s"
+msgstr "<br><b>Founder মূল ব্যাবলপ্রিন্ট:</b><br>%s"
 
 # tithi
 msgid "Add Channel Public Key"
-msgstr "চ্যানেলের সর্বসাধারণ কী যুক্ত করুন"
+msgstr "চ্যানেলের পাবলিক কী যোগ"
 
 # tithi
 #. Add new public key
 msgid "Open Public Key..."
-msgstr "সর্বসাধারণ কী খুলুন..."
+msgstr "পাবলিক কী খুলুন..."
 
 # tithi
 msgid "Channel Passphrase"
-msgstr "চ্যানেলের প্যাস-ফ্রেজ"
+msgstr "চ্যানেলের পাসফ্রেজ"
 
 msgid "Channel Public Keys List"
-msgstr "চ্যানেলের সর্বসাধারণ কী এর তালিকা"
+msgstr "চ্যানেলের পাবলিক কী এর তালিকা"
 
 # tithi
 #, c-format
@@ -9064,33 +9113,33 @@ msgid ""
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"চ্যানেল প্রমাণীকরণ চ্যানেলকে অনুমোদন বিহীন প্রবেশ থেকে নিরাপদ রাখতে ব্যবহার করা "
-"হয়। প্রমাণীকরণ সম্ভবত প্যাসফ্রেজ এবং ডিজিট্যাল স্বাক্ষর ভিত্তিক। যদি প্যাসফ্রেজ "
-"নির্ধারণ করা হয়, এটি যোগদান করতে সক্রিয় হতে হবে। যদি চ্যানেলের সর্বসাধারণ কী "
-"নির্ধারণ করা হয় তবে শুধুমাত্র সর্বসাধারণ কী যুক্ত তালিকাভুক্ত ব্যবহারকারীরা যোগদান "
-"করতে সক্ষম হবে।"
+"চ্যানেলকে অনুমোদনবিহীন প্রবেশ থেকে নিরাপদ রাখতে চ্যানেল প্রমাণীকরণ ব্যবহার করা হয়। "
+"প্রমাণীকরণ পাসফ্রেজ এবং ডিজিট্যাল স্বাক্ষর ভিত্তিক হতে পারে। যদি পাসফ্রেজ নির্ধারণ "
+"করা হয়ে থাকে তাহলে যোগদান করতে এটি প্রয়োগ করতে হবে। যদি চ্যানেলের পাবলিক কী "
+"নির্ধারণ করা হয়, তবে শুধুমাত্র যেসব ব্যবহারকারীদের পাবলিক কী তালিকাভুক্ত আছে তারা "
+"যোগদান করতে পারবেন।"
 
 # tithi
 msgid "Channel Authentication"
-msgstr "চ্যানেলের প্রমাণীকরণ"
+msgstr "চ্যানেল প্রমাণীকরণ"
 
 msgid "Add / Remove"
-msgstr "যোগ / অপসরণ করুন"
+msgstr "যোগ / অপসারণ"
 
 msgid "Group Name"
-msgstr "গ্রুপের নাম"
+msgstr "দলের নাম"
 
 # tithi
 msgid "Passphrase"
-msgstr "প্যাস-ফ্রেজ"
+msgstr "পাসফ্রেজ"
 
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "অনুগ্রহ করে %s চ্যানেলের ব্যক্তিগত গ্রুপের নাম ও প্যাস-ফ্রেজ প্রবেশ করান।"
+msgstr "অনুগ্রহ করে %s চ্যানেলের ব্যক্তিগত দলের নাম ও পাসফ্রেজ দিন।"
 
 # tithi
 msgid "Add Channel Private Group"
-msgstr "চ্যানেলের ব্যক্তিগত গ্রুপ যোগ করুন"
+msgstr "চ্যানেলের ব্যক্তিগত দল যোগ"
 
 msgid "User Limit"
 msgstr "ব্যবহারকারীর সীমা"
@@ -9098,8 +9147,8 @@ msgstr "ব্যবহারকারীর সীমা"
 # tithi
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
-"চ্যানেলে ব্যবহারকারীর সীমা নির্ধারণ করুন। ব্যবহারকারী সীমা পুনঃ বিন্যাস করতে শূন্যে "
-"নির্ধরণ করুন।"
+"চ্যানেলে ব্যবহারকারীর সীমা নির্ধারণ করুন। ব্যবহারকারী সীমা পুনঃ বিন্যাস করতে শূন্য "
+"নির্ধারন করুন।"
 
 msgid "Invite List"
 msgstr "আমন্ত্রন তালিকা"
@@ -9108,65 +9157,63 @@ msgid "Ban List"
 msgstr "নিষিদ্ধ তালিকা"
 
 msgid "Add Private Group"
-msgstr "ব্যক্তিগত দল যোগ করুন"
+msgstr "ব্যক্তিগত দল যোগ"
 
 # tithi
 msgid "Reset Permanent"
-msgstr "স্থায়ীভাবে পুনরায় বিন্যাস করুন"
+msgstr "স্থায়ীভাবে রিসেট"
 
 # tithi
 msgid "Set Permanent"
-msgstr "স্থায়ীভাবে বিন্যাস করুন"
+msgstr "স্থায়ীভাবে বিন্যাস"
 
 msgid "Set User Limit"
-msgstr "ব্যবহারকারীর সীমা নির্ধারন করুন"
+msgstr "ব্যবহারকারীর সীমা নির্ধারন"
 
 msgid "Reset Topic Restriction"
-msgstr "বিষয়বস্তুর নিষেধাজ্ঞা পুনরায় নির্ধারণ করুন"
+msgstr "বিষয়বস্তু সীমিতকরণ রিসেট"
 
 # tithi
 msgid "Set Topic Restriction"
-msgstr "বিষয়বস্তুর নিষেধাজ্ঞা নির্ধারণ করুন"
+msgstr "বিষয়বস্তু সীমিতকরণ নির্ধারন"
 
 # tithi
 msgid "Reset Private Channel"
-msgstr "ব্যক্তিগত চ্যানেল পুনরায় নির্ধারণ করুন"
+msgstr "ব্যক্তিগত চ্যানেল পুনঃনির্ধারণ করুন"
 
 # tithi
 msgid "Set Private Channel"
-msgstr "ব্যক্তিগত চ্যানেল নির্ধারণ করুন"
+msgstr "ব্যক্তিগত চ্যানেল নির্ধারণ"
 
 # tithi
 msgid "Reset Secret Channel"
-msgstr "গোপন চ্যানেল পুনরায় নির্ধারণ করুন"
+msgstr "গোপন চ্যানেল পুনঃনির্ধারণ"
 
 # tithi
 msgid "Set Secret Channel"
-msgstr "গোপন চ্যানেল নির্ধারণ করুন"
+msgstr "গোপন চ্যানেল নির্ধারণ"
 
 # tithi
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
-msgstr ""
-"আপনি ব্যক্তিগত গ্রুপে যোগদানে সমর্থ হওয়ার পূর্বে আপনাকে অবশ্যই %s চ্যানেলে যোগ দিতে "
-"হবে"
+msgstr "আপনাকে ব্যক্তিগত দলে যোগদানের পূর্বে অবশ্যই %s চ্যানেলে যোগ দিতে হবে"
 
 msgid "Join Private Group"
-msgstr "ব্যক্তিগত গ্রুপে যোগ দিন"
+msgstr "ব্যক্তিগত দলে যোগ দিন"
 
 # tithi
 msgid "Cannot join private group"
-msgstr "ব্যক্তিগত চ্যানেলে যোগ দিতে পারে না"
+msgstr "ব্যক্তিগত দলে যোগ দেয়া সম্ভব হয়নি"
 
 msgid "Call Command"
-msgstr "নির্দেশ কল করুন"
+msgstr "কমান্ড কল করুন"
 
 msgid "Cannot call command"
-msgstr "নির্দেশ কল করতে পারে না"
+msgstr "কমান্ড কল করা সম্ভব হয়নি"
 
 msgid "Unknown command"
-msgstr "অজানা নির্দেশ"
+msgstr "অজানা কমান্ড"
 
 msgid "Secure File Transfer"
 msgstr "নিরাপদ ফাইল স্থানান্তর"
@@ -9179,7 +9226,7 @@ msgstr "দূরবর্তী সংযোগ বিচ্ছিন্ন"
 
 # tithi
 msgid "Permission denied"
-msgstr "অনুমতি অস্বীকৃত"
+msgstr "অনুমতি প্রত্যাখ্যাত"
 
 # tithi
 msgid "Key agreement failed"
@@ -9187,72 +9234,72 @@ msgstr "মূল চুক্তি ব্যর্থ"
 
 # fix me tithi
 msgid "Connection timed out"
-msgstr "সংযোগ সময় শেষ"
+msgstr "সংযোগের সময় উত্তীর্ন"
 
 msgid "Creating connection failed"
 msgstr "সংযোগ তৈরীতে ব্যর্থ"
 
 msgid "File transfer session does not exist"
-msgstr "ফাইল স্থানান্তর অধিবেশন বিদ্যমান নয়"
+msgstr "ফাইল স্থানান্তর সেশন বিদ্যমান নয়"
 
 msgid "No file transfer session active"
-msgstr "কোনো ফাইল স্থানান্তর অধিবেশন সক্রিয় নয়"
+msgstr "কোনো ফাইল স্থানান্তর সেশন সক্রিয় নয়"
 
 msgid "File transfer already started"
-msgstr "ফাইল স্থানান্তর ইতোমধ্যে শুরু হয়েছে"
+msgstr "ফাইল স্থানান্তর ইতিমধ্যে শুরু হয়েছে"
 
 # tithi
 msgid "Could not perform key agreement for file transfer"
-msgstr "ফাইল স্থানান্তরের জন্য মূল চুক্তি সম্পাদন করতে পারে না"
+msgstr "ফাইল স্থানান্তরের মূল চুক্তি সম্পাদন করা সম্ভব হয়নি"
 
 msgid "Could not start the file transfer"
-msgstr "ফাইল স্থানান্তর শুরু করেনি"
+msgstr "ফাইল স্থানান্তর শুরু করা সম্ভব হয়নি"
 
 msgid "Cannot send file"
-msgstr "ফাইল পাঠাতে পারে না"
+msgstr "ফাইল পাঠানো সম্ভব হয়নি"
 
 msgid "Error occurred"
-msgstr "ত্রুটি সংঘটিত হয়েছে"
+msgstr "ত্রুটি হয়েছে"
 
 # tithi
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%1s <I>%2s</I> এর বিষয়বস্তু পরিবর্তন করেছে: %3s"
+msgstr "%1$s <I>%2$s</I> এর বিষয়বস্তু পরিবর্তন করেছে, এখন তা: %3$s"
 
 # tithi
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr "<I>%s</I> চ্যানেল <I>%s</I> মোডসমূহ নির্ধারণ করে: %s"
+msgstr "<I>%1$s</I> চ্যানেলের <I>%2$s</I> মোড নির্ধারণ করেছে: %3$s"
 
 # tithi
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr "<I>%s</I> সমস্ত চ্যানেল <I>%s</I> মোডসমূহ অপসারণ করেছে"
+msgstr "<I>%1$s</I> সমস্ত চ্যানেলের <I>%2$s</I> মোড অপসারণ করেছে"
 
 # tithi
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr "<I>%s</I> মোড <I> %s</I> নির্ধারণ করে: %s-এ"
+msgstr "<I>%2$sর</I> মোড <I>%1$s</I> নির্ধারণ করেছে: %3$s"
 
 # tithi
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr "<I>%s's</I> সব <I>%s</I> মোডসমূহ অপসারণ করেছে"
+msgstr "<I>%2$sর</I> সব মোড <I>%1$s</I> অপসারণ করেছে"
 
 # tithi
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "আপনি <I>%s</I> (%s) দ্বারা <I>%s</I> প্রত্যাখাতি হয়েছন"
+msgstr "আপনি <I>%2$s</I> (%3$s) দ্বারা <I>%1$s</I> থেকে তিরস্কৃত হয়েছেন"
 
 # tithi
 #, c-format
 msgid "You have been killed by %s (%s)"
-msgstr "আপনাকে %1s (%2s) দ্বারা অপসারণ করা হয়েছে"
+msgstr "%1$s (%2$s) আপনাকে নিষ্ক্রিয় করে দিয়েছে"
 
 # tithi
 #, c-format
 msgid "Killed by %s (%s)"
-msgstr "%1s (%2s) দ্বারা অপসারণ করা হয়েছে"
+msgstr "%1$s (%2$s) দ্বারা নিষ্ক্রিয় করা হয়েছে"
 
 msgid "Server signoff"
 msgstr "সার্ভার সাইন-অফ"
@@ -9265,16 +9312,13 @@ msgstr "জন্মদিন"
 
 # tithi
 msgid "Job Role"
-msgstr "কর্ম ভূমিকা"
+msgstr "কাজের ভূমিকা"
 
 msgid "Organization"
-msgstr "সংঘঠন"
+msgstr "সংগঠন"
 
 msgid "Unit"
-msgstr "একক"
-
-msgid "Note"
-msgstr "নোট"
+msgstr "বিভাগ"
 
 msgid "Join Chat"
 msgstr "আড্ডায় যোগ দিন"
@@ -9287,57 +9331,57 @@ msgstr "আপনি <I>%s</I> এ চ্যানেল প্রতিষ্�
 # tithi
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "<I>%s</I> এর চ্যানেল প্রতিষ্ঠাতা হলো <I>%s</I>"
+msgstr "<I>%s</I> চ্যানেলের প্রতিষ্ঠাতা হলো <I>%s</I>"
 
 msgid "Real Name"
 msgstr "আসল নাম"
 
 msgid "Status Text"
-msgstr "অবস্থা পাঠ"
+msgstr "অবস্থা টেক্সট"
 
 # tithi
 msgid "Public Key Fingerprint"
-msgstr "সর্বসাধারণ কী-এর হস্তাঙ্গুলির-ছাপ"
+msgstr "পাবলিক কী ফিঙ্গারপ্রিন্ট"
 
 # tithi
 msgid "Public Key Babbleprint"
-msgstr "সর্বসাধারণ কী-এর ব্যাবলপ্রিন্ট"
+msgstr "পাবলিক কী ব্যাবলপ্রিন্ট"
 
 msgid "_More..."
 msgstr "আরও... (_M)"
 
 # tithi
 msgid "Detach From Server"
-msgstr "সার্ভার থেকে বিচ্ছিন্ন"
+msgstr "সার্ভার থেকে বিচ্ছিন্নকরণ"
 
 # tithi
 msgid "Cannot detach"
-msgstr "বিচ্ছিন্ন হতে পারে না"
+msgstr "বিচ্ছিন্ন করা সম্ভব হচ্ছে না"
 
 msgid "Cannot set topic"
-msgstr "বিষয়বস্তু ঠিক করতে পারে না"
+msgstr "বিষয়বস্তু ঠিক করা যাচ্ছে না"
 
 msgid "Failed to change nickname"
 msgstr "ডাকনাম পরিবর্তন করতে ব্যর্থ"
 
 msgid "Roomlist"
-msgstr "রুম-তালিকা"
+msgstr "আসরের-তালিকা"
 
 msgid "Cannot get room list"
-msgstr "রুম-তালিকা পাওয়া যাচ্ছে না"
+msgstr "আসরের-তালিকা পাওয়া যায়নি"
 
 msgid "Network is empty"
 msgstr "নেটওয়ার্ক খালি"
 
 # tithi
 msgid "No public key was received"
-msgstr "কোনো সর্বসাধারণ কী খুঁজে পায়নি"
+msgstr "কোনো পাবলিক কী খুঁজে পাওয়া যায়নি"
 
 msgid "Server Information"
 msgstr "সার্ভারের তথ্য"
 
 msgid "Cannot get server information"
-msgstr "সার্ভারের তথ্য গ্রহণ করতে পারে না"
+msgstr "সার্ভারের তথ্য খুঁজে পাওয়া যায়নি"
 
 msgid "Server Statistics"
 msgstr "সার্ভারের পরিসংখ্যান"
@@ -9363,56 +9407,59 @@ msgid ""
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
-"স্থানীয় সার্ভারের প্রারম্ভিক সময়: %1s\n"
-"স্থানীয় সার্ভারের আপটাইম: %2s\n"
-"স্থানীয় সার্ভারের গ্রাহকগণ: %3d\n"
-"স্থানীয় সার্ভারের চ্যানেলসমূহ: %4d\n"
-"স্থানীয় সার্ভারের পরিচালকগণ: %5d\n"
-"স্থানীয় রাউটারের পরিচালকগণ: %6d\n"
-"স্থানীয় প্রকোষ্ঠের গ্রাহকগণ: %7d\n"
-"স্থানীয় প্রকোষ্ঠের চ্যানেলগুলো: %8d\n"
-"স্থানীয় প্রকোষ্ঠের সার্ভার: %9d\n"
-"মোট গ্রহক: %10d\n"
-"মোট চ্যানেল: %11d\n"
-"মোট সার্ভার: %12d\n"
-"মোট রাউটার: %13d\n"
-"মোট সার্ভারের পরিচালকগণ: %14d\n"
-"মোট রাউটারের পরিচালকগণ: %15d\n"
+"স্থানীয় সার্ভারের শুরুর সময়: %1$s\n"
+"স্থানীয় সার্ভারের আপটাইম: %2$s\n"
+"স্থানীয় সার্ভারের ক্লায়েন্ট: %3$d\n"
+"স্থানীয় সার্ভারের চ্যানেল: %4$d\n"
+"স্থানীয় সার্ভারের অপারেটর: %5$d\n"
+"স্থানীয় রাউটারের অপারেটর: %6$d\n"
+"স্থানীয় সেল ক্লায়েন্ট: %7$d\n"
+"স্থানীয় সেল চ্যানেল: %8$d\n"
+"স্থানীয় সেল সার্ভার: %9$d\n"
+"মোট গ্রহক: %10$d\n"
+"মোট চ্যানেল: %11$d\n"
+"মোট সার্ভার: %12$d\n"
+"মোট রাউটার: %13$d\n"
+"মোট সার্ভারের অপারেটর: %14$d\n"
+"মোট রাউটারের অপারেটর: %15$d\n"
 
 msgid "Network Statistics"
 msgstr "নেটওয়ার্ক পরিসংখ্যান"
 
+msgid "Ping"
+msgstr "পিং করুন"
+
 msgid "Ping failed"
-msgstr "পিঙ্গ ব্যর্থ"
+msgstr "পিং ব্যর্থ"
 
 msgid "Ping reply received from server"
-msgstr "সার্ভার থেকে পিঙ্গ এর উত্তর গ্রহন করা হয়েছে"
+msgstr "সার্ভার থেকে পিং এর উত্তর গ্রহন করা হয়েছে"
 
 # tithi
 msgid "Could not kill user"
-msgstr "ব্যবহারকারীকে বিচ্ছিন্ন করা সম্ভব হচ্ছে না"
+msgstr "ব্যবহারকারীকে নিষ্ক্রিয় করা সম্ভব হয়নি"
 
 # tithi
 msgid "WATCH"
-msgstr "পর্যবেক্ষণ করুন"
+msgstr "পর্যবেক্ষণ"
 
 msgid "Cannot watch user"
-msgstr "ব্যবহারকারীকে পর্যবেক্ষণ করতে পারছে না"
+msgstr "ব্যবহারকারীকে পর্যবেক্ষণ করা সম্ভব হচ্ছে না"
 
 # tithi
 msgid "Resuming session"
-msgstr "অধিবেশন পুনরায় শুরু করছে"
+msgstr "সেশন পুনরায় শুরু করা হচ্ছে"
 
 # tithi
 msgid "Authenticating connection"
-msgstr "সংযোগ প্রমাণ করছে"
+msgstr "সংযোগ প্রমাণীকরণ চলছে"
 
 msgid "Verifying server public key"
-msgstr "সার্ভারের সর্বসাধারণ কী পরীক্ষা করছে"
+msgstr "সার্ভারের পাবলিক কীর সত্যতা যাচাই করা হচ্ছে"
 
 # tithi
 msgid "Passphrase required"
-msgstr "প্যাস-ফ্রেজ প্রয়োজন"
+msgstr "পাসফ্রেজ প্রয়োজন"
 
 # tithi
 #, c-format
@@ -9420,14 +9467,13 @@ msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
-"%s এর সর্বসাধারণ কী গ্রহণ করেছে। আপনার স্থানীয় অনুলিপি এই কী এর সাথে মেলে না। "
-"আপনি কি তারপরও এই সর্বসাধারণ কী গ্রহণে আগ্রহী?"
+"%s এর পাবলিক কী পাওয়া গেছে। আপনার স্থানীয় অনুলিপি এই কী এর সাথে মেলে না। আপনি "
+"কি তবুও এই পাবলিক কী গ্রহণে আগ্রহী?"
 
 # tithi
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr ""
-"%s এর সর্বসাধারণ কী গ্রহণ করেছে। আপনি কি তারপরও এই সর্বসাধারণ কী গ্রহণে আগ্রহী?"
+msgstr "%s এর পাবলিক কী পাওয়া গেছে। আপনি কি এই পাবলিক কী গ্রহণে আগ্রহী?"
 
 # tithi
 #, c-format
@@ -9437,27 +9483,27 @@ msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
-"%1s কী এর জন্য হস্তাঙ্গুলির ছাপ ও ব্যাবলপ্রিন্ট হলো:\n"
+"%1$s কী এর জন্য ফিঙ্গারপ্রিন্ট ও ব্যাবলপ্রিন্ট হলো:\n"
 "\n"
-"%2s\n"
-"%3s\n"
+"%2$s\n"
+"%3$s\n"
 
 msgid "Verify Public Key"
-msgstr "সর্বসাধারণ কী যাচাই করুন"
+msgstr "পাবলিক কী যাচাইকরণ"
 
 msgid "_View..."
-msgstr "প্রদর্শন করুন... (_V)"
+msgstr "প্রদর্শন... (_V)"
 
 # tithi
 msgid "Unsupported public key type"
-msgstr "অসমর্থিত সর্বসাধারণ কী এর ধরন"
+msgstr "অসমর্থিত ধরনের পাবলিক কী"
 
 msgid "Disconnected by server"
 msgstr "সার্ভার দ্বারা বিচ্ছিন্ন"
 
 # tithi
-msgid "Error during connecting to SILC Server"
-msgstr "SILC সার্ভারে সংযোগের সময় ত্রুটি"
+msgid "Error connecting to SILC Server"
+msgstr "SILC সার্ভারে সংযোগকাল ত্রুটি"
 
 # tithi
 msgid "Key Exchange failed"
@@ -9467,34 +9513,28 @@ msgstr "কী বিনিময় ব্যর্থ হয়েছে"
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"বিচ্ছিন্ন অধিবেশনটি পুনরায় শুরু করতে ব্যর্থ হয়েছে। অনুগ্রহ করে নতুন সংযোগ তৈরী করতে "
-"'পুনরায় সংযোগ' চাপুন।"
-
-msgid "Connection failed"
-msgstr "সংযোগ ব্যর্থ হয়েছে"
+"বিচ্ছিন্ন সেশনটি পুনরায় শুরু করতে ব্যর্থ। অনুগ্রহ করে নতুন সংযোগ তৈরী করতে 'পুনঃসংযোগ' "
+"চাপুন।"
 
 # tithi
 msgid "Performing key exchange"
-msgstr "কী বিনিময় সম্পাদন করছে"
-
-msgid "Unable to create connection"
-msgstr "সংযোগ তৈরী করতে ব্যর্থ হয়েছে"
+msgstr "কী বিনিময় করা হচ্ছে"
 
 # tithi
-msgid "Could not load SILC key pair"
-msgstr "SILC কী যুগল লোড করতে পারেনি"
+msgid "Unable to load SILC key pair"
+msgstr "SILC কী যুগল লোড করা সম্ভব হয়নি"
 
 # tithi
 #. Progress
 msgid "Connecting to SILC Server"
-msgstr "SILC সার্ভারে সংযোগ করছে"
+msgstr "SILC সার্ভারে সংযোগ করা হচ্ছে"
 
 msgid "Out of memory"
-msgstr "মেমোরীর বাইরে"
+msgstr "মেমরি পরিপূর্ণ"
 
 # tithi
-msgid "Cannot initialize SILC protocol"
-msgstr "SILC প্রটোকল চালু করতে পারে না"
+msgid "Unable to initialize SILC protocol"
+msgstr "SILC প্রোটোকল চালু করতে ব্যর্থ"
 
 # tithi
 msgid "Error loading SILC key pair"
@@ -9502,17 +9542,17 @@ msgstr "SILC কী যুগল লোডে ত্রুটি"
 
 #, c-format
 msgid "Download %s: %s"
-msgstr "%1s ডাউনলোড করুন: %2s"
+msgstr "%1$s ডাউনলোড করুন: %2$s"
 
 msgid "Your Current Mood"
-msgstr "আপনার বর্তমান অবস্থা"
+msgstr "আপনার বর্তমান মনমেজাজ"
 
 #, c-format
 msgid "Normal"
 msgstr "স্বাভাবিক"
 
 msgid "In love"
-msgstr "ভালবাসায়"
+msgstr "প্রেমময়"
 
 # tithi
 msgid ""
@@ -9520,16 +9560,16 @@ msgid ""
 "Your Preferred Contact Methods"
 msgstr ""
 "\n"
-"আপনাকে পছন্দের যোগাযোগ পদ্ধতি সমূহ"
+"আপনাকে পছন্দের যোগাযোগ পদ্ধতি"
 
 msgid "SMS"
-msgstr "এসএমএস"
+msgstr "SMS"
 
 msgid "MMS"
-msgstr "এমএমএস"
+msgstr "MMS"
 
 msgid "Video conferencing"
-msgstr "ভিডিও অধিবেশন চলছে"
+msgstr "ভিডিও অধিবেশন"
 
 msgid "Your Current Status"
 msgstr "আপনার বর্তমান অবস্থা"
@@ -9539,17 +9579,17 @@ msgstr "অনলাইন সেবাসমূহ"
 
 # tithi
 msgid "Let others see what services you are using"
-msgstr "আপনি কি সেবাসমূহ ব্যবহার করছেন তা অন্যদের দেখতে দিন"
+msgstr "আপনি কি কি সেবা ব্যবহার করছেন তা অন্যদের দেখতে দিন"
 
 # tithi
 msgid "Let others see what computer you are using"
 msgstr "আপনি কি কম্পিউটার ব্যবহার করছেন তা অন্যদের দেখতে দিন"
 
 msgid "Your VCard File"
-msgstr "আপনার ভি-কার্ড ফাইল"
+msgstr "আপনার VCard ফাইল"
 
 msgid "Timezone (UTC)"
-msgstr "সময়-এলাকা (ইউটিসি)"
+msgstr "সময়-অঞ্চল (UTC)"
 
 # tithi
 msgid "User Online Status Attributes"
@@ -9566,50 +9606,50 @@ msgstr ""
 "তা পূরণ করুন।"
 
 msgid "Message of the Day"
-msgstr "দিনের বার্তা"
+msgstr "দৈনিক বার্তা"
 
 msgid "No Message of the Day available"
-msgstr "আজকের দিনের কোনো বার্তা সহজলভ্য নয়"
+msgstr "আজকের কোনো দৈনিক বার্তা নেই"
 
 # tithi
 msgid "There is no Message of the Day associated with this connection"
-msgstr "এই সংযোগের সাথে সম্পর্কিত আজকের দিনের কোনো বার্তা নেই"
+msgstr "এই সংযোগের সাথে সম্পর্কিত কোনো দৈনিক বার্তা নেই"
 
 # tithi
 msgid "Create New SILC Key Pair"
 msgstr "নতুন SILC কী যুগল তৈরি করুন"
 
 msgid "Passphrases do not match"
-msgstr "প্যাস-ফ্রেজ মিলে না"
+msgstr "পাসফ্রেজ মিলছে না"
 
 msgid "Key Pair Generation failed"
-msgstr "কী জোড়া তৈরী করতে ব্যর্থ হয়েছে"
+msgstr "কী যুগল তৈরী করতে ব্যর্থ"
 
 msgid "Key length"
 msgstr "কী-এর দৈর্ঘ্য"
 
 msgid "Public key file"
-msgstr "সর্বসাধারণ কী ফাইল"
+msgstr "পাবলিক কী ফাইল"
 
 msgid "Private key file"
-msgstr "বযক্তিগত কী ফাইল"
+msgstr "প্রাইভেট কী ফাইল"
 
 msgid "Passphrase (retype)"
-msgstr "প্যাস-ফ্রেজ (পুনরায় টাইপ করুন)"
+msgstr "পাসফ্রেজ (পুনরায় টাইপ করুন)"
 
 # tithi
 msgid "Generate Key Pair"
-msgstr "কী যুগল তৈরি করুন"
+msgstr "কী যুগল তৈরি"
 
 msgid "Online Status"
 msgstr "অনলাইন অবস্থা"
 
 msgid "View Message of the Day"
-msgstr "দিনের বার্তাটি প্রদর্শন করুন"
+msgstr "দৈনিক বার্তা প্রদর্শন"
 
 # tithi
 msgid "Create SILC Key Pair..."
-msgstr "SILC কী যুগল তৈরি করুন..."
+msgstr "SILC কী যুগল তৈরি..."
 
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
@@ -9627,7 +9667,7 @@ msgstr "%s চ্যানেলটি খুঁজে পাওয়া যা
 
 #, c-format
 msgid "channel modes for %s: %s"
-msgstr "%1s-এর চ্যানেল মোড: %2s"
+msgstr "%1$s-এর চ্যানেল মোড: %2$s"
 
 # tithi
 #, c-format
@@ -9636,150 +9676,141 @@ msgstr "%s এ কোনো চ্যানেল মোড নির্ধা�
 
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "%s-এর জন্য সি-মোড নির্ধারণ করতে ব্যর্থ"
+msgstr "%s-এর জন্য cmodes নির্ধারণ করতে ব্যর্থ"
 
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "অজানা নির্দেশ: %s, (সম্ভবত এটি একটি ক্লায়েন্ট ত্রুটি)"
+msgstr "অজানা কমান্ড: %s, (সম্ভবত এটি ক্লায়েন্ট ত্রুটি)"
 
 msgid "part [channel]:  Leave the chat"
-msgstr "অংশ [চ্যানেল]:  আড্ডা ত্যাগ করুন"
+msgstr "part [channel]:  আড্ডা ত্যাগ করুন"
 
 msgid "leave [channel]:  Leave the chat"
-msgstr "ত্যাগ করুন [চ্যানেল]:  আড্ডা ত্যাগ করুন"
+msgstr "leave [channel]:  আড্ডা ত্যাগ করুন"
 
 # tithi
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "বিষয়বস্তু [&1lt;নতুন বিষয়বস্তু &2gt;]: বিষয়বস্তু দেখুন বা পরিবর্তন করুন"
+msgstr "topic [&lt;new topic&gt;]: বিষয় দেখুন বা পরিবর্তন করুন"
 
 # tithi
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
-"যুক্ত হোন &1lt;চ্যানেল&2gt; [&3lt;গুপ্তসঙ্কেত&4gt;]:  এই নেটওয়ার্কের একটি আড্ডায় যোগ "
-"দিন"
+"join &lt;channel&gt; [&lt;password&gt;]:  এই নেটওয়ার্কের একটি আড্ডায় যোগ দিন"
 
 msgid "list:  List channels on this network"
-msgstr "তালিকা:  এই নেটওয়ার্কের চ্যানেলসমূহের তালিকা তৈরী করুন"
+msgstr "list:  এই নেটওয়ার্কের চ্যানেলের তালিকা তৈরী করে"
 
 # fix -me tithi
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "কে &1lt;ডাকনাম&2gt;:  ডাকনামের তথ্য দেখুন"
+msgstr "whois &lt;nick&gt;: এই নামের ব্যক্তির তথ্য দেখুন"
 
 # tithi
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
-"বার্তা &1lt;ডাকনাম&2gt; &3lt;বার্তা&4gt;:  ব্যবহারকারীকে একটি ব্যক্তিগত বার্তা "
-"পাঠান"
+"msg &lt;nick&gt; &lt;message&gt;:  ব্যবহারকারীকে একটি ব্যক্তিগত বার্তা পাঠান"
 
 # tithi
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
-"জিজ্ঞাসা &1lt;ডাকনাম&2gt; [&3lt;বার্তা&4gt;]:  ব্যবহারকারীকে একটি ব্যক্তিগত বার্তা "
-"পাঠান"
+"query &lt;nick&gt; [&lt;message&gt;]:  ব্যবহারকারীকে একটি ব্যক্তিগত বার্তা পাঠান"
 
 # tithi
 msgid "motd:  View the server's Message Of The Day"
-msgstr "দিনের সেরা বার্তা:  সার্ভারের 'দিনের সেরা বার্তা' দেখুন"
+msgstr "motd:  সার্ভারের দৈনিক বার্তা দেখায়"
 
 # tithi
 msgid "detach:  Detach this session"
-msgstr "বিচ্ছিন্ন:  অধিবেশনটিকে বিচ্ছিন্ন করুন"
+msgstr "detach:  সেশনটিকে বিচ্ছিন্ন করে"
 
 # tithi
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "ত্যাগ করুন [বার্তা]:  একটি ঐচ্ছিক বার্তার সহ, সার্ভার হতে বিচ্ছিন্ন করুন"
+msgstr "quit [message]:  একটি ঐচ্ছিক বার্তা সহ, সার্ভার থেকে বিচ্ছিন্ন হোন"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "কল করুন &1lt;নির্দেশ&2gt;:  যেকোনো silc ক্লায়েন্টের নির্দেশ কল করুন"
+msgstr "call &lt;command&gt;:  যেকোনো silc ক্লায়েন্টের কমান্ড কল করুন"
 
 # tithi
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-"মুছে ফেলুন &1lt;ডাকনাম&2gt; [-সর্বসাধারণ-কী|&3lt;কারণ&4gt;]:  ডাকনাম মুছে ফেলুন"
+msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  এই নাম নিষ্ক্রিয় করুন"
 
 # ডাকনাম
 # tithi
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "ডাকনাম &1lt;নতুন ডাকনাম&2gt;:  আপনার ডাকনাম পরিবর্তন করুন"
+msgstr "nick &lt;newnick&gt;:  আপনার ডাকনাম পরিবর্তন করুন"
 
 # tithi
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "কে ছিল &1lt;ডাকনাম&2gt;:  ডাকনামের তথ্য দেখুন"
+msgstr "whowas &lt;nick&gt;:  এই নামের ব্যক্তির তথ্য দেখুন"
 
 # tithi
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"সি-মোড &1lt;চ্যানেল&2gt; [+|-&3lt;মোডসমূহ&4gt;] [যুক্তি]:  চ্যানেলের মোডসমূহ "
-"পরিবর্তন করুন বা প্রদর্শন করুন"
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  চ্যানেলের মোড পরিবর্তন "
+"করুন বা প্রদর্শন করুন"
 
 # tithi
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
-"সি-ইউ-মোড &1lt;চ্যানেল&2gt; +|-&3lt;মোডসমূহ&4gt; &5lt;ডাকনাম&6gt;:  চ্যানেলে "
-"ডাকনামের মোডসমূহ পরিবর্তন করুন"
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  চ্যানেলে এই নামের "
+"ব্যক্তির মোড পরিবর্তন করুন"
 
 # tithi
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr ""
-"ইউ-মোড &1lt;ব্যবহারকারীর-মোডসমূহ&2gt;:  নেটওয়ার্কে আপনার মোডসমূহ নির্ধারণ করুন"
+msgstr "umode &lt;usermodes&gt;:  নেটওয়ার্কে আপনার মোড নির্ধারণ করুন"
 
 # tithi
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
-"অপারেটর &1lt;ডাকনাম&2gt; [-সর্বসাধারণ-কী]:  সার্ভার অপারেটরের প্রাধিকারগুলো গ্রহণ "
-"করুন"
+msgstr "oper &lt;nick&gt; [-pubkey]:  সার্ভার অপারেটরের প্রাধিকারগুলো গ্রহণ করুন"
 
 # tithi
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"আমন্ত্রন &1lt;চ্যানেল&2gt; [-|+]&3lt;ডাকনাম&4gt;:  ডাকনামে আমন্ত্রন জানান বা "
-"চ্যানেলের আমন্ত্রন তালিকা থেকে যোগ করুন/মুছে ফেলুন"
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  এই ডাকনামের ব্যক্তিকে আমন্ত্রন জানান "
+"বা চ্যানেলের আমন্ত্রন তালিকা থেকে যোগ করুন/মুছে ফেলুন"
 
 # tithi
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
-"অপসারণ করুন &1lt;চ্যানেল&2gt; &3lt;ডাকনাম&4gt; [মন্তব্য]:  চ্যানেল থেকে গ্রাহককে "
-"অপসারণ করুন"
+"kick &lt;channel&gt; &lt;nick&gt; [comment]:  চ্যানেল থেকে ক্লায়েন্টকে তিরস্কার "
+"করুন"
 
 # tithi
 msgid "info [server]:  View server administrative details"
-msgstr "তথ্য [সার্ভার]: সার্ভারের প্রশাসনিক বিবরণ দেখুন"
+msgstr "info [server]: সার্ভারের প্রশাসনিক বিবরণ দেখুন"
 
 # tithi
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
-"নিষিদ্ধ [&1lt;চ্যানেল&2gt; +|-&3lt;ডাকনাম&4gt;]:  চ্যানেল হতে গ্রাহককে নিষিদ্ধ করুন"
+"ban [&lt;channel&gt; +|-&lt;nick&gt;]:  চ্যানেল থেকে ক্লায়েন্টকে নিষিদ্ধ করুন"
 
 # tithi
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
-"কী-গ্রহণ করুন &1lt;ডাকনাম সার্ভার&2gt;:  গ্রাহক বা সার্ভারের সর্বসাধারণ কী পুনরুদ্ধার "
-"করুন"
+msgstr "getkey &lt;nick|server&gt;:  ক্লায়েন্ট বা সার্ভারের পাবলিক কী উদ্ধার করুন"
 
 # tithi
 msgid "stats:  View server and network statistics"
-msgstr "পরিসংখ্যান: সার্ভার এবং নেটওয়ার্কের পরিসংখ্যান দেখুন"
+msgstr "stats: সার্ভার এবং নেটওয়ার্কের পরিসংখ্যান দেখুন"
 
 msgid "ping:  Send PING to the connected server"
-msgstr "পিঙ্গ:  সংযুক্ত সার্ভারে একটি পিঙ্গ পাঠান"
+msgstr "ping:  সংযুক্ত সার্ভারে একটি পিং পাঠান"
 
 # tithi
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "ব্যবহারকারীগণ &1lt;চ্যানেল&2gt;:  চ্যানেল ব্যবহারকারীর তালিকা করুন"
+msgstr "users &lt;channel&gt;:  চ্যানেল ব্যবহারকারীদের তালিকা করুন"
 
 # tithi
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
-"নামগুলো [-গণনা|-ওপস|-হাফ-ওপস|-কন্ঠস্বর|-স্বাভাবিক] &1lt;চ্যানেল(গুলো)&2gt;:  চ্যানেল"
-"(গুলো) এর উল্লেখিত ব্যবহারকারীদের তালিকা করুন"
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  চ্যানেল"
+"(গুলো) থেকে নির্বাচিত ব্যবহারকারীদের তালিকা করুন"
 
 #. *< type
 #. *< ui_requirement
@@ -9791,21 +9822,21 @@ msgstr ""
 #. *< version
 #. *  summary
 msgid "SILC Protocol Plugin"
-msgstr "SILC প্রটোকল প্লাগইন"
+msgstr "SILC প্রোটোকল প্লাগইন"
 
 # tithi
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "ইন্টারনেটে সরাসরি মতবিনিময় করার নিরাপদ (SILC) প্রটোকল"
+msgstr "Secure Internet Live Conferencing (SILC) প্রোটোকল"
 
 msgid "Network"
 msgstr "নেটওয়ার্ক"
 
 msgid "Public Key file"
-msgstr "সর্বসাধারণ কী ফাইল"
+msgstr "পাবলিক কী ফাইল"
 
 msgid "Private Key file"
-msgstr "ব্যক্তিগত কী ফাইল"
+msgstr "প্রাইভেট কী ফাইল"
 
 msgid "Cipher"
 msgstr "সাইফার"
@@ -9815,35 +9846,35 @@ msgstr "HMAC"
 
 # tithi
 msgid "Use Perfect Forward Secrecy"
-msgstr "যথার্থ অগ্রগামী গোপনীয়তা ব্যবহার করুন"
+msgstr "Perfect Forward Secrecy ব্যবহার"
 
 # tithi
 msgid "Public key authentication"
-msgstr "সর্বসাধারণ কী প্রমাণীকরণ"
+msgstr "পাবলিক কী প্রমাণীকরণ"
 
 # tithi
 msgid "Block IMs without Key Exchange"
-msgstr "কী বিনিময় ব্যতিত IM গুলোকে ব্লক করুন"
+msgstr "কী বিনিময় ব্যতিত IM গুলোকে ব্লক করা হবে"
 
 # Fixme
 # block = বন্ধ? - tithi
 msgid "Block messages to whiteboard"
-msgstr "হোয়াটবোর্ডে বার্তাগুলো ব্লক করুন"
+msgstr "হোয়াটবোর্ডের বার্তাগুলো ব্লক করা হবে"
 
 # tithi
 msgid "Automatically open whiteboard"
-msgstr "স্বয়ংক্রিয়ভাবে হোয়াটবোর্ড খুলুন"
+msgstr "স্বয়ংক্রিয়ভাবে হোয়াটবোর্ড খোলা হবে"
 
 # tithi
 msgid "Digitally sign and verify all messages"
-msgstr "সকল বার্তা ডিজিটাল স্বাক্ষর করুন এবং যাচাই করুন"
+msgstr "সব বার্তা ডিজিটাল স্বাক্ষরিত হবে এবং সত্যতা যাচাই করা হবে"
 
 # tithi
 msgid "Creating SILC key pair..."
-msgstr "SILC কী যুগল তৈরি করছে..."
+msgstr "SILC কী যুগল তৈরি করা হচ্ছে..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "SILC কী যুগল তৈরী করতে পারে না\n"
+msgid "Unable to create SILC key pair"
+msgstr "SILC কী যুগল তৈরী করা সম্ভব হয়নি"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9858,7 +9889,7 @@ msgstr "ব্যবহারকারীর নাম: \t%s\n"
 
 #, c-format
 msgid "Email: \t\t%s\n"
-msgstr "ই-মেইল: \t\t%s\n"
+msgstr "ইমেইল: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
@@ -9874,7 +9905,7 @@ msgstr "দেশ: \t%s\n"
 
 #, c-format
 msgid "Algorithm: \t%s\n"
-msgstr "এলগোরিদম: \t%s\n"
+msgstr "অ্যলগরিদম: \t%s\n"
 
 # tithi
 #, c-format
@@ -9892,7 +9923,7 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
-"সর্বসাধারণ কী এর হস্তাঙ্গুলির ছাপ:\n"
+"পাবলিক কী ফিঙ্গারপ্রিন্ট:\n"
 "%s\n"
 "\n"
 
@@ -9902,23 +9933,23 @@ msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"সর্বসাধারণ কী এর ব্যাবল-প্রিন্ট:\n"
+"পাবলিক কী এর ব্যাবলপ্রিন্ট:\n"
 "%s"
 
 msgid "Public Key Information"
-msgstr "সর্বসাধারণ কী এর তথ্য"
+msgstr "পাবলিক কী এর তথ্য"
 
 msgid "Paging"
 msgstr "পেজিং"
 
 msgid "Video Conferencing"
-msgstr "ভিডিও আলোচনা সভা চলছে"
+msgstr "ভিডিও অধিবেশন"
 
 msgid "Computer"
 msgstr "কম্পিউটার"
 
 msgid "PDA"
-msgstr "পিডিএ"
+msgstr "PDA"
 
 msgid "Terminal"
 msgstr "টার্মিনাল"
@@ -9934,95 +9965,93 @@ msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
-"%2s চ্যানেলের হোয়াটবোর্ডে %1s বার্তা পাঠিয়েছিল। আপনি কি হোয়াটবোর্ডটি খুলতে আগ্রহী?"
+"%2$s চ্যানেলের হোয়াটবোর্ডে %1$s বার্তা পাঠিয়েছিল। আপনি কি হোয়াটবোর্ডটি খুলতে "
+"আগ্রহী?"
 
 msgid "Whiteboard"
-msgstr "হোয়াইট-বোর্ড"
+msgstr "হোয়াইটবোর্ড"
 
 msgid "No server statistics available"
-msgstr "কোনো সার্ভার পরিসংখ্যান সহজলভ্য নয়"
+msgstr "কোনো সার্ভার পরিসংখ্যান নেই"
+
+# tithi
+msgid "Error during connecting to SILC Server"
+msgstr "SILC সার্ভারে সংযোগকালীন ত্রুটি"
 
 # tithi
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "ব্যর্থতা: সংস্করণ অমিল, আপনার ক্লায়েন্ট উন্নততর করুন"
+msgstr "ব্যর্থ: সংস্করণে অমিল, আপনার ক্লায়েন্ট হালনাগাদ করুন"
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "ব্যর্থতা: রিমোট আপনার সর্বাসাধারণ কী বিশ্বাস/সমর্থন করে না"
+msgstr "ব্যর্থ: রিমোট আপনার পাবলিক কী বিশ্বাস/সমর্থন করে না"
 
 # tithi
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "ব্যর্থ: রিমোট প্রস্তাবিত কেই গ্রুপ সমর্থন করে না"
+msgstr "ব্যর্থ: রিমোট প্রস্তাবিত KE গ্রুপ সমর্থন করে না"
 
 # tithi
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "ব্যর্থ: রিমোট প্রস্তাবিত ছাইফার সমর্থন করে না"
+msgstr "ব্যর্থ: রিমোট প্রস্তাবিত সাইফার সমর্থন করে না"
 
 # tithi
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "ব্যর্থ: রিমোট প্রস্তাবিত পিকেসিএস সমর্থন করে না"
+msgstr "ব্যর্থ: রিমোট প্রস্তাবিত PKCS সমর্থন করে না"
 
 # tithi
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "ব্যর্থ: রিমোট প্রস্তাবিত হ্যাস ফাংশন সমর্থন করে না"
+msgstr "ব্যর্থ: রিমোট প্রস্তাবিত হ্যাশ ফাংশন সমর্থন করে না"
 
 # tithi
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "ব্যর্থ: রিমোট প্রস্তাবিত এইচএমএসি সমর্থন করে না"
+msgstr "ব্যর্থ: রিমোট প্রস্তাবিত HMAC সমর্থন করে না"
 
 # tithi
 #, c-format
 msgid "Failure: Incorrect signature"
-msgstr "ব্যর্থতা: ভূল স্বাক্ষর"
+msgstr "ব্যর্থ: ভুল স্বাক্ষর"
 
 # tithi
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "ব্যর্থতা: অবৈধ কুকি"
+msgstr "ব্যর্থ: অকার্যকর কুকি"
 
 # tithi
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "ব্যর্থতা: প্রমাণীকরণ ব্যর্থ হয়েছে"
+msgstr "ব্যর্থ: প্রমাণীকরণ ব্যর্থ হয়েছে"
 
 # tithi
-msgid "Cannot initialize SILC Client connection"
-msgstr "SILC ক্লায়েন্ট সংযোগ প্রাথমিকভাবে প্রস্তুত করতে পারে না"
+msgid "Unable to initialize SILC Client connection"
+msgstr "SILC ক্লায়েন্ট সংযোগ আরম্ভ করা সম্ভব হচ্ছে না"
 
 # fix me tithi
 msgid "John Noname"
-msgstr "জন নোনেম"
+msgstr "আবুল বেনামী"
 
 # tithi
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "SILC কী যুগল লোড করতে পারেনি: %s"
-
-msgid "Could not write"
-msgstr "লিখতে পারেনি"
+msgid "Unable to load SILC key pair: %s"
+msgstr "SILC কী যুগল লোড করা সম্ভব হয়নি: %s"
 
-msgid "Could not connect"
-msgstr "সংযোগ দিতে পারেনি"
-
-msgid "Unknown server response."
-msgstr "অজানা সার্ভার উত্তর।"
+msgid "Unable to create connection"
+msgstr "সংযোগ তৈরী করতে ব্যর্থ"
 
-# tithi
-msgid "Could not create listen socket"
-msgstr "শ্রবণ সকেট তৈরি করতে পারেনি"
+msgid "Unknown server response"
+msgstr "অজানা সার্ভার উত্তর"
 
-msgid "Could not resolve hostname"
-msgstr "হোস্ট-নাম স্থির করা হয়নি"
+msgid "Unable to create listen socket"
+msgstr "লিসেন সকেট তৈরী করতে ব্যর্থ"
 
 # tihi
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "SIP এর ব্যবহারকারী-নামগুলো ফাঁকা-জায়গা বা @ চিহ্ন ধারণ করতে পারে না"
+msgstr "SIP এর ব্যবহারকারী নামগুলোতে হোয়াইটস্পেস অথবা @ চিহ্ন থাকতে পারবে না"
 
 msgid "SIP connect server not specified"
 msgstr "SIP সংযোগ সার্ভার সুনির্দিষ্ট নয়"
@@ -10037,223 +10066,87 @@ msgstr "SIP সংযোগ সার্ভার সুনির্দিষ্
 #. *< name
 #. *< version
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/সাধারণ প্রটোকল প্লাগইন"
+msgstr "SIP/SIMPLE প্রোটোকল প্লাগইন"
 
 # tithi
 #. *  summary
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/সাধারণ প্রটোকল প্লাগইন"
+msgstr "SIP/SIMPLE প্রোটোকল প্লাগইন"
 
 # tithi
 msgid "Publish status (note: everyone may watch you)"
-msgstr "প্রকাশ অবস্থা (নোট: আপনাকে সবাই পর্যবেক্ষণ করতে পারে)"
+msgstr "অবস্থা প্রকাশ (নোট: আপনাকে যে কেউ পর্যবেক্ষণ করতে পারে)"
 
 msgid "Use UDP"
-msgstr "UDP ব্যবহার করুন"
+msgstr "UDP ব্যবহার করা হবে"
 
 msgid "Use proxy"
-msgstr "প্রক্সি ব্যবহার করুন"
+msgstr "প্রক্সি ব্যবহার করা হবে"
 
 msgid "Proxy"
 msgstr "প্রক্সি"
 
 msgid "Auth User"
-msgstr "স্বীকৃত ব্যবহারকারী"
+msgstr "যাচাইকৃত ব্যবহারকারী "
 
 msgid "Auth Domain"
-msgstr "স্বীকৃত ডোমেইন"
-
-#, c-format
-msgid "Looking up %s"
-msgstr "%s খোঁজা হচ্ছে"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s-এর সাথে সংযোগ দিতে ব্যর্থ হয়েছে"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "সাইনঅন: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "%s ফাইলে লিখতে ব্যর্থ হয়েছে।"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "%s ফাইলে পড়তে ব্যর্থ হয়েছে।"
-
-# tithi
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "বার্তাটি খুব দীর্ঘ, শেষ %s বাইট বাদ দেয়া হয়েছে।"
-
-# tithi
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s বর্তমানে লগইন নেই।"
-
-# tithi
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s এর সতর্কতা অনুমোদিত নয়।"
-
-# tithi
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "একটি বার্তা বাদ দেয়া হয়েছে, আপনি সার্ভারের গতি সীমা অতিক্রম করছেন।"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s-এ আড্ডা সহজলভ্য নয়।"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "আপনি %s এ খুব দ্রুত বার্তা পাঠাচ্ছেন।"
-
-# tithi
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "আপনি %s থেকে একটি তাৎক্ষণিক বার্তা পাননি কারণ এটি খুব বড় ছিল।"
-
-# tithi
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "আপনি %s থেকে একটি তাৎক্ষণিক বার্তা পাননি কারণ এটি খুব দ্রুত পাঠানো হয়েছিল।"
-
-#, c-format
-msgid "Failure."
-msgstr "ব্যর্থতা।"
-
-# tithi
-#, c-format
-msgid "Too many matches."
-msgstr "অনেক বেশি মিল।"
-
-# tithi
-#, c-format
-msgid "Need more qualifiers."
-msgstr "আরও নিয়ন্ত্রণকারী প্রয়োজন।"
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "নির্দেশিকা সেবা সাময়িকভাবে অপ্রাপ্য"
-
-# tithi
-#, c-format
-msgid "Email lookup restricted."
-msgstr "ই-মেইল অনুসন্ধান নিষিদ্ধ।"
-
-# tithi
-#, c-format
-msgid "Keyword ignored."
-msgstr "মূল-শব্দ অগ্রাহ্য করা হয়েছে।"
-
-#, c-format
-msgid "No keywords."
-msgstr "কোনো মূল-শব্দ নেই।"
-
-#, c-format
-msgid "User has no directory information."
-msgstr "ব্যবহারকারীর কোনো নির্দেশিকা তথ্য নেই।"
-
-#, c-format
-msgid "Country not supported."
-msgstr "দেশটি সমর্থিত নয়।"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "ব্যর্থতা অজানা: %s।"
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "ভুল ব্যবহারকারীর-নাম বা গুপ্তসংকেত।"
-
-# tithi
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "সেবাটি সাময়িকভাবে অপ্রাপ্য।"
-
-# tithi
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "আপনার সতর্কতা স্তর লগইন করার জন্য বর্তমানে খুব উচ্চ।"
+msgstr "যাচাইকৃত ডোমেইন"
 
-# tithi
-#, c-format
-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 ""
-"আপনি প্রায়সই সংযুক্ত এবং বিচ্ছিন্ন হচ্ছেন।  দশ মিনিট অপেক্ষা করুন এবং পুনরায় চেষ্টা "
-"করুন। আপনি যদি চেষ্টা অব্যাহত রাখেন, আপনাকে দীর্ঘ সময় অপেক্ষা করতে হতে পারে।"
-
-# tithi
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "একটি অজানা সাইনঅন ত্রুটি সংঘটিত হয়েছে: %s।"
-
-#  tithi
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "একটি অজানা ত্রুটি, %d, সংঘটিত হয়েছে।  তথ্য: %s"
-
-# tithi
-msgid "Invalid Groupname"
-msgstr "অবৈধ গ্রুপনাম"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  ইয়াহু নেটওয়ার্কের একটি আড্ডার আসরে যোগ দিন"
 
-msgid "Connection Closed"
-msgstr "সংযোগ বন্ধ করা হয়েছে "
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: ইয়াহু নেটওয়ার্কে আসরের তালিকা দিন"
 
-msgid "Waiting for reply..."
-msgstr "উত্তরের অপেক্ষায়..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: ব্যবহারকারীকে একটি Doodle সেশন শুরু করতে অনুরোধ করুন"
 
-# tithi
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC পুনরায় সচল হয়েছে। আপনি এখন পুনরায় বার্তা পাঠাতে পারেন।"
+msgid "Yahoo ID..."
+msgstr "ইয়াহু ID..."
 
-msgid "Password Change Successful"
-msgstr "গুপ্তসংকেত পরিবর্তন সফল হয়েছে"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "ইয়াহু! প্রোটোকল প্লাগইন"
 
-msgid "_Group:"
-msgstr "গ্রুপ: (_G)"
+msgid "Pager server"
+msgstr "পেইজার সার্ভার"
 
-msgid "Get Dir Info"
-msgstr "নির্দেশিকা তথ্য গ্রহণ করুন"
+msgid "Pager port"
+msgstr "পেইজার পোর্ট"
 
-msgid "Set Dir Info"
-msgstr "নির্দেশিকা তথ্য নির্ধারণ করুন"
+msgid "File transfer server"
+msgstr "ফাইল স্থানান্তর সার্ভার"
 
-# tithi
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "লেখার জন্য %s খুলতে পারেনি!"
+msgid "File transfer port"
+msgstr "ফাইল স্থানান্তর পোর্ট"
 
-# tithi
-msgid "File transfer failed; other side probably canceled."
-msgstr "ফাইল স্থানান্তর ব্যর্থ হয়েছে; অন্য দিক সম্ভবত বাতিল হয়েছে।"
+msgid "Chat room locale"
+msgstr "আড্ডার আসরের লোক্যাল"
 
 # tithi
-msgid "Could not connect for transfer."
-msgstr "স্থানান্তরের জন্য সংযোগ করতে পারেনি।"
+msgid "Ignore conference and chatroom invitations"
+msgstr "অধিবেশন এবং আড্ডার আসরের আমন্ত্রন অগ্রাহ্য করা হবে"
 
-# tithi
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "ফাইল শিরোনাম লিখতে পারেনি।  ফাইল স্থানান্তর করা হবে না।"
+msgid "Chat room list URL"
+msgstr "আড্ডার আসরের তালিকার URL"
 
-msgid "Save As..."
-msgstr "এভাবে সংরক্ষণ করুন..."
+msgid "Yahoo Chat server"
+msgstr "ইয়াহু আড্ডা সার্ভার"
 
-# tithi
-#, 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] " %1s %2s-কে  %3d ফাইলটি গ্রহণ করতে অনুরোধ করে: %4s (%.2f %5s)%6s%7s"
-msgstr[1] "%1s %2s-কে %3d ফাইলসমূহ গ্রহণ করতে অনুরোধ করে: %4s (%.2f %5s)%6s%7s"
+msgid "Yahoo Chat port"
+msgstr "ইয়াহু আড্ডার পোর্ট"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s আপনাকে একটি ফাইল পাঠাতে অনুরোধ করেছেন"
+msgid "Yahoo JAPAN ID..."
+msgstr "ইয়াহু জাপান ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -10265,13 +10158,11 @@ msgstr "%s আপনাকে একটি ফাইল পাঠাতে অ�
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC প্রটোকল প্লাগইন"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "ইয়াহু! জাপান প্রোটোকল প্লাগইন"
 
-# tithi
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s আপনাকে ওয়েবক্যাম আমন্ত্রন পাঠিয়েছেন, যা এখনও সমর্থিত নয়।"
+msgid "Your SMS was not delivered"
+msgstr "আপনার SMS প্রেরণ করা যায়নি"
 
 # tithi
 msgid "Your Yahoo! message did not get sent."
@@ -10287,16 +10178,40 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s (আইনগতভাবে) নিম্নলিখিত কারণের জন্য আপনার তালিকাতে তাদের যোগ করতে আপনার "
-"অনুরোধ বাতিল করেছে: %s।"
+"%s (আইনগতভাবে) এই কারণে আপনার তালিকাতে তাদের যোগ করার অনুরোধ প্রত্যাখ্যান করেছে: "
+"%s।"
 
 # tithi
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s (আইনগতভাবে) আপনার তালিকাতে তাদের যোগ করতে আপনার অনুরোধ বাতিল করেছে।"
+msgstr "%s (আইনগতভাবে) আপনার তালিকাতে তাদের যোগ করার অনুরোধ প্রত্যাখ্যান করেছে।"
 
 msgid "Add buddy rejected"
-msgstr "বন্ধু যোগ প্রত্যাখ্যান করেছে"
+msgstr "বন্ধু যোগ প্রত্যাখ্যান করা হয়েছে"
+
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "অকার্যকর ডাটা গৃহীত হয়ে‌ছে"
+
+# tithi
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"একাউন্ট আবদ্ধ: অত্যধিকবার লগইন করার ব্যর্থ চেষ্টা। ইয়াহু! তে লগইন করলে হয়তো এটি ঠিক "
+"হবে।"
+
+# tithi
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "একাউন্ট আবদ্ধ: অজানা কারন। ইয়াহু! তে লগইন করলে হয়তো এটি ঠিক হবে।"
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "ব্যবহারকারীর নাম অথবা পাসওয়ার্ড অনুপস্থিত"
 
 # tithi
 #, c-format
@@ -10305,12 +10220,12 @@ msgid ""
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-"ইয়াহু সার্ভার একটি অশনাক্তকৃত প্রমাণীকরণ প্রক্রিয়ার ব্যবহার অনুরোধ করেছে।  আপনি সম্ভবত "
-"ইয়াহুতে সফলভাবে যুক্ত হতে পারবেন না।  হালনাগাদসমূহের জন্য %s পরীক্ষা করুন।"
+"ইয়াহু সার্ভার একটি অজানা প্রমাণীকরণ প্রক্রিয়ার ব্যবহার অনুরোধ করেছে। আপনি সম্ভবত "
+"ইয়াহুতে সফলভাবে লগইন করতে পারবেন না। হালনাগাদের জন্য %s দেখুন।"
 
 # tithi
 msgid "Failed Yahoo! Authentication"
-msgstr "ইয়াহু! প্রমাণীকরণ ব্যর্থ হয়েছে"
+msgstr "ইয়াহু! প্রমাণীকরণ ব্যর্থ"
 
 #, c-format
 msgid ""
@@ -10321,52 +10236,41 @@ msgstr ""
 "\"হ্যাঁ\" ক্লিক করলে আপনার বন্ধু অপসারিত হবে এবং অগ্রাহ্য করা হবে।"
 
 msgid "Ignore buddy?"
-msgstr "বন্ধু কি অগ্রাহ্য করবেন?"
+msgstr "বন্ধুকে অগ্রাহ্য করবেন?"
 
 # tithi
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "আপনার একাউন্ট বন্ধ, অনুগ্রহ করে ইয়াহু! ওয়েবসাইটে লগইন করুন।"
+msgstr "আপনার একাউন্টটি আবদ্ধ, অনুগ্রহ করে ইয়াহু! ওয়েবসাইটে লগইন করুন।"
 
 # tithi
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "অজানা ত্রুটি নাম্বার %d। ইয়াহু! ওয়েব সাইটে লগইন করলে হয়ত এটি ঠিক হতে পারে।"
+msgstr "অজানা ত্রুটি নম্বার %d। ইয়াহু! ওয়েব সাইটে লগইন করলে হয়ত এটি ঠিক হতে পারে।"
 
 # tithi
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "%3s একাউন্টের সার্ভার তালিকায় %2s গ্রুপে %1s বন্ধুকে যোগ করতে পারেনি।"
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "%3$s একাউন্টের সার্ভার তালিকায় %2$s  দলে %1$s কে যোগ করা সম্ভব হয়নি।"
 
 # tithi
-msgid "Could not add buddy to server list"
-msgstr "সার্ভার তালিকায় বন্ধু যোগ করতে পারেনি।"
+msgid "Unable to add buddy to server list"
+msgstr "সার্ভার তালিকায় বন্ধু যোগ করা সম্ভব হয়নি"
 
 # tithi
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr "[ শ্রবণযোগ্য %1s/%2s/%3s.swf ] %4s"
+msgstr "[ শ্রবণযোগ্য %1$s/%2$s/%3$s.swf ] %4$s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "সার্ভার থেকে অপ্রত্যাশিত এইচটিটিপি সাড়া পেয়েছে।"
-
-msgid "Connection problem"
-msgstr "সংযোগ সমস্যা"
+msgid "Received unexpected HTTP response from server"
+msgstr "সার্ভার থেকে অপ্রত্যাশিত HTTP উত্তর পাওয়া গেছে"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"%1s এর সাথে সংযোগ হারিয়েছে:\n"
-"%2s"
+msgid "Lost connection with %s: %s"
+msgstr "%1$s এর সাথে সংযোগ বিচ্ছিন্ন: %2$s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"%1s এর সাথে সংযোগ স্থাপন করতে পারেনি:\n"
-"%2s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "%1$s এর সাথে সংযোগ স্থাপনে ব্যর্থ: %2$s"
 
 msgid "Not at Home"
 msgstr "বাসায় নেই"
@@ -10382,131 +10286,75 @@ msgstr "ছুটিতে"
 
 # fix me tithi
 msgid "Stepped Out"
-msgstr "চলে গেছে"
+msgstr "বের হয়ে গিয়েছি"
 
 msgid "Not on server list"
 msgstr "সার্ভার তালিকায় নেই"
 
 # tithi
 msgid "Appear Online"
-msgstr "অনলাইনে আছেন"
+msgstr "অনলাইনে দেখান"
 
 # tithi
 msgid "Appear Permanently Offline"
-msgstr "স্থায়ীভাবে অফলাইনে আছেন"
+msgstr "স্থায়ীভাবে অফলাইনে দেখান"
 
 msgid "Presence"
 msgstr "উপস্থিতি"
 
 msgid "Appear Offline"
-msgstr "অফলাইনে উপস্থিত"
+msgstr "অফলাইনে দেখান"
 
 # tithi
 msgid "Don't Appear Permanently Offline"
-msgstr "অফলাইনে স্থায়ীভাবে থাকছে না"
+msgstr "স্থায়ীভাবে অফলাইনে দেখানো হবে না"
 
 msgid "Join in Chat"
 msgstr "আড্ডায় যোগ দিন"
 
 msgid "Initiate Conference"
-msgstr "আলোচনা সভা শুরু করুন"
+msgstr "অধিবেশন শুরু করুন"
 
 msgid "Presence Settings"
-msgstr "উপস্থিতির বিন্যাসনসমূহ"
+msgstr "উপস্থিতি সেটিং"
 
 # tithi
 msgid "Start Doodling"
-msgstr "হিজিবিজি কাজ শুরু করুন"
+msgstr "Doodle করা শুরু করুন"
 
-msgid "Activate which ID?"
-msgstr "কোন আইডি সক্রিয় করা হবে?"
+msgid "Select the ID you want to activate"
+msgstr "আপনি যে ID টি সক্রিয় করতে চান তা নির্বাচন করুন"
 
 msgid "Join whom in chat?"
 msgstr "কার সাথে আড্ডায় যোগ দিতে চান?"
 
 msgid "Activate ID..."
-msgstr "আইডি সক্রিয় করুন..."
+msgstr "ID সক্রিয়করণ..."
 
 msgid "Join User in Chat..."
-msgstr "ব্যবহারকারীকে আড্ডায় যোগ করুন..."
+msgstr "ব্যবহারকারীকে আড্ডায় যোগ..."
 
 msgid "Open Inbox"
 msgstr "ইনবক্স খুলুন"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "যোগ দিন &1lt;রুম&2gt;:  ইয়াহু নেটওয়ার্কের একটি আড্ডার রুমে যোগ দিন"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "তালিকা: ইয়াহু নেটওয়ার্কে রুমের তালিকা করুন"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "হিজিবিজি: ব্যবহারকারীকে একটি হিজিবিজি অধিবেশন শুরু করতে অনুরোধ করুন"
-
-msgid "Yahoo ID..."
-msgstr "ইয়াহু আইডি..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "ইয়াহু প্রটোকল প্লাগইন"
-
-msgid "Yahoo Japan"
-msgstr "ইয়াহু জাপান"
-
-msgid "Pager server"
-msgstr "পেজার সার্ভার"
-
-msgid "Japan Pager server"
-msgstr "জাপানী পেজার সার্ভার"
-
-msgid "Pager port"
-msgstr "পেজার পোর্ট"
-
-msgid "File transfer server"
-msgstr "ফাইল স্থানান্তর সার্ভার"
-
-msgid "Japan file transfer server"
-msgstr "জাপান ফাইল স্থানান্তর সার্ভার"
-
-msgid "File transfer port"
-msgstr "ফাইল স্থানান্তর পোর্ট"
-
-msgid "Chat room locale"
-msgstr "আড্ডা রুমের অবস্থা"
-
-# tithi
-msgid "Ignore conference and chatroom invitations"
-msgstr "আলোচনা সভা এবং আড্ডার-রুমের আমন্ত্রন অগ্রাহ্য করুন"
-
-msgid "Chat room list URL"
-msgstr "আড্ডার রুম তালিকার ইউআরএল"
-
-msgid "Yahoo Chat server"
-msgstr "ইয়াহু আড্ডা সার্ভার"
-
-msgid "Yahoo Chat port"
-msgstr "ইয়াহু আড্ডার পোর্ট"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "হিজিবিজি অনুরোধ পাঠানো হয়েছে"
 
+msgid "Unable to connect."
+msgstr "সংযুক্ত করতে ব্যর্থ।"
+
 msgid "Unable to establish file descriptor."
-msgstr "ফাইল বর্ণনাকারী স্থাপন করতে অক্ষম।"
+msgstr "ফাইল বর্ণনাকারী স্থাপন করতে ব্যর্থ।"
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s আপনাকে %d ফাইলের একটি গ্রুপ পাঠানোর চেষ্টা করছে।\n"
+msgstr "%s আপনাকে %d টি ফাইল একসাথে পাঠানোর চেষ্টা করছে।\n"
+
+msgid "Write Error"
+msgstr "লিখতে ত্রুটি"
 
 msgid "Yahoo! Japan Profile"
 msgstr "ইয়াহু! জাপান প্রোফাইল"
@@ -10518,146 +10366,134 @@ msgstr "ইয়াহু! প্রোফাইল"
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr ""
-"দুঃখিত, প্রোফাইলগুলো প্রাপ্তবয়স্ক উপাদান ধারণকারী হিসেবে চিহ্নিত হওয়ার কারণে এটি "
-"এখন সমর্থিত নয়।"
+msgstr "দুঃখিত, প্রাপ্তবয়স্ক উপাদান ধারণকারী প্রোফাইলগুলো এখনও সমর্থিত নয়।"
 
 # tithi
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"আপনি যদি এই বৃত্তান্তটি দেখতে চান, আপনাকে আপনার ওয়েব ব্রাউজারের এই লিংকটি "
-"পরিদর্শন করতে হবে:"
+"আপনি যদি এই প্রোফাইলটি দেখতে চান, আপনাকে ওয়েব ব্রাউজারের এই লিংকটি পরিদর্শন "
+"করতে হবে:"
 
 msgid "Yahoo! ID"
-msgstr "ইয়াহু! আইডি"
+msgstr "ইয়াহু! ID"
 
 msgid "Hobbies"
 msgstr "শখ"
 
 msgid "Latest News"
-msgstr "সাম্প্রতিক খবর"
+msgstr "সর্বশেষ খবর"
 
 msgid "Home Page"
-msgstr "হোম পেজ"
+msgstr "হোমপেইজ"
 
 msgid "Cool Link 1"
-msgstr "কুল লিংক ১"
+msgstr "দারুন লিংক ১"
 
 msgid "Cool Link 2"
-msgstr "কুল লিংক ২"
+msgstr "দারুন লিংক ২"
 
 msgid "Cool Link 3"
-msgstr "কুল লিংক ৩"
+msgstr "দারুন লিংক ৩"
 
 msgid "Last Update"
-msgstr "সর্বশেষ পরিবর্ধন"
+msgstr "সর্বশেষ হালনাগাদ"
 
 # tithi
 msgid ""
 "This profile is in a language or format that is not supported at this time."
-msgstr "এই বৃত্তান্তটি এমন একটি ভাষায় বা বিন্যাসে যা এখন সমর্থিত নয়।"
+msgstr "এই প্রোফাইলটি এমন একটি ভাষায় বা বিন্যাসে যা এখনও সমর্থিত নয়।"
 
 # tithi
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
-"ব্যবহারকারীর বৃত্তান্ত উদ্ধার করতে পারনি। এটি সম্ভাবত একটি অস্থায়ী সার্ভার-পার্শ্বের "
-"সমস্যা। অনুগ্রহ করে পরবর্তীতে আবার চেষ্টা করুন।"
+"ব্যবহারকারীর প্রোফাইল উদ্ধার করা সম্ভব হয়নি। এটি সম্ভাবত একটি অস্থায়ী সার্ভার-"
+"প্রান্তের সমস্যা। অনুগ্রহ করে পরবর্তীতে আবার চেষ্টা করুন।"
 
 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 ""
-"ব্যবহারকারীর বৃত্তান্ত উদ্ধার করতে পারেনি। এটির অর্থ হলো যে ব্যবহারকারী বিদ্যমান "
-"নেই; যাই হোক, ইয়্যাহু! কখনোও ব্যবহারকারীর বৃত্তান্ত খুঁজে পেতে ব্যর্থ হয়। আপনি যদি "
-"জানেন যে ব্যবহারকারী বিদ্যমান, অনুগ্রহ করে পরবর্তীতে আবার চেষ্টা করুন।"
+"ব্যবহারকারীর প্রোফাইল উদ্ধার করা সম্ভব হয়নি। এটির অর্থ হতে পারে যে ব্যবহারকারী "
+"বিদ্যমান নেই;  তবে, ইয়্যাহু! মাঝেমধ্যে ব্যবহারকারীর প্রোফাইল খুঁজে পেতে ব্যর্থ হয়। "
+"আপনি যদি জানেন যে এই ব্যবহারকারী আছেন, অনুগ্রহ করে পরবর্তীতে আবার চেষ্টা করুন।"
 
 msgid "The user's profile is empty."
 msgstr "ব্যবহারকারীর প্রোফাইল ফাঁকা।"
 
-# tithi
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"\"%3s\" এর কারণে %1s \"%2s\" রুমে আপনার আলোচনা সভার আমন্ত্রণ অস্বীকার করেছেন।"
-
-msgid "Invitation Rejected"
-msgstr "আমন্ত্রন প্রত্যাখ্যান করা হয়েছে"
+msgid "%s has declined to join."
+msgstr "%s যোগ দিতে অনিচ্ছুক।"
 
 msgid "Failed to join chat"
 msgstr "আড্ডায় যোগ দিতে ব্যর্থ"
 
 #. -6
 msgid "Unknown room"
-msgstr "অজানা রুম"
+msgstr "অজানা আসর"
 
 #. -15
 msgid "Maybe the room is full"
-msgstr "সম্ভবত রুমটি পূর্ণ"
+msgstr "সম্ভবত আসরটি পূর্ণ"
 
 #. -35
 msgid "Not available"
-msgstr "বিদ্যমান নেই"
+msgstr "অনুপস্থিত"
 
 # tithi
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
-"অজানা ত্রুটি। একটি আড্ডা-রুমে পুনরায় যোগদানের পূর্বে আপনাকে সম্ভবত লগ আউট করতে হবে "
-"এবং পাঁচ মিনিট অপেক্ষা করতে হবে।"
+"অজানা ত্রুটি। একটি আড্ডার আসের পুনরায় যোগ দিতে হলে আপনাকে সম্ভবত লগ আউট করে পাঁচ "
+"মিনিট অপেক্ষা করতে হবে।"
 
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "আপনি এখন %s-এ আড্ডা দিচ্ছেন।"
 
 msgid "Failed to join buddy in chat"
-msgstr "বন্ধুকে আড্ডায় অংশগ্রহন করাতে ব্যর্থ হয়েছে"
+msgstr "বন্ধুকে আড্ডায় অংশগ্রহন করাতে ব্যর্থ"
 
 msgid "Maybe they're not in a chat?"
 msgstr "সম্ভবত তারা আড্ডায় নেই?"
 
 msgid "Fetching the room list failed."
-msgstr "রুমের তালিকা খুঁজতে ব্যর্থ হয়েছে।"
+msgstr "আসরের তালিকা খুঁজে পেতে ব্যর্থ।"
 
 msgid "Voices"
-msgstr "কন্ঠস্বরসমূহ"
+msgstr "কন্ঠ"
 
 msgid "Webcams"
-msgstr "ওয়েবক্যামসমূহ"
+msgstr "ওয়েবক্যাম"
+
+msgid "Connection problem"
+msgstr "সংযোগে সমস্যা"
 
 msgid "Unable to fetch room list."
-msgstr "রুমের তালিকা খুঁজতে অক্ষম।"
+msgstr "আসরের তালিকা খুঁজে পেতে ব্যর্থ।"
 
 msgid "User Rooms"
-msgstr "ব্যবহারকারীর রুম"
+msgstr "ব্যবহারকারীর আসর"
 
 # tithi
-msgid "Connection problem with the YCHT server."
-msgstr "YCHT সার্ভারের সাথে সংযোগে সমস্যা।"
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"সার্ভারের সাথে সংযোগ হারিয়েছে\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "YCHT সার্ভারের সাথে সংযোগে সমস্যা"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
-"(এই বার্তাটি রুপান্তরে একটি ত্রুটি ছিল।                      একাউন্ট সম্পাদকে "
-"'সঙ্কেতায়ন' পছন্দ পরীক্ষা করুন)"
+"(এই বার্তাটি রূপান্তরে ত্রুটি হয়েছে।             ‌‌‌‌একাউন্ট সম্পাদকে 'এনকোডিং' অপশনটি "
+"দেখুন)"
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "%1s,%2s,%3s আড্ডায় পাঠাতে সমর্থ নয়।"
+msgstr "%1$s,%2$s,%3$s আড্ডায় পাঠাতে ব্যর্থ।"
 
 msgid "Hidden or not logged-in"
 msgstr "লুকানো বা লগইন অবস্থায় নেই"
@@ -10665,7 +10501,7 @@ msgstr "লুকানো বা লগইন অবস্থায় নে�
 # tithi
 #, c-format
 msgid "<br>At %s since %s"
-msgstr "<br>%s হতে %s এ"
+msgstr "<br>%1$s তে %2$s থেকে"
 
 msgid "Anyone"
 msgstr "যে কেউ"
@@ -10675,81 +10511,81 @@ msgstr "শ্রেণী: (_C)"
 
 # tithi
 msgid "_Instance:"
-msgstr "ঘটনা: (_I)"
+msgstr "ইনস্ট্যান্স (_I):"
 
 msgid "_Recipient:"
-msgstr "প্রাপক: (_R)"
+msgstr "প্রাপক (_R):"
 
 # tithi
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr "%1s,%2s,%3s এর গ্রাহক হবার চেষ্টা ব্যর্থ হয়েছে"
+msgstr "%1$s,%2$s,%3$s এ সাবস্ক্রাইব করার চেষ্টা ব্যর্থ হয়েছে"
 
 # tithi
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "z-নির্দেশ করুন &1lt;ডাকনাম&2gt;: ব্যবহারকারী নির্দেশ করুন"
+msgstr "zlocate &lt;nick&gt;: ব্যবহারকারীর অবস্থান নির্ধারণ করুন"
 
 # tithi
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;ডাকনাম&gt;: ব্যবহারকারী নির্দেশ করুন"
+msgstr "zl &lt;nick&gt;: ব্যবহারকারীর অবস্থান নির্ধারণ করুন"
 
 # tithi
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "দৃষ্টান্ত &1lt;দৃষ্টান্ত&2gt;: এই শ্রেনীতে ব্যবহারের জন্য দৃষ্টান্ত নির্ধারণ করুন"
+msgstr "instance &lt;instance&gt;: এই ক্লাসে ব্যবহারের জন্য ইনস্ট্যান্স নির্ধারণ করুন"
 
 # tithi
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "দৃষ্টান্ত &1lt;দৃষ্টান্ত&2gt;: এই শ্রেণীতে ব্যবহারের জন্য দৃষ্টান্ত নির্ধারণ করুন"
+msgstr "inst &lt;instance&gt;: এই ক্লাসে ব্যবহারের জন্য ইনস্ট্যান্স নির্ধারণ করুন"
 
 # tithi
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "বিষয়বস্তু &1lt;দৃষ্টান্ত&2gt;: এই শ্রেণীতে ব্যবহারের জন্য দৃষ্টান্ত নির্ধারণ করুন"
+msgstr "topic &lt;instance&gt;: এই ক্লাসে ব্যবহারের জন্য ইনস্ট্যান্স নির্ধারণ করুন"
 
 # tithi
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
-"বিষয় &1lt;শ্রেণী&2gt; &3lt;দৃষ্টান্ত&4gt; &5lt;প্রাপক&6gt;: একটি নতুন আড্ডায় "
-"অংশগ্রহন করুন"
+"sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: একটি নতুন আড্ডায় অংশগ্রহন "
+"করুন"
 
 # tithi
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &1lt;দৃষ্টান্ত&2gt;; একটি বার্তা পাঠান &3It;বার্তা,<i>দৃষ্টান্ত</i>,*&4gt;"
+msgstr ""
+"zi &lt;instance&gt;:  &lt;message,<i>instance</i>,*&gt; এ একটি বার্তা পাঠান"
 
-# fix-me tithi
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
-"zci &1lt;শ্রেণী&2gt; &3lt;দৃষ্টান্ত&4gt;: একটি বার্তা পাঠান &5lt;<i>শ্রেণী</i>,"
-"<i>দৃষ্টান্ত</i>,*&6gt;"
+"zci &lt;class&gt; &lt;instance&gt;: &lt;<i>class</i>,<i>instance</i>,*&gt; এ "
+"একটি বার্তা পাঠান"
 
 # fix-me tithi
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zcir &1lt;শ্রেণী&2gt; &3lt;দৃষ্টান্ত&4gt; &5lt;প্রাপক&6gt;: একটি বার্তা পাঠান &7lt;"
-"<i>শ্রেণী</i>,<i>দৃষ্টান্ত</i>,<i>প্রাপক</i>&8gt;"
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: &lt;<i>class</i>,"
+"<i>instance</i>,<i>recipient</i>&gt; এ একটি বার্তা পাঠান"
 
 # fix-me tithi
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zir &1lt;দৃষ্টান্ত&2gt; &3lt;প্রাপক&4gt;: একটি বার্তা পাঠান &5lt;বার্তা,<i>দৃষ্টান্ত</"
-"i>,<i>প্রাপক</i>&6gt;"
+"zir &lt;instance&gt; &lt;recipient&gt;: &lt;MESSAGE,<i>instance</i>,"
+"<i>recipient</i>&gt; এ একটি বার্তা পাঠান"
 
 # fix-me tithi
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &1lt;শ্রেণী&2gt;: একটি বার্তা পাঠান &3lt;<i>শ্রেণী</i>,ব্যক্তিগত,*&4gt;"
+msgstr "zc &lt;class&gt;:  &lt;<i>class</i>,PERSONAL,*&gt; এ একটি বার্তা পাঠান"
 
 msgid "Resubscribe"
 msgstr "পুনরায় গ্রাহক হোন"
 
 # fix me tithi
 msgid "Retrieve subscriptions from server"
-msgstr "সার্ভার থেকে শেয়ারসমূহ উদ্ধার করুন"
+msgstr "সার্ভার থেকে সাবস্ক্রিপশন বের করে আনুন"
 
 # fix me tithi
 #. *< type
@@ -10763,63 +10599,52 @@ msgstr "সার্ভার থেকে শেয়ারসমূহ উদ্
 #. *  summary
 #. *  description
 msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr প্রটোকল প্লাগইন"
+msgstr "Zephyr প্রোটোকল প্লাগইন"
 
 msgid "Use tzc"
-msgstr "tzc ব্যবহার করুন"
+msgstr "tzc ব্যবহার"
 
 msgid "tzc command"
-msgstr "tzc নির্দেশ"
+msgstr "tzc কমান্ড"
 
 # tithi
 msgid "Export to .anyone"
-msgstr ".যেকারও কাছে রপ্তানি করুন"
+msgstr ".anyone এ এক্সপোর্ট"
 
 msgid "Export to .zephyr.subs"
-msgstr ".zephyr.subs এ রপ্তানি করুন"
+msgstr ".zephyr.subs এ এক্সপোর্ট"
 
 # tithi
 msgid "Import from .anyone"
-msgstr ".যেকারও কাছ থেকে আমদানি করুন"
+msgstr ".anyone থেকে ইমপোর্ট করা হবে"
 
 # fix me tithi
 msgid "Import from .zephyr.subs"
-msgstr ".zephyr.subs থেকে আমদানি করুন"
+msgstr ".zephyr.subs থেকে ইমপোর্ট করা হবে"
 
 msgid "Realm"
 msgstr "এলাকা"
 
 # tithi
 msgid "Exposure"
-msgstr "অনাবৃতকরণ"
-
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"সকেট তৈরী করতে ব্যর্থ:\n"
-"%s"
+msgstr "আলোকসম্পাত"
 
 #, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "HTTP প্রক্সি থেকে সাড়া গ্রহণ করতে অক্ষম: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "HTTP প্রক্সি থেকে উত্তর পার্স করতে ব্যর্থ: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "এইচটিটিপি প্রক্সি সংযোগের %d ত্রুটি"
+msgstr "HTTP প্রক্সি সংযোগে ত্রুটি %d"
 
 # tithi
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "অনুমতি বাতিল: HTTP প্রক্সি সার্ভার %d পোর্ট টানেলকরণে বাধা দেয়।"
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "প্রবেশ অননুমোদিত: HTTP প্রক্সি সার্ভার %d পোর্টে টানেল করতে বাধা দেয়।"
 
 #, c-format
 msgid "Error resolving %s"
-msgstr "%s স্থিরকরণে ত্রুটি"
-
-msgid "Could not resolve host name"
-msgstr "হোস্টের নাম স্থির করা হয়নি"
+msgstr "%s নিরূপণে ত্রুটি"
 
 # tithi
 #, c-format
@@ -10844,42 +10669,42 @@ msgstr "না (_N)"
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
 msgid "_Accept"
-msgstr "গ্রহণ করুন (_A)"
+msgstr "গ্রহণ (_A)"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
 msgid "I'm not here right now"
-msgstr "এই মুহুর্তে আমি এখানে নেই"
+msgstr "এই মূহুর্তে আমি এখানে নেই"
 
 msgid "saved statuses"
-msgstr "সংরক্ষিত অবস্থাসমূহ"
+msgstr "সংরক্ষিত অবস্থা"
 
 #, c-format
 msgid "%s is now known as %s.\n"
-msgstr "%1s এখন %2s নামে পরিচিত।\n"
+msgstr "%1$s এখন %2$s নামে পরিচিত।\n"
 
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"%1s %2s কে %3s আড্ডার রুমে আমন্ত্রন জানিয়েছেন:\n"
-"%4s"
+"%1$s %2$s কে %3$s আড্ডার আসরে আমন্ত্রন জানিয়েছে:\n"
+"%4$s"
 
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%1s %2s কে %3s আড্ডার রুমে আমন্ত্রন জানিয়েছেন\n"
+msgstr "%1$s %2$s কে %3$s আড্ডার আসরে আমন্ত্রন জানিয়েছে\n"
 
 msgid "Accept chat invitation?"
-msgstr "আড্ডার আমন্ত্রন কি গ্রহণ করবেন?"
+msgstr "আড্ডার আমন্ত্রন গ্রহণ করবেন?"
 
 #. Shortcut
 msgid "Shortcut"
 msgstr "শর্টকাট"
 
 msgid "The text-shortcut for the smiley"
-msgstr "স্মাইলির জন্য পাঠ-শর্টকাট"
+msgstr "স্মাইলির জন্য টেক্সট-শর্টকাট"
 
 #. Stored Image
 msgid "Stored Image"
@@ -10887,7 +10712,7 @@ msgstr "সংরক্ষিত ছবি"
 
 # tithi
 msgid "Stored Image. (that'll have to do for now)"
-msgstr "সংরক্ষিত ছবি। (ঐটি এই সময়ের জন্য করতে হবে)"
+msgstr "সংরক্ষিত ছবি। (ঐটি এই সময়ের জন্য এটিই যথেষ্ট)"
 
 msgid "SSL Connection Failed"
 msgstr "SSL সংযোগ ব্যর্থ হয়েছে"
@@ -10897,55 +10722,52 @@ msgstr "SSL হ্যান্ডশেক ব্যর্থ হয়েছে"
 
 # tithi
 msgid "SSL peer presented an invalid certificate"
-msgstr "SSL যুগল একটি অবৈধ প্রত্যয়নপত্র উপস্থাপন করেছিল"
+msgstr "SSL পিয়ার একটি অকার্যকর সার্টিফিকেট উপস্থাপন করেছে"
 
 msgid "Unknown SSL error"
 msgstr "অজানা SSL ত্রুটি"
 
 msgid "Unset"
-msgstr "অনির্ধারণ করুন"
+msgstr "নির্ধারিত মান অপসারণ"
 
 msgid "Do not disturb"
 msgstr "বিরক্ত করবেন না"
 
 # fix me tithi
 msgid "Extended away"
-msgstr "অনেক বর্ধিত"
-
-msgid "Mobile"
-msgstr "মোবাইল"
+msgstr "অনেকক্ষন যাবত অন্যত্র"
 
 # tithi
 msgid "Listening to music"
-msgstr "গান শুনছে"
+msgstr "গান শুনছি"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%1s (%2s) অবস্থা %4s থেকে %3s তে পরিবর্তন করেছে"
+msgstr "%1$s (%2$s) অবস্থা %3$s থেকে %4$s তে পরিবর্তন করেছে"
 
 #, c-format
 msgid "%s (%s) is now %s"
-msgstr "%1s (%2s) এখন %3s"
+msgstr "%1$s (%2$s) এখন %3$s"
 
 #, c-format
 msgid "%s (%s) is no longer %s"
-msgstr "%1s (%2s) আর %3s থাকবে না"
+msgstr "%1$s (%2$s) আর %3$s নেই"
 
 #, c-format
 msgid "%s became idle"
-msgstr "%s এখন অলস"
+msgstr "%s এখন নিষ্ক্রিয়"
 
 #, c-format
 msgid "%s became unidle"
-msgstr "%s এখন অলস নয়"
+msgstr "%s এখন নিষ্ক্রিয় নয়"
 
 #, c-format
 msgid "+++ %s became idle"
-msgstr "+++ %s অলস হয়েছে"
+msgstr "+++ %s এখন নিষ্ক্রিয়"
 
 #, c-format
 msgid "+++ %s became unidle"
-msgstr "+++ %s অলস হয়নি"
+msgstr "+++ %s এখন নিষ্ক্রিয় নয়"
 
 #.
 #. * This string determines how some dates are displayed.  The default
@@ -10957,19 +10779,6 @@ msgstr "+++ %s অলস হয়নি"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s পড়ায় ত্রুটি"
-
-# tithi
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"আপনার %s পড়ার সময় একটি ত্রুটির বাধা দেয়েছিল।  তাদেরকে লোড করা হয়নি, এবং পুরনো "
-"ফাইলটি %s~ এ নামান্তর করা হয়েছে।"
-
 msgid "Calculating..."
 msgstr "গননা করা হচ্ছে..."
 
@@ -10986,44 +10795,44 @@ msgstr[1] "%d সেকেন্ড"
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d দিন"
-msgstr[1] "%d গুলো দিন"
+msgstr[1] "%d দিন"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d ঘন্টা"
-msgstr[1] "%s, %d গুলো ঘন্টা"
+msgstr[1] "%s, %d ঘন্টা"
 
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ঘন্টা"
-msgstr[1] "%d গুলো ঘন্টা"
+msgstr[1] "%d ঘন্টা"
 
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d মিনিট"
-msgstr[1] "%s, %d গুলো মিনিট"
+msgstr[1] "%s, %d মিনিট"
 
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d মিনিট"
-msgstr[1] "%d গুলো মিনিট"
+msgstr[1] "%d মিনিট"
 
 # tithi
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr "%s খুলতে পারেনি: অনেকবার পুনঃনির্দেশ করা হয়েছে"
+msgstr "%s খুলতে ব্যর্থ: অনেকবার রিডিরেক্ট করা হয়েছে"
 
 #, c-format
 msgid "Unable to connect to %s"
-msgstr "%s এ সংযোগ দিতে ব্যর্থ হয়েছে"
+msgstr "%s এ সংযুক্ত হতে ব্যর্থ"
 
 #, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "%s থেকে পড়ায় ত্রুটি: প্রতিউত্তর অনেক দীর্ঘ্য (%d বাইটের সীমা)"
+msgstr "%s থেকে পড়ায় ত্রুটি: অনেক দীর্ঘ উত্তর (সীমা %d বাইট)"
 
 # fix-me tithi
 #, c-format
@@ -11031,20 +10840,20 @@ msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
-"%s এর উপাদানসমূহ ধারণ করার মতো যথেষ্ট মেমোরি বরাদ্দ করতে অক্ষম।  ওয়েব সার্ভার "
-"বিদ্বেষপরায়ণ কিছু করার চেষ্টা করতে পারে।"
+"%s এর বিষয়বস্তু ধারণ করার মতো মেমরি বরাদ্দ করতে ব্যর্থ। ওয়েব সার্ভারটি সম্ভবত "
+"বিদ্বেষপরায়ণ কিছু করার চেষ্টা করছে।"
 
 #, c-format
 msgid "Error reading from %s: %s"
-msgstr "%1s থেকে পড়ায় ত্রুটি: %2s"
+msgstr "%1$s থেকে পড়ায় ত্রুটি: %2$s"
 
 #, c-format
 msgid "Error writing to %s: %s"
-msgstr "%1s এ লেখায় ত্রুটি: %2s"
+msgstr "%1$s এ লেখায় ত্রুটি: %2$s"
 
 #, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "%1s এর সাথে সংযোগে ব্যর্থ: %2s"
+msgstr "%1$s এর সাথে সংযোগ স্থাপনে ব্যর্থ: %2$s"
 
 # tithi
 #, c-format
@@ -11059,7 +10868,7 @@ msgstr " (%s)"
 #. 10053
 #, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr "আপনার কম্পিউটারের অন্য সফটওয়্য়ার দ্বারা সংয়োগ বাধাগ্রস্থ হয়েছে। "
+msgstr "আপনার কম্পিউটারের অন্যান্য সফটওয়্যার দ্বারা সংযোগ বাধাগ্রস্থ হয়েছে। "
 
 #. 10054
 #, c-format
@@ -11070,17 +10879,30 @@ msgstr "দূরবর্তী হোস্ট সংযোগ বন্ধ �
 #. 10060
 #, c-format
 msgid "Connection timed out."
-msgstr "সংযোগ সময় উত্তীর্ণ হয়েছে।"
+msgstr "সংযোগের সময়উত্তীর্ণ হয়ে গেছে।"
 
 #. 10061
 #, c-format
 msgid "Connection refused."
-msgstr "সংযোগে প্রত্যাখান করা হয়েছে"
+msgstr "সংযোগ প্রত্যাখাত হয়েছে"
 
 #. 10048
 #, c-format
 msgid "Address already in use."
-msgstr "ঠিকানাটি ইতোমধ্যে ব্যবহৃত হচ্ছে।"
+msgstr "ঠিকানাটি ইতিমধ্যে ব্যবহৃত হচ্ছে।"
+
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s পড়ায় ত্রুটি"
+
+# tithi
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"আপনার %1$s পড়ার সময় একটি ত্রুটির দেখা দেয়েছে। ফাইলটি লোড করা হয়নি, এবং পুরনো "
+"ফাইলটি %2$s~ এ নামান্তর করা হয়েছে।"
 
 msgid "Internet Messenger"
 msgstr "ইন্টারনেট বার্তাবাহক"
@@ -11090,52 +10912,51 @@ msgstr "পিজিন ইন্টারনেট বার্তাবাহ�
 
 # tithi
 msgid "Send instant messages over multiple protocols"
-msgstr "বহুবিধ প্রটোকল দিয়ে তাৎক্ষনিক বার্তাসমূহ প্রেরণ করুন"
+msgstr "বহুবিধ প্রোটোকল দিয়ে তাৎক্ষনিক বার্তা প্রেরণ করুন"
 
+# page orientation
 msgid "Orientation"
-msgstr "পরিচিতি পর্ব"
+msgstr "পরিস্থিতি"
 
 msgid "The orientation of the tray."
-msgstr "ট্রে প্রদর্শনের ধরন"
+msgstr "ট্রের পরিস্থিতি।"
 
 #. Build the login options frame.
 msgid "Login Options"
-msgstr "লগইনের পছন্দসমূহ"
+msgstr "লগইনের অপশন"
 
 msgid "Pro_tocol:"
 msgstr "প্রটোকল (_t):"
 
 msgid "_Username:"
-msgstr "ব্যবহারকারীরনাম (_U):"
+msgstr "ব্যবহারকারীর নাম (_U):"
 
 msgid "Remember pass_word"
-msgstr "গুপ্তসংকেত স্মরণ রাখুন (_w)"
+msgstr "পাসওয়ার্ড স্মরণ রাখা হবে (_w)"
 
 #. Build the user options frame.
 msgid "User Options"
-msgstr "ব্যবহারকারীর পছন্দসমূহ"
+msgstr "ব্যবহারকারীর অপশন"
 
 msgid "_Local alias:"
-msgstr "স্থানীয় ডাকনাম (_L):"
+msgstr "স্থানীয় উপনাম (_L):"
 
 msgid "New _mail notifications"
-msgstr "নতুন মেইলের প্রজ্ঞাপন (_m)"
+msgstr "নতুন মেইলের ঘোষণা (_m)"
 
 # tithi
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "এই একাউন্টের জন্য এই বন্ধু আইকন ব্যবহার করুন (_i):"
+msgstr "এই একাউন্টের জন্য এই বন্ধু আইকন ব্যবহার করা হবে (_i):"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s পছন্দসমূহ"
+msgid "Ad_vanced"
+msgstr "উচ্চপর্যায় (_v)"
 
 msgid "Use GNOME Proxy Settings"
-msgstr "GNOME প্রক্সি বিন্যাসনসমূহ ব্যবহার করুন"
+msgstr "GNOME প্রক্সি সেটিং ব্যবহার করা হবে"
 
 msgid "Use Global Proxy Settings"
-msgstr "সর্বজনীন প্রক্সি বিন্যাসনসমূহ ব্যবহার করুন"
+msgstr "গ্লোবাল প্রক্সি সেটিং ব্যবহার করা হবে"
 
 msgid "No Proxy"
 msgstr "প্রক্সি নেই"
@@ -11144,13 +10965,13 @@ msgid "HTTP"
 msgstr "HTTP"
 
 msgid "SOCKS 4"
-msgstr "SOCKS ৪"
+msgstr "SOCKS 4"
 
 msgid "SOCKS 5"
-msgstr "SOCKS ৫"
+msgstr "SOCKS 5"
 
 msgid "Use Environmental Settings"
-msgstr "পারিপার্শ্বিক বিন্যাসনসমূহ ব্যবহার করুন"
+msgstr "এনভায়রনমেন্টাল সেটিং ব্যবহার করা হবে"
 
 #. This is an easter egg.
 #. It means one of two things, both intended as humourus:
@@ -11164,9 +10985,6 @@ msgstr "আপনি যদি খুব ভালভাবে দেখেন"
 msgid "you can see the butterflies mating"
 msgstr "আপনি প্রজাপতিদের সঙ্গী দেখতে পাবেন"
 
-msgid "Proxy Options"
-msgstr "প্রক্সির পছন্দসমূহ"
-
 msgid "Proxy _type:"
 msgstr "প্রক্সির ধরন (_t):"
 
@@ -11177,33 +10995,33 @@ msgid "_Port:"
 msgstr "পোর্ট (_P):"
 
 msgid "Pa_ssword:"
-msgstr "গুপ্তসংকেত (_s):"
+msgstr "পাসওয়ার্ড (_s):"
 
 msgid "Unable to save new account"
-msgstr "নতুন একাউন্ট সংরক্ষণে অক্ষম"
+msgstr "নতুন একাউন্ট সংরক্ষণে ব্যর্থ"
 
 # tithi
 msgid "An account already exists with the specified criteria."
 msgstr "উল্লেখিত বৈশিষ্ট্যের একটি একাউন্ট ইতিমধ্যে বিদ্যমান।"
 
 msgid "Add Account"
-msgstr "একাউন্ট যোগ করুন"
+msgstr "একাউন্ট যোগ"
 
 msgid "_Basic"
 msgstr "মৌলিক (_B)"
 
 # tithi
 msgid "Create _this new account on the server"
-msgstr "সার্ভারে এই নতুন একাউন্টটি তৈরী করুন (_t)"
+msgstr "সার্ভারে এই নতুন একাউন্টটি তৈরী করা হবে (_t)"
 
-msgid "_Advanced"
-msgstr "অগ্রগামী (_A)"
+msgid "P_roxy"
+msgstr "প্রক্সি (_r)"
 
 msgid "Enabled"
 msgstr "সক্রিয়"
 
 msgid "Protocol"
-msgstr "প্রটোকল"
+msgstr "প্রোটোকল"
 
 # tithi
 #, c-format
@@ -11218,102 +11036,113 @@ msgid ""
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
-"<span size='larger' weight='bold'>স্বাগতম %s!</span>\n"
+"<span size='larger' weight='bold'>%s এ স্বাগতম!</span>\n"
 "\n"
-"আপনার তাৎক্ষনিক বার্তা একাউন্ট কনফিগার করা নেই। %s এর সাথে সংযোগ পেতে  <b>Add..."
-"</b> বাটন চাপুন এবং আপনার প্রথম একাউন্ট কনফিগার করুন। যদি আপনি একাধিক IM "
-"একাউন্টকে %s এর সাথে সংযুক্ত করতে চান তবে সেগুলোকে পুনরায় কনফিগার করতে <b>Add...</"
-"b> বাটন চাপুন।\n"
+"আপনার তাৎক্ষনিক বার্তা একাউন্ট কনফিগার করা নেই। %s এর সাথে সংযোগ পেতে  <b>"
+"\"যোগ...\"</b> বোতাম চাপুন এবং আপনার প্রথম একাউন্টটি কনফিগার করুন। যদি আপনি %s "
+"এর মাধ্যমে একাধিক IM একাউন্টে সংযুক্ত হতে চান তবে সেগুলোকে কনফিগার করতে পুনরায় <b>"
+"\"যোগ...\"</b> বোতাম চাপুন।\n"
 "\n"
-"আপনি পুনরায় এই উইন্ডোতে ফিরে আসতে পারেন এবং বন্ধু তালিকা উইন্ডোতে  একাউন্ট গুলোকে "
-"<b>Accounts->একাউন্ট গুলোকে ম্যানেজ করুন</b> এর সাহায্যে  যুক্ত, সম্পাদনা করতে বা "
-"মুছে ফেলতে পারেন"
+"আপনি পুনরায় এই উইন্ডোতে ফিরে আসতে পারেন এবং \"একাউন্টসমূহ\" মেনুর \"একাউন্ট নিয়ন্ত্রন"
+"\" উইন্ডো থেকে নতুন একাউন্ট যোগ, সম্পাদনা বা অপসারণ করতে পারেন।"
 
 # tithi
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
-msgstr[0] "আপনার %1d-টি %2s নামের  যোগাযোগ আছে। আপনি কি তাদের একত্রিত করতে চান?"
+msgstr[0] ""
+"আপনার %1$d-টি %2$s নামের পরিচিতি আছে। আপনি কি তাদের একত্রিত করতে চান?"
 msgstr[1] ""
-"আপনার বর্তমানে %1dগুলো %2s নামের যোগাযোগ আছে। আপনি কি তাদের একত্রিত করতে চান?"
+"আপনার বর্তমানে %1$dটি %2$s নামের পরিচিতি আছে। আপনি কি তাদের একত্রিত করতে চান?"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
-"এই যোগাযোগসমূহ একত্রিত করার কারণে একটি একক এন্ট্রিকে বন্ধু তালিকায় শেয়ার করতে হবে "
-"এবং একটি একক কথোপকথন উইন্ডো ব্যবহার করুন। আপনি যোগাযোগের প্রসঙ্গ তালিকা থেকে "
-"'প্রসারন' পছন্দ করার মাধ্যমে তাদেরকে পুনরায় আলাদা করতে পারেন"
+"এই পরিচিতিগুলো একত্রিত করলে বন্ধু তালিকায় তাদের একট ভুক্তি হিসেবে দেখানো হবে এবং "
+"সবার জন্য একটি কথোপকথন উইন্ডো ব্যবহার করা হবে। আপনি পরিচিতির প্রাসঙ্গিক-মেনু থেকে "
+"'প্রসারিত' নির্বাচন করে তাদেরকে পুনরায় আলাদা করতে পারেন।"
 
 # tithi
 msgid "Please update the necessary fields."
 msgstr "অনুগ্রহ করে প্রয়োজনীয় ক্ষেত্রগুলো হালনাগাদ করুন।"
 
-msgid "Room _List"
-msgstr "রুমের তালিকা (_L)"
+msgid "A_ccount"
+msgstr "একাউন্ট (_c)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr ""
-"অনুগ্রহ করে আপনি যে আড্ডায় যোগ দিতে চান তার সম্পর্কে যথাযথ তথ্য প্রবেশ করান।\n"
+msgstr "অনুগ্রহ করে আপনি যে আড্ডায় যোগ দিতে চান তার সম্পর্কে যথাযথ তথ্য দিন।\n"
 
-msgid "_Account:"
-msgstr "একাউন্ট (_A):"
+msgid "Room _List"
+msgstr "আসরের তালিকা (_L)"
 
 msgid "_Block"
-msgstr "ব্লক করুন (_B)"
+msgstr "ব্লক (_B)"
 
 msgid "Un_block"
-msgstr "ব্লক সরান (_b)"
+msgstr "আনব্লক (_b)"
 
 # tithi
 msgid "Move to"
 msgstr "সরান"
 
 msgid "Get _Info"
-msgstr "তথ্য সংগ্রহ করুন (_I)"
+msgstr "তথ্য সংগ্রহ (_I)"
 
 msgid "I_M"
-msgstr "আইএম (_M)"
+msgstr "I_M"
+
+msgid "_Audio Call"
+msgstr "অডিও কল (_A)"
+
+msgid "Audio/_Video Call"
+msgstr "অডিও/ভিডিও কল (_V)"
+
+msgid "_Video Call"
+msgstr "ভিডিও কল (_V)"
 
 msgid "_Send File..."
-msgstr "ফাইল পাঠান... (_S)"
+msgstr "ফাইল প্রেরণ... (_S)"
 
 msgid "Add Buddy _Pounce..."
-msgstr "বন্ধু পাউন্স যোগ করুন... (_P)"
+msgstr "বন্ধু পাউন্স যোগ... (_P)"
 
 msgid "View _Log"
-msgstr "লগ প্রদর্শন করুন (_L)"
+msgstr "লগ প্রদর্শন (_L)"
+
+msgid "Hide When Offline"
+msgstr "অফলাইন হলে আড়াল করা হবে"
 
-msgid "Hide when offline"
-msgstr "অফলাইনে থাকলে লুকিয়ে রাখুন"
+msgid "Show When Offline"
+msgstr "অফলাইন হলে প্রদর্শন করা হবে"
 
 msgid "_Alias..."
 msgstr "উপনাম... (_A)"
 
 msgid "_Remove"
-msgstr "অপসারণ করুন (_R)"
+msgstr "অপসারণ (_R)"
 
 msgid "Set Custom Icon"
-msgstr "পছন্দসই আইকন নির্ধারণ করুন"
+msgstr "স্বনির্বাচিত আইকন নির্ধারণ"
 
 msgid "Remove Custom Icon"
-msgstr "পছন্দসই আইকন অপসারণ করুন"
+msgstr "স্বনির্বাচিত আইকন অপসারণ"
 
 msgid "Add _Buddy..."
-msgstr "বন্ধু যোগ করুন... (_B)"
+msgstr "বন্ধু যোগ... (_B)"
 
 msgid "Add C_hat..."
-msgstr "আড্ডা যোগ করুন...(_h)"
+msgstr "আড্ডা যোগ...(_h)"
 
 msgid "_Delete Group"
-msgstr "গ্রুপ মুছে ফেলুন (_D)"
+msgstr "দল মুছে ফেলা হবে (_D)"
 
 msgid "_Rename"
-msgstr "পুনরায় নামকরণ করুন (_R)"
+msgstr "নামান্তর (_R)"
 
 #. join button
 msgid "_Join"
@@ -11323,19 +11152,19 @@ msgid "Auto-Join"
 msgstr "স্বয়ং-যোগ দিন"
 
 msgid "Persistent"
-msgstr "পুনঃপুন ঘটনশীল"
+msgstr "পুনঃপুনঃ ঘটনশীল"
 
 msgid "_Edit Settings..."
-msgstr "বিন্যাসনসমূহ সম্পাদনা করুন... (_E)"
+msgstr "সেটিং সম্পাদনা... (_E)"
 
 msgid "_Collapse"
 msgstr "গুটিয়ে ফেলুন (_C)"
 
 msgid "_Expand"
-msgstr "বর্ধিত করুন (_E)"
+msgstr "প্রসারিত (_E)"
 
 msgid "/Tools/Mute Sounds"
-msgstr "/টুলসমূহ/সাউন্ড বন্ধ রাখুন"
+msgstr "/টুল/শব্দ বন্ধ"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11353,103 +11182,103 @@ msgid "/_Buddies"
 msgstr "/বন্ধুগণ (_B)"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/বন্ধুগণ/নতুন তাৎক্ষণিক বার্তা... (_M)"
+msgstr "/বন্ধুগণ/নতুন বার্তা... (_M)"
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/বন্ধুগণ/আড্ডায় যোগদান করুন... (_C)"
+msgstr "/বন্ধুগণ/আড্ডায় যোগদান... (_C)"
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/বন্ধুগণ/ব্যবহারকারীর তথ্য সংগ্রহ করুন... (_I)"
+msgstr "/বন্ধুগণ/ব্যবহারকারীর তথ্য... (_I)"
 
 msgid "/Buddies/View User _Log..."
-msgstr "/বন্ধুগণ/ব্যবহারকারী লগ প্রদর্শন করুন... (_L)"
+msgstr "/বন্ধুগণ/ব্যবহারকারীর লগ প্রদর্শন... (_L)"
 
 msgid "/Buddies/Sh_ow"
-msgstr "/বন্ধুগণ/দেখান (_o)"
+msgstr "/বন্ধুগণ/প্রদর্শন (_O)"
 
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/বন্ধুগণ/দেখান/অফলাইন বন্ধুগণ (_O)"
+msgstr "/বন্ধুগণ/প্রদর্শন/অফলাইন বন্ধুগণ (_O)"
 
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/বন্ধুগণ/দেখান/ফাঁকা গ্রুপসমূহ (_E)"
+msgstr "/বন্ধুগণ/প্রদর্শন/ফাঁকা দল (_E)"
 
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/বন্ধুগণ/দেখান/বন্ধুর বিবরণ (_D)"
+msgstr "/বন্ধুগণ/প্রদর্শন/বন্ধুর বিবরণ (_D)"
 
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/বন্ধুগণ/দেখান/অলস সময় (_T)"
+msgstr "/বন্ধুগণ/প্রদর্শন/নিষ্ক্রিয় সময় (_T)"
 
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/বন্ধুগণ/দেখান/প্রটোকল আইকনগুলো (_P)"
+msgstr "/বন্ধুগণ/প্রদর্শন/প্রোটোকল আইকন (_P)"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/বন্ধুগণ/বন্ধুদের ক্রমানুসারে সাজান (_S)"
+msgstr "/বন্ধুগণ/বন্ধুদের সাজান (_S)"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/বন্ধুগণ/বন্ধু যোগ করুন... (_A)"
+msgstr "/বন্ধুগণ/বন্ধু যোগ... (_A)"
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/বন্ধুগণ/আড্ডা যোগ করুন... (_h)"
+msgstr "/বন্ধুগণ/আড্ডা যোগ... (_h)"
 
 msgid "/Buddies/Add _Group..."
-msgstr "/বন্ধুগণ/গ্রুপ যোগ করুন... (_G)"
+msgstr "/বন্ধুগণ/দল যোগ (_G)..."
 
 msgid "/Buddies/_Quit"
-msgstr "/বন্ধুগণ/প্রস্থান করুন (_Q)"
+msgstr "/বন্ধুগণ/প্রস্থান (_Q)"
 
 #. Accounts menu
 msgid "/_Accounts"
 msgstr "/একাউন্টসমূহ (_A)"
 
 msgid "/Accounts/Manage Accounts"
-msgstr "/একাউন্টসমূহ/একাউন্টসমূহ নিয়ন্ত্রণ করুন"
+msgstr "/একাউন্টসমূহ/একাউন্ট নিয়ন্ত্রণ"
 
 #. Tools
 msgid "/_Tools"
-msgstr "/টুলসমূহ (_T)"
+msgstr "/টুল (_T)"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/টুলসমূহ/বন্ধু পাউন্সসমূহ (_P)"
+msgstr "/টুল/বন্ধু পাউন্স (_P)"
 
 msgid "/Tools/_Certificates"
-msgstr "/টুলসমূহ/প্রত্যয়নপত্রসমূহ (_C)"
+msgstr "/টুল/সার্টিফিকেট (_C)"
+
+msgid "/Tools/Custom Smile_ys"
+msgstr "/টুল/স্বনির্বাচিত স্মাইলি (_y)"
 
 msgid "/Tools/Plu_gins"
-msgstr "/টুলসমূহ/প্লাগ-ইনসমূহ (_g)"
+msgstr "/টুল/প্লাগইন (_G)"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/টুলসমূহ/প্রাধিকারসমূহ (_e)"
+msgstr "/টুল/পছন্দসমূহ (_E)"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/টুলসমূহ/গোপনীয়তা (_i)"
-
-msgid "/Tools/Smile_y"
-msgstr "/টুলসমূহ/স্মাইলী (_y)"
+msgstr "/টুল/গোপনতা (_I)"
 
 msgid "/Tools/_File Transfers"
-msgstr "/টুলসমূহ/ফাইল স্থানান্তর করে (_F)"
+msgstr "/টুল/ফাইল স্থানান্তর (_F)"
 
 msgid "/Tools/R_oom List"
-msgstr "/টুলসমূহ/রুমের তালিকা (_o)"
+msgstr "/টুল/আসরের তালিকা (_O)"
 
 msgid "/Tools/System _Log"
-msgstr "/টুলসমূহ/সিস্টেমের কার্যবিবরণী (_L)"
+msgstr "/টুল/সিস্টেম লগ (_L)"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/টুলসমূহ/সাউন্ড বন্ধ রাখুন (_S)"
+msgstr "/টুল/শব্দ বন্ধ (_S)"
 
 #. Help
 msgid "/_Help"
-msgstr "/সহায়িকা (_H)"
+msgstr "/সহায়তা (_H)"
 
 msgid "/Help/Online _Help"
-msgstr "/সহায়িকা/অনলাইন সহায়িকা (_H)"
+msgstr "/সহায়তা/অনলাইন সহায়িকা (_H)"
 
 msgid "/Help/_Debug Window"
-msgstr "/সহায়িকা/ডিবাগ উইন্ডো (_D)"
+msgstr "/সহায়তা/ডিবাগ উইন্ডো (_D)"
 
 msgid "/Help/_About"
-msgstr "/সহায়িকা/পরিচিতি (_A)"
+msgstr "/সহায়তা/পরিচিতি (_A)"
 
 #, c-format
 msgid "<b>Account:</b> %s"
@@ -11461,7 +11290,7 @@ msgid ""
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>পেশা:</b> %d"
+"<b>বসবাসকারী:</b> %d"
 
 #, c-format
 msgid ""
@@ -11485,7 +11314,7 @@ msgstr "শেষ দেখেছিলাম"
 
 # fix me tithi
 msgid "Spooky"
-msgstr "ভূতুরে"
+msgstr "ভুতুরে"
 
 msgid "Awesome"
 msgstr "দারুণ"
@@ -11500,54 +11329,54 @@ msgstr "মোট বন্ধু"
 # fix me tithi
 #, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "%dd %dh %02dm অলস"
+msgstr "%dd %dh %02dm যাবত নিষ্ক্রিয়"
 
 #, c-format
 msgid "Idle %dh %02dm"
-msgstr "%dh %02dm অলস"
+msgstr "%dh %02dm যাবত নিষ্ক্রিয়"
 
 #, c-format
 msgid "Idle %dm"
-msgstr "%dm অলস"
+msgstr "%dm যাবত নিষ্ক্রিয়"
 
 msgid "/Buddies/New Instant Message..."
-msgstr "/বন্ধুগণ/নতুন তাৎক্ষণিক বার্তা..."
+msgstr "/বন্ধুগণ/নতুন বার্তা..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/বন্ধুগণ/আড্ডায় যোগদান করুন..."
+msgstr "/বন্ধুগণ/আড্ডায় যোগদান..."
 
 msgid "/Buddies/Get User Info..."
-msgstr "/বন্ধুগণ/ব্যবহারকারীর তথ্য গ্রহন করুন..."
+msgstr "/বন্ধুগণ/ব্যবহারকারীর তথ্য..."
 
 msgid "/Buddies/Add Buddy..."
-msgstr "/বন্ধুগণ/বন্ধু যোগ করুন..."
+msgstr "/বন্ধুগণ/বন্ধু যোগ..."
 
 msgid "/Buddies/Add Chat..."
-msgstr "/বন্ধুগণ/আড্ডা যোগ করুন..."
+msgstr "/বন্ধুগণ/আড্ডা যোগ..."
 
 msgid "/Buddies/Add Group..."
-msgstr "/বন্ধুগণ/গ্রুপ যোগ করুন..."
+msgstr "/বন্ধুগণ/দল যোগ..."
 
 msgid "/Tools/Privacy"
-msgstr "/টুলসমূহ/গোপনীয়তা"
+msgstr "/টুল/গোপনতা"
 
 msgid "/Tools/Room List"
-msgstr "/টুলসমূহ/রুমের তালিকা"
+msgstr "/টুল/আসরের তালিকা"
 
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%1dটি অপঠিত বার্তা %2s হতে\n"
-msgstr[1] "%1dগুলো অপঠিত বার্তা %2s হতে\n"
+msgstr[0] "%2$s থেকে %1$dটি অপঠিত বার্তা\n"
+msgstr[1] "%2$s থেকে %1$dটি অপঠিত বার্তা\n"
 
 msgid "Manually"
-msgstr "হস্তচালিতভাবে"
+msgstr "নিজ হাতে"
 
 msgid "By status"
 msgstr "অবস্থা অনুসারে"
 
-msgid "By log size"
-msgstr "লগের আকার অনুসারে"
+msgid "By recent log activity"
+msgstr "সাম্প্রতিক লগ অনুসারে"
 
 #, c-format
 msgid "%s disconnected"
@@ -11558,10 +11387,13 @@ msgid "%s disabled"
 msgstr "%s নিষ্ক্রিয়"
 
 msgid "Reconnect"
-msgstr "পুনরায় সংযোগ দিন"
+msgstr "পুনঃসংযোগ করা হবে"
 
 msgid "Re-enable"
-msgstr "পুনরায় সক্রিয় করুন"
+msgstr "পুনঃসক্রিয় করা হবে"
+
+msgid "SSL FAQs"
+msgstr "SSL FAQ"
 
 # tithi
 msgid "Welcome back!"
@@ -11571,21 +11403,22 @@ msgstr "পুনরায় স্বাগতম!"
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "আপনি অন্য একটি স্থান থেকে সাইন অন করার কারণে %d একাউন্টটি নিষ্ক্রিয় ছিল:"
+msgstr[0] ""
+"আপনি অন্য একটি স্থান থেকে লগইন করার কারণে %d একাউন্টটি নিষ্ক্রিয় করা হয়েছে:"
 msgstr[1] ""
-"আপনি অন্য একটি স্থান থেকে সাইন অন করার কারণে %d একাউন্টগুলো নিষ্ক্রিয় ছিল:"
+"আপনি অন্য একটি স্থান থেকে লগইন করার কারণে %d একাউন্টগুলো নিষ্ক্রিয় করা হয়েছে:"
 
 msgid "<b>Username:</b>"
-msgstr "<b>ব্যবহারকারীর-নাম:</b>"
+msgstr "<b>ব্যবহারকারীর নাম:</b>"
 
 msgid "<b>Password:</b>"
-msgstr "<b>গুপ্তসংকেত:</b>"
+msgstr "<b>পাসওয়ার্ড:</b>"
 
 msgid "_Login"
 msgstr "লগইন (_L)"
 
 msgid "/Accounts"
-msgstr "/একাউন্টগুলো"
+msgstr "/একাউন্ট"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
 #, c-format
@@ -11598,119 +11431,210 @@ msgid ""
 msgstr ""
 "<span weight='bold' size='larger'>%s এ স্বাগতম!</span>\n"
 "\n"
-"আপনার কোন একাউন্ট সক্রিয় নেই। আপনার আইএম একাউন্টসমূহ <b>একাউন্টসমূহ->একাউন্টসমূহ "
-"নিয়ন্ত্রণ করুন</b> এর <b>একাউন্টসমূহ</b> এর উইন্ডো হতে সক্রিয় করুন। আপনি যদি একাউন্ট "
-"একবার সক্রিয় করেন, আপনি সাইন অন, অবস্থা নির্ধারণ করতে এবং বন্ধুদের সাথে কথা বলতে "
-"সক্ষম হবেন।"
+"আপনার কোন একাউন্ট সক্রিয় নেই। \"একাউন্টসমূহ\" মেনুর \"একাউন্ট নিয়ন্ত্রণ\" উইন্ডো থেকে "
+"আপনার IM সক্রিয় করুন। একাউন্ট একবার সক্রিয় করলে, আপনি লগইন, অবস্থা নির্ধারণ এবং "
+"বন্ধুদের সাথে কথা বলতে পারবেন।"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/বন্ধুগণ/দেখান/অফলাইন বন্ধুগণ"
+msgstr "/বন্ধু/প্রদর্শন/অফলাইন বন্ধু"
 
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/বন্ধুগণ/দেখান/ফাঁকা গ্রুপগুলো"
+msgstr "/বন্ধু/প্রদর্শন/ফাঁকা দল"
 
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/বন্ধুগণ/দেখান/বন্ধুদের বিস্তারিত"
+msgstr "/বন্ধু/প্রদর্শন/বন্ধুর বিবরণ"
 
 msgid "/Buddies/Show/Idle Times"
-msgstr "/বন্ধুগণ/দোখান/অলস সময়"
+msgstr "/বন্ধু/প্রদর্শন/নিষ্ক্রিয় সময়"
 
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/বন্ধুগণ/দেখান/প্রটোকল আইকনগুলো"
+msgstr "/বন্ধু/প্রদর্শন/প্রোটোকল আইকন"
 
 msgid "Add a buddy.\n"
 msgstr "বন্ধু যোগ করুন।\n"
 
 msgid "Buddy's _username:"
-msgstr "বন্ধুর ব্যবহারকারীর-নাম (_u):"
+msgstr "বন্ধুর নাম (_u):"
 
 # and this
 msgid "(Optional) A_lias:"
 msgstr "উপনাম (ঐচ্ছিক) (_l):"
 
 msgid "Add buddy to _group:"
-msgstr "গ্রুপে বন্ধু যোগ করুন (_g):"
+msgstr "বন্ধুকে দলে যোগ করুন (_g):"
 
 msgid "This protocol does not support chat rooms."
-msgstr "এই প্রটোকলটি আড্ডার রুমসমূহ সমর্থন করে না।"
+msgstr "এই প্রোটোকল আড্ডার আসর সমর্থন করে না।"
 
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "আপনি বর্তমানে আড্ডার যোগ্য এমন কোনো প্রটোকলে যুক্ত হননি।"
+msgstr "আপনি বর্তমানে আড্ডার যোগ্য কোনো প্রোটোকলে যুক্ত নন।"
 
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"অনুগ্রহ করে আপনি আপনার বন্ধু তালিকায় যুক্ত করতে চান এমন আড্ডার একটি ডাকনাম,এবং  "
-"যথাযথ তথ্য প্রবেশ করান।\n"
+"অনুগ্রহ করে আপনি আপনার বন্ধু তালিকায় যুক্ত করতে চান এমন আড্ডার একটি উপনাম,এবং যথাযথ "
+"তথ্য দিন।\n"
 
 msgid "A_lias:"
 msgstr "উপনাম (_l):"
 
+msgid "_Group:"
+msgstr "দল (_G):"
+
 # tithi
 msgid "Auto_join when account becomes online."
-msgstr "একাউন্ট অনলাইনে থাকলে স্বয়ংক্রিয় ভাবে যোগদান করুন।"
+msgstr "একাউন্ট অনলাইনে থাকলে স্বয়ংক্রিয় ভাবে যোগদান করা হবে।"
 
 # tithi
 msgid "_Remain in chat after window is closed."
 msgstr "উইন্ডো বন্ধ হবার পরেও আড্ডায় থাকুন (_R)।"
 
 msgid "Please enter the name of the group to be added."
-msgstr "অনুগ্রহ করে যুক্ত করতে হবে এমন গ্রুপের নাম প্রবেশ করান।"
+msgstr "অনুগ্রহ করে যে দলটি যুক্ত করতে হবে তার নাম দিন।"
 
 msgid "Enable Account"
-msgstr "একাউন্ট সক্রিয় করুন"
+msgstr "একাউন্ট সক্রিয় করা হবে"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/একাউন্টসমূহ/একাউন্ট সক্রিয় করুন"
+msgstr "<PurpleMain>/একাউন্ট/একাউন্ট সক্রিয়করণ"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/একাউন্টসমূহ/"
+msgstr "<PurpleMain>/একাউন্ট/"
 
 msgid "_Edit Account"
-msgstr "একাউন্ট সম্পাদন করুন (_E)"
+msgstr "একাউন্ট সম্পাদনা (_E)"
 
 msgid "No actions available"
-msgstr "কোনো কাজ সহজলভ্য নয়"
+msgstr "কোনো প্রতিক্রিয়া বিদ্যমান নেই"
 
 msgid "_Disable"
 msgstr "নিষ্ক্রিয় (_D)"
 
 msgid "/Tools"
-msgstr "/টুলসমূহ"
+msgstr "/টুল"
 
 msgid "/Buddies/Sort Buddies"
-msgstr "/বন্ধুগণ/বন্ধুদের ক্রমানুসারে সাজান"
+msgstr "/বন্ধু/বন্ধুদের সাজান"
+
+#. Buddy List
+msgid "Background Color"
+msgstr "পটভূমির রং"
+
+msgid "The background color for the buddy list"
+msgstr "বন্ধু তালিকার জন্য পটভূমির রং"
+
+# tithi
+msgid "Layout"
+msgstr "বহির্বিন্যাস"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "আইকন, নাম এবং blist এর অবস্থার বহির্বিন্যাস"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "প্রসারিত পটভূমির রং"
+
+msgid "The background color of an expanded group"
+msgstr "একটি প্রসারিত গ্রুপের পটভূমি রং "
+
+msgid "Expanded Text"
+msgstr "প্রসারিত টেক্সট"
+
+msgid "The text information for when a group is expanded"
+msgstr "একটি দল প্রসারিত হওয়ার সময় টেক্সট তথ্য"
+
+msgid "Collapsed Background Color"
+msgstr "গুটানো পটভূমির রং"
+
+msgid "The background color of a collapsed group"
+msgstr "একটি গুটিয়ে ফেলা দলের পটভূমির রং"
+
+msgid "Collapsed Text"
+msgstr "গুটানো টেক্সট"
+
+msgid "The text information for when a group is collapsed"
+msgstr "একটি দল গুটানোর সময় টেক্সট তথ্য"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "পরিচিতি/ আড্ডার পটভূমির রং"
+
+msgid "The background color of a contact or chat"
+msgstr "একটি পরিচিতি অথবা আড্ডার পটভূমির রং"
+
+msgid "Contact Text"
+msgstr "পরিচিতি টেক্সট"
+
+msgid "The text information for when a contact is expanded"
+msgstr "পরিচিতি প্রসারনের সময় টেক্সট তথ্য"
+
+msgid "On-line Text"
+msgstr "অনলাইন টেক্সট"
+
+msgid "The text information for when a buddy is online"
+msgstr "বন্ধু অনলাইনে থাকার সময় টেক্সট তথ্য"
+
+msgid "Away Text"
+msgstr "অন্যত্র অবস্থার টেক্সট"
+
+msgid "The text information for when a buddy is away"
+msgstr "বন্ধু অন্যত্র থাকার সময় টেক্সট তথ্য"
+
+msgid "Off-line Text"
+msgstr "অফলাইন অবস্থার টেক্সট"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "বন্ধু অফলাইনে থাকার সময় টেক্সট তথ্য"
+
+msgid "Idle Text"
+msgstr "নিষ্ক্রিয় অবস্থার টেক্সট"
+
+msgid "The text information for when a buddy is idle"
+msgstr "বন্ধু নিষ্ক্রিয় থাকার সময় টেক্সট তথ্য"
+
+msgid "Message Text"
+msgstr "বার্তার টেক্সট"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "বন্ধুর অপঠিত বার্তা থাকলে যে টেক্সট তথ্য দেখায়"
+
+msgid "Message (Nick Said) Text"
+msgstr "বার্তা (\"ডাকনাম\" বলেছিল) টেক্সট"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr "একটি অপঠিত বার্তায় আপনার নাম উল্লেখ করা হলে যে লেখা প্রদর্শিত হবে"
+
+msgid "The text information for a buddy's status"
+msgstr "বন্ধুর অবস্থার জন্য টেক্সট তথ্য "
+
+# tithi
+msgid "Type the host name for this certificate."
+msgstr "এই সার্টিফিকেটের হোস্ট নাম টাইপ করুন।"
 
 #. Widget creation function
 msgid "SSL Servers"
-msgstr "SSL সার্ভারসমূহ"
+msgstr "SSL সার্ভার"
 
 msgid "Unknown command."
-msgstr "অজানা নির্দেশ।"
+msgstr "অজানা কমান্ড।"
 
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "ঐ বন্ধুটি এই আড্ডার মতো একই প্রটোকলে নেই।"
+msgstr "বন্ধুটি এই আড্ডার একই প্রোটোকলে নেই।"
 
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "আপনি বর্তমানে এমন কোনো একাউন্টে যুক্ত নন যা ঐ বন্ধুকে আমন্ত্রণ জানাতে পারে।"
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "বন্ধুকে আড্ডার রুমে আমন্ত্রণ জানান"
-
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"একটি ঐচ্ছিক আমন্ত্রণ বার্তা সহ, অনুগ্রহ করে আপনি যে ব্যবহারকারীকে আমন্ত্রণ জানাতে চান "
-"তার নামটি প্রবেশ করান।"
+msgstr "বন্ধুকে আড্ডার আসরে আমন্ত্রণ জানান"
 
 msgid "_Buddy:"
 msgstr "বন্ধু (_B):"
@@ -11723,82 +11647,94 @@ msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>%s-এর সঙ্গে কথোপকথন</h1>\n"
 
 msgid "Save Conversation"
-msgstr "কথোপকথন সংরক্ষণ করুন"
+msgstr "কথোপকথন সংরক্ষণ"
 
 msgid "Find"
 msgstr "খুঁজুন"
 
 msgid "_Search for:"
-msgstr "খুঁজছে (_S):"
+msgstr "অনুসন্ধান (_S):"
 
 msgid "Un-Ignore"
-msgstr "অগ্রাহ্য করবেন না"
+msgstr "অগ্রাহ্য করা বাতিল করা হবে"
 
 msgid "Ignore"
-msgstr "অগ্রাহ্য করুন"
+msgstr "অগ্রাহ্য"
 
 msgid "Get Away Message"
-msgstr "অনুপস্থিতি বার্তা গ্রহণ করুন"
+msgstr "অন্যত্র অবস্থার বার্তা গ্রহণ করুন"
 
-msgid "Last said"
-msgstr "সর্বশেষ বলা হয়েছে"
+msgid "Last Said"
+msgstr "সর্বশেষ বলেছে"
 
 msgid "Unable to save icon file to disk."
-msgstr "ডিস্কে আইকন ফাইল সংরক্ষণ করতে অক্ষম।"
+msgstr "ডিস্কে আইকন ফাইল সংরক্ষণ করতে ব্যর্থ।"
 
 msgid "Save Icon"
-msgstr "আইকন সংরক্ষণ করুন"
+msgstr "আইকন সংরক্ষণ"
 
 msgid "Animate"
-msgstr "অ্যানিমেট"
+msgstr "অ্যানিমেশন করা হবে"
 
 msgid "Hide Icon"
-msgstr "আইকন লুকিয়ে রাখুন"
+msgstr "আইকন লুকিয়ে রাখা হবে"
 
 msgid "Save Icon As..."
-msgstr "এভাবে আইকন সংরক্ষণ করুন..."
+msgstr "অন্য নামে আইকন সংরক্ষণ..."
 
 msgid "Set Custom Icon..."
-msgstr "পছন্দসই আইকন নির্ধারণ করুন..."
+msgstr "স্বনির্বাচিত আইকন নির্ধারণ..."
 
 msgid "Change Size"
-msgstr "আকার পরিবর্তন করুন"
+msgstr "আকার পরিবর্তন করা হবে"
 
 # tithi
 msgid "Show All"
-msgstr "সব প্রদর্শন করুন"
+msgstr "সব প্রদর্শন করা হবে"
 
 #. Conversation menu
 msgid "/_Conversation"
 msgstr "/কথোপকথন (_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/কথোপকথন/নতুন তাৎক্ষণিক বার্তা... (_M)"
+msgstr "/কথোপকথন/নতুন বার্তা... (_M)"
 
 msgid "/Conversation/_Find..."
 msgstr "/কথোপকথন/খুঁজুন... (_F)"
 
 msgid "/Conversation/View _Log"
-msgstr "/কথোপকথন/কার্যবিবরণী প্রদর্শন করুন (_L)"
+msgstr "/কথোপকথন/লগ প্রদর্শন (_L)"
 
 msgid "/Conversation/_Save As..."
-msgstr "/কথোপকথন/এভাবে সংরক্ষণ করুন... (_S)"
+msgstr "/কথোপকথন/নতুন নামে সংরক্ষণ... (_S)"
 
 # fix me tithi
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/কথোপকথন/স্ক্রলবেক মুছুন (_r)"
+msgstr "/কথোপকথন/স্ক্রলব্যাক অপসারণ (_r)"
+
+msgid "/Conversation/M_edia"
+msgstr "/কথোপকথন/মিডিয়া (_e)"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/কথোপকথন/মিডিয়া/অডিও কল (_A)"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/কথোপকথন/মিডিয়া/ভিডিও কল (_V)"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/কথোপকথন/মিডিয়া/অডিও‌\\/ভিডিও কল (_C)"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/কথোপকথন/ফাইল প্রেরণ করুন... (_n)"
+msgstr "/কথোপকথন/ফাইল প্রেরণ... (_n)"
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/কথোপকথন/বন্ধু পাউন্স যোগ করুন... (_P)"
+msgstr "/কথোপকথন/বন্ধু পাউন্স যোগ... (_P)"
 
 msgid "/Conversation/_Get Info"
-msgstr "/কথোপকথন/তথ্য সংগ্রহ করুন (_G)"
+msgstr "/কথোপকথন/তথ্য সংগ্রহ (_G)"
 
 msgid "/Conversation/In_vite..."
-msgstr "/কথোপকথন/আমন্ত্রণ করুন... (_v)"
+msgstr "/কথোপকথন/আমন্ত্রণ... (_v)"
 
 msgid "/Conversation/M_ore"
 msgstr "/কথোপকথন/আরও (_o)"
@@ -11807,47 +11743,47 @@ msgid "/Conversation/Al_ias..."
 msgstr "/কথোপকথন/উপনাম... (_i)"
 
 msgid "/Conversation/_Block..."
-msgstr "/কথোপকথন/ব্লক করুন... (_B)"
+msgstr "/কথোপকথন/ব্লক... (_B)"
 
 msgid "/Conversation/_Unblock..."
-msgstr "/কথোপকথন/ব্লক মুক্ত করুন... (_U)"
+msgstr "/কথোপকথন/আনব্লক... (_U)"
 
 msgid "/Conversation/_Add..."
-msgstr "/কথোপকথন/যোগ করুন... (_A)"
+msgstr "/কথোপকথন/যোগ... (_A)"
 
 msgid "/Conversation/_Remove..."
-msgstr "/কথোপকথন/অপসারণ করুন... (_R)"
+msgstr "/কথোপকথন/অপসারণ... (_R)"
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/কথোপকথন/লিঙ্ক প্রবেশ করান... (_k)"
+msgstr "/কথোপকথন/লিংক প্রবেশ করান... (_k)"
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/কথোপকথন/চিত্র প্রবেশ করান... (_e)"
+msgstr "/কথোপকথন/চিত্র সন্নিবেশ... (_e)"
 
 msgid "/Conversation/_Close"
-msgstr "/কথোপকথন/বন্ধ করুন (_C)"
+msgstr "/কথোপকথন/বন্ধ (_C)"
 
 #. Options
 msgid "/_Options"
-msgstr "/পছন্দসমূহ (_O)"
+msgstr "/অপশন (_O)"
 
 msgid "/Options/Enable _Logging"
-msgstr "/পছন্দসমূহ/লগ সক্রিয় করুন (_L)"
+msgstr "/অপশন/লগ সক্রিয়করণ (_L)"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/পছন্দসমূহ/শব্দ সক্রিয় করুন (_S)"
+msgstr "/অপশন/শব্দ সক্রিয়করণ (_S)"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/পছন্দসমূহ/বিন্যাসকরণ টুলবারসমূহ প্রদর্শন করুন (_T)"
+msgstr "/অপশন/বিন্যাস টুলবার প্রদর্শন (_T)"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/পছন্দসমূহ/সময়-স্ট্যাম্প প্রদর্শন করুন (_m)"
+msgstr "/অপশন/টাইমস্ট্যাম্প প্রদর্শন (_m)"
 
 msgid "/Conversation/More"
 msgstr "/কথোপকথন/আরও"
 
 msgid "/Options"
-msgstr "/পছন্দসমূহ"
+msgstr "/অপশন"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
@@ -11858,52 +11794,61 @@ msgid "/Conversation"
 msgstr "/কথোপকথন"
 
 msgid "/Conversation/View Log"
-msgstr "/কথোপকথন/কার্যবিবরণী প্রদর্শন করুন"
+msgstr "/কথোপকথন/লগ প্রদর্শন"
+
+msgid "/Conversation/Media/Audio Call"
+msgstr "/কথোপকথন/মিডিয়া/অডিও কল"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/কথোপকথন/মিডিয়া/ভিডিও কল"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/কথোপকথন/মিডিয়া/অডিও‌\\/ভিডিও কল"
 
 msgid "/Conversation/Send File..."
-msgstr "/কথোপকথন/ফাইল প্রেরণ করুন..."
+msgstr "/কথোপকথন/ফাইল প্রেরণ..."
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/কথোপকথন/বন্ধু পাউন্স যোগ করুন..."
+msgstr "/কথোপকথন/বন্ধু পাউন্স যোগ..."
 
 msgid "/Conversation/Get Info"
-msgstr "/কথোপকথন/তথ্য গ্রহণ করুন"
+msgstr "/কথোপকথন/তথ্য গ্রহণ"
 
 msgid "/Conversation/Invite..."
-msgstr "/কথোপকথন/আমন্ত্রণ করুন..."
+msgstr "/কথোপকথন/আমন্ত্রণ..."
 
 msgid "/Conversation/Alias..."
 msgstr "/কথোপকথন/উপনাম..."
 
 msgid "/Conversation/Block..."
-msgstr "/কথোপকথন/ব্লক করুন..."
+msgstr "/কথোপকথন/ব্লক..."
 
 msgid "/Conversation/Unblock..."
-msgstr "/কথোপকথন/ব্লক মুক্ত করুন..."
+msgstr "/কথোপকথন/আনব্লক..."
 
 msgid "/Conversation/Add..."
-msgstr "/কথোপকথন/যোগ করুন..."
+msgstr "/কথোপকথন/যোগ..."
 
 msgid "/Conversation/Remove..."
-msgstr "/কথোপকথন/অপসারণ করুন..."
+msgstr "/কথোপকথন/অপসারণ..."
 
 msgid "/Conversation/Insert Link..."
-msgstr "/কথোপকথন/লিঙ্ক প্রবেশ করান..."
+msgstr "/কথোপকথন/লিংক প্রবেশ করান..."
 
 msgid "/Conversation/Insert Image..."
-msgstr "/কথোপকথন/চিত্র প্রবেশ করান..."
+msgstr "/কথোপকথন/চিত্র সন্নিবেশ..."
 
 msgid "/Options/Enable Logging"
-msgstr "/পছন্দসমূহ/লগ সক্রিয় করুন"
+msgstr "/অপশন/লগ সক্রিয়করণ"
 
 msgid "/Options/Enable Sounds"
-msgstr "/পছন্দসমূহ/শব্দ সক্রিয় করুন"
+msgstr "/অপশন/শব্দ সক্রিয়করণ "
 
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/পছন্দসমূহ/বিন্যাসকরণ টুলবারসমূহ প্রদর্শন করুন"
+msgstr "/অপশন/বিন্যাস টুলবার প্রদর্শন"
 
 msgid "/Options/Show Timestamps"
-msgstr "/পছন্দসমূহ/সময়-স্ট্যাম্প প্রদর্শন করুন"
+msgstr "/অপশন/টাইমস্ট্যাম্প প্রদর্শন "
 
 msgid "User is typing..."
 msgstr "ব্যবহারকারী টাইপ করছে..."
@@ -11918,20 +11863,20 @@ msgstr ""
 
 #. Build the Send To menu
 msgid "S_end To"
-msgstr "প্রেরণ করুন (_S)"
+msgstr "প্রেরণ (_e)"
 
 msgid "_Send"
-msgstr "প্রেরণ করুন (_S)"
+msgstr "প্রেরণ (_S)"
 
 #. Setup the label telling how many people are in the room.
 msgid "0 people in room"
-msgstr "রুমে ০ জন ব্যক্তি উপস্থিত"
+msgstr "আসরে ০ ব্যক্তি উপস্থিত"
 
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "রুমে %d জন ব্যক্তি উপস্থিত"
-msgstr[1] "রুমে %d জন ব্যক্তি উপস্থিত"
+msgstr[0] "আসরে %d জন উপস্থিত"
+msgstr[1] "আসরে %d জন উপস্থিত"
 
 msgid "Typing"
 msgstr "টাইপ করছে"
@@ -11940,93 +11885,93 @@ msgid "Stopped Typing"
 msgstr "টাইপ করা বন্ধ করেছে"
 
 msgid "Nick Said"
-msgstr "নিক বলেছে"
+msgstr "ডাকনাম বলা হয়েছে"
 
 msgid "Unread Messages"
-msgstr "অপঠিত বার্তাসমূহ"
+msgstr "অপঠিত বার্তা"
 
 msgid "New Event"
 msgstr "নতুন ঘটনা"
 
 # fix me tithi
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "মুছে ফেলুন: সব কথোপকথনের স্ক্রলবেক মুছে ফেলুন।"
+msgstr "clear: সব কথোপকথনের স্ক্রলব্যাক মুছে ফেলা হবে।"
 
 msgid "Confirm close"
-msgstr "বন্ধ নিশ্চিত করুন"
+msgstr "বন্ধ নিশ্চিতকরণ"
 
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "আপনার অপঠিত বার্তা আছে। আপনি কি নিশ্চিত আপনি উইন্ডোটি বন্ধ করতে চান?"
+msgstr "আপনার অপঠিত বার্তা আছে। আপনি কি নিশ্চিতভাবে উইন্ডোটি বন্ধ করতে চান?"
 
 msgid "Close other tabs"
-msgstr "অন্যান্য ট্যাবগুলো বন্ধ করুন"
+msgstr "অন্যান্য ট্যাবগুলো বন্ধ করা হবে"
 
 msgid "Close all tabs"
-msgstr "সকল ট্যাব বন্ধ করুন"
+msgstr "সব ট্যাব বন্ধ করা হবে"
 
 msgid "Detach this tab"
-msgstr "এই ট্যাবটি আলাদা করুন"
+msgstr "এই ট্যাবটি আলাদা করা হবে"
 
 msgid "Close this tab"
-msgstr "এই ট্যাবটি বন্ধ করুন"
+msgstr "এই ট্যাবটি বন্ধ করা হবে"
 
 msgid "Close conversation"
-msgstr "কথোপকথন বন্ধ করুন"
+msgstr "কথোপকথন বন্ধ করা হবে"
 
 msgid "Last created window"
 msgstr "সর্বশেষ তৈরিকৃত উইন্ডো"
 
 msgid "Separate IM and Chat windows"
-msgstr "তাৎক্ষণিক বার্তা ও আড্ডার উইন্ডো পৃথক করুন"
+msgstr "তাৎক্ষণিক বার্তা ও আড্ডার উইন্ডো পৃথক করা হবে"
 
 msgid "New window"
 msgstr "নতুন উইন্ডো"
 
 msgid "By group"
-msgstr "গ্রুপ অনুসারে"
+msgstr "দল অনুসারে"
 
 msgid "By account"
 msgstr "একাউন্ট অনুসারে"
 
 msgid "Save Debug Log"
-msgstr "ডিবাগ কার্যবিবরণী সংরক্ষণ করুন"
+msgstr "ডিবাগ লগ সংরক্ষণ করা হবে"
 
 msgid "Invert"
-msgstr "উল্টান"
+msgstr "উল্টানো"
 
 msgid "Highlight matches"
-msgstr "প্রনির্দেশ মিলসমূহ"
+msgstr "মিলগুলো হাইলাইট করা হবে"
 
 msgid "_Icon Only"
 msgstr "শুধুমাত্র আইকন (_I)"
 
 msgid "_Text Only"
-msgstr "শুধুমাত্র পাঠ (_T)"
+msgstr "শুধুমাত্র টেক্সট (_T)"
 
 msgid "_Both Icon & Text"
-msgstr "আইকন ও পাঠ উভয়ই (_B)"
+msgstr "আইকন ও টেক্সট উভয়ই (_B)"
 
 msgid "Filter"
-msgstr "পরিশ্রুতক"
+msgstr "পরিশোধক"
 
 msgid "Right click for more options."
-msgstr "আরও পছন্দের জন্য ডান ক্লিক করুন।"
+msgstr "আরও অপশনের জন্য ডান ক্লিক করুন।"
 
 msgid "Level "
 msgstr "স্তর"
 
 # tithi
 msgid "Select the debug filter level."
-msgstr "ডিবাগ পরিশ্রুতক স্তর নির্বাচন করুন।"
+msgstr "ডিবাগ পরিশোধকের স্তর নির্বাচন করুন।"
 
 msgid "All"
-msgstr "সকল"
+msgstr "সব"
 
 msgid "Misc"
 msgstr "অন্যান্য"
 
 msgid "Warning"
-msgstr "সতর্কতা"
+msgstr "সতর্কবানী"
 
 msgid "Error "
 msgstr "ত্রুটি"
@@ -12046,8 +11991,12 @@ msgstr "শিল্পী"
 msgid "Ka-Hing Cheung"
 msgstr "কা-হিং চিউং"
 
+msgid "voice and video"
+msgstr "ভয়েস এবং ভিডিও"
+
+# as in contact * people
 msgid "support"
-msgstr "সমর্থন করুন"
+msgstr "সমর্থন"
 
 msgid "webmaster"
 msgstr "ওয়েবমাস্টার"
@@ -12057,7 +12006,7 @@ msgid "Senior Contributor/QA"
 msgstr "সিনিয়র অংশগ্রহণকারী/QA"
 
 msgid "win32 port"
-msgstr "উইন৩২ পোর্ট"
+msgstr "win32 পোর্ট"
 
 msgid "maintainer"
 msgstr "রক্ষণাবেক্ষক"
@@ -12067,7 +12016,7 @@ msgstr "libfaim রক্ষণাবেক্ষক"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
 msgid "hacker and designated driver [lazy bum]"
-msgstr "হ্যাকার ও নির্দেশিত ড্রাইভার [অকর্মা]"
+msgstr "হ্যাকার ও নির্দেশিত ড্রাইভার [lazy bum]"
 
 msgid "support/QA"
 msgstr "সমর্থন/QA"
@@ -12077,21 +12026,21 @@ msgid "XMPP"
 msgstr "XMPP"
 
 msgid "original author"
-msgstr "মূল লেখক"
+msgstr "প্রকৃত লেখক"
 
 msgid "lead developer"
 msgstr "প্রধান ডেভেলপার"
 
 # tithi
 msgid "Afrikaans"
-msgstr "আফ্রিকানরা"
+msgstr "আফ্রিকান"
 
 msgid "Arabic"
-msgstr "এরাবিক"
+msgstr "আরবী"
 
 # tithi
 msgid "Belarusian Latin"
-msgstr "বেলারুশিয়ান ল্যাটিন"
+msgstr "বেলারুশিয় ল্যাটিন"
 
 msgid "Bulgarian"
 msgstr "বুলগেরীয়"
@@ -12136,26 +12085,26 @@ msgstr "ব্রিটিশ ইংরেজী"
 
 # tithi
 msgid "Esperanto"
-msgstr "এসপারেনটো"
+msgstr "এসপার‌্যান্টো"
 
 msgid "Spanish"
-msgstr "স্পেনিশ"
+msgstr "স্প্যানিশ"
 
 msgid "Estonian"
 msgstr "এসতোনীয়"
 
 # tithi
 msgid "Euskera(Basque)"
-msgstr "ইউসকেরা(বাসকু)"
+msgstr "ইউসকেরা(বাস্ক)"
 
 msgid "Persian"
-msgstr "পার্সিয"
+msgstr "পার্সীয়"
 
 msgid "Finnish"
-msgstr "ফীনিশ"
+msgstr "ফিনিশ"
 
 msgid "French"
-msgstr "ফরাসী"
+msgstr "ফ্রেঞ্চ"
 
 msgid "Irish"
 msgstr "আইরিশ"
@@ -12169,7 +12118,7 @@ msgstr "গুজরাটি"
 
 # tithi
 msgid "Gujarati Language Team"
-msgstr "গুজরাটি ভাষার দল"
+msgstr "গুজরাটি ভাষার টিম"
 
 msgid "Hebrew"
 msgstr "হিব্রু"
@@ -12180,6 +12129,9 @@ msgstr "হিন্দি"
 msgid "Hungarian"
 msgstr "হাঙ্গেরীয়"
 
+msgid "Armenian"
+msgstr "আর্মেনীয়"
+
 msgid "Indonesian"
 msgstr "ইন্ডোনেশিয়"
 
@@ -12193,7 +12145,10 @@ msgid "Georgian"
 msgstr "জর্জীয়"
 
 msgid "Ubuntu Georgian Translators"
-msgstr "উবান্টুর জর্জিয়ান অনুবাদকবৃন্দ"
+msgstr "Ubuntu জর্জিয় অনুবাদকবৃন্দ"
+
+msgid "Khmer"
+msgstr "খেমার"
 
 # fix me tithi
 msgid "Kannada"
@@ -12201,7 +12156,7 @@ msgstr "কান্নাডা"
 
 # tithi
 msgid "Kannada Translation team"
-msgstr "কান্নাডা ভাষান্তর দল"
+msgstr "কান্নাডা অনুবাদ টিম"
 
 msgid "Korean"
 msgstr "কোরিয়"
@@ -12219,13 +12174,12 @@ msgstr "লিথুনীয়"
 msgid "Macedonian"
 msgstr "ম্যাসেডনিয়"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "ম্যাসেডনিয়"
+msgstr "মঙ্গোলীয়"
 
 # fix me tithi
 msgid "Bokmål Norwegian"
-msgstr "বোকমাল নরওয়েয়ান"
+msgstr "বোকমাল নরওয়েজীয়"
 
 msgid "Nepali"
 msgstr "নেপালি"
@@ -12235,11 +12189,11 @@ msgstr "ওলন্দাজ, ফ্লেমিশ"
 
 # fix me tithi
 msgid "Norwegian Nynorsk"
-msgstr "নরওয়েয়ান নাইনোরকস"
+msgstr "নরওয়েজীয় নিনর্স্ক"
 
 # fix-me tithi
 msgid "Occitan"
-msgstr "অকেশান"
+msgstr "ওক্কিটান"
 
 # tithi
 msgid "Punjabi"
@@ -12252,10 +12206,10 @@ msgid "Portuguese"
 msgstr "পর্তুগীজ"
 
 msgid "Portuguese-Brazil"
-msgstr "পর্তুগীজ-ব্রাজিল"
+msgstr "পর্তুগীজ-ব্রাজিলীয়"
 
 msgid "Pashto"
-msgstr "পাশতু"
+msgstr "পশতু"
 
 msgid "Romanian"
 msgstr "রুমানীয়"
@@ -12267,20 +12221,23 @@ msgid "Slovak"
 msgstr "স্লোভাক"
 
 msgid "Slovenian"
-msgstr "স্লোভেনিয়"
+msgstr "স্লোভেনীয়"
 
 msgid "Albanian"
 msgstr "আলবেনীয়"
 
 msgid "Serbian"
-msgstr "সার্বিয়"
+msgstr "সার্বীয়"
 
 msgid "Sinhala"
-msgstr "সিনহালা"
+msgstr "সিনহলি"
 
 msgid "Swedish"
 msgstr "সুইডিশ"
 
+msgid "Swahili"
+msgstr "সোয়াহিলি"
+
 msgid "Tamil"
 msgstr "তামিল"
 
@@ -12291,30 +12248,30 @@ msgid "Thai"
 msgstr "থাই"
 
 msgid "Turkish"
-msgstr "টার্কিশ"
+msgstr "তুর্কি"
 
 # tithi
 msgid "Urdu"
-msgstr "ঊর্দূ"
+msgstr "উর্দু"
 
 msgid "Vietnamese"
-msgstr "ভিয়েতনামি"
+msgstr "ভিয়েতনামী"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "টি.এম.থানহ এবং নৌম-ভিআইর দল"
+msgstr "টি.এম.থানহ এবং জিনোমী-ভিআই টিম"
 
 msgid "Simplified Chinese"
-msgstr "সহজবোধ্য চীনা"
+msgstr "সরলকৃত চীনা"
 
 # tithi
 msgid "Hong Kong Chinese"
 msgstr "হংকং চীনা"
 
 msgid "Traditional Chinese"
-msgstr "ঐতিহ্যবাহী চীনা"
+msgstr "সনাতন চীনা"
 
 msgid "Amharic"
-msgstr "আমহারিক"
+msgstr "আমহরিক"
 
 #, c-format
 msgid "About %s"
@@ -12333,55 +12290,60 @@ msgid ""
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
-"%s লিবপারপল ভিত্তিক এমন একটি গ্রফিকাল মডিউলার বার্তাকরণ গ্রাহক যা AIM, MSN, "
+"%s হলো libpurple ভিত্তিক এমন একটি গ্রফিক্যাল মডিউলার বার্তা ক্লায়েন্ট যা AIM, MSN, "
 "Yahoo!, XMPP, ICQ, IRC,SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, এবং QQ এর সাথে যুগপৎ যোগাযোগ করতে "
+"Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, এবং QQ এর সাথে একযোগে সংযুক্ত হতে "
 "সক্ষম।  এটা GTK+ ব্যবহার করে লেখা হয়েছে।<BR><BR>আপনি GPL এর নীতির (সংস্করণ ২ বা "
-"পরবর্তী) অধীনে প্রোগ্রামটিকে পরিবর্তন বা পুনরায় বিলি করতে পারেন।  'অনুলিপি হচ্ছে' "
-"ফাইলে ধারণকৃত GPL এর একটি অনুলিপি %s এর সাথে বিতরণ করা হয়েছে।  %s এর প্রদায়ক "
-"দ্বারা স্বত্তাধিকার সংরক্ষিত। প্রদায়কগনের সম্পূর্ণ তালিকার জন্য 'স্বত্তাধিকার সংরক্ষিত' "
-"ফাইল দেখুন।  এই প্রোগ্রামটির জন্য আমরা কোনো নিশ্চয়তা প্রদান করি না।<BR><BR>"
+"পরবর্তী) অধীনে প্রোগ্রামটিকে পরিবর্তন বা পুনরায় বিলি করতে পারেন। 'COPYING' ফাইলে "
+"ধারণকৃত GPL এর একটি কপি %s এর সাথে বিতরণ করা হয়েছে। কতৃপক্ষ দ্বারা %s এর "
+"সর্বস্বত্ত্ব সংরক্ষিত। কতৃপক্ষের সম্পূর্ণ তালিকার জন্য 'COPYRIGHT' ফাইলটি দেখুন। এই "
+"প্রোগ্রামটির জন্য আমরা কোনো ওয়ারেন্টি প্রদান করি না।<BR><BR>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">ইমেইলের মাধ্যমে সহায়তা:</FONT> <A HREF=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
 
 # fix me
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC চ্যানেল:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 
 # fix me
-#, fuzzy, c-format
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "বর্তমান ডেভেলপারগণ"
 
 msgid "Crazy Patch Writers"
-msgstr "ক্ষিপ্ত প্যাচ লেখকগণ"
+msgstr "অত্যুৎসাহী প্যাচ লেখক"
 
 msgid "Retired Developers"
 msgstr "অবসরপ্রাপ্ত ডেভেলপার"
 
 msgid "Retired Crazy Patch Writers"
-msgstr "অবসরপ্রাপ্ত ক্ষিপ্ত প্যাচ লেখকগণ"
+msgstr "অবসরপ্রাপ্ত অত্যুৎসাহী প্যাচ লেখক"
 
 msgid "Current Translators"
-msgstr "বর্তমান অনুবাদকবৃন্দ"
+msgstr "বর্তমান অনুবাদক"
 
 msgid "Past Translators"
-msgstr "পুরনো অনুবাদকবৃন্দ"
+msgstr "পুরনো অনুবাদক"
 
 msgid "Debugging Information"
 msgstr "ডিবাগকরণ তথ্য"
@@ -12393,36 +12355,35 @@ msgid "_Account"
 msgstr "একাউন্ট (_A)"
 
 msgid "Get User Info"
-msgstr "ব্যবহারকারীর তথ্য গ্রহণ করুন"
+msgstr "ব্যবহারকারীর তথ্য"
 
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"অনুগ্রহ করে আপনি যে ব্যক্তির তথ্য প্রদর্শন করতে চান তার ব্যবহারকারী-নাম বা উপনাম "
-"প্রবেশ করান।"
+"অনুগ্রহ করে আপনি যে ব্যক্তির তথ্য প্রদর্শন করতে চান তার ব্যবহারকারী নাম বা উপনাম দিন।"
 
 msgid "View User Log"
-msgstr "ব্যবহারকারীর কার্যবিবরণী প্রদর্শন করুন"
+msgstr "ব্যবহারকারীর লগ প্রদর্শন"
 
 msgid "Alias Contact"
-msgstr "উপনামের যোগাযোগ"
+msgstr "উপনামের পরিচিতি"
 
 msgid "Enter an alias for this contact."
-msgstr "এই যোগাযোগের জন্য উপনাম প্রবেশ করান।"
+msgstr "এই পরিচিত ব্যক্তির একটি উপনাম দিন।"
 
 #, c-format
 msgid "Enter an alias for %s."
-msgstr "%s-এর জন্য উপনাম প্রবেশ করান।"
+msgstr "%s-এর জন্য উপনাম দিন।"
 
 msgid "Alias Buddy"
-msgstr "উপনাম বন্ধু"
+msgstr "উপনামের বন্ধু"
 
 msgid "Alias Chat"
 msgstr "উপনামের আড্ডা"
 
 msgid "Enter an alias for this chat."
-msgstr "এই আড্ডার জন্য একটি উপনাম প্রবেশ করান।"
+msgstr "এই আড্ডার জন্য একটি উপনাম দিন।"
 
 #, c-format
 msgid ""
@@ -12432,43 +12393,43 @@ msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"আপনি আপনার বন্ধু তালিকা থেকে  অন্য %s এবং %d বন্ধুর ধারনকারী যোগাযোগ অপসারণ করতে "
-"পারেন। আপনি কি অব্যাহত রাখতে চান?"
+"আপনি আপনার বন্ধু তালিকা থেকে  %s এবং অন্য %d জন বন্ধুকে অপসারণ করতে যাচ্ছেন। আপনি "
+"কি অব্যাহত রাখতে চান?"
 msgstr[1] ""
-"আপনি আপনার বন্ধু তালিকা থেকে  অন্য %s এবং %d বন্ধুগণের ধারনকারী যোগাযোগ অপসারণ "
-"করতে পারেন। আপনি কি অব্যাহত রাখতে চান?"
+"আপনি আপনার বন্ধু তালিকা থেকে  %s এবং অন্য %d জন বন্ধুকে অপসারণ করতে যাচ্ছেন। আপনি "
+"কি অব্যাহত রাখতে চান?"
 
 msgid "Remove Contact"
-msgstr "যোগাযোগ অপসারণ করুন"
+msgstr "পরিচিতি অপসারণ"
 
 msgid "_Remove Contact"
-msgstr "যোগাযোগ অপসারণ করুন (_R)"
+msgstr "পরিচিতি অপসারণ (_R)"
 
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
-msgstr "আপনি %1s নামের গ্রুপকে %2s গ্রুপে একত্রিত করছেন। আপনি কি অব্যাহত রাখতে চান?"
+msgstr "আপনি %2$s দলের সাথে %1$s দলকে একত্রিত করতে যাচ্ছেন। আপনি কি নিশ্চিত?"
 
 msgid "Merge Groups"
-msgstr "গ্রুপসমুহ একত্রিত করুন"
+msgstr "দলসমুহ একত্রিকরণ"
 
 msgid "_Merge Groups"
-msgstr "গ্রুপসমুহ একত্রিত করুন (_M)"
+msgstr "দলসমুহ একত্রিকরণ (_M)"
 
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"আপনি %s গ্রুপ ও এর সকল সদস্যকে আপনার বন্ধু তালিকা থেকে অপসারণ করতে পারেন। আপনি কি "
-"অব্যাহত রাখতে চান?"
+"আপনি %s দলটি এবং এর সব সদস্যকে বন্ধু তালিকা থেকে অপসারণ করতে যাচ্ছেন। আপনি কি "
+"নিশ্চিত?"
 
 msgid "Remove Group"
-msgstr "গ্রুপ অপসারণ করুন"
+msgstr "দল অপসারণ"
 
 msgid "_Remove Group"
-msgstr "গ্রুপ অপসারণ করুন (_R)"
+msgstr "দল অপসারণ (_R)"
 
 #, c-format
 msgid ""
@@ -12478,65 +12439,65 @@ msgstr ""
 "চান?"
 
 msgid "Remove Buddy"
-msgstr "বন্ধু অপসারণ করুন"
+msgstr "বন্ধু অপসারণ"
 
 msgid "_Remove Buddy"
-msgstr "বন্ধু অপসাণ করুন (_R)"
+msgstr "বন্ধু অপসারণ (_R)"
 
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
-"আপনি আপনার বন্ধু তালিকা হতে %s অপসারণ করতে পারেন।  আপনি কি অব্যাহত রাখতে চান?"
+"আপনি আপনার বন্ধু তালিকা থেকে %s অপসারণ করতে পারেন। আপনি কি অব্যাহত রাখতে চান?"
 
 msgid "Remove Chat"
-msgstr "আড্ডা অপসারণ করুন"
+msgstr "আড্ডা অপসারণ"
 
 msgid "_Remove Chat"
-msgstr "আড্ডা অপসারণ করুন (_R)"
+msgstr "আড্ডা অপসারণ (_R)"
 
 msgid "Right-click for more unread messages...\n"
-msgstr "আরও অপঠিত বার্তার জন্য ডান ক্লিক করুন...\n"
+msgstr "আরও অপঠিত বার্তার জন্য ডান-ক্লিক করুন...\n"
 
 msgid "_Change Status"
-msgstr "অবস্থা পরিবর্তন করুন (_C)"
+msgstr "অবস্থা পরিবর্তন (_C)"
 
 msgid "Show Buddy _List"
-msgstr "বন্ধু তালিকা প্রদর্শন করুন (_L)"
+msgstr "বন্ধু তালিকা প্রদর্শন (_L)"
 
 msgid "_Unread Messages"
-msgstr "অপঠিত বার্তাসমূহ (_U)"
+msgstr "অপঠিত বার্তা (_U)"
 
 msgid "New _Message..."
 msgstr "নতুন বার্তা...(_M)"
 
 msgid "_Accounts"
-msgstr "একাউন্টগুলো (_A)"
+msgstr "একাউন্ট (_A)"
 
 msgid "Plu_gins"
 msgstr "প্লাগইন (_g)"
 
 msgid "Pr_eferences"
-msgstr "প্রাধিকারসমূহ (_e)"
+msgstr "পছন্দসমূহ (_e)"
 
 msgid "Mute _Sounds"
-msgstr "শব্দ বন্ধ রাখুন (_S)"
+msgstr "শব্দ বন্ধ (_S)"
 
 msgid "_Blink on New Message"
-msgstr "নতুন বার্তায় পিট পিট করুন (_B)"
+msgstr "নতুন বার্তা আসলে মিটিমিটি জ্বলবে (_B)"
 
 msgid "_Quit"
-msgstr "প্রস্থান করুন (_Q)"
+msgstr "প্রস্থান (_Q)"
 
 msgid "Not started"
 msgstr "আরম্ভ হয়নি"
 
 msgid "<b>Receiving As:</b>"
-msgstr "<b>যেভাবে গ্রহণ করছে:</b>"
+msgstr "<b>যেভাবে গ্রহণ করা হচ্ছে:</b>"
 
 msgid "<b>Receiving From:</b>"
-msgstr "<b>যার থেকে গ্রহণ করছে:</b>"
+msgstr "<b>যার থেকে গ্রহণ করা হচ্ছে:</b>"
 
 msgid "<b>Sending To:</b>"
 msgstr "<b>যাকে পাঠানো হচ্ছে:</b>"
@@ -12545,14 +12506,15 @@ msgid "<b>Sending As:</b>"
 msgstr "<b>যেভাবে পাঠানো হচ্ছে:</b>"
 
 msgid "There is no application configured to open this type of file."
-msgstr "এই ধরনের ফাইল খোলার জন্য কোনো প্রয়োগন বিন্যাসিত নেই।"
+msgstr "এই ধরনের ফাইল খোলার জন্য কোনো অ্যাপ্লিকেশন কনফিগার করা নেই।"
 
+# mark40
 msgid "An error occurred while opening the file."
-msgstr "ফাইলটি খোলার সময়ে একটি ত্রুটি ঘটেছে।"
+msgstr "ফাইলটি খোলার সময়ে একটি ত্রুটি হয়েছে।"
 
 #, c-format
 msgid "Error launching %s: %s"
-msgstr "%s শুরুকরণে ত্রুটি: %s"
+msgstr "%s আরম্ভ করায় ত্রুটি: %s"
 
 #, c-format
 msgid "Error running %s"
@@ -12560,10 +12522,10 @@ msgstr "%s চালুকরণে ত্রুটি"
 
 #, c-format
 msgid "Process returned error code %d"
-msgstr "প্রক্রিয়াটি %d ত্রুটি কোড ফেরত পাঠিয়েছে"
+msgstr "প্রসেসটি %d ত্রুটি কোড ফেরত পাঠিয়েছে"
 
 msgid "Filename:"
-msgstr "ফাইলের-নাম:"
+msgstr "ফাইলের নাম:"
 
 msgid "Local File:"
 msgstr "স্থানীয় ফাইল:"
@@ -12578,10 +12540,10 @@ msgid "Time Remaining:"
 msgstr "অবশিষ্ট সময়:"
 
 msgid "Close this window when all transfers _finish"
-msgstr "সকল স্থানান্তর শেষ হলে এই উইন্ডোটি বন্ধ করুন (_f)"
+msgstr "সব স্থানান্তর শেষ হলে এই উইন্ডোটি বন্ধ করা হবে (_f)"
 
 msgid "C_lear finished transfers"
-msgstr "সমাপ্ত স্থানান্তর পরিস্কার করুন (_l)"
+msgstr "স্থানান্তর সমাপ্ত হলে তালিকা থেকে মুছে ফেলা হবে (_l)"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
@@ -12593,54 +12555,54 @@ msgstr "বিরতি (_P)"
 
 #. Resume button
 msgid "_Resume"
-msgstr "পুনরায় শুরু করুন (_R)"
+msgstr "পুনরায় শুরু (_R)"
 
 msgid "Paste as Plain _Text"
-msgstr "সরল পাঠ হিসেবে প্রতিলেপন করুন (_T)"
+msgstr "সরল টেক্সট হিসেবে প্রতিলেপন (_T)"
 
 msgid "_Reset formatting"
-msgstr "বিন্যাসকরণ পুনঃবিন্যাস করুন (_R)"
+msgstr "বিন্যাস রিসেট (_R)"
 
 # tithi
 msgid "Disable _smileys in selected text"
-msgstr "নির্বাচিত পাঠে স্মাইলীগুলো নিষ্ক্রিয় করুন (_s)"
+msgstr "নির্বাচিত টেক্সটে স্মাইলি নিষ্ক্রিয় করা হবে (_s)"
 
 msgid "Hyperlink color"
-msgstr "হাইপারলিঙ্কের রং"
+msgstr "হাইপারলিংকের রং"
 
 msgid "Color to draw hyperlinks."
-msgstr "হাইপারলিঙ্ক আঁকার রং।"
+msgstr "হাইপারলিংক আঁকার রং।"
 
 # fix me
 msgid "Hyperlink visited color"
-msgstr "হাইপারলিঙ্কের পরিদর্শিত রং"
+msgstr "পরিদর্শিত হাইপারলিংকের রং"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
-msgstr "হাইপারলিঙ্ক পরিদর্শন (বা সক্রিয়) করার পর এটা আকাঁর রং।"
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr "হাইপারলিংকে পরিদর্শন (বা সক্রিয়) করার পর এটি আঁকার রং।"
 
 msgid "Hyperlink prelight color"
-msgstr "হাইপারলিঙ্ক প্রাক-হালকা রং"
+msgstr "হাইপারলিঙ্কের prelight রং"
 
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "হাইপারলিঙ্কের ওপর মাউস থাকাকালীন এটা আকার রং"
+msgstr "হাইপারলিংকের ওপর মাউস থাকাকালীন এটি আঁকার রং"
 
 msgid "Sent Message Name Color"
 msgstr "প্রেরিত বার্তার নামের রং"
 
 # tithi
 msgid "Color to draw the name of a message you sent."
-msgstr "আপনার প্রেরিত বার্তাসমূহের নাম আকার রং।"
+msgstr "আপনার প্রেরিত বার্তার নাম আঁকার রং।"
 
 msgid "Received Message Name Color"
 msgstr "বার্তার নামের রং গ্রহণ করা হয়েছে"
 
 # tithi
 msgid "Color to draw the name of a message you received."
-msgstr "আপনার গৃহীত বার্তাসমূহের নাম আকার রং।"
+msgstr "আপনার গৃহীত বার্তার নাম আঁকার রং।"
 
 # tithi
 msgid "\"Attention\" Name Color"
-msgstr "\"মনোযোগ\" রং এর নাম"
+msgstr "\"দৃষ্টি আকর্ষণ\" রং এর নাম"
 
 # tithi
 msgid "Color to draw the name of a message you received containing your name."
@@ -12648,63 +12610,62 @@ msgstr "আপনার নাম ধারণকারী যে বার্�
 
 # tithi
 msgid "Action Message Name Color"
-msgstr "কার্য বার্তা নামের রং"
+msgstr "প্রতিক্রিয়া বার্তার নামের রং"
 
 # tithi
 msgid "Color to draw the name of an action message."
-msgstr "একটি কর্ম বার্তার নাম আকার রং।"
+msgstr "একটি প্রতিক্রিয়া বার্তার নামের রং।"
 
 # fix me tithi
 msgid "Action Message Name Color for Whispered Message"
-msgstr "গোপনীয় বার্তার জন্য কার্য বার্তার নামের রং"
+msgstr "গোপনীয় বার্তার জন্য প্রতিক্রিয়া বার্তার নামের রং"
+
+# tithi
+msgid "Color to draw the name of a whispered action message."
+msgstr "একটি গোপনীয় প্রতিক্রিয়া বার্তার নাম আঁকার রং।"
 
 # fix- me tithi
 msgid "Whisper Message Name Color"
 msgstr "গোপনীয় বার্তার নামের রং"
 
+# tithi
+msgid "Color to draw the name of a whispered message."
+msgstr "একটি গোপনীয় বার্তার নাম আঁকার রং।"
+
 msgid "Typing notification color"
-msgstr "প্রজ্ঞাপন রং টাইপ করছে"
+msgstr "ঘোষণা টাইপ করার রং"
 
 # tithi
-msgid "The color to use for the typing notification font"
-msgstr "টাইপকরণ প্রজ্ঞাপন ফন্টের জন্য ব্যবহারের রং"
+msgid "The color to use for the typing notification"
+msgstr "ঘোষণা টাইপ করার ফন্টের জন্য ব্যবহৃত রং"
 
 msgid "Typing notification font"
-msgstr "টাইপকরণ প্রজ্ঞাপন ফন্ট"
+msgstr "ঘোষণা টাইপ করার ফন্ট"
 
 # tithi
 msgid "The font to use for the typing notification"
-msgstr "টাইপকরণ প্রজ্ঞাপনের জন্য ব্যবহারের ফন্ট4"
+msgstr "ঘোষণা টাইপ করার জন্য ব্যবহৃত ফন্ট"
 
 msgid "Enable typing notification"
-msgstr "টাইপকরণ প্রজ্ঞাপন সক্রিয় করুন"
-
-msgid "_Copy Email Address"
-msgstr "ই-মেইল ঠিকানা অনুলিপি করুন (_C)"
-
-msgid "_Open Link in Browser"
-msgstr "ব্রাউজারে লিঙ্ক খুলুন (_O)"
-
-msgid "_Copy Link Location"
-msgstr "লিঙ্ক অবস্থান অনুলিপি করুন (_C)"
+msgstr "ঘোষণা টাইপ সক্রিয় করা হবে"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"<span size='larger' weight='bold'>অশনাক্তকৃত ফাইলের ধরন</span>\n"
+"<span size='larger' weight='bold'>অজানা ফাইলের ধরন</span>\n"
 "\n"
-"PNG তে পূর্বনির্ধারিত।"
+"ডিফল্ট মান PNG ব্যবহৃত হবে।"
 
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"অশনাক্তকৃত ফাইলের ধরন\n"
+"অজানা ফাইলের ধরন\n"
 "\n"
-"PNG তে পূর্বনির্ধারিত।।"
+"ডিফল্ট মান PNG ব্যবহৃত হবে।"
 
 #, c-format
 msgid ""
@@ -12727,47 +12688,44 @@ msgstr ""
 "%s"
 
 msgid "Save Image"
-msgstr "চিত্র সংরক্ষণ করুন"
+msgstr "চিত্র সংরক্ষণ"
 
-#, c-format
 msgid "_Save Image..."
-msgstr "চিত্র সংরক্ষণ করুন... (_S)"
+msgstr "চিত্র সংরক্ষণ... (_S)"
 
 # tithi
-#, c-format
 msgid "_Add Custom Smiley..."
-msgstr "পছন্দসই স্মাইলী যোগ করুন... (_A)"
+msgstr "স্বনির্বাচিত স্মাইলি যোগ... (_A)"
 
 msgid "Select Font"
-msgstr "ফন্ট নির্বাচন করুন"
+msgstr "ফন্ট নির্বাচন"
 
 msgid "Select Text Color"
-msgstr "পাঠ রং নির্বাচন করুন"
+msgstr "টেক্সটের রং নির্বাচন"
 
 msgid "Select Background Color"
-msgstr "প্রেক্ষাপট রং নির্বাচন করুন"
+msgstr "পটভূমি রং নির্বাচন"
 
 msgid "_URL"
-msgstr "ইউআরএল (_U)"
+msgstr "URL (_U)"
 
 msgid "_Description"
-msgstr "বিবরণ (_D)"
+msgstr "বর্ণনা (_D)"
 
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"অনুগ্রহ করে আপনি যে লিঙ্ক প্রবেশ করাতে চান তার ইউআরএল ও বিবরণ প্রবেশ করান। বিবরণ "
-"ঐচ্ছিক।"
+"অনুগ্রহ করে আপনি যে লিংক প্রবেশ করাতে চান তার URL এবং বর্ণনা দিন। বর্ণনা ঐচ্ছিক।"
 
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "অনুগ্রহ করে আপনি যে লিঙ্ক প্রবেশ করাতে চান তার ইউআরএল প্রবেশ করান।"
+msgstr "অনুগ্রহ করে আপনি যে লিংক প্রবেশ করাতে চান তার URL দিন।"
 
 msgid "Insert Link"
-msgstr "লিঙ্ক প্রবেশ করান"
+msgstr "লিংক প্রবেশ করান"
 
 msgid "_Insert"
-msgstr "প্রবেশ করান (_I)"
+msgstr "প্রবেশ (_I)"
 
 #, c-format
 msgid "Failed to store image: %s\n"
@@ -12782,7 +12740,8 @@ msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
-"এই স্মাইলীটি নিষ্ক্রিয় কারণ এই শর্টকাটটির জন্য একটি পছন্দসই স্মাইলী বিদ্যমান:\n"
+"এই স্মাইলিটি নিষ্ক্রিয় কারণ এই শর্টকাটটির জন্য ইতিমধ্যে স্বনির্বাচিত স্মাইলি "
+"বিদ্যমান:\n"
 "%s"
 
 msgid "Smile!"
@@ -12790,23 +12749,24 @@ msgstr "হাসি!"
 
 # fix-me tithi
 msgid "_Manage custom smileys"
-msgstr "পছন্দসই স্মাইলীগুলো নিয়ন্ত্রণ করুন (_M)"
+msgstr "স্বনির্বাচিত স্মাইলি নিয়ন্ত্রণ (_M)"
 
 msgid "This theme has no available smileys."
-msgstr "এই থীমের কোনো স্মাইলি সহজলভ্য নেই।"
+msgstr "এই থীমের কোনো স্মাইলি নেই।"
 
 msgid "_Font"
 msgstr "ফন্ট (_F)"
 
+# ***
 msgid "Group Items"
-msgstr "গ্রুপের বিষয়োপকরণসমূহ"
+msgstr "আইটেম একত্রিত করা হবে"
 
 # tithi
 msgid "Ungroup Items"
-msgstr "গ্রুপহীন বিষয়োপকরণসমূহ"
+msgstr "আইটেম আলাদা করা হবে"
 
 msgid "Bold"
-msgstr "মোটা"
+msgstr "গাঢ়"
 
 msgid "Italic"
 msgstr "তীর্যক"
@@ -12820,27 +12780,24 @@ msgstr "অবচ্ছেদন রেখা"
 
 # tithi
 msgid "Increase Font Size"
-msgstr "ফন্টের আকার বৃদ্ধি করুন"
+msgstr "ফন্টের আকার বৃদ্ধি করা হবে"
 
 # tithi
 msgid "Decrease Font Size"
-msgstr "ফন্টের আকার হ্রাস করুন"
+msgstr "ফন্টের আকার হ্রাস করা হবে"
 
 msgid "Font Face"
-msgstr "ফন্টের রুপ"
-
-msgid "Background Color"
-msgstr "প্রেক্ষাপট রং"
+msgstr "ফন্টের রূপ"
 
 msgid "Foreground Color"
-msgstr "সম্মুখভাগের রং"
+msgstr "পুরোভাগের রং"
 
 # tithi
 msgid "Reset Formatting"
-msgstr "বিন্যাসকরণ পুনঃবিন্যাস করুন"
+msgstr "বিন্যাস রিসেট"
 
 msgid "Insert IM Image"
-msgstr "আইএম চিত্র প্রবেশ করান"
+msgstr "IM চিত্র প্রবেশ করান"
 
 msgid "Insert Smiley"
 msgstr "স্মাইলি প্রবেশ করান"
@@ -12849,7 +12806,7 @@ msgid "<b>_Bold</b>"
 msgstr "<b>মোটা (_B)</b>"
 
 msgid "<i>_Italic</i>"
-msgstr "<i>তীর্যক (_I)</i>"
+msgstr "তীর্যক (_I) <i></i>"
 
 msgid "<u>_Underline</u>"
 msgstr "<u>নিম্নরেখা (_U)</u>"
@@ -12873,39 +12830,39 @@ msgstr "<span size='smaller'>অপেক্ষাকৃত ছোট (_S)</span
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
 msgid "_Font face"
-msgstr "ফন্টের রুপ (_F)"
+msgstr "ফন্টের রূপ (_F)"
 
 msgid "Foreground _color"
-msgstr "সম্মুখভাগের রং (_c)"
+msgstr "পুরোভাগের রং (_c)"
 
 msgid "Bac_kground color"
-msgstr "প্রেক্ষাপটের রং (_k)"
+msgstr "পটভূমির রং (_k)"
 
 msgid "_Image"
 msgstr "চিত্র (_I)"
 
 msgid "_Link"
-msgstr "লিঙ্ক (_L)"
+msgstr "লিংক (_L)"
 
 msgid "_Horizontal rule"
-msgstr "অনুভূমিক নিয়ম (_H)"
+msgstr "অনুভূমিক মাপকাঠি (_H)"
 
 msgid "_Smile!"
 msgstr "হাসি! (_S)"
 
 msgid "Log Deletion Failed"
-msgstr "কার্যবিবরণী শনাক্তকরণ ব্যর্থ হয়েছে"
+msgstr "লগ অপসারণ ব্যর্থ"
 
 # tithi
 msgid "Check permissions and try again."
-msgstr "অনুমতি যাচাই করুন এবং আবার চেষ্টা করুন।"
+msgstr "অনুমতি যাচাই করে আবার চেষ্টা করুন।"
 
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"আপনি কি নিশ্চিত আপনি স্থায়ীভাবে %2s তে শুরু হওয়া কথোপকথনের কার্যবিবরণী %1s সহ মুছে "
+"আপনি কি নিশ্চিতভাবে %1$s এর সাথে %2$s এ শুরু হওয়া কথোপকথনের লগ স্থায়ীভাবে মুছে "
 "ফেলতে চান?"
 
 #, c-format
@@ -12913,21 +12870,20 @@ msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr ""
-"আপনি কি নিশ্চিত আপনি স্থায়ীভাবে %2s তে শুরু হওয়া কথোপকথনের কার্যবিবরণী %1s এ মুছে "
-"ফেলতে চান?"
+"আপনি কি নিশ্চিতভাবে %1$s এ %2$s এ শুরু হওয়া কথোপকথনের লগ স্থায়ীভাবে মুছে ফেলতে "
+"চান?"
 
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
-msgstr ""
-"আপনি কি নিশ্চিত আপনি স্থায়ীভাবে %1s তে শুরু হওয়া সিস্টেম কার্যবিবরণী মুছে ফেলতে চান?"
+msgstr "আপনি কি নিশ্চিতভাবে %s এ শুরু হওয়া সিস্টেম লগ স্থায়ীভাবে মুছে ফেলতে চান?"
 
 msgid "Delete Log?"
-msgstr "কার্যবিবরণী কি মুছতে চান?"
+msgstr "লগ মুছতে চান?"
 
 msgid "Delete Log..."
-msgstr "কার্যবিবরণী মুছুন..."
+msgstr "লগ অপসারণ..."
 
 # fix me
 #, c-format
@@ -12941,11 +12897,11 @@ msgstr "<span size='larger' weight='bold'>%s এর উপর %s এর সা�
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr "কার্যবিবরণীর ফোল্ডার ব্রাউজ করুন (_B)"
+msgstr "লগ ফোল্ডার ব্রাউজ (_B)"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%1s %2s। আরও তথ্যের জন্য `%3s -h' এ চেষ্টা করুন।\n"
+msgstr "%1$s %2$s। আরও তথ্যের জন্য `%3$s -h' চেষ্টা করুন।\n"
 
 # fix me
 #, c-format
@@ -12955,6 +12911,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12965,19 +12922,20 @@ msgid ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"ব্যবহার: %s [পছন্দ]...\n"
+"ব্যবহার: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    পছন্দসই ফাইলের জন্য DIR ব্যবহার করুন\n"
-"  -d, --debug         stdout এ ডিবাগিং বার্তা মুদ্রণ করুন\n"
-"  -h, --help          এই সহায়িকা দেখুন ও ত্যাগ করুন\n"
-"  -m, --multiple      একক দৃষ্টান্ত নিশ্চিত করবেন না\n"
-"  -n, --nologin       স্বয়ংক্রিয়ভাবে লগইন করবেন না\n"
-"  -l, --login[=NAME]  সুনির্দিষ্ট একাউন্ট(সমূহ) সক্রিয় করুন (কমা দ্বারা পৃথক ঐচ্ছিক "
-"আর্গুমেন্ট নাম\n"
-"                        ব্যবহারের জন্য একাউন্ট(সমূহ) সুনির্দিষ্ট করে,\n"
-"                       এটা ব্যতিত শুধুমাত্র প্রথম একাউন্ট সক্রিয় হবে)। \n"
-"  --display=DISPLAY   X ব্যবহারের জন্য প্রদর্শন করুন\n"
-"  -v, --version       বর্তমান সংস্করণ প্রদর্শন করুন এবং ত্যাগ করুন\n"
+"  -c, --config=DIR    কনফিগারেশন ফাইলের জন্য DIR ব্যবহার করা হবে\n"
+"  -d, --debug         stdout এ ডিবাগিং বার্তা প্রিন্ট করা হবে\n"
+"  -f, --force-online  অনলাইন হতে বাধ্য করুন, নেটওয়ার্কের অবস্থা যাই হোক\n"
+"  -h, --help          এই সহায়িকা দেখুন ও প্রস্থান করুন\n"
+"  -m, --multiple     একক ইনস্ট্যান্স নিশ্চিত করা হবে না\n"
+"  -n, --nologin       স্বয়ংক্রিয়ভাবে লগইন করা হবে না\n"
+"  -l, --login[=NAME]  নির্দিষ্ট একাউন্ট(সমূহ) সক্রিয় করা হবে (NAME হচ্ছে কমা দ্বারা "
+"পৃথককৃত ঐচ্ছিক আর্গুমেন্ট\n"
+"                        যা একাউন্ট(সমূহ) নির্দিষ্ট করে,\n"
+"                       এটি ব্যতিত শুধুমাত্র প্রথম একাউন্টটি সক্রিয় হবে)। \n"
+"  --display=DISPLAY   যে X-ডিসপ্লে ব্যবহার করা হবে তা নির্দিষ্ট করে।\n"
+"  -v, --version       বর্তমান সংস্করণ প্রদর্শন করে প্রস্থান করা হবে\n"
 
 # fix me
 #, c-format
@@ -12987,6 +12945,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12996,18 +12955,19 @@ msgid ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"ব্যবহার: %s [পছন্দ]...\n"
+"ব্যবহার: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    পছন্দসই ফাইলের জন্য DIR ব্যবহার করুন\n"
-"  -d, --debug         stdout এ ডিবাগিং বার্তা মুদ্রণ করুন\n"
-"  -h, --help          এই সহায়িকা দেখুন ও ত্যাগ করুন\n"
-"  -m, --multiple      একক দৃষ্টান্ত নিশ্চিত করবেন না\n"
-"  -n, --nologin       স্বয়ংক্রিয়ভাবে লগইন করবেন না\n"
-"  -l, --login[=NAME]  সুনির্দিষ্ট একাউন্ট(সমূহ) সক্রিয় করুন (কমা দ্বারা পৃথক ঐচ্ছিক "
-"আর্গুমেন্ট নাম\n"
-"                        ব্যবহারের জন্য একাউন্ট(সমূহ) সুনির্দিষ্ট করে,\n"
-"                       এটা ব্যতিত শুধুমাত্র প্রথম একাউন্ট সক্রিয় হবে)। \n"
-"  -v, --version       বর্তমান সংস্করণ প্রদর্শন করুন এবং ত্যাগ করুন\n"
+"  -c, --config=DIR    কনফিগারেশন ফাইলের জন্য DIR ব্যবহার করা হবে\n"
+"  -d, --debug         stdout এ ডিবাগিং বার্তা প্রিন্ট করা হবে\n"
+"  -f, --force-online  অনলাইন হতে বাধ্য করুন, নেটওয়ার্কের অবস্থা যাই হোক\n"
+"  -h, --help          এই সহায়িকা দেখুন ও প্রস্থান করুন\n"
+"  -m, --multiple     একক ইনস্ট্যান্স নিশ্চিত করা হবে না\n"
+"  -n, --nologin       স্বয়ংক্রিয়ভাবে লগইন করা হবে না\n"
+"  -l, --login[=NAME]  নির্দিষ্ট একাউন্ট(সমূহ) সক্রিয় করা হবে (NAME হচ্ছে কমা দ্বারা "
+"পৃথককৃত ঐচ্ছিক আর্গুমেন্ট\n"
+"                        যা একাউন্ট(সমূহ) নির্দিষ্ট করে,\n"
+"                       এটি ব্যতিত শুধুমাত্র প্রথম একাউন্টটি সক্রিয় হবে)।\n"
+"  -v, --version       বর্তমান সংস্করণ প্রদর্শন করে প্রস্থান করা হবে\n"
 
 #, c-format
 msgid ""
@@ -13024,16 +12984,17 @@ msgid ""
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
-"%s %s একটি মূল ফাইলকে সেগ-ফল্ট ও নষ্ট করার উদ্দোগ নিয়েছে।\n"
-"এটি সফটওয়্যারের একটি বাগ এবং আপনার নিজের কোনো ভূল ছাড়াই সংঘটিত হয়।\n"
+"%s %s একটি মূল ফাইলকে সেগ-ফল্ট ও ডাম্প করার চেষ্টা  করেছে।\n"
+"এটি একটি সফটওয়্যার বাগ এবং আপনার নিজের কোনো ভুল ছাড়াই সংঘটিত হয়েছে।\n"
 "\n"
-"আপনি যদি ক্র্যাশ পুনরায় ঘটাতে করেন, একটি বাগ প্রতিবেদনের মাধ্যমের ডেভেলপারদের "
+"আপনি যদি ক্র্যাশটি পুনরায় ঘটাতে পারেন, একটি বাগ রিপোর্টের মাধ্যমের ডেভেলপারদের "
 "অবগত করুন:\n"
 "%ssimpleticket/\n"
 "\n"
-"অনুগ্রহ করে নিশ্চিত ভাবে উল্লেখ করুন আপনি এই সময়ে কি করছিলেন এবং মূল ফাইল হতে এর "
-"উৎস পোষ্ট করুন।  আপনি যদি না জানেন কিভাবে আলামত পেতে হবে, তবে অনুগ্রহ করে %swiki/"
-"GetABacktrace এর তথ্যসমূহ পাঠ করুন\n"
+"অনুগ্রহ করে নিশ্চিতভাবে উল্লেখ করুন আপনি এই সময়ে কি করছিলেন এবং মূল ফাইল থেকে\n"
+"এর backtrace পোষ্ট করুন। আপনি যদি না জানেন কিভাবে backtrace পেতে হবে, তবে "
+"অনুগ্রহ করে\n"
+"%swiki/GetABacktrace এর নিয়মাবলী পাঠ করুন\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -13042,63 +13003,93 @@ msgstr "পিজিন"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "প্রস্থান করছে কারণ আরেকটি libpurple ক্লায়েন্ট ইতিমধ্যে চলছে।\n"
 
-msgid "Open All Messages"
-msgstr "সকল বার্তা খুলুন"
+msgid "/_Media"
+msgstr "/মিডিয়া (_M)"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">আপনার মেইল আছে!</span>"
+msgid "/Media/_Hangup"
+msgstr "/মিডিয়া/কল শেষ করুন (_H)"
+
+msgid "Calling..."
+msgstr "কল করা হচ্ছে..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s আপনার সাথে একটি অডিও/ভিডিও সেশন শুরু করতে চায়।"
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s আপনার সাথে একটি ভিডিও সেশন শুরু করতে চায়।"
 
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s-এর %dটি নতুন বার্তা আছে।"
-msgstr[1] "%s-এর  %dগুলো নতুন বার্তা আছে।"
+msgstr[0] "%s-এর %d টি নতুন বার্তা আছে।"
+msgstr[1] "%s-এর  %d টি নতুন বার্তা আছে।"
 
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] " <b>%d টি নতুন ই-মেইল।</b>"
-msgstr[1] "<b>%dগুলো নতুন ই-মেইল।</b>"
+msgstr[0] "<b>%d টি নতুন ইমেইল।</b>"
+msgstr[1] "<b>%d টি নতুন ইমেইল।</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "ব্রাউজার নির্দেশ \"%s\" অবৈধ।"
+msgstr "ব্রাউজার কমান্ড \"%s\" অকার্যকর।"
 
 msgid "Unable to open URL"
-msgstr "ইউআরএল খুলতে সমর্থ নয়"
+msgstr "URL খুলতে ব্যর্থ"
 
 #, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "\"%1s\" শুরুকরণে ত্রুটি: %2s"
+msgstr "\"%1$s\" আরম্ভ করতে ত্রুটি: %2$s"
 
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
-"'হস্তচালিতভাবে' ব্রাউজার নির্দেশ পছন্দ করা হয়েছে, কিন্তু কোনো নির্দেশ নির্ধারণ করা "
+"'Manual'  ব্রাউজার কমান্ডটি নির্বাচন করা হয়েছে, কিন্তু কোনো কমান্ড নির্ধারণ করা "
 "হয়নি।"
 
+msgid "No message"
+msgstr "কোন বার্তা নেই"
+
+msgid "Open All Messages"
+msgstr "সব বার্তা খোলা হবে"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">আপনার মেইল আছে!</span>"
+
+msgid "New Pounces"
+msgstr "নতুন পাউন্স"
+
+# context?
+msgid "Dismiss"
+msgstr "বাতিল"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">আপনি পাউন্স করেছেন!</span>"
+
 # tithi
 msgid "The following plugins will be unloaded."
-msgstr "নিম্নোক্ত প্লাগইনগুলো লোড মুক্ত করা হবে।"
+msgstr "নিম্নোক্ত প্লাগইনগুলো আনলোড করা হবে।"
 
 # tithi
 msgid "Multiple plugins will be unloaded."
-msgstr "বহুবিধ প্লাগইনগুলো লোড মুক্ত করা হবে।"
+msgstr "বহুবিধ প্লাগইন আনলোড করা হবে।"
 
 msgid "Unload Plugins"
-msgstr "প্লাগইন লোড মুক্ত করুন"
+msgstr "প্লাগইন আনলোড করা হবে"
 
 msgid "Could not unload plugin"
-msgstr "প্লাগইন লোড মুক্ত করা যায়নি"
+msgstr "প্লাগইন আনলোড করা যায়নি"
 
 # tithi
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr ""
-"এই প্লাগইনটি এখন লোড মুক্ত করা যাচ্ছে না, কিন্তু পরবর্তী শুরুতে নিষ্ক্রিয় করা হবে।"
+"এই প্লাগইনটি এখন আনলোড করা যাচ্ছে না, কিন্তু পরবর্তীতে শুরুর সময় নিষ্ক্রিয় করা হবে।"
 
 # tithi
 #, c-format
@@ -13107,7 +13098,7 @@ msgid ""
 "Check the plugin website for an update.</span>"
 msgstr ""
 "<span foreground=\"red\" weight=\"bold\">ত্রুটি: %s\n"
-"হালনাগাদের জন্য প্লাগইন ওয়েবসাইট পরীক্ষা করুন।</span>"
+"হালনাগাদের জন্য প্লাগইন ওয়েবসাইট দেখুন।</span>"
 
 msgid "Author"
 msgstr "লেখক"
@@ -13119,102 +13110,158 @@ msgid "<b>Web site:</b>"
 msgstr "<b>ওয়েব সাইট:</b>"
 
 msgid "<b>Filename:</b>"
-msgstr "<b>ফাইলনাম:</b>"
+msgstr "<b>ফাইলের নাম:</b>"
 
 msgid "Configure Pl_ugin"
-msgstr "প্লাগইন পছন্দসই বিন্যাস করুন (_u)"
+msgstr "প্লাগইন কনফিগারকরণ (_u)"
 
 msgid "<b>Plugin Details</b>"
-msgstr "<b>প্লাগইনের বর্ণনা</b>"
+msgstr "<b>প্লাগইনের বিবরণ</b>"
 
 msgid "Select a file"
 msgstr "একটি ফাইল নির্বাচন করুন"
 
+msgid "Modify Buddy Pounce"
+msgstr "বন্ধু পাউন্স সম্পাদনা করা হবে"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
-msgstr "কাকে পাউন্স করেন"
+msgstr "যাকে পাউন্স করা হবে"
+
+msgid "_Account:"
+msgstr "একাউন্ট (_A):"
 
 msgid "_Buddy name:"
 msgstr "বন্ধুর নাম (_B):"
 
 msgid "Si_gns on"
-msgstr "সাইন অন (_g)"
+msgstr "লগইন করে (_g)"
 
 msgid "Signs o_ff"
-msgstr "সাইন অফ (_f)"
+msgstr "লগআউট করে (_f)"
 
 msgid "Goes a_way"
-msgstr "অনুপস্থিত (_w)"
+msgstr "অনত্র যায় (_w)"
 
 msgid "Ret_urns from away"
-msgstr "অনুপস্থিত অবস্থা থেকে ফিরে এসেছে (_u)"
+msgstr "অন্যত্র অবস্থা থেকে ফিরে আসে (_u)"
 
 msgid "Becomes _idle"
-msgstr "এখন অলস (_i)"
+msgstr "নিষ্ক্রিয় হয় (_i)"
 
 msgid "Is no longer i_dle"
-msgstr "আর অলস থাকবে না (_d)"
+msgstr "আর নিষ্ক্রিয় নয় (_d)"
 
 msgid "Starts _typing"
-msgstr "টাইপ শুরু করেছে (_t)"
+msgstr "টাইপ শুরু করে (_t)"
 
 # tithi
 msgid "P_auses while typing"
-msgstr "টাইপের সময় বন্ধ রাখুন (_a)"
+msgstr "টাইপ করার সময় থামে (_a)"
 
 msgid "Stops t_yping"
-msgstr "টাইপ বন্ধ করছে (_y)"
+msgstr "টাইপ বন্ধ করে (_y)"
 
 msgid "Sends a _message"
 msgstr "বার্তা পাঠায় (_m)"
 
 msgid "Ope_n an IM window"
-msgstr "একটি আইএম উইন্ডো খুলুন (_n)"
+msgstr "একটি IM উইন্ডো খোলা হবে (_n)"
 
 msgid "_Pop up a notification"
-msgstr "একটি প্রজ্ঞাপন পপআপ করুন (_P)"
+msgstr "একটি ঘোষণা পপআপ করা হবে (_P)"
 
 msgid "Send a _message"
-msgstr "একটি বার্তা পাঠান (_m)"
+msgstr "একটি বার্তা পাঠানো হবে (_m)"
 
 msgid "E_xecute a command"
-msgstr "একটি নির্দেশ কার্যকর করুন  (_x)"
+msgstr "একটি কমান্ড কার্যকর করা হবে  (_x)"
 
 msgid "P_lay a sound"
-msgstr "শব্দ বাজান (_l)"
+msgstr "শব্দ বাজানো হবে (_l)"
 
 msgid "Brows_e..."
-msgstr "ব্রাউজ করুন... (_e)"
+msgstr "ব্রাউজ... (_e)"
 
 msgid "Br_owse..."
-msgstr "ব্রাউজ করুন... (_o)"
+msgstr "ব্রাউজ... (_o)"
 
 msgid "Pre_view"
 msgstr "প্রাকদর্শন (_v)"
 
 msgid "P_ounce only when my status is not Available"
-msgstr "আমার অবস্থা যখন সহজলভ্য নয় তখন পাউন্স করুন (_o)"
+msgstr "আমার অবস্থা যখন অনুপস্থিত তখন পাউন্স করা হবে (_o)"
 
 # tithi
 msgid "_Recurring"
-msgstr "পুনরাবৃত্ত করছে (_R)"
+msgstr "পুনরাবৃত্ত (_R)"
 
 msgid "Pounce Target"
 msgstr "পাউন্সের লক্ষ্য"
 
-msgid "Smiley theme failed to unpack."
-msgstr "স্মাইলী থীম প্যাকহীন করতে ব্যর্থ হয়েছে"
+#, c-format
+msgid "Started typing"
+msgstr "টাইপ শুরু করেছে"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "টাইপ করা থামিয়েছে"
+
+#, c-format
+msgid "Signed on"
+msgstr "লগইন করেছে"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "নিষ্ক্রিয় অবস্থা থেকে ফিরেছে"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "অন্যত্র থেকে ফিরে এসেছে"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "টাইপ করা বন্ধ করেছে"
+
+#, c-format
+msgid "Signed off"
+msgstr "লগআউট করেছে"
+
+#, c-format
+msgid "Became idle"
+msgstr "নিষ্ক্রিয় হয়েছে"
+
+#, c-format
+msgid "Went away"
+msgstr "এখন অন্যত্র"
+
+#, c-format
+msgid "Sent a message"
+msgstr "একটি বার্তা পাঠানো হয়েছে"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "অজানা... অনুগ্রহ করে এটি রিপোর্ট করুন!"
+
+msgid "Theme failed to unpack."
+msgstr "থীম আনপ্যাক করতে ব্যর্থ হয়েছে।"
+
+msgid "Theme failed to load."
+msgstr "থীম লোড করতে ব্যর্থ হয়েছে।"
+
+msgid "Theme failed to copy."
+msgstr "থীম অনুলিপি করতে ব্যর্থ হয়েছে।"
 
 # tithi
 msgid "Install Theme"
-msgstr "থীম সংস্থাপন করুন"
+msgstr "থীম ইনস্টল করুন"
 
 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 ""
 "আপনি যে স্মাইলি থীম ব্যবহার করতে চান তা নিম্নবর্তী তালিকা থেকে বাছাই করুন। নতুন "
-"থীম থীমের তালিকায় টানা ও ছাড়ার মাধ্যমে তাদের সংস্থাপন করতে পারেন।"
+"থীম তালিকায় টেনে এনে ফেলে ইনস্টল করতে পারেন।"
 
 msgid "Icon"
 msgstr "আইকন"
@@ -13224,35 +13271,43 @@ msgid "Keyboard Shortcuts"
 msgstr "কীবোর্ড শর্টকাট"
 
 msgid "Cl_ose conversations with the Escape key"
-msgstr "Escape কী দ্বারা কথোপকথনসমূহ বন্ধ করুন (_o)"
+msgstr "Escape কী চেপে কথোপকথন বন্ধ করা যাবে (_o)"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "বন্ধু তালিকার থীম"
+
+#. System Tray
 msgid "System Tray Icon"
-msgstr "সিস্টেম ট্রে এর আইকন"
+msgstr "সিস্টেম ট্রের আইকন"
 
 msgid "_Show system tray icon:"
-msgstr "সিস্টেম ট্রে এর আইকন প্রদর্শন করুন (_S):"
+msgstr "সিস্টেম ট্রের আইকন প্রদর্শন (_S):"
 
 msgid "On unread messages"
-msgstr "অপঠিত বার্তাসমূহে"
+msgstr "অপঠিত বার্তা থাকলে"
 
-msgid "Conversation Window Hiding"
-msgstr "কথোপকথন উইন্ডো লুকিয়ে ফেলছে"
+msgid "Conversation Window"
+msgstr "কথোপকথনের উইন্ডো"
 
 msgid "_Hide new IM conversations:"
-msgstr "নতুন কথোপকথন IM লুকিয়ে রাখুন (_H):"
+msgstr "নতুন IM কথোপকথন লুকিয়ে রাখা হবে (_H):"
 
 msgid "When away"
-msgstr "যখন অনুপস্থিত"
+msgstr "যখন অন্যত্র"
+
+msgid "Minimi_ze new conversation windows"
+msgstr "নতুন কথোপকথন উইন্ডো ছোট করা হবে (_z)"
 
 #. All the tab options!
 msgid "Tabs"
-msgstr "ট্যাবসমূহ"
+msgstr "ট্যাব"
 
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "আইএম ও আড্ডাসমূহ ট্যাবকৃত উইন্ডোতে প্রদর্শন করুন (_t)"
+msgstr "IM ও আড্ডা ট্যাবকৃত উইন্ডোতে প্রদর্শন করা হবে (_t)"
 
 msgid "Show close b_utton on tabs"
-msgstr "ট্যাবে বন্ধ বোতাম প্রদর্শন করুন (_u)"
+msgstr "ট্যাবে বন্ধ বোতাম প্রদর্শন করা হবে (_u)"
 
 msgid "_Placement:"
 msgstr "অবস্থান (_P):"
@@ -13270,131 +13325,130 @@ msgid "Right"
 msgstr "ডান"
 
 msgid "Left Vertical"
-msgstr "বাম উলম্ব"
+msgstr "বাম উল্লম্ব"
 
 msgid "Right Vertical"
-msgstr "ডান উলম্ব"
+msgstr "ডান উল্লম্ব"
 
 msgid "N_ew conversations:"
 msgstr "নতুন কথোপকথন (_e):"
 
 msgid "Show _formatting on incoming messages"
-msgstr "আগত বার্তাসমূহে বিন্যাসকরণ প্রদর্শন করুন (_f)"
+msgstr "আগত বার্তার বিন্যাস প্রদর্শিত হবে (_f)"
 
 # tithi
 msgid "Close IMs immediately when the tab is closed"
-msgstr "ট্যাব বন্ধ করার সময় IM তাৎ‍ক্ষণিকভাবে বন্ধ করুন"
+msgstr "ট্যাব বন্ধ করলে IMগুলো তাৎ‍ক্ষণিকভাবে বন্ধ করা হবে"
 
 msgid "Show _detailed information"
-msgstr "বিস্তারিত তথ্য প্রদর্শন করুন (_d)"
+msgstr "বিস্তারিত তথ্য প্রদর্শন (_d)"
 
 msgid "Enable buddy ic_on animation"
-msgstr "এ্যানিমেশনে বন্ধুর আইকন সক্রিয় করুন (_o)"
+msgstr "বন্ধুর আইকনের এ্যানিমেশন সক্রিয় করা হবে (_o)"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "আপনি যা টাইপ করছেন তা বন্ধুদের অবগত করুন (_N)"
+msgstr "আপনি টাইপ করছেন তা বন্ধুদের অবগত করা হবে (_N)"
 
 msgid "Highlight _misspelled words"
-msgstr "ভুল বানানের শব্দ হাইলাইট করুন (_m)"
+msgstr "ভুল বানান হাইলাইট করা হবে (_m)"
 
 # tithi
 msgid "Use smooth-scrolling"
-msgstr "মসৃন-স্ক্রলিং ব্যবহার করুন"
+msgstr "মসৃন-স্ক্রলিং ব্যবহার করা হবে"
 
 msgid "F_lash window when IMs are received"
-msgstr "আইএম গ্রহণ করলে উইন্ডো ফ্ল্যাশ দিন (_l)"
-
-msgid "Minimi_ze new conversation windows"
-msgstr "নতুন কথোপকথন উইন্ডো নূন্যতম করুন (_z)"
+msgstr "IM গ্রহণ করলে উইন্ডো ঝলকানো হবে (_l)"
 
 # tithi
 msgid "Minimum input area height in lines:"
-msgstr "লাইনের ন্যুনতম ইনপুট এলাকার উচ্চতা:"
+msgstr "লাইনে ইনপুট এলাকার সর্বনিম্ন উচ্চতা:"
 
 msgid "Font"
 msgstr "ফন্ট"
 
 # tithi
 msgid "Use document font from _theme"
-msgstr "থীম থেকে নথির ফন্ট ব্যবহার করুন (_t)"
+msgstr "থীম থেকে নথির ফন্ট ব্যবহার করা হবে (_t)"
 
 # tithi
 msgid "Use font from _theme"
-msgstr "থীম থেকে ফন্ট ব্যবহার করুন (_t)"
+msgstr "থীম থেকে ফন্ট ব্যবহার করা হবে (_t)"
 
 msgid "Conversation _font:"
 msgstr "কথোপকথন ফন্ট (_f):"
 
 msgid "Default Formatting"
-msgstr "পুর্বনির্ধারিত বিন্যাসকরণ"
+msgstr "পুর্বনির্ধারিত বিন্যাস"
 
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
-"আপনি যখন বিন্যাসকরণ সমর্থিত প্রোটকল ব্যবহার করেন তখন আপনার বহির্গমন বার্তার পাঠ "
-"এমনভাবে উপস্থিত হবে।"
+"আপনি যখন বিন্যাস সমর্থিত প্রোটোকল ব্যবহার করেন তখন আপনার লেখা এমনভাবে উপস্থাপিত "
+"হবে।"
 
 # tithi
 msgid "Cannot start proxy configuration program."
-msgstr "প্রক্সি বিন্যাসন প্রোগ্রাম শুরু করতে পারে না।"
+msgstr "প্রক্সি কনফিগারেশন প্রোগ্রাম শুরু করা সম্ভব হয়নি।"
 
 msgid "Cannot start browser configuration program."
-msgstr "ব্রাউজারের বিন্যাসন প্রোগ্রাম শুরু করতে পারে না।"
-
-msgid "ST_UN server:"
-msgstr "STUN সার্ভার (_U):"
+msgstr "ব্রাউজার কনফিগারেশন প্রোগ্রাম শুরু করা সম্ভব হয়নি।"
 
 # tithi
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">উদাহরণ: স্ট্যানসার্ভার.অর্গ</span>"
+msgstr "উদাহরণ: <span style=\"italic\">stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "স্বয়ং-শনাক্ত আইপি ঠিকানা (_A)"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "স্বয়ংক্রিয়ভাবে সনাক্তকৃত IP ঠিকানা ব্যবহার করুন (_a): %s"
 
 msgid "Public _IP:"
-msgstr "সর্বসাধারণ আইপি (_I):"
+msgstr "পাবলিক _IP:"
 
 msgid "Ports"
-msgstr "পোর্টসমূহ"
+msgstr "পোর্ট"
 
 # tithi
 msgid "_Enable automatic router port forwarding"
-msgstr "স্বয়ংক্রিয় রাউটার পোর্ট অগ্রগমন সক্রিয় করুন (_E)"
+msgstr "স্বয়ংক্রিয় রাউটার পোর্ট ফরওয়ার্ডিং সক্রিয় করা হবে (_E)"
 
 msgid "_Manually specify range of ports to listen on"
-msgstr "শুনতে পোর্টের সীমা নিজের হাতে উল্লেখ করুন (_M)"
+msgstr "যেসব পোর্টে লিসেন করা হবে তার সীমা স্বনির্ধারণ (_M)"
 
 msgid "_Start port:"
 msgstr "শুরুর পোর্ট (_S):"
 
 msgid "_End port:"
-msgstr "শেষ পোর্ট (_E):"
+msgstr "শেষের পোর্ট (_E):"
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "রিলে সার্ভার (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "প্রক্সি সার্ভার &amp; ব্রাউজার"
 
 # tithi
 msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>প্রক্সির পছন্দসই বিন্যাসন প্রোগ্রাম খুঁজে পাওয়া যায়নি।</b>"
+msgstr "<b>প্রক্সির কনফিগারেশন প্রোগ্রাম খুঁজে পাওয়া যায়নি।</b>"
 
 # tithi
 msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>ব্রাউজারের পছন্দসই বিন্যাসন প্রোগ্রাম খুঁজে পাওয়া যায়নি।</b>"
+msgstr "<b>ব্রাউজারের কনফিগারেশন প্রোগ্রাম খুঁজে পাওয়া যায়নি।</b>"
 
 # tithi
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
-"প্রক্সি ও ব্রাউজারের প্রাধিকারসমূহ \n"
-"GNOME প্রাধিকারসমূহে পছন্দসই বিন্যাসন করা হয়েছে"
+"প্রক্সি ও ব্রাউজারের বৈশিষ্ট্যাবলী \n"
+"GNOME পছন্দসমূহে কনফিগার করা হয়েছে"
 
 msgid "Configure _Proxy"
-msgstr "প্রক্সি পছন্দসই বিন্যাস করুন (_P)"
+msgstr "প্রক্সি কনফিগারেশন  (_P)"
 
 msgid "Configure _Browser"
-msgstr "ব্রাউজার পছন্দসই বিন্যাস করুন (_B)"
+msgstr "ব্রাউজার কনফিগারেশন (_B)"
 
 msgid "Proxy Server"
 msgstr "প্রক্সি সার্ভার"
@@ -13404,7 +13458,7 @@ msgstr "কোনো প্রক্সি নেই"
 
 #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
 msgid "Use remote DNS with SOCKS4 proxies"
-msgstr ""
+msgstr "SOCKS4 প্রক্সি সম্বলিত দুরবর্তী DNS ব্যবহৃত হবে"
 
 msgid "_User:"
 msgstr "ব্যবহারকারী (_U):"
@@ -13423,13 +13477,13 @@ msgid "Mozilla"
 msgstr "মজিলা"
 
 msgid "Konqueror"
-msgstr "কনকোয়েরর"
+msgstr "কনকোয়েরার"
 
 msgid "Desktop Default"
-msgstr "ডেস্কটপ পূর্বনির্ধারিত"
+msgstr "পূর্বনির্ধারিত ডেস্কটপ "
 
 msgid "GNOME Default"
-msgstr "GNOME পূর্বনির্ধারিত"
+msgstr "পূর্বনির্ধারিত GNOME "
 
 msgid "Galeon"
 msgstr "গ্যালিওন"
@@ -13453,10 +13507,10 @@ msgid "_Browser:"
 msgstr "ব্রাউজার (_B):"
 
 msgid "_Open link in:"
-msgstr "লিঙ্ক খুলুন (_O):"
+msgstr "লিংক খুলুন (_O):"
 
 msgid "Browser default"
-msgstr "ব্রাউজার পূর্বনির্ধারিত"
+msgstr "পূর্বনির্ধারিত ব্রাউজার"
 
 msgid "Existing window"
 msgstr "বিদ্যমান উইন্ডো"
@@ -13473,16 +13527,16 @@ msgstr ""
 "(URL এর জন্য %s)"
 
 msgid "Log _format:"
-msgstr "কার্যবিবরণী বিন্যাস (_f):"
+msgstr "লগ বিন্যাস (_f):"
 
 msgid "Log all _instant messages"
-msgstr "সব তাৎক্ষণিক বার্তাসমূহ লগ করুন (_i)"
+msgstr "সব তাৎক্ষণিক বার্তা সংরক্ষণ করা হবে (_i)"
 
 msgid "Log all c_hats"
-msgstr "সকল আড্ডা লগ করুন (_h)"
+msgstr "সব আড্ডার কথোপকথন লগ করা হবে (_h)"
 
 msgid "Log all _status changes to system log"
-msgstr "সব অবস্থার পরিবর্তনসমূহ সিস্টেমের কার্যবিবরণীতে লগ করুন (_s)"
+msgstr "সব অবস্থার পরিবর্তন সিস্টেম লগে লেখা হবে (_s)"
 
 msgid "Sound Selection"
 msgstr "শব্দ নির্বাচন"
@@ -13509,7 +13563,7 @@ msgstr "অপেক্ষাকৃত জোরে"
 
 #, c-format
 msgid "Loudest"
-msgstr "একদম জোরে"
+msgstr "সবচেয়ে জোরে"
 
 msgid "_Method:"
 msgstr "প্রক্রিয়া (_M):"
@@ -13525,184 +13579,183 @@ msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"শব্দের নির্দেশ (_o):\n"
-"(ফাইল-নামের জন্য %s)"
+"শব্দের কমান্ড (_o):\n"
+"(ফাইলের নামের জন্য %s)"
 
 msgid "M_ute sounds"
-msgstr "শব্দ বন্ধ করুন (_u)"
+msgstr "শব্দ বন্ধ (_u)"
 
 msgid "Sounds when conversation has _focus"
-msgstr "কথোপকথন ফোকাস করার শব্দ"
+msgstr "কথোপকথনে ফোকাস করলে শব্দ হবে"
 
 msgid "_Enable sounds:"
-msgstr "শব্দ সক্রিয় করুন (_E):"
+msgstr "শব্দ সক্রিয় (_E):"
 
 msgid "V_olume:"
 msgstr "ভলিউম (_o):"
 
 msgid "Play"
-msgstr "বাজাও"
+msgstr "বাজানো হবে"
 
 msgid "_Browse..."
-msgstr "ব্রাউজ করুন... (_B)"
+msgstr "ব্রাউজ... (_B)"
 
 msgid "_Reset"
-msgstr "পুনঃ বিন্যাস করুন (_R)"
+msgstr "রিসেট (_R)"
 
 msgid "_Report idle time:"
-msgstr "অলস সময়ের প্রতিবেদন দিন (_R)"
+msgstr "নিষ্ক্রিয় সময় দেখানো হবে (_R):"
 
 # tithi
 msgid "Based on keyboard or mouse use"
-msgstr "কীবোর্ড বা মাউস ব্যবহারের উপর ভিত্তি করে"
+msgstr "কীবোর্ড বা মাউসের ব্যবহারের উপর ভিত্তি করে"
 
 msgid "_Auto-reply:"
 msgstr "স্বয়ংক্রিয়-উত্তর (_A):"
 
 msgid "When both away and idle"
-msgstr "যখন উভয়ই অনুপস্থিত এবং অলস"
+msgstr "যখন অন্যত্র এবং নিষ্ক্রিয়"
 
 #. Auto-away stuff
 msgid "Auto-away"
-msgstr "স্বয়ংক্রিয়ভাবে অনুপস্থিতি"
-
-msgid "Change status when _idle"
-msgstr "অলস থাকলে অবস্থা পরিবর্তন করুন (_i)"
+msgstr "স্বয়ংক্রিয়ভাবে অন্যত্র"
 
 msgid "_Minutes before becoming idle:"
-msgstr "অলস হওয়ার পূর্বের মিনিট (_M):"
+msgstr "নিষ্ক্রিয় হওয়ার মিনিটখানেক আগে (_M):"
+
+msgid "Change status when _idle"
+msgstr "নিষ্ক্রিয় থাকলে অবস্থা পরিবর্তন করা হবে (_i)"
 
 msgid "Change _status to:"
-msgstr "অবস্থা পরিবর্তন করুন (_s):"
+msgstr "অবস্থা পরিবর্তন (_s):"
 
 # tithi
 #. Signon status stuff
 msgid "Status at Startup"
-msgstr "সূচনার অবস্থা"
+msgstr "শুরুর অবস্থা"
 
 # tithi
 msgid "Use status from last _exit at startup"
-msgstr "সর্বশেষ ত্যাগের অবস্থা শুরুতে ব্যবহার করুন (_e)"
+msgstr "আরম্ভের সময় সর্বশেষ প্রস্থানের অবস্থা ব্যবহার করা হবে (_e)"
 
 # tithi
 msgid "Status to a_pply at startup:"
-msgstr "সূচনাতে প্রয়োগ করার অবস্থা (_p):"
+msgstr "শুরুতে প্রয়োগ করার অবস্থা (_p):"
 
 msgid "Interface"
 msgstr "ইন্টারফেস"
 
 msgid "Smiley Themes"
-msgstr "স্মাইলী থীমসমূহ"
+msgstr "স্মাইলি থীম"
 
 msgid "Browser"
 msgstr "ব্রাউজার"
 
 msgid "Status / Idle"
-msgstr "অবস্থা / অলস"
+msgstr "অবস্থা / নিষ্ক্রিয়"
 
 msgid "Allow all users to contact me"
-msgstr "সব ব্যবহারকারীকে আমার সাথে যোগাযোগ করার অনুমতি দিন"
+msgstr "সব ব্যবহারকারীকে আমার সাথে যোগাযোগের অনুমতি দেয়া হবে"
 
 msgid "Allow only the users on my buddy list"
-msgstr "শুধুমাত্র আমার তালিকার বন্ধুদের অনুমতি দিন"
+msgstr "শুধুমাত্র আমার তালিকার বন্ধুদের অনুমতি দেয়া হবে"
 
 msgid "Allow only the users below"
-msgstr "শুধুমাত্র নিম্নোলিখিত ব্যবহারকারীদের অনুমতি দিন"
+msgstr "শুধুমাত্র নিম্নলিখিত ব্যবহারকারীদের অনুমতি দেয়া হবে"
 
 msgid "Block all users"
-msgstr "সব ব্যবহারকারীদের ব্লক করুন"
+msgstr "সব ব্যবহারকারীদের ব্লক করা হবে"
 
 msgid "Block only the users below"
-msgstr "শুধুমাত্র নিম্নোলিখিত ব্যবহারকারীদের ব্লক করুন"
+msgstr "শুধুমাত্র নিম্নলিখিত ব্যবহারকারীদের ব্লক করা হবে"
 
 msgid "Privacy"
-msgstr "ব্যক্তিগত"
+msgstr "গোপনতা"
 
 msgid "Changes to privacy settings take effect immediately."
-msgstr "ব্যক্তিগত বিন্যাসনসমূহে পরিবর্তনসমূহ তাৎ‍ক্ষণিকভাবে কার্যকর হবে।"
+msgstr "গোপনতার বিন্যাসের পরিবর্তনগুলো তাৎ‍ক্ষণিকভাবে কার্যকর হবে।"
 
 msgid "Set privacy for:"
-msgstr "এর জন্য গোপনীয়তা নির্ধারণ করুন:"
+msgstr "এর জন্য গোপনতা নির্ধারণ করুন:"
 
 #. Remove All button
 msgid "Remove Al_l"
-msgstr "সব অপসারণ করুন (_l)"
+msgstr "সব অপসারণ করা হবে (_l)"
 
 msgid "Permit User"
-msgstr "ব্যবহারকারীকে অনুমতি দিন"
+msgstr "ব্যবহারকারীকে অনুমোদন"
 
 msgid "Type a user you permit to contact you."
-msgstr "আপনি অনুমতি দেন এমন ব্যবহারকারীকে আপনার সাথে যোগাযোগের জন্য টাইপ করুন।"
+msgstr "আপনার সাথে যোগাযোগ করতে অনুমোদিত একজন ব্যবহারকারীর নাম দিন।"
 
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"অনুগ।রহ করে আপনার সাথে যোগাযোগে অনুমতি দিতে চান এমন ব্যবহারকারীর নাম প্রবেশ করান।"
+msgstr "অনুগ্রহ করে আপনার সাথে যোগাযোগে অনুমতি দিতে চান এমন ব্যবহারকারীর নাম দিন।"
 
 msgid "_Permit"
-msgstr "অনুমতি দিন (_P)"
+msgstr "অনুমোদন করুন (_P)"
 
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "আপনার সাথে যোগাযোগের জন্যে %s কে কি অনুমতি দিবেন?"
+msgstr "%s কে আপনার সাথে যোগাযোগের করতে অনুমতি দিতে চান?"
 
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "আপনি কি নিশ্চিত আপনি  %s-কে আপনার সাথে যোগাযোগের অনুমতি দিতে চান?"
+msgstr "আপনি কি নিশ্চিতভাবে %s কে আপনার সাথে যোগাযোগের করতে অনুমতি দিতে চান?"
 
 msgid "Block User"
-msgstr "ব্যবহারকারীকে বাধা দিন"
+msgstr "ব্যবহারকারীকে ব্লক করা হবে"
 
 msgid "Type a user to block."
-msgstr "বাধা দেয়ার জন্য ব্যবহারকারীকে টাইপ করুন।"
+msgstr "ব্লক করার জন্য ব্যবহারকারীর নাম দিন।"
 
 msgid "Please enter the name of the user you wish to block."
-msgstr "অনুগ্রহ করে আপনি যে ব্যবহারকারীকে ব্লক করতে চান তার নাম প্রবেশ করান।"
+msgstr "অনুগ্রহ করে আপনি যে ব্যবহারকারীকে ব্লক করতে চান তার নাম দিন।"
 
 #, c-format
 msgid "Block %s?"
-msgstr "%s কে কি ব্লক করবেন?"
+msgstr "%s কে ব্লক করতে চান?"
 
 #, c-format
 msgid "Are you sure you want to block %s?"
-msgstr "আপনি কি নিশ্চিত আপনি %s-কে ব্লক করতে চান?"
+msgstr "আপনি কি নিশ্চিতভাবে %s-কে ব্লক করতে চান?"
 
 msgid "Apply"
-msgstr "প্রয়োগ করুন"
+msgstr "প্রয়োগ"
 
 msgid "That file already exists"
-msgstr "ঐ ফাইলটি ইতোমধ্যে বিদ্যমান"
+msgstr "ঐ ফাইলটি ইতিমধ্যে বিদ্যমান"
 
 msgid "Would you like to overwrite it?"
-msgstr "আপনি কি এটা উপরিলিখন করতে চান?"
+msgstr "আপনি কি এটার উপরিলেখন করতে চান?"
 
 # tithi
 msgid "Overwrite"
-msgstr "উপরিলিখন করুন"
+msgstr "উপরিলেখন"
 
 msgid "Choose New Name"
-msgstr "নতুন নাম পছন্দ করুন"
+msgstr "নতুন নাম নির্ধারণ"
 
 msgid "Select Folder..."
-msgstr "ফোল্ডার নির্বাচন করুন..."
+msgstr "ফোল্ডার নির্বাচন..."
 
 #. list button
 msgid "_Get List"
-msgstr "তালিকা সংগ্রহ করুন (_G)"
+msgstr "তালিকা সংগ্রহ (_G)"
 
 #. add button
 msgid "_Add Chat"
-msgstr "আড্ডা যোগ করুন (_A)"
+msgstr "আড্ডা যোগ (_A)"
 
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "আপনি কি নিশ্চিত আপনি নির্বাচিত সংরক্ষিত অবস্থাসমূহ মুছে ফেলতে চান?"
+msgstr "আপনি কি নিশ্চিতভাবে নির্বাচিত সংরক্ষিত অবস্থা মুছে ফেলতে চান?"
 
 #. Use button
 msgid "_Use"
-msgstr "ব্যবহার করুন (_U)"
+msgstr "ব্যবহার (_U)"
 
 msgid "Title already in use.  You must choose a unique title."
 msgstr ""
-"শিরোনাম ইতোমধ্যে ব্যবহৃত হচ্ছে।  আপনাকে অবশ্যই একটি অনন্য শিরোনাম পছন্দ করতে হবে।"
+"শিরোনাম ইতিমধ্যে ব্যবহৃত হচ্ছে। আপনাকে অবশ্যই একটি অব্যবহৃত শিরোনাম পছন্দ করতে হবে।"
 
 msgid "Different"
 msgstr "পৃথক"
@@ -13715,61 +13768,55 @@ msgstr "অবস্থা (_S):"
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr "কিছু একাউন্টের জন্য পৃথক অবস্থা ব্যবহার করুন (_d)"
+msgstr "কিছু একাউন্টের জন্য পৃথক অবস্থা ব্যবহার করা হবে (_d)"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
-msgstr "সংরক্ষণ এবং ব্যবহার করুন (_v)"
+msgstr "সংরক্ষণ এবং ব্যবহার (_V)"
 
 #, c-format
 msgid "Status for %s"
 msgstr "%s-এর জন্য অবস্থা"
 
-msgid "Custom Smiley"
-msgstr "পছন্দসই স্মাইলী"
-
-# tithi
-msgid "More Data needed"
-msgstr "আরও তথ্য প্রয়োজন"
-
-# tithi
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "অনুগ্রহ করে স্মাইলীর সাথে সম্পর্কিত করতে একটি শর্টকাট প্রদান করুন।"
-
-msgid "Duplicate Shortcut"
-msgstr "অনুরুপ শর্টকাট"
-
 # tithi
+#, c-format
 msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"নির্বাচিত শর্টকাটটির জন্য পছন্দসই স্মাইলী ইতোমধ্যে বিদ্যমান। অনুগ্রহ করে একটি ভিন্ন "
-"শর্টকাট উল্লেখ করুন।"
+"একটি স্বনির্বাচিত স্মাইলি '%s' এর জন্য ব্যবহৃত হয়েছে। অনুগ্রহ করে একটি ভিন্ন শর্টকাট "
+"ব্যবহার করুন।"
 
-msgid "Please select an image for the smiley."
-msgstr "অনুগ্রহ করে স্মাইলীটির জন্য একটি চিত্র নির্বাচন করুন।"
+msgid "Custom Smiley"
+msgstr "স্বনির্বাচিত স্মাইলি"
+
+msgid "Duplicate Shortcut"
+msgstr "হুবহু একই শর্টকাট"
 
 msgid "Edit Smiley"
-msgstr "স্মাইলী সম্পাদনা করুন"
+msgstr "স্মাইলি সম্পাদনা"
 
 msgid "Add Smiley"
-msgstr "স্মাইলী যোগ করুন"
+msgstr "স্মাইলি যোগ"
 
-msgid "Smiley _Image"
-msgstr "স্মাইলীর চিত্র (_I)"
+msgid "_Image:"
+msgstr "ছবি (_I):"
 
-# tithi
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "স্মাইলীর শর্টকাট (_S)"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "শর্টকাট টেক্সট (_h):"
 
 msgid "Smiley"
-msgstr "স্মাইলী"
+msgstr "স্মাইলি"
+
+msgid "Shortcut Text"
+msgstr "শর্টকাট টেক্সট"
 
 # tithi
 msgid "Custom Smiley Manager"
-msgstr "পছন্দসই স্মাইলী ব্যবস্থাপক"
+msgstr "স্বনির্বাচিত স্মাইলি ব্যবস্থাপক"
+
+msgid "Select Buddy Icon"
+msgstr "বন্ধু আইকন নির্বাচন"
 
 # tithi
 msgid "Click to change your buddyicon for this account."
@@ -13780,13 +13827,13 @@ msgid "Click to change your buddyicon for all accounts."
 msgstr "সব একাউন্টের জন্য আপনার বন্ধু-আইকন পরিবর্তন করতে ক্লিক করুন।"
 
 msgid "Waiting for network connection"
-msgstr "নেটওয়ার্ক সংযোগের জন্য অপেক্ষা করছে"
+msgstr "নেটওয়ার্ক সংযোগের জন্য অপেক্ষা করা হচ্ছে"
 
 msgid "New status..."
 msgstr "নতুন অবস্থা..."
 
 msgid "Saved statuses..."
-msgstr "সংরক্ষিত অবস্থাসমূহ..."
+msgstr "সংরক্ষিত অবস্থা..."
 
 msgid "Status Selector"
 msgstr "অবস্থা নির্বাচক"
@@ -13797,56 +13844,56 @@ msgstr "গুগল টক"
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "%1s লোড করার সময় নিম্নোক্ত ত্রুটি সংঘটিত হয়েছে: %2s"
+msgstr "%1$s লোড করার সময় নিম্নোক্ত ত্রুটি সংঘটিত হয়েছে: %2$s"
 
 msgid "Failed to load image"
-msgstr "চিত্র লোড করতে ব্যর্থ হয়েছে"
+msgstr "চিত্র লোড করতে ব্যর্থ"
 
 #, c-format
 msgid "Cannot send folder %s."
-msgstr "%s ফোল্ডার পাঠাতে পারে না।"
+msgstr "%s ফোল্ডার পাঠানো সম্ভব হয়না।"
 
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
-"%s ফোল্ডার স্থানান্তর করতে পারে না। আপনাকে প্রতিটি ফাইল আলাদাভাবে পাঠাতে হবে।"
+"%s ফোল্ডার স্থানান্তর করা সম্ভব হয়না। আপনাকে প্রতিটি ফাইল আলাদাভাবে পাঠাতে হবে।"
 
 msgid "You have dragged an image"
-msgstr "আপনি একটি চিত্র টেনেছেন"
+msgstr "আপনি একটি চিত্র টেনে এনেছেন"
 
 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 ""
-"আপনি এই ছবিটি ফাইল স্থানান্তর হিসেবে পাঠাতে পারেন, এটাকে এই বার্তার সাথে দৃঢ়বাবে "
-"সংযুক্ত করুন, বা এটাকে এই ব্যবহারকারীর জন্য বন্ধু আইকন হিসেবে ব্যবহার করুন।"
+"আপনি এই ছবিটি ফাইল স্থানান্তরের মাধ্যমে পাঠাতে পারেন, এটাকে এই বার্তার সাথে "
+"সন্নিবেশ করতে পারেন, অথবা এই ব্যবহারকারীর বন্ধু আইকন হিসেবে ব্যবহার করতে পারেন।"
 
 msgid "Set as buddy icon"
-msgstr "বন্ধু আইকন হিসেবে নির্ধারণ করুন"
+msgstr "বন্ধু আইকন হিসেবে নির্ধারণ করা হবে"
 
 msgid "Send image file"
-msgstr "চিত্র ফাইল পাঠান"
+msgstr "চিত্র ফাইল পাঠানো হবে"
 
 msgid "Insert in message"
-msgstr "বার্তায় প্রবেশ করান"
+msgstr "বার্তায় প্রবেশ করানো হবে"
 
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "আপনি কি এটাকে এই ব্যবহারকারীর জন্য বন্ধু আইকন হিসেবে নির্ধারণ করতে চান?"
+msgstr "আপনি কি এটিকে এই ব্যবহারকারীর জন্য বন্ধু আইকন হিসেবে নির্ধারণ করতে চান?"
 
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"আপনি এই চিত্রটি ফাইল স্থানান্তর হিসেবে পাঠাতে পারেন, বা এটাকে এই ব্যবহারকারীর "
-"জন্য বন্ধু আইকন হিসেবে ব্যবহার করতে পারেন।"
+"আপনি এই চিত্রটি ফাইল স্থানান্তর হিসেবে পাঠাতে পারেন, অথবা এটাকে এই ব্যবহারকারীর "
+"বন্ধু আইকন হিসেবে ব্যবহার করতে পারেন।"
 
 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
@@ -13855,14 +13902,14 @@ msgstr ""
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 msgid "Cannot send launcher"
-msgstr "প্রকাশক পাঠাতে পারে না"
+msgstr "লঞ্চার পাঠানো সম্ভব হয়নি"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
-"আপনি একটি ডেস্কটপ প্রকাশক টেনে এনেছেন। এই প্রকাশকটি নিজেকে নির্দেশ করার পরিবর্তে "
-"আর যেখানে নির্দেশ করে সেখানে সম্ভবত আপনি পাঠাতে চান।"
+"আপনি একটি ডেস্কটপ লঞ্চার টেনে এনেছেন। আপনি সম্ভবত  লঞ্চারটি নয় বরং এটি যাকে "
+"নির্দেশ করে তা পাঠাতে চান।"
 
 #, c-format
 msgid ""
@@ -13870,98 +13917,120 @@ msgid ""
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 msgstr ""
-"<b>ফাইল:</b> %1s\n"
-"<b>ফাইলের আকার:</b> %2s\n"
-"<b>চিত্রের আকার:</b> %3dx%4d"
+"<b>ফাইল:</b> %1$s\n"
+"<b>ফাইলের আকার:</b> %2$s\n"
+"<b>চিত্রের আকার:</b> %3$dx%4$d"
 
 # tithi
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
-"'%1s' ফাইলটি %2s এর জন্য অনেক বড়। অনুগ্রহ করে অপেক্ষাকৃত ছোট চিত্র ব্যবহার করুন।\n"
+"'%1$s' ফাইলটি %2$s এর জন্য অনেক বড়। অনুগ্রহ করে অপেক্ষাকৃত ছোট চিত্র ব্যবহার করুন।\n"
 
 msgid "Icon Error"
 msgstr "আইকন ত্রুটি"
 
 msgid "Could not set icon"
-msgstr "আইকন নির্ধারণ করা হয়নি"
+msgstr "আইকন নির্ধারণ করা যায়নি"
 
 #, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "'%1s' ফাইলটি খুলতে ব্যর্থ: %2s"
+msgstr "'%1$s' ফাইলটি খুলতে ব্যর্থ: %2$s"
 
 # tithi
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"'%s' চিত্রটি লোড করতে ব্যর্থ হয়েছে। কারণ জানা নেই, সম্ভবত একটি নষ্ট চিত্রের ফাইল"
+"'%s' চিত্রটি লোড করতে ব্যর্থ হয়েছে। কারণ জানা নেই, সম্ভবত চিত্রের ফাইলটি বিকৃত"
+
+msgid "_Open Link"
+msgstr "লিংক খোলা হবে (_O)"
+
+msgid "_Copy Link Location"
+msgstr "লিংকের অবস্থান অনুলিপি (_C)"
+
+msgid "_Copy Email Address"
+msgstr "ইমেইল ঠিকানা অনুলিপি (_C)"
+
+msgid "_Open File"
+msgstr "ফাইল খুলুন... (_O)"
+
+msgid "Open _Containing Directory"
+msgstr "ধারণকারী ডিরেক্টরি খুলুন (_C)"
 
 msgid "Save File"
-msgstr "ফাইল সংরক্ষণ করুন"
+msgstr "ফাইল সংরক্ষণ"
+
+msgid "_Play Sound"
+msgstr "শব্দ বাজানো হবে (_P)"
+
+msgid "_Save File"
+msgstr "ফাইল সংরক্ষণ (_S)"
 
 msgid "Select color"
-msgstr "রং নির্বাচন করুন"
+msgstr "রং নির্বাচন"
 
 msgid "_Alias"
 msgstr "উপনাম (_A)"
 
 msgid "Close _tabs"
-msgstr "ট্যাবসমূহ বন্ধ করুন (_t)"
+msgstr "সব ট্যাব বন্ধ করা হবে (_t)"
 
 msgid "_Get Info"
-msgstr "তথ্য সংগ্রহ করুন (_G)"
+msgstr "তথ্য সংগ্রহ করা হবে (_G)"
 
 msgid "_Invite"
-msgstr "আমন্ত্রণ জানান (_I)"
+msgstr "আমন্ত্রণ (_I)"
 
 msgid "_Modify..."
-msgstr "পরিবর্তন করুন... (_M)"
+msgstr "পরিবর্তন... (_M)"
 
 msgid "_Add..."
-msgstr "যোগ করুন... (_A)"
+msgstr "যোগ... (_A)"
 
 msgid "_Open Mail"
 msgstr "মেইল খুলুন (_O)"
 
 msgid "_Edit"
-msgstr "সম্পাদনা করুন (_E)"
+msgstr "সম্পাদনা (_E)"
 
 msgid "Pidgin Tooltip"
-msgstr "পিজিন টুলের-ইঙ্গিত"
+msgstr "পিজিন টুলটিপ"
 
 # tithi
 msgid "Pidgin smileys"
-msgstr "পিজিন স্মাইলীসমূহ"
+msgstr "পিজিন স্মাইলি"
 
 # tithi
 msgid "Penguin Pimps"
-msgstr "পেঙ্গুইন পিম্পসমূহ"
+msgstr "পেঙ্গুইন পিম্প"
 
 # tithi
 msgid "Selecting this disables graphical emoticons."
-msgstr "এই নিস্ক্রিয় গ্রাফিকাল অভিব্যক্তি-আইকন নির্বাচন করছে।"
+msgstr "এটি নির্বাচন করলে গ্রাফিকাল অনুভূতিচিহ্ন নিষ্ক্রিয় হবে।"
 
 msgid "none"
-msgstr "কোনটি না"
+msgstr "কোনটি নয়"
 
+# mark50
 msgid "Small"
 msgstr "ছোট"
 
 msgid "Smaller versions of the default smilies"
-msgstr "পূর্বনির্ধারিত স্মাইলীগুলোর অপেক্ষাকৃত ছোট সংস্করণ"
+msgstr "ডিফল্ট স্মাইলিগুলোর ছোট সংস্করণ"
 
 # tithi
 msgid "Response Probability:"
-msgstr "সাড়ার সম্ভাব্যতা:"
+msgstr "প্রতিক্রিয়া দেখানোর সম্ভাবনা:"
 
 msgid "Statistics Configuration"
-msgstr "পরিসংখ্যান বিন্যাসন"
+msgstr "পরিসংখ্যান কনফিগারেশন"
 
 # tithi
 #. msg_difference spinner
 msgid "Maximum response timeout:"
-msgstr "সর্বোচ্চ সাড়ার সময়োত্তীর্ণ হয়েছে:"
+msgstr "প্রতিক্রিয়ার সময় উত্তীর্নের সর্বোচ্চ মান:"
 
 msgid "minutes"
 msgstr "মিনিট"
@@ -13984,50 +14053,111 @@ msgstr "থ্রেসহোল্ড:"
 #. *< priority
 #. *< id
 msgid "Contact Availability Prediction"
-msgstr "যোগাযোগ সহজলভ্যতার ভবিষ্যৎবাণী"
+msgstr "পরিচিত ব্যক্তির উপস্থিতির ভবিষ্যদ্বাণী"
 
 # tithi
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr "যোগাযোগ সহজলভ্যতার ভবিষ্যৎবাণীর প্লাগইন।"
+msgstr "পরিচিত ব্যক্তির উপস্থিতি ভবিষ্যদ্বাণী প্লাগইন।"
 
 # tithi
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr "আপনার বন্ধুদের সম্ভাব্যতা সম্পর্কে পরিসংখ্যান সংক্রান্ত তথ্য প্রদর্শন করে"
+msgstr "আপনার বন্ধুদের উপস্থিতি সংক্রান্ত পরিসংখ্যান প্রদর্শন করে"
+
+msgid "Server name request"
+msgstr "সার্ভার নামের অনুরোধ"
+
+msgid "Enter an XMPP Server"
+msgstr "একটি XMPP সার্ভারের ঠিকানা দিন"
+
+msgid "Select an XMPP server to query"
+msgstr "কোয়েরির জন্য একটি XMPP সার্ভার নির্বাচন করুন"
+
+msgid "Find Services"
+msgstr "সার্ভিস খুঁজুন"
+
+msgid "Add to Buddy List"
+msgstr "বন্ধু তালিকায় যোগ"
+
+msgid "Gateway"
+msgstr "গেটওয়ে"
+
+msgid "Directory"
+msgstr "ডিরেক্টরি"
+
+msgid "PubSub Collection"
+msgstr "PubSub সংগ্রহ"
+
+# tithi
+msgid "PubSub Leaf"
+msgstr "PubSub লিফ"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>বর্ণনা:</b> "
+
+# ***
+#. Create the window.
+msgid "Service Discovery"
+msgstr "সার্ভিস অনুসন্ধান"
+
+msgid "_Browse"
+msgstr "ব্রাউজ (_B)"
+
+msgid "Server does not exist"
+msgstr "সার্ভার বিদ্যমান নেই"
+
+msgid "Server does not support service discovery"
+msgstr "সার্ভার সার্ভিস অনুসন্ধান সমর্থন করে না"
+
+# ***
+msgid "XMPP Service Discovery"
+msgstr "XMPP সার্ভিস অনুসন্ধান"
+
+msgid "Allows browsing and registering services."
+msgstr "সার্ভিস ব্রাউজ এবং নিবন্ধন করা অনুমোদন করে।"
+
+# tithi
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "এই প্লাগইনটি  ট্রান্সপোর্ট অথবা XMPP সার্ভিস দ্বারা নিবন্ধন করার জন্য কার্যকর।"
 
 msgid "Buddy is idle"
-msgstr "বন্ধু অলস"
+msgstr "বন্ধু নিষ্ক্রিয়"
 
 msgid "Buddy is away"
-msgstr "বন্ধু অনুপস্থিত"
+msgstr "বন্ধু অন্যত্র"
 
 # fix me tithi
 msgid "Buddy is \"extended\" away"
-msgstr "বন্ধু অনুপস্থিত \"প্রসারিত\":"
+msgstr "বন্ধু \"অনেকক্ষন যাবত\" অন্যত্র:"
 
 #. Not used yet.
 msgid "Buddy is mobile"
-msgstr "বন্ধু মোবাইলে"
+msgstr "বন্ধু ভ্রাম্যমান"
 
 msgid "Buddy is offline"
 msgstr "বন্ধু অফলাইনে"
 
 msgid "Point values to use when..."
-msgstr "ব্যবহার করতে মানসমূহ নির্দেশ করুন যখন..."
+msgstr "মানসমূহ নির্দেশ করা হবে যখন..."
 
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
-msgstr ""
-"<i>largest score</i> সম্বলিত বন্ধু হলো এমন বন্ধু যার যোগাযোগে অগ্রাধিকার থাকবে।\n"
+msgstr "<i>সর্বোচ্চ স্কোর</i> সম্বলিত বন্ধুটি পরিচিতিতে অগ্রাধিকার পাবে।\n"
 
 msgid "Use last buddy when scores are equal"
-msgstr "স্কোর সমান হলে শেষ বন্ধুকে ব্যবহার করুন"
+msgstr "স্কোর সমান হলে সর্বশেষ বন্ধুকে ব্যবহার করা হবে"
 
 msgid "Point values to use for account..."
-msgstr "একাউন্ট ব্যবহারের জন্য মানসমূহ নির্দেশ করুন..."
+msgstr "একাউন্টে ব্যবহারের জন্য মান নির্দেশ করা হবে..."
 
 #. *< type
 #. *< ui_requirement
@@ -14036,43 +14166,43 @@ msgstr "একাউন্ট ব্যবহারের জন্য মান
 #. *< priority
 #. *< id
 msgid "Contact Priority"
-msgstr "যোগাযোগের অগ্রাধিকার"
+msgstr "পরিচিতির অগ্রাধিকার"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid ""
 "Allows for controlling the values associated with different buddy states."
-msgstr "বিভিন্ন বন্ধুর রাজ্যের সাথে সম্পর্কিত মানসমূহ নিয়ন্ত্রণ করার জন্য অনুমতি দেয়।"
+msgstr "বন্ধুর বিভিন্ন অবস্থার সাথে সম্পর্কিত মানসমূহ নিয়ন্ত্রণ করতে দেয়।"
 
 #. *< description
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"যোগাযোগের অগ্রাধিকার নির্ণয়ে বন্ধুদের জন্য অলস/অনুপস্থিত/অফলাইন অবস্থার বিন্দু মানসমূহ "
-"পরিবর্তন করার জন্য অনুমোদন করে।"
+"পরিচিতির অগ্রাধিকার নির্ণয়ে বন্ধুদের নিষ্ক্রিয়/অন্যত্র/অফলাইন অবস্থার মানসমূহ পরিবর্তন "
+"করতে অনুমোদন করে।"
 
 msgid "Conversation Colors"
-msgstr "কথোপকথন রংসমূহ"
+msgstr "কথোপকথনের রং"
 
 msgid "Customize colors in the conversation window"
-msgstr "কথোপকথন উইন্ডোটির রং পছন্দসই বিন্যাস করুন"
+msgstr "কথোপকথন উইন্ডোর রং স্বনির্বাচন করা হবে"
 
 msgid "Error Messages"
-msgstr "ত্রুটি বার্তাসমূহ"
+msgstr "ত্রুটি বার্তা"
 
 msgid "Highlighted Messages"
-msgstr "প্রনির্দেশিত বার্তাসমূহ"
+msgstr "হাইলাইট করা বার্তা"
 
 msgid "System Messages"
-msgstr "সিস্টেম বার্তাসমূহ"
+msgstr "সিস্টেম বার্তা"
 
 msgid "Sent Messages"
-msgstr "প্রেরিত বার্তাসমূহ"
+msgstr "প্রেরিত বার্তা"
 
 msgid "Received Messages"
-msgstr "গৃহীত বার্তাসমূহ"
+msgstr "গৃহীত বার্তা"
 
 #, c-format
 msgid "Select Color for %s"
@@ -14080,20 +14210,20 @@ msgstr "%s এর জন্য রং নির্বাচন করুন"
 
 # tithi
 msgid "Ignore incoming format"
-msgstr "আগত বিন্যাস উপেক্ষা করুন"
+msgstr "আগত বিন্যাস উপেক্ষা করা হবে"
 
 msgid "Apply in Chats"
-msgstr "আড্ডায় প্রয়োগ করুন"
+msgstr "আড্ডায় প্রয়োগ করা হবে"
 
 # tithi
 msgid "Apply in IMs"
-msgstr "আইএম গুলোতে প্রয়োগ করুন"
+msgstr "IM গুলোতে প্রয়োগ করা হবে"
 
 msgid "By conversation count"
-msgstr "কথোপকথন গণনা অনুসারে"
+msgstr "মোট কথোপকথন অনুসারে"
 
 msgid "Conversation Placement"
-msgstr "কথোপকথন অবস্থিতিকরণ"
+msgstr "কথোপকথনের অবস্থান বিন্যাস"
 
 # fix-me tithi
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
@@ -14101,14 +14231,14 @@ msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
-"নোট: \"নতুন কথোপকথনসমূহের\" প্রাধিকার অবশ্যই \"কথোপকথন গণনার ভিত্তিতে\" নির্ধারিত "
-"হবে।"
+"নোট: \"নতুন কথোপকথন\" এর প্রাধিকার অবশ্যই \"মোট কথোপকথনের ভিত্তিতে\" নির্ধারণ "
+"করতে হবে।"
 
 msgid "Number of conversations per window"
 msgstr "প্রতি উইন্ডোতে কথোপকথনের সংখ্যা"
 
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "সংখ্যা অনুসারে সাজানোর সময় আইএম ও আড্ডার উইন্ডোগুলো আলাদা করুন"
+msgstr "সংখ্যা অনুসারে সাজানোর সময় IM এবং আড্ডার উইন্ডোগুলো আলাদা করা হবে"
 
 #. *< type
 #. *< ui_requirement
@@ -14122,19 +14252,18 @@ msgstr "ExtPlacement"
 #. *< name
 #. *< version
 msgid "Extra conversation placement options."
-msgstr "অতিরিক্ত কথোপকথন অবস্থিতিকরণ পছন্দসমূহ।"
+msgstr "অতিরিক্ত কথোপকথন অবস্থান বিন্যাস।"
 
 #. *< summary
 #. *  description
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
-msgstr ""
-"আইএম এবং আড্ডা ঐচ্ছিকভাবে আলাদা করে, প্রতিটি উইন্ডোর কথোপকথন সংখ্যা সীমিত করুন।"
+msgstr "প্রতি উইন্ডোর কথোপকথন সংখ্যা সীমিত করা হবে, IM এবং আড্ডা আলাদা করা ঐচ্ছিক।"
 
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
-msgstr "মাউসের ভঙ্গিমা বিন্যাসন করুন"
+msgstr "মাউসের ভঙ্গিমা কনফিগারেশন"
 
 msgid "Middle mouse button"
 msgstr "মাউসের মাঝের বোতাম"
@@ -14146,7 +14275,7 @@ msgstr "মাউসের ডান বোতাম"
 # দৃশ্যমান ভঙ্গিমা প্রদর্শন (_দ)
 #. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
-msgstr "ঐক্ষিক ভঙ্গিমার প্রদর্শন (_V)"
+msgstr "দৃশ্যমান ভঙ্গিমা প্রদর্শন (_V)"
 
 #. *< type
 #. *< ui_requirement
@@ -14161,7 +14290,7 @@ msgstr "মাউসের ভঙ্গিমা"
 #. *< version
 #. *  summary
 msgid "Provides support for mouse gestures"
-msgstr "মাউসের ভঙ্গিমাকে সমর্থন দেয়"
+msgstr "মাউসের ভঙ্গিমা সমর্থন দেয়"
 
 #. *  description
 msgid ""
@@ -14171,23 +14300,24 @@ msgid ""
 " • Drag up and then to the left to switch to the previous conversation.\n"
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"কথোপকথন উইন্ডোতে মাউস ভঙ্গিমার জন্য সহায়তা অনুমোদন করে। মাউসের মাঝের বোতামটি "
-"চেপে বিভিন্ন কার্য সম্পাদনা করুন:\n"
+"কথোপকথন উইন্ডোতে মাউস ভঙ্গিমা ব্যবহারের সমর্থন দেয়। মাউসের মাঝের বোতামটি চেপে "
+"বিভিন্ন কাজ সম্পাদন করুন:\n"
 "\n"
-"•একটি কথোপকথন বন্ধ করতে নিচে টানুন এবং তারপর ডানে টানুন।\n"
+"•একটি কথোপকথন বন্ধ করতে নিচে এবং তারপর ডানে টানুন।\n"
 "•পূর্ববর্তী কথোপকথনে পরিবর্তন করতে উপরে টানুন এবং তারপর বামে টানুন।\n"
 "•পরবর্তী কথোপকথন পরিবর্তন করতে উপরে টানুন এবং তারপর ডানে টানুন।"
 
 msgid "Instant Messaging"
-msgstr "তাৎক্ষণিক বার্তাব্যবস্থা"
+msgstr "তাৎক্ষণিক বার্তা ব্যবস্থা"
 
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
-"নিম্নোক্ত ঠিকানার বই থেকে একজন ব্যক্তিকে নির্বাচন করুন, বা একজন নতুন ব্যক্তি যোগ করুন।"
+"নিম্নোক্ত ঠিকানার বই থেকে একজন ব্যক্তিকে নির্বাচন করুন, অথবা একজন নতুন ব্যক্তি যোগ "
+"করুন।"
 
 msgid "Group:"
-msgstr "গ্রুপ:"
+msgstr "দল:"
 
 #. "New Person" button
 msgid "New Person"
@@ -14195,15 +14325,15 @@ msgstr "নতুন ব্যক্তি"
 
 #. "Select Buddy" button
 msgid "Select Buddy"
-msgstr "বন্ধু নির্বাচন করুন"
+msgstr "বন্ধু নির্বাচন"
 
 #. Add the label.
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr ""
-"এই বন্ধুটি যোগ করতে আপনার ঠিকানার বই থেকে একজন ব্যক্তি নির্বাচন করুন, বা নতুন ব্যক্তি "
-"তৈরি করুন।"
+"এই বন্ধুটি যোগ করতে আপনার ঠিকানার বই থেকে একজন ব্যক্তি নির্বাচন করুন, অথবা নতুন "
+"ব্যক্তির ঠিকানা তৈরি করুন।"
 
 #. Add the expander
 msgid "User _details"
@@ -14214,28 +14344,28 @@ msgid "_Associate Buddy"
 msgstr "সম্পৃক্ত বন্ধু (_A)"
 
 msgid "Unable to send email"
-msgstr "ই-মেইল পাঠাতে ব্যর্থ"
+msgstr "ইমেইল পাঠাতে ব্যর্থ"
 
 msgid "The evolution executable was not found in the PATH."
-msgstr "পথ-এর মধ্যে কার্যকরযোগ্য বিবর্তন খুঁজে পাওয়া যায়নি।"
+msgstr "PATH এ evolution এক্সিকিউটেবলটি  খুঁজে পাওয়া যায়নি।"
 
 # tithi
 msgid "An email address was not found for this buddy."
-msgstr "এই বন্ধুটির জন্য একটি ই-মেইল ঠিকানা খুঁজে পাওয়া যায়নি।"
+msgstr "এই বন্ধুটির কোন ইমেইল ঠিকানা খুঁজে পাওয়া যায়নি।"
 
 msgid "Add to Address Book"
-msgstr "ঠিকানার বইয়ে যোগ করুন"
+msgstr "ঠিকানার বইয়ে যোগ করা হবে"
 
 msgid "Send Email"
-msgstr "ই-মেইল পাঠান"
+msgstr "ইমেইল পাঠানো হবে"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
-msgstr "বিবর্তন একত্রিকরণ বিন্যাসন"
+msgstr "Evolution একত্রিকরণ কনফিগারেশন"
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "স্বয়ংক্রিয়ভাবে সব একাউন্টগুলো নির্বাচন করুন যাতে বন্ধুরা স্বয়ং-যুক্ত হবে।"
+msgstr "সব একাউন্টগুলো নির্বাচন করুন যাতে বন্ধুরা স্বয়ংক্রিয়ভাবে যুক্ত হবে।"
 
 #. *< type
 #. *< ui_requirement
@@ -14244,20 +14374,20 @@ msgstr "স্বয়ংক্রিয়ভাবে সব একাউন�
 #. *< priority
 #. *< id
 msgid "Evolution Integration"
-msgstr "বিবর্তন একত্রিকরণ"
+msgstr "Evolution সংযোজন"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides integration with Evolution."
-msgstr "বিবর্তনের সঙ্গে একত্রিকরণ প্রদান করে।"
+msgstr "Evolution এর সঙ্গে সংযোজন প্রদান করে।"
 
 msgid "Please enter the person's information below."
-msgstr "অনুগ্রহ করে ব্যক্তির তথ্যাদি নিচে প্রবেশ করান।"
+msgstr "অনুগ্রহ করে নিম্নে ব্যক্তির তথ্য দিন।"
 
 msgid "Please enter the buddy's username and account type below."
-msgstr "অনুগ্রহ করে বন্ধুর ব্যবহারকারী নাম ও একাউন্টের ধরণ নিচে প্রবেশ করান।"
+msgstr "অনুগ্রহ করে নিম্নে বন্ধুর ব্যবহারকারী নাম ও একাউন্টের ধরণ দিন।"
 
 msgid "Account type:"
 msgstr "একাউন্টের ধরণ:"
@@ -14283,14 +14413,14 @@ msgstr "ইমেইল:"
 #. *< priority
 #. *< id
 msgid "GTK Signals Test"
-msgstr "GTK সঙ্কেতের পরীক্ষা"
+msgstr "GTK সিগন্যাল পরীক্ষা"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all ui signals are working properly."
-msgstr "সব ইউআই সঙ্কেত সঠিকভাবে কাজ করছে কিনা তা দেখার জন্য পরীক্ষা করুন।"
+msgstr "সব UI সঙ্কেত সঠিকভাবে কাজ করছে কিনা তা পরীক্ষা করা হবে।"
 
 #, c-format
 msgid ""
@@ -14310,14 +14440,14 @@ msgstr "ইতিহাস"
 #. *< priority
 #. *< id
 msgid "Iconify on Away"
-msgstr "অনুপস্থিত হলে আইকন দ্বারা চিহ্নিত করুন"
+msgstr "অন্যত্র হলে আইকন দ্বারা চিহ্নিত করা হবে"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "আপনার অনুপস্থিতিতে বন্ধু তালিকা ও আপনার কথোপকথন আইকন দ্বারা চিহ্নিত করুন।"
+msgstr "আপনি অন্যত্র হলে বন্ধু তালিকা ও আপনার কথোপকথন আইকন দ্বারা চিহ্নিত করা হবে।"
 
 msgid "Mail Checker"
 msgstr "মেইল পরীক্ষক"
@@ -14326,25 +14456,25 @@ msgid "Checks for new local mail."
 msgstr "নতুন স্থানীয় মেইলের জন্য পরীক্ষা করে।"
 
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "বন্ধু তালিকার একটি ছোট বাক্স যুক্ত করে যা আপনার নতুন মেইল এলে প্রদর্শন করে।"
+msgstr "বন্ধু তালিকায় একটি ছোট বাক্স যুক্ত করে যা আপনার নতুন মেইল এলে প্রদর্শন করে।"
 
 msgid "Markerline"
-msgstr "চিহ্নিতকারীর-রেখা"
+msgstr "চিহ্নিতকরণ রেখা"
 
 # tithi
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "কথোপকথনে নতুন বার্তাগুলো নির্দেশ করতে একটি লাইন আঁকুন।"
+msgstr "কথোপকথনে নতুন বার্তা নির্দেশ করতে একটি লাইন আঁকা হবে।"
 
 # fix me tithi
 msgid "Jump to markerline"
-msgstr "চিহ্নিতকারীর-রেখায় গমন করুন"
+msgstr "চিহ্নিতকরণ রেখায় যাওয়া হবে"
 
 # tithi
 msgid "Draw Markerline in "
-msgstr "চিহ্নিতকারীর-রেখা আঁকুন"
+msgstr "চিহ্নিতকরণ রেখা আঁকা হবে"
 
 msgid "_IM windows"
-msgstr "আইএম উইন্ডোজ (_I)"
+msgstr "IM উইন্ডো (_I)"
 
 msgid "C_hat windows"
 msgstr "আড্ডার উইন্ডো (_h)"
@@ -14354,37 +14484,37 @@ msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
-"একটি সংগীত বার্তাকরণ অধিবেশনের জন্য অনুরোধ করা হয়েছে। অনুগ্রহ করে গ্রহণ করতে MM "
-"আইকনটি ক্লিক করুন।"
+"একটি গানের বার্তার সেশন অনুরোধ করা হয়েছে। অনুগ্রহ করে MM আইকনটি ক্লিক করে গ্রহণ "
+"করুন।"
 
 # fix me
 msgid "Music messaging session confirmed."
-msgstr "সংগীত বার্তাকরণ অধিবেশন নিশ্চিত।"
+msgstr "গানের বার্তার সেশন নিশ্চিত।"
 
 # fix me
 msgid "Music Messaging"
-msgstr "সংগীত বার্তাকরণ"
+msgstr "গানের বার্তা"
 
 # tithi
 msgid "There was a conflict in running the command:"
-msgstr "নির্দেশ চালাতে একটি দ্বন্দ্ব ছিল:"
+msgstr "কমান্ড চালাতে একটি দ্বন্দ্ব হয়েছে:"
 
 msgid "Error Running Editor"
 msgstr "সম্পাদক চালাতে ত্রুটি"
 
 msgid "The following error has occurred:"
-msgstr "নিম্নোক্ত ত্রুটি সংঘটিত হয়েছে:"
+msgstr "নিম্নোক্ত ত্রুটি হয়েছে:"
 
 #. Configuration frame
 msgid "Music Messaging Configuration"
-msgstr "সংগীত বার্তাকরণ বিন্যাসন"
+msgstr "গানের বার্তা কনফিগারেশন"
 
 # tithifix me
 msgid "Score Editor Path"
-msgstr "সম্পাদক পাথ স্কোর"
+msgstr "স্কোর সম্পাদকের পাথ "
 
 msgid "_Apply"
-msgstr "প্রয়োগ করুন (_A)"
+msgstr "প্রয়োগ (_A)"
 
 # tithi
 #. *< type
@@ -14396,56 +14526,54 @@ msgstr "প্রয়োগ করুন (_A)"
 #. *< name
 #. *< version
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr "সমন্নিত রচনার জন্য সংগীত বার্তাকরণ প্লাগইন করুন।"
+msgstr "সম্মিলিত রচনার জন্য গানের বার্তার প্লাগইন।"
 
 # fix me tithi
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
-"সংগীত বার্তাকরণ প্লাগইন কিছু সংখ্যক ব্যবহারকারী বাস্তব-সময়ের একটি সাধারন স্কোর "
-"সম্পাদনার মাধ্যমে যুগপৎভাবে এক খন্ড সংগীতের উপর কাজ করে।"
+"গানের বার্তার প্লাগইন কিছু সংখ্যক ব্যবহারকারীকে রিয়েল-টাইমে একটি সাধারন স্কোর "
+"সম্পাদনার মাধ্যমে একইসাথে একটি সংগীতের উপর কাজ করার অনুমোদন দেয়।"
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
-msgstr "এর জন্য প্রজ্ঞাপন"
+msgstr "বিজ্ঞপ্তি"
 
 # fix me
 msgid "\t_Only when someone says your username"
-msgstr ""
-"                        শুধুমাত্র তখন যখন কেউ একজন আপনার ব্যবহারকারীর নাম ডাকে "
-"(_O)"
+msgstr "\tশুধুমাত্র তখনই যখন কেউ আপনার ব্যবহারকারীর নাম উল্লেখ করে (_O)"
 
 msgid "_Focused windows"
 msgstr "ফোকাসকৃত উইন্ডো (_F)"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
-msgstr "প্রজ্ঞাপন পদ্ধতি"
+msgstr "ঘোষণা পদ্ধতি"
 
 msgid "Prepend _string into window title:"
-msgstr "উইন্ডোর শিরোনামে স্ট্রীং যোগ করুন (_s):"
+msgstr "উইন্ডো শিরোনামের অগ্রভাগে স্ট্রিং যোগ করা হবে (_s):"
 
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "উইন্ডোর শিরোনামে নতুন বার্তাসমূহের সংখ্যা প্রবেশ করান (_o)"
+msgstr "উইন্ডোর শিরোনামে নতুন বার্তার সংখ্যা প্রবেশ করানো হবে (_o)"
 
 # fix me
 #. Count xprop method button
 msgid "Insert count of new message into _X property"
-msgstr "X বৈশিষ্ট্যে নতুন বার্তাসমূহের সংখ্যা প্রবেশ করান (_X)"
+msgstr "X-এর বৈশিষ্ট্যে নতুন বার্তার সংখ্যা প্রবেশ করানো হবে (_X)"
 
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "উইন্ডো ব্যবস্থাপক \"জরুরী\" ইঙ্গিতে নির্দিষ্ট করুন (_U)"
+msgstr "উইন্ডো ব্যবস্থাপকের \"জরুরী\" ইঙ্গিত নির্ধারণ করা হবে (_U)"
 
 msgid "_Flash window"
-msgstr "ফ্ল্যাশ উইন্ডো (_F)"
+msgstr "উইন্ডো ঝলকানো হবে (_F)"
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr "কথোপকথন উইন্ডো বৃদ্ধি করুন (_a)"
+msgstr "কথোপকথন উইন্ডো উপরে উঠানো হবে (_a)"
 
 #. Present conversation method button
 msgid "_Present conversation window"
@@ -14453,27 +14581,27 @@ msgstr "বর্তমান কথোপকথন উইন্ডো (_P)"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
-msgstr "প্রজ্ঞাপন অপসারক"
+msgstr "ঘোষণা অপসারণ"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "কথোপকথন উইন্ডোতে ফোকাস করা হলে অপসারণ করুন (_g)"
+msgstr "কথোপকথন উইন্ডোতে ফোকাস করা হলে অপসারণ করা হবে (_g)"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr "কথোপকথন উইন্ডোতে ক্লিক করা হলে অপসারণ করুন (_r)"
+msgstr "কথোপকথন উইন্ডোতে ক্লিক করা হলে অপসারণ করা হবে (_r)"
 
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "কথোপকথন উইন্ডোতে টাইপ করার সময় অপসারণ করুন (_t)"
+msgstr "কথোপকথন উইন্ডোতে টাইপ করার সময় অপসারণ করা হবে (_t)"
 
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
-msgstr "একটি বার্তা পাঠানো হলে অপসারণ করুন (_m)"
+msgstr "একটি বার্তা পাঠানো হলে অপসারণ করা হবে (_m)"
 
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr "কথোপকথন ট্যাবে পরিবর্তনের সময় অপসারণ করুন (_b)"
+msgstr "কথোপকথন ট্যাবে পরিবর্তনের সময় অপসারণ করা হবে (_b)"
 
 #. *< type
 #. *< ui_requirement
@@ -14482,14 +14610,14 @@ msgstr "কথোপকথন ট্যাবে পরিবর্তনের
 #. *< priority
 #. *< id
 msgid "Message Notification"
-msgstr "বার্তার প্রজ্ঞাপন"
+msgstr "বার্তার ঘোষণা"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "আপনাকে অপঠিত বার্তাসমূহের বিভিন্ন ধরনের প্রজ্ঞাপন প্রদান করে।"
+msgstr "বিভিন্নভাবে অপঠিত বার্তার ঘোষণা প্রদানে সাহায্য করে "
 
 #. *< type
 #. *< ui_requirement
@@ -14498,13 +14626,13 @@ msgstr "আপনাকে অপঠিত বার্তাসমূহের
 #. *< priority
 #. *< id
 msgid "Pidgin Demonstration Plugin"
-msgstr "পিজিন কার্যপ্রণালী প্রদর্শন প্লাগইন"
+msgstr "পিজিনের কার্যপ্রণালী প্রদর্শনের প্লাগইন"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "An example plugin that does stuff - see the description."
-msgstr "একটি উদাহারণ প্লাগইন যা অনেক কিছু করে - বিবরণ দেখুন।"
+msgstr "অনেক কিছু করে এমন একটি উদাহরণ প্লাগইন - বর্ণনা দেখুন।"
 
 #. *  description
 msgid ""
@@ -14513,126 +14641,108 @@ msgid ""
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"এটা বস্তুত অসাধারণ প্লাগ-ইন যা বেশ কার্যকর:\n"
-"- আপনি লগইন করলে এটা আপনাকে জানাবে যে কে এই প্রোগ্রামটি লিখেছে\n"
-"- এটা সব আগত পাঠ উল্টে দেয়\n"
-"- আপনার তালিকাভুক্ত ব্যক্তি সাইন অন করলেই এটা তাদেরকে একটি বার্তা পাঠায়"
-
-msgid "Cursor Color"
-msgstr "কার্সারের রং"
-
-msgid "Secondary Cursor Color"
-msgstr "গৌণ কার্সারের রং"
+"এটা একটি অসাধারণ প্লাগ-ইন যা বেশ কার্যকর:\n"
+"- লগইন করলে আপনাকে জানায় যে কে এই প্রোগ্রামটি লিখেছে\n"
+"- আগত সব টেক্সট উল্টে দেয়\n"
+"- আপনার তালিকাভুক্ত ব্যক্তি লগইন করলেই তাদেরকে একটি বার্তা পাঠায়"
 
 msgid "Hyperlink Color"
-msgstr "হাইপারলিঙ্কের রং"
+msgstr "হাইপারলিংকের রং"
 
 msgid "Visited Hyperlink Color"
-msgstr "প্রনির্দেশিত হাইপারলিঙ্ক রং"
+msgstr "পরিদর্শিত হাইপারলিংক রং"
 
 msgid "Highlighted Message Name Color"
-msgstr "প্রনির্দেশিত বার্তার নামের রং"
+msgstr "হাইলাইটকৃত বার্তার নামের রং"
+
+msgid "Typing Notification Color"
+msgstr "ঘোষণা টাইপ করার ফন্টের রং"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView অনুভূমিক বিভাজন"
 
 msgid "Conversation Entry"
-msgstr "কথোপকথন এন্টি"
+msgstr "কথোপকথন ভুক্তি"
 
 msgid "Request Dialog"
-msgstr "অনুরোধ সংলাপ"
+msgstr "অনুরোধের ডায়ালগ"
 
 msgid "Notify Dialog"
-msgstr "প্রজ্ঞাপন সংলাপ"
+msgstr "বিজ্ঞাপন ডায়ালগ"
 
 msgid "Select Color"
-msgstr "রং নির্বাচন করুন"
+msgstr "রং নির্বাচন"
 
 #, c-format
 msgid "Select Interface Font"
-msgstr "ইন্টারফেসের ফন্ট নির্বাচন করুন"
+msgstr "ইন্টারফেসের ফন্ট নির্বাচন"
 
 #, c-format
 msgid "Select Font for %s"
-msgstr "%s-এর জন্য ফন্ট নির্বাচন করুন"
+msgstr "%s-এর জন্য ফন্ট নির্বাচন"
 
 msgid "GTK+ Interface Font"
 msgstr "GTK+ ইন্টারফেসের ফন্ট"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ পাঠ শর্টকাটের থীম"
+msgstr "GTK+ টেক্সট শর্টকাটের থীম"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "ইন্টারফেসের রং"
+msgid "Disable Typing Notification Text"
+msgstr "ঘোষণা টাইপ করার টেক্সট নিষ্ক্রিয় করুন"
 
-# tithi
-msgid "Widget Sizes"
-msgstr "উইজেট আকারসমূহ"
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ থীম নিয়ন্ত্রণ সেটিং"
+
+msgid "Colors"
+msgstr "রং"
 
 msgid "Fonts"
-msgstr "ফন্টসমূহ"
+msgstr "ফন্ট"
+
+msgid "Miscellaneous"
+msgstr "বিবিধ"
 
 msgid "Gtkrc File Tools"
-msgstr "Gtkrc ফাইলের টুলসমূহ"
+msgstr "Gtkrc ফাইলের টুল"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "%s%sgtkrc-২.০ এ  লিখন বিন্যাসন"
+msgstr "%s%sgtkrc-2.0 এ সেটিং লেখা হবে"
 
 msgid "Re-read gtkrc files"
-msgstr "gtkrc ফাইলগুলো পুনরায় পড়ুন"
+msgstr "gtkrc ফাইলগুলো পুনরায় পড়া হবে"
 
 msgid "Pidgin GTK+ Theme Control"
 msgstr "পিজিন GTK+ থীম নিয়ন্ত্রণ"
 
 msgid "Provides access to commonly used gtkrc settings."
-msgstr "সাধারণত ব্যবহৃত gtkrc বিন্যাসনসমূহে প্রবেশ অনুমোদন করে।"
+msgstr "সাধারণত ব্যবহৃত gtkrc বিন্যাস করতে অনুমোদন করে।"
 
 msgid "Raw"
-msgstr "নতুন"
+msgstr "অশোধিত"
 
 msgid "Lets you send raw input to text-based protocols."
-msgstr "আপনাকে পাঠ-ভিত্তিক প্রটোকলসমূহে নতুন ইনপুট পাঠাতে দেয়।"
+msgstr "আপনাকে টেক্সট-ভিত্তিক প্রোটোকলে অশোধিত ইনপুট পাঠাতে দেয়।"
 
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"আপনাকে পাঠ-ভিত্তিক প্রটোকলসমূহে (XMPP, MSN, IRC, TOC) নতুন ইনপুট পাঠাতে দেয়। "
-"পাঠাতে হলে এন্ট্রি বাক্সের 'Enter' চাপুন। ডিবাগ উইন্ডোটি পর্যবেক্ষণ করুন।"
+"আপনাকে টেক্সট-ভিত্তিক প্রোটোকলে (XMPP, MSN, IRC, TOC) অশোধিত ইনপুট পাঠাতে দেয়। "
+"পাঠাতে হলে এন্ট্রি বাক্সে 'Enter' চাপুন। ডিবাগ উইন্ডোটি পর্যবেক্ষণ করুন।"
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr "আপনি আজ %s %s এ উন্নততর করতে পারেন।"
+msgstr "আপনি আজ %s %s এ হালনাগাদ করতে পারেন।"
 
 msgid "New Version Available"
-msgstr "নতুন সংস্করণ সহজলভ্য"
+msgstr "নতুন সংস্করণ বের হয়েছে"
 
 msgid "Later"
 msgstr "পরবর্তীতে"
 
 msgid "Download Now"
-msgstr "এখন ডাউনলোড করুন"
+msgstr "এখন ডাউনলোড করা হবে"
 
 #. *< type
 #. *< ui_requirement
@@ -14641,21 +14751,21 @@ msgstr "এখন ডাউনলোড করুন"
 #. *< priority
 #. *< id
 msgid "Release Notification"
-msgstr "সংস্করণ প্রজ্ঞাপন"
+msgstr "রিলিজ ঘোষণা"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Checks periodically for new releases."
-msgstr "পর্যায়ক্রমিকভাবে নতুন সংস্করণের জন্য পরীক্ষা করুন।"
+msgstr "নির্দিষ্ট সময়সীমা পর পর নতুন সংস্করণের জন্য পরীক্ষা করে।"
 
 #. *  description
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"পর্যায়ক্রমিকভাবে নতুন সংস্করণের জন্য পরীক্ষা করুন এবং ChangeLog দ্বারা ব্যাবহারকারীকে "
-"অবগত করুন।"
+"নির্দিষ্ট সময়সীমা পর পর নতুন সংস্করণের জন্য পরীক্ষা করে এবং ChangeLog দ্বারা "
+"ব্যাবহারকারীকে অবগত করে।"
 
 #. *< major version
 #. *< minor version
@@ -14666,7 +14776,7 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Send Button"
-msgstr "পাঠানোর বোতাম"
+msgstr "প্রেরণ বোতাম"
 
 #. *< name
 #. *< version
@@ -14676,22 +14786,22 @@ msgstr "কথোপকথন উইন্ডোর প্রেরণ বোত
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
-"কথোপকথন উইন্ডোর এন্ট্রি এলাকায় একটি প্রেরণ বোতাম যোগ করুন। যখন কোনো কীবোর্ড বর্তমান "
-"নেই এমন উদ্দেশ্যে।"
+"কথোপকথন উইন্ডোর এন্ট্রি এলাকায় একটি প্রেরণ বোতাম যোগ করুন। যখন কোনো কীবোর্ড থাকেনা "
+"এমন পরিস্থিতিতে ব্যবহারের উদ্দেশ্যে।"
 
 msgid "Duplicate Correction"
-msgstr "অনুরূপ সংশোধন"
+msgstr "সাদৃশ্য সংশোধন"
 
 msgid "The specified word already exists in the correction list."
-msgstr "উল্লেখিত শব্দটি ইতোমধ্যে সংশোধন তালিকায় বিদ্যমান।"
+msgstr "উল্লেখিত শব্দটি ইতিমধ্যে সংশোধন তালিকায় বিদ্যমান।"
 
 msgid "Text Replacements"
-msgstr "পাঠ প্রতিস্থাপন"
+msgstr "টেক্সট প্রতিস্থাপন"
 
 msgid "You type"
-msgstr "আপনি টাইপ করুন"
+msgstr "আপনি টাইপ করেন"
 
 msgid "You send"
 msgstr "আপনি পাঠান"
@@ -14701,13 +14811,13 @@ msgstr "শুধুমাত্র পূর্ণ শব্দ"
 
 # tithi
 msgid "Case sensitive"
-msgstr "কেস সংবেদনশীল"
+msgstr "ছাঁদ সংবেদনশীল"
 
 msgid "Add a new text replacement"
-msgstr "নতুন পাঠ প্রতিস্থাপন যোগ করুন"
+msgstr "নতুন টেক্সট প্রতিস্থাপন যোগ করা হবে"
 
 msgid "You _type:"
-msgstr "আপনি টাইপ করুন (_t):"
+msgstr "আপনি টাইপ করেন (_t):"
 
 msgid "You _send:"
 msgstr "আপনি পাঠান (_s):"
@@ -14715,23 +14825,116 @@ msgstr "আপনি পাঠান (_s):"
 # tithi
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "যথাযথ কেস সমন্বয় (স্বয়ংক্রিয় কেস পরিচালনার জন্য অপরীক্ষীত রাখুন) (_E)"
+msgstr ""
+"অক্ষরের ছাঁদের হুবহু মিল (অক্ষরের ছাঁদের স্বয়ংক্রিয়ভাবে ব্যবস্থাপনার জন্য টিক চিহ্ন তুলে "
+"দিন) (_E)"
 
 msgid "Only replace _whole words"
-msgstr "শুধুমাত্র পূর্ণ শব্দ প্রতিস্থাপন করুন (_w)"
+msgstr "শুধুমাত্র পূর্ণ শব্দ প্রতিস্থাপন করা হবে (_w)"
 
 msgid "General Text Replacement Options"
-msgstr "সাধারণ পাঠ প্রতিস্থাপন পছন্দসমূহ"
+msgstr "সাধারণ টেক্সট প্রতিস্থাপন অপশন"
 
 # tithi
 msgid "Enable replacement of last word on send"
-msgstr "পাঠানোর সময় শেষ শব্দের প্রতিস্থাপন সক্রিয় করুন"
+msgstr "পাঠানোর সময় শেষ শব্দের প্রতিস্থাপন সক্রিয় করা হবে"
 
 msgid "Text replacement"
-msgstr "পাঠ প্রতিস্থাপন"
+msgstr "টেক্সট প্রতিস্থাপন করা হবে"
 
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "ব্যবহারকারী-সুনির্দিষ্ট নীতি অনুযায়ী বহির্গমন বার্তাসমুহে পাঠ প্রতিস্থাপন করে।"
+msgstr "ব্যবহারকারী নির্দিষ্ট নীতি অনুযায়ী বহির্গমন বার্তায় টেক্সট প্রতিস্থাপন করে।"
+
+msgid "Just logged in"
+msgstr "এইমাত্র লগইন করেছে"
+
+msgid "Just logged out"
+msgstr "এইমাত্র লগআউট হয়েছে"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"পরিচিতির আইকন/\n"
+"অপরিচিত ব্যক্তির আইকন"
+
+msgid "Icon for Chat"
+msgstr "আড্ডার আইকন"
+
+msgid "Ignored"
+msgstr "অগ্রাহ্য করা হয়েছে"
+
+msgid "Founder"
+msgstr "প্রতিষ্ঠাতা"
+
+msgid "Operator"
+msgstr "অপারেটর"
+
+msgid "Half Operator"
+msgstr "আংশিক অপারেটর"
+
+# tithi
+msgid "Authorization dialog"
+msgstr "অনুমোদন ডায়ালগ"
+
+msgid "Error dialog"
+msgstr "ত্রুটি ডায়ালগ"
+
+msgid "Information dialog"
+msgstr "তথ্য ডায়ালগ"
+
+msgid "Mail dialog"
+msgstr "মেইল ডায়ালগ"
+
+msgid "Question dialog"
+msgstr "জিজ্ঞাসা ডায়ালগ"
+
+# tithi
+msgid "Warning dialog"
+msgstr "সতর্কবানী ডায়ালগ"
+
+msgid "What kind of dialog is this?"
+msgstr "এটি কি ধরণের ডায়ালগ?"
+
+msgid "Status Icons"
+msgstr "অবস্থা আইকন"
+
+msgid "Chatroom Emblems"
+msgstr "আড্ডার আসরের প্রতীক"
+
+msgid "Dialog Icons"
+msgstr "ডায়ালগ আইকন"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "পিজিন আইকন থীম সম্পাদক"
+
+msgid "Contact"
+msgstr "পরিচিতি"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "পিজিন বন্ধু তালিকার থীম সম্পাদক"
+
+msgid "Edit Buddylist Theme"
+msgstr "বন্ধু তালিকার থীম সম্পাদনা"
+
+msgid "Edit Icon Theme"
+msgstr "আইকন থীম সম্পাদনা"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "পিজিন থীম সম্পাদক"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "পিজিন থীম সম্পাদক।"
 
 #. *< type
 #. *< ui_requirement
@@ -14740,7 +14943,7 @@ msgstr "ব্যবহারকারী-সুনির্দিষ্ট ন�
 #. *< priority
 #. *< id
 msgid "Buddy Ticker"
-msgstr "বন্ধু চিহ্নিতকারী"
+msgstr "বন্ধু ফিতা"
 
 #. *< name
 #. *< version
@@ -14750,7 +14953,7 @@ msgid "A horizontal scrolling version of the buddy list."
 msgstr "বন্ধুতালিকার একটি অনুভূমিক স্ক্রলিং সংস্করণ।"
 
 msgid "Display Timestamps Every"
-msgstr "প্রত্যেক টাইমস্টাম্প প্রদর্শন করুন"
+msgstr "প্রতি টাইমস্ট্যাম্প প্রদর্শন "
 
 #. *< type
 #. *< ui_requirement
@@ -14766,37 +14969,37 @@ msgstr "টাইমস্ট্যাম্প"
 #. *< version
 #. *  summary
 msgid "Display iChat-style timestamps"
-msgstr "আই-আড্ডা-শৈলীর টাইমস্ট্যাম্প প্রদর্শন করুন"
+msgstr "iChat শৈলীর মতো টাইমস্ট্যাম্প প্রদর্শন করা হবে"
 
-# fix me 
+# fix me
 #. *  description
 msgid "Display iChat-style timestamps every N minutes."
-msgstr "প্রতি N মিনিট পর আই-আড্ডা-শৈলীর টাইমস্ট্যাম্প প্রদর্শন করুন।"
+msgstr "প্রতি N মিনিট পর iChat শৈলীর মত টাইমস্ট্যাম্প প্রদর্শন করা হবে।"
 
 # tithi
 msgid "Timestamp Format Options"
-msgstr "টাইমস্ট্যাম্প বিন্যাসের পছন্দসমূহ"
+msgstr "টাইমস্ট্যাম্প বিন্যাসের অপশন"
 
 # tithi
 #, c-format
 msgid "_Force 24-hour time format"
-msgstr "২৪-ঘন্টার সময় বিন্যাস নির্ধারণ করুন (_F)"
+msgstr "২৪-ঘন্টা সময় বিন্যাস আরোপিত হবে (_F)"
 
 msgid "Show dates in..."
-msgstr "এ তারিখ প্রদর্শন করুন..."
+msgstr "তারিখ প্রদর্শন..."
 
 msgid "Co_nversations:"
 msgstr "কথোপকথন (_n):"
 
 msgid "For delayed messages"
-msgstr "বিলম্বিত বার্তাসমূহের জন্য"
+msgstr "বিলম্বিত বার্তার জন্য"
 
 # tithi
 msgid "For delayed messages and in chats"
-msgstr "বিলম্বিত বার্তাসমূহের জন্য এবং আড্ডায়"
+msgstr "বিলম্বিত বার্তার জন্য এবং আড্ডায়"
 
 msgid "_Message Logs:"
-msgstr "বার্তার কার্যবিবরণী (_M):"
+msgstr "বার্তার লগ (_M):"
 
 # tithi
 #. *< type
@@ -14806,14 +15009,14 @@ msgstr "বার্তার কার্যবিবরণী (_M):"
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr "বার্তার টাইমস্ট্যাম্প বিন্যাসসমূহ"
+msgstr "বার্তার টাইমস্ট্যাম্প বিন্যাস"
 
 # tithi
 #. *< name
 #. *< version
 #. *  summary
 msgid "Customizes the message timestamp formats."
-msgstr "বার্তার টাইমস্টাম্প বিন্যাসসমূহ পছন্দসই বিন্যাস করে।"
+msgstr "বার্তার টাইমস্ট্যাম্পের বিন্যাস স্বনির্বাচন করতে সাহায্য করে।"
 
 # tithi
 #. *  description
@@ -14821,27 +15024,27 @@ msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"এই প্লাগইন ব্য়বহারকারীকে কথোপকথন এবং যুক্তকরণ বার্তার টাইমস্টাম্প বিন্যাসসমূহ পছন্দসই "
-"বিন্যাস করার অনুমতি দেয়।"
+"এই প্লাগইন ব্যবহারকারীকে কথোপকথন এবং বার্তার টাইমস্টাম্পের বিন্যাস স্বনির্বাচন করার "
+"অনুমতি দেয়।"
 
 msgid "Opacity:"
-msgstr "জড়তা:"
+msgstr "অস্বচ্ছতা:"
 
 #. IM Convo trans options
 msgid "IM Conversation Windows"
-msgstr "তাৎক্ষণিক বার্তার কথোপকথন উইন্ডোজ"
+msgstr "IM কথোপকথনের উইন্ডো"
 
 msgid "_IM window transparency"
-msgstr "তাৎক্ষণিক বার্তা উইন্ডোর স্বচ্ছতা (_I)"
+msgstr "IM উইন্ডোর স্বচ্ছতা (_I)"
 
 msgid "_Show slider bar in IM window"
-msgstr "তাৎক্ষণিক বার্তার উইন্ডোতে স্লাইডার বার প্রদর্শন করুন (_S)"
+msgstr "IM উইন্ডোতে স্লাইডার বার প্রদর্শন করা হবে (_S)"
 
 msgid "Remove IM window transparency on focus"
-msgstr "ফোকাসে আইএম উইন্ডোর স্বচ্ছতা অপসারন করুন"
+msgstr "ফোকাস করলে IM উইন্ডোর স্বচ্ছতা অপসারন করা হবে"
 
 msgid "Always on top"
-msgstr "সব সময় উপরে"
+msgstr "সবসময় উপরে"
 
 #. Buddy List trans options
 msgid "Buddy List Window"
@@ -14851,7 +15054,7 @@ msgid "_Buddy List window transparency"
 msgstr "বন্ধু তালিকা উইন্ডোর স্বচ্ছতা (_B)"
 
 msgid "Remove Buddy List window transparency on focus"
-msgstr "ফোকাসে বন্ধু তালিকার উইন্ডোর স্বচ্ছতা অপসারণ করুন"
+msgstr "ফোকাস করলে বন্ধু তালিকার উইন্ডোর স্বচ্ছতা অপসারণ করা হবে"
 
 #. *< type
 #. *< ui_requirement
@@ -14866,7 +15069,7 @@ msgstr "স্বচ্ছতা"
 #. *< version
 #. *  summary
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "বন্ধু তালিকা ও কথোপকথনের জন্য ভেরিয়েবল স্বচ্ছতা।"
+msgstr "বন্ধু তালিকা এবং কথোপকথনের পরিবর্তনশীল স্বচ্ছতা।"
 
 #. *  description
 msgid ""
@@ -14875,46 +15078,45 @@ msgid ""
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"এই প্লাগইন বন্ধু তালিকা এবং কথোপকথন উইন্ডোতে ভেরিয়েবল আলফা স্বচ্ছতা সক্রিয় করে।\n"
+"এই প্লাগইন বন্ধু তালিকা এবং কথোপকথন উইন্ডোতে পরিবর্তনশীল আলফা স্বচ্ছতা সক্রিয় করে।\n"
 "\n"
-"* নোট: এই প্লাগইন Win2000 বা অপেক্ষাকৃত প্রয়োজন।"
+"* নোট: এই প্লাগইনের জন্য Win2000 অথবা ততোধিক প্রয়োজন।"
 
 msgid "GTK+ Runtime Version"
-msgstr "GTK+ চলমান সংস্করণ"
+msgstr "GTK+ Runtime সংস্করণ"
 
 #. Autostart
 msgid "Startup"
-msgstr "সূচনা"
+msgstr "আরম্ভ"
 
 #, c-format
 msgid "_Start %s on Windows startup"
-msgstr "উইন্ডোজ শুরুর সময় %s কে চালু করুন (_S)"
+msgstr "উইন্ডোজ আরম্ভের সময় %s চালু করা হবে (_S)"
 
 msgid "_Dockable Buddy List"
 msgstr "ডকযোগ্য বন্ধু তালিকা (_D)"
 
 #. Blist On Top
 msgid "_Keep Buddy List window on top:"
-msgstr "বন্ধু তালিকার উইন্ডো উপরে রাখুন (_K):"
+msgstr "বন্ধু তালিকার উইন্ডো উপরে রাখা হবে (_K):"
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
 msgstr "শুধুমাত্র যখন ডক করে"
 
 msgid "Windows Pidgin Options"
-msgstr "উইন্ডোজের পিজিন পছন্দসমূহ"
+msgstr "উইন্ডোজ পিজিনের অপশন"
 
 msgid "Options specific to Pidgin for Windows."
-msgstr "উইন্ডোজের জন্য পিজিনে উল্লেখিত পছন্দসমূহ।"
+msgstr "উইন্ডোজ পিজিনের জন্য সুনির্দিষ্ট অপশন।"
 
 # fix me
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-"উইন্ডোজের জন্য পিজিনে উল্লেখিত পছন্দগুলো প্রদান করে , যেমন বন্ধু তালিকা দেখানো।"
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "উইন্ডোজ পিজিনের জন্য সুনির্দিষ্ট অপশন প্রদান করে, যেমন বন্ধু তালিকা ডক করা।"
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>লগ আউট হয়েছে।</font>"
+msgstr "<font color='#777777'>লগ আউট করেছে।</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -14933,38 +15135,43 @@ msgstr "<font color='#777777'>XMPP এর সাথে সংযুক্ত ন
 
 # tithi
 msgid "Insert an <iq/> stanza."
-msgstr "একটি <iq/> পংক্তি যুক্ত করুন।"
+msgstr "একটি <iq/> স্তবক প্রবেশ করান।"
 
 # tithi
 msgid "Insert a <presence/> stanza."
-msgstr "একটি <presence/> পংক্তি প্রবেশ করান।"
+msgstr "একটি <presence/> স্তবক প্রবেশ করান।"
 
 msgid "Insert a <message/> stanza."
-msgstr "একটি <message/> পংক্তি প্রবেশ করান।"
+msgstr "একটি <message/> স্তবক প্রবেশ করান।"
 
 # tithi
 #. *< name
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr "নতুন XMPP পংক্তিগুলো পাঠান এবং গ্রহণ করুন।"
+msgstr "নতুন XMPP স্তবক পাঠান এবং গ্রহণ করুন।"
 
 # tithi
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "এই প্লাগিনটি XMPP সার্ভার বা ক্লায়েন্ট ডিবাগ করার জন্য কার্যকর।"
+msgstr "এই প্লাগইনটি XMPP সার্ভার বা ক্লায়েন্ট ডিবাগ করার জন্য কার্যকর।"
 
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "MSN ঠিকানা বই পুনরূদ্ধারে ব্যর্থ হয়েছে"
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "ত্রুটিপূর্ণ BOSH সংযোগ সার্ভার"
 
-# fix me
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "আড্ডার বার্তাসমূহ গ্রহণ করলে উইন্ডো ফ্ল্যাশ দিন (_F)"
+# tithi
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "SILC কী যুগল লোড না করা সম্ভব হয়নি"
 
 # tithi
 #~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
 #~ msgstr ""
-#~ "আপনি সাময়িকভাবে বিচ্ছিন্ন থাকতে পারেন।  আপনি সূচি নির্ধারণ না করা পর্যন্ত এটি "
-#~ "ব্যবহার করতে চাইতে পারেন। হালনাগাদের জন্য %s পরীক্ষা করুন।"
+#~ "\"%3$s\" এর কারণে \"%2$s\" আসরে %1$s আপনার অধিবেশনের আমন্ত্রণ প্রত্যাখ্যান "
+#~ "করেছেন।"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "আমন্ত্রন প্রত্যাখ্যান করা হয়েছে"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "সকেট খোলা যাচ্ছে না"
diff --git a/po/bs.po b/po/bs.po
index 891cec8ac8..7669978276 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-10-27 16:55-0400\n"
 "Last-Translator: Lejla Hadialic <lejlah@gmail.com>\n"
 "Language-Team: bs <LL@li.org>\n"
@@ -32,7 +32,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -626,21 +626,6 @@ msgid "Send To"
 msgstr "Pošalji"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "Ubaci sliku"
-
-msgid "Invite"
-msgstr "Pozovi"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Unesite ime korisnika, kojeg želite pozvati, zajedno sa opcionalnom pozivnom "
-"porukom."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "Konverzacije"
 
@@ -902,6 +887,42 @@ msgid "System Log"
 msgstr "Sistemski log"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "Racunanje..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Prihvati"
+
+#, fuzzy
+msgid "Reject"
+msgstr "Ponovno postavljanje"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Bili ste na kanalu%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "Email"
 
@@ -939,6 +960,9 @@ msgstr "Spajanje"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "Pozovi"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(bez imena)"
@@ -1162,7 +1186,6 @@ msgstr "%s je otišao/la. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s hoce da vam pošalje %s (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Nepoznat alarm-dogadaj. Molimo Vas prijavite ovo!"
 
@@ -1218,7 +1241,6 @@ msgstr "_Minute prije postavljanja odsutnosti:"
 msgid "Change status to"
 msgstr "Promjena adrese na:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Konverzacije"
 
@@ -1566,7 +1588,6 @@ msgstr ""
 "Kada je otvorena nova konverzacija, ovaj plugin ubacuje zadnju konverzaciju "
 "u trenutnu konverzaciju."
 
-#, c-format
 msgid "Online"
 msgstr "Online"
 
@@ -1615,6 +1636,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 #, fuzzy
 msgid "accounts"
 msgstr "Accounti"
@@ -1718,14 +1761,6 @@ msgstr "Prihvati chat pozivnicu?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Prihvati"
-
-#, fuzzy
-msgid "Reject"
-msgstr "Ponovno postavljanje"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1815,6 +1850,8 @@ msgstr "%s prijavljen/a"
 msgid "+++ %s signed off"
 msgstr "%s odjavljen/a"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
@@ -1863,6 +1900,18 @@ msgstr "%s nije više u sobi."
 msgid "%s left the room (%s)."
 msgstr "%s nije u više u sobi (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Iniciraj konferenciju"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Unesite ime korisnika, kojeg želite pozvati, zajedno sa opcionalnom pozivnom "
+"porukom."
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "Neuspio pokušaj postavljanja cmodova za %s"
@@ -2001,7 +2050,6 @@ msgstr "Da li prihvatate transfer datoteke od %s?"
 msgid "Transfer of file %s complete"
 msgstr "Transfer datoteke %s kompletiran"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Transfer datoteke kompletiran"
 
@@ -2009,7 +2057,6 @@ msgstr "Transfer datoteke kompletiran"
 msgid "You canceled the transfer of %s"
 msgstr "Odustali ste od transfera %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Transfer datoteke je otkazan"
 
@@ -2194,11 +2241,14 @@ msgstr "<font color=\"red\"><b>Nije moguce procitati datoteku: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s<AUTO-ODGOVOR>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Greška pri kreiranju konekcije"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2613,7 +2663,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2665,7 +2715,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2694,6 +2744,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Promjeni lozinku"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2887,19 +2963,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Nije moguce kreirati novu konekciju."
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 #, fuzzy
 msgid "First name"
 msgstr "Ime:"
@@ -2937,6 +3012,11 @@ msgstr "Yahoo protokol plugin"
 msgid "Purple Person"
 msgstr "Nova osoba"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Mjesto"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2948,17 +3028,17 @@ msgstr "%s je zatvorio prozor za konverzaciju."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nije moguce poslati poruku. Poruka je preduga."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Nije u stanju otvoriti socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nije moguce kreirati socket"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Spajanje na hosta neuspješno"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Kreiranje socketa neuspješno"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Nije moguce kreirati socket"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3014,15 +3094,15 @@ msgstr "Pošalji listu prijatelja"
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "Nove lozinke se ne slažu."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Nije moguce kreirati novu konekciju."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3035,17 +3115,15 @@ msgstr "Registracija uspješna"
 msgid "Password"
 msgstr "Lozinka"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Lozinka poslana"
+msgid "Password (again)"
+msgstr "Lozinka (ponovo)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s nije trenutno logovan."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Trenutno na"
+msgid "Captcha"
+msgstr "Spasi sliku"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3107,6 +3185,18 @@ msgid "Current password"
 msgstr "Netacna lozinka."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Lozinka poslana"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s nije trenutno logovan."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Trenutno na"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Unesite vašu trenutnu lozinku i vašu novu lozinku."
 
@@ -3122,13 +3212,13 @@ msgstr "Odstrani chat iz liste prijatelja"
 msgid "Add to chat..."
 msgstr "Dodaj C_hat"
 
+#. Global
 msgid "Available"
 msgstr "Dostupan"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Odsutan"
 
@@ -3159,7 +3249,8 @@ msgstr "Neslagajuci hostovi"
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Nije moguce citanje soketa"
 
 #, fuzzy
@@ -3178,8 +3269,14 @@ msgstr "Prijatelj displej"
 msgid "Your buddy list was stored on the server."
 msgstr "Nema spašene liste prijatelja na Gadu-Gadu serveru."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Spajanje"
+
+msgid "Connection failed"
 msgstr "Konekcija neuspjela"
 
 #, fuzzy
@@ -3190,6 +3287,15 @@ msgstr "Dodaj chat"
 msgid "Chat _name:"
 msgstr "Prezime:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Nije moguce pingati server"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Spajanje"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Greška prilikom citanja"
@@ -3199,7 +3305,7 @@ msgid "This chat name is already in use"
 msgstr "Ta datoteka vec postoji"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "Diskonektovani ste sa servera."
 
 #, fuzzy
@@ -3247,6 +3353,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu pretraživacki engine"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Postavi korisnicki info..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nepoznata komanda: %s"
@@ -3263,7 +3373,7 @@ msgid "File Transfer Failed"
 msgstr "Transfer datoteke je otkazan"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin nije mogao otvoriti port za slušanje."
 
 msgid "Error displaying MOTD"
@@ -3279,8 +3389,16 @@ msgstr "Nema MOTD asociranog sa ovom konekcijom."
 msgid "MOTD for %s"
 msgstr "MOTD za %s"
 
-msgid "Server has disconnected"
-msgstr "Server je diskonektovao"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Greška pri komunikaciji sa serverom"
 
 msgid "View MOTD"
 msgstr "Pogledaj MOTD"
@@ -3291,25 +3409,24 @@ msgstr "Kanal:"
 msgid "_Password:"
 msgstr "Lozinka:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nadimci ne smiju sadržavati whitespace"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Spajanje"
-
 msgid "SSL support unavailable"
 msgstr "SSL podrška nedostupna"
 
-msgid "Couldn't create socket"
-msgstr "Kreiranje socketa neuspješno"
+msgid "Unable to connect"
+msgstr "Nije moguce se spojiti"
 
-msgid "Couldn't connect to host"
-msgstr "Spajanje na hosta neuspješno"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Nije moguce konektovanje na server."
 
-msgid "Read error"
-msgstr "Greška prilikom citanja"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Greška pri kreiranju konekcije"
 
 msgid "Users"
 msgstr "Korisnici"
@@ -3494,6 +3611,17 @@ msgid ""
 msgstr ""
 "Vaše izabrano ime je server odbacio. Vjerovatno sadrži nedozvoljena slova."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Ta datoteka vec postoji"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Nadimak"
+
 msgid "Cannot change nick"
 msgstr "Nemoguce promjeniti nadimak"
 
@@ -3738,12 +3866,13 @@ msgstr "Komanda iskljucena"
 msgid "execute"
 msgstr "Neocekivan"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
 
@@ -3762,19 +3891,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Tekstualna autentikacija"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autentikacija neuspjela"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Pogrešan odgovor od servera."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server ne koristi ni jednu metodu autentikacije"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Pogrešan upit od servera"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Greška prilikom citanja"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Nema razloga"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Nepodržana verzija"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "Nije moguce ostvariti SSL konekciju na server."
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Nije moguce ostvariti SSL konekciju na server."
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Nije moguce kreirati novu konekciju."
+
 msgid "Full Name"
 msgstr "Puno ime"
 
@@ -3842,187 +4002,9 @@ msgstr "Grad"
 msgid "Operating System"
 msgstr "Sakrij operativni sistem"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Postavi Dir informacije"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Produžena adresa"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Alias chat"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Korisnik nema informacija o direktoriju."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Komanda"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Greška pri registraciji"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Lokacija"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Obavještavanje o statusu prijatelja"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Nepodržana verzija"
-
 #, fuzzy
-msgid "Stream Initiation"
-msgstr "Orijentacija"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "Transfer datoteke"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Korisnicki modusi"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Korisnicko ogranicenje"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Mogucnosti"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Korisnicko ime"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM sa razmjenom kljuca"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Email adresa"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Postavi profil"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Korisnicko ime"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Video uživo"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Primljena poruka"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Javni kljuc babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Korisnicke opcije"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Korisnicki modusi"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Korisnicko ogranicenje"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Korisnicko ogranicenje"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian enkripcija"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Mogucnosti"
+msgid "Local Time"
+msgstr "Lokalna datoteka:"
 
 #, fuzzy
 msgid "Priority"
@@ -4031,6 +4013,14 @@ msgstr "Prioritet kontakta"
 msgid "Resource"
 msgstr "Izvor"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Neulogovan"
+
 msgid "Middle Name"
 msgstr "Srednje ime"
 
@@ -4079,7 +4069,6 @@ msgstr "Pricljivo"
 msgid "Extended Away"
 msgstr "Produžena odsutnost"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Ne smetaj"
 
@@ -4206,28 +4195,27 @@ msgstr "Odaberite konferencijski server za upit"
 msgid "Find Rooms"
 msgstr "Traži sobe"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
-msgid "Write error"
-msgstr "Greška pri pisanju"
+#, fuzzy
+msgid "No users found"
+msgstr "Neslagajuci hostovi"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Obicni tekst"
+msgid "Roles:"
+msgstr "Uloga"
 
-msgid "Read Error"
-msgstr "Greška pri citanju"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Obicni tekst"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "Nije moguce kreirati socket"
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "Pogrešan ID"
@@ -4235,6 +4223,10 @@ msgstr "Pogrešan ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Neuspjelo spajanje na server."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspješna"
@@ -4261,9 +4253,6 @@ msgstr "Registracija uspješna"
 msgid "Unregistration Failed"
 msgstr "Registracija neuspjela"
 
-msgid "Already Registered"
-msgstr "Vec registrovan/a"
-
 msgid "State"
 msgstr "Država"
 
@@ -4277,6 +4266,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Vec registrovan/a"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Registruj se"
@@ -4309,6 +4301,10 @@ msgid "Change Registration"
 msgstr "Greška pri registraciji"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Neuspjelo spajanje na server."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Greška pri mjenjanju informacija o account-u"
 
@@ -4328,9 +4324,18 @@ msgstr "Autenticiranje"
 msgid "Re-initializing Stream"
 msgstr "Ponovno inicijalizirajuci tok"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Neautorizovani"
 
+msgid "Mood"
+msgstr "Raspoloženje"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Oboje"
 
@@ -4352,12 +4357,6 @@ msgstr "Niko"
 msgid "Subscription"
 msgstr "Pretplata"
 
-msgid "Mood"
-msgstr "Raspoloženje"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "Tekst"
@@ -4405,9 +4404,6 @@ msgstr "Vaša lozinka je promjenjena."
 msgid "Error changing password"
 msgstr "Greška prilikom mjenjanja lozinke"
 
-msgid "Password (again)"
-msgstr "Lozinka (ponovo)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Promjeni lozinku"
@@ -4603,18 +4599,24 @@ msgstr "Nije moguce izbaciti korisnika %s"
 msgid "Unable to ping user %s"
 msgstr "Nije moguce banovati korisnika %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Nije moguce odsvirati zvuk, jer izabrana datoteka (%s) ne postoji."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Nije moguce odsvirati zvuk, jer izabrana datoteka (%s) ne postoji."
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Nije moguce odsvirati zvuk, jer izabrana datoteka (%s) ne postoji."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4625,9 +4627,37 @@ msgstr "ZZZZujanje! !"
 msgid "%s has buzzed you!"
 msgstr "Korisnik Vas je blokirao"
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Nije moguce poslati poruku za %s:"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
 msgstr ""
+"Nije moguce poslati datoteku korisniku %s, korisnik ne podržavanja slanje"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Nije moguce poslati datoteku korisniku %s, korisnik ne podržavanja slanje"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Registracija neuspjela"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Unesite nadimak osobe, cije informacije želite da pogledate."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "Odaberite datoteku"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Iniciraj _Chat"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriši sobu za chat."
@@ -4649,13 +4679,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [soba]:  Banuj korisnika iz sobe."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4725,6 +4755,9 @@ msgstr "Spoji sa serverom"
 msgid "File transfer proxies"
 msgstr "Port datotecnog transfera"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4765,6 +4798,14 @@ msgstr "Greška XML prevoda"
 msgid "Unknown Error in presence"
 msgstr "Postojeca nepoznata greška"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Greška pri ulaženju na chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Greška na chatu %s"
+
 msgid "Create New Room"
 msgstr "Kreiraj novu sobu"
 
@@ -4783,13 +4824,32 @@ msgstr "Konfiguriši sobu"
 msgid "_Accept Defaults"
 msgstr "Prihvati standardne postavke"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Greška pri ulaženju na chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nema razloga"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Greška na chatu %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Izbaceni ste od %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Izbaceni ste od %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Pojavila se greška tokom otvaranja datoteke."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Transfer datoteke je otkazan"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Neuspio pokušaj spašavanja slike: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4818,10 +4878,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Unesite nadimak osobe, cije informacije želite da pogledate."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "Odaberite datoteku"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "Korisnicki modusi"
 
@@ -4860,9 +4916,20 @@ msgstr "Accounti"
 msgid "Select an action"
 msgstr "Odaberite datoteku"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Nije moguce citanje datoteke %s."
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Nije moguce povratiti listu prijatelja"
+msgid "Buddy Add error"
+msgstr "Greška u listi prijatelja"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Ukucani SecurID je pogrešan."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5092,7 +5159,7 @@ msgstr "Djecji pasoš bez roditeljskog odobrenja"
 msgid "Passport account not yet verified"
 msgstr "Pasoš account nije još provjeren"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Pasoš account nije još provjeren"
 
@@ -5116,6 +5183,10 @@ msgstr "Preferirani kontakt"
 msgid "Non-IM Contacts"
 msgstr "Odstrani kontakt"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5186,6 +5257,13 @@ msgstr "Pošalji mobilnu poruku."
 msgid "Page"
 msgstr "Strana"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Upozori"
+
 msgid "Has you"
 msgstr "Da li Vi"
 
@@ -5229,6 +5307,14 @@ msgid "Album"
 msgstr ""
 
 #, fuzzy
+msgid "Game Title"
+msgstr "Titula"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Titula"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "Postavi prijateljsko ime"
 
@@ -5270,9 +5356,6 @@ msgstr ""
 "SSL podrška je potrebna za MSN. Instalirajte podržanu SSL biblioteku. "
 "Pogledajte http://Pidgin.sf.net/faq-ssl.php za više informacija."
 
-msgid "Failed to connect to server."
-msgstr "Neuspjelo spajanje na server."
-
 msgid "Error retrieving profile"
 msgstr "Greška pri povratu profila"
 
@@ -5444,11 +5527,12 @@ msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Pidgin nije mogao pronaci ni jednu informaciju u korisnickom profilu. Korisnik "
-"vjerovatno ne postoji."
+"Pidgin nije mogao pronaci ni jednu informaciju u korisnickom profilu. "
+"Korisnik vjerovatno ne postoji."
 
-msgid "Profile URL"
-msgstr "Profil URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "Nije dozvoljeno kada je offline"
 
 #. *< type
 #. *< ui_requirement
@@ -5486,67 +5570,29 @@ msgstr "Neuspjela normalna autentikacija!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Neuspjela normalna autentikacija!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s nije validna grupa."
-
-msgid "Unknown error."
-msgstr "Nepoznata greška."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s hoce da vam pošalje datoteku"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Nepoznata greška"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Nije moguce banovati korisnika %s"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Nepoznata greška"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nije moguce dodati korisnika na %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nije moguce blokirati korisnika na %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nije moguce dozvoliti korisnika na %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nije mogao biti dodan, jer je Vaša lista prijatelja puna."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nije validan pasoš account."
-
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Servis trenutno nedostupan"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Poruka nije mogla biti poslana, jer je korisnik offline:"
 
-msgid "Unable to rename group"
-msgstr "Nije moguce preimenovati grupu"
-
-msgid "Unable to delete group"
-msgstr "Nije moguce izbrisati grupu"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5592,9 +5638,6 @@ msgstr "Poruka možda nije poslana, jer se pojavila nepoznata greška:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Poruka možda nije poslana, jer se pojavila nepoznata greška:"
 
-msgid "Unable to connect"
-msgstr "Nije moguce se spojiti"
-
 msgid "Writing error"
 msgstr "Greška pri pisanju"
 
@@ -5609,19 +5652,23 @@ msgstr ""
 "Konekcijska greška sa %s servera (%s):\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Naš protokol nije podržan od servera."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Greška parsanja HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Prijavili ste se sa druge lokacije."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN serveri su trenutno nedostupni. Sacekajte i pokušajte kasnije."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN serveri su privremeno ugašeni."
 
 #, c-format
@@ -5652,6 +5699,14 @@ msgstr "Slanje cookie"
 msgid "Retrieving buddy list"
 msgstr "Povrat liste prijatelja"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Udaljen od kompjutera"
 
@@ -5691,14 +5746,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Poruka možda nije poslana, jer se pojavila nepoznata greška:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Korisnik %s želi da doda %s na svoju listu prijatelja."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "Korisnik %s želi da doda %s na svoju listu prijatelja."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Dodaj u adresar"
@@ -5707,13 +5754,6 @@ msgstr "Dodaj u adresar"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Da li želite da dodate ovog prijatelja na Vašu listu prijatelja?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, fuzzy, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Nije moguce citanje datoteke %s."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "Ukucani SecurID je pogrešan."
@@ -5721,6 +5761,9 @@ msgstr "Ukucani SecurID je pogrešan."
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "Profil URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5735,18 +5778,64 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "AIM/ICQ protokol plugin"
 
-msgid "Missing Cipher"
-msgstr ""
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s nije validna grupa."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "Nepoznata greška."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nije moguce dodati korisnika na %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nije moguce blokirati korisnika na %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nije moguce dozvoliti korisnika na %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nije mogao biti dodan, jer je Vaša lista prijatelja puna."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nije validan pasoš account."
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Servis trenutno nedostupan"
+
+msgid "Unable to rename group"
+msgstr "Nije moguce preimenovati grupu"
+
+msgid "Unable to delete group"
+msgstr "Nije moguce izbrisati grupu"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Korisnik %s želi da doda %s na svoju listu prijatelja."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Korisnik %s želi da doda %s na svoju listu prijatelja."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "Korisnicke sobe"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "Citanje podataka"
 
@@ -5757,13 +5846,23 @@ msgstr "Pogrešan upit od servera"
 msgid "Logging in"
 msgstr "Prijavljivanje"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "Nije postavljen nadimak."
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "Greška pri komunikaciji sa serverom"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Nova poruka o odsutnosti"
@@ -5784,21 +5883,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "Nije postavljen nadimak."
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_IM prozori"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connected"
-msgstr "Spajanje"
+msgid "Add contacts from server"
+msgstr "Pogrešan odgovor od servera."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5806,16 +5906,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Netacan nadimak ili lozinka."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "Finaliziranje konekcije"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Neuspjeh prilikom pridruživanja prijatelju na chat-u"
 
@@ -5826,14 +5933,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr "Switchboard neuspjeh"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "Korisnicke sobe"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Neuspjeh prilikom pridruživanja prijatelju na chat-u"
@@ -5845,39 +5944,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "Switchboard neuspjeh"
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "Finaliziranje konekcije"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Popunjen red cekanja"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Nije moguce parsati poruku"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Spajanje na hosta neuspješno"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "_IM prozori"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "Pogrešan odgovor od servera."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5925,9 +6001,6 @@ msgstr "Veca velicina fonta"
 msgid "User"
 msgstr "Korisnici"
 
-msgid "Profile"
-msgstr "Profil"
-
 #, fuzzy
 msgid "Headline"
 msgstr "Odbiti"
@@ -5943,15 +6016,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "Zatvori konverzaciju"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "Nije postavljen nadimak."
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5964,6 +6032,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "Ova tema nema dostupnih smiley-ja."
@@ -5972,6 +6043,14 @@ msgstr "Ova tema nema dostupnih smiley-ja."
 msgid "Please try another username:"
 msgstr "Molim Vas unesite novo ime za izabranu grupu."
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "Nije postavljen nadimak."
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6169,10 +6248,6 @@ msgid "Master archive is misconfigured"
 msgstr "Glavna arhiva je loše konfigurisana"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Netacan nadimak ili lozinka."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nije moguce prepoznati hosta korisnickog imena, koje ste unijeli"
 
@@ -6214,9 +6289,9 @@ msgstr "Korisnik je ili offline ili ste blokirani"
 msgid "Unknown error: 0x%X"
 msgstr "Nepoznata greška: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Neuspio login (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Nije moguce banovati korisnika %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6322,9 +6397,6 @@ msgstr "GroupWise konferencija %d"
 msgid "Authenticating..."
 msgstr "Autenticiranje..."
 
-msgid "Unable to connect to server."
-msgstr "Nije moguce konektovanje na server."
-
 msgid "Waiting for response..."
 msgstr "Cekanje na odgovor..."
 
@@ -6348,26 +6420,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Da li biste željeli da se pridružite konverzaciji?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Upravo ste izlogovani, jer ste se ulogovali na drugoj radnoj stanici."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s izgleda da je offline i nije primio/la poruku, koju ste upravo poslali."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Nije moguce spajanje na server. Unesite adresu servera, na koji želite da se "
 "spojite."
 
-msgid "Error. SSL support is not installed."
-msgstr "Greška. SSL podrška nije instalirana."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ova konferencija je zatvorena. Poruke više ne mogu biti poslane."
 
@@ -6391,6 +6457,25 @@ msgid "Server port"
 msgstr "Port servera"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Pogrešan odgovor od servera."
+
+#. username connecting too frequently
+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 ""
+"Previše cesto ste uspostavljali i prekidali vezu. Pricekajte deset minuta i "
+"pokušajte ponovo. Ako nastavite pokušavati, moracete sacekati još duže."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Greška pri kreiranju konekcije"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Nemoguce spajanje"
 
@@ -6399,17 +6484,7 @@ msgid "Invalid chat room name"
 msgstr "Pogrešno ime sobe"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Greška pri kreiranju konekcije"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Greška pri komunikaciji sa serverom"
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Nije moguce ostvariti SSL konekciju na server."
 
 #. *< type
@@ -6462,8 +6537,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Nije moguce ostvariti SSL konekciju na server."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6634,23 +6710,18 @@ msgstr "Kamera"
 msgid "Screen Sharing"
 msgstr "Korisnicko ime"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Slobodan/a za chat"
 
-#, c-format
 msgid "Not Available"
 msgstr "Nedostupan/a"
 
-#, c-format
 msgid "Occupied"
 msgstr "Zaposlen/a"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Na webu"
 
-#, c-format
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -6664,16 +6735,12 @@ msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Nije bilo moguce se spojiti za transfer."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Neuspjelo spajanje na server."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nije moguce konektovanje na server."
 
 #, fuzzy
 msgid "Username sent"
@@ -6688,51 +6755,62 @@ msgstr "Finaliziranje konekcije"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Nemoguca prijava: Neuspio pokušaj prijavljivanja kao %s, jer je ovo ime "
 "pogrešno. Imena moraju pocinjati sa slovima i sadržavati samo slova, brojeve "
 "i razmake, ili sadržavati samo brojeve."
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Moguce da ce Vaša veza biti prekinuta ubrzo. Možda cete htjeti da koristite "
+"TOC, dok ovo ne bude popravljeno. Provjerite %s za noviju verziju."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "Pogrešan nadimak"
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin nije u mogucnosti da dobije validan AIM login hash."
 
-msgid "Incorrect password."
-msgstr "Netacna lozinka."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin nije u mogucnosti da dobije validan login hash."
+
+msgid "Received authorization"
+msgstr "Primljena autorizacija"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Korisnik ne postoji"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Vaš account je trenutno suspendovan."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger servis je trenutno nedostupan."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Klijent verzija, koju koristite, je prestara. Nova verzija na %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Previše cesto ste uspostavljali i prekidali vezu. Pricekajte deset minuta i "
 "pokušajte ponovo. Ako nastavite pokušavati, moracete sacekati još duže."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Klijent verzija, koju koristite, je prestara. Nova verzija na %s"
-
-msgid "Could Not Connect"
-msgstr "Nemoguce se spojiti"
-
-msgid "Received authorization"
-msgstr "Primljena autorizacija"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Ukucani SecurID je pogrešan."
 
 msgid "Enter SecurID"
@@ -6748,28 +6826,6 @@ msgstr "Ukucajte šestocifreni broj sa digitalnog displeja."
 msgid "_OK"
 msgstr "OK"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Moguce da ce Vaša veza biti prekinuta ubrzo. Možda cete htjeti da koristite "
-"TOC, dok ovo ne bude popravljeno. Provjerite %s za noviju verziju."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin nije u mogucnosti da dobije validan AIM login hash."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Moguce da ce Vaša veza biti prekinuta ubrzo. Možda cete htjeti da koristite "
-"TOC, dok ovo ne bude popravljeno. Provjerite %s za noviju verziju."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin nije u mogucnosti da dobije validan login hash."
-
 msgid "Password sent"
 msgstr "Lozinka poslana"
 
@@ -6903,7 +6959,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Propustili ste %hu poruku od %s iz nepoznatog razloga."
 msgstr[1] "Propustili ste %hu poruke od %s iz nepoznatog razloga."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Nije moguce poslati poruku: %s"
@@ -6925,6 +6981,12 @@ msgstr "Prijavljen vec"
 msgid "Member Since"
 msgstr "Clan vec od"
 
+msgid "Capabilities"
+msgstr "Mogucnosti"
+
+msgid "Profile"
+msgstr "Profil"
+
 msgid "Your AIM connection may be lost."
 msgstr "Vaša AIM konekcija može biti izgubljena."
 
@@ -7082,7 +7144,8 @@ msgstr[0] ""
 "Maksimalna dužina profila od %d bajta je prekoracena. Pidgin je skratio za "
 "Vas. "
 msgstr[1] ""
-"Maksimalna dužina profila od %d bajta je prekoracena. Pidgin je skratio za Vas."
+"Maksimalna dužina profila od %d bajta je prekoracena. Pidgin je skratio za "
+"Vas."
 
 msgid "Profile too long."
 msgstr "Profil predugacak."
@@ -7095,18 +7158,18 @@ msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"Maksimalna dužina poruke o odsutnosti od %d bajta je prekoracena. Pidgin je za "
-"Vas skratio."
+"Maksimalna dužina poruke o odsutnosti od %d bajta je prekoracena. Pidgin je "
+"za Vas skratio."
 msgstr[1] ""
-"Maksimalna dužina poruke o odsutnosti od %d bajta je prekoracena. Pidgin je za "
-"Vas skratio."
+"Maksimalna dužina poruke o odsutnosti od %d bajta je prekoracena. Pidgin je "
+"za Vas skratio."
 
 msgid "Away message too long."
 msgstr "Poruka o odsutnosti preduga."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7134,9 +7197,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Sirocad"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Nije moguce dodati prijatelja %s, jer vec imate previše prijatelja u Vašoj "
@@ -7146,7 +7209,7 @@ msgid "(no name)"
 msgstr "(bez imena)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Vaša komanda nije uspjela iz nepoznatih razloga."
 
 #, fuzzy, c-format
@@ -7219,6 +7282,7 @@ msgstr "Spajanje"
 msgid "Get AIM Info"
 msgstr "Uzmi info"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Uredi prijateljev komentar"
 
@@ -7282,6 +7346,7 @@ msgstr "Traži"
 msgid "Set User Info (web)..."
 msgstr "Postavi korisnicki info (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Promjeni lozinku (URL)"
@@ -7317,6 +7382,10 @@ msgstr "Traži prijatelja preko emaila..."
 msgid "Search for Buddy by Information"
 msgstr "Traži prijatelja preko informacija"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Korisnik nije tu"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7334,7 +7403,7 @@ msgstr "Pitam %s da se veže na nas na %s:%hu za direktnu IM."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Pokušaj konektovanja na %s na %s:%hu za direktnu IM."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "Nije moguce konektovanje na server."
 
@@ -7444,7 +7513,7 @@ msgstr "Opera"
 msgid "Visible"
 msgstr "Nevidljiv"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7540,17 +7609,51 @@ msgstr "Zadnji put obnovljeno"
 msgid "Could not change buddy information."
 msgstr "Unesite alarmiranje za prijatelja."
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "Mobilni telefon"
+
+msgid "Note"
+msgstr "Bilješka"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Ikonica prijatelja"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Dodaj prijatelja"
+msgid "_Modify"
+msgstr "_Modificiraj"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "_Modificiraj"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Server zauzet"
+
+msgid "Your request was accepted."
+msgstr ""
 
-msgid "Input answer here"
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Zahtjev za autorizaciju"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Dodajte prijatelja Vašoj listi?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Nemoguce poslati direktorij."
+
 msgid "Send"
 msgstr "Pošalji"
 
@@ -7562,19 +7665,20 @@ msgstr "Netacna lozinka"
 msgid "Authorization denied message:"
 msgstr "Poruka o odbijanju autorizacije:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Pocetak autentikacije"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Dodajte prijatelja Vašoj listi?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "Upišite server za konferenciju"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7597,7 +7701,7 @@ msgid "Failed sending authorize"
 msgstr "Autorizujte me, molim Vas! "
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Neuspjeh prilikom pridruživanja prijatelju na chat-u"
 
 #, fuzzy, c-format
@@ -7643,6 +7747,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Netacne proxy postavke"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Clan vec od"
 
@@ -7685,15 +7793,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "Pridruži se chat-u"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Broj telefona"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7704,7 +7815,7 @@ msgstr "Opcije zvuka"
 msgid "Failed:"
 msgstr "Neuspio pokušaj"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7716,11 +7827,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
-msgstr ""
+#, fuzzy
+msgid "Sorry, you are not our style"
+msgstr "Žao mi je, izašao/la sam na sekundu!"
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Broj telefona"
 
 #, fuzzy
@@ -7731,7 +7843,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Da li biste željeli da se pridružite konverzaciji?"
 
 #, fuzzy
@@ -7739,28 +7851,28 @@ msgid "Setup"
 msgstr "_Postavi"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Neuspjeh prilikom pridruživanja prijatelju na chat-u"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Odstrani prijatelja"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Odstrani prijatelja"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7880,6 +7992,13 @@ msgstr "<b>Korisnik:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Alias:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Korisnik:</b> %s<br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7887,7 +8006,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "O Pidgin-u"
 
 #, fuzzy
@@ -7908,6 +8027,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "O Pidgin-u"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Kucna adresa"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7939,7 +8062,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Spajanje"
@@ -7952,6 +8074,9 @@ msgstr "Prikaži manje opcija"
 msgid "Show server news"
 msgstr "Prikaži manje opcija"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Greška pri citanju"
@@ -7961,11 +8086,7 @@ msgid "Update interval (seconds)"
 msgstr "Greška pri citanju"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Nemoguce dobiti informacije o serveru"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Nemoguce dobiti informacije o serveru"
 
 #, c-format
@@ -7988,21 +8109,19 @@ msgid "Activation required"
 msgstr "Potrebna registracija"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "Greška pri citanju"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "Zahtjev nejasan"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Neuspjela Yahoo! autentikacija"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -8012,7 +8131,7 @@ msgstr "Spasi sliku"
 msgid "Enter code"
 msgstr "Promjeni lozinku"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -8020,69 +8139,43 @@ msgid "Enter the text from the image"
 msgstr "Unesite ime grupe koju dodajete"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Nije moguce spajanje."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Greška prilikom citanja"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "Greška pri komunikaciji sa serverom"
-
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Nije moguce citanje soketa"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Greška pri pisanju"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Konekcija zatvorena"
-
-#, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Postavi korisnicki info..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Zahtjev odbijen"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Spajanje na hosta neuspješno"
+msgid "Unable to resolve hostname"
+msgstr "Nije moguce pingati server"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Netacno korisnicko ime ili lozinka"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Spoji sa serverom"
+msgid "Connecting to server"
+msgstr "Spajanje na SILC server"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Greška pri citanju"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "Neuspio pokušaj pridruživanja na chat"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8092,6 +8185,10 @@ msgid ""
 msgstr "ICQ server relay"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s na %s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Od"
 
@@ -8101,32 +8198,30 @@ msgid ""
 "%s"
 msgstr "Server informacije"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Nepoznat razlog."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Komanda"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Nemoguce dobiti informacije o serveru"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Nepoznat razlog."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Nepoznat razlog."
 
 #, fuzzy, c-format
@@ -8141,10 +8236,6 @@ msgstr "Neuspjelo slanje datoteke"
 msgid "%d canceled the transfer of %s"
 msgstr "%s je otkazao transfer %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Konekcija zatvorena"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Korisnik:</b> %s<br>"
@@ -8206,19 +8297,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Konekcija zatvorena"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Greška pri citanju socketa."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Nije moguce konektovanje na server."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8246,6 +8324,10 @@ msgid "Video Camera"
 msgstr "Video chat"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "Transfer datoteke"
+
+#, fuzzy
 msgid "Supports"
 msgstr "podrška"
 
@@ -8979,9 +9061,6 @@ msgstr "Organizacija"
 msgid "Unit"
 msgstr "Jedinica"
 
-msgid "Note"
-msgstr "Bilješka"
-
 msgid "Join Chat"
 msgstr "Pridruži se chat-u"
 
@@ -9084,6 +9163,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistika mreže"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping neuspio"
 
@@ -9149,7 +9231,8 @@ msgstr "Nepodržani tipovi javnog kljuca"
 msgid "Disconnected by server"
 msgstr "Diskonektovani od servera"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Greška prilikom konektovanja na SILC server"
 
 msgid "Key Exchange failed"
@@ -9161,29 +9244,26 @@ msgstr ""
 "Nastavak odvojene sesije neuspio. Pritisnite Ponovno konektovanje da "
 "kreirate novu konekciju."
 
-msgid "Connection failed"
-msgstr "Konekcija neuspjela"
-
 msgid "Performing key exchange"
 msgstr "Obavljanje razmjene kljuca"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Nije moguce kreirati novu konekciju."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Nije moguce load-ati javni kljuc"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Spajanje na SILC server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Nije moguce load-ati javni kljuc"
+
 msgid "Out of memory"
 msgstr "Nedovoljno memorije"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Nemoguce inicijaliziranje SILC klijenta konekcije"
 
 #, fuzzy
@@ -9493,7 +9573,7 @@ msgid "Creating SILC key pair..."
 msgstr "Kreiranje SILC para kljuca..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Kreiranje SILC para kljuca..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9587,6 +9667,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Statistike servera nisu dostupne"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Greška prilikom konektovanja na SILC server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Neuspjeh: Pogrešna verzija, obnovite Vašeg klijenta"
@@ -9627,7 +9710,8 @@ msgstr "Neuspjeh: Pogrešan cookie"
 msgid "Failure: Authentication failed"
 msgstr "Neuspjeh: Autentikacija neuspjela"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Nemoguce inicijaliziranje SILC klijenta konekcije"
 
 #, fuzzy
@@ -9635,32 +9719,29 @@ msgid "John Noname"
 msgstr "(bez imena)"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nije moguce load-ati javni kljuc"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Nije poslano"
-
-msgid "Could not connect"
-msgstr "Nemoguce spajanje"
+msgid "Unable to create connection"
+msgstr "Nije moguce kreirati novu konekciju."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Nepoznat razlog."
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "Kreiranje socketa neuspješno"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Nije moguce riješiti hostname."
+msgid "Unable to create listen socket"
+msgstr "Nije moguce kreirati socket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "IRC nadimci ne smiju sadržavati whitespace"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Prikaži manje opcija"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9701,178 +9782,68 @@ msgstr "AP korisnik"
 msgid "Auth Domain"
 msgstr "Automatski"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Traženje %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Spajanje na %s neuspješno"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Prijava: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "U nemogucnosti pisanja datoteke %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Nije moguce citanje datoteke %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Poruka je preduga, posljednji %s bajti skraceni."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s nije trenutno logovan."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Upozorenje %s nije dozvoljeno."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Poruka je propala, vi prekoracujete ogranicenje brzine servera."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat u %s nije dostupan."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Prebrzo šaljete poruke prema %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Propustili ste IM poruku od %s, jer je bila prevelika."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Propustili ste IM poruku od %s, jer je prebrzo poslana."
-
-#, c-format
-msgid "Failure."
-msgstr "Neuspjeh."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Previše poklapanja."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Potrebno više kvalifikovanih."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Dir servis trenutno nedostupan."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Pregledanje emaila zabranjeno."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Kljucna rijec ignorisana."
-
-#, c-format
-msgid "No keywords."
-msgstr "Nema kljucnih rijeci."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Korisnik nema informacija o direktoriju."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Vaša država nije podržana."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Neuspjeh nepoznat: %s"
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Netacan nadimak ili lozinka."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Servis je trenutno nedostupan."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  Pridruži se chat sobi na Yahoo mreži"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Vaš upozoravajuci nivo je trenutno prevelik, da biste se ulogovali."
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "listaj:   Izlistaj kanale na ovoj mreži"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"Precesto ste se konektovali i diskonektovali. Pricekajte deset minuta i "
-"pokušajte ponovo. Ako nastavite pokušavati, moracete sacekati i duže."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Nepoznata greška se pojavila prilikom prijave: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Nepoznata greška, %d, se pojavila. Info: %s"
 
 #, fuzzy
-msgid "Invalid Groupname"
-msgstr "Netacna grupa"
-
-msgid "Connection Closed"
-msgstr "Konekcija zatvorena"
-
-msgid "Waiting for reply..."
-msgstr "Cekanje odgovora..."
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC se vratio sa pause. Sada možete ponovo slati poruke."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo protokol plugin"
 
-msgid "Password Change Successful"
-msgstr "Uspješno mijenjanje lozinke"
+#, fuzzy
+msgid "Pager server"
+msgstr "Proxy server"
 
-msgid "_Group:"
-msgstr "_Grupa:"
+msgid "Pager port"
+msgstr "Pager port"
 
-msgid "Get Dir Info"
-msgstr "Uzmi Dir informacije"
+#, fuzzy
+msgid "File transfer server"
+msgstr "Host transfera datoteke"
 
-msgid "Set Dir Info"
-msgstr "Postavi Dir informacije"
+msgid "File transfer port"
+msgstr "Port datotecnog transfera"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Nije bilo moguce otvoriti %s za pisanje!"
+msgid "Chat room locale"
+msgstr ""
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Transfer datoteke je neuspio; druga strana je vjerovatno odustala."
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
 
-msgid "Could not connect for transfer."
-msgstr "Nije bilo moguce se spojiti za transfer."
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "URL liste chat sobe"
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat server"
 msgstr ""
-"Nije bilo moguce napisati zaglavlje datoteke. Datoteka nece biti prebacena."
 
 #, fuzzy
-msgid "Save As..."
-msgstr "Spasi ikonicu kao…"
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s zahtjeva %s da prihvati %d datotetku: %s (%.2f %s)%s%s"
-msgstr[1] "%s zahtjeva %s da prihvati %d datoteke: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s zahtjeva da im pošaljete datoteku"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9884,11 +9855,11 @@ msgstr "%s zahtjeva da im pošaljete datoteku"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC protokol plugin"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo protokol plugin"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9914,6 +9885,34 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Dodavanje prijatelja odbijeno"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Nije moguce ostvariti SSL konekciju na server."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Nepoznata greška broj %d: Prijavljivanje na Yahoo! website može ovo "
+"popraviti."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Nepoznata greška broj %d: Prijavljivanje na Yahoo! website može ovo "
+"popraviti."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Netacan nadimak ili lozinka."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9947,13 +9946,14 @@ msgstr ""
 "Nepoznata greška broj %d: Prijavljivanje na Yahoo! website može ovo "
 "popraviti."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Nije bilo moguce dodati prijatelja %s u grupu %s na listu servera account-a %"
 "s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Nije bilo moguce dodati prijatelja na listu servera"
 
 #, c-format
@@ -9961,23 +9961,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Pogrešan odgovor od servera."
 
-msgid "Connection problem"
-msgstr "Problem konekcije"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Konverzacija sa %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Nije moguce ostvariti SSL konekciju na server."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10032,9 +10025,8 @@ msgstr "Koristi Environmental postavke"
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Aktivirati koji ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Kome se želite pridružiti na chat?"
@@ -10049,81 +10041,15 @@ msgstr "Pridruživanje korisniku na chat..."
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Pridruži se chat sobi na Yahoo mreži"
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "listaj:   Izlistaj kanale na ovoj mreži"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo protokol plugin"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy server"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japan pager host"
-
-msgid "Pager port"
-msgstr "Pager port"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Host transfera datoteke"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japan host transfera datoteke"
-
-msgid "File transfer port"
-msgstr "Port datotecnog transfera"
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "URL liste chat sobe"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Nije moguce spajanje."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nije moguce uspostaviti opisivaca datoteke."
 
@@ -10131,6 +10057,10 @@ msgstr "Nije moguce uspostaviti opisivaca datoteke."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Ponuda slanja %s prema %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Greška pri pisanju"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japanski profil"
 
@@ -10177,14 +10107,9 @@ msgstr "Cool link 3"
 msgid "Last Update"
 msgstr "Zadnji put obnovljeno"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Korisnicke informacije za %s su nedostupne"
-
 #, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Žao nam je, ali izgleda da je ovaj profil na jeziku, koji nije podržan u ovo "
 "vrijeme."
@@ -10258,21 +10183,19 @@ msgstr "Glasovi"
 msgid "Webcams"
 msgstr "Web kamere"
 
+msgid "Connection problem"
+msgstr "Problem konekcije"
+
 msgid "Unable to fetch room list."
 msgstr "Nije moguce uzimanje liste soba."
 
 msgid "User Rooms"
 msgstr "Korisnicke sobe"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Konekcijski problem sa YCHT serverom."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Greška pri komunikaciji sa serverom"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10408,31 +10331,21 @@ msgid "Exposure"
 msgstr "Izlaganje"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Nije moguce kreirati socket"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Nije moguce poslati poruku: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Proxy konekcijska greška %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Pristup odbijen: proxy server zabranjuje port %d prolaz."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Greška prilikom spašavanja slike: %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Nije moguce riješiti hostname."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10529,10 +10442,6 @@ msgstr "Ne smetaj"
 msgid "Extended away"
 msgstr "Produžena odsutnost"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Mobilni telefon"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10574,20 +10483,6 @@ msgstr "%s je aktivan/a"
 msgid "%x %X"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr ""
-"Greška pri citanju %s: \n"
-"%s.\n"
-
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Pojavila se greška pri parsanju vaše liste prijatelja. Lista nije napunjena, "
-"i stara datoteka je premještena u blist.xml~."
-
 msgid "Calculating..."
 msgstr "Racunanje..."
 
@@ -10699,6 +10594,20 @@ msgstr "Konekcija zatvorena"
 msgid "Address already in use."
 msgstr "Ta datoteka vec postoji"
 
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"Greška pri citanju %s: \n"
+"%s.\n"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Pojavila se greška pri parsanju vaše liste prijatelja. Lista nije napunjena, "
+"i stara datoteka je premještena u blist.xml~."
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "Instant Messagers"
@@ -10747,10 +10656,9 @@ msgstr "Obavještenje o novom mail-u"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Opcije"
+#, fuzzy
+msgid "_Advanced"
+msgstr "_Odustani"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10786,9 +10694,6 @@ msgstr "Ako pogledate bliže"
 msgid "you can see the butterflies mating"
 msgstr "možete gledati parenje leptira "
 
-msgid "Proxy Options"
-msgstr "Proxy opcije"
-
 msgid "Proxy _type:"
 msgstr "Proxy _tip:"
 
@@ -10819,8 +10724,8 @@ msgid "Create _this new account on the server"
 msgstr ""
 
 #, fuzzy
-msgid "_Advanced"
-msgstr "_Odustani"
+msgid "_Proxy"
+msgstr "No Proxy"
 
 #, fuzzy
 msgid "Enabled"
@@ -10859,8 +10764,8 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Lista soba"
+msgid "A_ccount"
+msgstr "Account:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10868,8 +10773,9 @@ msgid ""
 msgstr ""
 "Upišite odgovarajuce informacije o chatu, kojem hocete da se prikljucite.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Lista soba"
 
 #, fuzzy
 msgid "_Block"
@@ -10889,6 +10795,17 @@ msgid "I_M"
 msgstr "I_M"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "Dodaj chat"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Video chat"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "Pošalji datoteku"
 
@@ -10900,7 +10817,11 @@ msgid "View _Log"
 msgstr "Pogledaj _Log"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Nije dozvoljeno kada je offline"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Nije dozvoljeno kada je offline"
 
 msgid "_Alias..."
@@ -11046,6 +10967,10 @@ msgid "/Tools/_Certificates"
 msgstr "/Alati/Postavk_e"
 
 #, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Alati/Odsut_an"
+
+#, fuzzy
 msgid "/Tools/Plu_gins"
 msgstr "/Alati/Plugin akcije"
 
@@ -11055,10 +10980,6 @@ msgstr "/Alati/Postavk_e"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Alati/Pr_ivatnost"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Alati/Odsut_an"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Alati/_Prenos datoteka"
 
@@ -11191,8 +11112,8 @@ msgstr "Manuelno"
 msgid "By status"
 msgstr "Prema statusu"
 
-msgid "By log size"
-msgstr "Prema velicini loga"
+msgid "By recent log activity"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "%s disconnected"
@@ -11210,6 +11131,9 @@ msgstr "Ponovno spajanje"
 msgid "Re-enable"
 msgstr "Registruj novi Jabber account"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s se vratio/la"
@@ -11307,6 +11231,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Alias:"
 
+msgid "_Group:"
+msgstr "_Grupa:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11345,6 +11272,120 @@ msgstr "/Ala_ti"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Prikaži offline prijatelje"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Pozadinska boja"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Da li želite da dodate ovog prijatelja na Vašu listu prijatelja?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Neulogovan"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Pozadinska boja"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Expander-velicina"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Odaberi pozadinsku boju"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Collapse"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Odaberi pozadinsku boju"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Kratica"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Pogledaj informacije o izabranom prijatelju"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Odsutan"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Pogledaj informacije o izabranom prijatelju"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Pogledaj informacije o izabranom prijatelju"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Tekst"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Pogledaj informacije o izabranom prijatelju"
+
+msgid "Message Text"
+msgstr "Tekst poruke"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Tekst poruke"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Promijeni korisnicke informacije za %s"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11366,14 +11407,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Pozovite prijatelja u sobu za chat"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Unesite ime korisnika, kojeg želite pozvati, zajedno sa opcionalnom pozivnom "
-"porukom."
-
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
@@ -11404,7 +11437,7 @@ msgid "Get Away Message"
 msgstr "Nova poruka o odsutnosti"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Prezime"
 
 msgid "Unable to save icon file to disk."
@@ -11453,6 +11486,22 @@ msgstr "/Konverzacija/_Spasi kao…"
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Konverzacija/Ocisti"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Konverzacija/_Zatvori"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Konverzacija/_Zatvori"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Konverzacija/_Zatvori"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Konverzacija/Pogledaj _log"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konverzacija/Pošalji datoteku…"
 
@@ -11533,6 +11582,18 @@ msgstr "/Konverza_cija"
 msgid "/Conversation/View Log"
 msgstr "/Konverzacija/Pogledaj log"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Konverzacija/_Zatvori"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Konverzacija/Pogledaj log"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Konverzacija/_Zatvori"
+
 msgid "/Conversation/Send File..."
 msgstr "/Konverzacija/Pošalji datoteku…"
 
@@ -11731,6 +11792,9 @@ msgstr "Adresa"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "podrška"
 
@@ -11864,6 +11928,10 @@ msgid "Hungarian"
 msgstr "Madarski"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Rumunski"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Makedonski"
 
@@ -11881,6 +11949,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "Trenutni prevodioci"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "Opera"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "Banovani"
 
@@ -11904,6 +11976,10 @@ msgid "Macedonian"
 msgstr "Makedonski"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "Makedonski"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norveški"
 
@@ -11961,6 +12037,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "Švedski"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Terminal"
@@ -12012,8 +12091,25 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin na irc.freenode.net<BR><BR>"
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin na irc.freenode.net<BR><BR>"
 
 #, fuzzy
@@ -12292,7 +12388,7 @@ msgid "Hyperlink visited color"
 msgstr "Hiperlink boja"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Boja za bojenje hiperlinkova."
 
 #, fuzzy
@@ -12332,15 +12428,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Uklanjanje notifikacija"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Obavještenje o novom mail-u"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12353,15 +12456,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Obavještenje o novom mail-u"
 
-msgid "_Copy Email Address"
-msgstr "_Kopiraj email adresu"
-
-msgid "_Open Link in Browser"
-msgstr "_Otvori link u pretraživacu"
-
-msgid "_Copy Link Location"
-msgstr "_Kopiraj lokaciju linka"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12394,11 +12488,10 @@ msgstr "Greška prilikom spašavanja slike: %s"
 msgid "Save Image"
 msgstr "Spasi sliku"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Spasi sliku…"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Pokaži korisnicke detalje"
 
@@ -12488,10 +12581,6 @@ msgid "Font Face"
 msgstr "Oblik fonta"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Pozadinska boja"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Boja fonta"
 
@@ -12619,6 +12708,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12636,6 +12726,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12667,16 +12758,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Paging"
 
-#, fuzzy
-msgid "Open All Messages"
-msgstr "Pošalji poruku"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
 
 #, fuzzy
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "Calling..."
+msgstr "Racunanje..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Imate mail!</span>\n"
-"\n"
-"%s"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12709,6 +12811,35 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Komanda u pretraživacu je odabrana, ali nije postavljena."
 
+#, fuzzy
+msgid "No message"
+msgstr "(1 poruka)"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "Pošalji poruku"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Imate mail!</span>\n"
+"\n"
+"%s"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Novi prijatelj alarm"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Imate mail!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12767,11 +12898,18 @@ msgstr ""
 msgid "Select a file"
 msgstr "Odaberite datoteku"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Uredite prijatelj alarm"
+
 #. Create the "Pounce on Whom" frame.
 #, fuzzy
 msgid "Pounce on Whom"
 msgstr "Alarmiranje koga"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
@@ -12852,7 +12990,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr "Alarmiranje kada"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Prijatelj pocinje _tipkati"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Korisnik tipka…"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Prijavljivanje"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "Opet aktiva_n"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Opet p_risutan"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Prijatelj prestaje tipkati"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Odjavljivanje"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s je neaktivan/a"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Pri odsutnosti"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Pošalji poruku"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Nepoznat alarm-dogadaj. Molimo Vas prijavite ovo!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Neuspio pokušaj spašavanja slike: %s\n"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12877,6 +13066,12 @@ msgstr "Kratica"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Konverzacija sa %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Lista prijatelja"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ikonica system tray-a"
 
@@ -12889,7 +13084,7 @@ msgid "On unread messages"
 msgstr "Pošalji poruku"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM konverzacioni prozori"
 
 #, fuzzy
@@ -12899,6 +13094,10 @@ msgstr "Zatvori konverzaciju"
 msgid "When away"
 msgstr "Pri odsutnosti"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM konverzacioni prozori"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12963,10 +13162,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "Pojava prozora pri primanju poruke"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM konverzacioni prozori"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13002,15 +13197,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Nemoguce dobiti korisnicke informacije"
 
-#, fuzzy
-msgid "ST_UN server:"
-msgstr "_Server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Autodetekcija IP adrese"
 
 msgid "Public _IP:"
@@ -13033,6 +13224,10 @@ msgstr "_Start port:"
 msgid "_End port:"
 msgstr "_Završni port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy server"
@@ -13062,6 +13257,10 @@ msgstr "Proxy server"
 msgid "No proxy"
 msgstr "Bez proxy-ja"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Korisnik:"
 
@@ -13232,14 +13431,14 @@ msgid "Auto-away"
 msgstr "Automatska odsutnost"
 
 #, fuzzy
-msgid "Change status when _idle"
-msgstr "Postavi odsutan/a _pri neaktivnosti"
-
-#, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Minute prije postavljanja odsutnosti:"
 
 #, fuzzy
+msgid "Change status when _idle"
+msgstr "Postavi odsutan/a _pri neaktivnosti"
+
+#, fuzzy
 msgid "Change _status to:"
 msgstr "Promjena adrese na:"
 
@@ -13396,29 +13595,19 @@ msgstr "Spasi & koristi"
 msgid "Status for %s"
 msgstr "Status: %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Ubaci smiley"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Datoteka javnog kljuca"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Molim Vas unesite novo ime za izabranu grupu."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Ubaci smiley"
@@ -13428,21 +13617,29 @@ msgid "Add Smiley"
 msgstr "Smijeh!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "Spasi sliku"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "Kratica"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Smijeh!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Kratica"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Izaberite prijatelja"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13531,8 +13728,8 @@ msgid "Cannot send launcher"
 msgstr "Nemoguce poslati datoteku"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13567,6 +13764,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "_Otvori link u:"
+
+msgid "_Copy Link Location"
+msgstr "_Kopiraj lokaciju linka"
+
+msgid "_Copy Email Address"
+msgstr "_Kopiraj email adresu"
+
+#, fuzzy
 msgid "Save File"
 msgstr "Spasi datoteku…"
 
@@ -13670,6 +13877,78 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Adresa servera"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Upišite server za konferenciju"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Odaberite konferencijski server za upit"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online servisi"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Pošalji listu prijatelja"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Pri odsutnosti"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Pretraga direktorija"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Izbor zvuka"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Opis:</b> Zastrašujuce"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Postavi Dir informacije"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Pretraživac:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Korisnik ne postoji"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server ne koristi ni jednu metodu autentikacije"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Postavi Dir informacije"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Neaktivan prijatelj: "
 
@@ -14081,7 +14360,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14197,12 +14476,6 @@ msgstr ""
 "- Premješta sav dolazeci tekst\n"
 "- Šalje poruku ljudima na vašoj listi, odmah pri njihovoj prijavi"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Hiperlink boja"
@@ -14215,6 +14488,10 @@ msgstr "Hiperlink boja"
 msgid "Highlighted Message Name Color"
 msgstr "Pošalji poruku"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Uklanjanje notifikacija"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14249,37 +14526,24 @@ msgstr "Opcije sucelja"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ignoriši b_oje"
+msgid "Disable Typing Notification Text"
+msgstr "Obavještenje o novom mail-u"
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
 #, fuzzy
+msgid "Colors"
+msgstr "Zatvori"
+
+#, fuzzy
 msgid "Fonts"
 msgstr "Accounti"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin kontrola datoteke"
@@ -14371,7 +14635,7 @@ msgstr "IM konverzacioni prozori"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14426,6 +14690,111 @@ msgstr ""
 "Mijenja tekst u odlazecoj poruci, prema prethodno definisanim pravilima od "
 "strane korisnika."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Neulogovani"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s je izlogovan/a."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Pridruži se chatu"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignoriraj"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Punjenje"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorizacija odobrena"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Greška"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informacije"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Zahtjev nejasan"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Upozoravajuci nivo"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "URL liste chat sobe"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Spasi ikonicu"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informacije o account-u"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Lista prijatelja"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lista prijatelja"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin korisnik"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14597,10 +14966,6 @@ msgid "Only when docked"
 msgstr ""
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "Pojava prozora pri primanju poruke"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "Opcije prijave"
 
@@ -14608,9 +14973,10 @@ msgstr "Opcije prijave"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcije specificne za Windows Pidgin"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Opcije specificne za Windows Pidgin"
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14652,6 +15018,520 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Nije u stanju otvoriti socket"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Kreiranje socketa neuspješno"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Nije moguce citanje soketa"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Konekcija neuspjela"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server je diskonektovao"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Kreiranje socketa neuspješno"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Spajanje na hosta neuspješno"
+
+#~ msgid "Read error"
+#~ msgstr "Greška prilikom citanja"
+
+#~ msgid "Write error"
+#~ msgstr "Greška pri pisanju"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Postavi Dir informacije"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Produžena adresa"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Alias chat"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Korisnik nema informacija o direktoriju."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Komanda"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Greška pri registraciji"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Lokacija"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Obavještavanje o statusu prijatelja"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Nepodržana verzija"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Orijentacija"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Korisnicki modusi"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Korisnicko ogranicenje"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Mogucnosti"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Korisnicko ime"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM sa razmjenom kljuca"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Email adresa"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Postavi profil"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Korisnicko ime"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Video uživo"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Primljena poruka"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Javni kljuc babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Korisnicke opcije"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Korisnicki modusi"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Korisnicko ogranicenje"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Korisnicko ogranicenje"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian enkripcija"
+
+#~ msgid "Read Error"
+#~ msgstr "Greška pri citanju"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Neuspjelo spajanje na server."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Popunjen red cekanja"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Nije moguce parsati poruku"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Spajanje na hosta neuspješno"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Neuspio login (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Nije moguce konektovanje na server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Upravo ste izlogovani, jer ste se ulogovali na drugoj radnoj stanici."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Greška. SSL podrška nije instalirana."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Netacna lozinka."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Neuspjelo spajanje na server."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Moguce da ce Vaša veza biti prekinuta ubrzo. Možda cete htjeti da "
+#~ "koristite TOC, dok ovo ne bude popravljeno. Provjerite %s za noviju "
+#~ "verziju."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Nemoguce se spojiti"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Pogrešan nadimak"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Nemoguce dobiti informacije o serveru"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Konekcija zatvorena"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Spajanje na hosta neuspješno"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Konekcija zatvorena"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Konekcija zatvorena"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Greška pri citanju socketa."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Nije moguce konektovanje na server."
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Nije poslano"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nemoguce spajanje"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kreiranje socketa neuspješno"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Nije moguce riješiti hostname."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Netacna lozinka."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan pager host"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan host transfera datoteke"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Greška pri komunikaciji sa serverom"
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nije moguce riješiti hostname."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM konverzacioni prozori"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Molim Vas unesite novo ime za izabranu grupu."
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktivirati koji ID?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ignoriši b_oje"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "Ubaci sliku"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Unesite ime korisnika, kojeg želite pozvati, zajedno sa opcionalnom "
+#~ "pozivnom porukom."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Nije moguce povratiti listu prijatelja"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Moguce da ce Vaša veza biti prekinuta ubrzo. Možda cete htjeti da "
+#~ "koristite TOC, dok ovo ne bude popravljeno. Provjerite %s za noviju "
+#~ "verziju."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Dodaj prijatelja"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Nemoguce dobiti informacije o serveru"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "Greška pri citanju"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "Greška pri komunikaciji sa serverom"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Spoji sa serverom"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "Neuspio pokušaj pridruživanja na chat"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Traženje %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Spajanje na %s neuspješno"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Prijava: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "U nemogucnosti pisanja datoteke %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Nije moguce citanje datoteke %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Poruka je preduga, posljednji %s bajti skraceni."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s nije trenutno logovan."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Upozorenje %s nije dozvoljeno."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Poruka je propala, vi prekoracujete ogranicenje brzine servera."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Chat u %s nije dostupan."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Prebrzo šaljete poruke prema %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Propustili ste IM poruku od %s, jer je bila prevelika."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Propustili ste IM poruku od %s, jer je prebrzo poslana."
+
+#~ msgid "Failure."
+#~ msgstr "Neuspjeh."
+
+#~ msgid "Too many matches."
+#~ msgstr "Previše poklapanja."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Potrebno više kvalifikovanih."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Dir servis trenutno nedostupan."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Pregledanje emaila zabranjeno."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Kljucna rijec ignorisana."
+
+#~ msgid "No keywords."
+#~ msgstr "Nema kljucnih rijeci."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Korisnik nema informacija o direktoriju."
+
+#~ msgid "Country not supported."
+#~ msgstr "Vaša država nije podržana."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Neuspjeh nepoznat: %s"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Netacan nadimak ili lozinka."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Servis je trenutno nedostupan."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Vaš upozoravajuci nivo je trenutno prevelik, da biste se ulogovali."
+
+#~ 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 ""
+#~ "Precesto ste se konektovali i diskonektovali. Pricekajte deset minuta i "
+#~ "pokušajte ponovo. Ako nastavite pokušavati, moracete sacekati i duže."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Nepoznata greška se pojavila prilikom prijave: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Nepoznata greška, %d, se pojavila. Info: %s"
+
+#, fuzzy
+#~ msgid "Invalid Groupname"
+#~ msgstr "Netacna grupa"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Konekcija zatvorena"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Cekanje odgovora..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC se vratio sa pause. Sada možete ponovo slati poruke."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Uspješno mijenjanje lozinke"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Uzmi Dir informacije"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Postavi Dir informacije"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Nije bilo moguce otvoriti %s za pisanje!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Transfer datoteke je neuspio; druga strana je vjerovatno odustala."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Nije bilo moguce se spojiti za transfer."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr ""
+#~ "Nije bilo moguce napisati zaglavlje datoteke. Datoteka nece biti "
+#~ "prebacena."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Spasi ikonicu kao…"
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s zahtjeva %s da prihvati %d datotetku: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s zahtjeva %s da prihvati %d datoteke: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s zahtjeva da im pošaljete datoteku"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC protokol plugin"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Korisnicke informacije za %s su nedostupne"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Opcije"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxy opcije"
+
+#~ msgid "By log size"
+#~ msgstr "Prema velicini loga"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Otvori link u pretraživacu"
+
+#, fuzzy
+#~ msgid "ST_UN server:"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Spasi sliku"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Kratica"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "Pojava prozora pri primanju poruke"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "Direktorij sa tim imenom vec postoji"
 
@@ -14721,13 +15601,6 @@ msgstr ""
 #~ "Da li ste sigurni da hocete da odstranite poruku o odsutnosti \"%s\"?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s na %s (%s)"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Pošalji poruku"
 
@@ -14867,9 +15740,6 @@ msgstr ""
 #~ msgid "Invalid screen name"
 #~ msgstr "Pogrešno korisnicko ime"
 
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Nije moguce ostvariti SSL konekciju na server."
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "Previše zao (pošiljaoc)"
 
@@ -14930,18 +15800,10 @@ msgstr ""
 #~ msgstr "Korisnici na %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Da li želite da dodate ovog prijatelja na Vašu listu prijatelja?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "Greška pri operaciji nad datotekom"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Greška pri kreiranju konekcije"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Nije moguce se prijaviti na AIM"
 
@@ -15060,17 +15922,9 @@ msgstr ""
 #~ msgstr "Trenutno na"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Nije moguce konektovanje na server."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "Poruka:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Account:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Sakrij greške pri prekidu veze"
 
@@ -15164,8 +16018,8 @@ msgstr ""
 #~ "Gives Pidgin the ability to be remote-controlled through third-party "
 #~ "applications or through the Pidgin-remote tool."
 #~ msgstr ""
-#~ "Pruža Pidgin-u mogucnost daljinskog upravljanja od strane trece aplikacije "
-#~ "ili od strane Pidgin-daljinskog alata."
+#~ "Pruža Pidgin-u mogucnost daljinskog upravljanja od strane trece "
+#~ "aplikacije ili od strane Pidgin-daljinskog alata."
 
 #~ msgid "Hide user details"
 #~ msgstr "Sakrij korisnicke detalje"
@@ -15231,18 +16085,12 @@ msgstr ""
 #~ msgid "Group not removed"
 #~ msgstr "Grupa nije odstranjena"
 
-#~ msgid "Buddy List Error"
-#~ msgstr "Greška u listi prijatelja"
-
 #~ msgid "(+%d more)"
 #~ msgstr "(+%d više)"
 
 #~ msgid " left the room (%s)."
 #~ msgstr " nije više u sobi (%s)."
 
-#~ msgid "Expander Size"
-#~ msgstr "Expander-velicina"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Velicina expander arrow"
 
@@ -15415,13 +16263,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Opis:</b> Zastrašujuce"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status</b>: Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15449,9 +16290,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Pošalji poruku izabranom prijatelju"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Pogledaj informacije o izabranom prijatelju"
-
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
 
@@ -15619,9 +16457,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "Neakt_ivan"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "Opet aktiva_n"
-
 #~ msgid "Pounce Action"
 #~ msgstr "Alarm-akcija"
 
@@ -15758,9 +16593,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Kratki pregled"
 
-#~ msgid "Message Text"
-#~ msgstr "Tekst poruke"
-
 #~ msgid "Away Messages"
 #~ msgstr "Poruka pri odsutnosti"
 
@@ -15833,8 +16665,8 @@ msgstr ""
 #~ msgstr "Nije moguce preuzeti postavke"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
 #~ "Pidgin nije uspio preuzeti vaše opcije, jer su sacuvane u starom formatu, "
@@ -15877,9 +16709,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Kriticna greška u GG biblioteci\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Nije moguce pingati server"
-
 #~ msgid "Send as message"
 #~ msgstr "Pošalji kao poruku"
 
@@ -15923,8 +16752,8 @@ msgstr ""
 #~ "Pidgin was unable to complete your request due to a problem communicating "
 #~ "with the Gadu-Gadu HTTP server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin nije mogao kompletirati vaš zahtjev u vezi sa problemom komunikacije "
-#~ "sa Gadu-Gadu HTTP serverom. Pokušajte opet kasnije."
+#~ "Pidgin nije mogao kompletirati vaš zahtjev u vezi sa problemom "
+#~ "komunikacije sa Gadu-Gadu HTTP serverom. Pokušajte opet kasnije."
 
 #~ msgid "Unable to import Gadu-Gadu buddy list"
 #~ msgstr "Nije moguce importovati Gadu-Gadu listu prijatelja."
@@ -15933,15 +16762,15 @@ msgstr ""
 #~ "Pidgin was unable to connect to the Gadu-Gadu buddy list server.  Please "
 #~ "try again later."
 #~ msgstr ""
-#~ "Pidgin se nije mogao spojiti sa Gadu-Gadu serverom liste prijatelja. Molimo "
-#~ "pokušajte opet kasnije."
+#~ "Pidgin se nije mogao spojiti sa Gadu-Gadu serverom liste prijatelja. "
+#~ "Molimo pokušajte opet kasnije."
 
 #~ msgid ""
 #~ "Pidgin was unable to connect to the buddy list server.  Please try again "
 #~ "later."
 #~ msgstr ""
-#~ "Pidgin se nije mogao spojiti sa serverom liste prijatelja. Molimo pokušajte "
-#~ "kasnije."
+#~ "Pidgin se nije mogao spojiti sa serverom liste prijatelja. Molimo "
+#~ "pokušajte kasnije."
 
 #~ msgid "Unable to delete Gadu-Gadu buddy list"
 #~ msgstr "Nije moguce izbrisati Gadu-Gadu listu prijatelja"
@@ -15950,18 +16779,18 @@ msgstr ""
 #~ msgstr "Nije moguce pristupiti direktoriju"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin nije mogao pretraživati direktorij, jer nije mogao da se spoji na "
 #~ "direktorij-server. Molimo pokušajte opet kasnije."
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin nije mogao promjeniti lozinku zbog greške pri spajanju na Gadu-Gadu "
-#~ "server. Molimo pokušajte opet kasnije."
+#~ "Pidgin nije mogao promjeniti lozinku zbog greške pri spajanju na Gadu-"
+#~ "Gadu server. Molimo pokušajte opet kasnije."
 
 #~ msgid "Import Buddy List from Server"
 #~ msgstr "Importuj listu prijatelja sa servera"
@@ -15970,8 +16799,8 @@ msgstr ""
 #~ msgstr "Nije moguce pristupiti korisnickom profilu."
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin nije mogao pristupiti ovom korisnickom profilu zbog greške pri "
 #~ "spajanju na direktorij-server. Molimo pokušajte ponovo kasnije."
@@ -15988,9 +16817,6 @@ msgstr ""
 #~ msgid "Nick:"
 #~ msgstr "Nadimak:"
 
-#~ msgid "Pidgin User"
-#~ msgstr "Pidgin korisnik"
-
 #~ msgid "File Transfer Aborted"
 #~ msgstr "Transfer datoteke je obustavljen"
 
@@ -16235,8 +17061,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "Kada se ovo desi, TOC ignoriše sve poslane poruke, i u mogucnosti je da "
 #~ "Vas izbaci ako pošaljete poruku. Pidgin ce sprijeciti bilo šta da prode. "
@@ -16283,8 +17109,8 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "Normalna metoda autentikacije nije uspjela. Ovo znaci ili da je Vaša "
 #~ "lozinka netacna, ili se shema Yahoo! autentikacije promjenila. Pidgin ce "
@@ -16314,15 +17140,9 @@ msgstr ""
 #~ msgstr[0] "(%d poruka)"
 #~ msgstr[1] "(%d poruka)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 poruka)"
-
 #~ msgid "%s logged in."
 #~ msgstr "%s ulogovan/a."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s je izlogovan/a."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -16340,9 +17160,6 @@ msgstr ""
 #~ "%s je pozvao/la u chat sobu %s:\n"
 #~ "<b>%s</b>"
 
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Žao mi je, izašao/la sam na sekundu!"
-
 #~ msgid "_Warn"
 #~ msgstr "Upozori"
 
diff --git a/po/ca.po b/po/ca.po
index d91edf5d84..f328e0cc0e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -33,8 +33,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-22 10:28+0100\n"
-"PO-Revision-Date: 2009-02-22 15:18+0100\n"
+"POT-Creation-Date: 2009-07-26 17:22+0200\n"
+"PO-Revision-Date: 2009-07-26 17:23+0200\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -639,19 +639,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Envia a"
 
-msgid "Invite message"
-msgstr "Missatge d'invitació"
-
-msgid "Invite"
-msgstr "Convida"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Introduïu el nom de l'usuari que vulgueu convidar,\n"
-"així com un missatge d'invitació opcional."
-
 msgid "Conversation"
 msgstr "Conversa"
 
@@ -915,6 +902,41 @@ msgstr "Totes les converses"
 msgid "System Log"
 msgstr "Registre del sistema"
 
+msgid "Calling ... "
+msgstr "S'està trucant..."
+
+msgid "Hangup"
+msgstr "Penja"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Accepta"
+
+msgid "Reject"
+msgstr "Rebutja"
+
+msgid "Call in progress."
+msgstr "S'està fent una trucada."
+
+msgid "The call has been terminated."
+msgstr "Ha finalitzat la trucada."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s vol iniciar una sessió d'àudio."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+"%s està intentant iniciar una sessió amb medi d'un tipus que no està "
+"implementat."
+
+msgid "You have rejected the call."
+msgstr "Heu rebutjat la trucada."
+
+msgid "call: Make an audio call."
+msgstr "call: fa una trucada d'àudio."
+
 msgid "Emails"
 msgstr "Correus electrònics"
 
@@ -949,6 +971,9 @@ msgstr "Continua"
 msgid "IM"
 msgstr "MI"
 
+msgid "Invite"
+msgstr "Convida"
+
 msgid "(none)"
 msgstr "(cap)"
 
@@ -1153,7 +1178,6 @@ msgstr "%s ha passat a absent (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s us ha enviat un missatge. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Esdeveniment d'avís desconegut, informeu-nos-en."
 
@@ -1565,6 +1589,30 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Connector lastlog."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"S'està aconseguint un TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Crea TinyURL per a URL així de llargues o més"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Prefix de l'adreça TinyURL (o altra)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Connector TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"Quan rebeu missagtes amb URL, feu servir TinyURL per a copiar més fàcilment"
+
 msgid "accounts"
 msgstr "comptes"
 
@@ -1666,13 +1714,6 @@ msgstr "Voleu acceptar el certificat de %s?"
 msgid "SSL Certificate Verification"
 msgstr "Verificació d'un certificat SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Accepta"
-
-msgid "Reject"
-msgstr "Rebutja"
-
 msgid "_View Certificate..."
 msgstr "_Mostra el certificat..."
 
@@ -1685,6 +1726,7 @@ msgid ""
 msgstr ""
 "No es pot comprovar el certificat que presenta «%s» atès que està auto-signat."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "La cadena de certificació que presenta %s no és vàlida."
@@ -1695,6 +1737,7 @@ msgstr "La cadena de certificació que presenta %s no és vàlida."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Error en el certificat SSL"
 
@@ -1775,6 +1818,7 @@ msgstr "+++ %s s'ha connectat"
 msgid "+++ %s signed off"
 msgstr "+++ %s se n'ha anat"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -1821,6 +1865,17 @@ msgstr "%s ha sortit de la sala."
 msgid "%s left the room (%s)."
 msgstr "%s ha sortit de la sala (%s)."
 
+msgid "Invite to chat"
+msgstr "Convida al xat"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Introduïu el nom de l'usuari que vulgueu convidar, així com un missatge "
+"d'invitació opcional."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "No s'ha pogut obtenir la connexió: %s"
@@ -1955,6 +2010,11 @@ msgid "Starting transfer of %s from %s"
 msgstr "S'està iniciant la transferència de %s de %s?"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr ""
+"S'ha completat la transferència del fitxer <A HREF=\"file://%s\">%s</A>"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "S'ha completat la transferència del fitxer %s"
 
@@ -2161,6 +2221,9 @@ msgstr "<font color=\"red\"><b>No s'ha pogut llegir el fitxer: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA-AUTOMÀTICA>: %s\n"
 
+msgid "Error creating conference."
+msgstr "S'ha produït un error en crear la conferència."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Esteu emprant %s, però aquest connector requereix %s."
@@ -2566,14 +2629,14 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Quan es visualitzin els registres, aquest connector inclourà registres "
 "d'altres clients de MI. De moment, es poden incloure els d'Adium, MSN "
-"Messenger, i Trillian.\n"
+"Messenger, aMSN, i Trillian.\n"
 "\n"
 "Avís: aquest connector encara està en desenvolupament i pot ser que es pengi."
 
@@ -2622,7 +2685,7 @@ msgstr ""
 "Desa els missatges que s'hagin enviat a un usuari fora de línia com a avís"
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "La resta de missatges es desaran com a un avís. Podeu editar o suprimir "
@@ -2654,6 +2717,36 @@ msgstr "Desa els missatges fora de línia en un avís"
 msgid "Do not ask. Always save in pounce."
 msgstr "No ho demanis, desa-ho sempre en un avís."
 
+msgid "One Time Password"
+msgstr "Contrasenya d'un sol ús"
+
+# FIXME ?
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Contrasenyes d'un sol ús"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Força que les contrasenyes només s'emprin una vegada."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Us permet forçar que les contrasenyes siguin d'un sol ús per a comptes dels "
+"quals no es desin les contrasenyes.\n"
+"Nota: per poder fer servir això, cal que no es desi la contrasenya del "
+"compte."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2846,15 +2939,16 @@ msgstr ""
 "connectors TCL, instal·leu l'ActiveTCL de http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"No s'ha pogut trobar el joc d'eines per a Windows de l'Apple Bonjour, "
-"consulteu les preguntes més freqüents a http://developer.pidgin.im/"
-"BonjourWindows per a més informació."
+"No s'ha pogut trobar el joc d'eines «Bonjour per a Windows» d'Apple, "
+"consulteu les preguntes més freqüents a http://d.pidgin.im/BonjourWindows "
+"per a més informació."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "No es poden escoltar connexions entrants de MI\n"
+# FIXME
+msgid "Unable to listen for incoming IM connections"
+msgstr "No s'ha pogut escoltar connexions entrants de MI"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2908,14 +3002,17 @@ msgstr "%s ha finalitzat la conversa."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No s'ha pogut enviar el missatge, no s'ha pogut iniciar la conversa."
 
-msgid "Cannot open socket"
-msgstr "No s'ha pogut obrir el sòcol"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "No s'ha pogut crear el sòcol: %s"
 
-msgid "Could not bind socket to port"
-msgstr "No s'ha pogut vincular el sòcol al port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "No s'ha pogut vincular el sòcol al port: %s"
 
-msgid "Could not listen on socket"
-msgstr "No s'ha pogut escoltar al sòcol"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "No s'ha pogut crear el sòcol: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2965,14 +3062,14 @@ msgstr "Desa la llista d'amics..."
 msgid "Load buddylist from file..."
 msgstr "Carrega la llista d'amics d'un fitxer..."
 
-msgid "Fill in the registration fields."
-msgstr "Empleneu els camps de registre."
+msgid "You must fill in all registration fields"
+msgstr "Heu d'emplenar tots els camps de registre"
 
-msgid "Passwords do not match."
-msgstr "Les contrasenyes no coincideixen."
+msgid "Passwords do not match"
+msgstr "Les contrasenyes no coincideixen"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "No s'ha pogut registrar el nou compte. S'ha produït un error.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "No s'ha pogut registrar el nou compte. S'ha produït un error."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "S'ha registrat el nou compte Gadu-Gadu"
@@ -2983,14 +3080,14 @@ msgstr "S'ha registrat amb èxit."
 msgid "Password"
 msgstr "Contrasenya"
 
-msgid "Password (retype)"
-msgstr "Contrasenya (torneu-la a escriure)"
+msgid "Password (again)"
+msgstr "Contrasenya (repetiu-la)"
 
-msgid "Enter current token"
-msgstr "Introduïu el testimoni actual"
+msgid "Enter captcha text"
+msgstr "Introduïu el text captcha"
 
-msgid "Current token"
-msgstr "Testimoni actual"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un compte Gadu-Gadu nou"
@@ -3043,6 +3140,15 @@ msgstr "S'ha canviat la contrasenya."
 msgid "Current password"
 msgstr "Contrasenya actual"
 
+msgid "Password (retype)"
+msgstr "Contrasenya (torneu-la a escriure)"
+
+msgid "Enter current token"
+msgstr "Introduïu el testimoni actual"
+
+msgid "Current token"
+msgstr "Testimoni actual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduïu la contrasenya actual, i la nova per a UIN: "
 
@@ -3056,6 +3162,7 @@ msgstr "Seleccioneu un xat per a l'amic: %s"
 msgid "Add to chat..."
 msgstr "Afegeix al xat..."
 
+#. Global
 msgid "Available"
 msgstr "Disponible"
 
@@ -3089,7 +3196,7 @@ msgstr "No s'ha trobat cap usuari que coincideixi"
 msgid "There are no users matching your search criteria."
 msgstr "No hi ha usuaris que coincideixin amb el vostre criteri de cerca."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "No s'ha pogut llegir el sòcol"
 
 msgid "Buddy list downloaded"
@@ -3104,8 +3211,14 @@ msgstr "S'ha pujat la llista d'amics"
 msgid "Your buddy list was stored on the server."
 msgstr "S'ha desat la vostra llista d'amics al servidor."
 
-msgid "Connection failed."
-msgstr "Ha fallat la connexió."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connectat"
+
+msgid "Connection failed"
+msgstr "Ha fallat la connexió"
 
 msgid "Add to chat"
 msgstr "Afegeix al xat"
@@ -3113,14 +3226,23 @@ msgstr "Afegeix al xat"
 msgid "Chat _name:"
 msgstr "_Nom del xat:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "No s'ha pogut resoldre el nom «%s»: %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "S'està connectant"
+
 msgid "Chat error"
 msgstr "Error en el xat"
 
 msgid "This chat name is already in use"
 msgstr "Aquest nom de xat ja existeix"
 
-msgid "Not connected to the server."
-msgstr "No esteu connectat al servidor."
+msgid "Not connected to the server"
+msgstr "No esteu connectat al servidor"
 
 msgid "Find buddies..."
 msgstr "Cerca amics..."
@@ -3161,6 +3283,9 @@ msgstr "Popular MI polonesa"
 msgid "Gadu-Gadu User"
 msgstr "Usuari Gadu-Gadu"
 
+msgid "GG server"
+msgstr "Servidor GG"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ordre desconeguda: %s"
@@ -3175,7 +3300,7 @@ msgstr "No hi ha cap tema establert"
 msgid "File Transfer Failed"
 msgstr "Ha fallat la transferència del fitxer"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "No s'ha pogut obrir cap port on escoltar."
 
 msgid "Error displaying MOTD"
@@ -3191,8 +3316,16 @@ msgstr "No hi ha cap frase del dia associada a aquesta connexió."
 msgid "MOTD for %s"
 msgstr "Frase del dia per a %s"
 
-msgid "Server has disconnected"
-msgstr "El servidor ha desconnectat"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "S'ha perdut la connexió amb el servidor: %s"
 
 msgid "View MOTD"
 msgstr "Mostra la frase del dia"
@@ -3203,25 +3336,24 @@ msgstr "_Canal:"
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "Els sobrenoms d'IRC no poden contenir espais en blanc"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "S'està connectant"
+msgid "IRC nick and server may not contain whitespace"
+msgstr ""
+"Els sobrenoms i els noms de servidor d'IRC no poden contenir espais en blanc"
 
 msgid "SSL support unavailable"
 msgstr "El suport per a SSL no està disponible"
 
-msgid "Couldn't create socket"
-msgstr "No s'ha pogut crear el sòcol"
+msgid "Unable to connect"
+msgstr "No s'ha pogut connectar"
 
-msgid "Couldn't connect to host"
-msgstr "No s'ha pogut connectar a l'ordinador"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "No s'ha pogut connectar: %s"
 
-msgid "Read error"
-msgstr "Error de lectura"
+#, c-format
+msgid "Server closed the connection"
+msgstr "El servidor ha tancat la connexió"
 
 msgid "Users"
 msgstr "Usuaris"
@@ -3402,6 +3534,16 @@ msgstr ""
 "El servidor ha rebutjat el nom del compte que heu triat. Possiblement conté "
 "caràcters invàlids."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Ja hi ha algú amb el sobrenom «%s»."
+
+msgid "Nickname in use"
+msgstr "El sobrenom ja s'està fent servir"
+
 msgid "Cannot change nick"
 msgstr "No es pot canviar el sobrenom"
 
@@ -3639,12 +3781,12 @@ msgstr "Ha fallat l'ordre «Ad-Hoc»"
 msgid "execute"
 msgstr "executa"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"El servidor requereix TLS/SSL per entrar. No s'ha trobat suport per a TLS/"
-"SSL."
+"El servidor requereix TLS/SSL per entrar, però no s'ha trobat cap "
+"implementació de TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Heu requerit que es xifri, però no s'ha trobat cap implementació de TLS/SSL."
 
@@ -3662,17 +3804,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticació de text"
 
-msgid "Invalid response from server."
-msgstr "La resposta del servidor no és vàlida."
+msgid "SASL authentication failed"
+msgstr "Ha fallat l'autenticació SASL"
+
+msgid "Invalid response from server"
+msgstr "La resposta del servidor no és vàlida"
 
 msgid "Server does not use any supported authentication method"
 msgstr "No hi ha cap mètode d'autenticació compatible amb aquest servidor"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Requeriu xifratge, però no està disponible en aquest servidor."
+
 msgid "Invalid challenge from server"
 msgstr "Repte del servidor invàlid"
 
-msgid "SASL error"
-msgstr "Error en el SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Error SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "El gestor de connexions BOSH ha tancat la connexió."
+
+msgid "No session ID given"
+msgstr "No s'ha indicat cap ID"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Aquesta versió del protocol BOSH no està implementada"
+
+msgid "Unable to establish a connection with the server"
+msgstr "No s'ha pogut establir una connexió amb el servidor"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "No s'ha pogut establir una connexió amb el servidor: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "No s'ha pogut establir una connexió SSL"
 
 msgid "Full Name"
 msgstr "Nom"
@@ -3740,171 +3908,8 @@ msgstr "Client"
 msgid "Operating System"
 msgstr "Sistema operatiu"
 
-msgid "Last Activity"
-msgstr "Darrera activitat"
-
-msgid "Service Discovery Info"
-msgstr "Informació del servei de descoberta"
-
-msgid "Service Discovery Items"
-msgstr "Elements del servei de descoberta"
-
-# http://xmpp.org/extensions/xep-0033.html
-msgid "Extended Stanza Addressing"
-msgstr "Bloc d'adreçament estès"
-
-msgid "Multi-User Chat"
-msgstr "Xat multi-usuari"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Informació de presència estesa per a xats multi-usuari"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ordres Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Servei PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Flux de bits SOCK5"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Ubicació de l'usuari"
-
-msgid "User Avatar"
-msgstr "Avatar de l'usuari"
-
-msgid "Chat State Notifications"
-msgstr "Notificacions de l'estat del xat"
-
-msgid "Software Version"
-msgstr "Versió del programari"
-
-msgid "Stream Initiation"
-msgstr "Iniciació del flux"
-
-msgid "File Transfer"
-msgstr "Transferència de fitxers"
-
-msgid "User Mood"
-msgstr "Estat d'ànim de l'usuari"
-
-msgid "User Activity"
-msgstr "Activitat de l'usuari"
-
-msgid "Entity Capabilities"
-msgstr "Capacitats de l'entitat"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negociacions de la sessió xifrada"
-
-# Pot ser també música, cançó... (josep)
-# Vegeu: http://xmpp.org/extensions/xep-0118.html
-msgid "User Tune"
-msgstr "Melodia de l'usuari"
-
-# Nota: "Roster" en XMPP és la llista de contactes (josep)
-msgid "Roster Item Exchange"
-msgstr "Intercanvi d'element de la llista de contactes"
-
-# Vegeu: http://xmpp.org/extensions/xep-0152.html (josep)
-# Nota: codi mort
-msgid "Reachability Address"
-msgstr "Adreça de localització"
-
-msgid "User Profile"
-msgstr "Perfil de l'usuari"
-
-# Nota: Jingle és una extensió d'XMPP i ho considerem nom propi (josep)
-# http://www.xmpp.org/extensions/xep-0166.html
-msgid "Jingle"
-msgstr "Jingle"
-
-# FIXME
-msgid "Jingle Audio"
-msgstr "Àudio amb Jingle"
-
-msgid "User Nickname"
-msgstr "Sobrenom de l'usuari"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Vídeo amb Jingle"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Recepció de missatges"
-
-msgid "Public Key Publishing"
-msgstr "Publicació de claus públiques"
-
-msgid "User Chatting"
-msgstr "Converses d'usuari"
-
-msgid "User Browsing"
-msgstr "Navegació d'usuaris"
-
-msgid "User Gaming"
-msgstr "Jocs d'usuari"
-
-msgid "User Viewing"
-msgstr "Visualització d'usuaris"
-
-msgid "Ping"
-msgstr "Ping"
-
-# Vegeu: http://xmpp.org/extensions/xep-0200.html
-# Nota: Això es refereix a les capabilitats de l'altre interlocutor
-# No apareix a l'aplicació final, és codi mort dins un #if 0 ... #endif (josep)
-msgid "Stanza Encryption"
-msgstr "Blocs xifrats"
-
-msgid "Entity Time"
-msgstr "Hora de l'entitat"
-
-msgid "Delayed Delivery"
-msgstr "Lliurament endarrerit"
-
-msgid "Collaborative Data Objects"
-msgstr "Objectes de dades col·laboratius"
-
-msgid "File Repository and Sharing"
-msgstr "Dipòsit de fitxers i compartició"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Servei de descoberta STUN per al Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociació simple del xifratge de la sessió"
-
-# Mireu l'RFC (josep)
-msgid "Hop Check"
-msgstr "Comprovació dels salts"
-
-msgid "Capabilities"
-msgstr "Capacitats"
+msgid "Local Time"
+msgstr "Hora local"
 
 msgid "Priority"
 msgstr "Prioritat"
@@ -3912,6 +3917,13 @@ msgstr "Prioritat"
 msgid "Resource"
 msgstr "Recurs"
 
+#, c-format
+msgid "%s ago"
+msgstr "fa %s"
+
+msgid "Logged Off"
+msgstr "Desconnectat"
+
 # Segons la viquipèdia
 msgid "Middle Name"
 msgstr "Nom del mig"
@@ -4080,28 +4092,24 @@ msgstr "Seleccioneu a quin servidor de conferències consultar"
 msgid "Find Rooms"
 msgstr "Cerca sales"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Requeriu xifratge, però no està disponible en aquest servidor."
+msgid "Affiliations:"
+msgstr "Afiliacions:"
 
-msgid "Write error"
-msgstr "Error d'escriptura"
+msgid "No users found"
+msgstr "No s'ha trobat cap usuari"
 
-msgid "Ping timeout"
-msgstr "Temps d'espera del ping"
+msgid "Roles:"
+msgstr "Rols:"
 
-msgid "Read Error"
-msgstr "Error de lectura"
+msgid "Ping timed out"
+msgstr "S'ha esgitat el temps d'espera (ping)"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"No s'ha pogut establir una connexió amb al servidor:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "No s'ha pogut crear el sòcol"
+"No s'ha pogut trobar cap mètode alternatiu de connexió XMPP després de no "
+"haver pogut connectar directament."
 
 msgid "Invalid XMPP ID"
 msgstr "ID de l'XMPP invàlid"
@@ -4109,6 +4117,10 @@ msgstr "ID de l'XMPP invàlid"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "L'ID de l'XMPP no és vàlid. Cal especificar un domini."
 
+# FIX
+msgid "Malformed BOSH URL"
+msgstr "L'URL BOSH està malmès"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "S'ha registrat %s a %s amb èxit"
@@ -4133,9 +4145,6 @@ msgstr "S'ha cancel·lat el registre amb èxit"
 msgid "Unregistration Failed"
 msgstr "No s'ha pogut cancel·lar el registre"
 
-msgid "Already Registered"
-msgstr "Ja esteu registrat"
-
 msgid "State"
 msgstr "Estat"
 
@@ -4148,6 +4157,9 @@ msgstr "Telèfon"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Ja esteu registrat"
+
 msgid "Unregister"
 msgstr "Cancel·la el registre"
 
@@ -4199,6 +4211,13 @@ msgstr "El servidor no permet blocar"
 msgid "Not Authorized"
 msgstr "No autoritzat"
 
+msgid "Mood"
+msgstr "Estat d'ànim"
+
+# FIXME?
+msgid "Now Listening"
+msgstr "Ara escoltant"
+
 msgid "Both"
 msgstr "Ambdós"
 
@@ -4220,13 +4239,6 @@ msgstr "Cap"
 msgid "Subscription"
 msgstr "Subscripció"
 
-msgid "Mood"
-msgstr "Estat d'ànim"
-
-# FIXME?
-msgid "Now Listening"
-msgstr "Ara escoltant"
-
 msgid "Mood Text"
 msgstr "Text sobre l'estat d'ànim"
 
@@ -4269,9 +4281,6 @@ msgstr "La vostra contrasenya s'ha canviat."
 msgid "Error changing password"
 msgstr "S'ha produït un error en canviar la contrasenya"
 
-msgid "Password (again)"
-msgstr "Contrasenya (repetiu-la)"
-
 msgid "Change XMPP Password"
 msgstr "Canvia la contrasenya de l'XMPP"
 
@@ -4312,7 +4321,7 @@ msgstr "No s'ha trobat l'element"
 
 # FIX
 msgid "Malformed XMPP ID"
-msgstr "l'ID de l'XMPP està malmès"
+msgstr "L'ID de l'XMPP està malmès"
 
 msgid "Not Acceptable"
 msgstr "No és acceptable"
@@ -4468,17 +4477,25 @@ msgid "Unable to ping user %s"
 msgstr "No s'ha pogut fer ping a l'usuari %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "No s'ha pogut botzinar perquè no es coneix res de l'usuari %s."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "No s'ha pogut botzinar possiblement perquè l'usuari %s està desconnectat."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "No s'ha pogut botzinar perquè l'usuari %s no ho permet."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"No s'ha pogut botzinar l'usuari %s perquè no ho implementa, o bé ara mateix "
+"no ho permet."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "S'està botzinant a %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4490,8 +4507,35 @@ msgid "%s has buzzed you!"
 msgstr "%s us ha botzinat!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "S'està botzinant a %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "No s'ha pogut iniciar el medi amb %s: el JID no és vàlid"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "No s'ha pogut iniciar el medi amb %s: l'usuari no està connectat"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"No s'ha pogut iniciar el medi amb %s: no esteu subscrit a la presència de "
+"l'usuari"
+
+msgid "Media Initiation Failed"
+msgstr "Ha fallat la iniciació del medi"
+
+# FIXME: "media session" -> "sessió amb medi"?
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Escolliu el recurs de %s amb el qual voleu iniciar una sessió amb medi."
+
+msgid "Select a Resource"
+msgstr "Seleccioneu un recurs"
+
+msgid "Initiate Media"
+msgstr "Inicia el medi"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  configura la sala de xat."
@@ -4512,18 +4556,18 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [motiu]:  bandeja de la sala un usuari."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;usuari&gt; &lt;owner|admin|member|outcast|none&gt;: estableix "
-"l'afiliació de l'usuari a la sala."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [sobrenom1] "
+"[sobrenom2] ...: obtén els usuaris amb una afiliació, o els l'estableix."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;usuari&gt; &lt;moderator|participant|visitor|none&gt;: estableix el "
-"rol d'un usuari en una sala."
+"role &lt;usuari&gt; &lt;moderator|participant|visitor|none&gt; [sobrenom1] "
+"[sobrenom2] ...: obtén els usuaris amb el rol especificat, o els l'estableix."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuari&gt; [sala]:  convida un usuari a la sala."
@@ -4584,6 +4628,9 @@ msgstr "Servidor al qual connectar-se"
 msgid "File transfer proxies"
 msgstr "Servidors intermediari per a la transferència de fitxers"
 
+msgid "BOSH URL"
+msgstr "URL BOSH"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4622,6 +4669,14 @@ msgstr "Error en l'anàlisi de l'XML"
 msgid "Unknown Error in presence"
 msgstr "Error desconegut en la presència"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "S'ha produït un error en entrar al xat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "S'ha produït un error en el xat %s"
+
 msgid "Create New Room"
 msgstr "Crea una nova sala"
 
@@ -4638,13 +4693,28 @@ msgstr "_Configura la sala"
 msgid "_Accept Defaults"
 msgstr "_Accepta els valors predeterminats"
 
+msgid "No reason"
+msgstr "No s'ha indicat cap motiu"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "S'ha produït un error en entrar al xat %s"
+msgid "You have been kicked: (%s)"
+msgstr "Us han fet fora: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "S'ha produït un error en el xat %s"
+msgid "Kicked (%s)"
+msgstr "Us han fet fora (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr "La transferència s'ha tancat."
+
+msgid "Failed to open the file"
+msgstr "No s'ha pogut obrir el fitxer"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4674,9 +4744,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Escolliu a quin recurs de %s voleu enviar un fitxer"
 
-msgid "Select a Resource"
-msgstr "Seleccioneu un recurs"
-
 msgid "Edit User Mood"
 msgstr "Edita l'estat d'ànim"
 
@@ -4972,6 +5039,32 @@ msgstr "Altres contactes"
 msgid "Non-IM Contacts"
 msgstr "Contactes que no són de MI"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s us ha enviat un wink. <a href='msn-wink://%s'>Feu clic aquí per escoltar-"
+"lo</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s us ha envia un wink, però no s'ha pogut desar"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s us ha enviat un clip de veu. <a href='audio://%s'>Feu clic aquí per "
+"escoltar-lo</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s us han enviat un clip de música, però no s'ha pogut desar"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s us ha enviat una invitació per fer una conversa de veu, però això encara "
+"no està implementat."
+
 msgid "Nudge"
 msgstr "Donar un cop de colze"
 
@@ -5123,8 +5216,28 @@ msgstr "Inicia un _xat"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "L'MSN necessita SSL, instal·leu alguna biblioteca d'SSL permesa."
 
-msgid "Failed to connect to server."
-msgstr "No s'ha pogut connectar al servidor."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"No s'ha pogut afegir l'amic %s perquè el nom d'usuari no és vàlid. Els noms "
+"d'usuari han de ser adreces de correu vàlides."
+
+msgid "Unable to Add"
+msgstr "No s'ha pogut afegir"
+
+msgid "Authorization Request Message:"
+msgstr "Missatge de petició d'autorització:"
+
+msgid "Please authorize me!"
+msgstr "Autoritzeu-me, si us plau."
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_D'acord"
 
 msgid "Error retrieving profile"
 msgstr "S'ha produït un error en recuperar el perfil"
@@ -5315,63 +5428,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticació amb el Windows Live ID: la resposta no és vàlida"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s no és un nom de grup vàlid"
-
-msgid "Unknown error."
-msgstr "Error desconegut."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s a %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s us ha donat un cop de colze!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Error desconegut (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Error desconegut (%d): %s"
 
 msgid "Unable to add user"
 msgstr "No s'ha pogut afegir l'usuari"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Manquen aquests usuaris a la vostra llista d'amics"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "No s'ha pogut afegir l'usuari a %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "No s'ha pogut blocar l'usuari %s (%s)"
-
+#. Unknown error!
 #, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "No s'ha pogut permetre l'usuari %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "No s'ha pogut afegir %s perquè la llista és plena."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s no és un compte de passaport vàlid."
+msgid "Unknown error (%d)"
+msgstr "Error desconegut (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "El servei no està disponible temporalment."
+msgid "The following users are missing from your addressbook"
+msgstr "Manquen aquests usuaris a la vostra llista d'amics"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "No s'ha enviat el missatge al mòbil perquè era massa llarg."
 
-msgid "Unable to rename group"
-msgstr "No s'ha pogut canviar el nom del grup"
-
-msgid "Unable to delete group"
-msgstr "No s'ha pogut suprimir el grup"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5420,9 +5497,6 @@ msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error desconegut."
 
-msgid "Unable to connect"
-msgstr "No s'ha pogut connectar"
-
 msgid "Writing error"
 msgstr "Error en escriure"
 
@@ -5437,22 +5511,22 @@ msgstr ""
 "S'ha produït un error de connexió del servidor %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "El servidor no implementa el nostre protocol."
+msgid "Our protocol is not supported by the server"
+msgstr "El servidor no implementa aquest protocol"
 
-msgid "Error parsing HTTP."
-msgstr "S'ha produït un error en analitzar HTTP."
+msgid "Error parsing HTTP"
+msgstr "S'ha produït un error en analitzar HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Us heu connectat des d'un altre lloc."
+msgid "You have signed on from another location"
+msgstr "Us heu connectat des d'un altre lloc"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Els servidors MSN estan temporalment no disponibles. Espereu i proveu-ho més "
 "tard."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "Els servidors MSN no seran accessibles temporalment."
+msgid "The MSN servers are going down temporarily"
+msgstr "Els servidors MSN no seran accessibles temporalment"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5482,6 +5556,18 @@ msgstr "S'està enviant la galeta"
 msgid "Retrieving buddy list"
 msgstr "S'està recuperant la llista d'amics"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s ha sol·licitat poder veure la vostra càmera web, però això encara no està "
+"implementat."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s us ha enviat una invitació a la seva càmera web, però això encara no està "
+"implementat."
+
 msgid "Away From Computer"
 msgstr "Lluny de l'ordinador"
 
@@ -5529,14 +5615,6 @@ msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error desconegut:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s us ha afegit a la seva llista d'amics."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s us ha suprimit de la seva llista d'amics."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Voleu suprimir l'amic de la llibreta d'adreces?"
 
@@ -5566,6 +5644,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Connector per al protocol MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s no és un nom de grup vàlid"
+
+msgid "Unknown error."
+msgstr "Error desconegut."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s a %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "No s'ha pogut afegir l'usuari a %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "No s'ha pogut blocar l'usuari %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "No s'ha pogut permetre l'usuari %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "No s'ha pogut afegir %s perquè la llista és plena."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s no és un compte de passaport vàlid."
+
+msgid "Service Temporarily Unavailable."
+msgstr "El servei no està disponible temporalment."
+
+msgid "Unable to rename group"
+msgstr "No s'ha pogut canviar el nom del grup"
+
+msgid "Unable to delete group"
+msgstr "No s'ha pogut suprimir el grup"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s us ha afegit a la seva llista d'amics."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s us ha suprimit de la seva llista d'amics."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Aquest usuari no existeix: %s"
 
@@ -5595,6 +5721,8 @@ msgid "Lost connection with server"
 msgstr "S'ha perdut la connexió amb el servidor"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Missatges de correu nous"
 
@@ -5634,26 +5762,22 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Addició de contactes del servidor"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connectat"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "S'ha produït un error en el protocol amb codi %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s La vostra contrasenya conté %d caràcters, més del màxim de %d que permet "
-"MySpaceIM. Escolliu una contrasenya més curta a http://profileedit.myspace."
-"com/index.cfm?fuseaction=accountSettings.changePassword i proveu-ho de nou."
+"%s La vostra contrasenya conté %zu caràcters, més %d que és el màxim permès. "
+"Escolliu una contrasenya més curta a http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword i proveu-ho de nou."
+
+msgid "Incorrect username or password"
+msgstr "El sobrenom o la contrasenya no són correctes"
 
 msgid "MySpaceIM Error"
 msgstr "S'ha produït un error en el MySpaceIM"
@@ -5661,16 +5785,6 @@ msgstr "S'ha produït un error en el MySpaceIM"
 msgid "Invalid input condition"
 msgstr "La condició d'entrada no és vàlida"
 
-msgid "Read buffer full (2)"
-msgstr "La memòria intermèdia de lectura és plena (2)"
-
-msgid "Unparseable message"
-msgstr "No es pot analitzar el missatge"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "No s'ha pogut afegir l'amic"
 
@@ -5760,6 +5874,15 @@ msgstr "Nombre d'amics"
 msgid "Client Version"
 msgstr "Versió del client"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"S'ha produït un error en intentar establir el nom d'usuari. Intenteu-ho de "
+"nou, o aneu a http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username per establir el vostre nom d'usuari."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - El nom d'usuari està disponible"
 
@@ -5792,28 +5915,27 @@ msgstr "Entreu un nom d'usuari per a comprovar-ne la disponibilitat:"
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
+msgstr "Enrampar"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s us ha afegit [%s]"
+msgstr "%s us ha enrampat!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Zapping %s..."
-msgstr "S'està trucant a %s"
+msgstr "S'està enrampant %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#, fuzzy
 msgid "Whack"
 msgstr "bufetejar"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s us ha afegit [%s]"
+msgstr "%s us ha bufetejat!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Whacking %s..."
-msgstr "Bufetejant"
+msgstr "S'està bufetejant %s..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
@@ -5895,17 +6017,16 @@ msgstr "S'està xocant-ne cinc amb %s..."
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#, fuzzy
 msgid "Punk"
-msgstr "Ping"
+msgstr "Pren el pèl"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s s'ha connectat."
+msgstr "%s us ha près el pèl!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Punking %s..."
-msgstr "Ping"
+msgstr "S'està prenent el pèl a %s..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -5914,17 +6035,16 @@ msgstr "Ping"
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#, fuzzy
 msgid "Raspberry"
 msgstr "Llengoteja"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s s'ha connectat."
+msgstr "%s us ha fet una llengota!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Raspberrying %s..."
-msgstr "Morrejant"
+msgstr "S'està fent una llengota a %s..."
 
 msgid "Required parameters not passed in"
 msgstr "No s'han passat tots els paràmetres requerits"
@@ -5980,9 +6100,6 @@ msgstr "No es pot afegir a un mateix"
 msgid "Master archive is misconfigured"
 msgstr "L'arxiu mestre està desconfigurat"
 
-msgid "Incorrect username or password"
-msgstr "El sobrenom o la contrasenya no són correctes"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "No s'ha pogut reconèixer l'ordinador del nom d'usuari que heu entrat"
 
@@ -6026,8 +6143,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Error desconegut: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Ha fallat l'entrada (%s)."
+msgid "Unable to login: %s"
+msgstr "No s'ha pogut entrar: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6138,9 +6255,6 @@ msgstr "Conferència GroupWise %d"
 msgid "Authenticating..."
 msgstr "S'està autenticant..."
 
-msgid "Unable to connect to server."
-msgstr "No s'ha pogut connectar al servidor."
-
 msgid "Waiting for response..."
 msgstr "S'està esperant una resposta..."
 
@@ -6164,11 +6278,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Voleu afegir-vos a la conversa?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Se us ha desconnectat perquè heu entrat a través d'una altra estació de "
-"treball."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6177,15 +6286,12 @@ msgstr ""
 "acabeu d'enviar."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "No s'ha pogut connectar al servidor. Introduïu l'adreça del servidor al qual "
 "us vulgueu connectar."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error. No hi ha instal·lades les biblioteques per a SSL."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "S'ha tancat aquesta conferència. No s'hi poden enviar més missatges."
 
@@ -6208,25 +6314,33 @@ msgstr "Adreça del servidor"
 msgid "Server port"
 msgstr "Port en el servidor"
 
+msgid "Received unexpected response from "
+msgstr "S'ha rebut una resposta inesperada de "
+
+#. username connecting too frequently
+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 ""
+"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu "
+"deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
+"encara més temps."
+
+#, c-format
+msgid "Error requesting "
+msgstr "S'ha produït en sol·licitar "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL no permet que us autentiqueu amb aquest nom d'usuari aquí"
+
 msgid "Could not join chat room"
 msgstr "No s'ha pogut entrar a la sala de xat"
 
 msgid "Invalid chat room name"
 msgstr "El nom de sala de xat no és vàlid"
 
-msgid "Server closed the connection."
-msgstr "El servidor ha tancat la connexió."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"S'ha perdut la connexió amb el servidor:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "S'han rebut dades invàlides a la connexió amb el servidor."
+msgid "Received invalid data on connection with server"
+msgstr "S'han rebut dades invàlides a la connexió amb el servidor"
 
 #. *< type
 #. *< ui_requirement
@@ -6273,8 +6387,8 @@ msgstr "S'ha perdut la connexió amb l'usuari remot:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "S'han rebut dades invàlides a la connexió amb l'usuari remot."
 
-msgid "Could not establish a connection with the remote user."
-msgstr "No s'ha pogut establir una connexió amb l'usuari remot."
+msgid "Unable to establish a connection with the remote user."
+msgstr "No s'ha pogut establir una connexió amb el servidor remot."
 
 msgid "Direct IM established"
 msgstr "S'ha establert una connexió directa de MI"
@@ -6477,20 +6591,12 @@ msgid "Buddy Comment"
 msgstr "Comentari de l'amic"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"No s'ha pogut connectar al servidor d'autenticació:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "No s'ha pogut connectar al servidor d'autenticació: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"No s'ha pogut connectar al servidor BOS:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "No s'ha pogut connectar al servidor BOS: %s"
 
 msgid "Username sent"
 msgstr "S'ha enviat el nom d'usuari"
@@ -6504,54 +6610,61 @@ msgstr "S'està finalitzant la connexió"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"No s'ha pogut entrar: no s'ha pogut entrar com a %s perquè el nom d'usuari "
-"no és vàlid. Els noms d'usuari han de ser adreces de correu vàlides, o "
-"començar amb una lletra i contenir només lletres, nombres o espais, o només "
-"nombres."
+"No s'ha pogut entrar com a %s perquè aquest nom d'usuari no és vàlid. Els "
+"noms d'usuari han de ser adreces de correu vàlides, o començar amb una "
+"lletra i contenir només lletres, nombres o espais, o només nombres."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "El nom d'usuari no és vàlid"
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Pot ser que es desconnecti d'aquí a poc. Si això passés, comproveu si hi ha "
+"actualitzacions a %s."
+
+# FIXME: hash (josep)
+msgid "Unable to get a valid AIM login hash."
+msgstr "No s'ha pogut obtenir un hash d'AIM d'entrada vàlid."
 
-msgid "Incorrect password."
-msgstr "La contrasenya no és correcta."
+msgid "Unable to get a valid login hash."
+msgstr "No s'ha pogut obtenir un hash d'entrada vàlid."
+
+msgid "Received authorization"
+msgstr "S'ha rebut l'autorització"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "L'usuari no existeix"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "El vostre compte està actualment suspès."
+msgid "Your account is currently suspended"
+msgstr "El vostre compte està actualment suspès"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servei de missatges instantanis d'AOL no està disponible temporalment."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu "
-"deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
-"encara més temps."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "La versió del client que useu és massa antiga, actualitzeu-la a %s"
 
-msgid "Could Not Connect"
-msgstr "No s'ha pogut connectar"
-
-msgid "Received authorization"
-msgstr "S'ha rebut l'autorització"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu un "
+"minut i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
+"encara més temps."
 
-msgid "The SecurID key entered is invalid."
-msgstr "La clau SecurID que heu entrat no és vàlida."
+msgid "The SecurID key entered is invalid"
+msgstr "La clau SecurID que heu entrat no és vàlida"
 
 msgid "Enter SecurID"
 msgstr "Introduïu el SecureID"
@@ -6559,31 +6672,6 @@ msgstr "Introduïu el SecureID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduïu el nombre de 6 dígits de la pantalla digital."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_D'acord"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Pot ser que es desconnecti d'aquí a poc. Si això passés, comproveu si hi ha "
-"actualitzacions a %s."
-
-# FIXME: hash (josep)
-msgid "Unable to get a valid AIM login hash."
-msgstr "No s'ha pogut obtenir un hash d'AIM d'entrada vàlid."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Se us pot desconnectar d'aquí a poc temps. Comproveu si hi ha "
-"actualitzacions a %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "No s'ha pogut obtenir un hash d'entrada vàlid."
-
 msgid "Password sent"
 msgstr "S'ha enviat la contrasenya"
 
@@ -6593,12 +6681,6 @@ msgstr "No s'ha pogut inicialitzar la connexió"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autoritzeu-me perquè us pugui afegir a la meva llista d'amics."
 
-msgid "Authorization Request Message:"
-msgstr "Missatge de petició d'autorització:"
-
-msgid "Please authorize me!"
-msgstr "Autoritzeu-me, si us plau."
-
 msgid "No reason given."
 msgstr "No s'ha indicat cap motiu."
 
@@ -6717,7 +6799,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Heu perdut %hu missatge de %s per motius desconeguts."
 msgstr[1] "Heu perdut %hu missatges de %s per motius desconeguts."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
@@ -6739,6 +6821,9 @@ msgstr "En línia des de"
 msgid "Member Since"
 msgstr "Membre des de"
 
+msgid "Capabilities"
+msgstr "Capacitats"
+
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6921,7 +7006,7 @@ msgstr "El missatge d'absència és massa llarg."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6929,9 +7014,6 @@ msgstr ""
 "d'usuari han de ser adreces de correu vàlides, o començar amb una lletra i "
 "contenir només lletres, nombres i espais, o només nombres."
 
-msgid "Unable to Add"
-msgstr "No s'ha pogut afegir"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "No s'ha pogut obtenir la llista d'amics"
 
@@ -6947,17 +7029,17 @@ msgstr "Orfes"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"No s'ha pogut afegir l'amic %s perquè hi ha massa entrades a la llista "
-"d'amics. Suprimiu-ne algun i torneu-ho a intentar."
+"No s'ha pogut afegir l'amic %s perquè hi ha massa amics a la llista d'amics. "
+"Suprimiu-ne algun i torneu-ho a intentar."
 
 msgid "(no name)"
 msgstr "(sense nom)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Per motius desconeguts no s'ha pogut afegir l'amic %s."
 
 #, c-format
@@ -7088,6 +7170,7 @@ msgstr "C_erca"
 msgid "Set User Info (web)..."
 msgstr "Estableix informació d'usuari (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Canvia la contrasenya (web)"
 
@@ -7117,6 +7200,9 @@ msgstr "Cerca un amic per l'adreça de correu..."
 msgid "Search for Buddy by Information"
 msgstr "Cerca un amic per la informació"
 
+msgid "Use clientLogin"
+msgstr "Empra clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7308,6 +7394,35 @@ msgstr "Actualitza"
 msgid "Could not change buddy information."
 msgstr "No s'ha pogut canviar la informació l'amic."
 
+msgid "Mobile"
+msgstr "Mòbil"
+
+msgid "Note"
+msgstr "Nota"
+
+# FIXME: "memo", el qq té una terminologia molt peculiar
+#. callback
+msgid "Buddy Memo"
+msgstr "Memo de l'amic"
+
+msgid "Change his/her memo as you like"
+msgstr "Canvieu-ne el memo"
+
+msgid "_Modify"
+msgstr "_Modifica"
+
+msgid "Memo Modify"
+msgstr "Modifica el memo"
+
+msgid "Server says:"
+msgstr "El servidor diu:"
+
+msgid "Your request was accepted."
+msgstr "S'ha acceptat la vostra sol·licitud."
+
+msgid "Your request was rejected."
+msgstr "S'ha rebutjat la vostra sol·licitud."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "Cal verificació per a %u"
@@ -7620,6 +7735,12 @@ msgstr "<p><b>Encantadors apedaçadors (de codi)</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Reconeixement</b>:<br>\n"
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Comprovadors del codi</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "i més, si us plau feu-m'ho saber... gràcies!!!))"
+
 # FIXME: ush... traducció lliure... 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>I tothom que ho ha fet possible...<i><br>\n"
@@ -7646,6 +7767,9 @@ msgstr "Actualitza tots els Quns QQ"
 msgid "About OpenQ"
 msgstr "Quant a l'OpenQ"
 
+msgid "Modify Buddy Memo"
+msgstr "Modifica el memo de l'amic"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7693,7 +7817,7 @@ msgstr "Interval de permanència (en segons)"
 msgid "Update interval (seconds)"
 msgstr "Interval d'actualització (en segons)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "No es pot desxifrar la resposta del servidor"
 
 #, c-format
@@ -7718,9 +7842,6 @@ msgstr "Cal activació"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "No s'ha reconegut el codi de resposta en entrar (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "No s'ha pogut desxifrar la resposta del servidor"
-
 # FIXME: captcha
 msgid "Requesting captcha"
 msgstr "S'està sol·licitant un capcha"
@@ -7756,30 +7877,17 @@ msgstr ""
 "No s'ha reconegut el codi de resposta en entrar (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "No s'ha pogut connectar."
-
 msgid "Socket error"
 msgstr "Error del sòcol"
 
-msgid "Unable to read from socket"
-msgstr "No s'ha pogut llegir el sòcol"
-
-msgid "Write Error"
-msgstr "Error d'escriptura"
-
-msgid "Connection lost"
-msgstr "S'ha perdut la connexió"
-
 msgid "Getting server"
 msgstr "S'està obtenint el servidor"
 
 msgid "Requesting token"
 msgstr "S'està sol·licitant un testimoni"
 
-msgid "Couldn't resolve host"
-msgstr "No s'ha pogut obtenir l'adreça de l'ordinador"
+msgid "Unable to resolve hostname"
+msgstr "No s'ha pogut resoldre el nom de l'ordinador"
 
 msgid "Invalid server or port"
 msgstr "El servidor o el port no són vàlids"
@@ -7832,7 +7940,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Ordre QQ Qun"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "No s'ha pogut desxifrar la resposta d'entrada"
 
 msgid "Unknown LOGIN CMD"
@@ -7852,9 +7960,6 @@ msgstr "S'ha enviat el fitxer"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ha cancel·lat la transferència de %s"
 
-msgid "Connection closed (writing)"
-msgstr "S'ha tancat la connexió (escrivint)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Títol del grup:</b> %s<br>"
@@ -7910,17 +8015,6 @@ msgstr "Un administrador de Sametime ha enviat aquest anunci en el servidor %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Anunci de l'administrador de Sametime"
 
-msgid "Connection reset"
-msgstr "S'ha reiniciat la connexió"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "S'ha produït un error en llegir del sòcol: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "No s'ha pogut connectar a l'ordinador"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Avís de %s"
@@ -7943,6 +8037,9 @@ msgstr "Altaveus"
 msgid "Video Camera"
 msgstr "Càmera de vídeo"
 
+msgid "File Transfer"
+msgstr "Transferència de fitxers"
+
 msgid "Supports"
 msgstr "Permet"
 
@@ -8662,9 +8759,6 @@ msgstr "Organització"
 msgid "Unit"
 msgstr "Unitat"
 
-msgid "Note"
-msgstr "Nota"
-
 msgid "Join Chat"
 msgstr "Entra a un xat"
 
@@ -8764,6 +8858,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Estadístiques de xarxa"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ha fallat el ping"
 
@@ -8827,7 +8924,7 @@ msgstr "El tipus de la clau pública no està suportat"
 msgid "Disconnected by server"
 msgstr "El servidor us ha desconnectat"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "S'ha produït un error en connectar al servidor SILC"
 
 msgid "Key Exchange failed"
@@ -8839,16 +8936,10 @@ msgstr ""
 "No s'ha pogut restablir la sessió anteriorment separada. Premeu «Torna a "
 "connectar» per crear una nova connexió."
 
-msgid "Connection failed"
-msgstr "Ha fallat la connexió"
-
 msgid "Performing key exchange"
 msgstr "S'estan intercanviant les claus"
 
-msgid "Unable to create connection"
-msgstr "No s'ha pogut crear la connexió"
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "No s'ha pogut carregar el parell de claus SILC"
 
 #. Progress
@@ -8858,7 +8949,7 @@ msgstr "S'està connectant al servidor SILC"
 msgid "Out of memory"
 msgstr "Sense memòria"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "No s'ha pogut inicialitzar el protocol SILC"
 
 msgid "Error loading SILC key pair"
@@ -9157,8 +9248,8 @@ msgstr "Signa i verifica digitalment tots els missatges"
 msgid "Creating SILC key pair..."
 msgstr "S'està creant el parell de claus SILC..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "No s'ha pogut crear el parell de claus SILC\n"
+msgid "Unable to create SILC key pair"
+msgstr "No s'ha pogut crear el parell de claus SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9251,6 +9342,9 @@ msgstr "Pissarra"
 msgid "No server statistics available"
 msgstr "No hi ha estadístiques del servidor disponibles"
 
+msgid "Error during connecting to SILC Server"
+msgstr "S'ha produït un error en connectar al servidor SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Error: les versions no coincideixen, actualitzeu el client"
@@ -9296,30 +9390,24 @@ msgstr "Error: la galeta no és vàlida"
 msgid "Failure: Authentication failed"
 msgstr "Error: ha fallat l'autenticació"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "No s'ha pogut inicialitzar la connexió per al client SILC"
 
 msgid "John Noname"
 msgstr "Pepet Sensenom"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "No s'ha pogut carregar la parella de claus SILC: %s"
 
-msgid "Could not write"
-msgstr "No s'ha pogut escriure"
-
-msgid "Could not connect"
-msgstr "No s'ha pogut connectar"
-
-msgid "Unknown server response."
-msgstr "Resposta desconeguda del servidor."
+msgid "Unable to create connection"
+msgstr "No s'ha pogut crear la connexió"
 
-msgid "Could not create listen socket"
-msgstr "No s'ha pogut crear el sòcol per a escoltar"
+msgid "Unknown server response"
+msgstr "Resposta desconeguda del servidor"
 
-msgid "Could not resolve hostname"
-msgstr "No s'ha pogut resoltre el nom de l'ordinador"
+msgid "Unable to create listen socket"
+msgstr "No s'ha pogut crear el sòcol on escoltar"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Els noms d'usuari SIP no poden contenir espais en blanc ni @"
@@ -9360,181 +9448,62 @@ msgstr "Usuari Auth"
 msgid "Auth Domain"
 msgstr "Domini Auth"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "S'està cercant %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Ha fallat la connexió a %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Entrada: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "No s'ha pogut escriure el fitxer %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "No s'ha pogut llegir el fitxer %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "El missatge és massa llarg, s'han retallat els darrers %s octets."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s no està connectat."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Avís de %s no permès."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"S'ha ignorat un missatge. Esteu excedint el límit de velocitat del servidor."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "El xat a %s no està disponible."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Esteu enviant missatges massa de pressa a %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Us heu perdut un missatge instantani de %s perquè era massa gran."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Heu perdut un missatge instantani de %s perquè s'ha enviat massa de pressa."
-
-#, c-format
-msgid "Failure."
-msgstr "Fallada."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Massa coincidències."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Es necessiten més qualificadors."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Servei de directori no disponible temporalment."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Recerca per adreça de correu electrònic restringida."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "S'ha ignorat la paraula clau."
-
-#, c-format
-msgid "No keywords."
-msgstr "No hi ha paraules clau."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "L'usuari no té informació al directori."
-
-# FIXME
-#, c-format
-msgid "Country not supported."
-msgstr "Aquest país no està disponible."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Fallada desconeguda: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "El nom d'usuari o la contrasenya no són correctes."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "El servei està temporalment no disponible."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "El vostre nivell d'avisos és massa alt per a connectar-se."
-
-#, c-format
-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 ""
-"Us heu estat connectant i desconnectant amb massa freqüència. Espereu deu "
-"minuts i torneu-ho a provar. Si continueu intentant-ho, haureu d'esperar "
-"encara més."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Hi ha hagut un error de connexió desconegut: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "S'ha produït un error desconegut, %d. Informació: %s"
-
-msgid "Invalid Groupname"
-msgstr "El nom del grup no és vàlid"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;sala&gt;:  entra en una sala de xat de la xarxa Yahoo"
 
-msgid "Connection Closed"
-msgstr "Connexió tancada"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  llista les sales de la xarxa Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "S'està esperant una resposta..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: fa una petició a l'usuari per iniciar una sessió Doodle"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC ha tornat de la pausa. Ja podeu enviar missatges de nou."
+msgid "Yahoo ID..."
+msgstr "ID de Yahoo..."
 
-msgid "Password Change Successful"
-msgstr "S'ha canviat la contrasenya amb èxit"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Connector per al protocol Yahoo!"
 
-msgid "_Group:"
-msgstr "_Grup:"
+msgid "Pager server"
+msgstr "Servidor de cercapersones"
 
-msgid "Get Dir Info"
-msgstr "Aconsegueix informació del directori"
+msgid "Pager port"
+msgstr "Port per al cercapersones"
 
-msgid "Set Dir Info"
-msgstr "Estableix informació del directori"
+msgid "File transfer server"
+msgstr "Servidor de transferència de fitxers"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "No s'ha pogut obrir %s per a escriure-hi."
+msgid "File transfer port"
+msgstr "Port per transferència de fitxers"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
-"l'altra banda."
+# FIXME: no poso localització perquè l'usuari ho podria
+#        confondre amb "ubicació" (josep)
+msgid "Chat room locale"
+msgstr "Característiques locals de la sala de xat"
 
-msgid "Could not connect for transfer."
-msgstr "No s'ha pogut connectar per realitzar la transferència."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Bloca invitacions a conferències i sales de xat"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "No s'ha pogut escriure la capçalera del fitxer. No s'enviarà."
+msgid "Chat room list URL"
+msgstr "URL de la llista de sales de xat"
 
-msgid "Save As..."
-msgstr "Anomena i desa..."
+msgid "Yahoo Chat server"
+msgstr "Servidor de xat de Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s demana a %s que accepti %d fitxer: %s (%.2f %s)%s%s"
-msgstr[1] "%s demana a %s que accepti %d fitxers: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Port del xat de Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s us demana que li envieu un fitxer"
+msgid "Yahoo JAPAN ID..."
+msgstr "ID de Yahoo del Japó..."
 
 #. *< type
 #. *< ui_requirement
@@ -9546,14 +9515,11 @@ msgstr "%s us demana que li envieu un fitxer"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Connector per al protocol TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Connector per al protocol Yahoo! del Japó"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s us ha enviat una invitació a la seva càmera web, però això encara no està "
-"implementat."
+msgid "Your SMS was not delivered"
+msgstr "No s'ha enviat l'SMS"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "No s'ha pogut enviar el vostre missatge de Yahoo!"
@@ -9579,6 +9545,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "S'ha rebutjat afegir l'amic"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "S'han rebut dades invàlides"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"El compte està blocat perquè s'ha intentat entrar massa cops. Això es pot "
+"solucionar entrant al web de Yahoo!"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"El compte està blocat, però no se'n coneix el motiu. Això es pot solucionar "
+"entrant al web de Yahoo!"
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Manquen el nom d'uruari o la contrasenya"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9613,39 +9603,28 @@ msgstr ""
 "al web de Yahoo!"
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No s'ha pogut afegir l'amic %s al grup %s a la llista del servidor del "
 "compte %s."
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "No s'ha pogut afegir l'amic a la llista del servidor"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "S'ha rebut una resposta HTTP inesperada del servidor."
-
-msgid "Connection problem"
-msgstr "Hi ha un problema de connexió"
+msgid "Received unexpected HTTP response from server"
+msgstr "S'ha rebut una resposta HTTP inesperada del servidor"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"S'ha perdut la connexió amb %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "S'ha perdut la connexió amb %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"No s'ha pogut establir la connexió amb %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "No s'ha pogut establir una connexió amb %s: %s"
 
 msgid "Not at Home"
 msgstr "Fora de casa"
@@ -9692,8 +9671,8 @@ msgstr "Paràmetres de la presència"
 msgid "Start Doodling"
 msgstr "Comença a dibuixar"
 
-msgid "Activate which ID?"
-msgstr "Quin ID voleu activar?"
+msgid "Select the ID you want to activate"
+msgstr "Seleccioneu l'ID que vulgueu activar"
 
 msgid "Join whom in chat?"
 msgstr "A qui us voleu unir al xat?"
@@ -9707,75 +9686,15 @@ msgstr "Entra a un xat d'un usuari..."
 msgid "Open Inbox"
 msgstr "Obre la safata d'entrada"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;sala&gt;:  entra en una sala de xat de la xarxa Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  llista les sales de la xarxa Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: fa una petició a l'usuari per iniciar una sessió Doodle"
-
-msgid "Yahoo ID..."
-msgstr "ID de Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Connector per al protocol Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japó"
-
-msgid "Pager server"
-msgstr "Servidor de cercapersones"
-
-msgid "Japan Pager server"
-msgstr "Servidor de cercapersones del Japó"
-
-msgid "Pager port"
-msgstr "Port per al cercapersones"
-
-msgid "File transfer server"
-msgstr "Servidor de transferència de fitxers"
-
-msgid "Japan file transfer server"
-msgstr "Servidor de transferència de fitxers del Japó"
-
-msgid "File transfer port"
-msgstr "Port per transferència de fitxers"
-
-# FIXME: no poso localització perquè l'usuari ho podria
-#        confondre amb "ubicació" (josep)
-msgid "Chat room locale"
-msgstr "Característiques locals de la sala de xat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Bloca invitacions a conferències i sales de xat"
-
-msgid "Chat room list URL"
-msgstr "URL de la llista de sales de xat"
-
-msgid "Yahoo Chat server"
-msgstr "Servidor de xat de Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Port del xat de Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Envia la sol·licitud d'un dibuix."
 
+msgid "Unable to connect."
+msgstr "No s'ha pogut connectar."
+
 msgid "Unable to establish file descriptor."
 msgstr "No s'ha pogut establir un descriptor de fitxer."
 
@@ -9783,6 +9702,9 @@ msgstr "No s'ha pogut establir un descriptor de fitxer."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s està intentant enviar-vos un grup de %d fitxers.\n"
 
+msgid "Write Error"
+msgstr "Error d'escriptura"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil Yahoo! japonès"
 
@@ -9851,12 +9773,8 @@ msgid "The user's profile is empty."
 msgstr "El perfil d'usuari està buit."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s no ha acceptat la vostra invitació d'entrar a la sala «%s» perquè «%s»."
-
-msgid "Invitation Rejected"
-msgstr "S'ha rebutjat la invitació"
+msgid "%s has declined to join."
+msgstr "%s no ha volgut connectar-se."
 
 msgid "Failed to join chat"
 msgstr "No s'ha pogut unir al xat"
@@ -9899,22 +9817,17 @@ msgstr "Veus"
 msgid "Webcams"
 msgstr "Càmeres web"
 
+msgid "Connection problem"
+msgstr "Hi ha un problema de connexió"
+
 msgid "Unable to fetch room list."
 msgstr "No s'ha pogut obtenir la llista de sales."
 
 msgid "User Rooms"
 msgstr "Sales d'usuari"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Problema de connexió amb el servidor YCHT."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"S'ha perdut la connexió al servidor\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Hi ha un problema de connexió amb el servidor YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10050,17 +9963,9 @@ msgid "Exposure"
 msgstr "Exposició"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
-"No s'ha pogut crear el sòcol:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
-"No s'ha pogut analitzar la resposta del servidor intermediari d'HTTP: %s\n"
+"No s'ha pogut analitzar la resposta del servidor intermediari d'HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
@@ -10068,7 +9973,7 @@ msgstr "Error en la connexió al servidor intermediari d'HTTP %d"
 
 # FIXME: tunelitzar... tunelar? fer un túnel?
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "S'ha denegat l'accés: el servidor intermediari d'HTTP prohibeix la "
 "tunelització del port %d"
@@ -10077,9 +9982,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "S'ha produït un error en resoldre %s"
 
-msgid "Could not resolve host name"
-msgstr "No s'ha pogut resoldre el nom de l'ordinador"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "S'està reclamant l'atenció de %s..."
@@ -10166,9 +10068,6 @@ msgstr "No molesteu"
 msgid "Extended away"
 msgstr "Absent durant una bona estona"
 
-msgid "Mobile"
-msgstr "Mòbil"
-
 # És un estat, com "fora de línia", etc. (josep)
 msgid "Listening to music"
 msgstr "Escoltant música"
@@ -10211,18 +10110,6 @@ msgstr "+++ %s ja no està inactiu"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "S'ha produït un error en llegir %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"S'ha produït un error en llegir el vostre %s. No s'han carregat, i s'ha "
-"canviat el nom del fitxer per %s~."
-
 msgid "Calculating..."
 msgstr "S'està calculant..."
 
@@ -10332,6 +10219,18 @@ msgstr "S'ha refusat la connexió."
 msgid "Address already in use."
 msgstr "Aquesta adreça ja s'està fent servir"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "S'ha produït un error en llegir %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"S'ha produït un error en llegir el vostre %s. No s'ha carregat el fitxer, i "
+"s'ha canviat el nom per %s~."
+
 msgid "Internet Messenger"
 msgstr "Missatger d'Internet"
 
@@ -10374,10 +10273,8 @@ msgstr "_Notifica si hi ha correu nou"
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilitza aquesta _icona d'amic per a aquest compte:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Opcions de %s"
+msgid "Ad_vanced"
+msgstr "_Avançat"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Empra la configuració del servidor intermediari del Gnome"
@@ -10412,9 +10309,6 @@ msgstr "Si mireu de ben a prop"
 msgid "you can see the butterflies mating"
 msgstr "podreu veure les papallones aparellant-se"
 
-msgid "Proxy Options"
-msgstr "Opcions del servidor intermediari"
-
 msgid "Proxy _type:"
 msgstr "_Tipus de servidor intermediari"
 
@@ -10442,8 +10336,8 @@ msgstr "_Bàsic"
 msgid "Create _this new account on the server"
 msgstr "Crea _aquest compte nou al servidor"
 
-msgid "_Advanced"
-msgstr "_Avançat"
+msgid "P_roxy"
+msgstr "Servidor _intermediari"
 
 msgid "Enabled"
 msgstr "Habilitat"
@@ -10494,8 +10388,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Actualitzeu els camps necessaris."
 
-msgid "Room _List"
-msgstr "_Llista de sales"
+msgid "A_ccount"
+msgstr "_Compte"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10503,8 +10397,8 @@ msgid ""
 msgstr ""
 "Introduïu la informació necessària sobre el xat al qual vulgueu entrar.\n"
 
-msgid "_Account:"
-msgstr "C_ompte:"
+msgid "Room _List"
+msgstr "_Llista de sales"
 
 msgid "_Block"
 msgstr "_Bloca"
@@ -10522,6 +10416,15 @@ msgstr "_Informació"
 msgid "I_M"
 msgstr "_MI"
 
+msgid "_Audio Call"
+msgstr "_Trucada amb àudio"
+
+msgid "Audio/_Video Call"
+msgstr "Trucada d'àudio i _vídeo"
+
+msgid "_Video Call"
+msgstr "Trucada de _vídeo"
+
 msgid "_Send File..."
 msgstr "_Envia un fitxer..."
 
@@ -10531,9 +10434,12 @@ msgstr "Afegeix un a_vís per a l'amic..."
 msgid "View _Log"
 msgstr "_Visualitza el registre"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Amaga quan estigui fora de línia"
 
+msgid "Show When Offline"
+msgstr "Mostra quan estigui fora de línia"
+
 msgid "_Alias..."
 msgstr "À_lies..."
 
@@ -10657,6 +10563,9 @@ msgstr "/Eines/_Avís per a amics"
 msgid "/Tools/_Certificates"
 msgstr "/Eines/C_ertificats"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Eines/Em_oticones personalitzades"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Eines/_Connectors"
 
@@ -10666,9 +10575,6 @@ msgstr "/Eines/Pre_ferències"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eines/_Privadesa"
 
-msgid "/Tools/Smile_y"
-msgstr "/Eines/Em_oticona"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Eines/_Transferència de fitxers"
 
@@ -10786,8 +10692,8 @@ msgstr "Manualment"
 msgid "By status"
 msgstr "Per estat"
 
-msgid "By log size"
-msgstr "Per la mida del registre"
+msgid "By recent log activity"
+msgstr "Per activitat recent en el registre"
 
 #, c-format
 msgid "%s disconnected"
@@ -10803,6 +10709,9 @@ msgstr "Torna a connectar"
 msgid "Re-enable"
 msgstr "Rehabilita"
 
+msgid "SSL FAQs"
+msgstr "PMF sobre SSL"
+
 msgid "Welcome back!"
 msgstr "Ben tornat!"
 
@@ -10891,6 +10800,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Àl_ies:"
 
+msgid "_Group:"
+msgstr "_Grup:"
+
 msgid "Auto_join when account becomes online."
 msgstr "_Entra automàticament quant el compte estigui connectat."
 
@@ -10924,6 +10836,104 @@ msgstr "/Eines"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amics/Ordena els amics"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Color de fons"
+
+msgid "The background color for the buddy list"
+msgstr "El color de fons de la llista d'amics"
+
+msgid "Layout"
+msgstr "Format"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "El format de les icones, el nom, i l'estat de la llista d'amics"
+
+# Color de fons quan la blist està expandida
+#. Group
+msgid "Expanded Background Color"
+msgstr "Color de fons expandit"
+
+msgid "The background color of an expanded group"
+msgstr "El color de fons d'un grup expandit"
+
+msgid "Expanded Text"
+msgstr "Text expandit"
+
+msgid "The text information for when a group is expanded"
+msgstr "Text informatiu d'un grup expandit"
+
+msgid "Collapsed Background Color"
+msgstr "Color de fons col·lapsat"
+
+msgid "The background color of a collapsed group"
+msgstr "El color de fons d'un grup col·lapsat"
+
+msgid "Collapsed Text"
+msgstr "Text col·lapsat"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Text informatiu d'un grup col·lapsat"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Color de fons dels contactes i xats"
+
+msgid "The background color of a contact or chat"
+msgstr "El color de fons d'un contacte o un xat"
+
+msgid "Contact Text"
+msgstr "Text del contacte"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Text informatiu quan un contacte s'expandeix"
+
+msgid "On-line Text"
+msgstr "Text en línia"
+
+msgid "The text information for when a buddy is online"
+msgstr "Text informatiu per quan un amic estigui en línia"
+
+msgid "Away Text"
+msgstr "Text d'absència"
+
+msgid "The text information for when a buddy is away"
+msgstr "Text informatiu per quan un amic estigui absent"
+
+msgid "Off-line Text"
+msgstr "Text de fora de línia"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Text informatiu per quan un amic estigui fora de línia"
+
+msgid "Idle Text"
+msgstr "Text d'inactivitat"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Text informatiu per quan un amic estigui inactiu"
+
+msgid "Message Text"
+msgstr "Text del missatge"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Text informatiu per quan un amic tingui un missatge per llegir"
+
+msgid "Message (Nick Said) Text"
+msgstr "Text del missatge (on s'hi ha dit el sobrenom)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"Text informatiu quan hi ha un missatge per llegir que conté el vostre "
+"sobrenom en un xat"
+
+msgid "The text information for a buddy's status"
+msgstr "Text informatiu per l'estat d'un amic"
+
+msgid "Type the host name for this certificate."
+msgstr "Entreu el nom de l'ordinador al qual pertany aquest certificat."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidors SSL"
@@ -10941,14 +10951,6 @@ msgstr "No esteu connectat amb cap protocol que permeti convidar aquest amic."
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convida l'amic a una sala de xat"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Introduïu el nom de l'usuari que vulgueu convidar, així com un missatge "
-"d'invitació opcional."
-
 msgid "_Buddy:"
 msgstr "_Amic:"
 
@@ -10977,7 +10979,7 @@ msgstr "Ignora"
 msgid "Get Away Message"
 msgstr "Aconsegueix el missatge d'absència"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "El darrer que es digué"
 
 msgid "Unable to save icon file to disk."
@@ -11024,6 +11026,18 @@ msgstr "/Conversa/Anomena i _desa..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/_Neteja la finestra"
 
+msgid "/Conversation/M_edia"
+msgstr "/Conversa/M_edi"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversa/Medi/_Trucada d'àudio"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversa/Medi/Trucada de _vídeo"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversa/Medi/Tru_cada d'àudio i vídeo"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Envia un _fitxer..."
 
@@ -11096,6 +11110,15 @@ msgstr "/Conversa"
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Visualitza el registre"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversa/Medi/Trucada d'àudio"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversa/Medi/Trucada de vídeo"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversa/Medi/Trucada d'àudio i vídeo"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Envia un fitxer..."
 
@@ -11282,6 +11305,9 @@ msgstr "artista"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "veu i vídeo"
+
 msgid "support"
 msgstr "suport"
 
@@ -11409,6 +11435,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Hongarès"
 
+msgid "Armenian"
+msgstr "Armeni"
+
 msgid "Indonesian"
 msgstr "Indonesi"
 
@@ -11424,6 +11453,9 @@ msgstr "Georgià"
 msgid "Ubuntu Georgian Translators"
 msgstr "Traductors al georgià de l'Ubuntu"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11503,6 +11535,9 @@ msgstr "Sinhala"
 msgid "Swedish"
 msgstr "Suec"
 
+msgid "Swahili"
+msgstr " Suahili"
+
 msgid "Tamil"
 msgstr "Tàmil"
 
@@ -11839,7 +11874,7 @@ msgstr "El color amb què pintar els enllaços."
 msgid "Hyperlink visited color"
 msgstr "Color dels enllaços visitats"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "El color amb el qual es pintaran els enllaços que ja s'hagin visitat (o "
 "activat)."
@@ -11881,15 +11916,21 @@ msgstr "Color amb el qual es pintaran els missatges d'acció."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Color del nom del missatge d'acció per a missatges xiuxiuejats"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Color amb el qual es pintaran els missatges d'acció xiuxiuejats."
+
 msgid "Whisper Message Name Color"
 msgstr "Color dels missatges xiuxiuejats enviats"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Color amb el qual es pintaran els missatges xiuxiuejats."
+
 msgid "Typing notification color"
 msgstr "Color per a les notificacions de quan s'escriu"
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
-"El color que s'emprarà per a les notificacions indicant que s'està escrivint"
+"El color que s'emprarà per a les notificacions indicant que s'està teclejant"
 
 msgid "Typing notification font"
 msgstr "Tipus de lletra de les notificacions quan s'escriu"
@@ -11902,15 +11943,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Habilita les notificacions de que s'està escrivint"
 
-msgid "_Copy Email Address"
-msgstr "_Copia l'adreça de correu"
-
-msgid "_Open Link in Browser"
-msgstr "_Obre l'enllaç en el navegador"
-
-msgid "_Copy Link Location"
-msgstr "_Copia la ubicació de l'enllaç"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11954,11 +11986,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Desa imatge"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Desa la imatge..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Afegeix una emoticona personalitzada..."
 
@@ -12049,9 +12079,6 @@ msgstr "Disminueix la mida de la lletra"
 msgid "Font Face"
 msgstr "Tipus de lletra"
 
-msgid "Background Color"
-msgstr "Color de fons"
-
 msgid "Foreground Color"
 msgstr "Color del text"
 
@@ -12169,6 +12196,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12183,8 +12211,11 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
 "  -d, --debug         mostra missatges de depuració a la sortida estàndard\n"
+"  -f, --force-online  força que s'estigui en línia, independent de l'estat "
+"de\n"
+"                      la xarxa\n"
 "  -h, --help          mostra aquesta ajuda i surt\n"
-"  -m, --multiple      permet que hi hagi més d'una instància\n"
+"  -m, --multiple      no controla que només hi hagi una instància\n"
 "  -n, --nologin       no entra automàticament\n"
 "  -l, --login[=NOM]   habilita el compte especificat (l'argument opcional "
 "NOM\n"
@@ -12201,6 +12232,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12214,8 +12246,11 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
 "  -d, --debug         mostra missatges de depuració a la sortida estàndard\n"
+"  -f, --force-online  força que s'estigui en línia, independent de l'estat "
+"de\n"
+"                      la xarxa\n"
 "  -h, --help          mostra aquesta ajuda i surt\n"
-"  -m, --multiple      permet que hi hagi més d'una instància\n"
+"  -m, --multiple      no controla que només hi hagi una instància\n"
 "  -n, --nologin       no entra automàticament\n"
 "  -l, --login[=NOM]   habilita el compte especificat (l'argument opcional "
 "NOM\n"
@@ -12264,11 +12299,22 @@ msgstr ""
 "Ara se sortirà atès que ja hi ha un altre client del libpurple executant-"
 "se.\n"
 
-msgid "Open All Messages"
-msgstr "Obre tots els missatges"
+msgid "/_Media"
+msgstr "/_Medi"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Teniu correu electrònic.</span>"
+msgid "/Media/_Hangup"
+msgstr "/Medi/_Penja"
+
+msgid "Calling..."
+msgstr "S'està trucant..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s vol iniciar una sessió d'àudio/vídeo."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s vol iniciar una sessió de vídeo."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12298,6 +12344,26 @@ msgid ""
 msgstr ""
 "S'ha triat l'ordre per al navegador «manualment», però no se n'ha indicat cap."
 
+msgid "No message"
+msgstr "Cap missatge"
+
+msgid "Open All Messages"
+msgstr "Obre tots els missatges"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Teniu correu electrònic.</span>"
+
+msgid "New Pounces"
+msgstr "Avisos nous"
+
+# FIXME: Cancel·la?
+msgid "Dismiss"
+msgstr "Rebutja"
+
+# FIXME: pounced -> envestir?
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Us han envestit!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Es descarregaran els connectors següents."
 
@@ -12346,11 +12412,17 @@ msgstr "<b>Detalls del connector</b>"
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
+msgid "Modify Buddy Pounce"
+msgstr "Modifica l'avís per a l'amic"
+
 # FIXME
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Avisa dels Whom"
 
+msgid "_Account:"
+msgstr "C_ompte:"
+
 msgid "_Buddy name:"
 msgstr "_Nom de l'amic:"
 
@@ -12421,8 +12493,58 @@ msgstr "_Recurrent"
 msgid "Pounce Target"
 msgstr "Objectiu de l'avís"
 
-msgid "Smiley theme failed to unpack."
-msgstr "No s'ha pogut desempaquetar el tema d'emoticones."
+#, c-format
+msgid "Started typing"
+msgstr "Hagi començat a escriure"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "S'aturi mentre tecleja"
+
+#, c-format
+msgid "Signed on"
+msgstr "Es connecti"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Torna a estar actiu"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Torni a estar present"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Pari d'escriure"
+
+#, c-format
+msgid "Signed off"
+msgstr "Es desconnecti"
+
+#, c-format
+msgid "Became idle"
+msgstr "Passi a inactiu"
+
+#, c-format
+msgid "Went away"
+msgstr "En estar absent"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Envia un missatge"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Esdeveniment d'avís desconegut, informeu-nos-en."
+
+msgid "Theme failed to unpack."
+msgstr "No s'ha pogut desempaquetar el tema."
+
+msgid "Theme failed to load."
+msgstr "No s'ha pogut carregar el tema."
+
+msgid "Theme failed to copy."
+msgstr "No s'ha pogut copiar el tema."
 
 msgid "Install Theme"
 msgstr "Instal·la el tema"
@@ -12443,6 +12565,11 @@ msgstr "Dreceres de teclat"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Tanca les converses amb la tecla d'_escapament"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Tema de la llista d'amics"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Icona d'estat"
 
@@ -12452,9 +12579,8 @@ msgstr "_Mostra la icona d'estat:"
 msgid "On unread messages"
 msgstr "Si hi ha missatges sense llegir"
 
-# REVIEW
-msgid "Conversation Window Hiding"
-msgstr "Ocultació de les finestres"
+msgid "Conversation Window"
+msgstr "Finestra de conversa"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Amaga noves converses de MI:"
@@ -12462,6 +12588,9 @@ msgstr "_Amaga noves converses de MI:"
 msgid "When away"
 msgstr "En estar absent"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_Minimitza les finestres de conversa noves"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Pestanyes"
@@ -12520,9 +12649,6 @@ msgstr "Empra el desplaçament suau"
 msgid "F_lash window when IMs are received"
 msgstr "_Fes que la finestra faci un flaix quan hi arribin missatges"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_Minimitza les finestres de conversa noves"
-
 msgid "Minimum input area height in lines:"
 msgstr "Alçada mínima en línies de l'àrea d'entrada:"
 
@@ -12555,14 +12681,12 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "No s'ha pogut iniciar el programa de configuració del navegador."
 
-msgid "ST_UN server:"
-msgstr "Servidor ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "Detecta l'_adreça IP automàticament"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Empra l'_adreça IP detectada automàticament: %s"
 
 msgid "Public _IP:"
 msgstr "IP _pública:"
@@ -12582,6 +12706,10 @@ msgstr "Port _inicial:"
 msgid "_End port:"
 msgstr "Port _final:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Servidor repetidor (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor intermediari i navegador"
 
@@ -12774,12 +12902,12 @@ msgstr "En estar absent i inactiu alhora"
 msgid "Auto-away"
 msgstr "Auto-absència"
 
-msgid "Change status when _idle"
-msgstr "_Canvia l'estat quan estigui inactiu"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuts abans de passar a inactiu:"
 
+msgid "Change status when _idle"
+msgstr "_Canvia l'estat quan estigui inactiu"
+
 msgid "Change _status to:"
 msgstr "Canvia l'_estat a:"
 
@@ -12928,47 +13056,43 @@ msgstr "Desa i _fes servir"
 msgid "Status for %s"
 msgstr "Estat per a %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Ja hi ha una emoticona personalitzada per a «%s». Indiqueu-ne una de diferent."
+
 msgid "Custom Smiley"
 msgstr "Emoticona personalitzada"
 
-msgid "More Data needed"
-msgstr "Calen més dades"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Especifiqueu una drecera associada a l'emoticona."
-
 msgid "Duplicate Shortcut"
 msgstr "Drecera duplicada"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Hi ha una emoticona personalitzada per la drecera que heu seleccionat. "
-"Indiqueu-ne una de diferent."
-
-msgid "Please select an image for the smiley."
-msgstr "Seleccioneu una imatge per a l'emoticona."
-
 msgid "Edit Smiley"
 msgstr "Edita l'emoticona"
 
 msgid "Add Smiley"
 msgstr "Afegeix una emoticona"
 
-msgid "Smiley _Image"
-msgstr "_Imatge de l'emoticona"
+msgid "_Image:"
+msgstr "_Imatge:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "_Dreceres de l'emoticona"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "_Drecera:"
 
 msgid "Smiley"
 msgstr "Emoticona"
 
+msgid "Shortcut Text"
+msgstr "Drecera"
+
 msgid "Custom Smiley Manager"
 msgstr "Gestor d'emoticones personalitzades"
 
+msgid "Select Buddy Icon"
+msgstr "Seleccioneu una icona per a l'amic"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Feu clic per canviar la icona d'amic d'aquest compte."
 
@@ -13054,8 +13178,8 @@ msgid "Cannot send launcher"
 msgstr "No es pot enviar el llançador"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Heu arrossegat un llançador de l'escriptori. Segurament voleu enviar allò a "
 "què aquest llançador apunta i no pas el llançador."
@@ -13093,8 +13217,29 @@ msgstr ""
 "No s'ha pogut carregar la imatge «%s»: no se'n coneix el motiu, possiblement "
 "la imatge estigui corrompuda"
 
+msgid "_Open Link"
+msgstr "_Obre l'enllaç"
+
+msgid "_Copy Link Location"
+msgstr "_Copia l'enllaç"
+
+msgid "_Copy Email Address"
+msgstr "_Copia l'adreça de correu"
+
+msgid "_Open File"
+msgstr "_Obre un fitxer"
+
+msgid "Open _Containing Directory"
+msgstr "Obre el directori on es _troba"
+
 msgid "Save File"
-msgstr "Desa un fitxer"
+msgstr "Desa el fitxer"
+
+msgid "_Play Sound"
+msgstr "_Reprodueix un so"
+
+msgid "_Save File"
+msgstr "_Desa el fitxer"
 
 msgid "Select color"
 msgstr "Seleccioneu un color"
@@ -13187,6 +13332,68 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 "Mostra informació estadística sobre la disponibilitat dels vostres amics"
 
+msgid "Server name request"
+msgstr "Sol·licitud del nom del servidor"
+
+msgid "Enter an XMPP Server"
+msgstr "Introduïu un servidor XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Seleccioneu el servidor XMPP a consultar"
+
+msgid "Find Services"
+msgstr "Cerca serveis"
+
+msgid "Add to Buddy List"
+msgstr "Afegeix a la llista d'amics"
+
+msgid "Gateway"
+msgstr "Passarel·la"
+
+msgid "Directory"
+msgstr "Directori"
+
+msgid "PubSub Collection"
+msgstr "Col·lecció PubSub"
+
+# Mes info a xep-0060
+msgid "PubSub Leaf"
+msgstr "Fulla PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descripció:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Servei de descoberta"
+
+msgid "_Browse"
+msgstr "_Navega"
+
+msgid "Server does not exist"
+msgstr "El servidor no existeix"
+
+msgid "Server does not support service discovery"
+msgstr "El servidor no permet la descoberta de serveis"
+
+# xep-0060
+msgid "XMPP Service Discovery"
+msgstr "Servei de descoberta XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Permet navegar i registrar-se a serveis."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Aquest servei és útil per registrar-vos a transports antics o altres serveis "
+"XMPP."
+
 msgid "Buddy is idle"
 msgstr "L'amic està inactiu"
 
@@ -13582,7 +13789,7 @@ msgstr "Connector de missatgeria de música per a composar conjuntament."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "El connector per a missatgeria de música permet que diferents usuaris puguin "
 "treballar en una mateixa peça de música, editant la mateixa partitura en "
@@ -13698,12 +13905,6 @@ msgstr ""
 "- escriu a l'inrevés tots els missatges rebuts\n"
 "- envia un missatge a tots els amics immediatament després que es connectin"
 
-msgid "Cursor Color"
-msgstr "Color del cursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Color secundari del cursor"
-
 msgid "Hyperlink Color"
 msgstr "Color dels hiperenllaços"
 
@@ -13713,6 +13914,9 @@ msgstr "Color dels enllaços visitats"
 msgid "Highlighted Message Name Color"
 msgstr "Nom del color per als missatges ressaltats"
 
+msgid "Typing Notification Color"
+msgstr "Color per a les notificacions de quan s'escriu"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separació horitzontal del GtkTreeView"
 
@@ -13742,35 +13946,21 @@ msgstr "Tipus de lletra de la interfície GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de la drecera de text de GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Colors de la interfície"
+msgid "Disable Typing Notification Text"
+msgstr "Inhabilita les notificacions de que s'està escrivint"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Configuració dels temes GTK+"
 
-msgid "Widget Sizes"
-msgstr "Mides del giny"
+msgid "Colors"
+msgstr "Colors"
 
 msgid "Fonts"
 msgstr "Tipus de lletra"
 
+msgid "Miscellaneous"
+msgstr "Miscel·lània"
+
 msgid "Gtkrc File Tools"
 msgstr "Eines de fitxer Gtkrc"
 
@@ -13857,7 +14047,7 @@ msgstr "Botó d'enviar de la finestra de conversa."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Afegeix un botó d'Enviar a l'àrea d'entrada de la finestra de conversa. Està "
 "pensat per situacions en què no hi ha cap teclat."
@@ -13913,6 +14103,95 @@ msgstr ""
 "Substitueix el text dels missatges que s'envien emprant les regles que hàgiu "
 "establert."
 
+msgid "Just logged in"
+msgstr "Acabat de connectar"
+
+msgid "Just logged out"
+msgstr "Acabat de desconnectar"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Icona per a un contacte/\n"
+"Icona per a una persona desconeguda"
+
+msgid "Icon for Chat"
+msgstr "Icona per un xat"
+
+msgid "Ignored"
+msgstr "Ignorat"
+
+msgid "Founder"
+msgstr "Fundador"
+
+msgid "Operator"
+msgstr "Operador"
+
+msgid "Half Operator"
+msgstr "Mig operador"
+
+msgid "Authorization dialog"
+msgstr "Diàleg d'autorització"
+
+msgid "Error dialog"
+msgstr "Diàleg d'error"
+
+msgid "Information dialog"
+msgstr "Diàleg d'informació"
+
+msgid "Mail dialog"
+msgstr "Diàleg del correu"
+
+msgid "Question dialog"
+msgstr "Diàleg de pregunta"
+
+msgid "Warning dialog"
+msgstr "Diàleg d'avís"
+
+msgid "What kind of dialog is this?"
+msgstr "Quin tipus de diàleg és aquest?"
+
+msgid "Status Icons"
+msgstr "Icona d'estat"
+
+msgid "Chatroom Emblems"
+msgstr "Distintius de les sales de xat"
+
+msgid "Dialog Icons"
+msgstr "Icones dels quadres de diàleg"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Editor de temes d'icona del Pidgin"
+
+msgid "Contact"
+msgstr "Contacte"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Editor de temes per a la llista d'amics del Pidgin"
+
+msgid "Edit Buddylist Theme"
+msgstr "Edita el tema de la llista d'amics"
+
+msgid "Edit Icon Theme"
+msgstr "Edita el tema d'icones"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Editor de temes del Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Editor de temes del Pidgin"
+
 # FIXME (josep)
 #. *< type
 #. *< ui_requirement
@@ -14083,7 +14362,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Opcions específiques de la versió del Pidgin per al Windows"
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Proporciona opcions específiques per a la versió Windows del Pidgin, com ara "
 "l'acoblament de la llista d'amics."
@@ -14126,6 +14405,532 @@ msgstr "Envia i rep blocs XMPP en brut."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s no ha acceptat la vostra invitació d'entrar a la sala «%s» perquè «%s»."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "S'ha rebutjat la invitació"
+
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "La connexió al servidor BOSH està malmesa"
+
+#~ msgid "_Proxy"
+#~ msgstr "Servidor _intermediari"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "No s'ha pogut obrir el sòcol"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "No s'ha pogut escoltar al sòcol"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "No s'ha pogut llegir el sòcol"
+
+#~ msgid "Connection failed."
+#~ msgstr "Ha fallat la connexió."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "El servidor ha desconnectat"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "No s'ha pogut crear el sòcol"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "No s'ha pogut connectar a l'ordinador"
+
+#~ msgid "Read error"
+#~ msgstr "Error de lectura"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut establir una connexió amb el servidor:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Error d'escriptura"
+
+#~ msgid "Read Error"
+#~ msgstr "Error de lectura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "No s'ha pogut connectar al servidor."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "La memòria intermèdia de lectura és plena (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "No es pot analitzar el missatge"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Ha fallat l'entrada (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Se us ha desconnectat perquè heu entrat a través d'una altra estació de "
+#~ "treball."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error. No hi ha instal·lades les biblioteques per a SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "La contrasenya no és correcta."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut connectar al servidor BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Se us pot desconnectar d'aquí a poc temps. Comproveu si hi ha "
+#~ "actualitzacions a %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "No s'ha pogut connectar"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "No s'ha pogut desxifrar la resposta del servidor"
+
+#~ msgid "Invalid username."
+#~ msgstr "El nom d'usuari no és vàlid"
+
+#~ msgid "Connection lost"
+#~ msgstr "S'ha perdut la connexió"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "No s'ha pogut obtenir l'adreça de l'ordinador"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "S'ha tancat la connexió (escrivint)"
+
+#~ msgid "Connection reset"
+#~ msgstr "S'ha reiniciat la connexió"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "S'ha produït un error en llegir del sòcol: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "No s'ha pogut connectar a l'ordinador"
+
+#~ msgid "Could not write"
+#~ msgstr "No s'ha pogut escriure"
+
+#~ msgid "Could not connect"
+#~ msgstr "No s'ha pogut connectar"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "No s'ha pogut crear el sòcol per a escoltar"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "No s'ha pogut resoltre el nom de l'ordinador"
+
+#~ msgid "Incorrect Password"
+#~ msgstr "La contrasenya no és correcta"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut establir la connexió amb %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japó"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Servidor de cercapersones del Japó"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Servidor de transferència de fitxers del Japó"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "S'ha perdut la connexió al servidor\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "No s'ha pogut resoldre el nom de l'ordinador"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "No s'ha pogut connectar a %s: el servidor requereix TLS/SSL, però no s'ha "
+#~ "trobat cap implementació de TLS/SSL."
+
+#~ msgid "Last Activity"
+#~ msgstr "Darrera activitat"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Informació del servei de descoberta"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Elements del servei de descoberta"
+
+# http://xmpp.org/extensions/xep-0033.html
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Bloc d'adreçament estès"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Xat multi-usuari"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Informació de presència estesa per a xats multi-usuari"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ordres Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Servei PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Flux de bits SOCK5"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Ubicació de l'usuari"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar de l'usuari"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notificacions de l'estat del xat"
+
+#~ msgid "Software Version"
+#~ msgstr "Versió del programari"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Iniciació del flux"
+
+#~ msgid "User Mood"
+#~ msgstr "Estat d'ànim de l'usuari"
+
+#~ msgid "User Activity"
+#~ msgstr "Activitat de l'usuari"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capacitats de l'entitat"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negociacions de la sessió xifrada"
+
+# Pot ser també música, cançó... (josep)
+# Vegeu: http://xmpp.org/extensions/xep-0118.html
+#~ msgid "User Tune"
+#~ msgstr "Melodia de l'usuari"
+
+# Nota: "Roster" en XMPP és la llista de contactes (josep)
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Intercanvi d'element de la llista de contactes"
+
+# Vegeu: http://xmpp.org/extensions/xep-0152.html (josep)
+# Nota: codi mort
+#~ msgid "Reachability Address"
+#~ msgstr "Adreça de localització"
+
+#~ msgid "User Profile"
+#~ msgstr "Perfil de l'usuari"
+
+# Nota: Jingle és una extensió d'XMPP i ho considerem nom propi (josep)
+# http://www.xmpp.org/extensions/xep-0166.html
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+# FIXME
+#~ msgid "Jingle Audio"
+#~ msgstr "Àudio amb Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Sobrenom de l'usuari"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Vídeo amb Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Recepció de missatges"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publicació de claus públiques"
+
+#~ msgid "User Chatting"
+#~ msgstr "Converses d'usuari"
+
+#~ msgid "User Browsing"
+#~ msgstr "Navegació d'usuaris"
+
+#~ msgid "User Gaming"
+#~ msgstr "Jocs d'usuari"
+
+#~ msgid "User Viewing"
+#~ msgstr "Visualització d'usuaris"
+
+# Vegeu: http://xmpp.org/extensions/xep-0200.html
+# Nota: Això es refereix a les capabilitats de l'altre interlocutor
+# No apareix a l'aplicació final, és codi mort dins un #if 0 ... #endif (josep)
+#~ msgid "Stanza Encryption"
+#~ msgstr "Blocs xifrats"
+
+#~ msgid "Entity Time"
+#~ msgstr "Hora de l'entitat"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Lliurament endarrerit"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Objectes de dades col·laboratius"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Dipòsit de fitxers i compartició"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Servei de descoberta STUN per al Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negociació simple del xifratge de la sessió"
+
+# Mireu l'RFC (josep)
+#~ msgid "Hop Check"
+#~ msgstr "Comprovació dels salts"
+
+# REVIEW
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Ocultació de les finestres"
+
+#~ msgid "More Data needed"
+#~ msgstr "Calen més dades"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Especifiqueu una drecera associada a l'emoticona."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Seleccioneu una imatge per a l'emoticona."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Quin ID voleu activar?"
+
+#~ msgid "Account locked: Too many failed login attempts"
+#~ msgstr "S'ha blocat el compte: s'ha intentat entrar massa vegades"
+
+#~ msgid "Account locked: See the debug log"
+#~ msgstr "El compte està blocat: vegeu el registre de depuració"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Color del cursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Color secundari del cursor"
+
+#~ msgid "Interface colors"
+#~ msgstr "Colors de la interfície"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Mides del giny"
+
+#~ msgid "Invite message"
+#~ msgstr "Missatge d'invitació"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Introduïu el nom de l'usuari que vulgueu convidar,\n"
+#~ "així com un missatge d'invitació opcional."
+
+#~ msgid "Looking up %s"
+#~ msgstr "S'està cercant %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Ha fallat la connexió a %s"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Entrada: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "No s'ha pogut escriure el fitxer %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "No s'ha pogut llegir el fitxer %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "El missatge és massa llarg, s'han retallat els darrers %s octets."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s no està connectat."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Avís de %s no permès."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "S'ha ignorat un missatge. Esteu excedint el límit de velocitat del "
+#~ "servidor."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "El xat a %s no està disponible."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Esteu enviant missatges massa de pressa a %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Us heu perdut un missatge instantani de %s perquè era massa gran."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Heu perdut un missatge instantani de %s perquè s'ha enviat massa de "
+#~ "pressa."
+
+#~ msgid "Failure."
+#~ msgstr "Fallada."
+
+#~ msgid "Too many matches."
+#~ msgstr "Massa coincidències."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Es necessiten més qualificadors."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Servei de directori no disponible temporalment."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Recerca per adreça de correu electrònic restringida."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "S'ha ignorat la paraula clau."
+
+#~ msgid "No keywords."
+#~ msgstr "No hi ha paraules clau."
+
+#~ msgid "User has no directory information."
+#~ msgstr "L'usuari no té informació al directori."
+
+# FIXME
+#~ msgid "Country not supported."
+#~ msgstr "Aquest país no està disponible."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Fallada desconeguda: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "El nom d'usuari o la contrasenya no són correctes."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "El servei està temporalment no disponible."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "El vostre nivell d'avisos és massa alt per a connectar-se."
+
+#~ 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 ""
+#~ "Us heu estat connectant i desconnectant amb massa freqüència. Espereu deu "
+#~ "minuts i torneu-ho a provar. Si continueu intentant-ho, haureu d'esperar "
+#~ "encara més."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Hi ha hagut un error de connexió desconegut: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "S'ha produït un error desconegut, %d. Informació: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "El nom del grup no és vàlid"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Connexió tancada"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "S'està esperant una resposta..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC ha tornat de la pausa. Ja podeu enviar missatges de nou."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "S'ha canviat la contrasenya amb èxit"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Aconsegueix informació del directori"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Estableix informació del directori"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "No s'ha pogut obrir %s per a escriure-hi."
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
+#~ "l'altra banda."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "No s'ha pogut connectar per realitzar la transferència."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "No s'ha pogut escriure la capçalera del fitxer. No s'enviarà."
+
+#~ msgid "Save As..."
+#~ msgstr "Anomena i desa..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s demana a %s que accepti %d fitxer: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s demana a %s que accepti %d fitxers: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s us demana que li envieu un fitxer"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Connector per al protocol TOC"
+
+#~ msgid "%s Options"
+#~ msgstr "Opcions de %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Opcions del servidor intermediari"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Servidor ST_UN:"
+
+#~ msgid "By log size"
+#~ msgstr "Per la mida del registre"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Obre l'enllaç en el navegador"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "_Imatge de l'emoticona"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "_Dreceres de l'emoticona"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "No s'ha pogut obtenir la llibreta d'adreces MSN"
 
@@ -14371,13 +15176,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ "El MySpace no permet contrasenyes més llarges de %d caràcters, la vostra "
 #~ "en té %d."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Aneu a http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username escolliu un nom d'usuari i torneu a provar d'entrar."
-
 #~ msgid "Screen name sent"
 #~ msgstr "S'ha enviat el nom d'usuari"
 
@@ -14426,9 +15224,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ "llista d'amics. Opcionalment podeu entrar un àlies, o sobrenom, per a "
 #~ "l'amic. El sobrenom substituirà el nom d'usuari allà on sigui possible.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Compte:"
-
 #~ msgid "User has typed something and stopped"
 #~ msgstr "L'usuari ha escrit alguna cosa i s'ha aturat"
 
@@ -14833,9 +15628,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ "\n"
 #~ "Inactiu: %s"
 
-#~ msgid "Nickname: %s\n"
-#~ msgstr "Sobrenom: %s\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Nickname:</b> %s"
@@ -14873,13 +15665,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Descripció:</b> Xerraire"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15201,21 +15986,12 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "YCHT port"
 #~ msgstr "Port YCHT"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ha sortit."
-
 #~ msgid "Screen Name:"
 #~ msgstr "Nom d'usuari:"
 
-#~ msgid "Background color name"
-#~ msgstr "Nom del color de fons"
-
 #~ msgid "Background color as a string"
 #~ msgstr "El color de fons com a una cadena"
 
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "El color de fons com a GdkColor"
-
 #~ msgid "Background set"
 #~ msgstr "Estableix el color de fons"
 
@@ -15307,9 +16083,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Call ended."
 #~ msgstr "Ha finalitzat la trucada."
 
-#~ msgid "End Call"
-#~ msgstr "Finalitza la trucada"
-
 #~ msgid "Receiving call from %s"
 #~ msgstr "S'està rebent una trucada de %s"
 
@@ -15478,9 +16251,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "_Idle"
 #~ msgstr "_Inactiu"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "Tor_na a estar actiu"
-
 #~ msgid "Bro_wse..."
 #~ msgstr "Na_vega..."
 
@@ -15541,9 +16311,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgstr[0] "(%d missatge)"
 #~ msgstr[1] "(%d missatges)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 missatge)"
-
 #~ msgid "_Hide new messages until tray icon is clicked"
 #~ msgstr ""
 #~ "_Oculta els missatges nous fins que no es faci clic a la icona d'estat"
@@ -15560,9 +16327,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Show transfer details"
 #~ msgstr "Mostra els detalls de la transferència"
 
-#~ msgid "Expander Size"
-#~ msgstr "Mida de l'expansor"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Mida de la fletxa d'expansió"
 
@@ -15785,9 +16549,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Envia un missatge a l'amic seleccionat"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Aconsegueix dades sobre l'amic seleccionat"
-
 #~ msgid "_Chat"
 #~ msgstr "_Xat"
 
@@ -15952,9 +16713,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "New conversation _placement:"
 #~ msgstr "_Posicionament d'una nova conversa:"
 
-#~ msgid "Message Text"
-#~ msgstr "Text del missatge"
-
 #~ msgid "Away Messages"
 #~ msgstr "Missatges d'absència"
 
@@ -15985,9 +16743,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Invisible for friends only"
 #~ msgstr "Només invisible per als amics"
 
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "No s'ha pogut resoldre el nom de l'ordinador."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "S'ha produït un error en escriure al sòcol."
 
@@ -16197,9 +16952,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "/Buddies/Log Out"
 #~ msgstr "/Amics/Desconnecta"
 
-#~ msgid "Miscellaneous error"
-#~ msgstr "Error miscel·lani"
-
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr ""
 #~ "S'ha produït un error desconegut en intentar autoritzar amb el servidor "
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 6d41cd04f3..2823e41535 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -1,9 +1,9 @@
-# Pidgin Valencian (southern Catalan) translation
+# Pidgin Catalan (Valencian) translation
 # Copyright (C) 2003, JM Pérez Cáncer <jm@cocoloco.dyn.dhs.org>
 # Copyright (C) unknown, Robert Millan <zeratul2@wanadoo.es>
 # Copyright (C) December 2003 (from 2003-12-12 until 2003-12-18),
 #               January (2004-01-07,12), Xan <dxpublica@telefonica.net>
-# Copyright (c) 2004, 2005, 2006, 2007, 2008
+# Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009
 #               Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
 #
 # This file is distributed under the same license as the Pidgin package.
@@ -25,16 +25,16 @@
 # preferència en cas de contradicció amb el recull de Softcatalà):
 # http://www.termcat.net/cercaterm/
 #
-# NOTE: adjectives in valencian (southern catalan) go [almost] always to the end, for instance:
-# NOTA: els adjectius en valencià (català meridional) acostumen a anar al final, per exemple:
+# NOTE: adjectives in catalan go [almost] always to the end, for instance:
+# NOTA: els adjectius en català acostumen a anar al final, per exemple:
 #  "New file" --> "Fitxer nou"
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-19 17:53+0100\n"
-"PO-Revision-Date: 2009-01-05 20:36+0100\n"
+"POT-Creation-Date: 2009-07-28 09:57-0400\n"
+"PO-Revision-Date: 2009-07-26 17:23+0200\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -66,7 +66,8 @@ msgstr ""
 "Forma d'ús: %s [OPCIÓ]...\n"
 "\n"
 "  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
-"  -d, --debug         mostra missatges de depuració a la eixida estàndard\n"
+"  -d, --debug         mostra missatges de depuració a la eixida d'error\n"
+"                      estàndard \n"
 "  -h, --help          mostra esta ajuda i ix\n"
 "  -n, --nologin       no entra automàticament\n"
 "  -v, --version       mostra la versió actual i ix\n"
@@ -100,7 +101,7 @@ msgid "There are no protocol plugins installed."
 msgstr "No hi ha connectors de protocol instal·lats."
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(Segurament us heu oblidat de fer un «make install».)"
+msgstr "(Segurament vos heu oblidat de fer un «make install».)"
 
 msgid "Modify Account"
 msgstr "Modifica el compte"
@@ -139,11 +140,11 @@ msgid "Are you sure you want to delete %s?"
 msgstr "Esteu segur que voleu suprimir %s?"
 
 msgid "Delete Account"
-msgstr "Suprimix el compte"
+msgstr "Suprimeix el compte"
 
 #. Delete button
 msgid "Delete"
-msgstr "Suprimix"
+msgstr "Suprimeix"
 
 msgid "Accounts"
 msgstr "Comptes"
@@ -288,7 +289,7 @@ msgid "Retrieving..."
 msgstr "S'està recuperant..."
 
 msgid "Get Info"
-msgstr "Aconseguix informació"
+msgstr "Aconsegueix informació"
 
 msgid "Add Buddy Pounce"
 msgstr "Afig un avís per a l'amic"
@@ -310,7 +311,7 @@ msgid "Rename"
 msgstr "Reanomena"
 
 msgid "Set Alias"
-msgstr "Establix un àlies"
+msgstr "Estableix un àlies"
 
 msgid "Enter empty string to reset the name."
 msgstr "Introduïu una cadena buida per a reinicialitzar el nom."
@@ -320,7 +321,8 @@ msgstr ""
 "En suprimir este contacte, també se suprimiran tots els amics que hi haja"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "En suprimir este grup, també se suprimiran tots els amics que hi haja"
+msgstr ""
+"En suprimir este grup, també se suprimiran tots els amics que hi haja"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
@@ -331,7 +333,7 @@ msgid "Confirm Remove"
 msgstr "Confirmeu que voleu suprimir"
 
 msgid "Remove"
-msgstr "Suprimix"
+msgstr "Suprimeix"
 
 #. Buddy List
 msgid "Buddy List"
@@ -453,7 +455,7 @@ msgid "Alphabetically"
 msgstr "Alfabèticament"
 
 msgid "By Log Size"
-msgstr "Per la grandària del registre"
+msgstr "Per la mida del registre"
 
 msgid "Buddy"
 msgstr "Amic"
@@ -582,11 +584,12 @@ msgstr ""
 "compte entrareu de nou automàticament al xat."
 
 msgid "No such command."
-msgstr "No existix l'orde."
+msgstr "No existeix l'orde."
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Error de sintaxi: heu escrit un nombre d'arguments equivocat per a esta orde."
+"Error de sintaxi: heu escrit un nombre d'arguments equivocat per a esta "
+"orde."
 
 msgid "Your command failed for an unknown reason."
 msgstr "L'orde ha fallat per motius desconeguts."
@@ -636,19 +639,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Envia a"
 
-msgid "Invite message"
-msgstr "Missatge d'invitació"
-
-msgid "Invite"
-msgstr "Convida"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Introduïu el nom de l'usuari que vulgueu convidar,\n"
-"així com un missatge d'invitació opcional."
-
 msgid "Conversation"
 msgstr "Conversa"
 
@@ -684,7 +674,7 @@ msgid "Supported debug options are:  version"
 msgstr "Les opcions de depuració disponibles són:  version"
 
 msgid "No such command (in this context)."
-msgstr "L'orde no existix (en este context)."
+msgstr "L'orde no existeix (en este context)."
 
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
@@ -711,7 +701,7 @@ msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say &lt;missatge&gt;: envia un missatge normalment com si no féssiu servir "
+"say &lt;missatge&gt;: envia un missatge normalment com si no féreu servir "
 "cap orde."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
@@ -758,12 +748,12 @@ msgid ""
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
-"msgcolor &lt;classe&gt; &lt;primer pla&gt; &lt;fons&gt;: establix el color "
+"msgcolor &lt;classe&gt; &lt;primer pla&gt; &lt;fons&gt;: estableix el color "
 "de les diferents classes de missatge en les finestres de conversa.<br>    "
 "&lt;classe&gt;: receive (rep), send (envia), highlight (ressalta), action "
 "(acció), timestamp (marca de temps)<br>    &lt;primer pla/fons&gt;: black "
-"(negre), red (roig), green (verd), blue (blau), white (blanc), gray (gris), "
-"darkgray (gris fosc), magenta, cyan (cian), default (per defecte)"
+"(negre), red (roig), green (verd), blue (blau), white (blanc), gray "
+"(gris), darkgray (gris fosc), magenta, cyan (cian), default (per defecte)"
 "<br><br>EXEMPLE:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
@@ -802,7 +792,7 @@ msgid "Filename"
 msgstr "Nom del fitxer"
 
 msgid "Size"
-msgstr "Grandària"
+msgstr "Mida"
 
 msgid "Speed"
 msgstr "Velocitat"
@@ -892,7 +882,7 @@ msgid "No logs were found"
 msgstr "No s'ha trobat cap registre"
 
 msgid "Total log size:"
-msgstr "Grandària total del registre:"
+msgstr "Mida total del registre:"
 
 #. Search box *********
 msgid "Scroll/Search: "
@@ -912,6 +902,41 @@ msgstr "Totes les converses"
 msgid "System Log"
 msgstr "Registre del sistema"
 
+msgid "Calling ... "
+msgstr "S'està trucant..."
+
+msgid "Hangup"
+msgstr "Penja"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Accepta"
+
+msgid "Reject"
+msgstr "Rebutja"
+
+msgid "Call in progress."
+msgstr "S'està fent una trucada."
+
+msgid "The call has been terminated."
+msgstr "Ha finalitzat la trucada."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s vol iniciar una sessió d'àudio."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+"%s està intentant iniciar una sessió amb medi d'un tipus que no està "
+"implementat."
+
+msgid "You have rejected the call."
+msgstr "Heu rebutjat la trucada."
+
+msgid "call: Make an audio call."
+msgstr "call: fa una trucada d'àudio."
+
 msgid "Emails"
 msgstr "Correus electrònics"
 
@@ -946,6 +971,9 @@ msgstr "Continua"
 msgid "IM"
 msgstr "MI"
 
+msgid "Invite"
+msgstr "Convida"
+
 msgid "(none)"
 msgstr "(cap)"
 
@@ -1086,7 +1114,7 @@ msgid "Execute a command"
 msgstr "Executa una orde"
 
 msgid "Play a sound"
-msgstr "Reproduix un so"
+msgstr "Reprodueix un so"
 
 msgid "Pounce only when my status is not Available"
 msgstr "Avisa només quan el meu estat no siga Disponible"
@@ -1112,11 +1140,11 @@ msgstr "Avisos per a amics"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s us ha començat a escriure (%s)"
+msgstr "%s vos ha començat a escriure (%s)"
 
 #, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s s'ha aturat mentre us escrivia (%s)"
+msgstr "%s s'ha aturat mentre vos escrivia (%s)"
 
 #, c-format
 msgid "%s has signed on (%s)"
@@ -1132,7 +1160,7 @@ msgstr "%s ha deixat d'estar absent (%s)"
 
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s ha deixat d'escriure-us (%s)"
+msgstr "%s ha deixat d'escriure-vos (%s)"
 
 #, c-format
 msgid "%s has signed off (%s)"
@@ -1148,9 +1176,8 @@ msgstr "%s ha passat a absent (%s)"
 
 #, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s us ha enviat un missatge. (%s)"
+msgstr "%s vos ha enviat un missatge. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Esdeveniment d'avís desconegut, informeu-nos-en."
 
@@ -1196,7 +1223,6 @@ msgstr "Minuts abans de canviar l'estat"
 msgid "Change status to"
 msgstr "Canvia l'estat a"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Converses"
 
@@ -1450,7 +1476,7 @@ msgstr "%s acaba de desconnectar-se"
 
 #, c-format
 msgid "%s sent you a message"
-msgstr "%s us ha enviat un missatge"
+msgstr "%s vos ha enviat un missatge"
 
 #, c-format
 msgid "%s said your nick in %s"
@@ -1458,10 +1484,10 @@ msgstr "%s ha dit el vostre sobrenom a %s"
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%s us ha enviat un missatge a %s"
+msgstr "%s vos ha enviat un missatge a %s"
 
 msgid "Buddy signs on/off"
-msgstr "Un amic es connecte/desconnecti"
+msgstr "Un amic es connecte/desconnecte"
 
 msgid "You receive an IM"
 msgstr "Rebeu un MI"
@@ -1480,7 +1506,7 @@ msgstr "Fes pip també!"
 
 # FIXME
 msgid "Set URGENT for the terminal window."
-msgstr "Establix URGENT per a la finestra del terminal."
+msgstr "Estableix URGENT per a la finestra del terminal."
 
 msgid "GntGf"
 msgstr "GntGf"
@@ -1493,7 +1519,7 @@ msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Converses amb %s a %s:</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr "El connector per a l'historial requerix que s'habiliti el registre"
+msgstr "El connector per a l'historial requereix que s'habiliti el registre"
 
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1520,7 +1546,6 @@ msgstr ""
 "Quan s'òbriga una nova conversa este connector inserirà la darrera conversa "
 "en la conversa actual."
 
-#, c-format
 msgid "Online"
 msgstr "En línia"
 
@@ -1564,6 +1589,30 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Connector lastlog."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"S'està aconseguint un TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Crea TinyURL per a URL així de llargues o més"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Prefix de l'adreça TinyURL (o altra)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Connector TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"Quan rebeu missagtes amb URL, feu servir TinyURL per a copiar més fàcilment"
+
 msgid "accounts"
 msgstr "comptes"
 
@@ -1614,7 +1663,7 @@ msgid "Change user information for %s"
 msgstr "Canvia la informació d'usuari de %s"
 
 msgid "Set User Info"
-msgstr "Establix les dades d'usuari"
+msgstr "Estableix les dades d'usuari"
 
 msgid "Unknown"
 msgstr "Desconegut"
@@ -1665,13 +1714,6 @@ msgstr "Voleu acceptar el certificat de %s?"
 msgid "SSL Certificate Verification"
 msgstr "Verificació d'un certificat SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Accepta"
-
-msgid "Reject"
-msgstr "Rebutja"
-
 msgid "_View Certificate..."
 msgstr "_Mostra el certificat..."
 
@@ -1684,6 +1726,7 @@ msgid ""
 msgstr ""
 "No es pot comprovar el certificat que presenta «%s» atès que està auto-signat."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "La cadena de certificació que presenta %s no és vàlida."
@@ -1694,6 +1737,7 @@ msgstr "La cadena de certificació que presenta %s no és vàlida."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Error en el certificat SSL"
 
@@ -1720,8 +1764,8 @@ msgid ""
 "signature."
 msgstr ""
 "El certificat %s afirma tindre una signatura d'una entitat certificadora, "
-"però la cadena de certificació no conté cap signatura digital vàlida d'esta "
-"entitat."
+"però la cadena de certificació no conté cap signatura digital vàlida "
+"d'esta entitat."
 
 msgid "Invalid certificate authority signature"
 msgstr "La signatura de l'entitat certificadora no és vàlida"
@@ -1735,8 +1779,8 @@ msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
 "could mean that you are not connecting to the service you believe you are."
 msgstr ""
-"El certificat de «%s» sembla indicar que és de «%s». Això podria voler dir que "
-"us esteu connectant a un servici diferent del que us penseu."
+"El certificat de «%s» pareix indicar que és de «%s». Això podria voler dir que "
+"vos esteu connectant a un servei diferent del que vos penseu."
 
 #. Make messages
 #, c-format
@@ -1774,6 +1818,7 @@ msgstr "+++ %s s'ha connectat"
 msgid "+++ %s signed off"
 msgstr "+++ %s se n'ha anat"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -1806,7 +1851,7 @@ msgstr "%s [<I>%s</I>] ha entrat a la sala."
 
 #, c-format
 msgid "You are now known as %s"
-msgstr "Ara us feu dir %s"
+msgstr "Ara vos feu dir %s"
 
 #, c-format
 msgid "%s is now known as %s"
@@ -1820,6 +1865,17 @@ msgstr "%s ha eixit de la sala."
 msgid "%s left the room (%s)."
 msgstr "%s ha eixit de la sala (%s)."
 
+msgid "Invite to chat"
+msgstr "Convida al xat"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Introduïu el nom de l'usuari que vulgueu convidar, així com un missatge "
+"d'invitació opcional."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "No s'ha pogut obtindre la connexió: %s"
@@ -1917,11 +1973,11 @@ msgstr "%s no és un fitxer normal, no se sobreescriurà.\n"
 
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr "%s us vol enviar %s (%s)"
+msgstr "%s vos vol enviar %s (%s)"
 
 #, c-format
 msgid "%s wants to send you a file"
-msgstr "%s us vol enviar un fitxer"
+msgstr "%s vos vol enviar un fitxer"
 
 #, c-format
 msgid "Accept file transfer request from %s?"
@@ -1939,7 +1995,7 @@ msgstr ""
 
 #, c-format
 msgid "%s is offering to send file %s"
-msgstr "%s us oferix enviar el fitxer %s"
+msgstr "%s vos ofereix enviar el fitxer %s"
 
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1954,10 +2010,14 @@ msgid "Starting transfer of %s from %s"
 msgstr "S'està iniciant la transferència de %s de %s?"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr ""
+"S'ha completat la transferència del fitxer <A HREF=\"file://%s\">%s</A>"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "S'ha completat la transferència del fitxer %s"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "S'ha completat la transferència del fitxer"
 
@@ -1965,7 +2025,6 @@ msgstr "S'ha completat la transferència del fitxer"
 msgid "You canceled the transfer of %s"
 msgstr "Heu cancel·lat la transferència de %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "S'ha cancel·lat la transferència del fitxer"
 
@@ -2088,7 +2147,8 @@ msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"Cert si l'orde emprada per este tipus d'URL s'ha d'executar en un terminal."
+"Cert si l'orde emprada per este tipus d'URL s'ha d'executar en un "
+"terminal."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Si l'orde especificada ha de gestionar URL «aim»"
@@ -2161,17 +2221,19 @@ msgstr "<font color=\"red\"><b>No s'ha pogut llegir el fitxer: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA-AUTOMÀTICA>: %s\n"
 
+msgid "Error creating conference."
+msgstr "S'ha produït un error en crear la conferència."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr "Esteu emprant %s, però este connector requerix %s."
+msgstr "Esteu emprant %s, però este connector requereix %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Este connector no ha definit cap ID."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr "La versió %d del connector no coincidix (cal %d)"
+msgstr "La versió %d del connector no coincideix (cal %d)"
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
@@ -2203,7 +2265,7 @@ msgstr "No s'ha pogut carregar el connector"
 
 #, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "%s requerix %s, però no s'ha pogut carregar."
+msgstr "%s requereix %s, però no s'ha pogut carregar."
 
 msgid "Autoaccept"
 msgstr "Accepta automàticament"
@@ -2227,7 +2289,7 @@ msgid "When a file-transfer request arrives from %s"
 msgstr "Quan arribe una sol·licitud de transferència d'un fitxer de %s"
 
 msgid "Set Autoaccept Setting"
-msgstr "Establix el paràmetre d'acceptació automàtica"
+msgstr "Estableix el paràmetre d'acceptació automàtica"
 
 msgid "_Save"
 msgstr "De_sa"
@@ -2345,7 +2407,7 @@ msgstr "Control de fitxers"
 #. *  summary
 #. *  description
 msgid "Allows control by entering commands in a file."
-msgstr "Us permet controlar introduint ordes en un fitxer."
+msgstr "Vos permet controlar introduint ordes en un fitxer."
 
 msgid "Minutes"
 msgstr "Minuts"
@@ -2366,20 +2428,20 @@ msgstr "Cap dels vostres comptes està inactiu."
 
 # FIXME
 msgid "Unset Account Idle Time"
-msgstr "Desestablix el temps d'inactivitat del compte"
+msgstr "Desestableix el temps d'inactivitat del compte"
 
 # FIXME
 msgid "_Unset"
-msgstr "_Desestablix"
+msgstr "_Desestableix"
 
 msgid "Set Idle Time for All Accounts"
-msgstr "Establix el temps d'inactivitat de tots els comptes"
+msgstr "Estableix el temps d'inactivitat de tots els comptes"
 
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Desestablix el temps d'inactivitat de tots els comptes inactius"
+msgstr "Desestableix el temps d'inactivitat de tots els comptes inactius"
 
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Us permet configurar a mà durant quant de temps heu estat inactiu"
+msgstr "Vos permet configurar a mà durant quant de temps heu estat inactiu"
 
 #. *< type
 #. *< ui_requirement
@@ -2427,7 +2489,7 @@ msgid "Join/Part Hiding Configuration"
 msgstr "Configuració de l'ocultació de les entrades i eixides"
 
 msgid "Minimum Room Size"
-msgstr "Grandària mínima de la sala"
+msgstr "Mida mínima de la sala"
 
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Temps d'espera d'inactivitat del usuaris (en minuts)"
@@ -2484,11 +2546,10 @@ msgstr "Heu estat desconnectat del servidor."
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr "Esteu desconnectat. No rebreu missatges a no ser que us connecteu."
+msgstr "Esteu desconnectat. No rebreu missatges a no ser que vos connecteu."
 
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr ""
-"El missatge no s'ha pogut enviar perquè s'ha superat la grandària màxima."
+msgstr "El missatge no s'ha pogut enviar perquè s'ha superat la mida màxima."
 
 msgid "Message could not be sent."
 msgstr "No s'ha pogut enviar el missatge."
@@ -2540,7 +2601,7 @@ msgid "General Log Reading Configuration"
 msgstr "Configuració general de la lectura de registres"
 
 msgid "Fast size calculations"
-msgstr "Càlculs de grandària ràpids"
+msgstr "Càlculs de mida ràpids"
 
 msgid "Use name heuristics"
 msgstr "Utilitza heurístiques de noms"
@@ -2568,14 +2629,14 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Quan es visualitzin els registres, este connector inclourà registres "
 "d'altres clients de MI. De moment, es poden incloure els d'Adium, MSN "
-"Messenger, i Trillian.\n"
+"Messenger, aMSN, i Trillian.\n"
 "\n"
 "Avís: este connector encara està en desenvolupament i pot ser que es pengi."
 
@@ -2613,8 +2674,8 @@ msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
-"Afig una línia nova abans de cada missatge de manera que, en les finestres "
-"de conversa, els missatges apareixen sota el nom d'usuari."
+"Afig una línia nova abans de cada missatge de manera que, en les "
+"finestres de conversa, els missatges apareixen sota el nom d'usuari."
 
 msgid "Offline Message Emulation"
 msgstr "Emulació de missatge de fora de línia"
@@ -2624,7 +2685,7 @@ msgstr ""
 "Alça els missatges que s'hagen enviat a un usuari fora de línia com a avís"
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "La resta de missatges s'alçaran com a un avís. Podeu editar o suprimir "
@@ -2656,6 +2717,36 @@ msgstr "Alça els missatges fora de línia en un avís"
 msgid "Do not ask. Always save in pounce."
 msgstr "No ho demanes, alça-ho sempre en un avís."
 
+msgid "One Time Password"
+msgstr "Contrasenya d'un sol ús"
+
+# FIXME ?
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Contrasenyes d'un sol ús"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Força que les contrasenyes només s'emprin una vegada."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Vos permet forçar que les contrasenyes siguen d'un sol ús per a comptes dels "
+"quals no s'alcen les contrasenyes.\n"
+"Nota: per poder fer servir això, cal que no s'alce la contrasenya del "
+"compte."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2681,7 +2772,7 @@ msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
-"Fa que apareguen finestres de conversa així que altres usuaris us comencen a "
+"Fa que apareguen finestres de conversa així que altres usuaris vos comencen a "
 "enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!"
 
 msgid "You feel a disturbance in the force..."
@@ -2814,7 +2905,7 @@ msgid "Buddy Goes _Idle"
 msgstr "Un amic passe a _inactiu"
 
 msgid "Buddy _Signs On/Off"
-msgstr "Un amic e_s connecte/desconnecti"
+msgstr "Un amic e_s connecte/desconnecte"
 
 #. *< type
 #. *< ui_requirement
@@ -2848,15 +2939,16 @@ msgstr ""
 "connectors TCL, instal·leu l'ActiveTCL de http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"No s'ha pogut trobar el joc d'eines per a Windows de l'Apple Bonjour, "
-"consulteu les preguntes més freqüents a http://developer.pidgin.im/"
-"BonjourWindows per a més informació."
+"No s'ha pogut trobar el joc d'eines «Bonjour per a Windows» d'Apple, "
+"consulteu les preguntes més freqüents a http://d.pidgin.im/BonjourWindows "
+"per a més informació."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "No es poden escoltar connexions entrants de MI\n"
+# FIXME
+msgid "Unable to listen for incoming IM connections"
+msgstr "No s'ha pogut escoltar connexions entrants de MI"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2864,7 +2956,6 @@ msgstr ""
 "No s'ha pogut establir cap connexió amb el servidor local de mDNS. S'està "
 "executant?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Nom"
 
@@ -2897,6 +2988,10 @@ msgstr "Connector per al protocol Bonjour"
 msgid "Purple Person"
 msgstr "Persona porpra"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "Port local"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2907,14 +3002,17 @@ msgstr "%s ha finalitzat la conversa."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No s'ha pogut enviar el missatge, no s'ha pogut iniciar la conversa."
 
-msgid "Cannot open socket"
-msgstr "No s'ha pogut obrir el sòcol"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "No s'ha pogut crear el sòcol: %s"
 
-msgid "Could not bind socket to port"
-msgstr "No s'ha pogut vincular el sòcol al port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "No s'ha pogut vincular el sòcol al port: %s"
 
-msgid "Could not listen on socket"
-msgstr "No s'ha pogut escoltar al sòcol"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "No s'ha pogut crear el sòcol: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2964,14 +3062,14 @@ msgstr "Alça la llista d'amics..."
 msgid "Load buddylist from file..."
 msgstr "Carrega la llista d'amics d'un fitxer..."
 
-msgid "Fill in the registration fields."
-msgstr "Empleneu els camps de registre."
+msgid "You must fill in all registration fields"
+msgstr "Heu d'emplenar tots els camps de registre"
 
-msgid "Passwords do not match."
-msgstr "Les contrasenyes no coincideixen."
+msgid "Passwords do not match"
+msgstr "Les contrasenyes no coincideixen"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "No s'ha pogut registrar el nou compte. S'ha produït un error.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "No s'ha pogut registrar el nou compte. S'ha produït un error."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "S'ha registrat el nou compte Gadu-Gadu"
@@ -2982,14 +3080,14 @@ msgstr "S'ha registrat amb èxit."
 msgid "Password"
 msgstr "Contrasenya"
 
-msgid "Password (retype)"
-msgstr "Contrasenya (torneu-la a escriure)"
+msgid "Password (again)"
+msgstr "Contrasenya (repetiu-la)"
 
-msgid "Enter current token"
-msgstr "Introduïu el testimoni actual"
+msgid "Enter captcha text"
+msgstr "Introduïu el text captcha"
 
-msgid "Current token"
-msgstr "Testimoni actual"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un compte Gadu-Gadu nou"
@@ -3042,6 +3140,15 @@ msgstr "S'ha canviat la contrasenya."
 msgid "Current password"
 msgstr "Contrasenya actual"
 
+msgid "Password (retype)"
+msgstr "Contrasenya (torneu-la a escriure)"
+
+msgid "Enter current token"
+msgstr "Introduïu el testimoni actual"
+
+msgid "Current token"
+msgstr "Testimoni actual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduïu la contrasenya actual, i la nova per a UIN: "
 
@@ -3055,13 +3162,13 @@ msgstr "Seleccioneu un xat per a l'amic: %s"
 msgid "Add to chat..."
 msgstr "Afig al xat..."
 
+#. Global
 msgid "Available"
 msgstr "Disponible"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Absent"
 
@@ -3089,7 +3196,7 @@ msgstr "No s'ha trobat cap usuari que coincidisca"
 msgid "There are no users matching your search criteria."
 msgstr "No hi ha usuaris que coincidisquen amb el vostre criteri de cerca."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "No s'ha pogut llegir el sòcol"
 
 msgid "Buddy list downloaded"
@@ -3104,8 +3211,14 @@ msgstr "S'ha pujat la llista d'amics"
 msgid "Your buddy list was stored on the server."
 msgstr "S'ha alçat la vostra llista d'amics al servidor."
 
-msgid "Connection failed."
-msgstr "Ha fallat la connexió."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connectat"
+
+msgid "Connection failed"
+msgstr "Ha fallat la connexió"
 
 msgid "Add to chat"
 msgstr "Afig al xat"
@@ -3113,14 +3226,23 @@ msgstr "Afig al xat"
 msgid "Chat _name:"
 msgstr "_Nom del xat:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "No s'ha pogut resoldre el nom «%s»: %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "S'està connectant"
+
 msgid "Chat error"
 msgstr "Error en el xat"
 
 msgid "This chat name is already in use"
-msgstr "Este nom de xat ja existix"
+msgstr "Este nom de xat ja existeix"
 
-msgid "Not connected to the server."
-msgstr "No esteu connectat al servidor."
+msgid "Not connected to the server"
+msgstr "No esteu connectat al servidor"
 
 msgid "Find buddies..."
 msgstr "Cerca amics..."
@@ -3135,7 +3257,7 @@ msgid "Download buddylist from Server"
 msgstr "Baixa la llista d'amics del servidor"
 
 msgid "Delete buddylist from Server"
-msgstr "Suprimix la llista d'amics del servidor"
+msgstr "Suprimeix la llista d'amics del servidor"
 
 msgid "Save buddylist to file..."
 msgstr "Alça la llista d'amics a un fitxer..."
@@ -3161,6 +3283,9 @@ msgstr "Popular MI polonesa"
 msgid "Gadu-Gadu User"
 msgstr "Usuari Gadu-Gadu"
 
+msgid "GG server"
+msgstr "Servidor GG"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orde desconeguda: %s"
@@ -3175,7 +3300,7 @@ msgstr "No hi ha cap tema establit"
 msgid "File Transfer Failed"
 msgstr "Ha fallat la transferència del fitxer"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "No s'ha pogut obrir cap port on escoltar."
 
 msgid "Error displaying MOTD"
@@ -3191,8 +3316,16 @@ msgstr "No hi ha cap frase del dia associada a esta connexió."
 msgid "MOTD for %s"
 msgstr "Frase del dia per a %s"
 
-msgid "Server has disconnected"
-msgstr "El servidor ha desconnectat"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "S'ha perdut la connexió amb el servidor: %s"
 
 msgid "View MOTD"
 msgstr "Mostra la frase del dia"
@@ -3203,25 +3336,24 @@ msgstr "_Canal:"
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "Els sobrenoms d'IRC no poden contindre espais en blanc"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "S'està connectant"
+msgid "IRC nick and server may not contain whitespace"
+msgstr ""
+"Els sobrenoms i els noms de servidor d'IRC no poden contindre espais en blanc"
 
 msgid "SSL support unavailable"
 msgstr "El suport per a SSL no està disponible"
 
-msgid "Couldn't create socket"
-msgstr "No s'ha pogut crear el sòcol"
+msgid "Unable to connect"
+msgstr "No s'ha pogut connectar"
 
-msgid "Couldn't connect to host"
-msgstr "No s'ha pogut connectar a l'ordinador"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "No s'ha pogut connectar: %s"
 
-msgid "Read error"
-msgstr "Error de lectura"
+#, c-format
+msgid "Server closed the connection"
+msgstr "El servidor ha tancat la connexió"
 
 msgid "Users"
 msgstr "Usuaris"
@@ -3284,7 +3416,7 @@ msgstr "Final de la llista de bandejats"
 
 #, c-format
 msgid "You are banned from %s."
-msgstr "Us han bandejat de %s"
+msgstr "Vos han bandejat de %s"
 
 msgid "Banned"
 msgstr "Bandejat"
@@ -3350,11 +3482,11 @@ msgid "The IRC server's local time is:"
 msgstr "L'hora local del servidor d'IRC és:"
 
 msgid "No such channel"
-msgstr "Este canal no existix"
+msgstr "Este canal no existeix"
 
 #. does this happen?
 msgid "no such channel"
-msgstr "este canal no existix"
+msgstr "este canal no existeix"
 
 msgid "User is not logged in"
 msgstr "L'usuari no està connectat"
@@ -3374,12 +3506,12 @@ msgstr "Només amb invitació"
 
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "%s us ha fet fora: (%s)"
+msgstr "%s vos ha fet fora: (%s)"
 
 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "%s us ha fet fora (%s)"
+msgstr "%s vos ha fet fora (%s)"
 
 #, c-format
 msgid "mode (%s %s) by %s"
@@ -3402,6 +3534,16 @@ msgstr ""
 "El servidor ha rebutjat el nom del compte que heu triat. Possiblement conté "
 "caràcters invàlids."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Ja hi ha algú amb el sobrenom «%s»."
+
+msgid "Nickname in use"
+msgstr "El sobrenom ja s'està fent servir"
+
 msgid "Cannot change nick"
 msgstr "No es pot canviar el sobrenom"
 
@@ -3462,8 +3604,8 @@ msgid ""
 "must be a channel operator to do this."
 msgstr ""
 "devoice &lt;sobrenom1&gt; [sobrenom2] ...:  treu l'estat de veu a algú, "
-"prevenint que parlin al canal si este està moderat (+m). Heu de ser operador "
-"del canal per poder fer això."
+"prevenint que parlin al canal si este està moderat (+m). Heu de ser "
+"operador del canal per poder fer això."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
@@ -3510,7 +3652,7 @@ msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;sobrenom|canal&gt;:  establix o no el "
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;sobrenom|canal&gt;:  estableix o no el "
 "mode del canal o d'usuari."
 
 msgid ""
@@ -3580,7 +3722,7 @@ msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
-"remove &lt;sobrenom&gt; [missatge]:  suprimix algú de la sala. Heu de ser "
+"remove &lt;sobrenom&gt; [missatge]:  suprimeix algú de la sala. Heu de ser "
 "operador del canal per poder fer això."
 
 msgid "time: Displays the current local time at the IRC server."
@@ -3639,39 +3781,66 @@ msgstr "Ha fallat l'orde «Ad-Hoc»"
 msgid "execute"
 msgstr "executa"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"El servidor requerix TLS/SSL per entrar. No s'ha trobat suport per a TLS/SSL."
+"El servidor requereix TLS/SSL per entrar, però no s'ha trobat cap "
+"implementació de TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Heu requerit que es xifri, però no s'ha trobat cap implementació de TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "El servidor requerix autenticació de text sobre un flux no xifrat"
+msgstr "El servidor requereix autenticació de text sobre un flux no xifrat"
 
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"%s requerix autenticació de text sobre un flux no xifrat. Voleu permetre-ho "
+"%s requereix autenticació de text sobre un flux no xifrat. Voleu permetre-ho "
 "i continuar amb l'autenticació?"
 
 msgid "Plaintext Authentication"
 msgstr "Autenticació de text"
 
-msgid "Invalid response from server."
-msgstr "La resposta del servidor no és vàlida."
+msgid "SASL authentication failed"
+msgstr "Ha fallat l'autenticació SASL"
+
+msgid "Invalid response from server"
+msgstr "La resposta del servidor no és vàlida"
 
 msgid "Server does not use any supported authentication method"
 msgstr "No hi ha cap mètode d'autenticació compatible amb este servidor"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Requeriu xifratge, però no està disponible en este servidor."
+
 msgid "Invalid challenge from server"
 msgstr "Repte del servidor invàlid"
 
-msgid "SASL error"
-msgstr "Error en el SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Error SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "El gestor de connexions BOSH ha tancat la connexió."
+
+msgid "No session ID given"
+msgstr "No s'ha indicat cap ID"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Esta versió del protocol BOSH no està implementada"
+
+msgid "Unable to establish a connection with the server"
+msgstr "No s'ha pogut establir una connexió amb el servidor"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "No s'ha pogut establir una connexió amb el servidor: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "No s'ha pogut establir una connexió SSL"
 
 msgid "Full Name"
 msgstr "Nom"
@@ -3730,8 +3899,8 @@ msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"Les dades següents són opcionals. Introduïu només la informació que us "
-"sembli."
+"Les dades següents són opcionals. Introduïu només la informació que vos "
+"parega."
 
 msgid "Client"
 msgstr "Client"
@@ -3739,171 +3908,8 @@ msgstr "Client"
 msgid "Operating System"
 msgstr "Sistema operatiu"
 
-msgid "Last Activity"
-msgstr "Darrera activitat"
-
-msgid "Service Discovery Info"
-msgstr "Informació del servici de descoberta"
-
-msgid "Service Discovery Items"
-msgstr "Elements del servici de descoberta"
-
-# http://xmpp.org/extensions/xep-0033.html
-msgid "Extended Stanza Addressing"
-msgstr "Bloc d'adreçament estés"
-
-msgid "Multi-User Chat"
-msgstr "Xat multi-usuari"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Informació de presència estesa per a xats multi-usuari"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ordes Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Servici PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Flux de bits SOCK5"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Ubicació de l'usuari"
-
-msgid "User Avatar"
-msgstr "Avatar de l'usuari"
-
-msgid "Chat State Notifications"
-msgstr "Notificacions de l'estat del xat"
-
-msgid "Software Version"
-msgstr "Versió del programari"
-
-msgid "Stream Initiation"
-msgstr "Iniciació del flux"
-
-msgid "File Transfer"
-msgstr "Transferència de fitxers"
-
-msgid "User Mood"
-msgstr "Estat d'ànim de l'usuari"
-
-msgid "User Activity"
-msgstr "Activitat de l'usuari"
-
-msgid "Entity Capabilities"
-msgstr "Capacitats de l'entitat"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negociacions de la sessió xifrada"
-
-# Pot ser també música, cançó... (josep)
-# Vegeu: http://xmpp.org/extensions/xep-0118.html
-msgid "User Tune"
-msgstr "Melodia de l'usuari"
-
-# Nota: "Roster" en XMPP és la llista de contactes (josep)
-msgid "Roster Item Exchange"
-msgstr "Intercanvi d'element de la llista de contactes"
-
-# Vegeu: http://xmpp.org/extensions/xep-0152.html (josep)
-# Nota: codi mort
-msgid "Reachability Address"
-msgstr "Adreça de localització"
-
-msgid "User Profile"
-msgstr "Perfil de l'usuari"
-
-# Nota: Jingle és una extensió d'XMPP i ho considerem nom propi (josep)
-# http://www.xmpp.org/extensions/xep-0166.html
-msgid "Jingle"
-msgstr "Jingle"
-
-# FIXME
-msgid "Jingle Audio"
-msgstr "Àudio amb Jingle"
-
-msgid "User Nickname"
-msgstr "Sobrenom de l'usuari"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Vídeo amb Jingle"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Recepció de missatges"
-
-msgid "Public Key Publishing"
-msgstr "Publicació de claus públiques"
-
-msgid "User Chatting"
-msgstr "Converses d'usuari"
-
-msgid "User Browsing"
-msgstr "Navegació d'usuaris"
-
-msgid "User Gaming"
-msgstr "Jocs d'usuari"
-
-msgid "User Viewing"
-msgstr "Visualització d'usuaris"
-
-msgid "Ping"
-msgstr "Ping"
-
-# Vegeu: http://xmpp.org/extensions/xep-0200.html
-# Nota: Això es refereix a les capabilitats de l'altre interlocutor
-# No apareix a l'aplicació final, és codi mort dins un #if 0 ... #endif (josep)
-msgid "Stanza Encryption"
-msgstr "Blocs xifrats"
-
-msgid "Entity Time"
-msgstr "Hora de l'entitat"
-
-msgid "Delayed Delivery"
-msgstr "Lliurament endarrerit"
-
-msgid "Collaborative Data Objects"
-msgstr "Objectes de dades col·laboratius"
-
-msgid "File Repository and Sharing"
-msgstr "Dipòsit de fitxers i compartició"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Servici de descoberta STUN per al Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociació simple del xifratge de la sessió"
-
-# Mireu l'RFC (josep)
-msgid "Hop Check"
-msgstr "Comprovació dels salts"
-
-msgid "Capabilities"
-msgstr "Capacitats"
+msgid "Local Time"
+msgstr "Hora local"
 
 msgid "Priority"
 msgstr "Prioritat"
@@ -3911,6 +3917,13 @@ msgstr "Prioritat"
 msgid "Resource"
 msgstr "Recurs"
 
+#, c-format
+msgid "%s ago"
+msgstr "fa %s"
+
+msgid "Logged Off"
+msgstr "Desconnectat"
+
 # Segons la viquipèdia
 msgid "Middle Name"
 msgstr "Nom del mig"
@@ -3958,7 +3971,6 @@ msgstr "Xerraire"
 msgid "Extended Away"
 msgstr "Absent des de fa una bona estona"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "No molesteu"
 
@@ -3969,7 +3981,7 @@ msgid "Last Name"
 msgstr "Cognoms"
 
 msgid "The following are the results of your search"
-msgstr "El que seguix són els resultats de la vostra cerca"
+msgstr "El que segueix són els resultats de la vostra cerca"
 
 #. current comment from Jabber User Directory users.jabber.org
 msgid ""
@@ -4080,28 +4092,24 @@ msgstr "Seleccioneu a quin servidor de conferències consultar"
 msgid "Find Rooms"
 msgstr "Cerca sales"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Requeriu xifratge, però no està disponible en este servidor."
+msgid "Affiliations:"
+msgstr "Afiliacions:"
 
-msgid "Write error"
-msgstr "Error d'escriptura"
+msgid "No users found"
+msgstr "No s'ha trobat cap usuari"
 
-msgid "Ping timeout"
-msgstr "Temps d'espera del ping"
+msgid "Roles:"
+msgstr "Rols:"
 
-msgid "Read Error"
-msgstr "Error de lectura"
+msgid "Ping timed out"
+msgstr "S'ha esgitat el temps d'espera (ping)"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"No s'ha pogut establir una connexió amb al servidor:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "No s'ha pogut crear el sòcol"
+"No s'ha pogut trobar cap mètode alternatiu de connexió XMPP després de no "
+"haver pogut connectar directament."
 
 msgid "Invalid XMPP ID"
 msgstr "ID de l'XMPP invàlid"
@@ -4109,6 +4117,10 @@ msgstr "ID de l'XMPP invàlid"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "L'ID de l'XMPP no és vàlid. Cal especificar un domini."
 
+# FIX
+msgid "Malformed BOSH URL"
+msgstr "L'URL BOSH està malmés"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "S'ha registrat %s a %s amb èxit"
@@ -4133,9 +4145,6 @@ msgstr "S'ha cancel·lat el registre amb èxit"
 msgid "Unregistration Failed"
 msgstr "No s'ha pogut cancel·lar el registre"
 
-msgid "Already Registered"
-msgstr "Ja esteu registrat"
-
 msgid "State"
 msgstr "Estat"
 
@@ -4148,6 +4157,9 @@ msgstr "Telèfon"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Ja esteu registrat"
+
 msgid "Unregister"
 msgstr "Cancel·la el registre"
 
@@ -4193,9 +4205,19 @@ msgstr "S'està autenticant"
 msgid "Re-initializing Stream"
 msgstr "S'està reinicialitzant el flux"
 
+msgid "Server doesn't support blocking"
+msgstr "El servidor no permet blocar"
+
 msgid "Not Authorized"
 msgstr "No autoritzat"
 
+msgid "Mood"
+msgstr "Estat d'ànim"
+
+# FIXME?
+msgid "Now Listening"
+msgstr "Ara escoltant"
+
 msgid "Both"
 msgstr "Ambdós"
 
@@ -4217,13 +4239,6 @@ msgstr "Cap"
 msgid "Subscription"
 msgstr "Subscripció"
 
-msgid "Mood"
-msgstr "Estat d'ànim"
-
-# FIXME?
-msgid "Now Listening"
-msgstr "Ara escoltant"
-
 msgid "Mood Text"
 msgstr "Text sobre l'estat d'ànim"
 
@@ -4266,9 +4281,6 @@ msgstr "La vostra contrasenya s'ha canviat."
 msgid "Error changing password"
 msgstr "S'ha produït un error en canviar la contrasenya"
 
-msgid "Password (again)"
-msgstr "Contrasenya (repetiu-la)"
-
 msgid "Change XMPP Password"
 msgstr "Canvia la contrasenya de l'XMPP"
 
@@ -4276,7 +4288,7 @@ msgid "Please enter your new password"
 msgstr "Introduïu la nova contrasenya"
 
 msgid "Set User Info..."
-msgstr "Establix informació d'usuari..."
+msgstr "Estableix informació d'usuari..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password..."
@@ -4309,7 +4321,7 @@ msgstr "No s'ha trobat l'element"
 
 # FIX
 msgid "Malformed XMPP ID"
-msgstr "l'ID de l'XMPP està malmés"
+msgstr "L'ID de l'XMPP està malmés"
 
 msgid "Not Acceptable"
 msgstr "No és acceptable"
@@ -4336,7 +4348,7 @@ msgid "Server Overloaded"
 msgstr "El servidor està sobrecarregat"
 
 msgid "Service Unavailable"
-msgstr "El servici no està disponible"
+msgstr "El servei no està disponible"
 
 msgid "Subscription Required"
 msgstr "Cal subscripció"
@@ -4465,17 +4477,25 @@ msgid "Unable to ping user %s"
 msgstr "No s'ha pogut fer ping a l'usuari %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "No s'ha pogut botzinar perquè no es coneix res de l'usuari %s."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "No s'ha pogut botzinar possiblement perquè l'usuari %s està desconnectat."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "No s'ha pogut botzinar perquè l'usuari %s no ho permet."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"No s'ha pogut botzinar l'usuari %s perquè no ho implementa, o bé ara mateix "
+"no ho permet."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "S'està botzinant a %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4484,11 +4504,38 @@ msgstr "Botzina"
 
 #, c-format
 msgid "%s has buzzed you!"
-msgstr "%s us ha botzinat!"
+msgstr "%s vos ha botzinat!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "S'està botzinant a %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "No s'ha pogut iniciar el medi amb %s: el JID no és vàlid"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "No s'ha pogut iniciar el medi amb %s: l'usuari no està connectat"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"No s'ha pogut iniciar el medi amb %s: no esteu subscrit a la presència de "
+"l'usuari"
+
+msgid "Media Initiation Failed"
+msgstr "Ha fallat la iniciació del medi"
+
+# FIXME: "media session" -> "sessió amb medi"?
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Escolliu el recurs de %s amb el qual voleu iniciar una sessió amb medi."
+
+msgid "Select a Resource"
+msgstr "Seleccioneu un recurs"
+
+msgid "Initiate Media"
+msgstr "Inicia el medi"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  configura la sala de xat."
@@ -4509,18 +4556,18 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [motiu]:  bandeja de la sala un usuari."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;usuari&gt; &lt;owner|admin|member|outcast|none&gt;: establix "
-"l'afiliació de l'usuari a la sala."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [sobrenom1] "
+"[sobrenom2] ...: obtén els usuaris amb una afiliació, o els l'estableix."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;usuari&gt; &lt;moderator|participant|visitor|none&gt;: establix el "
-"rol d'un usuari en una sala."
+"role &lt;usuari&gt; &lt;moderator|participant|visitor|none&gt; [sobrenom1] "
+"[sobrenom2] ...: obtén els usuaris amb el rol especificat, o els l'estableix."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuari&gt; [sala]:  convida un usuari a la sala."
@@ -4541,7 +4588,7 @@ msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tfa ping a un usuari/component/servidor."
 
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: fa sonar una botzina a un usuari per tal de que us pare atenció"
+msgstr "buzz: fa sonar una botzina a un usuari per tal de que vos pare atenció"
 
 #. *< type
 #. *< ui_requirement
@@ -4561,7 +4608,7 @@ msgid "Domain"
 msgstr "Domini"
 
 msgid "Require SSL/TLS"
-msgstr "Requerix SSL/TLS"
+msgstr "Requereix SSL/TLS"
 
 msgid "Force old (port 5223) SSL"
 msgstr "Força l'antic port SSL (5223)"
@@ -4581,6 +4628,9 @@ msgstr "Servidor al qual connectar-se"
 msgid "File transfer proxies"
 msgstr "Servidors intermediari per a la transferència de fitxers"
 
+msgid "BOSH URL"
+msgstr "URL BOSH"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4619,6 +4669,14 @@ msgstr "Error en l'anàlisi de l'XML"
 msgid "Unknown Error in presence"
 msgstr "Error desconegut en la presència"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "S'ha produït un error en entrar al xat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "S'ha produït un error en el xat %s"
+
 msgid "Create New Room"
 msgstr "Crea una nova sala"
 
@@ -4635,13 +4693,28 @@ msgstr "_Configura la sala"
 msgid "_Accept Defaults"
 msgstr "_Accepta els valors predeterminats"
 
+msgid "No reason"
+msgstr "No s'ha indicat cap motiu"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "S'ha produït un error en entrar al xat %s"
+msgid "You have been kicked: (%s)"
+msgstr "Vos han fet fora: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "S'ha produït un error en el xat %s"
+msgid "Kicked (%s)"
+msgstr "Vos han fet fora (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr "La transferència s'ha tancat."
+
+msgid "Failed to open the file"
+msgstr "No s'ha pogut obrir el fitxer"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4671,9 +4744,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Escolliu a quin recurs de %s voleu enviar un fitxer"
 
-msgid "Select a Resource"
-msgstr "Seleccioneu un recurs"
-
 msgid "Edit User Mood"
 msgstr "Edita l'estat d'ànim"
 
@@ -4681,13 +4751,13 @@ msgid "Please select your mood from the list."
 msgstr "Seleccioneu l'estat d'ànim de la llista."
 
 msgid "Set"
-msgstr "Establix"
+msgstr "Estableix"
 
 msgid "Set Mood..."
-msgstr "Establix l'estat d'ànim..."
+msgstr "Estableix l'estat d'ànim..."
 
 msgid "Set User Nickname"
-msgstr "Establix el sobrenom de l'usuari"
+msgstr "Estableix el sobrenom de l'usuari"
 
 msgid "Please specify a new nickname for you."
 msgstr "Introduïu el nou sobrenom."
@@ -4700,7 +4770,7 @@ msgstr ""
 "d'amics, escolliu quelcom apropiat."
 
 msgid "Set Nickname..."
-msgstr "Establix el sobrenom..."
+msgstr "Estableix el sobrenom..."
 
 msgid "Actions"
 msgstr "Accions"
@@ -4708,9 +4778,6 @@ msgstr "Accions"
 msgid "Select an action"
 msgstr "Seleccioneu una acció"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "No s'ha pogut obtindre la llibreta d'adreces MSN"
-
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
@@ -4722,7 +4789,7 @@ msgid "Buddy Add error"
 msgstr "Error en afegir un amic"
 
 msgid "The username specified does not exist."
-msgstr "El nom d'usuari especificat no existix."
+msgstr "El nom d'usuari especificat no existeix."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4757,7 +4824,7 @@ msgstr "L'adreça de correu no és vàlida"
 
 #, c-format
 msgid "User does not exist"
-msgstr "L'usuari no existix."
+msgstr "L'usuari no existeix."
 
 #, c-format
 msgid "Fully qualified domain name missing"
@@ -4821,7 +4888,7 @@ msgstr "No es pot suprimir el grup zero"
 
 #, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "S'ha intentat afegir un usuari a un grup que no existix"
+msgstr "S'ha intentat afegir un usuari a un grup que no existeix"
 
 #, c-format
 msgid "Switchboard failed"
@@ -4845,7 +4912,7 @@ msgstr "No està connectat"
 
 #, c-format
 msgid "Service temporarily unavailable"
-msgstr "El servici està temporalment fora de servici"
+msgstr "El servei està temporalment fora de servei"
 
 #, c-format
 msgid "Database server error"
@@ -4951,7 +5018,6 @@ msgstr "Passaport per als nens sense consentiment patern"
 msgid "Passport account not yet verified"
 msgstr "El compte de passaport encara no està verificat"
 
-#, c-format
 msgid "Passport account suspended"
 msgstr "El compte de passaport s'ha suspès"
 
@@ -4973,12 +5039,38 @@ msgstr "Altres contactes"
 msgid "Non-IM Contacts"
 msgstr "Contactes que no són de MI"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s vos ha enviat un wink. <a href='msn-wink://%s'>Feu clic ací per escoltar-"
+"lo</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s vos ha envia un wink, però no s'ha pogut alçar"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s vos ha enviat un clip de veu. <a href='audio://%s'>Feu clic ací per "
+"escoltar-lo</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s vos han enviat un clip de música, però no s'ha pogut alçar"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s vos ha enviat una invitació per fer una conversa de veu, però això encara "
+"no està implementat."
+
 msgid "Nudge"
 msgstr "Donar un cop de colze"
 
 #, c-format
 msgid "%s has nudged you!"
-msgstr "%s us ha donat un cop de colze!"
+msgstr "%s vos ha donat un cop de colze!"
 
 #, c-format
 msgid "Nudging %s..."
@@ -4994,16 +5086,16 @@ msgid "Set your friendly name."
 msgstr "Establiu el vostre nom amistós."
 
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "Este és el nom amb el que els amics de l'MSN us veuran."
+msgstr "Este és el nom amb el que els amics de l'MSN vos veuran."
 
 msgid "Set your home phone number."
-msgstr "Establix el número de telèfon de casa."
+msgstr "Estableix el número de telèfon de casa."
 
 msgid "Set your work phone number."
-msgstr "Establix el número de telèfon de la faena."
+msgstr "Estableix el número de telèfon de la faena."
 
 msgid "Set your mobile phone number."
-msgstr "Establix el número de telèfon del mòbil."
+msgstr "Estableix el número de telèfon del mòbil."
 
 msgid "Allow MSN Mobile pages?"
 msgstr "Voleu permetre pàgines de mòbil d'MSN?"
@@ -5031,7 +5123,8 @@ msgstr "No hi ha text blocat per este compte."
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr "Actualment, servidors MSN bloquen estes expressions regulars:<br/>%s"
+msgstr ""
+"Actualment, servidors MSN bloquen estes expressions regulars:<br/>%s"
 
 msgid "This account does not have email enabled."
 msgstr "Este compte no té el correu habilitat."
@@ -5049,7 +5142,7 @@ msgid "Working"
 msgstr "Treballant"
 
 msgid "Has you"
-msgstr "Us té"
+msgstr "Vos té"
 
 msgid "Home Phone Number"
 msgstr "Número de telèfon de casa"
@@ -5091,16 +5184,16 @@ msgid "Office Title"
 msgstr "Títol oficial"
 
 msgid "Set Friendly Name..."
-msgstr "Establix el nom amistós..."
+msgstr "Estableix el nom amistós..."
 
 msgid "Set Home Phone Number..."
-msgstr "Establix el número de telèfon de casa..."
+msgstr "Estableix el número de telèfon de casa..."
 
 msgid "Set Work Phone Number..."
-msgstr "Establix el número de telèfon de la faena..."
+msgstr "Estableix el número de telèfon de la faena..."
 
 msgid "Set Mobile Phone Number..."
-msgstr "Establix el número del telèfon mòbil..."
+msgstr "Estableix el número del telèfon mòbil..."
 
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Habilita/inhabilita dispositius mòbils..."
@@ -5123,8 +5216,28 @@ msgstr "Inicia un _xat"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "L'MSN necessita SSL, instal·leu alguna biblioteca d'SSL permesa."
 
-msgid "Failed to connect to server."
-msgstr "No s'ha pogut connectar al servidor."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"No s'ha pogut afegir l'amic %s perquè el nom d'usuari no és vàlid. Els noms "
+"d'usuari han de ser adreces de correu vàlides."
+
+msgid "Unable to Add"
+msgstr "No s'ha pogut afegir"
+
+msgid "Authorization Request Message:"
+msgstr "Missatge de petició d'autorització:"
+
+msgid "Please authorize me!"
+msgstr "Autoritzeu-me, per favor."
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_D'acord"
 
 msgid "Error retrieving profile"
 msgstr "S'ha produït un error en recuperar el perfil"
@@ -5272,7 +5385,7 @@ msgid ""
 "public profile."
 msgstr ""
 "L'MSN no ha pogut trobar el perfil de l'usuari. Això pot voler dir que o bé "
-"l'usuari no existix, o que existix però el seu perfil no és públic."
+"l'usuari no existeix, o que existeix però el seu perfil no és públic."
 
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
@@ -5306,7 +5419,7 @@ msgid "Show custom smileys"
 msgstr "Mostra emoticones personalitzades"
 
 msgid "nudge: nudge a user to get their attention"
-msgstr "nudge: doneu un cop de colze a un usuari perquè us pare atenció"
+msgstr "nudge: doneu un cop de colze a un usuari perquè vos pare atenció"
 
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Autenticació amb el Windows Live ID: no s'ha pogut connectar"
@@ -5315,63 +5428,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticació amb el Windows Live ID: la resposta no és vàlida"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s no és un nom de grup vàlid"
-
-msgid "Unknown error."
-msgstr "Error desconegut."
+msgid "%s just sent you a Nudge!"
+msgstr "%s vos ha donat un cop de colze!"
 
 #, c-format
-msgid "%s on %s (%s)"
-msgstr "%s a %s (%s)"
+msgid "Unknown error (%d): %s"
+msgstr "Error desconegut (%d): %s"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s us ha donat un cop de colze!"
+msgid "Unable to add user"
+msgstr "No s'ha pogut afegir l'usuari"
 
-#. char *adl = g_strndup(payload, len);
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Error desconegut (%d)"
 
-msgid "Unable to add user"
-msgstr "No s'ha pogut afegir l'usuari"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Manquen estos usuaris a la vostra llista d'amics"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "No s'ha pogut afegir l'usuari a %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "No s'ha pogut blocar l'usuari %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "No s'ha pogut permetre l'usuari %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "No s'ha pogut afegir %s perquè la llista és plena."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s no és un compte de passaport vàlid."
-
-msgid "Service Temporarily Unavailable."
-msgstr "El servici no està disponible temporalment."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "No s'ha enviat el missatge al mòbil perquè era massa llarg."
 
-msgid "Unable to rename group"
-msgstr "No s'ha pogut canviar el nom del grup"
-
-msgid "Unable to delete group"
-msgstr "No s'ha pogut suprimir el grup"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5389,23 +5466,23 @@ msgid_plural ""
 "sign in."
 msgstr[0] ""
 "El servidor d'MSN es reiniciarà per raons de manteniment d'ací a %d minut. "
-"Se us desconnectarà automàticament al cap d'este temps. Finalitzeu qualsevol "
-"conversa en actiu.\n"
+"Se vos desconnectarà automàticament al cap d'este temps. Finalitzeu "
+"qualsevol conversa en actiu.\n"
 "\n"
-"Després que el manteniment s'haja completat, us podreu tornar a connectar."
+"Després que el manteniment s'haja completat, vos podreu tornar a connectar."
 msgstr[1] ""
 "El servidor d'MSN es reiniciarà per raons de manteniment d'ací a %d minuts. "
-"Se us desconnectarà automàticament al cap d'este temps. Finalitzeu qualsevol "
-"conversa en actiu.\n"
+"Se vos desconnectarà automàticament al cap d'este temps. Finalitzeu "
+"qualsevol conversa en actiu.\n"
 "\n"
-"Després que el manteniment s'haja completat, us podreu tornar a connectar."
+"Després que el manteniment s'haja completat, vos podreu tornar a connectar."
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
 "No s'ha pogut enviar el missatge perquè el sistema no està disponible. Això "
-"normalment passa quan l'usuari està blocat o no existix."
+"normalment passa quan l'usuari està blocat o no existeix."
 
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr ""
@@ -5420,9 +5497,6 @@ msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error desconegut."
 
-msgid "Unable to connect"
-msgstr "No s'ha pogut connectar"
-
 msgid "Writing error"
 msgstr "Error en escriure"
 
@@ -5437,22 +5511,22 @@ msgstr ""
 "S'ha produït un error de connexió del servidor %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "El servidor no implementa el nostre protocol."
+msgid "Our protocol is not supported by the server"
+msgstr "El servidor no implementa este protocol"
 
-msgid "Error parsing HTTP."
-msgstr "S'ha produït un error en analitzar HTTP."
+msgid "Error parsing HTTP"
+msgstr "S'ha produït un error en analitzar HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Us heu connectat des d'un altre lloc."
+msgid "You have signed on from another location"
+msgstr "Vos heu connectat des d'un altre lloc"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Els servidors MSN estan temporalment no disponibles. Espereu i proveu-ho més "
 "tard."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "Els servidors MSN no seran accessibles temporalment."
+msgid "The MSN servers are going down temporarily"
+msgstr "Els servidors MSN no seran accessibles temporalment"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5482,6 +5556,18 @@ msgstr "S'està enviant la galeta"
 msgid "Retrieving buddy list"
 msgstr "S'està recuperant la llista d'amics"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s ha sol·licitat poder veure la vostra càmera web, però això encara no està "
+"implementat."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s vos ha enviat una invitació a la seua càmera web, però això encara no està "
+"implementat."
+
 msgid "Away From Computer"
 msgstr "Lluny de l'ordinador"
 
@@ -5529,14 +5615,6 @@ msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error desconegut:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s us ha afegit a la seua llista d'amics."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s us ha suprimit de la seua llista d'amics."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Voleu suprimir l'amic de la llibreta d'adreces?"
 
@@ -5566,8 +5644,56 @@ msgid "MSN Protocol Plugin"
 msgstr "Connector per al protocol MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s no és un nom de grup vàlid"
+
+msgid "Unknown error."
+msgstr "Error desconegut."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s a %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "No s'ha pogut afegir l'usuari a %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "No s'ha pogut blocar l'usuari %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "No s'ha pogut permetre l'usuari %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "No s'ha pogut afegir %s perquè la llista és plena."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s no és un compte de passaport vàlid."
+
+msgid "Service Temporarily Unavailable."
+msgstr "El servei no està disponible temporalment."
+
+msgid "Unable to rename group"
+msgstr "No s'ha pogut canviar el nom del grup"
+
+msgid "Unable to delete group"
+msgstr "No s'ha pogut suprimir el grup"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s vos ha afegit a la seua llista d'amics."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s vos ha suprimit de la seua llista d'amics."
+
+#, c-format
 msgid "No such user: %s"
-msgstr "Este usuari no existix: %s"
+msgstr "Este usuari no existeix: %s"
 
 msgid "User lookup"
 msgstr "Cerca d'usuaris"
@@ -5577,7 +5703,7 @@ msgid "Reading challenge"
 msgstr "Repte de lectura"
 
 msgid "Unexpected challenge length from server"
-msgstr "El repte del servidor té una grandària inesperada"
+msgstr "El repte del servidor té una mida inesperada"
 
 msgid "Logging in"
 msgstr "S'està entrant"
@@ -5586,7 +5712,7 @@ msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - No s'ha establer cap nom d'usuari"
 
 msgid "You appear to have no MySpace username."
-msgstr "No sembla que tingueu cap nom d'usuari del MySpace."
+msgstr "No pareix que tingueu cap nom d'usuari del MySpace."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr "Voleu establir-ne un ara? (Nota: no es podrà canviar)"
@@ -5595,6 +5721,8 @@ msgid "Lost connection with server"
 msgstr "S'ha perdut la connexió amb el servidor"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Missatges de correu nous"
 
@@ -5634,26 +5762,22 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Addició de contactes del servidor"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connectat"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "S'ha produït un error en el protocol amb codi %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s La vostra contrasenya conté %d caràcters, més del màxim de %d que permet "
-"MySpaceIM. Escolliu una contrasenya més curta a http://profileedit.myspace."
-"com/index.cfm?fuseaction=accountSettings.changePassword i proveu-ho de nou."
+"%s La vostra contrasenya conté %zu caràcters, més %d que és el màxim permés. "
+"Escolliu una contrasenya més curta a http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword i proveu-ho de nou."
+
+msgid "Incorrect username or password"
+msgstr "El sobrenom o la contrasenya no són correctes"
 
 msgid "MySpaceIM Error"
 msgstr "S'ha produït un error en el MySpaceIM"
@@ -5661,16 +5785,6 @@ msgstr "S'ha produït un error en el MySpaceIM"
 msgid "Invalid input condition"
 msgstr "La condició d'entrada no és vàlida"
 
-msgid "Read buffer full (2)"
-msgstr "La memòria intermèdia de lectura és plena (2)"
-
-msgid "Unparseable message"
-msgstr "No es pot analitzar el missatge"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "No s'ha pogut afegir l'amic"
 
@@ -5721,8 +5835,8 @@ msgstr "Gestor d'URL myim"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
-"No s'ha pogut trobar cap compte adequat a MySpaceIM per poder obrir este URL "
-"myim."
+"No s'ha pogut trobar cap compte adequat a MySpaceIM per poder obrir este "
+"URL myim."
 
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Habiliteu el compte MySpaceIM adequat i proveu-ho de nou."
@@ -5743,7 +5857,7 @@ msgstr "Resolució de la pantalla (punts per polzada)"
 
 # FIXME: base... (josep)
 msgid "Base font size (points)"
-msgstr "Grandària del tipus de lletra base (punts)"
+msgstr "Mida del tipus de lletra base (punts)"
 
 msgid "User"
 msgstr "Usuari"
@@ -5760,6 +5874,15 @@ msgstr "Nombre d'amics"
 msgid "Client Version"
 msgstr "Versió del client"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"S'ha produït un error en intentar establir el nom d'usuari. Intenteu-ho de "
+"nou, o aneu a http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username per establir el vostre nom d'usuari."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - El nom d'usuari està disponible"
 
@@ -5792,28 +5915,27 @@ msgstr "Entreu un nom d'usuari per a comprovar-ne la disponibilitat:"
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
+msgstr "Enrampar"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s us ha afegit [%s]"
+msgstr "%s vos ha enrampat!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Zapping %s..."
-msgstr "S'està trucant a %s"
+msgstr "S'està enrampant %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#, fuzzy
 msgid "Whack"
 msgstr "bufetejar"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s us ha afegit [%s]"
+msgstr "%s vos ha bufetejat!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Whacking %s..."
-msgstr "Bufetejant"
+msgstr "S'està bufetejant %s..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
@@ -5823,7 +5945,7 @@ msgstr "Cala foc"
 
 #, c-format
 msgid "%s has torched you!"
-msgstr "%s us ha calat foc!"
+msgstr "%s vos ha calat foc!"
 
 #, c-format
 msgid "Torching %s..."
@@ -5836,7 +5958,7 @@ msgstr "Morreja"
 # Sí, sembla que siguem a l'època victoriana... (josep)
 #, c-format
 msgid "%s has smooched you!"
-msgstr "%s us ha morrejat!"
+msgstr "%s vos ha morrejat!"
 
 #, c-format
 msgid "Smooching %s..."
@@ -5848,7 +5970,7 @@ msgstr "Abraça"
 
 #, c-format
 msgid "%s has hugged you!"
-msgstr "%s us ha abraçat!"
+msgstr "%s vos ha abraçat!"
 
 #, c-format
 msgid "Hugging %s..."
@@ -5860,7 +5982,7 @@ msgstr "Bufeteja"
 
 #, c-format
 msgid "%s has slapped you!"
-msgstr "%s us ha bufetejat!"
+msgstr "%s vos ha bufetejat!"
 
 #, c-format
 msgid "Slapping %s..."
@@ -5872,7 +5994,7 @@ msgstr "Pessiga el cul"
 
 #, c-format
 msgid "%s has goosed you!"
-msgstr "%s us ha pessigat el cul!"
+msgstr "%s vos ha pessigat el cul!"
 
 #, c-format
 msgid "Goosing %s..."
@@ -5895,17 +6017,16 @@ msgstr "S'està xocant-ne cinc amb %s..."
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#, fuzzy
 msgid "Punk"
-msgstr "Ping"
+msgstr "Pren el pèl"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s s'ha connectat."
+msgstr "%s vos ha prés el pèl!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Punking %s..."
-msgstr "Ping"
+msgstr "S'està prenent el pèl a %s..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -5914,17 +6035,16 @@ msgstr "Ping"
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#, fuzzy
 msgid "Raspberry"
 msgstr "Llengoteja"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s s'ha connectat."
+msgstr "%s vos ha fet una llengota!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Raspberrying %s..."
-msgstr "Morrejant"
+msgstr "S'està fent una llengota a %s..."
 
 msgid "Required parameters not passed in"
 msgstr "No s'han passat tots els paràmetres requerits"
@@ -5942,10 +6062,10 @@ msgid "Conference not found"
 msgstr "No s'ha trobat la conferència"
 
 msgid "Conference does not exist"
-msgstr "La conferència no existix."
+msgstr "La conferència no existeix."
 
 msgid "A folder with that name already exists"
-msgstr "Ja existix una carpeta amb este nom"
+msgstr "Ja existeix una carpeta amb este nom"
 
 msgid "Not supported"
 msgstr "No està implementat"
@@ -5980,9 +6100,6 @@ msgstr "No es pot afegir a un mateix"
 msgid "Master archive is misconfigured"
 msgstr "L'arxiu mestre està desconfigurat"
 
-msgid "Incorrect username or password"
-msgstr "El sobrenom o la contrasenya no són correctes"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "No s'ha pogut reconèixer l'ordinador del nom d'usuari que heu entrat"
 
@@ -6009,13 +6126,14 @@ msgid "Incompatible protocol version"
 msgstr "La versió del protocol no és compatible"
 
 msgid "The user has blocked you"
-msgstr "L'usuari us ha blocat"
+msgstr "L'usuari vos ha blocat"
 
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-"Esta versió d'avaluació no permet que entrin més de deu usuaris a la vegada"
+"Esta versió d'avaluació no permet que entrin més de deu usuaris a la "
+"vegada"
 
 msgid "The user is either offline or you are blocked"
 msgstr "L'usuari està fora de línia o bé esteu blocat"
@@ -6025,14 +6143,14 @@ msgid "Unknown error: 0x%X"
 msgstr "Error desconegut: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Ha fallat l'entrada (%s)."
+msgid "Unable to login: %s"
+msgstr "No s'ha pogut entrar: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"No s'ha pogut enviar el missatge. No s'han pogut obtindre detalls de "
-"l'usuari (%s)."
+"No s'ha pogut enviar el missatge. No s'han pogut obtindre detalls de l'usuari "
+"(%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
@@ -6137,9 +6255,6 @@ msgstr "Conferència GroupWise %d"
 msgid "Authenticating..."
 msgstr "S'està autenticant..."
 
-msgid "Unable to connect to server."
-msgstr "No s'ha pogut connectar al servidor."
-
 msgid "Waiting for response..."
 msgstr "S'està esperant una resposta..."
 
@@ -6163,11 +6278,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Voleu afegir-vos a la conversa?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Se us ha desconnectat perquè heu entrat a través d'una altra estació de "
-"treball."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6176,16 +6286,12 @@ msgstr ""
 "acabeu d'enviar."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "No s'ha pogut connectar al servidor. Introduïu l'adreça del servidor al qual "
-"us vulgueu connectar."
+"vos vulgueu connectar."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error. No hi ha instal·lades les biblioteques per a SSL."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "S'ha tancat esta conferència. No s'hi poden enviar més missatges."
 
@@ -6208,25 +6314,33 @@ msgstr "Adreça del servidor"
 msgid "Server port"
 msgstr "Port en el servidor"
 
+msgid "Received unexpected response from "
+msgstr "S'ha rebut una resposta inesperada de "
+
+#. username connecting too frequently
+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 ""
+"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu "
+"deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
+"encara més temps."
+
+#, c-format
+msgid "Error requesting "
+msgstr "S'ha produït en sol·licitar "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL no permet que vos autentiqueu amb este nom d'usuari ací"
+
 msgid "Could not join chat room"
 msgstr "No s'ha pogut entrar a la sala de xat"
 
 msgid "Invalid chat room name"
 msgstr "El nom de sala de xat no és vàlid"
 
-msgid "Server closed the connection."
-msgstr "El servidor ha tancat la connexió."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"S'ha perdut la connexió amb el servidor:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "S'han rebut dades invàlides a la connexió amb el servidor."
+msgid "Received invalid data on connection with server"
+msgstr "S'han rebut dades invàlides a la connexió amb el servidor"
 
 #. *< type
 #. *< ui_requirement
@@ -6273,8 +6387,8 @@ msgstr "S'ha perdut la connexió amb l'usuari remot:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "S'han rebut dades invàlides a la connexió amb l'usuari remot."
 
-msgid "Could not establish a connection with the remote user."
-msgstr "No s'ha pogut establir una connexió amb l'usuari remot."
+msgid "Unable to establish a connection with the remote user."
+msgstr "No s'ha pogut establir una connexió amb el servidor remot."
 
 msgid "Direct IM established"
 msgstr "S'ha establit una connexió directa de MI"
@@ -6284,14 +6398,14 @@ msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
 msgstr ""
-"%s us ha intentat enviar un fitxer %s, però ara mateix només permetem enviar "
+"%s vos ha intentat enviar un fitxer %s, però ara mateix només permetem enviar "
 "fitxers de fins a %s a través de MI directa. Proveu-ho fent servir la "
 "transferència de fitxers.\n"
 
 # FIXME
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "El fitxer %s és %s, que és més gran que la grandària màxima de %s."
+msgstr "El fitxer %s és %s, que és més gran que la mida màxima de %s."
 
 msgid "Invalid error"
 msgstr "Error invàlid"
@@ -6306,10 +6420,10 @@ msgid "Rate to client"
 msgstr "Velocitat cap al client"
 
 msgid "Service unavailable"
-msgstr "Servici no disponible"
+msgstr "Servei no disponible"
 
 msgid "Service not defined"
-msgstr "Servici no definit"
+msgstr "Servei no definit"
 
 msgid "Obsolete SNAC"
 msgstr "SNAC obsolet"
@@ -6381,8 +6495,9 @@ msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"(S'ha produït un error en rebre este missatge. És molt possible que %s empri "
-"una codificació diferent a la vostra, o que %s tinga un client defectuós)"
+"(S'ha produït un error en rebre este missatge. És molt possible que %s "
+"empri una codificació diferent a la vostra, o que %s tinga un client "
+"defectuós)"
 
 #. Label
 msgid "Buddy Icon"
@@ -6395,7 +6510,7 @@ msgid "AIM Direct IM"
 msgstr "MI AIM directes"
 
 msgid "Get File"
-msgstr "Aconseguix el fitxer"
+msgstr "Aconsegueix el fitxer"
 
 msgid "Games"
 msgstr "Jocs"
@@ -6451,23 +6566,18 @@ msgstr "Càmera"
 msgid "Screen Sharing"
 msgstr "Compartició de pantalla"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Lliure per parlar"
 
-#, c-format
 msgid "Not Available"
 msgstr "No disponible"
 
-#, c-format
 msgid "Occupied"
 msgstr "Ocupat"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Conscient de la web"
 
-#, c-format
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -6481,20 +6591,12 @@ msgid "Buddy Comment"
 msgstr "Comentari de l'amic"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"No s'ha pogut connectar al servidor d'autenticació:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "No s'ha pogut connectar al servidor d'autenticació: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"No s'ha pogut connectar al servidor BOS:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "No s'ha pogut connectar al servidor BOS: %s"
 
 msgid "Username sent"
 msgstr "S'ha enviat el nom d'usuari"
@@ -6508,54 +6610,61 @@ msgstr "S'està finalitzant la connexió"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"No s'ha pogut entrar: no s'ha pogut entrar com a %s perquè el nom d'usuari "
-"no és vàlid. Els noms d'usuari han de ser adreces de correu vàlides, o "
-"començar amb una lletra i contindre només lletres, nombres o espais, o només "
-"nombres."
+"No s'ha pogut entrar com a %s perquè este nom d'usuari no és vàlid. Els "
+"noms d'usuari han de ser adreces de correu vàlides, o començar amb una "
+"lletra i contindre només lletres, nombres o espais, o només nombres."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "El nom d'usuari no és vàlid"
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Pot ser que es desconnecte d'ací a poc. Si això passés, comproveu si hi ha "
+"actualitzacions a %s."
+
+# FIXME: hash (josep)
+msgid "Unable to get a valid AIM login hash."
+msgstr "No s'ha pogut obtindre un hash d'AIM d'entrada vàlid."
+
+msgid "Unable to get a valid login hash."
+msgstr "No s'ha pogut obtindre un hash d'entrada vàlid."
+
+msgid "Received authorization"
+msgstr "S'ha rebut l'autorització"
 
-msgid "Incorrect password."
-msgstr "La contrasenya no és correcta."
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "L'usuari no existeix"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "El vostre compte està actualment suspès."
+msgid "Your account is currently suspended"
+msgstr "El vostre compte està actualment suspès"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
-"El servici de missatges instantanis d'AOL no està disponible temporalment."
-
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu "
-"deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
-"encara més temps."
+"El servei de missatges instantanis d'AOL no està disponible temporalment."
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "La versió del client que useu és massa antiga, actualitzeu-la a %s"
 
-msgid "Could Not Connect"
-msgstr "No s'ha pogut connectar"
-
-msgid "Received authorization"
-msgstr "S'ha rebut l'autorització"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu un "
+"minut i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
+"encara més temps."
 
-msgid "The SecurID key entered is invalid."
-msgstr "La clau SecurID que heu entrat no és vàlida."
+msgid "The SecurID key entered is invalid"
+msgstr "La clau SecurID que heu entrat no és vàlida"
 
 msgid "Enter SecurID"
 msgstr "Introduïu el SecureID"
@@ -6563,33 +6672,6 @@ msgstr "Introduïu el SecureID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduïu el nombre de 6 dígits de la pantalla digital."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_D'acord"
-
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Se us pot desconnectar d'ací a poc temps. Si voleu, podeu emprar TOC fins "
-"que això es resolgui. Comproveu si hi ha actualitzacions a %s."
-
-# FIXME: hash (josep)
-msgid "Unable to get a valid AIM login hash."
-msgstr "No s'ha pogut obtindre un hash d'AIM d'entrada vàlid."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Se us pot desconnectar d'ací a poc temps. Comproveu si hi ha actualitzacions "
-"a %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "No s'ha pogut obtindre un hash d'entrada vàlid."
-
 msgid "Password sent"
 msgstr "S'ha enviat la contrasenya"
 
@@ -6597,13 +6679,7 @@ msgid "Unable to initialize connection"
 msgstr "No s'ha pogut inicialitzar la connexió"
 
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Autoritzeu-me perquè us puga afegir a la meua llista d'amics."
-
-msgid "Authorization Request Message:"
-msgstr "Missatge de petició d'autorització:"
-
-msgid "Please authorize me!"
-msgstr "Autoritzeu-me, per favor."
+msgstr "Autoritzeu-me perquè vos puga afegir a la meua llista d'amics."
 
 msgid "No reason given."
 msgstr "No s'ha indicat cap motiu."
@@ -6617,7 +6693,7 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"L'usuari %u us ha denegat la vostra sol·licitud d'afegir-lo a la vostra "
+"L'usuari %u vos ha denegat la vostra sol·licitud d'afegir-lo a la vostra "
 "llista d'amics pel següent motiu:\n"
 "%s"
 
@@ -6627,7 +6703,7 @@ msgstr "S'ha denegat l'autorització ICQ."
 #. Someone has granted you authorization
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "L'usuari %u us ha permés afegir-lo a la vostra llista d'amics."
+msgstr "L'usuari %u vos ha permés afegir-lo a la vostra llista d'amics."
 
 #, c-format
 msgid ""
@@ -6667,7 +6743,7 @@ msgstr ""
 
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "L'usuari %u d'ICQ us ha enviat un amic: %s (%s)"
+msgstr "L'usuari %u d'ICQ vos ha enviat un amic: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voleu afegir este amic a la vostra llista d'amics?"
@@ -6723,7 +6799,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Heu perdut %hu missatge de %s per motius desconeguts."
 msgstr[1] "Heu perdut %hu missatges de %s per motius desconeguts."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
@@ -6745,6 +6821,9 @@ msgstr "En línia des de"
 msgid "Member Since"
 msgstr "Membre des de"
 
+msgid "Capabilities"
+msgstr "Capacitats"
+
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6768,7 +6847,7 @@ msgstr ""
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Se us ha desconnectat de la conversa %s."
+msgstr "Se vos ha desconnectat de la conversa %s."
 
 msgid "Mobile Phone"
 msgstr "Telèfon mòbil"
@@ -6822,7 +6901,7 @@ msgid ""
 "from the original."
 msgstr ""
 "Error 0x%04x: no s'ha pogut formatar el nom d'usuari perquè el nom demanat "
-"diferix de l'original."
+"difereix de l'original."
 
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
@@ -6890,7 +6969,7 @@ msgid ""
 "fully connected."
 msgstr ""
 "Probablement heu demanat establir el vostre perfil abans d'acabar amb el "
-"procés de connexió. El vostre perfil seguix sense estar establit; intenteu "
+"procés de connexió. El vostre perfil segueix sense estar establit; intenteu "
 "establir-lo de nou quan el procés de connexió haja finalitzat."
 
 #, c-format
@@ -6901,11 +6980,11 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"S'ha excedit el límit màxim de la grandària del perfil, que és d'%d byte. "
-"S'ha retallat."
+"S'ha excedit el límit màxim de la mida del perfil, que és d'%d byte. S'ha "
+"retallat."
 msgstr[1] ""
-"S'ha excedit el límit màxim de la grandària del perfil, que és de %d octets. "
-"S'ha retallat."
+"S'ha excedit el límit màxim de la mida del perfil, que és de %d octets. S'ha "
+"retallat."
 
 msgid "Profile too long."
 msgstr "Perfil massa llarg."
@@ -6927,7 +7006,7 @@ msgstr "El missatge d'absència és massa llarg."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6935,9 +7014,6 @@ msgstr ""
 "d'usuari han de ser adreces de correu vàlides, o començar amb una lletra i "
 "contindre només lletres, nombres i espais, o només nombres."
 
-msgid "Unable to Add"
-msgstr "No s'ha pogut afegir"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "No s'ha pogut obtindre la llista d'amics"
 
@@ -6953,17 +7029,17 @@ msgstr "Orfes"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"No s'ha pogut afegir l'amic %s perquè hi ha massa entrades a la llista "
-"d'amics. Suprimiu-ne algun i torneu-ho a intentar."
+"No s'ha pogut afegir l'amic %s perquè hi ha massa amics a la llista d'amics. "
+"Suprimiu-ne algun i torneu-ho a intentar."
 
 msgid "(no name)"
 msgstr "(sense nom)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Per motius desconeguts no s'ha pogut afegir l'amic %s."
 
 #, c-format
@@ -6971,7 +7047,7 @@ msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
 msgstr ""
-"L'usuari %s us ha donat permís perquè l'afegiu a la vostra llista d'amics. "
+"L'usuari %s vos ha donat permís perquè l'afegiu a la vostra llista d'amics. "
 "Voleu afegir-lo?"
 
 msgid "Authorization Given"
@@ -6980,7 +7056,7 @@ msgstr "S'ha donat l'autorització"
 #. Granted
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "L'usuari %s us ha permés afegir-lo a la vostra llista d'amics."
+msgstr "L'usuari %s vos ha permés afegir-lo a la vostra llista d'amics."
 
 msgid "Authorization Granted"
 msgstr "S'ha concedit l'autorització"
@@ -6992,7 +7068,7 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"L'usuari %s us ha denegat la petició d'afegir-lo a la vostra llista d'amics "
+"L'usuari %s vos ha denegat la petició d'afegir-lo a la vostra llista d'amics "
 "pels motius següents:\n"
 "%s"
 
@@ -7033,11 +7109,12 @@ msgstr "C_onnecta"
 msgid "Get AIM Info"
 msgstr "Obtén informació d'AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Edita el comentari sobre l'amic"
 
 msgid "Get Status Msg"
-msgstr "Aconseguix el missatge d'estat"
+msgstr "Aconsegueix el missatge d'estat"
 
 msgid "Direct IM"
 msgstr "MI directa"
@@ -7046,7 +7123,7 @@ msgid "Re-request Authorization"
 msgstr "Torna a demanar l'autorització"
 
 msgid "Require authorization"
-msgstr "Requerix autorització"
+msgstr "Requereix autorització"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Atent al web (si ho habiliteu, farà que comenceu a rebre'n brossa)"
@@ -7075,8 +7152,8 @@ msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Podeu tornar a demanar l'autorització d'estos amics fent-hi clic a sobre amb "
-"el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
+"Podeu tornar a demanar l'autorització d'estos amics fent-hi clic a sobre "
+"amb el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
 
 msgid "Find Buddy by Email"
 msgstr "Troba un amic per l'adreça de correu"
@@ -7091,8 +7168,9 @@ msgid "_Search"
 msgstr "C_erca"
 
 msgid "Set User Info (web)..."
-msgstr "Establix informació d'usuari (web)..."
+msgstr "Estableix informació d'usuari (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Canvia la contrasenya (web)"
 
@@ -7101,7 +7179,7 @@ msgstr "Configura el reenviament de MI (web)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "Establix les opcions de privadesa..."
+msgstr "Estableix les opcions de privadesa..."
 
 #. AIM actions
 msgid "Confirm Account"
@@ -7122,6 +7200,9 @@ msgstr "Cerca un amic per l'adreça de correu..."
 msgid "Search for Buddy by Information"
 msgstr "Cerca un amic per la informació"
 
+msgid "Use clientLogin"
+msgstr "Empra clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7144,7 +7225,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr "S'està intentant connectar amb %s:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "S'està intentant connectar a través d'un servidor intermediari."
 
@@ -7157,7 +7237,7 @@ msgid ""
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
-"Això requerix la connexió directa entre els dos ordinadors, ja que és "
+"Això requereix la connexió directa entre els dos ordinadors, ja que és "
 "necessari per poder enviar imatges instantànies. Atès que es revelarà la "
 "vostra adreça IP, això es pot considerar un risc de privadesa."
 
@@ -7261,7 +7341,7 @@ msgid "Phone Number"
 msgstr "Número de telèfon"
 
 msgid "Authorize adding"
-msgstr "Autoritzar que us afegisquen"
+msgstr "Autoritzar que vos afegisquen"
 
 msgid "Cellphone Number"
 msgstr "Número de mòbil"
@@ -7314,6 +7394,35 @@ msgstr "Actualitza"
 msgid "Could not change buddy information."
 msgstr "No s'ha pogut canviar la informació l'amic."
 
+msgid "Mobile"
+msgstr "Mòbil"
+
+msgid "Note"
+msgstr "Nota"
+
+# FIXME: "memo", el qq té una terminologia molt peculiar
+#. callback
+msgid "Buddy Memo"
+msgstr "Memo de l'amic"
+
+msgid "Change his/her memo as you like"
+msgstr "Canvieu-ne el memo"
+
+msgid "_Modify"
+msgstr "_Modifica"
+
+msgid "Memo Modify"
+msgstr "Modifica el memo"
+
+msgid "Server says:"
+msgstr "El servidor diu:"
+
+msgid "Your request was accepted."
+msgstr "S'ha acceptat la vostra sol·licitud."
+
+msgid "Your request was rejected."
+msgstr "S'ha rebutjat la vostra sol·licitud."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "Cal verificació per a %u"
@@ -7369,7 +7478,7 @@ msgstr "No s'ha pogut suprimir l'amic %u"
 
 #, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "No us heu pogut suprimir de la llista d'amics de %d"
+msgstr "No vos heu pogut suprimir de la llista d'amics de %d"
 
 msgid "No reason given"
 msgstr "No s'ha indicat cap motiu"
@@ -7377,7 +7486,7 @@ msgstr "No s'ha indicat cap motiu"
 #. only need to get value
 #, c-format
 msgid "You have been added by %s"
-msgstr "%s us ha afegit"
+msgstr "%s vos ha afegit"
 
 msgid "Would you like to add him?"
 msgstr "Voleu afegir-lo?"
@@ -7453,7 +7562,7 @@ msgstr "S'ha entrat al Qun"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr "No se us ha permés entrar al Qun %u"
+msgstr "No se vos ha permés entrar al Qun %u"
 
 msgid "QQ Qun Operation"
 msgstr "Operació Qun QQ"
@@ -7506,7 +7615,7 @@ msgstr "No s'ha pogut entrar al Qun %u, administrat per %u"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr "<b>L'administrador %2$u us ha permés unir-vos al Qun %1$u per %3$s</b>"
+msgstr "<b>L'administrador %2$u vos ha permés unir-vos al Qun %1$u per %3$s</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
@@ -7529,13 +7638,11 @@ msgstr " VIP"
 msgid " TCP"
 msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "Mòbil"
+msgstr " FromMobile"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "Mòbil"
+msgstr " BindMobile"
 
 msgid " Video"
 msgstr " Vídeo"
@@ -7628,11 +7735,17 @@ msgstr "<p><b>Encantadors apedaçadors (de codi)</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Reconeixement</b>:<br>\n"
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Comprovadors del codi</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "i més, per favor feu-m'ho saber... gràcies!!!))"
+
 # FIXME: ush... traducció lliure... 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>I tothom que ho ha fet possible...<i><br>\n"
 
-msgid "<i>Feel free to join us!</i> :)"
+msgid "<i>Feel free to join vos!</i> :)"
 msgstr "<i>No dubteu a col·laborar amb nosaltres!</i> :)"
 
 #, c-format
@@ -7654,6 +7767,9 @@ msgstr "Actualitza tots els Quns QQ"
 msgid "About OpenQ"
 msgstr "Quant a l'OpenQ"
 
+msgid "Modify Buddy Memo"
+msgstr "Modifica el memo de l'amic"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7691,6 +7807,9 @@ msgstr "Mostra els avisos del servidor"
 msgid "Show server news"
 msgstr "Mostra les notícies del servidor"
 
+msgid "Show chat room when msg comes"
+msgstr "Mostra la sala de xat quan hi arriben missatges"
+
 # FIXME: keep alive -> permanència
 msgid "Keep alive interval (seconds)"
 msgstr "Interval de permanència (en segons)"
@@ -7698,7 +7817,7 @@ msgstr "Interval de permanència (en segons)"
 msgid "Update interval (seconds)"
 msgstr "Interval d'actualització (en segons)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "No es pot desxifrar la resposta del servidor"
 
 #, c-format
@@ -7723,9 +7842,6 @@ msgstr "Cal activació"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "No s'ha reconegut el codi de resposta en entrar (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "No s'ha pogut desxifrar la resposta del servidor"
-
 # FIXME: captcha
 msgid "Requesting captcha"
 msgstr "S'està sol·licitant un capcha"
@@ -7761,30 +7877,17 @@ msgstr ""
 "No s'ha reconegut el codi de resposta en entrar (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "No s'ha pogut connectar."
-
 msgid "Socket error"
 msgstr "Error del sòcol"
 
-msgid "Unable to read from socket"
-msgstr "No s'ha pogut llegir el sòcol"
-
-msgid "Write Error"
-msgstr "Error d'escriptura"
-
-msgid "Connection lost"
-msgstr "S'ha perdut la connexió"
-
 msgid "Getting server"
 msgstr "S'està obtenint el servidor"
 
 msgid "Requesting token"
 msgstr "S'està sol·licitant un testimoni"
 
-msgid "Couldn't resolve host"
-msgstr "No s'ha pogut obtindre l'adreça de l'ordinador"
+msgid "Unable to resolve hostname"
+msgstr "No s'ha pogut resoldre el nom de l'ordinador"
 
 msgid "Invalid server or port"
 msgstr "El servidor o el port no són vàlids"
@@ -7837,7 +7940,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Orde QQ Qun"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "No s'ha pogut desxifrar la resposta d'entrada"
 
 msgid "Unknown LOGIN CMD"
@@ -7857,9 +7960,6 @@ msgstr "S'ha enviat el fitxer"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ha cancel·lat la transferència de %s"
 
-msgid "Connection closed (writing)"
-msgstr "S'ha tancat la connexió (escrivint)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Títol del grup:</b> %s<br>"
@@ -7915,17 +8015,6 @@ msgstr "Un administrador de Sametime ha enviat este anunci en el servidor %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Anunci de l'administrador de Sametime"
 
-msgid "Connection reset"
-msgstr "S'ha reiniciat la connexió"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "S'ha produït un error en llegir del sòcol: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "No s'ha pogut connectar a l'ordinador"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Avís de %s"
@@ -7948,6 +8037,9 @@ msgstr "Altaveus"
 msgid "Video Camera"
 msgstr "Càmera de vídeo"
 
+msgid "File Transfer"
+msgstr "Transferència de fitxers"
+
 msgid "Supports"
 msgstr "Permet"
 
@@ -7985,8 +8077,8 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Seleccioneu a quina conferència, de les d'ací sota, voleu convidar l'usuari %"
-"s. Seleccioneu «Crea una nova conferència» si voleu crear-ne una de nova on "
+"Seleccioneu a quina conferència, de les d'ací sota, voleu convidar l'usuari "
+"%s. Seleccioneu «Crea una nova conferència» si voleu crear-ne una de nova on "
 "convidar-hi l'usuari."
 
 msgid "Invite to Conference"
@@ -8057,7 +8149,7 @@ msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"L'identificador «%s» no coincidix amb cap usuari de la vostra comunitat "
+"L'identificador «%s» no coincideix amb cap usuari de la vostra comunitat "
 "Sametime. S'ha suprimit esta entrada de la vostra llista d'amics."
 
 #, c-format
@@ -8095,11 +8187,11 @@ msgid "Export Sametime List for Account %s"
 msgstr "Exporta la llista Sametime del compte %s"
 
 msgid "Unable to add group: group exists"
-msgstr "No s'ha pogut afegir el grup: ja existix"
+msgstr "No s'ha pogut afegir el grup: ja existeix"
 
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "Ja existix un grup anomenat «%s» a la vostra llista d'amics."
+msgstr "Ja existeix un grup anomenat «%s» a la vostra llista d'amics."
 
 msgid "Unable to add group"
 msgstr "No s'ha pogut afegir el grup"
@@ -8131,7 +8223,7 @@ msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-"L'identificador «%s» no coincidix amb cap dels grups de llibretes d'adreces "
+"L'identificador «%s» no coincideix amb cap dels grups de llibretes d'adreces "
 "Notes de la vostra comunitat Sametime."
 
 msgid "Notes Address Book Group"
@@ -8168,8 +8260,8 @@ msgstr "Cap coincidència"
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-"L'identificador «%s» no coincidix amb cap dels usuaris de la vostra comunitat "
-"Sametime."
+"L'identificador «%s» no coincideix amb cap dels usuaris de la vostra "
+"comunitat Sametime."
 
 msgid "No Matches"
 msgstr "Cap coincidència"
@@ -8266,7 +8358,7 @@ msgid "Set IM Password"
 msgstr "Especifica la contrasenya de MI"
 
 msgid "Get Public Key"
-msgstr "Aconseguix la clau pública"
+msgstr "Aconsegueix la clau pública"
 
 msgid "Cannot fetch the public key"
 msgstr "No s'ha pogut obtindre la clau pública"
@@ -8292,7 +8384,7 @@ msgid ""
 "You can use the Get Public Key command to get the public key."
 msgstr ""
 "No podeu rebre notificacions d'amic fins que no hàgeu importat la seua clau "
-"pública. Podeu fer servir l'orde 'Aconseguix la clau pública' per obtindre-"
+"pública. Podeu fer servir l'orde 'Aconsegueix la clau pública' per obtindre-"
 "la."
 
 #. Open file selector to select the public key.
@@ -8406,7 +8498,7 @@ msgid "IM with Password"
 msgstr "MI amb contrasenya"
 
 msgid "Get Public Key..."
-msgstr "Aconseguix la clau pública..."
+msgstr "Aconsegueix la clau pública..."
 
 msgid "Kill User"
 msgstr "Mata l'usuari"
@@ -8419,7 +8511,7 @@ msgstr "_Contrasenya:"
 
 #, c-format
 msgid "Channel %s does not exist in the network"
-msgstr "No existix el canal %s a la xarxa"
+msgstr "No existeix el canal %s a la xarxa"
 
 msgid "Channel Information"
 msgstr "Informació del canal"
@@ -8495,7 +8587,7 @@ msgid "Channel Authentication"
 msgstr "Autenticació del canal"
 
 msgid "Add / Remove"
-msgstr "Afig / Suprimix"
+msgstr "Afig / Suprimeix"
 
 msgid "Group Name"
 msgstr "Nom del grup"
@@ -8515,7 +8607,7 @@ msgstr "Límit d'usuaris"
 
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
-"Establix el límit d'usuaris del canal. Poseu-lo a zero per reiniciar el "
+"Estableix el límit d'usuaris del canal. Poseu-lo a zero per reiniciar el "
 "límit."
 
 msgid "Invite List"
@@ -8531,28 +8623,28 @@ msgid "Reset Permanent"
 msgstr "Reiniciació permanent"
 
 msgid "Set Permanent"
-msgstr "Establix a permanent"
+msgstr "Estableix a permanent"
 
 msgid "Set User Limit"
-msgstr "Establix el límit d'usuaris"
+msgstr "Estableix el límit d'usuaris"
 
 msgid "Reset Topic Restriction"
 msgstr "Reinicia la restricció del tema"
 
 msgid "Set Topic Restriction"
-msgstr "Establix restricció del tema"
+msgstr "Estableix restricció del tema"
 
 msgid "Reset Private Channel"
 msgstr "Reinicia el canal privat"
 
 msgid "Set Private Channel"
-msgstr "Establix canal privat"
+msgstr "Estableix canal privat"
 
 msgid "Reset Secret Channel"
 msgstr "Reinicia canal secret"
 
 msgid "Set Secret Channel"
-msgstr "Establix canal secret"
+msgstr "Estableix canal secret"
 
 #, c-format
 msgid ""
@@ -8597,7 +8689,7 @@ msgid "Creating connection failed"
 msgstr "No s'ha pogut crear la connexió"
 
 msgid "File transfer session does not exist"
-msgstr "La sessió de transferència de fitxers no existix"
+msgstr "La sessió de transferència de fitxers no existeix"
 
 msgid "No file transfer session active"
 msgstr "No hi ha cap sessió activa per a la transferència de fitxers"
@@ -8639,15 +8731,15 @@ msgstr "<I>%s</I> ha suprimit tots els modes de <I>%s</I>"
 
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "<I>%2$s</I> us ha fet fora de <I>%1$s</I> (%3$s)"
+msgstr "<I>%2$s</I> vos ha fet fora de <I>%1$s</I> (%3$s)"
 
 #, c-format
 msgid "You have been killed by %s (%s)"
-msgstr "%s us ha matat (%s)"
+msgstr "%s vos ha matat (%s)"
 
 #, c-format
 msgid "Killed by %s (%s)"
-msgstr "%s us ha matat (%s)"
+msgstr "%s vos ha matat (%s)"
 
 msgid "Server signoff"
 msgstr "Desconnexió del servidor"
@@ -8667,9 +8759,6 @@ msgstr "Organització"
 msgid "Unit"
 msgstr "Unitat"
 
-msgid "Note"
-msgstr "Nota"
-
 msgid "Join Chat"
 msgstr "Entra a un xat"
 
@@ -8769,6 +8858,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Estadístiques de xarxa"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ha fallat el ping"
 
@@ -8801,7 +8893,7 @@ msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
-"S'ha rebut la clau pública de %s. La còpia local de la clau no coincidix. "
+"S'ha rebut la clau pública de %s. La còpia local de la clau no coincideix. "
 "Voleu acceptar esta clau pública, de tota manera?"
 
 #, c-format
@@ -8830,9 +8922,9 @@ msgid "Unsupported public key type"
 msgstr "El tipus de la clau pública no està suportat"
 
 msgid "Disconnected by server"
-msgstr "El servidor us ha desconnectat"
+msgstr "El servidor vos ha desconnectat"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "S'ha produït un error en connectar al servidor SILC"
 
 msgid "Key Exchange failed"
@@ -8844,16 +8936,10 @@ msgstr ""
 "No s'ha pogut restablir la sessió anteriorment separada. Premeu «Torna a "
 "connectar» per crear una nova connexió."
 
-msgid "Connection failed"
-msgstr "Ha fallat la connexió"
-
 msgid "Performing key exchange"
 msgstr "S'estan intercanviant les claus"
 
-msgid "Unable to create connection"
-msgstr "No s'ha pogut crear la connexió"
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "No s'ha pogut carregar el parell de claus SILC"
 
 #. Progress
@@ -8863,7 +8949,7 @@ msgstr "S'està connectant al servidor SILC"
 msgid "Out of memory"
 msgstr "Sense memòria"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "No s'ha pogut inicialitzar el protocol SILC"
 
 msgid "Error loading SILC key pair"
@@ -9011,7 +9097,8 @@ msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;tema nou&gt;]: mostra o canvia el tema"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;canal&gt; [&lt;contrasenya&gt;]: entra en un xat d'esta xarxa"
+msgstr ""
+"join &lt;canal&gt; [&lt;contrasenya&gt;]: entra en un xat d'esta xarxa"
 
 msgid "list:  List channels on this network"
 msgstr "list:  llista els canals en esta xarxa"
@@ -9075,7 +9162,7 @@ msgid ""
 "channel invite list"
 msgstr ""
 "invite &lt;canal&gt; [-|+]&lt;sobrenom&gt;: convida el sobrenom o afig/"
-"suprimix de la llista de convidats al canal"
+"suprimeix de la llista de convidats al canal"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
@@ -9161,8 +9248,8 @@ msgstr "Signa i verifica digitalment tots els missatges"
 msgid "Creating SILC key pair..."
 msgstr "S'està creant el parell de claus SILC..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "No s'ha pogut crear el parell de claus SILC\n"
+msgid "Unable to create SILC key pair"
+msgstr "No s'ha pogut crear el parell de claus SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9255,6 +9342,9 @@ msgstr "Pissarra"
 msgid "No server statistics available"
 msgstr "No hi ha estadístiques del servidor disponibles"
 
+msgid "Error during connecting to SILC Server"
+msgstr "S'ha produït un error en connectar al servidor SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Error: les versions no coincideixen, actualitzeu el client"
@@ -9300,34 +9390,31 @@ msgstr "Error: la galeta no és vàlida"
 msgid "Failure: Authentication failed"
 msgstr "Error: ha fallat l'autenticació"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "No s'ha pogut inicialitzar la connexió per al client SILC"
 
 msgid "John Noname"
 msgstr "Pepet Sensenom"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "No s'ha pogut carregar la parella de claus SILC: %s"
 
-msgid "Could not write"
-msgstr "No s'ha pogut escriure"
-
-msgid "Could not connect"
-msgstr "No s'ha pogut connectar"
-
-msgid "Unknown server response."
-msgstr "Resposta desconeguda del servidor."
+msgid "Unable to create connection"
+msgstr "No s'ha pogut crear la connexió"
 
-msgid "Could not create listen socket"
-msgstr "No s'ha pogut crear el sòcol per a escoltar"
+msgid "Unknown server response"
+msgstr "Resposta desconeguda del servidor"
 
-msgid "Could not resolve hostname"
-msgstr "No s'ha pogut resoltre el nom de l'ordinador"
+msgid "Unable to create listen socket"
+msgstr "No s'ha pogut crear el sòcol on escoltar"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Els noms d'usuari SIP no poden contindre espais en blanc ni @"
 
+msgid "SIP connect server not specified"
+msgstr "No s'ha especificat el servidor SIP al qual connectar-se"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9344,7 +9431,7 @@ msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "El connector per al protocol SIP/SIMPLE"
 
 msgid "Publish status (note: everyone may watch you)"
-msgstr "Publica l'estat (nota: tothom us pot estar observant)"
+msgstr "Publica l'estat (nota: tothom vos pot estar observant)"
 
 msgid "Use UDP"
 msgstr "Utilitza UDP"
@@ -9361,181 +9448,62 @@ msgstr "Usuari Auth"
 msgid "Auth Domain"
 msgstr "Domini Auth"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "S'està cercant %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Ha fallat la connexió a %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Entrada: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "No s'ha pogut escriure el fitxer %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "No s'ha pogut llegir el fitxer %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "El missatge és massa llarg, s'han retallat els darrers %s octets."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s no està connectat."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Avís de %s no permés."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"S'ha ignorat un missatge. Esteu excedint el límit de velocitat del servidor."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "El xat a %s no està disponible."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Esteu enviant missatges massa de pressa a %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Us heu perdut un missatge instantani de %s perquè era massa gran."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Heu perdut un missatge instantani de %s perquè s'ha enviat massa de pressa."
-
-#, c-format
-msgid "Failure."
-msgstr "Fallada."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Massa coincidències."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Es necessiten més qualificadors."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Servici de directori no disponible temporalment."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Recerca per adreça de correu electrònic restringida."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "S'ha ignorat la paraula clau."
-
-#, c-format
-msgid "No keywords."
-msgstr "No hi ha paraules clau."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "L'usuari no té informació al directori."
-
-# FIXME
-#, c-format
-msgid "Country not supported."
-msgstr "Este país no està disponible."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Fallada desconeguda: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "El nom d'usuari o la contrasenya no són correctes."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "El servici està temporalment no disponible."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "El vostre nivell d'avisos és massa alt per a connectar-se."
-
-#, c-format
-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 ""
-"Us heu estat connectant i desconnectant amb massa freqüència. Espereu deu "
-"minuts i torneu-ho a provar. Si continueu intentant-ho, haureu d'esperar "
-"encara més."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Hi ha hagut un error de connexió desconegut: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "S'ha produït un error desconegut, %d. Informació: %s"
-
-msgid "Invalid Groupname"
-msgstr "El nom del grup no és vàlid"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;sala&gt;:  entra en una sala de xat de la xarxa Yahoo"
 
-msgid "Connection Closed"
-msgstr "Connexió tancada"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  llista les sales de la xarxa Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "S'està esperant una resposta..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: fa una petició a l'usuari per iniciar una sessió Doodle"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC ha tornat de la pausa. Ja podeu enviar missatges de nou."
+msgid "Yahoo ID..."
+msgstr "ID de Yahoo..."
 
-msgid "Password Change Successful"
-msgstr "S'ha canviat la contrasenya amb èxit"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Connector per al protocol Yahoo!"
 
-msgid "_Group:"
-msgstr "_Grup:"
+msgid "Pager server"
+msgstr "Servidor de cercapersones"
 
-msgid "Get Dir Info"
-msgstr "Aconseguix informació del directori"
+msgid "Pager port"
+msgstr "Port per al cercapersones"
 
-msgid "Set Dir Info"
-msgstr "Establix informació del directori"
+msgid "File transfer server"
+msgstr "Servidor de transferència de fitxers"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "No s'ha pogut obrir %s per a escriure-hi."
+msgid "File transfer port"
+msgstr "Port per transferència de fitxers"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
-"l'altra banda."
+# FIXME: no poso localització perquè l'usuari ho podria
+#        confondre amb "ubicació" (josep)
+msgid "Chat room locale"
+msgstr "Característiques locals de la sala de xat"
 
-msgid "Could not connect for transfer."
-msgstr "No s'ha pogut connectar per realitzar la transferència."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Bloca invitacions a conferències i sales de xat"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "No s'ha pogut escriure la capçalera del fitxer. No s'enviarà."
+msgid "Chat room list URL"
+msgstr "URL de la llista de sales de xat"
 
-msgid "Save As..."
-msgstr "Anomena i alça..."
+msgid "Yahoo Chat server"
+msgstr "Servidor de xat de Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s demana a %s que accepti %d fitxer: %s (%.2f %s)%s%s"
-msgstr[1] "%s demana a %s que accepti %d fitxers: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Port del xat de Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s us demana que li envieu un fitxer"
+msgid "Yahoo JAPAN ID..."
+msgstr "ID de Yahoo del Japó..."
 
 #. *< type
 #. *< ui_requirement
@@ -9547,14 +9515,11 @@ msgstr "%s us demana que li envieu un fitxer"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Connector per al protocol TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Connector per al protocol Yahoo! del Japó"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s us ha enviat una invitació a la seua càmera web, però això encara no està "
-"implementat."
+msgid "Your SMS was not delivered"
+msgstr "No s'ha enviat l'SMS"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "No s'ha pogut enviar el vostre missatge de Yahoo!"
@@ -9568,18 +9533,42 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s us ha denegat (retroactivament) la petició d'afegir-lo a la vostra llista "
+"%s vos ha denegat (retroactivament) la petició d'afegir-lo a la vostra llista "
 "pel següent motiu:\n"
 "%s"
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
-"%s us ha denegat (retroactivament) la petició d'afegir-lo a la vostra llista."
+"%s vos ha denegat (retroactivament) la petició d'afegir-lo a la vostra llista."
 
 msgid "Add buddy rejected"
 msgstr "S'ha rebutjat afegir l'amic"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "S'han rebut dades invàlides"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"El compte està blocat perquè s'ha intentat entrar massa cops. Això es pot "
+"solucionar entrant al web de Yahoo!"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"El compte està blocat, però no se'n coneix el motiu. Això es pot solucionar "
+"entrant al web de Yahoo!"
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Manquen el nom d'uruari o la contrasenya"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9587,7 +9576,7 @@ msgid ""
 "Check %s for updates."
 msgstr ""
 "El servidor Yahoo ha demanat l'ús d'un mètode d'autenticació que no és "
-"reconegut. Probablement no us podreu connectar al Yahoo. Comproveu si hi ha "
+"reconegut. Probablement no vos podreu connectar al Yahoo. Comproveu si hi ha "
 "actualitzacions a %s."
 
 msgid "Failed Yahoo! Authentication"
@@ -9614,39 +9603,28 @@ msgstr ""
 "al web de Yahoo!"
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No s'ha pogut afegir l'amic %s al grup %s a la llista del servidor del "
 "compte %s."
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "No s'ha pogut afegir l'amic a la llista del servidor"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "S'ha rebut una resposta HTTP inesperada del servidor."
-
-msgid "Connection problem"
-msgstr "Hi ha un problema de connexió"
+msgid "Received unexpected HTTP response from server"
+msgstr "S'ha rebut una resposta HTTP inesperada del servidor"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"S'ha perdut la connexió amb %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "S'ha perdut la connexió amb %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"No s'ha pogut establir la connexió amb %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "No s'ha pogut establir una connexió amb %s: %s"
 
 msgid "Not at Home"
 msgstr "Fora de casa"
@@ -9693,11 +9671,11 @@ msgstr "Paràmetres de la presència"
 msgid "Start Doodling"
 msgstr "Comença a dibuixar"
 
-msgid "Activate which ID?"
-msgstr "Quin ID voleu activar?"
+msgid "Select the ID you want to activate"
+msgstr "Seleccioneu l'ID que vulgueu activar"
 
 msgid "Join whom in chat?"
-msgstr "A qui us voleu unir al xat?"
+msgstr "A qui vos voleu unir al xat?"
 
 msgid "Activate ID..."
 msgstr "Activa l'ID..."
@@ -9708,75 +9686,15 @@ msgstr "Entra a un xat d'un usuari..."
 msgid "Open Inbox"
 msgstr "Obri la safata d'entrada"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;sala&gt;:  entra en una sala de xat de la xarxa Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  llista les sales de la xarxa Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: fa una petició a l'usuari per iniciar una sessió Doodle"
-
-msgid "Yahoo ID..."
-msgstr "ID de Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Connector per al protocol Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japó"
-
-msgid "Pager server"
-msgstr "Servidor de cercapersones"
-
-msgid "Japan Pager server"
-msgstr "Servidor de cercapersones del Japó"
-
-msgid "Pager port"
-msgstr "Port per al cercapersones"
-
-msgid "File transfer server"
-msgstr "Servidor de transferència de fitxers"
-
-msgid "Japan file transfer server"
-msgstr "Servidor de transferència de fitxers del Japó"
-
-msgid "File transfer port"
-msgstr "Port per transferència de fitxers"
-
-# FIXME: no poso localització perquè l'usuari ho podria
-#        confondre amb "ubicació" (josep)
-msgid "Chat room locale"
-msgstr "Característiques locals de la sala de xat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Bloca invitacions a conferències i sales de xat"
-
-msgid "Chat room list URL"
-msgstr "URL de la llista de sales de xat"
-
-msgid "Yahoo Chat server"
-msgstr "Servidor de xat de Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Port del xat de Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Envia la sol·licitud d'un dibuix."
 
+msgid "Unable to connect."
+msgstr "No s'ha pogut connectar."
+
 msgid "Unable to establish file descriptor."
 msgstr "No s'ha pogut establir un descriptor de fitxer."
 
@@ -9784,6 +9702,9 @@ msgstr "No s'ha pogut establir un descriptor de fitxer."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s està intentant enviar-vos un grup de %d fitxers.\n"
 
+msgid "Write Error"
+msgstr "Error d'escriptura"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil Yahoo! japonés"
 
@@ -9801,7 +9722,8 @@ msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"Si voleu veure este perfil, haureu de visitar este enllaç amb el navegador:"
+"Si voleu veure este perfil, haureu de visitar este enllaç amb el "
+"navegador:"
 
 msgid "Yahoo! ID"
 msgstr "ID de Yahoo!"
@@ -9843,20 +9765,16 @@ msgid ""
 "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 ""
-"No s'ha pogut obtindre el perfil de l'usuari. El més segur és que l'usuari "
-"no existisca, tot i que a vegades Yahoo! no pot trobar els perfils d'usuari. "
-"Si sabeu del cert que l'usuari existix, torneu-ho a intentar més tard."
+"No s'ha pogut obtindre el perfil de l'usuari. El més segur és que l'usuari no "
+"existisca, tot i que a vegades Yahoo! no pot trobar els perfils d'usuari. Si "
+"sabeu del cert que l'usuari existeix, torneu-ho a intentar més tard."
 
 msgid "The user's profile is empty."
 msgstr "El perfil d'usuari està buit."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s no ha acceptat la vostra invitació d'entrar a la sala «%s» perquè «%s»."
-
-msgid "Invitation Rejected"
-msgstr "S'ha rebutjat la invitació"
+msgid "%s has declined to join."
+msgstr "%s no ha volgut connectar-se."
 
 msgid "Failed to join chat"
 msgstr "No s'ha pogut unir al xat"
@@ -9877,8 +9795,8 @@ msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
-"S'ha produït un error desconegut. Potser caldrà que eixiu i espereu uns cinc "
-"minuts abans d'intentar tornar a entrar a la sala de xat"
+"S'ha produït un error desconegut. Potser caldrà que eixiu i espereu uns "
+"cinc minuts abans d'intentar tornar a entrar a la sala de xat"
 
 #, c-format
 msgid "You are now chatting in %s."
@@ -9899,22 +9817,17 @@ msgstr "Veus"
 msgid "Webcams"
 msgstr "Càmeres web"
 
+msgid "Connection problem"
+msgstr "Hi ha un problema de connexió"
+
 msgid "Unable to fetch room list."
 msgstr "No s'ha pogut obtindre la llista de sales."
 
 msgid "User Rooms"
 msgstr "Sales d'usuari"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Problema de connexió amb el servidor YCHT."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"S'ha perdut la connexió al servidor\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Hi ha un problema de connexió amb el servidor YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9963,11 +9876,13 @@ msgstr ""
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"inst &lt;instància&gt;: especifica la instància a fer servir en esta classe"
+"inst &lt;instància&gt;: especifica la instància a fer servir en esta "
+"classe"
 
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"topic &lt;instància&gt;: especifica la instància a fer servir en esta classe"
+"topic &lt;instància&gt;: especifica la instància a fer servir en esta "
+"classe"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
@@ -10048,17 +9963,9 @@ msgid "Exposure"
 msgstr "Exposició"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"No s'ha pogut crear el sòcol:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
-"No s'ha pogut analitzar la resposta del servidor intermediari d'HTTP: %s\n"
+"No s'ha pogut analitzar la resposta del servidor intermediari d'HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
@@ -10066,25 +9973,22 @@ msgstr "Error en la connexió al servidor intermediari d'HTTP %d"
 
 # FIXME: tunelitzar... tunelar? fer un túnel?
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
-"S'ha denegat l'accés: el servidor intermediari d'HTTP prohibix la "
+"S'ha denegat l'accés: el servidor intermediari d'HTTP prohibeix la "
 "tunelització del port %d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "S'ha produït un error en resoldre %s"
 
-msgid "Could not resolve host name"
-msgstr "No s'ha pogut resoldre el nom de l'ordinador"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "S'està reclamant l'atenció de %s..."
 
 #, c-format
 msgid "%s has requested your attention!"
-msgstr "%s us ha demanat l'atenció!"
+msgstr "%s vos ha demanat l'atenció!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
@@ -10164,9 +10068,6 @@ msgstr "No molesteu"
 msgid "Extended away"
 msgstr "Absent durant una bona estona"
 
-msgid "Mobile"
-msgstr "Mòbil"
-
 # És un estat, com "fora de línia", etc. (josep)
 msgid "Listening to music"
 msgstr "Escoltant música"
@@ -10209,18 +10110,6 @@ msgstr "+++ %s ja no està inactiu"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "S'ha produït un error en llegir %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"S'ha produït un error en llegir el vostre %s. No s'han carregat, i s'ha "
-"canviat el nom del fitxer per %s~."
-
 msgid "Calculating..."
 msgstr "S'està calculant..."
 
@@ -10330,6 +10219,18 @@ msgstr "S'ha refusat la connexió."
 msgid "Address already in use."
 msgstr "Esta adreça ja s'està fent servir"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "S'ha produït un error en llegir %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"S'ha produït un error en llegir el vostre %s. No s'ha carregat el fitxer, i "
+"s'ha canviat el nom per %s~."
+
 msgid "Internet Messenger"
 msgstr "Missatger d'Internet"
 
@@ -10372,10 +10273,8 @@ msgstr "_Notifica si hi ha correu nou"
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilitza esta _icona d'amic per a este compte:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Opcions de %s"
+msgid "Ad_vanced"
+msgstr "_Avançat"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Empra la configuració del servidor intermediari del Gnome"
@@ -10410,9 +10309,6 @@ msgstr "Si mireu de ben a prop"
 msgid "you can see the butterflies mating"
 msgstr "podreu veure les papallones aparellant-se"
 
-msgid "Proxy Options"
-msgstr "Opcions del servidor intermediari"
-
 msgid "Proxy _type:"
 msgstr "_Tipus de servidor intermediari"
 
@@ -10429,7 +10325,7 @@ msgid "Unable to save new account"
 msgstr "No s'ha pogut alçar el compte nou"
 
 msgid "An account already exists with the specified criteria."
-msgstr "Ja existix un altre compte amb estos criteris."
+msgstr "Ja existeix un altre compte amb estos criteris."
 
 msgid "Add Account"
 msgstr "Afig un compte"
@@ -10440,8 +10336,8 @@ msgstr "_Bàsic"
 msgid "Create _this new account on the server"
 msgstr "Crea _aquest compte nou al servidor"
 
-msgid "_Advanced"
-msgstr "_Avançat"
+msgid "P_roxy"
+msgstr "Servidor _intermediari"
 
 msgid "Enabled"
 msgstr "Habilitat"
@@ -10468,8 +10364,8 @@ msgstr ""
 "voleu que el %s es connecte amb més comptes de missatgeria instantània (MI), "
 "torneu a prémer <b>Afig</b> fins a configurar-los tots.\n"
 "\n"
-"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a partir "
-"del menú <b>Comptes->Gestiona els comptes</b> a finestra de la llista "
+"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a "
+"partir del menú <b>Comptes->Gestiona els comptes</b> a finestra de la llista "
 "d'amics."
 
 #, c-format
@@ -10486,14 +10382,14 @@ msgid ""
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
 "En fusionar estos contactes fareu que compartisquen una mateixa entrada en "
-"la llista d'amics i en la finestra de conversa. Més avant els podreu separar "
-"amb l'opció 'Expandix' del menú contextual del contacte."
+"la llista d'amics i en la finestra de conversa. Més avant els podreu "
+"separar amb l'opció 'Expandeix' del menú contextual del contacte."
 
 msgid "Please update the necessary fields."
 msgstr "Actualitzeu els camps necessaris."
 
-msgid "Room _List"
-msgstr "_Llista de sales"
+msgid "A_ccount"
+msgstr "_Compte"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10501,8 +10397,8 @@ msgid ""
 msgstr ""
 "Introduïu la informació necessària sobre el xat al qual vulgueu entrar.\n"
 
-msgid "_Account:"
-msgstr "C_ompte:"
+msgid "Room _List"
+msgstr "_Llista de sales"
 
 msgid "_Block"
 msgstr "_Bloca"
@@ -10520,6 +10416,15 @@ msgstr "_Informació"
 msgid "I_M"
 msgstr "_MI"
 
+msgid "_Audio Call"
+msgstr "_Trucada amb àudio"
+
+msgid "Audio/_Video Call"
+msgstr "Trucada d'àudio i _vídeo"
+
+msgid "_Video Call"
+msgstr "Trucada de _vídeo"
+
 msgid "_Send File..."
 msgstr "_Envia un fitxer..."
 
@@ -10529,20 +10434,23 @@ msgstr "Afig un a_vís per a l'amic..."
 msgid "View _Log"
 msgstr "_Visualitza el registre"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Amaga quan estiga fora de línia"
 
+msgid "Show When Offline"
+msgstr "Mostra quan estiga fora de línia"
+
 msgid "_Alias..."
 msgstr "À_lies..."
 
 msgid "_Remove"
-msgstr "Sup_rimix"
+msgstr "Sup_rimeix"
 
 msgid "Set Custom Icon"
-msgstr "Establix una icona personalitzada"
+msgstr "Estableix una icona personalitzada"
 
 msgid "Remove Custom Icon"
-msgstr "Suprimix la icona personalitzada"
+msgstr "Suprimeix la icona personalitzada"
 
 msgid "Add _Buddy..."
 msgstr "Afig un _amic..."
@@ -10551,7 +10459,7 @@ msgid "Add C_hat..."
 msgstr "Afig un _xat..."
 
 msgid "_Delete Group"
-msgstr "_Suprimix el grup"
+msgstr "_Suprimeix el grup"
 
 msgid "_Rename"
 msgstr "_Canvia el nom"
@@ -10570,7 +10478,7 @@ msgid "_Edit Settings..."
 msgstr "_Edita els paràmetres..."
 
 msgid "_Collapse"
-msgstr "_Reduïx"
+msgstr "_Redueix"
 
 msgid "_Expand"
 msgstr "_Amplia"
@@ -10599,7 +10507,7 @@ msgid "/Buddies/Join a _Chat..."
 msgstr "/Amics/_Entra a un xat..."
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/Amics/Aconseguix informació de l'_usuari..."
+msgstr "/Amics/Aconsegueix informació de l'_usuari..."
 
 msgid "/Buddies/View User _Log..."
 msgstr "/Amics/_Visualitza el registre de l'usuari..."
@@ -10655,6 +10563,9 @@ msgstr "/Eines/_Avís per a amics"
 msgid "/Tools/_Certificates"
 msgstr "/Eines/C_ertificats"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Eines/Em_oticones personalitzades"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Eines/_Connectors"
 
@@ -10664,9 +10575,6 @@ msgstr "/Eines/Pre_ferències"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eines/_Privadesa"
 
-msgid "/Tools/Smile_y"
-msgstr "/Eines/Em_oticona"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Eines/_Transferència de fitxers"
 
@@ -10755,7 +10663,7 @@ msgid "/Buddies/Join a Chat..."
 msgstr "/Amics/Entra a un xat..."
 
 msgid "/Buddies/Get User Info..."
-msgstr "/Amics/Aconseguix informació de l'usuari..."
+msgstr "/Amics/Aconsegueix informació de l'usuari..."
 
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amics/Afig un amic..."
@@ -10784,8 +10692,8 @@ msgstr "Manualment"
 msgid "By status"
 msgstr "Per estat"
 
-msgid "By log size"
-msgstr "Per la grandària del registre"
+msgid "By recent log activity"
+msgstr "Per activitat recent en el registre"
 
 #, c-format
 msgid "%s disconnected"
@@ -10801,6 +10709,9 @@ msgstr "Torna a connectar"
 msgid "Re-enable"
 msgstr "Rehabilita"
 
+msgid "SSL FAQs"
+msgstr "PMF sobre SSL"
+
 msgid "Welcome back!"
 msgstr "Ben tornat!"
 
@@ -10809,9 +10720,9 @@ msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
 msgstr[0] ""
-"S'ha inhabilitat %d compte perquè us heu connectat des d'un altre lloc:"
+"S'ha inhabilitat %d compte perquè vos heu connectat des d'un altre lloc:"
 msgstr[1] ""
-"S'han inhabilitat %d comptes perquè us heu connectat des d'un altre lloc:"
+"S'han inhabilitat %d comptes perquè vos heu connectat des d'un altre lloc:"
 
 msgid "<b>Username:</b>"
 msgstr "<b>Nom d'usuari:</b>"
@@ -10889,6 +10800,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Àl_ies:"
 
+msgid "_Group:"
+msgstr "_Grup:"
+
 msgid "Auto_join when account becomes online."
 msgstr "_Entra automàticament quant el compte estiga connectat."
 
@@ -10922,6 +10836,104 @@ msgstr "/Eines"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amics/Ordena els amics"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Color de fons"
+
+msgid "The background color for the buddy list"
+msgstr "El color de fons de la llista d'amics"
+
+msgid "Layout"
+msgstr "Format"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "El format de les icones, el nom, i l'estat de la llista d'amics"
+
+# Color de fons quan la blist està expandida
+#. Group
+msgid "Expanded Background Color"
+msgstr "Color de fons expandit"
+
+msgid "The background color of an expanded group"
+msgstr "El color de fons d'un grup expandit"
+
+msgid "Expanded Text"
+msgstr "Text expandit"
+
+msgid "The text information for when a group is expanded"
+msgstr "Text informatiu d'un grup expandit"
+
+msgid "Collapsed Background Color"
+msgstr "Color de fons col·lapsat"
+
+msgid "The background color of a collapsed group"
+msgstr "El color de fons d'un grup col·lapsat"
+
+msgid "Collapsed Text"
+msgstr "Text col·lapsat"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Text informatiu d'un grup col·lapsat"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Color de fons dels contactes i xats"
+
+msgid "The background color of a contact or chat"
+msgstr "El color de fons d'un contacte o un xat"
+
+msgid "Contact Text"
+msgstr "Text del contacte"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Text informatiu quan un contacte s'expandeix"
+
+msgid "On-line Text"
+msgstr "Text en línia"
+
+msgid "The text information for when a buddy is online"
+msgstr "Text informatiu per quan un amic estiga en línia"
+
+msgid "Away Text"
+msgstr "Text d'absència"
+
+msgid "The text information for when a buddy is away"
+msgstr "Text informatiu per quan un amic estiga absent"
+
+msgid "Off-line Text"
+msgstr "Text de fora de línia"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Text informatiu per quan un amic estiga fora de línia"
+
+msgid "Idle Text"
+msgstr "Text d'inactivitat"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Text informatiu per quan un amic estiga inactiu"
+
+msgid "Message Text"
+msgstr "Text del missatge"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Text informatiu per quan un amic tinga un missatge per llegir"
+
+msgid "Message (Nick Said) Text"
+msgstr "Text del missatge (on s'hi ha dit el sobrenom)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"Text informatiu quan hi ha un missatge per llegir que conté el vostre "
+"sobrenom en un xat"
+
+msgid "The text information for a buddy's status"
+msgstr "Text informatiu per l'estat d'un amic"
+
+msgid "Type the host name for this certificate."
+msgstr "Entreu el nom de l'ordinador al qual pertany este certificat."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidors SSL"
@@ -10939,14 +10951,6 @@ msgstr "No esteu connectat amb cap protocol que permeta convidar este amic."
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convida l'amic a una sala de xat"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Introduïu el nom de l'usuari que vulgueu convidar, així com un missatge "
-"d'invitació opcional."
-
 msgid "_Buddy:"
 msgstr "_Amic:"
 
@@ -10973,9 +10977,9 @@ msgid "Ignore"
 msgstr "Ignora"
 
 msgid "Get Away Message"
-msgstr "Aconseguix el missatge d'absència"
+msgstr "Aconsegueix el missatge d'absència"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "El darrer que es digué"
 
 msgid "Unable to save icon file to disk."
@@ -10994,10 +10998,10 @@ msgid "Save Icon As..."
 msgstr "Anomena i alça la icona..."
 
 msgid "Set Custom Icon..."
-msgstr "Establix una icona personalitzada..."
+msgstr "Estableix una icona personalitzada..."
 
 msgid "Change Size"
-msgstr "Canvia la grandària"
+msgstr "Canvia la mida"
 
 msgid "Show All"
 msgstr "Mostra-ho tot"
@@ -11022,6 +11026,18 @@ msgstr "/Conversa/Anomena i al_ça..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/_Neteja la finestra"
 
+msgid "/Conversation/M_edia"
+msgstr "/Conversa/M_edi"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversa/Medi/_Trucada d'àudio"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversa/Medi/Trucada de _vídeo"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversa/Medi/Tru_cada d'àudio i vídeo"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Envia un _fitxer..."
 
@@ -11029,7 +11045,7 @@ msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Afig un a_vís per a l'amic..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Conversa/_Aconseguix informació"
+msgstr "/Conversa/_Aconsegueix informació"
 
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/Con_vida..."
@@ -11050,13 +11066,13 @@ msgid "/Conversation/_Add..."
 msgstr "/Conversa/_Afig..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/Conversa/Sup_rimix..."
+msgstr "/Conversa/Sup_rimeix..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Conversa/Inserix un _enllaç..."
+msgstr "/Conversa/Insereix un _enllaç..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Conversa/Inserix una _imatge..."
+msgstr "/Conversa/Insereix una _imatge..."
 
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Tanca"
@@ -11094,6 +11110,15 @@ msgstr "/Conversa"
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Visualitza el registre"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversa/Medi/Trucada d'àudio"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversa/Medi/Trucada de vídeo"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversa/Medi/Trucada d'àudio i vídeo"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Envia un fitxer..."
 
@@ -11101,7 +11126,7 @@ msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Afig avís per a l'amic..."
 
 msgid "/Conversation/Get Info"
-msgstr "/Conversa/Aconseguix informació"
+msgstr "/Conversa/Aconsegueix informació"
 
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convida..."
@@ -11119,13 +11144,13 @@ msgid "/Conversation/Add..."
 msgstr "/Conversa/Afig..."
 
 msgid "/Conversation/Remove..."
-msgstr "/Conversa/Suprimix..."
+msgstr "/Conversa/Suprimeix..."
 
 msgid "/Conversation/Insert Link..."
-msgstr "/Conversa/Inserix un enllaç..."
+msgstr "/Conversa/Insereix un enllaç..."
 
 msgid "/Conversation/Insert Image..."
-msgstr "/Conversa/Inserix una imatge..."
+msgstr "/Conversa/Insereix una imatge..."
 
 msgid "/Options/Enable Logging"
 msgstr "/Opcions/Habilita el registre"
@@ -11225,7 +11250,7 @@ msgid "Save Debug Log"
 msgstr "Alça el registre de depuració"
 
 msgid "Invert"
-msgstr "Invertix"
+msgstr "Inverteix"
 
 msgid "Highlight matches"
 msgstr "Ressalta les coincidències"
@@ -11280,6 +11305,9 @@ msgstr "artista"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "veu i vídeo"
+
 msgid "support"
 msgstr "suport"
 
@@ -11337,7 +11365,7 @@ msgid "Catalan"
 msgstr "Català"
 
 msgid "Valencian-Catalan"
-msgstr "Valencià (català meridional)"
+msgstr "Valencià-català"
 
 msgid "Czech"
 msgstr "Txec"
@@ -11407,6 +11435,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Hongarés"
 
+msgid "Armenian"
+msgstr "Armeni"
+
 msgid "Indonesian"
 msgstr "Indonesi"
 
@@ -11422,6 +11453,9 @@ msgstr "Georgià"
 msgid "Ubuntu Georgian Translators"
 msgstr "Traductors al georgià de l'Ubuntu"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11443,6 +11477,9 @@ msgstr "Lituà"
 msgid "Macedonian"
 msgstr "Macedoni"
 
+msgid "Mongolian"
+msgstr "Mongol"
+
 msgid "Bokmål Norwegian"
 msgstr "Noruec bokmål"
 
@@ -11498,6 +11535,9 @@ msgstr "Sinhala"
 msgid "Swedish"
 msgstr "Suec"
 
+msgid "Swahili"
+msgstr " Suahili"
+
 msgid "Tamil"
 msgstr "Tàmil"
 
@@ -11555,14 +11595,36 @@ msgstr ""
 "Gadu-Gadu, i QQ, tots alhora. Utilitza la biblioteca de programació GTK+."
 "<BR><BR>Podeu modificar i redistribuir el programa sota els termes de la GPL "
 "(versió 2 o posterior). Hi ha una còpia de la GPL dins del fitxer «COPYING» "
-"que es distribuix amb el %s. Els drets d'autor del %s pertanyen als seus "
+"que es distribueix amb el %s. Els drets d'autor del %s pertanyen als seus "
 "col·laboradors. El fitxer «COPYRIGHT» conté una llista completa de tots els "
-"contribuïdors. No us proporcionem cap mena de garantia amb este programa."
+"contribuïdors. No vos proporcionem cap mena de garantia amb este programa."
 "<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin a irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">PMF:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">Ajuda per correu electrònic:</FONT> <A HREF=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">Canal d'IRC:</FONT> #pidgin a irc.freenode.net<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Desenvolupadors actuals"
@@ -11592,7 +11654,7 @@ msgid "_Account"
 msgstr "_Compte"
 
 msgid "Get User Info"
-msgstr "Aconseguix dades de l'usuari"
+msgstr "Aconsegueix dades de l'usuari"
 
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
@@ -11638,10 +11700,10 @@ msgstr[1] ""
 "d'amics. Voleu continuar?"
 
 msgid "Remove Contact"
-msgstr "Suprimix el contacte"
+msgstr "Suprimeix el contacte"
 
 msgid "_Remove Contact"
-msgstr "_Suprimix el contacte"
+msgstr "_Suprimeix el contacte"
 
 #, c-format
 msgid ""
@@ -11665,10 +11727,10 @@ msgstr ""
 "Voleu continuar?"
 
 msgid "Remove Group"
-msgstr "Suprimix el grup"
+msgstr "Suprimeix el grup"
 
 msgid "_Remove Group"
-msgstr "_Suprimix el grup"
+msgstr "_Suprimeix el grup"
 
 #, c-format
 msgid ""
@@ -11676,10 +11738,10 @@ msgid ""
 msgstr "Esteu segur que voleu suprimir %s de la llista d'amics?"
 
 msgid "Remove Buddy"
-msgstr "Suprimix l'amic"
+msgstr "Suprimeix l'amic"
 
 msgid "_Remove Buddy"
-msgstr "Sup_rimix un amic"
+msgstr "Sup_rimeix un amic"
 
 #, c-format
 msgid ""
@@ -11688,10 +11750,10 @@ msgid ""
 msgstr "Esteu segur que voleu suprimir el xat %s de la llista d'amics?"
 
 msgid "Remove Chat"
-msgstr "Suprimix el Xat"
+msgstr "Suprimeix el Xat"
 
 msgid "_Remove Chat"
-msgstr "_Suprimix el Xat"
+msgstr "_Suprimeix el Xat"
 
 # FIXME: Do not use "Right click", as left-handed people would use left click.
 # Instead it might be better to use "primary button" (josep)
@@ -11786,19 +11848,11 @@ msgstr "_Neteja les transferències acabades"
 msgid "File transfer _details"
 msgstr "_Detalls de la transferència de fitxers"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Pausa"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Continua"
-
 msgid "Paste as Plain _Text"
 msgstr "Enganxa com a _text"
 
 msgid "_Reset formatting"
-msgstr "_Restablix el format"
+msgstr "_Restableix el format"
 
 msgid "Disable _smileys in selected text"
 msgstr "Inhabilita les emoticones en el text _seleccionat"
@@ -11812,7 +11866,7 @@ msgstr "El color amb què pintar els enllaços."
 msgid "Hyperlink visited color"
 msgstr "Color dels enllaços visitats"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "El color amb el qual es pintaran els enllaços que ja s'hagen visitat (o "
 "activat)."
@@ -11854,15 +11908,21 @@ msgstr "Color amb el qual es pintaran els missatges d'acció."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Color del nom del missatge d'acció per a missatges xiuxiuejats"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Color amb el qual es pintaran els missatges d'acció xiuxiuejats."
+
 msgid "Whisper Message Name Color"
 msgstr "Color dels missatges xiuxiuejats enviats"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Color amb el qual es pintaran els missatges xiuxiuejats."
+
 msgid "Typing notification color"
 msgstr "Color per a les notificacions de quan s'escriu"
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
-"El color que s'emprarà per a les notificacions indicant que s'està escrivint"
+"El color que s'emprarà per a les notificacions indicant que s'està teclejant"
 
 msgid "Typing notification font"
 msgstr "Tipus de lletra de les notificacions quan s'escriu"
@@ -11875,15 +11935,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Habilita les notificacions de que s'està escrivint"
 
-msgid "_Copy Email Address"
-msgstr "_Copia l'adreça de correu"
-
-msgid "_Open Link in Browser"
-msgstr "_Obri l'enllaç en el navegador"
-
-msgid "_Copy Link Location"
-msgstr "_Copia la ubicació de l'enllaç"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11927,11 +11978,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Alça imatge"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Al_ça la imatge..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Afig una emoticona personalitzada..."
 
@@ -11961,25 +12010,25 @@ msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduïu l'URL i la descripció de l'enllaç que vulgueu inserir."
 
 msgid "Insert Link"
-msgstr "Inserix un enllaç"
+msgstr "Insereix un enllaç"
 
 msgid "_Insert"
-msgstr "_Inserix"
+msgstr "_Insereix"
 
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No s'ha pogut emmagatzemar la imatge: %s\n"
 
 msgid "Insert Image"
-msgstr "Inserix una imatge"
+msgstr "Insereix una imatge"
 
 #, c-format
 msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
-"Esta emoticona està inhabilitada perquè hi ha una emoticona personalitzada "
-"per esta drecera:\n"
+"Esta emoticona està inhabilitada perquè hi ha una emoticona "
+"personalitzada per esta drecera:\n"
 " %s"
 
 msgid "Smile!"
@@ -12013,29 +12062,26 @@ msgid "Strikethrough"
 msgstr "Ratlla"
 
 msgid "Increase Font Size"
-msgstr "Augmenta grandària de la lletra"
+msgstr "Augmenta mida de la lletra"
 
 msgid "Decrease Font Size"
-msgstr "Disminuix la grandària de la lletra"
+msgstr "Disminueix la mida de la lletra"
 
 # FIXME?
 msgid "Font Face"
 msgstr "Tipus de lletra"
 
-msgid "Background Color"
-msgstr "Color de fons"
-
 msgid "Foreground Color"
 msgstr "Color del text"
 
 msgid "Reset Formatting"
-msgstr "Restablix el format"
+msgstr "Restableix el format"
 
 msgid "Insert IM Image"
-msgstr "Inserix una imatge de MI"
+msgstr "Insereix una imatge de MI"
 
 msgid "Insert Smiley"
-msgstr "Inserix una emoticona"
+msgstr "Insereix una emoticona"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negreta</b>"
@@ -12117,7 +12163,7 @@ msgid "Delete Log?"
 msgstr "Voleu suprimir el registre?"
 
 msgid "Delete Log..."
-msgstr "Suprimix el registre..."
+msgstr "Suprimeix el registre..."
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -12142,6 +12188,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12156,8 +12203,11 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
 "  -d, --debug         mostra missatges de depuració a la eixida estàndard\n"
+"  -f, --force-online  força que s'estiga en línia, independent de l'estat "
+"de\n"
+"                      la xarxa\n"
 "  -h, --help          mostra esta ajuda i ix\n"
-"  -m, --multiple      permet que hi haja més d'una instància\n"
+"  -m, --multiple      no controla que només hi haja una instància\n"
 "  -n, --nologin       no entra automàticament\n"
 "  -l, --login[=NOM]   habilita el compte especificat (l'argument opcional "
 "NOM\n"
@@ -12174,6 +12224,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12187,8 +12238,11 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
 "  -d, --debug         mostra missatges de depuració a la eixida estàndard\n"
+"  -f, --force-online  força que s'estiga en línia, independent de l'estat "
+"de\n"
+"                      la xarxa\n"
 "  -h, --help          mostra esta ajuda i ix\n"
-"  -m, --multiple      permet que hi haja més d'una instància\n"
+"  -m, --multiple      no controla que només hi haja una instància\n"
 "  -n, --nologin       no entra automàticament\n"
 "  -l, --login[=NOM]   habilita el compte especificat (l'argument opcional "
 "NOM\n"
@@ -12231,11 +12285,28 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Obri tots els missatges"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+"Ara se eixirà atès que ja hi ha un altre client del libpurple executant-"
+"se.\n"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Teniu correu electrònic.</span>"
+msgid "/_Media"
+msgstr "/_Medi"
+
+msgid "/Media/_Hangup"
+msgstr "/Medi/_Penja"
+
+msgid "Calling..."
+msgstr "S'està trucant..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s vol iniciar una sessió d'àudio/vídeo."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s vol iniciar una sessió de vídeo."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12265,6 +12336,26 @@ msgid ""
 msgstr ""
 "S'ha triat l'orde per al navegador «manualment», però no se n'ha indicat cap."
 
+msgid "No message"
+msgstr "Cap missatge"
+
+msgid "Open All Messages"
+msgstr "Obri tots els missatges"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Teniu correu electrònic.</span>"
+
+msgid "New Pounces"
+msgstr "Avisos nous"
+
+# FIXME: Cancel·la?
+msgid "Dismiss"
+msgstr "Rebutja"
+
+# FIXME: pounced -> envestir?
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Vos han envestit!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Es descarregaran els connectors següents."
 
@@ -12313,11 +12404,17 @@ msgstr "<b>Detalls del connector</b>"
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
+msgid "Modify Buddy Pounce"
+msgstr "Modifica l'avís per a l'amic"
+
 # FIXME
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Avisa dels Whom"
 
+msgid "_Account:"
+msgstr "C_ompte:"
+
 msgid "_Buddy name:"
 msgstr "_Nom de l'amic:"
 
@@ -12388,8 +12485,58 @@ msgstr "_Recurrent"
 msgid "Pounce Target"
 msgstr "Objectiu de l'avís"
 
-msgid "Smiley theme failed to unpack."
-msgstr "No s'ha pogut desempaquetar el tema d'emoticones."
+#, c-format
+msgid "Started typing"
+msgstr "Haja començat a escriure"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "S'ature mentre tecleja"
+
+#, c-format
+msgid "Signed on"
+msgstr "Es connecte"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Torna a estar actiu"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Torne a estar present"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Pare d'escriure"
+
+#, c-format
+msgid "Signed off"
+msgstr "Es desconnecte"
+
+#, c-format
+msgid "Became idle"
+msgstr "Passe a inactiu"
+
+#, c-format
+msgid "Went away"
+msgstr "En estar absent"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Envia un missatge"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Esdeveniment d'avís desconegut, informeu-nos-en."
+
+msgid "Theme failed to unpack."
+msgstr "No s'ha pogut desempaquetar el tema."
+
+msgid "Theme failed to load."
+msgstr "No s'ha pogut carregar el tema."
+
+msgid "Theme failed to copy."
+msgstr "No s'ha pogut copiar el tema."
 
 msgid "Install Theme"
 msgstr "Instal·la el tema"
@@ -12410,6 +12557,11 @@ msgstr "Dreceres de teclat"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Tanca les converses amb la tecla d'_escapament"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Tema de la llista d'amics"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Icona d'estat"
 
@@ -12419,9 +12571,8 @@ msgstr "_Mostra la icona d'estat:"
 msgid "On unread messages"
 msgstr "Si hi ha missatges sense llegir"
 
-# REVIEW
-msgid "Conversation Window Hiding"
-msgstr "Ocultació de les finestres"
+msgid "Conversation Window"
+msgstr "Finestra de conversa"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Amaga noves converses de MI:"
@@ -12429,6 +12580,9 @@ msgstr "_Amaga noves converses de MI:"
 msgid "When away"
 msgstr "En estar absent"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_Minimitza les finestres de conversa noves"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Pestanyes"
@@ -12485,10 +12639,7 @@ msgid "Use smooth-scrolling"
 msgstr "Empra el desplaçament suau"
 
 msgid "F_lash window when IMs are received"
-msgstr "_Fes que la finestra faci un flaix quan hi arriben missatges"
-
-msgid "Minimi_ze new conversation windows"
-msgstr "_Minimitza les finestres de conversa noves"
+msgstr "_Fes que la finestra faça un flaix quan hi arriben missatges"
 
 msgid "Minimum input area height in lines:"
 msgstr "Alçada mínima en línies de l'àrea d'entrada:"
@@ -12522,14 +12673,12 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "No s'ha pogut iniciar el programa de configuració del navegador."
 
-msgid "ST_UN server:"
-msgstr "Servidor ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "Detecta l'_adreça IP automàticament"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Empra l'_adreça IP detectada automàticament: %s"
 
 msgid "Public _IP:"
 msgstr "IP _pública:"
@@ -12549,6 +12698,10 @@ msgstr "Port _inicial:"
 msgid "_End port:"
 msgstr "Port _final:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Servidor repetidor (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor intermediari i navegador"
 
@@ -12579,6 +12732,10 @@ msgstr "Servidor intermediari"
 msgid "No proxy"
 msgstr "Sense servidor intermediari"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr "Empra DNS remot amb servidors intermediàris SOCKS4"
+
 msgid "_User:"
 msgstr "_Usuari:"
 
@@ -12713,7 +12870,7 @@ msgid "V_olume:"
 msgstr "V_olum:"
 
 msgid "Play"
-msgstr "Reproduix"
+msgstr "Reprodueix"
 
 msgid "_Browse..."
 msgstr "_Navega..."
@@ -12737,12 +12894,12 @@ msgstr "En estar absent i inactiu alhora"
 msgid "Auto-away"
 msgstr "Auto-absència"
 
-msgid "Change status when _idle"
-msgstr "_Canvia l'estat quan estiga inactiu"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuts abans de passar a inactiu:"
 
+msgid "Change status when _idle"
+msgstr "_Canvia l'estat quan estiga inactiu"
+
 msgid "Change _status to:"
 msgstr "Canvia l'_estat a:"
 
@@ -12790,31 +12947,31 @@ msgid "Changes to privacy settings take effect immediately."
 msgstr "Els canvis en les opcions de privadesa es realitzen immediatament."
 
 msgid "Set privacy for:"
-msgstr "Establix la privadesa de:"
+msgstr "Estableix la privadesa de:"
 
 #. Remove All button
 msgid "Remove Al_l"
-msgstr "S_uprimix-ho tot"
+msgstr "S_uprimeix-ho tot"
 
 msgid "Permit User"
 msgstr "Permet l'usuari"
 
 msgid "Type a user you permit to contact you."
-msgstr "Escriviu quin usuari permeteu que us contacti."
+msgstr "Escriviu quin usuari permeteu que vos contacti."
 
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Introduïu el nom de l'usuari que vulgueu que us puga contactar."
+msgstr "Introduïu el nom de l'usuari que vulgueu que vos puga contactar."
 
 msgid "_Permit"
 msgstr "_Permet"
 
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "Voleu permetre que %s us puga contactar?"
+msgstr "Voleu permetre que %s vos puga contactar?"
 
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Esteu segur que voleu permetre que %s us puga contactar?"
+msgstr "Esteu segur que voleu permetre que %s vos puga contactar?"
 
 msgid "Block User"
 msgstr "Bloca un usuari"
@@ -12837,7 +12994,7 @@ msgid "Apply"
 msgstr "Aplica"
 
 msgid "That file already exists"
-msgstr "Este fitxer ja existix"
+msgstr "Este fitxer ja existeix"
 
 msgid "Would you like to overwrite it?"
 msgstr "El voleu sobreescriure?"
@@ -12853,7 +13010,7 @@ msgstr "Selecciona una carpeta..."
 
 #. list button
 msgid "_Get List"
-msgstr "Aconseguix la _llista"
+msgstr "Aconsegueix la _llista"
 
 #. add button
 msgid "_Add Chat"
@@ -12891,47 +13048,43 @@ msgstr "Alça i _fes servir"
 msgid "Status for %s"
 msgstr "Estat per a %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Ja hi ha una emoticona personalitzada per a «%s». Indiqueu-ne una de diferent."
+
 msgid "Custom Smiley"
 msgstr "Emoticona personalitzada"
 
-msgid "More Data needed"
-msgstr "Calen més dades"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Especifiqueu una drecera associada a l'emoticona."
-
 msgid "Duplicate Shortcut"
 msgstr "Drecera duplicada"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Hi ha una emoticona personalitzada per la drecera que heu seleccionat. "
-"Indiqueu-ne una de diferent."
-
-msgid "Please select an image for the smiley."
-msgstr "Seleccioneu una imatge per a l'emoticona."
-
 msgid "Edit Smiley"
 msgstr "Edita l'emoticona"
 
 msgid "Add Smiley"
 msgstr "Afig una emoticona"
 
-msgid "Smiley _Image"
-msgstr "_Imatge de l'emoticona"
+msgid "_Image:"
+msgstr "_Imatge:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "_Dreceres de l'emoticona"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "_Drecera:"
 
 msgid "Smiley"
 msgstr "Emoticona"
 
+msgid "Shortcut Text"
+msgstr "Drecera"
+
 msgid "Custom Smiley Manager"
 msgstr "Gestor d'emoticones personalitzades"
 
+msgid "Select Buddy Icon"
+msgstr "Seleccioneu una icona per a l'amic"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Feu clic per canviar la icona d'amic d'este compte."
 
@@ -12979,17 +13132,17 @@ 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 ""
-"Podeu enviar esta imatge com una transferència de fitxer, incrustar-la en el "
-"missatge, o emprar-la com a icona d'amic per a este usuari."
+"Podeu enviar esta imatge com una transferència de fitxer, incrustar-la en "
+"el missatge, o emprar-la com a icona d'amic per a este usuari."
 
 msgid "Set as buddy icon"
-msgstr "Establix com a icona de l'amic"
+msgstr "Estableix com a icona de l'amic"
 
 msgid "Send image file"
 msgstr "Envia un fitxer d'imatge"
 
 msgid "Insert in message"
-msgstr "Inserix en el missatge"
+msgstr "Insereix en el missatge"
 
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Voleu establir-la com la icona per a este amic?"
@@ -12998,15 +13151,15 @@ msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"Podeu enviar esta imatge com una transferència de fitxer, o emprar-la com a "
-"icona d'amic per a este usuari."
+"Podeu enviar esta imatge com una transferència de fitxer, o emprar-la com "
+"a icona d'amic per a este usuari."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per a "
-"este usuari."
+"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per "
+"a este usuari."
 
 #. 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
@@ -13017,8 +13170,8 @@ msgid "Cannot send launcher"
 msgstr "No es pot enviar el llançador"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Heu arrossegat un llançador de l'escriptori. Segurament voleu enviar allò a "
 "què este llançador apunta i no pas el llançador."
@@ -13030,8 +13183,8 @@ msgid ""
 "<b>Image size:</b> %dx%d"
 msgstr ""
 "<b>Fitxer:</b> %s\n"
-"<b>Grandària del fitxer:</b> %s\n"
-"<b>Grandària de la imatge:</b> %dx%d"
+"<b>Mida del fitxer:</b> %s\n"
+"<b>Mida de la imatge:</b> %dx%d"
 
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
@@ -13056,8 +13209,29 @@ msgstr ""
 "No s'ha pogut carregar la imatge «%s»: no se'n coneix el motiu, possiblement "
 "la imatge estiga corrompuda"
 
+msgid "_Open Link"
+msgstr "_Obri l'enllaç"
+
+msgid "_Copy Link Location"
+msgstr "_Copia l'enllaç"
+
+msgid "_Copy Email Address"
+msgstr "_Copia l'adreça de correu"
+
+msgid "_Open File"
+msgstr "_Obri un fitxer"
+
+msgid "Open _Containing Directory"
+msgstr "Obri el directori on es _troba"
+
 msgid "Save File"
-msgstr "Alça un fitxer"
+msgstr "Alça el fitxer"
+
+msgid "_Play Sound"
+msgstr "_Reprodueix un so"
+
+msgid "_Save File"
+msgstr "Al_ça el fitxer"
 
 msgid "Select color"
 msgstr "Seleccioneu un color"
@@ -13069,7 +13243,7 @@ msgid "Close _tabs"
 msgstr "Tanca les _pestanyes"
 
 msgid "_Get Info"
-msgstr "Aconseguix _informació"
+msgstr "Aconsegueix _informació"
 
 msgid "_Invite"
 msgstr "Conv_ida"
@@ -13083,6 +13257,9 @@ msgstr "_Afig..."
 msgid "_Open Mail"
 msgstr "_Obri el correu"
 
+msgid "_Pause"
+msgstr "_Pausa"
+
 msgid "_Edit"
 msgstr "_Edita"
 
@@ -13150,6 +13327,68 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 "Mostra informació estadística sobre la disponibilitat dels vostres amics"
 
+msgid "Server name request"
+msgstr "Sol·licitud del nom del servidor"
+
+msgid "Enter an XMPP Server"
+msgstr "Introduïu un servidor XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Seleccioneu el servidor XMPP a consultar"
+
+msgid "Find Services"
+msgstr "Cerca serveis"
+
+msgid "Add to Buddy List"
+msgstr "Afig a la llista d'amics"
+
+msgid "Gateway"
+msgstr "Passarel·la"
+
+msgid "Directory"
+msgstr "Directori"
+
+msgid "PubSub Collection"
+msgstr "Col·lecció PubSub"
+
+# Mes info a xep-0060
+msgid "PubSub Leaf"
+msgstr "Fulla PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descripció:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Servei de descoberta"
+
+msgid "_Browse"
+msgstr "_Navega"
+
+msgid "Server does not exist"
+msgstr "El servidor no existeix"
+
+msgid "Server does not support service discovery"
+msgstr "El servidor no permet la descoberta de serveis"
+
+# xep-0060
+msgid "XMPP Service Discovery"
+msgstr "Servei de descoberta XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Permet navegar i registrar-se a serveis."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Este servei és útil per registrar-vos a transports antics o altres serveis "
+"XMPP."
+
 msgid "Buddy is idle"
 msgstr "L'amic està inactiu"
 
@@ -13197,14 +13436,14 @@ msgstr "Prioritat de contacte"
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
-"Us permet canviar els valors associats als diferents estats dels amics."
+"Vos permet canviar els valors associats als diferents estats dels amics."
 
 #. *< description
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Us permet canviar els valors dels estats inactiu, absent i desconnectat pel "
+"Vos permet canviar els valors dels estats inactiu, absent i desconnectat pel "
 "càlcul de la prioritat dels amics."
 
 msgid "Conversation Colors"
@@ -13281,7 +13520,7 @@ msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Restringix el nombre de converses per finestra, separant opcionalment la MI "
+"Restringeix el nombre de converses per finestra, separant opcionalment la MI "
 "dels xats"
 
 #. Configuration frame
@@ -13545,7 +13784,7 @@ msgstr "Connector de missatgeria de música per a composar conjuntament."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "El connector per a missatgeria de música permet que diferents usuaris puguen "
 "treballar en una mateixa peça de música, editant la mateixa partitura en "
@@ -13570,11 +13809,11 @@ msgstr "Po_sa esta cadena davant del títol de la finestra:"
 
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "Inserix el _nombre de missatges nous al títol de la finestra"
+msgstr "Insereix el _nombre de missatges nous al títol de la finestra"
 
 #. Count xprop method button
 msgid "Insert count of new message into _X property"
-msgstr "Inserix el compte de missatges nous a la propietat _X"
+msgstr "Insereix el compte de missatges nous a la propietat _X"
 
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
@@ -13598,23 +13837,23 @@ msgstr "Supressió de notificacions"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "Suprimix quan la finestra de la conversa esti_gui activada"
+msgstr "Suprimeix quan la finestra de la conversa esti_gui activada"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr "Suprimix quan es faci clic a la finestra de la conve_rsa"
+msgstr "Suprimeix quan es faça clic a la finestra de la conve_rsa"
 
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "Suprimix quan s'escriga a la fines_tra de la conversa"
+msgstr "Suprimeix quan s'escriga a la fines_tra de la conversa"
 
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
-msgstr "Suprimix quan s'envie un _missatge"
+msgstr "Suprimeix quan s'envie un _missatge"
 
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr "Suprimix en canviar a la _pestanya de la conversa"
+msgstr "Suprimeix en canviar a la _pestanya de la conversa"
 
 #. *< type
 #. *< ui_requirement
@@ -13631,7 +13870,7 @@ msgstr "Notificació de missatges"
 #. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
-"Us proporciona diferents maneres de notificar-vos la presència de missatges "
+"Vos proporciona diferents maneres de notificar-vos la presència de missatges "
 "sense llegir."
 
 #. *< type
@@ -13657,16 +13896,10 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 "Este és un connector realment interessant que fa moltes coses:\n"
-"- mostra qui ha escrit el programa quan us connecteu\n"
+"- mostra qui ha escrit el programa quan vos connecteu\n"
 "- escriu a l'inrevés tots els missatges rebuts\n"
 "- envia un missatge a tots els amics immediatament després que es connecten"
 
-msgid "Cursor Color"
-msgstr "Color del cursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Color secundari del cursor"
-
 msgid "Hyperlink Color"
 msgstr "Color dels hiperenllaços"
 
@@ -13676,6 +13909,9 @@ msgstr "Color dels enllaços visitats"
 msgid "Highlighted Message Name Color"
 msgstr "Nom del color per als missatges ressaltats"
 
+msgid "Typing Notification Color"
+msgstr "Color per a les notificacions de quan s'escriu"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separació horitzontal del GtkTreeView"
 
@@ -13705,35 +13941,21 @@ msgstr "Tipus de lletra de la interfície GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de la drecera de text de GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Colors de la interfície"
+msgid "Disable Typing Notification Text"
+msgstr "Inhabilita les notificacions de que s'està escrivint"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Configuració dels temes GTK+"
 
-msgid "Widget Sizes"
-msgstr "Grandàries del giny"
+msgid "Colors"
+msgstr "Colors"
 
 msgid "Fonts"
 msgstr "Tipus de lletra"
 
+msgid "Miscellaneous"
+msgstr "Miscel·lània"
+
 msgid "Gtkrc File Tools"
 msgstr "Eines de fitxer Gtkrc"
 
@@ -13754,13 +13976,13 @@ msgid "Raw"
 msgstr "En brut"
 
 msgid "Lets you send raw input to text-based protocols."
-msgstr "Us permet enviar dades en brut als protocols en mode text."
+msgstr "Vos permet enviar dades en brut als protocols en mode text."
 
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Us permet enviar dades en brut als protocols en mode text (XMPP, MSN, IRC, "
+"Vos permet enviar dades en brut als protocols en mode text (XMPP, MSN, IRC, "
 "TOC). Premeu la tecla de retorn del quadre d'entrada per enviar-les. "
 "Observeu la finestra de depuració."
 
@@ -13797,7 +14019,7 @@ msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"Comprova periòdicament si hi ha versions noves i us ho notifica juntament "
+"Comprova periòdicament si hi ha versions noves i vos ho notifica juntament "
 "amb el seu registre de canvis."
 
 #. *< major version
@@ -13820,7 +14042,7 @@ msgstr "Botó d'enviar de la finestra de conversa."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Afig un botó d'Enviar a l'àrea d'entrada de la finestra de conversa. Està "
 "pensat per situacions en què no hi ha cap teclat."
@@ -13829,7 +14051,7 @@ msgid "Duplicate Correction"
 msgstr "Duplicació de la correcció"
 
 msgid "The specified word already exists in the correction list."
-msgstr "La paraula especificada ja existix a la llista de correccions."
+msgstr "La paraula especificada ja existeix a la llista de correccions."
 
 msgid "Text Replacements"
 msgstr "Substitució de text"
@@ -13844,7 +14066,7 @@ msgid "Whole words only"
 msgstr "Només paraules completes"
 
 msgid "Case sensitive"
-msgstr "Distingix majúscules i minúscules"
+msgstr "Distingeix majúscules i minúscules"
 
 msgid "Add a new text replacement"
 msgstr "Afig una altra substitució de text"
@@ -13857,10 +14079,10 @@ msgstr "_S'envia:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "Coincidix _majúscules i minúscules (desactiveu per a automàtic)"
+msgstr "Coincideix _majúscules i minúscules (desactiveu per a automàtic)"
 
 msgid "Only replace _whole words"
-msgstr "Substituix només paraules _completes"
+msgstr "Substitueix només paraules _completes"
 
 msgid "General Text Replacement Options"
 msgstr "Opcions generals de la substitució de text"
@@ -13873,9 +14095,98 @@ msgstr "Substitució de text"
 
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
-"Substituix el text dels missatges que s'envien emprant les regles que hàgeu "
+"Substitueix el text dels missatges que s'envien emprant les regles que hàgeu "
 "establit."
 
+msgid "Just logged in"
+msgstr "Acabat de connectar"
+
+msgid "Just logged out"
+msgstr "Acabat de desconnectar"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Icona per a un contacte/\n"
+"Icona per a una persona desconeguda"
+
+msgid "Icon for Chat"
+msgstr "Icona per un xat"
+
+msgid "Ignored"
+msgstr "Ignorat"
+
+msgid "Founder"
+msgstr "Fundador"
+
+msgid "Operator"
+msgstr "Operador"
+
+msgid "Half Operator"
+msgstr "Mig operador"
+
+msgid "Authorization dialog"
+msgstr "Diàleg d'autorització"
+
+msgid "Error dialog"
+msgstr "Diàleg d'error"
+
+msgid "Information dialog"
+msgstr "Diàleg d'informació"
+
+msgid "Mail dialog"
+msgstr "Diàleg del correu"
+
+msgid "Question dialog"
+msgstr "Diàleg de pregunta"
+
+msgid "Warning dialog"
+msgstr "Diàleg d'avís"
+
+msgid "What kind of dialog is this?"
+msgstr "Quin tipus de diàleg és este?"
+
+msgid "Status Icons"
+msgstr "Icona d'estat"
+
+msgid "Chatroom Emblems"
+msgstr "Distintius de les sales de xat"
+
+msgid "Dialog Icons"
+msgstr "Icones dels quadres de diàleg"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Editor de temes d'icona del Pidgin"
+
+msgid "Contact"
+msgstr "Contacte"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Editor de temes per a la llista d'amics del Pidgin"
+
+msgid "Edit Buddylist Theme"
+msgstr "Edita el tema de la llista d'amics"
+
+msgid "Edit Icon Theme"
+msgstr "Edita el tema d'icones"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Editor de temes del Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Editor de temes del Pidgin"
+
 # FIXME (josep)
 #. *< type
 #. *< ui_requirement
@@ -13988,8 +14299,7 @@ msgstr "_Transparència de la finestra de la llista d'amics"
 
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
-"Treu la transparència de la finestra de la llista d'amics en obtindre el "
-"focus"
+"Treu la transparència de la finestra de la llista d'amics en obtindre el focus"
 
 #. *< type
 #. *< ui_requirement
@@ -14013,10 +14323,10 @@ msgid ""
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Este connector habilita la transparència variables en finestres de conversa, "
-"i la llista d'amics.\n"
+"Este connector habilita la transparència variables en finestres de "
+"conversa, i la llista d'amics.\n"
 "\n"
-"* Nota: este connector requerix Windows 2000 o superior."
+"* Nota: este connector requereix Windows 2000 o superior."
 
 msgid "GTK+ Runtime Version"
 msgstr "Versió del mòdul d'execució de GTK+"
@@ -14040,9 +14350,6 @@ msgstr "_Conserva la finestra d'amics per sobre:"
 msgid "Only when docked"
 msgstr "Només si està acoblada"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_Fes que la finestra parpellege quan arriben missatges de xat"
-
 msgid "Windows Pidgin Options"
 msgstr "Opcions del Pidgin per al Windows"
 
@@ -14050,7 +14357,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Opcions específiques de la versió del Pidgin per al Windows"
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Proporciona opcions específiques per a la versió Windows del Pidgin, com ara "
 "l'acoblament de la llista d'amics."
@@ -14075,13 +14382,13 @@ msgstr "<font color='#777777'>No esteu connectat a XMPP</font>"
 
 # FIXME: stanza -> estrofa (literal) (Josep)
 msgid "Insert an <iq/> stanza."
-msgstr "Inserix un bloc <iq/>."
+msgstr "Insereix un bloc <iq/>."
 
 msgid "Insert a <presence/> stanza."
-msgstr "Inserix un bloc <presence/>."
+msgstr "Insereix un bloc <presence/>."
 
 msgid "Insert a <message/> stanza."
-msgstr "Inserix un bloc <message/>."
+msgstr "Insereix un bloc <message/>."
 
 #. *< name
 #. *< version
@@ -14093,6 +14400,548 @@ msgstr "Envia i rep blocs XMPP en brut."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 
+#~ msgid "_Resume"
+#~ msgstr "_Continua"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s no ha acceptat la vostra invitació d'entrar a la sala «%s» perquè «%s»."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "S'ha rebutjat la invitació"
+
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "La connexió al servidor BOSH està malmesa"
+
+#~ msgid "_Proxy"
+#~ msgstr "Servidor _intermediari"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "No s'ha pogut obrir el sòcol"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "No s'ha pogut escoltar al sòcol"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "No s'ha pogut llegir el sòcol"
+
+#~ msgid "Connection failed."
+#~ msgstr "Ha fallat la connexió."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "El servidor ha desconnectat"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "No s'ha pogut crear el sòcol"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "No s'ha pogut connectar a l'ordinador"
+
+#~ msgid "Read error"
+#~ msgstr "Error de lectura"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut establir una connexió amb el servidor:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Error d'escriptura"
+
+#~ msgid "Read Error"
+#~ msgstr "Error de lectura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "No s'ha pogut connectar al servidor."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "La memòria intermèdia de lectura és plena (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "No es pot analitzar el missatge"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Ha fallat l'entrada (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Se us ha desconnectat perquè heu entrat a través d'una altra estació de "
+#~ "treball."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error. No hi ha instal·lades les biblioteques per a SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "La contrasenya no és correcta."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut connectar al servidor BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Se us pot desconnectar d'aquí a poc temps. Comproveu si hi ha "
+#~ "actualitzacions a %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "No s'ha pogut connectar"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "No s'ha pogut desxifrar la resposta del servidor"
+
+#~ msgid "Invalid username."
+#~ msgstr "El nom d'usuari no és vàlid"
+
+#~ msgid "Connection lost"
+#~ msgstr "S'ha perdut la connexió"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "No s'ha pogut obtenir l'adreça de l'ordinador"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "S'ha tancat la connexió (escrivint)"
+
+#~ msgid "Connection reset"
+#~ msgstr "S'ha reiniciat la connexió"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "S'ha produït un error en llegir del sòcol: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "No s'ha pogut connectar a l'ordinador"
+
+#~ msgid "Could not write"
+#~ msgstr "No s'ha pogut escriure"
+
+#~ msgid "Could not connect"
+#~ msgstr "No s'ha pogut connectar"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "No s'ha pogut crear el sòcol per a escoltar"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "No s'ha pogut resoltre el nom de l'ordinador"
+
+#~ msgid "Incorrect Password"
+#~ msgstr "La contrasenya no és correcta"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut establir la connexió amb %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japó"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Servidor de cercapersones del Japó"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Servidor de transferència de fitxers del Japó"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "S'ha perdut la connexió al servidor\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "No s'ha pogut resoldre el nom de l'ordinador"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "No s'ha pogut connectar a %s: el servidor requereix TLS/SSL, però no s'ha "
+#~ "trobat cap implementació de TLS/SSL."
+
+#~ msgid "Last Activity"
+#~ msgstr "Darrera activitat"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Informació del servei de descoberta"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Elements del servei de descoberta"
+
+# http://xmpp.org/extensions/xep-0033.html
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Bloc d'adreçament estès"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Xat multi-usuari"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Informació de presència estesa per a xats multi-usuari"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ordres Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Servei PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Flux de bits SOCK5"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Ubicació de l'usuari"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar de l'usuari"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notificacions de l'estat del xat"
+
+#~ msgid "Software Version"
+#~ msgstr "Versió del programari"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Iniciació del flux"
+
+#~ msgid "User Mood"
+#~ msgstr "Estat d'ànim de l'usuari"
+
+#~ msgid "User Activity"
+#~ msgstr "Activitat de l'usuari"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capacitats de l'entitat"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negociacions de la sessió xifrada"
+
+# Pot ser també música, cançó... (josep)
+# Vegeu: http://xmpp.org/extensions/xep-0118.html
+#~ msgid "User Tune"
+#~ msgstr "Melodia de l'usuari"
+
+# Nota: "Roster" en XMPP és la llista de contactes (josep)
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Intercanvi d'element de la llista de contactes"
+
+# Vegeu: http://xmpp.org/extensions/xep-0152.html (josep)
+# Nota: codi mort
+#~ msgid "Reachability Address"
+#~ msgstr "Adreça de localització"
+
+#~ msgid "User Profile"
+#~ msgstr "Perfil de l'usuari"
+
+# Nota: Jingle és una extensió d'XMPP i ho considerem nom propi (josep)
+# http://www.xmpp.org/extensions/xep-0166.html
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+# FIXME
+#~ msgid "Jingle Audio"
+#~ msgstr "Àudio amb Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Sobrenom de l'usuari"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Vídeo amb Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Recepció de missatges"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publicació de claus públiques"
+
+#~ msgid "User Chatting"
+#~ msgstr "Converses d'usuari"
+
+#~ msgid "User Browsing"
+#~ msgstr "Navegació d'usuaris"
+
+#~ msgid "User Gaming"
+#~ msgstr "Jocs d'usuari"
+
+#~ msgid "User Viewing"
+#~ msgstr "Visualització d'usuaris"
+
+# Vegeu: http://xmpp.org/extensions/xep-0200.html
+# Nota: Això es refereix a les capabilitats de l'altre interlocutor
+# No apareix a l'aplicació final, és codi mort dins un #if 0 ... #endif (josep)
+#~ msgid "Stanza Encryption"
+#~ msgstr "Blocs xifrats"
+
+#~ msgid "Entity Time"
+#~ msgstr "Hora de l'entitat"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Lliurament endarrerit"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Objectes de dades col·laboratius"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Dipòsit de fitxers i compartició"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Servei de descoberta STUN per al Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negociació simple del xifratge de la sessió"
+
+# Mireu l'RFC (josep)
+#~ msgid "Hop Check"
+#~ msgstr "Comprovació dels salts"
+
+# REVIEW
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Ocultació de les finestres"
+
+#~ msgid "More Data needed"
+#~ msgstr "Calen més dades"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Especifiqueu una drecera associada a l'emoticona."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Seleccioneu una imatge per a l'emoticona."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Quin ID voleu activar?"
+
+#~ msgid "Account locked: Too many failed login attempts"
+#~ msgstr "S'ha blocat el compte: s'ha intentat entrar massa vegades"
+
+#~ msgid "Account locked: See the debug log"
+#~ msgstr "El compte està blocat: vegeu el registre de depuració"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Color del cursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Color secundari del cursor"
+
+#~ msgid "Interface colors"
+#~ msgstr "Colors de la interfície"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Mides del giny"
+
+#~ msgid "Invite message"
+#~ msgstr "Missatge d'invitació"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Introduïu el nom de l'usuari que vulgueu convidar,\n"
+#~ "així com un missatge d'invitació opcional."
+
+#~ msgid "Looking up %s"
+#~ msgstr "S'està cercant %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Ha fallat la connexió a %s"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Entrada: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "No s'ha pogut escriure el fitxer %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "No s'ha pogut llegir el fitxer %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "El missatge és massa llarg, s'han retallat els darrers %s octets."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s no està connectat."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Avís de %s no permès."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "S'ha ignorat un missatge. Esteu excedint el límit de velocitat del "
+#~ "servidor."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "El xat a %s no està disponible."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Esteu enviant missatges massa de pressa a %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Us heu perdut un missatge instantani de %s perquè era massa gran."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Heu perdut un missatge instantani de %s perquè s'ha enviat massa de "
+#~ "pressa."
+
+#~ msgid "Failure."
+#~ msgstr "Fallada."
+
+#~ msgid "Too many matches."
+#~ msgstr "Massa coincidències."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Es necessiten més qualificadors."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Servei de directori no disponible temporalment."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Recerca per adreça de correu electrònic restringida."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "S'ha ignorat la paraula clau."
+
+#~ msgid "No keywords."
+#~ msgstr "No hi ha paraules clau."
+
+#~ msgid "User has no directory information."
+#~ msgstr "L'usuari no té informació al directori."
+
+# FIXME
+#~ msgid "Country not supported."
+#~ msgstr "Aquest país no està disponible."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Fallada desconeguda: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "El nom d'usuari o la contrasenya no són correctes."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "El servei està temporalment no disponible."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "El vostre nivell d'avisos és massa alt per a connectar-se."
+
+#~ 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 ""
+#~ "Us heu estat connectant i desconnectant amb massa freqüència. Espereu deu "
+#~ "minuts i torneu-ho a provar. Si continueu intentant-ho, haureu d'esperar "
+#~ "encara més."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Hi ha hagut un error de connexió desconegut: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "S'ha produït un error desconegut, %d. Informació: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "El nom del grup no és vàlid"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Connexió tancada"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "S'està esperant una resposta..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC ha tornat de la pausa. Ja podeu enviar missatges de nou."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "S'ha canviat la contrasenya amb èxit"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Aconsegueix informació del directori"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Estableix informació del directori"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "No s'ha pogut obrir %s per a escriure-hi."
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
+#~ "l'altra banda."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "No s'ha pogut connectar per realitzar la transferència."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "No s'ha pogut escriure la capçalera del fitxer. No s'enviarà."
+
+#~ msgid "Save As..."
+#~ msgstr "Anomena i desa..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s demana a %s que accepti %d fitxer: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s demana a %s que accepti %d fitxers: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s us demana que li envieu un fitxer"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Connector per al protocol TOC"
+
+#~ msgid "%s Options"
+#~ msgstr "Opcions de %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Opcions del servidor intermediari"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Servidor ST_UN:"
+
+#~ msgid "By log size"
+#~ msgstr "Per la mida del registre"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Obre l'enllaç en el navegador"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "_Imatge de l'emoticona"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "_Dreceres de l'emoticona"
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "No s'ha pogut obtenir la llibreta d'adreces MSN"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Fes que la finestra parpellegi quan arribin missatges de xat"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Se us pot desconnectar d'aquí a poc temps. Si voleu, podeu emprar TOC "
+#~ "fins que això es resolgui. Comproveu si hi ha actualitzacions a %s."
+
 #~ msgid "Connection to server lost (no data received within %d second)"
 #~ msgid_plural ""
 #~ "Connection to server lost (no data received within %d seconds)"
@@ -14325,13 +15174,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ "El MySpace no permet contrasenyes més llarges de %d caràcters, la vostra "
 #~ "en té %d."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Aneu a http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username escolliu un nom d'usuari i torneu a provar d'entrar."
-
 #~ msgid "Screen name sent"
 #~ msgstr "S'ha enviat el nom d'usuari"
 
@@ -14380,9 +15222,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ "llista d'amics. Opcionalment podeu entrar un àlies, o sobrenom, per a "
 #~ "l'amic. El sobrenom substituirà el nom d'usuari allà on sigui possible.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Compte:"
-
 #~ msgid "User has typed something and stopped"
 #~ msgstr "L'usuari ha escrit alguna cosa i s'ha aturat"
 
@@ -14787,9 +15626,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ "\n"
 #~ "Inactiu: %s"
 
-#~ msgid "Nickname: %s\n"
-#~ msgstr "Sobrenom: %s\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Nickname:</b> %s"
@@ -14827,13 +15663,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Descripció:</b> Xerraire"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15155,21 +15984,12 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "YCHT port"
 #~ msgstr "Port YCHT"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ha sortit."
-
 #~ msgid "Screen Name:"
 #~ msgstr "Nom d'usuari:"
 
-#~ msgid "Background color name"
-#~ msgstr "Nom del color de fons"
-
 #~ msgid "Background color as a string"
 #~ msgstr "El color de fons com a una cadena"
 
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "El color de fons com a GdkColor"
-
 #~ msgid "Background set"
 #~ msgstr "Estableix el color de fons"
 
@@ -15261,9 +16081,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Call ended."
 #~ msgstr "Ha finalitzat la trucada."
 
-#~ msgid "End Call"
-#~ msgstr "Finalitza la trucada"
-
 #~ msgid "Receiving call from %s"
 #~ msgstr "S'està rebent una trucada de %s"
 
@@ -15432,9 +16249,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "_Idle"
 #~ msgstr "_Inactiu"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "Tor_na a estar actiu"
-
 #~ msgid "Bro_wse..."
 #~ msgstr "Na_vega..."
 
@@ -15495,9 +16309,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgstr[0] "(%d missatge)"
 #~ msgstr[1] "(%d missatges)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 missatge)"
-
 #~ msgid "_Hide new messages until tray icon is clicked"
 #~ msgstr ""
 #~ "_Oculta els missatges nous fins que no es faci clic a la icona d'estat"
@@ -15514,9 +16325,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Show transfer details"
 #~ msgstr "Mostra els detalls de la transferència"
 
-#~ msgid "Expander Size"
-#~ msgstr "Mida de l'expansor"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Mida de la fletxa d'expansió"
 
@@ -15739,9 +16547,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Envia un missatge a l'amic seleccionat"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Aconsegueix dades sobre l'amic seleccionat"
-
 #~ msgid "_Chat"
 #~ msgstr "_Xat"
 
@@ -15906,9 +16711,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "New conversation _placement:"
 #~ msgstr "_Posicionament d'una nova conversa:"
 
-#~ msgid "Message Text"
-#~ msgstr "Text del missatge"
-
 #~ msgid "Away Messages"
 #~ msgstr "Missatges d'absència"
 
@@ -15939,9 +16741,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Invisible for friends only"
 #~ msgstr "Només invisible per als amics"
 
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "No s'ha pogut resoldre el nom de l'ordinador."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "S'ha produït un error en escriure al sòcol."
 
@@ -16151,9 +16950,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "/Buddies/Log Out"
 #~ msgstr "/Amics/Desconnecta"
 
-#~ msgid "Miscellaneous error"
-#~ msgstr "Error miscel·lani"
-
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr ""
 #~ "S'ha produït un error desconegut en intentar autoritzar amb el servidor "
diff --git a/po/cs.po b/po/cs.po
index 7cc1ca11f2..2549567882 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-22 11:04-0500\n"
-"PO-Revision-Date: 2009-02-22 14:43+0100\n"
+"POT-Creation-Date: 2009-07-22 13:37-0700\n"
+"PO-Revision-Date: 2009-07-21 21:04+0100\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -605,19 +605,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Odeslat do"
 
-msgid "Invite message"
-msgstr "Zvací zpráva"
-
-msgid "Invite"
-msgstr "Pozvat"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Zadejte prosím jméno uživatele, kterého chcete pozvat,\n"
-"a nepovinně i zvací zprávu."
-
 msgid "Conversation"
 msgstr "Konverzace"
 
@@ -873,6 +860,39 @@ msgstr "Všechny konverzace"
 msgid "System Log"
 msgstr "Systémový záznam"
 
+msgid "Calling ... "
+msgstr "Volání ..."
+
+msgid "Hangup"
+msgstr "Zavěsit"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Přijmout"
+
+msgid "Reject"
+msgstr "Odmítnout"
+
+msgid "Call in progress."
+msgstr "Hovor probíhá."
+
+msgid "The call has been terminated."
+msgstr "Hovor byl ukončen."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s chce spustit audio sezení s vámi."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s se pokouší spustit multimediální sezení s nepodporovaným typem."
+
+msgid "You have rejected the call."
+msgstr "Odmítnul jste volání."
+
+msgid "call: Make an audio call."
+msgstr "call: Vytvořit audio hovor."
+
 msgid "Emails"
 msgstr "Emaily"
 
@@ -908,6 +928,9 @@ msgstr "Pokračovat"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "Pozvat"
+
 msgid "(none)"
 msgstr "(žádné)"
 
@@ -1111,7 +1134,6 @@ msgstr "%s šel pryč. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s vám poslal zprávu. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznámá událost sledování. Oznamte to prosím!"
 
@@ -1520,6 +1542,29 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Zásuvný modul posledního záznamu."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Získávání TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Vytvořit TinyURL pro url této délky a delší"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Předpona TinyURL (nebo jiných) adres"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Zásuvný modul TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "Při zprávě s URL, TinyURL pro snadnější kopírování"
+
 msgid "accounts"
 msgstr "účty"
 
@@ -1620,13 +1665,6 @@ msgstr "Přijmout certifikát pro %s?"
 msgid "SSL Certificate Verification"
 msgstr "SSL verifikace certifikátu"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Přijmout"
-
-msgid "Reject"
-msgstr "Odmítnout"
-
 msgid "_View Certificate..."
 msgstr "Zobrazit certifikát..."
 
@@ -1639,6 +1677,7 @@ msgid ""
 msgstr ""
 "Certifikát \"%s\" je podepsán sám sebou. Nemůže být automaticky zkontrolován."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Certifikační řetěz pro %s je neplatný."
@@ -1648,6 +1687,7 @@ msgstr "Certifikační řetěz pro %s je neplatný."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL chyba certifikátu"
 
@@ -1724,6 +1764,7 @@ msgstr "+++ %s se přihlásil"
 msgid "+++ %s signed off"
 msgstr "+++ %s se odhlásil"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
@@ -1770,6 +1811,17 @@ msgstr "%s opustil místnost."
 msgid "%s left the room (%s)."
 msgstr "%s opustil místnost (%s)."
 
+msgid "Invite to chat"
+msgstr "Pozvat k chatu"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Zadejte prosím jméno uživatele, kterého chcete pozvat, a nepovinně i zvací "
+"zprávu."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Nemohu získat spojení: %s"
@@ -1901,6 +1953,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Začínám přenos %s od %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Přenos souboru <A HREF=\"file://%s\">%s</A> dokončen"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Přenos souboru %s dokončen"
 
@@ -2109,6 +2165,9 @@ msgstr "<font color=\"red\"><b>Nemohu přečíst soubor: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-ODPOVĚĎ>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Chyba při vytváření konference."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Používáte %s, ale tento zásuvný modul vyžaduje %s."
@@ -2510,13 +2569,13 @@ msgstr "Zahrnuje záznamy jiných klientů IM v prohlížeči záznamů."
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Při prohlížení záznamů tento zásuvný modul přidá záznamy z jiných klientů "
-"IM. Momentálně se to týká Adium, MSN Messenger a Trillian.\n"
+"IM. Momentálně se to týká Adium, MSN Messenger, aMSN a Trillian.\n"
 "\n"
 "VAROVÁNÍ: Tento zásuvný modul je ještě alfa kód a může často padat. "
 "Používejte jej na své vlastní nebezpečí!"
@@ -2565,7 +2624,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "Uložit zprávy poslané odpojeným uživatelům jako sledování."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Ostatní zprávy budou uloženy jako sledování. Můžete sledování upravit/"
@@ -2597,6 +2656,34 @@ msgstr "Ukládat zprávy při odpojení do sledování"
 msgid "Do not ask. Always save in pounce."
 msgstr "Neptat se. Vždy uložit do sledování."
 
+msgid "One Time Password"
+msgstr "Jednorázové heslo"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Podpora jednorázového hesla"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Vynutit použití hesel jednorázově."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Umožňuje vynutit, že hesla, která nejsou uložena, jsou použita jen pro jedno "
+"připojení.\n"
+"Poznámka: Heslo účtu nemusí být uloženo."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2790,14 +2877,14 @@ msgstr ""
 "TCL, nainstalujte ActiveTCL z http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Apple Bonjour pro Windows toolkit nebyl nalezen, viz FAQ: http://d.pidgin.im/"
+"Apple Bonjour for Windows toolkit nebyl nalezen, viz http://d.pidgin.im/"
 "BonjourWindows pro další informace."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Nemohu poslouchat příchozí spojení IM\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Nemohu poslouchat příchozí spojení IM"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2835,9 +2922,8 @@ msgid "Purple Person"
 msgstr "Osoba Purple"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Lokalita"
+msgstr "Lokální port"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2849,14 +2935,17 @@ msgstr "%s zavřel konverzaci."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nemohu odeslat zprávu, konverzaci nelze spustit."
 
-msgid "Cannot open socket"
-msgstr "Nemohu otevřít socket"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nemohu vytvořit socket: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Nemohu připojit socket k portu"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Nemohu připojit socket k portu: %s"
 
-msgid "Could not listen on socket"
-msgstr "Nemohu poslouchat na socketu"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Nemohu poslouchat na soketu: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Chyba při komunikaci s lokálním mDNSResponderem."
@@ -2905,14 +2994,14 @@ msgstr "Uložit seznam kamarádů..."
 msgid "Load buddylist from file..."
 msgstr "Načíst seznam kamarádů ze serveru..."
 
-msgid "Fill in the registration fields."
-msgstr "Vyplňte pole pro registraci."
+msgid "You must fill in all registration fields"
+msgstr "Vyplňte všechna pole pro registraci"
 
-msgid "Passwords do not match."
-msgstr "Hesla nesouhlasí."
+msgid "Passwords do not match"
+msgstr "Hesla nesouhlasí"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Nemohu zaregistrovat nový účet. Došlo k chybě.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Nemohu zaregistrovat nový účet. Došlo k neznámé chybě."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nový účet Gadu-Gadu zaregistrován"
@@ -2923,14 +3012,14 @@ msgstr "Registrace úspěšně dokončena!"
 msgid "Password"
 msgstr "Heslo"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Heslo (znovu)"
 
-msgid "Enter current token"
-msgstr "Zadejte aktuální token"
+msgid "Enter captcha text"
+msgstr "Vložta text z obrázku"
 
-msgid "Current token"
-msgstr "Aktuální token"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Zaregistrovat nový účet Gadu-Gadu"
@@ -2983,6 +3072,15 @@ msgstr "Heslo bylo úspěšně změněno!"
 msgid "Current password"
 msgstr "Aktuální heslo"
 
+msgid "Password (retype)"
+msgstr "Heslo (znovu)"
+
+msgid "Enter current token"
+msgstr "Zadejte aktuální token"
+
+msgid "Current token"
+msgstr "Aktuální token"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Zadejte prosím své aktuální a nové heslo pro UIN: "
 
@@ -2996,6 +3094,7 @@ msgstr "Vyberte chat pro kamaráda: %s"
 msgid "Add to chat..."
 msgstr "Přidat k chatu..."
 
+#. Global
 msgid "Available"
 msgstr "Přítomen"
 
@@ -3029,7 +3128,7 @@ msgstr "Nenalezen žádný odpovídající uživatel"
 msgid "There are no users matching your search criteria."
 msgstr "Neexistuje žádný uživatel odpovídající vašim podmínkám hledání."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Nemohu číst ze socketu"
 
 msgid "Buddy list downloaded"
@@ -3044,8 +3143,14 @@ msgstr "Seznam kamarádů odeslán"
 msgid "Your buddy list was stored on the server."
 msgstr "Váš seznam kamarádů byl uložen na serveru."
 
-msgid "Connection failed."
-msgstr "Spojení selhalo."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Připojen"
+
+msgid "Connection failed"
+msgstr "Spojení selhalo"
 
 msgid "Add to chat"
 msgstr "Přidat k chatu"
@@ -3053,14 +3158,23 @@ msgstr "Přidat k chatu"
 msgid "Chat _name:"
 msgstr "_Název chatu:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Nemohu vyřešit hostname '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Připojuji se"
+
 msgid "Chat error"
 msgstr "Chyba chatu"
 
 msgid "This chat name is already in use"
 msgstr "Tento název chatu se již používá"
 
-msgid "Not connected to the server."
-msgstr "Nepřipojen k serveru."
+msgid "Not connected to the server"
+msgstr "Nepřipojen k serveru"
 
 msgid "Find buddies..."
 msgstr "Hledat kamarády..."
@@ -3101,6 +3215,9 @@ msgstr "Populární polský IM"
 msgid "Gadu-Gadu User"
 msgstr "Uživatel Gadu-Gadu"
 
+msgid "GG server"
+msgstr "GG server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznámý příkaz: %s"
@@ -3115,7 +3232,7 @@ msgstr "Nenastaveno žádné téma"
 msgid "File Transfer Failed"
 msgstr "Přenos souborů selhal"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Nemohu otevřít poslouchající port."
 
 msgid "Error displaying MOTD"
@@ -3131,8 +3248,16 @@ msgstr "S tímto spojením není asociována MOTD."
 msgid "MOTD for %s"
 msgstr "MOTD pro %s"
 
-msgid "Server has disconnected"
-msgstr "Server se odpojil"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Ztraceno spojení se serverem: %s"
 
 msgid "View MOTD"
 msgstr "Zobrazit MOTD"
@@ -3143,25 +3268,23 @@ msgstr "_Kanál:"
 msgid "_Password:"
 msgstr "_Heslo:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "Přezdívky IRC nemohou obsahovat mezery"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Připojuji se"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "Přezdívky IRC a jméno serveru nemohou obsahovat mezery"
 
 msgid "SSL support unavailable"
 msgstr "Podpora SSL není k dispozici"
 
-msgid "Couldn't create socket"
-msgstr "Nemohu vytvořit socket"
+msgid "Unable to connect"
+msgstr "Nemohu se připojit"
 
-msgid "Couldn't connect to host"
-msgstr "Nemohu se připojit k hostiteli"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Nemohu připojit: %s"
 
-msgid "Read error"
-msgstr "Chyba čtení"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Server zavřel spojení."
 
 msgid "Users"
 msgstr "Uživatelé"
@@ -3342,6 +3465,16 @@ msgstr ""
 "Vámi zvolený název účtu byl serverem odmítnut. Pravděpodobně obsahuje "
 "neplatné znaky."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Přezdívka \"%s\" se již používá"
+
+msgid "Nickname in use"
+msgstr "Přezdívka se používá"
+
 msgid "Cannot change nick"
 msgstr "Nemohu změnit přezdívku"
 
@@ -3581,11 +3714,11 @@ msgstr "Selhal příkaz Ad-Hoc"
 msgid "execute"
 msgstr "spustit"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Server pro přihlášení vyžaduje SSL. Nebyla nalezena podpora TLS/SSL."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Server vyžaduje TLS/SSL, ale podpora TLS/SSL nebyla nalezena."
 
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "Požadujete šifrování,ale nebyla nalezena podpora TLS/SSL."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Požadujete šifrování, ale nebyla nalezena podpora TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server vyžaduje textovou autentizaci v nešifrovaném proudu"
@@ -3601,17 +3734,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Textová autentizace"
 
-msgid "Invalid response from server."
-msgstr "Neplatná odpověď od serveru."
+msgid "SASL authentication failed"
+msgstr "SASL autentizace selhala"
+
+msgid "Invalid response from server"
+msgstr "Neplatná odpověď od serveru"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server nepoužívá žádnou podporovanou metodu autentizace"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Vyžadujete šifrování, ale to není na serveru dostupné."
+
 msgid "Invalid challenge from server"
 msgstr "Neplatná výzva od serveru"
 
-msgid "SASL error"
-msgstr "Chyba SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Chyba SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "Správce připojení BOSH ukončil sezení."
+
+msgid "No session ID given"
+msgstr "Neudáno ID sezení"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Nepodporovaná verze BOSH protokolu"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Nemohu navázat spojení se serverem"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Nemohu navázat spojení se serverem: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Nemohu navázat SSL spojení"
 
 msgid "Full Name"
 msgstr "Celé jméno"
@@ -3678,158 +3837,8 @@ msgstr "Klient"
 msgid "Operating System"
 msgstr "Operační systém"
 
-msgid "Last Activity"
-msgstr "Poslední aktivita"
-
-msgid "Service Discovery Info"
-msgstr "Informace vyhledání služby"
-
-msgid "Service Discovery Items"
-msgstr "Položky hledání služeb"
-
-msgid "Extended Stanza Addressing"
-msgstr "Rozšířené Stanza adresování"
-
-msgid "Multi-User Chat"
-msgstr "Víceuživatelský chat"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Rozšířené informace vzhledu chatu"
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band Bytestreamy"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc příkazy"
-
-msgid "PubSub Service"
-msgstr "PubSub služba"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreamy"
-
-msgid "Out of Band Data"
-msgstr "Mino Band data"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "In-Band registrace"
-
-msgid "User Location"
-msgstr "Umístění uživatele"
-
-msgid "User Avatar"
-msgstr "Avatar uživatele"
-
-msgid "Chat State Notifications"
-msgstr "Upozornění na stav chatu"
-
-msgid "Software Version"
-msgstr "Verze softwaru"
-
-msgid "Stream Initiation"
-msgstr "Iniciace streamu"
-
-msgid "File Transfer"
-msgstr "Přenos souborů"
-
-msgid "User Mood"
-msgstr "Nálada uživatele"
-
-msgid "User Activity"
-msgstr "Aktivita uživatele"
-
-msgid "Entity Capabilities"
-msgstr "Schopnosti"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Šifrované vyjednávání"
-
-msgid "User Tune"
-msgstr "Poslech uživatele"
-
-msgid "Roster Item Exchange"
-msgstr "Výměna položky seznamu"
-
-msgid "Reachability Address"
-msgstr "Dostupnost adres"
-
-msgid "User Profile"
-msgstr "Profil"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
-
-msgid "User Nickname"
-msgstr "Přezdívka"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Potvrzení zprávy"
-
-msgid "Public Key Publishing"
-msgstr "Zveřejnění veřejného klíče"
-
-msgid "User Chatting"
-msgstr "Uživatel chatuje"
-
-msgid "User Browsing"
-msgstr "Uživatel brouzdá"
-
-msgid "User Gaming"
-msgstr "Uživatel hraje"
-
-msgid "User Viewing"
-msgstr "Uživatel prohlíží"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Šifrování Stanza"
-
-msgid "Entity Time"
-msgstr "Čas položky"
-
-msgid "Delayed Delivery"
-msgstr "Zpožděné doručení"
-
-msgid "Collaborative Data Objects"
-msgstr "Spolupracující datové objekty"
-
-msgid "File Repository and Sharing"
-msgstr "Úložiště souboru a sdílení"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN Service Discovery pro Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Zjednodušené šifrované vyjednávání"
-
-msgid "Hop Check"
-msgstr "Kontrola hopu"
-
-msgid "Capabilities"
-msgstr "Schopnosti"
+msgid "Local Time"
+msgstr "Místní čas"
 
 msgid "Priority"
 msgstr "Priorita"
@@ -3837,6 +3846,13 @@ msgstr "Priorita"
 msgid "Resource"
 msgstr "Zdroj"
 
+#, c-format
+msgid "%s ago"
+msgstr "před %s"
+
+msgid "Logged Off"
+msgstr "Odhlášen"
+
 msgid "Middle Name"
 msgstr "Prostřední jméno"
 
@@ -4003,28 +4019,22 @@ msgstr "Zvolte server konference, kterého se ptát"
 msgid "Find Rooms"
 msgstr "Hledat místnosti"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Vyžadujete šifrování, ale to není na serveru dostupné."
+msgid "Affiliations:"
+msgstr "Vztahy:"
 
-msgid "Write error"
-msgstr "Chyba zápisu"
+msgid "No users found"
+msgstr "Uživatelé nebyli nalezeni"
 
-msgid "Ping timeout"
-msgstr "Ping timeout"
+msgid "Roles:"
+msgstr "Role:"
 
-msgid "Read Error"
-msgstr "Chyba čtení"
+msgid "Ping timed out"
+msgstr "Ping timeout"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Nemohu navázat spojení se serverem:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Nemohu vytvořit socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
+msgstr "Nemohu najít alternativní XMPP připojení po selhání přímého spojení."
 
 msgid "Invalid XMPP ID"
 msgstr "Neplatné ID XMPP"
@@ -4032,6 +4042,9 @@ msgstr "Neplatné ID XMPP"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Neplatné ID XMPP. Musí být nastavena doména."
 
+msgid "Malformed BOSH URL"
+msgstr "Zdeformovaný BOSH URL"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrace %s@%s úspěšná"
@@ -4056,9 +4069,6 @@ msgstr "Zrušení registrace úspěšné"
 msgid "Unregistration Failed"
 msgstr "Zrušení registrace selhalo"
 
-msgid "Already Registered"
-msgstr "Již zaregistrován"
-
 msgid "State"
 msgstr "Stát"
 
@@ -4071,6 +4081,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Již zaregistrován"
+
 msgid "Unregister"
 msgstr "Zrušit registraci"
 
@@ -4122,6 +4135,12 @@ msgstr "Server nepodporuje blokování"
 msgid "Not Authorized"
 msgstr "Neautorizován"
 
+msgid "Mood"
+msgstr "Nálada"
+
+msgid "Now Listening"
+msgstr "teď poslouchá"
+
 msgid "Both"
 msgstr "Obojí"
 
@@ -4143,12 +4162,6 @@ msgstr "Žádné"
 msgid "Subscription"
 msgstr "Přihlášení"
 
-msgid "Mood"
-msgstr "Nálada"
-
-msgid "Now Listening"
-msgstr "teď poslouchá"
-
 msgid "Mood Text"
 msgstr "Text nálady"
 
@@ -4191,9 +4204,6 @@ msgstr "Vaše heslo bylo změněno."
 msgid "Error changing password"
 msgstr "Chyba při změně hesla"
 
-msgid "Password (again)"
-msgstr "Heslo (znovu)"
-
 msgid "Change XMPP Password"
 msgstr "Změnit heslo XMPP"
 
@@ -4387,16 +4397,24 @@ msgid "Unable to ping user %s"
 msgstr "Nemohu pingnout uživatele %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "Nemohu budit, protože není nic známo o uživateli %s."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Nemohu budit, protože není nic známo o %s."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "Nemohu budit, protože  uživatel %s je asi odpojen."
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Nemohu budit, protože %s je asi odpojen."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Nemohu vzbudit, protože uživatel %s to nepodporuje."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"Nemohu vzbudit, protože %s to nepodporuje nebo si buzení teď nepřeje "
+"dostávat."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Buzení %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4408,8 +4426,32 @@ msgid "%s has buzzed you!"
 msgstr "%s vás budí!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Buzení %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Nemohu inicializovat multimédia s %s: neplatné JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Nemohu inicializovat multimédia s %s: uživatel není online"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Nemohu inicializovat multimédia s %s: nepřihlášen k přítomnosti uživatele"
+
+msgid "Media Initiation Failed"
+msgstr "Selhala inicializace multimédia"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Zvolte prosím zdroj %s s kterým chcete začít multimediální sezení."
+
+msgid "Select a Resource"
+msgstr "Zvolte zdroj"
+
+msgid "Initiate Media"
+msgstr "Inicializovat multimédia"
 
 msgid "config:  Configure a chat room."
 msgstr "config: Nastavit místnost chatu."
@@ -4430,18 +4472,18 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;uživatel&gt; [důvod]: Zakázat uživateli přístup do místnosti."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;uživatel&gt; &lt;owner|admin|member|outcast|none&gt;: Nastavit "
-"uživatelův vztah k místnosti."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: "
+"Získat uživatele se vytahem nebo nastavit uživatelův vztah k místnosti."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;uživatel&gt; &lt;moderator|participant|visitor|none&gt;: Nastavit "
-"uživatelovu roli v místnosti."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Získat "
+"uživatelovu roli nebo nastavit uživatelovu roli v místnosti."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;uživatel&gt; [zpráva]: Pozvat uživatele do místnosti."
@@ -4503,6 +4545,9 @@ msgstr "Server spojení"
 msgid "File transfer proxies"
 msgstr "Proxy přenosu souborů"
 
+msgid "BOSH URL"
+msgstr "BOSH URL"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4541,6 +4586,14 @@ msgstr "Chyba zpracování XML"
 msgid "Unknown Error in presence"
 msgstr "Neznámá chyba v přítomnosti"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Chyba při připojování k chatu %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Chyba v chatu %s"
+
 msgid "Create New Room"
 msgstr "Vytvořit novou místnost"
 
@@ -4557,13 +4610,28 @@ msgstr "_Nastavit místnost"
 msgid "_Accept Defaults"
 msgstr "_Přijmout implicitní"
 
+msgid "No reason"
+msgstr "Žádný důvod"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Chyba při připojování k chatu %s"
+msgid "You have been kicked: (%s)"
+msgstr "Byl jste vykopnut: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Chyba v chatu %s"
+msgid "Kicked (%s)"
+msgstr "Vykopnut (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Chyba při in-band bytestream přenosu\n"
+
+msgid "Transfer was closed."
+msgstr "Přenos byl ukončen."
+
+msgid "Failed to open the file"
+msgstr "Nemohu otevřít soubor"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Selhalo otevření in-band bytestreamu"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4588,9 +4656,6 @@ msgstr "Nemohu odeslat soubor %s, nepřihlášen k přítomnosti uživatele"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Zvolte prosím zdroj %s, kterému chcete odeslat soubor"
 
-msgid "Select a Resource"
-msgstr "Zvolte zdroj"
-
 msgid "Edit User Mood"
 msgstr "Upravit náladu uživatele"
 
@@ -4886,6 +4951,26 @@ msgstr "Jiné kontakty"
 msgid "Non-IM Contacts"
 msgstr "Ne-IM kontakty"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s poslal mrknutí. <a href='msn-wink://%s'>Tady si ho přehrajte</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s poslal mrknutí, ale to nemohlo být uloženo"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s poslal hlasový klip. <a href='audio://%s'>Tady si ho přehrajte</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s vám poslal zvukový klip, ale ten nemůže být uložen"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s vám poslal pozvánku k hlasovému chatu, který není podporováno."
+
 msgid "Nudge"
 msgstr "Šťouchnutí"
 
@@ -5038,8 +5123,28 @@ msgstr ""
 "Pro MSN je potřeba podpora SSL. Nainstalujte prosím podporovanou knihovnu "
 "SSL."
 
-msgid "Failed to connect to server."
-msgstr "Nemohu se připojit k serveru."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Nemohu přidat kamaráda %s, protože jméno uživatele není platné. Jméno "
+"uživatele musí být platná emailová adresa."
+
+msgid "Unable to Add"
+msgstr "Nemohu přidat"
+
+msgid "Authorization Request Message:"
+msgstr "Zpráva požadavku na autorizaci"
+
+msgid "Please authorize me!"
+msgstr "Autorizujte mě prosím!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Budiž"
 
 msgid "Error retrieving profile"
 msgstr "Chyba při získávání profilu"
@@ -5229,63 +5334,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID autentizace: Neplatná odpověď"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s není platná skupina."
-
-msgid "Unknown error."
-msgstr "Neznámá chyba."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vám právě poslal šťouchnutí!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Neznámá chyba (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Neznámá chyba (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Nemohu přidat uživatele"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Následující uživatelé chybí v adresáři"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nemohu přidat uživatele do %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nemohu zablokovat uživatele na %s (%s)"
-
+#. Unknown error!
 #, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nemohu povolit uživatele na %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nelze přidat, protože váš seznam kamarádů je plný."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s není platný účet passport."
+msgid "Unknown error (%d)"
+msgstr "Neznámá chyba (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Služba dočasně není k dispozici."
+msgid "The following users are missing from your addressbook"
+msgstr "Následující uživatelé chybí v adresáři"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Zpráva na mobil nebyla odeslána, protože byla příliš dlouhá."
 
-msgid "Unable to rename group"
-msgstr "Nemohu přejmenovat skupinu"
-
-msgid "Unable to delete group"
-msgstr "Nemohu odstranit skupinu"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5333,9 +5402,6 @@ msgstr "Zpráva možná nebyla odeslána, protože došlo k neznámé chybě kó
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Zpráva možná nebyla odeslána, protože došlo k neznámé chybě."
 
-msgid "Unable to connect"
-msgstr "Nemohu se připojit"
-
 msgid "Writing error"
 msgstr "Chyba zápisu"
 
@@ -5350,21 +5416,21 @@ msgstr ""
 "Chyba spojení od serveru %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Server nepodporuje náš protokol."
+msgid "Our protocol is not supported by the server"
+msgstr "Server nepodporuje náš protokol"
 
-msgid "Error parsing HTTP."
-msgstr "Chyba při zpracovávání HTTP."
+msgid "Error parsing HTTP"
+msgstr "Chyba při zpracovávání HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Přihlásili jste se z jiného umístění."
+msgid "You have signed on from another location"
+msgstr "Přihlásili jste se z jiného umístění"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Servery MSN dočasně nejsou dostupné. Počkejte prosím a zkuste to znovu."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "Servery MSN se dočasně vypínají."
+msgid "The MSN servers are going down temporarily"
+msgstr "Servery MSN se dočasně vypínají"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5394,6 +5460,15 @@ msgstr "Odesílám cookie"
 msgid "Retrieving buddy list"
 msgstr "Získávám seznam kamarádů"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s vám poslal požadavek k zobrazení kamery, což ještě není podporováno."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s vám poslal pozvánku k WWW kameře, což ještě není podporováno."
+
 msgid "Away From Computer"
 msgstr "Pryč od počítače"
 
@@ -5432,14 +5507,6 @@ msgstr "Zprávu nelze odeslat, protože došlo k chybě s ústřednou:"
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Zpráva možná nebyla odeslána, protože došlo k neznámé chybě:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s vás přidal do svého seznamu kamarádů."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s vás odstranil ze svého seznamu kamarádů."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Smazat kamaráda z adresáře?"
 
@@ -5469,6 +5536,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Zásuvný modul protokolu MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s není platná skupina."
+
+msgid "Unknown error."
+msgstr "Neznámá chyba."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nemohu přidat uživatele do %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nemohu zablokovat uživatele na %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nemohu povolit uživatele na %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nelze přidat, protože váš seznam kamarádů je plný."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s není platný účet passport."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Služba dočasně není k dispozici."
+
+msgid "Unable to rename group"
+msgstr "Nemohu přejmenovat skupinu"
+
+msgid "Unable to delete group"
+msgstr "Nemohu odstranit skupinu"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s vás přidal do svého seznamu kamarádů."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s vás odstranil ze svého seznamu kamarádů."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Takový uživatel neexistuje: %s"
 
@@ -5497,6 +5612,8 @@ msgid "Lost connection with server"
 msgstr "Ztraceno spojení se serverem"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Zprávy o nové poště"
 
@@ -5538,26 +5655,22 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Přidat kontakty ze serveru"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Připojen"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Chyba protokolu, kód %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s vaše heslo má %d znaků, což je více než maximum %d pro MySpaceIM. Prosím "
-"zkraťte vaše heslo na http://profileedit.myspace.com/index.cfm?"
-"fuseaction=accountSettings. Změnte heslo a zkuste znovu."
+"%s vaše heslo je %zu znaků, což je více než maximum %d. Prosím zkraťte vaše "
+"heslo na http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
+"changePassword a zkuste znovu."
+
+msgid "Incorrect username or password"
+msgstr "Nesprávné jméno uživatele nebo heslo"
 
 msgid "MySpaceIM Error"
 msgstr "Chyba MySpaceIM"
@@ -5565,16 +5678,6 @@ msgstr "Chyba MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Neplatný stav vstupu"
 
-msgid "Read buffer full (2)"
-msgstr "Vyrovnávací paměť čtení plná (2)"
-
-msgid "Unparseable message"
-msgstr "Nezpracovatelná zpráva"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Nemohu se připojit k počítači: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Nemohu přidat kamaráda"
 
@@ -5659,6 +5762,15 @@ msgstr "Celkem Přátelé"
 msgid "Client Version"
 msgstr "Verze klienta"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Chyba při pokusu nastavit uživatelské jméno. Zkuste to znovu nebo jděte na "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username a "
+"nastavte jméno uživatele."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - jméno uživatele dostupné"
 
@@ -5876,9 +5988,6 @@ msgstr "Nemohu vás přidat"
 msgid "Master archive is misconfigured"
 msgstr "Hlavní archiv není správně nastaven"
 
-msgid "Incorrect username or password"
-msgstr "Nesprávné jméno uživatele nebo heslo"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nemohu rozpoznat počítač ve jménu uživatele, které jste zadali"
 
@@ -5919,8 +6028,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Neznámá chyba: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Přihlášení selhalo (%s)."
+msgid "Unable to login: %s"
+msgstr "Nemohu se přihlásit: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6022,9 +6131,6 @@ msgstr "Konference GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-msgid "Unable to connect to server."
-msgstr "Nemohu se připojit k serveru."
-
 msgid "Waiting for response..."
 msgstr "Čekám na odpověď..."
 
@@ -6048,25 +6154,18 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Chcete se připojit k této konverzaci?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Byli jste odhlášeni, protože jste se přihlásili u jiné pracovní stanice."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s je zřejmě odpojen a nedostal zprávu, kterou jste právě odeslali."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Nemohu se připojit k serveru. Zadejte prosím adresu serveru, ke kterému se "
 "chcete připojit."
 
-msgid "Error. SSL support is not installed."
-msgstr "Chyba. Není nainstalována podpora SSL."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tato konference byla uzavřena. Nelze tam posílat další zprávy."
 
@@ -6089,25 +6188,32 @@ msgstr "Adresa serveru"
 msgid "Server port"
 msgstr "Port serveru"
 
+msgid "Received unexpected response from "
+msgstr "Přijata neočekávaná odpověď od"
+
+#. username connecting too frequently
+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 ""
+"Připojovali a odpojovali jste se příliš často. Počkejte deset minut a zkuste "
+"to znovu. Pokud to budete dále zkouše, budete muset čekat ještě déle."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Chyba žádosti"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL neumožňuje ověřit jméno tady"
+
 msgid "Could not join chat room"
 msgstr "Nemohu se připojit k chatu"
 
 msgid "Invalid chat room name"
 msgstr "Neplatný název místnosti"
 
-msgid "Server closed the connection."
-msgstr "Server zavřel spojení."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Ztraceno spojení se serverem:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Na spojení se serverem přijata neplatná data."
+msgid "Received invalid data on connection with server"
+msgstr "Na spojení se serverem přijata neplatná data"
 
 #. *< type
 #. *< ui_requirement
@@ -6154,7 +6260,7 @@ msgstr "Ztraceno spojení se vzdáleným uživatelem:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Při spojení se vzdáleným uživatelem přijata neplatná data."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Nemohu navázat spojení se vzdáleným uživatelem."
 
 msgid "Direct IM established"
@@ -6354,20 +6460,12 @@ msgid "Buddy Comment"
 msgstr "Poznámka o kamarádovi"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Nemohu se připojit k autentizačnímu serveru:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Nemohu se připojit k autentizačnímu serveru: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Nemohu se připojit k serveru BOS:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nemohu se připojit k BOS serveru: %s"
 
 msgid "Username sent"
 msgstr "Jméno uživatele posláno"
@@ -6381,53 +6479,58 @@ msgstr "Dokončuji spojení"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Nemohu se přihlásit: Nemohu se přihlásit jako %s, protože jméno uživatele "
-"není platné. Jméno uživatele musí být platná emailová adresa nebo začínat "
-"písmenem a obsahovat jen číslice, písmena a mezery, nebo obsahovat jen "
-"číslice."
+"Nemohu se přihlásit jako %s, protože jméno uživatele není platné. Jméno "
+"uživatele musí být platná emailová adresa nebo začínat písmenem a obsahovat "
+"jen číslice, písmena a mezery, nebo obsahovat jen číslice."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Neplatné jméno uživatele."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Možná budete brzo odpojen. Jestliže se tak stane, hledejte aktualizace na %s."
 
-msgid "Incorrect password."
-msgstr "Nesprávné heslo."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nemohu získat platný přihlašovací hash AIM."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nemohu získat platný přihlašovací hash."
+
+msgid "Received authorization"
+msgstr "Přijata autorizace"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Uživatel neexistuje"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Váš účet je momentálně suspendován."
+msgid "Your account is currently suspended"
+msgstr "Váš účet je momentálně suspendován"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Služba AOL Instant Messenger je dočasně nedostupná."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Připojovali a odpojovali jste se příliš často. Počkejte deset minut a zkuste "
-"to znovu. Pokud to budete dále zkouše, budete muset čekat ještě déle."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Verze klienta, kterou používáte, je příliš stará. Aktualizujte prosím na %s"
 
-msgid "Could Not Connect"
-msgstr "Nemohu se připojit"
-
-msgid "Received authorization"
-msgstr "Přijata autorizace"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Připojovali a odpojovali jste se příliš často. Počkejte minutu a zkuste to "
+"znovu. Pokud to budete dále zkoušet, budete muset čekat ještě déle."
 
-msgid "The SecurID key entered is invalid."
-msgstr "Zadaný klíč SecurID není platný."
+msgid "The SecurID key entered is invalid"
+msgstr "Zadaný klíč SecurID není platný"
 
 msgid "Enter SecurID"
 msgstr "Zadejte SecurID"
@@ -6435,27 +6538,6 @@ msgstr "Zadejte SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Zadejte šesticiferné číslo z digitálního displeje."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_Budiž"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Možná budete brzo odpojen. Jestliže se tak stane, hledejte aktualizace na %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Nemohu získat platný přihlašovací hash AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Možná budete brzo odpojen. Hledejte aktualizace na %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Nemohu získat platný přihlašovací hash."
-
 msgid "Password sent"
 msgstr "Heslo odesláno"
 
@@ -6466,12 +6548,6 @@ msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Autorizujte mě prosím, abych vás mohl přidat do svého seznamu kamarádů."
 
-msgid "Authorization Request Message:"
-msgstr "Zpráva požadavku na autorizaci"
-
-msgid "Please authorize me!"
-msgstr "Autorizujte mě prosím!"
-
 msgid "No reason given."
 msgstr "Neudán žádný důvod."
 
@@ -6608,7 +6684,7 @@ msgstr[0] "Přišli jste o %hu zprávu od %s z neznámého důvodu."
 msgstr[1] "Přišli jste o %hu zprávy od %s z neznámého důvodu."
 msgstr[2] "Přišli jste o %hu zpráv od %s z neznámého důvodu."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Nemohu odeslat zprávu: %s"
@@ -6630,6 +6706,9 @@ msgstr "Odpojen od"
 msgid "Member Since"
 msgstr "Člen od"
 
+msgid "Capabilities"
+msgstr "Schopnosti"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -6817,7 +6896,7 @@ msgstr "Zpráva o nepřítomnosti příliš dlouhá."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6825,9 +6904,6 @@ msgstr ""
 "uživatele musí být platná emailová adresa, nebo začínat písmenem a obsahovat "
 "jen číslice, písmena a mezery, nebo obsahovat jen číslice."
 
-msgid "Unable to Add"
-msgstr "Nemohu přidat"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Nemohu získat seznam kamarádů"
 
@@ -6843,7 +6919,7 @@ msgstr "Sirotci"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Nemohu přidat kamaráda %s, protože ve svém seznamu máte příliš mnoho "
@@ -6853,7 +6929,7 @@ msgid "(no name)"
 msgstr "(žádné jméno)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Nemohu přidat kamaráda %s z neznámého důvodu."
 
 #, c-format
@@ -6982,6 +7058,7 @@ msgstr "_Hledat"
 msgid "Set User Info (web)..."
 msgstr "Nastavit informace o uživateli (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Změnit heslo (web)"
 
@@ -7011,6 +7088,9 @@ msgstr "Hledat kamaráda podle emailové adresy..."
 msgid "Search for Buddy by Information"
 msgstr "Hledat kamaráda podle informací"
 
+msgid "Use clientLogin"
+msgstr "Použít clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7200,6 +7280,34 @@ msgstr "Update"
 msgid "Could not change buddy information."
 msgstr "Nemohu změnit informace o kamarádovi."
 
+msgid "Mobile"
+msgstr "Mobilní"
+
+msgid "Note"
+msgstr "Poznámka"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Poznámka kamaráda"
+
+msgid "Change his/her memo as you like"
+msgstr "Změňte jeho/její poznámku podle sebe"
+
+msgid "_Modify"
+msgstr "_Změnit"
+
+msgid "Memo Modify"
+msgstr "Úprava poznámky"
+
+msgid "Server says:"
+msgstr "Server říká:"
+
+msgid "Your request was accepted."
+msgstr "Požadavek byl přijat."
+
+msgid "Your request was rejected."
+msgstr "Požadavek byl odmítnut."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u vyžaduje ověření"
@@ -7508,6 +7616,12 @@ msgstr "<p><b>Autoři patchů</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Potvrzení</b>:<br>\n"
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Svědomitý testeři</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "a další, prosím dejte mi vědět... děkuji!))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>A všichni v pozadí...</i><br>\n"
 
@@ -7533,6 +7647,9 @@ msgstr "Updatovat všechny QQ Qun"
 msgid "About OpenQ"
 msgstr "O OpenQ"
 
+msgid "Modify Buddy Memo"
+msgstr "Změnit poznámku kamaráda"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7579,7 +7696,7 @@ msgstr "Interval udržování naživu (v sekundách)"
 msgid "Update interval (seconds)"
 msgstr "Interval updatu (v sekundách)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Nemohu dešifrovat odpověď serveru"
 
 #, c-format
@@ -7604,9 +7721,6 @@ msgstr "Je vyžadována aktivace"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Neznámý kód odpovědi při přihlašování 0x%02X"
 
-msgid "Could not decrypt server reply"
-msgstr "Nemohu dešifrovat odpověď serveru"
-
 msgid "Requesting captcha"
 msgstr "Vyžaduji captcha"
 
@@ -7640,30 +7754,17 @@ msgstr ""
 "Neznámý kód odpovědi, při přihlášení (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Nemohu se připojit."
-
 msgid "Socket error"
 msgstr "Chyba socketu"
 
-msgid "Unable to read from socket"
-msgstr "Nemohu číst ze socketu"
-
-msgid "Write Error"
-msgstr "Chyba při zápisu"
-
-msgid "Connection lost"
-msgstr "Spojení ztraceno"
-
 msgid "Getting server"
 msgstr "Získávám server"
 
 msgid "Requesting token"
 msgstr "Požadavek symbolu"
 
-msgid "Couldn't resolve host"
-msgstr "Nemohu najít počítač"
+msgid "Unable to resolve hostname"
+msgstr "Nemohu vyřešit jméno hosta"
 
 msgid "Invalid server or port"
 msgstr "Neplatný server nebo port"
@@ -7716,7 +7817,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun příkaz"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Nemohu dešifrovat přihlašovací odpověď"
 
 msgid "Unknown LOGIN CMD"
@@ -7736,9 +7837,6 @@ msgstr "Odeslání souboru"
 msgid "%d canceled the transfer of %s"
 msgstr "%d zrušil přenos %s"
 
-msgid "Connection closed (writing)"
-msgstr "Spojení uzavřeno (zápis)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Název skupiny:</b> %s<br>"
@@ -7792,17 +7890,6 @@ msgstr "Správce Sametime vydal na serveru %s následující oznámení"
 msgid "Sametime Administrator Announcement"
 msgstr "Oznámení správce Sametime"
 
-msgid "Connection reset"
-msgstr "Spojení přerušeno"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Chyba při čtení ze socketu: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Nemohu se připojit k počítači"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznámení od %s"
@@ -7825,6 +7912,9 @@ msgstr "Reproduktory"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Přenos souborů"
+
 msgid "Supports"
 msgstr "Podporuje"
 
@@ -8542,9 +8632,6 @@ msgstr "Organizace"
 msgid "Unit"
 msgstr "Jednotka"
 
-msgid "Note"
-msgstr "Poznámka"
-
 msgid "Join Chat"
 msgstr "Připojit se k chatu"
 
@@ -8644,6 +8731,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistika o síti"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping selhal"
 
@@ -8707,7 +8797,7 @@ msgstr "Nepodporovaný typ veřejného klíče"
 msgid "Disconnected by server"
 msgstr "Odpojen serverem"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Chyba při připojování se k serveru SILC"
 
 msgid "Key Exchange failed"
@@ -8719,16 +8809,10 @@ msgstr ""
 "Obnova odpojeného sezení selhala. Vytvořte nové spojení stisknutím Znovu se "
 "připojit"
 
-msgid "Connection failed"
-msgstr "Spojení selhalo"
-
 msgid "Performing key exchange"
 msgstr "Provádím výměnu klíčů"
 
-msgid "Unable to create connection"
-msgstr "Nemohu vytvořit spojení"
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Nemohu načíst pár klíčů SILC"
 
 #. Progress
@@ -8738,7 +8822,7 @@ msgstr "Připojuji se k serveru SILC"
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Nemohu inicializovat protokol SILC"
 
 msgid "Error loading SILC key pair"
@@ -9032,8 +9116,8 @@ msgstr "Digitálně podepisovat a ověřovat všechny zprávy"
 msgid "Creating SILC key pair..."
 msgstr "Vytvářím pár klíčů SILC..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Nemohu vytvořit pár klíčů SILC\n"
+msgid "Unable to create SILC key pair"
+msgstr "Nemohu vytvořit pár klíčů SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9126,6 +9210,9 @@ msgstr "Tabule"
 msgid "No server statistics available"
 msgstr "Statistika o serveru není k dispozici"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Chyba při připojování se k serveru SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Chyba: Verze nesouhlasí, aktualizujte vašeho klienta"
@@ -9166,30 +9253,24 @@ msgstr "Chyba: Neplatný cookie"
 msgid "Failure: Authentication failed"
 msgstr "Chyba: Autentizace selhala"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "Nemohu inicializovat připojení klienta SILC"
 
 msgid "John Noname"
 msgstr "Jan Anonym"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nemohu načíst pár klíčů SILC: %s"
 
-msgid "Could not write"
-msgstr "Nemohu zapisovat"
-
-msgid "Could not connect"
-msgstr "Nemohu se připojit"
-
-msgid "Unknown server response."
-msgstr "Neznámá odpověď serveru."
+msgid "Unable to create connection"
+msgstr "Nemohu vytvořit spojení"
 
-msgid "Could not create listen socket"
-msgstr "Nemohu vytvořit socket pro poslouchání"
+msgid "Unknown server response"
+msgstr "Neznámá odpověď serveru"
 
-msgid "Could not resolve hostname"
-msgstr "Nemohu přeložit název počítače"
+msgid "Unable to create listen socket"
+msgstr "Nemohu vytvořit naslouchací socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Jména uživatelů SIP nemohou obsahovat mezery ani symboly @"
@@ -9230,176 +9311,60 @@ msgstr "Uživatel pro autentizaci"
 msgid "Auth Domain"
 msgstr "Doména autentizace"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Vyhledávám %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Spojení k %s selhalo"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Přihlásit: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Nemohu zapsat soubor %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Nemohu číst soubor %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Zpráva příliš dlouhá, posledních %s bajtů useknuto."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s není momentálně přihlášen."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Varování %s není povoleno."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Zpráva byla zahozena, překračujete limit rychlosti serveru."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat v %s není dostupný."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Odesíláte zprávy pro %s příliš rychle."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Přišli jste IM od %s, protože byla příliš dlouhá."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Přišli jste o IM %s, protože byla odeslána příliš rychle."
-
-#, c-format
-msgid "Failure."
-msgstr "Selhání."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Příliš mnoho odpovědí."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Potřebuji více kvalifikátorů."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Adresářová služba momentálně není k dispozici."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Vyhledávání podle emailu omezeno."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Klíčové slovo ignorováno."
-
-#, c-format
-msgid "No keywords."
-msgstr "Žádné klíčové slovo."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Uživatel nemá žádné informace v adresáři."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Země není podporována."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Neznámé selhání: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Nesprávné jméno uživatele nebo heslo."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Služba je dočasně nedostupná."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Vaše úroveň výstrahy je momentálně příliš vysoká pro přihlášení."
-
-#, c-format
-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 ""
-"Připojovali a odpojovali jste se příliš často. Počkejte deset minut a zkuste "
-"to znovu. Pokud to budete dále zkoušet, budete muset čekat ještě déle."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Došlo k neznámé chybě při přihlašování: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Došlo k neznámé chybě, %d. Informace: %s"
-
-msgid "Invalid Groupname"
-msgstr "Neplatný název skupiny"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;místnost&gt;:  Připojit se k místnosti chatu v síti Yahoo"
 
-msgid "Connection Closed"
-msgstr "Spojení uzavřeno"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Vypsat místnosti v síti Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Čekám na odpověď..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Požádat uživatele, aby začal sezení kreslení"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC se vrátil z přestávky. Nyní můžete zase odesílat zprávy."
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
 
-msgid "Password Change Successful"
-msgstr "Změna hesla úspěšná"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Zásuvný modul protokolu Yahoo!"
 
-msgid "_Group:"
-msgstr "_Skupina:"
+msgid "Pager server"
+msgstr "Server pageru"
 
-msgid "Get Dir Info"
-msgstr "Získat informace adresáře"
+msgid "Pager port"
+msgstr "Port pageru"
 
-msgid "Set Dir Info"
-msgstr "Nastavit informace adresáře"
+msgid "File transfer server"
+msgstr "Server přenosu souborů"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Nemohu otevřít %s pro zápis!"
+msgid "File transfer port"
+msgstr "Port přenosu souborů"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Přenos souboru selhal; druhá strana jej pravděpodobně přerušila."
+msgid "Chat room locale"
+msgstr "Locale místnosti chatu"
 
-msgid "Could not connect for transfer."
-msgstr "Nemohu se připojit pro přenos."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorovat pozvání do konferencí a místností chatu"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Nemohu zapsat hlavičku souboru. Soubor nebude přenesen."
+msgid "Chat room list URL"
+msgstr "URL seznamu místností chatu"
 
-msgid "Save As..."
-msgstr "Uložit jako..."
+msgid "Yahoo Chat server"
+msgstr "Server Yahoo Chat"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s požaduje, aby %s přijal %d soubor: %s (%.2f %s)%s%s"
-msgstr[1] "%s požaduje, aby %s přijal %d soubory: %s (%.2f %s)%s%s"
-msgstr[2] "%s požaduje, aby %s přijal %d souborů: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Port Yahoo Chat"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s vás žádá, abyste jim poslali soubor"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9411,12 +9376,11 @@ msgstr "%s vás žádá, abyste jim poslali soubor"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Zásuvný modul protokolu TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Zásuvný modul protokolu Yahoo! JAPAN"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s vám poslal pozvánku k WWW kameře, což ještě není podporováno."
+msgid "Your SMS was not delivered"
+msgstr "Vaše SMS nebyla doručena"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaše zpráva Yahoo! nebyla odeslána."
@@ -9441,6 +9405,29 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Přidání kamaráda zamítnuto"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Přijata neplatná data"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Účet uzamčen: Příliš mnoho pokusů o přihlášení. Přihlášení na Yahoo! stránku "
+"to může vyřešit."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Účet uzamčen: Neznámý důvod. Přihlášení na Yahoo! stránku to může vyřešit."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Chybí jméno uživatele nebo heslo"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9472,37 +9459,26 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Neznámá chyba číslo %d. Přihlášení se na WWW Yahoo! to možná opraví."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Nemohu přidat kamaráda %s do skupiny %s do seznamu serveru na účtu %s."
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "Nemohu přidat kamaráda do seznamu na serveru"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Slyšitelné %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Přijata neočekávaná odpověď HTTP od serveru."
-
-msgid "Connection problem"
-msgstr "Problém se spojením"
+msgid "Received unexpected HTTP response from server"
+msgstr "Přijata neočekávaná odpověď HTTP od serveru"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Ztraceno spojení s %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Ztraceno spojení s %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Nemohu navázat spojení s %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Nemohu navázat spojení s %s: %s"
 
 msgid "Not at Home"
 msgstr "Nejsem doma"
@@ -9549,8 +9525,8 @@ msgstr "Nastavení přítomnosti"
 msgid "Start Doodling"
 msgstr "Začít kreslit"
 
-msgid "Activate which ID?"
-msgstr "Které ID aktivovat?"
+msgid "Select the ID you want to activate"
+msgstr "Vyberte ID, které chcete aktivovat"
 
 msgid "Join whom in chat?"
 msgstr "Připojit koho k chatu?"
@@ -9564,73 +9540,15 @@ msgstr "Připojit se k uživateli v chatu..."
 msgid "Open Inbox"
 msgstr "Otevřít Příchozí poštu"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;místnost&gt;:  Připojit se k místnosti chatu v síti Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Vypsat místnosti v síti Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Požádat uživatele, aby začal sezení kreslení"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Zásuvný modul protokolu Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonsko"
-
-msgid "Pager server"
-msgstr "Server pageru"
-
-msgid "Japan Pager server"
-msgstr "Server pageru v Japonsku"
-
-msgid "Pager port"
-msgstr "Port pageru"
-
-msgid "File transfer server"
-msgstr "Server přenosu souborů"
-
-msgid "Japan file transfer server"
-msgstr "Server přenosu souborů v Japonsku"
-
-msgid "File transfer port"
-msgstr "Port přenosu souborů"
-
-msgid "Chat room locale"
-msgstr "Locale místnosti chatu"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorovat pozvání do konferencí a místností chatu"
-
-msgid "Chat room list URL"
-msgstr "URL seznamu místností chatu"
-
-msgid "Yahoo Chat server"
-msgstr "Server Yahoo Chat"
-
-msgid "Yahoo Chat port"
-msgstr "Port Yahoo Chat"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Odeslán požadavek o kreslení."
 
+msgid "Unable to connect."
+msgstr "Nemohu se připojit."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nemohu získat deskriptor souboru."
 
@@ -9638,6 +9556,9 @@ msgstr "Nemohu získat deskriptor souboru."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s zkouší vám poslat %d souborů.\n"
 
+msgid "Write Error"
+msgstr "Chyba při zápisu"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonsko"
 
@@ -9708,12 +9629,8 @@ msgid "The user's profile is empty."
 msgstr "Profil uživatele je prázdný."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s odmítl vaše pozvání ke konferenci do místnosti \"%s\", protože \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Pozvání odmítnuto"
+msgid "%s has declined to join."
+msgstr "%s nepřijal připojení."
 
 msgid "Failed to join chat"
 msgstr "Nemohu se připojit k chatu"
@@ -9756,22 +9673,17 @@ msgstr "Hlasy"
 msgid "Webcams"
 msgstr "WWW kamery"
 
+msgid "Connection problem"
+msgstr "Problém se spojením"
+
 msgid "Unable to fetch room list."
 msgstr "Nemohu získat seznam místností."
 
 msgid "User Rooms"
 msgstr "Místnosti uživatele"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Problém se spojením k servery YCHT."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Ztraceno spojení se serverem\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Problém se spojením k serveru YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9902,32 +9814,21 @@ msgid "Exposure"
 msgstr "Vystavení"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Nemohu vytvořit socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Nemohu zpracovat odpověď od HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Nemohu zpracovat odpověď od HTTP proxy: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Chyba připojení k HTTP proxy %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Přístup odepřen: HTTP proxy server zakazuje tunelování portu %d."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "Přístup odepřen: HTTP proxy server zakazuje tunelování portu %d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Chyba při překladu %s"
 
-msgid "Could not resolve host name"
-msgstr "Nemohu přeložit název počítače"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Vyžaduji pozornost %s..."
@@ -10014,9 +9915,6 @@ msgstr "Nerušit"
 msgid "Extended away"
 msgstr "Pryč na dlouho"
 
-msgid "Mobile"
-msgstr "Mobilní"
-
 msgid "Listening to music"
 msgstr "Poslouchá muziku"
 
@@ -10058,18 +9956,6 @@ msgstr "+++ %s se stal činným"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Chyba při čtení %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Při čtení vašeho %s došlo k chybě. Nebylo načteno a starý soubor byl "
-"přejmenován na %s~."
-
 msgid "Calculating..."
 msgstr "Počítám..."
 
@@ -10183,6 +10069,18 @@ msgstr "Spojení odmítnuto."
 msgid "Address already in use."
 msgstr "Adresa se již používá"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Chyba při čtení %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Při čtení vašeho %s došlo k chybě. Nebyl načten a starý soubor byl "
+"přejmenován na %s~."
+
 msgid "Internet Messenger"
 msgstr "Internet Messenger"
 
@@ -10225,10 +10123,8 @@ msgstr "_Upozornění na nové zprávy"
 msgid "Use this buddy _icon for this account:"
 msgstr "Používat pro tento účet tuto _ikonu kamaráda:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Nastavení %s"
+msgid "Ad_vanced"
+msgstr "_Pokročilé"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Používat nastavení proxy v GNOME"
@@ -10264,9 +10160,6 @@ msgstr "Pokud se podíváte opravdu zblízka,"
 msgid "you can see the butterflies mating"
 msgstr "můžete vidět, jak se motýli párují"
 
-msgid "Proxy Options"
-msgstr "Možnosti proxy"
-
 msgid "Proxy _type:"
 msgstr "_Typ proxy:"
 
@@ -10294,8 +10187,8 @@ msgstr "Zá_kladní"
 msgid "Create _this new account on the server"
 msgstr "Vytvořit _tento nový účet na serveru"
 
-msgid "_Advanced"
-msgstr "_Pokročilé"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Povoleno"
@@ -10344,8 +10237,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Aktualizujte prosím potřebná pole."
 
-msgid "Room _List"
-msgstr "Seznam _místností"
+msgid "A_ccount"
+msgstr "Úč_et"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10354,8 +10247,8 @@ msgstr ""
 "Zadejte prosím odpovídající informace o chatu, ke kterému se chcete "
 "připojit.\n"
 
-msgid "_Account:"
-msgstr "_Účet:"
+msgid "Room _List"
+msgstr "Seznam _místností"
 
 msgid "_Block"
 msgstr "_Blokovat"
@@ -10373,6 +10266,15 @@ msgstr "_Info"
 msgid "I_M"
 msgstr "I_M"
 
+msgid "_Audio Call"
+msgstr "_Audio rozhovor"
+
+msgid "Audio/_Video Call"
+msgstr "Audio/_Video rozhovor"
+
+msgid "_Video Call"
+msgstr "_Video rozhovor"
+
 msgid "_Send File..."
 msgstr "_Odeslat soubor..."
 
@@ -10382,9 +10284,12 @@ msgstr "Přidat sledování _kamaráda..."
 msgid "View _Log"
 msgstr "Zobrazit záz_nam"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Skrýt při odpojení"
 
+msgid "Show When Offline"
+msgstr "Zobrazit při odpojení"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -10507,6 +10412,9 @@ msgstr "/Nástroje/_Sledování kamarádů"
 msgid "/Tools/_Certificates"
 msgstr "/Nástroje/_Certifikáty"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Nástroje/Uživatelské smajlíky"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Nástroje/_Zásuvné moduly"
 
@@ -10516,9 +10424,6 @@ msgstr "/Nástroje/_Nastavení"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Nástroje/_Soukromí"
 
-msgid "/Tools/Smile_y"
-msgstr "/Nástroje/Smajlíky"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Nástroje/_Přenosy souborů"
 
@@ -10637,8 +10542,8 @@ msgstr "Ručně"
 msgid "By status"
 msgstr "Podle stavu"
 
-msgid "By log size"
-msgstr "Podle velikosti záznamu"
+msgid "By recent log activity"
+msgstr "Podle nedávné aktivity záznamu"
 
 #, c-format
 msgid "%s disconnected"
@@ -10654,6 +10559,9 @@ msgstr "Znovu připojit"
 msgid "Re-enable"
 msgstr "Znovu povolit"
 
+msgid "SSL FAQs"
+msgstr "SSL FAQ"
+
 msgid "Welcome back!"
 msgstr "Vítej zpět!"
 
@@ -10741,6 +10649,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "_Alias:"
 
+msgid "_Group:"
+msgstr "_Skupina:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Automaticky _připojit při připojení účtu."
 
@@ -10774,6 +10685,101 @@ msgstr "/Nástroje"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kamarádi/Řadit kamarády"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Barva pozadí"
+
+msgid "The background color for the buddy list"
+msgstr "Barva pozadí seznamu kamarádů"
+
+msgid "Layout"
+msgstr "Rozvržení"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Rozvržení ikon, jmen a stavů na seznamu kamarádů"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Barva pozadí rozbaleného"
+
+msgid "The background color of an expanded group"
+msgstr "Barva pozadí rozbalené skupiny"
+
+msgid "Expanded Text"
+msgstr "Rozbalený text"
+
+msgid "The text information for when a group is expanded"
+msgstr "Text informace při rozbalení skupiny"
+
+msgid "Collapsed Background Color"
+msgstr "Barvu pozadí sbaleného"
+
+msgid "The background color of a collapsed group"
+msgstr "Barva pozadí sbalené skupiny"
+
+msgid "Collapsed Text"
+msgstr "Sbalený text"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Text informace při sbalení skupiny"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Barvu pozadí kontaktu/chatu"
+
+msgid "The background color of a contact or chat"
+msgstr "Barva pozadí kontaktu nebo chatu"
+
+msgid "Contact Text"
+msgstr "Text kontaktu"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Text informace při rozbalení kontaktu"
+
+msgid "On-line Text"
+msgstr "Text při přítomen"
+
+msgid "The text information for when a buddy is online"
+msgstr "Text informace, když je kamarád přítomen"
+
+msgid "Away Text"
+msgstr "Text pryč"
+
+msgid "The text information for when a buddy is away"
+msgstr "Text informace, když je kamarád pryč"
+
+msgid "Off-line Text"
+msgstr "Text pro odpojen"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Text informace, když je kamarád odpojen"
+
+msgid "Idle Text"
+msgstr "Text nečinnosti"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Text informace, když je kamarád nečinný"
+
+msgid "Message Text"
+msgstr "Text zprávy"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Text informace, když má kamarád nepřečtenou zprávu"
+
+msgid "Message (Nick Said) Text"
+msgstr "Text zprávy (uživatel jmenován)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr "Text informace, když je v chatu zpráva s tvojí přezdívkou"
+
+msgid "The text information for a buddy's status"
+msgstr "Text informace pro stav kamaráda"
+
+msgid "Type the host name for this certificate."
+msgstr "Zadejte jméno hostitele pro tento certifikát."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL servery"
@@ -10791,14 +10797,6 @@ msgstr "Nejste momentálně připojen s účtem, který může pozvat tohoto kam
 msgid "Invite Buddy Into Chat Room"
 msgstr "Pozvat kamaráda do místnosti chatu"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Zadejte prosím jméno uživatele, kterého chcete pozvat, a nepovinně i zvací "
-"zprávu."
-
 msgid "_Buddy:"
 msgstr "_Kamarád:"
 
@@ -10827,7 +10825,7 @@ msgstr "Ignorovat"
 msgid "Get Away Message"
 msgstr "Získat zprávu o nepřítomnosti"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Naposledy řečeno"
 
 msgid "Unable to save icon file to disk."
@@ -10873,6 +10871,18 @@ msgstr "/Konverzace/_Uložit jako..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Konverzace/Vy_mazat paměť řádků"
 
+msgid "/Conversation/M_edia"
+msgstr "/Konverzace/Multimé_dia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Konverzace/Multimédia/_Audio hovor"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Konverzace/Multimédia/_Video hovor"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Konverzace/Multimédia/Audio\\/Video _hovor"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konverzace/Odeslat _soubor..."
 
@@ -10945,6 +10955,15 @@ msgstr "/Konverzace"
 msgid "/Conversation/View Log"
 msgstr "/Konverzace/Zobrazit záznam"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Konverzace/Multimédia/Audio hovor"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Konverzace/Multimédia/Video hovor"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Konverzace/Multimédia\\/Video hovor"
+
 msgid "/Conversation/Send File..."
 msgstr "/Konverzace/Odeslat soubor..."
 
@@ -11128,6 +11147,9 @@ msgstr "umělec"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "hlas a video"
+
 msgid "support"
 msgstr "podpora"
 
@@ -11252,6 +11274,9 @@ msgstr "Hindština"
 msgid "Hungarian"
 msgstr "Maďarština"
 
+msgid "Armenian"
+msgstr "Arménština"
+
 msgid "Indonesian"
 msgstr "Indonéština"
 
@@ -11267,6 +11292,9 @@ msgstr "Gruzínština"
 msgid "Ubuntu Georgian Translators"
 msgstr "Překladatelé Gruzínštiny z Ubuntu"
 
+msgid "Khmer"
+msgstr "Khmérština"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11345,6 +11373,9 @@ msgstr "Sinhálština"
 msgid "Swedish"
 msgstr "Švédština"
 
+msgid "Swahili"
+msgstr "Svahilština"
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11677,7 +11708,7 @@ msgstr "Barva, kterou kreslit odkazy."
 msgid "Hyperlink visited color"
 msgstr "Barva navštívených odkazů"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Barva, kterou kreslit odkazy, když jsou navštíveny (nebo aktivovány)."
 
 msgid "Hyperlink prelight color"
@@ -11713,13 +11744,19 @@ msgstr "Barva akční zprávy."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Barva akční zprávy pro šeptané zprávy"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Barva šeptané akční zprávy."
+
 msgid "Whisper Message Name Color"
 msgstr "Barva šeptané zprávy"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Barva šeptané zprávy."
+
 msgid "Typing notification color"
 msgstr "Barva pro upozornění na psaní"
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr "Barva pro upozornění na psaní"
 
 msgid "Typing notification font"
@@ -11731,15 +11768,6 @@ msgstr "Font pro upozornění na psaní"
 msgid "Enable typing notification"
 msgstr "Povolit upozornění na psaní"
 
-msgid "_Copy Email Address"
-msgstr "_Kopírovat emailovou adresu"
-
-msgid "_Open Link in Browser"
-msgstr "_Otevřít odkaz v prohlížeči"
-
-msgid "_Copy Link Location"
-msgstr "_Kopírovat adresu odkazu"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11781,11 +11809,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Uložit obrázek"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Uložit obrázek..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Přidat uživatelské smajlíky..."
 
@@ -11874,9 +11900,6 @@ msgstr "Zmenšit velikost písma"
 msgid "Font Face"
 msgstr "Řez písma"
 
-msgid "Background Color"
-msgstr "Barva pozadí"
-
 msgid "Foreground Color"
 msgstr "Barva popředí"
 
@@ -11991,6 +12014,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12005,6 +12029,7 @@ msgstr ""
 "\n"
 "  -c, --config=ADRESÁŘ používat ADRESÁŘ pro soubory s nastavením\n"
 "  -d, --debug          vypisovat ladicí zprávy na stdout\n"
+"  -f, --force-online vynutit stav online, bez ohledu na status\n"
 "  -h, --help           zobrazit tuto nápovědu a skončit\n"
 "  -m, --multiple       nezajišťovat jedinou instanci\n"
 "  -n, --nologin        nepřihlašovat se automaticky\n"
@@ -12021,6 +12046,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12034,6 +12060,7 @@ msgstr ""
 "\n"
 "  -c, --config=ADRESÁŘ používat ADRESÁŘ pro soubory s nastavením\n"
 "  -d, --debug          vypisovat ladicí zprávy na stdout\n"
+"  -f, --force-online vynutit stav online, bez ohledu na status\n"
 "  -h, --help           zobrazit tuto nápovědu a skončit\n"
 "  -m, --multiple       nezajišťovat jedinou instanci\n"
 "  -n, --nologin        nepřihlašovat se automaticky\n"
@@ -12079,11 +12106,22 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Exiting because another libpurple client is already running.\n"
 
-msgid "Open All Messages"
-msgstr "Otevřít všechny zprávy"
+msgid "/_Media"
+msgstr "/_Multimédia"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>"
+msgid "/Media/_Hangup"
+msgstr "/Multimédia/_Zavěsit"
+
+msgid "Calling..."
+msgstr "Volání..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s chce začít audio/video rozhovor s tebou."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s chce začít video rozhovor s tebou."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12114,6 +12152,24 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Byl zvolen 'Ruční' příkaz prohlížeče, ale nebyl nastaven žádný příkaz."
 
+msgid "No message"
+msgstr "Žádná zpráva"
+
+msgid "Open All Messages"
+msgstr "Otevřít všechny zprávy"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>"
+
+msgid "New Pounces"
+msgstr "Nové sledování kamaráda"
+
+msgid "Dismiss"
+msgstr "Odmítnout"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Jste sledován!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Následující zásuvné moduly budou odebrány."
 
@@ -12160,10 +12216,16 @@ msgstr "<b>Podrobnosti o zásuvném modulu</b>"
 msgid "Select a file"
 msgstr "Zvolte soubor"
 
+msgid "Modify Buddy Pounce"
+msgstr "Upravit sledování kamaráda"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Sledovat koho"
 
+msgid "_Account:"
+msgstr "_Účet:"
+
 msgid "_Buddy name:"
 msgstr "_Jméno kamaráda:"
 
@@ -12230,8 +12292,58 @@ msgstr "_Opakující se"
 msgid "Pounce Target"
 msgstr "Cíl sledování"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Téma smajlíků nelze rozbalit."
+#, c-format
+msgid "Started typing"
+msgstr "Začal psát"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Zastavil psaní"
+
+#, c-format
+msgid "Signed on"
+msgstr "Přihlášen"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Vrátil se z nečinnosti"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Vrátil se z nepřítomnosti"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Přestal psát"
+
+#, c-format
+msgid "Signed off"
+msgstr "Odhlášen"
+
+#, c-format
+msgid "Became idle"
+msgstr "Stal se nečinným"
+
+#, c-format
+msgid "Went away"
+msgstr "Odešel pryč"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Odeslal zprávu"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Neznámé.... Oznamte to prosím!"
+
+msgid "Theme failed to unpack."
+msgstr "Téma nelze rozbalit."
+
+msgid "Theme failed to load."
+msgstr "Téma nelze načíst."
+
+msgid "Theme failed to copy."
+msgstr "Téma nelze zkopírovat."
 
 msgid "Install Theme"
 msgstr "Nainstalovat téma"
@@ -12252,6 +12364,11 @@ msgstr "Klávesové zkratky"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Za_vřít konverzaci klávesou Escape"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Téma seznamu kamarádů"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ikona v panelu"
 
@@ -12261,8 +12378,8 @@ msgstr "Zobrazovat _ikonu v panelu:"
 msgid "On unread messages"
 msgstr "Při nepřečtených zprávách"
 
-msgid "Conversation Window Hiding"
-msgstr "Skrývání okna konverzace"
+msgid "Conversation Window"
+msgstr "Okna konverzace"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Skrýt nové konverzace IM:"
@@ -12270,6 +12387,9 @@ msgstr "_Skrýt nové konverzace IM:"
 msgid "When away"
 msgstr "Při nepřítomnosti"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_Minimalizovat nová okna konverzací"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Záložky"
@@ -12328,9 +12448,6 @@ msgstr "Používat hladké posouvání"
 msgid "F_lash window when IMs are received"
 msgstr "_Bliknout oknem, když jsou přijaty IM"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_Minimalizovat nová okna konverzací"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimální výška plochy pro zadání v řádcích:"
 
@@ -12362,14 +12479,12 @@ msgstr "Nemohu spustit program pro konfiguraci proxy."
 msgid "Cannot start browser configuration program."
 msgstr "Nemohu spustit konfiguraci prohlížeče."
 
-msgid "ST_UN server:"
-msgstr "Server ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Příklad: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Autodetekovat IP adresu"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Použít _automaticky detekovanou IP adresu: %s"
 
 msgid "Public _IP:"
 msgstr "Veřejná _IP:"
@@ -12389,6 +12504,10 @@ msgstr "_Počáteční port:"
 msgid "_End port:"
 msgstr "_Koncový port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Server pro přenos (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy server a prohlížeč"
 
@@ -12579,12 +12698,12 @@ msgstr "Při nepřítomnosti a nečinnosti"
 msgid "Auto-away"
 msgstr "Automatická nepřítomnost"
 
-msgid "Change status when _idle"
-msgstr "Změnit stav _při nečinnosti"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuty před nečinností:"
 
+msgid "Change status when _idle"
+msgstr "Změnit stav _při nečinnosti"
+
 msgid "Change _status to:"
 msgstr "Změnit _stav na:"
 
@@ -12733,47 +12852,44 @@ msgstr "Uložit _a použít"
 msgid "Status for %s"
 msgstr "Stav pro %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Už existuje uživatelský smajlík pro '%s'. Specifikujte jinou klávesovou "
+"zkratku."
+
 msgid "Custom Smiley"
 msgstr "Uživatelský smajlík"
 
-msgid "More Data needed"
-msgstr "Je potřeba více dat"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Nastavte klávesovou zkratku asociovanou se smajlíkem."
-
 msgid "Duplicate Shortcut"
 msgstr "Duplikovat klávesovou zkratku"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Už existuje uživatelský smajlík pro vybranou klávesovou zkratku. "
-"Specifikujte jinou."
-
-msgid "Please select an image for the smiley."
-msgstr "Prosím vyberte obrázek pro smajlík."
-
 msgid "Edit Smiley"
 msgstr "Upravit smajlík"
 
 msgid "Add Smiley"
 msgstr "Přidat smajlík"
 
-msgid "Smiley _Image"
-msgstr "Obrázek _smajlíku"
+msgid "_Image:"
+msgstr "_Obrázek:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Klávesové _zkratky smajlíků"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "Text k_lávesové zkratky"
 
 msgid "Smiley"
 msgstr "Smajlík"
 
+msgid "Shortcut Text"
+msgstr "Text klávesové zkratky:"
+
 msgid "Custom Smiley Manager"
 msgstr "Správce smajlíků"
 
+msgid "Select Buddy Icon"
+msgstr "Vybrat ikonu kamaráda"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Změní ikonu pro tento účet."
 
@@ -12857,8 +12973,8 @@ msgid "Cannot send launcher"
 msgstr "Nemohu odeslat spouštěč"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Přetáhli jste spouštěč pracovní plochy. Pravděpodobně jste chtěli odeslat, "
 "na co tento spouštěč ukazuje, místo přímo tohoto spouštěče."
@@ -12894,9 +13010,30 @@ msgstr ""
 "Nemohu načíst obrázek '%s': důvod není znám, pravděpodobně poškozený soubor "
 "obrázku"
 
+msgid "_Open Link"
+msgstr "_Otevřít odkaz"
+
+msgid "_Copy Link Location"
+msgstr "_Kopírovat adresu odkazu"
+
+msgid "_Copy Email Address"
+msgstr "_Kopírovat emailovou adresu"
+
+msgid "_Open File"
+msgstr "_Otevřít soubor"
+
+msgid "Open _Containing Directory"
+msgstr "Otevřít a_dresář"
+
 msgid "Save File"
 msgstr "Uložit soubor"
 
+msgid "_Play Sound"
+msgstr "_Přehrát zvuk"
+
+msgid "_Save File"
+msgstr "_Uložit soubor"
+
 msgid "Select color"
 msgstr "Zvolte barvu"
 
@@ -12984,6 +13121,66 @@ msgstr "Zásuvný modul Předpovídání dostupnosti kontaktu."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Zobrazí statistické informace o dostupnosti kamarádů"
 
+msgid "Server name request"
+msgstr "Požadavek na jméno serveru"
+
+msgid "Enter an XMPP Server"
+msgstr "Zadejte XMPP server"
+
+msgid "Select an XMPP server to query"
+msgstr "Zvolte XMPP server pro rozhovor"
+
+msgid "Find Services"
+msgstr "Najít služby"
+
+msgid "Add to Buddy List"
+msgstr "Přidat do seznamu kamarádů"
+
+msgid "Gateway"
+msgstr "Brána"
+
+msgid "Directory"
+msgstr "Adresář"
+
+msgid "PubSub Collection"
+msgstr "PubSub kolekce"
+
+msgid "PubSub Leaf"
+msgstr "PubSub list"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Popis:</b>"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Prohlížení služeb"
+
+msgid "_Browse"
+msgstr "_Prohlížet"
+
+msgid "Server does not exist"
+msgstr "Server neexistuje"
+
+msgid "Server does not support service discovery"
+msgstr "Server nepodporuje prohlížení služeb"
+
+msgid "XMPP Service Discovery"
+msgstr "Prohlížení XMPP služeb"
+
+msgid "Allows browsing and registering services."
+msgstr "Umožňuje prohlížení a registrování služeb."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Tento zásuvný modul je užitečný pro registraci transportů nebo dalších XMPP "
+"služeb."
+
 msgid "Buddy is idle"
 msgstr "Kamarád je nečinný"
 
@@ -13368,9 +13565,9 @@ msgstr "Zásuvný modul music messaging pro spolupráci při skládání."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
-"Zásuvný modul music messaging umožňuje několika uživatelům zároveň pracovat "
+"Zásuvný modul Music messaging umožňuje několika uživatelům zároveň pracovat "
 "na hudebním díle upravováním společné partitury v reálném čase."
 
 #. ---------- "Notify For" ----------
@@ -13480,12 +13677,6 @@ msgstr ""
 "- Obrací všechen příchozí text\n"
 "- Odešle zprávu lidem ve vašem seznamu okamžitě, když se přihlásí"
 
-msgid "Cursor Color"
-msgstr "Barva kurzoru"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekundární barva kurzoru"
-
 msgid "Hyperlink Color"
 msgstr "Barva odkazu"
 
@@ -13495,6 +13686,9 @@ msgstr "Barva navštívených odkazů"
 msgid "Highlighted Message Name Color"
 msgstr "Barva zvýrazněné zprávy"
 
+msgid "Typing Notification Color"
+msgstr "Barva pro upozornění na psaní"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Vodorovné oddělení GtkTreeView"
 
@@ -13524,35 +13718,21 @@ msgstr "Písmo rozhraní GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Téma GTK+ textu odkazu"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Barvy rozhraní"
+msgid "Disable Typing Notification Text"
+msgstr "Zrušit upozornění na psaní"
 
-msgid "Widget Sizes"
-msgstr "Velikosti widgetů"
+msgid "GTK+ Theme Control Settings"
+msgstr "Ovládání tématu GTK+"
+
+msgid "Colors"
+msgstr "Barvy"
 
 msgid "Fonts"
 msgstr "Písma"
 
+msgid "Miscellaneous"
+msgstr "Různé"
+
 msgid "Gtkrc File Tools"
 msgstr "Nástroje souboru Gtkrc"
 
@@ -13635,7 +13815,7 @@ msgstr "Tlačítko Odeslat okna konverzace."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Přidá tlačítko Odeslat do plochy pro psaní konverzačního okna. Určeno, když "
 "není fyzická klávesnice."
@@ -13692,6 +13872,95 @@ msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Nahrazuje text v odchozích zprávách podle uživatelem definovaných pravidel."
 
+msgid "Just logged in"
+msgstr "Právě přihlášen"
+
+msgid "Just logged out"
+msgstr "Právě odhlášen"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Ikona pro kontakt/\n"
+"Ikona pro neznámou osobu"
+
+msgid "Icon for Chat"
+msgstr "Ikona pro chat"
+
+msgid "Ignored"
+msgstr "Ignorován"
+
+msgid "Founder"
+msgstr "Zakladatel"
+
+msgid "Operator"
+msgstr "Operátor"
+
+msgid "Half Operator"
+msgstr "Poloviční operátor"
+
+msgid "Authorization dialog"
+msgstr "Autorizační dialog"
+
+msgid "Error dialog"
+msgstr "Chybový dialog"
+
+msgid "Information dialog"
+msgstr "Informační dialog"
+
+msgid "Mail dialog"
+msgstr "Dialog mailu"
+
+msgid "Question dialog"
+msgstr "Dialog s otázkou"
+
+msgid "Warning dialog"
+msgstr "Dialog s varováním"
+
+msgid "What kind of dialog is this?"
+msgstr "Jaký je toto druh dialogu?"
+
+msgid "Status Icons"
+msgstr "Ikony stavů"
+
+msgid "Chatroom Emblems"
+msgstr "Emblémy místnosti chatu"
+
+msgid "Dialog Icons"
+msgstr "Ikony dialogu"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Editor témat ikon Pidgina"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Editor seznamu kamarádů Pidgina"
+
+msgid "Edit Buddylist Theme"
+msgstr "Upravit téma seznamu kamarádů"
+
+msgid "Edit Icon Theme"
+msgstr "Upravit téma ikon"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Editor témat Pidgina"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Editor témat Pidgina."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13860,9 +14129,9 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Možnosti specifické pro Pidgin pro Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Poskytuje možnosti specifické pro Pidgin pro Windows, například dokování "
+"Poskytuje možnosti specifické pro Pidgin na Windows, například dokování "
 "seznamu kamarádů."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13902,6 +14171,522 @@ msgstr "Přijímat a odesílat přímo sekce XMPP."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů XMPP."
 
+#, fuzzy
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "Nemohu se připojit k serveru."
+
+#, fuzzy
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Nemohu načíst pár klíčů SILC"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s odmítl vaše pozvání ke konferenci do místnosti \"%s\", protože \"%s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Pozvání odmítnuto"
+
+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "Proxy"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Nemohu otevřít socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Nemohu poslouchat na socketu"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Nemohu číst ze socketu"
+
+#~ msgid "Connection failed."
+#~ msgstr "Spojení selhalo."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server se odpojil"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Nemohu vytvořit socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Nemohu se připojit k hostiteli"
+
+#~ msgid "Read error"
+#~ msgstr "Chyba čtení"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nemohu navázat spojení se serverem:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Chyba zápisu"
+
+#~ msgid "Last Activity"
+#~ msgstr "Poslední aktivita"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Informace vyhledání služby"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Položky hledání služeb"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Rozšířené Stanza adresování"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Víceuživatelský chat"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Rozšířené informace vzhledu chatu"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band Bytestreamy"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc příkazy"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub služba"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Bytestreamy"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Mino Band data"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "In-Band registrace"
+
+#~ msgid "User Location"
+#~ msgstr "Umístění uživatele"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar uživatele"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Upozornění na stav chatu"
+
+#~ msgid "Software Version"
+#~ msgstr "Verze softwaru"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Iniciace streamu"
+
+#~ msgid "User Mood"
+#~ msgstr "Nálada uživatele"
+
+#~ msgid "User Activity"
+#~ msgstr "Aktivita uživatele"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Schopnosti"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Šifrované vyjednávání"
+
+#~ msgid "User Tune"
+#~ msgstr "Poslech uživatele"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Výměna položky seznamu"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Dostupnost adres"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle Audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "Přezdívka"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Potvrzení zprávy"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Zveřejnění veřejného klíče"
+
+#~ msgid "User Chatting"
+#~ msgstr "Uživatel chatuje"
+
+#~ msgid "User Browsing"
+#~ msgstr "Uživatel brouzdá"
+
+#~ msgid "User Gaming"
+#~ msgstr "Uživatel hraje"
+
+#~ msgid "User Viewing"
+#~ msgstr "Uživatel prohlíží"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Šifrování Stanza"
+
+#~ msgid "Entity Time"
+#~ msgstr "Čas položky"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Zpožděné doručení"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Spolupracující datové objekty"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Úložiště souboru a sdílení"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN Service Discovery pro Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Zjednodušené šifrované vyjednávání"
+
+#~ msgid "Hop Check"
+#~ msgstr "Kontrola hopu"
+
+#~ msgid "Read Error"
+#~ msgstr "Chyba čtení"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Nemohu se připojit k serveru."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Vyrovnávací paměť čtení plná (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Nezpracovatelná zpráva"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Nemohu se připojit k počítači: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Přihlášení selhalo (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Nemohu se připojit k serveru."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Byli jste odhlášeni, protože jste se přihlásili u jiné pracovní stanice."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Chyba. Není nainstalována podpora SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Nesprávné heslo."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nemohu se připojit k serveru BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Možná budete brzo odpojen. Hledejte aktualizace na %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Nemohu se připojit"
+
+#~ msgid "Invalid username."
+#~ msgstr "Neplatné jméno uživatele."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Nemohu dešifrovat odpověď serveru"
+
+#~ msgid "Connection lost"
+#~ msgstr "Spojení ztraceno"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Nemohu najít počítač"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Spojení uzavřeno (zápis)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Spojení přerušeno"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Chyba při čtení ze socketu: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Nemohu se připojit k počítači"
+
+#~ msgid "Could not write"
+#~ msgstr "Nemohu zapisovat"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nemohu se připojit"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Nemohu vytvořit socket pro poslouchání"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Nemohu přeložit název počítače"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Nesprávné heslo"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nemohu navázat spojení s %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonsko"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Server pageru v Japonsku"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Server přenosu souborů v Japonsku"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ztraceno spojení se serverem\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nemohu přeložit název počítače"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Server pro přihlášení vyžaduje SSL. Nebyla nalezena podpora TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skrývání okna konverzace"
+
+#~ msgid "More Data needed"
+#~ msgstr "Je potřeba více dat"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Nastavte klávesovou zkratku asociovanou se smajlíkem."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Prosím vyberte obrázek pro smajlík."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Které ID aktivovat?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Barva kurzoru"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Sekundární barva kurzoru"
+
+#~ msgid "Interface colors"
+#~ msgstr "Barvy rozhraní"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Velikosti widgetů"
+
+#~ msgid "Invite message"
+#~ msgstr "Zvací zpráva"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Zadejte prosím jméno uživatele, kterého chcete pozvat,\n"
+#~ "a nepovinně i zvací zprávu."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Vyhledávám %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Spojení k %s selhalo"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Přihlásit: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Nemohu zapsat soubor %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Nemohu číst soubor %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Zpráva příliš dlouhá, posledních %s bajtů useknuto."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s není momentálně přihlášen."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Varování %s není povoleno."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Zpráva byla zahozena, překračujete limit rychlosti serveru."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Chat v %s není dostupný."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Odesíláte zprávy pro %s příliš rychle."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Přišli jste IM od %s, protože byla příliš dlouhá."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Přišli jste o IM %s, protože byla odeslána příliš rychle."
+
+#~ msgid "Failure."
+#~ msgstr "Selhání."
+
+#~ msgid "Too many matches."
+#~ msgstr "Příliš mnoho odpovědí."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Potřebuji více kvalifikátorů."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Adresářová služba momentálně není k dispozici."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Vyhledávání podle emailu omezeno."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Klíčové slovo ignorováno."
+
+#~ msgid "No keywords."
+#~ msgstr "Žádné klíčové slovo."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Uživatel nemá žádné informace v adresáři."
+
+#~ msgid "Country not supported."
+#~ msgstr "Země není podporována."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Neznámé selhání: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Nesprávné jméno uživatele nebo heslo."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Služba je dočasně nedostupná."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Vaše úroveň výstrahy je momentálně příliš vysoká pro přihlášení."
+
+#~ 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 ""
+#~ "Připojovali a odpojovali jste se příliš často. Počkejte deset minut a "
+#~ "zkuste to znovu. Pokud to budete dále zkoušet, budete muset čekat ještě "
+#~ "déle."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Došlo k neznámé chybě při přihlašování: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Došlo k neznámé chybě, %d. Informace: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Neplatný název skupiny"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Spojení uzavřeno"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Čekám na odpověď..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC se vrátil z přestávky. Nyní můžete zase odesílat zprávy."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Změna hesla úspěšná"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Získat informace adresáře"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Nastavit informace adresáře"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Nemohu otevřít %s pro zápis!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Přenos souboru selhal; druhá strana jej pravděpodobně přerušila."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Nemohu se připojit pro přenos."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Nemohu zapsat hlavičku souboru. Soubor nebude přenesen."
+
+#~ msgid "Save As..."
+#~ msgstr "Uložit jako..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s požaduje, aby %s přijal %d soubor: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s požaduje, aby %s přijal %d soubory: %s (%.2f %s)%s%s"
+#~ msgstr[2] "%s požaduje, aby %s přijal %d souborů: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s vás žádá, abyste jim poslali soubor"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Zásuvný modul protokolu TOC"
+
+#~ msgid "%s Options"
+#~ msgstr "Nastavení %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Možnosti proxy"
+
+#~ msgid "By log size"
+#~ msgstr "Podle velikosti záznamu"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Otevřít odkaz v prohlížeči"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Server ST_UN:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Obrázek _smajlíku"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Klávesové _zkratky smajlíků"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Nemohu získat adresář MSN"
 
@@ -14164,9 +14949,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "Váš požadavek vstoupit do skupiny %d byl schválen správcem %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Tato skupina byla přidána do vašeho seznamu kamarádů"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Žádám o přidání"
 
@@ -14200,9 +14982,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Nemohu se přihlásit. Zkontrolujte ladicí výpis"
 
-#~ msgid "Unable to login"
-#~ msgstr "Nemohu se přihlásit"
-
 #~ msgid "Failed room reply"
 #~ msgstr "Odpověď místnosti selhala"
 
@@ -14249,9 +15028,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(stahuji)</i>"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Chyba při žádání o přihlašovací token"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP adresa"
 
@@ -14332,14 +15108,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ "supported by MySpace."
 #~ msgstr "Lituji, MySpace nepodporuje hesla delší než %d znaků (vaše má %d)."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Jděte prosím na http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username, zvolte jméno uživatele, a zkuste se "
-#~ "přihlásit znovu."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Nemohu vytvořit připojení SSL k serveru."
 
@@ -14428,17 +15196,9 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgstr "Aktuální token"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Nemohu se připojit k serveru."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "Z_práva:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Účet:"
-
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Právě jste odeslali šťouchnutí!"
 
@@ -14561,13 +15321,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Popis:</b> Vystrašený"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
diff --git a/po/da.po b/po/da.po
index c4aec780d4..42b443e923 100644
--- a/po/da.po
+++ b/po/da.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-22 13:16-0500\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-23 18:17+0100\n"
 "Last-Translator: Peter Bach <bach.peter@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -64,8 +64,14 @@ msgstr ""
 "  -v, --version       vis nuværende version og afslut\n"
 
 #, c-format
-msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
-msgstr "%s opdagede fejl ved migrering af dine indstillinger fra %s til %s. Undersøg og færdiggør migreringen manuelt. Venligst rapportér denne fejl på http://developer.pidgin.im"
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s opdagede fejl ved migrering af dine indstillinger fra %s til %s. Undersøg "
+"og færdiggør migreringen manuelt. Venligst rapportér denne fejl på http://"
+"developer.pidgin.im"
 
 msgid "Error"
 msgstr "Fejl"
@@ -302,10 +308,12 @@ msgid "Enter empty string to reset the name."
 msgstr "Indtast tom streng for at nulstille navnet."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "Ved at fjerne denne kontakt vil du også fjerne alle vennerne i denne kontakt"
+msgstr ""
+"Ved at fjerne denne kontakt vil du også fjerne alle vennerne i denne kontakt"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Ved at fjerne denne gruppe vil du også fjerne alle vennerne i denne gruppe"
+msgstr ""
+"Ved at fjerne denne gruppe vil du også fjerne alle vennerne i denne gruppe"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
@@ -361,7 +369,9 @@ msgstr "Blokér"
 msgid "Unblock"
 msgstr "Frigiv"
 
-msgid "Please enter the username or alias of the person you would like to Block/Unblock."
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
 msgstr "Indtast brugernavnet eller alias på personen du vil blokere/frigive."
 
 #. Not multiline
@@ -388,8 +398,12 @@ msgstr "Indtast navnet på den samtale du vil tilslutte."
 msgid "Join"
 msgstr "Tilslut"
 
-msgid "Please enter the username or alias of the person whose log you would like to view."
-msgstr "Indtast brugernavnet eller alias på den person, hvis log du gerne vil gennemse."
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+"Indtast brugernavnet eller alias på den person, hvis log du gerne vil "
+"gennemse."
 
 #. Create the "Options" frame.
 msgid "Options"
@@ -535,23 +549,30 @@ msgstr "%s afbrudt."
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
 msgstr ""
 "%s\n"
 " \n"
-"Finch vil ikke forsøge at genforbinde til kontoen før du retter fejlen og genaktiverer kontoen."
+"Finch vil ikke forsøge at genforbinde til kontoen før du retter fejlen og "
+"genaktiverer kontoen."
 
 msgid "Re-enable Account"
 msgstr "Slå konto til igen"
 
-msgid "The account has disconnected and you are no longer in this chat. You will be automatically rejoined in the chat when the account reconnects."
-msgstr "Kontoen har afbrudt og du er ikke længere i denne samtale. Du vil automatisk blive tilsluttet til samtalen igen når kontoen genforbinder."
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"Kontoen har afbrudt og du er ikke længere i denne samtale. Du vil automatisk "
+"blive tilsluttet til samtalen igen når kontoen genforbinder."
 
 msgid "No such command."
 msgstr "Ingen kommando ved det navn."
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Syntaksfejl:  Du indtastede det forkert antal argumenter til den kommando."
+msgstr ""
+"Syntaksfejl:  Du indtastede det forkert antal argumenter til den kommando."
 
 msgid "Your command failed for an unknown reason."
 msgstr "Din kommando fejlede pga. en ukendt årsag."
@@ -590,25 +611,14 @@ msgstr "Du har forladt denne samtale."
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Logning startet. Fremtidige beskeder i denne samtale vil blive logget."
 
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Logning stoppet. Fremtidige beskeder i denne samtale vil ikke blive logget."
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Logning stoppet. Fremtidige beskeder i denne samtale vil ikke blive logget."
 
 msgid "Send To"
 msgstr "Send til"
 
-msgid "Invite message"
-msgstr "Invitationsbesked"
-
-msgid "Invite"
-msgstr "Invitér"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Indtast navnet på den bruger du vil invitere,\n"
-"samt en valgfri invitationsbesked."
-
 msgid "Conversation"
 msgstr "Samtale"
 
@@ -653,21 +663,34 @@ msgstr ""
 "De følgende kommandoer er tilgængelige i dette sammenhæng:\n"
 
 #, c-format
-msgid "%s is not a valid message class. See '/help msgcolor' for valid message classes."
-msgstr "%s er ikke en gyldig beskedklasse. Se \"/help msgcolor\" for gyldige beskedklasser."
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s er ikke en gyldig beskedklasse. Se \"/help msgcolor\" for gyldige "
+"beskedklasser."
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr "%s er ikke gyldig farve. Se \"/help msgcolor\" for gyldige farver."
 
-msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
-msgstr "say &lt;besked&gt;:  Send en besked som normalt hvis du ikke brugte en kommando."
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;besked&gt;:  Send en besked som normalt hvis du ikke brugte en "
+"kommando."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;handling&gt;:  Send en IRC-lignende handling til en ven eller samtale."
+msgstr ""
+"me &lt;handling&gt;:  Send en IRC-lignende handling til en ven eller samtale."
 
-msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
-msgstr "edbug &lt;tilvalg&gt;:  Send forskellige fejlsøgningsoplysninger til den nuværende samtale."
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"edbug &lt;tilvalg&gt;:  Send forskellige fejlsøgningsoplysninger til den "
+"nuværende samtale."
 
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Rydder samtalevinduet for tekst."
@@ -696,8 +719,18 @@ msgstr "prefs: Vis indstillingsvinduet."
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Vis gemte statuser-vinduet."
 
-msgid "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color for different classes of messages in the conversation window.<br>    &lt;class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/background&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
-msgstr "msgcolor &lt;klasse&gt; &lt;forgrund&gt; &lt;baggrund;: Sæt farven for de forskellige klasser af beskeder i samtalevinduet.<br>    &lt;klasse&gt;: modtag, send, markér, handling, tidsstempel<br>    &lt;forgrund/baggrund&gt;: sort, rød, grøn, blå, hvid, grå, mørkegrå, magenta, cyan, standard<br><br>EKSEMPEL:<br>    msgcolor send cyan standard"
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;klasse&gt; &lt;forgrund&gt; &lt;baggrund;: Sæt farven for de "
+"forskellige klasser af beskeder i samtalevinduet.<br>    &lt;klasse&gt;: "
+"modtag, send, markér, handling, tidsstempel<br>    &lt;forgrund/"
+"baggrund&gt;: sort, rød, grøn, blå, hvid, grå, mørkegrå, magenta, cyan, "
+"standard<br><br>EKSEMPEL:<br>    msgcolor send cyan standard"
 
 msgid "Unable to open file."
 msgstr "Kunne ikke åbne fil."
@@ -799,14 +832,25 @@ msgstr "Samtaler med %s på %s"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
-msgstr "System handlinger vil kun blive logget hvis \"Log alle status ændringer til system log\" indstillingen er slået til."
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"System handlinger vil kun blive logget hvis \"Log alle status ændringer til "
+"system log\" indstillingen er slået til."
 
-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
-msgstr "Beskeder vil kun blive logget hvis \"Log alle beskeder\" indstillingen er slået til."
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Beskeder vil kun blive logget hvis \"Log alle beskeder\" indstillingen er "
+"slået til."
 
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "Samtaler vil kun blive logget hvis \"Log alle samtaler\" indstillingen er slået til."
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Samtaler vil kun blive logget hvis \"Log alle samtaler\" indstillingen er "
+"slået til."
 
 msgid "No logs were found"
 msgstr "Ingen logs blev fundet"
@@ -832,6 +876,41 @@ msgstr "Alle samtaler"
 msgid "System Log"
 msgstr "System log"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Udregner..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Acceptér"
+
+msgid "Reject"
+msgstr "Afvis"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Du har forladt kanalen%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "E-post"
 
@@ -866,6 +945,9 @@ msgstr "Fortsæt"
 msgid "IM"
 msgstr "Besked"
 
+msgid "Invite"
+msgstr "Invitér"
+
 msgid "(none)"
 msgstr "(intet)"
 
@@ -909,8 +991,10 @@ msgstr "Fejl ved indlæsning af udvidelsesmodul"
 msgid "The selected file is not a valid plugin."
 msgstr "Den valgte fil er ikke et gyldigt udvidelsesmodul."
 
-msgid "Please open the debug window and try again to see the exact error message."
-msgstr "Åben fejlsøgningsvinduet og prøv igen for at se den eksakte fejlbesked."
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Åben fejlsøgningsvinduet og prøv igen for at se den eksakte fejlbesked."
 
 msgid "Select plugin to install"
 msgstr "Vælg udvidelsesmodul som skal installeres"
@@ -1066,7 +1150,6 @@ msgstr "%s er nu fraværende. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s har sendt dig en besked. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukendt hændelse ved overvågning. Venligst rapportér dette!"
 
@@ -1339,7 +1422,9 @@ msgid "Couldn't find window"
 msgstr "Kan ikke finde vindue"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr "Udvidelsesmodulet kan ikke indlæses, fordi det ikke er bygget med X11-understøttelse."
+msgstr ""
+"Udvidelsesmodulet kan ikke indlæses, fordi det ikke er bygget med X11-"
+"understøttelse."
 
 msgid "GntClipboard"
 msgstr "GntClipboard"
@@ -1347,8 +1432,12 @@ msgstr "GntClipboard"
 msgid "Clipboard plugin"
 msgstr "Klippebords-udvidelsesmodul"
 
-msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
-msgstr "Når gnt-klippebordets indhold ændrer sig, bliver indholdet gjort tilgængelig for X, hvis det er muligt."
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+"Når gnt-klippebordets indhold ændrer sig, bliver indholdet gjort tilgængelig "
+"for X, hvis det er muligt."
 
 #, c-format
 msgid "%s just signed on"
@@ -1407,11 +1496,13 @@ msgstr "Historikmodul kræver logning"
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
 msgstr ""
 "Logning kan slås til i Værktøjer -> Indstillinger -> Logning.\n"
 "\n"
-"Ved at slå logs til for beskeder og/eller samtaler, vil det aktivere historikken for de samme samtale typer."
+"Ved at slå logs til for beskeder og/eller samtaler, vil det aktivere "
+"historikken for de samme samtale typer."
 
 msgid "GntHistory"
 msgstr "GntHistorik"
@@ -1419,8 +1510,12 @@ msgstr "GntHistorik"
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Viser tidligere loggede samtaler i nye samtaler."
 
-msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
-msgstr "Når en ny samtale bliver åbnet, vil dette modul indsætte den sidste samtale ind i den nye samtale."
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Når en ny samtale bliver åbnet, vil dette modul indsætte den sidste samtale "
+"ind i den nye samtale."
 
 msgid "Online"
 msgstr "Tilkoblet"
@@ -1465,6 +1560,28 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Lastlog-udvidelsesmodul."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "Sang URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "konti"
 
@@ -1565,21 +1682,18 @@ msgstr "Acceptér certifikat til %s?"
 msgid "SSL Certificate Verification"
 msgstr "SSL-certifikat efterprøvning"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Acceptér"
-
-msgid "Reject"
-msgstr "Afvis"
-
 msgid "_View Certificate..."
 msgstr "_Vis certifikat..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
-msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
-msgstr "Certifikatet præsenteret af \"%s\" er selv underskrevet. Det kan ikke kontrolleres automatisk."
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Certifikatet præsenteret af \"%s\" er selv underskrevet. Det kan ikke "
+"kontrolleres automatisk."
 
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
@@ -1597,16 +1711,27 @@ msgid "Invalid certificate chain"
 msgstr "Ugyldig certifikatkæde"
 
 #. vrq will be completed by user_auth
-msgid "You have no database of root certificates, so this certificate cannot be validated."
-msgstr "Du har ingen database med rodcertifikater, så dette certifikat kan ikke kontrolleres."
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Du har ingen database med rodcertifikater, så dette certifikat kan ikke "
+"kontrolleres."
 
 #. vrq will be completed by user_auth
-msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "Rodcertifikatet, som denne påstår at være udgivet af, er ukendt af Pidgin."
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Rodcertifikatet, som denne påstår at være udgivet af, er ukendt af Pidgin."
 
 #, c-format
-msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
-msgstr "Certifikatkæden, præsenteret af %s, har ikke en gyldig digital underskrift fra den certificerende myndighed, som den påstår at have en underskrift fra."
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"Certifikatkæden, præsenteret af %s, har ikke en gyldig digital underskrift "
+"fra den certificerende myndighed, som den påstår at have en underskrift fra."
 
 msgid "Invalid certificate authority signature"
 msgstr "Ugyldig underskrift fra certificerende myndighed"
@@ -1616,8 +1741,12 @@ msgstr "Ugyldig underskrift fra certificerende myndighed"
 #. being prompted
 #. vrq will be completed by user_auth
 #, c-format
-msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
-msgstr "Certifikatet præsenteret af \"%s\" påstår at være fra \"%s\" i stedet. Dette kunne tyde på, at du ikke er forbundet til den tjeneste du tror du er."
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Certifikatet præsenteret af \"%s\" påstår at være fra \"%s\" i stedet. Dette "
+"kunne tyde på, at du ikke er forbundet til den tjeneste du tror du er."
 
 #. Make messages
 #, c-format
@@ -1654,6 +1783,8 @@ msgstr "+++ %s loggede på"
 msgid "+++ %s signed off"
 msgstr "+++ %s loggede ud"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
@@ -1700,6 +1831,18 @@ msgstr "%s forlod rummet."
 msgid "%s left the room (%s)."
 msgstr "%s forlod rummet (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Invitér til konference"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Indtast navnet på den bruger, du vil invitere, samt eventuelt en inviterings-"
+"besked."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kunne ikke opnå forbindelse: %s"
@@ -1911,32 +2054,68 @@ msgstr "Håndteringen af \"xmpp\"-adresser"
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Håndteringen af \"ymsgr\"-adresser"
 
-msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
-msgstr "Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"aim\"-adresser."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"aim\"-"
+"adresser."
 
-msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
-msgstr "Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"gg\"-adresser."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"gg\"-"
+"adresser."
 
-msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
-msgstr "Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"icq\"-adresser."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"icq\"-"
+"adresser."
 
-msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
-msgstr "Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"irc\"-adresser."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"irc\"-"
+"adresser."
 
-msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
-msgstr "Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"msnim\"-adresser."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"msnim\"-"
+"adresser."
 
-msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
-msgstr "Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"sip\"-adresser."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"sip\"-"
+"adresser."
 
-msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
-msgstr "Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"xmpp\"-adresser."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"xmpp\"-"
+"adresser."
 
-msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
-msgstr "Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"ymsgr\"-adresser."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"Sand hvis kommandoen angivet i \"kommando\"-nøglen skulle håndtere \"ymsgr\"-"
+"adresser."
 
-msgid "True if the command used to handle this type of URL should be run in a terminal."
-msgstr "Sand hvis kommandoen brugt til at håndtere denne type af adresse skal køres i en terminal."
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"Sand hvis kommandoen brugt til at håndtere denne type af adresse skal køres "
+"i en terminal."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Hvorledes den angivne kommando skal håndtere \"aim\"-adresser"
@@ -1981,12 +2160,20 @@ msgid "XML"
 msgstr "XML"
 
 #, c-format
-msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:</b></font> %s<br/>\n"
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:"
+"</b></font> %s<br/>\n"
 
 #, c-format
-msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:</b></font> %s<br/>\n"
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:"
+"</b></font> %s<br/>\n"
 
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Kunne ikke finde logsti!</b></font>"
@@ -1999,6 +2186,10 @@ msgstr "<font color=\"red\"><b>Kunne ikke læse filen: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Fejl ved oprettelse af forbindelse"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Du bruger %s, men dette udvidelsesmodul kræver %s."
@@ -2014,12 +2205,19 @@ msgstr "Modul magi fejlede %d (krævede %d)"
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI versions fejl %d.%d.x (kræver %d.%d.x)"
 
-msgid "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr "Udvidelsesmodul implementerer ikke alle de krævede funktioner (list_icon, logind og luk)"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"Udvidelsesmodul implementerer ikke alle de krævede funktioner (list_icon, "
+"logind og luk)"
 
 #, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
-msgstr "Det krævede udvidelsesmodul %s blev ikke fundet. Installér modulet og prøv igen."
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+"Det krævede udvidelsesmodul %s blev ikke fundet. Installér modulet og prøv "
+"igen."
 
 msgid "Unable to load the plugin"
 msgstr "Kan ikke indlæse udvidelsesmodulet"
@@ -2219,8 +2417,12 @@ msgid "Test plugin IPC support, as a client."
 msgstr "Test modul IPC understøttelse, som en klient."
 
 #. *  description
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
-msgstr "Test modul IPC understøttelse, som en klient. Dette finder server modulet og kalder den registrerede kommando."
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Test modul IPC understøttelse, som en klient. Dette finder server modulet og "
+"kalder den registrerede kommando."
 
 #. *< type
 #. *< ui_requirement
@@ -2239,7 +2441,9 @@ msgstr "Test modul IPC understøttelse, som en server."
 
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Test modul IPC understøttelse, som en server. Dette registrerer IPC kommandoerne."
+msgstr ""
+"Test modul IPC understøttelse, som en server. Dette registrerer IPC "
+"kommandoerne."
 
 msgid "Join/Part Hiding Configuration"
 msgstr "Tilslut/Deltag skjult konfiguration"
@@ -2269,8 +2473,12 @@ msgid "Hides extraneous join/part messages."
 msgstr "Skjuler overflødige tilslut/deltag-beskeder."
 
 #. *  description
-msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
-msgstr "Dette udvidelsesmodul skjuler tilslut/deltag-beskeder i store rum, undtagen de brugere der aktivt tager del i en samtale."
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+"Dette udvidelsesmodul skjuler tilslut/deltag-beskeder i store rum, undtagen "
+"de brugere der aktivt tager del i en samtale."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2295,8 +2503,12 @@ msgstr "En eller flere beskeder er måske ikke blevet leveret."
 msgid "You were disconnected from the server."
 msgstr "Din forbindelse til serveren blev afbrudt."
 
-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
-msgstr "Du er ikke forbunddet. Beskeder vil ikke blive modtaget medmindre du er logged ind."
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Du er ikke forbunddet. Beskeder vil ikke blive modtaget medmindre du er "
+"logged ind."
 
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Besked kunne ikke sendes, fordi maksimum længden var overskredet."
@@ -2376,14 +2588,20 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Inkludér andre klienters logs i logviseren."
 
 #. * description
+#, fuzzy
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
 msgstr ""
-"Når der vises logs, vil dette udvidelsesmodul inkludere logs fra andre beskedklienter. På nuværende tidspunkt, er dette Adium, MSN Messenger og Trillian.\n"
+"Når der vises logs, vil dette udvidelsesmodul inkludere logs fra andre "
+"beskedklienter. På nuværende tidspunkt, er dette Adium, MSN Messenger og "
+"Trillian.\n"
 "\n"
-"ADVARSEL: Dette udvidelsesmodul er stadig alfa-kode og kan bryde ned jævnligt. Brug det på eget ansvar!"
+"ADVARSEL: Dette udvidelsesmodul er stadig alfa-kode og kan bryde ned "
+"jævnligt. Brug det på eget ansvar!"
 
 msgid "Mono Plugin Loader"
 msgstr "Mono-udvidelsesmodul indlæser"
@@ -2415,21 +2633,36 @@ msgid "Prepends a newline to displayed message."
 msgstr "Indskyder en ny linje i viste besked."
 
 #. *< summary
-msgid "Prepends a newline to messages so that the rest of the message appears below the username in the conversation window."
-msgstr "Indskyder en ny linje til beskederne så resten af beskederne optræder nedenunder skærmnavnet i samtalevinduet."
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the username in the conversation window."
+msgstr ""
+"Indskyder en ny linje til beskederne så resten af beskederne optræder "
+"nedenunder skærmnavnet i samtalevinduet."
 
 msgid "Offline Message Emulation"
 msgstr "Afkoblet besked-emulering"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr "Gem beskeder sendt til en afkoblet bruger som automatisk praj ved indlogning."
+msgstr ""
+"Gem beskeder sendt til en afkoblet bruger som automatisk praj ved indlogning."
 
-msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
-msgstr "Resten af beskeden vil blive gemt som automatisk praj ved indlogning. Du kan redigere/slette automatisk praj ved indlogning fra venne-automatisk praj ved indlogning-vinduet."
+#, fuzzy
+msgid ""
+"The rest of the messages will be saved as pounces. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+"Resten af beskeden vil blive gemt som automatisk praj ved indlogning. Du kan "
+"redigere/slette automatisk praj ved indlogning fra venne-automatisk praj ved "
+"indlogning-vinduet."
 
 #, c-format
-msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
-msgstr "\"%s\" er afkoblet. Vil du gemme testen af beskeden i en automatisk praj ved indlogning og automatisk sende dem når \"%s\" logger på igen?"
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+"\"%s\" er afkoblet. Vil du gemme testen af beskeden i en automatisk praj ved "
+"indlogning og automatisk sende dem når \"%s\" logger på igen?"
 
 msgid "Offline Message"
 msgstr "Besked når afkoblet"
@@ -2449,6 +2682,32 @@ msgstr "Gem beskeder ved afkoblet som automatisk praj ved indlogning"
 msgid "Do not ask. Always save in pounce."
 msgstr "Spørg ikke. Gem altid som automatisk praj ved indlogning."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Indtast adgangskode"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2470,8 +2729,12 @@ msgstr "Synsk tilstand"
 msgid "Psychic mode for incoming conversation"
 msgstr "Synsk tilstand for indgående samtaler"
 
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr "Får samtalevinduerne til at dukke frem når andre brugere begynder at skrive til dig. Dette virker med AIM, ICQ, XMPP, Sametime og Yahoo!"
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"Får samtalevinduerne til at dukke frem når andre brugere begynder at skrive "
+"til dig. Dette virker med AIM, ICQ, XMPP, Sametime og Yahoo!"
 
 msgid "You feel a disturbance in the force..."
 msgstr "Du føler en ændring i kraften..."
@@ -2617,8 +2880,11 @@ msgstr "Vennestatus påmindelse"
 #. *< version
 #. *  summary
 #. *  description
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
-msgstr "Fortæller i en samtale når en ven bliver fraværende eller kommer tilbage."
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Fortæller i en samtale når en ven bliver fraværende eller kommer tilbage."
 
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-udvidelsesmodul indlæser"
@@ -2626,16 +2892,27 @@ msgstr "Tcl-udvidelsesmodul indlæser"
 msgid "Provides support for loading Tcl plugins"
 msgstr "Giver understøttelse af Tcl-udvidelsesmoduler"
 
-msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
-msgstr "Ikke i stand til at opdage ActiveTCL installation. Hvis du ønsker at bruge TCL-udvidelsesmoduler, installér ActiveTCL fra http://www.activestate.com\n"
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+"Ikke i stand til at opdage ActiveTCL installation. Hvis du ønsker at bruge "
+"TCL-udvidelsesmoduler, installér ActiveTCL fra http://www.activestate.com\n"
 
-msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d.pidgin.im/BonjourWindows for more information."
-msgstr "Apple Bonjour-værktøjssættet til Windows blev ikke fundet, se oss på: http://d.pidgin.im/BonjourWindows for mere information."
+#, fuzzy
+msgid ""
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr ""
+"Apple Bonjour-værktøjssættet til Windows blev ikke fundet, se oss på: http://"
+"d.pidgin.im/BonjourWindows for mere information."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Ude af stand til at lytte for indgående beskeder\n"
 
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Kunne ikke etablerede forbindelse til lokal mDNS server. Kører den?"
 
 msgid "First name"
@@ -2683,14 +2960,21 @@ msgstr "%s har afsluttet samtalen."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kunne ikke sende beskedn; samtalen kunne ikke startes."
 
-msgid "Cannot open socket"
-msgstr "Kan ikke åbne socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Kunne ikke oprette sokkel:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Kan ikke binde socket til port"
 
-msgid "Could not listen on socket"
-msgstr "Kan ikke lytte på socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Kunne ikke oprette sokkel:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Fejl under kommunikation med lokal mDNSResponder."
@@ -2698,8 +2982,11 @@ msgstr "Fejl under kommunikation med lokal mDNSResponder."
 msgid "Invalid proxy settings"
 msgstr "Ugyldige proxyindstillinger"
 
-msgid "Either the host name or port number specified for your given proxy type is invalid."
-msgstr "Enten er værtsnavnet eller porten der er angivet for din proxytype ugyldig."
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"Enten er værtsnavnet eller porten der er angivet for din proxytype ugyldig."
 
 msgid "Token Error"
 msgstr "Nøgle fejl"
@@ -2735,13 +3022,16 @@ msgstr "Gem venneliste..."
 msgid "Load buddylist from file..."
 msgstr "Indlæs venneliste fra fil..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Udfyld registreringsfelterne."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Adgangskoder er ikke ens."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Kunne ikke registrere en ny konto. En fejl skete.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2753,14 +3043,15 @@ msgstr "Registering lykkedes!"
 msgid "Password"
 msgstr "Adgangskode"
 
-msgid "Password (retype)"
-msgstr "Adgangskode (tast igen)"
+msgid "Password (again)"
+msgstr "Adgangskode (igen)"
 
-msgid "Enter current token"
-msgstr "Indtast nuværende nøgle"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Nuværende nøgle"
+#, fuzzy
+msgid "Captcha"
+msgstr "Captcha-billede"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrér ny Gadu-Gadu konto"
@@ -2813,6 +3104,15 @@ msgstr "Adgangskoden blev ændret!"
 msgid "Current password"
 msgstr "Nuværende adgangskode"
 
+msgid "Password (retype)"
+msgstr "Adgangskode (tast igen)"
+
+msgid "Enter current token"
+msgstr "Indtast nuværende nøgle"
+
+msgid "Current token"
+msgstr "Nuværende nøgle"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Indtast din nuværende og nye adgangskode til UIN: "
 
@@ -2826,6 +3126,7 @@ msgstr "Vælg en samtale for ven: %s"
 msgid "Add to chat..."
 msgstr "Tilføj til samtale..."
 
+#. Global
 msgid "Available"
 msgstr "Tilgængelig"
 
@@ -2859,8 +3160,8 @@ msgstr "Ikke-matchende brugere fundet"
 msgid "There are no users matching your search criteria."
 msgstr "Der er ingen brugere der matcher dine søgekriterier."
 
-msgid "Unable to read socket"
-msgstr "Kan ikke læse fra netværket"
+msgid "Unable to read from socket"
+msgstr "Kan ikke læse fra sokkel"
 
 msgid "Buddy list downloaded"
 msgstr "Venneliste overført"
@@ -2874,8 +3175,14 @@ msgstr "Venneliste overført"
 msgid "Your buddy list was stored on the server."
 msgstr "Din venneliste blev gemt på serveren."
 
-msgid "Connection failed."
-msgstr "Forbindelse fejlede."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Tilsluttet"
+
+msgid "Connection failed"
+msgstr "Forbindelse fejlede"
 
 msgid "Add to chat"
 msgstr "Tilføj til samtale"
@@ -2883,13 +3190,23 @@ msgstr "Tilføj til samtale"
 msgid "Chat _name:"
 msgstr "Samtale_navn:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Kunne ikke kontakte server."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Tilslutter"
+
 msgid "Chat error"
 msgstr "Fejl i samtale"
 
 msgid "This chat name is already in use"
 msgstr "Dette samtalenavn eksisterer allerede"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Ikke forbundet til serveren."
 
 msgid "Find buddies..."
@@ -2931,6 +3248,10 @@ msgstr "Populær polsk klient"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu bruger"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Finder server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ukendt kommando: %s"
@@ -2945,7 +3266,8 @@ msgstr "Inet emne er sat"
 msgid "File Transfer Failed"
 msgstr "Filoverførsel fejlede"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Kunne ikke åbne en lyttende port."
 
 msgid "Error displaying MOTD"
@@ -2961,8 +3283,18 @@ msgstr "Der er ingen MOTD tilknyttet denne forbindelse."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Server har afbrudt forbindelse"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Mistede forbindelsen til server:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Vis MOTD"
@@ -2973,25 +3305,24 @@ msgstr "_Kanal:"
 msgid "_Password:"
 msgstr "_Adgangskode:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC navne må ikke indeholde mellemrum og lignende"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Tilslutter"
-
 msgid "SSL support unavailable"
 msgstr "SSL-understøttelse ikke tilgængelig"
 
-msgid "Couldn't create socket"
-msgstr "Kunne ikke oprette sokkel"
+msgid "Unable to connect"
+msgstr "Kunne ikke forbinde"
 
-msgid "Couldn't connect to host"
-msgstr "Kunne ikke kontakte vært"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Kunne ikke forbinde til %s"
 
-msgid "Read error"
-msgstr "Læsefejl"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server lukkede forbindelsen."
 
 msgid "Users"
 msgstr "Brugere"
@@ -3158,11 +3489,30 @@ msgstr "mode (%s %s) af %s"
 msgid "Invalid nickname"
 msgstr "Ugyldigt brugernavn"
 
-msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
-msgstr "Dit valgte brugernavn blev nægtet af serveren. Det indeholder sikkert ugyldige bogstaver."
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Dit valgte brugernavn blev nægtet af serveren. Det indeholder sikkert "
+"ugyldige bogstaver."
+
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Dit valgte konto navn blev nægtet af serveren. Det indeholder sikkert "
+"ugyldige bogstaver."
+
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Dette samtalenavn eksisterer allerede"
 
-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
-msgstr "Dit valgte konto navn blev nægtet af serveren. Det indeholder sikkert ugyldige bogstaver."
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Kælenavn"
 
 msgid "Cannot change nick"
 msgstr "Kan ikke ændre navn"
@@ -3198,8 +3548,12 @@ msgstr "Wallops fra %s"
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;handling at udføre&gt;:  Udfør en handling."
 
-msgid "away [message]:  Set an away message, or use no message to return from being away."
-msgstr "away [besked]:  Indstil en fraværsbesked. Hvis ingen besked angives, så returnes du fra fravær."
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"away [besked]:  Indstil en fraværsbesked. Hvis ingen besked angives, så "
+"returnes du fra fravær."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
 msgstr "ctcp <nick> <msg>: sender ctcp-besked til kælenavn."
@@ -3207,26 +3561,56 @@ msgstr "ctcp <nick> <msg>: sender ctcp-besked til kælenavn."
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Send en kommando til chanserv"
 
-msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
-msgstr "deop &lt;navn1&gt; [navn2] ...:  Fjern kanal operatør status fra en. Du skal være kanal operatør for at gøre dette."
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;navn1&gt; [navn2] ...:  Fjern kanal operatør status fra en. Du skal "
+"være kanal operatør for at gøre dette."
 
-msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
-msgstr "devoice &lt;navn1&gt; [navn2] ...:  Fjern kanal 'voice' status fra en. Det forhindrer dem i at snakke hvis kanalen er modereret (+m). Du skal være kanal operatør for at gøre dette."
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+"devoice &lt;navn1&gt; [navn2] ...:  Fjern kanal 'voice' status fra en. Det "
+"forhindrer dem i at snakke hvis kanalen er modereret (+m). Du skal være "
+"kanal operatør for at gøre dette."
 
-msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
-msgstr "invite &lt;navn&gt; [rum]:  Invitér nogle til den angivne kanal, eller den nuværende kanal."
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;navn&gt; [rum]:  Invitér nogle til den angivne kanal, eller den "
+"nuværende kanal."
 
-msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;rum1&gt;[,rum2][,...] [nøgle1[,nøgle2][,...]]:  Deltag i en eller flere kanaler. Du kan angive en adgangsnøgle hvis det er krævet."
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;rum1&gt;[,rum2][,...] [nøgle1[,nøgle2][,...]]:  Deltag i en eller "
+"flere kanaler. Du kan angive en adgangsnøgle hvis det er krævet."
 
-msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "join &lt;rum1&gt;[,rum2][,...] [nøgle1[,nøgle2][,...]]:  Tilslut en eller flere kanaler. Du kan angive en adgangsnøgle hvis det er krævet."
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;rum1&gt;[,rum2][,...] [nøgle1[,nøgle2][,...]]:  Tilslut en eller "
+"flere kanaler. Du kan angive en adgangsnøgle hvis det er krævet."
 
-msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
-msgstr "kick &lt;nick&gt; [besked]:  Fjern nogle fra kanalen. Du skal have kanal operatør status for at gøre dette."
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;nick&gt; [besked]:  Fjern nogle fra kanalen. Du skal have kanal "
+"operatør status for at gøre dette."
 
-msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
-msgstr "list:  Vis en liste over samtalerum på netværket. <i>Advarsel, nogle servere kan afbryde forbindelsen når du gør dette.</i>"
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:  Vis en liste over samtalerum på netværket. <i>Advarsel, nogle servere "
+"kan afbryde forbindelsen når du gør dette.</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;handling at udføre&gt;:  Udfør en handling."
@@ -3234,11 +3618,19 @@ msgstr "me &lt;handling at udføre&gt;:  Udfør en handling."
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Send en kommando til memoserv"
 
-msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
-msgstr "mode &lt;+|-&gt;&lt;A-Za-Z&gt; &lt;nick|kanal&gt;:  Sæt eller fjern en kanal eller bruger tilstand."
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;+|-&gt;&lt;A-Za-Z&gt; &lt;nick|kanal&gt;:  Sæt eller fjern en kanal "
+"eller bruger tilstand."
 
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "msg &lt;navn&gt; &lt;besked&gt;:  Send en privat besked til en bruger (istedet for en kanal)."
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;navn&gt; &lt;besked&gt;:  Send en privat besked til en bruger "
+"(istedet for en kanal)."
 
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Vis brugerne der er på kanalen lige nu."
@@ -3252,23 +3644,43 @@ msgstr "nickserv: Send en kommando til nickserv"
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr "notice &lt;targetl&lt;:  Send en påmindelse til en bruger eller kanal."
 
-msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
-msgstr "op &lt;navn1&gt; [navn2] ...:  Giv kanal operatør status til en. Du skal selv være kanal operatør for at gøre dette."
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;navn1&gt; [navn2] ...:  Giv kanal operatør status til en. Du skal "
+"selv være kanal operatør for at gøre dette."
 
-msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "operwall &lt;message&gt;:  Hvis du ikke ved hvad dette er, så kan du sikkert ikke bruge det."
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;message&gt;:  Hvis du ikke ved hvad dette er, så kan du sikkert "
+"ikke bruge det."
 
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Send en kommando til operserv"
 
-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
-msgstr "part [rum] [besked]:  Forlad den nuværende kanal, eller angiv en kanal med en eventuel fraværsbesked."
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [rum] [besked]:  Forlad den nuværende kanal, eller angiv en kanal med "
+"en eventuel fraværsbesked."
 
-msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
-msgstr "ping [navn]:  Spørger hvor meget lag (tidsforsinkelse) en bruger (eller serveren hvis ingen bruger angivet) har."
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [navn]:  Spørger hvor meget lag (tidsforsinkelse) en bruger (eller "
+"serveren hvis ingen bruger angivet) har."
 
-msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "query &lt;navn&gt; &lt;besked&gt;:  Send en privat besked til en bruger (istedet for en kanal)."
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;navn&gt; &lt;besked&gt;:  Send en privat besked til en bruger "
+"(istedet for en kanal)."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [besked]:  Luk forbindelse til server, med en eventuel besked."
@@ -3276,8 +3688,12 @@ msgstr "quit [besked]:  Luk forbindelse til server, med en eventuel besked."
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Sender en rå kommando til serveren."
 
-msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
-msgstr "remove &lt;nick&gt; [besked]:  Fjern nogen fra et rum. Du skal have kanal operatør status for at gøre dette."
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;nick&gt; [besked]:  Fjern nogen fra et rum. Du skal have kanal "
+"operatør status for at gøre dette."
 
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Viser den lokale tid på IRC-serveren."
@@ -3291,11 +3707,19 @@ msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Sæt eller fjern en bruger tilstand."
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [nick]: send CTCP VERSION forspørgelse til en bruger"
 
-msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
-msgstr "voice &lt;navn1&gt; [navn2] ...:  Giv kanal 'voice' status til en. Du skal havekanal operatør status for at gøre dette."
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;navn1&gt; [navn2] ...:  Giv kanal 'voice' status til en. Du skal "
+"havekanal operatør status for at gøre dette."
 
-msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "wallops &lt;besked&gt;:  Hvis du ikke ved hvad dette er, så kan du sikkert ikke bruge det."
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;besked&gt;:  Hvis du ikke ved hvad dette er, så kan du sikkert "
+"ikke bruge det."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;navn&gt;:  Hent oplysninger om en bruger."
@@ -3325,34 +3749,76 @@ msgstr "Ad-Hoc-kommando fejlede"
 msgid "execute"
 msgstr "kør"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server kræver SSL til logind. Ingen TLS/SSL-understøttelse fundet."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Du kræver kryptering, men ingen TLS/SSL-understøttelse blev fundet."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server kræver godkendelse i klartekst over en ukrypteret strøm"
 
 #, c-format
-msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "%s kræver godkendelse i klartekst over en ukrypteret forbindelse. Tillad dette og fortsæt godkendelse?"
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s kræver godkendelse i klartekst over en ukrypteret forbindelse. Tillad "
+"dette og fortsæt godkendelse?"
 
 msgid "Plaintext Authentication"
 msgstr "Godkendelse i klartekst"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Godkendelse fejlede"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Ugyldigt svar fra server."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Serveren bruger ikke nogle understøttede godkendelsesmetoder"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Du kræver kryptering, men det er ikke tilrådighed på denne server."
+
 msgid "Invalid challenge from server"
 msgstr "Ugyldigt svar fra server"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL fejl"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Ingen grund givet"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Ikke understøttet version"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Kunne ikke etablere en forbindelse til server:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Kunne ikke etablere en forbindelse til server:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Kunne ikke initialisere forbindelse"
+
 msgid "Full Name"
 msgstr "Fulde navn"
 
@@ -3406,8 +3872,12 @@ msgstr "Beskrivelse"
 msgid "Edit XMPP vCard"
 msgstr "Redigér XMPP vCard"
 
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
-msgstr "Alle elementerne nedenfor er valgfrie. Skriv kun de ting, du ønsker andre skal vide om dig."
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+"Alle elementerne nedenfor er valgfrie. Skriv kun de ting, du ønsker andre "
+"skal vide om dig."
 
 msgid "Client"
 msgstr "Klient"
@@ -3415,158 +3885,9 @@ msgstr "Klient"
 msgid "Operating System"
 msgstr "Operativsystem"
 
-msgid "Last Activity"
-msgstr "Sidste aktivitet"
-
-msgid "Service Discovery Info"
-msgstr "Besked ved tjenesteopdagelse"
-
-msgid "Service Discovery Items"
-msgstr "Elementer for tjenesteopdagelse"
-
-msgid "Extended Stanza Addressing"
-msgstr "Udvidet Stanza-adressering"
-
-msgid "Multi-User Chat"
-msgstr "Flerbrugersamtale"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Flerbrugersamtale udvidede tilstedeværelsesinformation"
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band-bytestrømme"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc-kommandoer"
-
-msgid "PubSub Service"
-msgstr "PubSub-tjeneste"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5-bytestrømme"
-
-msgid "Out of Band Data"
-msgstr "Out of Band Data"
-
-msgid "XHTML-IM"
-msgstr "XHTML-besked"
-
-msgid "In-Band Registration"
-msgstr "In-Band-registrering"
-
-msgid "User Location"
-msgstr "Brugerplacering"
-
-msgid "User Avatar"
-msgstr "Brugeravatar"
-
-msgid "Chat State Notifications"
-msgstr "Samtalestatus påmindelser"
-
-msgid "Software Version"
-msgstr "Software version"
-
-msgid "Stream Initiation"
-msgstr "Klargøring af strøm"
-
-msgid "File Transfer"
-msgstr "Filoverførsel"
-
-msgid "User Mood"
-msgstr "Brugerhumør"
-
-msgid "User Activity"
-msgstr "Brugeraktivitet"
-
-msgid "Entity Capabilities"
-msgstr "Enhedsegenskaber"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Krypterede sessionsforhandlinger"
-
-msgid "User Tune"
-msgstr "Brugermelodi"
-
-msgid "Roster Item Exchange"
-msgstr "Navneliste over elementudveksling"
-
-msgid "Reachability Address"
-msgstr "E-post-adresse"
-
-msgid "User Profile"
-msgstr "Brugerprofil"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle-lyd"
-
-msgid "User Nickname"
-msgstr "Brugerkælenavn"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Beskedmodtagere"
-
-msgid "Public Key Publishing"
-msgstr "Udgivelse af offentlig nøgle"
-
-msgid "User Chatting"
-msgstr "Bruger samtaler"
-
-msgid "User Browsing"
-msgstr "Bruger browser"
-
-msgid "User Gaming"
-msgstr "Bruger spiller"
-
-msgid "User Viewing"
-msgstr "Bruger ser"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza-kryptering"
-
-msgid "Entity Time"
-msgstr "Tidsenhed"
-
-msgid "Delayed Delivery"
-msgstr "Forsinket levering"
-
-msgid "Collaborative Data Objects"
-msgstr "Samarbejdende dataobjekter"
-
-msgid "File Repository and Sharing"
-msgstr "Filarkiv og -deling"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-tjenesteopdagelse for Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Simplificeret krypteret sessionsforhandling"
-
-msgid "Hop Check"
-msgstr "Hop-kontrol"
-
-msgid "Capabilities"
-msgstr "Klient understøtter"
+#, fuzzy
+msgid "Local Time"
+msgstr "Lokal fil:"
 
 msgid "Priority"
 msgstr "Prioritet"
@@ -3574,6 +3895,14 @@ msgstr "Prioritet"
 msgid "Resource"
 msgstr "Ressource"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Logget ind"
+
 msgid "Middle Name"
 msgstr "Mellemnavn"
 
@@ -3633,8 +3962,12 @@ msgid "The following are the results of your search"
 msgstr "Det følgende er resultaterne på din søgning"
 
 #. current comment from Jabber User Directory users.jabber.org
-msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
-msgstr "Find en kontakt ved at indtaste søgekriterien i de givne felter. Bemærk: Hver felt understøtter joker-søgninger (%)"
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+"Find en kontakt ved at indtaste søgekriterien i de givne felter. Bemærk: "
+"Hver felt understøtter joker-søgninger (%)"
 
 msgid "Directory Query Failed"
 msgstr "Mappe forespørgsel fejlede"
@@ -3736,28 +4069,26 @@ msgstr "Vælg en konference-server at slå op"
 msgid "Find Rooms"
 msgstr "Find rum"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Du kræver kryptering, men det er ikke tilrådighed på denne server."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
-msgid "Write error"
-msgstr "Fejl ved skrivning"
+#, fuzzy
+msgid "No users found"
+msgstr "Ikke-matchende brugere fundet"
 
-msgid "Ping timeout"
-msgstr "Ping tidsudløb"
+#, fuzzy
+msgid "Roles:"
+msgstr "Rolle"
 
-msgid "Read Error"
-msgstr "Læsefejl"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Ping tidsudløb"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Kunne ikke etablere en forbindelse til server:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Kunne ikke oprette sokkel"
 
 msgid "Invalid XMPP ID"
 msgstr "Ugyldigt XMPP-id"
@@ -3765,6 +4096,10 @@ msgstr "Ugyldigt XMPP-id"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ugyldigt XMPP-id. Domæne skal angives."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Kunne ikke forbinde til server."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registreringen af %s@%s lykkedes"
@@ -3789,9 +4124,6 @@ msgstr "Afregistering lykkedes"
 msgid "Unregistration Failed"
 msgstr "Afregistrering fejlede"
 
-msgid "Already Registered"
-msgstr "Allerede registreret"
-
 msgid "State"
 msgstr "Landsdel"
 
@@ -3804,10 +4136,14 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Dato"
 
+msgid "Already Registered"
+msgstr "Allerede registreret"
+
 msgid "Unregister"
 msgstr "Afregistrér"
 
-msgid "Please fill out the information below to change your account registration."
+msgid ""
+"Please fill out the information below to change your account registration."
 msgstr "Udfyld oplysninger forneden for at ændre din kontoregistrering."
 
 msgid "Please fill out the information below to register your new account."
@@ -3830,6 +4166,10 @@ msgstr "Registrér ny konto på %s"
 msgid "Change Registration"
 msgstr "Ændr registrering"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Kunne ikke forbinde til server."
+
 msgid "Error unregistering account"
 msgstr "Fejl ved afregistrering af konto"
 
@@ -3854,6 +4194,12 @@ msgstr "Server understøtter ikke blokering"
 msgid "Not Authorized"
 msgstr "Ikke godkendt"
 
+msgid "Mood"
+msgstr "Humør"
+
+msgid "Now Listening"
+msgstr "Lytter til"
+
 msgid "Both"
 msgstr "Begge"
 
@@ -3875,12 +4221,6 @@ msgstr "Ingen"
 msgid "Subscription"
 msgstr "Abonnering"
 
-msgid "Mood"
-msgstr "Humør"
-
-msgid "Now Listening"
-msgstr "Lytter til"
-
 msgid "Mood Text"
 msgstr "Humørtekst"
 
@@ -3923,9 +4263,6 @@ msgstr "Din adgangskode blev ændret."
 msgid "Error changing password"
 msgstr "Fejl ved ændring af adgangskode"
 
-msgid "Password (again)"
-msgstr "Adgangskode (igen)"
-
 msgid "Change XMPP Password"
 msgstr "Ændr XMPP-adgangskode"
 
@@ -4118,18 +4455,24 @@ msgstr "Ude af stand til at sparke bruge %s"
 msgid "Unable to ping user %s"
 msgstr "Ude af stand til at pinge bruger %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Kan ikke bippe, fordi der ikke er noget kendt om bruger %s."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Kan ikke bippe, fordi bruger %s måske er afkoblet."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Kunne ikke bippe fordi bruger %s ikke understøtter det."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Bipper %s..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4139,9 +4482,36 @@ msgstr "Bip"
 msgid "%s has buzzed you!"
 msgstr "%s har bippet dig!"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Bipper %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Kunne ikke sende fil til %s, ugyldig JID"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Ikke i stand til at sende fil til %s, brugeren er ikke tilkoblet"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Ikke i stand til at sende fil til %s, brugeren understøtter ikke "
+"filoverførsler"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Registrering fejlede"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Vælg ressourcen fra %s som du gerne vil sende en fil"
+
+msgid "Select a Resource"
+msgstr "Vælg en ressource"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Åbn _samtale"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Sæt et samtalerum op."
@@ -4161,11 +4531,21 @@ msgstr "topic [nyt emne]:  Vis eller ændr emnet."
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [reason]:  Udvis en bruger fra rummet."
 
-msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
-msgstr "affiliate &lt;bruger&gt; &lt;owner|admin|member|outcast|none&gt;: Indstil en brugerstilknytning til rummet."
+#, fuzzy
+msgid ""
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
+msgstr ""
+"affiliate &lt;bruger&gt; &lt;owner|admin|member|outcast|none&gt;: Indstil en "
+"brugerstilknytning til rummet."
 
-msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
-msgstr "role &lt;bruger&gt; &lt;moderator|participant|visitor|none&gt;: Indstil en brugers rolle i rummet."
+#, fuzzy
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
+msgstr ""
+"role &lt;bruger&gt; &lt;moderator|participant|visitor|none&gt;: Indstil en "
+"brugers rolle i rummet."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;bruger&gt; [besked]:  Invitér en bruger til rummet."
@@ -4176,8 +4556,11 @@ msgstr "join: &lt;room&gt; [password]:  Tilslut samtalerum på denne server."
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [reason]:  Spark en bruger fra rummet."
 
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;bruger&gt; &lt;besked&gt;:  Send en privat besked til en anden bruger."
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;bruger&gt; &lt;besked&gt;:  Send en privat besked til en anden "
+"bruger."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPing en bruger/komponent/server."
@@ -4223,6 +4606,9 @@ msgstr "Tilslut til server"
 msgid "File transfer proxies"
 msgstr "Filoverførsel-proxyer"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4261,11 +4647,23 @@ msgstr "XML læsningsfejl"
 msgid "Unknown Error in presence"
 msgstr "Ukendt fejlkode i tilstedeværelse"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Fejl ved tilslutning til samtale %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Fejl i samtale %s"
+
 msgid "Create New Room"
 msgstr "Opret nyt rum"
 
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr "Du opretter et nyt rum. Vil du konfigurere det, eller bruge standardindstillingerne?"
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Du opretter et nyt rum. Vil du konfigurere det, eller bruge "
+"standardindstillingerne?"
 
 msgid "_Configure Room"
 msgstr "_Konfigurér rum"
@@ -4273,17 +4671,38 @@ msgstr "_Konfigurér rum"
 msgid "_Accept Defaults"
 msgstr "_Acceptér standardindstillinger"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Fejl ved tilslutning til samtale %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Ingen grund givet"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Fejl i samtale %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Du er blevet smidt ud af %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Smidt ud af %s: (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "En fejl skete ved forsøg på at åbne filen."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Filoverførsel fejlede"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Kunne ikke åbne fil \"%s\": %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "Ikke i stand til at sende fil til %s, brugeren understøtter ikke filoverførsler"
+msgstr ""
+"Ikke i stand til at sende fil til %s, brugeren understøtter ikke "
+"filoverførsler"
 
 msgid "File Send Failed"
 msgstr "Afsendelse af fil fejlede"
@@ -4298,15 +4717,14 @@ msgstr "Ikke i stand til at sende fil til %s, brugeren er ikke tilkoblet"
 
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "Ikke i stand til at sende fil til %s, brugeren understøtter ikke filoverførsler"
+msgstr ""
+"Ikke i stand til at sende fil til %s, brugeren understøtter ikke "
+"filoverførsler"
 
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Vælg ressourcen fra %s som du gerne vil sende en fil"
 
-msgid "Select a Resource"
-msgstr "Vælg en ressource"
-
 msgid "Edit User Mood"
 msgstr "Redigér bruger humør"
 
@@ -4325,8 +4743,12 @@ msgstr "Indstil brugerkælenavn"
 msgid "Please specify a new nickname for you."
 msgstr "Indtast dit nye kælenavn for dig."
 
-msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
-msgstr "Denne information er synlig for alle kontakter på din kontaktliste, så vælg noget passende."
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"Denne information er synlig for alle kontakter på din kontaktliste, så vælg "
+"noget passende."
 
 msgid "Set Nickname..."
 msgstr "Indstil kælenavn..."
@@ -4355,12 +4777,20 @@ msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problemer med synkronisering af venneliste i %s (%s)"
 
 #, c-format
-msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
-msgstr "%s på den lokale liste er i gruppen \"%s\" men ikke på serverlisten. Vil du have denne ven tilføjet?"
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s på den lokale liste er i gruppen \"%s\" men ikke på serverlisten. Vil du "
+"have denne ven tilføjet?"
 
 #, c-format
-msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
-msgstr "%s er på den lokale liste men ikke på serverlisten. Vil du have denne ven tilføjet?"
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s er på den lokale liste men ikke på serverlisten. Vil du have denne ven "
+"tilføjet?"
 
 #, c-format
 msgid "Unable to parse message"
@@ -4591,6 +5021,10 @@ msgstr "Andre kontakter"
 msgid "Non-IM Contacts"
 msgstr "Ikke-besked kontakter"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s har sendt dig en webcam invitation, hvilket ikke er understøttet."
+
 msgid "Nudge"
 msgstr "Flirt"
 
@@ -4626,8 +5060,12 @@ msgstr "Sæt mobiltelefonnummer."
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillad MSN mobiltelefon sider?"
 
-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 "Vil du tillade eller nægte folk på din venneliste at sende dig MSN mobiltelefon sider til din mobiltelefon eller andre mobilenheder?"
+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 ""
+"Vil du tillade eller nægte folk på din venneliste at sende dig MSN "
+"mobiltelefon sider til din mobiltelefon eller andre mobilenheder?"
 
 msgid "Allow"
 msgstr "Tillad"
@@ -4643,7 +5081,8 @@ msgid "No text is blocked for this account."
 msgstr "Ingen tekst er blokeret for denne konto."
 
 #, c-format
-msgid "MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr "MSN-servere blokerer følgende regulære udtryk:<br/>%s"
 
 msgid "This account does not have email enabled."
@@ -4734,10 +5173,9 @@ msgid "Initiate _Chat"
 msgstr "Åbn _samtale"
 
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr "SSL-understøttelse er krævet til MSN. Installér et understøttet SSL-bibliotek."
-
-msgid "Failed to connect to server."
-msgstr "Kunne ikke forbinde til server."
+msgstr ""
+"SSL-understøttelse er krævet til MSN. Installér et understøttet SSL-"
+"bibliotek."
 
 msgid "Error retrieving profile"
 msgstr "Fejl ved modtagelse af profil"
@@ -4878,11 +5316,21 @@ msgstr "Hjemmeside"
 msgid "The user has not created a public profile."
 msgstr "Brugeren har ikke oprettet en offentlig profil."
 
-msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
-msgstr "MSN rapporterede tilbage, at den ikke kunne finde brugerens profil. Dette betyder enten at brugeren ikke eksisterer, eller at brugeren ikke har oprettet en offentlig profil."
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"MSN rapporterede tilbage, at den ikke kunne finde brugerens profil. Dette "
+"betyder enten at brugeren ikke eksisterer, eller at brugeren ikke har "
+"oprettet en offentlig profil."
 
-msgid "Could not find any information in the user's profile. The user most likely does not exist."
-msgstr "Kunne ikke finde nogle oplysninger i brugerens profil. Brugeren eksisterer højst sandsynligt ikke."
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+"Kunne ikke finde nogle oplysninger i brugerens profil. Brugeren eksisterer "
+"højst sandsynligt ikke."
 
 msgid "View web profile"
 msgstr "Se internet-profil"
@@ -4918,83 +5366,60 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Godkendelse af Windows Live-id:Ugyldigt svar"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s er ikke en gyldig gruppe."
-
-msgid "Unknown error."
-msgstr "Ukendt fejl."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s på %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s sendte dig et vink!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Ukendt fejl (%d)"
 
 msgid "Unable to add user"
 msgstr "Kunne ikke tilføje bruger"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Følgende brugere mangler i din adressebog"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kunne ikke tilføje brugeren på %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Kunne ikke blokere bruger på %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Kunne ikke tillade bruger på %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s kunne ikke tilføjes, fordi din venneliste er fuld."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s er ikke en gyldig passport-konto."
+msgid "Unknown error (%d)"
+msgstr "Ukendt fejl (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Tjeneste midlertidigt utilgængelig."
+msgid "The following users are missing from your addressbook"
+msgstr "Følgende brugere mangler i din adressebog"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilbesked blev ikke sendt, fordi den var for lang."
 
-msgid "Unable to rename group"
-msgstr "Kunne ikke omdøbe gruppe"
-
-msgid "Unable to delete group"
-msgstr "Kunne ikke slette gruppe"
-
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgstr[0] ""
-"MSN-serveren vil blive lukket ned for vedligeholdelse om %d minut. Du vil automatisk blive logget af på det tidspunkt. Færdiggør alle igangværende samtaler.\n"
+"MSN-serveren vil blive lukket ned for vedligeholdelse om %d minut. Du vil "
+"automatisk blive logget af på det tidspunkt. Færdiggør alle igangværende "
+"samtaler.\n"
 "\n"
 "Efter vedligeholdelsen er blevet gennemført, kan du logge ind igen."
 msgstr[1] ""
-"MSN-serveren vil blive lukket ned for vedligeholdelse om %d minutter. Du vil automatisk blive logget af på det tidspunkt. Færdiggør alle igangværende samtaler.\n"
+"MSN-serveren vil blive lukket ned for vedligeholdelse om %d minutter. Du vil "
+"automatisk blive logget af på det tidspunkt. Færdiggør alle igangværende "
+"samtaler.\n"
 "\n"
 "Efter vedligeholdelsen er blevet gennemført, kan du logge ind igen."
 
-msgid "Message was not sent because the system is unavailable. This normally happens when the user is blocked or does not exist."
-msgstr "Besked blev ikke sendt, fordi systemet ikke er tilgængeligt. Dette sker normalt når brugeren er blokeret eller ikke findes."
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"Besked blev ikke sendt, fordi systemet ikke er tilgængeligt. Dette sker "
+"normalt når brugeren er blokeret eller ikke findes."
 
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr "Besked blev ikke sendt, fordi beskederne sendes for hurtigt."
@@ -5005,9 +5430,6 @@ msgstr "Besked blev ikke sendt, fordi en ukendt kodningsfejl opstod."
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Besked blev ikke sendt, fordi en ukendt fejl opstod."
 
-msgid "Unable to connect"
-msgstr "Kunne ikke forbinde"
-
 msgid "Writing error"
 msgstr "Skrivningsfejl"
 
@@ -5022,27 +5444,34 @@ msgstr ""
 "Forbindelsesfejl fra %s server:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Vores protokol understøttes ikke af denne server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Fejl ved fortolkning af HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Du er logget ind fra en anden maskine."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "MSN-serverne er midlertidigt utilgængelige. Vent og forsøg igen senere."
+msgstr ""
+"MSN-serverne er midlertidigt utilgængelige. Vent og forsøg igen senere."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN-serverne lukkes midlertidigt."
 
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kunne ikke godkende: %s"
 
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "Din MSN venneliste er midlertidigt utilgængelig. Vent og førsøg igen senere."
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"Din MSN venneliste er midlertidigt utilgængelig. Vent og førsøg igen senere."
 
 msgid "Handshaking"
 msgstr "Forhandler"
@@ -5062,6 +5491,14 @@ msgstr "Sender cookie"
 msgid "Retrieving buddy list"
 msgstr "Modtager venneliste"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s har sendt dig en webcam invitation, hvilket ikke er understøttet."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s har sendt dig en webcam invitation, hvilket ikke er understøttet."
+
 msgid "Away From Computer"
 msgstr "Væk fra computeren"
 
@@ -5072,7 +5509,9 @@ msgid "Out To Lunch"
 msgstr "Ude til frokost"
 
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "Besked er måske ikke blevet sendt på grund af et tidsudløb der overskred grænsen:"
+msgstr ""
+"Besked er måske ikke blevet sendt på grund af et tidsudløb der overskred "
+"grænsen:"
 
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Besked kunne ikke sendes, ikke tilladt imens du er usynlig:"
@@ -5086,23 +5525,21 @@ msgstr "Besked kunne ikke sendes på grund af en forbindelsesfejl:"
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Besked kunne ikke sendes, fordi vi sender for hurtigt:"
 
-msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
-msgstr "Besked kunne ikke sendes, fordi vi ikke kunne etablere en session med serveren. Dette er højst sandsynligt et server problem, prøv igen om nogle få minutter:"
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"Besked kunne ikke sendes, fordi vi ikke kunne etablere en session med "
+"serveren. Dette er højst sandsynligt et server problem, prøv igen om nogle "
+"få minutter:"
 
-msgid "Message could not be sent because an error with the switchboard occurred:"
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
 msgstr "Besked kunne ikke sendes på grund af en fejl med switchboard:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Besked kunne ikke sendes på grund af en ukendt årsag:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s har tilføjet dig til hans eller hendes venneliste."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s har fjernet dig fra hans eller hendes venneliste."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Slet ven fra adressebog?"
 
@@ -5132,6 +5569,54 @@ msgid "MSN Protocol Plugin"
 msgstr "MSN-protokoludvidelsesmodul"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s er ikke en gyldig gruppe."
+
+msgid "Unknown error."
+msgstr "Ukendt fejl."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s på %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kunne ikke tilføje brugeren på %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Kunne ikke blokere bruger på %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Kunne ikke tillade bruger på %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s kunne ikke tilføjes, fordi din venneliste er fuld."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s er ikke en gyldig passport-konto."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Tjeneste midlertidigt utilgængelig."
+
+msgid "Unable to rename group"
+msgstr "Kunne ikke omdøbe gruppe"
+
+msgid "Unable to delete group"
+msgstr "Kunne ikke slette gruppe"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s har tilføjet dig til hans eller hendes venneliste."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s har fjernet dig fra hans eller hendes venneliste."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Bruger findes ikke: %s"
 
@@ -5160,6 +5645,8 @@ msgid "Lost connection with server"
 msgstr "Mistede forbindelsen til server"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nye postbeskeder"
 
@@ -5182,27 +5669,38 @@ msgid "IM Friends"
 msgstr "IM-venner"
 
 #, c-format
-msgid "%d buddy was added or updated from the server (including buddies already on the server-side list)"
-msgid_plural "%d buddies were added or updated from the server (including buddies already on the server-side list)"
-msgstr[0] "%d ven blev tilføjet eller opdateret fra serveren (inkluderet venner som allerede findes på serverlisten)"
-msgstr[1] "%d venner blev tilføjet eller opdateret fra serveren (inkluderet venner som allerede findes på serverlisten)"
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d ven blev tilføjet eller opdateret fra serveren (inkluderet venner som "
+"allerede findes på serverlisten)"
+msgstr[1] ""
+"%d venner blev tilføjet eller opdateret fra serveren (inkluderet venner som "
+"allerede findes på serverlisten)"
 
 msgid "Add contacts from server"
 msgstr "Tilføj kontakter fra server"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Tilsluttet"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokol fejlkode %d: %s"
 
-#, c-format
-msgid "%s Your password is %d characters, greater than the expected maximum length of %d for MySpaceIM. Please shorten your password at http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try again."
-msgstr "%s Din adgangskode er %d karakterer og dermed større end det forventede maksimum på %d for MySpaceIM. Forkort din adgangskode på http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword og prøv igen."
+#, fuzzy, c-format
+msgid ""
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr ""
+"%s Din adgangskode er %d karakterer og dermed større end det forventede "
+"maksimum på %d for MySpaceIM. Forkort din adgangskode på http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword og prøv igen."
+
+msgid "Incorrect username or password"
+msgstr "Forkert brugernavn eller adgangskode"
 
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-fejl"
@@ -5210,16 +5708,6 @@ msgstr "MySpaceIM-fejl"
 msgid "Invalid input condition"
 msgstr "Ugyldig indtastningsbetingelse"
 
-msgid "Read buffer full (2)"
-msgstr "Læsebuffer fuld (2)"
-
-msgid "Unparseable message"
-msgstr "Kunne ikke fortolke beskeden"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Kunne ikke forbinde til vært: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Kunne ikke tilføje ven"
 
@@ -5244,8 +5732,12 @@ msgstr "Manglende kode"
 msgid "The RC4 cipher could not be found"
 msgstr "RC4 cipher kunne ikke findes"
 
-msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
-msgstr "Opgradér til en libpurple med RC4-understøttelse (>=2.0.1). MySpaceIM-udvidelsesmodul vil ikke blive indlæst."
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Opgradér til en libpurple med RC4-understøttelse (>=2.0.1). MySpaceIM-"
+"udvidelsesmodul vil ikke blive indlæst."
 
 msgid "Add friends from MySpace.com"
 msgstr "Tilføj venner fra MySpace.com"
@@ -5264,7 +5756,9 @@ msgid "myim URL handler"
 msgstr "myim URL-håndtering"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr "Der kunne ikke findes nogen passende MySpaceIM-konto til at åbne denne myim URL."
+msgstr ""
+"Der kunne ikke findes nogen passende MySpaceIM-konto til at åbne denne myim "
+"URL."
 
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Aktivér den korrekte MySpaceIM-konto og prøv igen."
@@ -5299,6 +5793,12 @@ msgstr "Totale venner"
 msgid "Client Version"
 msgstr "Klientversion"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Brugernavn tilgængeligt"
 
@@ -5515,14 +6015,15 @@ msgstr "Kan ikke tilføje dig selv"
 msgid "Master archive is misconfigured"
 msgstr "Hoved-arkiv er konfigureret forkert"
 
-msgid "Incorrect username or password"
-msgstr "Forkert brugernavn eller adgangskode"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Kunne ikke genkende værten på brugernavnet du indtastede"
 
-msgid "Your account has been disabled because too many incorrect passwords were entered"
-msgstr "Din konto er blevet deaktiveret fordi for mange ugyldige adgangskoder blev indtastet"
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+"Din konto er blevet deaktiveret fordi for mange ugyldige adgangskoder blev "
+"indtastet"
 
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Du kan ikke tilføje den samme person to gange til en samtale"
@@ -5542,8 +6043,11 @@ msgstr "Inkompatibel protokolversion"
 msgid "The user has blocked you"
 msgstr "Brugeren har blokeret dig"
 
-msgid "This evaluation version does not allow more than ten users to log in at one time"
-msgstr "Denne prøve-version tillader ikke mere end 10 brugere logget ind på samme tid"
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Denne prøve-version tillader ikke mere end 10 brugere logget ind på samme tid"
 
 msgid "The user is either offline or you are blocked"
 msgstr "Brugeren er enten afkoblet, eller du er blokeret"
@@ -5552,9 +6056,9 @@ msgstr "Brugeren er enten afkoblet, eller du er blokeret"
 msgid "Unknown error: 0x%X"
 msgstr "Ukendt fejl: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Logind slog fejl (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Ude af stand til at pinge bruger %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5582,12 +6086,20 @@ msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Kunne ikke sende besked. Kunne ikke oprette konferencen (%s)."
 
 #, c-format
-msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
-msgstr "Kunne ikke flytte bruger %s til mappe %s i serverlisten. Fejl skete, da mappe skulle oprettes (%s)."
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+"Kunne ikke flytte bruger %s til mappe %s i serverlisten. Fejl skete, da "
+"mappe skulle oprettes (%s)."
 
 #, c-format
-msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
-msgstr "Kunne ikke tilføje %s til din venneliste. Fejl ved opretning af mappe i serverliste (%s)."
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+"Kunne ikke tilføje %s til din venneliste. Fejl ved opretning af mappe i "
+"serverliste (%s)."
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
@@ -5648,9 +6160,6 @@ msgstr "GroupWise konference %d"
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-msgid "Unable to connect to server."
-msgstr "Kunne ikke kontakte server."
-
 msgid "Waiting for response..."
 msgstr "Venter på svar..."
 
@@ -5674,18 +6183,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Vil du tilslutte samtalen?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Du er blevet logget af, fordi du er logget på en anden maskine."
-
 #, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
-msgstr "%s ser ud til at være afkoblet, og har ikke modtaget beskeden du har sendt."
-
-msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
-msgstr "Kunne ikke forbinde til server. Indtast adressen på serveren du vil forbinde til."
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+"%s ser ud til at være afkoblet, og har ikke modtaget beskeden du har sendt."
 
-msgid "Error. SSL support is not installed."
-msgstr "Fejl. SSL-understøttelse er ikke installeret."
+#, fuzzy
+msgid ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr ""
+"Kunne ikke forbinde til server. Indtast adressen på serveren du vil forbinde "
+"til."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Konferencen er blevet afsluttet. Der kan ikke sendes flere beskeder."
@@ -5709,24 +6219,33 @@ msgstr "Serveradresse"
 msgid "Server port"
 msgstr "Server port"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Modtog ugyldigt HTTP-svar fra server."
+
+#. username connecting too frequently
+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 ""
+"Du er logget ind og ud for mange gange indenfor et kort tidsrum. Vent ti "
+"minutter og prøv så igen, for ellers skal du bare vente endnu længere."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Fejl ved oprettelse af forbindelse"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Kunne ikke tilslutte samtalerum"
 
 msgid "Invalid chat room name"
 msgstr "Ugyldigt navn på samtalerum"
 
-msgid "Server closed the connection."
-msgstr "Server lukkede forbindelsen."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Mistede forbindelsen til server:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Modtog ugyldig data ved forbindelse med server."
 
 #. *< type
@@ -5774,15 +6293,20 @@ msgstr "Mistede forbindelse til fjernbrugeren:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Modtog ugyldige data ved forbindelse til fjern bruger."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Kunne ikke etablere en forbindelse til en fjernbruger."
 
 msgid "Direct IM established"
 msgstr "Direkte besked etableret"
 
 #, c-format
-msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
-msgstr "%s forsøgte at sende dig en %s fil, men vi tillader kun filer op til %s over direkte besked.  Prøv at bruge filoverførelse i stedet for.\n"
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s forsøgte at sende dig en %s fil, men vi tillader kun filer op til %s over "
+"direkte besked.  Prøv at bruge filoverførelse i stedet for.\n"
 
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -5860,12 +6384,24 @@ msgstr "Kø fuld"
 msgid "Not while on AOL"
 msgstr "Ikke samtidig med AOL"
 
-msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
-msgstr "(Der opstod en fejl ved modtagelse af denne besked. Vennen du taler med bruger måske en anden indkodning end forventet. Hvis du kender indkodningen, som han bruger, kan du angive den i avancerede kontoindstillinger for din AIM/ICQ-konto.)"
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+"(Der opstod en fejl ved modtagelse af denne besked. Vennen du taler med "
+"bruger måske en anden indkodning end forventet. Hvis du kender indkodningen, "
+"som han bruger, kan du angive den i avancerede kontoindstillinger for din "
+"AIM/ICQ-konto.)"
 
 #, c-format
-msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
-msgstr "(Der opstod en fejl ved modtagelse af denne besked. Enten har du eller %s valgt forskellige indkodninger, eller har %s en fejlramt klient.)"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+"(Der opstod en fejl ved modtagelse af denne besked. Enten har du eller %s "
+"valgt forskellige indkodninger, eller har %s en fejlramt klient.)"
 
 #. Label
 msgid "Buddy Icon"
@@ -5958,21 +6494,15 @@ msgstr "Advarselsniveau"
 msgid "Buddy Comment"
 msgstr "Vennekommentar"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Kunne ikke forbinde til godkendelsesserveren:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Kunne ikke forbinde til BOS-server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Kunne ikke kontakte server."
 
 msgid "Username sent"
 msgstr "Brugernavn sendt"
@@ -5984,42 +6514,63 @@ msgstr "Forbindelse oprettet, cookie sendt"
 msgid "Finalizing connection"
 msgstr "Færddiggører forbindelse"
 
+#, fuzzy, c-format
+msgid ""
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+"Kunne ikke logge ind: Kunne ikke logge på som %s, fordi brugernavnet er "
+"ugyldigt. Brugernavne skal være en gyldig e-postadresse, eller starte med et "
+"bogstav og kun indeholde bogstaver, tal eller mellemrum, eller kun indeholde "
+"tal."
+
 #, c-format
-msgid "Unable to login: Could not sign on as %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Kunne ikke logge ind: Kunne ikke logge på som %s, fordi brugernavnet er ugyldigt. Brugernavne skal være en gyldig e-postadresse, eller starte med et bogstav og kun indeholde bogstaver, tal eller mellemrum, eller kun indeholde tal."
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Du vil måske blive frakoblet snart.  Hvis tilfældet, kontrollér %s for "
+"opdateringer."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Ugyldigt brugernavn."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kunne ikke hente et gyldigt AIM-logindhash."
 
-msgid "Incorrect password."
-msgstr "Forkert adgangskode."
+msgid "Unable to get a valid login hash."
+msgstr "Kunne ikke hente et gyldigt loginhash."
+
+msgid "Received authorization"
+msgstr "Modtog godkendelse"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Bruger eksisterer ikke"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Din konto er ikke aktiv for øjeblikket."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger tjenesten er midlertidigt utilgængelig."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 "Du er logget ind og ud for mange gange indenfor et kort tidsrum. Vent ti minutter og prøv så igen, for ellers skal du bare vente endnu længere."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Din klient er for gammel. Hent en opgradering på %s"
 
-msgid "Could Not Connect"
-msgstr "Forbindelse fejlede"
-
-msgid "Received authorization"
-msgstr "Modtog godkendelse"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Du er logget ind og ud for mange gange indenfor et kort tidsrum. Vent ti "
+"minutter og prøv så igen, for ellers skal du bare vente endnu længere."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "SecurID-nøglen du indtastede er ugyldig."
 
 msgid "Enter SecurID"
@@ -6034,20 +6585,6 @@ msgstr "Indtast det 6-cifrede tal fra det digitale display."
 msgid "_OK"
 msgstr "_O.k."
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Du vil måske blive frakoblet snart.  Hvis tilfældet, kontrollér %s for opdateringer."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Kunne ikke hente et gyldigt AIM-logindhash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Du vil måske blive frakoblet snart. Kontrollér %s for opdateringer."
-
-msgid "Unable to get a valid login hash."
-msgstr "Kunne ikke hente et gyldigt loginhash."
-
 msgid "Password sent"
 msgstr "Adgangskode sendt"
 
@@ -6071,10 +6608,12 @@ msgstr "Besked for nægtelse af godkendelses anmodning:"
 
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"Brugeren %u har nægtet din anmodning om at tilføje sig til din venneliste, af den følgende grund:\n"
+"Brugeren %u har nægtet din anmodning om at tilføje sig til din venneliste, "
+"af den følgende grund:\n"
 "%s"
 
 msgid "ICQ authorization denied."
@@ -6147,22 +6686,37 @@ msgstr[0] "Du har ikke modtaget %hu besked fra %s, fordi den var for store."
 msgstr[1] "Du har ikke modtaget %hu beskeder fra %s, fordi de var for store."
 
 #, c-format
-msgid "You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "Du har ikke modtaget %hu besked fra %s, fordi den blev sendt for hurtigt."
-msgstr[1] "Du har ikke modtaget %hu beskeder fra %s, fordi de blev sendt for hurtigt."
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+"Du har ikke modtaget %hu besked fra %s, fordi den blev sendt for hurtigt."
+msgstr[1] ""
+"Du har ikke modtaget %hu beskeder fra %s, fordi de blev sendt for hurtigt."
 
 #, c-format
-msgid "You missed %hu message from %s because his/her warning level is too high."
-msgid_plural "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "Du har ikke modtaget %hu besked fra %s, fordi hans/hendes advarselsniveau er for højt."
-msgstr[1] "Du har ikke modtaget %hu beskeder fra %s, fordi hans/hendes advarselsniveau er for højt."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Du har ikke modtaget %hu besked fra %s, fordi hans/hendes advarselsniveau er "
+"for højt."
+msgstr[1] ""
+"Du har ikke modtaget %hu beskeder fra %s, fordi hans/hendes advarselsniveau "
+"er for højt."
 
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
-msgid_plural "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "Du har ikke modtaget %hu besked fra %s, fordi dit advarselsniveau er for højt."
-msgstr[1] "Du har ikke modtaget %hu beskeder fra %s, fordi dit advarselsniveau er for højt."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Du har ikke modtaget %hu besked fra %s, fordi dit advarselsniveau er for "
+"højt."
+msgstr[1] ""
+"Du har ikke modtaget %hu beskeder fra %s, fordi dit advarselsniveau er for "
+"højt."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -6170,7 +6724,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du har ikke modtaget %hu besked fra %s pga. en ukendt årsag."
 msgstr[1] "Du har ikke modtaget %hu beskeder fra %s pga. en ukendt årsag."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kunne ikke sende besked: %s"
@@ -6192,6 +6746,9 @@ msgstr "Tilkoblet siden"
 msgid "Member Since"
 msgstr "Medlem siden"
 
+msgid "Capabilities"
+msgstr "Klient understøtter"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -6199,11 +6756,19 @@ msgid "Your AIM connection may be lost."
 msgstr "Din AIM forbindelse kan være afbrudt."
 
 #. The conversion failed!
-msgid "[Unable to display a message from this user because it contained invalid characters.]"
-msgstr "[Ude af stand til at vise en besked fra denne bruger, fordi den indeholdte ugyldige bogstaver.]"
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+"[Ude af stand til at vise en besked fra denne bruger, fordi den indeholdte "
+"ugyldige bogstaver.]"
 
-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 "Den sidste handling blev ikke udført, fordi du har overskredet grænsen. Vent i 10 sekunder og prøv igen."
+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 ""
+"Den sidste handling blev ikke udført, fordi du har overskredet grænsen. Vent "
+"i 10 sekunder og prøv igen."
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -6256,28 +6821,48 @@ msgid "Account Confirmation Requested"
 msgstr "Der er anmodet om konto bekræftelse"
 
 #, c-format
-msgid "Error 0x%04x: Unable to format username because the requested name differs from the original."
-msgstr "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede brugernavn er forskelligt fra det oprindelige."
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+"Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede brugernavn "
+"er forskelligt fra det oprindelige."
 
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det er ugyldigt."
 
 #, c-format
-msgid "Error 0x%04x: Unable to format username because the requested name is too long."
-msgstr "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede navn er for langt."
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+"Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede navn er for "
+"langt."
 
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this username."
-msgstr "Fejl 0x%04x: Kan ikke ændre e-postadresse, fordi der allerede er en anmodning ventende for dette brugernavn."
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+"Fejl 0x%04x: Kan ikke ændre e-postadresse, fordi der allerede er en "
+"anmodning ventende for dette brugernavn."
 
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many usernames associated with it."
-msgstr "Fejl 0x%04x: Kan ikke ændre e-postadresse, fordi den angivne adresse har for mange brugernavne tilknyttet sig."
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many usernames associated with it."
+msgstr ""
+"Fejl 0x%04x: Kan ikke ændre e-postadresse, fordi den angivne adresse har for "
+"mange brugernavne tilknyttet sig."
 
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
-msgstr "Fejl 0x%04x: Kan ikke ændre e-postadresse, fordi den angivne adresse er ugyldig."
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+"Fejl 0x%04x: Kan ikke ændre e-postadresse, fordi den angivne adresse er "
+"ugyldig."
 
 #, c-format
 msgid "Error 0x%04x: Unknown error."
@@ -6293,36 +6878,67 @@ msgstr "%s's e-postadresse er %s"
 msgid "Account Info"
 msgstr "Konto Oplysninger"
 
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr "Dit billede blev ikke sendt. Du skal være direkte forbundet for at sende billeder."
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"Dit billede blev ikke sendt. Du skal være direkte forbundet for at sende "
+"billeder."
 
 msgid "Unable to set AIM profile."
 msgstr "Kunne ikke ændre AIM profil."
 
-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 "Du har sikkert anmodet om at sætte din profil før login-processen er blevet færdig. Din profil er ikke sat; prøv at sætte den igen når du er færdig med at forbinde til serveren."
+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 ""
+"Du har sikkert anmodet om at sætte din profil før login-processen er blevet "
+"færdig. Din profil er ikke sat; prøv at sætte den igen når du er færdig med "
+"at forbinde til serveren."
 
 #, c-format
-msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
-msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
-msgstr[0] "Profil-længdens maksimale størrelse på %d byte er blevet overskredet.  Den er blevet forkortet for dig."
-msgstr[1] "Profil-længdens maksimale størrelse på %d bytes er blevet overskredet.  Den er blevet forkortet for dig."
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+"Profil-længdens maksimale størrelse på %d byte er blevet overskredet.  Den "
+"er blevet forkortet for dig."
+msgstr[1] ""
+"Profil-længdens maksimale størrelse på %d bytes er blevet overskredet.  Den "
+"er blevet forkortet for dig."
 
 msgid "Profile too long."
 msgstr "Profil for lang."
 
 #, c-format
-msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
-msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
-msgstr[0] "Fraværsbeskedens maksimale længde på %d byte er blevet overskredet.  Den er blevet forkortet for dig."
-msgstr[1] "Fraværsbeskedens maksimale længde på %d bytes er blevet overskredet.  Den er blevet forkortet for dig."
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+"Fraværsbeskedens maksimale længde på %d byte er blevet overskredet.  Den er "
+"blevet forkortet for dig."
+msgstr[1] ""
+"Fraværsbeskedens maksimale længde på %d bytes er blevet overskredet.  Den er "
+"blevet forkortet for dig."
 
 msgid "Away message too long."
 msgstr "Fraværsbesked for lang."
 
-#, c-format
-msgid "Could not add the buddy %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Kunne ikke tilføje vennen %s, fordi brugernavnet er ugyldigt.  Brugernavne skal være en gyldig e-postadresse, eller starte med ét bogstav og kun indeholde bogstaver, tal og mellemrum, eller kun indeholde tal."
+#, fuzzy, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+"Kunne ikke tilføje vennen %s, fordi brugernavnet er ugyldigt.  Brugernavne "
+"skal være en gyldig e-postadresse, eller starte med ét bogstav og kun "
+"indeholde bogstaver, tal og mellemrum, eller kun indeholde tal."
 
 msgid "Unable to Add"
 msgstr "Ikke i stand til at tilføje"
@@ -6330,26 +6946,39 @@ msgstr "Ikke i stand til at tilføje"
 msgid "Unable to Retrieve Buddy List"
 msgstr "Kunne ikke hente venneliste"
 
-msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few minutes."
-msgstr "AIM-serverne var midlertidigt ude af stand til at sende din venneliste.  Din venneliste er ikke tabt, og vil sikkert blive tilgængelig indenfor et par minutter."
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few minutes."
+msgstr ""
+"AIM-serverne var midlertidigt ude af stand til at sende din venneliste.  Din "
+"venneliste er ikke tabt, og vil sikkert blive tilgængelig indenfor et par "
+"minutter."
 
 msgid "Orphans"
 msgstr "Tabte"
 
-#, 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 "Kunne ikke tilføje vennen %s fordi du har for mange venner i din venneliste.Fjern en, og prøv igen."
+#, fuzzy, c-format
+msgid ""
+"Unable to add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+"Kunne ikke tilføje vennen %s fordi du har for mange venner i din venneliste."
+"Fjern en, og prøv igen."
 
 msgid "(no name)"
 msgstr "(intet navn)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Kunne ikke tilføje vennen %s af en ukendt årsag."
 
 #, c-format
-msgid "The user %s has given you permission to add him or her to your buddy list.  Do you want to add this user?"
-msgstr "Brugeren %s har givet dig lov til at tilføje dig til din venneliste.  Vil du tilføje brugeren?"
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+"Brugeren %s har givet dig lov til at tilføje dig til din venneliste.  Vil du "
+"tilføje brugeren?"
 
 msgid "Authorization Given"
 msgstr "Godkendelse Givet"
@@ -6357,7 +6986,9 @@ msgstr "Godkendelse Givet"
 #. Granted
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "Brugeren %s har givet lov til din anmodning om at tilføje dem til din venneliste."
+msgstr ""
+"Brugeren %s har givet lov til din anmodning om at tilføje dem til din "
+"venneliste."
 
 msgid "Authorization Granted"
 msgstr "Godkendelse Givet"
@@ -6365,10 +6996,12 @@ msgstr "Godkendelse Givet"
 #. Denied
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"Brugeren %s har nægtet din anmodning om at tilføje dem til din venneliste af følgende grund:\n"
+"Brugeren %s har nægtet din anmodning om at tilføje dem til din venneliste af "
+"følgende grund:\n"
 "%s"
 
 msgid "Authorization Denied"
@@ -6378,7 +7011,8 @@ msgid "_Exchange:"
 msgstr "_Udveksl:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "Dit billede blev ikke sendt. Du kan ikke sende billeder i AIM-samtaler."
+msgstr ""
+"Dit billede blev ikke sendt. Du kan ikke sende billeder i AIM-samtaler."
 
 msgid "iTunes Music Store Link"
 msgstr "Henvisning til iTunes Music Store"
@@ -6394,8 +7028,12 @@ msgstr "Vennekommentar:"
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Du har valgt at åbne en direkte besked-forbindelse med %s."
 
-msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
-msgstr "Fordi dette afslører din IP-adresse, ses det som en privatlivs-risiko. Vil du fortsætte?"
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Fordi dette afslører din IP-adresse, ses det som en privatlivs-risiko. Vil "
+"du fortsætte?"
 
 msgid "C_onnect"
 msgstr "_Tilslut"
@@ -6420,7 +7058,8 @@ msgid "Require authorization"
 msgstr "Kræv godkendelse"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "Internet tilstedeværelse (hvis dette er slået til vil du modtage SPAM!)"
+msgstr ""
+"Internet tilstedeværelse (hvis dette er slået til vil du modtage SPAM!)"
 
 msgid "ICQ Privacy Options"
 msgstr "ICQ privatlivsindstillinger"
@@ -6440,8 +7079,12 @@ msgstr "<i>du venter ikke på godkendelse</i>"
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Du afventer godkendelse fra følgende venner"
 
-msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
-msgstr "Du kan anmode om ny godkendelse fra disse venner ved at højreklikke på dem og vælge \"Anmod om ny godkendelse\"."
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"Du kan anmode om ny godkendelse fra disse venner ved at højreklikke på dem "
+"og vælge \"Anmod om ny godkendelse\"."
 
 msgid "Find Buddy by Email"
 msgstr "Find ven udfra e-postadresse"
@@ -6458,6 +7101,7 @@ msgstr "_Søg"
 msgid "Set User Info (web)..."
 msgstr "Indstil brugeroplysninger (internet)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Ændr adgangskode (internet)"
 
@@ -6487,6 +7131,10 @@ msgstr "Søg efter ven udfra e-postadresse..."
 msgid "Search for Buddy by Information"
 msgstr "Søg efter ven udfra oplysninger"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Bruger er ikke logget ind"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6514,8 +7162,14 @@ msgstr "Forsøger at forbinde via proxy-server."
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s har lige spurgt om at forbinde direkte til %s"
 
-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 "Dette kræver en direkte forbindelse imellem to computere og er nødvendigt for billeder. Fordi din IP-adresse vil blive afsløret, kan det anses som en privatlivs risiko."
+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 ""
+"Dette kræver en direkte forbindelse imellem to computere og er nødvendigt "
+"for billeder. Fordi din IP-adresse vil blive afsløret, kan det anses som en "
+"privatlivs risiko."
 
 msgid "Aquarius"
 msgstr "Vandmand"
@@ -6670,6 +7324,38 @@ msgstr "Opdatér"
 msgid "Could not change buddy information."
 msgstr "Kunne ikke ændre venneinformation."
 
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Note"
+msgstr "Note"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Venneikon"
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "Ret"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Ret"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Server travl"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u kræver godkendelse"
@@ -6978,6 +7664,13 @@ msgstr "<p><b>Elskede programrettelsesskrivere</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Bekræft anerkendelse</b>:<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Oprindelig forfatter</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Og alle drengene i baggrunden...</i><br>\n"
 
@@ -7003,6 +7696,10 @@ msgstr "Opdatér alle QQ Qun'er"
 msgid "About OpenQ"
 msgstr "Om OpenQ"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Ændr adresse"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7049,7 +7746,8 @@ msgstr "Hold i live interval (sekunder)"
 msgid "Update interval (seconds)"
 msgstr "Opdateringsinterval (sekunder)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Kan ikke afkryptere serversvar"
 
 #, c-format
@@ -7074,9 +7772,6 @@ msgstr "Aktivering krævet"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Ukendt svarkode ved indlogning i (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Kunne ikke afkryptere serversvar"
-
 msgid "Requesting captcha"
 msgstr "Anmoder om captcha"
 
@@ -7110,30 +7805,18 @@ msgstr ""
 "Ukendt svarkode ved indlogning i (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Kunne ikke få kontakt."
-
 msgid "Socket error"
 msgstr "Sokkel-fejl"
 
-msgid "Unable to read from socket"
-msgstr "Kan ikke læse fra sokkel"
-
-msgid "Write Error"
-msgstr "Skrive fejl"
-
-msgid "Connection lost"
-msgstr "Forbindelse mistet"
-
 msgid "Getting server"
 msgstr "Finder server"
 
 msgid "Requesting token"
 msgstr "Anmoder om nøgle"
 
-msgid "Couldn't resolve host"
-msgstr "Kunne ikke slå vært op"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Kunne ikke kontakte server."
 
 msgid "Invalid server or port"
 msgstr "Ugyldig server eller port"
@@ -7186,7 +7869,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun-kommando"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Kan ikke afkryptere logindsvar"
 
 msgid "Unknown LOGIN CMD"
@@ -7206,9 +7890,6 @@ msgstr "Send fil"
 msgid "%d canceled the transfer of %s"
 msgstr "%d annullerede overførslen af %s"
 
-msgid "Connection closed (writing)"
-msgstr "Forbindelse lukket (skrivning)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppe titel:</b> %s<br>"
@@ -7255,23 +7936,14 @@ msgid "Starting Services"
 msgstr "Starter tjenester"
 
 #, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr "En Sametime administrator har sendt den følgende annoncering på server %s"
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+"En Sametime administrator har sendt den følgende annoncering på server %s"
 
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime administrator annoncering"
 
-msgid "Connection reset"
-msgstr "Forbindelse lukket"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Fejl under læsning fra sokkel: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Kunne ikke forbinde til vært"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Annoncering fra %s"
@@ -7294,6 +7966,9 @@ msgstr "Højtalere"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Filoverførsel"
+
 msgid "Supports"
 msgstr "Understøtter"
 
@@ -7304,8 +7979,12 @@ msgid "Create conference with user"
 msgstr "Opret konference med bruger"
 
 #, c-format
-msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
-msgstr "Indtast et emne for den nye konference, og en invitationsbesked der skal sendes til %s"
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+"Indtast et emne for den nye konference, og en invitationsbesked der skal "
+"sendes til %s"
 
 msgid "New Conference"
 msgstr "Ny konference"
@@ -7323,8 +8002,14 @@ msgid "Invite user to a conference"
 msgstr "Invitér bruger til en konference"
 
 #, c-format
-msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
-msgstr "Vælg en konference fra listen forneden for at sende en invitation til bruger %s. Vælg \"Opret ny konference\" hvis du vil oprette en ny konference at invitere denne bruger til."
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+"Vælg en konference fra listen forneden for at sende en invitation til bruger "
+"%s. Vælg \"Opret ny konference\" hvis du vil oprette en ny konference at "
+"invitere denne bruger til."
 
 msgid "Invite to Conference"
 msgstr "Invitér til konference"
@@ -7342,8 +8027,12 @@ msgid "No Sametime Community Server specified"
 msgstr "Ingen Sametime community server angivet"
 
 #, c-format
-msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
-msgstr "Ingen vært eller IP-adresse er blevet sat op for Meanwhile-kontoen %s. Indtast en forneden for at fortsætte med at logge ind."
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"Ingen vært eller IP-adresse er blevet sat op for Meanwhile-kontoen %s. "
+"Indtast en forneden for at fortsætte med at logge ind."
 
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile forbindelsesopsætning"
@@ -7371,8 +8060,13 @@ msgid "An ambiguous user ID was entered"
 msgstr "Et ugyldigt bruger id blev indtastet"
 
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
-msgstr "Identificeringen '%s' kan henvise til hvilken som helst af de følgende brugere. Vælg den korrekte bruger fra listen forneden for at tilføje dem til din venneliste."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"Identificeringen '%s' kan henvise til hvilken som helst af de følgende "
+"brugere. Vælg den korrekte bruger fra listen forneden for at tilføje dem til "
+"din venneliste."
 
 msgid "Select User"
 msgstr "Vælg bruger"
@@ -7381,8 +8075,12 @@ msgid "Unable to add user: user not found"
 msgstr "Kunne ikke tilføje bruger: bruger ikke fundet"
 
 #, c-format
-msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
-msgstr "Identificeringen '%s' matchede ikke nogle brugere i dit Sametime fællesskab. Denne post er blevet fjernet fra din venneliste."
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"Identificeringen '%s' matchede ikke nogle brugere i dit Sametime fællesskab. "
+"Denne post er blevet fjernet fra din venneliste."
 
 #, c-format
 msgid ""
@@ -7435,8 +8133,14 @@ msgid "Notes Address Book group results"
 msgstr "Notes adressebog grupperesultater"
 
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
-msgstr "Identificeringen '%s' kan henvise til hvilken som helst af de følgende Notes adressebogsgrupper. Vælg den korrekte gruppe fra listen forneden for at tilføje den til din venneliste."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+"Identificeringen '%s' kan henvise til hvilken som helst af de følgende Notes "
+"adressebogsgrupper. Vælg den korrekte gruppe fra listen forneden for at "
+"tilføje den til din venneliste."
 
 msgid "Select Notes Address Book"
 msgstr "Vælg Notes adressebog"
@@ -7445,22 +8149,36 @@ msgid "Unable to add group: group not found"
 msgstr "Kunne ikke tilføje gruppe: gruppe ikke fundet"
 
 #, c-format
-msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
-msgstr "Identificeringen '%s' matchede ikke nogle Notes adressebogsgrupper i dit Sametime fællesskab."
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+"Identificeringen '%s' matchede ikke nogle Notes adressebogsgrupper i dit "
+"Sametime fællesskab."
 
 msgid "Notes Address Book Group"
 msgstr "Notes adressebogsgruppe"
 
-msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
-msgstr "Indtast navnet på en Notes adressebogsgruppe i feltet forneden for at tilføje gruppen og dens medlemmer til din venneliste."
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+"Indtast navnet på en Notes adressebogsgruppe i feltet forneden for at "
+"tilføje gruppen og dens medlemmer til din venneliste."
 
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Søgeresultater for '%s'"
 
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
-msgstr "Identificeringen '%s' kan muligvis henvise til hvilken som helst af de følgende brugere. Du kan tilføje disse brugere til din venneliste eller sende dem beskeder med handlingsknapperne forneden."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+"Identificeringen '%s' kan muligvis henvise til hvilken som helst af de "
+"følgende brugere. Du kan tilføje disse brugere til din venneliste eller "
+"sende dem beskeder med handlingsknapperne forneden."
 
 msgid "Search Results"
 msgstr "Søgeresultater"
@@ -7470,7 +8188,8 @@ msgstr "Ingen fundne"
 
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr "Identificeringen '%s' matchede ingen brugere i dit Sametime fællesskab."
+msgstr ""
+"Identificeringen '%s' matchede ingen brugere i dit Sametime fællesskab."
 
 msgid "No Matches"
 msgstr "Ingen fundne"
@@ -7478,8 +8197,12 @@ msgstr "Ingen fundne"
 msgid "Search for a user"
 msgstr "Søg efter en bruger"
 
-msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
-msgstr "Indtast et navn eller delvist id i feltet forneden for at søge efter matchende brugere i dit Sametime fællesskab."
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"Indtast et navn eller delvist id i feltet forneden for at søge efter "
+"matchende brugere i dit Sametime fællesskab."
 
 msgid "User Search"
 msgstr "Brugersøgning"
@@ -7535,7 +8258,9 @@ msgid "The remote user is not present in the network any more"
 msgstr "Brugeren er ikke til stede i netværket længere"
 
 #, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
 msgstr "Anmodning om nøgle enighed modtaget %s. Vil du udføre nøgle enigheden?"
 
 #, c-format
@@ -7582,8 +8307,13 @@ msgstr "Kan ikke hente oplysninger"
 msgid "The %s buddy is not trusted"
 msgstr "Vennen %s er ikke betroet"
 
-msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
-msgstr "Du kan ikke modtage venne-påmindelser før du importerer hans/hendes offentlige nøgle. Du kan bruge \"Hent offentlig nøgle\" kommandoen for at hente den offentlige nøgle."
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"Du kan ikke modtage venne-påmindelser før du importerer hans/hendes "
+"offentlige nøgle. Du kan bruge \"Hent offentlig nøgle\" kommandoen for at "
+"hente den offentlige nøgle."
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -7593,8 +8323,12 @@ msgstr "Åbn..."
 msgid "The %s buddy is not present in the network"
 msgstr "%s vennen er ikke til stede på netværket"
 
-msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
-msgstr "For at tilføje vennen, skal du importere hendes/hans offentlige nøgle. Tryk Importér for at importere en offentlig nøgle."
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"For at tilføje vennen, skal du importere hendes/hans offentlige nøgle. Tryk "
+"Importér for at importere en offentlig nøgle."
 
 msgid "_Import..."
 msgstr "_Importér..."
@@ -7602,11 +8336,19 @@ msgstr "_Importér..."
 msgid "Select correct user"
 msgstr "Vælg en korrekt bruger"
 
-msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
-msgstr "Mere end én bruger blev fundet med den samme offentlige nøgle. Vælg den korrekte bruger fra listen som du vil tilføje til din venneliste."
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"Mere end én bruger blev fundet med den samme offentlige nøgle. Vælg den "
+"korrekte bruger fra listen som du vil tilføje til din venneliste."
 
-msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
-msgstr "Mere end én bruger blev fundet med det samme navn. Vælg den korrekte bruger fra listen, som du vil tilføje til din venneliste."
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+"Mere end én bruger blev fundet med det samme navn. Vælg den korrekte bruger "
+"fra listen, som du vil tilføje til din venneliste."
 
 msgid "Detached"
 msgstr "Ikke koblet på"
@@ -7756,8 +8498,18 @@ msgid "Channel Public Keys List"
 msgstr "Kanalens liste med offentlige nøgler"
 
 #, c-format
-msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
-msgstr "Kanal godkendelse brugeres til at sikre kanalen fra uønsket adgang. Godkendelsen kan være baseret på en adgangssætning og digitale underskrifter. Hvis adgangssætningen er angivet, er den påkrævet for at tilslutte. Hvis kanalens offentlige nøgler er angivet, så er det kun brugere hvis offentlige nøgler der er nævnt, som kan deltage."
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"Kanal godkendelse brugeres til at sikre kanalen fra uønsket adgang. "
+"Godkendelsen kan være baseret på en adgangssætning og digitale "
+"underskrifter. Hvis adgangssætningen er angivet, er den påkrævet for at "
+"tilslutte. Hvis kanalens offentlige nøgler er angivet, så er det kun brugere "
+"hvis offentlige nøgler der er nævnt, som kan deltage."
 
 msgid "Channel Authentication"
 msgstr "Kanal godkendelse"
@@ -7821,7 +8573,8 @@ msgid "Set Secret Channel"
 msgstr "Sæt hemmelig kanal"
 
 #, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr "Du skal tilslutte %s kanalen før du kan tilslutte den private gruppe"
 
 msgid "Join Private Group"
@@ -7931,9 +8684,6 @@ msgstr "Organisation"
 msgid "Unit"
 msgstr "Enhed"
 
-msgid "Note"
-msgstr "Note"
-
 msgid "Join Chat"
 msgstr "Tilslut samtale"
 
@@ -8033,6 +8783,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Netværk statistik"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping fejlede"
 
@@ -8061,8 +8814,12 @@ msgid "Passphrase required"
 msgstr "Adgangssætning krævet"
 
 #, c-format
-msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
-msgstr "Modtog %s's offentlige nøgle. Din lokale kopi passer ikke med denne nøgle. Vil du stadig acceptere den?"
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"Modtog %s's offentlige nøgle. Din lokale kopi passer ikke med denne nøgle. "
+"Vil du stadig acceptere den?"
 
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
@@ -8092,35 +8849,39 @@ msgstr "Ikke understøttet offentlige nøgle type"
 msgid "Disconnected by server"
 msgstr "Afbrudt af server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Fejl ved forbindelse til SILC-server"
 
 msgid "Key Exchange failed"
 msgstr "Nøgle udveksling fejlede"
 
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "Genoptagelse af tidligere session fejlede. Lav en ny forbindelse ved at trykke på gentabler forbindelse."
-
-msgid "Connection failed"
-msgstr "Forbindelse fejlede"
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Genoptagelse af tidligere session fejlede. Lav en ny forbindelse ved at "
+"trykke på gentabler forbindelse."
 
 msgid "Performing key exchange"
 msgstr "Udfører nøgleudveksling"
 
-msgid "Unable to create connection"
-msgstr "Kunne ikke oprette forbindelse"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Kunne ikke indlæse SILC-nøglepar"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Tilslutter til SILC-server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Kunne ikke indlæse SILC-nøglepar"
+
 msgid "Out of memory"
 msgstr "Løb tør for hukommelse"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Kan ikke initialisere SILC-protokol"
 
 msgid "Error loading SILC key pair"
@@ -8177,8 +8938,14 @@ msgstr "Tidszone (UTC)"
 msgid "User Online Status Attributes"
 msgstr "Status-attributter for tilkoblet bruger"
 
-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 "Du kan lade andre brugere se dine tilkoblede statusoplysninger og dine personlige oplysninger. Udfyld de oplysninger, du gerne vil have at folk kan se om dig."
+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 ""
+"Du kan lade andre brugere se dine tilkoblede statusoplysninger og dine "
+"personlige oplysninger. Udfyld de oplysninger, du gerne vil have at folk kan "
+"se om dig."
 
 msgid "Message of the Day"
 msgstr "Dagens besked (MOTD)"
@@ -8262,7 +9029,8 @@ msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nyt emne&gt;]:  Vis eller ændr emnet"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;kanal&gt; [&lt;adgangskode&gt;]:  Tilslut samtale på dette netværk"
+msgstr ""
+"join &lt;kanal&gt; [&lt;adgangskode&gt;]:  Tilslut samtale på dette netværk"
 
 msgid "list:  List channels on this network"
 msgstr "list:  Vis kanaler på dette netværk"
@@ -8274,7 +9042,8 @@ msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;navn&gt; &lt;besked&gt;:  Send en privat besked til en bruger"
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;navn&gt; [&lt;besked&gt;]:  Send en privat besked til en bruger"
+msgstr ""
+"query &lt;navn&gt; [&lt;besked&gt;]:  Send en privat besked til en bruger"
 
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Vis dagens besked (MOTD)"
@@ -8297,11 +9066,19 @@ msgstr "nick &lt;nyt navn&gt;:  Ændr dit kælenavn"
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;navn&gt;:  Vis brugerens oplysninger"
 
-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
-msgstr "cmode &lt;kanal&gt; [+|-&lt;tilstande&gt;] [argumenter]:  Ændre eller vis kanaltilstande"
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;kanal&gt; [+|-&lt;tilstande&gt;] [argumenter]:  Ændre eller vis "
+"kanaltilstande"
 
-msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
-msgstr "cumode &lt;kanal&gt; +|-&lt;tilstande&gt; &lt;navn&gt;:  Ændre brugerens tilstande på kanal"
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;kanal&gt; +|-&lt;tilstande&gt; &lt;navn&gt;:  Ændre brugerens "
+"tilstande på kanal"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;brugertilstande&gt;:  Angiv dine tilstande på netværket"
@@ -8309,8 +9086,12 @@ msgstr "umode &lt;brugertilstande&gt;:  Angiv dine tilstande på netværket"
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;navn&gt; [-pubkey]:  Få server operatør privilegier"
 
-msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
-msgstr "invite &lt;kanal&gt; [-|+]&lt;navn&gt;:  invitér navn eller tilføj/fjern fra kanal invitationsliste"
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;kanal&gt; [-|+]&lt;navn&gt;:  invitér navn eller tilføj/fjern fra "
+"kanal invitationsliste"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;kanal&gt; &lt;navn&gt; [comment]:  Spark klient fra kanal"
@@ -8322,7 +9103,8 @@ msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;navn&gt;]:  Udvis klient fra kanal"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;navn|server&gt;:  Hent klientens eller serverens offentlige nøgle"
+msgstr ""
+"getkey &lt;navn|server&gt;:  Hent klientens eller serverens offentlige nøgle"
 
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Vis server- og netværksstatistik"
@@ -8333,8 +9115,12 @@ msgstr "ping:  Send PING til den forbundne server"
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Vis brugere på kanalen"
 
-msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
-msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(er)&gt;:  Vis angivne brugere på kanal(er)"
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(er)&gt;:  Vis angivne "
+"brugere på kanal(er)"
 
 #. *< type
 #. *< ui_requirement
@@ -8388,7 +9174,8 @@ msgstr "Skriv alle beskeder under med digital underskrift og godkend dem"
 msgid "Creating SILC key pair..."
 msgstr "Opretter SILC-nøglepar..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Kan ikke oprette SILC-nøglepar\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -8471,7 +9258,9 @@ msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s sendte besked til tavle. Vil du åbne tavlen?"
 
 #, c-format
-msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
 msgstr "%s sendte besked til tavle på kanalen %s. Vil du åbne tavlen?"
 
 msgid "Whiteboard"
@@ -8480,6 +9269,9 @@ msgstr "Tavle"
 msgid "No server statistics available"
 msgstr "Ingen serverstatistik tilgængelig"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Fejl ved forbindelse til SILC-server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fejl: Version uoverensstemmelse, opgradér din klient"
@@ -8520,30 +9312,27 @@ msgstr "Fejl: Ugyldig cookie"
 msgid "Failure: Authentication failed"
 msgstr "Fejl: Godkendelse fejlede"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Kan ikke initialisere SILC-klient forbindelse"
 
 msgid "John Noname"
 msgstr "Intet navn"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Kunne ikke indlæse SILC-nøglepar: %s"
 
-msgid "Could not write"
-msgstr "Kunne ikke skrive"
-
-msgid "Could not connect"
-msgstr "Kunne ikke forbinde"
+msgid "Unable to create connection"
+msgstr "Kunne ikke oprette forbindelse"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Ukendt serversvar."
 
-msgid "Could not create listen socket"
-msgstr "Kunne ikke oprette lyttende sokkel"
-
-msgid "Could not resolve hostname"
-msgstr "Kunne ikke slå værtsnavn op"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Kunne ikke oprette sokkel"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-brugernavne må ikke indeholde mellemrum og @-tegn"
@@ -8584,171 +9373,62 @@ msgstr "Autentificering bruger"
 msgid "Auth Domain"
 msgstr "Autentificering domæne"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Slår %s op"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Forbindelse til %s fejlede"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Tilsluttet: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Kunne ikke skrive til filen %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Kunne ikke læse filen %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Beskeden var for lang - de sidste %s bytes blev slettet."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s er ikke logget på lige nu."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Du kan ikke advare %s."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "En besked blev ikke sendt - du var hurtigere end serveren."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Samtale i %s er ikke muligt."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Du sender beskeder for hurtigt til %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Du har ikke modtaget en besked fra %s, fordi den var for lang."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Du har ikke modtaget en besked fra %s, fordi den blev sendt for hurtigt."
-
-#, c-format
-msgid "Failure."
-msgstr "Fejl."
-
-#, c-format
-msgid "Too many matches."
-msgstr "For mange resultater."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Angiv flere søgeord."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Søgetjeneste midlertidigt utilgængelig."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "E-post søgning er begrænset."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Nøgleord ignoreret."
-
-#, c-format
-msgid "No keywords."
-msgstr "Ingen nøgleord."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Ingen oplysninger om brugeren fundet."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Land ikke understøttet."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Ukendt fejl: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Forkert brugernavn eller adgangskode."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Tjenesten er midlertidigt utilgængelig."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Du har for mange advarsler i øjeblikket til at kunne logge ind."
-
-#, c-format
-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 "Du er logget ind og ud for mange gange indenfor et kort tidsrum. Vent ti minutter og prøv så igen, for ellers skal du bare vente endnu længere."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Der opstod en ukendt fejl under logind: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "En ukendt fejl, %d, er opstået. Info: %s"
-
-msgid "Invalid Groupname"
-msgstr "Ugyldigt gruppenavn"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;rum&gt;:  Tilslut samtalerum på Yahoo-netværket"
 
-msgid "Connection Closed"
-msgstr "Forbindelse lukket"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Vis rum på Yahoo-netværket"
 
-msgid "Waiting for reply..."
-msgstr "Venter på svar..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Anmod en bruger om at starte en \"Doodle\"-session"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC er blevet tilgængelig. Du kan nu sende beskeder igen."
+msgid "Yahoo ID..."
+msgstr "Yahoo-id..."
 
-msgid "Password Change Successful"
-msgstr "Adgangskode ændret"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo protokolmodul"
 
-msgid "_Group:"
-msgstr "_Gruppe:"
+msgid "Pager server"
+msgstr "Bipper-server"
 
-msgid "Get Dir Info"
-msgstr "Hent mappeoplysninger"
+msgid "Pager port"
+msgstr "Bipper port"
 
-msgid "Set Dir Info"
-msgstr "Ret mappeoplysninger"
+msgid "File transfer server"
+msgstr "Filoverførselsserver"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Kunne ikke åbne %s til skrivning!"
+msgid "File transfer port"
+msgstr "Filoverførsel port"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Filoverførsel fejlede - den anden side har sikkert afbrudt."
+msgid "Chat room locale"
+msgstr "Samtalerum tegnsæt"
 
-msgid "Could not connect for transfer."
-msgstr "Kunne ikke oprette forbindelse til overførsel."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorér konference og samtalerum invitationer"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Kunne ikke skrive fil-hoved. Filen vil ikke blive overført."
+msgid "Chat room list URL"
+msgstr "Adresse på liste over samtalerum"
 
-msgid "Save As..."
-msgstr "Gem som..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo-samtaleserver"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s anmoder %s om at acceptere %d fil: %s (%.2f %s)%s%s"
-msgstr[1] "%s anmoder %s om at acceptere %d filer: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo-samtaleport"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s beder dig om at sende en fil"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo-id..."
 
 #. *< type
 #. *< ui_requirement
@@ -8760,12 +9440,12 @@ msgstr "%s beder dig om at sende en fil"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC protokolmodul"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo protokolmodul"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s har sendt dig en webcam invitation, hvilket ikke er understøttet."
+msgid "Your SMS was not delivered"
+msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Din Yahoo! besked blev ikke sendt."
@@ -8775,28 +9455,71 @@ msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! systembesked til %s:"
 
 #, c-format
-msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
 msgstr ""
-"%s har (tilbagevirkende) nægtet din anmodning om at tilføje dem til din venneliste af følgende grund:\n"
+"%s har (tilbagevirkende) nægtet din anmodning om at tilføje dem til din "
+"venneliste af følgende grund:\n"
 "%s."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s har (tilbagevirkende) nægtet din anmodning om at tilføje dem til din venneliste."
+msgstr ""
+"%s har (tilbagevirkende) nægtet din anmodning om at tilføje dem til din "
+"venneliste."
 
 msgid "Add buddy rejected"
 msgstr "Vennetilføjelse nægtet"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Modtog ugyldig data ved forbindelse med server."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Ukendt fejl nummer %d. Prøv at logge ind på Yahoo!webstedet for at fixe "
+"dette."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Ukendt fejl nummer %d. Prøv at logge ind på Yahoo!webstedet for at fixe "
+"dette."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Forkert brugernavn eller adgangskode"
+
 #, c-format
-msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
-msgstr "Yahoo-serveren har anmodet om brugen af en ukendt godkendelsesmetode.  Du vil højst sandsynligt ikke kunne logge problemfrit på Yahoo.  Kontrollér %s for opdateringer."
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+"Yahoo-serveren har anmodet om brugen af en ukendt godkendelsesmetode.  Du "
+"vil højst sandsynligt ikke kunne logge problemfrit på Yahoo.  Kontrollér %s "
+"for opdateringer."
 
 msgid "Failed Yahoo! Authentication"
 msgstr "Fejlede Yahoo! godkendelse"
 
 #, 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 "Du har prøvet at ignorere %s, men brugeren er på din venneliste. Hvis du klikker på \"Ja\" vil det fjerne og ignorere vennen."
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+"Du har prøvet at ignorere %s, men brugeren er på din venneliste. Hvis du "
+"klikker på \"Ja\" vil det fjerne og ignorere vennen."
 
 msgid "Ignore buddy?"
 msgstr "Ignorér ven?"
@@ -8806,39 +9529,36 @@ msgstr "Din konto er låst. Log ind på Yahoo!-webstedet."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "Ukendt fejl nummer %d. Prøv at logge ind på Yahoo!webstedet for at fixe dette."
+msgstr ""
+"Ukendt fejl nummer %d. Prøv at logge ind på Yahoo!webstedet for at fixe "
+"dette."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Kunne ikke tilføje ven %s til gruppe %s til serverlisten på konto %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Kunne ikke tilføje ven til serverliste"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørbar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Modtog ugyldigt HTTP-svar fra server."
 
-msgid "Connection problem"
-msgstr "Forbindelsesfejl"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Mistede forbindelsen til %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Kunne ikke etablere en forbindelse til %s:\n"
+"Kunne ikke etablere en forbindelse til server:\n"
 "%s"
 
 msgid "Not at Home"
@@ -8886,8 +9606,8 @@ msgstr "Tilstedeværelse indstillinger"
 msgid "Start Doodling"
 msgstr "Start med at \"Doodle\""
 
-msgid "Activate which ID?"
-msgstr "Aktivér hvilket id?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Tilslut hvem i samtale?"
@@ -8901,73 +9621,15 @@ msgstr "Tilslut bruger i samtale..."
 msgid "Open Inbox"
 msgstr "Åbn indbakke"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;rum&gt;:  Tilslut samtalerum på Yahoo-netværket"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Vis rum på Yahoo-netværket"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Anmod en bruger om at starte en \"Doodle\"-session"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-id..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo protokolmodul"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Bipper-server"
-
-msgid "Japan Pager server"
-msgstr "Japan Bipper-server"
-
-msgid "Pager port"
-msgstr "Bipper port"
-
-msgid "File transfer server"
-msgstr "Filoverførselsserver"
-
-msgid "Japan file transfer server"
-msgstr "Japan filoverførselsserver"
-
-msgid "File transfer port"
-msgstr "Filoverførsel port"
-
-msgid "Chat room locale"
-msgstr "Samtalerum tegnsæt"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorér konference og samtalerum invitationer"
-
-msgid "Chat room list URL"
-msgstr "Adresse på liste over samtalerum"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo-samtaleserver"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo-samtaleport"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Sendte Doodle anmodning."
 
+msgid "Unable to connect."
+msgstr "Kunne ikke få kontakt."
+
 msgid "Unable to establish file descriptor."
 msgstr "Kunne ikke etablere fildeskriptor."
 
@@ -8975,17 +9637,27 @@ msgstr "Kunne ikke etablere fildeskriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s prøver at sende dig en gruppe på %d filer.\n"
 
+msgid "Write Error"
+msgstr "Skrive fejl"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan profil"
 
 msgid "Yahoo! Profile"
 msgstr "Yahoo! profil"
 
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
-msgstr "Desværre, profiler der er markeret som indeholdende indhold der ikke er for børn, er ikke understøttet."
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+"Desværre, profiler der er markeret som indeholdende indhold der ikke er for "
+"børn, er ikke understøttet."
 
-msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
-msgstr "Vis du vil se denne profil, skal du besøge denne henvisning i din netlæser:"
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr ""
+"Vis du vil se denne profil, skal du besøge denne henvisning i din netlæser:"
 
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
@@ -9011,21 +9683,36 @@ msgstr "Sej henvisning 3"
 msgid "Last Update"
 msgstr "Sidst opdateret"
 
-msgid "This profile is in a language or format that is not supported at this time."
-msgstr "Denne profil er i et sprog eller format som ikke er understøttet på nuværende tidspunkt."
+msgid ""
+"This profile is in a language or format that is not supported at this time."
+msgstr ""
+"Denne profil er i et sprog eller format som ikke er understøttet på "
+"nuværende tidspunkt."
 
-msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
-msgstr "Kunne ikke modtage brugerens profil. Dette er højst sandsynligt et midlertidigt server problem. Prøv igen senere."
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"Kunne ikke modtage brugerens profil. Dette er højst sandsynligt et "
+"midlertidigt server problem. Prøv igen senere."
 
-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 "Kunne ikke modtage brugerens profil. Dette betyder højst sandsynligt at brugeren ikke eksisterer; men Yahoo! tager nogen gange fejl og kan ikke finde en brugers profil. Hvis du ved at brugeren eksisterer, så prøv igen senere."
+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 ""
+"Kunne ikke modtage brugerens profil. Dette betyder højst sandsynligt at "
+"brugeren ikke eksisterer; men Yahoo! tager nogen gange fejl og kan ikke "
+"finde en brugers profil. Hvis du ved at brugeren eksisterer, så prøv igen "
+"senere."
 
 msgid "The user's profile is empty."
 msgstr "Brugerens profil er tom."
 
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s sagde nej til din konference-invitiation til rum \"%s\" pga. \"%s\"."
+msgstr ""
+"%s sagde nej til din konference-invitiation til rum \"%s\" pga. \"%s\"."
 
 msgid "Invitation Rejected"
 msgstr "Invitation afvist"
@@ -9045,8 +9732,12 @@ msgstr "Måske er rummet fyldt"
 msgid "Not available"
 msgstr "Ikke tilgængelig"
 
-msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
-msgstr "Ukendt fejl. Det kræver måske at du logger ud og venter fem minutter før du kan tilslutte samtalerummet igen"
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Ukendt fejl. Det kræver måske at du logger ud og venter fem minutter før du "
+"kan tilslutte samtalerummet igen"
 
 #, c-format
 msgid "You are now chatting in %s."
@@ -9067,25 +9758,25 @@ msgstr "Stemmer"
 msgid "Webcams"
 msgstr "Webkameraer"
 
+msgid "Connection problem"
+msgstr "Forbindelsesfejl"
+
 msgid "Unable to fetch room list."
 msgstr "Ikke i stand til at hente rumliste."
 
 msgid "User Rooms"
 msgstr "Brugerrum"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Forbindelsesfejl med YCHT serveren."
 
-#, c-format
 msgid ""
-"Lost connection with server\n"
-"%s"
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
 msgstr ""
-"Mistede forbindelsen til server\n"
-"%s"
-
-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
-msgstr "(Der opstod en fejl, da denne besked skulle konverteres.\t Tjek 'Tegnsæt'-indstillingen i Konto-redigeringen)"
+"(Der opstod en fejl, da denne besked skulle konverteres.\t Tjek 'Tegnsæt'-"
+"indstillingen i Konto-redigeringen)"
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
@@ -9130,19 +9821,33 @@ msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instans&gt;: Sæt instans der skal bruges på denne class"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;class&gt; &lt;instans&gt; &lt;modtager&gt;: Tilslut en ny samtale"
+msgstr ""
+"sub &lt;class&gt; &lt;instans&gt; &lt;modtager&gt;: Tilslut en ny samtale"
 
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;instans&gt;: Send en besked til &lt;besked,<i>instans</i>,*&gt;"
 
-msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
-msgstr "zci &lt;klasse&gt; &lt;instans&gt;: Send en besked til &lt;<i>klasse</i>,<i>instans</i>,*&gt;"
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;klasse&gt; &lt;instans&gt;: Send en besked til &lt;<i>klasse</i>,"
+"<i>instans</i>,*&gt;"
 
-msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr "zcir &lt;klasse&gt; &lt;instans&gt; &lt;modtager&gt;: Send en besked til &lt;<i>klasse</i>,<i>instans</i>,<i>modtager</i>&gt;"
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zcir &lt;klasse&gt; &lt;instans&gt; &lt;modtager&gt;: Send en besked til &lt;"
+"<i>klasse</i>,<i>instans</i>,<i>modtager</i>&gt;"
 
-msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr "zir &lt;instans&gt; &lt;modtager&gt;: Send en besked til &lt;MESSAGE,<i>instans</i>,<i>modtager</i>&gt;"
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;instans&gt; &lt;modtager&gt;: Send en besked til &lt;MESSAGE,"
+"<i>instans</i>,<i>modtager</i>&gt;"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;klasse&gt;: Send en besked til &lt;<i>klasse</i>,PERSONAL,*&gt;"
@@ -9190,33 +9895,22 @@ msgstr "Rige"
 msgid "Exposure"
 msgstr "Fremvisning"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Kunne ikke oprette sokkel:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Kunne ikke fortolke svar fra HTTP-proxy: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxy forbindelsesfejl %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Adgang nægtet: HTTP-proxyserver tillader ikke port %d tunnel."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fejl ved opløsning af %s"
 
-msgid "Could not resolve host name"
-msgstr "Kunne ikke slå værtsnavn op"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Anmoder om %s's opmærksomhed..."
@@ -9303,9 +9997,6 @@ msgstr "Vil ikke forstyrres"
 msgid "Extended away"
 msgstr "Totalt fraværende"
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Listening to music"
 msgstr "Lytter til musik"
 
@@ -9347,14 +10038,6 @@ msgstr "+++ %s returnerede fra inaktivitet"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Fejl ved læsning af %s"
-
-#, c-format
-msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
-msgstr "En fejl opstod ved læsning af din %s. De er ikke blevet indlæst, og den gamle fil er blevet omdøbt til %s~."
-
 msgid "Calculating..."
 msgstr "Udregner..."
 
@@ -9410,8 +10093,12 @@ msgid "Error reading from %s: response too long (%d bytes limit)"
 msgstr "Fejl ved læsning fra %s: svar for langt (%d bytes grænse)"
 
 #, c-format
-msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
-msgstr "Ikke i stand til at allokere nok hukommelse til at holde indholdet fra %s. Internetserveren prøver måske noget ondskabsfuldt."
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"Ikke i stand til at allokere nok hukommelse til at holde indholdet fra %s. "
+"Internetserveren prøver måske noget ondskabsfuldt."
 
 #, c-format
 msgid "Error reading from %s: %s"
@@ -9458,6 +10145,18 @@ msgstr "Forbindelse afvist."
 msgid "Address already in use."
 msgstr "Addressen er allerede i brug."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Fejl ved læsning af %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"En fejl opstod ved læsning af din %s. De er ikke blevet indlæst, og den "
+"gamle fil er blevet omdøbt til %s~."
+
 msgid "Internet Messenger"
 msgstr "Internet beskeder"
 
@@ -9500,10 +10199,8 @@ msgstr "Påmindelse om ny _post"
 msgid "Use this buddy _icon for this account:"
 msgstr "Brug dette venne_ikon til denne konto:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s indstillinger"
+msgid "_Advanced"
+msgstr "_Avanceret"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Brug GNOME-proxy indstillinger"
@@ -9538,9 +10235,6 @@ msgstr "Hvis du kigger meget tæt på"
 msgid "you can see the butterflies mating"
 msgstr "du kan se sommerfuglene parre sig"
 
-msgid "Proxy Options"
-msgstr "Indstillinger for proxy"
-
 msgid "Proxy _type:"
 msgstr "Proxy_type:"
 
@@ -9568,8 +10262,9 @@ msgstr "_Basal"
 msgid "Create _this new account on the server"
 msgstr "Opret _denne nye konto på serveren"
 
-msgid "_Advanced"
-msgstr "_Avanceret"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Proxy"
 
 msgid "Enabled"
 msgstr "Slået til"
@@ -9581,36 +10276,55 @@ msgstr "Protokol"
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the <b>Add...</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add...</b> again to configure them all.\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add...</b> button below and configure your first account. If you want %s "
+"to connect to multiple IM accounts, press <b>Add...</b> again to configure "
+"them all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Manage Accounts</b> in the Buddy List window"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Velkommen til %s!</span>\n"
 "\n"
-"Du har ingen besked-konti konfigureret. For at komme i gang med at forbinde med %s tryk <b>Tilføj...</b>-knappen nedenfor og konfigurér din første konto. Hvis du vil have %s til at forbinde til flere besked-konti, tryk <b>Tilføj...</b> igen for at konfigurere dem alle.\n"
+"Du har ingen besked-konti konfigureret. For at komme i gang med at forbinde "
+"med %s tryk <b>Tilføj...</b>-knappen nedenfor og konfigurér din første "
+"konto. Hvis du vil have %s til at forbinde til flere besked-konti, tryk "
+"<b>Tilføj...</b> igen for at konfigurere dem alle.\n"
 "\n"
-"Du kan vende tilbage til dette vindue for at tilføje, redigere eller fjerne konti fra <b>Konti->Kontihåndtering</b> i venneliste-vinduet"
+"Du kan vende tilbage til dette vindue for at tilføje, redigere eller fjerne "
+"konti fra <b>Konti->Kontihåndtering</b> i venneliste-vinduet"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "Du har %d kontakt navngivet %s. Vil du slå dem sammen?"
 msgstr[1] "Du har %d kontakter navngivet %s. Vil du slå dem sammen?"
 
-msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
-msgstr "Slås disse kontakter sammen, vil de dele et enkelt element på vennelisten, og bruge et enkelt samtalevindue. Du kan adskille dem igen, ved at vælge \"Udvid\" i kontekstmenuen for kontakten"
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"Slås disse kontakter sammen, vil de dele et enkelt element på vennelisten, "
+"og bruge et enkelt samtalevindue. Du kan adskille dem igen, ved at vælge "
+"\"Udvid\" i kontekstmenuen for kontakten"
 
 msgid "Please update the necessary fields."
 msgstr "Opdatér de nødvendige felter."
 
-msgid "Room _List"
-msgstr "Rum_liste"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Konto:"
 
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
-msgstr "Indtast den nødvendige information om den samtale du gerne vil tilslutte.\n"
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Indtast den nødvendige information om den samtale du gerne vil tilslutte.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Rum_liste"
 
 msgid "_Block"
 msgstr "_Blokér"
@@ -9627,6 +10341,17 @@ msgstr "Hent _info"
 msgid "I_M"
 msgstr "_Besked"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "_Tilføj samtale"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Videosamtale"
+
 msgid "_Send File..."
 msgstr "_Send fil..."
 
@@ -9636,9 +10361,14 @@ msgstr "Tilføj venne_overvågning..."
 msgid "View _Log"
 msgstr "Vis _log"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Skjul når afkoblet"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Vis når afkoblet"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -9685,8 +10415,11 @@ msgstr "_Udvid"
 msgid "/Tools/Mute Sounds"
 msgstr "/Værktøjer/Slå lyde fra"
 
-msgid "You are not currently signed on with an account that can add that buddy."
-msgstr "Du er på nuværende tidspunkt ikke logget på nogen konti som kan tilføje denne ven."
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"Du er på nuværende tidspunkt ikke logget på nogen konti som kan tilføje "
+"denne ven."
 
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
@@ -9760,6 +10493,10 @@ msgstr "/Værktøjer/_Venneovervågning"
 msgid "/Tools/_Certificates"
 msgstr "/Værktøjer/_Certifikater"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Værktøjer/Smile_y"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Værktøjer/_Moduler"
 
@@ -9769,9 +10506,6 @@ msgstr "/Værktøjer/_Indstillinger"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Værktøjer/_Privatliv"
 
-msgid "/Tools/Smile_y"
-msgstr "/Værktøjer/Smile_y"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Værktøjer/_Filoverførsler"
 
@@ -9889,8 +10623,8 @@ msgstr "Manuelt"
 msgid "By status"
 msgstr "Status"
 
-msgid "By log size"
-msgstr "Logstørrelse"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -9906,14 +10640,20 @@ msgstr "Genforbind"
 msgid "Re-enable"
 msgstr "Slå konto til igen"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Velkommen tilbage!"
 
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
-msgid_plural "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "%d-konto blev deaktiveret, fordi du loggede ind fra en anden lokation:"
-msgstr[1] "%d-kontiene blev deaktiveret, fordi du loggede ind fra en anden lokation:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] ""
+"%d-konto blev deaktiveret, fordi du loggede ind fra en anden lokation:"
+msgstr[1] ""
+"%d-kontiene blev deaktiveret, fordi du loggede ind fra en anden lokation:"
 
 msgid "<b>Username:</b>"
 msgstr "<b>Brugernavn:</b>"
@@ -9932,11 +10672,15 @@ msgstr "/Konti"
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Velkommen til %s!</span>\n"
 "\n"
-"Du har ingen aktive konti. Aktivér dine besked-konti fra <b>Konti</b>-vinduet <b>Konti->Kontihåndtering</b>. Når du har aktiveret konti, vil du være i stand til at logge på, sætte din status og tale med dine venner."
+"Du har ingen aktive konti. Aktivér dine besked-konti fra <b>Konti</b>-"
+"vinduet <b>Konti->Kontihåndtering</b>. Når du har aktiveret konti, vil du "
+"være i stand til at logge på, sætte din status og tale med dine venner."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -9971,15 +10715,26 @@ msgstr "Tilføj ven til _gruppe:"
 msgid "This protocol does not support chat rooms."
 msgstr "Denne protokol understøtter ikke samtalerum."
 
-msgid "You are not currently signed on with any protocols that have the ability to chat."
-msgstr "Du er på nuværende tidspunkt ikke logget på nogen protokoller som har evnen til at samtale."
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Du er på nuværende tidspunkt ikke logget på nogen protokoller som har evnen "
+"til at samtale."
 
-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
-msgstr "Indtast et alias og den nødvendige information om den samtale du vil tilføje til din venneliste.\n"
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Indtast et alias og den nødvendige information om den samtale du vil tilføje "
+"til din venneliste.\n"
 
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Gruppe:"
+
 msgid "Auto_join when account becomes online."
 msgstr "_Tilslut automatisk når en konto tilkobles."
 
@@ -10013,6 +10768,116 @@ msgstr "/Værktøjer"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Venner/Sortér venner"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Baggrundsfarve"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Denne gruppe er blevet tilføjet til din venneliste"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Baggrundsfarve"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Udvid"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Vælg baggrundsfarve"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Fold sammen"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Vælg baggrundsfarve"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Genvej"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Tilkoblet"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Fraværende"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Afkoblet"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Humørtekst"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Besked sendt"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Ændr brugeroplysninger for %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Indtast værtsnavnet som dette certifikat er beregnet til."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-servere"
@@ -10023,16 +10888,15 @@ msgstr "Ukendt kommando."
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Vennen er ikke på den samme protokol som denne samtale."
 
-msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr "Du er på nuværende tidspunkt ikke logget på nogen konti som kan invitere den ven."
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"Du er på nuværende tidspunkt ikke logget på nogen konti som kan invitere den "
+"ven."
 
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitér ven med i samtalerum"
 
-#. Put our happy label in it.
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
-msgstr "Indtast navnet på den bruger, du vil invitere, samt eventuelt en inviterings-besked."
-
 msgid "_Buddy:"
 msgstr "_Ven:"
 
@@ -10061,7 +10925,8 @@ msgstr "Ignorér"
 msgid "Get Away Message"
 msgstr "Hent fraværsbesked"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Sidst sagt"
 
 msgid "Unable to save icon file to disk."
@@ -10107,6 +10972,22 @@ msgstr "/Samtale/Gem _som..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Samtale/_Ryd buffer"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Samtale/M_ere"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Samtale/M_ere"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Samtale/M_ere"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Samtale/Vis _log"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/Se_nd fil..."
 
@@ -10179,6 +11060,18 @@ msgstr "/Samtale"
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis log"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Samtale/Mere"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Samtale/Vis log"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Samtale/Mere"
+
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil..."
 
@@ -10361,6 +11254,9 @@ msgstr "kunstner"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "support"
 
@@ -10485,6 +11381,10 @@ msgstr "Hindu"
 msgid "Hungarian"
 msgstr "Ungarsk"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumænsk"
+
 msgid "Indonesian"
 msgstr "Indonesisk"
 
@@ -10500,6 +11400,10 @@ msgstr "Geogoriansk"
 msgid "Ubuntu Georgian Translators"
 msgstr "Georgiske Ubuntu-oversættere"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Andet"
+
 msgid "Kannada"
 msgstr "Kanada"
 
@@ -10578,6 +11482,9 @@ msgstr "Singalesisk"
 msgid "Swedish"
 msgstr "Svensk"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamilsk"
 
@@ -10616,19 +11523,45 @@ msgid "About %s"
 msgstr "Om %s"
 
 #, c-format
-msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
-msgstr "%s er en grafisk modulær beskedklient baseret på libpurple, der understøtter AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu og QQ på samme tid.  Det er skrevet i GTK+.<BR><BR>Du må modificere og redistribuere programmet under de betingelser givet af GPL (version 2 eller senere).  En kopi af GPL er indeholdt i 'COPYING' filen som blev distribueret med %s. %s er ophavsret af dens bidragydere. Se 'COPYRIGHT' filen for den komplette liste af bidragydere. Vi giver ingen garanti for dette program.<BR><BR>"
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+"%s er en grafisk modulær beskedklient baseret på libpurple, der understøtter "
+"AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
+"Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu og QQ på samme tid.  Det er "
+"skrevet i GTK+.<BR><BR>Du må modificere og redistribuere programmet under de "
+"betingelser givet af GPL (version 2 eller senere).  En kopi af GPL er "
+"indeholdt i 'COPYING' filen som blev distribueret med %s. %s er ophavsret af "
+"dens bidragydere. Se 'COPYRIGHT' filen for den komplette liste af "
+"bidragydere. Vi giver ingen garanti for dette program.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
-msgstr "<FONT SIZE=\"4\">OSS:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">OSS:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
-msgstr "<FONT SIZE=\"4\">Hjælp via e-post:</FONT> <A HREF=\"mailto:support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">Hjælp via e-post:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC-kanal:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 
 #, c-format
@@ -10665,8 +11598,12 @@ msgstr "_Konto"
 msgid "Get User Info"
 msgstr "Hent brugeroplysninger"
 
-msgid "Please enter the username or alias of the person whose info you would like to view."
-msgstr "Indtast brugernavnet eller alias på den person, hvis oplysninger du gerne vil se."
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+"Indtast brugernavnet eller alias på den person, hvis oplysninger du gerne "
+"vil se."
 
 msgid "View User Log"
 msgstr "Vis bruger log"
@@ -10691,10 +11628,18 @@ msgid "Enter an alias for this chat."
 msgstr "Indtast et alias for denne samtale."
 
 #, c-format
-msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
-msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
-msgstr[0] "Du skal til at fjerne kontakten indeholdende %s og %d anden ven fra din venneliste. Vil du fortsætte?"
-msgstr[1] "Du skal til at fjerne kontakten indeholdende %s og %d andre venner fra din venneliste. Vil du fortsætte?"
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"Du skal til at fjerne kontakten indeholdende %s og %d anden ven fra din "
+"venneliste. Vil du fortsætte?"
+msgstr[1] ""
+"Du skal til at fjerne kontakten indeholdende %s og %d andre venner fra din "
+"venneliste. Vil du fortsætte?"
 
 msgid "Remove Contact"
 msgstr "Fjern kontakt"
@@ -10703,7 +11648,9 @@ msgid "_Remove Contact"
 msgstr "_Fjern kontakt"
 
 #, c-format
-msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
 msgstr "Du er ved at slå gruppen %s sammen med gruppen %s. Vil du fortsætte?"
 
 msgid "Merge Groups"
@@ -10713,8 +11660,12 @@ msgid "_Merge Groups"
 msgstr "_Slå grupper sammen"
 
 #, c-format
-msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
-msgstr "Du skal til at fjerne gruppen %s og alle den indeholder fra din venneliste. Vil du fortsætte?"
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"Du skal til at fjerne gruppen %s og alle den indeholder fra din venneliste. "
+"Vil du fortsætte?"
 
 msgid "Remove Group"
 msgstr "Fjern gruppe"
@@ -10723,7 +11674,8 @@ msgid "_Remove Group"
 msgstr "_Fjern gruppe"
 
 #, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Du skal til at slette %s fra din venneliste. Vil du fortsætte?"
 
 msgid "Remove Buddy"
@@ -10733,8 +11685,11 @@ msgid "_Remove Buddy"
 msgstr "_Fjern ven"
 
 #, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
-msgstr "Du skal til at fjerne samtalen %s fra din venneliste. Vil du fortsætte?"
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"Du skal til at fjerne samtalen %s fra din venneliste. Vil du fortsætte?"
 
 msgid "Remove Chat"
 msgstr "Fjern samtale"
@@ -10859,7 +11814,8 @@ msgstr "Farve på henvisninger."
 msgid "Hyperlink visited color"
 msgstr "Farve på besøgt henvisning"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Farve på henvisning efter at de er blevet besøgt (eller aktiveret)."
 
 # virkelig dårlig oversættelse!
@@ -10885,7 +11841,8 @@ msgid "\"Attention\" Name Color"
 msgstr "\"Opmærksomhed\" farvenavn"
 
 msgid "Color to draw the name of a message you received containing your name."
-msgstr "Farve som bruges på navnet til den besked du modtog indeholdende dit navn."
+msgstr ""
+"Farve som bruges på navnet til den besked du modtog indeholdende dit navn."
 
 msgid "Action Message Name Color"
 msgstr "Farve som bruges på navnet til handlingsbesked"
@@ -10896,13 +11853,22 @@ msgstr "Farve som bruges på navnet til en handlingsbesked."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Farve som bruges på navnet til hvisket handlingsbesked"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Farve som bruges på navnet til en handlingsbesked."
+
 msgid "Whisper Message Name Color"
 msgstr "Farve som bruges på navnet til hviskebesked"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Farve som bruges på navnet til en handlingsbesked."
+
 msgid "Typing notification color"
 msgstr "Farve på påmindelse af indtastning"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Skriftfarven for indtastningspåmindelse"
 
 msgid "Typing notification font"
@@ -10914,15 +11880,6 @@ msgstr "Skriftypen for indtastningspåmindelse"
 msgid "Enable typing notification"
 msgstr "Aktivér påmindelse om indtastning"
 
-msgid "_Copy Email Address"
-msgstr "_Kopier e-postadresse"
-
-msgid "_Open Link in Browser"
-msgstr "Åbn henvisning i br_owser"
-
-msgid "_Copy Link Location"
-msgstr "_Kopiér henvisningsadresse"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -10964,11 +11921,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Gem billede"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Gem billede..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Tilføj tilpasset smiley..."
 
@@ -10987,8 +11942,12 @@ msgstr "_Hjemmeside"
 msgid "_Description"
 msgstr "_Beskrivelse"
 
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
-msgstr "Indtast adressen og beskrivelsen på den henvisning du vil indsætte. Beskrivelsen er ikke krævet."
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Indtast adressen og beskrivelsen på den henvisning du vil indsætte. "
+"Beskrivelsen er ikke krævet."
 
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Indtast adressen på henvisningen du vil indsætte."
@@ -11011,7 +11970,8 @@ msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
-"Denne smiley er deaktiveret, fordi en tilpasset smiley findes for denne genvej:\n"
+"Denne smiley er deaktiveret, fordi en tilpasset smiley findes for denne "
+"genvej:\n"
 "%s"
 
 msgid "Smile!"
@@ -11053,9 +12013,6 @@ msgstr "Formindsk skriftstørrelse"
 msgid "Font Face"
 msgstr "Skrifttype-familie"
 
-msgid "Background Color"
-msgstr "Baggrundsfarve"
-
 msgid "Foreground Color"
 msgstr "Forgrundsfarve"
 
@@ -11120,16 +12077,28 @@ msgid "Check permissions and try again."
 msgstr "Kontrollér rettigheder og prøv igen."
 
 #, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
-msgstr "Er du sikker på at du permanent vil slette loggen over samtaler med %s som startede %s?"
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+"Er du sikker på at du permanent vil slette loggen over samtaler med %s som "
+"startede %s?"
 
 #, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
-msgstr "Er du sikker på at du permanent vil slette loggen over samtalen i %s som er startet %s?"
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+"Er du sikker på at du permanent vil slette loggen over samtalen i %s som er "
+"startet %s?"
 
 #, c-format
-msgid "Are you sure you want to permanently delete the system log which started at %s?"
-msgstr "Er du sikker på at du permanent vil slette systemloggen som er startet ved %s?"
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr ""
+"Er du sikker på at du permanent vil slette systemloggen som er startet ved %"
+"s?"
 
 msgid "Delete Log?"
 msgstr "Slet log?"
@@ -11153,13 +12122,14 @@ msgstr "_Gennemse log-mappe"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Prøv \"%s -h\" for flere informationer.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11183,13 +12153,14 @@ msgstr ""
 "  --display=SKÆRM     X-skærm der skal benyttes\n"
 "  -v, --version       vis nuværende version og afslut\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11248,11 +12219,23 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Afslutter fordi en anden libpurple-klient allerede kører.\n"
 
-msgid "Open All Messages"
-msgstr "Åbn alle beskeder"
+msgid "/_Media"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Du har fået post!</span>"
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Udregner..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -11277,8 +12260,32 @@ msgstr "Kunne ikke åbne URL"
 msgid "Error launching \"%s\": %s"
 msgstr "Fejl ved kørsel af \"%s\": %s"
 
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "\"Manuel\" browser-kommandoen er blevet valgt, men ingen kommando er blevet angivet."
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"\"Manuel\" browser-kommandoen er blevet valgt, men ingen kommando er blevet "
+"angivet."
+
+#, fuzzy
+msgid "No message"
+msgstr "Ukendt besked"
+
+msgid "Open All Messages"
+msgstr "Åbn alle beskeder"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har fået post!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Tilføj venneovervågning"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har fået post!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "De følgende moduler kunne ikke udlæses."
@@ -11292,8 +12299,12 @@ msgstr "Udlæs udvidelsesmoduler"
 msgid "Could not unload plugin"
 msgstr "Kunne ikke udlæse udvidelsesmodul"
 
-msgid "The plugin could not be unloaded now, but will be disabled at the next startup."
-msgstr "Udvidelsesmodulet kunne ikke blive udlæst nu, men vil blive slået fra ved den næste opstart."
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"Udvidelsesmodulet kunne ikke blive udlæst nu, men vil blive slået fra ved "
+"den næste opstart."
 
 #, c-format
 msgid ""
@@ -11324,10 +12335,17 @@ msgstr "<b>Modul detaljer</b>"
 msgid "Select a file"
 msgstr "Vælg en fil"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Redigér venneovervågning"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Overvåg hvem"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "_Vennenavn:"
 
@@ -11394,14 +12412,71 @@ msgstr "_Gentages"
 msgid "Pounce Target"
 msgstr "Overvåg mål"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Starter med at skrive"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Pause ved tastning"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Logger på"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s returnerede fra inaktivitet (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Returnerer fra fravær"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Stoppet med at skrive"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Logger af"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Bliver inaktiv"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Hvis fraværende"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Send en besked"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Ukendt hændelse ved overvågning. Venligst rapportér dette!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Smiley-tema kunne ikke udpakkes."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Smiley-tema kunne ikke udpakkes."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Smiley-tema kunne ikke udpakkes."
 
 msgid "Install Theme"
 msgstr "Installér tema"
 
-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 "Vælg et smiley-tema som du gerne vil bruge fra listen forneden. Nye temaer kan installeres ved at træk-og-slippe dem ind i tema listen."
+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 ""
+"Vælg et smiley-tema som du gerne vil bruge fra listen forneden. Nye temaer "
+"kan installeres ved at træk-og-slippe dem ind i tema listen."
 
 msgid "Icon"
 msgstr "Ikon"
@@ -11412,6 +12487,12 @@ msgstr "Tastaturgenveje"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Afslut samtaler med Escape-tasten"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Venneliste"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Statusområde ikon"
 
@@ -11421,8 +12502,9 @@ msgstr "_Vis statusområde ikon:"
 msgid "On unread messages"
 msgstr "Ulæste beskeder"
 
-msgid "Conversation Window Hiding"
-msgstr "Skjul beskedsamtalevindue"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Beskedsamtalevinduer"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Skjul nye samtaler:"
@@ -11430,6 +12512,9 @@ msgstr "_Skjul nye samtaler:"
 msgid "When away"
 msgstr "Hvis fraværende"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Min_imér nye samtalevinduer"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Faner"
@@ -11488,9 +12573,6 @@ msgstr "Brug blød rullebjælke"
 msgid "F_lash window when IMs are received"
 msgstr "_Blink vindue når beskeder modtages"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Min_imér nye samtalevinduer"
-
 msgid "Minimum input area height in lines:"
 msgstr "Mindste højde, i linjer, af indtastningsfelt:"
 
@@ -11509,8 +12591,12 @@ msgstr "Samtale_skrifttype:"
 msgid "Default Formatting"
 msgstr "Standard formattering"
 
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
-msgstr "Sådan vil din udgående besked se ud når du bruger protokoller, der understøtter formattering."
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+"Sådan vil din udgående besked se ud når du bruger protokoller, der "
+"understøtter formattering."
 
 msgid "Cannot start proxy configuration program."
 msgstr "Kan ikke starte proxy-konfigurationsprogram."
@@ -11518,13 +12604,11 @@ msgstr "Kan ikke starte proxy-konfigurationsprogram."
 msgid "Cannot start browser configuration program."
 msgstr "Kan ikke starte konfigurationsprogram til browser."
 
-msgid "ST_UN server:"
-msgstr "ST_UN server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Eksempel: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Find IP-adresse _automatisk"
 
 msgid "Public _IP:"
@@ -11545,6 +12629,10 @@ msgstr "_Start port:"
 msgid "_End port:"
 msgstr "Slut _port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy-server &amp; Browser"
 
@@ -11735,12 +12823,12 @@ msgstr "Når både fraværende og inaktiv"
 msgid "Auto-away"
 msgstr "Automatisk fraværende"
 
-msgid "Change status when _idle"
-msgstr "Ændr status ved _inaktivitet"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutter før du bliver inaktiv:"
 
+msgid "Change status when _idle"
+msgstr "Ændr status ved _inaktivitet"
+
 msgid "Change _status to:"
 msgstr "Ændr _status til:"
 
@@ -11888,43 +12976,48 @@ msgstr "G_em og brug"
 msgid "Status for %s"
 msgstr "Status for %s"
 
+#, fuzzy, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"En tilpasset smiley for den valgte genvej findes allerede. Angiv en anden "
+"genvej."
+
 msgid "Custom Smiley"
 msgstr "Tilpasset smiley"
 
-msgid "More Data needed"
-msgstr "Der er behov for flere data"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Angiv en genvej der skal tilknyttes smileyen."
-
 msgid "Duplicate Shortcut"
 msgstr "Dublet genvej"
 
-msgid "A custom smiley for the selected shortcut already exists. Please specify a different shortcut."
-msgstr "En tilpasset smiley for den valgte genvej findes allerede. Angiv en anden genvej."
-
-msgid "Please select an image for the smiley."
-msgstr "Vælg et billede til smileyen."
-
 msgid "Edit Smiley"
 msgstr "Redigér smiley"
 
 msgid "Add Smiley"
 msgstr "Tilføj smiley"
 
-msgid "Smiley _Image"
-msgstr "Smiley _billede"
+#, fuzzy
+msgid "_Image:"
+msgstr "Bi_llede"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Smiley _genvej"
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Genvej"
 
 msgid "Smiley"
 msgstr "Smiley"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Genvej"
+
 msgid "Custom Smiley Manager"
 msgstr "Brugertilpasset håndtering af smiley"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Vælg ven"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klik for at ændre dit venneikon til denne konto."
 
@@ -11958,14 +13051,21 @@ msgid "Cannot send folder %s."
 msgstr "Kan ikke sende mappe %s."
 
 #, c-format
-msgid "%s cannot transfer a folder. You will need to send the files within individually."
-msgstr "%s kan ikke overføre en mappe. Du skal sende filerne i denne individuelt."
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+"%s kan ikke overføre en mappe. Du skal sende filerne i denne individuelt."
 
 msgid "You have dragged an image"
 msgstr "Du har trukket et billede"
 
-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 "Du kan sende dette billede som en filoverførsel, vedlægge det til en besked, eller bruge det som venneikonet til denne bruger."
+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 ""
+"Du kan sende dette billede som en filoverførsel, vedlægge det til en besked, "
+"eller bruge det som venneikonet til denne bruger."
 
 msgid "Set as buddy icon"
 msgstr "Sæt som venneikon"
@@ -11979,11 +13079,19 @@ msgstr "Indsæt i besked"
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Vil du sætte det som venneikon for denne bruger?"
 
-msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
-msgstr "Du kan sende dette billede som en filoverførsel, eller bruge det som venneikonet for denne bruger."
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"Du kan sende dette billede som en filoverførsel, eller bruge det som "
+"venneikonet for denne bruger."
 
-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
-msgstr "Du kan indsætte dette billede i beskeden, eller bruge det som venneikon for denne bruger"
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"Du kan indsætte dette billede i beskeden, eller bruge det som venneikon for "
+"denne bruger"
 
 #. 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
@@ -11993,8 +13101,13 @@ msgstr "Du kan indsætte dette billede i beskeden, eller bruge det som venneikon
 msgid "Cannot send launcher"
 msgstr "Kan ikke sende starter"
 
-msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
-msgstr "Du har trukket en skrivebords starter. Højst sandsynligt vil du sende hvad starteren peger på og ikke starten selv."
+#, fuzzy
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
+msgstr ""
+"Du har trukket en skrivebords starter. Højst sandsynligt vil du sende hvad "
+"starteren peger på og ikke starten selv."
 
 #, c-format
 msgid ""
@@ -12021,8 +13134,21 @@ msgid "Failed to open file '%s': %s"
 msgstr "Kunne ikke åbne fil \"%s\": %s"
 
 #, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "Kunne ikke indlæse billeder \"%s\": årsag ikke kendt, måske en ødelagt billedefil"
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"Kunne ikke indlæse billeder \"%s\": årsag ikke kendt, måske en ødelagt "
+"billedefil"
+
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Åbn henvisning i:"
+
+msgid "_Copy Link Location"
+msgstr "_Kopiér henvisningsadresse"
+
+msgid "_Copy Email Address"
+msgstr "_Kopier e-postadresse"
 
 msgid "Save File"
 msgstr "Gem fil"
@@ -12114,6 +13240,82 @@ msgstr "Tilængelighedsforudsigelses-udvidelsesmodul."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Viser statistiske oplysninger om dine venners tilgængelighed"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Serveradresse"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Indtast en konference-server"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Vælg en konference-server at slå op"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online tjenester"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send venneliste"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Bliver fraværende"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Logmappe"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Lydvalg"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub-tjeneste"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Beskrivelse:</b> Skræmmende"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Besked ved tjenesteopdagelse"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Bruger eksisterer ikke"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server understøtter ikke blokering"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Besked ved tjenesteopdagelse"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller "
+"klienter."
+
 msgid "Buddy is idle"
 msgstr "Ven er inaktiv"
 
@@ -12133,8 +13335,12 @@ msgstr "Ven er afkoblet"
 msgid "Point values to use when..."
 msgstr "Værdier der skal bruges når..."
 
-msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
-msgstr "Vennen med den <i>højeste score</i> er den ven som vil have prioritet i kontakten.\n"
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"Vennen med den <i>højeste score</i> er den ven som vil have prioritet i "
+"kontakten.\n"
 
 msgid "Use last buddy when scores are equal"
 msgstr "Brug den sidste ven når score er lige"
@@ -12154,12 +13360,19 @@ msgstr "Kontaktsprioritet"
 #. *< name
 #. *< version
 #. *< summary
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Giver mulighed for at kontrollere værdierne tilknyttet venners forskellige status."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Giver mulighed for at kontrollere værdierne tilknyttet venners forskellige "
+"status."
 
 #. *< description
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr "Giver mulighed for at ændre værdierne af inaktiv/fraværende/afkoblet status for venner i kontaktprioritets beregninger."
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Giver mulighed for at ændre værdierne af inaktiv/fraværende/afkoblet status "
+"for venner i kontaktprioritets beregninger."
 
 msgid "Conversation Colors"
 msgstr "Samtalefarver"
@@ -12202,8 +13415,12 @@ msgid "Conversation Placement"
 msgstr "Samtale placering"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
-msgstr "Bemærk: Indstillingerne for \"Nye samtaler\" skal sættes til \"Efter samtale antal\"."
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"Bemærk: Indstillingerne for \"Nye samtaler\" skal sættes til \"Efter samtale "
+"antal\"."
 
 msgid "Number of conversations per window"
 msgstr "Antal af samtaler pr. vindue"
@@ -12227,8 +13444,12 @@ msgstr "Ekstra placeringsindstillinger for samtaler."
 
 #. *< summary
 #. *  description
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "Begræns antallet af samtaler pr. vindue, med mulighed for seperate samtale- og samtalevinduer"
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Begræns antallet af samtaler pr. vindue, med mulighed for seperate samtale- "
+"og samtalevinduer"
 
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
@@ -12261,12 +13482,14 @@ msgstr "Giver understøttelse for musebevægelser"
 
 #. *  description
 msgid ""
-"Allows support for mouse gestures in conversation windows. Drag the middle mouse button to perform certain actions:\n"
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
 " • Drag down and then to the right to close a conversation.\n"
 " • Drag up and then to the left to switch to the previous conversation.\n"
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"Giver understøttelse for musebevægelser i samtalevinduer. Træk i den midterste knap for at udføre forskellige handlinger:\n"
+"Giver understøttelse for musebevægelser i samtalevinduer. Træk i den "
+"midterste knap for at udføre forskellige handlinger:\n"
 " • Træk ned og derefter til højre, for at afslutte en samtale.\n"
 " • Træk op og derefter til venstre, for at skifte til den forrige samtale.\n"
 " • Træk op og derefter til højre, for at skifte til den næste samtale."
@@ -12290,8 +13513,12 @@ msgid "Select Buddy"
 msgstr "Vælg ven"
 
 #. Add the label.
-msgid "Select a person from your address book to add this buddy to, or create a new person."
-msgstr "Vælg en person fra din adressebog at tilføje denne ven til, eller tilføj en ny person."
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Vælg en person fra din adressebog at tilføje denne ven til, eller tilføj en "
+"ny person."
 
 #. Add the expander
 msgid "User _details"
@@ -12432,8 +13659,12 @@ msgstr "Besked-v_induer"
 msgid "C_hat windows"
 msgstr "C_hat-vinduer"
 
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
-msgstr "En musik-beskeds session er blevet anmodet. Klik på MM-ikonet for at acceptere."
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"En musik-beskeds session er blevet anmodet. Klik på MM-ikonet for at "
+"acceptere."
 
 msgid "Music messaging session confirmed."
 msgstr "Musik beskeds-session bekræftet."
@@ -12472,8 +13703,14 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musik besked udvidelsesmodul for samarbejdskomposition."
 
 #. *  summary
-msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
-msgstr "Musik beskeds udvidelsesmodulet tillader flere bruger af gangen, til samtidig at arbejde på et stykke musik ved at redigere en fælles score i real-time."
+#, fuzzy
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editing a common score in real-time."
+msgstr ""
+"Musik beskeds udvidelsesmodulet tillader flere bruger af gangen, til "
+"samtidig at arbejde på et stykke musik ved at redigere en fælles score i "
+"real-time."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -12553,7 +13790,8 @@ msgstr "Påmindelse af beskeder"
 #. *  summary
 #. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Giver mulighed for at påminde dig om ulæste beskeder på forskellige måder."
+msgstr ""
+"Giver mulighed for at påminde dig om ulæste beskeder på forskellige måder."
 
 #. *< type
 #. *< ui_requirement
@@ -12568,7 +13806,8 @@ msgstr "Pidgin demonstrationsudvidelsesmodul"
 #. *< version
 #. *  summary
 msgid "An example plugin that does stuff - see the description."
-msgstr "Et eksempel-udvidelsesmodul der gør forskellige ting - se beskrivelsen."
+msgstr ""
+"Et eksempel-udvidelsesmodul der gør forskellige ting - se beskrivelsen."
 
 #. *  description
 msgid ""
@@ -12582,12 +13821,6 @@ msgstr ""
 "- Det skriver al indkommende tekst bagvendt\n"
 "- Det sender en besked til folk på din venneliste straks når de logger på"
 
-msgid "Cursor Color"
-msgstr "Markør farve"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekundær markør farve"
-
 msgid "Hyperlink Color"
 msgstr "Farve på henvisning"
 
@@ -12597,6 +13830,10 @@ msgstr "Farve på besøgt henvisning"
 msgid "Highlighted Message Name Color"
 msgstr "Farve som bruges til fremhævede beskednavne"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Farve på påmindelse af indtastning"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horisontal separering"
 
@@ -12626,35 +13863,24 @@ msgstr "GTK+ grænseflade skrifttype"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ tekst genvejstema"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Grænseflade farver"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Aktivér påmindelse om indtastning"
 
-msgid "Widget Sizes"
-msgstr "Størrelse på kontroller"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Temakontrol til Pidgin GTK+"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Luk"
 
 msgid "Fonts"
 msgstr "Skrifttyper"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc-filværktøjer"
 
@@ -12675,10 +13901,16 @@ msgid "Raw"
 msgstr "Rå"
 
 msgid "Lets you send raw input to text-based protocols."
-msgstr "Giver dig mulighed for at sende rå inddata til text-baserede protokoller."
+msgstr ""
+"Giver dig mulighed for at sende rå inddata til text-baserede protokoller."
 
-msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "Giver dig mulighed for at sende rå inddata til tekstbaserede protokoller (XMPP, MSN, IRC, TOC). Tryk \"Enter\" i indtastningsfeltet for at sende. Hold øje med fejlsøgningsvinduet."
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Giver dig mulighed for at sende rå inddata til tekstbaserede protokoller "
+"(XMPP, MSN, IRC, TOC). Tryk \"Enter\" i indtastningsfeltet for at sende. "
+"Hold øje med fejlsøgningsvinduet."
 
 #, c-format
 msgid "You can upgrade to %s %s today."
@@ -12709,8 +13941,12 @@ msgid "Checks periodically for new releases."
 msgstr "Tjekker periodisk efter nye udgivelser."
 
 #. *  description
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "Tjeker periodisk efter nye udgivelser og viser brugeren hvilke ændringer der er i den nye udgivelse."
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Tjeker periodisk efter nye udgivelser og viser brugeren hvilke ændringer der "
+"er i den nye udgivelse."
 
 #. *< major version
 #. *< minor version
@@ -12729,8 +13965,13 @@ msgid "Conversation Window Send Button."
 msgstr "Samtalevindue sendknap."
 
 #. *< summary
-msgid "Adds a Send button to the entry area of the conversation window. Intended for when no physical keyboard is present."
-msgstr "Tilføjer en sendknap til indtastningsområdet i samtalevinduet. Beregnet til når der ikke er noget fysisk tastatur tilstede."
+#, fuzzy
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for use when no physical keyboard is present."
+msgstr ""
+"Tilføjer en sendknap til indtastningsområdet i samtalevinduet. Beregnet til "
+"når der ikke er noget fysisk tastatur tilstede."
 
 msgid "Duplicate Correction"
 msgstr "Duplikér rettelse"
@@ -12781,6 +14022,113 @@ msgstr "Teksterstatning"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstatter tekst i udgående beskeder udfra bruger-definerede regler."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Ikke logget ind"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Ikke logget ind"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Tilslut en samtale"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorér"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Højere"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Godkendelse Givet"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Fejl "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Anmodnings dialog"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Advarselsniveau"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status for %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Samtalerum tegnsæt"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Ændr ikon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Temakontrol til Pidgin GTK+"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakt-oplysninger"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Venneliste"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Venneliste"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Temakontrol til Pidgin GTK+"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Temakontrol til Pidgin GTK+"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -12857,8 +14205,12 @@ msgid "Customizes the message timestamp formats."
 msgstr "Tilpasser formatet på tidsstempler i beskeder."
 
 #. *  description
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
-msgstr "Dette modul tillader brugeren selv at tilpasse formatet på tidsstempler i samtaler og logs."
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Dette modul tillader brugeren selv at tilpasse formatet på tidsstempler i "
+"samtaler og logs."
 
 msgid "Opacity:"
 msgstr "Ugennemsigtighed:"
@@ -12906,11 +14258,13 @@ msgstr "Variabel gennemsigtighed for venneliste og samtaler."
 
 #. *  description
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Dette modul giver dig mulighed variabel alpha gennemsigtighed i samtale-vinduer og vennelisten.\n"
+"Dette modul giver dig mulighed variabel alpha gennemsigtighed i samtale-"
+"vinduer og vennelisten.\n"
 "\n"
 "* Bemærk: Dette modul kræver Win2000 eller bedre."
 
@@ -12942,8 +14296,11 @@ msgstr "Indstillinger for Pidgin til Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Specifikke indstillinger for Pidgin til Windows."
 
-msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "Indstillinger specifikt for Pidgin for Windows, såsom venneliste dokning."
+#, fuzzy
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr ""
+"Indstillinger specifikt for Pidgin for Windows, såsom venneliste dokning."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Loggede ud.</font>"
@@ -12980,10 +14337,506 @@ msgstr "Send og modtag rå XMPP-stanzas."
 
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller klienter."
+msgstr ""
+"Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller "
+"klienter."
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Kan ikke åbne socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Kan ikke lytte på socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Kan ikke læse fra netværket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Forbindelse fejlede."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server har afbrudt forbindelse"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Kunne ikke oprette sokkel"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Kunne ikke kontakte vært"
+
+#~ msgid "Read error"
+#~ msgstr "Læsefejl"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke etablere en forbindelse til server:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Fejl ved skrivning"
+
+#~ msgid "Last Activity"
+#~ msgstr "Sidste aktivitet"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Besked ved tjenesteopdagelse"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Elementer for tjenesteopdagelse"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Udvidet Stanza-adressering"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Flerbrugersamtale"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Flerbrugersamtale udvidede tilstedeværelsesinformation"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band-bytestrømme"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc-kommandoer"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub-tjeneste"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5-bytestrømme"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Out of Band Data"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-besked"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "In-Band-registrering"
+
+#~ msgid "User Location"
+#~ msgstr "Brugerplacering"
+
+#~ msgid "User Avatar"
+#~ msgstr "Brugeravatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Samtalestatus påmindelser"
+
+#~ msgid "Software Version"
+#~ msgstr "Software version"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Klargøring af strøm"
+
+#~ msgid "User Mood"
+#~ msgstr "Brugerhumør"
+
+#~ msgid "User Activity"
+#~ msgstr "Brugeraktivitet"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Enhedsegenskaber"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Krypterede sessionsforhandlinger"
+
+#~ msgid "User Tune"
+#~ msgstr "Brugermelodi"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Navneliste over elementudveksling"
+
+#~ msgid "Reachability Address"
+#~ msgstr "E-post-adresse"
+
+#~ msgid "User Profile"
+#~ msgstr "Brugerprofil"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle-lyd"
+
+#~ msgid "User Nickname"
+#~ msgstr "Brugerkælenavn"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Beskedmodtagere"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Udgivelse af offentlig nøgle"
+
+#~ msgid "User Chatting"
+#~ msgstr "Bruger samtaler"
+
+#~ msgid "User Browsing"
+#~ msgstr "Bruger browser"
+
+#~ msgid "User Gaming"
+#~ msgstr "Bruger spiller"
+
+#~ msgid "User Viewing"
+#~ msgstr "Bruger ser"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanza-kryptering"
+
+#~ msgid "Entity Time"
+#~ msgstr "Tidsenhed"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Forsinket levering"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Samarbejdende dataobjekter"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Filarkiv og -deling"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN-tjenesteopdagelse for Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Simplificeret krypteret sessionsforhandling"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hop-kontrol"
+
+#~ msgid "Read Error"
+#~ msgstr "Læsefejl"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Kunne ikke forbinde til server."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Læsebuffer fuld (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Kunne ikke fortolke beskeden"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Kunne ikke forbinde til vært: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Logind slog fejl (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Kunne ikke kontakte server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Du er blevet logget af, fordi du er logget på en anden maskine."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Fejl. SSL-understøttelse er ikke installeret."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Forkert adgangskode."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke forbinde til BOS-server:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Du vil måske blive frakoblet snart. Kontrollér %s for opdateringer."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Forbindelse fejlede"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ugyldigt brugernavn."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Kunne ikke afkryptere serversvar"
+
+#~ msgid "Connection lost"
+#~ msgstr "Forbindelse mistet"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Kunne ikke slå vært op"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Forbindelse lukket (skrivning)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Forbindelse lukket"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Fejl under læsning fra sokkel: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Kunne ikke forbinde til vært"
+
+#~ msgid "Could not write"
+#~ msgstr "Kunne ikke skrive"
+
+#~ msgid "Could not connect"
+#~ msgstr "Kunne ikke forbinde"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kunne ikke oprette lyttende sokkel"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Kunne ikke slå værtsnavn op"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Forkert adgangskode"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke etablere en forbindelse til %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan Bipper-server"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan filoverførselsserver"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Mistede forbindelsen til server\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Kunne ikke slå værtsnavn op"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server kræver SSL til logind. Ingen TLS/SSL-understøttelse fundet."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skjul beskedsamtalevindue"
+
+#~ msgid "More Data needed"
+#~ msgstr "Der er behov for flere data"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Angiv en genvej der skal tilknyttes smileyen."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Vælg et billede til smileyen."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktivér hvilket id?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Markør farve"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Sekundær markør farve"
+
+#~ msgid "Interface colors"
+#~ msgstr "Grænseflade farver"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Størrelse på kontroller"
+
+#~ msgid "Invite message"
+#~ msgstr "Invitationsbesked"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Indtast navnet på den bruger du vil invitere,\n"
+#~ "samt en valgfri invitationsbesked."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Slår %s op"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Forbindelse til %s fejlede"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Tilsluttet: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Kunne ikke skrive til filen %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Kunne ikke læse filen %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Beskeden var for lang - de sidste %s bytes blev slettet."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s er ikke logget på lige nu."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Du kan ikke advare %s."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "En besked blev ikke sendt - du var hurtigere end serveren."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Samtale i %s er ikke muligt."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Du sender beskeder for hurtigt til %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Du har ikke modtaget en besked fra %s, fordi den var for lang."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Du har ikke modtaget en besked fra %s, fordi den blev sendt for hurtigt."
+
+#~ msgid "Failure."
+#~ msgstr "Fejl."
+
+#~ msgid "Too many matches."
+#~ msgstr "For mange resultater."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Angiv flere søgeord."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Søgetjeneste midlertidigt utilgængelig."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "E-post søgning er begrænset."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Nøgleord ignoreret."
+
+#~ msgid "No keywords."
+#~ msgstr "Ingen nøgleord."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Ingen oplysninger om brugeren fundet."
+
+#~ msgid "Country not supported."
+#~ msgstr "Land ikke understøttet."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Ukendt fejl: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Forkert brugernavn eller adgangskode."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Tjenesten er midlertidigt utilgængelig."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Du har for mange advarsler i øjeblikket til at kunne logge ind."
+
+#~ 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 ""
+#~ "Du er logget ind og ud for mange gange indenfor et kort tidsrum. Vent ti "
+#~ "minutter og prøv så igen, for ellers skal du bare vente endnu længere."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Der opstod en ukendt fejl under logind: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "En ukendt fejl, %d, er opstået. Info: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Ugyldigt gruppenavn"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Forbindelse lukket"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Venter på svar..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC er blevet tilgængelig. Du kan nu sende beskeder igen."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Adgangskode ændret"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Hent mappeoplysninger"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Ret mappeoplysninger"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Kunne ikke åbne %s til skrivning!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Filoverførsel fejlede - den anden side har sikkert afbrudt."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Kunne ikke oprette forbindelse til overførsel."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Kunne ikke skrive fil-hoved. Filen vil ikke blive overført."
+
+#~ msgid "Save As..."
+#~ msgstr "Gem som..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s anmoder %s om at acceptere %d fil: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s anmoder %s om at acceptere %d filer: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s beder dig om at sende en fil"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC protokolmodul"
+
+#~ msgid "%s Options"
+#~ msgstr "%s indstillinger"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Indstillinger for proxy"
+
+#~ msgid "By log size"
+#~ msgstr "Logstørrelse"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "Åbn henvisning i br_owser"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN server:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Smiley _billede"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Smiley _genvej"
 
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Ikke i stand til at hente MSN-adressebog"
+
 #~ msgid ""
 #~ "You may be disconnected shortly.  You may want to use TOC until this is "
 #~ "fixed.  Check %s for updates."
@@ -13018,14 +14871,19 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #, fuzzy
 #~ msgid "Failed to send IM."
 #~ msgstr "Kunne ikke hente navn: %s"
+
 #~ msgid "User information for %s unavailable"
 #~ msgstr "Bruger oplysninger for %s er ikke tilgængelige"
+
 #~ msgid "_Flash window when chat messages are received"
 #~ msgstr "_Blink vindue når samtalebeskeder modtages"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "En mappe med det navn eksisterer allerede."
+
 #~ msgid "Primary Information"
 #~ msgstr "Primær-information"
+
 #~ msgid "Blood Type"
 #~ msgstr "Blodtype"
 
@@ -13044,10 +14902,13 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ msgstr ""
 #~ "Du prøver at opsætte et ansigt. Pidgin tillader, på nuværende tidspunkt, "
 #~ "kun standard ansigterne. Vælg venligst et billede fra "
+
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Ugyldigt QQ-ansigt"
+
 #~ msgid "You rejected %d's request"
 #~ msgstr "Du afviste %d's anmodning"
+
 #~ msgid "Reject request"
 #~ msgstr "Afvis anmodning"
 
@@ -13062,10 +14923,13 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #, fuzzy
 #~ msgid "QQ Number Error"
 #~ msgstr "QQ-nummer"
+
 #~ msgid "Group Description"
 #~ msgstr "Gruppebeskrivelse"
+
 #~ msgid "Auth"
 #~ msgstr "Godkend"
+
 #~ msgid "Approve"
 #~ msgstr "Godkend"
 
@@ -13082,14 +14946,17 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #, fuzzy
 #~ msgid "[%d] added to Qun \"%d\""
 #~ msgstr "Du [%d] er blevet tilføjet af gruppe \"%d\""
+
 #~ msgid "I am a member"
 #~ msgstr "Jeg er medlem"
 
 #, fuzzy
 #~ msgid "I am requesting"
 #~ msgstr "Ugyldig anmodning"
+
 #~ msgid "I am the admin"
 #~ msgstr "Jeg er administratoren"
+
 #~ msgid "Unknown status"
 #~ msgstr "Ukendt status"
 
@@ -13116,10 +14983,13 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #, fuzzy
 #~ msgid "Change Qun information"
 #~ msgstr "Kanal oplysninger"
+
 #~ msgid "System Message"
 #~ msgstr "Systembesked"
+
 #~ msgid "<b>Last Login IP</b>: %s<br>\n"
 #~ msgstr "<b>Sidste logind IP</b>: %s<br>\n"
+
 #~ msgid "<b>Last Login Time</b>: %s\n"
 #~ msgstr "<b>Sidste logind tid</b>: %s\n"
 
@@ -13184,6 +15054,7 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #, fuzzy
 #~ msgid "Network disconnected"
 #~ msgstr "%s afbrudt"
+
 #~ msgid "developer"
 #~ msgstr "udvikler"
 
@@ -13206,78 +15077,105 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ msgstr ""
 #~ "<b>Ændringer:</b>\n"
 #~ "%s<br><br>"
+
 #~ msgid "Screen name:"
 #~ msgstr "Brugernavn:"
 
 #, fuzzy
 #~ msgid "Show offline buddies"
 #~ msgstr "Vis afkoblede venner"
+
 #~ msgid "Sort by status"
 #~ msgstr "Sorter efter status"
+
 #~ msgid "Sort alphabetically"
 #~ msgstr "Sorter alfabetisk"
+
 #~ msgid "Sort by log size"
 #~ msgstr "Sorter efter logstørrelse"
 
 #, fuzzy
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Over_våg kun når min status er ikke tilgængelig"
+
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Nogle siger dit brugernavn i samtale"
+
 #~ msgid "EOF while reading from resolver process"
 #~ msgstr "EOF ved læsning fra resolver-proces"
 
 #, fuzzy
 #~ msgid "There were errors unloading the plugin."
 #~ msgstr "Pidgin kunne ikke udlæse modulet."
+
 #~ msgid "Error setting socket options"
 #~ msgstr "Fejl ved opsætning af socket indstillinger"
+
 #~ msgid "Couldn't open file"
 #~ msgstr "Kan ikke åbne fil"
+
 #~ msgid ""
 #~ "This server requires plaintext authentication over an unencrypted "
 #~ "connection.  Allow this and continue authentication?"
 #~ msgstr ""
 #~ "Denne server kræver at godkendelse sker i klartekst (uden kryptering). "
 #~ "Tillad dette og fortsæt godkendelse?"
+
 #~ msgid "Error initializing session"
 #~ msgstr "Fejl ved initialisering af session"
+
 #~ msgid "Invalid screen name"
 #~ msgstr "Ugyldigt skærmnavn"
+
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Kunne ikke skabe SSL-forbindelse til server."
+
 #~ msgid "Too evil (sender)"
 #~ msgstr "For ond (afsender)"
+
 #~ msgid "Too evil (receiver)"
 #~ msgstr "For ond (modtager)"
+
 #~ msgid "Screen name sent"
 #~ msgstr "Brugernavn sendt"
+
 #~ msgid "Invalid screen name."
 #~ msgstr "Ugyldigt skærmnavn."
+
 #~ msgid "Available Message"
 #~ msgstr "Tilgængelig besked"
+
 #~ msgid "Screen name"
 #~ msgstr "Skærmnavn"
+
 #~ msgid "Invalid chat name specified."
 #~ msgstr "Ugyldigt samtalenavn angivet."
+
 #~ msgid "Away Message"
 #~ msgstr "Fraværs-besked"
+
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(modtager)</i>"
+
 #~ msgid "Use recent buddies group"
 #~ msgstr "Brug seneste vennegruppe"
+
 #~ msgid "Show how long you have been idle"
 #~ msgstr "Vis hvor lang tid du har været inaktiv"
+
 #~ msgid ""
 #~ "Always use ICQ proxy server for file transfers\n"
 #~ "(slower, but does not reveal your IP address)"
 #~ msgstr ""
 #~ "Brug altid ICQ-mellemværtssever til filoverførelser\n"
 #~ "(langsommere, men afslører ikke din IP-adresse)"
+
 #~ msgid "Your information has been updated"
 #~ msgstr "Din information er blevet opdateret"
+
 #~ msgid "Input your reason:"
 #~ msgstr "Angiv din grund:"
+
 #~ msgid "You have successfully removed a buddy"
 #~ msgstr "Du har fjernet en ven."
 
@@ -13288,12 +15186,14 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #, fuzzy
 #~ msgid "You have added %d to buddy list"
 #~ msgstr "Du har tilføjet %d i vennelisten"
+
 #~ msgid "Invalid QQid"
 #~ msgstr "Ugyldigt QQid"
 
 #, fuzzy
 #~ msgid "Please enter external group ID"
 #~ msgstr "Venligt indtast en ekstern gruppe-ID"
+
 #~ msgid "Reason: %s"
 #~ msgstr "Grund: %s"
 
@@ -13302,22 +15202,24 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ msgstr ""
 #~ "Din forespørgsel om at tilslutte gruppen %d er blevet godkendt af "
 #~ "administrator %d"
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Denne gruppe er blevet tilføjet til din venneliste"
+
 #~ msgid "I am applying to join"
 #~ msgstr "Jeg prøver at tilslutte"
 
 #, fuzzy
 #~ msgid "You have successfully left the group"
 #~ msgstr "Du har forladt gruppen"
+
 #~ msgid "QQ Group Auth"
 #~ msgstr "QQ gruppe autorisation"
 
 #, fuzzy
 #~ msgid "Your authorization request has been accepted by the QQ server"
 #~ msgstr "Din autorisations-operation er blevet accepteret af QQ-serveren"
+
 #~ msgid "Code [0x%02X]: %s"
 #~ msgstr "Kode [0x%02X]: %s"
+
 #~ msgid "Group Operation Error"
 #~ msgstr "Gruppe-operationsfejl"
 
@@ -13325,9 +15227,6 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ msgid "Enter your reason:"
 #~ msgstr "Angiv din grund:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Fejl ved oprettelse af forbindelse"
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Kunne ikke logge ind, kontrollér fejlsøgningslog"
 
@@ -13338,22 +15237,29 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #, fuzzy
 #~ msgid "UDP Address"
 #~ msgstr "IP-adresse"
+
 #~ msgid "Show Login Information"
 #~ msgstr "Vis logind information"
+
 #~ msgid "Login failed, no reply"
 #~ msgstr "Logind slog fejl, intet svar"
+
 #~ msgid "User %s rejected your request"
 #~ msgstr "Bruger %s afslog din forespørgsel"
 
 #, fuzzy
 #~ msgid "User %s approved your request"
 #~ msgstr "Bruger %s har godkendt din forespørgsel"
+
 #~ msgid "Cannot find/access ~/.silc directory"
 #~ msgstr "Kan ikke finde eller tilgå ~/.silc mappe"
+
 #~ msgid "%s changed status from %s to %s"
 #~ msgstr "%s ændrede status fra %s til %s"
+
 #~ msgid "%s is now %s"
 #~ msgstr "%s er nu %s"
+
 #~ msgid "%s is no longer %s"
 #~ msgstr "%s er ikke længere %s"
 
@@ -13368,12 +15274,16 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #, fuzzy
 #~ msgid "Add Buddy _Pounce"
 #~ msgstr "Tilføj overvågning"
+
 #~ msgid "Add a C_hat"
 #~ msgstr "Tilføj en _samtale"
+
 #~ msgid "/Accounts/Add\\/Edit"
 #~ msgstr "/Konti/Tilføj\\/Redigér"
+
 #~ msgid "<span color=\"red\">%s disconnected: %s</span>"
 #~ msgstr "<span color=\"red\">%s afbrudt: %s</span>"
+
 #~ 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 "
@@ -13399,12 +15309,14 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ " \n"
 #~ "Pidgin vil ikke forsøge at genforbinde til kontoen før du retter fejlen "
 #~ "og genaktiverer kontoen."
+
 #~ msgid "User has typed something and stopped"
 #~ msgstr "Bruger har skrevet noget, og stoppet"
 
 #, fuzzy
 #~ msgid "_Send To"
 #~ msgstr "_Send til"
+
 #~ msgid ""
 #~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
 #~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
@@ -13413,16 +15325,20 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ "%s%s<span weight=\"bold\">Skrevet af:</span>\t%s\n"
 #~ "<span weight=\"bold\">Websted:</span>\t\t%s\n"
 #~ "<span weight=\"bold\">Filnavn:</span>\t\t%s"
+
 #~ msgid "Display Statistics"
 #~ msgstr "Vis statistikker"
+
 #~ msgid ""
 #~ "The contact availability plugin (cap) is used to display statistical "
 #~ "information about buddies in a users contact list."
 #~ msgstr ""
 #~ "Tilgængelighedsforudsigelses-udvidelsesmodulet (cap) bruges til at vise "
 #~ "statistik-information om venner i en brugers kontaktliste."
+
 #~ msgid "Conversation History"
 #~ msgstr "Samtale historik"
+
 #~ msgid "Log Viewer"
 #~ msgstr "Loglæser"
 
@@ -13435,74 +15351,90 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ msgstr "Nuværende medie"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Kunne ikke kontakte server."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Besked:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Konto:"
 #~ msgid "Toggle offline buddies"
 #~ msgstr "Afkoblet venner til/fra"
+
 #~ msgid ""
 #~ "%s was disconnected due to the following error:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "%s blev afbrudt grundet følgende fejl:\n"
 #~ "%s"
+
 #~ msgid "Commands are not supported yet. Message was NOT sent."
 #~ msgstr "Kommandoer er ikke understøttet endnu. Besked blev IKKE sendt."
+
 #~ msgid "Timestamps"
 #~ msgstr "Tidsstempler"
+
 #~ msgid "..."
 #~ msgstr "..."
+
 #~ msgid "Still need to do something about this."
 #~ msgstr "Mangler stadig at gøre noget ved dette."
+
 #~ msgid "Alias..."
 #~ msgstr "Alias..."
+
 #~ msgid "/Tools/Buddy Pounces"
 #~ msgstr "/Værktøjer/Venneovervågning"
+
 #~ msgid "/Options/Show Buddy _Icon"
 #~ msgstr "/Indstillinger/Vis venne_ikoner"
+
 #~ msgid "/Options/Show Buddy Icon"
 #~ msgstr "/Indstillinger/Vis venne_ikoner"
+
 #~ msgid "Jabber developer"
 #~ msgstr "Jabber udvikler"
+
 #~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin on irc.freenode.net<BR><BR>"
 #~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin på irc.freenode.net<BR><BR>"
+
 #~ msgid "Smaller font size"
 #~ msgstr "Mindre skriftstørrelse"
+
 #~ msgid "Insert link"
 #~ msgstr "Indsæt henvisning"
+
 #~ msgid "Insert image"
 #~ msgstr "Indsæt billede"
+
 #~ msgid "Pidgin %s. Try `%s -h' for more information.\n"
 #~ msgstr "Pidgin %s. Prøv `%s -h' for flere oplysninger.\n"
+
 #~ msgid "Show buddy _icons"
 #~ msgstr "Vis venne_ikoner"
+
 #~ msgid ""
 #~ "You can send this image as a file transfer or embed it into this message, "
 #~ "or use it as the buddy icon for this user."
 #~ msgstr ""
 #~ "Du kan sende dette billede som en filoverførsel, vedlægge det til en "
 #~ "besked, eller bruge det som venneikonet for denne bruger."
+
 #~ msgid "GtkTreeView Expander Size"
 #~ msgstr "GtkTreeView udfoldelses-pil størrelse"
+
 #~ msgid "GtkTreeView Indent Expanders"
 #~ msgstr "GtkTreeView indryknings pile"
+
 #~ msgid "Tools"
 #~ msgstr "Værktøjer"
+
 #~ msgid ""
 #~ "You can get version %s from:<br><a href=\"http://Pidgin.sourceforge.net/"
 #~ "\">http://Pidgin.sourceforge.net</a>."
 #~ msgstr ""
 #~ "Du kan få version %s fra:<br><a href=\"http://Pidgin.sourceforge.net/"
 #~ "\">http://Pidgin.sourceforge.net</a>."
+
 #~ msgid "WinPidgin Options"
 #~ msgstr "WinPidgin Indstillinger"
+
 #~ msgid ""
 #~ "%d buddy from group %s was not removed because it belongs to an account "
 #~ "which is disabled or offline.  This buddy and the group were not "
@@ -13517,14 +15449,19 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ msgstr[1] ""
 #~ "%d venner fra gruppe %s blev ikke fjernet fordi de tilhører en konto som "
 #~ "er slået fra eller afkoblet. Disse venner og gruppen blev ikke flyttet.\n"
+
 #~ msgid "Group not removed"
 #~ msgstr "Gruppe ikke fjernet"
+
 #~ msgid "Old Pidgin"
 #~ msgstr "Gammel Pidgin"
+
 #~ msgid "Autoreply"
 #~ msgstr "Automatisk svar"
+
 #~ msgid "Autoreply for all the protocols"
 #~ msgstr "Automatisk svar for alle protokollerne"
+
 #~ msgid ""
 #~ "This plugin lets you set autoreply message for any protocol. You can set "
 #~ "the global autoreply message from the Plugin-options dialog. To set some "
@@ -13538,80 +15475,112 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ "automatisk svarbesked for en bestemt ven, højreklik på vennen i "
 #~ "venneliste-vinduet. For at sætte en automatisk svarbesked for bestemte "
 #~ "konti, gå til \"Avanceret\"-fanen i Konto-redigér-vinduet."
+
 #~ msgid "Set autoreply message for %s"
 #~ msgstr "Sæt automatisk svarbesked for %s"
+
 #~ msgid "Set Autoreply Message"
 #~ msgstr "Sæt automatisk svarbesked"
+
 #~ msgid ""
 #~ "The following message will be sent to the buddy when the buddy sends you "
 #~ "a message and autoreply is enabled."
 #~ msgstr ""
 #~ "Følgende besked vil blive sendt til vennen når vennen sender dig en "
 #~ "besked og automatisk svarbesked er aktiveret."
+
 #~ msgid "Set _Autoreply Message"
 #~ msgstr "Sæt _automatisk svarbesked"
+
 #~ msgid "Autoreply message"
 #~ msgstr "Automatisk svarbesked"
+
 #~ msgid "Send autoreply messages when"
 #~ msgstr "Send automatisk svarbesked når"
+
 #~ msgid "When my account is _away"
 #~ msgstr "Når min konto er _væk"
+
 #~ msgid "When my account is _idle"
 #~ msgstr "Når min konto er _fraværende"
+
 #~ msgid "_Default reply"
 #~ msgstr "_Standard-svar"
+
 #~ msgid "Status message"
 #~ msgstr "Status-besked"
+
 #~ msgid "Autoreply with status message"
 #~ msgstr "Automatisk svar med statusbesked"
+
 #~ msgid "Always when there is a status message"
 #~ msgstr "Altid når der er en statusbesked"
+
 #~ msgid "Only when there's no autoreply message"
 #~ msgstr "Kun når der ikke er nogen automatisk svarbesked"
+
 #~ msgid "Delay between autoreplies"
 #~ msgstr "Forsinkelse mellem automatisk svar"
+
 #~ msgid "_Minimum delay (mins)"
 #~ msgstr "_Mindste forsinkelse (mins)"
+
 #~ msgid "Times to send autoreplies"
 #~ msgstr "Antal gange der sendes automatisk svar"
+
 #~ msgid "Ma_ximum count"
 #~ msgstr "Maksimum tæller"
+
 #~ msgid ""
 #~ "I am currently not available. Please leave your message, and I will get "
 #~ "back to you as soon as possible."
 #~ msgstr ""
 #~ "Jeg er ikke til stede. Vær venlig at efterlade en besked, og jeg vil "
 #~ "vende tilbage til dig hurtigst muligt."
+
 #~ msgid "Pidgin User"
 #~ msgstr "Pidgin bruger"
+
 #~ msgid "Jabber Account"
 #~ msgstr "Jabber-konto"
+
 #~ msgid "Server couldn't authenticate you without a password"
 #~ msgstr "Server kunne ikke godkende dig uden en adgangskode"
+
 #~ msgid "Search for Jabber users"
 #~ msgstr "Søg efter Jabber brugere"
+
 #~ msgid "Invalid Jabber ID"
 #~ msgstr "Ugyldigt Jabber ID"
+
 #~ msgid "Change Jabber Password"
 #~ msgstr "Ændr Jabber adgangskode"
+
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Jabber protokolmodul"
+
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Du har sendt et vink!"
+
 #~ msgid "SNAC threw error: %s\n"
 #~ msgstr "SNAC gav fejlen: %s\n"
+
 #~ msgid "User information for %s unavailable:"
 #~ msgstr "Bruger oplysninger for %s er ikke tilgængelige:"
+
 #~ msgid "Rate limiting error."
 #~ msgstr "Grænsefejl."
+
 #~ msgid "You have been signed off for an unknown reason."
 #~ msgstr "Du er blevet logget af pga. en ukendt årsag."
+
 #~ msgid ""
 #~ "Your screen name is currently formatted as follows:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Dit brugernavn er formatter således på nuværende tidspunkt:\n"
 #~ "%s"
+
 #~ msgid ""
 #~ "Could not add the buddy %s for an unknown reason.  The most common reason "
 #~ "for this is that you have the maximum number of allowed buddies in your "
@@ -13619,50 +15588,73 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ msgstr ""
 #~ "Kunne ikke tilføje vennen %s pga. en ukendt årsag. Den normale grund for "
 #~ "dette er at du har det maskimale antal tilladte venner i din venneliste."
+
 #~ msgid "New screen name formatting:"
 #~ msgstr "Ny brugernavn formatering:"
+
 #~ msgid "Format Screen Name..."
 #~ msgstr "Formatér brugernavn..."
+
 #~ msgid "_Connect"
 #~ msgstr "_Tilslut"
+
 #~ msgid "Are you sure to exit this Qun?"
 #~ msgstr "Er du sikker på at du vil forlade denne Qun?"
+
 #~ msgid "Go ahead"
 #~ msgstr "Fortsæt"
+
 #~ msgid "Server ACK"
 #~ msgstr "Server-ACK"
+
 #~ msgid "Send IM fail\n"
 #~ msgstr "Send besked fejlede\n"
+
 #~ msgid "Keep alive error, seems connection lost!"
 #~ msgstr "Hold i live fejl, lader til at forbindelsen er tabt!"
+
 #~ msgid "Request login token error!"
 #~ msgstr "Login forespørgelesmærke-fejl!"
+
 #~ msgid "%s Address"
 #~ msgstr "%s-adresse"
+
 #~ msgid "QQ: Available"
 #~ msgstr "QQ: Tilgængelig"
+
 #~ msgid "QQ: Away"
 #~ msgstr "QQ: Fraværende"
+
 #~ msgid "QQ: Invisible"
 #~ msgstr "QQ: Usynlig"
+
 #~ msgid "QQ: Offline"
 #~ msgstr "QQ: Afkoblet"
+
 #~ msgid "Login in TCP"
 #~ msgstr "Logind i TCP"
+
 #~ msgid "Login Hidden"
 #~ msgstr "Skjult logind"
+
 #~ msgid "Socket send error"
 #~ msgstr "Sokkel sendefejl"
+
 #~ msgid "Would like to add him?"
 #~ msgstr "Vil du tilføje ham?"
+
 #~ msgid "Reject watching by other users"
 #~ msgstr "Nægt andre brugere at kigge på"
+
 #~ msgid "Block invites"
 #~ msgstr "Blokér invitationer"
+
 #~ msgid "Reject online status attribute requests"
 #~ msgstr "Nægt anmodning om online status-attributter"
+
 #~ msgid "TOC has sent a PAUSE command."
 #~ msgstr "TOC har sendt en PAUSE kommando."
+
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
 #~ "off if you send a message. Pidgin will prevent anything from going "
@@ -13672,8 +15664,10 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ "risikere at blive logget af, hvis du forsøger at sende en besked. Pidgin "
 #~ "vil derfor tilbageholde alle beskeder. Dette er kun midlertidigt, så hav "
 #~ "tålmodighed."
+
 #~ msgid "Pidgin - Save As..."
 #~ msgstr "Pidgin - Gem som..."
+
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
@@ -13684,34 +15678,48 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ "adgangskode er forkert, eller at Yahoo!'s godkendelsesmetode er blevet "
 #~ "ændret. Pidgin vil nu forsøge at logge ind via Web Messenger-"
 #~ "godkendelsesmetoden, som vil resultere i begrænset funktionalitet."
+
 #~ msgid "Unavailable"
 #~ msgstr "Ikke tilgængelig"
+
 #~ msgid "Crazychat"
 #~ msgstr "Skørchat"
+
 #~ msgid "Plugin to establish a Crazychat session."
 #~ msgstr "Plugin til at etablere en skørchat session."
+
 #~ msgid "Uses Pidgin to obtain buddy ips to connect for a Crazychat session"
 #~ msgstr ""
 #~ "Bruger Pidgin til at finde venners ip-adresser til at forbinde til en "
 #~ "skørchat session"
+
 #~ msgid "Network Configuration"
 #~ msgstr "Netværksopsætning"
+
 #~ msgid "TCP port"
 #~ msgstr "TCP port"
+
 #~ msgid "UDP port"
 #~ msgstr "UDP port"
+
 #~ msgid "Feature Calibration"
 #~ msgstr "Funktionalitets justering"
+
 #~ msgid "DBus"
 #~ msgstr "DBus"
+
 #~ msgid "Blink tray icon for unread..."
 #~ msgstr "Blink statusikon for ulæste..."
+
 #~ msgid "_Instant Messages:"
 #~ msgstr "_Kvikbeskeder:"
+
 #~ msgid "C_hat Messages:"
 #~ msgstr "C_hat beskeder:"
+
 #~ msgid "Displays an icon for Pidgin in the system tray."
 #~ msgstr "Viser et Pidgin-ikon i statusområdet."
+
 #~ msgid ""
 #~ "Displays a system tray icon (in GNOME, KDE, or Windows for example) to "
 #~ "show the current status of Pidgin, allow fast access to commonly used "
@@ -13722,60 +15730,67 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ "vise Pidgins nuværende status. Det tillader hurtig adgang til ofte brugte "
 #~ "funktioner, og du kan hurtigt skjule/vise vennelisten. Det giver også "
 #~ "mulighed for at blinke når der er ulæste beskeder."
+
 #~ msgid "The specified buddy was not found in the Evolution Contacts."
 #~ msgstr "Den angivne ven blev ikke fundet i Evolution kontakter"
+
 #~ msgid "Delay"
 #~ msgstr "Forsinkelse"
+
 #~ msgid "Buddy icon:"
 #~ msgstr "Venneikon:"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Nickname:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Kælenavn:</b> %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Logged In:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Logget ind:</b> %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Idle:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Inaktiv:</b> %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> Offline"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> Afkoblet"
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Beskrivelse:</b> Skræmmende"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> Enestående"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> Rockin'"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> Fantastisk"
+
 #~ msgid "IM the user"
 #~ msgstr "Send besked til bruger"
+
 #~ msgid "Ignore the user"
 #~ msgstr "Ignorér brugeren"
+
 #~ msgid "Get the user's information"
 #~ msgstr "Hent brugerens oplysninger"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
 #~ "\n"
@@ -13784,96 +15799,131 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ "<span weight=\"bold\" size=\"larger\">Du har fået post!</span>\n"
 #~ "\n"
 #~ "%s"
+
 #~ msgid "Send unknown \"_slash\" commands as messages"
 #~ msgstr "Send ukendte \"_skråstreg\" kommandoer som beskeder"
+
 #~ msgid "Tab Options"
 #~ msgstr "Faneblad indstillinger"
+
 #~ msgid "_Sounds while away"
 #~ msgstr "Afspil _lyde under fravær"
+
 #~ msgid ""
 #~ "Unable to play sound because the 'Command' sound method has been chosen, "
 #~ "but no command has been set."
 #~ msgstr ""
 #~ "Kunne ikke afspille lyd fordi 'Kommando' lydmetoden er blevet valgt, men "
 #~ "ingen kommando er blevet sat."
+
 #~ msgid ""
 #~ "Unable to play sound because the configured sound command could not be "
 #~ "launched: %s"
 #~ msgstr ""
 #~ "Ikke i stand til at afspille lyd fordi den opsatte lydkommando ikke kunne "
 #~ "køres: %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status</b>: %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Message:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Besked:</b> %s"
+
 #~ msgid "Unable to initiate a new search"
 #~ msgstr "Kunne ikke lave en ny søgning"
+
 #~ msgid "You have a pending search. Please wait for it to finish."
 #~ msgstr "Du har en søgning i gang. Vent til den afslutter."
+
 #~ msgid "<b>%s:</b> %s"
 #~ msgstr "<b>%s:</b> %s"
+
 #~ msgid ""
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 #~ msgstr ""
 #~ "Server kræevr TLS/SSL til logind.  Vælg \"Brug TLS hvis tilgængeligt\" i "
 #~ "kontoegenskaber"
+
 #~ msgid "Use TLS if available"
 #~ msgstr "Brug TLS hvis tilgængelig"
+
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "Brugeren %s vil tilføje %s til sin venneliste."
+
 #~ msgid "_Authorize"
 #~ msgstr "_Godkend"
+
 #~ msgid "_Deny"
 #~ msgstr "_Nægt"
+
 #~ msgid "%s<b>General</b><br>%s"
 #~ msgstr "%s<b>Generelt</b><br>%s"
+
 #~ msgid "%s<b>Social</b><br>%s"
 #~ msgstr "%s<b>Social</b><br>%s"
+
 #~ msgid "<br><b>Personal</b><br>%s"
 #~ msgstr "<br><b>Personlig</b><br>%s"
+
 #~ msgid "<br><b>Business</b><br>%s"
 #~ msgstr "<br><b>Erhverv</b><br>%s"
+
 #~ msgid "<hr><b>Contact Info</b>%s%s"
 #~ msgstr "<hr><b>Kontaktoplysninger</b>%s%s"
+
 #~ msgid "<hr><b>%s:</b> "
 #~ msgstr "<hr><b>%s:</b> "
+
 #~ msgid "Login server"
 #~ msgstr "Indlogningsserver"
+
 #~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
 #~ msgstr "Brugeren %s (%s) vil tilføje %s til sin venneliste."
+
 #~ msgid "Unable to read header from server"
 #~ msgstr "Kunne ikke hente hoved fra server"
+
 #~ msgid ""
 #~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
 #~ msgstr ""
 #~ "Kunne ikke læse besked fra server: %s. Kommando er %hd, længde er %hd."
+
 #~ msgid "users: %s, files: %s, size: %sGB"
 #~ msgstr "brugere: %s, filer: %s, størrelse: %sGB"
+
 #~ msgid "Unable to add \"%s\" to your Napster hotlist"
 #~ msgstr "Kunne ikke tilføje \"%s\" til din Napster hotlist"
+
 #~ msgid "%s requested a PING"
 #~ msgstr "%s anmodede om PING"
+
 #~ msgid "NAPSTER Protocol Plugin"
 #~ msgstr "NAPSTER protokolmodul"
+
 #~ msgid "Direct IM with %s closed"
 #~ msgstr "Direkte forbindelse til %s lukket"
+
 #~ msgid "Direct IM with %s failed"
 #~ msgstr "Direkte forbindelse til %s fejlede"
+
 #~ msgid "Unable to open Direct IM"
 #~ msgstr "Kunne ikke oprette direkte forbindelse"
+
 #~ msgid "You have lost your connection to chat room %s."
 #~ msgstr "Du har tabt forbindelsen til samtalerummet %s."
+
 #~ msgid "Chat is currently unavailable"
 #~ msgstr "Samtale er ikke tilgængelig nu"
+
 #~ msgid ""
 #~ "Transfer of file %s timed out.\n"
 #~ " Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
@@ -13882,22 +15932,28 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ "Overførsel af fil %s overløb tidsgrænsen.\n"
 #~ " Prøv at aktivere proxyservere for filoverførsler i Konti -> %s -> "
 #~ "Redigér konto -> Avanceret."
+
 #~ msgid "Unable to log into file transfer proxy."
 #~ msgstr "Kunne ikke logge ind til filoverførselsproxy."
+
 #~ msgid ""
 #~ "Unable to establish listener socket or no AOL proxy connection present."
 #~ msgstr ""
 #~ "Kan ikke etablere lytte sokkel eller ingen AOL proxy forbindelse tilstede."
+
 #~ msgid ""
 #~ "The user %s requires authorization before being added to a buddy list.  "
 #~ "Do you want to send an authorization request?"
 #~ msgstr ""
 #~ "Brugeren %s kræver godkendelse for at blive tilføjet til en venneliste."
 #~ "Vil du sende en anmodning om godkendelse?"
+
 #~ msgid "Request Authorization"
 #~ msgstr "Anmod om godkendelse"
+
 #~ msgid "_Request Authorization"
 #~ msgstr "_Anmod om godkendelse"
+
 #~ msgid ""
 #~ "The user %u wants to add %s to their buddy list for the following "
 #~ "reason:\n"
@@ -13905,40 +15961,55 @@ msgstr "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller
 #~ msgstr ""
 #~ "Brugeren %u vil tilføje %s til sin venneliste af følgende grund:\n"
 #~ "%s"
+
 #~ msgid "Authorization Request"
 #~ msgstr "Godkendelse anmodning"
+
 #~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 #~ msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+
 #~ msgid "Auth host"
 #~ msgstr "Godkendelses server"
+
 #~ msgid "Auth port"
 #~ msgstr "Godkendelses port"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Supports:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Understøtter:</b>: %s"
+
 #~ msgid "<b>Full Name:</b> %s<br>"
 #~ msgstr "<b>Fulde navn:</b> %s<br>"
+
 #~ msgid "<b>Supports:</b> %s<br>"
 #~ msgstr "<b>Understøtter:</b> %s<br>"
+
 #~ msgid "<b>Status:</b> %s"
 #~ msgstr "<b>Status:</b> %s"
+
 #~ msgid "Wrong Password"
 #~ msgstr "Forkert adgangskode"
+
 #~ msgid "TOC host"
 #~ msgstr "TOC Vært"
+
 #~ msgid "TOC port"
 #~ msgstr "TOC Port"
+
 #~ msgid "Unable to read"
 #~ msgstr "Kunne ikke læse"
+
 #~ msgid "Pager host"
 #~ msgstr "Bipper vært"
+
 #~ msgid "YCHT host"
 #~ msgstr "YCHT vært"
+
 #~ msgid "YCHT port"
 #~ msgstr "YCHT port"
+
 #~ msgid "g003: Error opening connection.\n"
 #~ msgstr "g003: Fejl ved oprettelse af forbindelse\n"
-
diff --git a/po/de.po b/po/de.po
index 993315bf86..83259f964d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-25 17:28+0100\n"
-"PO-Revision-Date: 2009-02-25 17:28+0100\n"
-"Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
-"Language-Team: German <de@li.org>\n"
+"POT-Creation-Date: 2009-08-14 16:32+0200\n"
+"PO-Revision-Date: 2009-08-14 16:31+0200\n"
+"Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n"
+"Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -614,19 +614,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Senden an"
 
-msgid "Invite message"
-msgstr "Einladungsnachricht"
-
-msgid "Invite"
-msgstr "Einladen"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen möchten "
-"zusammen mit einer optionalen Einladungsnachricht."
-
 msgid "Conversation"
 msgstr "Unterhaltung"
 
@@ -889,6 +876,41 @@ msgstr "Alle Unterhaltungen"
 msgid "System Log"
 msgstr "System-Mitschnitt"
 
+msgid "Calling ... "
+msgstr "Anrufen ... "
+
+msgid "Hangup"
+msgstr "Auflegen"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Akzeptieren"
+
+msgid "Reject"
+msgstr "Ablehnen"
+
+msgid "Call in progress."
+msgstr "Anruf läuft."
+
+msgid "The call has been terminated."
+msgstr "Der Anruf wurde beendet."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s möchte eine Audio-Sitzung mit Ihnen starten."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+"%s versucht, einen nicht unterstützten Typ von Medien-Sitzung mit Ihnen zu "
+"starten."
+
+msgid "You have rejected the call."
+msgstr "Sie haben den Anruf abgelehnt."
+
+msgid "call: Make an audio call."
+msgstr "call: Einen Audio-Anruf tätigen."
+
 msgid "Emails"
 msgstr "E-Mails"
 
@@ -923,6 +945,9 @@ msgstr "Fortfahren"
 msgid "IM"
 msgstr "Nachricht"
 
+msgid "Invite"
+msgstr "Einladen"
+
 msgid "(none)"
 msgstr "(kein)"
 
@@ -1092,7 +1117,7 @@ msgstr "%s hat begonnen Ihnen zu schreiben (%s)"
 
 #, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s hat beim Schreiben an Sie (%s) angehalten"
+msgstr "%s hat beim Tippen an Sie (%s) angehalten"
 
 #, c-format
 msgid "%s has signed on (%s)"
@@ -1537,6 +1562,30 @@ msgstr "Gnt-Verlauf"
 msgid "Lastlog plugin."
 msgstr "Verlauf-Plugin."
 
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Hole TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "TinyURL nur für URLs mit mindestens dieser Länge generieren"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Adresspräfix für TinyURL (oder andere)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL-Plugin"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"URLs aus erhaltenen Nachrichten zum einfacheren Kopieren in TinyURLs "
+"umwandeln"
+
 msgid "accounts"
 msgstr "Konten"
 
@@ -1638,41 +1687,40 @@ msgstr "Akzeptieren Sie das Zertifikat für %s?"
 msgid "SSL Certificate Verification"
 msgstr "SSL-Zertifikatsüberprüfung"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Akzeptieren"
-
-msgid "Reject"
-msgstr "Ablehnen"
-
 msgid "_View Certificate..."
 msgstr "Ze_rtifikat ansehen..."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
-"Das Zertifikat von „%s“ ist selbstsigniert. Es kann nicht automatisch "
-"geprüft werden."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "Die Zertifizierungskette, die für %s präsentiert wird, ist ungültig."
+"Das Zertifikat, welches von „%s“ präsentiert wurde, behauptet stattdessen "
+"von „%s“ zu kommen.  Das kann bedeuten, dass Sie tatsächlich nicht mit dem "
+"Dienst verbunden sind, mit dem Sie glauben verbunden zu sein."
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL-Zertifikatfehler"
 
 msgid "Invalid certificate chain"
 msgstr "Ungültige Zertifikationskette"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1681,6 +1729,21 @@ msgstr ""
 "Sie haben keine Datenbank für Root-Zertifikate. Zertifikate können nicht "
 "überprüft werden."
 
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Das Zertifikat von „%s“ ist selbstsigniert. Es kann nicht automatisch "
+"geprüft werden."
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "Die Zertifizierungskette, die für %s präsentiert wird, ist ungültig."
+
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1698,19 +1761,6 @@ msgstr ""
 msgid "Invalid certificate authority signature"
 msgstr "Unbekannte Zertifizierungsstellensignatur"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Das Zertifikat, welches von „%s“ präsentiert wurde, behauptet stattdessen "
-"von „%s“ zu kommen.  Das kann bedeuten, dass Sie tatsächlich nicht mit dem "
-"Dienst verbunden sind, mit dem Sie glauben verbunden zu sein."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1746,6 +1796,7 @@ msgstr "+++ %s hat sich angemeldet"
 msgid "+++ %s signed off"
 msgstr "+++ %s hat sich abgemeldet"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -1792,6 +1843,17 @@ msgstr "%s hat den Raum verlassen."
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
 
+msgid "Invite to chat"
+msgstr "Zum Chat einladen"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen möchten "
+"zusammen mit einer optionalen Einladungsnachricht."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kann keine Verbindung herstellen: %s"
@@ -1923,6 +1985,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Starte die Dateiübertragung von %s von %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Übertragung der Datei <A HREF=\"file://%s\">%s</A> ist komplett"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Übertragung der Datei %s ist komplett"
 
@@ -2136,6 +2202,9 @@ msgstr "<font color=\"red\"><b>Kann folgende Datei nicht lesen: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Fehler beim Erstellen der Konferenz."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Sie benutzen %s, aber dieses Plugin benötigt %s."
@@ -2543,14 +2612,14 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Dieses Plugin zeigt auch die Mitschnitte anderer Sofortnachrichtenprogramme "
-"im Mitschnittsbetrachter an. Momentan sind das Adium, MSN Messenger und "
-"Trillian.\n"
+"im Mitschnittsbetrachter an. Momentan sind das Adium, MSN Messenger, aMSN "
+"und Trillian.\n"
 "WARNUNG: Dieses Plugin ist immer noch im Alpha-Stadium und kann oft "
 "abstürzen. Benutzung auf eigene Gefahr!"
 
@@ -2598,10 +2667,10 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "Sichert Nachrichten an einen Offline-Benutzer als Alarm."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Die folgenden Nachrichten werden als Alarm gesichert. Sie können den Alarm "
+"Die folgenden Nachrichten werden als Alarme gesichert. Sie können den Alarm "
 "im `Buddy-Alarm'-Dialog ändern oder löschen."
 
 #, c-format
@@ -2630,6 +2699,35 @@ msgstr "Sichere Offline-Nachricht als Alarm"
 msgid "Do not ask. Always save in pounce."
 msgstr "Nicht nachfragen. Immer als Alarm sichern."
 
+msgid "One Time Password"
+msgstr "Einmalpasswort"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Unterstützung für Einmalpasswörter"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Erzwinge, dass Passwörter nur einmal verwendet werden."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Erlaubt Ihnen (pro Konto) zu erzwingen, dass nicht gespeicherte Passwörter "
+"nur in einer einzigen erfolgreichen Verbindung verwendet werden.\n"
+"Hinweis: Damit dies funktioniert, darf das Konto-Passwort nicht gespeichert "
+"werden."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2823,15 +2921,14 @@ msgstr ""
 "dann installieren Sie ActiveTCL von http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Apples Bonjour-Toolkit für Windows konnte nicht gefunden werden. Besuchen "
-"Sie die FAQ unter http://d.pidgin.im/BonjourWindows für weitere "
-"Informationen."
+"Apples Toolkit „Bonjour für Windows“ konnte nicht gefunden werden. Besuchen "
+"Sie http://d.pidgin.im/BonjourWindows für weitere Informationen."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Kann nicht auf eingehende IM-Verbindungen hören\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Kann nicht auf eingehende IM-Verbindungen hören"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2885,14 +2982,17 @@ msgstr ""
 "Die Nachricht kann nicht gesendet werden, das Gespräch kann nicht gestartet "
 "werden."
 
-msgid "Cannot open socket"
-msgstr "Kann die Socket nicht öffnen"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Kann Socket nicht erstellen: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Kann die Socket nicht an den Port binden"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Kann die Socket nicht an den Port binden: %s"
 
-msgid "Could not listen on socket"
-msgstr "Kann nicht an der Socket hören"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Lauschen auf Socket nicht möglich: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Fehler bei der Kommunikation mit lokalem mDNSResponder."
@@ -2939,14 +3039,15 @@ msgstr "Buddy-Liste speichern..."
 msgid "Load buddylist from file..."
 msgstr "Buddy-Liste aus Datei laden..."
 
-msgid "Fill in the registration fields."
-msgstr "Füllen Sie die Registrierungsfelder aus."
+msgid "You must fill in all registration fields"
+msgstr "Sie müssen alle Registrierungsfelder ausfüllen"
 
-msgid "Passwords do not match."
-msgstr "Passwörter stimmen nicht überein."
+msgid "Passwords do not match"
+msgstr "Passwörter stimmen nicht überein"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Kann neues Konto nicht anlegen. Es ist ein Fehler aufgetreten.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+"Kann neues Konto nicht anlegen. Es ist ein unbekannter Fehler aufgetreten."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Neues Gadu-Gadu-Konto angelegt"
@@ -2957,14 +3058,14 @@ msgstr "Registrierung erfolgreich abgeschlossen!"
 msgid "Password"
 msgstr "Passwort"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Passwort (nochmal)"
 
-msgid "Enter current token"
-msgstr "Geben Sie das aktuelle Token ein"
+msgid "Enter captcha text"
+msgstr "Captcha-Text eigeben"
 
-msgid "Current token"
-msgstr "Aktuelles Token"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrierung eines neuen Gadu-Gadu-Kontos"
@@ -3017,6 +3118,15 @@ msgstr "Das Passwort wurde erfolgreich geändert!"
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
+msgid "Password (retype)"
+msgstr "Passwort (nochmal)"
+
+msgid "Enter current token"
+msgstr "Geben Sie das aktuelle Token ein"
+
+msgid "Current token"
+msgstr "Aktuelles Token"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort für folgende UIN ein: "
@@ -3031,6 +3141,7 @@ msgstr "Wählen sie einen Chat für den Benutzer: %s"
 msgid "Add to chat..."
 msgstr "Zum Chat hinzufügen..."
 
+#. Global
 msgid "Available"
 msgstr "Verfügbar"
 
@@ -3064,7 +3175,7 @@ msgstr "Keine entsprechenden Benutzer gefunden"
 msgid "There are no users matching your search criteria."
 msgstr "Es gibt keine Benutzer, die Ihrer Anfrage entsprechen."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Socket kann nicht gelesen werden"
 
 msgid "Buddy list downloaded"
@@ -3079,8 +3190,14 @@ msgstr "Buddy-Liste hochgeladen"
 msgid "Your buddy list was stored on the server."
 msgstr "Ihre Buddy-Liste wurde auf dem Server gespeichert."
 
-msgid "Connection failed."
-msgstr "Verbindung fehlgeschlagen."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Verbunden"
+
+msgid "Connection failed"
+msgstr "Verbindung fehlgeschlagen"
 
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
@@ -3088,14 +3205,23 @@ msgstr "Zum Chat hinzufügen"
 msgid "Chat _name:"
 msgstr "Chat_name:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Hostname '%s' kann nicht aufgelöst werden: %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Verbindungsaufbau"
+
 msgid "Chat error"
 msgstr "Chatfehler"
 
 msgid "This chat name is already in use"
 msgstr "Dieser Chatname existiert bereits"
 
-msgid "Not connected to the server."
-msgstr "Nicht mit dem Server verbunden."
+msgid "Not connected to the server"
+msgstr "Nicht mit dem Server verbunden"
 
 msgid "Find buddies..."
 msgstr "Finde Buddys..."
@@ -3136,6 +3262,9 @@ msgstr "Beliebter polnischer IM-Dienst"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-Benutzer"
 
+msgid "GG server"
+msgstr "GG-Server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unbekanntes Kommando: %s"
@@ -3150,8 +3279,8 @@ msgstr "Kein Thema gesetzt"
 msgid "File Transfer Failed"
 msgstr "Dateiübertragung gescheitert"
 
-msgid "Could not open a listening port."
-msgstr "Konnte keinen Listener-Port öffnen."
+msgid "Unable to open a listening port."
+msgstr "Es konnte kein lauschender Port geöffnet werden."
 
 msgid "Error displaying MOTD"
 msgstr "Fehler beim Anzeigen des MOTD"
@@ -3166,8 +3295,16 @@ msgstr "Es gibt kein MOTD zu dieser Verbindung."
 msgid "MOTD for %s"
 msgstr "MOTD für %s"
 
-msgid "Server has disconnected"
-msgstr "Serververbindung wurde unterbrochen"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Verbindung zum Server verloren: %s"
 
 msgid "View MOTD"
 msgstr "MOTD anzeigen"
@@ -3178,25 +3315,22 @@ msgstr "_Kanal:"
 msgid "_Password:"
 msgstr "_Passwort:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC-Nicknamen dürfen keine Leerzeichen enthalten"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Verbindungsaufbau"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC- Server und -Nicknamen dürfen keine Leerzeichen enthalten"
 
 msgid "SSL support unavailable"
 msgstr "SSL-Unterstützung nicht verfügbar"
 
-msgid "Couldn't create socket"
-msgstr "Kann Socket nicht erstellen"
+msgid "Unable to connect"
+msgstr "Verbindung nicht möglich"
 
-msgid "Couldn't connect to host"
-msgstr "Keine Verbindung zum Host"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Verbinden nicht möglich: %s"
 
-msgid "Read error"
-msgstr "Fehler beim Lesen"
+msgid "Server closed the connection"
+msgstr "Der Server hat die Verbindung beendet"
 
 msgid "Users"
 msgstr "Benutzer"
@@ -3377,6 +3511,16 @@ msgstr ""
 "Ihr gewählter Kontoname wurde vom Server abgelehnt.  Er enthält vermutlich "
 "ungültige Zeichen."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Der Spitzname „%s“ existiert bereits."
+
+msgid "Nickname in use"
+msgstr "Spitzname wird benutzt"
+
 msgid "Cannot change nick"
 msgstr "Kann den Spitznamen nicht ändern"
 
@@ -3618,12 +3762,11 @@ msgstr "Ad Hoc-Kommando gescheitert"
 msgid "execute"
 msgstr "Ausführen"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"Der Server benötigt TLS/SSL zur Anmeldung.  Es wurde kein TLS/SSL-Support "
-"gefunden."
+"Der Server benötigt TLS/SSL, es wurde aber kein TLS/SSL-Support gefunden."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Sie fordern Verschlüsselung, aber es wurde keine TLS/SSL-Unterstützung "
 "gefunden."
@@ -3645,17 +3788,44 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Klartext-Authentifizierung"
 
-msgid "Invalid response from server."
-msgstr "Ungültige Serverantwort."
+msgid "SASL authentication failed"
+msgstr "SASL-Authentifizierung fehlgeschlagen"
+
+msgid "Invalid response from server"
+msgstr "Ungültige Serverantwort"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Der Server benutzt keine der unterstützten Authentifizierungsmethoden"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+"Sie fordern Verschlüsselung, aber diese ist auf dem Server nicht verfügbar."
+
 msgid "Invalid challenge from server"
 msgstr "Ungültige Challenge vom Server"
 
-msgid "SASL error"
-msgstr "SASL-Fehler"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL-Fehler: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "Der BOSH-Verbindungsmanager hat Ihre Sitzung beendet."
+
+msgid "No session ID given"
+msgstr "Keine Sitzungs-ID angegeben"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Nicht-unterstützte Version des BOSH-Protokolls"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Die Verbindung mit dem Server konnte nicht hergestellt werden"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Die Verbindung mit dem Server konnte nicht hergestellt werden: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Kann SSL-Verbindung nicht erstellen"
 
 msgid "Full Name"
 msgstr "Vollständiger Name"
@@ -3672,6 +3842,11 @@ msgstr "URL"
 msgid "Street Address"
 msgstr "Straße"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
@@ -3723,158 +3898,8 @@ msgstr "Client"
 msgid "Operating System"
 msgstr "Betriebssystem"
 
-msgid "Last Activity"
-msgstr "Letzte Aktivität"
-
-msgid "Service Discovery Info"
-msgstr "Information zur Dienstsuche"
-
-msgid "Service Discovery Items"
-msgstr "Elemente der Dienstsuche"
-
-msgid "Extended Stanza Addressing"
-msgstr "Erweiterte Blockadressierung"
-
-msgid "Multi-User Chat"
-msgstr "Mehrbenutzer-Chat"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Erweiterte Anwesenheitsinformation im Mehrbenutzer-Chat"
-
-msgid "In-Band Bytestreams"
-msgstr "Bandinterner Bytestrom("
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad Hoc-Kommando"
-
-msgid "PubSub Service"
-msgstr "PubSub-Dienst"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5-Bytestrom"
-
-msgid "Out of Band Data"
-msgstr "Bandexterne Daten"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Bandinterne Registrierung"
-
-msgid "User Location"
-msgstr "Benutzerort"
-
-msgid "User Avatar"
-msgstr "Benutzer-Avatar"
-
-msgid "Chat State Notifications"
-msgstr "Chat-Status-Benachrichtigung"
-
-msgid "Software Version"
-msgstr "Software-Version"
-
-msgid "Stream Initiation"
-msgstr "Strom-Initialisierung"
-
-msgid "File Transfer"
-msgstr "Dateiübertragung"
-
-msgid "User Mood"
-msgstr "Benutzerstimmung"
-
-msgid "User Activity"
-msgstr "Benutzeraktivität"
-
-msgid "Entity Capabilities"
-msgstr "Instanz-Fähigkeiten"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Aushandlung einer verschlüsselten Sitzung"
-
-msgid "User Tune"
-msgstr "Benutzer anpassen"
-
-msgid "Roster Item Exchange"
-msgstr "Mitgliedsverzeichnis-Eintragsaustausch"
-
-msgid "Reachability Address"
-msgstr "Erreichbare Adresse"
-
-msgid "User Profile"
-msgstr "Benutzerprofil"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle-Klang"
-
-msgid "User Nickname"
-msgstr "Benutzer-Spitzname"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle-Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Nachrichtempfänge"
-
-msgid "Public Key Publishing"
-msgstr "Öffentliche Schlüssel-Veröffentlichung"
-
-msgid "User Chatting"
-msgstr "Benutzer, die chatten"
-
-msgid "User Browsing"
-msgstr "Benutzer, die im Web surfen"
-
-msgid "User Gaming"
-msgstr "Benutzer, die spielen"
-
-msgid "User Viewing"
-msgstr "Benutzer, die schauen"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Blockverschlüsselung"
-
-msgid "Entity Time"
-msgstr "Instanzzeit"
-
-msgid "Delayed Delivery"
-msgstr "Verzögerte Lieferung"
-
-msgid "Collaborative Data Objects"
-msgstr "Kooperative Datenobjekte"
-
-msgid "File Repository and Sharing"
-msgstr "Speicherbereich und gemeinsame Benutzung von Dateien"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-Dienstsuche für Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Vereinfachte Aushandlung der verschlüsselten Sitzung"
-
-msgid "Hop Check"
-msgstr "Hop-Überprüfung"
-
-msgid "Capabilities"
-msgstr "Fähigkeiten"
+msgid "Local Time"
+msgstr "Lokale Zeit"
 
 msgid "Priority"
 msgstr "Priorität"
@@ -3882,6 +3907,13 @@ msgstr "Priorität"
 msgid "Resource"
 msgstr "Ressource"
 
+#, c-format
+msgid "%s ago"
+msgstr "vor %s"
+
+msgid "Logged Off"
+msgstr "Abgemeldet"
+
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
@@ -3903,14 +3935,12 @@ msgstr "Sichtbar von"
 msgid "Temporarily Hide From"
 msgstr "Temporär versteckt von"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Abbrechen der Anwesenheitsbenachrichtigung"
 
 msgid "(Re-)Request authorization"
 msgstr "(Nochmal) nach Autorisierung fragen"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4051,29 +4081,24 @@ msgstr "Wählen Sie einen Konferenz-Server zur Abfrage"
 msgid "Find Rooms"
 msgstr "Finde Räume"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-"Sie fordern Verschlüsselung, aber diese ist auf dem Server nicht verfügbar."
+msgid "Affiliations:"
+msgstr "Mitgliedschaften:"
 
-msgid "Write error"
-msgstr "Schreibfehler"
+msgid "No users found"
+msgstr "Keine Benutzer gefunden"
 
-msgid "Ping timeout"
-msgstr "Ping-Zeitüberschreitung"
+msgid "Roles:"
+msgstr "Rollen:"
 
-msgid "Read Error"
-msgstr "Fehler beim Lesen"
+msgid "Ping timed out"
+msgstr "Ping-Zeitüberschreitung"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Die Verbindung mit dem Server konnte nicht hergestellt werden:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Kann Socket nicht erstellen"
+"Nach dem Fehlschlagen einer direkten XMPP-Verbindung konnen keine "
+"alternativen Verbindungsmethoden gefunden werden."
 
 msgid "Invalid XMPP ID"
 msgstr "Ungültige XMPP-ID"
@@ -4081,6 +4106,9 @@ msgstr "Ungültige XMPP-ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Falsche XMPP-ID. Die Domain muss gesetzt werden."
 
+msgid "Malformed BOSH URL"
+msgstr "Fehlerhafte BOSH-URL"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrierung von %s@%s erfolgreich"
@@ -4105,9 +4133,6 @@ msgstr "Aufheben der Registrierung erfolgreich"
 msgid "Unregistration Failed"
 msgstr "Aufheben der Registrierung gescheitert"
 
-msgid "Already Registered"
-msgstr "Schon registriert"
-
 msgid "State"
 msgstr "Provinz/Bundesland"
 
@@ -4120,6 +4145,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Schon registriert"
+
 msgid "Unregister"
 msgstr "Aufheben der Registrierung"
 
@@ -4175,6 +4203,12 @@ msgstr "Server unterstützt kein Blockieren"
 msgid "Not Authorized"
 msgstr "Nicht autorisiert"
 
+msgid "Mood"
+msgstr "Stimmung"
+
+msgid "Now Listening"
+msgstr "Hört gerade"
+
 msgid "Both"
 msgstr "Beide"
 
@@ -4196,12 +4230,6 @@ msgstr "Kein"
 msgid "Subscription"
 msgstr "Abonnement"
 
-msgid "Mood"
-msgstr "Stimmung"
-
-msgid "Now Listening"
-msgstr "Hört gerade"
-
 msgid "Mood Text"
 msgstr "Stimmungstext"
 
@@ -4244,9 +4272,6 @@ msgstr "Ihr Passwort wurde geändert."
 msgid "Error changing password"
 msgstr "Fehler beim Ändern des Passworts"
 
-msgid "Password (again)"
-msgstr "Passwort (nochmal)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP-Passwort ändern"
 
@@ -4440,16 +4465,24 @@ msgid "Unable to ping user %s"
 msgstr "Kann den Benutzer %s nicht anpingen"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "Kann nicht anklopfen, da nichts über den Benutzer %s bekannt ist."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Kann nicht anklopfen, da nichts über %s bekannt ist."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "Kann nicht anklopfen, da der Benutzer %s vielleicht offline ist."
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Kann nicht anklopfen, da %s vielleicht offline ist."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Kann nicht anklopfen, da der Benutzer %s dies nicht unterstützt."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"Kann nicht anklopfen, da %s dies nicht unterstützt oder im Moment nicht "
+"möchte."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s anklopfen..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4461,8 +4494,37 @@ msgid "%s has buzzed you!"
 msgstr "%s hat bei Ihnen angeklopft!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "%s anklopfen..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Medien-Sitzung mit %s konnte nicht gestartet werden: ungültige JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+"Medien-Sitzung mit %s konnte nicht gestartet werden: Benutzer ist nicht "
+"online"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Medien-Sitzung mit %s konnte nicht gestartet werden: Anwesenheit des "
+"Benutzers nicht abonniert"
+
+msgid "Media Initiation Failed"
+msgstr "Medien-Initiierung fehlgeschlagen"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Bitte wählen Sie die Ressource von %s, mir der Sie eine Medien-Sitzung "
+"starten möchten."
+
+msgid "Select a Resource"
+msgstr "Wählen Sie eine Ressource"
+
+msgid "Initiate Media"
+msgstr "Initiiere Medien"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriere einen Chatraum."
@@ -4483,18 +4545,20 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;Benutzer&gt; [Grund]:  Verbanne einen Benutzer aus dem Raum."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;Benutzer&gt; &lt;owner|admin|member|outcast|none&gt;: Setze "
-"eine Benutzerzugehörigkeit für den Raum."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [Benutzer1] "
+"[Benutzer2] ...: Benutzer mit einer Mitgliedschaft für den Raum erfragen "
+"oder setzen."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;Benutzer&gt; &lt;moderator|participant|visitor|none&gt;: Setze eine "
-"Rolle für den Benutzer im Raum."
+"role &lt;owner|admin|member|outcast|none&gt; [Benutzer1] [Benutzer2] ...: "
+"Benutzer mit einer Rolle für den Raum erfragen oder Benutzern eine Rolle "
+"zuweisen."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
@@ -4556,6 +4620,9 @@ msgstr "Verbindungsserver"
 msgid "File transfer proxies"
 msgstr "Proxys für Dateiübertragungen"
 
+msgid "BOSH URL"
+msgstr "BOSH-URL"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4594,6 +4661,14 @@ msgstr "Fehler bei Einlesen von XML-Daten"
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Fehler beim Betreten des Chats %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Fehler im Chat %s"
+
 msgid "Create New Room"
 msgstr "Einen neuen Chat-Raum erstellen"
 
@@ -4610,13 +4685,25 @@ msgstr "Raum _konfigurieren"
 msgid "_Accept Defaults"
 msgstr "Standards _akzeptieren"
 
+msgid "No reason"
+msgstr "Kein Grund"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Fehler beim Betreten des Chats %s"
+msgid "You have been kicked: (%s)"
+msgstr "Sie wurden hinausgeworfen: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Fehler im Chat %s"
+msgid "Kicked (%s)"
+msgstr "Hinausgeworfen (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Bei der In-Band-Bytestrom-Übertragung trat ein Fehler auf\n"
+
+msgid "Transfer was closed."
+msgstr "Übertragung wurde geschlossen."
+
+msgid "Failed to open in-band bytestream"
+msgstr "Öffnen des In-Band-Bytestroms fehlgeschlagen"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4645,9 +4732,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 "Bitte wählen Sie die Ressource von %s, an die Sie eine Datei schicken möchten"
 
-msgid "Select a Resource"
-msgstr "Wählen Sie eine Ressource"
-
 msgid "Edit User Mood"
 msgstr "Benutzerstimmung ändern"
 
@@ -4892,6 +4976,33 @@ msgstr "Andere Kontakte"
 msgid "Non-IM Contacts"
 msgstr "Nicht-IM-Kontakte"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s hat einen Wink gesendet. <a href='msn-wink://%s'>Zum Abspielen hier "
+"klicken</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s hat einen Wink gesendet, er konnte aber nicht gespeichert werden"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s hat einen Sprach-Clip gesendet. <a href='msn-wink://%s'>Zum Abspielen "
+"hier klicken</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr ""
+"%s hat einen Sprach-Clip gesendet, er konnte aber nicht gespeichert werden"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s hat Ihnen eine Audiochat-Einladung gesendet, die noch nicht unterstützt "
+"wird."
+
 msgid "Nudge"
 msgstr "Anstoßen"
 
@@ -5045,8 +5156,28 @@ msgstr ""
 "Für MSN wird SSL-Unterstützung benötigt. Bitte installieren Sie eine "
 "unterstützte SSL-Bibliothek."
 
-msgid "Failed to connect to server."
-msgstr "Verbindung zum Server nicht möglich."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Konnte den Buddy %s nicht hinzufügen, da der Benutzername ungültig ist.  "
+"Benutzernamen müssen gültige E-Mail-Adressen sein."
+
+msgid "Unable to Add"
+msgstr "Kann nicht hinzufügen"
+
+msgid "Authorization Request Message:"
+msgstr "Autorisierungsanfrage:"
+
+msgid "Please authorize me!"
+msgstr "Bitte autorisiere mich!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Fehler beim Empfangen des Profils"
@@ -5237,63 +5368,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID-Authentifikation:Ungültige Antwort"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ist keine gültige Gruppe."
-
-msgid "Unknown error."
-msgstr "Unbekannter Fehler."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s auf %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s hat Sie gerade angestoßen!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Unbekannter Fehler (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Unbekannter Fehler (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Kann den Benutzer nicht hinzufügen"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Die folgenden Benutzer fehlen in Ihrem Adressbuch"
-
+#. Unknown error!
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kann den Benutzer nicht zu %s (%s) hinzufügen"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Kann den Benutzer nicht für %s (%s) blockieren"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Kann den Benutzer nicht für %s (%s) erlauben"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s konnte nicht hinzugefügt werden, da Ihre Buddy-Liste voll ist."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ist kein gültiges Passport-Konto."
+msgid "Unknown error (%d)"
+msgstr "Unbekannter Fehler (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Dienst momentan nicht verfügbar."
+msgid "The following users are missing from your addressbook"
+msgstr "Die folgenden Benutzer fehlen in Ihrem Adressbuch"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobile Nachricht wurde nicht gesendet, da sie zu lang war."
 
-msgid "Unable to rename group"
-msgstr "Kann die Gruppe nicht umbenennen"
-
-msgid "Unable to delete group"
-msgstr "Kann die Gruppe nicht löschen"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5346,9 +5441,6 @@ msgstr ""
 "Nachricht konnte nicht gesendet werden, da ein unbekannter Fehler "
 "aufgetreten ist."
 
-msgid "Unable to connect"
-msgstr "Verbindung nicht möglich"
-
 msgid "Writing error"
 msgstr "Schreibfehler"
 
@@ -5363,22 +5455,22 @@ msgstr ""
 "Verbindungsfehler vom %s-Server:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Unser Protokoll wird vom Server nicht unterstützt."
+msgid "Our protocol is not supported by the server"
+msgstr "Unser Protokoll wird vom Server nicht unterstützt"
 
-msgid "Error parsing HTTP."
-msgstr "Fehler beim Verarbeiten von HTTP."
+msgid "Error parsing HTTP"
+msgstr "Fehler beim Verarbeiten von HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Sie haben sich von einem anderen Ort angemeldet."
+msgid "You have signed on from another location"
+msgstr "Sie haben sich von einem anderen Ort angemeldet"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Die MSN-Server sind temporär nicht verfügbar. Bitte warten Sie und versuchen "
 "Sie es später nochmal."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "Die MSN-Server werden kurzzeitig heruntergefahren."
+msgid "The MSN servers are going down temporarily"
+msgstr "Die MSN-Server werden kurzzeitig heruntergefahren"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5408,6 +5500,17 @@ msgstr "Cookie senden"
 msgid "Retrieving buddy list"
 msgstr "Abfragen der Buddy-Liste"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s möchte Ihr Webcam-Bild sehen, diese Anfrage wird jedoch noch nicht "
+"unterstützt."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s hat Ihnen eine Webcam-Einladung gesendet, die noch nicht unterstützt wird."
+
 msgid "Away From Computer"
 msgstr "Abwesend"
 
@@ -5457,14 +5560,6 @@ msgstr ""
 "Nachricht konnte nicht gesendet werden, da ein unbekannter Fehler "
 "aufgetreten ist:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Der Benutzer %s hat Sie zu seiner Buddy-Liste hinzugefügt."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "Der Benutzer %s hat Sie von seiner Buddy-Liste gelöscht."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Buddy aus dem Adressbuch löschen?"
 
@@ -5494,6 +5589,54 @@ msgid "MSN Protocol Plugin"
 msgstr "MSN-Protokoll-Plugin"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ist keine gültige Gruppe."
+
+msgid "Unknown error."
+msgstr "Unbekannter Fehler."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s auf %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kann den Benutzer nicht zu %s (%s) hinzufügen"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Kann den Benutzer nicht für %s (%s) blockieren"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Kann den Benutzer nicht für %s (%s) erlauben"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s konnte nicht hinzugefügt werden, da Ihre Buddy-Liste voll ist."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ist kein gültiges Passport-Konto."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Dienst momentan nicht verfügbar."
+
+msgid "Unable to rename group"
+msgstr "Kann die Gruppe nicht umbenennen"
+
+msgid "Unable to delete group"
+msgstr "Kann die Gruppe nicht löschen"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Der Benutzer %s hat Sie zu seiner Buddy-Liste hinzugefügt."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Der Benutzer %s hat Sie von seiner Buddy-Liste gelöscht."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Kein solcher Benutzer: %s"
 
@@ -5523,6 +5666,8 @@ msgid "Lost connection with server"
 msgstr "Verbindung zum Server verloren"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Neue Mail-Nachrichten"
 
@@ -5561,27 +5706,23 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Kontakte vom Server hinzufügen"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Verbunden"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfehler, Code %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Ihr Passwort hat %d Buchstaben, mehr als die erwartete maximale Länge von "
-"%d für MySpaceIM. Bitte kürzen Sie ihr Passwort unter http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword und "
-"versuchen Sie es erneut."
+"%s Ihr Passwort hat %zu Buchstaben, mehr als die erwartete maximale Länge "
+"von %d.  Bitte kürzen Sie ihr Passwort unter http://profileedit.myspace.com/"
+"index.cfm?fuseaction=accountSettings.changePassword und versuchen Sie es "
+"erneut."
+
+msgid "Incorrect username or password"
+msgstr "Ungültiger Benutzername oder Passwort"
 
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-Fehler"
@@ -5589,16 +5730,6 @@ msgstr "MySpaceIM-Fehler"
 msgid "Invalid input condition"
 msgstr "Ungültige Eingabebedingung"
 
-msgid "Read buffer full (2)"
-msgstr "Lesepuffer voll (2)"
-
-msgid "Unparseable message"
-msgstr "Kann die Nachricht nicht parsen"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Konnte nicht zum Host verbinden: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Kontakt konnte nicht hinzugefügt werden"
 
@@ -5685,6 +5816,16 @@ msgstr "Freunde insgesamt"
 msgid "Client Version"
 msgstr "Client-Version"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Es ist ein Fehler beim Setzten des Benutzernamens aufgetreten. Bitte "
+"versuchen Sie es noch einmal oder besuchen Sie http://editprofile.myspace."
+"com/index.cfm?fuseaction=profile.username um Ihren Benutzernamen zu "
+"bearbeiten."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Benutzername verfügbar"
 
@@ -5902,9 +6043,6 @@ msgstr "Kann Sie nicht selbst hinzufügen"
 msgid "Master archive is misconfigured"
 msgstr "Master-Archiv ist falsch konfiguriert"
 
-msgid "Incorrect username or password"
-msgstr "Ungültiger Benutzername oder Passwort"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 "Konnte den Rechnernamen des Benutzers, den Sie eingegeben haben, nicht "
@@ -5948,8 +6086,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Unbekannter Fehler: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Anmeldung fehlgeschlagen (%s)."
+msgid "Unable to login: %s"
+msgstr "Anmeldung nicht möglich: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6057,9 +6195,6 @@ msgstr "GroupWise-Konferenz %d"
 msgid "Authenticating..."
 msgstr "Authentifizierung..."
 
-msgid "Unable to connect to server."
-msgstr "Verbindung zum Server nicht möglich."
-
 msgid "Waiting for response..."
 msgstr "Warte auf Antwort..."
 
@@ -6083,11 +6218,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Möchten der Konferenz beitreten?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Sie wurden abgemeldet, weil Sie sich an einer anderen Workstation angemeldet "
-"haben."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6096,15 +6226,12 @@ msgstr ""
 "haben, nicht empfangen."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Kann keine Verbindung zum Server herstellen. Bitte geben Sie die Adresse des "
 "Servers ein, mit dem Sie sich verbinden wollen."
 
-msgid "Error. SSL support is not installed."
-msgstr "Fehler. SSL ist nicht installiert."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Diese Konferenz wurde geschlossen. Es können keine Nachrichten mehr gesendet "
@@ -6129,25 +6256,32 @@ msgstr "Server-Adresse"
 msgid "Server port"
 msgstr "Server-Port"
 
+msgid "Received unexpected response from "
+msgstr "Unerwartete Antwort erhalten von "
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Sie haben sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
+"versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
+"noch länger warten."
+
+msgid "Error requesting "
+msgstr "Fehler beim Anfordern von "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL erlaubt Ihnen nicht, sich hier mit Ihrem Benutzernamen anzumelden"
+
 msgid "Could not join chat room"
 msgstr "Konnte Chatraum nicht betreten"
 
 msgid "Invalid chat room name"
 msgstr "Ungültiger Chatraumname"
 
-msgid "Server closed the connection."
-msgstr "Der Server hat die Verbindung beendet."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Verbindung zum Server verloren:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Ungültige Daten in der Verbindung mit dem Server empfangen."
+msgid "Received invalid data on connection with server"
+msgstr "Ungültige Daten in der Verbindung mit dem Server empfangen"
 
 #. *< type
 #. *< ui_requirement
@@ -6195,7 +6329,7 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 "Ungültige Daten in der Verbindung mit dem entfernten Benutzer empfangen."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 "Die Verbindung mit dem entfernten Benutzer konnte nicht hergestellt werden."
 
@@ -6399,20 +6533,12 @@ msgid "Buddy Comment"
 msgstr "Buddy-Kommentar"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Verbindung zum Authentifizierungsserver nicht möglich:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Verbindung zum Authentifizierungsserver nicht möglich: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Verbindung zum BOS-Server nicht möglich\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Verbindung zum BOS-Server nicht möglich: %s"
 
 msgid "Username sent"
 msgstr "Benutzername gesendet"
@@ -6426,54 +6552,61 @@ msgstr "Verbindung herstellen"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Anmeldung fehlgeschlagen: Sie konnten nicht als %s angemeldet werden, da der "
-"Benutzername fehlerhaft ist.  Benutzernamen müssen gültige E-Mail-Adressen "
-"sein oder mit einem Buchstaben beginnen und nur Buchstaben, Ziffern und "
-"Leerzeichen enthalten oder nur aus Ziffern bestehen."
+"Sie konnten nicht als %s angemeldet werden, da der Benutzername fehlerhaft "
+"ist.  Benutzernamen müssen gültige E-Mail-Adressen sein oder mit einem "
+"Buchstaben beginnen und nur Buchstaben, Ziffern und Leerzeichen enthalten "
+"oder nur aus Ziffern bestehen."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Ungültiger Benutzername."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Sie werden eventuell gleich abgemeldet. In diesem Fall, überprüfen Sie %s "
+"auf Updates."
 
-msgid "Incorrect password."
-msgstr "Falsches Passwort."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Konnte keinen gültigen AIM Login-Hash bekommen."
+
+msgid "Unable to get a valid login hash."
+msgstr "Konnte keinen gültigen Login-Hash bekommen."
+
+msgid "Received authorization"
+msgstr "Autorisierung empfangen"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Benutzername existiert nicht"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Ihr Benutzerkonto ist momentan gesperrt."
+msgid "Your account is currently suspended"
+msgstr "Ihr Benutzerkonto ist momentan gesperrt"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Der AOL-Sofortnachrichtendienst ist zur Zeit nicht erreichbar."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Sie haben sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
-"versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
-"noch länger warten."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Die Client-Version, die Sie nutzen ist zu alt. Bitte updaten Sie unter %s"
 
-msgid "Could Not Connect"
-msgstr "Verbinden nicht möglich"
-
-msgid "Received authorization"
-msgstr "Autorisierung empfangen"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Sie haben sich zu schnell an- und abgemeldet. Warten Sie eine Minute und "
+"versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
+"noch länger warten."
 
-msgid "The SecurID key entered is invalid."
-msgstr "Der eingegebene SecurID-Schlüssel ist falsch."
+msgid "The SecurID key entered is invalid"
+msgstr "Der eingegebene SecurID-Schlüssel ist falsch"
 
 msgid "Enter SecurID"
 msgstr "SecurID-Eingabe"
@@ -6481,29 +6614,6 @@ msgstr "SecurID-Eingabe"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Geben Sie die 6-stellige Nummer vom Digital-Display ein."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Sie werden eventuell gleich abgemeldet. In diesem Fall, überprüfen Sie %s "
-"auf Updates."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Konnte keinen gültigen AIM Login-Hash bekommen."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Sie wurden in kurzer Zeit abgemeldet.  Überprüfen Sie %s wegen Updates."
-
-msgid "Unable to get a valid login hash."
-msgstr "Konnte keinen gültigen Login-Hash bekommen."
-
 msgid "Password sent"
 msgstr "Passwort gesendet"
 
@@ -6515,12 +6625,6 @@ msgstr ""
 "Bitte autorisieren Sie mich, sodass ich Sie in meine Buddy-Liste aufnehmen "
 "kann."
 
-msgid "Authorization Request Message:"
-msgstr "Autorisierungsanfrage:"
-
-msgid "Please authorize me!"
-msgstr "Bitte autorisiere mich!"
-
 msgid "No reason given."
 msgstr "Kein Grund angegeben."
 
@@ -6591,7 +6695,7 @@ msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Möchten Sie diesen Buddy zu Ihrer Buddy-Liste hinzufügen?"
 
 msgid "_Add"
-msgstr "_Hinzufügen"
+msgstr "Hinzu_fügen"
 
 msgid "_Decline"
 msgstr "_Ablehnen"
@@ -6652,7 +6756,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s aus unbekannten Gründen nicht erhalten."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kann die Nachricht nicht senden: %s"
@@ -6674,6 +6778,9 @@ msgstr "Online seit"
 msgid "Member Since"
 msgstr "Mitglied seit"
 
+msgid "Capabilities"
+msgstr "Fähigkeiten"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -6862,7 +6969,7 @@ msgstr "Abwesenheitsmitteilungen zu lang."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6871,9 +6978,6 @@ msgstr ""
 "beginnen und nur Buchstaben, Ziffern und Leerzeichen enthalten oder nur aus "
 "Ziffern bestehen."
 
-msgid "Unable to Add"
-msgstr "Kann nicht hinzufügen"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Konnte Buddy-Liste nicht laden"
 
@@ -6890,7 +6994,7 @@ msgstr "Waisen"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Kann den Buddy %s nicht hinzufügen, weil Sie schon zu viele Buddys in Ihrer "
@@ -6900,7 +7004,7 @@ msgid "(no name)"
 msgstr "(kein Name)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Konnte den Buddy %s aus einem unbekannten Grund nicht hinzufügen."
 
 #, c-format
@@ -7035,6 +7139,7 @@ msgstr "_Suchen"
 msgid "Set User Info (web)..."
 msgstr "Benutzer-Info (Web) setzen..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Ändere Passwort (Web)"
 
@@ -7064,6 +7169,9 @@ msgstr "Suche Buddys nach E-Mail-Adresse..."
 msgid "Search for Buddy by Information"
 msgstr "Suche Buddy nach Information"
 
+msgid "Use clientLogin"
+msgstr "clientLogin benutzen"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7253,6 +7361,34 @@ msgstr "Aktualisieren"
 msgid "Could not change buddy information."
 msgstr "Konnte Buddy-Informationen nicht bearbeiten."
 
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Note"
+msgstr "Bemerkung"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Buddy-Notiz"
+
+msgid "Change his/her memo as you like"
+msgstr "Ändern Sie seine/ihre Notiz wie sie möchten"
+
+msgid "_Modify"
+msgstr "_Bearbeiten"
+
+msgid "Memo Modify"
+msgstr "Memo bearbeiten"
+
+msgid "Server says:"
+msgstr "Server meldet:"
+
+msgid "Your request was accepted."
+msgstr "Ihre Anfrage wurde akzeptiert."
+
+msgid "Your request was rejected."
+msgstr "Ihre Anfrage wurde abgelehnt."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u erfordert Autorisierung"
@@ -7566,6 +7702,9 @@ msgstr "<p><b>Bestätigung</b>:<br>\n"
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>Gewissenhafte Tester</b>:<br>\n"
 
+msgid "and more, please let me know... thank you!))"
+msgstr "und andere, bitten sagen Sie mir Bescheid... Danke!))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Und all die Jungs im Hinterzimmer...</i><br>\n"
 
@@ -7640,7 +7779,7 @@ msgstr "Intervall zum Aufrechterhalten der Verbindung (Sekunden)"
 msgid "Update interval (seconds)"
 msgstr "Aktualisierungsintervall (Sekunden)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Kann die Antwort des Servers nicht entschlüsseln"
 
 #, c-format
@@ -7665,9 +7804,6 @@ msgstr "Aktivierung erforderlich"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Unbekannte Antwort bei der Anmeldung (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Konnte die Antwort des Servers nicht entschlüsseln"
-
 msgid "Requesting captcha"
 msgstr "Captcha anfordern"
 
@@ -7701,30 +7837,17 @@ msgstr ""
 "Unbekannte Antwort bei der Anmeldung (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Verbindung nicht möglich."
-
 msgid "Socket error"
 msgstr "Socket-Fehler"
 
-msgid "Unable to read from socket"
-msgstr "Socket kann nicht gelesen werden"
-
-msgid "Write Error"
-msgstr "Schreibfehler"
-
-msgid "Connection lost"
-msgstr "Verbindung verloren"
-
 msgid "Getting server"
 msgstr "Hole server"
 
 msgid "Requesting token"
 msgstr "Fordere Token an"
 
-msgid "Couldn't resolve host"
-msgstr "Kann den Hostnamen nicht auflösen"
+msgid "Unable to resolve hostname"
+msgstr "Hostname konnte nicht aufgelöst werden"
 
 msgid "Invalid server or port"
 msgstr "Ungültiger Server oder Port"
@@ -7777,7 +7900,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ-Qun-Kommando"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Konnte die Antwort der Anmeldung nicht entschlüsseln"
 
 msgid "Unknown LOGIN CMD"
@@ -7797,9 +7920,6 @@ msgstr "Dateiübertragung"
 msgid "%d canceled the transfer of %s"
 msgstr "%d hat die Übertragung von %s abgebrochen"
 
-msgid "Connection closed (writing)"
-msgstr "Verbindung geschlossen (schreibend)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppentitel:</b> %s<br>"
@@ -7854,17 +7974,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-Administrator-Ankündigung"
 
-msgid "Connection reset"
-msgstr "Verbindung zurückgesetzt"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Fehler beim Lesen des Socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Verbindung zum Server nicht möglich"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ankündigung von %s"
@@ -7887,6 +7996,9 @@ msgstr "Lautsprecher"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Dateiübertragung"
+
 msgid "Supports"
 msgstr "Unterstützt"
 
@@ -8613,9 +8725,6 @@ msgstr "Organisation"
 msgid "Unit"
 msgstr "Abteilung"
 
-msgid "Note"
-msgstr "Bemerkung"
-
 msgid "Join Chat"
 msgstr "Chat betreten"
 
@@ -8715,6 +8824,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Netzwerkstatistik"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping fehlgeschlagen"
 
@@ -8781,7 +8893,7 @@ msgstr "Nicht-unterstützter Typ für den öffentlichen Schlüssel"
 msgid "Disconnected by server"
 msgstr "Abgemeldet vom Server"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Fehler beim Verbinden mit dem SILC-Server"
 
 msgid "Key Exchange failed"
@@ -8793,17 +8905,11 @@ msgstr ""
 "Das Fortsetzen der angehaltenen Sitzung ist fehlgeschlagen. Bitte drücken "
 "Sie „Neu Verbinden“, um eine neue Verbindung zu erzeugen."
 
-msgid "Connection failed"
-msgstr "Verbindung fehlgeschlagen"
-
 msgid "Performing key exchange"
 msgstr "Schlüsselaustausch"
 
-msgid "Unable to create connection"
-msgstr "Kann Verbindung nicht erstellen"
-
-msgid "Could not load SILC key pair"
-msgstr "Konnte SILC-Schlüsselpaar nicht laden"
+msgid "Unable to load SILC key pair"
+msgstr "SILC-Schlüsselpaar konnte nicht geladen werden"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -8812,8 +8918,8 @@ msgstr "Verbinde mit SILC-Server"
 msgid "Out of memory"
 msgstr "Kein Speicher verfügbar"
 
-msgid "Cannot initialize SILC protocol"
-msgstr "Kann das SILC-Protokoll nicht initialisieren"
+msgid "Unable to initialize SILC protocol"
+msgstr "SILC-Protokoll konnte nicht initialisiert werden"
 
 msgid "Error loading SILC key pair"
 msgstr "Fehler beim Laden des SILC-Schlüsselpaares"
@@ -9112,8 +9218,8 @@ msgstr "Alle IM-Nachrichten digital unterschreiben und überprüfen"
 msgid "Creating SILC key pair..."
 msgstr "Erstelle SILC-Schlüsselpaar..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Kann SILC-Schlüsselpaar nicht erstellen\n"
+msgid "Unable to create SILC key pair"
+msgstr "SILC-Schlüsselpaar konnte nicht erstellt werden"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9210,6 +9316,9 @@ msgstr "Whiteboard"
 msgid "No server statistics available"
 msgstr "Keine Serverstatistik verfügbar"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Fehler beim Verbinden mit dem SILC-Server"
+
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fehler: Unterschiedliche Version, aktualisieren Sie Ihren Client"
 
@@ -9244,30 +9353,24 @@ msgstr "Fehler: Ungültiger Cookie"
 msgid "Failure: Authentication failed"
 msgstr "Fehler: Authentifizierung fehlgeschlagen"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "Konnte die SILC-Client-Verbindung nicht herstellen"
+msgid "Unable to initialize SILC Client connection"
+msgstr "SILC-Client-Verbindung konnte nicht hergestellt werden"
 
 msgid "John Noname"
 msgstr "Max Mustermann"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Konnte SILC-Schlüsselpaar nicht laden: %s"
-
-msgid "Could not write"
-msgstr "Konnte nicht schreiben"
+msgid "Unable to load SILC key pair: %s"
+msgstr "SILC-Schlüsselpaar konnte nicht geladen werden: %s"
 
-msgid "Could not connect"
-msgstr "Verbinden nicht möglich"
-
-msgid "Unknown server response."
-msgstr "Unbekannte Serverantwort."
+msgid "Unable to create connection"
+msgstr "Kann Verbindung nicht erstellen"
 
-msgid "Could not create listen socket"
-msgstr "Kann Listen-Socket nicht erstellen"
+msgid "Unknown server response"
+msgstr "Unbekannte Serverantwort"
 
-msgid "Could not resolve hostname"
-msgstr "Konnte den Hostnamen nicht auflösen"
+msgid "Unable to create listen socket"
+msgstr "Lauschender Socket konnte nicht erstellt werden"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-Benutzernamen dürfen keine Leerzeichen oder @-Symbole enthalten"
@@ -9308,170 +9411,60 @@ msgstr "Auth-Benutzer"
 msgid "Auth Domain"
 msgstr "Auth-Domain"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Suche nach %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Verbindung mit %s fehlgeschlagen"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Anmeldung: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Datei %s konnte nicht geschrieben werden."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Datei %s konnte nicht gelesen werden."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Nachricht zu lange, letzten %s Bytes abgeschnitten."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s ist zur Zeit nicht online."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Verwarnung von %s nicht erlaubt."
-
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Eine Nachricht ging verloren. Sie überschreiten die Geschwindigkeitsgrenze "
-"des Servers."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat in %s ist nicht verfügbar."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Sie verschicken die Nachrichten an %s zu schnell."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu groß war."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Eine Nachricht von %s hat Sie nicht erreicht, da sie zu schnell gesendet "
-"wurde."
-
-msgid "Failure."
-msgstr "Fehler."
-
-msgid "Too many matches."
-msgstr "Zu viele Übereinstimmungen."
-
-msgid "Need more qualifiers."
-msgstr "Benötige mehr Angaben."
-
-msgid "Dir service temporarily unavailable."
-msgstr "Verzeichnis-Dienst ist zur Zeit nicht verfügbar."
-
-msgid "Email lookup restricted."
-msgstr "E-Mail-Suche eingeschränkt."
-
-msgid "Keyword ignored."
-msgstr "Stichwort ignoriert."
-
-msgid "No keywords."
-msgstr "Keine Stichwörter."
-
-msgid "User has no directory information."
-msgstr "Der Benutzer hat kein Profil."
-
-msgid "Country not supported."
-msgstr "Land nicht unterstützt."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Unbekannter Fehler: %s."
-
-msgid "Incorrect username or password."
-msgstr "Ungültiger Benutzername oder Passwort."
-
-msgid "The service is temporarily unavailable."
-msgstr "Der Dienst ist zur Zeit nicht verfügbar."
-
-msgid "Your warning level is currently too high to log in."
-msgstr "Ihre Warnstufe ist zur Zeit zu hoch, um sich anzumelden."
-
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"Sie haben Sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
-"versuchen Sie es erneut. Wenn Sie es weiter versuchen, werden sie noch "
-"länger warten müssen."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Unbekannter Anmeldungsfehler: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Unbekannter Fehler '%d' aufgetreten. Info: %s"
-
-msgid "Invalid Groupname"
-msgstr "Ungültiger Gruppenname"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;Raum&gt;:  Einen Chatraum im Yahoo-Netzwerk betreten"
 
-msgid "Connection Closed"
-msgstr "Verbindung geschlossen"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Liste Räume im Yahoo-Netzwerk auf"
 
-msgid "Waiting for reply..."
-msgstr "Warte auf Antwort..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Einen Benutzer auffordern, eine Mal-Sitzung zu starten"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"TOC ist von seiner Pause zurückgekehrt. Sie können wieder Nachrichten senden."
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID..."
 
-msgid "Password Change Successful"
-msgstr "Passwortänderung erfolgreich"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo!-Protokoll-Plugin"
 
-msgid "_Group:"
-msgstr "_Gruppe:"
+msgid "Pager server"
+msgstr "Pager-Server"
 
-msgid "Get Dir Info"
-msgstr "Verzeichnisinformation abrufen"
+msgid "Pager port"
+msgstr "Pager-Port"
 
-msgid "Set Dir Info"
-msgstr "Verzeichnisinformation abrufen"
+msgid "File transfer server"
+msgstr "Server für Dateiübertragungen"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Kann %s nicht zum Schreiben öffnen!"
+msgid "File transfer port"
+msgstr "Port für Dateiübertragungen"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Dateiübertragung gescheitert; die andere Seite hat die Dateiübertragung "
-"wahrscheinlich abgebrochen."
+msgid "Chat room locale"
+msgstr "Chatraum-Gebiet"
 
-msgid "Could not connect for transfer."
-msgstr "Übertragungsverbindung konnte nicht hergestellt werden."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Konferenz- und Chateinladungen ignorieren"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-"Konnte keinen Datei-Header schreiben. Die Datei wurde nicht übermittelt."
+msgid "Chat room list URL"
+msgstr "Chatraumliste (URL)"
 
-msgid "Save As..."
-msgstr "Speichern unter..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo-Chat-Server"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s bittet %s %d Datei zu akzeptieren: %s (%.2f %s)%s%s"
-msgstr[1] "%s bittet %s %d Dateien zu akzeptieren: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo-Chat-Port"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s bittet Sie eine Datei zu senden"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo-JAPAN-ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9483,13 +9476,11 @@ msgstr "%s bittet Sie eine Datei zu senden"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC-Protokoll-Plugin"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo!-Japan-Protokoll-Plugin"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s hat Ihnen eine Webcam-Einladung gesendet, die noch nicht unterstützt wird."
+msgid "Your SMS was not delivered"
+msgstr "Ihre SMS wurde nicht ausgeliefert"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ihre Yahoo!-Nachricht wurde nicht verschickt."
@@ -9515,6 +9506,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Hinzufügen des Buddys zurückgewiesen"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Ungültige Daten empfangen"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Konto gesperrt: Zu viele fehlgeschlagene Login-Versuche. Eventuell können "
+"Sie dies beheben, wenn Sie sich auf der Yahoo!-Webseite anmelden."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Konto gesperrt: Unbekannter Grund. Eventuell können Sie dies beheben, wenn "
+"Sie sich auf der Yahoo!-Webseite anmelden."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Benutzername oder Passwort fehlt"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9550,39 +9565,28 @@ msgstr ""
 "sich auf der Yahoo! Webseite anmelden."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Konnte den Buddy %s der Gruppe %s nicht zur Serverliste des Kontos %s "
-"hinzufügen."
+"Buddy %s konnte der Gruppe %s der Serverliste des Kontos %s nicht "
+"hinzugefügt werden."
 
-msgid "Could not add buddy to server list"
-msgstr "Konnte den Buddy nicht zur Serverliste hinzufügen"
+msgid "Unable to add buddy to server list"
+msgstr "Buddy konnte der Serverliste nicht hinzugefügt werden"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hörbar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Ungültige HTTP-Antwort vom Server empfangen."
-
-msgid "Connection problem"
-msgstr "Verbindungsfehler"
+msgid "Received unexpected HTTP response from server"
+msgstr "Ungültige HTTP-Antwort vom Server empfangen"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Verbindung zu %s verloren:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Verbindung zu %s verloren: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Die Verbindung mit %s konnte nicht hergestellt werden:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Die Verbindung mit %s konnte nicht hergestellt werden: %s"
 
 msgid "Not at Home"
 msgstr "Nicht zu Hause"
@@ -9629,8 +9633,8 @@ msgstr "Anwesenheitseinstellungen"
 msgid "Start Doodling"
 msgstr "Anfangen zu malen"
 
-msgid "Activate which ID?"
-msgstr "Welche ID aktivieren?"
+msgid "Select the ID you want to activate"
+msgstr "Wählen Sie die ID die Sie aktivieren möchten"
 
 msgid "Join whom in chat?"
 msgstr "Wen wollen Sie zum Chat einladen?"
@@ -9644,73 +9648,15 @@ msgstr "Einen Benutzer zum Chat einladen..."
 msgid "Open Inbox"
 msgstr "Öffne Posteingang"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;Raum&gt;:  Einen Chatraum im Yahoo-Netzwerk betreten"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Liste Räume im Yahoo-Netzwerk auf"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Einen Benutzer auffordern, eine Mal-Sitzung zu starten"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-Protokoll-Plugin"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Pager-Server"
-
-msgid "Japan Pager server"
-msgstr "Pager-Server (Japan)"
-
-msgid "Pager port"
-msgstr "Pager-Port"
-
-msgid "File transfer server"
-msgstr "Server für Dateiübertragungen"
-
-msgid "Japan file transfer server"
-msgstr "Server für Dateiübertragungen (Japan)"
-
-msgid "File transfer port"
-msgstr "Port für Dateiübertragungen"
-
-msgid "Chat room locale"
-msgstr "Chatraum-Gebiet"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Konferenz- und Chateinladungen ignorieren"
-
-msgid "Chat room list URL"
-msgstr "Chatraumliste (URL)"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo-Chat-Server"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo-Chat-Port"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Doodle-Anfrage senden."
 
+msgid "Unable to connect."
+msgstr "Verbindung nicht möglich."
+
 msgid "Unable to establish file descriptor."
 msgstr "Konnte Dateibeschreibung nicht erstellen."
 
@@ -9718,6 +9664,9 @@ msgstr "Konnte Dateibeschreibung nicht erstellen."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s versucht, Ihnen eine Gruppe von %d Dateien zu senden.\n"
 
+msgid "Write Error"
+msgstr "Schreibfehler"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo!-Japan-Profil"
 
@@ -9789,11 +9738,8 @@ msgid "The user's profile is empty."
 msgstr "Das Profil des Benutzers ist leer."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s lehnte Ihre Konferenzeinladung in den Raum „%s“ ab, da „%s“."
-
-msgid "Invitation Rejected"
-msgstr "Einladung zurückgewiesen"
+msgid "%s has declined to join."
+msgstr "%s hat abgelehnt beizutreten."
 
 msgid "Failed to join chat"
 msgstr "Der Chat kann nicht betreten werden"
@@ -9836,22 +9782,17 @@ msgstr "Stimmen"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Verbindungsfehler"
+
 msgid "Unable to fetch room list."
 msgstr "Kamm die Raumliste nicht abrufen."
 
 msgid "User Rooms"
 msgstr "Benutzerräume"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Verbindungsproblem mit dem YCHT-Server."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Verbindung zum Server verloren\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Verbindungsproblem mit dem YCHT-Server"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9986,33 +9927,22 @@ msgid "Exposure"
 msgstr "Aussetzen"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Kann Socket nicht erstellen:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Kann Antwort vom HTTP-Proxy nicht verarbeiten: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Kann Antwort vom HTTP-Proxy nicht verarbeiten: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-Proxy-Verbindungsfehler %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
-"Zugriff verboten: Der HTTP-Proxy-Server verbietet das Tunneling über Port %d."
+"Zugriff verboten: Der HTTP-Proxy-Server verbietet das Tunneling über Port %d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fehler beim Auflösen von %s"
 
-msgid "Could not resolve host name"
-msgstr "Kann den Hostnamen nicht auflösen"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Bitte um %ss Aufmerksamkeit..."
@@ -10099,9 +10029,6 @@ msgstr "Nicht stören"
 msgid "Extended away"
 msgstr "Abwesend (erweitert)"
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Listening to music"
 msgstr "Musik hören"
 
@@ -10143,18 +10070,6 @@ msgstr "+++ %s wurde tätig"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Fehler beim Lesen von %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Beim Einlesen Ihrer %s trat ein Fehler auf.  Die Liste wurde nicht geladen "
-"und die alte Datei wurde in %s~ umbenannt."
-
 msgid "Calculating..."
 msgstr "Berechne..."
 
@@ -10259,6 +10174,18 @@ msgstr "Verbindung abgelehnt."
 msgid "Address already in use."
 msgstr "Adresse wird bereits benutzt."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Fehler beim Lesen von %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Beim Einlesen Ihrer %s trat ein Fehler auf.  Die Datei wurde nicht geladen "
+"und die alte Datei wurde in %s~ umbenannt."
+
 msgid "Internet Messenger"
 msgstr "Internet-Sofortnachrichtendienst"
 
@@ -10301,10 +10228,8 @@ msgstr "Benachrichtigung über neue _Mails"
 msgid "Use this buddy _icon for this account:"
 msgstr "Dieses Buddy-_Icon für dieses Konto benutzen:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Einstellungen"
+msgid "Ad_vanced"
+msgstr "Erwei_tert"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Benutze GNOME-Proxy-Einstellungen"
@@ -10339,9 +10264,6 @@ msgstr "Wenn Sie genau hinschauen"
 msgid "you can see the butterflies mating"
 msgstr "Sie können den Schmetterlingen beim Paaren zusehen"
 
-msgid "Proxy Options"
-msgstr "Proxy-Optionen"
-
 msgid "Proxy _type:"
 msgstr "Proxy-_Typ:"
 
@@ -10369,8 +10291,8 @@ msgstr "_Einfach"
 msgid "Create _this new account on the server"
 msgstr "Dieses _neue Konto auf dem Server anlegen"
 
-msgid "_Advanced"
-msgstr "_Erweitert"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 # Aktiv
 msgid "Enabled"
@@ -10424,8 +10346,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Bitte aktualisieren Sie die erforderlichen Felder."
 
-msgid "Room _List"
-msgstr "Ra_umliste"
+msgid "A_ccount"
+msgstr "K_onto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10434,8 +10356,8 @@ msgstr ""
 "Bitte geben Sie geeignete Informationen über den Chat ein, den Sie betreten "
 "wollen.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Ra_umliste"
 
 msgid "_Block"
 msgstr "_Sperren"
@@ -10452,6 +10374,15 @@ msgstr "_Info abrufen"
 msgid "I_M"
 msgstr "I_M"
 
+msgid "_Audio Call"
+msgstr "_Audio-Anruf"
+
+msgid "Audio/_Video Call"
+msgstr "Audio/_Video-Anruf"
+
+msgid "_Video Call"
+msgstr "_Video-Anruf"
+
 msgid "_Send File..."
 msgstr "_Datei versenden..."
 
@@ -10461,9 +10392,12 @@ msgstr "_Buddy-Alarm hinzufügen..."
 msgid "View _Log"
 msgstr "Mi_tschnitt anzeigen"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Verstecken, wenn im Offline-Modus"
 
+msgid "Show When Offline"
+msgstr "Anzeigen, wenn im Offline-Modus"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -10545,7 +10479,7 @@ msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Buddys/Anzeigen/_Offline-Buddys"
 
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Buddys/Anzeigen/_leere Gruppen"
+msgstr "/Buddys/Anzeigen/_Leere Gruppen"
 
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Buddys/Anzeigen/Buddy-_Details"
@@ -10588,6 +10522,9 @@ msgstr "/Werkzeuge/Buddy-_Alarm"
 msgid "/Tools/_Certificates"
 msgstr "/Werkzeuge/_Zertifikate"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Werkzeuge/Benutzerdefinierte Smile_ys"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Werkzeuge/Plu_gins"
 
@@ -10597,9 +10534,6 @@ msgstr "/Werkzeuge/_Einstellungen"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Werkzeuge/Pri_vatsphäre"
 
-msgid "/Tools/Smile_y"
-msgstr "/Werkzeuge/Smile_y"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Werkzeuge/_Dateiübertragungen"
 
@@ -10717,8 +10651,8 @@ msgstr "Manuell"
 msgid "By status"
 msgstr "Nach Status"
 
-msgid "By log size"
-msgstr "Nach Größe der Logs"
+msgid "By recent log activity"
+msgstr "Nach letzter Mitschnitts-Aktivität"
 
 #, c-format
 msgid "%s disconnected"
@@ -10734,6 +10668,9 @@ msgstr "Wiederverbinden"
 msgid "Re-enable"
 msgstr "Reaktivieren"
 
+msgid "SSL FAQs"
+msgstr "SSL-FAQs"
+
 msgid "Welcome back!"
 msgstr "Willkommen zurück!"
 
@@ -10783,7 +10720,7 @@ msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Buddys/Anzeigen/Offline-Buddys"
 
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Buddys/Anzeigen/leere Gruppen"
+msgstr "/Buddys/Anzeigen/Leere Gruppen"
 
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Buddys/Anzeigen/Buddy-Details"
@@ -10824,6 +10761,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Gruppe:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Automatisch _beitreten, wenn das Konto online geht."
 
@@ -10857,6 +10797,103 @@ msgstr "/Werkzeuge"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddys/Buddys sortieren"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Hintergrundfarbe"
+
+msgid "The background color for the buddy list"
+msgstr "Die Hintergrundfarbe für die Buddy-Liste"
+
+msgid "Layout"
+msgstr "Layout"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Das Layout von Icons, Namen und Status der Kontaktliste"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Hintergrundfarbe (ausgeklappt)"
+
+msgid "The background color of an expanded group"
+msgstr "Die Hintergrundfarbe für eine ausgeklappte Gruppe"
+
+msgid "Expanded Text"
+msgstr "Text (ausgeklappt)"
+
+msgid "The text information for when a group is expanded"
+msgstr "Die Textinformation für eine ausgeklappte Gruppe"
+
+msgid "Collapsed Background Color"
+msgstr "Hintergrundfarbe (zusammengeklappt)"
+
+msgid "The background color of a collapsed group"
+msgstr "Die Hintergrundfarbe für eine zusammengeklappte Gruppe"
+
+msgid "Collapsed Text"
+msgstr "Text (zusammengeklappt)"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Die Textinformation für eine zusammengeklappte Gruppe"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Hintergrundfarbe für Kontakt/Chat"
+
+msgid "The background color of a contact or chat"
+msgstr "Die Hintergrundfarbe für einen Kontakt oder Chat"
+
+msgid "Contact Text"
+msgstr "Text für Kontakt"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Die Textinformation für einen ausgeklappten Kontakt"
+
+msgid "On-line Text"
+msgstr "Online-Text"
+
+msgid "The text information for when a buddy is online"
+msgstr "Die Textinformation für einen Online-Buddy"
+
+msgid "Away Text"
+msgstr "Abwesenheitstext"
+
+msgid "The text information for when a buddy is away"
+msgstr "Die Textinformation für einen abwesenden Buddy"
+
+msgid "Off-line Text"
+msgstr "Offline-Text"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Die Textinformation für einen Offline-Buddy"
+
+msgid "Idle Text"
+msgstr "Untätigkeitstext"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Die Textinformation für einen untätigen Buddy"
+
+msgid "Message Text"
+msgstr "Nachrichtentext"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Die Textinformation für einen Buddy mit ungelesenen Nachrichten"
+
+msgid "Message (Nick Said) Text"
+msgstr "Nachrichtentext (mit enthaltenem Spitznamen)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"Die Textinformation für einen Chat mit einer ungelesenen Nachricht, in der "
+"Ihr Nickname vorkommt"
+
+msgid "The text information for a buddy's status"
+msgstr "Die Textinformation für den Status eines Buddys"
+
+msgid "Type the host name for this certificate."
+msgstr "Geben Sie einen Hostnamen für dieses Zertifikat an."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-Server"
@@ -10876,14 +10913,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Buddy in einen Chatraum einladen"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen möchten "
-"zusammen mit einer optionalen Einladungsnachricht."
-
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
@@ -10912,7 +10941,7 @@ msgstr "Ignorieren"
 msgid "Get Away Message"
 msgstr "Neue Abwesenheitsnachricht abholen"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Zuletzt gesagt"
 
 msgid "Unable to save icon file to disk."
@@ -10958,6 +10987,18 @@ msgstr "/Unterhaltung/S_peichern als..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Unterhaltung/_Leeren"
 
+msgid "/Conversation/M_edia"
+msgstr "/Unterhaltung/M_edien"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Unterhaltung/Medien/_Audio-Anruf"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Unterhaltung/Medien/_Video-Anruf"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Unterhaltung/Medien/A_udio-\\/Video-Anruf"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Unterhaltung/Datei _senden..."
 
@@ -11030,6 +11071,15 @@ msgstr "/Unterhaltung"
 msgid "/Conversation/View Log"
 msgstr "/Unterhaltung/Betrachte Mitschnitt"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Unterhaltung/Medien/Audio-Anruf"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Unterhaltung/Medien/Video-Anruf"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Unterhaltung/Medien/Audio-\\/Video-Anruf"
+
 msgid "/Conversation/Send File..."
 msgstr "/Unterhaltung/Datei senden ..."
 
@@ -11213,6 +11263,9 @@ msgstr "Künstler"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "Sprach- und Videoübertragung"
+
 msgid "support"
 msgstr "Support"
 
@@ -11337,6 +11390,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Ungarisch"
 
+msgid "Armenian"
+msgstr "Armenisch"
+
 msgid "Indonesian"
 msgstr "Indonesisch"
 
@@ -11352,6 +11408,9 @@ msgstr "Georgisch"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu-Georgisch-Übersetzer"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11430,6 +11489,9 @@ msgstr "Singhalesisch"
 msgid "Swedish"
 msgstr "Schwedisch"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 msgid "Tamil"
 msgstr "Tamilisch"
 
@@ -11536,7 +11598,7 @@ msgid "_Name"
 msgstr "_Name"
 
 msgid "_Account"
-msgstr "_Konto"
+msgstr "K_onto"
 
 msgid "Get User Info"
 msgstr "Benutzer-Info abrufen"
@@ -11736,14 +11798,6 @@ msgstr "_Entferne komplette Übertragungen"
 msgid "File transfer _details"
 msgstr "Dateiübertragungs-_Details"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Pause"
-
-#. Resume button
-msgid "_Resume"
-msgstr "Fo_rtsetzen"
-
 msgid "Paste as Plain _Text"
 msgstr "Einfügen als normaler _Text"
 
@@ -11762,7 +11816,7 @@ msgstr "Farbe zum Darstellen von Hyperlinks."
 msgid "Hyperlink visited color"
 msgstr "Farbe für besuchte Hyperlinks"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Farbe zum Darstellen von Hyperlinks, wenn sie besucht (oder aktiviert) "
 "wurden."
@@ -11805,13 +11859,22 @@ msgstr "Farbe, mit der der Name in einer Aktions-Nachricht dargestellt wird."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Farbe des Absendernamens für geflüsterte Aktions-Nachrichten"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+"Farbe, mit der der Name in einer geflüsterten Aktions-Nachricht dargestellt "
+"wird."
+
 msgid "Whisper Message Name Color"
 msgstr "Farbe des Absendernamens für Flüster-Nachrichten"
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+"Farbe, mit der der Name in einer geflüsterten Nachricht dargestellt wird."
+
 msgid "Typing notification color"
 msgstr "Farbe der Tipp-Benachrichtigung"
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 "Die Farbe, die für die Tipp-Benachrichtigungsmeldung benutzt werden soll"
 
@@ -11825,15 +11888,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Tipp-Benachrichtigung aktivieren"
 
-msgid "_Copy Email Address"
-msgstr "Kopiere _E-Mail-Adresse"
-
-msgid "_Open Link in Browser"
-msgstr "Ö_ffne Link im Browser"
-
-msgid "_Copy Link Location"
-msgstr "_Kopiere den Link"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11967,9 +12021,6 @@ msgstr "Schrift verkleinern"
 msgid "Font Face"
 msgstr "Schriftart"
 
-msgid "Background Color"
-msgstr "Hintergrundfarbe"
-
 msgid "Foreground Color"
 msgstr "Vordergrundfarbe"
 
@@ -12086,6 +12137,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12100,6 +12152,7 @@ msgstr ""
 "\n"
 "  -c, --config=VERZ   benutze VERZ als Konfigurationsverzeichnis\n"
 "  -d, --debug         gibt Debugging-Meldungen nach stdout aus\n"
+"  -f, --force-online  online erzwingen, ungeachtet des Netzwerk-Status\n"
 "  -h, --help          zeigt diese Hilfe und beendet das Programm\n"
 "  -m, --multiple      mehrere Instanzen erlauben\n"
 "  -n, --nologin       nicht automatisch anmelden\n"
@@ -12117,6 +12170,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12130,6 +12184,7 @@ msgstr ""
 "\n"
 "  -c, --config=VERZ   benutze VERZ als Konfigurationsverzeichnis\n"
 "  -d, --debug         gibt Debugging-Meldungen nach stdout aus\n"
+"  -f, --force-online  online erzwingen, ungeachtet des Netzwerkstatus\n"
 "  -h, --help          zeigt diese Hilfe und beendet das Programm\n"
 "  -m, --multiple      mehrere Instanzen erlauben\n"
 "  -n, --nologin       nicht automatisch anmelden\n"
@@ -12176,11 +12231,28 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Wird geschlossen, da bereits ein anderer libpurple-Client läuft\n"
 
-msgid "Open All Messages"
-msgstr "Alle Nachrichten öffnen"
+msgid "/_Media"
+msgstr "/_Medien"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Sie haben Post!</span>"
+msgid "/Media/_Hangup"
+msgstr "/Medien/_Auflegen"
+
+msgid "Calling..."
+msgstr "Anrufen..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s möchte eine Audio-/Video-Sitzung mit Ihnen starten."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s möchte eine Video-Sitzung mit Ihnen starten."
+
+msgid "Incoming Call"
+msgstr "Eingehender Anruf"
+
+msgid "_Pause"
+msgstr "_Pause"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12210,6 +12282,24 @@ msgid ""
 msgstr ""
 "Das benutzerdefinierte Browserkommando wurde ausgewählt, aber nicht gesetzt."
 
+msgid "No message"
+msgstr "Keine Nachricht"
+
+msgid "Open All Messages"
+msgstr "Alle Nachrichten öffnen"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Sie haben Post!</span>"
+
+msgid "New Pounces"
+msgstr "Neuer Alarm"
+
+msgid "Dismiss"
+msgstr "Verwerfen"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Sie haben geklopft!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Die folgenden Plugins werden entladen."
 
@@ -12258,21 +12348,27 @@ msgstr "<b>Plugin-Details</b>"
 msgid "Select a file"
 msgstr "Wählen Sie eine Datei"
 
+msgid "Modify Buddy Pounce"
+msgstr "Buddy-Alarm bearbeiten"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Bei wem alarmieren"
 
+msgid "_Account:"
+msgstr "K_onto:"
+
 msgid "_Buddy name:"
-msgstr "_Buddy-Name:"
+msgstr "Budd_y-Name:"
 
 msgid "Si_gns on"
-msgstr "_sich anmeldet"
+msgstr "si_ch anmeldet"
 
 msgid "Signs o_ff"
 msgstr "sich abmel_det"
 
 msgid "Goes a_way"
-msgstr "_hinausgeht"
+msgstr "hinausgeh_t"
 
 msgid "Ret_urns from away"
 msgstr "wi_eder anwesend ist"
@@ -12281,22 +12377,22 @@ msgid "Becomes _idle"
 msgstr "_untätig wird"
 
 msgid "Is no longer i_dle"
-msgstr "nicht meh_r untätig ist"
+msgstr "nicht _mehr untätig ist"
 
 msgid "Starts _typing"
-msgstr "zu _tippen beginnt"
+msgstr "zu tippen _beginnt"
 
 msgid "P_auses while typing"
-msgstr "beim Tippen an_hält"
+msgstr "beim Tippen anh_ält"
 
 msgid "Stops t_yping"
 msgstr "aufhört _zu tippen"
 
 msgid "Sends a _message"
-msgstr "eine _Nachricht sendet"
+msgstr "eine Nachr_icht sendet"
 
 msgid "Ope_n an IM window"
-msgstr "Gesprächsfenster ö_ffnen"
+msgstr "_Gesprächsfenster öffnen"
 
 msgid "_Pop up a notification"
 msgstr "_Popup-Benachrichtigung"
@@ -12305,22 +12401,22 @@ msgid "Send a _message"
 msgstr "_Nachricht senden"
 
 msgid "E_xecute a command"
-msgstr "Befeh_l ausführen"
+msgstr "Befehl ausfüh_ren"
 
 msgid "P_lay a sound"
-msgstr "einen _Klang abspielen"
+msgstr "Einen _Klang abspielen"
 
 msgid "Brows_e..."
-msgstr "Aus_wählen..."
+msgstr "Au_swählen..."
 
 msgid "Br_owse..."
-msgstr "Aus_wählen..."
+msgstr "Auswäh_len..."
 
 msgid "Pre_view"
 msgstr "_Vorschau"
 
 msgid "P_ounce only when my status is not Available"
-msgstr "Nur _alarmieren, wenn ich nicht verfügbar bin"
+msgstr "Nur alarmieren, wenn ich nicht ver_fügbar bin"
 
 msgid "_Recurring"
 msgstr "_Wiederkehrend"
@@ -12328,8 +12424,47 @@ msgstr "_Wiederkehrend"
 msgid "Pounce Target"
 msgstr "Alarm-Ziel"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Smiley-Thema konnte nicht entpackt werden."
+msgid "Started typing"
+msgstr "Beginnt zu tippen"
+
+msgid "Paused while typing"
+msgstr "Hat beim Tippen angehalten"
+
+msgid "Signed on"
+msgstr "Hat sich anmeldet"
+
+msgid "Returned from being idle"
+msgstr "Ist nicht mehr inaktiv"
+
+msgid "Returned from being away"
+msgstr "Ist wieder anwesend"
+
+msgid "Stopped typing"
+msgstr "Hat das Tippen gestoppt"
+
+msgid "Signed off"
+msgstr "Hat sich abmeldet"
+
+msgid "Became idle"
+msgstr "Wurde untätig"
+
+msgid "Went away"
+msgstr "Ging hinaus"
+
+msgid "Sent a message"
+msgstr "Eine Nachricht senden"
+
+msgid "Unknown.... Please report this!"
+msgstr "Unbekannt.... Bitte berichten Sie dieses Problem!"
+
+msgid "Theme failed to unpack."
+msgstr "Thema konnte nicht entpackt werden."
+
+msgid "Theme failed to load."
+msgstr "Thema konnte nicht geladen werden."
+
+msgid "Theme failed to copy."
+msgstr "Thema konnte nicht kopiert werden."
 
 msgid "Install Theme"
 msgstr "Thema installieren"
@@ -12350,6 +12485,11 @@ msgstr "Tastaturkürzel"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Schließe Gespräche mit der Escape-Taste"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Buddy-Listen-Thema"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Kontrollleisten-Icon"
 
@@ -12359,8 +12499,8 @@ msgstr "Kontrollleisten-Icon _anzeigen:"
 msgid "On unread messages"
 msgstr "Bei ungelesenen Nachrichten"
 
-msgid "Conversation Window Hiding"
-msgstr "Gesprächsfenster verstecken"
+msgid "Conversation Window"
+msgstr "Gesprächsfenster"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Neue IM-Gespräche verstecken:"
@@ -12368,6 +12508,9 @@ msgstr "_Neue IM-Gespräche verstecken:"
 msgid "When away"
 msgstr "Bei Abwesenheit"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Neue Gesprächsfenster mi_nimieren"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Reiter"
@@ -12426,9 +12569,6 @@ msgstr "Weiches Scrollen aktivieren"
 msgid "F_lash window when IMs are received"
 msgstr "Fenster b_linkt, wenn IM-Nachrichten empfangen werden"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Neue Gesprächsfenster mi_nimieren"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimale Höhe des Eingabefeldes in Zeilen:"
 
@@ -12460,14 +12600,12 @@ msgstr "Kann das Proxy-Konfigurationsprogramm nicht starten."
 msgid "Cannot start browser configuration program."
 msgstr "Kann das Browser-Konfigurationsprogramm nicht starten."
 
-msgid "ST_UN server:"
-msgstr "ST_UN Server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Beispiel: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "IP-Adresse _automatisch erkennen"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Benutze _automatisch erkannte IP-Adresse: %s"
 
 msgid "Public _IP:"
 msgstr "Öffentliche _IP:"
@@ -12487,6 +12625,10 @@ msgstr "_Start-Port:"
 msgid "_End port:"
 msgstr "_End-Port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Relay-Server (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy-Server &amp; Browser"
 
@@ -12517,7 +12659,7 @@ msgstr "Kein Proxy"
 
 #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
 msgid "Use remote DNS with SOCKS4 proxies"
-msgstr "Remote-DNS mit SOCKS4-Proxys benuten"
+msgstr "Remote-DNS mit SOCKS4-Proxys benutzen"
 
 msgid "_User:"
 msgstr "_Benutzer:"
@@ -12671,12 +12813,12 @@ msgstr "Wenn abwesend und untätig"
 msgid "Auto-away"
 msgstr "Automatisch abwesend"
 
-msgid "Change status when _idle"
-msgstr "Ändere Status, wenn _inaktiv"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuten, bevor auf abwesend gesetzt wird:"
 
+msgid "Change status when _idle"
+msgstr "Ändere Status, wenn _inaktiv"
+
 msgid "Change _status to:"
 msgstr "Ändere _Status zu:"
 
@@ -12833,47 +12975,44 @@ msgstr "S_peichern & Übernehmen"
 msgid "Status for %s"
 msgstr "Status für %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Für '%s' existiert bereits ein benutzerdefinierter Smiley. Bitten wählen Sie "
+"eine andere Tastenkombination."
+
 msgid "Custom Smiley"
 msgstr "Benutzerdefinierter Smiley"
 
-msgid "More Data needed"
-msgstr "Weitere Daten benötigt"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Bitte geben Sie eine Tastenkombination für den Smiley an."
-
 msgid "Duplicate Shortcut"
 msgstr "Doppelte Tastenkombination"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Für diese Tastenkombination existiert bereits ein benutzerdefinierter "
-"Smiley. Bitten wählen Sie eine andere Tastenkombination."
-
-msgid "Please select an image for the smiley."
-msgstr "Bitte wählen Sie ein Bild für den Smiley."
-
 msgid "Edit Smiley"
 msgstr "Smiley bearbeiten"
 
 msgid "Add Smiley"
 msgstr "Smiley hinzufügen"
 
-msgid "Smiley _Image"
-msgstr "Smiley-_Bild"
+msgid "_Image:"
+msgstr "_Bild:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "_Tastenkombination"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "_Verknüpfter Text:"
 
 msgid "Smiley"
 msgstr "Smiley"
 
+msgid "Shortcut Text"
+msgstr "Verknüpfter Text"
+
 msgid "Custom Smiley Manager"
 msgstr "Verwaltung für benutzerdefinierte Smileys"
 
+msgid "Select Buddy Icon"
+msgstr "Buddy-Icon auswählen"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klicken Sie hier, um Ihr Buddy-Icon für dieses Konto zu ändern."
 
@@ -12958,8 +13097,8 @@ msgid "Cannot send launcher"
 msgstr "Kann Verknüpfung nicht senden"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Sie haben eine Verknüpfung gewählt. Wahrscheinlich wollten sie das Ziel der "
 "Verknüpfung senden und nicht die Verknüpfung selbst."
@@ -12996,9 +13135,30 @@ msgstr ""
 "Bild '%s' konnte nicht geladen werden: Grund unbekannt, vermutlich eine "
 "korrupte Bilddatei"
 
+msgid "_Open Link"
+msgstr "Ö_ffne Link"
+
+msgid "_Copy Link Location"
+msgstr "_Kopiere den Link"
+
+msgid "_Copy Email Address"
+msgstr "Kopiere _E-Mail-Adresse"
+
+msgid "_Open File"
+msgstr "_Datei öffnen"
+
+msgid "Open _Containing Directory"
+msgstr "_Enthaltendes Verzeichnis öffnen"
+
 msgid "Save File"
 msgstr "Datei speichern"
 
+msgid "_Play Sound"
+msgstr "Klang _abspielen"
+
+msgid "_Save File"
+msgstr "Datei _speichern"
+
 msgid "Select color"
 msgstr "Farbe auswählen"
 
@@ -13086,6 +13246,66 @@ msgstr "Kontakt-Verfügbarkeits-Vorhersage-Plugin."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Statistische Informationen über die Verfügbarkeit Ihrer Buddys zeigen"
 
+msgid "Server name request"
+msgstr "Servernamen-Anfrage"
+
+msgid "Enter an XMPP Server"
+msgstr "Geben Sie einen XMPP-Server ein"
+
+msgid "Select an XMPP server to query"
+msgstr "Wählen Sie einen XMPP-Server zur Abfrage"
+
+msgid "Find Services"
+msgstr "Dienste suchen"
+
+msgid "Add to Buddy List"
+msgstr "Zur Buddy-Liste hinzufügen"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Directory"
+msgstr "Verzeichnis"
+
+msgid "PubSub Collection"
+msgstr "PubSub-Sammlung"
+
+msgid "PubSub Leaf"
+msgstr "PubSub-Blatt"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Beschreibung:</b>"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Dienstsuche"
+
+msgid "_Browse"
+msgstr "_Suchen"
+
+msgid "Server does not exist"
+msgstr "Server existiert nicht"
+
+msgid "Server does not support service discovery"
+msgstr "Server unterstützt keine Dienstsuche"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP-Dienstsuche"
+
+msgid "Allows browsing and registering services."
+msgstr "Erlaubt das Durchsuchen und Registrieren von Diensten."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Dieses Plugin ist nützlich zum Registrieren bei veralteten Transports oder "
+"anderen XMPP-Diensten."
+
 msgid "Buddy is idle"
 msgstr "Buddy ist untätig"
 
@@ -13485,7 +13705,7 @@ msgstr "Musik-Nachrichten-Plugin zum gemeinschaftlichen Komponieren."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Das Musik-Nachrichtenübermittlungsplugin erlaubt es einer Menge von "
 "Benutzern, simultan an einem Musikstück in Echtzeit zu arbeiten."
@@ -13602,12 +13822,6 @@ msgstr ""
 "- Es sendet eine Nachricht zu Leuten in Ihrer Buddy Liste, direkt wenn Sie "
 "sich angemeldet haben"
 
-msgid "Cursor Color"
-msgstr "Cursor-Farbe"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekundäre Cursor-Farbe"
-
 msgid "Hyperlink Color"
 msgstr "Hyperlink-Farbe"
 
@@ -13617,6 +13831,9 @@ msgstr "Farbe für besuchte Hyperlinks"
 msgid "Highlighted Message Name Color"
 msgstr "Farbe des Absendernamens für hervorgehobene Nachrichten"
 
+msgid "Typing Notification Color"
+msgstr "Farbe der Tipp-Benachrichtigung"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeview horizontaler Abstand"
 
@@ -13645,35 +13862,21 @@ msgstr "GTK+ Schrift"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Text Shortcut-Thema"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "UI-Farben"
+msgid "Disable Typing Notification Text"
+msgstr "Tipp-Benachrichtigungstext deaktivieren"
 
-msgid "Widget Sizes"
-msgstr "Widget-Größen"
+msgid "GTK+ Theme Control Settings"
+msgstr "Themenkontroll-Einstellungen für GTK+"
+
+msgid "Colors"
+msgstr "Farben"
 
 msgid "Fonts"
 msgstr "Schrift"
 
+msgid "Miscellaneous"
+msgstr "Sonstiges"
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc-Datei-Werkzeuge"
 
@@ -13759,7 +13962,7 @@ msgstr "Senden-Knopf für das Gesprächsfenster."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Fügt einen Senden-Knopf zum Eingabefeld des Gesprächsfensters hinzu. Die ist "
 "für Fälle gedacht, wo keine Tastatur vorhanden ist."
@@ -13815,6 +14018,98 @@ msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Ersetzt Text in ausgehenden Nachrichten durch benutzerdefinierte Regeln."
 
+msgid "Just logged in"
+msgstr "Gerade angemeldet"
+
+msgid "Just logged out"
+msgstr "Gerade abgemeldet"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Icon für Kontakt/\n"
+"Icon for unbekannte Person"
+
+msgid "Icon for Chat"
+msgstr "Icon für Chat"
+
+msgid "Ignored"
+msgstr "Ignoriert"
+
+msgid "Founder"
+msgstr "Gründer"
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "Operator"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr "Half-Operator"
+
+msgid "Authorization dialog"
+msgstr "Autorisierungsdialog"
+
+msgid "Error dialog"
+msgstr "Fehlerdialog"
+
+msgid "Information dialog"
+msgstr "Informationsdialog"
+
+msgid "Mail dialog"
+msgstr "Mail-Dialog"
+
+msgid "Question dialog"
+msgstr "Frage-Dialog"
+
+msgid "Warning dialog"
+msgstr "Warnungdialog"
+
+msgid "What kind of dialog is this?"
+msgstr "Welche Art von Dialog ist dies?"
+
+msgid "Status Icons"
+msgstr "Status-Icons"
+
+msgid "Chatroom Emblems"
+msgstr "Chatraum-Embleme"
+
+msgid "Dialog Icons"
+msgstr "Dialog-Icons"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin Icon-Themen-Editor"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin Buddy-Listen-Thema-Editor"
+
+msgid "Edit Buddylist Theme"
+msgstr "Buddy-Listen-Thema bearbeiten"
+
+msgid "Edit Icon Theme"
+msgstr "Icon-Thema bearbeiten"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin Themen-Editor"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin Themen-Editor."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13982,7 +14277,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Optionen für Pidgin unter Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Bietet spezielle Optionen für Windows-Pidgin, wie Buddy-Listen-Docking."
 
@@ -14024,5 +14319,5 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
 
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Konnte das MSN-Adressbuch nicht abrufen"
+#~ msgid "Failed to open the file"
+#~ msgstr "Öffnen der Datei fehlgeschlagen"
diff --git a/po/dz.po b/po/dz.po
index 9443714abe..cb4dd82c03 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-11-09 17:11+0530\n"
 "Last-Translator: wangmo sherpa <rinwanshe@yahoo.com>\n"
 "Language-Team:  <pgeygel@dit.gov.bt>\n"
@@ -31,13 +31,13 @@ msgstr "ཕིརེནཆི།"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. བརྡ་དོན་ཧེང་བཀལ་དོན་ལུ་ `%s -h' འབད་རྩོན་བསྐྱེད།\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -624,21 +624,6 @@ msgid "Send To"
 msgstr "ལུ་གཏང་།(_S)"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "འཕྲིན་དོན་སྤང་།"
-
-msgid "Invite"
-msgstr "མགྲོན་དུ་འབོད།"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"ཁྱོད་ཀྱིས་ མགྲོན་བརྡ་འབད་ནིའི་རེ་འདོད་བསྐྱེད་མི་ ལག་ལེན་པའི་མིང་ གདམ་ཁ་ཅན་གྱི་མགྲོན་འབོད་འཕྲིན་དོན་དང་"
-"སྦྲགས་ཏེ་བཙུགས་གནང་།"
-
-#, fuzzy
 msgid "Conversation"
 msgstr "གྲོས་གླེང་།"
 
@@ -902,6 +887,42 @@ msgstr "གྲོས་གླེང་།"
 msgid "System Log"
 msgstr "དྲན་དེབ་རིམ་ལུགས།"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "རྩིས་སྟོན་པའི་བསྒང་..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "དང་ལེན་འབད།(_A)"
+
+msgid "Reject"
+msgstr "ཕྱིར་བཏོན།"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "ཁྱོད་ཀྱིས་  རྒྱུ་ལམ%s%sའདི་ཁ་འཕྱལ་ཡི།"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "གློག་འཕྲིན་ཚུ།"
 
@@ -937,6 +958,9 @@ msgstr "འཕྲོ་མཐུད།"
 msgid "IM"
 msgstr "ཨའི་ཨེམ་།"
 
+msgid "Invite"
+msgstr "མགྲོན་དུ་འབོད།"
+
 msgid "(none)"
 msgstr "(ཅི་མེད།)"
 
@@ -1163,7 +1187,6 @@ msgstr "%s འདི་ ཡར་སོ་ནུག (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s གིས་ ཁྱོད་ལུ་ འཕྲིན་དོན་གཅིག་བཏང་ཡོད། (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "ངོ་མ་ཤེས་པའི་ པའུནསི་གི་ བྱུང་ལས། འ་ནི་འདི་སྙན་ཞུ་འབད་གནང་།"
 
@@ -1214,7 +1237,6 @@ msgstr "གནས་ཚད་བསྒྱུར་བཅོས་མ་འབད
 msgid "Change status to"
 msgstr ": ལུ་ གནས་ཚད་བསྒྱུར་བཅོས་འབད།(_s)"
 
-#. Conversations
 msgid "Conversations"
 msgstr "གྲོས་གླེང་།"
 
@@ -1553,7 +1575,6 @@ msgid ""
 msgstr ""
 "གྲོས་གླེང་གསརཔ་འདི་ ཁ་ཕྱེཝ་ད་ལུ པ་ལག་ཨིན་འདི་གིས མཇུག་གི་གྲོས་གླེང་འདི ད་ལྟོའི་གྲོས་གླེང་ནང་བཙུགས་འོང་།"
 
-#, c-format
 msgid "Online"
 msgstr "གློག་ཐོག"
 
@@ -1603,6 +1624,28 @@ msgstr "ཇི་ཨེན་ཊི་མཇུག་གི་ལོག"
 msgid "Lastlog plugin."
 msgstr "གེམ་-ཚིག་ཡིག་དོན་ལུ་ མཇུག་གི་ལོག་གི་པ་ལག་ཨིན།"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "ཡུ་ཨར་ཨེལ"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "རྩིས་ཐོ་ ཚུ།"
 
@@ -1701,14 +1744,6 @@ msgstr "ཁ་སླབ་མགྲོན་བརྡ་དང་ལེན་འ
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "དང་ལེན་འབད།(_A)"
-
-msgid "Reject"
-msgstr "ཕྱིར་བཏོན།"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1799,6 +1834,8 @@ msgstr "+++ %s འཛུལ་ཡོདཔ།"
 msgid "+++ %s signed off"
 msgstr "+++ %s འཐོན་ཡོདཔ།"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
 
@@ -1845,6 +1882,18 @@ msgstr "%s ཁང་མིག་ནང་ལས་ཡར་སོ་ཡི།"
 msgid "%s left the room (%s)."
 msgstr "%sའདི་ཁང་མིག་(%s)ནང་ལས་ཡར་སོ་ཡི།"
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "གྲོས་ཚོགས་ནང་གདན་འདྲེན་ཞུ།"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"ཁྱོད་ཀྱིས་ མགྲོན་བརྡ་འབད་ནིའི་རེ་འདོད་བསྐྱེད་མི་ ལག་ལེན་པའི་མིང་ གདམ་ཁ་ཅན་གྱི་མགྲོན་འབོད་འཕྲིན་དོན་དང་"
+"སྦྲགས་ཏེ་བཙུགས་གནང་།"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "མཐུད་ལམ་: %s ཐོབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
@@ -1979,7 +2028,6 @@ msgstr "%s ལས་  %s གི་ གནས་སོར་འགོ་བཙུ
 msgid "Transfer of file %s complete"
 msgstr "མཇུག་བསྡུའི་ཡིག་སྣོད་%sཀྱི་གནས་སོར། "
 
-#, c-format
 msgid "File transfer complete"
 msgstr "ཡིག་སྣོད་གནས་སོར་མཇུག་བསྡུ།"
 
@@ -1987,7 +2035,6 @@ msgstr "ཡིག་སྣོད་གནས་སོར་མཇུག་བས
 msgid "You canceled the transfer of %s"
 msgstr " ཁྱོད་ཀྱིས་%sཀྱི་གནས་སོར་འདི་ཆ་མེད་བཏང་ནུག"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "ཡིག་སྣོད་གནས་སོར་འདི་ཆ་མེད་བཏང་ནུག"
 
@@ -2206,11 +2253,15 @@ msgstr "<font color=\"red\"><b>ཡིག་སྣོད་ལྷག་མ་ཚ�
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <རང་བཞིན-ལན>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "This plugin has not defined an ID."
 msgstr "འ་ནི་ལས་འགན་འདི་ ད་ཚུན་ ལག་ལེན་མ་འཐབ་པས།"
 
@@ -2612,9 +2663,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "ཨའི་ཨེམ་ཞབས་ཏོག་སྤྱོད་མི་གཞན་མི་ཚུ་གྲངས་སུ་བཙུགས་ཏེ་ ལོག་མཐོན་བྱེད་ནང་དྲན་དེབ་བཀོདཔ་ཨིན།"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2670,7 +2722,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2699,6 +2751,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "ཆོག་ཡིག་བཙུགས།"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2892,11 +2970,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "ནང་འབྱོར་ཨའི་ཨེམ་མཐུད་ལམ་ཚུའི་དོན་ལུ་ཉན་མ་ཚུགསཔ།\n"
 
 msgid ""
@@ -2905,7 +2984,6 @@ msgstr ""
 "ཉེ་གནས་ཀྱི་ ཨེམ་ཌི་ཨེན་ཨེསི་སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས། འདི་ལཱ་འབདཝ་མས་"
 "ག?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "མགོ་མིང་།"
 
@@ -2939,6 +3017,11 @@ msgstr "བཱོན་ཇོར་ གནད་སྤེལ་ལམ་ལུ�
 msgid "Purple Person"
 msgstr "གང་ཟག་གསརཔ།"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "ཉེ་གནས།"
+
 msgid "Bonjour"
 msgstr "བཱོན་ཇོར།"
 
@@ -2949,14 +3032,21 @@ msgstr "%s གིས་ གྲོས་གླེང་ཁ་བསྡམས་�
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "འཕྲིན་དོན་འདི་གཏང་མ་ཚུགས་ གྲོས་གླེང་འདི་འགོ་བཙུགས་མ་ཚུགས།"
 
-msgid "Cannot open socket"
-msgstr "སོ་ཀེཊི་ཁ་ཕྱེ་མ་ཚུགས།"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ་:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "འདྲེན་ལམ་ལུ་ སོ་ཀེཊི་བསྡམས་མ་ཚུགས།"
 
-msgid "Could not listen on socket"
-msgstr "སོ་ཀེཊི་གུ་ལུ་ ཉན་མ་ཚུགས།"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ་:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3006,13 +3096,16 @@ msgstr "ཆ་རོགས་ཐོ་ཡིག་སྲུངས་བཞག...
 msgid "Load buddylist from file..."
 msgstr "ཡིག་སྣོད་ལས་ ཆ་རོགས་ཐོ་ཡིག་མངོན་གསལ་འབད།..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "ཐོ་བཀོད་ས་སྒོ་ཚུ་བཀང་།"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "ཆོག་ཡིག་འདི་མི་མཐུན་པས།"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "རྩིས་ཐོ་གསརཔ་ཐོ་འགོད་འབད་མ་ཚུགས། འཛོལ་བ་བྱུང་ཡི།\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3024,14 +3117,15 @@ msgstr "ཐོ་འགོད་འདི་ མཐར་འཁྱོལ་ས�
 msgid "Password"
 msgstr "ཆོག་ཡིག"
 
-msgid "Password (retype)"
-msgstr "ཆོག་ཡིག་(ལོག་ཡིག་དཔར་བརྐྱབ)།"
+msgid "Password (again)"
+msgstr "ཆོག་ཡིག(ལོག་སྟེ)"
 
-msgid "Enter current token"
-msgstr "ད་ལྟོའི་ངོ་རྟགས་བཙུགས།"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "ད་ལྟོའི་ངོ་རྟགས།"
+#, fuzzy
+msgid "Captcha"
+msgstr "གཟུགས་བརྙན་སྲུང་བཞག་འབད།"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ག་ཌུ་-ག་ཌུ་ རྩིས་ཐོ་གསརཔ་ཐོ་འགོད་འབད།"
@@ -3084,6 +3178,15 @@ msgstr "ཆོག་ཡིག་འདི་མཐར་འཁྱོལ་སྦ
 msgid "Current password"
 msgstr "ད་ལྟོའི་ཆོག་ཡིག"
 
+msgid "Password (retype)"
+msgstr "ཆོག་ཡིག་(ལོག་ཡིག་དཔར་བརྐྱབ)།"
+
+msgid "Enter current token"
+msgstr "ད་ལྟོའི་ངོ་རྟགས་བཙུགས།"
+
+msgid "Current token"
+msgstr "ད་ལྟོའི་ངོ་རྟགས།"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "ཡུ་ཨའི་ཨེེན་དོན་ལུ་ ད་ལྟོའི་ཆོག་ཡིག་དང་ ཆོག་ཡིག་གསརཔ་བཙུགས་གནང་།:"
 
@@ -3097,13 +3200,13 @@ msgstr "ཆ་རོགས་: %s དོན་ལུ་ ཁ་སླབ་གཅ
 msgid "Add to chat..."
 msgstr "ཁ་སླབ་ལུ་ཁ་སྐོང་བརྐྱབ།..."
 
+#. Global
 msgid "Available"
 msgstr "ཐོབ་ཚུགས།"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "ཕྱི་ཁ།"
 
@@ -3131,8 +3234,8 @@ msgstr "ལག་ལེན་པ་མཐུན་སྒྲིག་ཚུ་འ
 msgid "There are no users matching your search criteria."
 msgstr "ཁྱོད་ཀྱི་ འཚོལ་ཞིབ་ཁྱད་ཚད་མཐུན་སྒྲིག་འབད་བའི་ལག་ལེན་པ་ཚུ་གཅིག་ཡང་མིན་འདུག"
 
-msgid "Unable to read socket"
-msgstr "སོ་ཀེཊི་ལྷག་མི་ཚུགས།"
+msgid "Unable to read from socket"
+msgstr "སོ་ཀེཊི་ལས་ ལྷག་མ་ཚུགས།"
 
 msgid "Buddy list downloaded"
 msgstr "ཆ་རོགས་ཐོ་ཡིག་ཕབ་ལེན་འབད་ཡོདཔ།"
@@ -3146,8 +3249,14 @@ msgstr "ཆ་རོགས་ཐོ་ཡིག་སྐྱེལ་བཙུག
 msgid "Your buddy list was stored on the server."
 msgstr "ཁྱོད་ཀྱི་ ཆ་རོགས་ཐོ་ཡིག་འདི་ སར་བར་གུ་ལུ་གསོག་འཇོག་འབད་བཞག་ནུག"
 
-msgid "Connection failed."
-msgstr "མཐུད་ལམ་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "མཐུད་ཡོདཔ།"
+
+msgid "Connection failed"
+msgstr "མཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 msgid "Add to chat"
 msgstr "ཁ་སླབ་ལུ་ཁ་སྐོང་བརྐྱབ།"
@@ -3155,13 +3264,23 @@ msgstr "ཁ་སླབ་ལུ་ཁ་སྐོང་བརྐྱབ།"
 msgid "Chat _name:"
 msgstr "ཁ་སླབ་ མིང་།:(_n)"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "སར་བར་ པིང་འབད་མ་ཚུགས།"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "མཐུད་དོ།"
+
 msgid "Chat error"
 msgstr "ཁ་སླབ་འཛོལ་བ།"
 
 msgid "This chat name is already in use"
 msgstr "འ་ནི་ཁ་སླབ་འདི་ ཧེ་མ་ལས་རང་ལག་ལེན་འཐབ་བཞིན་ཡོད།"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "སར་བར་ལུ་མཐུད་དེ་མེདཔ།"
 
 msgid "Find buddies..."
@@ -3203,6 +3322,10 @@ msgstr "ཡོང་གྲགས་ཅན་ ཨའི་ཨེམ་ལེག�
 msgid "Gadu-Gadu User"
 msgstr "ག་ཌུ་-ག་ཌུ་ ལག་ལེན་པ།"
 
+#, fuzzy
+msgid "GG server"
+msgstr "ལག་ལེན་པའི་བརྡ་དོན་གཞི་སྒྲིག་འབད..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "བརྡ་བཀོད་ངོ་མ་ཤེསཔ: %s"
@@ -3218,7 +3341,7 @@ msgid "File Transfer Failed"
 msgstr "ཡིག་སྣོད་གནས་སོར་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "གཱེམ་གྱིས་ཉན་ནིའི་འདྲེན་ལམ་ཁ་ཕྱེ་མི་ཚུགས།"
 
 msgid "Error displaying MOTD"
@@ -3234,8 +3357,18 @@ msgstr "མཐུད་ལམ་འདི་དང་ འབྲེལ་བའ�
 msgid "MOTD for %s"
 msgstr "ཨེམ་ཨོ་ཊི་ཌིའི་ དོན་ལུ་  %s"
 
-msgid "Server has disconnected"
-msgstr "སར་བར་འདི་ མཐུད་བཏོག་ནུག"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "ཨེམ་ཨོ་ཊི་ཌི་ བལྟ།"
@@ -3246,25 +3379,24 @@ msgstr "རྒྱུ་ལམ:"
 msgid "_Password:"
 msgstr "ཆོག་ཡིག:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "ཨའི་ཨར་སི་ ནིཀསི་ནང་ལུ་ བར་སྟོང་དཀརཔོ་མེདཔ་འོང་།"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "མཐུད་དོ།"
-
 msgid "SSL support unavailable"
 msgstr "SSL རྒྱབ་སྐྱོར་མི་ཐོབ།"
 
-msgid "Couldn't create socket"
-msgstr "སོ་ཀེཊི་ གསར་བསྐྲུན་འབད་མི་ཚུགས།"
+msgid "Unable to connect"
+msgstr "མཐུད་མ་ཚུགས།"
 
-msgid "Couldn't connect to host"
-msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%sལུ་མཐུད་མ་ཚུགས།"
 
-msgid "Read error"
-msgstr "འཛོལ་བ་ལྷག"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "སར་བར་གྱིས་ མཐུད་ལམ་ཁ་བསྡམས་ད་ནུག"
 
 msgid "Users"
 msgstr "ལག་ལེན་པ་ཚུ།"
@@ -3450,6 +3582,17 @@ msgstr ""
 "ཁྱོད་ཀྱི་ སེལ་འཐུ་འབད་འབད་བའི་རྩིས་ཐོའི་མིང་འདི་སར་བར་གྱིས་དང་ལེན་སྤང་ནུག འདི་ནང་ལུ་ ནུས་མེད་ཀྱི་ཡིག་"
 "འབྲུ་ཡོདཔ་འོང་ནི་མས།"
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "འ་ནི་ཁ་སླབ་འདི་ ཧེ་མ་ལས་རང་ལག་ལེན་འཐབ་བཞིན་ཡོད།"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "སྐྱོན་མིང་: %s\n"
+
 msgid "Cannot change nick"
 msgstr "ནིཀ་ བསྒྱུར་བཅོས་རྐྱབས་མི་ཚུགས།"
 
@@ -3689,13 +3832,14 @@ msgstr "བརྡ་བཀོད་ལྕོགས་མིན་ཐལ།"
 msgid "execute"
 msgstr "རེ་བ་མ་བསྐྱེད།"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ "
 "རྒྱབ་སྐྱོར་མིན་འདུག"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ "
 "རྒྱབ་སྐྱོར་མིན་འདུག"
@@ -3715,18 +3859,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "ཚིག་ཡིག་ཉག་རྐྱང་གི་བདེན་བཤད།"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "སར་བར་ལས་ནུས་མེད་ཀྱི་ལན།"
 
 msgid "Server does not use any supported authentication method"
 msgstr "སར་བར་གྱིས ་རྒྱབ་སྐྱོར་འབད་འབདཝ་གི་བདེན་བཤད་ཐབས་ལམ་ག་ནི་ཡང་  ལག་ལེན་མི་འཐབ།"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "སར་བར་ལས་ ནུས་མེད་ཀྱི་དོ་འགྲན།"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "ཨེསི་ཨེ་ཨེསི་ཨེལ་ འཛོལ་བ།"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "རྒྱུ་མཚན་མ་བཀོད་པས།"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་ཐོན་རིམ།"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ།"
+
 msgid "Full Name"
 msgstr "ངོ་མིང་ཆ་ཚང་།"
 
@@ -3793,187 +3973,9 @@ msgstr "ཞབས་ཏོག་སྤྱོད་མི།"
 msgid "Operating System"
 msgstr "རིམ་ལུགས་བཀོལ་སྤྱོད་འབད་དོ།"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Dir བརྡ་དོན་གཞི་སྒྲིག་འབད།"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "རྒྱ་བསྐྱེད་ཅན་གྱི་ཁ་བྱང་།"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "ཁ་སླབ་མིང་གཞན།"
-
 #, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "ལག་ལེན་པ་ལུ་ སྣོད་ཐོའི་བརྡ་དོན་མིན་འདུག"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "བརྡ་བཀོད།"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "ཨེཅི་ཊི་ཨེམ་ཨེལ།"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "ཐོ་འགོད་འབད་ནིའི་འཛོལ་བ།"
-
-#, fuzzy
-msgid "User Location"
-msgstr "གནས་ཁོངས།"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "ལག་ལེན་པ་གི་འཚོལ་ཞིབ།"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "ཆ་རོགས་ཀྱི་གནས་ལུགས་བརྡ་བསྐུལ་འབད་ནི།"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་ཐོན་རིམ།"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "ཕྱོགས།"
-
-msgid "File Transfer"
-msgstr "ཡིག་སྣོད་གནས་སོར།"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "ལག་ལེན་པའི་ཚད།"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "ལྕོགས་གྲུབ།"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "ལག་ལེན་པའི་མིང་།"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "ཨའི་ཨེམ་དང་བཅས་ལྡེ་མིག་བརྗེ་སོར།"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "གློག་འཕྲིན་ཁ་བྱང་།"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "གསལ་སྡུད་གཞི་སྒྲིག་འབད།"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "མཐུད་ནི།"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "ལག་ལེན་པའི་ མིང་།"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "མངོན་མཐོང་ ཝི་ཌིའོ།"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "འཕྲིན་དོན་ཐོབ་ཅི།"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "མི་མང་ལྡེ་མིག་ བ་བཱལ པིརིནཊི།"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "ལག་ལེན་པའི་གདམ་ཁ་ཚུ།"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "ལག་ལེན་པའི་ མིང་།"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "ལག་ལེན་པའི་ཚད།"
-
-msgid "Ping"
-msgstr "པིང་།"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ཊིལིཡེན་ གསང་བཟོ།"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "ལྕོགས་གྲུབ།"
+msgid "Local Time"
+msgstr "ཉེ་གནས་ཀྱི་ཡིག་སྣོད:"
 
 msgid "Priority"
 msgstr "གཙོ་རིམ།"
@@ -3981,6 +3983,14 @@ msgstr "གཙོ་རིམ།"
 msgid "Resource"
 msgstr "ཐོན་ཁུངས།"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "ཕྱིར་བསྐྱོད།"
+
 msgid "Middle Name"
 msgstr "བར་མའི་མིང་།"
 
@@ -4029,7 +4039,6 @@ msgstr "ཁ་མང་དྲགས།"
 msgid "Extended Away"
 msgstr "རྒྱ་བསྐྱེད་འབད་ཡི།"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "མ་དཀྲོགས།"
 
@@ -4152,29 +4161,26 @@ msgstr "འདྲི་དཔྱད་འབད་ནི་ལུ་ གྲོ�
 msgid "Find Rooms"
 msgstr "ཁང་མིག་ཚུ་འཚོལ།"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "མིང་གཞན:"
 
-msgid "Write error"
-msgstr "འཛོལ་བ་བྲིས།"
+#, fuzzy
+msgid "No users found"
+msgstr "ལག་ལེན་པ་མཐུན་སྒྲིག་ཚུ་འཚོལ་མ་ཐོབ་པས།"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "ཉག་རྐྱང་གི་ཚིག་ཡིག"
+msgid "Roles:"
+msgstr "ལས་འགན།"
 
-msgid "Read Error"
-msgstr "འཛོལ་བ་ལྷག"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "ཉག་རྐྱང་གི་ཚིག་ཡིག"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "སོ་ཀེཊི་བཟོ་བསྐྲུན་འབད་མི་ཚུགས་པས།"
 
 #, fuzzy
 msgid "Invalid XMPP ID"
@@ -4183,6 +4189,10 @@ msgstr "ནུས་མེད་ཀྱི་ ཨའི་ཌི།"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "སར་བར་ལུ་མཐུད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr " %s@%s ཀྱི་ཐོ་བཀོད་ མཐར་འཁྱོལ་བྱུང་ཡོདཔ།"
@@ -4209,9 +4219,6 @@ msgstr "ཐོ་བཀོད་མཐར་འཁྱོལ་བྱུང་ཡ
 msgid "Unregistration Failed"
 msgstr "ཐོེ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-msgid "Already Registered"
-msgstr "ཧེ་མ་ལས་རང་ ཐོ་བཀོད་འབད་ཡི།"
-
 msgid "State"
 msgstr "གནས་ལུགས།"
 
@@ -4224,6 +4231,9 @@ msgstr "བརྒྱུད་འཕྲིན།"
 msgid "Date"
 msgstr "ཚེས་གྲངས།"
 
+msgid "Already Registered"
+msgstr "ཧེ་མ་ལས་རང་ ཐོ་བཀོད་འབད་ཡི།"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "ཐོ་དེབ།"
@@ -4256,6 +4266,10 @@ msgid "Change Registration"
 msgstr ": ལུ་ གནས་ཚད་བསྒྱུར་བཅོས་འབད།(_s)"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "སར་བར་ལུ་མཐུད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "རྩིས་ཐོའི་བརྡ་དོན་བསྒྱུར་བཅོས་འབདཝ་ད་ འཛོལ་བ།"
 
@@ -4276,9 +4290,18 @@ msgstr "བདེན་བཤད་དོ།"
 msgid "Re-initializing Stream"
 msgstr "ལོག་འགོ་བྱེད་ཀྱི་རྒྱུན་རིམ།"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "དབང་སྤྲོད་མ་འབད།"
 
+msgid "Mood"
+msgstr "ཁམས།"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "གཉིས་ཆ་རང་།"
 
@@ -4300,12 +4323,6 @@ msgstr "ཅི་མེད།"
 msgid "Subscription"
 msgstr "མཁོ་མངགས"
 
-msgid "Mood"
-msgstr "ཁམས།"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "ཁྲག་དབྱེ་བ།"
@@ -4352,9 +4369,6 @@ msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་འདི་བསྒ
 msgid "Error changing password"
 msgstr "འཛོལ་བ་བསྒྱུར་བཅེོས་ཀྱི་ཆོག་ཡིག"
 
-msgid "Password (again)"
-msgstr "ཆོག་ཡིག(ལོག་སྟེ)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "ཆོག་ཡིག་བསྒྱུར་བཅོས་འབད།"
@@ -4549,18 +4563,24 @@ msgstr "ལག་ལེན་པ %s འདི་བཏོན་གཏང་མ�
 msgid "Unable to ping user %s"
 msgstr "ལག་ལེན་པ %s འདི་བཀག་དམ་འབད་མི་ཚུགས།"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "གདམ་ཁ་རྐྱབས་པའི་ཡིག་སྣོད་ (%s) འདི་མེད་ནི་དེ་གིས་སྒྲ་སྐད་གཏང་མ་ཚུགས།"
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "གདམ་ཁ་རྐྱབས་པའི་ཡིག་སྣོད་ (%s) འདི་མེད་ནི་དེ་གིས་སྒྲ་སྐད་གཏང་མ་ཚུགས།"
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "གདམ་ཁ་རྐྱབས་པའི་ཡིག་སྣོད་ (%s) འདི་མེད་ནི་དེ་གིས་སྒྲ་སྐད་གཏང་མ་ཚུགས།"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4571,9 +4591,37 @@ msgstr "ཟིར་ཟིར!!"
 msgid "%s has buzzed you!"
 msgstr "%s གིས་ ཁྱོད་ [%s] ལུ་ཁ་སྐོང་བརྐྱབ་ཡོདཔ་ཨིན།"
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "%s ལུ་ འཕྲིན་དོན་གཏང་མ་ཚུགས།"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+" %sལུ ཡིག་སྣོད་གཏང་མ་ཚུགས་ དེ་ལས་ ལག་ལེན་པ་གིས་ ཡིག་སྣོད་གནས་སོར་གཏང་ནི་ཚུ་རྒྱབ་སྐྱོར་མི་འབད།"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
+" %sལུ ཡིག་སྣོད་གཏང་མ་ཚུགས་ དེ་ལས་ ལག་ལེན་པ་གིས་ ཡིག་སྣོད་གནས་སོར་གཏང་ནི་ཚུ་རྒྱབ་སྐྱོར་མི་འབད།"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "ཐོེ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "ཁྱོད་ཀྱིས་ བལྟ་དགོ་མནོ་བའི་མི་འདི་གི་ མིང་གཞན་ཡང་ན་གསལ་གཞི་མིང་བཙུགས་གནང་།"
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "ཨང་གྲངས་གཅིག་སེལ་འཐུ་འབད།"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "ཁ་སླབ་འགོ་བཙུགས(_c)"
 
 msgid "config:  Configure a chat room."
 msgstr "ཀཱོན་ཕིག: ཁ་སླབ་ཁང་མིག་  རིམ་སྒྲིག་འབད།"
@@ -4594,16 +4642,18 @@ msgstr " གནད་དོན[གནད་དོན་གསརཔ]: བལྟ
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "བཀག་དམ་འབད &lt;ལག་ལེན་པ&gt; [ཁང་མིག]: ཁང་མིག་ནང་ལས་ལག་ལེན་པ་བཀག་དམ་འབད། "
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "འབྲེལ་གཏོགས་དང་ ཨའི་ཊི།;ལག་ལེན་པ་དང་ཇི་ཊི།; དང་ཨའི་ཊི།;བདག་པོ།|བདག་སྐྱོང་པ།|འཐུས་མི།|ཕྱིར་བཏོན་"
 "བཞག་མི།|ཅི་མེད་དང་ ཇི་ཊི།;: ལག་ལེན་པའི་ འབྲེལ་གཏོགས་འདི་ ཁང་མིག་དང་གཅིག་ཁར་གཞི་སྒྲིག་འབད།"
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "ལས་འགན་དང་ཨའི་ཊི།;ལག་ལེན་པ་དང་ཇི་ཊི།; དང་ཨའི་ཊི།;རན་པ་བཟོ་མི|བཅའ་མར་གཏོགས་མི།|འཕྱད་པར་འོང་"
 "མི།|ཅི་མེད་དང་ཇི་ཊི།;: ཁང་མིག་ནང་ལུ་ ལག་ལེན་པའི་ལས་འགན་གཅིག་གཞི་སྒྲིག་འབད།(&I)(&g)(&I)(&g)"
@@ -4672,6 +4722,9 @@ msgstr "སར་བར་ལུ་མཐུད།"
 msgid "File transfer proxies"
 msgstr "ཡིག་སྣོད་གནས་སོར་འདྲེན་ལམ།"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4712,6 +4765,14 @@ msgstr "ཨེགསི་ཨེམ་ཨེལ་ འཛོལ་བ་མི�
 msgid "Unknown Error in presence"
 msgstr "ངོ་འཛོམས་ནང་ ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "ཁ་སླབ་ %sནང་འཛུལ་ནི་ འཛོལ་བ།"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "ཁ་སླབ་ %sནང་ལུ་ འཛོལ་བ།"
+
 msgid "Create New Room"
 msgstr "ཁང་མིག་གསརཔ་བཟོ་བསྐྲུན་འབད།"
 
@@ -4728,13 +4789,32 @@ msgstr "ཁང་མིག་རིམ་སྒྲིག་འབད།(_C)"
 msgid "_Accept Defaults"
 msgstr "སྔོན་སྒྲིག་ཚུ་དང་ལེན་འབད།(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "ཁ་སླབ་ %sནང་འཛུལ་ནི་ འཛོལ་བ།"
+#, fuzzy
+msgid "No reason"
+msgstr "རྒྱུ་མཚན་མ་བཀོད་པས།"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "ཁ་སླབ་ %sནང་ལུ་ འཛོལ་བ།"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "ཁྱོད་  %s: (%s)ཀྱིས་བཏོན་བཏང་ནུག"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s)ཀྱིས་ བཏོན་བཏང་ཡི།"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "ཡིག་སྣོད་ཁ་ཕྱེཝ་ད་ འཛོལ་བ་བྱུང་ནུག"
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "ཡིག་སྣོད་གནས་སོར་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "ཡིག་སྣོད་ '%s': %s ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4763,10 +4843,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "ཁྱོད་ཀྱིས་ བལྟ་དགོ་མནོ་བའི་མི་འདི་གི་ མིང་གཞན་ཡང་ན་གསལ་གཞི་མིང་བཙུགས་གནང་།"
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "ཨང་གྲངས་གཅིག་སེལ་འཐུ་འབད།"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
 
@@ -4806,9 +4882,20 @@ msgstr "བྱ་བ།"
 msgid "Select an action"
 msgstr "སེལ་འཐུ།"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\"འདི་ཁ་སྐོང་རྐྱབ་མ་ཚུགས།"
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "དྲན་འཛིན་ཚུའི་ཁ་བྱང་ཀི་དེབ་སེལ་འཐུ་འབད།"
+msgid "Buddy Add error"
+msgstr "ཆ་རོགས་ཐོ་ཡིག་གི་འཛོལ་བ།"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "གསལ་བཀོད་འབད་འབདཝ་གི་གསལ་གཞི་མིང་འདི་ ནུས་མེད་ཨིན་པས།"
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5038,7 +5125,7 @@ msgstr "རྩ་ལག་གི་ཁས་ལེན་མེད་པའི་
 msgid "Passport account not yet verified"
 msgstr "ལམ་ཡིག་རྩིས་ཐོ་འདི་ ད་ཚུན་བདེན་སྦྱོར་མ་འབད།"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "ལམ་ཡིག་རྩིས་ཐོ་འདི་ ད་ཚུན་བདེན་སྦྱོར་མ་འབད།"
 
@@ -5062,6 +5149,10 @@ msgstr "དགའ་མིའི་འབྲེལ་ས།"
 msgid "Non-IM Contacts"
 msgstr "འབྲེལ་ས་རྩ་བསྐྲད་གཏང་།"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5134,6 +5225,13 @@ msgstr "འགྲུལ་འཕྲིན་གྱི་ཡིག་འཕྲི
 msgid "Page"
 msgstr "ཤོག་ལེབ།"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "ཨའི་ཨེམ་ ལཱ་གཡོག"
+
 msgid "Has you"
 msgstr "ཁྱོད་ལུ་ཡོད་ག"
 
@@ -5175,6 +5273,14 @@ msgstr "དུས་སྦྱོར་ལུག"
 msgid "Album"
 msgstr "ཨེ་ཌིཡམ།"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "མགོ་མིང་།"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "མགོ་མིང་།"
+
 msgid "Set Friendly Name..."
 msgstr "མིང་མཐུན་ཏོག་ཏོ་གཞི་སྒྲིག་འབད།..."
 
@@ -5212,9 +5318,6 @@ msgstr ""
 "མཛོད་འདི་གཞི་བཙུགས་འབད་གནང་།     བརྡ་དོན་ཁ་གསལ་གྱི་དོན་ལུ http://གཱེམsf.net/faq-ssl.php "
 "ནང་བལྟ།"
 
-msgid "Failed to connect to server."
-msgstr "སར་བར་ལུ་མཐུད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
 msgid "Error retrieving profile"
 msgstr "འཛོལ་བ་ སླར་འདྲེན་འབད་བའི་གསལ་སྡུད།"
 
@@ -5372,8 +5475,9 @@ msgid ""
 msgstr ""
 "གཱེམ་གྱིས་ ལག་ལེན་པའི་གསལ་སྡུད་ནང་ལུ་ བརྡ་དོན་འཚོལ་མ་ཐོབ་པས། ལག་ལེན་པ་འདི་མེདཔ་བཟུམ་ཅིག་འདུག"
 
-msgid "Profile URL"
-msgstr "གསལ་སྡུད་ ཡུ་ཨར་ཨེལ།"
+#, fuzzy
+msgid "View web profile"
+msgstr "ཨོཕ་ལ་ཡིན་གྱི་སྐབས་འབད་མི་ཆོགཔ་ཨིན།"
 
 #. *< type
 #. *< ui_requirement
@@ -5410,65 +5514,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "སྤྱིར་བཏང་གི་བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s འདི་ནུས་ཅན་གྱི་སྡེ་ཚན་མེན།"
-
-msgid "Unknown error."
-msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s གུ %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s གིས་ ཁྱོད་ལུ་ ནཱཌཇི་བཏང་ཡོདཔ་ཨིན།"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
 
 msgid "Unable to add user"
 msgstr "ལག་ལེན་པ་ཁ་སྐོང་བརྐྱབ་མ་ཚུགས།"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "འོག་ལུ་ཡོད་མི་ཚུ་ ཁྱོད་ཀྱི་འཚོལ་ཞིབ་ཀྱི་གྲུབ་འབྲས་ཚུ་ཨིན།"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s)གུ་ལུ་ལག་ལེན་པ་ཁ་སྐོང་རྐྱབས་མ་ཚུགས།"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s)གུ་ལུ་ ལག་ལེན་པ་ འགགས་མ་ཚུགས།"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s)གུ་ལུ་ ལག་ལེན་པ་ གནང་བ་བྱིན་མ་ཚུགས།"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s འདི་ཁ་སྐོང་རྐྱབ་མི་ཚུགས་པས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ཀྱི་ཆ་རོགས་ཐོ་ཡིག་འདི་གང་སོ་ནུག"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s འདི་ནུས་ཅན་གྱི་ལམ་ཡིག་རྩིས་ཐོ་མེན།"
-
-msgid "Service Temporarily Unavailable."
-msgstr "གནས་སྐབས་ཅིག་ཞབས་ཏོག་ཐོབ་ཆོགཔ་མིན་འདུག"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "ང་བཅས་ཀྱིས་གནམ་མེད་ས་མེད་མགྱོགས་པ་གཏང་ནི་དེ་གིས་ འཕྲིན་དོན་འདི་ གཏང་མི་བཏུབ་པས།:"
 
-msgid "Unable to rename group"
-msgstr "སྡེ་ཚན་གྱི་བསྐྱར་མིང་བཏགས་མི་ཚུགས་པས།"
-
-msgid "Unable to delete group"
-msgstr "སྡེ་ཚན་འདི་བཏོན་གཏང་མི་ཚུགས་པས།"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5508,9 +5575,6 @@ msgstr "འཕྲིན་དོན་འདི་མ་གཏང་འོང་
 msgid "Message was not sent because an unknown error occurred."
 msgstr "འཕྲིན་དོན་འདི་མ་གཏང་འོང་ནི་མས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ངོ་མ་ཤེས་པའི་འཛོལ་བ་བྱུང་ནུག:"
 
-msgid "Unable to connect"
-msgstr "མཐུད་མ་ཚུགས།"
-
 msgid "Writing error"
 msgstr "འཛོལ་བ་བྲིས་དོ།"
 
@@ -5525,19 +5589,23 @@ msgstr ""
 "%s སར་བར་ལས་ མཐུད་ལམ་འཛོལ་བ།:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "ང་བཅས་ཀྱི་གནད་སྤེལ་ལམ་ལུགས་འདི་ སར་བར་གྱིས་རྒྱབ་སྐྱོར་འབད་འབདཝ་མེན།"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "འཛོལ་བ་མིང་དཔྱད་འབད་དོ་ ཨེཆ་ཊི་ཊི་པི།"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "ཁྱོད་ གནས་ཁོངས་གཞན་ཅིག་ཁ་ལས་ ནང་ན་འཛུལ་ནུག"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "ཨེམ་ཨེསི་ཨེན་ སར་བར་ཚུ་ གནས་སྐབས་ཅིག་ཐོབ་མི་ཚུགས། ཨ་ཙི་བསྒུག་ཞིན་ན་འབད་རྩོལ་བསྐྱེད་གནང་།"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "ཨེམ་ཨེསི་ཨེན་ སར་བར་ཚུ་ གནས་སྐབས་ཅིག་ ལཱ་མི་འབད།"
 
 #, c-format
@@ -5568,6 +5636,14 @@ msgstr "ཀུ་ཀི་གཏང་དོ།"
 msgid "Retrieving buddy list"
 msgstr "སླར་འདྲེན་འབད་བའི་བསྒང་གི་ཆ་རོགས་ཐོ་ཡིག"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "གློག་རིག་ལས་ཕྱི་ཁ་ཨིན།"
 
@@ -5606,14 +5682,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "འཕྲིན་དོན་འདི་མ་གཏང་འོང་ནི་མས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ངོ་མ་ཤེས་པའི་འཛོལ་བ་བྱུང་ནུག:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr " %s གིས་ ཁོ་རའི་ཡང་ན་མོ་རའི་ ཆ་རོགས་ཐོ་ཡིག་ནང་ ཁྱོད་ ཁ་སྐོང་བརྐྱབ་ནུག"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s གིས་ ཁོ་རའི་ཡང་ན་མོ་རའི་ཆ་རོགས་ཐོ་ཡིག་ལས་ ཁྱོད་རྩ་བསྐྲད་བཏང་ནུག"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "ཁ་བྱང་ཀི་དེབ་ལུ་ཁ་སྐོང་རྐྱབས།"
@@ -5622,13 +5690,6 @@ msgstr "ཁ་བྱང་ཀི་དེབ་ལུ་ཁ་སྐོང་ར
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "ཆ་རོགས་འདི་ ཁྱོད་ཀྱི་ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་རྐྱབས་ནི་ཨིན་ན?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "\"%s\"འདི་ཁ་སྐོང་རྐྱབ་མ་ཚུགས།"
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "གསལ་བཀོད་འབད་འབདཝ་གི་གསལ་གཞི་མིང་འདི་ ནུས་མེད་ཨིན་པས།"
@@ -5636,6 +5697,9 @@ msgstr "གསལ་བཀོད་འབད་འབདཝ་གི་གསལ
 msgid "This Hotmail account may not be active."
 msgstr "འ་ནི་ཧོཊི་མཱེལ་རྩིས་ཐོ་འདི་ ཤུགས་ལྡན་མེདཔ་འོང་།"
 
+msgid "Profile URL"
+msgstr "གསལ་སྡུད་ ཡུ་ཨར་ཨེལ།"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5650,19 +5714,63 @@ msgstr "འ་ནི་ཧོཊི་མཱེལ་རྩིས་ཐོ་འ
 msgid "MSN Protocol Plugin"
 msgstr "ཨེ་ཨའི་ཨེམ/ཨའི་སི་ཀིའུ་  གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
 
-#, fuzzy
-msgid "Missing Cipher"
-msgstr "གསང་ཡིག"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s འདི་ནུས་ཅན་གྱི་སྡེ་ཚན་མེན།"
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s གུ %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s)གུ་ལུ་ལག་ལེན་པ་ཁ་སྐོང་རྐྱབས་མ་ཚུགས།"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s)གུ་ལུ་ ལག་ལེན་པ་ འགགས་མ་ཚུགས།"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s)གུ་ལུ་ ལག་ལེན་པ་ གནང་བ་བྱིན་མ་ཚུགས།"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s འདི་ཁ་སྐོང་རྐྱབ་མི་ཚུགས་པས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ཀྱི་ཆ་རོགས་ཐོ་ཡིག་འདི་གང་སོ་ནུག"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s འདི་ནུས་ཅན་གྱི་ལམ་ཡིག་རྩིས་ཐོ་མེན།"
+
+msgid "Service Temporarily Unavailable."
+msgstr "གནས་སྐབས་ཅིག་ཞབས་ཏོག་ཐོབ་ཆོགཔ་མིན་འདུག"
+
+msgid "Unable to rename group"
+msgstr "སྡེ་ཚན་གྱི་བསྐྱར་མིང་བཏགས་མི་ཚུགས་པས།"
+
+msgid "Unable to delete group"
+msgstr "སྡེ་ཚན་འདི་བཏོན་གཏང་མི་ཚུགས་པས།"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr " %s གིས་ ཁོ་རའི་ཡང་ན་མོ་རའི་ ཆ་རོགས་ཐོ་ཡིག་ནང་ ཁྱོད་ ཁ་སྐོང་བརྐྱབ་ནུག"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s གིས་ ཁོ་རའི་ཡང་ན་མོ་རའི་ཆ་རོགས་ཐོ་ཡིག་ལས་ ཁྱོད་རྩ་བསྐྲད་བཏང་ནུག"
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "ལག་ལེན་པའི་ཁང་མིག་ཚུ།"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "གནད་སྡུད་ལྷག་དོ།"
 
@@ -5674,13 +5782,25 @@ msgstr "སར་བར་ལས་ ནུས་མེད་ཀྱི་དོ�
 msgid "Logging in"
 msgstr "ནང་བསྐྱོད།"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "མིང་མེད།"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "འཕྲིན་དོན་གསརཔ་གཏང་ནི།"
@@ -5701,20 +5821,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "མིང་མེད།"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "ཨའི་ཨེམ་སྒོ་སྒྲིག་ཚུ།(_I)"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "མཐུད་ཡོདཔ།"
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "སར་བར་ལས་ནུས་མེད་ཀྱི་ལན།"
 
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
@@ -5722,16 +5844,23 @@ msgstr "སླར་ལོག་འབད་ཡོད་པའི་ཨང་ར
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "བདེན་མེད་ཀྱི་  སྐྱོན་མིང་ ཡང་ན་ ཆོག་ཡིག"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "མཐུད་ལམ་མཐའ་དཔྱད་འབད་དོ།"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "ཆ་རོགས་འདི་  ཁ་སླབ་གྲངས་སུ་འཛུལ་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
@@ -5743,14 +5872,6 @@ msgstr "ཡིག་སྣོད་ལས་ ཆ་རོགས་ཐོ་ཡ�
 msgid "persist command failed"
 msgstr "སུཝིཆ་བོཌི་ འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "ལག་ལེན་པའི་ཁང་མིག་ཚུ།"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "ཆ་རོགས་འདི་  ཁ་སླབ་གྲངས་སུ་འཛུལ་ནི་འཐུས་ཤོར་བྱུང་ནུག"
@@ -5763,38 +5884,16 @@ msgid "blocklist command failed"
 msgstr "སུཝིཆ་བོཌི་ འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #, fuzzy
-msgid "Invalid input condition"
-msgstr "མཐུད་ལམ་མཐའ་དཔྱད་འབད་དོ།"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "གྲལ་རིམ་གང་།"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "འཕྲིན་དོན་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
+msgid "Missing Cipher"
+msgstr "གསང་ཡིག"
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "ཨའི་ཨེམ་སྒོ་སྒྲིག་ཚུ།(_I)"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "སར་བར་ལས་ནུས་མེད་ཀྱི་ལན།"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5843,9 +5942,6 @@ msgstr "ཡིག་གཟུགས་ཀྱི་ཚད་སྦོམ་མི
 msgid "User"
 msgstr "ལག་ལེན་པ་ཚུ།"
 
-msgid "Profile"
-msgstr "གསལ་སྡུད།"
-
 #, fuzzy
 msgid "Headline"
 msgstr "བཤེད་བཟུང:(_H)"
@@ -5861,15 +5957,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "གྲོས་གླེང་ཁ་བསྡམ།"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "མིང་མེད།"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5883,6 +5974,9 @@ msgstr "%s གིས་ པང་དེབ་དཀརཔོ་ལུ་འཕ�
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "འ་ནི་བརྗོད་དོན་འདི་ལུ་སི་མའི་ལི་ཚུ་གཅིག་ཡང་ཐོབ་ཚུགསཔ་མེད།"
@@ -5891,6 +5985,14 @@ msgstr "འ་ནི་བརྗོད་དོན་འདི་ལུ་སི
 msgid "Please try another username:"
 msgstr "%s དོན་ལུ་ མིང་གསརཔ་བཙུགས་གནང་།"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "མིང་མེད།"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6087,10 +6189,6 @@ msgid "Master archive is misconfigured"
 msgstr "ཡིག་མཛོད་ཨམ་འདི་ རིམ་སྒྲིག་འཛོལ་སོ་ནུག"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "བདེན་མེད་ཀྱི་  སྐྱོན་མིང་ ཡང་ན་ ཆོག་ཡིག"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "ཁྱོད་ཀྱིས་བཙུགས་མི་ཧོསཊི་ ལག་ལེན་པའི་མིང་འདི་ ངོས་འཛིན་འབད་མ་ཚུགས།"
 
@@ -6135,9 +6233,9 @@ msgstr "ལག་ལེན་པ་འདི་ཨོཕ་ལ་ཡིན་ �
 msgid "Unknown error: 0x%X"
 msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོདཔ(%s)།"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "ལག་ལེན་པ %s འདི་བཀག་དམ་འབད་མི་ཚུགས།"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6239,9 +6337,6 @@ msgstr "སྡེ་ཚན་ལྟར་གྱི་གྲོས་ཚོགས
 msgid "Authenticating..."
 msgstr "བདེན་བཤད་འབད་དོ..."
 
-msgid "Unable to connect to server."
-msgstr "སར་བར་ལུ་མཐུད་མ་ཚུགས།"
-
 msgid "Waiting for response..."
 msgstr "ལན་གྱི་དོན་ལུ་བསྒུག་དོ..."
 
@@ -6265,24 +6360,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "ཁྱོད་ གྲོས་གླེང་གི་གྲངས་སུ་འཛུལ་ནིའི་དང་འདོད་ཡོད་ག?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"ཁྱོད་ ཕྱིར་བསྐྱོད་འབད་དེ་ཡོདཔ་ཨིན་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ཀྱིས་ལཱ་གི་ལྟེ་བ་སོ་སོ་ནང་ ནང་བསྐྱོད་འབད་ནུག"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%sའདི་ ཨོཕ་ལ་ཡིན་འབད་བྱུངམ་ཨིནམ་དང་ཁྱོད་ཀྱིས་བཏང་མི་འཕྲིན་དོན་འདི་མ་ཐོབ།"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "སར་བར་ལུ་ མཐུད་མ་ཚུགས། ཁྱོད་ཀྱིས་མཐུད་དགོ་མནོ་མི སར་བར་གྱི་ ཁ་བྱང་འདི་བཙུགས་གནང་།"
 
-msgid "Error. SSL support is not installed."
-msgstr "འཛོལ་བ། ཨེསི་ཨེསི་ཨེལ་གྱི་རྒྱབ་སྐྱོར་འདི་ གཞི་བཙུགས་འབད་མ་ཚུགས་པས།"
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "གྲོས་ཚོགས་འདི་ཁ་བསྡམས་ཚར་ཡི། ད་འབདན་འཕྲིན་དོན་ཚུ་གཏང་ནི་མེད།"
 
@@ -6306,6 +6394,25 @@ msgid "Server port"
 msgstr "སར་བར་ འདྲེན་ལམ།"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "སར་བར་ལས་ རེ་བ་མེད་པའི་ཨེཅ་ཊི་ཊི་པི་ ལན་ཐོབ་ཡོདཔ།"
+
+#. username connecting too frequently
+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 ""
+"ཁྱོད་  འཕྲལ་འཕྲལ་འབད་རང་ མཐུད་ནི་དང་མཐུད་བཏོག་སྟེ་འདུག  སྐར་མ་བཅུ་ཐམ་དེ་ཅིག་བསྒུག་ཞིན་ན་ དེ་ལས་"
+"འབད་རྩོལ་བསྐྱེད།  ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་རང་འབད་རྩོལ་བསྐྱེད་པ་ཅིན་ ཧེང་བཀལ་རང་བསྒུག་དགོ"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "མཐུད་མ་ཚུགས།"
 
@@ -6313,18 +6420,8 @@ msgstr "མཐུད་མ་ཚུགས།"
 msgid "Invalid chat room name"
 msgstr "ནུས་མེད་ཁང་མིག་གི་མིང་།"
 
-msgid "Server closed the connection."
-msgstr "སར་བར་གྱིས་ མཐུད་ལམ་ཁ་བསྡམས་ད་ནུག"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "སར་བར་དང་གཅིག་ཁར་མཐུད་ལམ་གུ་ལུ་ ནུས་མེད་གནས་སྡུད་ཐོབ་ཡོདཔ།"
 
 #. *< type
@@ -6375,7 +6472,8 @@ msgstr "ཐག་རིང་གི་ལག་ལེན་པ་:<br>%s དང�
 msgid "Received invalid data on connection with remote user."
 msgstr "ཐག་རིང་གི་ལག་ལེན་པ་དང་གཅིག་ཁར་ མཐུད་ལམ་གུ་ལུ་ ནུས་མེད་གནས་སྡུད་གཅིག་ཐོབ་ཅི།"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "ཐག་རིང་གི་ལག་ལེན་པ་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགསཔ།"
 
 msgid "Direct IM established"
@@ -6550,23 +6648,18 @@ msgstr "པར་ཆས།"
 msgid "Screen Sharing"
 msgstr "གསལ་གཞི་མིང་།"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "ཁ་སླབ་ནི་ དལཝ་ཨིན།"
 
-#, c-format
 msgid "Not Available"
 msgstr "ཐོབ་མི་ཚུགས།"
 
-#, c-format
 msgid "Occupied"
 msgstr "དལ་ཁོམས་མེདཔ།"
 
-#, c-format
 msgid "Web Aware"
 msgstr "ཝེབ་ དྲན་ཤེས་ཅན།"
 
-#, c-format
 msgid "Invisible"
 msgstr "མ་མཐོངམ།"
 
@@ -6579,21 +6672,15 @@ msgstr "ཉེན་བརྡའི་གནས་རིམ།"
 msgid "Buddy Comment"
 msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད།"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "བདེན་བཤད་སར་བར་ལུ་ མཐུད་མ་ཚུགས།:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"བི་ཨོ་ཨེསི་ སར་བར་ལུ་ མཐུད་མ་ཚུགས།:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "སར་བར་ལུ་མཐུད་མ་ཚུགས།"
 
 #, fuzzy
 msgid "Username sent"
@@ -6608,51 +6695,61 @@ msgstr "མཐུད་ལམ་མཐའ་དཔྱད་འབད་དོ།
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "ནང་བསྐྱོད་འབད་མ་ཚུགས: %sབཟུམ་སྦེ་ ནང་ན་འཛུལ་མ་ཚུགས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ གསལ་གཞི་མིང་འདི་ ནུས་"
 "མེད་ཨིན་པས། གསལ་གཞི་མིང་ཚུ་ ཡི་གུ་ལས་འགོ་བཙུགས་ནི་དང་ ནང་ན་ཡི་གུ་དང་  ཨང་གྲངས་དེ་ལས་ བར་སྟོང་"
 "ཚུ་རྐྱངམ་ཅིག་ཚུད་དགོཔ་དང་  ཡང་ན་ ཨང་གྲངས་ཚུ་རྐྱངམ་ཅིག་ཚུད་དགོཔ་ཨིན།"
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "ནུས་མེད་ ལག་ལེན་པའི་མིང་།"
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "ཁྱོད་ དུམ་གྲ་ཅིག་མཐུད་ལམ་བཏོག་ནི་འོང་། དུས་མཐུན་བཟོ་ནིའི་ཚུའི་དོན་ལུ་ %s ཞིབ་དཔྱད་འབད།"
 
-msgid "Incorrect password."
-msgstr "བདེན་མེད་ཀྱི་ཆོག་ཡིག"
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "གཱེམ་གྱིས་ ནུས་ཅན་གྱི་ཨེ་ཨའི་ཨེམ་ ནང་བསྐྱོད་དྲྭ་རྟགས་ཐོབ་མ་ཚུགས་པས།"
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "གཱེམ་གྱིས་ ནུས་ཅན་གྱི་དྲྭ་རྟགས་མ་ཐོབ་པས།"
+
+msgid "Received authorization"
+msgstr "དབང་སྤྲོད་ཐོབ་ཡོདཔ།"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "ལག་ལེན་པ་མེད།"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "ཁྱོད་ཀྱི་ རྩིས་ཐོ་འདི་ ད་ལྟོ་རང་བཀག་ད་ནུག"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "ཨེ་ཨོ་ཨེལ་ འཕྲལ་མྱུར་ འཕྲིན་སྐྱེལ་པའི་ཞབས་ཏོག་འདི་ གནས་སྐབས་ཅིག་ ཐོབ་མི་ཚུགས།"
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"ཁྱོད་  འཕྲལ་འཕྲལ་འབད་རང་ མཐུད་ནི་དང་མཐུད་བཏོག་སྟེ་འདུག  སྐར་མ་བཅུ་ཐམ་དེ་ཅིག་བསྒུག་ཞིན་ན་ དེ་ལས་"
-"འབད་རྩོལ་བསྐྱེད།  ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་རང་འབད་རྩོལ་བསྐྱེད་པ་ཅིན་ ཧེང་བཀལ་རང་བསྒུག་དགོ"
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "ཁྱོད་ཀྱིས་ལག་ལེན་འཐབ་མི་ཞབས་ཏོག་སྤྱོད་མིའི་ཐོན་རིམ་འདི་ རྙིང་དྲགས་པས།    %s ལུ་ཡར་བསྐྱེད་འབད་གནང་།"
 
-msgid "Could Not Connect"
-msgstr "མཐུད་མ་ཚུགས།"
-
-msgid "Received authorization"
-msgstr "དབང་སྤྲོད་ཐོབ་ཡོདཔ།"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"ཁྱོད་  འཕྲལ་འཕྲལ་འབད་རང་ མཐུད་ནི་དང་མཐུད་བཏོག་སྟེ་འདུག  སྐར་མ་བཅུ་ཐམ་དེ་ཅིག་བསྒུག་ཞིན་ན་ དེ་ལས་"
+"འབད་རྩོལ་བསྐྱེད།  ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་རང་འབད་རྩོལ་བསྐྱེད་པ་ཅིན་ ཧེང་བཀལ་རང་བསྒུག་དགོ"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
 
 msgid "Enter SecurID"
@@ -6668,26 +6765,6 @@ msgstr "ཌི་ཇི་ཊཱལ་བཀྲམ་སྟོན་ནང་ལ
 msgid "_OK"
 msgstr "བཏུབ།"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"ཡང་ཅིན་  ཁྱོད་ཀྱིས་དུམ་གྲ་ཅིག་ལས་མཐུད་བཏོག་འོང་།  འདི་གཏན་གཏན་མ་བཟོ་ཚུན་ ཁྱོད་ཀྱིས ཊི་ཨོ་སི འདི་ལག་"
-"ལེན་འཐབ་དགོཔ་འོང་།དུས་མཐུན་ཚུ་བཟོ་ནིའི་དོན་ལུ %sཞིབ་དཔྱད་འབད།"
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "གཱེམ་གྱིས་ ནུས་ཅན་གྱི་ཨེ་ཨའི་ཨེམ་ ནང་བསྐྱོད་དྲྭ་རྟགས་ཐོབ་མ་ཚུགས་པས།"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "ཁྱོད་ དུམ་གྲ་ཅིག་མཐུད་ལམ་བཏོག་ནི་འོང་། དུས་མཐུན་བཟོ་ནིའི་ཚུའི་དོན་ལུ་ %s ཞིབ་དཔྱད་འབད།"
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "གཱེམ་གྱིས་ ནུས་ཅན་གྱི་དྲྭ་རྟགས་མ་ཐོབ་པས།"
-
 msgid "Password sent"
 msgstr "ཆོག་ཡིག་བཏང་ཡི།"
 
@@ -6831,7 +6908,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན་གྱི་དོན་ལུ་ %hu འཕྲིན་དོན་འདི་%sལས་ བྱིག་ཡར་སོ་ནུག  "
 msgstr[1] "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན་གྱི་དོན་ལུ  ཁྱོད་ཀྱིས%huའཕྲིན་དོན་ཚུ %sལས བྱིག་ཡར་སོ་ནུག "
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "འཕྲིན་དོན%sའདི་གཏང་མ་ཚུགས།"
@@ -6853,6 +6930,12 @@ msgstr "ལས་ཚུར་ གློག་ཐོག"
 msgid "Member Since"
 msgstr "ལས་ཚུར་ འཐུས་མི།"
 
+msgid "Capabilities"
+msgstr "ལྕོགས་གྲུབ།"
+
+msgid "Profile"
+msgstr "གསལ་སྡུད།"
+
 msgid "Your AIM connection may be lost."
 msgstr "ཁྱོད་ཀྱི་ ཨེ་ཨའི་ཨེམ་ མཐུད་ལམ་འདི་བརླག་གཏོར་ཞུགས་ཞུགསཔ་འོང་།"
 
@@ -7028,7 +7111,7 @@ msgstr "ཕྱི་ཁའི་འཕྲིན་དོན་འདི་རི
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7055,9 +7138,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "དྭ་ཕྲུག་ཚུ།"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "ཆ་རོགས་ %sའདི ཁ་སྐོང་རྐྱབས་མི་ཚུགས་པས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ཀྱི་ཆ་རོགས་ཐོ་ཡིག་ནང་ ཆ་རོགས་ཀྱི་"
@@ -7067,7 +7150,7 @@ msgid "(no name)"
 msgstr "(མིང་མེད)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "རྒྱུ་མཚན་མ་ཤེསཔ་ལས་བརྟེན་ ཁྱོད་ཀྱི་བརྡ་བཀོད་འདི་འཐུས་ཤོར་བྱུང་ནུག"
 
 #, fuzzy, c-format
@@ -7141,6 +7224,7 @@ msgstr "མཐུད།"
 msgid "Get AIM Info"
 msgstr "ཨེ་ཨའི་ཨེམ་ བརྡ་དོན་ལེན།"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད་ཞུན་དག་འབད།"
 
@@ -7204,6 +7288,7 @@ msgstr "འཚོལ་ཞིབ།"
 msgid "Set User Info (web)..."
 msgstr "ལག་ལེན་པའི་བརྡ་དོན་གཞི་སྒྲིག་འབད(ཡུ་ཨར་ཨེལ)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "ཆོག་ཡིག་བསྒྱུར་བཅོས་རྐྱབས(ཡུ་ཨར་ཨེལ)"
@@ -7236,6 +7321,10 @@ msgid "Search for Buddy by Information"
 msgstr "བརྡ་དོན་གྱི་ཐོག་ལས་ ཆ་རོགས་ཀྱི་དོན་ལུ་ འཚོལ་ཞིབ་འབད།"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "ལག་ལེན་པ་འདི་ནང་བསྐྱོད་མ་འབད་བས།"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7255,7 +7344,6 @@ msgstr "ཨའི་ཨེམ་ཐད་ཀར་གྱི་དོན་ལུ
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s:%hu ལུ་མཐུད་ནི་དཔའ་བཅམ་དོ།"
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "པོརོ་སི་སར་བར་བརྒྱུད་དེ་ མཐུད་ནི་དཔའ་བཅམ་དོ།"
 
@@ -7351,7 +7439,7 @@ msgstr "གཞན།"
 msgid "Visible"
 msgstr "མ་མཐོངམ།"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7441,16 +7529,48 @@ msgstr "དུས་མཐུན་བཟོ།"
 msgid "Could not change buddy information."
 msgstr "བ་ཌི་བརྡ་བཀོད་བཙུགས་གནང་།"
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "འགྲུལ་འཕྲིན། "
+
+msgid "Note"
+msgstr "དྲན་ཐོ།"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "ཆ་རོགས་ཀྱི་ངོས་དཔར།"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "ཆ་རོགས་ཁ་སྐོང་རྐྱབས།"
+msgid "_Modify"
+msgstr "ལེགས་བཅོས་འབད།"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "ལེགས་བཅོས་འབད།"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "སར་བར་ཁོམ་མེད།"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "དབང་སྤྲོད་དགོས་མཁོ་བས།"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "ཁྱོད་རའི་ཐོ་ཡིག་ནང་ཆ་རོགས་ཁ་སྐོང་རྐྱབསན?"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Enter answer here"
 msgstr "ཞུ་བ་འདི་ནཱ་ལུ་ནང་འདེབས་འབད།"
 
 msgid "Send"
@@ -7465,18 +7585,19 @@ msgid "Authorization denied message:"
 msgstr "དབང་སྤྲོད་ཉན་མ་བཏུབ་པའི་འཕྲིན་དོན:"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "དགོངསམ་མ་འཁྲིལ་ ཁྱོད་ངིའི་གདམ་ཁ་བཟུམ་མེད་པས།..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "ལག་ལེན་པ་ %d གིས་ བདེན་བཤད་དགོཔ་ཨིན།"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "ཁྱོད་རའི་ཐོ་ཡིག་ནང་ཆ་རོགས་ཁ་སྐོང་རྐྱབསན?"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "ཞུ་བ་འདི་ནཱ་ལུ་ནང་འདེབས་འབད།"
 
 msgid "Would you be my friend?"
@@ -7499,7 +7620,7 @@ msgid "Failed sending authorize"
 msgstr "ང་ལུ་དབང་སྤྲོད་འབད་གནང་!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "ཆ་རོགས་འདི་  ཁ་སླབ་གྲངས་སུ་འཛུལ་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
 #, fuzzy, c-format
@@ -7544,6 +7665,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr "ཁྱོད་ཀྱིས་ རྟག་བརྟན་ཀིའུ་ཀིའུ་སྡེ་ཚན་རྐྱངམ་ཅིག་འཚོལ་ཞིབ་འབད་ཚུགསཔ་ཨིན།\n"
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "ནུས་མེད་ཀྱི་ པོ་རོགསི་ གཞི་སྒྲིག་ཚུ།"
+
+#, fuzzy
 msgid "Not member"
 msgstr "ང་འཐུས་མི་མེན།"
 
@@ -7586,16 +7711,19 @@ msgstr "འ་ནི་སྡེ་ཚན་གྱིས་ གཞན་མི�
 msgid "Join QQ Qun"
 msgstr "ཁ་སླབ་གྲངས་སུ་འཛུལ།"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "ཞུ་བ་འདི་ནཱ་ལུ་ནང་འདེབས་འབད།"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "ཁྱོད་ཀྱིས་ ཀིའུན་འཐུས་མི་མཐར་འཁྱོལ་སྦེ་ལེགས་བཅོས་འབད་དགོས།"
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "ཁྱོད་ཀྱིས་ ཀིའུན་འཐུས་མི་མཐར་འཁྱོལ་སྦེ་ལེགས་བཅོས་འབད་དགོས།"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7605,7 +7733,7 @@ msgstr "ཀིའུ་ཀིའུ་ཀིའུན་ བཀོལ་སྤ�
 msgid "Failed:"
 msgstr "འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7620,11 +7748,11 @@ msgstr ""
 "འ་ནི་བཀོལ་སྤྱོད་མཇུག་ལུ་ འ་ནི་ཀིའུན་འདི་རྩ་བསྐྲད་གཏངམ་ཨིན།"
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "དགོངསམ་མ་འཁྲིལ་ ཁྱོད་ངིའི་གདམ་ཁ་བཟུམ་མེད་པས།..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "ཁྱོད་ཀྱིས་ ཀིའུན་འཐུས་མི་མཐར་འཁྱོལ་སྦེ་ལེགས་བཅོས་འབད་དགོས།"
 
 #, fuzzy
@@ -7635,35 +7763,35 @@ msgid "You have successfully created a Qun"
 msgstr "ཁྱོད་ཀྱིས་ ཀིའུན་གཅིག་མཐར་འཁྱོལ་སྦེ་གསར་བསྐྲུན་འབད་ཡོདཔ་ཨིན།"
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "ད་འབདན་ཁྱོད་ཀྱིས་ ཀིའུན་རྒྱས་བཤད་ཚུ་གཞི་སྒྲིག་འབད་ནི་ཨིན་ན?"
 
 msgid "Setup"
 msgstr "གཞི་སྒྲིག"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "ལག་ལེན་ %d གིས་ སྡེ་ཚན་ %d ནང་མཐུད་ནིའི་དོན་ལུ་འཇུག་སྤྱོད་འབད་ཡོདཔ།"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "ལག་ལེན་ %d གིས་ སྡེ་ཚན་ %d ནང་མཐུད་ནིའི་དོན་ལུ་འཇུག་སྤྱོད་འབད་ཡོདཔ།"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "ཆ་རོགས་འདི་  ཁ་སླབ་གྲངས་སུ་འཛུལ་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "ཆ་རོགས་རྩ་བསྐྲད་གཏང་།"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "ཆ་རོགས་རྩ་བསྐྲད་གཏང་།"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7782,6 +7910,13 @@ msgstr "<b>ཧེ་མའི་ཡང་སེལ།</b>: %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>ད་ལྟོའི་གློག་ཐོག</b>: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>ཕྱིའི་ལག་ལེན་པ།</b><br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7789,7 +7924,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "གཱེམ་གྱི་སྐོར་ལས"
 
 #, fuzzy
@@ -7810,6 +7945,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "གཱེམ་གྱི་སྐོར་ལས"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "ཁྱིམ་ནང་གི་ཁ་བྱང་།"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7841,7 +7980,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "མཐུད་དོ།"
@@ -7854,6 +7992,9 @@ msgstr "གདམ་ཁ་ཉུང་སུ་ཅིག་སྟོན།"
 msgid "Show server news"
 msgstr "གདམ་ཁ་ཉུང་སུ་ཅིག་སྟོན།"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "འཛོལ་བ་ལྷག་དོ།"
@@ -7863,11 +8004,7 @@ msgid "Update interval (seconds)"
 msgstr "འཛོལ་བ་ལྷག་དོ།"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "སལ་བར་ བརྡ་དོན་ཐོབ་མི་ཚུགས།"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "སལ་བར་ བརྡ་དོན་ཐོབ་མི་ཚུགས།"
 
 #, c-format
@@ -7890,21 +8027,19 @@ msgid "Activation required"
 msgstr "ཐོ་བཀོད་དགོཔ།"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "འཛོལ་བ་ལྷག་དོ།"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "ཌའི་ལོག་ཞུ།"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "ཡ་ཧུ་ འཐུས་ཤོར་བྱུང་ཡོདཔ! བདེན་བཤད།"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7914,7 +8049,7 @@ msgstr "གཟུགས་བརྙན་སྲུང་བཞག་འབད།
 msgid "Enter code"
 msgstr "ཆོག་ཡིག་བཙུགས།"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7922,67 +8057,42 @@ msgid "Enter the text from the image"
 msgstr "སྡེ་ཚན་གྱི་མིང་བཙུགས།"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "མཐུད་མི་ཚུགས།"
-
 msgid "Socket error"
 msgstr "སོ་ཀེཊི་འཛོལ་བ།"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "སོ་ཀེཊི་ལས་ ལྷག་མ་ཚུགས།"
-
-msgid "Write Error"
-msgstr "འཛོལ་བ་འབྲི།"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "ལག་ལེན་པའི་བརྡ་དོན་གཞི་སྒྲིག་འབད..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "ཞུ་བ་ངོས་ལེན་འབད་མ་བཏུབ་པས།"
 
-msgid "Couldn't resolve host"
-msgstr "ཧོསཊི་མོས་མཐུན་འབད་མ་ཚུགས།"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "སར་བར་ པིང་འབད་མ་ཚུགས།"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "ནུས་མེག་ ལག་ལེན་པའི་མིང་ ཡང་ན་ ལམ་ཡིག"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "སར་བར་ལུ་མཐུད།"
+msgid "Connecting to server"
+msgstr "ཨེསི་ཨའི་ཨེལ་སི་ སར་བར་ལུ་ མཐུད་དོ།"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "ཀིའུ་ཀིའུ་ཨའི་ཌི་ འཛོལ་བ།"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "མིང་: %s ཐོབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7992,6 +8102,10 @@ msgid ""
 msgstr "ཨའི་སི་ཀིའུ་ སར་བར་ བརྒྱུད་སྤྲོད།"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "ལས།"
 
@@ -8001,32 +8115,30 @@ msgid ""
 "%s"
 msgstr "སར་བར་བསླབ་སྟོན་ཚུ།: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "མ་ཤེས་པའི་རྒྱུ་མཚན།"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "བརྡ་བཀོད།"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "སལ་བར་ བརྡ་དོན་ཐོབ་མི་ཚུགས།"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "མ་ཤེས་པའི་རྒྱུ་མཚན།"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "མ་ཤེས་པའི་རྒྱུ་མཚན།"
 
 #, c-format
@@ -8040,9 +8152,6 @@ msgstr "ཡིག་སྣོད་གཏང་།"
 msgid "%d canceled the transfer of %s"
 msgstr "%d གིས་ %s གི་ གནས་སོར་འདི་ཆ་མེད་བཏང་ཡོདཔ།"
 
-msgid "Connection closed (writing)"
-msgstr "མཐུད་ལམ་ཁ་མ་བསྡམ་ཡོདཔ་(རྩོམ་སྒྲིག)།"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>སྡེ་ཚན་མགོ་མིང་།:</b> %s<br>"
@@ -8096,17 +8205,6 @@ msgstr "དུས་ཚོད་གཅིག་པའི་བདག་སྐྱ
 msgid "Sametime Administrator Announcement"
 msgstr "དུས་ཚོད་གཅིག་པའི་བདག་སྐྱོང་པ་ཁྱབ་བསྒྲགས།"
 
-msgid "Connection reset"
-msgstr "མཐུད་ལམ་སླར་སྒྲིག"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "སོ་ཀེཊི་ %s ལས་ལྷག་པའི་འཛོལ་བ།:"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr " %s ལས་ཁྱབ་བསྒྲགས།"
@@ -8129,6 +8227,9 @@ msgstr "གསལ་བཤདཔ་ཚུ།"
 msgid "Video Camera"
 msgstr "ཝི་ཌིའོ་ པར་ཆས།"
 
+msgid "File Transfer"
+msgstr "ཡིག་སྣོད་གནས་སོར།"
+
 #, fuzzy
 msgid "Supports"
 msgstr "རྒྱབ་སྐྱོར།"
@@ -8855,9 +8956,6 @@ msgstr "ཚོགས་སྡེ།"
 msgid "Unit"
 msgstr "ཆ་ཕྲན།"
 
-msgid "Note"
-msgstr "དྲན་ཐོ།"
-
 msgid "Join Chat"
 msgstr "ཁ་སླབ་གྲངས་སུ་འཛུལ།"
 
@@ -8958,6 +9056,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ཡོངས་འབྲེལ་ཚད་རྩིས་ཚུ།"
 
+msgid "Ping"
+msgstr "པིང་།"
+
 msgid "Ping failed"
 msgstr "པིང་ འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
@@ -9022,7 +9123,8 @@ msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་མི་
 msgid "Disconnected by server"
 msgstr "སར་བར་གྱིས་ མཐུད་ལམ་བཏོག་དའི།"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་ལུ་  མཐུད་པའི་སྐབས་ལུ འཛོལ་བ།"
 
 msgid "Key Exchange failed"
@@ -9034,27 +9136,26 @@ msgstr ""
 "བསྐྱར་ལོག་གི་ལཱ་ཡུན་ཁ་འཕྱལ་འཕྱལཝ་ཚུ་འཐུས་ཤོར་བྱུང་ནུག  སླར་མཐུད་གཡེབ་སྟེ མཐུད་ལམ་གསརཔ་གསར་བསྐྲུན་"
 "འབད།"
 
-msgid "Connection failed"
-msgstr "མཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
 msgid "Performing key exchange"
 msgstr "ལྡེ་མིག་བརྗེ་སོར་གྱི་ལག་ལེན་འཐབ་དོ།"
 
-msgid "Unable to create connection"
-msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ།"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་ ལྡེ་མིག་ཟུང་: %s འདི་མངོན་གསལ་འབད་མ་ཚུགས།"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་ སར་བར་ལུ་ མཐུད་དོ།"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "ཨེསི་ཨའི་ཨེལ་སི་ ལྡེ་མིག་ཟུང་: %s འདི་མངོན་གསལ་འབད་མ་ཚུགས།"
+
 msgid "Out of memory"
 msgstr "དྲན་ཚད་མེདཔ།"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་ གནད་སྤེལ་ལམ་ལུགས་འགོ་འབྱེད་འབད་མི་ཚུགས།"
 
 #, fuzzy
@@ -9348,7 +9449,7 @@ msgid "Creating SILC key pair..."
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་  ལྡེ་མིག་ཟུང་ བཟོ་བསྐྲུན་འབད་དོ..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་  ལྡེ་མིག་ཟུང་ བཟོ་བསྐྲུན་འབད་དོ..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9444,6 +9545,9 @@ msgstr "པང་དེབ་དཀརཔོ།"
 msgid "No server statistics available"
 msgstr "སར་བར་ ཚད་རྩིས་ཚུ་མི་ཐོབ།"
 
+msgid "Error during connecting to SILC Server"
+msgstr "ཨེསི་ཨའི་ཨེལ་སི་ལུ་  མཐུད་པའི་སྐབས་ལུ འཛོལ་བ།"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "འཐུས་ཤོར:ཐོན་རིམ་མི་མཐུན་པས་  ཁྱོད་རའི་ ཞབས་ཏོག་སྤྱོད་མི་ཡར་བསྐྱེད་འབད།"
@@ -9484,37 +9588,37 @@ msgstr "འཐུས་ཤོར:ནུས་མེད་ཀྱི་ཀཱུ�
 msgid "Failure: Authentication failed"
 msgstr "འཐུས་ཤོར:བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་  ཞབས་ཏོད་སྤྱོད་མི་ མཐུད་ལམ་འདི་ འགོ་བྱེད་འབད་མི་ཚུགས་པས།"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "མིང་མེད།"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་ ལྡེ་མིག་ཟུང་: %s འདི་མངོན་གསལ་འབད་མ་ཚུགས།"
 
-msgid "Could not write"
-msgstr "འབྲི་མ་ཚུགས།"
-
-msgid "Could not connect"
-msgstr "མཐུད་མ་ཚུགས།"
+msgid "Unable to create connection"
+msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ།"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན།"
 
-msgid "Could not create listen socket"
-msgstr "ཉན་སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགས།"
-
-msgid "Could not resolve hostname"
-msgstr "ཧོསཊི་མིང་མོས་མཐུན་འབད་མ་ཚུགས།"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "སོ་ཀེཊི་བཟོ་བསྐྲུན་འབད་མི་ཚུགས་པས།"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "ཨེསི་ཨའི་པི་ལག་ལེན་པའི་མིང་ཚུ་ནང་ན་བར་སྟོང་དཀརཔོ་ཡང་ན་ @བརྡ་མཚོན་ཚུ་ཤོམ་ཏེ་མེདཔ་འོང་།"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "གདམ་ཁ་ཉུང་སུ་ཅིག་སྟོན།"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9548,179 +9652,63 @@ msgstr "ལག་ལེན་པ་བདེན་ཅན།"
 msgid "Auth Domain"
 msgstr "བདེན་ཅན་ཌོ་མེན།"
 
-#, c-format
-msgid "Looking up %s"
-msgstr " %sལུ བལྟ་དོ།"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s ལུ་མཐུད་ནི་ འཐུས་ཤོར་བྱུང་ནུག"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "ནང་ན་འཛུལ: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "ཡིག་སྣོད%sའདི་བྲིས་མ་ཚུགས།"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "ཡིག་སྣོད%sའདི་ ལྷག་མ་ཚུགས།"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "འཕྲིན་དོན་རིང་དྲགས་པས་ མཇུག་གི%sབཱའིཊིསི་འདི་ཆུང་ཀུ་བཟོ་ནུག"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s འདི་ད་ལྟོ་ ནང་བསྐྱོད་མ་འབད།"
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr " %s ཉེན་བརྡ་འབད་ནི་འདི་ མི་ཆོགཔ་ཨིན།"
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "འཕྲིན་དོན་འདི་ ས་ཁར་འབུད་ནུག  ཁྱོད་ཀྱིས སལ་བར་གྱི་མགྱོགས་ཚད་འདི་ཚད་ལས་བརྒལ་བཅུག་དེས།"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%sནང་ ཁ་སླབ་ནི་ཐོབ་མི་ཚུགས།"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "ཁྱོད་ཀྱིས་ %s ལུ་ འཕྲིན་དོན་ཚུ་གནམ་མེད་ས་མེད་མགྱོགས་པར་གཏང་དེས།"
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "ཁྱོད་ཀྱིས་ %s ལས་ ཨའི་ཨེམ བྱིག་ཡར་སོ་ནུག ག་ཅི་འབད་ཟེར་བ་ཅིན་ འདི་སྦོམ་དྲགས་པས།"
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"ཁྱོད་ཀྱིས་ %s ལས་ ཨའི་ཨེམ་ བྱིག་ཡར་སོ་ནུག  ག་ཅི་འབད་ཟེར་བ་ཅིན་ འདི་གནམ་མེད་ས་མེད་མགྱོགས་པར་བཏང་"
-"ནུག"
-
-#, c-format
-msgid "Failure."
-msgstr "འཐུས་ཤོར།"
-
-#, c-format
-msgid "Too many matches."
-msgstr "མཐུན་སྒྲིག་ཚུ་མང་དྲགས་པས།"
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "ཁྱད་ཆོས་ཚང་མི་ལེ་ཤཱ་རང་དགོ་པས།"
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Dir ཞབས་ཏོག་འདི་གནས་སྐབས་ཅིག་ཐོབ་མི་ཚུགས།"
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "གློག་འཕྲིན་བལྟ་ནི་བཀག་དམ་འབད་ཡོདཔ།"
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "གཙོ་ཚིག་སྣང་མེད་སྦེ་བཞག་ནུག"
-
-#, c-format
-msgid "No keywords."
-msgstr "གཙོ་ཚིག་ཚུ་མེད།"
-
-#, c-format
-msgid "User has no directory information."
-msgstr "ལག་ལེན་པ་ལུ་ སྣོད་ཐོའི་བརྡ་དོན་མིན་འདུག"
-
-#, c-format
-msgid "Country not supported."
-msgstr "རྒྱལ་ཁབ་ རྒྱབ་སྐྱོར་མ་འབད་བས།"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "འཐུས་ཤོར་ངོ་མ་ཤེས: %s"
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "བདེན་མེད་ཀྱི་  སྐྱོན་མིང་ ཡང་ན་ ཆོག་ཡིག"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "ཞབས་ཏོག་འདི་གནས་སྐབས་ཅིག་ཐོབ་མི་ཚུགས།"
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "ནང་བསྐྱོད་འབད་ནིའི་དོན་ལུ་ ཁྱོད་ཀྱི་ཉེན་བརྡའི་གནས་རིམ་འདི་མཐོ་དྲགས་པས།"
-
-#, c-format
-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 ""
-"ཁྱོད་ འཕྲལ་འཕྲལ་རང་ མཐུད་ནི་ནང་ དེ་ལས་མཐུད་བཏོག་སྟེ་ཡོད། སྐར་མ་བཅུ་ཐམ་དེ་ཅིག་བསྒུག་ཞིན་ན་ དོ་རུང་"
-"འབད་རྩོལ་བསྐྱེད། ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་རང་འབད་རྩོལ་བསྐྱེད་པ་ཅིན་ ཧེང་བཀལ་རང་བསྒུག་དགོ"
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "ངོ་མ་ཤེསཔ་ནང་ན་འཛུལཝ་ད་ འཛོལ་བ་བྱུང་ནུག: %s"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "གྲངས་སུ་འཛུལ་ &lt;ཁང་མིག&gt;: ཡ་ཧུ་  ཡོངས་འབྲེལ་གུ་ལུ ཁ་སླབ་ཁང་མིག་ནང་འཛུལ།"
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ %d བྱུང་ནུག  བརྡ་དོན: %s"
+msgid "list: List rooms on the Yahoo network"
+msgstr "ཐོ་ཡིག: ཡ་ཧུ་ཡོངས་འབྲེལ་གུ་ལུ་ ཁང་མིག་ཚུ་ཐོ་བཀོད་འབད།"
 
-msgid "Invalid Groupname"
-msgstr "ནུས་མེད་སྡེ་ཚན།"
+msgid "doodle: Request user to start a Doodle session"
+msgstr "ཌུ་ཌཱལ་: ཌུ་ཌཱལ་ལཱ་ཡུན་འགོ་བཙུགས་ནིའི་དོན་ལུ་ ལག་ལེན་པ་ཞུ་བ་འབད།"
 
-msgid "Connection Closed"
-msgstr "མཐུད་ལམ་ཁ་མ་བསྡམ།"
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ཡ་ཧུ!ཨའི་ཌི།"
 
-msgid "Waiting for reply..."
-msgstr "ལན་ལུ་བསྒུག་དོ..."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "ཡ་ཧུ་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "ཊི་ཨོ་སི་ འདི་གིས་ ཐེམལས་ ལོག་འོང་ནུག  ད་འབདན་ཁྱོད་རང་འཕྲིན་དོན་ཚུ་  དོ་རུང་གཏང་།"
+msgid "Pager server"
+msgstr "བརྡ་འཕྲུལ་སར་བར།"
 
-msgid "Password Change Successful"
-msgstr "ཆོག་ཡིག་ བསྒྱུར་བཅོས་ མཐར་འཁྱོལ་ནུག"
+msgid "Pager port"
+msgstr "བརྡ་འཕྲུལ་ འདྲེན་ལམ།"
 
-msgid "_Group:"
-msgstr "སྡེ་ཚན:(_G)"
+msgid "File transfer server"
+msgstr "ཡིག་སྣོད་གནས་སོར་ སར་བར།"
 
-msgid "Get Dir Info"
-msgstr "Dir བརྡ་དོན་ལེན།"
+msgid "File transfer port"
+msgstr "ཡིག་སྣོད་གནས་སོར་འདྲེན་ལམ།"
 
-msgid "Set Dir Info"
-msgstr "Dir བརྡ་དོན་གཞི་སྒྲིག་འབད།"
+msgid "Chat room locale"
+msgstr "ཁ་སླབ་ཁང་མིག་ ལོ་ཀེལ།"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "བྲིས་ནིའི་དོན་ལུ %s ཁ་ཕྱེ་མ་ཚུགས།"
+msgid "Ignore conference and chatroom invitations"
+msgstr "གྲོས་ཚོགས་དང་ ཁ་སླབ་ཁང་མིག་མགྲོན་བརྡ་ཚུ་སྣང་མེད་སྦེ་བཞག"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "ཡིག་སྣོད་གནས་སོར་འཐུས་ཤོར་བྱུང་ནུག ཕྱོགས་གཞན་མི་འདི་ཆ་མེད་བཏང་ཡི།"
+msgid "Chat room list URL"
+msgstr "ཁ་སླབ་ཁང་མིག་ ཐོ་ཡིག་ ཡུ་ཨར་ཨེལ།"
 
-msgid "Could not connect for transfer."
-msgstr "གནས་སོར་གྱི་དོན་ལུ་ མཐུད་མ་ཚུགས།"
+msgid "Yahoo Chat server"
+msgstr "ཡ་ཧུ་ ཁ་སླབ་སར་བར།"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "ཡིག་སྣོད་ཀྱི་མགོ་ཡིག་བྲིས་མ་ཚུགས། ཡིག་སྣོད་འདི་གནས་སོར་མི་གཏང་།"
+msgid "Yahoo Chat port"
+msgstr "ཡ་ཧུ་ ཁ་སླབ་འདྲེན་ལམ།"
 
 #, fuzzy
-msgid "Save As..."
-msgstr " བཟུམ་སྦེ་སྲུང་བཞག་འབད།"
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s གིས %s ལུ %dཡིག་སྣོད་དང་ལེན་འབད་ནི་འབད  ཞུ་བ་འབདཝ་ཨིན: %s (%.2f %s)%s%s"
-msgstr[1] ""
-"%s  གིས %s ལུ %d ཡིག་སྣོད་ཚུ་ དང་ལེན་འབད་ནི་འབད་  ཞུ་བ་འབདཝ་ཨིན: %s (%.2f %s)%s%s"
-
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s གིས་ ཁྱོད་ལུ་ ཁོང་ཚུ་ལུ་ཡི་གུ་གཏང་ནིའི་ཞུ་བ་འབདཝ་ཨིན།"
+msgid "Yahoo JAPAN ID..."
+msgstr "ཡ་ཧུ!ཨའི་ཌི།"
 
 #. *< type
 #. *< ui_requirement
@@ -9732,11 +9720,11 @@ msgstr "%s གིས་ ཁྱོད་ལུ་ ཁོང་ཚུ་ལུ་�
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "ཊི་ཨོ་སི་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "ཡ་ཧུ་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9761,6 +9749,34 @@ msgstr "%s གིས་ ཁོང་ཚུ་ཁྱོད་ཀྱི་ཐོ�
 msgid "Add buddy rejected"
 msgstr "དང་ལེན་སྤང་བའི་ཆ་རོགས་ཁ་སྐོང་འབད།"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "སར་བར་དང་གཅིག་ཁར་མཐུད་ལམ་གུ་ལུ་ ནུས་མེད་གནས་སྡུད་ཐོབ་ཡོདཔ།"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"ངོ་མ་ཤེས་པའི་ འཛོལ་བའི་ ཨང་གྲངས %d ། ཡ་ཧུ! ཝེབ་ས་ཁོངས་ནང་ དྲན་དེབ་བཀོད་མི་འདི་གིས་ དཀའ་ངལ་"
+"སེལ་ཚུགསཔ་འོང་།"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"ངོ་མ་ཤེས་པའི་ འཛོལ་བའི་ ཨང་གྲངས %d ། ཡ་ཧུ! ཝེབ་ས་ཁོངས་ནང་ དྲན་དེབ་བཀོད་མི་འདི་གིས་ དཀའ་ངལ་"
+"སེལ་ཚུགསཔ་འོང་།"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "བདེན་མེད་ཀྱི་  སྐྱོན་མིང་ ཡང་ན་ ཆོག་ཡིག"
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9794,35 +9810,30 @@ msgstr ""
 "ངོ་མ་ཤེས་པའི་ འཛོལ་བའི་ ཨང་གྲངས %d ། ཡ་ཧུ! ཝེབ་ས་ཁོངས་ནང་ དྲན་དེབ་བཀོད་མི་འདི་གིས་ དཀའ་ངལ་"
 "སེལ་ཚུགསཔ་འོང་།"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "ཆ་རོགས་ %s འདི་ སྡེ་ཚན་ %s སར་བར་ཐོ་ཡིག་ལུ་  རྩིས་ཐོ་  %s གུ་ ཁ་སྐོང་འབད་མ་ཚུགས།"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "སར་བར་ཐོ་ཡིག་ནང་ཆ་རོགས་ཁ་སྐོང་འབད་མ་ཚུགས།"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "སར་བར་ལས་ རེ་བ་མེད་པའི་ཨེཅ་ཊི་ཊི་པི་ ལན་ཐོབ་ཡོདཔ།"
 
-msgid "Connection problem"
-msgstr "མཐུད་ལམ་ དཀའ་ངལ།"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག:\n"
 "%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
 "%s"
@@ -9872,9 +9883,8 @@ msgstr "ངོ་འཛོམས་སྒྲིག་སྟངང་ཚུ།"
 msgid "Start Doodling"
 msgstr "ཌུཌ་ལིང་ འགོ་བཙུགས།"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "ཨའི་ཌི་ག་འདི་ཤུགས་ལྡན་སྨོ?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "ག་ ཁ་སླབ་ཀྱི་གྲངས་སུ་འཛུལ་ཡི?"
@@ -9889,74 +9899,15 @@ msgstr "ལག་ལེན་པའི་ཁ་སླབ་ནང་འཛུལ
 msgid "Open Inbox"
 msgstr "ཧོཊ་མཱེལ་ ནང་སྒྲོམ་ཁ་ཕྱེ།"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "གྲངས་སུ་འཛུལ་ &lt;ཁང་མིག&gt;: ཡ་ཧུ་  ཡོངས་འབྲེལ་གུ་ལུ ཁ་སླབ་ཁང་མིག་ནང་འཛུལ།"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "ཐོ་ཡིག: ཡ་ཧུ་ཡོངས་འབྲེལ་གུ་ལུ་ ཁང་མིག་ཚུ་ཐོ་བཀོད་འབད།"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "ཌུ་ཌཱལ་: ཌུ་ཌཱལ་ལཱ་ཡུན་འགོ་བཙུགས་ནིའི་དོན་ལུ་ ལག་ལེན་པ་ཞུ་བ་འབད།"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ཡ་ཧུ!ཨའི་ཌི།"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "ཡ་ཧུ་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
-
-msgid "Yahoo Japan"
-msgstr "ཡ་ཧུ་ ཇ་པཱན།"
-
-msgid "Pager server"
-msgstr "བརྡ་འཕྲུལ་སར་བར།"
-
-msgid "Japan Pager server"
-msgstr "ཇ་པཱན་ བརྡ་འཕྲུལ་ སར་བར།"
-
-msgid "Pager port"
-msgstr "བརྡ་འཕྲུལ་ འདྲེན་ལམ།"
-
-msgid "File transfer server"
-msgstr "ཡིག་སྣོད་གནས་སོར་ སར་བར།"
-
-msgid "Japan file transfer server"
-msgstr "ཇ་པཱན་ ཡིག་སྣོད་གནས་སོར་ སར་བར།"
-
-msgid "File transfer port"
-msgstr "ཡིག་སྣོད་གནས་སོར་འདྲེན་ལམ།"
-
-msgid "Chat room locale"
-msgstr "ཁ་སླབ་ཁང་མིག་ ལོ་ཀེལ།"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "གྲོས་ཚོགས་དང་ ཁ་སླབ་ཁང་མིག་མགྲོན་བརྡ་ཚུ་སྣང་མེད་སྦེ་བཞག"
-
-msgid "Chat room list URL"
-msgstr "ཁ་སླབ་ཁང་མིག་ ཐོ་ཡིག་ ཡུ་ཨར་ཨེལ།"
-
-msgid "Yahoo Chat server"
-msgstr "ཡ་ཧུ་ ཁ་སླབ་སར་བར།"
-
-msgid "Yahoo Chat port"
-msgstr "ཡ་ཧུ་ ཁ་སླབ་འདྲེན་ལམ།"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "ཌུ་ཌཱལ་ཞུ་བ་བཏང་ཡོདཔ།"
 
+msgid "Unable to connect."
+msgstr "མཐུད་མི་ཚུགས།"
+
 msgid "Unable to establish file descriptor."
 msgstr "ཡིག་སྣོད་འགྲེལ་བཤད་པ་ གཞི་འཛུགས་འབད་མ་ཚུགས།"
 
@@ -9964,6 +9915,9 @@ msgstr "ཡིག་སྣོད་འགྲེལ་བཤད་པ་ གཞ�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%sའདི་གིས་ཡིག་སྣོད་%sགཏང་ནིའི་དང་ལེན་འབདཝ་མས།"
 
+msgid "Write Error"
+msgstr "འཛོལ་བ་འབྲི།"
+
 msgid "Yahoo! Japan Profile"
 msgstr "ཡ་ཧུ!ཇ་པཱན་ གསལ་སྡུད།"
 
@@ -10009,13 +9963,9 @@ msgstr "བསིལ་བའི་འབྲེལ་ལམ ༣"
 msgid "Last Update"
 msgstr "མཇུག་གི་དུས་མཐུན་བཟོ།"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%sགི་དོན་ལུ་ ལག་ལེན་པའི་བརྡ་དོན་མི་ཐོབ།"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "དགོངསམ་མ་ཁྲེལ་ འ་ནི་གསལ་སྡུད་འདི་ ད་ལྟོའི་སྐབས་ལུ་ རྒྱབ་སྐྱོར་མ་འབད་བའི་སྐད་ཡིག་ཡང་ན་རྩ་སྒྲིག་ནང་ཨིནམ་"
 "བཟུམ་མཐོང་མས།"
@@ -10089,23 +10039,19 @@ msgstr "སྐད་ཚུ།"
 msgid "Webcams"
 msgstr "ཝེབ་ཀེམསི།"
 
+msgid "Connection problem"
+msgstr "མཐུད་ལམ་ དཀའ་ངལ།"
+
 msgid "Unable to fetch room list."
 msgstr "ཁང་མིག་ཐོ་ཡིག་ལེན་མི་ཚུགས་པས།"
 
 msgid "User Rooms"
 msgstr "ལག་ལེན་པའི་ཁང་མིག་ཚུ།"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "ཝའི་སི་ཨེཅ་ཊི་ སར་བར་དང་བཅསམཐུད་ལམ་གྱི་དཀའ་ངལ།"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10234,24 +10180,16 @@ msgstr "རྒྱལ་ཁམས།"
 msgid "Exposure"
 msgstr "མདངས་ཕོག"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ་:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "ཨེཅ་ཊི་ཊི་པི་ པོརོ་སི་: %s ལས་ ལན་མིང་དཔྱད་འབད་མ་ཚུགས།\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "ཨེཅ་ཊི་ཊི་པི་པོརོ་སི་ མཐུད་ལམ་ འཛོལ་བ་ %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "འཛུལ་སྤྱོད་འབད་ནི་ འདི་ ཉན་མ་བཏུབ་པས: ཨེཅ་ཊི་ཊི་པི་ པོརོ་སི་ སར་བར་གྱིས་ འདྲེན་ལམ %d ཊ་ན་ལིང་"
 "བཀགཔ་མས།"
@@ -10260,9 +10198,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr " %s མོས་མཐུན་འབད་བའི་སྐབས་ འཛོལ་བ།"
 
-msgid "Could not resolve host name"
-msgstr "ཧོསཊི་མིང་མོས་མཐུན་འབད་མི་ཚུགས་པས།"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10361,9 +10296,6 @@ msgstr "མ་དཀྲོགས།"
 msgid "Extended away"
 msgstr "རྒྱ་བསྐྱེད་འབད་ཡི།"
 
-msgid "Mobile"
-msgstr "འགྲུལ་འཕྲིན། "
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10405,18 +10337,6 @@ msgstr "+++ %s འདི་ ལཱ་ཡོདཔ་ལུ་འགྱུར་�
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s ལྷག་པའི་སྐབས་སུ་འཛོལ་བ།"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"ཁྱོད་ཀྱི་ %s ལྷག་པའི་སྐབས་སུ་ འཛོལ་བ་གཅིག་གདོང་ཐུག་བྱུང་ནུག ཁོང་དེ་ཚུ་ མངོན་གསལ་འབད་དེ་མེདཔ་མ་ཚད་ "
-"ཡིག་སྣོད་རྙིངམ་འདི་  %s~ ལུ་བསྐྱར་མིང་བཏགས་ཏེ་ཡོད། "
-
 msgid "Calculating..."
 msgstr "རྩིས་སྟོན་པའི་བསྒང་..."
 
@@ -10524,6 +10444,18 @@ msgstr "མཐུད་ལམ་ངོས་ལེན་མི་འབད་བ
 msgid "Address already in use."
 msgstr "འ་ནི་ཁ་སླབ་འདི་ ཧེ་མ་ལས་རང་ལག་ལེན་འཐབ་བཞིན་ཡོད།"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s ལྷག་པའི་སྐབས་སུ་འཛོལ་བ།"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"ཁྱོད་ཀྱི་ %s ལྷག་པའི་སྐབས་སུ་ འཛོལ་བ་གཅིག་གདོང་ཐུག་བྱུང་ནུག ཁོང་དེ་ཚུ་ མངོན་གསལ་འབད་དེ་མེདཔ་མ་ཚད་ "
+"ཡིག་སྣོད་རྙིངམ་འདི་  %s~ ལུ་བསྐྱར་མིང་བཏགས་ཏེ་ཡོད། "
+
 msgid "Internet Messenger"
 msgstr "ཨིན་ཊར་ནེཊི་འཕྲིན་སྐྱེལ་པ།"
 
@@ -10572,10 +10504,8 @@ msgstr "ཡིག་འཕྲིན་གསརཔ་གི་བརྡ་བས
 msgid "Use this buddy _icon for this account:"
 msgstr "འ་ནི་རྩིས་ཐོ་དོན་ལུ་ འ་ནི་བ་ཌི་ངོས་དཔར་ལག་ལེན་འཐབ།"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s གདམ་ཁ་ཚུ།"
+msgid "_Advanced"
+msgstr "ཡར་འཕེལ་ཅན།(_A)"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10611,9 +10541,6 @@ msgstr "ཁྱོད་ཀྱིས་ངོ་མ་འབད་སྦོ་ལ
 msgid "you can see the butterflies mating"
 msgstr "ཁྱོད་ཀྱིས་ཕྱེ་མ་ལེབ་འདོད་སྦྱོར་འབད་སར་མཐོང་འོང་།"
 
-msgid "Proxy Options"
-msgstr "པོ་རོག་སི་གདམ་ཁ་ཚུ།"
-
 msgid "Proxy _type:"
 msgstr "པོ་རོག་སི་དབྱེ་བ་:(_t)"
 
@@ -10642,8 +10569,9 @@ msgstr "གཞི་རིམ།(_B)"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "ཡར་འཕེལ་ཅན།(_A)"
+#, fuzzy
+msgid "_Proxy"
+msgstr "པོརོ་སི།"
 
 msgid "Enabled"
 msgstr "ལྕོགས་ཅན་བཟོ་ཡོདཔ།"
@@ -10682,16 +10610,17 @@ msgid "Please update the necessary fields."
 msgstr "ཉེར་མཁོ་བའི་ས་སྒོ་ཚུ་ དུས་མཐུན་བཟོ།"
 
 #, fuzzy
-msgid "Room _List"
-msgstr "ཁང་མིག་གི་ཐོ་ཡིག"
+msgid "A_ccount"
+msgstr "རྩིས་ཐོ:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "ཁྱོད་ ཁ་སླབ་ཀྱི་སྐོར་ལས་དེའི་གྲངས་སུ་འཛུལ་ནི་འབདཝ་ད ་འོས་ལྡན་གྱི་བརྡ་དོན་འདི་བཙུགས་གནང་།\n"
 
-msgid "_Account:"
-msgstr "རྩིས་ཐོ:(_A)"
+#, fuzzy
+msgid "Room _List"
+msgstr "ཁང་མིག་གི་ཐོ་ཡིག"
 
 msgid "_Block"
 msgstr "འགག(_B)"
@@ -10710,6 +10639,17 @@ msgid "I_M"
 msgstr "ཨའི་ཨེམ།(_M)"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "ཁ་སླབ་ཁ་སྐོང་བརྐྱབ།(_A)"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "ཝི་ཌིའོ་ ཁ་སླབ།"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "ཡིག་སྣོད་གཏང་།(_S)"
 
@@ -10721,7 +10661,11 @@ msgid "View _Log"
 msgstr "དྲན་དེབ་སྟོན།(_L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "ཨོཕ་ལ་ཡིན་གྱི་སྐབས་འབད་མི་ཆོགཔ་ཨིན།"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "ཨོཕ་ལ་ཡིན་གྱི་སྐབས་འབད་མི་ཆོགཔ་ཨིན།"
 
 msgid "_Alias..."
@@ -10861,6 +10805,10 @@ msgstr "/ལག་ཆས་ཚུ་/ཆ་རོགས་ པ་འུནསི
 msgid "/Tools/_Certificates"
 msgstr "/ལག་ཆས/དགའ་གདམ(_e)"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/ལག་ཆས/ཕྱི་ཁ(_A)"
+
 msgid "/Tools/Plu_gins"
 msgstr "/ལག་ཆས་ཚུ་/པ་ལག་ཨིནསི།(_g)"
 
@@ -10870,10 +10818,6 @@ msgstr "/ལག་ཆས/དགའ་གདམ(_e)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ལག་ཆས/སྒེར་གཙང་།(_i)"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/ལག་ཆས/ཕྱི་ཁ(_A)"
-
 msgid "/Tools/_File Transfers"
 msgstr "/ལག་ཆས/ཡིག་སྣོད་གནས་སོར(_F)"
 
@@ -11000,8 +10944,8 @@ msgstr "ལག་ཐོག་ལས།"
 msgid "By status"
 msgstr "གནས་ཚད་ཀྱིས།"
 
-msgid "By log size"
-msgstr "དྲན་དེབ་ཚད་ཀྱིས།"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -11019,6 +10963,9 @@ msgstr "སླར་མཐུད(_R)"
 msgid "Re-enable"
 msgstr "རྩིས་ཐོ་འདི་སླར་ལྕོགས་ཅན་བཟོ།"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s ལོག་འོང་ཡི།"
@@ -11113,6 +11060,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "མིང་གཞན:"
 
+msgid "_Group:"
+msgstr "སྡེ་ཚན:(_G)"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11146,6 +11096,120 @@ msgstr "/ལག་ཆས་ཚུ།"
 msgid "/Buddies/Sort Buddies"
 msgstr "/ཆ་རོགས་ཚུ་/ཆ་རོགས་ཚུ་དབྱེ་སེལ་འབད།"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "རྒྱབ་གཞིའི་ཚོས་གཞི།"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "འ་ནི་སྡེ་ཚན་འདི་ཁྱོད་ཀྱི་ ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་བརྐྱབ་ཡོདཔ་ཨིན་པས།"
+
+#, fuzzy
+msgid "Layout"
+msgstr "སེང་གེ།"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "རྒྱབ་གཞིའི་ཚོས་གཞི།"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "རྒྱ་འཕར།(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "རྒྱབ་གཞིའི་ཚོས་གཞི་སེལ་འཐུ་འབད།"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "རམ་ནི།(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "རྒྱབ་གཞིའི་ཚོས་གཞི་སེལ་འཐུ་འབད།"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "མགྱོགས་ཐབས།"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "གློག་ཐོག"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "སེལ་འཐུ་གྲུབ་པའི་ཆ་རོགས་ཀྱི་བརྡ་དོན་ལེན།"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "ཕྱི་ཁ།"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "སེལ་འཐུ་གྲུབ་པའི་ཆ་རོགས་ཀྱི་བརྡ་དོན་ལེན།"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "ཨོཕ་ལ་ཡིན།"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "སེལ་འཐུ་གྲུབ་པའི་ཆ་རོགས་ཀྱི་བརྡ་དོན་ལེན།"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "ཁྲག་དབྱེ་བ།"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "སེལ་འཐུ་གྲུབ་པའི་ཆ་རོགས་ཀྱི་བརྡ་དོན་ལེན།"
+
+msgid "Message Text"
+msgstr "འཕྲིན་དོན་ཚིག་ཡིག"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "འཕྲིན་དོན་ཚིག་ཡིག"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%sགི་དོན་ལུ་བརྡ་དོན་ལག་ལེན་པ་འདི་སོར།་"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11165,14 +11229,6 @@ msgstr "ཁྱོད་ཀྱིས་ མགྲོན་དུ་འབོད�
 msgid "Invite Buddy Into Chat Room"
 msgstr "ཆ་རོགས་འདི་ཁ་སླབ་གྲངས་སུ་མགྲོན་བརྡ་འབད།"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"ཁྱོད་ཀྱིས་ མགྲོན་བརྡ་འབད་ནིའི་རེ་འདོད་བསྐྱེད་མི་ ལག་ལེན་པའི་མིང་ གདམ་ཁ་ཅན་གྱི་མགྲོན་འབོད་འཕྲིན་དོན་དང་"
-"སྦྲགས་ཏེ་བཙུགས་གནང་།"
-
 msgid "_Buddy:"
 msgstr "ཆ་རོགས:(_B)"
 
@@ -11201,7 +11257,8 @@ msgstr "སྣང་མེད་བཞག"
 msgid "Get Away Message"
 msgstr "ཕྱི་ཁའི་འཕྲིན་དོན་ལེན།"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "མཇུག་ལུ་སླབ་ཡོདཔ།"
 
 msgid "Unable to save icon file to disk."
@@ -11249,6 +11306,22 @@ msgstr "/གྲོས་གླེང་/ བཟུམ་སྦེ་སྲུང
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/གྲོས་གླེང་/རྒྱབ་སྒྲིལ་བསལ།(_r)"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/གྲོས་གླེ་ང/ཧེང་བཀལ།(_o)"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/གྲོས་གླེ་ང/ཧེང་བཀལ།(_o)"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/གྲོས་གླེ་ང/ཧེང་བཀལ།(_o)"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/གྲོས་གླེང་/དྲན་དེབ་ལུ་བལྟ(_L)"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/གྲོས་གླེང་/ཡིག་སྣོད་གཏང་...(_n)"
 
@@ -11323,6 +11396,18 @@ msgstr "/གྲོས་གླེང་།"
 msgid "/Conversation/View Log"
 msgstr "/གྲོས་གླེང་/དྲན་དེབ་བལྟ"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/གྲོས་གླེ་ང/ཧེང་བཀལ།"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/གྲོས་གླེང་/དྲན་དེབ་བལྟ"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/གྲོས་གླེ་ང/ཧེང་བཀལ།"
+
 msgid "/Conversation/Send File..."
 msgstr "/གྲོས་གླེང་/ཡིག་སྣོད་གཏང་..."
 
@@ -11507,6 +11592,9 @@ msgstr "དུས་སྦྱོར་ལུག"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "རྒྱབ་སྐྱོར།"
 
@@ -11635,6 +11723,10 @@ msgid "Hungarian"
 msgstr "ཧང་ག་རི་ཡཱན།"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "རོ་མ་ནི་ཡཱན"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "མེ་སི་ཌོ་ནི་ཡཱན།"
 
@@ -11652,6 +11744,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "ད་ལྟོའི་སྐད་བསྒྱུར་པཚུ།"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "གཞན།"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "བཀག་དམ་ཅན།"
 
@@ -11675,6 +11771,10 @@ msgid "Macedonian"
 msgstr "མེ་སི་ཌོ་ནི་ཡཱན།"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "མེ་སི་ཌོ་ནི་ཡཱན།"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "ནོར་ཝེ་ཇི་ཡཱན།"
 
@@ -11731,6 +11831,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "སུའི་ཌིཤི།"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "ཏ་མིལ།"
 
@@ -11789,8 +11892,25 @@ msgstr ""
 "རམ་འབད་མི་ཚུ་གིས་ བདག་དབང་ཐོབ་སྟེ་ཡོདཔ་ཨིན། གྲོགས་རམ་པ་ཚུའི་ཐོ་ཡིག་ཡོངས་རྫོགས་དོན་ལུ་ "
 "'COPYRIGHT' ཡིག་སྣོད་བལྟ། ང་བཅས་ཀྱིས་ ལས་རིམ་དེའི་དོན་ལུ་ ཉེན་ལེན་བྱིན་ནི་མེདཔ་ཨིན།<BR><BR>"
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE =\"4\">IRC:</FONT> #གཱེམ on irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE =\"4\">IRC:</FONT> #གཱེམ on irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -12055,7 +12175,7 @@ msgid "Hyperlink visited color"
 msgstr "ཧའི་པར་ལིངཀ་ ཚོས་གཞི།"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "མཱའུསི་འདི་ ཁོང་རའི་གུ་ལུ་ཡོདཔ་ད་ ཚད་བརྒལ་འབྲེལ་ལམ་ཚུ་འབྲི་ནིའི་ཚོས་གཞི།"
 
 msgid "Hyperlink prelight color"
@@ -12093,15 +12213,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "བརྡ་བསྐུལ་རྩ་བསྐྲད་གཏང་ནི།"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "ཡིག་འཕྲིན་གསརཔ་གི་བརྡ་བསྐུལ།"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12114,15 +12241,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "ཡིག་འཕྲིན་གསརཔ་གི་བརྡ་བསྐུལ།"
 
-msgid "_Copy Email Address"
-msgstr "གློག་འཕྲིན་འདྲ་བཤུས་རྐྱབས(_C)"
-
-msgid "_Open Link in Browser"
-msgstr "བརའུ་ཟར་ནང་འབྲེལ་ལམ་ཁ་ཕྱེ(_O)"
-
-msgid "_Copy Link Location"
-msgstr "འབྲེལ་ལམ་གནས་ཁོངས་འདྲ་བཤུས(_C)"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12164,11 +12282,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "གཟུགས་བརྙན་སྲུང་བཞག་འབད།"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "གཟུགས་བརྙན་སྲུང་བཞག་འབད...(_S)"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "སྲོལ་སྒྲིག་ སི་མའི་ལི་ཚུ་སྟོན།"
 
@@ -12261,10 +12378,6 @@ msgid "Font Face"
 msgstr "ཡིག་གཟུགས་ བཀོད་རྣམ།"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "རྒྱབ་གཞིའི་ཚོས་གཞི།"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "གདོང་གཞི་ཡིག་གཟུགས་ཀྱི་ཚོས་གཞི།"
 
@@ -12392,6 +12505,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12420,6 +12534,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12479,11 +12594,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "ཕགཔ།"
 
-msgid "Open All Messages"
-msgstr "འཕྲིན་དོན་ཚུ་ཆ་མཉམ་རང་ཁ་ཕྱེ།"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">ཁྱོད་ལུ་ཡིག་འཕྲིན་གཅིག་ཡོད།!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "རྩིས་སྟོན་པའི་བསྒང་..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12513,6 +12644,27 @@ msgid ""
 msgstr ""
 "ལག་དེབ་བརའུ་ཟར་བརྡ་བཀོད་འདི་གདམ་ཁ་བརྐྱབས་ནུག དེ་འབདཝ་ད་ བརྡ་བཀོད་འདི་གཞི་སྒྲིག་མ་འབད་བས།"
 
+#, fuzzy
+msgid "No message"
+msgstr "(༡ འཕྲིན་དོན)"
+
+msgid "Open All Messages"
+msgstr "འཕྲིན་དོན་ཚུ་ཆ་མཉམ་རང་ཁ་ཕྱེ།"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">ཁྱོད་ལུ་ཡིག་འཕྲིན་གཅིག་ཡོད།!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "ཆ་རོགས་པའུནསི་གསརཔ།"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">ཁྱོད་ལུ་ཡིག་འཕྲིན་གཅིག་ཡོད།!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "འོག་ལུ་ཡོད་པའི་པ་ལག་ཨིནསི་འདི་ སྐྱེལ་བཙུགས་འབད་ནི་ཨིན།"
 
@@ -12565,10 +12717,17 @@ msgstr "<b>པ་ལག་ཨིན་རྒྱས་བཤད་ཚུ།</b>"
 msgid "Select a file"
 msgstr "ཡིག་སྣོད་སེལ་འཐུ་འབད།"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "ཆ་རོགས་པའུནསི་ ཞུན་དག་འབད།"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "ག་གུ་ལུ་པའུནསི།"
 
+msgid "_Account:"
+msgstr "རྩིས་ཐོ:(_A)"
+
 msgid "_Buddy name:"
 msgstr "ཆ་རོགས་ཀྱི་མིང:(_B)"
 
@@ -12636,7 +12795,60 @@ msgstr "སླར་འབྱུང་དོ།(_R)"
 msgid "Pounce Target"
 msgstr "དམིགས་གཏད་པའུནསི།"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "ཡིག་དཔར་བརྐྱབ་ནི་འགོ་བཙུགསཔ་ཨིན།(_t)"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "ཡིག་དཔར་བརྐྱབ་པའི་སྐབས་སུ་ཐེམ་ཚུ།(_a)"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "འཛུལཝ་ཨིན།(_g)"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "ལས་མེད་ལས་ལོག་ནི(_n)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "ཕྱི་ཁ་ལས་སླར་ལོག་འབདཝ་ཨིན།"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "ཡིག་དཔར་བརྐྱབ་ནི་བཀག་ཡོདཔ།"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "འཐོནམ་ཨིན།(_f)"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "ལས་མེད་འགྱུརཝ་ཨིན།(_i)"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "ཕྱི་ཁ་ཨིན་པའི་སྐབས།"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "འཕྲིན་དོན་གཏང་(_m)"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "ངོ་མ་ཤེས་པའི་ པའུནསི་གི་ བྱུང་ལས། འ་ནི་འདི་སྙན་ཞུ་འབད་གནང་།"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "སི་མའི་ལི་བརྗོད་དོན་བཤུབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "སི་མའི་ལི་བརྗོད་དོན་བཤུབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "སི་མའི་ལི་བརྗོད་དོན་བཤུབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 msgid "Install Theme"
@@ -12660,6 +12872,12 @@ msgstr "མགྱོགས་ཐབས།"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "%s དང་བཅས་གྲོས་གླེང་ཚུ།"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "ཆ་རོགས་ཀྱི་ཐོ་ཡིག"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "ངོས་དཔར་སྣོད་ཀྱི་རིམ་ལུགས།"
 
@@ -12672,7 +12890,7 @@ msgid "On unread messages"
 msgstr "མ་ལྷག་པའི་འཕྲིན་དོན་ཚུ།"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "ཨའི་ཨེམ་གྲོས་གླེང་སྒོ་སྒྲིག་ཚུ།"
 
 #, fuzzy
@@ -12682,6 +12900,10 @@ msgstr "ཨའི་ཨེམ་གྲོས་གླེང་གསརཔ་ཚ
 msgid "When away"
 msgstr "ཕྱི་ཁ་ཨིན་པའི་སྐབས།"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "གྲོས་གླེང་ཝིན་ཌོ་ ཆེར་བསྐྱེད་འབད།(_a)"
+
 #. All the tab options!
 #, fuzzy
 msgid "Tabs"
@@ -12742,10 +12964,6 @@ msgstr "བཤུད་སྒྲིལ་འབད་ནི་ཧུམ་ཁྱ
 msgid "F_lash window when IMs are received"
 msgstr "ཨའི་ཨེམ་ཚུ་ ཐོབ་ཡོད་པའི་སྐབས་སུ་ ཝིན་ཌོ་ རིབ་སྟོན་འབད།(_l)"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "གྲོས་གླེང་ཝིན་ཌོ་ ཆེར་བསྐྱེད་འབད།(_a)"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12782,13 +13000,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "ལགལེན་པའི་བརྡ་དོན་ཐོབ་མ་ཚུགས།"
 
-msgid "ST_UN server:"
-msgstr "ཨེསི་ཊི་ཡུ་ཨེན་ སར་བར།:(_U)"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">དཔེར་བརྗོད།: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "རང་བཞིན་སྐྱོན་འཛིན་ནི་ཨའི་པི་ཁ་བྱང་།(_A)"
 
 msgid "Public _IP:"
@@ -12809,6 +13025,10 @@ msgstr "འདྲེན་ལམ་ འགོ་བཙུགས:(_S)"
 msgid "_End port:"
 msgstr "འདྲེན་ལམ་ མཇུག་བསྡུ:(_E)"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "པོརོག་སི་སར་བར།"
@@ -12838,6 +13058,10 @@ msgstr "པོརོག་སི་སར་བར།"
 msgid "No proxy"
 msgstr "པོརོག་སི་མེད།"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "ལག་ལེན་པ:(_U)"
 
@@ -13002,13 +13226,13 @@ msgstr "གཉིས་ཆ་རང་ ཕྱི་ཁ་དང་ལས་མ�
 msgid "Auto-away"
 msgstr "རང་བཞིན་གྱི་-ཕྱི་ཁ།"
 
-msgid "Change status when _idle"
-msgstr "ལས་མེད་སྦེ་ཡོད་པའི་སྐབས་སུ་གནས་ཚད་བསྒྱུར་བཅོས་འབད།(_i)"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "གནས་ཚད་བསྒྱུར་བཅོས་མ་འབད་བའི་ཧེ་མ་སྐར་མ་ཚུ།:(_M)"
 
+msgid "Change status when _idle"
+msgstr "ལས་མེད་སྦེ་ཡོད་པའི་སྐབས་སུ་གནས་ཚད་བསྒྱུར་བཅོས་འབད།(_i)"
+
 msgid "Change _status to:"
 msgstr ": ལུ་ གནས་ཚད་བསྒྱུར་བཅོས་འབད།(_s)"
 
@@ -13161,29 +13385,19 @@ msgstr "སྲུང་བཞག་འབད་ཞིནམ་ལས་ལག་
 msgid "Status for %s"
 msgstr "%s དོན་ལུ་ གནས་ཚད་ཚུ།"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "སི་མའི་ལི་ནང་ན་བཙུགས།"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "ནོར་བཅོས་ངོ་བཤུས།"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "%s དོན་ལུ་ མིང་གསརཔ་བཙུགས་གནང་།"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "སི་མའི་ལི་ནང་ན་བཙུགས།"
@@ -13193,22 +13407,30 @@ msgid "Add Smiley"
 msgstr "བགའ་འཛུམ་བཏོན!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "གཟུགས་བརྙན་སྲུང་བཞག་འབད།"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "མགྱོགས་ཐབས།"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "བགའ་འཛུམ་བཏོན!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "མགྱོགས་ཐབས།"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "ཆ་རོགས་སེལ་འཐུ་འབད།"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "འ་ནི་རྩིས་ཐོ་དོན་ལུ་ འ་ནི་བ་ཌི་ངོས་དཔར་ལག་ལེན་འཐབ།"
 
@@ -13294,9 +13516,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "གསར་བཙུགས་འབད་མི་གཏང་མི་ཚུགས་པས།"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "ཁྱོད་ཀྱིས་ ཌེཀསི་ཊོཔ་ གསར་བཙུགས་འབད་མི་འདྲུད་ཡོདཔ་ཨིན་པས། ཁྱོད་ཀྱིས་ གསར་བཙུགས་འབད་མིའི་ཚབ་མ་ལུ་ "
 "གསར་བཙུགས་འབད་མི་གིས་ག་ཅི་དཔག་མིའི་འདི་གཏང་ནི་ཨིནམ་འོང་།"
@@ -13334,6 +13557,16 @@ msgstr ""
 "གཟུགས་བརྙན་ '%s': འདི་མངོན་གསལ་འབད་མ་ཚུགས་ ཏེ་རྒྱུ་མཚན་འདི་མ་ཤེས་པས་ཨིན་རུང་ གཟུགས་བརྙན་ཡིག་"
 "སྣོད་ངན་ཅན་གཅིག་གིས་འོང་སྲིད།"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "འབྲེལ་ལམ(ནང་)ཁ་ཕྱེ:(_O)"
+
+msgid "_Copy Link Location"
+msgstr "འབྲེལ་ལམ་གནས་ཁོངས་འདྲ་བཤུས(_C)"
+
+msgid "_Copy Email Address"
+msgstr "གློག་འཕྲིན་འདྲ་བཤུས་རྐྱབས(_C)"
+
 msgid "Save File"
 msgstr "ཡིག་སྣོད་སྲུངས།"
 
@@ -13431,6 +13664,78 @@ msgstr "ཐོབ་ཚུགས་པའི་སྔོན་དཔག་པ་
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "སར་བར་ ཁ་བྱང་།"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "གྲོས་ཚོགས་ སར་བར་ཅིག་ཐོ་བཀོད་འབད།"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "འདྲི་དཔྱད་འབད་ནི་ལུ་ གྲོས་ཚོགས་སར་བར་འདི་སེལ་འཐུ་འབད།"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "གློག་ཐོག་ཞབས་ཏོག་ཚུ།"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "ཆ་རོགས་ཀྱི་ཐོ་ཡིག་གཏང་།"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "ཕྱི་ཁ་འགྱོཝ་ཨིན།(_w)"
+
+#, fuzzy
+msgid "Directory"
+msgstr "ལོག་ སྣོད་ཐོ།"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "སྒྲ་སྐད་སེལ་འཐུ།"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>འགྲེལ་བཤད།:</b>ཨིསི་པུ་ཀི"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Dir བརྡ་དོན་གཞི་སྒྲིག་འབད།"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "བ་རའུ་ཟར:(_B)"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "ལག་ལེན་པ་མེད།"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "སར་བར་གྱིས ་རྒྱབ་སྐྱོར་འབད་འབདཝ་གི་བདེན་བཤད་ཐབས་ལམ་ག་ནི་ཡང་  ལག་ལེན་མི་འཐབ།"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Dir བརྡ་དོན་གཞི་སྒྲིག་འབད།"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "ཆ་རོགས་འདི་ལས་མེད་ཨིན་པས:"
 
@@ -13830,9 +14135,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "སྣ་སྡུད་མཉམ་རུབ་དོན་ལུ་སྙན་ཆ་འཕྲིན་གཏོང་པ་ལག་ཨིན།"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "སྙན་ཆ་འཕྲིན་གཏོང་པ་ལག་ཨིན་གྱིས་ ལག་ལེན་པ་ལེ་ཤ་ཅིག་ལུ་རང་ སྙན་ཆ་གི་པིསི་གཅིག་གུ་དུས་ཚོད་-ངོ་མ་ནང་"
 "སྐུགས་མཐུན་མོང་ཞུན་དག་འབད་ཐོག་ལས་ལཱ་འབད་བཅུགཔ་ཨིན།"
@@ -13948,12 +14254,6 @@ msgstr ""
 "-ནང་འབྱོར་གྱི་ཚིག་ཡིག་གེ་ར རིམ་ལོག་འབདཝ་ཨིན\n"
 "-ཁོང་ཚུ་ནང་ན་འཛུལཝད་ལུ་ཁྱོད་ཀྱི་ཐོ་ཡིག་ཁར་འཕྲིན་དོན་འདི་མགྱོགས་པ་རང་མི་མང་ལུ་གཏངམ་ཨིན། "
 
-msgid "Cursor Color"
-msgstr "འོད་རྟགས་ཚོས་གཞི།"
-
-msgid "Secondary Cursor Color"
-msgstr "ངོས་དཔར་ཚོས་གཞི་གལ་གནད་ཆུང་བ།"
-
 msgid "Hyperlink Color"
 msgstr "ཚད་བརྒལ་འབྲེལ་ལམ་ཚོས་གཞི།"
 
@@ -13965,6 +14265,10 @@ msgstr "ཚད་བརྒལ་འབྲེལ་ལམ་ཚོས་གཞི
 msgid "Highlighted Message Name Color"
 msgstr "གཙོ་དམིགས་མཐུན་སྒྲིག་ཚུ།"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "བརྡ་བསྐུལ་རྩ་བསྐྲད་གཏང་ནི།"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "ཇི་ཊི་ཀེ་ རྩ་འབྲེལ་མཐོང་སྣང་ཐད་སྙོམས་ཡ་བྲལ།"
 
@@ -13994,35 +14298,24 @@ msgstr "ཇི་ཊི་ཀེ་+ངོས་འདྲ་བའི་ཡི�
 msgid "GTK+ Text Shortcut Theme"
 msgstr "ཇི་ཊི་ཀེ་+ཚིག་ཡིག་མགྱོགས་ཐབས་བརྗོད་དོན།"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "ངོས་འདྲ་བའི་ཚོས་གཞི་ཚུ།"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "ཡིག་འཕྲིན་གསརཔ་གི་བརྡ་བསྐུལ།"
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "གེམ་ ཇི་ཊི་ཀེ་+བརྗོད་དོན་ཚད་འཛིན།"
 
-msgid "Widget Sizes"
-msgstr "ཝི་གེཊི་ཚད་ཚུ།"
+#, fuzzy
+msgid "Colors"
+msgstr "ཁ་བསྡམ།"
 
 msgid "Fonts"
 msgstr "ཡིག་གཟུགས་ཚུ།"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "གཱེམ་གྱི་ཡིག་སྣོད་ཚད་འཛིན།"
@@ -14114,7 +14407,7 @@ msgstr "ཨའི་ཨེམ་གྲོས་གླེང་སྒོ་སྒ
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14168,6 +14461,113 @@ msgstr ""
 "ངེས་འཛིན་འབད་ཚར་མི་ལམ་ལུགས་ལག་ལེན་པ་དང་འཁྲིལ་ཏེ་ ཕྱིར་གཏང་འཕྲིན་དོན་ཚུ་ནང་ ཚིག་ཡིག་གི་ཚབ་མ་"
 "འབདཝ་ཨིན།"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "ནང་བསྐྱོད་མ་འབད་བས།"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s ཕྱིར་བསྐྱོད་འབད་ཡི།"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "ཁ་སླབ་ཀྱི་གྲངས་སུ་འཛུལ།"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "སྣང་མེད་བཞག"
+
+#, fuzzy
+msgid "Founder"
+msgstr "སྐད་སྦོམ་སྦེ།"
+
+#, fuzzy
+msgid "Operator"
+msgstr "གླུ་གཞས། (གླུ་གཞས་ཁང་)"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "དབང་སྤྲོད་བྱིན་ཡོདཔ།"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "འཛོལ་ བ།"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "བརྡ་དོན།"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "ཌའི་ལོག་ཞུ།"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "ཉེན་བརྡའི་གནས་རིམ།"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s དོན་ལུ་ གནས་ཚད་ཚུ།"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "ཁ་སླབ་ཁང་མིག་ ལོ་ཀེལ།"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "ངོས་དཔར་སྲུང་བཞག་འབད།"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "གེམ་ ཇི་ཊི་ཀེ་+བརྗོད་དོན་ཚད་འཛིན།"
+
+#, fuzzy
+msgid "Contact"
+msgstr "རྩིས་ཐོའི་བརྡ་དོན།"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "ཆ་རོགས་ཀྱི་ཐོ་ཡིག"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "ཆ་རོགས་ཀྱི་ཐོ་ཡིག"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "གེམ་ ཇི་ཊི་ཀེ་+བརྗོད་དོན་ཚད་འཛིན།"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "གེམ་ ཇི་ཊི་ཀེ་+བརྗོད་དོན་ཚད་འཛིན།"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14332,9 +14732,6 @@ msgstr "ཆ་རོགས་ཐོ་ཡིག་སྒོ་སྒྲིག་
 msgid "Only when docked"
 msgstr "ཌོཀ་འབད་ཡོདཔ་ད་རྐྱངམ་ཅིག"
 
-msgid "_Flash window when chat messages are received"
-msgstr "ཁ་སླབ་འཕྲིན་དོན་ཚུ་ཐོབ་ཡོདཔ་ད་ སྒོ་སྒྲིག་རིབ་སྟོན་འབད།(_F)"
-
 #, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "ནང་བསྐྱོད་ཀྱི་གདམ་ཁ་ཚུ།"
@@ -14345,7 +14742,7 @@ msgstr "ཝིན་ཌོསི་གཱེམ་ལུ་དམིགས་བ
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "ཝིན་ཌོཝསི་གེམ་ལུ་ དམིགས་བསལ་གྱི་ ཆ་རོགས་ཐོ་ཡིག་ཌོ་ཀིང་ བཟུམ་མའི་གདམ་ཁ་ཚུ་བྱིནམ་ཨིན།"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14387,6 +14784,532 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cannot open socket"
+#~ msgstr "སོ་ཀེཊི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "སོ་ཀེཊི་གུ་ལུ་ ཉན་མ་ཚུགས།"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "སོ་ཀེཊི་ལྷག་མི་ཚུགས།"
+
+#~ msgid "Connection failed."
+#~ msgstr "མཐུད་ལམ་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "སར་བར་འདི་ མཐུད་བཏོག་ནུག"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "སོ་ཀེཊི་ གསར་བསྐྲུན་འབད་མི་ཚུགས།"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
+
+#~ msgid "Read error"
+#~ msgstr "འཛོལ་བ་ལྷག"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "འཛོལ་བ་བྲིས།"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Dir བརྡ་དོན་གཞི་སྒྲིག་འབད།"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "རྒྱ་བསྐྱེད་ཅན་གྱི་ཁ་བྱང་།"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "ཁ་སླབ་མིང་གཞན།"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "ལག་ལེན་པ་ལུ་ སྣོད་ཐོའི་བརྡ་དོན་མིན་འདུག"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "བརྡ་བཀོད།"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "ཨེཅི་ཊི་ཨེམ་ཨེལ།"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "ཐོ་འགོད་འབད་ནིའི་འཛོལ་བ།"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "གནས་ཁོངས།"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "ལག་ལེན་པ་གི་འཚོལ་ཞིབ།"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "ཆ་རོགས་ཀྱི་གནས་ལུགས་བརྡ་བསྐུལ་འབད་ནི།"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་ཐོན་རིམ།"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "ཕྱོགས།"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "ལག་ལེན་པའི་ཚད།"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "ལྕོགས་གྲུབ།"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "ལག་ལེན་པའི་མིང་།"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "ཨའི་ཨེམ་དང་བཅས་ལྡེ་མིག་བརྗེ་སོར།"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "གློག་འཕྲིན་ཁ་བྱང་།"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "གསལ་སྡུད་གཞི་སྒྲིག་འབད།"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "མཐུད་ནི།"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "ལག་ལེན་པའི་ མིང་།"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "མངོན་མཐོང་ ཝི་ཌིའོ།"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "འཕྲིན་དོན་ཐོབ་ཅི།"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "མི་མང་ལྡེ་མིག་ བ་བཱལ པིརིནཊི།"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "ལག་ལེན་པའི་གདམ་ཁ་ཚུ།"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "ལག་ལེན་པའི་ མིང་།"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "ལག་ལེན་པའི་ཚད།"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ཊིལིཡེན་ གསང་བཟོ།"
+
+#~ msgid "Read Error"
+#~ msgstr "འཛོལ་བ་ལྷག"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "སར་བར་ལུ་མཐུད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "གྲལ་རིམ་གང་།"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "འཕྲིན་དོན་མིང་དཔྱད་འབད་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོདཔ(%s)།"
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "སར་བར་ལུ་མཐུད་མ་ཚུགས།"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "ཁྱོད་ ཕྱིར་བསྐྱོད་འབད་དེ་ཡོདཔ་ཨིན་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ཀྱིས་ལཱ་གི་ལྟེ་བ་སོ་སོ་ནང་ ནང་བསྐྱོད་"
+#~ "འབད་ནུག"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "འཛོལ་བ། ཨེསི་ཨེསི་ཨེལ་གྱི་རྒྱབ་སྐྱོར་འདི་ གཞི་བཙུགས་འབད་མ་ཚུགས་པས།"
+
+#~ msgid "Incorrect password."
+#~ msgstr "བདེན་མེད་ཀྱི་ཆོག་ཡིག"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "བི་ཨོ་ཨེསི་ སར་བར་ལུ་ མཐུད་མ་ཚུགས།:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "ཁྱོད་ དུམ་གྲ་ཅིག་མཐུད་ལམ་བཏོག་ནི་འོང་། དུས་མཐུན་བཟོ་ནིའི་ཚུའི་དོན་ལུ་ %s ཞིབ་དཔྱད་འབད།"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "མཐུད་མ་ཚུགས།"
+
+#~ msgid "Invalid username."
+#~ msgstr "ནུས་མེད་ ལག་ལེན་པའི་མིང་།"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "སལ་བར་ བརྡ་དོན་ཐོབ་མི་ཚུགས།"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "ཧོསཊི་མོས་མཐུན་འབད་མ་ཚུགས།"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "མཐུད་ལམ་ཁ་མ་བསྡམ་ཡོདཔ་(རྩོམ་སྒྲིག)།"
+
+#~ msgid "Connection reset"
+#~ msgstr "མཐུད་ལམ་སླར་སྒྲིག"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "སོ་ཀེཊི་ %s ལས་ལྷག་པའི་འཛོལ་བ།:"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
+
+#~ msgid "Could not write"
+#~ msgstr "འབྲི་མ་ཚུགས།"
+
+#~ msgid "Could not connect"
+#~ msgstr "མཐུད་མ་ཚུགས།"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "ཉན་སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགས།"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ཧོསཊི་མིང་མོས་མཐུན་འབད་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "བདེན་མེད་ཀྱི་ཆོག་ཡིག"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "ཡ་ཧུ་ ཇ་པཱན།"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "ཇ་པཱན་ བརྡ་འཕྲུལ་ སར་བར།"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "ཇ་པཱན་ ཡིག་སྣོད་གནས་སོར་ སར་བར།"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "ཧོསཊི་མིང་མོས་མཐུན་འབད་མི་ཚུགས་པས།"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་"
+#~ "ཨེལ་ རྒྱབ་སྐྱོར་མིན་འདུག"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "ཨའི་ཨེམ་གྲོས་གླེང་སྒོ་སྒྲིག་ཚུ།"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "%s དོན་ལུ་ མིང་གསརཔ་བཙུགས་གནང་།"
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "ཨའི་ཌི་ག་འདི་ཤུགས་ལྡན་སྨོ?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "འོད་རྟགས་ཚོས་གཞི།"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "ངོས་དཔར་ཚོས་གཞི་གལ་གནད་ཆུང་བ།"
+
+#~ msgid "Interface colors"
+#~ msgstr "ངོས་འདྲ་བའི་ཚོས་གཞི་ཚུ།"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "ཝི་གེཊི་ཚད་ཚུ།"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "འཕྲིན་དོན་སྤང་།"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "ཁྱོད་ཀྱིས་ མགྲོན་བརྡ་འབད་ནིའི་རེ་འདོད་བསྐྱེད་མི་ ལག་ལེན་པའི་མིང་ གདམ་ཁ་ཅན་གྱི་མགྲོན་འབོད་འཕྲིན་དོན་"
+#~ "དང་སྦྲགས་ཏེ་བཙུགས་གནང་།"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "དྲན་འཛིན་ཚུའི་ཁ་བྱང་ཀི་དེབ་སེལ་འཐུ་འབད།"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "ཡང་ཅིན་  ཁྱོད་ཀྱིས་དུམ་གྲ་ཅིག་ལས་མཐུད་བཏོག་འོང་།  འདི་གཏན་གཏན་མ་བཟོ་ཚུན་ ཁྱོད་ཀྱིས ཊི་ཨོ་སི འདི་"
+#~ "ལག་ལེན་འཐབ་དགོཔ་འོང་།དུས་མཐུན་ཚུ་བཟོ་ནིའི་དོན་ལུ %sཞིབ་དཔྱད་འབད།"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "ཆ་རོགས་ཁ་སྐོང་རྐྱབས།"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "སལ་བར་ བརྡ་དོན་ཐོབ་མི་ཚུགས།"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "འཛོལ་བ་ལྷག་དོ།"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "སར་བར་ལུ་མཐུད།"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "མིང་: %s ཐོབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#~ msgid "Looking up %s"
+#~ msgstr " %sལུ བལྟ་དོ།"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s ལུ་མཐུད་ནི་ འཐུས་ཤོར་བྱུང་ནུག"
+
+#~ msgid "Signon: %s"
+#~ msgstr "ནང་ན་འཛུལ: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "ཡིག་སྣོད%sའདི་བྲིས་མ་ཚུགས།"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "ཡིག་སྣོད%sའདི་ ལྷག་མ་ཚུགས།"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "འཕྲིན་དོན་རིང་དྲགས་པས་ མཇུག་གི%sབཱའིཊིསི་འདི་ཆུང་ཀུ་བཟོ་ནུག"
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s འདི་ད་ལྟོ་ ནང་བསྐྱོད་མ་འབད།"
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr " %s ཉེན་བརྡ་འབད་ནི་འདི་ མི་ཆོགཔ་ཨིན།"
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "འཕྲིན་དོན་འདི་ ས་ཁར་འབུད་ནུག  ཁྱོད་ཀྱིས སལ་བར་གྱི་མགྱོགས་ཚད་འདི་ཚད་ལས་བརྒལ་བཅུག་དེས།"
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%sནང་ ཁ་སླབ་ནི་ཐོབ་མི་ཚུགས།"
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "ཁྱོད་ཀྱིས་ %s ལུ་ འཕྲིན་དོན་ཚུ་གནམ་མེད་ས་མེད་མགྱོགས་པར་གཏང་དེས།"
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "ཁྱོད་ཀྱིས་ %s ལས་ ཨའི་ཨེམ བྱིག་ཡར་སོ་ནུག ག་ཅི་འབད་ཟེར་བ་ཅིན་ འདི་སྦོམ་དྲགས་པས།"
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "ཁྱོད་ཀྱིས་ %s ལས་ ཨའི་ཨེམ་ བྱིག་ཡར་སོ་ནུག  ག་ཅི་འབད་ཟེར་བ་ཅིན་ འདི་གནམ་མེད་ས་མེད་མགྱོགས་པར་"
+#~ "བཏང་ནུག"
+
+#~ msgid "Failure."
+#~ msgstr "འཐུས་ཤོར།"
+
+#~ msgid "Too many matches."
+#~ msgstr "མཐུན་སྒྲིག་ཚུ་མང་དྲགས་པས།"
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "ཁྱད་ཆོས་ཚང་མི་ལེ་ཤཱ་རང་དགོ་པས།"
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Dir ཞབས་ཏོག་འདི་གནས་སྐབས་ཅིག་ཐོབ་མི་ཚུགས།"
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "གློག་འཕྲིན་བལྟ་ནི་བཀག་དམ་འབད་ཡོདཔ།"
+
+#~ msgid "Keyword ignored."
+#~ msgstr "གཙོ་ཚིག་སྣང་མེད་སྦེ་བཞག་ནུག"
+
+#~ msgid "No keywords."
+#~ msgstr "གཙོ་ཚིག་ཚུ་མེད།"
+
+#~ msgid "User has no directory information."
+#~ msgstr "ལག་ལེན་པ་ལུ་ སྣོད་ཐོའི་བརྡ་དོན་མིན་འདུག"
+
+#~ msgid "Country not supported."
+#~ msgstr "རྒྱལ་ཁབ་ རྒྱབ་སྐྱོར་མ་འབད་བས།"
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "འཐུས་ཤོར་ངོ་མ་ཤེས: %s"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "བདེན་མེད་ཀྱི་  སྐྱོན་མིང་ ཡང་ན་ ཆོག་ཡིག"
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "ཞབས་ཏོག་འདི་གནས་སྐབས་ཅིག་ཐོབ་མི་ཚུགས།"
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "ནང་བསྐྱོད་འབད་ནིའི་དོན་ལུ་ ཁྱོད་ཀྱི་ཉེན་བརྡའི་གནས་རིམ་འདི་མཐོ་དྲགས་པས།"
+
+#~ 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 ""
+#~ "ཁྱོད་ འཕྲལ་འཕྲལ་རང་ མཐུད་ནི་ནང་ དེ་ལས་མཐུད་བཏོག་སྟེ་ཡོད། སྐར་མ་བཅུ་ཐམ་དེ་ཅིག་བསྒུག་ཞིན་ན་ དོ་"
+#~ "རུང་འབད་རྩོལ་བསྐྱེད། ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་རང་འབད་རྩོལ་བསྐྱེད་པ་ཅིན་ ཧེང་བཀལ་རང་བསྒུག་དགོ"
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "ངོ་མ་ཤེསཔ་ནང་ན་འཛུལཝ་ད་ འཛོལ་བ་བྱུང་ནུག: %s"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ %d བྱུང་ནུག  བརྡ་དོན: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "ནུས་མེད་སྡེ་ཚན།"
+
+#~ msgid "Connection Closed"
+#~ msgstr "མཐུད་ལམ་ཁ་མ་བསྡམ།"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "ལན་ལུ་བསྒུག་དོ..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "ཊི་ཨོ་སི་ འདི་གིས་ ཐེམལས་ ལོག་འོང་ནུག  ད་འབདན་ཁྱོད་རང་འཕྲིན་དོན་ཚུ་  དོ་རུང་གཏང་།"
+
+#~ msgid "Password Change Successful"
+#~ msgstr "ཆོག་ཡིག་ བསྒྱུར་བཅོས་ མཐར་འཁྱོལ་ནུག"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Dir བརྡ་དོན་ལེན།"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Dir བརྡ་དོན་གཞི་སྒྲིག་འབད།"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "བྲིས་ནིའི་དོན་ལུ %s ཁ་ཕྱེ་མ་ཚུགས།"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "ཡིག་སྣོད་གནས་སོར་འཐུས་ཤོར་བྱུང་ནུག ཕྱོགས་གཞན་མི་འདི་ཆ་མེད་བཏང་ཡི།"
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "གནས་སོར་གྱི་དོན་ལུ་ མཐུད་མ་ཚུགས།"
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "ཡིག་སྣོད་ཀྱི་མགོ་ཡིག་བྲིས་མ་ཚུགས། ཡིག་སྣོད་འདི་གནས་སོར་མི་གཏང་།"
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr " བཟུམ་སྦེ་སྲུང་བཞག་འབད།"
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] ""
+#~ "%s གིས %s ལུ %dཡིག་སྣོད་དང་ལེན་འབད་ནི་འབད  ཞུ་བ་འབདཝ་ཨིན: %s (%.2f %s)%s%s"
+#~ msgstr[1] ""
+#~ "%s  གིས %s ལུ %d ཡིག་སྣོད་ཚུ་ དང་ལེན་འབད་ནི་འབད་  ཞུ་བ་འབདཝ་ཨིན: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s གིས་ ཁྱོད་ལུ་ ཁོང་ཚུ་ལུ་ཡི་གུ་གཏང་ནིའི་ཞུ་བ་འབདཝ་ཨིན།"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "ཊི་ཨོ་སི་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%sགི་དོན་ལུ་ ལག་ལེན་པའི་བརྡ་དོན་མི་ཐོབ།"
+
+#~ msgid "%s Options"
+#~ msgstr "%s གདམ་ཁ་ཚུ།"
+
+#~ msgid "Proxy Options"
+#~ msgstr "པོ་རོག་སི་གདམ་ཁ་ཚུ།"
+
+#~ msgid "By log size"
+#~ msgstr "དྲན་དེབ་ཚད་ཀྱིས།"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "བརའུ་ཟར་ནང་འབྲེལ་ལམ་ཁ་ཕྱེ(_O)"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ཨེསི་ཊི་ཡུ་ཨེན་ སར་བར།:(_U)"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "གཟུགས་བརྙན་སྲུང་བཞག་འབད།"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "མགྱོགས་ཐབས།"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "ཁ་སླབ་འཕྲིན་དོན་ཚུ་ཐོབ་ཡོདཔ་ད་ སྒོ་སྒྲིག་རིབ་སྟོན་འབད།(_F)"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "མིང་དང་བཅས་པའི་སྡེ་ཚན་འདི་ཧེ་མ་ལས་རང་གནས་ཏེ་འདུག"
 
@@ -14486,13 +15409,6 @@ msgstr ""
 #~ msgid "Change Qun information"
 #~ msgstr "རྒྱུ་ལམ་བརྡ་དོན།"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "འཕྲིན་དོན་རིམ་ལུགས།"
 
@@ -14706,9 +15622,6 @@ msgstr ""
 #~ "སྡེ་ཚན་ %d གྲངས་སུ་འཛུ་ནིའི་དོན་ལུ་ཁྱོད་ཀྱིས་ཞུ་བ་འབད་ཡོད་མི་འདི་ བདག་སྐྱོང་པ་ %d གིས་ དང་ལེན་"
 #~ "འབད་ཡོདཔ་ཨིན།"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "འ་ནི་སྡེ་ཚན་འདི་ཁྱོད་ཀྱི་ ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་བརྐྱབ་ཡོདཔ་ཨིན་པས།"
-
 #~ msgid "I am applying to join"
 #~ msgstr "ང་འཛུལ་ནིའི་དོན་ལུ་འཇུག་སྤྱོད་འབད་དོ།"
 
@@ -14733,10 +15646,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "ཁྱོད་ཀྱི་རྒྱུ་མཚན་ནང་འདེབས་འབད།:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "ནང་བསྐྱོད་འབད་མ་ཚུགས་ རྐྱེན་སེལ་དྲན་དེབ་ཞིབ་དཔྱད་འབད།"
 
@@ -14861,17 +15770,9 @@ msgstr ""
 #~ msgstr "ད་ལྟོའི་ངོ་རྟགས།"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "སར་བར་ལུ་མཐུད་མ་ཚུགས།"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "འཕྲིན་དོན་:(_M)"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "རྩིས་ཐོ:"
-
 #~ msgid "Tag"
 #~ msgstr "ངོ་རྟགས།"
 
@@ -14882,9 +15783,6 @@ msgstr ""
 #~ "\n"
 #~ "ལས་མེད།: %s"
 
-#~ msgid "Nickname: %s\n"
-#~ msgstr "སྐྱོན་མིང་: %s\n"
-
 #~ msgid "Toggle offline buddies"
 #~ msgstr "གློག་ལམ་མེད་པའི་ཆ་རོགས་ཚུ་ སོར་སྟོན་འབད།"
 
@@ -14947,13 +15845,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>འགྲེལ་བཤད།:</b>ཨིསི་པུ་ཀི"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15040,8 +15931,8 @@ msgstr ""
 #~ "You can get version %s from:<br><a href=\"http://Pidgin.sourceforge.net/"
 #~ "\">http://Pidgin.sourceforge.net</a>."
 #~ msgstr ""
-#~ "ཁྱོད་ཀྱིས<br><a href=\"http://Pidgin.sourceforge.net/\">http://Pidgin.sourceforge."
-#~ "net</a>.ལས་ཐོན་རིམ་%sཐོབ་ཚུགས།"
+#~ "ཁྱོད་ཀྱིས<br><a href=\"http://Pidgin.sourceforge.net/\">http://Pidgin."
+#~ "sourceforge.net</a>.ལས་ཐོན་རིམ་%sཐོབ་ཚུགས།"
 
 #~ msgid "Delay"
 #~ msgstr "ཕྱིར་འགྱངས།"
@@ -15339,8 +16230,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "འདི་བཟུམ་བྱུངམ་ད་ལུ་ ཊི་ཨོ་སི་གིས་ འཕྲིན་དོན་ག་ཅི་རང་བཏང་རུང་ སྣང་མེད་སྦེ་བཞགཔ་ཨིནམ་དང་འཕྲིན་"
 #~ "དོན་གཏང་པ་ཅིན་ ཕྱི་ཁ་ཡང་བཏོན་གཏང་འོང་། གཱེམ་གྱིས་ ག་ཅིའི་ཐད་ལས་འབད་རུང་ འཕྲིན་དོན་གཏང་ནི་"
@@ -15352,8 +16243,8 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "སྤྱིར་བཏང་བདེན་བཤད་ཐབས་ལམ་འདི་འཐུས་ཤོར་བྱུང་ནུག འདི་ཡང་ ཡང་ཅིན་ ཁྱོད་རའི་ཆོག་ཡིག་འདི་བདེན་"
 #~ "མེད་ ཡང་ན་ ཡ་ཧུ་བདེན་བཤད་ཀྱི་ལས་འཆར་འདི་བསྒྱུར་བཅོས་འབད་འབདཝ་འོང་།  གཱེམ་གྱིས་  ཝེབ་འཕྲིན་"
@@ -15497,9 +16388,6 @@ msgstr ""
 #~ msgid "Away title: "
 #~ msgstr "ཕྱི་ཁ་ཨིན་པའི་མགོ་མིང་: "
 
-#~ msgid "Buddy List Error"
-#~ msgstr "ཆ་རོགས་ཐོ་ཡིག་གི་འཛོལ་བ།"
-
 #~ msgid "(+%d more)"
 #~ msgstr "(+%d ཧེང་བཀལ)"
 
@@ -15662,9 +16550,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "སེལ་འཐུ་གྲུབ་པའི་ཆ་རོགས་ལུ་འཕྲིན་དོན་གཏང་།"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "སེལ་འཐུ་གྲུབ་པའི་ཆ་རོགས་ཀྱི་བརྡ་དོན་ལེན།"
-
 #~ msgid "_Chat"
 #~ msgstr "ཁ་སླབ(_C)"
 
@@ -15813,9 +16698,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "ལས་མེད(_I)"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "ལས་མེད་ལས་ལོག་ནི(_n)"
-
 #~ msgid "Pounce Action"
 #~ msgstr "པའུནསི་གི་བྱ་བ།"
 
@@ -15944,9 +16826,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "བཅུད་དོན།"
 
-#~ msgid "Message Text"
-#~ msgstr "འཕྲིན་དོན་ཚིག་ཡིག"
-
 #~ msgid "Away Messages"
 #~ msgstr "ཕྱི་ཁའི་འཕྲིན་དོན་ཚུ།"
 
@@ -16017,8 +16896,8 @@ msgstr ""
 #~ msgstr "དགའ་གདམ་ཚུ་མངོན་གསལ་འབད་མ་ཚུགས།"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
 #~ "གཱེམ་འདི་གིས་ཁྱོད་ཀྱི་དགའ་གདམ་ཚུ་མངོན་གསལ་འབད་མ་ཚུགས་པས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ དེ་ཚུ་ད་ལས་"
@@ -16058,9 +16937,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "ཇི་ཇི་དཔེ་མཛོད་ནང་ཚབས་ཆེན་གྱི་འཛོལ་བ།\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "སར་བར་ པིང་འབད་མ་ཚུགས།"
-
 #~ msgid "Looking up GG server"
 #~ msgstr "ཇི་ཇི་སར་བར་ བལྟཝ་ཨིན།"
 
@@ -16127,15 +17003,15 @@ msgstr ""
 #~ msgstr "སྣོད་ཐོ་འཛུལ་སྤྱོད་འབད་མི་ཚུགས།"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "གཱེམ་གྱིས་སྣོད་ཐོ་འཚོལ་ཞིབ་འབད་མ་ཚུགས་པས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ སྣོད་ཐོའི་སར་བར་ལུ་མཐུད་མ་ཚུགས་"
 #~ "པས། དོ་རུང་ཤུལ་ལས་འབད་རྩོལ་བསྐྱེད་གནང་།"
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
 #~ "ག་ཌུ་ ག་ཌུ་ སར་བར་ལུ་འཛོལ་བ་མཐུད་དེ་ཡོདཔ་ལས་བརྟེན་ཏེ་ གཱེམ་གྱིས་ཁྱོད་ཀྱི་ཆོག་ཡིག་བསྒྱུར་བཅོས་འབད་"
 #~ "མ་ཚུགས་པས། དོ་རུང་ཤུལ་ལས་འབད་རྩོལ་བསྐྱེད་གནང་།"
@@ -16147,8 +17023,8 @@ msgstr ""
 #~ msgstr "ལག་ལེན་པའི་གསལ་སྡུད་འཛུལ་སྤྱོད་འབད་མི་ཚུགས།"
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "སྣོད་ཐོ་སར་བར་ལུ་འཛོལ་བ་མཐུདཔ་ལས་བརྟེན་ཏེ་ གཱེམ་གྱིས་ལག་ལེན་པའི་གསལ་སྡུད་འདི་འཛུལ་སྤྱོད་འབད་མ་"
 #~ "ཚུགས་པས། དོ་རུང་ཤུལ་ལས་འབད་རྩོལ་བསྐྱེད་གནང་།"
@@ -16376,15 +17252,9 @@ msgstr ""
 #~ msgstr[0] "(%d འཕྲིན་དོན)"
 #~ msgstr[1] "(%d འཕྲིན་དོན་ཚུ)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(༡ འཕྲིན་དོན)"
-
 #~ msgid "%s logged in."
 #~ msgstr "%s ནང་བསྐྱོད་འབད་ཡི།"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ཕྱིར་བསྐྱོད་འབད་ཡི།"
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
diff --git a/po/el.po b/po/el.po
index 07b35967dd..7f1e69e897 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2,7 +2,7 @@
 #
 # This file is distributed under the same license as the Pidgin package.
 #
-# Copyright (C) Bouklis Panos <panos@echidna-band.com>, 2005-2008.
+# Copyright (C) Bouklis Panos <panos@echidna-band.com>, 2005-2009.
 # Copyright (C) Panayotis Katsaloulis <panayotis@panayotis.com>, 2005.
 # Copyright (C) Ubuntu Greek Translators <ubuntu-gr@lists.ubuntu.com.>, 2005.
 #
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin[el]\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-18 01:17-0800\n"
-"PO-Revision-Date: 2008-12-17 23:56+0200\n"
+"POT-Creation-Date: 2009-07-19 00:16-0700\n"
+"PO-Revision-Date: 2009-07-16 16:48+0300\n"
 "Last-Translator: Bouklis Panos <panos@echidna-band.com>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: Plural-Forms:  nplurals=2; plural=(n != 1)\n"
-"X-Generator: Lokalize 0.2\n"
+"X-Generator: Lokalize 0.3\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -35,16 +35,16 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-"Pidgin %s\n"
+"%s\n"
 "Χρήση: %s [ΕΠΙΛΟΓΉ]...\n"
 "\n"
 "  -c, --config=DIR    χρήση του DIR για τα αρχεία ρυθμίσεων\n"
-"  -d, --debug         τύπωμα των μηνυμάτων αποσφαλμάτωσης στο stdout\n"
+"  -d, --debug         τύπωμα των μηνυμάτων αποσφαλμάτωσης στο stderr\n"
 "  -h, --help          εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "  -n, --nologin       χωρίς αυτόματη είσοδο\n"
 "  -v, --version       εμφάνιση τρέχουσας έκδοσης και έξοδος\n"
@@ -100,7 +100,7 @@ msgstr "Γνωστός ως:"
 
 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "Δημιουργία αυτού του νέου λογαριασμού στον εξυπηρετητή"
+msgstr "Δημιουργία αυτού του λογαριασμού στον εξυπηρετητή"
 
 #. Cancel button
 #. Cancel
@@ -234,6 +234,8 @@ msgstr "Προσθήκη συζήτησης"
 
 msgid "You can edit more information from the context menu later."
 msgstr ""
+"Μπορείτε αργότερα να επεξεργαστείτε περισσότερες πληροφορίες από το σχετικό "
+"μενού."
 
 msgid "Error adding group"
 msgstr "Σφάλμα κατά την προσθήκη ομάδας"
@@ -278,7 +280,7 @@ msgid "Blocked"
 msgstr "Αποκλεισμένος"
 
 msgid "Show when offline"
-msgstr ""
+msgstr "Εμφάνιση και χωρίς σύνδεση"
 
 #, c-format
 msgid "Please enter the new name for %s"
@@ -349,7 +351,7 @@ msgid "Plugins"
 msgstr "Πρόσθετα"
 
 msgid "Block/Unblock"
-msgstr "Αποκλεισμός / Ακύρωση αποκλεισμού"
+msgstr "Αποκλεισμός/Ακύρωση αποκλεισμού"
 
 msgid "Block"
 msgstr "Αποκλεισμός"
@@ -362,7 +364,7 @@ msgid ""
 "Unblock."
 msgstr ""
 "Παρακαλούμε εισάγετε το όνομα χρήστη ή το ψευδώνυμο του ατόμου το οποίο "
-"θέλετε να αποκλείσετε / ακυρώσετε τον αποκλεισμό του."
+"θέλετε να αποκλείσετε/ακυρώσετε τον αποκλεισμό του."
 
 #. Not multiline
 #. Not masked?
@@ -406,7 +408,7 @@ msgid "Send IM..."
 msgstr "Αποστολή άμεσου μηνύματος..."
 
 msgid "Block/Unblock..."
-msgstr "Αποκλεισμός / Ακύρωση αποκλεισμού"
+msgstr "Αποκλεισμός/Ακύρωση αποκλεισμού"
 
 msgid "Join Chat..."
 msgstr "Συμμετοχή σε συζήτηση..."
@@ -612,19 +614,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Αποστολή σε"
 
-msgid "Invite message"
-msgstr "Μήνυμα πρόσκλησης"
-
-msgid "Invite"
-msgstr "Πρόσκληση"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Παρακαλούμε εισάγετε το όνομα του χρήστη που επιθυμείτε να προσκαλέσετε,\n"
-"μαζί με ένα προαιρετικό μήνυμα πρόσκλησης."
-
 msgid "Conversation"
 msgstr "Συνομιλία"
 
@@ -701,7 +690,7 @@ msgstr ""
 "τρέχουσα συνομιλία."
 
 msgid "clear: Clears the conversation scrollback."
-msgstr ""
+msgstr "clear: Καθαρίζει την αναδίφηση της συζήτησης."
 
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;εντολή&gt;:  Βοήθεια σε μια συγκεκριμένη εντολή."
@@ -879,6 +868,41 @@ msgstr "Όλες οι συνομιλίες"
 msgid "System Log"
 msgstr "Καταγραφή συστήματος"
 
+msgid "Calling ... "
+msgstr "Κλήση... "
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Αποδοχή"
+
+msgid "Reject"
+msgstr "Απόρριψη"
+
+msgid "Call in progress."
+msgstr "Κλήση σε εξέλιξη."
+
+msgid "The call has been terminated."
+msgstr "Η κλήση τερματίστηκε."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s επιθυμεί να ξεκινήσει μαζί σας μία συνεδρία ήχου."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+"%s προσπαθεί να ξεκινήσει μαζί σας μία συνεδρία πολυμέσων που δεν "
+"υποστηρίζεται."
+
+msgid "You have rejected the call."
+msgstr "Απορρίψατε την κλήση."
+
+msgid "call: Make an audio call."
+msgstr "call: Πραγματοποίηση μίας κλήσης ήχου."
+
 msgid "Emails"
 msgstr "Emails"
 
@@ -913,6 +937,9 @@ msgstr "Συνέχεια"
 msgid "IM"
 msgstr "Μήνυμα"
 
+msgid "Invite"
+msgstr "Πρόσκληση"
+
 msgid "(none)"
 msgstr "(κανένα)"
 
@@ -1118,7 +1145,6 @@ msgstr "%s απουσιάζει. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s σας έστειλε ένα μήνυμα. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Άγνωστο γεγονός εφόρμησης. Παρακαλούμε αναφέρετέ το!"
 
@@ -1164,7 +1190,6 @@ msgstr "Λεπτά πριν την αλλαγή της κατάστασης"
 msgid "Change status to"
 msgstr "Αλλαγή κατάστασης σε"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Συνομιλίες"
 
@@ -1491,7 +1516,6 @@ msgstr ""
 "Όταν ανοίγει μία νέα συνομιλία αυτό το πρόσθετο θα εισάγει την τελευταία "
 "συνομιλία μέσα στην τρέχουσα."
 
-#, c-format
 msgid "Online"
 msgstr "Συνδεδεμένος"
 
@@ -1535,6 +1559,29 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr "Πρόσθετο lastlog."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Δημιουργία TinyURL μόνο για url μεγαλύτερα από αυτό το μήκος"
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Πρόσθετο TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"Κατά τη λήψη ενός μηνήματος με URL, χρήση του TinyURL για ευκολότερη "
+"αντιγραφή"
+
 msgid "accounts"
 msgstr "λογαριασμοί"
 
@@ -1633,13 +1680,6 @@ msgstr "Αποδοχή πιστοποιητικού για %s;"
 msgid "SSL Certificate Verification"
 msgstr "Επιβεβαίωση πιστοποιητικού SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Αποδοχή"
-
-msgid "Reject"
-msgstr "Απόρριψη"
-
 msgid "_View Certificate..."
 msgstr "_Προβολή πιστοποιητικού..."
 
@@ -1731,6 +1771,7 @@ msgstr "+++ %s συνδέθηκε"
 msgid "+++ %s signed off"
 msgstr "+++ %s αποσυνδέθηκε"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Άγνωστο σφάλμα"
 
@@ -1777,6 +1818,17 @@ msgstr "%s έφυγε από το δωμάτιο."
 msgid "%s left the room (%s)."
 msgstr "%s έφυγε από το δωμάτιο (%s)."
 
+msgid "Invite to chat"
+msgstr "Πρόσκληση σε συζήτηση"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Παρακαλούμε εισάγετε το όνομα του χρήστη που επιθυμείτε να προσκαλέσετε, "
+"μαζί με ένα προαιρετικό μήνυμα πρόσκλησης."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Αποτυχία δημιουργίας σύνδεσης:  %s"
@@ -1908,10 +1960,13 @@ msgid "Starting transfer of %s from %s"
 msgstr "Εκκίνηση μεταφοράς του %s από %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Η μεταφορά του αρχείου <A HREF=\"file://%s\">%s</A> ολοκληρώθηκε"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Η μεταφορά του αρχείου %s ολοκληρώθηκε"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Μεταφορά αρχείου ολοκληρώθηκε"
 
@@ -1919,7 +1974,6 @@ msgstr "Μεταφορά αρχείου ολοκληρώθηκε"
 msgid "You canceled the transfer of %s"
 msgstr "Ακυρώσατε τη μεταφορά του %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Μεταφορά αρχείου ακυρώθηκε"
 
@@ -2125,11 +2179,13 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <ΑΥΤΟΜΑΤΗ-ΑΠΑΝΤΗΣΗ>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Σφάλμα δημιουργίας συζήτησης."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Χρησιμοποιείτε το %s, αλλά αυτό το πρόσθετο απαιτεί το %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Αυτό το πρόσθετο δεν έχει αναγνωριστικό ID."
 
@@ -2535,16 +2591,17 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Κατά την προβολή των καταγραφών, αυτό το πρόσθετο θα περιλάβει τις "
 "καταγραφές από άλλους πελάτες άμεσων μηνυμάτων. Αυτή τη στιγμή, αυτό "
-"περιλαμβάνει τα Adium, Fire, Messenger Plus!, MSN Messenger, και Trillian. \n"
+"περιλαμβάνει τα Adium, MSN Messenger, aMSN, και Trillian. \n"
+"\n"
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το πρόσθετο είναι ακόμη σε κώδικα aplha και μπορεί να "
-"κρασάρει συχνά.  Χρησιμοποιείστε το με δική σας ευθύνη!"
+"καταρρέει συχνά.  Χρησιμοποιείστε το με δική σας ευθύνη!"
 
 msgid "Mono Plugin Loader"
 msgstr "Φορτωτής προσθέτων Mono"
@@ -2592,7 +2649,7 @@ msgstr ""
 "εφόρμηση."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Τα υπόλοιπα μηνύματα θα αποθηκευτούν ως εφόρμηση. Μπορείτε να επεξεργαστείτε/"
@@ -2627,6 +2684,34 @@ msgstr "Αποθήκευση των μηνυμάτων χωρίς σύνδεση
 msgid "Do not ask. Always save in pounce."
 msgstr "Χωρίς ερώτηση. Πάντα αποθήκευση ως εφόρμηση."
 
+msgid "One Time Password"
+msgstr "Κωδικός μίας χρήσης"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Υποστήριξη κωδικών μιας χρήσης"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Εξαναγκασμός χρήσης κωδικών για μια φορά μόνο."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Σας επιτρέπει να εξαναγκάσετε, ανα λογαριασμό, ώστε οι κωδικοί που δεν "
+"αποθηκεύονται να χρησιμοποιούνται σε μόνο μία επιτυχημένη σύνδεση.\n"
+"Σημείωση: Για να λειτουργήσει δεν πρέπει να αποθηκευτεί ο κωδικός λογαριασμού"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2821,15 +2906,14 @@ msgstr ""
 "activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Δε βρέθηκε το σετ εργαλείων Apple Bonjour για Windows, δείτε τις Συχνές "
-"Ερωτήσεις στο: http://d.pidgin.im/BonjourWindows για περισσότερες "
-"πληροφορίες."
+"Δε βρέθηκε το σετ εργαλείων της Apple, \"Bonjour για Windows\", δείτε το "
+"http://d.pidgin.im/BonjourWindows για περισσότερες πληροφορίες."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Αδυναμία ακρόασης εισερχόμενων συνδέσεων άμεσων μηνυμάτων\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Αδυναμία ακρόασης εισερχόμενων συνδέσεων άμεσων μηνυμάτων"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2837,7 +2921,6 @@ msgstr ""
 "Αδυναμία δημιουργία σύνδεσης με τον τοπικό εξυπηρετητή mDNS.  Είναι σε "
 "λειτουργία;"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Όνομα"
 
@@ -2869,6 +2952,10 @@ msgstr "Πρόσθετο πρωτοκόλλου Bonjour"
 msgid "Purple Person"
 msgstr ""
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "Τοπική θύρα"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2879,14 +2966,17 @@ msgstr "%s έκλεισε τη συνομιλία."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Αδύνατο να σταλεί το μήνυμα, η συνομιλία δεν ξεκίνησε."
 
-msgid "Cannot open socket"
-msgstr "Δεν είναι δυνατό το άνοιγμα του υποδοχέα"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Αδυναμία δημιουργίας υποδοχέα: %s"
 
-msgid "Could not bind socket to port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr ""
 
-msgid "Could not listen on socket"
-msgstr "Δεν ήταν δυνατή η ακρόαση του υποδοχέα"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Αδυναμία ακρόασης στον υποδοχέα: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2935,14 +3025,14 @@ msgstr "Αποθήκευση λίστας φίλων..."
 msgid "Load buddylist from file..."
 msgstr "Φόρτωμα λίστας φίλων από αρχείο..."
 
-msgid "Fill in the registration fields."
-msgstr "Συμπληρώστε τα πεδία καταχώρησης."
+msgid "You must fill in all registration fields"
+msgstr "Πρέπει να συμπληρώσετε τα πεδία εγγραφής"
 
-msgid "Passwords do not match."
-msgstr "Οι κωδικοί δεν ταιριάζουν."
+msgid "Passwords do not match"
+msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Αδυναμία καταχώρησης νέου λογαριασμού. Συνέβη σφάλμα.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Αδυναμία καταχώρησης νέου λογαριασμού. Συνέβη ένα άγνωστο σφάλμα."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Καταχωρήθηκε νέος λογαριασμός Gadu-Gadu"
@@ -2953,13 +3043,13 @@ msgstr "Η καταχώρηση ολοκληρώθηκε επιτυχώς!"
 msgid "Password"
 msgstr "Κωδικός"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Κωδικός (ξανά)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
+msgid "Captcha"
 msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
@@ -3013,6 +3103,15 @@ msgstr "Ο κωδικός άλλαξε επιτυχώς!"
 msgid "Current password"
 msgstr "Τρέχων κωδικός"
 
+msgid "Password (retype)"
+msgstr "Κωδικός (ξανά)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Παρακαλούμε εισάγετε τον παλιό και τον καινούριο κωδικό σας για το UIN. "
@@ -3027,13 +3126,13 @@ msgstr "Επιλογή συζήτησης φίλου: %s"
 msgid "Add to chat..."
 msgstr "Προσθήκη στη συζήτηση..."
 
+#. Global
 msgid "Available"
 msgstr "Διαθέσιμος"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Απών"
 
@@ -3061,8 +3160,8 @@ msgstr "Δε βρέθηκαν χρήστες που να ταιριάζουν"
 msgid "There are no users matching your search criteria."
 msgstr "Δε βρέθηκαν χρήστες που να ταιριάζουν με τα κριτήρια αναζήτησης."
 
-msgid "Unable to read socket"
-msgstr "Αδυναμία ανάγνωσης υποδοχέα"
+msgid "Unable to read from socket"
+msgstr "Αδυναμία ανάγνωσης από τον υποδοχέα"
 
 msgid "Buddy list downloaded"
 msgstr "Η λίστα φίλων λήφθηκε"
@@ -3076,8 +3175,14 @@ msgstr "Η λίστα φίλων στάλθηκε"
 msgid "Your buddy list was stored on the server."
 msgstr "Η λίστα φίλων σας αποθηκεύτηκε στον εξυπηρετητή."
 
-msgid "Connection failed."
-msgstr "Αποτυχία σύνδεσης."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Συνδέθηκε"
+
+msgid "Connection failed"
+msgstr "Αποτυχία σύνδεσης"
 
 msgid "Add to chat"
 msgstr "Προσθήκη στη συζήτηση"
@@ -3085,14 +3190,23 @@ msgstr "Προσθήκη στη συζήτηση"
 msgid "Chat _name:"
 msgstr "Όνομα _συζήτησης:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr ""
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Γίνεται σύνδεση"
+
 msgid "Chat error"
 msgstr "Σφάλμα συζήτησης"
 
 msgid "This chat name is already in use"
 msgstr "Αυτό το όνομα συζήτησης χρησιμοποιείται ήδη"
 
-msgid "Not connected to the server."
-msgstr "Δεν είστε συνδεδεμένοι με τον εξυπηρετητή."
+msgid "Not connected to the server"
+msgstr "Δεν υπάρχει σύνδεση με τον εξυπηρετητή"
 
 msgid "Find buddies..."
 msgstr "Εύρεση φίλων..."
@@ -3133,6 +3247,9 @@ msgstr "Δημοφιλής υπηρεσία άμεσων μηνυμάτων στ
 msgid "Gadu-Gadu User"
 msgstr "Χρήστης Gadu-Gadu"
 
+msgid "GG server"
+msgstr "Εξυπηρετητής GG"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Άγνωστη εντολή: %s"
@@ -3147,8 +3264,8 @@ msgstr "Δεν ορίστηκε θέμα συζήτησης"
 msgid "File Transfer Failed"
 msgstr "Αποτυχία μεταφοράς αρχείου"
 
-msgid "Could not open a listening port."
-msgstr "Αδυναμία ανοίγματος μιας θύρας ακρόασης."
+msgid "Unable to open a listening port."
+msgstr "Αδυναμία ανοίγματος μιας θύρας ακρόασης"
 
 msgid "Error displaying MOTD"
 msgstr "Σφάλμα εμφάνισης μηνύματος της ημέρας"
@@ -3163,8 +3280,16 @@ msgstr "Δεν υπάρχει μήνυμα της ημέρας σχετικό μ
 msgid "MOTD for %s"
 msgstr "Μήνυμα της ημέρας για %s"
 
-msgid "Server has disconnected"
-msgstr "Ο εξυπηρετητής αποσυνδέθηκε"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Η σύνδεση με τον εξυπηρετητή χάθηκε: %s"
 
 msgid "View MOTD"
 msgstr "Εμφάνιση μηνύματος της ημέρας"
@@ -3175,25 +3300,23 @@ msgstr "_Κανάλι:"
 msgid "_Password:"
 msgstr "_Κωδικός:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "Τα ψευδώνυμα IRC δεν πρέπει να περιέχουν κενά"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Γίνεται σύνδεση"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "Τα ψευδώνυμα και οι εξυπηρετητές IRC δεν πρέπει να περιέχουν κενά"
 
 msgid "SSL support unavailable"
 msgstr "Υποστήριξη SSL μη διαθέσιμη"
 
-msgid "Couldn't create socket"
-msgstr "Δεν ήταν δυνατή η δημιουργία υποδοχέα"
+msgid "Unable to connect"
+msgstr "Αδυναμία σύνδεσης"
 
-msgid "Couldn't connect to host"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον κεντρικό υπολογιστή"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Αδυναμία σύνδεσης: %s"
 
-msgid "Read error"
-msgstr "Σφάλμα ανάγνωσης"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Ο εξυπηρετητής έκλεισε τη σύνδεση"
 
 msgid "Users"
 msgstr "Χρήστες"
@@ -3374,6 +3497,16 @@ msgstr ""
 "Το όνομα λογαριασμού που επιλέξατε απορρίφθηκε από τον εξυπηρετητή.  Πιθανώς "
 "να περιέχει μη έγκυρους χαρακτήρες."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Το ψευδώνυμο \"%s\" χρησιμοποιείται ήδη."
+
+msgid "Nickname in use"
+msgstr "Ψευδώνυμο που χρησιμοποιείται"
+
 msgid "Cannot change nick"
 msgstr "Δεν είναι δυνατή η αλλαγή του ψευδωνύμου"
 
@@ -3615,13 +3748,11 @@ msgstr ""
 msgid "execute"
 msgstr "εκτέλεση"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"Ο εξυπηρετητής απαιτεί TLS/SSL για να γίνει σύνδεση.  Δε βρέθηκε υποστήριξη "
-"TLS/SSL."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Ο εξυπηρετητής απαιτεί TLS/SSL, όμως δε βρέθηκε υποστήριξη TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "Θέλετε κρυπτογράφηση αλλά δε βρέθηκε υποστήριξη TLS/SSL."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Θέλετε κρυπτογράφηση, όμως δε βρέθηκε υποστήριξη TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
@@ -3639,17 +3770,44 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Έγκριση με σκέτο κείμενο"
 
-msgid "Invalid response from server."
-msgstr "Λανθασμένη ανταπόκριση του εξυπηρετητή."
+msgid "SASL authentication failed"
+msgstr "Αποτυχία έγκρισης SASL"
+
+msgid "Invalid response from server"
+msgstr "Λανθασμένη ανταπόκριση του εξυπηρετητή"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Ο εξυπηρετητής δε χρησιμοποιεί καμία υποστηριζόμενη μέθοδο έγκρισης"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+"Απαιτείτε κρυπτογράφηση, αλλά δεν είναι διαθέσιμη σε αυτόν τον εξυπηρετητή."
+
 msgid "Invalid challenge from server"
 msgstr "Μη έγκυρη πρόκληση από τον εξυπηρετητή"
 
-msgid "SASL error"
-msgstr "Σφάλμα SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Σφάλμα SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr "Δε δόθηκε ID συνεδρίας"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Μη υποστηριζόμενη έκδοση του πρωτοκόλλου BOSH"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Αδυναμίας δημιουργίας σύνδεσης SSL"
 
 msgid "Full Name"
 msgstr "Ονοματεπώνυμο"
@@ -3717,158 +3875,8 @@ msgstr "Πελάτης"
 msgid "Operating System"
 msgstr "Λειτουργικό σύστημα"
 
-msgid "Last Activity"
-msgstr "Τελευταία ενέργεια"
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr "Συζήτηση πολλών ατόμων"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Τοποθεσία χρήστη"
-
-msgid "User Avatar"
-msgstr "Εικόνα χρήστη"
-
-msgid "Chat State Notifications"
-msgstr "Ειδοποιήσεις κατάστασης συζήτησης"
-
-msgid "Software Version"
-msgstr "Έκδοση λογισμικού"
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr "Μεταφορές αρχείων"
-
-msgid "User Mood"
-msgstr "Διάθεση χρήστη"
-
-msgid "User Activity"
-msgstr "Δραστηριότητα χρήστη"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Προφίλ χρήστη"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Όνομα χρήστη"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "Λήψεις μηνυμάτων"
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr "Ο χρήστης συζητάει"
-
-msgid "User Browsing"
-msgstr "Ο χρήστης περιηγείται"
-
-msgid "User Gaming"
-msgstr "Ο χρήστης παίζει"
-
-msgid "User Viewing"
-msgstr "Ο χρήστεις προβάλλει"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr "Καθυστερημένη παράδοση"
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Δυνατότητες"
+msgid "Local Time"
+msgstr "Τοπική ώρα"
 
 msgid "Priority"
 msgstr "Προτεραιότητα"
@@ -3876,6 +3884,13 @@ msgstr "Προτεραιότητα"
 msgid "Resource"
 msgstr "Πηγή"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+msgid "Logged Off"
+msgstr "Αποσυνδεδεμένος"
+
 msgid "Middle Name"
 msgstr "Πατρώνυμο"
 
@@ -3922,7 +3937,6 @@ msgstr "Ομιλητικός"
 msgid "Extended Away"
 msgstr "Πολύ απών"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Μην ενοχλείτε"
 
@@ -4043,29 +4057,22 @@ msgstr "Επιλέξτε τον εξυπηρετητή συνομιλίας πο
 msgid "Find Rooms"
 msgstr "Εύρεση δωματίων"
 
-msgid "You require encryption, but it is not available on this server."
+msgid "Affiliations:"
 msgstr ""
-"Απαιτείτε κρυπτογράφηση, αλλά δεν είναι διαθέσιμη σε αυτόν τον εξυπηρετητή."
 
-msgid "Write error"
-msgstr "Σφάλμα εγγραφής"
+msgid "No users found"
+msgstr "Δε βρέθηκαν χρήστες"
 
-msgid "Ping timeout"
-msgstr "Τέλος χρονικού ορίου για ping"
+msgid "Roles:"
+msgstr "Ρόλοι:"
 
-msgid "Read Error"
-msgstr "Σφάλμα ανάγνωσης"
+msgid "Ping timed out"
+msgstr "Τέλος χρονικού ορίου για ping"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Αδυναμία δημιουργίας υποδοχέα"
 
 msgid "Invalid XMPP ID"
 msgstr "Μη έγκυρο XMPP ID"
@@ -4073,6 +4080,9 @@ msgstr "Μη έγκυρο XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+msgid "Malformed BOSH URL"
+msgstr "Παραμορφωμένο BOSH URL"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Η καταχώρηση του %s@%s ήταν επιτυχής"
@@ -4097,9 +4107,6 @@ msgstr "Επιτυχής διαγραφή"
 msgid "Unregistration Failed"
 msgstr "Αποτυχία διαγραφής"
 
-msgid "Already Registered"
-msgstr "Ήδη καταχωρημένος"
-
 msgid "State"
 msgstr "Πολιτεία"
 
@@ -4112,6 +4119,9 @@ msgstr "Τηλέφωνο"
 msgid "Date"
 msgstr "Ημερομηνία"
 
+msgid "Already Registered"
+msgstr "Ήδη καταχωρημένος"
+
 msgid "Unregister"
 msgstr ""
 
@@ -4161,9 +4171,18 @@ msgstr "Γίνεται έγκριση"
 msgid "Re-initializing Stream"
 msgstr "Επανεκκίνηση ροής"
 
+msgid "Server doesn't support blocking"
+msgstr "Ο εξυπηρετητής δεν υπηστηρίζει αποκλεισμούς"
+
 msgid "Not Authorized"
 msgstr "Δεν εγκρίθηκε"
 
+msgid "Mood"
+msgstr "Διάθεση"
+
+msgid "Now Listening"
+msgstr "Τώρα ακούει"
+
 msgid "Both"
 msgstr "Και τα δύο"
 
@@ -4185,12 +4204,6 @@ msgstr "Καμία"
 msgid "Subscription"
 msgstr "Εγγραφή"
 
-msgid "Mood"
-msgstr "Διάθεση"
-
-msgid "Now Listening"
-msgstr "Τώρα ακούει"
-
 msgid "Mood Text"
 msgstr "Κείμενο διάθεσης"
 
@@ -4233,9 +4246,6 @@ msgstr "Ο κωδικός σας έχει αλλάξει."
 msgid "Error changing password"
 msgstr "Σφάλμα αλλαγής κωδικού"
 
-msgid "Password (again)"
-msgstr "Κωδικός (ξανά)"
-
 msgid "Change XMPP Password"
 msgstr "Αλλαγή κωδικού XMPP"
 
@@ -4429,15 +4439,21 @@ msgid "Unable to ping user %s"
 msgstr "Δεν ήταν δυνατό να γίνει ping στο χρήστη %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+
+#, c-format
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4450,9 +4466,34 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Αδυναμία εκκίνησης πολυμέσων με %s: μη έγκυρο JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Αδυναμία εκκίνησης πολυμέσων με %s: ο χρήστης δεν είναι συνδεδεμένος"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
 
+msgid "Media Initiation Failed"
+msgstr "Αδυναμία εκκίνησης πολυμέσων"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Παρακαλούμε εισάγετε την πηγή του %s με την οποία θέλετε να ξεκινήσετε τη "
+"συνεδρία πολυμέσων."
+
+msgid "Select a Resource"
+msgstr "Επιλογή πηγής"
+
+msgid "Initiate Media"
+msgstr "Έναρξη πολυμέσων"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Ρύθμιση του δωματίου συζήτησης."
 
@@ -4473,16 +4514,16 @@ msgstr ""
 "ban &lt;χρήστης&gt; [αιτία]:  Απαγόρευση εισόδου ενός χρήστη στο δωμάτιο."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;χρήστης&gt; &lt;moderator|participant|visitor|none&gt;: Ορίζει το "
-"ρόλο ενός χρήστη στο δωμάτιο."
+"role &lt;moderator|participant|visitor|none&gt; [ψευδώνυμο 1] [ψευδώνυμο "
+"2] ... : Ορίζει το ρόλο ενός χρήστη στο δωμάτιο."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;χρήστης&gt; [μήνυμα]:  Πρόσκληση ενός χρήστη στο δωμάτιο."
@@ -4545,6 +4586,9 @@ msgstr "Σύνδεση με εξυπηρετητή"
 msgid "File transfer proxies"
 msgstr "Διαμεσολαβητές μεταφοράς αρχείων"
 
+msgid "BOSH URL"
+msgstr "BOSH URL"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4583,6 +4627,14 @@ msgstr "Σφάλμα ανάλυσης XML"
 msgid "Unknown Error in presence"
 msgstr "Υπάρχει άγνωστο σφάλμα"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Σφάλμα κατά τη συμμετοχή στη συζήτηση %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Σφάλμα στη συζήτηση %s"
+
 msgid "Create New Room"
 msgstr "Δημιουργία νέου δωματίου"
 
@@ -4599,13 +4651,28 @@ msgstr "_Ρύθμιση δωματίου"
 msgid "_Accept Defaults"
 msgstr "_Αποδοχή προεπιλεγμένων"
 
+msgid "No reason"
+msgstr "Χωρίς αιτία"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Σφάλμα κατά τη συμμετοχή στη συζήτηση %s"
+msgid "You have been kicked: (%s)"
+msgstr "Έχετε εκδιωχθεί: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Σφάλμα στη συζήτηση %s"
+msgid "Kicked (%s)"
+msgstr "Εκδιωγμένος (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr "Η μεταφορά έκλεισε."
+
+msgid "Failed to open the file"
+msgstr "Αποτυχία κατά το άνοιγμα του αρχείου"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4632,9 +4699,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 "Παρακαλούμε επιλέξτε την πηγή του %s στο οποίο θέλετε να στείλετε ένα αρχείο"
 
-msgid "Select a Resource"
-msgstr "Επιλογή πηγής"
-
 msgid "Edit User Mood"
 msgstr "Επεξεργασία διάθεσης χρήστη"
 
@@ -4669,9 +4733,6 @@ msgstr "Ενέργειες"
 msgid "Select an action"
 msgstr "Επιλέξτε μία ενέργεια"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Αδύνατη η λήψη ενός βιβλίου διευθύνσεων του MSN"
-
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
@@ -4913,7 +4974,6 @@ msgstr "Διαβατήριο παιδιών χωρίς γονική συναίν
 msgid "Passport account not yet verified"
 msgstr "Ο λογαριασμός διαβατηρίου δεν πιστοποιήθηκε"
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4935,17 +4995,39 @@ msgstr "Άλλες επαφές"
 msgid "Non-IM Contacts"
 msgstr "Επαφές μη-άμεσων μηνυμάτων"
 
-msgid "Nudge"
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
 msgstr ""
 
 #, c-format
-msgid "%s has nudged you!"
+msgid "%s sent a wink, but it could not be saved"
 msgstr ""
 
 #, c-format
-msgid "Nudging %s..."
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
 msgstr ""
 
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s σας έστειλε πρόσκληση για συζήτηση με φωνή, κάτι το οποίο δεν "
+"υποστηρίζεται ακόμα."
+
+msgid "Nudge"
+msgstr "Σκούντηγμα"
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s σας σκούντηξε"
+
+#, c-format
+msgid "Nudging %s..."
+msgstr "Σκούντηγμα %s..."
+
 msgid "Email Address..."
 msgstr "Διεύθυνση email..."
 
@@ -5062,7 +5144,7 @@ msgid "Set Work Phone Number..."
 msgstr "Ορισμός τηλεφώνου εργασίας..."
 
 msgid "Set Mobile Phone Number..."
-msgstr "Ορισμός κινητού τηλεφώνου..."
+msgstr "Ορισ�ός κινητού τηλεφώνου..."
 
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ενεργοποίηση/Απενεργοποίηση φορητών συσκευών..."
@@ -5087,8 +5169,29 @@ msgstr ""
 "Χρειάζεται υποστήριξη SSL για το MSN. Παρακαλούμε εγκαταστήστε μία "
 "υποστηριζόμενη βιβλιοθήκη SSL."
 
-msgid "Failed to connect to server."
-msgstr "Αποτυχία σύνδεσης με τον εξυπηρετητή."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Δεν ήταν δυνατή η προσθήκη του φίλου %s επειδή το όνομα χρήστη δεν είναι "
+"έγκυρο.  Τα ονόματα χρήστη πρέπει να είναι μία έγκυρη διεύθυνση ηλεκτρονικού "
+"ταχυδρομείου."
+
+msgid "Unable to Add"
+msgstr "Αδυναμία προσθήκης"
+
+msgid "Authorization Request Message:"
+msgstr "Μήνυμα αίτησης έγκρισης:"
+
+msgid "Please authorize me!"
+msgstr "Παρακαλώ δώστε μου έγκριση!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Εντάξει"
 
 msgid "Error retrieving profile"
 msgstr "Σφάλμα κατά τη λήψη του προφίλ"
@@ -5270,7 +5373,7 @@ msgid "Show custom smileys"
 msgstr "Εμφάνισε τις προσαρμοσμένες φατσούλες"
 
 msgid "nudge: nudge a user to get their attention"
-msgstr ""
+msgstr "nudge: σκούντηγμα ενός χρήστη για να ζητήσετε την προσοχή του"
 
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Έγκριση Windows Live ID:Αδυναμία σύνδεσης"
@@ -5279,63 +5382,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Έγκριση Windows Live ID:Μη έγκυρη απάντηση"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s δεν είναι έγκυρη ομάδα."
-
-msgid "Unknown error."
-msgstr "Άγνωστο σφάλμα."
+msgid "%s just sent you a Nudge!"
+msgstr "%s μόλις σας σκούντηξε!"
 
 #, c-format
-msgid "%s on %s (%s)"
-msgstr "%s σε %s (%s)"
+msgid "Unknown error (%d): %s"
+msgstr "Άγνωστο σφάλμα (%d): %s"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
+msgid "Unable to add user"
+msgstr "Αδυναμία προσθήκης χρήστη"
 
-#. char *adl = g_strndup(payload, len);
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Άγνωστο σφάλμα (%d)"
 
-msgid "Unable to add user"
-msgstr "Αδυναμία προσθήκης χρήστη"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Οι ακόλουθοι χρήστες λείπουν από το βιβλίο επαφών σας"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Αδυναμία προσθήκης χρήστη σε %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Αδυναμία αποκλεισμού χρήστη σε %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Αδύνατο να επιτραπεί ο χρήστης σε %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s δεν ήταν δυνατό να προστεθεί επειδή η λίστα φίλων είναι πλήρης."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s δεν είναι ένας έγκυρος λογαριασμός διαβατηρίου."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Υπηρεσία προσωρινά μη διαθέσιμη."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Το μήνυμα κινητού δε στάλθηκε επειδή ήταν πολύ μεγάλο."
 
-msgid "Unable to rename group"
-msgstr "Αδυναμία μετονομασίας ομάδας"
-
-msgid "Unable to delete group"
-msgstr "Αδυναμία διαγραφής ομάδας"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5380,9 +5447,6 @@ msgstr "Το μήνυμα δε στάλθηκε επειδή συνέβη ένα
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Το μήνυμα δε στάλθηκε επειδή συνέβη ένα άγνωστο σφάλμα."
 
-msgid "Unable to connect"
-msgstr "Αδυναμία σύνδεσης"
-
 msgid "Writing error"
 msgstr "Σφάλμα εγγραφής"
 
@@ -5397,22 +5461,22 @@ msgstr ""
 "Σφάλμα σύνδεσης από %s διακομιστή:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Το πρωτόκολλό μας δεν υποστηρίζεται από τον εξυπηρετητή."
+msgid "Our protocol is not supported by the server"
+msgstr "Το πρωτόκολλό μας δεν υποστηρίζεται από τον εξυπηρετητή"
 
-msgid "Error parsing HTTP."
-msgstr "Σφάλμα ανάλυσης HTTP."
+msgid "Error parsing HTTP"
+msgstr "Σφάλμα ανάλυσης HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Έχετε συνδεθεί από άλλη τοποθεσία."
+msgid "You have signed on from another location"
+msgstr "Έχετε συνδεθεί από άλλη τοποθεσία"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Οι εξυπηρετητές του MSN είναι προσωρινά μη διαθέσιμοι. Παρακαλούμε "
 "περιμένετε και ξαναδοκιμάστε."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "Οι εξυπηρετητές του MSN κλείνουν προσωρινά."
+msgid "The MSN servers are going down temporarily"
+msgstr "Οι εξυπηρετητές του MSN κλείνουν προσωρινά"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5442,6 +5506,16 @@ msgstr "Αποστολή cookie"
 msgid "Retrieving buddy list"
 msgstr "Λήψη λίστας φίλων"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s σας έστειλε πρόσκληση με κάμερα, κάτι το οποίο δεν υποστηρίζεται ακόμα."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s σας έστειλε πρόσκληση με κάμερα, κάτι το οποίο δεν υποστηρίζεται ακόμα."
+
 msgid "Away From Computer"
 msgstr "Μακριά από τον υπολογιστή"
 
@@ -5485,14 +5559,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Το μήνυμα πιθανό να μη στάλθηκε επειδή συνέβη ένα άγνωστο σφάλμα:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s σας προσέθεσε στη λίστα φίλων του."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s σας αφαίρεσε από τη λίστα φίλων του."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Διαγραφή φίλου από το βιβλίο διευθύνσεων;"
 
@@ -5522,6 +5588,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Πρόσθετο πρωτοκόλλου MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s δεν είναι έγκυρη ομάδα."
+
+msgid "Unknown error."
+msgstr "Άγνωστο σφάλμα."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s σε %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Αδυναμία προσθήκης χρήστη σε %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Αδυναμία αποκλεισμού χρήστη σε %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Αδύνατο να επιτραπεί ο χρήστης σε %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s δεν ήταν δυνατό να προστεθεί επειδή η λίστα φίλων είναι πλήρης."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s δεν είναι ένας έγκυρος λογαριασμός διαβατηρίου."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Υπηρεσία προσωρινά μη διαθέσιμη."
+
+msgid "Unable to rename group"
+msgstr "Αδυναμία μετονομασίας ομάδας"
+
+msgid "Unable to delete group"
+msgstr "Αδυναμία διαγραφής ομάδας"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s σας προσέθεσε στη λίστα φίλων του."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s σας αφαίρεσε από τη λίστα φίλων του."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Δεν υπάρχει τέτοιος χρήστης: %s"
 
@@ -5550,6 +5664,8 @@ msgid "Lost connection with server"
 msgstr "Η σύνδεση με τον εξυπηρετητή χάθηκε"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Νέα αλληλογραφία"
 
@@ -5588,27 +5704,23 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Προσθήκη επαφών από τον εξυπηρετητή"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Συνδέθηκε"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Σφάλμα πρωτοκόλλου, κώδικας %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Ο κωδικό σας είναι %d χαρακτήρες, μεγαλύτερος από το μέγιστο επιτρεπόμενο "
-"μήκος των %d για το MySpaceIM. Παρακαλούμε μικρύνετε τον κωδικό σας στο "
-"http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
-"changePassword και δοκιμάστε ξανά."
+"%s Ο κωδικός σας είναι %zu χαρακτήρες, μεγαλύτερος από το μέγιστο "
+"επιτρεπόμενο μήκος των %d. Παρακαλούμε μικρύνετε τον κωδικό σας στο http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"και δοκιμάστε ξανά."
+
+msgid "Incorrect username or password"
+msgstr "Λανθασμένο όνομα χρήστη ή κωδικός."
 
 msgid "MySpaceIM Error"
 msgstr "Σφάλμα MySpaceIM"
@@ -5616,16 +5728,6 @@ msgstr "Σφάλμα MySpaceIM"
 msgid "Invalid input condition"
 msgstr "λανθασμένη συνθήκη εισόδου"
 
-msgid "Read buffer full (2)"
-msgstr "Η ενδιάμεση μνήμη ανάγνωσης είναι γεμάτη (2)"
-
-msgid "Unparseable message"
-msgstr "Μη αναλυόμενο μήνυμα"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Αδυναμία σύνδεσης στον υπολογιστή: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Αδυναμία προσθήκης φίλου"
 
@@ -5710,6 +5812,12 @@ msgstr "Σύνολο φίλων"
 msgid "Client Version"
 msgstr "Έκδοση πελάτη"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Το όνομα χρήστη είναι διαθέσιμο"
 
@@ -5927,9 +6035,6 @@ msgstr "Δεν μπορείτε να προσθέσετε τον εαυτό σα
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr "Λανθασμένο όνομα χρήστη ή κωδικός."
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 "Δεν ήταν δυνατή η αναγνώριση του κεντρικού υπολογιστή τουονόματος χρήστη που "
@@ -5975,8 +6080,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Άγνωστο σφάλμα: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Η σύνδεση απέτυχε (%s)."
+msgid "Unable to login: %s"
+msgstr "Αδυναμία εισόδου: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6086,9 +6191,6 @@ msgstr "Συζήτηση GroupWise %d"
 msgid "Authenticating..."
 msgstr "Γίνεται έγκριση..."
 
-msgid "Unable to connect to server."
-msgstr "Αδύνατη η σύνδεση με τον εξυπηρετητή."
-
 msgid "Waiting for response..."
 msgstr "Αναμονή ανταπόκρισης..."
 
@@ -6112,9 +6214,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Θέλετε να συμμετάσχετε στη συζήτηση;"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Αποσυνδεθήκατε επειδή είστε συνδεδεμένοι από άλλο σταθμό εργασίας."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6123,16 +6222,12 @@ msgstr ""
 "στείλατε."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Αδύνατη η σύνδεση με τον εξυπηρετητή. Παρακαλούμε εισάγετε τη διεύθυνση του "
 "εξυπηρετητή με τον οποίο επιθυμείτε να συνδεθείτε."
 
-msgid "Error. SSL support is not installed."
-msgstr "Σφάλμα. Δεν είναι εγκατεστημένη η υποστήριξη SSL."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Αυτή η συζήτηση έκλεισε. Δεν είναι δυνατή η αποστολή άλλων μηνυμάτων."
 
@@ -6155,25 +6250,33 @@ msgstr "Διεύθυνση εξυπηρετητή"
 msgid "Server port"
 msgstr "Θύρα εξυπηρετητή"
 
+msgid "Received unexpected response from "
+msgstr "Λήφθηκε αναπάντεχη ανταπόκριση από "
+
+#. username connecting too frequently
+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 ""
+"Συνδεόσασταν και αποσυνδεόσασταν πολύ γρήγορα. Περιμένετε δέκα λεπτά και "
+"ξαναπροσπαθήστε. Αν συνεχίσετε να προσπαθείτε, θα πρέπει να περιμένετε ακόμα "
+"περισσότερο."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Σφάλμα αίτησης "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Δεν ήταν δυνατή η είσοδος στο δωμάτιο συζήτησης"
 
 msgid "Invalid chat room name"
 msgstr "Μη έγκυρο όνομα δωματίου"
 
-msgid "Server closed the connection."
-msgstr "Ο εξυπηρετητής έκλεισε τη σύνδεση"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Η σύνδεση με τον εξυπηρετητή χάθηκε:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Λήφθηκαν μη έγκυρα δεδομένα κατά τη σύνδεση με τον εξυπηρετητή."
+msgid "Received invalid data on connection with server"
+msgstr "Λήφθηκαν μη έγκυρα δεδομένα κατά τη σύνδεση με τον εξυπηρετητή"
 
 #. *< type
 #. *< ui_requirement
@@ -6221,7 +6324,7 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 "Λήφθηκαν μη έγκυρα δεδομένα κατά τη σύνδεση με τον απομακρυσμένο χρήστη."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Δεν ήταν δυνατή η δημιουργία σύνδεσης με τον απομακρυσμένο χρήστη."
 
 msgid "Direct IM established"
@@ -6400,23 +6503,18 @@ msgstr "Κάμερα"
 msgid "Screen Sharing"
 msgstr ""
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Ελεύθερος για συζήτηση"
 
-#, c-format
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
-#, c-format
 msgid "Occupied"
 msgstr "Απασχολημένος"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Εμφανής στον ιστό"
 
-#, c-format
 msgid "Invisible"
 msgstr "Αόρατος"
 
@@ -6430,20 +6528,12 @@ msgid "Buddy Comment"
 msgstr "Σχόλιο φίλου"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Δεν ήταν δυνατή η σύνδεση με τον εξυπηρετητή πιστοποίησης:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Δεν ήταν δυνατή η σύνδεση με τον εξυπηρετητή πιστοποίησης: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Δεν ήταν δυνατή η σύνδεση με τον εξυπηρετητή BOS:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Δεν ήταν δυνατή η σύνδεση με τον εξυπηρετητή BOS: %s"
 
 msgid "Username sent"
 msgstr "Το όνομα χρήστη στάλθηκε"
@@ -6457,55 +6547,62 @@ msgstr "Ολοκλήρωση σύνδεσης"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Αδυναμία εισόδου: Δεν ήταν δυνατό να συνδεθείτε ως %s επειδή το όνομα χρήστη "
-"δεν είναι έγκυρο.  Τα ονόματα χρήστη πρέπει είτε να είναι μία έγκυρη "
-"διεύθυνση ηλεκτρονικού ταχυδρομείου, είτε να ξεκινούν με ένα γράμμα και να "
-"περιέχουν μόνο γράμματα, αριθμούς και κενά, είτε να περιέχουν μόνο αριθμούς."
+"Αδυναμία εισόδου ως %s επειδή το όνομα χρήστη δεν είναι έγκυρο.  Τα ονόματα "
+"χρήστη πρέπει είτε να είναι μία έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου, "
+"είτε να ξεκινούν με ένα γράμμα και να περιέχουν μόνο γράμματα, αριθμούς και "
+"κενά, είτε να περιέχουν μόνο αριθμούς."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Μη έγκυρο όνομα χρήστη."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Μπορεί να αποσυνδεθείτε πολύ γρήγορα.  Αν γίνει αυτό, ελέγξτε το %s για "
+"αναβαθμίσεις."
 
-msgid "Incorrect password."
-msgstr "Λανθασμένος κωδικός."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Αδυναμία λήψης ενός έγκυρου hash εισόδου στο AIM."
+
+msgid "Unable to get a valid login hash."
+msgstr "Αδυναμία λήψης ενός έγκυρου hash εισόδου."
+
+msgid "Received authorization"
+msgstr "Λήφθηκε έγκριση"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Το όνομα χρήστη δεν υπάρχει"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Ο λογαριασμός σας είναι προς το παρόν σε αναστολή."
+msgid "Your account is currently suspended"
+msgstr "Ο λογαριασμός σας είναι προς το παρόν σε αναστολή"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Η υπηρεσία AOL Instant Messenger είναι προσωρινά μη διαθέσιμη."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Συνδεόσασταν και αποσυνδεόσασταν πολύ γρήγορα. Περιμένετε δέκα λεπτά και "
-"ξαναπροσπαθήστε. Αν συνεχίσετε να προσπαθείτε, θα πρέπει να περιμένετε ακόμα "
-"περισσότερο."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Η έκδοση πελάτη που χρησιμοποιείτε είναι πολύ παλιά. Παρακαλούμε αναβαθμίστε "
 "σε %s"
 
-msgid "Could Not Connect"
-msgstr "Δεν ήταν δυνατή η σύνδεση"
-
-msgid "Received authorization"
-msgstr "Λήφθηκε έγκριση"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Συνδεόσασταν και αποσυνδεόσασταν πολύ γρήγορα. Περιμένετε ένα λεπτό και "
+"ξαναπροσπαθήστε. Αν συνεχίσετε να προσπαθείτε, θα πρέπει να περιμένετε ακόμα "
+"περισσότερο."
 
-msgid "The SecurID key entered is invalid."
-msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο."
+msgid "The SecurID key entered is invalid"
+msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"
 
 msgid "Enter SecurID"
 msgstr "Εισαγωγή SecurID"
@@ -6513,30 +6610,6 @@ msgstr "Εισαγωγή SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Δώστε τα 6 ψηφία από τη ψηφιακή οθόνη."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_Εντάξει"
-
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Αποσυνδεθήκατε πολύ γρήγορα.  Ίσως να θέλετε να χρησιμοποιήσετε το TOC μέχρι "
-"να διορθωθεί αυτό.  Ελέγξτε το %s για αναβαθμίσεις."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Αδυναμία λήψης ενός έγκυρου hash εισόδου στο AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Αποσυνδεθήκατε πολύ γρήγορα.  Ελέγξτε το %s για αναβαθμίσεις."
-
-msgid "Unable to get a valid login hash."
-msgstr "Αδυναμία λήψης ενός έγκυρου hash εισόδου."
-
 msgid "Password sent"
 msgstr "Κωδικός στάλθηκε"
 
@@ -6547,12 +6620,6 @@ msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Παρακαλώ δώστε μου έγκριση ώστε να μπορώ να σας προσθέσω στη λίστα φίλων μου."
 
-msgid "Authorization Request Message:"
-msgstr "Μήνυμα αίτησης έγκρισης:"
-
-msgid "Please authorize me!"
-msgstr "Παρακαλώ δώστε μου έγκριση!"
-
 msgid "No reason given."
 msgstr "Δεν δόθηκε αιτία."
 
@@ -6676,7 +6743,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Χάσατε %hu μήνυμα από %s για άγνωστο λόγο."
 msgstr[1] "Χάσατε %hu μηνύματα από %s για άγνωστο λόγο."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Αδυναμία αποστολής μηνύματος: %s"
@@ -6698,6 +6765,9 @@ msgstr "Συνδεδεμένος από"
 msgid "Member Since"
 msgstr "Μέλος από"
 
+msgid "Capabilities"
+msgstr "Δυνατότητες"
+
 msgid "Profile"
 msgstr "Προφίλ"
 
@@ -6883,7 +6953,7 @@ msgstr "Πολύ μεγάλο μήνυμα απουσίας."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6892,9 +6962,6 @@ msgstr ""
 "ταχυδρομείου, ή ξεκινούν με ένα γράμμα και να  περιέχουν μόνο γράμματα, "
 "αριθμούς και κενά, ή να περιέχουν μόνο αριθμούς."
 
-msgid "Unable to Add"
-msgstr "Αδυναμία προσθήκης"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Αδυναμία λήψης της λίστας φίλων"
 
@@ -6910,7 +6977,7 @@ msgstr "Ορφανά"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Αδύνατη η προσθήκη του %s επειδή έχετε πάρα πολλούς φίλους στη λίστα φίλων "
@@ -6920,7 +6987,7 @@ msgid "(no name)"
 msgstr "(χωρίς όνομα)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Δεν ήταν δυνατή η προσθήκη του φίλου %s για άγνωστο λόγο."
 
 #, c-format
@@ -6992,6 +7059,7 @@ msgstr "_Σύνδεση"
 msgid "Get AIM Info"
 msgstr "Λήψη πληροφοριών AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Επεξεργασία σχολίου φίλου"
 
@@ -7054,6 +7122,7 @@ msgstr "_Αναζήτηση"
 msgid "Set User Info (web)..."
 msgstr "Ορισμός πληροφοριών χρήστη (διαδίκτυο)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Αλλαγή κωδικού (διαδίκτυο)"
 
@@ -7083,6 +7152,9 @@ msgstr "Αναζήτηση φίλου με email..."
 msgid "Search for Buddy by Information"
 msgstr "Αναζήτηση φίλου με πληροφορίες"
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7104,7 +7176,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr "Προσπάθεια σύνδεσης με %s:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Προσπάθεια σύνδεσης με διαμεσολαβητή."
 
@@ -7274,6 +7345,34 @@ msgstr "Ενημέρωση"
 msgid "Could not change buddy information."
 msgstr "Δεν ήταν δυνατή η αλλαγή των πληροφοριών φίλου."
 
+msgid "Mobile"
+msgstr "Με φορητή συσκευή"
+
+msgid "Note"
+msgstr "Σημείωση"
+
+#. callback
+msgid "Buddy Memo"
+msgstr ""
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+msgid "_Modify"
+msgstr "_Τροποποίηση"
+
+msgid "Memo Modify"
+msgstr ""
+
+msgid "Server says:"
+msgstr "Ο εξυπηρετητής λέει:"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u απαιτεί έγκριση"
@@ -7545,7 +7644,7 @@ msgstr "<b>Στάλθηκαν</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr ""
+msgstr "<b>Αποστολή ξανά</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
@@ -7580,6 +7679,12 @@ msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
 msgstr ""
 
 msgid "<p><b>Acknowledgement</b>:<br>\n"
+msgstr "<p><b>Αναγνώριση</b>:<br>\n"
+
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Προσεκτικοί Δοκιμαστές</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
 msgstr ""
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
@@ -7607,6 +7712,9 @@ msgstr "Ανανέωση όλων των QQ Quns"
 msgid "About OpenQ"
 msgstr "Σχετικά με το OpenQ"
 
+msgid "Modify Buddy Memo"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7644,14 +7752,17 @@ msgstr "Εμφάνιση μηνύματος εξυπηρετητή"
 msgid "Show server news"
 msgstr "Εμφάνιση νέων εξυπηρετητή"
 
+msgid "Show chat room when msg comes"
+msgstr "Εμφάνιση δωματίου συζήτησης όταν λαμβάνεται μήνυμα"
+
 msgid "Keep alive interval (seconds)"
 msgstr ""
 
 msgid "Update interval (seconds)"
 msgstr ""
 
-msgid "Cannot decrypt server reply"
-msgstr "Δεν ήταν δυνατή η απόκρυψη της απάντησης του εξυπηρετητή"
+msgid "Unable to decrypt server reply"
+msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση της απάντησης του εξυπηρετητή"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
@@ -7675,9 +7786,6 @@ msgstr "Απαιτείται ενεργοποίηση"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Άγνωστος κωδικός απάντησης κατά την είσοδο (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση της απάντησης του εξυπηρετητή"
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -7711,30 +7819,17 @@ msgstr ""
 "Άγνωστος κωδικός απάντησης κατά την είσοδο (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Αδυναμία σύνδεσης."
-
 msgid "Socket error"
 msgstr "Σφάλμα υποδοχέα"
 
-msgid "Unable to read from socket"
-msgstr "Αδυναμία ανάγνωσης από τον υποδοχέα"
-
-msgid "Write Error"
-msgstr "Σφάλμα εγγραφής"
-
-msgid "Connection lost"
-msgstr "Η σύνδεση χάθηκε"
-
 msgid "Getting server"
 msgstr "Λήψη εξυπηρετητή"
 
 msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
-msgstr "Δεν ήταν δυνατή η εύρεση του κεντρικού υπολογιστή"
+msgid "Unable to resolve hostname"
+msgstr ""
 
 msgid "Invalid server or port"
 msgstr "Μη έγκυρος εξυπηρετητής ή θύρα"
@@ -7787,7 +7882,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Εντολή QQ Qun"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση της απάντησης εισόδου"
 
 msgid "Unknown LOGIN CMD"
@@ -7807,9 +7902,6 @@ msgstr "Αποστολή αρχείου"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ακύρωσε τη μεταφορά του %s"
 
-msgid "Connection closed (writing)"
-msgstr "Η σύνδεση έκλεισε (γίνεται εγγραφή)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Τίτλος Ομάδας:</b> %s<br>"
@@ -7865,17 +7957,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Ανακοίνωση διαχειριστή Sametime"
 
-msgid "Connection reset"
-msgstr "Επαναφορά σύνδεσης"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Σφάλμα ανάγνωσης από τον υποδοχέα: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Αδύνατη η σύνδεση με τον κεντρικό υπολογιστή"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ανακοίνωση από %s"
@@ -7898,6 +7979,9 @@ msgstr "Ηχεία"
 msgid "Video Camera"
 msgstr "Βιντεοκάμερα"
 
+msgid "File Transfer"
+msgstr "Μεταφορές αρχείων"
+
 msgid "Supports"
 msgstr "Υποστηρίζει"
 
@@ -8610,9 +8694,6 @@ msgstr "Οργανισμός"
 msgid "Unit"
 msgstr "Μονάδα"
 
-msgid "Note"
-msgstr "Σημείωση"
-
 msgid "Join Chat"
 msgstr "Συμμετοχή σε συζήτηση"
 
@@ -8712,6 +8793,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Στατιστικά δικτύου"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Αποτυχία Ping"
 
@@ -8773,7 +8857,7 @@ msgstr "Μη υποστηριζόμενος τύπος δημοσίου κλει
 msgid "Disconnected by server"
 msgstr "Έγινε αποσύνδεση από τον εξυπηρετητή"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Σφάλμα κατά τη σύνδεση με τον εξυπηρετητή SILC"
 
 msgid "Key Exchange failed"
@@ -8785,27 +8869,24 @@ msgstr ""
 "Αποτυχία συνέχειας αποδεσμευμένης συνεδρίας. Πατήστε Επανασύνδεση για να "
 "δημιουργήσετε νέα σύνδεση"
 
-msgid "Connection failed"
-msgstr "Αποτυχία σύνδεσης"
-
 msgid "Performing key exchange"
 msgstr "Γίνεται ανταλλαγή κλειδιού"
 
-msgid "Unable to create connection"
-msgstr "Αδυναμία δημιουργίας σύνδεσης"
-
-msgid "Could not load SILC key pair"
-msgstr "Αδυναμία φορτώματος του κλειδιού SILC"
+msgid "Unable to load SILC key pair"
+msgstr "Αδυναμία φορτώματος του ζεύγους κλειδιών SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Γίνεται σύνδεση με τον εξυπηρετητή SILC"
 
+msgid "Unable to not load SILC key pair"
+msgstr "Αδυναμία μη φορτώματος του ζεύγους κλειδιών SILC"
+
 msgid "Out of memory"
 msgstr "Τέλος μνήμης"
 
-msgid "Cannot initialize SILC protocol"
-msgstr "Αδυναμία εκκίνησης πρωτοκόλλου SILC"
+msgid "Unable to initialize SILC protocol"
+msgstr "Αδυναμία αρχικοποίησης πρωτοκόλλου SILC"
 
 msgid "Error loading SILC key pair"
 msgstr "Σφάλμα κατά το φόρτωμα του κλειδιού SILC"
@@ -9112,8 +9193,8 @@ msgstr "Ψηφιακή υπογραφή και έλεγχος όλων των μ
 msgid "Creating SILC key pair..."
 msgstr "Δημιουργία κλειδιού SILC..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Αδύνατη η δημιουργία κλειδιού SILC\n"
+msgid "Unable to create SILC key pair"
+msgstr "Αδύνατη η δημιουργία του ζεύγους κλειδιών SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9204,6 +9285,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Δεν υπάρχουν διαθέσιμα στατιστικά εξυπηρετητή"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Σφάλμα κατά τη σύνδεση με τον εξυπηρετητή SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Αποτυχία: Δεν ταιριάζουν οι εκδόσεις, αναβαθμίστε τον πελάτη σας"
@@ -9249,34 +9333,31 @@ msgstr "Αποτυχία: Μη έγκυρο cookie"
 msgid "Failure: Authentication failed"
 msgstr "Αποτυχία: Η έγκρισή απέτυχε"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "Αδυναμία έναρξης σύνδεσης του πελάτη SILC"
+msgid "Unable to initialize SILC Client connection"
+msgstr "Αδυναμία αρχικοποίησης σύνδεσης του πελάτη SILC"
 
 msgid "John Noname"
 msgstr "Γιάννης Χωρίς-όνομα"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Δεν ήταν δυνατό το φόρτωμα του ζεύγους κλειδιών SILC: %s"
 
-msgid "Could not write"
-msgstr "Δεν ήταν δυνατή η εγγραφή"
-
-msgid "Could not connect"
-msgstr "Δεν ήταν δυνατή η σύνδεση"
-
-msgid "Unknown server response."
-msgstr "Άγνωστη απάντηση εξυπηρετητή."
+msgid "Unable to create connection"
+msgstr "Αδυναμία δημιουργίας σύνδεσης"
 
-msgid "Could not create listen socket"
-msgstr "Δεν ήταν δυνατή η δημιουργία υποδοχέα ακρόασης"
+msgid "Unknown server response"
+msgstr "Άγνωστη απάντηση εξυπηρετητή"
 
-msgid "Could not resolve hostname"
-msgstr "Δεν ήταν δυνατή η εύρεση του ονόματος του κεντρικού υπολογιστή"
+msgid "Unable to create listen socket"
+msgstr "Αδυναμία δημιουργίας υποδοχέα ακρόασης"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Τα ονόματα χρήστη χρηστών SIP δεν πρέπει να περιέχουν κενά ή σύμβολα @"
 
+msgid "SIP connect server not specified"
+msgstr "Δεν ορίστηκε εξυπηρετητής SIP"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9310,179 +9391,61 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Εύρεση του %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Αποτυχία σύνδεσης με %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Σύνδεση: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Αδύνατη η εγγραφή του αρχείου %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Αδύνατη η ανάγνωση του αρχείου %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Πολύ μεγάλο μήνυμα, τα τελευταία %s bytes αποκόπηκαν."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s δεν είναι συνδεδεμένος."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Η προειδοποίηση του %s δεν επιτρέπεται."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Το μήνυμα απορρίφθηκε, ξεπεράσατε το όριο ταχύτητας του εξυπηρετητή."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Η συζήτηση στο %s δεν είναι διαθέσιμη."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Στέλνετε πολύ γρήγορα μηνύματα σε %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Χάσατε ένα μήνυμα από %s επειδή ήταν πολύ μεγάλο."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Χάσατε ένα άμεσο μήνυμα από %s επειδή στάλθηκε πολύ γρήγορα."
-
-#, c-format
-msgid "Failure."
-msgstr "Αποτυχία."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Πάρα πολλές αντιστοιχίες."
-
-#, c-format
-msgid "Need more qualifiers."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
+"join &lt;δωμάτιο&gt;:  συμμετοχή σε ένα δωμάτιο συζήτησης στο δίκτυο Yahoo"
 
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Η υπηρεσία καταλόγου είναι προσωρινά μη διαθέσιμη."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Απαγορεύεται η εύρεση email."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Η λέξη-κλειδί αγνοήθηκε."
-
-#, c-format
-msgid "No keywords."
-msgstr "Δεν υπάρχουν λέξεις κλειδιά."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Ο χρήστης δεν έχει πληροφορίες καταλόγου."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Η χώρα δεν υποστηρίζεται."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Άγνωστη αποτυχία: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Λανθασμένο όνομα χρήστη ή κωδικός."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Η υπηρεσία είναι προσωρινά μη διαθέσιμη."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Έχετε πολύ υψηλό επίπεδο προειδοποίησης για να συνδεθείτε."
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Λίστα των καναλιών στο δίκτυο Yahoo"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"Συνδεόσασταν και αποσυνδεόσασταν πολύ γρήγορα.  Περιμένετε δέκα λεπτά και "
-"προσπαθήστε ξανά.  Αν συνεχίσετε να προσπαθείτε, θα χρειαστεί να περιμένετε "
-"ακόμα περισσότερο."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Ένα άγνωστο σφάλμα σύνδεσης συνέβη: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Ένα άγνωστο σφάλμα, %d, συνέβη.  Πληροφορίες: %s"
-
-msgid "Invalid Groupname"
-msgstr "Μη έγκυρο όνομα ομάδας"
 
-msgid "Connection Closed"
-msgstr "Η σύνδεση έκλεισε"
-
-msgid "Waiting for reply..."
-msgstr "Αναμονή απάντησης..."
-
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"Το TOC επέστρεψε από την παύση του. Τώρα μπορείτε να στείλετε μηνύματα ξανά."
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
 
-msgid "Password Change Successful"
-msgstr "Επιτυχής αλλαγή κωδικού"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Πρόσθετο πρωτοκόλλου Yahoo!"
 
-msgid "_Group:"
-msgstr "_Ομάδα:"
+msgid "Pager server"
+msgstr "Εξυπηρετητής τηλεειδοποίησης"
 
-msgid "Get Dir Info"
-msgstr "Λήψη πληροφοριών καταλόγου"
+msgid "Pager port"
+msgstr "Θύρα τηλεειδοποιητή"
 
-msgid "Set Dir Info"
-msgstr "Ορισμός πληροφοριών καταλόγου"
+msgid "File transfer server"
+msgstr "Εξυπηρετητής μεταφοράς αρχείων"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή!"
+msgid "File transfer port"
+msgstr "Θύρα μεταφοράς αρχείων"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Αποτυχία μεταφοράς αρχείου. Πιθανώς να ακυρώθηκε από την άλλη πλευρά."
+msgid "Chat room locale"
+msgstr "Εντοπιότητα δωματίου συζήτησης"
 
-msgid "Could not connect for transfer."
-msgstr "Δεν ήταν δυνατή η σύνδεση για τη μεταφορά."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Παράβλεψη προσκλήσεων συζητήσεων και δωματίων συζητήσεων"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-"Δεν ήταν δυνατή η εγγραφή της κεφαλίδας του αρχείου.  Το αρχείο δε θα "
-"μεταφερθεί."
+msgid "Chat room list URL"
+msgstr "URL λίστας δωματίων συζήτησης"
 
-msgid "Save As..."
-msgstr "Αποθήκευση ως..."
+msgid "Yahoo Chat server"
+msgstr "Εξυπηρετητής συζητήσεων Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s ζητά %s την αποδοχή %d αρχείου: %s (%.2f %s)%s%s"
-msgstr[1] "%s ζητά %s την αποδοχή %d αρχείων: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Θύρα συζητήσεων Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s ζητά να του στείλετε ένα αρχείο"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9494,13 +9457,11 @@ msgstr "%s ζητά να του στείλετε ένα αρχείο"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Πρόσθετο πρωτοκόλλου TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Πρόσθετο πρωτοκόλλου Yahoo! JAPAN"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s σας έστειλε πρόσκληση με κάμερα, κάτι το οποίο δεν υποστηρίζεται ακόμα."
+msgid "Your SMS was not delivered"
+msgstr "Το SMS σας δεν παραδόθηκε"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Το μήνυμα σας Yahoo! δε στάλθηκε."
@@ -9525,6 +9486,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Η προσθήκη φίλου απορρίφθηκε"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Λήφθηκαν μη έγκυρα δεδομένα"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Ο λογαριασμός κλειδώθηκε: Πολλές αποτυχημένες προσπάθειες εισόδου. Η είσοδος "
+"στην ιστοσελίδα του Yahoo! πιθανώς να το διορθώσει αυτό."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Ο λογαριασμός κλειδώθηκε: Άγνωστη αιτία. Η είσοδος στην ιστοσελίδα του "
+"Yahoo! πιθανώς να το διορθώσει αυτό."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Λείπει το όνομα χρήστη ή ο κωδικός."
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9561,39 +9546,28 @@ msgstr ""
 "διορθωθεί."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Δεν ήταν δυνατή η προσθήκη του φίλου %s στην ομάδα %s της λίστας εξυπηρετητή "
-"στο λογαριασμό %s."
+"Δεν ήταν δυνατή η προσθήκη του φίλου %s στην ομάδα %s στη λίστα του "
+"εξυπηρετητή για το λογαριασμό %s."
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "Δεν ήταν δυνατή η προσθήκη του φίλου στη λίστα εξυπηρετητή"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ %s/%s/%s.swf με ήχο ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Λήφθηκε αναπάντεχη ανταπόκριση HTTP από τον εξυπηρετητή."
-
-msgid "Connection problem"
-msgstr "Πρόβλημα σύνδεσης"
+msgid "Received unexpected HTTP response from server"
+msgstr "Λήφθηκε αναπάντεχη ανταπόκριση HTTP από τον εξυπηρετητή"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Χάθηκε η σύνδεση με %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Χάθηκε η σύνδεση με %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Αδυναμία δημιουργίας σύνδεσης με %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Αδυναμία δημιουργίας σύνδεσης με %s: %s"
 
 msgid "Not at Home"
 msgstr "Εκτός σπιτιού"
@@ -9640,8 +9614,8 @@ msgstr "Ρυθμίσεις παρουσίας"
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "Ενεργοποίηση ποιανού ID;"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Συμμετοχή στη συζήτηση με ποιον;"
@@ -9655,74 +9629,15 @@ msgstr "Συμμετοχή χρήστη σε συζήτηση..."
 msgid "Open Inbox"
 msgstr "Άνοιγμα εισερχομένων"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join &lt;δωμάτιο&gt;:  συμμετοχή σε ένα δωμάτιο συζήτησης στο δίκτυο Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Λίστα των καναλιών στο δίκτυο Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Πρόσθετο πρωτοκόλλου Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Ιαπωνίας"
-
-msgid "Pager server"
-msgstr "Εξυπηρετητής τηλεειδοποίησης"
-
-msgid "Japan Pager server"
-msgstr "Εξυπηρετητής τηλεειδοποίησης Ιαπωνίας"
-
-msgid "Pager port"
-msgstr "Θύρα τηλεειδοποιητή"
-
-msgid "File transfer server"
-msgstr "Εξυπηρετητής μεταφοράς αρχείων"
-
-msgid "Japan file transfer server"
-msgstr "Εξυπηρετητής μεταφοράς αρχείων Ιαπωνίας"
-
-msgid "File transfer port"
-msgstr "Θύρα μεταφοράς αρχείων"
-
-msgid "Chat room locale"
-msgstr "Εντοπιότητα δωματίου συζήτησης"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Παράβλεψη προσκλήσεων συζητήσεων και δωματίων συζητήσεων"
-
-msgid "Chat room list URL"
-msgstr "URL λίστας δωματίων συζήτησης"
-
-msgid "Yahoo Chat server"
-msgstr "Εξυπηρετητής συζητήσεων Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Θύρα συζητήσεων Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Αδυναμία σύνδεσης."
+
 msgid "Unable to establish file descriptor."
 msgstr "Αδυναμία σύνδεσης με τον περιγραφέα αρχείων."
 
@@ -9730,6 +9645,9 @@ msgstr "Αδυναμία σύνδεσης με τον περιγραφέα αρ�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s προσπαθεί να σας στείλει ένα σύνολο %d αρχείων.\n"
 
+msgid "Write Error"
+msgstr "Σφάλμα εγγραφής"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Προφίλ Yahoo! Ιαπωνίας"
 
@@ -9847,22 +9765,17 @@ msgstr "Φωνές"
 msgid "Webcams"
 msgstr "Ιστοκάμερες"
 
+msgid "Connection problem"
+msgstr "Πρόβλημα σύνδεσης"
+
 msgid "Unable to fetch room list."
 msgstr "Αδύνατη η λήψη της λίστας δωματίων."
 
 msgid "User Rooms"
 msgstr "Δωμάτια χρηστών"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Πρόβλημα σύνδεσης με τον εξυπηρετητή YCHT."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Η σύνδεση με τον εξυπηρετητή χάθηκε\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Πρόβλημα σύνδεσης με τον εξυπηρετητή YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9982,23 +9895,15 @@ msgid "Exposure"
 msgstr "Έκθεση"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Αδυναμία δημιουργίας υποδοχέα\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Αδυναμία ανάλυσης της ανταπόκρισης του διακομιστή HTTP: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Αδυναμία ανάλυσης της ανταπόκρισης του διακομιστή HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Σφάλμα σύνδεσης διαμεσολαβητή HTTP %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Άρνηση πρόσβασης: ο διαμεσολαβητής HTTP απαγορεύει την σηράγγωση της θύρας %"
 "d."
@@ -10007,9 +9912,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Σφάλμα εύρεσης του %s"
 
-msgid "Could not resolve host name"
-msgstr "Δεν ήταν δυνατή η εύρεση του ονόματος του κεντρικού υπολογιστή"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Ζητείται η προσοχή του %s..."
@@ -10096,9 +9998,6 @@ msgstr "Μην ενοχλείτε"
 msgid "Extended away"
 msgstr "Πολύ απών"
 
-msgid "Mobile"
-msgstr "Με φορητή συσκευή"
-
 msgid "Listening to music"
 msgstr "Ακούει μουσική"
 
@@ -10140,18 +10039,6 @@ msgstr "+++ %s δεν είναι πια ανενεργός"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Σφάλμα ανάγνωσης του %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Ένα σφάλμα συνέβη κατά την ανάγνωση του %s σας.  Δεν φορτώθηκε, και το παλιό "
-"αρχείο μετονομάστηκε σε %s~."
-
 msgid "Calculating..."
 msgstr "Υπολογισμός..."
 
@@ -10259,6 +10146,18 @@ msgstr "Άρνηση σύνδεσης."
 msgid "Address already in use."
 msgstr "Η διεύθυνση ήδη χρησιμοποιείται."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Σφάλμα ανάγνωσης του %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Ένα σφάλμα συνέβη κατά την ανάγνωση του %s σας.  Δεν φορτώθηκε, και το παλιό "
+"αρχείο μετονομάστηκε σε %s~."
+
 msgid "Internet Messenger"
 msgstr "Αποστολέας μηνυμάτων διαδικτύου"
 
@@ -10301,10 +10200,8 @@ msgstr "Ειδοποιήσεις νέας α_λληλογραφίας"
 msgid "Use this buddy _icon for this account:"
 msgstr "Χρήση αυτού του _εικονιδίου φίλου για αυτόν το λογαριασμό."
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Επιλογές %s"
+msgid "Ad_vanced"
+msgstr "_Για προχωρημένους"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Χρήση ρυθμίσεων διαμεσολαβητή GNOME"
@@ -10339,9 +10236,6 @@ msgstr "Αν κοιτάξεις από πραγματικά πολύ κοντά"
 msgid "you can see the butterflies mating"
 msgstr "θα μπορέσεις να δεις τις πεταλούδες να ζευγαρώνουν"
 
-msgid "Proxy Options"
-msgstr "Επιλογές διαμεσολαβητή"
-
 msgid "Proxy _type:"
 msgstr "_Τύπος διαμεσολαβητή:"
 
@@ -10369,8 +10263,8 @@ msgstr "_Βασικά"
 msgid "Create _this new account on the server"
 msgstr "Δημιουργία αυτού του νέου _λογαριασμού στον εξυπηρετητή"
 
-msgid "_Advanced"
-msgstr "_Για προχωρημένους"
+msgid "P_roxy"
+msgstr "_Διαμεσολαβητής"
 
 msgid "Enabled"
 msgstr "Ενεργοποιήθηκε"
@@ -10418,8 +10312,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Παρακαλούμε ανανεώστε τα απαραίτητα πεδία."
 
-msgid "Room _List"
-msgstr "_Λίστα δωματίων"
+msgid "A_ccount"
+msgstr "_Λογαριασμός"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10428,8 +10322,8 @@ msgstr ""
 "Παρακαλούμε εισάγετε τις κατάλληλες πληροφορίες σχετικά με τη συζήτηση που "
 "θέλετε να συμμετάσχετε.\n"
 
-msgid "_Account:"
-msgstr "_Λογαριασμός:"
+msgid "Room _List"
+msgstr "_Λίστα δωματίων"
 
 msgid "_Block"
 msgstr "_Αποκλεισμός"
@@ -10446,6 +10340,15 @@ msgstr "Λήψη _πληροφοριών"
 msgid "I_M"
 msgstr "_Μήνυμα"
 
+msgid "_Audio Call"
+msgstr "Κλήση _ήχου"
+
+msgid "Audio/_Video Call"
+msgstr "Ήχος/_Κλήση βίντεο"
+
+msgid "_Video Call"
+msgstr "Κλήση _βίντεο"
+
 msgid "_Send File..."
 msgstr "_Αποστολή αρχείου..."
 
@@ -10455,9 +10358,12 @@ msgstr "Προσθήκη ε_φόρμησης φίλου..."
 msgid "View _Log"
 msgstr "Εμφάνιση _καταγραφής"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr ""
 
+msgid "Show When Offline"
+msgstr "Εμφάνιση και χωρίς σύνδεση"
+
 msgid "_Alias..."
 msgstr "_Γνωστός ως..."
 
@@ -10493,7 +10399,7 @@ msgid "Persistent"
 msgstr ""
 
 msgid "_Edit Settings..."
-msgstr "_Επεξεργασία ρυθμίσεων..."
+msgstr "_Επεξεργασία ρυ�μίσεων..."
 
 msgid "_Collapse"
 msgstr "_Σύμπτυξη"
@@ -10582,6 +10488,9 @@ msgstr "/Εργαλεία/_Εφόρμηση φίλων"
 msgid "/Tools/_Certificates"
 msgstr "/Εργαλεία/_Πιστοποιητικά"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Εργαλεία/Προσαρμοσμένες _φατσούλες"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Εργαλεία/_Πρόσθετα"
 
@@ -10591,9 +10500,6 @@ msgstr "/Εργαλεία/Π_ροτιμήσεις"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Εργαλεία/Προσωπικό _απόρρητο"
 
-msgid "/Tools/Smile_y"
-msgstr "/Εργαλεία/Smile_y"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Εργαλεία/_Μεταφορές αρχείων"
 
@@ -10711,8 +10617,8 @@ msgstr "Με το χέρι"
 msgid "By status"
 msgstr "Ανά κατάσταση"
 
-msgid "By log size"
-msgstr "Ανά μέγεθος καταγραφής"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10728,6 +10634,9 @@ msgstr "Επανασύνδεση"
 msgid "Re-enable"
 msgstr "Επανενεργοποίηση"
 
+msgid "SSL FAQs"
+msgstr "Συχνές ερωτήσεις SSL"
+
 msgid "Welcome back!"
 msgstr "Καλώς ήρθατε πίσω!"
 
@@ -10819,6 +10728,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "_Γνωστός ως:"
 
+msgid "_Group:"
+msgstr "_Ομάδα:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Αυτόματη ε_πανασύνδεση όταν ο λογαριασμός συνδέεται."
 
@@ -10852,6 +10764,103 @@ msgstr "/Εργαλεία"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Φίλοι/Ταξινόμηση φίλων"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Χρώμα παρασκηνίου"
+
+msgid "The background color for the buddy list"
+msgstr "Το χρώμα παρασκηνίου της λίστας φίλων"
+
+msgid "Layout"
+msgstr ""
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+msgid "Expanded Background Color"
+msgstr ""
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+msgid "Collapsed Background Color"
+msgstr ""
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Χρώμα παρασκηνίου συζητήσεων/επαφών"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+msgid "Contact Text"
+msgstr "Κείμενο επαφών"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+msgid "On-line Text"
+msgstr ""
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+msgid "Away Text"
+msgstr ""
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+msgid "Off-line Text"
+msgstr ""
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+msgid "Idle Text"
+msgstr ""
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+msgid "Message Text"
+msgstr "Κείμενο μηνύματος"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"Το κείμενο πληροφορίας για όταν μία συζήτηση έχει ένα μη αναγνωσμένο μήνυμα "
+"που αναφέρει το ψυεδώνυμό σας"
+
+msgid "The text information for a buddy's status"
+msgstr "Το κείμενο πληροφοριών για την κατάσταση ενός φίλου"
+
+msgid "Type the host name for this certificate."
+msgstr "Εισάγετε το όνομα του υπολογιστή για αυτό το πιστοποιητικό"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Εξυπηρετητές SSL"
@@ -10871,14 +10880,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Πρόσκληση φίλου στο δωμάτιο συζήτησης"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Παρακαλούμε εισάγετε το όνομα του χρήστη που επιθυμείτε να προσκαλέσετε, "
-"μαζί με ένα προαιρετικό μήνυμα πρόσκλησης."
-
 msgid "_Buddy:"
 msgstr "_Φίλος:"
 
@@ -10907,7 +10908,7 @@ msgstr "Παράβλεψη"
 msgid "Get Away Message"
 msgstr "Λήψη μηνύματος απουσίας"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Τελευταία φράση"
 
 msgid "Unable to save icon file to disk."
@@ -10953,6 +10954,18 @@ msgstr "/Συνομιλία/_Αποθήκευση ως..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Συνομιλία/_Καθαρισμός αναδίφησης"
 
+msgid "/Conversation/M_edia"
+msgstr "/Συνομιλία/Πολυ_μέσα"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Συνομιλία/Πολυμέσα/_Κλήση ήχου"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Συνομιλία/Πολυμέσα/Κλήση _βίντεο"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Συνομιλία/Πολυμέσα/Ήχος\\/Κλήση _βίντεο"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Συνομιλία/_Αποστολή αρχείου..."
 
@@ -11025,6 +11038,15 @@ msgstr "/Συνομιλία"
 msgid "/Conversation/View Log"
 msgstr "/Συνομιλία/Εμφάνιση καταγραφής"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Συνομιλία/Πολυμέσα/Κλήση ήχου"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Συνομιλία/Πολυμέσα/Κλήση βίντεο"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Συνομιλία/Πολυμέσα/Ήχος\\/Κλήση βίντεο"
+
 msgid "/Conversation/Send File..."
 msgstr "/Συνομιλία/Αποστολή αρχείου..."
 
@@ -11114,7 +11136,7 @@ msgid "New Event"
 msgstr "Νέο γεγονός"
 
 msgid "clear: Clears all conversation scrollbacks."
-msgstr ""
+msgstr "clear: Καθαρίζει όλες τις αναδιφήσεις συνομιλιών"
 
 msgid "Confirm close"
 msgstr "Επιβεβαίωση κλεισίματος"
@@ -11207,7 +11229,10 @@ msgstr "καλλιτέχνης"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"
+
+msgid "voice and video"
+msgstr "Φωνή και βίντεο"
 
 msgid "support"
 msgstr "υποστήριξη"
@@ -11333,6 +11358,9 @@ msgstr "Ινδικά"
 msgid "Hungarian"
 msgstr "Ουγγρικά"
 
+msgid "Armenian"
+msgstr "Αρμένικα"
+
 msgid "Indonesian"
 msgstr "Ινδονησιακά"
 
@@ -11348,6 +11376,9 @@ msgstr "Γεωργιανά"
 msgid "Ubuntu Georgian Translators"
 msgstr "Γεωργιανοί μεταφραστές Ubuntu"
 
+msgid "Khmer"
+msgstr ""
+
 msgid "Kannada"
 msgstr ""
 
@@ -11369,6 +11400,9 @@ msgstr "Λιθουανικά"
 msgid "Macedonian"
 msgstr "Μακεδονικά (Σλαβικά)"
 
+msgid "Mongolian"
+msgstr "Μογγολικά"
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11423,6 +11457,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "Σουηδικά"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr ""
 
@@ -11484,8 +11521,30 @@ msgstr ""
 "εγγύηση για αυτό το πρόγραμμα.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin στο irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">Συχνές ερωτήσεις:</FONT> <A HREF=\"http://developer.pidgin."
+"im/wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">Βοήθεια μέσω ηλ. ταχυδρομίου:</FONT> <A HREF=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">Κανάλι IRC:</FONT> #pidgin στο irc.freenode.net<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Υπεύθυνοι ανάπτυξης"
@@ -11497,7 +11556,7 @@ msgid "Retired Developers"
 msgstr "Υπεύθυνοι ανάπτυξης που έχουν πλέον αποσυρθεί"
 
 msgid "Retired Crazy Patch Writers"
-msgstr ""
+msgstr "Τρελοί συγγραφείς μπαλωμάτων που έχουν πλέον αποσυρθεί"
 
 msgid "Current Translators"
 msgstr "Τωρινοί μεταφραστές"
@@ -11734,9 +11793,9 @@ msgid "Color to draw hyperlinks."
 msgstr "Χρώμα για να ζωγραφιστούν οι υπερσύνδεσμοι."
 
 msgid "Hyperlink visited color"
-msgstr ""
+msgstr "Χρώμα υπερσυνδέσμου που έχει επισκεφτεί"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Χρώμα για να ζωγραφιστούν οι υπερσύνδεσμοι αφού τους έχετε επισκεφτεί (ή "
 "ενεργοποιήσει)."
@@ -11777,13 +11836,19 @@ msgstr "Χρώμα που θα ζωγραφίζεται το όνομα ενός
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr "Χρώμα ειδοποίησης πληκτρολόγησης"
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 "Το χρώμα που θα χρησιμοποιείται για τη γραμματοσειρά ειδοποίησης "
 "πληκτρολόγησης"
@@ -11798,15 +11863,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Ενεργοποίηση ειδοποίησης πληκτρολόγησης"
 
-msgid "_Copy Email Address"
-msgstr "_Αντιγραφή διεύθυνσης email"
-
-msgid "_Open Link in Browser"
-msgstr "_Άνοιγμα στον περιηγητή"
-
-msgid "_Copy Link Location"
-msgstr "_Αντιγραφή τοποθεσίας συνδέσμου"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11849,11 +11905,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Αποθήκευση εικόνας"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Αποθήκευση εικόνας..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "Π_ροσθήκη προσαρμοσμένης φατσούλας.."
 
@@ -11943,9 +11997,6 @@ msgstr "Μείωση μεγέθους γραμματοσειράς"
 msgid "Font Face"
 msgstr "Είδος γραμματοσειράς"
 
-msgid "Background Color"
-msgstr "Χρώμα παρασκηνίου"
-
 msgid "Foreground Color"
 msgstr "Χρώμα προσκηνίου"
 
@@ -12062,6 +12113,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12079,11 +12131,13 @@ msgstr ""
 "  -h, --help          εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       χωρίς αυτόματη είσοδο\n"
-"  -l, --login[=ΟΝΟΜΑ] αυτόματη είσοδος (το όρισμα ΟΝΟΜΑ προσδιορίζει\n"
-"                      τους λογαριασμούς που θα χρησιμοποιηθούν, χωρισμένους "
-"με κόμμα\n"
-"Χωρίς αυτό θα ενεργοποιηθεί μόνο ο πρώτος λογαριασμός)\n"
-"  --display=DISPLAY   Οθόνη X που θα χρησιμοποιηθεί\n"
+"  -l, --login[=ΟΝΟΜΑ] ενεργοποίηση συγκεκριμένων λογαριασμών (το όρισμα "
+"ΟΝΟΜΑ προσδιορίζει\n"
+"                        τους λογαριασμούς που θα χρησιμοποιηθούν, "
+"χωρισμένους με κόμματα.\n"
+"                        Χωρίς αυτό θα ενεργοποιηθεί μόνο ο πρώτος "
+"λογαριασμός)\n"
+"  --display=ΟΘΟΝΗ   Οθόνη X που θα χρησιμοποιηθεί\n"
 "  -v, --version       εμφάνιση τρέχουσας έκδοσης και έξοδος\n"
 
 #, c-format
@@ -12093,6 +12147,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12109,10 +12164,12 @@ msgstr ""
 "  -h, --help          εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       χωρίς αυτόματη είσοδο\n"
-"  -l, --login[=ΟΝΟΜΑ] αυτόματη είσοδος (το όρισμα ΟΝΟΜΑ προσδιορίζει\n"
+"  -l, --login[=ΟΝΟΜΑ] ενεργοποίηση συγκεκριμένων λογαριασμών (το όρισμα "
+"ΟΝΟΜΑ προσδιορίζει\n"
 "                      τους λογαριασμούς που θα χρησιμοποιηθούν, χωρισμένους "
-"με κόμμα)\n"
-"Χωρίς αυτό θα ενεργοποιηθεί μόνο ο πρώτος λογαριασμός)\n"
+"με κόμματα.\n"
+"                      Χωρίς αυτό θα ενεργοποιηθεί μόνο ο πρώτος "
+"λογαριασμός).\n"
 "  -v, --version       εμφάνιση τρέχουσας έκδοσης και έξοδος\n"
 
 #, c-format
@@ -12136,14 +12193,26 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Άνοιγμα όλων των μηνυμάτων"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "Έξοδος επειδή ήδη τρέχει ένας άλλος πελάτης της libpurple.\n"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr "/_Πολυμέσα"
+
+msgid "/Media/_Hangup"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Έχετε αλληλογραφία!</span>\n"
-"\n"
-"%s"
+
+msgid "Calling..."
+msgstr "Κλήση..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s επιθυμεί να ξεκινήσει μία συνεδρία ήχου/βίντεο μαζί σας."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s επιθυμεί να ξεκινήσει μία συνεδρία βίντεο μαζί σας."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12174,6 +12243,27 @@ msgstr ""
 "Έχει επιλεχθεί η 'με το χέρι' εντολή του περιηγητή, αλλά δεν έχει ορισθεί "
 "καμία εντολή."
 
+msgid "No message"
+msgstr "Χωρίς μήνυμα"
+
+msgid "Open All Messages"
+msgstr "Άνοιγμα όλων των μηνυμάτων"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Έχετε αλληλογραφία!</span>\n"
+"\n"
+"%s"
+
+msgid "New Pounces"
+msgstr "Νέες εφορμήσεις"
+
+msgid "Dismiss"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
 msgid "The following plugins will be unloaded."
 msgstr "Τα ακόλουθα πρόσθετα θα αποφορτωθούν."
 
@@ -12222,10 +12312,16 @@ msgstr "<b>Λεπτομέρειες προσθέτου</b>"
 msgid "Select a file"
 msgstr "Επιλογή αρχείου"
 
+msgid "Modify Buddy Pounce"
+msgstr "Επεξεργασία εφόρμησης φίλου"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Εφόρμηση σε"
 
+msgid "_Account:"
+msgstr "_Λογαριασμός:"
+
 msgid "_Buddy name:"
 msgstr "_Όνομα φίλου:"
 
@@ -12292,7 +12388,57 @@ msgstr "_Κατ' επανάληψη"
 msgid "Pounce Target"
 msgstr "Στόχος εφόρμησης"
 
-msgid "Smiley theme failed to unpack."
+#, c-format
+msgid "Started typing"
+msgstr "Ξεκίνησε να πληκτρολογεί"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Έκανε παύση κατά την πληκτρολόγηση"
+
+#, c-format
+msgid "Signed on"
+msgstr "Συνδέθηκε"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr ""
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Επιστρέφει από απών"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Σταμάτησε την πληκτρολόγηση"
+
+#, c-format
+msgid "Signed off"
+msgstr "Αποσυνδέθηκε"
+
+#, c-format
+msgid "Became idle"
+msgstr "Έγινε ανενεργός"
+
+#, c-format
+msgid "Went away"
+msgstr "Έγινε απών"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Έστειλε ένα μήνυμα"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Άγνωστο.... Παρακαλούμε αναφέρετέ το!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+msgid "Theme failed to load."
+msgstr "Αποτυχία φορτώματος του θέματος"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12315,6 +12461,11 @@ msgstr "Συντομεύσεις πληκτρολογίου"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Κλείσιμο των συνομιλιών με το Escape"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Θέμα λίστα φίλων"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Εικονίδιο εργαλειοθήκης συστήματος"
 
@@ -12324,8 +12475,8 @@ msgstr "Εμφάνιση εικονιδίου εργαλειοθήκης συσ�
 msgid "On unread messages"
 msgstr "Όταν υπάρχουν μη αναγνωσμένα μηνύματα"
 
-msgid "Conversation Window Hiding"
-msgstr "Απόκρυψη παραθύρων συνομιλιών"
+msgid "Conversation Window"
+msgstr "Παράθυρο συζήτησης"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Απόκρυψη νέων συνομιλιών άμεσων μηνυμάτων:"
@@ -12333,6 +12484,9 @@ msgstr "_Απόκρυψη νέων συνομιλιών άμεσων μηνυμ�
 msgid "When away"
 msgstr "Κατά την απουσία"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Ελαχιστοποίηση παραθύρων _νέων συνομιλιών"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Καρτέλες"
@@ -12391,9 +12545,6 @@ msgstr "Χρήση ομαλής κύλισης"
 msgid "F_lash window when IMs are received"
 msgstr "Να ανα_βοσβήνει το παράθυρο όταν λαμβάνονται άμεσα μηνύματα"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Ελαχιστοποίηση παραθύρων _νέων συνομιλιών"
-
 msgid "Minimum input area height in lines:"
 msgstr "Ελάχιστο ύψος περιοχής εισαγωγής κειμένου σε γραμμές:"
 
@@ -12401,7 +12552,7 @@ msgid "Font"
 msgstr "Γραμματοσειρά"
 
 msgid "Use document font from _theme"
-msgstr ""
+msgstr "Χρήση γραμματοσειράς κειμένου από το _θέμα"
 
 msgid "Use font from _theme"
 msgstr "Χρήση γραμματοσειράς _θέματος"
@@ -12425,14 +12576,12 @@ msgstr "Δεν είναι δυνατή η εκκίνηση του προγράμ
 msgid "Cannot start browser configuration program."
 msgstr "Δεν είναι δυνατή η εκκίνηση του προγράμματος ρυθμίσεων περιηγητή."
 
-msgid "ST_UN server:"
-msgstr "Εξυπηρετητής STUN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Παράδειγμα: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Αυτόματος εντοπισμός διεύθυνσης IP"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Χρήση _αυτόματου εντοπισμού διεύθυνσης IP: %s"
 
 msgid "Public _IP:"
 msgstr "Δημόσια _IP:"
@@ -12452,6 +12601,10 @@ msgstr "_Θύρα εκκίνησης:"
 msgid "_End port:"
 msgstr "_Θύρα τέλους:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr ""
 
@@ -12480,6 +12633,10 @@ msgstr "Διαμεσολαβητής"
 msgid "No proxy"
 msgstr "Χωρίς διαμεσολαβητή"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Χρήστης:"
 
@@ -12638,12 +12795,12 @@ msgstr "Απών και ανενεργός"
 msgid "Auto-away"
 msgstr "Αυτόματη απουσία"
 
-msgid "Change status when _idle"
-msgstr "Αλλαγή κατάστασης όταν είμαι _ανενεργός"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Λεπτά πριν γίνω ανενεργός:"
 
+msgid "Change status when _idle"
+msgstr "Αλλαγή κατάστασης όταν είμαι _ανενεργός"
+
 msgid "Change _status to:"
 msgstr "Αλλαγή _κατάστασης σε:"
 
@@ -12799,47 +12956,44 @@ msgstr "_Αποθήκευση & Χρήση"
 msgid "Status for %s"
 msgstr "Κατάσταση %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Υπάρχει ήδη μία προσπαρμοσμένη φατσούλα για το %s. Παρακαλούμε "
+"χρησιμοποιείστε μία διαφορετική συντόμευση."
+
 msgid "Custom Smiley"
 msgstr "Προσαρμοσμένη φατσούλα"
 
-msgid "More Data needed"
-msgstr "Χρειάζονται περισσότερα δεδομένα"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Παρακαλούμε εισάγετε μία συντόμευση για να συσχετιστεί με τη φατσούλα."
-
 msgid "Duplicate Shortcut"
 msgstr "Αντιγραφή συντόμευσης"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Υπάρχει ήδη μία προσπαρμοσμένη φατσούλα για την επιλεγμένη συντόμευση. "
-"Παρακαλούμε εισάγετε μία διαφορετική συντόμευση."
-
-msgid "Please select an image for the smiley."
-msgstr "Παρακαλούμε επιλέξτε μία εικόνα για τη φατσούλα."
-
 msgid "Edit Smiley"
 msgstr "Επεξεργασία φατσούλας"
 
 msgid "Add Smiley"
 msgstr "Προσθήκη φατσούλας"
 
-msgid "Smiley _Image"
-msgstr "Εικόνα _φατσούλας"
+msgid "_Image:"
+msgstr "Ει_κόνα:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "_Συντόμευση φατσούλας"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "_Κείμενο συντόμευσης:"
 
 msgid "Smiley"
 msgstr "Φατσούλα"
 
+msgid "Shortcut Text"
+msgstr "Κείμενο συντόμευσης"
+
 msgid "Custom Smiley Manager"
 msgstr "Διαχειριστής προσαρμοσμένων φατσουλών"
 
+msgid "Select Buddy Icon"
+msgstr "Επιλογή εικονιδίου φίλου"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Κάντε κλικ για να αλλάξετε την εικόνα φίλου για αυτό το λογαριασμό."
 
@@ -12926,8 +13080,8 @@ msgid "Cannot send launcher"
 msgstr "Δεν είναι δυνατή η αποστολή συντόμευσης"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Σύρατε μία συντόμευση της επιφάνειας εργασίας. Το πιθανότερο είναι να θέλετε "
 "να στείλετε το στόχο αυτής της συντόμευσης και όχι την ίδια τη συντόμευση."
@@ -12965,9 +13119,30 @@ msgstr ""
 "Αποτυχία κατά το φόρτωμα της εικόνας '%s': άγνωστη αιτία, πιθανώς ένα "
 "κατεστραμμένο αρχείο εικόνας"
 
+msgid "_Open Link"
+msgstr "_Άνοιγμα συνδέσμου"
+
+msgid "_Copy Link Location"
+msgstr "_Αντιγραφή τοποθεσίας συνδέσμου"
+
+msgid "_Copy Email Address"
+msgstr "_Αντιγραφή διεύθυνσης email"
+
+msgid "_Open File"
+msgstr "_Άνοιγμα αρχείου"
+
+msgid "Open _Containing Directory"
+msgstr "Άνοιγμα _περιεχόμενου καταλόγου"
+
 msgid "Save File"
 msgstr "Αποθήκευση αρχείου"
 
+msgid "_Play Sound"
+msgstr "Αναπαραγωγή _ήχου"
+
+msgid "_Save File"
+msgstr "_Αποθήκευση αρχείου"
+
 msgid "Select color"
 msgstr "Επιλογή χρώματος"
 
@@ -13056,6 +13231,64 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 "Εμφανίζει στατιστικές πληροφορίες σχετικά με τη διαθεσιμότητα των φίλων σας"
 
+msgid "Server name request"
+msgstr "Αίτημα ονόματος εξυπηρετητή"
+
+msgid "Enter an XMPP Server"
+msgstr "Εισάγετε έναν εξυπηρετητή XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Επιλέξτε έναν εξυπηρετητή XMPP για ερώτημα"
+
+msgid "Find Services"
+msgstr "Εύρεση υπηρεσιών"
+
+msgid "Add to Buddy List"
+msgstr "Προσθήκη στη λίστα φίλων"
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Directory"
+msgstr "Κατάλογος"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Περιγραφή:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Ανακάλυψη υπηρεσιών"
+
+msgid "_Browse"
+msgstr "_Περιήγηση"
+
+msgid "Server does not exist"
+msgstr "Ο εξυπηρετητής δεν υπάρχει"
+
+msgid "Server does not support service discovery"
+msgstr "Ο εξυπηρετητής δεν επιτρέπη την ανακάλυψη υπηρεσιών"
+
+msgid "XMPP Service Discovery"
+msgstr "Ανακάλυψη υπηρεσιών XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Επιτρέπει την περιήγηση και την εγγραφή σε υπηρεσίες."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "Ο φίλος είναι ανενεργός"
 
@@ -13461,7 +13694,7 @@ msgstr "Πρόσθετο μουσικών μηνυμάτων για συνεργ
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Το πρόσθετο μηνυμάτων μουσικής επιτρέπει σε έναν αριθμό χρηστών να δουλεύουν "
 "ταυτόχρονα πάνω σε ένα κομμάτι μουσικής καθώς επεξεργάζονται μία κοινή "
@@ -13497,7 +13730,7 @@ msgid "Set window manager \"_URGENT\" hint"
 msgstr "Καθορισμός της υπόδειξης \"_URGENT\" του διαχειριστή παραθύρων"
 
 msgid "_Flash window"
-msgstr ""
+msgstr "_Αναβόσβημα παραθύρου"
 
 #. Raise window method button
 msgid "R_aise conversation window"
@@ -13505,7 +13738,7 @@ msgstr "Α_νύψωση παραθύρου συνομιλίας"
 
 #. Present conversation method button
 msgid "_Present conversation window"
-msgstr ""
+msgstr "_Παράθυρο τρέχουσας συνομιλίας"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -13575,12 +13808,6 @@ msgstr ""
 "- Αντιστρέφει το εισερχόμενο κείμενο\n"
 "- Στέλνει ένα μήνυμα στα άτομα της λίστας σας μόλις συνδεθούν"
 
-msgid "Cursor Color"
-msgstr "Χρώμα δείκτη ποντικιού"
-
-msgid "Secondary Cursor Color"
-msgstr "Δευτερεύον χρώμα δείκτη ποντικιού"
-
 msgid "Hyperlink Color"
 msgstr "Χρώμα υπερσυνδέσμου"
 
@@ -13590,6 +13817,9 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr "Χρώμα ονομάτων τονισμένων μηνυμάτων"
 
+msgid "Typing Notification Color"
+msgstr "Χρώμα ειδοποίησης πληκτρολόγησης"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13619,35 +13849,21 @@ msgstr "Γραμματοσειρά περιβάλλοντος GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Θέμα κειμένου συντόμευσης GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Χρώματα περιβάλλοντος"
+msgid "Disable Typing Notification Text"
+msgstr "Απενεργοποίηση κειμένου ειδοποίησης πληκτρολόγησης"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Ρυθμίσεις ελέγχου θεμάτων GTK+"
 
-msgid "Widget Sizes"
-msgstr "Μεγέθη εφαρμογιδίων"
+msgid "Colors"
+msgstr "Χρώματα"
 
 msgid "Fonts"
 msgstr "Γραμματοσειρές"
 
+msgid "Miscellaneous"
+msgstr "Διάφορα"
+
 msgid "Gtkrc File Tools"
 msgstr "Εργαλεία αρχείων Gtkrc"
 
@@ -13735,10 +13951,10 @@ msgstr "Κουμπί αποστολής παραθύρου συνομιλίας.
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
-"Προσθέτει ένα κουμπί αποστολής στο πεδίο εισαγωγής στο παράθυρο συνομιλίας. "
-"Προορίζεται για περιπτώσης που δεν υπάρχει πραγματικό πληκτρολόγιο."
+"Προσθέτει ένα κουμπί Αποστολή στο πεδίο εισαγωγής στο παράθυρο συνομιλίας. "
+"Προορίζεται για περιπτώσεις που δεν υπάρχει πραγματικό πληκτρολόγιο."
 
 msgid "Duplicate Correction"
 msgstr "Διόρθωση επανάληψης"
@@ -13793,6 +14009,95 @@ msgstr ""
 "Αντικαθιστά το κείμενο στα εξερχόμενα μηνύματα σύμφωνα με ορισμένους από τον "
 "χρήστη κανόνες."
 
+msgid "Just logged in"
+msgstr "Μόλις συνδέθηκε"
+
+msgid "Just logged out"
+msgstr "Μόλις αποσυνδέθηκε"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Εικονίδιο για επαφή/\n"
+"Εικονίδιο για άγνωστο άτομο"
+
+msgid "Icon for Chat"
+msgstr "Εικονίδιο για συζήτηση"
+
+msgid "Ignored"
+msgstr "Παραβλέφθηκε"
+
+msgid "Founder"
+msgstr "Ιδρυτής"
+
+msgid "Operator"
+msgstr ""
+
+msgid "Half Operator"
+msgstr ""
+
+msgid "Authorization dialog"
+msgstr "Διάλογος έγκρισης"
+
+msgid "Error dialog"
+msgstr "Διάλογος σφάλματος"
+
+msgid "Information dialog"
+msgstr "Διάλογος πληροφοριών"
+
+msgid "Mail dialog"
+msgstr "Διάλογος αλληλογραφίας"
+
+msgid "Question dialog"
+msgstr "Διάλογος ερώτησης"
+
+msgid "Warning dialog"
+msgstr "Διάλογος προειδοποίησης"
+
+msgid "What kind of dialog is this?"
+msgstr "Τι είδος διαλόγου είναι αυτό;"
+
+msgid "Status Icons"
+msgstr "Εικονίδια κατάστασης"
+
+msgid "Chatroom Emblems"
+msgstr "Εμβλήματα δωματίων συζητήσεων"
+
+msgid "Dialog Icons"
+msgstr "Εικονίδια διαλόγων"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Έλεγχος θεμάτων εικονιδίων Pidgin"
+
+msgid "Contact"
+msgstr "Επικοινωνία"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Επεξεργαστής θεμάτων λίστα φίλων Pidgin"
+
+msgid "Edit Buddylist Theme"
+msgstr "Επεξεργασία θεμάτων λίστας φίλων"
+
+msgid "Edit Icon Theme"
+msgstr "Επεξεργασία θέματος εικονιδίων"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Επεξεργαστής θεμάτων Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Επεξεργαστής θεμάτων Pidgin"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13954,9 +14259,6 @@ msgstr "_Διατήρηση παραθύρου λίστας φίλων στην
 msgid "Only when docked"
 msgstr "Μόνο όταν είναι προσαρτημένο"
 
-msgid "_Flash window when chat messages are received"
-msgstr "Να ανα_βοσβήνει το παράθυρο όταν λαμβάνονται νέα μηνύματα συζήτησης"
-
 msgid "Windows Pidgin Options"
 msgstr "Επιλογές Windows Pidgin"
 
@@ -13964,10 +14266,10 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Επιλογές ειδικά για το Pidgin για Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Παρέχει επιλογές ειδικά για το Windows Pidgin, όπως είναι η προσάρτηση της "
-"λίστας φίλων."
+"Παρέχει επιλογές ειδικά για το Pidgin για Windows, όπως είναι η προσάρτηση "
+"της λίστας φίλων."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Αποσυνδέθηκε.</font>"
@@ -14009,6 +14311,426 @@ msgstr ""
 "πελατών XMPP."
 
 #, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "Διαμεσολαβητής"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Δεν είναι δυνατό το άνοιγμα του υποδοχέα"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Δεν ήταν δυνατή η ακρόαση του υποδοχέα"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Αδυναμία ανάγνωσης υποδοχέα"
+
+#~ msgid "Connection failed."
+#~ msgstr "Αποτυχία σύνδεσης."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Ο εξυπηρετητής αποσυνδέθηκε"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Δεν ήταν δυνατή η δημιουργία υποδοχέα"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Δεν ήταν δυνατή η σύνδεση με τον κεντρικό υπολογιστή"
+
+#~ msgid "Read error"
+#~ msgstr "Σφάλμα ανάγνωσης"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Σφάλμα εγγραφής"
+
+#~ msgid "Last Activity"
+#~ msgstr "Τελευταία ενέργεια"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Συζήτηση πολλών ατόμων"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Τοποθεσία χρήστη"
+
+#~ msgid "User Avatar"
+#~ msgstr "Εικόνα χρήστη"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Ειδοποιήσεις κατάστασης συζήτησης"
+
+#~ msgid "Software Version"
+#~ msgstr "Έκδοση λογισμικού"
+
+#~ msgid "User Mood"
+#~ msgstr "Διάθεση χρήστη"
+
+#~ msgid "User Activity"
+#~ msgstr "Δραστηριότητα χρήστη"
+
+#~ msgid "User Profile"
+#~ msgstr "Προφίλ χρήστη"
+
+#~ msgid "User Nickname"
+#~ msgstr "Όνομα χρήστη"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Λήψεις μηνυμάτων"
+
+#~ msgid "User Chatting"
+#~ msgstr "Ο χρήστης συζητάει"
+
+#~ msgid "User Browsing"
+#~ msgstr "Ο χρήστης περιηγείται"
+
+#~ msgid "User Gaming"
+#~ msgstr "Ο χρήστης παίζει"
+
+#~ msgid "User Viewing"
+#~ msgstr "Ο χρήστεις προβάλλει"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Καθυστερημένη παράδοση"
+
+#~ msgid "Read Error"
+#~ msgstr "Σφάλμα ανάγνωσης"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Αποτυχία σύνδεσης με τον εξυπηρετητή."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Η ενδιάμεση μνήμη ανάγνωσης είναι γεμάτη (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Μη αναλυόμενο μήνυμα"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Αδυναμία σύνδεσης στον υπολογιστή: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Η σύνδεση απέτυχε (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Αποσυνδεθήκατε επειδή είστε συνδεδεμένοι από άλλο σταθμό εργασίας."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Σφάλμα. Δεν είναι εγκατεστημένη η υποστήριξη SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Λανθασμένος κωδικός."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Δεν ήταν δυνατή η σύνδεση με τον εξυπηρετητή BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Αποσυνδεθήκατε πολύ γρήγορα.  Ελέγξτε το %s για αναβαθμίσεις."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Δεν ήταν δυνατή η σύνδεση"
+
+#~ msgid "Invalid username."
+#~ msgstr "Μη έγκυρο όνομα χρήστη."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση της απάντησης του εξυπηρετητή"
+
+#~ msgid "Connection lost"
+#~ msgstr "Η σύνδεση χάθηκε"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Δεν ήταν δυνατή η εύρεση του κεντρικού υπολογιστή"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Η σύνδεση έκλεισε (γίνεται εγγραφή)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Επαναφορά σύνδεσης"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Σφάλμα ανάγνωσης από τον υποδοχέα: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Αδύνατη η σύνδεση με τον κεντρικό υπολογιστή"
+
+#~ msgid "Could not write"
+#~ msgstr "Δεν ήταν δυνατή η εγγραφή"
+
+#~ msgid "Could not connect"
+#~ msgstr "Δεν ήταν δυνατή η σύνδεση"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Δεν ήταν δυνατή η δημιουργία υποδοχέα ακρόασης"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Δεν ήταν δυνατή η εύρεση του ονόματος του κεντρικού υπολογιστή"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Λανθασμένος κωδικός."
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Αδυναμία δημιουργίας σύνδεσης με %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Ιαπωνίας"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Εξυπηρετητής τηλεειδοποίησης Ιαπωνίας"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Εξυπηρετητής μεταφοράς αρχείων Ιαπωνίας"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Η σύνδεση με τον εξυπηρετητή χάθηκε\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Δεν ήταν δυνατή η εύρεση του ονόματος του κεντρικού υπολογιστή"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Ο εξυπηρετητής απαιτεί TLS/SSL για να γίνει σύνδεση.  Δε βρέθηκε "
+#~ "υποστήριξη TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Απόκρυψη παραθύρων συνομιλιών"
+
+#~ msgid "More Data needed"
+#~ msgstr "Χρειάζονται περισσότερα δεδομένα"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr ""
+#~ "Παρακαλούμε εισάγετε μία συντόμευση για να συσχετιστεί με τη φατσούλα."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Παρακαλούμε επιλέξτε μία εικόνα για τη φατσούλα."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Ενεργοποίηση ποιανού ID;"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Χρώμα δείκτη ποντικιού"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Δευτερεύον χρώμα δείκτη ποντικιού"
+
+#~ msgid "Interface colors"
+#~ msgstr "Χρώματα περιβάλλοντος"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Μεγέθη εφαρμογιδίων"
+
+#~ msgid "Invite message"
+#~ msgstr "Μήνυμα πρόσκλησης"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Παρακαλούμε εισάγετε το όνομα του χρήστη που επιθυμείτε να προσκαλέσετε,\n"
+#~ "μαζί με ένα προαιρετικό μήνυμα πρόσκλησης."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Αδύνατη η λήψη ενός βιβλίου διευθύνσεων του MSN"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Αποσυνδεθήκατε πολύ γρήγορα.  Ίσως να θέλετε να χρησιμοποιήσετε το TOC "
+#~ "μέχρι να διορθωθεί αυτό.  Ελέγξτε το %s για αναβαθμίσεις."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Εύρεση του %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Αποτυχία σύνδεσης με %s"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Σύνδεση: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Αδύνατη η εγγραφή του αρχείου %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Αδύνατη η ανάγνωση του αρχείου %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Πολύ μεγάλο μήνυμα, τα τελευταία %s bytes αποκόπηκαν."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s δεν είναι συνδεδεμένος."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Η προειδοποίηση του %s δεν επιτρέπεται."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "Το μήνυμα απορρίφθηκε, ξεπεράσατε το όριο ταχύτητας του εξυπηρετητή."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Η συζήτηση στο %s δεν είναι διαθέσιμη."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Στέλνετε πολύ γρήγορα μηνύματα σε %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Χάσατε ένα μήνυμα από %s επειδή ήταν πολύ μεγάλο."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Χάσατε ένα άμεσο μήνυμα από %s επειδή στάλθηκε πολύ γρήγορα."
+
+#~ msgid "Failure."
+#~ msgstr "Αποτυχία."
+
+#~ msgid "Too many matches."
+#~ msgstr "Πάρα πολλές αντιστοιχίες."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Η υπηρεσία καταλόγου είναι προσωρινά μη διαθέσιμη."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Απαγορεύεται η εύρεση email."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Η λέξη-κλειδί αγνοήθηκε."
+
+#~ msgid "No keywords."
+#~ msgstr "Δεν υπάρχουν λέξεις κλειδιά."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Ο χρήστης δεν έχει πληροφορίες καταλόγου."
+
+#~ msgid "Country not supported."
+#~ msgstr "Η χώρα δεν υποστηρίζεται."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Άγνωστη αποτυχία: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Λανθασμένο όνομα χρήστη ή κωδικός."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Η υπηρεσία είναι προσωρινά μη διαθέσιμη."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Έχετε πολύ υψηλό επίπεδο προειδοποίησης για να συνδεθείτε."
+
+#~ 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 ""
+#~ "Συνδεόσασταν και αποσυνδεόσασταν πολύ γρήγορα.  Περιμένετε δέκα λεπτά και "
+#~ "προσπαθήστε ξανά.  Αν συνεχίσετε να προσπαθείτε, θα χρειαστεί να "
+#~ "περιμένετε ακόμα περισσότερο."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Ένα άγνωστο σφάλμα σύνδεσης συνέβη: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Ένα άγνωστο σφάλμα, %d, συνέβη.  Πληροφορίες: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Μη έγκυρο όνομα ομάδας"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Η σύνδεση έκλεισε"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Αναμονή απάντησης..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "Το TOC επέστρεψε από την παύση του. Τώρα μπορείτε να στείλετε μηνύματα "
+#~ "ξανά."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Επιτυχής αλλαγή κωδικού"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Λήψη πληροφοριών καταλόγου"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Ορισμός πληροφοριών καταλόγου"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Αποτυχία μεταφοράς αρχείου. Πιθανώς να ακυρώθηκε από την άλλη πλευρά."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Δεν ήταν δυνατή η σύνδεση για τη μεταφορά."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr ""
+#~ "Δεν ήταν δυνατή η εγγραφή της κεφαλίδας του αρχείου.  Το αρχείο δε θα "
+#~ "μεταφερθεί."
+
+#~ msgid "Save As..."
+#~ msgstr "Αποθήκευση ως..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s ζητά %s την αποδοχή %d αρχείου: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s ζητά %s την αποδοχή %d αρχείων: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s ζητά να του στείλετε ένα αρχείο"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Πρόσθετο πρωτοκόλλου TOC"
+
+#~ msgid "%s Options"
+#~ msgstr "Επιλογές %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Επιλογές διαμεσολαβητή"
+
+#~ msgid "By log size"
+#~ msgstr "Ανά μέγεθος καταγραφής"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Άνοιγμα στον περιηγητή"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Εξυπηρετητής STUN:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Εικόνα _φατσούλας"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "_Συντόμευση φατσούλας"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "Να ανα_βοσβήνει το παράθυρο όταν λαμβάνονται νέα μηνύματα συζήτησης"
+
+#, fuzzy
 #~ msgid "Connection to server lost (no data received within %d second)"
 #~ msgid_plural ""
 #~ "Connection to server lost (no data received within %d seconds)"
@@ -14213,9 +14935,6 @@ msgstr ""
 #~ msgid "developer"
 #~ msgstr "υπεύθυνος ανάπτυξης"
 
-#~ msgid "XMPP developer"
-#~ msgstr "υπεύθυνος ανάπτυξης XMPP"
-
 #~ msgid "Artists"
 #~ msgstr "Καλλιτέχνες"
 
@@ -14298,9 +15017,6 @@ msgstr ""
 #~ "Το αίτημά σας να συμμετάσχετε στην ομάδα %d εγκρίθηκε από το διαχειριστή %"
 #~ "d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Αυτή η ομάδα προστέθηκε στη λίστα φίλων σας"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Κάνω αίτηση για συμμετοχή"
 
@@ -14322,9 +15038,6 @@ msgstr ""
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Αδυναμία εισόδου. Ελέγξτε την καταγραφή αποσφαλμάτωσης."
 
-#~ msgid "Unable to login"
-#~ msgstr "Αδυναμία εισόδου"
-
 #~ msgid "TCP Address"
 #~ msgstr "Διεύθυνση TCP"
 
@@ -14360,9 +15073,6 @@ msgstr ""
 #~ "είναι γνωστός ή ένα ψευδώνυμο. Το πως θα είναι γνωστός θα εμφανίζεται στη "
 #~ "θέση του ονόματος λογαριασμού όποτε αυτό είναι δυνατό.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Λογαριασμός:"
-
 #~ msgid "_Screen name:"
 #~ msgstr "Εμ_φανιζόμενο όνομα:"
 
diff --git a/po/en_AU.po b/po/en_AU.po
index 902810b743..3c2052cfdd 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-01-19 07:55+1100\n"
 "Last-Translator: Peter (Bleeter) Lawler <trans@six-by-nine.com.au>\n"
 "Language-Team: English/AU <trans@six-by-nine.com.au>\n"
@@ -33,7 +33,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -637,21 +637,6 @@ msgid "Send To"
 msgstr "_Send As"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "(1 message)"
-
-msgid "Invite"
-msgstr "Invite"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "Conversations"
 
@@ -914,6 +899,42 @@ msgid "System Log"
 msgstr "System Log"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "Calculating..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Accept"
+
+#, fuzzy
+msgid "Reject"
+msgstr "Reset"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "You have parted the channel%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "Email"
 
@@ -951,6 +972,9 @@ msgstr "Connecting"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "Invite"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(no name)"
@@ -1174,7 +1198,6 @@ msgstr "%s has gone away. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
@@ -1230,7 +1253,6 @@ msgstr "_Minutes before setting away:"
 msgid "Change status to"
 msgstr "Change Address To:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1581,7 +1603,6 @@ msgstr ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 
-#, c-format
 msgid "Online"
 msgstr "Online"
 
@@ -1630,6 +1651,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 #, fuzzy
 msgid "accounts"
 msgstr "Accounts"
@@ -1733,14 +1776,6 @@ msgstr "Accept chat invitation?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Accept"
-
-#, fuzzy
-msgid "Reject"
-msgstr "Reset"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1830,6 +1865,8 @@ msgstr "%s signed on"
 msgid "+++ %s signed off"
 msgstr "%s signed off"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -1878,6 +1915,18 @@ msgstr "%s left the room."
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Initiate Conference"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "Failed to set cmodes for %s"
@@ -2016,7 +2065,6 @@ msgstr "Accept file transfer request from %s?"
 msgid "Transfer of file %s complete"
 msgstr "Transfer of file %s complete"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "File transfer complete"
 
@@ -2024,7 +2072,6 @@ msgstr "File transfer complete"
 msgid "You canceled the transfer of %s"
 msgstr "You canceled the transfer of %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
@@ -2209,11 +2256,14 @@ msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Error creating connection"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2627,7 +2677,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2679,7 +2729,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2708,6 +2758,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Change Password"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2901,19 +2977,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Unable to create new connection."
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 #, fuzzy
 msgid "First name"
 msgstr "First name:"
@@ -2951,6 +3026,11 @@ msgstr "Yahoo Protocol Plugin"
 msgid "Purple Person"
 msgstr "New Person"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Locality"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2962,17 +3042,17 @@ msgstr "%s has been invited to this conversation."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Unable to send message. The message is too large."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Unable to open socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Couldn't create socket"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Couldn't create socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3031,15 +3111,15 @@ msgstr "Send Buddy List"
 msgid "Load buddylist from file..."
 msgstr "Import Buddy List from Server"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "New passwords do not match."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Unable to create new connection."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3052,17 +3132,15 @@ msgstr "Registration Successful"
 msgid "Password"
 msgstr "Password"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Password sent"
+msgid "Password (again)"
+msgstr "Password (again)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s not currently logged in."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Currently on"
+msgid "Captcha"
+msgstr "Save Image"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3124,6 +3202,18 @@ msgid "Current password"
 msgstr "Incorrect password."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Password sent"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s not currently logged in."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Currently on"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Please enter your current password and your new password."
 
@@ -3139,13 +3229,13 @@ msgstr "Remove the chat from your buddy list"
 msgid "Add to chat..."
 msgstr "Add a C_hat"
 
+#. Global
 msgid "Available"
 msgstr "Available"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Away"
 
@@ -3177,7 +3267,8 @@ msgstr "Non-matching Hosts"
 msgid "There are no users matching your search criteria."
 msgstr "Please enter your new password"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Unable to read socket"
 
 #, fuzzy
@@ -3196,8 +3287,14 @@ msgstr "Buddy Display"
 msgid "Your buddy list was stored on the server."
 msgstr "There is no Buddy List stored on the Gadu-Gadu server."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Connect"
+
+msgid "Connection failed"
 msgstr "Connection failed"
 
 #, fuzzy
@@ -3208,6 +3305,15 @@ msgstr "Add Chat"
 msgid "Chat _name:"
 msgstr "Last name:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Unable to ping server"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connecting"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Read error"
@@ -3217,7 +3323,7 @@ msgid "This chat name is already in use"
 msgstr "That file already exists"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "You were disconnected from the server."
 
 #, fuzzy
@@ -3266,6 +3372,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Search Engine"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Set User Info..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
@@ -3282,7 +3392,7 @@ msgid "File Transfer Failed"
 msgstr "File transfer cancelled"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin could not open a listening port."
 
 msgid "Error displaying MOTD"
@@ -3298,8 +3408,16 @@ msgstr "There is no MOTD associated with this connection."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "You were disconnected from the server."
 
 msgid "View MOTD"
 msgstr "View MOTD"
@@ -3310,25 +3428,24 @@ msgstr "_Channel:"
 msgid "_Password:"
 msgstr "_Password:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connecting"
-
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-msgid "Couldn't create socket"
-msgstr "Couldn't create socket"
+msgid "Unable to connect"
+msgstr "Unable to connect"
 
-msgid "Couldn't connect to host"
-msgstr "Couldn't connect to host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Unable to connect to server."
 
-msgid "Read error"
-msgstr "Read error"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Error creating connection"
 
 msgid "Users"
 msgstr "Users"
@@ -3512,6 +3629,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "That file already exists"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Nickname"
+
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
@@ -3758,11 +3886,12 @@ msgstr "Command disabled"
 msgid "execute"
 msgstr "Not expected"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3779,19 +3908,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Authentication failed"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Invalid response from server."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Read error"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "No reason given."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Unsupported Version"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "Unable to make SSL connection to server."
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Unable to make SSL connection to server."
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Unable to create new connection."
+
 msgid "Full Name"
 msgstr "Full Name"
 
@@ -3860,187 +4020,9 @@ msgstr "City"
 msgid "Operating System"
 msgstr "Hide Operating System"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Set Dir Info"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Extended Address"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Alias Chat"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "User has no directory information."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Command"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Registration Error"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Location"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Buddy State Notification"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Unsupported Version"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Organisation"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "File Transfers"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Capabilities"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Username"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM with Key Exchange"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Email Address"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Set Profile"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
 #, fuzzy
-msgid "User Nickname"
-msgstr "Nickname"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Live Video"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Message received"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Public Key Babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "User Options"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "User Limit"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian Encryption"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Capabilities"
+msgid "Local Time"
+msgstr "Local Users"
 
 #, fuzzy
 msgid "Priority"
@@ -4049,6 +4031,14 @@ msgstr "Port"
 msgid "Resource"
 msgstr "Resource"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Logged out"
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4097,7 +4087,6 @@ msgstr "Chatty"
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
@@ -4224,34 +4213,37 @@ msgstr "Select a conference server to query"
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
-msgid "Write error"
-msgstr "Write error"
+#, fuzzy
+msgid "No users found"
+msgstr "Non-matching Hosts"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Plain text"
+msgid "Roles:"
+msgstr "Role"
 
-msgid "Read Error"
-msgstr "Read Error"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Plain text"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "Unable to create socket"
-
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
 
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Unable to connect to server."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
@@ -4278,9 +4270,6 @@ msgstr "Registration Successful"
 msgid "Unregistration Failed"
 msgstr "Registration Failed"
 
-msgid "Already Registered"
-msgstr "Already Registered"
-
 msgid "State"
 msgstr "State"
 
@@ -4294,6 +4283,9 @@ msgstr "Phone"
 msgid "Date"
 msgstr "Date"
 
+msgid "Already Registered"
+msgstr "Already Registered"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Register"
@@ -4325,6 +4317,10 @@ msgid "Change Registration"
 msgstr "Registration Error"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Unable to connect to server."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Error Changing Account Info"
 
@@ -4344,9 +4340,18 @@ msgstr "Authenticating"
 msgid "Re-initializing Stream"
 msgstr "Re-initialising Stream"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
+msgid "Mood"
+msgstr "Mood"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Both"
 
@@ -4368,12 +4373,6 @@ msgstr "None"
 msgid "Subscription"
 msgstr "Subscription"
 
-msgid "Mood"
-msgstr "Mood"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "Mood"
@@ -4421,9 +4420,6 @@ msgstr "Your password has been changed."
 msgid "Error changing password"
 msgstr "Error changing password"
 
-msgid "Password (again)"
-msgstr "Password (again)"
-
 msgid "Change XMPP Password"
 msgstr "Change XMPP Password"
 
@@ -4617,18 +4613,24 @@ msgstr "Unable to kick user %s"
 msgid "Unable to ping user %s"
 msgstr "Unable to ban user %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4639,9 +4641,36 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr "The user has blocked you"
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Unable to send message to %s:"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Unable to send file to %s, user does not support file transfers"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Unable to send file to %s, user does not support file transfers"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Registration Failed"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
 msgstr ""
+"Please enter the screen name of the person whose info you would like to view."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "Select a file"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Initiate _Chat"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
@@ -4663,13 +4692,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4737,6 +4766,9 @@ msgstr "Connect server"
 msgid "File transfer proxies"
 msgstr "File transfer port"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4775,6 +4807,14 @@ msgstr "XML Parse error"
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error joining chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error in chat %s"
+
 msgid "Create New Room"
 msgstr "Create New Room"
 
@@ -4793,13 +4833,32 @@ msgstr "Configure Room"
 msgid "_Accept Defaults"
 msgstr "Accept Defaults"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Error joining chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "No reason given."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Error in chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Kicked by %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "An error occurred while opening the file."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "File transfer cancelled"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Failed to store image: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4826,10 +4885,6 @@ msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "Select a file"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "User Modes"
 
@@ -4869,9 +4924,20 @@ msgstr "Accounts"
 msgid "Select an action"
 msgstr "Select a file"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Unable to read file %s."
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Unable To Retrieve Buddy List"
+msgid "Buddy Add error"
+msgstr "Buddy List Error"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "The SecurID key entered is invalid."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5101,7 +5167,7 @@ msgstr "Kids Passport without parental consent"
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Passport account not yet verified"
 
@@ -5125,6 +5191,10 @@ msgstr "Preferred Contact"
 msgid "Non-IM Contacts"
 msgstr "Remove Contact"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5195,6 +5265,13 @@ msgstr "Send a mobile message."
 msgid "Page"
 msgstr "Page"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Warn"
+
 msgid "Has you"
 msgstr "Has you"
 
@@ -5238,6 +5315,14 @@ msgid "Album"
 msgstr ""
 
 #, fuzzy
+msgid "Game Title"
+msgstr "Title"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Title"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "Set Friendly Name"
 
@@ -5279,10 +5364,6 @@ msgstr ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://Pidgin.sf.net/faq-ssl.php for more information."
 
-#, fuzzy
-msgid "Failed to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Error retrieving profile"
 msgstr "Error retrieving profile"
 
@@ -5458,8 +5539,9 @@ msgstr ""
 "Pidgin could not find any information in the user's profile. The user most "
 "likely does not exist."
 
-msgid "Profile URL"
-msgstr "Profile URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "Not allowed when offline"
 
 #. *< type
 #. *< ui_requirement
@@ -5495,67 +5577,29 @@ msgstr "Normal authentication failed!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Normal authentication failed!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s is not a valid group."
-
-msgid "Unknown error."
-msgstr "Unknown error."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s on %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s wants to send you a file"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Unknown error"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Unable to ban user %s"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Unknown error"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Unable to add user on %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Unable to block user on %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Unable to permit user on %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s could not be added because your buddy list is full."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is not a valid passport account."
-
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Service Temporarily Unavailable"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Message could not be sent because the user is offline:"
 
-msgid "Unable to rename group"
-msgstr "Unable to rename group"
-
-msgid "Unable to delete group"
-msgstr "Unable to delete group"
-
 #, fuzzy, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5613,9 +5657,6 @@ msgstr "Message may have not been sent because an unknown error occurred:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-msgid "Unable to connect"
-msgstr "Unable to connect"
-
 msgid "Writing error"
 msgstr "Writing error"
 
@@ -5630,13 +5671,16 @@ msgstr ""
 "Connection error from %s server (%s):\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Our protocol is not supported by the server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Error parsing HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "You have signed on from another location."
 
 #, fuzzy
@@ -5644,7 +5688,8 @@ msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "The MSN servers are going down temporarily."
 
 #, c-format
@@ -5674,6 +5719,14 @@ msgstr "Sending cookie"
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
@@ -5712,14 +5765,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Add to Address Book"
@@ -5728,13 +5773,6 @@ msgstr "Add to Address Book"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Do you want to add this buddy to your buddy list?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, fuzzy, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Unable to read file %s."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "The SecurID key entered is invalid."
@@ -5742,6 +5780,9 @@ msgstr "The SecurID key entered is invalid."
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "Profile URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5755,18 +5796,64 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-msgid "Missing Cipher"
-msgstr ""
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s is not a valid group."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "Unknown error."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s on %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Unable to add user on %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Unable to block user on %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Unable to permit user on %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s could not be added because your buddy list is full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is not a valid passport account."
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Service Temporarily Unavailable"
+
+msgid "Unable to rename group"
+msgstr "Unable to rename group"
+
+msgid "Unable to delete group"
+msgstr "Unable to delete group"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "User Rooms"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "Reading data"
 
@@ -5778,13 +5865,23 @@ msgstr "Invalid challenge from server"
 msgid "Logging in"
 msgstr "Logging"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "No screenname given."
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "You were disconnected from the server."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "New away message"
@@ -5805,21 +5902,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "No screenname given."
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_IM windows"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connected"
-msgstr "Connect"
+msgid "Add contacts from server"
+msgstr "Invalid response from server."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5827,16 +5925,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Incorrect nickname or password."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "Finalising connection"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Failed to join buddy in chat"
 
@@ -5848,14 +5953,6 @@ msgstr "Import Buddy List from Server"
 msgid "persist command failed"
 msgstr "Switchboard failed"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "User Rooms"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Failed to join buddy in chat"
@@ -5867,39 +5964,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "Switchboard failed"
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "Finalising connection"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Queue full"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Unable to parse message"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Couldn't connect to host"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "_IM windows"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "Invalid response from server."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5947,9 +6021,6 @@ msgstr "Larger font size"
 msgid "User"
 msgstr "Users"
 
-msgid "Profile"
-msgstr "Profile"
-
 #, fuzzy
 msgid "Headline"
 msgstr "Decline"
@@ -5965,15 +6036,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "Close conversation"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "No screenname given."
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5986,6 +6052,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "This theme has no available smileys."
@@ -5994,6 +6063,14 @@ msgstr "This theme has no available smileys."
 msgid "Please try another username:"
 msgstr "Please enter a new name for the selected group."
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "No screenname given."
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6191,10 +6268,6 @@ msgid "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Incorrect nickname or password."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Could not recognise the host of the username you entered"
 
@@ -6239,9 +6312,9 @@ msgstr "The user is either offline or you are blocked"
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login failed (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Unable to ban user %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6343,9 +6416,6 @@ msgstr "GroupWise Conference %d"
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-msgid "Unable to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
@@ -6369,26 +6439,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "You have been logged out because you logged in at another workstation."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s appears to be offline and did not receive the message that you just sent."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error. SSL support is not installed."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
@@ -6412,6 +6476,25 @@ msgid "Server port"
 msgstr "Server port"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Invalid response from server."
+
+#. username connecting too frequently
+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 ""
+"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."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Error creating connection"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
 
@@ -6420,17 +6503,7 @@ msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Error creating connection"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "You were disconnected from the server."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Unable to make SSL connection to server."
 
 #. *< type
@@ -6483,8 +6556,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6655,23 +6729,18 @@ msgstr "Camera"
 msgid "Screen Sharing"
 msgstr "Screen Name"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#, c-format
 msgid "Not Available"
 msgstr "Not Available"
 
-#, c-format
 msgid "Occupied"
 msgstr "Occupied"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#, c-format
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -6685,15 +6754,11 @@ msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Could not connect for transfer."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr "Unable to connect to server."
 
 #, fuzzy
@@ -6709,51 +6774,62 @@ msgstr "Finalising connection"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "Invalid Username"
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin was unable to get a valid AIM login hash."
 
-msgid "Incorrect password."
-msgstr "Incorrect password."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin was unable to get a valid login hash."
+
+msgid "Received authorization"
+msgstr "Received authorisation"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "User does not exist"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "The client version you are using is too old. Please upgrade at %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "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."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "The client version you are using is too old. Please upgrade at %s"
-
-msgid "Could Not Connect"
-msgstr "Could Not Connect"
-
-msgid "Received authorization"
-msgstr "Received authorisation"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "The SecurID key entered is invalid."
 
 msgid "Enter SecurID"
@@ -6769,28 +6845,6 @@ msgstr "Enter the 6 digit number from the digital display."
 msgid "_OK"
 msgstr "OK"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin was unable to get a valid AIM login hash."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin was unable to get a valid login hash."
-
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -6923,7 +6977,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu message from %s for an unknown reason."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
@@ -6945,6 +6999,12 @@ msgstr "Online Since"
 msgid "Member Since"
 msgstr "Member Since"
 
+msgid "Capabilities"
+msgstr "Capabilities"
+
+msgid "Profile"
+msgstr "Profile"
+
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
@@ -7098,13 +7158,13 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"The maximum profile length of %d byte has been exceeded.  Pidgin has truncated "
-"it for you.The maximum profile length of %d bytes has been exceeded.  Pidgin "
-"has truncated it for you."
+"The maximum profile length of %d byte has been exceeded.  Pidgin has "
+"truncated it for you.The maximum profile length of %d bytes has been "
+"exceeded.  Pidgin has truncated it for you."
 msgstr[1] ""
-"The maximum profile length of %d byte has been exceeded.  Pidgin has truncated "
-"it for you.The maximum profile length of %d bytes has been exceeded.  Pidgin "
-"has truncated it for you."
+"The maximum profile length of %d byte has been exceeded.  Pidgin has "
+"truncated it for you.The maximum profile length of %d bytes has been "
+"exceeded.  Pidgin has truncated it for you."
 
 msgid "Profile too long."
 msgstr "Profile too long."
@@ -7130,7 +7190,7 @@ msgstr "Away message too long."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7158,9 +7218,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orphans"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7170,7 +7230,7 @@ msgid "(no name)"
 msgstr "(no name)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
 #, fuzzy, c-format
@@ -7242,6 +7302,7 @@ msgstr "Connect"
 msgid "Get AIM Info"
 msgstr "Get Info"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
@@ -7305,6 +7366,7 @@ msgstr "Search"
 msgid "Set User Info (web)..."
 msgstr "Set User Info (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Change Password (URL)"
@@ -7340,6 +7402,10 @@ msgstr "Search for Buddy by Email..."
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "User is not logged in"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7357,7 +7423,7 @@ msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
 
@@ -7467,7 +7533,7 @@ msgstr "Opera"
 msgid "Visible"
 msgstr "Invisible"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7563,17 +7629,51 @@ msgstr "Last Updated"
 msgid "Could not change buddy information."
 msgstr "Please enter a buddy to pounce."
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "Mobile Phone"
+
+msgid "Note"
+msgstr "Note"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Buddy Icon"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Add Buddy"
+msgid "_Modify"
+msgstr "_Modify"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "_Modify"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Server busy"
+
+msgid "Your request was accepted."
+msgstr ""
 
-msgid "Input answer here"
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Request Authorisation"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Add buddy to your list?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Cannot send a directory."
+
 msgid "Send"
 msgstr "Send"
 
@@ -7585,19 +7685,20 @@ msgstr "Invalid password"
 msgid "Authorization denied message:"
 msgstr "Authorisation Denied Message:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Starting authentication"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Add buddy to your list?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "Enter a Conference Server"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7620,7 +7721,7 @@ msgid "Failed sending authorize"
 msgstr "Please authorise me!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Failed to join buddy in chat"
 
 #, fuzzy, c-format
@@ -7666,6 +7767,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Invalid proxy settings"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Member Since"
 
@@ -7710,15 +7815,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "Join Chat"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Telephone Number"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7729,7 +7837,7 @@ msgstr "Sound Options"
 msgid "Failed:"
 msgstr "Failed"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7741,11 +7849,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
-msgstr ""
+#, fuzzy
+msgid "Sorry, you are not our style"
+msgstr "Sorry, I ran out for a bit!"
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Telephone Number"
 
 #, fuzzy
@@ -7756,7 +7865,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Would you like to join the conversation?"
 
 #, fuzzy
@@ -7764,28 +7873,28 @@ msgid "Setup"
 msgstr "_Set"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Failed to join buddy in chat"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Remove Buddy"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Remove Buddy"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7905,6 +8014,13 @@ msgstr "<b>User:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Alias:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>User:</b> %s<br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7912,7 +8028,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "About Pidgin"
 
 #, fuzzy
@@ -7933,6 +8049,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "About Pidgin"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Home Address"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7964,7 +8084,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Connecting"
@@ -7977,6 +8096,9 @@ msgstr "Show fewer options"
 msgid "Show server news"
 msgstr "Show fewer options"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Reading error"
@@ -7986,11 +8108,7 @@ msgid "Update interval (seconds)"
 msgstr "Reading error"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Cannot get server information"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Cannot get server information"
 
 #, c-format
@@ -8013,21 +8131,19 @@ msgid "Activation required"
 msgstr "Registration Required"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "Reading error"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "Request ambiguous"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Failed Yahoo! Authentication"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -8037,7 +8153,7 @@ msgstr "Save Image"
 msgid "Enter code"
 msgstr "Change Password"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -8045,69 +8161,43 @@ msgid "Enter the text from the image"
 msgstr "Please enter the name of the group to be added."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Unable to connect."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Unknown Error"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "You were disconnected from the server."
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "Unable to read socket"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Write error"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Connection Closed"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Set User Info..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Request denied"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Couldn't connect to host"
+msgid "Unable to resolve hostname"
+msgstr "Unable to ping server"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Invalid username or password"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Connect server"
+msgid "Connecting to server"
+msgstr "Connecting to SILC Server"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Read Error"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "Failed to join chat"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8117,6 +8207,10 @@ msgid ""
 msgstr "ICQ Server Relay"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s on %s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "From"
 
@@ -8126,32 +8220,30 @@ msgid ""
 "%s"
 msgstr "Server Information"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Unknown reason."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Command"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Cannot get server information"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Unknown reason."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Unknown reason."
 
 #, fuzzy, c-format
@@ -8166,10 +8258,6 @@ msgstr "File Send Failed"
 msgid "%d canceled the transfer of %s"
 msgstr "%s canceled the transfer of %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Connection Closed"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
@@ -8231,19 +8319,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Connection Closed"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Error while reading from socket."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Unable to connect to server."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8271,6 +8346,10 @@ msgid "Video Camera"
 msgstr "Video Chat"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "File Transfers"
+
+#, fuzzy
 msgid "Supports"
 msgstr "support"
 
@@ -9003,9 +9082,6 @@ msgstr "Organisation"
 msgid "Unit"
 msgstr "Unit"
 
-msgid "Note"
-msgstr "Note"
-
 msgid "Join Chat"
 msgstr "Join Chat"
 
@@ -9108,6 +9184,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping failed"
 
@@ -9173,7 +9252,8 @@ msgstr "Unsupported public key type"
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
 msgid "Key Exchange failed"
@@ -9184,29 +9264,26 @@ msgid ""
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-msgid "Connection failed"
-msgstr "Connection failed"
-
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Unable to create new connection."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Could not load public key"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Could not load public key"
+
 msgid "Out of memory"
 msgstr "Out of memory"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Cannot initialise SILC Client connection"
 
 #, fuzzy
@@ -9515,7 +9592,7 @@ msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Creating SILC key pair..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9609,6 +9686,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Error during connecting to SILC Server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
@@ -9649,7 +9729,8 @@ msgstr "Failure: Invalid cookie"
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Cannot initialise SILC Client connection"
 
 #, fuzzy
@@ -9657,32 +9738,29 @@ msgid "John Noname"
 msgstr "Last name:"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Could not load public key"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Could not send"
-
-msgid "Could not connect"
-msgstr "Could not connect"
+msgid "Unable to create connection"
+msgstr "Unable to create new connection."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Unknown error."
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "Couldn't create socket"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Unable to resolve hostname."
+msgid "Unable to create listen socket"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "IRC nicks may not contain whitespace"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Show fewer options"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9723,177 +9801,70 @@ msgstr "AP User"
 msgid "Auth Domain"
 msgstr "Automatic"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Looking up %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Connect to %s failed"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Signon: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Unable to write file %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Unable to read file %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Message too long, last %s bytes truncated."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s not currently logged in."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Warning of %s not allowed."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "A message has been dropped, you are exceeding the server speed limit."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat in %s is not available."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "You are sending messages too fast to %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "You missed an IM from %s because it was too big."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "You missed an IM from %s because it was sent too fast."
-
-#, c-format
-msgid "Failure."
-msgstr "Failure."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Too many matches."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Need more qualifiers."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Dir service temporarily unavailable."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Email lookup restricted."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Keyword ignored."
-
-#, c-format
-msgid "No keywords."
-msgstr "No keywords."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "User has no directory information."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Country not supported."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Failure unknown: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Incorrect nickname or password."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "The service is temporarily unavailable."
+#, fuzzy
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Your warning level is currently too high to log in."
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  List channels on this network"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"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."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "An unknown signon error has occurred: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "An unknown error, %d, has occurred.  Info: %s"
 
 #, fuzzy
-msgid "Invalid Groupname"
-msgstr "Invalid group"
-
-msgid "Connection Closed"
-msgstr "Connection Closed"
-
-msgid "Waiting for reply..."
-msgstr "Waiting for reply..."
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC has come back from its pause. You may now send messages again."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
 
-msgid "Password Change Successful"
-msgstr "Password Change Successful"
+#, fuzzy
+msgid "Pager server"
+msgstr "Proxy Server"
 
-msgid "_Group:"
-msgstr "_Group:"
+msgid "Pager port"
+msgstr "Pager port"
 
-msgid "Get Dir Info"
-msgstr "Get Dir Info"
+#, fuzzy
+msgid "File transfer server"
+msgstr "File transfer host"
 
-msgid "Set Dir Info"
-msgstr "Set Dir Info"
+msgid "File transfer port"
+msgstr "File transfer port"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Could not open %s for writing!"
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Chat Room List Url"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "File transfer failed; other side probably canceled."
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
 
-msgid "Could not connect for transfer."
-msgstr "Could not connect for transfer."
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Chat Room List Url"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat server"
+msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "Save Icon As..."
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgstr[1] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s requests you to send them a file"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9905,11 +9876,11 @@ msgstr "%s requests you to send them a file"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC Protocol Plugin"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9934,6 +9905,30 @@ msgstr "%s has (retroactively) denied your request to add them to your list."
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Unable to make SSL connection to server."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Incorrect nickname or password."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9965,11 +9960,12 @@ msgstr "Your account is locked, please log in to the Yahoo! website."
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Could not add buddy to server list"
 
 #, c-format
@@ -9977,23 +9973,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Invalid response from server."
 
-msgid "Connection problem"
-msgstr "Connection problem"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Conversations with %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10048,9 +10037,8 @@ msgstr "Use Environmental Settings"
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Active which ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Join whom in chat?"
@@ -10065,83 +10053,15 @@ msgstr "Join user in chat..."
 msgid "Open Inbox"
 msgstr ""
 
-#, fuzzy
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  List channels on this network"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy Server"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japan Pager host"
-
-msgid "Pager port"
-msgstr "Pager port"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "File transfer host"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japan File transfer host"
-
-msgid "File transfer port"
-msgstr "File transfer port"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Chat Room List Url"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Chat Room List Url"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Unable to connect."
+
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
@@ -10149,6 +10069,10 @@ msgstr "Unable to establish file descriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Offering to send %s to %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Write error"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
@@ -10195,14 +10119,9 @@ msgstr "Cool Link 3"
 msgid "Last Update"
 msgstr "Last Updated"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "User information for %s unavailable"
-
 #, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
@@ -10275,21 +10194,19 @@ msgstr "Voices"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Connection problem"
+
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
 msgid "User Rooms"
 msgstr "User Rooms"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Connection problem with the YCHT server."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "You were disconnected from the server."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10422,31 +10339,21 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Unable to create socket"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Unable to send message: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Proxy connection error %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Error joining chat %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Unable to resolve hostname."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10543,10 +10450,6 @@ msgstr "Do Not Disturb"
 msgid "Extended away"
 msgstr "Extended Away"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Mobile Phone"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10588,20 +10491,6 @@ msgstr "%s became unidle"
 msgid "%x %X"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr ""
-"Error reading %s: \n"
-"%s.\n"
-
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"An error was encountered parsing your buddy list.  It has not been loaded, "
-"and the old file has moved to blist.xml~."
-
 msgid "Calculating..."
 msgstr "Calculating..."
 
@@ -10713,6 +10602,20 @@ msgstr "Connection Closed"
 msgid "Address already in use."
 msgstr "That file already exists"
 
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"Error reading %s: \n"
+"%s.\n"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "Instant Messagers"
@@ -10762,10 +10665,9 @@ msgstr "New mail notifications"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Options"
+#, fuzzy
+msgid "_Advanced"
+msgstr "_Cancel"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10801,9 +10703,6 @@ msgstr "If you look real closely"
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-msgid "Proxy Options"
-msgstr "Proxy Options"
-
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
@@ -10834,8 +10733,8 @@ msgid "Create _this new account on the server"
 msgstr ""
 
 #, fuzzy
-msgid "_Advanced"
-msgstr "_Cancel"
+msgid "_Proxy"
+msgstr "No Proxy"
 
 #, fuzzy
 msgid "Enabled"
@@ -10874,8 +10773,8 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Room List"
+msgid "A_ccount"
+msgstr "Account:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10884,8 +10783,9 @@ msgstr ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Room List"
 
 #, fuzzy
 msgid "_Block"
@@ -10905,6 +10805,17 @@ msgid "I_M"
 msgstr "I_M"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "Add Chat"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Video Chat"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "_Send File"
 
@@ -10916,7 +10827,11 @@ msgid "View _Log"
 msgstr "View _Log"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Not allowed when offline"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Not allowed when offline"
 
 msgid "_Alias..."
@@ -11062,6 +10977,10 @@ msgid "/Tools/_Certificates"
 msgstr "/Tools/Pr_eferences"
 
 #, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Tools/_Away"
+
+#, fuzzy
 msgid "/Tools/Plu_gins"
 msgstr "/Tools/Plugin Actions"
 
@@ -11071,10 +10990,6 @@ msgstr "/Tools/Pr_eferences"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Tools/_Away"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
@@ -11207,8 +11122,8 @@ msgstr "Manual"
 msgid "By status"
 msgstr "By status"
 
-msgid "By log size"
-msgstr "By log size"
+msgid "By recent log activity"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "%s disconnected"
@@ -11226,6 +11141,9 @@ msgstr "_Reconnect"
 msgid "Re-enable"
 msgstr "_Rename"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s came back"
@@ -11325,6 +11243,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Alias:"
 
+msgid "_Group:"
+msgstr "_Group:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11363,6 +11284,120 @@ msgstr "/_Tools"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Background colour"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Do you want to add this buddy to your buddy list?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Logged out"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Background colour"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expand"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Collapse"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Shortcuts"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Away"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Mood"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Get information on the selected buddy"
+
+msgid "Message Text"
+msgstr "Message Text"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Message Text"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Change user information for %s"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11384,14 +11419,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
@@ -11422,7 +11449,7 @@ msgid "Get Away Message"
 msgstr "New Away Message"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Last name:"
 
 msgid "Unable to save icon file to disk."
@@ -11471,6 +11498,22 @@ msgstr "/Conversation/_Save As..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/Clear"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversation/View _Log"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
@@ -11551,6 +11594,18 @@ msgstr "/_Conversation"
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversation/View Log"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversation/_Close"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
@@ -11751,6 +11806,9 @@ msgstr "Address"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "support"
 
@@ -11886,6 +11944,10 @@ msgid "Hungarian"
 msgstr "Hungarian"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Macedonian"
 
@@ -11904,6 +11966,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "Current Translators"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "Opera"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "Banned"
 
@@ -11927,6 +11993,10 @@ msgid "Macedonian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "Macedonian"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norwegian"
 
@@ -11984,6 +12054,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "Swedish"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Terminal"
@@ -12035,8 +12108,25 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
 
 #, fuzzy
@@ -12318,7 +12408,7 @@ msgid "Hyperlink visited color"
 msgstr "Hyperlink colour"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Colour to draw hyperlinks."
 
 #, fuzzy
@@ -12358,15 +12448,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Notification Removal"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "New mail notifications"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12379,15 +12476,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "New mail notifications"
 
-msgid "_Copy Email Address"
-msgstr "_Copy Email Address"
-
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
-
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12420,11 +12508,9 @@ msgstr "Error saving image: %s"
 msgid "Save Image"
 msgstr "Save Image"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12515,10 +12601,6 @@ msgid "Font Face"
 msgstr "Font Face"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Background colour"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Foreground font colour"
 
@@ -12652,6 +12734,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12669,6 +12752,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12700,16 +12784,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Paging"
 
-#, fuzzy
-msgid "Open All Messages"
-msgstr "Send Message"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
 
 #, fuzzy
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "Calling..."
+msgstr "Calculating..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12739,6 +12834,35 @@ msgid ""
 msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
+#, fuzzy
+msgid "No message"
+msgstr "(1 message)"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "Send Message"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "New Buddy Pounce"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12792,11 +12916,18 @@ msgstr ""
 msgid "Select a file"
 msgstr "Select a file"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Edit Buddy Pounce"
+
 #. Create the "Pounce on Whom" frame.
 #, fuzzy
 msgid "Pounce on Whom"
 msgstr "Pounce Who"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
@@ -12877,7 +13008,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr "Pounce When"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Buddy starts _typing"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "User is typing..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Si_gn on"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "Retur_n from idle"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "_Return from away"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Ping"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Sign _off"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s became idle"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "When away"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Send a _message"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Unknown pounce event. Please report this!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Failed to store image: %s\n"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12901,6 +13083,12 @@ msgstr "Shortcuts"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Conversations with %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Buddy List"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
@@ -12913,7 +13101,7 @@ msgid "On unread messages"
 msgstr "Send a _message"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM Conversation Windows"
 
 #, fuzzy
@@ -12923,6 +13111,10 @@ msgstr "Close conversation"
 msgid "When away"
 msgstr "When away"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM Conversation Windows"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12987,10 +13179,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Flash Window when messages are received"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM Conversation Windows"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13026,15 +13214,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Cannot get user information"
 
-#, fuzzy
-msgid "ST_UN server:"
-msgstr "_Server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Autodetect IP Address"
 
 msgid "Public _IP:"
@@ -13057,6 +13241,10 @@ msgstr "_Start Port:"
 msgid "_End port:"
 msgstr "_End Port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy Server"
@@ -13086,6 +13274,10 @@ msgstr "Proxy Server"
 msgid "No proxy"
 msgstr "No proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_User:"
 
@@ -13256,14 +13448,14 @@ msgid "Auto-away"
 msgstr "Auto-away"
 
 #, fuzzy
-msgid "Change status when _idle"
-msgstr "Set away _when idle"
-
-#, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes before setting away:"
 
 #, fuzzy
+msgid "Change status when _idle"
+msgstr "Set away _when idle"
+
+#, fuzzy
 msgid "Change _status to:"
 msgstr "Change Address To:"
 
@@ -13421,29 +13613,19 @@ msgstr "Sa_ve & Use"
 msgid "Status for %s"
 msgstr "Status: %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Insert smiley"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Public key file"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Please enter a new name for the selected group."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Insert smiley"
@@ -13453,21 +13635,29 @@ msgid "Add Smiley"
 msgstr "Smile!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "Save Image"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "Shortcuts"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Smile!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Shortcuts"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Select Buddy"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13557,8 +13747,8 @@ msgid "Cannot send launcher"
 msgstr "Cannot send file"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13593,6 +13783,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "_Open link in:"
+
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
+
+msgid "_Copy Email Address"
+msgstr "_Copy Email Address"
+
+#, fuzzy
 msgid "Save File"
 msgstr "Save File..."
 
@@ -13696,6 +13896,78 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Server address"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Enter a Conference Server"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Select a conference server to query"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online Services"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send Buddy List"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "When away"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Search for:"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Sound Selection"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Description:</b> Spooky"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Set Dir Info"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "User does not exist"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Set Dir Info"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Buddy is idle:"
 
@@ -14105,7 +14377,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14221,12 +14493,6 @@ msgstr ""
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Hyperlink colour"
@@ -14239,6 +14505,10 @@ msgstr "Hyperlink colour"
 msgid "Highlighted Message Name Color"
 msgstr "Send Message"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Notification Removal"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14273,37 +14543,25 @@ msgstr "Interface Options"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ignore c_olours"
+msgid "Disable Typing Notification Text"
+msgstr "New mail notifications"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin File Control"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Close"
 
 #, fuzzy
 msgid "Fonts"
 msgstr "Accounts"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin File Control"
@@ -14394,7 +14652,7 @@ msgstr "IM Conversation Windows"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14447,6 +14705,113 @@ msgstr "Text replacement"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Not logged in"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s logged out."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Join a Chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignore"
+
+#, fuzzy
+msgid "Founder"
+msgstr "hour"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Authorisation Given"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Error"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Request ambiguous"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Warning Level"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Chat Room List Url"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Save Icon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin File Control"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Account Info"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Buddy List"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin File Control"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin File Control"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14619,10 +14984,6 @@ msgid "Only when docked"
 msgstr ""
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "_Flash Window when messages are received"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "Login Options"
 
@@ -14630,9 +14991,10 @@ msgstr "Login Options"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Windows Pidgin."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Options specific to Windows Pidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14675,6 +15037,518 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Unable to open socket"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Unable to read socket"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Connection failed"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server has disconnected"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Read error"
+#~ msgstr "Read error"
+
+#~ msgid "Write error"
+#~ msgstr "Write error"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Set Dir Info"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Extended Address"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Alias Chat"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "User has no directory information."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Command"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Registration Error"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Location"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Buddy State Notification"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Unsupported Version"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Organisation"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capabilities"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Username"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM with Key Exchange"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Email Address"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Set Profile"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Live Video"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Message received"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Public Key Babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "User Options"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian Encryption"
+
+#~ msgid "Read Error"
+#~ msgstr "Read Error"
+
+#, fuzzy
+#~ msgid "Failed to connect to server."
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Queue full"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Unable to parse message"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login failed (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Unable to connect to server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "You have been logged out because you logged in at another workstation."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error. SSL support is not installed."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Incorrect password."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Could Not Connect"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Invalid Username"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Cannot get server information"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Couldn't connect to host"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Error while reading from socket."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Could not send"
+
+#~ msgid "Could not connect"
+#~ msgstr "Could not connect"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Couldn't create socket"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Incorrect password."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan Pager host"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan File transfer host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "You were disconnected from the server."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM Conversation Windows"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Please enter a new name for the selected group."
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Active which ID?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ignore c_olours"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "(1 message)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Please enter the name of the user you wish to invite, along with an "
+#~ "optional invite message."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Unable To Retrieve Buddy List"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Add Buddy"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Cannot get server information"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "Reading error"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "You were disconnected from the server."
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Connect server"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "Failed to join chat"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Looking up %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Connect to %s failed"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Signon: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Unable to write file %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Unable to read file %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Message too long, last %s bytes truncated."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s not currently logged in."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Warning of %s not allowed."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Chat in %s is not available."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "You are sending messages too fast to %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "You missed an IM from %s because it was too big."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "You missed an IM from %s because it was sent too fast."
+
+#~ msgid "Failure."
+#~ msgstr "Failure."
+
+#~ msgid "Too many matches."
+#~ msgstr "Too many matches."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Need more qualifiers."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Dir service temporarily unavailable."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Email lookup restricted."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Keyword ignored."
+
+#~ msgid "No keywords."
+#~ msgstr "No keywords."
+
+#~ msgid "User has no directory information."
+#~ msgstr "User has no directory information."
+
+#~ msgid "Country not supported."
+#~ msgstr "Country not supported."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Failure unknown: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Incorrect nickname or password."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "The service is temporarily unavailable."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Your warning level is currently too high to log in."
+
+#~ 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 ""
+#~ "You have been connecting and disconnecting too frequently.  Wait ten "
+#~ "minutes and try again.  If you continue to try, you will need to wait "
+#~ "even longer."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "An unknown signon error has occurred: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "An unknown error, %d, has occurred.  Info: %s"
+
+#, fuzzy
+#~ msgid "Invalid Groupname"
+#~ msgstr "Invalid group"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Connection Closed"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Waiting for reply..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC has come back from its pause. You may now send messages again."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Password Change Successful"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Get Dir Info"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Set Dir Info"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Could not open %s for writing!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "File transfer failed; other side probably canceled."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Could not connect for transfer."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Could not write file header.  The file will not be transferred."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Save Icon As..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s requests you to send them a file"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC Protocol Plugin"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "User information for %s unavailable"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Options"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxy Options"
+
+#~ msgid "By log size"
+#~ msgstr "By log size"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Open Link in Browser"
+
+#, fuzzy
+#~ msgid "ST_UN server:"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Save Image"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Shortcuts"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Flash Window when messages are received"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "A folder with that name already exists"
 
@@ -14743,13 +15617,6 @@ msgstr ""
 #~ msgstr "Are you sure you want to remove the away message \"%s\"?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s on %s (%s)"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Send Message"
 
@@ -14890,9 +15757,6 @@ msgstr ""
 #~ msgid "Invalid screen name"
 #~ msgstr "Invalid Username"
 
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Unable to make SSL connection to server."
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "Too evil (sender)"
 
@@ -14953,10 +15817,6 @@ msgstr ""
 #~ msgstr "Users on %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Do you want to add this buddy to your buddy list?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "File operation error"
 
@@ -14965,10 +15825,6 @@ msgstr ""
 #~ msgstr "%s not currently logged in."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Error creating connection"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Unable to login to AIM"
 
@@ -15087,17 +15943,9 @@ msgstr ""
 #~ msgstr "Currently on"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Unable to connect to server."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Message:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Account:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Hide Disconnect Errors"
 
@@ -15258,13 +16106,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> Offline"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -15362,9 +16203,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "_Idle"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "Retur_n from idle"
-
 #~ msgid "Pounce Action"
 #~ msgstr "Pounce Action"
 
@@ -15647,12 +16485,12 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 
 #~ msgid "Pidgin - Save As..."
 #~ msgstr "Pidgin - Save As..."
@@ -15666,13 +16504,13 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 
 #~ msgid "Unable to read"
 #~ msgstr "Unable to read"
@@ -15695,9 +16533,6 @@ msgstr ""
 #~ msgstr[0] "(%d message)"
 #~ msgstr[1] "(%d message)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 message)"
-
 #, fuzzy
 #~ msgid "Default auto-away"
 #~ msgstr "Auto-away"
@@ -15800,9 +16635,6 @@ msgstr ""
 #~ msgid "Away title: "
 #~ msgstr "Away title: "
 
-#~ msgid "Buddy List Error"
-#~ msgstr "Buddy List Error"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Size of the expander arrow"
 
@@ -15934,9 +16766,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Send a message to the selected buddy"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Get information on the selected buddy"
-
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
 
@@ -16145,9 +16974,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Summary"
 
-#~ msgid "Message Text"
-#~ msgstr "Message Text"
-
 #~ msgid "Away Messages"
 #~ msgstr "Away Messages"
 
@@ -16205,12 +17031,12 @@ msgstr ""
 #~ msgstr "Unable to load preferences"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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."
 
 #~ msgid "Slightly less boring default"
@@ -16246,9 +17072,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Critical error in GG library\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Unable to ping server"
-
 #~ msgid "Send as message"
 #~ msgstr "Send as message"
 
@@ -16316,18 +17139,18 @@ msgstr ""
 #~ msgstr "Unable to access directory"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 
 #~ msgid "Directory Search"
 #~ msgstr "Directory Search"
@@ -16336,11 +17159,11 @@ msgstr ""
 #~ msgstr "Unable to access user profile."
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 
 #~ msgid "Pidgin encountered an error communicating with the ICQ server."
 #~ msgstr "Pidgin encountered an error communicating with the ICQ server."
@@ -16459,9 +17282,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s logged in."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s logged out."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -16479,9 +17299,6 @@ msgstr ""
 #~ "%s has invited %s to the chat room %s:\n"
 #~ "<b>%s</b>"
 
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Sorry, I ran out for a bit!"
-
 #~ msgid ""
 #~ "Unable to guess the image type based on the file extension supplied.  "
 #~ "Defaulting to PNG."
diff --git a/po/en_CA.po b/po/en_CA.po
index 80330c020a..9f9bb40e76 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-03-17 19:45-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -33,7 +33,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -637,21 +637,6 @@ msgid "Send To"
 msgstr "_Send As"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "(1 message)"
-
-msgid "Invite"
-msgstr "Invite"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "Conversations"
 
@@ -914,6 +899,42 @@ msgid "System Log"
 msgstr "System Log"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "Calculating..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Accept"
+
+#, fuzzy
+msgid "Reject"
+msgstr "Reset"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "You have parted the channel%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "Email"
 
@@ -951,6 +972,9 @@ msgstr "Connecting"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "Invite"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(no name)"
@@ -1174,7 +1198,6 @@ msgstr "%s has gone away. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
@@ -1230,7 +1253,6 @@ msgstr "_Minutes before setting away:"
 msgid "Change status to"
 msgstr "Change Address To:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1581,7 +1603,6 @@ msgstr ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 
-#, c-format
 msgid "Online"
 msgstr "Online"
 
@@ -1630,6 +1651,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 #, fuzzy
 msgid "accounts"
 msgstr "Accounts"
@@ -1733,14 +1776,6 @@ msgstr "Accept chat invitation?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Accept"
-
-#, fuzzy
-msgid "Reject"
-msgstr "Reset"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1830,6 +1865,8 @@ msgstr "%s signed on"
 msgid "+++ %s signed off"
 msgstr "%s signed off"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -1878,6 +1915,18 @@ msgstr "%s left the room."
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Initiate Conference"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "Failed to set cmodes for %s"
@@ -2016,7 +2065,6 @@ msgstr "Accept file transfer request from %s?"
 msgid "Transfer of file %s complete"
 msgstr "Transfer of file %s complete"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "File transfer complete"
 
@@ -2024,7 +2072,6 @@ msgstr "File transfer complete"
 msgid "You canceled the transfer of %s"
 msgstr "You cancelled the transfer of %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
@@ -2209,11 +2256,14 @@ msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Error creating connection"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2627,7 +2677,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2679,7 +2729,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2708,6 +2758,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Change Password"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2901,19 +2977,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Unable to create new connection."
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 #, fuzzy
 msgid "First name"
 msgstr "First name:"
@@ -2951,6 +3026,11 @@ msgstr "Yahoo Protocol Plugin"
 msgid "Purple Person"
 msgstr "New Person"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Locality"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2962,17 +3042,17 @@ msgstr "%s has been invited to this conversation."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Unable to send message. The message is too large."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Unable to open socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Couldn't create socket"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Couldn't create socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3031,15 +3111,15 @@ msgstr "Send Buddy List"
 msgid "Load buddylist from file..."
 msgstr "Import Buddy List from Server"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "New passwords do not match."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Unable to create new connection."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3052,17 +3132,15 @@ msgstr "Registration Successful"
 msgid "Password"
 msgstr "Password"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Password sent"
+msgid "Password (again)"
+msgstr "Password (again)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s not currently logged in."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Currently on"
+msgid "Captcha"
+msgstr "Save Image"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3124,6 +3202,18 @@ msgid "Current password"
 msgstr "Incorrect password."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Password sent"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s not currently logged in."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Currently on"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Please enter your current password and your new password."
 
@@ -3139,13 +3229,13 @@ msgstr "Remove the chat from your buddy list"
 msgid "Add to chat..."
 msgstr "Add a C_hat"
 
+#. Global
 msgid "Available"
 msgstr "Available"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Away"
 
@@ -3177,7 +3267,8 @@ msgstr "Non-matching Hosts"
 msgid "There are no users matching your search criteria."
 msgstr "Please enter your new password"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Unable to read socket"
 
 #, fuzzy
@@ -3196,8 +3287,14 @@ msgstr "Buddy Display"
 msgid "Your buddy list was stored on the server."
 msgstr "There is no Buddy List stored on the Gadu-Gadu server."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Connect"
+
+msgid "Connection failed"
 msgstr "Connection failed"
 
 #, fuzzy
@@ -3208,6 +3305,15 @@ msgstr "Add Chat"
 msgid "Chat _name:"
 msgstr "Last name:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Unable to ping server"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connecting"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Read error"
@@ -3217,7 +3323,7 @@ msgid "This chat name is already in use"
 msgstr "That file already exists"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "You were disconnected from the server."
 
 #, fuzzy
@@ -3266,6 +3372,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Search Engine"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Set User Info..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
@@ -3282,7 +3392,7 @@ msgid "File Transfer Failed"
 msgstr "File transfer cancelled"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin could not open a listening port."
 
 msgid "Error displaying MOTD"
@@ -3298,8 +3408,16 @@ msgstr "There is no MOTD associated with this connection."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "You were disconnected from the server."
 
 msgid "View MOTD"
 msgstr "View MOTD"
@@ -3310,25 +3428,24 @@ msgstr "_Channel:"
 msgid "_Password:"
 msgstr "_Password:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connecting"
-
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-msgid "Couldn't create socket"
-msgstr "Couldn't create socket"
+msgid "Unable to connect"
+msgstr "Unable to connect"
 
-msgid "Couldn't connect to host"
-msgstr "Couldn't connect to host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Unable to connect to server."
 
-msgid "Read error"
-msgstr "Read error"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Error creating connection"
 
 msgid "Users"
 msgstr "Users"
@@ -3516,6 +3633,17 @@ msgstr ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "That file already exists"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Nickname"
+
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
@@ -3760,11 +3888,12 @@ msgstr "Command disabled"
 msgid "execute"
 msgstr "Not expected"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3781,19 +3910,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Authentication failed"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Invalid response from server."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Read error"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "No reason given."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Unsupported Version"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "Unable to make SSL connection to server."
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Unable to make SSL connection to server."
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Unable to create new connection."
+
 msgid "Full Name"
 msgstr "Full Name"
 
@@ -3862,187 +4022,9 @@ msgstr "City"
 msgid "Operating System"
 msgstr "Hide Operating System"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Set Dir Info"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Extended Address"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Alias Chat"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "User has no directory information."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Command"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Registration Error"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Location"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Buddy State Notification"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Unsupported Version"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Organization"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "File Transfers"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Capabilities"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Username"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM with Key Exchange"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Email Address"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Set Profile"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
 #, fuzzy
-msgid "User Nickname"
-msgstr "Nickname"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Live Video"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Message received"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Public Key Babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "User Options"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "User Limit"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian Encryption"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Capabilities"
+msgid "Local Time"
+msgstr "Local Users"
 
 #, fuzzy
 msgid "Priority"
@@ -4051,6 +4033,14 @@ msgstr "Port"
 msgid "Resource"
 msgstr "Resource"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Logged out"
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4099,7 +4089,6 @@ msgstr "Chatty"
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
@@ -4226,34 +4215,37 @@ msgstr "Select a conference server to query"
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
-msgid "Write error"
-msgstr "Write error"
+#, fuzzy
+msgid "No users found"
+msgstr "Non-matching Hosts"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Plain text"
+msgid "Roles:"
+msgstr "Role"
 
-msgid "Read Error"
-msgstr "Read Error"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Plain text"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "Unable to create socket"
-
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
 
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Failed to connect to server."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
@@ -4280,9 +4272,6 @@ msgstr "Registration Successful"
 msgid "Unregistration Failed"
 msgstr "Registration Failed"
 
-msgid "Already Registered"
-msgstr "Already Registered"
-
 msgid "State"
 msgstr "Province/Territory"
 
@@ -4296,6 +4285,9 @@ msgstr "Phone"
 msgid "Date"
 msgstr "Date"
 
+msgid "Already Registered"
+msgstr "Already Registered"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Register"
@@ -4327,6 +4319,10 @@ msgid "Change Registration"
 msgstr "Registration Error"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Failed to connect to server."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Error Changing Account Info"
 
@@ -4346,9 +4342,18 @@ msgstr "Authenticating"
 msgid "Re-initializing Stream"
 msgstr "Re-initializing Stream"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Not Authorized"
 
+msgid "Mood"
+msgstr "Mood"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Both"
 
@@ -4370,12 +4375,6 @@ msgstr "None"
 msgid "Subscription"
 msgstr "Subscription"
 
-msgid "Mood"
-msgstr "Mood"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "Mood"
@@ -4423,9 +4422,6 @@ msgstr "Your password has been changed."
 msgid "Error changing password"
 msgstr "Error changing password"
 
-msgid "Password (again)"
-msgstr "Password (again)"
-
 msgid "Change XMPP Password"
 msgstr "Change XMPP Password"
 
@@ -4619,18 +4615,24 @@ msgstr "Unable to kick user %s"
 msgid "Unable to ping user %s"
 msgstr "Unable to ban user %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4641,9 +4643,36 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr "The user has blocked you"
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Unable to send message to %s:"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Unable to send file to %s, user does not support file transfers"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Unable to send file to %s, user does not support file transfers"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Registration Failed"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
 msgstr ""
+"Please enter the screen name of the person whose info you would like to view."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "Select a file"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Initiate _Chat"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
@@ -4665,13 +4694,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4739,6 +4768,9 @@ msgstr "Connect server"
 msgid "File transfer proxies"
 msgstr "File transfer port"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4777,6 +4809,14 @@ msgstr "XML Parse error"
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error joining chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error in chat %s"
+
 msgid "Create New Room"
 msgstr "Create New Room"
 
@@ -4795,13 +4835,32 @@ msgstr "Configure Room"
 msgid "_Accept Defaults"
 msgstr "Accept Defaults"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Error joining chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "No reason given."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Error in chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Kicked by %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "An error occurred while opening the file."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "File transfer cancelled"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Failed to store image: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4828,10 +4887,6 @@ msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "Select a file"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "User Modes"
 
@@ -4871,9 +4926,20 @@ msgstr "Accounts"
 msgid "Select an action"
 msgstr "Select a file"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Unable to read file %s."
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Unable To Retrieve Buddy List"
+msgid "Buddy Add error"
+msgstr "Buddy List Error"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "The SecurID key entered is invalid."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5103,7 +5169,7 @@ msgstr "Kids Passport without parental consent"
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Passport account not yet verified"
 
@@ -5127,6 +5193,10 @@ msgstr "Preferred Contact"
 msgid "Non-IM Contacts"
 msgstr "Remove Contact"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5197,6 +5267,13 @@ msgstr "Send a mobile message."
 msgid "Page"
 msgstr "Page"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Warn"
+
 msgid "Has you"
 msgstr "Has you"
 
@@ -5240,6 +5317,14 @@ msgid "Album"
 msgstr ""
 
 #, fuzzy
+msgid "Game Title"
+msgstr "Title"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Title"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "Set Friendly Name"
 
@@ -5281,9 +5366,6 @@ msgstr ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://Pidgin.sf.net/faq-ssl.php for more information."
 
-msgid "Failed to connect to server."
-msgstr "Failed to connect to server."
-
 msgid "Error retrieving profile"
 msgstr "Error retrieving profile"
 
@@ -5459,8 +5541,9 @@ msgstr ""
 "Pidgin could not find any information in the user's profile. The user most "
 "likely does not exist."
 
-msgid "Profile URL"
-msgstr "Profile URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "Not allowed when offline"
 
 #. *< type
 #. *< ui_requirement
@@ -5496,67 +5579,29 @@ msgstr "Normal authentication failed!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Normal authentication failed!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s is not a valid group."
-
-msgid "Unknown error."
-msgstr "Unknown error."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s on %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s wants to send you a file"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Unknown error"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Unable to ban user %s"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Unknown error"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Unable to add user on %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Unable to block user on %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Unable to permit user on %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s could not be added because your buddy list is full."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is not a valid passport account."
-
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Service Temporarily Unavailable"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Message could not be sent because the user is offline:"
 
-msgid "Unable to rename group"
-msgstr "Unable to rename group"
-
-msgid "Unable to delete group"
-msgstr "Unable to delete group"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5604,9 +5649,6 @@ msgstr "Message may have not been sent because an unknown error occurred:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-msgid "Unable to connect"
-msgstr "Unable to connect"
-
 msgid "Writing error"
 msgstr "Writing error"
 
@@ -5621,20 +5663,24 @@ msgstr ""
 "Connection error from %s server (%s):\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Our protocol is not supported by the server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Error parsing HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "You have signed on from another location."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "The MSN servers are temporarily unavailable. Please wait and try again."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "The MSN servers are going down temporarily."
 
 #, c-format
@@ -5664,6 +5710,14 @@ msgstr "Sending cookie"
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
@@ -5702,14 +5756,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Add to Address Book"
@@ -5718,13 +5764,6 @@ msgstr "Add to Address Book"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Do you want to add this buddy to your buddy list?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, fuzzy, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Unable to read file %s."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "The SecurID key entered is invalid."
@@ -5732,6 +5771,9 @@ msgstr "The SecurID key entered is invalid."
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "Profile URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5745,18 +5787,64 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-msgid "Missing Cipher"
-msgstr ""
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s is not a valid group."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "Unknown error."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s on %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Unable to add user on %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Unable to block user on %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Unable to permit user on %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s could not be added because your buddy list is full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is not a valid passport account."
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Service Temporarily Unavailable"
+
+msgid "Unable to rename group"
+msgstr "Unable to rename group"
+
+msgid "Unable to delete group"
+msgstr "Unable to delete group"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "User Rooms"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "Reading data"
 
@@ -5768,13 +5856,23 @@ msgstr "Invalid challenge from server"
 msgid "Logging in"
 msgstr "Logging"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "No screenname given."
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "You were disconnected from the server."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "New away message"
@@ -5795,21 +5893,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "No screenname given."
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_IM windows"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connected"
-msgstr "Connect"
+msgid "Add contacts from server"
+msgstr "Invalid response from server."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5817,16 +5916,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Incorrect nickname or password."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "Finalizing connection"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Failed to join buddy in chat"
 
@@ -5838,14 +5944,6 @@ msgstr "Import Buddy List from Server"
 msgid "persist command failed"
 msgstr "Switchboard failed"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "User Rooms"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Failed to join buddy in chat"
@@ -5857,39 +5955,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "Switchboard failed"
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "Finalizing connection"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Queue full"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Unable to parse message"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Couldn't connect to host"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "_IM windows"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "Invalid response from server."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5937,9 +6012,6 @@ msgstr "Larger font size"
 msgid "User"
 msgstr "Users"
 
-msgid "Profile"
-msgstr "Profile"
-
 #, fuzzy
 msgid "Headline"
 msgstr "Decline"
@@ -5955,15 +6027,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "Close conversation"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "No screenname given."
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5976,6 +6043,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "This theme has no available smileys."
@@ -5984,6 +6054,14 @@ msgstr "This theme has no available smileys."
 msgid "Please try another username:"
 msgstr "Please enter a new name for the selected group."
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "No screenname given."
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6181,10 +6259,6 @@ msgid "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Incorrect nickname or password."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Could not recognize the host of the username you entered"
 
@@ -6229,9 +6303,9 @@ msgstr "The user is either offline or you are blocked"
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login failed (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Unable to ban user %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6333,9 +6407,6 @@ msgstr "GroupWise Conference %d"
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-msgid "Unable to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
@@ -6359,26 +6430,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "You have been logged out because you logged in at another workstation."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s appears to be offline and did not receive the message that you just sent."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error. SSL support is not installed."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
@@ -6402,6 +6467,25 @@ msgid "Server port"
 msgstr "Server port"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Invalid response from server."
+
+#. username connecting too frequently
+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 ""
+"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."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Error creating connection"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
 
@@ -6410,17 +6494,7 @@ msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Error creating connection"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "You were disconnected from the server."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Unable to make SSL connection to server."
 
 #. *< type
@@ -6473,8 +6547,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6645,23 +6720,18 @@ msgstr "Camera"
 msgid "Screen Sharing"
 msgstr "Screen Name"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#, c-format
 msgid "Not Available"
 msgstr "Not Available"
 
-#, c-format
 msgid "Occupied"
 msgstr "Occupied"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#, c-format
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -6675,16 +6745,12 @@ msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Could not connect for transfer."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Failed to connect to server."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Unable to connect to server."
 
 #, fuzzy
 msgid "Username sent"
@@ -6699,51 +6765,62 @@ msgstr "Finalizing connection"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "Invalid Username"
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin was unable to get a valid AIM login hash."
 
-msgid "Incorrect password."
-msgstr "Incorrect password."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin was unable to get a valid login hash."
+
+msgid "Received authorization"
+msgstr "Received authorization"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "User does not exist"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "The client version you are using is too old. Please upgrade at %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "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."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "The client version you are using is too old. Please upgrade at %s"
-
-msgid "Could Not Connect"
-msgstr "Could Not Connect"
-
-msgid "Received authorization"
-msgstr "Received authorization"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "The SecurID key entered is invalid."
 
 msgid "Enter SecurID"
@@ -6759,28 +6836,6 @@ msgstr "Enter the 6-digit number from the digital display."
 msgid "_OK"
 msgstr "OK"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin was unable to get a valid AIM login hash."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin was unable to get a valid login hash."
-
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -6915,7 +6970,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
@@ -6937,6 +6992,12 @@ msgstr "Online Since"
 msgid "Member Since"
 msgstr "Member Since"
 
+msgid "Capabilities"
+msgstr "Capabilities"
+
+msgid "Profile"
+msgstr "Profile"
+
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
@@ -7090,8 +7151,8 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"The maximum profile length of %d byte has been exceeded.  Pidgin has truncated "
-"it for you."
+"The maximum profile length of %d byte has been exceeded.  Pidgin has "
+"truncated it for you."
 msgstr[1] ""
 "The maximum profile length of %d bytes has been exceeded.  Pidgin has "
 "truncated it for you."
@@ -7118,7 +7179,7 @@ msgstr "Away message too long."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7146,9 +7207,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orphans"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7158,7 +7219,7 @@ msgid "(no name)"
 msgstr "(no name)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
 #, fuzzy, c-format
@@ -7230,6 +7291,7 @@ msgstr "Connect"
 msgid "Get AIM Info"
 msgstr "Get Info"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
@@ -7293,6 +7355,7 @@ msgstr "Search"
 msgid "Set User Info (web)..."
 msgstr "Set User Info (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Change Password (URL)"
@@ -7328,6 +7391,10 @@ msgstr "Search for Buddy by Email..."
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "User is not logged in"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7345,7 +7412,7 @@ msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
 
@@ -7455,7 +7522,7 @@ msgstr "Opera"
 msgid "Visible"
 msgstr "Invisible"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7551,17 +7618,51 @@ msgstr "Last Updated"
 msgid "Could not change buddy information."
 msgstr "Please enter a buddy to pounce."
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "Mobile Phone"
+
+msgid "Note"
+msgstr "Note"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Buddy Icon"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Add Buddy"
+msgid "_Modify"
+msgstr "_Modify"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "_Modify"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Server busy"
 
-msgid "Input answer here"
+msgid "Your request was accepted."
 msgstr ""
 
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Request Authorization"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Add buddy to your list?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Cannot send a directory."
+
 msgid "Send"
 msgstr "Send"
 
@@ -7573,19 +7674,20 @@ msgstr "Invalid password"
 msgid "Authorization denied message:"
 msgstr "Authorization Denied Message:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Starting authentication"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Add buddy to your list?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "Enter a Conference Server"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7608,7 +7710,7 @@ msgid "Failed sending authorize"
 msgstr "Please authorize me!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Failed to join buddy in chat"
 
 #, fuzzy, c-format
@@ -7654,6 +7756,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Invalid proxy settings"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Member Since"
 
@@ -7698,15 +7804,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "Join Chat"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Telephone Number"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7717,7 +7826,7 @@ msgstr "Sound Options"
 msgid "Failed:"
 msgstr "Failed"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7729,11 +7838,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
-msgstr ""
+#, fuzzy
+msgid "Sorry, you are not our style"
+msgstr "Sorry, I ran out for a bit!"
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Telephone Number"
 
 #, fuzzy
@@ -7744,7 +7854,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Would you like to join the conversation?"
 
 #, fuzzy
@@ -7752,28 +7862,28 @@ msgid "Setup"
 msgstr "_Set"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Failed to join buddy in chat"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Remove Buddy"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Remove Buddy"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7893,6 +8003,13 @@ msgstr "<b>User:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Alias:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>User:</b> %s<br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7900,7 +8017,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "About Pidgin"
 
 #, fuzzy
@@ -7921,6 +8038,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "About Pidgin"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Home Address"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7952,7 +8073,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Connecting"
@@ -7965,6 +8085,9 @@ msgstr "Show fewer options"
 msgid "Show server news"
 msgstr "Show fewer options"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Reading error"
@@ -7974,11 +8097,7 @@ msgid "Update interval (seconds)"
 msgstr "Reading error"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Cannot get server information"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Cannot get server information"
 
 #, c-format
@@ -8001,21 +8120,19 @@ msgid "Activation required"
 msgstr "Registration Required"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "Reading error"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "Request ambiguous"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Failed Yahoo! Authentication"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -8025,7 +8142,7 @@ msgstr "Save Image"
 msgid "Enter code"
 msgstr "Change Password"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -8033,69 +8150,43 @@ msgid "Enter the text from the image"
 msgstr "Please enter the name of the group to be added."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Unable to connect."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Unknown Error"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "You were disconnected from the server."
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "Unable to read socket"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Write error"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Connection Closed"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Set User Info..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Request denied"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Couldn't connect to host"
+msgid "Unable to resolve hostname"
+msgstr "Unable to ping server"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Invalid username or password"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Connect server"
+msgid "Connecting to server"
+msgstr "Connecting to SILC Server"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Read Error"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "Failed to join chat"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8105,6 +8196,10 @@ msgid ""
 msgstr "ICQ Server Relay"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s on %s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "From"
 
@@ -8114,32 +8209,30 @@ msgid ""
 "%s"
 msgstr "Server Information"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Unknown reason."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Command"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Cannot get server information"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Unknown reason."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Unknown reason."
 
 #, fuzzy, c-format
@@ -8154,10 +8247,6 @@ msgstr "File Send Failed"
 msgid "%d canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Connection Closed"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
@@ -8219,19 +8308,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Connection Closed"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Error while reading from socket."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Unable to connect to server."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8259,6 +8335,10 @@ msgid "Video Camera"
 msgstr "Video Chat"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "File Transfers"
+
+#, fuzzy
 msgid "Supports"
 msgstr "support"
 
@@ -8991,9 +9071,6 @@ msgstr "Organization"
 msgid "Unit"
 msgstr "Unit"
 
-msgid "Note"
-msgstr "Note"
-
 msgid "Join Chat"
 msgstr "Join Chat"
 
@@ -9096,6 +9173,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping failed"
 
@@ -9161,7 +9241,8 @@ msgstr "Unsupported public key type"
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
 msgid "Key Exchange failed"
@@ -9172,29 +9253,26 @@ msgid ""
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-msgid "Connection failed"
-msgstr "Connection failed"
-
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Unable to create new connection."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Could not load public key"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Could not load public key"
+
 msgid "Out of memory"
 msgstr "Out of memory"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Cannot initialize SILC Client connection"
 
 #, fuzzy
@@ -9503,7 +9581,7 @@ msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Creating SILC key pair..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9597,6 +9675,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Error during connecting to SILC Server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch; upgrade your client"
@@ -9637,7 +9718,8 @@ msgstr "Failure: Invalid cookie"
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Cannot initialize SILC Client connection"
 
 #, fuzzy
@@ -9645,32 +9727,29 @@ msgid "John Noname"
 msgstr "Last name:"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Could not load public key"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Could not send"
-
-msgid "Could not connect"
-msgstr "Could not connect"
+msgid "Unable to create connection"
+msgstr "Unable to create new connection."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Unknown error."
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "Couldn't create socket"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Unable to resolve hostname."
+msgid "Unable to create listen socket"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "IRC nicks may not contain whitespace"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Show fewer options"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9711,177 +9790,70 @@ msgstr "AP User"
 msgid "Auth Domain"
 msgstr "Automatic"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Looking up %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Connect to %s failed"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Signon: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Unable to write file %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Unable to read file %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Message too long, last %s bytes truncated."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s not currently logged in."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Warning of %s not allowed."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "A message has been dropped, you are exceeding the server speed limit."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat in %s is not available."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "You are sending messages too fast to %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "You missed an IM from %s because it was too big."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "You missed an IM from %s because it was sent too fast."
-
-#, c-format
-msgid "Failure."
-msgstr "Failure."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Too many matches."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Need more qualifiers."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Dir service temporarily unavailable."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Email lookup restricted."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Keyword ignored."
-
-#, c-format
-msgid "No keywords."
-msgstr "No keywords."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "User has no directory information."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Country not supported."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Failure unknown: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Incorrect nickname or password."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "The service is temporarily unavailable."
+#, fuzzy
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Your warning level is currently too high to log in."
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  List channels on this network"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"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."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "An unknown signon error has occurred: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "An unknown error, %d, has occurred.  Info: %s"
 
 #, fuzzy
-msgid "Invalid Groupname"
-msgstr "Invalid group"
-
-msgid "Connection Closed"
-msgstr "Connection Closed"
-
-msgid "Waiting for reply..."
-msgstr "Waiting for reply..."
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC has come back from its pause. You may now send messages again."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
 
-msgid "Password Change Successful"
-msgstr "Password Change Successful"
+#, fuzzy
+msgid "Pager server"
+msgstr "Proxy Server"
 
-msgid "_Group:"
-msgstr "_Group:"
+msgid "Pager port"
+msgstr "Pager port"
 
-msgid "Get Dir Info"
-msgstr "Get Dir Info"
+#, fuzzy
+msgid "File transfer server"
+msgstr "File transfer host"
 
-msgid "Set Dir Info"
-msgstr "Set Dir Info"
+msgid "File transfer port"
+msgstr "File transfer port"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Could not open %s for writing!"
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Chat Room List Url"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "File transfer failed; other side probably cancelled."
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
 
-msgid "Could not connect for transfer."
-msgstr "Could not connect for transfer."
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Chat Room List Url"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat server"
+msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "Save Icon As..."
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s requests you to send them a file"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9893,11 +9865,11 @@ msgstr "%s requests you to send them a file"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC Protocol Plugin"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9922,6 +9894,30 @@ msgstr "%s has (retroactively) denied your request to add them to your list."
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Unable to make SSL connection to server."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Incorrect nickname or password."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9953,11 +9949,12 @@ msgstr "Your account is locked. Please log in to the Yahoo! website."
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Could not add buddy to server list"
 
 #, c-format
@@ -9965,23 +9962,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Invalid response from server."
 
-msgid "Connection problem"
-msgstr "Connection problem"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Conversations with %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10036,9 +10026,8 @@ msgstr "Use Environmental Settings"
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Active which ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Join whom in chat?"
@@ -10053,83 +10042,15 @@ msgstr "Join user in chat..."
 msgid "Open Inbox"
 msgstr ""
 
-#, fuzzy
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  List channels on this network"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy Server"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japan Pager host"
-
-msgid "Pager port"
-msgstr "Pager port"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "File transfer host"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japan File transfer host"
-
-msgid "File transfer port"
-msgstr "File transfer port"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Chat Room List Url"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Chat Room List Url"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Unable to connect."
+
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
@@ -10137,6 +10058,10 @@ msgstr "Unable to establish file descriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Offering to send %s to %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Write error"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
@@ -10183,14 +10108,9 @@ msgstr "Cool Link 3"
 msgid "Last Update"
 msgstr "Last Updated"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "User information for %s unavailable"
-
 #, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
@@ -10263,21 +10183,19 @@ msgstr "Voices"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Connection problem"
+
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
 msgid "User Rooms"
 msgstr "User Rooms"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Connection problem with the YCHT server."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "You were disconnected from the server."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10410,31 +10328,21 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Unable to create socket"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Unable to send message: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Proxy connection error %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Error joining chat %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Unable to resolve hostname."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10531,10 +10439,6 @@ msgstr "Do Not Disturb"
 msgid "Extended away"
 msgstr "Extended Away"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Mobile Phone"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10576,20 +10480,6 @@ msgstr "%s became unidle"
 msgid "%x %X"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr ""
-"Error reading %s: \n"
-"%s.\n"
-
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"An error was encountered parsing your buddy list.  It has not been loaded, "
-"and the old file has moved to blist.xml~."
-
 msgid "Calculating..."
 msgstr "Calculating..."
 
@@ -10701,6 +10591,20 @@ msgstr "Connection Closed"
 msgid "Address already in use."
 msgstr "That file already exists"
 
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"Error reading %s: \n"
+"%s.\n"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "Instant Messagers"
@@ -10750,10 +10654,9 @@ msgstr "New mail notifications"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Options"
+#, fuzzy
+msgid "_Advanced"
+msgstr "_Cancel"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10789,9 +10692,6 @@ msgstr "If you look real closely"
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-msgid "Proxy Options"
-msgstr "Proxy Options"
-
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
@@ -10822,8 +10722,8 @@ msgid "Create _this new account on the server"
 msgstr ""
 
 #, fuzzy
-msgid "_Advanced"
-msgstr "_Cancel"
+msgid "_Proxy"
+msgstr "No Proxy"
 
 #, fuzzy
 msgid "Enabled"
@@ -10862,8 +10762,8 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Room List"
+msgid "A_ccount"
+msgstr "Account:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10872,8 +10772,9 @@ msgstr ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Room List"
 
 #, fuzzy
 msgid "_Block"
@@ -10893,6 +10794,17 @@ msgid "I_M"
 msgstr "I_M"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "Add Chat"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Video Chat"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "_Send File"
 
@@ -10904,7 +10816,11 @@ msgid "View _Log"
 msgstr "View _Log"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Not allowed when offline"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Not allowed when offline"
 
 msgid "_Alias..."
@@ -11050,6 +10966,10 @@ msgid "/Tools/_Certificates"
 msgstr "/Tools/Pr_eferences"
 
 #, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Tools/_Away"
+
+#, fuzzy
 msgid "/Tools/Plu_gins"
 msgstr "/Tools/Plugin Actions"
 
@@ -11059,10 +10979,6 @@ msgstr "/Tools/Pr_eferences"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Tools/_Away"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
@@ -11195,8 +11111,8 @@ msgstr "Manual"
 msgid "By status"
 msgstr "By status"
 
-msgid "By log size"
-msgstr "By log size"
+msgid "By recent log activity"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "%s disconnected"
@@ -11214,6 +11130,9 @@ msgstr "_Reconnect"
 msgid "Re-enable"
 msgstr "_Rename"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s came back"
@@ -11313,6 +11232,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Alias:"
 
+msgid "_Group:"
+msgstr "_Group:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11351,6 +11273,120 @@ msgstr "/_Tools"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Background colour"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Do you want to add this buddy to your buddy list?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Logged out"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Background colour"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expand"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Collapse"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Shortcuts"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Away"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Mood"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Get information on the selected buddy"
+
+msgid "Message Text"
+msgstr "Message Text"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Message Text"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Change user information for %s"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11372,14 +11408,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
@@ -11410,7 +11438,7 @@ msgid "Get Away Message"
 msgstr "New Away Message"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Last name:"
 
 msgid "Unable to save icon file to disk."
@@ -11459,6 +11487,22 @@ msgstr "/Conversation/_Save As..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/Clear"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversation/View _Log"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
@@ -11539,6 +11583,18 @@ msgstr "/_Conversation"
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversation/View Log"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversation/_Close"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
@@ -11739,6 +11795,9 @@ msgstr "Address"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "support"
 
@@ -11874,6 +11933,10 @@ msgid "Hungarian"
 msgstr "Hungarian"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Macedonian"
 
@@ -11892,6 +11955,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "Current Translators"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "Opera"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "Banned"
 
@@ -11915,6 +11982,10 @@ msgid "Macedonian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "Macedonian"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norwegian"
 
@@ -11972,6 +12043,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "Swedish"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Terminal"
@@ -12023,8 +12097,25 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
 
 #, fuzzy
@@ -12306,7 +12397,7 @@ msgid "Hyperlink visited color"
 msgstr "Hyperlink colour"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Colour to draw hyperlinks."
 
 #, fuzzy
@@ -12346,15 +12437,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Notification Removal"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "New mail notifications"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12367,15 +12465,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "New mail notifications"
 
-msgid "_Copy Email Address"
-msgstr "_Copy Email Address"
-
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
-
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12408,11 +12497,9 @@ msgstr "Error saving image: %s"
 msgid "Save Image"
 msgstr "Save Image"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12503,10 +12590,6 @@ msgid "Font Face"
 msgstr "Font Face"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Background colour"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Foreground font colour"
 
@@ -12640,6 +12723,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12657,6 +12741,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12688,16 +12773,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Paging"
 
-#, fuzzy
-msgid "Open All Messages"
-msgstr "Send Message"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
 
 #, fuzzy
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "Calling..."
+msgstr "Calculating..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12727,6 +12823,35 @@ msgid ""
 msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
+#, fuzzy
+msgid "No message"
+msgstr "(1 message)"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "Send Message"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "New Buddy Pounce"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12780,11 +12905,18 @@ msgstr ""
 msgid "Select a file"
 msgstr "Select a file"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Edit Buddy Pounce"
+
 #. Create the "Pounce on Whom" frame.
 #, fuzzy
 msgid "Pounce on Whom"
 msgstr "Pounce Who"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
@@ -12865,7 +12997,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr "Pounce When"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Buddy starts _typing"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "User is typing..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Si_gn on"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "Retur_n from idle"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "_Return from away"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Ping"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Sign _off"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s became idle"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "When away"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Send a _message"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Unknown pounce event. Please report this!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Failed to store image: %s\n"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12889,6 +13072,12 @@ msgstr "Shortcuts"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Conversations with %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Buddy List"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
@@ -12901,7 +13090,7 @@ msgid "On unread messages"
 msgstr "Send a _message"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM Conversation Windows"
 
 #, fuzzy
@@ -12911,6 +13100,10 @@ msgstr "Close conversation"
 msgid "When away"
 msgstr "When away"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM Conversation Windows"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12975,10 +13168,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Flash Window when messages are received"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM Conversation Windows"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13014,15 +13203,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Cannot get user information"
 
-#, fuzzy
-msgid "ST_UN server:"
-msgstr "_Server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Autodetect IP Address"
 
 msgid "Public _IP:"
@@ -13045,6 +13230,10 @@ msgstr "_Start Port:"
 msgid "_End port:"
 msgstr "_End Port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy Server"
@@ -13074,6 +13263,10 @@ msgstr "Proxy Server"
 msgid "No proxy"
 msgstr "No proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_User:"
 
@@ -13244,14 +13437,14 @@ msgid "Auto-away"
 msgstr "Auto-away"
 
 #, fuzzy
-msgid "Change status when _idle"
-msgstr "Set away _when idle"
-
-#, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes before setting away:"
 
 #, fuzzy
+msgid "Change status when _idle"
+msgstr "Set away _when idle"
+
+#, fuzzy
 msgid "Change _status to:"
 msgstr "Change Address To:"
 
@@ -13409,29 +13602,19 @@ msgstr "Sa_ve & Use"
 msgid "Status for %s"
 msgstr "Status: %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Insert smiley"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Public key file"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Please enter a new name for the selected group."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Insert smiley"
@@ -13441,21 +13624,29 @@ msgid "Add Smiley"
 msgstr "Smile!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "Save Image"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "Shortcuts"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Smile!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Shortcuts"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Select Buddy"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13545,8 +13736,8 @@ msgid "Cannot send launcher"
 msgstr "Cannot send file"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13581,6 +13772,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "_Open link in:"
+
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
+
+msgid "_Copy Email Address"
+msgstr "_Copy Email Address"
+
+#, fuzzy
 msgid "Save File"
 msgstr "Save File..."
 
@@ -13684,6 +13885,78 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Server address"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Enter a Conference Server"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Select a conference server to query"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online Services"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send Buddy List"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "When away"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Search for:"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Sound Selection"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Description:</b> Spooky"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Set Dir Info"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "User does not exist"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Set Dir Info"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Buddy is idle:"
 
@@ -14093,7 +14366,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14209,12 +14482,6 @@ msgstr ""
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Hyperlink colour"
@@ -14227,6 +14494,10 @@ msgstr "Hyperlink colour"
 msgid "Highlighted Message Name Color"
 msgstr "Send Message"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Notification Removal"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14261,37 +14532,25 @@ msgstr "Interface Options"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ignore c_olours"
+msgid "Disable Typing Notification Text"
+msgstr "New mail notifications"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin File Control"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Close"
 
 #, fuzzy
 msgid "Fonts"
 msgstr "Accounts"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin File Control"
@@ -14382,7 +14641,7 @@ msgstr "IM Conversation Windows"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14435,6 +14694,113 @@ msgstr "Text replacement"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Not logged in"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s logged out."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Join a Chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignore"
+
+#, fuzzy
+msgid "Founder"
+msgstr "hour"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Authorization Given"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Error"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Request ambiguous"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Warning Level"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Chat Room List Url"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Save Icon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin File Control"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Account Info"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Buddy List"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin File Control"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin File Control"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14607,10 +14973,6 @@ msgid "Only when docked"
 msgstr ""
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "_Flash Window when messages are received"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "Login Options"
 
@@ -14618,9 +14980,10 @@ msgstr "Login Options"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Windows Pidgin."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Options specific to Windows Pidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14663,6 +15026,517 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Unable to open socket"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Unable to read socket"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Connection failed"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server has disconnected"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Read error"
+#~ msgstr "Read error"
+
+#~ msgid "Write error"
+#~ msgstr "Write error"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Set Dir Info"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Extended Address"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Alias Chat"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "User has no directory information."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Command"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Registration Error"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Location"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Buddy State Notification"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Unsupported Version"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Organization"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capabilities"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Username"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM with Key Exchange"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Email Address"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Set Profile"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Live Video"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Message received"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Public Key Babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "User Options"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian Encryption"
+
+#~ msgid "Read Error"
+#~ msgstr "Read Error"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Failed to connect to server."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Queue full"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Unable to parse message"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login failed (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Unable to connect to server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "You have been logged out because you logged in at another workstation."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error. SSL support is not installed."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Incorrect password."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Failed to connect to server."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Could Not Connect"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Invalid Username"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Cannot get server information"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Couldn't connect to host"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Error while reading from socket."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Could not send"
+
+#~ msgid "Could not connect"
+#~ msgstr "Could not connect"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Couldn't create socket"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Incorrect password."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan Pager host"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan File transfer host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "You were disconnected from the server."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM Conversation Windows"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Please enter a new name for the selected group."
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Active which ID?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ignore c_olours"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "(1 message)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Please enter the name of the user you wish to invite, along with an "
+#~ "optional invite message."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Unable To Retrieve Buddy List"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Add Buddy"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Cannot get server information"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "Reading error"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "You were disconnected from the server."
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Connect server"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "Failed to join chat"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Looking up %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Connect to %s failed"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Signon: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Unable to write file %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Unable to read file %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Message too long, last %s bytes truncated."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s not currently logged in."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Warning of %s not allowed."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Chat in %s is not available."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "You are sending messages too fast to %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "You missed an IM from %s because it was too big."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "You missed an IM from %s because it was sent too fast."
+
+#~ msgid "Failure."
+#~ msgstr "Failure."
+
+#~ msgid "Too many matches."
+#~ msgstr "Too many matches."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Need more qualifiers."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Dir service temporarily unavailable."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Email lookup restricted."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Keyword ignored."
+
+#~ msgid "No keywords."
+#~ msgstr "No keywords."
+
+#~ msgid "User has no directory information."
+#~ msgstr "User has no directory information."
+
+#~ msgid "Country not supported."
+#~ msgstr "Country not supported."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Failure unknown: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Incorrect nickname or password."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "The service is temporarily unavailable."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Your warning level is currently too high to log in."
+
+#~ 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 ""
+#~ "You have been connecting and disconnecting too frequently.  Wait ten "
+#~ "minutes and try again.  If you continue to try, you will need to wait "
+#~ "even longer."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "An unknown signon error has occurred: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "An unknown error, %d, has occurred.  Info: %s"
+
+#, fuzzy
+#~ msgid "Invalid Groupname"
+#~ msgstr "Invalid group"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Connection Closed"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Waiting for reply..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC has come back from its pause. You may now send messages again."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Password Change Successful"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Get Dir Info"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Set Dir Info"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Could not open %s for writing!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "File transfer failed; other side probably cancelled."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Could not connect for transfer."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Could not write file header.  The file will not be transferred."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Save Icon As..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s requests you to send them a file"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC Protocol Plugin"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "User information for %s unavailable"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Options"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxy Options"
+
+#~ msgid "By log size"
+#~ msgstr "By log size"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Open Link in Browser"
+
+#, fuzzy
+#~ msgid "ST_UN server:"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Save Image"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Shortcuts"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Flash Window when messages are received"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "A folder with that name already exists"
 
@@ -14731,13 +15605,6 @@ msgstr ""
 #~ msgstr "Are you sure you want to remove the away message \"%s\"?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s on %s (%s)"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Send Message"
 
@@ -14878,9 +15745,6 @@ msgstr ""
 #~ msgid "Invalid screen name"
 #~ msgstr "Invalid Username"
 
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Unable to make SSL connection to server."
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "Too evil (sender)"
 
@@ -14941,10 +15805,6 @@ msgstr ""
 #~ msgstr "Users on %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Do you want to add this buddy to your buddy list?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "File operation error"
 
@@ -14953,10 +15813,6 @@ msgstr ""
 #~ msgstr "%s not currently logged in."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Error creating connection"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Unable to login to AIM"
 
@@ -15075,17 +15931,9 @@ msgstr ""
 #~ msgstr "Currently on"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Unable to connect to server."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Message:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Account:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Hide Disconnect Errors"
 
@@ -15241,13 +16089,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> Offline"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -15344,9 +16185,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "_Idle"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "Retur_n from idle"
-
 #~ msgid "Pounce Action"
 #~ msgstr "Pounce Action"
 
@@ -15629,12 +16467,12 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 
 #~ msgid "Pidgin - Save As..."
 #~ msgstr "Pidgin - Save As..."
@@ -15648,13 +16486,13 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 
 #~ msgid "Unable to read"
 #~ msgstr "Unable to read"
@@ -15677,9 +16515,6 @@ msgstr ""
 #~ msgstr[0] "(%d message)"
 #~ msgstr[1] "(%d messages)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 message)"
-
 #, fuzzy
 #~ msgid "Default auto-away"
 #~ msgstr "Auto-away"
@@ -15782,9 +16617,6 @@ msgstr ""
 #~ msgid "Away title: "
 #~ msgstr "Away title: "
 
-#~ msgid "Buddy List Error"
-#~ msgstr "Buddy List Error"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Size of the expander arrow"
 
@@ -15916,9 +16748,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Send a message to the selected buddy"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Get information on the selected buddy"
-
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
 
@@ -16127,9 +16956,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Summary"
 
-#~ msgid "Message Text"
-#~ msgstr "Message Text"
-
 #~ msgid "Away Messages"
 #~ msgstr "Away Messages"
 
@@ -16187,12 +17013,12 @@ msgstr ""
 #~ msgstr "Unable to load preferences"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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."
 
 #~ msgid "Slightly less boring default"
@@ -16228,9 +17054,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Critical error in GG library\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Unable to ping server"
-
 #~ msgid "Send as message"
 #~ msgstr "Send as message"
 
@@ -16298,18 +17121,18 @@ msgstr ""
 #~ msgstr "Unable to access directory"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 
 #~ msgid "Directory Search"
 #~ msgstr "Directory Search"
@@ -16318,11 +17141,11 @@ msgstr ""
 #~ msgstr "Unable to access user profile."
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 
 #~ msgid "Pidgin encountered an error communicating with the ICQ server."
 #~ msgstr "Pidgin encountered an error communicating with the ICQ server."
@@ -16441,9 +17264,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s logged in."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s logged out."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -16461,9 +17281,6 @@ msgstr ""
 #~ "%s has invited %s to the chat room %s:\n"
 #~ "<b>%s</b>"
 
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Sorry, I ran out for a bit!"
-
 #~ msgid ""
 #~ "Unable to guess the image type based on the file extension supplied.  "
 #~ "Defaulting to PNG."
diff --git a/po/en_GB.po b/po/en_GB.po
index de7c809f9b..7637f5cb63 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-25 14:11-0700\n"
 "PO-Revision-Date: 2006-02-07 13:57+0000\n"
 "Last-Translator: Luke Ross <luke@lukeross.name>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -31,7 +31,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -40,7 +40,7 @@ msgstr ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debug messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -70,7 +70,6 @@ msgstr "New mail notifications"
 msgid "Remember password"
 msgstr "Remember password"
 
-#, fuzzy
 msgid "There are no protocol plugins installed."
 msgstr "There are no protocol plugins installed."
 
@@ -96,9 +95,8 @@ msgid "Alias:"
 msgstr "Alias:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "Create this new account on the server"
+msgstr "Create this account on the server"
 
 #. Cancel button
 #. Cancel
@@ -405,9 +403,8 @@ msgstr "Join Chat..."
 msgid "View Log..."
 msgstr "View Log..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "View Log"
+msgstr "View All Logs"
 
 msgid "Show"
 msgstr "Show"
@@ -604,21 +601,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Send To"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "Insert in message"
-
-msgid "Invite"
-msgstr "Invite"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-
 msgid "Conversation"
 msgstr "Conversation"
 
@@ -631,9 +613,8 @@ msgstr "Show Timestamps"
 msgid "Add Buddy Pounce..."
 msgstr "Add Buddy Pounce..."
 
-#, fuzzy
 msgid "Invite..."
-msgstr "Invite"
+msgstr "Invite..."
 
 msgid "Enable Logging"
 msgstr "Enable Logging"
@@ -644,11 +625,11 @@ msgstr "Enable Sounds"
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "List of users:\n"
-msgstr[1] "List of users:\n"
+msgstr[0] "List of %d user:\n"
+msgstr[1] "List of %d users:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
@@ -668,10 +649,12 @@ msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
 msgstr ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
-msgstr ""
+msgstr "%s is not a valid colour. See '/help msgcolor' for valid colours."
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
@@ -724,6 +707,11 @@ msgid ""
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the colour "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
 msgstr "Unable to open file."
@@ -744,10 +732,10 @@ msgstr "Filter:"
 msgid "Pause"
 msgstr "Pause"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "File Transfers - %d%% of %d files"
+msgstr[0] "File Transfers - %d%% of %d file"
 msgstr[1] "File Transfers - %d%% of %d files"
 
 #. Create the window.
@@ -862,13 +850,45 @@ msgstr "Conversations in %s"
 msgid "Conversations with %s"
 msgstr "Conversations with %s"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "Conversations"
+msgstr "All Conversations"
 
 msgid "System Log"
 msgstr "System Log"
 
+msgid "Calling ... "
+msgstr "Calling ... "
+
+msgid "Hangup"
+msgstr "Hangup"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Accept"
+
+msgid "Reject"
+msgstr "Reject"
+
+msgid "Call in progress."
+msgstr "Call in progress."
+
+msgid "The call has been terminated."
+msgstr "The call has been terminated."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s wishes to start an audio session with you."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s is trying to start an unsupported media session type with you."
+
+msgid "You have rejected the call."
+msgstr "You have rejected the call."
+
+msgid "call: Make an audio call."
+msgstr "call: Make an audio call."
+
 msgid "Emails"
 msgstr "Emails"
 
@@ -903,6 +923,9 @@ msgstr "Continue"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "Invite"
+
 msgid "(none)"
 msgstr "(none)"
 
@@ -1105,7 +1128,6 @@ msgstr "%s has gone away. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s has sent you a message. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
@@ -1151,7 +1173,6 @@ msgstr "Minutes before changing status"
 msgid "Change status to"
 msgstr "Change status to"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1473,7 +1494,6 @@ msgstr ""
 "When a new conversation is opened this plug-in will insert the last "
 "conversation into the current conversation."
 
-#, c-format
 msgid "Online"
 msgstr "Online"
 
@@ -1496,10 +1516,10 @@ msgid "No Grouping"
 msgstr "No Grouping"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "Nested Subgroup"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "Nested Grouping (experimental)"
 
 msgid "Provides alternate buddylist grouping options."
 msgstr "Provides alternate buddylist grouping options."
@@ -1517,6 +1537,29 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Lastlog plugin."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Fetching TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Only create TinyURL for urls of this length or greater"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (or other) address prefix"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL plugin"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "When receiving a message with URL(s), TinyURL for easier copying"
+
 msgid "accounts"
 msgstr "accounts"
 
@@ -1617,13 +1660,6 @@ msgstr "Accept certificate for %s?"
 msgid "SSL Certificate Verification"
 msgstr "SSL Certificate Verification"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Accept"
-
-msgid "Reject"
-msgstr "Reject"
-
 msgid "_View Certificate..."
 msgstr "_View Certificate..."
 
@@ -1637,6 +1673,7 @@ msgstr ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "The certificate chain presented for %s is not valid."
@@ -1646,6 +1683,7 @@ msgstr "The certificate chain presented for %s is not valid."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL Certificate Error"
 
@@ -1726,6 +1764,7 @@ msgstr "+++ %s signed on"
 msgid "+++ %s signed off"
 msgstr "+++ %s signed off"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -1772,6 +1811,17 @@ msgstr "%s left the room."
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
+msgid "Invite to chat"
+msgstr "Invite to chat"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Failed to get connection: %s"
@@ -1818,7 +1868,7 @@ msgstr ""
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "Resolver process exited without answering our request"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -1903,10 +1953,13 @@ msgid "Starting transfer of %s from %s"
 msgstr "Starting transfer of %s from %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfer of file %s complete"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "File transfer complete"
 
@@ -1914,7 +1967,6 @@ msgstr "File transfer complete"
 msgid "You canceled the transfer of %s"
 msgstr "You cancelled the transfer of %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
@@ -2117,11 +2169,13 @@ msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Error creating conference."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "You are using %s, but this plugin requires %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "This plugin has not defined an ID."
 
@@ -2133,10 +2187,10 @@ msgstr "Plug-in magic mismatch %d (need %d)"
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI version mismatch %d.%d.x (need %d.%d.x)"
 
-#, fuzzy
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr "Plug-in does not implement all required functions"
+msgstr ""
+"Plugin does not implement all required functions (list_icon, login and close)"
 
 #, c-format
 msgid ""
@@ -2216,9 +2270,8 @@ msgstr ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "Select a user directory to search"
+msgstr "Create a new directory for each user"
 
 msgid "Notes"
 msgstr "Notes"
@@ -2382,7 +2435,7 @@ msgid "User Inactivity Timeout (in minutes)"
 msgstr "User Inactivity Timeout (in minutes)"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "Apply hiding rules to buddies"
 
 #. *< type
 #. *< ui_requirement
@@ -2517,13 +2570,13 @@ msgstr "Includes other IM clients' logs in the log viewer."
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2572,10 +2625,10 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "Save messages sent to an offline user as pounce."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 
 #, c-format
@@ -2604,6 +2657,34 @@ msgstr "Save offline messages in pounce"
 msgid "Do not ask. Always save in pounce."
 msgstr "Do not ask. Always save in pounce."
 
+msgid "One Time Password"
+msgstr "One Time Password"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "One Time Password Support"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Enforce that passwords are used only once."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2796,24 +2877,21 @@ msgstr ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 
-#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Unable to listen for incoming IM connections"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Unable to establish connection with the local mDNS server - is it running?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Forename"
 
@@ -2845,6 +2923,10 @@ msgstr "Bonjour Protocol Plug-in"
 msgid "Purple Person"
 msgstr "Purple Person"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "Local Port"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2855,14 +2937,17 @@ msgstr "%s has closed the conversation."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Unable to send the message: the conversation couldn't be started."
 
-msgid "Cannot open socket"
-msgstr "Cannot open socket"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Could not bind socket to port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Unable to bind socket to port: %s"
 
-msgid "Could not listen on socket"
-msgstr "Could not listen on socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Unable to listen on socket: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Error communicating with local mDNSResponder."
@@ -2911,14 +2996,14 @@ msgstr "Save buddylist..."
 msgid "Load buddylist from file..."
 msgstr "Load buddylist from file..."
 
-msgid "Fill in the registration fields."
-msgstr "Fill in the registration fields."
+msgid "You must fill in all registration fields"
+msgstr "You must fill in all registration fields"
 
-msgid "Passwords do not match."
-msgstr "Passwords do not match."
+msgid "Passwords do not match"
+msgstr "Passwords do not match"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Unable to register new account.  An unknown error occurred."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "New Gadu-Gadu Account Registered"
@@ -2929,14 +3014,14 @@ msgstr "Registration completed successfully!"
 msgid "Password"
 msgstr "Password"
 
-msgid "Password (retype)"
-msgstr "Password (retype)"
+msgid "Password (again)"
+msgstr "Password (again)"
 
-msgid "Enter current token"
-msgstr "Enter current token"
+msgid "Enter captcha text"
+msgstr "Enter captcha text"
 
-msgid "Current token"
-msgstr "Current token"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Register New Gadu-Gadu Account"
@@ -2989,6 +3074,15 @@ msgstr "Password successfully changed!"
 msgid "Current password"
 msgstr "Current password"
 
+msgid "Password (retype)"
+msgstr "Password (retype)"
+
+msgid "Enter current token"
+msgstr "Enter current token"
+
+msgid "Current token"
+msgstr "Current token"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Please enter your current password and your new password for UIN: "
 
@@ -3002,13 +3096,13 @@ msgstr "Select a chat for buddy: %s"
 msgid "Add to chat..."
 msgstr "Add to chat..."
 
+#. Global
 msgid "Available"
 msgstr "Available"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Away"
 
@@ -3036,8 +3130,8 @@ msgstr "No matching users found"
 msgid "There are no users matching your search criteria."
 msgstr "There are no users matching your search criteria."
 
-msgid "Unable to read socket"
-msgstr "Unable to read socket"
+msgid "Unable to read from socket"
+msgstr "Unable to read from socket"
 
 msgid "Buddy list downloaded"
 msgstr "Buddy list downloaded"
@@ -3051,8 +3145,14 @@ msgstr "Buddy list uploaded"
 msgid "Your buddy list was stored on the server."
 msgstr "Your buddy list was stored on the server."
 
-msgid "Connection failed."
-msgstr "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connected"
+
+msgid "Connection failed"
+msgstr "Connection failed"
 
 msgid "Add to chat"
 msgstr "Add to chat"
@@ -3060,14 +3160,23 @@ msgstr "Add to chat"
 msgid "Chat _name:"
 msgstr "Chat _name:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Unable to resolve hostname '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connecting"
+
 msgid "Chat error"
 msgstr "Chat error"
 
 msgid "This chat name is already in use"
 msgstr "This chat name is already in use"
 
-msgid "Not connected to the server."
-msgstr "Not connected to the server."
+msgid "Not connected to the server"
+msgstr "Not connected to the server"
 
 msgid "Find buddies..."
 msgstr "Find buddies..."
@@ -3108,6 +3217,9 @@ msgstr "Polish popular IM system"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu User"
 
+msgid "GG server"
+msgstr "GG server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
@@ -3122,8 +3234,8 @@ msgstr "No topic is set"
 msgid "File Transfer Failed"
 msgstr "File Transfer Failed"
 
-msgid "Could not open a listening port."
-msgstr "Could not open a listening port."
+msgid "Unable to open a listening port."
+msgstr "Unable to open a listening port."
 
 msgid "Error displaying MOTD"
 msgstr "Error displaying MOTD"
@@ -3138,8 +3250,16 @@ msgstr "There is no MOTD associated with this connection."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Lost connection with server: %s"
 
 msgid "View MOTD"
 msgstr "View MOTD"
@@ -3150,25 +3270,23 @@ msgstr "_Channel:"
 msgid "_Password:"
 msgstr "_Password:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC nicks may not contain whitespace"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connecting"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC nick and server may not contain whitespace"
 
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-msgid "Couldn't create socket"
-msgstr "Couldn't create socket"
+msgid "Unable to connect"
+msgstr "Unable to connect"
 
-msgid "Couldn't connect to host"
-msgstr "Couldn't connect to host"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Unable to connect: %s"
 
-msgid "Read error"
-msgstr "Read error"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Server closed the connection"
 
 msgid "Users"
 msgstr "Users"
@@ -3203,7 +3321,7 @@ msgid "Encodings"
 msgstr "Encodings"
 
 msgid "Auto-detect incoming UTF-8"
-msgstr ""
+msgstr "Auto-detect incoming UTF-8"
 
 msgid "Real name"
 msgstr "Real name"
@@ -3218,9 +3336,9 @@ msgstr "Use SSL"
 msgid "Bad mode"
 msgstr "Bad mode"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr "Ban on %s by %s, set %ld seconds ago"
+msgstr "Ban on %s by %s, set %s ago"
 
 #, c-format
 msgid "Ban on %s"
@@ -3349,6 +3467,16 @@ msgstr ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "The nickname \"%s\" is already being used."
+
+msgid "Nickname in use"
+msgstr "Nickname in use"
+
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
@@ -3391,7 +3519,7 @@ msgstr ""
 "away."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <nick> <msg>: sends ctcp msg to nick."
 
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Send a command to chanserv"
@@ -3584,11 +3712,11 @@ msgstr "Ad-Hoc Command Failed"
 msgid "execute"
 msgstr "execute"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Server requires TLS/SSL, but no TLS/SSL support was found."
 
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "You require encryption, but no TLS/SSL support was found."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
@@ -3604,17 +3732,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-msgid "Invalid response from server."
-msgstr "Invalid response from server."
+msgid "SASL authentication failed"
+msgstr "SASL Authentication failed"
+
+msgid "Invalid response from server"
+msgstr "Invalid response from server"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "You require encryption, but it is not available on this server."
+
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-msgid "SASL error"
-msgstr "SASL error"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL error: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "The BOSH connection manager terminated your session."
+
+msgid "No session ID given"
+msgstr "No session ID given"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Unsupported version of BOSH protocol"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Unable to establish a connection with the server"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Unable to establish a connection with the server: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Unable to establish SSL connection"
 
 msgid "Full Name"
 msgstr "Full Name"
@@ -3641,7 +3795,7 @@ msgid "Region"
 msgstr "Region"
 
 msgid "Postal Code"
-msgstr "Postal Code"
+msgstr "Postcode"
 
 msgid "Country"
 msgstr "Country"
@@ -3682,158 +3836,8 @@ msgstr "Client"
 msgid "Operating System"
 msgstr "Operating System"
 
-msgid "Last Activity"
-msgstr "Last Activity"
-
-msgid "Service Discovery Info"
-msgstr "Service Discovery Info"
-
-msgid "Service Discovery Items"
-msgstr "Service Discovery Items"
-
-msgid "Extended Stanza Addressing"
-msgstr "Extended Stanza Addressing"
-
-msgid "Multi-User Chat"
-msgstr "Multi-User Chat"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Multi-User Chat Extended Presence Information"
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band Bytestreams"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc Commands"
-
-msgid "PubSub Service"
-msgstr "PubSub Service"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreams"
-
-msgid "Out of Band Data"
-msgstr "Out of Band Data"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "In-Band Registration"
-
-msgid "User Location"
-msgstr "User Location"
-
-msgid "User Avatar"
-msgstr "User Avatar"
-
-msgid "Chat State Notifications"
-msgstr "Chat State Notifications"
-
-msgid "Software Version"
-msgstr "Software Version"
-
-msgid "Stream Initiation"
-msgstr "Stream Initiation"
-
-msgid "File Transfer"
-msgstr "File Transfer"
-
-msgid "User Mood"
-msgstr "User Mood"
-
-msgid "User Activity"
-msgstr "User Activity"
-
-msgid "Entity Capabilities"
-msgstr "Entity Capabilities"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Encrypted Session Negotiations"
-
-msgid "User Tune"
-msgstr "User Tune"
-
-msgid "Roster Item Exchange"
-msgstr "Roster Item Exchange"
-
-msgid "Reachability Address"
-msgstr "Reachability Address"
-
-msgid "User Profile"
-msgstr "User Profile"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
-
-msgid "User Nickname"
-msgstr "User Nickname"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Message Receipts"
-
-msgid "Public Key Publishing"
-msgstr "Public Key Publishing"
-
-msgid "User Chatting"
-msgstr "User Chatting"
-
-msgid "User Browsing"
-msgstr "User Browsing"
-
-msgid "User Gaming"
-msgstr "User Gaming"
-
-msgid "User Viewing"
-msgstr "User Viewing"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza Encryption"
-
-msgid "Entity Time"
-msgstr "Entity Time"
-
-msgid "Delayed Delivery"
-msgstr "Delayed Delivery"
-
-msgid "Collaborative Data Objects"
-msgstr "Collaborative Data Objects"
-
-msgid "File Repository and Sharing"
-msgstr "File Repository and Sharing"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN Service Discovery for Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Simplified Encrypted Session Negotiation"
-
-msgid "Hop Check"
-msgstr "Hop Check"
-
-msgid "Capabilities"
-msgstr "Capabilities"
+msgid "Local Time"
+msgstr "Local Time"
 
 msgid "Priority"
 msgstr "Priority"
@@ -3841,6 +3845,13 @@ msgstr "Priority"
 msgid "Resource"
 msgstr "Resource"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s ago"
+
+msgid "Logged Off"
+msgstr "Logged Off"
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -3887,7 +3898,6 @@ msgstr "Chatty"
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
@@ -4008,28 +4018,24 @@ msgstr "Select a conference server to query"
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "You require encryption, but it is not available on this server."
+msgid "Affiliations:"
+msgstr "Affiliations:"
 
-msgid "Write error"
-msgstr "Write error"
+msgid "No users found"
+msgstr "No users found"
 
-msgid "Ping timeout"
-msgstr "Ping timeout"
+msgid "Roles:"
+msgstr "Roles:"
 
-msgid "Read Error"
-msgstr "Read Error"
+msgid "Ping timed out"
+msgstr "Ping timed out"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Could not establish a connection with the server:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Unable to create socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
@@ -4037,6 +4043,9 @@ msgstr "Invalid XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Invalid XMPP ID. Domain must be set."
 
+msgid "Malformed BOSH URL"
+msgstr "Malformed BOSH URL"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
@@ -4061,9 +4070,6 @@ msgstr "Unregistration Successful"
 msgid "Unregistration Failed"
 msgstr "Unregistration Failed"
 
-msgid "Already Registered"
-msgstr "Already Registered"
-
 msgid "State"
 msgstr "County/State"
 
@@ -4076,6 +4082,9 @@ msgstr "Telephone"
 msgid "Date"
 msgstr "Date"
 
+msgid "Already Registered"
+msgstr "Already Registered"
+
 msgid "Unregister"
 msgstr "Unregister"
 
@@ -4122,9 +4131,18 @@ msgstr "Authenticating"
 msgid "Re-initializing Stream"
 msgstr "Re-initialising Stream"
 
+msgid "Server doesn't support blocking"
+msgstr "Server doesn't support blocking"
+
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
+msgid "Mood"
+msgstr "Mood"
+
+msgid "Now Listening"
+msgstr "Now Listening"
+
 msgid "Both"
 msgstr "Both"
 
@@ -4146,12 +4164,6 @@ msgstr "None"
 msgid "Subscription"
 msgstr "Subscription"
 
-msgid "Mood"
-msgstr "Mood"
-
-msgid "Now Listening"
-msgstr "Now Listening"
-
 msgid "Mood Text"
 msgstr "Mood Text"
 
@@ -4194,9 +4206,6 @@ msgstr "Your password has been changed."
 msgid "Error changing password"
 msgstr "Error changing password"
 
-msgid "Password (again)"
-msgstr "Password (again)"
-
 msgid "Change XMPP Password"
 msgstr "Change XMPP Password"
 
@@ -4390,16 +4399,24 @@ msgid "Unable to ping user %s"
 msgstr "Unable to ping user %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Unable to buzz, because there is nothing known about %s."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Unable to buzz, because %s might be offline."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Buzzing %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4411,8 +4428,33 @@ msgid "%s has buzzed you!"
 msgstr "%s has buzzed you!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Buzzing %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Unable to initiate media with %s: invalid JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Unable to initiate media with %s: user is not online"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Unable to initiate media with %s: not subscribed to user presence"
+
+msgid "Media Initiation Failed"
+msgstr "Media Initiation Failed"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+
+msgid "Select a Resource"
+msgstr "Select a Resource"
+
+msgid "Initiate Media"
+msgstr "Initiate Media"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
@@ -4433,18 +4475,18 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [reason]:  Ban a user from the room."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4504,11 +4546,13 @@ msgstr "Connect server"
 msgid "File transfer proxies"
 msgstr "File transfer proxies"
 
+msgid "BOSH URL"
+msgstr "BOSH URL"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
-msgstr "Show custom smileys"
+msgstr "Show Custom Smileys"
 
 #, c-format
 msgid "%s has left the conversation."
@@ -4533,9 +4577,9 @@ msgstr "Message delivery to %s failed: %s"
 msgid "XMPP Message Error"
 msgstr "XMPP Message Error"
 
-#, fuzzy, c-format
+#, c-format
 msgid "(Code %s)"
-msgstr " (Code %s)"
+msgstr "(Code %s)"
 
 msgid "XML Parse error"
 msgstr "XML Parse error"
@@ -4543,6 +4587,14 @@ msgstr "XML Parse error"
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error joining chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error in chat %s"
+
 msgid "Create New Room"
 msgstr "Create New Room"
 
@@ -4559,13 +4611,28 @@ msgstr "_Configure Room"
 msgid "_Accept Defaults"
 msgstr "_Accept Defaults"
 
+msgid "No reason"
+msgstr "No reason"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Error joining chat %s"
+msgid "You have been kicked: (%s)"
+msgstr "You have been kicked: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Error in chat %s"
+msgid "Kicked (%s)"
+msgstr "Kicked (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "An error occurred on the in-band bytestream transfer\n"
+
+msgid "Transfer was closed."
+msgstr "Transfer was closed."
+
+msgid "Failed to open the file"
+msgstr "Failed to open the file"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Failed to open in-band bytestream"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4591,9 +4658,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 "Please select the resource of %s to which you would like to send a file"
 
-msgid "Select a Resource"
-msgstr "Select a Resource"
-
 msgid "Edit User Mood"
 msgstr "Edit User Mood"
 
@@ -4628,8 +4692,18 @@ msgstr "Actions"
 msgid "Select an action"
 msgstr "Select an action"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Unable to retrieve MSN Address Book"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Unable to add \"%s\"."
+
+msgid "Buddy Add error"
+msgstr "Buddy Add error"
+
+msgid "The username specified does not exist."
+msgstr "The username specified does not exist."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4859,9 +4933,8 @@ msgstr "Kids Passport without parental consent"
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
-#, fuzzy, c-format
 msgid "Passport account suspended"
-msgstr "Passport account not yet verified"
+msgstr "Passport account suspended"
 
 #, c-format
 msgid "Bad ticket"
@@ -4875,13 +4948,31 @@ msgstr "Unknown Error Code %d"
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "Preferred Contact"
+msgstr "Other Contacts"
 
-#, fuzzy
 msgid "Non-IM Contacts"
-msgstr "Remove Contact"
+msgstr "Non-IM Contacts"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s sent a wink, but it could not be saved"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s sent a voice clip, but it could not be saved"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s sent you a voice chat invite, which is not yet supported."
 
 msgid "Nudge"
 msgstr "Nudge"
@@ -4894,9 +4985,8 @@ msgstr "%s has nudged you!"
 msgid "Nudging %s..."
 msgstr "Nudging %s..."
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "Email Address"
+msgstr "Email Address..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
@@ -4932,22 +5022,21 @@ msgstr "Allow"
 msgid "Disallow"
 msgstr "Disallow"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
-msgstr "Buddy Comment for %s"
+msgstr "Blocked Text for %s"
 
-#, fuzzy
 msgid "No text is blocked for this account."
-msgstr "Use this buddy _icon for this account:"
+msgstr "No text is blocked for this account."
 
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
 
-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "This Hotmail account may not be active."
+msgstr "This account does not have email enabled."
 
 msgid "Send a mobile message."
 msgstr "Send a mobile message."
@@ -4955,6 +5044,12 @@ msgstr "Send a mobile message."
 msgid "Page"
 msgstr "Page"
 
+msgid "Playing a game"
+msgstr "Playing a game"
+
+msgid "Working"
+msgstr "Working"
+
 msgid "Has you"
 msgstr "Has you"
 
@@ -4991,6 +5086,12 @@ msgstr "Artist"
 msgid "Album"
 msgstr "Album"
 
+msgid "Game Title"
+msgstr "Game Title"
+
+msgid "Office Title"
+msgstr "Office Title"
+
 msgid "Set Friendly Name..."
 msgstr "Set Friendly Name..."
 
@@ -5010,7 +5111,7 @@ msgid "Allow/Disallow Mobile Pages..."
 msgstr "Allow/Disallow Mobile Pages..."
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "View Blocked Text..."
 
 msgid "Open Hotmail Inbox"
 msgstr "Open Hotmail Inbox"
@@ -5024,8 +5125,28 @@ msgstr "Initiate _Chat"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL support is needed for MSN. Please install a supported SSL library."
 
-msgid "Failed to connect to server."
-msgstr "Failed to connect to server."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+
+msgid "Unable to Add"
+msgstr "Unable to Add"
+
+msgid "Authorization Request Message:"
+msgstr "Authorisation Request Message:"
+
+msgid "Please authorize me!"
+msgstr "Please authorise me!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
@@ -5182,8 +5303,8 @@ msgstr ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 
-msgid "Profile URL"
-msgstr "Profile URL"
+msgid "View web profile"
+msgstr "View web profile"
 
 #. *< type
 #. *< ui_requirement
@@ -5212,69 +5333,30 @@ msgstr "nudge: nudge a user to get their attention"
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID authentication: Unable to connect"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Windows Live ID authentication: Unable to connect"
-
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s is not a valid group."
-
-msgid "Unknown error."
-msgstr "Unknown error."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s on %s (%s)"
+msgstr "Windows Live ID authentication: Invalid response"
 
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s just sent you a Nudge!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Unknown error (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Unable to add user"
 
-#, fuzzy
-msgid "The following users are missing from your addressbook"
-msgstr "The following are the results of your search"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Unable to add user on %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Unable to block user on %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Unable to permit user on %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s could not be added because your buddy list is full."
-
+#. Unknown error!
 #, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is not a valid passport account."
+msgid "Unknown error (%d)"
+msgstr "Unknown error (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Service Temporarily Unavailable."
+msgid "The following users are missing from your addressbook"
+msgstr "The following users are missing from your addressbook"
 
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
-msgstr "Message was not sent because you are not signed on."
-
-msgid "Unable to rename group"
-msgstr "Unable to rename group"
-
-msgid "Unable to delete group"
-msgstr "Unable to delete group"
+msgstr "Mobile message was not sent because it was too long."
 
 #, c-format
 msgid ""
@@ -5310,21 +5392,17 @@ msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
 
-#, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "Message could not be sent because we are sending too quickly:"
+msgstr "Message was not sent because messages are being sent too quickly."
 
-#, fuzzy
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "Message may have not been sent because an unknown error occurred:"
+msgstr "Message was not sent because an unknown encoding error occurred."
 
-#, fuzzy
 msgid "Message was not sent because an unknown error occurred."
-msgstr "Message may have not been sent because an unknown error occurred:"
-
-msgid "Unable to connect"
-msgstr "Unable to connect"
+msgstr "Message was not sent because an unknown error occurred."
 
 msgid "Writing error"
 msgstr "Writing error"
@@ -5340,21 +5418,21 @@ msgstr ""
 "Connection error from %s server:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
+msgstr "Our protocol is not supported by the server"
 
-msgid "Error parsing HTTP."
-msgstr "Error parsing HTTP."
+msgid "Error parsing HTTP"
+msgstr "Error parsing HTTP"
 
-msgid "You have signed on from another location."
-msgstr "You have signed on from another location."
+msgid "You have signed on from another location"
+msgstr "You have signed on from another location"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "The MSN servers are temporarily unavailable. Please wait and try again."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
+msgstr "The MSN servers are going down temporarily"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5383,6 +5461,15 @@ msgstr "Sending cookie"
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s requests to view your webcam, but this request is not yet supported."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s has sent you a webcam invitation, which is not yet supported."
+
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
@@ -5422,28 +5509,11 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s has added you to his or her buddy list."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s has removed you from his or her buddy list."
-
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "Add to Address Book"
+msgstr "Delete Buddy from Address Book?"
 
-#, fuzzy
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Do you want to add this buddy to your buddy list?"
-
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Unable to add \"%s\"."
+msgstr "Do you want to delete this buddy from your address book as well?"
 
 msgid "The username specified is invalid."
 msgstr "The username specified is invalid."
@@ -5451,6 +5521,9 @@ msgstr "The username specified is invalid."
 msgid "This Hotmail account may not be active."
 msgstr "This Hotmail account may not be active."
 
+msgid "Profile URL"
+msgstr "Profile URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5464,18 +5537,60 @@ msgstr "This Hotmail account may not be active."
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plug-in"
 
-msgid "Missing Cipher"
-msgstr "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s is not a valid group."
 
-msgid "The RC4 cipher could not be found"
-msgstr "The RC4 cipher could not be found"
+msgid "Unknown error."
+msgstr "Unknown error."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s on %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Unable to add user on %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Unable to block user on %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Unable to permit user on %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s could not be added because your buddy list is full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is not a valid passport account."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Service Temporarily Unavailable."
+
+msgid "Unable to rename group"
+msgstr "Unable to rename group"
+
+msgid "Unable to delete group"
+msgstr "Unable to delete group"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s has added you to his or her buddy list."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s has removed you from his or her buddy list."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "No such user: %s"
+
+msgid "User lookup"
+msgstr "User lookup"
 
 msgid "Reading challenge"
 msgstr "Reading challenge"
@@ -5486,13 +5601,21 @@ msgstr "Unexpected challenge length from server"
 msgid "Logging in"
 msgstr "Logging in"
 
-#, fuzzy, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] "Connection to server lost (no data received within %d seconds)"
-msgstr[1] "Connection to server lost (no data received within %d seconds)"
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - No Username Set"
+
+msgid "You appear to have no MySpace username."
+msgstr "You appear to have no MySpace username."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+
+msgid "Lost connection with server"
+msgstr "Lost connection with server"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "New mail messages"
 
@@ -5511,20 +5634,25 @@ msgstr "New picture comments"
 msgid "MySpace"
 msgstr "MySpace"
 
-msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM - No Username Set"
-
-msgid "You appear to have no MySpace username."
-msgstr "You appear to have no MySpace username."
+msgid "IM Friends"
+msgstr "IM Friends"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgstr[1] ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connected"
+msgid "Add contacts from server"
+msgstr "Add contacts from server"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5532,19 +5660,23 @@ msgstr "Protocol error, code %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+
+msgid "Incorrect username or password"
+msgstr "Incorrect username or password"
 
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM Error"
 
+msgid "Invalid input condition"
+msgstr "Invalid input condition"
+
 msgid "Failed to add buddy"
 msgstr "Failed to add buddy"
 
@@ -5554,13 +5686,6 @@ msgstr "'addbuddy' command failed."
 msgid "persist command failed"
 msgstr "persist command failed"
 
-#, c-format
-msgid "No such user: %s"
-msgstr "No such user: %s"
-
-msgid "User lookup"
-msgstr "User lookup"
-
 msgid "Failed to remove buddy"
 msgstr "Failed to remove buddy"
 
@@ -5570,38 +5695,18 @@ msgstr "'delbuddy' command failed"
 msgid "blocklist command failed"
 msgstr "blocklist command failed"
 
-msgid "Invalid input condition"
-msgstr "Invalid input condition"
-
-msgid "Read buffer full (2)"
-msgstr "Read buffer full (2)"
-
-msgid "Unparseable message"
-msgstr "Unparseable message"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Couldn't connect to host: %s (%d)"
+msgid "Missing Cipher"
+msgstr "Missing Cipher"
 
-msgid "IM Friends"
-msgstr "IM Friends"
+msgid "The RC4 cipher could not be found"
+msgstr "The RC4 cipher could not be found"
 
-#, fuzzy, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[1] ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-
-msgid "Add contacts from server"
-msgstr "Add contacts from server"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
 
 msgid "Add friends from MySpace.com"
 msgstr "Add friends from MySpace.com"
@@ -5643,9 +5748,6 @@ msgstr "Base font size (points)"
 msgid "User"
 msgstr "User"
 
-msgid "Profile"
-msgstr "Profile"
-
 msgid "Headline"
 msgstr "Headline"
 
@@ -5658,15 +5760,14 @@ msgstr "Total Friends"
 msgid "Client Version"
 msgstr "Client Version"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "No username set"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM - Please Set a Username"
-
-msgid "Please enter a username to check its availability:"
-msgstr "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Username Available"
@@ -5677,12 +5778,22 @@ msgstr "This username is available. Would you like to set it?"
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "ONCE SET, THIS CANNOT BE CHANGED!"
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Please Set a Username"
+
 msgid "This username is unavailable."
 msgstr "This username is not available."
 
 msgid "Please try another username:"
 msgstr "Please try another username:"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "No username set"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Please enter a username to check its availability:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5874,9 +5985,6 @@ msgstr "Cannot add yourself"
 msgid "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
-msgid "Incorrect username or password"
-msgstr "Incorrect username or password"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Could not recognise the host of the username you entered"
 
@@ -5920,8 +6028,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Login failed (%s)."
+msgid "Unable to login: %s"
+msgstr "Unable to login: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6023,9 +6131,6 @@ msgstr "GroupWise Conference %d"
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-msgid "Unable to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
@@ -6049,9 +6154,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "You have been logged out because you logged in at another workstation."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6060,16 +6162,12 @@ msgstr ""
 "sent."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-
-msgid "Error. SSL support is not installed."
-msgstr "Error: SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
@@ -6092,25 +6190,32 @@ msgstr "Server address"
 msgid "Server port"
 msgstr "Server port"
 
+msgid "Received unexpected response from "
+msgstr "Received unexpected response from "
+
+#. username connecting too frequently
+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 ""
+"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."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Error requesting "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL does not allow your screen name to authenticate here"
+
 msgid "Could not join chat room"
 msgstr "Could not join chat room"
 
 msgid "Invalid chat room name"
 msgstr "Invalid chat room name"
 
-msgid "Server closed the connection."
-msgstr "Server closed the connection."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Lost connection with server:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
+msgstr "Received invalid data on connection with server"
 
 #. *< type
 #. *< ui_requirement
@@ -6126,7 +6231,7 @@ msgid "AIM Protocol Plugin"
 msgstr "AIM Protocol Plugin"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "ICQ UIN..."
 
 #. *< type
 #. *< ui_requirement
@@ -6157,8 +6262,8 @@ msgstr "Lost connection with the remote user:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Received invalid data on connection with remote user."
 
-msgid "Could not establish a connection with the remote user."
-msgstr "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
+msgstr "Unable to establish a connection with the remote user."
 
 msgid "Direct IM established"
 msgstr "Direct IM established"
@@ -6224,10 +6329,10 @@ msgid "In local permit/deny"
 msgstr "In local permit/deny"
 
 msgid "Warning level too high (sender)"
-msgstr ""
+msgstr "Warning level too high (sender)"
 
 msgid "Warning level too high (receiver)"
-msgstr ""
+msgstr "Warning level too high (receiver)"
 
 msgid "User temporarily unavailable"
 msgstr "User temporarily unavailable"
@@ -6331,25 +6436,20 @@ msgid "Camera"
 msgstr "Camera"
 
 msgid "Screen Sharing"
-msgstr ""
+msgstr "Screen Sharing"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#, c-format
 msgid "Not Available"
 msgstr "Not Available"
 
-#, c-format
 msgid "Occupied"
 msgstr "Occupied"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#, c-format
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -6363,20 +6463,12 @@ msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Unable to connect to authentication server: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Unable to connect to BOS server: %s"
 
 msgid "Username sent"
 msgstr "Username sent"
@@ -6390,51 +6482,56 @@ msgstr "Finalising connection"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Invalid username."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "You may be disconnected shortly.  If so, check %s for updates."
 
-msgid "Incorrect password."
-msgstr "Incorrect password."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Unable to get a valid AIM login hash."
+
+msgid "Unable to get a valid login hash."
+msgstr "Unable to get a valid login hash."
+
+msgid "Received authorization"
+msgstr "Received authorisation"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Username does not exist"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Your account is currently suspended."
+msgid "Your account is currently suspended"
+msgstr "Your account is currently suspended"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"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."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "The client version you are using is too old. Please upgrade at %s"
 
-msgid "Could Not Connect"
-msgstr "Could Not Connect"
-
-msgid "Received authorization"
-msgstr "Received authorisation"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 
-msgid "The SecurID key entered is invalid."
-msgstr "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
+msgstr "The SecurID key entered is invalid"
 
 msgid "Enter SecurID"
 msgstr "Enter SecurID"
@@ -6442,30 +6539,6 @@ msgstr "Enter SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Enter the 6 digit number from the digital display."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Unable to get a valid AIM login hash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "You may be disconnected shortly.  Check %s for updates."
-
-msgid "Unable to get a valid login hash."
-msgstr "Unable to get a valid login hash."
-
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -6475,12 +6548,6 @@ msgstr "Unable to initialise connection"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Please authorise me so I can add you to my buddy list."
 
-msgid "Authorization Request Message:"
-msgstr "Authorisation Request Message:"
-
-msgid "Please authorize me!"
-msgstr "Please authorise me!"
-
 msgid "No reason given."
 msgstr "No reason given."
 
@@ -6576,20 +6643,24 @@ msgstr[0] ""
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "You missed %hu message from %s because he/she was too evil."
-msgstr[1] "You missed %hu messages from %s because he/she was too evil."
+msgstr[0] ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgstr[1] ""
+"You missed %hu messages from %s because his/her warning level is too high."
 
-#, fuzzy, c-format
+#, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "You missed %hu message from %s because you are too evil."
-msgstr[1] "You missed %hu messages from %s because you are too evil."
+msgstr[0] ""
+"You missed %hu message from %s because your warning level is too high."
+msgstr[1] ""
+"You missed %hu messages from %s because your warning level is too high."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -6597,7 +6668,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
@@ -6619,6 +6690,12 @@ msgstr "Online Since"
 msgid "Member Since"
 msgstr "Member Since"
 
+msgid "Capabilities"
+msgstr "Capabilities"
+
+msgid "Profile"
+msgstr "Profile"
+
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
@@ -6798,21 +6875,16 @@ msgstr "Away message too long."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 
-#, fuzzy
-msgid "Unable to Add"
-msgstr "Unable To Add"
-
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "Unable To Retrieve Buddy List"
+msgstr "Unable to Retrieve Buddy List"
 
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
@@ -6826,18 +6898,18 @@ msgstr "Orphans"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 
 msgid "(no name)"
 msgstr "(no name)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "Unable to add the buddy %s for an unknown reason."
 
 #, c-format
 msgid ""
@@ -6905,6 +6977,7 @@ msgstr "C_onnect"
 msgid "Get AIM Info"
 msgstr "Get AIM Info"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
@@ -6963,6 +7036,7 @@ msgstr "_Search"
 msgid "Set User Info (web)..."
 msgstr "Set User Info (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Change Password (web)"
 
@@ -6992,6 +7066,9 @@ msgstr "Search for Buddy by Email Address..."
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
+msgid "Use clientLogin"
+msgstr "Use clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7002,7 +7079,7 @@ msgstr ""
 "but does not reveal your IP address)"
 
 msgid "Allow multiple simultaneous logins"
-msgstr ""
+msgstr "Allow multiple simultaneous logins"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
@@ -7012,7 +7089,6 @@ msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Attempting to connect to %s:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Attempting to connect via proxy server."
 
@@ -7104,16 +7180,14 @@ msgstr "Pig"
 msgid "Other"
 msgstr "Other"
 
-#, fuzzy
 msgid "Visible"
-msgstr "Invisible"
+msgstr "Visible"
 
-msgid "Firend Only"
-msgstr ""
+msgid "Friend Only"
+msgstr "Friend Only"
 
-#, fuzzy
 msgid "Private"
-msgstr "Privacy"
+msgstr "Private"
 
 msgid "QQ Number"
 msgstr "QQ Number"
@@ -7130,9 +7204,8 @@ msgstr "Postcode"
 msgid "Phone Number"
 msgstr "Telephone Number"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Authorise buddy?"
+msgstr "Authorise adding"
 
 msgid "Cellphone Number"
 msgstr "Mobile Number"
@@ -7140,132 +7213,136 @@ msgstr "Mobile Number"
 msgid "Personal Introduction"
 msgstr "Personal Introduction"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "City"
+msgstr "City/Area"
 
-#, fuzzy
 msgid "Publish Mobile"
-msgstr "Personal Mobile"
+msgstr "Publish Mobile"
 
-#, fuzzy
 msgid "Publish Contact"
-msgstr "Alias Contact"
+msgstr "Publish Contact"
 
 msgid "College"
 msgstr "College/University"
 
-#, fuzzy
 msgid "Horoscope"
-msgstr "Horoscope Symbol"
+msgstr "Horoscope"
 
-#, fuzzy
 msgid "Zodiac"
-msgstr "Zodiac Sign"
+msgstr "Zodiac"
 
-#, fuzzy
 msgid "Blood"
-msgstr "Blocked"
+msgstr "Blood"
 
-#, fuzzy
 msgid "True"
-msgstr "Taurus"
+msgstr "True"
 
-#, fuzzy
 msgid "False"
-msgstr "Failed"
+msgstr "False"
 
-#, fuzzy
 msgid "Modify Contact"
-msgstr "Modify Account"
+msgstr "Modify Contact"
 
-#, fuzzy
 msgid "Modify Address"
-msgstr "Home Address"
+msgstr "Modify Address"
 
-#, fuzzy
 msgid "Modify Extended Information"
-msgstr "Modify my information"
+msgstr "Modify Extended Information"
 
-#, fuzzy
 msgid "Modify Information"
-msgstr "Modify my information"
+msgstr "Modify Information"
 
-#, fuzzy
 msgid "Update"
-msgstr "Last Update"
+msgstr "Update"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "Please enter buddy information."
+msgstr "Could not change buddy information."
+
+msgid "Mobile"
+msgstr "Mobile"
+
+msgid "Note"
+msgstr "Note"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Buddy Memo"
+
+msgid "Change his/her memo as you like"
+msgstr "Change his/her memo as you like"
+
+msgid "_Modify"
+msgstr "_Modify"
+
+msgid "Memo Modify"
+msgstr "Memo Modify"
+
+msgid "Server says:"
+msgstr "Server says:"
+
+msgid "Your request was accepted."
+msgstr "Your request was accepted."
+
+msgid "Your request was rejected."
+msgstr "Your request was rejected."
 
 #, c-format
-msgid "%d needs Q&A"
-msgstr ""
+msgid "%u requires verification"
+msgstr "%u requires verification"
 
-#, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Add Buddy"
+msgid "Add buddy question"
+msgstr "Add buddy question"
 
-#, fuzzy
-msgid "Input answer here"
-msgstr "Enter request here"
+msgid "Enter answer here"
+msgstr "Enter answer here"
 
 msgid "Send"
 msgstr "Send"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Invalid username."
+msgstr "Invalid answer."
 
 msgid "Authorization denied message:"
 msgstr "Authorisation denied message:"
 
-#, fuzzy
-msgid "Sorry, You are not my style."
-msgstr "Sorry, you are not my type..."
+msgid "Sorry, you're not my style."
+msgstr "Sorry, you are not my style."
 
-#, fuzzy, c-format
-msgid "%d needs authentication"
-msgstr "User %d needs authentication"
+#, c-format
+msgid "%u needs authorization"
+msgstr "%u needs authorisation"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "Add buddy to your list?"
+msgstr "Add buddy authorise"
 
-msgid "Input request here"
+msgid "Enter request here"
 msgstr "Enter request here"
 
 msgid "Would you be my friend?"
 msgstr "Would you like to be my friend?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Buddy"
+msgstr "QQ Buddy"
 
-#, fuzzy
 msgid "Add buddy"
-msgstr "Add Buddy"
+msgstr "Add buddy"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "Invalid QQ Face"
+msgstr "Invalid QQ Number"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "Please authorise me!"
+msgstr "Failed sending authorise"
 
-#, fuzzy, c-format
-msgid "Failed removing buddy %d"
-msgstr "Failed to remove buddy"
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "Failed removing buddy %u"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s has removed you from his or her buddy list."
+msgstr "Failed removing me from %d's buddy list"
 
-#, fuzzy
 msgid "No reason given"
-msgstr "No reason given."
+msgstr "No reason given"
 
 #. only need to get value
 #, c-format
@@ -7275,9 +7352,9 @@ msgstr "You have been added by %s"
 msgid "Would you like to add him?"
 msgstr "Would you like to add this person?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Reject"
+msgstr "Rejected by %s"
 
 #, c-format
 msgid "Message: %s"
@@ -7292,82 +7369,73 @@ msgstr "Group ID"
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Please enter the new name for %s"
+msgstr "Please enter Qun number"
 
-#, fuzzy
 msgid "You can only search for permanent Qun\n"
-msgstr "You can only search for permanent QQ groups\n"
+msgstr "You can only search for permanent Qun\n"
+
+msgid "(Invalid UTF-8 string)"
+msgstr "(Invalid UTF-8 string)"
 
-#, fuzzy
 msgid "Not member"
-msgstr "I am not a member"
+msgstr "Not member"
 
-#, fuzzy
 msgid "Member"
-msgstr "Member Since"
+msgstr "Member"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "Request Dialog"
+msgstr "Requesting"
 
-#, fuzzy
 msgid "Admin"
-msgstr "Adium"
+msgstr "Admin"
 
-#, fuzzy
 msgid "Notice"
-msgstr "Note"
+msgstr "Notice"
 
-#, fuzzy
 msgid "Detail"
-msgstr "Default"
+msgstr "Detail"
 
 msgid "Creator"
 msgstr "Creator"
 
-#, fuzzy
 msgid "About me"
-msgstr "About %s"
+msgstr "About me"
 
-#, fuzzy
 msgid "Category"
-msgstr "Chat error"
+msgstr "Category"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr "This group does not allow others to join"
+msgstr "The Qun does not allow others to join"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "Join Chat"
+msgstr "Join QQ Qun"
+
+msgid "Input request here"
+msgstr "Enter request here"
 
 #, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Successfully joined Qun %s (%u)"
 
-#, fuzzy
 msgid "Successfully joined Qun"
-msgstr "You have successfully modified Qun member"
+msgstr "Successfully joined Qun"
 
 #, c-format
-msgid "Qun %d denied to join"
-msgstr ""
+msgid "Qun %u denied from joining"
+msgstr "Qun %u denied from joining"
 
 msgid "QQ Qun Operation"
 msgstr "QQ Qun Operation"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Failed"
+msgstr "Failed:"
 
-msgid "Join Qun, Unknow Reply"
-msgstr ""
+msgid "Join Qun, Unknown Reply"
+msgstr "Join Qun, Unknown Reply"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "QQ Qun"
+msgstr "Quit Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -7376,51 +7444,47 @@ msgstr ""
 "Note: if you are the creator \n"
 "this operation will eventually remove this Qun."
 
-#, fuzzy
-msgid "Sorry, you are not our style ..."
-msgstr "Sorry, you are not my type..."
+msgid "Sorry, you are not our style"
+msgstr "Sorry, you are not our style"
 
-#, fuzzy
-msgid "Successfully changed Qun member"
-msgstr "You have successfully modified Qun member"
+msgid "Successfully changed Qun members"
+msgstr "Successfully changed Qun members"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
-msgstr "You have successfully modified Qun information"
+msgstr "Successfully changed Qun information"
 
 msgid "You have successfully created a Qun"
 msgstr "You have successfully created a Qun"
 
-#, fuzzy
-msgid "Would you like to set detailed information now?"
-msgstr "Would you like to set up the Qun details now?"
+msgid "Would you like to set up detailed information now?"
+msgstr "Would you like to set up detailed information now?"
 
 msgid "Setup"
 msgstr "Setup"
 
-#, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
-msgstr "User %d requested to join group %d"
+#, c-format
+msgid "%u requested to join Qun %u for %s"
+msgstr "%u requested to join Qun %u for %s"
 
-#, fuzzy, c-format
-msgid "%d request to join Qun %d"
-msgstr "User %d requested to join group %d"
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr "%u request to join Qun %u"
 
-#, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
-msgstr "Failed to join buddy in chat"
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "Failed to join Qun %u, operated by admin %u"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
-msgstr ""
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr "<b>Joining Qun %u is approved by admin %u for %s</b>"
 
-#, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
-msgstr "Remove Buddy"
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>Removed buddy %u.</b>"
 
 #, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>New buddy %u joined.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7430,140 +7494,139 @@ msgid "Level"
 msgstr "Level"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
+msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "Mobile"
+msgstr " FromMobile"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "Mobile"
+msgstr " BindMobile"
 
-#, fuzzy
 msgid " Video"
-msgstr "Live Video"
+msgstr " Video"
 
-#, fuzzy
 msgid " Zone"
-msgstr "None"
+msgstr " Zone"
 
 msgid "Flag"
-msgstr ""
+msgstr "Flag"
 
 msgid "Ver"
-msgstr ""
+msgstr "Ver"
 
 msgid "Invalid name"
 msgstr "Invalid name"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "Select Folder..."
+msgstr "Select icon..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Login Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Currently Online</b>: %d<br>\n"
+msgstr "<b>Total Online Buddies</b>: %d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Last Refreshed</b>: %s<br>\n"
+msgstr "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>Server</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Client Tag</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Connection Mode</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>My Internet IP</b>: %s:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>Currently Online</b>: %d<br>\n"
+msgstr "<b>Sent</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>Last Refreshed</b>: %s<br>\n"
+msgstr "<b>Resend</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>Last Refreshed</b>: %s<br>\n"
+msgstr "<b>Lost</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>Last Refreshed</b>: %s<br>\n"
+msgstr "<b>Received</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>Received Duplicate</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
 msgstr "Login Information"
 
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Original Author</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Code Contributors</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<b>Last Refreshed</b>: %s<br>\n"
+msgstr "<p><b>Lovely Patch Writers</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Currently Online</b>: %d<br>\n"
+msgstr "<p><b>Acknowledgement</b>:<br>\n"
+
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Scrupulous Testers</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "and more, please let me know... thank you!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>And, all the boys in the backroom...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
+msgstr "<i>Feel free to join us!</i> :)"
 
-#, fuzzy, c-format
-msgid "About OpenQ r%s"
-msgstr "About %s"
+#, c-format
+msgid "About OpenQ %s"
+msgstr "About OpenQ %s"
 
-#, fuzzy
 msgid "Change Icon"
-msgstr "Save Icon"
+msgstr "Change Icon"
 
 msgid "Change Password"
 msgstr "Change Password"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Login Information"
+msgstr "Account Information"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "Update all QQ Quns"
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "About %s"
+msgstr "About OpenQ"
+
+msgid "Modify Buddy Memo"
+msgstr "Modify Buddy Memo"
 
 #. *< type
 #. *< ui_requirement
@@ -7575,212 +7638,171 @@ msgstr "About %s"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "QQ Protocol\tPlugin"
+msgstr "QQ Protocol Plugin"
 
-#, fuzzy
 msgid "Auto"
-msgstr "Author"
+msgstr "Auto"
 
-#, fuzzy
 msgid "Select Server"
-msgstr "Select User"
+msgstr "Select Server"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
+msgstr "QQ2008"
 
-#. #endif
-#, fuzzy
 msgid "Connect by TCP"
-msgstr "Connect using TCP"
+msgstr "Connect by TCP"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "Server port"
+msgstr "Show server notice"
 
-#, fuzzy
 msgid "Show server news"
-msgstr "Server address"
+msgstr "Show server news"
+
+msgid "Show chat room when msg comes"
+msgstr "Show chat room when msg comes"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "Keep alive error"
+msgstr "Keep alive interval (seconds)"
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "Keep alive error"
+msgstr "Update interval (seconds)"
 
-#, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Cannot get server information"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
-msgstr "Cannot get server information"
+msgid "Unable to decrypt server reply"
+msgstr "Unable to decrypt server reply"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "Failed to request token, 0x%02X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "Invalid title"
+msgstr "Invalid token len, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX is not currently supported"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Registration Required"
+msgstr "Activation required"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
-msgstr ""
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "Unknown reply code when logging in (0x%02X)"
 
-msgid "Keep alive error"
-msgstr "Keep alive error"
+msgid "Requesting captcha"
+msgstr "Requesting captcha"
 
-#, fuzzy
-msgid "Requesting captcha ..."
-msgstr "Requesting %s's attention..."
-
-msgid "Checking code of captcha ..."
-msgstr ""
+msgid "Checking captcha"
+msgstr "Checking captcha"
 
-msgid "Failed captcha verify"
-msgstr ""
+msgid "Failed captcha verification"
+msgstr "Failed captcha verification"
 
-#, fuzzy
 msgid "Captcha Image"
-msgstr "Save Image"
+msgstr "Captcha Image"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "Enter Password"
+msgstr "Enter code"
 
-msgid "QQ Captcha Verifing"
-msgstr ""
+msgid "QQ Captcha Verification"
+msgstr "QQ Captcha Verification"
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "Enter the name of the group"
+msgstr "Enter the text from the image"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
-msgstr ""
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "Unknown reply when checking password (0x%02X)"
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Unable to connect."
+"Unknown reply code when logging in (0x%02X):\n"
+"%s"
 
 msgid "Socket error"
 msgstr "Socket error"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"Lost connection with server:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "Unable to read from socket"
-
-msgid "Write Error"
-msgstr "Write Error"
-
-msgid "Connection lost"
-msgstr "Connection lost"
-
-#, fuzzy
-msgid "Get server ..."
-msgstr "Set User Info..."
+msgid "Getting server"
+msgstr "Getting server"
 
-#, fuzzy
-msgid "Request token"
-msgstr "Request denied"
+msgid "Requesting token"
+msgstr "Requesting token"
 
-msgid "Couldn't resolve host"
-msgstr "Couldn't resolve host"
+msgid "Unable to resolve hostname"
+msgstr "Unable to resolve hostname"
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "Invalid error"
+msgstr "Invalid server or port"
 
-#, fuzzy
-msgid "Connecting server ..."
-msgstr "Connect server"
+msgid "Connecting to server"
+msgstr "Connecting to server"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "QQid Error"
-
-msgid "Failed to send IM."
-msgstr "Failed to send IM."
+msgstr "QQ Error"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "ICQ Server Relay"
+msgstr ""
+"Server News:\n"
+"%s\n"
+"%s\n"
+"%s"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "From"
+msgstr "From %s:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Server Instructions: %s"
-
-msgid "Unknow SERVER CMD"
 msgstr ""
+"Server notice From %s: \n"
+"%s"
+
+msgid "Unknown SERVER CMD"
+msgstr "Unknown SERVER CMD"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "Command"
+msgstr "QQ Qun Command"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+msgid "Unable to decrypt login reply"
+msgstr "Unable to decrypt login reply"
 
-#, fuzzy
-msgid "Unknow LOGIN CMD"
-msgstr "Unknown reason"
+msgid "Unknown LOGIN CMD"
+msgstr "Unknown LOGIN CMD"
 
-#, fuzzy
-msgid "Unknow CLIENT CMD"
-msgstr "Unknown reason"
+msgid "Unknown CLIENT CMD"
+msgstr "Unknown CLIENT CMD"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -7793,9 +7815,6 @@ msgstr "File Send"
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelled the transfer of %s"
 
-msgid "Connection closed (writing)"
-msgstr "Connection closed (writing)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Group Title:</b> %s<br>"
@@ -7850,17 +7869,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime Administrator Announcement"
 
-msgid "Connection reset"
-msgstr "Connection reset"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Error reading from socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Unable to connect to host"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Announcement from %s"
@@ -7883,6 +7891,9 @@ msgstr "Speakers"
 msgid "Video Camera"
 msgstr "Video Camera"
 
+msgid "File Transfer"
+msgstr "File Transfer"
+
 msgid "Supports"
 msgstr "Supports"
 
@@ -8599,9 +8610,6 @@ msgstr "Organisation"
 msgid "Unit"
 msgstr "Unit"
 
-msgid "Note"
-msgstr "Note"
-
 msgid "Join Chat"
 msgstr "Join Chat"
 
@@ -8701,6 +8709,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping failed"
 
@@ -8764,8 +8775,8 @@ msgstr "Unsupported public key type"
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-msgid "Error during connecting to SILC Server"
-msgstr "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
+msgstr "Error connecting to SILC Server"
 
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
@@ -8775,17 +8786,11 @@ msgid ""
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-msgid "Connection failed"
-msgstr "Connection failed"
-
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
-msgid "Unable to create connection"
-msgstr "Unable to create connection"
-
-msgid "Could not load SILC key pair"
-msgstr "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
+msgstr "Unable to load SILC key pair"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -8794,15 +8799,15 @@ msgstr "Connecting to SILC Server"
 msgid "Out of memory"
 msgstr "Out of memory"
 
-msgid "Cannot initialize SILC protocol"
-msgstr "Cannot initialise SILC protocol"
+msgid "Unable to initialize SILC protocol"
+msgstr "Unable to initialize SILC protocol"
 
 msgid "Error loading SILC key pair"
 msgstr "Error loading SILC key pair"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Download %s: %s"
-msgstr "Users on %s: %s"
+msgstr "Download %s: %s"
 
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
@@ -9085,8 +9090,8 @@ msgstr "Digitally sign and verify all messages"
 msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
+msgstr "Unable to create SILC key pair"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9181,6 +9186,9 @@ msgstr "Whiteboard"
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Error during connecting to SILC Server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
@@ -9221,34 +9229,31 @@ msgstr "Failure: Invalid cookie"
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "Cannot initialise SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
+msgstr "Unable to initialize SILC Client connection"
 
 msgid "John Noname"
-msgstr "No name"
+msgstr "John Noname"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Could not load SILC key pair: %s"
-
-msgid "Could not write"
-msgstr "Could not write"
-
-msgid "Could not connect"
-msgstr "Could not connect"
+msgid "Unable to load SILC key pair: %s"
+msgstr "Unable to load SILC key pair: %s"
 
-msgid "Unknown server response."
-msgstr "Unknown server response."
+msgid "Unable to create connection"
+msgstr "Unable to create connection"
 
-msgid "Could not create listen socket"
-msgstr "Could not create listen socket"
+msgid "Unknown server response"
+msgstr "Unknown server response"
 
-msgid "Could not resolve hostname"
-msgstr "Could not resolve hostname"
+msgid "Unable to create listen socket"
+msgstr "Unable to create listen socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP usernames may not contain whitespaces or @ symbols"
 
+msgid "SIP connect server not specified"
+msgstr "SIP connect server not specified"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9282,175 +9287,60 @@ msgstr "Auth User"
 msgid "Auth Domain"
 msgstr "Auth Domain"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Looking up %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Connect to %s failed"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Signon: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Unable to write file %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Unable to read file %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Message too long, last %s bytes truncated."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s not currently logged in."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Warning of %s not allowed."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "A message has been dropped, you are exceeding the server speed limit."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat in %s is not available."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "You are sending messages too fast to %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "You missed an IM from %s because it was too big."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "You missed an IM from %s because it was sent too fast."
-
-#, c-format
-msgid "Failure."
-msgstr "Failure."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Too many matches."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Need more qualifiers."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Dir service temporarily unavailable."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Email lookup restricted."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Keyword ignored."
-
-#, c-format
-msgid "No keywords."
-msgstr "No keywords."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "User has no directory information."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Country not supported."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Failure unknown: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Incorrect username or password."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "The service is temporarily unavailable."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Your warning level is currently too high to log in."
-
-#, c-format
-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 ""
-"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."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "An unknown signon error has occurred: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "An unknown error, %d, has occurred.  Info: %s"
-
-msgid "Invalid Groupname"
-msgstr "Invalid Groupname"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 
-msgid "Connection Closed"
-msgstr "Connection Closed"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  List rooms on the Yahoo network"
 
-msgid "Waiting for reply..."
-msgstr "Waiting for reply..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Request user to start a Doodle session"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC has come back from its pause. You may now send messages again."
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
 
-msgid "Password Change Successful"
-msgstr "Password Change Successful"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! Protocol Plugin"
 
-msgid "_Group:"
-msgstr "_Group:"
+msgid "Pager server"
+msgstr "Pager server"
 
-msgid "Get Dir Info"
-msgstr "Get Dir Info"
+msgid "Pager port"
+msgstr "Pager port"
 
-msgid "Set Dir Info"
-msgstr "Set Dir Info"
+msgid "File transfer server"
+msgstr "File transfer server"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Could not open %s for writing!"
+msgid "File transfer port"
+msgstr "File transfer port"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "File transfer failed; other side probably cancelled."
+msgid "Chat room locale"
+msgstr "Chat room locale"
 
-msgid "Could not connect for transfer."
-msgstr "Could not connect for transfer."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignore conference and chatroom invitations"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Could not write file header.  The file will not be transferred."
+msgid "Chat room list URL"
+msgstr "Chat room list URL"
 
-msgid "Save As..."
-msgstr "Save As..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo Chat server"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Chat port"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s requests you to send them a file"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9462,12 +9352,11 @@ msgstr "%s requests you to send them a file"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC Protocol Plug-in"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! JAPAN Protocol Plugin"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s has sent you a webcam invitation, which is not yet supported."
+msgid "Your SMS was not delivered"
+msgstr "Your SMS was not delivered"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
@@ -9491,6 +9380,30 @@ msgstr "%s has (retroactively) denied your request to add them to your list."
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Received invalid data"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Username or password missing"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9523,37 +9436,26 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "Unable to add buddy %s to group %s to the server list on account %s."
 
-msgid "Could not add buddy to server list"
-msgstr "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
+msgstr "Unable to add buddy to server list"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Received unexpected HTTP response from server."
-
-msgid "Connection problem"
-msgstr "Connection problem"
+msgid "Received unexpected HTTP response from server"
+msgstr "Received unexpected HTTP response from server"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Lost connection with %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Unable to establish a connection with %s: %s"
 
 msgid "Not at Home"
 msgstr "Not at Home"
@@ -9600,8 +9502,8 @@ msgstr "Presence Settings"
 msgid "Start Doodling"
 msgstr "Start Doodling"
 
-msgid "Activate which ID?"
-msgstr "Activate which ID?"
+msgid "Select the ID you want to activate"
+msgstr "Select the ID you want to activate"
 
 msgid "Join whom in chat?"
 msgstr "Join whom in chat?"
@@ -9615,74 +9517,15 @@ msgstr "Join User in Chat..."
 msgid "Open Inbox"
 msgstr "Open Inbox"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  List rooms on the Yahoo network"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Request user to start a Doodle session"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plug-in"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Pager server"
-
-msgid "Japan Pager server"
-msgstr "Japan Pager server"
-
-msgid "Pager port"
-msgstr "Pager port"
-
-msgid "File transfer server"
-msgstr "File transfer server"
-
-msgid "Japan file transfer server"
-msgstr "Japan file transfer server"
-
-msgid "File transfer port"
-msgstr "File transfer port"
-
-msgid "Chat room locale"
-msgstr "Chat room locale"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignore conference and chatroom invitations"
-
-msgid "Chat room list URL"
-msgstr "Chat room list URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Chat server"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chat port"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Sent Doodle request."
 
+msgid "Unable to connect."
+msgstr "Unable to connect."
+
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
@@ -9690,6 +9533,9 @@ msgstr "Unable to establish file descriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s is trying to send you a group of %d files.\n"
 
+msgid "Write Error"
+msgstr "Write Error"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
@@ -9734,16 +9580,10 @@ msgstr "Cool Link 3"
 msgid "Last Update"
 msgstr "Last Update"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "User information for %s unavailable"
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -9765,11 +9605,8 @@ msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Invitation Rejected"
+msgid "%s has declined to join."
+msgstr "%s has declined to join."
 
 msgid "Failed to join chat"
 msgstr "Failed to join chat"
@@ -9812,22 +9649,17 @@ msgstr "Voices"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Connection problem"
+
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
 msgid "User Rooms"
 msgstr "User Rooms"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Connection problem with the YCHT server."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Lost connection with server\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Connection problem with the YCHT server"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9954,32 +9786,21 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Unable to create socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Unable to parse response from HTTP proxy: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP proxy connection error %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Access denied: HTTP proxy server forbids port %d tunnelling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "Access denied: HTTP proxy server forbids port %d tunnelling"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error resolving %s"
 
-msgid "Could not resolve host name"
-msgstr "Could not resolve host name"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Requesting %s's attention..."
@@ -10032,21 +9853,18 @@ msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "Sort"
+msgstr "Shortcut"
 
-#, fuzzy
 msgid "The text-shortcut for the smiley"
-msgstr "GTK+ Text Shortcut Theme"
+msgstr "The text-shortcut for the smiley"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "Save Image"
+msgstr "Stored Image"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "Stored Image. (that'll have to do for now)"
 
 msgid "SSL Connection Failed"
 msgstr "SSL Connection Failed"
@@ -10069,9 +9887,6 @@ msgstr "Do not disturb"
 msgid "Extended away"
 msgstr "Extended away"
 
-msgid "Mobile"
-msgstr "Mobile"
-
 msgid "Listening to music"
 msgstr "Listening to music"
 
@@ -10113,18 +9928,6 @@ msgstr "+++ %s is no longer idle"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Error reading %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-
 msgid "Calculating..."
 msgstr "Calculating..."
 
@@ -10175,9 +9978,9 @@ msgstr "Could not open %s: Redirected too many times"
 msgid "Unable to connect to %s"
 msgstr "Unable to connect to %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Error reading from %s: %s"
+msgstr "Error reading from %s: response too long (%d bytes limit)"
 
 #, c-format
 msgid ""
@@ -10228,9 +10031,21 @@ msgid "Connection refused."
 msgstr "Connection refused."
 
 #. 10048
-#, fuzzy, c-format
+#, c-format
 msgid "Address already in use."
-msgstr "This chat name is already in use"
+msgstr "Address already in use."
+
+#, c-format
+msgid "Error Reading %s"
+msgstr "Error reading %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
 
 msgid "Internet Messenger"
 msgstr "Internet Messenger"
@@ -10274,10 +10089,8 @@ msgstr "New _mail notifications"
 msgid "Use this buddy _icon for this account:"
 msgstr "Use this buddy _icon for this account:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Options"
+msgid "Ad_vanced"
+msgstr "Ad_vanced"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Use GNOME Proxy Settings"
@@ -10312,9 +10125,6 @@ msgstr "If you look real closely"
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-msgid "Proxy Options"
-msgstr "Proxy Options"
-
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
@@ -10339,12 +10149,11 @@ msgstr "Add Account"
 msgid "_Basic"
 msgstr "_Basic"
 
-#, fuzzy
 msgid "Create _this new account on the server"
-msgstr "Create this new account on the server"
+msgstr "Create _this new account on the server"
 
-msgid "_Advanced"
-msgstr "_Advanced"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Enabled"
@@ -10352,7 +10161,7 @@ msgstr "Enabled"
 msgid "Protocol"
 msgstr "Protocol"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -10367,12 +10176,12 @@ msgstr ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
 "You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add</b> button below and configure your first account. If you want %s to "
-"connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
+"<b>Add...</b> button below and configure your first account. If you want %s "
+"to connect to multiple IM accounts, press <b>Add...</b> again to configure "
+"them all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -10394,8 +10203,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Please update the necessary fields."
 
-msgid "Room _List"
-msgstr "Room _List"
+msgid "A_ccount"
+msgstr "A_ccount"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10404,8 +10213,8 @@ msgstr ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+msgid "Room _List"
+msgstr "Room _List"
 
 msgid "_Block"
 msgstr "_Block"
@@ -10422,6 +10231,15 @@ msgstr "Get _Info"
 msgid "I_M"
 msgstr "I_M"
 
+msgid "_Audio Call"
+msgstr "_Audio Call"
+
+msgid "Audio/_Video Call"
+msgstr "Audio/_Video Call"
+
+msgid "_Video Call"
+msgstr "_Video Call"
+
 msgid "_Send File..."
 msgstr "_Send File..."
 
@@ -10431,8 +10249,11 @@ msgstr "Add Buddy _Pounce..."
 msgid "View _Log"
 msgstr "View _Log"
 
-msgid "Hide when offline"
-msgstr "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Hide When Offline"
+
+msgid "Show When Offline"
+msgstr "Show When Offline"
 
 msgid "_Alias..."
 msgstr "_Alias..."
@@ -10440,9 +10261,8 @@ msgstr "_Alias..."
 msgid "_Remove"
 msgstr "_Remove"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "Set Custom Icon..."
+msgstr "Set Custom Icon"
 
 msgid "Remove Custom Icon"
 msgstr "Remove Custom Icon"
@@ -10545,9 +10365,8 @@ msgstr "/Buddies/_Quit"
 msgid "/_Accounts"
 msgstr "/_Accounts"
 
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "/Accounts/Manage"
+msgstr "/Accounts/Manage Accounts"
 
 #. Tools
 msgid "/_Tools"
@@ -10559,6 +10378,9 @@ msgstr "/Tools/Buddy _Pounces"
 msgid "/Tools/_Certificates"
 msgstr "/Tools/_Certificates"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Tools/Custom Smile_ys"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Tools/Plu_g-ins"
 
@@ -10568,10 +10390,6 @@ msgstr "/Tools/Pr_eferences"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Tools/Privacy"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
@@ -10689,8 +10507,8 @@ msgstr "Manually"
 msgid "By status"
 msgstr "By status"
 
-msgid "By log size"
-msgstr "By log size"
+msgid "By recent log activity"
+msgstr "By recent log activity"
 
 #, c-format
 msgid "%s disconnected"
@@ -10706,6 +10524,9 @@ msgstr "Reconnect"
 msgid "Re-enable"
 msgstr "Re-enable"
 
+msgid "SSL FAQs"
+msgstr "SSL FAQs"
+
 msgid "Welcome back!"
 msgstr "Welcome back!"
 
@@ -10731,7 +10552,7 @@ msgid "/Accounts"
 msgstr "/Accounts"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
@@ -10742,8 +10563,8 @@ msgstr ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10795,12 +10616,14 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Group:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Auto_join when account becomes online."
 
-#, fuzzy
 msgid "_Remain in chat after window is closed."
-msgstr "_Hide chat when the window is closed."
+msgstr "_Remain in chat after window is closed."
 
 msgid "Please enter the name of the group to be added."
 msgstr "Please enter the name of the group to be added."
@@ -10829,6 +10652,103 @@ msgstr "/Tools"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Sort Buddies"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Background Colour"
+
+msgid "The background color for the buddy list"
+msgstr "The background colour for the buddy list"
+
+msgid "Layout"
+msgstr "Layout"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "The layout of icons, name, and status of the blist"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Expanded Background Colour"
+
+msgid "The background color of an expanded group"
+msgstr "The background colour of an expanded group"
+
+msgid "Expanded Text"
+msgstr "Expanded Text"
+
+msgid "The text information for when a group is expanded"
+msgstr "The text information for when a group is expanded"
+
+msgid "Collapsed Background Color"
+msgstr "Collapsed Background Colour"
+
+msgid "The background color of a collapsed group"
+msgstr "The background colour of a collapsed group"
+
+msgid "Collapsed Text"
+msgstr "Collapsed Text"
+
+msgid "The text information for when a group is collapsed"
+msgstr "The text information for when a group is collapsed"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Contact/Chat Background Colour"
+
+msgid "The background color of a contact or chat"
+msgstr "The background colour of a contact or chat"
+
+msgid "Contact Text"
+msgstr "Contact Text"
+
+msgid "The text information for when a contact is expanded"
+msgstr "The text information for when a contact is expanded"
+
+msgid "On-line Text"
+msgstr "On-line Text"
+
+msgid "The text information for when a buddy is online"
+msgstr "The text information for when a buddy is online"
+
+msgid "Away Text"
+msgstr "Away Text"
+
+msgid "The text information for when a buddy is away"
+msgstr "The text information for when a buddy is away"
+
+msgid "Off-line Text"
+msgstr "Off-line Text"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "The text information for when a buddy is off-line"
+
+msgid "Idle Text"
+msgstr "Idle Text"
+
+msgid "The text information for when a buddy is idle"
+msgstr "The text information for when a buddy is idle"
+
+msgid "Message Text"
+msgstr "Message Text"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "The text information for when a buddy has an unread message"
+
+msgid "Message (Nick Said) Text"
+msgstr "Message (Nick Said) Text"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+
+msgid "The text information for a buddy's status"
+msgstr "The text information for a buddy's status"
+
+msgid "Type the host name for this certificate."
+msgstr "Type the host name for this certificate."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Servers"
@@ -10847,14 +10767,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
@@ -10883,8 +10795,8 @@ msgstr "Ignore"
 msgid "Get Away Message"
 msgstr "Get Away Message"
 
-msgid "Last said"
-msgstr "Last said"
+msgid "Last Said"
+msgstr "Last Said"
 
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
@@ -10929,6 +10841,18 @@ msgstr "/Conversation/_Save As..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/Clea_r Scrollback"
 
+msgid "/Conversation/M_edia"
+msgstr "/Conversation/M_edia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversation/Media/_Audio Call"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversation/Media/_Video Call"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversation/Media/Audio\\/Video _Call"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
@@ -11001,6 +10925,15 @@ msgstr "/Conversation"
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversation/Media/Audio Call"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversation/Media/Video Call"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversation/Media/Audio\\/Video Call"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
@@ -11174,22 +11107,23 @@ msgid "Fatal Error"
 msgstr "Fatal Error"
 
 msgid "bug master"
-msgstr ""
+msgstr "bug master"
 
-#, fuzzy
 msgid "artist"
-msgstr "Artist"
+msgstr "artist"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"
+
+msgid "voice and video"
+msgstr "voice and video"
 
 msgid "support"
 msgstr "support"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "developer & webmaster"
+msgstr "webmaster"
 
 msgid "Senior Contributor/QA"
 msgstr "Senior Contributor/QA"
@@ -11211,7 +11145,7 @@ msgid "support/QA"
 msgstr "support/QA"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "original author"
@@ -11288,9 +11222,8 @@ msgstr "Finnish"
 msgid "French"
 msgstr "French"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Kurdish"
+msgstr "Irish"
 
 msgid "Galician"
 msgstr "Galician"
@@ -11310,6 +11243,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Hungarian"
 
+msgid "Armenian"
+msgstr "Armenian"
+
 msgid "Indonesian"
 msgstr "Indonesian"
 
@@ -11325,6 +11261,9 @@ msgstr "Georgian"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu Georgian Translators"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11346,6 +11285,9 @@ msgstr "Lithuanian"
 msgid "Macedonian"
 msgstr "Macedonian"
 
+msgid "Mongolian"
+msgstr "Mongolian"
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegian"
 
@@ -11359,7 +11301,7 @@ msgid "Norwegian Nynorsk"
 msgstr "Norwegian Nynorsk"
 
 msgid "Occitan"
-msgstr ""
+msgstr "Occitan"
 
 msgid "Punjabi"
 msgstr "Punjabi"
@@ -11400,6 +11342,9 @@ msgstr "Sinhala"
 msgid "Swedish"
 msgstr "Swedish"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11460,8 +11405,30 @@ msgstr ""
 "<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Current Developers"
@@ -11599,45 +11566,35 @@ msgstr "_Remove Chat"
 msgid "Right-click for more unread messages...\n"
 msgstr "Right-click for more unread messages...\n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "Change Status"
+msgstr "_Change Status"
 
-#, fuzzy
 msgid "Show Buddy _List"
-msgstr "Show Buddy List"
+msgstr "Show Buddy _List"
 
-#, fuzzy
 msgid "_Unread Messages"
-msgstr "Unread Messages"
+msgstr "_Unread Messages"
 
-#, fuzzy
 msgid "New _Message..."
-msgstr "New Message..."
+msgstr "New _Message..."
 
-#, fuzzy
 msgid "_Accounts"
-msgstr "/_Accounts"
+msgstr "_Accounts"
 
-#, fuzzy
 msgid "Plu_gins"
-msgstr "Plug-ins"
+msgstr "Plu_gins"
 
-#, fuzzy
 msgid "Pr_eferences"
-msgstr "Preferences"
+msgstr "Pr_eferences"
 
-#, fuzzy
 msgid "Mute _Sounds"
-msgstr "Mute Sounds"
+msgstr "Mute _Sounds"
 
-#, fuzzy
 msgid "_Blink on New Message"
-msgstr "Blink on New Message"
+msgstr "_Blink on New Message"
 
-#, fuzzy
 msgid "_Quit"
-msgstr "Quit"
+msgstr "_Quit"
 
 msgid "Not started"
 msgstr "Not started"
@@ -11720,13 +11677,11 @@ msgstr "Hyperlink colour"
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "Hyperlink colour"
+msgstr "Hyperlink visited colour"
 
-#, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
-msgstr "Colour to draw hyperlinks when mouse is over them."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr "Colour to draw hyperlinks after they has been visited (or activated)."
 
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink prelight colour"
@@ -11759,19 +11714,23 @@ msgstr "Action Message Name Colour"
 msgid "Color to draw the name of an action message."
 msgstr "Colour to draw the name of an action message."
 
-#, fuzzy
 msgid "Action Message Name Color for Whispered Message"
-msgstr "Action Message Name Colour"
+msgstr "Action Message Name Colour for Whispered Message"
+
+msgid "Color to draw the name of a whispered action message."
+msgstr "Colour to draw the name of a whispered action message."
 
-#, fuzzy
 msgid "Whisper Message Name Color"
-msgstr "Sent Message Name Colour"
+msgstr "Whisper Message Name Colour"
+
+msgid "Color to draw the name of a whispered message."
+msgstr "Colour to draw the name of a whispered message."
 
 msgid "Typing notification color"
 msgstr "Typing notification colour"
 
-msgid "The color to use for the typing notification font"
-msgstr "The colour to use for the typing notification font"
+msgid "The color to use for the typing notification"
+msgstr "The colour to use for the typing notification"
 
 msgid "Typing notification font"
 msgstr "Typing notification font"
@@ -11782,15 +11741,6 @@ msgstr "The font to use for the typing notification"
 msgid "Enable typing notification"
 msgstr "Enable typing notification"
 
-msgid "_Copy Email Address"
-msgstr "_Copy Email Address"
-
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
-
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11832,13 +11782,11 @@ msgstr ""
 msgid "Save Image"
 msgstr "Save Image"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#, fuzzy, c-format
 msgid "_Add Custom Smiley..."
-msgstr "Show custom smileys"
+msgstr "_Add Custom Smiley..."
 
 msgid "Select Font"
 msgstr "Select Font"
@@ -11883,13 +11831,14 @@ msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
 
 msgid "Smile!"
 msgstr "Smile!"
 
-#, fuzzy
 msgid "_Manage custom smileys"
-msgstr "Show custom smileys"
+msgstr "_Manage custom smileys"
 
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
@@ -11924,9 +11873,6 @@ msgstr "Decrease Font Size"
 msgid "Font Face"
 msgstr "Font Face"
 
-msgid "Background Color"
-msgstr "Background Colour"
-
 msgid "Foreground Color"
 msgstr "Foreground Colour"
 
@@ -12043,6 +11989,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12057,6 +12004,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12073,6 +12021,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12086,6 +12035,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12094,7 +12044,7 @@ msgstr ""
 "                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
@@ -12121,22 +12071,32 @@ msgstr ""
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
-"\n"
-"If you need further assistance, please IM either SeanEgn or \n"
-"LSchiere (via AIM).  Contact information for Sean and Luke \n"
-"on other protocols is at\n"
-"%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Open All Messages"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "Exiting because another libpurple client is already running.\n"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr "/_Media"
+
+msgid "/Media/_Hangup"
+msgstr "/Media/_Hangup"
+
+msgid "Calling..."
+msgstr "Calling..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s wishes to start an audio/video session with you."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s wishes to start a video session with you."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12166,6 +12126,24 @@ msgid ""
 msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
+msgid "No message"
+msgstr "No message"
+
+msgid "Open All Messages"
+msgstr "Open All Messages"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+
+msgid "New Pounces"
+msgstr "New Pounces"
+
+msgid "Dismiss"
+msgstr "Dismiss"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "The following plug-ins will be unloaded."
 
@@ -12214,10 +12192,16 @@ msgstr "<b>Plug-in Details</b>"
 msgid "Select a file"
 msgstr "Select a file"
 
+msgid "Modify Buddy Pounce"
+msgstr "Modify Buddy Pounce"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Pounce on Whom"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
@@ -12284,8 +12268,58 @@ msgstr "_Recurring"
 msgid "Pounce Target"
 msgstr "Pounce Target"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Smiley theme failed to unpack."
+#, c-format
+msgid "Started typing"
+msgstr "Started typing"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Paused while typing"
+
+#, c-format
+msgid "Signed on"
+msgstr "Signed on"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Returned from being idle"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Returned from being away"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Stopped typing"
+
+#, c-format
+msgid "Signed off"
+msgstr "Signed off"
+
+#, c-format
+msgid "Became idle"
+msgstr "Became idle"
+
+#, c-format
+msgid "Went away"
+msgstr "Went away"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Sent a message"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Unknown.... Please report this!"
+
+msgid "Theme failed to unpack."
+msgstr "Theme failed to unpack."
+
+msgid "Theme failed to load."
+msgstr "Theme failed to load."
+
+msgid "Theme failed to copy."
+msgstr "Theme failed to copy."
 
 msgid "Install Theme"
 msgstr "Install Theme"
@@ -12306,6 +12340,11 @@ msgstr "Keyboard Shortcuts"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Cl_ose conversations with the Escape key"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Buddy List Theme"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
@@ -12315,8 +12354,8 @@ msgstr "_Show system tray icon:"
 msgid "On unread messages"
 msgstr "On unread messages"
 
-msgid "Conversation Window Hiding"
-msgstr "Conversation Window Hiding"
+msgid "Conversation Window"
+msgstr "Conversation Window"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Hide new IM conversations:"
@@ -12324,6 +12363,9 @@ msgstr "_Hide new IM conversations:"
 msgid "When away"
 msgstr "When away"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_ze new conversation windows"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Tabs"
@@ -12382,9 +12424,6 @@ msgstr "Use smooth-scrolling"
 msgid "F_lash window when IMs are received"
 msgstr "F_lash window when IMs are received"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_ze new conversation windows"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimum input area height in lines:"
 
@@ -12416,14 +12455,12 @@ msgstr "Cannot start proxy configuration program."
 msgid "Cannot start browser configuration program."
 msgstr "Cannot start browser configuration program."
 
-msgid "ST_UN server:"
-msgstr "ST_UN Server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Example: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Use _automatically detected IP address: %s"
 
 msgid "Public _IP:"
 msgstr "Public _IP:"
@@ -12443,6 +12480,10 @@ msgstr "_Start port:"
 msgid "_End port:"
 msgstr "_End port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Relay Server (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy Server &amp; Browser"
 
@@ -12471,6 +12512,10 @@ msgstr "Proxy Server"
 msgid "No proxy"
 msgstr "No proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr "Use remote DNS with SOCKS4 proxies"
+
 msgid "_User:"
 msgstr "_User:"
 
@@ -12592,31 +12637,26 @@ msgstr ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "Mute Sounds"
+msgstr "M_ute Sounds"
 
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "Enable sounds:"
+msgstr "_Enable sounds:"
 
-#, fuzzy
 msgid "V_olume:"
-msgstr "Volume:"
+msgstr "V_olume:"
 
 msgid "Play"
 msgstr "Play"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "Brows_e..."
+msgstr "_Browse..."
 
-#, fuzzy
 msgid "_Reset"
-msgstr "Reset"
+msgstr "_Reset"
 
 msgid "_Report idle time:"
 msgstr "_Report idle time:"
@@ -12634,12 +12674,12 @@ msgstr "When both away and idle"
 msgid "Auto-away"
 msgstr "Auto-away"
 
-msgid "Change status when _idle"
-msgstr "Change status when _idle"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes before becoming idle:"
 
+msgid "Change status when _idle"
+msgstr "Change status when _idle"
+
 msgid "Change _status to:"
 msgstr "Change _status to:"
 
@@ -12787,61 +12827,48 @@ msgstr "Sa_ve & Use"
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Insert Smiley"
-
-msgid "More Data needed"
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
+msgid "Custom Smiley"
+msgstr "Custom Smiley"
 
-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "Duplicate Correction"
-
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
+msgstr "Duplicate Shortcut"
 
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Please select your mood from the list."
-
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "Insert Smiley"
+msgstr "Edit Smiley"
 
-#, fuzzy
 msgid "Add Smiley"
-msgstr "Smile!"
+msgstr "Add Smiley"
 
-#, fuzzy
-msgid "Smiley _Image"
-msgstr "Save Image"
+msgid "_Image:"
+msgstr "_Image:"
 
-#. Smiley shortcut
-#, fuzzy
-msgid "Smiley S_hortcut"
-msgstr "Keyboard Shortcuts"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "S_hortcut text:"
 
-#, fuzzy
 msgid "Smiley"
-msgstr "Smile!"
+msgstr "Smiley"
+
+msgid "Shortcut Text"
+msgstr "Shortcut Text"
 
-#, fuzzy
 msgid "Custom Smiley Manager"
-msgstr "Certificate Manager"
+msgstr "Custom Smiley Manager"
+
+msgid "Select Buddy Icon"
+msgstr "Select Buddy Icon"
 
-#, fuzzy
 msgid "Click to change your buddyicon for this account."
-msgstr "Use this buddy _icon for this account:"
+msgstr "Click to change your buddy icon for this account."
 
-#, fuzzy
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Use this buddy _icon for this account:"
+msgstr "Click to change your buddy icon for all accounts."
 
 msgid "Waiting for network connection"
 msgstr "Waiting for network connection"
@@ -12922,11 +12949,11 @@ msgid "Cannot send launcher"
 msgstr "Cannot send launcher"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 
 #, c-format
 msgid ""
@@ -12958,9 +12985,30 @@ msgid ""
 msgstr ""
 "Failed to load image \"%s\": reason not known; probably a corrupt image file"
 
+msgid "_Open Link"
+msgstr "_Open Link"
+
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
+
+msgid "_Copy Email Address"
+msgstr "_Copy Email Address"
+
+msgid "_Open File"
+msgstr "_Open File"
+
+msgid "Open _Containing Directory"
+msgstr "Open _Containing Directory"
+
 msgid "Save File"
 msgstr "Save File"
 
+msgid "_Play Sound"
+msgstr "_Play Sound"
+
+msgid "_Save File"
+msgstr "_Save File"
+
 msgid "Select color"
 msgstr "Select colour"
 
@@ -12976,20 +13024,17 @@ msgstr "_Get Info"
 msgid "_Invite"
 msgstr "_Invite"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_Modify"
+msgstr "_Modify..."
 
-#, fuzzy
 msgid "_Add..."
-msgstr "_Add"
+msgstr "_Add..."
 
 msgid "_Open Mail"
 msgstr "_Open Mail"
 
-#, fuzzy
 msgid "_Edit"
-msgstr "Edit"
+msgstr "_Edit"
 
 msgid "Pidgin Tooltip"
 msgstr "Pidgin Tooltip"
@@ -13006,12 +13051,11 @@ msgstr "Selecting this disables graphical emoticons."
 msgid "none"
 msgstr "none"
 
-#, fuzzy
 msgid "Small"
-msgstr "Email"
+msgstr "Small"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "Smaller versions of the default smilies"
 
 msgid "Response Probability:"
 msgstr "Responses Probability:"
@@ -13052,6 +13096,66 @@ msgstr "Contact Availability Prediction plugin."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Displays statistical information about your buddies' availability"
 
+msgid "Server name request"
+msgstr "Server name request"
+
+msgid "Enter an XMPP Server"
+msgstr "Enter an XMPP Server"
+
+msgid "Select an XMPP server to query"
+msgstr "Select an XMPP server to query"
+
+msgid "Find Services"
+msgstr "Find Services"
+
+msgid "Add to Buddy List"
+msgstr "Add to Buddy List"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Directory"
+msgstr "Directory"
+
+msgid "PubSub Collection"
+msgstr "PubSub Collection"
+
+msgid "PubSub Leaf"
+msgstr "PubSub Leaf"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Description:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Service Discovery"
+
+msgid "_Browse"
+msgstr "_Browse"
+
+msgid "Server does not exist"
+msgstr "Server does not exist"
+
+msgid "Server does not support service discovery"
+msgstr "Server does not support service discovery"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP Service Discovery"
+
+msgid "Allows browsing and registering services."
+msgstr "Allows browsing and registering services."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+
 msgid "Buddy is idle"
 msgstr "Buddy is idle"
 
@@ -13316,10 +13420,10 @@ msgid "Optional information:"
 msgstr "Optional information:"
 
 msgid "First name:"
-msgstr "Forename"
+msgstr "Forename:"
 
 msgid "Last name:"
-msgstr "Surname"
+msgstr "Surname:"
 
 msgid "Email:"
 msgstr "Email:"
@@ -13440,10 +13544,10 @@ msgstr "Music Messaging Plugin for collaborative composition."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -13474,9 +13578,8 @@ msgstr "Insert count of new messages into _X property"
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Set window manager \"_URGENT\" hint"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "C_hat windows"
+msgstr "_Flash window"
 
 #. Raise window method button
 msgid "R_aise conversation window"
@@ -13553,22 +13656,18 @@ msgstr ""
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
-msgid "Cursor Color"
-msgstr "Cursor Colour"
-
-msgid "Secondary Cursor Color"
-msgstr "Secondary Cursor Colour"
-
 msgid "Hyperlink Color"
 msgstr "Hyperlink Colour"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "Hyperlink Colour"
+msgstr "Visited Hyperlink Colour"
 
 msgid "Highlighted Message Name Color"
 msgstr "Highlighted Messages Name Colour"
 
+msgid "Typing Notification Color"
+msgstr "Typing Notification Colour"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView Horizontal Separation"
 
@@ -13598,35 +13697,21 @@ msgstr "GTK+ Interface Font"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Text Shortcut Theme"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Interface colours"
+msgid "Disable Typing Notification Text"
+msgstr "Disable Typing Notification Text"
 
-msgid "Widget Sizes"
-msgstr "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ Theme Control Settings"
+
+msgid "Colors"
+msgstr "Colours"
 
 msgid "Fonts"
 msgstr "Fonts"
 
+msgid "Miscellaneous"
+msgstr "Miscellaneous"
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc File Tools"
 
@@ -13658,18 +13743,16 @@ msgstr ""
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "You can upgrade to %s %s today."
 
 msgid "New Version Available"
 msgstr "New Version Available"
 
-#, fuzzy
 msgid "Later"
-msgstr "Date"
+msgstr "Later"
 
-#, fuzzy
 msgid "Download Now"
-msgstr "Users on %s: %s"
+msgstr "Download Now"
 
 #. *< type
 #. *< ui_requirement
@@ -13713,10 +13796,10 @@ msgstr "Conversation Window Send Button."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 
 msgid "Duplicate Correction"
 msgstr "Duplicate Correction"
@@ -13767,6 +13850,95 @@ msgstr "Text replacement"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
+msgid "Just logged in"
+msgstr "Just logged in"
+
+msgid "Just logged out"
+msgstr "Just logged out"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+
+msgid "Icon for Chat"
+msgstr "Icon for Chat"
+
+msgid "Ignored"
+msgstr "Ignored"
+
+msgid "Founder"
+msgstr "Founder"
+
+msgid "Operator"
+msgstr "Operator"
+
+msgid "Half Operator"
+msgstr "Half Operator"
+
+msgid "Authorization dialog"
+msgstr "Authorisation dialog"
+
+msgid "Error dialog"
+msgstr "Error dialog"
+
+msgid "Information dialog"
+msgstr "Information dialog"
+
+msgid "Mail dialog"
+msgstr "Mail dialog"
+
+msgid "Question dialog"
+msgstr "Question dialog"
+
+msgid "Warning dialog"
+msgstr "Warning dialog"
+
+msgid "What kind of dialog is this?"
+msgstr "What kind of dialog is this?"
+
+msgid "Status Icons"
+msgstr "Status Icons"
+
+msgid "Chatroom Emblems"
+msgstr "Chatroom Emblems"
+
+msgid "Dialog Icons"
+msgstr "Dialog Icons"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin Icon Theme Editor"
+
+msgid "Contact"
+msgstr "Contact"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin Buddylist Theme Editor"
+
+msgid "Edit Buddylist Theme"
+msgstr "Edit Buddylist Theme"
+
+msgid "Edit Icon Theme"
+msgstr "Edit Icon Theme"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin Theme Editor"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin Theme Editor."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13928,9 +14100,6 @@ msgstr "_Keep Buddy List window on top:"
 msgid "Only when docked"
 msgstr "Only when docked"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_Flash window when chat messages are received"
-
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin Options"
 
@@ -13938,7 +14107,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Pidgin for Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 
@@ -13978,306 +14147,3 @@ msgstr "Send and receive raw XMPP stanzas."
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "This plugin is useful for debugging XMPP servers or clients."
-
-#~ msgid "A group with the name already exists."
-#~ msgstr "A group with that name already exists."
-
-#~ msgid "Primary Information"
-#~ msgstr "Primary Information"
-
-#~ msgid "Blood Type"
-#~ msgstr "Blood Group"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "Update my information"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Speed:"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Invalid QQ Face"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "You rejected %d's request"
-
-#~ msgid "Reject request"
-#~ msgstr "Reject request"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "Add buddy with auth request failed"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Couldn't load buddy list"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ Number"
-
-#~ msgid "Group Description"
-#~ msgstr "Group Description"
-
-#~ msgid "Auth"
-#~ msgstr "Auth"
-
-#~ msgid "Approve"
-#~ msgstr "Approve"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "Your request to join group %d has been rejected by admin %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "You [%d] have left group \"%d\""
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "You [%d] have been added to group \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "I am a member"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Bad Request"
-
-#~ msgid "I am the admin"
-#~ msgstr "I am the admin"
-
-#~ msgid "Unknown status"
-#~ msgstr "Unknown status"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Remove Group"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "You entered a group ID outside the acceptable range"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Are you sure you want to leave this Qun?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Do you want to approve the request?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Telephone Number"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Channel Information"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
-#~ msgid "System Message"
-#~ msgstr "System Message"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>Last Login IP</b>: %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Last Login Time</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Set My Information"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Leave this QQ Qun"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Block this buddy"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Error changing password"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Failed to connect to server."
-
-#, fuzzy
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr ""
-#~ "Connection error from %s server:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Do you want to approve the request?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Do you want to add this buddy?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s has added you [%s] to his or her buddy list"
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Buddy"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s wants to add you [%s] as a friend"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s is not in your buddy list"
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Would you like to add this person?"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Server port"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Remote disconnected"
-
-#~ msgid "developer"
-#~ msgstr "developer"
-
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP developer"
-
-#~ msgid "Artists"
-#~ msgstr "Artists"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>ChangeLog:</b><br>%s"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "EOF while reading from resolver process"
-
-#~ msgid "Error setting socket options"
-#~ msgstr "Error setting socket options"
-
-#~ msgid ""
-#~ "Windows Live ID authentication: cannot find authenticate token in server "
-#~ "response"
-#~ msgstr ""
-#~ "Windows Live ID authentication: cannot find authenticate token in server "
-#~ "response"
-
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Windows Live ID authentication failed"
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "Too evil (sender)"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "Too evil (receiver)"
-
-#~ msgid "Available Message"
-#~ msgstr "Available Message"
-
-#~ msgid "Away Message"
-#~ msgstr "Away Message"
-
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr " <i>(retrieving)</i>"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Your information has been updated"
-
-#~ msgid "Input your reason:"
-#~ msgstr "Enter your reason:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "You have successfully removed a buddy"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr ""
-#~ "You have successfully removed yourself from your friend's buddy list"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "You have added %d to buddy list"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "Invalid QQid"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Please enter external group ID"
-
-#~ msgid "Reason: %s"
-#~ msgstr "Reason: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr "Your request to join group %d has been approved by admin %d"
-
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "This group has been added to your buddy list"
-
-#~ msgid "I am applying to join"
-#~ msgstr "I am applying to join"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "You have successfully left the group"
-
-#~ msgid "QQ Group Auth"
-#~ msgstr "QQ Group Auth"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "Your authorisation request has been accepted by the QQ server"
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "Code [0x%02X]: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "Group Operation Error"
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Enter your reason:"
-
-#~ msgid "Error requesting login token"
-#~ msgstr "Error requesting login token"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "Unable to login. Check debug log"
-
-#~ msgid "Unable to login"
-#~ msgstr "Unable to login"
-
-#~ msgid "TCP Address"
-#~ msgstr "TCP Address"
-
-#~ msgid "UDP Address"
-#~ msgstr "UDP Address"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Show Login Information"
-
-#~ msgid "Login failed, no reply"
-#~ msgstr "Login failed; no reply"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "User %s rejected your request"
-
-#~ msgid "User %s approved your request"
-#~ msgstr "User %s approved your request"
diff --git a/po/eo.po b/po/eo.po
index 28fda83c41..274d36f298 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2,21 +2,21 @@
 #
 # Copyright (C) 2006, Stéphane Fillod <fillods@users.sourceforge.net>
 #
-# Stéphane Fillod <f8cfe@free.fr>, 2006, 2007, 2008.
+# Stéphane Fillod <fillods@users.sourceforge.net>, 2006, 2007, 2008, 2009.
 # This file is distributed under the same license as the Pidgin package.
 msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
-"PO-Revision-Date: 2008-03-02 13:39+0100\n"
-"Last-Translator: Stéphane Fillod <f8cfe@free.fr>\n"
+"POT-Creation-Date: 2009-08-16 09:57-0400\n"
+"PO-Revision-Date: 2009-08-16 20:26+0200\n"
+"Last-Translator: Stéphane Fillod <fillods@users.sourceforge.net>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: gtranslator 1.9.4\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -33,7 +33,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -42,7 +42,7 @@ msgstr ""
 "Uzo: %s [OPCIOJ]...\n"
 "\n"
 "  -c, --config=UJO    uzu UJOn por agordo dosieroj\n"
-"  -d, --debug         montru sencimigajn mesaĝojn al stdout\n"
+"  -d, --debug         montru sencimigajn mesaĝojn al stderr\n"
 "  -h, --help          vidigu tiun helpon kaj finu\n"
 "  -n, --nologin       ne aŭtomate ensalutu\n"
 "  -v, --version       vidigu la aktualan version kaj finu\n"
@@ -60,9 +60,8 @@ msgstr "Eraro"
 msgid "Account was not added"
 msgstr "Konto ne estis aldonita"
 
-#, fuzzy
 msgid "Username of an account must be non-empty."
-msgstr "Ekrannomo de konto ne devas esti malplena."
+msgstr "Uzantonomo de konto ne devas esti malplena."
 
 msgid "New mail notifications"
 msgstr "Nova retpoŝt-avizoj"
@@ -85,9 +84,8 @@ msgstr "Nova Konto"
 msgid "Protocol:"
 msgstr "Protokolo:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "_Uzantonomo:"
+msgstr "Uzantnomo:"
 
 msgid "Password:"
 msgstr "Pasvorto:"
@@ -96,9 +94,8 @@ msgid "Alias:"
 msgstr "Alinomo:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "Ne konektita al servilo."
+msgstr "Krei tiun konton ĉe la servilo"
 
 #. Cancel button
 #. Cancel
@@ -178,9 +175,8 @@ msgstr ""
 msgid "Default"
 msgstr "Apriora"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
-msgstr "Vi devas enigi ekrannomon por la kunul."
+msgstr "Vi devas enigi uzantnomon por la kunul."
 
 msgid "You must provide a group."
 msgstr "Vi devas enigi grupon."
@@ -256,7 +252,7 @@ msgid "Edit"
 msgstr "Redaktu"
 
 msgid "Edit Settings"
-msgstr "Agordu"
+msgstr "Agordi"
 
 msgid "Information"
 msgstr "Informo"
@@ -352,12 +348,11 @@ msgstr "Bloku"
 msgid "Unblock"
 msgstr "Malbloku"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"Bonvolu enigi la ekrannomon aŭ alinomon de persono kiun vi dezrias Bloki/"
+"Bonvolu enigi la uzantnomon aŭ alinomon de persono kiun vi deziras Bloki/"
 "Malbloki."
 
 #. Not multiline
@@ -369,10 +364,9 @@ msgstr "Daŭrigu"
 msgid "New Instant Message"
 msgstr "Nova Tujmesaĝo"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"Bonvolu enigi la ekrannomon aŭ alinomon de persono kiun vi dezrias tujmesaĝi."
+"Bonvolu enigi la uzantnomon aŭ alinomon de persono kiun vi deziras tujmesaĝi."
 
 msgid "Channel"
 msgstr "Kanalo"
@@ -386,13 +380,12 @@ msgstr "Bonvolu enigi la nomon de la babilejo kiun vi deziras aliĝi."
 msgid "Join"
 msgstr "Aliĝu"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"Bonvolu enigi la ekrannomon aŭ alinomon de persono kiesn protokolon vi "
-"dezrias rigardi."
+"Bonvolu enigi la uzantnomon aŭ alinomon de persono kiesn protokolon vi "
+"deziras rigardi."
 
 #. Create the "Options" frame.
 msgid "Options"
@@ -410,9 +403,8 @@ msgstr "Aliĝu Babilejon..."
 msgid "View Log..."
 msgstr "Montru Protokolon..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "Montru Protokolon"
+msgstr "Montri Ĉiujn Protokolojn"
 
 msgid "Show"
 msgstr "Montru"
@@ -593,21 +585,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Sendu Al"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "Enmetu en mesaĝon"
-
-msgid "Invite"
-msgstr "Invitu"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Bonvolu enigi la nomon de uzanto kiun vi deziras inviti, kun fakultativan "
-"invitmesaĝon."
-
 msgid "Conversation"
 msgstr "Konversacio"
 
@@ -620,9 +597,8 @@ msgstr "Montru Tempomarkojn"
 msgid "Add Buddy Pounce..."
 msgstr "Aldonu Kunul Atentigon..."
 
-#, fuzzy
 msgid "Invite..."
-msgstr "Invitu"
+msgstr "Invitu..."
 
 msgid "Enable Logging"
 msgstr "Ŝaltu Protokoladon"
@@ -633,11 +609,11 @@ msgstr "Ŝaltu Sonojn"
 msgid "<AUTO-REPLY> "
 msgstr "<AŬTO-RESPONDO> "
 
-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "Uzantoj Listo:\n"
-msgstr[1] "Uzantoj Listo:\n"
+msgstr[0] "Listo de %d uzanto:\n"
+msgstr[1] "Listo de %d uzantoj:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "Subtenitaj sencimigopcioj estas:  versio"
@@ -729,10 +705,10 @@ msgstr "Filtrilo:"
 msgid "Pause"
 msgstr "Paŭzu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "Dosiero alŝuto - %d%% je %d dosieroj"
+msgstr[0] "Dosiero alŝuto - %d%% je %d dosiero"
 msgstr[1] "Dosiero alŝuto - %d%% je %d dosieroj"
 
 #. Create the window.
@@ -780,13 +756,11 @@ msgstr "Malsukcesita"
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#, fuzzy
 msgid "Sent"
-msgstr "Difinu"
+msgstr "Sendita"
 
-#, fuzzy
 msgid "Received"
-msgstr "Ricevitaj Mesaĝoj"
+msgstr "Ricevita"
 
 msgid "Finished"
 msgstr "Finita"
@@ -795,13 +769,11 @@ msgstr "Finita"
 msgid "The file was saved as %s."
 msgstr "La dosiero estas konservita kial %s."
 
-#, fuzzy
 msgid "Sending"
-msgstr "Sendu"
+msgstr "Sendante"
 
-#, fuzzy
 msgid "Receiving"
-msgstr "Restanta"
+msgstr "Ricevante"
 
 #, c-format
 msgid "Conversation in %s on %s"
@@ -848,13 +820,45 @@ msgstr "Konversacioj en %s"
 msgid "Conversations with %s"
 msgstr "Konversacioj kun %s"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "Konversacioj"
+msgstr "Ĉiuj Konversacioj"
 
 msgid "System Log"
 msgstr "Sistemo Protokolo"
 
+msgid "Calling ... "
+msgstr "Alvokante..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Akceptu"
+
+msgid "Reject"
+msgstr "Malakceptu"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+msgid "You have rejected the call."
+msgstr "Vi rifuzis la alvokon."
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "Retadresoj"
 
@@ -889,12 +893,14 @@ msgstr "Daŭrigu"
 msgid "IM"
 msgstr "TM"
 
+msgid "Invite"
+msgstr "Invitu"
+
 msgid "(none)"
 msgstr "(neniu)"
 
-#, fuzzy
 msgid "URI"
-msgstr "UIN"
+msgstr "URI"
 
 msgid "ERROR"
 msgstr "ERARO"
@@ -1091,7 +1097,6 @@ msgstr "%s foriĝis. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s sendis mesaĝon al vi. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1137,7 +1142,6 @@ msgstr "Minutoj antaŭe ŝanĝenda staton"
 msgid "Change status to"
 msgstr "Ŝanĝu staton al"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Konversacioj"
 
@@ -1199,9 +1203,8 @@ msgstr "Vi parolas en babilejo"
 msgid "Others talk in chat"
 msgstr "Aliaj parolas en babilejo"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "Iun diras vian nomon en babilejo"
+msgstr "Iun diras vian uzantnomon en babilejo"
 
 msgid "GStreamer Failure"
 msgstr "GStreamer Malsukceso"
@@ -1453,7 +1456,6 @@ msgstr ""
 "Kiam nova konversacio estas malfermita, tiu kromaĵo enmetos la lastan "
 "konversacion en la aktuala konversacio."
 
-#, c-format
 msgid "Online"
 msgstr "Enrete"
 
@@ -1497,6 +1499,27 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Lastaprotokolo kromaĵo."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "kontoj"
 
@@ -1595,45 +1618,56 @@ msgstr "Akceptu astestilon por %s?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Akceptu"
-
-msgid "Reject"
-msgstr "Malakceptu"
-
 msgid "_View Certificate..."
 msgstr "_Montru Atestilon..."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr ""
 
 msgid "Invalid certificate chain"
 msgstr ""
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
 
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr ""
+
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1649,16 +1683,6 @@ msgstr ""
 msgid "Invalid certificate authority signature"
 msgstr ""
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1688,6 +1712,8 @@ msgstr "+++ %s ensalutis"
 msgid "+++ %s signed off"
 msgstr "+++ %s malsalutis"
 
+#. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "Nekonata eraro"
 
@@ -1734,6 +1760,17 @@ msgstr "%s forlasis la ĉambron."
 msgid "%s left the room (%s)."
 msgstr "%s forlasis la ĉambron (%s)."
 
+msgid "Invite to chat"
+msgstr "Inviti por babili"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Bonvolu enigi la nomon de uzanto kiun vi deziras inviti, kun fakultativan "
+"invitmesaĝon."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Malsukcesis konekti: %s"
@@ -1852,10 +1889,13 @@ msgid "Starting transfer of %s from %s"
 msgstr ""
 
 #, c-format
-msgid "Transfer of file %s complete"
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
 msgstr ""
 
 #, c-format
+msgid "Transfer of file %s complete"
+msgstr ""
+
 msgid "File transfer complete"
 msgstr "Dosiero alŝuto kompleta"
 
@@ -1863,7 +1903,6 @@ msgstr "Dosiero alŝuto kompleta"
 msgid "You canceled the transfer of %s"
 msgstr "Vi rezignis la alŝuton de %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Dosiero alŝuto rezignita"
 
@@ -2066,11 +2105,13 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AŬTO-RESPONDO>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Eraro kreante konferencon."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2158,9 +2199,8 @@ msgid ""
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "Elektu uzantan adreslibron serĉendan"
+msgstr ""
 
 msgid "Notes"
 msgstr "Notoj"
@@ -2452,7 +2492,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2500,7 +2540,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2528,6 +2568,31 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+msgid "One Time Password"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2719,18 +2784,17 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Antaŭ nomo"
 
@@ -2762,6 +2826,10 @@ msgstr "Bonjour Protokol-Kromaĵo"
 msgid "Purple Person"
 msgstr "Purpura Persono"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr ""
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2772,13 +2840,16 @@ msgstr "%s fermis la konversacion."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
+#, c-format
+msgid "Unable to create socket: %s"
 msgstr ""
 
-msgid "Could not bind socket to port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr ""
 
-msgid "Could not listen on socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
 msgstr ""
 
 msgid "Error communicating with local mDNSResponder."
@@ -2826,13 +2897,13 @@ msgstr "Konservu kunulliston..."
 msgid "Load buddylist from file..."
 msgstr "Ŝarĝu kunulliston el dosiero..."
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
-msgstr "Pasvortoj ne kongruas."
+msgid "Passwords do not match"
+msgstr "Pasvortoj ne akordas"
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2844,13 +2915,13 @@ msgstr "Registro pleniĝis sukcese!"
 msgid "Password"
 msgstr "Pasvorto"
 
-msgid "Password (retype)"
-msgstr "Pasvorto (retajpu)"
+msgid "Password (again)"
+msgstr "Pasvorto (denove)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
+msgid "Captcha"
 msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
@@ -2904,6 +2975,15 @@ msgstr ""
 msgid "Current password"
 msgstr "Aktuala pasvorto"
 
+msgid "Password (retype)"
+msgstr "Pasvorto (retajpu)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2917,13 +2997,13 @@ msgstr "Elektu babilejon por kunul: %s"
 msgid "Add to chat..."
 msgstr "Aldonu al babilejo..."
 
+#. Global
 msgid "Available"
 msgstr "Disponebla"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Fora"
 
@@ -2951,7 +3031,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -2966,8 +3046,14 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
-msgstr "Konekto malsukcesis."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr ""
+
+msgid "Connection failed"
+msgstr "Konekto malsukcesis"
 
 msgid "Add to chat"
 msgstr "Aldonu al babilejo"
@@ -2975,14 +3061,23 @@ msgstr "Aldonu al babilejo"
 msgid "Chat _name:"
 msgstr "Babilejo _nomo:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr ""
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Konektante"
+
 msgid "Chat error"
 msgstr "Babileraro"
 
 msgid "This chat name is already in use"
 msgstr "Tiu babil nomo jam estas uzata"
 
-msgid "Not connected to the server."
-msgstr "Ne konektita al servilo."
+msgid "Not connected to the server"
+msgstr "Ne konektita al servilo"
 
 msgid "Find buddies..."
 msgstr "Trovu kunulojn..."
@@ -3023,6 +3118,9 @@ msgstr "Pola fama TM"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Uzanto"
 
+msgid "GG server"
+msgstr "GG servilo"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nekonata komando: %s"
@@ -3037,7 +3135,7 @@ msgstr "Neniu temo estas"
 msgid "File Transfer Failed"
 msgstr "Dosiero Transmeto Malsukcesis"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr ""
 
 msgid "Error displaying MOTD"
@@ -3053,8 +3151,16 @@ msgstr "Estas neniu MOTD kuniĝita kun tiu konekto."
 msgid "MOTD for %s"
 msgstr "MOTD por %s"
 
-msgid "Server has disconnected"
-msgstr "Servilo diskonektis"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Perdis konekton kun servilo: %s"
 
 msgid "View MOTD"
 msgstr "Rigardu MOTD-n"
@@ -3065,25 +3171,23 @@ msgstr "_Kanalo:"
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC karesnomoj ne enhaveblas blankan spacon"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Konektante"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC karesnomo kaj servilo ne enhaveblas blankan spacon"
 
 msgid "SSL support unavailable"
 msgstr "SSL subteno ne disponeblas"
 
-msgid "Couldn't create socket"
-msgstr ""
+msgid "Unable to connect"
+msgstr "Malkonekteblas"
 
-msgid "Couldn't connect to host"
-msgstr "Ne povis konekti al servilo"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Ne konekteblas: %s"
 
-msgid "Read error"
-msgstr "Legeraro"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Servilo fermis la konekton"
 
 msgid "Users"
 msgstr "Uzantoj"
@@ -3137,13 +3241,12 @@ msgstr "Malbona moduso"
 msgid "Ban on %s by %s, set %s ago"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Ban on %s"
-msgstr "Kialo: %s"
+msgstr ""
 
-#, fuzzy
 msgid "End of ban list"
-msgstr "Ne en listo"
+msgstr ""
 
 #, c-format
 msgid "You are banned from %s."
@@ -3265,6 +3368,16 @@ msgstr ""
 "Via elektita kontonomo estas refuzita de la servilo.  Ĝi verŝajne enhavas "
 "malvalidajn signojn."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Tiu karesnomo \"%s\" jam estas uzata."
+
+msgid "Nickname in use"
+msgstr "Karesnomo uzata"
+
 msgid "Cannot change nick"
 msgstr "Ne povas ŝanĝi karesnomon"
 
@@ -3465,10 +3578,10 @@ msgstr ""
 msgid "execute"
 msgstr "ruligi"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3483,17 +3596,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Platteksta Aŭtentokontrolo"
 
-msgid "Invalid response from server."
-msgstr "Malvalida respondo el servilo."
+msgid "SASL authentication failed"
+msgstr "SASL aŭtentokontrolo malsukcesis"
+
+msgid "Invalid response from server"
+msgstr "Malvalida respondo el servilo"
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
-msgstr "SASL eraro"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL eraro: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr ""
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+msgid "Unable to establish a connection with the server"
+msgstr ""
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+
+msgid "Unable to establish SSL connection"
+msgstr ""
 
 msgid "Full Name"
 msgstr "Plena Nomo"
@@ -3510,6 +3649,11 @@ msgstr "URL"
 msgid "Street Address"
 msgstr "Strato Adreso"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Plia Adreso"
 
@@ -3559,158 +3703,8 @@ msgstr "Kliento"
 msgid "Operating System"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr "Servico Malkovrado Informo"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr "Multopa Babilejo"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc Komandoj"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "En-Bando Registrado"
-
-msgid "User Location"
-msgstr "Uzanto Loko"
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr "Kunul Stato Avizoj"
-
-msgid "Software Version"
-msgstr "Programo Versio"
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr "Uzanto Agordo"
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr "Eraj Kapablecoj"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Uzanto Profilo"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Uzanto Karesnomo"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr "Viva Video"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "Mesaĝaj Ricevitaj Konfirmoj"
-
-msgid "Public Key Publishing"
-msgstr "Publika Ŝloŝilo Disdono"
-
-msgid "User Chatting"
-msgstr "Uzanto Babilante"
-
-msgid "User Browsing"
-msgstr "Uzanto Navigante"
-
-msgid "User Gaming"
-msgstr "Uzanto Ludante"
-
-msgid "User Viewing"
-msgstr "Uzanto Rigardante"
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Kapablecoj"
+msgid "Local Time"
+msgstr "Loka Tempo"
 
 msgid "Priority"
 msgstr "Prioriteco"
@@ -3718,6 +3712,13 @@ msgstr "Prioriteco"
 msgid "Resource"
 msgstr "Rimedo"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+msgid "Logged Off"
+msgstr "Elsalutinta"
+
 msgid "Middle Name"
 msgstr "Meza Nomo"
 
@@ -3739,14 +3740,12 @@ msgstr "Malkaŝu De"
 msgid "Temporarily Hide From"
 msgstr "Provizore Kaŝu De"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Ĉesigu Prezentavizon"
 
 msgid "(Re-)Request authorization"
 msgstr "(Re-)demandu permeson"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -3764,7 +3763,6 @@ msgstr "Babilema"
 msgid "Extended Away"
 msgstr "Longfora"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Ne Ĝenu"
 
@@ -3883,25 +3881,21 @@ msgstr "Elektu konferencan servilon petendan"
 msgid "Find Rooms"
 msgstr "Trovu Babilejojn"
 
-msgid "You require encryption, but it is not available on this server."
+msgid "Affiliations:"
 msgstr ""
 
-msgid "Write error"
-msgstr "Skriberaro"
-
-msgid "Ping timeout"
-msgstr ""
+msgid "No users found"
+msgstr "Neniu uzanto trovita"
 
-msgid "Read Error"
-msgstr "Legeraro"
+msgid "Roles:"
+msgstr "Roloj:"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+msgid "Ping timed out"
 msgstr ""
 
-msgid "Unable to create socket"
+msgid ""
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -3910,6 +3904,9 @@ msgstr "Malvalida XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+msgid "Malformed BOSH URL"
+msgstr ""
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrado de %s@%s sukcesa"
@@ -3934,9 +3931,6 @@ msgstr "Forregistrado Sukcesa"
 msgid "Unregistration Failed"
 msgstr "Malregistrado Malsukcesis"
 
-msgid "Already Registered"
-msgstr "Jam Registrita"
-
 msgid "State"
 msgstr "Ŝato"
 
@@ -3949,6 +3943,9 @@ msgstr "Telefono"
 msgid "Date"
 msgstr "Dato"
 
+msgid "Already Registered"
+msgstr "Jam Registrita"
+
 msgid "Unregister"
 msgstr "Forregistru"
 
@@ -3995,9 +3992,18 @@ msgstr "Aŭtentokontrolante"
 msgid "Re-initializing Stream"
 msgstr ""
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Malpermesita"
 
+msgid "Mood"
+msgstr "Etoso"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Ambaŭ"
 
@@ -4019,12 +4025,6 @@ msgstr "Nenio"
 msgid "Subscription"
 msgstr "Abono"
 
-msgid "Mood"
-msgstr "Etoso"
-
-msgid "Now Listening"
-msgstr ""
-
 msgid "Mood Text"
 msgstr "Agorda Teksto"
 
@@ -4067,9 +4067,6 @@ msgstr "Via pasvorto estas ŝanĝita."
 msgid "Error changing password"
 msgstr "Erara ŝanĝante pasvorton"
 
-msgid "Password (again)"
-msgstr "Pasvorto (denove)"
-
 msgid "Change XMPP Password"
 msgstr "Ŝanĝu XMPP Pasvorton"
 
@@ -4263,15 +4260,21 @@ msgid "Unable to ping user %s"
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4284,7 +4287,30 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Ne eblas eki medion kun %s, malvalida JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Ne eblas eki medion kun %s, uzanto ne estas konektita"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+msgid "Media Initiation Failed"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+msgid "Select a Resource"
+msgstr ""
+
+msgid "Initiate Media"
 msgstr ""
 
 msgid "config:  Configure a chat room."
@@ -4306,13 +4332,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4372,11 +4398,13 @@ msgstr "Konekto servilo"
 msgid "File transfer proxies"
 msgstr "Dosieralŝuto prokuriloj"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
-msgstr "Montru personajn ridmienojn"
+msgstr "Montru Proprajn Sidmienojn"
 
 #, c-format
 msgid "%s has left the conversation."
@@ -4401,9 +4429,9 @@ msgstr "Mesaĝo transdono al %s malsukcesis: %s"
 msgid "XMPP Message Error"
 msgstr "XMPP Mesaĝo Eraro"
 
-#, fuzzy, c-format
+#, c-format
 msgid "(Code %s)"
-msgstr " (Kodo %s)"
+msgstr "(Kodo %s)"
 
 msgid "XML Parse error"
 msgstr ""
@@ -4411,6 +4439,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Eraro aliĝante babilejon %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Eraro en babilejo %s"
+
 msgid "Create New Room"
 msgstr "Kreu Novan Ĉambron"
 
@@ -4427,13 +4463,25 @@ msgstr "_Agordu Ĉambron"
 msgid "_Accept Defaults"
 msgstr "_Akceptu Apriorajn"
 
+msgid "No reason"
+msgstr "Sen kialo"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Eraro aliĝante babilejon %s"
+msgid "You have been kicked: (%s)"
+msgstr "Vi estas forigita: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Eraro en babilejo %s"
+msgid "Kicked (%s)"
+msgstr "Forigita (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr "Transmeto estis fermita."
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4458,9 +4506,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Select a Resource"
-msgstr ""
-
 msgid "Edit User Mood"
 msgstr "Redaktu Uzantan Agordon"
 
@@ -4493,8 +4538,18 @@ msgstr "Agoj"
 msgid "Select an action"
 msgstr "Elektu agon"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Ne eblas ricevi MSN Adresaron"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Malsukcesis aldoni \"%s\"."
+
+msgid "Buddy Add error"
+msgstr ""
+
+msgid "The username specified does not exist."
+msgstr ""
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4536,9 +4591,9 @@ msgstr ""
 msgid "Already logged in"
 msgstr "Jam ensalutita"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid username"
-msgstr "Malvalida Uzantonomo"
+msgstr "Malvalida uzantnomo"
 
 #, c-format
 msgid "Invalid friendly name"
@@ -4720,9 +4775,8 @@ msgstr "Infana Pasporto sen patra konsento"
 msgid "Passport account not yet verified"
 msgstr "Pasporta konto ne jam kontrolita"
 
-#, fuzzy, c-format
 msgid "Passport account suspended"
-msgstr "Pasporta konto ne jam kontrolita"
+msgstr "Pasporta konto suspendita"
 
 #, c-format
 msgid "Bad ticket"
@@ -4736,13 +4790,31 @@ msgstr "Nekonata Eraro Kodo %d"
 msgid "MSN Error: %s\n"
 msgstr "MSN Eraro: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "Preferata Kontakto"
+msgstr "Aliaj Kontaktoj"
 
-#, fuzzy
 msgid "Non-IM Contacts"
-msgstr "Forigu Kontakton"
+msgstr "Ne-TM Kontaktoj"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
 
 msgid "Nudge"
 msgstr ""
@@ -4755,9 +4827,8 @@ msgstr ""
 msgid "Nudging %s..."
 msgstr ""
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "Retadreso"
+msgstr "Retadreso..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "Via nova MSN amika nomo estas tro longa."
@@ -4791,22 +4862,20 @@ msgstr "Permesu"
 msgid "Disallow"
 msgstr "Malpermesu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
-msgstr "Kunul Komento por %s"
+msgstr ""
 
-#, fuzzy
 msgid "No text is blocked for this account."
-msgstr "Uzu tiun kunul p_iktogramon por tiu konto:"
+msgstr ""
 
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr ""
 
-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "Tiu Hotmail konto eble ne estas aktiva."
+msgstr ""
 
 msgid "Send a mobile message."
 msgstr ""
@@ -4814,6 +4883,12 @@ msgstr ""
 msgid "Page"
 msgstr "Paĝo"
 
+msgid "Playing a game"
+msgstr ""
+
+msgid "Working"
+msgstr "Laborante"
+
 msgid "Has you"
 msgstr "Havas vin"
 
@@ -4850,6 +4925,12 @@ msgstr "Artisto"
 msgid "Album"
 msgstr "Albumo"
 
+msgid "Game Title"
+msgstr "Ludo Titolo"
+
+msgid "Office Title"
+msgstr ""
+
 msgid "Set Friendly Name..."
 msgstr "Difinu Amika Nomo..."
 
@@ -4883,8 +4964,26 @@ msgstr "Iniciatu _Babilon"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr "Malsukcesis konekti servilon."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+
+msgid "Unable to Add"
+msgstr "Ne eblas Aldoni"
+
+msgid "Authorization Request Message:"
+msgstr "Permeso Demando Mesaĝo:"
+
+msgid "Please authorize me!"
+msgstr "Bonvolu permesu min!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Daŭrigu"
 
 msgid "Error retrieving profile"
 msgstr "Eraro ricevante profilon"
@@ -5036,8 +5135,8 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
-msgstr "Profilo URL"
+msgid "View web profile"
+msgstr "Rigardi ttt profilon"
 
 #. *< type
 #. *< ui_requirement
@@ -5070,64 +5169,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ne estas valida grupo."
-
-msgid "Unknown error."
-msgstr "Nekonata eraro."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s en %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ĵus sendis al vi Zumon!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Nekonata eraro (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Nekonata eraro (%d): %s"
 
 msgid "Unable to add user"
-msgstr ""
-
-#, fuzzy
-msgid "The following users are missing from your addressbook"
-msgstr "La jenaj estas la rezultoj de via serĉo"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Ne eblas aldoni uzanto en %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Ne eblas bloki uzanton ĉe %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Ne eblas permezi uzanton ĉe %s (%s)"
+msgstr "Ne eblas aldoni uzanton"
 
+#. Unknown error!
 #, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ne aldoneblas ĉar via kunullisto plenumas."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ne etas valida pasporto konto."
+msgid "Unknown error (%d)"
+msgstr "Nekonata eraro (%d)"
 
-msgid "Service Temporarily Unavailable."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr "Ne eblas alinomigi grupon"
-
-msgid "Unable to delete group"
-msgstr "Ne eblas forigi grupo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5160,9 +5222,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "Malkonekteblas"
-
 msgid "Writing error"
 msgstr "Skriberaro"
 
@@ -5175,19 +5234,19 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr ""
 
-msgid "You have signed on from another location."
-msgstr "Vi ensalutis el alia loko."
+msgid "You have signed on from another location"
+msgstr "Vi ensalutis el alia loko"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5216,6 +5275,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5252,36 +5319,21 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s aldonis vin en sia kunul listo."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s forigis vin el sia kunul listo."
-
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "Aldonu al adresaro"
+msgstr ""
 
-#, fuzzy
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Ĉu vi volas aldoni tiun kunul en via kunullisto?"
-
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Malsukcesis aldoni \"%s\"."
+msgstr "Ĉu vi volas forigi tiun kunul el via adresaro ankaŭ?"
 
-#, fuzzy
 msgid "The username specified is invalid."
-msgstr "La nova formatumo malvalidas."
+msgstr "La enigita uzantnomo malvalidas."
 
 msgid "This Hotmail account may not be active."
 msgstr "Tiu Hotmail konto eble ne estas aktiva."
 
+msgid "Profile URL"
+msgstr "Profilo URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5295,15 +5347,59 @@ msgstr "Tiu Hotmail konto eble ne estas aktiva."
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protokol-Kromaĵo"
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s ne estas valida grupo."
+
+msgid "Unknown error."
+msgstr "Nekonata eraro."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s en %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Ne eblas aldoni uzanto en %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Ne eblas bloki uzanton ĉe %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Ne eblas permezi uzanton ĉe %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ne aldoneblas ĉar via kunullisto plenumas."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ne etas valida pasporto konto."
+
+msgid "Service Temporarily Unavailable."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+msgid "Unable to rename group"
+msgstr "Ne eblas alinomigi grupon"
+
+msgid "Unable to delete group"
+msgstr "Ne eblas forigi grupo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s aldonis vin en sia kunul listo."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s forigis vin el sia kunul listo."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+msgid "User lookup"
 msgstr ""
 
 msgid "Reading challenge"
@@ -5315,13 +5411,21 @@ msgstr ""
 msgid "Logging in"
 msgstr "Ensalutante"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Neniu Uzantonomo Difinitia"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+msgid "Lost connection with server"
+msgstr "Perdis konekton kun servilo"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Novaj retmesaĝoj"
 
@@ -5340,20 +5444,21 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM - Neniu Uzantonomo Difinitia"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "TM Amikoj"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr ""
+msgid "Add contacts from server"
+msgstr "Aldoni kontaktojn el servilo."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5361,15 +5466,20 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr "Misa uzantnomo aŭ pasvorto"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
+msgid "Invalid input condition"
+msgstr ""
+
 msgid "Failed to add buddy"
 msgstr "Malsukcesis aldoni kunulon"
 
@@ -5379,13 +5489,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-msgid "User lookup"
-msgstr ""
-
 msgid "Failed to remove buddy"
 msgstr "Malsukcesis forigi kunulon"
 
@@ -5395,34 +5498,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-msgid "Invalid input condition"
-msgstr ""
-
-msgid "Read buffer full (2)"
+msgid "Missing Cipher"
 msgstr ""
 
-msgid "Unparseable message"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Ne povis konekti al servilo: %s (%d)"
-
-msgid "IM Friends"
-msgstr "TM Amikoj"
-
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Add contacts from server"
-msgstr "Aldoni kontaktojn el servilo."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5464,9 +5549,6 @@ msgstr "Baza tiparo grandeco (punktoj)"
 msgid "User"
 msgstr "Uzanto"
 
-msgid "Profile"
-msgstr "Profilo"
-
 msgid "Headline"
 msgstr ""
 
@@ -5479,14 +5561,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "Klienta Version"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "Neniu uzantonomo difinita"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 msgid "MySpaceIM - Username Available"
@@ -5498,12 +5576,22 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 msgid "This username is unavailable."
 msgstr "Tiu uzantonomo ne disponeblas."
 
 msgid "Please try another username:"
 msgstr "Bonvolu provi alian uzantonomon:"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Neniu uzantonomo difinita"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5695,10 +5783,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "Misa ekrannomo aŭ pasvorto"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5713,9 +5797,8 @@ msgstr ""
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr ""
 
-#, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "Vi trenis bildon"
+msgstr ""
 
 msgid "An error occurred while updating the directory"
 msgstr ""
@@ -5739,8 +5822,8 @@ msgid "Unknown error: 0x%X"
 msgstr ""
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr ""
+msgid "Unable to login: %s"
+msgstr "Ne eblas ensaluti: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5838,9 +5921,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr "Aŭtentokontrolas..."
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr "Atendante respondon..."
 
@@ -5864,23 +5944,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Ĉu vi deziras aliĝi al konversacio?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tiu konferenco fermiĝis. Ne pliaj mesaĝoj sendiĝeblas."
 
@@ -5903,24 +5976,29 @@ msgstr "Servilo adreso"
 msgid "Server port"
 msgstr "Servilo pordo"
 
+msgid "Received unexpected response from "
+msgstr "Ricevis neatenditan respondon de"
+
+#. username connecting too frequently
+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 ""
+
+#, c-format
+msgid "Error requesting "
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Ne povis aliĝi babilejon"
 
 msgid "Invalid chat room name"
 msgstr "Malvalida babilejo nomo"
 
-msgid "Server closed the connection."
-msgstr "Servilo fermis la konekton."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Perdis konekton kun servilo:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr ""
 
 #. *< type
@@ -5968,7 +6046,7 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
 msgid "Direct IM established"
@@ -6133,27 +6211,21 @@ msgstr "Viva Video"
 msgid "Camera"
 msgstr "Kamerao"
 
-#, fuzzy
 msgid "Screen Sharing"
-msgstr "Ekrannomo"
+msgstr ""
 
-#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#, c-format
 msgid "Not Available"
 msgstr "Ne Disponebla"
 
-#, c-format
 msgid "Occupied"
 msgstr "Okupata"
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr "Nevidebla"
 
@@ -6166,25 +6238,15 @@ msgstr ""
 msgid "Buddy Comment"
 msgstr "Kunul Komento"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Ne povis konekti al aŭtentokontrolo servilo:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Ne povis konekti al aŭtentokontrolo servilo: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Ne povis konekti al BOS servilo:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Ne konekteblas al BOS servilo: %s"
 
-#, fuzzy
 msgid "Username sent"
-msgstr "Neniu uzantonomo difinita"
+msgstr "Uzantonomo sendita"
 
 msgid "Connection established, cookie sent"
 msgstr "Konekto estabilta, kuketo sendita"
@@ -6195,47 +6257,51 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
-#, fuzzy
-msgid "Invalid username."
-msgstr "Malvalida Uzantonomo"
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Ne eblas obteni validan AIM-an profilon."
 
-msgid "Incorrect password."
-msgstr "Misa pasvorto."
+msgid "Unable to get a valid login hash."
+msgstr ""
 
-#. Suspended account
-msgid "Your account is currently suspended."
+msgid "Received authorization"
 msgstr ""
 
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Uzantonomo ne ekzistas"
+
+#. Suspended account
+msgid "Your account is currently suspended"
+msgstr "Via konto estas nun tempe suspendita"
+
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "La AOL Tujmesaĝilo servo estas provizore nedisponebla."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr "Ne Povas Konekti"
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
-msgstr ""
+msgid "The SecurID key entered is invalid"
+msgstr "La enigita SecurID malvalidas."
 
 msgid "Enter SecurID"
 msgstr ""
@@ -6243,28 +6309,6 @@ msgstr ""
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_Daŭrigu"
-
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Ne eblas obteni validan AIM-an profilon."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr "Pasvorto sendita"
 
@@ -6274,12 +6318,6 @@ msgstr "Ne povas eki konekton"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Bonvolu permesi min do mi povas aldoni vin al mia kunullisto."
 
-msgid "Authorization Request Message:"
-msgstr "Permeso Demando Mesaĝo:"
-
-msgid "Please authorize me!"
-msgstr "Bonvolu permesu min!"
-
 msgid "No reason given."
 msgstr "Nenia kialo donita."
 
@@ -6379,7 +6417,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ne eblas sendi mesaĝon: %s"
@@ -6401,6 +6439,12 @@ msgstr "Enrete Ek De"
 msgid "Member Since"
 msgstr "Membro Ek De"
 
+msgid "Capabilities"
+msgstr "Kapablecoj"
+
+msgid "Profile"
+msgstr "Profilo"
+
 msgid "Your AIM connection may be lost."
 msgstr "Via AIM konekto perdeblas."
 
@@ -6448,11 +6492,11 @@ msgstr "TTT-ejo"
 msgid "Pop-Up Message"
 msgstr "Ŝpruca Mesaĝo"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "La jena ekrannomo estas kunligita kun %s"
-msgstr[1] "La jenaj ekrannomoj estas kunligitaj kun %s"
+msgstr[0] "La jena uzantnomo estas kunligita kun %s"
+msgstr[1] "La jenaj uzantnomoj estas kunligitaj kun %s"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -6554,16 +6598,11 @@ msgstr "Formesaĝo tro longa."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
 
-#, fuzzy
-msgid "Unable to Add"
-msgstr "Ne eblas Aldoni"
-
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
 msgstr "Ne eblas Ricevi Kunulliston"
 
@@ -6577,7 +6616,7 @@ msgstr "Senpatroj"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6585,17 +6624,16 @@ msgid "(no name)"
 msgstr "(sen nomo)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr "Ne povis aldoni kunulon %s pro nekonata kialo."
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "Ne povis aldoni la kunulon %s pro nekonata kialo."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
 msgstr ""
-"La uzanto %s ne koncedis vian demandon aldoni sin al via kunullisto pro la "
-"jena kialo:\n"
-"%s"
+"La uzanto %s koncedis al vi permeson aldoni ŝlin al via kunullisto.  Ĉu vi "
+"volas aldoni tiun uzanton?"
 
 msgid "Authorization Given"
 msgstr "Permeso Donita"
@@ -6623,7 +6661,7 @@ msgid "Authorization Denied"
 msgstr "Permeso Rifuzita"
 
 msgid "_Exchange:"
-msgstr "_Interŝanĝo"
+msgstr "_Interŝanĝo:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
@@ -6655,6 +6693,7 @@ msgstr "K_onektu"
 msgid "Get AIM Info"
 msgstr "Ricevu AIM Informon"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Redaktu Kunul Komenton"
 
@@ -6710,17 +6749,15 @@ msgstr "Tajpu retadreson de la kunul kiun vi serĉas."
 msgid "_Search"
 msgstr "_Serĉu"
 
-#, fuzzy
 msgid "Set User Info (web)..."
-msgstr "Difinu Uzanto-Informon (URL)..."
+msgstr "Difinu Uzanto-Informon (ttt)..."
 
-#, fuzzy
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
-msgstr "Ŝanĝu Pasvorton (URL)"
+msgstr "Ŝanĝu Pasvorton (ttt)"
 
-#, fuzzy
 msgid "Configure IM Forwarding (web)"
-msgstr "Agordu TM Plusendado (URL)"
+msgstr "Agordi TM Plusendado (ttt)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
@@ -6745,6 +6782,9 @@ msgstr "Serĉu Kunulon laŭ Retadreso..."
 msgid "Search for Buddy by Information"
 msgstr "Serĉu Kunulon laŭ Informo..."
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6765,7 +6805,6 @@ msgstr "Demandas %s konekti nin al %s:%hu por Rekta TM."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Provas konekti al %s:%hu"
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Provas konekti pere de prokurservilo."
 
@@ -6854,16 +6893,14 @@ msgstr "Porko"
 msgid "Other"
 msgstr "Alia"
 
-#, fuzzy
 msgid "Visible"
-msgstr "Nevidebla"
+msgstr "Videbla"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
-#, fuzzy
 msgid "Private"
-msgstr "Privataj aferoj"
+msgstr "Privata"
 
 msgid "QQ Number"
 msgstr "QQ Nombro"
@@ -6880,9 +6917,8 @@ msgstr "Poŝtkodo"
 msgid "Phone Number"
 msgstr "Telefonnumero"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Permesi kunulon?"
+msgstr "Permesi aldoni"
 
 msgid "Cellphone Number"
 msgstr "Poŝtelefona Numero"
@@ -6890,130 +6926,136 @@ msgstr "Poŝtelefona Numero"
 msgid "Personal Introduction"
 msgstr "Persono Enkonduko"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "Urbo"
+msgstr "Urbo/Loko"
 
-#, fuzzy
 msgid "Publish Mobile"
-msgstr "Persona Poŝtelefono"
+msgstr "Montri Poŝtelefonon"
 
-#, fuzzy
 msgid "Publish Contact"
-msgstr "Alinomo Kontakto"
+msgstr "Alinomo Kontakton"
 
 msgid "College"
 msgstr "Kolegio"
 
-#, fuzzy
 msgid "Horoscope"
-msgstr "Horoskopa Simbolo"
+msgstr "Horoskopo"
 
-#, fuzzy
 msgid "Zodiac"
-msgstr "Zodiaka Signo"
+msgstr "Zodiako"
 
-#, fuzzy
 msgid "Blood"
-msgstr "Blokita"
+msgstr "Sango"
 
-#, fuzzy
 msgid "True"
-msgstr "Bovo"
+msgstr "Prave"
 
-#, fuzzy
 msgid "False"
-msgstr "Malsukcesita"
+msgstr "Malprave"
 
-#, fuzzy
 msgid "Modify Contact"
-msgstr "Ŝanĝu Konton"
+msgstr "Ŝanĝi Kontakton"
 
-#, fuzzy
 msgid "Modify Address"
-msgstr "Hejmo Adreso"
+msgstr "Ŝanĝi Adreson"
 
-#, fuzzy
 msgid "Modify Extended Information"
-msgstr "Ŝanĝu mian informon"
+msgstr "Ŝanĝi Detalan Informon"
 
-#, fuzzy
 msgid "Modify Information"
-msgstr "Ŝanĝu mian informon"
+msgstr "Ŝanĝu Informon"
 
-#, fuzzy
 msgid "Update"
-msgstr "Lasta Aktualigo"
+msgstr "Aktualigi"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "Bonvolu enigi kunul informon."
+msgstr ""
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "Movante"
+
+msgid "Note"
 msgstr ""
 
-#, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Aldonu Kunulon"
+#. callback
+msgid "Buddy Memo"
+msgstr ""
 
-msgid "Input answer here"
+msgid "Change his/her memo as you like"
 msgstr ""
 
+msgid "_Modify"
+msgstr "Ŝ_anĝu"
+
+msgid "Memo Modify"
+msgstr ""
+
+msgid "Server says:"
+msgstr "Servilo diras:"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, c-format
+msgid "%u requires verification"
+msgstr ""
+
+msgid "Add buddy question"
+msgstr "Aldonu kunulon al via listo?"
+
+msgid "Enter answer here"
+msgstr "Enigu respondon ĉi-tie"
+
 msgid "Send"
 msgstr "Sendu"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Malvalida Uzantonomo"
+msgstr "Malvalida respondo."
 
 msgid "Authorization denied message:"
 msgstr "Rifuzita permeso mesaĝo:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%d needs authentication"
-msgstr "Uzanto %d bezonas aŭtentokontrolon"
+#, c-format
+msgid "%u needs authorization"
+msgstr "%u bezonas aŭtentokontrolon"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "Aldonu kunulon al via listo?"
+msgstr ""
 
-msgid "Input request here"
+msgid "Enter request here"
 msgstr ""
 
 msgid "Would you be my friend?"
 msgstr "Ĉu vi estus mia amiko?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Kunul"
+msgstr "QQ Kunul"
 
-#, fuzzy
 msgid "Add buddy"
-msgstr "Aldonu Kunulon"
+msgstr "Aldoni kunulon"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "Malvalida QQ Aspekto"
+msgstr "Malvalida QQ Numero"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "Bonvolu permesu min!"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "Failed removing buddy %d"
-msgstr "Malsukcesis forigi kunulon"
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "Malsukcesis forigi kunulon %u"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s forigis vin el sia kunul listo."
+msgstr ""
 
-#, fuzzy
 msgid "No reason given"
-msgstr "Nenia kialo donita."
+msgstr "Nenia kialo donita"
 
 #. only need to get value
 #, c-format
@@ -7023,9 +7065,9 @@ msgstr ""
 msgid "Would you like to add him?"
 msgstr "Ĉu vi deziras aldoni ŝlin?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Malakceptu"
+msgstr ""
 
 #, c-format
 msgid "Message: %s"
@@ -7040,129 +7082,119 @@ msgstr "Grupo ID"
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Bonvolu enigi la novan nomon por %s"
+msgstr "Bonvolu enigi Qun numeron"
 
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
-#, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
 msgid "Not member"
-msgstr "Mi ne estas membro"
+msgstr "Ne membro"
 
-#, fuzzy
 msgid "Member"
-msgstr "Membro Ek De"
+msgstr "Membro"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "Peto Dialogujo"
+msgstr ""
 
-#, fuzzy
 msgid "Admin"
-msgstr "Adium"
+msgstr ""
 
-#, fuzzy
 msgid "Notice"
-msgstr "Notoj"
+msgstr ""
 
-#, fuzzy
 msgid "Detail"
-msgstr "Apriora"
+msgstr "Detalo"
 
 msgid "Creator"
 msgstr "Kreanto"
 
-#, fuzzy
 msgid "About me"
-msgstr "Pri %s"
+msgstr "Pri mi"
 
-#, fuzzy
 msgid "Category"
-msgstr "Babileraro"
+msgstr "Kategorio"
 
 msgid "The Qun does not allow others to join"
 msgstr ""
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "QQ Qun"
+msgstr "Aliĝu QQ Qun"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
-#, fuzzy
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Sukcese aliĝis Qun %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "Vi sukcese ŝanĝis Qun numeron"
+msgstr "Sukcese aliĝis Qun"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
 msgstr "QQ Qun Operacio"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Malsukcesita"
+msgstr "Malsukcesita:"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "QQ Qun"
+msgstr ""
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
-#, fuzzy
-msgid "Successfully changed Qun member"
-msgstr "Vi sukcese ŝanĝis Qun numeron"
+msgid "Successfully changed Qun members"
+msgstr "Sukcese ŝanĝis Qun membrojn"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
-msgstr "Vi sukcese ŝanĝis Qun informon"
+msgstr "Sukcese ŝanĝis Qun informon"
 
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#, fuzzy
-msgid "Would you like to set detailed information now?"
-msgstr "Ĉu vi deziras meti ĝin kiel la kunul piktogramo por tiu uzanto?"
+msgid "Would you like to set up detailed information now?"
+msgstr ""
 
 msgid "Setup"
 msgstr "Agordo"
 
-#, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
-msgstr "Uzanto %d petis aliĝon al grupo %d"
+#, c-format
+msgid "%u requested to join Qun %u for %s"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%d request to join Qun %d"
-msgstr "Uzanto %d petis aliĝon al grupo %d"
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
-msgstr "Malsukcesis kuniĝi kunulon en babilejo"
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr ""
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
-msgstr "Forigu Kunulon"
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>Forigu Kunulon %u.</b>"
 
 #, c-format
-msgid "<b>New buddy %d joined.</b>"
+msgid "<b>New buddy %u joined.</b>"
 msgstr ""
 
 #, c-format
@@ -7173,26 +7205,22 @@ msgid "Level"
 msgstr "Nivelo"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
+msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "Movante"
+msgstr ""
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "Movante"
+msgstr ""
 
-#, fuzzy
 msgid " Video"
-msgstr "Viva Video"
+msgstr ""
 
-#, fuzzy
 msgid " Zone"
-msgstr "Nenio"
+msgstr ""
 
 msgid "Flag"
 msgstr ""
@@ -7203,9 +7231,8 @@ msgstr ""
 msgid "Invalid name"
 msgstr "Malvalida Uzantonomo"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "Elektu Dosierujon..."
+msgstr "Elektu piktogramon..."
 
 #, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
@@ -7219,21 +7246,21 @@ msgstr ""
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>Grupo Titolo:</b> %s<br>"
+msgstr "<b>Servilo</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Grupo Titolo:</b> %s<br>"
+msgstr ""
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>Grupo Titolo:</b> %s<br>"
+msgstr ""
 
 #, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
@@ -7243,9 +7270,9 @@ msgstr ""
 msgid "<b>Resend</b>: %lu<br>\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>Grupo Titolo:</b> %s<br>"
+msgstr ""
 
 #, c-format
 msgid "<b>Received</b>: %lu<br>\n"
@@ -7259,9 +7286,9 @@ msgstr ""
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>Grupo Titolo:</b> %s<br>"
+msgstr ""
 
 msgid "Login Information"
 msgstr "Ensaluta Informo"
@@ -7278,33 +7305,39 @@ msgstr ""
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr ""
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr ""
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
 msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "About OpenQ r%s"
-msgstr "Pri %s"
+#, c-format
+msgid "About OpenQ %s"
+msgstr "Pri OpenQ %s"
 
-#, fuzzy
 msgid "Change Icon"
-msgstr "Konservu Piktogramon"
+msgstr "Ŝanĝi Piktogramon"
 
 msgid "Change Password"
 msgstr ""
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Ensaluta Informo"
+msgstr "Konto Informo"
 
 msgid "Update all QQ Quns"
 msgstr ""
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "Pri %s"
+msgstr "Pri OpenQ"
+
+msgid "Modify Buddy Memo"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -7316,61 +7349,52 @@ msgstr "Pri %s"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "QQ Protokolo\tKromaĵo"
+msgstr "QQ Protokolo tKromaĵo"
 
-#, fuzzy
 msgid "Auto"
-msgstr "Permesi"
+msgstr "Aŭtomate"
 
-#, fuzzy
 msgid "Select Server"
-msgstr "Konekto servilo"
+msgstr "Elekti Servilon"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
+msgstr "QQ2008"
 
-#. #endif
-#, fuzzy
 msgid "Connect by TCP"
-msgstr "Konektu per TCP"
+msgstr "Konekti per TCP"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "Servilo pordo"
+msgstr ""
 
-#, fuzzy
 msgid "Show server news"
-msgstr "Servilo adreso"
+msgstr ""
+
+msgid "Show chat room when msg comes"
+msgstr ""
 
 msgid "Keep alive interval (seconds)"
 msgstr ""
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "Aktualigi mian informon"
-
-#, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Konekto servilo"
+msgstr ""
 
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr ""
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "Malvalida titolo"
+msgstr ""
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
@@ -7379,146 +7403,107 @@ msgstr ""
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Registrado Postulita"
+msgstr "Registrado postulita"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
-msgstr ""
-
-msgid "Keep alive error"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Requesting captcha ..."
+msgid "Requesting captcha"
 msgstr ""
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
+msgid "Failed captcha verification"
 msgstr ""
 
-#, fuzzy
 msgid "Captcha Image"
-msgstr "Konservu Bildon"
+msgstr ""
 
-#, fuzzy
 msgid "Enter code"
-msgstr "Enigu Pasvorton"
+msgstr "Enigu kodon"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "Bonvolu enigi la nomon de la grupo"
+msgstr ""
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Ne konekteblas."
-
 msgid "Socket error"
 msgstr ""
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
+msgid "Getting server"
 msgstr ""
-"Perdis konekton kun servilo:\n"
-"%s"
 
-msgid "Unable to read from socket"
+msgid "Requesting token"
 msgstr ""
 
-msgid "Write Error"
-msgstr "Skriberaro"
-
-msgid "Connection lost"
-msgstr "Konekto perdita"
-
-#, fuzzy
-msgid "Get server ..."
-msgstr "Difinu Uzanto-Informon..."
-
-#, fuzzy
-msgid "Request token"
-msgstr "Peto Dialogujo"
-
-msgid "Couldn't resolve host"
+msgid "Unable to resolve hostname"
 msgstr ""
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "Malvalida eraro"
+msgstr ""
 
-#, fuzzy
-msgid "Connecting server ..."
-msgstr "Konekto servilo"
+msgid "Connecting to server"
+msgstr "Konekto al servilo"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "QQid Eraro"
+msgstr "QQ Eraro"
 
-msgid "Failed to send IM."
-msgstr "Malsukcesis sendi tujmesaĝon."
-
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "ICQ Servilo Reludo"
+msgstr ""
+
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "From %s:"
-msgstr "De"
+msgstr "De %s:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Servilo instrukcioj: %s"
-
-msgid "Unknow SERVER CMD"
 msgstr ""
 
+msgid "Unknown SERVER CMD"
+msgstr "Nekonata SERVILO CMD"
+
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "Komando"
+msgstr "QQ Qun Komando"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
+msgid "Unable to decrypt login reply"
 msgstr ""
 
-msgid "Can not decrypt login reply"
+msgid "Unknown LOGIN CMD"
 msgstr ""
 
-#, fuzzy
-msgid "Unknow LOGIN CMD"
-msgstr "Nekonata kialo"
-
-#, fuzzy
-msgid "Unknow CLIENT CMD"
-msgstr "Nekonata kialo"
+msgid "Unknown CLIENT CMD"
+msgstr "Nekonata KLIENTO CMD"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -7531,9 +7516,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr "Koneto fermita (skribante)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupo Titolo:</b> %s<br>"
@@ -7587,17 +7569,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7620,6 +7591,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr ""
+
 msgid "Supports"
 msgstr "Subtenas"
 
@@ -7713,7 +7687,7 @@ msgid "Select User"
 msgstr ""
 
 msgid "Unable to add user: user not found"
-msgstr ""
+msgstr "Ne eblas aldoni uzanton: uzanto ne trovita"
 
 #, c-format
 msgid ""
@@ -8291,9 +8265,6 @@ msgstr ""
 msgid "Unit"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Join Chat"
 msgstr ""
 
@@ -8318,7 +8289,7 @@ msgid "Public Key Babbleprint"
 msgstr ""
 
 msgid "_More..."
-msgstr ""
+msgstr "_Plia..."
 
 msgid "Detach From Server"
 msgstr ""
@@ -8378,6 +8349,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8435,7 +8409,7 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr ""
 
 msgid "Key Exchange failed"
@@ -8445,16 +8419,10 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "Konekto malsukcesis"
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr ""
 
 #. Progress
@@ -8464,15 +8432,15 @@ msgstr ""
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr ""
 
 msgid "Error loading SILC key pair"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Download %s: %s"
-msgstr "Uzantoj ĉe %s: %s"
+msgstr ""
 
 msgid "Your Current Mood"
 msgstr ""
@@ -8741,7 +8709,7 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -8830,6 +8798,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -8870,35 +8841,31 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr ""
 
 msgid "John Noname"
 msgstr "Sennomulo"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr ""
 
-msgid "Could not write"
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not connect"
+msgid "Unknown server response"
 msgstr ""
 
-msgid "Unknown server response."
+msgid "Unable to create listen socket"
 msgstr ""
 
-msgid "Could not create listen socket"
-msgstr ""
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "SIP uzantnomoj ne enhaveblas blankan spacon aŭ @ simbolojn"
 
-msgid "Could not resolve hostname"
+msgid "SIP connect server not specified"
 msgstr ""
 
-#, fuzzy
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "SIP ekrannomoj ne enhaveblas blankan spacon aŭ @ simbolon"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8932,173 +8899,60 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr ""
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr ""
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr ""
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr "Malsukceso."
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr ""
-
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
-
-#, c-format
-msgid "No keywords."
-msgstr ""
-
-#, c-format
-msgid "User has no directory information."
-msgstr ""
-
-#, c-format
-msgid "Country not supported."
-msgstr "Lando ne subtenita."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Misa ekrannomo aŭ pasvorto."
-
-#, c-format
-msgid "The service is temporarily unavailable."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Nekonata ensaluteraro okazis: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Nekonata eraro, %d, okazis.  Informo: %s"
-
-msgid "Invalid Groupname"
-msgstr "Malvalida Gruponomo"
-
-msgid "Connection Closed"
-msgstr "Konekto Fermita"
-
-msgid "Waiting for reply..."
-msgstr "Atendante respondon..."
-
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC revenis el sia paŭzo. Vi nun povas sendi mesaĝojn denove."
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
 
-msgid "Password Change Successful"
-msgstr "Pasvorto Ŝanĝita Sukcese"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! Protokol-Kromaĵo"
 
-msgid "_Group:"
-msgstr "_Grupo:"
+msgid "Pager server"
+msgstr "Paĝila servilo"
 
-msgid "Get Dir Info"
-msgstr "Ricevu Ujan Informon"
+msgid "Pager port"
+msgstr "Paĝila pordo"
 
-msgid "Set Dir Info"
-msgstr "Difini Ujan Informon"
+msgid "File transfer server"
+msgstr "Dosieralŝuto servilo"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr ""
+msgid "File transfer port"
+msgstr "Dosieralŝuto pordo"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
+msgid "Chat room locale"
+msgstr "Babilejo lokaĵaro"
 
-msgid "Could not connect for transfer."
-msgstr ""
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignoru konferencajn kaj babilejan invitojn"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
+msgid "Chat room list URL"
+msgstr "Babilejolisto URL"
 
-msgid "Save As..."
-msgstr "Konservu Kiel..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo Babil servilo"
 
-#, 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] ""
+msgid "Yahoo Chat port"
+msgstr "Yahoo Babilo pordo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr ""
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPANA ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9110,11 +8964,10 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC Protokol-Kromaĵo"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! JAPANA Protokol-Kromaĵo"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9137,6 +8990,26 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Misa uzantnomo aŭ pasvorto"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9164,35 +9037,25 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+msgid "Unable to add buddy to server list"
+msgstr "Ne eblas aldoni kunulon al servilolisto"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Aŭdebla %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Ricevis neatendita HTTP respondo de servilo."
-
-msgid "Connection problem"
-msgstr "Konektado problemo"
+msgid "Received unexpected HTTP response from server"
+msgstr "Ricevis neatenditan HTTP respondon de servilo"
 
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Perdis konekton kun %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Perdis konekton kun %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Ne eblas konekti kun %s: %s"
 
 msgid "Not at Home"
 msgstr "Malhejme"
@@ -9239,8 +9102,8 @@ msgstr "Ĉeesto Agordoj"
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "Ŝaltu kiun ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Kiun kuniĝi en babilejo?"
@@ -9254,74 +9117,15 @@ msgstr "Kuniĝu Uzanto en Babilejo..."
 msgid "Open Inbox"
 msgstr "Malfermu Alkeston"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protokol-Kromaĵo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japanio"
-
-msgid "Pager server"
-msgstr "Paĝila servilo"
-
-msgid "Japan Pager server"
-msgstr "Japana Paĝila servilo"
-
-msgid "Pager port"
-msgstr "Paĝila pordo"
-
-msgid "File transfer server"
-msgstr "Dosieralŝuto servilo"
-
-msgid "Japan file transfer server"
-msgstr "Japana dosieralŝuto servilo"
-
-msgid "File transfer port"
-msgstr "Dosieralŝuto pordo"
-
-msgid "Chat room locale"
-msgstr "Babilejo lokaĵaro"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignoru konferencajn kaj babilejan invitojn"
-
-msgid "Chat room list URL"
-msgstr "Babilejolisto URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Babil servilo"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Babilo pordo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Ne konekteblas."
+
 msgid "Unable to establish file descriptor."
 msgstr "Ne eblas estabi dosierotenilon."
 
@@ -9329,6 +9133,9 @@ msgstr "Ne eblas estabi dosierotenilon."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr "Skriberaro"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japana profilo"
 
@@ -9369,13 +9176,8 @@ msgstr "Mojosa Ligilo 1"
 msgid "Last Update"
 msgstr "Lasta Aktualigo"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Uzanto informo pri %s nedisponebla"
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9393,12 +9195,9 @@ msgid "The user's profile is empty."
 msgstr "La uzanto profilo malplenas."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgid "%s has declined to join."
 msgstr ""
 
-msgid "Invitation Rejected"
-msgstr "Invito malakceptita"
-
 msgid "Failed to join chat"
 msgstr "Malsukcesis aliĝi babilejon"
 
@@ -9438,22 +9237,17 @@ msgstr "Voĉoj"
 msgid "Webcams"
 msgstr "Retkameraoj"
 
+msgid "Connection problem"
+msgstr "Konektado problemo"
+
 msgid "Unable to fetch room list."
 msgstr "Ne eblas ricevi babilejliston."
 
 msgid "User Rooms"
 msgstr "Uzanto Babilejoj"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Konektproblemo kun la YCHT servilo."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Perdis konekto kun prokura servilo\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Konektproblemo kun la YCHT servilo"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9571,13 +9365,7 @@ msgid "Exposure"
 msgstr "Montreco"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9585,17 +9373,14 @@ msgid "HTTP proxy connection error %d"
 msgstr "HTTP prokura konekteraro %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
-"Aliro nepermesita: HTTP prokura servilo malpermesas pordon %d tunelumadon."
+"Aliro nepermesita: HTTP prokura servilo malpermesas pordon %d tunelumadon"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9648,17 +9433,15 @@ msgid "Accept chat invitation?"
 msgstr "Ĉu akceptu babilinviton ?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "Ordigi"
+msgstr "Ligilo"
 
 msgid "The text-shortcut for the smiley"
 msgstr ""
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "Konservu Bildon"
+msgstr "Konservita Bildo"
 
 msgid "Stored Image. (that'll have to do for now)"
 msgstr ""
@@ -9684,9 +9467,6 @@ msgstr "Ne ĝenu"
 msgid "Extended away"
 msgstr "Longfora"
 
-msgid "Mobile"
-msgstr "Movante"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -9728,16 +9508,6 @@ msgstr "+++ %s iĝis senfara"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Eraro dum legado %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr "Kalkulante..."
 
@@ -9788,9 +9558,9 @@ msgstr ""
 msgid "Unable to connect to %s"
 msgstr "Ne konekteblas al %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Eraro legante de %s: %s"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -9839,9 +9609,19 @@ msgid "Connection refused."
 msgstr "Konekto malakceptita."
 
 #. 10048
-#, fuzzy, c-format
+#, c-format
 msgid "Address already in use."
-msgstr "Tiu babil nomo jam estas uzata"
+msgstr "Adreso jam uzata."
+
+#, c-format
+msgid "Error Reading %s"
+msgstr "Eraro dum legado %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
 
 msgid "Internet Messenger"
 msgstr "Interreta Mesaĝilo"
@@ -9885,10 +9665,8 @@ msgstr "Nova ret_poŝto avizoj"
 msgid "Use this buddy _icon for this account:"
 msgstr "Uzu tiun kunul p_iktogramon por tiu konto:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Opcioj"
+msgid "Ad_vanced"
+msgstr "Pro_gresinta"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Uzu GNOME-ajn Prokurilo-Agordojn"
@@ -9923,9 +9701,6 @@ msgstr "Se vi rigardas sufiĉe proksime"
 msgid "you can see the butterflies mating"
 msgstr "vi povas vidi la Zamenhofan barbon kreski"
 
-msgid "Proxy Options"
-msgstr "Prokurilo Opcioj"
-
 msgid "Proxy _type:"
 msgstr "Prokurilo _tipo:"
 
@@ -9953,8 +9728,8 @@ msgstr "_Baza"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_Kroma"
+msgid "P_roxy"
+msgstr "P_rokurilo"
 
 msgid "Enabled"
 msgstr "Enŝaltita"
@@ -9988,12 +9763,11 @@ msgid ""
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
 
-#, fuzzy
 msgid "Please update the necessary fields."
-msgstr "Bonvolu Aktualigi la necesajn kampojn."
+msgstr "Bonvolu aktualigi la necesajn kampojn."
 
-msgid "Room _List"
-msgstr "Babilejoj _Listo"
+msgid "A_ccount"
+msgstr "_Konto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10001,8 +9775,8 @@ msgid ""
 msgstr ""
 "B.v enigi la konvenan informon pri la babilejo kiun vi deziras aliĝi.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Babilejoj _Listo"
 
 msgid "_Block"
 msgstr "_Bloku"
@@ -10019,6 +9793,15 @@ msgstr "Ricevu _Informon"
 msgid "I_M"
 msgstr "T_M"
 
+msgid "_Audio Call"
+msgstr "_Sona Alvoko"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
 msgid "_Send File..."
 msgstr "_Sendu Dosieron..."
 
@@ -10028,8 +9811,11 @@ msgstr "Aldonu Kunul _Atentigon..."
 msgid "View _Log"
 msgstr "Montru Protoko_lon"
 
-msgid "Hide when offline"
-msgstr "Kaŝu kiam senkonekta"
+msgid "Hide When Offline"
+msgstr "Kaŝi Kiam Senkonekta"
+
+msgid "Show When Offline"
+msgstr "Montri Kiam Senkonekta"
 
 msgid "_Alias..."
 msgstr "_Alinomo..."
@@ -10037,9 +9823,8 @@ msgstr "_Alinomo..."
 msgid "_Remove"
 msgstr "Fo_rigu"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "Difinu Propran Piktogramon..."
+msgstr "Difinu Propran Piktogramon"
 
 msgid "Remove Custom Icon"
 msgstr "Forigu Propran Piktogramon"
@@ -10066,9 +9851,8 @@ msgstr "Aŭtomate-aliĝu"
 msgid "Persistent"
 msgstr "Daŭra"
 
-#, fuzzy
 msgid "_Edit Settings..."
-msgstr "Agordu"
+msgstr "_Redakti Agordojn..."
 
 msgid "_Collapse"
 msgstr "_Maletendu"
@@ -10142,9 +9926,8 @@ msgstr "/Kunuloj/_Finu"
 msgid "/_Accounts"
 msgstr "/_Kontoj"
 
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "/Kontoj/Mastrumu"
+msgstr "/Kontoj/Mastrumi Kontoj"
 
 #. Tools
 msgid "/_Tools"
@@ -10156,6 +9939,9 @@ msgstr "/Iloj/Kunul _Atentigoj"
 msgid "/Tools/_Certificates"
 msgstr "/Iloj/_Atestiloj"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Iloj/Propaj Pi_ktogramoj"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Iloj/Kromaĵo_j"
 
@@ -10165,10 +9951,6 @@ msgstr "/Iloj/Agordoj"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Iloj/Pr_ivateco"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Iloj/Privateco"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Iloj/_Dosiero-alŝutoj"
 
@@ -10198,11 +9980,13 @@ msgstr "/Helpo/_Pri"
 msgid "<b>Account:</b> %s"
 msgstr "<b>Konto:</b> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
-msgstr "<b>Konto:</b> %s"
+msgstr ""
+"\n"
+"<b>Okupantoj:</b> %d"
 
 #, c-format
 msgid ""
@@ -10284,8 +10068,8 @@ msgstr "Mane"
 msgid "By status"
 msgstr "Laŭ stato"
 
-msgid "By log size"
-msgstr "Laŭ protokolo grandeco"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10301,6 +10085,9 @@ msgstr "Rekontaktu"
 msgid "Re-enable"
 msgstr "Reŝaltu"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Rebonvenon!"
 
@@ -10324,7 +10111,7 @@ msgid "/Accounts"
 msgstr "/Kontoj"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
@@ -10335,8 +10122,8 @@ msgstr ""
 "<span weight='bold' size='larger'>Bonvenon en %s!</span>\n"
 "\n"
 "Vi havas neniun konton ŝaltitan. Ŝaltu viajn TM kontojn per la <b>Kontoj</b> "
-"fenestro ĉe <b>Kontoj->Mastrumi</b>. Post la ŝalto de kontoj, vi povos "
-"ensaluti, difini vian staton, kaj babiladi kun viaj amikoj."
+"fenestro ĉe <b>Kontoj->Mastrumi Kontojn</b>. Post la ŝalto de kontoj, vi "
+"povos ensaluti, difini vian staton, kaj babiladi kun viaj amikoj."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10356,21 +10143,17 @@ msgstr "/Kunuloj/Montru/Senfarajn Tempojn"
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Kunuloj/Montru/Malplenajn Grupojn"
 
-#, fuzzy
 msgid "Add a buddy.\n"
-msgstr "Aldonu Kunulon"
+msgstr "Aldoni Kunulon.\n"
 
-#, fuzzy
 msgid "Buddy's _username:"
-msgstr "Kunul nomo:"
+msgstr "Kunul _uzantnomo:"
 
-#, fuzzy
 msgid "(Optional) A_lias:"
-msgstr "Opcia informo:"
+msgstr "(Opcia) A_linomo:"
 
-#, fuzzy
 msgid "Add buddy to _group:"
-msgstr "Aldonu kunulon al via listo?"
+msgstr "Aldoni kunulon al _grupo:"
 
 msgid "This protocol does not support chat rooms."
 msgstr ""
@@ -10390,6 +10173,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_linomo:"
 
+msgid "_Group:"
+msgstr "_Grupo:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10409,7 +10195,7 @@ msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Kontoj/"
 
 msgid "_Edit Account"
-msgstr "_Redaktu Konton"
+msgstr "_Redakti Konton"
 
 msgid "No actions available"
 msgstr "Neniu ago disponebla"
@@ -10423,6 +10209,101 @@ msgstr "/Iloj"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kunuloj/Ordigu Kunulojn"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Malantaŭa Koloro"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+msgid "Layout"
+msgstr ""
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+msgid "Expanded Background Color"
+msgstr ""
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+msgid "Collapsed Background Color"
+msgstr ""
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Kontakt/Babilan Malantaŭan Koloron"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+msgid "Contact Text"
+msgstr "Kontakt-Teksto"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+msgid "On-line Text"
+msgstr "Konektita Teksto"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+msgid "Away Text"
+msgstr "Fora Teksto"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+msgid "Off-line Text"
+msgstr "Senkonekta Teksto"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+msgid "Idle Text"
+msgstr "Senfara Teksto"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+msgid "Message Text"
+msgstr "Mesaĝo Teksto"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Serviloj"
@@ -10440,14 +10321,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitu Kunul En Babilejo"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Bonvolu enigi la nomon de uzanto kiun vi deziras inviti, kun fakultativan "
-"invitmesaĝon."
-
 msgid "_Buddy:"
 msgstr "K_unul:"
 
@@ -10476,8 +10349,8 @@ msgstr "Ignoru"
 msgid "Get Away Message"
 msgstr "Montru Formesaĝon"
 
-msgid "Last said"
-msgstr "Laste diris"
+msgid "Last Said"
+msgstr "Laste Diris"
 
 msgid "Unable to save icon file to disk."
 msgstr "Ne eblas konservi piktogramodosieron al disko."
@@ -10497,9 +10370,8 @@ msgstr "Konservu Piktogramon Kiel..."
 msgid "Set Custom Icon..."
 msgstr "Difinu Propran Piktogramon..."
 
-#, fuzzy
 msgid "Change Size"
-msgstr "Ŝanĝu staton"
+msgstr "Ŝanĝu Grandecon"
 
 msgid "Show All"
 msgstr "Montru Ĉiujn"
@@ -10523,6 +10395,18 @@ msgstr "/Konversacio/_Konservu Kiel..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Konversacio/Fo_rviŝu Dialogon"
 
+msgid "/Conversation/M_edia"
+msgstr "/Konversacio/M_edio"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Konversacio/Medio/_Aŭda Alvoko"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Konversacio/Medio/_Vida Alvoko"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Konversacio/Medio/Aŭda\\/Vida Alvo_ko"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konversacio/Se_ndu Dosieron..."
 
@@ -10595,6 +10479,15 @@ msgstr "/Konversacio"
 msgid "/Conversation/View Log"
 msgstr "/Konversacio/Montru Protokoladon"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Konversacio/Medio/Aŭda Alvoko"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Konversacio/Medio/Vida Alvoko"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Konversacio/Medio/Aŭda\\/Vida Alvoko"
+
 msgid "/Conversation/Send File..."
 msgstr "/Konversacio/Sendu Dosieron..."
 
@@ -10771,20 +10664,21 @@ msgstr "Fatala Eraro"
 msgid "bug master"
 msgstr ""
 
-#, fuzzy
 msgid "artist"
-msgstr "Artisto"
+msgstr "artisto"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "subteno"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "programisto kaj retestro"
+msgstr "retestro"
 
 msgid "Senior Contributor/QA"
 msgstr ""
@@ -10806,7 +10700,7 @@ msgid "support/QA"
 msgstr "subteno/Kvalitkontrolo"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "originala aŭtoro"
@@ -10883,9 +10777,8 @@ msgstr "Finna"
 msgid "French"
 msgstr "Franca"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Kurda"
+msgstr "Irlanda"
 
 msgid "Galician"
 msgstr "Galega"
@@ -10905,6 +10798,9 @@ msgstr "Hindia"
 msgid "Hungarian"
 msgstr "Hungara"
 
+msgid "Armenian"
+msgstr "Armena"
+
 msgid "Indonesian"
 msgstr "Indonezia"
 
@@ -10920,6 +10816,9 @@ msgstr "Kartvela"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntaj Kartvelaj Tradukantoj"
 
+msgid "Khmer"
+msgstr "Ĥmera"
+
 msgid "Kannada"
 msgstr "Kanara"
 
@@ -10941,6 +10840,9 @@ msgstr "Litova"
 msgid "Macedonian"
 msgstr "Makedona"
 
+msgid "Mongolian"
+msgstr "Mongola"
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norvega"
 
@@ -10954,7 +10856,7 @@ msgid "Norwegian Nynorsk"
 msgstr "Norvega Ninorska"
 
 msgid "Occitan"
-msgstr ""
+msgstr "Okcitana"
 
 msgid "Punjabi"
 msgstr "Panĝaba"
@@ -10990,11 +10892,14 @@ msgid "Serbian"
 msgstr "Serba"
 
 msgid "Sinhala"
-msgstr ""
+msgstr "Sinhala"
 
 msgid "Swedish"
 msgstr "Sveda"
 
+msgid "Swahili"
+msgstr "Svahila"
+
 msgid "Tamil"
 msgstr "Tamila"
 
@@ -11008,7 +10913,7 @@ msgid "Turkish"
 msgstr "Turka"
 
 msgid "Urdu"
-msgstr ""
+msgstr "Urdua"
 
 msgid "Vietnamese"
 msgstr "Vjetnama"
@@ -11055,8 +10960,26 @@ msgstr ""
 "<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin ĉe irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC kanalo:</FONT> #pidgin ĉe irc.freenode.net<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Aktualaj Programistoj"
@@ -11088,13 +11011,12 @@ msgstr "_Konto"
 msgid "Get User Info"
 msgstr "Ricevu Uzanto-Informon"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Bonvolu enigi la ekrannomon aŭ alinomon de persono kiesn informon vi dezrias "
-"rigardi."
+"Bonvolu enigi la uzantnomon aŭ alinomon de persono kiesan informon vi "
+"deziras rigardi."
 
 msgid "View User Log"
 msgstr "Rigardu Uzanto-Protokolon"
@@ -11192,45 +11114,35 @@ msgstr "_Forigu Babilejon"
 msgid "Right-click for more unread messages...\n"
 msgstr "Dektre-klaku por pliaj nelegitaj mesaĝoj...\n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "Ŝanĝu staton"
+msgstr "Ŝ_anĝu staton"
 
-#, fuzzy
 msgid "Show Buddy _List"
-msgstr "Montru kunulliston"
+msgstr "Montru Kunul_liston"
 
-#, fuzzy
 msgid "_Unread Messages"
-msgstr "Nelegitaj mesaĝoj"
+msgstr "_Nelegitaj Mesaĝoj"
 
-#, fuzzy
 msgid "New _Message..."
-msgstr "Nova mesaĝo..."
+msgstr "Nova _Mesaĝo..."
 
-#, fuzzy
 msgid "_Accounts"
-msgstr "/_Kontoj"
+msgstr "_Kontoj"
 
-#, fuzzy
 msgid "Plu_gins"
-msgstr "Kromaĵoj"
+msgstr "K_romaĵoj"
 
-#, fuzzy
 msgid "Pr_eferences"
-msgstr "Agordo"
+msgstr "Ag_ordoj"
 
-#, fuzzy
 msgid "Mute _Sounds"
-msgstr "Malsonorigu"
+msgstr "Mal_sonorigu"
 
-#, fuzzy
 msgid "_Blink on New Message"
-msgstr "Flagri je Nova Mesaĝo"
+msgstr "_Flagri je Nova Mesaĝo"
 
-#, fuzzy
 msgid "_Quit"
-msgstr "Finu"
+msgstr "_Finu"
 
 msgid "Not started"
 msgstr "Malkomencita"
@@ -11290,14 +11202,6 @@ msgstr "F_orviŝu finitajn transmetojn"
 msgid "File transfer _details"
 msgstr "Dosiero-transmeto _detaloj"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Paŭzo"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Rekomenci"
-
 msgid "Paste as Plain _Text"
 msgstr "Enmetu keil Plena _Teksto"
 
@@ -11313,11 +11217,10 @@ msgstr "Ligila koloro"
 msgid "Color to draw hyperlinks."
 msgstr "Koloro ligila."
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "Ligila koloro"
+msgstr "Vizitita ligilo koloro"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11353,36 +11256,29 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
-#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
-msgstr "Senditaj Mesaĝoj Nomoj Koloro"
+msgstr ""
+
+msgid "Color to draw the name of a whispered message."
+msgstr ""
 
-#, fuzzy
 msgid "Typing notification color"
-msgstr "Avizo Forigo"
+msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 
-#, fuzzy
 msgid "Typing notification font"
-msgstr "Ŝprucigu avizon"
+msgstr ""
 
 msgid "The font to use for the typing notification"
 msgstr ""
 
-#, fuzzy
 msgid "Enable typing notification"
-msgstr "Nova retpoŝt-avizoj"
-
-msgid "_Copy Email Address"
-msgstr "_Kopiu Retadreson"
-
-msgid "_Open Link in Browser"
-msgstr "_Malfermu Ligilon en Retumilo"
-
-msgid "_Copy Link Location"
-msgstr "_Kopiu Ligilo-Lokon"
+msgstr ""
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -11425,13 +11321,11 @@ msgstr ""
 msgid "Save Image"
 msgstr "Konservu Bildon"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Konservi Bildon..."
 
-#, fuzzy, c-format
 msgid "_Add Custom Smiley..."
-msgstr "Montru personajn ridmienojn"
+msgstr "_Aldoni Propajn Ridmienojn..."
 
 msgid "Select Font"
 msgstr "Elektu Tiparon"
@@ -11480,9 +11374,8 @@ msgstr ""
 msgid "Smile!"
 msgstr "Ridetu!"
 
-#, fuzzy
 msgid "_Manage custom smileys"
-msgstr "Montru personajn ridmienojn"
+msgstr "_Mastumi proprajn ridmienojn"
 
 msgid "This theme has no available smileys."
 msgstr "Tiu temo havas neniujn disponeblajn ridmienojn"
@@ -11517,9 +11410,6 @@ msgstr ""
 msgid "Font Face"
 msgstr "Tiparo Aspekto"
 
-msgid "Background Color"
-msgstr "Malantaŭa Koloro"
-
 msgid "Foreground Color"
 msgstr "Antaŭa Koloro"
 
@@ -11619,19 +11509,20 @@ msgstr "<span size='larger' weight='bold'>Konversacio kun %s ĉe %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr ""
+msgstr "_Foliumi protokolujon"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Provu `%s -h' por pli da informo.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11646,21 +11537,25 @@ msgstr ""
 "\n"
 "  -c, --config=UJO    uzu UJOn por agordo dosieroj\n"
 "  -d, --debug         montru sencimigajn mesaĝojn al stdout\n"
+"  -f, --force-online  devigu konektita, sendistinge je reta stato\n"
 "  -h, --help          vidigu tiun helpon kaj finu\n"
-"  -m, --multiple       ne devigu unuopa ruliĝo\n"
+"  -m, --multiple      ne devigu unuopa ruliĝo\n"
 "  -n, --nologin       ne aŭtomate ensalutu\n"
 "  -l, --login[=NOMO]  aŭtomate ensalutu (fakultativa argumento NOMO "
 "specifas\n"
-"                      konto(j)n uzendajn, disigitajn per komoj)\n"
+"                      konto(j)n uzendajn, disigitajn per komoj.\n"
+"                      Sen tio, nur la unua konto estos ensalutita).\n"
+"  --display=DISPLAY   X vidilo uzenda\n"
 "  -v, --version       vidigu la aktualan version kaj finu\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11674,12 +11569,15 @@ msgstr ""
 "\n"
 "  -c, --config=UJO    uzu UJOn por agordo dosieroj\n"
 "  -d, --debug         montru sencimigajn mesaĝojn al stdout\n"
+"  -f, --force-online  devigu konektita, sendistinge je reta stato\n"
 "  -h, --help          vidigu tiun helpon kaj finu\n"
 "  -m, --multiple       ne devigu unuopa ruliĝo\n"
 "  -n, --nologin       ne aŭtomate ensalutu\n"
 "  -l, --login[=NOMO]  aŭtomate ensalutu (fakultativa argumento NOMO "
 "specifas\n"
-"                      konto(j)n uzendajn, disigitajn per komoj)\n"
+"                      konto(j)n uzendajn, disigitajn per komoj.\n"
+"                      Sen tio, nur la unua konto estos ensalutita).\n"
+"  --display=DISPLAY   X vidilo uzenda\n"
 "  -v, --version       vidigu la aktualan version kaj finu\n"
 
 #, c-format
@@ -11703,11 +11601,32 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Piĝin"
 
-msgid "Open All Messages"
-msgstr "Malfermu Ĉiujn Mesaĝojn"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Vi ricevis retmesaĝon!</span>"
+msgid "/_Media"
+msgstr "/_Medio"
+
+msgid "/Media/_Hangup"
+msgstr "/Medio/_Rekroĉi"
+
+msgid "Calling..."
+msgstr "Alvokante..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
+
+msgid "Incoming Call"
+msgstr ""
+
+msgid "_Pause"
+msgstr "_Paŭzo"
 
 #, c-format
 msgid "%s has %d new message."
@@ -11737,6 +11656,24 @@ msgid ""
 msgstr ""
 "La 'Mana' foliumilo komando estis elektita, sed nenia komando estis difinita."
 
+msgid "No message"
+msgstr "Neniu mesaĝo"
+
+msgid "Open All Messages"
+msgstr "Malfermu Ĉiujn Mesaĝojn"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Vi ricevis retmesaĝon!</span>"
+
+msgid "New Pounces"
+msgstr ""
+
+msgid "Dismiss"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
 msgid "The following plugins will be unloaded."
 msgstr "La jenajn kromaĵoj estos malŝarĝitaj."
 
@@ -11754,30 +11691,25 @@ msgid ""
 "startup."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Eraro: %s\n"
-"Kontrolu kromaĵan retsituon por ĝisdatigo .</span>"
+"<span foreground=\"red\" weight=\"bold\">Eraro: %s\n"
+"Kontrolu kromaĵan retsituon por ĝisdatigo.</span>"
 
-#, fuzzy
 msgid "Author"
-msgstr "Permesu"
+msgstr "Aŭtoro"
 
-#, fuzzy
 msgid "<b>Written by:</b>"
-msgstr "<b>Sendante Al:</b>"
+msgstr "<b>Verkita de::</b>"
 
-#, fuzzy
 msgid "<b>Web site:</b>"
-msgstr "<b>Sendante Kiel:</b>"
+msgstr "<b>Retejo:</b>"
 
-#, fuzzy
 msgid "<b>Filename:</b>"
-msgstr "<b>Uzantonomo:</b>"
+msgstr "<b>Dosiernomo:</b>"
 
 msgid "Configure Pl_ugin"
 msgstr "Agrod_u Kromaĵon"
@@ -11788,10 +11720,16 @@ msgstr "<b>Kromaĵo Detaloj</b>"
 msgid "Select a file"
 msgstr "Elektu dosieron"
 
+msgid "Modify Buddy Pounce"
+msgstr ""
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Atentigi Kiun"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "K_unul nomo:"
 
@@ -11858,7 +11796,57 @@ msgstr "_Rikuranta"
 msgid "Pounce Target"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+#, c-format
+msgid "Started typing"
+msgstr "Ektajpas"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Paŭzas tajpante"
+
+#, c-format
+msgid "Signed on"
+msgstr "Ensalutas"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Revenis el senfarado"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Ekmalforiĝas"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Ekmaltajpas"
+
+#, c-format
+msgid "Signed off"
+msgstr "Audiaŭas"
+
+#, c-format
+msgid "Became idle"
+msgstr "Eksenfaras"
+
+#, c-format
+msgid "Went away"
+msgstr "Kiam fora"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Sendis mesaĝon"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -11877,10 +11865,14 @@ msgstr "Piktogramo"
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#, fuzzy
 msgid "Cl_ose conversations with the Escape key"
-msgstr "Konversacioj kun %s"
+msgstr ""
+
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr ""
 
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Sistemlistela Piktogramo"
 
@@ -11890,8 +11882,8 @@ msgstr "_Montru sistemlistelan piktogramon:"
 msgid "On unread messages"
 msgstr "Je nelegitaj mesaĝoj"
 
-msgid "Conversation Window Hiding"
-msgstr "Konversacio Fenestroj Kaŝeco"
+msgid "Conversation Window"
+msgstr "Konversacio Fenestroj"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Kaŝu novajn TM-ajn konversaciojn:"
@@ -11899,6 +11891,9 @@ msgstr "_Kaŝu novajn TM-ajn konversaciojn:"
 msgid "When away"
 msgstr "Kiam fora"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_gu novajn konversaciajn fenestrojn"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Langetoj"
@@ -11957,9 +11952,6 @@ msgstr "Uzu dolĉan rulumon"
 msgid "F_lash window when IMs are received"
 msgstr "Fu_lmu ekranon kiam TM-oj riceviĝas"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_gu novajn konversaciajn fenestrojn"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -11991,14 +11983,12 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-msgid "ST_UN server:"
-msgstr "ST_UN servilo:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ekzemplo: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Aŭtodetekti IP adreson"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Uzi _aŭtodetektitan IP adreson: %s"
 
 msgid "Public _IP:"
 msgstr "Publika _IP:"
@@ -12018,6 +12008,10 @@ msgstr "_Komenca pordo:"
 msgid "_End port:"
 msgstr "_Fina pordo:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Prokura Servilo &amp; Retumilo"
 
@@ -12033,10 +12027,10 @@ msgid ""
 msgstr ""
 
 msgid "Configure _Proxy"
-msgstr "Agordu _Prokurilon"
+msgstr "Agordi _Prokurilon"
 
 msgid "Configure _Browser"
-msgstr "Agordu _Retumilon"
+msgstr "Agordi _Retumilon"
 
 msgid "Proxy Server"
 msgstr "Prokura Servilo"
@@ -12044,6 +12038,10 @@ msgstr "Prokura Servilo"
 msgid "No proxy"
 msgstr "Sen prokurilo"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Uzanto:"
 
@@ -12165,31 +12163,26 @@ msgstr ""
 "Sono k_omando:\n"
 "(%s por dosiernomo)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "Malsonorigu"
+msgstr "_Malsonorigu"
 
 msgid "Sounds when conversation has _focus"
 msgstr "Sonu kiam konversacio _fokusas"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "Ŝaltu Sonojn:"
+msgstr "Ŝ_altu sonojn:"
 
-#, fuzzy
 msgid "V_olume:"
-msgstr "Laŭteco:"
+msgstr "Laŭtec_o:"
 
 msgid "Play"
 msgstr "Ludu"
 
-#, fuzzy
 msgid "_Browse..."
 msgstr "Fol_iumi..."
 
-#, fuzzy
 msgid "_Reset"
-msgstr "Restarigu"
+msgstr "_Restarigu"
 
 msgid "_Report idle time:"
 msgstr "_Raportu senfaran tempon:"
@@ -12207,12 +12200,12 @@ msgstr "Kiam ambaŭ fora kaj senfara"
 msgid "Auto-away"
 msgstr "Aŭto-fora"
 
-msgid "Change status when _idle"
-msgstr "Ŝanĝu staton kiam _senfara"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutoj antaŭe eksenfari:"
 
+msgid "Change status when _idle"
+msgstr "Ŝanĝu staton kiam _senfara"
+
 msgid "Change _status to:"
 msgstr "Ŝangû _staton al:"
 
@@ -12360,59 +12353,47 @@ msgstr "Konser_vu & Uzu"
 msgid "Status for %s"
 msgstr "Stato por %s"
 
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Enmetu Ridmienon"
-
-msgid "More Data needed"
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
+msgid "Custom Smiley"
+msgstr "Propra Ridmieno"
 
-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "Duobligo Korekto"
-
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Bonvolu enigi novan nomon por vi."
+msgstr "Duobliga Ligilo"
 
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "Enmetu Ridmienon"
+msgstr "Redakti Ridmienon"
 
-#, fuzzy
 msgid "Add Smiley"
-msgstr "Ridetu!"
+msgstr "Aldoni Ridmienon"
 
-#, fuzzy
-msgid "Smiley _Image"
-msgstr "Konservu Bildon"
+msgid "_Image:"
+msgstr "B_ildon:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "L_igilo teksto:"
 
-#, fuzzy
 msgid "Smiley"
-msgstr "Ridetu!"
+msgstr "Ridmieno"
+
+msgid "Shortcut Text"
+msgstr "Ligilo teksto"
 
 msgid "Custom Smiley Manager"
 msgstr ""
 
-#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Elektu Kunulan Piktogramon"
+
 msgid "Click to change your buddyicon for this account."
-msgstr "Uzu tiun kunul p_iktogramon por tiu konto:"
+msgstr "Klaku por ŝanĝi vian kunul-piktogramon por tiu konto."
 
-#, fuzzy
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Uzu tiun kunul p_iktogramon por tiu konto:"
+msgstr "Klaku por ŝanĝi vian kunul-piktogramon por ĉiuj kontoj."
 
 msgid "Waiting for network connection"
 msgstr "Atendante retkonekto"
@@ -12423,9 +12404,8 @@ msgstr "Novaj statoj..."
 msgid "Saved statuses..."
 msgstr "Konservitaj statoj..."
 
-#, fuzzy
 msgid "Status Selector"
-msgstr "Sono Elekto"
+msgstr "Stato Elektilo"
 
 msgid "Google Talk"
 msgstr "Gogla Babilado"
@@ -12488,8 +12468,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -12521,9 +12501,30 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
+msgid "_Open Link"
+msgstr "_Malfermu ligilon"
+
+msgid "_Copy Link Location"
+msgstr "_Kopiu Ligilo-Lokon"
+
+msgid "_Copy Email Address"
+msgstr "_Kopiu Retadreson"
+
+msgid "_Open File"
+msgstr "Malfermu _Dosieron"
+
+msgid "Open _Containing Directory"
+msgstr ""
+
 msgid "Save File"
 msgstr "Konservu Dosieron"
 
+msgid "_Play Sound"
+msgstr "_Ludu sonon"
+
+msgid "_Save File"
+msgstr "_Konservu Dosieron"
+
 msgid "Select color"
 msgstr "Elektu koloron"
 
@@ -12539,20 +12540,17 @@ msgstr "_Ricevu Informon"
 msgid "_Invite"
 msgstr "_Ivitu"
 
-#, fuzzy
 msgid "_Modify..."
 msgstr "Ŝ_anĝu..."
 
-#, fuzzy
 msgid "_Add..."
-msgstr "_Aldonu"
+msgstr "_Aldonu.."
 
 msgid "_Open Mail"
 msgstr "_Malfermu retmesaĝon"
 
-#, fuzzy
 msgid "_Edit"
-msgstr "Redaktu"
+msgstr "_Redaktu"
 
 msgid "Pidgin Tooltip"
 msgstr ""
@@ -12569,9 +12567,8 @@ msgstr ""
 msgid "none"
 msgstr "neniu"
 
-#, fuzzy
 msgid "Small"
-msgstr "Retadreso"
+msgstr "Malgranda"
 
 msgid "Smaller versions of the default smilies"
 msgstr ""
@@ -12615,6 +12612,64 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+msgid "Server name request"
+msgstr ""
+
+msgid "Enter an XMPP Server"
+msgstr "Enigu XMPP Servilon"
+
+msgid "Select an XMPP server to query"
+msgstr "Elektu XMPP servilon petendan"
+
+msgid "Find Services"
+msgstr "Trovu Servojn"
+
+msgid "Add to Buddy List"
+msgstr "Aldoni al Kunulliston"
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Directory"
+msgstr "Dosierujo"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Priskibo:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Servo Malkovrado"
+
+msgid "_Browse"
+msgstr "_Retumilo"
+
+msgid "Server does not exist"
+msgstr "Servilo ne ekzistas"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP Servo Malkovrado"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "Kunul senokupas"
 
@@ -12856,9 +12911,8 @@ msgstr ""
 msgid "Please enter the person's information below."
 msgstr ""
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
-msgstr "Bonvolu enigi la kunul ekrannomo kaj kontotipo sube."
+msgstr "Bonvolu enigi la kunul uzantnomon kaj kontotipon sube."
 
 msgid "Account type:"
 msgstr "Konto tipo:"
@@ -12990,7 +13044,7 @@ msgstr "Muzika Mesaĝilo Kromaĵo por kunlaboranta verkado."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "La Muzika Mesaĝilo Kromaĵo ebligas plurajn uzantojn samtempe labori muzikan "
 "pecon redaktante komunan orkestrumon realtempe."
@@ -12999,9 +13053,8 @@ msgstr ""
 msgid "Notify For"
 msgstr "Avizu Por"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "\t_Nur kiam iun diras vian ekran nomon"
+msgstr "\t_Nur kiam iun diras vian uzantnomon"
 
 msgid "_Focused windows"
 msgstr "_Fokusitaj fenestoj"
@@ -13025,18 +13078,16 @@ msgstr "Enmetu nombron de novaj mesaĝoj en _X eco"
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Dinifu fenestrtraktilan \"_URĜANTA\" indikon"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "B_abilfenestroj"
+msgstr ""
 
 #. Raise window method button
 msgid "R_aise conversation window"
 msgstr "Startigu konversacio-fenestron"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "Startigu konversacio-fenestron"
+msgstr "_Nuna konversacio-fenestro"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -13105,22 +13156,18 @@ msgstr ""
 "- Ĝi inversigas ĉiajn enirantan tekston\n"
 "- Ĝi sendas mesaĝon al homoj en via listo tuj kiam ili ensalutas"
 
-msgid "Cursor Color"
-msgstr "Kursoro Koloro"
-
-msgid "Secondary Cursor Color"
-msgstr "Dua Kursoro Koloro"
-
 msgid "Hyperlink Color"
 msgstr "Ligilo Koloro"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "Ligilo Koloro"
+msgstr "Vizitita Ligilo Koloro"
 
 msgid "Highlighted Message Name Color"
 msgstr "Emfazitaj Mesaĝoj Nomo Koloro"
 
+msgid "Typing Notification Color"
+msgstr ""
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13150,35 +13197,21 @@ msgstr "GTK+ Interfaco Tiparo"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Interfaco koloroj"
+msgid "Disable Typing Notification Text"
+msgstr ""
 
-msgid "Widget Sizes"
-msgstr "Fenestraĵo Grandecoj"
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ Etoso Kontrolo Agordoj"
+
+msgid "Colors"
+msgstr "Koloroj"
 
 msgid "Fonts"
 msgstr "Tiparoj"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13213,13 +13246,11 @@ msgstr ""
 msgid "New Version Available"
 msgstr "Nova Versio Disponebla"
 
-#, fuzzy
 msgid "Later"
-msgstr "Dato"
+msgstr "Poste"
 
-#, fuzzy
 msgid "Download Now"
-msgstr "Uzantoj ĉe %s: %s"
+msgstr "Elŝuti Nun"
 
 #. *< type
 #. *< ui_requirement
@@ -13251,20 +13282,18 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "Sendu Al"
+msgstr "Send-Butono"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "Konversacio Fenestroj Kaŝeco"
+msgstr "Konversacio Fenestro Sendo Butono."
 
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13316,6 +13345,96 @@ msgstr "Teksto anstataŭigo"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Anstataŭigu tekston en elirantaj mesaĝoj laŭ uzantodfinitaj reguloj."
 
+msgid "Just logged in"
+msgstr "Ĵus ensalutita"
+
+msgid "Just logged out"
+msgstr "Ĵus elsalutita"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+msgid "Icon for Chat"
+msgstr "Piktogramo por Babilejo"
+
+msgid "Ignored"
+msgstr "Ignorita"
+
+msgid "Founder"
+msgstr ""
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr ""
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr ""
+
+msgid "Authorization dialog"
+msgstr ""
+
+msgid "Error dialog"
+msgstr ""
+
+msgid "Information dialog"
+msgstr ""
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+msgid "Warning dialog"
+msgstr ""
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+msgid "Status Icons"
+msgstr ""
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+msgid "Dialog Icons"
+msgstr ""
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Piĝin Piktogramo Etoso Redaktilo"
+
+msgid "Contact"
+msgstr "Kontakto"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr ""
+
+msgid "Edit Buddylist Theme"
+msgstr ""
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Piĝin Etoso Redaktilo"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Piĝin Etoso Redaktilo."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13473,9 +13592,6 @@ msgstr ""
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr ""
-
 msgid "Windows Pidgin Options"
 msgstr "Vindozaj Piĝinaj Opcioj"
 
@@ -13483,7 +13599,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Opcioj apartaj al Piĝin Vindoza."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13523,6 +13639,209 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Invitation Rejected"
+#~ msgstr "Invito malakceptita"
+
+#~ msgid "_Resume"
+#~ msgstr "_Rekomenci"
+
+#~ msgid "Connection failed."
+#~ msgstr "Konekto malsukcesis."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Servilo diskonektis"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Ne povis konekti al servilo"
+
+#~ msgid "Read error"
+#~ msgstr "Legeraro"
+
+#~ msgid "Write error"
+#~ msgstr "Skriberaro"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Servico Malkovrado Informo"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Multopa Babilejo"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc Komandoj"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "En-Bando Registrado"
+
+#~ msgid "User Location"
+#~ msgstr "Uzanto Loko"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Kunul Stato Avizoj"
+
+#~ msgid "Software Version"
+#~ msgstr "Programo Versio"
+
+#~ msgid "User Mood"
+#~ msgstr "Uzanto Agordo"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Eraj Kapablecoj"
+
+#~ msgid "User Profile"
+#~ msgstr "Uzanto Profilo"
+
+#~ msgid "User Nickname"
+#~ msgstr "Uzanto Karesnomo"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Viva Video"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Mesaĝaj Ricevitaj Konfirmoj"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publika Ŝloŝilo Disdono"
+
+#~ msgid "User Chatting"
+#~ msgstr "Uzanto Babilante"
+
+#~ msgid "User Browsing"
+#~ msgstr "Uzanto Navigante"
+
+#~ msgid "User Gaming"
+#~ msgstr "Uzanto Ludante"
+
+#~ msgid "User Viewing"
+#~ msgstr "Uzanto Rigardante"
+
+#~ msgid "Read Error"
+#~ msgstr "Legeraro"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Malsukcesis konekti servilon."
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Ne povis konekti al servilo: %s (%d)"
+
+#~ msgid "Incorrect password."
+#~ msgstr "Misa pasvorto."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne povis konekti al BOS servilo:\n"
+#~ "%s"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Ne Povas Konekti"
+
+#~ msgid "Connection lost"
+#~ msgstr "Konekto perdita"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Koneto fermita (skribante)"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japanio"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japana Paĝila servilo"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japana dosieralŝuto servilo"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Perdis konekto kun prokura servilo\n"
+#~ "%s"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Konversacio Fenestroj Kaŝeco"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Ŝaltu kiun ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Kursoro Koloro"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Dua Kursoro Koloro"
+
+#~ msgid "Interface colors"
+#~ msgstr "Interfaco koloroj"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Fenestraĵo Grandecoj"
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Ne eblas ricevi MSN Adresaron"
+
+#~ msgid "Failed to send IM."
+#~ msgstr "Malsukcesis sendi tujmesaĝon."
+
+#~ msgid "Failure."
+#~ msgstr "Malsukceso."
+
+#~ msgid "Country not supported."
+#~ msgstr "Lando ne subtenita."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Nekonata ensaluteraro okazis: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Nekonata eraro, %d, okazis.  Informo: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Malvalida Gruponomo"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Konekto Fermita"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Atendante respondon..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC revenis el sia paŭzo. Vi nun povas sendi mesaĝojn denove."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Pasvorto Ŝanĝita Sukcese"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Ricevu Ujan Informon"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Difini Ujan Informon"
+
+#~ msgid "Save As..."
+#~ msgstr "Konservu Kiel..."
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC Protokol-Kromaĵo"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Uzanto informo pri %s nedisponebla"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Opcioj"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Prokurilo Opcioj"
+
+#~ msgid "By log size"
+#~ msgstr "Laŭ protokolo grandeco"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Malfermu Ligilon en Retumilo"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN servilo:"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "Samnomita grupo jam ekzistas."
 
@@ -13532,17 +13851,9 @@ msgstr ""
 #~ msgid "Blood Type"
 #~ msgstr "Sanga Tipo"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Rapideco:"
-
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Malvalida QQ Aspekto"
 
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ Nombro"
-
 #~ msgid "Group Description"
 #~ msgstr "Grupo Priskribo"
 
@@ -13555,38 +13866,15 @@ msgstr ""
 #~ msgid "I am a member"
 #~ msgstr "Mi estas membro"
 
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Malbona Demando"
-
 #~ msgid "Unknown status"
 #~ msgstr "Nekonata stato"
 
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Forigu Grupon"
-
 #~ msgid "Are you sure you want to leave this Qun?"
 #~ msgstr "Ĉu vi certas vi volas forigi tiun Qun?"
 
 #~ msgid "Do you want to approve the request?"
 #~ msgstr "Ĉu vi volas jesi tiun demandon?"
 
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Telefonnumero"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Ŝanĝu uzanto-informon de %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "Sistema Mesaĝo"
 
@@ -13596,50 +13884,6 @@ msgstr ""
 #~ msgid "Block this buddy"
 #~ msgstr "Bloku tiun kunulon"
 
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Erara ŝanĝante pasvorton"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Malsukcesis konekti servilon."
-
-#, fuzzy
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Konekto servilo"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Ĉu vi volas jesi tiun demandon?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Ĉu vi volas aldoni tiun kunul?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s aldonis vin [%s] en sia kunul listo"
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Kunul"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s aldonis vin en sia kunul listo."
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Ĉu vi deziras aldoni ŝlin?"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Servilo pordo"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "%s malkontaktita"
-
 #~ msgid "developer"
 #~ msgstr "programisto"
 
@@ -13747,9 +13991,6 @@ msgstr ""
 #~ "kunullisto. Vi povas laŭ deziro enigi alinomon, aŭ karesnomon, pri la "
 #~ "kunul. La alinomo estos vidigita anstataŭ la erkrana nomo laŭ kaze.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Konto:"
-
 #~ msgid "_Screen name:"
 #~ msgstr "_Ekrannomo:"
 
diff --git a/po/es.po b/po/es.po
index 634936d863..02396ecba4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 # Copyright (c) December 2003, Francisco Javier F. Serrador
 #               <franciscojavier.fernandez.serrador@hispalinux.es>, 2003.
 # Copyright (C) June 2002, April 2003, January 2004, March 2004, September 2004,
-# 	      January 2005, 2006-2008
+# 	      January 2005, 2006-2008, July 2009
 # 		Javier Fernández-Sanguino Peña  <jfs@debian.org>
 #
 # Agradecemos la ayuda de revisión realizada por:
@@ -52,14 +52,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-04 09:58-0500\n"
-"PO-Revision-Date: 2009-01-05 00:05+0100\n"
+"POT-Creation-Date: 2009-07-22 09:57-0400\n"
+"PO-Revision-Date: 2009-08-05 01:47+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-POFile-SpellExtra: gt cian PUFs gg SIP changePassword\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -76,7 +77,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -84,10 +85,8 @@ msgstr ""
 "%s\n"
 "Modo de uso: %s [OPCIÓN]...\n"
 "\n"
-"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de "
-"configuración\n"
-"  -d, --debug          imprimir mensajes de depuración en la salida "
-"estándar\n"
+"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de configuración\n"
+"  -d, --debug          imprimir mensajes de depuración en la salida estándar de error\n"
 "  -h, --help           mostrar este mensaje y salir\n"
 "  -n, --nologin        no conectarse de forma automática\n"
 "  -v, --version        mostrar la versión actual y salir\n"
@@ -659,19 +658,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Enviar a"
 
-msgid "Invite message"
-msgstr "Mensaje de invitacio"
-
-msgid "Invite"
-msgstr "Invitar"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Introduzca el nombre de usuario al que desea invitar,\\n\n"
-"junto con un mensaje de invitación opcional."
-
 msgid "Conversation"
 msgstr "Conversación"
 
@@ -720,8 +706,8 @@ msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
 msgstr ""
-"%s no es una clase de mensajes válida. Consulte «/help msgcolor» para ver "
-"las clases de mensaje válidas."
+"%s no es una clase de mensajes válida. Consulte «/help msgcolor» para ver las "
+"clases de mensaje válidas."
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
@@ -934,6 +920,39 @@ msgstr "Todas las conversaciones"
 msgid "System Log"
 msgstr "Registro del Sistema"
 
+msgid "Calling ... "
+msgstr "Llamando..."
+
+msgid "Hangup"
+msgstr "Colgar"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Aceptar"
+
+msgid "Reject"
+msgstr "Rechazar"
+
+msgid "Call in progress."
+msgstr "Llamada en curso."
+
+msgid "The call has been terminated."
+msgstr "La llamada se ha cancelado."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s desea empezar una sesión de audio contigo."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s está intentando empezar una sesión con vd. con un tipo de medio no soportado."
+
+msgid "You have rejected the call."
+msgstr "Ha rechazado la llamada."
+
+msgid "call: Make an audio call."
+msgstr "llamar: Hacer una llamada de audio."
+
 msgid "Emails"
 msgstr "Correos"
 
@@ -968,6 +987,9 @@ msgstr "Continuar"
 msgid "IM"
 msgstr "MI"
 
+msgid "Invite"
+msgstr "Invitar"
+
 msgid "(none)"
 msgstr "(ninguno)"
 
@@ -1216,7 +1238,6 @@ msgstr "Minutos antes de cambiar el estado"
 msgid "Change status to"
 msgstr "Cambiar estado a"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Conversaciones"
 
@@ -1583,6 +1604,29 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Complemento «Lastlog»."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Obteniendo TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Sólo crear urls de TinyURL cuando sean de esta longitudo o superior"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Prefijo de dirección de TinyURL (u otro)"
+
+msgid "TinyURL"
+msgstr "TiniyURL"
+
+msgid "TinyURL plugin"
+msgstr "Complemento TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "Cuando se reciba un mensaje con URL(s) utilizar TinyURL para facilitar su copia"
+
 msgid "accounts"
 msgstr "cuentas"
 
@@ -1685,13 +1729,6 @@ msgstr "¿Desea aceptar el certificado para %s?"
 msgid "SSL Certificate Verification"
 msgstr "Verificación de certificado SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Aceptar"
-
-msgid "Reject"
-msgstr "Rechazar"
-
 msgid "_View Certificate..."
 msgstr "_Ver certificado..."
 
@@ -1705,6 +1742,7 @@ msgstr ""
 "El certificado presentado por «%s» es autofirmado. No puede comprobarse de "
 "forma automática."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "La cadena de certificados presentada por %s no es válida."
@@ -1714,6 +1752,7 @@ msgstr "La cadena de certificados presentada por %s no es válida."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Error de certificado SSL"
 
@@ -1795,6 +1834,7 @@ msgstr "+++ %s se ha conectado"
 msgid "+++ %s signed off"
 msgstr "+++ %s se ha desconectado"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -1841,6 +1881,17 @@ msgstr "%s ha salido de la sala."
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."
 
+msgid "Invite to chat"
+msgstr "Invitar a un chat"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
+"de invitación opcional."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "No se pudo obtener la conexión: %s"
@@ -1887,6 +1938,7 @@ msgstr ""
 "Error al leer del proceso de resolución:\n"
 "%s"
 
+#, c-format
 msgid "Resolver process exited without answering our request"
 msgstr "El proceso de resolución salió sin responder a su petición"
 
@@ -1973,6 +2025,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Comienza la transferencia de %s de %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Se ha completado la transferencia de <A HREF=\"file://%s\">%s</A>"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Se ha completado la transferencia de %s"
 
@@ -2187,6 +2243,9 @@ msgstr "<font color=\"red\"><b>No se pudo leer el archivo: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMÁTICA>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Error al crear la conferencia."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Está utilizando %s, pero este complemento requiere %s."
@@ -2598,17 +2657,14 @@ msgstr "Incluir otros registros de clientes de MI en el visor de registro."
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Cuando consulte los registros este complemento incluirá registros de otros "
-"clientes de IM. Actualmente, esto incluye a Adium, MSN Messenger y "
-"Trillian.\n"
+"Cuando consulte los registros este complemento incluirá registros de otros clientes de IM. Actualmente, esto incluye a Adium, MSN Messenger, aMSN y Trillian.\n"
 "\n"
-"AVISO: Este complemento aún es código en «alpha» y puede bloquearse con "
-"frecuencia. ¡Uselo bajo su propia responsabilidad!"
+"AVISO: Este complemento aún es código en estado «alpha» y puede bloquearse con frecuencia. ¡Uselo bajo su propia responsabilidad!"
 
 msgid "Mono Plugin Loader"
 msgstr "Cargador de complementos Mono"
@@ -2655,11 +2711,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "Guardar los mensajes enviados como un aviso."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"El resto de los mensajes se guardarán como un aviso. Puede editar y eliminar "
-"los avisos en el diálogo «Aviso de amigo»."
+msgstr "El resto de los mensajes se guardarán como avisos. Puede editar y eliminar los avisos en el diálogo «Aviso de amigo»."
 
 #, c-format
 msgid ""
@@ -2687,6 +2741,33 @@ msgstr "Guardar los mensajes de desconexión como un aviso"
 msgid "Do not ask. Always save in pounce."
 msgstr "No preguntar. Siempre guardar como un aviso."
 
+msgid "One Time Password"
+msgstr "Contraseña de un solo uso"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Soporte de contraseñas de un solo uso"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Obligar a que las contraseñas sólo se utilicen una vez."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Permite obligar, en cada cuenta de forma independiente, que sólo se utilicen una vez las contraseñas no guardadas usadas en una conexión con éxito.\n"
+"Nota: Para que ésto funcione no debe guardarse la contraseña de la cuenta."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2882,15 +2963,12 @@ msgstr ""
 "http://www.activestate.com si desea utilizar los complementos TCL\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
-msgstr ""
-"No se encontró el conjunto de herramientas Apple Bonjour para Windows. Para "
-"más información consulte las preguntas frecuentas (FAQ) en http://d.pidgin."
-"im/wiki/BonjourWindows."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr "No se encontró el conjunto de herramientas Apple «Bonjour para Windows». Para más información consulte en http://d.pidgin.im/wiki/BonjourWindows."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "No se pudieron escuchar las conexiones MI entrantes\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "No se pudieron escuchar las conexiones MI entrantes"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2898,7 +2976,6 @@ msgstr ""
 "No se pudo establecer una conexión con el servidor mDNS local. ¿Está "
 "arrancado?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Nombre:"
 
@@ -2930,6 +3007,10 @@ msgstr "Complemento de protocolo Bonjour"
 msgid "Purple Person"
 msgstr "Persona morada"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "Puerto local"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2940,14 +3021,17 @@ msgstr "%s ha cerrado la conversación."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No se pudo enviar el mensaje, no se pudo iniciar la conversación."
 
-msgid "Cannot open socket"
-msgstr "No se pudo abrir el socket"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "No se pudo crear el socket: %s"
 
-msgid "Could not bind socket to port"
-msgstr "No se pudo vincular el socket al puerto"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "No se pudo vincular el socket al puerto: %s"
 
-msgid "Could not listen on socket"
-msgstr "No se pudo escuchar en el socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "No se pudo escuchar el socket: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Error comunicándose con el servicio «mDNSResponder» local."
@@ -2997,14 +3081,14 @@ msgstr "Guardar lista de amigos..."
 msgid "Load buddylist from file..."
 msgstr "Cargar la lista de amigos desde archivo..."
 
-msgid "Fill in the registration fields."
-msgstr "Rellene los campos de registro."
+msgid "You must fill in all registration fields"
+msgstr "Debe rellenar todos los campos de registro."
 
-msgid "Passwords do not match."
-msgstr "Las contraseñas no coinciden."
+msgid "Passwords do not match"
+msgstr "Las contraseñas no coinciden"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "No se pudo registrar la cuenta nueva. Se produjo un error.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "No se pudo registrar la nueva cuenta. Se produjo un error desconocido."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Se ha registrado una nueva cuenta Gadu-Gadu"
@@ -3015,14 +3099,14 @@ msgstr "¡Se completó el registro con éxito!"
 msgid "Password"
 msgstr "Contraseña"
 
-msgid "Password (retype)"
-msgstr "Contraseña (escribir de nuevo)"
+msgid "Password (again)"
+msgstr "Contraseña (de nuevo)"
 
-msgid "Enter current token"
-msgstr "Introduzca el token actual"
+msgid "Enter captcha text"
+msgstr "Introducir texto del captcha"
 
-msgid "Current token"
-msgstr "Token actual"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrando cuenta nueva de Gadu-Gadu"
@@ -3075,6 +3159,15 @@ msgstr "¡Se cambió con éxito la contraseña!"
 msgid "Current password"
 msgstr "Contraseña actual"
 
+msgid "Password (retype)"
+msgstr "Contraseña (escribir de nuevo)"
+
+msgid "Enter current token"
+msgstr "Introduzca el token actual"
+
+msgid "Current token"
+msgstr "Token actual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduzca su contraseña actual y la contraseña nueva para UIN: "
 
@@ -3088,6 +3181,7 @@ msgstr "Seleccione un chat para el amigo: %s"
 msgid "Add to chat..."
 msgstr "Añadir al chat"
 
+#. Global
 msgid "Available"
 msgstr "Disponible"
 
@@ -3121,8 +3215,8 @@ msgstr "No se encontraron usuarios que coincidan"
 msgid "There are no users matching your search criteria."
 msgstr "No hay usuarios que coincidan con sus criterios de búsqueda."
 
-msgid "Unable to read socket"
-msgstr "No se pudo leer el socket"
+msgid "Unable to read from socket"
+msgstr "No se pudo leer del socket"
 
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos descargada"
@@ -3136,8 +3230,14 @@ msgstr "Lista de amigos exportada"
 msgid "Your buddy list was stored on the server."
 msgstr "Su lista de amigos fue almacenada en el servidor."
 
-msgid "Connection failed."
-msgstr "Falló la conexión."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Conectado"
+
+msgid "Connection failed"
+msgstr "Falló la conexión"
 
 msgid "Add to chat"
 msgstr "Añadir al chat"
@@ -3145,14 +3245,23 @@ msgstr "Añadir al chat"
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "No se pudo resolver el nombre del servidor '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Conectando"
+
 msgid "Chat error"
 msgstr "Error de chat"
 
 msgid "This chat name is already in use"
 msgstr "Ya existe un chat con ese nombre"
 
-msgid "Not connected to the server."
-msgstr "No está conectado al servidor."
+msgid "Not connected to the server"
+msgstr "No está conectado al servidor"
 
 msgid "Find buddies..."
 msgstr "Encontrar amigos... "
@@ -3193,6 +3302,9 @@ msgstr "Mensajería instantánea polaca muy popular"
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
+msgid "GG server"
+msgstr "Servidor GG"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
@@ -3207,8 +3319,8 @@ msgstr "No hay tema establecido"
 msgid "File Transfer Failed"
 msgstr "Falló la transferencia de archivos"
 
-msgid "Could not open a listening port."
-msgstr "No se pudo abrir un puerto de escucha."
+msgid "Unable to open a listening port."
+msgstr "No se pudo abrir un puerto para la escucha."
 
 msgid "Error displaying MOTD"
 msgstr "Error al mostrar el MOTD"
@@ -3223,8 +3335,16 @@ msgstr "No hay MOTD asociado con esta conexión."
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-msgid "Server has disconnected"
-msgstr "El servidor se ha desconectado"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Se perdió la conexión con el servidor: %s"
 
 msgid "View MOTD"
 msgstr "Ver MOTD"
@@ -3235,25 +3355,23 @@ msgstr "_Canal:"
 msgid "_Password:"
 msgstr "Contra_seña:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "Los apodos de IRC no pueden tener espacios en blanco"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Conectando"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "Los apodos y servidores de IRC no pueden tener espacios en blanco"
 
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
 
-msgid "Couldn't create socket"
-msgstr "No se pudo crear el socket"
+msgid "Unable to connect"
+msgstr "No se pudo conectar"
 
-msgid "Couldn't connect to host"
-msgstr "No se pudo conectar al servidor"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "No se pudo conectar: %s"
 
-msgid "Read error"
-msgstr "Error de lectura"
+#, c-format
+msgid "Server closed the connection"
+msgstr "El servidor ha cerrado la conexión"
 
 msgid "Users"
 msgstr "Usuarios"
@@ -3424,9 +3542,7 @@ msgstr "Apodo inválido"
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr ""
-"El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
-"incluya caracteres inválidos."
+msgstr "El servidor rechazó el apodo que escogió para su cuenta. Es posible que incluya caracteres inválidos."
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
@@ -3435,6 +3551,16 @@ msgstr ""
 "El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
 "incluya caracteres inválidos."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Ya se está utilizando el apodo \"%s\"."
+
+msgid "Nickname in use"
+msgstr "Apodo en uso"
+
 msgid "Cannot change nick"
 msgstr "No se puede cambiar el alias"
 
@@ -3675,11 +3801,10 @@ msgstr "Falló la orden ad-hoc"
 msgid "execute"
 msgstr "ejecutar"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"El servidor requiere SSL para conectarse. No se dispone de soporte TLS/SSL."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "El servidor requiere TLS/SSL, pero no se ha encontrado soporte para TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Vd. solicita cifrado, pero no se dispone de soporte TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3696,17 +3821,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticación en claro"
 
-msgid "Invalid response from server."
-msgstr "Respuesta inválida del servidor."
+msgid "SASL authentication failed"
+msgstr "Falló la autenticación SASL"
+
+msgid "Invalid response from server"
+msgstr "Respuesta inválida del servidor"
 
 msgid "Server does not use any supported authentication method"
 msgstr "El servidor no usa un método de autenticación conocido"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Necesita cifrado, pero no está disponible esa opción en este servidor."
+
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido del servidor"
 
-msgid "SASL error"
-msgstr "Error de SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Error de SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "El gestor de conexiones BOSH terminó su sesión."
+
+msgid "No session ID given"
+msgstr "No se ha obtenido un ID de sesión"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Versión del protocolo BOSH no soportada"
+
+msgid "Unable to establish a connection with the server"
+msgstr "No se pudo establecer una conexión con el servidor"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "No se pudo establecer una conexión con el servidor: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "No se pudo establecer una conexión SSL"
 
 msgid "Full Name"
 msgstr "Nombre completo"
@@ -3774,159 +3925,8 @@ msgstr "Cliente"
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-msgid "Last Activity"
-msgstr "Última actividad"
-
-msgid "Service Discovery Info"
-msgstr "Información de descubrimiento de servicio"
-
-msgid "Service Discovery Items"
-msgstr "Elementos de descubrimiento de servicio"
-
-msgid "Extended Stanza Addressing"
-msgstr "Dirección de grupo extendida"
-
-msgid "Multi-User Chat"
-msgstr "Chat multiusuario"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Información de presencia extendida en chat multiusuario"
-
-msgid "In-Band Bytestreams"
-msgstr "Flujos de bytes en banda"
-
-msgid "Ad-Hoc Commands"
-msgstr "Órdenes ad-hoc"
-
-msgid "PubSub Service"
-msgstr "Servicio PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Flujos de bytes SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Datos fuera de banda"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Registro en línea"
-
-msgid "User Location"
-msgstr "Ubicación del usuario"
-
-msgid "User Avatar"
-msgstr "Avatar del usuario"
-
-msgid "Chat State Notifications"
-msgstr "Notificaciones de estado de chat"
-
-msgid "Software Version"
-msgstr "Versión del programa"
-
-msgid "Stream Initiation"
-msgstr "Origen del flujo"
-
-msgid "File Transfer"
-msgstr "Transferencia de archivo"
-
-msgid "User Mood"
-msgstr "Estado de ánimo del usuario"
-
-msgid "User Activity"
-msgstr "Actividad de usuario"
-
-msgid "Entity Capabilities"
-msgstr "Capacidades de la entidad"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negociaciones de sesiones cifradas"
-
-msgid "User Tune"
-msgstr "Música del usuario"
-
-msgid "Roster Item Exchange"
-msgstr "Intercambio de elementos de la lista"
-
-msgid "Reachability Address"
-msgstr "Dirección alcanzable"
-
-msgid "User Profile"
-msgstr "Perfil de usuario"
-
-# JFS: Jingle es un protocolo de transporte, no se traduce
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Audio Jingle"
-
-msgid "User Nickname"
-msgstr "Nombre de usuario"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle UDP en crudo"
-
-msgid "Jingle Video"
-msgstr "Vídeo Jingle"
-
-msgid "Jingle DTMF"
-msgstr "DTMF Jingle"
-
-msgid "Message Receipts"
-msgstr "Recibos de mensajes"
-
-msgid "Public Key Publishing"
-msgstr "Publicación de la clave pública"
-
-msgid "User Chatting"
-msgstr "Chatear con usuarios"
-
-msgid "User Browsing"
-msgstr "Navegar usuarios"
-
-msgid "User Gaming"
-msgstr "Jugar con usuarios"
-
-msgid "User Viewing"
-msgstr "Ver usuarios"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Cifrado de grupo"
-
-msgid "Entity Time"
-msgstr "Tiempo de entidad"
-
-msgid "Delayed Delivery"
-msgstr "Envío con demora"
-
-msgid "Collaborative Data Objects"
-msgstr "Objetods de datos colaborativos"
-
-msgid "File Repository and Sharing"
-msgstr "Repositorio de archivos y compartición"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Servidor de descubrimiento STUN para Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociación de sesión cifrada simplificada"
-
-msgid "Hop Check"
-msgstr "Comprobación de saltos"
-
-msgid "Capabilities"
-msgstr "Capacidades"
+msgid "Local Time"
+msgstr "Hora local:"
 
 msgid "Priority"
 msgstr "Prioridad"
@@ -3934,6 +3934,13 @@ msgstr "Prioridad"
 msgid "Resource"
 msgstr "Recurso"
 
+#, c-format
+msgid "%s ago"
+msgstr "hace %s"
+
+msgid "Logged Off"
+msgstr "Desconectado"
+
 msgid "Middle Name"
 msgstr "Nombre medio"
 
@@ -4102,28 +4109,22 @@ msgstr "Selecciona un servidor de conferencias al que consultar"
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Necesita cifrado, pero no está disponible esa opción en este servidor."
+msgid "Affiliations:"
+msgstr "Afiliaciones:"
 
-msgid "Write error"
-msgstr "Error de escritura"
+msgid "No users found"
+msgstr "No se encontraron usuarios"
 
-msgid "Ping timeout"
-msgstr "Tiempo de expiración del ping"
+msgid "Roles:"
+msgstr "Roles:"
 
-msgid "Read Error"
-msgstr "Error de lectura"
+msgid "Ping timed out"
+msgstr "Expiró el «ping»"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"No se pudo establecer una conexión con el servidor:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "No se pudo crear el socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
+msgstr "No se pudo encontrar un método de conexión XMPP alternativo después de intentar conectar directamente sin éxito."
 
 msgid "Invalid XMPP ID"
 msgstr "XMPP ID no válido"
@@ -4131,6 +4132,9 @@ msgstr "XMPP ID no válido"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID inválido. Debe establecerse el dominio."
 
+msgid "Malformed BOSH URL"
+msgstr "URL BOSH malformada"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con éxito"
@@ -4155,9 +4159,6 @@ msgstr "Éxito en el deregistro"
 msgid "Unregistration Failed"
 msgstr "Falló el deregistro"
 
-msgid "Already Registered"
-msgstr "Ya está registrado"
-
 msgid "State"
 msgstr "Estado"
 
@@ -4170,6 +4171,9 @@ msgstr "Teléfono"
 msgid "Date"
 msgstr "Fecha"
 
+msgid "Already Registered"
+msgstr "Ya está registrado"
+
 msgid "Unregister"
 msgstr "Deregistrar"
 
@@ -4225,6 +4229,12 @@ msgstr "El servidor no soporta bloqueos"
 msgid "Not Authorized"
 msgstr "No autorizado"
 
+msgid "Mood"
+msgstr "Estado de ánimo"
+
+msgid "Now Listening"
+msgstr "Escuchando ahora"
+
 msgid "Both"
 msgstr "Ambos"
 
@@ -4246,12 +4256,6 @@ msgstr "Ninguno"
 msgid "Subscription"
 msgstr "Subscripción"
 
-msgid "Mood"
-msgstr "Estado de ánimo"
-
-msgid "Now Listening"
-msgstr "Escuchando ahora"
-
 msgid "Mood Text"
 msgstr "Texto de estado de ánimo"
 
@@ -4294,9 +4298,6 @@ msgstr "Su contraseña ha sido modificada."
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseña"
 
-msgid "Password (again)"
-msgstr "Contraseña (de nuevo)"
-
 msgid "Change XMPP Password"
 msgstr "Cambiar contraseña XMPP"
 
@@ -4490,18 +4491,22 @@ msgid "Unable to ping user %s"
 msgstr "No puede hacer un ping al usuario %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "No se pudo dar el codazo porque no se sabe nada del usuario %s."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "No se pudo dar el codazo, porque no se sabe nada de %s."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
-"No se pudo dar el codazo porque puede que el usuario %s esté desconectado."
+msgid "Unable to buzz, because %s might be offline."
+msgstr "No se pudo dar el codazo, puede que %s esté desconectado."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr ""
-"No se pudo dar un codazo porque el usuario %s no tiene soporte para ello."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr "No se pudo dar un codazo, puede que %s no tenga soporte para ello o no desea recibir codazos ahora."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Dando un codazo a %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4513,8 +4518,31 @@ msgid "%s has buzzed you!"
 msgstr "¡%s le ha dado un codazo!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Dando un codazo a %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "No se pudo enviar el medio a %s: JID inválido"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "No se pudo enviar el medio a %s: el usuario no está conectado"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "No se pudo enviar el medio a %s: no está suscrito a la presencia del usuario"
+
+msgid "Media Initiation Failed"
+msgstr "Falló la inicialización del medio"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Elija el recurso de %s con el que quiere comenzar un intercambio de medio"
+
+msgid "Select a Resource"
+msgstr "Seleccione un recurso"
+
+msgid "Initiate Media"
+msgstr "Iniciar medio"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
@@ -4535,18 +4563,14 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [razón]:  Echar a un usuario de la sala."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-"affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: definir "
-"la afiliación de un usuario a la sala."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
+msgstr "affiliate &lt;owner|admin|member|outcast|none&gt; [alias1] [alias2] ...: Obtener los usuarios con una afiliación o fijar la afiliación de un usuario a la sala."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-"rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el "
-"rol de un usuario en la sala."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
+msgstr "role &lt;moderator|participant|visitor|none&gt; [alias1] [alias2] ...: Obtener los usuarios con un rol o definir el rol de un usuario en la sala."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaje]:  Invitar a un usuario a la sala."
@@ -4588,10 +4612,10 @@ msgid "Domain"
 msgstr "Dominio"
 
 msgid "Require SSL/TLS"
-msgstr "Requiere SSL/TLS"
+msgstr "Requerir cifrado SSL/TLS"
 
 msgid "Force old (port 5223) SSL"
-msgstr "Forzar SSL antiguo (puerto 5323)"
+msgstr "Forzar el uso de cifrado SSL antiguo (puerto 5223)"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"
@@ -4608,6 +4632,9 @@ msgstr "Conectar con el servidor"
 msgid "File transfer proxies"
 msgstr "Pasarelas de transferencia de archivos"
 
+msgid "BOSH URL"
+msgstr "URL BOSH"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4646,6 +4673,14 @@ msgstr "Error de tratamiento XML"
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error al unirse al chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error en el chat %s"
+
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
@@ -4662,13 +4697,28 @@ msgstr "_Configurar sala"
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisión"
 
+msgid "No reason"
+msgstr "No hay razón"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Error al unirse al chat %s"
+msgid "You have been kicked: (%s)"
+msgstr "Ha sido expulsado: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Error en el chat %s"
+msgid "Kicked (%s)"
+msgstr "Expulsado (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Se produjo un error en la transferencia de flujos de bytes en banda\n"
+
+msgid "Transfer was closed."
+msgstr "Se cerró la transferencia."
+
+msgid "Failed to open the file"
+msgstr "No se pudo abrir el archivo"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Fallo al abrir un flujo de bytes en banda"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4697,9 +4747,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Elija el recurso de %s al que quiera enviar un archivo"
 
-msgid "Select a Resource"
-msgstr "Seleccione un recurso"
-
 msgid "Edit User Mood"
 msgstr "Editar estados de ánimo del usuario"
 
@@ -4734,9 +4781,6 @@ msgstr "Acciones"
 msgid "Select an action"
 msgstr "Seleccione una acción"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "No se pudo obtener el libro de direcciones de MSN"
-
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
@@ -4770,169 +4814,222 @@ msgstr ""
 "%s está en la lista local pero no está en la lista del servidor. ¿Desea "
 "añadir a este amigo?"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "No se pudo interpretar el mensaje"
 
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Error de sintaxis (probablemente un error del cliente)"
 
+#, c-format
 msgid "Invalid email address"
 msgstr "Dirección de correo electrónico inválida"
 
+#, c-format
 msgid "User does not exist"
 msgstr "El usuario no existe"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Falta un nombre de dominio totalmente cualificado"
 
+#, c-format
 msgid "Already logged in"
 msgstr "Ya está conectado"
 
+#, c-format
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Nombre de amigo no válido"
 
+#, c-format
 msgid "List full"
 msgstr "Lista llena"
 
+#, c-format
 msgid "Already there"
 msgstr "Ya está en lista"
 
+#, c-format
 msgid "Not on list"
 msgstr "No está en la lista"
 
+#, c-format
 msgid "User is offline"
 msgstr "El usuario no está conectado"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "Ya está en ese modo"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "Ya está en la lista contraria"
 
+#, c-format
 msgid "Too many groups"
 msgstr "Demasiados grupos"
 
+#, c-format
 msgid "Invalid group"
 msgstr "Grupo inválido"
 
+#, c-format
 msgid "User not in group"
 msgstr "El usuario no está en el grupo"
 
+#, c-format
 msgid "Group name too long"
 msgstr "Nombre de grupo demasiado largo"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "No se puede eliminar el grupo cero"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Intentó añadir un contacto a un grupo que no existe"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "Falló el servidor Switchboard"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Falló la notificación de la transferencia"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "Faltan campos obligatorios"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Demasiados resultados de un FND"
 
+#, c-format
 msgid "Not logged in"
 msgstr "No ha iniciado sesión"
 
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Servicio no disponible temporalmente"
 
+#, c-format
 msgid "Database server error"
 msgstr "Error del servidor de base de datos"
 
+#, c-format
 msgid "Command disabled"
 msgstr "Orden deshabilitada"
 
+#, c-format
 msgid "File operation error"
 msgstr "Error de operación de archivos"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "Error al asignar memoria"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Valor CHL erróneo enviado al servidor"
 
+#, c-format
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "Servidor no disponible"
 
 # «Peer» no tiene una traducción fácil, he elegido 'pares' (de par, o igual)
 # Acepto otras alternativas (pero no dejarlo igual) jfs.
+#, c-format
 msgid "Peer notification server down"
 msgstr "Servidor de notificación de pares caído"
 
+#, c-format
 msgid "Database connect error"
 msgstr "Error de conexión con la base de datos"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "El servidor está apagándose (Sálvese quien pueda)"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "Error al crear la conexión"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Los parámetros CVR no se conocen o no están permitidos"
 
+#, c-format
 msgid "Unable to write"
 msgstr "No se pudo escribir"
 
 # En verdad traduje el error como figura en
 # "http://www.hypothetic.org/docs/msn/basics.php" -NL.
+#, c-format
 msgid "Session overload"
 msgstr "Sobrecarga de sesión"
 
+#, c-format
 msgid "User is too active"
 msgstr "El usuario está demasiado activo"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "Demasiadas sesiones"
 
+#, c-format
 msgid "Passport not verified"
 msgstr "Pasaporte no verificado"
 
+#, c-format
 msgid "Bad friend file"
 msgstr "Fichero de amigos incorrecto"
 
+#, c-format
 msgid "Not expected"
 msgstr "No se esperaba"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Los nombres de amigos cambian demasiado rápido"
 
+#, c-format
 msgid "Server too busy"
 msgstr "Servidor muy ocupado"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "No puede mandar mensajes fuera de línea"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "No se aceptan usuarios nuevos"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Pasaporte de menores sin consentimiento paterno"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Cuenta Passport no verificada aún"
 
 msgid "Passport account suspended"
 msgstr "Cuenta Passport suspendida"
 
+#, c-format
 msgid "Bad ticket"
 msgstr "Ticket erróneo"
 
@@ -4950,6 +5047,26 @@ msgstr "Otros contactos"
 msgid "Non-IM Contacts"
 msgstr "Contacto no MI"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s le envío un guiño. <a href='msn-wink://%s'>Pulse aquí para reproducirlo</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s le envío un guiño, pero no pudo salvarse"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s le envío un mensaje de voz. <a href='audio://%s'>Pulse aquí para escucharlo</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s le ha enviado un mensaje de voz, pero no pudo salvarse"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s le ha enviado una invitación de chat de voz, pero no está aún no soportado."
+
 msgid "Nudge"
 msgstr "Codazo"
 
@@ -5104,8 +5221,26 @@ msgstr ""
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada."
 
-msgid "Failed to connect to server."
-msgstr "No se pudo conectar al servidor."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr "No se pudo añadir al amigo %s porque el nombre de usuario no es válido. Los nombres de usuario deben ser direcciones de correo válidas."
+
+msgid "Unable to Add"
+msgstr "No se pudo añadir"
+
+msgid "Authorization Request Message:"
+msgstr "Mensaje de solicitud de autorización:"
+
+msgid "Please authorize me!"
+msgstr "¡Por favor, autoríceme!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Aceptar"
 
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
@@ -5298,63 +5433,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticación Windows Live ID: Respuestas inválida"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s no es un nombre de grupo válido."
-
-msgid "Unknown error."
-msgstr "Error desconocido."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s en %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "¡%s le acaba de dar un codazo!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Error desconocido (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Error desconocido (%d): %s"
 
 msgid "Unable to add user"
 msgstr "No puede añadir al usuario"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Los usuarios indicados a continuación no están en su agenda"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "No se pudo añadir al usuario a %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "No puede expulsar al usuario en %s (%s)"
-
+#. Unknown error!
 #, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "No se pudo invitar al usuario a %s (%s)."
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "No se pudo añadir a %s porque su lista de amigos está llena."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s no es un nombre de cuenta «passport» válida."
+msgid "Unknown error (%d)"
+msgstr "Error desconocido (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Servicio no disponible temporalmente."
+msgid "The following users are missing from your addressbook"
+msgstr "Los usuarios indicados a continuación no están en su agenda"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "No se pudo enviar el mensaje al móvil porque es demasiado largo."
 
-msgid "Unable to rename group"
-msgstr "No se pudo cambiar el nombre del grupo"
-
-msgid "Unable to delete group"
-msgstr "No se pudo borrar el grupo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5404,9 +5503,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
 
-msgid "Unable to connect"
-msgstr "No se pudo conectar"
-
 msgid "Writing error"
 msgstr "Error de escritura"
 
@@ -5421,22 +5517,22 @@ msgstr ""
 "Error de conexión del servidor %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "El servidor no soporta nuestro protocolo."
+msgid "Our protocol is not supported by the server"
+msgstr "El servidor no soporta nuestro protocolo"
 
-msgid "Error parsing HTTP."
-msgstr "Error en el análisis HTTP."
+msgid "Error parsing HTTP"
+msgstr "Error en el análisis HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Ha conectado desde otra ubicación."
+msgid "You have signed on from another location"
+msgstr "Se ha conectado desde otra ubicación"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "Los servidores de MSN van a sufrir un apagado temporal."
+msgid "The MSN servers are going down temporarily"
+msgstr "Los servidores de MSN van a sufrir un apagado temporal"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5466,6 +5562,16 @@ msgstr "Enviando cookie"
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s le ha enviado una invitación para utilizar la webcam, algo aún no soportado"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s le ha enviado una invitación para utilizar la webcam, algo aún no "
+"soportado."
+
 msgid "Away From Computer"
 msgstr "Ausente"
 
@@ -5508,14 +5614,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "El usuario %s lo ha añadido a su lista de amigos."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "El usuario %s lo ha quitado de su lista de amigos."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "¿Desea borrar al amigo de su agenda?"
 
@@ -5545,6 +5643,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s no es un nombre de grupo válido."
+
+msgid "Unknown error."
+msgstr "Error desconocido."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s en %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "No se pudo añadir al usuario a %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "No puede expulsar al usuario en %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "No se pudo invitar al usuario a %s (%s)."
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "No se pudo añadir a %s porque su lista de amigos está llena."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s no es un nombre de cuenta «passport» válida."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Servicio no disponible temporalmente."
+
+msgid "Unable to rename group"
+msgstr "No se pudo cambiar el nombre del grupo"
+
+msgid "Unable to delete group"
+msgstr "No se pudo borrar el grupo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "El usuario %s lo ha añadido a su lista de amigos."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "El usuario %s lo ha quitado de su lista de amigos."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "No existe el usuario: %s"
 
@@ -5573,6 +5719,8 @@ msgid "Lost connection with server"
 msgstr "Se ha perdido la conexión con el servidor"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Mensajes de correo nuevos"
 
@@ -5611,27 +5759,19 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Añadir contactos del servidor"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Conectado"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Error de prótocolo, código %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
-msgstr ""
-"%s, su contraseña es de %d caracteres, esto es más de la longitud máxima "
-"esperada (%d) para MySpaceIM. Reduzca el tamaño de su contraseña en «http://"
-"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword» "
-"e inténtelo de nuevo."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr "%s, su contraseña es de %zu caracteres, esto es más de la longitud máxima esperada (%d). Reduzca el tamaño de su contraseña en «http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword» e inténtelo de nuevo."
+
+msgid "Incorrect username or password"
+msgstr "Nombre de usuario o contraseña incorrecta"
 
 msgid "MySpaceIM Error"
 msgstr "Error MySpaceIM"
@@ -5639,16 +5779,6 @@ msgstr "Error MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Condición de entrada inválida"
 
-msgid "Read buffer full (2)"
-msgstr "Cola de lectura llena (2)"
-
-msgid "Unparseable message"
-msgstr "No se pudo interpretar el mensaje"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "No se pudo conectar al servidor: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "No se pudo añadir al amigo"
 
@@ -5734,6 +5864,12 @@ msgstr "Amigos en total"
 msgid "Client Version"
 msgstr "Versión del cliente"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr "Se produjo un error al intentar fijar el nombre de usuario. Inténtelo de nuevo o vaya a «http://editprofile.myspace.com/index.cfm?fuseaction=profile.username» para fijar su nombre de usuario."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nombre de usuario disponible"
 
@@ -5950,9 +6086,6 @@ msgstr "No se puede añadir uno mismo"
 msgid "Master archive is misconfigured"
 msgstr "El archivo maestro no está bien configurado"
 
-msgid "Incorrect username or password"
-msgstr "Nombre de usuario o contraseña incorrecta"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "No se reconoció el servidor del nombre de usuario que introdujo"
 
@@ -5996,8 +6129,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Error desconocido: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Fallo en la conexión (%s)."
+msgid "Unable to login: %s"
+msgstr "No pudo conectarse: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6102,9 +6235,6 @@ msgstr "Conferencia GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-msgid "Unable to connect to server."
-msgstr "No se pudo conectar al servidor."
-
 msgid "Waiting for response..."
 msgstr "Esperando respuesta..."
 
@@ -6128,10 +6258,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "¿Desea unirse a la conversación?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Ha sido desconectado porque se ha conectado desde otra estación de trabajo."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6140,14 +6266,9 @@ msgstr ""
 "enviar."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-"No se pudo contactar con el servidor. Por favor, indique la dirección del "
-"servidor con el que desea conectarse."
-
-msgid "Error. SSL support is not installed."
-msgstr "Error. El soporte de SSL no está instalado."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr "No se pudo conectar con el servidor. Por favor, indique la dirección del servidor con el que desea conectarse."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Se ha cerrado esta conferencia. No se pueden enviar más mensajes."
@@ -6171,25 +6292,33 @@ msgstr "Dirección del servidor"
 msgid "Server port"
 msgstr "Puerto del servidor"
 
+msgid "Received unexpected response from "
+msgstr "Se recibió una respuesta que no se esperaba de "
+
+#. username connecting too frequently
+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 ""
+"Se ha conectado y desconectado demasiadas veces. Espere diez minutos e "
+"inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
+"tiempo."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Error al solicitar "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL no permite que su nombre de usuario se autentique aquí"
+
 msgid "Could not join chat room"
 msgstr "No se pudo conectar a la sala de chat"
 
 msgid "Invalid chat room name"
 msgstr "Nombre de sala de chat inválida"
 
-msgid "Server closed the connection."
-msgstr "El servidor ha cerrado la conexión."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Se perdió la conexión con el servidor:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Se recibieron datos inválidos al conectarse al servidor."
+msgid "Received invalid data on connection with server"
+msgstr "Se recibieron datos inválidos al conectarse al servidor"
 
 #. *< type
 #. *< ui_requirement
@@ -6236,7 +6365,7 @@ msgstr "Se perdió la conexión con el usuario remoto:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Se recibieron datos inválidos en la conexión con el usuario remoto."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "No se pudo establecer una conexión con el usuario remoto."
 
 msgid "Direct IM established"
@@ -6400,7 +6529,7 @@ msgid "Security Enabled"
 msgstr "Seguridad activada"
 
 msgid "Video Chat"
-msgstr "Video chat"
+msgstr "Vídeo chat"
 
 msgid "iChat AV"
 msgstr "iChat AV"
@@ -6439,20 +6568,12 @@ msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"No se pudo conectar al servidor de autenticación:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "No se pudo conectar al servidor de autenticación: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"No se pudo conectar al servidor BOS:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "No se pudo conectar al servidor BOS: %s"
 
 msgid "Username sent"
 msgstr "Nombre de usuario enviado"
@@ -6466,56 +6587,54 @@ msgstr "Terminando la conexión"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Incapaz de registrarse: No pudo conectarse como %s porque el nombre de "
-"usuario no es válido. Los nombres de usuario deben ser direcciones de correo "
-"válidas, o empezar con una letra y sólo pueden contener letras, números y "
-"espacios, o contener sólo números."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr "Incapaz de registrarse como %s porque el nombre de usuario no es válido. Los nombres de usuario deben ser direcciones de correo válidas, o empezar con una letra y sólo pueden contener letras, números y espacios, o contener sólo números."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Nombre de usuario no válido."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Quizá sea desconectado en breve.  Si sucede esto, consulte %s para ver las actualizaciones disponibles."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "No se pudo obtener un «hash» de conexión a AIM válido."
+
+msgid "Unable to get a valid login hash."
+msgstr "No se pudo un «hash» de conexión válido."
+
+msgid "Received authorization"
+msgstr "Se recibió la autorización"
 
-msgid "Incorrect password."
-msgstr "Contraseña incorrecta."
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "El nombre de usuario no existe"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Su cuenta está deshabilitada actualmente."
+msgid "Your account is currently suspended"
+msgstr "Su cuenta está deshabilitada actualmente"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Se ha conectado y desconectado demasiadas veces. Espere diez minutos e "
-"inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
-"tiempo."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versión del cliente que usa es demasiado antigua. Por favor, actualícela "
 "en %s"
 
-msgid "Could Not Connect"
-msgstr "No se pudo conectar"
-
-msgid "Received authorization"
-msgstr "Se recibió la autorización"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr "Se ha conectado y desconectado demasiadas veces. Espere un minuto e inténtelo de nuevo. Si sigue intentándolo ahora, necesitará esperar incluso más tiempo."
 
-msgid "The SecurID key entered is invalid."
-msgstr "La clave SecurID que se ha introducido no es válida."
+msgid "The SecurID key entered is invalid"
+msgstr "La clave SecurID introducida no es válida"
 
 msgid "Enter SecurID"
 msgstr "Introduzca SecurID"
@@ -6523,30 +6642,6 @@ msgstr "Introduzca SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduzca el dígito de seis números que aparece en la pantalla."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_Aceptar"
-
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
-"resuelva.  Compruebe %s para novedades."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "No se pudo obtener un «hash» de conexión a AIM válido."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Quizá sea desconectado en breve.  Compruebe %s para novedades."
-
-msgid "Unable to get a valid login hash."
-msgstr "No se pudo un «hash» de conexión válido."
-
 msgid "Password sent"
 msgstr "Contraseña enviada"
 
@@ -6556,12 +6651,6 @@ msgstr "No se pudo inicializar la conexión"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Por favor, autoríceme para que pueda añadirle a mi lista de amigos."
 
-msgid "Authorization Request Message:"
-msgstr "Mensaje de solicitud de autorización:"
-
-msgid "Please authorize me!"
-msgstr "¡Por favor, autoríceme!"
-
 msgid "No reason given."
 msgstr "No se indicó una razón."
 
@@ -6684,7 +6773,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Se perdió %hu mensaje de %s por motivos desconocidos."
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
@@ -6706,6 +6795,9 @@ msgstr "Conectado desde"
 msgid "Member Since"
 msgstr "Miembro desde"
 
+msgid "Capabilities"
+msgstr "Capacidades"
+
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6890,7 +6982,7 @@ msgstr "Mensaje de ausencia demasiado largo"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6898,9 +6990,6 @@ msgstr ""
 "nombres de usuario deben ser direcciones de correo válidas o empezar con una "
 "letra y contener sólo letras, números y espacios, o contener sólo números."
 
-msgid "Unable to Add"
-msgstr "No se pudo añadir"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
@@ -6917,17 +7006,15 @@ msgstr "Huérfanos"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
-msgstr ""
-"No se ha podido añadir al amigo %s porque hay demasiados contactos en la "
-"lista de amigos. Por favor, elimine uno y vuelva a probar."
+msgstr "No se ha podido añadir al amigo %s porque hay demasiados contactos en su lista de amigos. Elimine uno y vuelva a probar."
 
 msgid "(no name)"
 msgstr "(sin nombre)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "No se pudo añadir al amigo %s por motivos desconocidos."
 
 #, c-format
@@ -6999,6 +7086,7 @@ msgstr "C_onectar"
 msgid "Get AIM Info"
 msgstr "Info"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
@@ -7060,6 +7148,7 @@ msgstr "_Buscar"
 msgid "Set User Info (web)..."
 msgstr "Establecer su información de usuario (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Cambiar su contraseña (web)"
 
@@ -7089,6 +7178,9 @@ msgstr "Buscar un amigo por correo electrónico..."
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través de su información"
 
+msgid "Use clientLogin"
+msgstr "Utilizar «clientLogin»"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7279,6 +7371,35 @@ msgstr "Actualizar"
 msgid "Could not change buddy information."
 msgstr "No se pudo cambiar la información del amigo."
 
+# El latinoamérica se prefiere 'Celular', creo, jfs
+msgid "Mobile"
+msgstr "Móvil"
+
+msgid "Note"
+msgstr "Nota"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Memo de amigo"
+
+msgid "Change his/her memo as you like"
+msgstr "Cambiar su memo como desee"
+
+msgid "_Modify"
+msgstr "_Modificar"
+
+msgid "Memo Modify"
+msgstr "Modificar Memo"
+
+msgid "Server says:"
+msgstr "El servidor dice:"
+
+msgid "Your request was accepted."
+msgstr "Su solicitud fué aceptada."
+
+msgid "Your request was rejected."
+msgstr "Su solicitud fué rechazada."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u solicita verificación"
@@ -7588,6 +7709,12 @@ msgstr "<p><b>Encantadores escritores de parches</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Agradecimientos</b>:<br>\n"
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Probadores escrupulosos</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "y más, por favor, háganoslo saber.. ¡gracias!))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Y, todos los chicos entre bastidores...</i><br>\n"
 
@@ -7613,6 +7740,9 @@ msgstr "Actualizar todos los Quns QQ"
 msgid "About OpenQ"
 msgstr "Acerca de OpenQ"
 
+msgid "Modify Buddy Memo"
+msgstr "Modiciar memo de amigo"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7650,13 +7780,16 @@ msgstr "Mostrar notas del servidor"
 msgid "Show server news"
 msgstr "Mostrar noticas del servidor"
 
+msgid "Show chat room when msg comes"
+msgstr "Mostrar la sala de chat cuando venga un mensaje"
+
 msgid "Keep alive interval (seconds)"
 msgstr "Intervalo de comprobación de conexión (segundos)"
 
 msgid "Update interval (seconds)"
 msgstr "Intervalo de actualización (segundos)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "No se pudo descifrar la respuesta del servidor"
 
 #, c-format
@@ -7681,9 +7814,6 @@ msgstr "Es necesaria la activación"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Código de respuesta desconocido al conectarse (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "No se pudo descifrar la respuesta del servidor"
-
 msgid "Requesting captcha"
 msgstr "Solicitando el «captcha»"
 
@@ -7694,7 +7824,7 @@ msgid "Failed captcha verification"
 msgstr "¡Falló la autenticación del «captcha»!"
 
 msgid "Captcha Image"
-msgstr "Guardar imagen"
+msgstr "Imagen captcha"
 
 msgid "Enter code"
 msgstr "Introduzca el código"
@@ -7717,30 +7847,17 @@ msgstr ""
 "Respuesta desconocida al conectarse (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "No se pudo conectar."
-
 msgid "Socket error"
 msgstr "Error de socket"
 
-msgid "Unable to read from socket"
-msgstr "No se pudo leer del socket"
-
-msgid "Write Error"
-msgstr "Error de escritura"
-
-msgid "Connection lost"
-msgstr "Conexión perdida"
-
 msgid "Getting server"
 msgstr "Obteniendo el servidor"
 
 msgid "Requesting token"
 msgstr "Solicitando testingo"
 
-msgid "Couldn't resolve host"
-msgstr "No se pudo resolver el nombre"
+msgid "Unable to resolve hostname"
+msgstr "No se pudo resolver el nombre del sistema"
 
 msgid "Invalid server or port"
 msgstr "Puerto o servidor no válido"
@@ -7758,7 +7875,7 @@ msgid ""
 "%s\n"
 "%s"
 msgstr ""
-"Noticas del servidor:\n"
+"Noticias del servidor:\n"
 "%s\n"
 "%s\n"
 "%s"
@@ -7793,8 +7910,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Orden QQ Qun"
 
-msgid "Could not decrypt login reply"
-msgstr "No se pudo descifrar la respuesta al intento de registro"
+msgid "Unable to decrypt login reply"
+msgstr "No se pudo descifrar la respuesta a la solicitud conexión"
 
 msgid "Unknown LOGIN CMD"
 msgstr "LOGIN CMD desconocido"
@@ -7813,9 +7930,6 @@ msgstr "Archivo enviado"
 msgid "%d canceled the transfer of %s"
 msgstr "%d canceló la transferencia de %s"
 
-msgid "Connection closed (writing)"
-msgstr "Conexión cerrada (escribiendo)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título de grupo:</b> %s<br>"
@@ -7865,23 +7979,12 @@ msgstr "Arrancando servicios"
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
-"Un administrador de «Sametime» ha enviado el siguiente anuncio en el "
-"servidor %s"
+"Un administrador de «Sametime» ha enviado el siguiente anuncio en el servidor "
+"%s"
 
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio del administrador «Sametime»"
 
-msgid "Connection reset"
-msgstr "Conexión rehusada"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Error al leer del socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "No se pudo conectar al servidor"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"
@@ -7904,6 +8007,9 @@ msgstr "Altavoces"
 msgid "Video Camera"
 msgstr "Vídeo cámara"
 
+msgid "File Transfer"
+msgstr "Transferencia de archivo"
+
 msgid "Supports"
 msgstr "Soporta"
 
@@ -8075,9 +8181,9 @@ msgid ""
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"Es posible que el identificador «%s» se refiera a cualquiera de los grupos "
-"de la libreta de direcciones «Notes». Escoja el grupo más apropiado de la "
-"lista que se muestra abajo para añadirlo a su lista de amigos."
+"Es posible que el identificador «%s» se refiera a cualquiera de los grupos de "
+"la libreta de direcciones «Notes». Escoja el grupo más apropiado de la lista "
+"que se muestra abajo para añadirlo a su lista de amigos."
 
 msgid "Select Notes Address Book"
 msgstr "Seleccionar libro de direcciones «Notes»"
@@ -8127,8 +8233,8 @@ msgstr "No hubo coincidencias"
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-"El identificador «%s» no coincide con ninguno de los usuarios en su "
-"comunidad «Sametime»."
+"El identificador «%s» no coincide con ninguno de los usuarios en su comunidad "
+"«Sametime»."
 
 msgid "No Matches"
 msgstr "No hubo coincidencias"
@@ -8412,6 +8518,7 @@ msgstr "<br><b>HMAC de canal:</b> %s"
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema del canal:</b><br>%s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos del canal:</b> "
 
@@ -8436,6 +8543,7 @@ msgstr "Contraseña del canal"
 msgid "Channel Public Keys List"
 msgstr "Lista de claves públicas del canal"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8628,9 +8736,6 @@ msgstr "Organización"
 msgid "Unit"
 msgstr "Unidad"
 
-msgid "Note"
-msgstr "Nota"
-
 msgid "Join Chat"
 msgstr "Unirse a un chat"
 
@@ -8731,6 +8836,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Estadísticas de red"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Falló el ping"
 
@@ -8794,8 +8902,8 @@ msgstr "Tipo de clave pública no soportada"
 msgid "Disconnected by server"
 msgstr "Desconectado por el servidor"
 
-msgid "Error during connecting to SILC Server"
-msgstr "Se produjo un error durante la conexión al servidor SILC"
+msgid "Error connecting to SILC Server"
+msgstr "Error al conectarse al servidor SILC"
 
 msgid "Key Exchange failed"
 msgstr "Falló el intercambio de claves"
@@ -8806,17 +8914,11 @@ msgstr ""
 "Se produjo un fallo al retomar la sesión desligada. Pulse «Reconectar» para "
 "crear una nueva conexión."
 
-msgid "Connection failed"
-msgstr "Falló la conexión"
-
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
-msgid "Unable to create connection"
-msgstr "No se pudo crear la conexión"
-
-msgid "Could not load SILC key pair"
-msgstr "No se pudo cargar la clave pública SILC"
+msgid "Unable to load SILC key pair"
+msgstr "No se pudo cargar el par de claves SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -8825,7 +8927,7 @@ msgstr "Conectando con el servidor SILC"
 msgid "Out of memory"
 msgstr "Sin memoria"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "No se pudo inicializar el protocolo SILC"
 
 msgid "Error loading SILC key pair"
@@ -8838,6 +8940,7 @@ msgstr "Descarga %s: %s"
 msgid "Your Current Mood"
 msgstr "Su estado de ánimo actual"
 
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
@@ -8858,7 +8961,7 @@ msgid "MMS"
 msgstr "MMS"
 
 msgid "Video conferencing"
-msgstr "Video conferencia"
+msgstr "Vídeo-conferencia"
 
 msgid "Your Current Status"
 msgstr "Su estado actual"
@@ -9124,8 +9227,8 @@ msgstr "Firmar digitalmente todos los mensajes instantáneos"
 msgid "Creating SILC key pair..."
 msgstr "Creando el par de claves SILC..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "No se pudo crear el par de claves SILC\n"
+msgid "Unable to create SILC key pair"
+msgstr "No se pudo crear el par de claves SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9191,7 +9294,7 @@ msgid "Paging"
 msgstr "Enviar"
 
 msgid "Video Conferencing"
-msgstr "Video conferencia"
+msgstr "Vídeo-conferencia"
 
 msgid "Computer"
 msgstr "Ordenador"
@@ -9219,63 +9322,70 @@ msgstr "Pizarra"
 msgid "No server statistics available"
 msgstr "No se disponen de estadísticas del servidor"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Se produjo un error durante la conexión al servidor SILC"
+
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 "Fallo: Existe una diferencia en las versiones, por favor, actualice su "
 "cliente"
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fallo: El servidor remoto no soporta/confía en su clave pública"
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fallo: El servidor remoto no soporta el grupo de IC propuesto"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Fallo: El servidor remoto no soporta los sistemas de cifrado propuestos"
 
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallo: El servidor remoto no soporta los PKCS propuestos"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fallo: El servidor remoto no soporta la función de hash propuesta"
 
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallo: El servidor remoto no soporta el HMAC propuesto"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Firma incorrecta"
 
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Fallo: Cookie inválida"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Falló la autenticación"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "No se pudo inicializar al conexión del cliente SILC"
+msgid "Unable to initialize SILC Client connection"
+msgstr "No se pudo inicializar la conexión del cliente SILC"
 
 msgid "John Noname"
 msgstr "Pepe sin nombre"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "No se pudo cargar la clave pública SILC: %s"
+msgid "Unable to load SILC key pair: %s"
+msgstr "No se pudo cargar el par de claves SILC: %s"
 
-msgid "Could not write"
-msgstr "No se pudo escribir"
-
-msgid "Could not connect"
-msgstr "No se pudo conectar"
-
-msgid "Unknown server response."
-msgstr "Respuesta desconocida del servidor."
+msgid "Unable to create connection"
+msgstr "No se pudo crear la conexión"
 
-msgid "Could not create listen socket"
-msgstr "No se pudo crear el socket de escucha"
+msgid "Unknown server response"
+msgstr "Respuesta desconocida del servidor"
 
-msgid "Could not resolve hostname"
-msgstr "No se pudo resolver el nombre de sistema"
+msgid "Unable to create listen socket"
+msgstr "No se pudo crear el puerto para escuchar peticiones"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9317,167 +9427,60 @@ msgstr "Usuario de autenticación"
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Buscando %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Falló la conexión a %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Conectado: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "No se pudo escribir el archivo %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "No se pudo leer el archivo %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Mensaje demasiado largo, los últimos %s bytes fueron borrados."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s no está conectado ahora."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "No se permiten advertencias de %s."
-
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"El mensaje ha sido descartado, usted esta excediendo el límite de velocidad "
-"del servidor."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "No está disponible el chat en %s."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Esta enviando mensajes demasiado rápido a %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Usted perdió un MI de %s porque era demasiado largo."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Usted perdió un MI de %s porque fue mandado demasiado rápido."
-
-msgid "Failure."
-msgstr "Fallo."
-
-msgid "Too many matches."
-msgstr "Demasiados resultados."
-
-msgid "Need more qualifiers."
-msgstr "Necesito más calificadores."
-
-msgid "Dir service temporarily unavailable."
-msgstr "Servicio de directorio temporalmente no disponible."
-
-msgid "Email lookup restricted."
-msgstr "Búsqueda de direcciones de correo electrónico restringida."
-
-msgid "Keyword ignored."
-msgstr "Palabra clave ignorada."
-
-msgid "No keywords."
-msgstr "Sin palabras clave."
-
-msgid "User has no directory information."
-msgstr "El usuario no tiene información en el directorio."
-
-msgid "Country not supported."
-msgstr "País no soportado."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Fallo desconocido: %s."
-
-msgid "Incorrect username or password."
-msgstr "Nombre de usuario o contraseña incorrecta."
-
-msgid "The service is temporarily unavailable."
-msgstr "Servicio temporalmente no disponible."
-
-msgid "Your warning level is currently too high to log in."
-msgstr "Su nivel de advertencias es demasiado alto para conectarse."
-
-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 ""
-"Se ha conectado y desconectado demasiadas veces. Espere diez minutos e "
-"inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
-"tiempo."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Ha ocurrido un error desconocido al conectarse: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Un error desconocido, %d, ha ocurrido. Info: %s"
-
-msgid "Invalid Groupname"
-msgstr "Nombre de grupo inválido"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;sala&gt;:  Unirse a una sala en la red de Yahoo."
 
-msgid "Connection Closed"
-msgstr "Conexión cerrada"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Mostrar los canales de la red Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Esperando respuesta..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Solicitar al usuario el comienzo de una sesión Doodle"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC ha terminado su pausa. Ya puede volver a mandar mensajes."
+msgid "Yahoo ID..."
+msgstr "ID de Yahoo..."
 
-msgid "Password Change Successful"
-msgstr "La contraseña se ha cambiado con éxito"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Complemento de protocolo Yahoo!"
 
-msgid "_Group:"
-msgstr "_Grupo:"
+msgid "Pager server"
+msgstr "Servidor buscapersonas"
 
-msgid "Get Dir Info"
-msgstr "Obtener información del directorio"
+msgid "Pager port"
+msgstr "Puerto del buscapersonas"
 
-msgid "Set Dir Info"
-msgstr "Guardar información del directorio"
+msgid "File transfer server"
+msgstr "Servidor de transferencia de archivos"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "¡No se pudo abrir %s para escritura!"
+msgid "File transfer port"
+msgstr "Puerto de transferencia de archivos"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Se produjo un fallo en la transferencia del archivo; posiblemente fue "
-"cancelado por el otro extremo."
+msgid "Chat room locale"
+msgstr "Localización de la sala de chat"
 
-msgid "Could not connect for transfer."
-msgstr "No se pudo conectar para realizar la transferencia."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorar las invitaciones a salas de conferencias o chat"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-"No se pudo escribir la cabecera de archivo.  El archivo no será transferido."
+msgid "Chat room list URL"
+msgstr "Url de lista de salas de chat"
 
-msgid "Save As..."
-msgstr "Guardar como..."
+msgid "Yahoo Chat server"
+msgstr "Servidor de chat de Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s solicita %s para aceptar %d archivo: %s (%.2f %s)%s%s"
-msgstr[1] "%s solicita %s para aceptar %d archivos: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Puerto de chat de Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s le solicita que le mande un archivo"
+msgid "Yahoo JAPAN ID..."
+msgstr "ID de Yahoo Japón..."
 
 #. *< type
 #. *< ui_requirement
@@ -9489,14 +9492,11 @@ msgstr "%s le solicita que le mande un archivo"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Complemento de protocolo TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Complemento de protocolo Yahoo! Japón"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s le ha enviado una invitación para utilizar la webcam, algo aún no "
-"soportado."
+msgid "Your SMS was not delivered"
+msgstr "Se ha enviado su SMS"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se envió."
@@ -9522,6 +9522,26 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Se rechazó la adición del amigo"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Recibidos datos inválidos"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "Cuenta bloqueada: demasiados intentos de conexión fallidos. Si se conecta al servidor de web de Yahoo! es posible que ésto se arregle."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "Cuenta bloqueada: error desconocido. Si se conecta al servidor de web de Yahoo! es posible que ésto se arregle."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Falta el nombre de usuario o contraseña "
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9557,39 +9577,28 @@ msgstr ""
 "posible que ésto se arregle."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo añadir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."
 
-msgid "Could not add buddy to server list"
-msgstr "No se pudo añadir el amigo a la lista del servidor"
+msgid "Unable to add buddy to server list"
+msgstr "No se pudo añadir al amigo a la lista del servidor"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba."
-
-msgid "Connection problem"
-msgstr "Error de conexión"
+msgid "Received unexpected HTTP response from server"
+msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Se perdió la conexión con %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Se perdió la conexión con %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"No se pudo establecer una conexión con %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "No se pudo establecer una conexión con %s: %s"
 
 msgid "Not at Home"
 msgstr "Fuera de casa"
@@ -9636,8 +9645,8 @@ msgstr "Usar configuración del entorno"
 msgid "Start Doodling"
 msgstr "Comenzar una sesión de Doodle"
 
-msgid "Activate which ID?"
-msgstr "¿Qué ID quiere activar?"
+msgid "Select the ID you want to activate"
+msgstr "Seleccione el ID que quiere activar"
 
 msgid "Join whom in chat?"
 msgstr "¿Con quién quiere juntarse en un chat?"
@@ -9651,73 +9660,15 @@ msgstr "Juntarse con un usuario en un chat..."
 msgid "Open Inbox"
 msgstr "Abrir bandeja de entrada"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;sala&gt;:  Unirse a una sala en la red de Yahoo."
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Mostrar los canales de la red Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Solicitar al usuario el comienzo de una sesión Doodle"
-
-msgid "Yahoo ID..."
-msgstr "ID de Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Complemento de protocolo Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japón"
-
-msgid "Pager server"
-msgstr "Servidor buscapersonas"
-
-msgid "Japan Pager server"
-msgstr "Servidor de buscapersonas japonés"
-
-msgid "Pager port"
-msgstr "Puerto del buscapersonas"
-
-msgid "File transfer server"
-msgstr "Servidor de transferencia de archivos"
-
-msgid "Japan file transfer server"
-msgstr "Servidor de transferencia de archivos japonés"
-
-msgid "File transfer port"
-msgstr "Puerto de transferencia de archivos"
-
-msgid "Chat room locale"
-msgstr "Localización de la sala de chat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorar las invitaciones a salas de conferencias o chat"
-
-msgid "Chat room list URL"
-msgstr "Url de lista de salas de chat"
-
-msgid "Yahoo Chat server"
-msgstr "Servidor de chat de Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Puerto de chat de Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Enviar petición Doodle."
 
+msgid "Unable to connect."
+msgstr "No se pudo conectar."
+
 msgid "Unable to establish file descriptor."
 msgstr "No se pudo establecer el descriptor de archivo."
 
@@ -9725,6 +9676,9 @@ msgstr "No se pudo establecer el descriptor de archivo."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s se ofrece a enviarle un conjunto de %d archivos.\n"
 
+msgid "Write Error"
+msgstr "Error de escritura"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! Japón"
 
@@ -9793,11 +9747,8 @@ msgid "The user's profile is empty."
 msgstr "El perfil del usuario está vacío."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s ha declinado su invitación de conferencia en la sala «%s» por «%s»."
-
-msgid "Invitation Rejected"
-msgstr "Invitación rechazada"
+msgid "%s has declined to join."
+msgstr "%s ha rechazado unirse."
 
 msgid "Failed to join chat"
 msgstr "No se pudo unir al chat"
@@ -9841,22 +9792,17 @@ msgstr "Voces"
 msgid "Webcams"
 msgstr "Cámaras web"
 
+msgid "Connection problem"
+msgstr "Error de conexión"
+
 msgid "Unable to fetch room list."
 msgstr "No se pudo obtener la lista de salas."
 
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Se produjo un problema al conectarse con el servidor YCHT."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Se ha perdido la conexión con el servidor\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Problema de conexión con el servidor YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9985,33 +9931,21 @@ msgid "Exposure"
 msgstr "Exposición"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"No se pudo crear el socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "No se pudo interpretar la respuesta del proxy HTTP: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "No se pudo interpretar la respuesta del proxy HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Error de conexión en el proxy HTTP %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr ""
-"Acceso denegado: el servidor proxy HTTP no permite túneles en el puerto %d."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "Acceso denegado: el servidor proxy HTTP no permite túneles en el puerto %d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error al resolver %s"
 
-msgid "Could not resolve host name"
-msgstr "No se pudo resolver el nombre de equipo"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Solicitando la atención de %s..."
@@ -10098,10 +10032,6 @@ msgstr "No molestar"
 msgid "Extended away"
 msgstr "Ausencia extendida"
 
-# El latinoamérica se prefiere 'Celular', creo, jfs
-msgid "Mobile"
-msgstr "Móvil"
-
 msgid "Listening to music"
 msgstr "Escuchando música"
 
@@ -10143,18 +10073,6 @@ msgstr "+++ %s ahora está activo"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Error al leer %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Se ha encontrado un error al leer su %s. No se ha cargado, y el archivo "
-"antiguo se ha renombrado a %s~."
-
 msgid "Calculating..."
 msgstr "Calculando..."
 
@@ -10239,25 +10157,42 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Otro programa en su ordenador ha interrumpido la conexión."
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "El servidor remoto ha cerrado la conexión."
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "Expiró la conexión."
 
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "Conexión rechazada."
 
 #. 10048
+#, c-format
 msgid "Address already in use."
 msgstr "La dirección ya se está utilizando."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Error al leer %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Se ha encontrado un error al leer su %s. No se ha cargado, y el archivo "
+"antiguo se ha renombrado a %s~."
+
 msgid "Internet Messenger"
 msgstr "Cliente de mensajería de Internet"
 
@@ -10300,10 +10235,8 @@ msgstr "Notificaciones de _correo nuevo"
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizar este _icono de amigo para esta cuenta:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Opciones de %s"
+msgid "Ad_vanced"
+msgstr "A_vanzadas"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configuración del proxy de GNOME"
@@ -10338,9 +10271,6 @@ msgstr "Si miras de cerca"
 msgid "you can see the butterflies mating"
 msgstr "puedes ver a las mariposas apareándose"
 
-msgid "Proxy Options"
-msgstr "Opciones del proxy"
-
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
@@ -10368,8 +10298,8 @@ msgstr "_Básica"
 msgid "Create _this new account on the server"
 msgstr "Crear es_ta nueva cuenta en el servidor"
 
-msgid "_Advanced"
-msgstr "_Avanzadas"
+msgid "P_roxy"
+msgstr "Pasa_rela"
 
 msgid "Enabled"
 msgstr "Habilitado"
@@ -10418,16 +10348,16 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Por favor, actualice los campos necesarios."
 
-msgid "Room _List"
-msgstr "_Lista de salas"
+msgid "A_ccount"
+msgstr "_Cuenta"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduzca la información apropiada del chat al que desearía unirse.\n"
 
-msgid "_Account:"
-msgstr "_Cuenta:"
+msgid "Room _List"
+msgstr "_Lista de salas"
 
 msgid "_Block"
 msgstr "_Bloquear"
@@ -10444,6 +10374,15 @@ msgstr "Obtener _información"
 msgid "I_M"
 msgstr "_MI"
 
+msgid "_Audio Call"
+msgstr "Llamada _audio"
+
+msgid "Audio/_Video Call"
+msgstr "Audio/_Vídeollamada"
+
+msgid "_Video Call"
+msgstr "_Vídeollamada"
+
 msgid "_Send File..."
 msgstr "_Enviar archivo..."
 
@@ -10453,8 +10392,11 @@ msgstr "Añadir _aviso de amigo..."
 msgid "View _Log"
 msgstr "Ver _registro"
 
-msgid "Hide when offline"
-msgstr "Ocultar cuando se esté desconectado"
+msgid "Hide When Offline"
+msgstr "Ocultar cuando se está desconectado"
+
+msgid "Show When Offline"
+msgstr "Mostrar cuando se esté desconectado"
 
 msgid "_Alias..."
 msgstr "_Apodo..."
@@ -10578,6 +10520,9 @@ msgstr "/Herramientas/_Aviso de amigo"
 msgid "/Tools/_Certificates"
 msgstr "/Herramientas/_Certificados"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Herramientas/Emot_iconos personalizados"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Herramientas/Com_plementos"
 
@@ -10587,9 +10532,6 @@ msgstr "/Herramientas/_Preferencias"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-msgid "/Tools/Smile_y"
-msgstr "/Herramientas/_Emoticonos"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
 
@@ -10707,8 +10649,8 @@ msgstr "Manualmente"
 msgid "By status"
 msgstr "Por estado"
 
-msgid "By log size"
-msgstr "Por tamaño de registro"
+msgid "By recent log activity"
+msgstr "Por actividad de registro reciente"
 
 #, c-format
 msgid "%s disconnected"
@@ -10724,6 +10666,9 @@ msgstr "Reconectar"
 msgid "Re-enable"
 msgstr "Reactivar"
 
+msgid "SSL FAQs"
+msgstr "PUFs de SSL"
+
 msgid "Welcome back!"
 msgstr "¡Bienvenido!"
 
@@ -10814,6 +10759,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "_Apodo:"
 
+msgid "_Group:"
+msgstr "_Grupo:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Reconec_tarse cuando la cuenta se pone en línea."
 
@@ -10847,6 +10795,101 @@ msgstr "/Herramientas"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Color del fondo"
+
+msgid "The background color for the buddy list"
+msgstr "Color de fondo para la lista de amigos"
+
+msgid "Layout"
+msgstr "Distribución"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "La distribución de iconos, nombres y estados en la blist"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Color del fondo expandido"
+
+msgid "The background color of an expanded group"
+msgstr "Color de fondo para un grupo expandido"
+
+msgid "Expanded Text"
+msgstr "_Expandir texto"
+
+msgid "The text information for when a group is expanded"
+msgstr "La información de texto para un grupo cuando se expande"
+
+msgid "Collapsed Background Color"
+msgstr "Color de fondo contraído"
+
+msgid "The background color of a collapsed group"
+msgstr "El color de fondo de un grupo contraído"
+
+msgid "Collapsed Text"
+msgstr "Texto contraido"
+
+msgid "The text information for when a group is collapsed"
+msgstr "La información de texto para cuando un grupo se contrae"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Color de fondo para contactos/chat"
+
+msgid "The background color of a contact or chat"
+msgstr "El color de fondo de un contacto o chat"
+
+msgid "Contact Text"
+msgstr "Texto de contacto"
+
+msgid "The text information for when a contact is expanded"
+msgstr "La información de texto cuando se expande un contacto"
+
+msgid "On-line Text"
+msgstr "Texto conectado"
+
+msgid "The text information for when a buddy is online"
+msgstr "La información en texto cuando un amigo está en línea"
+
+msgid "Away Text"
+msgstr "Texto de ausencia"
+
+msgid "The text information for when a buddy is away"
+msgstr "La información de texto cuando un amigo está austen"
+
+msgid "Off-line Text"
+msgstr "Texto desconectado"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "La información de texto cuando un amigo está desconectado"
+
+msgid "Idle Text"
+msgstr "Texto de inactividad"
+
+msgid "The text information for when a buddy is idle"
+msgstr "La información de texto cuando un amigo está inactivo"
+
+msgid "Message Text"
+msgstr "Texto de los mensajes"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "La información de texto cuando un amigo tiene mensajes sin leer"
+
+msgid "Message (Nick Said) Text"
+msgstr "Texto de nensaje («apodo dijo»)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr "La información de texto cuando un chat tiene mensajes sin leer que mencionan su apodo"
+
+msgid "The text information for a buddy's status"
+msgstr "La información de texto para el estado de los amigos"
+
+msgid "Type the host name for this certificate."
+msgstr "Especifique el nombre de sistema para este certificado."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidores SSL"
@@ -10865,14 +10908,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo a la sala de chat"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
-"de invitación opcional."
-
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
@@ -10901,7 +10936,7 @@ msgstr "Ignorar"
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Dicho la última vez"
 
 msgid "Unable to save icon file to disk."
@@ -10947,11 +10982,23 @@ msgstr "/Conversación/_Guardar como..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversación/Limpia_r deslizable"
 
+msgid "/Conversation/M_edia"
+msgstr "/Conversación/_Medio"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversación/Medio/_Audiollamada"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversación/Medio/_Vídeollamada"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversación/Medio/_Llamada audio\\/vídeo"
+
 msgid "/Conversation/Se_nd File..."
-msgstr "/Conversación/_Enviar archivo..."
+msgstr "/Conversación/E_nviar archivo..."
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Conversación/Añadir _aviso de amigo..."
+msgstr "/Conversación/Añadir a_viso de amigo..."
 
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obtener información"
@@ -10960,7 +11007,7 @@ msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."
 
 msgid "/Conversation/M_ore"
-msgstr "/Conversación/_Más"
+msgstr "/Conversación/Má_s"
 
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/A_podo..."
@@ -11019,6 +11066,15 @@ msgstr "/Conversación"
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver registro"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversación/Medio/Audiollamada"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversación/Medio/Vídeollamada"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversación/Llamada audio\\/vídeo"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar archivo..."
 
@@ -11201,6 +11257,9 @@ msgstr "artista"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "voz y vídeo"
+
 msgid "support"
 msgstr "soporte"
 
@@ -11326,6 +11385,9 @@ msgstr "Hindú"
 msgid "Hungarian"
 msgstr "Húngaro"
 
+msgid "Armenian"
+msgstr "Armenio"
+
 msgid "Indonesian"
 msgstr "Indonesio"
 
@@ -11341,6 +11403,9 @@ msgstr "Georgiano"
 msgid "Ubuntu Georgian Translators"
 msgstr "Traductores al georgiano de Ubuntu"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11362,6 +11427,9 @@ msgstr "Lituano"
 msgid "Macedonian"
 msgstr "Macedonio"
 
+msgid "Mongolian"
+msgstr "Mongol"
+
 msgid "Bokmål Norwegian"
 msgstr "Noruego Bokmål"
 
@@ -11416,6 +11484,9 @@ msgstr "Sinhala"
 msgid "Swedish"
 msgstr "Sueco"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11477,8 +11548,26 @@ msgstr ""
 "completa de personas que han contribuido. Este programa se distribuye sin "
 "ninguna garantía.<BR><BR>"
 
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> canal #pidgin en irc.freenode.net<BR><BR>"
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr "<FONT SIZE=\"4\">Ayuda por correo:</FONT> <A HREF=\"mailto:support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">Canal de IRC:</FONT> #pidgin en irc.freenode.net<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
@@ -11624,7 +11713,7 @@ msgid "_Unread Messages"
 msgstr "Mensajes _no leídos"
 
 msgid "New _Message..."
-msgstr "Mensaje nuevo..."
+msgstr "_Mensaje nuevo..."
 
 msgid "_Accounts"
 msgstr "Cuent_as"
@@ -11729,7 +11818,7 @@ msgstr "Color para dibujar hiperenlaces."
 msgid "Hyperlink visited color"
 msgstr "Color de hiperenlace visitado"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Color para dibujar hiperenlaces cuando ya han sido visitados (o activados)."
 
@@ -11768,14 +11857,20 @@ msgstr "Color con el que dibujar el nombre de un mensaje de acción."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Nombre de color de mensajes de accción para mensajes susurrados"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Color con el que dibujar el nombre de un mensaje de acción susurrado."
+
 msgid "Whisper Message Name Color"
 msgstr "Susurrar nombre de color de mensajes"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Color con el que dibujar el nombre de un mensaje susurrado."
+
 msgid "Typing notification color"
 msgstr "Color de notificación de tecleo"
 
-msgid "The color to use for the typing notification font"
-msgstr "Color a utilizar para la tipografía de notificación de tecleo"
+msgid "The color to use for the typing notification"
+msgstr "Color a utilizar para la notificación de tecleo"
 
 msgid "Typing notification font"
 msgstr "Tipografía de notificación de tecleo"
@@ -11786,15 +11881,6 @@ msgstr "Tipografía a utilizar para la notificación de tecleo"
 msgid "Enable typing notification"
 msgstr "Activar la notificación de tecleo"
 
-msgid "_Copy Email Address"
-msgstr "_Copiar dirección de correo electrónico"
-
-msgid "_Open Link in Browser"
-msgstr "_Abrir enlace en navegador"
-
-msgid "_Copy Link Location"
-msgstr "_Copiar destino del enlace"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11929,9 +12015,6 @@ msgstr "Reducir tamaño de tipografía"
 msgid "Font Face"
 msgstr "Estilo de tipografía"
 
-msgid "Background Color"
-msgstr "Color del fondo"
-
 msgid "Foreground Color"
 msgstr "Color del primer plano"
 
@@ -11946,7 +12029,7 @@ msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
 msgid "<b>_Bold</b>"
-msgstr "<b> Negrita</b>"
+msgstr "<b>_Negrita</b>"
 
 msgid "<i>_Italic</i>"
 msgstr "<i>_Cursiva</i>"
@@ -12049,6 +12132,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12061,15 +12145,12 @@ msgstr ""
 "%s %s\n"
 "Modo de uso: %s [OPCIÓN]...\n"
 "\n"
-"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de "
-"configuración\n"
-"  -d, --debug          imprimir mensajes de depuración en la salida "
-"estándar\n"
-"  -h, --help           mostrar este mensaje y salir\n"
+"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de configuración\n"
+"  -d, --debug          imprimir mensajes de depuración en la salida estándar\n"
+"  -h, --help           mostrar esta ayuda y salir\n"
 "  -m, --multiple       no asegurarse de que hay sólo una instancia\n"
 "  -n, --nologin        no conectarse de forma automática\n"
-"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opcional "
-"NOMBRE\n"
+"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opcional NOMBRE\n"
 "                       indica la(s) cuenta(s) a usar, separadas por comas.\n"
 "                       Si no se indica se activará sólo la primera cuenta).\n"
 "  --display=DISPLAY    pantalla X que se debe utilizar\n"
@@ -12082,6 +12163,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12093,15 +12175,12 @@ msgstr ""
 "%s %s\n"
 "Modo de uso: %s [OPCIÓN]...\n"
 "\n"
-"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de "
-"configuración\n"
-"  -d, --debug          imprimir mensajes de depuración en la salida "
-"estándar\n"
-"  -h, --help           mostrar este mensaje y salir\n"
+"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de configuración\n"
+"  -d, --debug          imprimir mensajes de depuración en la salida estándar\n"
+"  -h, --help           mostrar esta ayuda y salir\n"
 "  -m, --multiple       no asegurarse de que hay sólo una instancia\n"
 "  -n, --nologin        no conectarse de forma automática\n"
-"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opcional "
-"NOMBRE\n"
+"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opcional NOMBRE\n"
 "                       indica la(s) cuenta(s) a usar, separadas por comas.\n"
 "                       Si no se indica se activará sólo la primera cuenta).\n"
 "  --display=DISPLAY    pantalla X que se debe utilizar\n"
@@ -12140,11 +12219,26 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Abrir todos los mensajes"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "Saliendo porque está ejecutándose otro cliente de libpurple.\n"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>"
+msgid "/_Media"
+msgstr "/_Media"
+
+msgid "/Media/_Hangup"
+msgstr "/Media/_Colgar"
+
+msgid "Calling..."
+msgstr "Llamando..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s desea iniciar una sesión de audio/vídeo con vd."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s desea comenzor una sesión de vídeo con vd."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12175,6 +12269,24 @@ msgstr ""
 "Se ha definido un navegador «Manual», pero no se ha definido ningún comando "
 "para ejecutarlo."
 
+msgid "No message"
+msgstr "No hay mensajes"
+
+msgid "Open All Messages"
+msgstr "Abrir todos los mensajes"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>"
+
+msgid "New Pounces"
+msgstr "Nuevos avisos"
+
+msgid "Dismiss"
+msgstr "Descartar"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene un aviso!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Se van a desactivar los siguientes complementos."
 
@@ -12223,10 +12335,16 @@ msgstr "<b>Detalles del complemento</b>"
 msgid "Select a file"
 msgstr "Seleccione un archivo"
 
+msgid "Modify Buddy Pounce"
+msgstr "Modificar aviso de amigo"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "A quién avisar"
 
+msgid "_Account:"
+msgstr "_Cuenta:"
+
 msgid "_Buddy name:"
 msgstr "Nombre del _amigo:"
 
@@ -12295,8 +12413,58 @@ msgstr "_Recurrente"
 msgid "Pounce Target"
 msgstr "Objetivo a avisar"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Falló el desempaque de tema de emoticonos"
+#, c-format
+msgid "Started typing"
+msgstr "Empezó a escribir"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Pausa mientras escribe"
+
+#, c-format
+msgid "Signed on"
+msgstr "Se conecta"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Deje de estar inactivo"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Deje de estar ausente"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Deje de escribir"
+
+#, c-format
+msgid "Signed off"
+msgstr "Se desconecte"
+
+#, c-format
+msgid "Became idle"
+msgstr "Pase a estar inactivo"
+
+#, c-format
+msgid "Went away"
+msgstr "Se va"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Envía un mensaje"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Desconocido..... ¡Por favor, informe de esto! "
+
+msgid "Theme failed to unpack."
+msgstr "No se pudo desempaquetar el tema."
+
+msgid "Theme failed to load."
+msgstr "No se pudo cargar el tema."
+
+msgid "Theme failed to copy."
+msgstr "No se pudo copiar el tema."
 
 msgid "Install Theme"
 msgstr "Instalar tema"
@@ -12317,6 +12485,11 @@ msgstr "Atajos de teclado"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "C_errrar las conversaciones con la tecla Esc"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Tema de la lista de amigos"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Icono del área de notificación del sistema"
 
@@ -12326,8 +12499,8 @@ msgstr "_Mostrar icono del área de notificación del sistema:"
 msgid "On unread messages"
 msgstr "Si hay mensajes sin leer"
 
-msgid "Conversation Window Hiding"
-msgstr "Ocultar ventana de conversación"
+msgid "Conversation Window"
+msgstr "Ventana de conversación"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar nuevas conversaciones MI:"
@@ -12335,6 +12508,9 @@ msgstr "_Ocultar nuevas conversaciones MI:"
 msgid "When away"
 msgstr "Cuando estoy fuera"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zar las nuevas ventana de conversación"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Solapas"
@@ -12393,9 +12569,6 @@ msgstr "Utilizar paginado suave"
 msgid "F_lash window when IMs are received"
 msgstr "_Destello de ventana cuando se reciben MIs"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zar las nuevas ventana de conversación"
-
 msgid "Minimum input area height in lines:"
 msgstr "Altura mínima del área de entrada en líneas:"
 
@@ -12409,7 +12582,7 @@ msgid "Use font from _theme"
 msgstr "Utilizar la tipografía del _tema"
 
 msgid "Conversation _font:"
-msgstr "Tipografía para las conversaciones:"
+msgstr "Tipogra_fía para las conversaciones:"
 
 msgid "Default Formatting"
 msgstr "Formato por omisión"
@@ -12427,14 +12600,12 @@ msgstr "No se pudo iniciar el programa de configuración de proxy."
 msgid "Cannot start browser configuration program."
 msgstr "No se pudo iniciar el programa de configuración del navegador."
 
-msgid "ST_UN server:"
-msgstr "Servidor ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Auto detectar la dirección IP"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Utilizar la dirección IP detectada _automáticamente: %s"
 
 msgid "Public _IP:"
 msgstr "_IP pública:"
@@ -12454,6 +12625,10 @@ msgstr "Puerto _inicial:"
 msgid "_End port:"
 msgstr "Puerto _final:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Servidor de reenvío (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor proxy y navegador"
 
@@ -12482,6 +12657,10 @@ msgstr "Servidor proxy"
 msgid "No proxy"
 msgstr "Sin proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr "Utilizar un DNS remoto con pasarelas SOCKS4"
+
 msgid "_User:"
 msgstr "_Usuario:"
 
@@ -12562,21 +12741,27 @@ msgstr "Registrar todos los cambios de _estado en el registro del sistema"
 msgid "Sound Selection"
 msgstr "Selección de sonido"
 
+#, c-format
 msgid "Quietest"
 msgstr "El más silencioso"
 
+#, c-format
 msgid "Quieter"
 msgstr "Más silencioso"
 
+#, c-format
 msgid "Quiet"
 msgstr "Silencio"
 
+#, c-format
 msgid "Loud"
 msgstr "Ruidoso"
 
+#, c-format
 msgid "Louder"
 msgstr "Más ruidoso"
 
+#, c-format
 msgid "Loudest"
 msgstr "El más ruidoso"
 
@@ -12635,12 +12820,12 @@ msgstr "Cuando está ausente e inactivo"
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-msgid "Change status when _idle"
-msgstr "Cambiar el estado cuando esté _inactivo"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de pasar a inactivo:"
 
+msgid "Change status when _idle"
+msgstr "Cambiar el estado cuando esté _inactivo"
+
 msgid "Change _status to:"
 msgstr "Cambiar _estado a:"
 
@@ -12790,29 +12975,18 @@ msgstr "Gua_rdar y usar"
 msgid "Status for %s"
 msgstr "Estado de %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr "Ya existe un emoticono a medida para '%s'. Especifique un atajo distinto."
+
 # No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
 msgid "Custom Smiley"
 msgstr "Emoticono a medida"
 
-msgid "More Data needed"
-msgstr "Son necesarios más datos"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Indique un atajo para asociarlo al emoticono."
-
 msgid "Duplicate Shortcut"
 msgstr "Atajo duplicado"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Ya existe un emoticono a medida para el atajo de teclado seleccionado. "
-"Especifique un atajo distinto."
-
-msgid "Please select an image for the smiley."
-msgstr "Escoja una imagen para el emoticono."
-
 # No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
 msgid "Edit Smiley"
 msgstr "Editar emoticono"
@@ -12820,19 +12994,25 @@ msgstr "Editar emoticono"
 msgid "Add Smiley"
 msgstr "Añadir emoticono"
 
-msgid "Smiley _Image"
-msgstr "Imagen de emoticono"
+msgid "_Image:"
+msgstr "_Imagen:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Ata_jos de emoticonos"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "Ata_jo de teclado"
 
 msgid "Smiley"
 msgstr "Emoticono"
 
+msgid "Shortcut Text"
+msgstr "Atajo de teclado"
+
 msgid "Custom Smiley Manager"
 msgstr "Gestor de emoticonos a medida"
 
+msgid "Select Buddy Icon"
+msgstr "Seleccionar icono de amigo"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Pulse para cambiar el icono de amigo para esta cuenta."
 
@@ -12918,8 +13098,8 @@ msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Vd. arrastró un lanzador de escritorio. Lo más probable es que quiera enviar "
 "a lo que apunta el lanzador más que el lanzador en sí."
@@ -12954,12 +13134,33 @@ msgstr "No se pudo abrir el archivo «%s»: %s"
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"Se produjo un fallo al cargar la imagen «%s»: razón desconocida, "
-"posiblemente se trata de un archivo de imagen dañado"
+"Se produjo un fallo al cargar la imagen «%s»: razón desconocida, posiblemente "
+"se trata de un archivo de imagen dañado"
+
+msgid "_Open Link"
+msgstr "_Abrir enlace"
+
+msgid "_Copy Link Location"
+msgstr "_Copiar destino del enlace"
+
+msgid "_Copy Email Address"
+msgstr "_Copiar dirección de correo electrónico"
+
+msgid "_Open File"
+msgstr "_Abrir archivo"
+
+msgid "Open _Containing Directory"
+msgstr "Abrir _contenido del directorio "
 
 msgid "Save File"
 msgstr "Guardar archivo"
 
+msgid "_Play Sound"
+msgstr "Re_producir un sonido"
+
+msgid "_Save File"
+msgstr "_Guardar archivo"
+
 msgid "Select color"
 msgstr "Seleccionar el color"
 
@@ -13047,6 +13248,62 @@ msgstr "Complemento de predicción de disponibilidad de contactos."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Muestra información estadística de la disponibilidad de sus amigos"
 
+msgid "Server name request"
+msgstr "Solicitud de nombre de servidor"
+
+msgid "Enter an XMPP Server"
+msgstr "Introducir un servidor XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Seleccione un servidor XMPP al que consultar"
+
+msgid "Find Services"
+msgstr "Encontrar servicios"
+
+msgid "Add to Buddy List"
+msgstr "Añadir a la lista de amigos"
+
+msgid "Gateway"
+msgstr "Pasarela"
+
+msgid "Directory"
+msgstr "Directorio"
+
+msgid "PubSub Collection"
+msgstr "Collección PubSub"
+
+msgid "PubSub Leaf"
+msgstr "Rama PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "\n<b>Descripción:</b>"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Descubrimiento de servicios"
+
+msgid "_Browse"
+msgstr "_Navegador"
+
+msgid "Server does not exist"
+msgstr "El servidor no existe"
+
+msgid "Server does not support service discovery"
+msgstr "El servidor no ofrece soporte para el descubrimiento de servicios"
+
+msgid "XMPP Service Discovery"
+msgstr "Descubrimiento de servicios XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Permite buscar y registrar servicios."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Este complemento es útil para registrarse con transportes antiguos o con otros servicios XMPP."
+
 msgid "Buddy is idle"
 msgstr "El amigo está inactivo"
 
@@ -13450,11 +13707,8 @@ msgstr "Complemento de mensajería musical para composición colaborativa."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"El complemento de mensajería musical permite trabajar a distintos usuarios "
-"de forma simultánea en una pieza de música editando una partitura común en "
-"tiempo real."
+"on a piece of music by editing a common score in real-time."
+msgstr "El complemento de mensajería musical permite que distintos usuarios trabajen de forma simultánea en una pieza de música al permitir editar una partitura común en tiempo real."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -13565,12 +13819,6 @@ msgstr ""
 "- Envía un mensaje a las personas en su lista inmediatamente cuando se "
 "conectan"
 
-msgid "Cursor Color"
-msgstr "Color del puntero"
-
-msgid "Secondary Cursor Color"
-msgstr "Color secundario del puntero"
-
 msgid "Hyperlink Color"
 msgstr "Color de hiperenlace"
 
@@ -13580,6 +13828,9 @@ msgstr "Color de hiperenlace visitado"
 msgid "Highlighted Message Name Color"
 msgstr "Color para mensajes resaltados por nombre"
 
+msgid "Typing Notification Color"
+msgstr "Color de notificación de tecleo"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separación horizontal GtkTreeView"
 
@@ -13595,6 +13846,7 @@ msgstr "Diálogo de notificación"
 msgid "Select Color"
 msgstr "Seleccionar el color"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "Seleccionar tipografía de la interfaz"
 
@@ -13608,35 +13860,21 @@ msgstr "Tipografía de la interfaz GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atajos de teclado GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Colores de la interfaz"
+msgid "Disable Typing Notification Text"
+msgstr "Desactivar el texto de la notificación de tecleo"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Configuración del tema GTK+"
 
-msgid "Widget Sizes"
-msgstr "Tamaño de los controles"
+msgid "Colors"
+msgstr "Colores"
 
 msgid "Fonts"
 msgstr "Tipografía"
 
+msgid "Miscellaneous"
+msgstr "Miscelánea"
+
 msgid "Gtkrc File Tools"
 msgstr "Herramientas de ficheros Gtkrc"
 
@@ -13724,7 +13962,7 @@ msgstr "Botón «enviar» de la ventana de conversación."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Añade un botón «Enviar» al área de entrada de datos de la ventana de "
 "conversación. Útil para cuando no hay un teclado físico disponible."
@@ -13782,6 +14020,95 @@ msgstr ""
 "Reemplaza el texto de los mensajes salientes según las reglas definidas por "
 "el usuario."
 
+msgid "Just logged in"
+msgstr "Acaba de conectarse"
+
+msgid "Just logged out"
+msgstr "Se acaba de desconectar"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Icono para contactos/\n"
+"Icono para personas desconocidas"
+
+msgid "Icon for Chat"
+msgstr "Icono para el chat"
+
+msgid "Ignored"
+msgstr "Ignorado"
+
+msgid "Founder"
+msgstr "Fundador"
+
+msgid "Operator"
+msgstr "Operador"
+
+msgid "Half Operator"
+msgstr "Semi-Operador"
+
+msgid "Authorization dialog"
+msgstr "Diálogo de autorización"
+
+msgid "Error dialog"
+msgstr "Diálogo de error "
+
+msgid "Information dialog"
+msgstr "Diálogo de información"
+
+msgid "Mail dialog"
+msgstr "Diálogo de correo"
+
+msgid "Question dialog"
+msgstr "Diálogo de pregunta"
+
+msgid "Warning dialog"
+msgstr "Diálogo de aviso"
+
+msgid "What kind of dialog is this?"
+msgstr "¿Qué tipo de diálogo es éste?"
+
+msgid "Status Icons"
+msgstr "Iconos de estado"
+
+msgid "Chatroom Emblems"
+msgstr "Emblemas de la sala de chat"
+
+msgid "Dialog Icons"
+msgstr "Iconos de dialogo"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Editor de temas de iconos de Pidgin"
+
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Editor de temas de la lista de amigos de Pidgin"
+
+msgid "Edit Buddylist Theme"
+msgstr "Editar el tema de la lista de amigos"
+
+msgid "Edit Icon Theme"
+msgstr "Editar el tema de iconos"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Editor de temas de Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Editor de temas de Pidgin"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13824,6 +14151,7 @@ msgid "Timestamp Format Options"
 msgstr "Opciones de formato de marca de tiempo"
 
 # JFS: Is this complete? REVIEW
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Forzar formato de tiempo de 24 horas"
 
@@ -13945,9 +14273,6 @@ msgstr "_Mantener la ventana de lista de amigos por encima del resto"
 msgid "Only when docked"
 msgstr "Solamente cuando se apile"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_Destello de ventana cuando se reciben mensajes de chat"
-
 msgid "Windows Pidgin Options"
 msgstr "Opciones de Pidgwin en Windows"
 
@@ -13955,10 +14280,8 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Opciones específicas de %s para Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-"Contiene las opciones específicas al Pidgin de Windows como el apilado de la "
-"lista de amigos."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Contiene las opciones específicas a Pidgin para Windows, como por ejemplo el apilado de la lista de amigos."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Desconectado.</font>"
@@ -13997,6 +14320,540 @@ msgstr "Enviar y recibir entradas XMPP en crudo."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
+#, fuzzy
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "No se pudo conectar al servidor."
+
+#, fuzzy
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "No se pudo cargar la clave pública SILC"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s ha declinado su invitación de conferencia en la sala «%s» por «%s»."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Invitación rechazada"
+
+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "Proxy"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "No se pudo abrir el socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "No se pudo escuchar en el socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "No se pudo leer el socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Falló la conexión."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "El servidor se ha desconectado"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "No se pudo crear el socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "No se pudo conectar al servidor"
+
+#~ msgid "Read error"
+#~ msgstr "Error de lectura"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo establecer una conexión con el servidor:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Error de escritura"
+
+#~ msgid "Last Activity"
+#~ msgstr "Última actividad"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Información de descubrimiento de servicio"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Elementos de descubrimiento de servicio"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Dirección de grupo extendida"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Chat multiusuario"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Información de presencia extendida en chat multiusuario"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Flujos de bytes en banda"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Órdenes ad-hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Servicio PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Flujos de bytes SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Datos fuera de banda"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Registro en línea"
+
+#~ msgid "User Location"
+#~ msgstr "Ubicación del usuario"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar del usuario"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notificaciones de estado de chat"
+
+#~ msgid "Software Version"
+#~ msgstr "Versión del programa"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Origen del flujo"
+
+#~ msgid "User Mood"
+#~ msgstr "Estado de ánimo del usuario"
+
+#~ msgid "User Activity"
+#~ msgstr "Actividad de usuario"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capacidades de la entidad"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negociaciones de sesiones cifradas"
+
+#~ msgid "User Tune"
+#~ msgstr "Música del usuario"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Intercambio de elementos de la lista"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Dirección alcanzable"
+
+#~ msgid "User Profile"
+#~ msgstr "Perfil de usuario"
+
+# JFS: Jingle es un protocolo de transporte, no se traduce
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Audio Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Nombre de usuario"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle UDP en crudo"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Vídeo Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "DTMF Jingle"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Recibos de mensajes"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publicación de la clave pública"
+
+#~ msgid "User Chatting"
+#~ msgstr "Chatear con usuarios"
+
+#~ msgid "User Browsing"
+#~ msgstr "Navegar usuarios"
+
+#~ msgid "User Gaming"
+#~ msgstr "Jugar con usuarios"
+
+#~ msgid "User Viewing"
+#~ msgstr "Ver usuarios"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Cifrado de grupo"
+
+#~ msgid "Entity Time"
+#~ msgstr "Tiempo de entidad"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Envío con demora"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Objetods de datos colaborativos"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Repositorio de archivos y compartición"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Servidor de descubrimiento STUN para Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negociación de sesión cifrada simplificada"
+
+#~ msgid "Hop Check"
+#~ msgstr "Comprobación de saltos"
+
+#~ msgid "Read Error"
+#~ msgstr "Error de lectura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "No se pudo conectar al servidor."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Cola de lectura llena (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "No se pudo interpretar el mensaje"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "No se pudo conectar al servidor: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Fallo en la conexión (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Ha sido desconectado porque se ha conectado desde otra estación de "
+#~ "trabajo."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error. El soporte de SSL no está instalado."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Contraseña incorrecta."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo conectar al servidor BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Quizá sea desconectado en breve.  Compruebe %s para novedades."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "No se pudo conectar"
+
+#~ msgid "Invalid username."
+#~ msgstr "Nombre de usuario no válido."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "No se pudo descifrar la respuesta del servidor"
+
+#~ msgid "Connection lost"
+#~ msgstr "Conexión perdida"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "No se pudo resolver el nombre"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Conexión cerrada (escribiendo)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Conexión rehusada"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Error al leer del socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "No se pudo conectar al servidor"
+
+#~ msgid "Could not write"
+#~ msgstr "No se pudo escribir"
+
+#~ msgid "Could not connect"
+#~ msgstr "No se pudo conectar"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "No se pudo crear el socket de escucha"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "No se pudo resolver el nombre de sistema"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Contraseña incorrecta"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo establecer una conexión con %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japón"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Servidor de buscapersonas japonés"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Servidor de transferencia de archivos japonés"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Se ha perdido la conexión con el servidor\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "No se pudo resolver el nombre de equipo"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "El servidor requiere SSL para conectarse. No se dispone de soporte TLS/"
+#~ "SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Ocultar ventana de conversación"
+
+#~ msgid "More Data needed"
+#~ msgstr "Son necesarios más datos"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Indique un atajo para asociarlo al emoticono."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Escoja una imagen para el emoticono."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "¿Qué ID quiere activar?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Color del puntero"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Color secundario del puntero"
+
+#~ msgid "Interface colors"
+#~ msgstr "Colores de la interfaz"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Tamaño de los controles"
+
+#~ msgid "Invite message"
+#~ msgstr "Mensaje de invitacio"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Introduzca el nombre de usuario al que desea invitar,\\n\n"
+#~ "junto con un mensaje de invitación opcional."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "No se pudo obtener el libro de direcciones de MSN"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
+#~ "resuelva.  Compruebe %s para novedades."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Buscando %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Falló la conexión a %s"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Conectado: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "No se pudo escribir el archivo %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "No se pudo leer el archivo %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Mensaje demasiado largo, los últimos %s bytes fueron borrados."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s no está conectado ahora."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "No se permiten advertencias de %s."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "El mensaje ha sido descartado, usted esta excediendo el límite de "
+#~ "velocidad del servidor."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "No está disponible el chat en %s."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Esta enviando mensajes demasiado rápido a %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Usted perdió un MI de %s porque era demasiado largo."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Usted perdió un MI de %s porque fue mandado demasiado rápido."
+
+#~ msgid "Failure."
+#~ msgstr "Fallo."
+
+#~ msgid "Too many matches."
+#~ msgstr "Demasiados resultados."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Necesito más calificadores."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Servicio de directorio temporalmente no disponible."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Búsqueda de direcciones de correo electrónico restringida."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Palabra clave ignorada."
+
+#~ msgid "No keywords."
+#~ msgstr "Sin palabras clave."
+
+#~ msgid "User has no directory information."
+#~ msgstr "El usuario no tiene información en el directorio."
+
+#~ msgid "Country not supported."
+#~ msgstr "País no soportado."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Fallo desconocido: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Nombre de usuario o contraseña incorrecta."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Servicio temporalmente no disponible."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Su nivel de advertencias es demasiado alto para conectarse."
+
+#~ 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 ""
+#~ "Se ha conectado y desconectado demasiadas veces. Espere diez minutos e "
+#~ "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
+#~ "tiempo."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Ha ocurrido un error desconocido al conectarse: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Un error desconocido, %d, ha ocurrido. Info: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Nombre de grupo inválido"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Conexión cerrada"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Esperando respuesta..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC ha terminado su pausa. Ya puede volver a mandar mensajes."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "La contraseña se ha cambiado con éxito"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Obtener información del directorio"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Guardar información del directorio"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "¡No se pudo abrir %s para escritura!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Se produjo un fallo en la transferencia del archivo; posiblemente fue "
+#~ "cancelado por el otro extremo."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "No se pudo conectar para realizar la transferencia."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr ""
+#~ "No se pudo escribir la cabecera de archivo.  El archivo no será "
+#~ "transferido."
+
+#~ msgid "Save As..."
+#~ msgstr "Guardar como..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s solicita %s para aceptar %d archivo: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s solicita %s para aceptar %d archivos: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s le solicita que le mande un archivo"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Complemento de protocolo TOC"
+
+#~ msgid "%s Options"
+#~ msgstr "Opciones de %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Opciones del proxy"
+
+#~ msgid "By log size"
+#~ msgstr "Por tamaño de registro"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Abrir enlace en navegador"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Servidor ST_UN:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Imagen de emoticono"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Ata_jos de emoticonos"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Destello de ventana cuando se reciben mensajes de chat"
+
 #~ msgid "Connection to server lost (no data received within %d second)"
 #~ msgid_plural ""
 #~ "Connection to server lost (no data received within %d seconds)"
@@ -14257,9 +15114,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "Su solicitud de unirse al grupo %d ha sido aprobada por el administrador %"
 #~ "d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Se ha añadido este grupo a su lista de amigos."
-
 #~ msgid "I am applying to join"
 #~ msgstr "He solicitado unirme"
 
@@ -14293,9 +15147,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "No pudo conectarse, compruebe el registro de depuración."
 
-#~ msgid "Unable to login"
-#~ msgstr "No pudo conectarse"
-
 #~ msgid "Failed room reply"
 #~ msgstr "Fallo en la respuesta a la sala"
 
@@ -14342,9 +15193,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(obteniendo)</i>"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Error al solicitar un testigo de conexión"
-
 #~ msgid "TCP Address"
 #~ msgstr "Dirección TCP"
 
@@ -14406,14 +15254,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "Lo siento, MySpace no permite el uso de contraseñas de más de %d "
 #~ "caracteres de longitud (la suya tiene %d)."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Por favor, vaya a http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username, escoja un nombre de usuario e intente "
-#~ "conectarse de nuevo."
-
 #~ msgid "Screen name sent"
 #~ msgstr "Se ha enviado el nombre de usuario"
 
@@ -14452,9 +15292,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "sobrenombre se mostrará en lugar del nombre de usuario siempre que sea "
 #~ "posible.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Cuenta:"
-
 #~ msgid "User has typed something and stopped"
 #~ msgstr "El usuario ha escrito algo y ha parado"
 
@@ -14739,9 +15576,9 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "automática global en el diálogo de las opciones del complemento. Si "
 #~ "quiere establecer mensajes de respuesta particulares para un amigo sólo "
 #~ "tiene que pulsar con el botón derecho sobre el amigo en la ventana con la "
-#~ "lista de amigos. Vaya a la pestaña «Avanzadas» en el diálogo de edición "
-#~ "de cuentas si quiere configurar un mensaje de respuesta automática para "
-#~ "sólo alguna de sus cuentas."
+#~ "lista de amigos. Vaya a la pestaña «Avanzadas» en el diálogo de edición de "
+#~ "cuentas si quiere configurar un mensaje de respuesta automática para sólo "
+#~ "alguna de sus cuentas."
 
 #~ msgid "Set autoreply message for %s"
 #~ msgstr "Fijar el mensaje de respuesta automática para %s"
@@ -14908,12 +15745,12 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "Cuando esto ocurre, TOC ignora todos los mensajes que se le envían y "
-#~ "puede expulsarle si envía mensajes. Pidgin evitará que le llegue cualquier "
-#~ "cosa. Esto es sólo temporal, por favor, sea paciente."
+#~ "puede expulsarle si envía mensajes. Pidgin evitará que le llegue "
+#~ "cualquier cosa. Esto es sólo temporal, por favor, sea paciente."
 
 #~ msgid "Pidgin - Save As..."
 #~ msgstr "Pidgin - Guardar como..."
@@ -14921,8 +15758,8 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "El método de autenticación habitual falló. Esto significa o bien que que "
 #~ "su contraseña no es correcta o bien que el sistema de autenticación de "
@@ -14940,9 +15777,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "\n"
 #~ "Inactivo: %s"
 
-#~ msgid "Nickname: %s\n"
-#~ msgstr "Apodo: %s\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Nickname:</b> %s"
@@ -14980,13 +15814,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Descripción:</b> Terrorífica"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15224,7 +16051,8 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgstr "Ajuste de la función"
 
 #~ msgid "Displays an icon for Pidgin in the system tray."
-#~ msgstr "Muestra un icono para Pidgin en el área de notificación del sistema."
+#~ msgstr ""
+#~ "Muestra un icono para Pidgin en el área de notificación del sistema."
 
 #~ msgid ""
 #~ "Displays a system tray icon (in GNOME, KDE, or Windows for example) to "
@@ -15241,9 +16069,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "DBus"
 #~ msgstr "DBus"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s se ha desconectado."
-
 #~ msgid "Buddy icon:"
 #~ msgstr "Icono de amigo:"
 
@@ -15253,15 +16078,9 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Screen Name:"
 #~ msgstr "Nombre de usuario:"
 
-#~ msgid "Background color name"
-#~ msgstr "Nombre del color de fondo"
-
 #~ msgid "Background color as a string"
 #~ msgstr "Cadena del color de fondo"
 
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "Color de fondo como un GdkColor"
-
 #~ msgid "Background set"
 #~ msgstr "Establecer color de fondo"
 
@@ -15325,9 +16144,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Calling %s"
 #~ msgstr "Llamando %s"
 
-#~ msgid "End Call"
-#~ msgstr "Terminar llamada"
-
 #~ msgid "Receiving call from %s"
 #~ msgstr "Recibiendo llamada de %s"
 
@@ -15740,9 +16556,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "/Tools/A_ccounts"
 #~ msgstr "/Herramientas/_Cuentas"
 
-#~ msgid "Idle "
-#~ msgstr "Inactivo "
-
 #~ msgid "/Tools/Account Actions"
 #~ msgstr "/Herramientas/Acciones de cuentas"
 
@@ -15769,9 +16582,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "_Idle"
 #~ msgstr "_Inactivo"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "Dejar de estar i_nactivo"
-
 # Examinar puede ser también válido, comprobar, jfs.
 #~ msgid "Bro_wse..."
 #~ msgstr "_Navegar..."
@@ -15836,9 +16646,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgstr[0] "(%d mensaje)"
 #~ msgstr[1] "(%d mensajes)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 mensaje)"
-
 #~ msgid "Default auto-away"
 #~ msgstr "Auto-ausencia por omisión"
 
@@ -15906,8 +16713,8 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "Gives Pidgin the ability to be remote-controlled through third-party "
 #~ "applications or through the Pidgin-remote tool."
 #~ msgstr ""
-#~ "Permite que Pidgin sea controlado de forma remota a través de aplicaciones "
-#~ "de terceros o de la herramienta de control remoto de Pidgin."
+#~ "Permite que Pidgin sea controlado de forma remota a través de "
+#~ "aplicaciones de terceros o de la herramienta de control remoto de Pidgin."
 
 #~ msgid "Docked _Buddy List is always on top"
 #~ msgstr "La lista de _amigos apilada está siempre encima del resto"
@@ -16010,8 +16817,7 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "Enviar un MI a un nombre de usuario:\n"
 #~ "\tPidgin-remote uri 'aim:goim?screenname=Pingüino&message=hola+mundo'\n"
 #~ "En este caso, «Pingüino» es el nombre de usuario al que se le quiere\n"
-#~ "enviar un MI, y «hola mundo» es el mensaje a enviar. Se debe utilizar "
-#~ "'+'\n"
+#~ "enviar un MI, y «hola mundo» es el mensaje a enviar. Se debe utilizar '+'\n"
 #~ "en lugar de los espacios en blanco.\n"
 #~ "Por favor, tenga en cuenta el entrecomillado utilizado arriba. Si "
 #~ "ejecuta\n"
@@ -16079,9 +16885,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Enviar un mensaje al amigo seleccionado"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Obtener información sobre el amigo seleccionado"
-
 #~ msgid "_Chat"
 #~ msgstr "_Charlar"
 
@@ -16298,9 +17101,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Summary"
 #~ msgstr "Resumen"
 
-#~ msgid "Message Text"
-#~ msgstr "Texto de los mensajes"
-
 #~ msgid "Please create an account."
 #~ msgstr "Por favor, cree una cuenta."
 
@@ -16361,8 +17161,8 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgstr "No se pudieron cargar las preferencias"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
 #~ "Pidgin no pudo cargar sus preferencias porque están almacenadas en un "
@@ -16381,9 +17181,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Invisible for friends only"
 #~ msgstr "Invisible sólo para los amigos"
 
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "No se pudo resolver el nombre del servidor."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "Error al escribir al socket."
 
@@ -16451,8 +17248,8 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "Pidgin was unable to complete your request due to a problem communicating "
 #~ "with the Gadu-Gadu HTTP server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin no pudo completar su petición debido a problemas al comunicarse con "
-#~ "el servidor HTTP de Gadu-Gadu.  Vuelva a intentarlo más tarde."
+#~ "Pidgin no pudo completar su petición debido a problemas al comunicarse "
+#~ "con el servidor HTTP de Gadu-Gadu.  Vuelva a intentarlo más tarde."
 
 #~ msgid "Unable to import Gadu-Gadu buddy list"
 #~ msgstr "No se pudo importar la lista de amigos de Gadu-Gadu"
@@ -16468,8 +17265,8 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "Pidgin was unable to connect to the buddy list server.  Please try again "
 #~ "later."
 #~ msgstr ""
-#~ "Pidgin no pudo conectarse con el servidor de listas de amigos.  Por favor, "
-#~ "inténtelo más tarde."
+#~ "Pidgin no pudo conectarse con el servidor de listas de amigos.  Por "
+#~ "favor, inténtelo más tarde."
 
 #~ msgid "Unable to delete Gadu-Gadu buddy list"
 #~ msgstr "No se pudo borrar la lista de amigos Gadu-Gadu"
@@ -16478,15 +17275,15 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgstr "No se pudo acceder al directorio"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin no pudo buscar en el directorio porque no pudo conectarse con el "
 #~ "servidor de directorio. Por favor, inténtelo más tarde."
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin no pudo cambiar su contraseña porque no pudo conectarse con el "
 #~ "servidor Gadu-Gadu. Por favor, inténtelo más tarde."
@@ -16495,8 +17292,8 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgstr "No se pudo acceder al perfil del usuario."
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin no pudo acceder al perfil de este usuario debido a un error al "
 #~ "intentar conectarse al servidor de directorio. Por favor, inténtelo de "
@@ -16643,8 +17440,8 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "Unable to guess the image type based on the file extension supplied.  "
 #~ "Defaulting to PNG."
 #~ msgstr ""
-#~ "Pidgin no ha podido deducir el tipo de imagen a partir de la extensión del "
-#~ "archivo. Tomando PNG por omisión."
+#~ "Pidgin no ha podido deducir el tipo de imagen a partir de la extensión "
+#~ "del archivo. Tomando PNG por omisión."
 
 #~ msgid "SILC Public Key"
 #~ msgstr "Clave pública SILC"
@@ -16655,9 +17452,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Myanmar"
 #~ msgstr "Myanmar"
 
-#~ msgid "Miscellaneous error"
-#~ msgstr "Error misceláneo"
-
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr ""
 #~ "Error desconocido cuando se intentaba obtener autorización del servidor "
@@ -16676,11 +17470,11 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgstr "No se ha podido enviar el mensaje por motivos desconocidos."
 
 #~ msgid ""
-#~ "Pidgin cannot send files over Yahoo! that are bigger than %d megabytes (%d "
-#~ "bytes)."
+#~ "Pidgin cannot send files over Yahoo! that are bigger than %d megabytes (%"
+#~ "d bytes)."
 #~ msgstr ""
-#~ "Pidgin no puede enviar archivos más grandes que de %d megabytes (%d bytes) "
-#~ "a través de Yahoo!"
+#~ "Pidgin no puede enviar archivos más grandes que de %d megabytes (%d "
+#~ "bytes) a través de Yahoo!"
 
 #~ msgid ""
 #~ "(There was an error converting this message.  Check the 'Encoding' option "
@@ -16783,9 +17577,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "User Count:\t\t%d\n"
 #~ msgstr "Cuenta de usuarios:\t\t%d\n"
 
-#~ msgid "_Browse"
-#~ msgstr "_Navegador"
-
 #~ msgid "Show IMs and chats in _same tabbed window"
 #~ msgstr "Mo_strar MIs y chats en la misma ventana con solapas."
 
@@ -16915,9 +17706,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Use custom si_ze"
 #~ msgstr "Usar _tamaño personalizado"
 
-#~ msgid "Color"
-#~ msgstr "Color"
-
 #~ msgid "Show _URLs as links"
 #~ msgstr "Mostrar _URLs como enlaces"
 
@@ -16948,9 +17736,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Hide window on _send"
 #~ msgstr "Ocultar la ventana al _enviar"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Completado con el tabulador"
-
 #~ msgid "_Tab-complete nicks"
 #~ msgstr "_Tab completa los apodos"
 
@@ -17387,9 +18172,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "DCC Chat with %s established"
 #~ msgstr "Chat vía DCC con %s establecida"
 
-#~ msgid "IRC Operator"
-#~ msgstr "Operador IRC"
-
 #~ msgid "%s is an Identified User"
 #~ msgstr "%s es un usuario identificado"
 
@@ -17535,8 +18317,8 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "Pidgin is converting your old buddy lists to a new format, which will now "
 #~ "be located at %s"
 #~ msgstr ""
-#~ "Pidgin está convirtiendo la lista antigua de amigos a un nuevo formato, que "
-#~ "residirá en %s"
+#~ "Pidgin está convirtiendo la lista antigua de amigos a un nuevo formato, "
+#~ "que residirá en %s"
 
 #~ msgid "Converting Buddy List"
 #~ msgstr "Convirtiendo lista de amigos"
@@ -17593,9 +18375,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "Permite añadir salas de chat a su lista de amigos. Pulse el botón de "
 #~ "configuración para escoger las salas."
 
-#~ msgid "Pidgin - Buddy Ticker"
-#~ msgstr "Pidgin - Lista de amigos"
-
 #~ msgid "<b>Status:</b> %s%s%s"
 #~ msgstr "<b>Estado:</b> %s%s%s"
 
@@ -17612,8 +18391,8 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgstr "Pidgin no pudo enviar un mensaje MSN"
 
 #~ msgid ""
-#~ "Pidgin encountered an error communicating with the MSN switchboard server.  "
-#~ "Please try again later."
+#~ "Pidgin encountered an error communicating with the MSN switchboard "
+#~ "server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin encontró un error mientras se comunicaba con el servidor MSN de "
 #~ "'switchboard'.  Por favor, vuelva a intentar más tarde."
diff --git a/po/et.po b/po/et.po
index 0f26d416f3..e3e0ae81b5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-09-30 08:10+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -26,13 +26,13 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Täpsemate andmete saamiseks kasuta `%s -h'.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -608,20 +608,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Kellele saata"
 
-msgid "Invite message"
-msgstr "Kutse sõnum"
-
-msgid "Invite"
-msgstr "Kutsu"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Palun sisesta selle kasutaja nimi, keda sa soovid\n"
-"jututuppa kutsuda. Kui sisestad ka sõnumi, siis\n"
-"saadetakse see sõbrale koos kutsumisteatega."
-
 msgid "Conversation"
 msgstr "Vestlus"
 
@@ -873,6 +859,41 @@ msgstr "Kõik vestlused"
 msgid "System Log"
 msgstr "Süsteemne logi"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Arvutamine..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Nõustu"
+
+msgid "Reject"
+msgstr "Lükka tagasi"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Sa lahkusid sellest vestlusest."
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "E-sõnumid"
 
@@ -907,6 +928,9 @@ msgstr "Jätka"
 msgid "IM"
 msgstr "Välksõnum"
 
+msgid "Invite"
+msgstr "Kutsu"
+
 msgid "(none)"
 msgstr "(puudub)"
 
@@ -1108,7 +1132,6 @@ msgstr "%s eemaldus. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s saatis sulle sõnumi. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tundmatu teavitussündmus. Palun anna sellest teada!"
 
@@ -1154,7 +1177,6 @@ msgstr "Mitme minuti möödudes olekut muudetakse"
 msgid "Change status to"
 msgstr "Uueks olekuks saab"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Vestlused"
 
@@ -1475,7 +1497,6 @@ msgstr ""
 "Vestluse avamisel lisab see plugin avatava vestluse aknasse viimase vestluse "
 "logi."
 
-#, c-format
 msgid "Online"
 msgstr "Ühendatud"
 
@@ -1519,6 +1540,28 @@ msgstr "GntViimaneLogi"
 msgid "Lastlog plugin."
 msgstr "Viimase logi plugin."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "Loo URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "kontod"
 
@@ -1619,13 +1662,6 @@ msgstr "Kas nõustuda subjekti \"%s\" sertifikaadiga?"
 msgid "SSL Certificate Verification"
 msgstr "SSL-sertifikaadi verifitseerimine"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Nõustu"
-
-msgid "Reject"
-msgstr "Lükka tagasi"
-
 msgid "_View Certificate..."
 msgstr "_Vaata sertifikaati..."
 
@@ -1722,6 +1758,8 @@ msgstr "+++ %s logis sisse"
 msgid "+++ %s signed off"
 msgstr "+++ %s logis välja"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -1768,6 +1806,18 @@ msgstr "%s väljus toast."
 msgid "%s left the room (%s)."
 msgstr "%s väljus toast (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Konverentsile kutsumine"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Palun sisesta selle kasutaja nimi, keda sa soovid jututuppa kutsuda. Kui "
+"sisestad ka sõnumi, siis saadetakse see sõbrale koos kutsumisteatega."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Tõrge ühenduse hankimisel: %s"
@@ -1902,7 +1952,6 @@ msgstr "Faili %s ülekandmise alustamine kasutajalt %s"
 msgid "Transfer of file %s complete"
 msgstr "Fail %s täielikult üle kantud"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Fail on täielikult üle kantud"
 
@@ -1910,7 +1959,6 @@ msgstr "Fail on täielikult üle kantud"
 msgid "You canceled the transfer of %s"
 msgstr "Sa katkestasid faili %s ülekandmise"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Faili ülekandmine katkestatud"
 
@@ -2109,11 +2157,14 @@ msgstr "<font color=\"red\"><b>Faili pole võimalik lugeda: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATVASTUS>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Viga ühenduse loomisel"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Sul on kasutusel %s kuid selle plugina jaoks on vajalik %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "See plugin pole ID-d defineerinud."
 
@@ -2511,9 +2562,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Teiste välksõnumiprogrammide logide kaasamine logivaatajasse."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2567,8 +2619,9 @@ msgstr "Võrguvabade sõnumite emuleerimine"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Ühendamata kasutajatele sõnumite salvestamine sõbramärguannetena."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Ülejäänud sõnumid salvestatakse sõbramärguannetena. Salvestatud märguandeid "
@@ -2602,6 +2655,32 @@ msgstr "Võrguvabade sõnumite salvestamine märguannetena"
 msgid "Do not ask. Always save in pounce."
 msgstr "Küsimusi ei esitata, alati salvestatakse märguannetena."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Sisesta parool"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2793,15 +2872,17 @@ msgstr ""
 "kasutada, siis pead sa paigaldama ActiveTCL'i aadressilt http://www."
 "activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Apple Bonjour For Windows tööriistakomplekti ei leitud. Täiendavat teavet "
 "saad korduma kippuvate küsimuste (FAQ) alt aadressilt http://d.pidgin.im/"
 "BonjourWindows."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Sissetulevaid välksõnumiühendusi pole võimalik kuulata\n"
 
 msgid ""
@@ -2809,7 +2890,6 @@ msgid ""
 msgstr ""
 "Kohaliku mDNS-serveriga pole võimalik ühendust saada.  Kas see üldse töötab?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Eesnimi"
 
@@ -2841,6 +2921,11 @@ msgstr "Bonjour protokolli plugin"
 msgid "Purple Person"
 msgstr ""
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Paikkond"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2852,14 +2937,21 @@ msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Sõnumit pole võimalik saata ja seetõttu pole võimalik ka vestlust algatada."
 
-msgid "Cannot open socket"
-msgstr "Soklit pole võimalik avada"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Soklit pole võimalik luua:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Soklit pole võimalik porti kuulama panna"
 
-msgid "Could not listen on socket"
-msgstr "Soklit pole võimalik kuulata"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Soklit pole võimalik luua:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Viga kohaliku mDNSResponder'iga suhtlemisel."
@@ -2906,13 +2998,16 @@ msgstr "Sõbranimekirja salvestamine..."
 msgid "Load buddylist from file..."
 msgstr "Sõbranimekirja laadimine failist..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Täida registreerumiseks vajalikud väljad."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Paroolid ei klapi omavahel."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Uut kontot pole vea tõttu võimalik registreerida.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2924,14 +3019,15 @@ msgstr "Registreerimine edukalt läbi viidud!"
 msgid "Password"
 msgstr "Parool"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Parool (uuesti)"
 
-msgid "Enter current token"
-msgstr "Sisesta praegune tõend"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Praegune tõend"
+#, fuzzy
+msgid "Captcha"
+msgstr "Pildi salvestamine"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Uue Gadu-Gadu konto registreerimine"
@@ -2984,6 +3080,15 @@ msgstr "Parool on edukalt muudetud!"
 msgid "Current password"
 msgstr "Praegune parool"
 
+msgid "Password (retype)"
+msgstr "Parool (uuesti)"
+
+msgid "Enter current token"
+msgstr "Sisesta praegune tõend"
+
+msgid "Current token"
+msgstr "Praegune tõend"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Palun sisesta oma praegune parool ja uus parool UIN-i jaoks: "
 
@@ -2997,13 +3102,13 @@ msgstr "Sõbra jaoks vestluse valimine: %s"
 msgid "Add to chat..."
 msgstr "Lisa vestlusesse..."
 
+#. Global
 msgid "Available"
 msgstr "Saadaval"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Eemal"
 
@@ -3031,8 +3136,8 @@ msgstr "Sobivaid kasutajaid ei leitud"
 msgid "There are no users matching your search criteria."
 msgstr "Sellele otsingukriteeriumile vastavaid kasutajaid ei leitud."
 
-msgid "Unable to read socket"
-msgstr "Soklit pole võimalik lugeda"
+msgid "Unable to read from socket"
+msgstr "Soklist pole võimalik lugeda"
 
 msgid "Buddy list downloaded"
 msgstr "Sõbranimekiri alla laaditud"
@@ -3046,8 +3151,14 @@ msgstr "Sõbranimekiri üles laaditud"
 msgid "Your buddy list was stored on the server."
 msgstr "Sinu sõbranimekiri on serverisse üles laaditud."
 
-msgid "Connection failed."
-msgstr "Tõrge ühendumisel."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Ühendatud"
+
+msgid "Connection failed"
+msgstr "Tõrge ühendumisel"
 
 msgid "Add to chat"
 msgstr "Vestlusese lisamine"
@@ -3055,13 +3166,23 @@ msgstr "Vestlusese lisamine"
 msgid "Chat _name:"
 msgstr "Vestluse _nimi:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Serveriga pole võimalik ühenduda."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Ühendumine"
+
 msgid "Chat error"
 msgstr "Viga vestlusel"
 
 msgid "This chat name is already in use"
 msgstr "Selline vestluse nimi on juba kasutusel"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Puudub ühendus serveriga."
 
 msgid "Find buddies..."
@@ -3103,6 +3224,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu kasutaja"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Määra kasutajateave..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tundmatu käsk: %s"
@@ -3117,7 +3242,8 @@ msgstr "Teemat pole seatud"
 msgid "File Transfer Failed"
 msgstr "Tõrge faili ülekandmisel"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Kuulatavat porti pole võimalik avada."
 
 msgid "Error displaying MOTD"
@@ -3133,8 +3259,18 @@ msgstr "Selle ühendusega pole päevasõnumit seotud"
 msgid "MOTD for %s"
 msgstr "%s päevasõnum"
 
-msgid "Server has disconnected"
-msgstr "Server katkestas ühenduse"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Ühendus serveriga katkes:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Vaata päevasõnumit"
@@ -3145,25 +3281,24 @@ msgstr "Ka_nal:"
 msgid "_Password:"
 msgstr "_Parool:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nimed ei tohi sisaldada tühje kohti"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Ühendumine"
-
 msgid "SSL support unavailable"
 msgstr "SSL-i tugi pole saadaval"
 
-msgid "Couldn't create socket"
-msgstr "Soklit pole võimalik luua"
+msgid "Unable to connect"
+msgstr "Ühendumine pole võimalik"
 
-msgid "Couldn't connect to host"
-msgstr "Hostiga pole võimalik ühenduda"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Ühendumine pole võimalik"
 
-msgid "Read error"
-msgstr "Viga lugemisel"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server sulges ühenduse."
 
 msgid "Users"
 msgstr "Kasutajad"
@@ -3344,6 +3479,17 @@ msgstr ""
 "Sinu valitud hüüdnimi lükati serveri poolt tagasi, arvatavasti sisaldab nimi "
 "lubamatuid märke."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Selline vestluse nimi on juba kasutusel"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Hüüdnimi"
+
 msgid "Cannot change nick"
 msgstr "Hüüdmine pole võimalik muuta"
 
@@ -3563,10 +3709,12 @@ msgstr "Tõrge Ad-Hoc käsu täitmisel"
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server vajab sisselogimiseks TLS/SSL-i.  TLS/SSL-i tuge ei leitud."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Sa vajad krüptimist, kuid TLS/SSL-i tuge ei leitud."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3583,18 +3731,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Avatekstiline autentimine"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Tõrge autentimisel"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Server tagastas vigase vastuse."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server ei kasuta ühtegi toetatud autentimismeetodit"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Sa nõuad krüptimist aga selles serveris pole see toetatud."
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL-i viga"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Põhjendust pole määratud."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Toetamata versioon"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Selle serveriga pole võimalik ühendust luua:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Selle serveriga pole võimalik ühendust luua:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Ühendust pole võimalik lähtestada"
+
 msgid "Full Name"
 msgstr "Täisnimi"
 
@@ -3661,158 +3845,9 @@ msgstr "Klient"
 msgid "Operating System"
 msgstr "Operatsioonisüsteem"
 
-msgid "Last Activity"
-msgstr "Viimati aktiivne"
-
-msgid "Service Discovery Info"
-msgstr "Teenuse avastamise andmed"
-
-msgid "Service Discovery Items"
-msgstr "Teenuse avastamise kirjed"
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr "Mitmekasutaja vestlus"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc käsud"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 baidivood"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Kasutaja asukoht"
-
-msgid "User Avatar"
-msgstr "Kasutaja avatar"
-
-msgid "Chat State Notifications"
-msgstr "Vestluste olekust teavitaja"
-
-msgid "Software Version"
-msgstr "Tarkvara versioon"
-
-msgid "Stream Initiation"
-msgstr "Voo lähtestamine"
-
-msgid "File Transfer"
-msgstr "Failiülekanne"
-
-msgid "User Mood"
-msgstr "Kasutaja meeleolu"
-
-msgid "User Activity"
-msgstr "Kasutaja aktiivsus"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr "Krüptitud seansi läbirääkimised"
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Kasutajaprofiil"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Kasutaja hüüdnimi"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "Sõnumi vastuvõtjad"
-
-msgid "Public Key Publishing"
-msgstr "Avaliku võtme avalikustamine"
-
-msgid "User Chatting"
-msgstr "Kasutaja lobiseb"
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr "Kasutaja mängib"
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr "Viivitusega kohaletoimetamine"
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-teenuse avastamine Jingle jaoks"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Lihtsustatud krüptitud seansi läbirääkimised"
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Võimalused"
+#, fuzzy
+msgid "Local Time"
+msgstr "Kohalik fail:"
 
 msgid "Priority"
 msgstr "Tähtsus"
@@ -3820,6 +3855,14 @@ msgstr "Tähtsus"
 msgid "Resource"
 msgstr "Vahend"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Sisse logitud"
+
 msgid "Middle Name"
 msgstr "Keskmine nimi"
 
@@ -3866,7 +3909,6 @@ msgstr "Lobisev"
 msgid "Extended Away"
 msgstr "Kaua eemal"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Mitte segada"
 
@@ -3985,28 +4027,26 @@ msgstr "Vali konverentsiserver, kuhu päring esitada"
 msgid "Find Rooms"
 msgstr "Otsi jututube"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Sa nõuad krüptimist aga selles serveris pole see toetatud."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
-msgid "Write error"
-msgstr "Kirjutamise viga"
+#, fuzzy
+msgid "No users found"
+msgstr "Sobivaid kasutajaid ei leitud"
 
-msgid "Ping timeout"
-msgstr "Pingimine ületas ajapiirangu"
+#, fuzzy
+msgid "Roles:"
+msgstr "Roll"
 
-msgid "Read Error"
-msgstr "Lugemise viga"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Pingimine ületas ajapiirangu"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Selle serveriga pole võimalik ühendust luua:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Soklit pole võimalik luua"
 
 msgid "Invalid XMPP ID"
 msgstr "Vigane XMPP ID"
@@ -4014,6 +4054,10 @@ msgstr "Vigane XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Vigane XMPP ID. Domeen peab olema määratud."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Tõrge serveriga ühendumisel."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Kasutaja %s@%s registreerimine õnnestus"
@@ -4038,9 +4082,6 @@ msgstr "Registreerimine edukalt tühistatud"
 msgid "Unregistration Failed"
 msgstr "Tõrge registreeringu tühistamisel"
 
-msgid "Already Registered"
-msgstr "Juba registreeritud"
-
 msgid "State"
 msgstr "Olek"
 
@@ -4053,6 +4094,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Kuupäev"
 
+msgid "Already Registered"
+msgstr "Juba registreeritud"
+
 msgid "Unregister"
 msgstr "Tühista registreering"
 
@@ -4080,6 +4124,10 @@ msgstr ""
 msgid "Change Registration"
 msgstr "Registreeringu muutmine"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Tõrge serveriga ühendumisel."
+
 msgid "Error unregistering account"
 msgstr "Viga konto registreeringu tühistamisel"
 
@@ -4098,9 +4146,18 @@ msgstr "Autentimine"
 msgid "Re-initializing Stream"
 msgstr "Andmevaa taaslähtestamine"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Autoriseerimata"
 
+msgid "Mood"
+msgstr "Meeleolu"
+
+msgid "Now Listening"
+msgstr "Hetkel kuulab"
+
 msgid "Both"
 msgstr "Mõlemad"
 
@@ -4122,12 +4179,6 @@ msgstr "Puudub"
 msgid "Subscription"
 msgstr "Tellimus"
 
-msgid "Mood"
-msgstr "Meeleolu"
-
-msgid "Now Listening"
-msgstr "Hetkel kuulab"
-
 msgid "Mood Text"
 msgstr "Tujutekst"
 
@@ -4170,9 +4221,6 @@ msgstr "Sinu parool on muudetud."
 msgid "Error changing password"
 msgstr "Viga parooli muutmisel"
 
-msgid "Password (again)"
-msgstr "Parool (uuesti)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP parooli muutmine"
 
@@ -4366,15 +4414,21 @@ msgid "Unable to ping user %s"
 msgstr "Kasutajat %s pole võimalik pingida"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+
+#, c-format
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4386,10 +4440,35 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Kasutajale %s pole võimalik faili saata, JID on vigane."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Kasutajale %s pole võimalik faili saata, kasutaja pole võrku ühendatud"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Tõrge registreerimisel"
+
 #, c-format
-msgid "Buzzing %s..."
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
 msgstr ""
 
+msgid "Select a Resource"
+msgstr "Vahendi valimine"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Algata _jututuba"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Jututoa seadistamine."
 
@@ -4409,13 +4488,14 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;kasutaja&gt; [põhjus]:  Kasutaja tõrjumine toast."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;kasutaja&gt; &lt;moderator|participant|visitor|none&gt;: Kasutaja "
 "rolli määramine selle ruumi jaoks."
@@ -4479,6 +4559,9 @@ msgstr "Ühendumisserver"
 msgid "File transfer proxies"
 msgstr "Failiülekande proksid"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4518,6 +4601,14 @@ msgstr "XML'i parsimise viga"
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Viga vestlusega %s ühinemisel"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Viga vestluses %s"
+
 msgid "Create New Room"
 msgstr "Uue ruumi loomine"
 
@@ -4534,13 +4625,32 @@ msgstr "_Seadista tuba"
 msgid "_Accept Defaults"
 msgstr "_Nõustu vaikeväärtustega"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Viga vestlusega %s ühinemisel"
+#, fuzzy
+msgid "No reason"
+msgstr "Põhjendust pole määratud."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Viga vestluses %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Sind löödi kasutaja %s poolt välja (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Välja löödud kasutaja %s poolt (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Faili avamisel tekkis viga."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Tõrge faili ülekandmisel"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Tõrge faili '%s' avamisel: %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4567,9 +4677,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Select a Resource"
-msgstr "Vahendi valimine"
-
 msgid "Edit User Mood"
 msgstr "Kasutaja meeleolu määramine"
 
@@ -4604,8 +4711,19 @@ msgstr "Tegevused"
 msgid "Select an action"
 msgstr "Tegevuse valimine"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "MSN-i aadressiraamatut pole võimalik vastu võtta"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\" pole võimalik lisada."
+
+msgid "Buddy Add error"
+msgstr ""
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Määratud kasutajanimi on vigane."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4835,7 +4953,6 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr "Passporti kontot pole veel üle vaadatud"
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4859,6 +4976,10 @@ msgstr "Eelistatud kontakt"
 msgid "Non-IM Contacts"
 msgstr "Kontakti eemaldamine"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s saatis sulle veebikaamera kutse, mis pole aga veel toetatud."
+
 msgid "Nudge"
 msgstr "Müks"
 
@@ -4926,6 +5047,13 @@ msgstr "Mobiilisõnumi saatmine."
 msgid "Page"
 msgstr ""
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Tööl"
+
 msgid "Has you"
 msgstr "Sina tema loendis"
 
@@ -4962,6 +5090,14 @@ msgstr "Esitaja"
 msgid "Album"
 msgstr "Album"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "Loo pealkiri"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Loo pealkiri"
+
 msgid "Set Friendly Name..."
 msgstr "Määra sõbralik nimi..."
 
@@ -4995,9 +5131,6 @@ msgstr "Algata _jututuba"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN-ile on vaja SSL-i tuge. Palun paigalda toetatud SSL-teek."
 
-msgid "Failed to connect to server."
-msgstr "Tõrge serveriga ühendumisel."
-
 msgid "Error retrieving profile"
 msgstr "Viga profiili vastuvõtmisel"
 
@@ -5150,8 +5283,9 @@ msgstr ""
 "Kasutajaprofiili kohta pole võimalik mingeid andmeid leida. Kõige "
 "tõenäolisemalt pole seda kasutajat olemas."
 
-msgid "Profile URL"
-msgstr "Profiili URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "Peida, kui pole võrku ühendatud"
 
 #. *< type
 #. *< ui_requirement
@@ -5184,64 +5318,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID autentimine:Vigane vastus"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s pole korrektne grupp."
-
-msgid "Unknown error."
-msgstr "Tundmatu viga."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s müksas sind!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Tundmatu viga (%d)"
 
 msgid "Unable to add user"
 msgstr "Kasutajat pole võimalik lisada"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Tundmatu viga (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Järgneb sinu otsingu tulemus"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Kasutajat %s ei lisatud, kuna sinu sõbranimekiri on täis."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr "Teenus pole ajutiselt kättesaadav."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiilisõnumit ei saadetud, kuna see oli liiga pikk."
 
-msgid "Unable to rename group"
-msgstr "Gruppi pole võimalik ümber nimetada"
-
-msgid "Unable to delete group"
-msgstr "Gruppi pole võimalik kustutada"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5276,9 +5373,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Sõnumit ei saadetud, kuna saatmisel tekkis tundmatu viga."
 
-msgid "Unable to connect"
-msgstr "Ühendumine pole võimalik"
-
 msgid "Writing error"
 msgstr "Viga kirjutamisel"
 
@@ -5293,20 +5387,24 @@ msgstr ""
 "Ühenduse viga %s serverist:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Meie protokoll pole serveri poolt toetatud."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Viga HTTP parsimisel."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Sa oled teisest kohast sisse loginud."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-serverid pole ajutiselt kättesaadavad. Palun oota ja proovi uuesti."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN-serverid jäetakse ajutiselt seisma"
 
 #, c-format
@@ -5337,6 +5435,14 @@ msgstr "Küpsise saatmine"
 msgid "Retrieving buddy list"
 msgstr "Sõbranimekirja vastuvõtmine"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s saatis sulle veebikaamera kutse, mis pole aga veel toetatud."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s saatis sulle veebikaamera kutse, mis pole aga veel toetatud."
+
 msgid "Away From Computer"
 msgstr "Arvutist eemal"
 
@@ -5376,14 +5482,6 @@ msgstr "Sõnumit pole kommutaatori vea tõttu võimalik saata:"
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Sõnumit pole võimlik saata, kuna leidis aset tundmatu viga:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s lisas sinu oma sõbranimekirja."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s eemaldas sinu oma sõbranimekirjast."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Lisa aadressiraamatusse"
@@ -5391,19 +5489,15 @@ msgstr "Lisa aadressiraamatusse"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr ""
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "\"%s\" pole võimalik lisada."
-
 msgid "The username specified is invalid."
 msgstr "Määratud kasutajanimi on vigane."
 
 msgid "This Hotmail account may not be active."
 msgstr "See Hotmaili konto võib mitte aktiivne olla."
 
+msgid "Profile URL"
+msgstr "Profiili URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5417,18 +5511,60 @@ msgstr "See Hotmaili konto võib mitte aktiivne olla."
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokolli plugin"
 
-msgid "Missing Cipher"
-msgstr "Šiffer on puudu"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s pole korrektne grupp."
 
-msgid "The RC4 cipher could not be found"
-msgstr "RC4 šifrit pole võimalik leida"
+msgid "Unknown error."
+msgstr "Tundmatu viga."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
 msgstr ""
-"Uuenda oma libpurple teeki nii, et see toetakse RC4u šifrit (>= 2.0.1). "
-"MySpaceIM jäetakse laadimata."
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Kasutajat %s ei lisatud, kuna sinu sõbranimekiri on täis."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr "Teenus pole ajutiselt kättesaadav."
+
+msgid "Unable to rename group"
+msgstr "Gruppi pole võimalik ümber nimetada"
+
+msgid "Unable to delete group"
+msgstr "Gruppi pole võimalik kustutada"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s lisas sinu oma sõbranimekirja."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s eemaldas sinu oma sõbranimekirjast."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "Sellist kasutajat pole: %s"
+
+msgid "User lookup"
+msgstr "Kasutaja otsimine"
 
 msgid "Reading challenge"
 msgstr ""
@@ -5439,13 +5575,25 @@ msgstr ""
 msgid "Logging in"
 msgstr "Sisselogimine"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Kasutajanimi on määramata"
+
+msgid "You appear to have no MySpace username."
+msgstr "Sul ei paista MySpace kasutajanime olevat."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+"Kas sa soovid praegu ühe määrata? (Märkus: SEDA POLE VÕIMALIK HILJEM MUUTA!)"
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"Ühendus serveriga katkes\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Uued e-posti sõnumid"
 
@@ -5464,21 +5612,25 @@ msgstr "Uued pildikommentaarid"
 msgid "MySpace"
 msgstr "MySpace"
 
-msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM - Kasutajanimi on määramata"
-
-msgid "You appear to have no MySpace username."
-msgstr "Sul ei paista MySpace kasutajanime olevat."
+msgid "IM Friends"
+msgstr "Välksõnumi-sõbrad"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
-"Kas sa soovid praegu ühe määrata? (Märkus: SEDA POLE VÕIMALIK HILJEM MUUTA!)"
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"Serverist lisati või uuendati %d sõber (kaasa arvatud sõbrad, kes on juba "
+"serveripoolses nimekirjas)"
+msgstr[1] ""
+"Serverist lisati või uuendati %d sõpra (kaasa arvatud sõbrad, kes on juba "
+"serveripoolses nimekirjas)"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Ühendatud"
+msgid "Add contacts from server"
+msgstr "Serverist kontaktide lisamine"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5486,15 +5638,20 @@ msgstr "Protkolli viga, veakood %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr "Vigane kasutajanimi või parool"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM viga"
 
+msgid "Invalid input condition"
+msgstr ""
+
 msgid "Failed to add buddy"
 msgstr "Tõrge sõbra lisamisel"
 
@@ -5504,13 +5661,6 @@ msgstr "Tõrge 'addbuddy' käsu täitmisel."
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr "Sellist kasutajat pole: %s"
-
-msgid "User lookup"
-msgstr "Kasutaja otsimine"
-
 msgid "Failed to remove buddy"
 msgstr "Tõrge sõbra eemaldamisel"
 
@@ -5520,38 +5670,18 @@ msgstr "Tõrge 'delbuddy' käsu täitmisel."
 msgid "blocklist command failed"
 msgstr ""
 
-msgid "Invalid input condition"
-msgstr ""
-
-msgid "Read buffer full (2)"
-msgstr "Lugemispuhver on täis (2)"
-
-msgid "Unparseable message"
-msgstr "Analüüsimatu sõnum"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Hostiga pole võimalik ühenduda: %s (%d)"
+msgid "Missing Cipher"
+msgstr "Šiffer on puudu"
 
-msgid "IM Friends"
-msgstr "Välksõnumi-sõbrad"
+msgid "The RC4 cipher could not be found"
+msgstr "RC4 šifrit pole võimalik leida"
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-"Serverist lisati või uuendati %d sõber (kaasa arvatud sõbrad, kes on juba "
-"serveripoolses nimekirjas)"
-msgstr[1] ""
-"Serverist lisati või uuendati %d sõpra (kaasa arvatud sõbrad, kes on juba "
-"serveripoolses nimekirjas)"
-
-msgid "Add contacts from server"
-msgstr "Serverist kontaktide lisamine"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Uuenda oma libpurple teeki nii, et see toetakse RC4u šifrit (>= 2.0.1). "
+"MySpaceIM jäetakse laadimata."
 
 msgid "Add friends from MySpace.com"
 msgstr "Sõprade lisamine MySpace.com'ist"
@@ -5593,9 +5723,6 @@ msgstr "Aluskirjatüübi suurus (punktides)"
 msgid "User"
 msgstr "Kasutaja"
 
-msgid "Profile"
-msgstr "Profiil"
-
 msgid "Headline"
 msgstr ""
 
@@ -5608,16 +5735,11 @@ msgstr "Sõpru kokku"
 msgid "Client Version"
 msgstr "Kliendi versioon"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "Kasutajanimi on määramata"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM - Palun määra kasutajanimi"
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
-"Palun sisesta kasutajanimi, et kontrollida selle kasutamise võimalikkust:"
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Kasutajanimi on saadaval"
@@ -5628,12 +5750,23 @@ msgstr "Kasutajanimi on vaba. Kas sa soovid seda pruukida?"
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "KUI SEE ON JUBA MÄÄRATUD, POLE SEDA ENAM VÕIMALIK MUUTA!"
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Palun määra kasutajanimi"
+
 msgid "This username is unavailable."
 msgstr "See kasutajanimi pole saadaval."
 
 msgid "Please try another username:"
 msgstr "Palun proovi mõnda muud kasutajanime:"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Kasutajanimi on määramata"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+"Palun sisesta kasutajanimi, et kontrollida selle kasutamise võimalikkust:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5825,9 +5958,6 @@ msgstr "Ennast pole võimalik lisada"
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr "Vigane kasutajanimi või parool"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Sinu poolt sisestatud kasutajanimest pole võimalik hosti ära tunda"
 
@@ -5869,9 +5999,9 @@ msgstr "Kasutaja pole võrgus või oled sa blokitud"
 msgid "Unknown error: 0x%X"
 msgstr "Tundmatu viga: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Tõrge sisselogimisel (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Kasutajat %s pole võimalik pingida"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5975,9 +6105,6 @@ msgstr "GroupWise konverents %d"
 msgid "Authenticating..."
 msgstr "Autentimine..."
 
-msgid "Unable to connect to server."
-msgstr "Serveriga pole võimalik ühenduda."
-
 msgid "Waiting for response..."
 msgstr "Vastuse ootamine..."
 
@@ -6001,25 +6128,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Kas sa soovid vestlusega ühineda?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Sind logiti välja, kuna sa logisid sisse teisest tööjaamast."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Serveriga pole võimalik ühendust saada. Palun sisesta serveri aadress, "
 "millega soovid ühenduda."
 
-msgid "Error. SSL support is not installed."
-msgstr "Viga. SSL-i tugi pole paigaldatud."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "See konverents on suletud. Rohkem sõnumeid pole võimalik saata."
 
@@ -6042,25 +6163,35 @@ msgstr "Serveri aadress"
 msgid "Server port"
 msgstr "Serveri port"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Serverist võeti vastu ootamatu HTTP-vastus."
+
+#. username connecting too frequently
+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 ""
+"Sinu ühendumine ja ühenduse katkestamine toimub liiga sagedasi. Oota 10 "
+"minutit ja proovi siis uuesti. Kui sa aga samamoodi jätkad, siis pead pärast "
+"ka kauem ootama."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Viga %s lahendamisel"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Jututoaga pole võimalik ühineda"
 
 msgid "Invalid chat room name"
 msgstr "Vigane jututoa nimi"
 
-msgid "Server closed the connection."
-msgstr "Server sulges ühenduse."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Ühendus serveriga katkes:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr ""
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Kaugkasutajaga ühendumisel võeti vastu vigased andmed."
 
 #. *< type
 #. *< ui_requirement
@@ -6107,7 +6238,8 @@ msgstr "Ühendus kaugkasutajaga katkes:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Kaugkasutajaga ühendumisel võeti vastu vigased andmed."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Kaugkasutajaga pole võimalik ühendust saada."
 
 msgid "Direct IM established"
@@ -6282,23 +6414,18 @@ msgstr "Kaamera"
 msgid "Screen Sharing"
 msgstr ""
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Vestluseks vaba"
 
-#, c-format
 msgid "Not Available"
 msgstr "Pole saadaval"
 
-#, c-format
 msgid "Occupied"
 msgstr "Hõivatud"
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr "Nähtamatu"
 
@@ -6311,21 +6438,15 @@ msgstr "Hoiatuste tase"
 msgid "Buddy Comment"
 msgstr "Sõbra kommentaar"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Autentimisserveriga pole võimalik ühendust saada:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS-serveriga pole võimalik ühendust saada:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Serveriga pole võimalik ühenduda."
 
 msgid "Username sent"
 msgstr "Kasutajanimi saadetud"
@@ -6339,50 +6460,57 @@ msgstr "Ühendumise lõpuleviimine"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Vigane kasutajanimi."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
 
-msgid "Incorrect password."
-msgstr "Vale parool."
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Received authorization"
+msgstr "Autoriseerimine vastu võetud"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Kasutajat pole olemas"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL'i välksõnumiserver pole ajutiselt saadaval."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Sinu ühendumine ja ühenduse katkestamine toimub liiga sagedasi. Oota 10 "
-"minutit ja proovi siis uuesti. Kui sa aga samamoodi jätkad, siis pead pärast "
-"ka kauem ootama."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Sinu poolt kasutatava kliendi versioon on liiga vana. Palun hangi uuem "
 "versioon aadressilt %s"
 
-msgid "Could Not Connect"
-msgstr "Pole võimalik ühenduda"
-
-msgid "Received authorization"
-msgstr "Autoriseerimine vastu võetud"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Sinu ühendumine ja ühenduse katkestamine toimub liiga sagedasi. Oota 10 "
+"minutit ja proovi siis uuesti. Kui sa aga samamoodi jätkad, siis pead pärast "
+"ka kauem ootama."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Sisestatud SecurID võti on vigane."
 
 msgid "Enter SecurID"
@@ -6397,22 +6525,6 @@ msgstr "Sisesta digitaalkuval olev kuuekohaline number."
 msgid "_OK"
 msgstr "_Olgu"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr "Parool saadetud"
 
@@ -6528,7 +6640,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Sõnumit pole võimalik saata: %s"
@@ -6550,6 +6662,12 @@ msgstr "Võrgus alates"
 msgid "Member Since"
 msgstr "Liige alates"
 
+msgid "Capabilities"
+msgstr "Võimalused"
+
+msgid "Profile"
+msgstr "Profiil"
+
 msgid "Your AIM connection may be lost."
 msgstr "Sinu AIM-ühendus võib olla katkenud."
 
@@ -6718,7 +6836,7 @@ msgstr "Eemaloleku teade on liiga pikk."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6739,9 +6857,9 @@ msgstr ""
 msgid "Orphans"
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Sõpra %s pole võimalik lisada, kuna su sõbranimekirjas on juba liiga palju "
@@ -6750,8 +6868,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(nimi puudub)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Sõpra %s pole teadmata põhjusel võimalik lisada."
 
 #, c-format
@@ -6817,6 +6935,7 @@ msgstr "Ü_hendu"
 msgid "Get AIM Info"
 msgstr "Hangi AIM-andmed"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Redigeeri sõbrakommentaari"
 
@@ -6873,6 +6992,7 @@ msgstr "_Otsi"
 msgid "Set User Info (web)..."
 msgstr "Kasutajate andmete määramine (veebis)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Muuda parooli (veebis)"
 
@@ -6902,6 +7022,10 @@ msgstr "Sõbra otsimine e-posti aadressi järgi..."
 msgid "Search for Buddy by Information"
 msgstr "Sõbra otsimine andmete järgi"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Kasutaja pole sisse logitud"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6922,7 +7046,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Proovitakse ühenduda proksi serveri kaudu."
 
@@ -7015,7 +7138,7 @@ msgstr "Muu"
 msgid "Visible"
 msgstr "Nähtamatu"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7106,17 +7229,50 @@ msgstr "Viimane uuendus"
 msgid "Could not change buddy information."
 msgstr "Sõbra andmete muutmine."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "Mobiilne"
+
+msgid "Note"
+msgstr "Märkus"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Sõbraikoon"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Sõbra lisamine"
+msgid "_Modify"
+msgstr "Muuda"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Muuda"
 
-msgid "Input answer here"
+#, fuzzy
+msgid "Server says:"
+msgstr "Server on hõivatud"
+
+msgid "Your request was accepted."
 msgstr ""
 
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Ühinemine %s'ga on vaja kutset."
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Kas lisada sõber sinu nimekirja?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Kasutajate kataloogi sisestamine"
+
 msgid "Send"
 msgstr ""
 
@@ -7127,19 +7283,20 @@ msgstr "Vigane kasutajanimi."
 msgid "Authorization denied message:"
 msgstr "Volituste andmisest keeldumise sõnum:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
-#, c-format
-msgid "%d needs authentication"
+#, fuzzy, c-format
+msgid "%u needs authorization"
 msgstr "%d vajab autentimist"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Kas lisada sõber sinu nimekirja?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "Jututoaserveri sisestamine"
 
 msgid "Would you be my friend?"
 msgstr "Kas sa võiks olla minu sõber?"
@@ -7160,7 +7317,7 @@ msgid "Failed sending authorize"
 msgstr "Palun autoriseeri mind!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Tõrge sõbra eemaldamisel"
 
 #, fuzzy, c-format
@@ -7204,6 +7361,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Vigased proksi sätted"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Ma ei ole liige"
 
@@ -7243,15 +7404,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr ""
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Telefoninumber"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7261,7 +7425,7 @@ msgstr ""
 msgid "Failed:"
 msgstr "Nurjunud"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7273,11 +7437,11 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Telefoninumber"
 
 #, fuzzy
@@ -7288,35 +7452,35 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Kas sa soovid seda pilti määrata selle kasutaja sõbraikooniks?"
 
 msgid "Setup"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "Sinu päring grupiga %d liitumiseks lükati halduri %d poolt tagasi"
 
-#, c-format
-msgid "%d request to join Qun %d"
-msgstr ""
+#, fuzzy, c-format
+msgid "%u request to join Qun %u"
+msgstr "Sinu päring grupiga %d liitumiseks lükati halduri %d poolt tagasi"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Tõrge sõbraga jututoas ühinemisel"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Sõbra eemaldamine"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Sõbra eemaldamine"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7429,6 +7593,13 @@ msgstr "<b>Viimane värskendus</b>: %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Saadetud</b>: %lu<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Viimane värskendus</b>: %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7436,7 +7607,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "%s - lähem teave"
 
 #, fuzzy
@@ -7456,6 +7627,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "%s - lähem teave"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Koduaadress"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7487,7 +7662,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 msgid "Connect by TCP"
 msgstr "Ühendumine TCP abil"
 
@@ -7499,6 +7673,9 @@ msgstr "Serveri port"
 msgid "Show server news"
 msgstr "Serveri aadress"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Ühenduse ülevalhoidmise sagedus(ed)"
@@ -7508,11 +7685,7 @@ msgid "Update interval (seconds)"
 msgstr "Uuenduste sagedus(ed)"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Sisselogimise vastust pole võimalik lahti krüptida"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Sisselogimise vastust pole võimalik lahti krüptida"
 
 #, c-format
@@ -7535,20 +7708,19 @@ msgid "Activation required"
 msgstr "Volituste andmine katkestati"
 
 #, fuzzy, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Vigane tõendi vastusekood, 0x%02X"
 
-msgid "Keep alive error"
-msgstr "Ühenduse ülevalhoidmise viga"
-
-msgid "Requesting captcha ..."
-msgstr ""
+#, fuzzy
+msgid "Requesting captcha"
+msgstr "Päringudialoog"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Tõrge Yahoo! autentimisel"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7558,71 +7730,49 @@ msgstr "Pildi salvestamine"
 msgid "Enter code"
 msgstr "Sisesta parool"
 
-msgid "QQ Captcha Verifing"
-msgstr ""
+#, fuzzy
+msgid "QQ Captcha Verification"
+msgstr "SSL-sertifikaadi verifitseerimine"
 
 #, fuzzy
 msgid "Enter the text from the image"
 msgstr "Sisesta grupi nimi"
 
-#, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "Vigane tõendi vastusekood, 0x%02X"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
-msgstr ""
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Ühendumine pole võimalik."
+msgstr "Vigane tõendi vastusekood, 0x%02X"
 
 msgid "Socket error"
 msgstr "Sokli viga"
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"Ühendus serveriga katkes:\n"
-"%d, %s"
-
-msgid "Unable to read from socket"
-msgstr "Soklist pole võimalik lugeda"
-
-msgid "Write Error"
-msgstr "Viga kirjutamisel"
-
-msgid "Connection lost"
-msgstr "Ühendus katkes"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Määra kasutajateave..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Päring on keelatud"
 
-msgid "Couldn't resolve host"
-msgstr "Hosti pole võimalik lahendada"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Serveriga pole võimalik ühenduda."
 
 msgid "Invalid server or port"
 msgstr "Vigane server või port"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Ühendumisserver"
+msgid "Connecting to server"
+msgstr "Ühendumine SILC-serverisse"
 
 msgid "QQ Error"
 msgstr "QQ viga"
 
-msgid "Failed to send IM."
-msgstr "Tõrge välksõnumi saatmisel."
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7632,6 +7782,13 @@ msgid ""
 msgstr "QQ serveri uudised"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr ""
+"%s\n"
+"\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Saatja"
 
@@ -7641,32 +7798,30 @@ msgid ""
 "%s"
 msgstr "Serveri juhised: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Tundmatu põhjus"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Käsk"
 
-#, fuzzy, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr "Sa pole grupi \"%s\" liige\n"
-
-msgid "Can not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Sisselogimise vastust pole võimalik lahti krüptida"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Tundmatu põhjus"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Tundmatu põhjus"
 
 #, c-format
@@ -7680,9 +7835,6 @@ msgstr "Faili saatmine"
 msgid "%d canceled the transfer of %s"
 msgstr "%d katkestas %s ülekandmise"
 
-msgid "Connection closed (writing)"
-msgstr "Ühendus suletud (kirjutamine)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupi pealkiri:</b> %s<br>"
@@ -7736,17 +7888,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Viga soklist lugemisel: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Hostiga pole võimalik ühenduda"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7769,6 +7910,9 @@ msgstr "Kõlarid"
 msgid "Video Camera"
 msgstr "Videokaamera"
 
+msgid "File Transfer"
+msgstr "Failiülekanne"
+
 msgid "Supports"
 msgstr ""
 
@@ -8449,9 +8593,6 @@ msgstr "Organisatsioon"
 msgid "Unit"
 msgstr "Üksus"
 
-msgid "Note"
-msgstr "Märkus"
-
 msgid "Join Chat"
 msgstr ""
 
@@ -8551,6 +8692,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Võrgustatistika"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Tõrge ping'i läbiviimisel"
 
@@ -8608,7 +8752,8 @@ msgstr "Toetamata avaliku võtme liik"
 msgid "Disconnected by server"
 msgstr "Ühendus katkestatud serveri poolt"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Viga SILC-serveriga ühendumisel"
 
 msgid "Key Exchange failed"
@@ -8618,26 +8763,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "Tõrge ühendumisel"
-
 msgid "Performing key exchange"
 msgstr "Võtmevahetuse läbiviimine"
 
-msgid "Unable to create connection"
-msgstr "Ühendust pole võimalik luua"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "SILC-võtmepaari pole võimalik laadida"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Ühendumine SILC-serverisse"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC-võtmepaari pole võimalik laadida"
+
 msgid "Out of memory"
 msgstr "Vaba pole piisavalt mälu"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC-protokolli pole võimalik lähtestada"
 
 msgid "Error loading SILC key pair"
@@ -8922,7 +9067,8 @@ msgstr "Kõikide sõnumite digitaalne signeerimine ja verifitseerimine"
 msgid "Creating SILC key pair..."
 msgstr "SILC võtmepaari loomine..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "SILC võtmepaari pole võimalik luua\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9014,6 +9160,9 @@ msgstr "Tahvel"
 msgid "No server statistics available"
 msgstr "Serveri statistika pole saadaval"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Viga SILC-serveriga ühendumisel"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Tõrge: Versioonid ei klapi, uuenda oma klienti"
@@ -9054,34 +9203,35 @@ msgstr "Tõrge: Vigane küpsis"
 msgid "Failure: Authentication failed"
 msgstr "Tõrge: Autentimine nurjus"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC-kliendi ühendust pole võimalik lähtestada"
 
 msgid "John Noname"
 msgstr "Nimetu Nipitiri"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC-võtmepaari pole võimalik laadida: %s"
 
-msgid "Could not write"
-msgstr "Pole võimalik kirjutada"
-
-msgid "Could not connect"
-msgstr "Pole võimalik ühenduda"
+msgid "Unable to create connection"
+msgstr "Ühendust pole võimalik luua"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Tundmatu vastus serverilt."
 
-msgid "Could not create listen socket"
-msgstr "Kuulavat soklit pole võimalik luua"
-
-msgid "Could not resolve hostname"
-msgstr "Hostinime pole võimalik lahendada"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Soklit pole võimalik luua"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-i kasutajanimed ei tohi sisaldada sõnavahe- ja @-märke"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Serveri port"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9115,173 +9265,62 @@ msgstr "Autentimiskasutaja"
 msgid "Auth Domain"
 msgstr "Autentimisdomeen"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s lahendamine"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Faili %s pole võimalik kirjutada."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Faili %s pole võimalik lugeda."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s pole hetkel sisse logitud."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr ""
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr "Tõrge."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Liiga palju vastavusi."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Kataloogiteenus pole ajutiselt saadaval."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr ""
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Võtmesõna eirati."
-
-#, c-format
-msgid "No keywords."
-msgstr "Võtmesõnu ei ole."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Kasutajal pole kataloogiandmeid."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Riik pole toetatud."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Tundmatu tõrge: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Vigane kasutajanimi või parool."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "See teenus pole ajutiselt saadaval."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-
-#, c-format
-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 ""
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr ""
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;tuba&gt;:  Yahoo võrgus oleva jututoaga ühinemine"
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Tekkis tundmatu viga %d.  Andmed: %s"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Yahoo võrgu jututubade nimekirja kuvamine"
 
-msgid "Invalid Groupname"
-msgstr "Vigane grupinimi"
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Kasutajaga Doodle seansi algatamine"
 
-msgid "Connection Closed"
-msgstr "Ühendus sulgeti"
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
 
-msgid "Waiting for reply..."
-msgstr "Vastuse ootamine..."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo protokolli plugin"
 
-msgid "TOC has come back from its pause. You may now send messages again."
+msgid "Pager server"
 msgstr ""
 
-msgid "Password Change Successful"
-msgstr "Paroolimuutmine õnnestus"
-
-msgid "_Group:"
-msgstr "_Grupp:"
-
-msgid "Get Dir Info"
+msgid "Pager port"
 msgstr ""
 
-msgid "Set Dir Info"
-msgstr ""
+msgid "File transfer server"
+msgstr "Failiülekande server"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr ""
+msgid "File transfer port"
+msgstr "Failiülekande port"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Tõrge ülekandmisel, ilmselt tühistas teine pool ülekande."
+msgid "Chat room locale"
+msgstr "Jututoa lokaat"
 
-msgid "Could not connect for transfer."
-msgstr "Ülekandmiseks pole võimalik ühendust luua."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Konverentside ja jututubade kutseid eiratakse"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Failipäist pole võimalik kirjutada.  Faili ei kanta üle."
+msgid "Chat room list URL"
+msgstr "Jututubade nimekirja URL"
 
-msgid "Save As..."
-msgstr "Salvesta kui..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo jututoaserver"
 
-#, 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] ""
+msgid "Yahoo Chat port"
+msgstr "Yahoo jututoaport"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s soovib, et sa saadaksid talle faili"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9293,12 +9332,12 @@ msgstr "%s soovib, et sa saadaksid talle faili"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC protokolli plugin"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo protokolli plugin"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s saatis sulle veebikaamera kutse, mis pole aga veel toetatud."
+msgid "Your SMS was not delivered"
+msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
@@ -9320,6 +9359,32 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Autoriseerimine vastu võetud"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine võib selle parandada."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine võib selle parandada."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Vigane kasutajanimi või parool"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9347,34 +9412,33 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine võib selle parandada."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Sõpra %s pole võimalik serveri nimekirjas gruppi %s lisada (konto %s)."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Sõpra pole võimalik serveri nimekirja lisada."
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Serverist võeti vastu ootamatu HTTP-vastus."
 
-msgid "Connection problem"
-msgstr "Ühendumisprobleem"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
-
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
+"Ühendus serveriga katkes:\n"
 "%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
+"Selle serveriga pole võimalik ühendust luua:\n"
+"%s"
 
 msgid "Not at Home"
 msgstr "Pole kodus"
@@ -9421,8 +9485,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "Milline ID aktiveerida?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr ""
@@ -9436,73 +9500,15 @@ msgstr "Ühine kasutajaga vestluses..."
 msgid "Open Inbox"
 msgstr "Ava sisendkast"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;tuba&gt;:  Yahoo võrgus oleva jututoaga ühinemine"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Yahoo võrgu jututubade nimekirja kuvamine"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Kasutajaga Doodle seansi algatamine"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo protokolli plugin"
-
-msgid "Yahoo Japan"
-msgstr "Jaapani Yahoo"
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr "Failiülekande server"
-
-msgid "Japan file transfer server"
-msgstr "Jaapani failiülekandeserver"
-
-msgid "File transfer port"
-msgstr "Failiülekande port"
-
-msgid "Chat room locale"
-msgstr "Jututoa lokaat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Konverentside ja jututubade kutseid eiratakse"
-
-msgid "Chat room list URL"
-msgstr "Jututubade nimekirja URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo jututoaserver"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo jututoaport"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Doodle päringu saatmine."
 
+msgid "Unable to connect."
+msgstr "Ühendumine pole võimalik."
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9510,6 +9516,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s proovib sulle saata %d-failist koosnevat gruppi.\n"
 
+msgid "Write Error"
+msgstr "Viga kirjutamisel"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Jaapani Yahoo! profiil"
 
@@ -9554,13 +9563,9 @@ msgstr "Lahe viit nr 3"
 msgid "Last Update"
 msgstr "Viimane uuendus"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Kasutaja %s andmed pole saadaval"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Vabandust, see profiil paistab olevat hetkel toetamata keeles või vormingus."
 
@@ -9628,19 +9633,17 @@ msgstr ""
 msgid "Webcams"
 msgstr "Veebikaamerad"
 
+msgid "Connection problem"
+msgstr "Ühendumisprobleem"
+
 msgid "Unable to fetch room list."
 msgstr "Tubade nimekirja pole võimalik hankida."
 
 msgid "User Rooms"
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
-msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr ""
 "Ühendus serveriga katkes\n"
 "%s"
@@ -9762,33 +9765,22 @@ msgstr ""
 msgid "Exposure"
 msgstr ""
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Soklit pole võimalik luua:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP-proksi vastust pole võimalik analüüsida: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Proksi ühenduse viga %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Ligipääs keelatud: HTTP proksi server keelab pordi %d tunneldamise."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Viga %s lahendamisel"
 
-msgid "Could not resolve host name"
-msgstr "Hostinime pole võimalik lahendada"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9875,9 +9867,6 @@ msgstr "Mitte segada"
 msgid "Extended away"
 msgstr "Kaua eemal"
 
-msgid "Mobile"
-msgstr "Mobiilne"
-
 msgid "Listening to music"
 msgstr "Kuulan muusikat"
 
@@ -9919,16 +9908,6 @@ msgstr "+++ %s naases jõudeolekust"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Viga %s lugemisel"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr "Arvutamine..."
 
@@ -10034,6 +10013,16 @@ msgstr "Ühendus lükati tagasi."
 msgid "Address already in use."
 msgstr "Aadress on juba kasutusel."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Viga %s lugemisel"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 msgid "Internet Messenger"
 msgstr "Interneti sõnumivahetus"
 
@@ -10076,10 +10065,8 @@ msgstr "Teavitused e-posti _uute sõnumite kohta"
 msgid "Use this buddy _icon for this account:"
 msgstr "Selle konto jaoks kasutatakse seda sõbra_ikooni:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s - valikud"
+msgid "_Advanced"
+msgstr "Laien_datud"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Kasutatakse GNOME proksi sätteid"
@@ -10114,9 +10101,6 @@ msgstr "Kui sa päris lähedalt vaatad, siis"
 msgid "you can see the butterflies mating"
 msgstr "võid sa näha paarituvaid liblikaid"
 
-msgid "Proxy Options"
-msgstr "Proksi valikud"
-
 msgid "Proxy _type:"
 msgstr "_Proksi liik:"
 
@@ -10144,8 +10128,9 @@ msgstr "_Põhiline"
 msgid "Create _this new account on the server"
 msgstr "See on _uus konto ja tuleb serverisse luua"
 
-msgid "_Advanced"
-msgstr "Laien_datud"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Proksi"
 
 msgid "Enabled"
 msgstr "Lubatud"
@@ -10192,16 +10177,17 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Palun uuenda tarvilikud väljad."
 
-msgid "Room _List"
-msgstr "Tubade _nimekiri"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Konto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Palun sisesta teave vestluse kohta, millega soovid ühineda.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Tubade _nimekiri"
 
 msgid "_Block"
 msgstr "_Bloki"
@@ -10218,6 +10204,17 @@ msgstr "Hangi a_ndmed"
 msgid "I_M"
 msgstr "Vä_lksõnum"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "_Lisa vestlus"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Videovestlus"
+
 msgid "_Send File..."
 msgstr "Saada _fail..."
 
@@ -10227,9 +10224,14 @@ msgstr "Lisa _sõbramärguanne..."
 msgid "View _Log"
 msgstr "Vaata _logi"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Peida, kui pole võrku ühendatud"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Näita, kui pole võrku ühendatud"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -10354,6 +10356,10 @@ msgstr "/Vahendid/Sõbra_märguanded"
 msgid "/Tools/_Certificates"
 msgstr "/Vahendid/_Sertifikaadid"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Vahendid/_Tujunäod"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Vahendid/Plu_ginad"
 
@@ -10363,9 +10369,6 @@ msgstr "/Vahendid/_Eelistused"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Vahendid/_Privaatsus"
 
-msgid "/Tools/Smile_y"
-msgstr "/Vahendid/_Tujunäod"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Vahendid/_Failiülekanded"
 
@@ -10481,8 +10484,8 @@ msgstr "Käsitsi"
 msgid "By status"
 msgstr "Oleku järgi"
 
-msgid "By log size"
-msgstr "Logi suuruse järgi"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10498,6 +10501,9 @@ msgstr "Ühendu uuesti"
 msgid "Re-enable"
 msgstr "Luba uuesti"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Tere tulemast tagasi!"
 
@@ -10586,6 +10592,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Grupp:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10619,6 +10628,115 @@ msgstr "/Vahendid"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Sõbrad/Sordi sõbrad"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Taustavärvus"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Taustavärvus"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Laien_da"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Taustavärvuse valimine"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "Ahen_da"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Taustavärvuse valimine"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Kiirklahv"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Ühendatud"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Eemal"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Ühendamata"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Tujutekst"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Saadetakse sõnumit"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Kasutaja %s andmete muutmine"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Sisesta hostinimi, mille kohta see sertifikaat mõeldud on."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-serverid"
@@ -10636,14 +10754,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Sõbra kutsumine jututuppa"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Palun sisesta selle kasutaja nimi, keda sa soovid jututuppa kutsuda. Kui "
-"sisestad ka sõnumi, siis saadetakse see sõbrale koos kutsumisteatega."
-
 msgid "_Buddy:"
 msgstr "_Sõber:"
 
@@ -10672,7 +10782,8 @@ msgstr "Eira"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Viimati ütles"
 
 msgid "Unable to save icon file to disk."
@@ -10718,6 +10829,22 @@ msgstr "/Vestlus/Salvesta _kui..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Vestlus/_Puhasta tagasikerimine"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Vestlus/_Veel"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Vestlus/_Veel"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Vestlus/_Veel"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Vestlus/Vaata _logi"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Vestlus/Saada _fail..."
 
@@ -10790,6 +10917,18 @@ msgstr "/Vestlus"
 msgid "/Conversation/View Log"
 msgstr "/Vestlus/Vaata logi"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Vestlus/Veel"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Vestlus/Vaata logi"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Vestlus/Veel"
+
 msgid "/Conversation/Send File..."
 msgstr "/Vestlus/Saada fail..."
 
@@ -10973,6 +11112,9 @@ msgstr "Esitaja"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "kasutajatugi"
 
@@ -11098,6 +11240,10 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Ungari"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumeenia"
+
 msgid "Indonesian"
 msgstr "Indoneesia"
 
@@ -11113,6 +11259,10 @@ msgstr "Gruusia"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu Gruusia tõlkijad"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Muu"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11134,6 +11284,10 @@ msgstr "Leedu"
 msgid "Macedonian"
 msgstr "Makedoonia"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "Makedoonia"
+
 msgid "Bokmål Norwegian"
 msgstr "Norra (bokmål)"
 
@@ -11188,6 +11342,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "Rootsi"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamili"
 
@@ -11250,7 +11407,24 @@ msgstr ""
 "pole mitte mingisugust garantiid.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin serveris irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin serveris irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11500,7 +11674,7 @@ msgid "Hyperlink visited color"
 msgstr "Hüperviida värv"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Hüperviitade joonistamise värv hiirekursori fookuse korral."
 
 msgid "Hyperlink prelight color"
@@ -11536,13 +11710,20 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr "Tippimismärguande värvus"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Tippimismärguande kuvamiseks kasutatav värvus"
 
 msgid "Typing notification font"
@@ -11554,15 +11735,6 @@ msgstr "Tippimismärguande kuvamiseks kasutatav kirjatüüp"
 msgid "Enable typing notification"
 msgstr "Tippimismärguande lubamine"
 
-msgid "_Copy Email Address"
-msgstr "_Kopeeri e-posti aadress"
-
-msgid "_Open Link in Browser"
-msgstr "_Ava viit veebisirvijas"
-
-msgid "_Copy Link Location"
-msgstr "_Kopeeri viida asukoht"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11603,11 +11775,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Pildi salvestamine"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Salvesta pilt..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "Lisa _kohandatud tujunägu..."
 
@@ -11693,9 +11863,6 @@ msgstr "Kirjatüübi suuruse vähendamine"
 msgid "Font Face"
 msgstr "Kirjatüüp"
 
-msgid "Background Color"
-msgstr "Taustavärvus"
-
 msgid "Foreground Color"
 msgstr "Teksti värvus"
 
@@ -11799,13 +11966,14 @@ msgstr "_Sirvi logide kausta"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Lähema teabe saamiseks kasuta `%s -h'.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11834,13 +12002,14 @@ msgstr ""
 "  -v, --version          käesoleva versiooni kuvamine ja programmi töö\n"
 "                         lõpetamine\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11888,11 +12057,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Ava kõik sõnumid"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Sulle on e-sõnum!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Arvutamine..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -11921,6 +12106,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "Tundmatu sõnum"
+
+msgid "Open All Messages"
+msgstr "Ava kõik sõnumid"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Sulle on e-sõnum!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Uus sõbramärguanne"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Sulle on e-sõnum!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Järgnevad pluginad laaditakse mälust välja."
 
@@ -11967,10 +12173,17 @@ msgstr "<b>Plugina üksikasjad</b>"
 msgid "Select a file"
 msgstr "Faili valimine"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Sõbramärguande redigeerimine"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Kellest märku antakse"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "Sõbra _nimi:"
 
@@ -12037,7 +12250,60 @@ msgstr "_Korduv"
 msgid "Pounce Target"
 msgstr "Kelle kohta"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Alustab tippimist"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Teeb tippimisel pausi"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Logib sisse"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s pole enam jõude (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Pöördub eemalolekust tagasi"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Tippimine lõpetatud"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Logib välja"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Jääb jõude"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Kui olen eemal"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Saadetakse sõnum"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Tundmatu teavitussündmus. Palun anna sellest teada!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Tõrge tujunägude teema lahtipakkimisel"
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Tõrge tujunägude teema lahtipakkimisel"
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Tõrge tujunägude teema lahtipakkimisel"
 
 msgid "Install Theme"
@@ -12059,6 +12325,12 @@ msgstr "Kiirklahvid"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Vestlused suletakse _Escape-klahvi vajutamisega"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Sõbranimekiri"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Süsteemisalve ikoon"
 
@@ -12068,8 +12340,9 @@ msgstr "Süsteemisalve _ikooni näidatakse:"
 msgid "On unread messages"
 msgstr "Lugemata sõnumite korral"
 
-msgid "Conversation Window Hiding"
-msgstr "Vestlusakna peitmine"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Välksõnumite aknad"
 
 msgid "_Hide new IM conversations:"
 msgstr "Välksõnumivestlused _peidetakse:"
@@ -12077,6 +12350,9 @@ msgstr "Välksõnumivestlused _peidetakse:"
 msgid "When away"
 msgstr "Kui olen eemal"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Uute vestluste aknad _minimeeritakse"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Kaardid"
@@ -12135,9 +12411,6 @@ msgstr "Kasutatakse pehmet kerimist"
 msgid "F_lash window when IMs are received"
 msgstr "Välksõnumite vastuvõtmisel vilgutatakse _aknaid"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Uute vestluste aknad _minimeeritakse"
-
 msgid "Minimum input area height in lines:"
 msgstr "Vähim sisestuskasti kõrgus ridades:"
 
@@ -12169,13 +12442,11 @@ msgstr "Proksi seadistusprogrammi pole võimalik käivitada."
 msgid "Cannot start browser configuration program."
 msgstr "Veebisirvija seadistusprogrammi pole võimalik käivitada."
 
-msgid "ST_UN server:"
-msgstr "ST_UN server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Näide: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP-aadress tuvastatakse _automaatselt"
 
 msgid "Public _IP:"
@@ -12196,6 +12467,10 @@ msgstr "Al_gusport:"
 msgid "_End port:"
 msgstr "_Lõpuport:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proksi server ja veebisirvija"
 
@@ -12224,6 +12499,10 @@ msgstr "Proksi server"
 msgid "No proxy"
 msgstr "Proksi puudub"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "Kasuta_ja:"
 
@@ -12382,12 +12661,12 @@ msgstr "Kui olen eemal ja jõude"
 msgid "Auto-away"
 msgstr "Automaatne eemaldumine"
 
-msgid "Change status when _idle"
-msgstr "Jõudeoleku puhul määratakse uus _olek"
-
 msgid "_Minutes before becoming idle:"
 msgstr "Mitme _minuti möödudes jõudeolek määratakse:"
 
+msgid "Change status when _idle"
+msgstr "Jõudeoleku puhul määratakse uus _olek"
+
 msgid "Change _status to:"
 msgstr "Uueks o_lekuks saab:"
 
@@ -12536,46 +12815,47 @@ msgstr "Sal_vesta ja kasuta"
 msgid "Status for %s"
 msgstr ""
 
-msgid "Custom Smiley"
-msgstr "Kohandatud tujunägu"
-
-msgid "More Data needed"
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
+msgid "Custom Smiley"
+msgstr "Kohandatud tujunägu"
 
 msgid "Duplicate Shortcut"
 msgstr "Dubleeriuv kiirklahv"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-msgid "Please select an image for the smiley."
-msgstr "Palun vali tujunäo jaoks pilt."
-
 msgid "Edit Smiley"
 msgstr "Tujunäo muutmine"
 
 msgid "Add Smiley"
 msgstr "Tujunäo lisamine"
 
-msgid "Smiley _Image"
-msgstr "Tujunäo _pilt"
+#, fuzzy
+msgid "_Image:"
+msgstr "_Pilt"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Tujunäo _kiirklahv"
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Kiirklahv"
 
 msgid "Smiley"
 msgstr "Tujunägu"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Kiirklahv"
+
 msgid "Custom Smiley Manager"
 msgstr "Kohandatud tujunägude haldur"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Vali sõber"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Selle konto jaoks kasutatakse seda sõbra_ikooni:"
 
@@ -12657,8 +12937,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -12691,6 +12971,16 @@ msgid ""
 msgstr ""
 "Tõrge pildi '%s' laadimisel: põhjus on teadmata, ilmselt on pildifail rikutud"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Viidad avatakse:"
+
+msgid "_Copy Link Location"
+msgstr "_Kopeeri viida asukoht"
+
+msgid "_Copy Email Address"
+msgstr "_Kopeeri e-posti aadress"
+
 msgid "Save File"
 msgstr "Faili salvestamine"
 
@@ -12784,6 +13074,77 @@ msgstr "Kontakti saadavaloleku ennustamise plugin."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Sõprade saadavaloleku kohta statistiliste andmete kuvamine"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Serveri aadress"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Jututoaserveri sisestamine"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Vali konverentsiserver, kuhu päring esitada"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Võrguteenused"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Sõbranimekiri"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Eemaldub"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Logikataloog"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Heli valimine"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Kirjeldus"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Teenuse avastamise andmed"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "Si_rvija:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Kasutajat pole olemas"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server ei kasuta ühtegi toetatud autentimismeetodit"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Teenuse avastamise andmed"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
+
 msgid "Buddy is idle"
 msgstr "Sõber on jõude"
 
@@ -13160,7 +13521,7 @@ msgstr "Muusikalise sõnumivahetuse plugin ühise komponeerimise tarbeks."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13267,12 +13628,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr "Kursori värvus"
-
-msgid "Secondary Cursor Color"
-msgstr "Teise kursori värvus"
-
 msgid "Hyperlink Color"
 msgstr "Hüperviida värvus"
 
@@ -13282,6 +13637,10 @@ msgstr "Külastatud hüperviida värvus"
 msgid "Highlighted Message Name Color"
 msgstr "Nime värvus esiletõstetud sõnumites"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Tippimismärguande värvus"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GTK puuvaate rõhteraldaja"
 
@@ -13311,35 +13670,24 @@ msgstr "GTK+ liidese kirjatüüp"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Liidese värvid"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Tippimismärguande lubamine"
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgini GTK+ teemajuhtija"
 
-msgid "Widget Sizes"
-msgstr "Vidinate suurused"
+#, fuzzy
+msgid "Colors"
+msgstr "Sulge"
 
 msgid "Fonts"
 msgstr "Kirjatüübid"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc failitööriistad"
 
@@ -13421,9 +13769,10 @@ msgid "Conversation Window Send Button."
 msgstr "Vestlusakna saatmisnupp."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Saatmisnupu lisamine vestlusakna sisestusala juurde. See on mõeldud "
 "kasutamiseks olukorras, kus klaviatuuri pole võimalik pruukida."
@@ -13479,6 +13828,113 @@ msgstr ""
 "Asendab väljaminevates sõnumites teksti vastavalt kasutaja poolt määratud "
 "reeglitele"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Pole sisse logitud"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Pole sisse logitud"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Vestlusega ühinemine"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Eira"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Valjem"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Volituste andmisest keeldumise sõnum:"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Vead"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Andmed"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Päringudialoog"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Hoiatuste tase"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Olekud"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Jututoa lokaat"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Ikooni salvestamine"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgini GTK+ teemajuhtija"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktandmed"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Sõbranimekiri"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Sõbranimekiri"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgini GTK+ teemajuhtija"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgini GTK+ teemajuhtija"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13640,17 +14096,15 @@ msgstr "Sõbranimekirja _hoitakse pealmisena:"
 msgid "Only when docked"
 msgstr "Ainult dokitud olekus"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_Akna vilgutamine vestlussõnumite vastuvõtmisel"
-
 msgid "Windows Pidgin Options"
 msgstr "Windowsi Pidgini valikud"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows'i Pidgin'ile omased valikud."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Windows'i Pidgin'ile omasete valikute tagamine (näiteks sõbranimekirja "
 "dokkimie)."
@@ -13692,6 +14146,376 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Soklit pole võimalik avada"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Soklit pole võimalik kuulata"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Soklit pole võimalik lugeda"
+
+#~ msgid "Connection failed."
+#~ msgstr "Tõrge ühendumisel."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server katkestas ühenduse"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Soklit pole võimalik luua"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Hostiga pole võimalik ühenduda"
+
+#~ msgid "Read error"
+#~ msgstr "Viga lugemisel"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Selle serveriga pole võimalik ühendust luua:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Kirjutamise viga"
+
+#~ msgid "Last Activity"
+#~ msgstr "Viimati aktiivne"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Teenuse avastamise andmed"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Teenuse avastamise kirjed"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Mitmekasutaja vestlus"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc käsud"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 baidivood"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Kasutaja asukoht"
+
+#~ msgid "User Avatar"
+#~ msgstr "Kasutaja avatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Vestluste olekust teavitaja"
+
+#~ msgid "Software Version"
+#~ msgstr "Tarkvara versioon"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Voo lähtestamine"
+
+#~ msgid "User Mood"
+#~ msgstr "Kasutaja meeleolu"
+
+#~ msgid "User Activity"
+#~ msgstr "Kasutaja aktiivsus"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Krüptitud seansi läbirääkimised"
+
+#~ msgid "User Profile"
+#~ msgstr "Kasutajaprofiil"
+
+#~ msgid "User Nickname"
+#~ msgstr "Kasutaja hüüdnimi"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Sõnumi vastuvõtjad"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Avaliku võtme avalikustamine"
+
+#~ msgid "User Chatting"
+#~ msgstr "Kasutaja lobiseb"
+
+#~ msgid "User Gaming"
+#~ msgstr "Kasutaja mängib"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Viivitusega kohaletoimetamine"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN-teenuse avastamine Jingle jaoks"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Lihtsustatud krüptitud seansi läbirääkimised"
+
+#~ msgid "Read Error"
+#~ msgstr "Lugemise viga"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Tõrge serveriga ühendumisel."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Lugemispuhver on täis (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Analüüsimatu sõnum"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Hostiga pole võimalik ühenduda: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Tõrge sisselogimisel (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Sind logiti välja, kuna sa logisid sisse teisest tööjaamast."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Viga. SSL-i tugi pole paigaldatud."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Vale parool."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS-serveriga pole võimalik ühendust saada:\n"
+#~ "%s"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Pole võimalik ühenduda"
+
+#~ msgid "Invalid username."
+#~ msgstr "Vigane kasutajanimi."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Sisselogimise vastust pole võimalik lahti krüptida"
+
+#~ msgid "Connection lost"
+#~ msgstr "Ühendus katkes"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Hosti pole võimalik lahendada"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Ühendus suletud (kirjutamine)"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Viga soklist lugemisel: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Hostiga pole võimalik ühenduda"
+
+#~ msgid "Could not write"
+#~ msgstr "Pole võimalik kirjutada"
+
+#~ msgid "Could not connect"
+#~ msgstr "Pole võimalik ühenduda"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kuulavat soklit pole võimalik luua"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Hostinime pole võimalik lahendada"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Vigane parool"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Jaapani Yahoo"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Jaapani failiülekandeserver"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ühendus serveriga katkes\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Hostinime pole võimalik lahendada"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server vajab sisselogimiseks TLS/SSL-i.  TLS/SSL-i tuge ei leitud."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Vestlusakna peitmine"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Palun vali tujunäo jaoks pilt."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Milline ID aktiveerida?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Kursori värvus"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Teise kursori värvus"
+
+#~ msgid "Interface colors"
+#~ msgstr "Liidese värvid"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Vidinate suurused"
+
+#~ msgid "Invite message"
+#~ msgstr "Kutse sõnum"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Palun sisesta selle kasutaja nimi, keda sa soovid\n"
+#~ "jututuppa kutsuda. Kui sisestad ka sõnumi, siis\n"
+#~ "saadetakse see sõbrale koos kutsumisteatega."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "MSN-i aadressiraamatut pole võimalik vastu võtta"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Sõbra lisamine"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Sisselogimise vastust pole võimalik lahti krüptida"
+
+#~ msgid "Keep alive error"
+#~ msgstr "Ühenduse ülevalhoidmise viga"
+
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "Ühendus serveriga katkes:\n"
+#~ "%d, %s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Ühendumisserver"
+
+#~ msgid "Failed to send IM."
+#~ msgstr "Tõrge välksõnumi saatmisel."
+
+#, fuzzy
+#~ msgid "Not a member of room \"%s\"\n"
+#~ msgstr "Sa pole grupi \"%s\" liige\n"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s lahendamine"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Faili %s pole võimalik kirjutada."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Faili %s pole võimalik lugeda."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s pole hetkel sisse logitud."
+
+#~ msgid "Failure."
+#~ msgstr "Tõrge."
+
+#~ msgid "Too many matches."
+#~ msgstr "Liiga palju vastavusi."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Kataloogiteenus pole ajutiselt saadaval."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Võtmesõna eirati."
+
+#~ msgid "No keywords."
+#~ msgstr "Võtmesõnu ei ole."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Kasutajal pole kataloogiandmeid."
+
+#~ msgid "Country not supported."
+#~ msgstr "Riik pole toetatud."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Tundmatu tõrge: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Vigane kasutajanimi või parool."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "See teenus pole ajutiselt saadaval."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Tekkis tundmatu viga %d.  Andmed: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Vigane grupinimi"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Ühendus sulgeti"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Vastuse ootamine..."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Paroolimuutmine õnnestus"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Tõrge ülekandmisel, ilmselt tühistas teine pool ülekande."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Ülekandmiseks pole võimalik ühendust luua."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Failipäist pole võimalik kirjutada.  Faili ei kanta üle."
+
+#~ msgid "Save As..."
+#~ msgstr "Salvesta kui..."
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s soovib, et sa saadaksid talle faili"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC protokolli plugin"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Kasutaja %s andmed pole saadaval"
+
+#~ msgid "%s Options"
+#~ msgstr "%s - valikud"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proksi valikud"
+
+#~ msgid "By log size"
+#~ msgstr "Logi suuruse järgi"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Ava viit veebisirvijas"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN server:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Tujunäo _pilt"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Tujunäo _kiirklahv"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Akna vilgutamine vestlussõnumite vastuvõtmisel"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "Selle nimega grupp on juba olemas."
 
@@ -13757,15 +14581,6 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ msgid "Do you want to approve the request?"
 #~ msgstr "Kas sa nõustud selle päringuga?"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "System Message"
 #~ msgstr "Süsteemne sõnum"
 
diff --git a/po/eu.po b/po/eu.po
index 9f06fcd849..60af6e41af 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2,53 +2,49 @@
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2006.
 # tamax, 2006.
 #
+# Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>, correct and translate more than 85%, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
-"PO-Revision-Date: 2006-05-25 23:48+0200\n"
-"Last-Translator: tamax\n"
+"POT-Creation-Date: 2009-08-02 17:40-0700\n"
+"PO-Revision-Date: 2009-08-04 21:14+0200\n"
+"Last-Translator: Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>\n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Finch"
-msgstr "Frantsesa"
+msgstr "Finch"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "Pidgin %s. Informazio gehiago nahi baduzu, idatzi `%s -h'.\n"
+msgstr "%s. Informazio gehiago nahi baduzu, idatzi `%s -h'.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-"Pidgin %s\n"
-"Erabiltzeko era: %s [Aukerak]...\n"
+"%s\n"
+"Erabiltera: %s [AUKERA]...\n"
 "\n"
-"  -c, --config=DIR    erabili DIR konfigurazio fitxategientzat\n"
-"  -d, --debug         idatzi \"debugging\"mezuak stdout -en\n"
-"  -h, --help          Erakutsi laguntza eta irten\n"
-"  -n, --nologin       Automatikoki ez konexio hasi\n"
-"  -l, --login[=IZENA]  Automatikoki konexioa hasi (IZENA aukerazko argumentu "
-"espesifikazioa\n"
-"                      kontua(k) erabiltzeko, koma batez bereiztu)\n"
-"  -v, --version       Erakutsi egungo bertsioa eta irten\n"
+"  -c, --config=DIR    DIR erabili konfigurazio-fitxategientzat\n"
+"  -d, --debug         arazte-mezuak idatzi stderr-en\n"
+"  -h, --help          laguntza hau erakutsi eta irten\n"
+"  -n, --nologin       ez automatikoki konektatu\n"
+"  -v, --version       egungo bertsioa erakutsi eta irten\n"
 
 #, c-format
 msgid ""
@@ -56,53 +52,52 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
+"%s(e)k erroreak aurkitu ditu zure ezarpenak %s(e)tik %s(e)ra migratzean. "
+"Eskuz burutu ezazu migrazioa. Errore honen berri eman ezazu hemen: http://"
+"developer.pidgin.im"
 
 msgid "Error"
 msgstr "Errorea"
 
-#, fuzzy
 msgid "Account was not added"
-msgstr "Kontua desgaitu egin da"
+msgstr "Ez da kontua gehitu"
 
 msgid "Username of an account must be non-empty."
-msgstr ""
+msgstr "Kontuaren erabiltzaile-izena ezin da hutsik egon."
 
 msgid "New mail notifications"
 msgstr "Mezu berrien jakinarazpenak"
 
 msgid "Remember password"
-msgstr "Gogoratu pasahitza"
+msgstr "Pasahitza gogoratu"
 
 msgid "There are no protocol plugins installed."
-msgstr ""
+msgstr "Ez dago protokolo-pluginik instalatuta."
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr ""
+msgstr "(Ziurrenik 'make install' egitea ahaztu duzu.)"
 
 msgid "Modify Account"
-msgstr "Aldatu kontua"
+msgstr "Kontua Aldatu"
 
-#, fuzzy
 msgid "New Account"
-msgstr "Kontua"
+msgstr "Kontu Berria"
 
 msgid "Protocol:"
 msgstr "Protokoloa:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "_Erabiltzaile-izena:"
+msgstr "Erabiltzaile-Izena:"
 
 msgid "Password:"
 msgstr "Pasahitza:"
 
 msgid "Alias:"
-msgstr "Aliasa:"
+msgstr "Ezizena:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "Zerbitzaritik deskonektatuta zaude."
+msgstr "Zerbitzarian sortu kontu hau"
 
 #. Cancel button
 #. Cancel
@@ -118,9 +113,8 @@ msgstr "Gorde"
 msgid "Are you sure you want to delete %s?"
 msgstr "Ziur zaude %s ezabatu nahi duzula?"
 
-#, fuzzy
 msgid "Delete Account"
-msgstr "Ahalbidetu Kontua"
+msgstr "Kontua Ezabatu"
 
 #. Delete button
 msgid "Delete"
@@ -129,36 +123,33 @@ msgstr "Ezabatu"
 msgid "Accounts"
 msgstr "Kontuak"
 
-#, fuzzy
 msgid "You can enable/disable accounts from the following list."
-msgstr "Lagun hauen baimenaren zain zaude"
+msgstr "Kontuak gaitu/ezgaitu ditzakezu ondorengo zerrendan."
 
 #. Add button
 msgid "Add"
 msgstr "Gehitu"
 
 #. Modify button
-#, fuzzy
 msgid "Modify"
-msgstr "_Aldatu"
+msgstr "Aldatu"
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s  %s lagun egin du  %s%s"
+msgstr "%s%s%s%s(e)k bere lagnu egin du%s %s%s"
 
 msgid "Add buddy to your list?"
-msgstr "Laguna zerrendan gehitu nahi duzu?"
+msgstr "Zure zerrendara gehitu laguna?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s erabiltzaileak %s gehitu nahi du bere lagunen zerrendan %s%s."
+msgstr "%s%s%s%s(e)k bere lagun-zerrendara gehitu nahi du %s %s%s."
 
-#, fuzzy
 msgid "Authorize buddy?"
-msgstr "Baimena eman"
+msgstr "Laguna baimendu?"
 
 msgid "Authorize"
-msgstr "Baimena eman"
+msgstr "Baimendu"
 
 msgid "Deny"
 msgstr "Ukatu"
@@ -168,61 +159,56 @@ msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
+"Online: %d\n"
+"Guztira: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Account: %s (%s)"
-msgstr "%s: %s (%s)"
+msgstr "Kontua: %s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"<b>Azken aldiz ikusia:</b> duela %s"
+"Azkenekoz ikusia: duela %s"
 
-#, fuzzy
 msgid "Default"
-msgstr "Gnome-ren lehenetsia "
+msgstr "Lehenetsia"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
-msgstr "Idatzi gehitu nahi duzun taldearen izena."
+msgstr "Lagunarentzako erabiltzaile-izen bat eman behar duzu."
 
 msgid "You must provide a group."
-msgstr ""
+msgstr "Talde bat eman behar duzu."
 
-#, fuzzy
 msgid "You must select an account."
-msgstr "Goitizena zehaztu behar duzu"
+msgstr "Kontu bat hautatu behar duzu."
 
 msgid "The selected account is not online."
-msgstr ""
+msgstr "Hautatutako kontua ez dago online."
 
-#, fuzzy
 msgid "Error adding buddy"
-msgstr "Errorea %s irakurtzean"
+msgstr "Errorea laguna gehitzean"
 
 msgid "Username"
 msgstr "Erabiltzaile-izena"
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "Mezu (Aukerazkoa):"
+msgstr "Ezizena (opzionala)"
 
-#, fuzzy
 msgid "Add in group"
-msgstr "Gehitu taldea"
+msgstr "Taldera gehitu"
 
 msgid "Account"
 msgstr "Kontua"
 
 msgid "Add Buddy"
-msgstr "Gehitu laguna"
+msgstr "Laguna Gehitu"
 
-#, fuzzy
 msgid "Please enter buddy information."
-msgstr "Adierazi lagun bat alerta emateko."
+msgstr "Lagunaren informazioa sartu ezazu."
 
 msgid "Chats"
 msgstr "Berriketak"
@@ -234,121 +220,106 @@ msgstr "Izena"
 msgid "Alias"
 msgstr "Ezizena"
 
-#, fuzzy
 msgid "Group"
-msgstr "Taldea:"
+msgstr "Taldea"
 
-#, fuzzy
 msgid "Auto-join"
-msgstr "_Automatikoki sartu"
+msgstr "Automatikoki batu"
 
 msgid "Add Chat"
-msgstr "Gehitu berriketa"
+msgstr "Berriketa Gehitu"
 
 msgid "You can edit more information from the context menu later."
 msgstr ""
+"Informazio gehiago editatu ahalko duzu geroago kontestu-menua erabiliz."
 
-#, fuzzy
 msgid "Error adding group"
-msgstr "Errorea %s irakurtzean"
+msgstr "Errorea taldea gehitzean"
 
-#, fuzzy
 msgid "You must give a name for the group to add."
-msgstr "Idatzi gehitu nahi duzun taldearen izena."
+msgstr "Izen bat eman behar duzu gehituko duzun talderako."
 
 msgid "Add Group"
-msgstr "Gehitu taldea"
+msgstr "Taldea Gehitu"
 
-#, fuzzy
 msgid "Enter the name of the group"
-msgstr "Idatzi gehitu nahi duzun taldearen izena."
+msgstr "Taldearen izena sartu"
 
-#, fuzzy
 msgid "Edit Chat"
-msgstr "Gehitu berriketa"
+msgstr "Berriketa Editatu"
 
 msgid "Please Update the necessary fields."
-msgstr ""
+msgstr "Beharrezko eremuak Eguneratu."
 
 msgid "Edit"
-msgstr ""
+msgstr "Editatu"
 
-#, fuzzy
 msgid "Edit Settings"
-msgstr "Erabili ingurune-ezarpenak"
+msgstr "Ezarpenak Editatu"
 
-#, fuzzy
 msgid "Information"
-msgstr "Laneko datuak"
+msgstr "Informazioa"
 
-#, fuzzy
 msgid "Retrieving..."
-msgstr "Erabiltzailea idazten ari da..."
+msgstr "Eskuratzen..."
 
 msgid "Get Info"
-msgstr "Hartu informazioa"
+msgstr "Informazioa Eskuratu"
 
-#, fuzzy
 msgid "Add Buddy Pounce"
-msgstr "Gehitu lagun-_alerta"
+msgstr "Lagun-Alerta Gehitu"
 
 msgid "Send File"
-msgstr "Bidali fitxategia"
+msgstr "Fitxategia Bidali"
 
 msgid "Blocked"
 msgstr "Blokeatuta"
 
-#, fuzzy
 msgid "Show when offline"
-msgstr "Ez da onartzen lineaz kanpo"
+msgstr "Offline egotean erakutsi"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the new name for %s"
-msgstr "Idatzi pasahitz berria"
+msgstr "%s(r)en izen berria sartu"
 
-#, fuzzy
 msgid "Rename"
-msgstr "_Izena aldatu"
+msgstr "Berrizendatu"
 
-#, fuzzy
 msgid "Set Alias"
-msgstr "Ezizena"
+msgstr "Ezizena Ezarri"
 
 msgid "Enter empty string to reset the name."
-msgstr ""
+msgstr "Kate hutsa sartu ezazu izena berrezartzeko."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
+msgstr "Kontaktu hau kentzean, kontaktuko lagun guztiak ere kenduko dira."
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
+msgstr "Talde hau kentzean, taldeko lagun guztiak ere kenduko dira."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "Ziur zaude %s ezabatu nahi duzula?"
+msgstr "Ziur zaude %s kendu nahi duzula?"
 
 #. XXX: anything to do with the returned ui-handle?
-#, fuzzy
 msgid "Confirm Remove"
-msgstr "Isteko konfirmazioa"
+msgstr "Kentzea Konfirmatu"
 
 msgid "Remove"
 msgstr "Kendu"
 
 #. Buddy List
 msgid "Buddy List"
-msgstr "Lagunen zerrenda"
+msgstr "Lagunen Zerrenda"
 
-#, fuzzy
 msgid "Place tagged"
-msgstr "Bizilekua"
+msgstr "Lekua etiketatua"
 
 msgid "Toggle Tag"
-msgstr ""
+msgstr "Etiketa Konmutatu"
 
-#, fuzzy
 msgid "View Log"
-msgstr "Ikusi _egunkaria"
+msgstr "Txostena Ikusi"
 
 #. General
 msgid "Nickname"
@@ -357,36 +328,35 @@ msgstr "Goitizena"
 #. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
-msgstr "Ez-aktibo"
+msgstr "Inaktibo"
 
-#, fuzzy
 msgid "On Mobile"
-msgstr "Mugikorra"
+msgstr "Mugikorrean"
 
 msgid "New..."
 msgstr "Berria..."
 
 msgid "Saved..."
-msgstr "Gordeta..."
+msgstr "Gordetakoa..."
 
 msgid "Plugins"
-msgstr "Plugin-ak"
+msgstr "Pluginak"
 
-#, fuzzy
 msgid "Block/Unblock"
-msgstr "Blokeoa kendu"
+msgstr "Blokeatu/Desblokeatu"
 
 msgid "Block"
 msgstr "Blokeatu"
 
 msgid "Unblock"
-msgstr "Blokeoa kendu"
+msgstr "Desblokeatu"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "Idatzi BM bidali nahi diozun pertsonaren pantaila-izena edo ezizena."
+msgstr ""
+"Blokeatu/Desblokeatu nahi duzun pertsonaren erabiltzaile-izena edo ezizena "
+"sartu ezazu."
 
 #. Not multiline
 #. Not masked?
@@ -395,139 +365,127 @@ msgid "OK"
 msgstr "Ados"
 
 msgid "New Instant Message"
-msgstr "Berehalako mezu berria"
+msgstr "Istanteko Mezu Berria"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "Idatzi BM bidali nahi diozun pertsonaren pantaila-izena edo ezizena."
+msgstr ""
+"IMa bidali nahi diozun pertsonaren erabiltzaile-izena edo ezizena sartu "
+"ezazu."
 
-#, fuzzy
 msgid "Channel"
-msgstr "_Kanala:"
+msgstr "Kanala"
 
 msgid "Join a Chat"
-msgstr "Sartu berriketa batean"
+msgstr "Berriketa batera Batu"
 
-#, fuzzy
 msgid "Please enter the name of the chat you want to join."
-msgstr "Sartu txertatu nahi duzun estekaren URL helbidea."
+msgstr "Batu nahi zaren berriketaren izena sartu ezazu."
 
-#, fuzzy
 msgid "Join"
-msgstr "_Sartu"
+msgstr "Batu"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"Idatzi egunkaria ikusi nahi duzun pertsonaren pantaila-izena edo ezizena."
+"Ikusi nahi duzun txostena dagokion pertsonaren erabiltzaile-izena edo "
+"ezizena sartu ezazu."
 
 #. Create the "Options" frame.
 msgid "Options"
 msgstr "Aukerak"
 
-#, fuzzy
 msgid "Send IM..."
-msgstr "Gordeta..."
+msgstr "IMa Bidali..."
 
-#, fuzzy
 msgid "Block/Unblock..."
-msgstr "Blokeoa kendu"
+msgstr "Blokeatu/Desblokeatu..."
 
-#, fuzzy
 msgid "Join Chat..."
-msgstr "Sartu berriketa batean"
+msgstr "Berriketara Batu..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "Ikusi _egunkaria"
+msgstr "Txostena Ikusi..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "Ikusi _egunkaria"
+msgstr "Txosten Guztiak Ikusi"
 
 msgid "Show"
-msgstr ""
+msgstr "Erakutsi"
 
-#, fuzzy
 msgid "Empty groups"
-msgstr "Taldearen arabera"
+msgstr "Talde hutsak"
 
-#, fuzzy
 msgid "Offline buddies"
-msgstr "Bilatu lagunak"
+msgstr "Offline lagunak"
 
-#, fuzzy
 msgid "Sort"
-msgstr "Ataka"
+msgstr "Antolatu"
 
-#, fuzzy
 msgid "By Status"
-msgstr "Egoeraren arabera"
+msgstr "Egoeraren Arabera"
 
 msgid "Alphabetically"
 msgstr "Alfabetikoki "
 
-#, fuzzy
 msgid "By Log Size"
-msgstr "Egunkari-tamainaren arabera"
+msgstr "Txosten-Tamainaren Arabera"
 
-#, fuzzy
 msgid "Buddy"
-msgstr "_Laguna:"
+msgstr "Laguna"
 
 msgid "Chat"
 msgstr "Berriketa"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "Taldea:"
+msgstr "Taldekatzea"
 
-#, fuzzy
 msgid "Certificate Import"
-msgstr "Konektatzeko atak"
+msgstr "Zertifikatua Inportatu"
 
 msgid "Specify a hostname"
-msgstr ""
+msgstr "Ostalari-izena zehaztu"
 
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "Zertifikatu hau dagokion ostalariaren izena idatzi ezazu."
 
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"Ezin %s fitxategia inportatu.\n"
+"Irakurgarria dela eta PEM formatua duela egiaztatu ezazu.\n"
 
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "Zertifikatu Inportazio Errorea"
 
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "Errorea X.509 zertifikatua inportatzean"
 
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "Hautatu fitxategia"
+msgstr "PEM zertifikatua hautatu"
 
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"Ezin %s fitxategira esportatu.\n"
+"Helburu-bidean idazteko baimena duzula egiaztatu ezazu.\n"
 
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "Zertifikatu Esportatze Errorea"
 
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "Errorea X.509 zertifikatua esportatzean"
 
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "PEM X.509 Zertifikatu Esportazioa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate for %s"
-msgstr "Egoera : %s rako."
+msgstr "%s(e)rako zertifikatua"
 
 #, c-format
 msgid ""
@@ -536,23 +494,27 @@ msgid ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"Izen arrunta: %s\n"
+"\n"
+"SHA1 hatz-marka:\n"
+"%s"
 
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "SSL Ostalari-Zertifikatua"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "Benetan ezabatu %s(e)rako zertifikatua?"
 
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "Zertifikatu-ezabatzea konfirmatu"
 
 msgid "Certificate Manager"
-msgstr ""
+msgstr "Zertifikatu-Kudeatzailea"
 
 #. Creating the user splits
 msgid "Hostname"
-msgstr "Ostalari-Izena"
+msgstr "Ostalaria"
 
 msgid "Info"
 msgstr "Informazioa"
@@ -561,208 +523,190 @@ msgstr "Informazioa"
 msgid "Close"
 msgstr "Itxi"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s)"
-msgstr "%s: %s (%s)"
+msgstr "%s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s disconnected."
-msgstr "%s Deskonektatuta."
+msgstr "%s deskonektatuta."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "\n"
 "Finch will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 msgstr ""
-"%s deskonektatua izan da errorea baten ondorioz: %s\n"
-" Pidgin ez da saiatuko kontua berriz konektatzen errorea konpondu  eta kontua "
-"ahalbidetu arte."
+"%s\n"
+"\n"
+"Finch ez da kontuarekin berriz konektatzen saiatuko zuk errorea konpondu  "
+"eta kontua bergaitu arte."
 
 msgid "Re-enable Account"
-msgstr "Ber ahalbidetu kontua"
+msgstr "Kontua Bergaitu"
 
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
 msgstr ""
+"Kontua deskonektatu egin da eta jadanik ez zaude berriketa honetan. "
+"Automatikoki batuko zara berriketara, kontua berkonektatu bezain laster."
 
 msgid "No such command."
-msgstr "Komando hori ez dago."
+msgstr "Halako agindurik ez."
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Sintaxi errorea: argumentu kopuru okerra idatzi duzu komando horrentzako."
+"Sintaxi-errorea: Argumentu-kopuru okerra idatzi duzu agindu horrentzako."
 
 msgid "Your command failed for an unknown reason."
-msgstr "Komandoak huts egin du arrazoi ezezagunen batengatik."
+msgstr "Zure aginduak huts egin du arrazoi ezezagunen batengatik."
 
 msgid "That command only works in chats, not IMs."
-msgstr "Komando horrek Berriketan bakarrik funtzionatzen du, ez IMen "
+msgstr "Agindu horrek berriketetan bakarrik funtzionatzen du, ez IMetan."
 
 msgid "That command only works in IMs, not chats."
-msgstr "Komando horrek IMen bakarrik funtzionatzen du, ez Berriketan "
+msgstr "Agindu horrek IMetan bakarrik funtzionatzen du, ez berriketetan."
 
 msgid "That command doesn't work on this protocol."
-msgstr "Komando horrek ez du protokolo honekin lanik egiten"
+msgstr "Agindu horrek ez du protokolo honekin funtzionatzen."
 
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "Mezua ezin izan da bidali azkarregi bidaltzen ari garelako:"
+msgstr "Ez da mezua bidali, ez zaudelako konektatuta."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s -- %s)"
-msgstr "%s: %s (%s)"
+msgstr "%s.(%s -- %s)"
 
 #, c-format
 msgid "%s [%s]"
-msgstr ""
+msgstr "%s [%s]"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s is typing..."
-msgstr "Erabiltzailea idazten ari da..."
+msgstr ""
+"\n"
+"Idazten ari da %s..."
 
-#, fuzzy
 msgid "You have left this chat."
-msgstr "Berriketan ari zara"
+msgstr "Berriketa hau utzi duzu."
 
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
-"Egunkaria martxan jarri da. Solasaldi honetako etorkizuneko mezuak egunkaria "
-"gordeko dira."
+"Martxan jarri da txostena. Txostenean gordeko dira solasaldi honetako mezu "
+"guztiak."
 
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-"Egunkaria gelditua. Solasaldi honetako mezuak etorkizunean ez dira "
-"egunkarian gordeko."
+"Geldiarazi egin da txostena. Ez da txostenean gordeko solasaldi honetako "
+"mezu gehiago."
 
-#, fuzzy
 msgid "Send To"
-msgstr "_Bidali honi:"
-
-#, fuzzy
-msgid "Invite message"
-msgstr "Txertatu irudia mezuan"
-
-msgid "Invite"
-msgstr "Gonbidatu"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Idatzi gonbidatu nahi duzun erabiltzailearen izena, gonbit-mezu batekin nahi "
-"baduzu."
+msgstr "Hona Bidali"
 
-#, fuzzy
 msgid "Conversation"
-msgstr "Solasaldiak"
+msgstr "Solasaldia"
 
-#, fuzzy
 msgid "Clear Scrollback"
-msgstr "/Solasaldia/Garb_itu Scrollback"
+msgstr "Solasaldia Garbitu"
 
-#, fuzzy
 msgid "Show Timestamps"
-msgstr "Ordu-zigiluak"
+msgstr "Ordu-Markak Erakutsi"
 
-#, fuzzy
 msgid "Add Buddy Pounce..."
-msgstr "Gehitu lagun-_alerta"
+msgstr "Lagun-Alerta Gehitu..."
 
-#, fuzzy
 msgid "Invite..."
-msgstr "Gonbidatu"
+msgstr "Gonbidatu..."
 
-#, fuzzy
 msgid "Enable Logging"
-msgstr "/Aukerak/Gaitu egunkaria"
+msgstr "Txostena Gaitu"
 
-#, fuzzy
 msgid "Enable Sounds"
-msgstr "/Aukerak/Gaitu soinuak"
+msgstr "/Soinuak Gaitu"
 
-#, fuzzy
 msgid "<AUTO-REPLY> "
-msgstr "(%s) %s <ERANTZUN AUTOMATIKOA>: %s\n"
+msgstr "<ERANTZUN AUTOMATIKOA>"
 
 #, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Erabiltzaile %d(e)ko zerrenda:\n"
+msgstr[1] "%d erabiltzaileko zerrenda:\n"
 
 msgid "Supported debug options are:  version"
-msgstr "Onartutako arazketa aukerak: bertsioa"
+msgstr "Onartutako arazketa-aukerak:  version"
 
 msgid "No such command (in this context)."
-msgstr "Komando hori ez dago (testuinguru honetan)"
+msgstr "Halako agindurik ez dago (testuinguru honetan)."
 
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Erabili \"/help &lt;komandoa&gt;\" komando zehatz baten laguntza ikusteko.\n"
-"Testuinguru honetan honako komandoak daude eskuragarri:\n"
+"\"/help &lt;agindua&gt;\" erabili ezazu agindu zehatz baten laguntza "
+"ikusteko.\n"
+"Agindu hauek erabil ditzakezu testuinguru honetan:\n"
 
 #, c-format
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
 msgstr ""
+"%s ez da baliozko mezu-klasea. '/help msgcolor' ikusi ezazu baliozko mezu-"
+"klaseen bila."
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr ""
+"%s ez da baliozko kolorea. '/help msgcolor' ikusi ezazu baliozko koloreen "
+"bila."
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say &lt;mezua&gt;:  bidali mezua modu normalean, komandorik erabiliko ez "
-"bazenu bezala."
+"say &lt;mezua&gt;:  Mezu bat bidali, agindurik erabiliko ez bazenu bezala."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
-"me &lt;ekintza&gt;:  bidali IRC estiloko ekintza lagun bati edo berriketara."
+"me &lt;ekintza&gt;:  IRC estiloko ekintza bidali lagun bati edo berriketara."
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr ""
-"debug &lt;aukera&gt;: bidali hainbat arazketako informazio uneko solasaldira."
+msgstr "debug &lt;aukera&gt;: Hainbat arazketa-informazio bidali solasaldira."
 
 msgid "clear: Clears the conversation scrollback."
-msgstr "garbitu: Garbitu sosaldiaren scrollback"
+msgstr "clear: Solasaldia garbitu."
 
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;komandoa&gt;: komando zehatz bati dagokion laguntza."
+msgstr "help &lt;agindua&gt;: Agindu zehatz bati dagokion laguntza."
 
 msgid "users:  Show the list of users in the chat."
-msgstr ""
+msgstr "users:  Berriketan dauden erabiltzaileen zerrenda bistaratu."
 
 msgid "plugins: Show the plugins window."
-msgstr ""
+msgstr "plugins: Plugin-Leihoa bistaratu."
 
 msgid "buddylist: Show the buddylist."
-msgstr ""
+msgstr "buddylist: Lagun-zerrenda bistaratu."
 
 msgid "accounts: Show the accounts window."
-msgstr ""
+msgstr "accounts: Kontu-leihoa bistaratu."
 
 msgid "debugwin: Show the debug window."
-msgstr ""
+msgstr "debugwin: Arazketa-leihoa bistaratu."
 
 msgid "prefs: Show the preference window."
-msgstr ""
+msgstr "prefs: Hobespen-leihoa bistaratu."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr ""
+msgstr "statuses: Gordetako egoeren leihoa bistaratu."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -771,12 +715,17 @@ msgid ""
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
+"msgcolor &lt;klasea&gt; &lt;aurrealdea&gt; &lt;atzealdea&gt;: Solasaldi-"
+"leihoko mezu-klase ezberdinen koloreak ezarri.<br>    &lt;klasea&gt;: "
+"receive, send, highlight, action, timestamp<br>    &lt;aurrealdea/"
+"atzealdea&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>ADIBIDEA:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
-msgstr "Ezin da fitxategia ireki."
+msgstr "Ezin fitxategia ireki."
 
 msgid "Debug Window"
-msgstr "Arazketa-leihoa"
+msgstr "Arazketa-Leihoa"
 
 #. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
 #. * it's necessary to make the width of the debug window resizable ... like I said,
@@ -785,25 +734,24 @@ msgstr "Arazketa-leihoa"
 msgid "Clear"
 msgstr "Garbitu"
 
-#, fuzzy
 msgid "Filter:"
-msgstr "Iragazgailua"
+msgstr "Iragazkia:"
 
 msgid "Pause"
 msgstr "Pausarazi"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "Fitxategi transferentzia hona %s huts egin du."
-msgstr[1] "Fitxategi transferentzia hona %s huts egin du."
+msgstr[0] "Fitxategi-Transferentziak - %d%%, fitxategi %detik"
+msgstr[1] "Fitxategi-Transferentziak - %d%%, %d fitxategitatik"
 
 #. Create the window.
 msgid "File Transfers"
-msgstr "Fitxategi-transferentziak"
+msgstr "Fitxategi-Transferentziak"
 
 msgid "Progress"
-msgstr "Aurrerabidea"
+msgstr "Progresua"
 
 msgid "Filename"
 msgstr "Fitxategi-izena"
@@ -811,31 +759,27 @@ msgstr "Fitxategi-izena"
 msgid "Size"
 msgstr "Tamaina"
 
-#, fuzzy
 msgid "Speed"
-msgstr "Abiadura:"
+msgstr "Abiadura"
 
 msgid "Remaining"
-msgstr "Falta:"
+msgstr "Faltan"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 msgid "Status"
 msgstr "Egoera"
 
-#, fuzzy
 msgid "Close this window when all transfers finish"
-msgstr "Lehio hau itxi transferentzia guztiak amaitu direnean"
+msgstr "Leiho hau itxi transferentzia guztiak amaitzean"
 
-#, fuzzy
 msgid "Clear finished transfers"
-msgstr "_Garbitu amaitutako transferentziak "
+msgstr "Amaitutako transferentziak garbitu"
 
-#, fuzzy
 msgid "Stop"
-msgstr "Hiptop"
+msgstr "Gelditu"
 
 msgid "Waiting for transfer to begin"
-msgstr "Transferentziaren zain hasteko"
+msgstr "Transferentzia hasteko zain"
 
 msgid "Canceled"
 msgstr "Bertan behera utzi da"
@@ -843,40 +787,36 @@ msgstr "Bertan behera utzi da"
 msgid "Failed"
 msgstr "Huts egin du"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KB/s"
+msgstr "%.2f KiB/s"
 
-#, fuzzy
 msgid "Sent"
-msgstr "_Ezarri"
+msgstr "Bidalita"
 
-#, fuzzy
 msgid "Received"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Jasota"
 
 msgid "Finished"
 msgstr "Amaituta"
 
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "%s bezala gorde da fitxategia."
 
-#, fuzzy
 msgid "Sending"
-msgstr "_Bidali"
+msgstr "Bidaltzen"
 
-#, fuzzy
 msgid "Receiving"
-msgstr "Falta:"
+msgstr "Jasotzen"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "Solasaldiak %s(r)ekin "
+msgstr "Solasaldia %s(en), %s(e)n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "Solasaldiak %s(r)ekin"
+msgstr "Solasaldiak %s(r)ekin, %s(e)n"
 
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -885,101 +825,130 @@ msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"Gertaeren sistemak bakarrik egunkarian gordeko du \" Log all status changes "
-"to system log\" ezarpena ahalbidetuab badago."
+"Sistemaren gertaerak txostenean gordetzeko, \"Egoera-aldaketa guztiak gorde "
+"sistemaren txostenean\" gaituta egon behar da."
 
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"Beheralako mezuak egunkarian gordeko dira bakarrik  \"Log all instant "
-"messages\"  ezarpena ahalbidetua badago."
+"Istanteko mezuak txostenean gordetzeko, \"Istanteko mezu guztiak gorde "
+"txostenean\" gaituta egon behar da."
 
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Berriketak egunkarian gordeko dira bakarrik  \"Log all chats\"  ezarpena "
-"ahalbidetua badago."
+"Berriketak txostenean gordetzeko, \"Berriketa guztiak gorde txostenean\" "
+"gaituta egon behar da."
 
 msgid "No logs were found"
-msgstr "Ez da egunkaririk topatu"
+msgstr "Ez da txostenik aurkitu"
 
 msgid "Total log size:"
-msgstr "Egunkari-tamaina totala:"
+msgstr "Txosten-tamaina totala:"
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "Korritu/Bilatu:"
 
 #, c-format
 msgid "Conversations in %s"
-msgstr "Solasaldiak %s(r)ekin "
+msgstr "Solasaldiak %s(e)n"
 
 #, c-format
 msgid "Conversations with %s"
 msgstr "Solasaldiak %s(r)ekin"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "Solasaldiak"
+msgstr "Solasaldi Guztiak"
 
 msgid "System Log"
-msgstr "Sistemaren egunkaria"
+msgstr "Sistemaren Txostena"
+
+msgid "Calling ... "
+msgstr "Deitzen ... "
+
+msgid "Hangup"
+msgstr "Eskegi"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Onartu"
+
+msgid "Reject"
+msgstr "Ezetsi"
+
+msgid "Call in progress."
+msgstr "Deia burutzen."
+
+msgid "The call has been terminated."
+msgstr "Deia amaitu da."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s(e)k audio-sesio bat hasiarazi nahi du zurekin."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s zurekin media ezezaguneko sesio bat hasiarazi nahian dabil."
+
+msgid "You have rejected the call."
+msgstr "Deia ezetsi duzu."
+
+msgid "call: Make an audio call."
+msgstr "call: Audio-dei bat burutu."
 
-#, fuzzy
 msgid "Emails"
-msgstr "Helbide elektronikoa"
+msgstr "E-postak"
 
 msgid "You have mail!"
-msgstr ""
+msgstr "Posta daukazu!"
 
-#, fuzzy
 msgid "Sender"
-msgstr "Sexua"
+msgstr "Igorlea"
 
 msgid "Subject"
 msgstr "Gaia"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s erabiltzaileak mezu berri %d du."
-msgstr[1] "%s erabiltzaileak %d mezu berri ditu."
+msgstr[0] "%s (%s), mezu berri %d."
+msgstr[1] "%s (%s), %d mezu berri."
 
 msgid "New Mail"
-msgstr "Post _berria"
+msgstr "Posta Berria"
 
 #, c-format
 msgid "Info for %s"
 msgstr "%s(r)en inf."
 
 msgid "Buddy Information"
-msgstr "Lagunaren datuak"
+msgstr "Lagunaren Informazioa"
 
-#, fuzzy
 msgid "Continue"
-msgstr "Konektatu"
+msgstr "Jarraitu"
 
 msgid "IM"
-msgstr "BM"
+msgstr "IM"
+
+msgid "Invite"
+msgstr "Gonbidatu"
 
-#, fuzzy
 msgid "(none)"
-msgstr "(ez dago izenik)"
+msgstr "(batere ez)"
 
-#, fuzzy
 msgid "URI"
-msgstr "UINa"
+msgstr "URI"
 
 msgid "ERROR"
-msgstr ""
+msgstr "ERROREA"
 
-#, fuzzy
 msgid "loading plugin failed"
-msgstr "Ping-ek huts egin du"
+msgstr "ezin plugina kargatu"
 
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "ezin plugina deskargatu"
 
 #, c-format
 msgid ""
@@ -990,38 +959,41 @@ msgid ""
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
+"Izena: %s\n"
+"Bertsioa: %s\n"
+"Azalpena: %s\n"
+"Egilea: %s\n"
+"Webgunea: %s\n"
+"Fitxategi-izena: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr ""
+msgstr "Plugina kargatu egin behar da konfiguratu ahal izan aurretik."
 
 msgid "No configuration options for this plugin."
-msgstr ""
+msgstr "Konfigurazio-aukerarik ez plugin honentzat."
 
-#, fuzzy
 msgid "Error loading plugin"
-msgstr "Pidgin-ek errore bat aurkitu du plugin -a kargatzean"
+msgstr "Errorea plugina kargatzean"
 
 msgid "The selected file is not a valid plugin."
-msgstr ""
+msgstr "Hautatutako fitxategia ez da baliozko plugina."
 
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
+"Arazketa-leihoa ireki eta berriro saiatu zaitez errore-mezu zehatza ikusteko."
 
-#, fuzzy
 msgid "Select plugin to install"
-msgstr "Hautatu fitxategia"
+msgstr "Instalatuko den plugina hautatu"
 
-#, fuzzy
 msgid "You can (un)load plugins from the following list."
-msgstr "Lagun hauen baimenaren zain zaude"
+msgstr "Zerrenda honetako pluginak kargatu/deskargatu ditzakezu."
 
 msgid "Install Plugin..."
-msgstr ""
+msgstr "Plugina Instalatu..."
 
-#, fuzzy
 msgid "Configure Plugin"
-msgstr "Pl_uing-a konfiguratu"
+msgstr "Plugina Konfiguratu"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1032,130 +1004,108 @@ msgid "Preferences"
 msgstr "Hobespenak"
 
 msgid "Please enter a buddy to pounce."
-msgstr "Adierazi lagun bat alerta emateko."
+msgstr "Alertarako lagun bat hautatu ezazu."
 
 msgid "New Buddy Pounce"
-msgstr "Lagun-alerta berria"
+msgstr "Lagun-Alerta Berria"
 
 msgid "Edit Buddy Pounce"
-msgstr "Editatu lagun-alerta"
+msgstr "Lagun-Alerta Editatu"
 
-#, fuzzy
 msgid "Pounce Who"
-msgstr "Alerta nori"
+msgstr "Alerta Nori"
 
 #. Account:
 msgid "Account:"
 msgstr "Kontua:"
 
-#, fuzzy
 msgid "Buddy name:"
-msgstr "_Lagunaren izena:"
+msgstr "Lagunaren izena:"
 
 #. Create the "Pounce When Buddy..." frame.
-#, fuzzy
 msgid "Pounce When Buddy..."
-msgstr "Alerta noiz"
+msgstr "Alerta Eman Laguna..."
 
-#, fuzzy
 msgid "Signs on"
-msgstr "_Konektatzean "
+msgstr "Konektatzean "
 
-#, fuzzy
 msgid "Signs off"
-msgstr "_Deskonektzean "
+msgstr "Deskonektzean "
 
-#, fuzzy
 msgid "Goes away"
-msgstr "Joanda egoera joan"
+msgstr "Kanpora joatean"
 
-#, fuzzy
 msgid "Returns from away"
-msgstr "J_oanda egoeratik itzuli"
+msgstr "Itzultzean"
 
-#, fuzzy
 msgid "Becomes idle"
-msgstr "Bihurtu ez-aktibo"
+msgstr "Inaktibo geratzean"
 
-#, fuzzy
 msgid "Is no longer idle"
-msgstr "Ez da luzeagoz ez-aktibo egongo"
+msgstr "Aktibatzean"
 
-#, fuzzy
 msgid "Starts typing"
-msgstr "_Idazten hastean"
+msgstr "Idazten hastean"
 
-#, fuzzy
 msgid "Pauses while typing"
-msgstr "Erabiltzailea idazten ari da..."
+msgstr "Idazteari uztean"
 
-#, fuzzy
 msgid "Stops typing"
-msgstr "_Idazteari gelditu"
+msgstr "Idazteari uztean"
 
-#, fuzzy
 msgid "Sends a message"
-msgstr "Bidali _mezua"
+msgstr "Mezua bidaltzean"
 
 #. Create the "Action" frame.
 msgid "Action"
-msgstr "Akzioa"
+msgstr "Ekintza"
 
-#, fuzzy
 msgid "Open an IM window"
-msgstr "_Ireki BM leiho bat "
+msgstr "IM leiho bat ireki"
 
-#, fuzzy
 msgid "Pop up a notification"
-msgstr "_Ireki jakinarazpen-leihoa "
+msgstr "Jakinarazpen-leihoa ireki"
 
-#, fuzzy
 msgid "Send a message"
-msgstr "Bidali _mezua"
+msgstr "Mezua bidali"
 
-#, fuzzy
 msgid "Execute a command"
-msgstr "_Exekutatu komando bat"
+msgstr "Agindua exekutatu"
 
-#, fuzzy
 msgid "Play a sound"
-msgstr "_Jo soinu bat"
+msgstr "Soinua erreproduzitu"
 
 # , fuzzy
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "P_ounce bakarrik nire egoera eskuragarri ez nagoenean"
+msgstr "Nire egoera 'Eskuragaitz' denean bakarrik eman alertak."
 
-#, fuzzy
 msgid "Recurring"
-msgstr "Errepikatzean"
+msgstr "Errepikakorra"
 
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "Ezin da goitizena aldatu"
+msgstr "Ezin alerta sortu"
 
 msgid "You do not have any accounts."
-msgstr ""
+msgstr "Ez daukazu konturik"
 
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "Kontu bat sortu behar duzu alertak sortu ahal izan aurretik."
 
 # , fuzzy
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?"
+msgstr "Ziur al zaude %s-rako %s-ren alerta ezabatu nahi duzula?"
 
-#, fuzzy
 msgid "Buddy Pounces"
-msgstr "Lagun-alerta berria"
+msgstr "Lagun-Alertak"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s idazten hasi zaizu (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s idazten hasi zaizu (%s)"
+msgstr "%s gelditu egin da zuri idatzi bitartean (%s)"
 
 #, c-format
 msgid "%s has signed on (%s)"
@@ -1187,15 +1137,13 @@ msgstr "%s joan egin da (%s)"
 
 #, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s bidali mezu bat bidali dizu  (%s)"
+msgstr "%s(e)k mezu bat bidali dizu (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
-msgstr "Alerta emateko gertaera ezezaguna. Eman honen berri!"
+msgstr "Alerta-gertaera ezezaguna. Eman honen berri!"
 
-#, fuzzy
 msgid "Based on keyboard use"
-msgstr "Teklatu edo saguaren erabilpenean oinarrituta"
+msgstr "Teklatuaren erabilpenean oinarrituta"
 
 msgid "From last sent message"
 msgstr "Bidalitako azkeneko mezutik"
@@ -1203,88 +1151,72 @@ msgstr "Bidalitako azkeneko mezutik"
 msgid "Never"
 msgstr "Inoiz ez"
 
-#, fuzzy
 msgid "Show Idle Time"
-msgstr "/Lagunak/Erakutsi ez-aktibo Denbora"
+msgstr "Inaktibotasun-Denbora Erakutsi"
 
-#, fuzzy
 msgid "Show Offline Buddies"
-msgstr "/Lagunak/Erakutsi Lineaz kanpoko lagunak"
+msgstr "Offline Lagunak Erakutsi"
 
-#, fuzzy
 msgid "Notify buddies when you are typing"
-msgstr "Jakinarazi _lagunei idazten ari zatzaizkienean"
+msgstr "Idazten ari zarela jakinarazi lagunei"
 
-#, fuzzy
 msgid "Log format"
-msgstr "_Egunkari-formatua: "
+msgstr "Txosten-formatua"
 
 msgid "Log IMs"
-msgstr ""
+msgstr "Txostenean gorde IMak"
 
-#, fuzzy
 msgid "Log chats"
-msgstr "Erreg_istratu egunkarian berriketa guztiak"
+msgstr "Txostenean gorde solasaldiak"
 
-#, fuzzy
 msgid "Log status change events"
-msgstr "Egunkarian gorde _egoera aldaketa guztiak egunkari sistema bidez"
+msgstr "Txostenean gorde egoera-aldaketak"
 
-#, fuzzy
 msgid "Report Idle time"
-msgstr "Ezagutarazi _inaktibotasun-denborak"
+msgstr "Inaktibotasun-Denboraren Berri Eman"
 
-#, fuzzy
 msgid "Change status when idle"
-msgstr "Egoera aldatu _ez-aktibo dagoenean"
+msgstr "Egoera aldatu inaktibo egotean"
 
-#, fuzzy
 msgid "Minutes before changing status"
-msgstr "_Egoera aldatu aurreko minutuak:"
+msgstr "Egoera aldatu aurreko minutuak"
 
-#, fuzzy
 msgid "Change status to"
-msgstr "_Egoera  aldatu hona:"
+msgstr "Egoera honetara aldatu"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Solasaldiak"
 
 msgid "Logging"
-msgstr "Egunkaria"
+msgstr "Txostenak"
 
-#, fuzzy
 msgid "You must fill all the required fields."
-msgstr "Bete harpidetzarako eremuak"
+msgstr "Beharrezko eremu guztiak bete behar dituzu."
 
-#, fuzzy
 msgid "The required fields are underlined."
-msgstr "Behar den %s plugin-a ezin da kargatu."
+msgstr "Beharrezko eremuak azpimarratuta daude."
 
-#, fuzzy
 msgid "Not implemented yet."
-msgstr "Eginbidea ez da inplementatu"
+msgstr "Inplementatu gabe oraindik."
 
 msgid "Save File..."
-msgstr "Gorde fitxategia..."
+msgstr "Fitxategia Gorde..."
 
 msgid "Open File..."
-msgstr "Ireki fitxategia..."
+msgstr "Fitxategia Ireki..."
 
-#, fuzzy
 msgid "Choose Location..."
-msgstr "Kokalekua"
+msgstr "Kokalekua Hautatu..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
+msgstr "'Entrar' sakatu ezazu kategoria honetako gela gehiago aurkitzeko."
 
-#, fuzzy
 msgid "Get"
-msgstr "_Ezarri"
+msgstr "Eskuratu"
 
 #. Create the window.
 msgid "Room List"
-msgstr "Gelen zerrenda"
+msgstr "Gela-Zerrenda"
 
 msgid "Buddy logs in"
 msgstr "Laguna konektatu da"
@@ -1302,10 +1234,10 @@ msgid "Message sent"
 msgstr "Mezua bidali da"
 
 msgid "Person enters chat"
-msgstr "Pertsona bat sartu da berriketan"
+msgstr "Pertsona bat berriketan sartu da"
 
 msgid "Person leaves chat"
-msgstr "Pertsona bat irten da berriketatik"
+msgstr "Pertsona bat berriketatik irten da"
 
 msgid "You talk in chat"
 msgstr "Berriketan ari zara"
@@ -1313,95 +1245,81 @@ msgstr "Berriketan ari zara"
 msgid "Others talk in chat"
 msgstr "Beste batzuk berriketan ari dira"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "Norbaitek zure pantaila-izena esan du berriketan"
+msgstr "Norbaitek zure erabiltzaile-izena dio solasaldian"
 
-#, fuzzy
 msgid "GStreamer Failure"
-msgstr "Gorde fitxategia"
+msgstr "GStreamer Errorea"
 
-#, fuzzy
 msgid "GStreamer failed to initialize."
-msgstr "desenpetatzerakoan huts egin du."
+msgstr "Ezin GStreamer hasiarazi."
 
 msgid "(default)"
-msgstr ""
+msgstr "(lehenetsia)"
 
-#, fuzzy
 msgid "Select Sound File ..."
-msgstr "Hautatu karpeta..."
+msgstr "Soinu-Fitxategia Hautatu..."
 
-#, fuzzy
 msgid "Sound Preferences"
-msgstr "Hobespenak"
+msgstr "Soinu-Hobespenak"
 
-#, fuzzy
 msgid "Profiles"
-msgstr "MSN profila"
+msgstr "Profilak"
 
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#, fuzzy
 msgid "Console Beep"
-msgstr "Kontsolaren soinu-seinalea"
+msgstr "Kontsolaren Soinua"
 
 msgid "Command"
-msgstr "Komandoa"
+msgstr "Agindua"
 
-#, fuzzy
 msgid "No Sound"
-msgstr "Soinurik ez"
+msgstr "Soinurik Ez"
 
 msgid "Sound Method"
-msgstr "Soinu-metodoa"
+msgstr "Soinu-Metodoa"
 
-#, fuzzy
 msgid "Method: "
-msgstr "_Metodoa:"
+msgstr "Metodoa:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Soinuaren k_omandoa:\n"
+"Soinu-Agindua:\n"
 "(%s fitxategi-izena)"
 
 #. Sound options
 msgid "Sound Options"
-msgstr "Soinu-aukerak"
+msgstr "Soinu-Aukerak"
 
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "_Solasaldiak fokua duenean"
+msgstr "Solasaldiak fokua dueneko soinuak"
 
 msgid "Always"
 msgstr "Beti"
 
-#, fuzzy
 msgid "Only when available"
-msgstr "Ez erabilgarri"
+msgstr "Eskuragarri egotean bakarrik"
 
-#, fuzzy
 msgid "Only when not available"
-msgstr "Ez dago erabilgarri"
+msgstr "Eskuragaitz egotean bakarrik"
 
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "Bolumena:"
+msgstr "Bolumena(0-100):"
 
 #. Sound events
 msgid "Sound Events"
-msgstr "Soinu-gertaerak"
+msgstr "Soinu-Gertaerak"
 
 msgid "Event"
 msgstr "Gertaera"
 
-#, fuzzy
 msgid "File"
-msgstr "Iragazgailua"
+msgstr "Fitxategia"
 
 msgid "Test"
 msgstr "Probatu"
@@ -1410,21 +1328,20 @@ msgid "Reset"
 msgstr "Berrezarri"
 
 msgid "Choose..."
-msgstr "Aukeratu..."
+msgstr "Hautatu..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Ziur zaude %s ezabatu nahi duzula?"
+msgstr "Ziur zaude \"%s\" ezabatu nahi duzula?"
 
-#, fuzzy
 msgid "Delete Status"
-msgstr "Egoera linean"
+msgstr "Egoera Ezabatu"
 
 msgid "Saved Statuses"
-msgstr "Gorde egoerak"
+msgstr "Egoera Gordeak"
 
 msgid "Title"
-msgstr "Lanpostua"
+msgstr "Titulua"
 
 msgid "Type"
 msgstr "Mota "
@@ -1441,142 +1358,125 @@ msgid "Message"
 msgstr "Mezua"
 
 #. Use
-#, fuzzy
 msgid "Use"
-msgstr "_Erabili"
+msgstr "Erabili"
 
-#, fuzzy
 msgid "Invalid title"
-msgstr "authzid baliogabea"
+msgstr "Titulu baliogabea"
 
 msgid "Please enter a non-empty title for the status."
-msgstr ""
+msgstr "Zerbait idatzi ezazu egoeraren titulurako."
 
-#, fuzzy
 msgid "Duplicate title"
-msgstr "Bikoiztutako zuzenketa"
+msgstr "Bikoiztutako titulua"
 
-#, fuzzy
 msgid "Please enter a different title for the status."
-msgstr "Erabili egoera _ezbedinak kontu batzuentzat"
+msgstr "Titulu ezberdin bat idatz ezazu egoerarako."
 
-#, fuzzy
 msgid "Substatus"
-msgstr "Egoera"
+msgstr "Azpiegoera"
 
 msgid "Status:"
 msgstr "Egoera:"
 
-#, fuzzy
 msgid "Message:"
-msgstr "_Mezua:"
+msgstr "Mezua:"
 
-#, fuzzy
 msgid "Edit Status"
-msgstr "Egoera zibila"
+msgstr "Egoera Editatu"
 
-#, fuzzy
 msgid "Use different status for following accounts"
-msgstr "Erabili egoera _ezbedinak kontu batzuentzat"
+msgstr "Egoera ezberdina erabili kontu hauentzako"
 
 #. Save & Use
-#, fuzzy
 msgid "Save & Use"
-msgstr "G_orde eta erabili"
+msgstr "Gorde eta erabili"
 
 msgid "Certificates"
-msgstr ""
+msgstr "Zertifikatuak"
 
 msgid "Sounds"
 msgstr "Soinuak"
 
-#, fuzzy
 msgid "Statuses"
-msgstr "Egoera"
+msgstr "Egoerak"
 
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "Pidgin-ek errore bat aurkitu du plugin -a kargatzean"
+msgstr "Errorea plugina kargatzean."
 
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "Ezin da fitxategia ireki."
+msgstr "Ezin X pantaila aurkitu"
 
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "Ezin da fitxategia ireki."
+msgstr "Ezin leihoa aurkitu"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "Ezin da plugin hau kargatu, ez zelako X11 jasateko eraiki."
 
 msgid "GntClipboard"
 msgstr ""
 
-#, fuzzy
 msgid "Clipboard plugin"
-msgstr "Memoriatik deskargatu Plugin-ak"
+msgstr ""
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed on"
-msgstr "%s konektatu da bertan."
+msgstr "%s konektatu da"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed off"
-msgstr "%s deskonektatu da ."
+msgstr "%s deskonektatu da"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent you a message"
-msgstr "%s bidali mezu bat bidali dizu  (%s)"
+msgstr "%s(e)k mezu bat bidali dizu"
 
 #, c-format
 msgid "%s said your nick in %s"
-msgstr ""
+msgstr "%s(e)k zure ezizena esan du %s(e)n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent a message in %s"
-msgstr "%s bidali mezu bat bidali dizu  (%s)"
+msgstr "%s(e)k mezu bat bidali du %s(e)n"
 
-#, fuzzy
 msgid "Buddy signs on/off"
-msgstr "Laguna _konektatu/deskonektatu"
+msgstr "Laguna konektatu/deskonektatu da"
 
 msgid "You receive an IM"
-msgstr ""
+msgstr "IM bat jasotzen duzunean"
 
-#, fuzzy
 msgid "Someone speaks in a chat"
-msgstr "Norbaitek zure pantaila-izena esan du berriketan"
+msgstr "Norbaitek solasaldi batean hitz egiten duenean"
 
-#, fuzzy
 msgid "Someone says your name in a chat"
-msgstr "Norbaitek zure pantaila-izena esan du berriketan"
+msgstr "Norbaitek zure erabiltzaile-izena dionean solasaldian"
 
 msgid "Notify with a toaster when"
-msgstr ""
+msgstr "'Toaster' batekin jakinarazi"
 
 msgid "Beep too!"
-msgstr ""
+msgstr "Soinua ere egin!"
 
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "URGENT bezala markatu terminalaren leihoa"
 
 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"
 
 msgid "Toaster plugin"
-msgstr ""
+msgstr "'Toaster' plugina"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>Solasaldia honekin  %s  hemen %s:</b><br>"
+msgstr "<b>%s(r)ekin solasaldia, %s(e)n:</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr "Historia Plugin-a logeatzea eskatzen du"
+msgstr "Historia Pluginak Txostena behar du"
 
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1584,14 +1484,13 @@ msgid ""
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"Logeatzea aktibatu daiteke Erabilpenal -> Ezarpenak -> Logeoa. \n"
+"Txostenak gaitzeko: Tresnak-> Hobespenak -> Txostenak. \n"
 "\n"
-"Log-ak ahalbidetu berehalako mezu eta/edo txat-entzat; historia aktibatuko "
-"da elkarrizketa solasaldi antzekoentzat."
+"Istanteko mezularitzarako edo berriketetarako txostenak gaituz gero, "
+"solasaldi-mota berdinetarako ere gaituko da."
 
-#, fuzzy
 msgid "GntHistory"
-msgstr "Historia"
+msgstr "GntHistoria"
 
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Azkenaldiko solasaldiak erakusten ditu solasaldi berrietan."
@@ -1600,86 +1499,103 @@ msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"Solasaldi berri bat irekitzean, plugin honek azken solasaldia uneko "
-"solasaldian sartuko du."
+"Solasaldi berri bat irekitzean, plugin honek azken solasaldia sartuko du "
+"solasaldi berrian."
 
-#, c-format
 msgid "Online"
-msgstr "Linean"
+msgstr "Konektatuta"
 
 msgid "Offline"
-msgstr "Lineaz kanpo"
+msgstr "Deskonektatuta"
 
-#, fuzzy
 msgid "Online Buddies"
-msgstr "Bilatu lagunak"
+msgstr "Online Lagunak"
 
-#, fuzzy
 msgid "Offline Buddies"
-msgstr "Bilatu lagunak"
+msgstr "Offline Lagunak"
 
-#, fuzzy
 msgid "Online/Offline"
-msgstr "Noiztik linean"
+msgstr "Online/Offline"
 
 msgid "Meebo"
-msgstr ""
+msgstr "Meebo"
 
-#, fuzzy
 msgid "No Grouping"
-msgstr "Soinurik ez"
+msgstr "Taldekatzerik Ez"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "Azpitalde Habikatua"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "Azpitalde Habikatuak (experimentala)"
 
-#, fuzzy
 msgid "Provides alternate buddylist grouping options."
-msgstr "Evolution-ekin integrazioa ahalbidetzen du."
+msgstr "Lagun-zerrenda taldekatzeko beste aukera batzuk eskaintzen ditu."
 
 msgid "Lastlog"
-msgstr ""
+msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "lastlog: Kate bat bilatzen du txostenean."
 
 msgid "GntLastlog"
-msgstr ""
+msgstr "GntLastlog"
 
 msgid "Lastlog plugin."
+msgstr "Lastlog plugina"
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
 msgstr ""
+"\n"
+"TinyURLa eskuratzen..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Luzera hau edo gehiago url-entzat bakarrik sortu TinyURLak"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (edo antzekoak) helbide-aurrizkia"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL plugina"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "URLa(k) dituen mezu bat jasotzean, TinyURL erabili errazago kopiatzeko"
 
 msgid "accounts"
-msgstr "Kontuak "
+msgstr "kontuak "
 
 msgid "Password is required to sign on."
-msgstr "Pasahitza beharrezkoa konektatzeko"
+msgstr "Pasahitza beharrezkoa konektatzeko."
 
 #, c-format
 msgid "Enter password for %s (%s)"
-msgstr "Idatzi %s(r)en (%s) pasahitza"
+msgstr "%s(r)en (%s) pasahitza idatzi"
 
 msgid "Enter Password"
-msgstr "Sartu Pasahitza"
+msgstr "Pasahitza Sartu"
 
 msgid "Save password"
-msgstr "Pasahitz gorde"
+msgstr "Pasahitza Gorde"
 
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "%s - protokoloaren plugin-a falta da"
+msgstr "%s(r)entzako protokolo-plugina falta da"
 
 msgid "Connection Error"
-msgstr "Konexio-errorea"
+msgstr "Konexio-Errorea"
 
 msgid "New passwords do not match."
 msgstr "Pasahitz berriak ez datoz bat."
 
 msgid "Fill out all fields completely."
-msgstr "Bete guztiz eremu guztiak."
+msgstr "Eremu guztiak osorik bete."
 
 msgid "Original password"
 msgstr "Pasahitz zaharra"
@@ -1692,17 +1608,17 @@ msgstr "Pasahitz berria (berriro)"
 
 #, c-format
 msgid "Change password for %s"
-msgstr "Aldatu %s erabiltzailearen pasahitza"
+msgstr "%s(r)en pasahitza aldatu"
 
 msgid "Please enter your current password and your new password."
-msgstr "Idatzi orain arteko pasahitza eta pasahitz berria."
+msgstr "Oraingo pasahitza eta pasahitz berria idatzi itzazu."
 
 #, c-format
 msgid "Change user information for %s"
-msgstr "Aldatu %s erabiltzailearen datuak"
+msgstr "%s erabiltzailearen datuak aldatu"
 
 msgid "Set User Info"
-msgstr "Ezarri erabiltzailearen datuak"
+msgstr "Erabiltzailearen Datuak Ezarri"
 
 msgid "Unknown"
 msgstr "Ezezaguna"
@@ -1711,30 +1627,32 @@ msgid "Buddies"
 msgstr "Lagunak"
 
 msgid "buddy list"
-msgstr "Lagunen zerrenda "
+msgstr "lagun-zerrenda"
 
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(EZ DATOR BAT)"
 
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s(e)k zertifikatu hau aurkeztu du oraingoan behintzat erabiltzeko:"
 
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"Izen arrunta: %s %s\n"
+"Hatz-marka (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Erabilera bakarreko Zertifikatuaren Egiaztapena"
 
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "Zertifikatu-Autoritateak"
 
 #. Scheme name
 #. Pool name
@@ -1742,61 +1660,74 @@ msgid "SSL Peers Cache"
 msgstr ""
 
 #. Make messages
-#, fuzzy, c-format
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "Berriketarako gonbita onartu nahi duzu?"
+msgstr "%s(e)rako zertifikatua onartu?"
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr ""
-
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "_Onartu"
-
-#, fuzzy
-msgid "Reject"
-msgstr "Berrezarri"
+msgstr "SSL-Zertifikatu Egiaztapena"
 
 msgid "_View Certificate..."
-msgstr ""
+msgstr "Zertifikatua _Ikusi..."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
+"\"%s\"(e)k aurkeztutako zertifikatuak \"%s\"(r)ena dela dio.  Agian ez zara "
+"zuk uste duzun zerbitzarira konektatzen ari."
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#, fuzzy
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
-msgstr "Idazketa-errorea "
+msgstr "SSL-Zertifikatu Errorea"
 
-#, fuzzy
 msgid "Invalid certificate chain"
-msgstr "Baimen-mekanismoa ez da baliozkoa"
+msgstr "Zertifikatu-kate baliogabea"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"Ez daukazu erro-zertifikatu datubaserik, beraz, ezin da zertifikatua "
+"egiaztatu."
 
+#. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
+#, c-format
 msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
 msgstr ""
+"Auto-sinatua da \"%s\"(e)k aurkeztutako zertifikatua. Ezin da automatikoki "
+"egiaztatua izan."
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "Baliogabea da %s(r)entzako aurkeztutako zertifikatu-katea."
+
+#. vrq will be completed by user_auth
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "Pidgin-ek ez du ezagutzen hau eskaini duela dioen erro-zertifikatua."
 
 #, c-format
 msgid ""
@@ -1804,19 +1735,11 @@ msgid ""
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
 msgstr ""
+"%s(e)k aurkeztutako zertifikatu-kateak ez dauka berak dioen Zertifikatu "
+"Autoritatearen baliozko sinadura digitalik."
 
 msgid "Invalid certificate authority signature"
-msgstr ""
-
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
+msgstr "Zertifikatu-autoritate sinadura baliogabea"
 
 #. Make messages
 #, c-format
@@ -1828,50 +1751,54 @@ msgid ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Izen arrunta: %s\n"
+"\n"
+"Hatz-marka (SHA1): %s\n"
+"\n"
+"Aktibazio-data: %s\n"
+"Iraungitze-data: %s\n"
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "Zerbitzariaren informazioa"
+msgstr "Zertifikatu-Informazioa"
 
 msgid "Registration Error"
-msgstr "Erregistratze-errorea"
+msgstr "Erregistratze-Errorea"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "Erregistratze-errorea"
+msgstr "Deserregistratze-Errorea"
 
 #, c-format
 msgid "+++ %s signed on"
-msgstr "+++%s sartu da"
+msgstr "+++ %s sartu da"
 
 #, c-format
 msgid "+++ %s signed off"
-msgstr "+++%s irten egin da"
+msgstr "+++ %s irten egin da"
 
+#. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
 msgid "Unable to send message: The message is too large."
-msgstr "Ezin da mezua bidali: mezua handiegia da."
+msgstr "Ezin mezua bidali: Mezua luzeegia da."
 
 #, c-format
 msgid "Unable to send message to %s."
-msgstr "Ezin zaio mezua bidali %s(r)i."
+msgstr "Ezin mezua bidali %s(r)i."
 
 msgid "The message is too large."
 msgstr "Mezua luzeegia da."
 
 msgid "Unable to send message."
-msgstr "Ezin da mezua bidali."
+msgstr "Ezin mezua bidali."
 
-#, fuzzy
 msgid "Send Message"
-msgstr "Bidali _mezua"
+msgstr "Mezua Bidali"
 
-#, fuzzy
 msgid "_Send Message"
-msgstr "Bidali _mezua"
+msgstr "Mezua _Bidali"
 
 #, c-format
 msgid "%s entered the room."
@@ -1897,63 +1824,71 @@ msgstr "%s gelatik irten da."
 msgid "%s left the room (%s)."
 msgstr "%s gelatik irten da (%s)."
 
-#, fuzzy, c-format
+msgid "Invite to chat"
+msgstr "Solasaldira gonbidatu"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Gonbidatu nahi duzun erabiltzailearen izena idatzi ezazu, gonbidapen-mezu "
+"batekin (nahi baduzu)."
+
+#, c-format
 msgid "Failed to get connection: %s"
-msgstr "Ezin da konexio sortu."
+msgstr "Ezin konexioa lortu: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get name: %s"
-msgstr "Huts egin du irudia gordetzean: %s\n"
+msgstr "Ezin izena eskuratu: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get serv name: %s"
-msgstr "Huts egin du irudia gordetzean: %s\n"
+msgstr "Ezin zerbitzari-izena eskuratu: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
+msgstr "Purple-ren D-BUS zerbitzaria ez dago martxan. Arrazoia:"
 
 msgid "No name"
-msgstr "Ez dago izenik"
+msgstr "Izenik ez"
 
-#, fuzzy
 msgid "Unable to create new resolver process\n"
-msgstr "Ezin da socket-a sortu"
+msgstr "Ezin prozesu konpontzaile berria sortu\n"
 
-#, fuzzy
 msgid "Unable to send request to resolver process\n"
-msgstr "Ezin zaio mezua bidali %s(r)i."
+msgstr "Ezin eskaera bidali prozesu konpontzaileari\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"Errorea %s irakurtzean: \n"
-"%s\n"
+"Errorea %s konpontzean:\n"
+"%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
-"Errorea %s irakurtzean: \n"
-"%s\n"
+msgstr "Errorea %s konpontzean: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "Errorea socket-etik irakurtzean:%s."
+msgstr ""
+"Errorea prozesu konpontzailetik irakurtzean:\n"
+"%s"
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "Gure eskaera erantzun gabe amaitu da prozesu konpontzailea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Thread creation failure: %s"
-msgstr "Autentifikazioak huts egin du"
+msgstr "Hari-sorrera errorea: %s"
 
-#, fuzzy
 msgid "Unknown reason"
-msgstr "Arrazoi ezezaguna."
+msgstr "Arrazoi ezezaguna"
 
 #, c-format
 msgid ""
@@ -1961,7 +1896,7 @@ msgid ""
 "%s.\n"
 msgstr ""
 "Errorea %s irakurtzean: \n"
-"%s\n"
+"%s.\n"
 
 #, c-format
 msgid ""
@@ -1969,18 +1904,18 @@ msgid ""
 "%s.\n"
 msgstr ""
 "Errorea %s idaztean: \n"
-"%s\n"
+"%s.\n"
 
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
-"Errorea %s sarbidetzean:\n"
-"%s\n"
+"Errorea %s(e)ra sartzean:\n"
+"%s.\n"
 
 msgid "Directory is not writable."
-msgstr ""
+msgstr "Direktorioa ez da idazgarria."
 
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ezin da 0 byteko fitxategirik bidali."
@@ -2002,7 +1937,7 @@ msgstr "%s erabiltzaileak fitxategi bat bidali nahi dizu"
 
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr "%s(r)en fitxategi-transferentzia onartu nahi duzu?"
+msgstr "%s(r)en fitxategi-transferentzia onartu?"
 
 #, c-format
 msgid ""
@@ -2016,7 +1951,7 @@ msgstr ""
 
 #, c-format
 msgid "%s is offering to send file %s"
-msgstr "%s  fitxategia bidaltzeko %s(r)i eskaria egiten"
+msgstr "%s(e)k fitxategia eskaintzen dizu: %s"
 
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -2024,167 +1959,187 @@ msgstr "%s ez da baliozko fitxategi-izena.\n"
 
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "%s bidaltzeko %s(r)i eskaria egiten"
+msgstr "%s bidaltzeko eskaintza egiten %s(r)i"
 
 #, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Transferentzia hasten hemendik %s hona %s"
+msgstr "%s transferitzen hasten %s-tik"
 
 #, c-format
-msgid "Transfer of file %s complete"
-msgstr "%s fitxategiaren transferentzia osatu da"
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "<A HREF=\"file://%s\">%s</A> fitxategiaren transferetzia burututa"
 
 #, c-format
+msgid "Transfer of file %s complete"
+msgstr "%s fitxategiaren transferentzia burututa"
+
 msgid "File transfer complete"
-msgstr "Fitxategi-transferentzien osatuta"
+msgstr "Fitxategi-transferentzia burututa"
 
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "%s(r)en transferentzia bertan behera utzi duzu"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Fitxategi-transferentzia bertan behera utzi da"
 
 #, c-format
 msgid "%s canceled the transfer of %s"
-msgstr "%s(e)k %s(r)en transferentzia bertan behera utzi du"
+msgstr "%s(e)k bertan behera utzi du transferentzia: %s"
 
 #, c-format
 msgid "%s canceled the file transfer"
-msgstr "%s(e)k fitxategi-transferentzi bertan behera utzi du."
+msgstr "%s(e)k bertan behera utzi du fitxategi-transferentzia"
 
 #, c-format
 msgid "File transfer to %s failed."
-msgstr "Fitxategi transferentzia hona %s huts egin du."
+msgstr "Errorea fitxategia hona bidaltzean: %s"
 
 #, c-format
 msgid "File transfer from %s failed."
-msgstr "Fitxategi transferentzia hemendik %s huts egin du."
+msgstr "Errorea fitxategia hemendik jasotzean: %s"
 
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "Terminalean exekutatu agindua"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
+msgstr "\"aim\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
+msgstr "\"gg\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
+msgstr "\"icq\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
+msgstr "\"irc\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
+msgstr "\"msnim\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
+msgstr "\"sip\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
+msgstr "\"xmpp\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
+msgstr "\"ymsgr\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "\"aim\" URLen kudeatzailea"
 
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "\"gg\" URLen kudeatzailea"
 
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "\"icq\" URLen kudeatzailea"
 
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "\"irc\" URLen kudeatzailea"
 
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "\"msnim\" URLen kudeatzailea"
 
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "\"sip\" URLen kudeatzailea"
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "\"xmpp\" URLen kudeatzailea"
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "\"ymsgr\" URLen kudeatzailea"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"aim\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"gg\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"icq\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"irc\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"msnim\" URLak kudeatu "
+"beharko balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"sip\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"xmpp\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"ymsgr\" URLak kudeatu "
+"beharko balitu"
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
+"Egia, URL-mota hau kudeatzeko erabilitako agindua terminalean exekutatu "
+"beharko balitz"
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"aim\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"gg\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"icq\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"irc\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"msnim\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"sip\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"xmpp\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"ymsgr\" URLak kudeatu beharko lituzkeen"
 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
-"<b><font color=\"red\">Egunkariak ez du irakurtzeko funtziorik</font></b>"
+"<b><font color=\"red\">Txostenak ez dauka irakurtzeko funtziorik</font></b>"
 
 msgid "HTML"
 msgstr "HTML"
@@ -2193,10 +2148,10 @@ msgid "Plain text"
 msgstr "Testu arrunta"
 
 msgid "Old flat format"
-msgstr ""
+msgstr "Formatu lau zaharra"
 
 msgid "Logging of this conversation failed."
-msgstr "Solsaldi hau egunkaria gordetzean huts egin du."
+msgstr "Errorea solasaldi hau txostenean sartzean."
 
 msgid "XML"
 msgstr "XML"
@@ -2214,136 +2169,134 @@ msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;ERANTZUN "
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;ERANTZUN "
 "AUTOMATIKOA&gt;:</b></font> %s<br/>\n"
 
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Ezin da aurkitu egunkarirako bidea!</b></font>"
+msgstr "<font color=\"red\"><b>Ezin txostenerako bidea aurkitu!</b></font>"
 
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr "<font color=\"red\"><b>Ezin izan da irakurri fitxategia: %s</b></font>"
+msgstr "<font color=\"red\"><b>Ezin fitxategia irakurri: %s</b></font>"
 
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <ERANTZUN AUTOMATIKOA>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Errorea konferentzia sortzean."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
+msgstr "%s darabilzu, baina plugin honek %s behar du."
 
-#, c-format
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "Plugin honek ez du IDrik zehaztu."
 
-#, c-format
+#, fuzzy, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Plugin magikoa gaizki elkartua %d (%d beharrezkoa) "
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "ABI bertsio gaizki elkartua %d.%d.x (%d.%d.x beharrezkoa)"
+msgstr "ABI bertsio okerra %d.%d.x (%d.%d.x behar)"
 
-#, fuzzy
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr "Plugin-ak ez ditu beharrezko funtzioen inplementazioak"
+msgstr ""
+"Plugin-ak ez ditu beharrezko funtzioak inplementatzen (list_icon, login eta "
+"close)"
 
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"Behar den %s plugin-a ez da aurkitu. Instalatu plugin hori, eta saiatu "
-"berriro."
+"Ezin beharrezko %s plugina aurkitu. Plugin hori instalatu eta berriro saiatu "
+"zaitez."
 
-#, fuzzy
 msgid "Unable to load the plugin"
-msgstr "Pidgin-ek ezin du plugin-a kargatu."
+msgstr "Ezin plugina kargatu"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "Behar den %s plugin-a ezin da kargatu."
+msgstr "Ezin beharrezko %s plugina kargatu."
 
-#, fuzzy
 msgid "Unable to load your plugin."
-msgstr "Pidgin-ek ezin du plugin-a kargatu."
+msgstr "Ezin zure plugina kargatu."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "Menpekotasuna duen plugin-a %s kargatzean huts egin du."
+msgstr "%s(e)k %s behar du, baina ezin izan da deskargatu."
 
-#, fuzzy
 msgid "Autoaccept"
-msgstr "_Onartu"
+msgstr "Auto-onartu"
 
-#, fuzzy
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "%s(r)en fitxategi-transferentzia onartu nahi duzu?"
+msgstr "Hautatutako erabiltzaileen fitxategi-transferentziak auto-onartu."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "%s(r)en fitxategi-transferentzia onartu nahi duzu?"
+msgstr "\"%s\"(e)ri \"%s\"(e)tik auto-onartutako transferentzia burutu da."
 
 msgid "Autoaccept complete"
-msgstr ""
+msgstr "Auto-onartzea burututa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "%s(r)en fitxategi-transferentzia onartu nahi duzu?"
+msgstr "%s(e)tik fitxategi-transferentzia jasotzean"
 
 msgid "Set Autoaccept Setting"
-msgstr ""
+msgstr "Auto-onartze Ezarpena Ezarri"
 
-#, fuzzy
 msgid "_Save"
-msgstr "Gorde"
+msgstr "_Gorde"
 
 msgid "_Cancel"
 msgstr "_Utzi"
 
 msgid "Ask"
-msgstr ""
+msgstr "Galdetu"
 
-#, fuzzy
 msgid "Auto Accept"
-msgstr "_Onartu"
+msgstr "Auto-Onartu"
 
-#, fuzzy
 msgid "Auto Reject"
-msgstr "Gonbita ezetsi da"
+msgstr "Auto-Ezetsi"
 
-#, fuzzy
 msgid "Autoaccept File Transfers..."
-msgstr "Fitxategi-transferentziak"
+msgstr "Fitxategi-Transferentziak Auto-Onartu..."
 
 #. XXX: Is there a better way than this? There really should be.
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
+"Fitxategiak non gordeko diren\n"
+"(Bide oso bat eman ezazu)"
 
-#, fuzzy
 msgid "Automatically reject from users not in buddy list"
-msgstr "Llagunen zerrendako erabiltzaileak  ahalbidetu bakarrik"
+msgstr "Automatikoki ezetsi lagun-zerrendan ez dauden erabiltzaileak"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
+"Leihotxo batekin jakinarazi fitxategi-transferentzia auto-onartu bat "
+"burutzean\n"
+"(igorlearekin solasaldirik ez badago bakarrik)"
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "Aukeratu erabiltzaile direktorioa bilaketarako"
+msgstr "Direktorio berria sortu erabiltzaile bakoitzarentzat"
 
 msgid "Notes"
-msgstr "Oharra "
+msgstr "Oharrak"
 
 msgid "Enter your notes below..."
-msgstr ""
+msgstr "Azpian sartu itzazu zure oharrak..."
 
 msgid "Edit Notes..."
-msgstr ""
+msgstr "Oharrak Editatu..."
 
 #. *< major version
 #. *< minor version
@@ -2353,18 +2306,17 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Buddy Notes"
-msgstr "Lagun-alerta berria"
+msgstr "Lagun-Oharrak"
 
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "Lagun zehatzen inguruko oharrak gorde."
 
 #. *< summary
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr ""
+msgstr "Lagunen inguruko oharrak gorde ahal izateko lagun-zerrendan."
 
 #. *< type
 #. *< ui_requirement
@@ -2372,16 +2324,15 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Cipher Test"
-msgstr "Zifra"
+msgstr "Zifratu-Proba"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "libpurple-rekin datozen zifratuak probatzen ditu."
 
 #. *< type
 #. *< ui_requirement
@@ -2389,9 +2340,8 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "DBus Example"
-msgstr "DBus Plugin adibidea"
+msgstr "DBus Adibidea"
 
 #. *< name
 #. *< version
@@ -2406,18 +2356,15 @@ msgstr "DBus Plugin adibidea"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "File Control"
-msgstr "Pidgin fitxategien kontrola"
+msgstr "Fitxategi-Kontrola"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Allows control by entering commands in a file."
-msgstr ""
-"Aukera ematen dizu Pidgin kontrolatzeko fitxategi batean komandoak sartuz."
+msgstr "Fitxategi batean sartutako aginduen bidezko kontrola ahalbidetzen du."
 
 msgid "Minutes"
 msgstr "Minutu"
@@ -2425,31 +2372,31 @@ msgstr "Minutu"
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
 msgid "I'dle Mak'er"
-msgstr "Inaktibo-bihurtzailea"
+msgstr "In'aktibo Mark'a"
 
 msgid "Set Account Idle Time"
-msgstr "Ezarri kontuaren inaktibotasun-denbora"
+msgstr "Kontuaren Inaktibotasun-Denbora Ezarri"
 
 msgid "_Set"
 msgstr "_Ezarri"
 
 msgid "None of your accounts are idle."
-msgstr "Zure kontuetako kideetatik ez dago bat erez ez-aktibo egoeran."
+msgstr "Zure konturik ez dago inaktibo."
 
 msgid "Unset Account Idle Time"
-msgstr "Kendu kontuaren ez-aktibo-denbora"
+msgstr "Kontuaren Inaktibotasun-Denbora Kendu"
 
 msgid "_Unset"
-msgstr "_Ezarpena kendu"
+msgstr "_Kendu"
 
 msgid "Set Idle Time for All Accounts"
-msgstr "Ezarri ez-aktibo denbora kontu guztientzat"
+msgstr "Kontu Guztientzako Inaktibotasun-Denbora Ezarri"
 
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Kendu ez-aktibo denbora kontu guztientzat"
+msgstr "Kontu Guztientzako Inaktibotasun-Denbora Kendu"
 
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Ez-aktibo-denbora kopurua eskuz konfiguratzeko aukera ematen du"
+msgstr "Inaktibo egon zaren denbora eskuz ezartzeko aukera ematen dizu"
 
 #. *< type
 #. *< ui_requirement
@@ -2464,15 +2411,15 @@ msgstr "Bezeroaren IPC proba"
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "Bezero gisa IPC euskarria probatzeko plugin-a."
+msgstr "Bezero gisa IPC euskarria probatzeko plugina."
 
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Bezero gisa IPC euskarria probatzeko plugin-a. Zerbitzariaren plugin-a "
-"aurkitzen du, eta erregistratutako komandoei deitzen die."
+"Bezero gisa IPC euskarria probatzeko plugina. Zerbitzariaren plugina "
+"aurkitzen du eta erregistratutako aginduei deitzen die."
 
 #. *< type
 #. *< ui_requirement
@@ -2487,26 +2434,25 @@ msgstr "Zerbitzariaren IPC proba"
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "Zerbitzari gisa IPC euskarria probatzeko plugin-a."
+msgstr "Zerbitzari gisa IPC euskarria probatzeko plugina."
 
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"Zerbitzari gisa IPC euskarria probatzeko plugin-a. IPC komandoak "
+"Zerbitzari gisa IPC euskarria probatzeko plugina. IPC aginduak "
 "erregistratzen ditu."
 
-#, fuzzy
 msgid "Join/Part Hiding Configuration"
-msgstr "Evolution integratzeko konfigurazioa"
+msgstr "Batu/Irten Ezkutatzearen Konfigurazioa"
 
 msgid "Minimum Room Size"
-msgstr ""
+msgstr "Gela-Tamaina Minimoa"
 
 msgid "User Inactivity Timeout (in minutes)"
-msgstr ""
+msgstr "Erabiltzaile Inaktibitate Denbora-muga (minututan)"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "Lagunei aplikatu ezkutatze arauak"
 
 #. *< type
 #. *< ui_requirement
@@ -2515,119 +2461,111 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Join/Part Hiding"
-msgstr ""
+msgstr "Batu/Irten Ezkutatzea"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr ""
+msgstr "Alferrikako batu/irten mezuak ezkutatzen ditu."
 
 #. *  description
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
+"Plugin honek batu/irten mezuak ezkutatzen ditu gela handietan, solasaldian "
+"aktiboki diharduten erabiltzaileenak izan ezik."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
 msgid "(UTC)"
-msgstr ""
+msgstr "(UTC)"
 
-#, fuzzy
 msgid "User is offline."
-msgstr "Erabiltzailea lineaz kanpo dago"
+msgstr "Erabiltzailea offline dago."
 
-#, fuzzy
 msgid "Auto-response sent:"
-msgstr "Erantzunak galdu dira"
+msgstr "Auto-erantzun bidalia:"
 
 #, c-format
 msgid "%s has signed off."
-msgstr "%s deskonektatu da ."
+msgstr "%s deskonektatu da."
 
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "Agian ezin izan da mezu bat edo gehiago entregatu."
 
 msgid "You were disconnected from the server."
-msgstr "Zerbitzaritik deskonektatuta zaude."
+msgstr "Zerbitzaritik deskonektatu zara."
 
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr ""
+msgstr "Deskonektatuta zaude. Konektatu arte ez duzu mezurik jasoko."
 
-#, fuzzy
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr ""
-"Litekeena da mezua bidali ez izatea erabiltzailea lineaz kanpo dagoelako:"
+msgstr "Ezin mezua bidali, luzera maximoa gainditu delako."
 
-#, fuzzy
 msgid "Message could not be sent."
-msgstr "Yahoo! mezua ez da bidali."
+msgstr "Ezin mezua bidali."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Adium"
-msgstr ""
+msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#, fuzzy
 msgid "Fire"
-msgstr "Firefox"
+msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#, fuzzy
 msgid "Messenger Plus!"
-msgstr "Honen mezua: %s"
+msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "QIP"
-msgstr ""
+msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#, fuzzy
 msgid "MSN Messenger"
-msgstr "Interneteko mezularitza"
+msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Trillian"
-msgstr ""
+msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "aMSN"
-msgstr ""
+msgstr "aMSN"
 
 #. Add general preferences.
-#, fuzzy
 msgid "General Log Reading Configuration"
-msgstr "Musika-mezuen konfigurazioa"
+msgstr "Txosten-Irakurketa Konfigurazio Orokorra"
 
 msgid "Fast size calculations"
-msgstr ""
+msgstr "Tamaina-kalkulu azkarra"
 
 msgid "Use name heuristics"
-msgstr ""
+msgstr "Izen-heuristikak erabili"
 
 #. Add Log Directory preferences.
-#, fuzzy
 msgid "Log Directory"
-msgstr "Bilatu direktorioa"
+msgstr "Txosten-Direktorioa"
 
 #. *< type
 #. *< ui_requirement
@@ -2635,37 +2573,41 @@ msgstr "Bilatu direktorioa"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Log Reader"
-msgstr "Log ikuskatzailea"
+msgstr "Txosten-Irakurlea"
 
 #. *< name
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
+msgstr "Beste IM-bezeroen txostenak gehitzen ditu txosten-irakurlera."
 
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
+"Txostenak ikustean, plugin honek beste IM-bezeroetako txostenak gehituko "
+"ditu. Oraintxe, Adium, MSN Messenger, aMSN, eta Trillian hartzen ditu "
+"kontutan.\n"
+"\n"
+"OHARRA: Plugin honen kodea alfa egoeran dago oraindik eta maiz kraskatu "
+"daiteke. Erabakia zeure kontu!"
 
 msgid "Mono Plugin Loader"
-msgstr "Mono Plugin kargatzailea"
+msgstr "Mono Plugin-Kargatzailea"
 
 msgid "Loads .NET plugins with Mono."
-msgstr "Kargatuta. NET plugin-ak Mono-rekin."
+msgstr "Mono darabil .NET pluginak kargatzeko."
 
 msgid "Add new line in IMs"
-msgstr ""
+msgstr "Lerro berria gehitu IMetan"
 
-#, fuzzy
 msgid "Add new line in Chats"
-msgstr "Ezizena berriketarako"
+msgstr "Lerro berria gehitu Solasaldietan"
 
 #. *< magic
 #. *< major version
@@ -2676,45 +2618,48 @@ msgstr "Ezizena berriketarako"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "New Line"
-msgstr "Leiho berria"
+msgstr "Lerro Berria"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Prepends a newline to displayed message."
-msgstr "Ezin da mezua bidali."
+msgstr "Lerro berria gehitzen dio bistaratutako mezuari."
 
 #. *< summary
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
+"Lerro berria gehitzen die mezuei, erabiltzaile-izenaren azpian ikusteko "
+"solasaldietako mezuak."
 
 msgid "Offline Message Emulation"
-msgstr ""
+msgstr "Offline-Mezu Emulazioa"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
+msgstr "Alerta modura gorde offline erabiltzaileei bidalitako mezuak."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
+"Alerta modura gordeko dira gainontzeko mezuak. 'Lagun-Alerta' elkarrizketan "
+"editatu/kendu ditzakezu."
 
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
+"\"%s\" offline dago. Alerta modura gorde nahi dituzu gainontzeko mezuak, "
+"automatikoki bidaltzeko \"%s\" konektatu bezain laster?"
 
-#, fuzzy
 msgid "Offline Message"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Offline-Mezua"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
+msgstr "'Lagun-Alerta' elkarrizketan editatu/kendu dezakezu alerta"
 
 msgid "Yes"
 msgstr "Bai"
@@ -2723,10 +2668,38 @@ msgid "No"
 msgstr "Ez"
 
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "Alerta modura gorde offline-mezuak"
 
 msgid "Do not ask. Always save in pounce."
+msgstr "Ez galdetu. Beti gorde alerta modura."
+
+msgid "One Time Password"
+msgstr "Erabilera Bakarreko Pasahitza"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Erabilera Bakarreko Pasahitzentzako Euskarria"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Pasahitzak behin bakarrik erabiltzera behartu."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
 msgstr ""
+"Honi esker, konexio bakoitzean pasahitza idatzi behar izatera behar dezakezu "
+"kontu bakoitzaren arabera.\n"
+"Oharra: Honek funtziona dezan, ezin da kontuaren pasahitza gorde."
 
 #. *< type
 #. *< ui_requirement
@@ -2735,44 +2708,42 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "Perl plugin-aren kargatzailea"
+msgstr "Perl Plugin-Kargatzailea"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "Perl plugin-ak kargatzeko erabiltzen da."
+msgstr "Perl pluginak kargatzeko erabiltzen da."
 
 msgid "Psychic Mode"
-msgstr "Modu psikikoa "
+msgstr "Modu Psikikoa"
 
 msgid "Psychic mode for incoming conversation"
-msgstr "Modu psikikoa datorren elkarrizketerako "
+msgstr "Datozen solasaldietarako modu psikikoa"
 
-#, fuzzy
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
-"Solasaldi lehioa azaltzen da beste erabiltzaile batek  mezua zeuri bidaltzen "
-"hasten denean. Honek funtzionatzen du AIM,ICQ,Jabber,Sametime eta Yahoo!"
+"Solasaldi-leihoa agertarazten du beste erabiltzaileek zure idaztean.  AIM, "
+"ICQ, XMPP, Sametime eta Yahoo!-rekin funtzionatzen du."
 
 # , fuzzy
 msgid "You feel a disturbance in the force..."
-msgstr "Ikanbila sentitu duzu indarrean"
+msgstr "Perturbazio bat sentitzen duzu indarrean..."
 
 msgid "Only enable for users on the buddy list"
-msgstr "Llagunen zerrendako erabiltzaileak  ahalbidetu bakarrik"
+msgstr "Lagun-zerrendako erabiltzaileentzako bakarrik gaitu"
 
 msgid "Disable when away"
-msgstr "·zgaitu kanpora joatean"
+msgstr "Ezgaitu kanpora joatean"
 
 msgid "Display notification message in conversations"
 msgstr "Azaldu notifikazio mezua solasaldian"
 
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "Eskutatutako solasaldietan"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -2781,14 +2752,14 @@ msgstr "Eskutatutako solasaldietan"
 #. *< priority
 #. *< id
 msgid "Signals Test"
-msgstr "Seinaleen proba"
+msgstr "Seinale-Proba"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all signals are working properly."
-msgstr "Seinale guztiak ondo dauden ikusteko proba."
+msgstr "Seinale guztiak ondo dabiltzan frogatzeko proba."
 
 #. *< type
 #. *< ui_requirement
@@ -2797,18 +2768,18 @@ msgstr "Seinale guztiak ondo dauden ikusteko proba."
 #. *< priority
 #. *< id
 msgid "Simple Plugin"
-msgstr "Plugin soila"
+msgstr "Plugin Sinplea"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests to see that most things are working."
-msgstr "Gauza gehienak ondo dabiltzan begiratzen du."
+msgstr "Gauza gehienak ondo dabiltzan frogatzeko proba."
 
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 Zertifikatuak"
 
 #. *< type
 #. *< ui_requirement
@@ -2824,7 +2795,7 @@ msgstr "GNUTLS"
 #. *  summary
 #. *  description
 msgid "Provides SSL support through GNUTLS."
-msgstr "SSL euskarria ematen du GNUTLSekin."
+msgstr "GNUTLS darabil SSL euskarria eskaintzeko."
 
 #. *< type
 #. *< ui_requirement
@@ -2840,7 +2811,7 @@ msgstr "NSS"
 #. *  summary
 #. *  description
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "SSL euskarria ematen du Mozilla NSSrekin."
+msgstr "Mozilla NSS darabil SSL euskarria eskaintzeko."
 
 #. *< type
 #. *< ui_requirement
@@ -2856,15 +2827,15 @@ msgstr "SSL"
 #. *  summary
 #. *  description
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Bilduki bat ematen du SSL euskarriko liburutegiak biltzeko."
+msgstr "SSL euskarri-liburutegien bidezko biltzailea eskaintzen du."
 
 #, c-format
 msgid "%s is no longer away."
-msgstr "%s itzuli egin da."
+msgstr "%s itzuli da."
 
 #, c-format
 msgid "%s has gone away."
-msgstr "%s joan egin da."
+msgstr "%s joan da."
 
 #, c-format
 msgid "%s has become idle."
@@ -2872,23 +2843,23 @@ msgstr "%s inaktibo geratu da."
 
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s aktibo jarri da berriro."
+msgstr "%s aktibo da berriro."
 
 #, c-format
 msgid "%s has signed on."
-msgstr "%s konektatu da bertan."
+msgstr "%s konektatu da."
 
 msgid "Notify When"
-msgstr "Noiz jakinarazi"
+msgstr "Jakinarazi"
 
 msgid "Buddy Goes _Away"
-msgstr "Laguna _kanpoan dagoenean"
+msgstr "Laguna _Kanpora Joatean"
 
 msgid "Buddy Goes _Idle"
-msgstr "Laguna _inaktibo dagoenean"
+msgstr "Laguna _Inaktibo Geratzean"
 
 msgid "Buddy _Signs On/Off"
-msgstr "Laguna _konektatu/deskonektatu"
+msgstr "Laguna Konektatzean/_Deskonektatzean"
 
 #. *< type
 #. *< ui_requirement
@@ -2897,7 +2868,7 @@ msgstr "Laguna _konektatu/deskonektatu"
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "Lagunen egoeraren jakinarazpena"
+msgstr "Lagunen Egoeraren Jakinarazpena"
 
 #. *< name
 #. *< version
@@ -2906,36 +2877,35 @@ msgstr "Lagunen egoeraren jakinarazpena"
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr ""
-"Lagunak alde egin duen edo itzuli den, edo inaktibo edo aktibo dagoen "
-"jakinarazten du solasaldi-leihoan."
+msgstr "Laguna joan dela edo itzuli dela jakinarazten du, solasaldi-leihoan."
 
 msgid "Tcl Plugin Loader"
-msgstr "Tcl plugin-aren kargatzailea"
+msgstr "Tcl Plugin-Kargatzailea"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "Tcl plugin-ak kargatzeko aukera ematen du"
+msgstr "Tcl pluginak kargatzeko erabiltzen da."
 
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
+"Ezin ActiveTCL instalazioa aurkitu. TCL pluginak erabili nahi badituzu, "
+"ActiveTCL instalatu ezazu hemendik: http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
+"Ezin Apple-ren \"Bonjour for Windows\" tresnak aurkitu, http://d.pidgin.im/"
+"BonjourWindows ikus ezazu informazio gehiago eskuratzeko."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Datozen BM konexio berriak entzutea ezinezkoa gertatu da\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Ezin sarrerako IM konexioak entzun"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
-"Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al "
-"dago ?"
+msgstr "Ezin konexioa ezarri mDNS-zerbitzari lokalarekin. Martxan al dago ?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Izena"
 
@@ -2943,15 +2913,13 @@ msgid "Last name"
 msgstr "Deitura"
 
 msgid "Email"
-msgstr "Helb. el."
+msgstr "E-posta"
 
-#, fuzzy
 msgid "AIM Account"
-msgstr "Gehitu kontua"
+msgstr "AIM Kontua"
 
-#, fuzzy
 msgid "XMPP Account"
-msgstr "Kontua"
+msgstr "XMPP Kontua"
 
 #. *< type
 #. *< ui_requirement
@@ -2964,128 +2932,128 @@ msgstr "Kontua"
 #. *  summary
 #. *  description
 msgid "Bonjour Protocol Plugin"
-msgstr "Bonjour protokoloaren plugin-a"
+msgstr "Bonjour Protokolo-Plugina"
 
-#, fuzzy
 msgid "Purple Person"
-msgstr "Pertsona berria"
+msgstr "Purple Pertsona"
+
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "Ataka Lokala"
 
 msgid "Bonjour"
 msgstr "Bonjour"
 
 #, c-format
 msgid "%s has closed the conversation."
-msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
+msgstr "%s(e)k solasaldia itxi du. "
 
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Ezin da mezua bidali, solasaldia ezin izango da hasi."
+msgstr "Ezin mezua bidali; ezin izan da solasaldia hasi."
 
-msgid "Cannot open socket"
-msgstr "Ezin da socket-a ireki "
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Ezin socket-a sortu: %s"
 
-#, fuzzy
-msgid "Could not bind socket to port"
-msgstr "Ezin izan da socket -a ataka lotu"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Ezin socket-a atakara lotu: %s"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Ezin da socket-tik entzun"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Ezin socket-ean entzun: %s"
 
-#, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "Errorea zerbitzariarekin komunikatzean"
+msgstr "Errorea mDNSResponder lokalarekin komunikatzean."
 
 msgid "Invalid proxy settings"
-msgstr "Proxy-ezarpenak ez dira baliozkoak"
+msgstr "Proxy-ezarpen baliogabeak"
 
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"Zehaztutako proxy-motarentzat emandako ostalari-izena edo ataka-zenbakia ez "
-"dira baliozkoak."
+"Zehaztutako proxy-motarentzat, baliogabeak dira emandako ostalari-izena edo "
+"ataka-zenbakia."
 
 msgid "Token Error"
-msgstr "Testigu errorea"
+msgstr "Testigu-Errorea"
 
-#, fuzzy
 msgid "Unable to fetch the token.\n"
-msgstr "Ezinezkoa lekukoa ekartzea. \n"
+msgstr "Ezin testigua eskuratu.\n"
 
 msgid "Save Buddylist..."
-msgstr "Gorde lagunen zerrenda"
+msgstr "Lagun-Zerrenda Gorde..."
 
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "Zure lagunen-zerrenda hutsik dago, ez da ezer erez idatzi fitxategian."
+msgstr "Hutsik dago zure lagun-zerrenda, ez da ezer idatzi fitxategian."
 
 msgid "Buddylist saved successfully!"
-msgstr "Lagunen-zerrenda arraskataz gordea !"
+msgstr "Arrakastaz gorde da lagun-zerrenda!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "Ezin izan da kargatu lagunen zerrenda"
+msgstr "Ezin %s(r)entzako lagun-zerrenda idatzi %s(e)n"
 
 msgid "Couldn't load buddylist"
-msgstr "Ezin izan da kargatu lagunen zerrenda"
+msgstr "Ezin lagun-zerrenda kargatu"
 
 msgid "Load Buddylist..."
-msgstr "Kargatu lagunen-zerrenda..."
+msgstr "Lagun-Zerrenda Kargatu..."
 
 msgid "Buddylist loaded successfully!"
-msgstr "Lagunen-zerrenda arrakastaz kargatua izan da !"
+msgstr "Arrakastaz kargatu da lagun-zerrenda!"
 
 msgid "Save buddylist..."
-msgstr "Gorde lagunen-zerrenda..."
+msgstr "Lagun-zerrenda gorde..."
 
 msgid "Load buddylist from file..."
-msgstr "Kargatu lagunen-zerrenda fitxategi batetik..."
+msgstr "Fitxategitik kargatu lagun-zerrenda..."
 
-msgid "Fill in the registration fields."
-msgstr "Bete harpidetzarako eremuak"
+msgid "You must fill in all registration fields"
+msgstr "Erregistro-eremu guztiak bete behar dituzu"
 
-msgid "Passwords do not match."
-msgstr "Pasahitz-ak ez datoz bat."
+msgid "Passwords do not match"
+msgstr "Pasahitzak ez datoz bat"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Ezin izan da kontu berria erregistratu. Errorea gertatu da.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Ezin kontu berria erregistratu. Errore ezezaguna gertatu da."
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr "Gadu-Gadu Kontu berria  erregistratua"
+msgstr "Gadu-Gadu Kontu Berria Erregistratua"
 
 msgid "Registration completed successfully!"
-msgstr "Erregistroa arrakastan betea izan da !"
+msgstr "Arrakastaz burutu da erregistroa!"
 
 msgid "Password"
 msgstr "Pasahitza"
 
-msgid "Password (retype)"
-msgstr "Pasahitza (beridatzi)"
+msgid "Password (again)"
+msgstr "Pasahitza (berriro)"
 
-# , fuzzy
-msgid "Enter current token"
-msgstr "Sartu momentuko lekukoa"
+msgid "Enter captcha text"
+msgstr "Captcha testua sartu"
 
-# , fuzzy
-msgid "Current token"
-msgstr "Momentuko lekukoa"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "Erregistratu Gadu-Gadu kontu berria"
+msgstr "Gadu-Gadu Kontu Berria Erregistratu"
 
 msgid "Please, fill in the following fields"
-msgstr "Mesedez, bete itzazu ondorengo eremuak"
+msgstr "Ondorengo eremuak bete itzazu"
 
 msgid "City"
 msgstr "Herria"
 
 msgid "Year of birth"
-msgstr "Jaiotze urtea"
+msgstr "Jaiotze-urtea"
 
 msgid "Gender"
 msgstr "Sexua"
 
 msgid "Male or female"
-msgstr "Gizonezko edo Emakumezkoa"
+msgstr "Gizonezko edo emakumezkoa"
 
 msgid "Male"
 msgstr "Gizonezkoa"
@@ -3094,53 +3062,63 @@ msgid "Female"
 msgstr "Emakumezkoa"
 
 msgid "Only online"
-msgstr "Linean bakarrik"
+msgstr "Online bakarrik"
 
 msgid "Find buddies"
-msgstr "Bilatu lagunak"
+msgstr "Lagunak bilatu"
 
 msgid "Please, enter your search criteria below"
-msgstr "Mesedez, sartu ezazu zure bilaketaren irizpideak behekaldean"
+msgstr "Azpian sar itzazu zure bilaketaren irizpideak"
 
 msgid "Fill in the fields."
-msgstr "Bete eremuak"
+msgstr "Eremuak bete itzazu."
 
 msgid "Your current password is different from the one that you specified."
-msgstr "Zure egungo pasahitza ezberdina da zuk adierazi dezunaren aldean. "
+msgstr "Zure pasahitza ez da zehaztu duzuna."
 
-#, fuzzy
 msgid "Unable to change password. Error occurred.\n"
-msgstr "Ezin da aldatu pasahitza. Akats gertatu da.\n"
+msgstr "Ezin pasahitza aldatu. Errorea gertatu da.\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Pasahitza aldatu Gadu-Gadu kontuarentzat"
+msgstr "Gadu-Gadu kontuaren pasahitza aldatu"
 
 msgid "Password was changed successfully!"
-msgstr "Pasahitza arrakastaz aldatua izan da !"
+msgstr "Arrakastaz aldatu da pasahitza!"
 
 msgid "Current password"
-msgstr "Egungo pasahitza"
+msgstr "Oraingo pasahitza"
+
+msgid "Password (retype)"
+msgstr "Pasahitza (berriro)"
+
+# , fuzzy
+msgid "Enter current token"
+msgstr "Oraingo lekukoa sartu"
+
+# , fuzzy
+msgid "Current token"
+msgstr "Oraingo lekukoa"
 
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Idatzi egungo pasahitza eta pasahitz berria UIN -rentzako."
+msgstr "Zure UIN-arentzako oraingo pasahitza eta pasahitz berria sar itzazu:"
 
 msgid "Change Gadu-Gadu Password"
-msgstr "Aldatu Gadu-Gadu -ren pasahitza"
+msgstr "Gadu-Gadu Pasahitza Aldatu"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Aukeratu berriketak lagun batentzat:%s "
+msgstr "Lagunarentzako berriketa bat hautatu: %s "
 
 msgid "Add to chat..."
-msgstr "Gehitu berriketara ..."
+msgstr "Berriketara gehitu..."
 
+#. Global
 msgid "Available"
-msgstr "Erabilgarri"
+msgstr "Eskuragarri"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Kanpoan"
 
@@ -3148,59 +3126,73 @@ msgid "UIN"
 msgstr "UINa"
 
 msgid "First Name"
-msgstr "Izena"
+msgstr "Lehen Abizena"
 
 msgid "Birth Year"
 msgstr "Jaiotza-urtea"
 
 msgid "Unable to display the search results."
-msgstr "Ezin izan da aurkitutakoaren emaitza azaldu."
+msgstr "Ezin bilaketaren emaitzak erakutsi."
 
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu Direktorio Publikoa"
 
 msgid "Search results"
-msgstr "Bilaketaren emaitza "
+msgstr "Bilaketaren emaitzak"
 
 msgid "No matching users found"
-msgstr "Ez dira erabiltzailerik aurkitu"
+msgstr "Ez da erabiltzailerik aurkitu"
 
 msgid "There are no users matching your search criteria."
-msgstr ""
-"Bilaketa egitean zure irizpideak erabiliz ez dira erabiltzailerik topatu."
+msgstr "Ez dago zure irizpideak betetzen dituen erabiltzailerik."
 
-msgid "Unable to read socket"
-msgstr "Ezin da socket-a irakurri"
+msgid "Unable to read from socket"
+msgstr "Ezin socket-etik irakurri"
 
 msgid "Buddy list downloaded"
-msgstr "Laguna-zerrenda deskargatuta"
+msgstr "Lagun-zerrenda deskargatuta"
 
 msgid "Your buddy list was downloaded from the server."
-msgstr "Zure lagunen-zerrenda deskargatuta izan da zerbitzaritik."
+msgstr "Zerbitzaritik deskargatu da zure lagun-zerrenda."
 
 msgid "Buddy list uploaded"
-msgstr "Lagunen-zerrenda igota"
+msgstr "Lagun-zerrenda igota"
 
 msgid "Your buddy list was stored on the server."
-msgstr "Zure lagunen-zerrenda zerbitzaria gordea izan da."
+msgstr "Zerbitzarian gorde da zure lagun-zerrenda."
 
-msgid "Connection failed."
-msgstr "Konexioak huts egin du "
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Konektatuta"
+
+msgid "Connection failed"
+msgstr "Errorea Konexioan"
 
 msgid "Add to chat"
-msgstr "Gehitu berriketa-ra"
+msgstr "Berriketara gehitu"
 
 msgid "Chat _name:"
-msgstr "Berreketan _Deitura:"
+msgstr "Berriketaren _izena:"
+
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Ezin '%s' ostalari-izena ebaztu: %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Konektatzen"
 
 msgid "Chat error"
 msgstr "Berriketa-errorea"
 
 msgid "This chat name is already in use"
-msgstr "Berriketa honen izena dagoeneko erabiltzen ari da"
+msgstr "Jada erabilpean dago berriketa-izen hori"
 
-msgid "Not connected to the server."
-msgstr "Zerbitzaritik deskonektatuta zaude."
+msgid "Not connected to the server"
+msgstr "Zerbitzaritik deskonektatuta zaude"
 
 msgid "Find buddies..."
 msgstr "Lagunak bilatu..."
@@ -3209,16 +3201,16 @@ msgid "Change password..."
 msgstr "Pasahitza aldatu..."
 
 msgid "Upload buddylist to Server"
-msgstr "Igo lagunen-zerrenda zerbitzarira"
+msgstr "Lagun-Zerrenda Zerbitzarira igo"
 
 msgid "Download buddylist from Server"
-msgstr "Deskargatu lagunen-zerrenda zerbitzaritik"
+msgstr "Lagun-Zerrenda Zerbitzaritik deskargatu"
 
 msgid "Delete buddylist from Server"
-msgstr "Ezabatu lagunen-zerrenda zerbitzaritik "
+msgstr "Lagun-Zerrenda Zerbitzaritik ezabatu"
 
 msgid "Save buddylist to file..."
-msgstr "Gorde lagunen-zerrenda fitxategi baten..."
+msgstr "Lagun-Zerrenda fitxategian gorde..."
 
 #. magic
 #. major_version
@@ -3232,51 +3224,61 @@ msgstr "Gorde lagunen-zerrenda fitxategi baten..."
 #. name
 #. version
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu protokoloaren plugin-a"
+msgstr "Gadu-Gadu Protokolo-Plugina"
 
 #. summary
 msgid "Polish popular IM"
 msgstr "Poloniar IM ospetsua"
 
 msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu erabiltzailea"
+msgstr "Gadu-Gadu Erabiltzailea"
+
+msgid "GG server"
+msgstr "GG-zerbitzaria"
 
 #, c-format
 msgid "Unknown command: %s"
-msgstr "Komando ezezaguna: %s"
+msgstr "Agindu ezezaguna: %s"
 
 #, c-format
 msgid "current topic is: %s"
-msgstr "uneko gaia: %s"
+msgstr "oraingo gaia: %s"
 
 msgid "No topic is set"
 msgstr "Ez da gairik ezarri"
 
 msgid "File Transfer Failed"
-msgstr "Fitxategi-transferentzia huts egin du"
+msgstr "Errorea Fitxategi-Transferentzian"
 
-#, fuzzy
-msgid "Could not open a listening port."
-msgstr "Pidgin-ek ezin izan du ireki entzuteko ataka bat."
+msgid "Unable to open a listening port."
+msgstr "Ezin entzuteko ataka ireki."
 
 msgid "Error displaying MOTD"
-msgstr "Errorea MOTD bistaratzean"
+msgstr "Errorea MOTD erakustean"
 
 msgid "No MOTD available"
-msgstr "Ez dago MOTD erabilgarririk"
+msgstr "MOTD erabilgarririk ez"
 
 msgid "There is no MOTD associated with this connection."
-msgstr "Ez dago konexio honekin asoziatutako MOTDrik."
+msgstr "Ez dago konexio honekin asoziaturiko MOTDrik."
 
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s - MOTD"
 
-msgid "Server has disconnected"
-msgstr "Zerbitzaria deskonektatu da"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Zerbitzaritik deskonektatuta: %s"
 
 msgid "View MOTD"
-msgstr "Ikusi MOTD"
+msgstr "MOTD Ikusi"
 
 msgid "_Channel:"
 msgstr "_Kanala:"
@@ -3284,25 +3286,23 @@ msgstr "_Kanala:"
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC goitizenek ezin dute zuriunerik eduki"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Konektatzen"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC-ezizenek eta zerbitzariek ezin dute zuriunerik eduki"
 
 msgid "SSL support unavailable"
-msgstr "SSL euskarria ez dago erabilgarri"
+msgstr "SSL euskarririk ez erabilgarri"
 
-msgid "Couldn't create socket"
-msgstr "Ezin izan da socket-a sortu"
+msgid "Unable to connect"
+msgstr "Ezin konektatu"
 
-msgid "Couldn't connect to host"
-msgstr "Ezin izan da ostalariarekin konektatu"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Ezin konektatu: %s"
 
-msgid "Read error"
-msgstr "Irakurketa-errorea"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Zerbitzariak amaituarazi du konexioa"
 
 msgid "Users"
 msgstr "Erabiltzaileak"
@@ -3319,11 +3319,11 @@ msgstr "Gaia"
 #. *< name
 #. *< version
 msgid "IRC Protocol Plugin"
-msgstr "IRC protokoloaren plugin-a"
+msgstr "IRC Protokolo-Plugina"
 
 #. *  summary
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "Problema gutxien ematen duen IRC protokoloa"
+msgstr "Arazo gutxien ematen dituen IRC Protokolo-Plugina"
 
 #. host to connect to
 msgid "Server"
@@ -3337,7 +3337,7 @@ msgid "Encodings"
 msgstr "Kodeketak"
 
 msgid "Auto-detect incoming UTF-8"
-msgstr ""
+msgstr "Sarrerako UTF-8a autodetektatu"
 
 msgid "Real name"
 msgstr "Benetako izena"
@@ -3347,63 +3347,60 @@ msgstr "Benetako izena"
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
 msgid "Use SSL"
-msgstr "Erabili SSL"
+msgstr "SSL Erabili"
 
 msgid "Bad mode"
 msgstr "Modu okerra"
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr ""
+msgstr "%s(e)n %s(e)k betos, duela %s ezarria"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Ban on %s"
-msgstr "%s - ezin da sartu:"
+msgstr "%s(e)n betoa"
 
-#, fuzzy
 msgid "End of ban list"
-msgstr "Ez dago zerrendan"
+msgstr "Beto-zerrendaren bukaera"
 
 #, c-format
 msgid "You are banned from %s."
-msgstr "%s(e)n debekua ezarri dizute."
+msgstr "Betatuta zaude %s(e)n."
 
 msgid "Banned"
-msgstr "Debekatuta"
+msgstr "Betatuta"
 
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "Ezin da %s bota: botatakoen zerrenda beteta dago"
+msgstr "Ezin %s betatu: beteta dago betatu-zerrenda"
 
 msgid " <i>(ircop)</i>"
-msgstr " <i>(identifikatuta)</i>"
+msgstr " <i>(ircop)</i>"
 
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifikatuta)</i>"
 
 msgid "Nick"
-msgstr "Goitizena"
+msgstr "Ezizena"
 
 msgid "Currently on"
-msgstr "Orain konektatuta"
+msgstr "Orain hemen: "
 
-#, fuzzy
 msgid "Idle for"
-msgstr "Ez-aktibo"
+msgstr "Inaktibo duela"
 
 msgid "Online since"
-msgstr "Noiztik linean"
+msgstr "Noiztik online:"
 
-#, fuzzy
 msgid "<b>Defining adjective:</b>"
-msgstr "<br><b>Definitzeko adejktiboa:</b> Zoragarria<br>"
+msgstr "<b>Definitzeko adjektiboa:</b>"
 
 msgid "Glorious"
-msgstr ""
+msgstr "Harrigarria"
 
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s(e)k gaia aldatu du: %s"
+msgstr "%s(e)k gai berria ezarri du: %s"
 
 #, c-format
 msgid "%s has cleared the topic."
@@ -3411,48 +3408,47 @@ msgstr "%s(e)k gaia garbitu du."
 
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "%s(r)en gaia: %s"
+msgstr "%s(e)ko gaia: %s"
 
 #, c-format
 msgid "Unknown message '%s'"
-msgstr "Errore ezezaguna: '%s'"
+msgstr "Mezu ezezaguna: '%s'"
 
 msgid "Unknown message"
 msgstr "Mezu ezezaguna"
 
-#, fuzzy
 msgid "The IRC server received a message it did not understand."
-msgstr "Pidgin-ek IRC zerbitzariak ulertu ez duen mezu bat bidali du."
+msgstr "Ulertu ez duen mezu bat jaso du IRC-zerbitzariak."
 
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Eraibltzaileak %s(e)n: %s"
 
 msgid "Time Response"
-msgstr "Orduaren erantzuna"
+msgstr "Erantzun-Denbora"
 
 msgid "The IRC server's local time is:"
-msgstr "IRC zerbitzariaren ordu lokala: "
+msgstr "IRC zerbitzariaren ordu lokala:"
 
 msgid "No such channel"
-msgstr "Kanal hori ez dago"
+msgstr "Halako kanalik ez"
 
 #. does this happen?
 msgid "no such channel"
-msgstr "kanal hori ez dago"
+msgstr "halako kanalik ez"
 
 msgid "User is not logged in"
 msgstr "Erabiltzailea ez dago konektatuta"
 
 msgid "No such nick or channel"
-msgstr "Goitizen edo kanal hori ez dago"
+msgstr "Halako ezizen edo kanalik ez"
 
 msgid "Could not send"
-msgstr "Ezin izan da bidali"
+msgstr "Ezin bidali"
 
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "%s berriketan sartzeko gonbita behar da."
+msgstr "Gonbidapena behar duzu %s(e)n sartzeko."
 
 msgid "Invitation only"
 msgstr "Gonbidatuak bakarrik"
@@ -3464,246 +3460,255 @@ msgstr "%s erabiltzaileak kanporatu zaitu: (%s)"
 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "Honek kanporatu zaitu: %s (%s)"
+msgstr "%s(e)k kanporatua (%s)"
 
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modua (%s %s) - %s"
 
 msgid "Invalid nickname"
-msgstr "Erabiltzaile-izena ez da baliozkoa"
+msgstr "Ezizen baliogabea"
 
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"Zerbitzariak hautatu duzun goitizena gaitzetsi du. Baliteke karaktere "
+"Zerbitzariak ez du onartu zuk hautatutako ezizena. Baliteke karaktere "
 "baliogabeak edukitzea."
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"Zerbitzariak hautatu dituzun kontu-izenak ezetsi ditu. Baliteke karaktere "
+"Zerbitzariak ez du onartu zuk hautatutako kontu-izena. Baliteke karaktere "
 "baliogabeak edukitzea."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Erabilpean dago jadanik \"%s\" ezizena."
+
+msgid "Nickname in use"
+msgstr "Ezizena erabilpean"
+
 msgid "Cannot change nick"
-msgstr "Ezin da goitizena aldatu"
+msgstr "Ezin ezizena aldatu"
 
 msgid "Could not change nick"
-msgstr "Ezin izan da goitizena aldatu"
+msgstr "Ezin izan da ezizena aldatu"
 
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "%s%s kanaletik irten zara"
 
 msgid "Error: invalid PONG from server"
-msgstr "Errorea: zerbitzariko PONG baliogabea"
+msgstr "Errorea: PONG baliogabea zerbitzaritik"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING erantzuna -- Atzerapena: %lu segundo"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "Erregistratu egin behar da"
+msgstr "Ezin %s(e)ra sartu: Erregistroa beharrezkoa da."
 
 msgid "Cannot join channel"
-msgstr "Ezin da sartu kanalean"
+msgstr "Ezin kanalean sartu"
 
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Ezizena edo kanala ez dago erabilgarri denbora baterako."
+msgstr "Ezizena edo kanala ez dago eskuragarri oraintxe."
 
 #, c-format
 msgid "Wallops from %s"
-msgstr "Egurra %s(e)k"
+msgstr "%s(r)en astinduak"
 
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;landuko den ekintza&gt;:  ekintza bat lantzen du."
+msgstr "action &lt;burutuko den ekintza&gt;:  Wkintza bat burutu."
 
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [mezua]:  ezarri kanpoan zaudeneko mezua, edo ez erabili mezurik "
-"kanpotik etortzen zarenean."
+"away [mezua]:  Kanpoan zaudeneko mezua ezarri, edo mezurik ez ezazu jarri "
+"kanpotik itzultzeko."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <ezizena> <mezua>: ctcp mezua bidali ezizenari."
 
 msgid "chanserv: Send a command to chanserv"
-msgstr "chanserv: Bidali komandoa chanserv-i"
+msgstr "chanserv: Chanserv-ri agindu bat bidali"
 
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &lt;goitizen1&gt; [goitizen2] ...: kendu kanaleko operadore egoera  "
-"norbaiti. Kanaleko operadorea izan behar duzu hau egiteko."
+"deop &lt;ezizena1&gt; [ezizena2] ...: Kanal-operadore egoera kendu norbaiti. "
+"Kanal-operadorea izan behar duzu hau egiteko."
 
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;goitizen1&gt; [goitizen2] ...:  isildu arazi norbait, kanala "
-"moderatuta egonez gero (+m) hitzegiteko aukera sahitezteko. Kanaleko "
+"devoice &lt;ezizena1&gt; [ezizena2] ...:  Kanal-ahotsa kendu norbaiti; "
+"kanala moderatuta egonez gero (+m), hitzegiteko ahalmena kentzeko. Kanaleko "
 "operadorea izan behar duzu hau egiteko."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;goitizena&gt; [gela]:  gonbidatu norbait zehaztutako gelara,  edo "
-"uneko  kanalera, konektatzeko."
+"invite &lt;ezizena&gt; [gela]:  Zehaztutako gelara edo uneko gelara "
+"gonbidatu norbait."
 
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;gela1&gt;[,gela2][,...] [gako1[,gako2][,...]]:  sartu kanal batean edo "
-"gehiagotan,aukeran kanal bakoitzeko gakoa eskainiz (behar izanez gero)."
+"j &lt;gela1&gt;[,gela2][,...] [gakoa1[,gakoa2][,...]]:  Kanal bat edo "
+"gehiagotan sartu, kanal bakoitzeko gakoa zehaztuz (beharrezkoa bada)."
 
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;gela1&gt;[,gela2][,...] [gako1[,gako2][,...]]:  sartu kanal batean "
-"edo gehiagotan,aukeran kanal bakoitzeko gakoa eskainiz (behar izanez gero)."
+"join &lt;gela1&gt;[,gela2][,...] [gakoa1[,gakoa2][,...]]:  Kanal bat edo "
+"gehiagotan sartu, kanal bakoitzeko gakoa zehaztuz (beharrezkoa bada)."
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"kick &lt;goitizena&gt; [mezua]: kendu (bota) norbait kanaletik . Kanaleko "
-"operadorea izan behar duzu hau egiteko."
+"kick &lt;ezizena&gt; [mezua]: Norbait kanaletik kanporatu. Kanal-operadorea "
+"izan behar duzu hau egiteko."
 
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list:  bistaratu sareko berriketa-gelen zerrenda. <i>Abisua, zerbitzari "
-"batzuk deskonektatu zaitzake hau eginez gero.</i>"
+"list:  Sareko berriketa-gelen zerrenda bistaratu. <i>Abisua, zerbitzari "
+"batzuek deskonektatu egingo zaituzte hau eginez gero.</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;ekintza&gt;:  landu ekintza bat."
+msgstr "me &lt;ekintza&gt;:  Ekintza bat burutu."
 
 msgid "memoserv: Send a command to memoserv"
-msgstr "memoserv: Bidali komandoa memoserv-i"
+msgstr "memoserv: Memoserv-ri agindu bat bidali"
 
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;goitizena|kanala&gt;:  jarri edo kendu "
-"kanalaren edo erabiltzaile-moduaren ezarpena"
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;ezizena|kanala&gt;:  Kanal-modu edo "
+"erabiltzaile-modu bat ezarri/kendu."
 
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"msg &lt;goitizena&gt; &lt;mezua&gt;:  bidali mezu pribatua erabiltzaileari "
-"(kanalari bidali beharrean)."
+"msg &lt;ezizena&gt; &lt;mezua&gt;:  Erabiltzaile bati mezu pribatu bat "
+"bidali (kanalera bidali ordez)."
 
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "names [kanala]:  zerrendatu kanalean dauden uneko erabiltzaileak."
+msgstr "names [kanala]:  Kanal bateko erabiltzaileak zerrendatu."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;goitizen berria&gt;:  aldatu zure goitizena"
+msgstr "nick &lt;ezizen berria&gt;:  Zure ezizena aldatu."
 
 msgid "nickserv: Send a command to nickserv"
-msgstr "nickserv: Bidali komandoa nickserv-i"
+msgstr "nickserv: Nickserv-ri agindu bat bidali"
 
-#, fuzzy
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr ""
-"me &lt;ekintza&gt;:  bidali IRC estiloko ekintza lagun bati edo berriketara."
+msgstr "notice &lt;helburua&lt;:  Oharra bidali erabiltzaileari edo kanalera."
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;goitizen1&gt; [goitizen2] ...:  eman kanalaren operadore baimenak "
-"norbaiti. Kanaleko operadorea izan behar duzu hau egiteko."
+"op &lt;ezizena1&gt; [ezizena2] ...:  Kanal-operadore baimenak eman norbaiti. "
+"Kanal-operadorea izan behar duzu hau egiteko."
 
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-"operwall &lt;mezua&gt;:  hau zer den ez badakizu, litekeena da ez erabiltzea."
+"operwall &lt;mezua&gt;:  Hau zer den ez badakizu, segurasko ezin duzu "
+"erabili."
 
 msgid "operserv: Send a command to operserv"
-msgstr "operserv: Bidali komandoa operserv-i"
+msgstr "operserv: Operserv-ri agindu bat bidali"
 
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-"part [gela] [mezua]:  irten uneko kanaletik, edo zehaztutako kanaletik, "
-"aukerazko mezu batekin."
+"part [gela] [mezua]:  Zauden kanaletik edo zehaztutako kanaletik irten, mezu "
+"bat utziz (nahi izanez gero)."
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [goitizena]:  erabiltzaile batek duen atzerapena galdetzen du (edo "
-"zerbitzariarena erabiltzailerik ez bada zehazten)."
+"ping [ezizena]:  Erabiltzaile batek duen atzerapena galdetu (edo "
+"zerbitzariak duena, erabiltzailerik ez bada zehazten)."
 
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"query &lt;goitizena&gt; &lt;mezua&gt;:  bidali mezu pribatu bat erabiltzaile "
-"bati (kanalera bidali beharrean)."
+"query &lt;ezizena&gt; &lt;mezua&gt;:  Erabiltzaile bati mezu pribatu bat "
+"bidali (kanalera bidali ordez)."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [mezua]:  deskonektatu zerbitzaritik, aukerazko mezu batekin."
+msgstr ""
+"quit [mezua]:  Zerbitzaritik deskonektatu, mezu bat utziz (nahi izanez gero)."
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  bidali komando gordina zerbitzariari"
+msgstr "quote [...]:  Zerbitzarira agindu gordina bidali."
 
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
-"remove &lt;goitizena&gt; [mezua]:  kendu norbait gelatik. Kanaleko "
-"operadorea izan behar duzu hau egiteko."
+"remove &lt;ezizena&gt; [mezua]:  Norbait gelatik kanporatu. Kanal-operadorea "
+"izan behar duzu hau egiteko."
 
 msgid "time: Displays the current local time at the IRC server."
-msgstr "time: erakutsi IRC zerbitzariko uneko ordu lokala."
+msgstr "time: IRC zerbitzariaren ordu lokala bistaratu."
 
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [gai berria]:  ikusi edo aldatu kanalaren gaia."
+msgstr "topic [gai berria]:  Kanalaren gaia ikusi edo editatu."
 
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  jarri edo kendu erabiltzaile-moduaren "
-"ezarpena"
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Erabiltzaile-modua ezarri/kendu."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "version [ezizena]: CTCP VERSION eskaera bidali erabiltzaileari"
 
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;goitizen1&gt; [goitizen2] ...:  eman kanalean hitzegiteko baimenak "
-"norbaiti. Kanaleko operadorea izan behar duzu hau egiteko."
+"voice &lt;ezizena1&gt; [ezizena2] ...:  Kanal-ahots baimenak eman norbaiti. "
+"Kanal-operadorea izan behar duzu hau egiteko."
 
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
-"wallops &lt;mezua&gt;:  hau zer den ez badakizu litekeena da ez erabiltzea."
+"wallops &lt;mezua&gt;:  Hau zer den ez badakizu, segurasko ezin duzu erabili."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
-"whois [zerbitzaria] &lt;goitizena&gt;:  hartu erabiltzaile baten informazioa."
+"whois [zerbitzaria] &lt;ezizena&gt;:  Erabiltzaile baten inguruko "
+"informazioa eskuratu."
 
-#, fuzzy
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
-"whois [zerbitzaria] &lt;goitizena&gt;:  hartu erabiltzaile baten informazioa."
+"whowas &lt;ezizena&gt;: Deskonektatu den erabiltzaile baten inguruko "
+"informazioa eskuratu."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
@@ -3719,55 +3724,76 @@ msgid "Disconnected."
 msgstr "Deskonektatuta."
 
 msgid "Unknown Error"
-msgstr "Errore ezezaguna"
+msgstr "Errore Ezezaguna"
 
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "Komandoa desgaitu da"
+msgstr "Errorea Ad-Hoc Aginduan"
 
-#, fuzzy
 msgid "execute"
-msgstr "Ez zen espero"
+msgstr "exekutatu"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"Zerbitzariak TLS/SSL behar du konektatzeko. Ez da TLS/SSL euskarririk aurkitu"
+"Zerbitzariak TLS/SSL behar du, baina ez da TLS/SSL euskarririk aurkitu."
 
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr ""
-"Zerbitzariak TLS/SSL behar du konektatzeko. Ez da TLS/SSL euskarririk aurkitu"
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Enkripzioa behar duzu, baina ez da TLS/SSL euskarririk aurkitu."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
-"Zerbitzariak testu arruntaren autentifikazioa behar du enkriptatu gabeko "
-"korrontean"
+"Zerbitzariak testu-arrunt autentifikazioa behar du, enkriptatu gabeko jarioan"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"Zerbitzariak testu arruntaren autentifikazioa behar du enkriptatu gabeko "
-"korrontean. Onartu nahi duzu, eta autentifikazioarekin jarraitu?"
+"%s(e)k testu-arrunt autentifikazioa behar du, enkriptatu gabeko jarioan.   "
+"Hau baimendu eta autentifikazioarekin jarraitu?"
 
 msgid "Plaintext Authentication"
-msgstr "Testu arruntaren autentifikazioa"
+msgstr "Testu-arrunt Autentifikazioa"
 
-msgid "Invalid response from server."
-msgstr "Erantzun baliogabea zerbitzaritik."
+msgid "SASL authentication failed"
+msgstr "Errorea SASL autentifikazioan"
+
+msgid "Invalid response from server"
+msgstr "Erantzun baliogabea zerbitzaritik"
 
 msgid "Server does not use any supported authentication method"
-msgstr "Zerbitzariak ez du erabiltzen autentifikazio-metodo onarturik"
+msgstr "Zerbitzariak ez du jasandako autentifikazio-metodorik erabiltzen"
+
+msgid "You require encryption, but it is not available on this server."
+msgstr "Enkripzioa behar duzu, baina zerbitzari honetan ezin da erabili."
 
 msgid "Invalid challenge from server"
 msgstr "Erronka baliogabea zerbitzaritik"
 
-msgid "SASL error"
-msgstr "SASL error"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL errorea: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "Zure sesioa amaituarazi du BOSH konexioa-kudeatzaileak."
+
+msgid "No session ID given"
+msgstr "Ez da sesio-IDrik eman"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "BOSH protokolo-bertsio ez jasana"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Ezin konexioa ezarri zerbitzariarekin"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Ezin konexioa ezarri zerbitzariarekin: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Ezin SSL-konexioa ezarri"
 
 msgid "Full Name"
-msgstr "Izen-deiturak"
+msgstr "Izen Osoa"
 
 msgid "Family Name"
 msgstr "Deitura"
@@ -3779,10 +3805,15 @@ msgid "URL"
 msgstr "URLa"
 
 msgid "Street Address"
-msgstr "Kale-helbidea"
+msgstr "Kale-Helbidea"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
-msgstr "Helbidearen jarraipena"
+msgstr "Helbidearen Jarraipena"
 
 msgid "Locality"
 msgstr "Herria"
@@ -3791,7 +3822,7 @@ msgid "Region"
 msgstr "Eskualdea"
 
 msgid "Postal Code"
-msgstr "Posta-kodea"
+msgstr "Posta-Kodea"
 
 msgid "Country"
 msgstr "Estatua"
@@ -3802,10 +3833,10 @@ msgid "Telephone"
 msgstr "Telefonoa"
 
 msgid "Organization Name"
-msgstr "Erakundearen izena"
+msgstr "Erakundearen Izena"
 
 msgid "Organization Unit"
-msgstr "Saila"
+msgstr "Erakundeko Saila"
 
 msgid "Role"
 msgstr "Funtzioa"
@@ -3816,205 +3847,24 @@ msgstr "Urtebetetzea"
 msgid "Description"
 msgstr "Azalpena"
 
-#, fuzzy
 msgid "Edit XMPP vCard"
-msgstr "Editatu Jabber vCard-a"
+msgstr "XMPP vCard-a Editatu"
 
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"Beheko elementu guztiak aukerakoak dira. Eman informazioa zuk nahi duzun "
-"moduan."
+"Opzionalak dira beheko elementu guztiak. Zuk nahi duzun informazioa bakarrik "
+"eman dezakezu."
 
-#, fuzzy
 msgid "Client"
-msgstr "Herria"
+msgstr "Bezeroa"
 
 msgid "Operating System"
-msgstr ""
-
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Ezarri Dir informazioa"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Helbidearen jarraipena"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Ezizena berriketarako"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Erabiltzaileak ez du direktorio-informaziorik."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Komandoa"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Erregistratze-errorea"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Kokalekua"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "Erabiltzaile bilaketa"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Lagunen egoeraren jakinarazpena"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Bertsioa ez da onartzen"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Orientazioa"
-
-msgid "File Transfer"
-msgstr "Fitxategi-transferentzia"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Erabiltzaile-moduak"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Erabiltzaile-muga"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Gaitasunak"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Erabiltzaile-izena"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM gako-trukearekin"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Helbide elektronikoa"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "MSN profila"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Erabiltzaile-izena "
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Zuzeneko bideoa"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Mezua iritsi da"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Gako publikoaren 'babble'-marka"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Erabiltzailearen aukerak"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Erabiltzaile-moduak"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Erabiltzaile-izena "
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Erabiltzaile-muga"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian enkriptatzea"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
+msgstr "Sistema Eragilea"
 
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Gaitasunak"
+msgid "Local Time"
+msgstr "Ordu Lokala"
 
 msgid "Priority"
 msgstr "Lehentasuna"
@@ -4022,14 +3872,21 @@ msgstr "Lehentasuna"
 msgid "Resource"
 msgstr "Baliabidea"
 
+#, c-format
+msgid "%s ago"
+msgstr "duela %s"
+
+msgid "Logged Off"
+msgstr "Deskonektatuta"
+
 msgid "Middle Name"
-msgstr "Bigarren izena"
+msgstr "Bigarren Izena"
 
 msgid "Address"
 msgstr "Helbidea"
 
 msgid "P.O. Box"
-msgstr "Posta-kutxa"
+msgstr "Posta-Kutxa"
 
 msgid "Photo"
 msgstr "Argazkia"
@@ -4038,41 +3895,36 @@ msgid "Logo"
 msgstr "Logotipoa"
 
 msgid "Un-hide From"
-msgstr "Desezkutatu honengandik"
+msgstr "Honengandik Ez Ezkutatu"
 
 msgid "Temporarily Hide From"
-msgstr "Ezkutatu aldi baterako honengandik"
+msgstr "Honengandik Ezkutatu Oraingoz"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
-msgstr "Ezeztatu presentzia-jakinarazpena"
+msgstr "Presentzia-Jakinarazpena Ezeztatu"
 
 msgid "(Re-)Request authorization"
-msgstr "Eskatu baimena (berriro)"
+msgstr "Baimena (berriro) Eskatu"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
 msgstr "Harpidetza kendu"
 
-#, fuzzy
 msgid "Log In"
-msgstr "Egunkaria"
+msgstr "Konektatu"
 
-#, fuzzy
 msgid "Log Out"
-msgstr "Saioa hasteko aukerak"
+msgstr "Deskonektatu"
 
 msgid "Chatty"
 msgstr "Berritsu"
 
 msgid "Extended Away"
-msgstr "Kanpoan luzarorako"
+msgstr "Kanpoan Luzarorako"
 
-#, c-format
 msgid "Do Not Disturb"
-msgstr "Ez molestatu"
+msgstr "Ez Molestatu"
 
 msgid "JID"
 msgstr "JID"
@@ -4081,56 +3933,52 @@ msgid "Last Name"
 msgstr "Deitura"
 
 msgid "The following are the results of your search"
-msgstr "Zure bilaketaren ondoriozko emaitzak hauek dira"
+msgstr "Hauek dira zure bilaketaren emaitzak"
 
 #. current comment from Jabber User Directory users.jabber.org
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
+"Kontaktu bat aurkitu, irizpideak sartuz eremuetan. Oharra: Eremu guztietan "
+"erabili ditzakezu komodinak (%)"
 
-#, fuzzy
 msgid "Directory Query Failed"
-msgstr "Zuzeneko konexioak huts egin du"
+msgstr "Direktorio-Galdekatze Errorea"
 
-#, fuzzy
 msgid "Could not query the directory server."
-msgstr "Ezin izan da fitxategi-transferentzia hasi"
+msgstr "Ezin direktorio-zerbitzaria galdekatu."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
 #, c-format
 msgid "Server Instructions: %s"
-msgstr "Zerbitzariaren aginduak:%s"
+msgstr "Zerbitzari-Aginduak: %s"
 
-#, fuzzy
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr ""
-"Bete ezazu bat edo eremu gehiago edozein Jabber erabiltzaileren "
-"topaketarako. "
+msgstr "Eremu bat edo gehiago bete ezazu XMPP erabiltzaileak bilatzeko."
 
 msgid "Email Address"
-msgstr "Helbide elektronikoa"
+msgstr "Helbide Elektronikoa"
 
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "Erabiltzailea bilatu"
+msgstr "XMPP-erabiltzaileak bilatu"
 
 #. "Search"
 msgid "Search"
 msgstr "Bilatu"
 
 msgid "Invalid Directory"
-msgstr "Direktorio baliogabea"
+msgstr "Direktorio Baliogabea"
 
 msgid "Enter a User Directory"
-msgstr "Sartu erabiltzailearen direktorioa"
+msgstr "Erabiltzaile-Direktorioa Sartu"
 
 msgid "Select a user directory to search"
-msgstr "Aukeratu erabiltzaile direktorioa bilaketarako"
+msgstr "Bilaketarako erabiltzaile-direktorio bat hautatu"
 
 msgid "Search Directory"
-msgstr "Bilatu direktorioa"
+msgstr "Direktorioan Bilatu"
 
 msgid "_Room:"
 msgstr "_Gela:"
@@ -4139,37 +3987,37 @@ msgid "_Server:"
 msgstr "_Zerbitzaria:"
 
 msgid "_Handle:"
-msgstr "_Heldulekua:"
+msgstr "_Kudeatzailea:"
 
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ez da baliozko gela-izena."
 
 msgid "Invalid Room Name"
-msgstr "Gela-izen baliogabea"
+msgstr "Gela-Izen Baliogabea"
 
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ez da baliozko zerbitzari-izena."
 
 msgid "Invalid Server Name"
-msgstr "Zerbitzari-izena ez da baliozkoa"
+msgstr "Zerbitzari-Izen Baliogabea"
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s ez da baliozko gela-heldulekua."
+msgstr "%s ez da baliozko gela-kudeatzailea"
 
 msgid "Invalid Room Handle"
-msgstr "Gela-heldulekua ez da baliozkoa"
+msgstr "Gela-Kudeatzaile Baliogabea"
 
 msgid "Configuration error"
 msgstr "Konfigurazio-errorea"
 
 msgid "Unable to configure"
-msgstr "Ezin da konfiguratu"
+msgstr "Ezin konfiguratu"
 
 msgid "Room Configuration Error"
-msgstr "Errorea gela konfiguratzean"
+msgstr "Gela-Konfigurazio Errorea"
 
 msgid "This room is not capable of being configured"
 msgstr "Gela hau ezin da konfiguratu"
@@ -4178,85 +4026,77 @@ msgid "Registration error"
 msgstr "Erregistratze-errorea"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "Ezin da goitizena aldatu MUC ez diren berriketa-geletan"
+msgstr "Ezin da ezizena aldatu MUC ez diren berriketa-geletan"
 
 msgid "Error retrieving room list"
-msgstr "Errorea gela-zerrenda eskuratzean "
+msgstr "Errorea gela-zerrenda eskuratzean"
 
 msgid "Invalid Server"
-msgstr "Zerbitzaria ez da baliozkoa"
+msgstr "Zerbitzaria Baliogabea"
 
 msgid "Enter a Conference Server"
-msgstr "Sartu konferentzia-zerbitzari bat"
+msgstr "Konferentzia-Zerbitzari bat Sartu"
 
 msgid "Select a conference server to query"
-msgstr "Hautatu konferentzia-zerbitzari bat kontsulta egiteko"
+msgstr "Konferentzia-zerbitzari bat hautatu kontsultarako"
 
 msgid "Find Rooms"
-msgstr "Bilatu gelak"
+msgstr "Gelak Bilatu"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgid "Affiliations:"
+msgstr "Afiliazioak:"
 
-msgid "Write error"
-msgstr "Idazketa-errorea"
+msgid "No users found"
+msgstr "Ez da erabiltzailerik aurkitu"
 
-#, fuzzy
-msgid "Ping timeout"
-msgstr "Testu arrunta"
+msgid "Roles:"
+msgstr "Funtzioak:"
 
-msgid "Read Error"
-msgstr "Irakurketa-errorea"
+msgid "Ping timed out"
+msgstr ""
 
-#, fuzzy, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al "
-"dago ?"
+"Zuzeneko konexioak huts egin ondoren ezin izan da beste XMPP konexio-"
+"metodorik aurkitu."
 
-msgid "Unable to create socket"
-msgstr "Ezin da socket-a sortu"
-
-#, fuzzy
 msgid "Invalid XMPP ID"
-msgstr "IDa ez da baliozkoa"
+msgstr "XMPP-ID baliogabea"
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
+msgstr "XMPP-ID baliogabea. Domeinua ezarri behar da."
+
+msgid "Malformed BOSH URL"
+msgstr "BOSH URL baliogabea"
 
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "%s@%s ondo erregistratu da"
+msgstr "Arrakastaz erregistratu da %s@%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "%s@%s ondo erregistratu da"
+msgstr "%s erregistro arrakastatsua"
 
 msgid "Registration Successful"
-msgstr "Ondo erregistratu da"
+msgstr "Erregistratze Arrakastatsua"
 
 msgid "Registration Failed"
-msgstr "Erregistratzeak huts egin du"
+msgstr "Errorea Erregistratzean"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "%s@%s ondo erregistratu da"
+msgstr "Arrakastaz kendu da %s(e)ko erregistroa"
 
-#, fuzzy
 msgid "Unregistration Successful"
-msgstr "Ondo erregistratu da"
+msgstr "Deserregistratze Arrakastatsua"
 
-#, fuzzy
 msgid "Unregistration Failed"
-msgstr "Erregistratzeak huts egin du"
-
-msgid "Already Registered"
-msgstr "Erregistratuta dago"
+msgstr "Deserregistratze Errorea"
 
 msgid "State"
-msgstr "Herrialdea"
+msgstr "Estatua"
 
 msgid "Postal code"
 msgstr "Posta-kodea "
@@ -4267,65 +4107,71 @@ msgstr "Telefonoa"
 msgid "Date"
 msgstr "Data"
 
-#, fuzzy
+msgid "Already Registered"
+msgstr "Dagoeneko Erregistratuta"
+
 msgid "Unregister"
-msgstr "Erregistratu"
+msgstr "Deserregistratu"
 
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "Eman datuak behean, zure kontu berria erregistratzeko."
+msgstr "Zure kontuaren datuak aldatzeko, bete itzazu beheko datuak."
 
 msgid "Please fill out the information below to register your new account."
-msgstr "Eman datuak behean, zure kontu berria erregistratzeko."
+msgstr "Zure kontu berria erregistratzeko, bete itzazu beheko datuak."
 
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "Erregistratu Jabber kontu berria"
+msgstr "XMPP Kontu Berria Erregistratu"
 
 msgid "Register"
 msgstr "Erregistratu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "Aldatu %s erabiltzailearen datuak"
+msgstr "%s Kontuaren Erregistroa Aldatu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Register New Account at %s"
-msgstr "Erregistratu Jabber kontu berria"
+msgstr "%s Kontu Berria Eregistratu"
 
-#, fuzzy
 msgid "Change Registration"
-msgstr "Erregistratze-errorea"
+msgstr "Erregistroa Aldatu"
 
-#, fuzzy
 msgid "Error unregistering account"
-msgstr "Errorea kontuaren datuak aldatzean"
+msgstr "Errorea kontua erregistratzean"
 
 msgid "Account successfully unregistered"
-msgstr ""
+msgstr "Arrakastaz erregistratu da kontua"
 
 msgid "Initializing Stream"
-msgstr "Korrontea hasieratzen"
+msgstr "Jarioa Hasiaratzen"
 
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "Korrontea hasieratzen"
+msgstr "SSL/TLS hasiarazten"
 
 msgid "Authenticating"
 msgstr "Autentifikatzen"
 
 msgid "Re-initializing Stream"
-msgstr "Korrontea berrasieratzen"
+msgstr "Jarioa Berrasiaratzen"
+
+msgid "Server doesn't support blocking"
+msgstr "Zerbitzariak ez ditu blokeoak jasaten"
 
 msgid "Not Authorized"
-msgstr "Baimenik ez"
+msgstr "Baimenik Ez"
+
+msgid "Mood"
+msgstr "Umorea"
+
+msgid "Now Listening"
+msgstr "Orain Entzuten"
 
 msgid "Both"
 msgstr "Biak"
 
 msgid "From (To pending)"
-msgstr "Nork (Nori jarri gabe)"
+msgstr "Nork (Nori erabakitzeke)"
 
 msgid "From"
 msgstr "Nork"
@@ -4334,147 +4180,132 @@ msgid "To"
 msgstr "Nori"
 
 msgid "None (To pending)"
-msgstr "Ez (Nori jarri gabe)"
+msgstr "Ez (Nori erabakitzeke)"
 
 msgid "None"
-msgstr "Bat ere ez"
+msgstr "Batere ez"
 
 msgid "Subscription"
 msgstr "Harpidetza"
 
-msgid "Mood"
-msgstr "Umorea"
-
-msgid "Now Listening"
-msgstr ""
-
-#, fuzzy
 msgid "Mood Text"
-msgstr "Umorea"
+msgstr "Umore-Testua"
 
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "Onartu"
+msgstr "Burrunbak Onartu"
 
 msgid "Tune Artist"
-msgstr ""
+msgstr "Doinuaren Artista"
 
-#, fuzzy
 msgid "Tune Title"
-msgstr "Lanpostua"
+msgstr "Doinuaren Titulua"
 
 msgid "Tune Album"
-msgstr ""
+msgstr "Doinuaren Albuma"
 
 msgid "Tune Genre"
-msgstr ""
+msgstr "Doinuaren Generoa"
 
-#, fuzzy
 msgid "Tune Comment"
-msgstr "Lagunen iruzkinak"
+msgstr "Doinuaren Iruzkina"
 
 msgid "Tune Track"
-msgstr ""
+msgstr "Donuaren Pista"
 
 msgid "Tune Time"
-msgstr ""
+msgstr "Doinuaren Denbora"
 
 msgid "Tune Year"
-msgstr ""
+msgstr "Doinuaren Urtea"
 
 msgid "Tune URL"
-msgstr ""
+msgstr "Doinuaren URLa"
 
 msgid "Password Changed"
-msgstr "Pasahitza aldatu da"
+msgstr "Pasahitza Aldatuta"
 
 msgid "Your password has been changed."
-msgstr "Zure pasahitza aldatu egin da."
+msgstr "Zure pasahitza aldatu da."
 
 msgid "Error changing password"
 msgstr "Errorea pasahitza aldatzean"
 
-msgid "Password (again)"
-msgstr "Pasahitza (berriro)"
-
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "Aldatu pasahitza"
+msgstr "XMPP-Pasahitza Aldatu"
 
 msgid "Please enter your new password"
-msgstr "Idatzi pasahitz berria"
+msgstr "Idatzi ezazu pasahitz berria"
 
 msgid "Set User Info..."
-msgstr "Ezarri erabiltzailearen datuak..."
+msgstr "Erabiltzaile-Datuak Ezarri..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password..."
-msgstr "Aldatu pasahitza..."
+msgstr "Pasahitza Aldatu..."
 
 #. }
 msgid "Search for Users..."
-msgstr "Bilatu erabiltzaileak..."
+msgstr "Erabiltzaileak Bilatu..."
 
 msgid "Bad Request"
-msgstr "Eskaera okerra"
+msgstr "Eskaera Okerra"
 
 msgid "Conflict"
 msgstr "Gatazka"
 
 msgid "Feature Not Implemented"
-msgstr "Eginbidea ez da inplementatu"
+msgstr "Ezaugarria Ez da Inplementatu"
 
 msgid "Forbidden"
 msgstr "Debekatuta"
 
 msgid "Gone"
-msgstr "Joan egin da"
+msgstr "Kanpoan"
 
 msgid "Internal Server Error"
-msgstr "Zerbitzariaren barneko errorea"
+msgstr "Zerbitzariaren Barneko Errorea"
 
 msgid "Item Not Found"
-msgstr "Elementua ez da aurkitu"
+msgstr "Ez da Elementua Aurkitu"
 
-#, fuzzy
 msgid "Malformed XMPP ID"
-msgstr "Gaizki osatutako Jabber IDa"
+msgstr "XMPP-ID Baliogabea"
 
 msgid "Not Acceptable"
-msgstr "Ezin da onartu"
+msgstr "Ez Onargarria"
 
 msgid "Not Allowed"
-msgstr "Ez da onartzen"
+msgstr "Ez Onartua"
 
 msgid "Payment Required"
-msgstr "Ordaindu egin behar da"
+msgstr "Ordainketa Beharrezkoa"
 
 msgid "Recipient Unavailable"
-msgstr "Hartzailea ez dago erabilgarri"
+msgstr "Hartzailea Ez dago Eskuragarri"
 
 msgid "Registration Required"
-msgstr "Erregistratu egin behar da"
+msgstr "Erregistratzea Beharrezkoa"
 
 msgid "Remote Server Not Found"
-msgstr "Urruneko zerbitzaria ez da aurkitu"
+msgstr "Ez da Urruneko Zerbitzaria Aurkitu"
 
 msgid "Remote Server Timeout"
-msgstr "Urruneko zerbitzariaren denbora-muga"
+msgstr "Urruneko Zerbitzariaren Denbora-muga"
 
 msgid "Server Overloaded"
-msgstr "Zerbitzariak karga handiegia du"
+msgstr "Zerbitzariaren Gainkarga"
 
 msgid "Service Unavailable"
-msgstr "Zerbitzua ez dago erabilgarri"
+msgstr "Zerbitzu Erabilgaitza"
 
 msgid "Subscription Required"
-msgstr "Harpidetu egin behar da"
+msgstr "Harpidetza Beharrezkoa"
 
 msgid "Unexpected Request"
-msgstr "Ustekabeko eskaera"
+msgstr "Ustekabeko Eskaera"
 
 msgid "Authorization Aborted"
-msgstr "Baimena abortatu da"
+msgstr "Baimen Abortatua"
 
 msgid "Incorrect encoding in authorization"
 msgstr "Kodeketa okerra baimenean"
@@ -4483,198 +4314,228 @@ msgid "Invalid authzid"
 msgstr "authzid baliogabea"
 
 msgid "Invalid Authorization Mechanism"
-msgstr "Baimen-mekanismoa ez da baliozkoa"
+msgstr "Baimen-Mekanismo Baliogabea"
 
 msgid "Authorization mechanism too weak"
-msgstr "Baimen-mekanismoa ahulegia da"
+msgstr "Baimen-mekanismo ahulegia"
 
 msgid "Temporary Authentication Failure"
-msgstr "Aldi baterako autentifikazioak huts egin du"
+msgstr "Aldiuneko Autentifikazio-Errorea"
 
 msgid "Authentication Failure"
-msgstr "Autentifikazioak huts egin du"
+msgstr "Autentifikazio-Errorea"
 
 msgid "Bad Format"
-msgstr "Okerreko formatua"
+msgstr "Formatu Baliogabea"
 
 msgid "Bad Namespace Prefix"
-msgstr "Izen-lekuaren aurrizki okerra"
+msgstr "Izen-Leku Aurrizki Baliogabea"
 
 msgid "Resource Conflict"
-msgstr "Baliabide-gatazka"
+msgstr "Baliabide-Gatazka"
 
 msgid "Connection Timeout"
-msgstr "Konexioaren denbora-muga"
+msgstr "Konexioaren Denbora-muga"
 
 msgid "Host Gone"
-msgstr "Ostalaria galdu da"
+msgstr "Ostalaria Galdu da"
 
 msgid "Host Unknown"
-msgstr "Ostalari ezezaguna"
+msgstr "Ostalari Ezezaguna"
 
 msgid "Improper Addressing"
-msgstr "Helbideratze desegokia"
+msgstr "Helbideratze Desegokia"
 
 msgid "Invalid ID"
-msgstr "IDa ez da baliozkoa"
+msgstr "ID Baliogabea"
 
 msgid "Invalid Namespace"
-msgstr "Izen-lekua ez da baliozkoa"
+msgstr "Izen-Leku Baliogabea"
 
 msgid "Invalid XML"
-msgstr "XML baliogabea"
+msgstr "XML Baliogabea"
 
 msgid "Non-matching Hosts"
-msgstr "Bat ez datozen ostalariak"
+msgstr "Ostalari Ezberdinak"
 
 msgid "Policy Violation"
-msgstr "Gidalerroen bortxaketa"
+msgstr "Politika-Bortxaketa"
 
 msgid "Remote Connection Failed"
-msgstr "Urruneko konexioak huts egin du"
+msgstr "Urruneko Konexioak Huts"
 
 msgid "Resource Constraint"
-msgstr "Baliabide-murriztapena"
+msgstr "Baliabide-Murrizketa"
 
 msgid "Restricted XML"
-msgstr "XML murriztua"
+msgstr "XML Murriztua"
 
 msgid "See Other Host"
-msgstr "Ikus beste ostalari batzuk"
+msgstr "Beste Ostalaria Ikusi"
 
 msgid "System Shutdown"
-msgstr "Sistema itzali da"
+msgstr "Sistema Itzalketa"
 
 msgid "Undefined Condition"
-msgstr "Definitu gabeko baldintza"
+msgstr "Definitu Gabeko Baldintza"
 
 msgid "Unsupported Encoding"
-msgstr "Kodeketa ez da onartzen"
+msgstr "Kodeketa Jasangabea"
 
 msgid "Unsupported Stanza Type"
-msgstr "Stanza mota ez da onartzen"
+msgstr "Stanza-Mota Jasangabea"
 
 msgid "Unsupported Version"
-msgstr "Bertsioa ez da onartzen"
+msgstr "Bertsio Jasangabea"
 
 msgid "XML Not Well Formed"
-msgstr "XML ez da ondo osatu"
+msgstr "XML Desitxuratua"
 
 msgid "Stream Error"
-msgstr "Korronte-errorea"
+msgstr "Jario-Errorea"
 
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "Ezin da %s erabiltzailea kanporatu"
+msgstr "Ezin %s erabiltzailea betatu"
 
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "kidetza ezezaguna:\" %s\""
+msgstr "Kidetza ezezaguna:\" %s\""
 
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Ezin da erabiltzailea %s kide bihurtu \"%s\""
+msgstr "Ezin da %s erabiltzailea kide bihurtu: \"%s\""
 
 #, c-format
 msgid "Unknown role: \"%s\""
-msgstr "Rol ezezaguna:\" %s\""
+msgstr "Rol ezezaguna: \" %s\""
 
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "%s erabiltzaileari ezin zaio %s rola ezarri"
+msgstr "Ezin \"%s\" rola ezarri erabiltzaileari: %s"
 
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "Ezin da %s erabiltzailea jaurti"
+msgstr "Ezin %s erabiltzailea kanporatu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "Ezin da %s erabiltzailea kanporatu"
+msgstr "Ezin %s erabiltzaileari ping egin"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Ezin burrunba egin, ez dagoela %s(r)en inguruko ezer."
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Ezin burrunba egin, %s deskonektatu egon daitekeelako."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
+"Ezin burrunba egin, %s(e)k ez duelako jasaten edo ez duelako burrunbarik "
+"jaso nahi orain."
 
-#, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Ezin da soinua jo, aukeratutako fitxategia (%s) ez dagoelako."
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s(r)i burrunba egiten..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#, fuzzy
 msgid "Buzz"
-msgstr "Buzz!!"
+msgstr "Burrunba"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k burruba egin dizu!"
 
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Ezin multimedia hasiarazi %s(r)ekin: JID baliogabea"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Ezin multimedia hasiarazi %s(r)ekin: erabiltzailea ez dago konektatuta"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
+"Ezin multimedia hasiarazi %s(r)ekin: ez dago erabiltzaile-presentziara "
+"harpidetua"
+
+msgid "Media Initiation Failed"
+msgstr "Ezin Multimedia Hasiarazi"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Multimedia sesioa hasiarazteko erabiliko duzun %s(e)ko baliabidea hautatu "
+"ezazu."
+
+msgid "Select a Resource"
+msgstr "Baliabide bat Hautatu"
+
+msgid "Initiate Media"
+msgstr "Multimedia Hasiarazi"
 
 msgid "config:  Configure a chat room."
-msgstr "konfig.: konfiguratu berriketa-gela bat."
+msgstr "config: Berriketa-gela bat konfiguratu."
 
 msgid "configure:  Configure a chat room."
-msgstr "konfiguratu: konfiguratu berriketa-gela bat."
+msgstr "configure: Berriketa-gela bat konfiguratu."
 
 msgid "part [room]:  Leave the room."
-msgstr "part [gela]:  irten gelatik."
+msgstr "part [gela]:  Gelatik irten."
 
 msgid "register:  Register with a chat room."
-msgstr "register:  harpidetu berriketa-gela batean."
+msgstr "register:  Berriketa-gela batean erregistratu."
 
 msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [gai berria]:  ikusi edo aldatu gaia"
+msgstr "topic [gai berria]:  Gaia ikusi edo aldatu."
 
-#, fuzzy
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;erabiltzailea&gt; [gela]:  bota erabiltzailea gela batetik."
+msgstr ""
+"ban &lt;erabiltzailea&gt; [arrazoia]:  Gela batetik betatu erabiltzailea."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"Afiliatu &It; erabiltzaile&gt;&It;jabea| administratzailea|kidea| paria | "
-"ezer ez&gt;: Erabiltzailearen afiliazioa ezarri gelarekiko."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [ezizena1] [ezizena2] ...: "
+"Gela bateko erabiltzaileen afizialioak eskuratu edo ezarri."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"Zeregin &It;erabiltzaile;&It;moderatzailea| partehartzailea | bisitari | "
-"ezer ez&gt;: Ezarri erabiltzailearen zeregina gelarekiko."
+"role &lt;moderator|participant|visitor|none&gt; [ezizena1] [ezizena2] ...: "
+"Gela batean rol bat duten erabiltzaileak eskuratu, edo rol bat ezarri."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr ""
-"gonbidatu &lt;erabiltzailea&gt; [mezua]:  gonbidatu erabiltzailea gelara."
+msgstr "invite &lt;erabiltzailea&gt; [mezua]:  Erabiltzailea gelara gonbidatu."
 
-#, fuzzy
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr ""
-"Lotu: &lt;gela&gt; [zerbitzaria]:  Lotu zerbitzari hontako berriketara."
+msgstr "join: &lt;gela&gt; [pasahitza]:  Zerbitzariko solasaldi batera batu."
 
-#, fuzzy
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "Jaurti &lt;erabiltzailea&gt; [gela]: Jaurti erabiltzailea gelatik."
+msgstr ""
+"kick &lt;erabiltzailea&gt; [arrazoia]:  Gelatik kanporatu erabiltzailea."
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"msg &lt;erabiltzailea&gt; &lt;mezua&gt;:  bidali mezu pribatua "
-"erabiltzaileari."
+"msg &lt;erabiltzailea&gt; &lt;mezua&gt;:  Mezu pribatu bat bidali beste "
+"erabiltzaile bati."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\tErabiltzaile/osagai/zerbitzari bat ping egin."
 
-#, fuzzy
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: eman abisu kontaktu bati bere harreta lortzeko"
+msgstr "buzz: Erabiltzaile bati burrunba egin bere arreta eskuratzeko"
 
 #. *< type
 #. *< ui_requirement
@@ -4686,47 +4547,45 @@ msgstr "buzz: eman abisu kontaktu bati bere harreta lortzeko"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "XMPP Protocol Plugin"
-msgstr "MSN protokoloaren plugin-a"
+msgstr "XMPP Protokolo-Plugina"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#, fuzzy
 msgid "Domain"
-msgstr "Errumaniera"
+msgstr "Domeinua"
 
-#, fuzzy
 msgid "Require SSL/TLS"
-msgstr "TLS beharrezkoa da"
+msgstr "SSL/TLS Eskatu"
 
 msgid "Force old (port 5223) SSL"
-msgstr "Behartu SSL zaharra (atala 5223) SSL"
+msgstr "SSL zaharra (5223 ataka) behartu"
 
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "Onartu testu arruntaren autentifikazioa enkriptatu gabeko korronteetan"
+msgstr "Enkriptatu gabeko jarioen bidezko testu-arrunt autentifikazioa onartu"
 
 msgid "Connect port"
-msgstr "Konektatzeko atak"
+msgstr "Konexio-ataka"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 msgid "Connect server"
-msgstr "Konektatu zerbitzariarekin"
+msgstr "Zerbitzarira konektatu"
 
-#, fuzzy
 msgid "File transfer proxies"
-msgstr "Fitxategi-transferentzien ataka"
+msgstr "Fitxategi-transferentzien proxya"
+
+msgid "BOSH URL"
+msgstr "BOSH URLa"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
-msgstr "Erakutsi _aurpegiera grafikoak "
+msgstr "Smiley Pertsonalizatuak Erakutsi"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
+msgstr "%s solasalditik irten da."
 
 #, c-format
 msgid "Message from %s"
@@ -4738,186 +4597,204 @@ msgstr "%s erabiltzaileak gaia aldatu du: %s"
 
 #, c-format
 msgid "The topic is: %s"
-msgstr "Uneko gaia: %s"
+msgstr "Oraingo gaia: %s"
 
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "%s(r)i mezua bidaltzeak huts egin du: %s"
+msgstr "Ezin mezua bidali %s(r)i: %s"
 
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "Jabber mezuaren errorea"
+msgstr "XMPP Mezu Errorea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "(Code %s)"
-msgstr " (%s kodea)"
+msgstr "(%s kodea)"
 
 msgid "XML Parse error"
-msgstr "XML analisi-errorea"
+msgstr "XML Analisi-errorea"
 
 msgid "Unknown Error in presence"
-msgstr "Presentzia-errore ezezaguna"
+msgstr "Errore Ezezaguna Presentzian"
+
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Errorea %s berriketan sartzean"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Errorea %s berriketan"
 
 msgid "Create New Room"
-msgstr "Sortu gela berria"
+msgstr "Gela Berria Sortu"
 
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
-"Gela berri bat sortzera zoaz. Konfiguratu egin nahi duzu, ala ezarpen "
+"Gela berri bat sortuko duzu. Konfiguratu egin nahi duzu, ala ezarpen "
 "lehenetsiak onartu nahi dituzu?"
 
 msgid "_Configure Room"
 msgstr "Gela _Konfiguratu"
 
 msgid "_Accept Defaults"
-msgstr "Lehenetsiak _onartu"
+msgstr "Lehenetsiak _Onartu"
+
+msgid "No reason"
+msgstr "Arrazoirik ez"
 
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Errorea %s berriketan sartzean"
+msgid "You have been kicked: (%s)"
+msgstr "Kanporatua izan zara: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Errorea %s berriketan"
+msgid "Kicked (%s)"
+msgstr "Kanporatua (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Errorea banda barruko byte-jario transferentzian\n"
+
+msgid "Transfer was closed."
+msgstr "Transferentzia itxiarazi da."
+
+msgid "Failed to open the file"
+msgstr "Ezin fitxategia ireki"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Ezin banda barneko byte-jarioa ireki"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
-"Ezin zaio fitxategia bidali %s erabiltzaileari, ez duelako fitxategi-"
+"Ezin fitxategia bidali %s erabiltzaileari, ez duelako fitxategi-"
 "transferentziarik onartzen"
 
 msgid "File Send Failed"
-msgstr "Huts egin du fitxategia bidaltzean"
+msgstr "Errorea Fitxategia Bidaltzean"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "Ezin zaio mezua bidali %s(r)i."
+msgstr "Ezin fitxategia bidali %s(r)i, JID baliogabea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr ""
-"Ezin zaio fitxategia bidali %s erabiltzaileari, ez duelako fitxategi-"
-"transferentziarik onartzen"
+msgstr "Ezin fitxategia bidali %s(r)i, erabiltzailea ez dago konektatuta"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
-"Ezin zaio fitxategia bidali %s erabiltzaileari, ez duelako fitxategi-"
-"transferentziarik onartzen"
+"Ezin fitxategia bidali %s(r)i, ez dago erabiltzaile-presentziara harpidetuta"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr ""
-"Idatzi informazioa ikusi nahi duzun pertsonaren pantaila-izena edo ezizena."
+msgstr "Fitxategia %s(e)ko zein baliabidetara bidaliko duzun hautatu ezazu."
 
-#, fuzzy
-msgid "Select a Resource"
-msgstr "Hautatu fitxategia"
-
-#, fuzzy
 msgid "Edit User Mood"
-msgstr "Erabiltzaile-moduak"
+msgstr "Erabiltzaile-Umorea Editatu"
 
 msgid "Please select your mood from the list."
-msgstr ""
+msgstr "Zerrendako umore bat hautatu ezazu."
 
-#, fuzzy
 msgid "Set"
-msgstr "_Ezarri"
+msgstr "Ezarri"
 
-#, fuzzy
 msgid "Set Mood..."
-msgstr "Hautatu karpeta..."
+msgstr "Umorea Ezarri..."
 
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "Ezarri erabiltzailearen muga"
+msgstr "Erabiltzaile-Ezizena Ezarri"
 
 msgid "Please specify a new nickname for you."
-msgstr ""
+msgstr "Zure ezizen berria zehaztu ezazu."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
+"Zure kontaktu-zerrendako edonork ikus dezake informazio hau, beraz, egokia "
+"hautatu ezazu."
 
-#, fuzzy
 msgid "Set Nickname..."
-msgstr "Goitizena"
+msgstr "Ezizena Ezarri..."
 
-#, fuzzy
 msgid "Actions"
-msgstr "Akzioa"
+msgstr "Ekintzak"
 
-#, fuzzy
 msgid "Select an action"
-msgstr "Hautatu fitxategia"
+msgstr "Ekintza hautatu"
 
-#, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Gehitu helbide-liburuan oharretan"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Ezin \"%s\" gehitu."
+
+msgid "Buddy Add error"
+msgstr "Errorea laguna gehitzean"
+
+msgid "The username specified does not exist."
+msgstr "Zehaztu duzun erabiltzaile-izena ez da existitzen."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Arazoa lagunen zerrenda %s(e)n (%s) sinkronizatzean"
+msgstr "Arazoa lagun-zerrenda sinkronizatzean: %s (%s)"
 
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"%s lokaleko zerrendan (\"%s\" taldean) dago, baina ez zerbitzariaren "
-"zerrendan. Lagun hau gehitzea nahi duzu?"
+"Zerrenda lokaleko \"%s\" taldean dago %s, baina ez zerbitzariko zerrendan. "
+"Lagun hau gehitzea nahi al duzu?"
 
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
-"%s lokaleko zerrendan dago, baina ez zerbitzariaren zerrendan. Lagun hau "
-"gehitzea nahi duzu?"
+"Zerrenda lokalean dago %s, baina ez zerbitzariko zerrendan. Lagun hau "
+"gehitzea nahi al duzu?"
 
 #, c-format
 msgid "Unable to parse message"
-msgstr "Ezin da mezua analizatu"
+msgstr "Ezin mezua analizatu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "Sintaxi-errorea (beharbada Pidgin errorea dago)"
+msgstr "Sintaxi-Errorea (beharbada bezeroaren akatsa)"
 
 #, c-format
 msgid "Invalid email address"
-msgstr "Helbide elektronikoa ez da zuzena"
+msgstr "Helbide-elektroniko baliogabea"
 
 #, c-format
 msgid "User does not exist"
-msgstr "Erabiltzailea ez dago"
+msgstr "Erabiltzailea ez da existitzen"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Fully qualified domain name missing"
-msgstr "Domeinu-izen osoa falta da"
+msgstr "Baliozko domeinu-izena falta"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Already logged in"
-msgstr "Konektatuta dago lehendik"
+msgstr "Jadanik konektatuta"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid username"
-msgstr "Erabiltzaile-izena ez da baliozkoa"
+msgstr "Erabiltzaile-izen baliogabea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid friendly name"
-msgstr "Lagunarteko izena ez da baliozkoa"
+msgstr "Lagunarteko izen baliogabea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "List full"
-msgstr "Zerrenda beteta dago"
+msgstr "Zerrenda osoa"
 
 #, c-format
 msgid "Already there"
-msgstr "Hor dago lehendik"
+msgstr "Hor dago jadanik"
 
 #, c-format
 msgid "Not on list"
@@ -4925,23 +4802,23 @@ msgstr "Ez dago zerrendan"
 
 #, c-format
 msgid "User is offline"
-msgstr "Erabiltzailea lineaz kanpo dago"
+msgstr "Erabiltzailea offline dago"
 
 #, c-format
 msgid "Already in the mode"
-msgstr "Lehendik dago modu honetan"
+msgstr "Modu honetan jadanik"
 
 #, c-format
 msgid "Already in opposite list"
-msgstr "Lehendik dago aurkako zerrendan"
+msgstr "Aurkako zerrendan jadanik"
 
 #, c-format
 msgid "Too many groups"
-msgstr "Talde gehiegi daude"
+msgstr "Talde gehiegi"
 
 #, c-format
 msgid "Invalid group"
-msgstr "Taldea ez da baliozkoa"
+msgstr "Talde baliogabea"
 
 #, c-format
 msgid "User not in group"
@@ -4949,7 +4826,7 @@ msgstr "Erabiltzailea ez dago taldean"
 
 #, c-format
 msgid "Group name too long"
-msgstr "Talde-izena luzeegia da"
+msgstr "Talde-izen luzeegia"
 
 #, c-format
 msgid "Cannot remove group zero"
@@ -4957,47 +4834,47 @@ msgstr "Ezin da zero taldea kendu"
 
 #, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "Existitzen ez den talde batera erabiltzailea atxikitzen"
+msgstr "Existitzen ez den talde batera erabiltzaile bat gehitzen saiatu zara"
 
 #, c-format
 msgid "Switchboard failed"
-msgstr "Switchboard hutsegitea"
+msgstr "Switchboard errorea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Notify transfer failed"
-msgstr "Jakinarazpen-transferentziak huts egin du"
+msgstr "Transferentzi-jakinarazpen errorea"
 
 #, c-format
 msgid "Required fields missing"
-msgstr "Behar diren eremu batzuk falta dira"
+msgstr "Beharrezko eremu batzuk falta"
 
-#, c-format
+#, fuzzy, c-format
 msgid "Too many hits to a FND"
 msgstr "Emaitza gehiegi FND baterako"
 
 #, c-format
 msgid "Not logged in"
-msgstr "Ez dago konektatuta"
+msgstr "Ez konektatuta"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Service temporarily unavailable"
-msgstr "Zerbitzua ez dago erabilgarri une honetan"
+msgstr "Zerbitzua eskuragaitz dago une honetan"
 
 #, c-format
 msgid "Database server error"
-msgstr "Datu-basearen zerbitzariaren errorea"
+msgstr "Datu-basea zerbitzariaren errorea"
 
 #, c-format
 msgid "Command disabled"
-msgstr "Komandoa desgaitu da"
+msgstr "Agindua ezgaituta"
 
 #, c-format
 msgid "File operation error"
-msgstr "Errorea fitxategi-eragiketan"
+msgstr "Fitxategi-eragiketa errorea"
 
 #, c-format
 msgid "Memory allocation error"
-msgstr "Memoria-esleipeneko errorea"
+msgstr "Memoria-esleipen errorea"
 
 #, c-format
 msgid "Wrong CHL value sent to server"
@@ -5005,19 +4882,19 @@ msgstr "Okerreko CHL balioa bidali da zerbitzarira"
 
 #, c-format
 msgid "Server busy"
-msgstr "Zerbitzaria okupatuta dago"
+msgstr "Zerbitzaria lanpetuta"
 
 #, c-format
 msgid "Server unavailable"
 msgstr "Zerbitzaria ez dago erabilgarri"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Peer notification server down"
-msgstr "Parekoaren jakinarazpen-zerbitzaria itxita"
+msgstr "Parekoen jakinarazpen-zerbitzaria itxita"
 
 #, c-format
 msgid "Database connect error"
-msgstr "Errorea datu-basearekin konektatzean"
+msgstr "Datu-base konexio errorea"
 
 #, c-format
 msgid "Server is going down (abandon ship)"
@@ -5033,11 +4910,11 @@ msgstr "CVR parametroak ezezagunak dira edo ez dira onartzen"
 
 #, c-format
 msgid "Unable to write"
-msgstr "Ezin da idatzi"
+msgstr "Ezin idatzi"
 
 #, c-format
 msgid "Session overload"
-msgstr "Saioak karga handiegia du"
+msgstr "Sesio gainkarga"
 
 #, c-format
 msgid "User is too active"
@@ -5045,7 +4922,7 @@ msgstr "Erabiltzailea aktiboegia da"
 
 #, c-format
 msgid "Too many sessions"
-msgstr "Saio gehiegi daude"
+msgstr "Sesio gehiegi"
 
 #, c-format
 msgid "Passport not verified"
@@ -5053,7 +4930,7 @@ msgstr "Pasaportea ez da egiaztatu"
 
 #, c-format
 msgid "Bad friend file"
-msgstr "Okerreko lagun-fitxategia"
+msgstr "Lagun-fitxategi baliogabea"
 
 #, c-format
 msgid "Not expected"
@@ -5061,19 +4938,19 @@ msgstr "Ez zen espero"
 
 #, c-format
 msgid "Friendly name changes too rapidly"
-msgstr "Lagunarteko izena bizkorregi aldatu da"
+msgstr "Lagunarteko izena bizkorregi aldatzen ari da"
 
 #, c-format
 msgid "Server too busy"
-msgstr "Zerbitzaria okupatuegi dago"
+msgstr "Zerbitzaria lanpetuegi"
 
 #, c-format
 msgid "Authentication failed"
-msgstr "Huts egin du autentifikatzean."
+msgstr "Ezin autentifikatu"
 
 #, c-format
 msgid "Not allowed when offline"
-msgstr "Ez da onartzen lineaz kanpo"
+msgstr "Ez da onartzen offline egotean"
 
 #, c-format
 msgid "Not accepting new users"
@@ -5081,78 +4958,99 @@ msgstr "Ez da erabiltzaile berririk onartzen"
 
 #, c-format
 msgid "Kids Passport without parental consent"
-msgstr "Ume-pasaportea gurasoen baimenik gabe"
+msgstr "Gurasoen baimenik gabeko Kids Passport"
 
 #, c-format
 msgid "Passport account not yet verified"
-msgstr "Pasaporte-kontua ez da egiaztatu oraindik"
+msgstr "Passport-kontua ez da egiaztatu oraindik"
 
-#, fuzzy, c-format
 msgid "Passport account suspended"
-msgstr "Pasaporte-kontua ez da egiaztatu oraindik"
+msgstr "Passport-kontua suspendituta"
 
 #, c-format
 msgid "Bad ticket"
-msgstr "Okerreko tiketa"
+msgstr "Tiket baliogabea"
 
 #, c-format
 msgid "Unknown Error Code %d"
-msgstr "%d errore-kode ezezaguna"
+msgstr "Errore-Kode Ezezaguna: %d"
 
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN Errorea: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "Kontaktu hobetsia"
+msgstr "Beste Kontaktuak"
 
-#, fuzzy
 msgid "Non-IM Contacts"
-msgstr "Kendu kontaktua"
+msgstr "Ez-IM Kontaktuak"
 
-msgid "Nudge"
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
 msgstr ""
+"%s(e)k keinu bat bidali dizu. <a href='audio://%s'>Klik egizu "
+"erreproduzitzeko</a>"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s(e)k keinu bat bidali dizu, baina ezin izan da gorde"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s(e)k ahots-klip bat bidali dizu. <a href='audio://%s'>Klik egizu "
+"erreproduzitzeko</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s(e)k ahots-klip bat bidali dizu, baina ezin izan da gorde"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s(e)k ahots-solasaldi batera gonbidatu zaitu, baina oraindik ez dago jasana."
+
+msgid "Nudge"
+msgstr "Ukondokada"
+
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k ukondokatu zaitu!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "%s ukondokatzen..."
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "Helbide elektronikoa"
+msgstr "Helbide Elektronikoa..."
 
 msgid "Your new MSN friendly name is too long."
-msgstr "MSN lagunarteko izen berria luzeegia da."
+msgstr "MSN-lagunarteko izen berria luzeegia da."
 
 msgid "Set your friendly name."
-msgstr "Ezarri lagunarteko izena."
+msgstr "Zure lagunarteko izena ezarri."
 
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "Beste MSN lagunek izen horrekin ikusiko zaituzte."
+msgstr "MSNko lagunek izen honekin ikusiko zaituzte."
 
 msgid "Set your home phone number."
-msgstr "Idatzi zure etxeko telefonoa."
+msgstr "Zure etxeko telefonoa ezarri."
 
 msgid "Set your work phone number."
-msgstr "Idatzi zure laneko telefonoa."
+msgstr "Zure laneko telefonoa ezarri."
 
 msgid "Set your mobile phone number."
-msgstr "Idatzi zure telefono mugikorra."
+msgstr "Zure telefono mugikorra ezarri."
 
 msgid "Allow MSN Mobile pages?"
-msgstr "MSN Mobile-ren orriak onartu nahi dituzu?"
+msgstr "MSN Mobile orriak onartu?"
 
 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 ""
-"Onartu nahi duzu zure lagunen zerrendakoek zuri MSN Mobile-ren orriak "
-"bidaltzea, telefono mugikorrera edo beste gailu mugikorren batera?"
+"Zure lagun-zerrendako jendeak zure telefono mugikorrera edo gailu "
+"mogikorretara MSN Mobile orriak bidaltzea onartu nahi al duzu?"
 
 msgid "Allow"
 msgstr "Onartu"
@@ -5160,42 +5058,45 @@ msgstr "Onartu"
 msgid "Disallow"
 msgstr "Ez onartu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
-msgstr "Lagunaren iruzkinak %s(r)entzako"
+msgstr "%s(e)rako Testu Blokeatua"
 
 msgid "No text is blocked for this account."
-msgstr ""
+msgstr "Ez da testurik blokeatu kontu honetarako."
 
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr ""
+msgstr "Expresio hauek blokeatzen ari dira gaur egun MSN-zerbitzariak:<br/>%s"
 
-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "Hotmail kontu hau behar bada ez dago aktibatua."
+msgstr "Kontu honek ez dauka e-posta gaituta."
 
 msgid "Send a mobile message."
-msgstr "Bidali mezu bat mugikor batera."
+msgstr "Mugikor batera mezu bat bidali."
 
 msgid "Page"
 msgstr "Orria"
 
+msgid "Playing a game"
+msgstr "Jolasten"
+
+msgid "Working"
+msgstr "Lanean"
+
+#, fuzzy
 msgid "Has you"
 msgstr "Atzeman zaitu"
 
-#, fuzzy
 msgid "Home Phone Number"
-msgstr "Ezarri etxeko telefonoa..."
+msgstr "Etxeko Telefono Zenbakia"
 
-#, fuzzy
 msgid "Work Phone Number"
-msgstr "Ezarri laneko telefonoa..."
+msgstr "Laneko Telefono Zenbakia"
 
-#, fuzzy
 msgid "Mobile Phone Number"
-msgstr "Ezarri telefono mugikorra..."
+msgstr "Telefono Zenbaki Mugikorra"
 
 msgid "Be Right Back"
 msgstr "Oraintxe nator"
@@ -5207,7 +5108,7 @@ msgid "On the Phone"
 msgstr "Telefonoan "
 
 msgid "Out to Lunch"
-msgstr "Bazkaltzera joan naiz "
+msgstr "Bazkaltzen"
 
 #. primitive
 #. ID
@@ -5215,51 +5116,75 @@ msgstr "Bazkaltzera joan naiz "
 #. saveable
 #. should be user_settable some day
 #. independent
-#, fuzzy
 msgid "Artist"
-msgstr "Helbidea"
+msgstr "Artista"
 
 msgid "Album"
-msgstr ""
+msgstr "Albuma"
+
+msgid "Game Title"
+msgstr "Jolasaren Titulua"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Lanpostua"
 
 msgid "Set Friendly Name..."
-msgstr "Ezarri lagunarteko izena..."
+msgstr "Lagunarteko Izena Ezarri..."
 
 msgid "Set Home Phone Number..."
-msgstr "Ezarri etxeko telefonoa..."
+msgstr "Etxeko Telefonoa Ezarri..."
 
 msgid "Set Work Phone Number..."
-msgstr "Ezarri laneko telefonoa..."
+msgstr "Laneko Telefonoa Ezarri..."
 
 msgid "Set Mobile Phone Number..."
-msgstr "Ezarri telefono mugikorra..."
+msgstr "Telefono Mugikorra ezarri..."
 
 msgid "Enable/Disable Mobile Devices..."
-msgstr "Gaitu/ez-gaitu gailu mugikorrak..."
+msgstr "Gailu Mugikorrak Gaitu/Ezgaitu..."
 
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "Baimendu/Ukatu mugikorraren orriak..."
+msgstr "Mobile Pages Onartu/Ez-onartu..."
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "Blokeatutako Testua Ikusi..."
 
 msgid "Open Hotmail Inbox"
-msgstr "Ireki Hotmail posta"
+msgstr "Hotmail Posta Ireki"
 
 msgid "Send to Mobile"
-msgstr "Bidali mugikorrera"
+msgstr "Mugikorrera Bidali"
 
 msgid "Initiate _Chat"
-msgstr "Hasi _berriketa"
+msgstr "_Berriketa Hasiarazi"
 
-#, fuzzy
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"SSL euskarria behar da MSNrako. Instalatu SSL liburutegi onartu bat. "
-"Informazio gehiago: http://Pidgin.sf.net/faq-ssl.php."
+"SSL euskarria behar da MSNrako. SSL-liburutegi onartu bat instalatu ezazu."
 
-msgid "Failed to connect to server."
-msgstr "Huts egin du zerbitzariarekin konektatzean."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Ezin %s laguna gehitu, erabiltzaile-izena ez delako baliozkoa. Erabiltzaile-"
+"izenek baliozko helbide elektroniko bat izan behar dute."
+
+msgid "Unable to Add"
+msgstr "Ezin Gehitu"
+
+msgid "Authorization Request Message:"
+msgstr "Baimena Eskatzeko Mezua:"
+
+msgid "Please authorize me!"
+msgstr "Emadaizu baimena!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Ados"
 
 msgid "Error retrieving profile"
 msgstr "Errorea profila eskuratzean"
@@ -5271,87 +5196,84 @@ msgid "Age"
 msgstr "Adina"
 
 msgid "Occupation"
-msgstr "Funtzioa"
+msgstr "Okupazioa"
 
 msgid "Location"
 msgstr "Kokalekua"
 
 msgid "Hobbies and Interests"
-msgstr "Zaletasunak eta interesak"
+msgstr "Zaletasunak eta Interesak"
 
 msgid "A Little About Me"
-msgstr "Zertxobait niri buruz"
+msgstr "Niri Buruzko Zertxobait"
 
 msgid "Social"
-msgstr ""
+msgstr "Soziala"
 
 msgid "Marital Status"
-msgstr "Egoera zibila"
+msgstr "Egoera Zibila"
 
 msgid "Interests"
 msgstr "Intereresak"
 
 msgid "Pets"
-msgstr "Azienda"
+msgstr "Maskotak"
 
 msgid "Hometown"
-msgstr "Jaiotze hiria"
+msgstr "Jaioterria"
 
 msgid "Places Lived"
-msgstr "Bizilekua"
+msgstr "Izandako Bizilekuak"
 
 # , fuzzy
 msgid "Fashion"
-msgstr "Fashion"
+msgstr "Moda"
 
 msgid "Humor"
-msgstr "humorea"
+msgstr "Humorea"
 
 msgid "Music"
 msgstr "Musika"
 
 msgid "Favorite Quote"
-msgstr "Aipamen gogokoena"
+msgstr "Aipamen Gogokoena"
 
-#, fuzzy
 msgid "Contact Info"
-msgstr "Kontuari buruzko informazioa"
+msgstr "Kontua-Informazioa"
 
-#, fuzzy
 msgid "Personal"
-msgstr "IM pertsonala"
+msgstr "Pertsonala"
 
 msgid "Significant Other"
-msgstr "Beste zentzu"
+msgstr "Beste Batzuk"
 
 msgid "Home Phone"
-msgstr "Etxeko telefonoa"
+msgstr "Etxeko Telefonoa"
 
 msgid "Home Phone 2"
-msgstr "Etxeko telefonoa 2"
+msgstr "Etxeko Telefonoa 2"
 
 msgid "Home Address"
-msgstr "Etxeko helbidea"
+msgstr "Etxeko Helbidea"
 
 msgid "Personal Mobile"
-msgstr "Zagapoto pertsonala"
+msgstr "Mugikor Pertsonala"
 
 msgid "Home Fax"
 msgstr "Etxeko Fax-a"
 
 msgid "Personal Email"
-msgstr "Norberaren posta elektronikoa"
+msgstr "E-posta Pertsonala"
 
 msgid "Personal IM"
-msgstr "IM pertsonala"
+msgstr "IM Pertsonala"
 
 msgid "Anniversary"
-msgstr "Urteurren"
+msgstr "Urtebetetzea"
 
 #. Business
-#, fuzzy
 msgid "Work"
-msgstr "Laneko IM"
+msgstr "Lana"
 
 msgid "Job Title"
 msgstr "Lanpostua"
@@ -5363,44 +5285,44 @@ msgid "Department"
 msgstr "Departamentua"
 
 msgid "Profession"
-msgstr "Ofizio"
+msgstr "Ofizioa"
 
 msgid "Work Phone"
 msgstr "Laneko Telefonoa"
 
 msgid "Work Phone 2"
-msgstr "Laneko telefonoa 2"
+msgstr "Laneko Telefonoa 2"
 
 msgid "Work Address"
-msgstr "Laneko helbidea"
+msgstr "Laneko Helbidea"
 
 msgid "Work Mobile"
-msgstr "Laneko segapotoa"
+msgstr "Laneko Mugikorra"
 
 # , fuzzy
 msgid "Work Pager"
-msgstr "Lan orrigilea"
+msgstr "Laneko Orria"
 
 msgid "Work Fax"
 msgstr "Laneko Fax-a"
 
 msgid "Work Email"
-msgstr "Laneko helbide elektronikoa"
+msgstr "Laneko E-posta"
 
 msgid "Work IM"
 msgstr "Laneko IM"
 
 msgid "Start Date"
-msgstr "Hasteko data "
+msgstr "Hasiera-Data "
 
 msgid "Favorite Things"
-msgstr "Gogoko gauzak"
+msgstr "Gogoko Gauzak"
 
 msgid "Last Updated"
-msgstr "Azken eguneratzea"
+msgstr "Azkenekoz Eguneratua"
 
 msgid "Homepage"
-msgstr "Etxeko orria"
+msgstr "Orri Nagusia"
 
 msgid "The user has not created a public profile."
 msgstr "Erabiltzaileak ez du profila publikorik sortu."
@@ -5410,20 +5332,18 @@ msgid ""
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
-"MSNek dio ezin izan duela erabiltzailearen profila aurkitu. Agian "
-"erabiltzailea ez da existitzen, edo exisititzen bada ez duela profila "
-"publikorik sortu."
+"MSNek ezin izan du erabiltzailearen profila aurkitu. Agian erabiltzailea ez "
+"da existitzen, edo exisititzen da baina ez du profila publikorik sortu."
 
-#, fuzzy
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Pidgin-ek ezin izan du erabiltzailearen profilean informaziorik aurkitu. "
-"Erabiltzailea ez dela existitzen dirudi."
+"Ezin informaziorik aurkitu erabiltzailearen profilean. Erabiltzailea ez dela "
+"existitzen dirudi."
 
-msgid "Profile URL"
-msgstr "Profilaren URLa"
+msgid "View web profile"
+msgstr "Web profila ikusi"
 
 #. *< type
 #. *< ui_requirement
@@ -5434,90 +5354,48 @@ msgstr "Profilaren URLa"
 #. *< name
 #. *< version
 #. *< summary
-#, fuzzy
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Novell GroupWise mezulariaren protokoloaren plugin-a"
+msgstr "Windows Live Messenger Protokolo-Plugina"
 
 msgid "Use HTTP Method"
-msgstr "Erabili HTTP metodoa"
+msgstr "HTTP Metodoa Erabili"
 
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "Zerbitzariaren IPC proba"
+msgstr "HTTP Metodo Zerbitzaria"
 
 msgid "Show custom smileys"
-msgstr "Erakutsi _aurpegiera grafikoak "
+msgstr "Smiley pertsonalak erakutsi"
 
 msgid "nudge: nudge a user to get their attention"
-msgstr "Harreta ematen: harreta eman kontaktu bati atentzioa lortzeko"
+msgstr "nudge: erabiltzaile bati ukondokada eman, bere harreta eskuratzeko"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "Huts egin du era normalean autentifikatzean."
+msgstr "Windows Live ID autentifikazioa: Ezin konektatu"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Huts egin du era normalean autentifikatzean."
-
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s ez da baliozko taldea."
-
-msgid "Unknown error."
-msgstr "Errore ezezaguna."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s: %s (%s)"
+msgstr "Windows Live ID autentifikazioa: Erantzun baliogabea"
 
 #, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s berriki harreta eskaera bidali dizute !"
-
-#. char *adl = g_strndup(payload, len);
-#, fuzzy, c-format
-msgid "Unknown error (%d)"
-msgstr "Errore ezezaguna"
-
-msgid "Unable to add user"
-msgstr "Ezin da erabiltzailea gehitu"
-
-#, fuzzy
-msgid "The following users are missing from your addressbook"
-msgstr "Zure bilaketaren ondoriozko emaitzak hauek dira"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Ezin da erabiltzailea gehitu: %s (%s)"
+msgstr "Ukondokada bidali dizu %s(e)k!"
 
 #, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Ezin da erabiltzailea blokeatu: %s (%s)."
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Ezin da erabiltzailea baimendu: %s (%s)"
+msgid "Unknown error (%d): %s"
+msgstr "Errore ezezaguna (%d): %s"
 
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ezin da gehitu lagunen zerrenda beteta daukazulako."
+msgid "Unable to add user"
+msgstr "Ezin erabiltzailea gehitu"
 
+#. Unknown error!
 #, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ez da baliozko pasaporte-kontua."
+msgid "Unknown error (%d)"
+msgstr "Errore ezezaguna (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Zerbitzua ez dago erabilgarri une honetan "
+msgid "The following users are missing from your addressbook"
+msgstr "Erabiltzaile hauek ez daude zure helbide-liburuan"
 
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
-msgstr "Mezua ezin izan da bidali azkarregi bidaltzen ari garelako:"
-
-msgid "Unable to rename group"
-msgstr "Ezin da taldea izenez aldatu"
-
-msgid "Unable to delete group"
-msgstr "Ezin da taldea ezabatu"
+msgstr "Ez da mugikor-mezua bidali, luzeegia delako."
 
 #, c-format
 msgid ""
@@ -5535,35 +5413,33 @@ msgid_plural ""
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"MSN zerbitzaria minutu %d barru itzaliko da, mantentze-lanak egiteko. "
-"Automatikoki deskonektatuko zaitu. Amaitu irekita dauden solasaldiak.\n"
+"Mantenimendurako itxiko da MSN-zerbitzaria minutu %d barru. Automatikoki "
+"deskonektatuko zara une horretan.  Martxan dituzun solasaldiak amaitu "
+"itzazu..\n"
 "\n"
-"Mantentze-lanak egindakoan, berriz ere sartu ahal izango zara."
+"Mantenimendua amaitu bezain laster konektatu ahalko zara berriro."
 msgstr[1] ""
-"MSN zerbitzaria %d minutu barru itzaliko da, mantentze-lanak egiteko. "
-"Automatikoki deskonektatuko zaitu. Amaitu irekita dauden solasaldiak.\n"
+"Mantenimendurako itxiko da MSN-zerbitzaria %d minutu barru. Automatikoki "
+"deskonektatuko zara une horretan.  Martxan dituzun solasaldiak amaitu "
+"itzazu..\n"
 "\n"
-"Mantentze-lanak egindakoan, berriz ere sartu ahal izango zara."
+"Mantenimendua amaitu bezain laster konektatu ahalko zara berriro."
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
+"Ez da mezua bidali, sistema eskuragaitz dagoelako. Erabiltzailea blokeatuta "
+"dagoenean edo existitzen ez denean gertatu ohi da."
 
-#, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "Mezua ezin izan da bidali azkarregi bidaltzen ari garelako:"
+msgstr "Ez da mezua bidali, azkarregi bidaliak izaten ari direlako mezuak."
 
-#, fuzzy
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "Mezua ezin izan da bidali errore ezezaguna gertatu delako:"
+msgstr "Ez da mezua bidali, kodeketa-errore ezezaguna gertatu delako."
 
-#, fuzzy
 msgid "Message was not sent because an unknown error occurred."
-msgstr "Mezua ezin izan da bidali errore ezezaguna gertatu delako:"
-
-msgid "Unable to connect"
-msgstr "Ezin da konektatu"
+msgstr "Ez da mezua bidali, errore ezezaguna gertatu delako."
 
 msgid "Writing error"
 msgstr "Idazketa-errorea"
@@ -5579,31 +5455,31 @@ msgstr ""
 "Konexio-errorea %s zerbitzarian :\n"
 "%s "
 
-msgid "Our protocol is not supported by the server."
-msgstr "Zerbitzariak ez du protokoloa hau onartzen"
+msgid "Our protocol is not supported by the server"
+msgstr "Zerbitzariak ez du gura protokoloa onartzen"
 
-msgid "Error parsing HTTP."
-msgstr "Errorea HTTP analizatzean"
+msgid "Error parsing HTTP"
+msgstr "HTTP-arazketa errorea"
 
-msgid "You have signed on from another location."
-msgstr "Beste kokaleku batetik hasi duzu saioa."
+msgid "You have signed on from another location"
+msgstr "Beste nonbaitetik konektatu zara"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN zerbitzariak ez daude eskuragarri une honetan. Itxaron, eta saiatu "
 "berriro."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "MSN zerbitzariak ixtera doaz aldi baterako."
+msgid "The MSN servers are going down temporarily"
+msgstr "MSN zerbitzariak aldi baterako deskonektatuko dira"
 
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "Ezin da autentifikatu: %s"
+msgstr "Ezin autentifikatu: %s"
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"MSN lagunen zerrenda ez dago erabilgarri une honetan. Itxaron, eta saiatu "
+"MSN lagun-zerrenda ez dago eskuragarri une honetan. Itxaron, eta saiatu "
 "berriro."
 
 msgid "Handshaking"
@@ -5613,86 +5489,79 @@ msgid "Transferring"
 msgstr "Transferitzen"
 
 msgid "Starting authentication"
-msgstr "Autentifikazioa haiseratzen"
+msgstr "Autentifikazioa hasieratzen"
 
 msgid "Getting cookie"
-msgstr "Cookie eskuratzen"
+msgstr "Cookie-a eskuratzen"
 
 msgid "Sending cookie"
-msgstr "Cookie bidaltzen"
+msgstr "Cookie-a bidaltzen"
 
 msgid "Retrieving buddy list"
-msgstr "Lagunen zerrenda eskuratzen"
+msgstr "Lagun-zerrenda eskuratzen"
+
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s(e)k zure web-kamera ikusi nahi du, baina halako eskaerak ez daude jasanak "
+"oraindik."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s(e)k web-kamera gonbita bidali dizu, baina oraindik ez dago jasana."
 
 msgid "Away From Computer"
-msgstr "Ordenagailutik urrun"
+msgstr "Ordenagailutik Urrun"
 
 msgid "On The Phone"
 msgstr "Telefonoan"
 
 msgid "Out To Lunch"
-msgstr "Bazkaltzera joan naiz"
+msgstr "Bazkaltzen"
 
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "Litekeena da mezua bidali ez izatea konexioa iraungitu delako:"
+msgstr "Zuirrenik, denbora-muga agortu delako ezin izan da bidali mezua:"
 
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr ""
-"Litekeena da mezua bidali ez izatea, ez dago baimendua ikusezina den "
-"bitartean:"
+msgstr "Ezin mezua bidali, ezin duzulako mezurik bidali ikustezina zarenean:"
 
 msgid "Message could not be sent because the user is offline:"
-msgstr ""
-"Litekeena da mezua bidali ez izatea erabiltzailea lineaz kanpo dagoelako:"
+msgstr "Ezin mezua bidali, erabiltzailea ez dagoelako konektatuta:"
 
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "Litekeena da mezua bidali ez izatea konexio-errore bat gertatu delako:"
+msgstr "Ezin mezua bidali, konexio-errore baten erruz:"
 
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Mezua ezin izan da bidali azkarregi bidaltzen ari garelako:"
+msgstr "Ezin mezua bidali, azkarregi ari zarelako bidaltzen:"
 
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
+"Ezin mezua bidali, ezin izan dugulako sesio bat ezarri zerbitzariarekin. "
+"Zerbitzariaren arazoa dela dirudi. Minutu batzu pasa ondoren saiatu berriro:"
 
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
-msgstr ""
-"Litekeena da mezua bidali ez izatea 'switch'ean errorea gertatu delako:"
+msgstr "Ezin mezua bidali, switchboard-ean errore bat gertatu delako:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "Mezua ezin izan da bidali errore ezezaguna gertatu delako:"
+msgstr "Ezin mezua bidali, errore ezezagun baten erruz:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s gehitu zaitut bere lagunen-zerrendara."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ezabatu zaitu bere lagunen-zerrendatik."
-
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "Gehitu helbide-liburuan"
+msgstr "Helbide-Liburutik Ezabatu Laguna?"
 
-#, fuzzy
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Lagun hori zure lagunen zerrendan gehitu nahi duzu?"
-
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Ezin da gehitu \"%s\"."
+msgstr "Zure helbide-liburutik ere ezabatu nahi al duzu lagun hau?"
 
-#, fuzzy
 msgid "The username specified is invalid."
-msgstr "Zehastu duzun Pantaila-izena ez baliogarria."
+msgstr "Baliogabea da zehaztutako erabiltzaile-izena."
 
 msgid "This Hotmail account may not be active."
-msgstr "Hotmail kontu hau behar bada ez dago aktibatua."
+msgstr "Posible da Hotmail-kontu hau aktibatuta ez egotea."
+
+msgid "Profile URL"
+msgstr "Profilaren URLa"
 
 #. *< type
 #. *< ui_requirement
@@ -5704,253 +5573,266 @@ msgstr "Hotmail kontu hau behar bada ez dago aktibatua."
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "MSN Protocol Plugin"
-msgstr "AIM/ICQ protokoloaren plugin-a"
+msgstr "MSN Protokolo-Plugina"
 
-#, fuzzy
-msgid "Missing Cipher"
-msgstr "Zifra"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s ez da baliozko taldea."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "Errore ezezaguna."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s: %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Ezin erabiltzailea gehitu: %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Ezin erabiltzailea blokeatu: %s (%s)."
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Ezin erabiltzailea baimendu: %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Ezin %s lagun-zerrendara gehitu, zerrenda beteta dagoelako."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ez da baliozko passport-kontua."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Zerbitzua Eskuragaitz Oraintxe."
+
+msgid "Unable to rename group"
+msgstr "Ezin taldea berrizendatu"
+
+msgid "Unable to delete group"
+msgstr "Ezin taldea ezabatu"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s(e)k bere lagun-zerrendara gehitu zaitu."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s(e)k bere lagun-zerrendatik kendu zaitu."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "Halako erabiltzailerik ez: %s"
+
+msgid "User lookup"
 msgstr ""
 
-#, fuzzy
 msgid "Reading challenge"
-msgstr "Irakurketa-errorea"
+msgstr "Erronka irakurtzen"
 
-#, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "Erronka baliogabea zerbitzaritik"
+msgstr "Espero ez zen erronka-luzera zerbitzaritik"
 
-#, fuzzy
 msgid "Logging in"
-msgstr "Egunkaria"
+msgstr "Konektatzen"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Erabiltzaile-Izenik ez"
+
+msgid "You appear to have no MySpace username."
+msgstr "MySpace erabiltzaile-izenik ez daukazula dirudi."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Bat ezarri nahi al duzu orain? (Oharra: HAU EZIN DA ALDATU!)"
+
+msgid "Lost connection with server"
+msgstr "Zerbitzariko konexioa galdu da"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#, fuzzy
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
-msgstr "Bidali _mezua"
+msgstr "Posta mezu berriak"
 
 msgid "New blog comments"
-msgstr ""
+msgstr "Blog iruzkin berriak"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "Profila iruzkin berriak"
 
 msgid "New friend requests!"
-msgstr ""
+msgstr "Lagun-eskaera berriak!"
 
 msgid "New picture comments"
-msgstr ""
+msgstr "Irudi iruzkin berriak"
 
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
-#, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "Ez dago izenik"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "IM Lagunak"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"Lagun %d gehitu edo eguneratu da zerbitzaritik (lehendik zerbitzariko "
+"zerrendan zeudenak barne)"
+msgstr[1] ""
+"%d lagun gehitu edo eguneratu dira zerbitzaritik (lehendik zerbitzariko "
+"zerrendan zeudenak barne)"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Konektatua"
+msgid "Add contacts from server"
+msgstr "Zerbitzariko kontaktuak gehitu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "Prozesua errorea kodea itzuli du %d"
+msgstr "Protokolo-errorea, %d kodea: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
+"%s Zure pasahitzak %zu karaktere ditu, hau da, %d(e)ko luzera maximoa baina "
+"gehiago.  Zure pasahitza moztu ezazu http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword helbidea, eta berriro saiatu."
+
+msgid "Incorrect username or password"
+msgstr "Erabiltzaile-izen edo pasahitz okerra"
 
 msgid "MySpaceIM Error"
-msgstr ""
+msgstr "MySpaceIM Errorea"
+
+msgid "Invalid input condition"
+msgstr "Sarrera-kondizio baliogabea"
 
-#, fuzzy
 msgid "Failed to add buddy"
-msgstr "Huts egin du berriketako lagunarekin elkartzean"
+msgstr "Ezin laguna gehitu"
 
-#, fuzzy
 msgid "'addbuddy' command failed."
-msgstr "Kargatu lagunen-zerrenda fitxategi batetik..."
+msgstr "Errorea 'addbuddy' aginduan."
 
-#, fuzzy
 msgid "persist command failed"
-msgstr "Switchboard hutsegitea"
+msgstr "Errorea 'persist' aginduan"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "Erabiltzaile-gelak"
-
-#, fuzzy
 msgid "Failed to remove buddy"
-msgstr "Huts egin du berriketako lagunarekin elkartzean"
+msgstr "Ezin laguna kendu"
 
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "Errorea 'delbuddy' aginduan"
 
-#, fuzzy
 msgid "blocklist command failed"
-msgstr "Switchboard hutsegitea"
-
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "Konexioa amaitzen"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Ilara beteta dago"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Ezin da mezua analizatu"
+msgstr "Errorea 'blocklist' aginduan"
 
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Ezin izan da ostalariarekin konektatu"
+msgid "Missing Cipher"
+msgstr "Zifratua Falta"
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "_BM leihoak"
+msgid "The RC4 cipher could not be found"
+msgstr "Ezin RC4 zifratua aurkitu"
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "Erantzun baliogabea zerbitzaritik."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"RC4 jasaten duen libpurple batera eguneratu zaitez (>= 2.0.1). Ez da "
+"MySpaceIM plugina kargatuko."
 
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "MySpace.com-eko lagunak gehitu"
 
-#, fuzzy
 msgid "Importing friends failed"
-msgstr "Okerreko lagun-fitxategia"
+msgstr "Ezin lagunak inportatu"
 
 #. TODO: find out how
-#, fuzzy
 msgid "Find people..."
-msgstr "Lagunak bilatu..."
+msgstr "Jendea bilatu..."
 
-#, fuzzy
 msgid "Change IM name..."
-msgstr "Pasahitza aldatu..."
+msgstr "IM-izena aldatu..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "myim URL-kudeatzailea"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "Ez da myim URL honekin irekitzeko MySpaceIM kontu egokirik aurkitu."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "MySpaceIM kontu egokia gaitu ezazu eta berriro saiatu zaitez."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Pantaila-izena erakutsi egoera-testuan"
 
 msgid "Show headline in status text"
-msgstr ""
+msgstr "Izenburua erakutsi egoera-testuan"
 
-#, fuzzy
 msgid "Send emoticons"
-msgstr "Soinu-aukerak"
+msgstr "Emotikonoak bidali"
 
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "Pantaila-bereizmena (hatzbeteko puntuko)"
 
-#, fuzzy
 msgid "Base font size (points)"
-msgstr "Letra-tipo handiagoa"
+msgstr "Oinarrizko letra-tamaina (puntuak)"
 
-#, fuzzy
 msgid "User"
-msgstr "Erabiltzaileak"
+msgstr "Erabiltzailea"
 
-#, fuzzy
-msgid "Profile"
-msgstr "MSN profila"
-
-#, fuzzy
 msgid "Headline"
-msgstr "_Heldulekua:"
+msgstr "Izenburua"
 
-#, fuzzy
 msgid "Song"
-msgstr "Soinuak"
+msgstr "Abestia"
 
 msgid "Total Friends"
-msgstr ""
+msgstr "Lagunak Guztira"
 
-#, fuzzy
 msgid "Client Version"
-msgstr "Itxi solasaldia"
+msgstr "Bezero-Bertsioa"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "Ez dago izenik"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
+"Errorea erabiltzaile-izena ezartzean.  Berriro saiatu zaitez edo http://"
+"editprofile.myspace.com/index.cfm?fuseaction=profile.username helbidean "
+"sartu zaitez zure erbiltzaile-izena ezartzeko."
 
-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "Zerbitzua ez dago erabilgarri"
+msgstr "MySpaceIM - Erabiltzaile-Izena Eskuragarri"
 
 # c-format
-#, fuzzy
 msgid "This username is available. Would you like to set it?"
-msgstr ""
-"\"Whiteboard\" -era   %s mezua bidalia izan da. \"Whiteboard\" -a irekitzea "
-"nahi al duzu ?"
+msgstr "Eskuragarri dago erabiltzaile-izen hau. Ikusi nahi al duzu?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "EZARRI ONDOREN, EZIN DA ALDATU!"
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Erabiltzaile-Izen bat Ezarri"
 
-#, fuzzy
 msgid "This username is unavailable."
-msgstr "Gai honek ez du aurpegiera erabilgarririk"
+msgstr "Erabiltzaile-izen hau ez dago eskuragarri."
 
-#, fuzzy
 msgid "Please try another username:"
-msgstr "Idatzi pasahitz berria"
+msgstr "Beste erabiltzaile-izen batekin saiatu:"
+
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Erabiltzaile-izenik ez"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Erabiltzaile-izen bat sartu ezazu, eskuragarri dagoen egiaztatzeko:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -5959,120 +5841,117 @@ msgstr "Idatzi pasahitz berria"
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
+msgstr "Elektrikara"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k elektrikara eman dizu!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "%s elektrikaratzen..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr ""
+msgstr "Kolpekatu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "Erabiltzaileak blokeatu egin zaitu."
+msgstr "%s(e)k kolpekatu zaitu!"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "%s kolpekatzen..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
-msgstr "Gaia"
+msgstr "Erre"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has torched you!"
-msgstr "Erabiltzaileak blokeatu egin zaitu."
+msgstr "%s(e)k erre zaitu!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "%s erretzen..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "Muxukatu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k muxukatu zaitu!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "%s muxukatzen..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
+msgstr "Besarkatu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k besarkatu zaitu!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "%s besarkatzen..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "Eslovakiera"
+msgstr "Zaplaztekoa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k zaplaztatu zaitu!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "%s zaplaztatzen..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "Joan egin da"
+msgstr "Atximurkatu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s joan egin da."
+msgstr "%s(e)k atximurkatu zaitu!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Goosing %s..."
-msgstr "%s bilatzen"
+msgstr "%s atximurkatzen..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
 msgid "High-five"
-msgstr ""
+msgstr "Bostekoa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k bostekoa eman dizu!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "%s(e)ri bostekoa ematen..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
 msgid "Punk"
-msgstr ""
+msgstr "Adarra jo"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k adarra jo dizu!"
 
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "%s(r)i adarra jotzen..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6082,36 +5961,36 @@ msgstr ""
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr ""
+msgstr "Aho-puzkerra egin"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k aho-puzkerra egin dizu!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "%s(r)i aho-puzkerra egiten..."
 
 msgid "Required parameters not passed in"
-msgstr "Ez dira beharrezko parametrorik jaso"
+msgstr "Ez dira beharrezko parametroak jaso"
 
 msgid "Unable to write to network"
-msgstr "Ezin da sarean idatzi"
+msgstr "Ezin sarera idatzi"
 
 msgid "Unable to read from network"
-msgstr "Ezin da saretik irakurri"
+msgstr "Ezin saretik irakurri"
 
 msgid "Error communicating with server"
 msgstr "Errorea zerbitzariarekin komunikatzean"
 
 msgid "Conference not found"
-msgstr "Ez da konferentziarik aurkitu"
+msgstr "Ez konferentzia aurkitu"
 
 msgid "Conference does not exist"
-msgstr "Konferentzia ez dago"
+msgstr "Konferentzia ez da existitzen"
 
 msgid "A folder with that name already exists"
-msgstr "Direktorio hori badago"
+msgstr "Jadanik badago izen horretako direktorio bat"
 
 msgid "Not supported"
 msgstr "Ez dago onartuta"
@@ -6119,27 +5998,26 @@ msgstr "Ez dago onartuta"
 msgid "Password has expired"
 msgstr "Pasahitza iraungitu da"
 
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Okerreko pasahitza."
+msgstr "Pasahitz okerra"
 
 msgid "User not found"
-msgstr "Erabiltzailea ez da aurkitu"
+msgstr "Ez da erabiltzailea aurkitu"
 
 msgid "Account has been disabled"
-msgstr "Kontua desgaitu egin da"
+msgstr "Kontua ezgaitua izan da"
 
 msgid "The server could not access the directory"
-msgstr "Zerbitzaria ezin da direktoriora sarbidetu "
+msgstr "Zerbitzaria ezin izan da direktoriora sartu"
 
 msgid "Your system administrator has disabled this operation"
-msgstr "sistemako adminiztratzaileak eragiketa hau desgaitu du"
+msgstr "Sistema-adminiztratzaileak eragiketa hau ezgaitu du"
 
 msgid "The server is unavailable; try again later"
-msgstr "Zerbitzaria ez dago erabilgarri; saiatu berriro geroaro"
+msgstr "Zerbitzaria ez dago eskuragarri; saiatu berriro geroaro"
 
 msgid "Cannot add a contact to the same folder twice"
-msgstr "Ezin da kontaktu bat karpeta berdinean bi aldiz gehitu"
+msgstr "Ezin da kontaktu bat direktorio berdinera bi aldiz gehitu"
 
 msgid "Cannot add yourself"
 msgstr "Ezin duzu zure burua gehitu"
@@ -6147,137 +6025,127 @@ msgstr "Ezin duzu zure burua gehitu"
 msgid "Master archive is misconfigured"
 msgstr "Artxibo nagusia oker konfiguratuta dago"
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "Goitizen edo pasahitz okerra."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
-msgstr "Ezin izan da idatzi duzun ostalariko erabiltzaile-izena ezagutu"
+msgstr "Ezin da sartu duzun erabiltzaile-izenaren ostalaria identifikatu"
 
-#, fuzzy
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr "Kontua desgaitu egin da pasahitz baliogabe gehiegi idatzi dituzulako"
+msgstr "Pahitz oker gehiegi sartu dituzu, beraz, zure kontua ezgaitu da"
 
 msgid "You cannot add the same person twice to a conversation"
-msgstr "Ezin duzu pertsona bera birritan gehitu solasaldi batean"
+msgstr "Ezin duzu pertsona bera bi aldiz gehitu solasaldi batera"
 
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr "Baimendutako kontaktuen gehienezko kopurua gainditu duzu"
+msgstr "Baimendutako gehieneko kontaktu-kopurua gainditu duzu"
 
-#, fuzzy
 msgid "You have entered an incorrect username"
 msgstr "Erabiltzaile-izen baliogabea idatzi duzu"
 
 msgid "An error occurred while updating the directory"
-msgstr "Errore bat gertatu da direktorioa eguneratzean."
+msgstr "Errore bat gertatu da direktorioa eguneratzean"
 
 msgid "Incompatible protocol version"
-msgstr "Protokolo bertsio bateraezina"
+msgstr "Protokolo-bertsio bateraezina"
 
 msgid "The user has blocked you"
-msgstr "Erabiltzaileak blokeatu egin zaitu."
+msgstr "Erabiltzaileak blokeatu egin zaitu"
 
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-"Probako bertsio honek ez du uzten hamar erabiltzaile baino gehiago une "
-"berean konektatzea"
+"Probako bertsio honekin ezin dira aldi berean 10 erabiltzaile baina gehiago "
+"konektatu"
 
 msgid "The user is either offline or you are blocked"
-msgstr "Erabiltzailea lineaz kanpo dago edo blokeatuta zaude"
+msgstr "Erabiltzailea offline dago edo blokeatuta zaude"
 
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Errore ezezaguna: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Huts egin du saioa hastean (%s)."
+msgid "Unable to login: %s"
+msgstr "Ezin konektatu: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr ""
-"Ezin da mezua bidali. Ezin izan dira erabiltzailearen xehetasunak lortu (%s)."
+msgstr "Ezin mezua bidali. Ezin erabiltzailearen xehetasunak lortu (%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "Ezin da %s gehitu zure lagunen zerrendan (%s)."
+msgstr "Ezin %s gehitu zure lagun-zerrendara (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
 #, c-format
 msgid "Unable to send message (%s)."
-msgstr "Ezin da mezua bidali (%s)."
+msgstr "Ezin mezua bidali (%s)."
 
 #, c-format
 msgid "Unable to invite user (%s)."
-msgstr "Ezin da erabiltzaiea gonbidatu (%s)."
+msgstr "Ezin erabiltzaiea gonbidatu (%s)."
 
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr ""
-"Ezin zaio mezua bidali %s erabiltzaileari. Ezin izan da konferentzia sortu (%"
-"s)."
+msgstr "Ezin mezua bidali %s(r)i. Ezin izan da konferentzia sortu (%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "Ezin da mezua bidali. Ezin izan da konferentzia sortu (%s)."
+msgstr "Ezin mezua bidali. Ezin izan da konferentzia sortu (%s)."
 
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"Ezin izan da %s erabiltzailea eraman zerbitzariaren aldeko zerrendako %s "
-"karpetara. Errorea karpeta sortzean (%s)."
+"Ezin %s erabiltzailea mugitu zerbitzariko zerrendako %s direktoriora. "
+"Errorea karpeta sortzean (%s)."
 
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"Ezin da %s gehitu zure lagunen zerrendan. Errorea zerbitzariaren aldeko "
-"zerrendan karpeta sortzean (%s)."
+"Ezin %s gehitu zure lagun-zerrendara. Errorea zerbitzariako zerrendan "
+"direktorioa sortzean (%s)."
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
-msgstr "Ezin izan dira %s erabiltzailearen xehetasunak lortu (%s)."
+msgstr "Ezin %s erabiltzailearen xehetasunak lortu (%s)."
 
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr "Ezin da erabiltzailea gehitu zure pribatuen zerrendan (%s)."
+msgstr "Ezin erabiltzailea gehitu pribatu-zerrendara (%s)."
 
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "Ezin da %s gehitu zure ukatuen zerrendan (%s)."
+msgstr "Ezin %s gehitu ukatu-zerrendara (%s)."
 
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr "Ezin da %s gehitu zure baimenduen zerrendan (%s)."
+msgstr "Ezin %s gehitu baimendu-zerrendara (%s)."
 
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr "Ezin da %s kendu zure pribatuen zerrendan (%s)."
+msgstr "Ezin %s kendu pribatu-zerrendatik (%s)."
 
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr "Ezin da zerbitzariaren aldeko pribatutasunaren ezarpenak aldatu (%s)"
+msgstr "Ezin zerbitzariako pribatutasun-ezarpenak aldatu (%s)."
 
 #, c-format
 msgid "Unable to create conference (%s)."
-msgstr "Ezin da konferentzia sortu (%s)"
+msgstr "Ezin konferentzia sortu (%s)."
 
 msgid "Error communicating with server. Closing connection."
 msgstr "Errorea zerbitzariarekin komunikatzean. Konexioa ixten."
 
 msgid "Telephone Number"
-msgstr "Telefono zenbakia"
+msgstr "Telefono Zenbakia"
 
 msgid "Personal Title"
-msgstr "Titulu pertsonala"
+msgstr "Titulu Pertsonala"
 
 msgid "Mailstop"
 msgstr "Postontzia"
@@ -6296,14 +6164,11 @@ msgstr "Izen-deiturak"
 
 #, c-format
 msgid "GroupWise Conference %d"
-msgstr "GroupWise konferentzia %d"
+msgstr "GroupWise Konferentzia %d"
 
 msgid "Authenticating..."
 msgstr "Autentifikatzen..."
 
-msgid "Unable to connect to server."
-msgstr "Ezin da zerbitzariarekin konektatu."
-
 msgid "Waiting for response..."
 msgstr "Erantzunaren zain..."
 
@@ -6312,7 +6177,7 @@ msgid "%s has been invited to this conversation."
 msgstr "%s erabiltzailea solasaldira gonbidatua izan da."
 
 msgid "Invitation to Conversation"
-msgstr "Solasaldirako gonbita"
+msgstr "Solasaldirako Gonbita"
 
 #, c-format
 msgid ""
@@ -6320,37 +6185,28 @@ msgid ""
 "\n"
 "Sent: %s"
 msgstr ""
-"Honen gonbita: %s\n"
+"%s(r)en gobita\n"
 "\n"
 "Bidalita: %s"
 
 msgid "Would you like to join the conversation?"
-msgstr "Solasaldian sartu nahi duzu?"
-
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Deskonektatu egin zaituzte, beste lanpostu batetik hasi duzulako saioa."
+msgstr "Solasaldira batu nahi duzu?"
 
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
-"Badirudi %s lineaz kanpo dagoela, eta ez duela jaso zuk bidali berri diozun "
-"mezua."
+"Badirudi %s offline dagoela, eta ez duela jaso zuk bidali berri diozun mezua."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
-"Ezin da zerbitzariarekin konektatu. Sartu konektatu beharreko zerbitzariaren "
-"helbidea."
-
-msgid "Error. SSL support is not installed."
-msgstr "Errorea. SSL euskarria ez dago instalatuta."
+"Ezin zerbitzarira konektatu. Konektatu nahi duzun zerbitzariaren helbidea "
+"sartu ezazu."
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
-msgstr "Konferentzia hau itxi egin da, eta ezin da mezu gehiago bidali."
+msgstr "Konferentzia hau itxi egin da. Ezin da mezu gehiago bidali."
 
 #. *< type
 #. *< ui_requirement
@@ -6363,7 +6219,7 @@ msgstr "Konferentzia hau itxi egin da, eta ezin da mezu gehiago bidali."
 #. *  summary
 #. *  description
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Novell GroupWise mezulariaren protokoloaren plugin-a"
+msgstr "Novell GroupWise Mezulari-Protokoloaren Plugin-a"
 
 msgid "Server address"
 msgstr "Zerbitzariaren helbidea"
@@ -6371,27 +6227,33 @@ msgstr "Zerbitzariaren helbidea"
 msgid "Server port"
 msgstr "Zerbitzariaren ataka"
 
-#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Espero ez zen erantzuna jaso da "
+
+#. username connecting too frequently
+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 ""
+"Maizegi konektatu eta deskonektatu zara. Hamar minutu itxaron itzazu berriro "
+"saiatu aurretik. Saiatzen jarraituz gero, agian gehiago ere itxaron beharko "
+"duzu."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Errorea eskaeran."
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL-k ez du zure pantaila-izena hemen autentifikatzea onartzen"
+
 msgid "Could not join chat room"
-msgstr "Ezin izan da konektatu"
+msgstr "Ezin gelara batu"
 
-#, fuzzy
 msgid "Invalid chat room name"
 msgstr "Gela-izen baliogabea"
 
-#, fuzzy
-msgid "Server closed the connection."
-msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Zerbitzaritik deskonektatuta zaude."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
-msgstr "Ezin da zerbitzariarekiko SSL konexiorik ezarri."
+msgid "Received invalid data on connection with server"
+msgstr "Datu baliogabeak jaso dira zerbotzariarekin konektatzean"
 
 #. *< type
 #. *< ui_requirement
@@ -6403,12 +6265,11 @@ msgstr "Ezin da zerbitzariarekiko SSL konexiorik ezarri."
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ protokoloaren plugin-a"
+msgstr "AIM Protokolo-Plugina"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "ICQ UIN..."
 
 #. *< type
 #. *< ui_requirement
@@ -6420,47 +6281,44 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "ICQ Protocol Plugin"
-msgstr "IRC protokoloaren plugin-a"
+msgstr "ICQ Protokolo-Plugina"
 
 msgid "Encoding"
 msgstr "Kodeketa"
 
-#, fuzzy
 msgid "The remote user has closed the connection."
-msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
+msgstr "Konexioa itxi du urruneko erabiltzaileak."
 
-#, fuzzy
 msgid "The remote user has declined your request."
-msgstr "Erabiltzaileak blokeatu egin zaitu."
+msgstr "Zure eskaria ezetsi du urruneko erabiltzaileak."
 
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
+msgstr "Urruneko erabiltzailearekiko konexioa galduta:<br>%s"
 
 msgid "Received invalid data on connection with remote user."
-msgstr ""
+msgstr "Datu baliogabeak jaso dira urruneko erabiltzailearekiko konexioan."
 
-#, fuzzy
-msgid "Could not establish a connection with the remote user."
-msgstr ""
-"Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al "
-"dago ?"
+msgid "Unable to establish a connection with the remote user."
+msgstr "Ezin konexioa ezarri urruneko erabiltzailearekin."
 
-#, fuzzy
 msgid "Direct IM established"
-msgstr "%s(r)ekiko zuzeneko BMa ezarri da"
+msgstr "Zuzeneko IMa ezarrita"
 
 #, c-format
 msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
 msgstr ""
+"%s(e)k %s fitxategia bidali nahi izan dizu, baina gehienez %s dauzkaten "
+"fitxategiak onartzen ditugu Zuzeneko IMaren bidez. Fitxategi-transferentzia "
+"erabili ezazu.\n"
 
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
+"%s fitxategiak %s dauzka, hau da, %s tamaina maximoa baina handiagoa da."
 
 msgid "Invalid error"
 msgstr "Errore baliogabea"
@@ -6475,7 +6333,7 @@ msgid "Rate to client"
 msgstr "Bezeroarekiko tasa"
 
 msgid "Service unavailable"
-msgstr "Zerbitzua ez dago erabilgarri"
+msgstr "Zerbitzua eskuragaitz"
 
 msgid "Service not defined"
 msgstr "Zerbitzua ez dago zehaztuta"
@@ -6505,34 +6363,34 @@ msgid "Busted SNAC payload"
 msgstr "SNAC karga hondatuta"
 
 msgid "Insufficient rights"
-msgstr "Ez duzu nahikoa eskubide"
+msgstr "Eskubide nahikorik ez"
 
 msgid "In local permit/deny"
-msgstr "Lokalean onartu/ukatu"
+msgstr "Lokalki onartu/ukatu"
 
 msgid "Warning level too high (sender)"
-msgstr ""
+msgstr "Abisu-maila  altuegia (igorlea)"
 
 msgid "Warning level too high (receiver)"
-msgstr ""
+msgstr "Abisu-maila altuegia (hartzailea)"
 
 msgid "User temporarily unavailable"
-msgstr "Erabiltzailea ez dago erabilgarri une honetan"
+msgstr "Erabiltzailea eskuragaitz aldi baterako"
 
 msgid "No match"
-msgstr "Ez dago bat datorrenik"
+msgstr "Kointzidentziarik ez"
 
 msgid "List overflow"
-msgstr "Zerrendak gainezka egin du"
+msgstr "Zerrendaren gainezkatzea"
 
 msgid "Request ambiguous"
-msgstr "Eskaera anbiguoa da"
+msgstr "Eskaera anbiguoa"
 
 msgid "Queue full"
-msgstr "Ilara beteta dago"
+msgstr "Ilara beteta"
 
 msgid "Not while on AOL"
-msgstr "Ez AOLn zauden bitartean"
+msgstr "Ez AOLn egon bitartean"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -6540,27 +6398,30 @@ msgid ""
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
+"(Errorea mezu hau jasotzean.  Agian, espero zena ez den beste kodeketa bat "
+"darabil zure lagunak.  Zein kodeketa darabilen badakizu, zure AIM/ICQ "
+"kontuaren aukera aurreratuetan zehaztu dezakezu.)"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"(Errore bat gertatu da mezu hau jasotzean.  Baliteke hitzegiten ari zaren "
-"erabiltzaileak akasdun bezeroa edukitzea"
+"((Errorea mezu hau jasotzean.  Kodeketa ezberdinak hautatu dituzue zuk eta %s"
+"(e)k, edo %s(e)k bezero akatsduna dauka.)"
 
 #. Label
 msgid "Buddy Icon"
-msgstr "Lagunaren ikonoa"
+msgstr "Lagun-Ikonoa"
 
 msgid "Voice"
 msgstr "Ahotsa"
 
 msgid "AIM Direct IM"
-msgstr "AIM zuzeneko berehalako mezua"
+msgstr "AIM Direct IM"
 
 msgid "Get File"
-msgstr "Hartu fitxategia"
+msgstr "Fitxategia Hartu"
 
 msgid "Games"
 msgstr "Jokoak"
@@ -6569,13 +6430,13 @@ msgid "Add-Ins"
 msgstr "Osagarriak"
 
 msgid "Send Buddy List"
-msgstr "Bidali lagunen zerrenda"
+msgstr "Lagun-Zerrenda Bidali"
 
 msgid "ICQ Direct Connect"
-msgstr "ICQ zuzeneko konexioa"
+msgstr "ICQ Zuzeneko Konexioa"
 
 msgid "AP User"
-msgstr "AP erabiltzailea"
+msgstr "AP Erabiltzailea"
 
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
@@ -6584,13 +6445,13 @@ msgid "Nihilist"
 msgstr "Nihilista"
 
 msgid "ICQ Server Relay"
-msgstr "ICQ zerbitzariaren errelea"
+msgstr "ICQ Server Relay"
 
 msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 zaharra"
+msgstr "ICQ UTF8 Zaharra"
 
 msgid "Trillian Encryption"
-msgstr "Trillian enkriptatzea"
+msgstr "Trillian Enkripzioa"
 
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
@@ -6599,68 +6460,57 @@ msgid "Hiptop"
 msgstr "Hiptop"
 
 msgid "Security Enabled"
-msgstr "Segurtasuna gaituta"
+msgstr "Segurtasuna Gaituta"
 
 msgid "Video Chat"
-msgstr "Bideo-berriketa"
+msgstr "Bideo-Berriketa"
 
 msgid "iChat AV"
 msgstr "iChat AV"
 
 msgid "Live Video"
-msgstr "Zuzeneko bideoa"
+msgstr "Zuzeneko Bideoa"
 
 msgid "Camera"
 msgstr "Kamera"
 
-#, fuzzy
 msgid "Screen Sharing"
-msgstr "Pantaila-izena"
+msgstr "Pantaila-Partekatzea"
 
-#, c-format
 msgid "Free For Chat"
-msgstr "Berriketarako libre"
+msgstr "Berriketarako Libre"
 
-#, c-format
 msgid "Not Available"
-msgstr "Ez erabilgarri"
+msgstr "Eskuragaitz"
 
-#, c-format
 msgid "Occupied"
 msgstr "Okupatuta"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Web-ean"
 
-#, c-format
 msgid "Invisible"
-msgstr "Ikusezin"
+msgstr "Ikustezin"
 
 msgid "IP Address"
-msgstr "IP helbidea"
+msgstr "IP Helbidea"
 
 msgid "Warning Level"
-msgstr "Abisu-maila"
+msgstr "Abisu-Maila"
 
 msgid "Buddy Comment"
-msgstr "Lagunen iruzkinak"
+msgstr "Lagun-Iruzkina"
 
-#, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr "Ezin izan da konektatu transferentzia egiteko."
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr "Ezin autentifikazio-zerbitzarira konektatu: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Huts egin du zerbitzariarekin konektatzean."
+#, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Ezin BOS zerbitzarira konektatu: %s"
 
-#, fuzzy
 msgid "Username sent"
-msgstr "Ez dago izenik"
+msgstr "Erabiltzaile-izena bidalia"
 
 msgid "Connection established, cookie sent"
 msgstr "Konexioa ezarri da, eta cookie-a bidali da"
@@ -6669,113 +6519,83 @@ msgstr "Konexioa ezarri da, eta cookie-a bidali da"
 msgid "Finalizing connection"
 msgstr "Konexioa amaitzen"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Ezin da sartu: Ezin izan da saioa hasi %s gisa, pantaila-izena ez delako "
-"baliozkoa. Pantaila-izenek letra batekin hasi behar dute, eta letrak, "
-"zenbakiak eta zuriuneak bakarrik eduki, edo bestela zenbakiak bakarrik eduki "
-"behar dituzte."
+"Ezin %s bezala konektatu, erabiltzaile-izena ez delako baliozkoa.  "
+"Erabiltzaile-izenek baliozko helbide elektroniko izan behar dute, edo letra "
+"batekin hasi eta letrak, zenbakiak eta zuriuneak bakarrik eduki, edo bestela "
+"zenbakiak bakarrik."
 
-#. Unregistered screen name
-#. uid is not exist
-#, fuzzy
-msgid "Invalid username."
-msgstr "Erabiltzaile-izena ez da baliozkoa"
-
-msgid "Incorrect password."
-msgstr "Okerreko pasahitza."
-
-#. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Zure kontua esekita dago une honetan."
-
-#. service temporarily unavailable
-msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "AOL berehalako mezularitza-zerbitzua ez dago erabilgarri une honetan."
-
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
-"Maizegi konektatzen eta deskonektatzen aritu zara. Itxaron hamar minutu, eta "
-"saiatu berriro. Saiatzen jarraituz gero, agian gehiago ere itxaron beharko "
-"duzu."
+"Laster deskonektatuko zaituzte agian.  Hala bada, eguneraketak bilatu "
+"itzazu: %s"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Zuk daukazun bezero-bertsioa zaharregia da; bertsio-berritu %s gunean"
+msgid "Unable to get a valid AIM login hash."
+msgstr "Ezin baliozko AIM-konexio hash-a eskuratu."
 
-msgid "Could Not Connect"
-msgstr "Ezin izan da konektatu"
+msgid "Unable to get a valid login hash."
+msgstr "Ezin baliozko konexio-hash-a eskuratu."
 
 msgid "Received authorization"
 msgstr "Baimena jaso da"
 
-msgid "The SecurID key entered is invalid."
-msgstr "Sartu duzun SecurID gakoa ez da baliozkoa"
-
-msgid "Enter SecurID"
-msgstr "Sartu SecurID-a"
-
-msgid "Enter the 6 digit number from the digital display."
-msgstr "Sartu pantailan agertzsen den 6 digitodun zenbakia "
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Erabiltzaile-izena ez da existitzen"
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
+#. Suspended account
 #, fuzzy
-msgid "_OK"
-msgstr "Ados"
+msgid "Your account is currently suspended"
+msgstr "Zure kontua suspendituta dago"
 
+#. service temporarily unavailable
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "AOL Istanteko Mezularitza zerbitzua eskuragaitz dago une honetan."
+
+#. client too old
 #, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Zure bezero-bertsioa zaharregia da. %s gunean berritu dezakezu"
+
+#. IP address connecting too frequently
 msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"Laster deskonektatuta greatzeko arriskua duzu. TOC erabil dezakezu arazoa "
-"konpondu arte. Bilatu eguneratzeak %s gunean."
+"Maizegi konektatu/deskonektatu zara. Minutu bat itxaron ezazu berriro saiatu "
+"aurretik. Saiatzen jarraituz gero, agian gehiago itxaron beharko duzu."
 
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin-ek ezin du lortu AIM saio-hasierako hash baliozkorik."
+msgid "The SecurID key entered is invalid"
+msgstr "Baliogabea da sartutako SecurID-gakoa"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Laster deskonektatuta greatzeko arriskua duzu. TOC erabil dezakezu arazoa "
-"konpondu arte. Bilatu eguneratzeak %s gunean."
+msgid "Enter SecurID"
+msgstr "SecurID-a Sartu"
 
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin-ek ezin du lortu saio-hasierako hash baliozkorik."
+msgid "Enter the 6 digit number from the digital display."
+msgstr "Pantaila digitaleko zenbakia (6 digito) sartu ezazu."
 
 msgid "Password sent"
 msgstr "Pasahitza bidali da"
 
-#, fuzzy
 msgid "Unable to initialize connection"
-msgstr "Ezin da konexio sortu."
+msgstr "Ezin konexioa hasiarazi"
 
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Emango didazu baimena nire lagunen zerrendan gehi zaitzadan?"
-
-msgid "Authorization Request Message:"
-msgstr "Baimena eskatzeko mezua:"
-
-msgid "Please authorize me!"
-msgstr "Emadazu baimena!"
+msgstr "Zu nire lagun-zerrendara gehitzeko baimena emaidazu, mesedez."
 
 msgid "No reason given."
 msgstr "Ez da arrazoirik eman."
 
 msgid "Authorization Denied Message:"
-msgstr "Baimena ezesteko mezua:"
+msgstr "Baimena Ezesteko Mezua:"
 
 #, c-format
 msgid ""
@@ -6783,7 +6603,7 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"%u erabiltzaileak ukatu egin dizu bera zure lagunen zerrendan gehitzeko "
+"%u erabiltzaileak ukatu egin dizu bera zure lagun-zerrendara gehitzeko "
 "baimena. Arrazoia:\n"
 "%s"
 
@@ -6794,7 +6614,7 @@ msgstr "ICQ baimena ukatu da."
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
-"%u erabiltzaileak baimena eman dizu bera zure lagunen zerrendan gehitzeko."
+"%u erabiltzaileak baimena eman dizu bera zure lagun-zerrendara gehitzeko."
 
 #, c-format
 msgid ""
@@ -6815,7 +6635,7 @@ msgid ""
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"ICQ orri bat jaso duzu\n"
+"ICQ-orri bat jaso duzu\n"
 "\n"
 "Bidaltzailea: %s [%s]\n"
 "%s"
@@ -6828,17 +6648,17 @@ msgid ""
 "Message is:\n"
 "%s"
 msgstr ""
-"%s erabiltzaileak ICQ mezu bat bidali dizu [%s]\n"
+"ICQ e-posta jaso duzu: %s [%s]\n"
 "\n"
 "Mezua:\n"
 "%s"
 
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "%u erabiltzaileak lagun bat bidali dizu: %s (%s)"
+msgstr "%u ICQ-erabiltzaileak lagun bat bidali dizu: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Lagun hori zure lagunen zerrendan gehitu nahi duzu?"
+msgstr "Lagun hori zure lagun-zerrendara gehitu nahi duzu?"
 
 msgid "_Add"
 msgstr "_Gehitu"
@@ -6849,62 +6669,50 @@ msgstr "_Ukatu"
 #, 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] "%2$s erabiltzailearen mezu %1$hu ez zaizu heldu, baliogabea delako."
-msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, baliogabeak direlako."
+msgstr[0] "Mezu %hu galdu duzu (%s(r)enak), baliogabea zelako."
+msgstr[1] "%hu mezu galdu dituzu (%s(r)enak), baliogabeak zirelako."
 
 #, 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] "%2$s erabiltzailearen mezu %1$hu ez zaizu heldu, handiegia delako."
-msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, handiegiak direlako."
+msgstr[0] "Mezu %hu galdu duzu (%s(r)ena), luzeegia zelako."
+msgstr[1] "%hu mezu galdu dituzu (%s(r)enak), luzeegiak zirelako."
 
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] ""
-"%2$s erabiltzailearen mezu %1$hu ez zaizu heldu, abiadura-muga gainditu "
-"delako."
-msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, abiadura-muga gainditu "
-"delako."
+msgstr[0] "Mezu %hu galdu duzu (%s(r)ena), tasa-muga gainditu delako."
+msgstr[1] "%hu mezu galdu dituzu (%s(r)enak), tasa-muga gainditu delako."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] ""
-"%2$s erabiltzailearen mezu %1$hu ez zaizu heldu, bidaltzailea gaiztoegia "
-"delako."
-msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, bidaltzailea gaiztoegia "
-"delako."
+msgstr[0] "Mezu %hu galdu duzu, %s(r)en abisu-maila altuegia delako."
+msgstr[1] "%hu mezu galdu dituzu, %s(r)en abisu-maila altuegia delako."
 
-#, fuzzy, c-format
+#, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
 msgstr[0] ""
-"%2$s erabiltzailearen mezu %1$hu ez zaizu heldu, gaiztoegia zarelako."
+"Mezu %hu galdu duzu (%s(e)k bidalia), zure abisu-maila altuegia delako."
 msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, gaiztoegia zarelako."
+"%hu mezu galdu dituzu (%s(e)k bidaliak), zure abisu-maila altuegia delako."
 
 #, 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] ""
-"%2$s erabiltzailearen mezu %1$hu ez zaizu heldu. Arrazoia ez da ezaguna."
-msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu. Arrazoia ez da ezaguna."
+msgstr[0] "Mezu %hu galdu duzu (%s(r)ena), arrazoi ezezagun baten erruz."
+msgstr[1] "%hu mezu galdu dituzu (%s(r)enak), arrazoi ezezagun baten erruz."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
-msgstr "Ezin da mezua bidali: %s"
+msgstr "Ezin mezua bidali: %s"
 
 msgid "Unknown reason."
 msgstr "Arrazoi ezezaguna."
@@ -6915,52 +6723,57 @@ msgstr "Ezin zaio mezua bidali %s(r)i:"
 
 #, c-format
 msgid "User information not available: %s"
-msgstr "Erabiltzailearen datuak ez daude erabilgarri: %s"
+msgstr "Erabiltzaile-datuak ez daude eskuragarri: %s"
 
 msgid "Online Since"
-msgstr "Noiztik linean"
+msgstr "Noiztik Online"
 
 msgid "Member Since"
-msgstr "Noiztik kidea"
+msgstr "Noiztik Kidea"
+
+msgid "Capabilities"
+msgstr "Gaitasunak"
+
+msgid "Profile"
+msgstr "Profila"
 
 msgid "Your AIM connection may be lost."
-msgstr "Beharbada AIM konexioa galdu egingo zen."
+msgstr "Beharbada AIM konexioa galdu duzu."
 
 #. The conversion failed!
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
-"[Ezin da erabiltzaile honen mezu bat erakutsi, karaktere baliogabeak "
-"dituelako.]"
+"[Ezin erabiltzaile honen mezu bat erakutsi, karaktere baliogabeak dituelako.]"
 
 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 ""
-"Egiten saiatu zaren azken ekintza ezin izan da egin abiadura-muga gainditu "
-"duzulako. Itxaron 10 segundo, eta saiatu berriro."
+"Egiten saiatu zaren azken ekintza ezin izan da burutu, abiadura-muga "
+"gainditu duzulako. Itxaron 10 segundo, eta saiatu berriro."
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s berriketa-gelatik deskonektatu egin zaituzte."
 
 msgid "Mobile Phone"
-msgstr "Telefono mugikorra"
+msgstr "Telefono Mugikorra"
 
 msgid "Personal Web Page"
-msgstr "Web orri pertsonala"
+msgstr "Webgune Pertsonala"
 
 #. aim_userinfo_t
 #. strip_html_tags
 msgid "Additional Information"
-msgstr "Informazio osagarria"
+msgstr "Informazio Gehigarria"
 
 msgid "Zip Code"
-msgstr "Posta-kodea"
+msgstr "Posta-Kodea"
 
 msgid "Work Information"
-msgstr "Laneko datuak"
+msgstr "Laneko Datuak"
 
 msgid "Division"
 msgstr "Saila"
@@ -6969,107 +6782,106 @@ msgid "Position"
 msgstr "Kargua"
 
 msgid "Web Page"
-msgstr "Web orria"
+msgstr "Webgunea"
 
 msgid "Pop-Up Message"
-msgstr "Pop-up mezua"
+msgstr "Pop-Up Mezua"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "Ondoko pantaila-izenak %s erabiltzailearekin erlazionatuak daude"
-msgstr[1] "Ondoko pantaila-izenak %s erabiltzailearekin erlazionatuak daude"
+msgstr[0] "%s(r)ekin asoziatuta dago ondorengo erabiltzaile-izen hau"
+msgstr[1] "%s(r)ekin asoziatuta daude ondorengo erabiltzaile-izen hauek"
 
 #, c-format
 msgid "No results found for email address %s"
-msgstr "Emaitzarik ez %s helbide elektronikoarentzat "
+msgstr "Emaitzik ez %s e-postarentzat"
 
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "%s berrestea eskatzeko posta-mezu bat jaso beharko zenuke. "
+msgstr "%s berrestea eskatzen duen posta-mezu bat jaso beharko zenuke. "
 
 msgid "Account Confirmation Requested"
-msgstr "Kontuaren berrespena eskatu da"
+msgstr "Kontuaren Berrespena Eskatuta"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
-"0x%04x errorea: ezin da formateatu pantaila-izena, eskatutako pantaila-izena "
-"eta jatorrizkoa bat ez datozelako."
+"0x%04x errorea: Ezin da erabiltzaile-izena formateatu, eskatutako izena ez "
+"delako jatorrizkoaren berdina."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
-"0x%04x errorea: ezin da formateatu pantaila-izena, eskatutako pantaila-izena "
-"Balio okerra du."
+"0x%04x errorea: Ezin da erabiltzaile-izena formateatu, baliogabea delako."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr ""
-"0x%04x errorea: ezin da formateatu pantaila-izena, eskatutako pantaila-izena "
+"0x%04x errorea: Ezin da erabiltzaile-izena formateatu, eskatutako izena "
 "luzeegia delako."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"0x%04x errorea: ezin da helbide elektronikoa aldatu,  lehendik "
-"badagoelakeskaera bat zain pantaila-izen honekin."
+"0x%04x errorea: Ezin da helbide elektronikoa aldatu, jadanik badagoelako "
+"erabiltzaile-izen honentzako beste eskaera bat."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbideak "
-"pantaila-izen gehiegi dituelako erlazionatuak."
+"0x%04x errorea: Ezin da helbide elektronikoa aldatu, emandako helbideak "
+"erabiltzaile-izen gehiegi dituelako asoziatuta."
 
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbidea ez "
-"delako baliozkoa. "
+"0x%04x errorea: Ezin da helbide elektronikoa aldatu, emandako helbidea ez "
+"delako baliozkoa."
 
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr "0x%04x errorea: errore ezezaguna."
+msgstr "0x%04x errorea: Errore ezezaguna."
 
 msgid "Error Changing Account Info"
-msgstr "Errorea kontuaren datuak aldatzean"
+msgstr "Errorea Kontuaren Datuak Aldatzean"
 
 #, c-format
 msgid "The email address for %s is %s"
-msgstr "%s erabiltzailearen helbide elektronikoa %s da "
+msgstr "%s erabiltzailearen helbide elektronikoa %s da"
 
 msgid "Account Info"
-msgstr "Kontuari buruzko informazioa"
+msgstr "Kontuaren Informazioa"
 
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"Zure BM irudia ez da bidali. 'Zuzeneko Konexioa'  behar duzu BM irudiak "
+"Ez da zure IM Irudia bidali. Zuzeneko Konexioa behar duzu IM Irudiak "
 "bidaltzeko."
 
 msgid "Unable to set AIM profile."
-msgstr "Ezin da AIM profila ezarri."
+msgstr "Ezin AIM profila ezarri."
 
 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 ""
-"Beharbada zure profila ezartzea eskatuko zenuen saio-hasiera osatu aurretik. "
-"Profilak ezarri gabe jarraitzen du. Saiatu berriro, ondo konektatuta "
+"Beharbada, saio-hasiera osatu aurretik saiatu zara zure profila ezartzen. "
+"Profilak ezarri gabe jarraitzen du; saiatu berriro, erabat konektatuta "
 "zaudenean."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -7077,14 +6889,13 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"Profilaren gehienezko luzera (%d byte) gainditu da. Pidgin-ek trunkatu egin du."
-msgstr[1] ""
-"Profilaren gehienezko luzera (%d byte) gainditu da. Pidgin-ek trunkatu egin du."
+"Byte %d(e)ko profila-luzeera maximoa gainditu da.  Laburtua izan da."
+msgstr[1] "%d byteko profila-luzeera maximoa gainditu da.  Laburtua izan da."
 
 msgid "Profile too long."
-msgstr "Profila luzeegia da."
+msgstr "Profila luzeegia."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -7092,79 +6903,74 @@ msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"Kanpoan zaudeneko mezuaren gehienezko luzera (%d byte) gainditu da. Pidgin-ek "
-"trunkatu egin du."
+"Kanpoan zaudeneko mezuaren gehienezko luzera (%d byte) gainditu da. Laburtua "
+"izan da."
 msgstr[1] ""
-"Kanpoan zaudeneko mezuaren gehienezko luzera (%d byte) gainditu da. Pidgin-ek "
-"trunkatu egin du."
+"Kanpoan zaudeneko mezuaren gehienezko luzera (%d byte) gainditu da. Laburtua "
+"izan da."
 
 msgid "Away message too long."
-msgstr "Kanpoan zaudeneko mezua luzeegia da."
+msgstr "Luzeegia da Kanpoan Zaudeneko Mezua."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Ezin da %s laguna gehitu, pantaila-izena ez delako baliozkoa. Pantaila-"
-"izenek letra batekin hasi behar dute, eta letrak, zenbakiak eta zuriuneak "
-"bakarrik eduki, edo bestela zenbakiak bakarrik."
-
-#, fuzzy
-msgid "Unable to Add"
-msgstr "Ezin da gehitu"
+"Ezin %s laguna gehitu, erabiltzaile-izena ez delako baliozkoa.  Erabiltzaile-"
+"izenek baliozko helbide elektroniko izan behar dute, edo letra batekin hasi "
+"eta letrak, zenbakiak eta zuriuneak bakarrik eduki, edo bestela zenbakiak "
+"bakarrik."
 
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "Ezin da eskuratu lagunen zerrenda"
+msgstr "Ezin Lagun-Zerrenda Eskuratu"
 
-#, fuzzy
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
 msgstr ""
-"Pidgin-ek ezin izan du eskuratu zure lagunen zerrenda AIM zerbitzarietatik. "
-"Zure lagunen zerrenda ez da galdu, eta ordu batzuk barru erabilgarri egongo "
-"da seguru asko."
+"Oraintxe AIM-zerbitzariak ez dira zure lagun-zerrenda bidaltzeko gai.  Zure "
+"lagun-zerrenda ez da galdu, eta ziurrenik minutu batzutan izango duzu "
+"eskurragarri."
 
 msgid "Orphans"
 msgstr "Umezurtzak"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"Ezin izan da %s laguna gehitu, lagun gehiegi daudelako zure lagunen "
-"zerrendan. Kendu baten bat, eta saiatu berriro."
+"Ezin %s laguna gehitu, lagun gehiegi dauzkazulako zure lagun-zerrendan.  "
+"Batenbat kendu ezazu, eta berriro saiatu zaitez."
 
 msgid "(no name)"
-msgstr "(ez dago izenik)"
+msgstr "(izenik ez)"
 
-#, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr "Komandoak huts egin du arrazoi ezezagunen batengatik."
+#, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "Ezin %s laguna gehitu, arrazoi ezezagun baten erruz."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
 msgstr ""
-"%s erabiltzaileak baimena eman dizu zure burua bere lagun-zerrendan "
-"gehitzeko. Zuk bera gehitu nahi duzu?"
+"%s erabiltzaileak baimena eman dizu bera zure lagun-zerrendara gehitzeko. "
+"Lagun hau gehitu nahi al duzu?"
 
 msgid "Authorization Given"
-msgstr "Baimena eman da"
+msgstr "Baimena Emana"
 
 #. Granted
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
-"%s erabiltzaileak baimena eman dizu bera zure lagun-zerrendan gehitzeko."
+"%s erabiltzaileak baimena eman dizu bera zure lagun-zerrendara gehitzeko."
 
 msgid "Authorization Granted"
-msgstr "Baimena eman da"
+msgstr "Baimena Emana"
 
 #. Denied
 #, c-format
@@ -7173,83 +6979,81 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"%s erabiltzaileak ukatu dizu bera zure lagun-zerrendan gehitzeko eskaera. "
+"%s erabiltzaileak ukatu dizu bera zure lagun-zerrendara gehitzeko eskaera. "
 "Arrazoia:\n"
 "%s"
 
 msgid "Authorization Denied"
-msgstr "Baimena ukatu da"
+msgstr "Baimena Ukatuta"
 
 msgid "_Exchange:"
 msgstr "_Trukea:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"Zure IM irudia ez da bidali. Ezin duzu IM irudirik bidali AIM berriketetan."
+"Ez da zure IM Irudia bidali. Ezin duzu IM Irudirik bidali AIM berriketetara."
 
 msgid "iTunes Music Store Link"
-msgstr ""
+msgstr "iTunes Musika-Denda Esteka"
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "Lagunaren iruzkinak %s(r)entzako"
+msgstr "Lagun-Iruzkina %s(r)entzako"
 
 msgid "Buddy Comment:"
-msgstr "Lagunaren iruzkina:"
+msgstr "Lagun-Iruzkina:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "%s(r)ekiko zuzeneko BMko konexio bat irekitzea hautatu duzu."
+msgstr "%s(r)ekin zuzeneko IM-konexio bat irekitzea hautatu duzu."
 
-#, fuzzy
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
-"Zure IP helbidea ikusiko denez, arriskutsua izan daiteke pribatutasunaren "
-"aldetik. Jarraitu nahi duzu?"
+"Zure IP helbidea erakutsiko denez, segurtasun arazo bezala har liteke.  "
+"Jarraitu nahi duzu?"
 
-#, fuzzy
 msgid "C_onnect"
-msgstr "Konektatu"
+msgstr "_Konektatu"
 
-#, fuzzy
 msgid "Get AIM Info"
-msgstr "Hartu informazioa"
+msgstr "AIM-Informazioa Eskuratu"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "Editatu lagunaren iruzkina"
+msgstr "Lagun-Iruzkina Editatu"
 
 msgid "Get Status Msg"
-msgstr "Hartu egoera-mezua"
+msgstr "Egoera-Mezua Eskuratu"
 
 msgid "Direct IM"
-msgstr "Zuzeneko BM"
+msgstr "Zuzeneko IM"
 
 msgid "Re-request Authorization"
-msgstr "Eskatu baimena berriro"
+msgstr "Baimena Berriro Eskatu"
 
 msgid "Require authorization"
-msgstr "Baimena beharrezkoa"
+msgstr "Baimena eskatu"
 
+#, fuzzy
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 "Web kontuan izan ( hau ahalbidetzen baduzu Zaborra jasotzea gerta daiteke) "
 
 msgid "ICQ Privacy Options"
-msgstr "ICQ pribatisasun ezarpenak"
+msgstr "ICQ Pribatutasun Ezarpenak"
 
 msgid "The new formatting is invalid."
 msgstr "Formatu berria ez da baliozkoa."
 
-#, fuzzy
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
-"Pantaila-izenen formatuan maiuskulak eta minuskulak eta zuriuneak bakarrik "
-"alda daitezke."
+"Erabiltzaile-izenak formateatzean maiuskula/minuskulak eta hutsuneak "
+"bakarrik aldatu ditzake."
 
 msgid "Change Address To:"
-msgstr "Aldatu helbidea eta jarri hau:"
+msgstr "Helbide Hau Ezarri:"
 
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ez zaude baimenaren zain</i>"
@@ -7261,80 +7065,80 @@ msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Lagun hauei baimena berriro eskatzeko, egin klik eskuin-botoiarekin lagunen "
-"gainean, eta hautatu \"Eskatu baimena berriro.\""
+"Lagun hauei baimena berriro eskatzeko, eskuin-klik egizu lagunen gainean eta "
+"\"Baimena Berriro Eskatu\" hautatu ezazu."
 
 msgid "Find Buddy by Email"
-msgstr "Bilatu laguna helbide elektronikoaren arabera "
+msgstr "E-posta bidez Bilatu Laguna"
 
 msgid "Search for a buddy by email address"
-msgstr "Bilatu laguna helbide elektronikoaren arabera"
+msgstr "Helbide elektronikoaren bidez bilatu lagun bat"
 
 msgid "Type the email address of the buddy you are searching for."
-msgstr "Idatzi aurkitu nahi duzun lagunaren helbide elektronikoa."
+msgstr "Bilatu nahi duzun lagunaren helbide elektronikoa idatz ezazu."
 
-#, fuzzy
 msgid "_Search"
-msgstr "Bilatu"
+msgstr "_Bilatu"
 
-#, fuzzy
 msgid "Set User Info (web)..."
-msgstr "Ezarri erabiltzailearen datuak (URLa)..."
+msgstr "Erabiltzaile-Informazioa Ezarri (web)..."
 
-#, fuzzy
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
-msgstr "Aldatu pasahitza (URLa)"
+msgstr "Pasahitza Aldatu (web)"
 
-#, fuzzy
 msgid "Configure IM Forwarding (web)"
-msgstr "Konfiguratu BMen birbidalketa (URLa)"
+msgstr "IM-Birbidalketa Konfiguratu (URLa)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "Ezarri pribatitasun aukerak:"
+msgstr "Pribatutasun Aukerak Ezarri..."
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr "Berretsi kontua"
+msgstr "Kontua Berretsi"
 
-#, fuzzy
 msgid "Display Currently Registered Email Address"
-msgstr "Bistaratu une honetan erregistratuta dagoen helbidea"
+msgstr "Orain Erregistratuta Dagoen Helbidea Elektronikoa Erakutsi"
 
-#, fuzzy
 msgid "Change Currently Registered Email Address..."
-msgstr "Aldatu une honetan erregistratuta dagoen helbidea..."
+msgstr "Orain Erregistratuta Dagoen Helbidea Elektronikoa Erakutsi..."
 
 msgid "Show Buddies Awaiting Authorization"
-msgstr "Bistaratu baimenaren zain dauden lagunak"
+msgstr "Baimenaren Zain dauden Lagunak Bistaratu"
 
-#, fuzzy
 msgid "Search for Buddy by Email Address..."
-msgstr "Bilatu laguna helbide elektronikoaren arabera... "
+msgstr "Helbide Elektronikoaren bidez Bilatu Laguna..."
 
 msgid "Search for Buddy by Information"
-msgstr "Bilatu laguna informazioaren arabera..."
+msgstr "Informazioaren bidez Bilatu Laguna"
+
+msgid "Use clientLogin"
+msgstr ""
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
+"AIM/ICQ proxy-zerbitzariak erabili beti\n"
+"fitxategi-transferentzi eta zuzeneko IMrako\n"
+"(geldoagoa da,baina ez du IP-helbidea erakusten)"
 
 msgid "Allow multiple simultaneous logins"
-msgstr ""
+msgstr "Aldi bereko konexio ugari onartu"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "%s(r)i galdetzen gurekin %s(e)n konektatzeko: %hu BM Zuzenerako."
+msgstr ""
+"%s(r)i galdetzen gurekin %s:%hu(e)n IM Zuzenerako koenktatzeko eskatzen."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "%s(e)ra (%s) konektatzen saiatzen: %hu BM Zuzenerako."
+msgstr "%s(e)ra konektatzen saiatzen: %hu."
 
-#, fuzzy, c-format
 msgid "Attempting to connect via proxy server."
-msgstr "Konexioa berbideratzen zailatzen..."
+msgstr "Proxy zerbitzari baten bidez konektatzen saiatzen."
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
@@ -7345,570 +7149,534 @@ msgid ""
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
-"Horrek bi ordenagailuak zuzenean konektatzea eskatzen du, eta beharrezkoa da "
-"BMen irudietarako. Zure IP helbidea ikusiko denez, arriskutsua izan daiteke "
-"pribatutasunaren aldetik."
+"Bi ordenagailuen arteko konexio zuzena behar du, eta beharrezkoa da IM "
+"Irudietarako. Zure IP helbidea erakutsiko denez, pribatutasun-arrisku bat "
+"suposa dezake."
 
 msgid "Aquarius"
-msgstr ""
+msgstr "Akuario"
 
-#, fuzzy
 msgid "Pisces"
-msgstr "Ahotsak"
+msgstr "Piszis"
 
-#, fuzzy
 msgid "Aries"
-msgstr "Helbidea"
+msgstr "Aries"
 
-#, fuzzy
 msgid "Taurus"
-msgstr "Turkiera"
+msgstr "Tauro"
 
-#, fuzzy
 msgid "Gemini"
-msgstr "Alemana"
+msgstr "Geminis"
 
-#, fuzzy
 msgid "Cancer"
-msgstr "Utzi"
+msgstr "Kantzer"
 
 msgid "Leo"
-msgstr ""
+msgstr "Leo"
 
 msgid "Virgo"
-msgstr ""
+msgstr "V‏irgo"
 
 msgid "Libra"
-msgstr ""
+msgstr "Libra"
 
-#, fuzzy
 msgid "Scorpio"
-msgstr "Harpidetza"
+msgstr "Eskorpio"
 
 msgid "Sagittarius"
-msgstr ""
+msgstr "Sagitario"
 
 msgid "Capricorn"
-msgstr ""
+msgstr "Kaprikornio"
 
-#, fuzzy
 msgid "Rat"
-msgstr "Formaturik gabe"
+msgstr "Sagua"
 
 msgid "Ox"
-msgstr ""
+msgstr "Idia"
 
-#, fuzzy
 msgid "Tiger"
-msgstr "Lanpostua"
+msgstr "Tigrea"
 
 msgid "Rabbit"
-msgstr ""
+msgstr "Untxia"
 
 msgid "Dragon"
-msgstr ""
+msgstr "Herensugea"
 
-#, fuzzy
 msgid "Snake"
-msgstr "Gorde"
+msgstr "Sugea"
 
-#, fuzzy
 msgid "Horse"
-msgstr "Ostalari-Izena"
+msgstr "Zaldia"
 
 msgid "Goat"
-msgstr ""
+msgstr "Ahuntza"
 
-#, fuzzy
 msgid "Monkey"
-msgstr "Bat ere ez"
+msgstr "Tximinoa"
 
-#, fuzzy
 msgid "Rooster"
-msgstr "Erregistratu"
+msgstr "Oilarra"
 
 msgid "Dog"
-msgstr ""
+msgstr "Txakurra"
 
-#, fuzzy
 msgid "Pig"
-msgstr "Ping"
+msgstr "Txerria"
 
-#, fuzzy
 msgid "Other"
-msgstr "Opera"
+msgstr "Besteak"
 
-#, fuzzy
 msgid "Visible"
-msgstr "Ikusezin"
+msgstr "Ikusgarri"
 
-msgid "Firend Only"
-msgstr ""
+msgid "Friend Only"
+msgstr "Lagunak Bakarrik"
 
-#, fuzzy
 msgid "Private"
-msgstr "Pribatutasuna"
+msgstr "Pribatua"
 
 msgid "QQ Number"
-msgstr ""
+msgstr "QQ Zenbakia"
 
-#, fuzzy
 msgid "Country/Region"
-msgstr "Estatua"
+msgstr "Herrialdea/Zona"
 
 msgid "Province/State"
-msgstr ""
+msgstr "Probintzia/Estatua"
 
-#, fuzzy
 msgid "Zipcode"
 msgstr "Posta-kodea"
 
-#, fuzzy
 msgid "Phone Number"
-msgstr "Telefono zenbakia"
+msgstr "Telefono Zenbakia"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Baimena eman"
+msgstr ""
 
-#, fuzzy
 msgid "Cellphone Number"
-msgstr "Telefono zenbakia"
+msgstr "Mugikoe Telefono"
 
-#, fuzzy
 msgid "Personal Introduction"
-msgstr "Informazio pertsonala"
+msgstr "Hitzaurre Pertsonala"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "Herria"
+msgstr "Herria/Area"
 
-#, fuzzy
 msgid "Publish Mobile"
-msgstr "Zagapoto pertsonala"
+msgstr "Mugikorra Argitaratu"
 
-#, fuzzy
 msgid "Publish Contact"
-msgstr "Ezizena kontaktuarentzat"
+msgstr "Kontaktua Argitaratu"
 
-#, fuzzy
 msgid "College"
-msgstr "_Tolestu"
+msgstr "Eskola"
 
-#, fuzzy
 msgid "Horoscope"
-msgstr "Ostalari-Izena"
+msgstr "Horoskopoa"
 
 msgid "Zodiac"
-msgstr ""
+msgstr "Zodiakoa"
 
-#, fuzzy
 msgid "Blood"
-msgstr "Blokeatuta"
+msgstr "Odola"
 
-#, fuzzy
 msgid "True"
-msgstr "Turkiera"
+msgstr "Egia"
 
-#, fuzzy
 msgid "False"
-msgstr "Huts egin du"
+msgstr "Gezurra"
 
-#, fuzzy
 msgid "Modify Contact"
-msgstr "Aldatu kontua"
+msgstr "Kontaktua Aldatu"
 
-#, fuzzy
 msgid "Modify Address"
-msgstr "Etxeko helbidea"
+msgstr "Helbidea Aldatu"
 
-#, fuzzy
 msgid "Modify Extended Information"
-msgstr "Lagunaren datuak"
+msgstr "Informazio Gehigarria Aldatu"
 
-#, fuzzy
 msgid "Modify Information"
-msgstr "Lagunaren datuak"
+msgstr "Informazioa Aldatu"
 
-#, fuzzy
 msgid "Update"
-msgstr "Azken eguneratzea "
+msgstr "Eguneratu"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "Adierazi lagun bat alerta emateko."
+msgstr "Ezin lagunaren informazioa aldatu."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "Mugikorra"
+
+msgid "Note"
+msgstr "Oharra"
+
+#. callback
+msgid "Buddy Memo"
 msgstr ""
 
-#, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Gehitu laguna"
+msgid "Change his/her memo as you like"
+msgstr ""
+
+msgid "_Modify"
+msgstr "_Modifikatu"
 
-msgid "Input answer here"
+msgid "Memo Modify"
 msgstr ""
 
-#, fuzzy
+msgid "Server says:"
+msgstr "Zerbitzariak dio:"
+
+msgid "Your request was accepted."
+msgstr "Zure eskaera onartu da."
+
+msgid "Your request was rejected."
+msgstr "Zure eskaera ezetsi da."
+
+#, c-format
+msgid "%u requires verification"
+msgstr "%u(e)k egiaztapena behar du"
+
+msgid "Add buddy question"
+msgstr "Lagun-galdera gehitu"
+
+msgid "Enter answer here"
+msgstr "Hemen sartu erantzuna"
+
 msgid "Send"
-msgstr "_Bidali"
+msgstr "Bidali"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Pasahitz baliogabea"
+msgstr "Erantzun baliogabea."
 
-#, fuzzy
 msgid "Authorization denied message:"
-msgstr "Baimena ezesteko mezua:"
+msgstr "Autorizazioa ezesteko mezua:"
 
-msgid "Sorry, You are not my style."
-msgstr ""
+msgid "Sorry, you're not my style."
+msgstr "Lastima, ez zara nire tipoa."
 
-#, fuzzy, c-format
-msgid "%d needs authentication"
-msgstr "Autentifikazioa haiseratzen"
+#, c-format
+msgid "%u needs authorization"
+msgstr "%u(e)k autorizazioa behar du"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "Laguna zerrendan gehitu nahi duzu?"
+msgstr "Lagun-autorizazioa gehitu"
 
-msgid "Input request here"
-msgstr ""
+msgid "Enter request here"
+msgstr "Hemen sartu eskaera"
 
-#, fuzzy
 msgid "Would you be my friend?"
-msgstr "Gainidatzi nahi duzu?"
+msgstr "Nire laguna izan nahi al duzu?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Gehitu laguna"
+msgstr "QQ Laguna"
 
-#, fuzzy
 msgid "Add buddy"
-msgstr "Gehitu laguna"
+msgstr "Laguna gehitu"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "Gela-izen baliogabea"
+msgstr "QQ-Zenbaki Baliogabea"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "Emadazu baimena!"
+msgstr "Ezin autorizazioa bidali"
 
-#, fuzzy, c-format
-msgid "Failed removing buddy %d"
-msgstr "Huts egin du berriketako lagunarekin elkartzean"
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "Ezin %u laguna kendu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s ezabatu zaitu bere lagunen-zerrendatik."
+msgstr "Ezin ni kendu %d lagunaren zerrendatik."
 
-#, fuzzy
 msgid "No reason given"
-msgstr "Ez da arrazoirik eman."
+msgstr "Arrazoirik ez"
 
 #. only need to get value
-#, fuzzy, c-format
+#, c-format
 msgid "You have been added by %s"
-msgstr "%s erabiltzaileak kanporatu zaitu: (%s)"
+msgstr "%s erabiltzaileak gehitu zaitu"
 
-#, fuzzy
 msgid "Would you like to add him?"
-msgstr "Gainidatzi nahi duzu?"
+msgstr "Bera gehitu nahi al duzu?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Berrezarri"
+msgstr "%s(e)k ezetsia"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Message: %s"
-msgstr "_Mezua:"
+msgstr "Mezua: %s"
 
 msgid "ID: "
-msgstr ""
+msgstr "IDa:"
 
-#, fuzzy
 msgid "Group ID"
-msgstr "Taldea:"
+msgstr "Talde IDa"
 
 msgid "QQ Qun"
-msgstr ""
+msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Idatzi pasahitz berria"
+msgstr "Qun zenbakia sartu"
 
 msgid "You can only search for permanent Qun\n"
-msgstr ""
+msgstr "Qun iraunkorrak bakarrik bilatu ditzakezu\n"
+
+msgid "(Invalid UTF-8 string)"
+msgstr "(UTF-8 kate baliogabea)"
 
-#, fuzzy
 msgid "Not member"
-msgstr "Noiztik kidea"
+msgstr "Ez kidea"
 
-#, fuzzy
 msgid "Member"
-msgstr "Noiztik kidea"
+msgstr "Kidea"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "Eskaera Elkarrizketa"
+msgstr "Eskatzen"
 
 msgid "Admin"
-msgstr ""
+msgstr "Administratzailea"
 
-#, fuzzy
 msgid "Notice"
 msgstr "Oharra"
 
-#, fuzzy
 msgid "Detail"
-msgstr "Gnome-ren lehenetsia "
+msgstr "Xehetasunak"
 
-#, fuzzy
 msgid "Creator"
-msgstr "Sortu"
+msgstr "Sortzailea"
 
-#, fuzzy
 msgid "About me"
-msgstr "Pidgin-i buruz"
+msgstr "Niri buruz"
 
-#, fuzzy
 msgid "Category"
-msgstr "Berriketa-errorea"
+msgstr "Kategoria"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr ""
-"Probako bertsio honek ez du uzten hamar erabiltzaile baino gehiago une "
-"berean konektatzea"
+msgstr "Qun-ak ez du erabiltzaile gehiago batzea onartzen"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "Sartu berriketa batean"
+msgstr "QQ Qun-era Batu"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Arrakastaz batua %s Qun-era (%u)"
+
 msgid "Successfully joined Qun"
-msgstr ""
+msgstr "Arrakastaz batua Qun-era"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
-#, fuzzy
 msgid "QQ Qun Operation"
-msgstr "Soinu-aukerak"
+msgstr "QQ Qun Eragiketa"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Huts egin du"
+msgstr "Errorea:"
 
-msgid "Join Qun, Unknow Reply"
-msgstr ""
+msgid "Join Qun, Unknown Reply"
+msgstr "Qun-era Batu, Erantzun Ezezaguna"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "Sartu berriketa batean"
+msgstr "Qun-etik Irten"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
+"Oharra, sortzailea bazara, \n"
+"eragiketa honek Qun hau ken dezake."
 
-msgid "Sorry, you are not our style ..."
-msgstr ""
+msgid "Sorry, you are not our style"
+msgstr "Lastima, ez zara nire tipoa"
 
-#, fuzzy
-msgid "Successfully changed Qun member"
-msgstr "Telefono zenbakia"
+msgid "Successfully changed Qun members"
+msgstr "Arrakastaz aldatu dira Qun kideak"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
-msgstr "Kanalaren informazioa"
+msgstr "Arrakastaz aldatu da Qun informazioa"
 
 msgid "You have successfully created a Qun"
-msgstr ""
+msgstr "Arrakastaz sortu duzu Qun bat"
 
-#, fuzzy
-msgid "Would you like to set detailed information now?"
-msgstr "Ikono hau lagunaren ikono bezela ezartzea gustatuko litzaizuke ?"
+msgid "Would you like to set up detailed information now?"
+msgstr "Informazio xehea konfiguratu nahi al duzu orain?"
 
-#, fuzzy
 msgid "Setup"
-msgstr "_Ezarri"
+msgstr "Konfiguratu"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
-msgstr ""
+msgid "%u requested to join Qun %u for %s"
+msgstr "%u(e)k %u Qun-era batu nahi du %s(e)rako"
 
 #, c-format
-msgid "%d request to join Qun %d"
-msgstr ""
+msgid "%u request to join Qun %u"
+msgstr "%u(e)k %u Qun-era batu nahi du"
 
-#, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
-msgstr "Huts egin du berriketako lagunarekin elkartzean"
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "Ezin %u Qun-era batu (%u administratzaileak kudeatua)"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
+"<b>%u Qun-era batu zaitezke (%u administratzaileak baimendua %s(e)rako)</b>"
 
-#, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
-msgstr "Kendu laguna"
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>%u.laguna kenduta.</b>"
 
 #, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>%u lagun berria batu da.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown-%d"
-msgstr "Ezezaguna"
+msgstr "Ezezaguna-%d"
 
-#, fuzzy
 msgid "Level"
-msgstr "Inoiz ez"
+msgstr "Maila"
 
 msgid " VIP"
-msgstr ""
+msgstr "VIP"
 
 msgid " TCP"
-msgstr ""
+msgstr "TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "Mugikorra"
+msgstr " Mugikorretik"
 
 #, fuzzy
 msgid " BindMobile"
-msgstr "Mugikorra"
+msgstr " MugikorraLotu"
 
-#, fuzzy
 msgid " Video"
-msgstr "Zuzeneko bideoa"
+msgstr " Bideoa"
 
-#, fuzzy
 msgid " Zone"
-msgstr "Bat ere ez"
+msgstr " Zona"
 
 msgid "Flag"
-msgstr ""
+msgstr "Bandera"
 
 msgid "Ver"
-msgstr ""
+msgstr "Ber"
 
-#, fuzzy
 msgid "Invalid name"
-msgstr "Erabiltzaile-izena ez da baliozkoa"
+msgstr "Izen baliogabea"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "Hautatu karpeta..."
+msgstr "Ikonoa hautatu..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
+msgstr "<b>Konexio-ordua</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
+msgstr "<b>Lagun Konektatuak Guztira</b>: %d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
+msgstr "<b>Azken Freskatzea</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>ID Erabiltzailea :</b> %s<br>"
+msgstr "<b>Zerbitzaria</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
+msgstr "<b>Bezero-Etiketa</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>Inaktibo:</b> %s<br>"
+msgstr "<b>Konexio-Modua</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>IP helbidea:</b> %s<br>"
+msgstr "<b>Nire Internet-IPa</b>: %s:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
+msgstr "<b>Bidalita</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
+msgstr "<b>Birbidali</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>%s:</b> </b>%s<br>"
+msgstr "<b>Galduta</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
+msgstr "<b>Jasota</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>Aliasa:</b> %s<br>"
+msgstr "<b>Jasotako Bikoiztua</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
+msgstr "<b>Ordua</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>ID Erabiltzailea :</b> %s<br>"
+msgstr "<b>IPa</b>: %s<br>\n"
 
-#, fuzzy
 msgid "Login Information"
-msgstr "Arakatze informazioa"
+msgstr "Konexio-Informazioa"
 
-#, fuzzy
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr "<b>Kanpoko Erabiltzailea:</b><br>"
+msgstr "<p><b>Jatorrizko Egilea</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Kode-Kontribuitzaileak</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
+msgstr "<p><b>Partxe-Idazle Maitagarriak</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
+msgstr "<p><b>Eskerrak</b>:<br>\n"
+
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Frogatzaile Arduratsuak</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "eta gehiago, mesedez esaidazue.... esker mila!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>Eta, atzeko gelako mutiko guztiak...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
+msgstr "<i>Zatoz gurekin!</i> :)"
 
-#, fuzzy, c-format
-msgid "About OpenQ r%s"
-msgstr "Pidgin-i buruz"
+#, c-format
+msgid "About OpenQ %s"
+msgstr "OpenQ %s(e)ri Buruz"
 
-#, fuzzy
 msgid "Change Icon"
-msgstr "Gorde ikonoa"
+msgstr "Ikonoa Aldatu"
 
 msgid "Change Password"
-msgstr "Aldatu pasahitza"
+msgstr "Pasahitza Aldatu"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Arakatze informazioa"
+msgstr "Kontuaren Informazioa"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "QQ Qun guztiak eguneratu"
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "Pidgin-i buruz"
+msgstr "OpenQ-ri Buruz"
+
+msgid "Modify Buddy Memo"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -7920,312 +7688,254 @@ msgstr "Pidgin-i buruz"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "IRC protokoloaren plugin-a"
+msgstr "QQ Protokolo-Plugina"
 
-#, fuzzy
 msgid "Auto"
-msgstr "Baimena eman"
+msgstr "Auto"
 
-#, fuzzy
 msgid "Select Server"
-msgstr "Hautatu erabiltzaile "
+msgstr "Zerbitzaria Hautatu"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
+msgstr "QQ2008"
 
-#. #endif
-#, fuzzy
 msgid "Connect by TCP"
-msgstr "Konektatzen"
+msgstr "TCP bidez konektatu"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "Zerbitzariaren ataka"
+msgstr "Zerbitzari-oharra erakutsi"
 
-#, fuzzy
 msgid "Show server news"
-msgstr "Zerbitzariaren helbidea"
+msgstr "Zerbitzari-albisteak erakutsi"
+
+msgid "Show chat room when msg comes"
+msgstr "Solasaldi-gela erakutsi mezua jasotzean"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "Irakurketa-errorea"
+msgstr ""
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "Irakurketa-errorea"
+msgstr "Eguneratze-tartea (segundoak)"
 
-#, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Ezin da zerbitzariaren informazioa hartu"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
-msgstr "Ezin da zerbitzariaren informazioa hartu"
+msgid "Unable to decrypt server reply"
+msgstr "Ezin zerbitzariaren erantzuna desenkriptatu"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "Ezin testigua eskatu, 0x%02X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "authzid baliogabea"
+msgstr "Testigu-luzera baliogabea, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX ez dago jasana oraindik"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Erregistratu egin behar da"
+msgstr "Aktibazioa beharrezkoa"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
-msgstr ""
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "Erantzun-kode ezezaguna konektatzean (0x%02X)"
 
-#, fuzzy
-msgid "Keep alive error"
-msgstr "Irakurketa-errorea"
+msgid "Requesting captcha"
+msgstr "Captcha eskatzen"
 
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Checking captcha"
+msgstr "Captcha egiaztatzen"
 
-msgid "Checking code of captcha ..."
-msgstr ""
+msgid "Failed captcha verification"
+msgstr "Errorea captcha egiaztapenean"
 
-msgid "Failed captcha verify"
-msgstr ""
-
-#, fuzzy
 msgid "Captcha Image"
-msgstr "Gorde irudia"
+msgstr "Captcha Irudia"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "Sartu Pasahitza"
+msgstr "Kodea sartu"
 
-msgid "QQ Captcha Verifing"
-msgstr ""
+msgid "QQ Captcha Verification"
+msgstr "QQ Captcha-Egiaztapena"
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "Idatzi gehitu nahi duzun taldearen izena."
+msgstr "Irudiko testua sartu ezazu"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
-msgstr ""
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "Erantzun ezezaguna pasahitza egiaztatzean (0x%02X)"
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"Erantzun-kode ezezaguna konektatzean (0x%02X)\n"
+"%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Ezin da konektatu."
-
-#, fuzzy
 msgid "Socket error"
-msgstr "Testigu errorea"
+msgstr "Socket errorea"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "Zerbitzaritik deskonektatuta zaude."
+msgid "Getting server"
+msgstr "Zerbitzaria eskuratzen"
 
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "Ezin da socket-a irakurri"
-
-msgid "Write Error"
-msgstr "Idazketa-errorea "
+msgid "Requesting token"
+msgstr "Testigua eskatzen"
 
-#, fuzzy
-msgid "Connection lost"
-msgstr "Konexioa itxi da"
-
-#, fuzzy
-msgid "Get server ..."
-msgstr "Ezarri erabiltzailearen datuak..."
+msgid "Unable to resolve hostname"
+msgstr "Ezin ostalari-izena ebaztu"
 
-#, fuzzy
-msgid "Request token"
-msgstr "Eskaera ukatu da"
-
-# ,fuzzy
-msgid "Couldn't resolve host"
-msgstr "Ezin izan da ostalaria"
-
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "Erabiltzaile-izena edo pasahitza ez da baliozkoa."
+msgstr "Zerbitzari edo ataka baliogabea"
 
-#, fuzzy
-msgid "Connecting server ..."
-msgstr "Konektatu zerbitzariarekin"
+msgid "Connecting to server"
+msgstr "Zerbitzarira konektatzen"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "Irakurketa-errorea"
-
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "Huts egin du berriketan sartzean"
+msgstr "QQ Errorea"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "ICQ zerbitzariaren errelea"
+msgstr ""
+"Zerbitzariko Albisteak\n"
+"%s\n"
+"%s\n"
+"%s"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "Nork"
+msgstr "%s(e)tik:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Zerbitzariaren aginduak:%s"
-
-msgid "Unknow SERVER CMD"
 msgstr ""
+"Zerbitzari-oharra %s(e)tik:\n"
+"%s"
+
+msgid "Unknown SERVER CMD"
+msgstr "SERVER CMD Ezezaguna"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
+"%s(r)en errore-erantzuna (0x%02X)\n"
+"%u gela, 0x%02X erantzuna"
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "Komandoa"
+msgstr "QQ Qun Agindua"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
+msgid "Unable to decrypt login reply"
+msgstr "Ezin konexio-erantzuna desenkriptatu"
 
-msgid "Can not decrypt login reply"
-msgstr ""
+msgid "Unknown LOGIN CMD"
+msgstr "LOGIN CMD Ezezaguna"
 
-#, fuzzy
-msgid "Unknow LOGIN CMD"
-msgstr "Arrazoi ezezaguna."
+msgid "Unknown CLIENT CMD"
+msgstr "CLIENT CMD Ezezaguna"
 
-#, fuzzy
-msgid "Unknow CLIENT CMD"
-msgstr "Arrazoi ezezaguna."
-
-#, fuzzy, c-format
+#, c-format
 msgid "%d has declined the file %s"
-msgstr "%s(e)k gaia aldatu du: %s"
+msgstr "%d(e)k ez du %s fitxategia onartu"
 
-#, fuzzy
 msgid "File Send"
-msgstr "Huts egin du fitxategia bidaltzean"
+msgstr "Fitxategi Bidalia"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d canceled the transfer of %s"
-msgstr "%s(e)k %s(r)en transferentzia bertan behera utzi du"
-
-msgid "Connection closed (writing)"
-msgstr "Konexioa itxi da (idazten)"
+msgstr "%d(e)k bertan behera utzi du %s fitxategiaren transferentzia"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
+msgstr "<b>Taldearen Titulua:</b> %s<br>"
 
-#, c-format
+#, fuzzy, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>Talde ID oharra:</b> %s<br> "
+msgstr "<b>Ohar Talde IDa:</b> %s<br>"
 
 #, c-format
 msgid "Info for Group %s"
-msgstr "%s Taldearentzako informazioa"
+msgstr "%s Taldearen Informazioa"
 
+#, fuzzy
 msgid "Notes Address Book Information"
 msgstr "Helbide agenda-ren informazioa"
 
 msgid "Invite Group to Conference..."
-msgstr "Konferentziara  taldea gonbidatu"
+msgstr "Taldea Gonbidatu Konfrentziara..."
 
+#, fuzzy
 msgid "Get Notes Address Book Info"
 msgstr "Gehitu helbide-liburuan oharraren informazioa"
 
 msgid "Sending Handshake"
-msgstr "Bostekoa bidaltzen"
+msgstr "Handshake-a Bidaltzen"
 
 # , fuzzy
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Bosteko ezagupenaren zain"
+msgstr "Handshake-aren Ezagupenaren Zain"
 
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "Bostekoa ezagutua, Konexio informazioa bidaltzen"
+msgstr "Handshake-a Ezagutua, Konektatzen"
 
 # , fuzzy
 msgid "Waiting for Login Acknowledgement"
-msgstr "Konexio ikuskapenaren zain"
+msgstr "Konexioaren Ezagupenaren Zain"
 
 msgid "Login Redirected"
-msgstr "Konexio berbideratua"
+msgstr "Konexio Berbideratua"
 
 msgid "Forcing Login"
-msgstr "Konektatzea behartzen"
+msgstr "Konexioa Behartzen"
 
 # ,fuzzy
 msgid "Login Acknowledged"
-msgstr "Konexio ikuskapena"
+msgstr "Konexioa Ezagutua"
 
 msgid "Starting Services"
-msgstr "Zerbitzuak hasten"
+msgstr "Zerbitzuak Hasiarazten"
 
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
-"Sametime-eko administratzaileak hurrengo oharra argitaratu du zerbitzarian: %"
-"s"
+"Sametime-eko administratzaileak ohar hau argitaratu du zerbitzarian: %s"
 
 msgid "Sametime Administrator Announcement"
-msgstr "Sametime-eko administratzailearen oharra"
-
-msgid "Connection reset"
-msgstr "Konexioa berabierazten "
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Errorea socket-etik irakurtzean:%s."
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Ezin da ostalariarekin konektatu"
+msgstr "Sametime-eko Administratzailearen Oharra"
 
 #, c-format
 msgid "Announcement from %s"
-msgstr "Oharra  %s -tik"
+msgstr "%s(e)ko oharra"
 
 msgid "Conference Closed"
-msgstr "Konferentzia itxi da"
+msgstr "Konferentzia Itxita"
 
 msgid "Unable to send message: "
-msgstr "Ezin da mezua bidali: %s."
+msgstr "Ezin mezua bidali:"
 
 msgid "Place Closed"
-msgstr "Place itxita"
+msgstr "Lekua Itxita"
 
 msgid "Microphone"
 msgstr "Mikrofonoa"
@@ -8234,17 +7944,16 @@ msgid "Speakers"
 msgstr "Bozgorailuak"
 
 msgid "Video Camera"
-msgstr "Bideo-kamera"
+msgstr "Bideo-Kamera"
+
+msgid "File Transfer"
+msgstr "Fitxategi-Transferentzia"
 
-#, fuzzy
 msgid "Supports"
-msgstr "euskarria"
+msgstr "Jasaten du"
 
-#, fuzzy
 msgid "External User"
-msgstr ""
-"\n"
-"<b>Kanpoko erabiltzailea:</b>"
+msgstr "Kanpoko Erabiltzailea"
 
 msgid "Create conference with user"
 msgstr "Erabiltzailerarekin konferentzia sortu"
@@ -8254,20 +7963,19 @@ msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"Gehitu ezazu topiko berria konferentziarako, eta mezua idatzi inbitazion "
-"moduan bidaltzeko %s"
+"Konferentzia berriarentzako gaia sar ezazu, eta %s(r)entzako gonbit-mezua"
 
 msgid "New Conference"
-msgstr "Konferentzia berria"
+msgstr "Konferentzia Berria"
 
 msgid "Create"
 msgstr "Sortu"
 
 msgid "Available Conferences"
-msgstr "Konferentzia erabilgarri"
+msgstr "Konferentzia Eskuragarriak"
 
 msgid "Create New Conference..."
-msgstr "Sortu konferentzia berria..."
+msgstr "Konferentzia Berria Sortu..."
 
 msgid "Invite user to a conference"
 msgstr "Erabiltzailea konferentziara gonbidatu"
@@ -8278,38 +7986,38 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Beheko zerrendatik aukeratu konferentzia %s erabiltzaileari gonbitea "
-"bidaltzeko. Aukeratu \"Konferentzia berria sortu\" konferentzia berria sortu "
-"nahi baduzu aurreko erabiltzailea gonbidatzeko."
+"Azpiko zerrendako konferentzia bat hautatu ezazu, %s erabiltzailea bertara "
+"gonbidatzeko. \"Konferentzia Berria Sortu\" hautatu ezazu erabiltzailea "
+"konferentzia berri batera gonbidatzeko."
 
 msgid "Invite to Conference"
-msgstr "Konferentziara gonbidatu"
+msgstr "Konferentziara Gonbidatu"
 
 msgid "Invite to Conference..."
-msgstr "Konferentziara gonbidatu..."
+msgstr "Konferentziara Gonbidatu..."
 
 msgid "Send TEST Announcement"
-msgstr "Bidali FROGA oharra"
+msgstr "FROGA Oharra Bidali"
 
 msgid "Topic:"
 msgstr "Gaia:"
 
 msgid "No Sametime Community Server specified"
-msgstr "Ez dago Sametime komunitatearen espezifikaziorik zerbitzarian  "
+msgstr "Ez da Sametime Komunitate Zerbitzaririk zehaztu"
 
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"Ez da inongo stalari edo IP helbide konfiguratu izan %s konturako. Sartu "
-"ezazu behean konexioa ezartzen jarraitzeko."
+"Ez ostalari edo IP helbiderik konfiguratu %s Meanwhile konturako. "
+"Konektatzeko, bat sartu ezazu azpian."
 
 msgid "Meanwhile Connection Setup"
-msgstr "Konexio ezarpena bitartean"
+msgstr "Meanwhile Konexio Konfigurazioa"
 
 msgid "No Sametime Community Server Specified"
-msgstr "Ez dago Sametime komunitatearen espezifikaziorik zerbitzarian "
+msgstr "Ez da Sametime Komunitate Zerbitzaririk Zehaztu"
 
 msgid "Connect"
 msgstr "Konektatu"
@@ -8318,41 +8026,40 @@ msgstr "Konektatu"
 msgid "Unknown (0x%04x)<br>"
 msgstr "Ezezaguna (0x%04x)<br>"
 
-#, fuzzy
 msgid "Last Known Client"
-msgstr "<b>Azkenengo bezero ezaguna:</b> "
+msgstr "Azkenengo Bezero Ezaguna"
 
 msgid "User Name"
 msgstr "Erabiltzaile-izena "
 
 msgid "Sametime ID"
-msgstr "Sametime ID"
+msgstr "Sametime IDa"
 
 msgid "An ambiguous user ID was entered"
-msgstr "ID erabiltzaile anbiguoa sartua izan da."
+msgstr "Erabiltzaile-ID anbiguoa sartu da"
 
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"%s identifikatzailea segurazki beste edozein erabiltzaileri erreferentzia "
-"egiten dio. Mesedez  ondorengo zerrendatik zuzeneko erabiltzailea hautatu "
-"zure lagun-zerrendara gehitzeko."
+"'%s' identifikatzaileak ondorengo erabiltzaileetako edozeinekin etor daiteke "
+"bat. Zure lagun-zerrendara gehitzeko, azpiko zerrendan hautatu ezazu "
+"erabiltzaile zuzena."
 
 msgid "Select User"
-msgstr "Hautatu erabiltzaile "
+msgstr "Erabiltzailea Hautatu"
 
 msgid "Unable to add user: user not found"
-msgstr "Ezin da erabiltzailea gehitu: erabiltzailea ez aurkitu"
+msgstr "Ezin erabiltzailea gehitu: ez da erabiltzailea aurkitu"
 
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"%s identifikatzailea ez dator bat Sametime-ko komunitateko inongo "
-"erabiltzailearekin. Sarrea hau zure lagunen-zerrendatik ezabatua izan da."
+"'%s' identifikatzailea ez dator bat zure Sametime komunitateko inongo "
+"erabiltzailerekin. Sarrera hau zure lagun-zerrendatik ezabatua izan da."
 
 #, c-format
 msgid ""
@@ -8363,13 +8070,13 @@ msgstr ""
 "%s\n"
 
 msgid "Remotely Stored Buddy List"
-msgstr "Hurrunezko lagunen zerrenda bilketa"
+msgstr "Urrunean Gordetako Lagun-Zerrenda"
 
 msgid "Buddy List Storage Mode"
-msgstr "Lagunen zerrenda bilketa modua"
+msgstr "Lagun-Zerrenda Gordetzeko Modua"
 
 msgid "Local Buddy List Only"
-msgstr "Bertako lagunen zerrenda bakarrik"
+msgstr "Lagun-Zerrenda Lokala Bakarrik"
 
 #, fuzzy
 msgid "Merge List from Server"
@@ -8380,59 +8087,63 @@ msgid "Merge and Save List to Server"
 msgstr "Esportatu lagunen zerrenda zerbitzarira"
 
 msgid "Synchronize List with Server"
-msgstr "Zerbitzariarekin  zerrenda sinkronizatu"
+msgstr "Zerbitzariarekin Sinkronizatu Zerrenda"
 
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "Sametime-eko zerrenda inportatu kontu honetara %s"
+msgstr "%s Kontuaren Sametime-Zerrenda Inportatu"
 
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "Sametime-eko zerrenda esportatu kontu honetara %s"
+msgstr "%s Kontuaren Sametime-Zerrenda Esportatu"
 
 msgid "Unable to add group: group exists"
-msgstr "Ezin da taldea gehitu:dagoneneko badago."
+msgstr "Ezin taldea gehitu: jadanik badago"
 
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "%s izena duen taldea badago zure lagunen-zerrendan."
+msgstr "Jadanik badago '%s' izeneko talde bat zure lagun-zerrenda."
 
 msgid "Unable to add group"
-msgstr "Ezin da taldea gehitu"
+msgstr "Ezin taldea gehitu"
 
 msgid "Possible Matches"
-msgstr "Topaketa posibleak"
+msgstr "Kontzidentzia Posibleak"
 
+#, fuzzy
 msgid "Notes Address Book group results"
 msgstr "Helbideen agenda taldeen emaitzak "
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"%s Identifitikatzailea behar bada helbide-liburuaren oharreko taldeetara "
-"erreferentzia egiten ari da. Aukeratu ezazu talde egokia beheko zerrenda "
-"honetatik eta gehitu ezazu zure lagunen zerrenda."
+"'%s' identifikatzaileak ondorengo helbide-liburuaren oharreko taldeetako "
+"edozeinekin etor daiteke bat. Zure lagun-zerrendara gehitzeko, azpiko "
+"zerrendan hautatu ezazu talde  zuzena."
 
+#, fuzzy
 msgid "Select Notes Address Book"
 msgstr "Gehitu helbide-liburuan oharretan"
 
 msgid "Unable to add group: group not found"
-msgstr "Ezin da taldea gehitu:ez da taldea topatu"
+msgstr "Ezin taldea gehitu: ez da taldea aurkitu"
 
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-"%s identifikatzailea ez du  inongo emaitzik aurkitu helbide agenda taldean, "
-"zure Sametime-eko komunitatean."
+"'%s' identifikatzailea ez dator bat zure Sametime komunitateko inongo "
+"helbide-liburuaren oharreko talderekin. "
 
+#, fuzzy
 msgid "Notes Address Book Group"
 msgstr "Helbide agenda taldea"
 
+#, fuzzy
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8442,7 +8153,7 @@ msgstr ""
 
 #, c-format
 msgid "Search results for '%s'"
-msgstr "Bilaketaren emaitza '%s'"
+msgstr "'%s' bilaketaren emaitzak"
 
 #, c-format
 msgid ""
@@ -8450,24 +8161,24 @@ msgid ""
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
-"%s Identifitikatzailea behar bada ondorengo erabiltzaileren bati "
-"erreferentzia egiten ari da. Erabiltzaileek zure lagunen-zerrendara gehitu "
-"ditzazkezu edo mezu bat bidali beheko ekintza botoiekin."
+"'%s' identifikatzaileak ondorengo erabiltzaileetako edozeinekin etor daiteke "
+"bat. Zure lagun-zerrendara gehitu ditzakezu edo mezuak bidal diezaiekezu "
+"azpiko botoiak erabiliz."
 
 msgid "Search Results"
-msgstr "Bilaketaren emaitza"
+msgstr "Bilaketaren Emaitzak"
 
 msgid "No matches"
-msgstr "Ez dago bat datorrenik "
+msgstr "Kointzidentziarik ez"
 
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-"%s identifikatzailea ez dator bat inongo  zure Sametime komunitateko "
-"erabiltzaileekin."
+"'%s' identifikatzailea ez dator bat zure Sametime komunitateko inongo "
+"erabiltzailerekin. "
 
 msgid "No Matches"
-msgstr "Ez da ezer ez aurkitu"
+msgstr "Kointzidentziarik Ez"
 
 msgid "Search for a user"
 msgstr "Erabiltzailea bilatu"
@@ -8476,70 +8187,70 @@ msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
-"Sartu ezazu izena edo ID partziala beheko gunean Sametime komunitateko "
-"erabiltzaileak topatzeko."
+"Zure Sametime komunitateko erabiltzaileen artean kointzidentziak bilatzeko, "
+"izen edo ID partziala sar ezazu azpiko eremuan."
 
 msgid "User Search"
-msgstr "Erabiltzaile bilaketa"
+msgstr "Erabiltzaile-Bilaketa"
 
 msgid "Import Sametime List..."
-msgstr "Inportatu Sametime zerrenda..."
+msgstr "Sametime-Zerrenda Inportatu..."
 
 msgid "Export Sametime List..."
-msgstr "Esportatu Sametime zerrenda..."
+msgstr "Sametime-Zerrenda Esportatu..."
 
+#, fuzzy
 msgid "Add Notes Address Book Group..."
-msgstr "Helbide agenda taldea  gehitu..."
+msgstr "Helbide agenda taldea gehitu..."
 
 msgid "User Search..."
-msgstr "Erabiltzaile Bilaketa..."
+msgstr "Erabiltzaile-Bilaketa..."
 
 msgid "Force login (ignore server redirects)"
-msgstr ""
-"Konexioa ezartzen behartu (entzungor egin zerbitzariaren norantza ber-"
-"adierazlei) "
+msgstr "Konexioa behartu (zerbitzari-berbideraketak ezikusi) "
 
 #. pretend to be Sametime Connect
 msgid "Hide client identity"
-msgstr "Eskutatu bezeroaren identidadea"
+msgstr "Bezeroaren identidadea ezkutatu"
 
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "%s erabiltzailea ez dago sarean"
 
 msgid "Key Agreement"
-msgstr "Gako-hitzarmena"
+msgstr "Gako-Hitzarmena"
 
 msgid "Cannot perform the key agreement"
-msgstr "Ezin da gako-hitzarmena landu"
+msgstr "Ezin gako-hitzarmena burutu"
 
 msgid "Error occurred during key agreement"
-msgstr "Errorea gertatu da gako-hitzarmenean"
+msgstr "Errorea gako-hitzarmen bitartean"
 
 msgid "Key Agreement failed"
-msgstr "Gako-hitzarmenak huts egin du"
+msgstr "Huts egin du Gako-Hitzarmenak"
 
 msgid "Timeout during key agreement"
-msgstr "Denbora iraungitu da gako-itzarmenean"
+msgstr "Denbora-muga iraungi da gako-itzarmen bitartean"
 
 msgid "Key agreement was aborted"
-msgstr "Gako-itzarmena abortatu egin da"
+msgstr "Gako-hitzarmena abortatu da"
 
 msgid "Key agreement is already started"
-msgstr "Gako-hitzarmena hasita dago"
+msgstr "Gako-hitzarmena hasi da jadanik"
 
 msgid "Key agreement cannot be started with yourself"
-msgstr "Ezin da norbere buruarekin gako-hitzarmenik hasi"
+msgstr "Ezin duzu zeure buruarekin hasi gako-hitzarmena"
 
 msgid "The remote user is not present in the network any more"
-msgstr "Urruneko erabiltzailea ez dago aktibo sarean"
+msgstr "Urruneko erabiltzailea ez dago sarean jadanik"
 
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
-"%s(e)tik gako-hitzarmen eskaera jaso da. Gako-hitzarmena lantzea nahi duzu?"
+"Gako-hitzarmen eskaera jaso da %s(en)gandik. Gako-hitzarmena burutu nahi "
+"duzu?"
 
 #, c-format
 msgid ""
@@ -8552,34 +8263,34 @@ msgstr ""
 "Urruneko ataka: %d"
 
 msgid "Key Agreement Request"
-msgstr "Gako-hitzarmenaren eskaera"
+msgstr "Gako-Hitzarmen Eskaera"
 
 msgid "IM With Password"
-msgstr "IM pasahitzarekin"
+msgstr "Pasahitzdun IM"
 
 msgid "Cannot set IM key"
-msgstr "Ezin da IM gakoa ezarri"
+msgstr "Ezin IM gakoa ezarri"
 
 msgid "Set IM Password"
-msgstr "Ezarri IM pasahitza"
+msgstr "IM-pasahitza ezarri"
 
 msgid "Get Public Key"
-msgstr "Lortu gako publikoa"
+msgstr "Gako Publikoa Eskuratu"
 
 msgid "Cannot fetch the public key"
-msgstr "Ezin da gako publikoa eskuratu"
+msgstr "Ezin gako publikoa eskuratu"
 
 msgid "Show Public Key"
-msgstr "Erakutsi gako publikoa"
+msgstr "Gako Publikoa Erakutsi"
 
 msgid "Could not load public key"
-msgstr "Ezin izan da gako publikoa kargatu"
+msgstr "Ezin gako publikoa kargatu"
 
 msgid "User Information"
-msgstr "Erabiltzailearen inf."
+msgstr "Erabiltzaile-Informazioa"
 
 msgid "Cannot get user information"
-msgstr "Ezin da erabiltzailearen informazioa lortu"
+msgstr "Ezin erabiltzaile-informazioa eskuratu"
 
 #, c-format
 msgid "The %s buddy is not trusted"
@@ -8589,8 +8300,8 @@ msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"Ezin duzu lagunaren jakinarazpenik jaso bere gako publikoa inportatu arte. "
-"'Lortu gako publikoa' eraibl dezakezu gako publikoa lortzeko."
+"Ezin duzu lagun-jakinarazpenik jaso bere gako publikoa inportatu arte. 'Gako "
+"Publikoa Eskuratu' agindua erabili dezakezu gako publikoa eskuratzeko."
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -8604,28 +8315,29 @@ msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
-"Laguna gehitzeko bere gako publikoa inprotatu behar duzu. Sakatu 'Inportatu' "
-"inportatzeko"
+"Laguna gehitzeko, bere gako publikoa inportatu behar duzu. 'Inportatu' "
+"sakatu ezazu gako publikoa inportatzeko."
 
 msgid "_Import..."
 msgstr "_Inportatu..."
 
 msgid "Select correct user"
-msgstr "Hautatu erabiltzaile zuzena"
+msgstr "Erabiltzaile zuzena hautatu"
 
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
-"Erabiltzaile bat baino gehiagok gako publiko berdina dute. Hautatu "
-"erabiltzaile zuzena zerrendatik lagunen zerrendan gehitzeko."
+"Erabiltzaile bat baino gehiago aurkitu da gako publiko berdinarekin. Zure "
+"lagun-zerrendara gehitzeko, azpiko zerrendan hautatu ezazu erabiltzaile "
+"zuzena."
 
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
-"Erabiltzaile bat baino gehiagok izen berdina dute. Hautatu erabiltzaile "
-"zuzena zerrendatik lagunen zerrendan gehitzeko."
+"Erabiltzaile bat baino gehiago aurkitu da izen berdinarekin. Zure lagun-"
+"zerrendara gehitzeko, azpiko zerrendan hautatu ezazu erabiltzaile zuzena."
 
 msgid "Detached"
 msgstr "Inpartzial"
@@ -8634,7 +8346,7 @@ msgid "Indisposed"
 msgstr "Ondoezik"
 
 msgid "Wake Me Up"
-msgstr "Esna nazazu"
+msgstr "Esna Nazazu"
 
 msgid "Hyper Active"
 msgstr "Hiperaktibo"
@@ -8655,7 +8367,7 @@ msgid "Jealous"
 msgstr "Jeloskor"
 
 msgid "Ashamed"
-msgstr "Lotsati"
+msgstr "Lotsatuta"
 
 msgid "Invincible"
 msgstr "Garaiezin"
@@ -8667,7 +8379,7 @@ msgid "Sleepy"
 msgstr "Logurarekin"
 
 msgid "Bored"
-msgstr "Azpertuta"
+msgstr "Aspertuta"
 
 msgid "Excited"
 msgstr "Aztoratuta"
@@ -8679,10 +8391,10 @@ msgid "User Modes"
 msgstr "Erabiltzaile-moduak"
 
 msgid "Preferred Contact"
-msgstr "Kontaktu hobetsia"
+msgstr "Kontaktu Hobetsia"
 
 msgid "Preferred Language"
-msgstr "Hizkuntza hobetsia"
+msgstr "Hizkuntza Hobetsia"
 
 msgid "Device"
 msgstr "Gailua"
@@ -8691,54 +8403,54 @@ msgid "Timezone"
 msgstr "Ordu-zona"
 
 msgid "Geolocation"
-msgstr "Kokalekua"
+msgstr "Geokokapena"
 
 msgid "Reset IM Key"
-msgstr "Berrasieratu IM gakoa"
+msgstr "IM Gakoa Berrezarri"
 
 msgid "IM with Key Exchange"
-msgstr "IM gako-trukearekin"
+msgstr "Gako-Trukedun IMa"
 
 msgid "IM with Password"
-msgstr "IM pasahitzarekin"
+msgstr "Pasahitzdun IMa"
 
 msgid "Get Public Key..."
-msgstr "Lortu gako publikoa..."
+msgstr "Gako Publikoa Eskuratu..."
 
 msgid "Kill User"
-msgstr "Kanporatu erabiltzailea"
+msgstr "Erabiltzailea Hil"
 
 msgid "Draw On Whiteboard"
-msgstr "Marraztu Whiteboard -ean"
+msgstr "Arbelean Marraztu"
 
 msgid "_Passphrase:"
 msgstr "_Pasaesaldia:"
 
 #, c-format
 msgid "Channel %s does not exist in the network"
-msgstr "%s kanala ez dago sarean"
+msgstr "%s kanala ez da sarean existitzen"
 
 msgid "Channel Information"
-msgstr "Kanalaren informazioa"
+msgstr "Kanal-Informazioa"
 
 msgid "Cannot get channel information"
-msgstr "Ezin da kanalaren informazioa eskuratu"
+msgstr "Ezin kanal-informazioa eskuratu"
 
 #, c-format
 msgid "<b>Channel Name:</b> %s"
-msgstr "<b>Kanal-izena:</b> %s"
+msgstr "<b>Kanalaren Izena:</b> %s"
 
 #, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<br><b>Erabiltzaile-kontua:</b> %d"
+msgstr "<br><b>Erabiltzaile-Kontua:</b> %d"
 
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
-msgstr "<br><b>Kanalaren sortzailea:</b> %s"
+msgstr "<br><b>Kanalaren Sortzailea:</b> %s"
 
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "<br><b>Kanalaren zifratua:</b> %s"
+msgstr "<br><b>Kanalaren Zifratua:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
 #, c-format
@@ -8747,32 +8459,32 @@ msgstr "<br><b>Kanalaren HMAC:</b> %s"
 
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
-msgstr "<br><b>Kanalaren gaia:</b><br>%s"
+msgstr "<br><b>Kanalaren Gaia:</b><br>%s"
 
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
-msgstr "<br><b>Kanalaren moduak:</b> "
+msgstr "<br><b>Kanalaren Moduak:</b> "
 
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b>Sortzailearen hatz-marka:</b><br>%s"
+msgstr "<br><b>Sortzailearen Hatz-Marka:</b><br>%s"
 
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>Sortzailearen 'babble'-marka:</b><br>%s"
+msgstr "<br><b>Sortzailearen Babble-Marka:</b><br>%s"
 
 msgid "Add Channel Public Key"
-msgstr "Gehitu kanalaren gako publikoa"
+msgstr "Kanalaren Gako Publikoa Gehitu"
 
 #. Add new public key
 msgid "Open Public Key..."
-msgstr "Ireki gako publikoa..."
+msgstr "Gako Publikoa Ireki..."
 
 msgid "Channel Passphrase"
-msgstr "Kanalaren pasaesaldia"
+msgstr "Kanalaren Pasaesaldia"
 
 msgid "Channel Public Keys List"
-msgstr "Kanalaren gako publikoen zerrenda"
+msgstr "Kanalaren Gako Publikoen Zerrenda"
 
 #, c-format
 msgid ""
@@ -8782,148 +8494,144 @@ msgid ""
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"Kanalaren autentifikazioa baimendu gabeko sarbideetatik kanala babesteko "
-"erabiltzen da. Autentifikazioa pasaesaldian eta sinadura digitaletan "
-"oinarritzen da. Pasaesaldia ezartzen bada konektatzeko eskatuko da. "
-"Kanalaren gako publikoak ezartzen badira gako publikoak zerrendatzen "
-"dituzten erabiltzaileek bakarrik izango dute baimena konektatzeko."
+"Kanalaren autentifikazioari esker, baimendu gabeko sarrerak ekiditen dira. "
+"Pasaesaldian eta sinadura digitaletan oinarritu daiteke atentifikazioa. "
+"Pasaesaldia ezartzen bada, konektatu aurretik eskatuko da. Kanalaren gako "
+"publikoak ezartzen badira, bere gako publikoa zerrendatua duten "
+"erabiltzaileek bakarrik konektatu ahalko dira."
 
 msgid "Channel Authentication"
-msgstr "Kanalaren autentifikazioa"
+msgstr "Kanalaren Autentifikazioa"
 
 msgid "Add / Remove"
 msgstr "Gehitu / Kendu"
 
 msgid "Group Name"
-msgstr "Taldearen izena"
+msgstr "Taldearen Izena"
 
 msgid "Passphrase"
 msgstr "Pasaesaldia"
 
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Idatzi %s kanaleko talde pribatuaren izena eta pasaesaldia."
+msgstr "%s kanaleko talde pribatuaren izena eta pasaesaldia idatzi itzazu."
 
 msgid "Add Channel Private Group"
-msgstr "Gehitu kanal pribatuaren taldea"
+msgstr "Kanaleko Talde Pribatua Gehitu"
 
 msgid "User Limit"
-msgstr "Erabiltzaile-muga"
+msgstr "Erabiltzaile-Muga"
 
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
-"Ezarri erabiltzailearen muga kanalean. Ezarri zerora erabiltzailearen muga "
-"berrasieratzeko "
+"Erabiltzaile-muga ezarri kanalean. Zero ezarri ezazu erabiltzaile-muga "
+"kentzeko."
 
 msgid "Invite List"
-msgstr "Gonbidatuen zerrenda"
+msgstr "Gonbidatu-Zerrenda"
 
 msgid "Ban List"
-msgstr "Kanporatutakoen zerrenda"
+msgstr "Betatu-Zerrenda"
 
 msgid "Add Private Group"
-msgstr "Gehitu talde pribatua"
+msgstr "Talde Pribatua Gehitu"
 
 msgid "Reset Permanent"
-msgstr "Berrasieratu iraunkortasuna"
+msgstr "Iraunkortasuna Kendu"
 
 msgid "Set Permanent"
-msgstr "Ezarri iraunkortasuna"
+msgstr "Iraunkortasuna Ezarri"
 
 msgid "Set User Limit"
-msgstr "Ezarri erabiltzailearen muga"
+msgstr "Erabiltzaile-Muga Ezarri"
 
 msgid "Reset Topic Restriction"
-msgstr "Berreasieratu gai-murriztapena"
+msgstr "Gai-Murrizketa Kendu"
 
 msgid "Set Topic Restriction"
-msgstr "Ezarri gai-murriztapena"
+msgstr "Gai-Murrizketa Ezarri"
 
 msgid "Reset Private Channel"
-msgstr "Berrasieratu kanal pribatua"
+msgstr "Kanal Pribatua Kendu"
 
 msgid "Set Private Channel"
-msgstr "Ezarri kanal pribatua"
+msgstr "Kanal Pribatua Ezarri"
 
 msgid "Reset Secret Channel"
-msgstr "Berrasieratu kanal sekretua"
+msgstr "Kanal Sekretua Kendu"
 
 msgid "Set Secret Channel"
-msgstr "Ezarri kanal sekretua"
+msgstr "Kanal Sekretua Ezarri"
 
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
-msgstr ""
-"%s kanalera konektatu behar zara talde pribatu batera konektatu aurretik"
+msgstr "%s kanalera konektatu behar zara talde pribatura batu aurretik"
 
 msgid "Join Private Group"
-msgstr "Konektatu talde pribatura"
+msgstr "Talde Pribatura Batu"
 
 msgid "Cannot join private group"
-msgstr "Ezin da talde pribatura konektatu"
+msgstr "Ezin talde pribatura batu"
 
 msgid "Call Command"
-msgstr "Deitu Komandoa"
+msgstr "Agindua Deitu"
 
 msgid "Cannot call command"
-msgstr "Ezin da komandoari deitu"
+msgstr "Ezin agindua deitu"
 
 msgid "Unknown command"
-msgstr "Komando ezezaguna"
+msgstr "Agindu ezezaguna"
 
 msgid "Secure File Transfer"
-msgstr "Fitxategi-transferentzia segurua"
+msgstr "Fitxategi-Transferentzia Segurua"
 
 msgid "Error during file transfer"
-msgstr "Errorea fitxategia transferitzean"
+msgstr "Errorea Fitxategi-Transferentzian"
 
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s Deskonektatuta."
+msgstr "Urrunekoa deskonektatua"
 
 msgid "Permission denied"
-msgstr "Baimena ukatua"
+msgstr "Baimena Ukatua"
 
 msgid "Key agreement failed"
 msgstr "Gako-hitzarmenak huts egin du"
 
-#, fuzzy
 msgid "Connection timed out"
-msgstr "Konexioaren denbora-muga"
+msgstr "Konexioaren denbora-muga agortua"
 
-#, fuzzy
 msgid "Creating connection failed"
-msgstr "Konexioak huts egin du"
+msgstr "Ezin konexioa sortu"
 
 msgid "File transfer session does not exist"
 msgstr "Ez dago fitxategi-transferentzia saiorik "
 
 msgid "No file transfer session active"
-msgstr "Fitxategi-transferentzi saioa ez dago aktibo"
+msgstr "Ez dago fitxategi-transferentzia aktiborik"
 
 msgid "File transfer already started"
-msgstr "fitxategi-transferentzia hasita dago"
+msgstr "Jadanik hasi da fitxategi-transferentzia"
 
 msgid "Could not perform key agreement for file transfer"
-msgstr "Ezin izan da gako-hitzarmena landu fitxategia transferitzeko"
+msgstr "Ezin gako-hitzarmena burutu fitxategi-transferentziarako"
 
 msgid "Could not start the file transfer"
-msgstr "Ezin izan da fitxategi-transferentzia hasi"
+msgstr "Ezin fitxategi-transferentzia hasi"
 
 msgid "Cannot send file"
-msgstr "Ezin da fitxategia bidali."
+msgstr "Ezin fitxategia bidali"
 
 msgid "Error occurred"
-msgstr ""
+msgstr "Errorea"
 
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%s(e)k <I>%s</I> gaia aldatu du: %s"
+msgstr "%s(e)k gaia aldatu du <I>%s</I>: %s"
 
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr "<I>%s</I>(e)k <I>%s</I> kanalaren moduak ezarri ditu: %s"
+msgstr "<I>%s</I>(e)k kanalaren moduak ezarri ditu <I>%s</I>: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
@@ -8931,35 +8639,35 @@ msgstr "<I>%s</I>(e)k <I>%s</I> kanaleko modu guztiak kendu ditu"
 
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr "<I>%s</I>(e)k <I>%s</I>(e)n moduak ezarri ditu: %s"
+msgstr "<I>%s</I>(e)k moduak ezarri ditu <I>%s</I>: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr "<I>%s</I>(e)k <I>%s</I>(e)n modu guztiak kendu ditu"
+msgstr "<I>%s</I>(e)k <I>%s</I>(e)ko modu guztiak kendu ditu"
 
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "<I>%s</I>(e)tik <I>%s</I> erabiltzaileak kanporatu zaitu: (%s)"
+msgstr "<I>%s</I>(e)tik kanporatu zaitu <I>%s</I> erabiltzaileak: %s"
 
 #, c-format
 msgid "You have been killed by %s (%s)"
-msgstr "%s erabiltzaileak kanporatu zaitu: (%s)"
+msgstr "%s erabiltzaileak hil zaitu: %s"
 
 #, c-format
 msgid "Killed by %s (%s)"
-msgstr "%s(e)k kanporatu zaitu: (%s)"
+msgstr "%s erabiltzaileak hila: %s"
 
 msgid "Server signoff"
 msgstr "Zerbitzariak deskonektatu zaitu"
 
 msgid "Personal Information"
-msgstr "Informazio pertsonala"
+msgstr "Informazio Pertsonala"
 
 msgid "Birth Day"
 msgstr "Urtebetetzea"
 
 msgid "Job Role"
-msgstr "Funtzioa"
+msgstr "Laneko Funtzioa"
 
 msgid "Organization"
 msgstr "Erakundea"
@@ -8967,71 +8675,67 @@ msgstr "Erakundea"
 msgid "Unit"
 msgstr "Saila"
 
-msgid "Note"
-msgstr "Oharra"
-
 msgid "Join Chat"
-msgstr "Sartu berriketa batean"
+msgstr "Berriketara Batu"
 
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
-msgstr "<I>%s</I> kanalaren sortailea zara."
+msgstr "<I>%s</I> kanalaren sortzailea zara"
 
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "<I>%s</I> kanalaren sortailea  <I>%s</I> da"
+msgstr "<I>%s</I> kanalaren sortzailea <I>%s</I> da"
 
 msgid "Real Name"
-msgstr "Benetako izena "
+msgstr "Benetako Izena "
 
 msgid "Status Text"
-msgstr "Egoera-testua"
+msgstr "Egoera-Testua"
 
 msgid "Public Key Fingerprint"
-msgstr "Gako pubilkoaren hatz-marka"
+msgstr "Gako Publikoaren Hatz-Marka"
 
 msgid "Public Key Babbleprint"
-msgstr "Gako publikoaren 'babble'-marka"
+msgstr "Gako Publikoaren 'Babble'-Marka"
 
 msgid "_More..."
 msgstr "_Gehiago..."
 
 msgid "Detach From Server"
-msgstr "Askatu zerbitzaritik"
+msgstr "Zerbitzaritik Askatu"
 
 msgid "Cannot detach"
-msgstr "Ezin da askatu"
+msgstr "Ezin askatu"
 
 msgid "Cannot set topic"
-msgstr "Ezin da gaia ezarri"
+msgstr "Ezin gaia ezarri"
 
 msgid "Failed to change nickname"
-msgstr "Huts egin du goitizena aldatzean"
+msgstr "Errorea ezizena aldatzean"
 
 msgid "Roomlist"
-msgstr "Gelen zerrenda"
+msgstr "Gela-Zerrenda"
 
 msgid "Cannot get room list"
-msgstr "Ezin da gela-zerrenda hartu."
+msgstr "Ezin gela-zerrenda eskuratu"
 
-#, fuzzy
 msgid "Network is empty"
-msgstr "Sareko estatistikak"
+msgstr "Sareko hutsik"
 
 msgid "No public key was received"
 msgstr "Ez da gako publikorik jaso"
 
 msgid "Server Information"
-msgstr "Zerbitzariaren informazioa"
+msgstr "Zerbitzari-Informazioa"
 
 msgid "Cannot get server information"
-msgstr "Ezin da zerbitzariaren informazioa hartu"
+msgstr "Ezin zerbitzari-informazioa eskuratu"
 
 msgid "Server Statistics"
-msgstr "Zerbitzariaren estatistikak"
+msgstr "Zerbitzari-Estatistikak"
 
 msgid "Cannot get server statistics"
-msgstr "Ez dago zerbitzarien estatistikarik hartu"
+msgstr "Ezin zerbitzari-estatistikarik eskuratu"
 
 #, c-format
 msgid ""
@@ -9051,15 +8755,15 @@ msgid ""
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
-"Zerbitzari lokaleko abioaren ordua: %s\n"
-"Zerbitzari lokaleko abio iraupena: %s\n"
-"Zerbitzari lokaleko bezeroak: %d\n"
-"Zerbitzari lokaleko kanalak: %d\n"
-"Zerbitzari lokaleko operadoreak: %d\n"
-"Bideratzaile lokaleko operadoreak: %d\n"
-"Gelaxka lokaleko bezeroak: %d\n"
-"Gelaxka lokaleko kanalak: %d\n"
-"Gelaxka lokaleko zerbitzariak: %d\n"
+"Zerbitzariaren abio-ordu lokala: %s\n"
+"Zerbitzariaren abio-iraupen lokala: %s\n"
+"Zerbitzariaren bezero loakalak: %d\n"
+"Zerbitzariaren kanal lokalak: %d\n"
+"Zerbitzariaren operadore lokalak: %d\n"
+"Bideratzaile-operadore lokalak: %d\n"
+"Gelaxka-bezero lokalak: %d\n"
+"Gelaxka-kanal lokalak: %d\n"
+"Gelaxka-zerbitzari lokalak: %d\n"
 "Guztira bezeroak: %d\n"
 "Guztira kanalak: %d\n"
 "Guztira zerbitzariak: %d\n"
@@ -9068,26 +8772,28 @@ msgstr ""
 "Guztira bideratzaile-operadoreak: %d\n"
 
 msgid "Network Statistics"
-msgstr "Sareko estatistikak"
+msgstr "Sare-Estatistikak"
+
+msgid "Ping"
+msgstr "Ping"
 
 msgid "Ping failed"
-msgstr "Ping-ek huts egin du"
+msgstr "Ping-ak huts egin du"
 
 msgid "Ping reply received from server"
 msgstr "Ping erantzuna jaso da zerbitzaritik"
 
 msgid "Could not kill user"
-msgstr "Ezin izan da erabiltzailea kanporatu"
+msgstr "Ezin erabiltzailea hil"
 
 msgid "WATCH"
-msgstr ""
+msgstr "ZELATATU"
 
-#, fuzzy
 msgid "Cannot watch user"
-msgstr "Ezin duzu zure burua gehitu"
+msgstr "Ezin erabiltzailea zelatatu"
 
 msgid "Resuming session"
-msgstr "Saioa berriro hasten"
+msgstr "Sesioa berrabiarazten"
 
 msgid "Authenticating connection"
 msgstr "Konexioa autentifikatzen"
@@ -9103,12 +8809,12 @@ msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
-"%s(r)en gako publikoa jaso da. Gako hau ez dator bat lokaleko kopiarekin. "
-"Hala ere gako publiko hau onartzea nahi duzu?"
+"%s(r)en gako publikoa jaso da. Gako hau ez dator bat zure kopia lokalarekin. "
+"Hala ere, gako publiko hau onartu nahi duzu?"
 
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "%s(r)en gako publikoa jaso da. Gako publiko hau onartzea nahi duzu?"
+msgstr "%s(r)en gako publikoa jaso da. Gako publiko hau onartu nahi duzu?"
 
 #, c-format
 msgid ""
@@ -9123,62 +8829,54 @@ msgstr ""
 "%s\n"
 
 msgid "Verify Public Key"
-msgstr "Egiaztatu gako publikoa"
+msgstr "Gako Publikoa Egiaztatu"
 
 msgid "_View..."
 msgstr "_Ikusi..."
 
 msgid "Unsupported public key type"
-msgstr "Gako publiko mota ez da onartzen"
+msgstr "Gako publiko mota ulergaitza"
 
 msgid "Disconnected by server"
-msgstr "Zerbitzariak deskonektatu zaitu "
+msgstr "Zerbitzariak deskonektatua"
 
-msgid "Error during connecting to SILC Server"
-msgstr "Errorea SILC zerbitzariarekin konektatzean"
+msgid "Error connecting to SILC Server"
+msgstr "Errorea SILC-Zerbitzarira konektatzean"
 
 msgid "Key Exchange failed"
-msgstr "Gako-trukatzeak huts egin du"
+msgstr "Huts egin du Gako-Trukeak"
 
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"Huts egin du askatutako saio berriro hastean. Konektatu berriro konexio "
+"Ezin askatutako sesioa berrabiarazi. Berkonektatu sakatu ezazu konexio "
 "berria sortzeko."
 
-msgid "Connection failed"
-msgstr "Konexioak huts egin du"
-
 msgid "Performing key exchange"
-msgstr "Gako-trukatzea lantzen"
-
-msgid "Unable to create connection"
-msgstr "Ezin da konexio sortu."
+msgstr "Gako-trukea burutzen"
 
-#, fuzzy
-msgid "Could not load SILC key pair"
-msgstr "Ezin da SILC gako-parea : %s kargatu."
+msgid "Unable to load SILC key pair"
+msgstr "Ezin SILC gako parea kargatu"
 
 #. Progress
 msgid "Connecting to SILC Server"
-msgstr "SILC zerbitzariarekin konektatzen"
+msgstr "SILC zerbitzarira konektatzen"
 
 msgid "Out of memory"
-msgstr "Memoriarik ez"
+msgstr "Memoria agortuta"
 
-msgid "Cannot initialize SILC protocol"
-msgstr "Ezin izan da SILC protokoloa hasieratu"
+msgid "Unable to initialize SILC protocol"
+msgstr "Ezin SILC protokoloa hasieratu"
 
-#, fuzzy
 msgid "Error loading SILC key pair"
-msgstr "SILC gako bikotea sortzen..."
+msgstr "Errorea SILC gako parea kargatzean"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Download %s: %s"
-msgstr "Eraibltzaileak %s(e)n: %s"
+msgstr "%s deskargatu: %s"
 
 msgid "Your Current Mood"
-msgstr "Uneko umorea"
+msgstr "Zure Umorea Orain"
 
 #, c-format
 msgid "Normal"
@@ -9192,7 +8890,7 @@ msgid ""
 "Your Preferred Contact Methods"
 msgstr ""
 "\n"
-"Kontaktu-metodo hobetsiak"
+"Zure Kontaktu-Metodo Hobetsiak"
 
 msgid "SMS"
 msgstr "SMS"
@@ -9201,27 +8899,27 @@ msgid "MMS"
 msgstr "MMS"
 
 msgid "Video conferencing"
-msgstr "Bideo-konferentzia "
+msgstr "Bideo-Konferentzia "
 
 msgid "Your Current Status"
-msgstr "Uneko egoera"
+msgstr "Zure Egoera Orain"
 
 msgid "Online Services"
-msgstr "Zerbitzuak linean"
+msgstr "Online Zerbitzuak"
 
 msgid "Let others see what services you are using"
-msgstr "Utzi besteei erabiltzen ari zaren zerbitzuak ikusten"
+msgstr "Zein zerbitzu darabilzkizun erakutsi besteei"
 
 msgid "Let others see what computer you are using"
-msgstr "Utzi besteei erabiltzen ari zaren ordenagailua ikusten"
+msgstr "Zein ordenagailu darabilzun erakutsi besteei"
 
 msgid "Your VCard File"
-msgstr "VCard fitxategia"
+msgstr "Zure VCard-Fitxategia"
 
-#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "Ordu-zona"
+msgstr "Ordu-zona (UTC)"
 
+#, fuzzy
 msgid "User Online Status Attributes"
 msgstr "Erabiltzailearen lineako egoeraren atributuak"
 
@@ -9230,193 +8928,189 @@ msgid ""
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
-"Utzi beste erabiltzaileei zure lineako egoeraren informazioa eta zure "
-"informazio pertsonala ikusten. Bete zuri buruzko informazioa, beste "
-"erabiltzaileek ikustea nahiko zenukeena."
+"Zure online-egoeraren informazioa eta zure informazio pertsonala erakutsi "
+"diezaiekezu besteei. Beste erabiltzaileek ikustea gustatuko litzaizukeen "
+"informazioa bete ezazu."
 
 msgid "Message of the Day"
-msgstr "Eguneko mezua"
+msgstr "Eguneko Mezua"
 
 msgid "No Message of the Day available"
-msgstr "Ez dago eguneko mezu erabilgarririk"
+msgstr "Ez dago Eguneko Mezurik eskuragarri"
 
 msgid "There is no Message of the Day associated with this connection"
-msgstr "Ez dago konexio honekin asoziatutako eguneko mezurik."
+msgstr "Ez dago konexio honekin asoziatutako Eguneko Mezurik."
 
 msgid "Create New SILC Key Pair"
-msgstr "SILC gako bikotea berria sortzen..."
+msgstr "SILC Gako Bikotea Berria Sortu"
 
-#, fuzzy
 msgid "Passphrases do not match"
-msgstr "Pasahitz berriak ez datoz bat."
+msgstr "Pasaesaldiak ez datoz bat"
 
-#, fuzzy
 msgid "Key Pair Generation failed"
-msgstr "Gako-hitzarmenak huts egin du"
+msgstr "Ezin Gako Parea Sortu"
 
 msgid "Key length"
-msgstr "Gakoa luzera"
+msgstr "Gako-luzera"
 
 msgid "Public key file"
-msgstr "Gako publikoaren fitxategia "
+msgstr "Gako publikoaren fitxategia"
 
 msgid "Private key file"
 msgstr "Gako pribatuaren fitxategia "
 
-#, fuzzy
 msgid "Passphrase (retype)"
-msgstr "Pasaesaldia behar da"
+msgstr "Pasaesaldia (berriro)"
 
 msgid "Generate Key Pair"
-msgstr "Gako bikote berria egin"
+msgstr "Gako-Bikotea Sortu"
 
 msgid "Online Status"
-msgstr "Egoera linean"
+msgstr "Online Egoera"
 
 msgid "View Message of the Day"
-msgstr "Ikusi eguneko mezua"
+msgstr "Eguneko Mezua Ikusi"
 
-#, fuzzy
 msgid "Create SILC Key Pair..."
-msgstr "SILC gako bikotea sortzen..."
+msgstr "SILC Gako Bikotea Sortu"
 
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "<I>%s</I> erabiltzailea ez dago sarean"
 
 msgid "Topic too long"
-msgstr "Gaia luzeegia da."
+msgstr "Gai luzeegia"
 
 msgid "You must specify a nick"
-msgstr "Goitizena zehaztu behar duzu"
+msgstr "Ezizen bat zehaztu behar duzu"
 
 #, c-format
 msgid "channel %s not found"
-msgstr "%s kanala ez da aurkitu"
+msgstr "ezin %s kanala aurkitu"
 
 #, c-format
 msgid "channel modes for %s: %s"
-msgstr "%s(r)en kanal moduak: %s"
+msgstr "%s kanalaren moduak: %s"
 
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr "ez da %s(r)en kanal modurik ezarri"
+msgstr "ez da %s kanalaren modurik ezarri"
 
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "Huts egin du %s(r)en moduak ezartzean"
+msgstr "Ezin %s(r)en cmoduak ezarri"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Komando ezezaguna: %s (Pidgin-en akatsa izan daiteke)"
+msgstr "Agindu ezezaguna: %s (bezeroaren akatsa izan daiteke)"
 
 msgid "part [channel]:  Leave the chat"
-msgstr "part [kanala]:  irten berriketatik"
+msgstr "part [kanala]:  Kanaletik irten"
 
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [kanala]:  irten berriketatik"
+msgstr "leave [kanala]:  Kanaletik irten"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;gai berria&gt;]: ikusi edo aldatu gaia"
+msgstr "topic [&lt;gai berria&gt;]:  Gaia ikusi edo aldatu"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
-"join &lt;kanala&gt; [&lt;pasahitza&gt;]:  konektatu sare honetako kanal "
-"batera"
+"join &lt;kanala&gt; [&lt;pasahitza&gt;]:  Sare honetako kanal batera batu"
 
 msgid "list:  List channels on this network"
-msgstr "list: zerrendatu sare honetako kanalak"
+msgstr "list:  Sare honetako kanalak zerrendatu"
 
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;goitizena&gt;: ikusi goitizenaren informazioa"
+msgstr "whois &lt;ezizena&gt;:  Ezizenaren informazioa ikusi"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
-"msg &lt;goitizena&gt; &lt;mezua&gt;: bidali mezu pribatua erabiltzaileari"
+"msg &lt;ezizena&gt; &lt;mezua&gt;:  Erabiltzaileari mezu pribatua bidali"
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
-"query &lt;goitizena&gt; [&lt;mezua&gt;]: bidali mezu pribatua erabiltzaileari"
+"query &lt;ezizena&gt; [&lt;mezua&gt;]:  Erabiltzaileari mezu pribatua bidali"
 
 msgid "motd:  View the server's Message Of The Day"
-msgstr "motd:  ikusi zerbitzariaren eguneko mezua"
+msgstr "motd:  Zerbitzariaren Eguneko Mezua ikusi"
 
 msgid "detach:  Detach this session"
-msgstr "detach:  askatu saio honetatik"
+msgstr "detach:  Sesio hau askatu"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [mezua]:  deskonektatu zerbitzaritik, aukerazko mezu batekin"
+msgstr ""
+"quit [mezua]:  Zerbitzaritik deskonektatu, mezu bat utziz (nahi izanez gero)"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;komandoa&gt;: deitu silc bezeroko edozein komandori"
+msgstr "call &lt;agindua&gt;:  Ezizein silc-bezero agindu deitu"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;goitizena&gt; [-pubkey|&lt;arrazoia&gt;]: hil goitizena "
+msgstr "kill &lt;ezizena&gt; [-pubkey|&lt;arrazoia&gt;]: Ezizena hil"
 
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;goitizen-berria&gt;:  aldatu zure goitizena"
+msgstr "nick &lt;ezizen-berria&gt;:  Zure ezizena aldatu"
 
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;goitizena&gt;: ikusi goitizenaren informazioa"
+msgstr "whowas &lt;ezizena&gt;:  Ezizenaren informazioa ikusi"
 
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"cmode &lt;kanala&gt; [+|-&lt;moduak&gt;] [argumentuak]:  aldatu edo bistarau "
-"kanalaren moduak"
+"cmode &lt;kanala&gt; [+|-&lt;moduak&gt;] [argumentuak]:  Kanalaren moduak "
+"ikusi edo aldatu"
 
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
-"cumode &lt;kanala&gt; +|-&lt;moduak&gt; &lt;goitizena&gt;:  aldatu kanaleko "
-"goitizenaren moduak"
+"cumode &lt;kanala&gt; +|-&lt;moduak&gt; &lt;ezizena&gt;:  Kanaleko ezizenen "
+"moduak aldatu"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;erabiltzaile-moduak&gt;: ezarri zure sareko moduak"
+msgstr "umode &lt;erabiltzaile-moduak&gt;:  Sareko zure moduak ezarri"
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
-"oper &lt;goitizena&gt; [-pubkey]: hartu zerbitzariko operadorearen eskubideak"
+"oper &lt;ezizena&gt; [-pubkey]: Zerbitzari-operadorearen eskubideak eskuratu"
 
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;kanala&gt; [-|+]&lt;goitizena&gt;:  gonbidatu goitizena edo "
-"gehitu/kendu kanaleko gonbidatuen zerrendatik "
+"invite &lt;kanala&gt; [-|+]&lt;ezizena&gt;:  Ezizena gonbidatu edo kanaleko "
+"gonbidatu-zerrendara gehitu/kendu"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
-"kick &lt;kanala&gt; &lt;goitizena&gt; [iruzkina]: bota bezeroa kanaletik"
+"kick &lt;kanala&gt; &lt;ezizena&gt; [iruzkina]:  Kanaletik bota bezeroa"
 
 msgid "info [server]:  View server administrative details"
-msgstr "info [server]:  ikusi zerbitzariko administrazioaren xehetasunak"
+msgstr "info [zerbitzaria]:  Zerbitzariaren administrazio-xehetasunak ikusi"
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;kanala&gt; +|-&lt;goitizena&gt;]: kanporatu bezeroa kanaletik"
+msgstr "ban [&lt;kanala&gt; +|-&lt;ezizena&gt;]:  Kanaletik betatu bezeroa"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
-"getkey &lt;goitizena|zerbitzaria&gt;:  eskuratu bezeroaren edo "
-"zerbitzariaren gako publikoa"
+"getkey &lt;ezizena|zerbitzaria&gt;:  Bezeroaren edo zerbitzariaren gako "
+"publikoa eskuratu"
 
 msgid "stats:  View server and network statistics"
-msgstr "stats:  ikusi zerbitzariaren eta sarearen estatistikak"
+msgstr "stats:  Zerbitzariaren eta sarearen estatistikak ikusi"
 
 msgid "ping:  Send PING to the connected server"
-msgstr "ping:  bidali PING konektatutako zerbitzarira"
+msgstr "ping:  PING bat bidali konektatuta zauden zerbitzarira"
 
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;kanala&gt;:  zerrendatu kanaleko erabiltzaileak"
+msgstr "users &lt;kanala&gt;:  Kanaleko erabiltzaileak zerrendatu"
 
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;kanala(s)&gt;:  zerrendatu "
-"kanale(ta)ko erabiltzaile zehatzak"
+"names [-count|-ops|-halfops|-voices|-normal] &lt;kanala(s)&gt;:  Kanale(ta)"
+"ko erabiltzaile zehatzak zerrendatu"
 
 #. *< type
 #. *< ui_requirement
@@ -9428,23 +9122,23 @@ msgstr ""
 #. *< version
 #. *  summary
 msgid "SILC Protocol Plugin"
-msgstr "SILC protokoloaren plugin-a"
+msgstr "SILC Protokolo-Plugina"
 
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "Interneteko Zuzeneko Konferentzia Segurua (SILC) protokoloa"
+msgstr "Interneteko Zuzeneko Konferentzia Segurua (SILC) Protokoloa"
 
 msgid "Network"
 msgstr "Sarea"
 
 msgid "Public Key file"
-msgstr "Gako publikoaren fitxategia"
+msgstr "Gako Publikoaren fitxategia"
 
 msgid "Private Key file"
-msgstr "Gako pribatuaren fitxategia"
+msgstr "Gako Pribatuaren fitxategia"
 
 msgid "Cipher"
-msgstr "Zifra"
+msgstr "Zifratua"
 
 msgid "HMAC"
 msgstr "HMAC "
@@ -9456,46 +9150,45 @@ msgid "Public key authentication"
 msgstr "Gako publikoaren autentifikazioa"
 
 msgid "Block IMs without Key Exchange"
-msgstr "Blokeatu IMak gako-trukatzerik gabe"
+msgstr "Gako-trukerik gabe IMak blokeatu"
 
 msgid "Block messages to whiteboard"
-msgstr "Mezuak blokeatu \"whiteboard\" -ean "
+msgstr "Arbelerako mezuak blokeatu"
 
 msgid "Automatically open whiteboard"
-msgstr "Automatikoki zabaldu whiteboard-a"
+msgstr "Automatikoki ireki arbela"
 
 msgid "Digitally sign and verify all messages"
-msgstr "Sinatu digitalki eta mezu guztiak ondo daudela zihurtatu"
+msgstr "Mezu guztiak digitalki sinatu eta egiaztatu"
 
 msgid "Creating SILC key pair..."
 msgstr "SILC gako bikotea sortzen..."
 
-#, fuzzy
-msgid "Cannot create SILC key pair\n"
-msgstr "SILC gako bikotea sortzen..."
+msgid "Unable to create SILC key pair"
+msgstr "Ezin SILC gako bikotea sortu"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
 #, c-format
 msgid "Real Name: \t%s\n"
-msgstr "Benetako izena: \t%s\n"
+msgstr "Benetako Izena: \t%s\n"
 
 #, c-format
 msgid "User Name: \t%s\n"
-msgstr "Erabiltzaile-izena: \t%s\n"
+msgstr "Erabiltzaile-Izena: \t%s\n"
 
 #, c-format
 msgid "Email: \t\t%s\n"
-msgstr "Helbide elektronikoa.: \t\t%s\n"
+msgstr "E-posta: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
-msgstr "Ostalari-izena: \t%s\n"
+msgstr "Ostalari-Izena: \t%s\n"
 
 #, c-format
 msgid "Organization: \t%s\n"
-msgstr "Erakundearen izena: \t%s\n"
+msgstr "Erakundea: \t%s\n"
 
 #, c-format
 msgid "Country: \t%s\n"
@@ -9507,11 +9200,11 @@ msgstr "Algoritmoa: \t%s\n"
 
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "Gakoaren luzera: \t%d bit\n"
+msgstr "Gako-luzera: \t%d bit\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "Erakundearen izena: \t%s\n"
+msgstr "Bertsioa: \t%s\n"
 
 #, c-format
 msgid ""
@@ -9519,7 +9212,7 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
-"Gako publikoaren hatz-marka:\n"
+"Gako Publikoaren Hatz-Marka:\n"
 "%s\n"
 "\n"
 
@@ -9528,17 +9221,18 @@ msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"Gako publikoaren 'babble'-marka:\n"
+"Gako Publikoaren 'Babble'-Marka:\n"
 "%s"
 
 msgid "Public Key Information"
-msgstr "Gako publikoaren informazioa"
+msgstr "Gako Publikoaren Informazioa"
 
+#, fuzzy
 msgid "Paging"
-msgstr "Markatzea"
+msgstr "Orrikatzea"
 
 msgid "Video Conferencing"
-msgstr "Bideo-konferentzia"
+msgstr "Bideo-Konferentzia"
 
 msgid "Computer"
 msgstr "Ordenagailua"
@@ -9552,96 +9246,88 @@ msgstr "Terminala"
 # c-format
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
-"\"Whiteboard\" -era   %s mezua bidalia izan da. \"Whiteboard\" -a irekitzea "
-"nahi al duzu ?"
+msgstr "%s(e)k mezua bidali du arbelera. Arbela ireki nahi al duzu?"
 
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
-" bidalitako mezua %s \"Whiteboard\"-ko  %s kanalera.\"Whiteboard\"-a "
-"irekitzea nahi al duzu ?"
+"%s(e)k mezua bidali du %s kanaleko arbelera. Arbela ireki nahi al duzu?"
 
 msgid "Whiteboard"
-msgstr "\"Whiteboard\" "
+msgstr "Arbela"
 
 msgid "No server statistics available"
-msgstr "Ez dago zerbitzariaren estatistika eskuragarri"
+msgstr "Zerbitzari-estatistikarik ez eskuragarri"
+
+msgid "Error during connecting to SILC Server"
+msgstr "Errorea SILC Zerbitzariarekin konektatzean"
 
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Hutsegitea: bertsioa falta da. Eguneratu bezeroa"
+msgstr "Hutsegitea: Bertsio-errorea; zure bezeroa eguneratu ezazu"
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Hutsegitea: urrunekoak ez du zure gako publikoan fidatzen/onartzen"
+msgstr "Hutsegitea: Urrunekoak ez du zure gako publikoa onartzen/jasaten"
 
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "Hutsegitea: urrunekoak ez du eskainitako KE taldea onartzen"
+msgstr "Hutsegitea: Urrunekoak ez du proposatutako KE taldea jasaten"
 
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "hutsegitea: urrunekoak ez du eskainitako zifratua "
+msgstr "Hutsegitea: Urrunekoak ez du proposatutako zifratua jasaten"
 
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Hutsegitea: urrunekoak ez du eskainitako PKCS onartzen"
+msgstr "Hutsegitea: Urrunekoak ez du proposatutako PKCSa jasaten"
 
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "Hutsegitea: urrunekoak ez du eskainitako hash funtzioa onartzen"
+msgstr "Hutsegitea: Urrunekoak ez du proposatutako hash funtzioa jasaten"
 
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Hutsegitea: urrunekoak ez du eskainitako HMAC onartzen"
+msgstr "Hutsegitea: Urrunekoak ez du proposatutako HMACa jasaten"
 
 #, c-format
 msgid "Failure: Incorrect signature"
-msgstr "Hutsegitea: sinadura okerra"
+msgstr "Hutsegitea: Sinadura okerra"
 
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "Hutsegitea: cookie baliogabea"
+msgstr "Hutsegitea: Cookie baliogabea"
 
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "Hutsegitea: huts egin du autentifikatzean."
+msgstr "Hutsegitea: Huts egin du autentifikazioak"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "Ezin izan da SILC bezeroaren konexioa hasieratu"
+msgid "Unable to initialize SILC Client connection"
+msgstr "Ezin SILC Bezeroaren konexioa hasieratu"
 
-#, fuzzy
 msgid "John Noname"
-msgstr "Ez dago izenik"
+msgstr "John Izengabe"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Ezin da SILC gako-parea : %s kargatu."
+msgid "Unable to load SILC key pair: %s"
+msgstr "Ezin SILC gako parea kargatu: %s"
 
-msgid "Could not write"
-msgstr "Ezin izan da idatzi"
-
-msgid "Could not connect"
-msgstr "Ezin izan da konektatu"
-
-#, fuzzy
-msgid "Unknown server response."
-msgstr "Zerbitzari errore ezezaguna."
+msgid "Unable to create connection"
+msgstr "Ezin konexio sortu"
 
-msgid "Could not create listen socket"
-msgstr "Ezin izan da entzuteko socket-a sortu"
+msgid "Unknown server response"
+msgstr "Zerbitzari-erantzun ezezaguna"
 
-# ,fuzzy
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Ezin izan da ostalaria"
+msgid "Unable to create listen socket"
+msgstr "Ezin entzuteko socket-a sortu"
 
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "SIP goitizenek ezin dute zurigunerik izan edo @ ikurra"
+msgstr "SIP ezizenek ezin dute zuriunerik edo @ ikurrik eduki"
+
+msgid "SIP connect server not specified"
+msgstr "SIP konexio-zerbitzaria zehaztu gabe"
 
 #. *< type
 #. *< ui_requirement
@@ -9652,210 +9338,84 @@ msgstr "SIP goitizenek ezin dute zurigunerik izan edo @ ikurra"
 #. *< name
 #. *< version
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/SIMPLE protokoloaren plugin-a"
+msgstr "SIP/SIMPLE Protokolo-Plugina"
 
 #. *  summary
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/SIMPLE protokoloaren plugin-a"
+msgstr "SIP/SIMPLE Protokolo-Plugina"
 
 msgid "Publish status (note: everyone may watch you)"
-msgstr "Egoera argitaratu (oharra:Jende guztiak ikusi zaitzake)"
+msgstr "Egoera argitaratu (oharra: edozeinek ikusi dezake)"
 
 msgid "Use UDP"
-msgstr "Erabilli UDP"
+msgstr "UDP erabili"
 
 msgid "Use proxy"
-msgstr "Erabili proxy-a"
+msgstr "Proxy bat erabili"
 
 msgid "Proxy"
 msgstr "Proxy-a"
 
-#, fuzzy
 msgid "Auth User"
-msgstr "AP erabiltzailea"
+msgstr "Erabiltzaile Autorizazioa"
 
-#, fuzzy
 msgid "Auth Domain"
-msgstr "Automatikoa"
-
-#, c-format
-msgid "Looking up %s"
-msgstr "%s bilatzen"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Huts egin du %s konexioak"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Konektatuta: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Ezin da %s fitxategian idatzi"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Ezin da %s fitxategia irakurri."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Mezua luzeegia, azken %s byteak trunkatu egin dira."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s ez dago une honetan konektatuta."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s erabiltzailearen abisua ez da onartzen."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Mezu bat jaregin da, zerbitzariaren abiadura-muga gainditu duzu."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s(e)ko berriketa ez dago erabilgarri."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Mezuak bizkorregi bidaltzen ari zara -> %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "%s erabiltzailearen BM bat ez zaizu heldu, handiegia delako."
+msgstr "Domeinu Autorizazioa"
 
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "%s erabiltzailearen BM bat ez zaizu heldu, bizkorregi bidali delako."
-
-#, c-format
-msgid "Failure."
-msgstr "Huts egin du."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Emaitza gehiegi."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Identifikatzaile gehiago behar dira."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Dir zerbitzua ez dago erabilgarri une honetan."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Helbide elektronikoaren bilaketa murriztu da. "
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Gako-hitza ez ikusi egin da."
-
-#, c-format
-msgid "No keywords."
-msgstr "Gako-hitzik ez."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Erabiltzaileak ez du direktorio-informaziorik."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Estatua ez da onartzen."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;gela&gt;:  Yahoo sareko berriketa-gela batera batu"
 
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Hutsegite ezezaguna: %s."
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Yahoo sareko gelak zerrendatu"
 
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Goitizen edo pasahitz okerra."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Doodle-sesio bat hasteko eskatu erabiltzaileari"
 
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Zerbitzua ez dago erabilgarri une honetan."
+msgid "Yahoo ID..."
+msgstr "Yahoo IDa..."
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Zure abisu-maila altuegia da konektatu ahal izateko."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! Protokolo-Plugina"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "Pager server"
 msgstr ""
-"Maizegi konektatzen eta deskonektatzen aritu zara. Itxaron hamar minutu eta "
-"saiatu berriro. Saiatzen jarraituz gero, agian gehiago ere itxaron beharko "
-"duzu."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Sartzeko errore ezezagun bat gertatu da: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Errore ezezagun bat (%d) gertatu da. Informazioa: %s."
-
-msgid "Invalid Groupname"
-msgstr "Talde-izena ez da baliozkoa"
-
-msgid "Connection Closed"
-msgstr "Konexioa itxi da"
-
-msgid "Waiting for reply..."
-msgstr "Erantzunaren zain..."
-
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC itzuli da pausalditik. Mezuak bidal diezazkiokezu."
-
-msgid "Password Change Successful"
-msgstr "Pasahitza ondo aldatu da"
-
-msgid "_Group:"
-msgstr "_Taldea:"
 
-msgid "Get Dir Info"
-msgstr "Hartu Dir informazioa"
+msgid "Pager port"
+msgstr ""
 
-msgid "Set Dir Info"
-msgstr "Ezarri Dir informazioa"
+msgid "File transfer server"
+msgstr "Fitxategi-transferentzia zerbitzaria"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Ezin izan da %s ireki idazteko!"
+msgid "File transfer port"
+msgstr "Fitxategi-transferentzia ataka"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Fitxategi-transferentziak huts egin du; beste aldekoak beharbada bertan "
-"behera utziko zuen."
+msgid "Chat room locale"
+msgstr "Solasaldi-gelaren lokalizazioa"
 
-msgid "Could not connect for transfer."
-msgstr "Ezin izan da konektatu transferentzia egiteko."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Konferentzia eta berriketa-geletarako gonbidapenak ezikusi"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-"Ezin izan da idatzi fitxategi-goiburua. Fitxategia ez da transferituko."
+msgid "Chat room list URL"
+msgstr "Berriketa-gelen zerrendaren URLa"
 
-#, fuzzy
-msgid "Save As..."
-msgstr "Gorde ikonoa honela..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo Solasaldi zerbitzaria"
 
-#, 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] ""
-"%1$s(e)k fitxategi %3$d onartzea eskatu dio %2$s(r)i: %4$s (%5$.2f %6$s)%7$s%"
-"8$s"
-msgstr[1] ""
-"%1$s(e)k %3$d fitxategi onartzea eskatu dio %2$s(r)i: %4$s (%5$.2f %6$s)%7$s%"
-"8$s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Solasaldi ataka"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s erabiltzaileak fitxategi bat bidaltzea eskatu dizu"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN IDa..."
 
 #. *< type
 #. *< ui_requirement
@@ -9867,15 +9427,14 @@ msgstr "%s erabiltzaileak fitxategi bat bidaltzea eskatu dizu"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC protokoloaren plugin-a"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! JAPAN Protokolo-Plugina"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgid "Your SMS was not delivered"
+msgstr "Ez da zure SMSa bidali"
 
 msgid "Your Yahoo! message did not get sent."
-msgstr "Yahoo! mezua ez da bidali."
+msgstr "Ez da zure Yahoo!-mezua bidali."
 
 #, c-format
 msgid "Yahoo! system message for %s:"
@@ -9886,245 +9445,191 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s erabiltzaileak bera zure zerrendan gehitzeko eskaera ukatu du "
-"(atzeraeraginez). Arrazoia: %s."
+"%s(e)k ez dizu bera zure zerrendara gehitzen uzten (erretroaktiboki). "
+"Arrazoia: %s."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s erabiltzaileak bera zure zerrendan gehitzeko eskaera ukatu du "
-"(atzeraeraginez)."
+msgstr "%s(e)k ez dizu bera zure zerrendara gehitzen uzten (erretroaktiboki)."
 
 msgid "Add buddy rejected"
-msgstr "Laguna gehitzea ezetsita"
+msgstr "Lagun-gehitzea ezetsita"
 
-#, fuzzy, c-format
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Datu baliogabeak jaso dira"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Kontua blokeatuta: Konexio-saiakera gehiegi hutsegin dira.  Yahoo! webgunean "
+"konektatuz konpon liteke."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Kontua blokeatuta: Arrazoi ezezaguna.  Yahoo! webgunean konektatuz konpon "
+"liteke."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Erabiltzaile-izen edo pasahitza falta"
+
+#, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
 "Yahoo zerbitzariak autentifikatzeko metodo ezezagun bat erabiltzea eskatu "
-"du. Pidgin-en bertsio hau ez da gai izango Yahoo-n ondo sartzeko. Eguneratzeak "
-"lortzeko, begiratu %s gunean."
+"du.  Ziurrenik ezingo duzu Yahoo-ra konektatu.  %s(e)ra joan eguneraketa "
+"bila."
 
 msgid "Failed Yahoo! Authentication"
-msgstr "Huts egin du Yahoo! autentifikazioak"
+msgstr "Huts egin du Yahoo!-Autentifikazioak"
 
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
-"%s erabiltzaileari ez ikusi egiten saiatu zara, baina zure lagunen zerrendan "
-"dago. \"Bai\" hautatuz gero, laguna kendu eta ez ikusi egingo zaio."
+"%s ezikusten saiatu zara, baina erabiltzailea zure lagun-zerrendan dago. "
+"\"Bai\" hautatuz gero, laguna kendu eta ezikusi egingo da."
 
 msgid "Ignore buddy?"
-msgstr "Lagunari ez ikusi egin nahi diozu?"
+msgstr "Laguna ezikusi?"
 
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Kontua blokeatuta dago, konektatu yahoo-ren web gunean."
+msgstr "Zure kontua blokeatuta dago; Yahoo! webgunean konektatu zaitez."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"%d errore-zenbaki ezezaguna. Yahoo-ren web gunean konektatzeak arazoa konpon "
-"dezake."
+"%d errore-zenbaki ezezaguna. Yahoo-ren webgunean konektatzean arazoa konpon "
+"daiteke."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Ezin izan da %s laguna %s taldean gehitu, %s kontuko zerbitzari-zerrendan."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "Ezin %s laguna %s taldera gehitu, %s kontuko zerbitzari-zerrendan."
 
-msgid "Could not add buddy to server list"
-msgstr "Ezin izan da laguna zerbitzari-zerrendan gehitu"
+msgid "Unable to add buddy to server list"
+msgstr "Ezin laguna zerbitzari-zerrendara gehitu"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr "[ Entzungai %s/%s/%s.swf ] %s"
+msgstr "[ Entzungarri %s/%s/%s.swf ] %s"
 
-#, fuzzy
-msgid "Received unexpected HTTP response from server."
-msgstr "Erantzun baliogabea zerbitzaritik."
-
-msgid "Connection problem"
-msgstr "Konexio-arazoa"
+msgid "Received unexpected HTTP response from server"
+msgstr "Espero ez zen HTTP-erantzuna jaso da zerbitzaritik"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr "Solasaldiak %s(r)ekin"
+#, c-format
+msgid "Lost connection with %s: %s"
+msgstr "%s(r)ekiko konexioa galduta: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Ezin konexioa ezarri %s(r)ekin: %s"
 
 msgid "Not at Home"
-msgstr "Ez dago etxean "
+msgstr "Etxetik Kanpo"
 
 msgid "Not at Desk"
-msgstr "Ez dago bere mahaian "
+msgstr "Mahaitik Urrun"
 
 msgid "Not in Office"
-msgstr "Ez dago bulegoan "
+msgstr "Bulegotik Kanpo"
 
 msgid "On Vacation"
 msgstr "Oporretan"
 
 msgid "Stepped Out"
-msgstr "Irten egin da"
+msgstr "Kanpoan"
 
 msgid "Not on server list"
-msgstr "Ez dago zerbitzarien zerrendan"
+msgstr "Ez dago zerbitzari-zerrendan"
 
 msgid "Appear Online"
-msgstr "Agertu Linean"
+msgstr "Online Agertu"
 
-#, fuzzy
 msgid "Appear Permanently Offline"
-msgstr "Agertu Lineaz kanpo"
+msgstr "Iraunkorki Agertu Offline"
 
-#, fuzzy
 msgid "Presence"
-msgstr "Hobespenak"
+msgstr "Presentzia"
 
 msgid "Appear Offline"
-msgstr "Agertu Lineaz kanpo"
+msgstr "Offline Agertu"
 
-#, fuzzy
 msgid "Don't Appear Permanently Offline"
-msgstr "Agertu Lineaz kanpo"
+msgstr "Ez Iraunkorki Agertu Offline"
 
 msgid "Join in Chat"
-msgstr "Sartu berriketan"
+msgstr "Berriketara Batu"
 
 msgid "Initiate Conference"
-msgstr "Hasi konferentzia"
+msgstr "Konferentzia Hasi"
 
-#, fuzzy
 msgid "Presence Settings"
-msgstr "Erabili ingurune-ezarpenak"
+msgstr "Presentzia-Ezarpenak"
 
 msgid "Start Doodling"
-msgstr "Hasi \"Doodling\" "
+msgstr "Doodling Hasi"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Zein ID aktibatu?"
+msgid "Select the ID you want to activate"
+msgstr "Aktibatu nahi duzun IDa hautatu"
 
 msgid "Join whom in chat?"
-msgstr "Norekin elkartu nahi duzu berriketan?"
+msgstr "Norekin batu berriketan?"
 
 msgid "Activate ID..."
-msgstr "Aktibatu IDa..."
+msgstr "IDa Aktibatu..."
 
 msgid "Join User in Chat..."
-msgstr "Join User in Chat..."
+msgstr "Erabiltzailearekin Batu Elkarrizketan..."
 
-#, fuzzy
 msgid "Open Inbox"
-msgstr "Ireki Hotmail posta"
-
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;gela&gt;:  konektatu Yahoo sareko berriketa-gelara"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "zerrendatu: ZerrendatuYahoo sareko kanalak"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Request user to start a Doodle session"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! IDa"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo protokoloaren plugin-a"
-
-msgid "Yahoo Japan"
-msgstr "Japoniako yahoo"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy zerbitzaria"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japoniako bilagailuaren ostalaria"
-
-msgid "Pager port"
-msgstr "Bilagailuaren ataka"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Fitxategi-transferentzien ostalaria"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japoniako fitxategi-transferentzien ostalaria "
-
-msgid "File transfer port"
-msgstr "Fitxategi-transferentzien ataka"
-
-msgid "Chat room locale"
-msgstr "Berriketarako gela gunea"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Entzungor egin konferentzia eta berriketa-gela gonbidapenei"
-
-msgid "Chat room list URL"
-msgstr "Berriketa-gelen zerrendaren URLa "
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Japoniako yahoo"
+msgstr "Postontzia Ireki"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
-msgstr "Bidalia izan da \"Doodle\" eskaera "
+msgstr "Doodle-eskaera bidalita"
+
+msgid "Unable to connect."
+msgstr "Ezin konektatu."
 
 msgid "Unable to establish file descriptor."
-msgstr "Fitxategi-deskriptorea ezin da ezarri."
+msgstr "Ezin fitxategi-deskriptorea ezarri."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s  fitxategia bidaltzeko %s(r)i eskaria egiten"
+msgstr "%s(e)k %d fitxategiko taldea bidali nahi dizu.\n"
+
+msgid "Write Error"
+msgstr "Idazketa-Errorea "
 
 msgid "Yahoo! Japan Profile"
-msgstr "Japoniako yahoo-ren profila"
+msgstr "Japoniar Yahoo! Profila"
 
 msgid "Yahoo! Profile"
-msgstr "Yahoo-ren profila"
+msgstr "Yahoo! Profila"
 
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "Helduentzako edukia duten profilak ez dira onartzen orain"
+msgstr "Helduentzako edukia duten profilak ez dira jasaten oraindik."
 
-#, fuzzy
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"Profila ikusi nahi baduzu, bisitatu esteka hori zure web arakatzailearekin"
+"Profila hau ikusi nahi baduzu, esteka honetara jo beharko duzu zure web-"
+"arakatzailearekin"
 
 msgid "Yahoo! ID"
 msgstr "Yahoo! IDa"
@@ -10133,64 +9638,54 @@ msgid "Hobbies"
 msgstr "Zaletasunak"
 
 msgid "Latest News"
-msgstr "Azken berriak"
+msgstr "Azken Berriak"
 
 msgid "Home Page"
-msgstr "Etxeko orria"
+msgstr "Etxeko Orria"
 
 msgid "Cool Link 1"
-msgstr "Esteka bikaina 1"
+msgstr "Esteka Bikaina 1"
 
 msgid "Cool Link 2"
-msgstr "Esteka bikaina 2"
+msgstr "Esteka Bikaina 2"
 
 msgid "Cool Link 3"
-msgstr "Esteka bikaina 3"
+msgstr "Esteka Bikaina 3"
 
 msgid "Last Update"
-msgstr "Azken eguneratzea "
-
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s erabiltzailearen datuak ez daude erabilgarri"
+msgstr "Azken Eguneraketa"
 
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
-"Badirudi profila hau oraingoz onartzen ez den hizkuntza edo formatuan batean "
-"dagoela dirudi."
+"Profila hau oraingoz onartzen ez den hizkuntza edo formatu batean dago."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
-"Ezin izan da erabiltzailearen profila eskuratu. Zerbitzariaren arazo bat "
-"dela dirudi. Saiatu geroago"
+"Ezin erabiltzaile-profila eskuratu. Ziurrenik, zerbitzariaren aldiuneko "
+"arazo bat izango da. Saiatu zaitez geroago."
 
 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 ""
-"Ezin izan da erabiltzailearen profila eskuratu. Litekeena da erabiltzailea "
-"ez existitzea; hala ere batzuetan Yahoo-k huts egiten du erabiltzaile baten "
-"profila bilatzean. Saiatu geroago erabiltzailea existitzen dela ziur bazaude."
+"Ezin erabiltzaile-profila eskuratu. Ziurrenik, erabiltzailea ez da "
+"existitzen; hala ere, batzuetan Yahoo!-k huts egiten du erabiltzaile baten "
+"profila bilatzean. Ziur badakizu erabiltzailea existitzen dela, saiatu "
+"zaitez berriro geroago."
 
 msgid "The user's profile is empty."
-msgstr "Erabiltzailearen profila hutsik dago."
+msgstr "Erabiltzaile-profila hutsik dago."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s erabiltzaileak uko egin dio \"%s\" konferentzia-gelarako egin diozun "
-"gonbitari. Arrazoia: \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Gonbita ezetsi da"
+msgid "%s has declined to join."
+msgstr "%s ez da batu nahi."
 
 msgid "Failed to join chat"
-msgstr "Huts egin du berriketan sartzean"
+msgstr "Ezin berriketara batu"
 
 #. -6
 msgid "Unknown room"
@@ -10202,141 +9697,136 @@ msgstr "Gela beteta egon daiteke"
 
 #. -35
 msgid "Not available"
-msgstr "Ez dago erabilgarri"
+msgstr "Eskuragaitz"
 
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
-"Errore ezezaguna. Deskonektatzeko beharrean egongo zara eta 5 minutu itxoin "
-"berriketa-gela berriz konektatu baino lehen"
+"Errore ezezaguna. Agian, deskonektatu eta bost minutuz itxaron beharko duzu "
+"berriro gelara batu aurretik"
 
 #, c-format
 msgid "You are now chatting in %s."
-msgstr "Orain %s(e)n ari zara berriketan."
+msgstr "%s(e)n ari zara berriketan orain."
 
 msgid "Failed to join buddy in chat"
-msgstr "Huts egin du berriketako lagunarekin elkartzean"
+msgstr "Ezin lagunarekin batu berriketan"
 
 msgid "Maybe they're not in a chat?"
-msgstr "Beharbada ez zara berriketan egongo?"
+msgstr "Beharbada, ez daude berriketa batean?"
 
 msgid "Fetching the room list failed."
-msgstr "Huts egin du gela-zerrenda hartzean."
+msgstr "Errorea gela-zerrenda eskuratzean."
 
 msgid "Voices"
 msgstr "Ahotsak"
 
 msgid "Webcams"
-msgstr "Web kamerak"
+msgstr "Webkamerak"
+
+msgid "Connection problem"
+msgstr "Konexio-arazoa"
 
 msgid "Unable to fetch room list."
-msgstr "Ezin da gela-zerrenda hartu."
+msgstr "Ezin gela-zerrenda eskuratu."
 
 msgid "User Rooms"
-msgstr "Erabiltzaile-gelak"
-
-msgid "Connection problem with the YCHT server."
-msgstr "Konexio-arazoa YCHT zerbitzariarekin."
+msgstr "Erabiltzaile-Gelak"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Zerbitzaritik deskonektatuta zaude."
+msgid "Connection problem with the YCHT server"
+msgstr "Konexio-arazoa YCHT zerbitzariarekin"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
-"(Errore bat gertatu da mezu hau bihurtzean.\t Aztertu 'Kodeketa' aukera "
-"Kontu-editorean)"
+"(Errorea gertatu da mezu hau bihurtzean.\t 'Kodeketa' aukera egiaztatu ezazu "
+"Kontu-Editorean)"
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "Ezin da bidali berriketara %s,%s,%s "
+msgstr "Ezin berriketara bidali %s,%s,%s "
 
-#, fuzzy
 msgid "Hidden or not logged-in"
-msgstr "<br>Ezkutuan edo konektatu gabe"
+msgstr "Ezkutatua edo konektatu gabe"
 
 #, c-format
 msgid "<br>At %s since %s"
-msgstr "<br>Non: %s; noiztik: %s"
+msgstr "<br>%s(e)n; %s(e)z geroztik"
 
 msgid "Anyone"
-msgstr "Edozein"
+msgstr "Edonor"
 
 msgid "_Class:"
 msgstr "_Klasea:"
 
 msgid "_Instance:"
-msgstr "_Instantzia:"
+msgstr "_Istantzia:"
 
 msgid "_Recipient:"
 msgstr "_Hartzailea:"
 
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr "Huts egin du %s,%s,%s(e)ra harpidetzean"
+msgstr "Errorea %s,%s,%s(e)ra harpidetzean"
 
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;goitizena&gt;: kokatu erabiltzailea"
+msgstr "zlocate &lt;ezizena&gt;: Erabiltzailea kokatu"
 
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;goitizena&gt;: kokatu erabiltzailea"
+msgstr "zl &lt;ezizena&gt;: Erabiltzailea kokatu"
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"instance &lt;instantzia&gt;: ezarri klase honetan erabiliko den instantzia"
+"instance &lt;istantzia&gt;: Klase honetan erabiliko den istantzia ezarri"
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instantzia&gt;: ezarri klase honetan erabiliko den instantzia"
+msgstr "inst &lt;istantzia&gt;: Klase honetan erabiliko den istantzia ezarri"
 
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"topikoa &lt;instantzia&gt;: ezarri klase honetan erabiliko den instantzia"
+msgstr "topic &lt;istantzia&gt;: Klase honetan erabiliko den istantzia ezarri"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
-"sub &lt;klasea&gt; &lt;instantzia&gt; &lt;ontzia&gt;: konektatu berriketa "
-"berrira"
+"sub &lt;klasea&gt; &lt;istantzia&gt; &lt;hartzailea&gt;: Berriketa berri "
+"batera batu"
 
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
-"zi &lt;instantzia&gt;: bidali mezua hona: &lt;mezua,<i>instantzia</i>,*&gt;"
+"zi &lt;istantzia&gt;: Mezua bidali hona: &lt;mezua,<i>istantzia</i>,*&gt;"
 
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
-"zci &lt;klasea&gt; &lt;instantzia&gt;: bidali mezua hona: &lt;<i>klasea</i>,"
-"<i>instantzia</i>,*&gt;"
+"zci &lt;klasea&gt; &lt;istantzia&gt;: Mezua bidali hona: &lt;<i>klasea</i>,"
+"<i>istantzia</i>,*&gt;"
 
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zcir &lt;klasea&gt; &lt;instantzia&gt; &lt;ontzia&gt;: bidali mezua hona: "
-"&lt;<i>klasea</i>,<i>instantzia</i>,<i>ontzia</i>&gt;"
+"zcir &lt;klasea&gt; &lt;istantzia&gt; &lt;hartzailea&gt;: Mezua bidali hona: "
+"&lt;<i>klasea</i>,<i>istantzia</i>,<i>hartzailea</i>&gt;"
 
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zir &lt;instantzia&gt; &lt;ontzia&gt;: bidali mezua hona: &lt;MEZUA,"
-"<i>instantzia</i>,<i>ontzia</i>&gt;"
+"zir &lt;istantzia&gt; &lt;hartzailea&gt;: Mezua bidali hona: &lt;MEZUA,"
+"<i>istantzia</i>,<i>hartzailea</i>&gt;"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
-"zc &lt;klasea&gt;: bidali mezua hona: &lt;<i>klasea</i>,PERTSONALA,*&gt;"
+"zc &lt;klasea&gt;: Mezua bidali hona: &lt;<i>klasea</i>,PERTSONALA,*&gt;"
 
 msgid "Resubscribe"
-msgstr "Berriro harpidetu"
+msgstr "Berharpidetu"
 
 msgid "Retrieve subscriptions from server"
-msgstr "Eskuratu harpidetzak zerbitzaritik."
+msgstr "Harpidetzak eskuratu zerbitzaritik"
 
 #. *< type
 #. *< ui_requirement
@@ -10349,77 +9839,65 @@ msgstr "Eskuratu harpidetzak zerbitzaritik."
 #. *  summary
 #. *  description
 msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr protokoloaren plugin-a"
+msgstr "Zephyr Protokolo-Plugina"
 
 msgid "Use tzc"
-msgstr "Erabili tzc"
+msgstr "tzc erabili"
 
 msgid "tzc command"
-msgstr "tzc komandoa"
+msgstr "tzc agindua"
 
 msgid "Export to .anyone"
-msgstr "Esportatu hona: .anyone"
+msgstr "Hona esportatu: .anyone"
 
 msgid "Export to .zephyr.subs"
-msgstr "Esportatu hona: .zephyr.subs"
+msgstr "Hona esportatu: .zephyr.subs"
 
 msgid "Import from .anyone"
-msgstr "Inportatu hemendik:edozein"
+msgstr "Hemendik inportatu: .anyone"
 
 msgid "Import from .zephyr.subs"
-msgstr "Inportatu hemendik: .zephyr.subs"
+msgstr "Hemendik inportatu: .zephyr.subs"
 
 msgid "Realm"
-msgstr "Realm"
+msgstr "Domeinua"
 
 msgid "Exposure"
-msgstr "Agerpena"
+msgstr "Esposizioa"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Ezin da socket-a sortu"
-
-#, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "%s erabiltzaileari ezin zaio %s rola ezarri"
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Ezin HTTP proxyaren erantzuna araztu: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "Proxy konexioko %d errorea"
+msgstr "HTTP proxy konexio-errorea: %d"
 
-#, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Sarbidea ukatuta: proxy zerbitzariak ez du tunelik onartzen %d atakan."
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr ""
+"Sarrera ukatua: HTTP proxy zerbitzariak ez du tunelik onartzen %d atakan"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error resolving %s"
-msgstr "Errorea martxan jartzean %s"
-
-# ,fuzzy
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Ezin izan da ostalaria"
+msgstr "Errorea %s ebaztean"
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "%s(r)ren arreta eskatzen..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has requested your attention!"
-msgstr "%s(e)k zuri buruzko informazioa eskatu du"
+msgstr "%s(e)k zure arreta eskatu du!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#, fuzzy
 msgid "_Yes"
-msgstr "Bai"
+msgstr "_Bai"
 
-#, fuzzy
 msgid "_No"
-msgstr "Ez"
+msgstr "_Ez"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
@@ -10431,10 +9909,10 @@ msgstr "_Onartu"
 #. * The default message to use when the user becomes auto-away.
 #.
 msgid "I'm not here right now"
-msgstr "Une honetan ez nago hemen"
+msgstr "Oraintxe ez nago hemen"
 
 msgid "saved statuses"
-msgstr "Gorde egoerak"
+msgstr "egoera gordeak"
 
 #, c-format
 msgid "%s is now known as %s.\n"
@@ -10445,76 +9923,65 @@ msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"'%s' erabiltzaileak %s gonbidatu du %s:\n"
-"%s berriketa-gelara"
+"%s(e)k %s gonbidatu du %s gelara:\n"
+"%s"
 
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "'%s' erabiltzaileak %s gonbidatu du %s berriketa-gelara\n"
+msgstr "%s(e)k %s gonbidatu du %s gelara\n"
 
 msgid "Accept chat invitation?"
-msgstr "Berriketarako gonbita onartu nahi duzu?"
+msgstr "Berriketarako gonbita onartu?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "Ataka"
+msgstr "Lasterbidea"
 
-#, fuzzy
 msgid "The text-shortcut for the smiley"
-msgstr "GTK+ Testu ? gaia"
+msgstr "Smiley-aren testu-lasterbidea"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "Gorde irudia"
+msgstr "Irudi Gordea"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "Irudi Gorde. (hala izan beharko da oraingoz)"
 
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "Konexioak huts egin du"
+msgstr "Errorea SSL Konexioan"
 
 msgid "SSL Handshake Failed"
-msgstr "SSL diosalak huts egin du"
+msgstr "Errorea SSL Handshake-an"
 
-#, fuzzy
 msgid "SSL peer presented an invalid certificate"
-msgstr "Erabiltzaile-izen baliogabea idatzi duzu"
+msgstr "SSL parekoak zertifizatu balioganea aurkeztu du"
 
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "Errore ezezaguna"
+msgstr "SSL errore ezezaguna"
 
 msgid "Unset"
 msgstr "Ezarri gabe"
 
-#, fuzzy
 msgid "Do not disturb"
 msgstr "Ez molestatu"
 
-#, fuzzy
 msgid "Extended away"
 msgstr "Kanpoan luzarorako"
 
-msgid "Mobile"
-msgstr "Mugikorra"
-
 msgid "Listening to music"
-msgstr ""
+msgstr "Musika entzuten"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s(e)k egoera aldatu du: %s -> %s"
+msgstr "%s(e)k (%s) egoera aldatu du: %s -> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) is now %s"
-msgstr "%s orain %s da"
+msgstr "%s (%s) orain %s da"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) is no longer %s"
-msgstr "%s ez dago luzaroago %s"
+msgstr "%s (%s) jadanik ez dago %s"
 
 #, c-format
 msgid "%s became idle"
@@ -10542,18 +10009,6 @@ msgstr "+++ %s aktibo dago berriro"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Errorea %s irakurtzean"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Errore bat aurkitu da %s zerrenda analizatzean, eta ez da kargatu.Fitxategi "
-"zaharra %s~ izenarekin gorde da."
-
 msgid "Calculating..."
 msgstr "Kalkulatzen..."
 
@@ -10563,31 +10018,31 @@ msgstr "Ezezaguna."
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "segundo %d"
+msgstr[0] "Segundo %d"
 msgstr[1] "%d segundo"
 
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "egun %d"
+msgstr[0] "Egun %d"
 msgstr[1] "%d egun"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] "%s, ordu %d"
+msgstr[0] "%s, %d ordu"
 msgstr[1] "%s, %d ordu"
 
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "ordu %d"
+msgstr[0] "Ordu %d"
 msgstr[1] "%d ordu"
 
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "%s, minutu %d"
+msgstr[0] "%s, %d minutu"
 msgstr[1] "%s, %d minutu"
 
 #, c-format
@@ -10598,78 +10053,89 @@ msgstr[1] "%d minutu"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "Ezin %s ireki: Gehietan berbideratua"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s"
-msgstr "Ezin da ostalariarekin konektatu"
+msgstr "Ezin %s(e)ra konektatu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Errorea socket-etik irakurtzean:%s."
+msgstr "Errorea %s(e)tik irakurtzean: erantzun luzeegia (%d byteko muga)"
 
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
+"Ezin %s(e)ko edukiak hartzeko memoria nahiko alokatu.  Maltzurkeri batenbat "
+"egiten saiatzen ariko da web-zerbitzaria."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: %s"
-msgstr "Errorea socket-etik irakurtzean:%s."
+msgstr "Errorea %s(e)tik irakurtzean: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing to %s: %s"
-msgstr ""
-"Errorea %s idaztean: \n"
-"%s\n"
+msgstr "Errorea %s(e)ra idaztean: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "Ezin da ostalariarekin konektatu"
+msgstr "Ezin %s(e)ra konektatu: %s"
 
 #, c-format
 msgid " - %s"
-msgstr ""
+msgstr ".- %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid " (%s)"
-msgstr "%s: %s (%s)"
+msgstr " (%s)"
 
 #. 10053
 #, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr ""
+msgstr "Zure ordenagailuko beste software batek moztu du konexioa."
 
 #. 10054
-#, fuzzy, c-format
+#, c-format
 msgid "Remote host closed connection."
-msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
+msgstr "Konexioa itxi du urruneko ostalariak."
 
 #. 10060
-#, fuzzy, c-format
+#, c-format
 msgid "Connection timed out."
-msgstr "Konexioaren denbora-muga"
+msgstr "Konexioaren denbora-muga agortua."
 
 #. 10061
-#, fuzzy, c-format
+#, c-format
 msgid "Connection refused."
-msgstr "Konexioa berabierazten "
+msgstr "Konexioa ezetsia "
 
 #. 10048
-#, fuzzy, c-format
+#, c-format
 msgid "Address already in use."
-msgstr "Berriketa honen izena dagoeneko erabiltzen ari da"
+msgstr "Erabilpean dago jadanik helbidea."
+
+#, c-format
+msgid "Error Reading %s"
+msgstr "Errorea %s Irakurtzean"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Errore bat aurkitu da zure %s irakurtzean.  Ez da fitxategia kargatu, eta "
+"fitxategi zaharra berrizendatu da: %s~."
 
 msgid "Internet Messenger"
-msgstr "Interneteko mezularitza"
+msgstr "Internet-Mezularia"
 
-#, fuzzy
 msgid "Pidgin Internet Messenger"
-msgstr "Interneteko mezularitza"
+msgstr "Pidgin Internet-Mezularia"
 
 msgid "Send instant messages over multiple protocols"
-msgstr "Bidali berehalako mezuak hainbat protokoloetan"
+msgstr "Istanteko mezuak bidali hainbat protokoloren bidez"
 
 msgid "Orientation"
 msgstr "Orientazioa"
@@ -10679,49 +10145,42 @@ msgstr "Erretiluaren orientazioa."
 
 #. Build the login options frame.
 msgid "Login Options"
-msgstr "Saioa hasteko aukerak"
+msgstr "Saioa Hasteko Aukerak"
 
-#, fuzzy
 msgid "Pro_tocol:"
-msgstr "Protokoloa:"
+msgstr "Pro_tokoloa:"
 
 msgid "_Username:"
-msgstr "_Erabiltzaile-izena:"
+msgstr "_Erabiltzaile-Izena:"
 
-#, fuzzy
 msgid "Remember pass_word"
-msgstr "Gogoratu pasahitza"
+msgstr "Pasahitza _gogoratu"
 
 #. Build the user options frame.
 msgid "User Options"
-msgstr "Erabiltzailearen aukerak"
+msgstr "Erabiltzaile-Aukerak"
 
-#, fuzzy
 msgid "_Local alias:"
-msgstr "Fitxagei lokala:"
+msgstr "Ezizen _lokala:"
 
-#, fuzzy
 msgid "New _mail notifications"
-msgstr "Mezu berrien jakinarazpenak"
+msgstr "Mezu _berrien jakinarazpenak"
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr ""
+msgstr "Lagun-_ikono hau erabili kontu honentzako:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s - Aukerak"
+msgid "Ad_vanced"
+msgstr "A_urreratua"
 
-#, fuzzy
 msgid "Use GNOME Proxy Settings"
-msgstr "Erabili proxy ezarpen orokorrak"
+msgstr "GNOMEren Proxy Ezarpenak Erabili"
 
 msgid "Use Global Proxy Settings"
-msgstr "Erabili proxy ezarpen orokorrak"
+msgstr "Proxy-Ezarpen Orokorrak Erabili"
 
 msgid "No Proxy"
-msgstr "Proxy-rik ez"
+msgstr "Proxy-rik Ez"
 
 msgid "HTTP"
 msgstr "HTTP"
@@ -10733,7 +10192,7 @@ msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 msgid "Use Environmental Settings"
-msgstr "Erabili ingurune-ezarpenak"
+msgstr "Ingurune-Ezarpenak Erabili"
 
 #. This is an easter egg.
 #. It means one of two things, both intended as humourus:
@@ -10741,14 +10200,11 @@ msgstr "Erabili ingurune-ezarpenak"
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
 msgid "If you look real closely"
-msgstr "oso bertatik begiratzen baduzu"
+msgstr "Benetan gertutik begiratzen baduzu"
 
 #. This is an easter egg. See the comment on the previous line in the source.
 msgid "you can see the butterflies mating"
-msgstr "tximeletak elkarrenganatzen ikusiko dituzu"
-
-msgid "Proxy Options"
-msgstr "Proxy aukerak"
+msgstr "tximeletak ernalarazten ikusi ditzakezu"
 
 msgid "Proxy _type:"
 msgstr "_Proxy-mota:"
@@ -10760,29 +10216,28 @@ msgid "_Port:"
 msgstr "_Ataka:"
 
 msgid "Pa_ssword:"
-msgstr "_Pasahitza:"
+msgstr "Pa_sahitza:"
 
-#, fuzzy
 msgid "Unable to save new account"
-msgstr "Ezin da konexio berria sortu."
+msgstr "Ezin kontu berria gorde"
 
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "Jadanik badago zehaztutako irizpideak betetzen dituen kontu bat."
 
 msgid "Add Account"
-msgstr "Gehitu kontua"
+msgstr "Kontua Gehitu"
 
 msgid "_Basic"
-msgstr "_OInarrizkoa"
+msgstr "_Oinarrizkoa"
 
 msgid "Create _this new account on the server"
-msgstr ""
+msgstr "Kontu berri hau sortu _zerbitzarian"
 
-msgid "_Advanced"
-msgstr "_Aurreratua"
+msgid "P_roxy"
+msgstr "P_roxy-a"
 
 msgid "Enabled"
-msgstr "Ahalbidetua"
+msgstr "Gaituta"
 
 msgid "Protocol"
 msgstr "Protokoloa"
@@ -10799,65 +10254,84 @@ msgid ""
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
+"<span size='larger' weight='bold'>Ongietorri %s(e)ra!</span>\n"
+"\n"
+"Ez duzu IM-konturik konfiguratu. %s(r)ekin konektatzen hasteko,azpialdeko "
+"<b>Gehitu...</b> botoia sakatu eta zure lehen kontua konfiguratu ezazu. %s "
+"IM-kontu ugarira konektatzea nahi baduzu, <b>Gehitu...</b> sakatu ezazu "
+"berriro, kontu gehiago gehitzeko.\n"
+"\n"
+"Lagun-Zerrenda leihoko <b>Kontuak->Kontuak Kudeatu</b> sakatu ezazu leiho "
+"honetara itzuli eta kontuak gehitu, editatu edo kentzeko"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kontaktu %d daukazu %s izenarekin. Batu egin nahi al dituzu?"
+msgstr[1] "%d kontaktu dauzkazu %s izenarekin. Batu egin nahi al dituzu?"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
+"Kontaktu hauek batuz gero, sarrera bakarra erabiliko dute lagun-zerrendan "
+"eta solasaldi-leiho bakarra erabiliko dute. Berriro banandu nahi badituzu, "
+"kontestu-menuko 'Zabaldu' erabili ezazu."
 
 msgid "Please update the necessary fields."
-msgstr ""
+msgstr "Beharrezko eremuak eguneratu."
 
-#, fuzzy
-msgid "Room _List"
-msgstr "Gelen zerrenda"
+msgid "A_ccount"
+msgstr "_Kontua"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Eman sartu nahi duzun berriketari buruzko informazioa.\n"
+msgstr "Batu nahi duzun berriketaren inguruko informazio egokia eman ezazu.\n"
 
-msgid "_Account:"
-msgstr "K_ontua:"
+msgid "Room _List"
+msgstr "Gela-_Zerrenda"
 
 msgid "_Block"
-msgstr "Blokeatu "
+msgstr "_Blokeatu"
 
-#, fuzzy
 msgid "Un_block"
-msgstr "Blokeoa kendu"
+msgstr "_Desblokeatu"
 
 msgid "Move to"
-msgstr ""
+msgstr "Mugitu hona"
 
 msgid "Get _Info"
-msgstr "_Inf."
+msgstr "_Datuak Eskuratu"
 
 msgid "I_M"
-msgstr "_BM"
+msgstr "I_M"
+
+msgid "_Audio Call"
+msgstr "_Audio-Deia"
+
+msgid "Audio/_Video Call"
+msgstr "Audio-/_Bideo-Deia"
+
+msgid "_Video Call"
+msgstr "_Bideo-Deia"
 
-#, fuzzy
 msgid "_Send File..."
-msgstr "_Bidali fitxategia"
+msgstr "_Fitxategia Bidali..."
 
-#, fuzzy
 msgid "Add Buddy _Pounce..."
-msgstr "Gehitu lagun-_alerta"
+msgstr "Lagun-Alerta Gehitu..."
 
 msgid "View _Log"
-msgstr "Ikusi _egunkaria"
+msgstr "_Txostena Ikusi"
 
-#, fuzzy
-msgid "Hide when offline"
-msgstr "Ez da onartzen lineaz kanpo"
+msgid "Hide When Offline"
+msgstr "Ezkutatu Ofline Egotean"
+
+msgid "Show When Offline"
+msgstr "Erakutsi Offline Egotean"
 
 msgid "_Alias..."
 msgstr "_Ezizena..."
@@ -10865,42 +10339,36 @@ msgstr "_Ezizena..."
 msgid "_Remove"
 msgstr "_Kendu"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "Ezarri erabiltzailearen datuak..."
+msgstr "Ikono Pertsonalizatua Ezarri"
 
-#, fuzzy
 msgid "Remove Custom Icon"
-msgstr "Kendu kontaktua"
+msgstr "Ikono Pertsonalizatua Kendu"
 
-#, fuzzy
 msgid "Add _Buddy..."
-msgstr "Gehitu laguna"
+msgstr "_Laguna Gehitu..."
 
-#, fuzzy
 msgid "Add C_hat..."
-msgstr "Gehitu berriketa"
+msgstr "_Solasaldia Gehitu..."
 
 msgid "_Delete Group"
-msgstr "E_zabatu taldea"
+msgstr "Taldea _ezabatu"
 
 msgid "_Rename"
-msgstr "_Izena aldatu"
+msgstr "_Berrizendatu"
 
 #. join button
 msgid "_Join"
 msgstr "_Sartu"
 
 msgid "Auto-Join"
-msgstr "_Automatikoki sartu"
+msgstr "Automatikoki Sartu"
 
-#, fuzzy
 msgid "Persistent"
-msgstr "pertsiera"
+msgstr "Iraunkorra"
 
-#, fuzzy
 msgid "_Edit Settings..."
-msgstr "Erabili ingurune-ezarpenak"
+msgstr "_Ezarpenak Editatu..."
 
 msgid "_Collapse"
 msgstr "_Tolestu"
@@ -10909,93 +10377,86 @@ msgid "_Expand"
 msgstr "_Zabaldu"
 
 msgid "/Tools/Mute Sounds"
-msgstr "/Erabilpenak/Mutututako soinuak"
+msgstr "/Tresnak/Soinuak Mututu"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
-msgstr "Kontu honetan ezin da lagun hori gehitu."
+msgstr "Ezin duzu lagun hori gehitu konektatuta zauden kontuetara."
 
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#, fuzzy
 msgid "Unknown node type"
-msgstr "%d errore-kode ezezaguna"
+msgstr "Nodo-mota ezezaguna"
 
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Lagunak"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/Lagunak/_Berehalako mezu berria..."
+msgstr "/Lagunak/_Istanteko Mezu Berria..."
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/Lagunak/_Sartu berriketa batean..."
+msgstr "/Lagunak/Berriketa batera _Batu..."
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/Lagunak/_Hartu erabiltzailearen datuak..."
+msgstr "/Lagunak/_Erabiltzaile-Datuak Eskuratu..."
 
 msgid "/Buddies/View User _Log..."
-msgstr "/Lagunak/Ikusi erabiltzailearen _egunkaria..."
+msgstr "/Lagunak/Erabiltzaile-T_xostena Ikusi..."
 
-#, fuzzy
 msgid "/Buddies/Sh_ow"
-msgstr "/_Lagunak"
+msgstr "/Lagunak/E_rakutsi"
 
-#, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Lagunak/Erakutsi _Lineaz kanpoko lagunak"
+msgstr "/Lagunak/Erakutsi/O_ffline Lagunak"
 
-#, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Lagunak/Erakutsi _talde hutsak"
+msgstr "/Lagunak/Erakutsi/Talde _Hutsak"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Lagunak/Erakutsi Lineaz  lagunen _ezaugarriak"
+msgstr "/Lagunak/Erakutsi/Lagunen _Xehetasunak"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Lagunak/Erakutsi ez-aktibo _Denborak"
+msgstr "/Lagunak/Erakutsi/Inaktibotasun _Denborak"
 
-#, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Lagunak/Erakutsi _talde hutsak"
+msgstr "/Lagunak/Erakutsi/_Protokolo Ikonoak"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Lagunak/Lagun_motak"
+msgstr "/Lagunak/Lagunak _Antolatu"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/Lagunak/_Gehitu laguna..."
+msgstr "/Lagunak/Laguna _Gehitu..."
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/Lagunak/Gehitu _berriketa..."
+msgstr "/Lagunak/Be_rriketa Gehitu..."
 
 msgid "/Buddies/Add _Group..."
-msgstr "/Lagunak/Gehitu _taldea..."
+msgstr "/Lagunak/_Taldea Gehitu..."
 
 msgid "/Buddies/_Quit"
 msgstr "/Lagunak/_Irten"
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/K_ontua"
+msgstr "/_Kontuak"
 
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "/Kontuak"
+msgstr "/Kontuak/Kontuak Kudeatu"
 
 #. Tools
 msgid "/_Tools"
 msgstr "/_Tresnak"
 
-#, fuzzy
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Tresnak/Gehitu lagun-_alerta"
+msgstr "/Tresnak/Lagun-_Alertak"
 
-#, fuzzy
 msgid "/Tools/_Certificates"
-msgstr "/Tresnak/_Hobespenak"
+msgstr "/Tresnak/_Zertifikatuak"
+
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Tresnak/_Smiley Pertsonalizatuak"
 
 msgid "/Tools/Plu_gins"
 msgstr "/Tresnak/Plu_gin-ak"
@@ -11006,174 +10467,161 @@ msgstr "/Tresnak/_Hobespenak"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tresnak/P_ribatutasuna"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Tresnak/Pribatutasuna"
-
 msgid "/Tools/_File Transfers"
-msgstr "/Tresnak/_Fitxategi-transferentziak"
+msgstr "/Tresnak/_Fitxategi-Transferentziak"
 
 msgid "/Tools/R_oom List"
-msgstr "/Tresnak/_Gelen zerrenda"
+msgstr "/Tresnak/_Gela-Zerrenda"
 
 msgid "/Tools/System _Log"
-msgstr "/Tresnak/_Ikusi sistemaren egunkaria "
+msgstr "/Tresnak/_Sistemaren Txostena"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/Tresnak/Mututu _soinuak"
+msgstr "/Tresnak/Soinuak _Mututu"
 
 #. Help
 msgid "/_Help"
-msgstr "/Lagu_ntza"
+msgstr "/_Laguntza"
 
 msgid "/Help/Online _Help"
-msgstr "/Laguntza/_Lineako laguntza..."
+msgstr "/Laguntza/_Online Laguntza"
 
 msgid "/Help/_Debug Window"
-msgstr "/Laguntza/_Arazketa-leihoa"
+msgstr "/Laguntza/_Arazketa-Leihoa"
 
 msgid "/Help/_About"
-msgstr "/Laguntza/H_oni buruz"
+msgstr "/Laguntza/_Honi buruz"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Kontua:</b> %s"
+msgstr "<b>Kontua:</b> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>Kontua:</b> %s"
+"<b>Partaideak:</b> %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>Gaia:</b> %s"
 
-#, fuzzy
 msgid "(no topic set)"
-msgstr "Ez da gairik ezarri"
+msgstr "(gairik ez)"
 
-#, fuzzy
 msgid "Buddy Alias"
-msgstr "Lagunen zerrenda"
+msgstr "Lagunaren Ezizena"
 
-#, fuzzy
 msgid "Logged In"
-msgstr "Konektatuta dago lehendik"
+msgstr "Konektatuta"
 
-#, fuzzy
 msgid "Last Seen"
-msgstr "Deitura"
+msgstr "Azkenekoz Ikusia"
 
 msgid "Spooky"
-msgstr ""
+msgstr "Beldurtia"
 
 msgid "Awesome"
-msgstr ""
+msgstr "Bikaina"
 
 msgid "Rockin'"
-msgstr ""
+msgstr "Rock'n'Roll-eatzen"
 
-#, fuzzy
 msgid "Total Buddies"
-msgstr "Lagunak"
+msgstr "Lagunak Guztira"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "Ez-aktibo %dh%02dm "
+msgstr "Inaktibo %deg %dord %02dmin"
 
 #, c-format
 msgid "Idle %dh %02dm"
-msgstr "Ez-aktibo %dh%02dm "
+msgstr "Inaktibo %dord%02dmin"
 
 #, c-format
 msgid "Idle %dm"
-msgstr "Ez-aktibo %dm "
+msgstr "Inaktibo %dmin"
 
 msgid "/Buddies/New Instant Message..."
-msgstr "/Lagunak/Berehalako mezu berria..."
+msgstr "/Lagunak/Istanteko Mezu Berria..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/Lagunak/Sartu berriketa batean..."
+msgstr "/Lagunak/Berriketa batera Batu..."
 
 msgid "/Buddies/Get User Info..."
-msgstr "/Lagunak/Lortu erabiltzailearen datuak..."
+msgstr "/Lagunak/Erabiltzaile-Datuak Eskuratu..."
 
 msgid "/Buddies/Add Buddy..."
-msgstr "/Lagunak/Gehitu laguna..."
+msgstr "/Lagunak/Laguna Gehitu..."
 
 msgid "/Buddies/Add Chat..."
-msgstr "/Lagunak/Gehitu berriketa..."
+msgstr "/Lagunak/Berriketa Gehitu..."
 
 msgid "/Buddies/Add Group..."
-msgstr "/Lagunak/Gehitu taldea..."
+msgstr "/Lagunak/Taldea Gehitu..."
 
 msgid "/Tools/Privacy"
 msgstr "/Tresnak/Pribatutasuna"
 
 msgid "/Tools/Room List"
-msgstr "/Tresnak/Gelen zerrenda"
+msgstr "/Tresnak/Gela-Zerrenda"
 
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d irakurri gabeko mezua  %s bidalia \n"
-msgstr[1] "%d irakurri gabeko mezuak  %s bidalia \n"
+msgstr[0] "Mezu %d irakurri gabe (%s(r)ena)\n"
+msgstr[1] "%d mezu irakurri gabe (%s(r)enak)\n"
 
 msgid "Manually"
-msgstr "Eskuz "
+msgstr "Eskuz"
 
 msgid "By status"
 msgstr "Egoeraren arabera"
 
-msgid "By log size"
-msgstr "Egunkari-tamainaren arabera"
+msgid "By recent log activity"
+msgstr "Txosteneko azken aktibitatearen arabera"
 
 #, c-format
 msgid "%s disconnected"
-msgstr "%s Deskonektatuta."
+msgstr "%s deskonektatuta"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s disabled"
-msgstr "Komandoa desgaitu da"
+msgstr "%s ezgaituta"
 
-#, fuzzy
 msgid "Reconnect"
-msgstr "Konektatu"
+msgstr "Berkonektatu"
 
-#, fuzzy
 msgid "Re-enable"
-msgstr "Ber ahalbidetu kontua"
+msgstr "Bergaitu"
+
+msgid "SSL FAQs"
+msgstr "SSL Galderak"
 
 msgid "Welcome back!"
-msgstr ""
+msgstr "Ongietorri berriro!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "Beste kokaleku batetik hasi duzu saioa."
-msgstr[1] "Beste kokaleku batetik hasi duzu saioa."
+msgstr[0] "Kontu %d ezgaitu da, beste nonbaitetik konektatu zarelako:"
+msgstr[1] "%d kontu ezgaitu dira, beste nonbaitetik konektatu zarelako:"
 
-#, fuzzy
 msgid "<b>Username:</b>"
-msgstr "_Erabiltzaile-izena:"
+msgstr "<b>Erabiltzaile-izena:</b>"
 
-#, fuzzy
 msgid "<b>Password:</b>"
-msgstr "Pasahitza:"
+msgstr "<b>Pasahitza:</b>"
 
-#, fuzzy
 msgid "_Login"
-msgstr "Egunkaria"
+msgstr "_Konektatu"
 
 msgid "/Accounts"
 msgstr "/Kontuak"
@@ -11187,124 +10635,209 @@ msgid ""
 "b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
 "you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
+"<span weight='bold' size='larger'>Ongietorri %s(e)ra!</span>\n"
+"\n"
+"Ez daukazu konturik gaituta. <b>Kontuak->Kontuak Kudeatu</b> leihoan gaitu "
+"itzazu zure IM kontuak. Kontuak gaitu ondoren, konektatu, zure egoera ezarri "
+"eta zure lagunekin hitz egin ahalko duzu."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Lagunak/Erakutsi Lineaz kanpoko lagunak"
+msgstr "/Lagunak/Erakutsi/Offline Lagunak"
 
-#, fuzzy
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Lagunak/Erakutsi talde hutsak"
+msgstr "/Lagunak/Erakutsi/Talde Hutsak"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Lagunak/Erakutsi lagunaren ezaugarriak"
+msgstr "/Lagunak/Erakutsi/Lagunaren Xehetasunak"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Lagunak/Erakutsi ez-aktibo Denbora"
+msgstr "/Lagunak/Erakutsi/Inaktibotasun Denborak"
 
-#, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Lagunak/Erakutsi talde hutsak"
+msgstr "/Lagunak/Erakutsi/Protokolo Ikonoak"
 
-#, fuzzy
 msgid "Add a buddy.\n"
-msgstr "_Gehitu laguna"
+msgstr "Laguna gehitu.\n"
 
-#, fuzzy
 msgid "Buddy's _username:"
-msgstr "_Lagunaren izena:"
+msgstr "Lagunaren e_rabiltzaile-izena:"
 
-#, fuzzy
 msgid "(Optional) A_lias:"
-msgstr "Aukerako informazioa:"
+msgstr "(Opzionala) E_zizena:"
 
-#, fuzzy
 msgid "Add buddy to _group:"
-msgstr "Laguna zerrendan gehitu nahi duzu?"
+msgstr "_Talde batera gehitu laguna:"
 
 msgid "This protocol does not support chat rooms."
-msgstr "Protokolo honek ez ditu berriketa-gelak onartzen"
+msgstr "Protokolo honek ez ditu berriketa-gelak jasaten."
 
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "Une honetan ez daukazu berriketarako gaitasuna duen protokolorik."
+msgstr "Ezin berriketarik izan konektatuta zauden protokoloekin."
 
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"Sartu aliasa, eta lagunen zerrendan gehitu nahi duzun berriketari buruzko "
-"informazio guztia.\n"
+"Zure lagun-zerrendara gehitu nahi duzun berriketaren inguruko informazio "
+"egokia eta ezizen bat sartu itzazu.\n"
 
-#, fuzzy
 msgid "A_lias:"
-msgstr "Aliasa:"
+msgstr "E_zizena:"
+
+msgid "_Group:"
+msgstr "_Taldea:"
 
 msgid "Auto_join when account becomes online."
-msgstr ""
+msgstr "Auto-_batu kontua konektatzean."
 
 msgid "_Remain in chat after window is closed."
-msgstr ""
+msgstr "Solasaldian _jarraitu leihoa itxi ondoren."
 
 msgid "Please enter the name of the group to be added."
-msgstr "Idatzi gehitu nahi duzun taldearen izena."
+msgstr "Gehitu nahi duzun taldearen izena sartu ezazu."
 
 msgid "Enable Account"
-msgstr "Ahalbidetu Kontua"
+msgstr "Kontua Gaitu"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr ""
+msgstr "<PurpleMain>/Kontuak/Kontua Gaitu"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr ""
+msgstr "<PurpleMain>/Kontuak/"
 
 msgid "_Edit Account"
 msgstr "Kontua _Editatu"
 
 msgid "No actions available"
-msgstr "Ekintza erabilgarririk ez"
+msgstr "Ekintzarik ez eskuragarri"
 
 msgid "_Disable"
-msgstr "_Ez-gaitu"
+msgstr "_Ezgaitu"
 
 msgid "/Tools"
 msgstr "/Tresnak"
 
 msgid "/Buddies/Sort Buddies"
-msgstr "/Lagunak/Lagun Motak"
+msgstr "/Lagunak/Lagunak Antolatu"
+
+#. Buddy List
+msgid "Background Color"
+msgstr "Atzealdeko Kolorea"
+
+msgid "The background color for the buddy list"
+msgstr "Lagun-zerrendaren atzealdeko kolorea."
+
+msgid "Layout"
+msgstr "Diseinua"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Lagun-zerrendako ikono, izena eta egoeren diseinua"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Atzealde Zabalduaren Kolorea"
+
+msgid "The background color of an expanded group"
+msgstr "Talde zabalduaren atzealdearen kolorea"
+
+msgid "Expanded Text"
+msgstr "Testu Zabaldua"
+
+msgid "The text information for when a group is expanded"
+msgstr "Talde zabalduaren testu-informazioa"
+
+msgid "Collapsed Background Color"
+msgstr "Atzealde Tolestuaren Kolorea"
+
+msgid "The background color of a collapsed group"
+msgstr "Talde tolestuaren atzealdearen kolorea"
+
+msgid "Collapsed Text"
+msgstr "Testu Tolestua"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Talde tolestuaren testu-informazioa"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Kontaktu/Solasaldien Atzealdearen Kolorea"
+
+msgid "The background color of a contact or chat"
+msgstr "Kontaktu edo solasaldien atzealdearen kolorea"
+
+msgid "Contact Text"
+msgstr "Kontaktu-Testua"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Kontaktua zabaltzen denerako testu-informazioa"
+
+msgid "On-line Text"
+msgstr "Online-Testua"
+
+msgid "The text information for when a buddy is online"
+msgstr "Lagun bat online dagoenerako testu-informazioa"
+
+msgid "Away Text"
+msgstr "Kanpoan-Testua"
+
+msgid "The text information for when a buddy is away"
+msgstr "Lagun bat kanpoan dagoenerako testu-informazioa"
+
+msgid "Off-line Text"
+msgstr "Offline-Testua"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Lagun bat offline dagoenerako testu-informazioa"
+
+msgid "Idle Text"
+msgstr "inaktibo-Testua"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Lagun bat inaktibo dagoenerako testu-informazioa"
+
+msgid "Message Text"
+msgstr "Mezu-Testua"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Lagun batek irakurri gabeko mezu bat daukanerako testu-informazioa"
+
+msgid "Message (Nick Said) Text"
+msgstr "Mezu-Testua(Ezizena Aipatua)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"Solasaldi batean zure ezizena aipatzenduen irakurri gabeko mezu bat "
+"daukanerako testu-informazioa"
+
+msgid "The text information for a buddy's status"
+msgstr "Lagunaren egoerarako testu-informazioa"
+
+msgid "Type the host name for this certificate."
+msgstr "Zertifikatu honen ostalari-izena idatzi ezazu."
 
 #. Widget creation function
-#, fuzzy
 msgid "SSL Servers"
-msgstr "Zerbitzaria"
+msgstr "SSL-Zerbitzariak"
 
-#, fuzzy
 msgid "Unknown command."
-msgstr "Komando ezezaguna"
+msgstr "Agindu ezezaguna."
 
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Lagun hori ez dago berriketa honek darabilen protokoloarekin."
+msgstr "Lagun hori ez dago berriketa honen protokolo berdinean."
 
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
-msgstr "Ez duzu sinatu kontu batekin lagun hori gonbidatzeko."
+msgstr "Ez zaude lagun hori gonbidatu dezakeen inongo konturekin konektatuta."
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "Gonbidatu laguna berriketa-gelara"
-
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Idatzi gonbidatu nahi duzun erabiltzailearen izena, gonbit-mezu batekin nahi "
-"baduzu."
+msgstr "Laguna Gonbidatu Berriketa-Gelara"
 
 msgid "_Buddy:"
 msgstr "_Laguna:"
@@ -11317,7 +10850,7 @@ msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Solasaldia: %s</h1>\n"
 
 msgid "Save Conversation"
-msgstr "Gorde solasaldia"
+msgstr "Solasaldia Gorde"
 
 msgid "Find"
 msgstr "Bilatu"
@@ -11326,87 +10859,95 @@ msgid "_Search for:"
 msgstr "Bila_tu:"
 
 msgid "Un-Ignore"
-msgstr "Desegin ez ikustea"
+msgstr "Ezikusia Desegin"
 
 msgid "Ignore"
-msgstr "Ez ikusi egin"
+msgstr "Ezikusi"
 
 msgid "Get Away Message"
-msgstr "Kanpoan nagoeneko mezua "
+msgstr "Kanpoan Nagoeneko Mezua "
 
-msgid "Last said"
-msgstr "Esandako azkena"
+msgid "Last Said"
+msgstr "Esandako Azkena"
 
 msgid "Unable to save icon file to disk."
-msgstr "Ezin da gorde ikono-fitxategia diskoan."
+msgstr "Ezin ikono-fitxategia diskoan gorde."
 
 msgid "Save Icon"
-msgstr "Gorde ikonoa"
+msgstr "Ikonoa Gorde"
 
 msgid "Animate"
 msgstr "Animatu"
 
 msgid "Hide Icon"
-msgstr "Ezkutatu ikonoa"
+msgstr "Ikonoa Ezkutatu"
 
 msgid "Save Icon As..."
-msgstr "Gorde ikonoa honela..."
+msgstr "Ikonoa Gorde Honela..."
 
-#, fuzzy
 msgid "Set Custom Icon..."
-msgstr "Ezarri erabiltzailearen datuak..."
+msgstr "Ikono Pertsonalizatu Ezarri..."
 
-#, fuzzy
 msgid "Change Size"
-msgstr "Egoera aldatu"
+msgstr "Tamaina Aldatu"
 
 msgid "Show All"
-msgstr ""
+msgstr "Denak Erakutsi"
 
 #. Conversation menu
 msgid "/_Conversation"
 msgstr "/_Solasaldia"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/Solasaldia/_Berehalako mezu berria..."
+msgstr "/Solasaldia/Istanteko _Mezu Berria..."
 
 msgid "/Conversation/_Find..."
-msgstr "/Solasaldia/B_ilatu..."
+msgstr "/Solasaldia/_Bilatu..."
 
 msgid "/Conversation/View _Log"
-msgstr "/Solasaldia/Ikusi _egunkaria"
+msgstr "/Solasaldia/_Txostena Ikusi"
 
 msgid "/Conversation/_Save As..."
-msgstr "/Solasaldia/_Gorde honela..."
+msgstr "/Solasaldia/Gorde _Honela..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Solasaldia/Garb_itu Scrollback"
+msgstr "/Solasaldia/Garbit_u"
+
+msgid "/Conversation/M_edia"
+msgstr "/Solasaldia/_Multimedia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Solasaldia/Multimedia/_Audio-Deia"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Solasaldia/Multimedia/_Bideo-Deia"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversation/Media/Audio\\/Bideo-_Deia"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/Solasaldia/B_idali fitxategia..."
+msgstr "/Solasaldia/_Fitxategia Bidali..."
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Solasaldia/Gehitu lagun-_alerta..."
+msgstr "/Solasaldia/Lagun-_Alerta Gehitu..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Solasaldia/_Hartu informazioa"
+msgstr "/Solasaldia/_Informazioa Eskuratu"
 
 msgid "/Conversation/In_vite..."
-msgstr "/Solasaldia/G_onbidatu..."
+msgstr "/Solasaldia/_Gonbidatu..."
 
-#, fuzzy
 msgid "/Conversation/M_ore"
-msgstr "/Solasaldia/It_xi"
+msgstr "/Solasaldia/_Gehiago"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/Solasaldia/Ezize_na..."
+msgstr "/Solasaldia/E_zizena..."
 
 msgid "/Conversation/_Block..."
 msgstr "/Solasaldia/Blo_keatu..."
 
-#, fuzzy
 msgid "/Conversation/_Unblock..."
-msgstr "/Solasaldia/Blo_keatu..."
+msgstr "/Solasaldia/De_sblokeatu..."
 
 msgid "/Conversation/_Add..."
 msgstr "/Solasaldia/Gehi_tu..."
@@ -11415,10 +10956,10 @@ msgid "/Conversation/_Remove..."
 msgstr "/Solasaldia/Ke_ndu..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Solasaldia/Txertat_u esteka..."
+msgstr "/Solasaldia/_Esteka Txertatu..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Solasaldia/Txe_rtatu irudia..."
+msgstr "/Solasaldia/Irudia Txe_rtatu..."
 
 msgid "/Conversation/_Close"
 msgstr "/Solasaldia/It_xi"
@@ -11428,58 +10969,63 @@ msgid "/_Options"
 msgstr "/_Aukerak"
 
 msgid "/Options/Enable _Logging"
-msgstr "/Aukerak/Gaitu _egunkaria"
+msgstr "/Aukerak/_Txostena Gaitu"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/Aukerak/Gaitu _soinuak"
+msgstr "/Aukerak/_Soinuak Gaitu"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Aukerak/Erakutsi  tresna-barrarren  _formatua"
+msgstr "/Aukerak/_Formatu-Tresnak Erakutsi"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Aukerak/Erakutsi ord_u-zigiluak"
+msgstr "/Aukerak/_Ordu-Markak Erakutsi"
 
-#, fuzzy
 msgid "/Conversation/More"
-msgstr "/Solasaldia/It_xi"
+msgstr "/Solasaldia/Gehiago"
 
-#, fuzzy
 msgid "/Options"
-msgstr "/_Aukerak"
+msgstr "/Aukerak"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#, fuzzy
 msgid "/Conversation"
-msgstr "/_Solasaldia"
+msgstr "/Solasaldia"
 
 msgid "/Conversation/View Log"
-msgstr "/Solasaldia/Ikusi egunkaria"
+msgstr "/Solasaldia/Txostena Ikusi"
+
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Solasaldia/Multimedia/Audio-Deia"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Solasaldia/Multimedia/Bideo-Deia"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversation/Media/Audio\\/Bideo-Deia"
 
 msgid "/Conversation/Send File..."
-msgstr "/Solasaldia/Bidali fitxategia..."
+msgstr "/Solasaldia/Fitxategia Bidali..."
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Solasaldia/Gehitu lagun-alerta..."
+msgstr "/Solasaldia/Lagun-Alerta Gehitu..."
 
 msgid "/Conversation/Get Info"
-msgstr "/Solasaldia/Hartu informazioa"
+msgstr "/Solasaldia/Informazioa Eskuratu"
 
 msgid "/Conversation/Invite..."
 msgstr "/Solasaldia/Gonbidatu..."
 
 msgid "/Conversation/Alias..."
-msgstr "/Solasaldia/Aliasa..."
+msgstr "/Solasaldia/Ezizena..."
 
 msgid "/Conversation/Block..."
 msgstr "/Solasaldia/Blokeatu..."
 
-#, fuzzy
 msgid "/Conversation/Unblock..."
-msgstr "/Solasaldia/Blokeatu..."
+msgstr "/Solasaldia/Desblokeatu..."
 
 msgid "/Conversation/Add..."
 msgstr "/Solasaldia/Gehitu..."
@@ -11488,36 +11034,37 @@ msgid "/Conversation/Remove..."
 msgstr "/Solasaldia/Kendu..."
 
 msgid "/Conversation/Insert Link..."
-msgstr "/Solasaldia/Txertatu esteka..."
+msgstr "/Solasaldia/Esteka Txertatu..."
 
 msgid "/Conversation/Insert Image..."
-msgstr "/Solasaldia/Txertatu irudia..."
+msgstr "/Solasaldia/Irudia Txertatu..."
 
 msgid "/Options/Enable Logging"
-msgstr "/Aukerak/Gaitu egunkaria"
+msgstr "/Aukerak/Txostena Gaitu"
 
 msgid "/Options/Enable Sounds"
-msgstr "/Aukerak/Gaitu soinuak"
+msgstr "/Aukerak/Soinuak Gaitu"
 
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/Aukerak/Erakutsi  tresna-barrarren formatua"
+msgstr "/Aukerak/Formatu-Tresnak Erakutsi"
 
 msgid "/Options/Show Timestamps"
-msgstr "/Aukerak/Erakutsi ordu-zigiluak"
+msgstr "/Aukerak/Ordu-Markak Erakutsi"
 
 msgid "User is typing..."
-msgstr "Erabiltzailea idazten ari da..."
+msgstr "Idazten ari da..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "%s(e)k zuri idazten amaitu du (%s)"
+msgstr ""
+"\n"
+"%s(e)k zuri idazten amaitu du"
 
 #. Build the Send To menu
-#, fuzzy
 msgid "S_end To"
-msgstr "_Bidali honi:"
+msgstr "Bidali _Honi"
 
 msgid "_Send"
 msgstr "_Bidali"
@@ -11529,55 +11076,53 @@ msgstr "0 pertsona gelan"
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "pertsona %d gelan"
+msgstr[0] "Pertsona %d gelan"
 msgstr[1] "%d pertsona gelan"
 
 msgid "Typing"
 msgstr "Idazten"
 
 msgid "Stopped Typing"
-msgstr "Gelditu idazteari"
+msgstr "Idazten Gelditu Da"
 
 msgid "Nick Said"
-msgstr "Goitizenak dio"
+msgstr "Ezizenak Dio"
 
 msgid "Unread Messages"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Irakurri Gabeko Mezuak"
 
 msgid "New Event"
-msgstr "Gertaera berria "
+msgstr "Gertaera Berria "
 
-#, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "garbitu: Garbitu sosaldiaren scrollback"
+msgstr "clear: Solasaldiak garbitu."
 
 msgid "Confirm close"
-msgstr "Isteko konfirmazioa"
+msgstr "Isteko Konfirmazioa"
 
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr ""
-"Irakurri gabeko mezuak dituzu. Zihur al zaude lehioa itxi nahi duzula ?"
+msgstr "Irakurri gabeko mezuak dituzu. Ziur al zaude leihoa itxi nahi duzula?"
 
 msgid "Close other tabs"
-msgstr "Itxi beste tapakia"
+msgstr "Beste fitxak itxi"
 
 msgid "Close all tabs"
-msgstr "Tapaki guztiak itxi"
+msgstr "Fitxa guztiak itxi"
 
 msgid "Detach this tab"
-msgstr "Banatu betilea"
+msgstr "Fitxa askatu"
 
 msgid "Close this tab"
-msgstr "Tapaki hau itxi"
+msgstr "Fitxa hau itxi"
 
 msgid "Close conversation"
-msgstr "Itxi solasaldia"
+msgstr "Solasaldia Itxi"
 
 msgid "Last created window"
 msgstr "Sortutako azken leihoa"
 
 msgid "Separate IM and Chat windows"
-msgstr "Bereiztu IM eta berriketa leihoak"
+msgstr "IM eta Berriketa-leihoak bereiztu"
 
 msgid "New window"
 msgstr "Leiho berria"
@@ -11589,95 +11134,91 @@ msgid "By account"
 msgstr "Kontuaren arabera"
 
 msgid "Save Debug Log"
-msgstr "Gorde arazketaren egunkaria"
+msgstr "Arazketa-Txostena Gorde"
 
 msgid "Invert"
 msgstr "Inbertitu"
 
 msgid "Highlight matches"
-msgstr "Aurkitutako azpimarratu"
+msgstr "Kointzidentziak nabarmendu"
 
 msgid "_Icon Only"
-msgstr ""
+msgstr "_Ikonoak Bakarrik"
 
 msgid "_Text Only"
-msgstr ""
+msgstr "_Testua Bakarrik"
 
 msgid "_Both Icon & Text"
-msgstr ""
+msgstr "Ikonoak _eta Testua"
 
 msgid "Filter"
-msgstr "Iragazgailua"
+msgstr "Iragazia"
 
 msgid "Right click for more options."
-msgstr "Eskubiko botoiaz klik egin  aukera gehiagorentzat"
+msgstr "Eskuin-klik egin aukera gehiagorako."
 
 msgid "Level "
-msgstr ""
+msgstr "Maila"
 
 msgid "Select the debug filter level."
-msgstr ""
+msgstr "Arazte-iragazkiaren maila hautatu."
 
-#, fuzzy
 msgid "All"
-msgstr "Onartu"
+msgstr "Denak"
 
-#, fuzzy
 msgid "Misc"
-msgstr "Musika"
+msgstr "Ugari"
 
-#, fuzzy
 msgid "Warning"
-msgstr "Abisu-maila"
+msgstr "Abisua"
 
-#, fuzzy
 msgid "Error "
 msgstr "Errorea"
 
-#, fuzzy
 msgid "Fatal Error"
-msgstr "Barne-errorea"
+msgstr "Errore Konponezina"
 
 msgid "bug master"
 msgstr ""
 
-#, fuzzy
 msgid "artist"
-msgstr "Helbidea"
+msgstr "artista"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"
+
+msgid "voice and video"
+msgstr "ahotsa eta bideoa"
 
 msgid "support"
 msgstr "euskarria"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "garatzailea eta web arduraduna"
+msgstr "webmaster-a"
 
 msgid "Senior Contributor/QA"
 msgstr ""
 
 msgid "win32 port"
-msgstr "win32 ataka"
+msgstr "win32 bertsioa"
 
 msgid "maintainer"
 msgstr "mantentzailea"
 
 msgid "libfaim maintainer"
-msgstr "libfaim mantentzaile"
+msgstr "libfaim mantentzailea"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#, fuzzy
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker eta zehaztutako kontrolatzailea [lazy bum]"
 
-#, fuzzy
 msgid "support/QA"
-msgstr "euskarria"
+msgstr "euskarria/Galderak"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "jatorrizko egilea"
@@ -11686,11 +11227,10 @@ msgid "lead developer"
 msgstr "garatzaile-burua"
 
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#, fuzzy
 msgid "Arabic"
-msgstr "Amharic"
+msgstr "Arabiera"
 
 msgid "Belarusian Latin"
 msgstr ""
@@ -11699,17 +11239,16 @@ msgid "Bulgarian"
 msgstr "Bulgariera"
 
 msgid "Bengali"
-msgstr "bengalera"
+msgstr "Bengalera"
 
 msgid "Bosnian"
-msgstr "Bosniarra"
+msgstr "Bosniera"
 
 msgid "Catalan"
-msgstr "Katalana"
+msgstr "Katalan"
 
-#, fuzzy
 msgid "Valencian-Catalan"
-msgstr "Balentziera"
+msgstr "Valentziera"
 
 msgid "Czech"
 msgstr "Txekiera"
@@ -11724,7 +11263,7 @@ msgid "Dzongkha"
 msgstr ""
 
 msgid "Greek"
-msgstr "Gerkera"
+msgstr "Greziera"
 
 msgid "Australian English"
 msgstr "Ingelesa (Australia)"
@@ -11733,23 +11272,22 @@ msgid "Canadian English"
 msgstr "Ingelesa (Kanada)"
 
 msgid "British English"
-msgstr "Ingelesa (Britainia Handia)"
+msgstr "Ingelesa (Britainia)"
 
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
 msgid "Spanish"
 msgstr "Gaztelania"
 
-#, fuzzy
 msgid "Estonian"
-msgstr "Bosniarra"
+msgstr "Estoniera"
 
 msgid "Euskera(Basque)"
-msgstr ""
+msgstr "Euskara"
 
 msgid "Persian"
-msgstr "pertsiera"
+msgstr "Pertsiera"
 
 msgid "Finnish"
 msgstr "Finlandiera"
@@ -11757,31 +11295,32 @@ msgstr "Finlandiera"
 msgid "French"
 msgstr "Frantsesa"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Turkiera "
+msgstr "Gaelera"
 
 msgid "Galician"
-msgstr "Italiera "
+msgstr "Galiziera"
 
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujaratera"
 
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "Gujaratera Itzulpen-Taldea"
 
 msgid "Hebrew"
 msgstr "Hebreera"
 
 msgid "Hindi"
-msgstr "Hindia"
+msgstr "Hindi"
 
 msgid "Hungarian"
 msgstr "Hungariera"
 
-#, fuzzy
+msgid "Armenian"
+msgstr "Armeniera"
+
 msgid "Indonesian"
-msgstr "Mazedoniera"
+msgstr "Indonesiera"
 
 msgid "Italian"
 msgstr "Italiera"
@@ -11792,25 +11331,27 @@ msgstr "Japoniera"
 msgid "Georgian"
 msgstr "Georgiera"
 
-#, fuzzy
 msgid "Ubuntu Georgian Translators"
-msgstr "Itzultzaileak"
+msgstr "Ubuntuko Georgiera Itzultzaileak"
+
+msgid "Khmer"
+msgstr "Khmerera"
 
-#, fuzzy
 msgid "Kannada"
-msgstr "Debekatuta"
+msgstr "Kannadera"
 
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "Kannadera Itzulpen-taldea"
 
 msgid "Korean"
 msgstr "Koreera"
 
 msgid "Kurdish"
-msgstr "Turkiera "
+msgstr "Kurduera"
 
+#, fuzzy
 msgid "Lao"
-msgstr ""
+msgstr "Laoera"
 
 msgid "Lithuanian"
 msgstr "Lituaniera"
@@ -11818,27 +11359,28 @@ msgstr "Lituaniera"
 msgid "Macedonian"
 msgstr "Mazedoniera"
 
-#, fuzzy
+msgid "Mongolian"
+msgstr "Mongoliaera"
+
 msgid "Bokmål Norwegian"
-msgstr "Norvegiera"
+msgstr "Bokmål Norvegiera"
 
-#, fuzzy
 msgid "Nepali"
-msgstr "bengalera"
+msgstr "Nepalera"
 
 #, fuzzy
 msgid "Dutch, Flemish"
-msgstr "Nederlandera; flandesera"
+msgstr "Nederlandera, Flandesera"
 
 #, fuzzy
 msgid "Norwegian Nynorsk"
-msgstr "Norvegiera"
+msgstr "Norvegiar Nynorsk"
 
 msgid "Occitan"
-msgstr ""
+msgstr "Okzitaniera"
 
 msgid "Punjabi"
-msgstr ""
+msgstr "Punjabera"
 
 msgid "Polish"
 msgstr "Poloniera"
@@ -11849,9 +11391,8 @@ msgstr "Portugesa"
 msgid "Portuguese-Brazil"
 msgstr "Portugesa-Brasil"
 
-#, fuzzy
 msgid "Pashto"
-msgstr "Argazkia"
+msgstr "Pashtoera"
 
 msgid "Romanian"
 msgstr "Errumaniera"
@@ -11865,58 +11406,59 @@ msgstr "Eslovakiera"
 msgid "Slovenian"
 msgstr "Esloveniera"
 
-#, fuzzy
 msgid "Albanian"
-msgstr "Errumaniera"
+msgstr "Albaniera"
 
 msgid "Serbian"
 msgstr "Serbiera"
 
 msgid "Sinhala"
-msgstr ""
+msgstr "Zingaliera"
 
 msgid "Swedish"
 msgstr "Suediera"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 msgid "Tamil"
-msgstr "Tamil"
+msgstr "Tamilera"
 
 msgid "Telugu"
-msgstr "Telugu"
+msgstr "Teluguera"
 
-#, fuzzy
 msgid "Thai"
-msgstr "Tamil"
+msgstr "Thaiera"
 
 msgid "Turkish"
 msgstr "Turkiera"
 
 msgid "Urdu"
-msgstr ""
+msgstr "Urdu"
 
 msgid "Vietnamese"
 msgstr "Vietnamera"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh eta Gnome-Vi taldea"
+msgstr "T.M.Thanh eta Gnome-Vi Taldea"
 
 msgid "Simplified Chinese"
-msgstr "Txinera soildua"
+msgstr "Txinera Sinplifikatua"
 
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "Hong Kong-eko Txinera"
 
 msgid "Traditional Chinese"
-msgstr "Txinera tradizionala"
+msgstr "Txinera Tradizionala"
 
 msgid "Amharic"
-msgstr "Amharic"
+msgstr "Amharera"
 
-#, fuzzy, c-format
+#, c-format
 msgid "About %s"
-msgstr "Pidgin-i buruz"
+msgstr "%s(r)i buruz"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
@@ -11928,80 +11470,101 @@ msgid ""
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
-"Pidgin berehalako mezuen bezero modularra da  AIM, MSN, Yahoo!, Jabber, ICQ, "
-"IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, eta Gadu-Gadu "
-"momentu berean erabiltzeko gaitasuna duena. GTK+ erabiliz idatzi izan da ."
-"<BR><BR> Programa hau aldatu eta ber-banatu dezakezu  GPL terminopean (2 "
-"bertsioa edo beranduagokoa). GPL -ren kopia COPYING izeneko fitxategi baten "
-"dago Pidgin distribuzioarekin batera. Pidgin \"copyright\"-a du bere "
-"laguntzaileen eskutik. Ikusi ezazy COPYRIGHT fitxategia laguntzaileen "
-"zerrenda osoa ikusteko. Ez dugu programa honen bermea zihurtatzen.<BR><BR>"
+"Libpurple-n oinarritutako mezularitza-bezero grafiko modularra da %s. AIM, "
+"MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
+"Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu eta QQ jasaten ditu. GTK+ "
+"darabil. <BR><BR>GPL (2garren bertsioa edo ondorengoak) lizentziaren "
+"araupean modifikatu eta distribuitu dezakezu programa hau.  GPLren kopia bat "
+"aurkituko duzu %s(r)ekin distribuitutako 'COPYING' fitxategian.  Bere "
+"kontribuitzaileen copyright-a dauka %s(e)k.  Ez dugu programa honekiko inono "
+"bermerik eskaintzen.<BR><BR>"
 
-#, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin irc.freenode.net-en<BR><BR>"
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">Galderak:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/"
+"FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">E-posta bidezko laguntza:</FONT> <A HREF=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC Kanala:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
-msgstr "Egungo garatzailea"
+msgstr "Egungo Garatzaileak"
 
 msgid "Crazy Patch Writers"
-msgstr "Adabaki-idazle zoroak"
+msgstr "Partxe-Idazle Zoroak"
 
 msgid "Retired Developers"
-msgstr "Garatzaile erretiratuak"
+msgstr "Garatzaile Erretiratuak"
 
-#, fuzzy
 msgid "Retired Crazy Patch Writers"
-msgstr "Adabaki-idazle zoroak"
+msgstr "Erretiratutako Partxe-Idazle Zoroak"
 
 msgid "Current Translators"
-msgstr "Itzultzaileak"
+msgstr "Egungo Itzultzaileak"
 
 msgid "Past Translators"
-msgstr "Lehengo itzultzaileak"
+msgstr "Lehengo Itzultzaileak"
 
 msgid "Debugging Information"
-msgstr "Arakatze informazioa"
+msgstr "Arazte-Informazioa"
 
 msgid "_Name"
 msgstr "_Izena"
 
 msgid "_Account"
-msgstr "K_ontua"
+msgstr "_Kontua"
 
 msgid "Get User Info"
-msgstr "Hartu erabiltzailearen datuak"
+msgstr "Erabiltzaile-Datuak Eskuratu"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Idatzi informazioa ikusi nahi duzun pertsonaren pantaila-izena edo ezizena."
+"Zein pertsonaren informazioa ikusi nahi duzun zehaztu ezazu, erabiltzaile-"
+"izena edo ezizena idatziz."
 
 msgid "View User Log"
-msgstr "Ikusi erabiltzailearen egunkaria"
+msgstr "Erabiltzaile-Txostena Ikusi"
 
 msgid "Alias Contact"
-msgstr "Ezizena kontaktuarentzat"
+msgstr "Kontaktuaren Ezizena"
 
 msgid "Enter an alias for this contact."
-msgstr "Idatzi ezizen bat kontaktu honentzat."
+msgstr "Kontaktu honentzako ezizen bat idatzi ezazu."
 
 #, c-format
 msgid "Enter an alias for %s."
-msgstr "Idatzi ezizena bat %s(r)entzat."
+msgstr "%s(r)entzako ezizen bat idatzi."
 
 msgid "Alias Buddy"
-msgstr "Ezizena lagunarentzat"
+msgstr "Lagunaren Ezizena"
 
 msgid "Alias Chat"
-msgstr "Ezizena berriketarako"
+msgstr "Berriketaren Ezizena"
 
 msgid "Enter an alias for this chat."
-msgstr "Idatzi ezizen bat berriketa honetarako."
+msgstr "Berriketa honentzako ezizen bat idatzi ezazu."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
@@ -12009,52 +11572,49 @@ msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"%s eta beste %d lagun dituen kontaktua lagunen zerrendatik kentzera zoaz. "
-"Jarraitu nahi duzu?"
+"%s eta beste lagun %d dituen kontaktu bat kenduko duzu zure lagun-"
+"zerrendatik. Jarraitu nahi al duzu?"
 msgstr[1] ""
-"%s eta beste %d lagun dituen kontaktua lagunen zerrendatik kentzera zoaz. "
-"Jarraitu nahi duzu?"
+"%s eta beste %d lagun dituen kontaktu bat kenduko duzu zure lagun-"
+"zerrendatik. Jarraitu nahi al duzu?"
 
 msgid "Remove Contact"
-msgstr "Kendu kontaktua"
+msgstr "Kontaktua Kendu"
 
 msgid "_Remove Contact"
-msgstr "_Kontaktua kendu"
+msgstr "Kontaktua _Kendu"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr ""
-"%s taldea eta taldeko kide guztiak lagunen zerrendatik kentzera zoaz. "
-"Jarraitu nahi duzu?"
+"%s izeneko taldea eta %s izeneko taldea batuko dituzu. Jarraitu nahi al duzu?"
 
-#, fuzzy
 msgid "Merge Groups"
-msgstr "Kendu taldea"
+msgstr "Taldeak Batu"
 
-#, fuzzy
 msgid "_Merge Groups"
-msgstr "E_zabatu taldea"
+msgstr "Taldeak _Batu"
 
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"%s taldea eta taldeko kide guztiak lagunen zerrendatik kentzera zoaz. "
-"Jarraitu nahi duzu?"
+"%s taldea eta taldeko kide guztiak kenduko dituzu zure lagun-zerrendatik. "
+"Jarraitu nahi al duzu?"
 
 msgid "Remove Group"
-msgstr "Kendu taldea"
+msgstr "Taldea Kendu"
 
 msgid "_Remove Group"
-msgstr "_Kendu taldea"
+msgstr "Taldea _Kendu"
 
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "%s lagunen zerrendatik kentzera zoaz. Jarraitu nahi duzu?"
+msgstr "%s zure lagunen zerrendatik kentzera zoaz. Jarraitu nahi duzu?"
 
 msgid "Remove Buddy"
 msgstr "Kendu laguna"
@@ -12066,72 +11626,62 @@ msgstr "_Kendu laguna"
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr "%s berriketa lagunen zerrendatik kentzera zoaz. Jarraitu nahi duzu?"
+msgstr ""
+"%s berriketa kenduko duzu zure lagun-zerrendatik. Jarraitu nahi al duzu?"
 
 msgid "Remove Chat"
-msgstr "Kendu berriketa"
+msgstr "Berriketa Kendu"
 
 msgid "_Remove Chat"
-msgstr "_Kendu berriketa"
+msgstr "Berriketa _Kendu"
 
 msgid "Right-click for more unread messages...\n"
-msgstr "Eskubiko botoiaz klik egin irakurri gabeko mezu gehiagorentzat...\n"
+msgstr "Eskuin-klik egizu irakurri gabeko mezu gehiagorako...\n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "Egoera aldatu"
+msgstr "Egoera _Aldatu"
 
-#, fuzzy
 msgid "Show Buddy _List"
-msgstr "Lagunen zerrenda erakutsi"
+msgstr "Lagun-_Zerrenda Erakutsi"
 
-#, fuzzy
 msgid "_Unread Messages"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Irakurri _Gabeko Mezuak"
 
-#, fuzzy
 msgid "New _Message..."
-msgstr "Mezu berria..."
+msgstr "Mezu _Berria..."
 
-#, fuzzy
 msgid "_Accounts"
-msgstr "/K_ontua"
+msgstr "_Kontuak"
 
-#, fuzzy
 msgid "Plu_gins"
-msgstr "Plugin-ak"
+msgstr "_Plugin-ak"
 
-#, fuzzy
 msgid "Pr_eferences"
-msgstr "Hobespenak"
+msgstr "_Hobespenak"
 
-#, fuzzy
 msgid "Mute _Sounds"
-msgstr "Mututu soinuak"
+msgstr "Soinuak _Mututu"
 
-#, fuzzy
 msgid "_Blink on New Message"
-msgstr "Mezu berria..."
+msgstr "Mezu Berriekin Kliskatu"
 
-#, fuzzy
 msgid "_Quit"
-msgstr "Irten"
+msgstr "_Irten"
 
-#, fuzzy
 msgid "Not started"
-msgstr "Ez dago onartuta"
+msgstr "Hasi gabe"
 
 msgid "<b>Receiving As:</b>"
-msgstr "<b>Honela jasotzen:</b>"
+msgstr "<b>Honela Jasotzen:</b>"
 
 msgid "<b>Receiving From:</b>"
-msgstr "<b>Honengandik jasotzen:</b>"
+msgstr "<b>Honengandik Jasotzen:</b>"
 
 msgid "<b>Sending To:</b>"
-msgstr "<b>Honi bidaltzen:</b>"
+msgstr "<b>Honi Bidaltzen:</b>"
 
 msgid "<b>Sending As:</b>"
-msgstr "<b>Honela bidaltzen:</b>"
+msgstr "<b>Honela Bidaltzen:</b>"
 
 msgid "There is no application configured to open this type of file."
 msgstr "Ez dago fitxategi-mota hori irekitzeko aplikaziorik konfiguratuta."
@@ -12141,144 +11691,129 @@ msgstr "Errore bat gertatu da fitxategia irekitzean."
 
 #, c-format
 msgid "Error launching %s: %s"
-msgstr "Errorea <b>%s</b> abiaraztean: %s "
+msgstr "Errorea <b>%s</b> abiaraztean: %s"
 
 #, c-format
 msgid "Error running %s"
-msgstr "Errorea martxan jartzean %s"
+msgstr "Errorea %s exekutatzean"
 
 #, c-format
 msgid "Process returned error code %d"
-msgstr "Prozesua errorea kodea itzuli du %d"
+msgstr "Prozesuak errore-kodea itzuli du: %d"
 
 msgid "Filename:"
-msgstr "Fitxategi-izena:"
+msgstr "Fitxategi-Izena:"
 
 msgid "Local File:"
-msgstr "Fitxagei lokala:"
+msgstr "Fitxategi Lokala:"
 
 msgid "Speed:"
 msgstr "Abiadura:"
 
 msgid "Time Elapsed:"
-msgstr "Igarotako denbora:"
+msgstr "Denbora Igaroa:"
 
 msgid "Time Remaining:"
-msgstr "Geratzen den denbora:"
+msgstr "Denbora Faltan:"
 
 msgid "Close this window when all transfers _finish"
-msgstr "Lehio hau itxi transferentzia guztiak amaitu direnean"
+msgstr "Leihoa hau _itxi transferentzia guztiak amaitu direnean"
 
 msgid "C_lear finished transfers"
-msgstr "_Garbitu amaitutako transferentziak "
+msgstr "Amaitutako transferentziak _garbitu"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "Fitxategi transferentziaren _xehetasunak"
-
-#. Pause button
-msgid "_Pause"
-msgstr "_Pausarazi"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Berrekin"
+msgstr "Fitxategi-transferentziaren _xehetasunak"
 
 msgid "Paste as Plain _Text"
-msgstr "Itsatsi _testu gisa"
+msgstr "_Testu Arrunt bezela Itsatsi"
 
 msgid "_Reset formatting"
-msgstr "_Garbitu estiloa "
+msgstr "Formatua _garbitu"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "_Smiley-ak ezgaitu hautatutako testuan"
 
 msgid "Hyperlink color"
-msgstr "Hiperestekaren kolorea"
+msgstr "Hiperesteka-kolorea"
 
 msgid "Color to draw hyperlinks."
-msgstr "Kolorea hiperestekak marrazteko"
+msgstr "Hiperestekak marrazteko kolorea."
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "Hiperestekaren kolorea"
+msgstr "Bisitatutako hiperesten kolorea"
 
-#, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
-msgstr "Kolorea hiperestekak marrazteko sagua gainetik pasatzean."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr ""
+"Bisitatutako (edo aktibatutako) hiperestekak marrazteko erabiliko den "
+"kolorea."
 
-#, fuzzy
 msgid "Hyperlink prelight color"
-msgstr "Hiperestekaren kolorea"
+msgstr ""
 
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Kolorea hiperestekak marrazteko sagua gainetik pasatzean."
+msgstr "Hiperestekek xagua gainean dutenean marrazteko kolorea."
 
-#, fuzzy
 msgid "Sent Message Name Color"
-msgstr "Ireki mezu guztiak"
+msgstr "Bidalitako Mezuen Izenaren Kolorea"
 
 msgid "Color to draw the name of a message you sent."
-msgstr ""
+msgstr "Zuk bidalitako mezuen izena marrazteko erabiliko den kolorea."
 
-#, fuzzy
 msgid "Received Message Name Color"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Jasotako Mezuen Izenaren Kolorea"
 
 msgid "Color to draw the name of a message you received."
-msgstr ""
+msgstr "Zuk jasotako mezuen izena marrazteko erabiliko den kolorea."
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "\"Aipamena\" Izenaren Kolorea"
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
+"Zuk jasotako eta zure izena aipatzen duten mezuen izena marrazteko erabiliko "
+"den kolorea."
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "Ekintza-Mezuen Izenaren Kolorea"
 
 msgid "Color to draw the name of an action message."
-msgstr ""
+msgstr "Ekintza-mezuen izena marrazteko erabiliko den kolorea."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
+msgstr "Ekintza-Mezu Xuxurlatuen Izenaren Kolorea"
+
+msgid "Color to draw the name of a whispered action message."
+msgstr "Xuxurlatutako ekintza-mezuen izena marrazteko erabiliko den kolorea."
 
 msgid "Whisper Message Name Color"
-msgstr ""
+msgstr "Mezu Xuxurlatuen Izenaren Kolorea"
+
+msgid "Color to draw the name of a whispered message."
+msgstr "Xuxurlatutako mezuen izena marrazteko erabiliko den kolorea."
 
-#, fuzzy
 msgid "Typing notification color"
-msgstr "Kendu jakinarazpenak"
+msgstr "Idazte-jakinarazpenaren kolorea"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+msgid "The color to use for the typing notification"
+msgstr "Idazte-jakinarazpenean erabiliko den kolorea."
 
-#, fuzzy
 msgid "Typing notification font"
-msgstr "_Ireki jakinarazpen-leihoa "
+msgstr "Idazte-jakinarazpenaren letra-tipoa"
 
 msgid "The font to use for the typing notification"
-msgstr ""
+msgstr "Idazte-jakinarazpenean erabiliko den letra-tipoa."
 
-#, fuzzy
 msgid "Enable typing notification"
-msgstr "Mezu berrien jakinarazpenak"
-
-msgid "_Copy Email Address"
-msgstr "_Kopiatu helbide elektronikoa"
-
-msgid "_Open Link in Browser"
-msgstr "Ire_ki esteka arakatzailean"
-
-msgid "_Copy Link Location"
-msgstr "_Kopiatu estekaren helbidea"
+msgstr "Idazte-jakinarazpena gaitu"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"<span size='larger' weight='bold'>Fitxategi mota ezezaguna</span>\n"
+"<span size='larger' weight='bold'>Fitxategi-mota ezezaguna</span>\n"
 "\n"
 "Defektuz PNG ezarria."
 
@@ -12312,24 +11847,22 @@ msgstr ""
 " %s"
 
 msgid "Save Image"
-msgstr "Gorde irudia"
+msgstr "Irudia Gorde"
 
-#, c-format
 msgid "_Save Image..."
-msgstr "_Gorde irudia..."
+msgstr "Irudia _Gorde..."
 
-#, fuzzy, c-format
 msgid "_Add Custom Smiley..."
-msgstr "Erakutsi _aurpegiera grafikoak "
+msgstr "Smiley _Pertsonalizatua Gehitu..."
 
 msgid "Select Font"
-msgstr "Hautatu letra-tipoa"
+msgstr "Letra-Tipoa Hautatu"
 
 msgid "Select Text Color"
-msgstr "Hautatu testu-kolorea"
+msgstr "Testu-Kolorea Hautatu"
 
 msgid "Select Background Color"
-msgstr "Hautatu atzeko planoaren kolorea"
+msgstr "Atzealdeko Kolorea Hautatu"
 
 msgid "_URL"
 msgstr "_URLa"
@@ -12341,51 +11874,51 @@ msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"Sartu txertatu nahi duzun estekaren URL helbidea eta azalpena. Azalpena "
-"aukerakoa da."
+"Txertatu nahi duzun estekaren URLa eta azalpena sartu itzazu. Azalpena "
+"opzionala da."
 
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Sartu txertatu nahi duzun estekaren URL helbidea."
+msgstr "Txertatu nahi duzun estekaren URLa sartu ezazu."
 
 msgid "Insert Link"
-msgstr "Txertatu esteka"
+msgstr "Esteka Txertatu"
 
 msgid "_Insert"
 msgstr "_Txertatu"
 
 #, c-format
 msgid "Failed to store image: %s\n"
-msgstr "Huts egin du irudia gordetzean: %s\n"
+msgstr "Ezin irudia gorde: %s\n"
 
 msgid "Insert Image"
-msgstr "Txertatu irudia"
+msgstr "Irudia Txertatu"
 
 #, c-format
 msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
+"Smiley hau ezgaituta dago, smiley pertsonalizatu bat dagoelako lasterbide "
+"honentzat:\n"
+" %s"
 
 msgid "Smile!"
 msgstr "Irri egin!"
 
-#, fuzzy
 msgid "_Manage custom smileys"
-msgstr "Erakutsi _aurpegiera grafikoak "
+msgstr "Smiley pertsonalizatuak _kudeatu"
 
 msgid "This theme has no available smileys."
-msgstr "Gai honek ez du aurpegiera erabilgarririk"
+msgstr "Gai honek ez du smiley-rik."
 
-#, fuzzy
 msgid "_Font"
-msgstr "Letra-tipoak"
+msgstr "_Letra-Tipoa"
 
-#, fuzzy
 msgid "Group Items"
-msgstr "Taldearen izena"
+msgstr "Elementuak Taldekatu"
 
 msgid "Ungroup Items"
-msgstr ""
+msgstr "Elementuak Destaldekatu"
 
 msgid "Bold"
 msgstr "Lodia"
@@ -12397,156 +11930,137 @@ msgid "Underline"
 msgstr "Azpimarratua"
 
 msgid "Strikethrough"
-msgstr ""
+msgstr "Zirriborratu"
 
 msgid "Increase Font Size"
-msgstr ""
+msgstr "Letra-Tamaina Handitu"
 
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "Letra-Tamaina Txikitu"
 
 msgid "Font Face"
-msgstr "Letra-tipoa"
-
-#, fuzzy
-msgid "Background Color"
-msgstr "Atzeko planoko kolorea"
+msgstr "Letra-Tipoa"
 
-#, fuzzy
 msgid "Foreground Color"
-msgstr "Aurreko planoko letraren kolorea"
+msgstr "Aurrealdearen Kolorea"
 
-#, fuzzy
 msgid "Reset Formatting"
-msgstr "Formateoa beregin"
+msgstr "Formatoa Desegin"
 
-#, fuzzy
 msgid "Insert IM Image"
-msgstr "Txertatu irudia"
+msgstr "IM-Irudia Txertatu"
 
-#, fuzzy
 msgid "Insert Smiley"
-msgstr "Txertatu aurpegiera"
+msgstr "Smiley-a Txertatu"
 
-#, fuzzy
 msgid "<b>_Bold</b>"
-msgstr "<b>%s:</b> "
+msgstr "<b>_Lodia</b>"
 
-#, fuzzy
 msgid "<i>_Italic</i>"
-msgstr " <i>(identifikatuta)</i>"
+msgstr "<i>_Etzana</i>"
 
-#, fuzzy
 msgid "<u>_Underline</u>"
-msgstr "Azpimarratua"
+msgstr "<u>_Azpimarratua</u>"
 
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
+msgstr "<span strikethrough='true'>Zirriborratua</span>"
 
-#, fuzzy
 msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Errorea irudia gordetzean</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger'>_Handiagoa</span>"
 
-#, fuzzy
 msgid "_Normal"
-msgstr "Normala"
+msgstr "_Normala"
 
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>_Txikiagoa</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#, fuzzy
 msgid "_Font face"
-msgstr "Letra-tipoa"
+msgstr "_Letra-tipoa"
 
-#, fuzzy
 msgid "Foreground _color"
-msgstr "Aurreko planoko letraren kolorea"
+msgstr "A_urrealdearen kolorea"
 
-#, fuzzy
 msgid "Bac_kground color"
-msgstr "Atzeko planoko kolorea"
+msgstr "A_tzealdearen kolorea"
 
-#, fuzzy
 msgid "_Image"
-msgstr "Gorde irudia"
+msgstr "_Irudia"
 
-#, fuzzy
 msgid "_Link"
-msgstr "_Sartu"
+msgstr "_Esteka"
 
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "Erregela _horizontala"
 
-#, fuzzy
 msgid "_Smile!"
-msgstr "Irri egin!"
+msgstr "_Irri egin!"
 
-#, fuzzy
 msgid "Log Deletion Failed"
-msgstr "Konexioak huts egin du"
+msgstr "Errorea Txostena Ezabatzean"
 
 msgid "Check permissions and try again."
-msgstr ""
+msgstr "Baimenak egiaztatu eta berriro saiatu."
 
 # , fuzzy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
-msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?"
+msgstr ""
+"Ziur zaude %s(r)ekin %s(et)an hasitako solasaldiaren txostena betirako "
+"ezabatu nahi duzula?"
 
 # , fuzzy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
-msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?"
+msgstr ""
+"Ziur zaude %s(r)en %s(et)an hasitako solasaldiaren txostena betirako ezabatu "
+"nahi duzula?"
 
 # , fuzzy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
-msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?"
+msgstr ""
+"Ziur zaude %s(et)an hasitako solasaldiaren txostena betirako ezabatu nahi "
+"duzula?"
 
-#, fuzzy
 msgid "Delete Log?"
-msgstr "Ezabatu"
+msgstr "Txostena Ezabatu?"
 
-#, fuzzy
 msgid "Delete Log..."
-msgstr "Ezabatu"
+msgstr "Txostena Ezabatu..."
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Solasaldia %s  hemen %s</span>"
+msgstr "<span size='larger' weight='bold'>Solasaldia %s(e)n %s(r)ekin</span>"
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr ""
-"<span size='larger' weight='bold'>Solasaldia honekin %s hemen %s</span>"
+msgstr "<span size='larger' weight='bold'>Solasaldia %s(r)ekin %s(e)n</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr ""
+msgstr "Txosten-_direktorioa arakatu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "Pidgin %s. Informazio gehiago nahi baduzu, idatzi `%s -h'.\n"
+msgstr "%s %s. `%s -h' erabili ezazu informazio gehiago eskuratzeko.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12556,25 +12070,29 @@ msgid ""
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-"Pidgin %s\n"
-"Erabiltzeko era: %s [Aukerak]...\n"
+"%s %s\n"
+"Erabilera: %s [AUKERA]...\n"
 "\n"
-"  -c, --config=DIR    erabili DIR konfigurazio fitxategientzat\n"
-"  -d, --debug         idatzi \"debugging\"mezuak stdout -en\n"
-"  -h, --help          Erakutsi laguntza eta irten\n"
-"  -n, --nologin       Automatikoki ez konexio hasi\n"
-"  -l, --login[=IZENA]  Automatikoki konexioa hasi (IZENA aukerazko argumentu "
-"espesifikazioa\n"
-"                      kontua(k) erabiltzeko, koma batez bereiztu)\n"
-"  -v, --version       Erakutsi egungo bertsioa eta irten\n"
+"  -c, --config=DIR    DIR erabili konfigurazio-fitxategietarako\n"
+"  -d, --debug         'stdout'-en inprimatu arazte-mezuak\n"
+"  -f, --force-online  konektatzera beharko, sare-egoera kontutan hartu gabe\n"
+"  -h, --help          laguntza hau bistaratu eta irten\n"
+"  -m, --multiple      ez istantzia bakarra egotera behartu\n"
+"  -n, --nologin       ez automatikoki konektatu\n"
+"  -l, --login[=IZENA]  kontu zehaztza(k) gaitu (opzionalki NAME\n"
+"                      erabili zein kontu erabili zehazteko,komaz bereiztuz.\n"
+"                      Hau gabe, lehenengo kontua bakarrik gaituko da).\n"
+"  --display=DISPLAY   zein X-pantaila erabili\n"
+"  -v, --version       bertsio-zenbakia erakutsi eta irten\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12583,17 +12101,20 @@ msgid ""
 "                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-"Pidgin %s\n"
-"Erabiltzeko era: %s [Aukerak]...\n"
+"%s %s\n"
+"Erabiltera: %s [AUKERA]...\n"
 "\n"
-"  -c, --config=DIR    erabili DIR konfigurazio fitxategientzat\n"
-"  -d, --debug         idatzi \"debugging\"mezuak stdout -en\n"
-"  -h, --help          Erakutsi laguntza eta irten\n"
-"  -n, --nologin       Automatikoki ez konexio hasi\n"
-"  -l, --login[=IZENA]  Automatikoki konexioa hasi (IZENA aukerazko argumentu "
-"espesifikazioa\n"
-"                      kontua(k) erabiltzeko, koma batez bereiztu)\n"
-"  -v, --version       Erakutsi egungo bertsioa eta irten\n"
+"  -c, --config=DIR    DIR erbili konfigurazio-fitxategientzat\n"
+"  -d, --debug         'stdout'-en inprimatu arazte-mezuak\n"
+"  -f, --force-online  online egotera behartu, sare-egoera kontutan izan "
+"gabe\n"
+"  -h, --help          laguntza hau bistaratu eta irten\n"
+"  -m, --multiple      ez istantzia bakarra izatera behartu\n"
+"  -n, --nologin       ez automatikoki konektatu\n"
+"  -l, --login[=IZENA]  kontu zehaztza(k) gaitu (opzionalki NAME\n"
+"                      erabili zein kontu erabili zehazteko,komaz bereiztuz.\n"
+"                      Hau gabe, lehenengo kontua bakarrik gaituko da).\n"
+"  -v, --version       bertsio-zenbakia erakutsi eta irten\n"
 
 #, c-format
 msgid ""
@@ -12613,101 +12134,133 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Pidgin"
-msgstr "Markatzea"
+msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Ireki mezu guztiak"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "Ixten, beste libpurple-bezero bat martxan dagoelako jadanik.\n"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Posta-mezua daukazu!</span>"
+msgid "/_Media"
+msgstr "/_Multimedia"
+
+msgid "/Media/_Hangup"
+msgstr "/Multimedia/E_skegi"
+
+msgid "Calling..."
+msgstr "Deitzen..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s(e)k audio-/bideo-sesio bat hasiarazi nahi du zurekin."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s(e)k bideo-sesio bat hasiarazi nahi du zurekin."
 
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s erabiltzaileak mezu berri %d du."
-msgstr[1] "%s erabiltzaileak %d mezu berri ditu."
+msgstr[0] "%s(e)k mezu berri %d dauka."
+msgstr[1] "%s(e)k %d mezu berri dauzka."
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "<b>Plugin ezaugarriak</b>"
-msgstr[1] "<b>Plugin ezaugarriak</b>"
+msgstr[0] "<b>Posta berri %d.</b>"
+msgstr[1] "<b>%d posta berri.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Arakatzailearen <b>\"%s\"</b> komandoa ez da baliozkoa."
+msgstr "Baliogabea da arakatzailearen <b>\"%s\"</b> agindua."
 
 msgid "Unable to open URL"
-msgstr "Ezin da URLa ireki"
+msgstr "Ezin URLa ireki"
 
 #, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "Errorea <b>\"%s\"</b> abiaraztean: %s"
+msgstr "Errorea \"%s\"abiaraztean: %s"
 
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
-"Arakatzailearen 'eskuzko' komandoa aukeratu da, baina ez da komandorik "
-"ezarri."
+"Arakatzailearen 'Eskuz' komandoa aukeratu da, baina ez da komandorik ezarri."
+
+msgid "No message"
+msgstr "Mezurik ez"
+
+msgid "Open All Messages"
+msgstr "Mezu Guztiak Ireki"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Posta daukazu!</span>"
+
+msgid "New Pounces"
+msgstr "Alerta Berriak"
+
+msgid "Dismiss"
+msgstr "Mespretxatu"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Alerta daukazu!</span>"
 
 msgid "The following plugins will be unloaded."
-msgstr "Ondorengo plugin-ak  memoriatik deskargatuko  dira."
+msgstr "Plugin hauek memoriatik deskargatuko dira."
 
 msgid "Multiple plugins will be unloaded."
-msgstr "Plugin-ak anitz memoriatik deskargatuko dira."
+msgstr "Plugin ugari memoriatik deskargatuko dira."
 
 msgid "Unload Plugins"
-msgstr "Memoriatik deskargatu Plugin-ak"
+msgstr "Pluginak Deskargatu"
 
-#, fuzzy
 msgid "Could not unload plugin"
-msgstr "Ezin izan da gako publikoa kargatu"
+msgstr "Ezin plugina deskargatu"
 
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr ""
+"Ezin izan da plugina deskargatu orain, baino hurrengo abioan ezgaituko da."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Eguneratzeko plugin-aren webgunea begiratu.</span>"
+"<span foreground=\"red\" weight=\"bold\">Errorea: %s\n"
+"Pluginaren webgunera jo ezazu eguneraketa bila.</span>"
 
-#, fuzzy
 msgid "Author"
-msgstr "Baimena eman"
+msgstr "Egilea"
 
-#, fuzzy
 msgid "<b>Written by:</b>"
-msgstr "<b>Honi bidaltzen:</b>"
+msgstr "<b>Idazlea:</b>"
 
-#, fuzzy
 msgid "<b>Web site:</b>"
-msgstr "<b>Honela bidaltzen:</b>"
+msgstr "<b>Webgunea:</b>"
 
-#, fuzzy
 msgid "<b>Filename:</b>"
-msgstr "_Erabiltzaile-izena:"
+msgstr "<b>Fitxategi-izena:</b>"
 
 msgid "Configure Pl_ugin"
-msgstr "Pl_uing-a konfiguratu"
+msgstr "Pl_uinga Konfiguratu"
 
 msgid "<b>Plugin Details</b>"
-msgstr "<b>Plugin ezaugarriak</b>"
+msgstr "<b>Plugin-Xehetasunak</b>"
 
 msgid "Select a file"
-msgstr "Hautatu fitxategia"
+msgstr "Fitxategia Hautatu"
+
+msgid "Modify Buddy Pounce"
+msgstr "Lagun-Alerta Modifikatu"
 
 #. Create the "Pounce on Whom" frame.
-#, fuzzy
 msgid "Pounce on Whom"
-msgstr "Alerta nori"
+msgstr "Norgatik egin Alerta"
+
+msgid "_Account:"
+msgstr "K_ontua:"
 
 msgid "_Buddy name:"
 msgstr "_Lagunaren izena:"
@@ -12719,46 +12272,46 @@ msgid "Signs o_ff"
 msgstr "_Deskonektzean "
 
 msgid "Goes a_way"
-msgstr "Joanda egoera joan"
+msgstr "_Joatean"
 
 msgid "Ret_urns from away"
-msgstr "J_oanda egoeratik itzuli"
+msgstr "_Itzultzean"
 
 msgid "Becomes _idle"
-msgstr "Bihurtu ez-aktibo"
+msgstr "Ina_ktibo geratzean"
 
 msgid "Is no longer i_dle"
-msgstr "Ez da luzeagoz ez-aktibo egongo"
+msgstr "_Aktibatzean"
 
 msgid "Starts _typing"
-msgstr "_Idazten hastean"
+msgstr "Idazten _hastean"
 
 msgid "P_auses while typing"
-msgstr ""
+msgstr "Idazten _gelditzean"
 
 msgid "Stops t_yping"
-msgstr "_Idazteari gelditu"
+msgstr "Idazteari _uztean"
 
 msgid "Sends a _message"
-msgstr "Bidali _mezua"
+msgstr "_Mezua bidaltzean"
 
 msgid "Ope_n an IM window"
-msgstr "_Ireki BM leiho bat "
+msgstr "_IM leiho bat ireki"
 
 msgid "_Pop up a notification"
-msgstr "_Ireki jakinarazpen-leihoa "
+msgstr "_Jakinarazpen-leihoa ireki"
 
 msgid "Send a _message"
-msgstr "Bidali _mezua"
+msgstr "_Mezua bidali"
 
 msgid "E_xecute a command"
-msgstr "_Exekutatu komando bat"
+msgstr "Agindua _exekutatu"
 
 msgid "P_lay a sound"
-msgstr "_Jo soinu bat"
+msgstr "_Soinua erreproduzitu"
 
 msgid "Brows_e..."
-msgstr "_Arakatu... "
+msgstr "_Arakatu..."
 
 msgid "Br_owse..."
 msgstr "A_rakatu..."
@@ -12767,74 +12320,125 @@ msgid "Pre_view"
 msgstr "_Aurrebista"
 
 # , fuzzy
-#, fuzzy
 msgid "P_ounce only when my status is not Available"
-msgstr "P_ounce bakarrik nire egoera eskuragarri ez nagoenean"
+msgstr "Nire egoera 'Eskuragaitz' denean bakarrik eman a_lerta"
 
 msgid "_Recurring"
-msgstr "_Errepikatzean"
+msgstr "_Errepikakorra"
 
-#, fuzzy
 msgid "Pounce Target"
-msgstr "Alerta noiz"
+msgstr "Alertaren Helburua"
 
-msgid "Smiley theme failed to unpack."
-msgstr "desenpetatzerakoan huts egin du."
+#, c-format
+msgid "Started typing"
+msgstr "Idazten hasi da"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Idazten gelditu da"
+
+#, c-format
+msgid "Signed on"
+msgstr "Konektatu da"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Aktibatu da"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Itzuli da"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Idazteari utzi dio"
+
+#, c-format
+msgid "Signed off"
+msgstr "Deskonektatu da"
+
+#, c-format
+msgid "Became idle"
+msgstr "Inaktibo geratu da"
+
+#, c-format
+msgid "Went away"
+msgstr "Kanpora joan da"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Mezua bidali du"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Ezezaguna... Eman honen berri!"
+
+msgid "Theme failed to unpack."
+msgstr "Ezin gaia erauzi."
+
+msgid "Theme failed to load."
+msgstr "Ezin gaia kargatu."
+
+msgid "Theme failed to copy."
+msgstr "Ezin gaia kopiatu."
 
 msgid "Install Theme"
-msgstr ""
+msgstr "Gaia Instalatu"
 
 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 ""
-"Hautatu aurpegiera-gai bat beheko zerrendan. Gai berriak instalatzeko, "
-"arrastatu eta jaregin gaien zerrendan."
+"Erabili nahi duzun smiley-gaia hautatu ezazu azpiko zerrendan. Gai berriak "
+"instalatzeko, zerrendara arrastatu eta jaregin itzazu."
 
 msgid "Icon"
 msgstr "Ikonoa"
 
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Teklatu-Lasterbideak"
 
-#, fuzzy
 msgid "Cl_ose conversations with the Escape key"
-msgstr "Solasaldiak %s(r)ekin"
+msgstr "Solasaldiak _itxi 'Escape' teklarekin"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Lagun-Zerrendaren Gaia"
+
+#. System Tray
 msgid "System Tray Icon"
-msgstr "Sistema-erretiluaren ikonoa"
+msgstr "Sistema-Erretiluko Ikonoa"
 
-#, fuzzy
 msgid "_Show system tray icon:"
-msgstr "Sistema-erretiluaren ikonoa"
+msgstr "Erretiluko ikonoa _erakutsi:"
 
-#, fuzzy
 msgid "On unread messages"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Irakurri gabeko mezuetan"
 
-#, fuzzy
-msgid "Conversation Window Hiding"
-msgstr "IMko solasaldi-leihoak"
+msgid "Conversation Window"
+msgstr "Solasaldi-Leihoa"
 
-#, fuzzy
 msgid "_Hide new IM conversations:"
-msgstr "_Eskutatu BM solasaldi berria"
+msgstr "IM-solasaldi berriak _ezkutatu:"
 
 msgid "When away"
 msgstr "Kanpora joatean"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Solasaldi-leiho berriak mi_nimizatu"
+
 #. All the tab options!
 msgid "Tabs"
-msgstr ""
+msgstr "Fitxak"
 
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Erakutsi _BMak eta berriketak fitxadun leihotan"
+msgstr "Fitxetan erakutsi _IMak eta berriketak"
 
 msgid "Show close b_utton on tabs"
-msgstr "Erakutsi _ixteko botoia fitxetan"
+msgstr "_Ixteko botoia erakutsi fitxetan"
 
 msgid "_Placement:"
-msgstr "_Kokalekua :"
+msgstr "_Kokalekua:"
 
 msgid "Top"
 msgstr "Goian"
@@ -12849,141 +12453,135 @@ msgid "Right"
 msgstr "Eskuinean"
 
 msgid "Left Vertical"
-msgstr "Ezker bertikala"
+msgstr "Ezker Bertikala"
 
 msgid "Right Vertical"
-msgstr "Eskubi bertikala "
+msgstr "Eskuin Bertikala "
 
 msgid "N_ew conversations:"
-msgstr "Solasaldia b_erria:"
+msgstr "Solasaldia b_erriak:"
 
 msgid "Show _formatting on incoming messages"
-msgstr "Erakutsi  datozen mezuen _formatua "
+msgstr "Iristen diren mezuen _formatua erakutsi"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+msgstr "Fitxa itxi bezain laster itxi IMak"
 
-#, fuzzy
 msgid "Show _detailed information"
-msgstr "Ezin da kanalaren informazioa eskuratu"
+msgstr "Informazio _xehetua erakutsi"
 
 msgid "Enable buddy ic_on animation"
-msgstr "_Gaitu lagunen ikonen animazioa"
+msgstr "Lagunen i_konoen animazioa gaitu"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "Jakinarazi _lagunei idazten ari zatzaizkienean"
+msgstr "_Idazten ari zarela jakinarazi lagunei"
 
 msgid "Highlight _misspelled words"
-msgstr "_Nabarmendu gaizki idatzitako hitzak "
+msgstr "Oker idatzitako hitzak _nabarmendu"
 
 msgid "Use smooth-scrolling"
-msgstr "Erabili mugimendu leuna norantza bertikalean"
+msgstr "Korritze leuna erabili"
 
-#, fuzzy
 msgid "F_lash window when IMs are received"
-msgstr "_Erakutsi leihoa keinuka mezuak jasotzean"
-
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "BMko solasaldi-leihoak"
+msgstr "Leihoa_kliskatu IMak jasotzean"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "Sarrera-eremuaren altuera minimoa:"
 
-#, fuzzy
 msgid "Font"
-msgstr "Letra-tipoak"
+msgstr "Letra-tipoa"
 
 msgid "Use document font from _theme"
-msgstr ""
+msgstr "Gaiaren _dokumentu-letra erabili"
 
 msgid "Use font from _theme"
-msgstr ""
+msgstr "_Gaiaren letra-tipoa erabili"
 
-#, fuzzy
 msgid "Conversation _font:"
-msgstr "Solasaldiako Sarrerak"
+msgstr "Solasaldirako letra-_tipoa:"
 
-#, fuzzy
 msgid "Default Formatting"
-msgstr "Formateoa beregin"
+msgstr "Formato Lehenetsia"
 
-#, fuzzy
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
-"Irteerako testudun mezuek edukiko duten itxura estiloa onartzen duten "
-"protokoloak erabiltzean. :)"
+"Honela ikusiko dira zuk bidalitako mezuak, formateatzea onartzen duten "
+"protokoloak erabiltzean."
 
 msgid "Cannot start proxy configuration program."
-msgstr ""
+msgstr "Ezin proxy-konfigurazio programa hasiarazi."
 
-#, fuzzy
 msgid "Cannot start browser configuration program."
-msgstr "Ezin da erabiltzailearen informazioa lortu"
-
-msgid "ST_UN server:"
-msgstr "ST_UN Zerbitzaria:"
+msgstr "Ezin nabigatzaile-konfigurazio programa hasiarazi."
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr ""
+msgstr "<span style=\"italic\">Adibidea: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Automatikoki detektatu IP helbidea "
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "_Automatikoki detektatutako IP-helbidea erabili: %s"
 
 msgid "Public _IP:"
-msgstr "_IP publikoa:"
+msgstr "_IP Publikoa:"
 
 msgid "Ports"
 msgstr "Atakak"
 
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "_Routerraren ataka-bideratze automatikoa gaitu"
 
 msgid "_Manually specify range of ports to listen on"
-msgstr "_Zehaztu eskuz entzuteko ataken barrutia"
+msgstr "_Eskuz zehaztu zein ataka-barruti entzun"
 
 msgid "_Start port:"
-msgstr "_Hasierako ataka: "
+msgstr "_Hasierako ataka:"
 
 msgid "_End port:"
-msgstr "_Amaierako ataka: "
+msgstr "_Amaierako ataka:"
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Relay Zerbitzaria (TURN)"
 
-#, fuzzy
 msgid "Proxy Server &amp; Browser"
-msgstr "Proxy zerbitzaria"
+msgstr "Proxy Zerbitzaria &amp; Nabigatzailea"
 
 msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
+msgstr "<b>Ez da proxy-konfigurazio programa aurkitu.</b>"
 
 msgid "<b>Browser configuration program was not found.</b>"
-msgstr ""
+msgstr "<b>Ez da nabigatzaile-konfigurazio programa aurkitu.</b>"
 
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
+"GNOME Hobespenetan konfiguratuak daude\n"
+"Proxy- eta Nabigatzaile-hobespenak"
 
-#, fuzzy
 msgid "Configure _Proxy"
-msgstr "Gela _Konfiguratu"
+msgstr "_Proxya Konfiguratu"
 
-#, fuzzy
 msgid "Configure _Browser"
-msgstr "Gela _Konfiguratu"
+msgstr "_Nabigatzailea Konfiguratu"
 
 msgid "Proxy Server"
-msgstr "Proxy zerbitzaria"
+msgstr "Proxy Zerbitzaria"
 
 msgid "No proxy"
 msgstr "Proxy-rik ez"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr "Urruneko DNSa erabili SOCKS4 proxy-ekin"
+
 msgid "_User:"
 msgstr "_Erabiltzailea:"
 
 msgid "Seamonkey"
-msgstr ""
+msgstr "Seamonkey"
 
 msgid "Opera"
 msgstr "Opera"
@@ -12997,12 +12595,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#, fuzzy
 msgid "Desktop Default"
-msgstr "Lehenetsiak _onartu"
+msgstr "Mahaigainaren Lehenetsia"
 
 msgid "GNOME Default"
-msgstr "Gnome-ren lehenetsia "
+msgstr "Gnome-ren Lehenetsia"
 
 msgid "Galeon"
 msgstr "Galeon"
@@ -13020,22 +12617,22 @@ msgid "Manual"
 msgstr "Eskuz"
 
 msgid "Browser Selection"
-msgstr "Arakatzailea hautatzea"
+msgstr "Nabigatzaile-Hautaketa"
 
 msgid "_Browser:"
-msgstr "_Arakatzailea:"
+msgstr "_Nabigatzailea:"
 
 msgid "_Open link in:"
-msgstr "_Ireki esteka:"
+msgstr "_Hemen ireki esteka:"
 
 msgid "Browser default"
-msgstr "Arakatzaile lehenetsian"
+msgstr "Arakatzailearen lehenetsian"
 
 msgid "Existing window"
-msgstr "Lehendik dagoen leihoan"
+msgstr "Lehengo leihoan"
 
 msgid "New tab"
-msgstr "Fitxa berrian"
+msgstr "Fitxa berria"
 
 #, c-format
 msgid ""
@@ -13046,49 +12643,49 @@ msgstr ""
 "(%s - URL)"
 
 msgid "Log _format:"
-msgstr "_Egunkari-formatua: "
+msgstr "_Txosten-formatua:"
 
 msgid "Log all _instant messages"
-msgstr "Erregistratu _egunkarian berehalako mezu guztiak "
+msgstr "_Istanteko mezu guztiak gorde"
 
 msgid "Log all c_hats"
-msgstr "Erreg_istratu egunkarian berriketa guztiak"
+msgstr "_Berriketa guztiak gorde"
 
 msgid "Log all _status changes to system log"
-msgstr "Egunkarian gorde _egoera aldaketa guztiak egunkari sistema bidez"
+msgstr "_Egoera-aldaketa guztiak gorde"
 
 msgid "Sound Selection"
-msgstr "Soinua hautatzea"
+msgstr "Soinu-Hautaketa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Quietest"
-msgstr "Erreserbatua"
+msgstr "Ixilena"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Quieter"
-msgstr "Irten"
+msgstr "Ixilagoa"
 
 #, c-format
 msgid "Quiet"
-msgstr "Irten "
+msgstr "Ixila"
 
 #, c-format
 msgid "Loud"
-msgstr "Altu esan "
+msgstr "Ozena"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Louder"
-msgstr "ordu"
+msgstr "Ozenagoa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Loudest"
-msgstr "Soinuak"
+msgstr "Ozenena"
 
 msgid "_Method:"
 msgstr "_Metodoa:"
 
 msgid "Console beep"
-msgstr "Kontsolaren soinu-seinalea"
+msgstr "Kontsolaren soinua"
 
 msgid "No sounds"
 msgstr "Soinurik ez"
@@ -13098,100 +12695,91 @@ msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"Soinuaren k_omandoa:\n"
+"Soinu-_agindua:\n"
 "(%s fitxategi-izena)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "Mututu soinuak"
+msgstr "Soinuak m_ututu"
 
 msgid "Sounds when conversation has _focus"
 msgstr "_Solasaldiak fokua duenean"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "Ahalbidetu Kontua"
+msgstr "Soinuak _gaitu:"
 
-#, fuzzy
 msgid "V_olume:"
-msgstr "Bolumena:"
+msgstr "B_olumena:"
 
 msgid "Play"
 msgstr "Erreproduzitu"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "_Arakatu... "
+msgstr "_Arakatu..."
 
-#, fuzzy
 msgid "_Reset"
-msgstr "Berrezarri"
+msgstr "_Berrezarri"
 
 msgid "_Report idle time:"
-msgstr "Ezagutarazi _inaktibotasun-denborak"
+msgstr "_inaktibotasun-denbora:"
 
 msgid "Based on keyboard or mouse use"
 msgstr "Teklatu edo saguaren erabilpenean oinarrituta"
 
 msgid "_Auto-reply:"
-msgstr "_Erantzun _automatikoki"
+msgstr "_Auto-erantzuna:"
 
 msgid "When both away and idle"
-msgstr "Bai Kanpoan eta inaktibo dagoenean"
+msgstr "Kanpoan edo inaktibo egotean"
 
 #. Auto-away stuff
 msgid "Auto-away"
-msgstr "Kanpoan automatikoki ezartzea"
-
-msgid "Change status when _idle"
-msgstr "Egoera aldatu _ez-aktibo dagoenean"
+msgstr "Auto-atera"
 
-#, fuzzy
 msgid "_Minutes before becoming idle:"
-msgstr "_Egoera aldatu aurreko minutuak:"
+msgstr "_Inaktibo geratu arteko minutuak:"
+
+msgid "Change status when _idle"
+msgstr "Egoera aldatu _inaktibo egotean"
 
 msgid "Change _status to:"
-msgstr "_Egoera  aldatu hona:"
+msgstr "_Egoera honetara aldatu:"
 
 #. Signon status stuff
-#, fuzzy
 msgid "Status at Startup"
-msgstr "Hasierako egoera"
+msgstr "Abioko Egoera"
 
 msgid "Use status from last _exit at startup"
-msgstr "Erabili azkeneko irteteerako egoera hasieratzeko"
+msgstr "Azkeneko exekuzioko egoera erabili abiaraztean"
 
 msgid "Status to a_pply at startup:"
-msgstr "Haserako egoera ezartzeko:"
+msgstr "Abioan e_zarriko den egoera:"
 
-#, fuzzy
 msgid "Interface"
-msgstr "Koloreen Interfaze"
+msgstr "Interfazea"
 
 msgid "Smiley Themes"
-msgstr "Aurpegiera-gaiak"
+msgstr "Smiley-Gaiak"
 
 msgid "Browser"
 msgstr "Arakatzailea"
 
-#, fuzzy
 msgid "Status / Idle"
-msgstr "Kanpoan / Inaktibo"
+msgstr "Egoera / Inaktibo"
 
 msgid "Allow all users to contact me"
-msgstr "Onartu erabiltzaile guztiek nirekin kontaktatzea"
+msgstr "Erabiltzaile guztien deiak onartu"
 
 msgid "Allow only the users on my buddy list"
-msgstr "Onartu lagunen zerrendako erabiltzaileak bakarrik"
+msgstr "Nire lagun-zerrendako erabiltzaileak bakarrik onartu"
 
 msgid "Allow only the users below"
-msgstr "Onartu beheko erabiltzaileak bakarrik"
+msgstr "Azpiko erabiltzaileak bakarrik onartu"
 
 msgid "Block all users"
-msgstr "Blokeatu erabiltzaile guztiak"
+msgstr "Erabiltzaile guztiak blokeatu"
 
 msgid "Block only the users below"
-msgstr "Blokeatu beheko erabiltzaileak bakarrik"
+msgstr "Azpiko erabiltzaileak bakarrik blokeatu"
 
 msgid "Privacy"
 msgstr "Pribatutasuna"
@@ -13200,45 +12788,44 @@ msgid "Changes to privacy settings take effect immediately."
 msgstr "Pribatutasun-ezarpenetako aldaketak berehala aplikatuko dira."
 
 msgid "Set privacy for:"
-msgstr "Ezarri pribatutasuna:"
+msgstr "Pribatutasuna ezarri:"
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "Kendu"
+msgstr "De_na Kendu"
 
 msgid "Permit User"
-msgstr "Onartu erabiltzailea"
+msgstr "Erabiltzailea Onartu"
 
 msgid "Type a user you permit to contact you."
-msgstr "Eman zurekin kontaktatzea onartzen duzun erabiltzailearen izena."
+msgstr "Zu deitzera baimentzen duzun erabiltzailearen izena."
 
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Eman zurekin kontaktatzea nahi duzun erabiltzailearen izena."
+msgstr "Zu deitzera baimendu nahi duzun erabiltzailearen izena idatzi ezazu."
 
 msgid "_Permit"
 msgstr "_Baimendu"
 
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "Onartzen duzu %s erabiltzaileak zurekin kontaktatzea?"
+msgstr "%s zu deitzera baimendu?"
 
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Ziur zaude nahi duzula %s erabiltzaileak zurekin kontaktatzea?"
+msgstr "Ziur zaude %s zu deitzera baimendu nahi duzula?"
 
 msgid "Block User"
-msgstr "Blokeatu erabiltzailea"
+msgstr "Erabiltzailea Blokeatu"
 
 msgid "Type a user to block."
-msgstr "Eman blokeatu nahi duzun erabiltzailearen izena."
+msgstr "Blokeatu nahi duzunaren izena idatzi."
 
 msgid "Please enter the name of the user you wish to block."
-msgstr "Eman blokeatu nahi duzun erabiltzailearen izena."
+msgstr "Blokeatu nahi duzun erabiltzailearen izena idatzi ezazu."
 
 #, c-format
 msgid "Block %s?"
-msgstr "%s blokeatu nahi duzu?"
+msgstr "%s blokeatu?"
 
 #, c-format
 msgid "Are you sure you want to block %s?"
@@ -13248,39 +12835,38 @@ msgid "Apply"
 msgstr "Aplikatu"
 
 msgid "That file already exists"
-msgstr "Fitxategi hori badago"
+msgstr "Fitxategia existitzen da jadanik"
 
 msgid "Would you like to overwrite it?"
-msgstr "Gainidatzi nahi duzu?"
+msgstr "Gainidatzi nahi al duzu?"
 
 msgid "Overwrite"
-msgstr "Gainean idatzi"
+msgstr "Gainidatzi"
 
 msgid "Choose New Name"
-msgstr "Aukeratu izen berria"
+msgstr "Izen Berria Hautatu"
 
 msgid "Select Folder..."
-msgstr "Hautatu karpeta..."
+msgstr "Direktorioa Hautatu..."
 
 #. list button
 msgid "_Get List"
-msgstr "_Hartu zerrenda"
+msgstr "_Zerrenda Eskuratu"
 
 #. add button
 msgid "_Add Chat"
-msgstr "_Gehitu berriketa"
+msgstr "_Berriketa Gehitu"
 
 # , fuzzy
-#, fuzzy
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?"
+msgstr "Ziur zaude egoera gordeak ezabatu nahi dituzula?"
 
 #. Use button
 msgid "_Use"
 msgstr "_Erabili"
 
 msgid "Title already in use.  You must choose a unique title."
-msgstr "Titulua erabilia dago. Berria aukeratu."
+msgstr "Titulua erabilpean dago jadanik. Beste bat hautatu ezazu."
 
 msgid "Different"
 msgstr "Ezberdina"
@@ -13293,142 +12879,129 @@ msgstr "_Egoera:"
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr "Erabili egoera _ezbedinak kontu batzuentzat"
+msgstr "Egoera _ezberdina erabili kontu batzuetarako"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
-msgstr "G_orde eta erabili"
+msgstr "G_orde eta Erabili"
 
 #, c-format
 msgid "Status for %s"
-msgstr "Egoera : %s rako."
+msgstr "%s(e)rako egoera"
 
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Txertatu aurpegiera"
-
-msgid "More Data needed"
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
+"Jadanik badago '%s'(r)entzako smiley pertsonalizatu bat.  Lasterbide "
+"ezberdin bat erabili ezazu."
 
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
+msgid "Custom Smiley"
+msgstr "Smiley Pertsonalizatua"
 
-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "Bikoiztutako zuzenketa"
-
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Erabili egoera _ezbedinak kontu batzuentzat"
+msgstr "Lasterbide Bikoiztua"
 
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "Txertatu aurpegiera"
+msgstr "Smiley-a Editatu"
 
-#, fuzzy
 msgid "Add Smiley"
-msgstr "Irri egin!"
+msgstr "Smiley-a Gehitu"
 
-#, fuzzy
-msgid "Smiley _Image"
-msgstr "Gorde irudia"
+msgid "_Image:"
+msgstr "_Irudia:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "_Lasterbide-testua:"
 
-#, fuzzy
 msgid "Smiley"
-msgstr "Irri egin!"
+msgstr "Smiley-a"
+
+msgid "Shortcut Text"
+msgstr "Lasterbide-Testua"
 
 msgid "Custom Smiley Manager"
-msgstr ""
+msgstr "Smiley Pertsonalizatuen Kudeatzailea"
+
+msgid "Select Buddy Icon"
+msgstr "Lagun-Ikonoa Hautatu"
 
 msgid "Click to change your buddyicon for this account."
-msgstr ""
+msgstr "Klik egizu kontu honentako zure lagun-ikonoa aldatzeko."
 
 msgid "Click to change your buddyicon for all accounts."
-msgstr ""
+msgstr "Klik egizu kontu guztietako zure lagun-ikonoa aldatzeko."
 
-#, fuzzy
 msgid "Waiting for network connection"
-msgstr "Transferentziaren zain hasteko"
+msgstr "Sare-konexioaren zain"
 
-#, fuzzy
 msgid "New status..."
-msgstr "Mezu berria..."
+msgstr "Egoera berria..."
 
-#, fuzzy
 msgid "Saved statuses..."
-msgstr "Gorde egoerak"
+msgstr "Egoera gordeak..."
 
-#, fuzzy
 msgid "Status Selector"
-msgstr "Egoera-testua"
+msgstr "Egoera-Hautatzailea"
 
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "Kargatzerakoan ondorengo errorea gertatu da %s: %s"
+msgstr "Ondorengo errorea gertatu da %s kargatzean: %s"
 
 msgid "Failed to load image"
-msgstr "Huts egin du irudia kargatzerakoan"
+msgstr "Ezin irudia kargatu"
 
 #, c-format
 msgid "Cannot send folder %s."
-msgstr "Ezin da karpeta %s bidali."
+msgstr "Ezin %s direktorioa bidali."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
-"Pidgin -ek ezin du karpeta bidali. Fitxategiak banan-bana bidali beharko "
+"%s(e)k ezin ditu direktorioak bidali. Fitxategiak banan-banan bidali beharko "
 "dituzu."
 
 msgid "You have dragged an image"
-msgstr "Herrestan eraman duzu irudia "
+msgstr "Irudi bat arrastatu duzu"
 
 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 ""
-"Irudi hau fitxategi transferentzi bezela bidali dezakezu,  mezuan txertatu, "
-"edo lagunaren ikono bezela erabili erabiltzaile honentzako."
+"Fitxategi-transferentzia bezela bidali dezakezu irudi hau, mezuan txertatu "
+"dezakezu, edo erabiltzaile honen lagun-ikono bezela erabili dezakezu."
 
 msgid "Set as buddy icon"
-msgstr "Ezarri lagunaren ikonoa"
+msgstr "Lagun-ikono bezala ezarri"
 
 msgid "Send image file"
-msgstr "Bidali irudi fitxategia"
+msgstr "Irudi-fitxategia bidali"
 
 msgid "Insert in message"
-msgstr "Txertatu irudia mezuan"
+msgstr "Mezuan txertatu"
 
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Ikono hau lagunaren ikono bezela ezartzea gustatuko litzaizuke ?"
+msgstr "Erabiltzaile honen lagun-ikono bezala ezarri nahi al duzu?"
 
-#, fuzzy
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"Irudi hau fitxategi transferentzi bezela bidali dezakezu,  mezuan txertatu, "
-"edo lagunaren ikono bezela erabili erabiltzaile honentzako."
+"Irudi hau fitxategi-transferentzia modura bidali dezakezu, edo erabiltzaile "
+"honen lagun-ikono bezala erabili."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Irudi hau  mezuan txertatu dezakezu , edo lagunaren ikono bezela erabili "
-"erabiltzaile honentzako."
+"Irudi hau mezu honetan txertatu dezakezu, edo erabiltzaile honen lagun-ikono "
+"bezela erabili dezakezu"
 
 #. 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
@@ -13436,14 +13009,14 @@ msgstr ""
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 msgid "Cannot send launcher"
-msgstr "Ezinezkoa  jaurtitzailea  bidaltzea"
+msgstr "Ezin jaurtitzailea bidali"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
-"Mahaingain-eko jaurtigailua herrestan eraman duzu. Seguraski beste zeozer "
-"bidali nahiko zenuen. "
+"Mahaingaineko abiarazle bat arrastatu duzu. Ziurrenik, abiarazle honen "
+"helburua bidali nahi zenuen abiarazlearen ordez."
 
 #, c-format
 msgid ""
@@ -13458,103 +13031,119 @@ msgstr ""
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
+"'%s' fitxategia handiegia da %s(r)entzako.  Irudi txikiago batekin saiatu.\n"
 
-#, fuzzy
 msgid "Icon Error"
-msgstr "Testigu errorea"
+msgstr "Ikono-Errorea"
 
-#, fuzzy
 msgid "Could not set icon"
-msgstr "Ezin izan da bidali"
+msgstr "Ezin ikonoa ezarri"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Huts egin du irudia gordetzean: %s\n"
+msgstr "Ezin '%s' fitxategia ireki: %s"
 
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
+"Ezin '%s' irudia kargatu: zergatia ezezaguna da, ziurrenik irudi baliogabea"
+
+msgid "_Open Link"
+msgstr "Esteka _Ireki"
+
+msgid "_Copy Link Location"
+msgstr "Estekaren Helbidea _Kopiatu"
+
+msgid "_Copy Email Address"
+msgstr "Helbide Elektronikoa _Kopiatu"
+
+msgid "_Open File"
+msgstr "Fitxategia _Ireki"
+
+msgid "Open _Containing Directory"
+msgstr ""
 
 msgid "Save File"
-msgstr "Gorde fitxategia"
+msgstr "Fitxategia Gorde"
+
+msgid "_Play Sound"
+msgstr "_Soinua Erreproduzitu"
+
+msgid "_Save File"
+msgstr "Fitxategia _Gorde"
 
 msgid "Select color"
-msgstr "Hautatu kolorea"
+msgstr "Kolorea Hautatu"
 
 msgid "_Alias"
-msgstr "_Aliasa"
+msgstr "_Ezizena"
 
 msgid "Close _tabs"
-msgstr "_Tapakiak  itxi"
+msgstr "_Fitxak itxi"
 
 msgid "_Get Info"
-msgstr "Informazioa _Lortu"
+msgstr "Informazioa _Eskuratu"
 
 msgid "_Invite"
 msgstr "_Gonbidatu"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_Aldatu"
+msgstr "_Modifikatu..."
 
-#, fuzzy
 msgid "_Add..."
-msgstr "_Gehitu"
+msgstr "_Gehitu..."
 
 msgid "_Open Mail"
-msgstr "_Ireki posta"
+msgstr "_Posta Ireki"
+
+msgid "_Pause"
+msgstr "_Pausarazi"
 
 msgid "_Edit"
-msgstr ""
+msgstr "_Editatu"
 
-#, fuzzy
 msgid "Pidgin Tooltip"
-msgstr "Markatzea"
+msgstr "Pidgin Aholkua"
 
 msgid "Pidgin smileys"
-msgstr ""
+msgstr "Pidgin smiley-ak"
 
 msgid "Penguin Pimps"
-msgstr ""
+msgstr "Pinguino Proxenetak"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "Hau hautatzean, emotikono grafikoak ezgaituko dira."
 
-#, fuzzy
 msgid "none"
-msgstr "Edozein"
+msgstr "batere ez"
 
-#, fuzzy
 msgid "Small"
-msgstr "Helb. el."
+msgstr "Txikia"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "Smily-en bertsio txikiagoak"
 
-#, fuzzy
 msgid "Response Probability:"
-msgstr "Erantzunak galdu dira"
+msgstr "Erantzun-Probabilitatea:"
 
-#, fuzzy
 msgid "Statistics Configuration"
-msgstr "Musika-mezuen konfigurazioa"
+msgstr "Estatistika-Konfigurazioa"
 
 #. msg_difference spinner
 msgid "Maximum response timeout:"
-msgstr ""
+msgstr "Erantzunen denbora-muga:"
 
-#, fuzzy
 msgid "minutes"
-msgstr "minutu."
+msgstr "minutu"
 
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "'Azkenekoz ikusia' tarte maximoa:"
 
 #. threshold spinner
 msgid "Threshold:"
-msgstr ""
+msgstr "Muga:"
 
 #. *< type
 #. *< ui_requirement
@@ -13563,16 +13152,79 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "Kontaktu-Eskuragarritasun Aurreikuspena"
 
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "Kontaktu-Eskuragarritasun Aurreikuspen plugina"
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
+"Zure lagunen eskuragarritasunaren inguruko informazio estatistikoa erakusten "
+"du"
+
+msgid "Server name request"
+msgstr "Zerbitzari-izen eskaera"
+
+msgid "Enter an XMPP Server"
+msgstr "XMPP Zerbitzarira sartu"
+
+msgid "Select an XMPP server to query"
+msgstr "Galdetzeko XMPP-zerbitzari bat hautatu"
+
+msgid "Find Services"
+msgstr "Zerbitzuak Bilatu"
+
+msgid "Add to Buddy List"
+msgstr "Lagun-Zerrendara Gehitu"
+
+msgid "Gateway"
+msgstr "Pasabidea"
+
+msgid "Directory"
+msgstr "Direktorioa"
+
+msgid "PubSub Collection"
+msgstr "PubSub Kolekzioa"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Deskribapena:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Zerbitzu-Atzematea"
+
+msgid "_Browse"
+msgstr "_Arakatu"
+
+msgid "Server does not exist"
+msgstr "Zerbitzaria ez da existitzen"
+
+msgid "Server does not support service discovery"
+msgstr "Zerbitzariak ez du zerbitzu-atzematea onartzen"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP Zerbitzu Atzematea"
+
+msgid "Allows browsing and registering services."
+msgstr "Zerbitzuak arakatu eta erregistratzea ahalbidetzen du."
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Plugin hau trasnporte zahar eta beste XMPP-zerbitzu batzuk erregistratzeko "
+"erabilgarria da."
 
 msgid "Buddy is idle"
 msgstr "Laguna inaktibo dago"
@@ -13581,30 +13233,30 @@ msgid "Buddy is away"
 msgstr "Laguna kanpoan dago"
 
 msgid "Buddy is \"extended\" away"
-msgstr "Laguna \""
+msgstr "Laguna \"luzarorako\" dago kanpoan"
 
 #. Not used yet.
 msgid "Buddy is mobile"
-msgstr "Laguna mugikorra denean"
+msgstr "Laguna mugikorra DA"
 
 msgid "Buddy is offline"
-msgstr "Laguna lineaz kanpo dago"
+msgstr "Laguna offline dago"
 
 msgid "Point values to use when..."
-msgstr "Seinalatu zein balio erabili..."
+msgstr "Zein balio erabili..."
 
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
 msgstr ""
-"<i>Puntuazio altuena</i> duen laguna kontaktuetan lehentasuna edukiko duen "
-"laguna da.\n"
+"<i>Puntuazio altuena</i> duen laguna izango da kontakturako lehentasuna "
+"izango duena.\n"
 
 msgid "Use last buddy when scores are equal"
-msgstr "Erabili azken laguna puntuazioa berdina denean"
+msgstr "Azken laguna erabili puntuazioa berdina denean"
 
 msgid "Point values to use for account..."
-msgstr "Seinalatu zein balio erabili konturako..."
+msgstr "Zein balio erabili konturako..."
 
 #. *< type
 #. *< ui_requirement
@@ -13613,7 +13265,7 @@ msgstr "Seinalatu zein balio erabili konturako..."
 #. *< priority
 #. *< id
 msgid "Contact Priority"
-msgstr "Kontaktu-lehentasuna"
+msgstr "Kontaktu-Lehentasuna"
 
 #. *< name
 #. *< version
@@ -13621,63 +13273,55 @@ msgstr "Kontaktu-lehentasuna"
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
-"Lagunen egoera bakoitzari asoziatutako balioak kudeatzeko aukera ematen du."
+"Lagun-egoera ezberdinekin asoziatutako balioak kudeatzeko aukera ematen du."
 
 #. *< description
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Aukera ematen du lagunen inaktibo/kanpoan/lineaz kanpo egoeren puntuazioaren "
-"balioak aldatzeko kontaktu-lehentasunen kalkuluetan."
+"Kontaktu-lehentasun kalkuluetan lagunen inaktibo/kanpoan/offline "
+"egoeretarako erabiliko diren balioak aldatzeko aukera ematen du."
 
-#, fuzzy
 msgid "Conversation Colors"
-msgstr "/Solasaldia/It_xi"
+msgstr "Solasaldi-Koloreak"
 
-#, fuzzy
 msgid "Customize colors in the conversation window"
-msgstr "BMko solasaldi-leihoak"
+msgstr "Solasaldi-leihoko koloreak pertsonalizatu"
 
-#, fuzzy
 msgid "Error Messages"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Errore.Mezuak"
 
-#, fuzzy
 msgid "Highlighted Messages"
-msgstr "Aurkitutako azpimarratu"
+msgstr "Mezu Nabarmenduak"
 
-#, fuzzy
 msgid "System Messages"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Sistemaren Mezuak"
 
-#, fuzzy
 msgid "Sent Messages"
-msgstr "Ireki mezu guztiak"
+msgstr "Bidalitako Mezuak"
 
-#, fuzzy
 msgid "Received Messages"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Jasotako Mezuak"
 
 #, c-format
 msgid "Select Color for %s"
-msgstr "Hautatu testu-kolorea honentzako  %s"
+msgstr "%s(e)rako Kolorea Hautatu"
 
 msgid "Ignore incoming format"
-msgstr ""
+msgstr "Jasotako formato ezikusi"
 
-#, fuzzy
 msgid "Apply in Chats"
-msgstr "Ezizena berriketarako"
+msgstr "Solasaldietan Aplikatu"
 
 msgid "Apply in IMs"
-msgstr ""
+msgstr "IMetan Aplikatu"
 
 msgid "By conversation count"
 msgstr "Solasaldi kopuruaren arabera"
 
 msgid "Conversation Placement"
-msgstr "Solasaldiaren kokalekua"
+msgstr "Solasaldiaren Kokalekua"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 msgid ""
@@ -13686,10 +13330,10 @@ msgid ""
 msgstr ""
 
 msgid "Number of conversations per window"
-msgstr "Solasaldi kopurua leihoko"
+msgstr "Leiho bakoitzeko solasaldi kopurua"
 
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Bereiztu IM eta berriketa leihoak zenbakien araberan kokatzean"
+msgstr "IM- eta berriketa-leihoak bereiztu zenbakien arabera kokatzean"
 
 #. *< type
 #. *< ui_requirement
@@ -13698,12 +13342,12 @@ msgstr "Bereiztu IM eta berriketa leihoak zenbakien araberan kokatzean"
 #. *< priority
 #. *< id
 msgid "ExtPlacement"
-msgstr "ExtPlacement "
+msgstr "ExtKokaleku"
 
 #. *< name
 #. *< version
 msgid "Extra conversation placement options."
-msgstr "Solasaldi-kokaleku gehigarrien  aukerak."
+msgstr "Solasaldi-kokaleku aukera extrak."
 
 #. *< summary
 #. *  description
@@ -13711,21 +13355,22 @@ msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Murriztu solasaldi kopurua leihoko, IMk eta berriketak bereizteko aukerarekin"
+"Leiho bakoitzeko solasaldi kopurua murriztu, nahi izanez gero, IM eta "
+"berriketak bereizten"
 
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
-msgstr "Sagu-mugimenduen konfigurazioa"
+msgstr "Sagu-Mugimendu Konfigurazioa"
 
 msgid "Middle mouse button"
 msgstr "Saguaren erdiko botoia"
 
 msgid "Right mouse button"
-msgstr "Saguaren eskuineko botoia"
+msgstr "Saguaren eskuin-botoia"
 
 #. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
-msgstr "_Mugimendu bisualen bistaratzea"
+msgstr "_Keinu-bistaratze bisuala"
 
 #. *< type
 #. *< ui_requirement
@@ -13734,16 +13379,15 @@ msgstr "_Mugimendu bisualen bistaratzea"
 #. *< priority
 #. *< id
 msgid "Mouse Gestures"
-msgstr "Sagu-mugimenduak"
+msgstr "Sagu-Keinuak"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Provides support for mouse gestures"
-msgstr "Sagu-mugimenduen euskarria ematen du"
+msgstr "Sagu-keinuak jasaten ditu"
 
 #. *  description
-#, fuzzy
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -13751,38 +13395,40 @@ msgid ""
 " • Drag up and then to the left to switch to the previous conversation.\n"
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"Sagu-mugimenduak erabiltzeko aukera ematen du solasaldi-leihoetan.\n"
-"Arrastatu saguaren erdiko botoia hainbat eragiketa egiteko:\n"
+"Solasaldi-leihoetan sagu-mugimenduak erabiltzeko aukera ematen du .Saguaren "
+"erdiko botoia arrastatu ezazu hainbat ekintza burutzeko:\n"
 "\n"
-"Arrastatu beherantz eta eskuinerantz solasaldiak ixteko.\n"
-"Arrastatu gorantz eta ezkerrerantz aurreko solasaldira joateko.\n"
-"Arrastatu gorantz eta eskuinerantz hurrengo solasaldira joateko."
+" • Behera eta eskuinera arrastatu ezazu solasaldia isteko.\n"
+" • Gora eta ezkerrera arrastatu ezazu aurreko solasaldira joateko.\n"
+" • Gora eta eskuinera arrastatu ezazu hurrengo solasaldira joateko."
 
 msgid "Instant Messaging"
-msgstr "Berehalako mezularitza"
+msgstr "Istanteko Mezularitza"
 
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
-msgstr "Hautatu pertsona bat beheko helbide-liburuan, edo gehitu pertsona bat."
+msgstr ""
+"Zure helbide-liburuko pertsona bat hautatu ezazu azpian, edo berria gehitu "
+"ezazu."
 
 msgid "Group:"
 msgstr "Taldea:"
 
 #. "New Person" button
 msgid "New Person"
-msgstr "Pertsona berria"
+msgstr "Pertsona Berria"
 
 #. "Select Buddy" button
 msgid "Select Buddy"
-msgstr "Hautatu laguna"
+msgstr "Laguna Hautatu"
 
 #. Add the label.
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr ""
-"Hautatu helbide-liburuko pertsona bat lagun hau gehitzeko, edo sortu "
-"pertsona bat."
+"Zure helbide-liburuko pertsona bat hautatu ezazu lagun hau bertara "
+"gehitzeko, edo pertsona berria sortu ezazu."
 
 #. Add the expander
 msgid "User _details"
@@ -13790,30 +13436,30 @@ msgstr "Erabiltzailearen _xehetasunak"
 
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
-msgstr "_Asoziatu laguna"
+msgstr "Laguna _Asoziatu"
 
 msgid "Unable to send email"
-msgstr "Ezin da posta-mezua bidali."
+msgstr "Ezin e-posta bidali."
 
 msgid "The evolution executable was not found in the PATH."
-msgstr "Evolution-en Exukatagarria ez da bere helbidean topatu. "
+msgstr "Ez da evolution-en exekutagarria aurkitu bere bidean."
 
 msgid "An email address was not found for this buddy."
-msgstr ""
+msgstr "Ez da helbide elektronikorik aurkitu lagun honentzat."
 
 msgid "Add to Address Book"
-msgstr "Gehitu helbide-liburuan"
+msgstr "Helbide-Liburura Gehitu"
 
 msgid "Send Email"
-msgstr "Posta bidali"
+msgstr "Posta Bidali"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
-msgstr "Evolution integratzeko konfigurazioa"
+msgstr "Evolution-Integrazio Konfigurazioa"
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Hautatu lagunak automatikoki gehitzeko kontu guztiak."
+msgstr "Lagunak auto-gehitu beharko liratekeen kontu guztiak hautatu itzazu."
 
 #. *< type
 #. *< ui_requirement
@@ -13822,28 +13468,27 @@ msgstr "Hautatu lagunak automatikoki gehitzeko kontu guztiak."
 #. *< priority
 #. *< id
 msgid "Evolution Integration"
-msgstr "Evolution integratzea"
+msgstr "Evolution Integrazioa"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides integration with Evolution."
-msgstr "Evolution-ekin integrazioa ahalbidetzen du."
+msgstr "Evolution-ekin integratzea ahalbidetzen du."
 
 msgid "Please enter the person's information below."
-msgstr "Idatzi behean pertsonari buruzko informazioa."
+msgstr "Azpian idatzi ezazu pertsonaren inguruko informazioa."
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
-msgstr "Idatzi lagunaren pantaila-izena eta kontu-mota behean."
+msgstr "Azpian idatzi itzazu lagunaren erabiltzaile-izena eta kontu-mota."
 
 msgid "Account type:"
 msgstr "Kontu-mota:"
 
 #. Optional Information section
 msgid "Optional information:"
-msgstr "Aukerako informazioa:"
+msgstr "Informazio opzionala:"
 
 msgid "First name:"
 msgstr "Izena:"
@@ -13852,7 +13497,7 @@ msgid "Last name:"
 msgstr "Deitura:"
 
 msgid "Email:"
-msgstr "Helbide elektronikoa:"
+msgstr "E-posta:"
 
 #. *< type
 #. *< ui_requirement
@@ -13861,22 +13506,22 @@ msgstr "Helbide elektronikoa:"
 #. *< priority
 #. *< id
 msgid "GTK Signals Test"
-msgstr "GTK seinaleen proba"
+msgstr "GTK Seinale Proba"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all ui signals are working properly."
-msgstr "UIko seinale guztiak ondo dauden ikusteko proba."
+msgstr "Interfazeko seinale guztiak ondo dabiltzala egiaztatzeko proba."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>Lagun ezizena:</b> %s"
+"<b>Lagun-Oharra</b>: %s"
 
 msgid "History"
 msgstr "Historia"
@@ -13895,68 +13540,64 @@ msgstr "Ikonotu Kanpoan nagoenean"
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Kanpora zoazenean, lagunen zerrenda eta solasaldiak ikonotzen ditu."
+msgstr "Lagun-zerrenda eta solasaldiak ikonotzen ditu kanpora zoazenean."
 
 msgid "Mail Checker"
-msgstr "Mezu-begiralea"
+msgstr "Mezu-Begiralea"
 
 msgid "Checks for new local mail."
 msgstr "Mezu berririk dagoen begiratzen du."
 
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
-"Lagunen zerrendan koadro txiki bat gehitzen du, mezu berririk dagoen "
-"erakusteko."
+"Mezu berririk baduzun erakusten dizun koadrotxo bat gehitzen dio lagun-"
+"zerrendari."
 
-#, fuzzy
 msgid "Markerline"
-msgstr "Azpimarratua"
+msgstr "Marka-marra"
 
-#, fuzzy
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Azaldu notifikazio mezua solasaldian"
+msgstr "Marka-marra bat marraztu solasaldiko mezu berriak ezberdintzeko."
 
-#, fuzzy
 msgid "Jump to markerline"
-msgstr "Azpimarratua"
+msgstr "Marka-marrara saltatu"
 
 msgid "Draw Markerline in "
-msgstr ""
+msgstr "Marka-marra Marraztu "
 
 msgid "_IM windows"
-msgstr "_BM leihoak"
+msgstr "_IM-leihoetan"
 
 msgid "C_hat windows"
-msgstr "_Berriketa-leihoak"
+msgstr "_Berriketa-leihoetan"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
-"Musika mezu sesioa eskatua izan da. Mesedez MM ikonoan klik egin onartzeko ."
+"Musika-mezularitza sesioa eskatu dizute. Onartzeko, MM ikonoan egizu klik."
 
 msgid "Music messaging session confirmed."
-msgstr "Musika mezu sesioa konfirmatua."
+msgstr "Musika-mezularitza sesioa konfirmatua."
 
 msgid "Music Messaging"
-msgstr "Musika mezua"
+msgstr "Musika-Mezularitza"
 
 msgid "There was a conflict in running the command:"
-msgstr "Gatazka egon da komandoa exekutatzean:"
+msgstr "Gatazka egon da agindua exekutatzean:"
 
 msgid "Error Running Editor"
-msgstr "Errorea editorea martxan jartzean"
+msgstr "Errorea Editorea Exekutzatzean"
 
-#, fuzzy
 msgid "The following error has occurred:"
-msgstr "Ondorengo errorea izan da:"
+msgstr "Errore hau gertatu da:"
 
 #. Configuration frame
 msgid "Music Messaging Configuration"
-msgstr "Musika-mezuen konfigurazioa"
+msgstr "Musika-Mezularitza Konfigurazioa"
 
 msgid "Score Editor Path"
-msgstr "Emaitza editorearen helbidea"
+msgstr "Partitura-Editorearen Bidea"
 
 msgid "_Apply"
 msgstr "_Aplikatu"
@@ -13971,39 +13612,37 @@ msgstr "_Aplikatu"
 #. *< name
 #. *< version
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Musika mezuen Plugin-a kolaborazio bitarteko osaketarako."
+msgstr "Konposaketa kolaboratiborako Musika-Mezularitza Plugina."
 
 # , fuzzy
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
-"Musika mezuen plugin-a hainbat erabiltzaile momentu berean musika zati "
-"batean amankumeko \"score\"-a editatzen lan egiteko aukera eskeintzen du "
-"benetazko denboran."
+"Musika-Mezularitza Pluginari esker, erabiltzaile ugarik partitura berean "
+"aldi berean lan egin dezake."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
 msgstr "Jakinarazpenak"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "\t_Baten batek zure ezizena esaten duenean bakarrik"
+msgstr "\t_Norbaitek zure erabiltzaile-izena aipatzean"
 
 msgid "_Focused windows"
 msgstr "_Fokudun leihoak"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
-msgstr "Jakinarazteko metodoak"
+msgstr "Jakinarazpen Metodoak"
 
 msgid "Prepend _string into window title:"
-msgstr "_Erantsi katea aurretik leihoaren tituluan:"
+msgstr "_Katea txertatu leihoaren tituluaren aurretik:"
 
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "_Txertatu mezu berrien kopurua leihoaren tituluan"
+msgstr "Mezu berrien _kopurua txertatu leihoaren tituluan"
 
 #. Count xprop method button
 #, fuzzy
@@ -14011,46 +13650,44 @@ msgid "Insert count of new message into _X property"
 msgstr "_Txertatu mezu berrien kopurua leihoaren tituluan"
 
 #. Urgent method button
+#, fuzzy
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Ezarri \"_URGENT\" leiho-kudeatzailean"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "_Berriketa-leihoak"
+msgstr "Leihoa _kliskatu"
 
 #. Raise window method button
-#, fuzzy
 msgid "R_aise conversation window"
-msgstr "BMko solasaldi-leihoak"
+msgstr "Solasaldi-leihoa _igo"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "BMko solasaldi-leihoak"
+msgstr "Solasaldi-leihoa _erakutsi"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
-msgstr "Kendu jakinarazpenak"
+msgstr "Jakinarazpenak Kentzeko"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "_Kendu solasaldi-leihoak fokua hartzen duenean"
+msgstr "Solasaldi-leihoak _fokua hartzean kendu"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr "K_endu solasaldi-leihoan klik egitean"
+msgstr "Solasaldi-leihoak _klik bat jasotzean kendu"
 
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "Ke_ndu solasaldi-leihoan idaztean"
+msgstr "Solasaldi-leihoan _idaztean kendu"
 
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
-msgstr "Kendu _mezu bat bidalitakoan"
+msgstr "Mezu bat _bidaltzean kendu"
 
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr "Ken_du solasaldi batetik bestera aldatzean"
+msgstr "Solasaldi-_fitxara _aldatzean kendu"
 
 #. *< type
 #. *< ui_requirement
@@ -14059,14 +13696,14 @@ msgstr "Ken_du solasaldi batetik bestera aldatzean"
 #. *< priority
 #. *< id
 msgid "Message Notification"
-msgstr "Mezu-jakinarazpena"
+msgstr "Mezu-Jakinarazpena"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Hainbat modu eskaintzen ditu mezu berriak daudela jakinarazteko."
+msgstr "Irakurri gabeko mezuetaz jakinarazteko modu ugari eskaintzen ditu."
 
 #. *< type
 #. *< ui_requirement
@@ -14074,9 +13711,8 @@ msgstr "Hainbat modu eskaintzen ditu mezu berriak daudela jakinarazteko."
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin-eko demostrazioaren plugin-a"
+msgstr "Pidgin Demostrazio-Plugina"
 
 #. *< name
 #. *< version
@@ -14096,129 +13732,106 @@ msgstr ""
 "- Sarrerako testu guztia alderantzikatzen du\n"
 "- Zure zerrendakoren batek saioa hasten duenean, mezua bidaltzen dio"
 
-msgid "Cursor Color"
-msgstr "Kurtsore kolorea"
-
-msgid "Secondary Cursor Color"
-msgstr "Bigarrengo Kurtsore kolorea"
-
 msgid "Hyperlink Color"
-msgstr "Hiperestekaren kolorea "
+msgstr "Hiperesteka-Kolorea "
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "Hiperestekaren kolorea "
+msgstr "Bisitatutako Hiperesteken Kolorea "
 
-#, fuzzy
 msgid "Highlighted Message Name Color"
-msgstr "Aurkitutako azpimarratu"
+msgstr "Nabarmendutako Mezuen Izenaren Kolorea"
+
+msgid "Typing Notification Color"
+msgstr "idazte-Jakinarazpenen Kolorea"
 
 msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView banatzaile horizontala"
+msgstr "GtkTreeView Separazio Horizontala"
 
 msgid "Conversation Entry"
-msgstr "Solasaldiako Sarrerak"
+msgstr "Solasaldi-Sarrera"
 
 msgid "Request Dialog"
-msgstr "Eskaera Elkarrizketa"
+msgstr "Eskaera-Elkarrizketa"
 
 msgid "Notify Dialog"
-msgstr "Jakinarazpenak elkarrizketa"
+msgstr "Jakinarazpen-Elkarrizketa"
 
 msgid "Select Color"
-msgstr "Hautatu kolorea"
+msgstr "Kolorea Hautatu"
 
 #, c-format
 msgid "Select Interface Font"
-msgstr "Hautatu letra-tipoa "
+msgstr "Interfazearen Letra-Tipoa Hautatu"
 
 #, c-format
 msgid "Select Font for %s"
-msgstr "Hautatu letra-tipoa honentzako %s"
+msgstr "%s(r)rentzako Letra-Tipoa Hautatu"
 
 msgid "GTK+ Interface Font"
-msgstr "GTK+ Interfazearen letra-tipoa"
+msgstr "GTK+ Interfazearen Letra-Tipoa"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ Testu ? gaia"
+msgstr "GTK+ Laster-Tekla Gaia"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Koloreen Interfaze"
+msgid "Disable Typing Notification Text"
+msgstr "Idatze-Jakinarazpen Testua Ezgaitu"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ Gaien Kontrol-Ezarpenak"
 
-msgid "Widget Sizes"
-msgstr "Widget neurriak"
+msgid "Colors"
+msgstr "Koloreak"
 
 msgid "Fonts"
-msgstr "Letra-tipoak"
+msgstr "Letra-Tipoak"
+
+msgid "Miscellaneous"
+msgstr "Ugari"
 
-#, fuzzy
 msgid "Gtkrc File Tools"
-msgstr "Pidgin fitxategien kontrola"
+msgstr "Gtkrc Fitxategi-Tresnak"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Ezapernak idatzi honentzako %s%sgtkrc-2.0"
+msgstr "Ezapernak hemen gorde: %s%sgtkrc-2.0"
 
 msgid "Re-read gtkrc files"
-msgstr "Berirakurri  gtkrc files"
+msgstr "gtkrc ftxategiak berrirakurri"
 
-#, fuzzy
 msgid "Pidgin GTK+ Theme Control"
-msgstr "Pidgin GTK+ Gaien kontrola"
+msgstr "Pidgin GTK+ Gaien Kontrola"
 
 msgid "Provides access to commonly used gtkrc settings."
-msgstr "gtkrc -ren ohizko ezarpenetara akzesua ahalbidetzen du."
+msgstr "Ohiko gtkrc-ezarpenetarako akzesua eskaintzen du."
 
 msgid "Raw"
-msgstr "Formaturik gabe"
+msgstr "Gordina"
 
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
-"Testuan oinarritutako protokoloetara formaturik gabeko sarrera bidaltzeko."
+"Testuan oinarritutako protokoloetara sarrera gordina bidaltzea eskaintzen "
+"dizu."
 
-#, fuzzy
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Testuan oinarritutako protokoloetara (Jabber, MSN, IRC, TOC) formaturik "
-"gabeko testua bidaltzeko. Sakatu 'Sartu' sarrera-koadroan, eta zaindu "
-"arazketa-leihoa."
+"Testuan oinarritutako protokoloetara sarrera gordina bidaltzea eskaintzen "
+"dizu (XMPP, MSN, IRC, TOC). Bidaltzeko, 'Entrar' sakatu ezazu sarrera-"
+"kutxan. Arazte-leihoa begiratu ezazu."
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "%s %s(e)ra eguneratu zaitezke gaur."
 
 msgid "New Version Available"
-msgstr "Bertsio berria erabilgarri dago"
+msgstr "Bertsio Berria Eskuragarri"
 
-#, fuzzy
 msgid "Later"
-msgstr "Data"
+msgstr "Geroago"
 
-#, fuzzy
 msgid "Download Now"
-msgstr "Eraibltzaileak %s(e)n: %s"
+msgstr "Orain Deskargatu"
 
 #. *< type
 #. *< ui_requirement
@@ -14227,21 +13840,21 @@ msgstr "Eraibltzaileak %s(e)n: %s"
 #. *< priority
 #. *< id
 msgid "Release Notification"
-msgstr "Bertsioaren jakinarazpena"
+msgstr "Argitaratze-Jakinarazpena"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Checks periodically for new releases."
-msgstr "Aldiro-aldiro bertsio berririk dagoen begiratzen du."
+msgstr "Argitaratze berriak bilatzen ditu periodikoki."
 
 #. *  description
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"Aldiro-aldiro bertsio berririk dagoen begiratzen du, eta ChangeLog-en bidez "
-"horren berri ematen du."
+"Argitaratze berriak bilatzen ditu periodikoki, eta erabiltzaileari "
+"jakinarazten dio Aldaketa-Txostenarekin."
 
 #. *< major version
 #. *< minor version
@@ -14251,30 +13864,30 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "_Bidali honi:"
+msgstr "Bidaltze-Botoia"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "IMko solasaldi-leihoak"
+msgstr "Solasaldi-Leihoetako Bidaltze-Leihoa"
 
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
+"Bidaltze-Botoi bat gehitzen du solasaldi-leihora. Teklatu fisikorik ez "
+"dagoenerako pentsaua dago hau."
 
 msgid "Duplicate Correction"
-msgstr "Bikoiztutako zuzenketa"
+msgstr "Bikoiztutako Zuzenketa"
 
 msgid "The specified word already exists in the correction list."
-msgstr "Adierazitako hitza dagoeneko badago zuzendutako zerrendan."
+msgstr "Adierazitako hitza dagoeneko badago zuzenketa-zerrendan."
 
 msgid "Text Replacements"
-msgstr "Testu-ordezpenak"
+msgstr "Testu-Ordezpenak"
 
 msgid "You type"
 msgstr "Idazten duzu"
@@ -14286,10 +13899,10 @@ msgid "Whole words only"
 msgstr "Hitz osoak bakarrik"
 
 msgid "Case sensitive"
-msgstr "Maiuskulak bereizi"
+msgstr "Maiuskulak/minuskulak ezberdindu"
 
 msgid "Add a new text replacement"
-msgstr "Gehitu testu-ordezpen berri bat"
+msgstr "Testu-ordezpen berria gehitu"
 
 msgid "You _type:"
 msgstr "_Idazten duzu:"
@@ -14300,24 +13913,117 @@ msgstr "_Bidaltzen duzu:"
 # , fuzzy
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "Kasuarko topaketa zehatza (ez-gaitu kasu automatikorako)"
+msgstr ""
+"Formatu zehatza (maiuskula/minuskulak automatikoki kudeatzeko hau ezgaitu)"
 
 msgid "Only replace _whole words"
 msgstr "_Hitz osoak bakarrik ordezkatu"
 
 msgid "General Text Replacement Options"
-msgstr "Orokorrean Testu-ordezpenen aukerak"
+msgstr "Testu-Ordezpen Aukera Orokorrak"
 
 msgid "Enable replacement of last word on send"
-msgstr "Ahalbidetu ordezkapenak bidalitako azken hitzean"
+msgstr "Bidalitako azken hitzaren aldaketa gaitu"
 
 msgid "Text replacement"
 msgstr "Testu-ordezpena"
 
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
-"Mezuak bidaltzean testua ordezten du erabiltzaileak sortutako arauei "
-"jarraituz. "
+"Bidalitako mezuetako testuak aldatzen ditu, erabiltzaileak zehaztutako arau "
+"batzuen arabera."
+
+msgid "Just logged in"
+msgstr "Konektatu-berri da"
+
+msgid "Just logged out"
+msgstr "Deskonektatu-berri da"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Kontaktuarentzako Ikonoa/\n"
+"Pertsona Ezezagunarentzako Ikonoa"
+
+msgid "Icon for Chat"
+msgstr "Solasaldirako Ikonoa"
+
+msgid "Ignored"
+msgstr "Ezikusia"
+
+msgid "Founder"
+msgstr "Sortzailea"
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "Operadorea"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr "Erdi-Operadorea"
+
+msgid "Authorization dialog"
+msgstr "Autorizazio-elkarrizketa"
+
+msgid "Error dialog"
+msgstr "Errore-elkarrizketa"
+
+msgid "Information dialog"
+msgstr "informazio-elkarrizketa"
+
+msgid "Mail dialog"
+msgstr "Posta-elkarrizketa"
+
+msgid "Question dialog"
+msgstr "Galdera-elkarrizketa"
+
+msgid "Warning dialog"
+msgstr "Abisu-elkarrizketa"
+
+msgid "What kind of dialog is this?"
+msgstr "Zein elkarrizketa-mota da hau?"
+
+msgid "Status Icons"
+msgstr "Egoera Ikonoak"
+
+msgid "Chatroom Emblems"
+msgstr "Solasaldien Ikurrak"
+
+msgid "Dialog Icons"
+msgstr "Elkarrizketa Ikonoak"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin Ikono-Gaien Editorea"
+
+msgid "Contact"
+msgstr "Kontaktua"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin Lagun-Zerrenda Gaien Editorea"
+
+msgid "Edit Buddylist Theme"
+msgstr "Lagun-Zerrenda Editatu"
+
+msgid "Edit Icon Theme"
+msgstr "Ikono-Gaia Editatu"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin Gai-Editorea"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin Gai-Editorea."
 
 #. *< type
 #. *< ui_requirement
@@ -14326,18 +14032,17 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Buddy Ticker"
-msgstr "Lagunen korritze-barra"
+msgstr "Lagun-Barra"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "Lagunen zerrendaren bertsio korrigarri horizontala."
+msgstr "Lagun-zerrendaren bertsio korrigarri horizontala."
 
-#, fuzzy
 msgid "Display Timestamps Every"
-msgstr "iChat ordu-zigilua"
+msgstr "Denbora-Markak Erakutsi"
 
 #. *< type
 #. *< ui_requirement
@@ -14346,42 +14051,39 @@ msgstr "iChat ordu-zigilua"
 #. *< priority
 #. *< id
 msgid "Timestamp"
-msgstr "Ordu-zigilua"
+msgstr "Ordu-marka"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Display iChat-style timestamps"
-msgstr "iChat ordu-zigilua"
+msgstr "iChat moduko ordu-markak erakutsi"
 
 #. *  description
-#, fuzzy
 msgid "Display iChat-style timestamps every N minutes."
-msgstr ""
-"iChat estiloko ordu-zigiluak gehitzen ditu solasaldietan, N minutuz behin."
+msgstr "iChat moduko ordu-markak erakutsi N minututo"
 
 msgid "Timestamp Format Options"
-msgstr "Timestamp-en formatu ezarpenak"
+msgstr "Ordu-marka Formatu Aukerak"
 
-#, fuzzy, c-format
+#, c-format
 msgid "_Force 24-hour time format"
-msgstr "_Behartu (Ohizko Pidgin) 24 orduko denbora formatua"
+msgstr "24 _orduko ordu-formatua behartu"
 
 msgid "Show dates in..."
-msgstr "Erakutsi datak hemen..."
+msgstr "Datak erakutsi..."
 
 msgid "Co_nversations:"
-msgstr "So_lasaldiak"
+msgstr "So_lasaldietan:"
 
 msgid "For delayed messages"
-msgstr "Berandu datozen mezuentzat"
+msgstr "Mezu atzeratuentzako"
 
 msgid "For delayed messages and in chats"
-msgstr "Atzeratutako mezuentzat eta berriketentzat"
+msgstr "Mezu atzeratuentzako eta berriketetarako"
 
 msgid "_Message Logs:"
-msgstr "_Mezuen egunkariak:"
+msgstr "_Mezu-Txostenak:"
 
 #. *< type
 #. *< ui_requirement
@@ -14390,50 +14092,50 @@ msgstr "_Mezuen egunkariak:"
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr "Mezuen Timestamp formatuak"
+msgstr "Mezuen Ordu-Marka Formatuak"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Customizes the message timestamp formats."
-msgstr "Pertsonalizatu mezuen timestamp formatuak."
+msgstr "Mezuen ordu-marken formatu pertsonalizatzen du."
 
 #. *  description
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"Plugin honek erabiltzaileak elkarrizketak eta egunkari mezuen timestamp "
-"formatuak pertsonalizatzea ahalbidetzen du."
+"Plugin honi esker, erabiltzaileak elkarrizketen eta txosten-mezuen ordu-"
+"marken formatua pertsonalizatu dezake."
 
 msgid "Opacity:"
-msgstr "Opakutasuna:"
+msgstr "Opakotasuna:"
 
 #. IM Convo trans options
 msgid "IM Conversation Windows"
-msgstr "IMko solasaldi-leihoak"
+msgstr "IM Solasaldi-Leihoak"
 
 msgid "_IM window transparency"
-msgstr "_IMko leihoen gardentasuna"
+msgstr "_IM-leihoen gardentasuna"
 
 msgid "_Show slider bar in IM window"
-msgstr "_Erakutsi barra graduatzailea IMko leihoan"
+msgstr "_Barra graduatzailea erakutsi IM-leihoan"
 
 msgid "Remove IM window transparency on focus"
-msgstr "IMko leihoen gardentasuna ezabatu fokua duenean"
+msgstr "Fokua dutenean, IM-leihoen gardentasuna kendu"
 
 msgid "Always on top"
 msgstr "Beti goian"
 
 #. Buddy List trans options
 msgid "Buddy List Window"
-msgstr "Lagunen zerrendaren leihoa"
+msgstr "Lagun-Zerrenda Leihoa"
 
 msgid "_Buddy List window transparency"
-msgstr "_Lagunen zerrendaren leihoaren gardentasuna"
+msgstr "_Lagun-Zerrenda leihoaren gardentasuna"
 
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Ezabatu Lagunen zerrendaren leihoaren gardentasuna fokua duenean"
+msgstr "Fokua duenean, Lagun-zerrenda leihoaren gardentasuna kendu"
 
 #. *< type
 #. *< ui_requirement
@@ -14448,7 +14150,7 @@ msgstr "Gardentasuna"
 #. *< version
 #. *  summary
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Lagunen zerrendako eta solasaldiko gardentasun aldakorra."
+msgstr "Lagun-zerrendako eta solasaldientzako Gardentasun Aldakorra."
 
 #. *  description
 msgid ""
@@ -14457,54 +14159,47 @@ msgid ""
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Solasaldi-leihoen eta lagunen zerrendan alfa gardentasuna ahalbidetzen du "
+"Solasaldi-leihoen eta lagun-zerrendaren alfa gardentasuna ahalbidetzen du "
 "plugin honek.\n"
 "\n"
-"* Oharra: Plugin honek Win2000 edo geroagoko bat behar du."
+"* Oharra: Plugin honek Win2000 edo berriago bat behar du."
 
 msgid "GTK+ Runtime Version"
-msgstr "GTK+ Exekuzio-denborako bertsioa"
+msgstr "GTK+ Exekuzio-Denborako Bertsioa"
 
 #. Autostart
 msgid "Startup"
 msgstr "Abioa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "_Start %s on Windows startup"
-msgstr "_Abiarazi Pidgin Windows abiaraztean"
+msgstr "_Windows-ekin batera abiarazi %s"
 
 msgid "_Dockable Buddy List"
-msgstr "_Lagunen zerrenda atrakagarria"
+msgstr "_Lagun-zerrenda atrakagarria"
 
 #. Blist On Top
 msgid "_Keep Buddy List window on top:"
-msgstr "_Utzi lagunen zerrendaren leihoa goian:"
+msgstr "Lagun-Zerrenda leihoa gainean _mantendu:"
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "Bakarrik geldiunean"
-
-#, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "_Erakutsi leihoa keinuka mezuak jasotzean"
+msgstr "Atrakatua dagoenean bakarrik"
 
-#, fuzzy
 msgid "Windows Pidgin Options"
-msgstr "Saioa hasteko aukerak"
+msgstr "Windows Pidgin Aukerak"
 
-#, fuzzy
 msgid "Options specific to Pidgin for Windows."
-msgstr "Windows Pidgin-i bakarrik dagozkion aukerak."
+msgstr "Pidgin-en Windows-erako aukera bereziak."
 
-#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Pidgin Windows-en ezarpenak zehazteko aukera eskeintzen du, hala nola lagunen-"
-"zerrenda gelditzea eta elkarrizketa kinuak."
+"Pidgin-en Windows-erako aukera bereziak eskaintzen ditu (lagun-zerrenda "
+"atrakatzea, adibidez)."
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>Deskonektatua</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -14513,14 +14208,13 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr ""
+msgstr "XMPP Kontsola"
 
-#, fuzzy
 msgid "Account: "
 msgstr "Kontua:"
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
+msgstr "<font color='#777777'>XMPPra ez konektatua</font>"
 
 msgid "Insert an <iq/> stanza."
 msgstr ""
@@ -14540,7 +14234,554 @@ msgstr ""
 
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
+msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
+
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "BOSH Konexio-Zerbitzari Baliogabea"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Ezin SILC gako parea ez kargatu"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s erabiltzaileak ez du onartu \"%s\" gelarako egin diozun gonbita. "
+#~ "Arrazoia: \"%s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Gonbita Ezetsia"
+
+#~ msgid "_Resume"
+#~ msgstr "_Berrekin"
+
+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "Proxy-a"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Ezin da socket-a ireki "
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Ezin da socket-tik entzun"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Ezin da socket-a irakurri"
+
+#~ msgid "Connection failed."
+#~ msgstr "Konexioak huts egin du "
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Zerbitzaria deskonektatu da"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Ezin izan da socket-a sortu"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Ezin izan da ostalariarekin konektatu"
+
+#~ msgid "Read error"
+#~ msgstr "Irakurketa-errorea"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan "
+#~ "al dago ?"
+
+#~ msgid "Write error"
+#~ msgstr "Idazketa-errorea"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Ezarri Dir informazioa"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Helbidearen jarraipena"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Ezizena berriketarako"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Erabiltzaileak ez du direktorio-informaziorik."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Komandoa"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Erregistratze-errorea"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Kokalekua"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "Erabiltzaile bilaketa"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Lagunen egoeraren jakinarazpena"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Bertsioa ez da onartzen"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Orientazioa"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Erabiltzaile-moduak"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Erabiltzaile-muga"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Gaitasunak"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Erabiltzaile-izena"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM gako-trukearekin"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Helbide elektronikoa"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "MSN profila"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Erabiltzaile-izena "
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Zuzeneko bideoa"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Mezua iritsi da"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Gako publikoaren 'babble'-marka"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Erabiltzailearen aukerak"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Erabiltzaile-moduak"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Erabiltzaile-izena "
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Erabiltzaile-muga"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian enkriptatzea"
+
+#~ msgid "Read Error"
+#~ msgstr "Irakurketa-errorea"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Huts egin du zerbitzariarekin konektatzean."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Ilara beteta dago"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Ezin da mezua analizatu"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Ezin izan da ostalariarekin konektatu"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Huts egin du saioa hastean (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Ezin da zerbitzariarekin konektatu."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Deskonektatu egin zaituzte, beste lanpostu batetik hasi duzulako saioa."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Errorea. SSL euskarria ez dago instalatuta."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Okerreko pasahitza."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Huts egin du zerbitzariarekin konektatzean."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Laster deskonektatuta greatzeko arriskua duzu. TOC erabil dezakezu arazoa "
+#~ "konpondu arte. Bilatu eguneratzeak %s gunean."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Ezin izan da konektatu"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Erabiltzaile-izena ez da baliozkoa"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Ezin da zerbitzariaren informazioa hartu"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Konexioa itxi da"
+
+# ,fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Ezin izan da ostalaria"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Konexioa itxi da (idazten)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Konexioa berabierazten "
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Errorea socket-etik irakurtzean:%s."
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Ezin da ostalariarekin konektatu"
+
+#~ msgid "Could not write"
+#~ msgstr "Ezin izan da idatzi"
+
+#~ msgid "Could not connect"
+#~ msgstr "Ezin izan da konektatu"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Ezin izan da entzuteko socket-a sortu"
+
+# ,fuzzy
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Ezin izan da ostalaria"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Okerreko pasahitza."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Japoniako yahoo"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japoniako bilagailuaren ostalaria"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japoniako fitxategi-transferentzien ostalaria "
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Zerbitzaritik deskonektatuta zaude."
+
+# ,fuzzy
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Ezin izan da ostalaria"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Zerbitzariak TLS/SSL behar du konektatzeko. Ez da TLS/SSL euskarririk "
+#~ "aurkitu"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IMko solasaldi-leihoak"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Erabili egoera _ezbedinak kontu batzuentzat"
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Zein ID aktibatu?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Kurtsore kolorea"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Bigarrengo Kurtsore kolorea"
+
+#~ msgid "Interface colors"
+#~ msgstr "Koloreen Interfaze"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget neurriak"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "Txertatu irudia mezuan"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Idatzi gonbidatu nahi duzun erabiltzailearen izena, gonbit-mezu batekin "
+#~ "nahi baduzu."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Gehitu helbide-liburuan oharretan"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Laster deskonektatuta greatzeko arriskua duzu. TOC erabil dezakezu arazoa "
+#~ "konpondu arte. Bilatu eguneratzeak %s gunean."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Gehitu laguna"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Ezin da zerbitzariaren informazioa hartu"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "Irakurketa-errorea"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "Zerbitzaritik deskonektatuta zaude."
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Konektatu zerbitzariarekin"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "Huts egin du berriketan sartzean"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s bilatzen"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Huts egin du %s konexioak"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Konektatuta: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Ezin da %s fitxategian idatzi"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Ezin da %s fitxategia irakurri."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Mezua luzeegia, azken %s byteak trunkatu egin dira."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s ez dago une honetan konektatuta."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s erabiltzailearen abisua ez da onartzen."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Mezu bat jaregin da, zerbitzariaren abiadura-muga gainditu duzu."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%s(e)ko berriketa ez dago erabilgarri."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Mezuak bizkorregi bidaltzen ari zara -> %s."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "%s erabiltzailearen BM bat ez zaizu heldu, bizkorregi bidali delako."
+
+#~ msgid "Failure."
+#~ msgstr "Huts egin du."
+
+#~ msgid "Too many matches."
+#~ msgstr "Emaitza gehiegi."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Identifikatzaile gehiago behar dira."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Dir zerbitzua ez dago erabilgarri une honetan."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Helbide elektronikoaren bilaketa murriztu da. "
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Gako-hitza ez ikusi egin da."
+
+#~ msgid "No keywords."
+#~ msgstr "Gako-hitzik ez."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Erabiltzaileak ez du direktorio-informaziorik."
+
+#~ msgid "Country not supported."
+#~ msgstr "Estatua ez da onartzen."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Hutsegite ezezaguna: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Goitizen edo pasahitz okerra."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Zerbitzua ez dago erabilgarri une honetan."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Zure abisu-maila altuegia da konektatu ahal izateko."
+
+#~ 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 ""
+#~ "Maizegi konektatzen eta deskonektatzen aritu zara. Itxaron hamar minutu "
+#~ "eta saiatu berriro. Saiatzen jarraituz gero, agian gehiago ere itxaron "
+#~ "beharko duzu."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Sartzeko errore ezezagun bat gertatu da: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Errore ezezagun bat (%d) gertatu da. Informazioa: %s."
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Talde-izena ez da baliozkoa"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Konexioa itxi da"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Erantzunaren zain..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC itzuli da pausalditik. Mezuak bidal diezazkiokezu."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Pasahitza ondo aldatu da"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Hartu Dir informazioa"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Ezarri Dir informazioa"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Ezin izan da %s ireki idazteko!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Fitxategi-transferentziak huts egin du; beste aldekoak beharbada bertan "
+#~ "behera utziko zuen."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Ezin izan da konektatu transferentzia egiteko."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr ""
+#~ "Ezin izan da idatzi fitxategi-goiburua. Fitxategia ez da transferituko."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Gorde ikonoa honela..."
+
+#~ 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] ""
+#~ "%1$s(e)k fitxategi %3$d onartzea eskatu dio %2$s(r)i: %4$s (%5$.2f %6$s)%7"
+#~ "$s%8$s"
+#~ msgstr[1] ""
+#~ "%1$s(e)k %3$d fitxategi onartzea eskatu dio %2$s(r)i: %4$s (%5$.2f %6$s)%7"
+#~ "$s%8$s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s erabiltzaileak fitxategi bat bidaltzea eskatu dizu"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC protokoloaren plugin-a"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%s erabiltzailearen datuak ez daude erabilgarri"
+
+#~ msgid "%s Options"
+#~ msgstr "%s - Aukerak"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxy aukerak"
+
+#~ msgid "By log size"
+#~ msgstr "Egunkari-tamainaren arabera"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "Ire_ki esteka arakatzailean"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN Zerbitzaria:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Gorde irudia"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Erakutsi leihoa keinuka mezuak jasotzean"
 
 #, fuzzy
 #~ msgid "A group with the name already exists."
@@ -14607,13 +14848,6 @@ msgstr ""
 #~ msgstr "Ziur zaude %s ezabatu nahi duzula?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s: %s (%s)"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Sistemaren egunkaria"
 
@@ -14690,7 +14924,8 @@ msgstr ""
 #~ msgid ""
 #~ "You are using %s version %s.  The current version is %s.  You can get it "
 #~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr "Pidgin-en %s bertsioa erabiltzen ari zara. Azken bertsioa %s da.<hr>"
+#~ msgstr ""
+#~ "Pidgin-en %s bertsioa erabiltzen ari zara. Azken bertsioa %s da.<hr>"
 
 #, fuzzy
 #~ msgid "<b>ChangeLog:</b><br>%s"
@@ -14816,10 +15051,6 @@ msgstr ""
 #~ msgstr "Eraibltzaileak %s(e)n: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "%s gehitu zaitut bere lagunen-zerrendara."
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "Errorea fitxategi-eragiketan"
 
@@ -14829,10 +15060,6 @@ msgstr ""
 #~ msgstr "Sartu momentuko lekukoa"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Errorea konexioa sortzean"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Ezin da AIMen sartu"
 
@@ -14947,17 +15174,9 @@ msgstr ""
 #~ msgstr "Momentuko lekukoa"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Ezin da zerbitzariarekin konektatu."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Mezua:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Kontua:"
-
 #~ msgid "DBus"
 #~ msgstr "DBus"
 
@@ -15005,8 +15224,8 @@ msgstr ""
 #~ "You can get version %s from:<br><a href=\"http://Pidgin.sourceforge.net/"
 #~ "\">http://Pidgin.sourceforge.net</a>."
 #~ msgstr ""
-#~ "%s bertsioa lortzeko:<br><a href=\"http://Pidgin.sourceforge.net/\">http://"
-#~ "Pidgin.sourceforge.net</a>."
+#~ "%s bertsioa lortzeko:<br><a href=\"http://Pidgin.sourceforge.net/"
+#~ "\">http://Pidgin.sourceforge.net</a>."
 
 #~ msgid "Delay"
 #~ msgstr "Atzerapena"
@@ -15068,13 +15287,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Azalpena:</b> Beldurgarria"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15319,148 +15531,3 @@ msgstr ""
 
 #~ msgid "_Request Authorization"
 #~ msgstr "_Baimena eskatu"
-
-# c-format
-#~ msgid ""
-#~ "The user %u wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%u erabiltzaileak bere lagunen zerrendan gehitu nahi zaitu. Arrazoia:\n"
-#~ "%s"
-
-#~ msgid "Authorization Request"
-#~ msgstr "Baimen-eskaera"
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>UINa:</B> %s<BR><B>Egoera:</B> %s<HR>%s"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "SNAC errorea: %s\n"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "%s erabiltzailearen datuak ez daude erabilgarri:"
-
-#~ msgid "Rate limiting error."
-#~ msgstr "Abiadura-mugaren errorea."
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "Deskonektatu egin zaituzte arrazoi ezezagunen batengatik."
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Zure pantaila-izenak formatu hau du orain:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "Ezin izan da %s laguna gehitu, arrazoi ezezagun bat dela-eta. Arrazoi "
-#~ "ohikoena lagunen zerrendan jende gehiegi izatea da."
-
-#~ msgid ""
-#~ "The user %s wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s erabiltzaileak bere lagunen zerrendan %s gehitu nahi du bere lagunen "
-#~ "zerrendan honako arrazoiagatik:\n"
-#~ " %s"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "Pantaila-izenaren formatu berria:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "Formatua eman pantaila-izenari..."
-
-#~ msgid "Auth host"
-#~ msgstr "Baimen-ostalaria"
-
-#~ msgid "Auth port"
-#~ msgstr "Baimen-ataka"
-
-#~ msgid ""
-#~ "Use AIM/ICQ proxy server\n"
-#~ "(slower, but usually works)"
-#~ msgstr ""
-#~ "Erabili AIM/ICQ proxy zerbitzaria\n"
-#~ "(motelagoa, baina normalean funtzionatzen du)"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Supports:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Bermatua:</b> %s"
-
-#~ msgid "<b>Full Name:</b> %s<br>"
-#~ msgstr "<b>Izen osoa:</b> %s<br>"
-
-#~ msgid "<b>Supports:</b> %s<br>"
-#~ msgstr "<b>Bermatua: </b>%s<br>"
-
-#~ msgid "<b>Status:</b> %s"
-#~ msgstr "<b>Egoera:</b> %s"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "Ezetsi beste erabiltzaileek begiratzea"
-
-#~ msgid "Block invites"
-#~ msgstr "Blokeatu gonbidatuak"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "Ezetsi lineako egoeraren atributuen eskaerak"
-
-#~ msgid "Wrong Password"
-#~ msgstr "Pasahitza okerra"
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOCek PAUSE komando bat bidali du."
-
-#~ msgid ""
-#~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
-#~ msgstr ""
-#~ "Hori gertatzen denean, TOCek ez ikusi egiten die, bidalitako mezu guztiei "
-#~ "eta beharbada kanporatu egingo zaitu mezurik bidaliz gero. Pidgin-ek bidali "
-#~ "edo jasotzea eragotziko du. Aldi baterako bakarrik izango da, itxaron."
-
-#~ msgid "Pidgin - Save As..."
-#~ msgstr "Pidgin - Gorde honela..."
-
-#~ msgid "TOC host"
-#~ msgstr "TOC ostalaria"
-
-#~ msgid "TOC port"
-#~ msgstr "TOC ataka"
-
-#~ msgid ""
-#~ "The normal authentication method has failed. This means either your "
-#~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
-#~ msgstr ""
-#~ "Autentifikazio metodo normalak huts egin du. Zure pasahitza okerra izan "
-#~ "daiteke, edo Yahoo-ren autentifikazio eskema aldatu egin da. Pidgin-ek Web "
-#~ "Messenger erabiliz konektatzen saiatuko da, funtzionalitate eta ezaugarri "
-#~ "murrituagoak dituelarik."
-
-#~ msgid "Unable to read"
-#~ msgstr "Ezin da irakurri"
-
-#~ msgid "Pager host"
-#~ msgstr "Bilagailuaren ostalaria"
-
-#~ msgid "YCHT host"
-#~ msgstr "YCHT ostalaria "
-
-#~ msgid "YCHT port"
-#~ msgstr "YCHT Ataka "
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "Errorea konexioa irekitzean.\n"
diff --git a/po/fa.po b/po/fa.po
index d25a930ca3..bc2ca9da55 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-04-10 20:37+0330\n"
 "Last-Translator: Elnaz Sarbar <elnaz@farsiweb.info>\n"
 "Language-Team: Persian\n"
@@ -27,13 +27,13 @@ msgstr "فرانسوی"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Try `%s -h' for more information.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -620,21 +620,6 @@ msgid "Send To"
 msgstr "_فرستادن به"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "پیغامِ تَرک"
-
-msgid "Invite"
-msgstr "دعوت"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"لطفاً نام کاربری را که مایلید از او دعوت کنید، در صورت تمایل همراه با پیغام "
-"دعوت‌نامه، وارد کنید."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "گفتگوها"
 
@@ -892,6 +877,42 @@ msgstr "گفتگوها"
 msgid "System Log"
 msgstr "تاریخچهٔ سیستم"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "در حال محاسبه"
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "_پذیرش"
+
+msgid "Reject"
+msgstr "رد"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "شما کانال %s%s را ترک کردید"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "پست‌ الکترونیکی"
 
@@ -925,6 +946,9 @@ msgstr "ادامه"
 msgid "IM"
 msgstr "پیغام اینترنتی"
 
+msgid "Invite"
+msgstr "دعوت"
+
 msgid "(none)"
 msgstr "(هیچکدام)"
 
@@ -1133,7 +1157,6 @@ msgstr "‏%s جایی رفته است. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "‏%s برای شما پیغامی فرستاده است. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "رویداد کمین نامعلوم. لطفاً این را گزارش کنید!"
 
@@ -1184,7 +1207,6 @@ msgstr "_تعداد دقایق تا تغییر وضعیت:"
 msgid "Change status to"
 msgstr "تغییر _وضعیت به:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "گفتگوها"
 
@@ -1522,7 +1544,6 @@ msgstr ""
 "هر وقت گفتگوی جدیدی باز می‌شود این متصل شونده آخرین گفتگو را در پنجرهٔ گفتگوی "
 "فعلی درج خواهد کرد."
 
-#, c-format
 msgid "Online"
 msgstr "برخط"
 
@@ -1571,6 +1592,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "نشانی اینترنتی"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "حساب‌ها"
 
@@ -1669,14 +1712,6 @@ msgstr "دعوت گپ را قبول می‌کنید؟"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "_پذیرش"
-
-msgid "Reject"
-msgstr "رد"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1767,6 +1802,8 @@ msgstr "+++ ‏%s وارد سیستم شد"
 msgid "+++ %s signed off"
 msgstr "+++ %s از سیستم خارج شد"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "خطای نامعلوم"
 
@@ -1813,6 +1850,18 @@ msgstr "‏%s از اتاق خارج شد."
 msgid "%s left the room (%s)."
 msgstr "‏%s از اتاق خارج شد (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "دعوت به کنفرانس"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"لطفاً نام کاربری را که مایلید از او دعوت کنید، در صورت تمایل همراه با پیغام "
+"دعوت‌نامه، وارد کنید."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "ایجاد اتصال شکست خورد: %s"
@@ -1948,7 +1997,6 @@ msgstr "در حال آغاز انتقال پروندهٔ %s از %s"
 msgid "Transfer of file %s complete"
 msgstr "انتقال پروندهٔ %s انجام شد"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "انتقال پرونده انجام شد"
 
@@ -1956,7 +2004,6 @@ msgstr "انتقال پرونده انجام شد"
 msgid "You canceled the transfer of %s"
 msgstr "شما از انتقال %s صرف نظر کردید"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "از انتقال پرونده صرف نظر شد"
 
@@ -2141,11 +2188,14 @@ msgstr "<font color=\"red\"><b>خواندن پرونده ممکن نیست: %s</
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <پاسخ خودکار>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "خطای هنگام ایجاد اتصال"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "شما از %s استفاده می‌کنید، اما این متصل‌شونده به %s نیاز دارد."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2541,9 +2591,10 @@ msgstr ""
 "تاریخچه‌های کارگیرهای پیغام اینترنتی دیگر را در نمایش‌دهندهٔ تاریخچه قرار می‌دهد."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2600,7 +2651,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2628,6 +2679,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "گذرواژه را وارد کنید"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2824,18 +2901,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "گوش ایستادن برای اتصالات پیغام‌های اینترنتی دریافتی ممکن نیست\n"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "برقرار اتصال با کارگزار محلی mDNS ممکن نیست. آیا در حال اجراست؟"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "نام"
 
@@ -2869,6 +2946,11 @@ msgstr "متصل شوندهٔ قرارداد Bonjour"
 msgid "Purple Person"
 msgstr "شخص جدید"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "محله"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2879,14 +2961,21 @@ msgstr "‏%s گفتگو را بست."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "نمی‌توان پیغام را فرستاد. گفتگو شروع نمی‌شود."
 
-msgid "Cannot open socket"
-msgstr "باز کردن سوکت ممکن نیست"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"ایجاد سوکت ممکن نیست:\n"
+"‏%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "نمی‌توان سوکت را به درگاه مقید کرد"
 
-msgid "Could not listen on socket"
-msgstr "گوش ایستادن روی سوکت ممکن نیست"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"ایجاد سوکت ممکن نیست:\n"
+"‏%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -2935,13 +3024,16 @@ msgstr "ذخیره کردن فهرست رفقا..."
 msgid "Load buddylist from file..."
 msgstr "بار کردن فهرست رفقا از پرونده..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "فیلدهای ثبت نام را پر کنید."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "گذرواژه‌ها مطابقت ندارند."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "نمی‌توان حساب جدید را ثبت کرد. خطایی رخ داد.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2953,14 +3045,15 @@ msgstr "ثبت نام موفقیت‌آمیز انجام شد!"
 msgid "Password"
 msgstr "گذرواژه"
 
-msgid "Password (retype)"
-msgstr "گذرواژه (تایپ مجدد)"
+msgid "Password (again)"
+msgstr "گذرواژه (دوباره)"
 
-msgid "Enter current token"
-msgstr "توکن فعلی را وارد کنید"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "توکن فعلی"
+#, fuzzy
+msgid "Captcha"
+msgstr "ذخیرهٔ تصویر"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ثبت حساب Gadu-Gadu جدید"
@@ -3013,6 +3106,15 @@ msgstr "گذرواژه با موفقیت تغییر کرد!"
 msgid "Current password"
 msgstr "گذرواژهٔ فعلی"
 
+msgid "Password (retype)"
+msgstr "گذرواژه (تایپ مجدد)"
+
+msgid "Enter current token"
+msgstr "توکن فعلی را وارد کنید"
+
+msgid "Current token"
+msgstr "توکن فعلی"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "لطفاً گذرواژهٔ فعلی و گذرواژهٔ جدیدتان را وارد کنید."
 
@@ -3026,13 +3128,13 @@ msgstr "یک گپ برای رفیق انتخاب کنید: %s"
 msgid "Add to chat..."
 msgstr "اضافه کردن به گپ..."
 
+#. Global
 msgid "Available"
 msgstr "در دسترس"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "رفته"
 
@@ -3060,8 +3162,8 @@ msgstr "کاربری با این مشخصات پیدا نشد"
 msgid "There are no users matching your search criteria."
 msgstr "هیچ کاربری مطابق با معیارهای جستجوی شما پیدا نشد."
 
-msgid "Unable to read socket"
-msgstr "خواندن سوکت ممکن نیست"
+msgid "Unable to read from socket"
+msgstr "خواندن از سوکت ممکن نیست"
 
 msgid "Buddy list downloaded"
 msgstr "فهرست رفقا بارگیری شد:"
@@ -3075,8 +3177,14 @@ msgstr "فهرست رفقا بارگذاری شد"
 msgid "Your buddy list was stored on the server."
 msgstr "فهرست رفقای شما در کارگزار ذخیره نشده است."
 
-msgid "Connection failed."
-msgstr "اتصال شکست خورد."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "متصل شد"
+
+msgid "Connection failed"
+msgstr "اتصال شکست خورد"
 
 msgid "Add to chat"
 msgstr "اضافه کردن به گپ"
@@ -3084,13 +3192,23 @@ msgstr "اضافه کردن به گپ"
 msgid "Chat _name:"
 msgstr "_نام گپ:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "تحویل نام میزبان ممکن نیست."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "در حال اتصال"
+
 msgid "Chat error"
 msgstr "خطای گپ"
 
 msgid "This chat name is already in use"
 msgstr "این نام گپ از قبل وجود دارد"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "به کارگزار متصل نیست."
 
 msgid "Find buddies..."
@@ -3132,6 +3250,10 @@ msgstr "پیغام اینترنتی مشهور لهستانی"
 msgid "Gadu-Gadu User"
 msgstr "کاربر Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "تنظیم اطلاعات کاربر..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "فرمان نامعلوم: %s"
@@ -3146,7 +3268,8 @@ msgstr "موضوعی تنظیم نشده است"
 msgid "File Transfer Failed"
 msgstr "انتقال پرونده شکست خورد"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "باز کردن درگاه حال پایش ممکن نیست."
 
 msgid "Error displaying MOTD"
@@ -3162,8 +3285,18 @@ msgstr "هیچ MOTD با این اتصال مربوط نشده است."
 msgid "MOTD for %s"
 msgstr "MOTD برای %s"
 
-msgid "Server has disconnected"
-msgstr "اتصال کارگزار قطع شده است"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"اتصال به کارگزار قطع شد:\n"
+"‏%s"
 
 msgid "View MOTD"
 msgstr "نمایش MOTD"
@@ -3174,25 +3307,24 @@ msgstr "_کانال:"
 msgid "_Password:"
 msgstr "_گذرواژه:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "لقب‌های IRC نمی‌توانند حاوی فاصله باشند"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "در حال اتصال"
-
 msgid "SSL support unavailable"
 msgstr "پشتیبانی SSL وجود ندارد"
 
-msgid "Couldn't create socket"
-msgstr "ایجاد سوکت ممکن نیست"
+msgid "Unable to connect"
+msgstr "اتصال ممکن نیست"
 
-msgid "Couldn't connect to host"
-msgstr "نمی‌توان به میزبان متصل شد"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "اتصال به %s ممکن نیست"
 
-msgid "Read error"
-msgstr "خطای خواندن"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "کارگزار اتصال را قطع کرد."
 
 msgid "Users"
 msgstr "کاربران"
@@ -3374,6 +3506,17 @@ msgstr ""
 "نام حسابی که انتخاب کرده‌اید توسط کارگزار رد شد. این نام احتمالاً حاوی "
 "نویسه‌های نامعتبر است."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "این نام گپ از قبل وجود دارد"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "لقب"
+
 msgid "Cannot change nick"
 msgstr "نمی‌توان لقب را عوض کرد"
 
@@ -3612,12 +3755,13 @@ msgstr "فرمان از کار انداخته شد"
 msgid "execute"
 msgstr "غیرمنتظره"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "کارگزار برای ورود به سیستم TLS/SSL لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "کارگزار برای ورود به سیستم TLS/SSL لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
 
@@ -3635,18 +3779,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "تأیید هویت متنی ساده"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "تأیید هویت شکست خورد"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "پاسخ نامعتبر از کارگزار."
 
 msgid "Server does not use any supported authentication method"
 msgstr "کارگزار از هیچ روش تأیید هویت پشتیبانی شده‌ای استفاده نمی‌کند"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "تقاضای نامعتبر از سوی کارگزار"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "خطای SASL"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "دلیلی ارائه نشد."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "نسخهٔ پشتیبانی نشده"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"برقراری اتصال با کارگزار ممکن نیست.\n"
+"‏%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"برقراری اتصال با کارگزار ممکن نیست.\n"
+"‏%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "نمی‌توان اتصال ایجاد کرد"
+
 msgid "Full Name"
 msgstr "نام و نام خانوادگی"
 
@@ -3712,187 +3892,9 @@ msgstr "کارگیر"
 msgid "Operating System"
 msgstr "سیستم عامل"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "تنظیم اطلاعات دفترچهٔ راهنمای کاربران"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "ادامهٔ نشانی"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "اسم مستعار گپ"
-
 #, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "کاربر اطلاعاتی در دفترچهٔ راهنمای کاربران ندارد."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "فرمان"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "خطای ثبت"
-
-#, fuzzy
-msgid "User Location"
-msgstr "مکان"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "جستجوی کاربر"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "اطلاع وضعیت رفیق"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "نسخهٔ پشتیبانی نشده"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "جهت"
-
-msgid "File Transfer"
-msgstr "انتقال پرونده"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "حالت‌های کاربر"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "محدودیت کاربران"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "قابلیت‌ها"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "نام کاربر"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "پیغام اینترنتی با تبادل کلید"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "نشانی پست الکترونیکی"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "تنظیم مجموعه تنظیمات"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "پیوستن"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "نام کاربر"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "ویدیوی زنده"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "پیغام دریافت می‌شود"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "پروندهٔ کلید عمومی"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "گزینه‌های کاربر"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "حالت‌های کاربر"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "نام کاربر"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "محدودیت کاربران"
-
-msgid "Ping"
-msgstr "‏Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "رمزنگاری Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "قابلیت‌ها"
+msgid "Local Time"
+msgstr "پروندهٔ محلی:"
 
 msgid "Priority"
 msgstr "اولویت"
@@ -3900,6 +3902,14 @@ msgstr "اولویت"
 msgid "Resource"
 msgstr "منابع"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "وارد سیستم شد"
+
 msgid "Middle Name"
 msgstr "نام وسط"
 
@@ -3948,7 +3958,6 @@ msgstr "پرچونه"
 msgid "Extended Away"
 msgstr "رفتهٔ بیشتر"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "مزاحم نشوید"
 
@@ -4073,29 +4082,26 @@ msgstr "کارگزار کنفرانسی برای پرس‌وجو انتخاب ک
 msgid "Find Rooms"
 msgstr "پیدا کردن اتاق‌ها"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "اسم مستعار:"
 
-msgid "Write error"
-msgstr "خطای نوشتن"
+#, fuzzy
+msgid "No users found"
+msgstr "کاربری با این مشخصات پیدا نشد"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "متن ساده"
+msgid "Roles:"
+msgstr "نقش"
 
-msgid "Read Error"
-msgstr "خطای خواندن"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "متن ساده"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"برقراری اتصال با کارگزار ممکن نیست.\n"
-"‏%s"
-
-msgid "Unable to create socket"
-msgstr "ایجاد سوکت ممکن نیست"
 
 #, fuzzy
 msgid "Invalid XMPP ID"
@@ -4104,6 +4110,10 @@ msgstr "شناسهٔ نامعتبر"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "اتصال به کارگزار شکست خورد."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "ثبت نام %s@%s موفقیت‌آمیز بود"
@@ -4130,9 +4140,6 @@ msgstr "ثبت نام موفقیت‌آمیز"
 msgid "Unregistration Failed"
 msgstr "ثبت نام شکست خورد"
 
-msgid "Already Registered"
-msgstr "قبلاً ثبت نام شده است"
-
 msgid "State"
 msgstr "استان"
 
@@ -4145,6 +4152,9 @@ msgstr "تلفن"
 msgid "Date"
 msgstr "تاریخ"
 
+msgid "Already Registered"
+msgstr "قبلاً ثبت نام شده است"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "ثبت"
@@ -4177,6 +4187,10 @@ msgid "Change Registration"
 msgstr "خطای ثبت"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "اتصال به کارگزار شکست خورد."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "خطا هنگام تغییر اطلاعات حساب"
 
@@ -4197,9 +4211,18 @@ msgstr "تأیید هویت"
 msgid "Re-initializing Stream"
 msgstr "راه‌اندازی مجدد جریان"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "اجازه ندارد"
 
+msgid "Mood"
+msgstr "حال"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "هر دو"
 
@@ -4221,12 +4244,6 @@ msgstr "هیچ‌کدام"
 msgid "Subscription"
 msgstr "اشتراک"
 
-msgid "Mood"
-msgstr "حال"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "گروه خون"
@@ -4274,9 +4291,6 @@ msgstr "گذرواژهٔ شما تغییر کرد."
 msgid "Error changing password"
 msgstr "خطا هنگام تغییر گذرواژه"
 
-msgid "Password (again)"
-msgstr "گذرواژه (دوباره)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "تغییر گذرواژه"
@@ -4471,18 +4485,24 @@ msgstr "نمی‌توان کاربر %s را بیرون انداخت"
 msgid "Unable to ping user %s"
 msgstr "نمی‌توان ورود کاربر %s را ممنوع کرد"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "نمی‌توان صدا را بخش کرد چون پروندهٔ انتخاب شده (%s) وجود ندارد."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "نمی‌توان صدا را بخش کرد چون پروندهٔ انتخاب شده (%s) وجود ندارد."
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "نمی‌توان صدا را بخش کرد چون پروندهٔ انتخاب شده (%s) وجود ندارد."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4493,9 +4513,35 @@ msgstr "اوهوی!!"
 msgid "%s has buzzed you!"
 msgstr "‏%s شما را اضافه کرده است [%s]"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "نمی‌توان به %s پیغام فرستاد."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "فرستادن پرونده به %s ممکن نیست، کاربر از انتقال پرونده پشتیبانی نمی‌کند"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "فرستادن پرونده به %s ممکن نیست، کاربر از انتقال پرونده پشتیبانی نمی‌کند"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "ثبت نام شکست خورد"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "لطفاً نام کاربری شخصی را که می‌خواهید اطلاعاتش را ببینید وارد کنید."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "یک پرونده انتخاب کنید"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "راه‌اندازی _گپ"
 
 msgid "config:  Configure a chat room."
 msgstr "‏config: پیکربندی اتاق گپ."
@@ -4516,16 +4562,18 @@ msgstr "‏topic [new topic]‎: نمایش یا تغییر موضوع."
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "‏ban &lt;user&gt; [room]‎: محروم کردن کاربری از اتاق."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: تنظیم نوع "
 "رابطهٔ کاربر با اتاق."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: تنظیم نقش "
 "کاربر در اتاق."
@@ -4593,6 +4641,9 @@ msgstr "اتصال کارگزار"
 msgid "File transfer proxies"
 msgstr "درگاه انتقال پرونده"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4633,6 +4684,14 @@ msgstr "خطای تجزیهٔ XML"
 msgid "Unknown Error in presence"
 msgstr "خطای نامعلوم در حضور"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "خطا هنگام پیوستن به گپ %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "خطا در گپ %s"
+
 msgid "Create New Room"
 msgstr "ایجاد اتاق جدید"
 
@@ -4649,13 +4708,32 @@ msgstr "_پیکربندی اتاق"
 msgid "_Accept Defaults"
 msgstr "_پذیرش پیش‌فرض‌ها"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "خطا هنگام پیوستن به گپ %s"
+#, fuzzy
+msgid "No reason"
+msgstr "دلیلی ارائه نشد."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "خطا در گپ %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "‏%s شما را از کانال بیرون انداخت: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "توسط %s (%s) بیرون انداخته شد"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "هنگام باز کردن پرونده خطایی رخ داد."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "انتقال پرونده شکست خورد"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "باز کردن پروندهٔ %s شکست خورد: %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4681,10 +4759,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "لطفاً نام کاربری شخصی را که می‌خواهید اطلاعاتش را ببینید وارد کنید."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "یک پرونده انتخاب کنید"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "حالت‌های کاربر"
 
@@ -4724,9 +4798,20 @@ msgstr "اقدام"
 msgid "Select an action"
 msgstr "یک پرونده انتخاب کنید"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "نمی‌توان «%s» را اضافه کرد."
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "انتخاب دفترچهٔ نشانی نوتز"
+msgid "Buddy Add error"
+msgstr "خطای فهرست رفقا"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "نام کاربری مشخص شده نامعتبر است."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4956,7 +5041,7 @@ msgstr "بچه‌ها بدون رضایت والدینشان passport می‌ک�
 msgid "Passport account not yet verified"
 msgstr "حساب passport هنوز تأیید نشده است"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "حساب passport هنوز تأیید نشده است"
 
@@ -4980,6 +5065,10 @@ msgstr "آشنای مرجح "
 msgid "Non-IM Contacts"
 msgstr "حذف اطلاعات تماس"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5051,6 +5140,13 @@ msgstr "فرستادن پیغام همراه."
 msgid "Page"
 msgstr "پی‌جویی"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "کاری"
+
 msgid "Has you"
 msgstr "شما را دارد"
 
@@ -5092,6 +5188,14 @@ msgstr "هنرمندان"
 msgid "Album"
 msgstr "Adium"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "عنوان"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "عنوان"
+
 msgid "Set Friendly Name..."
 msgstr "تنظیم نام دوستانه..."
 
@@ -5126,9 +5230,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "پشتیبانی SSL برای MSN لازم است. لطفاً یک کتابخانهٔ SSL پشتیبانی شده نصب کنید. "
 
-msgid "Failed to connect to server."
-msgstr "اتصال به کارگزار شکست خورد."
-
 msgid "Error retrieving profile"
 msgstr "خطا هنگام بازیابی شرح حال"
 
@@ -5283,8 +5384,9 @@ msgid ""
 msgstr ""
 "اطلاعاتی در شرح حال کاربر پیدا نشد. به احتمال زیاد این کاربر وجود ندارد."
 
-msgid "Profile URL"
-msgstr "نشانی اینترنتی شرح حال"
+#, fuzzy
+msgid "View web profile"
+msgstr "هنگام انفصال ممکن نیست"
 
 #. *< type
 #. *< ui_requirement
@@ -5321,65 +5423,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "تأیید هویت عادی شکست خورد!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "‏%s گروه معتبری نیست."
-
-msgid "Unknown error."
-msgstr "خطای نامعلوم."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "‏%s در %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "‏%s برای شما سقلمه‌ای فرستاد"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "خطای نامعلوم"
 
 msgid "Unable to add user"
 msgstr "نمی‌توان کاربر را اضافه کرد"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "خطای نامعلوم"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "نتایج جستجوی شما در زیر آمده است"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "نمی‌توان کاربر را در %s اضافه کرد (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "نمی‌توان با کاربر در %s قطع رابطه کرد (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "نمی‌توان به کاربر اجازهٔ ورود به %s را داد (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "اضافه کردن %s ممکن نیست چون فهرست رفقای شما پر شده است."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "‏%s حساب passport معتبری نیست."
-
-msgid "Service Temporarily Unavailable."
-msgstr "سرویس موقتاً موجود نیست."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "نمی‌توان پیغام را فرستاد چون سرعت ارسال پیغام‌ها خیلی زیاد است:"
 
-msgid "Unable to rename group"
-msgstr "تغییر نام گروه ممکن نیست"
-
-msgid "Unable to delete group"
-msgstr "حذف گروه ممکن نیست"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5419,9 +5484,6 @@ msgstr "ممکن است پیغام فرستاده نشده باشد چون خط�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "ممکن است پیغام فرستاده نشده باشد چون خطایی نامعلوم رخ داد:"
 
-msgid "Unable to connect"
-msgstr "اتصال ممکن نیست"
-
 msgid "Writing error"
 msgstr "خطای نوشتن"
 
@@ -5436,13 +5498,16 @@ msgstr ""
 "خطای اتصال از کارگزار %s:\n"
 "‏%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "قرارداد ما توسط این کارگزار پشتیبانی نمی‌شود."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "خطا هنگام تجزیهٔ HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "شما از جای دیگری وارد سیستم شده‌اید."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5450,7 +5515,8 @@ msgstr ""
 "کارگزارهای MSN موقتاً قابل دسترسی نیستند. لطفاً پس از کمی صبر دوباره امتحان "
 "کنید."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "کارگزارهای MSN موقتاً خاموش خواهند شد."
 
 #, c-format
@@ -5481,6 +5547,14 @@ msgstr "در حال فرستادن کوکی"
 msgid "Retrieving buddy list"
 msgstr "در حال بازیابی فهرست رفقا"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "از کنار کامپیوتر رفته است"
 
@@ -5517,14 +5591,6 @@ msgstr "نمی‌توان پیغام را فرستاد چون در جعبه تق
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "ممکن است پیغام فرستاده نشده باشد چون خطایی نامعلوم رخ داد:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "‏%s شما را به فهرست رفقایش اضافه کرد."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "‏%s شما را از فهرست رفقایش حذف کرد."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "اضافه کردن به دفترچهٔ نشانی"
@@ -5533,13 +5599,6 @@ msgstr "اضافه کردن به دفترچهٔ نشانی"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "آیا می‌خواهید این رفیق را به فهرست رفقا‌یتان اضافه کنید؟"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "نمی‌توان «%s» را اضافه کرد."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "نام کاربری مشخص شده نامعتبر است."
@@ -5547,6 +5606,9 @@ msgstr "نام کاربری مشخص شده نامعتبر است."
 msgid "This Hotmail account may not be active."
 msgstr "ممکن است این حساب هات‌مِیل فعال نباشد."
 
+msgid "Profile URL"
+msgstr "نشانی اینترنتی شرح حال"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5561,19 +5623,63 @@ msgstr "ممکن است این حساب هات‌مِیل فعال نباشد."
 msgid "MSN Protocol Plugin"
 msgstr "متصل شوندهٔ قرارداد AIM"
 
-#, fuzzy
-msgid "Missing Cipher"
-msgstr "کلید رمز"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "‏%s گروه معتبری نیست."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "خطای نامعلوم."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "‏%s در %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "نمی‌توان کاربر را در %s اضافه کرد (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "نمی‌توان با کاربر در %s قطع رابطه کرد (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "نمی‌توان به کاربر اجازهٔ ورود به %s را داد (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "اضافه کردن %s ممکن نیست چون فهرست رفقای شما پر شده است."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "‏%s حساب passport معتبری نیست."
+
+msgid "Service Temporarily Unavailable."
+msgstr "سرویس موقتاً موجود نیست."
+
+msgid "Unable to rename group"
+msgstr "تغییر نام گروه ممکن نیست"
+
+msgid "Unable to delete group"
+msgstr "حذف گروه ممکن نیست"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "‏%s شما را به فهرست رفقایش اضافه کرد."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "‏%s شما را از فهرست رفقایش حذف کرد."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "اتاق‌های کاربر"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "در حال خواندن داده"
 
@@ -5585,12 +5691,25 @@ msgstr "تقاضای نامعتبر از سوی کارگزار"
 msgid "Logging in"
 msgstr "ثبت وقایع"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "بدون نام"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"اتصال به کارگزار قطع شد\n"
+"‏%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "پیغام رفتن جدید"
@@ -5611,20 +5730,21 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "بدون نام"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "پنجره‌های _پیغام اینترنتی"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "متصل شد"
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "پاسخ نامعتبر از کارگزار."
 
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
@@ -5632,16 +5752,23 @@ msgstr "فراروند کُد خطای %d را بازگرداند"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "لقب یا گذرواژهٔ نادرست"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "در حال تکمیل کردن اتصال"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "پیوستن به رفیق در گپ شکست خورد"
 
@@ -5652,14 +5779,6 @@ msgstr "بار کردن فهرست رفقا از پرونده..."
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "اتاق‌های کاربر"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "پیوستن به رفیق در گپ شکست خورد"
@@ -5671,37 +5790,16 @@ msgid "blocklist command failed"
 msgstr ""
 
 #, fuzzy
-msgid "Invalid input condition"
-msgstr "در حال تکمیل کردن اتصال"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "صف پر است"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "نمی‌توان پیغام را تجزیه کرد"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "نمی‌توان به میزبان متصل شد"
+msgid "Missing Cipher"
+msgstr "کلید رمز"
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "پنجره‌های _پیغام اینترنتی"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "پاسخ نامعتبر از کارگزار."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5749,9 +5847,6 @@ msgstr "قلم درشت‌تر"
 msgid "User"
 msgstr "کاربر"
 
-msgid "Profile"
-msgstr "مجموعه تنظیمات"
-
 #, fuzzy
 msgid "Headline"
 msgstr "_دست‌گیره:"
@@ -5767,15 +5862,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "بستن گفتگو"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "بدون نام"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5789,6 +5879,9 @@ msgstr "‏%s پیغامی به تخته‌سفید فرستاد. آیا می‌
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "این تم صورتک ندارد."
@@ -5797,6 +5890,14 @@ msgstr "این تم صورتک ندارد."
 msgid "Please try another username:"
 msgstr "لطفاً برای %s نام جدیدی وارد کنید"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "بدون نام"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5993,10 +6094,6 @@ msgid "Master archive is misconfigured"
 msgstr "آرشیو اصلی درست پیکربندی نشده است"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "لقب یا گذرواژهٔ نادرست"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "شناسایی میزبانِ نام کاربری‌ای که وارد کرده‌اید ممکن نشد"
 
@@ -6038,9 +6135,9 @@ msgstr "کاربر یا برون‌خط است یا با شما قطع رابط�
 msgid "Unknown error: 0x%X"
 msgstr "خطای نامعلوم: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "ورود به سیستم شکست خورد (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "نمی‌توان ورود کاربر %s را ممنوع کرد"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6142,9 +6239,6 @@ msgstr "کنفرانس GroupWise %Id"
 msgid "Authenticating..."
 msgstr "تأیید هویت..."
 
-msgid "Unable to connect to server."
-msgstr "اتصال به کارگزار ممکن نیست."
-
 msgid "Waiting for response..."
 msgstr "در حال انتظار برای پاسخ..."
 
@@ -6168,26 +6262,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "آیا مایلید به این گفتگو بپیوندید؟"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "شما از سیستم خارج شدید چون در ایستگاه کاری دیگری وارد سیستم شده‌اید."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "به نظر می‌رسد %s برون‌خط است و پیغامی را که الان فرستادید دریافت نکرده است."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "نمی‌توان به کارگزار متصل شد. لطفاً نشانی کارگزاری را که مایلید به آن متصل شوید "
 "وارد کنید."
 
-msgid "Error. SSL support is not installed."
-msgstr "خطا. پشتیبانی SSL نصب نشده است."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "این کنفرانس بسته شده است. دیگر نمی‌توان پیغامی فرستاد."
 
@@ -6211,6 +6299,26 @@ msgid "Server port"
 msgstr "درگاه کارگزار"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "پاسخ‌های HTTP نامعتبر از کارگزار دریافت شد."
+
+#. username connecting too frequently
+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 ""
+"شما دفعات خیلی زیادی متصل شده و دوباره اتصالتان را قطع کرده‌اید. ده دقیقه صبر "
+"کنید و بعد دوباره امتحان کنید. اگر الان به تلاشتان ادامه دهید شاید مجبور "
+"شوید بیشتر منتظر بمانید."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "خطای هنگام ایجاد اتصال"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "متصل نشد"
 
@@ -6218,18 +6326,8 @@ msgstr "متصل نشد"
 msgid "Invalid chat room name"
 msgstr "نام اتاق نامعتبر"
 
-msgid "Server closed the connection."
-msgstr "کارگزار اتصال را قطع کرد."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"اتصال به کارگزار قطع شد:\n"
-"‏%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "داده‌های نامعتبری از اتصال کارگزار دریافت شد.."
 
 #. *< type
@@ -6278,7 +6376,8 @@ msgstr "اتصال به کاربر دوردست قطع شد:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "داده‌های نامعتبری از اتصال با کاربر دوردست دریافت شد."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "برقراری اتصال با کاربر دوردست ممکن نیست."
 
 msgid "Direct IM established"
@@ -6453,23 +6552,18 @@ msgstr "دوربین"
 msgid "Screen Sharing"
 msgstr "نام کاربری"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "آزاد برای گپ"
 
-#, c-format
 msgid "Not Available"
 msgstr "در دسترس نیست"
 
-#, c-format
 msgid "Occupied"
 msgstr "مشغول"
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr "نامرئی"
 
@@ -6482,21 +6576,15 @@ msgstr "سطح اخطار"
 msgid "Buddy Comment"
 msgstr "توضیح دربارهٔ رفیق"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "نمی‌توان به کارگزار تأیید هویت متصل شد:\n"
 "‏%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"نمی‌توان به کارگزار BOS متصل شد:\n"
-"‏%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "اتصال به کارگزار ممکن نیست."
 
 #, fuzzy
 msgid "Username sent"
@@ -6511,52 +6599,62 @@ msgstr "در حال تکمیل کردن اتصال"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "نمی‌توان وارد سیستم شد: نمی‌توان با %s وارد سیستم شد چون نام کاربری نامعتبر "
 "است. نام کاربری باید یا با حرف شروع شود و شامل حروف، ارقام، و فاصله باشد یا "
 "فقط از ارقام تشکیل شده باشد."
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"ممکن است به زودی ارتباط شما قطع شود. برای دیدن به‌هنگام‌سازی‌ها %s را ببینید."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "نام نامعتبر"
+msgid "Unable to get a valid AIM login hash."
+msgstr "نمی‌توان مجموعه تنظیمات AIM را تنظیم کرد."
 
-msgid "Incorrect password."
-msgstr "گذرواژهٔ نادرست"
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "خواندن پروندهٔ %s ممکن نیست."
+
+msgid "Received authorization"
+msgstr "اجازه دریافت شد"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "کاربر وجود ندارد"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "حساب شما در حال حاضر به حالت تعلیق در آمده است."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "پیغام‌رسان اینترنتی AOL موقتاً قابل دسترسی نیست."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "نسخهٔ کارگیری که استفاده می‌کنید خیلی قدیمی است. لطفاً در %s ارتقا دهید"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "شما دفعات خیلی زیادی متصل شده و دوباره اتصالتان را قطع کرده‌اید. ده دقیقه صبر "
 "کنید و بعد دوباره امتحان کنید. اگر الان به تلاشتان ادامه دهید شاید مجبور "
 "شوید بیشتر منتظر بمانید."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "نسخهٔ کارگیری که استفاده می‌کنید خیلی قدیمی است. لطفاً در %s ارتقا دهید"
-
-msgid "Could Not Connect"
-msgstr "نمی‌توان متصل شد"
-
-msgid "Received authorization"
-msgstr "اجازه دریافت شد"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "کلید SecurID وارد شده نامعتبر است."
 
 msgid "Enter SecurID"
@@ -6571,27 +6669,6 @@ msgstr "عدد ۶ رقمی را از نمایش دیجیتالی وارد کنی
 msgid "_OK"
 msgstr "_تأیید"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"ممکن است به‌زودی ارتباط شما قطع شود. شاید مایل باشید تا زمان تعمیر، از TOC "
-"استفاده کنید. برای به‌هنگام‌سازی %s را ببینید."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "نمی‌توان مجموعه تنظیمات AIM را تنظیم کرد."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"ممکن است به زودی ارتباط شما قطع شود. برای دیدن به‌هنگام‌سازی‌ها %s را ببینید."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "خواندن پروندهٔ %s ممکن نیست."
-
 msgid "Password sent"
 msgstr "گذرواژه فرستاده شد"
 
@@ -6716,7 +6793,7 @@ 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] "شما به دلیل نامعلومی %Ihu پیغام از %s را دریافت نکردید."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "نمی‌توان پیغام فرستاد: %s"
@@ -6738,6 +6815,12 @@ msgstr "برخط از"
 msgid "Member Since"
 msgstr "عضو از"
 
+msgid "Capabilities"
+msgstr "قابلیت‌ها"
+
+msgid "Profile"
+msgstr "مجموعه تنظیمات"
+
 msgid "Your AIM connection may be lost."
 msgstr "ممکن است اتصال AIM شما از دست رفته باشد."
 
@@ -6907,7 +6990,7 @@ msgstr "پیغام رفتن خیلی طولانی است."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6934,9 +7017,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "یتیمان"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "نمی‌توان رفیق %s را به فهرست رفقایتان اضافه کرد چون رفقای خیلی زیادی در فهرست "
@@ -6946,7 +7029,7 @@ msgid "(no name)"
 msgstr "(بدون نام)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "فرمان شما به دلیل نامعلومی شکست خورد."
 
 #, fuzzy, c-format
@@ -7018,6 +7101,7 @@ msgstr "_اتصال"
 msgid "Get AIM Info"
 msgstr "گرفتن اطلاعات AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "ویرایش توضیح رفیق"
 
@@ -7079,6 +7163,7 @@ msgstr "_جستجو"
 msgid "Set User Info (web)..."
 msgstr "تنظیم اطلاعات کاربر (نشانی اینترنتی)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "تغییر گذرواژه (نشانی اینترنتی)"
@@ -7111,6 +7196,10 @@ msgid "Search for Buddy by Information"
 msgstr "جستجو به دنبال رفیق از روی اطلاعات"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "کاربر وارد سیستم نشده است"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7130,7 +7219,6 @@ msgstr "درخواست از %s برای اتصال به ما در %s:%hu برا�
 msgid "Attempting to connect to %s:%hu."
 msgstr "در حال تلاش برای اتصال به %s:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "در حال تلاش برای اتصال از طریق کارگزار پیشکار."
 
@@ -7227,7 +7315,7 @@ msgstr "دیگر"
 msgid "Visible"
 msgstr "نامرئی"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7318,16 +7406,48 @@ msgstr "آخرین به هنگام‌رسانی"
 msgid "Could not change buddy information."
 msgstr "لطفاً اطلاعات رفیقی را وارد کنید."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "همراه"
+
+msgid "Note"
+msgstr "یادداشت"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "شمایل رفیق"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "اضافه کردن رفیق"
+msgid "_Modify"
+msgstr "تغییر"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "تغییر"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "کارگزار مشغول است"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "اجازه لازم دارد"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "این شخص به فهرست رفقایتان اضافه شود؟"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Enter answer here"
 msgstr "درخواست را اینجا وارد کنید"
 
 msgid "Send"
@@ -7341,18 +7461,19 @@ msgid "Authorization denied message:"
 msgstr "پیغام رد اجازه:"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "ببخشید، تیپ شما به من نمی‌خورد..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "کاربر %Id به تأیید هویت نیاز دارد"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "این شخص به فهرست رفقایتان اضافه شود؟"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "درخواست را اینجا وارد کنید"
 
 msgid "Would you be my friend?"
@@ -7375,7 +7496,7 @@ msgid "Failed sending authorize"
 msgstr "اگر می‌شود به من اجازه دهید!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "پیوستن به رفیق در گپ شکست خورد"
 
 #, fuzzy, c-format
@@ -7420,6 +7541,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr "شما فقط می‌توانید گروه‌های دایم QQ را جستجو کنید\n"
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "تنظیمات پیشکار نامعتبر"
+
+#, fuzzy
 msgid "Not member"
 msgstr "من عضو نیستم"
 
@@ -7462,16 +7587,19 @@ msgstr "این گروه به دیگران اجازهٔ پیوستن نمی‌د�
 msgid "Join QQ Qun"
 msgstr "پیوستن به گپ"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "درخواست را اینجا وارد کنید"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "شما با موفقیت عضو Qun را تغییر دادید"
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "شما با موفقیت عضو Qun را تغییر دادید"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7481,7 +7609,7 @@ msgstr "عملیات QQ Qun"
 msgid "Failed:"
 msgstr "شکست خورد"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7496,11 +7624,11 @@ msgstr ""
 "این عملیات برای همیشه Qun را حذف خواهد کرد."
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "ببخشید، تیپ شما به من نمی‌خورد..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "شما با موفقیت عضو Qun را تغییر دادید"
 
 #, fuzzy
@@ -7511,35 +7639,35 @@ msgid "You have successfully created a Qun"
 msgstr "شما با موفقیت Qun ایجاد کردید"
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "آیا مایلید الان جزئیات Qun را تنظیم کنید؟"
 
 msgid "Setup"
 msgstr "راه‌اندازی"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "کاربر %Id خواستار پیوستن به گروه %Id است"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "کاربر %Id خواستار پیوستن به گروه %Id است"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "پیوستن به رفیق در گپ شکست خورد"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "حذف رفیق"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "حذف رفیق"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7657,6 +7785,13 @@ msgstr "<b>آخرین بازآوری</b>: %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>فعلاً برخط</b>: %Id<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>کاربر خارجی</b><br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7664,7 +7799,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "دربارهٔ %s"
 
 #, fuzzy
@@ -7685,6 +7820,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "دربارهٔ %s"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "نشانی خانه"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7716,7 +7855,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "در حال اتصال"
@@ -7729,6 +7867,9 @@ msgstr "نمایش گزینه‌های کمتر"
 msgid "Show server news"
 msgstr "نمایش گزینه‌های کمتر"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "خطای خواندن"
@@ -7738,11 +7879,7 @@ msgid "Update interval (seconds)"
 msgstr "خطای خواندن"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "نمی‌توان اطلاعات کارگزار را گرفت"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "نمی‌توان اطلاعات کارگزار را گرفت"
 
 #, c-format
@@ -7765,21 +7902,19 @@ msgid "Activation required"
 msgstr "ثبت نام لازم است"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "خطای خواندن"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "محاورهٔ درخواست"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "تأیید هویت Yahoo!‎ شکست خورد"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7789,7 +7924,7 @@ msgstr "ذخیرهٔ تصویر"
 msgid "Enter code"
 msgstr "گذرواژه را وارد کنید"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7797,66 +7932,42 @@ msgid "Enter the text from the image"
 msgstr "نام گروه را وارد کنید."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "نمی‌توان متصل شد"
-
 msgid "Socket error"
 msgstr "خطای سوکت"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"اتصال به کارگزار قطع شد:\n"
-"‏%s"
-
-msgid "Unable to read from socket"
-msgstr "خواندن از سوکت ممکن نیست"
-
-msgid "Write Error"
-msgstr "خطای نوشتن"
-
-msgid "Connection lost"
-msgstr "اتصال قطع شد"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "تنظیم اطلاعات کاربر..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "درخواست رد شد"
 
-msgid "Couldn't resolve host"
-msgstr "تحویل نام میزبان ممکن نیست"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "تحویل نام میزبان ممکن نیست."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "نام کاربر یا گذرواژهٔ نامعتبر"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "اتصال کارگزار"
+msgid "Connecting to server"
+msgstr "در حال اتصال به کارگزار SILC"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "خطای شناسهٔ QQ"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "'گرفتن نام شکست خورد: %s"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7866,6 +7977,10 @@ msgid ""
 msgstr "نشانی کارگزار"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "‏%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "فرستنده"
 
@@ -7875,32 +7990,30 @@ msgid ""
 "%s"
 msgstr "راهنمایی‌های کارگزار: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "دلیل نامعلوم"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "فرمان"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "نمی‌توان اطلاعات کارگزار را گرفت"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "دلیل نامعلوم"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "دلیل نامعلوم"
 
 #, c-format
@@ -7914,9 +8027,6 @@ msgstr "فرستادن پرونده"
 msgid "%d canceled the transfer of %s"
 msgstr "‏%Id از انتقال %s صرف نظر کرد"
 
-msgid "Connection closed (writing)"
-msgstr "اتصال بسته شد (در حال نوشتن)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>عنوان گروه:</b> %s<br>"
@@ -7970,17 +8080,6 @@ msgstr "یک مدیر Sametime اعلان زیر را در کارگزار %s م�
 msgid "Sametime Administrator Announcement"
 msgstr "اعلان مدیر Sametime"
 
-msgid "Connection reset"
-msgstr "اتصال از نو آغاز شد"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "خطا هنگام خواندن از سوکت: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "اتصال به میزبان ممکن نیست"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "اعلان از %s"
@@ -8003,6 +8102,9 @@ msgstr "بلندگوها"
 msgid "Video Camera"
 msgstr "دوربین ویدیویی"
 
+msgid "File Transfer"
+msgstr "انتقال پرونده"
+
 #, fuzzy
 msgid "Supports"
 msgstr "پشتیبانی"
@@ -8724,9 +8826,6 @@ msgstr "سازمان"
 msgid "Unit"
 msgstr "واحد"
 
-msgid "Note"
-msgstr "یادداشت"
-
 msgid "Join Chat"
 msgstr "پیوستن به گپ"
 
@@ -8827,6 +8926,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "آمار شبکه"
 
+msgid "Ping"
+msgstr "‏Ping"
+
 msgid "Ping failed"
 msgstr "‏Ping شکست خورد"
 
@@ -8887,7 +8989,8 @@ msgstr "نوع کلید عمومی پشتیبانی نشده"
 msgid "Disconnected by server"
 msgstr "قطع شده از طرف کارگزار"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "خطا هنگام اتصال به کارگزار SILC"
 
 msgid "Key Exchange failed"
@@ -8899,27 +9002,26 @@ msgstr ""
 "ازسرگیری نشست جدا شده شکست خورد. برای ایجاد اتصال جدید، اتصال مجدد را فشار "
 "دهید."
 
-msgid "Connection failed"
-msgstr "اتصال شکست خورد"
-
 msgid "Performing key exchange"
 msgstr "در حال اجرای تبادل کلید"
 
-msgid "Unable to create connection"
-msgstr "نمی‌توان اتصال ایجاد کرد"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "نمی‌توان زوج کلید SILC را بار کرد: %s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "در حال اتصال به کارگزار SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "نمی‌توان زوج کلید SILC را بار کرد: %s"
+
 msgid "Out of memory"
 msgstr "حافظه تمام شد"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "نمی‌توان قرارداد SILC را راه‌اندازی کرد"
 
 #, fuzzy
@@ -9210,7 +9312,7 @@ msgid "Creating SILC key pair..."
 msgstr "در حال ایجاد زوج کلید SILC..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "در حال ایجاد زوج کلید SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9303,6 +9405,9 @@ msgstr "تخته‌سفید"
 msgid "No server statistics available"
 msgstr "آمار کارگزاری موجود نیست"
 
+msgid "Error during connecting to SILC Server"
+msgstr "خطا هنگام اتصال به کارگزار SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "شکست: عدم تطابق نسخه، کارگیرتان را ارتقا دهید"
@@ -9344,37 +9449,37 @@ msgstr "شکست: کوکی نامعتبر"
 msgid "Failure: Authentication failed"
 msgstr "شکست: تأیید هویت شکست خورد"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "نمی‌توان اتصال کارگیر SILC را راه‌اندازی کرد"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "بدون نام"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "نمی‌توان زوج کلید SILC را بار کرد: %s"
 
-msgid "Could not write"
-msgstr "نمی‌توان نوشت"
-
-msgid "Could not connect"
-msgstr "متصل نشد"
+msgid "Unable to create connection"
+msgstr "نمی‌توان اتصال ایجاد کرد"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "خطای کارگزار نامعلوم."
 
-msgid "Could not create listen socket"
-msgstr "ایجاد سوکت پایش ممکن نیست"
-
-msgid "Could not resolve hostname"
-msgstr "تحویل نام میزبان ممکن نیست"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "ایجاد سوکت ممکن نیست"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "نام‌های کاربری SIP نمی‌توانند حاوی فاصله یا نماد @ باشند"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "نمایش گزینه‌های کمتر"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9408,175 +9513,63 @@ msgstr "تأیید هویت کاربر"
 msgid "Auth Domain"
 msgstr "تأیید هویت دامنه"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "در حال جستجوی %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "اتصال به %s شکست خورد"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "ورود به سیستم: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "نوشتن پروندهٔ %s ممکن نیست."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "خواندن پروندهٔ %s ممکن نیست."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "پیغام خیلی طولانی است، %s بایت آخر قیچی شد."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s در حال حاضر وارد سیستم نشده است."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "اخطار %s مجاز نیست."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "یک پیغام جا افتاد، شما از محدودهٔ سرعت کارگزار فراتر رفته‌اید."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "گپ در %s موجود نیست."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "شما پیغام‌های را با سرعت خیلی زیادی به %s ارسال می‌کنید."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "یک پیغام اینترنتی از %s را دریافت نکردید چون خیلی بزرگ بود."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "یک پیغام اینترنتی از %s را دریافت نکردید چون خیلی سریع بود."
-
-#, c-format
-msgid "Failure."
-msgstr "شکست."
-
-#, c-format
-msgid "Too many matches."
-msgstr "تعداد مطابقت‌ها خیلی زیاد است."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "وصف‌کننده‌های بیشتری لازم است."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "سرویس دفترچهٔ راهنمای کاربران به طور موقت قابل دسترسی نیست."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "گشتن به دنبال نشانی پست الکترونیکی محدود شده است."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "کلیدواژه نادیده گرفته شد."
-
-#, c-format
-msgid "No keywords."
-msgstr "بدون کلیدواژه."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "کاربر اطلاعاتی در دفترچهٔ راهنمای کاربران ندارد."
-
-#, c-format
-msgid "Country not supported."
-msgstr "کشور پشتیبانی نمی‌شود."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "شکست نامعلوم: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "نام کاربری یا گذرواژهٔ نادرست."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "این سرویس موقتاً موجود نیست."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "‏join &lt;room&gt;‎: پیوستن به اتاق گپ در شبکهٔ Yahoo"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "سطح اخطار شما در حال حاضر بالاتر از آن است که بتوانید وارد سیستم شوید."
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: فهرست کردن اتاق‌های شبکهٔ یاهو"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"شما دفعات خیلی زیادی متناوباً وارد سیستم شده و از آن خارج شده‌اید. ده دقیقه "
-"صبر کرده و بعد دوباره امتحان کنید. اگر به تلاش ادامه دهید، باید حتی بیش از "
-"این صبر کنید."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "خطای نامعلومی در ورود به سیستم رخ داد: %s"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "خطای نامعلومی، %Id، رخ داد. اطلاعات: %s"
-
-msgid "Invalid Groupname"
-msgstr "نام گروه نامعتبر"
-
-msgid "Connection Closed"
-msgstr "اتصال بسته شد"
-
-msgid "Waiting for reply..."
-msgstr "در انتظار پاسخ..."
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "مکث TOC به پایان رسید.حالا می‌توانید دوباره پیغام بفرستید."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "شناسهٔ Yahoo!‎"
 
-msgid "Password Change Successful"
-msgstr "تغییر گذرواژه موفقیت‌آمیز بود"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "متصل شوندهٔ قرارداد یاهو"
 
-msgid "_Group:"
-msgstr "_گروه:"
+msgid "Pager server"
+msgstr "کارگزار پِی‌جو"
 
-msgid "Get Dir Info"
-msgstr "گرفتن اطلاعات دفترچهٔ راهنمای کاربران"
+msgid "Pager port"
+msgstr "درگاه پِی‌جو"
 
-msgid "Set Dir Info"
-msgstr "تنظیم اطلاعات دفترچهٔ راهنمای کاربران"
+msgid "File transfer server"
+msgstr "کارگزار انتقال پرونده"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "نمی‌توان %s را برای نوشتن باز کرد!"
+msgid "File transfer port"
+msgstr "درگاه انتقال پرونده"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "انتقال پرونده شکست خورد؛ احتمالاً طرف دیگر انصراف داده است."
+msgid "Chat room locale"
+msgstr "شرایط محلی اتاق گپ"
 
-msgid "Could not connect for transfer."
-msgstr "نمی‌توان برای انتقال متصل شد."
+msgid "Ignore conference and chatroom invitations"
+msgstr "نادیده گرفتن دعوت به کنفرانس‌ها و اتاق‌های گپ"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "نمی‌توان سرصفحهٔ پرونده را نوشت. پرونده انتقال نخواهد یافت."
+msgid "Chat room list URL"
+msgstr "نشانی اینترنتی فهرست اتاق‌های گپ"
 
-msgid "Save As..."
-msgstr "ذخیره به نام..."
+msgid "Yahoo Chat server"
+msgstr "کارگزار گپ یاهو"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "‏%s از %s می‌خواهد %Id پرونده را بپذیرد: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "درگاه گَپ‏ یاهو"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "‏%s از شما درخواست کرده است برایش پرونده‌ای بفرستید"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "شناسهٔ Yahoo!‎"
 
 #. *< type
 #. *< ui_requirement
@@ -9588,11 +9581,11 @@ msgstr "‏%s از شما درخواست کرده است برایش پرونده
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "متصل شوندهٔ قرارداد TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "متصل شوندهٔ قرارداد یاهو"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9618,6 +9611,34 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "اضافه کردن رفیق رد شد"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "داده‌های نامعتبری از اتصال کارگزار دریافت شد.."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"خطای نامعلوم با شمارهٔ %d. ورود به وب‌گاه Yahoo!‎ ممکن است این مشکل را برطرف "
+"کند."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"خطای نامعلوم با شمارهٔ %d. ورود به وب‌گاه Yahoo!‎ ممکن است این مشکل را برطرف "
+"کند."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "لقب یا گذرواژهٔ نادرست"
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9651,35 +9672,30 @@ msgstr ""
 "خطای نامعلوم با شمارهٔ %d. ورود به وب‌گاه Yahoo!‎ ممکن است این مشکل را برطرف "
 "کند."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "اضافه کردن رفیق %s به گروه %s به فهرست کارگزار با حساب %s ممکن نیست."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "نمی‌توان رفیق را به فهرست کارگزار اضافه کرد"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "پاسخ‌های HTTP نامعتبر از کارگزار دریافت شد."
 
-msgid "Connection problem"
-msgstr "مشکل اتصال"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 "اتصال به کارگزار قطع شد:\n"
 "‏%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 "برقراری اتصال با کارگزار ممکن نیست.\n"
 "‏%s"
@@ -9729,9 +9745,8 @@ msgstr "تنظیمات حضور"
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "فعال‌سازی کدام شناسه؟"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "پیوستن به کی در گپ؟"
@@ -9746,74 +9761,15 @@ msgstr "پیوستن به کاربر در گپ..."
 msgid "Open Inbox"
 msgstr "صندوق نامهٔ هات‌مِیل باز شود"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "‏join &lt;room&gt;‎: پیوستن به اتاق گپ در شبکهٔ Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: فهرست کردن اتاق‌های شبکهٔ یاهو"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "شناسهٔ Yahoo!‎"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "متصل شوندهٔ قرارداد یاهو"
-
-msgid "Yahoo Japan"
-msgstr "‏یاهوی ژاپن"
-
-msgid "Pager server"
-msgstr "کارگزار پِی‌جو"
-
-msgid "Japan Pager server"
-msgstr "کارگزار پِی‌جوی ژاپن"
-
-msgid "Pager port"
-msgstr "درگاه پِی‌جو"
-
-msgid "File transfer server"
-msgstr "کارگزار انتقال پرونده"
-
-msgid "Japan file transfer server"
-msgstr "کارگزار انتقال پروندهٔ ژاپن"
-
-msgid "File transfer port"
-msgstr "درگاه انتقال پرونده"
-
-msgid "Chat room locale"
-msgstr "شرایط محلی اتاق گپ"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "نادیده گرفتن دعوت به کنفرانس‌ها و اتاق‌های گپ"
-
-msgid "Chat room list URL"
-msgstr "نشانی اینترنتی فهرست اتاق‌های گپ"
-
-msgid "Yahoo Chat server"
-msgstr "کارگزار گپ یاهو"
-
-msgid "Yahoo Chat port"
-msgstr "درگاه گَپ‏ یاهو"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "نمی‌توان متصل شد"
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9821,6 +9777,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "‏%s مایل است پروندهٔ %s را برای شما بفرستد"
 
+msgid "Write Error"
+msgstr "خطای نوشتن"
+
 msgid "Yahoo! Japan Profile"
 msgstr "مجموعه تنظیمات Yahoo!‎ ژاپن"
 
@@ -9865,13 +9824,9 @@ msgstr "پیوند باحال ۳"
 msgid "Last Update"
 msgstr "آخرین به هنگام‌رسانی"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "اطلاعات کاربر برای %s موجود نیست"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "ببخشید، به نظر می‌رسد این شرح حال به زبان یا قالبی است که در حال حاضر "
 "پشتیبانی نمی‌شود."
@@ -9943,23 +9898,19 @@ msgstr "صداها"
 msgid "Webcams"
 msgstr "دوربین‌های وبی"
 
+msgid "Connection problem"
+msgstr "مشکل اتصال"
+
 msgid "Unable to fetch room list."
 msgstr "نمی‌توان فهرست اتاق‌ها را گرفت."
 
 msgid "User Rooms"
 msgstr "اتاق‌های کاربر"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "مشکل اتصال با کارگزار YCHT"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"اتصال به کارگزار قطع شد\n"
-"‏%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10078,24 +10029,16 @@ msgstr ""
 msgid "Exposure"
 msgstr ""
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"ایجاد سوکت ممکن نیست:\n"
-"‏%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "تجزیهٔ پاسخ پیشکار HTTP ممکن نیست: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "خطای اتصال پیشکار HTTP %Id"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "دسترسی مُجاز نیست: کارگزار پیشکار HTTP تونل زدن از درگاه %Id را ممنوع کرده "
 "است."
@@ -10104,9 +10047,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "خطا هنگام تحویل %s"
 
-msgid "Could not resolve host name"
-msgstr "تحویل نام میزبان ممکن نیست"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10200,9 +10140,6 @@ msgstr "مزاحم نشوید"
 msgid "Extended away"
 msgstr "رفتهٔ بیشتر"
 
-msgid "Mobile"
-msgstr "همراه"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10244,17 +10181,6 @@ msgstr "+++ %s دیگر بی‌کار نیست"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "خطا هنگام خواندن %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"در خواندن %s شما خطایی پیش آمد و بار نشد. نام پروندهٔ قدیمی به %s~ تغییر کرد."
-
 msgid "Calculating..."
 msgstr "در حال محاسبه"
 
@@ -10354,6 +10280,17 @@ msgstr "اتصال رد شد"
 msgid "Address already in use."
 msgstr "این نام گپ از قبل وجود دارد"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "خطا هنگام خواندن %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"در خواندن %s شما خطایی پیش آمد و بار نشد. نام پروندهٔ قدیمی به %s~ تغییر کرد."
+
 msgid "Internet Messenger"
 msgstr "پیغام‌رسان اینترنتی"
 
@@ -10400,10 +10337,8 @@ msgstr "اطلاع‌های نامهٔ جدید"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "گزینه‌های %s"
+msgid "_Advanced"
+msgstr "_پیشرفته"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "استفاده از تنظیمات پیشکار گنوم"
@@ -10438,9 +10373,6 @@ msgstr "اگر خوب دقت کنید"
 msgid "you can see the butterflies mating"
 msgstr "می‌توانید جفت‌گیری پروانه‌ها را ببینید"
 
-msgid "Proxy Options"
-msgstr "گزینه‌های پیشکار"
-
 msgid "Proxy _type:"
 msgstr "_نوع پیشکار:"
 
@@ -10469,8 +10401,9 @@ msgstr "ا_صلی"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_پیشرفته"
+#, fuzzy
+msgid "_Proxy"
+msgstr "پیشکار"
 
 msgid "Enabled"
 msgstr "به کار انداخته شده"
@@ -10508,8 +10441,8 @@ msgid "Please update the necessary fields."
 msgstr "لطفاً فیلدهای لازم را به‌هنگام کنید."
 
 #, fuzzy
-msgid "Room _List"
-msgstr "فهرست اتاق"
+msgid "A_ccount"
+msgstr "حساب:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10517,8 +10450,9 @@ msgid ""
 msgstr ""
 "لطفاً اطلاعات مناسب را دربارهٔ گفتگویی که مایلید به آن بپیوندید وارد کنید.\n"
 
-msgid "_Account:"
-msgstr "_حساب:"
+#, fuzzy
+msgid "Room _List"
+msgstr "فهرست اتاق"
 
 msgid "_Block"
 msgstr "_قطع رابطه"
@@ -10536,6 +10470,17 @@ msgid "I_M"
 msgstr "_پیغام اینترنتی"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "_اضافه کردن گپ"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "گپ ویدیویی"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "_فرستادن پرونده"
 
@@ -10547,7 +10492,11 @@ msgid "View _Log"
 msgstr "نمایش _تاریخچه"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "هنگام انفصال ممکن نیست"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "هنگام انفصال ممکن نیست"
 
 msgid "_Alias..."
@@ -10687,6 +10636,10 @@ msgstr "/ابزارها/_کمینِ رفیق"
 msgid "/Tools/_Certificates"
 msgstr "/ابزارها/تر_جیحات"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "ابزارها/_رفتن"
+
 msgid "/Tools/Plu_gins"
 msgstr "/ابزارها/_متصل شونده‌ها"
 
@@ -10696,10 +10649,6 @@ msgstr "/ابزارها/تر_جیحات"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ابزارها/_حریم خصوصی"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "ابزارها/_رفتن"
-
 msgid "/Tools/_File Transfers"
 msgstr "/ابزارها/انت_قال ‌پرونده"
 
@@ -10820,8 +10769,8 @@ msgstr "دستی"
 msgid "By status"
 msgstr "از روی وضعیت"
 
-msgid "By log size"
-msgstr "از روی اندازهٔ تاریخچه"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10839,6 +10788,9 @@ msgstr "اتصال م_جدد"
 msgid "Re-enable"
 msgstr "به کار انداختن مجدد حساب"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "‏%s برگشت"
@@ -10930,6 +10882,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "اسم مستعار:"
 
+msgid "_Group:"
+msgstr "_گروه:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10963,6 +10918,123 @@ msgstr "/ابزارها"
 msgid "/Buddies/Sort Buddies"
 msgstr "/رفقا/مرتب کردن رفقا"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "رنگ پس‌زمینه"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "‏این گروه به فهرست رفقای شما اضافه شد."
+
+#, fuzzy
+msgid "Layout"
+msgstr "اسد"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "رنگ پس‌زمینه"
+
+#, fuzzy
+msgid "The background color of an expanded group"
+msgstr "رنگ پس‌زمینه"
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_باز کردن"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "انتخاب رنگ پس‌زمینه"
+
+#, fuzzy
+msgid "The background color of a collapsed group"
+msgstr "رنگ پس‌زمینه"
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_جمع کردن"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "انتخاب رنگ پس‌زمینه"
+
+#, fuzzy
+msgid "The background color of a contact or chat"
+msgstr "رنگ پس‌زمینه"
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "میانبرها"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "برخط"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "گرفتن اطلاعات دربارهٔ رفیق انتخاب شده"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "رفته"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "گرفتن اطلاعات دربارهٔ رفیق انتخاب شده"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "برون‌خط"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "گرفتن اطلاعات دربارهٔ رفیق انتخاب شده"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "گروه خون"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "گرفتن اطلاعات دربارهٔ رفیق انتخاب شده"
+
+msgid "Message Text"
+msgstr "متن پیغام"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "متن پیغام"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "تغییر اطلاعات کاربر %s"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -10983,14 +11055,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "دعوت رفیق به اتاق گپ"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"لطفاً نام کاربری را که مایلید از او دعوت کنید، در صورت تمایل همراه با پیغام "
-"دعوت‌نامه، وارد کنید."
-
 msgid "_Buddy:"
 msgstr "_رفیق:"
 
@@ -11019,7 +11083,8 @@ msgstr "نادیده گرفتن"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "آخرین گفته"
 
 msgid "Unable to save icon file to disk."
@@ -11066,6 +11131,22 @@ msgstr "/گفتگو/_ذخیره با نام..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/گفتگو/پا_ک کردن پیغام‌های گذشته"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/گفتگو/_بیشتر"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/گفتگو/_بیشتر"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/گفتگو/_بیشتر"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/گفتگو/نمایش _تاریخچه"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/گفتگو/_فرستادن پرونده...."
 
@@ -11139,6 +11220,18 @@ msgstr "/گفتگو"
 msgid "/Conversation/View Log"
 msgstr "/گفتگو/نمایش تاریخچه"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/گفتگو/بیشتر"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/گفتگو/نمایش تاریخچه"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/گفتگو/بیشتر"
+
 msgid "/Conversation/Send File..."
 msgstr "/گفتگو/فرستادن پرونده..."
 
@@ -11322,6 +11415,9 @@ msgstr "هنرمندان"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "پشتیبانی"
 
@@ -11448,6 +11544,10 @@ msgstr "هندی"
 msgid "Hungarian"
 msgstr "مجاری"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "رومانیایی"
+
 msgid "Indonesian"
 msgstr "اندونزیایی"
 
@@ -11464,6 +11564,10 @@ msgstr "گرجی"
 msgid "Ubuntu Georgian Translators"
 msgstr "مترجمان فعلی"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "دیگر"
+
 msgid "Kannada"
 msgstr "کناره‌ای"
 
@@ -11487,6 +11591,10 @@ msgid "Macedonian"
 msgstr "مقدونی"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "مقدونی"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "نروژی"
 
@@ -11542,6 +11650,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "سوئدی"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "تامیلی"
 
@@ -11602,7 +11713,24 @@ msgstr ""
 "ارائه نمی‌کنیم."
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin در irc.freenode.net<BR><BR"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin در irc.freenode.net<BR><BR"
 
 msgid "Current Developers"
@@ -11864,7 +11992,7 @@ msgid "Hyperlink visited color"
 msgstr "رنگ پیوند"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "رنگ پیوندهای اینترنتی وقتی موشی روی آنها قرار می‌گیرد."
 
 msgid "Hyperlink prelight color"
@@ -11902,15 +12030,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "حذف اطلاع"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "اطلاع‌های نامهٔ جدید"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11923,15 +12058,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "اطلاع‌های نامهٔ جدید"
 
-msgid "_Copy Email Address"
-msgstr "_نسخه‌برداری از نشانی پست الکترونیکی"
-
-msgid "_Open Link in Browser"
-msgstr "_باز کردن پیوند در مرورگر"
-
-msgid "_Copy Link Location"
-msgstr "_نسخه‌برداری از مکان پیوند"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11973,11 +12099,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "ذخیرهٔ تصویر"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_ذخیرهٔ تصویر..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "نمایش صورتک‌های سفارشی"
 
@@ -12070,10 +12195,6 @@ msgid "Font Face"
 msgstr "شکل قلم"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "رنگ پس‌زمینه"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "رنگ قلم پیش‌زمینه"
 
@@ -12207,6 +12328,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12234,6 +12356,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12292,11 +12415,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "خوک"
 
-msgid "Open All Messages"
-msgstr "همهٔ پیغام‌ها باز شوند"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">نامه دارید!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "در حال محاسبه"
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12323,6 +12462,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "فرمان مرورگر «دستی» انتخاب شده است، ولی فرمانی تنظیم نشده است."
 
+#, fuzzy
+msgid "No message"
+msgstr "(۱ پیغام)"
+
+msgid "Open All Messages"
+msgstr "همهٔ پیغام‌ها باز شوند"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">نامه دارید!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "کمینِ رفیق جدید"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">نامه دارید!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "متصل شونده‌های زیر از حافظه خارج خواهند شد."
 
@@ -12375,10 +12535,17 @@ msgstr "<b>جزئیات متصل شونده</b>"
 msgid "Select a file"
 msgstr "یک پرونده انتخاب کنید"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "ویرایش کمینِ رفیق"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "کمین برای"
 
+msgid "_Account:"
+msgstr "_حساب:"
+
 msgid "_Buddy name:"
 msgstr "_نام رفیق:"
 
@@ -12446,7 +12613,60 @@ msgstr "_تکراری"
 msgid "Pounce Target"
 msgstr "هدف حمله"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "شروع به تایپ کردن می‌کند"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "هنگام تایپ مکث می‌کند"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "وارد سیستم می‌شود"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "با_زگشت از بی‌کاری"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "بازمی‌گردد"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "تایپ کردن را متوقف کرد"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "از سیستم  خارج می‌شود"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "بی‌کار می‌شود"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "وقتی نیستید"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "فرستادن پیغام"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "رویداد کمین نامعلوم. لطفاً این را گزارش کنید!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "درآوردن تم صورتک‌ها از بسته شکست خورد."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "درآوردن تم صورتک‌ها از بسته شکست خورد."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "درآوردن تم صورتک‌ها از بسته شکست خورد."
 
 msgid "Install Theme"
@@ -12470,6 +12690,12 @@ msgstr "میانبرها"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "گفتگوها با %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "فهرست رفقا"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "شمایل محوطهٔ اعلانات"
 
@@ -12479,8 +12705,9 @@ msgstr "_نمایش شمایل محوطهٔ اعلانات:"
 msgid "On unread messages"
 msgstr "برای ‌پیغام‌های خوانده نشده"
 
-msgid "Conversation Window Hiding"
-msgstr "مخفی کردن پنجره‌های گفتگو"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "پنجره‌های گفتگوی پیغام اینترنتی"
 
 msgid "_Hide new IM conversations:"
 msgstr "_مخفی کردن گفتگوهای پیغام‌های اینترنتی جدید:"
@@ -12488,6 +12715,10 @@ msgstr "_مخفی کردن گفتگوهای پیغام‌های اینترنتی
 msgid "When away"
 msgstr "وقتی نیستید"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "پنجرهٔ گفتگو _بالا آورده شود"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12548,10 +12779,6 @@ msgstr "استفاده از لغزش نرم"
 msgid "F_lash window when IMs are received"
 msgstr "_چشمک زدن پنجره وقتی پیغام‌های اینترنتی دریافت می‌شوند"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "پنجرهٔ گفتگو _بالا آورده شود"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12587,13 +12814,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "نمی‌توان اطلاعات کاربر را گرفت"
 
-msgid "ST_UN server:"
-msgstr "_کارگزار STUN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">مثال: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "تشخیص _خودکار نشانی IP"
 
 msgid "Public _IP:"
@@ -12614,6 +12839,10 @@ msgstr "درگاه _شروع:"
 msgid "_End port:"
 msgstr "درگاه _پایان:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "کارگزار پیشکار"
@@ -12643,6 +12872,10 @@ msgstr "کارگزار پیشکار"
 msgid "No proxy"
 msgstr "بدون پیشکار"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_کاربر:"
 
@@ -12807,13 +13040,13 @@ msgstr "وقتی نیستید و بی‌کارید"
 msgid "Auto-away"
 msgstr "رفتن خودکار"
 
-msgid "Change status when _idle"
-msgstr "تغییر وضعیت _هنگام بی‌کار شدن"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_تعداد دقایق تا تغییر وضعیت:"
 
+msgid "Change status when _idle"
+msgstr "تغییر وضعیت _هنگام بی‌کار شدن"
+
 msgid "Change _status to:"
 msgstr "تغییر _وضعیت به:"
 
@@ -12964,29 +13197,19 @@ msgstr "_ذخیره و استفاده"
 msgid "Status for %s"
 msgstr "وضعیت %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "درج صورتک"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "تصحیح مقادیر تکراری"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "لطفاً برای %s نام جدیدی وارد کنید"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "درج صورتک"
@@ -12996,21 +13219,29 @@ msgid "Add Smiley"
 msgstr "لبخند!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "ذخیرهٔ تصویر"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "میانبرها"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "لبخند!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "میانبرها"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "انتخاب رفیق"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13099,9 +13330,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "نمی‌توان راه‌انداز را فرستاد"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "شما یک راه‌انداز رومیزی را برداشته‌اید. به احتمال زیاد منظورتان ارسال چیزی است "
 "که این راه‌انداز به آن اشاره می‌کند."
@@ -13135,6 +13367,16 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_باز کردن پیوند در:"
+
+msgid "_Copy Link Location"
+msgstr "_نسخه‌برداری از مکان پیوند"
+
+msgid "_Copy Email Address"
+msgstr "_نسخه‌برداری از نشانی پست الکترونیکی"
+
 msgid "Save File"
 msgstr "ذخیرهٔ پرونده"
 
@@ -13232,6 +13474,79 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "نشانی کارگزار"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "کارگزار کنفرانس را وارد کنید"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "کارگزار کنفرانسی برای پرس‌وجو انتخاب کنید"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "سرویس‌های برخط"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "فرستادن فهرست رفقا"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "می‌رود"
+
+#, fuzzy
+msgid "Directory"
+msgstr "شاخهٔ ثبت وقایع"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "انتخاب صدا"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>شرح:</b> عصبی"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "تنظیم اطلاعات دفترچهٔ راهنمای کاربران"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_مرورگر:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "کاربر وجود ندارد"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "کارگزار از هیچ روش تأیید هویت پشتیبانی شده‌ای استفاده نمی‌کند"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "تنظیم اطلاعات دفترچهٔ راهنمای کاربران"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کارگیرها یا کارگزارهای XMPP مفید است."
+
 msgid "Buddy is idle"
 msgstr "رفیقتان بی‌کار است"
 
@@ -13623,9 +13938,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "متصل شوندهٔ پیغام‌رسانی موسیقیایی برای آهنگ‌سازی چند نفری."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "با متصل شوندهٔ پیغام‌رسانی موسیقیایی چند کاربر می‌توانند هم‌زمان روی یک قطعهٔ "
 "موسیقی کار کنند."
@@ -13742,12 +14058,6 @@ msgstr ""
 "‐ به محض این که هر یک از رفقای موجود در فهرست شما وارد سیستم شدند پیغامی "
 "برایشان می‌فرستد"
 
-msgid "Cursor Color"
-msgstr "رنگ مکان‌نما"
-
-msgid "Secondary Cursor Color"
-msgstr "رنگ مکان‌نمای فرعی"
-
 msgid "Hyperlink Color"
 msgstr "رنگ پیوند اینترنتی"
 
@@ -13759,6 +14069,10 @@ msgstr "رنگ پیوند اینترنتی"
 msgid "Highlighted Message Name Color"
 msgstr "پر رنگ کردن پیغام‌ها"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "حذف اطلاع"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "جداسازی افقی نمای درختی GTK"
 
@@ -13788,35 +14102,24 @@ msgstr "قلم واسط GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "تم میان‌بر متنی GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "رنگ‌های واسط"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "اطلاع‌های نامهٔ جدید"
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "کنترل تم GTK+ پیجین"
 
-msgid "Widget Sizes"
-msgstr "اندازهٔ ویجت‌ها"
+#, fuzzy
+msgid "Colors"
+msgstr "بستن"
 
 msgid "Fonts"
 msgstr "قلم‌ها"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13907,7 +14210,7 @@ msgstr "مخفی کردن پنجره‌های گفتگو"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13962,6 +14265,113 @@ msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "جای‌گزینی متن در پیغام‌های ارسالی با توجه به قوانین تعریف شده توسط کاربر."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "وارد سیستم نشده است"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s از سیستم خارج شد."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "پیوستن به گپ"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "نادیده گرفتن"
+
+#, fuzzy
+msgid "Founder"
+msgstr "بلندتر"
+
+#, fuzzy
+msgid "Operator"
+msgstr "اُپرا"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "اجازه داده شد"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "خطا"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "اطلاعات"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "محاورهٔ درخواست"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "سطح اخطار"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "وضعیت %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "شرایط محلی اتاق گپ"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "ذخیرهٔ شمایل"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "کنترل تم GTK+ پیجین"
+
+#, fuzzy
+msgid "Contact"
+msgstr "اطلاعات حساب"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "فهرست رفقا"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "فهرست رفقا"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "کنترل تم GTK+ پیجین"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "کنترل تم GTK+ پیجین"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14123,9 +14533,6 @@ msgstr "رو نگه داشتن پنجرهٔ فهرست رفقا_:"
 msgid "Only when docked"
 msgstr "فقط وقتی جدا شده است"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_چشمک زدن پنجره وقتی پیغام‌های گپ دریافت می‌شود"
-
 #, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "گزینه‌های پیجین"
@@ -14133,8 +14540,9 @@ msgstr "گزینه‌های پیجین"
 msgid "Options specific to Pidgin for Windows."
 msgstr "گزینه‌های خاص پیجین برای ویندوز."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "گزینه‌های خاص پیجین ویندوزی مانند جدا کردن فهرست را فراهم می‌کند."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14175,6 +14583,525 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کارگیرها یا کارگزارهای XMPP مفید است."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "باز کردن سوکت ممکن نیست"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "گوش ایستادن روی سوکت ممکن نیست"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "خواندن سوکت ممکن نیست"
+
+#~ msgid "Connection failed."
+#~ msgstr "اتصال شکست خورد."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "اتصال کارگزار قطع شده است"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "ایجاد سوکت ممکن نیست"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "نمی‌توان به میزبان متصل شد"
+
+#~ msgid "Read error"
+#~ msgstr "خطای خواندن"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "برقراری اتصال با کارگزار ممکن نیست.\n"
+#~ "‏%s"
+
+#~ msgid "Write error"
+#~ msgstr "خطای نوشتن"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "تنظیم اطلاعات دفترچهٔ راهنمای کاربران"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "ادامهٔ نشانی"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "اسم مستعار گپ"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "کاربر اطلاعاتی در دفترچهٔ راهنمای کاربران ندارد."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "فرمان"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "خطای ثبت"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "مکان"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "جستجوی کاربر"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "اطلاع وضعیت رفیق"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "نسخهٔ پشتیبانی نشده"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "جهت"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "حالت‌های کاربر"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "محدودیت کاربران"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "قابلیت‌ها"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "نام کاربر"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "پیغام اینترنتی با تبادل کلید"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "نشانی پست الکترونیکی"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "تنظیم مجموعه تنظیمات"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "پیوستن"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "نام کاربر"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "ویدیوی زنده"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "پیغام دریافت می‌شود"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "پروندهٔ کلید عمومی"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "گزینه‌های کاربر"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "حالت‌های کاربر"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "نام کاربر"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "محدودیت کاربران"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "رمزنگاری Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "خطای خواندن"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "اتصال به کارگزار شکست خورد."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "صف پر است"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "نمی‌توان پیغام را تجزیه کرد"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "نمی‌توان به میزبان متصل شد"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "ورود به سیستم شکست خورد (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "اتصال به کارگزار ممکن نیست."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "شما از سیستم خارج شدید چون در ایستگاه کاری دیگری وارد سیستم شده‌اید."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "خطا. پشتیبانی SSL نصب نشده است."
+
+#~ msgid "Incorrect password."
+#~ msgstr "گذرواژهٔ نادرست"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "نمی‌توان به کارگزار BOS متصل شد:\n"
+#~ "‏%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "ممکن است به زودی ارتباط شما قطع شود. برای دیدن به‌هنگام‌سازی‌ها %s را ببینید."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "نمی‌توان متصل شد"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "نام نامعتبر"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "نمی‌توان اطلاعات کارگزار را گرفت"
+
+#~ msgid "Connection lost"
+#~ msgstr "اتصال قطع شد"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "تحویل نام میزبان ممکن نیست"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "اتصال بسته شد (در حال نوشتن)"
+
+#~ msgid "Connection reset"
+#~ msgstr "اتصال از نو آغاز شد"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "خطا هنگام خواندن از سوکت: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "اتصال به میزبان ممکن نیست"
+
+#~ msgid "Could not write"
+#~ msgstr "نمی‌توان نوشت"
+
+#~ msgid "Could not connect"
+#~ msgstr "متصل نشد"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "ایجاد سوکت پایش ممکن نیست"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "تحویل نام میزبان ممکن نیست"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "گذرواژهٔ نادرست"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "برقراری اتصال با کارگزار ممکن نیست.\n"
+#~ "‏%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "‏یاهوی ژاپن"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "کارگزار پِی‌جوی ژاپن"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "کارگزار انتقال پروندهٔ ژاپن"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "اتصال به کارگزار قطع شد\n"
+#~ "‏%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "تحویل نام میزبان ممکن نیست"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "کارگزار برای ورود به سیستم TLS/SSL لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "مخفی کردن پنجره‌های گفتگو"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "لطفاً برای %s نام جدیدی وارد کنید"
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "فعال‌سازی کدام شناسه؟"
+
+#~ msgid "Cursor Color"
+#~ msgstr "رنگ مکان‌نما"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "رنگ مکان‌نمای فرعی"
+
+#~ msgid "Interface colors"
+#~ msgstr "رنگ‌های واسط"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "اندازهٔ ویجت‌ها"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "پیغامِ تَرک"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "لطفاً نام کاربری را که مایلید از او دعوت کنید، در صورت تمایل همراه با "
+#~ "پیغام دعوت‌نامه، وارد کنید."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "انتخاب دفترچهٔ نشانی نوتز"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "ممکن است به‌زودی ارتباط شما قطع شود. شاید مایل باشید تا زمان تعمیر، از TOC "
+#~ "استفاده کنید. برای به‌هنگام‌سازی %s را ببینید."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "اضافه کردن رفیق"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "نمی‌توان اطلاعات کارگزار را گرفت"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "خطای خواندن"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "اتصال به کارگزار قطع شد:\n"
+#~ "‏%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "اتصال کارگزار"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "'گرفتن نام شکست خورد: %s"
+
+#~ msgid "Looking up %s"
+#~ msgstr "در حال جستجوی %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "اتصال به %s شکست خورد"
+
+#~ msgid "Signon: %s"
+#~ msgstr "ورود به سیستم: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "نوشتن پروندهٔ %s ممکن نیست."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "خواندن پروندهٔ %s ممکن نیست."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "پیغام خیلی طولانی است، %s بایت آخر قیچی شد."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s در حال حاضر وارد سیستم نشده است."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "اخطار %s مجاز نیست."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "یک پیغام جا افتاد، شما از محدودهٔ سرعت کارگزار فراتر رفته‌اید."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "گپ در %s موجود نیست."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "شما پیغام‌های را با سرعت خیلی زیادی به %s ارسال می‌کنید."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "یک پیغام اینترنتی از %s را دریافت نکردید چون خیلی بزرگ بود."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "یک پیغام اینترنتی از %s را دریافت نکردید چون خیلی سریع بود."
+
+#~ msgid "Failure."
+#~ msgstr "شکست."
+
+#~ msgid "Too many matches."
+#~ msgstr "تعداد مطابقت‌ها خیلی زیاد است."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "وصف‌کننده‌های بیشتری لازم است."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "سرویس دفترچهٔ راهنمای کاربران به طور موقت قابل دسترسی نیست."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "گشتن به دنبال نشانی پست الکترونیکی محدود شده است."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "کلیدواژه نادیده گرفته شد."
+
+#~ msgid "No keywords."
+#~ msgstr "بدون کلیدواژه."
+
+#~ msgid "User has no directory information."
+#~ msgstr "کاربر اطلاعاتی در دفترچهٔ راهنمای کاربران ندارد."
+
+#~ msgid "Country not supported."
+#~ msgstr "کشور پشتیبانی نمی‌شود."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "شکست نامعلوم: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "نام کاربری یا گذرواژهٔ نادرست."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "این سرویس موقتاً موجود نیست."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr ""
+#~ "سطح اخطار شما در حال حاضر بالاتر از آن است که بتوانید وارد سیستم شوید."
+
+#~ 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 ""
+#~ "شما دفعات خیلی زیادی متناوباً وارد سیستم شده و از آن خارج شده‌اید. ده دقیقه "
+#~ "صبر کرده و بعد دوباره امتحان کنید. اگر به تلاش ادامه دهید، باید حتی بیش "
+#~ "از این صبر کنید."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "خطای نامعلومی در ورود به سیستم رخ داد: %s"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "خطای نامعلومی، %Id، رخ داد. اطلاعات: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "نام گروه نامعتبر"
+
+#~ msgid "Connection Closed"
+#~ msgstr "اتصال بسته شد"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "در انتظار پاسخ..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "مکث TOC به پایان رسید.حالا می‌توانید دوباره پیغام بفرستید."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "تغییر گذرواژه موفقیت‌آمیز بود"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "گرفتن اطلاعات دفترچهٔ راهنمای کاربران"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "تنظیم اطلاعات دفترچهٔ راهنمای کاربران"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "نمی‌توان %s را برای نوشتن باز کرد!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "انتقال پرونده شکست خورد؛ احتمالاً طرف دیگر انصراف داده است."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "نمی‌توان برای انتقال متصل شد."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "نمی‌توان سرصفحهٔ پرونده را نوشت. پرونده انتقال نخواهد یافت."
+
+#~ msgid "Save As..."
+#~ msgstr "ذخیره به نام..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "‏%s از %s می‌خواهد %Id پرونده را بپذیرد: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "‏%s از شما درخواست کرده است برایش پرونده‌ای بفرستید"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "متصل شوندهٔ قرارداد TOC"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "اطلاعات کاربر برای %s موجود نیست"
+
+#~ msgid "%s Options"
+#~ msgstr "گزینه‌های %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "گزینه‌های پیشکار"
+
+#~ msgid "By log size"
+#~ msgstr "از روی اندازهٔ تاریخچه"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_باز کردن پیوند در مرورگر"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "_کارگزار STUN:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "ذخیرهٔ تصویر"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "میانبرها"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_چشمک زدن پنجره وقتی پیغام‌های گپ دریافت می‌شود"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "گروهی به این نام از قبل وجود دارد"
 
@@ -14271,13 +15198,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Change Qun information"
 #~ msgstr "اطلاعات کانال"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "‏%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "پیغام سیستم"
 
@@ -14484,9 +15404,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "مدیر %Id درخواست شما را برای پیوستن به گروه %Id تأیید کرده است"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "‏این گروه به فهرست رفقای شما اضافه شد."
-
 #~ msgid "I am applying to join"
 #~ msgstr "من برای پیوستن درخواست داده‌ام"
 
@@ -14511,10 +15428,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Enter your reason:"
 #~ msgstr "دلیل‌تان را وارد کنید:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "خطای هنگام ایجاد اتصال"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "نمی‌توان وارد سیستم شد، تاریخچهٔ اشکال‌زدایی را بررسی کنید"
 
@@ -14631,17 +15544,9 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgstr "توکن فعلی"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "اتصال به کارگزار ممکن نیست."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_پیغام:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "حساب:"
-
 #~ msgid "Toggle offline buddies"
 #~ msgstr "ضامن رفقای برون‌خط"
 
@@ -14967,13 +15872,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>شرح:</b> عصبی"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15175,8 +16073,8 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "وقتی این اتفاق می‌افتد TOC همهٔ پیغام‌هایی را که به آن فرستاده می‌شود نادیده "
 #~ "می‌گیرد، و اگر پیغامی ارسال کنید ممکن است شما را بیرون بیندازد. گیم جلوی "
@@ -15188,8 +16086,8 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "روش تأیید هویت عادی شکست خورد. دلیل این مسئله یا غلط بودن گذرواژهٔ شما و "
 #~ "یا تغییر شِمای تأیید هویت Yahoo!‎ است. گِیم تلاش خواهد کرد با استفاده از "
@@ -15202,25 +16100,14 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "g003: Error opening connection.\n"
 #~ msgstr "‏g003: خطای آغاز کردن اتصال.\n"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s از سیستم خارج شد."
-
 #~ msgid "Screen Name:"
 #~ msgstr "نام کاربری:"
 
 #, fuzzy
-#~ msgid "Background color name"
-#~ msgstr "رنگ پس‌زمینه"
-
-#, fuzzy
 #~ msgid "Background color as a string"
 #~ msgstr "رنگ پس‌زمینه"
 
 #, fuzzy
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "رنگ پس‌زمینه"
-
-#, fuzzy
 #~ msgid "Background set"
 #~ msgstr "رنگ پس‌زمینه"
 
@@ -15419,9 +16306,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Away title: "
 #~ msgstr "عنوان رفته:"
 
-#~ msgid "Buddy List Error"
-#~ msgstr "خطای فهرست رفقا"
-
 #~ msgid "(+%d more)"
 #~ msgstr "(+%Id بیشتر)"
 
@@ -15581,9 +16465,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "فرستادن پیغام به رفیق انتخاب شده"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "گرفتن اطلاعات دربارهٔ رفیق انتخاب شده"
-
 #~ msgid "_Chat"
 #~ msgstr "_گپ"
 
@@ -15723,9 +16604,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "_Idle"
 #~ msgstr "_بی‌کار"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "با_زگشت از بی‌کاری"
-
 #~ msgid "Pounce Action"
 #~ msgstr "کنشِ حمله"
 
@@ -15853,9 +16731,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Summary"
 #~ msgstr "خلاصه"
 
-#~ msgid "Message Text"
-#~ msgstr "متن پیغام"
-
 #~ msgid "Please create an account."
 #~ msgstr "لطفاً یک حساب ایجاد کنید."
 
@@ -15911,8 +16786,8 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgstr "نمی‌توان ترجیحات را بار کرد"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
 #~ "گیم نمی‌تواند ترجیحات شما را بار کند چون در قالب قدیمی‌ای که دیگر استفاده "
@@ -15931,9 +16806,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Invisible for friends only"
 #~ msgstr "نامرئی فقط برای دوستان"
 
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "تحویل نام میزبان ممکن نیست."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "خطا هنگام نوشتن در سوکت."
 
@@ -16017,15 +16889,15 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgstr "دسترسی به شاخه ممکن نیست"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "گیم نتوانست در دفترچهٔ راهنمای کاربران جستجو کند چون نمی‌توانست به کارگزار "
 #~ "دفترچهٔ راهنمای کاربران متصل شود. لطفاً کمی بعد دوباره امتحان کنید."
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
 #~ "به دلیل اشکال در اتصال به کارگزار Gadu-Gadu گیم نتوانست گذرواژهٔ شما را "
 #~ "تغییر دهد. لطفاً کمی بعد دوباره امتحان کنید."
@@ -16037,8 +16909,8 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgstr "دسترسی به مجموعه تنظیمات کاربر ممکن نیست."
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "به علت وجود خطایی در اتصال به کارگزار دفترچهٔ راهنمای کاربران، گیم نتوانست "
 #~ "به مجموعه تنظیمات این کاربر دسترسی پیدا کند. لطفاً کمی دیرتر دوباره تلاش "
@@ -16173,9 +17045,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid_plural "(%d messages)"
 #~ msgstr[0] "(%Id پیغام)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(۱ پیغام)"
-
 #~ msgid "%s logged in."
 #~ msgstr "‏%s وارد سیستم شد."
 
diff --git a/po/fi.po b/po/fi.po
index 083cc974a6..ef27af497c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
-# Pidgin Finnish translation
+# Piidgin Finnish translation
 # Copyright (C) 2002 Tero Kuusela <teroajk@subdimension.com>
 # Copyright (C) 2003-2005 Arto Alakulju <arto@alakulju.net>
-# Copyright (C) 2005-2008 Timo Jyrinki <timo.jyrinki@iki.fi>
+# Copyright (C) 2005-2009 Timo Jyrinki <timo.jyrinki@iki.fi>
 #
 # This file is distributed under the same license as the Pidgin package.
 #
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-07 13:30+0200\n"
-"PO-Revision-Date: 2009-01-23 19:58+0200\n"
+"POT-Creation-Date: 2009-07-16 21:37+0300\n"
+"PO-Revision-Date: 2009-07-16 21:36+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -43,7 +43,7 @@ msgstr ""
 "Käyttö: %s [VALITSIN]...\n"
 "\n"
 "  -c, --config=HAK    käytä hakemistoa HAK asetustiedostoille\n"
-"  -d, --debug         kirjoita virheenjäljitysviestit putkeen stdout\n"
+"  -d, --debug         kirjoita virheenjäljitysviestit putkeen stderr\n"
 "  -h, --help          näytä tämä ohje ja poistu\n"
 "  -n, --nologin       älä kirjaudu automaattisesti\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
@@ -608,19 +608,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Lähetä käyttäjälle"
 
-msgid "Invite message"
-msgstr "Kutsuviesti"
-
-msgid "Invite"
-msgstr "Kutsu"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen \n"
-"kutsuviesti."
-
 msgid "Conversation"
 msgstr "Keskustelu"
 
@@ -880,6 +867,40 @@ msgstr "Kaikki keskustelut"
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
+msgid "Calling ... "
+msgstr "Soitetaan..."
+
+msgid "Hangup"
+msgstr "Katkaise"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Hyväksy"
+
+msgid "Reject"
+msgstr "Kieltäydy"
+
+msgid "Call in progress."
+msgstr "Puhelu käynnissä."
+
+msgid "The call has been terminated."
+msgstr "Puhelu on päättynyt."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s haluaa aloittaa ääni-istunnon kanssasi."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+"%s yrittää aloittaa kanssasi mediaistuntoa, jonka tyyppi ei ole tuettu."
+
+msgid "You have rejected the call."
+msgstr "Olet hylännyt puhelun."
+
+msgid "call: Make an audio call."
+msgstr "call: Tee äänipuhelu."
+
 msgid "Emails"
 msgstr "Sähköpostit"
 
@@ -914,6 +935,9 @@ msgstr "Jatka"
 msgid "IM"
 msgstr "Pikaviesti"
 
+msgid "Invite"
+msgstr "Kutsu"
+
 msgid "(none)"
 msgstr "(ei mitään)"
 
@@ -1118,7 +1142,6 @@ msgstr "%s on poissa. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s on lähettämässä sinulle viestiä. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Raportoi tästä!"
 
@@ -1164,7 +1187,6 @@ msgstr "Minuutteja ennen tilan asetusta"
 msgid "Change status to"
 msgstr "Vaihda tila seuraavaksi"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Keskustelut"
 
@@ -1529,6 +1551,31 @@ msgstr "GntLastLog"
 msgid "Lastlog plugin."
 msgstr "Lastlog-liitännäinen."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Noudetaan TinyURL-osoitetta..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Luo TinyURL vain tämän pituisille tai pidemmille osoitteille"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL:n (tai muun) osoite-etuliite"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL-liitännäinen"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"Vastaanotettaessa viestiä jossa on URL-osoitteita, käytä TinyURL-palvelua "
+"helpompaa kopiomista varten"
+
 msgid "accounts"
 msgstr "käyttäjätilit"
 
@@ -1629,13 +1676,6 @@ msgstr "Hyväksy varmenne kohteelle %s?"
 msgid "SSL Certificate Verification"
 msgstr "SSL-varmenteen tarkistus"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Hyväksy"
-
-msgid "Reject"
-msgstr "Kieltäydy"
-
 msgid "_View Certificate..."
 msgstr "_Näytä varmenne..."
 
@@ -1735,6 +1775,7 @@ msgstr "+++ %s kirjautui sisään"
 msgid "+++ %s signed off"
 msgstr "+++ %s kirjautui ulos"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -1781,6 +1822,15 @@ msgstr "%s poistui huoneesta."
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
+msgid "Invite to chat"
+msgstr "Kutsu keskusteluun"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Yhteyden saaminen epäonnistui: %s"
@@ -1913,6 +1963,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Aloitetaan tiedoston %s siirto käyttäjältä %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Tiedoston <A HREF=\"file://%s\">%s</A> siirto valmis"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Tiedoston %s siirto valmis"
 
@@ -2125,6 +2179,9 @@ msgstr "<font color=\"red\"><b>Ei voi lukea tiedostoa: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Virhe luotaessa konferenssia."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Käytät: %s, mutta tämä liitännäinen vaatii: %s."
@@ -2526,16 +2583,17 @@ msgstr "Sisällyttää muiden pikaviestinohjelmien lokit lokikatselimeen."
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Katsottaessa lokeja tämä liitännäinen sisällyttää niihin myös muiden "
 "pikaviestinohjelmien lokit. Tällä hetkellä tuettuina ovat Adium, MSN "
-"Messenger ja Trillian.\n"
+"Messenger, aMSN ja Trillian.\n"
 "\n"
-"Varoitus: Tämä liitännäinen on vielä kehitysasteella ja voi kaatua usein."
+"Varoitus: Tämä liitännäinen on vielä kehitysasteella ja voi kaatua usein. "
+"Käytä sitä omalla vastuulla!"
 
 msgid "Mono Plugin Loader"
 msgstr "Mono-liitännäisen lataaja"
@@ -2583,11 +2641,11 @@ msgstr ""
 "tuttavailmoittimen avulla."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Loput viesteistä tallennetaan ilmoittimeen. Voit muokata/poistaa sen "
-"\"Tuttavailmoittimet\"-valintaikkunasta."
+"Loput viesteistä tallennetaan ilmoittimina. Voit muokata/poistaa sen "
+"ilmoittimen ”Tuttavailmoittimet”-valintaikkunasta."
 
 #, c-format
 msgid ""
@@ -2617,6 +2675,34 @@ msgstr "Tallenna yhteydettömät viestit ilmoittimeen"
 msgid "Do not ask. Always save in pounce."
 msgstr "Älä kysy. Tallenna aina ilmoittimeen."
 
+msgid "One Time Password"
+msgstr "Kertasalasana"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Kertasalasanan tuki"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Pakota käyttöön salasanat, joita käytetään vain kerran."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Mahdollistaa tilikohtaisen tallentamattomien salasanojen käytön vain yhteen "
+"onnistuneeseen yhteyteen.\n"
+"Huomioitavaa: Tilin salasanaa ei tule tallentaa, jotta tämä toimisi."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2811,22 +2897,20 @@ msgstr ""
 "ActiveTCL osoitteesta http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Apple Bonjour for Windows -työkalupakettia ei löytynyt, tarkista usein "
-"kysytyt kysymykset osoitteessa http://developer.pidgin.im/wiki/Using%"
-"20Pidgin#CanIusePidginforBonjourLink-LocalMessaging ."
+"Applen ”Bonjour for Windows” -työkalupakettia ei löytynyt, katso lisätietoja "
+"osoitteesta http://d.pidgin.im/BonjourWindows."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Sisääntulevia pikaviestintäyhteyksiä ei voi kuunnella\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Sisääntulevia pikaviestintäyhteyksiä ei voi kuunnella"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Paikalliseen mDNS-palvelimeen ei voi luoda yhteyttä. Onko se käynnissä?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Etunimi"
 
@@ -2858,6 +2942,10 @@ msgstr "Bonjour-yhteyskäytäntöliitännäinen"
 msgid "Purple Person"
 msgstr "Purple-henkilö"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "Paikallinen portti"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2868,14 +2956,17 @@ msgstr "%s on sulkenut keskustelun."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Viestiä ei voi lähettää, keskustelua ei voi aloittaa."
 
-msgid "Cannot open socket"
-msgstr "Pistoketta ei voi avata"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Pistokkeen luonti epäonnistui: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Pistoketta ei voi liittää porttiin"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Pistoketta ei voi liittää porttiin: %s"
 
-msgid "Could not listen on socket"
-msgstr "Pistoketta ei voi kuunnella"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Pistokkeen kuuntelu epäonnistui: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Virhe viestittäessä paikallisen mDNSResponderin kanssa."
@@ -2923,14 +3014,15 @@ msgstr "Tallenna tuttavat..."
 msgid "Load buddylist from file..."
 msgstr "Tuo tuttavat tiedostosta..."
 
-msgid "Fill in the registration fields."
-msgstr "Täytä rekisteröitymiskentät."
+msgid "You must fill in all registration fields"
+msgstr "Täytä kaikki rekisteröitymiskentät"
 
-msgid "Passwords do not match."
-msgstr "Salasanat eivät täsmää."
+msgid "Passwords do not match"
+msgstr "Salasanat eivät täsmää"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Uuden käyttäjätilin rekisteröinti epäonnistui virheen takia.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+"Uuden käyttäjätilin rekisteröinti epäonnistui tuntemattoman virheen takia."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Uusi Gadu-Gadu-käyttäjätili rekisteröity"
@@ -2941,14 +3033,14 @@ msgstr "Rekisteröinti onnistui!"
 msgid "Password"
 msgstr "Salasana"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-msgid "Enter current token"
-msgstr "Syötä nykyinen poletti"
+msgid "Enter captcha text"
+msgstr "Syötä captcha-teksti"
 
-msgid "Current token"
-msgstr "Nykyinen poletti"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rekisteröi uusi Gadu-Gadu-käyttäjätili"
@@ -3001,6 +3093,15 @@ msgstr "Salasanan vaihto onnistui!"
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
+msgid "Password (retype)"
+msgstr "Salasana (uudelleen)"
+
+msgid "Enter current token"
+msgstr "Syötä nykyinen poletti"
+
+msgid "Current token"
+msgstr "Nykyinen poletti"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Syötä sekä nykyinen että uusi salasana tunnukselle: "
 
@@ -3014,6 +3115,7 @@ msgstr "Valitse ryhmäkeskustelu tuttavalle: %s"
 msgid "Add to chat..."
 msgstr "Lisää ryhmäkeskusteluun..."
 
+#. Global
 msgid "Available"
 msgstr "Tavoitettavissa"
 
@@ -3047,7 +3149,7 @@ msgstr "Käyttäjistä ei löytynyt osumia"
 msgid "There are no users matching your search criteria."
 msgstr "Hakuvalintojasi vastaavia käyttäjiä ei ole."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
 msgid "Buddy list downloaded"
@@ -3062,8 +3164,14 @@ msgstr "Tuttavat lähetettiin"
 msgid "Your buddy list was stored on the server."
 msgstr "Tuttavasi tallennettiin palvelimelle."
 
-msgid "Connection failed."
-msgstr "Yhteys epäonnistui."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Yhdistetty"
+
+msgid "Connection failed"
+msgstr "Yhteys epäonnistui"
 
 msgid "Add to chat"
 msgstr "Lisää ryhmäkeskusteluun"
@@ -3071,14 +3179,23 @@ msgstr "Lisää ryhmäkeskusteluun"
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Ei kyetty selvittämään palvelimen nimeä ”%s”: %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Yhdistetään"
+
 msgid "Chat error"
 msgstr "Keskusteluvirhe"
 
 msgid "This chat name is already in use"
 msgstr "Tämä keskustelunimi on jo käytössä"
 
-msgid "Not connected to the server."
-msgstr "Ei yhdistettynä palvelimeen."
+msgid "Not connected to the server"
+msgstr "Ei yhdistettynä palvelimeen"
 
 msgid "Find buddies..."
 msgstr "Etsi tuttavia..."
@@ -3119,6 +3236,9 @@ msgstr "Puolalainen suosittu pikaviestin"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-käyttäjä"
 
+msgid "GG server"
+msgstr "GG-palvelin"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
@@ -3133,7 +3253,7 @@ msgstr "Aihetta ei ole asetettu"
 msgid "File Transfer Failed"
 msgstr "Tiedostonsiirto epäonnistui"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Kuuntelevaa porttia ei voi avata."
 
 msgid "Error displaying MOTD"
@@ -3149,8 +3269,16 @@ msgstr "MOTD:tä ei ole assosioitu tälle yhteydelle."
 msgid "MOTD for %s"
 msgstr "MOTD %s:lle"
 
-msgid "Server has disconnected"
-msgstr "Palvelin on katkaissut yhteyden"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Yhteys palvelimeen katkesi: %s"
 
 msgid "View MOTD"
 msgstr "Näytä MOTD"
@@ -3161,25 +3289,23 @@ msgstr "_Kanava:"
 msgid "_Password:"
 msgstr "_Salasana:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Yhdistetään"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC-kutsumanimissä ja -palvelimissa ei saa olla välilyöntejä"
 
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-msgid "Couldn't create socket"
-msgstr "Pistokkeen luominen epäonnistui"
+msgid "Unable to connect"
+msgstr "Yhteyden muodostaminen epäonnistui"
 
-msgid "Couldn't connect to host"
-msgstr "Yhteyttä isäntään ei voi muodostaa"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Ei voi yhdistää: %s"
 
-msgid "Read error"
-msgstr "Virhe luettaessa"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Palvelin on katkaissut yhteyden"
 
 msgid "Users"
 msgstr "Käyttäjät"
@@ -3360,6 +3486,16 @@ msgstr ""
 "Palvelin hylkäsi valitsemasi tilinimen. Siinä on todennäköisesti kiellettyjä "
 "merkkejä."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Kutsumanimi ”%s” on jo käytössä."
+
+msgid "Nickname in use"
+msgstr "Kutsumanimi on käytössä"
+
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
@@ -3596,10 +3732,10 @@ msgstr "Ad-Hoc-komento epäonnistui"
 msgid "execute"
 msgstr "suorita"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Palvelin vaatii TSL/SSL-tuen kirjautumiseen. TLS/SSL-tukea ei löydy."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Palvelin vaatii TSL/SSL-tuen, mutta TLS/SSL-tukea ei löydy."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Salausta vaadittu, mutta TLS/SSL-tukea ei löydy."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3617,17 +3753,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"
 
-msgid "Invalid response from server."
-msgstr "Kelvoton vastaus palvelimelta."
+msgid "SASL authentication failed"
+msgstr "SASL-todennus epäonnistui"
+
+msgid "Invalid response from server"
+msgstr "Kelvoton vastaus palvelimelta"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Palvelin ei käytä mitään tuetuista tunnistautumismenetelmistä"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Salausta vaadittu, mutta sitä ei tueta tällä palvelimella."
+
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-msgid "SASL error"
-msgstr "SASL-virhe"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL-virhe: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "BOSH-yhteyshallinta lopetti istunnon."
+
+msgid "No session ID given"
+msgstr "Istuntotunnistetta ei annettu"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Tukematon versio BOSH-yhteyskäytännöstä"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Yhteyttä palvelimeen ei voi muodostaa"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Yhteyttä palvelimeen ei voi muodostaa: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "SSL-yhteyden muodostaminen ei onnistu"
 
 msgid "Full Name"
 msgstr "Koko nimi"
@@ -3695,158 +3857,8 @@ msgstr "Asiakasohjelma"
 msgid "Operating System"
 msgstr "Käyttöjärjestelmä"
 
-msgid "Last Activity"
-msgstr "Viimeisin aktiivisena olo"
-
-msgid "Service Discovery Info"
-msgstr "Palvelulöytötiedot"
-
-msgid "Service Discovery Items"
-msgstr "Palvelulöytökohteet"
-
-msgid "Extended Stanza Addressing"
-msgstr "Laajennettu raakalohko-osoitus"
-
-msgid "Multi-User Chat"
-msgstr "Monen käyttäjän keskustelu"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Monen käyttäjän keskustelun laajennetut läsnäolotiedot"
-
-msgid "In-Band Bytestreams"
-msgstr "In-band-tavujonot"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc-komennot"
-
-msgid "PubSub Service"
-msgstr "PubSub-palvelu"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5-tavujonot"
-
-msgid "Out of Band Data"
-msgstr "Out of band -tiedot"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Rekisteröinti \"in-band\""
-
-msgid "User Location"
-msgstr "Käyttäjän sijainti"
-
-msgid "User Avatar"
-msgstr "Käyttäjän hahmo"
-
-msgid "Chat State Notifications"
-msgstr "Keskustelun tilan ilmoitukset"
-
-msgid "Software Version"
-msgstr "Ohjelmistoversio"
-
-msgid "Stream Initiation"
-msgstr "Virtauksen alustus"
-
-msgid "File Transfer"
-msgstr "Tiedostonsiirto"
-
-msgid "User Mood"
-msgstr "Käyttäjän mieliala"
-
-msgid "User Activity"
-msgstr "Käyttäjän aktiivisuus"
-
-msgid "Entity Capabilities"
-msgstr "Entiteetin ominaisuudet"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Salatut istuntojen neuvottelut"
-
-msgid "User Tune"
-msgstr "Käyttäjänimi"
-
-msgid "Roster Item Exchange"
-msgstr "Tuttavaluetteloiden vaihto"
-
-msgid "Reachability Address"
-msgstr "Tavoitettavuusosoite"
-
-msgid "User Profile"
-msgstr "Käyttäjän profiili"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle-ääni"
-
-msgid "User Nickname"
-msgstr "Käyttäjän kutsumanimi"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle raaka-UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle-video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Viestikuittaukset"
-
-msgid "Public Key Publishing"
-msgstr "Julkisen avaimen julkaiseminen"
-
-msgid "User Chatting"
-msgstr "Käyttäjä keskustelee"
-
-msgid "User Browsing"
-msgstr "Käyttäjä selaa"
-
-msgid "User Gaming"
-msgstr "Käyttäjä pelaa"
-
-msgid "User Viewing"
-msgstr "Käyttäjä katselee"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Raakalohkojen salaus"
-
-msgid "Entity Time"
-msgstr "Entiteetin aika"
-
-msgid "Delayed Delivery"
-msgstr "Viivästetty toimitus"
-
-msgid "Collaborative Data Objects"
-msgstr "Yhteistyötä tekevät dataobjektit"
-
-msgid "File Repository and Sharing"
-msgstr "Tiedostovarasto ja jakaminen"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-palvelun löytäminen Jinglelle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Yksinkertaistettu salatun istunnon neuvottelu"
-
-msgid "Hop Check"
-msgstr "Hyppytarkistus"
-
-msgid "Capabilities"
-msgstr "Kyvyt"
+msgid "Local Time"
+msgstr "Paikallinen aika"
 
 msgid "Priority"
 msgstr "Tärkeys"
@@ -3854,6 +3866,13 @@ msgstr "Tärkeys"
 msgid "Resource"
 msgstr "Sijainti"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s sitten"
+
+msgid "Logged Off"
+msgstr "Kirjautunut ulos"
+
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
@@ -4020,28 +4039,24 @@ msgstr "Valitse konferenssipalvelin"
 msgid "Find Rooms"
 msgstr "Etsi huoneita"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Salausta vaadittu, mutta sitä ei tueta tällä palvelimella."
+msgid "Affiliations:"
+msgstr "Kytkökset:"
 
-msgid "Write error"
-msgstr "Virhe kirjoituksessa"
+msgid "No users found"
+msgstr "Käyttäjiä ei löytynyt"
 
-msgid "Ping timeout"
-msgstr "Pingin aikakatkaisu"
+msgid "Roles:"
+msgstr "Roolit:"
 
-msgid "Read Error"
-msgstr "Virhe luettaessa"
+msgid "Ping timed out"
+msgstr "Pingin aikakatkaisu"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Yhteyttä palvelimeen ei voi muodostaa:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Pistokkeen luonti epäonnistui"
+"Vaihtoehtoisia XMPP-yhteystapoja ei löytynyt suoran yhdistämisen "
+"epäonnistumisen jälkeen."
 
 msgid "Invalid XMPP ID"
 msgstr "Epäkelpo XMPP-ID"
@@ -4049,6 +4064,9 @@ msgstr "Epäkelpo XMPP-ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Epäkelpo XMPP-ID. Verkkoalue pitää olla asetettu."
 
+msgid "Malformed BOSH URL"
+msgstr "Viallisesti muodostettu BOSH-URL"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
@@ -4073,9 +4091,6 @@ msgstr "Rekisteröinnin poisto onnistui"
 msgid "Unregistration Failed"
 msgstr "Rekisteröinnin poisto epäonnistui"
 
-msgid "Already Registered"
-msgstr "Valmiiksi rekisteröity"
-
 msgid "State"
 msgstr "Lääni"
 
@@ -4088,6 +4103,9 @@ msgstr "Puhelin"
 msgid "Date"
 msgstr "Päiväys"
 
+msgid "Already Registered"
+msgstr "Valmiiksi rekisteröity"
+
 msgid "Unregister"
 msgstr "Rekisteröinnin poisto"
 
@@ -4115,6 +4133,9 @@ msgstr "Rekisteröi uusi tili kohteessa %s"
 msgid "Change Registration"
 msgstr "Muuta rekisteröitymistä"
 
+msgid "Malformed BOSH Connect Server"
+msgstr "Virheellisesti muodostettu BOSH-yhteyspalvein"
+
 msgid "Error unregistering account"
 msgstr "Virhe poistettaessa käyttäjätilin rekisteröitymistä"
 
@@ -4139,6 +4160,12 @@ msgstr "Palvelin ei tue estämistä"
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
+msgid "Mood"
+msgstr "Mieliala"
+
+msgid "Now Listening"
+msgstr "Kuuntelee nyt"
+
 msgid "Both"
 msgstr "molemmille"
 
@@ -4160,12 +4187,6 @@ msgstr "Ei mitään"
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-msgid "Mood"
-msgstr "Mieliala"
-
-msgid "Now Listening"
-msgstr "Kuuntelee nyt"
-
 msgid "Mood Text"
 msgstr "Mielialan teksti"
 
@@ -4208,9 +4229,6 @@ msgstr "Salasana vaihdettu"
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-msgid "Password (again)"
-msgstr "Salasana (uudelleen)"
-
 msgid "Change XMPP Password"
 msgstr "Vaihda XMPP-salasana"
 
@@ -4404,17 +4422,25 @@ msgid "Unable to ping user %s"
 msgstr "Käyttäjää %s ei voi pingata."
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Äänimerkkiä ei voi lähettää, koska mitään ei tiedetä käyttäjästä %s."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "Äänimerkkiä ei voi lähettää, koska käyttäjä %s voi olla poissa linjoilta."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Äänimerkkiä ei voi lähettää, koska käyttäjä %s ei tue sitä."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"Äänimerkkiä ei voi lähettää, koska käyttäjä %s ei tue sitä tai ei halua "
+"vastaanottaa äänimerkkejä tällä hetkellä."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Töötätään tuttavalle %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4426,8 +4452,33 @@ msgid "%s has buzzed you!"
 msgstr "%s on töötännyt sinulle."
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Töötätään tuttavalle %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Mediaa ei voi alustaa käyttäjän %s kanssa: virheellinen JID."
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Mediaa ei voi alustaa käyttäjän %s kanssa: käyttäjä ei ole linjoilla"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Mediaa ei voi alustaa käyttäjän %s kanssa: käyttäjän läsnäolotilaa ei ole "
+"tilattu"
+
+msgid "Media Initiation Failed"
+msgstr "Median alustus epäonnistui"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Valitse käyttäjän %s sijainti jonne haluat aloittaa mediaistunnon."
+
+msgid "Select a Resource"
+msgstr "Valitse sijainti"
+
+msgid "Initiate Media"
+msgstr "Aloita median käyttö"
 
 msgid "config:  Configure a chat room."
 msgstr "config: Konfiguroi ryhmäkeskusteluhuone."
@@ -4448,17 +4499,17 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [syy]: Estä käyttäjä huoneesta."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nimi1] [nimi2] ...: Aseta "
 "käyttäjän käyttäjäluokka tälle huoneelle."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
+"role &lt;moderator|participant|visitor|none&gt; [nimi1] [nimi2] ...: Aseta "
 "käyttäjän rooli huoneessa."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4520,6 +4571,9 @@ msgstr "Yhdistä palvelimeen"
 msgid "File transfer proxies"
 msgstr "Tiedostonsiirron välipalvelimet"
 
+msgid "BOSH URL"
+msgstr "BOSH-URL"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4558,6 +4612,14 @@ msgstr "Virhe XML-jäsennyksessä"
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Virhe ryhmäkeskustelussa: %s"
+
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
@@ -4574,13 +4636,28 @@ msgstr "_Aseta huoneen asetuksia"
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"
 
+msgid "No reason"
+msgstr "Syytä ei annettu"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
+msgid "You have been kicked: (%s)"
+msgstr "Sinut on potkaistu kanavalta: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Virhe ryhmäkeskustelussa: %s"
+msgid "Kicked (%s)"
+msgstr "Potkaisi (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Kaistansisäisessä tavuvirtasiirrossa tapahtui virhe\n"
+
+msgid "Transfer was closed."
+msgstr "Siirto suljettiin."
+
+msgid "Failed to open the file"
+msgstr "Tiedoston avaaminen epäonnistui"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Kaistansisäisen tavuvirran avaaminen epäonnistui"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4607,9 +4684,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Valitse käyttäjän %s sijainti johon haluat lähettää tiedoston"
 
-msgid "Select a Resource"
-msgstr "Valitse sijainti"
-
 msgid "Edit User Mood"
 msgstr "Muuta käyttäjän mielialaa"
 
@@ -4644,9 +4718,6 @@ msgstr "Toiminnot"
 msgid "Select an action"
 msgstr "Valitse toiminto"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "MSN-osoitekirjaa ei onnistuttu noutamaan"
-
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
@@ -4909,6 +4980,30 @@ msgstr "Muut yhteystiedot"
 msgid "Non-IM Contacts"
 msgstr "Pikaviestittömät yhteystiedot"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s lähetti animoidun hymiön. <a href='msn-wink://%s'>Napsauta tästä "
+"toistaaksesi sen</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s lähetti animoidun hymiön, mutta sitä ei voi tallentaa"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s lähetti äänipätkän. <a href='audio://%s'>Napsauta tässä toistaaksesi sen</"
+"a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s on lähettänyt äänipätkän, mutta sitä ei voi tallentaa"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s on lähettänyt puhekeskustelukutsun, mitä ei vielä tueta."
+
 msgid "Nudge"
 msgstr "Tönäise"
 
@@ -5061,8 +5156,28 @@ msgstr "Aloita _ryhmäkeskustelu"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto."
 
-msgid "Failed to connect to server."
-msgstr "Palvelimeen ei saatu yhteyttä."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Tuttavaa %s ei voi lisätä koska käyttäjänimi on virheellinen. Käyttäjänimen "
+"tulee olla oikea sähköpostiosoite."
+
+msgid "Unable to Add"
+msgstr "Lisääminen epäonnistui"
+
+msgid "Authorization Request Message:"
+msgstr "Valtuutuksen pyyntöviesti:"
+
+msgid "Please authorize me!"
+msgstr "Voisitko valtuuttaa minut?"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
@@ -5252,63 +5367,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID -tunnistautuminen:Virheellinen vastaus"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ei ole kelvollinen ryhmä."
-
-msgid "Unknown error."
-msgstr "Tuntematon virhe."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s tilillä %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Tuntematon virhe (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Tuntematon virhe (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Käyttäjää ei voi lisätä"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Seuraavat käyttäjät puuttuvat osoitekirjastasi"
-
+#. Unknown error!
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Käyttäjää ei voi lisätä %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Ei voi estää käyttäjää %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Käyttäjää ei voi sallia %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Käyttäjää %s ei voi lisätä koska tuttavia on liikaa."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ei ole kelvollinen passport-tili"
+msgid "Unknown error (%d)"
+msgstr "Tuntematon virhe (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Palvelu ei tilapäisesti ole käytettävissä."
+msgid "The following users are missing from your addressbook"
+msgstr "Seuraavat käyttäjät puuttuvat osoitekirjastasi"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiiliviestiä ei lähetetty, koska se on liian pitkä."
 
-msgid "Unable to rename group"
-msgstr "Ryhmän uudelleen nimeäminen epäonnistui"
-
-msgid "Unable to delete group"
-msgstr "Ryhmää ei voi poistaa"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5353,9 +5432,6 @@ msgstr "Viestiä ei voi lähettää tuntemattoman koodausvirheen vuoksi."
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Viestiä ei voi lähettää tuntemattoman virheen vuoksi."
 
-msgid "Unable to connect"
-msgstr "Yhteyden muodostaminen epäonnistui"
-
 msgid "Writing error"
 msgstr "Virhe kirjoitettaessa"
 
@@ -5370,22 +5446,22 @@ msgstr ""
 "Yhteysvirhe palvelimelta %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Palvelin ei tue yhteyskäytäntöä."
+msgid "Our protocol is not supported by the server"
+msgstr "Palvelin ei tue tämän ohjelman yhteyskäytäntöä."
 
-msgid "Error parsing HTTP."
-msgstr "Virhe jäsennettäessä HTTP:tä."
+msgid "Error parsing HTTP"
+msgstr "Virhe jäsennettäessä HTTP:tä"
 
-msgid "You have signed on from another location."
-msgstr "Olet kirjautunut sisään toisesta paikasta."
+msgid "You have signed on from another location"
+msgstr "Olet kirjautunut sisään toisesta paikasta"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-palvelimet ovat väliaikaisesti tavoittamattomissa. Odota ja yritä "
 "uudelleen."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
+msgid "The MSN servers are going down temporarily"
+msgstr "MSN-palvelimet ajetaan alas väliaikaisesti"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5413,6 +5489,14 @@ msgstr "Lähetetään evästettä"
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavia"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s on lähettänyt pyynnön nähdä webkamerasi, mutta tätä ei vielä tueta."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s on lähettänyt webkamera-kutsun, mikä ei ole vielä tuettuna."
+
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
@@ -5453,14 +5537,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Viestiä ei voi lähettää tuntemattoman virheen vuoksi:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Käyttäjä %s on lisännyt sinut tuttaviinsa."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s on poistanut sinut tuttavistaan."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Poista tuttava osoitekirjasta?"
 
@@ -5490,6 +5566,54 @@ msgid "MSN Protocol Plugin"
 msgstr "MSN-yhteyskäytäntöliitännäinen"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ei ole kelvollinen ryhmä."
+
+msgid "Unknown error."
+msgstr "Tuntematon virhe."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s tilillä %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Käyttäjää ei voi lisätä %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Ei voi estää käyttäjää %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Käyttäjää ei voi sallia %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Käyttäjää %s ei voi lisätä koska tuttavia on liikaa."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ei ole kelvollinen passport-tili"
+
+msgid "Service Temporarily Unavailable."
+msgstr "Palvelu ei tilapäisesti ole käytettävissä."
+
+msgid "Unable to rename group"
+msgstr "Ryhmän uudelleen nimeäminen epäonnistui"
+
+msgid "Unable to delete group"
+msgstr "Ryhmää ei voi poistaa"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Käyttäjä %s on lisännyt sinut tuttaviinsa."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s on poistanut sinut tuttavistaan."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Käyttäjää ei löydy: %s"
 
@@ -5518,6 +5642,8 @@ msgid "Lost connection with server"
 msgstr "Yhteys palvelimeen katkesi"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Uusia viestejä postilaatikossa"
 
@@ -5556,27 +5682,22 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Lisää tuttavia palvelimelta"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Yhdistetty"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Yhteyskäytäntövirhe, virhekoodi %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Salasanasi on %d merkkiä, mikä on enemmän kuin MySpaceIM:n odottama "
-"suurin mahdollinen %d merkkiä. Lyhennä salasanaasi osoitteessa http://"
-"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
-"ja yritä uudelleen."
+"%s Salasanasi on %zu merkkiä, mikä on enemmän kuin suurin mahdollinen %d. "
+"Lyhennä salasanaasi osoitteessa http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings.changePassword ja yritä uudelleen."
+
+msgid "Incorrect username or password"
+msgstr "Virheellinen käyttäjänimi tai salasana"
 
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-virhe"
@@ -5584,16 +5705,6 @@ msgstr "MySpaceIM-virhe"
 msgid "Invalid input condition"
 msgstr "Epäkelpo syötetila"
 
-msgid "Read buffer full (2)"
-msgstr "Lukupuskuri täynnä (2)"
-
-msgid "Unparseable message"
-msgstr "Viestin jäsennys epäonnistui"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Yhteyttä isäntään ei voi muodostaa: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Tuttavan lisääminen epäonnistui"
 
@@ -5677,6 +5788,15 @@ msgstr "Kavereita yhteensä"
 msgid "Client Version"
 msgstr "Asiakasohjelman versio"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Virhe asetettaessa käyttäjänimeä. Yritä uudelleen tai mene osoitteeseen "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"valitaksesi käyttäjänimen."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Käyttäjänimi saatavilla"
 
@@ -5893,9 +6013,6 @@ msgstr "Et voi lisätä itseäsi"
 msgid "Master archive is misconfigured"
 msgstr "Pääarkisto on väärin konfiguroitu"
 
-msgid "Incorrect username or password"
-msgstr "Virheellinen käyttäjänimi tai salasana"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Syötetyn käyttäjänimen isäntäpalvelinta ei voi tunnistaa"
 
@@ -5939,8 +6056,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Tuntematon virhe: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Kirjautuminen epäonnistui (%s)."
+msgid "Unable to login: %s"
+msgstr "Kirjautuminen ei onnistu: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6043,9 +6160,6 @@ msgstr "GroupWise-konferenssi %d"
 msgid "Authenticating..."
 msgstr "Todennetaan..."
 
-msgid "Unable to connect to server."
-msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
-
 msgid "Waiting for response..."
 msgstr "Odotetaan vastausta..."
 
@@ -6069,10 +6183,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6080,15 +6190,12 @@ msgstr ""
 "%s näyttää olevan poissa linjoilta eikä saanut viestiä jonka juuri lähetit."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Palvelimeen ei voi yhdistää. Ole hyvä, syötä palvelimen osoite jolle haluat "
 "yhdistää."
 
-msgid "Error. SSL support is not installed."
-msgstr "Virhe. SSL-tuki ei ole asennettu."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
 
@@ -6111,25 +6218,33 @@ msgstr "Palvelimen osoite"
 msgid "Server port"
 msgstr "Palvelimen portti"
 
+msgid "Received unexpected response from "
+msgstr "Odottamaton vastaus palvelimelta "
+
+#. username connecting too frequently
+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 ""
+"Olet ottanut ja katkaissut yhteyden liian tiheästi. Odota kymmenen minuuttia "
+"ja yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä "
+"pidempään."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Virhe pyydettäessä "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL ei salli näyttönimen todentamista tätä kautta"
+
 msgid "Could not join chat room"
 msgstr "Keskusteluhuoneeseen ei voi liittyä"
 
 msgid "Invalid chat room name"
 msgstr "Epäkelpo keskusteluhuoneen nimi"
 
-msgid "Server closed the connection."
-msgstr "Palvelin on katkaissut yhteyden."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Yhteys palvelimeen katkesi:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja."
+msgid "Received invalid data on connection with server"
+msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja"
 
 #. *< type
 #. *< ui_requirement
@@ -6176,8 +6291,8 @@ msgstr "Yhteys käyttäjään katkesi:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Vastaanotettiin virheellisiä tietoja luotaessa yhteyttä käyttäjään."
 
-msgid "Could not establish a connection with the remote user."
-msgstr "Yhteyttä käyttäjän kanssa ei voi muodostaa."
+msgid "Unable to establish a connection with the remote user."
+msgstr "Yhteyttä etäkäyttäjän kanssa ei voi muodostaa."
 
 msgid "Direct IM established"
 msgstr "Suora pikaviestiyhteys muodostettu"
@@ -6379,20 +6494,12 @@ msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Ei saatu yhteyttä todentamispalvelimeen:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Ei saatu yhteyttä todentamispalvelimeen: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Ei saatu yhteyttä BOS-palvelimeen:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "BOS-palvelimeen ei kyetty muodostamaan yhteyttä: %s"
 
 msgid "Username sent"
 msgstr "Käyttäjänimi lähetetty"
@@ -6406,53 +6513,58 @@ msgstr "Viimeistellään yhteyttä"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Kirjautuminen epäonnistui: käyttäjänä %s ei voi kirjautua koska käyttäjänimi "
-"on virheellinen. Käyttäjänimen tulee olla oikea sähköpostiosoite, tai alkaa "
-"kirjaimella ja sisältää vain kirjaimia, numeroita ja välilyöntejä, tai "
-"sisältää vain numeroita."
+"Kirjautuminen epäonnistui käyttäjänä %s, koska käyttäjänimi on virheellinen. "
+"Käyttäjänimen tulee olla oikea sähköpostiosoite, tai alkaa kirjaimella ja "
+"sisältää vain kirjaimia, numeroita ja välilyöntejä, tai sisältää vain "
+"numeroita."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Epäkelpo käyttäjänimi."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Yhteytesi saattaa katketa kohta. Jos niin käy, tarkista päivitykset: %s."
 
-msgid "Incorrect password."
-msgstr "Virheellinen salasana."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kelvollista AIM-sisäänkirjautumistiivistettä ei saatu."
+
+msgid "Unable to get a valid login hash."
+msgstr "Kelvollista sisäänkirjautumistiivistettä ei saatu."
+
+msgid "Received authorization"
+msgstr "Saatiin lupa"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Käyttäjänimeä ei ole"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
+msgid "Your account is currently suspended"
+msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Olet ottanut ja katkaissut yhteyden liian tiheästi. Odota kymmenen minuuttia "
-"ja yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä "
-"pidempään."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä osoitteessa %s"
 
-msgid "Could Not Connect"
-msgstr "Yhteyttä ei voi muodostaa"
-
-msgid "Received authorization"
-msgstr "Saatiin lupa"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Olet ottanut ja katkaissut yhteyden liian tiheästi. Odota jonkin aikaa ja "
+"yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä pidempään."
 
-msgid "The SecurID key entered is invalid."
-msgstr "Syötetty SecurID-avain on virheellinen."
+msgid "The SecurID key entered is invalid"
+msgstr "Syötetty SecurID-avain on virheellinen"
 
 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
@@ -6460,27 +6572,6 @@ msgstr "Syötä SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Syötä 6 numeroinen luku digitaaliselta näytöltä."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Yhteytesi saattaa katketa kohta. Jos niin käy, tarkista päivitykset: %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Kelvollista AIM-sisäänkirjautumistiivistettä ei saatu."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Yhteytesi saattaa katketa kohta. Tarkista päivitykset: %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Kelvollista sisäänkirjautumistiivistettä ei saatu."
-
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
@@ -6490,12 +6581,6 @@ msgstr "Yhteyden luominen epäonnistui"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttaviini?"
 
-msgid "Authorization Request Message:"
-msgstr "Valtuutuksen pyyntöviesti:"
-
-msgid "Please authorize me!"
-msgstr "Voisitko valtuuttaa minut?"
-
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
@@ -6611,7 +6696,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voi lähettää: %s"
@@ -6633,6 +6718,9 @@ msgstr "Kirjautunut"
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
+msgid "Capabilities"
+msgstr "Kyvyt"
+
 msgid "Profile"
 msgstr "Profiili"
 
@@ -6816,7 +6904,7 @@ msgstr "Poissaoloviesti on liian pitkä."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6824,9 +6912,6 @@ msgstr ""
 "tulee olla oikea sähköpostiosoite, tai alkaa kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä, tai sisältää vain numeroita."
 
-msgid "Unable to Add"
-msgstr "Lisääminen epäonnistui"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Tuttavien noutaminen ei onnistunut"
 
@@ -6843,17 +6928,17 @@ msgstr "Orvot"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"Tuttavaa %s ei voi lisätä koska tuttaviasi on liian monta. Ole hyvä ja "
-"poista joku ja yritä uudelleen."
+"Tuttavaa %s ei voi lisätä koska tuttavia on liian monta. Ole hyvä ja poista "
+"joku ja yritä uudelleen."
 
 msgid "(no name)"
 msgstr "(nimetön)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Tuttavaa %s ei voi lisätä tuntemattomasta syystä."
 
 #, c-format
@@ -6923,6 +7008,7 @@ msgstr "Y_hdistä"
 msgid "Get AIM Info"
 msgstr "Hae AIM-tiedot"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
@@ -6983,6 +7069,7 @@ msgstr "_Etsi"
 msgid "Set User Info (web)..."
 msgstr "Aseta käyttäjätiedot (WWW)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Vaihda salasana (WWW)"
 
@@ -7012,6 +7099,9 @@ msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
+msgid "Use clientLogin"
+msgstr "Käytä clientLoginia"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7203,6 +7293,34 @@ msgstr "Päivitä"
 msgid "Could not change buddy information."
 msgstr "Tuttavan tietojen muuttaminen ei onnistunut."
 
+msgid "Mobile"
+msgstr "Liikkeellä"
+
+msgid "Note"
+msgstr "Huomautus"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Tuttavamuistio"
+
+msgid "Change his/her memo as you like"
+msgstr "Muuta henkilön muistiota halutulla tavalla"
+
+msgid "_Modify"
+msgstr "_Muokkaa"
+
+msgid "Memo Modify"
+msgstr "Muistion muokkaaminen"
+
+msgid "Server says:"
+msgstr "Palvelin sanoo:"
+
+msgid "Your request was accepted."
+msgstr "Pyyntösi hyväksyttiin."
+
+msgid "Your request was rejected."
+msgstr "Pyyntösi hylättiin."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u pyytää valtuutusta"
@@ -7511,6 +7629,12 @@ msgstr "<p><b>Ihanat päivitysten kirjoittajat</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Tunnustus</b>:<br>\n"
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Tunnolliset testaajat</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "ja muuta, kerro minulle... kiitos!))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Ja, kaikki pojat takahuoneessa...</i><br>\n"
 
@@ -7536,6 +7660,9 @@ msgstr "Päivitä kaikki QQ Qunit"
 msgid "About OpenQ"
 msgstr "Tietoja OpenQ:sta"
 
+msgid "Modify Buddy Memo"
+msgstr "Muokkaa tuttavan muistiota"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7573,13 +7700,16 @@ msgstr "Näytä palvelinhuomautukset"
 msgid "Show server news"
 msgstr "Näytä palvelinuutiset"
 
+msgid "Show chat room when msg comes"
+msgstr "Näytä keskusteluhuone viestin tullessa"
+
 msgid "Keep alive interval (seconds)"
 msgstr "Jatkuvan yhteydenpidon aikaväli (sekunneissa)"
 
 msgid "Update interval (seconds)"
 msgstr "Päivitysten aikaväli (sekunneissa)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Palvelinvastauksen salausta ei voi purkaa"
 
 #, c-format
@@ -7604,9 +7734,6 @@ msgstr "Vaatii aktivoinnin"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Tuntematon vastauskoodi kirjauduttaessa (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Palvelinvastauksen salausta ei voi purkaa"
-
 msgid "Requesting captcha"
 msgstr "Pyydetään captchaa"
 
@@ -7640,30 +7767,17 @@ msgstr ""
 "Tuntematon vastauskoosi kirjauduttaessa sisään (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Yhteyden muodostaminen epäonnistui."
-
 msgid "Socket error"
 msgstr "Pistokevirhe"
 
-msgid "Unable to read from socket"
-msgstr "Ei kyetty lukemaan pistoketta"
-
-msgid "Write Error"
-msgstr "Virhe kirjoituksessa"
-
-msgid "Connection lost"
-msgstr "Yhteys katkesi"
-
 msgid "Getting server"
 msgstr "Haetaan palvelinta"
 
 msgid "Requesting token"
 msgstr "Pyydetään polettia"
 
-msgid "Couldn't resolve host"
-msgstr "Yhteyttä isäntään ei voi löytää"
+msgid "Unable to resolve hostname"
+msgstr "Ei kyetty selvittämään palvelimen nimeä"
 
 msgid "Invalid server or port"
 msgstr "Epäkelpo palvelin tai portti"
@@ -7716,7 +7830,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ-Qun-komento"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Kirjautumisvastauksen salausta ei voi purkaa"
 
 msgid "Unknown LOGIN CMD"
@@ -7736,9 +7850,6 @@ msgstr "Tiedoston lähetys"
 msgid "%d canceled the transfer of %s"
 msgstr "%d peruutti tiedoston %s siirron"
 
-msgid "Connection closed (writing)"
-msgstr "Yhteys suljettu (kirjoitus)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ryhmän nimi:</b> %s<br>"
@@ -7792,17 +7903,6 @@ msgstr "Sametime-ylläpitäjä on julkaissut seuraavan tiedotteen palvelimella %
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-ylläpitäjän tiedote"
 
-msgid "Connection reset"
-msgstr "Yhteys suljettu"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Virhe luettaessa socketista: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ilmoitus käyttäjältä %s"
@@ -7825,6 +7925,9 @@ msgstr "Kaiuttimet"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Tiedostonsiirto"
+
 msgid "Supports"
 msgstr "Tukee"
 
@@ -8542,9 +8645,6 @@ msgstr "Organisaatio"
 msgid "Unit"
 msgstr "Yksikkö"
 
-msgid "Note"
-msgstr "Huomautus"
-
 msgid "Join Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
@@ -8644,6 +8744,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Verkkotilastoja"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping epäonnistui"
 
@@ -8707,7 +8810,7 @@ msgstr "Julkisen avaimen tyyppiä ei tuettu"
 msgid "Disconnected by server"
 msgstr "Palvelin katkaisi yhteyden"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
 
 msgid "Key Exchange failed"
@@ -8719,26 +8822,23 @@ msgstr ""
 "Irrotetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
 "luodaksesi uuden yhteyden."
 
-msgid "Connection failed"
-msgstr "Yhteys epäonnistui"
-
 msgid "Performing key exchange"
 msgstr "Suoritetaan avaintenvaihto"
 
-msgid "Unable to create connection"
-msgstr "Yhteyden luominen epäonnistui"
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "SILC-avainparia ei voi ladata"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Yhdistetään SILC-palvelimelle"
 
+msgid "Unable to not load SILC key pair"
+msgstr "SILC-avainparin lataamatta jättäminen ei onnistu"
+
 msgid "Out of memory"
 msgstr "Muisti loppu"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC-yhteyskäytäntöä ei voi alustaa"
 
 msgid "Error loading SILC key pair"
@@ -9030,8 +9130,8 @@ msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 msgid "Creating SILC key pair..."
 msgstr "Luodaan SILC-avainpari..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "SILC-avainparia ei voi luoda\n"
+msgid "Unable to create SILC key pair"
+msgstr "SILC-avainparia ei voi luoda"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9127,6 +9227,9 @@ msgstr "Kirjoitustaulu"
 msgid "No server statistics available"
 msgstr "Palvelimen tilastoja ei saatavilla."
 
+msgid "Error during connecting to SILC Server"
+msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Virhe: Versioepäyhteensopivuus, päivitä ohjelmasi"
@@ -9167,30 +9270,24 @@ msgstr "Virhe: Virheellinen eväste"
 msgid "Failure: Authentication failed"
 msgstr "Virhe: Todennus epäonnistui"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC-asiakasyhteyttä ei voi alustaa"
 
 msgid "John Noname"
 msgstr "Pertti Perusnimi"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC-avainparia ei voi ladata: %s"
 
-msgid "Could not write"
-msgstr "Kirjoittaminen ei onnistu"
-
-msgid "Could not connect"
-msgstr "Yhdistäminen ei onnistu"
-
-msgid "Unknown server response."
-msgstr "Tuntematon palvelinvastaus."
+msgid "Unable to create connection"
+msgstr "Yhteyden luominen epäonnistui"
 
-msgid "Could not create listen socket"
-msgstr "Kuuntelupistokkeen luominen epäonnistui"
+msgid "Unknown server response"
+msgstr "Tuntematon palvelinvastaus"
 
-msgid "Could not resolve hostname"
-msgstr "Isäntänimeä ei voi selvittää"
+msgid "Unable to create listen socket"
+msgstr "Kuuntelupistokkeen luonti epäonnistui"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-käyttäjänimissä ei tule olla välilyöntejä tai @-merkkejä"
@@ -9231,177 +9328,60 @@ msgstr "Todennus/käyttäjä"
 msgid "Auth Domain"
 msgstr "Todennus/verkkoalue"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Etsitään %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s: yhteyden muodostaminen epäonnistui"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Kirjautuminen: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Ei kyetty kirjoittamaan tiedostoa %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Ei kyetty lukemaan tiedostoa %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Viesti on liian pitkä, viimeiset %s tavua katkaistu."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s ei ole parhaillaan kirjautuneena sisään."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s:n varoittaminen ei ole sallittua."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Viesti on hylätty, ylität palvelimen nopeusrajan."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Ryhmäkeskustelu %s ei ole käytettävissä."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Lähetät viestejä %s:lle liian nopeasti."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Et saanut %s:n pikaviestiä koska se oli liian suuri."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Et saanut %s:n pikaviestiä koska se lähetettiin liian nopeasti."
-
-#, c-format
-msgid "Failure."
-msgstr "Epäonnistuminen."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Liian monta tulosta."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Tarvitaan lisää määritteitä."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Hakemistopalvelu ei tilapäisesti ole käytettävissä."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Sähköpostin katsominen rajoitettu."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Avainsanasta ei välitetty."
-
-#, c-format
-msgid "No keywords."
-msgstr "Ei avainsanoja."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Käyttäjällä ei ole hakemistotietoja."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Maa ei tuettu."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Tunnistamaton epäonnistuminen: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Virheellinen käyttäjänimi tai salasana."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Palvelu ei tilapäisesti ole käytössä."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Varoitustasosi on parhaillaan liian korkea kirjautuaksesi sisään."
-
-#, c-format
-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 ""
-"Olet ottanut ja katkaissut yhteyden liian tiheään. Odota kymmenen minuuttia "
-"ja yritä uudestaan. Jos jatkat yrittämistä, joudut odottamaan vielä "
-"pidempään."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Tuntematon sisäänkirjautumisvirhe esiintyi: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Tuntematon virhe, %d, esiintyi. Tiedot: %s"
-
-msgid "Invalid Groupname"
-msgstr "Epäkelpo ryhmän nimi"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-msgid "Connection Closed"
-msgstr "Yhteys suljettu"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-msgid "Waiting for reply..."
-msgstr "Odotetaan vastausta..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC on palannut tauoltaan. Voit lähettää viestejä jälleen."
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
 
-msgid "Password Change Successful"
-msgstr "Salasanan vaihto onnistui"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo!-yhteyskäytäntöliitännäinen"
 
-msgid "_Group:"
-msgstr "_Ryhmä:"
+msgid "Pager server"
+msgstr "Hakulaitepalvelin"
 
-msgid "Get Dir Info"
-msgstr "Hae hakemistotiedot"
+msgid "Pager port"
+msgstr "Hakulaiteportti"
 
-msgid "Set Dir Info"
-msgstr "Aseta hakemistotiedot"
+msgid "File transfer server"
+msgstr "Tiedostonsiirtopalvelin"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!"
+msgid "File transfer port"
+msgstr "Tiedostonsiirtoportti"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
+msgid "Chat room locale"
+msgstr "Keskusteluhuoneen paikallisasetus"
 
-msgid "Could not connect for transfer."
-msgstr "Yhteyttä siirtoa varten ei voi muodostaa."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Tiedosto-otsikkoa ei voi kirjoittaa. Tiedostoa ei siirretä."
+msgid "Chat room list URL"
+msgstr "Keskusteluhuoneluettelon URL"
 
-msgid "Save As..."
-msgstr "Tallenna nimellä..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo-ryhmäkeskustelupalvelin"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s pyytää %s hyväksymään %d tiedoston: %s (%.2f %s)%s%s"
-msgstr[1] "%s pyytää %s hyväksymään %d tiedostot: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s pyytää sinua lähettämään hänelle tiedoston"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9413,12 +9393,11 @@ msgstr "%s pyytää sinua lähettämään hänelle tiedoston"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC-yhteyskäytäntöliitännäinen"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! JAPAN -yhteyskäytäntöliitännäinen"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s on lähettänyt webkamera-kutsun, mikä ei ole vielä tuettuna."
+msgid "Your SMS was not delivered"
+msgstr "Tekstiviestiä (SMS) ei välitetty"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
@@ -9443,6 +9422,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Vastaanotettiin virheellisiä tietoja"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Käyttäjätili lukittu: liian monta epäonnistuttu kirjautumisyritystä. Yahoo!-"
+"WWW-sivustolle kirjautuminen saatta korjata tämän."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Käyttäjätili lukittu: tuntematon syy. Yahoo!-WWW-sivustolle kirjautuminen "
+"saatta korjata tämän."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Puuttuva käyttäjänimi tai salasana"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9478,38 +9481,27 @@ msgstr ""
 "korjata tämän."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Tuttavaa %s ei voi lisätä ryhmään %s palvelimen tuttavissa, tilillä %s."
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "Tuttavaa ei voi lisätä palvelimen tuttaviin"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Odottamaton HTTP-vastaus palvelimelta."
-
-msgid "Connection problem"
-msgstr "Yhteysvirhe"
+msgid "Received unexpected HTTP response from server"
+msgstr "Odottamaton HTTP-vastaus palvelimelta"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Yhteys palvelimeen %s katkesi:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Yhteys palvelimeen %s katkesi: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Yhteyttä ei voi muodostaa palvelimeen %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Yhteyttä palvelimeen %s ei voi muodostaa: %s"
 
 msgid "Not at Home"
 msgstr "Poissa kotoa"
@@ -9556,8 +9548,8 @@ msgstr "Läsnäoloasetukset"
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
-msgid "Activate which ID?"
-msgstr "Mikä tunnus (ID) aktivoidaan?"
+msgid "Select the ID you want to activate"
+msgstr "Valitse aktivoitava tunnus (ID)"
 
 msgid "Join whom in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
@@ -9571,73 +9563,15 @@ msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 msgid "Open Inbox"
 msgstr "Avaa saapuneet-kansio"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Listaa kanavat Yahoo-verkossa"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-yhteyskäytäntöliitännäinen"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japani"
-
-msgid "Pager server"
-msgstr "Hakulaitepalvelin"
-
-msgid "Japan Pager server"
-msgstr "Hakulaitepalvelin (Japani)"
-
-msgid "Pager port"
-msgstr "Hakulaiteportti"
-
-msgid "File transfer server"
-msgstr "Tiedostonsiirtopalvelin"
-
-msgid "Japan file transfer server"
-msgstr "Tiedostonsiirtopalvelin (Japani)"
-
-msgid "File transfer port"
-msgstr "Tiedostonsiirtoportti"
-
-msgid "Chat room locale"
-msgstr "Keskusteluhuoneen paikallisasetus"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
-
-msgid "Chat room list URL"
-msgstr "Keskusteluhuoneluettelon URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo-ryhmäkeskustelupalvelin"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Lähetä piirtelypyyntö (doodle)."
 
+msgid "Unable to connect."
+msgstr "Yhteyden muodostaminen epäonnistui."
+
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
@@ -9645,6 +9579,9 @@ msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s tarjoaa %d tiedoston tiedostoryhmää.\n"
 
+msgid "Write Error"
+msgstr "Virhe kirjoituksessa"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan -profiili"
 
@@ -9763,23 +9700,18 @@ msgstr "Äänet"
 msgid "Webcams"
 msgstr "Web-kamerat"
 
+msgid "Connection problem"
+msgstr "Yhteysvirhe"
+
 msgid "Unable to fetch room list."
 msgstr "Huoneluetteloa ei voi hakea."
 
 msgid "User Rooms"
 msgstr "Käyttäjän huoneet"
 
-msgid "Connection problem with the YCHT server."
+msgid "Connection problem with the YCHT server"
 msgstr "Yhteysvirhe YCHT-palvelimen kanssa"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Yhteys palvelimeen katkesi\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9907,32 +9839,21 @@ msgid "Exposure"
 msgstr "Altistus"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Pistokkeen luonti epäonnistui:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Vastausta HTTP-välipalvelimelta ei voi jäsentää: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Vastausta HTTP-välipalvelimelta ei voi jäsentää: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-välipalvelimen yhteysvirhe %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Pääsy evätty: HTTP-välipalvelin estää portin %d tunneloinnin."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "Pääsy evätty: HTTP-välipalvelin estää portin %d tunneloinnin"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Virhe selvitettäessä %s"
 
-msgid "Could not resolve host name"
-msgstr "Isäntänimeä ei voi selvittää"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Pyydetään käyttäjän %s huomiota..."
@@ -10019,9 +9940,6 @@ msgstr "Älä häiritse"
 msgid "Extended away"
 msgstr "Pidennetty poissaolo"
 
-msgid "Mobile"
-msgstr "Liikkeellä"
-
 msgid "Listening to music"
 msgstr "Kuuntelee musiikkia"
 
@@ -10063,18 +9981,6 @@ msgstr "+++ %s on aktiivinen"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Virhe luettaessa %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"%s:n lukemisessa tapahtui virhe. Niitä ei ladattu ja vanha tiedosto on "
-"nimetty uudelleen nimellä %s~."
-
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
@@ -10182,6 +10088,18 @@ msgstr "Yhteys torjuttu."
 msgid "Address already in use."
 msgstr "Osoite on jo käytössä."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Virhe luettaessa %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"%s:n lukemisessa tapahtui virhe. Tiedostoa ei ladattu ja vanha tiedosto on "
+"nimetty uudelleen nimelle %s~."
+
 msgid "Internet Messenger"
 msgstr "Pikaviestin"
 
@@ -10224,10 +10142,8 @@ msgstr "Il_moita uudesta sähköpostista"
 msgid "Use this buddy _icon for this account:"
 msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjät_ilille:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s-valinnat"
+msgid "Ad_vanced"
+msgstr "_Lisäasetukset"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Käytä Gnomen välipalvelinasetuksia"
@@ -10262,9 +10178,6 @@ msgstr "Jos katsot todella tarkkaan"
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-msgid "Proxy Options"
-msgstr "Välipalvelinvalinnat"
-
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
@@ -10292,8 +10205,8 @@ msgstr "_Perus"
 msgid "Create _this new account on the server"
 msgstr "Luo _tämä uusi käyttäjätili palvelimelle"
 
-msgid "_Advanced"
-msgstr "_Lisäasetukset"
+msgid "P_roxy"
+msgstr "Vä_lipalvelin"
 
 msgid "Enabled"
 msgstr "Käytössä"
@@ -10342,16 +10255,16 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Päivitä tarvittavat kentät."
 
-msgid "Room _List"
-msgstr "Huone_luettelo"
+msgid "A_ccount"
+msgstr "_Käyttäjätili"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
-msgid "_Account:"
-msgstr "_Käyttäjätili:"
+msgid "Room _List"
+msgstr "Huone_luettelo"
 
 msgid "_Block"
 msgstr "_Estä"
@@ -10368,6 +10281,15 @@ msgstr "Hae _tiedot"
 msgid "I_M"
 msgstr "_Pikaviesti"
 
+msgid "_Audio Call"
+msgstr "_Äänipuhelu"
+
+msgid "Audio/_Video Call"
+msgstr "Ääni/_videopuhelu"
+
+msgid "_Video Call"
+msgstr "_Videopuhelu"
+
 msgid "_Send File..."
 msgstr "_Lähetä tiedosto..."
 
@@ -10377,9 +10299,12 @@ msgstr "Lisää tuttava_ilmoitin..."
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Piilota kun poissa linjoilta"
 
+msgid "Show When Offline"
+msgstr "Näytä kun poissa linjoilta"
+
 msgid "_Alias..."
 msgstr "_Lempinimi..."
 
@@ -10504,6 +10429,9 @@ msgstr "/Työkalut/Tuttava_ilmoittimet"
 msgid "/Tools/_Certificates"
 msgstr "/Työkalut/_Varmenteet"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Työkalut/Omat h_ymiöt"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Työkalut/_Liitännäiset"
 
@@ -10513,9 +10441,6 @@ msgstr "/Työkalut/A_setukset"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-msgid "/Tools/Smile_y"
-msgstr "/Työkalut/H_ymiö"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostonsiirrot..."
 
@@ -10633,8 +10558,8 @@ msgstr "Käsin"
 msgid "By status"
 msgstr "Tilan mukaan"
 
-msgid "By log size"
-msgstr "Lokin koon mukaan"
+msgid "By recent log activity"
+msgstr "Viimeisimpien lokikirjauksien mukaan"
 
 #, c-format
 msgid "%s disconnected"
@@ -10650,6 +10575,9 @@ msgstr "Yhdistä uudelleen"
 msgid "Re-enable"
 msgstr "Ota uudelleen käyttöön"
 
+msgid "SSL FAQs"
+msgstr "SSL-UKK:t"
+
 msgid "Welcome back!"
 msgstr "Tervetuloa takaisin."
 
@@ -10740,6 +10668,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "_Lempinimi:"
 
+msgid "_Group:"
+msgstr "_Ryhmä:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Liity automaattisesti kun käyttä_jätili pääsee linjoille."
 
@@ -10773,6 +10704,103 @@ msgstr "/Työkalut"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Taustaväri"
+
+msgid "The background color for the buddy list"
+msgstr "Tuttavaluettelon taustaväri"
+
+msgid "Layout"
+msgstr "Asettelu"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Tuttavien kuvakkeiden, nimien ja tilojen asettelu"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Laajennettu taustaväri"
+
+msgid "The background color of an expanded group"
+msgstr "Laajennetun ryhmän taustavärin"
+
+msgid "Expanded Text"
+msgstr "Laajennettu teksti"
+
+msgid "The text information for when a group is expanded"
+msgstr "Tekstitieto ryhmää laajennettaessa"
+
+msgid "Collapsed Background Color"
+msgstr "Supistettu taustaväri"
+
+msgid "The background color of a collapsed group"
+msgstr "Supistetun ryhmän taustaväri"
+
+msgid "Collapsed Text"
+msgstr "Supistettu teksti"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Tekstitieto ryhmää supistettaessa"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Yhteystiedon/keskustelun taustaväri"
+
+msgid "The background color of a contact or chat"
+msgstr "Yhteystiedon tai keskustelun taustaväri"
+
+msgid "Contact Text"
+msgstr "Yhteystiedon teksti"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Tekstitieto yhteystietoa laajennettaessa"
+
+msgid "On-line Text"
+msgstr "Linjoilla-teksti"
+
+msgid "The text information for when a buddy is online"
+msgstr "Tekstitieto tuttavan ollessa linjoilla"
+
+msgid "Away Text"
+msgstr "Poissa-teksti"
+
+msgid "The text information for when a buddy is away"
+msgstr "Tekstitieto tuttavan ollessa poissa"
+
+msgid "Off-line Text"
+msgstr "Poissa linjoilta -teksti"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Tekstitieto tuttavan ollessa poissa linjoilta"
+
+msgid "Idle Text"
+msgstr "Joutenoloteksti"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Tekstitieto tuttavan ollessa jouten"
+
+msgid "Message Text"
+msgstr "Viestin teksti"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Tekstitieto kun tuttavalla on lukematon viesti"
+
+msgid "Message (Nick Said) Text"
+msgstr "Viestin (henkilö sanoi) teksti"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"Tekstitieto kun keskustelussa on lukematon viesti, jossa mainitaan "
+"kutsumanimesi"
+
+msgid "The text information for a buddy's status"
+msgstr "Tekstitieto tuttavan tilalle"
+
+msgid "Type the host name for this certificate."
+msgstr "Kirjoita isäntänimi tälle varmenteelle."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-palvelimet"
@@ -10792,12 +10820,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
-
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
@@ -10826,7 +10848,7 @@ msgstr "Jätä huomiotta"
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Viimeksi sanottu"
 
 msgid "Unable to save icon file to disk."
@@ -10872,6 +10894,18 @@ msgstr "/Keskustelu/_Tallenna nimellä..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjennä takaisinvieritys"
 
+msgid "/Conversation/M_edia"
+msgstr "/Keskustelu/M_edia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Keskustelu/Media/_Äänipuhelu"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Keskustelu/Media/_Videopuhelu"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Keskustelu/Media/Ääni\\/video_puhelu"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
@@ -10944,6 +10978,15 @@ msgstr "/Keskustelu"
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Keskustelu/Media/Äänipuhelu"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Keskustelu/Media/Videopuhelu"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Keskustelu/Media/Ääni\\/videopuhelu"
+
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
@@ -11127,6 +11170,9 @@ msgstr "esittäjä"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "ääni ja video"
+
 msgid "support"
 msgstr "tuki"
 
@@ -11251,6 +11297,9 @@ msgstr "hindi"
 msgid "Hungarian"
 msgstr "unkari"
 
+msgid "Armenian"
+msgstr "armenia"
+
 msgid "Indonesian"
 msgstr "indonesia"
 
@@ -11266,6 +11315,9 @@ msgstr "georgia"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntun georgian kääntäjät"
 
+msgid "Khmer"
+msgstr "khmeeri"
+
 msgid "Kannada"
 msgstr "kannada"
 
@@ -11287,6 +11339,9 @@ msgstr "liettua"
 msgid "Macedonian"
 msgstr "makedonia"
 
+msgid "Mongolian"
+msgstr "mongolia"
+
 msgid "Bokmål Norwegian"
 msgstr "kirjanorja"
 
@@ -11341,6 +11396,9 @@ msgstr "sinhali"
 msgid "Swedish"
 msgstr "ruotsi"
 
+msgid "Swahili"
+msgstr "swahili"
+
 msgid "Tamil"
 msgstr "tamil"
 
@@ -11402,9 +11460,32 @@ msgstr ""
 "anna ohjelmalle minkäänlaista takuuta.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">UKK:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> #pidgin palvelimella irc.freenode.net<BR><BR>"
+"<FONT SIZE=\"4\">Apua sähköpostitse (engl.):</FONT> <A HREF=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC-kanava:</FONT> #pidgin palvelimella irc.freenode."
+"net<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">XMPP-keskustelu:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
@@ -11650,7 +11731,7 @@ msgstr "Väri jolla piirretään hyperlinkit"
 msgid "Hyperlink visited color"
 msgstr "Vieraillun hyperlinkin väri"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Väri jolla piirretään vierailtu (tai aktivoitu) hyperlinkki."
 
 msgid "Hyperlink prelight color"
@@ -11686,14 +11767,20 @@ msgstr "Väri jolla näytetään toimintoviestin nimi."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Toimintoviestin nimen väri kuiskatulle viestille"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Väri jolla näytetään kuiskatun toimintoviestin nimi."
+
 msgid "Whisper Message Name Color"
 msgstr "Kuiskatun viestin nimen väri"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Väri jolla näytetään kuiskatun viestin nimi."
+
 msgid "Typing notification color"
 msgstr "Kirjoittamishuomautuksen väri"
 
-msgid "The color to use for the typing notification font"
-msgstr "Väri jota käytetään kirjoittamishuomautuksen kirjasimessa"
+msgid "The color to use for the typing notification"
+msgstr "Väri jota käytetään kirjoittamishuomautuksessa"
 
 msgid "Typing notification font"
 msgstr "Kirjoittamishuomautuksen kirjasin"
@@ -11704,15 +11791,6 @@ msgstr "Kirjoittamishuomautukseen käytettävä kirjasin"
 msgid "Enable typing notification"
 msgstr "Ota kirjoittamishuomautus käyttöön"
 
-msgid "_Copy Email Address"
-msgstr "_Kopioi sähköpostiosoite"
-
-msgid "_Open Link in Browser"
-msgstr "_Avaa linkki selaimessa"
-
-msgid "_Copy Link Location"
-msgstr "_Kopioi linkin osoite"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11754,11 +11832,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Lisää oma hymiö..."
 
@@ -11847,9 +11923,6 @@ msgstr "Pienennä kirjasimen kokoa"
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-msgid "Background Color"
-msgstr "Taustaväri"
-
 msgid "Foreground Color"
 msgstr "Etualaväri"
 
@@ -11964,6 +12037,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11978,6 +12052,7 @@ msgstr ""
 "\n"
 "  -c, --config=HAK    käytä hakemistoa HAK asetustiedostoille\n"
 "  -d, --debug         kirjoita virheenjäljitysviestit putkeen stdout\n"
+"  -f, --force-online  pakota ”tavoitettavissa” riippumatta verkon tilasta\n"
 "  -h, --help          näytä tämä ohje ja poistu\n"
 "  -m, --multiple      älä pitäydy vain yhdessä instanssissa\n"
 "  -n, --nologin       älä kirjaudu automaattisesti\n"
@@ -11994,6 +12069,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12007,6 +12083,7 @@ msgstr ""
 "\n"
 "  -c, --config=HAK    käytä hakemistoa HAK asetustiedostoille\n"
 "  -d, --debug         kirjoita virheenjäljitysviestit putkeen stdout\n"
+"  -f, --force-online  pakota ”tavoitettavissa” riippumatta verkon tilasta\n"
 "  -h, --help          näytä tämä ohje ja poistu\n"
 "  -m, --multiple      älä pitäydy vain yhdessä instanssissa\n"
 "  -n, --nologin       älä kirjaudu automaattisesti\n"
@@ -12048,11 +12125,26 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Avaa kaikki viestit"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "Poistutaan, koska toinen libpurple-asiakas on jo käynnissä.\n"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Sinulle on postia!</span>"
+msgid "/_Media"
+msgstr "/_Media"
+
+msgid "/Media/_Hangup"
+msgstr "/Media/_Katkaise"
+
+msgid "Calling..."
+msgstr "Soitetaan..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s haluaa aloittaa ääni/videoistunnon kanssasi."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s haluaa aloittaa videoistunnon kanssasi."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12081,6 +12173,24 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento -asetus valittu, mutta komentoa ei ole asetettu."
 
+msgid "No message"
+msgstr "Ei viestiä"
+
+msgid "Open All Messages"
+msgstr "Avaa kaikki viestit"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Sinulle on postia!</span>"
+
+msgid "New Pounces"
+msgstr "Uusi ilmoituksia"
+
+msgid "Dismiss"
+msgstr "Hylkää"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Uusi ilmoitus</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Seuraavat liitännäiset otetaan pois käytöstä."
 
@@ -12129,10 +12239,16 @@ msgstr "<b>Liitännäisen yksityiskohdat</b>"
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
+msgid "Modify Buddy Pounce"
+msgstr "Muokkaa tuttavailmoitinta"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Kenestä ilmoitetaan"
 
+msgid "_Account:"
+msgstr "_Käyttäjätili:"
+
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
@@ -12199,8 +12315,58 @@ msgstr "_Toistuva"
 msgid "Pounce Target"
 msgstr "Ilmoituksen kohde"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Hymiöteeman purkaminen epäonnistui."
+#, c-format
+msgid "Started typing"
+msgstr "alkoi kirjoittaa"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "keskeytti kirjoittamisen"
+
+#, c-format
+msgid "Signed on"
+msgstr "kirjautui sisään"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "palasi oltuaan jouten"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "palasi oltuaan poissa"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "lopetti kirjoittamisen"
+
+#, c-format
+msgid "Signed off"
+msgstr "kirjautui ulos"
+
+#, c-format
+msgid "Became idle"
+msgstr "muuttui jouten olevaksi"
+
+#, c-format
+msgid "Went away"
+msgstr "muuttui poissa olevaksi"
+
+#, c-format
+msgid "Sent a message"
+msgstr "lähetti viestin"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Tuntematon... Raportoi tästä!"
+
+msgid "Theme failed to unpack."
+msgstr "Teeman purkaminen epäonnistui."
+
+msgid "Theme failed to load."
+msgstr "Teeman lataaminen epäonnistui."
+
+msgid "Theme failed to copy."
+msgstr "Teeman kopioiminen epäonnistui."
 
 msgid "Install Theme"
 msgstr "Asenna teema"
@@ -12221,6 +12387,11 @@ msgstr "Pikanäppäimet"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "S_ulje keskustelut Escape-näppäimellä"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Tuttavaluettelon teema"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ilmoitusalueen kuvake"
 
@@ -12230,8 +12401,8 @@ msgstr "_Näytä ilmoitusalueen kuvake:"
 msgid "On unread messages"
 msgstr "Kun lukemattomia viestejä"
 
-msgid "Conversation Window Hiding"
-msgstr "Keskusteluikkunan piilottaminen"
+msgid "Conversation Window"
+msgstr "Keskusteluikkuna"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Piilota uudet pikaviestikeskustelut:"
@@ -12239,6 +12410,9 @@ msgstr "_Piilota uudet pikaviestikeskustelut:"
 msgid "When away"
 msgstr "Poissaollessa"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Piene_nnä uudet keskusteluikkunat"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Välilehdet"
@@ -12297,9 +12471,6 @@ msgstr "Käytä portaatonta tekstinvieritystä"
 msgid "F_lash window when IMs are received"
 msgstr "_Vilkuta ikkunaa pikaviestien saapuessa"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Piene_nnä uudet keskusteluikkunat"
-
 msgid "Minimum input area height in lines:"
 msgstr "Kirjoitusalueen pienin korkeus riveissä:"
 
@@ -12331,14 +12502,12 @@ msgstr "Välipalvelimen asetusohjelmaa ei voi käynnistää."
 msgid "Cannot start browser configuration program."
 msgstr "Selaimen asetusohjelmaa ei voi käynnistää."
 
-msgid "ST_UN server:"
-msgstr "ST_UN-palvelin:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esimerkki: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Hae IP-osoite automaattisesti"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Käytä _automaattisesti tunnistettua IP-osoitetta: %s"
 
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
@@ -12358,6 +12527,10 @@ msgstr "_Ensimmäinen portti:"
 msgid "_End port:"
 msgstr "Viimeinen _portti:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Edelleenvälityspalvelin (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Välipalvelin &amp; selain"
 
@@ -12386,6 +12559,10 @@ msgstr "Välipalvelin"
 msgid "No proxy"
 msgstr "Ei välipalvelinta"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr "Käytä etä-DNS:ää SOCKS4-välipalvelimien kanssa"
+
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
@@ -12544,12 +12721,12 @@ msgstr "Poissa ja jouten ollessa"
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-msgid "Change status when _idle"
-msgstr "Vaihda tila, kun ollaan _jouten"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuutteja ennen jouten olevaksi asettamista:"
 
+msgid "Change status when _idle"
+msgstr "Vaihda tila, kun ollaan _jouten"
+
 msgid "Change _status to:"
 msgstr "Vaihda tila seuraavaksi:"
 
@@ -12697,45 +12874,42 @@ msgstr "Tallenna ja _käytä"
 msgid "Status for %s"
 msgstr "%s:n tila"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr "Oikotielle ”%s” on jo oma hymiö. Valitse toinen oikotie."
+
 msgid "Custom Smiley"
 msgstr "Oma hymiö"
 
-msgid "More Data needed"
-msgstr "Lisää tietoja tarvitaan"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Syötä hymiöön liitettävä oikotie."
-
 msgid "Duplicate Shortcut"
 msgstr "Monista oikotie"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr "Valitulle oikotielle on jo oma hymiö. Valitse toisenlainen oikotie."
-
-msgid "Please select an image for the smiley."
-msgstr "Valitse hymiölle kuva."
-
 msgid "Edit Smiley"
 msgstr "Muokkaa hymiötä"
 
 msgid "Add Smiley"
 msgstr "Lisää hymiö"
 
-msgid "Smiley _Image"
-msgstr "Hymiön kuva"
+msgid "_Image:"
+msgstr "Ku_va:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Hymiön _oikotie"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "Oi_kotien teksti:"
 
 msgid "Smiley"
 msgstr "Hymiö"
 
+msgid "Shortcut Text"
+msgstr "Oikotien teksti"
+
 msgid "Custom Smiley Manager"
 msgstr "Omien hymiöiden hallinta"
 
+msgid "Select Buddy Icon"
+msgstr "Valitse tuttavakuvake"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Napsauta muuttaaksesi tämän käyttäjätilin tuttavakuvaketta."
 
@@ -12821,10 +12995,10 @@ msgid "Cannot send launcher"
 msgstr "Käynnistintä ei voi lähettää"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
-"Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää tiedoston johon "
+"Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää kohteen johon "
 "käynnistin osoittaa, käynnistimen itsensä sijaan."
 
 #, c-format
@@ -12858,9 +13032,30 @@ msgstr ""
 "Kuvaa \"%s\" ei voi ladata: syy ei ole tiedossa, mahdollisesti vioittunut "
 "kuvatiedosto"
 
+msgid "_Open Link"
+msgstr "_Avaa linkki"
+
+msgid "_Copy Link Location"
+msgstr "_Kopioi linkin osoite"
+
+msgid "_Copy Email Address"
+msgstr "_Kopioi sähköpostiosoite"
+
+msgid "_Open File"
+msgstr "_Avaa tiedosto..."
+
+msgid "Open _Containing Directory"
+msgstr "Avaa kansio joka _sisältää tämän"
+
 msgid "Save File"
 msgstr "Tallenna tiedosto"
 
+msgid "_Play Sound"
+msgstr "_Toista ääni"
+
+msgid "_Save File"
+msgstr "_Tallenna tiedosto"
+
 msgid "Select color"
 msgstr "Valitse väri"
 
@@ -12948,6 +13143,66 @@ msgstr "Tuttavan paikallaolon ennustava liitännäinen."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Näyttää tilastotietoja tuttavien läsnäolosta"
 
+msgid "Server name request"
+msgstr "Palvelinnimen pyyntö"
+
+msgid "Enter an XMPP Server"
+msgstr "Syötä XMPP-palvelin"
+
+msgid "Select an XMPP server to query"
+msgstr "Valitse XMPP-palvelin johon kysely lähetetään"
+
+msgid "Find Services"
+msgstr "Etsi palveluita"
+
+msgid "Add to Buddy List"
+msgstr "Lisää tuttaviin"
+
+msgid "Gateway"
+msgstr "Yhdyskäytävä"
+
+msgid "Directory"
+msgstr "Hakemisto"
+
+msgid "PubSub Collection"
+msgstr "PubSub-kokoelma"
+
+msgid "PubSub Leaf"
+msgstr "PubSub-lehti"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Kuvaus:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Palveluiden löytö"
+
+msgid "_Browse"
+msgstr "_Selaa"
+
+msgid "Server does not exist"
+msgstr "Palvelinta ei ole"
+
+msgid "Server does not support service discovery"
+msgstr "Palvelin ei palveluiden löytämistä"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP-palveluiden löytö"
+
+msgid "Allows browsing and registering services."
+msgstr "Sallii palveluiden selaamisen ja rekisteröimisen."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Tätä liitännäistä voidaan käyttää vanhojen siirtotapojen tai muiden XMPP-"
+"palveluiden rekisteröimiseen."
+
 msgid "Buddy is idle"
 msgstr "Tuttava on jouten"
 
@@ -13336,7 +13591,7 @@ msgstr "Musiikkiviestintäliitännäinen yhdessä säveltämistä varten."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Musiikkiviestintäliitännäinen sallii usean käyttäjän työskennellä yhtä aikaa "
 "musiikkikappaleen parissa, muokkaamalla samaa sävellystä yhdessä, "
@@ -13450,12 +13705,6 @@ msgstr ""
 "- Lähettää viestin listalla oleville tuttavillesi aina kun he kirjautuvat "
 "sisään"
 
-msgid "Cursor Color"
-msgstr "Kohdistimen väri"
-
-msgid "Secondary Cursor Color"
-msgstr "Toissijainen kohdistimen väri"
-
 msgid "Hyperlink Color"
 msgstr "Hyperlinkin väri"
 
@@ -13465,6 +13714,9 @@ msgstr "Vieraillun hyperlinkin väri"
 msgid "Highlighted Message Name Color"
 msgstr "Korostetun viestin nimen väri"
 
+msgid "Typing Notification Color"
+msgstr "Kirjoittamishuomautuksen väri"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView - leveyssuuntainen erotus"
 
@@ -13494,35 +13746,21 @@ msgstr "GTK+-käyttöliittymän kirjasin"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekstioikopolkuteema"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Käyttöliittymän värit"
+msgid "Disable Typing Notification Text"
+msgstr "Ota kirjoittamishuomautus pois käytöstä"
 
-msgid "Widget Sizes"
-msgstr "Säädinkoot"
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+-teemanhallinta"
+
+msgid "Colors"
+msgstr "Värit"
 
 msgid "Fonts"
 msgstr "Kirjasimet"
 
+msgid "Miscellaneous"
+msgstr "Sekalaiset"
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc-tiedostotyökalut"
 
@@ -13610,7 +13848,7 @@ msgstr "Keskusteluikkunan Läheta-painike."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Lisää keskusteluikkunan kirjoitusalueelle Lähetä-painikkeen. Tarkoitettu "
 "käytettäväksi, kun fyysistä näppäimistöä ei ole käytettävissä."
@@ -13666,6 +13904,95 @@ msgstr "Tekstin korvaus"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Korvaa lähetettävän tekstin käyttäjän määritelmän mukaan."
 
+msgid "Just logged in"
+msgstr "Juuri kirjautunut sisään"
+
+msgid "Just logged out"
+msgstr "Juuri kirjautunus ulos"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Kuvake yhteystiedolle/\n"
+"kuvake tuntemattomalle henkilölle"
+
+msgid "Icon for Chat"
+msgstr "Kuvake ryhmäkeskustelulle"
+
+msgid "Ignored"
+msgstr "Jätetty huomiotta"
+
+msgid "Founder"
+msgstr "Perustaja"
+
+msgid "Operator"
+msgstr "Operaattori"
+
+msgid "Half Operator"
+msgstr "Puolioperaattori"
+
+msgid "Authorization dialog"
+msgstr "Valtuutusvalintaikkuna"
+
+msgid "Error dialog"
+msgstr "Virhevalintaikkuna"
+
+msgid "Information dialog"
+msgstr "Tietovalintaikkuna"
+
+msgid "Mail dialog"
+msgstr "Sähköpostin valintaikkuna"
+
+msgid "Question dialog"
+msgstr "Kysymysvalintaikkuna"
+
+msgid "Warning dialog"
+msgstr "Varoitusvalintaikkuna"
+
+msgid "What kind of dialog is this?"
+msgstr "Minkä tyyppinen valintaikkuna tämä on?"
+
+msgid "Status Icons"
+msgstr "Tilakuvakkeet"
+
+msgid "Chatroom Emblems"
+msgstr "Keskusteluhuoneiden tunnuskuvat"
+
+msgid "Dialog Icons"
+msgstr "Valintaikkunan kuvakkeet"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidginin kuvaketeemaeditori"
+
+msgid "Contact"
+msgstr "Yhteystieto"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidginin tuttavaluettelon teemaeditori"
+
+msgid "Edit Buddylist Theme"
+msgstr "Muokkaa tuttavaluettelon teemaa"
+
+msgid "Edit Icon Theme"
+msgstr "Muokkaa kuvaketeemaa"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidginin teemaeditori"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidginin teemaeditori."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13832,9 +14159,6 @@ msgstr "_Pidä tuttavat-ikkuna päällimmäisenä:"
 msgid "Only when docked"
 msgstr "Vain telakoituna"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_Vilkuta ikkunaa ryhmäkeskusteluviestien saapuessa"
-
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin -valinnat"
 
@@ -13842,9 +14166,9 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Asetukset jotka liittyvät erityisesti Pidginin Windows-versioon "
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Tarjoaa Windows Pidgin -sidonnaisia valintoja, kuten tuttavat-ikkunan "
+"Tarjoaa Windows Pidgin -sidonnaisia valintoja, kuten Tuttavat-ikkunan "
 "telakoinnin."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13886,6 +14210,510 @@ msgstr ""
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "_Proxy"
+#~ msgstr "_Välipalvelin"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Pistoketta ei voi avata"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Pistoketta ei voi kuunnella"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Ei kyetty lukemaan pistoketta"
+
+#~ msgid "Connection failed."
+#~ msgstr "Yhteys epäonnistui."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Palvelin on katkaissut yhteyden"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Pistokkeen luominen epäonnistui"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Yhteyttä isäntään ei voi muodostaa"
+
+#~ msgid "Read error"
+#~ msgstr "Virhe luettaessa"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Yhteyttä palvelimeen ei voi muodostaa:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Virhe kirjoituksessa"
+
+#~ msgid "Last Activity"
+#~ msgstr "Viimeisin aktiivisena olo"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Palvelulöytötiedot"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Palvelulöytökohteet"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Laajennettu raakalohko-osoitus"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Monen käyttäjän keskustelu"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Monen käyttäjän keskustelun laajennetut läsnäolotiedot"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-band-tavujonot"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc-komennot"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub-palvelu"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5-tavujonot"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Out of band -tiedot"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Rekisteröinti \"in-band\""
+
+#~ msgid "User Location"
+#~ msgstr "Käyttäjän sijainti"
+
+#~ msgid "User Avatar"
+#~ msgstr "Käyttäjän hahmo"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Keskustelun tilan ilmoitukset"
+
+#~ msgid "Software Version"
+#~ msgstr "Ohjelmistoversio"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Virtauksen alustus"
+
+#~ msgid "User Mood"
+#~ msgstr "Käyttäjän mieliala"
+
+#~ msgid "User Activity"
+#~ msgstr "Käyttäjän aktiivisuus"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Entiteetin ominaisuudet"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Salatut istuntojen neuvottelut"
+
+#~ msgid "User Tune"
+#~ msgstr "Käyttäjänimi"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Tuttavaluetteloiden vaihto"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Tavoitettavuusosoite"
+
+#~ msgid "User Profile"
+#~ msgstr "Käyttäjän profiili"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle-ääni"
+
+#~ msgid "User Nickname"
+#~ msgstr "Käyttäjän kutsumanimi"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle raaka-UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle-video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Viestikuittaukset"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Julkisen avaimen julkaiseminen"
+
+#~ msgid "User Chatting"
+#~ msgstr "Käyttäjä keskustelee"
+
+#~ msgid "User Browsing"
+#~ msgstr "Käyttäjä selaa"
+
+#~ msgid "User Gaming"
+#~ msgstr "Käyttäjä pelaa"
+
+#~ msgid "User Viewing"
+#~ msgstr "Käyttäjä katselee"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Raakalohkojen salaus"
+
+#~ msgid "Entity Time"
+#~ msgstr "Entiteetin aika"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Viivästetty toimitus"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Yhteistyötä tekevät dataobjektit"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Tiedostovarasto ja jakaminen"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN-palvelun löytäminen Jinglelle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Yksinkertaistettu salatun istunnon neuvottelu"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hyppytarkistus"
+
+#~ msgid "Read Error"
+#~ msgstr "Virhe luettaessa"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Palvelimeen ei saatu yhteyttä."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Lukupuskuri täynnä (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Viestin jäsennys epäonnistui"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Yhteyttä isäntään ei voi muodostaa: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Kirjautuminen epäonnistui (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Virhe. SSL-tuki ei ole asennettu."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Virheellinen salasana."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ei saatu yhteyttä BOS-palvelimeen:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Yhteytesi saattaa katketa kohta. Tarkista päivitykset: %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Yhteyttä ei voi muodostaa"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Palvelinvastauksen salausta ei voi purkaa"
+
+#~ msgid "Invalid username."
+#~ msgstr "Epäkelpo käyttäjänimi."
+
+#~ msgid "Connection lost"
+#~ msgstr "Yhteys katkesi"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Yhteyttä isäntään ei voi löytää"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Yhteys suljettu (kirjoitus)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Yhteys suljettu"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Virhe luettaessa socketista: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
+
+#~ msgid "Could not write"
+#~ msgstr "Kirjoittaminen ei onnistu"
+
+#~ msgid "Could not connect"
+#~ msgstr "Yhdistäminen ei onnistu"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kuuntelupistokkeen luominen epäonnistui"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Isäntänimeä ei voi selvittää"
+
+#~ msgid "Incorrect Password"
+#~ msgstr "Virheellinen salasana"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Yhteyttä ei voi muodostaa palvelimeen %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japani"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Hakulaitepalvelin (Japani)"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Tiedostonsiirtopalvelin (Japani)"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Yhteys palvelimeen katkesi\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Isäntänimeä ei voi selvittää"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Palvelimelle %s ei voi yhdistää: palvelin vaatii TSL/SSL-tuen, mutta TLS/"
+#~ "SSL-tukea ei löydy."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Keskusteluikkunan piilottaminen"
+
+#~ msgid "More Data needed"
+#~ msgstr "Lisää tietoja tarvitaan"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Syötä hymiöön liitettävä oikotie."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Valitse hymiölle kuva."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Mikä tunnus (ID) aktivoidaan?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Kohdistimen väri"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Toissijainen kohdistimen väri"
+
+#~ msgid "Interface colors"
+#~ msgstr "Käyttöliittymän värit"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Säädinkoot"
+
+#~ msgid "Invite message"
+#~ msgstr "Kutsuviesti"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen \n"
+#~ "kutsuviesti."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "MSN-osoitekirjaa ei onnistuttu noutamaan"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Etsitään %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s: yhteyden muodostaminen epäonnistui"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Kirjautuminen: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Ei kyetty kirjoittamaan tiedostoa %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Ei kyetty lukemaan tiedostoa %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Viesti on liian pitkä, viimeiset %s tavua katkaistu."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s ei ole parhaillaan kirjautuneena sisään."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s:n varoittaminen ei ole sallittua."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Viesti on hylätty, ylität palvelimen nopeusrajan."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Ryhmäkeskustelu %s ei ole käytettävissä."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Lähetät viestejä %s:lle liian nopeasti."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Et saanut %s:n pikaviestiä koska se oli liian suuri."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Et saanut %s:n pikaviestiä koska se lähetettiin liian nopeasti."
+
+#~ msgid "Failure."
+#~ msgstr "Epäonnistuminen."
+
+#~ msgid "Too many matches."
+#~ msgstr "Liian monta tulosta."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Tarvitaan lisää määritteitä."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Hakemistopalvelu ei tilapäisesti ole käytettävissä."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Sähköpostin katsominen rajoitettu."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Avainsanasta ei välitetty."
+
+#~ msgid "No keywords."
+#~ msgstr "Ei avainsanoja."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Käyttäjällä ei ole hakemistotietoja."
+
+#~ msgid "Country not supported."
+#~ msgstr "Maa ei tuettu."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Tunnistamaton epäonnistuminen: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Virheellinen käyttäjänimi tai salasana."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Palvelu ei tilapäisesti ole käytössä."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Varoitustasosi on parhaillaan liian korkea kirjautuaksesi sisään."
+
+#~ 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 ""
+#~ "Olet ottanut ja katkaissut yhteyden liian tiheään. Odota kymmenen "
+#~ "minuuttia ja yritä uudestaan. Jos jatkat yrittämistä, joudut odottamaan "
+#~ "vielä pidempään."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Tuntematon sisäänkirjautumisvirhe esiintyi: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Tuntematon virhe, %d, esiintyi. Tiedot: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Epäkelpo ryhmän nimi"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Yhteys suljettu"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Odotetaan vastausta..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC on palannut tauoltaan. Voit lähettää viestejä jälleen."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Salasanan vaihto onnistui"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Hae hakemistotiedot"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Aseta hakemistotiedot"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Yhteyttä siirtoa varten ei voi muodostaa."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Tiedosto-otsikkoa ei voi kirjoittaa. Tiedostoa ei siirretä."
+
+#~ msgid "Save As..."
+#~ msgstr "Tallenna nimellä..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s pyytää %s hyväksymään %d tiedoston: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s pyytää %s hyväksymään %d tiedostot: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s pyytää sinua lähettämään hänelle tiedoston"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC-yhteyskäytäntöliitännäinen"
+
+#~ msgid "%s Options"
+#~ msgstr "%s-valinnat"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Välipalvelinvalinnat"
+
+#~ msgid "By log size"
+#~ msgstr "Lokin koon mukaan"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Avaa linkki selaimessa"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN-palvelin:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Hymiön kuva"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Hymiön _oikotie"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Vilkuta ikkunaa ryhmäkeskusteluviestien saapuessa"
+
 #~ msgid ""
 #~ "You may be disconnected shortly.  You may want to use TOC until this is "
 #~ "fixed.  Check %s for updates."
@@ -14150,9 +14978,6 @@ msgstr ""
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "Pyyntösi liittyä ryhmään %d hyväksyttiin ylläpitäjän %d toimesta"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Tämä ryhmä on lisätty tuttaviisi"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Pyydän liittymistä"
 
@@ -14186,9 +15011,6 @@ msgstr ""
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Ei voi kirjautua. Tarkista virheenjäljitysloki."
 
-#~ msgid "Unable to login"
-#~ msgstr "Ei voi kirjautua"
-
 #~ msgid "Failed room reply"
 #~ msgstr "Epäonnistunut huoneen vastaus"
 
@@ -14235,9 +15057,6 @@ msgstr ""
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr "<i>(vastaanotetaan)</i>"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Virhe pyydettäessä kirjautumispolettia"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP-osoite"
 
@@ -14304,9 +15123,6 @@ msgstr ""
 #~ "valita lempinimen tuttavalle. Lempinimi näytetään näyttönimen sijasta "
 #~ "aina kuin mahdollista.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Käyttäjätili:"
-
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Ilmoita vain kun tilani on \"tavoittamattomissa\""
 
@@ -14320,14 +15136,6 @@ msgstr ""
 #~ "Pahoittelut, MySpace ei tue salasanoja jotka ovat yli %d kirjainta pitkiä "
 #~ "(sinun on %d kirjainta)."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Mene osoitteeseen http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username ja valitse käyttäjänimesi. Kirjaudu sitten "
-#~ "uudestaan."
-
 #~ msgid "Invalid chat name specified."
 #~ msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
@@ -14393,10 +15201,6 @@ msgstr ""
 #~ msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
-
-#, fuzzy
 #~ msgid "Show offline buddies"
 #~ msgstr "Näytä poissaolevat tuttavat"
 
@@ -14834,9 +15638,6 @@ msgstr ""
 #~ msgid "minutes."
 #~ msgstr "minuuttia."
 
-#~ msgid "Nickname: %s\n"
-#~ msgstr "Kutsumanimi: %s\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Idle: %s"
@@ -14881,13 +15682,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Kuvaus:</b> Aavemainen"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15284,18 +16078,9 @@ msgstr ""
 #~ msgid "%s went away"
 #~ msgstr "%s on poissa"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s kirjautui ulos."
-
-#~ msgid "Background color name"
-#~ msgstr "Taustavärin nimi"
-
 #~ msgid "Background color as a string"
 #~ msgstr "Taustaväri merkkijonona"
 
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "Taustaväri GdkColor-tyyppisenä"
-
 #~ msgid "Background set"
 #~ msgstr "Taustaväri asetettu"
 
@@ -15350,9 +16135,6 @@ msgstr ""
 #~ msgid "Calling %s"
 #~ msgstr "Soitetaan %s"
 
-#~ msgid "End Call"
-#~ msgstr "Lopeta puhelu"
-
 #~ msgid "Receiving call from %s"
 #~ msgstr "Puhelu tulossa käyttäjältä %s"
 
@@ -15594,9 +16376,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "_on jouten"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "palaa oltuaan _jouten"
-
 #~ msgid "Bro_wse..."
 #~ msgstr "_Selaa"
 
@@ -15632,9 +16411,6 @@ msgstr ""
 #~ msgstr[0] "(%d viesti)"
 #~ msgstr[1] "(%d viestiä)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 viesti)"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Piilota yhteydenkatkaisuvirheilmoitukset"
 
@@ -15686,9 +16462,6 @@ msgstr ""
 #~ msgid "Show transfer details"
 #~ msgstr "Näytä tiedostonsiirron yksityiskohdat"
 
-#~ msgid "Expander Size"
-#~ msgstr "Laajentajan koko"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Laajennusnuolen koko"
 
@@ -16000,9 +16773,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Lähetä viesti valitulle tuttavalle"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Hae tietoja valitusta tuttavasta"
-
 #~ msgid "_Chat"
 #~ msgstr "_Keskustelu"
 
@@ -16161,9 +16931,6 @@ msgstr ""
 #~ msgid "New conversation _placement:"
 #~ msgstr "Uusi keskustelu_asetettelu:"
 
-#~ msgid "Message Text"
-#~ msgstr "Viestin teksti"
-
 #~ msgid "Please create an account."
 #~ msgstr "Luo uusi käyttäjätili"
 
@@ -16235,9 +17002,6 @@ msgstr ""
 #~ msgid "Invisible for friends only"
 #~ msgstr "Näkymätön vain ystäville"
 
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "Ei kyetty selvittämään isännän nimeä."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "Virhe kirjoitettaessa socketiin."
 
diff --git a/po/fr.po b/po/fr.po
index 6522b81f05..bfc819ce41 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 01:27+0100\n"
-"PO-Revision-Date: 2009-02-23 01:25+0100\n"
+"POT-Creation-Date: 2009-07-19 22:15+0200\n"
+"PO-Revision-Date: 2009-07-19 22:15+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -622,19 +622,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Envoyer vers"
 
-msgid "Invite message"
-msgstr "Message d'invitation"
-
-msgid "Invite"
-msgstr "Inviter"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Saisissez le nom de l'utilisateur que vous voulez inviter,\n"
-"ainsi qu'un message d'invitation facultatif."
-
 msgid "Conversation"
 msgstr "Conversation"
 
@@ -897,6 +884,39 @@ msgstr "Toutes les conversations"
 msgid "System Log"
 msgstr "Archives des messages système"
 
+msgid "Calling ... "
+msgstr "Appel... "
+
+msgid "Hangup"
+msgstr "Raccrocher"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Accepter"
+
+msgid "Reject"
+msgstr "Refuser"
+
+msgid "Call in progress."
+msgstr "Appel en cours."
+
+msgid "The call has been terminated."
+msgstr "L'appel s'est terminé."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s veut engager une session audio."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s essaie d'engager une session audio de type non supportée."
+
+msgid "You have rejected the call."
+msgstr "Vous avez refusé l'appel."
+
+msgid "call: Make an audio call."
+msgstr "call : appel audio."
+
 msgid "Emails"
 msgstr "Courriers électroniques"
 
@@ -931,6 +951,9 @@ msgstr "Continuer"
 msgid "IM"
 msgstr "Message"
 
+msgid "Invite"
+msgstr "Inviter"
+
 msgid "(none)"
 msgstr "(aucun)"
 
@@ -1134,7 +1157,6 @@ msgstr "%s est passé absent (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s vous a envoyé un message. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Événement d'alerte inconnu. Veuillez reporter cette erreur."
 
@@ -1544,6 +1566,31 @@ msgstr "Gnt Dernière occurrence"
 msgid "Lastlog plugin."
 msgstr "Dernière occurrence"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Récupération TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Création de TinyURL seulement pour les liens de cette taille mini"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Préfixe d'adresse TinyURL (ou autre)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Plugin TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"À la réception d'un message avec un ou plusieurs liens hypertextes, utilise "
+"TinyURL pour les copier plus facilement."
+
 msgid "accounts"
 msgstr "Comptes"
 
@@ -1644,13 +1691,6 @@ msgstr "Accepter le certificat pour %s ?"
 msgid "SSL Certificate Verification"
 msgstr "Vérification de certificat SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Accepter"
-
-msgid "Reject"
-msgstr "Refuser"
-
 msgid "_View Certificate..."
 msgstr "_Voir le certificat..."
 
@@ -1753,6 +1793,7 @@ msgstr "+++ %s vient de se connecter"
 msgid "+++ %s signed off"
 msgstr "+++ %s a quitté"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -1799,6 +1840,17 @@ msgstr "%s a quitté le salon"
 msgid "%s left the room (%s)."
 msgstr "%s a quitté le salon (%s)"
 
+msgid "Invite to chat"
+msgstr "Inviter à une discussion"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Saisissez le nom de l'utilisateur que vous voulez inviter dans la "
+"discussion, ainsi qu'un message d'invitation facultatif."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Impossible de récupérer une connexion : %s"
@@ -1932,6 +1984,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Démarrage du transfert de %s depuis %s."
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Transfert du fichier <A HREF=\"file://%s\">%s</A> terminé"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfert du fichier « %s » terminé"
 
@@ -2147,6 +2203,9 @@ msgstr "<font color=\"red\"><b>Impossible de lire le fichier %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Réponse automatique> : %s\n"
 
+msgid "Error creating conference."
+msgstr "Erreur à la création de la conférence."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Vous utilisez %s, mais ce plugin a besoin de %s."
@@ -2556,14 +2615,14 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Quand les archives sont consultés, ce plugin ajoute les archives d'autres "
 "clients de messagerie instantanée. Cela inclut actuellement Adium, MSN "
-"Messenger et Trillian.\n"
+"Messenger, aMSN et Trillian.\n"
 "\n"
 "ATTENTION : ce plugin est encore en phase de développement précoce et peut "
 "planter fréquemment. Utilisez le à vos risques et périls !"
@@ -2614,10 +2673,10 @@ msgstr ""
 "qu'alerte."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Les messages seront enregistrés en tant qu'alerte. Vous pouvez modifier ou "
+"Les messages seront enregistrés en tant qu'alertes. Vous pouvez modifier ou "
 "supprimer l'alerte dans la fenêtre « Alerte »."
 
 #, c-format
@@ -2646,6 +2705,35 @@ msgstr "Enregistrer les messages déconnectés dans une alerte."
 msgid "Do not ask. Always save in pounce."
 msgstr "Ne jamais demander. Toujours créer une alerte."
 
+msgid "One Time Password"
+msgstr "Mot de passe jetable"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Support de mot de passe à usage unique"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "S'assure que les mots de passe ne peuvent être utilisés qu'une fois."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Permet de s'assurer pour certains comptes que les mot de passe n'est pas "
+"sauvegardé et qu'il n'est utilisé que pour une seule connexion validée.\n"
+"NB : le mot de passe ne doit pas déjà être sauvegardé pour que cela "
+"fonctionne."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2798,10 +2886,10 @@ msgid "Notify When"
 msgstr "Notification quand"
 
 msgid "Buddy Goes _Away"
-msgstr "L'utilisateur s'absente"
+msgstr "L'utilisateur s'_absente"
 
 msgid "Buddy Goes _Idle"
-msgstr "L'utilisateur passe inactif"
+msgstr "L'utilisateur passe _inactif"
 
 msgid "Buddy _Signs On/Off"
 msgstr "_Connexion/déconnexion d'un contact"
@@ -2841,15 +2929,14 @@ msgstr ""
 "activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Le kit Apple Bonjour pour Windows n'a pas été trouvé. Veuillez consulter la "
-"FAQ disponible sur : http://d.pidgin.im/wiki/BonjourWindows pour plus "
-"d'informations."
+"Impossible de trouver le kit Apple Bonjour pour Windows. Veuillez consulter "
+"http://d.pidgin.im/wiki/BonjourWindows pour plus d'informations."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Impossible d'attendre des connexions rentrantes de messages.\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Impossible d'attendre des connexions rentrantes de messages"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2903,14 +2990,17 @@ msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Impossible d'envoyer le message, la conversation n'a pas pu être commencée."
 
-msgid "Cannot open socket"
-msgstr "Impossible d'ouvrir la connexion."
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Impossible de créer le socket : %s"
 
-msgid "Could not bind socket to port"
-msgstr "Impossible d'affecter un port à la connexion."
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Impossible d'affecter un port à la connexion : %s"
 
-msgid "Could not listen on socket"
-msgstr "Impossible de se mettre en écoute sur la connexion."
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Impossible de se mettre en écoute sur la connexion : %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Erreur de communication avec le mDNSResponder local."
@@ -2957,14 +3047,14 @@ msgstr "Sauver la liste de contacts..."
 msgid "Load buddylist from file..."
 msgstr "Charger la liste de contacts depuis un fichier..."
 
-msgid "Fill in the registration fields."
-msgstr "Renseignez les rubriques d'inscription."
+msgid "You must fill in all registration fields"
+msgstr "Vous devez renseignez toutes les rubriques d'inscription"
 
-msgid "Passwords do not match."
-msgstr "Les mots de passe diffèrent."
+msgid "Passwords do not match"
+msgstr "Les mots de passe diffèrent"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Une erreur est survenue. Impossible d'inscrire un nouveau compte.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Une erreur est survenue. Impossible d'inscrire un nouveau compte."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nouveau compte Gadu-Gadu créé."
@@ -2975,14 +3065,14 @@ msgstr "Inscription effectuée."
 msgid "Password"
 msgstr "Mot de passe"
 
-msgid "Password (retype)"
-msgstr "Mot de passe (pour vérification)"
+msgid "Password (again)"
+msgstr "Mot de passe (confirmation)"
 
-msgid "Enter current token"
-msgstr "Saisissez le jeton actuel"
+msgid "Enter captcha text"
+msgstr "Saisissez le texte captcha"
 
-msgid "Current token"
-msgstr "Jeton actuel"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Créer un nouveau compte Gadu-Gadu"
@@ -3035,6 +3125,15 @@ msgstr "Changement de mot de passe effectué."
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
+msgid "Password (retype)"
+msgstr "Mot de passe (pour vérification)"
+
+msgid "Enter current token"
+msgstr "Saisissez le jeton actuel"
+
+msgid "Current token"
+msgstr "Jeton actuel"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Saisissez votre mot de passe et un nouveau mot de passe pour cet UIN : "
@@ -3049,6 +3148,7 @@ msgstr "Choisissez un salon de discussions pour le contact : %s"
 msgid "Add to chat..."
 msgstr "Ajouter à la discussion..."
 
+#. Global
 msgid "Available"
 msgstr "Disponible"
 
@@ -3082,8 +3182,8 @@ msgstr "Aucun utilisateur correspondant trouvé."
 msgid "There are no users matching your search criteria."
 msgstr "Il n'y a pas d'utilisateur qui vérifie votre critère de recherche."
 
-msgid "Unable to read socket"
-msgstr "Impossible de lire le socket"
+msgid "Unable to read from socket"
+msgstr "Impossible de lire le socket."
 
 msgid "Buddy list downloaded"
 msgstr "Liste de contacts téléchargée"
@@ -3097,7 +3197,13 @@ msgstr "Liste de contacts envoyée"
 msgid "Your buddy list was stored on the server."
 msgstr "Votre liste de contacts à été stockée sur le serveur."
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connecté"
+
+msgid "Connection failed"
 msgstr "Échec de la connexion"
 
 msgid "Add to chat"
@@ -3106,14 +3212,23 @@ msgstr "Ajouter à la discussion"
 msgid "Chat _name:"
 msgstr "_Nom de la discussion :"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Impossible de résoudre le nom internet « %s » : %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connexion en cours"
+
 msgid "Chat error"
 msgstr "Erreur de discussion"
 
 msgid "This chat name is already in use"
 msgstr "Ce nom de discussion est déjà utilisé."
 
-msgid "Not connected to the server."
-msgstr "Vous n'êtes pas connecté au serveur."
+msgid "Not connected to the server"
+msgstr "Vous n'êtes pas connecté au serveur"
 
 msgid "Find buddies..."
 msgstr "Trouver des contacts..."
@@ -3154,6 +3269,9 @@ msgstr "Messagerie polonaise populaire"
 msgid "Gadu-Gadu User"
 msgstr "Utilisateur Gadu-Gadu"
 
+msgid "GG server"
+msgstr "Serveur GG"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Commande inconnue : %s"
@@ -3168,7 +3286,7 @@ msgstr "Pas de sujet"
 msgid "File Transfer Failed"
 msgstr "Échec du transfert de fichier."
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Impossible d'ouvrir un port en écoute."
 
 msgid "Error displaying MOTD"
@@ -3184,8 +3302,16 @@ msgstr "Il n'y a pas de message du jour associé à cette connexion."
 msgid "MOTD for %s"
 msgstr "Message du jour pour %s"
 
-msgid "Server has disconnected"
-msgstr "Déconnexion par le serveur"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Connexion perdue avec le serveur : %s"
 
 msgid "View MOTD"
 msgstr "Voir le message du jour"
@@ -3196,25 +3322,23 @@ msgstr "_Salon :"
 msgid "_Password:"
 msgstr "Mot de _passe :"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "Les pseudonymes IRC ne doivent pas avoir d'espace"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connexion en cours"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "Le pseudonyme et le serveur IRC ne doivent pas avoir d'espace"
 
 msgid "SSL support unavailable"
 msgstr "Support SSL non disponible"
 
-msgid "Couldn't create socket"
-msgstr "Impossible de créer le socket"
+msgid "Unable to connect"
+msgstr "Impossible de se connecter"
 
-msgid "Couldn't connect to host"
-msgstr "Impossible de se connecter à l'hôte"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Impossible de se connecter : %s"
 
-msgid "Read error"
-msgstr "Erreur de lecture"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Le serveur a fermé la connexion."
 
 msgid "Users"
 msgstr "Utilisateurs"
@@ -3395,11 +3519,21 @@ msgstr ""
 "Le nom de compte choisi a été rejeté par le serveur. Le nom contenait "
 "probablement des caractères non valides."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Le pseudonyme « %s » est déjà utilisé."
+
+msgid "Nickname in use"
+msgstr "Pseudonyme utilisé"
+
 msgid "Cannot change nick"
-msgstr "Impossible de changer de surnom"
+msgstr "Impossible de changer de pseudonyme"
 
 msgid "Could not change nick"
-msgstr "Impossible de changer de surnom"
+msgstr "Impossible de changer de pseudonyme"
 
 #, c-format
 msgid "You have parted the channel%s%s"
@@ -3637,12 +3771,12 @@ msgstr "Échec de la commande Ad-Hoc"
 msgid "execute"
 msgstr "execute"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "TLS/SSL est nécessaire pour la connexion au serveur. Aucun support de TLS/"
 "SSL n'a pu être trouvé."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Vous demandez un chiffrement mais aucun support de TLS/SSL n'a pu être "
 "trouvé."
@@ -3663,17 +3797,44 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Authentification en texte non chiffré"
 
-msgid "Invalid response from server."
+msgid "SASL authentication failed"
+msgstr "Échec de l'authentification SASL"
+
+msgid "Invalid response from server"
 msgstr "Réponse non valide du serveur"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Le serveur utilise une méthode d'authentification non supportée"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+"Vous voulez un chiffrement, mais il n'est pas disponible sur ce serveur."
+
 msgid "Invalid challenge from server"
 msgstr "Demande d'accès non valide du serveur"
 
-msgid "SASL error"
-msgstr "Erreur SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Erreur SASL : %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "Le gestionnaire de connexion BOSH a interrompu votre session."
+
+msgid "No session ID given"
+msgstr "Pas d'ID de session"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Version non supportée du protocole BOSH"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Impossible de se connecter au serveur"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Impossible de se connecter au serveur : %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Impossible de créer une connexion SSL"
 
 msgid "Full Name"
 msgstr "Nom complet"
@@ -3741,158 +3902,8 @@ msgstr "Client"
 msgid "Operating System"
 msgstr "Système d'exploitation"
 
-msgid "Last Activity"
-msgstr "Dernière activité"
-
-msgid "Service Discovery Info"
-msgstr "Informations du service de découverte"
-
-msgid "Service Discovery Items"
-msgstr "Items du service de découverte"
-
-msgid "Extended Stanza Addressing"
-msgstr "Adressage étendu de paragraphes"
-
-msgid "Multi-User Chat"
-msgstr "Discussion multi-utilisateurs"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Informations de présence des discussions multi-utilisateurs"
-
-msgid "In-Band Bytestreams"
-msgstr "Flux de données intrabandes"
-
-msgid "Ad-Hoc Commands"
-msgstr "Commandes ad-hoc"
-
-msgid "PubSub Service"
-msgstr "Service PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Flux de données SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Données hors de la bande passante"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Enregistrement intrabande"
-
-msgid "User Location"
-msgstr "Position de l'utilisateur"
-
-msgid "User Avatar"
-msgstr "Avatar de l'utilisateur"
-
-msgid "Chat State Notifications"
-msgstr "Notifications d'état de discussions"
-
-msgid "Software Version"
-msgstr "Version du logiciel"
-
-msgid "Stream Initiation"
-msgstr "Initialisation de flux"
-
-msgid "File Transfer"
-msgstr "Transfert de fichier"
-
-msgid "User Mood"
-msgstr "Humeur de l'utilisateur"
-
-msgid "User Activity"
-msgstr "Activité de l'utilisateur"
-
-msgid "Entity Capabilities"
-msgstr "Possibilités de l'entité"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Négociations de session chiffrée"
-
-msgid "User Tune"
-msgstr "Musique de l'utilisateur"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Profil de l'utilisateur"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle audio"
-
-msgid "User Nickname"
-msgstr "Pseudo de l'utilisateur"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "Reçus des messages"
-
-msgid "Public Key Publishing"
-msgstr "Publication de clé publique"
-
-msgid "User Chatting"
-msgstr "L'utilisateur discute"
-
-msgid "User Browsing"
-msgstr "L'utilisateur navigue le web"
-
-msgid "User Gaming"
-msgstr "L'utilisateur joue"
-
-msgid "User Viewing"
-msgstr "L'utilisateur observe"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Chiffrement de paragraphe"
-
-msgid "Entity Time"
-msgstr "Temps de l'entité"
-
-msgid "Delayed Delivery"
-msgstr "Livraison retardée"
-
-msgid "Collaborative Data Objects"
-msgstr "Objets de données collaboratives"
-
-msgid "File Repository and Sharing"
-msgstr "Répertoire de fichier et partage"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Service de découverte STUN pour Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Négociation de session chiffré simplifiée"
-
-msgid "Hop Check"
-msgstr "Vérifications des bonds"
-
-msgid "Capabilities"
-msgstr "Possibilités"
+msgid "Local Time"
+msgstr "Heure locale"
 
 msgid "Priority"
 msgstr "Priorité"
@@ -3900,6 +3911,13 @@ msgstr "Priorité"
 msgid "Resource"
 msgstr "Ressource"
 
+#, c-format
+msgid "%s ago"
+msgstr "il y a %s"
+
+msgid "Logged Off"
+msgstr "Deconnecté"
+
 msgid "Middle Name"
 msgstr "Deuxième prénom"
 
@@ -3940,9 +3958,9 @@ msgstr "Connexion"
 msgid "Log Out"
 msgstr "Déconnexion"
 
-# Repris du fr.po de gabber
+# Pour avoir le même texte que « Free for Chat »
 msgid "Chatty"
-msgstr "Bavard"
+msgstr "Libre pour discuter"
 
 msgid "Extended Away"
 msgstr "Longue absence"
@@ -4069,29 +4087,24 @@ msgstr "Choisissez un serveur de conférences"
 msgid "Find Rooms"
 msgstr "Chercher un salon de discussions"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-"Vous voulez un chiffrement, mais il n'est pas disponible sur ce serveur."
+msgid "Affiliations:"
+msgstr "Affiliations :"
 
-msgid "Write error"
-msgstr "Erreur d'écriture"
+msgid "No users found"
+msgstr "Aucun utilisateur trouvé."
 
-msgid "Ping timeout"
-msgstr "Pas de réponse au ping"
+msgid "Roles:"
+msgstr "Rôles :"
 
-msgid "Read Error"
-msgstr "Erreur de lecture"
+msgid "Ping timed out"
+msgstr "Pas de réponse au ping"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Impossible de se connecter au serveur :\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Impossible de créer le socket."
+"Impossible de trouver une autre méthode de connexion XMPP après l'échec de "
+"connexion directe."
 
 msgid "Invalid XMPP ID"
 msgstr "Identifiant XMPP non valide."
@@ -4099,6 +4112,9 @@ msgstr "Identifiant XMPP non valide."
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Identifiant XMPP non valide. Le domaine doit être saisi."
 
+msgid "Malformed BOSH URL"
+msgstr "URL BOSH mal formée"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Enregistrement de %s@%s réussi"
@@ -4123,9 +4139,6 @@ msgstr "Désinscription réussi"
 msgid "Unregistration Failed"
 msgstr "Échec à la désinscription"
 
-msgid "Already Registered"
-msgstr "Déjà enregistré"
-
 msgid "State"
 msgstr "État"
 
@@ -4138,6 +4151,9 @@ msgstr "Téléphone"
 msgid "Date"
 msgstr "Date"
 
+msgid "Already Registered"
+msgstr "Déjà enregistré"
+
 msgid "Unregister"
 msgstr "Se désinscrire"
 
@@ -4193,6 +4209,12 @@ msgstr "Le serveur ne supporte pas le blocage"
 msgid "Not Authorized"
 msgstr "Non autorisé"
 
+msgid "Mood"
+msgstr "Humeur"
+
+msgid "Now Listening"
+msgstr "Écoute maintenant"
+
 msgid "Both"
 msgstr "Bidirectionnelle"
 
@@ -4214,12 +4236,6 @@ msgstr "Aucun"
 msgid "Subscription"
 msgstr "Inscription"
 
-msgid "Mood"
-msgstr "Humeur"
-
-msgid "Now Listening"
-msgstr "Écoute maintenant"
-
 msgid "Mood Text"
 msgstr "Texte d'humeur"
 
@@ -4262,9 +4278,6 @@ msgstr "Le mot de passe a été modifié"
 msgid "Error changing password"
 msgstr "Erreur lors du changement du mot de passe"
 
-msgid "Password (again)"
-msgstr "Mot de passe (confirmation)"
-
 msgid "Change XMPP Password"
 msgstr "Changer de mot de passe XMPP"
 
@@ -4458,16 +4471,24 @@ msgid "Unable to ping user %s"
 msgstr "Impossible d'envoyer un ping à l'utilisateur %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Impossible de buzzer, rien n'est connu sur l'utilisateur %s."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Impossible de buzzer, l'utilisateur %s est peut-être déconnecté."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Impossible de buzzer, l'utilisateur %s l'interdit."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"Impossible de buzzer, l'utilisateur %s l'interdit ou n'est pas capable de le "
+"recevoir."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Buzz %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4479,8 +4500,37 @@ msgid "%s has buzzed you!"
 msgstr "%s vient de vous buzzer !"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Buzz %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Impossible d'engager une session média avec %s : JID non valide"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+"Impossible d'engager une session média avec %s : l'utilisateur n'est pas en "
+"ligne"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Impossible d'engager une session média avec %s : pas d'inscription à la "
+"présence de l'utilisateur"
+
+msgid "Media Initiation Failed"
+msgstr "Échec de la session média"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Veuillez choisir parmi les ressources de %s, avec laquelle vous voulez "
+"engager une session média"
+
+msgid "Select a Resource"
+msgstr "Choisissez une ressource"
+
+msgid "Initiate Media"
+msgstr "Session média"
 
 msgid "config:  Configure a chat room."
 msgstr "config : Configurer un salon de discussions"
@@ -4501,18 +4551,20 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;utilisateur&gt; [salon] : Bannir un utilisateur d'un salon"
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;utilisateur&gt; &lt;owner|admin|member|outcast|none&gt; : "
-"Change l'affiliation d'un utilisateur dans le salon."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [pseudo1] [pseudo2] ... : "
+"Récupère les utilisateurs avec une certaine affiliation ou change "
+"l'affiliation d'utilisateurs dans le salon."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;utilisateur&gt; &lt;moderator|participant|visitor|none&gt; : "
-"Assigne à un utilisateur un rôle dans le salon."
+"role &lt;moderator|participant|visitor|none&gt; [pseudo1] [pseudo2] ... : "
+"Récupère les utilisateurs avec un certain rôle ou change le rôle "
+"d'utilisateurs dans le salon."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
@@ -4574,6 +4626,9 @@ msgstr "Serveur de connexion"
 msgid "File transfer proxies"
 msgstr "Serveur mandataire de transfert de fichiers"
 
+msgid "BOSH URL"
+msgstr "URL BOSH"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4612,6 +4667,14 @@ msgstr "Erreur de lecture du XML"
 msgid "Unknown Error in presence"
 msgstr "Erreur inconnue"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Erreur lors de l'arrivée dans la discussion %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Erreur dans la discussion %s"
+
 msgid "Create New Room"
 msgstr "Créer un nouveau salon"
 
@@ -4628,13 +4691,28 @@ msgstr "_Configurer le salon"
 msgid "_Accept Defaults"
 msgstr "_Accepter les paramètres par défaut"
 
+msgid "No reason"
+msgstr "Pas de raison"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Erreur lors de l'arrivée dans la discussion %s"
+msgid "You have been kicked: (%s)"
+msgstr "Vous avez été expulsé : (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Erreur dans la discussion %s"
+msgid "Kicked (%s)"
+msgstr "Expulsé (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Erreur lors du transfert dans le flux de données in-band.\n"
+
+msgid "Transfer was closed."
+msgstr "Le transfert a été interrompu."
+
+msgid "Failed to open the file"
+msgstr "Impossible d'ouvrir le fichier"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Impossible d'ouvrir le flux de données in-band"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4665,9 +4743,6 @@ msgstr ""
 "Veuillez sélectionner parmi les ressources de %s, à laquelle vous voulez "
 "envoyer un fichier"
 
-msgid "Select a Resource"
-msgstr "Choisissez une ressource"
-
 msgid "Edit User Mood"
 msgstr "Modifier l'humeur"
 
@@ -4964,6 +5039,31 @@ msgstr "Autres contacts"
 msgid "Non-IM Contacts"
 msgstr "Contacts non instantanés"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s a envoyé un clin d'œil. <a href='msn-wink://%s'>Cliquez ici pour le jouer."
+"</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s a envoyé un clin d'œil, mais il n'a pas pu être sauvé."
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s a envoyé un clip audio. <a href='audio://%s'>Cliquez ici pour le jouer.</"
+"a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s a envoyé un clip audio, mais il n'a pas pu être sauvé."
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s vous a envoyé une invitation voix, ce qui n'est pas encore supporté."
+
 msgid "Nudge"
 msgstr "Nudge"
 
@@ -5118,8 +5218,28 @@ msgstr ""
 "Le support de SSL est nécessaire pour MSN. Veuillez installer une "
 "bibliothèque SSL pour l'application."
 
-msgid "Failed to connect to server."
-msgstr "Impossible de se connecter au serveur."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Impossible d'ajouter le contact %s car son nom d'utilisateur est non valide. "
+"Les noms des contacts doivent être une adresse électronique valide."
+
+msgid "Unable to Add"
+msgstr "Impossible d'ajouter"
+
+msgid "Authorization Request Message:"
+msgstr "Message pour la demande d'autorisation :"
+
+msgid "Please authorize me!"
+msgstr "Autorise moi, s'il te plaît !"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Erreur à la récupération du profil."
@@ -5309,63 +5429,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Authentification Windows Live ID : réponse non valide."
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s n'est pas un nom de groupe valide"
-
-msgid "Unknown error."
-msgstr "Erreur inconnue"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s pour %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vient de vous envoyer un « Nudge. »"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Erreur inconnue (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Erreur inconnue (%d) : %s"
 
 msgid "Unable to add user"
 msgstr "Impossible d'ajouter un utilisateur"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Les utilisateurs suivants manquent dans votre carnet d'adresse"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Impossible d'ajouter l'utilisateur à la liste de %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Impossible de bloquer l'utilisateur pour %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Impossible d'autoriser l'utilisateur pour %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Liste de contacts pleine. Impossible d'ajouter %s."
-
+#. Unknown error!
 #, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s n'est pas un compte passeport valide."
+msgid "Unknown error (%d)"
+msgstr "Erreur inconnue (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Service temporairement indisponible."
+msgid "The following users are missing from your addressbook"
+msgstr "Les utilisateurs suivants manquent dans votre carnet d'adresse"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Le message mobile n'a pas été envoyé parce qu'il est trop long."
 
-msgid "Unable to rename group"
-msgstr "Impossible de renommer le groupe"
-
-msgid "Unable to delete group"
-msgstr "Impossible de supprimer le groupe"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5412,9 +5496,6 @@ msgstr "Le message n'a pas été envoyé à cause d'une erreur de codage inconnu
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Le message n'a pas été envoyé à cause d'une erreur inconnue."
 
-msgid "Unable to connect"
-msgstr "Impossible de se connecter"
-
 msgid "Writing error"
 msgstr "Erreur d'écriture"
 
@@ -5429,21 +5510,21 @@ msgstr ""
 "Erreur de connexion du serveur %s :\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Notre protocole n'est pas supportés par le serveur."
+msgid "Our protocol is not supported by the server"
+msgstr "Notre protocole n'est pas supporté par le serveur."
 
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr "Erreur à l'analyse du HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Vous venez de vous connecter depuis un autre endroit."
+msgid "You have signed on from another location"
+msgstr "Vous vous êtes connecté depuis un autre endroit."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Les serveurs MSN ne sont pas disponibles pour l'instant. Veuillez attendre "
 "un peu puis réessayer."
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr "Les serveurs MSN sont coupés temporairement."
 
 #, c-format
@@ -5474,6 +5555,15 @@ msgstr "Envoi du cookie"
 msgid "Retrieving buddy list"
 msgstr "Récupération de la liste de contacts"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s demande à voir votre webcam, ce qui n'est pas encore supporté."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s vous a envoyé une invitation webcam, ce qui n'est pas encore supporté."
+
 msgid "Away From Computer"
 msgstr "Absent"
 
@@ -5516,14 +5606,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Impossible d'envoyer le message à cause d'une erreur inconnue :"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "L'utilisateur %s vous a ajouté à sa liste de contacts."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "L'utilisateur %s vous a supprimé de sa liste de contacts."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Supprimer le contact du carnet d'adresses ?"
 
@@ -5553,6 +5635,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Plugin pour le protocole MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s n'est pas un nom de groupe valide"
+
+msgid "Unknown error."
+msgstr "Erreur inconnue"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s pour %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Impossible d'ajouter l'utilisateur à la liste de %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Impossible de bloquer l'utilisateur pour %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Impossible d'autoriser l'utilisateur pour %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Liste de contacts pleine. Impossible d'ajouter %s."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s n'est pas un compte passeport valide."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Service temporairement indisponible."
+
+msgid "Unable to rename group"
+msgstr "Impossible de renommer le groupe"
+
+msgid "Unable to delete group"
+msgstr "Impossible de supprimer le groupe"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "L'utilisateur %s vous a ajouté à sa liste de contacts."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "L'utilisateur %s vous a supprimé de sa liste de contacts."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Utilisateur inconnu : %s"
 
@@ -5583,6 +5713,8 @@ msgid "Lost connection with server"
 msgstr "Connexion perdue avec le serveur"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nouveaux courrier électroniques"
 
@@ -5621,27 +5753,23 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Ajouter les contacts du serveur"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connecté"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Erreur de protocole, code %d : %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s, votre mot de passe fait %d caractères, ce qui est supérieur à la "
-"longueur maximale de %d attendue par MySpaceIM. Veuillez raccourcir votre "
-"mot de passe à http://profileedit.myspace.com/index.cfm?"
-"fuseaction=accountSettings.changePassword puis réessayer."
+"%s, votre mot de passe fait %zu caractères, ce qui est supérieur à la "
+"longueur maximale de %d. Veuillez raccourcir votre mot de passe à http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"puis réessayer."
+
+msgid "Incorrect username or password"
+msgstr "Nom d'utilisateur ou mot de passe incorrect"
 
 msgid "MySpaceIM Error"
 msgstr "Erreur MySpaceIM"
@@ -5649,16 +5777,6 @@ msgstr "Erreur MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Condition de saisie non valide."
 
-msgid "Read buffer full (2)"
-msgstr "Buffer de lecture plein (2)"
-
-msgid "Unparseable message"
-msgstr "Impossible d'interpréter le message."
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Impossible de se connecter à l'hôte : %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Échec lors de l'ajout du contact."
 
@@ -5742,6 +5860,15 @@ msgstr "Total d'amis"
 msgid "Client Version"
 msgstr "Version du client"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Une erreur est survenue en essayant de changer le nom d'utilisateur. "
+"Veuillez réessayer ou aller sur http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username pour changer de nom d'utilisateur."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nom d'utilisateur disponible"
 
@@ -5958,9 +6085,6 @@ msgstr "Impossible de s'ajouter en tant que contact"
 msgid "Master archive is misconfigured"
 msgstr "L'archive principale est mal configurée"
 
-msgid "Incorrect username or password"
-msgstr "Nom d'utilisateur ou mot de passe incorrect"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Impossible de reconnaître le nom d'hôte ou d'utilisateur saisi"
 
@@ -6004,8 +6128,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Erreur inconnue :0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Échec à la connexion (%s)"
+msgid "Unable to login: %s"
+msgstr "Impossible de s'authentifier : %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6111,9 +6235,6 @@ msgstr "Conférence GroupWise %d"
 msgid "Authenticating..."
 msgstr "Authentification en cours..."
 
-msgid "Unable to connect to server."
-msgstr "Impossible de se connecter au serveur"
-
 msgid "Waiting for response..."
 msgstr "En attente de réponse..."
 
@@ -6137,26 +6258,18 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Voulez-vous rejoindre la discussion ?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Vous venez d'être déconnecté à la suite d'une connexion depuis un autre "
-"endroit."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s est déconnecté et n'a pas reçu le message que vous venez d'envoyer."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Impossible de se connecter au serveur. Veuillez saisir l'adresse du serveur "
 "sur lequel vous voulez vous connecter."
 
-msgid "Error. SSL support is not installed."
-msgstr "Support SSL non installé"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Cette conférence est fermée. Aucun message ne peut être envoyé."
 
@@ -6179,25 +6292,33 @@ msgstr "Hôte du serveur"
 msgid "Server port"
 msgstr "Port du serveur"
 
+msgid "Received unexpected response from "
+msgstr "Réception d'un message non attendu de "
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Vous vous êtes connecté/déconnecté trop rapidement. Attendez 10 minutes et "
+"réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
+"longtemps."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Erreur à la demande de "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL n'autorise pas votre nom d'utilisateur pour authentification ici."
+
 msgid "Could not join chat room"
 msgstr "Impossible de rejoindre le salon de discussions"
 
 msgid "Invalid chat room name"
 msgstr "Nom de salon non valide"
 
-msgid "Server closed the connection."
-msgstr "Le serveur a fermé la connexion."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Connexion perdue avec le serveur :\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Données non valides reçues sur la connexion du serveur."
+msgid "Received invalid data on connection with server"
+msgstr "Données non valides reçues à la connexion sur le serveur."
 
 #. *< type
 #. *< ui_requirement
@@ -6244,7 +6365,7 @@ msgstr "Connexion perdue avec l'interlocuteur :<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Données non valides reçues sur la connexion avec l'interlocuteur."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Impossible de se connecter à l'interlocuteur."
 
 msgid "Direct IM established"
@@ -6447,20 +6568,12 @@ msgid "Buddy Comment"
 msgstr "Commentaire"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Impossible de se connecter au serveur d'authentification :\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Impossible de se connecter au serveur d'authentification : %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Impossible de se connecter au serveur BOS :\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Impossible de se connecter au serveur BOS : %s"
 
 msgid "Username sent"
 msgstr "Nom d'utilisateur envoyé"
@@ -6474,54 +6587,61 @@ msgstr "Finalisation de la connexion"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Impossible de se connecter : le nom d'utilisateur %s est non valide. Les "
-"noms doivent soit être une adresse électronique valide, soit commencer par "
-"une lettre et contenir uniquement des lettres, des chiffres et des espaces, "
-"soit contenir uniquement des chiffres."
+"Impossible de se connecter en tant que %s, ce nom n'est pas valide. Les noms "
+"doivent soit être une adresse électronique valide, soit commencer par une "
+"lettre et contenir uniquement des lettres, des chiffres et des espaces, soit "
+"contenir uniquement des chiffres."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Nom d'utilisateur non valide."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Vous risquez d'être déconnecté sous peu. Si c'est le cas, consultez %s pour "
+"plus d'informations."
 
-msgid "Incorrect password."
-msgstr "Mot de passe incorrect."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Impossible de récupérer un code de connexion AIM valide."
+
+msgid "Unable to get a valid login hash."
+msgstr "Impossible de récupérer un code de connexion valide."
+
+msgid "Received authorization"
+msgstr "Autorisation reçue."
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Cet utilisateur n'existe pas"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr "Votre compte est actuellement suspendu."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Vous vous êtes connecté/déconnecté trop rapidement. Attendez 10 minutes et "
-"réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
-"longtemps."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La version du client que vous utilisez est trop ancienne. Veuillez la mettre "
 "à jour sur %s."
 
-msgid "Could Not Connect"
-msgstr "Impossible de se connecter."
-
-msgid "Received authorization"
-msgstr "Autorisation reçue."
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Vous vous reconnectez trop rapidement. Attendez quelques minutes et "
+"réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
+"longtemps."
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr "La clé SecurID saisie est non valide."
 
 msgid "Enter SecurID"
@@ -6530,29 +6650,6 @@ msgstr "Saisissez votre SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Saisissez les 6 chiffres de l'affichage numérique."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Vous risquez d'être déconnecté sous peu. Si c'est le cas, consultez %s pour "
-"plus d'informations."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Impossible de récupérer un code de connexion AIM valide."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Vous risquez être déconnecté sous peu. Consultez %s pour plus d'informations."
-
-msgid "Unable to get a valid login hash."
-msgstr "Impossible de récupérer un code de connexion valide."
-
 msgid "Password sent"
 msgstr "Mot de passe envoyé"
 
@@ -6562,12 +6659,6 @@ msgstr "Impossible de créer une connexion."
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorise moi pour que je t'ajoute à ma liste de contacts."
 
-msgid "Authorization Request Message:"
-msgstr "Message pour la demande d'autorisation :"
-
-msgid "Please authorize me!"
-msgstr "Autorise moi, s'il te plaît !"
-
 msgid "No reason given."
 msgstr "Pas de raison"
 
@@ -6695,7 +6786,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Vous avez raté %hu message de %s pour des raisons inconnues."
 msgstr[1] "Vous avez raté %hu messages de %s pour des raisons inconnues."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossible d'envoyer le message : %s"
@@ -6717,6 +6808,9 @@ msgstr "En ligne depuis"
 msgid "Member Since"
 msgstr "Inscrit depuis"
 
+msgid "Capabilities"
+msgstr "Possibilités"
+
 msgid "Profile"
 msgstr "Informations"
 
@@ -6902,7 +6996,7 @@ msgstr "Message d'absence trop long"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6911,9 +7005,6 @@ msgstr ""
 "soit commencer par une lettre et contenir uniquement des lettres, des "
 "chiffres et des espaces, soit contenir uniquement des chiffres."
 
-msgid "Unable to Add"
-msgstr "Impossible d'ajouter"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Impossible de récupérer la liste de contacts"
 
@@ -6930,7 +7021,7 @@ msgstr "Orphelins"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Impossible d'ajouter le contact %s parce qu'il y a trop de contacts dans la "
@@ -6940,7 +7031,7 @@ msgid "(no name)"
 msgstr "(pas de nom)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Impossible d'ajouter le contact %s pour une raison inconnue."
 
 #, c-format
@@ -7074,6 +7165,7 @@ msgstr "_Recherche"
 msgid "Set User Info (web)..."
 msgstr "Modifier les informations (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Changer de mot de passe (web)"
 
@@ -7103,6 +7195,9 @@ msgstr "Chercher un contact par adresse électronique..."
 msgid "Search for Buddy by Information"
 msgstr "Chercher d'après les informations..."
 
+msgid "Use clientLogin"
+msgstr "Utiliser clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7292,6 +7387,34 @@ msgstr "Mettre à jour"
 msgid "Could not change buddy information."
 msgstr "Impossible de changer les informations du contact."
 
+msgid "Mobile"
+msgstr "Téléphone portable"
+
+msgid "Note"
+msgstr "Commentaire"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Mémo du contact"
+
+msgid "Change his/her memo as you like"
+msgstr "Vous pouvez changer son mémo à votre convenance"
+
+msgid "_Modify"
+msgstr "_Modifier"
+
+msgid "Memo Modify"
+msgstr "Changer mémo"
+
+msgid "Server says:"
+msgstr "Message du serveur :"
+
+msgid "Your request was accepted."
+msgstr "Votre requête a été acceptée."
+
+msgid "Your request was rejected."
+msgstr "Votre requête a été rejetée."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u demande une vérification"
@@ -7600,11 +7723,17 @@ msgstr "<p><b>Charmants contributeurs de patchs :</b><br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Remerciements :</b><br>\n"
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Testeurs scrupuleux :</b><br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "et d'autres, faites-nous le savoir... merci !"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr "<p><i>et tous les personnes dans les coulisses...</i><br>\n"
+msgstr "<p><i>et toutes les personnes dans les coulisses...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr "<i>N'hésitez pas à mous rejoindre !</i> :)"
+msgstr "<i>N'hésitez pas à nous rejoindre !</i> :)"
 
 #, c-format
 msgid "About OpenQ %s"
@@ -7625,6 +7754,9 @@ msgstr "Mettre à jour tous les Quns QQ"
 msgid "About OpenQ"
 msgstr "À propos de OpenQ"
 
+msgid "Modify Buddy Memo"
+msgstr "Changer le mémo de l'utilisateur"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7671,7 +7803,7 @@ msgstr "Délai de Keep alive (en secondes)"
 msgid "Update interval (seconds)"
 msgstr "Délai de mise à jour (en secondes)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Impossible de déchiffrer la réponse du serveur"
 
 #, c-format
@@ -7696,9 +7828,6 @@ msgstr "Activation nécessaire"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Réponse inconnue à la connexion (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Impossible de déchiffrer la réponse du serveur"
-
 msgid "Requesting captcha"
 msgstr "Demande de captcha"
 
@@ -7732,30 +7861,17 @@ msgstr ""
 "Réponse inconnue à la connexion (0x%02X) :\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Impossible de se connecter"
-
 msgid "Socket error"
 msgstr "Erreur de socket."
 
-msgid "Unable to read from socket"
-msgstr "Impossible de lire le socket."
-
-msgid "Write Error"
-msgstr "Erreur d'écriture"
-
-msgid "Connection lost"
-msgstr "Connexion perdue."
-
 msgid "Getting server"
 msgstr "Récupération du serveur"
 
 msgid "Requesting token"
 msgstr "Requête d'un token"
 
-msgid "Couldn't resolve host"
-msgstr "Impossible de trouver l'adresse de l'hôte."
+msgid "Unable to resolve hostname"
+msgstr "Impossible de résoudre l'adresse internet."
 
 msgid "Invalid server or port"
 msgstr "Serveur ou port non valide"
@@ -7808,7 +7924,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Commande Qun QQ"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Impossible de déchiffrer la réponse de connexion"
 
 msgid "Unknown LOGIN CMD"
@@ -7828,9 +7944,6 @@ msgstr "Envoi de fichier"
 msgid "%d canceled the transfer of %s"
 msgstr "%d a annulé le transfert de %s"
 
-msgid "Connection closed (writing)"
-msgstr "Connexion terminée (en écriture)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titre du groupe :</b> %s<br>"
@@ -7885,17 +7998,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Annonce d'un administrateur Sametime"
 
-msgid "Connection reset"
-msgstr "Connexion remise à zéro"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Erreur à la lecture du socket : %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Impossible de se connecter à l'hôte"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Annonce de %s"
@@ -7918,6 +8020,9 @@ msgstr "Haut-parleurs"
 msgid "Video Camera"
 msgstr "Caméra vidéo"
 
+msgid "File Transfer"
+msgstr "Transfert de fichier"
+
 msgid "Supports"
 msgstr "Fonctionnalités"
 
@@ -8635,9 +8740,6 @@ msgstr "Organisation"
 msgid "Unit"
 msgstr "Groupe"
 
-msgid "Note"
-msgstr "Commentaire"
-
 msgid "Join Chat"
 msgstr "Rejoindre une discussion"
 
@@ -8737,6 +8839,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistiques du réseau"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Échec du ping"
 
@@ -8800,7 +8905,7 @@ msgstr "Type de clé publique non supporté"
 msgid "Disconnected by server"
 msgstr "Déconnexion par le serveur"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Erreur à la connexion au serveur SILC"
 
 msgid "Key Exchange failed"
@@ -8812,16 +8917,10 @@ msgstr ""
 "Échec de la reprise de session détachée. Choisissez « Reconnexion » pour "
 "créer une nouvelle connexion."
 
-msgid "Connection failed"
-msgstr "Échec de la connexion"
-
 msgid "Performing key exchange"
 msgstr "Échange de clé en cours"
 
-msgid "Unable to create connection"
-msgstr "Impossible de créer une connexion."
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Impossible de charger la paire de clés SILC"
 
 #. Progress
@@ -8831,8 +8930,8 @@ msgstr "Connexion au serveur SILC"
 msgid "Out of memory"
 msgstr "Pas assez de mémoire"
 
-msgid "Cannot initialize SILC protocol"
-msgstr "Impossible d'initialiser le protocole SILC."
+msgid "Unable to initialize SILC protocol"
+msgstr "Impossible d'initialiser le protocole SILC"
 
 msgid "Error loading SILC key pair"
 msgstr "Erreur de chargement de la paire de clés SILC"
@@ -9131,8 +9230,8 @@ msgstr "Signer numériquement et vérifier tous les messages"
 msgid "Creating SILC key pair..."
 msgstr "Création de la paire de clés SILC..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Impossible de créer la paire de clés SILC\n"
+msgid "Unable to create SILC key pair"
+msgstr "Impossible de créer la paire de clés SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9227,6 +9326,9 @@ msgstr "Tableau"
 msgid "No server statistics available"
 msgstr "Aucune statistique du serveur disponible"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Erreur à la connexion au serveur SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Échec : version incompatible, veuillez mettre à jour votre client"
@@ -9271,30 +9373,24 @@ msgstr "Échec : cookie invalide"
 msgid "Failure: Authentication failed"
 msgstr "Échec de l'authentification"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "Impossible d'initialiser la connexion client SILC"
 
 msgid "John Noname"
 msgstr "Anne Onyme"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Impossible de charger la paire de clés SILC : %s"
 
-msgid "Could not write"
-msgstr "Impossible d'envoyer."
-
-msgid "Could not connect"
-msgstr "Impossible de se connecter."
-
-msgid "Unknown server response."
-msgstr "Réponse du serveur inconnue."
+msgid "Unable to create connection"
+msgstr "Impossible de créer une connexion."
 
-msgid "Could not create listen socket"
-msgstr "Impossible de créer le socket d'écoute."
+msgid "Unknown server response"
+msgstr "Réponse du serveur inconnue"
 
-msgid "Could not resolve hostname"
-msgstr "Impossible de résoudre le nom de l'hôte."
+msgid "Unable to create listen socket"
+msgstr "Impossible de se mettre en écoute sur la connexion"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9336,181 +9432,60 @@ msgstr "Utilisateur d'authentification"
 msgid "Auth Domain"
 msgstr "Domaine d'authentification"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Recherche de %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Connexion à %s échouée"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Connexion : %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Impossible d'écrire dans le fichier %s"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Impossible de lire le fichier %s"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Message trop long, les %s derniers caractères sont perdus."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s n'est pas en ligne"
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Les avertissements de %s ne sont pas autorisés."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Un message a été perdu, vous dépassez la vitesse limite du serveur."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "La discussion %s est inaccessible."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Vous envoyez vos messages trop vite à %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Vous avez raté un message de %s parce que le message était trop gros,"
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Vous avez raté un message de %s parce qu'il a été envoyé trop vite."
-
-#, c-format
-msgid "Failure."
-msgstr "Échec"
-
-#, c-format
-msgid "Too many matches."
-msgstr "Trop de réponses"
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Besoin de plus de critères."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "L'annuaire est temporairement indisponible."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "La recherche par adresse électronique est restreinte."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Mot clé ignoré"
-
-#, c-format
-msgid "No keywords."
-msgstr "Pas de mot-clé"
-
-#, c-format
-msgid "User has no directory information."
-msgstr "L'utilisateur n'a pas d'informations personnelles."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Pays non supporté"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Échec inconnu : %s"
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Nom d'utilisateur ou mot de passe incorrect."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Le service est temporairement indisponible."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-"Votre niveau d'avertissement est actuellement trop élevé pour que vous "
-"puissiez vous connecter."
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"Vous vous êtes connecté et déconnecté trop rapidement. Attendez 10 minutes "
-"et réessayez. Si vous persistez maintenant, il vous faudra attendre encore "
-"plus longtemps."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Une erreur inconnue est survenue à la connexion : %s"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Une erreur inconnue (%d) s'est produite : %s"
-
-msgid "Invalid Groupname"
-msgstr "Nom de groupe non valide."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt; : Rejoindre une discussion sur le réseau Yahoo"
 
-msgid "Connection Closed"
-msgstr "Connexion terminée"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list : Récupérer la liste des salons du réseau Yahoo."
 
-msgid "Waiting for reply..."
-msgstr "En attente de réponse..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle : Envoie une demande pour un séance de griffonnage."
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"TOC est revenu de sa pause. Vous pouvez désormais envoyer des messages à "
-"nouveau."
+msgid "Yahoo ID..."
+msgstr "ID Yahoo..."
 
-msgid "Password Change Successful"
-msgstr "Changement de mot de passe effectué."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Plugin pour le protocole Yahoo"
 
-msgid "_Group:"
-msgstr "_Groupe :"
+msgid "Pager server"
+msgstr "Serveur de texto"
 
-msgid "Get Dir Info"
-msgstr "Chercher dans l'annuaire"
+msgid "Pager port"
+msgstr "Port du pager"
 
-msgid "Set Dir Info"
-msgstr "Changer les informations"
+msgid "File transfer server"
+msgstr "Server de transfert de fichiers"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Impossible d'ouvrir %s pour l'écriture"
+msgid "File transfer port"
+msgstr "Port de transfert de fichiers"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Échec du transfert de fichier. Annulation probable du correspondant."
+msgid "Chat room locale"
+msgstr "Langue du salon de discussions"
 
-msgid "Could not connect for transfer."
-msgstr "Impossible de se connecter pour le transfert"
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorer les invitations aux conférences et salons de discussions"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-"Impossible d'écrire l'entête de fichier. Le fichier n'est pas transmis."
+msgid "Chat room list URL"
+msgstr "URL de liste des salons de discussions"
 
-msgid "Save As..."
-msgstr "Enregistrer sous..."
+msgid "Yahoo Chat server"
+msgstr "Serveur Yahoo Chat"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s demande à %s d'accepter %d fichier : %s (%.2f %s)%s%s"
-msgstr[1] "%s demande à %s d'accepter %d fichiers : %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Port Yahoo Chat"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s vous demande de leur envoyer un fichier"
+msgid "Yahoo JAPAN ID..."
+msgstr "ID Yahoo Japon..."
 
 #. *< type
 #. *< ui_requirement
@@ -9522,13 +9497,11 @@ msgstr "%s vous demande de leur envoyer un fichier"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Plugin pour le protocole TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Plugin pour le protocole Yahoo Japon"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s vous a envoyé une invitation webcam, ce qui n'est pas encore supporté."
+msgid "Your SMS was not delivered"
+msgstr "Votre SMS n'a pas été transmis"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Votre message Yahoo! n'a pas été envoyé"
@@ -9554,6 +9527,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Ajout du contact refusé"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Données reçues non valides"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Compte bloqué : trop de mauvais mots de passe. Se connecter sur le site web "
+"Yahoo! peut corriger le problème."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Compte bloqué : raison inconnue. Se connecter sur le site web Yahoo! peut "
+"corriger le problème."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Nom d'utilisateur ou mot de passe manquant"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9590,39 +9587,28 @@ msgstr ""
 "problème."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossible d'ajouter le contact %s au groupe %s sur la liste du serveur pour "
 "le compte %s."
 
-msgid "Could not add buddy to server list"
-msgstr "Impossible d'ajouter le contact sur la liste du serveur."
+msgid "Unable to add buddy to server list"
+msgstr "Impossible d'ajouter le contact sur la liste du serveur"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Réception d'un message HTTP non attendu du serveur."
-
-msgid "Connection problem"
-msgstr "Problème de connexion"
+msgid "Received unexpected HTTP response from server"
+msgstr "Réception d'un message HTTP non attendu du serveur"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Connexion perdue avec %s :\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Connexion perdue avec %s : %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Impossible de se connecter avec %s :\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Impossible de se connecter à %s : %s"
 
 msgid "Not at Home"
 msgstr "Pas à la maison"
@@ -9669,8 +9655,8 @@ msgstr "Paramètres de présence"
 msgid "Start Doodling"
 msgstr "Commencer à griffonner"
 
-msgid "Activate which ID?"
-msgstr "Activer quelle identité ?"
+msgid "Select the ID you want to activate"
+msgstr "Choisissez l'ID que vous voulez activer"
 
 msgid "Join whom in chat?"
 msgstr "Qui rejoindre dans une discussion ?"
@@ -9684,73 +9670,15 @@ msgstr "Joindre l'utilisateur dans une discussion..."
 msgid "Open Inbox"
 msgstr "Ouvrir la boîte à lettres"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt; : Rejoindre une discussion sur le réseau Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list : Récupérer la liste des salons du réseau Yahoo."
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle : Envoie une demande pour un séance de griffonnage."
-
-msgid "Yahoo ID..."
-msgstr "ID Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Plugin pour le protocole Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japon"
-
-msgid "Pager server"
-msgstr "Serveur de texto"
-
-msgid "Japan Pager server"
-msgstr "Serveur japonais de texto"
-
-msgid "Pager port"
-msgstr "Port du pager"
-
-msgid "File transfer server"
-msgstr "Server de transfert de fichiers"
-
-msgid "Japan file transfer server"
-msgstr "Server japonais de transfert de fichiers"
-
-msgid "File transfer port"
-msgstr "Port de transfert de fichiers"
-
-msgid "Chat room locale"
-msgstr "Langue du salon de discussions"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorer les invitations aux conférences et salons de discussions"
-
-msgid "Chat room list URL"
-msgstr "URL de liste des salons de discussions"
-
-msgid "Yahoo Chat server"
-msgstr "Serveur Yahoo Chat"
-
-msgid "Yahoo Chat port"
-msgstr "Port Yahoo Chat"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Envoyer une demande Doodle."
 
+msgid "Unable to connect."
+msgstr "Impossible de se connecter"
+
 msgid "Unable to establish file descriptor."
 msgstr "Impossible de créer un descripteur de fichier"
 
@@ -9758,6 +9686,9 @@ msgstr "Impossible de créer un descripteur de fichier"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s essaie de vous envoyer un groupe de %d fichiers.\n"
 
+msgid "Write Error"
+msgstr "Erreur d'écriture"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japon"
 
@@ -9830,12 +9761,8 @@ msgid "The user's profile is empty."
 msgstr "Le profil de l'utilisateur est vide"
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s a décliné votre invitation à la conférence « %s » pour la raison : %s"
-
-msgid "Invitation Rejected"
-msgstr "Invitation refusée"
+msgid "%s has declined to join."
+msgstr "%s a décliné l'invitation."
 
 msgid "Failed to join chat"
 msgstr "Impossible de rejoindre la discussion."
@@ -9878,23 +9805,18 @@ msgstr "Voix"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Problème de connexion"
+
 msgid "Unable to fetch room list."
 msgstr "Impossible de récupérer la liste des salons"
 
 msgid "User Rooms"
 msgstr "Salon de discussions utilisateur"
 
-msgid "Connection problem with the YCHT server."
+msgid "Connection problem with the YCHT server"
 msgstr "Problème de connexion avec le serveur YCHT"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Connexion perdue avec le serveur :\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10026,34 +9948,23 @@ msgid "Exposure"
 msgstr "Exposition"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Impossible de créer le socket :\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Impossible de reconnaître la réponse du serveur mandataire HTTP : %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Impossible de reconnaître la réponse du serveur mandataire HTTP : %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erreur de connexion au serveur mandataire HTTP %d."
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Accès interdit : le serveur mandataire n'autorise pas le passage par le port "
-"%d."
+"%d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Erreur à la résolution du nom %s."
 
-msgid "Could not resolve host name"
-msgstr "Impossible de résoudre le nom de l'hôte."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Attire l'attention de %s..."
@@ -10140,9 +10051,6 @@ msgstr "Ne pas déranger"
 msgid "Extended away"
 msgstr "Longue absence"
 
-msgid "Mobile"
-msgstr "Téléphone portable"
-
 msgid "Listening to music"
 msgstr "Écoute de la musique"
 
@@ -10184,18 +10092,6 @@ msgstr "+++ %s devient actif."
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Erreur à la lecture de « %s »."
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Une erreur est survenue à la lecture de « %s ». Il n'a pas été chargé et "
-"l'ancien fichier a été renommé « %s~ »."
-
 msgid "Calculating..."
 msgstr "Calcul en cours"
 
@@ -10303,6 +10199,18 @@ msgstr "Connexion refusée."
 msgid "Address already in use."
 msgstr "Cette adresse est déjà utilisée."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Erreur à la lecture de « %s »."
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Une erreur est survenue à la lecture de « %s ». Il n'a pas été chargé et "
+"l'ancien fichier a été renommé « %s~ »."
+
 msgid "Internet Messenger"
 msgstr "Messagerie internet"
 
@@ -10345,10 +10253,8 @@ msgstr "Avertir des nouveaux _courriers"
 msgid "Use this buddy _icon for this account:"
 msgstr "Utiliser cette _icône pour ce compte :"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Options de %s"
+msgid "Ad_vanced"
+msgstr "_Avancé"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Utiliser les paramètres mandataires de GNOME"
@@ -10383,9 +10289,6 @@ msgstr "Si on regarde de très près"
 msgid "you can see the butterflies mating"
 msgstr "on peut voir les papillons s'accoupler"
 
-msgid "Proxy Options"
-msgstr "Options du serveur mandataire"
-
 msgid "Proxy _type:"
 msgstr "_Type :"
 
@@ -10413,8 +10316,8 @@ msgstr "_Essentiel"
 msgid "Create _this new account on the server"
 msgstr "Créer ce _nouveau compte sur le serveur"
 
-msgid "_Advanced"
-msgstr "_Avancé"
+msgid "P_roxy"
+msgstr "Serveur _mandataire"
 
 msgid "Enabled"
 msgstr "Activé"
@@ -10449,8 +10352,8 @@ msgstr ""
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vous avez %d contact nommé %s. Voulez-vous le fusionner ?"
+msgstr[1] "Vous avez %d contacts nommé %s. Voulez-vous les fusionner ?"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -10465,8 +10368,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Veuillez mettre à jour les rubriques nécessaires."
 
-msgid "Room _List"
-msgstr "_Liste des salons de discussions"
+msgid "A_ccount"
+msgstr "_Compte"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10475,8 +10378,8 @@ msgstr ""
 "Saisissez les informations sur le salon de discussions que vous voulez "
 "rejoindre.\n"
 
-msgid "_Account:"
-msgstr "C_ompte :"
+msgid "Room _List"
+msgstr "_Liste des salons de discussions"
 
 msgid "_Block"
 msgstr "_Bloquer"
@@ -10493,6 +10396,15 @@ msgstr "_Infos"
 msgid "I_M"
 msgstr "_Message"
 
+msgid "_Audio Call"
+msgstr "Appel _audio"
+
+msgid "Audio/_Video Call"
+msgstr "Appel audio/_vidéo"
+
+msgid "_Video Call"
+msgstr "Appel _vidéo"
+
 msgid "_Send File..."
 msgstr "Envoyer un _fichier..."
 
@@ -10502,9 +10414,12 @@ msgstr "Ajouter une _alerte..."
 msgid "View _Log"
 msgstr "_Voir les archives"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Cacher si déconnecté"
 
+msgid "Show When Offline"
+msgstr "Afficher si déconnecté"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -10627,6 +10542,9 @@ msgstr "/Outils/_Alertes"
 msgid "/Tools/_Certificates"
 msgstr "/Outils/_Certificats"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Outils/Frimo_usses personnalisée"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Outils/Plu_gins"
 
@@ -10636,9 +10554,6 @@ msgstr "/Outils/_Préférences"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Outils/_Filtres"
 
-msgid "/Tools/Smile_y"
-msgstr "/Outils/Frim_ousses"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Outils/_Transferts de fichier"
 
@@ -10756,8 +10671,8 @@ msgstr "Manuel"
 msgid "By status"
 msgstr "Par état"
 
-msgid "By log size"
-msgstr "Par la taille des archives"
+msgid "By recent log activity"
+msgstr "Par discussions récentes"
 
 #, c-format
 msgid "%s disconnected"
@@ -10773,6 +10688,9 @@ msgstr "Reconnecter"
 msgid "Re-enable"
 msgstr "Réactiver"
 
+msgid "SSL FAQs"
+msgstr "FAQs SSL"
+
 msgid "Welcome back!"
 msgstr "Content de vous revoir !"
 
@@ -10865,6 +10783,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "_Alias :"
 
+msgid "_Group:"
+msgstr "_Groupe :"
+
 msgid "Auto_join when account becomes online."
 msgstr "Rejoindre _automatiquement quand le compte est activé."
 
@@ -10898,6 +10819,103 @@ msgstr "/Outils"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacts/Trier les contacts"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Couleur de fond"
+
+msgid "The background color for the buddy list"
+msgstr "La couleur de fond pour la liste de contacts"
+
+msgid "Layout"
+msgstr "Arrangement"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "L'arrangement des icônes, noms et états dans la liste"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Couleur de fond déplié"
+
+msgid "The background color of an expanded group"
+msgstr "La couleur de fond pour un groupe de contacts déplié"
+
+msgid "Expanded Text"
+msgstr "Texte déplié"
+
+msgid "The text information for when a group is expanded"
+msgstr "L'information textuelle pour un groupe de contacts déplié"
+
+msgid "Collapsed Background Color"
+msgstr "Couleur de fond replié"
+
+msgid "The background color of a collapsed group"
+msgstr "La couleur de fond pour un groupe de contacts replié"
+
+msgid "Collapsed Text"
+msgstr "Texte replié"
+
+msgid "The text information for when a group is collapsed"
+msgstr "L'information textuelle pour un groupe de contacts replié"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Couleur du fond des contacts et salons"
+
+msgid "The background color of a contact or chat"
+msgstr "La couleur de fond pour un contact ou un salon de discussions"
+
+msgid "Contact Text"
+msgstr "Texte des contacts"
+
+msgid "The text information for when a contact is expanded"
+msgstr "L'information textuelle pour un contact déplié"
+
+msgid "On-line Text"
+msgstr "Texte des contacts connectés"
+
+msgid "The text information for when a buddy is online"
+msgstr "L'information textuelle pour un contact connecté"
+
+msgid "Away Text"
+msgstr "Texte des contacts absents"
+
+msgid "The text information for when a buddy is away"
+msgstr "L'information textuelle pour un contact absent"
+
+msgid "Off-line Text"
+msgstr "Texte des contacts déconnectés"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "L'information textuelle pour un contact déconnecté"
+
+msgid "Idle Text"
+msgstr "Texte des contacts inactifs"
+
+msgid "The text information for when a buddy is idle"
+msgstr "L'information textuelle pour un contact inactif"
+
+msgid "Message Text"
+msgstr "Texte des messages non-lus"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "L'information textuelle pour les messages non-lus d'un contact"
+
+msgid "Message (Nick Said) Text"
+msgstr "Texte des messages avec pseudo"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"L'information textuelle pour les messages dans lesquels apparaissent votre "
+"pseudo"
+
+msgid "The text information for a buddy's status"
+msgstr "L'information textuelle pour l'état des contacts"
+
+msgid "Type the host name for this certificate."
+msgstr "Saisissez le nom d'hôte correspondant à ce certificat."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Serveurs SSL"
@@ -10916,14 +10934,6 @@ msgstr "Il n'y a aucun compte actif vous permettant d'inviter ce contact."
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter le contact dans une discussion"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Saisissez le nom de l'utilisateur que vous voulez inviter dans la "
-"discussion, ainsi qu'un message d'invitation facultatif."
-
 msgid "_Buddy:"
 msgstr "_Contact :"
 
@@ -10952,7 +10962,7 @@ msgstr "Ignorer"
 msgid "Get Away Message"
 msgstr "Récupérer le message d'absence"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Dernières paroles"
 
 msgid "Unable to save icon file to disk."
@@ -10998,6 +11008,18 @@ msgstr "/Conversation/Enregistrer _sous..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/_Effacer la conversation"
 
+msgid "/Conversation/M_edia"
+msgstr "/Conversation/Mé_dia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversation/Média/Appel _audio"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversation/Média/Appel _vidéo"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversation/Média/A_ppel audio\\/vidéo"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Envoyer un _fichier..."
 
@@ -11070,6 +11092,15 @@ msgstr "/Conversation"
 msgid "/Conversation/View Log"
 msgstr "/Conversation/Voir les archives"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversation/Média/Appel audio"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversation/Média/Appel vidéo"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversation/Média/Appel audio\\/vidéo"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Envoyer un fichier..."
 
@@ -11252,7 +11283,10 @@ msgstr "artiste"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"
+
+msgid "voice and video"
+msgstr "voix et vidéo"
 
 msgid "support"
 msgstr "support"
@@ -11378,6 +11412,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Hongrois"
 
+msgid "Armenian"
+msgstr "Arménien"
+
 msgid "Indonesian"
 msgstr "Indonésien"
 
@@ -11393,6 +11430,9 @@ msgstr "Géorgien"
 msgid "Ubuntu Georgian Translators"
 msgstr "Traducteurs géorgiens d'Ubuntu"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "Kannara"
 
@@ -11471,6 +11511,9 @@ msgstr "Singhalais"
 msgid "Swedish"
 msgstr "Suédois"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 msgid "Tamil"
 msgstr "Tamoul"
 
@@ -11806,7 +11849,7 @@ msgstr "Couleur pour afficher les liens hypertextes"
 msgid "Hyperlink visited color"
 msgstr "Couleur des liens visités"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Couleur pour afficher les liens hypertextes une fois visités (ou activés)."
 
@@ -11842,15 +11885,21 @@ msgid "Color to draw the name of an action message."
 msgstr "Couleur pour afficher le nom pour les messages d'action."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr "Nom de la couleur des messages chuchotés."
+msgstr "Nom de la couleur des messages d'action chuchotés."
+
+msgid "Color to draw the name of a whispered action message."
+msgstr "Couleur pour afficher le nom pour les messages d'actions chuchotés."
 
 msgid "Whisper Message Name Color"
-msgstr "Nom de la couleur pour les messages envoyés"
+msgstr "Nom de la couleur des messages chuchotés."
+
+msgid "Color to draw the name of a whispered message."
+msgstr "Couleur pour afficher le nom pour les messages chuchotés."
 
 msgid "Typing notification color"
 msgstr "Couleur de la notification de saisie"
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 "Couleur pour afficher que quelqu'un est en train de vous écrire un message"
 
@@ -11864,15 +11913,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Activer la notification de saise"
 
-msgid "_Copy Email Address"
-msgstr "_Copier l'adresse électronique"
-
-msgid "_Open Link in Browser"
-msgstr "_Ouvrir le lien"
-
-msgid "_Copy Link Location"
-msgstr "_Copier l'adresse du lien"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11915,11 +11955,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Enregistrer l'image"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Enregi_strer l'image..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Ajouter une frimousse personnalisée..."
 
@@ -12009,9 +12047,6 @@ msgstr "Diminuer la taille de la police"
 msgid "Font Face"
 msgstr "Type de police"
 
-msgid "Background Color"
-msgstr "Couleur de fond"
-
 msgid "Foreground Color"
 msgstr "Couleur du texte"
 
@@ -12126,6 +12161,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12136,11 +12172,12 @@ msgid ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"Usage : %s [option] ...\n"
+"Usage : %s [option]...\n"
 "\n"
 "  -c, --config=DOS    lit les fichiers de configuration depuis le dossier "
 "DOS\n"
 "  -d, --debug         affiche les messages de debug sur la sortie standard\n"
+"  -f, --force-online  force online, quelque soit l'état du réseau\n"
 "  -h, --help          affiche ce texte d'aide\n"
 "  -m, --multiple      ne vérifie pas la présence d'une seule instance du "
 "programme\n"
@@ -12159,6 +12196,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12173,6 +12211,7 @@ msgstr ""
 "  -c, --config=REP    lit les fichiers de configuration depuis le dossier "
 "REP\n"
 "  -d, --debug         affiche les messages de debug sur la sortie standard\n"
+"  -f, --force-online  force online, quelque soit l'état du réseau\n"
 "  -h, --help          affiche ce texte d'aide\n"
 "  -m, --multiple      ne vérifie pas la présence d'une seule instance du "
 "programme\n"
@@ -12221,11 +12260,22 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Arrêt à cause d'un autre client libpurple existant.\n"
 
-msgid "Open All Messages"
-msgstr "Ouvrir tous les messages"
+msgid "/_Media"
+msgstr "/_Média"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Vous avez du courrier !</span>"
+msgid "/Media/_Hangup"
+msgstr "/Média/_Raccrocher"
+
+msgid "Calling..."
+msgstr "Appel..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s veut engager une session audio/vidéo."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s veut engager une session vidéo."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12256,6 +12306,24 @@ msgstr ""
 "Un navigateur « Manuel » a été choisi choisi mais la ligne de commande est "
 "vide."
 
+msgid "No message"
+msgstr "Pas de message"
+
+msgid "Open All Messages"
+msgstr "Ouvrir tous les messages"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Vous avez du courrier !</span>"
+
+msgid "New Pounces"
+msgstr "Nouvelles alertes"
+
+msgid "Dismiss"
+msgstr "Fermer"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Vous avez des alertes !</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Les plugins suivants vont être déchargés."
 
@@ -12304,10 +12372,16 @@ msgstr "<b>Informations sur le plugin</b>"
 msgid "Select a file"
 msgstr "Choisissez un fichier"
 
+msgid "Modify Buddy Pounce"
+msgstr "Modifier une alerte"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Alerte sur"
 
+msgid "_Account:"
+msgstr "C_ompte :"
+
 msgid "_Buddy name:"
 msgstr "_Contact :"
 
@@ -12374,9 +12448,59 @@ msgstr "_Récurrente"
 msgid "Pounce Target"
 msgstr "Cible de l'alerte"
 
-msgid "Smiley theme failed to unpack."
+#, c-format
+msgid "Started typing"
+msgstr "Commence à écrire"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Pause pendant la saisie"
+
+#, c-format
+msgid "Signed on"
+msgstr "Se connecte"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "N'est plus inactif"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Revient d'absence"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "S'arrête d'écrire"
+
+#, c-format
+msgid "Signed off"
+msgstr "Se déconnecte"
+
+#, c-format
+msgid "Became idle"
+msgstr "Devient inactif"
+
+#, c-format
+msgid "Went away"
+msgstr "Devient absent"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Envoi un message"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Événement d'alerte inconnu. Veuillez reporter cette erreur."
+
+msgid "Theme failed to unpack."
 msgstr "Le thème de frimousses n'a pas pu être déballé."
 
+msgid "Theme failed to load."
+msgstr "Le thème de frimousses n'a pas pu être chargé."
+
+msgid "Theme failed to copy."
+msgstr "Le thème de frimousses n'a pas pu être copié."
+
 msgid "Install Theme"
 msgstr "Installer un thème"
 
@@ -12397,6 +12521,11 @@ msgstr "Raccourcis clavier"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Fermer les conversations avec la touche _Echap"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Thème de liste de contacts"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Icône de notification"
 
@@ -12406,8 +12535,8 @@ msgstr "_Afficher l'icône de notification :"
 msgid "On unread messages"
 msgstr "Quand des messages sont non lus"
 
-msgid "Conversation Window Hiding"
-msgstr "Quand la fenêtre de conversation est cachée"
+msgid "Conversation Window"
+msgstr "Fenêtre de conversation"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Cacher les nouvelles conversations :"
@@ -12415,6 +12544,9 @@ msgstr "_Cacher les nouvelles conversations :"
 msgid "When away"
 msgstr "Lorsque absent"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Rédu_ire la nouvelle fenêtre de conversation"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Onglets"
@@ -12473,9 +12605,6 @@ msgstr "Utiliser le défilement progressif"
 msgid "F_lash window when IMs are received"
 msgstr "_Faire clignoter la fenêtre sur la réception de messages"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Rédu_ire la nouvelle fenêtre de conversation"
-
 msgid "Minimum input area height in lines:"
 msgstr "Nombre minimum de lignes dans la zone de saisie :"
 
@@ -12507,14 +12636,12 @@ msgstr "Impossible de lancer le programme de configuration de proxy."
 msgid "Cannot start browser configuration program."
 msgstr "Impossible de lancer le programme de configuration du navigateur."
 
-msgid "ST_UN server:"
-msgstr "Serveur ST_UN :"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple : stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Détection auto de l'adresse IP"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "_Détection auto de l'adresse IP : %s"
 
 msgid "Public _IP:"
 msgstr "Adresse _IP publique :"
@@ -12534,6 +12661,10 @@ msgstr "_Premier port : "
 msgid "_End port:"
 msgstr "_Dernier port :"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Serveur relai (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Serveur mandataire &amp; navigateur"
 
@@ -12726,12 +12857,12 @@ msgstr "Lorsque absent et inactif"
 msgid "Auto-away"
 msgstr "Absence automatique"
 
-msgid "Change status when _idle"
-msgstr "Changer d'état lorsque _inactif"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes avant de passer inactif :"
 
+msgid "Change status when _idle"
+msgstr "Changer d'état lorsque _inactif"
+
 msgid "Change _status to:"
 msgstr "_Changer l'état en :"
 
@@ -12879,47 +13010,44 @@ msgstr "Enregistrer _et utiliser"
 msgid "Status for %s"
 msgstr "État pour %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Une frimousse personnalisée pour « %s » existe déjà. Veuillez choisir un "
+"autre raccourci."
+
 msgid "Custom Smiley"
 msgstr "Frimousse personnalisée"
 
-msgid "More Data needed"
-msgstr "Données insuffisantes"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Veuillez fournir un raccourci correspondant à cette frimousse."
-
 msgid "Duplicate Shortcut"
 msgstr "Raccourci en double"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Une frimousse spécialisée pour ce raccourci existe déjà. Veuillez choisir un "
-"autre raccourci."
-
-msgid "Please select an image for the smiley."
-msgstr "Veuillez choisir une image pour cette frimousse."
-
 msgid "Edit Smiley"
 msgstr "Modifier la frimousse"
 
 msgid "Add Smiley"
 msgstr "Ajouter la frimousse"
 
-msgid "Smiley _Image"
-msgstr "_Image de la frimousse"
+msgid "_Image:"
+msgstr "_Image :"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "_Raccourci de la frimousse"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "Texte de _raccourci :"
 
 msgid "Smiley"
 msgstr "Frimousse"
 
+msgid "Shortcut Text"
+msgstr "Texte de raccourci"
+
 msgid "Custom Smiley Manager"
 msgstr "Gestionnaire de frimousses personnalisée"
 
+msgid "Select Buddy Icon"
+msgstr "Choisir l'icône de contact"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Cliquer pour changer votre icône pour ce compte."
 
@@ -13002,11 +13130,11 @@ msgstr ""
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 msgid "Cannot send launcher"
-msgstr "Impossible d'envoyer ce lien."
+msgstr "Impossible d'envoyer ce lien"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Vous avez déposé un lien du bureau. Vous vouliez probablement envoyer le "
 "fichier vers lequel pointe ce lien au lieu du lien."
@@ -13044,9 +13172,30 @@ msgstr ""
 "Impossible de charger l'image « %s » : la raison est inconnue, le fichier est "
 "peut-être endommagé."
 
+msgid "_Open Link"
+msgstr "_Ouvrir le lien"
+
+msgid "_Copy Link Location"
+msgstr "_Copier l'adresse du lien"
+
+msgid "_Copy Email Address"
+msgstr "_Copier l'adresse électronique"
+
+msgid "_Open File"
+msgstr "Ouvrir le _fichier"
+
+msgid "Open _Containing Directory"
+msgstr "Ouvrir le _dossier du fichier"
+
 msgid "Save File"
 msgstr "Sauver le fichier"
 
+msgid "_Play Sound"
+msgstr "_Jouer le son"
+
+msgid "_Save File"
+msgstr "_Sauver le fichier"
+
 msgid "Select color"
 msgstr "Choisir la couleur"
 
@@ -13134,6 +13283,66 @@ msgstr "Plugin de prédiction de disponibilité des contacts."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Affiche des statistiques sur la disponibilité de vos contacts"
 
+msgid "Server name request"
+msgstr "Demande du nom du serveur"
+
+msgid "Enter an XMPP Server"
+msgstr "Saisissez l'adresse d'un serveur XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Choisissez un serveur XMPP à consulter"
+
+msgid "Find Services"
+msgstr "Trouver des services"
+
+msgid "Add to Buddy List"
+msgstr "Ajouter à la liste de contacts"
+
+msgid "Gateway"
+msgstr "Portail"
+
+msgid "Directory"
+msgstr "Annuaire"
+
+msgid "PubSub Collection"
+msgstr "Ensemble PubSub"
+
+msgid "PubSub Leaf"
+msgstr "Feuillet PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Description :</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Découverte de services"
+
+msgid "_Browse"
+msgstr "_Parcourir"
+
+msgid "Server does not exist"
+msgstr "Le serveur n'existe pas"
+
+msgid "Server does not support service discovery"
+msgstr "Le serveur ne supporte pas la découverte de services"
+
+msgid "XMPP Service Discovery"
+msgstr "Découverte de services XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Permet la visualisation et l'enregistrement de services."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Ce plugin est utile pour s'abonner avec d'anciens transports ou d'autres "
+"services XMPP."
+
 msgid "Buddy is idle"
 msgstr "L'utilisateur est inactif"
 
@@ -13541,7 +13750,7 @@ msgstr "Plugin de messagerie musicale pour la composition collaborative."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Permet à plusieurs utilisateurs de travailler simultanément sur un morceau "
 "de musique en modifiant une partition commune en temps réel."
@@ -13653,12 +13862,6 @@ msgstr ""
 "- il écrit à l'envers tous les messages reçus\n"
 "- il envoie automatiquement un message à tous les contacts qui se connectent"
 
-msgid "Cursor Color"
-msgstr "Couleur du curseur"
-
-msgid "Secondary Cursor Color"
-msgstr "Deuxième couleur du curseur"
-
 msgid "Hyperlink Color"
 msgstr "Couleur des liens hypertextes"
 
@@ -13668,6 +13871,9 @@ msgstr "Couleur des liens visités"
 msgid "Highlighted Message Name Color"
 msgstr "Nom de la couleur des messages en surbrillance"
 
+msgid "Typing Notification Color"
+msgstr "Couleur de la notification de saisie"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Séparation horizontale GtkTreeView"
 
@@ -13697,35 +13903,21 @@ msgstr "Police de l'interface GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Raccourci du thème GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Couleurs de l'interface"
+msgid "Disable Typing Notification Text"
+msgstr "Désactiver le texte de notification de saisie"
 
-msgid "Widget Sizes"
-msgstr "Tailles des éléments"
+msgid "GTK+ Theme Control Settings"
+msgstr "Contrôle des paramètres du thème GTK+"
+
+msgid "Colors"
+msgstr "Couleurs"
 
 msgid "Fonts"
 msgstr "Polices"
 
+msgid "Miscellaneous"
+msgstr "Divers"
+
 msgid "Gtkrc File Tools"
 msgstr "Outils du fichier Gtkrc"
 
@@ -13811,7 +14003,7 @@ msgstr "Bouton Envoyer dans la fenêtre de conversation."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Ajoute un bouton Envoyer dans la fenêtre de conversation. Permet l'envoi de "
 "messages quand il n'y a pas de clavier physique."
@@ -13867,6 +14059,95 @@ msgstr ""
 "Remplace le texte dans les messages envoyés grâce à des règles de "
 "substitution."
 
+msgid "Just logged in"
+msgstr "Vient de se connecter"
+
+msgid "Just logged out"
+msgstr "Vient de se déconnecter"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Icône pour le contact/\n"
+"Icône pour une personne inconnue"
+
+msgid "Icon for Chat"
+msgstr "Icône pour un salon de discussions"
+
+msgid "Ignored"
+msgstr "Ignoré"
+
+msgid "Founder"
+msgstr "Fondateur"
+
+msgid "Operator"
+msgstr "Opérateur"
+
+msgid "Half Operator"
+msgstr "Demi-opérateur"
+
+msgid "Authorization dialog"
+msgstr "Boite de message pour autorisation"
+
+msgid "Error dialog"
+msgstr "Boite de message pour erreur"
+
+msgid "Information dialog"
+msgstr "Boite de message pour informations"
+
+msgid "Mail dialog"
+msgstr "Boite de message pour courrier"
+
+msgid "Question dialog"
+msgstr "Boite de message pour demande"
+
+msgid "Warning dialog"
+msgstr "Boite de message pour avertissement"
+
+msgid "What kind of dialog is this?"
+msgstr "Quel genre de boite de message est-ce là ?"
+
+msgid "Status Icons"
+msgstr "Icônes d'état"
+
+msgid "Chatroom Emblems"
+msgstr "Emblêmes de salon de discussions"
+
+msgid "Dialog Icons"
+msgstr "Icônes des boites de message"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Éditeur de thème d'icônes Pidgin"
+
+msgid "Contact"
+msgstr "Contact"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Éditeur de thème de liste de contacts Pidgin"
+
+msgid "Edit Buddylist Theme"
+msgstr "Permet de modifier le thème de la liste de contacts"
+
+msgid "Edit Icon Theme"
+msgstr "Permet de modifier le thème des icônes"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Éditeur de thème Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Permet de modifier le thème de Pidgin"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14035,7 +14316,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Options spécifiques à Pidgin Windows"
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Fournit des options spécifiques à Pidgin Windows, tels que l'accrochage de "
 "la liste de contacts."
@@ -14077,6 +14358,446 @@ msgstr "Envoyer et recevoir des blocs XMPP."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 
+#~ msgid "Invitation Rejected"
+#~ msgstr "Invitation refusée"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Impossible d'ouvrir la connexion."
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Impossible de se mettre en écoute sur la connexion."
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Impossible de lire le socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Échec de la connexion"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Déconnexion par le serveur"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Impossible de créer le socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Impossible de se connecter à l'hôte"
+
+#~ msgid "Read error"
+#~ msgstr "Erreur de lecture"
+
+#~ msgid "Write error"
+#~ msgstr "Erreur d'écriture"
+
+#~ msgid "Last Activity"
+#~ msgstr "Dernière activité"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Items du service de découverte"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Adressage étendu de paragraphes"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Discussion multi-utilisateurs"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Informations de présence des discussions multi-utilisateurs"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Flux de données intrabandes"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Commandes ad-hoc"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Flux de données SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Données hors de la bande passante"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Enregistrement intrabande"
+
+#~ msgid "User Location"
+#~ msgstr "Position de l'utilisateur"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar de l'utilisateur"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notifications d'état de discussions"
+
+#~ msgid "Software Version"
+#~ msgstr "Version du logiciel"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Initialisation de flux"
+
+#~ msgid "User Mood"
+#~ msgstr "Humeur de l'utilisateur"
+
+#~ msgid "User Activity"
+#~ msgstr "Activité de l'utilisateur"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Possibilités de l'entité"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Négociations de session chiffrée"
+
+#~ msgid "User Tune"
+#~ msgstr "Musique de l'utilisateur"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil de l'utilisateur"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "Pseudo de l'utilisateur"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Reçus des messages"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publication de clé publique"
+
+#~ msgid "User Chatting"
+#~ msgstr "L'utilisateur discute"
+
+#~ msgid "User Browsing"
+#~ msgstr "L'utilisateur navigue le web"
+
+#~ msgid "User Gaming"
+#~ msgstr "L'utilisateur joue"
+
+#~ msgid "User Viewing"
+#~ msgstr "L'utilisateur observe"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Chiffrement de paragraphe"
+
+#~ msgid "Entity Time"
+#~ msgstr "Temps de l'entité"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Livraison retardée"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Objets de données collaboratives"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Répertoire de fichier et partage"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Service de découverte STUN pour Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Négociation de session chiffré simplifiée"
+
+#~ msgid "Hop Check"
+#~ msgstr "Vérifications des bonds"
+
+#~ msgid "Read Error"
+#~ msgstr "Erreur de lecture"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Impossible de se connecter au serveur."
+
+#~ msgid "Unparseable message"
+#~ msgstr "Impossible d'interpréter le message."
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Impossible de se connecter à l'hôte : %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Échec à la connexion (%s)"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Vous venez d'être déconnecté à la suite d'une connexion depuis un autre "
+#~ "endroit."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Support SSL non installé"
+
+#~ msgid "Invalid username."
+#~ msgstr "Nom d'utilisateur non valide."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Mot de passe incorrect."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Impossible de se connecter."
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Vous risquez être déconnecté sous peu. Consultez %s pour plus "
+#~ "d'informations."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Impossible de déchiffrer la réponse du serveur"
+
+#~ msgid "Connection lost"
+#~ msgstr "Connexion perdue."
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Impossible de trouver l'adresse de l'hôte."
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Connexion terminée (en écriture)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Connexion remise à zéro"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Erreur à la lecture du socket : %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Impossible de se connecter à l'hôte"
+
+#~ msgid "Could not write"
+#~ msgstr "Impossible d'envoyer."
+
+#~ msgid "Could not connect"
+#~ msgstr "Impossible de se connecter."
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Impossible de créer le socket d'écoute."
+
+#~ msgid "Incorrect Password"
+#~ msgstr "Mot de passe incorrect"
+
+#~ msgid "Account locked: Too many failed login attempts"
+#~ msgstr "Compte bloqué : trop de mauvais mots de passe"
+
+#~ msgid "Account locked: See the debug log"
+#~ msgstr "Compte bloqué : regarder le journal de debug"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Activer quelle identité ?"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Impossible de résoudre le nom de l'hôte."
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Impossible de se connecter à %s : TLS/SSL est nécessaire mais aucun "
+#~ "support n'est disponible."
+
+#~ msgid "_Proxy"
+#~ msgstr "Serveur _mandataire"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Quand la fenêtre de conversation est cachée"
+
+#~ msgid "More Data needed"
+#~ msgstr "Données insuffisantes"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Veuillez fournir un raccourci correspondant à cette frimousse."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Veuillez choisir une image pour cette frimousse."
+
+#~ msgid "Cursor Color"
+#~ msgstr "Couleur du curseur"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Deuxième couleur du curseur"
+
+#~ msgid "Interface colors"
+#~ msgstr "Couleurs de l'interface"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Tailles des éléments"
+
+#~ msgid "Invite message"
+#~ msgstr "Message d'invitation"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Saisissez le nom de l'utilisateur que vous voulez inviter,\n"
+#~ "ainsi qu'un message d'invitation facultatif."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Recherche de %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Connexion à %s échouée"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Connexion : %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Impossible d'écrire dans le fichier %s"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Impossible de lire le fichier %s"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Message trop long, les %s derniers caractères sont perdus."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s n'est pas en ligne"
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Les avertissements de %s ne sont pas autorisés."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Un message a été perdu, vous dépassez la vitesse limite du serveur."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "La discussion %s est inaccessible."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Vous envoyez vos messages trop vite à %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr ""
+#~ "Vous avez raté un message de %s parce que le message était trop gros,"
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Vous avez raté un message de %s parce qu'il a été envoyé trop vite."
+
+#~ msgid "Failure."
+#~ msgstr "Échec"
+
+#~ msgid "Too many matches."
+#~ msgstr "Trop de réponses"
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Besoin de plus de critères."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "L'annuaire est temporairement indisponible."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "La recherche par adresse électronique est restreinte."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Mot clé ignoré"
+
+#~ msgid "No keywords."
+#~ msgstr "Pas de mot-clé"
+
+#~ msgid "User has no directory information."
+#~ msgstr "L'utilisateur n'a pas d'informations personnelles."
+
+#~ msgid "Country not supported."
+#~ msgstr "Pays non supporté"
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Échec inconnu : %s"
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Nom d'utilisateur ou mot de passe incorrect."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Le service est temporairement indisponible."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr ""
+#~ "Votre niveau d'avertissement est actuellement trop élevé pour que vous "
+#~ "puissiez vous connecter."
+
+#~ msgid ""
+#~ "You have been connecting and disconnecting too frequently.  Wait ten "
+#~ "minutes and try again.  If you continue to try, you will need to wait "
+#~ "even longer."
+#~ msgstr ""
+#~ "Vous vous êtes connecté et déconnecté trop rapidement. Attendez 10 "
+#~ "minutes et réessayez. Si vous persistez maintenant, il vous faudra "
+#~ "attendre encore plus longtemps."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Une erreur inconnue est survenue à la connexion : %s"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Une erreur inconnue (%d) s'est produite : %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Nom de groupe non valide."
+
+#~ msgid "Connection Closed"
+#~ msgstr "Connexion terminée"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "En attente de réponse..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "TOC est revenu de sa pause. Vous pouvez désormais envoyer des messages à "
+#~ "nouveau."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Changement de mot de passe effectué."
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Chercher dans l'annuaire"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Changer les informations"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Impossible d'ouvrir %s pour l'écriture"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Échec du transfert de fichier. Annulation probable du correspondant."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Impossible de se connecter pour le transfert"
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr ""
+#~ "Impossible d'écrire l'entête de fichier. Le fichier n'est pas transmis."
+
+#~ msgid "Save As..."
+#~ msgstr "Enregistrer sous..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s demande à %s d'accepter %d fichier : %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s demande à %s d'accepter %d fichiers : %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s vous demande de leur envoyer un fichier"
+
+#~ msgid "%s Options"
+#~ msgstr "Options de %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Options du serveur mandataire"
+
+#~ msgid "By log size"
+#~ msgstr "Par la taille des archives"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Ouvrir le lien"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Serveur ST_UN :"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "_Image de la frimousse"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "_Raccourci de la frimousse"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Impossible de récupérer le carnet d'adresses MSN"
 
@@ -14100,9 +14821,6 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ "connexion non cryptée. Voulez-vous autoriser ceci et continuer "
 #~ "l'authentification ?"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Compte :"
-
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Alerter uniquement quand mon état est non disponible"
 
diff --git a/po/ga.po b/po/ga.po
index 8a35b5c56c..8d20895cfd 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-08-27 16:26-0800\n"
 "Last-Translator: Aaron Kearns <ajkearns6@gmail.com>\n"
 "Language-Team: \n"
@@ -19,13 +19,13 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "Bain triail as `%s %s' chun tuilleadh eolais a fháil.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -570,17 +570,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Cuir Chuig"
 
-msgid "Invite message"
-msgstr ""
-
-msgid "Invite"
-msgstr ""
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-
 msgid "Conversation"
 msgstr ""
 
@@ -825,6 +814,39 @@ msgstr ""
 msgid "System Log"
 msgstr ""
 
+msgid "Calling ... "
+msgstr ""
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Glac leis"
+
+msgid "Reject"
+msgstr ""
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+msgid "You have rejected the call."
+msgstr ""
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "Ríomhphoist"
 
@@ -859,6 +881,9 @@ msgstr ""
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr ""
+
 msgid "(none)"
 msgstr "(aon cheann)"
 
@@ -1060,7 +1085,6 @@ msgstr ""
 msgid "%s has sent you a message. (%s)"
 msgstr ""
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1106,7 +1130,6 @@ msgstr ""
 msgid "Change status to"
 msgstr ""
 
-#. Conversations
 msgid "Conversations"
 msgstr ""
 
@@ -1427,7 +1450,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr ""
 
-#, c-format
 msgid "Online"
 msgstr ""
 
@@ -1471,6 +1493,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "cuntais"
 
@@ -1571,13 +1615,6 @@ msgstr ""
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Glac leis"
-
-msgid "Reject"
-msgstr ""
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1664,6 +1701,8 @@ msgstr ""
 msgid "+++ %s signed off"
 msgstr ""
 
+#. Unknown error
+#. Unknown error!
 #, fuzzy
 msgid "Unknown error"
 msgstr "Earraidh gan aithne"
@@ -1711,6 +1750,16 @@ msgstr ""
 msgid "%s left the room (%s)."
 msgstr ""
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Cuir le comhrá"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr ""
@@ -1835,7 +1884,6 @@ msgstr ""
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#, c-format
 msgid "File transfer complete"
 msgstr ""
 
@@ -1843,7 +1891,6 @@ msgstr ""
 msgid "You canceled the transfer of %s"
 msgstr ""
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr ""
 
@@ -2025,11 +2072,13 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+msgid "Error creating conference."
+msgstr ""
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2410,7 +2459,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2458,7 +2507,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2486,6 +2535,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Íontráil Pasfhocal"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2673,18 +2748,17 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Ainm Baiste"
 
@@ -2716,6 +2790,11 @@ msgstr "Bonjour Prótacal Breiseán"
 msgid "Purple Person"
 msgstr ""
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Ceantar"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2726,13 +2805,16 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Ní féidir an comhad a oscailt."
 
-msgid "Could not bind socket to port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr ""
 
-msgid "Could not listen on socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
 msgstr ""
 
 msgid "Error communicating with local mDNSResponder."
@@ -2780,13 +2862,13 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr ""
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2798,14 +2880,15 @@ msgstr ""
 msgid "Password"
 msgstr "Pasfhocal"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr ""
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "Sábháil an Íomha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -2858,6 +2941,15 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2872,13 +2964,13 @@ msgid "Add to chat..."
 msgstr "Cuir le comhrá..."
 
 # infhaighte???
+#. Global
 msgid "Available"
 msgstr "Ar fáil"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Shiúl"
 
@@ -2906,7 +2998,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -2921,7 +3013,13 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Ceangailte"
+
+msgid "Connection failed"
 msgstr ""
 
 msgid "Add to chat"
@@ -2930,14 +3028,24 @@ msgstr "Cuir le comhrá"
 msgid "Chat _name:"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Ní féidir an comhad a oscailt."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Nasctha"
+
 msgid "Chat error"
 msgstr ""
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
-msgstr ""
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "Cailleadh an nasc le \"%s\"."
 
 msgid "Find buddies..."
 msgstr ""
@@ -2979,6 +3087,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Úsáideoir"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Nasc diúltaithe"
+
 #, fuzzy, c-format
 msgid "Unknown command: %s"
 msgstr "ordú anaithnid: `%c'"
@@ -2993,8 +3105,9 @@ msgstr ""
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "Ní féidir an comhad a oscailt."
 
 msgid "Error displaying MOTD"
 msgstr ""
@@ -3009,8 +3122,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr "MOTD le %s"
 
-msgid "Server has disconnected"
-msgstr ""
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Cailleadh an nasc le \"%s\"."
 
 msgid "View MOTD"
 msgstr "Amharc MOTD"
@@ -3022,26 +3143,23 @@ msgstr "Bealach"
 msgid "_Password:"
 msgstr "_Pasfhocal:"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Nasctha"
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Ní féidir an comhad a oscailt."
 
-#, fuzzy
-msgid "Read error"
-msgstr "Earráid sa léamh"
+#, c-format
+msgid "Server closed the connection"
+msgstr ""
 
 msgid "Users"
 msgstr "Úsáideoirí"
@@ -3218,6 +3336,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Seoladh in úsáid cheana féin"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "_Leasainm:"
+
 msgid "Cannot change nick"
 msgstr ""
 
@@ -3418,10 +3547,10 @@ msgstr ""
 msgid "execute"
 msgstr "Deán"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3436,16 +3565,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
+msgid "SASL authentication failed"
 msgstr ""
 
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Ní féidir an comhad a oscailt."
+
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SSL Servers"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr ""
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+msgid "Unable to establish a connection with the server"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Cailleadh an nasc le \"%s\"."
+
+msgid "Unable to establish SSL connection"
 msgstr ""
 
 msgid "Full Name"
@@ -3519,158 +3675,9 @@ msgstr "Cliant:"
 msgid "Operating System"
 msgstr "Córas Oibriúcháin"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreams"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr ""
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr ""
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr ""
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Local Time"
+msgstr "Ceantar"
 
 #, fuzzy
 msgid "Priority"
@@ -3679,6 +3686,14 @@ msgstr "Tosaíocht"
 msgid "Resource"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Logáilte isteach!\n"
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3728,7 +3743,6 @@ msgstr ""
 msgid "Extended Away"
 msgstr ""
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
@@ -3849,27 +3863,25 @@ msgstr ""
 msgid "Find Rooms"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Ailias:"
 
 #, fuzzy
-msgid "Write error"
-msgstr "Earráid sa scríobh"
+msgid "No users found"
+msgstr "Níl fuaim"
 
-msgid "Ping timeout"
-msgstr ""
+#, fuzzy
+msgid "Roles:"
+msgstr "Post"
 
 #, fuzzy
-msgid "Read Error"
-msgstr "earráid ag léamh"
+msgid "Ping timed out"
+msgstr "Dínascadh de bharr moille rófhada"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-
-msgid "Unable to create socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -3878,6 +3890,9 @@ msgstr "XMPP ID Neamhbhailí "
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+msgid "Malformed BOSH URL"
+msgstr ""
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
@@ -3902,9 +3917,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr ""
 
-msgid "Already Registered"
-msgstr ""
-
 #, fuzzy
 msgid "State"
 msgstr "Stát"
@@ -3919,6 +3931,9 @@ msgstr "Guthán"
 msgid "Date"
 msgstr "Dáta"
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -3946,6 +3961,9 @@ msgstr ""
 msgid "Change Registration"
 msgstr ""
 
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -3964,9 +3982,19 @@ msgstr ""
 msgid "Re-initializing Stream"
 msgstr ""
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Níl údaraithe"
 
+#, fuzzy
+msgid "Mood"
+msgstr "fonn"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Araon"
 
@@ -3991,13 +4019,6 @@ msgstr "Tada"
 msgid "Subscription"
 msgstr ""
 
-#, fuzzy
-msgid "Mood"
-msgstr "fonn"
-
-msgid "Now Listening"
-msgstr ""
-
 msgid "Mood Text"
 msgstr ""
 
@@ -4040,9 +4061,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 msgid "Change XMPP Password"
 msgstr ""
 
@@ -4238,15 +4256,21 @@ msgid "Unable to ping user %s"
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+
+#, c-format
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4259,7 +4283,30 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+msgid "Media Initiation Failed"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+msgid "Select a Resource"
+msgstr ""
+
+msgid "Initiate Media"
 msgstr ""
 
 msgid "config:  Configure a chat room."
@@ -4281,13 +4328,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4347,6 +4394,9 @@ msgstr ""
 msgid "File transfer proxies"
 msgstr ""
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4385,6 +4435,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4399,12 +4457,29 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
+#, fuzzy
+msgid "No reason"
+msgstr "Ní fios cén fáth"
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
-#, c-format
-msgid "Error in chat %s"
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr " (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr ""
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Ní féidir an comhad a oscailt."
+
+msgid "Failed to open in-band bytestream"
 msgstr ""
 
 #, c-format
@@ -4430,9 +4505,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Select a Resource"
-msgstr ""
-
 msgid "Edit User Mood"
 msgstr ""
 
@@ -4466,9 +4538,20 @@ msgstr "Aicsin"
 msgid "Select an action"
 msgstr ""
 
-msgid "Unable to retrieve MSN Address Book"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr ""
+
+msgid "Buddy Add error"
 msgstr ""
 
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Níl úsáideoir '%s' ar bith ann."
+
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
@@ -4693,7 +4776,6 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4715,6 +4797,10 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -4783,6 +4869,13 @@ msgstr ""
 msgid "Page"
 msgstr "Leathanach"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Obair"
+
 msgid "Has you"
 msgstr ""
 
@@ -4821,6 +4914,13 @@ msgstr "Ealaíontóir"
 msgid "Album"
 msgstr "Albam"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "Teideal"
+
+msgid "Office Title"
+msgstr ""
+
 msgid "Set Friendly Name..."
 msgstr ""
 
@@ -4854,9 +4954,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5012,7 +5109,7 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
+msgid "View web profile"
 msgstr ""
 
 #. *< type
@@ -5046,64 +5143,26 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
+msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#, fuzzy
-msgid "Unknown error."
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Earráid anaithnid=(%d)\n"
 
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ar %s (%s)"
-
-#, c-format
-msgid "%s just sent you a Nudge!"
+msgid "Unable to add user"
 msgstr ""
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
 msgid "Unknown error (%d)"
 msgstr "Earráid anaithnid=(%d)\n"
 
-msgid "Unable to add user"
-msgstr ""
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr ""
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5136,9 +5195,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr "Earráid sa scríobh"
 
@@ -5152,19 +5208,20 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "earráid agus ag léamh %s"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5193,6 +5250,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5229,33 +5294,21 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 msgid "Delete Buddy from Address Book?"
 msgstr ""
 
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr ""
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr ""
-
 msgid "The username specified is invalid."
 msgstr ""
 
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5269,15 +5322,60 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "MSN Prótacal Breiseán"
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+#, fuzzy
+msgid "Unknown error."
+msgstr "Earráid anaithnid=(%d)\n"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ar %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "No such user: %s"
+msgstr "%s: Níl a leithéid d'úsáideoir ann"
+
+msgid "User lookup"
 msgstr ""
 
 msgid "Reading challenge"
@@ -5289,13 +5387,22 @@ msgstr ""
 msgid "Logging in"
 msgstr ""
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "Cailleadh an nasc le \"%s\"."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr ""
 
@@ -5314,36 +5421,42 @@ msgstr ""
 msgid "MySpace"
 msgstr "MySpace"
 
-msgid "MySpaceIM - No Username Set"
+msgid "IM Friends"
 msgstr ""
 
-msgid "You appear to have no MySpace username."
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgid "Add contacts from server"
 msgstr ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Ceangailte"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr ""
+
+msgid "Incorrect username or password"
 msgstr ""
 
 msgid "MySpaceIM Error"
 msgstr ""
 
+msgid "Invalid input condition"
+msgstr ""
+
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5353,13 +5466,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "No such user: %s"
-msgstr "%s: Níl a leithéid d'úsáideoir ann"
-
-msgid "User lookup"
-msgstr ""
-
 msgid "Failed to remove buddy"
 msgstr ""
 
@@ -5369,33 +5475,15 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-msgid "Invalid input condition"
-msgstr ""
-
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
+msgid "Missing Cipher"
 msgstr ""
 
-msgid "IM Friends"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Add contacts from server"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
 msgstr ""
 
 msgid "Add friends from MySpace.com"
@@ -5438,9 +5526,6 @@ msgstr ""
 msgid "User"
 msgstr "Úsáideoir"
 
-msgid "Profile"
-msgstr "Próifíl"
-
 msgid "Headline"
 msgstr ""
 
@@ -5453,14 +5538,10 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr ""
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 msgid "MySpaceIM - Username Available"
@@ -5472,12 +5553,22 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 msgid "This username is unavailable."
 msgstr ""
 
 msgid "Please try another username:"
 msgstr ""
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr ""
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5670,9 +5761,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr ""
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5711,9 +5799,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Ní féidir an comhad a oscailt."
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5811,9 +5899,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -5834,23 +5919,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -5873,24 +5951,32 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-msgid "Could not join chat room"
+msgid "Received unexpected response from "
 msgstr ""
 
-msgid "Invalid chat room name"
+#. username connecting too frequently
+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 ""
 
-msgid "Server closed the connection."
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "earráid agus ag léamh %s"
+
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
+msgid "Could not join chat room"
 msgstr ""
 
-msgid "Received invalid data on connection with server."
+msgid "Invalid chat room name"
 msgstr ""
 
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Cailleadh an nasc le \"%s\"."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5936,7 +6022,7 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
 msgid "Direct IM established"
@@ -6107,23 +6193,18 @@ msgstr ""
 msgid "Screen Sharing"
 msgstr ""
 
-#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#, c-format
 msgid "Not Available"
 msgstr "níl ar fáil"
 
-#, c-format
 msgid "Occupied"
 msgstr ""
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr ""
 
@@ -6137,16 +6218,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Ní féidir an comhad a oscailt."
 
 msgid "Username sent"
 msgstr ""
@@ -6160,46 +6237,50 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Received authorization"
 msgstr ""
 
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
 #, fuzzy
-msgid "Incorrect password."
-msgstr "pasfhocal mícheart"
+msgid "Username does not exist"
+msgstr "Níl úsáideoir '%s' ar bith ann."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr ""
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6214,22 +6295,6 @@ msgstr ""
 msgid "_OK"
 msgstr "_Ceart go Leor"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -6344,7 +6409,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
@@ -6367,6 +6432,12 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
+msgid "Profile"
+msgstr "Próifíl"
+
 msgid "Your AIM connection may be lost."
 msgstr ""
 
@@ -6522,7 +6593,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6544,7 +6615,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6552,7 +6623,7 @@ msgid "(no name)"
 msgstr "(gan-ainm)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -6614,6 +6685,7 @@ msgstr ""
 msgid "Get AIM Info"
 msgstr ""
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr ""
 
@@ -6671,6 +6743,7 @@ msgstr "Cuardaigh ("
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr ""
 
@@ -6700,6 +6773,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6717,7 +6793,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
@@ -6809,7 +6884,7 @@ msgstr "Eile"
 msgid "Visible"
 msgstr ""
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -6896,17 +6971,50 @@ msgstr "Dáta"
 msgid "Could not change buddy information."
 msgstr "Eolais Logann"
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
 msgstr ""
 
+msgid "Note"
+msgstr "Nóta"
+
+#. callback
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Cuir Cara"
+msgid "Buddy Memo"
+msgstr "Cara"
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "Modhnaigh"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Modhnaigh"
 
-msgid "Input answer here"
+#, fuzzy
+msgid "Server says:"
+msgstr "Freastalaí"
+
+msgid "Your request was accepted."
 msgstr ""
 
+msgid "Your request was rejected."
+msgstr ""
+
+#, c-format
+msgid "%u requires verification"
+msgstr ""
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Údaraigh"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Íontráil Pasfhocal"
+
 msgid "Send"
 msgstr "Seol"
 
@@ -6917,18 +7025,18 @@ msgstr "grúpa Neamhbhailí"
 msgid "Authorization denied message:"
 msgstr ""
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr ""
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Údaraigh"
 
-msgid "Input request here"
+msgid "Enter request here"
 msgstr ""
 
 msgid "Would you be my friend?"
@@ -6950,7 +7058,7 @@ msgid "Failed sending authorize"
 msgstr ""
 
 #, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr ""
 
 #, c-format
@@ -6991,6 +7099,9 @@ msgstr ""
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
 msgid "Not member"
 msgstr ""
 
@@ -7029,15 +7140,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr ""
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Uimhir Guthán"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7047,7 +7161,7 @@ msgstr ""
 msgid "Failed:"
 msgstr "Theip"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7059,11 +7173,11 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Uimhir Guthán"
 
 #, fuzzy
@@ -7073,36 +7187,37 @@ msgstr "Eolais Logann"
 msgid "You have successfully created a Qun"
 msgstr ""
 
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr ""
 
 msgid "Setup"
 msgstr "Cumraigh"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr ""
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 # scrios???? scrud????
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Scrios"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+# scrios???? scrud????
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Scrios"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7216,6 +7331,12 @@ msgstr ""
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr ""
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr ""
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7223,7 +7344,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Faoi %s"
 
 #, fuzzy
@@ -7245,6 +7366,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Faoi %s"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Seoladh"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7276,7 +7401,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Ceangal"
@@ -7287,6 +7411,9 @@ msgstr ""
 msgid "Show server news"
 msgstr ""
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 msgid "Keep alive interval (seconds)"
 msgstr ""
 
@@ -7294,11 +7421,9 @@ msgstr ""
 msgid "Update interval (seconds)"
 msgstr "Eolas Úsáideoir"
 
-msgid "Can not decrypt server reply"
-msgstr ""
-
-msgid "Can not decrypt get server reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt server reply"
+msgstr "Ní féidir an comhad a oscailt."
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
@@ -7319,19 +7444,16 @@ msgid "Activation required"
 msgstr ""
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Keep alive error"
+msgid "Requesting captcha"
 msgstr ""
 
-msgid "Requesting captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Checking code of captcha ..."
-msgstr ""
-
-msgid "Failed captcha verify"
+msgid "Failed captcha verification"
 msgstr ""
 
 #, fuzzy
@@ -7342,68 +7464,48 @@ msgstr "Sábháil an Íomha"
 msgid "Enter code"
 msgstr "Íontráil Pasfhocal"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 msgid "Enter the text from the image"
 msgstr ""
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr ""
-
 msgid "Socket error"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr "Earráid scríobh"
-
-msgid "Connection lost"
-msgstr ""
-
-msgid "Get server ..."
-msgstr ""
+#, fuzzy
+msgid "Getting server"
+msgstr "Nasc diúltaithe"
 
-msgid "Request token"
+msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Ní féidir an comhad a oscailt."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "grúpa Neamhbhailí"
 
 #, fuzzy
-msgid "Connecting server ..."
+msgid "Connecting to server"
 msgstr "Nasc diúltaithe"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Earráid"
 
-msgid "Failed to send IM."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7413,6 +7515,10 @@ msgid ""
 msgstr "SSL Servers"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Ó"
 
@@ -7422,32 +7528,29 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Ní fios cén fáth"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Ordú"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr ""
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Ní fios cén fáth"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Ní fios cén fáth"
 
 #, c-format
@@ -7461,9 +7564,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7517,17 +7617,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7550,6 +7639,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr ""
+
 msgid "Supports"
 msgstr ""
 
@@ -8229,9 +8321,6 @@ msgstr "Eagrú"
 msgid "Unit"
 msgstr "Aonad"
 
-msgid "Note"
-msgstr "Nóta"
-
 msgid "Join Chat"
 msgstr ""
 
@@ -8316,6 +8405,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8374,8 +8466,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "Nasc diúltaithe"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8384,27 +8477,24 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr ""
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+msgid "Unable to not load SILC key pair"
+msgstr ""
+
 #, fuzzy
 msgid "Out of memory"
 msgstr "Cuimhne ídithe"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr ""
 
 msgid "Error loading SILC key pair"
@@ -8683,7 +8773,7 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -8773,6 +8863,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -8813,32 +8906,31 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr ""
 
 msgid "John Noname"
 msgstr ""
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
+msgid "Unable to load SILC key pair: %s"
 msgstr ""
 
-msgid "Could not connect"
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Unknown server response."
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "Ní fios cén fáth"
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Ní féidir an comhad a oscailt."
 
-msgid "Could not resolve hostname"
+msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
-msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgid "SIP connect server not specified"
 msgstr ""
 
 #. *< type
@@ -8874,174 +8966,63 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr ""
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr ""
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr ""
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr ""
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "Email lookup restricted."
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "Keyword ignored."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-#, c-format
-msgid "No keywords."
-msgstr ""
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-#, c-format
-msgid "User has no directory information."
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Prótacal Breiseán"
 
-#, c-format
-msgid "Country not supported."
+msgid "Pager server"
 msgstr ""
 
-#, c-format
-msgid "Failure unknown: %s."
+msgid "Pager port"
 msgstr ""
 
-#, c-format
-msgid "Incorrect username or password."
+msgid "File transfer server"
 msgstr ""
 
-#, c-format
-msgid "The service is temporarily unavailable."
+msgid "File transfer port"
 msgstr ""
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
+msgid "Chat room locale"
 msgstr ""
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
+msgid "Chat room list URL"
 msgstr ""
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
+msgid "Yahoo Chat server"
 msgstr ""
 
-msgid "Invalid Groupname"
+msgid "Yahoo Chat port"
 msgstr ""
 
 #, fuzzy
-msgid "Connection Closed"
-msgstr "Nasc dúnta"
-
-msgid "Waiting for reply..."
-msgstr ""
-
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-
-msgid "Password Change Successful"
-msgstr ""
-
-msgid "_Group:"
-msgstr "_Grúpa:"
-
-msgid "Get Dir Info"
-msgstr ""
-
-msgid "Set Dir Info"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Could not open %s for writing!"
-msgstr "Níorbh fhéidir `%s' a oscailt chun scríoch ann: %s"
-
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-
-msgid "Could not connect for transfer."
-msgstr ""
-
-msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-
-msgid "Save As..."
-msgstr "Sábháil le..."
-
-#, 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] ""
-
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr ""
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9053,11 +9034,11 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC Prótacal Breiseán"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Prótacal Breiseán"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9080,6 +9061,27 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "earráid agus ag léamh %s"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9107,33 +9109,27 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "Ní féidir an comhad a oscailt."
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr ""
-
-msgid "Connection problem"
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Cailleadh an nasc le \"%s\"."
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Cailleadh an nasc le \"%s\"."
 
 msgid "Not at Home"
 msgstr ""
@@ -9180,7 +9176,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -9195,74 +9191,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Prótacal Breiseán"
-
-msgid "Yahoo Japan"
-msgstr ""
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr ""
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9270,6 +9207,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr "Earráid scríobh"
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9311,13 +9251,8 @@ msgstr ""
 msgid "Last Update"
 msgstr ""
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr ""
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9380,20 +9315,18 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
-msgid "Unable to fetch room list."
+msgid "Connection problem"
 msgstr ""
 
-msgid "User Rooms"
+msgid "Unable to fetch room list."
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
+msgid "User Rooms"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Connection problem with the YCHT server"
+msgstr "Cailleadh an nasc le \"%s\"."
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9512,13 +9445,7 @@ msgid "Exposure"
 msgstr "nochtadh"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9526,16 +9453,13 @@ msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9620,9 +9544,6 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Mobile"
-msgstr ""
-
 msgid "Listening to music"
 msgstr ""
 
@@ -9664,16 +9585,6 @@ msgstr ""
 msgid "%x %X"
 msgstr "%x %X"
 
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr "earráid agus ag léamh %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr ""
 
@@ -9780,6 +9691,16 @@ msgstr "Nasc diúltaithe"
 msgid "Address already in use."
 msgstr "Seoladh in úsáid cheana féin"
 
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr "earráid agus ag léamh %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 msgid "Internet Messenger"
 msgstr ""
 
@@ -9824,10 +9745,9 @@ msgstr ""
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Roghanna"
+#, fuzzy
+msgid "_Advanced"
+msgstr "_Ardmódh"
 
 msgid "Use GNOME Proxy Settings"
 msgstr ""
@@ -9862,9 +9782,6 @@ msgstr ""
 msgid "you can see the butterflies mating"
 msgstr ""
 
-msgid "Proxy Options"
-msgstr ""
-
 msgid "Proxy _type:"
 msgstr ""
 
@@ -9894,8 +9811,8 @@ msgid "Create _this new account on the server"
 msgstr ""
 
 #, fuzzy
-msgid "_Advanced"
-msgstr "_Ardmódh"
+msgid "_Proxy"
+msgstr "Seach"
 
 msgid "Enabled"
 msgstr "cumasaithe"
@@ -9932,16 +9849,17 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr ""
 
-msgid "Room _List"
-msgstr ""
+#, fuzzy
+msgid "A_ccount"
+msgstr "Cuntas"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "_Cuntas:"
+msgid "Room _List"
+msgstr ""
 
 msgid "_Block"
 msgstr "_Cuireann bac"
@@ -9958,6 +9876,16 @@ msgstr ""
 msgid "I_M"
 msgstr ""
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "_Cuir Comhrá"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
 msgid "_Send File..."
 msgstr ""
 
@@ -9968,7 +9896,10 @@ msgstr ""
 msgid "View _Log"
 msgstr "Amharc ar logchomhad"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
 msgstr ""
 
 msgid "_Alias..."
@@ -10093,6 +10024,9 @@ msgstr ""
 msgid "/Tools/_Certificates"
 msgstr ""
 
+msgid "/Tools/Custom Smile_ys"
+msgstr ""
+
 msgid "/Tools/Plu_gins"
 msgstr ""
 
@@ -10102,9 +10036,6 @@ msgstr ""
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
-msgid "/Tools/Smile_y"
-msgstr ""
-
 msgid "/Tools/_File Transfers"
 msgstr ""
 
@@ -10219,7 +10150,7 @@ msgstr ""
 msgid "By status"
 msgstr ""
 
-msgid "By log size"
+msgid "By recent log activity"
 msgstr ""
 
 #, c-format
@@ -10236,6 +10167,9 @@ msgstr ""
 msgid "Re-enable"
 msgstr ""
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10315,6 +10249,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_ilias"
 
+msgid "_Group:"
+msgstr "_Grúpa:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10348,6 +10285,111 @@ msgstr "/Uirlísí"
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Dath Cúlra"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Láóis"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Dath Cúlra"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Cuir dath cúlra"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Cuir dath cúlra"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+msgid "Contact Text"
+msgstr ""
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Gnáth-Théacs"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Shiúl"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Gnáth-Théacs"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Díomhaoin"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Scéal"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Servers"
@@ -10366,12 +10408,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
 msgid "_Buddy:"
 msgstr "_Cara:"
 
@@ -10404,8 +10440,9 @@ msgstr "Déan neamhshuim"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
-msgstr ""
+#, fuzzy
+msgid "Last Said"
+msgstr "Sloinne"
 
 msgid "Unable to save icon file to disk."
 msgstr ""
@@ -10450,6 +10487,21 @@ msgstr ""
 msgid "/Conversation/Clea_r Scrollback"
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Comhrá"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Comhrá/_Cuir..."
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Comhrá/Cuir..."
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr ""
+
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
@@ -10522,6 +10574,17 @@ msgstr "/Comhrá"
 msgid "/Conversation/View Log"
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Comhrá/Cuir..."
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Comhrá/Cuir..."
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr ""
+
 msgid "/Conversation/Send File..."
 msgstr ""
 
@@ -10712,6 +10775,9 @@ msgstr "Ealaíontóir"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr ""
 
@@ -10840,6 +10906,10 @@ msgstr "Hiondis"
 msgid "Hungarian"
 msgstr "Ungáiris"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rómáinis"
+
 msgid "Indonesian"
 msgstr "Indinéisis"
 
@@ -10855,6 +10925,10 @@ msgstr "Grúisis"
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Eile"
+
 msgid "Kannada"
 msgstr "Cannadais"
 
@@ -10876,6 +10950,10 @@ msgstr "Liotuáinis"
 msgid "Macedonian"
 msgstr "Macadóinis"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "Macadóinis"
+
 msgid "Bokmål Norwegian"
 msgstr "Ioruais Bokmål"
 
@@ -10930,6 +11008,9 @@ msgstr "Siolóinis"
 msgid "Swedish"
 msgstr "Sualainnis"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamailis"
 
@@ -10981,7 +11062,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 
 msgid "Current Developers"
@@ -11221,7 +11319,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11257,13 +11355,19 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 
 msgid "Typing notification font"
@@ -11275,15 +11379,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr ""
 
-msgid "_Copy Email Address"
-msgstr ""
-
-msgid "_Open Link in Browser"
-msgstr ""
-
-msgid "_Copy Link Location"
-msgstr ""
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11314,11 +11409,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Sábháil an Íomha"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Sábháil Íomhá..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11406,10 +11499,6 @@ msgstr ""
 msgid "Font Face"
 msgstr "Clófhoireann"
 
-#, fuzzy
-msgid "Background Color"
-msgstr "Dath Cúlra"
-
 msgid "Foreground Color"
 msgstr "Dath an Tulra"
 
@@ -11515,13 +11604,14 @@ msgstr ""
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11531,14 +11621,23 @@ msgid ""
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11547,6 +11646,14 @@ msgid ""
 "                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
 
 #, c-format
 msgid ""
@@ -11569,10 +11676,25 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+msgid "Calling..."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
 
 #, c-format
@@ -11602,6 +11724,26 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "Scéal"
+
+msgid "Open All Messages"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Cuntas Nua"
+
+msgid "Dismiss"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -11649,10 +11791,17 @@ msgstr ""
 msgid "Select a file"
 msgstr "Roghnaigh Comhad"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Eolais Logann"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "_Cuntas:"
+
 msgid "_Buddy name:"
 msgstr ""
 
@@ -11719,7 +11868,57 @@ msgstr ""
 msgid "Pounce Target"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+#, c-format
+msgid "Started typing"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr " Tá  úsáideoir ag clóscríobh..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Cuir Chuig"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr ""
+
+#, c-format
+msgid "Returned from being away"
+msgstr ""
+
+#, c-format
+msgid "Stopped typing"
+msgstr ""
+
+#, c-format
+msgid "Signed off"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Sábháil comhad..."
+
+#, c-format
+msgid "Went away"
+msgstr ""
+
+#, c-format
+msgid "Sent a message"
+msgstr ""
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -11739,6 +11938,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr ""
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Liosta Cara"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr ""
 
@@ -11748,8 +11953,9 @@ msgstr ""
 msgid "On unread messages"
 msgstr ""
 
-msgid "Conversation Window Hiding"
-msgstr ""
+#, fuzzy
+msgid "Conversation Window"
+msgstr "/Comhrá"
 
 msgid "_Hide new IM conversations:"
 msgstr ""
@@ -11757,6 +11963,9 @@ msgstr ""
 msgid "When away"
 msgstr ""
 
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -11815,9 +12024,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-msgid "Minimi_ze new conversation windows"
-msgstr ""
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -11848,13 +12054,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-msgid "ST_UN server:"
-msgstr ""
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -11875,6 +12079,10 @@ msgstr ""
 msgid "_End port:"
 msgstr ""
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr ""
 
@@ -11901,6 +12109,10 @@ msgstr ""
 msgid "No proxy"
 msgstr ""
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Úsáideoir:"
 
@@ -12060,10 +12272,10 @@ msgstr ""
 msgid "Auto-away"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-msgid "_Minutes before becoming idle:"
+msgid "Change status when _idle"
 msgstr ""
 
 msgid "Change _status to:"
@@ -12217,45 +12429,44 @@ msgstr ""
 msgid "Status for %s"
 msgstr "Stádas le %s"
 
-msgid "Custom Smiley"
-msgstr ""
-
-msgid "More Data needed"
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Please provide a shortcut to associate with the smiley."
+msgid "Custom Smiley"
 msgstr ""
 
 msgid "Duplicate Shortcut"
 msgstr ""
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-msgid "Please select an image for the smiley."
-msgstr ""
-
 msgid "Edit Smiley"
 msgstr ""
 
 msgid "Add Smiley"
 msgstr "Cuir Straoiseog"
 
-msgid "Smiley _Image"
-msgstr ""
+#, fuzzy
+msgid "_Image:"
+msgstr "_Íomhá"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
+#. Shortcut text
+msgid "S_hortcut text:"
 msgstr ""
 
 msgid "Smiley"
 msgstr "Straoiseog"
 
+msgid "Shortcut Text"
+msgstr ""
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Roghnaigh Cló..."
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -12333,8 +12544,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -12363,6 +12574,16 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Nasc"
+
+msgid "_Copy Link Location"
+msgstr ""
+
+msgid "_Copy Email Address"
+msgstr ""
+
 msgid "Save File"
 msgstr "Sábháil comhad..."
 
@@ -12457,6 +12678,68 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+msgid "Server name request"
+msgstr ""
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Íontráil Pasfhocal"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Liosta Cara"
+
+msgid "Gateway"
+msgstr ""
+
+#, fuzzy
+msgid "Directory"
+msgstr "cruthaitheoir"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Tuarascail"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Brabhsálaí:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Níl úsáideoir '%s' ar bith ann."
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -12825,7 +13108,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -12932,12 +13215,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -12947,6 +13224,9 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+msgid "Typing Notification Color"
+msgstr ""
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -12977,35 +13257,22 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+msgid "Disable Typing Notification Text"
 msgstr ""
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "Dún"
+
 msgid "Fonts"
 msgstr "Clófhoireann"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13089,7 +13356,7 @@ msgstr ""
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13141,6 +13408,106 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Logáilte isteach!\n"
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+msgid "Icon for Chat"
+msgstr ""
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Déan neamhshuim"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Níos Airde"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Údaraigh cara?"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Earraidh"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Eolas"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Rabhadh"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Stádas le %s"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Athraigh focal faire"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "Ceangal"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Liosta Cara"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Liosta Cara"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13296,9 +13663,6 @@ msgstr ""
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr ""
-
 msgid "Windows Pidgin Options"
 msgstr ""
 
@@ -13306,7 +13670,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13347,19 +13711,55 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Luas:"
+#~ msgid "Read error"
+#~ msgstr "Earráid sa léamh"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
+#~ msgid "Write error"
+#~ msgstr "Earráid sa scríobh"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Bytestreams"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#, fuzzy
+#~ msgid "Read Error"
+#~ msgstr "earráid ag léamh"
 
 #, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "earráid agus ag léamh %s"
+#~ msgid "Incorrect password."
+#~ msgstr "pasfhocal mícheart"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "pasfhocal mícheart"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Cuir Cara"
+
+#, fuzzy
+#~ msgid "Connection Closed"
+#~ msgstr "Nasc dúnta"
+
+#, fuzzy
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Níorbh fhéidir `%s' a oscailt chun scríoch ann: %s"
+
+#~ msgid "Save As..."
+#~ msgstr "Sábháil le..."
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC Prótacal Breiseán"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Roghanna"
+
+#, fuzzy
+#~ msgid "Successed:"
+#~ msgstr "Luas:"
 
 #, fuzzy
 #~ msgid "QQ Budy"
diff --git a/po/gl.po b/po/gl.po
index e28eb7b12e..a3d4464709 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,22 +1,23 @@
-# translation of gl.po to Galego
+# translation of gl.po to Galician
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2008.
+# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2008,2009
+# Antón Méixome <meixome@mancomun.org>, 2009.
 # Previously translators:
 # Mar Castro <mmcastro@cesga.es> 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-18 01:17-0800\n"
-"PO-Revision-Date: 2008-12-15 13:44+0100\n"
-"Last-Translator: Frco. Javier Rial Rodríguez <fjrial@cesga.es>\n"
-"Language-Team: Galego <g11n@mancomun.org>\n"
+"POT-Creation-Date: 2009-07-18 01:43-0700\n"
+"PO-Revision-Date: 2009-07-15 15:15+0200\n"
+"Last-Translator: Antón Méixome <meixome@mancomun.org>\n"
+"Language-Team: Galician <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Translators may want to transliterate the name.
@@ -34,7 +35,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -43,7 +44,7 @@ msgstr ""
 "Uso: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    usar DIR para ficheiros de configuración\n"
-"  -d, --debug         imprimir mensaxes de depuración en stdout\n"
+"  -d, --debug         imprimir mensaxes de depuración en stderr\n"
 "  -h, --help          mostrar esta axuda e saír\n"
 "  -n, --nologin       non iniciar a sesión automaticamente\n"
 "  -v, --version       mostrar a versión actual e saír\n"
@@ -555,24 +556,23 @@ msgstr ""
 "novamente."
 
 msgid "No such command."
-msgstr "Non existe o comando."
+msgstr "Non existe a orde."
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Erro de sintaxe: escribiu un número incorrecto de argumentos para ese "
-"comando."
+"Erro de sintaxe: escribiu un número incorrecto de argumentos para esa orde."
 
 msgid "Your command failed for an unknown reason."
-msgstr "O seu comando fallou por motivos descoñecidos."
+msgstr "A súa orde fallou por motivos descoñecidos."
 
 msgid "That command only works in chats, not IMs."
-msgstr "Ese comando só funciona en conversas, non en MIs."
+msgstr "Esa orde só funciona en conversas, non nas MI."
 
 msgid "That command only works in IMs, not chats."
-msgstr "Ese comando só funciona en MIs, non en conversas."
+msgstr "Esa orde só funciona nas MI, non en conversas."
 
 msgid "That command doesn't work on this protocol."
-msgstr "Ese comando non funciona neste protocolo."
+msgstr "Esa orde non funciona neste protocolo."
 
 msgid "Message was not sent, because you are not signed on."
 msgstr "Non se enviou a mensaxe porque non está conectado."
@@ -610,19 +610,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Enviar a"
 
-msgid "Invite message"
-msgstr "Mensaxe de convite"
-
-msgid "Invite"
-msgstr "Convidar"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Introduza o nome do usuario que desexa convidar,\n"
-"xunto cunha mensaxe de convite opcional."
-
 msgid "Conversation"
 msgstr "Conversa"
 
@@ -651,41 +638,41 @@ msgstr "<RESPOSTA AUTOMÁTICA> "
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
 msgstr[0] "Lista de %d usuario:\n"
-msgstr[1] "Lista de %d usuario:\n"
+msgstr[1] "Lista de %d usuarios:\n"
 
 msgid "Supported debug options are:  version"
-msgstr "As opcións de depuración soportadas son:  version"
+msgstr "As opcións de depuración compatíbeis son:  version"
 
 msgid "No such command (in this context)."
-msgstr "Non existe o comando (neste contexto)."
+msgstr "Non existe a orde (neste contexto)."
 
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Use \"/help &lt;comando&gt;\" para obter axuda sobre un comando específico.\n"
-"Os seguintes comandos están dispoñíbeis neste contexto:\n"
+"Use \"/help &lt;orde&gt;\" para obter axuda sobre unha orde específica.\n"
+"As seguintes ordes están dispoñíbeis neste contexto:\n"
 
 #, c-format
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
 msgstr ""
-"%s non é unha clase válida de mensaxe. Consulte o ficheiro '/help msgcolor' "
-"para ver as mensaxes de clase válidas."
+"%s non é unha clase válida de mensaxe. Consulte '/help msgcolor' para ver as "
+"mensaxes de clase válidas."
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr ""
-"%s non é unha cor válida. Consulte o ficheiro '/help msgcolor' para ver as "
-"cores válidas."
+"%s non é unha cor válida. Consulte '/help msgcolor' para ver as cores "
+"válidas."
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 "say &lt;mensaxe&gt;:  Envía unha mensaxe normalmente, como se non estivese "
-"utilizando un comando."
+"utilizando unha orde."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
@@ -703,7 +690,7 @@ msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Limpa o historial da conversa."
 
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;comando&gt;:  Axuda sobre un comando específico."
+msgstr "help &lt;orde&gt;:  Axuda sobre unha orde específica."
 
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Mostra a lista de usuarios na sala de conversa."
@@ -754,7 +741,7 @@ msgid "Clear"
 msgstr "Limpar"
 
 msgid "Filter:"
-msgstr "Filtro: "
+msgstr "Filtro:"
 
 msgid "Pause"
 msgstr "Deter"
@@ -763,7 +750,7 @@ msgstr "Deter"
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
 msgstr[0] "Transferencias de ficheiros - %d%% de %d ficheiro"
-msgstr[1] "Transferencias de ficheiros - %d%% de %d ficheiro"
+msgstr[1] "Transferencias de ficheiros - %d%% de %d ficheiros"
 
 #. Create the window.
 msgid "File Transfers"
@@ -884,11 +871,46 @@ msgstr "Todas as conversas"
 msgid "System Log"
 msgstr "Rexistro do sistema"
 
+msgid "Calling ... "
+msgstr "Chamando... "
+
+msgid "Hangup"
+msgstr "Colgar"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Aceptar"
+
+msgid "Reject"
+msgstr "Rexeitar"
+
+msgid "Call in progress."
+msgstr "Chamada en curso."
+
+msgid "The call has been terminated."
+msgstr "A chamada terminou."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s quere comezar unha sesión de audio contigo."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+"%s está intentando comezar un tipo de sesión multimedia non compatíbel "
+"contigo."
+
+msgid "You have rejected the call."
+msgstr "Vostede rexeitou a chamada."
+
+msgid "call: Make an audio call."
+msgstr "chamada: Facer unha chamada de audio."
+
 msgid "Emails"
 msgstr "Correos electrónicos"
 
 msgid "You have mail!"
-msgstr "Ten un correo!"
+msgstr "Ten correo!"
 
 msgid "Sender"
 msgstr "Remitente"
@@ -900,7 +922,7 @@ msgstr "Asunto"
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) ten %d mensaxe nova."
-msgstr[1] "%s (%s) ten %d mensaxe nova."
+msgstr[1] "%s (%s) ten %d mensaxes novas."
 
 msgid "New Mail"
 msgstr "Correo novo"
@@ -918,6 +940,9 @@ msgstr "Continuar"
 msgid "IM"
 msgstr "MI"
 
+msgid "Invite"
+msgstr "Convidar"
+
 msgid "(none)"
 msgstr "(ningún)"
 
@@ -996,7 +1021,7 @@ msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de contacto"
 
 msgid "Pounce Who"
-msgstr "Avisar a quen?"
+msgstr "Avisar a quen"
 
 #. Account:
 msgid "Account:"
@@ -1053,7 +1078,7 @@ msgid "Send a message"
 msgstr "Enviar unha mensaxe"
 
 msgid "Execute a command"
-msgstr "Executar un comando"
+msgstr "Executar unha orde"
 
 msgid "Play a sound"
 msgstr "Reproducir un son"
@@ -1120,7 +1145,6 @@ msgstr "%s marchou. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s envioulle unha mensaxe. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso descoñecido. Informe disto!"
 
@@ -1166,7 +1190,6 @@ msgstr "Minutos antes de cambiar o estado"
 msgid "Change status to"
 msgstr "Cambiar o estado a"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Conversacións"
 
@@ -1256,7 +1279,7 @@ msgid "Console Beep"
 msgstr "Ton de aviso da consola"
 
 msgid "Command"
-msgstr "Comando"
+msgstr "Orde"
 
 msgid "No Sound"
 msgstr "Sen son"
@@ -1272,7 +1295,7 @@ msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Comandos de son\n"
+"Ordes de son\n"
 "(%s para nome de ficheiro)"
 
 #. Sound options
@@ -1395,8 +1418,8 @@ msgstr "Non se puido encontrar a xanela"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
-"Este complemento non se pode cargar porque non se construíu con soporte de "
-"X11."
+"Este complemento non se pode cargar porque non se construíu con "
+"compatibilidade de X11."
 
 msgid "GntClipboard"
 msgstr "GntClipboard"
@@ -1489,7 +1512,6 @@ msgstr ""
 "Cando se abra unha nova conversa este complemento introducirá a última "
 "conversa na actual."
 
-#, c-format
 msgid "Online"
 msgstr "Conectado"
 
@@ -1533,6 +1555,30 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Complemento de Lastlog."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Obtendo TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Só crear TinyURL para enderezos deste tamaño ou superior"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (ou outro) prefixo de enderezo"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Plugin TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"Ao recibir unha mensaxe con URL, utilizar o TinyURL para o copiado rápido"
+
 msgid "accounts"
 msgstr "contas"
 
@@ -1633,13 +1679,6 @@ msgstr "Quere aceptar o certificado para %s?"
 msgid "SSL Certificate Verification"
 msgstr "Verificación de certificado SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Aceptar"
-
-msgid "Reject"
-msgstr "Rexeitar"
-
 msgid "_View Certificate..."
 msgstr "_Ver certificado..."
 
@@ -1743,6 +1782,7 @@ msgstr "+++ %s conectouse"
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectouse"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
@@ -1789,6 +1829,17 @@ msgstr "%s saíu da sala."
 msgid "%s left the room (%s)."
 msgstr "%s saíu da sala (%s)."
 
+msgid "Invite to chat"
+msgstr "Convidar a unha conversa"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Introduza o nome do usuario que desexa convidar, xunto cunha mensaxe de "
+"convite opcional."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Fallou ao obter a conexión: %s"
@@ -1922,10 +1973,13 @@ msgid "Starting transfer of %s from %s"
 msgstr "Iniciando transferencia de %s desde %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Transferencia do ficheiro <A HREF=\"file://%s\">%s</A> completada"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Terminou a transferencia do ficheiro %s"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Transferencia de ficheiros terminada"
 
@@ -1933,7 +1987,6 @@ msgstr "Transferencia de ficheiros terminada"
 msgid "You canceled the transfer of %s"
 msgstr "Cancelou a transferencia de %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Transferencia de ficheiros cancelada"
 
@@ -1954,31 +2007,31 @@ msgid "File transfer from %s failed."
 msgstr "A transferencia de ficheiros desde %s fallou."
 
 msgid "Run the command in a terminal"
-msgstr "Executar o comando nun terminal"
+msgstr "Executar a orde nun terminal"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"aim\", se está activado."
+msgstr "A orde usada para manipular os URL \"aim\", se está activado."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"gg\",  se está activado."
+msgstr "A orde usada para manipular os URL \"gg\",  se está activado."
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"icq\",  se está activado."
+msgstr "A orde usada para manipular os URL \"icq\",  se está activado."
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"irc\",  se está activado."
+msgstr "A orde usada para manipular os URL \"irc\",  se está activado."
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"msnim\", se está activado."
+msgstr "A orde usada para manipular os URL \"msnim\", se está activado."
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"sip\", se está activado."
+msgstr "A orde usada para manipular os URL \"sip\", se está activado."
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"xmpp\", se está activado."
+msgstr "A orde usada para manipular os URL \"xmpp\", se está activado."
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"ymsgr\",  se está activado."
+msgstr "A orde usada para manipular os URL \"ymsgr\",  se está activado."
 
 msgid "The handler for \"aim\" URLs"
 msgstr "O manipulador dos URL \"aim\""
@@ -2008,88 +2061,88 @@ msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"aim\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"aim\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"gg\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"gg\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"icq\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"icq\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"irc\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"irc\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"msnim\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"msnim\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"sip\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"sip\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"xmpp\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"xmpp\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"ymsgr\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"ymsgr\"."
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"É verdadeiro se o comando usado para manipular este tipo de URL debe ser "
+"É verdadeiro se a orde usada para manipular este tipo de URL debe ser "
 "executado nun terminal."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"aim\""
+msgstr "Indica se a orde especificada debe manipular os URL \"aim\""
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"gg\""
+msgstr "Indica se a orde especificada debe manipular os URL \"gg\""
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"icq\""
+msgstr "Indica se a orde especificada debe manipular os URL \"icq\""
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"irc\""
+msgstr "Indica se a orde especificada debe manipular os URL \"irc\""
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"msnim\""
+msgstr "Indica se a orde especificada debe manipular os URL \"msnim\""
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"sip\""
+msgstr "Indica se a orde especificada debe manipular os URL \"sip\""
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"xmpp\""
+msgstr "Indica se a orde especificada debe manipular os URL \"xmpp\""
 
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"ymsgr\""
+msgstr "Indica se a orde especificada debe manipular os URL \"ymsgr\""
 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
@@ -2139,11 +2192,13 @@ msgstr "<font color=\"red\"><b>Non se puido ler o ficheiro: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA AUTOMÁTICA>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Erro ao crear a conversa."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Esta a empregar %s, mais este complemento precisa %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Este complemento non definiu un ID."
 
@@ -2325,7 +2380,7 @@ msgstr "Control de ficheiros"
 #. *  summary
 #. *  description
 msgid "Allows control by entering commands in a file."
-msgstr "Permite controlar o programa introducindo comandos nun ficheiro."
+msgstr "Permite controlar o programa introducindo ordes nun ficheiro."
 
 msgid "Minutes"
 msgstr "Minutos"
@@ -2372,15 +2427,15 @@ msgstr "Cliente de proba IPC"
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "Probar o soporte do complemento IPC como un cliente."
+msgstr "Probar a compatibilidade do complemento IPC como un cliente."
 
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Probar o soporte do complemento IPC como un cliente. Isto localiza o "
-"complemento de servidor e chama aos comandos rexistrados."
+"Probar a compatibilidade do complemento IPC como un cliente. Isto localiza o "
+"complemento de servidor e chama as ordes rexistradas."
 
 #. *< type
 #. *< ui_requirement
@@ -2395,13 +2450,13 @@ msgstr "Servidor de proba IPC"
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "Probar o soporte do complemento IPC como un servidor."
+msgstr "Probar a compatibilidade do complemento IPC como un servidor."
 
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"Probar o soporte do complemento IPC como un servidor. Isto rexistra os "
-"comandos IPC."
+"Probar a compatibilidade do complemento IPC como un servidor. Isto rexistra "
+"as ordes IPC."
 
 msgid "Join/Part Hiding Configuration"
 msgstr "Configuración da ocultación de Unirse/Deixar"
@@ -2548,7 +2603,7 @@ msgstr "Inclúe outros rexistros de clientes de MI no visualizador de rexistro."
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2604,11 +2659,11 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "Gardar como avisos as mensaxes enviadas a un usuario desconectado."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "O resto das mensaxes gardaranse como avisos. Pode editar/eliminar os avisos "
-"na xanela de diálogo 'Avisos de amigo'."
+"no cadro de diálogo 'Avisos de amigo'."
 
 #, c-format
 msgid ""
@@ -2637,6 +2692,34 @@ msgstr "Gardar as mensaxes sen conexión nun aviso"
 msgid "Do not ask. Always save in pounce."
 msgstr "Non preguntar. Gardar sempre nun aviso."
 
+msgid "One Time Password"
+msgstr "Contrasinal de un só uso"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Compatibilidade con contrasinal de un só uso"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Obriga a que os contrasinais só teñan un uso."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Permítelle obrigar respecto dunha conta que os contrasinais que non sexan "
+"gardados só sexan usados nunha única conexión correcta.\n"
+"Nota. O contrasinal da conta non debe ser gardado para que isto funcione."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2650,7 +2733,7 @@ msgstr "Cargador de complementos Perl"
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "Proporciona o soporte para cargar complementos en perl."
+msgstr "Proporciona a compatibilidade para cargar complementos en perl."
 
 msgid "Psychic Mode"
 msgstr "Modo psíquico"
@@ -2731,7 +2814,7 @@ msgstr "GNUTLS"
 #. *  summary
 #. *  description
 msgid "Provides SSL support through GNUTLS."
-msgstr "Proporciona soporte SSL a través de GNUTLS."
+msgstr "Proporciona a compatibilidade SSL a través de GNUTLS."
 
 #. *< type
 #. *< ui_requirement
@@ -2747,7 +2830,7 @@ msgstr "NSS"
 #. *  summary
 #. *  description
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "Proporciona soporte SSL a través do NSS de Mozilla."
+msgstr "Proporciona compatibilidade SSL a través do NSS de Mozilla."
 
 #. *< type
 #. *< ui_requirement
@@ -2763,7 +2846,7 @@ msgstr "SSL"
 #. *  summary
 #. *  description
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Proporciona un wrapper para as bibliotecas de soporte de SSL."
+msgstr "Proporciona un wrapper para as bibliotecas de compatibilidade con SSL."
 
 #, c-format
 msgid "%s is no longer away."
@@ -2821,7 +2904,7 @@ msgid "Tcl Plugin Loader"
 msgstr "Cargador de complementos Tcl"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "Proporciona o soporte para cargar complementos Tcl"
+msgstr "Proporciona a compatabilidade para cargar complementos Tcl"
 
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
@@ -2832,15 +2915,15 @@ msgstr ""
 "activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Non se encontrou o toolkit Apple Bonjour for Windows, vexa a sección de "
+"Non se encontrou o toolkit Apple Bonjour para Windows, vexa a sección de "
 "preguntas máis frecuentes (FAQ) en: http://d.pidgin.im/BonjourWindows para "
 "máis información."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Non é posíbel escoitar as conexións entrantes de MI\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Non é posíbel escoitar as conexións entrantes de MI"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2848,7 +2931,6 @@ msgstr ""
 "Non é posíbel establecer a conexión co servidor local mDNS. Estase a "
 "executar?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Nome"
 
@@ -2880,6 +2962,10 @@ msgstr "Complemento de protocolo Bonjour"
 msgid "Purple Person"
 msgstr "Persoa Purple"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "Porto local"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2890,17 +2976,20 @@ msgstr "%s pechou a conversa."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Non é posíbel enviar a mensaxe; non se puido iniciar a conversa."
 
-msgid "Cannot open socket"
-msgstr "Non se pode abrir o conectador"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Non se puido crear un conectador: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Non se puido vincular o conectador ao porto"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Non se puido vincular o conectador ao porto: %s"
 
-msgid "Could not listen on socket"
-msgstr "Non se puido escoitar o conectador"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Non foi posíbel escoitar no conectador: %s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "Erro ao comunicar co mDNSResponder local"
+msgstr "Erro ao comunicar co mDNSResponder local."
 
 msgid "Invalid proxy settings"
 msgstr "A configuración do proxy non é válida"
@@ -2947,14 +3036,14 @@ msgstr "Gardar lista de contactos..."
 msgid "Load buddylist from file..."
 msgstr "Cargar a lista de contactos desde un ficheiro..."
 
-msgid "Fill in the registration fields."
-msgstr "Encher os campos de rexistro."
+msgid "You must fill in all registration fields"
+msgstr "Encher en todos os campos de rexistro"
 
-msgid "Passwords do not match."
-msgstr "Os contrasinais non coinciden."
+msgid "Passwords do not match"
+msgstr "Os contrasinais non coinciden"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Non se puido rexistrar a nova conta. Produciuse un erro.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Non se puido rexistrar a nova conta. Produciuse un erro."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nova conta rexistrada de Gadu-Gadu"
@@ -2965,14 +3054,14 @@ msgstr "O rexistro terminou satisfactoriamente!"
 msgid "Password"
 msgstr "Contrasinal"
 
-msgid "Password (retype)"
-msgstr "Contrasinal (escribir de novo)"
+msgid "Password (again)"
+msgstr "Contrasinal (de novo)"
 
-msgid "Enter current token"
-msgstr "Introduza o token actual"
+msgid "Enter captcha text"
+msgstr "Introduza o texto CAPTCHA"
 
-msgid "Current token"
-msgstr "Token actual"
+msgid "Captcha"
+msgstr "Imaxe CAPTCHA"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rexistrar unha conta nova de Gadu-Gadu"
@@ -2993,7 +3082,7 @@ msgid "Male or female"
 msgstr "Home ou muller"
 
 msgid "Male"
-msgstr "Male"
+msgstr "Home"
 
 msgid "Female"
 msgstr "Muller"
@@ -3025,6 +3114,15 @@ msgstr "O contrasinal modificouse con éxito!"
 msgid "Current password"
 msgstr "Contrasinal actual"
 
+msgid "Password (retype)"
+msgstr "Contrasinal (escribir de novo)"
+
+msgid "Enter current token"
+msgstr "Introduza o token actual"
+
+msgid "Current token"
+msgstr "Token actual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduza o seu contrasinal actual e o novo para o UIN: "
 
@@ -3038,13 +3136,13 @@ msgstr "Seleccione unha conversa para o contacto: %s"
 msgid "Add to chat..."
 msgstr "Engadir á conversa..."
 
+#. Global
 msgid "Available"
 msgstr "Dispoñíbel"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Ausente"
 
@@ -3072,8 +3170,8 @@ msgstr "Non se encontrou usuarios coincidentes"
 msgid "There are no users matching your search criteria."
 msgstr "Non hai usuarios que coincidan cos seus criterios de busca."
 
-msgid "Unable to read socket"
-msgstr "Non é posíbel ler o conectador"
+msgid "Unable to read from socket"
+msgstr "Non é posíbel ler desde o conectador"
 
 msgid "Buddy list downloaded"
 msgstr "Descargouse a lista de contactos"
@@ -3087,8 +3185,14 @@ msgstr "Enviouse a lista de contactos"
 msgid "Your buddy list was stored on the server."
 msgstr "A súa lista de contactos almacenouse no servidor."
 
-msgid "Connection failed."
-msgstr "Fallou a conexión."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Conectado"
+
+msgid "Connection failed"
+msgstr "Fallo ao conectar"
 
 msgid "Add to chat"
 msgstr "Engadir á conversa"
@@ -3096,14 +3200,23 @@ msgstr "Engadir á conversa"
 msgid "Chat _name:"
 msgstr "_Nome da conversa:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Non se puido conectar ao servidor '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Conectando"
+
 msgid "Chat error"
 msgstr "Erro da conversa"
 
 msgid "This chat name is already in use"
 msgstr "O nome desta conversa xa está en uso"
 
-msgid "Not connected to the server."
-msgstr "Non está conectado ao servidor."
+msgid "Not connected to the server"
+msgstr "Non está conectado ao servidor"
 
 msgid "Find buddies..."
 msgstr "Buscar contactos..."
@@ -3144,9 +3257,12 @@ msgstr "MI popular en Polonia"
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
+msgid "GG server"
+msgstr "Servidor GC"
+
 #, c-format
 msgid "Unknown command: %s"
-msgstr "Comando descoñecido: %s"
+msgstr "Orde descoñecida: %s"
 
 #, c-format
 msgid "current topic is: %s"
@@ -3158,7 +3274,7 @@ msgstr "Non hai un asunto definido"
 msgid "File Transfer Failed"
 msgstr "Fallou a transferencia do ficheiro"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Non se puido abrir un porto de escoita."
 
 msgid "Error displaying MOTD"
@@ -3174,8 +3290,16 @@ msgstr "Non hai un MOTD asociado con esta conexión."
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-msgid "Server has disconnected"
-msgstr "O servidor desconectouse"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Perdeuse a conexión co servidor: %s"
 
 msgid "View MOTD"
 msgstr "Ver MOTD"
@@ -3186,25 +3310,23 @@ msgstr "_Canle:"
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "Os alias de IRC non poden conter espazos en branco"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Conectando"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "Os alias de IRC e servidor non poden conter espazos en branco"
 
 msgid "SSL support unavailable"
-msgstr "O soporte de SSL non está dispoñíbel"
+msgstr "A compatibilidade con SSL non está dispoñíbel"
 
-msgid "Couldn't create socket"
-msgstr "Non se puido crear o conectador "
+msgid "Unable to connect"
+msgstr "Non é posíbel conectar"
 
-msgid "Couldn't connect to host"
-msgstr "Non se puido conectar ao servidor"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Non se puido conectar: %s"
 
-msgid "Read error"
-msgstr "Erro de lectura"
+#, c-format
+msgid "Server closed the connection"
+msgstr "O servidor cerrou a conexión"
 
 msgid "Users"
 msgstr "Usuarios"
@@ -3385,6 +3507,16 @@ msgstr ""
 "O servidor rexeitou o nome que escolleu para a súa conta. É probábel que "
 "inclúa caracteres non válidos."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "O alcume  \"%s\" xa está en uso."
+
+msgid "Nickname in use"
+msgstr "Alcume en uso"
+
 msgid "Cannot change nick"
 msgstr "Non se pode cambiar o alias"
 
@@ -3430,7 +3562,7 @@ msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
 msgstr "ctcp <nick> <msg>: envía unha mensaxe ctcp ao alias."
 
 msgid "chanserv: Send a command to chanserv"
-msgstr "chanserv: Enviar un comando ao chanserv"
+msgstr "chanserv: Enviar unha orde ao chanserv"
 
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
@@ -3486,7 +3618,7 @@ msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;acción para realizar&gt;:  Realizar unha acción."
 
 msgid "memoserv: Send a command to memoserv"
-msgstr "memoserv: Enviar un comando ao memoserv"
+msgstr "memoserv: Enviar unha orde ao memoserv"
 
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
@@ -3509,7 +3641,7 @@ msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo alias&gt;:  Cambia o seu alias."
 
 msgid "nickserv: Send a command to nickserv"
-msgstr "nickserv: Enviar un comando ao nickserv"
+msgstr "nickserv: Enviar unha orde ao nickserv"
 
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr "notice &lt;target&lt;:  Enviar un aviso a un usuario ou canle."
@@ -3529,7 +3661,7 @@ msgstr ""
 "utilizalo."
 
 msgid "operserv: Send a command to operserv"
-msgstr "operserv: Enviar un comando ao operserv"
+msgstr "operserv: Enviar unha orde ao operserv"
 
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
@@ -3554,10 +3686,10 @@ msgstr ""
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
-"quit [mensaxe]:  Desconéctase do servidor actual cunha mensaxe opcional"
+"quit [mensaxe]:  Desconéctase do servidor actual cunha mensaxe opcional."
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Enviar un comando en bruto ao servidor."
+msgstr "quote [...]:  Enviar unha orde en bruto ao servidor."
 
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
@@ -3617,20 +3749,17 @@ msgid "Unknown Error"
 msgstr "Erro descoñecido"
 
 msgid "Ad-Hoc Command Failed"
-msgstr "Fallou o comando Ad-Hoc"
+msgstr "Fallou a orde Ad-Hoc"
 
 msgid "execute"
 msgstr "executar"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"O servidor require TLS/SSL para iniciar a sesión. Non se dispón de soporte "
-"TLS/SSL."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "O servidor require TLS/SSL mais non está dispoñíbel."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
-"O servidor require TLS/SSL para iniciar a sesión. Non se dispón de soporte "
-"TLS/SSL."
+"Solicitou o cifrado mais non está dispoñíbel a capacidade para TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
@@ -3647,20 +3776,47 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticación con texto plano"
 
-msgid "Invalid response from server."
-msgstr "Resposta non válida do servidor."
+msgid "SASL authentication failed"
+msgstr "Fallou a autenticación SASL"
+
+msgid "Invalid response from server"
+msgstr "A resposta do servidor non é válida"
 
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor non usa ningún método de autenticación coñecido"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+"Vostede solicitou a codificación, mais non está dispoñíbel neste servidor."
+
 msgid "Invalid challenge from server"
-msgstr "O desafío do servidor non é válido."
+msgstr "O desafío do servidor non é válido"
+
+#, c-format
+msgid "SASL error: %s"
+msgstr "Erro de SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "O xestor de conexión BOSH terminou a súa sesión."
+
+msgid "No session ID given"
+msgstr "Non se proporcionou ningún ID de sesión"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "A versión do protocolo BOSH non é compatíbel"
 
-msgid "SASL error"
-msgstr "Erro de SASL"
+msgid "Unable to establish a connection with the server"
+msgstr "Non se puido estabelecer unha conexión co servidor"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Non se puido establecer unha conexión co servidor: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Non é posíbel comezar a conexión SSL"
 
 msgid "Full Name"
-msgstr "Nome completo:"
+msgstr "Nome completo"
 
 msgid "Family Name"
 msgstr "Apelidos"
@@ -3725,158 +3881,8 @@ msgstr "Cliente"
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-msgid "Last Activity"
-msgstr "Última actividade"
-
-msgid "Service Discovery Info"
-msgstr "Información de descubrimento de servizo"
-
-msgid "Service Discovery Items"
-msgstr "Elementos de descubrimento de servizo"
-
-msgid "Extended Stanza Addressing"
-msgstr "Envío de parágrafos ampliado"
-
-msgid "Multi-User Chat"
-msgstr "Conversa multiusuario"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Información de presencia ampliada de conversa multiusuario"
-
-msgid "In-Band Bytestreams"
-msgstr "Fluxos de bytes In-Band"
-
-msgid "Ad-Hoc Commands"
-msgstr "Comandos Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Servizo PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Fluxos de bytes SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Datos fóra de banda"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Rexistro In-Band"
-
-msgid "User Location"
-msgstr "Localización do usuario"
-
-msgid "User Avatar"
-msgstr "Avatar de usuario"
-
-msgid "Chat State Notifications"
-msgstr "Notificacións de estado da conversa"
-
-msgid "Software Version"
-msgstr "Versión de software"
-
-msgid "Stream Initiation"
-msgstr "Inicio de fluxo"
-
-msgid "File Transfer"
-msgstr "Transferencia de ficheiros"
-
-msgid "User Mood"
-msgstr "Estado de ánimo do usuario"
-
-msgid "User Activity"
-msgstr "Actividade do usuario"
-
-msgid "Entity Capabilities"
-msgstr "Capacidades da entidade"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negociacións de sesión codificada"
-
-msgid "User Tune"
-msgstr "Música do usuario"
-
-msgid "Roster Item Exchange"
-msgstr "Intercambio de elementos da lista"
-
-msgid "Reachability Address"
-msgstr "Enderezo de contacto"
-
-msgid "User Profile"
-msgstr "Perfil de usuario"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
-
-msgid "User Nickname"
-msgstr "Alias do usuario"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle UDP en bruto"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Recibos de mensaxe"
-
-msgid "Public Key Publishing"
-msgstr "Publicación da chave pública"
-
-msgid "User Chatting"
-msgstr "O usuario está conversando"
-
-msgid "User Browsing"
-msgstr "O usuario está navegando"
-
-msgid "User Gaming"
-msgstr "O usuario está xogando"
-
-msgid "User Viewing"
-msgstr "O usuario está observando"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Cifrado de parágrafo"
-
-msgid "Entity Time"
-msgstr "Hora da entidade"
-
-msgid "Delayed Delivery"
-msgstr "Envío atrasado"
-
-msgid "Collaborative Data Objects"
-msgstr "Collaborative Data Objects"
-
-msgid "File Repository and Sharing"
-msgstr "Repositorio de ficheiros e compartidos"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Descubrimento de servizo STUN para o Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociación simplificada de sesión cifrada"
-
-msgid "Hop Check"
-msgstr "Verificación de saltos"
-
-msgid "Capabilities"
-msgstr "Capacidades"
+msgid "Local Time"
+msgstr "Hora local"
 
 msgid "Priority"
 msgstr "Prioridade"
@@ -3884,6 +3890,13 @@ msgstr "Prioridade"
 msgid "Resource"
 msgstr "Recurso"
 
+#, c-format
+msgid "%s ago"
+msgstr "Hai %s "
+
+msgid "Logged Off"
+msgstr "Sesión cerrada"
+
 msgid "Middle Name"
 msgstr "Segundo nome"
 
@@ -3930,7 +3943,6 @@ msgstr "Falador"
 msgid "Extended Away"
 msgstr "Ausencia estendida"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Non molestar"
 
@@ -4052,29 +4064,24 @@ msgstr "Seleccione un servidor de conferencias ao que consultar"
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-"Vostede solicitou a codificación, mais non está dispoñíbel neste servidor."
+msgid "Affiliations:"
+msgstr "Afiliacións:"
 
-msgid "Write error"
-msgstr "Erro de escritura"
+msgid "No users found"
+msgstr "Non se encontrou usuarios"
 
-msgid "Ping timeout"
-msgstr "Excedeuse o tempo de espera do ping"
+msgid "Roles:"
+msgstr "Roles:"
 
-msgid "Read Error"
-msgstr "Erro de lectura"
+msgid "Ping timed out"
+msgstr "Excedeuse o tempo de espera do ping"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Non se puido establecer unha conexión co servidor:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Non é posíbel crear o conectador"
+"Non foi posíbel encontrar métodos de conexión XMPP alternativos despois de "
+"que fallase a conexión directa."
 
 msgid "Invalid XMPP ID"
 msgstr "ID de XMPP non válido"
@@ -4082,6 +4089,9 @@ msgstr "ID de XMPP non válido"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID de XMPP non válido. Débese definir o dominio."
 
+msgid "Malformed BOSH URL"
+msgstr "O enderezo URL BOSH está malformado"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Rexistro de %s@%s efectuado con éxito"
@@ -4106,9 +4116,6 @@ msgstr "uO rexistro cancelouse con éxito"
 msgid "Unregistration Failed"
 msgstr "Fallou a cancelación do rexistro"
 
-msgid "Already Registered"
-msgstr "Xa está rexistrado"
-
 msgid "State"
 msgstr "Estado"
 
@@ -4121,6 +4128,9 @@ msgstr "Teléfono"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Xa está rexistrado"
+
 msgid "Unregister"
 msgstr "Cancelar o rexistro"
 
@@ -4169,9 +4179,18 @@ msgstr "Autentificación"
 msgid "Re-initializing Stream"
 msgstr "Reinicializando  o fluxo"
 
+msgid "Server doesn't support blocking"
+msgstr "O servidor non admite o bloqueo"
+
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
+msgid "Mood"
+msgstr "Estado de ánimo"
+
+msgid "Now Listening"
+msgstr "Escoitando agora"
+
 msgid "Both"
 msgstr "Ambos"
 
@@ -4193,12 +4212,6 @@ msgstr "Ninguén"
 msgid "Subscription"
 msgstr "Subscrición"
 
-msgid "Mood"
-msgstr "Estado de ánimo"
-
-msgid "Now Listening"
-msgstr "Escoitando agora"
-
 msgid "Mood Text"
 msgstr "Texto de estado de ánimo"
 
@@ -4241,9 +4254,6 @@ msgstr "Modificouse o seu contrasinal."
 msgid "Error changing password"
 msgstr "Erro ao modificar o contrasinal"
 
-msgid "Password (again)"
-msgstr "Contrasinal (de novo)"
-
 msgid "Change XMPP Password"
 msgstr "Cambiar o contrasinal de XMPP"
 
@@ -4394,13 +4404,13 @@ msgid "Undefined Condition"
 msgstr "Condición non definida"
 
 msgid "Unsupported Encoding"
-msgstr "Codificación non soportada"
+msgstr "Codificación incompatíbel"
 
 msgid "Unsupported Stanza Type"
-msgstr "Tipo de parágrafo non soportado"
+msgstr "Tipo de parágrafo non compatíbel"
 
 msgid "Unsupported Version"
-msgstr "Versión non soportada"
+msgstr "Versión non compatíbel"
 
 msgid "XML Not Well Formed"
 msgstr "XML incorrectamente formado"
@@ -4437,19 +4447,24 @@ msgid "Unable to ping user %s"
 msgstr "Non é posíbel facer ping ao usuario %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
-"Non é posíbel enviar un zunido porque non se coñece nada do usuario %s."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Non é posíbel enviar un zunido porque non se coñece nada de %s."
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Non é posíbel enviar un zunido porque %s pode que estea desconectado."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
-"Non é posíbel enviar un zunido porque pode que o usuario %s estea "
-"desconectado."
+"Non é posíbel enviar un zunido porque %s non o admite ou non quere recibir  "
+"zunidos agora."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Non é posíbel enviar un zunido porque o usuario %s non o soporta."
+msgid "Buzzing %s..."
+msgstr "Enviando un zunido a %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4461,8 +4476,32 @@ msgid "%s has buzzed you!"
 msgstr "%s envioulle un zunido!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Enviando un zunido a %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Non se puido iniciar o medio con %s: o JID non é correcto"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Non se puido iniciar o medio con  %s: o usuario non está conectado"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Non se puido iniciar o medio con %s: non está subscrito á presenza do usuario"
+
+msgid "Media Initiation Failed"
+msgstr "Fallou o iniciación do medio"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Seleccione o recurso de %s co que quere iniciar unha sesión no medio."
+
+msgid "Select a Resource"
+msgstr "Seleccione un recurso"
+
+msgid "Initiate Media"
+msgstr "Iniciar o medio"
 
 msgid "config:  Configure a chat room."
 msgstr "config: Configurar unha sala de conversa."
@@ -4483,18 +4522,20 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]: Excluír un usuario da sala."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: Definir a "
-"afiliación dun usuario coa sala."
+"affiliado &lt;usuario&gt; &lt;propietario|admin|membro|outcast|ningún&gt; "
+"[nick1] [nick2] ...: Obter os usuarios cunha afiliación ou conxunto de "
+"afiliación de usuarios coa sala."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir o "
-"papel dun usuario na sala."
+"rol &lt;usuario&gt; &lt;moderador|participante|visitante|ningún&gt;:  "
+"[nick1] [nick2] ...: Obter os usuarios cun rol ou conxunto de roles de "
+"usuario coa sala."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaxe]: Convidar un usuario á sala."
@@ -4557,6 +4598,9 @@ msgstr "Conectar co servidor"
 msgid "File transfer proxies"
 msgstr "Proxies de transferencia de ficheiros"
 
+msgid "BOSH URL"
+msgstr "URL BOSH"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4595,6 +4639,14 @@ msgstr "Erro de análise de XML"
 msgid "Unknown Error in presence"
 msgstr "Erro descoñecido na presenza"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Erro ao unirse á conversa %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Erro na conversa %s"
+
 msgid "Create New Room"
 msgstr "Crear unha sala nova"
 
@@ -4611,19 +4663,34 @@ msgstr "_Configurar a sala"
 msgid "_Accept Defaults"
 msgstr "_Aceptar os valores predeterminados"
 
+msgid "No reason"
+msgstr "Non se deu ningunha razón"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Erro ao unirse á conversa %s"
+msgid "You have been kicked: (%s)"
+msgstr "Vostede foi expulsado: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Erro na conversa %s"
+msgid "Kicked (%s)"
+msgstr "Expulsado (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Produciuse un erro na transferencia do fluxo de bytes in-band\n"
+
+msgid "Transfer was closed."
+msgstr "A transferencia foi cerrada."
+
+msgid "Failed to open the file"
+msgstr "Fallou ao abrir o ficheiro"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Produciuse un erro no fluxo de bytes in-band"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
-"Non se puido enviar o ficheiro a %s, o usuario non soporta a transferencia "
-"de ficheiros"
+"Non se puido enviar o ficheiro a %s, o usuario non admite a transferencia de "
+"ficheiros"
 
 msgid "File Send Failed"
 msgstr "Fallou o envío do ficheiro"
@@ -4645,9 +4712,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Seleccione o recurso de %s ao que quere enviar o ficheiro"
 
-msgid "Select a Resource"
-msgstr "Seleccione un recurso"
-
 msgid "Edit User Mood"
 msgstr "Editar o estado de ánimo de usuario"
 
@@ -4682,9 +4746,6 @@ msgstr "Accións"
 msgid "Select an action"
 msgstr "Seleccionar unha acción"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Non é posíbel obter a axenda de enderezos do MSN"
-
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
@@ -4828,7 +4889,7 @@ msgstr "Erro do servidor de base de datos"
 
 #, c-format
 msgid "Command disabled"
-msgstr "Comando desactivado"
+msgstr "Orde desactivada"
 
 #, c-format
 msgid "File operation error"
@@ -4920,13 +4981,12 @@ msgstr "Non se aceptan novos usuarios"
 
 #, c-format
 msgid "Kids Passport without parental consent"
-msgstr "Pasaporte de menores sen consentimento paterno"
+msgstr "Pasaporte de menores sen consentemento paterno"
 
 #, c-format
 msgid "Passport account not yet verified"
 msgstr "Conta de pasaporte aínda non verificada"
 
-#, c-format
 msgid "Passport account suspended"
 msgstr "Conta de pasaporte suspendida"
 
@@ -4948,6 +5008,30 @@ msgstr "Outros contactos"
 msgid "Non-IM Contacts"
 msgstr "Contactos non MI"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s envía unha chiscadela. <a href='msn-wink://%s'>Prema aquí para "
+"reproducila</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s enviou unha chiscadel mais pode que non se garde"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s enviou un clip de voz. <a href='audio://%s'>Prema aquí para reproducilo</"
+"a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s enviou clip de voz mais pode que non se garde"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s enviou un convite de chat de voz mais isto aínda non é posíbel."
+
 msgid "Nudge"
 msgstr "Chamar a atención"
 
@@ -5065,9 +5149,8 @@ msgstr "Álbum"
 msgid "Game Title"
 msgstr "Título do xogo"
 
-#, fuzzy
 msgid "Office Title"
-msgstr "Título"
+msgstr "Título de oficina"
 
 msgid "Set Friendly Name..."
 msgstr "Establecer o nome do contacto..."
@@ -5101,10 +5184,31 @@ msgstr "Iniciar a _conversa"
 
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"Necesítase o soporte SSL para o MSN. Instale unha biblioteca SSL soportada."
+"Necesítase a compatibilidade con SSL para o MSN. Instale unha biblioteca SSL "
+"compatíbel."
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Non se puido engadir o contacto %s porque o nome de usuario non é válido. Os "
+"nomes de usuario deben ser enderezos de correo electrónico válidos."
+
+msgid "Unable to Add"
+msgstr "Non se puido engadir"
+
+msgid "Authorization Request Message:"
+msgstr "Mensaxe de solicitude de autorización:"
+
+msgid "Please authorize me!"
+msgstr "Por favor, autoríceme!"
 
-msgid "Failed to connect to server."
-msgstr "Fallou ao conectar ao servidor."
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Aceptar"
 
 msgid "Error retrieving profile"
 msgstr "Erro ao obter o perfil"
@@ -5295,63 +5399,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticación do Windows Live ID: resposta non válida"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s non é un grupo válido."
-
-msgid "Unknown error."
-msgstr "Erro descoñecido."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s en %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s acáballe de dar un cobadazo!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Erro descoñecido (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Erro descoñecido (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Non é posíbel engadir o usuario"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Os seguintes usuarios faltan da súa axenda de enderezos"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Non é posíbel engadir o usuario a %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Non é posíbel bloquear o usuario en %s (%s)"
-
+#. Unknown error!
 #, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Non é posíbel permitir o usuario en %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Non se puido engadir a %s porque a súa lista de contactos está chea."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s non é un nome válido de conta passport."
+msgid "Unknown error (%d)"
+msgstr "Erro descoñecido (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Servizo non dispoñíbel temporalmente."
+msgid "The following users are missing from your addressbook"
+msgstr "Os seguintes usuarios faltan da súa axenda de enderezos"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Non se puido enviar a mensaxe porque era demasiado longa."
 
-msgid "Unable to rename group"
-msgstr "Non é posíbel renomear o grupo"
-
-msgid "Unable to delete group"
-msgstr "Non é posíbel eliminar o grupo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5375,9 +5443,9 @@ msgstr[0] ""
 "Despois de que rematen as tarefas de mantemento poderá conectarse con éxito "
 "de novo."
 msgstr[1] ""
-"O servidor de MSN desconectarase para as tarefas de mantemento en %d minuto. "
-"Desconectaráselle automaticamente nese momento. Remate calquera conversa "
-"activa.\n"
+"O servidor de MSN desconectarase para as tarefas de mantemento en %d "
+"minutos. Desconectaráselle automaticamente nese momento. Remate calquera "
+"conversa activa.\n"
 "\n"
 "Despois de que rematen as tarefas de mantemento poderá conectarse con éxito "
 "de novo."
@@ -5400,9 +5468,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Non se enviou a mensaxe porque se produciu un erro descoñecido."
 
-msgid "Unable to connect"
-msgstr "Non é posíbel conectar"
-
 msgid "Writing error"
 msgstr "Erro de escritura"
 
@@ -5417,22 +5482,22 @@ msgstr ""
 "Erro de conexión do servidor %s :\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "O servidor non soporta o noso protocolo."
+msgid "Our protocol is not supported by the server"
+msgstr "O servidor non é compatíbel co noso protocolo"
 
-msgid "Error parsing HTTP."
-msgstr "Erro na análise HTTP."
+msgid "Error parsing HTTP"
+msgstr "Erro no procesamento de HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Conectouse desde outra localización."
+msgid "You have signed on from another location"
+msgstr "Conectouse desde outra localización"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Os servidores MSN non están dispoñíbeis temporalmente. Agarde e volva "
 "tentalo máis tarde."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "Os servidores MSN van sufrir un apagado temporal."
+msgid "The MSN servers are going down temporarily"
+msgstr "Os servidores MSN van sufrir un apagado temporal"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5462,6 +5527,14 @@ msgstr "Enviando unha cookie"
 msgid "Retrieving buddy list"
 msgstr "Recuperando a lista de contactos"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s enviou unconvite de cámara web mais aínda isto aínda non é posíbel."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s enviou unconvite de cámara web, mais aínda non está dispoñíbel."
+
 msgid "Away From Computer"
 msgstr "Ausente do computador"
 
@@ -5506,14 +5579,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro descoñecido:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "O usuario %s engadiuno á súa lista de contactos."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "O usuario %s eliminouno da súa lista de contactos."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Eliminar o contacto da súa axenda de enderezos?"
 
@@ -5543,6 +5608,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s non é un grupo válido."
+
+msgid "Unknown error."
+msgstr "Erro descoñecido."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s en %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Non é posíbel engadir o usuario a %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Non é posíbel bloquear o usuario en %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Non é posíbel permitir o usuario en %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Non se puido engadir a %s porque a súa lista de contactos está chea."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s non é un nome válido de conta passport."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Servizo non dispoñíbel temporalmente."
+
+msgid "Unable to rename group"
+msgstr "Non é posíbel renomear o grupo"
+
+msgid "Unable to delete group"
+msgstr "Non é posíbel eliminar o grupo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "O usuario %s engadiuno á súa lista de contactos."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "O usuario %s eliminouno da súa lista de contactos."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Non existe ese usuario: %s"
 
@@ -5571,6 +5684,8 @@ msgid "Lost connection with server"
 msgstr "Perdeuse a conexión co servidor"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Novas mensaxes de correo"
 
@@ -5603,33 +5718,28 @@ msgstr[0] ""
 "Engadiuse ou actualizouse %d contacto desde o servidor (incluídos os "
 "contactos que xa estaban na lista do lado do servidor)"
 msgstr[1] ""
-"Engadiuse ou actualizouse %d contacto desde o servidor (incluídos os "
+"Engadíronse ou actualizáronse %d contactos desde o servidor (incluídos os "
 "contactos que xa estaban na lista do lado do servidor)"
 
 msgid "Add contacts from server"
 msgstr "Engadir contactos desde o servidor"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Conectado"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Erro de protocolo, código %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s O seu contrasinal ten %d caracteres, maior do que a lonxitude máxima de %"
-"d para o MySpaceIM. Faga a súa conta máis curta en http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword e ténteo de "
-"novo."
+"%s O seu contrasinal ten %zu caracteres, maior do que a lonxitude máxima de %"
+"d.Acúrte o seu contrasinal en http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings.changePassword e ténteo de novo."
+
+msgid "Incorrect username or password"
+msgstr "O nome de conta ou contrasinal non é correcto"
 
 msgid "MySpaceIM Error"
 msgstr "Erro do MySpaceIM"
@@ -5637,33 +5747,23 @@ msgstr "Erro do MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Condición de entrada non válida"
 
-msgid "Read buffer full (2)"
-msgstr "O búfer de lectura está cheo (2)"
-
-msgid "Unparseable message"
-msgstr "A mensaxe non é analizábel"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Non se puido conectar ao servidor: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Fallou ao engadir un contacto"
 
 msgid "'addbuddy' command failed."
-msgstr "O comando 'addbuddy' fallou."
+msgstr "A orde 'addbuddy' fallou."
 
 msgid "persist command failed"
-msgstr "O comando 'persist' fallou"
+msgstr "A orde 'persist' fallou"
 
 msgid "Failed to remove buddy"
 msgstr "Fallou ao eliminar o contacto"
 
 msgid "'delbuddy' command failed"
-msgstr "O comando 'delbuddy' fallou."
+msgstr "A orde 'delbuddy' fallou"
 
 msgid "blocklist command failed"
-msgstr "O comando 'blocklist' fallou"
+msgstr "A orde 'blocklist' fallou"
 
 msgid "Missing Cipher"
 msgstr "Falta o cifrado"
@@ -5675,8 +5775,8 @@ msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
-" Actualice a unha versión do libpurple con soporte de RC4 (>= 2.0.1). Non se "
-"cargará o complemento MySpaceIM."
+" Actualice a unha versión do libpurple con compatibilidade de RC4 (>= "
+"2.0.1). Non se cargará o complemento MySpaceIM."
 
 msgid "Add friends from MySpace.com"
 msgstr "Engadir amigos desde MySpace.com"
@@ -5731,6 +5831,15 @@ msgstr "Total de amigos"
 msgid "Client Version"
 msgstr "Versión do cliente"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Produciuse un erro mentres se estabelecía o nome de usuario/a. Probe outra "
+"vez, ou visite http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username para estabelecer o seu nome de usuario/a."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - O nome de usuario está dispoñíbel"
 
@@ -5845,7 +5954,7 @@ msgstr "%s beliscouno!"
 
 #, c-format
 msgid "Goosing %s..."
-msgstr "Beliscando a %s"
+msgstr "Beliscando %s..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
@@ -5915,7 +6024,7 @@ msgid "A folder with that name already exists"
 msgstr "Xa existe un cartafol con ese nome"
 
 msgid "Not supported"
-msgstr "Non soportado"
+msgstr "Non compatíbel"
 
 msgid "Password has expired"
 msgstr "O contrasinal expirou"
@@ -5947,9 +6056,6 @@ msgstr "Non se pode engadir a si mesmo"
 msgid "Master archive is misconfigured"
 msgstr "O arquivo mestre non está ben configurado"
 
-msgid "Incorrect username or password"
-msgstr "O nome de conta ou contrasinal non é correcto"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Non se recoñeceu o host do nome de usuario que introduciu"
 
@@ -5993,8 +6099,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Erro descoñecido: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Fallou o inicio de sesión (%s)."
+msgid "Unable to login: %s"
+msgstr "Non é posíbel abrir sesión: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6101,9 +6207,6 @@ msgstr "Conferencia GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-msgid "Unable to connect to server."
-msgstr "Non se puido conectar ao servidor."
-
 msgid "Waiting for response..."
 msgstr "Agardando unha resposta..."
 
@@ -6127,9 +6230,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Desexa unirse á conversa?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Foi desconectado porque se conectou desde outra estación de traballo."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6138,16 +6238,12 @@ msgstr ""
 "enviar."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
-"Non se puido contactar co servidor. Indique o enderezo do servidor co que "
+"Non se puido conectar co servidor. Indique o enderezo do servidor co que "
 "desexa conectar."
 
-msgid "Error. SSL support is not installed."
-msgstr "Erro. O soporte SSL non está instalado."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Pechouse esta conferencia. Non se poden enviar máis mensaxes."
 
@@ -6170,25 +6266,32 @@ msgstr "Enderezo do servidor"
 msgid "Server port"
 msgstr "Porto do servidor"
 
+msgid "Received unexpected response from "
+msgstr "Recibiuse unha resposta inesperada de "
+
+#. username connecting too frequently
+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 ""
+"Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
+"de novo. Se segue a intentalo vai precisar agardar cada vez máis tempo."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Erro ao consultar"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL non lle permite usar o nome de pantalla para autenticarse aquí"
+
 msgid "Could not join chat room"
 msgstr "Non se puido unir á sala de conversa"
 
 msgid "Invalid chat room name"
 msgstr "Nome de sala de conversa non válido"
 
-msgid "Server closed the connection."
-msgstr "O servidor pechou a conexión."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Perdeuse a conexión co servidor:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Recibíronse datos non válidos na conexión co servidor."
+msgid "Received invalid data on connection with server"
+msgstr "Recibíronse datos incorrectos na conexión co servidor"
 
 #. *< type
 #. *< ui_requirement
@@ -6235,7 +6338,7 @@ msgstr "Perdeuse a conexión co usuario remoto:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Recibíronse datos non válidos na conexión co usuario remoto."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Non se puido establecer unha conexión co usuario remoto."
 
 msgid "Direct IM established"
@@ -6276,10 +6379,10 @@ msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
 msgid "Not supported by host"
-msgstr "Non soportado polo host"
+msgstr "Non compatíbel co host"
 
 msgid "Not supported by client"
-msgstr "Non soportado polo cliente"
+msgstr "Non compatíbel co cliente"
 
 msgid "Refused by client"
 msgstr "Rexeitado polo cliente"
@@ -6334,7 +6437,7 @@ msgid ""
 msgstr ""
 "(Houbo un erro ao recibir a mensaxe. O contacto co que está falando está a "
 "empregar unha codificación diferente da esperada. Se sabe cal está "
-"empregando pode especificalo nas opcións avanzadas de conta para AIM/ICQ)."
+"empregando pode especificalo nas opcións avanzadas de conta para AIM/ICQ)"
 
 #, c-format
 msgid ""
@@ -6342,8 +6445,8 @@ msgid ""
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
 "(Produciuse un erro ao recibir esta mensaxe. Pode deberse a que vostede e "
-"mais %s teñen seleccionadaunha codificación diferente ou que %s ten un "
-"cliente con erros)."
+"mais %s teñen seleccionada unha codificación diferente ou que %s ten un "
+"cliente con erros)"
 
 #. Label
 msgid "Buddy Icon"
@@ -6380,7 +6483,7 @@ msgid "Nihilist"
 msgstr "Nihilista"
 
 msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
+msgstr "Reenvío de servidor ICQ"
 
 msgid "Old ICQ UTF8"
 msgstr "Antigo ICQ UTF8"
@@ -6412,23 +6515,18 @@ msgstr "Cámara"
 msgid "Screen Sharing"
 msgstr "Pantalla compartida"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Dispoñíbel para conversar"
 
-#, c-format
 msgid "Not Available"
 msgstr "Non dispoñíbel"
 
-#, c-format
 msgid "Occupied"
 msgstr "Ocupado"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Visibilidade na Web"
 
-#, c-format
 msgid "Invisible"
 msgstr "Invisíbel"
 
@@ -6442,20 +6540,12 @@ msgid "Buddy Comment"
 msgstr "Comentario de contacto"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Non se puido conectar ao servidor de autenticación:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Non se puido conectar ao servidor de autenticación: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Non se puido conectar ao servidor BOS:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Non se puido conectar co servidor: %s"
 
 msgid "Username sent"
 msgstr "Enviouse o nome de usuario"
@@ -6469,53 +6559,58 @@ msgstr "Rematando a conexión"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Non se puido iniciar a sesión: Non se iniciou a sesión como %s porque o nome "
-"de usuario non é válido.  Os nomes de usuario teñen que ser unha dirección "
-"de correo electrónico válida ou comezar cunha letra e conter só letras, "
-"números e espazos, ou conter só números."
+"Non se puido acceder como %s porque o nome de usuario non é válido. Os nomes "
+"de usuario teñen que ser unha dirección de correo electrónico válida ou "
+"comezar cunha letra e conter só letras, números e espazos, ou conter só "
+"números."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Nome de usuario non válido."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Talvez sexa desconectado en breve. Comprobe %s para actualizacións."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Non se puido obter un hash de inicio de sesión AIM válido."
+
+msgid "Unable to get a valid login hash."
+msgstr "Non se puido obter un hash de inicio de sesión válido."
+
+msgid "Received authorization"
+msgstr "Recibiuse a autorización"
 
-msgid "Incorrect password."
-msgstr "Contrasinal incorrecto."
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "O nome de usuario non existe"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "A conta está actualmente deshabilitada."
+msgid "Your account is currently suspended"
+msgstr "A súa conta está actualmente deshabilitada"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "O servizo de mensaxería instantánea AOL non está dispoñíbel temporalmente."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
-"de novo. Se segue a intentalo pode que precise agardar aínda máis tempo."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "A versión do cliente que usa é demasiado antiga. Actualízea en %s"
 
-msgid "Could Not Connect"
-msgstr "Non se puido conectar"
-
-msgid "Received authorization"
-msgstr "Recibiuse a autorización"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
+"de novo. Se segue a intentalo precisará agardar cada vez máis tempo."
 
-msgid "The SecurID key entered is invalid."
-msgstr "A chave SecurID que se introduciu non é válida."
+msgid "The SecurID key entered is invalid"
+msgstr "A chave SecurID que se introduciu non é válida"
 
 msgid "Enter SecurID"
 msgstr "Introduza o SecurID"
@@ -6523,30 +6618,6 @@ msgstr "Introduza o SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduza o díxito de seis números que aparece na pantalla."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_Aceptar"
-
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Talvez sexa desconectado en breve. Pode querer usar TOC até que se resolva "
-"isto. Comprobe %s para as actualizacións."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Non se puido obter un hash de inicio de sesión AIM válido."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Talvez sexa desconectado en breve. Comprobe %s para actualizacións."
-
-msgid "Unable to get a valid login hash."
-msgstr "Non se puido obter un hash de inicio de sesión válido."
-
 msgid "Password sent"
 msgstr "Contrasinal enviado"
 
@@ -6556,12 +6627,6 @@ msgstr "Non é posíbel comezar a conexión"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autoríceme para que poida engadilo á miña lista de contactos."
 
-msgid "Authorization Request Message:"
-msgstr "Mensaxe de solicitude de autorización:"
-
-msgid "Please authorize me!"
-msgstr "Por favor, autoríceme!"
-
 msgid "No reason given."
 msgstr "Non se indicou unha razón."
 
@@ -6641,21 +6706,21 @@ msgstr "_Rexeitar"
 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] "Perdeuse %hu mensaxe de %s porque non era válida."
-msgstr[1] "Perdeuse %hu mensaxe de %s porque non era válida."
+msgstr[1] "Perdéronse %hu mensaxes de %s porque non eran válidas."
 
 #, 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] "Perdeuse %hu mensaxe de %s porque era demasiado longa."
-msgstr[1] "Perdeuse %hu mensaxe de %s porque era demasiado longa."
+msgstr[1] "Perdéronse %hu mensaxes de %s porque eran demasiado longas."
 
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "Perdeu %hu mensaxe de %s porque se excedeu o límite de taxa."
-msgstr[1] "Perdeu %hu mensaxe de %s porque se excedeu o límite de taxa."
+msgstr[0] "Perdeuse %hu mensaxe de %s porque se excedeu o límite de taxa."
+msgstr[1] "Perdéronse %hu mensaxes de %s porque se excedeu o límite de taxa."
 
 #, c-format
 msgid ""
@@ -6663,26 +6728,28 @@ msgid ""
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] ""
-"Perdeuse %hu mensaxe de %s porque o seu nivel de aviso é demasiado alto."
+"Perdeuse %hu mensaxe de %s porque ten un nivel de aviso demasiado alto."
 msgstr[1] ""
-"Perdeuse %hu mensaxe de %s porque o seu nivel de aviso é demasiado alto."
+"Perdéronse %hu mensaxes de %s porque teñen un nivel de aviso demasiado alto."
 
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
 msgstr[0] ""
-"Perdeuse %hu mensaxe de %s porque o seu nivel de aviso é demasiado alto."
+"Perdeuse %hu mensaxe de %s porque vostede ten un nivel de aviso demasiado "
+"alto."
 msgstr[1] ""
-"Perdeuse %hu mensaxe de %s porque o seu nivel de aviso é demasiado alto."
+"Perdéronse %hu mensaxes de %s porque vostede ten un nivel de aviso demasiado "
+"alto."
 
 #, 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] "Perdeuse %hu mensaxe de %s por motivos descoñecidos."
-msgstr[1] "Perdeuse %hu mensaxe de %s por motivos descoñecidos."
+msgstr[1] "Perdéronse %hu mensaxes de %s por motivos descoñecidos."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Non se puido enviar a mensaxe: %s"
@@ -6704,6 +6771,9 @@ msgstr "Conectado desde"
 msgid "Member Since"
 msgstr "Membro desde"
 
+msgid "Capabilities"
+msgstr "Capacidades"
+
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6762,7 +6832,7 @@ msgstr "Mensaxe emerxente"
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] "O seguinte nome de usuario está asociado a %s"
-msgstr[1] "O seguinte nome de usuario está asociado a %s"
+msgstr[1] "Os seguintes nomes de usuarios están asociados a %s"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -6864,7 +6934,7 @@ msgstr[0] ""
 "Excedeuse a lonxitude máxima de %d byte do perfil de usuario.  Eliminouse o "
 "excedente."
 msgstr[1] ""
-"Excedeuse a lonxitude máxima de %d byte do perfil de usuario.  Eliminouse o "
+"Excedeuse a lonxitude máxima de %d bytes do perfil de usuario.  Eliminouse o "
 "excedente."
 
 msgid "Profile too long."
@@ -6881,7 +6951,7 @@ msgstr[0] ""
 "Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse "
 "o excedente."
 msgstr[1] ""
-"Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse "
+"Excedeuse a lonxitude máxima de %d bytes da mensaxe de ausencia.  Eliminouse "
 "o excedente."
 
 msgid "Away message too long."
@@ -6889,7 +6959,7 @@ msgstr "A mensaxe de ausencia é demasiado longa."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6898,9 +6968,6 @@ msgstr ""
 "comezar cunha letra e conter só letras, números e espazos, ou só conter "
 "números."
 
-msgid "Unable to Add"
-msgstr "Non se puido engadir"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Non se puido obter a lista de contactos"
 
@@ -6917,7 +6984,7 @@ msgstr "Orfos"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Non se puido engadir o contacto %s porque hai demasiados contactos na lista "
@@ -6927,7 +6994,7 @@ msgid "(no name)"
 msgstr "(sen nome)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Non se puido engadir o contacto %s por unha razón descoñecida."
 
 #, c-format
@@ -6998,6 +7065,7 @@ msgstr "C_onectar"
 msgid "Get AIM Info"
 msgstr "Obter información de AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Editar o comentario de contacto"
 
@@ -7059,6 +7127,7 @@ msgstr "_Buscar"
 msgid "Set User Info (web)..."
 msgstr "Editar a información de usuario (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Modificar contrasinal (web)"
 
@@ -7088,6 +7157,9 @@ msgstr "Buscar un contacto polo enderezo de correo electrónico..."
 msgid "Search for Buddy by Information"
 msgstr "Localizar un contacto pola súa información"
 
+msgid "Use clientLogin"
+msgstr "Usar login de cliente"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7107,7 +7179,6 @@ msgstr "Preguntándolle a %s para nos conectar a %s: %hu para MI Directa."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Tentando conectarse a %s:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Tentando conectarse ao servidor por medio do proxy."
 
@@ -7200,7 +7271,7 @@ msgid "Other"
 msgstr "Outros"
 
 msgid "Visible"
-msgstr "Visible"
+msgstr "Visíbel"
 
 msgid "Friend Only"
 msgstr "Só amigos"
@@ -7235,13 +7306,11 @@ msgstr "Introdución persoal"
 msgid "City/Area"
 msgstr "Cidade/Área"
 
-#, fuzzy
 msgid "Publish Mobile"
-msgstr "Móbil persoal"
+msgstr "Publicar móbil"
 
-#, fuzzy
 msgid "Publish Contact"
-msgstr "Contacto público"
+msgstr "Publicar o contacto"
 
 msgid "College"
 msgstr "Escola"
@@ -7276,17 +7345,43 @@ msgstr "Modificar información"
 msgid "Update"
 msgstr "Actualizar"
 
-#, fuzzy
 msgid "Could not change buddy information."
 msgstr "Non se puido cambiar a información do contacto."
 
+msgid "Mobile"
+msgstr "Móbil"
+
+msgid "Note"
+msgstr "Nota"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Icona de contacto"
+
+msgid "Change his/her memo as you like"
+msgstr "Cambiar o recordatorio del/dela segundo o seu gusto"
+
+msgid "_Modify"
+msgstr "_Modificar"
+
+msgid "Memo Modify"
+msgstr "Modificar o recordatorio"
+
+msgid "Server says:"
+msgstr "O servidor di:"
+
+msgid "Your request was accepted."
+msgstr "A súa consulta foi aceptada."
+
+msgid "Your request was rejected."
+msgstr "A súa cosulta foi rexeitada."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u require verificación"
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "Pregunta engadir contacto"
+msgstr "Engadir pregunta de contacto"
 
 msgid "Enter answer here"
 msgstr "Introduza a resposta aquí"
@@ -7294,9 +7389,8 @@ msgstr "Introduza a resposta aquí"
 msgid "Send"
 msgstr "Enviar"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Resposta non válida."
+msgstr "A resposta non é válida."
 
 msgid "Authorization denied message:"
 msgstr "Mensaxe de autorización rexeitada:"
@@ -7308,9 +7402,8 @@ msgstr "Síntoo, non é do meu tipo."
 msgid "%u needs authorization"
 msgstr "%u necesita autorización"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "Autorizar engadir contacto"
+msgstr "Autorizar a adición do contacto"
 
 msgid "Enter request here"
 msgstr "Introducir a solicitude aquí"
@@ -7402,9 +7495,8 @@ msgstr "Acerca de min"
 msgid "Category"
 msgstr "Categoría"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr "O Qun non permite unirse a outros"
+msgstr "O Qun non permite a outros unirse"
 
 msgid "Join QQ Qun"
 msgstr "Unirse a QQ Qun"
@@ -7419,7 +7511,7 @@ msgstr "Uniuse con éxito a Qun %s (%u)"
 msgid "Successfully joined Qun"
 msgstr "Uniuse a Qun con éxito"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Qun %u denied from joining"
 msgstr "%u Qun denegada desde a unión"
 
@@ -7455,7 +7547,7 @@ msgid "You have successfully created a Qun"
 msgstr "Creou con éxito un Qun "
 
 msgid "Would you like to set up detailed information now?"
-msgstr "Quere configurar agora a información ampliada"
+msgstr "Quere configurar agora a información detallada?"
 
 msgid "Setup"
 msgstr "Configuración"
@@ -7468,13 +7560,13 @@ msgstr "%u solicitou unirse a Qun %u para %s"
 msgid "%u request to join Qun %u"
 msgstr "%u solicitou unirse a Qun %u"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Fallou ao unirse a Qun %u, xestionado por admin %u"
+msgstr "Fallou ao unirse Qun %u, xestionado polo admin %u"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr "<b>A unión a Qun %u é aprobada polo administrador %u para %s</b>"
+msgstr "<b>A unión Qun %u é aprobada polo administrador %u para %s</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
@@ -7510,7 +7602,7 @@ msgid " Zone"
 msgstr "Zona"
 
 msgid "Flag"
-msgstr "Flag"
+msgstr "Bandeira"
 
 msgid "Ver"
 msgstr "Ver"
@@ -7537,7 +7629,7 @@ msgstr "<b>Última actualización</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>Servidor</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
 msgstr "<b>Etiqueta do cliente</b>: %s<br>\n"
 
@@ -7592,6 +7684,12 @@ msgstr "<p><b>Queridos escritores de parches</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Recoñecemento</b>:<br>\n"
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Probadores escrupulosos</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "e máis, fágamo saber, por favor... grazas!)"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>E ao resto da xente que está por detrás...</i><br>\n"
 
@@ -7617,6 +7715,9 @@ msgstr "Actualizar todos os QQ Quns"
 msgid "About OpenQ"
 msgstr "Sobre OpenQ"
 
+msgid "Modify Buddy Memo"
+msgstr "Modificar o recordatorio do contact"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7654,14 +7755,16 @@ msgstr "Amosar o aviso do servidor"
 msgid "Show server news"
 msgstr "Amosar as noticias do servidor"
 
-#, fuzzy
+msgid "Show chat room when msg comes"
+msgstr "Mostrar a sala de conversa cando chega a mensaxe"
+
 msgid "Keep alive interval (seconds)"
 msgstr "Intervalo de keep alive (segundos)"
 
 msgid "Update interval (seconds)"
 msgstr "Intervalo de actualización (segundos)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Non se pode descifrar a resposta do servidor"
 
 #, c-format
@@ -7686,9 +7789,6 @@ msgstr "Requírese activación"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Código de resposta descoñecido ao iniciar sesión en (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Non se puido descrifrar a resposta do servidor"
-
 msgid "Requesting captcha"
 msgstr "Solicitando captcha"
 
@@ -7704,9 +7804,8 @@ msgstr "Imaxe captcha"
 msgid "Enter code"
 msgstr "Introducir código"
 
-#, fuzzy
 msgid "QQ Captcha Verification"
-msgstr "Verificación de captcha QQ"
+msgstr "Verificación de CAPTCHA QQ"
 
 msgid "Enter the text from the image"
 msgstr "Introduza o texto da imaxe"
@@ -7723,30 +7822,17 @@ msgstr ""
 "Código de resposta descoñecido ao iniciar sesión en (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Non é posíbel conectar."
-
 msgid "Socket error"
 msgstr "Erro do conectador"
 
-msgid "Unable to read from socket"
-msgstr "Non é posíbel ler desde o conectador"
-
-msgid "Write Error"
-msgstr "Erro de escritura"
-
-msgid "Connection lost"
-msgstr "Conexión perdida"
-
 msgid "Getting server"
 msgstr "A obter o servidor"
 
 msgid "Requesting token"
 msgstr "Solicitando token"
 
-msgid "Couldn't resolve host"
-msgstr "Non se puido resolver o host"
+msgid "Unable to resolve hostname"
+msgstr "Non se puido conectar ao servidor"
 
 msgid "Invalid server or port"
 msgstr "O servidor ou o porto non son válidos"
@@ -7788,7 +7874,7 @@ msgstr ""
 msgid "Unknown SERVER CMD"
 msgstr "SERVER CMD descoñecido"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
@@ -7797,17 +7883,14 @@ msgstr ""
 "sala %u, resposta 0x%02X"
 
 msgid "QQ Qun Command"
-msgstr "Comando QQ Qun"
+msgstr "Orde QQ Qun"
 
-#, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Non puido descifrar a resposta do inicio de sesión"
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
 msgstr "LOGIN CMD descoñecido"
 
-#, fuzzy
 msgid "Unknown CLIENT CMD"
 msgstr "CLIENT CMD descoñecido"
 
@@ -7822,9 +7905,6 @@ msgstr "Ficheiro enviado"
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelou a transferencia de %s"
 
-msgid "Connection closed (writing)"
-msgstr "Conexión pechada (escribindo)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título do grupo:</b> %s<br>"
@@ -7879,17 +7959,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio do administrador Sametime"
 
-msgid "Connection reset"
-msgstr "Conexión reiniciada"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Erro ao ler do conectador: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Non é posíbel conectarse ao host"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anuncio de %s"
@@ -7912,6 +7981,9 @@ msgstr "Altofalantes"
 msgid "Video Camera"
 msgstr "Videocámara"
 
+msgid "File Transfer"
+msgstr "Transferencia de ficheiros"
+
 msgid "Supports"
 msgstr "Admitidos"
 
@@ -8258,7 +8330,7 @@ msgid ""
 "You can use the Get Public Key command to get the public key."
 msgstr ""
 "Non pode recibir notificacións do contacto hasta que importe a súa chave "
-"pública. Pode empregar o comando \"Obter chave pública\" para obtela."
+"pública. Pode empregar a orde \"Obter chave pública\" para obtela."
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -8531,13 +8603,13 @@ msgid "Cannot join private group"
 msgstr "Non se pode unir a un grupo privado"
 
 msgid "Call Command"
-msgstr "Chamar ao comando"
+msgstr "Chamar a orde"
 
 msgid "Cannot call command"
-msgstr "Non se pode chamar ao comando"
+msgstr "Non se pode chamar a orde"
 
 msgid "Unknown command"
-msgstr "Comando descoñecido"
+msgstr "Orde descoñecida"
 
 msgid "Secure File Transfer"
 msgstr "Transferencia segura de ficheiros"
@@ -8633,9 +8705,6 @@ msgstr "Organización"
 msgid "Unit"
 msgstr "Unidade"
 
-msgid "Note"
-msgstr "Nota"
-
 msgid "Join Chat"
 msgstr "Unirse a unha conversa"
 
@@ -8735,6 +8804,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Estatísticas de rede"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Fallou o ping"
 
@@ -8793,12 +8865,12 @@ msgid "_View..."
 msgstr "_Ver..."
 
 msgid "Unsupported public key type"
-msgstr "Tipo de chave pública non soportada"
+msgstr "Tipo de chave pública non compatíbel"
 
 msgid "Disconnected by server"
 msgstr "Desconectado polo servidor"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Produciuse un erro durante a conexión ao servidor SILC"
 
 msgid "Key Exchange failed"
@@ -8810,26 +8882,23 @@ msgstr ""
 "Produciuse un erro ao retomar a sesión desconectada. Prema Reconectar para "
 "crear unha nova conexión."
 
-msgid "Connection failed"
-msgstr "Fallo ao conectar"
-
 msgid "Performing key exchange"
 msgstr "Efectuando o intercambio de chaves"
 
-msgid "Unable to create connection"
-msgstr "Non é posíbel crear a conexión"
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Non se puido cargar o par de chaves SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Conectando co servidor SILC"
 
+msgid "Unable to not load SILC key pair"
+msgstr "Non se puido cargar o par de chaves SILC"
+
 msgid "Out of memory"
 msgstr "Sen memoria"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Non se puido inicializar o protocolo SILC"
 
 msgid "Error loading SILC key pair"
@@ -8965,7 +9034,7 @@ msgstr "Fallou ao definir os modos da canle para %s"
 
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Comando descoñecido: %s, (pode ser un erro do cliente)"
+msgstr "Orde descoñecida: %s, (pode ser un erro do cliente)"
 
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canle]:  Abandonar a conversa"
@@ -9006,7 +9075,7 @@ msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [mensaxe]:  Desconecta do servidor, cunha mensaxe opcional"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;comando&gt;:  Executar un comando calquera do cliente silc"
+msgstr "call &lt;orde&gt;:  Executar unha orde calquera do cliente silc"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;alias&gt; [-pubkey|&lt;razón&gt;]:  Matar un alias"
@@ -9128,8 +9197,8 @@ msgstr "Asinar dixitalmente e verificar todas as mensaxes"
 msgid "Creating SILC key pair..."
 msgstr "Creando o par de chaves SILC..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Non se pode crear o par de chaves SILC\n"
+msgid "Unable to create SILC key pair"
+msgstr "Non se pode crear o par de chaves SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9223,33 +9292,37 @@ msgstr "Encerado"
 msgid "No server statistics available"
 msgstr "Non hai estatísticas do servidor dispoñíbeis"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Produciuse un erro durante a conexión ao servidor SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fallo: Existe unha diferenza nas versións, actualice o seu cliente"
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Fallo: O servidor remoto non soporta/confía na súa chave pública"
+msgstr "Fallo: O servidor remoto non confía/admite a súa chave pública"
 
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "Fallo: O servidor remoto non soporta o grupo de KE proposto"
+msgstr "Fallo: O servidor remoto non admite o grupo de KE proposto"
 
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "Fallo: O servidor remoto non soporta o sistema de cifrado proposto"
+msgstr ""
+"Fallo: O servidor remoto non é compatíbel co sistema de cifrado proposto"
 
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Fallo: O servidor remoto non soporta os PKCS proposto"
+msgstr "Fallo: O servidor remoto non é compatíbel o PKCS proposto"
 
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "Fallo: O servidor remoto non soporta a función de hash proposta"
+msgstr "Fallo: O servidor remoto non é compatíbel coa función de hash proposta"
 
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Fallo: O servidor remoto non soporta o HMAC proposto"
+msgstr "Fallo: O servidor remoto non é compatíbel co HMAC proposto"
 
 #, c-format
 msgid "Failure: Incorrect signature"
@@ -9263,35 +9336,32 @@ msgstr "Fallo: Cookie non válida"
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Fallou a autenticación"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "Non se puido inicializar a conexión do cliente SILC"
 
 msgid "John Noname"
 msgstr "Nome Apelidos"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Non se puido cargar o par de chaves SILC: %s"
 
-msgid "Could not write"
-msgstr "Non se puido escribir"
-
-msgid "Could not connect"
-msgstr "Non se puido conectar"
-
-msgid "Unknown server response."
-msgstr "Resposta do servidor descoñecida."
+msgid "Unable to create connection"
+msgstr "Non é posíbel crear a conexión"
 
-msgid "Could not create listen socket"
-msgstr "Non se puido crear o conectador para escoitar"
+msgid "Unknown server response"
+msgstr "Resposta do servidor descoñecida"
 
-msgid "Could not resolve hostname"
-msgstr "Non se puido resolver o nome do host"
+msgid "Unable to create listen socket"
+msgstr "Non é posíbel crear conectador de escoita"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 "Os nomes de usuario SIP non poden conter espazos en branco nin o símbolo @"
 
+msgid "SIP connect server not specified"
+msgstr "A conexión SIP ao servidor non foi especificada"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9325,183 +9395,60 @@ msgstr "Usuario de autenticación"
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Buscando %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Fallou a conexión a %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Conectado: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Non se puido escribir o ficheiro %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Non se puido ler o ficheiro %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "A mensaxe é demasiado longa; borrouse os últimos %s bytes."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s non está conectado agora."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Non se permiten avisos de %s."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Descartouse a mensaxe; vostede está a exceder o límite de velocidade do "
-"servidor."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Non está dispoñíbel a conversa en %s."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Está a enviar mensaxes demasiado rápido a %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Perdeu unha MI de %s porque era demasiado grande."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Perdeu unha MI de %s porque se mandou demasiado rápido."
-
-#, c-format
-msgid "Failure."
-msgstr "Fallo."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Demasiados resultados."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Necesítanse máis cualificadores."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Servizo de directorio non dispoñíbel temporalmente."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Busca de enderezos de correo electrónico restrinxida."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Palabra chave ignorada."
-
-#, c-format
-msgid "No keywords."
-msgstr "Sen palabras chave."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "O usuario non ten información de directorio."
-
-#, c-format
-msgid "Country not supported."
-msgstr "País non soportado."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Fallo descoñecido: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "O nome de usuario ou contrasinal non é correcto."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "O servizo non está dispoñíbel temporalmente."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-"O seu nivel de advertencias é actualmente demasiado alto para iniciar a "
-"sesión."
-
-#, c-format
-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 ""
-"Conectouse e desconectouse con demasida frecuencia. Agarde dez minutos e "
-"inténteo de novo. Se segue intentándoo, poida que precise agardar aínda máis "
-"tempo."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Ocorreu un erro descoñecido ao conectarse: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Ocorreu un erro (%d) descoñecido. Información: %s"
-
-msgid "Invalid Groupname"
-msgstr "Nome de grupo non válido"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;sala&gt;:  Unirse a unha sala na rede Yahoo"
 
-msgid "Connection Closed"
-msgstr "Conexión pechada"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Mostrar as salas da rede Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Agardando resposta..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Solicitar ao usuario o comezo dunha sesión Doodle"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "O TOC rematou a pausa. Xa pode volver a enviar mensaxes."
+msgid "Yahoo ID..."
+msgstr "ID de Yahoo..."
 
-msgid "Password Change Successful"
-msgstr "O contrasinal modificouse con éxito"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Complemento de protocolo Yahoo"
 
-msgid "_Group:"
-msgstr "_Grupo:"
+msgid "Pager server"
+msgstr "Servidor do buscapersoas"
 
-msgid "Get Dir Info"
-msgstr "Obter a información do directorio"
+msgid "Pager port"
+msgstr "Porto do buscapersoas"
 
-msgid "Set Dir Info"
-msgstr "Establecer a información do directorio"
+msgid "File transfer server"
+msgstr "Servidor de transferencia de ficheiros"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Non se puido abrir %s para escritura!"
+msgid "File transfer port"
+msgstr "Porto de transferencia de ficheiros"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Fallou a transferencia do ficheiro; posibelmente foi cancelado polo outro "
-"extremo."
+msgid "Chat room locale"
+msgstr "Localización da sala de conversa"
 
-msgid "Could not connect for transfer."
-msgstr "Non se puido conectar para realizar a transferencia."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorar os convites a salas de conferencias ou de conversa"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-"Non se puido escribir a cabeceira do ficheiro. O ficheiro non se transferirá."
+msgid "Chat room list URL"
+msgstr "URL de lista de salas da conversa"
 
-msgid "Save As..."
-msgstr "Gardar como..."
+msgid "Yahoo Chat server"
+msgstr "Servidor de conversa de Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s solicita a %s que acepte %d ficheiro: %s (%.2f %s)%s%s"
-msgstr[1] "%s solicita a %s que acepte %d ficheiro: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Porto de conversa de Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s solicita que lles envíe un ficheiro"
+msgid "Yahoo JAPAN ID..."
+msgstr "ID de Yahoo JAPAN..."
 
 #. *< type
 #. *< ui_requirement
@@ -9513,12 +9460,11 @@ msgstr "%s solicita que lles envíe un ficheiro"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Complemento de protocolo TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Complemento de protocolo Yahoo! JAPAN"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s enviou unconvite de cámara web, mais aínda non está soportada."
+msgid "Your SMS was not delivered"
+msgstr "O seu SMS non foi entregado"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "A súa mensaxe Yahoo! non se enviou."
@@ -9544,6 +9490,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Rexeitouse engadir o contacto"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Recibíronse datos incorrectos"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Conta bloqueada: Demasiados intentos fallos. Se inicia sesión no sitio web "
+"de Yahoo! é posíbel que isto se arranxe."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Conta bloqueada: Razón descoñecida. Se inicia sesión no sitio web de Yahoo! "
+"é posíbel que isto se arranxe."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "O nome de conta ou contrasinal non se encontran"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9569,7 +9539,7 @@ msgid "Ignore buddy?"
 msgstr "Quere ignorar o contacto?"
 
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "A súa conta está bloqueada. Inicie unha sesión no sitio web de Yahoo!."
+msgstr "A súa conta está bloqueada. Inicie unha sesión no sitio web de Yahoo!"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -9578,39 +9548,28 @@ msgstr ""
 "posíbel que isto se arranxe."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Non se puido engadir o contacto %s ao grupo %s á lista no servidor para a "
+"Non se puido engadir o contacto %s ao grupo %s para a lista de servidor na "
 "conta %s."
 
-msgid "Could not add buddy to server list"
-msgstr "Non se puido engadir o contacto á lista do servidor"
+msgid "Unable to add buddy to server list"
+msgstr "Non se puido engadir o contacto na lista do servidor"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audíbel %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Recibiuse unha resposta HTTP inesperada do servidor."
-
-msgid "Connection problem"
-msgstr "Problema de conexión"
+msgid "Received unexpected HTTP response from server"
+msgstr "Recibiuse unha resposta HTTP inesperada do servidor"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Perdeuse a conexión con %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Perdeuse a conexión con %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Non se puido establecer unha conexión con %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Non se puido establecer unha conexión con %s: %s"
 
 msgid "Not at Home"
 msgstr "Fóra da casa"
@@ -9657,8 +9616,8 @@ msgstr "Configuración da presenza"
 msgid "Start Doodling"
 msgstr "Comezar o Doodle"
 
-msgid "Activate which ID?"
-msgstr "Que ID quere activar?"
+msgid "Select the ID you want to activate"
+msgstr "Seleccionar o ID que queres activar"
 
 msgid "Join whom in chat?"
 msgstr "A quen quere unir á conversa?"
@@ -9672,73 +9631,15 @@ msgstr "Unir un usuario á conversa..."
 msgid "Open Inbox"
 msgstr "Abrir a caixa de entrada"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;sala&gt;:  Unirse a unha sala na rede Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Mostrar as salas da rede Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Solicitar ao usuario o comezo dunha sesión Doodle"
-
-msgid "Yahoo ID..."
-msgstr "ID de Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Complemento de protocolo Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Xapón"
-
-msgid "Pager server"
-msgstr "Servidor do buscapersoas"
-
-msgid "Japan Pager server"
-msgstr "Servidor de buscapersoas xaponés"
-
-msgid "Pager port"
-msgstr "Porto do buscapersoas"
-
-msgid "File transfer server"
-msgstr "Servidor de transferencia de ficheiros"
-
-msgid "Japan file transfer server"
-msgstr "Servidor de transferencia de ficheiros xaponés"
-
-msgid "File transfer port"
-msgstr "Porto de transferencia de ficheiros"
-
-msgid "Chat room locale"
-msgstr "Localización da sala de conversa"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorar os convites a salas de conferencias ou de conversa"
-
-msgid "Chat room list URL"
-msgstr "URL de lista de salas da conversa"
-
-msgid "Yahoo Chat server"
-msgstr "Servidor de conversa de Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Porto de conversa de Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Enviar unha petición Doodle."
 
+msgid "Unable to connect."
+msgstr "Non é posíbel conectar."
+
 msgid "Unable to establish file descriptor."
 msgstr "Non se puido establecer o descritor de ficheiro."
 
@@ -9746,6 +9647,9 @@ msgstr "Non se puido establecer o descritor de ficheiro."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s está tentándolle enviar un grupo de %d ficheiros.\n"
 
+msgid "Write Error"
+msgstr "Erro de escritura"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! xaponés"
 
@@ -9861,22 +9765,17 @@ msgstr "Voces"
 msgid "Webcams"
 msgstr "Cámaras web"
 
+msgid "Connection problem"
+msgstr "Problema de conexión"
+
 msgid "Unable to fetch room list."
 msgstr "Non se puido obter a lista de salas."
 
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Produciuse un problema ao conectarse co servidor YCHT."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Perdeuse a conexión co servidor\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Produciuse un problema ao conectarse co servidor YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9991,7 +9890,7 @@ msgid "Use tzc"
 msgstr "Usar tzc"
 
 msgid "tzc command"
-msgstr "Comando tzc"
+msgstr "Orde tzc"
 
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
@@ -10012,33 +9911,21 @@ msgid "Exposure"
 msgstr "Exposición"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Non se puido crear un conectador:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Non é posíbel analizar a resposta desde o proxy HTTP: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Non é posíbel analizar a resposta desde o proxy HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erro de conexión no proxy HTTP %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr ""
-"Acceso denegado: o servidor de proxy HTTP prohibe o túnel polo porto %d."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "Acceso denegado: o servidor proxy HTTP prohibe o túnel polo porto %d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Erro ao resolver %s"
 
-msgid "Could not resolve host name"
-msgstr "Non se puido resolver o nome do host"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Solicitando a atención de %s..."
@@ -10125,9 +10012,6 @@ msgstr "Non molestar"
 msgid "Extended away"
 msgstr "Ausencia ampliada"
 
-msgid "Mobile"
-msgstr "Móbil"
-
 msgid "Listening to music"
 msgstr "Escoitando música"
 
@@ -10169,18 +10053,6 @@ msgstr "+++ %s agora está activo"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Erro ao ler %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Encontrouse un erro ao ler o seu %s. Non se cargaron e o ficheiro antigo "
-"renomeouse como %s~."
-
 msgid "Calculating..."
 msgstr "Calculando..."
 
@@ -10191,37 +10063,37 @@ msgstr "Descoñecido."
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
-msgstr[1] "%d segundo"
+msgstr[1] "%d segundos"
 
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
-msgstr[1] "%d día"
+msgstr[1] "%d días"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
-msgstr[1] "%s, %d hora"
+msgstr[1] "%s, %d horas"
 
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
-msgstr[1] "%d hora"
+msgstr[1] "%d horas"
 
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
-msgstr[1] "%s, %d minuto"
+msgstr[1] "%s, %d minutos"
 
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
-msgstr[1] "%d minuto"
+msgstr[1] "%d minutos"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -10288,6 +10160,18 @@ msgstr "Conexión rexeitada."
 msgid "Address already in use."
 msgstr "O enderezo xa está en uso."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Erro ao ler %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Encontrouse un erro lendo o seu %s. Non se cargou o ficheiro e o antigo "
+"renomeouse como %s~."
+
 msgid "Internet Messenger"
 msgstr "Mensaxería na Internet"
 
@@ -10330,10 +10214,8 @@ msgstr "Noti_ficacións de correo novo"
 msgid "Use this buddy _icon for this account:"
 msgstr "Usar esta icona de contacto para esta conta:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Opcións de %s"
+msgid "Ad_vanced"
+msgstr "_Avanzado"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar a configuración de proxy de GNOME"
@@ -10368,9 +10250,6 @@ msgstr "Se mira ben preto"
 msgid "you can see the butterflies mating"
 msgstr "pode ver as bolboretas apareándose"
 
-msgid "Proxy Options"
-msgstr "Opcións do proxy"
-
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
@@ -10398,8 +10277,8 @@ msgstr "_Básico"
 msgid "Create _this new account on the server"
 msgstr "Crear es_ta conta nova no servidor"
 
-msgid "_Advanced"
-msgstr "_Avanzado"
+msgid "P_roxy"
+msgstr "Proxy"
 
 msgid "Enabled"
 msgstr "Activado"
@@ -10434,7 +10313,7 @@ msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "Ten %d contacto chamado %s. Quere combinalos?"
-msgstr[1] "Ten %d contacto chamado %s. Quere combinalos?"
+msgstr[1] "Ten %d contactos chamados %s. Quere combinalos?"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -10449,8 +10328,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Actualice os campos necesarios."
 
-msgid "Room _List"
-msgstr "_Lista de salas"
+msgid "A_ccount"
+msgstr "Conta"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10458,8 +10337,8 @@ msgid ""
 msgstr ""
 "Introduza a información apropiada da conversa á que desexaría unirse.\n"
 
-msgid "_Account:"
-msgstr "_Conta:"
+msgid "Room _List"
+msgstr "_Lista de salas"
 
 msgid "_Block"
 msgstr "_Bloquear"
@@ -10476,6 +10355,15 @@ msgstr "Obter _información"
 msgid "I_M"
 msgstr "M_I"
 
+msgid "_Audio Call"
+msgstr "Ch_amada de audio"
+
+msgid "Audio/_Video Call"
+msgstr "Audio/_Videochamada"
+
+msgid "_Video Call"
+msgstr "_Videoconferencia"
+
 msgid "_Send File..."
 msgstr "E_nviar ficheiro..."
 
@@ -10485,9 +10373,12 @@ msgstr "Engadir _aviso de contacto..."
 msgid "View _Log"
 msgstr "Ver _rexistro"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Ocultar cando se está desconectado"
 
+msgid "Show When Offline"
+msgstr "Mostrar cando se está desconectado"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -10612,6 +10503,9 @@ msgstr "/Ferramentas/_Avisos de contacto"
 msgid "/Tools/_Certificates"
 msgstr "/Ferramentas/_Certificados"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Ferramentas/E_moticonas personalizadas"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/C_omplementos"
 
@@ -10621,9 +10515,6 @@ msgstr "/Ferramentas/Pr_eferencias"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-msgid "/Tools/Smile_y"
-msgstr "/Ferramentas/E_moticona"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferencias de _ficheiros"
 
@@ -10733,7 +10624,7 @@ msgstr "/Ferramentas/Lista de salas"
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensaxe sen ler de %s\n"
-msgstr[1] "%d mensaxe sen ler de %s\n"
+msgstr[1] "%d mensaxes sen ler de %s\n"
 
 msgid "Manually"
 msgstr "Manualmente"
@@ -10741,8 +10632,8 @@ msgstr "Manualmente"
 msgid "By status"
 msgstr "Por estado"
 
-msgid "By log size"
-msgstr "Por tamaño de rexistro"
+msgid "By recent log activity"
+msgstr "Por actividade rexistrada recente"
 
 #, c-format
 msgid "%s disconnected"
@@ -10758,6 +10649,9 @@ msgstr "Conectar de novo"
 msgid "Re-enable"
 msgstr "Activar de novo"
 
+msgid "SSL FAQs"
+msgstr "FAQ SSL"
+
 msgid "Welcome back!"
 msgstr "Benvida/o de novo!"
 
@@ -10768,7 +10662,7 @@ msgid_plural ""
 msgstr[0] ""
 "%d conta foi desactivada porque se conectou desde outra localización:"
 msgstr[1] ""
-"%d conta foi desactivada porque se conectou desde outra localización:"
+"%d contas foron desactivadas porque se conectou desde outra localización:"
 
 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuario:</b>"
@@ -10829,7 +10723,7 @@ msgid "Add buddy to _group:"
 msgstr "Engadir o contacto ao _grupo:"
 
 msgid "This protocol does not support chat rooms."
-msgstr "Este protocolo non soporta as salas de conversa."
+msgstr "Este protocolo non é compatíbel coas salas de conversa."
 
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
@@ -10848,12 +10742,14 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Grupo:"
+
 msgid "Auto_join when account becomes online."
 msgstr "_Unirse automatiamente cando unha conta se volve activa."
 
-#, fuzzy
 msgid "_Remain in chat after window is closed."
-msgstr "_Permanecer na xanela de "
+msgstr "_Permanecer no chat tras cerrar a xanela."
 
 msgid "Please enter the name of the group to be added."
 msgstr "Introduza o nome do grupo que quere engadir."
@@ -10882,12 +10778,109 @@ msgstr "/Ferramentas"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contactos/Ordenar contactos"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Cor do fondo"
+
+msgid "The background color for the buddy list"
+msgstr "A cor de fondo para a lista de contactos"
+
+msgid "Layout"
+msgstr "Disposición"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "A disposición das iconas, nome e estado da lista blist"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Cor do fondo expandida"
+
+msgid "The background color of an expanded group"
+msgstr "A cor de fondo dun grupo expandido"
+
+msgid "Expanded Text"
+msgstr "Texto _expandido"
+
+msgid "The text information for when a group is expanded"
+msgstr "A información textual para cando se expande un grupo"
+
+msgid "Collapsed Background Color"
+msgstr "Cor do fondo colapsada"
+
+msgid "The background color of a collapsed group"
+msgstr "A cor de fondo dun grupo colapsado"
+
+msgid "Collapsed Text"
+msgstr "_Contraer o texto"
+
+msgid "The text information for when a group is collapsed"
+msgstr "A inforamción textual para cando un grupo se colapsa"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Cor de fondo para Contacto/Chat"
+
+msgid "The background color of a contact or chat"
+msgstr "A cor de fondo dun contacto ou chat"
+
+msgid "Contact Text"
+msgstr "Texto do contacto"
+
+msgid "The text information for when a contact is expanded"
+msgstr "A información textual para cando un contacto se expande"
+
+msgid "On-line Text"
+msgstr "Texto para conectado"
+
+msgid "The text information for when a buddy is online"
+msgstr "A información textual para cando un contacto está en liña"
+
+msgid "Away Text"
+msgstr "Texto de despedida"
+
+msgid "The text information for when a buddy is away"
+msgstr "A información textual para cando un contacto se foi"
+
+msgid "Off-line Text"
+msgstr "Texto para Desconectado"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "A información textual para cando un contacto está desconectado"
+
+msgid "Idle Text"
+msgstr "Texto para Inactivo"
+
+msgid "The text information for when a buddy is idle"
+msgstr "A información textual para cando un contacto está inactivo"
+
+msgid "Message Text"
+msgstr "Texto de mensaxe"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "A información textual para cando un contacto ten unha mensaxe sen ler"
+
+msgid "Message (Nick Said) Text"
+msgstr "Texto da mensaxe (Alcume referido)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"A información textual para cando un chat ten unha mensaxe sen ler que "
+"menciona o seu alcume"
+
+msgid "The text information for a buddy's status"
+msgstr "Información textual para o estado do contacto"
+
+msgid "Type the host name for this certificate."
+msgstr "Escriba o nome do host deste certificado."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidores SSL"
 
 msgid "Unknown command."
-msgstr "Comando descoñecido."
+msgstr "Orde descoñecida."
 
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese contacto non utiliza o mesmo protocolo que esta conversa."
@@ -10900,14 +10893,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar a un contacto á sala de conversa"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Introduza o nome do usuario que desexa convidar, xunto cunha mensaxe de "
-"convite opcional."
-
 msgid "_Buddy:"
 msgstr "_Contacto:"
 
@@ -10936,8 +10921,8 @@ msgstr "Ignorar"
 msgid "Get Away Message"
 msgstr "Mensaxe de ausencia"
 
-msgid "Last said"
-msgstr "Dito a última vez"
+msgid "Last Said"
+msgstr "O último que se dixo"
 
 msgid "Unable to save icon file to disk."
 msgstr "Non se puido gardar o ficheiro de iconas no disco."
@@ -10982,6 +10967,18 @@ msgstr "/Conversa/_Gardar como..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpar _historial"
 
+msgid "/Conversation/M_edia"
+msgstr "/Conversa/M_edia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversa/Media/Chamada de _audio"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversa/Media/_Videochamada"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversa/Media/Audio\\/Video _Chamada"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar ficheiro..."
 
@@ -11054,6 +11051,15 @@ msgstr "/Conversa"
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver o rexistro"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversa/Media/Audiochamada"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversation/Media/Videochamada"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversation/Media/Audio\\/Videochamada"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar o ficheiro..."
 
@@ -11125,7 +11131,7 @@ msgstr "0 persoas na sala"
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoa na sala"
-msgstr[1] "%d persoa na sala"
+msgstr[1] "%d persoas na sala"
 
 msgid "Typing"
 msgstr "Escribindo"
@@ -11226,7 +11232,6 @@ msgstr "Erro "
 msgid "Fatal Error"
 msgstr "Erro moi grave"
 
-#, fuzzy
 msgid "bug master"
 msgstr "bug master"
 
@@ -11237,12 +11242,14 @@ msgstr "artista"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "voz e vídeo"
+
 msgid "support"
-msgstr "soporte"
+msgstr "compatibilide"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "webmaster"
+msgstr "webmáster"
 
 msgid "Senior Contributor/QA"
 msgstr "Contribuínte sénior/QA"
@@ -11261,7 +11268,7 @@ msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e deseñador de controladores [vagabundo preguizoso]"
 
 msgid "support/QA"
-msgstr "soporte/QA"
+msgstr "compatibilidade/QA"
 
 msgid "XMPP"
 msgstr "XMPP"
@@ -11362,6 +11369,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Húngaro"
 
+msgid "Armenian"
+msgstr "Armenio"
+
 msgid "Indonesian"
 msgstr "Indonesio"
 
@@ -11377,6 +11387,9 @@ msgstr "Xeorxiano"
 msgid "Ubuntu Georgian Translators"
 msgstr "Tradutores xeorxianos de Ubuntu"
 
+msgid "Khmer"
+msgstr "Khemer"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11398,6 +11411,9 @@ msgstr "Lituano"
 msgid "Macedonian"
 msgstr "Macedonio"
 
+msgid "Mongolian"
+msgstr "Macedonio"
+
 msgid "Bokmål Norwegian"
 msgstr "Noruegués Bokmål"
 
@@ -11414,7 +11430,7 @@ msgid "Occitan"
 msgstr "Occitano"
 
 msgid "Punjabi"
-msgstr "Punjabi"
+msgstr "Punjabí"
 
 msgid "Polish"
 msgstr "Polaco"
@@ -11452,6 +11468,9 @@ msgstr "Sinhala"
 msgid "Swedish"
 msgstr "Sueco"
 
+msgid "Swahili"
+msgstr "Suahili"
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11512,7 +11531,28 @@ msgstr ""
 "tipo de garantía para este programa.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">Axuda vía correo:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin en irc.freenode.net<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin en irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11585,7 +11625,7 @@ msgstr[0] ""
 "Está a punto de eliminar o contacto que contén a %s e %d contacto máis da "
 "lista de contactos. Quere continuar?"
 msgstr[1] ""
-"Está a punto de eliminar o contacto que contén a %s e %d contacto máis da "
+"Está a punto de eliminar o contacto que contén a %s e %d contactos máis da "
 "lista de contactos. Quere continuar?"
 
 msgid "Remove Contact"
@@ -11696,8 +11736,7 @@ msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
 msgid "There is no application configured to open this type of file."
-msgstr ""
-"Non se configurou ningunha aplicación para abrir este tipo de ficheiro."
+msgstr "Non se configurou ningún aplicativo para abrir este tipo de ficheiro."
 
 msgid "An error occurred while opening the file."
 msgstr "Produciuse un erro ao abrir o ficheiro."
@@ -11765,9 +11804,9 @@ msgstr "Cor para debuxar as ligazóns."
 msgid "Hyperlink visited color"
 msgstr "Cor da ligazón visitada"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
-"A cor para debuxar as ligazóns despois de que se visiten (ou se activen)"
+"A cor para debuxar as ligazóns despois de que se visiten (ou se activen)."
 
 msgid "Hyperlink prelight color"
 msgstr "Cor de ligazón iluminada previamente"
@@ -11803,14 +11842,20 @@ msgstr "A cor para debuxar o nome dunha mensaxe de acción."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Cor do nome para a mensaxe de acción dunha mensaxe privada"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "A cor para debuxar o nome dunha mensaxe de acción."
+
 msgid "Whisper Message Name Color"
 msgstr "Cor do nome para as mensaxes privadas"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "A cor para debuxar o nome dunha mensaxe de acción."
+
 msgid "Typing notification color"
 msgstr "Eliminación da notificación de escritura"
 
-msgid "The color to use for the typing notification font"
-msgstr "A cor que se usará para o tipo de letra da notificación de escritura"
+msgid "The color to use for the typing notification"
+msgstr "A cor que se usará para a notificación de escritura"
 
 msgid "Typing notification font"
 msgstr "Cor da notificación de escritura"
@@ -11821,15 +11866,6 @@ msgstr "A cor que se usará para a notificación de escritura"
 msgid "Enable typing notification"
 msgstr "Activar a notificación de escritura"
 
-msgid "_Copy Email Address"
-msgstr "_Copiar enderezo de correo"
-
-msgid "_Open Link in Browser"
-msgstr "_Abrir ligazón no navegador"
-
-msgid "_Copy Link Location"
-msgstr "_Copiar localización da ligazón"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11871,11 +11907,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Gardar a imaxe..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "Eng_adir emoticonas personalizadas..."
 
@@ -11965,9 +11999,6 @@ msgstr "Diminuír o tamaño do tipo de letra"
 msgid "Font Face"
 msgstr "Estilo do tipo de letra"
 
-msgid "Background Color"
-msgstr "Cor do fondo"
-
 msgid "Foreground Color"
 msgstr "Cor de primeiro plano"
 
@@ -12084,6 +12115,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12098,13 +12130,15 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    use DIR para ficheiros de configuración\n"
 "  -d, --debug         imprime as mensaxes de depuración á saída estándar\n"
+"  -f, --force-online  forzar en liña, coidando o status da rede\n"
 "  -h, --help          mostra esta axuda e sae\n"
 "  -m, --multiple      non se asegurar de que hai só unha instancia\n"
 "  -n, --nologin       non iniciar a sesión de forma automática\n"
-"  -l, --login[=NOME]  iniciar a sesión de forma automática (o argumento "
-"opcional NOME especifica\n"
-"                      a(s) conta(s) que hai que empregar separadas por "
-"comas.\n"
+"  -l, --login[=NOME]  activar a conta(s) específica(s) (o argumento "
+"opcional\n"
+"                         NOME especifica a(s) contas que hai que empregar "
+"separadas por comas.\n"
+"  --display=DISPLAY   X mostra para usa\n"
 "                      Sen isto só se activará a primeira conta).\n"
 "  -v, --version       mostra a versión actual e sae\n"
 
@@ -12115,6 +12149,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12128,6 +12163,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    use DIR para ficheiros de configuración\n"
 "  -d, --debug         imprime as mensaxes de depuración á saída estándar\n"
+"  -f, --force-online  forzar en liña, coidando o status da rede\n"
 "  -h, --help          mostra esta axuda e sae\n"
 "  -m, --multiple      non asegurarse de que hai só unha instancia\n"
 "  -n, --nologin       non conectarse de forma automática\n"
@@ -12169,27 +12205,42 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Abrir todas as mensaxes"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "Saíndo porque xa está executándose outro cliente libpurple.\n"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"
+msgid "/_Media"
+msgstr "/_Media"
+
+msgid "/Media/_Hangup"
+msgstr "/Media/_Colgar"
+
+msgid "Calling..."
+msgstr "Chamando..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s desexa comezar unha sesión de audio/video contigo."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s desexa comezar unha sesión de video con vostede."
 
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ten %d mensaxe nova."
-msgstr[1] "%s ten %d mensaxe nova."
+msgstr[1] "%s ten %d mensaxes novas."
 
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>Ten %d correo electrónico novo.</b>"
-msgstr[1] "<b>Ten %d correo electrónico novo.</b>"
+msgstr[1] "<b>Ten %d correos electrónicos novos.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "O comando do navegador \"%s\" non é válido."
+msgstr "A orde do navegador \"%s\" non é válido."
 
 msgid "Unable to open URL"
 msgstr "Non se puido abrir o URL"
@@ -12201,8 +12252,27 @@ msgstr "Erro ao iniciar \"%s\": %s"
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
-"Elixiuse o navegador 'Manual', mais non se definiu ningún comando para "
-"executalo."
+"Elixiuse o navegador 'Manual', mais non se definiu ningunha orde para "
+"executala."
+
+msgid "No message"
+msgstr "Sen mensaxe"
+
+msgid "Open All Messages"
+msgstr "Abrir todas as mensaxes"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"
+
+msgid "New Pounces"
+msgstr "Novo aviso do seu contacto"
+
+msgid "Dismiss"
+msgstr "Desbotar"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Acaba de recibir un aviso!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "Desactivaranse os seguintes complementos."
@@ -12252,10 +12322,16 @@ msgstr "<b>Detalles do complemento</b>"
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
+msgid "Modify Buddy Pounce"
+msgstr "Editar o aviso do seu contacto"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "A quen avisar"
 
+msgid "_Account:"
+msgstr "_Conta:"
+
 msgid "_Buddy name:"
 msgstr "Nome do _contacto:"
 
@@ -12299,7 +12375,7 @@ msgid "Send a _message"
 msgstr "Enviar unha _mensaxe"
 
 msgid "E_xecute a command"
-msgstr "E_xecutar un comando"
+msgstr "E_xecutar unha orde"
 
 msgid "P_lay a sound"
 msgstr "Re_producir un son"
@@ -12322,8 +12398,58 @@ msgstr "_Recorrente"
 msgid "Pounce Target"
 msgstr "Sobre quen avisar"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Fallou o desempaquetado do tema de emoticonas."
+#, c-format
+msgid "Started typing"
+msgstr "Comezou a escribir"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Fixo unha pausa mentres escribía"
+
+#, c-format
+msgid "Signed on"
+msgstr "Conéctase"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Volveu da inactividade"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Volveu da ausencia"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Deixou de escribir"
+
+#, c-format
+msgid "Signed off"
+msgstr "Desconectouse"
+
+#, c-format
+msgid "Became idle"
+msgstr "Volveuse inactivo"
+
+#, c-format
+msgid "Went away"
+msgstr "Cando non estea"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Enviar unha mensaxe"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Descoñecido... Por favor informe disto!"
+
+msgid "Theme failed to unpack."
+msgstr "Fallou o desempaquetado do tema."
+
+msgid "Theme failed to load."
+msgstr "Fallou a carga do tema."
+
+msgid "Theme failed to copy."
+msgstr "Fallou a copia do tema."
 
 msgid "Install Theme"
 msgstr "Instalar tema"
@@ -12344,6 +12470,11 @@ msgstr "Atallos de teclado"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Pechar as c_onversas coa tecla Esc"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Tema da lista de contactos"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Icona da área de notificación do sistema"
 
@@ -12353,8 +12484,8 @@ msgstr "Mo_strar a icona da área de notificación do sistema:"
 msgid "On unread messages"
 msgstr "Se hai mensaxes sen ler"
 
-msgid "Conversation Window Hiding"
-msgstr "Ocultar a xanela de conversa"
+msgid "Conversation Window"
+msgstr "Xanela de conversa"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar as novas conversas de MI:"
@@ -12362,6 +12493,9 @@ msgstr "_Ocultar as novas conversas de MI:"
 msgid "When away"
 msgstr "Cando estea ausente"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zar as novas xanelas de conversa"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Separadores"
@@ -12420,9 +12554,6 @@ msgstr "Usar o desprazamento suave"
 msgid "F_lash window when IMs are received"
 msgstr "Facer escinti_lar a xanela ao recibir mensaxes de MI"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zar as novas xanelas de conversa"
-
 msgid "Minimum input area height in lines:"
 msgstr "Altura mínima da área de entrada en liñas:"
 
@@ -12446,7 +12577,7 @@ msgid ""
 "that support formatting."
 msgstr ""
 "Isto é unha mostra de como aparecerá a súa mensaxe saínte cando use "
-"protocolos que soportan o formatado."
+"protocolos que son compatíbeis co formatado."
 
 msgid "Cannot start proxy configuration program."
 msgstr "Non se pode iniciar o programa de configuración do proxy."
@@ -12454,14 +12585,12 @@ msgstr "Non se pode iniciar o programa de configuración do proxy."
 msgid "Cannot start browser configuration program."
 msgstr "Non se pode iniciar o programa de configuración do navegador."
 
-msgid "ST_UN server:"
-msgstr "Servidor ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "Detectar _automaticamente o enderezo IP"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Usar o enderezo IP detectado _automaticamente: %s"
 
 msgid "Public _IP:"
 msgstr "_IP público:"
@@ -12481,6 +12610,10 @@ msgstr "Porto _inicial:"
 msgid "_End port:"
 msgstr "Porto _final:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Servidor de reenvío (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor proxy &amp; Navegador"
 
@@ -12509,6 +12642,10 @@ msgstr "Servidor proxy"
 msgid "No proxy"
 msgstr "Sen proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr "Usar DNS remoto con proxies SOCKS4"
+
 msgid "_User:"
 msgstr "_Usuario:"
 
@@ -12667,12 +12804,12 @@ msgstr "Cando estea ausente ou inactivo"
 msgid "Auto-away"
 msgstr "Ausencia automática"
 
-msgid "Change status when _idle"
-msgstr "Cambiar o estado cando estea _inactivo"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de volverse inactivo:"
 
+msgid "Change status when _idle"
+msgstr "Cambiar o estado cando estea _inactivo"
+
 msgid "Change _status to:"
 msgstr "Cambiar o e_stado a:"
 
@@ -12823,47 +12960,43 @@ msgstr "Ga_rdar e usar"
 msgid "Status for %s"
 msgstr "Estado para %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Xa existe unha emoticona personalizada para '%s'. Use un atallo diferente."
+
 msgid "Custom Smiley"
 msgstr "Emoticona personalizada"
 
-msgid "More Data needed"
-msgstr "Precísanse máis datos"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Proporcione un atallo para asociar á emoticona."
-
 msgid "Duplicate Shortcut"
 msgstr "Atallo duplicado"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Xa existe unha emoticona personalizada para o atallo seleccionado. "
-"Especifique un atallo diferente."
-
-msgid "Please select an image for the smiley."
-msgstr "Escolla unha imaxe para a emoticona."
-
 msgid "Edit Smiley"
 msgstr "Editar emoticona"
 
 msgid "Add Smiley"
 msgstr "Engadir emoticona"
 
-msgid "Smiley _Image"
-msgstr "_Imaxe de emoticona"
+msgid "_Image:"
+msgstr "_Imaxe:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "A_tallo de emoticona"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "Te_xto de atallo:"
 
 msgid "Smiley"
 msgstr "Emoticona"
 
+msgid "Shortcut Text"
+msgstr "Texto de atallo"
+
 msgid "Custom Smiley Manager"
 msgstr "Xestor de emoticonas personalizadas"
 
+msgid "Select Buddy Icon"
+msgstr "Seleccionar icona de contacto"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Prema para cambiar a súa icona de contacto para esta conta."
 
@@ -12949,11 +13082,11 @@ msgid "Cannot send launcher"
 msgstr "Non se pode enviar o iniciador"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Arrastrou un iniciador do escritorio. O máis probábel é que queira enviar o "
-"contido ao que apunta o propio iniciador."
+"destinodeste iniciador en lugar de enviar este mesmo iniciador."
 
 #, c-format
 msgid ""
@@ -12987,9 +13120,30 @@ msgstr ""
 "Fallo ao cargar a imaxe '%s': causa descoñecida, probablemente o ficheiro "
 "está corrompido"
 
+msgid "_Open Link"
+msgstr "_Abrir ligazón"
+
+msgid "_Copy Link Location"
+msgstr "_Copiar localización da ligazón"
+
+msgid "_Copy Email Address"
+msgstr "_Copiar enderezo de correo"
+
+msgid "_Open File"
+msgstr "_Abrir ficheiro"
+
+msgid "Open _Containing Directory"
+msgstr "Abrir o cartafol que os _contén"
+
 msgid "Save File"
 msgstr "Gardar o ficheiro"
 
+msgid "_Play Sound"
+msgstr "Re_producir un son"
+
+msgid "_Save File"
+msgstr "_Gardar o ficheiro"
+
 msgid "Select color"
 msgstr "Seleccione a cor"
 
@@ -13078,6 +13232,66 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 "Mostra información estatística sobre a dispoñibilidade dos seus contactos"
 
+msgid "Server name request"
+msgstr "Consulta do nome do servidor"
+
+msgid "Enter an XMPP Server"
+msgstr "Introduza un servidor de XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Seleccione un servidor de XMPP ao que consultar"
+
+msgid "Find Services"
+msgstr "Encontrar servizos"
+
+msgid "Add to Buddy List"
+msgstr "Engadir á lista de contactos"
+
+msgid "Gateway"
+msgstr "Pasarela"
+
+msgid "Directory"
+msgstr "Directorio"
+
+msgid "PubSub Collection"
+msgstr "Selección de PubSub"
+
+msgid "PubSub Leaf"
+msgstr "Folla PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descrición:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Información de descubrimento de servizo"
+
+msgid "_Browse"
+msgstr "_Navegador"
+
+msgid "Server does not exist"
+msgstr "O usuario non existe"
+
+msgid "Server does not support service discovery"
+msgstr "O servidor non usa ningún método de autenticación coñecido"
+
+msgid "XMPP Service Discovery"
+msgstr "Información de descubrimento de servizo XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Permitir a navegación e o rexistro de servizos."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Este complemento é útil para rexistar transportes con herdanza ou outros "
+"servizos sobre XMPP."
+
 msgid "Buddy is idle"
 msgstr "O contacto está inactivo"
 
@@ -13237,7 +13451,7 @@ msgstr "Xestos co rato"
 #. *< version
 #. *  summary
 msgid "Provides support for mouse gestures"
-msgstr "Proporciona soporte para os xestos co rato"
+msgstr "Proporciona compatibilidade para os xestos co rato"
 
 #. *  description
 msgid ""
@@ -13247,8 +13461,8 @@ msgid ""
 " • Drag up and then to the left to switch to the previous conversation.\n"
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"Permite o soporte de xestos co rato nas xanelas de conversa. Arrastre co "
-"botón central do rato para realizar certas accións:\n"
+"Permite dispoñibilidade de xestos co rato nas xanelas de conversa. Arrastre "
+"co botón central do rato para realizar certas accións:\n"
 " &bull; Abaixo e despois á dereita para pechar unha conversa.\n"
 " &bull; Arriba e despois á esquerda para mudar á conversa anterior.\n"
 " &bull; Arriba e despois á dereita para mudar á seguinte conversa."
@@ -13439,7 +13653,7 @@ msgid "Music Messaging"
 msgstr "Mensaxería musical"
 
 msgid "There was a conflict in running the command:"
-msgstr "Produciuse un conflito ao executar o comando:"
+msgstr "Produciuse un conflito ao executar a orde:"
 
 msgid "Error Running Editor"
 msgstr "Erro ao executar o editor"
@@ -13471,10 +13685,10 @@ msgstr "Complemento de mensaxería musical para a composición colaborativa."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "O complemento de mensaxería musical permíte que distintos usuarios traballen "
-"de forma simultánea nunha peza de música editando unha partitura común en "
+"de forma simultánea nunha peza músical editando unha partitura común en "
 "tempo real."
 
 #. ---------- "Notify For" ----------
@@ -13584,12 +13798,6 @@ msgstr ""
 "- Transpón os textos que lle envíen\n"
 "- Envía inmediatamente unha mensaxe ás persoas da súa lista cando se conectan"
 
-msgid "Cursor Color"
-msgstr "Cor do cursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Cor secundaria do cursor"
-
 msgid "Hyperlink Color"
 msgstr "Cor da ligazón"
 
@@ -13599,6 +13807,9 @@ msgstr "Cor da ligazón visitada"
 msgid "Highlighted Message Name Color"
 msgstr "Cor do nome para a mensaxe realzada"
 
+msgid "Typing Notification Color"
+msgstr "Eliminación da notificación de escritura"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separación horizontal de GtkTreeView"
 
@@ -13628,35 +13839,21 @@ msgstr "Tipo de letra da interface GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atallo de texto GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Cores da interface"
+msgid "Disable Typing Notification Text"
+msgstr "Activar a notificación de escritura"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Configuración de temas GTK+"
 
-msgid "Widget Sizes"
-msgstr "Tamaño dos widget"
+msgid "Colors"
+msgstr "Cores"
 
 msgid "Fonts"
 msgstr "Tipos de letra"
 
+msgid "Miscellaneous"
+msgstr "Misceláneo"
+
 msgid "Gtkrc File Tools"
 msgstr "Ferramentas de ficheiros Gtkrc"
 
@@ -13742,7 +13939,7 @@ msgstr "O botón para enviar a xanela de conversa."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Engade un botón Enviar á área de entrada da xanela de conversa. Está "
 "previsto para cando non existe un teclado físico."
@@ -13800,6 +13997,95 @@ msgstr ""
 "Substitúe o texto das mensaxes saíntes segundo as regras definidas polo "
 "usuario."
 
+msgid "Just logged in"
+msgstr "Acaba de iniciar a sesión"
+
+msgid "Just logged out"
+msgstr "Acaba de rematar a sesión"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Icona do contacto/\n"
+"Icona de persoa descoñecida"
+
+msgid "Icon for Chat"
+msgstr "Icona para chat"
+
+msgid "Ignored"
+msgstr "Ignorado"
+
+msgid "Founder"
+msgstr "Fundador"
+
+msgid "Operator"
+msgstr "Operador"
+
+msgid "Half Operator"
+msgstr "Semioperador"
+
+msgid "Authorization dialog"
+msgstr "Diálogo de autorización"
+
+msgid "Error dialog"
+msgstr "Diálogo de erro "
+
+msgid "Information dialog"
+msgstr "Diálogo de información"
+
+msgid "Mail dialog"
+msgstr "Diálogo de correo"
+
+msgid "Question dialog"
+msgstr "Diálogo de solicitude"
+
+msgid "Warning dialog"
+msgstr "Diálogo de aviso"
+
+msgid "What kind of dialog is this?"
+msgstr "Que clase de diálogo é este?"
+
+msgid "Status Icons"
+msgstr "Iconas de estado"
+
+msgid "Chatroom Emblems"
+msgstr "Emblemas da sala de conversa"
+
+msgid "Dialog Icons"
+msgstr "Iconas de diálogo"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Editor de iconas de tema de Pidgin"
+
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Editor de tema lista de contactos"
+
+msgid "Edit Buddylist Theme"
+msgstr "Editar o tema da lista de contactos"
+
+msgid "Edit Icon Theme"
+msgstr "Editar tema da icona"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Editor do tema de Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Editor do tema de Pidgin."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13941,7 +14227,7 @@ msgstr ""
 "* Nota: este complemento require Win2000 ou outro máis novo."
 
 msgid "GTK+ Runtime Version"
-msgstr "GTK+ Runtime Version"
+msgstr "Versión de GTK+ Runtime"
 
 #. Autostart
 msgid "Startup"
@@ -13962,9 +14248,6 @@ msgstr "_Manter a xanela da lista de contactos en primeiro plano:"
 msgid "Only when docked"
 msgstr "Só cando está ancorado"
 
-msgid "_Flash window when chat messages are received"
-msgstr "Facer escintilar a _xanela cando se reciben mensaxes de conversas"
-
 msgid "Windows Pidgin Options"
 msgstr "Opcións do Pidgin no Windows"
 
@@ -13972,9 +14255,9 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Opcións específicas do Pidgin no Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Proporciona opcións específicas para o Pidgin no Windows, como a ancoraxe da "
+"Proporciona opcións específicas para o Pidgin en Windows, como a ancoraxe da "
 "xanela de contactos."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14013,3 +14296,6 @@ msgstr "Enviar e recibir entradas XMPP en bruto."
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento é útil para depurar servidores XMPP ou clientes."
+
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "A conexión BOSH ao servidor está malformada"
diff --git a/po/gu.po b/po/gu.po
index b7f7d106b5..b3e19c54af 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin_gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-07-03 11:31+0530\n"
 "Last-Translator: Ankit Patel <ankit644@yahoo.com>\n"
 "Language-Team: Gujarati <indianoss-gujarati@lists.sourceforge.net>\n"
@@ -36,7 +36,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -644,21 +644,6 @@ msgid "Send To"
 msgstr "આને મોકલો (_S)"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "બહાર નીકળવાનો સંદેશો"
-
-msgid "Invite"
-msgstr "આમંત્રણ આપો"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"મહેરબાની કરીને તમે જે વપરાશકર્તાને આમંત્રિત કરવા માંગો તેનું નામ, વૈકલ્પિક આમંત્રણ સંદેશા સાથે "
-"દાખલ કરો."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "વાર્તાલાપો"
 
@@ -923,6 +908,42 @@ msgid "System Log"
 msgstr "સિસ્ટમ લૉગ"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "ગણી રહ્યા છીએ..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "સ્વીકારો"
+
+#, fuzzy
+msgid "Reject"
+msgstr "પુનઃસુયોજન"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "તમે ચેનલ%s%s ને ભાગી નાંખી છે"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "ઈમેઈલ"
 
@@ -960,6 +981,9 @@ msgstr "જોડાઈ રહ્યા છીએ"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "આમંત્રણ આપો"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(નામ વિનાનું)"
@@ -1183,7 +1207,6 @@ msgstr "%s એ દૂર જતો રહ્યો છે. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s તમને %s (%s) મોકલવા માંગે છે"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "અજ્ઞાત પાઉન્સ ઘટના. મહેરબાની કરીને આનો અહેવાલ આપો!"
 
@@ -1240,7 +1263,6 @@ msgstr "સુયોજિત કરવા પહેલાંની મિનિ
 msgid "Change status to"
 msgstr "સ્થિતિને આમાં બદલો (_s):"
 
-#. Conversations
 msgid "Conversations"
 msgstr "વાર્તાલાપો"
 
@@ -1593,7 +1615,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr "જ્યારે નવો સંવાદ આ પ્લગઈન ખોલે તો તે છેલ્લો સંવાદ વર્તમાન સંવાદમાં દાખલ કરશે."
 
-#, c-format
 msgid "Online"
 msgstr "ઓનલાઈન"
 
@@ -1642,6 +1663,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "ખાતાઓ"
 
@@ -1740,14 +1783,6 @@ msgstr "શું સંવાદ આમંત્રણ સ્વીકારવ
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "સ્વીકારો"
-
-#, fuzzy
-msgid "Reject"
-msgstr "પુનઃસુયોજન"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1837,6 +1872,8 @@ msgstr "%s પ્રવેશ કરેલ છે"
 msgid "+++ %s signed off"
 msgstr "%s પ્રવેશ બહાર નીકળી ગયો"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "અજ્ઞાત ક્ષતિ"
 
@@ -1884,6 +1921,18 @@ msgstr "%s એ કક્ષ છોડી દીધો."
 msgid "%s left the room (%s)."
 msgstr "%s એ કક્ષ (%s) છોડી દીધો."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "કોન્ફરન્સ આરંભ કરો"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"મહેરબાની કરીને તમે જે વપરાશકર્તાને આમંત્રિત કરવા માંગો તેનું નામ, વૈકલ્પિક આમંત્રણ સંદેશા સાથે "
+"દાખલ કરો."
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "%s માટે cmodes સુયોજિત કરવામાં નિષ્ફળ"
@@ -2022,7 +2071,6 @@ msgstr "શું %s માંથી  %sની ફાઈલ પરિવહન �
 msgid "Transfer of file %s complete"
 msgstr "ફાઈલ %s નું પરિવહન પૂર્ણ"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "ફાઈલ પરિવહન પૂર્ણ"
 
@@ -2030,7 +2078,6 @@ msgstr "ફાઈલ પરિવહન પૂર્ણ"
 msgid "You canceled the transfer of %s"
 msgstr "તમે %s નું પરિવહન રદ કર્યું"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "ફાઈલ પરિવહન રદ થઈ ગયું"
 
@@ -2215,11 +2262,14 @@ msgstr "<font color=\"red\"><b>ફાઈલ વાંચી શક્યા ન�
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "જોડાણ બનાવવામાં ક્ષતિ"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2632,7 +2682,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2684,7 +2734,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2713,6 +2763,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "પાસવર્ડ દાખલ કરો"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2904,19 +2980,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "પ્રથમ નામ"
 
@@ -2951,6 +3026,11 @@ msgstr "Bonjour પ્રોટોકોલ પ્લગઈન"
 msgid "Purple Person"
 msgstr "નવી વ્યક્તિ"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "સ્થાનિકત્વ"
+
 msgid "Bonjour"
 msgstr "બોનજોર"
 
@@ -2962,17 +3042,17 @@ msgstr "%s એ આ વાર્તાલાપમાં આમંત્રિત
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "સંદેશો મોકલવામાં અસમર્થઃ સંદેશો ખૂબ લાંબો છે."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "સોકેટ ખોલવામાં અસમર્થ"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "સોકેટ બનાવવામાં અસમર્થ"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "સોકેટ બનાવવામાં અસમર્થ"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3024,13 +3104,16 @@ msgstr "વ્યક્તિયાદી સંગ્રહો..."
 msgid "Load buddylist from file..."
 msgstr "સર્વરમાંથી વ્યક્તિ યાદી આયાત કરો"
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "નોંધણી ક્ષેત્રોમાં ભરો."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "પાસવર્ડો બંધબેસતા નથી."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "નવું જોડાણ બનાવવામાં અસમર્થ. ક્ષતિ ઉદભવી.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3042,14 +3125,15 @@ msgstr "રજીસ્ટ્રેશન સફળતાપૂર્વક પ�
 msgid "Password"
 msgstr "પાસવર્ડ"
 
-msgid "Password (retype)"
-msgstr "પાસવર્ડ (ફરી લખો)"
+msgid "Password (again)"
+msgstr "પાસવર્ડ (ફરી)"
 
-msgid "Enter current token"
-msgstr "હાલનું ટોકન દાખલ કરો"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "હાલનું ટોકન"
+#, fuzzy
+msgid "Captcha"
+msgstr "ચિત્ર સંગ્રહો"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "નવું ગડુ-ગડુ ખાતું રજીસ્ટર કરો"
@@ -3103,6 +3187,15 @@ msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ
 msgid "Current password"
 msgstr "હાલનો પાસવર્ડ"
 
+msgid "Password (retype)"
+msgstr "પાસવર્ડ (ફરી લખો)"
+
+msgid "Enter current token"
+msgstr "હાલનું ટોકન દાખલ કરો"
+
+msgid "Current token"
+msgstr "હાલનું ટોકન"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "મહેરબાની કરી, UIN માટે તમારો વર્તમાન પાસવર્ડ અને નવો પાસવર્ડ દાખલ કરો: "
 
@@ -3116,13 +3209,13 @@ msgstr "સંવાદ માટે વ્યક્તિ પસંદ કર�
 msgid "Add to chat..."
 msgstr "સંવાદમાં ઉમેરો..."
 
+#. Global
 msgid "Available"
 msgstr "ઉપલબ્ધ"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "દૂર"
 
@@ -3153,7 +3246,8 @@ msgstr "કોઇ લૉગ મળ્યા નહિ"
 msgid "There are no users matching your search criteria."
 msgstr "મહેરબાની કરીને તમારી શોધ પરિણામ દાખલ કરો"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "સોકેટ વાંચવામાં અસમર્થ"
 
 #, fuzzy
@@ -3172,8 +3266,15 @@ msgstr "વ્યક્તિ દર્શાવો"
 msgid "Your buddy list was stored on the server."
 msgstr "Gadu-Gadu સર્વર પર કોઈ વ્યક્તિ યાદી સંગ્રહાયેલ નથી."
 
-msgid "Connection failed."
-msgstr "જોડાણ નિષ્ફળ."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#, fuzzy
+msgid "Connected"
+msgstr "સાંકળો"
+
+msgid "Connection failed"
+msgstr "જોડાણ નિષ્ફળ"
 
 msgid "Add to chat"
 msgstr "સંવાદમાં ઉમેરો"
@@ -3181,13 +3282,23 @@ msgstr "સંવાદમાં ઉમેરો"
 msgid "Chat _name:"
 msgstr "સંવાદ નામ (_n):"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "સર્વરને પીંગ કરવામાં અસમર્થ"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "જોડાઈ રહ્યા છીએ"
+
 msgid "Chat error"
 msgstr "સંવાદ ક્ષતિ"
 
 msgid "This chat name is already in use"
 msgstr "આ સંવાદ નામ પહેલાથી જ ઉપયોગમાં છે"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "સર્વર સાથે જોડાણથયેલ નથી."
 
 #, fuzzy
@@ -3232,6 +3343,10 @@ msgstr "ચકાચક લોકપ્રિય IM"
 msgid "Gadu-Gadu User"
 msgstr "ગડુ-ગડુ વપરાશકર્તા"
 
+#, fuzzy
+msgid "GG server"
+msgstr "વપરાશકર્તા જાણ સુયોજિત કરો..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "અજ્ઞાત આદેશ: %s"
@@ -3247,7 +3362,7 @@ msgid "File Transfer Failed"
 msgstr "ફાઈલ પરિવહન રદ થઈ ગયું"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin સાંભળનાર પોર્ટ ખોલી શક્યું નહિં."
 
 msgid "Error displaying MOTD"
@@ -3263,8 +3378,16 @@ msgstr "આ જોડાણ સાથે સંકળાયેલ કોઈ MOTD
 msgid "MOTD for %s"
 msgstr "%s માટે MOTD"
 
-msgid "Server has disconnected"
-msgstr "સર્વરે જોડાણ તોડી નાંખ્યું"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "સર્વર સાથે જોડાણથયેલ નથી."
 
 msgid "View MOTD"
 msgstr "MOTD જુઓ"
@@ -3275,25 +3398,24 @@ msgstr "માધ્યમ (_C):"
 msgid "_Password:"
 msgstr "પાસવર્ડ (_P):"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ખોટા નામો ખાલી જગ્યાઓ સમાવી શકે નહિં"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "જોડાઈ રહ્યા છીએ"
-
 msgid "SSL support unavailable"
 msgstr "SSL આધાર ઉપલબ્ધ નથી"
 
-msgid "Couldn't create socket"
-msgstr "સોકેટ બનાવી શક્યા નહિં"
+msgid "Unable to connect"
+msgstr "જોડાવામાં અસમર્થ"
 
-msgid "Couldn't connect to host"
-msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
 
-msgid "Read error"
-msgstr "વાંચન ક્ષતિ"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "જોડાણ બનાવવામાં ક્ષતિ"
 
 msgid "Users"
 msgstr "વપરાશકર્તાઓ"
@@ -3475,6 +3597,17 @@ msgid ""
 "invalid characters."
 msgstr "તમારું પસંદિત ખાતા નામ સર્વર દ્વારા નકારાયું હતું.  તે કદાચ અયોગ્ય અક્ષરો સમાવે છે."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "આ સંવાદ નામ પહેલાથી જ ઉપયોગમાં છે"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "લાડકું નામ"
+
 msgid "Cannot change nick"
 msgstr "નામ બદલી શકતા નથી"
 
@@ -3718,11 +3851,12 @@ msgstr "આદેશ નિષ્ક્રિય કરેલ"
 msgid "execute"
 msgstr "ઈચ્છિત નથી"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "પ્રવેશ માટે સર્વરને TLS/SSL જરૂરી છે.  કોઈ TLS/SSL આધાર મળ્યો નહિં."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "પ્રવેશ માટે સર્વરને TLS/SSL જરૂરી છે.  કોઈ TLS/SSL આધાર મળ્યો નહિં."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3739,19 +3873,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "સાદુંલખાણ સત્તાધિકરણ"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "સત્તાધિકરણ નિષ્ફળ"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
 
 msgid "Server does not use any supported authentication method"
 msgstr "સર્વર કોઈપણ આધારભૂત સત્તાધિકરણ પદ્ધતિ વાપરતું નથી"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "સર્વરમાંથી અયોગ્ય શરત"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "સંવાદ ક્ષતિ"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "કોઈ કારણ આપેલ નથી."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "બિનઆધારભૂત આવૃત્તિ"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
+
 msgid "Full Name"
 msgstr "પૂરું નામ"
 
@@ -3821,187 +3986,9 @@ msgstr "શહેર"
 msgid "Operating System"
 msgstr "ઓપરેટિંગ સિસ્ટમ છુપાવો"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "ડિરેક્ટરી જાણકારી સુયોજિત કરો"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "વિસ્તૃત સરનામું"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "ઉપનામ સંવાદ"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "વપરાશકર્તા પાસે કોઈ ડિરેક્ટરી જાણકારી નથી."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "આદેશ"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "રજીસ્ટ્રેશન ક્ષતિ"
-
-#, fuzzy
-msgid "User Location"
-msgstr "સ્થળ"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "વ્યક્તિ સ્થિતિ સૂચન"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "બિનઆધારભૂત આવૃત્તિ"
-
 #, fuzzy
-msgid "Stream Initiation"
-msgstr "દિશા"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "ફાઈલ પરિવહનો"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "વપરાશકર્તા સ્થિતિઓ"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "વપરાશકર્તા મર્યાદા"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "ક્ષમતાઓ"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "વપરાશકર્તા નામ"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "કી ફેરબદલી સાથે IM"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ઈમેઈલ સરનામું"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "રૂપરેખા સુયોજિત કરો"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "લાડકું નામ"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "જીવંત વીડિયો"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "સંદેશો મળ્યો"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "જાહેર કી બેબલપ્રિન્ટ"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "વપરાશકર્તા વિકલ્પો"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "વપરાશકર્તા સ્થિતિઓ"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "વપરાશકર્તા મર્યાદા"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "વપરાશકર્તા મર્યાદા"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ટ્રીલીયન એનક્રિપ્શન"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "ક્ષમતાઓ"
+msgid "Local Time"
+msgstr "સ્થાનિક ફાઈલ:"
 
 msgid "Priority"
 msgstr "ઉચ્ચતા"
@@ -4009,6 +3996,14 @@ msgstr "ઉચ્ચતા"
 msgid "Resource"
 msgstr "સ્રોત"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "પ્રવેશ બહાર નીકળો"
+
 msgid "Middle Name"
 msgstr "મધ્ય નામ"
 
@@ -4057,7 +4052,6 @@ msgstr "ચેટી"
 msgid "Extended Away"
 msgstr "વિસ્તૃત દૂર થયેલ"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "ખલેલ પહોંચાડશો નહિં"
 
@@ -4180,28 +4174,27 @@ msgstr "પ્રશ્ન પૂછવા માટે કોન્ફરન્
 msgid "Find Rooms"
 msgstr "કક્ષો શોધો"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "ઉપનામ:"
 
-msgid "Write error"
-msgstr "લખવામાં ક્ષતિ"
+#, fuzzy
+msgid "No users found"
+msgstr "કોઇ લૉગ મળ્યા નહિ"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "સાદું લખાણ"
+msgid "Roles:"
+msgstr "ભૂમિકા"
 
-msgid "Read Error"
-msgstr "વાંચવામાં ક્ષતિ"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "સાદું લખાણ"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "સોકેટ બનાવવામાં અસમર્થ"
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "અયોગ્ય ID"
@@ -4209,6 +4202,10 @@ msgstr "અયોગ્ય ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s નું રજીસ્ટ્રેશન સફળ"
@@ -4235,9 +4232,6 @@ msgstr "રજીસ્ટ્રેશન સફળ"
 msgid "Unregistration Failed"
 msgstr "રજીસ્ટ્રેશન નિષ્ફળ"
 
-msgid "Already Registered"
-msgstr "પહેલાથી જ નોંધણી કરાયેલ છે"
-
 msgid "State"
 msgstr "સ્થિતિ"
 
@@ -4251,6 +4245,9 @@ msgstr "ફોન"
 msgid "Date"
 msgstr "તારીખ"
 
+msgid "Already Registered"
+msgstr "પહેલાથી જ નોંધણી કરાયેલ છે"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "રજીસ્ટર"
@@ -4283,6 +4280,10 @@ msgid "Change Registration"
 msgstr "રજીસ્ટ્રેશન ક્ષતિ"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "ખાતા જાણકારી બદલવામાં ક્ષતિ"
 
@@ -4302,9 +4303,18 @@ msgstr "સત્તાધિકરણ કરી રહ્યા છીએ"
 msgid "Re-initializing Stream"
 msgstr "સ્ટ્રીમ પુનઃ-પ્રારંભ કરી રહ્યા છીએ"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "સત્તાધિકારીત નથી"
 
+msgid "Mood"
+msgstr "સ્વભાવ"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "બંને"
 
@@ -4326,12 +4336,6 @@ msgstr "કંઇ નહી"
 msgid "Subscription"
 msgstr "ઉમેદવારી"
 
-msgid "Mood"
-msgstr "સ્વભાવ"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "સ્વભાવ"
@@ -4379,9 +4383,6 @@ msgstr "તમારો પાસવર્ડ બદલાઈ ગયો છે."
 msgid "Error changing password"
 msgstr "પાસવર્ડ બદલવામાં ક્ષતિ"
 
-msgid "Password (again)"
-msgstr "પાસવર્ડ (ફરી)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "પાસવર્ડ બદલો"
@@ -4577,18 +4578,24 @@ msgstr "વપરાશકર્તા %s ને કિક મારવામા
 msgid "Unable to ping user %s"
 msgstr "વપરાશકર્તા %s ને બેન કરવામાં અસમર્થ"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "ધ્વનિ વગાડવામાં અસમર્થ કારણ કે પસંદિત ફાઈલ (%s) અસ્તિત્વમાં નથી."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "ધ્વનિ વગાડવામાં અસમર્થ કારણ કે પસંદિત ફાઈલ (%s) અસ્તિત્વમાં નથી."
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "ધ્વનિ વગાડવામાં અસમર્થ કારણ કે પસંદિત ફાઈલ (%s) અસ્તિત્વમાં નથી."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4599,9 +4606,37 @@ msgstr "જાગો!!"
 msgid "%s has buzzed you!"
 msgstr "વપરાશકર્તાએ તમને અટકાવેલ છે"
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "%s ને સંદેશો મોકલવામાં અસમર્થ."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "%s ને ફાઈલ મોકલવામાં અસમર્થ, વપરાશકર્તા ફાઈલ પરિવહનોને આધાર આપતું નથી"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "%s ને ફાઈલ મોકલવામાં અસમર્થ, વપરાશકર્તા ફાઈલ પરિવહનોને આધાર આપતું નથી"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "રજીસ્ટ્રેશન નિષ્ફળ"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
 msgstr ""
+"મહેરબાની કરીને વ્યક્તિનું સ્ક્રીન નામ અથવા બીજું નામ દાખલ કરો કે જેની જાણકારી  તમે જોવા "
+"માંગો છો."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "ફાઈલ પસંદ કરો"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "સંવાદનો પ્રારંભ કરો (_C)"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  સંવાદ કક્ષ રૂપરેખાંકિત કરો."
@@ -4622,17 +4657,18 @@ msgstr "topic [new topic]:  મુદ્દો જુઓ અથવા બદલ�
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  વપરાશકર્તાને કક્ષમાં બેન કરી દો."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: વપરાશકર્તાનું "
 "કક્ષ સાથેનું જોડાણ દર્શાવે છે."
 
 #, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: વપરાશકર્તાનું "
 "કક્ષ સાથેનું જોડાણ દર્શાવે છે."
@@ -4701,6 +4737,9 @@ msgstr "સર્વર જોડો"
 msgid "File transfer proxies"
 msgstr "ફાઈલ પરિવહન પોર્ટ"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4740,6 +4779,14 @@ msgstr "XML પદચ્છેદન ક્ષતિ"
 msgid "Unknown Error in presence"
 msgstr "હાજરીમાં અજ્ઞાત ક્ષતિ"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "સંવાદ %s માં જોડાવામાં ક્ષતિ"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "સંવાદ %s માં ક્ષતિ"
+
 msgid "Create New Room"
 msgstr "નવો કક્ષ બનાવો"
 
@@ -4758,13 +4805,32 @@ msgstr "કક્ષ રૂપરેખાંકિત કરો"
 msgid "_Accept Defaults"
 msgstr "મૂળભુતો સ્વીકારો"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "સંવાદ %s માં જોડાવામાં ક્ષતિ"
+#, fuzzy
+msgid "No reason"
+msgstr "કોઈ કારણ આપેલ નથી."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "સંવાદ %s માં ક્ષતિ"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "તમે %s દ્વારા હકાલી કાઢાયા છો: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s દ્વારા હકાલી કઢાયા (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "ફાઈલ ખોલતી વખતે ક્ષતિ ઉદ્દભવી."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "ફાઈલ પરિવહન રદ થઈ ગયું"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "ચિત્ર સંગ્રહવામાં નિષ્ફળ: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4792,10 +4858,6 @@ msgstr ""
 "માંગો છો."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "ફાઈલ પસંદ કરો"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "વપરાશકર્તા સ્થિતિઓ"
 
@@ -4835,9 +4897,20 @@ msgstr "ખાતાઓ"
 msgid "Select an action"
 msgstr "ફાઈલ પસંદ કરો"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\" ને ઉમેરવામાં અસમર્થ."
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "વ્યક્તિ યાદી મેળવવામાં અસમર્થ"
+msgid "Buddy Add error"
+msgstr "વ્યક્તિ યાદી ક્ષતિ"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "સ્પષ્ટ થયેલ સ્ક્રીન નામ અયોગ્ય છે."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5066,7 +5139,7 @@ msgstr "પિતૃની આડ વિના બાળકો પાસપો�
 msgid "Passport account not yet verified"
 msgstr "પાસપોર્ટ ખાતું હજુ ચકાસાયેલ નથી"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "પાસપોર્ટ ખાતું હજુ ચકાસાયેલ નથી"
 
@@ -5090,6 +5163,10 @@ msgstr "પ્રાધાન્યવાળો સંપર્ક"
 msgid "Non-IM Contacts"
 msgstr "સંપર્ક દૂર કરો"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5161,6 +5238,13 @@ msgstr "મોબાઈલ સંદેશો મોકલો."
 msgid "Page"
 msgstr "પાનું"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "ચેતવો"
+
 msgid "Has you"
 msgstr "તમારી પાસે"
 
@@ -5204,6 +5288,14 @@ msgid "Album"
 msgstr ""
 
 #, fuzzy
+msgid "Game Title"
+msgstr "શીર્ષક"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "શીર્ષક"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "મિત્ર નામ સુયોજિત કરો"
 
@@ -5245,9 +5337,6 @@ msgstr ""
 "SSL આધાર એ MSN માટે જરૂરી છે. મહેરબાની કરીને આધારભૂત SSL લાઈબ્રેરી સ્થાપિત કરો. વધુ "
 "જાણકારી માટે http://Pidgin.sf.net/faq-ssl.php જુઓ."
 
-msgid "Failed to connect to server."
-msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
-
 msgid "Error retrieving profile"
 msgstr "રૂપરેખા મેળવવામાં ક્ષતિ"
 
@@ -5423,8 +5512,9 @@ msgstr ""
 "Pidgin વપરાશકર્તાની રૂપરેખામાં કોઈપણ જાણકારી શોધી શક્યું નહિં. વપરાશકર્તા મોટે ભાગે "
 "અસ્તિત્વમાં નહિં હોય."
 
-msgid "Profile URL"
-msgstr "રૂપરેખા URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "જ્યારે ઓફલાઈન હોય ત્યારે માન્ય નથી"
 
 #. *< type
 #. *< ui_requirement
@@ -5462,67 +5552,29 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "સામાન્ય સત્તાધિકરણ નિષ્ફળ!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s એ માન્ય જૂથ નથી."
-
-msgid "Unknown error."
-msgstr "અજ્ઞાત ક્ષતિ."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s એ %s (%s) પર"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s એ તમને ફાઈલ મોકલી!"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "અજ્ઞાત ક્ષતિ"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "વપરાશકર્તા %s ને બેન કરવામાં અસમર્થ"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "અજ્ઞાત ક્ષતિ"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "નીચે તમારી શોધનાં પરિણામો છે"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) પર વપરાશકર્તા ઉમેરવામાં અસમર્થ"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) પર વપરાશકર્તા અટકાવવામાં અસમર્થ"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) પર વપરાશકર્તાને પરવાનગી આપવામાં અસમર્થ"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ઉમેરી શકાયું નહિં કરાણ કે તમારી વ્યક્તિ યાદી ભરેલી છે."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s એ માન્ય પાસપોર્ટ ખાતું નથી."
-
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "સેવા ક્ષણો માટે ઉપ્લબ્ધ નથી"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "વપરાશકર્તા ઓફલાઈન હોવાના કારણે સંદેશો મોકલી શકાયો નહિં:"
 
-msgid "Unable to rename group"
-msgstr "જૂથનું નામ બદલાવામાં અસમર્થ"
-
-msgid "Unable to delete group"
-msgstr "જૂથ કાઢી નાંખવામાં અસમર્થ"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5566,9 +5618,6 @@ msgstr "સંદેશો મોકલાઈ શકાશે નહિં ક�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "સંદેશો મોકલાઈ શકાશે નહિં કારણ કે એક અજ્ઞાત ક્ષતિ ઉદ્દભવી:"
 
-msgid "Unable to connect"
-msgstr "જોડાવામાં અસમર્થ"
-
 msgid "Writing error"
 msgstr "લખવામાં ક્ષતિ"
 
@@ -5583,20 +5632,24 @@ msgstr ""
 "%s માંથી સર્વર (%s) માં જોડાણ ક્ષતિ:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "સર્વર દ્વારા અમારો પ્રોટોકોલ આધારભૂત નથી."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP નું પદચ્છેદન કરવામાં ક્ષતિ."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "તમે અન્ય સ્થાનમાંથી પ્રવેશ કર્યો છે."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN સર્વરો ક્ષણવાર માટે ઉપલબ્ધ નથી. મહેરબાની કરીને રાહ જુઓ અને ફરીથી પ્રયત્ન કરો."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN સર્વરો ક્ષણવાર માટે નીચા જઈ રહ્યા છે."
 
 #, c-format
@@ -5627,6 +5680,14 @@ msgstr "કુકી મોકલી રહ્યા છીએ"
 msgid "Retrieving buddy list"
 msgstr "વ્યક્તિ યાદી મેળવી રહ્યા છીએ"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "કમ્પ્યૂટરથી દૂર"
 
@@ -5664,14 +5725,6 @@ msgstr "સંદેશો મોકલી શકાયો નહિં કા�
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "સંદેશો મોકલાઈ શકાશે નહિં કારણ કે એક અજ્ઞાત ક્ષતિ ઉદ્દભવી:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "વપરાશકર્તા %s એ તમને તેની અથવા તેણીની વ્યક્તિયાદીમાં ઉમેરેલ છે."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s તમને તેની સંપર્ક યાદી માંથી નિકાળી નાખ્યા છે."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "સરનામા પુસ્તિકામાં ઉમેરો"
@@ -5680,13 +5733,6 @@ msgstr "સરનામા પુસ્તિકામાં ઉમેરો"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "શું તમે આ વ્યક્તિને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માંગો છો?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "\"%s\" ને ઉમેરવામાં અસમર્થ."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "સ્પષ્ટ થયેલ સ્ક્રીન નામ અયોગ્ય છે."
@@ -5694,6 +5740,9 @@ msgstr "સ્પષ્ટ થયેલ સ્ક્રીન નામ અય�
 msgid "This Hotmail account may not be active."
 msgstr "આ હોટમેલ ખાતું કદાચ સક્રિય નથી."
 
+msgid "Profile URL"
+msgstr "રૂપરેખા URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5708,18 +5757,64 @@ msgstr "આ હોટમેલ ખાતું કદાચ સક્રિય �
 msgid "MSN Protocol Plugin"
 msgstr "AIM/ICQ પ્રોટોકોલ પ્લગઈન"
 
-msgid "Missing Cipher"
-msgstr ""
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s એ માન્ય જૂથ નથી."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "અજ્ઞાત ક્ષતિ."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s એ %s (%s) પર"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) પર વપરાશકર્તા ઉમેરવામાં અસમર્થ"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) પર વપરાશકર્તા અટકાવવામાં અસમર્થ"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) પર વપરાશકર્તાને પરવાનગી આપવામાં અસમર્થ"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ઉમેરી શકાયું નહિં કરાણ કે તમારી વ્યક્તિ યાદી ભરેલી છે."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s એ માન્ય પાસપોર્ટ ખાતું નથી."
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "સેવા ક્ષણો માટે ઉપ્લબ્ધ નથી"
+
+msgid "Unable to rename group"
+msgstr "જૂથનું નામ બદલાવામાં અસમર્થ"
+
+msgid "Unable to delete group"
+msgstr "જૂથ કાઢી નાંખવામાં અસમર્થ"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "વપરાશકર્તા %s એ તમને તેની અથવા તેણીની વ્યક્તિયાદીમાં ઉમેરેલ છે."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s તમને તેની સંપર્ક યાદી માંથી નિકાળી નાખ્યા છે."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "વપરાશકર્તા કક્ષો"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "માહિતી વાંચી રહ્યા છીએ"
 
@@ -5731,13 +5826,23 @@ msgstr "સર્વરમાંથી અયોગ્ય શરત"
 msgid "Logging in"
 msgstr "પ્રવેશી રહ્યા છીએ"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "કોઈ સ્ક્રીનનામ આપેલ નથી."
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "સર્વર સાથે જોડાણથયેલ નથી."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "નવો દૂર જવાનો સંદેશો"
@@ -5758,21 +5863,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "કોઈ સ્ક્રીનનામ આપેલ નથી."
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_IM વિન્ડો"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connected"
-msgstr "સાંકળો"
+msgid "Add contacts from server"
+msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
 
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
@@ -5780,16 +5886,23 @@ msgstr "પ્રક્રિયાએ ક્ષતિ કોડ %d આપ્ય
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "અયોગ્ય નામ અથવા પાસવર્ડ."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "જોડાણ પરિપૂર્ણ કરી રહ્યા છીએ"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "વ્યક્તિને સંવાદમાં જોડવામાં નિષ્ફળ"
 
@@ -5801,14 +5914,6 @@ msgstr "સર્વરમાંથી વ્યક્તિ યાદી આય
 msgid "persist command failed"
 msgstr "સ્વીચબોર્ડ નિષ્ફળ"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "વપરાશકર્તા કક્ષો"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "વ્યક્તિને સંવાદમાં જોડવામાં નિષ્ફળ"
@@ -5820,39 +5925,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "સ્વીચબોર્ડ નિષ્ફળ"
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "જોડાણ પરિપૂર્ણ કરી રહ્યા છીએ"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "કતાર ભરેલી છે"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "સંદેશાનું પદચ્છેદન કરવામાં અસમર્થ"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "_IM વિન્ડો"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5900,9 +5982,6 @@ msgstr "મોટું ફોન્ટ માપ"
 msgid "User"
 msgstr "વપરાશકર્તાઓ"
 
-msgid "Profile"
-msgstr "રુપરેખા"
-
 #, fuzzy
 msgid "Headline"
 msgstr "અસ્વીકારો"
@@ -5918,15 +5997,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "વાર્તાલાપ બંધ કરો"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "કોઈ સ્ક્રીનનામ આપેલ નથી."
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5939,6 +6013,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "આ થીમ પાસે કોઈ ઉપલબ્ધ હસતા ચહેરાઓ નથી."
@@ -5947,6 +6024,14 @@ msgstr "આ થીમ પાસે કોઈ ઉપલબ્ધ હસતા ચ
 msgid "Please try another username:"
 msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "કોઈ સ્ક્રીનનામ આપેલ નથી."
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6144,10 +6229,6 @@ msgid "Master archive is misconfigured"
 msgstr "મુખ્ય પેટી ખોટી રીતે રૂપરેખાંકિત થયેલ છે"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "અયોગ્ય નામ અથવા પાસવર્ડ."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "તમે દાખલ કરેલ વપરાશકર્તાનામનું યજમાન ઓળખી શક્યા નહિં"
 
@@ -6189,9 +6270,9 @@ msgstr "વપરાશકર્તા ક્યાં તો ઓફલાઈન
 msgid "Unknown error: 0x%X"
 msgstr "અજ્ઞાત ક્ષતિ: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "પ્રવેશ નિષ્ફળ (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "વપરાશકર્તા %s ને બેન કરવામાં અસમર્થ"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6293,9 +6374,6 @@ msgstr "GroupWise કોન્ફરન્સ %d"
 msgid "Authenticating..."
 msgstr "સત્તાધિકરણ કરી રહ્યા છીએ..."
 
-msgid "Unable to connect to server."
-msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
-
 msgid "Waiting for response..."
 msgstr "પ્રત્યુત્તર માટે રાહ જોઈ રહ્યા છીએ..."
 
@@ -6319,25 +6397,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "શું તમે વાર્તાલાપમાં જોડાવા માંગો છો?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "તમે પ્રવેશ બહાર નીકળી ગયા છો કારણ કે તમે બીજા વર્કસ્ટેશનમાં પ્રવેશ કરેલ છે."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s એ ઓફલાઈન થયેલ હોય એમ દેખાય છે અને તમે મોકલેલ સંદેશો મેળવેલ નથી."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "સર્વર સાથે જોડાવામાં અસમર્થ. તમે જે સર્વર સાથે જોડાવા ઈચ્છો છો તે સર્વરનું મહેરબાની કીરને "
 "સરનામું દાખલ કરો."
 
-msgid "Error. SSL support is not installed."
-msgstr "ક્ષતિ. SSL આધાર સ્થાપિત થયેલ નથી."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "કોન્ફરન્સ બંધ થઈ ગયેલ છે. કોઈ વધુ સંદેશાઓ મોકલી શકાશે નહિં."
 
@@ -6361,6 +6433,25 @@ msgid "Server port"
 msgstr "સર્વર પોર્ટ"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
+
+#. username connecting too frequently
+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 ""
+"તમે ખૂબ ઝડપથી જોડાણ બનાવી રહ્યા છો અને તોડી રહ્યા છો. દસ મિનિટ રાહ જુઓ અને ફરીથી "
+"પ્રયત્ન કરો. જો તમે પ્રયત્ન કરવાનું ચાલુ રાખો, તો તમારે વધુ સમય માટે રાહ જોવી પડશે."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "જોડાણ બનાવવામાં ક્ષતિ"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "જોડાઈ શક્યા નહિં"
 
@@ -6369,17 +6460,7 @@ msgid "Invalid chat room name"
 msgstr "અયોગ્ય કક્ષ નામ"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "જોડાણ બનાવવામાં ક્ષતિ"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "સર્વર સાથે જોડાણથયેલ નથી."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
 
 #. *< type
@@ -6432,8 +6513,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6604,23 +6686,18 @@ msgstr "કેમેરો"
 msgid "Screen Sharing"
 msgstr "સ્ક્રીન નામ"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "સંવાદથી મુક્ત"
 
-#, c-format
 msgid "Not Available"
 msgstr "ઉપલબ્ધ નથી"
 
-#, c-format
 msgid "Occupied"
 msgstr "ફાળવેલ"
 
-#, c-format
 msgid "Web Aware"
 msgstr "વેબ પરિચિત"
 
-#, c-format
 msgid "Invisible"
 msgstr "અદૃશ્ય"
 
@@ -6634,16 +6711,12 @@ msgid "Buddy Comment"
 msgstr "વ્યક્તિ ટિપ્પણી"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "પરિવહન માટે જોડાઈ શક્યા નહિં."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
+msgid "Unable to connect to BOS server: %s"
+msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
 
 #, fuzzy
 msgid "Username sent"
@@ -6658,51 +6731,62 @@ msgstr "જોડાણ પરિપૂર્ણ કરી રહ્યા છ�
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "પ્રવેશ કરવામાં અસમર્થ: %s તરીકે પ્રવેશ કરી શક્યા નહિં કારણ કે સ્ક્રીન નામ એ અયોગ્ય છે.  "
 "સ્ક્રીન નામો ક્યાં તો અક્ષરથી જ શરૂ થવા જોઈએ અને માત્ર અક્ષરો, નંબરો અને જગ્યાઓ, અથવા "
 "માત્ર નંબરો જ સમાવતા હોવા જોઈએ."
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"તમે ટુંકમાં જ જોડાણ છોજી દેશો.  તમે TOC વાપરવાની ઈચ્છા રાખશો જ્યાં સુધી આ ચોક્કસ નહિં થઈ "
+"જાય.  સુધારાઓ માટે %s ને ચકાસો."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "અયોગ્ય વપરાશકર્તા નામ"
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin એ માન્ય AIM પ્રવેશ હેશ મેળવવામાં અસમર્થ હતું."
 
-msgid "Incorrect password."
-msgstr "અયોગ્ય પાસવર્ડ."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin એ માન્ય પ્રવેશ હેશ મેળવવામાં અસમર્થ હતું."
+
+msgid "Received authorization"
+msgstr "સત્તાધિકરણ મેળવ્યું"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "વપરાશકર્તા અસ્તિત્વમાં નથી"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "તમારું ખાતું વર્તમાનમાં અટકાવી દેવાયેલ છે."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL તુરંત સંદેશાવાહક સેવા ક્ષણવાર માટે ઉપલબ્ધ નથી."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "તમે વાપરી રહ્યા છો તે ક્લાઈન્ટ આવૃત્તિ ખૂબ જૂની છે. મહેરબાની કરીને %s આગળથી સુધારો"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "તમે ખૂબ ઝડપથી જોડાણ બનાવી રહ્યા છો અને તોડી રહ્યા છો. દસ મિનિટ રાહ જુઓ અને ફરીથી "
 "પ્રયત્ન કરો. જો તમે પ્રયત્ન કરવાનું ચાલુ રાખો, તો તમારે વધુ સમય માટે રાહ જોવી પડશે."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "તમે વાપરી રહ્યા છો તે ક્લાઈન્ટ આવૃત્તિ ખૂબ જૂની છે. મહેરબાની કરીને %s આગળથી સુધારો"
-
-msgid "Could Not Connect"
-msgstr "જોડાઈ શક્યા નહિં"
-
-msgid "Received authorization"
-msgstr "સત્તાધિકરણ મેળવ્યું"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "દાખલ થયેલ SecurID કી અયોગ્ય છે."
 
 msgid "Enter SecurID"
@@ -6718,28 +6802,6 @@ msgstr "ડિજીટલ ડિસ્પ્લેમાંથી ૬ ડિજ
 msgid "_OK"
 msgstr "બરાબર"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"તમે ટુંકમાં જ જોડાણ છોજી દેશો.  તમે TOC વાપરવાની ઈચ્છા રાખશો જ્યાં સુધી આ ચોક્કસ નહિં થઈ "
-"જાય.  સુધારાઓ માટે %s ને ચકાસો."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin એ માન્ય AIM પ્રવેશ હેશ મેળવવામાં અસમર્થ હતું."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"તમે ટુંકમાં જ જોડાણ છોજી દેશો.  તમે TOC વાપરવાની ઈચ્છા રાખશો જ્યાં સુધી આ ચોક્કસ નહિં થઈ "
-"જાય.  સુધારાઓ માટે %s ને ચકાસો."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin એ માન્ય પ્રવેશ હેશ મેળવવામાં અસમર્થ હતું."
-
 msgid "Password sent"
 msgstr "પાસવર્ડ મોકલાઈ ગયો"
 
@@ -6873,7 +6935,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "તમે %hu સંદેશો %s માંથી ચૂકી ગયેલ છો કોઈ અજ્ઞાત કારણોસર."
 msgstr[1] "તમે %hu સંદેશાઓ %s માંથી ચૂકી ગયેલ છો કોઈ અજ્ઞાત કારણોસર."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "સંદેશો મોકલવામાં અસમર્થ: %s"
@@ -6895,6 +6957,12 @@ msgstr "ત્યારથી ઓનલાઈન"
 msgid "Member Since"
 msgstr "ત્યારથી સભ્ય"
 
+msgid "Capabilities"
+msgstr "ક્ષમતાઓ"
+
+msgid "Profile"
+msgstr "રુપરેખા"
+
 msgid "Your AIM connection may be lost."
 msgstr "તમારું AIM જોડાણ ખોવાઈ જશે."
 
@@ -7070,7 +7138,7 @@ msgstr "દૂર સંદેશ ખૂબ લાંબો છે."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7091,15 +7159,15 @@ msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
 msgstr ""
-"Pidgin એ AIM સર્વરોમાંથી વ્યક્તિ યાદી મેળવવામાં થોડી વાર માટે અસમર્થ હતું.  તમારી વ્યક્તિ "
-"યાદી એ ખોવાયેલ નથી, અને કદાચ થોડા કલાકોમાં ઉપલબ્ધ હશે."
+"Pidgin એ AIM સર્વરોમાંથી વ્યક્તિ યાદી મેળવવામાં થોડી વાર માટે અસમર્થ હતું.  તમારી "
+"વ્યક્તિ યાદી એ ખોવાયેલ નથી, અને કદાચ થોડા કલાકોમાં ઉપલબ્ધ હશે."
 
 msgid "Orphans"
 msgstr "ઓરફાન"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "વ્યક્તિ %s ને ઉમેરી શક્યા નહિં કારણ કે તમારી પાસે ઘણી વ્યક્તિઓ તમારી વ્યક્તિ યાદીમાં ઉમેરેલ "
@@ -7109,7 +7177,7 @@ msgid "(no name)"
 msgstr "(નામ વિનાનું)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "તમારો આદેશ અજ્ઞાત કારણોસર નિષ્ફળ ગયો."
 
 #, fuzzy, c-format
@@ -7181,6 +7249,7 @@ msgstr "સાંકળો"
 msgid "Get AIM Info"
 msgstr "જાણ મેળવો"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "વ્યક્તિ ટિપ્પણીમાં ફેરફાર કરો"
 
@@ -7242,6 +7311,7 @@ msgstr "શોધો"
 msgid "Set User Info (web)..."
 msgstr "વપરાશકર્તા જાણ સુયોજિત કરો (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "પાસવર્ડ બદલો (URL)"
@@ -7277,6 +7347,10 @@ msgstr "ઈ-મેઈલ દ્વારા વ્યક્તિ માટે �
 msgid "Search for Buddy by Information"
 msgstr "જાણકારી દ્વારા વ્યક્તિ માટે શોધ કરો"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "વપરાશકર્તા પ્રવેશ્યો નથી"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7294,7 +7368,7 @@ msgstr "%s ને અમારી સાથે %s આગળ જોડાવા �
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s સાથે %s આગળ જોડાવાનું કરી રહ્યા છીએ:%hu એ સીધા IM માટે."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "જોડાણ પુનઃદિશામાન કરી રહ્યા છીએ..."
 
@@ -7403,7 +7477,7 @@ msgstr "ઓપેરા"
 msgid "Visible"
 msgstr "અદૃશ્ય"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7499,17 +7573,51 @@ msgstr "છેલ્લો સુધારો"
 msgid "Could not change buddy information."
 msgstr "મહેરબાની કરીને વ્યક્તિ દાખલ કરો."
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "મોબાઈલ ફોન"
+
+msgid "Note"
+msgstr "નોંધ"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "વ્યક્તિ ચિહ્ન"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "વ્યક્તિ ઉમેરો"
+msgid "_Modify"
+msgstr "સુધારો (_M)"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "સુધારો (_M)"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "સર્વર વ્યસ્ત છે"
+
+msgid "Your request was accepted."
+msgstr ""
 
-msgid "Input answer here"
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "સત્તાધિકરણ જરૂરી"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "શું તમારી યાદીમાં વ્યક્તિ ઉમેરવો છે?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "વપરાશકર્તા ડિરેક્ટરી દાખલ કરો."
+
 msgid "Send"
 msgstr "મોકલો"
 
@@ -7521,19 +7629,20 @@ msgstr "અયોગ્ય પાસવર્ડ"
 msgid "Authorization denied message:"
 msgstr "સત્તાધિકરણ નામંજૂરી સંદેશો:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "સત્તાધિકરણ શરૂ કરી રહ્યા છીએ"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "શું તમારી યાદીમાં વ્યક્તિ ઉમેરવો છે?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "કોન્ફરન્સ સર્વર દાખલ કરો"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7556,7 +7665,7 @@ msgid "Failed sending authorize"
 msgstr "મહેરબાની કરીને મને સત્તાધિકારીત કરો!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "વ્યક્તિને સંવાદમાં જોડવામાં નિષ્ફળ"
 
 #, fuzzy, c-format
@@ -7602,6 +7711,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "અયોગ્ય પ્રોક્સી સુયોજનો"
+
+#, fuzzy
 msgid "Not member"
 msgstr "ત્યારથી સભ્ય"
 
@@ -7646,15 +7759,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "સંવાદમાં જોડાવ"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "ટેલિફોન નંબર"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7665,7 +7781,7 @@ msgstr "ધ્વનિ વિકલ્પો"
 msgid "Failed:"
 msgstr "નિષ્ફળ"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7677,11 +7793,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
-msgstr ""
+#, fuzzy
+msgid "Sorry, you are not our style"
+msgstr "માફ કરજો, હું થોડા સમય માટે ચાલી ગયો હતો!"
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "ટેલિફોન નંબર"
 
 #, fuzzy
@@ -7692,7 +7809,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "શું તમે આ વપરાશકર્તા માટે વ્યક્તિ ચિહ્ન ગોઠવવા માંગો છો?"
 
 #, fuzzy
@@ -7700,28 +7817,28 @@ msgid "Setup"
 msgstr "સુયોજિત કરો (_S)"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "વ્યક્તિને સંવાદમાં જોડવામાં નિષ્ફળ"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "વ્યક્તિ દૂર કરો"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "વ્યક્તિ દૂર કરો"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7841,6 +7958,13 @@ msgstr "<b>વપરાશકર્તા:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>ઉપનામ:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>વપરાશકર્તા:</b> %s<br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7848,7 +7972,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Pidgin વિશે"
 
 #, fuzzy
@@ -7869,6 +7993,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Pidgin વિશે"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "ઘરનું સરનામું"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7900,7 +8028,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "જોડાઈ રહ્યા છીએ"
@@ -7913,6 +8040,9 @@ msgstr "થોડા વિકલ્પો બતાવો"
 msgid "Show server news"
 msgstr "થોડા વિકલ્પો બતાવો"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "વાંચવામાં ક્ષતિ"
@@ -7922,11 +8052,7 @@ msgid "Update interval (seconds)"
 msgstr "વાંચવામાં ક્ષતિ"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "સર્વર જાણકારી મેળવી શકતા નથી"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "સર્વર જાણકારી મેળવી શકતા નથી"
 
 #, c-format
@@ -7949,21 +8075,19 @@ msgid "Activation required"
 msgstr "રજીસ્ટ્રેશન જરૂરી છે"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "વાંચવામાં ક્ષતિ"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "વિનંતી સંવાદ"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Yahoo નિષ્ફળ! સત્તાધિકરણ"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7973,7 +8097,7 @@ msgstr "ચિત્ર સંગ્રહો"
 msgid "Enter code"
 msgstr "પાસવર્ડ દાખલ કરો"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7981,69 +8105,43 @@ msgid "Enter the text from the image"
 msgstr "મહેરબાની કરીને ઉમેરવા માટેના જૂથનું નામ દાખલ કરો."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "જોડાવામાં અસમર્થ."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "ટોકન ક્ષતિ"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "સર્વર સાથે જોડાણથયેલ નથી."
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "સોકેટ વાંચવામાં અસમર્થ"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "લખવામાં ક્ષતિ"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "જોડાણ બંધ થઈ ગયું"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "વપરાશકર્તા જાણ સુયોજિત કરો..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "માંગણી રદ થઈ ગયેલ"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
+msgid "Unable to resolve hostname"
+msgstr "સર્વરને પીંગ કરવામાં અસમર્થ"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "અયોગ્ય વપરાશકર્તા નામ અથવા પાસવર્ડ"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "સર્વર જોડો"
+msgid "Connecting to server"
+msgstr "SILC સર્વર સાથે જોડાઈ રહ્યા છીએ"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "વાંચવામાં ક્ષતિ"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "સંવાદમાં જોડાવામાં નિષ્ફળ"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8053,6 +8151,10 @@ msgid ""
 msgstr "ICQ સર્વર રીલે"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s એ %s (%s) પર"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "તરફથી"
 
@@ -8062,32 +8164,30 @@ msgid ""
 "%s"
 msgstr "સર્વર જાણકારી"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "અજ્ઞાત કારણ."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "આદેશ"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "સર્વર જાણકારી મેળવી શકતા નથી"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "અજ્ઞાત કારણ."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "અજ્ઞાત કારણ."
 
 #, fuzzy, c-format
@@ -8102,10 +8202,6 @@ msgstr "ફાઈલ મોકલવામાં નિષ્ફળ"
 msgid "%d canceled the transfer of %s"
 msgstr "%s એ %s નું પરિવહન રદ કર્યું"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "જોડાણ બંધ થઈ ગયું"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>વપરાશકર્તા:</b> %s<br>"
@@ -8163,19 +8259,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "જોડાણ બંધ થઈ ગયું"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "સોકેટમાંથી વાંચતી વખતે ક્ષતિ."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8203,6 +8286,10 @@ msgid "Video Camera"
 msgstr "વીડિયો સંવાદ"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "ફાઈલ પરિવહનો"
+
+#, fuzzy
 msgid "Supports"
 msgstr "આધાર"
 
@@ -8932,9 +9019,6 @@ msgstr "સંસ્થા"
 msgid "Unit"
 msgstr "એકમ"
 
-msgid "Note"
-msgstr "નોંધ"
-
 msgid "Join Chat"
 msgstr "સંવાદમાં જોડાવ"
 
@@ -9037,6 +9121,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "નેટવર્ક પરિસ્થિતિઓ"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping નિષ્ફળ"
 
@@ -9102,7 +9189,8 @@ msgstr "બિનઆધારભૂત જાહેર કી પ્રકાર
 msgid "Disconnected by server"
 msgstr "સર્વર દ્વારા જોડાણ તૂટી ગયેલ"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC સર્વર સાથે જોડાણ કરવામાં ક્ષતિ"
 
 msgid "Key Exchange failed"
@@ -9112,29 +9200,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "નહિં જોડાયેલ સત્ર છોડવામાં નિષ્ફળ. નવું જોડાણ બનાવવા માટે પુનઃજોડાવ દબાવો."
 
-msgid "Connection failed"
-msgstr "જોડાણ નિષ્ફળ"
-
 msgid "Performing key exchange"
 msgstr "કી ફેરબદલી કરી રહ્યા છીએ"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "જાહેર કી લાવી શક્યા નહિં"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC સર્વર સાથે જોડાઈ રહ્યા છીએ"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "જાહેર કી લાવી શક્યા નહિં"
+
 msgid "Out of memory"
 msgstr "મેમરી ઓછી છે"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC ક્લાઈન્ટ જોડાણનો પ્રારંભ કરી શકતા નથી"
 
 #, fuzzy
@@ -9440,7 +9525,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILC કી જોડ બનાવી રહ્યા છીએ..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "SILC કી જોડ બનાવી રહ્યા છીએ..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9534,6 +9619,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "કોઈ સર્વર પરિસ્થિતિઓ ઉપલબ્ધ નથી"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC સર્વર સાથે જોડાણ કરવામાં ક્ષતિ"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "નિષ્ફળતા: આવૃત્તિ બિનજોડણી, તમારો ક્લાઈન્ટ સુધારો"
@@ -9574,7 +9662,8 @@ msgstr "નિષ્ફળતા: અયોગ્ય કુકી"
 msgid "Failure: Authentication failed"
 msgstr "નિષ્ફળતા: સત્તાધિકરણ નિષ્ફળ"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC ક્લાઈન્ટ જોડાણનો પ્રારંભ કરી શકતા નથી"
 
 #, fuzzy
@@ -9582,31 +9671,29 @@ msgid "John Noname"
 msgstr "યજમાન નામ"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "જાહેર કી લાવી શક્યા નહિં"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "મોકલી શક્યા નહિં"
-
-msgid "Could not connect"
-msgstr "જોડાઈ શક્યા નહિં"
+msgid "Unable to create connection"
+msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "અજ્ઞાત સર્વર ક્ષતિ."
 
-msgid "Could not create listen socket"
-msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "યજમાનનામો ઉકેલવામાં અસમર્થ."
+msgid "Unable to create listen socket"
+msgstr "સોકેટ બનાવવામાં અસમર્થ"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP વપરાશકર્તાનામ ખાલી જગ્યાઓ અથવા @ ચિહ્નો ધરાવી શકે નહિં"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "થોડા વિકલ્પો બતાવો"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9644,176 +9731,69 @@ msgstr "AP વપરાશકર્તા"
 msgid "Auth Domain"
 msgstr "આપમેળે"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s જોઈ રહ્યા છીએ"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s સાથે જોડાવામાં નિષ્ફળ"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "પ્રવેશ કરો: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "ફાઈલ %s લખવામાં અસમર્થ."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "ફાઈલ %s વાંચવામાં અસમર્થ."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "સંદેશો ખૂબ લાંબો છે, છેલ્લા %s બાઈટો બગડી ગયેલ છે."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s વર્તમાનમાં પ્રવેશેલ નથી."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s ની ચેતવણી માન્ય નથી."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "સંદેશો છોડી મૂકાયેલ છે, તમે સર્વર ઝડપ મર્યાદા ઓળંગી ગયા છે."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s માં સંવાદ ઉપલબ્ધ નથી."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "તમે સંદેશાઓ ખૂબ ઝડપથી %s ને મોકલી રહ્યા છો."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "તમે IM ને %s માંથી રહી ગયા કારણ કે તે ખૂબ મોટું હતું."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "તમે IM ને %s માંથી મેળવવામાં રહી ગયા કારણ કે તે ખૂબ ઝડપથી મોકલાયું હતું."
-
-#, c-format
-msgid "Failure."
-msgstr "નિષ્ફળતા."
-
-#, c-format
-msgid "Too many matches."
-msgstr "ઘણી બધી જોડણીઓ."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "વધુ ચકાસણીઓની જરૂર છે."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "ડિરેક્ટરી સેવા કામચલાઉ રીતે ઉપલબ્ધ નથી."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  Yahoo નેટવર્ક પર સંવાદ કક્ષમાં જોડાવ"
 
-#, c-format
-msgid "Email lookup restricted."
-msgstr "ઈ-મેઈલ જોવાનું પ્રતિબંધિત છે."
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  આ નેટવર્ક પરની ચેનલોની યાદી આપો"
 
-#, c-format
-msgid "Keyword ignored."
-msgstr "મુખ્ય શબ્દ અવગણાયેલ છે."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: વપરાશકર્તાને ડુડલ સત્ર શરૂ કરવા માટે વિનંતિ કરો"
 
-#, c-format
-msgid "No keywords."
-msgstr "કોઈ મુખ્ય શબ્દો નથી."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-#, c-format
-msgid "User has no directory information."
-msgstr "વપરાશકર્તા પાસે કોઈ ડિરેક્ટરી જાણકારી નથી."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo પ્રોટોકોલ પ્લગઈન"
 
-#, c-format
-msgid "Country not supported."
-msgstr "દેશ આધારભૂત નથી."
+#, fuzzy
+msgid "Pager server"
+msgstr "પ્રોક્સી સર્વર"
 
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "નિષ્ફળતા અજ્ઞાત: %s."
+msgid "Pager port"
+msgstr "પેજર પોર્ટ"
 
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "અયોગ્ય નામ અથવા પાસવર્ડ."
+#, fuzzy
+msgid "File transfer server"
+msgstr "ફાઈલ પરિવહન યજમાન"
 
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "સેવા ક્ષણવાર માટે ઉપલબ્ધ નથી."
+msgid "File transfer port"
+msgstr "ફાઈલ પરિવહન પોર્ટ"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "તમારું ચેતવણી સ્તર વર્તમાનમાં પ્રવેશ માટે ખૂબ ઊંચું છે."
+#, fuzzy
+msgid "Chat room locale"
+msgstr "સંવાદ કક્ષ લોકેલ"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
-"તમે ખૂબ ઝડપથી જોડાણ કરી રહ્યા છો અને તોડી રહ્યા છો.  દસ મિનિટો રાહ જુઓ અને ફરીથી "
-"પ્રયત્ન કરો.  જો તમે પ્રયાસ કરવાનું ચાલુ રાખો, તો તમારે વધુ લાંબા સમય સુધી રાહ જોવી પડશે."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "એક અજ્ઞાત પ્રવેશ ક્ષતિ ઉદ્દભવી: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "એક અજ્ઞાત ક્ષતિ, %d, ઉદ્દભવી.  જાણકારી: %s"
-
-msgid "Invalid Groupname"
-msgstr "અયોગ્ય જૂથનામ"
-
-msgid "Connection Closed"
-msgstr "જોડાણ બંધ થઈ ગયું"
-
-msgid "Waiting for reply..."
-msgstr "પ્રત્યુત્તર માટે રાહ જોઈ રહ્યા છીએ..."
-
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC એ તેની અટકાવો સ્થિતિમાંથી પાછું આવી ગયું છે. તમે હવે ફરીથી સંદેશાઓ મોકલી શકશો."
-
-msgid "Password Change Successful"
-msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ ગયો"
-
-msgid "_Group:"
-msgstr "જૂથ (_G):"
-
-msgid "Get Dir Info"
-msgstr "ડિરેક્ટરી જાણ મેળવો"
-
-msgid "Set Dir Info"
-msgstr "ડિરેક્ટરી જાણકારી સુયોજિત કરો"
-
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "%s ને લખવા માટે ખોલી શક્યા નહિં!"
-
-msgid "File transfer failed; other side probably canceled."
-msgstr "ફાઈલ પરિવહન નિષ્ફળ; અન્ય બાજુ કદાચ રદ થઈ ગયેલ હશે."
 
-msgid "Could not connect for transfer."
-msgstr "પરિવહન માટે જોડાઈ શક્યા નહિં."
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "સંવાદ કક્ષ યાદી Url"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "ફાઈલ હેડરમાં લખી શક્યા નહિં.  ફાઈલ પરિવહન થશે નહિં."
+msgid "Yahoo Chat server"
+msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "ચિહ્ન આ રીતે સંગ્રહો..."
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s એ %s ને %d ફાઈલ સ્વીકારવા માટે અરજી કરે છે: %s (%.2f %s)%s%s"
-msgstr[1] "%s એ %s ને %d ફાઈલો સ્વીકારવા માટે અરજી કરે છે: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo જાપાન"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s તમને તેમને ફાઈલ મોકલવા માટે અરજી કરે છે"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9825,11 +9805,11 @@ msgstr "%s તમને તેમને ફાઈલ મોકલવા મા�
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC પ્રોટોકોલ પ્લગઈન"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo પ્રોટોકોલ પ્લગઈન"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9853,14 +9833,38 @@ msgstr "%s એ (પૂછીને) તેમને તમારી યાદી
 msgid "Add buddy rejected"
 msgstr "વ્યક્તિ ઉમેરવાનું નામંજૂર થયેલ"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "અજ્ઞાત ક્ષતિ નંબર %d. Yahoo! વેબસાઈટમાં પ્રવેશ કરવાનું ક્ષતિ ચોક્કસ કરશે."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "અજ્ઞાત ક્ષતિ નંબર %d. Yahoo! વેબસાઈટમાં પ્રવેશ કરવાનું ક્ષતિ ચોક્કસ કરશે."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "અયોગ્ય નામ અથવા પાસવર્ડ."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-"Yahoo સર્વરે નહિં ઓળખાયેલ સત્તાધિકરણ પદ્ધતિનો વપરાશ નામંજૂર કર્યો છે.  Pidgin ની આ આવૃત્તિ "
-"Yahoo પર સફળતાપૂર્વક પ્રવેશ કરવામાં સમર્થ હશે નહિં.  સુધારાઓ માટે %s ચકાસો."
+"Yahoo સર્વરે નહિં ઓળખાયેલ સત્તાધિકરણ પદ્ધતિનો વપરાશ નામંજૂર કર્યો છે.  Pidgin ની આ "
+"આવૃત્તિ Yahoo પર સફળતાપૂર્વક પ્રવેશ કરવામાં સમર્થ હશે નહિં.  સુધારાઓ માટે %s ચકાસો."
 
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo નિષ્ફળ! સત્તાધિકરણ"
@@ -9883,11 +9887,12 @@ msgstr "તમારું ખાતું તાળું મરાયેલ �
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "અજ્ઞાત ક્ષતિ નંબર %d. Yahoo! વેબસાઈટમાં પ્રવેશ કરવાનું ક્ષતિ ચોક્કસ કરશે."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "વ્યક્તિ %s ને જૂથ %s માં સર્વર સાથે ઉમેરી શક્યા નહિં જે યાદી ખાતા %s પર છે."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "વ્યક્તિને સર્વર યાદીમાં ઉમેરી શક્યા નહિં"
 
 #, c-format
@@ -9895,23 +9900,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
 
-msgid "Connection problem"
-msgstr "જોડાણ સમસ્યા"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "%s પર %s સાથે વાર્તાલાપ"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
 
 #, fuzzy
 msgid "Not at Home"
@@ -9963,9 +9961,8 @@ msgstr "છુપાવવાની ગોઠવણીઓ"
 msgid "Start Doodling"
 msgstr "ડુડલિંગ શરૂ કરો"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "કયું ID સક્રિય કરવું છે?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "જોડાવ કે કોણ સંવાદમાં છે?"
@@ -9981,82 +9978,15 @@ msgstr "વપરાશકર્તાને સંવાદમાં જોડ�
 msgid "Open Inbox"
 msgstr "હોટમેલ ઇનબોક્સ ખોલો"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Yahoo નેટવર્ક પર સંવાદ કક્ષમાં જોડાવ"
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  આ નેટવર્ક પરની ચેનલોની યાદી આપો"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: વપરાશકર્તાને ડુડલ સત્ર શરૂ કરવા માટે વિનંતિ કરો"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo પ્રોટોકોલ પ્લગઈન"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo જાપાન"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "પ્રોક્સી સર્વર"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "જાપાન Pager યજમાન"
-
-msgid "Pager port"
-msgstr "પેજર પોર્ટ"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "ફાઈલ પરિવહન યજમાન"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "જાપાન ફાઈલ પરિવહન યજમાન"
-
-msgid "File transfer port"
-msgstr "ફાઈલ પરિવહન પોર્ટ"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "સંવાદ કક્ષ લોકેલ"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "સંવાદ કક્ષ યાદી Url"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo જાપાન"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "જોડાવામાં અસમર્થ."
+
 msgid "Unable to establish file descriptor."
 msgstr "ફાઈલ વર્ણનાત્મક અધિષ્ઠાપિત કરવામાં અસમર્થ."
 
@@ -10064,6 +9994,10 @@ msgstr "ફાઈલ વર્ણનાત્મક અધિષ્ઠાપિ�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s એ ફાઈલ %s મોકલવાની તક આપી રહ્યું છે"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "લખવામાં ક્ષતિ"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! જાપાન રૂપરેખા"
 
@@ -10108,14 +10042,9 @@ msgstr "સારી કડી ૩"
 msgid "Last Update"
 msgstr "છેલ્લો સુધારો"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s માટે વપરાશકર્તા જાણકારી ઉપલબ્ધ નથી"
-
 #, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr "માફ કરજો, આ રૂપરેખા કોઈ એક ભાષામાં લાગે છે કે જે આ સમયે આધારભૂત નથી."
 
 msgid ""
@@ -10187,21 +10116,19 @@ msgstr "અવાજો"
 msgid "Webcams"
 msgstr "વેબકેમ"
 
+msgid "Connection problem"
+msgstr "જોડાણ સમસ્યા"
+
 msgid "Unable to fetch room list."
 msgstr "કક્ષ યાદી મેળવવામાં અસમર્થ."
 
 msgid "User Rooms"
 msgstr "વપરાશકર્તા કક્ષો"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT સર્વર સાથે જોડાણ સમસ્યા છે."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "સર્વર સાથે જોડાણથયેલ નથી."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10327,31 +10254,21 @@ msgid "Exposure"
 msgstr "પ્રસ્તાવ"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "સોકેટ બનાવવામાં અસમર્થ"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "સંદેશો મોકલવામાં અસમર્થ: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "પ્રોક્સી જોડાણ ક્ષતિ %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "પરવાનગી નામંજૂર: પ્રોક્સી સર્વર પોર્ટ %d ટનલીંગ બગાડે છે."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "%s ચલાવવામાં ક્ષતિ"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "યજમાનનામો ઉકેલવામાં અસમર્થ."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10450,10 +10367,6 @@ msgstr "ખલેલ પહોંચાડશો નહિં"
 msgid "Extended away"
 msgstr "વિસ્તૃત દૂર થયેલ"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "મોબાઈલ ફોન"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10495,18 +10408,6 @@ msgstr "%s બિનનિષ્ક્રિય બની ગયો"
 msgid "%x %X"
 msgstr ""
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s વાંચવામાં ક્ષતિ"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"તમારૂ  %s વાંચવામાં ક્ષતિ ઉદ્દભવી હતી.  તે હજુ લોડ થયેલ નથી, અને જૂની ફાઈલને %s તરીકે "
-"નામ આપવામાં આવ્યું છે."
-
 msgid "Calculating..."
 msgstr "ગણી રહ્યા છીએ..."
 
@@ -10618,6 +10519,18 @@ msgstr "જોડાણ બંધ થઈ ગયું"
 msgid "Address already in use."
 msgstr "આ સંવાદ નામ પહેલાથી જ ઉપયોગમાં છે"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s વાંચવામાં ક્ષતિ"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"તમારૂ  %s વાંચવામાં ક્ષતિ ઉદ્દભવી હતી.  તે હજુ લોડ થયેલ નથી, અને જૂની ફાઈલને %s તરીકે "
+"નામ આપવામાં આવ્યું છે."
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "તુરંત સંદેશા મોકલનારાઓ"
@@ -10666,10 +10579,9 @@ msgstr "નવા મેઈલ સૂચનો"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s વિકલ્પો"
+#, fuzzy
+msgid "_Advanced"
+msgstr "નકારો (_C)"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10705,9 +10617,6 @@ msgstr "જો તમે વાસ્તવમાં નજીકથી જુ�
 msgid "you can see the butterflies mating"
 msgstr "તમે પતંગિયાઓ જોઈ શકો છો"
 
-msgid "Proxy Options"
-msgstr "પ્રોક્સી વિકલ્પો"
-
 msgid "Proxy _type:"
 msgstr "પ્રોક્સી પ્રકાર (_t):"
 
@@ -10738,8 +10647,8 @@ msgid "Create _this new account on the server"
 msgstr ""
 
 #, fuzzy
-msgid "_Advanced"
-msgstr "નકારો (_C)"
+msgid "_Proxy"
+msgstr "પ્રોક્સી"
 
 msgid "Enabled"
 msgstr "સક્રિય"
@@ -10777,16 +10686,17 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "કક્ષ યાદી"
+msgid "A_ccount"
+msgstr "ખાતું:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "મહેરબાની કરીને તમે જે સંવાદમાં જોડાવા માંગો તેના વિશે જરૂરી જાણકારી દાખલ કરો.\n"
 
-msgid "_Account:"
-msgstr "ખાતું (_A):"
+#, fuzzy
+msgid "Room _List"
+msgstr "કક્ષ યાદી"
 
 #, fuzzy
 msgid "_Block"
@@ -10806,6 +10716,17 @@ msgid "I_M"
 msgstr "I_M"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "સંવાદ ઉમેરો"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "વીડિયો સંવાદ"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "ફાઈલ મોકલો (_S)"
 
@@ -10817,7 +10738,11 @@ msgid "View _Log"
 msgstr "લૉગ જુઓ (_L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "જ્યારે ઓફલાઈન હોય ત્યારે માન્ય નથી"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "જ્યારે ઓફલાઈન હોય ત્યારે માન્ય નથી"
 
 msgid "_Alias..."
@@ -10960,6 +10885,10 @@ msgstr "/સાધનો/વ્યક્તિ (_P)"
 msgid "/Tools/_Certificates"
 msgstr "/સાધનો/પસંદગીઓ (_e)"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/સાધનો/દૂર (_A)"
+
 msgid "/Tools/Plu_gins"
 msgstr "/સાધનો/પ્લગઈન (_g)"
 
@@ -10969,10 +10898,6 @@ msgstr "/સાધનો/પસંદગીઓ (_e)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/સાધનો/ખાનગીપણું (_i)"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/સાધનો/દૂર (_A)"
-
 msgid "/Tools/_File Transfers"
 msgstr "/સાધનો/ફાઈલ પરિવહનો (_F)"
 
@@ -11098,8 +11023,8 @@ msgstr "જાતે"
 msgid "By status"
 msgstr "સ્થિતિ પ્રમાણે"
 
-msgid "By log size"
-msgstr "લૉગ માપ પ્રમાણે"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -11117,6 +11042,9 @@ msgstr "પુનઃ જોડાવ (_R)"
 msgid "Re-enable"
 msgstr "નવું Jabber ખાતું રજીસ્ટર કરો"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s પાછો આવ્યો"
@@ -11214,6 +11142,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "ઉપનામ:"
 
+msgid "_Group:"
+msgstr "જૂથ (_G):"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11250,6 +11181,120 @@ msgstr "/સાધનો"
 msgid "/Buddies/Sort Buddies"
 msgstr "/વ્યક્તિઓ/ગોઠવો વ્યક્તિઓ"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "પાશ્વ ભાગનો રંગ"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "શું તમે આ વ્યક્તિને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માંગો છો?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "પ્રવેશ બહાર નીકળો"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "પાશ્વ ભાગનો રંગ"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "વિસ્તારો (_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "પાશ્વ ભાગનો રંગ પસંદ કરો"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "ભેગું કરો (_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "પાશ્વ ભાગનો રંગ પસંદ કરો"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "ટુંકાણો"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "ઓનલાઈન"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "દૂર"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "ઓફલાઈન"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "સ્વભાવ"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
+
+msgid "Message Text"
+msgstr "સંદેશા લખાણ"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "સંદેશા લખાણ"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s માટે વપરાશકર્તા જાણકારી બદલો"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11269,14 +11314,6 @@ msgstr "તમે વર્તમાનમાં જે ખાતા સાથ�
 msgid "Invite Buddy Into Chat Room"
 msgstr "વ્યક્તિને સંવાદ કક્ષમાં આમંત્રિત કરો"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"મહેરબાની કરીને તમે જે વપરાશકર્તાને આમંત્રિત કરવા માંગો તેનું નામ, વૈકલ્પિક આમંત્રણ સંદેશા સાથે "
-"દાખલ કરો."
-
 msgid "_Buddy:"
 msgstr "વ્યક્તિ (_B):"
 
@@ -11306,7 +11343,7 @@ msgid "Get Away Message"
 msgstr "દૂર જવાનો સંદેશ મેળવો"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "છેલ્લું નામ"
 
 msgid "Unable to save icon file to disk."
@@ -11355,6 +11392,22 @@ msgstr "/વાર્તાલાપ/આ રીતે સંગ્રહો (_S)
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/વાર્તાલાપ/સાફ કરો"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/વાર્તાલાપ/લૉગ જુઓ (_L)"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/વાર્તાલાપ/ફાઈલ મોકલો (_n)..."
 
@@ -11432,6 +11485,18 @@ msgstr "/વાર્તાલાપ (_C)"
 msgid "/Conversation/View Log"
 msgstr "/વાર્તાલાપ/લૉગ જુઓ"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/વાર્તાલાપ/લૉગ જુઓ"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+
 msgid "/Conversation/Send File..."
 msgstr "/વાર્તાલાપ/ફાઈલ મોકલો..."
 
@@ -11625,6 +11690,9 @@ msgstr "સરનામું"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "આધાર"
 
@@ -11756,6 +11824,10 @@ msgid "Hungarian"
 msgstr "હંગેરિયાઈ"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "રોમેનિયન"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "મેકડોનિયન"
 
@@ -11773,6 +11845,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "વર્તમાન અનુવાદકો"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "ઓપેરા"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "બેન થયેલ"
 
@@ -11796,6 +11872,10 @@ msgid "Macedonian"
 msgstr "મેકડોનિયન"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "મેકડોનિયન"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "નોર્વેઈન"
 
@@ -11852,6 +11932,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "સ્વેડીશ"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "ટર્મિનલ"
@@ -11903,8 +11986,25 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
 
 #, fuzzy
@@ -12180,7 +12280,7 @@ msgid "Hyperlink visited color"
 msgstr "હાયપરલીંક રંગ"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "જ્યારે માઉસ તેના પર લઇ જવાય ત્યારનો હાયપરલીંકો દોરવા માટેનો રંગ."
 
 msgid "Hyperlink prelight color"
@@ -12218,15 +12318,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "સૂચન દૂર કરવાનું"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "નવા મેઈલ સૂચનો"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12239,15 +12346,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "નવા મેઈલ સૂચનો"
 
-msgid "_Copy Email Address"
-msgstr "ઈ-મેઈલ સરનામાની નકલ કરો (_C)"
-
-msgid "_Open Link in Browser"
-msgstr "કડી બ્રાઉઝરમાં ખોલો (_O)"
-
-msgid "_Copy Link Location"
-msgstr "કડી સ્થાનની નકલ કરો (_C)"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12289,11 +12387,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "ચિત્ર સંગ્રહો"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "ચિત્ર સંગ્રહો (_S)..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12383,10 +12479,6 @@ msgid "Font Face"
 msgstr "ફોન્ટ ફેસ"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "પાશ્વ ભાગનો રંગ"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "ફોન્ટનો અગ્ર ભાગનો રંગ"
 
@@ -12520,6 +12612,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12548,6 +12641,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12590,16 +12684,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "પેજીંગ"
 
-#, fuzzy
-msgid "Open All Messages"
-msgstr "સંદેશો મોકલો"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
 
 #, fuzzy
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "Calling..."
+msgstr "ગણી રહ્યા છીએ..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">તમારી પાસે મેઈલ છે!</span>\n"
-"\n"
-"%s"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12628,6 +12733,35 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'Manual' બ્રાઉઝર આદેશ પસંદ થયેલ છે, પરંતુ કોઈ આદેશ સુયોજિત થયેલ નથી."
 
+#, fuzzy
+msgid "No message"
+msgstr "(૧ સંદેશો)"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "સંદેશો મોકલો"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">તમારી પાસે મેઈલ છે!</span>\n"
+"\n"
+"%s"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "નવી વ્યક્તિની જાણકારી"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">તમારી પાસે મેઈલ છે!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12681,11 +12815,18 @@ msgstr ""
 msgid "Select a file"
 msgstr "ફાઈલ પસંદ કરો"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "વ્યક્તિમાં ફેરફાર કરો"
+
 #. Create the "Pounce on Whom" frame.
 #, fuzzy
 msgid "Pounce on Whom"
 msgstr "પાઉન્સ કોણ"
 
+msgid "_Account:"
+msgstr "ખાતું (_A):"
+
 msgid "_Buddy name:"
 msgstr "વ્યક્તિ નામ (_B):"
 
@@ -12766,7 +12907,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr "પાઉન્સ જ્યારે"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "વ્યક્તિ લખવાનું શરુ કરે છે (_t)"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "વપરાશકર્તા એ લખી રહ્યું છે..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "પ્રવેશ કરો (_g)"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "નિષ્ક્રિયમાંથી પાછા આવો (_n)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "દૂરથી પાછા આવો (_R)"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "ટાઇપિંગ"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "પ્રવેશ બહાર નીકળો (_o)"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s નિષ્ક્રિય બની ગયો"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "જ્યારે દૂર જાવ"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "સંદેશો મોકલો (_m)"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "અજ્ઞાત પાઉન્સ ઘટના. મહેરબાની કરીને આનો અહેવાલ આપો!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "ચિત્ર લાવવામાં નિષ્ફળ"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12790,6 +12982,12 @@ msgstr "ટુંકાણો"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "%s સાથે વાર્તાલાપ"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "વ્યક્તિ યાદી"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "સિસ્ટમ ટ્રે ચિહ્ન"
 
@@ -12802,7 +13000,7 @@ msgid "On unread messages"
 msgstr "સંદેશો મોકલો (_m)"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM વાર્તાલાપ વિન્ડો"
 
 #, fuzzy
@@ -12812,6 +13010,10 @@ msgstr "નવાં વાર્તાલાપો (_e):"
 msgid "When away"
 msgstr "જ્યારે દૂર જાવ"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "વાર્તાલાપ વિન્ડો ઉપર લાવો (_a)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12873,10 +13075,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "જ્યારે સંદેશાઓ મેળવાય ત્યારે વિન્ડો ફ્લેશ કરો (_F)"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "વાર્તાલાપ વિન્ડો ઉપર લાવો (_a)"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12911,15 +13109,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "વપરાશકર્તા જાણકારી મેળવી શકતા નથી"
 
-#, fuzzy
-msgid "ST_UN server:"
-msgstr "STUN સર્વર :"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "આપોઆપ શોધાયેલ IP સરનામું (_A)"
 
 msgid "Public _IP:"
@@ -12942,6 +13136,10 @@ msgstr "શરૂઆતનો પોર્ટ (_S):"
 msgid "_End port:"
 msgstr "અંતિમ પોર્ટ (_E):"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "પ્રોક્સી સર્વર"
@@ -12971,6 +13169,10 @@ msgstr "પ્રોક્સી સર્વર"
 msgid "No proxy"
 msgstr "કોઈ પ્રોક્સી નથી"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "વપરાશકર્તા (_U):"
 
@@ -13136,13 +13338,13 @@ msgstr "જ્યારે દૂર જાવ અને નિષ્ક્ર�
 msgid "Auto-away"
 msgstr "આપોઆપ-દૂર"
 
-msgid "Change status when _idle"
-msgstr "જ્યારે નિષ્ક્રિય હોય ત્યારે દૂર સુયોજિત કરો (_i)"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "સુયોજિત કરવા પહેલાંની મિનિટો (_M):"
 
+msgid "Change status when _idle"
+msgstr "જ્યારે નિષ્ક્રિય હોય ત્યારે દૂર સુયોજિત કરો (_i)"
+
 msgid "Change _status to:"
 msgstr "સ્થિતિને આમાં બદલો (_s):"
 
@@ -13299,29 +13501,19 @@ msgstr "સંગ્રહો & વાપરો (_v)"
 msgid "Status for %s"
 msgstr "સ્થિતિ: %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "સ્મિત ઉમેરો"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "નકલી ખરૂ"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "સ્મિત ઉમેરો"
@@ -13331,21 +13523,29 @@ msgid "Add Smiley"
 msgstr "હસો!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "ચિત્ર સંગ્રહો"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "ટુંકાણો"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "હસો!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "ટુંકાણો"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "વ્યક્તિ પસંદ કરો"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13433,9 +13633,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "ચલાવનાર મોકલી શકતા નથી"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -13472,6 +13673,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "કડી આમાં ખોલો (_O):"
+
+msgid "_Copy Link Location"
+msgstr "કડી સ્થાનની નકલ કરો (_C)"
+
+msgid "_Copy Email Address"
+msgstr "ઈ-મેઈલ સરનામાની નકલ કરો (_C)"
+
+#, fuzzy
 msgid "Save File"
 msgstr "ફાઈલ સંગ્રહો..."
 
@@ -13575,6 +13786,78 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "સર્વર સરનામું"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "કોન્ફરન્સ સર્વર દાખલ કરો"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "પ્રશ્ન પૂછવા માટે કોન્ફરન્સ સર્વર પસંદ કરો"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "ઓનલાઈન સેવાઓ"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "વ્યક્તિ યાદી મોકલો"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "જ્યારે દૂર જાવ"
+
+#, fuzzy
+msgid "Directory"
+msgstr "ડિરેક્ટરી શોધો"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "ધ્વનિ પસંદગી"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>વર્ણન:</b> ભૂતિયાળ"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "ડિરેક્ટરી જાણકારી સુયોજિત કરો"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "બ્રાઉઝર (_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "વપરાશકર્તા અસ્તિત્વમાં નથી"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "સર્વર કોઈપણ આધારભૂત સત્તાધિકરણ પદ્ધતિ વાપરતું નથી"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "ડિરેક્ટરી જાણકારી સુયોજિત કરો"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "વ્યક્તિ નિષ્ક્રિય છે:"
 
@@ -13976,7 +14259,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14091,12 +14374,6 @@ msgstr ""
 "- તે બધા આવતા લખાણો ઉલટા કરે છે\n"
 "- તે તમારી યાદીમાંના લોકોને સંદેશો મોકલે છે જ્યારે તેઓ પ્રવેશ કરે"
 
-msgid "Cursor Color"
-msgstr "કર્સર રંગ"
-
-msgid "Secondary Cursor Color"
-msgstr "ગૌણ કર્સર રંગ"
-
 msgid "Hyperlink Color"
 msgstr "હાયપરલીંક રંગ"
 
@@ -14108,6 +14385,10 @@ msgstr "હાયપરલીંક રંગ"
 msgid "Highlighted Message Name Color"
 msgstr "જોડી પ્રકાશિત"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "સૂચન દૂર કરવાનું"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14137,37 +14418,25 @@ msgstr "GTK+ ઈન્ટરફેસ ફોન્ટ"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ લખાણ ટુંકાણ થીમ"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "રંગો અવગણો (_o)"
+msgid "Disable Typing Notification Text"
+msgstr "નવા મેઈલ સૂચનો"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ થીમ નિયંત્રણ"
+
+#, fuzzy
+msgid "Colors"
+msgstr "બંધ કરો"
 
 #, fuzzy
 msgid "Fonts"
 msgstr "ખાતાઓ"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin ફાઈલ નિયંત્રણ"
@@ -14257,7 +14526,7 @@ msgstr "IM વાર્તાલાપ વિન્ડો"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14310,6 +14579,113 @@ msgstr "લખાણ બદલી"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "આઉટગોઈંગ સંદેશાઓમાં વપરાશકર્તા-વ્યાખ્યાયિત નિયમો અનુસાર લખાણ બદલે છે."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "પ્રવેશેલ નથી"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s બહાર નીકળી ગયો."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "સંવાદમાં જોડાવ"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "અવગણો"
+
+#, fuzzy
+msgid "Founder"
+msgstr "કલાક"
+
+#, fuzzy
+msgid "Operator"
+msgstr "ઓપેરા"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "સત્તાધિકરણ અપાયેલ"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "ક્ષતિ"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "જાણકારી"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "વિનંતી સંવાદ"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "ચેતવણી સ્તર"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "સ્થિતિ: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "સંવાદ કક્ષ લોકેલ"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "ચિહ્ન સંગ્રહો"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ થીમ નિયંત્રણ"
+
+#, fuzzy
+msgid "Contact"
+msgstr "ખાતા જાણકારી"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "વ્યક્તિ યાદી"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "વ્યક્તિ યાદી"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ થીમ નિયંત્રણ"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ થીમ નિયંત્રણ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14476,10 +14852,6 @@ msgid "Only when docked"
 msgstr "ફક્ત જ્યારે નીચું હોય"
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "જ્યારે સંદેશાઓ મેળવાય ત્યારે વિન્ડો ફ્લેશ કરો (_F)"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "પ્રવેશ વિકલ્પો"
 
@@ -14489,7 +14861,7 @@ msgstr "વિન્ડોઝ Pidgin માટે વિશિષ્ટ વિ�
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Provides options specific to Windows Pidgin, such as buddy list docking and "
 "conversation flashing."
@@ -14534,6 +14906,519 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "સોકેટ ખોલવામાં અસમર્થ"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "સોકેટ વાંચવામાં અસમર્થ"
+
+#~ msgid "Connection failed."
+#~ msgstr "જોડાણ નિષ્ફળ."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "સર્વરે જોડાણ તોડી નાંખ્યું"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "સોકેટ બનાવી શક્યા નહિં"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
+
+#~ msgid "Read error"
+#~ msgstr "વાંચન ક્ષતિ"
+
+#~ msgid "Write error"
+#~ msgstr "લખવામાં ક્ષતિ"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "ડિરેક્ટરી જાણકારી સુયોજિત કરો"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "વિસ્તૃત સરનામું"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "ઉપનામ સંવાદ"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "વપરાશકર્તા પાસે કોઈ ડિરેક્ટરી જાણકારી નથી."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "આદેશ"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "રજીસ્ટ્રેશન ક્ષતિ"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "સ્થળ"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "વ્યક્તિ સ્થિતિ સૂચન"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "બિનઆધારભૂત આવૃત્તિ"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "દિશા"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "વપરાશકર્તા સ્થિતિઓ"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "વપરાશકર્તા મર્યાદા"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "ક્ષમતાઓ"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "વપરાશકર્તા નામ"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "કી ફેરબદલી સાથે IM"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ઈમેઈલ સરનામું"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "રૂપરેખા સુયોજિત કરો"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "લાડકું નામ"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "જીવંત વીડિયો"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "સંદેશો મળ્યો"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "જાહેર કી બેબલપ્રિન્ટ"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "વપરાશકર્તા વિકલ્પો"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "વપરાશકર્તા સ્થિતિઓ"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "વપરાશકર્તા મર્યાદા"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "વપરાશકર્તા મર્યાદા"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ટ્રીલીયન એનક્રિપ્શન"
+
+#~ msgid "Read Error"
+#~ msgstr "વાંચવામાં ક્ષતિ"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "કતાર ભરેલી છે"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "સંદેશાનું પદચ્છેદન કરવામાં અસમર્થ"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "પ્રવેશ નિષ્ફળ (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "તમે પ્રવેશ બહાર નીકળી ગયા છો કારણ કે તમે બીજા વર્કસ્ટેશનમાં પ્રવેશ કરેલ છે."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "ક્ષતિ. SSL આધાર સ્થાપિત થયેલ નથી."
+
+#~ msgid "Incorrect password."
+#~ msgstr "અયોગ્ય પાસવર્ડ."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "તમે ટુંકમાં જ જોડાણ છોજી દેશો.  તમે TOC વાપરવાની ઈચ્છા રાખશો જ્યાં સુધી આ ચોક્કસ નહિં "
+#~ "થઈ જાય.  સુધારાઓ માટે %s ને ચકાસો."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "જોડાઈ શક્યા નહિં"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "અયોગ્ય વપરાશકર્તા નામ"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "સર્વર જાણકારી મેળવી શકતા નથી"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "જોડાણ બંધ થઈ ગયું"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "જોડાણ બંધ થઈ ગયું"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "જોડાણ બંધ થઈ ગયું"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "સોકેટમાંથી વાંચતી વખતે ક્ષતિ."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "મોકલી શક્યા નહિં"
+
+#~ msgid "Could not connect"
+#~ msgstr "જોડાઈ શક્યા નહિં"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "યજમાનનામો ઉકેલવામાં અસમર્થ."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "અયોગ્ય પાસવર્ડ."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo જાપાન"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "જાપાન Pager યજમાન"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "જાપાન ફાઈલ પરિવહન યજમાન"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "સર્વર સાથે જોડાણથયેલ નથી."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "યજમાનનામો ઉકેલવામાં અસમર્થ."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "પ્રવેશ માટે સર્વરને TLS/SSL જરૂરી છે.  કોઈ TLS/SSL આધાર મળ્યો નહિં."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM વાર્તાલાપ વિન્ડો"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "કયું ID સક્રિય કરવું છે?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "કર્સર રંગ"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "ગૌણ કર્સર રંગ"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "રંગો અવગણો (_o)"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "બહાર નીકળવાનો સંદેશો"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "મહેરબાની કરીને તમે જે વપરાશકર્તાને આમંત્રિત કરવા માંગો તેનું નામ, વૈકલ્પિક આમંત્રણ સંદેશા "
+#~ "સાથે દાખલ કરો."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "વ્યક્તિ યાદી મેળવવામાં અસમર્થ"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "તમે ટુંકમાં જ જોડાણ છોજી દેશો.  તમે TOC વાપરવાની ઈચ્છા રાખશો જ્યાં સુધી આ ચોક્કસ નહિં "
+#~ "થઈ જાય.  સુધારાઓ માટે %s ને ચકાસો."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "વ્યક્તિ ઉમેરો"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "સર્વર જાણકારી મેળવી શકતા નથી"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "વાંચવામાં ક્ષતિ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "સર્વર સાથે જોડાણથયેલ નથી."
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "સર્વર જોડો"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "સંવાદમાં જોડાવામાં નિષ્ફળ"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s જોઈ રહ્યા છીએ"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s સાથે જોડાવામાં નિષ્ફળ"
+
+#~ msgid "Signon: %s"
+#~ msgstr "પ્રવેશ કરો: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "ફાઈલ %s લખવામાં અસમર્થ."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "ફાઈલ %s વાંચવામાં અસમર્થ."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "સંદેશો ખૂબ લાંબો છે, છેલ્લા %s બાઈટો બગડી ગયેલ છે."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s વર્તમાનમાં પ્રવેશેલ નથી."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s ની ચેતવણી માન્ય નથી."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "સંદેશો છોડી મૂકાયેલ છે, તમે સર્વર ઝડપ મર્યાદા ઓળંગી ગયા છે."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%s માં સંવાદ ઉપલબ્ધ નથી."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "તમે સંદેશાઓ ખૂબ ઝડપથી %s ને મોકલી રહ્યા છો."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "તમે IM ને %s માંથી રહી ગયા કારણ કે તે ખૂબ મોટું હતું."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "તમે IM ને %s માંથી મેળવવામાં રહી ગયા કારણ કે તે ખૂબ ઝડપથી મોકલાયું હતું."
+
+#~ msgid "Failure."
+#~ msgstr "નિષ્ફળતા."
+
+#~ msgid "Too many matches."
+#~ msgstr "ઘણી બધી જોડણીઓ."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "વધુ ચકાસણીઓની જરૂર છે."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "ડિરેક્ટરી સેવા કામચલાઉ રીતે ઉપલબ્ધ નથી."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "ઈ-મેઈલ જોવાનું પ્રતિબંધિત છે."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "મુખ્ય શબ્દ અવગણાયેલ છે."
+
+#~ msgid "No keywords."
+#~ msgstr "કોઈ મુખ્ય શબ્દો નથી."
+
+#~ msgid "User has no directory information."
+#~ msgstr "વપરાશકર્તા પાસે કોઈ ડિરેક્ટરી જાણકારી નથી."
+
+#~ msgid "Country not supported."
+#~ msgstr "દેશ આધારભૂત નથી."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "નિષ્ફળતા અજ્ઞાત: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "અયોગ્ય નામ અથવા પાસવર્ડ."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "સેવા ક્ષણવાર માટે ઉપલબ્ધ નથી."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "તમારું ચેતવણી સ્તર વર્તમાનમાં પ્રવેશ માટે ખૂબ ઊંચું છે."
+
+#~ 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 ""
+#~ "તમે ખૂબ ઝડપથી જોડાણ કરી રહ્યા છો અને તોડી રહ્યા છો.  દસ મિનિટો રાહ જુઓ અને ફરીથી "
+#~ "પ્રયત્ન કરો.  જો તમે પ્રયાસ કરવાનું ચાલુ રાખો, તો તમારે વધુ લાંબા સમય સુધી રાહ જોવી "
+#~ "પડશે."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "એક અજ્ઞાત પ્રવેશ ક્ષતિ ઉદ્દભવી: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "એક અજ્ઞાત ક્ષતિ, %d, ઉદ્દભવી.  જાણકારી: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "અયોગ્ય જૂથનામ"
+
+#~ msgid "Connection Closed"
+#~ msgstr "જોડાણ બંધ થઈ ગયું"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "પ્રત્યુત્તર માટે રાહ જોઈ રહ્યા છીએ..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "TOC એ તેની અટકાવો સ્થિતિમાંથી પાછું આવી ગયું છે. તમે હવે ફરીથી સંદેશાઓ મોકલી શકશો."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ ગયો"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "ડિરેક્ટરી જાણ મેળવો"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "ડિરેક્ટરી જાણકારી સુયોજિત કરો"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "%s ને લખવા માટે ખોલી શક્યા નહિં!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "ફાઈલ પરિવહન નિષ્ફળ; અન્ય બાજુ કદાચ રદ થઈ ગયેલ હશે."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "પરિવહન માટે જોડાઈ શક્યા નહિં."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "ફાઈલ હેડરમાં લખી શક્યા નહિં.  ફાઈલ પરિવહન થશે નહિં."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "ચિહ્ન આ રીતે સંગ્રહો..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s એ %s ને %d ફાઈલ સ્વીકારવા માટે અરજી કરે છે: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s એ %s ને %d ફાઈલો સ્વીકારવા માટે અરજી કરે છે: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s તમને તેમને ફાઈલ મોકલવા માટે અરજી કરે છે"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC પ્રોટોકોલ પ્લગઈન"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%s માટે વપરાશકર્તા જાણકારી ઉપલબ્ધ નથી"
+
+#~ msgid "%s Options"
+#~ msgstr "%s વિકલ્પો"
+
+#~ msgid "Proxy Options"
+#~ msgstr "પ્રોક્સી વિકલ્પો"
+
+#~ msgid "By log size"
+#~ msgstr "લૉગ માપ પ્રમાણે"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "કડી બ્રાઉઝરમાં ખોલો (_O)"
+
+#, fuzzy
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN સર્વર :"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "ચિત્ર સંગ્રહો"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "ટુંકાણો"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "જ્યારે સંદેશાઓ મેળવાય ત્યારે વિન્ડો ફ્લેશ કરો (_F)"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "આજ નામવાળું ફોલ્ડર પહેલાથી જ હાજર છે"
 
@@ -14602,13 +15487,6 @@ msgstr ""
 #~ msgstr "શું તમે ખરેખર દૂર જવાનો સંદેશો \"%s\" દૂર કરવા માંગો છો?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s એ %s (%s) પર"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "સંદેશો મોકલો"
 
@@ -14748,9 +15626,6 @@ msgstr ""
 #~ msgid "Invalid screen name"
 #~ msgstr "અયોગ્ય વપરાશકર્તા નામ"
 
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "ખૂબ ખરાબ (મોકલનાર)"
 
@@ -14809,10 +15684,6 @@ msgstr ""
 #~ msgstr "%s પરના વપરાશકર્તાઓ: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "શું તમે આ વ્યક્તિને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માંગો છો?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "ફાઈલ પ્રક્રિયા ક્ષતિ"
 
@@ -14821,10 +15692,6 @@ msgstr ""
 #~ msgstr "હાલનું ટોકન દાખલ કરો"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "જોડાણ બનાવવામાં ક્ષતિ"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "AIM માં પ્રવેશ કરવામાં અસમર્થ"
 
@@ -14951,17 +15818,9 @@ msgstr ""
 #~ msgstr "હાલનું ટોકન"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "સંદેશો (_M):"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "ખાતું:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "જોડાણ તોડી નાંખેલ ક્ષતિઓ છુપાવો"
 
@@ -15003,10 +15862,11 @@ msgstr ""
 #~ "functions, and to toggle display of the buddy list or login window. Also "
 #~ "allows messages to be queued until the icon is clicked, similar to ICQ."
 #~ msgstr ""
-#~ "Pidgin ની વર્તમાન પરિસ્થિતિ બતાવવા માટે સિસ્ટમ ટ્રે ચિહ્ન (ઉદાહરણ તરીકે GNOME, KDE "
-#~ "અથવા Windows માં) દર્શાવે છે, સામાન્ય રીતે વપરાતા વિધેયો વાપરવા માટે ઝડપી વપરાશની "
-#~ "પરવાનગી આપે છે, અને વ્યક્તિ યાદી અથવા પ્રવેશ વિન્ડોનું દ્રશ્ય બદલે છે. સંદેશાઓને જ્યાં સુધી "
-#~ "ચિહ્ન ક્લિક નહિં થાય ત્યાં સુધી કતારમાં રાખવા માટે પરવાનગી પણ આપે છે, ICQ ની જેમ જ."
+#~ "Pidgin ની વર્તમાન પરિસ્થિતિ બતાવવા માટે સિસ્ટમ ટ્રે ચિહ્ન (ઉદાહરણ તરીકે GNOME, "
+#~ "KDE અથવા Windows માં) દર્શાવે છે, સામાન્ય રીતે વપરાતા વિધેયો વાપરવા માટે ઝડપી "
+#~ "વપરાશની પરવાનગી આપે છે, અને વ્યક્તિ યાદી અથવા પ્રવેશ વિન્ડોનું દ્રશ્ય બદલે છે. સંદેશાઓને "
+#~ "જ્યાં સુધી ચિહ્ન ક્લિક નહિં થાય ત્યાં સુધી કતારમાં રાખવા માટે પરવાનગી પણ આપે છે, ICQ "
+#~ "ની જેમ જ."
 
 #~ msgid "GtkTreeView Expander Size"
 #~ msgstr "GtkTreeView વિસ્તારક માપ"
@@ -15128,13 +15988,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>વર્ણન:</b> ભૂતિયાળ"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15226,9 +16079,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "નિષ્ક્રિય (_I)"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "નિષ્ક્રિયમાંથી પાછા આવો (_n)"
-
 #~ msgid "Pounce Action"
 #~ msgstr "પાઉન્સ ક્રિયા"
 
@@ -15543,8 +16393,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "જ્યારે આ થાય છે, ત્યારે TOC તેને મોકલાયેલ કોઈપણ સંદેશાઓ અવગણે છે, અને તે તમને લાત મારી "
 #~ "દેશે જો તમે સંદેશો મોકલો. Pidgin કંઈમાં પણ જવાથી બચાવશે. આ માત્ર કામચલાઉ જ છે, "
@@ -15562,13 +16412,13 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "સામાન્ય સત્તાધિકરણ પદ્ધતિ નિષ્ફળ ગઈ છે. આનો અર્થ એ થાય કે ક્યાં તો તમારો પાસવર્ડ "
-#~ "અયોગ્ય છે, અથવા Yahoo! ની સત્તાધિકરણ પદ્ધતિ બદલાઈ ગયેલ છે. Pidgin હવે વેબ સંદેશાવાહક "
-#~ "સત્તાધિકરણ પદ્ધતિની મદદથી પ્રવેશ કરવાનું શરૂ કરશે, કે જે ઘટાડાયેલ વિધેયો અને લક્ષણોમાં "
-#~ "પરિણમશે."
+#~ "અયોગ્ય છે, અથવા Yahoo! ની સત્તાધિકરણ પદ્ધતિ બદલાઈ ગયેલ છે. Pidgin હવે વેબ "
+#~ "સંદેશાવાહક સત્તાધિકરણ પદ્ધતિની મદદથી પ્રવેશ કરવાનું શરૂ કરશે, કે જે ઘટાડાયેલ વિધેયો અને "
+#~ "લક્ષણોમાં પરિણમશે."
 
 #~ msgid "Unable to read"
 #~ msgstr "વાંચવામાં અસમર્થ"
@@ -15590,9 +16440,6 @@ msgstr ""
 #~ msgstr[0] "(%d સંદેશો)"
 #~ msgstr[1] "(%d સંદેશાઓ)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(૧ સંદેશો)"
-
 #~ msgid "Default auto-away"
 #~ msgstr "મૂળભુત આપોઆપ-દૂર"
 
@@ -15697,9 +16544,6 @@ msgstr ""
 #~ msgid "Away title: "
 #~ msgstr "દૂર જવાનું શીર્ષક: "
 
-#~ msgid "Buddy List Error"
-#~ msgstr "વ્યક્તિ યાદી ક્ષતિ"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "વિસ્તારક તીરનું માપ"
 
@@ -15827,9 +16671,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "પસંદ કરેલ વ્યક્તિને સંદેશો મોકલો"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
-
 #~ msgid "_Chat"
 #~ msgstr "સંવાદ (_C)"
 
@@ -16036,9 +16877,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "સાર"
 
-#~ msgid "Message Text"
-#~ msgstr "સંદેશા લખાણ"
-
 #~ msgid "Away Messages"
 #~ msgstr "દૂર સંદેશાઓ"
 
@@ -16094,12 +16932,12 @@ msgstr ""
 #~ msgstr "પસંદગીઓ લાવવામાં અસમર્થ"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
-#~ "Pidgin તમારી પસંદગીઓ લાવવામાં સમર્થ હતું નહિં કારણ કે તેઓ જૂના બંધારણમાં સંગ્રહાયેલ હતા કે "
-#~ "જેઓ લાંબા સમય સુધી વાપરવાના નથી.  મહેરબાની કરીને પસંદગીઓ વિન્ડોની મદદથી તમારા "
+#~ "Pidgin તમારી પસંદગીઓ લાવવામાં સમર્થ હતું નહિં કારણ કે તેઓ જૂના બંધારણમાં સંગ્રહાયેલ હતા "
+#~ "કે જેઓ લાંબા સમય સુધી વાપરવાના નથી.  મહેરબાની કરીને પસંદગીઓ વિન્ડોની મદદથી તમારા "
 #~ "સુયોજનો પુનઃરૂપરેખાંકિત કરો."
 
 #~ msgid "Slightly less boring default"
@@ -16135,9 +16973,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "GG લાઈબ્રેરીમાં જટિલ ક્ષતિ\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "સર્વરને પીંગ કરવામાં અસમર્થ"
-
 #~ msgid "Send as message"
 #~ msgstr "સંદેશા તરીકે મોકલો"
 
@@ -16205,18 +17040,18 @@ msgstr ""
 #~ msgstr "ડિરેક્ટરી વાપરવામાં અસમર્થ"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin ડિરેક્ટરી શોધવા માટે અસમર્થ હતું કારણ કે તે ડિરેક્ટરી સર્વર સાથે જોડાવા માટે "
 #~ "અસમર્થ હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin એ Gadu-Gadu સર્વર સાથે જોડાવામાં ક્ષતિને કારણે તમારો પાસવર્ડ બદલવામાં અસમર્થ "
-#~ "હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
+#~ "Pidgin એ Gadu-Gadu સર્વર સાથે જોડાવામાં ક્ષતિને કારણે તમારો પાસવર્ડ બદલવામાં "
+#~ "અસમર્થ હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
 
 #~ msgid "Directory Search"
 #~ msgstr "ડિરેક્ટરી શોધ"
@@ -16225,8 +17060,8 @@ msgstr ""
 #~ msgstr "વપરાશકર્તા રૂપરેખા વાપરવામાં અસમર્થ."
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin ડિરેક્ટરી સર્વર સાથે જોડાવામાં ક્ષતિને કારણે વપરાશકર્તાની રૂપરેખા વાપરવામાં "
 #~ "અસમર્થ હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
@@ -16339,9 +17174,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s પ્રવેશેલ છે."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s બહાર નીકળી ગયો."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -16358,6 +17190,3 @@ msgstr ""
 #~ msgstr ""
 #~ "%s એ %s ને સંવાદ કક્ષ %s માં આમંત્રિત કર્યો છે:\n"
 #~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "માફ કરજો, હું થોડા સમય માટે ચાલી ગયો હતો!"
diff --git a/po/he.po b/po/he.po
index 312e10eddd..adadd759dd 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,5 +1,5 @@
 # Pidgin Hebrew translation
-# Copyright (C) 2005-2007, Shalom Craimer <scraimer at gmail dot com>
+# Copyright (C) 2005-2009, Shalom Craimer <scraimer at gmail dot com>
 # Copyright (C) 2003, Pavel Bibergal cyberkm@barak-online.net
 #
 # This file is distributed under the same license as the Pidgin package.
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
-"PO-Revision-Date: 2008-08-27 21:03+0200\n"
+"POT-Creation-Date: 2009-08-15 09:57-0400\n"
+"PO-Revision-Date: 2009-08-16 08:51+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -41,19 +41,14 @@ msgstr ""
 "שימוש: %s [אפשרות]...\n"
 "\n"
 "  -c, --config=ספריה  השתמש בספרייה לקבצי הגדרות\n"
-"  -d, --debug         שלח הודעות ניפוי באגים ל-stdout\n"
+"  -d, --debug         שלח הודעות ניפוי באגים ל-stderr\n"
 "  -h, --help          הצג הודעה זו וצא\n"
 "  -n, --nologin       אל תתחבר אוטומטית\n"
 "  -v, --version       הצג את הגירסא של התוכנה וצא\n"
 
 #, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr ""
-"%s נתקל בשגיאות בעת המרת הגדרותיך מ- %s ל- %s. יש לחקור את העניין, ולסיים את "
-"ההעברה ידנית. נשמח אם באפשורתך לדווח על תקלה זו ב- http://developer.pidgin.im"
+msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
+msgstr "%s נתקל בשגיאות בעת המרת הגדרותיך מ- %s ל- %s. יש לחקור את העניין, ולסיים את ההעברה ידנית. נשמח אם באפשורתך לדווח על תקלה זו ב- http://developer.pidgin.im"
 
 msgid "Error"
 msgstr "שגיאה"
@@ -70,7 +65,6 @@ msgstr "הודעה על דואר חדש"
 msgid "Remember password"
 msgstr "זכור סיסמה"
 
-#, fuzzy
 msgid "There are no protocol plugins installed."
 msgstr "לא מותקנים תוספים לפרוטוקולים."
 
@@ -350,11 +344,8 @@ msgstr "חסום"
 msgid "Unblock"
 msgstr "הסר חסימה"
 
-msgid ""
-"Please enter the username or alias of the person you would like to Block/"
-"Unblock."
-msgstr ""
-"יש להזין את שם המשתמש או הכינוי של האדם אותו ברצונך לחסום/להוציא מחסימה."
+msgid "Please enter the username or alias of the person you would like to Block/Unblock."
+msgstr "יש להזין את שם המשתמש או הכינוי של האדם אותו ברצונך לחסום/להוציא מחסימה."
 
 #. Not multiline
 #. Not masked?
@@ -380,11 +371,8 @@ msgstr "יש להזין את שם הצ'אט אליו ברצונך להצטרף."
 msgid "Join"
 msgstr "הצטרף"
 
-msgid ""
-"Please enter the username or alias of the person whose log you would like to "
-"view."
-msgstr ""
-"יש להזין את שם המשתמש או הכינוי של האדם שאת יומן-השיחות שלו ברצונך לקרוא."
+msgid "Please enter the username or alias of the person whose log you would like to view."
+msgstr "יש להזין את שם המשתמש או הכינוי של האדם שאת יומן-השיחות שלו ברצונך לקרוא."
 
 #. Create the "Options" frame.
 msgid "Options"
@@ -530,8 +518,7 @@ msgstr "%s מנותק."
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
@@ -540,12 +527,8 @@ msgstr ""
 msgid "Re-enable Account"
 msgstr "הפעל מחדש חשבון"
 
-msgid ""
-"The account has disconnected and you are no longer in this chat. You will be "
-"automatically rejoined in the chat when the account reconnects."
-msgstr ""
-"החשבון נותק וכבר אינך בצא'ט זה. החזרה לצ'אט תיעשה באופן אוטומטי ברגע שהחשבון "
-"יתחבר מחדש."
+msgid "The account has disconnected and you are no longer in this chat. You will be automatically rejoined in the chat when the account reconnects."
+msgstr "החשבון נותק וכבר אינך בצא'ט זה. החזרה לצ'אט תיעשה באופן אוטומטי ברגע שהחשבון יתחבר מחדש."
 
 msgid "No such command."
 msgstr "אין פקודה כזו."
@@ -590,26 +573,12 @@ msgstr "עזבת את הצ'אט הזה."
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "רישום הוחל. הודעות בשיחה זו יירשמו מעתה."
 
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
+msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "רישום הופסק. הודעות בשיחה זו לא יירשמו מעתה."
 
 msgid "Send To"
 msgstr "שלח אל"
 
-msgid "Invite message"
-msgstr "הודעת הזמנה"
-
-msgid "Invite"
-msgstr "הזמן"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"יש להזין את שם המשתמש שברצונך להזמין,\n"
-"יחד עם הודעת הזמנה אופציונלית."
-
 msgid "Conversation"
 msgstr "שיחה"
 
@@ -654,28 +623,20 @@ msgstr ""
 "להלן הפקודות שאפשריים בהקשר הנוכחי:\n"
 
 #, c-format
-msgid ""
-"%s is not a valid message class. See '/help msgcolor' for valid message "
-"classes."
-msgstr ""
-"%s אינו מחלקת מסרים תקפה. יש לראות את המידע בתוך '/help msgcolor' לרשימה של "
-"מחלקות-מסרים תקפות."
+msgid "%s is not a valid message class. See '/help msgcolor' for valid message classes."
+msgstr "%s אינו מחלקת מסרים תקפה. יש לראות את המידע בתוך '/help msgcolor' לרשימה של מחלקות-מסרים תקפות."
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr "%s אינו צבע תקף. יש לראות את '/help msgcolor' לצבעים תקפים."
 
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;message&gt;:  שלח הודעה כרגיל, כאילו לא דרך פקודה."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  שלח למשתמש או צ'אט פעולה נוסח IRC."
 
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "debug &lt;option&gt;:  שלח כל מיני רסיסי מידע לחלון שיחה הנוכחי."
 
 msgid "clear: Clears the conversation scrollback."
@@ -705,18 +666,8 @@ msgstr "prefs: הצג את חלון ההעדפות."
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: הצג את חלון המצבים-השמורים."
 
-msgid ""
-"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
-"for different classes of messages in the conversation window.<br>    &lt;"
-"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
-"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
-"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
-msgstr ""
-"msgcolor &lt;מחלקה&gt; &lt;צבע-תוכן&gt; &lt;רקע&gt;: קבע צבע עבור מחלקות "
-"שונות של הודעות בחלון השיחה.<br>    &lt;מחלקה&gt;: receive, send, highlight, "
-"action, timestamp<br>    &lt;צבע-תוכן/רקע&gt;: black, red, green, blue, "
-"white, gray, darkgray, magenta, cyan, default<br><br>לדוגמא:<br>    msgcolor "
-"send cyan default"
+msgid "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color for different classes of messages in the conversation window.<br>    &lt;class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/background&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr "msgcolor &lt;מחלקה&gt; &lt;צבע-תוכן&gt; &lt;רקע&gt;: קבע צבע עבור מחלקות שונות של הודעות בחלון השיחה.<br>    &lt;מחלקה&gt;: receive, send, highlight, action, timestamp<br>    &lt;צבע-תוכן/רקע&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>לדוגמא:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
 msgstr "אין אפשרות לפתוח את הקובץ."
@@ -818,18 +769,13 @@ msgstr "שיחות עם %s בתאריך %s"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
 msgstr "אירועי מערכת רק יירשמו אם סומן \"רשום כל שינויי סטטוס ליומן המערכת\"."
 
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
 msgstr "הודעות רק יירשמו אם סומן \"רשום את כל ההודעות\"."
 
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "צ'אטים רק יירשמו אם סומן \"רשום את כל הצ'אטים\"."
 
 msgid "No logs were found"
@@ -856,6 +802,39 @@ msgstr "כל השיחות"
 msgid "System Log"
 msgstr "דו\"ח מערכת"
 
+msgid "Calling ... "
+msgstr "מתקשר ..."
+
+msgid "Hangup"
+msgstr "התנתק"
+
+#. Number of actions
+msgid "Accept"
+msgstr "אשר"
+
+msgid "Reject"
+msgstr "דחה"
+
+msgid "Call in progress."
+msgstr "באמצע שיחה."
+
+msgid "The call has been terminated."
+msgstr "השיחה נותקה."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "נתקבלה בקשה מאת %s לבצע התקשרות קולית."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "נקבלה בקשה מאת %s לביצוע התקשרות שאינה נתמכת."
+
+msgid "You have rejected the call."
+msgstr "דחית את השיחה."
+
+msgid "call: Make an audio call."
+msgstr "call: בצע התקשרות קולית."
+
 msgid "Emails"
 msgstr "דוא\"ל"
 
@@ -890,6 +869,9 @@ msgstr "המשך"
 msgid "IM"
 msgstr "הודעה"
 
+msgid "Invite"
+msgstr "הזמן"
+
 msgid "(none)"
 msgstr "(ללא)"
 
@@ -933,11 +915,8 @@ msgstr "שגיאה בטעינת תוסף"
 msgid "The selected file is not a valid plugin."
 msgstr "הקובץ שנבחר אינו תוסף."
 
-msgid ""
-"Please open the debug window and try again to see the exact error message."
-msgstr ""
-"יש לפתוח את חלון ניפוי הבאגים ולנסות שוב על מנת לראות את הודעת השגיאה "
-"המדוייקת."
+msgid "Please open the debug window and try again to see the exact error message."
+msgstr "יש לפתוח את חלון ניפוי הבאגים ולנסות שוב על מנת לראות את הודעת השגיאה המדוייקת."
 
 msgid "Select plugin to install"
 msgstr "יש לבחור תוסף להתקין"
@@ -1093,7 +1072,6 @@ msgstr "%s התרחק/ה מהמחשב. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s שלך לך הודעה. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "אירעה פעילות לא מוכרת. אנא דווח על כך!"
 
@@ -1139,7 +1117,6 @@ msgstr "דקות לפני שינוי מצב"
 msgid "Change status to"
 msgstr "שנה מצב להיות"
 
-#. Conversations
 msgid "Conversations"
 msgstr "שיחות"
 
@@ -1375,9 +1352,7 @@ msgstr "GntClipboard"
 msgid "Clipboard plugin"
 msgstr "תוסף לוח ההעתקה"
 
-msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
+msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
 msgstr "כאשר תוכן לוח ההעתקה של gnt משתנה, התוכן גם נעשה זמין עבור X, אם ניתן."
 
 #, c-format
@@ -1437,8 +1412,7 @@ msgstr "תוסף ההיסטוריה דורש רישום יומנים"
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
 "ניתן לאפשר רישום מתוך כלים -> העדפות -> רישום.\n"
 "\n"
@@ -1450,12 +1424,9 @@ msgstr "GntHistory"
 msgid "Shows recently logged conversations in new conversations."
 msgstr "מציג שיחות אחרונות בחלונות שיחה חדשות."
 
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
 msgstr "כאשר חלון שיחה חדש נפתח, תוסף זה יכניס את השיחה האחרונה לראש החלון."
 
-#, c-format
 msgid "Online"
 msgstr "מחובר"
 
@@ -1478,10 +1449,10 @@ msgid "No Grouping"
 msgstr "ללא קיבוץ"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "קבוצה בתוך קבוצה"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "קבוצות בתוך קבוצות (נסיוני)"
 
 msgid "Provides alternate buddylist grouping options."
 msgstr "מאפשר אפשרויות נוספות לחלוקת רשימת אנשי הקשר לקבוצות."
@@ -1499,6 +1470,29 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "תוסף Lastlog."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"מביא TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "רק ייצר TinyURL עבור כתובות באורך הזה ומעלה"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "ראשית כתובת עבור TinyURL (או אחר)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "תוסף TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "בעת קבלת הודעה עם כתובת, השתמש ב-TinyURL להעתקה קלה יותר"
+
 msgid "accounts"
 msgstr "חשבונות"
 
@@ -1599,75 +1593,61 @@ msgstr "לקבל תעודה עבור %s?"
 msgid "SSL Certificate Verification"
 msgstr "וידוא תעודת SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "אשר"
-
-msgid "Reject"
-msgstr "דחה"
-
 msgid "_View Certificate..."
 msgstr "הצג תעודה..."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"התעודה שהוצגה על ידי \"%s\" נחתמה על ידי עצמה. לא ניתן לבצע בדיקה אוטומטית."
-
 #, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "שרשרת רשויות הנפקת התעודה עבור %s אינה תקפה."
+msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
+msgstr "תעודה שהוצגה על ידי \"%s\" טוענת שהיא באה בעצם מתוך \"%s\". ייתכן וזה אומר שהשירות אליו התחברת אינו השירות שחשבת."
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "שגיאת תעודת SSL"
 
 msgid "Invalid certificate chain"
 msgstr "שרשרת תעודות לא-תקפה"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
+msgid "You have no database of root certificates, so this certificate cannot be validated."
 msgstr "אין לך מסד-נתונים של תעודות שורש, אז לא ניתן לאשרר תעודה זו."
 
+#. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
+#, c-format
+msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
+msgstr "התעודה שהוצגה על ידי \"%s\" נחתמה על ידי עצמה. לא ניתן לבצע בדיקה אוטומטית."
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "שרשרת רשויות הנפקת התעודה עבור %s אינה תקפה."
+
+#. vrq will be completed by user_auth
+msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "תעודת-השורש שלכאורה הנפיקה את התעודה אינה מוכרת לפידג'ין."
 
 #, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"שרשרת התעודות שהוצגה על ידי %s לא מכילה חתימה תקפה מרשויות ההנפקה שמהם היא "
-"טוענת שיש לה חתימה."
+msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
+msgstr "שרשרת התעודות שהוצגה על ידי %s לא מכילה חתימה תקפה מרשויות ההנפקה שמהם היא טוענת שיש לה חתימה."
 
 msgid "Invalid certificate authority signature"
 msgstr "חתימת רשות הנפקות לא תקפה"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"תעודה שהוצגה על ידי \"%s\" טוענת שהיא באה בעצם מתוך \"%s\". ייתכן וזה אומר "
-"שהשירות אליו התחברת אינו השירות שחשבת."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1703,6 +1683,8 @@ msgstr "+++ %s התחבר"
 msgid "+++ %s signed off"
 msgstr "+++ %s התנתק"
 
+#. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "שגיאה לא מוכרת"
 
@@ -1749,6 +1731,13 @@ msgstr "%s עזב את החדר"
 msgid "%s left the room (%s)."
 msgstr "%s עזב את החדר (%s)."
 
+msgid "Invite to chat"
+msgstr "הזמן לצ'אט"
+
+#. Put our happy label in it.
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgstr "יש להזין את שם המשתמש שברצונך להזמין, יחד עם הודעת הזמנה אופציונלית."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "כישלון בהשגת חיבור: %s"
@@ -1795,7 +1784,7 @@ msgstr ""
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "שירות תרגום הכתובת סיים ללא תשובה לבקשתנו"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -1880,10 +1869,13 @@ msgid "Starting transfer of %s from %s"
 msgstr "מתחיל את ההעברה של %s מ-%s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "העברה של הקובץ <A HREF=\"file://%s\">%s</A> הושלמה"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "העברה של קובץ %s הושלמה"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "הושלמה העברת הקובץ"
 
@@ -1891,7 +1883,6 @@ msgstr "הושלמה העברת הקובץ"
 msgid "You canceled the transfer of %s"
 msgstr "ביטלת את העברת %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "העברת הקובץ בוטלה"
 
@@ -1962,49 +1953,31 @@ msgstr "המטפל בכתובות \"xmpp\""
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "המטפל בכתובות \"ymsgr\""
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"aim\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"gg\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"icq\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"irc\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"msnim\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"aim\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"xmpp\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"ymsgr\"."
 
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
+msgid "True if the command used to handle this type of URL should be run in a terminal."
 msgstr "אמת אם הפקודה לטיפול בסוג זה של כתובת צריכה לרוץ בטרמינל."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2050,20 +2023,12 @@ msgid "XML"
 msgstr "XML"
 
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה "
-"אוטומטי&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה אוטומטי&gt;:</b></font> %s<br/>\n"
 
 #, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה "
-"אוטומטי&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה אוטומטי&gt;:</b></font> %s<br/>\n"
 
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>לא ניתן למצוא את נתיב הרישום!</b></font>"
@@ -2076,11 +2041,13 @@ msgstr "<font color=\"red\"><b>לא ניתן לקרוא קובץ: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <מענה-אוטומטי>: %s\n"
 
+msgid "Error creating conference."
+msgstr "שגיאה ביצירת שיחת הועידה."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "את/ה משתמש/ת ב- %s, אבל תוסף זה דורש %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "תוסף זה לא הגדיר מזהה."
 
@@ -2092,14 +2059,11 @@ msgstr "אי-התאמה במספר הקסם של התוסף %d (צריך להי�
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "אי-התאמה בגירסת ABI %d.%d.x (צריך %d.%d.x)"
 
-msgid ""
-"Plugin does not implement all required functions (list_icon, login and close)"
+msgid "Plugin does not implement all required functions (list_icon, login and close)"
 msgstr "התוסף לא מיישם את כל הפונקציות הדרושות (list_icon, login וכן close)"
 
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
 msgstr "חסר תוסף %s. מומלץ להתקין את התוסף מחדש ולנסות שנית."
 
 msgid "Unable to load the plugin"
@@ -2300,12 +2264,8 @@ msgid "Test plugin IPC support, as a client."
 msgstr "בודק תמיכה ב-IPC, כלקוח."
 
 #. *  description
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"בודק את תוסף התמיכה ב-IPC, כלקוח. זה מאתר את השרת של התוסף וקורא לפקודות "
-"הרשומות."
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "בודק את תוסף התמיכה ב-IPC, כלקוח. זה מאתר את השרת של התוסף וקורא לפקודות הרשומות."
 
 #. *< type
 #. *< ui_requirement
@@ -2354,12 +2314,8 @@ msgid "Hides extraneous join/part messages."
 msgstr "מסתיר הודעות הצטרפות/עזיבה לא נחוצות."
 
 #. *  description
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
-msgstr ""
-"תוסף זה מסתיר הודעות הצטרפות/עזיבה בחדרי-צ'אט גדולים, מלבד עבור אותם משתמשים "
-"שלוקחים חלק פעיל בשיחה."
+msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
+msgstr "תוסף זה מסתיר הודעות הצטרפות/עזיבה בחדרי-צ'אט גדולים, מלבד עבור אותם משתמשים שלוקחים חלק פעיל בשיחה."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2384,9 +2340,7 @@ msgstr "אחת או יותר מן ההודעות לא ניתנו לשליחה."
 msgid "You were disconnected from the server."
 msgstr "נותקת מהשרת."
 
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr "את/ה כרגע מנותק/ת. הודעות לא יתקבלו אלא רק בזמן שאת/ה מחובר/ת."
 
 msgid "Message could not be sent because the maximum length was exceeded."
@@ -2468,17 +2422,13 @@ msgstr "כלול יומנים של תוכנות צ'אט אחרות בצופה-ה
 
 #. * description
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
 msgstr ""
-"בעת צפייה ביומני-שיחה, תוסף זה יכלול יומנים מתוכנות צ'אט אחרות. כרגע, זה "
-"כולל Adium, MSN Messenger, Trillian.\n"
+"בעת צפייה ביומני-שיחה, תוסף זה יכלול יומנים מתוכנות צ'אט אחרות. כרגע, זה כולל Adium, MSN Messenger, aMSN, Trillian.\n"
 "\n"
-"אזהרה: תוסף זה עדיין בשלבי פיתוח מוקדמים וייתכן ויקרוס לעיתים קרובות.  יש "
-"להשתמש בו על חשבון סיכונך האישי בלבד!"
+"אזהרה: תוסף זה עדיין בשלבי פיתוח מוקדמים וייתכן ויקרוס לעיתים קרובות.  יש להשתמש בו על חשבון סיכונך האישי בלבד!"
 
 msgid "Mono Plugin Loader"
 msgstr "אשף הטענת תוספי Mono"
@@ -2510,12 +2460,8 @@ msgid "Prepends a newline to displayed message."
 msgstr "מוסיף שורה חדשה לפני הודעה מוצגת."
 
 #. *< summary
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the username in the conversation window."
-msgstr ""
-"מוסיף תו שורה חדשה לתחילת הודעות כדי ששאר ההודעה תופיע מתחת לשם המשתמש בחלון "
-"השיחה."
+msgid "Prepends a newline to messages so that the rest of the message appears below the username in the conversation window."
+msgstr "מוסיף תו שורה חדשה לתחילת הודעות כדי ששאר ההודעה תופיע מתחת לשם המשתמש בחלון השיחה."
 
 msgid "Offline Message Emulation"
 msgstr "אמולציה של הודעות לא-מקוונות"
@@ -2523,20 +2469,12 @@ msgstr "אמולציה של הודעות לא-מקוונות"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "שמור הודעות שנשלחו למשתמש לא-מחובר בתור תגובת-פעילות."
 
-msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
-"pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"שאר ההודעת יישמרו בתור תגובת-פעילות. ניתן לערוך/למחוק את התגובה מתוך חלון "
-"תגובות-הפעילות."
+msgid "The rest of the messages will be saved as pounces. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgstr "שאר ההודעת יישמרו בתור תגובת-פעילות. ניתן לערוך/למחוק את התגובה מתוך חלון תגובות-הפעילות."
 
 #, c-format
-msgid ""
-"\"%s\" is currently offline. Do you want to save the rest of the messages in "
-"a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
-"\"%s\" לא מחובר כרגע. האם ברצונך לשמור את שאר ההודעות בתגובת-פעילות על מנת "
-"שהם יישלחו אליו אוטומטים כאשר \"%s\" יתחבר מחדש?"
+msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
+msgstr "\"%s\" לא מחובר כרגע. האם ברצונך לשמור את שאר ההודעות בתגובת-פעילות על מנת שהם יישלחו אליו אוטומטים כאשר \"%s\" יתחבר מחדש?"
 
 msgid "Offline Message"
 msgstr "הודעות לא-מקוונות"
@@ -2556,6 +2494,32 @@ msgstr "שמור הודעות לא-מקוונות בתגובת-פעילות"
 msgid "Do not ask. Always save in pounce."
 msgstr "אל תשאל. תמיד שמור בתגובת פעילות."
 
+msgid "One Time Password"
+msgstr "One Time Password"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "תמיכת One Time Password"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "אכוף שימוש בסיסמאות חד-פעמיות"
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"מאפשר לך לאכוף לכל חשבון משתמש שסיסמאות שאינן נשמרות ישומשו רק לחיבור יחיד שמצליח.\n"
+"הערה: על מנת שזה יעבוד אין לשמור את סיסמת החשבון."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2577,12 +2541,8 @@ msgstr "מצב מנבא-עתידות"
 msgid "Psychic mode for incoming conversation"
 msgstr "מצב מנבא-עתידות לשיחות נכנסות"
 
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"גורם לחלונות-שיחה להופיע כבר כאשר אנשי קשר מתחילים לכתוב הודעה.  זה עובד "
-"עבור AIM, ICQ, XMPP, Sametime, Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "גורם לחלונות-שיחה להופיע כבר כאשר אנשי קשר מתחילים לכתוב הודעה.  זה עובד עבור AIM, ICQ, XMPP, Sametime, Yahoo!"
 
 msgid "You feel a disturbance in the force..."
 msgstr "אתה מרגיש הפרעה בכוח..."
@@ -2728,12 +2688,8 @@ msgstr "התרעות על מצב אנשי הקשר"
 #. *< version
 #. *  summary
 #. *  description
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"מודיע בחלון השיחה כאשר איש הקשר מתרחק מהמתחשב, עובר למצב של חוזר פעילות, או "
-"חוזר."
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "מודיע בחלון השיחה כאשר איש הקשר מתרחק מהמתחשב, עובר למצב של חוזר פעילות, או חוזר."
 
 msgid "Tcl Plugin Loader"
 msgstr "מטעין לתוספי Tcl"
@@ -2741,28 +2697,18 @@ msgstr "מטעין לתוספי Tcl"
 msgid "Provides support for loading Tcl plugins"
 msgstr "מספק תמיכה לטעינת תוספי Tcl"
 
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"לא היה ניתן לזהות ActiveTCL מתוקן. אם ברצונך להשתמש בתוספי TCL, יש להתקין "
-"ActiveTCL מתוך http://www.activestate.com\n"
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "לא היה ניתן לזהות ActiveTCL מתוקן. אם ברצונך להשתמש בתוספי TCL, יש להתקין ActiveTCL מתוך http://www.activestate.com\n"
 
-msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
-msgstr ""
-"חבילת בונג'ור של אפל עבור חלונות לא נמצאה, ראה את השו\"ת באתר: http://d."
-"pidgin.im/BonjourWindows למידע נוסף."
+msgid "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin.im/BonjourWindows for more information."
+msgstr "חבילת \"בונג'ור\" של אפל עבור חלונות לא נמצאה, ראה את השו\"ת באתר: http://d.pidgin.im/BonjourWindows למידע נוסף."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "לא ניתן להקשיב לתקשורת-הודעות נכנסת.\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "לא ניתן להקשיב לחיבורי הודעות נכנסת"
 
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "לא מצליח לתקשר עם שרת ה-mDNS המקומי. האם הוא כבר רץ?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "שם פרטי"
 
@@ -2794,6 +2740,10 @@ msgstr "תוסף פרוטוקול Bonjour"
 msgid "Purple Person"
 msgstr "אדם סגול"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "חיבור מקומי"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2804,14 +2754,17 @@ msgstr "%s סגר את חלון השיחה."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "לא ניתן לשלוח את ההודעה, לא היה אפשר להתחיל את השיחה."
 
-msgid "Cannot open socket"
-msgstr "אין אפשרות לפתוח שקע"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "אין אפשרות ליצור שקע: %s"
 
-msgid "Could not bind socket to port"
-msgstr "לא ניתן לקבע את השקע ליציאה"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "לא ניתן לקבע את השקע ליציאה: %s"
 
-msgid "Could not listen on socket"
-msgstr "אין אפשרות להקשיב בשקע זה"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "אין אפשרות ליצור שקע: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "שגיאה בתקשורת עם mDNSResponder מקומי."
@@ -2819,9 +2772,7 @@ msgstr "שגיאה בתקשורת עם mDNSResponder מקומי."
 msgid "Invalid proxy settings"
 msgstr "הגדרות לא תקפות של מתווכים"
 
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
+msgid "Either the host name or port number specified for your given proxy type is invalid."
 msgstr "או כתובת השרת או יציאת השרת שניתנה עבור סוג המתווך שהוגדרלא תקפים."
 
 msgid "Token Error"
@@ -2858,14 +2809,14 @@ msgstr "שמור את רשימת אנשי הקשר..."
 msgid "Load buddylist from file..."
 msgstr "טען את רשימת אנשי הקשר מקובץ..."
 
-msgid "Fill in the registration fields."
-msgstr "יש למלא את שדות ההרשמה."
+msgid "You must fill in all registration fields"
+msgstr "יש למלא את כל שדות ההרשמה"
 
-msgid "Passwords do not match."
-msgstr "הסיסמאות אינן תואמות."
+msgid "Passwords do not match"
+msgstr "הסיסמאות אינן תואמות"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "לא ניתן לבצע הרשמה לחשבון חדש. אירעה שגיאה.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "לא ניתן לבצע הרשמה לחשבון חדש. אירעה שגיאה לא-מוכרת."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "הושלמה ההרשמה לחשבון החדש של Gadu-Gadu"
@@ -2876,14 +2827,14 @@ msgstr "הרישום בוצע בהצלחה"
 msgid "Password"
 msgstr "סיסמה"
 
-msgid "Password (retype)"
-msgstr "סיסמא )שוב("
+msgid "Password (again)"
+msgstr "סיסמא (שנית)"
 
-msgid "Enter current token"
-msgstr "הזן ערך נוכחי"
+msgid "Enter captcha text"
+msgstr "יש להזין את טקסט ב-caphtca"
 
-msgid "Current token"
-msgstr "ערך נוכחי"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "בצע רישום לחשבון חדש של Gadu-Gadu"
@@ -2936,6 +2887,15 @@ msgstr "הסיסמא שונתה בהצלחה!"
 msgid "Current password"
 msgstr "סיסמא נוכחית"
 
+msgid "Password (retype)"
+msgstr "סיסמא )שוב("
+
+msgid "Enter current token"
+msgstr "הזן ערך נוכחי"
+
+msgid "Current token"
+msgstr "ערך נוכחי"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "יש להזין את סיסמתך הנוכחית וסיסמתך החדשה עבור משתמש מספר: "
 
@@ -2949,13 +2909,13 @@ msgstr "בחר צ'אט עבור איש הקשר: %s"
 msgid "Add to chat..."
 msgstr "הוסף לשיחה..."
 
+#. Global
 msgid "Available"
 msgstr "זמין"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "רחוק מהמחשב"
 
@@ -2983,8 +2943,8 @@ msgstr "לא נמצאו משתמשים תואמים"
 msgid "There are no users matching your search criteria."
 msgstr "לא נמצאו משתמשים התואמים לקריטריוני החיפוש שלך."
 
-msgid "Unable to read socket"
-msgstr "אין אפשרות לקרוא את השקע"
+msgid "Unable to read from socket"
+msgstr "אין אפשרות לקרוא מן השקע"
 
 msgid "Buddy list downloaded"
 msgstr "רשימת אנשי הקשר הועתקה"
@@ -2998,8 +2958,14 @@ msgstr "רשימת אנשי הקשר נשלחה"
 msgid "Your buddy list was stored on the server."
 msgstr "רשימת אנשי הקשר שלך אוכסנה על השרת"
 
-msgid "Connection failed."
-msgstr "ההתחברות נכשלה."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "מחובר"
+
+msgid "Connection failed"
+msgstr "ההתחברות נכשלה"
 
 msgid "Add to chat"
 msgstr "הוסף לשיחה"
@@ -3007,14 +2973,23 @@ msgstr "הוסף לשיחה"
 msgid "Chat _name:"
 msgstr "שם _צ'אט:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "לא ניתן לתרגם לכתובת את שם השרת '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "מתחבר"
+
 msgid "Chat error"
 msgstr "שגיאה בצ'אט"
 
 msgid "This chat name is already in use"
 msgstr "שם הצ'אט הזה כבר בשימוש"
 
-msgid "Not connected to the server."
-msgstr "לא מחובר לשרת."
+msgid "Not connected to the server"
+msgstr "לא מחובר אל השרת"
 
 msgid "Find buddies..."
 msgstr "חפש אנשי קשר..."
@@ -3055,6 +3030,9 @@ msgstr "מערכת הודעות פופולרית בפולין"
 msgid "Gadu-Gadu User"
 msgstr "משתמש Gadu-Gadu"
 
+msgid "GG server"
+msgstr "שרת GG"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "פקודה בלתי מוכרת: %s"
@@ -3069,7 +3047,7 @@ msgstr "אין כותרת"
 msgid "File Transfer Failed"
 msgstr "העברת הקובץ נכשלה"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "לא ניתן לפתוח שקע-קשב."
 
 msgid "Error displaying MOTD"
@@ -3085,8 +3063,16 @@ msgstr "אין הודעה יומית המיוחסת לחיבור זה."
 msgid "MOTD for %s"
 msgstr "הודעת היום עבור %s"
 
-msgid "Server has disconnected"
-msgstr "השרת התנתק"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "אבדה התקשורת עם השרת: %s"
 
 msgid "View MOTD"
 msgstr "הצג את הודעת היום"
@@ -3097,25 +3083,23 @@ msgstr "_ערוץ:"
 msgid "_Password:"
 msgstr "_סיסמא:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "אסור לשמות ב-IRC להכיל רווחים"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "מתחבר"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "אסור לשמות ולשרתים ב-IRC להכיל רווחים"
 
 msgid "SSL support unavailable"
 msgstr "אין תמיכה ב-SSL."
 
-msgid "Couldn't create socket"
-msgstr "אין אפשרות ליצור שקע"
+msgid "Unable to connect"
+msgstr "לא ניתן להתחבר"
 
-msgid "Couldn't connect to host"
-msgstr "לא ניתן להתחבר לשרת"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "לא ניתן להתחבר: %s"
 
-msgid "Read error"
-msgstr "שגיאה בקריאה"
+#, c-format
+msgid "Server closed the connection"
+msgstr "השרת סגר את החיבור"
 
 msgid "Users"
 msgstr "משתמשים"
@@ -3282,16 +3266,22 @@ msgstr "מצב (%s %s) ע\"י %s"
 msgid "Invalid nickname"
 msgstr "שם המשתמש לא חוקי"
 
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
 msgstr "הכינוי שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."
 
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
 msgstr "שם החשבון שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "הכינו \"%s\" כבר בשימוש."
+
+msgid "Nickname in use"
+msgstr "שם-הכינוי בשימוש"
+
 msgid "Cannot change nick"
 msgstr "כשל בשינוי הכינוי"
 
@@ -3326,11 +3316,8 @@ msgstr "כאפה מ-%s"
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;פעולה לביצוע&gt;: פעל פעולה ."
 
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"away [הודעה]:  קבע הודעת ריחוק מהמחשב, או השתמש ללא הודעה לחזור לזמינות."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "away [הודעה]:  קבע הודעת ריחוק מהמחשב, או השתמש ללא הודעה לחזור לזמינות."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
 msgstr "ctcp <שם> <הודעה>: שלך הודעת ctcp לאותו כינוי."
@@ -3338,56 +3325,26 @@ msgstr "ctcp <שם> <הודעה>: שלך הודעת ctcp לאותו כינוי."
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: שלח פקודה אל chanserv"
 
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;שם1&gt1; [שם2] ...:  הסר סטטוס של מפעיל הערוץ ממישהו. חובה להיות "
-"מפעיל ערוץ כדי לבצע פעולה זו."
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;שם1&gt1; [שם2] ...:  הסר סטטוס של מפעיל הערוץ ממישהו. חובה להיות מפעיל ערוץ כדי לבצע פעולה זו."
 
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;שם1&gt; [שם2] ...:  הסר יכולת דיבור בערוץ ממישהו, אשר רק מונע "
-"מהם לדבר אם הערוץ במצב של תיווך (+m). חובה להיות מפעיל ערוץ כדי לבצע פעולה "
-"זו."
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;שם1&gt; [שם2] ...:  הסר יכולת דיבור בערוץ ממישהו, אשר רק מונע מהם לדבר אם הערוץ במצב של תיווך (+m). חובה להיות מפעיל ערוץ כדי לבצע פעולה זו."
 
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;שם&gt; [חדר]:  הזמן מישהו להצטרף אליך בערוץ הנתון, או בערוץ "
-"הנוכחי."
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;שם&gt; [חדר]:  הזמן מישהו להצטרף אליך בערוץ הנתון, או בערוץ הנוכחי."
 
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, עם "
-"אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, עם אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
 
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, "
-"עם אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, עם אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
 
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מהערוץ. צריך להיות מפעיל הערוץ כדי "
-"לעשות זאת."
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מהערוץ. צריך להיות מפעיל הערוץ כדי לעשות זאת."
 
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list: הצג רשימה של חדרי צ'אט ברשת. <i>אזהרה, יש שרתים שינתקו אותך ברגע ביצוע "
-"פעולה זו.</i>"
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list: הצג רשימה של חדרי צ'אט ברשת. <i>אזהרה, יש שרתים שינתקו אותך ברגע ביצוע פעולה זו.</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;פעולה לביצוע&gt;:  בצע פעולה"
@@ -3395,18 +3352,11 @@ msgstr "me &lt;פעולה לביצוע&gt;:  בצע פעולה"
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: שלח פקודה אל memoserv"
 
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;שם כינוי|ערוץ&gt;:  קבע או הסר מצבי ערוץ "
-"או משתמש."
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;שם כינוי|ערוץ&gt;:  קבע או הסר מצבי ערוץ או משתמש."
 
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;שם כינוי&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;שם כינוי&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
 
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [ערוץ]:  הצג את רשימת המשתמשים שכרגע בערוץ."
@@ -3420,41 +3370,23 @@ msgstr "nickserv: שלח פקודה אל nickserv"
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr "me &lt;action&gt;:  שלח למשתמש או צ'אט התראה."
 
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;שם כינוי1&gt; [שם כינוי2] ...:  נותן סטטוס של מפעיל ערוץ למישהו. עליך "
-"להיות מפעיל ערוץ לבצע פעולה זו."
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;שם כינוי1&gt; [שם כינוי2] ...:  נותן סטטוס של מפעיל ערוץ למישהו. עליך להיות מפעיל ערוץ לבצע פעולה זו."
 
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;הודעה&gt;:  אם אינך יודע/ת מה זה עושה, כנראה את/ה לא יכול/ה "
-"להשתמש בזה."
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;הודעה&gt;:  אם אינך יודע/ת מה זה עושה, כנראה את/ה לא יכול/ה להשתמש בזה."
 
 msgid "operserv: Send a command to operserv"
 msgstr " operserv: שלח פקודה אל operserv"
 
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [חדר] [הודעה]:  עזוב את החדר הנוכחי, או חדר מסויים, עם אפשרות להודעה."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [חדר] [הודעה]:  עזוב את החדר הנוכחי, או חדר מסויים, עם אפשרות להודעה."
 
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [שם כינוי]:  שואל כמה איטית התגובה של משתמש (או של השרת אם לא צויין "
-"משתמש."
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [שם כינוי]:  שואל כמה איטית התגובה של משתמש (או של השרת אם לא צויין משתמש."
 
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;שם משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;שם משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [הודעה]:  התנתקות מהשרת, עם אפשרות להודעה."
@@ -3462,12 +3394,8 @@ msgstr "quit [הודעה]:  התנתקות מהשרת, עם אפשרות להו�
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  שלח פקודה ישירות לשרת."
 
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מחדר. צריך להיות מפעיל הערוץ "
-"לבצע פעולה זו."
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מחדר. צריך להיות מפעיל הערוץ לבצע פעולה זו."
 
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: מציג את השעה המקומית בשרת ה-IRC."
@@ -3481,18 +3409,11 @@ msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  קבע או הסר מצב משתמש."
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [שם כינוי]: שלח בקשה CTCP VERSION למשתמש"
 
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;שם כינוי1&gt; [שם כינוי2] ...:  תן סטטוס דיבור למישהו. חובה להיות "
-"מפעיל הערוץ לבצע פעולה זו."
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;שם כינוי1&gt; [שם כינוי2] ...:  תן סטטוס דיבור למישהו. חובה להיות מפעיל הערוץ לבצע פעולה זו."
 
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;הודעה&gt;:  אם אינך יודע/ת מה זה, את/ה כנראה לא יכול להשתמש בזה."
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;הודעה&gt;:  אם אינך יודע/ת מה זה, את/ה כנראה לא יכול להשתמש בזה."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [שרת] &lt;שם כינוי&gt;:  השג מידע על משתמש."
@@ -3522,35 +3443,59 @@ msgstr "פקודה זמנית נכשלה"
 msgid "execute"
 msgstr "הפעל"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "השרת דורש TLS/SSL להתחברות. לא נמצאה תמיכה ל-TLS/SSL."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "השרת דורש TLS/SSL להתחברות, אך לא נמצאה תמיכה ל-TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "הגדרת דרישה להצפנה, אך לא נמצאה תמיכה ב-TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת"
 
 #, c-format
-msgid ""
-"%s requires plaintext authentication over an unencrypted connection.  Allow "
-"this and continue authentication?"
+msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
 msgstr "%s דורש אימות לא מוצפן מעל תקשורת לא מוצפנת. לאפשר ולהמשיך בכל זאת?"
 
 msgid "Plaintext Authentication"
 msgstr "אימות לא מוצפן"
 
-msgid "Invalid response from server."
-msgstr "שגיעה בתגובה מהשרת"
+msgid "SASL authentication failed"
+msgstr "אימות SASL נכשל"
+
+msgid "Invalid response from server"
+msgstr "תגובה לא תקפה מהשרת"
 
 msgid "Server does not use any supported authentication method"
 msgstr "השרת לא תומך באימות באף תצורה"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "נתת דרישה להצפנה, אבל השרת לא מספק זאת."
+
 msgid "Invalid challenge from server"
 msgstr "תשובת אימות לא תקפה מהשרת"
 
-msgid "SASL error"
-msgstr "שגיאת SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "שגיאת SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "מנהל התקשורת BOSH ניתק את חיבורך."
+
+msgid "No session ID given"
+msgstr "לא ניתן מזהה לחיבור"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "גירסת פרוטוקול BOSH שאינה נתמכת"
+
+msgid "Unable to establish a connection with the server"
+msgstr "לא ניתן ליצור חיבור עם השרת"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "לא ניתן ליצור חיבור עם השרת: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "לא ניתן ליצור חיבור SSL"
 
 msgid "Full Name"
 msgstr "שם מלא"
@@ -3567,6 +3512,11 @@ msgstr "קישור"
 msgid "Street Address"
 msgstr "כתובת"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "מידע כתובת מורחב"
 
@@ -3605,9 +3555,7 @@ msgstr "תיאור"
 msgid "Edit XMPP vCard"
 msgstr "ערוך את ה- XMPP vCard"
 
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "כל הפריטים להלן הם בחירה. יש להזין רק את המידע שאת/ה מרגיש/ה נוח לתת."
 
 msgid "Client"
@@ -3616,158 +3564,8 @@ msgstr "לקוח"
 msgid "Operating System"
 msgstr "מערכת הפעלה"
 
-msgid "Last Activity"
-msgstr "פעילות אחרונה"
-
-msgid "Service Discovery Info"
-msgstr "מידע של שירות תגלית"
-
-msgid "Service Discovery Items"
-msgstr "פריטי שירות תגלית"
-
-msgid "Extended Stanza Addressing"
-msgstr "כתובות מורחבות לסטאנזות"
-
-msgid "Multi-User Chat"
-msgstr "צ'אט מרובה משתמשים"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "מידע נוכחותי בצ'אט מרובה משתמשים"
-
-msgid "In-Band Bytestreams"
-msgstr "זרמי-נתונים לפי הסדר"
-
-msgid "Ad-Hoc Commands"
-msgstr "פקודות זמניות"
-
-msgid "PubSub Service"
-msgstr "שירות PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "זרמי-נתונים של SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "מידע שלא לפי סדר"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "רישום דרך התור"
-
-msgid "User Location"
-msgstr "מיקום משתמש"
-
-msgid "User Avatar"
-msgstr "תמונת משתמש"
-
-msgid "Chat State Notifications"
-msgstr "התרעות על מצבי צ'אט"
-
-msgid "Software Version"
-msgstr "גירסת תוכנה"
-
-msgid "Stream Initiation"
-msgstr "איתחול זרם"
-
-msgid "File Transfer"
-msgstr "משלוח קבצים"
-
-msgid "User Mood"
-msgstr "מצב-רוח המשתמש"
-
-msgid "User Activity"
-msgstr "פעילות משתמש"
-
-msgid "Entity Capabilities"
-msgstr "יכולות ישות"
-
-msgid "Encrypted Session Negotiations"
-msgstr "מיקוחים לחיבור מוצפן"
-
-msgid "User Tune"
-msgstr "שיר משתמש"
-
-msgid "Roster Item Exchange"
-msgstr "החלפת פריטי רשימה"
-
-msgid "Reachability Address"
-msgstr "כתובת זמינות"
-
-msgid "User Profile"
-msgstr "פרופיל משתמש"
-
-msgid "Jingle"
-msgstr "ג'ינגל"
-
-msgid "Jingle Audio"
-msgstr "צליל ג'ינגל"
-
-msgid "User Nickname"
-msgstr "כינוי משתמש"
-
-msgid "Jingle ICE UDP"
-msgstr "ג'ינגל ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "ג'ינגל ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "ג'ינגל UDP לא-מעובד"
-
-msgid "Jingle Video"
-msgstr "ג'ינגל וידאו"
-
-msgid "Jingle DTMF"
-msgstr "ג'ינגל DTMF"
-
-msgid "Message Receipts"
-msgstr "קבלות הודעות"
-
-msgid "Public Key Publishing"
-msgstr "פירסום מפתח ציבורי"
-
-msgid "User Chatting"
-msgstr "משתמש מצ'וטט"
-
-msgid "User Browsing"
-msgstr "משתמש גולש"
-
-msgid "User Gaming"
-msgstr "משתמש משחק"
-
-msgid "User Viewing"
-msgstr "משתמש צופה"
-
-msgid "Ping"
-msgstr "פינג"
-
-msgid "Stanza Encryption"
-msgstr "הצפנת סטנזה"
-
-msgid "Entity Time"
-msgstr "זמן ישות"
-
-msgid "Delayed Delivery"
-msgstr "משלוח מעוכב"
-
-msgid "Collaborative Data Objects"
-msgstr "אובייקטי מידע שיתופיים"
-
-msgid "File Repository and Sharing"
-msgstr "ספריית קבצים ושיתוף"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "שירות תגלית STUN עבור ג'ינגל"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "מיקוח פשוט לחיבור המוצפן"
-
-msgid "Hop Check"
-msgstr "בדיקת קפיצות"
-
-msgid "Capabilities"
-msgstr "יכולות"
+msgid "Local Time"
+msgstr "שעה מקומית"
 
 msgid "Priority"
 msgstr "עדיפות"
@@ -3775,6 +3573,13 @@ msgstr "עדיפות"
 msgid "Resource"
 msgstr "משאב"
 
+#, c-format
+msgid "%s ago"
+msgstr "לפני %s"
+
+msgid "Logged Off"
+msgstr "התנתק/ה"
+
 msgid "Middle Name"
 msgstr "שם אמצעי"
 
@@ -3796,14 +3601,12 @@ msgstr "הצג תבנית"
 msgid "Temporarily Hide From"
 msgstr "הסתר את התבנית זמנית"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "בטל התרעת נוכחות"
 
 msgid "(Re-)Request authorization"
 msgstr "בקש אימות (מחדש)"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -3821,7 +3624,6 @@ msgstr "פטפטן"
 msgid "Extended Away"
 msgstr "העדרות ממושכת"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "נא לא להפריע"
 
@@ -3835,12 +3637,8 @@ msgid "The following are the results of your search"
 msgstr "להלן תוצאות החיפוש שלך"
 
 #. current comment from Jabber User Directory users.jabber.org
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-"מצא איש קשר על ידי הזנן קריטריונים לחיפוש בשדות הנתונים. הערה: כל שדה תומך "
-"בחיפושים עם אותיות חלופיות (%)"
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "מצא איש קשר על ידי הזנן קריטריונים לחיפוש בשדות הנתונים. הערה: כל שדה תומך בחיפושים עם אותיות חלופיות (%)"
 
 msgid "Directory Query Failed"
 msgstr "שגיאה בשאילתת הספרייה"
@@ -3942,28 +3740,20 @@ msgstr "יש לבחור שרת ועידה לתישאול"
 msgid "Find Rooms"
 msgstr "חפש חדרים"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "נתת דרישה להצפנה, אבל השרת לא מספק זאת."
+msgid "Affiliations:"
+msgstr "שיוכים:"
 
-msgid "Write error"
-msgstr "שגיאה בכתיבה"
+msgid "No users found"
+msgstr "לא נמצאו משתמשים"
 
-msgid "Ping timeout"
-msgstr "פינג לא חזר בזמן"
-
-msgid "Read Error"
-msgstr "שגיאה בקריאה"
+msgid "Roles:"
+msgstr "תפקידים:"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"לא ניתן ליצור חיבור עם השרת:\n"
-"%s"
+msgid "Ping timed out"
+msgstr "פינג לא חזר בזמן"
 
-msgid "Unable to create socket"
-msgstr "אין אפשרות ליצור שקע"
+msgid "Unable to find alternative XMPP connection methods after failing to connect directly."
+msgstr "לא יכול למצוא צורות חיבור XMPP חלופיות אחרי כישלון בחיבור ישירות."
 
 msgid "Invalid XMPP ID"
 msgstr "מזהה XMPP לא תקין"
@@ -3971,6 +3761,9 @@ msgstr "מזהה XMPP לא תקין"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "מזהה XMPP שגוי. יש להגדיר את הדומיין."
 
+msgid "Malformed BOSH URL"
+msgstr "כתובת BOTH משובשת"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "הרישום של %s@%s בוצע בהצלחה"
@@ -3995,9 +3788,6 @@ msgstr "הסרת הרישום הצליחה"
 msgid "Unregistration Failed"
 msgstr "הסרת הרישום נכשלה"
 
-msgid "Already Registered"
-msgstr "הכינוי כבר רשום."
-
 msgid "State"
 msgstr "מחוז"
 
@@ -4010,11 +3800,13 @@ msgstr "טלפון"
 msgid "Date"
 msgstr "תאריך"
 
+msgid "Already Registered"
+msgstr "הכינוי כבר רשום."
+
 msgid "Unregister"
 msgstr "הסר רישום"
 
-msgid ""
-"Please fill out the information below to change your account registration."
+msgid "Please fill out the information below to change your account registration."
 msgstr ".יש להזין את המידע להלן כדי לשנות את רישום החשבון שלך"
 
 msgid "Please fill out the information below to register your new account."
@@ -4055,9 +3847,18 @@ msgstr "מאמת"
 msgid "Re-initializing Stream"
 msgstr "מאתחל את הזרם מחדש"
 
+msgid "Server doesn't support blocking"
+msgstr "השרת לא תומך בחסימה"
+
 msgid "Not Authorized"
 msgstr "לא מורשה"
 
+msgid "Mood"
+msgstr "מצב רוח"
+
+msgid "Now Listening"
+msgstr "מקשיב כעת"
+
 msgid "Both"
 msgstr "שניהם"
 
@@ -4079,12 +3880,6 @@ msgstr "ללא"
 msgid "Subscription"
 msgstr "מנוי"
 
-msgid "Mood"
-msgstr "מצב רוח"
-
-msgid "Now Listening"
-msgstr "מקשיב כעת"
-
 msgid "Mood Text"
 msgstr "טקסט מצב-רוח"
 
@@ -4127,9 +3922,6 @@ msgstr "הסיסמה שלך שונתה."
 msgid "Error changing password"
 msgstr "שגיאה במהלך שינוי הסיסמה"
 
-msgid "Password (again)"
-msgstr "סיסמא (שנית)"
-
 msgid "Change XMPP Password"
 msgstr "שנה סיסמת XMPP"
 
@@ -4323,16 +4115,20 @@ msgid "Unable to ping user %s"
 msgstr "לא ניתן לעשות פינג למשתמש %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "לא ניתן לזמזם, מכיוון שלא ידוע כלום על המשתמש %s."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "לא ניתן לזמזם, מכיוון שלא ידוע כלום על %s."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "לא ניתן לזמזם, מכיוון שייתכן והמשתמש %s לא מחובר."
+msgid "Unable to buzz, because %s might be offline."
+msgstr "לא ניתן לזמזם, מכיוון שייתכן כי%s לא מחובר."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "לא ניתן לזמזם, כי המשתמש %s  לא תומך בזה."
+msgid "Unable to buzz, because %s does not support it or does not wish to receive buzzes now."
+msgstr "לא ניתן לזמזם, כי %s  לא תומך בזה או לא רוצה לקבל זימזומים כרגע."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "מזמם ל-%s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4344,8 +4140,29 @@ msgid "%s has buzzed you!"
 msgstr "%s זימזם אותך!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "מזמם ל-%s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "לא ניתן ליזום מדיה עם %s: JID לא תקף"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "לא ניתן ליזום מדיה עם %s: המשתמש לא מחובר"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "לא ניתן ליזום מדיה עם %s: לא רשום להודעות-נוכחות המשתמש"
+
+msgid "Media Initiation Failed"
+msgstr "ייזום מדיה נכשל"
+
+#, c-format
+msgid "Please select the resource of %s with which you would like to start a media session."
+msgstr "יש לבחור את המשאב של %s איתו ברצונך להתחיל תקשורת מדיה."
+
+msgid "Select a Resource"
+msgstr "יש לבחור משאב"
+
+msgid "Initiate Media"
+msgstr "יזום מדיה"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  קבע הגדרות חדר צ'אט."
@@ -4365,19 +4182,11 @@ msgstr "topic [נושא חדש]:  הצג או שנה את הנושא."
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;משתמש&gt; [סיבה]:  חסום משתמש מן החדר."
 
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-"affiliate &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt;: קביעת ייחוס משתמש "
-"עם החדר."
+msgid "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get the users with an affiliation or set users' affiliation with the room."
+msgstr "affiliate &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt; [שם1][שם2]...: שלוף או קבע את ייחוסם של משתמשים עם החדר."
 
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-"role &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt;: קביעת ייחוס משתמש עם "
-"החדר."
+msgid "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the users with an role or set users' role with the room."
+msgstr "role &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt; [שם1][שם2]...: שלוף או קבע את ייחוסם של משתמשים עם החדר."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;משתמש&gt; [חדר]:  הזמן משתמש לחדר."
@@ -4388,8 +4197,7 @@ msgstr "join: &lt;חדר&gt; [סיסמא]:  הצטרף לצ'אט בשרת זה."
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;משתמש&gt; [סיבה]:  בעט משתמש מהחדר."
 
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש אחר."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
@@ -4436,11 +4244,13 @@ msgstr "שרת ההתחברות"
 msgid "File transfer proxies"
 msgstr "שרתי תיווך להעברת קבצים"
 
+msgid "BOSH URL"
+msgstr "כתובת BOSH"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
-msgstr "הצג סמייליים שלי"
+msgstr "הצג חייכנים שלי"
 
 #, c-format
 msgid "%s has left the conversation."
@@ -4475,14 +4285,19 @@ msgstr "שגיאת פיענוח XML"
 msgid "Unknown Error in presence"
 msgstr "שגיאה לא מוכרת בנוכחות"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "שגיאה בהצטרפות לצ'אט %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "שגיאה בשיחה %s"
+
 msgid "Create New Room"
 msgstr "צור חדר חדש"
 
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"החדר החדש שיצרת. האם ברצונך לשנות את ההגדרות שלו, או לקבל את ברירות המחדל?"
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "החדר החדש שיצרת. האם ברצונך לשנות את ההגדרות שלו, או לקבל את ברירות המחדל?"
 
 msgid "_Configure Room"
 msgstr "הגדרות החדר"
@@ -4490,13 +4305,25 @@ msgstr "הגדרות החדר"
 msgid "_Accept Defaults"
 msgstr "קבל את ברירות המחדל"
 
+msgid "No reason"
+msgstr "לא ניתנה סיבה"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "שגיאה בהצטרפות לצ'אט %s"
+msgid "You have been kicked: (%s)"
+msgstr "נבעטת: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "שגיאה בשיחה %s"
+msgid "Kicked (%s)"
+msgstr "נבעט (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "ארעה שגיאה בעת ההעברה בזרם בתווך\n"
+
+msgid "Transfer was closed."
+msgstr "העברת הקובץ נסגרה."
+
+msgid "Failed to open in-band bytestream"
+msgstr "כישלון בפתיחת תזרים מידע בתווך"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4521,9 +4348,6 @@ msgstr "לא ניתן לשלוח את הקובץ אל %s, אינך רשומ/ה �
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "יש לבחור את המשאב של %s אליו ברצונך לשלוח קובץ"
 
-msgid "Select a Resource"
-msgstr "יש לבחור משאב"
-
 msgid "Edit User Mood"
 msgstr "קבע מצב-רוח משתמש"
 
@@ -4542,11 +4366,8 @@ msgstr "קבע כינוי משתמש"
 msgid "Please specify a new nickname for you."
 msgstr "אנא הזן כינוי חדש עבורך."
 
-msgid ""
-"This information is visible to all contacts on your contact list, so choose "
-"something appropriate."
-msgstr ""
-"המידע הזה נגיש לכל אנשי-הקשר ברשימת אנשי הקשר שלך, אז יש לבחור משהו מתאים."
+msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
+msgstr "המידע הזה נגיש לכל אנשי-הקשר ברשימת אנשי הקשר שלך, אז יש לבחור משהו מתאים."
 
 msgid "Set Nickname..."
 msgstr "קבע כינוי..."
@@ -4557,25 +4378,29 @@ msgstr "פעולות"
 msgid "Select an action"
 msgstr "בחר פעולה"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "לא יכול לאחזר את רשימת הכתובות של MSN"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "אין אפשרות להוסיף \"%s\"."
+
+msgid "Buddy Add error"
+msgstr "שגיאת הוספת חבר"
+
+msgid "The username specified does not exist."
+msgstr "שם המשתמש שהוזן אינו קיים."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "אירוע סינכרון רשימת אנשי הקשר ב-%s (%s)"
 
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s ברשימה המקומית הוא בתוך הקבוצה \"%s\" אך לא ברשימה שעל השרת. האם ברצונך "
-"להוסיף איש קשר זה?"
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s ברשימה המקומית הוא בתוך הקבוצה \"%s\" אך לא ברשימה שעל השרת. האם ברצונך להוסיף איש קשר זה?"
 
 #, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
 msgstr "%s הרשימה המקומית אך לא ברשימה שעל השרת. האם ברצונך להוסיף איש קשר זה?"
 
 #, c-format
@@ -4786,9 +4611,8 @@ msgstr "פספורט ילדים ללא הסכמת הורים"
 msgid "Passport account not yet verified"
 msgstr "חשבון הפספורט לא אומת עדיין"
 
-#, fuzzy, c-format
 msgid "Passport account suspended"
-msgstr "חשבון הפספורט לא אומת עדיין"
+msgstr "חשבון הפספורט מושעה"
 
 #, c-format
 msgid "Bad ticket"
@@ -4802,13 +4626,31 @@ msgstr "קוד שגיאה לא מוכר %d"
 msgid "MSN Error: %s\n"
 msgstr "שגיאת MSN: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "איש קשר מועדף"
+msgstr "אנשי-קשר אחרים"
 
-#, fuzzy
 msgid "Non-IM Contacts"
-msgstr "הסר איש קשר"
+msgstr "אנשי-קשר שאינם להודעות"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "נשלח קריצה מאת %s. <a href='msn-wink://%s'>יש ללחוץ כאן להפעלתה</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "נשלח קריצה מאת %s, אבל לא ניתן היה לשמור אותה"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "נשלח קטע קולי מאת %s. <a href='audio://%s'>יש ללחוץ כאן להשמיעה</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "נשלח אליך קטע קולי מאת %s, אבל היה ניתן לשמור אותו"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "נשלחה אליך הזמנה לשיחה קולית מאת %s, אשר אינה נתמכת כעת."
 
 msgid "Nudge"
 msgstr "נו כבר!"
@@ -4845,12 +4687,8 @@ msgstr "קבע/י את מספר הטלפון הנייד."
 msgid "Allow MSN Mobile pages?"
 msgstr "אפשר הודעות לנייד מ-MSN?"
 
-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 ""
-"האם ברצונך לאפשר או לא לאפשר לאנשים מרשימת אנשי הקשר שלך לשלוח לך הודעות "
-"לטלפון הנייד או שאר מכשירים ניידים?"
+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 "האם ברצונך לאפשר או לא לאפשר לאנשים מרשימת אנשי הקשר שלך לשלוח לך הודעות לטלפון הנייד או שאר מכשירים ניידים?"
 
 msgid "Allow"
 msgstr "אפשר"
@@ -4866,8 +4704,7 @@ msgid "No text is blocked for this account."
 msgstr "אין טקסט חסום עבור חשבון זה."
 
 #, c-format
-msgid ""
-"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgid "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr "שרתי MSN כרגע חוסמים את הביטוי הרגוליים הבאים:<br/>%s"
 
 msgid "This account does not have email enabled."
@@ -4879,6 +4716,12 @@ msgstr "שלח בתור הודעה לנייד."
 msgid "Page"
 msgstr "דף"
 
+msgid "Playing a game"
+msgstr "באמצע משחק"
+
+msgid "Working"
+msgstr "עובד"
+
 msgid "Has you"
 msgstr "יש אותך"
 
@@ -4915,6 +4758,12 @@ msgstr "אמן"
 msgid "Album"
 msgstr "אלבום"
 
+msgid "Game Title"
+msgstr "שם המשחק"
+
+msgid "Office Title"
+msgstr "שם המשרד"
+
 msgid "Set Friendly Name..."
 msgstr "קבע/י שם ידידותי..."
 
@@ -4948,8 +4797,24 @@ msgstr "יז_ום שיחה"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "נדרשת תמיכה ב-SSL עבור MSN. נא להתקין ספריית SSL נתמכת."
 
-msgid "Failed to connect to server."
-msgstr "כשל בהתחברות לשרת"
+#, c-format
+msgid "Unable to add the buddy %s because the username is invalid.  Usernames must be a valid email address."
+msgstr "לא ניתן להוסיף את החבר %s מכיוון ששם המשתמש אינו חוקי. שמות משתמשים מוכרחים להיות כתובות אימייל תקפות."
+
+msgid "Unable to Add"
+msgstr "לא ניתן להוסיף"
+
+msgid "Authorization Request Message:"
+msgstr "הודעת בקשה להרשאה:"
+
+msgid "Please authorize me!"
+msgstr "בבקשה, אני רוצה הרשאה!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "אישור"
 
 msgid "Error retrieving profile"
 msgstr "שגיאה בשליפת הפרופיל"
@@ -5090,21 +4955,14 @@ msgstr "כתובת אתר בית"
 msgid "The user has not created a public profile."
 msgstr "המשתמש לא יצר פרופיל ציבורי."
 
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"MSN דיווחה שלא יכלה למצוא את פרופיל המשתמש. זאת אומרת שהמשתמש לא קיים, או "
-"שהמשתמש קיים אך לא יצר פרופיל ציבורי."
+msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
+msgstr "MSN דיווחה שלא יכלה למצוא את פרופיל המשתמש. זאת אומרת שהמשתמש לא קיים, או שהמשתמש קיים אך לא יצר פרופיל ציבורי."
 
-msgid ""
-"Could not find any information in the user's profile. The user most likely "
-"does not exist."
+msgid "Could not find any information in the user's profile. The user most likely does not exist."
 msgstr "לא יכול למצוא מידע בתוך פרופיל המשתמש. ככל הנראה המשתמש לא קיים."
 
-msgid "Profile URL"
-msgstr "URL לפרופיל"
+msgid "View web profile"
+msgstr "הצג פרופיל ווב"
 
 #. *< type
 #. *< ui_requirement
@@ -5137,96 +4995,47 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "אישוש מול Windows Live ID:הודעה לא תקפה"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s אינה קבוצה תקפה."
-
-msgid "Unknown error."
-msgstr "שגיאה לא מוכרת."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s על %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s שלח לך הרגע דחיפה קלה!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "שגיאה לא מוכרת (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "שגיאה לא מוכרת (%d): %s"
 
 msgid "Unable to add user"
 msgstr "לא ניתן להוסיף משתמש"
 
-#, fuzzy
-msgid "The following users are missing from your addressbook"
-msgstr "להלן תוצאות החיפוש שלך"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "אין אפשרות להוסיף משתמש על %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "אין אפשרות לחסום משתמש על %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "אין אפשרות לאשר משתמש על %s (%s)"
-
+#. Unknown error!
 #, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "לא ניתן להוסיף את %s מכיוון שרשימת אנשי הקשר שלך מלאה."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s אינו חשבון פספורט תקף."
+msgid "Unknown error (%d)"
+msgstr "שגיאה לא מוכרת (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "השירות אינו זמין כרגע."
+msgid "The following users are missing from your addressbook"
+msgstr "המשתמשים להלן אינם נמצאים בפנקס הכתובות שלך"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "הודעת לנייד לא נשלחה מכיוון שהיא ארוכה מדי."
 
-msgid "Unable to rename group"
-msgstr "אין אפשרות לשנות את שם הקבוצה"
-
-msgid "Unable to delete group"
-msgstr "אין אפשרות למחוק את הקבוצה"
-
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"שרת ה-MSN יכבה לתחזוקה בעוד %d דקה. את/ה תנותק/י אוטומטית.אנא סיימ/י את "
-"השיחות שלך בהקדם.\n"
+"שרת ה-MSN יכבה לתחזוקה בעוד %d דקה. את/ה תנותק/י אוטומטית.אנא סיימ/י את השיחות שלך בהקדם.\n"
 "\n"
 "לאחר שהתחזוקה הושלמה, תוכל/י להתחבר מחדש."
 msgstr[1] ""
-"שרת ה-MSN יכבה לתחזוקה בעוד %d דקות. את/ה תנותק/י אוטומטית.אנא סיימ/י את "
-"השיחות שלך בהקדם.\n"
+"שרת ה-MSN יכבה לתחזוקה בעוד %d דקות. את/ה תנותק/י אוטומטית.אנא סיימ/י את השיחות שלך בהקדם.\n"
 "\n"
 "לאחר שהתחזוקה הושלמה, תוכל/י להתחבר מחדש."
 
-msgid ""
-"Message was not sent because the system is unavailable. This normally "
-"happens when the user is blocked or does not exist."
-msgstr ""
-"ההודעה לא נשלחה משום שהמערכת לא זמינה. בדרך-כלל זה קורה כשהמשתמש חסום או לא "
-"קיים."
+msgid "Message was not sent because the system is unavailable. This normally happens when the user is blocked or does not exist."
+msgstr "ההודעה לא נשלחה משום שהמערכת לא זמינה. בדרך-כלל זה קורה כשהמשתמש חסום או לא קיים."
 
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr "ההודעה לא נשלחה מכיוון שההודעות נשלחות מהר מדי."
@@ -5237,9 +5046,6 @@ msgstr "ההודעה לא נשלחה מכיוון שקרתה הודעת-קידו
 msgid "Message was not sent because an unknown error occurred."
 msgstr "ההודעה לא נשלחה מכיוון שקרתה שגיאה לא מוכרת."
 
-msgid "Unable to connect"
-msgstr "לא ניתן להתחבר"
-
 msgid "Writing error"
 msgstr "שגיאה בכתיבה"
 
@@ -5254,27 +5060,26 @@ msgstr ""
 "שגיאת תקשורת משרת %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "הפרוטוקול שלנו לא נתמך ע\"י השרת."
+msgid "Our protocol is not supported by the server"
+msgstr "הפרוטוקול שלנו לא נתמך ע\"י השרת"
 
-msgid "Error parsing HTTP."
-msgstr "שגיאה בפיענוח HTTP."
+msgid "Error parsing HTTP"
+msgstr "שגיאה בפיענוח HTTP"
 
-msgid "You have signed on from another location."
-msgstr "אתה התחברת ממיקום נוסף."
+msgid "You have signed on from another location"
+msgstr "אתה התחברת ממיקום נוסף"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "שרתי ה-MSN לא זמינים כרגע. אנא נסו מאוחר יותר."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "שרתי ב-MSN זמנית מפסיקים לפעול."
+msgid "The MSN servers are going down temporarily"
+msgstr "שרתי ה-MSN זמנית מפסיקים לפעול."
 
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "לא ניתן לאמת: %s"
 
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "רשימת אנשי הקשר שלך ב-MSN אינה זמינה כרגע. יש לנסות שנית מאוחר יותר."
 
 msgid "Handshaking"
@@ -5295,6 +5100,14 @@ msgstr "שולח Cookie"
 msgid "Retrieving buddy list"
 msgstr "מקבל רשימת אנשי הקשר"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "נשלחה בקשה מאת %s לצפות במצלמת האינטרנט שלך, אבל בקשה זו אינה נתמכת כרגע."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s שלח לך"
+
 msgid "Away From Computer"
 msgstr "מרוחק מהמחשב"
 
@@ -5319,42 +5132,20 @@ msgstr "לא ניתן לשלוח את ההודעה כיוון שאירעה שג�
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "לא ניתן לשלוח את ההודעה כיוון שאני שולחים מהר מדי:"
 
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
-"לא היה ניתן לשלוח את ההודעה, מכיוון שלא יכולנו לבצע התקשרות עם השרת. ככל "
-"הנראה זו בעייה עם השרת, יש לנסות שוב בעוד מספר דקות:"
+msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
+msgstr "לא היה ניתן לשלוח את ההודעה, מכיוון שלא יכולנו לבצע התקשרות עם השרת. ככל הנראה זו בעייה עם השרת, יש לנסות שוב בעוד מספר דקות:"
 
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "לא ניתן לשלוח את ההודעה כיוון שאירעה שגיאה עם המרכזייה:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "ההודעה אולי לא נשלחה מכיוון שאירעה שגיאה לא מוכרת:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s הוסיפ/ה אותך לרשימת אנשי הקשר שלו או שלה."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s הסיר/ה אותך מרשימת אנשי הקשר שלו או שלה."
-
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "הוסף לפנקס הכתובות"
+msgstr "מחק חבר מפנקס הכתובות?"
 
-#, fuzzy
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "האם ברצונך להוסיף את המשתמש הזה לרשימת אנשי הקשר שלך?"
-
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "אין אפשרות להוסיף \"%s\"."
+msgstr "האם ברצונך גם למחוק את המשתמש הזה מפנקס הכתובות שלך?"
 
 msgid "The username specified is invalid."
 msgstr "שם המשתמש שהוזן אינו חוקי."
@@ -5362,6 +5153,9 @@ msgstr "שם המשתמש שהוזן אינו חוקי."
 msgid "This Hotmail account may not be active."
 msgstr "ייתכן וחשבון ה-Hotmail הזה אינו פעיל."
 
+msgid "Profile URL"
+msgstr "URL לפרופיל"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5375,17 +5169,60 @@ msgstr "ייתכן וחשבון ה-Hotmail הזה אינו פעיל."
 msgid "MSN Protocol Plugin"
 msgstr "תוסף פרוטוקול MSN"
 
-msgid "Missing Cipher"
-msgstr "צופן חסר"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s אינה קבוצה תקפה."
 
-msgid "The RC4 cipher could not be found"
-msgstr "צופן ה- RC4 לא נמצא"
+msgid "Unknown error."
+msgstr "שגיאה לא מוכרת."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"יש לשדרג לגירסא של libpurple עם תמיכת RC4 (>= 2.0.1). תוסף MySpaceIM לא יטען."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s על %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "אין אפשרות להוסיף משתמש על %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "אין אפשרות לחסום משתמש על %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "אין אפשרות לאשר משתמש על %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "לא ניתן להוסיף את %s מכיוון שרשימת אנשי הקשר שלך מלאה."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s אינו חשבון פספורט תקף."
+
+msgid "Service Temporarily Unavailable."
+msgstr "השירות אינו זמין כרגע."
+
+msgid "Unable to rename group"
+msgstr "אין אפשרות לשנות את שם הקבוצה"
+
+msgid "Unable to delete group"
+msgstr "אין אפשרות למחוק את הקבוצה"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s הוסיפ/ה אותך לרשימת אנשי הקשר שלו או שלה."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s הסיר/ה אותך מרשימת אנשי הקשר שלו או שלה."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "אין משתמש כזה: %s"
+
+msgid "User lookup"
+msgstr "חיפוש משתמש"
 
 msgid "Reading challenge"
 msgstr "קורא תגובת-תיגר"
@@ -5396,13 +5233,21 @@ msgstr "אורך תגובת-תיגר לא צפוייה מהשרת"
 msgid "Logging in"
 msgstr "מתחבר"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] "אבד החיבור אל השרת (לא התקבל מידע תוך %d שניה)"
-msgstr[1] "אבד החיבור אל השרת (לא התקבל מידע תוך %d שניות)"
+msgid "MySpaceIM - No Username Set"
+msgstr "לא נקבע שם משתמש עבור MySpaceIM"
+
+msgid "You appear to have no MySpace username."
+msgstr "ככל הנראה אין לך משתמש של מייספייס."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "האם ברצונך לקבוע אחד כעת? (הערה: לא ניתן לשינוי!)"
+
+msgid "Lost connection with server"
+msgstr "אבד החיבור עם השרת"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "הודעות דוא\"ל חדשות"
 
@@ -5421,39 +5266,35 @@ msgstr "הערות-תמונה חדשות"
 msgid "MySpace"
 msgstr "מייספס"
 
-msgid "MySpaceIM - No Username Set"
-msgstr "לא נקבע שם משתמש עבור MySpaceIM"
-
-msgid "You appear to have no MySpace username."
-msgstr "ככל הנראה אין לך משתמש של מייספייס."
+msgid "IM Friends"
+msgstr "חברי בהודעות מידיות"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr "האם ברצונך לקבוע אחד כעת? (הערה: לא ניתן לשינוי!)"
+#, c-format
+msgid "%d buddy was added or updated from the server (including buddies already on the server-side list)"
+msgid_plural "%d buddies were added or updated from the server (including buddies already on the server-side list)"
+msgstr[0] "%d איש-קשר נוסף או עודכן מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
+msgstr[1] "%d אנשי-קשר נוספו או עודכנו מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "מחובר"
+msgid "Add contacts from server"
+msgstr "הוסף אנשי-קשר מהשרת"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "שגיאת פרוטוקול, קוד %d: %s"
 
 #, c-format
-msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
-msgstr ""
-"%s סיסמתך הינה באורך %d תוים, יותר מהאורך המצופה של %d עבור MySpaceIM (מערכת "
-"הודעות מיידיות במייספייס).יש לקצר את הסיסמא בדףhttp://profileedit.myspace."
-"com/index.cfm?fuseaction=accountSettings.changePassword ולנסות שנית."
+msgid "%s Your password is %zu characters, which is longer than the maximum length of %d.  Please shorten your password at http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr "%s סיסמתך הינה באורך %zu תוים, יותר מהאורך המצופה של %d. יש לקצר את הסיסמא באתר http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword ולנסות שנית."
+
+msgid "Incorrect username or password"
+msgstr "שם משתמש או סיסמה שגויים"
 
 msgid "MySpaceIM Error"
 msgstr "שגיאת MySpaceIM"
 
+msgid "Invalid input condition"
+msgstr "תנאי קליטה שגוי"
+
 msgid "Failed to add buddy"
 msgstr "כשל בהוספת איש-קשר"
 
@@ -5463,13 +5304,6 @@ msgstr "כשל בפקודת 'addbuddy'."
 msgid "persist command failed"
 msgstr "כישלון בפקודת persist"
 
-#, c-format
-msgid "No such user: %s"
-msgstr "אין משתמש כזה: %s"
-
-msgid "User lookup"
-msgstr "חיפוש משתמש"
-
 msgid "Failed to remove buddy"
 msgstr "כשל בהסרת איש-קשר"
 
@@ -5479,36 +5313,14 @@ msgstr "פקודת 'delbuddy' נכשלה"
 msgid "blocklist command failed"
 msgstr "פקודת blocklist נכשלה"
 
-msgid "Invalid input condition"
-msgstr "תנאי קליטה שגוי"
-
-msgid "Read buffer full (2)"
-msgstr "תור-הקריאה מלא (2)"
-
-msgid "Unparseable message"
-msgstr "הודעת שלא ניתנת לפיענוח"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "לא ניתן להתחבר לשרת: %s (%d)"
-
-msgid "IM Friends"
-msgstr "חברי בהודעות מידיות"
+msgid "Missing Cipher"
+msgstr "צופן חסר"
 
-#, c-format
-msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-"%d איש-קשר נוסף או עודכן מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
-msgstr[1] ""
-"%d אנשי-קשר נוספו או עודכנו מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
+msgid "The RC4 cipher could not be found"
+msgstr "צופן ה- RC4 לא נמצא"
 
-msgid "Add contacts from server"
-msgstr "הוסף אנשי-קשר מהשרת"
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgstr "יש לשדרג לגירסא של libpurple עם תמיכת RC4 (>= 2.0.1). תוסף MySpaceIM לא יטען."
 
 msgid "Add friends from MySpace.com"
 msgstr "הוסף חברים מתוך MySpace.com"
@@ -5550,9 +5362,6 @@ msgstr "(גודל גופן בסיסי (בנקודות"
 msgid "User"
 msgstr "משתמש"
 
-msgid "Profile"
-msgstr "פרופיל"
-
 msgid "Headline"
 msgstr "כותרת"
 
@@ -5565,15 +5374,8 @@ msgstr "סה\"כ חברים"
 msgid "Client Version"
 msgstr "גירסת לקוח"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "לא נקבע שם משתמש"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM - יש לקבוע סיסמה, בבקשה"
-
-msgid "Please enter a username to check its availability:"
-msgstr "יש להקליד שם משתמש לבדיקת זמינותו:"
+msgid "An error occurred while trying to set the username.  Please try again, or visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username to set your username."
+msgstr "קרתה שגיאה בעת קביעת שם המשתמש. יש לנסות שנית, או לגשת אל http://editprofile.myspace.com/index.cfm?fuseaction=profile.username על מנת לקבוע את שם המשתמש שלך."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - שם המשתמש זמין"
@@ -5584,12 +5386,22 @@ msgstr "שם המשתמש הינו זמין. האם ברצונך להשתמש ב
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "אחרי שנקבע, זה לא ניתן לשינוי!"
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - יש לקבוע סיסמה, בבקשה"
+
 msgid "This username is unavailable."
 msgstr "שם משתמש זה אינו זמין."
 
 msgid "Please try another username:"
 msgstr "יש לנסות שם משתמש אחר:"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "לא נקבע שם משתמש"
+
+msgid "Please enter a username to check its availability:"
+msgstr "יש להקליד שם משתמש לבדיקת זמינותו:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5781,15 +5593,10 @@ msgstr "לא ניתן להוסיף את עצמך"
 msgid "Master archive is misconfigured"
 msgstr "הארכיון הראשי מוגדר בצורה לא נכונה"
 
-msgid "Incorrect username or password"
-msgstr "שם משתמש או סיסמה שגויים"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "לא ניתן לזהות את השרת אותו הזנת"
 
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
+msgid "Your account has been disabled because too many incorrect passwords were entered"
 msgstr "חשבונך הושעה  עקב ריבוי הזנת סיסמאות שגויות"
 
 msgid "You cannot add the same person twice to a conversation"
@@ -5810,9 +5617,7 @@ msgstr "גירסת לא תואמת של הפרוטוקול"
 msgid "The user has blocked you"
 msgstr "משתמש זה חסם אותך"
 
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "גירסת הניסוי הזו אינה מאפשרת ליותר מ-10 משתמשים להתחבר בו זמנית"
 
 msgid "The user is either offline or you are blocked"
@@ -5823,8 +5628,8 @@ msgid "Unknown error: 0x%X"
 msgstr "שגיאה לא מוכרת: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "לא ניתן להתחבר (%s)."
+msgid "Unable to login: %s"
+msgstr "לא ניתן להתחבר: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5852,20 +5657,12 @@ msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "לא ניתן לשלוח הודעה. לא יכול ליצור את הועידה (%s)."
 
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"לא ניתן להעביר את המשתמש %s לתיקייה %s ברשימה אצל השרת.שגיאה בעת יצירת "
-"התיקייה (%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "לא ניתן להעביר את המשתמש %s לתיקייה %s ברשימה אצל השרת.שגיאה בעת יצירת התיקייה (%s)."
 
 #, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך.שגיאה ביצירת תיקייה ברשימת של השרת "
-"(%s)."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך.שגיאה ביצירת תיקייה ברשימת של השרת (%s)."
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
@@ -5926,9 +5723,6 @@ msgstr "ועידת GroupWise %d"
 msgid "Authenticating..."
 msgstr "מאמת..."
 
-msgid "Unable to connect to server."
-msgstr "לא ניתן להתחבר לשרת"
-
 msgid "Waiting for response..."
 msgstr "ממתין לתשובה..."
 
@@ -5952,23 +5746,13 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "האם ברצונך להצטרף לשיחה?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "נותקת כיוון שהתחברת ממחשב אחר."
-
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "ככל הנראה, %s אינו מחובר ולא קיבל את ההודעה ששלחת הרגע."
 
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת השרת שברצונך להתחבר אליו."
-
-msgid "Error. SSL support is not installed."
-msgstr "שגיאה. לא מותקנת תמיכה ב-SSL."
+msgid "Unable to connect to server. Please enter the address of the server to which you wish to connect."
+msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת השרת אליו ברצונך להתחבר."
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ועידה זו נסגרה. לא ניתן לשלוח עוד הודעות."
 
@@ -5991,25 +5775,28 @@ msgstr "כתובת שרת"
 msgid "Server port"
 msgstr "פורט השרת"
 
+msgid "Received unexpected response from "
+msgstr "התקבלה תגובה לא-צפויה מאת"
+
+#. username connecting too frequently
+msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
+msgstr "התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, תיאלץ להמתין אפילו יותר."
+
+#, c-format
+msgid "Error requesting "
+msgstr "שגיאה בבקשה"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL אינם מאפשרים לאמת את שם המשתמש שלך כאן"
+
 msgid "Could not join chat room"
 msgstr "לא ניתן להתחבר אל חדר הצ'אט"
 
 msgid "Invalid chat room name"
 msgstr "שם החדר אינו תקף"
 
-msgid "Server closed the connection."
-msgstr "השרת סגר את החיבור."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"אבדה התקשורת עם השרת:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "התקבל מידע שגוי בחיבור עם השרת."
+msgid "Received invalid data on connection with server"
+msgstr "התקבל מידע שגוי בעת חיבור עם השרת."
 
 #. *< type
 #. *< ui_requirement
@@ -6025,7 +5812,7 @@ msgid "AIM Protocol Plugin"
 msgstr "תוסף פרוטוקולים AIM"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "ICQ UIN..."
 
 #. *< type
 #. *< ui_requirement
@@ -6056,19 +5843,15 @@ msgstr "אבד החיבור עם המשתמש המרוחק:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "התקבל מידע שגוי בחיבור עם המשתמש המרוחק."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "לא ניתן ליצור חיבור עם המשתמש המרוחק."
 
 msgid "Direct IM established"
 msgstr "בוצע חיבור ישיר"
 
 #, c-format
-msgid ""
-"%s tried to send you a %s file, but we only allow files up to %s over Direct "
-"IM.  Try using file transfer instead.\n"
-msgstr ""
-"%s ניסה לשלוח קובץ %s אליך, אבל אנו מאפשרים רק קבצים עד %s מעל Direct IM.  "
-"במקום זאת, יש לנסות להעביר את הקובץ בעזרת מנגנון העברת הקבצים.\n"
+msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
+msgstr "%s ניסה לשלוח קובץ %s אליך, אבל אנו מאפשרים רק קבצים עד %s מעל Direct IM.  במקום זאת, יש לנסות להעביר את הקובץ בעזרת מנגנון העברת הקבצים.\n"
 
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -6146,23 +5929,12 @@ msgstr "התור מלא"
 msgid "Not while on AOL"
 msgstr "לא בזמן שהות ב-AOL"
 
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking with "
-"is probably using a different encoding than expected.  If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-"(הייתה שגיאה בעת קבלת הודעה זו.  איש-הקשר איתו בשיחה כנראה משתמש בקידוד שונה "
-"מן המצופה. אם הינך יודע/ת באיזה קידוד הוא משתמש, ניתן להגדיר זאת בהגדרות "
-"המתקדמות של החשבון עבור החשבון הזה של AIM/ICQ.)"
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "(הייתה שגיאה בעת קבלת הודעה זו.  איש-הקשר איתו בשיחה כנראה משתמש בקידוד שונה מן המצופה. אם הינך יודע/ת באיזה קידוד הוא משתמש, ניתן להגדיר זאת בהגדרות המתקדמות של החשבון עבור החשבון הזה של AIM/ICQ.)"
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(הייתה תקלה בקבלת הודעה זו. או שלך ולמשתמש %s יש קידודים שונים,או שלמשתמש %s "
-"יש תוכנה עם באגים.)"
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+msgstr "(הייתה תקלה בקבלת הודעה זו. או שלך ולמשתמש %s יש קידודים שונים,או שלמשתמש %s יש תוכנה עם באגים.)"
 
 #. Label
 msgid "Buddy Icon"
@@ -6231,23 +6003,18 @@ msgstr "מצלמה"
 msgid "Screen Sharing"
 msgstr "שיתוף מסך"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "פנוי לשיחה"
 
-#, c-format
 msgid "Not Available"
 msgstr "לא זמין"
 
-#, c-format
 msgid "Occupied"
 msgstr "עסוק"
 
-#, c-format
 msgid "Web Aware"
 msgstr "מודע רשת"
 
-#, c-format
 msgid "Invisible"
 msgstr "בלתי נראה"
 
@@ -6261,20 +6028,12 @@ msgid "Buddy Comment"
 msgstr "הערת איש קשר"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"לא ניתן להתחבר לשרת האימות:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "לא ניתן להתחבר לשרת האימות: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"לא ניתן להתחבר לשרת ה-BOS:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "לא ניתן להתחבר לשרת ה-BOS: %s"
 
 msgid "Username sent"
 msgstr "שם משתמש נשלח"
@@ -6287,52 +6046,47 @@ msgid "Finalizing connection"
 msgstr "מבצע גימור לחיבור"
 
 #, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"לא ניתן להתחבר: לא היה ניתן להתחבר בתור %s כיוון ששם-תצוגה זה אינו תקף. שמות-"
-"תצוגה חייבים להיות כתובות אימייל חוקיות, או להתחיל באות ולהכיל רק אותיות "
-"מספרים ורווחים, או לחלופין להכיל אך ורק מספרים."
+msgid "Unable to sign on as %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "לא ניתן להתחבר בתור %s כיוון ששם משתמש זה אינו תקף. שמות משתמשים חייבים להיות כתובות אימייל חוקיות, או לחילופין להתחיל באות ולהכיל רק אותיות מספרים ורווחים, או לחילופין להכיל אך ורק מספרים."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "שם משתמש לא תקף."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "ייתכן ותנותק/י בקרוב. במידה וכך יש לבדוק  %s לעידכונים."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "לא מצליח להשיג קוד התחברות תקף של AIM."
+
+msgid "Unable to get a valid login hash."
+msgstr "לא מצליח להשיג קוד התחברות תקף."
 
-msgid "Incorrect password."
-msgstr "סיסמה לא נכונה."
+msgid "Received authorization"
+msgstr "התקבלה הרשאה"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "שם המשתמש אינו קיים"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "חשבונך מושעה כרגע."
+msgid "Your account is currently suspended"
+msgstr "חשבונך מושעה כרגע"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "שירות ההודעות של AOL לא זמין כרגע."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, "
-"תיאלץ להמתין אפילו יותר."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "גירסת תוכנת הלקוח בה את/ה משתמש/ת ישנה מדי. אנא שדרג/י ב-%s"
 
-msgid "Could Not Connect"
-msgstr "לא ניתן להתחבר"
-
-msgid "Received authorization"
-msgstr "התקבלה הרשאה"
+#. IP address connecting too frequently
+msgid "You have been connecting and disconnecting too frequently. Wait a minute and try again. If you continue to try, you will need to wait even longer."
+msgstr "התחברת והתנתקת בתדירות גבוהה מדיי. יש להמתין דקה ולנסות שנית. אם תמשיכ/י לנסות, תיאלצ/י להמתין אפילו יותר."
 
-msgid "The SecurID key entered is invalid."
-msgstr "המפתח עבור SecurID אינו תקף."
+msgid "The SecurID key entered is invalid"
+msgstr "המפתח SecurID שהוזן אינו תקף."
 
 msgid "Enter SecurID"
 msgstr "יש להזין SecurID"
@@ -6340,30 +6094,6 @@ msgstr "יש להזין SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "יש להזין את קוד 6 הספרות מהתצוגה הדיגיטלית."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "אישור"
-
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"ייתכן ותנותק/י בקרוב. אולי תרצ/י להיעזר ב-TOC עד אשר זה יתוקן. אפשר לבדוק ב%"
-"s לעידכונים."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "לא מצליח להשיג קוד התחברות תקף של AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "ייתכן ותנותק/י בקרוב. יש לבדוק את %s לעידכונים."
-
-msgid "Unable to get a valid login hash."
-msgstr "לא מצליח להשיג קוד התחברות תקף."
-
 msgid "Password sent"
 msgstr "הסיסמא נשלחה"
 
@@ -6373,12 +6103,6 @@ msgstr "לא ניתן לאתחל חיבור"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "בבקשה, תנ/י לי אישור כדי להוסיף אותך לרשימת אנשי הקשר שלי."
 
-msgid "Authorization Request Message:"
-msgstr "הודעת בקשה להרשאה:"
-
-msgid "Please authorize me!"
-msgstr "בבקשה, אני רוצה הרשאה!"
-
 msgid "No reason given."
 msgstr "לא ניתנה סיבה."
 
@@ -6387,8 +6111,7 @@ msgstr "הודעת סירוב הרשאה"
 
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "המשתמש %u דחה את בקשתך להוסיף אותם לרשימת אנשי הקשר שלהם מהסיבה להלן:\n"
@@ -6464,25 +6187,20 @@ msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שהיא היתה ג
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שהן היו גדולות מדי."
 
 #, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שמהירות השליחה מופרזת."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שמהירות השליחה מופרזת."
 
 #, c-format
-msgid ""
-"You missed %hu message from %s because his/her warning level is too high."
-msgid_plural ""
-"You missed %hu messages from %s because his/her warning level is too high."
+msgid "You missed %hu message from %s because his/her warning level is too high."
+msgid_plural "You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] "לא קיבלת %hu הודעה מאת %s בגלל שרמת האזהרה של השולח גבוהה מדי."
 msgstr[1] "לא קיבלת %hu הודעות מאת %s בגלל שרמת האזהרה של השולח גבוהה מדי."
 
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
-msgid_plural ""
-"You missed %hu messages from %s because your warning level is too high."
+msgid_plural "You missed %hu messages from %s because your warning level is too high."
 msgstr[0] "לא קיבלת %hu הודעה מאת %s בגלל שרמת-האזהרה שלך גבוהה מדי."
 msgstr[1] "לא קיבלת %hu הודעות מאת %s בגלל שרמת-האזהרה שלך גבוהה מדי."
 
@@ -6492,7 +6210,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "פספסת %hu הודעה מאת %s מסיבה לא ידועה."
 msgstr[1] "פספסת %hu הודעות מאת %s מסיבה לא ידועה."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "לא ניתן לשלוח הודעה: %s"
@@ -6514,21 +6232,21 @@ msgstr "מחובר מאז"
 msgid "Member Since"
 msgstr "חבר מאז"
 
+msgid "Capabilities"
+msgstr "יכולות"
+
+msgid "Profile"
+msgstr "פרופיל"
+
 msgid "Your AIM connection may be lost."
 msgstr "החיבור AIM שלך אולי יתנתק."
 
 #. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "[לא ניתן להציג הודעה ממשתמש זה כיוון שהיא מכילה תווים לא חוקיים.]"
 
-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 ""
-"הפעולה האחרונה שניסית לבצע לא התבצעה כיוון שאתה הפרזת במהירות שליחת ההודעת "
-"יש לחכות 10 שניות ולנסות שנית."
+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 "הפעולה האחרונה שניסית לבצע לא התבצעה כיוון שאתה הפרזת במהירות שליחת ההודעת יש לחכות 10 שניות ולנסות שנית."
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -6581,44 +6299,28 @@ msgid "Account Confirmation Requested"
 msgstr "התקבלה בקשה לאישור החשבון"
 
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format username because the requested name differs "
-"from the original."
-msgstr ""
-"שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש שונה מהשם המקורי."
+msgid "Error 0x%04x: Unable to format username because the requested name differs from the original."
+msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש שונה מהשם המקורי."
 
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש לא תקני."
 
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format username because the requested name is too "
-"long."
+msgid "Error 0x%04x: Unable to format username because the requested name is too long."
 msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש ארוך מדי."
 
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
-"request pending for this username."
-msgstr ""
-"שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שיש כבר בקשה מחכה עבור "
-"משתמש זה."
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this username."
+msgstr "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שיש כבר בקשה מחכה עבור משתמש זה."
 
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
-"too many usernames associated with it."
-msgstr ""
-"שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת הנתונה מיוחסת "
-"ליותר מדי שמות משתמשים."
+msgid "Error 0x%04x: Unable to change email address because the given address has too many usernames associated with it."
+msgstr "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת הנתונה מיוחסת ליותר מדי שמות משתמשים."
 
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
-"invalid."
-msgstr ""
-"שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת שניתנה לא חוקית."
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgstr "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת שניתנה לא חוקית."
 
 #, c-format
 msgid "Error 0x%04x: Unknown error."
@@ -6634,28 +6336,18 @@ msgstr "כתובת הדוא\"ל של %s היא %s"
 msgid "Account Info"
 msgstr "מידע על החשבון"
 
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "הודעת-התמונה לא נשלחה. עליך להיות מחובר/ת בתקשורת ישירה לשלוח תמונות."
 
 msgid "Unable to set AIM profile."
 msgstr "אין אפשרות לקבוע את פרופיל ה-AIM."
 
-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 ""
-"ככל הנראה ניסית לקבוע את פרופיל המשתמש שלך לפני סיום תהליך האימות. הפרופיל "
-"לא השתנה; יש לנסות שנית לאחר סיום תהליך האימות."
+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 "ככל הנראה ניסית לקבוע את פרופיל המשתמש שלך לפני סיום תהליך האימות. הפרופיל לא השתנה; יש לנסות שנית לאחר סיום תהליך האימות."
 
 #, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "עברת את אורך הפרופיל המקסימלי של %d בייט. הפרופיל קוצר עבורך."
 msgstr[1] "עברת את אורך הפרופיל המקסימלי של %d בייטים. הפרופיל קוצר עבורך."
 
@@ -6663,12 +6355,8 @@ msgid "Profile too long."
 msgstr "הפרופיל ארוך מדי."
 
 #, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "עברת את אורך הודעת הריחוק המקסימלי של %d בייט. הוא קוצר עבורך."
 msgstr[1] "עברת את אורך הודעת הריחוק המקסימלי של %d בייטים. הוא קוצר עבורך."
 
@@ -6676,53 +6364,32 @@ msgid "Away message too long."
 msgstr "הודעת הריחוק מהמחשב ארוכה מדי."
 
 #, c-format
-msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
-"be a valid email address, or start with a letter and contain only letters, "
-"numbers and spaces, or contain only numbers."
-msgstr ""
-"לא ניתן להוסיף את איש הקשר %s מכיוון ששם-התצוגה שלו לא חוקי. שמות-תצוגה "
-"חייבים להתחיל באות ולהכיל רק אותיות, מספרים ורווחים, או רק להכיל מספרים."
+msgid "Unable to add the buddy %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "לא ניתן להוסיף את החבר %s מכיוון ששם המשתמש שלו לא חוקי. שמות-משתמשים מוכרחים להיות כתובות אימייל תקפות, או לחילופין להתחיל באות ולהכיל רק אותיות, מספרים ורווחים, או לחילופין להכיל רק מספרים."
 
-#, fuzzy
-msgid "Unable to Add"
-msgstr "לא ניתן להוסיף"
-
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "כשלון בשליפת רשימת אנשי הקשר"
+msgstr "לא ניתן לשלוף את רשימת החברים"
 
-msgid ""
-"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few minutes."
-msgstr ""
-"שרתי ה-AIM זמנית לא יכלו לשלוח את רשימת אנשי הקשר שלך. הרשימה לא אבדה, וככל "
-"הנראה תהייה זמינה בדקות הקרובות."
+msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few minutes."
+msgstr "שרתי ה-AIM זמנית לא יכלו לשלוח את רשימת אנשי הקשר שלך. הרשימה לא אבדה, וככל הנראה תהייה זמינה בדקות הקרובות."
 
 msgid "Orphans"
 msgstr "יתומים"
 
 #, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך, כיוון שיש יותר מדי אנשי קשר "
-"ברשימה. יש להסיר אחד ולנסות שנית."
+msgid "Unable to add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "לא ניתן להוסיף את %s לרשימת החברים שלך, כיוון שיש יותר מדי חברים ברשימה. יש להסיר אחד ולנסות שנית."
 
 msgid "(no name)"
 msgstr "(ללא שם)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr "לא היה ניתן להוסיף את איש הקשר %s מסיבה לא ידועה."
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "לא ניתן להוסיף את החבר%s מסיבה לא ידועה."
 
 #, c-format
-msgid ""
-"The user %s has given you permission to add him or her to your buddy list.  "
-"Do you want to add this user?"
-msgstr ""
-"המשתמש %s התיר/ה לך להוסיף אותו/ה לרשימת אנשי הקשר שלך. האם ברצונך להוסיפו/ה?"
+msgid "The user %s has given you permission to add him or her to your buddy list.  Do you want to add this user?"
+msgstr "המשתמש %s התיר/ה לך להוסיף אותו/ה לרשימת אנשי הקשר שלך. האם ברצונך להוסיפו/ה?"
 
 msgid "Authorization Given"
 msgstr "ההרשאה ניתנה"
@@ -6738,8 +6405,7 @@ msgstr "ההרשאה ניתנה"
 #. Denied
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "המשתמש %s דחה את בקשתך להוסיף אותו לרשימת אנשי הקשר שלך מהסיבה להלן:\n"
@@ -6768,12 +6434,8 @@ msgstr "הערת איש קשר:"
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "בחרת לפתוח בתקשורת ישירה להודעות עם %s."
 
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
-msgstr ""
-"משום שפעולה זו חושפת את כתובת ה-IP שלך, יתכן והיא מהווה סיכון לביטחונך.  "
-"להמשיך בכל זאת?"
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "משום שפעולה זו חושפת את כתובת ה-IP שלך, יתכן והיא מהווה סיכון לביטחונך.  להמשיך בכל זאת?"
 
 msgid "C_onnect"
 msgstr "התחבר"
@@ -6781,6 +6443,7 @@ msgstr "התחבר"
 msgid "Get AIM Info"
 msgstr "הצג פרטי AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "ערוך הערת איש קשר"
 
@@ -6817,12 +6480,8 @@ msgstr "<i>אינך מחכה להרשאה</i>"
 msgid "You are awaiting authorization from the following buddies"
 msgstr "אתה מחכה להרשאה מאנשי הקשר להלן"
 
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"יש באפשרותך לבקש שוב הרשאה מאנשי קשר אלו ע\"י לחיצה ימנית עם העכבר עליהם "
-"ולבחור \"בקש הרשאה שוב\"."
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "יש באפשרותך לבקש שוב הרשאה מאנשי קשר אלו ע\"י לחיצה ימנית עם העכבר עליהם ולבחור \"בקש הרשאה שוב\"."
 
 msgid "Find Buddy by Email"
 msgstr "מצא איש קשר לפי דוא\"ל"
@@ -6839,6 +6498,7 @@ msgstr "חיפוש"
 msgid "Set User Info (web)..."
 msgstr "קבע את המידע על המשתמש (אתר)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "שנה סיסמא (אתר)"
 
@@ -6868,6 +6528,9 @@ msgstr "חפש איש-קשר עפ\"י כתובת דוא\"ל..."
 msgid "Search for Buddy by Information"
 msgstr "חפש איש-קשר עפ\"י מידע"
 
+msgid "Use clientLogin"
+msgstr "השתמש ב-clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6889,7 +6552,6 @@ msgstr "מבקש מ-%s להתחבר אלינו אל %s:%hu לתקשורת ישי
 msgid "Attempting to connect to %s:%hu."
 msgstr "מנסה להתחבר אל %s:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "מנסה להתחבר דרך שרת תיווך..."
 
@@ -6897,13 +6559,8 @@ msgstr "מנסה להתחבר דרך שרת תיווך..."
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ביקש כעת להתחבר ישירות אל %s"
 
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"זה דורש חיבור ישיר בין שני המחשבים, ונחוץ עבור תמונות בהודעות. מכיוון שכתובת "
-"ה-IP שלך תיחשף, ייתכן וזה ייחשב כסיכון לפרטיותך."
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "זה דורש חיבור ישיר בין שני המחשבים, ונחוץ עבור תמונות בהודעות. מכיוון שכתובת ה-IP שלך תיחשף, ייתכן וזה ייחשב כסיכון לפרטיותך."
 
 msgid "Aquarius"
 msgstr "דלי"
@@ -6980,16 +6637,14 @@ msgstr "חזיר"
 msgid "Other"
 msgstr "אחר"
 
-#, fuzzy
 msgid "Visible"
-msgstr "בלתי נראה"
+msgstr "נראה"
 
-msgid "Firend Only"
-msgstr ""
+msgid "Friend Only"
+msgstr "חבר בלבד"
 
-#, fuzzy
 msgid "Private"
-msgstr "פרטיות"
+msgstr "פרטי"
 
 msgid "QQ Number"
 msgstr "מספר QQ"
@@ -7006,9 +6661,8 @@ msgstr "מיקוד"
 msgid "Phone Number"
 msgstr "מםפר טלפון"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "לתת אישור לחבר?"
+msgstr "אישור הוספה"
 
 msgid "Cellphone Number"
 msgstr "מםפר פלאפון"
@@ -7016,132 +6670,136 @@ msgstr "מםפר פלאפון"
 msgid "Personal Introduction"
 msgstr "הצגה אישית"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "עיר"
+msgstr "עיר/איזור"
 
-#, fuzzy
 msgid "Publish Mobile"
-msgstr "טלפון נייד"
+msgstr "פרסם טל. נייד"
 
-#, fuzzy
 msgid "Publish Contact"
-msgstr "שם נוסף לאיש קשר"
+msgstr "פרסם איש-קשר"
 
 msgid "College"
 msgstr "מכללה"
 
-#, fuzzy
 msgid "Horoscope"
-msgstr "סמל הורוסקופ"
+msgstr "הורוסקופ"
 
-#, fuzzy
 msgid "Zodiac"
-msgstr "סמל מן המזלות"
+msgstr "גלגל המזלות"
 
-#, fuzzy
 msgid "Blood"
-msgstr "חסום"
+msgstr "סוג דם"
 
-#, fuzzy
 msgid "True"
-msgstr "שור"
+msgstr "אמת"
 
-#, fuzzy
 msgid "False"
-msgstr "נכשל"
+msgstr "שקר"
 
-#, fuzzy
 msgid "Modify Contact"
-msgstr "עריכת החשבון"
+msgstr "ערוך איש-קשר"
 
-#, fuzzy
 msgid "Modify Address"
-msgstr "כתובת בבית"
+msgstr "ערוך כתובת"
 
-#, fuzzy
 msgid "Modify Extended Information"
-msgstr "ערוך את המידע שלי"
+msgstr "ערוך מידע נוסף"
 
-#, fuzzy
 msgid "Modify Information"
-msgstr "ערוך את המידע שלי"
+msgstr "ערוך מידע"
 
-#, fuzzy
 msgid "Update"
-msgstr "עודכן לאחרונה"
+msgstr "עדכן"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "יש להזין מידע על איש הקשר."
+msgstr "לא ניתן לשנות מידע של החבר."
+
+msgid "Mobile"
+msgstr "נייד"
+
+msgid "Note"
+msgstr "הערה"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "מזכר חבר"
+
+msgid "Change his/her memo as you like"
+msgstr "ניתן לערוך את הטקסט של החבר כרצונך"
+
+msgid "_Modify"
+msgstr "_ערוך"
+
+msgid "Memo Modify"
+msgstr "עריכת מזכר"
+
+msgid "Server says:"
+msgstr "השרת אומר:"
+
+msgid "Your request was accepted."
+msgstr "בקשתך נתקבלה."
+
+msgid "Your request was rejected."
+msgstr "בקשתך נדחתה."
 
 #, c-format
-msgid "%d needs Q&A"
-msgstr ""
+msgid "%u requires verification"
+msgstr "נדרש אימות מאת %u"
 
-#, fuzzy
-msgid "Add buddy Q&A"
-msgstr "הוסף איש קשר"
+msgid "Add buddy question"
+msgstr "הוסף שאלת חבר"
 
-#, fuzzy
-msgid "Input answer here"
-msgstr "יש להזין את הבקשה כאו"
+msgid "Enter answer here"
+msgstr "יש להזין את התשובה כאן"
 
 msgid "Send"
 msgstr "שלח"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "שם משתמש לא תקף."
+msgstr "תשובה לא תקפה."
 
 msgid "Authorization denied message:"
 msgstr "הודעת סירוב הרשאה:"
 
-#, fuzzy
-msgid "Sorry, You are not my style."
-msgstr "סליחה, את/ה לא הטיפוס שלי..."
+msgid "Sorry, you're not my style."
+msgstr "סליחה, את/ה לא הטיפוס שלי."
 
-#, fuzzy, c-format
-msgid "%d needs authentication"
-msgstr "משתמש %d דורש אימות"
+#, c-format
+msgid "%u needs authorization"
+msgstr "%u דורש אימות"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "להוסיף את איש הקשר לרשימה שלך?"
+msgstr "הוסף אימות חבר"
 
-msgid "Input request here"
-msgstr "יש להזין את הבקשה כאו"
+msgid "Enter request here"
+msgstr "יש להזין את הבקשה כאן"
 
 msgid "Would you be my friend?"
 msgstr "התרצ/י להיות ידיד/ה שלי?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "איש הקשר"
+msgstr "חבר QQ"
 
-#, fuzzy
 msgid "Add buddy"
-msgstr "הוסף איש קשר"
+msgstr "הוסף חבר"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "פרצוף QQ לא תקף"
+msgstr "מספר QQ לא תקף"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "בבקשה, אני רוצה הרשאה!"
+msgstr "כשל בשליחת אישור"
 
-#, fuzzy, c-format
-msgid "Failed removing buddy %d"
-msgstr "כשל בהסרת איש-קשר"
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "כשל בהסרת חבר %u"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s הסיר/ה אותך מרשימת אנשי הקשר שלו או שלה."
+msgstr "כשל בהסרתי מרשימת החברים של %d"
 
-#, fuzzy
 msgid "No reason given"
-msgstr "לא ניתנה סיבה."
+msgstr "לא ניתנה סיבה"
 
 #. only need to get value
 #, c-format
@@ -7151,9 +6809,9 @@ msgstr "הוספת ע\"י %s"
 msgid "Would you like to add him?"
 msgstr "האם ברצונך להוסיף אותו?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "דחה"
+msgstr "נדחה על ידי %s"
 
 #, c-format
 msgid "Message: %s"
@@ -7168,81 +6826,73 @@ msgstr "ID לקבוצה"
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "אנא הזן את השם חדש עבור %s"
+msgstr "יש להזין מספר Qun"
 
-#, fuzzy
 msgid "You can only search for permanent Qun\n"
-msgstr "ניתן לחפש רק קבוצות QQ קבועות\n"
+msgstr "ניתן לחפש רק Qun קבועות\n"
+
+msgid "(Invalid UTF-8 string)"
+msgstr "(מחרוזת UTF-8 שגויה)"
 
-#, fuzzy
 msgid "Not member"
-msgstr "אני אינני חבר/ה"
+msgstr "לא חבר בקבוצה"
 
 msgid "Member"
 msgstr "חבר"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "חלון בקשה"
+msgstr "מבקש"
 
-#, fuzzy
 msgid "Admin"
-msgstr "Adium"
+msgstr "מנהל"
 
-#, fuzzy
 msgid "Notice"
-msgstr "הערה"
+msgstr "הודעה"
 
-#, fuzzy
 msgid "Detail"
-msgstr "ברירת המחדל"
+msgstr "פרטים"
 
 msgid "Creator"
 msgstr "יוצר"
 
-#, fuzzy
 msgid "About me"
-msgstr "אודות %s"
+msgstr "אודותי"
 
-#, fuzzy
 msgid "Category"
-msgstr "שגיאה בצ'אט"
+msgstr "קטגוריה"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr "קבוצה זו לא מאשרת לאחרים להצטרף"
+msgstr "ה-Qnn הזו לא מאשרת לאחרים להצטרף"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "הצטרף לצ'אט"
+msgstr "הצטרף אל QQ Qun"
+
+msgid "Input request here"
+msgstr "יש להזין את הבקשה כאו"
 
 #, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Successfully joined Qun %s (%u)"
+msgstr "צורף בהצלחה אל Qun %s (%u)"
 
-#, fuzzy
 msgid "Successfully joined Qun"
-msgstr "שינית בהצלחה את החבר-Qun"
+msgstr "צורף בהצלחה אל Qun"
 
 #, c-format
-msgid "Qun %d denied to join"
-msgstr ""
+msgid "Qun %u denied from joining"
+msgstr "Qun %u נאסר מלהצטרף"
 
 msgid "QQ Qun Operation"
 msgstr "פעולת QQ Qun"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "נכשל"
+msgstr "נכשל:"
 
-msgid "Join Qun, Unknow Reply"
-msgstr ""
+msgid "Join Qun, Unknown Reply"
+msgstr "תשובה לא מוכרת, Join Qun"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "QQ Qun"
+msgstr "יציאה מה-Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -7251,51 +6901,47 @@ msgstr ""
 "יש לשים לב, כי אם את/ה היוצר/ת, \n"
 "פעולה זו תביא בסופו של דבר להסרת ה-Qun."
 
-#, fuzzy
-msgid "Sorry, you are not our style ..."
-msgstr "סליחה, את/ה לא הטיפוס שלי..."
+msgid "Sorry, you are not our style"
+msgstr "סליחה, את/ה לא הטיפוס שלנו"
 
-#, fuzzy
-msgid "Successfully changed Qun member"
-msgstr "שינית בהצלחה את החבר-Qun"
+msgid "Successfully changed Qun members"
+msgstr "שינית בהצלחה את חברי ה-Qun"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
 msgstr "שינית בהצלחה מידע של ה-Qun"
 
 msgid "You have successfully created a Qun"
 msgstr "יצרת בהצלחה Qun"
 
-#, fuzzy
-msgid "Would you like to set detailed information now?"
-msgstr "האם ברצונך לקבוע את פרטי ה-Qun כעת?"
+msgid "Would you like to set up detailed information now?"
+msgstr "האם ברצונך כעת לקבוע את הפרטים?"
 
 msgid "Setup"
 msgstr "הגדרות"
 
-#, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
-msgstr "המשתמש %d ביקש להצטרף לקבוצה %d"
+#, c-format
+msgid "%u requested to join Qun %u for %s"
+msgstr "%u ביקש להצטרף אל Qun %u בשביל %s"
 
-#, fuzzy, c-format
-msgid "%d request to join Qun %d"
-msgstr "המשתמש %d ביקש להצטרף לקבוצה %d"
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr "%u ביקש להצטרף אל Qun %u"
 
-#, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
-msgstr "כישלון בהצטרפות לאיש קשר בצ'אט"
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "כשל בצטרפות אל Qun %u, המופעל על ידי המנהל %u"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
-msgstr ""
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr "<b>הצטרפות אל Qun %u מאושרת על ידי המנהל %u עבור %s</b>"
 
-#, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
-msgstr "הסר איש קשר"
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>הוסר חבר %u.</b>"
 
 #, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>חבר חדש %u הצטרף.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7319,9 +6965,8 @@ msgstr " קשרנייד"
 msgid " Video"
 msgstr " וידאו"
 
-#, fuzzy
 msgid " Zone"
-msgstr "ללא"
+msgstr "איזור"
 
 msgid "Flag"
 msgstr "דגל"
@@ -7332,110 +6977,113 @@ msgstr "גרסא"
 msgid "Invalid name"
 msgstr "שם משתמש שגוי"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "בחירת תיקיה..."
+msgstr "בחירת סמל..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>זמן כניסה</b>: %s<br>\n"
+msgstr "<b>זמן כניסה</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>כרגע מחוברים</b>: %d<br>\n"
+msgstr "<b>סך-הכל חברים מחוברים</b>: %d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>עידכון אחרון</b>: %s<br>\n"
+msgstr "<b>עידכון אחרון</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>שרת</b>: %s: %d<br>\n"
+msgstr "<b>שרת</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>זמן כניסה</b>: %s<br>\n"
+msgstr "<b>תגית לקוח</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>סוג החיבור</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>סוג החיבור</b>: %s<br>\n"
+msgstr "<b>כתובתי באינטרנט</b>: %s:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>שרת</b>: %s: %d<br>\n"
+msgstr "<b>נשלח</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>עידכון אחרון</b>: %s<br>\n"
+msgstr "<b>נשלח שוב</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>עידכון אחרון</b>: %s<br>\n"
+msgstr "<b>אבד</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>שרת</b>: %s: %d<br>\n"
+msgstr "<b>התקבל</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>כתובתי המפורסמת</b>: %s<br>\n"
+msgstr "<b>התקבל במכופל</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>זמן כניסה</b>: %s<br>\n"
+msgstr "<b>זמן</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>שרת</b>: %s: %d<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
 msgstr "מידע על הכניסה"
 
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>מחבר מקורי</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>תורמי קוד</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<b>עידכון אחרון</b>: %s<br>\n"
+msgstr "<p><b>כותבי-טלאי נפלאים</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>שרת</b>: %s: %d<br>\n"
+msgstr "<p><b>הכרת-תודה</b>:<br>\n"
+
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>בודקי-תוכנה קפדניים</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "ועוד, אנא הודיעו לי... תודה!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>וכן, כל החבר'ה בחדר האחורי...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
+msgstr "<i>הרגישו חופשי להצטרף אלינו!</i> :)"
 
-#, fuzzy, c-format
-msgid "About OpenQ r%s"
-msgstr "אודות %s"
+#, c-format
+msgid "About OpenQ %s"
+msgstr "אודות OpenQ %s"
 
-#, fuzzy
 msgid "Change Icon"
-msgstr "שמירת סמל"
+msgstr "שנה סמל"
 
 msgid "Change Password"
 msgstr "שנה סיסמא"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "מידע על הכניסה"
+msgstr "מידע על החשבון"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "עדכן את כל QQ Quns"
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "אודות %s"
+msgstr "אודות OpenQ"
+
+msgid "Modify Buddy Memo"
+msgstr "ערוך מזכר על החבר"
 
 #. *< type
 #. *< ui_requirement
@@ -7447,59 +7095,48 @@ msgstr "אודות %s"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "פרוטוקול QQ\tתוסף"
+msgstr "פרוטוקול תוסף QQ"
 
-#, fuzzy
 msgid "Auto"
-msgstr "מחבר"
+msgstr "אוטומטי"
 
-#, fuzzy
 msgid "Select Server"
-msgstr "בחר משתמש"
+msgstr "בחר שרת"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
+msgstr "QQ2008"
 
-#. #endif
-#, fuzzy
 msgid "Connect by TCP"
-msgstr "מתחבר בעזרת TCP"
+msgstr "התחבר בעזרת TCP"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "פורט השרת"
+msgstr "הצג הודעת שרת"
 
-#, fuzzy
 msgid "Show server news"
-msgstr "כתובת שרת"
+msgstr "הצג חדשות שרת"
+
+msgid "Show chat room when msg comes"
+msgstr "הצג חדר-צ'אט כשמתקבלת הודעה"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "פרקי-זמן להודעות הישאר-בחיים"
+msgstr "פרקי-זמן להודעות הישאר-בחיים (בשניות)"
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "פרק זמן בין עידכונים"
+msgstr "פרק זמן בין עידכונים (שניות)"
 
-#, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
-msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
+msgid "Unable to decrypt server reply"
+msgstr "אין אפשרות לפענוח המשוב מהשרת"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "כישלון בבקשת token, 0x%02X"
 
 #, c-format
 msgid "Invalid token len, %d"
@@ -7507,156 +7144,122 @@ msgstr "אורך סמל לא תקף, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX אינו נתמך כרגע"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "נדרשת הרשמה"
+msgstr "נדרשת הפעלה"
 
-#, fuzzy, c-format
-msgid "Unknow reply code when login (0x%02X)"
-msgstr "קוד-תגובה שגוי, 0x%02X"
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "משוב לא מוכר בעת התחברות (0x%02X)"
 
-msgid "Keep alive error"
-msgstr "שגיאה בהשאר-חי"
+msgid "Requesting captcha"
+msgstr "מבקש וידוא-אדם"
 
-#, fuzzy
-msgid "Requesting captcha ..."
-msgstr "מבקש/ת את תשומת-הלב של %s..."
+msgid "Checking captcha"
+msgstr "בודק וידוא-אדם"
 
-msgid "Checking code of captcha ..."
-msgstr ""
+msgid "Failed captcha verification"
+msgstr "כישלון וידוא-אדם"
 
-msgid "Failed captcha verify"
-msgstr ""
-
-#, fuzzy
 msgid "Captcha Image"
-msgstr "שמור תמונה"
+msgstr "תמונת captcha"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "הזן סיסמא"
+msgstr "הזן קוד"
 
-msgid "QQ Captcha Verifing"
-msgstr ""
+msgid "QQ Captcha Verification"
+msgstr "וידוא-אדם של QQ"
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "יש להזין את שם הקבוצה"
+msgstr "יש להזין את הטקסט מהתמונה"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
-msgstr ""
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "משוב לא מוכר בעת בדיקת סיסמא (0x%02X)"
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "לא ניתן להתחבר"
+"קוד-משוב לא מוכר בעת התחברות (0x%02X):\n"
+"%s"
 
 msgid "Socket error"
 msgstr "שגיאת שקע"
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"אבדה התקשורת עם שרת:\n"
-"%d, %s"
+msgid "Getting server"
+msgstr "שולף שרת"
 
-msgid "Unable to read from socket"
-msgstr "אין אפשרות לקרוא מן השקע"
+msgid "Requesting token"
+msgstr "מבקש סמלון"
 
-msgid "Write Error"
-msgstr "שגיאה בכתיבה"
-
-msgid "Connection lost"
-msgstr "החיבור אבד"
+msgid "Unable to resolve hostname"
+msgstr "לא ניתן לתרגם את שם השרת לכתובת"
 
-#, fuzzy
-msgid "Get server ..."
-msgstr "קבע את המידע על המשתמש..."
-
-#, fuzzy
-msgid "Request token"
-msgstr "הבקשה נדחית"
-
-msgid "Couldn't resolve host"
-msgstr "לא ניתן למצוא כתובת שרת"
-
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "מספר שגיאה לא תקף."
+msgstr "שרת או יציאה לא-חוקיים"
 
-#, fuzzy
-msgid "Connecting server ..."
-msgstr "שרת ההתחברות"
+msgid "Connecting to server"
+msgstr "מתחבר לשרת"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "שגיאת QQid"
+msgstr "שגיאת QQ"
 
-msgid "Failed to send IM."
-msgstr "כישלון בשליחת הודעה."
-
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "ניתוב שרת ICQ"
+msgstr ""
+"חדשות שרת:\n"
+"%s\n"
+"%s\n"
+"%s"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "מאת"
+msgstr "מאת %s:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "הנחיות שרת: %s"
-
-msgid "Unknow SERVER CMD"
 msgstr ""
+"הודעת שרת מאת %s: \n"
+"%s"
 
-#, fuzzy, c-format
+msgid "Unknown SERVER CMD"
+msgstr "SERVER CMD לא מוכר"
+
+#, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
-"משוב %s(0x%02X )\n"
-"נשלח %s(0x%02X )\n"
-"מזהה חדר %d, משוב [0x%02X]: \n"
-"%s"
+"משוב שגיאה של %s(0x%02X)\n"
+"חדר %u, משוב 0x%02X"
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "פקודה"
+msgstr "פקודת QQ Qun"
 
-#, fuzzy, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr "אינך חבר/ה בקבוצה \"%s\"\n"
+msgid "Unable to decrypt login reply"
+msgstr "אין אפשרות לפענוח המשוב לניסיון ההתחברות"
 
-msgid "Can not decrypt login reply"
-msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
-
-#, fuzzy
-msgid "Unknow LOGIN CMD"
-msgstr "סיבה לא ידועה"
+msgid "Unknown LOGIN CMD"
+msgstr "LOGIN CMD לא מוכר"
 
-#, fuzzy
-msgid "Unknow CLIENT CMD"
-msgstr "סיבה לא ידועה"
+msgid "Unknown CLIENT CMD"
+msgstr "CLIENT CMD לא מוכר"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -7669,9 +7272,6 @@ msgstr "שליחת קובץ"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ביטל את העברת %s"
 
-msgid "Connection closed (writing)"
-msgstr "החיבור נסגר (כתיבה)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>שם קבוצה:</b> %s<br>"
@@ -7718,24 +7318,12 @@ msgid "Starting Services"
 msgstr "מפעיל שירותים"
 
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
+msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "אדמיניסטרטור Sametime שם את ההודעה להלן על השרת %s"
 
 msgid "Sametime Administrator Announcement"
 msgstr "הודעה מאת אדמיניסטרטור Sametime"
 
-msgid "Connection reset"
-msgstr "החיבור אותחל"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "שגיאה בקריאת נתונים מהשקע: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "לא ניתן להתחבר לשרת"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "הודעה מאת %s"
@@ -7758,6 +7346,9 @@ msgstr "רמקולים"
 msgid "Video Camera"
 msgstr "מצלמת וידאו"
 
+msgid "File Transfer"
+msgstr "משלוח קבצים"
+
 msgid "Supports"
 msgstr "תומכים"
 
@@ -7768,9 +7359,7 @@ msgid "Create conference with user"
 msgstr "צור שיחת ועידה עם המשתמש"
 
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
 msgstr "יש להזין נושא עבוד שיחת הועידה, והודעת הזמנה שתישלח אל %s"
 
 msgid "New Conference"
@@ -7789,13 +7378,8 @@ msgid "Invite user to a conference"
 msgstr "הזמן משתמש אל ועידה"
 
 #, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr ""
-"בחר שיחת ועידה מהרשימה להלן לשלוח הזמנה למשתמש %s.בחר \"צור ועידה חדשה\" אם "
-"ברצונך ליצור ועידה חדשה להזמין אליה משתמש זה."
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "בחר שיחת ועידה מהרשימה להלן לשלוח הזמנה למשתמש %s.בחר \"צור ועידה חדשה\" אם ברצונך ליצור ועידה חדשה להזמין אליה משתמש זה."
 
 msgid "Invite to Conference"
 msgstr "הזמן לועידה"
@@ -7813,12 +7397,8 @@ msgid "No Sametime Community Server specified"
 msgstr "לא ניתן שרת קהילה של Sametime"
 
 #, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr ""
-"לא הוגדר שם או כתובת IP עבור חשבון ה-Meanwhile %s. יש להזין אחת להלן כדי "
-"להמשיך בכניסה למערכת."
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "לא הוגדר שם או כתובת IP עבור חשבון ה-Meanwhile %s. יש להזין אחת להלן כדי להמשיך בכניסה למערכת."
 
 msgid "Meanwhile Connection Setup"
 msgstr "הגדרות תקשורת Meanwhile"
@@ -7846,12 +7426,8 @@ msgid "An ambiguous user ID was entered"
 msgstr "שם משתמש דו-משמעי הוזן"
 
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"המזהה '%s' יכול להתכוון אל כל אחד מן המשתמשים להלן. אנא בחר/י את המשתמשהנכון "
-"מן הרשימה כדי להוסיף אותם לרשימת אנשי הקשר שלך."
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "המזהה '%s' יכול להתכוון אל כל אחד מן המשתמשים להלן. אנא בחר/י את המשתמשהנכון מן הרשימה כדי להוסיף אותם לרשימת אנשי הקשר שלך."
 
 msgid "Select User"
 msgstr "בחר משתמש"
@@ -7860,12 +7436,8 @@ msgid "Unable to add user: user not found"
 msgstr "אין אפשרות להוסיף משתמש: המשתמש לא נמצא"
 
 #, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
-msgstr ""
-"המזהה '%s' לא תואם לאף משתמש בקהילה ה-Sametime שלך.והוא הוסר מרשימת אנשי "
-"הקשר שלך."
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "המזהה '%s' לא תואם לאף משתמש בקהילה ה-Sametime שלך.והוא הוסר מרשימת אנשי הקשר שלך."
 
 #, c-format
 msgid ""
@@ -7918,13 +7490,8 @@ msgid "Notes Address Book group results"
 msgstr "תוצאות מתוך רשימת הכתובות של Notes"
 
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr ""
-"המזהה '%s' יכול להתכוון לכל אחד מקבוצות ספרי הכתובות של Notes שלהלן.אנא בחר "
-"י את הקבוצה הנכונה מתוך הרשימה כדי להוסיף אותה לרשימת אנשי הקשר שלך."
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "המזהה '%s' יכול להתכוון לכל אחד מקבוצות ספרי הכתובות של Notes שלהלן.אנא בחר י את הקבוצה הנכונה מתוך הרשימה כדי להוסיף אותה לרשימת אנשי הקשר שלך."
 
 msgid "Select Notes Address Book"
 msgstr "בחר ספר כתובות של Notes"
@@ -7933,33 +7500,22 @@ msgid "Unable to add group: group not found"
 msgstr "לא ניתן להוסיף קבוצה: הקבוצה לא נמצאה"
 
 #, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr "המזהה '%s' לא תואם לאף קבוצת ספרי הכתובות של Notes בקהילה שלך."
 
 msgid "Notes Address Book Group"
 msgstr "קבוצה מספר כתובות של Notes"
 
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr ""
-"יש להזין שם שלקבוצה בספר כתובות של Notes בשדה להלן על-מנת להוסיף את הקבוצה "
-"וחבריה לרשימת אנשי הקשר שלך."
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgstr "יש להזין שם שלקבוצה בספר כתובות של Notes בשדה להלן על-מנת להוסיף את הקבוצה וחבריה לרשימת אנשי הקשר שלך."
 
 #, c-format
 msgid "Search results for '%s'"
 msgstr "תוצאות חיפוש עבור %s"
 
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-"המזהה '%s' יכול להתכוון לכל אחר מן המשתמשים שלהלן. יש באפשרותך להוסיף אותם "
-"אל רשימת אנשי הקשר שלך או לשלוח להם הודעות בעזרת כפתורי הפעולה שלמטה."
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "המזהה '%s' יכול להתכוון לכל אחר מן המשתמשים שלהלן. יש באפשרותך להוסיף אותם אל רשימת אנשי הקשר שלך או לשלוח להם הודעות בעזרת כפתורי הפעולה שלמטה."
 
 msgid "Search Results"
 msgstr "תוצאות חיפוש"
@@ -7977,12 +7533,8 @@ msgstr "לא נמצאו מתאימים"
 msgid "Search for a user"
 msgstr "חיפוש משתמש"
 
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr ""
-"יש להזין שם או מזהה חלקי בשדה להלן כדי לחפש משתמשים תואמים בקהילת ב Sametime "
-"שלך."
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "יש להזין שם או מזהה חלקי בשדה להלן כדי לחפש משתמשים תואמים בקהילת ב Sametime שלך."
 
 msgid "User Search"
 msgstr "חיפוש משתמש"
@@ -8038,11 +7590,8 @@ msgid "The remote user is not present in the network any more"
 msgstr "המשתמש המרוחק כבר לא נוכח ברשת"
 
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-msgstr ""
-"בקשה להסכמה על מפתחות התקבלה מאת %s. האם ברצונך לבצע את ההסכמה על מפתחות?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgstr "בקשה להסכמה על מפתחות התקבלה מאת %s. האם ברצונך לבצע את ההסכמה על מפתחות?"
 
 #, c-format
 msgid ""
@@ -8088,12 +7637,8 @@ msgstr "לא יכול להשיג את המידע על המשתמש"
 msgid "The %s buddy is not trusted"
 msgstr "איש הקשר %s אינו נבטח"
 
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"אינך יכול/ה לקבל התרעות על איש קשר עד אשר תייבא/י את המפתח הציבורי שלו.  "
-"ניתן להשתמש בפקודת השג מפתח ציבורי על-מנת להשיג את המפתח הציבורי."
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "אינך יכול/ה לקבל התרעות על איש קשר עד אשר תייבא/י את המפתח הציבורי שלו.  ניתן להשתמש בפקודת השג מפתח ציבורי על-מנת להשיג את המפתח הציבורי."
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -8103,12 +7648,8 @@ msgstr "פתח..."
 msgid "The %s buddy is not present in the network"
 msgstr "המשתמש %s לא נוכח ברשת"
 
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"להוסיף את איש הקשר, עליך לייבא את המפתח הציבורי שלו.ניתן ללחוץ על \"ייבא\" "
-"לייבא מפתח ציבורי."
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "להוסיף את איש הקשר, עליך לייבא את המפתח הציבורי שלו.ניתן ללחוץ על \"ייבא\" לייבא מפתח ציבורי."
 
 msgid "_Import..."
 msgstr "ייבא..."
@@ -8116,19 +7657,11 @@ msgstr "ייבא..."
 msgid "Select correct user"
 msgstr "בחר/י משתמש נכון"
 
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"יותר ממשתמש אחד נמצא עם אותו מפתח ציבורי. יש לבחור מהרשימה את המשתמש הנכון "
-"להוסיף לרשימת אנשי הקשר."
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "יותר ממשתמש אחד נמצא עם אותו מפתח ציבורי. יש לבחור מהרשימה את המשתמש הנכון להוסיף לרשימת אנשי הקשר."
 
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"יותר ממשתמש אחד נמצא עם אותו שם. יש לבחור מהרשימה את המשתמש הנכון להוסיף "
-"לרשימת אנשי הקשר."
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "יותר ממשתמש אחד נמצא עם אותו שם. יש לבחור מהרשימה את המשתמש הנכון להוסיף לרשימת אנשי הקשר."
 
 msgid "Detached"
 msgstr "מנותק"
@@ -8278,17 +7811,8 @@ msgid "Channel Public Keys List"
 msgstr "רשימת המפתחות הציבוריים של הערוץ"
 
 #, c-format
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"אימות בערוץ היא לצורך איבטוח הערוץ מגישה לא מורשית. ייתכן והאימות יהיה על "
-"בסיס סיסמה וחתימה דיגיטלית. אם הסיסמא נקבעה, חובה לתת אותה כדי להצטרף. אם "
-"נקבעו מפתחות ציבוריים לערוץ, אז רק משתמשים שהמפתח הציבורי שלהם ברשימה יוכלו "
-"להצטרף."
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "אימות בערוץ היא לצורך איבטוח הערוץ מגישה לא מורשית. ייתכן והאימות יהיה על בסיס סיסמה וחתימה דיגיטלית. אם הסיסמא נקבעה, חובה לתת אותה כדי להצטרף. אם נקבעו מפתחות ציבוריים לערוץ, אז רק משתמשים שהמפתח הציבורי שלהם ברשימה יוכלו להצטרף."
 
 msgid "Channel Authentication"
 msgstr "אימות בערוץ"
@@ -8352,8 +7876,7 @@ msgid "Set Secret Channel"
 msgstr "קביעת סודיות ערוץ"
 
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "חובה להצטרף לערוץ %s לפני הצטרפות לקבוצה הפרטית"
 
 msgid "Join Private Group"
@@ -8463,9 +7986,6 @@ msgstr "אירגון"
 msgid "Unit"
 msgstr "יחידה"
 
-msgid "Note"
-msgstr "הערה"
-
 msgid "Join Chat"
 msgstr "הצטרף לצ'אט"
 
@@ -8565,6 +8085,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "סטטיסטיקות של הרשת"
 
+msgid "Ping"
+msgstr "פינג"
+
 msgid "Ping failed"
 msgstr "פינג נכשל"
 
@@ -8593,12 +8116,8 @@ msgid "Passphrase required"
 msgstr "נדרשת סיסמא"
 
 #, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-"המפתח הציבורי של %s התקבל. ההעתק המקומי אינו תואם למפתח זה. האם ברצונך "
-"להמשיך ולקבל את המפתח הציבורי?"
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
+msgstr "המפתח הציבורי של %s התקבל. ההעתק המקומי אינו תואם למפתח זה. האם ברצונך להמשיך ולקבל את המפתח הציבורי?"
 
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
@@ -8628,26 +8147,19 @@ msgstr "סוג מפתח ציבורי שאינו נתמך"
 msgid "Disconnected by server"
 msgstr "נותק ע\"י השרת"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "שגיאה בעת התחברות לשרת ה-SILC"
 
 msgid "Key Exchange failed"
 msgstr "החלפת המפתחות נכשלה"
 
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "המשך תהליך פעולה שנותק, נכשל. לחצ/י על חיבור מחדש ליצור חיבור חדש."
 
-msgid "Connection failed"
-msgstr "ההתחברות נכשלה"
-
 msgid "Performing key exchange"
 msgstr "מבצע החלפת מפתחות"
 
-msgid "Unable to create connection"
-msgstr "לא ניתן ליצור חיבור"
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "לא ניתן לטעון את זוג מפתחות ה-SILC"
 
 #. Progress
@@ -8657,7 +8169,7 @@ msgstr "מתחבר לשרת ה-SILC"
 msgid "Out of memory"
 msgstr "אזל הזיכרון"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "לא ניתן לאתחל את פרוטוקול SILC"
 
 msgid "Error loading SILC key pair"
@@ -8714,13 +8226,8 @@ msgstr "איזור זמן (UTC)"
 msgid "User Online Status Attributes"
 msgstr "מאפייני מצב משתמש זמין ומחובר"
 
-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 ""
-"ניתן לאפשר למשתמשים אחרים לראות את מצב החיבור שלך ומידע אישי. יש למלא את "
-"המידע שברצונך לאפשר למשתמשים אחרים לראות עליך."
+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 "ניתן לאפשר למשתמשים אחרים לראות את מצב החיבור שלך ומידע אישי. יש למלא את המידע שברצונך לאפשר למשתמשים אחרים לראות עליך."
 
 msgid "Message of the Day"
 msgstr "ההודעה להיום"
@@ -8839,17 +8346,11 @@ msgstr "nick &lt;שם כינוי חדש&gt;:  שינוי הכינוי שלך"
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;שם כינוי&gt;:  הצג מידע על משתמש"
 
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;ערוץ&gt; [+|-&lt;מצבים&gt;] [פרמטרים]: שנה או הצג את מצבי הערוץ"
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;ערוץ&gt; [+|-&lt;מצבים&gt;] [פרמטרים]: שנה או הצג את מצבי הערוץ"
 
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;ערוץ&gt; +|-&lt;מצבים&gt; &lt;שם כינוי&gt;:  שנה מצבי משתמש בערוץ"
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;ערוץ&gt; +|-&lt;מצבים&gt; &lt;שם כינוי&gt;:  שנה מצבי משתמש בערוץ"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;מצבי משתמש&gt;:  קביעת מצבי המשתמש שלך ברשת"
@@ -8857,12 +8358,8 @@ msgstr "umode &lt;מצבי משתמש&gt;:  קביעת מצבי המשתמש ש�
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;שם כינוי&gt; [-pubkey]:  השג הרשאות מפעיל שרת"
 
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;ערוץ&gt; [-|+]&lt;שם כינוי&gt;:  הזמן משתמש או הוסף/הסר מרשימת "
-"ההזמנות של הערוץ"
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;ערוץ&gt; [-|+]&lt;שם כינוי&gt;:  הזמן משתמש או הוסף/הסר מרשימת ההזמנות של הערוץ"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;ערוץ&gt; &lt;שם כינוי&gt; [הערה]:  בעט משתמש מן הערוץ"
@@ -8885,12 +8382,8 @@ msgstr "ping:  שלח PING לשרת המחובר"
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;ערוץ&gt;:  הצג את רשימת הערוצים"
 
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;ערוצ(ים)&gt;:  הצג רשימת "
-"אנשים מסוג מסויים בערוצ(ים)"
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;ערוצ(ים)&gt;:  הצג רשימת אנשים מסוג מסויים בערוצ(ים)"
 
 #. *< type
 #. *< ui_requirement
@@ -8944,8 +8437,8 @@ msgstr "חתום דיגיטלית וודא את כל ההודעות המיידי
 msgid "Creating SILC key pair..."
 msgstr "יוצר זוג מפתחות SILC..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "לא יכול ליצור זוג מפתחות SILC\n"
+msgid "Unable to create SILC key pair"
+msgstr "לא ניתן ליצור זוג מפתחות SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9027,9 +8520,7 @@ msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s שלח הודעה אל הלוח הלבן. האם ברצונך לפתוח את הלוח הלבן?"
 
 #, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
 msgstr "%s שלח הודעה אל הלוח הלבן בערוץ %s.האם ברצונך לפתוח את הלוח הלבן?"
 
 msgid "Whiteboard"
@@ -9038,6 +8529,9 @@ msgstr "לוח-לבן"
 msgid "No server statistics available"
 msgstr "אין סטטיסטיקות זמינות לשרת"
 
+msgid "Error during connecting to SILC Server"
+msgstr "שגיאה בעת התחברות לשרת ה-SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "שגיאה: אי-תאימות גירסאות, יש לשדרג את תוכנה הלקוח שלך"
@@ -9078,34 +8572,31 @@ msgstr "שגיאה: cookie שגוי"
 msgid "Failure: Authentication failed"
 msgstr "שגיאה: האימות נכשל"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "לא ניתן לאתחל חיבור לקוח של SILC"
 
 msgid "John Noname"
 msgstr "פלוני אלמוני"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "לא ניתן לטעון את זוג מפתחות ה-SILC: %s"
 
-msgid "Could not write"
-msgstr "לא ניתן לכתוב"
-
-msgid "Could not connect"
-msgstr "לא ניתן להתחבר"
+msgid "Unable to create connection"
+msgstr "לא ניתן ליצור חיבור"
 
-msgid "Unknown server response."
-msgstr "תגובת שרת לא ידועה."
+msgid "Unknown server response"
+msgstr "תגובת שרת לא מוכרת"
 
-msgid "Could not create listen socket"
+msgid "Unable to create listen socket"
 msgstr "אין אפשרות ליצור שקע-קשב"
 
-msgid "Could not resolve hostname"
-msgstr "לא ניתן למצוא כתובת שרת"
-
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "אסור לשמות משתמשים של SIP להכיל רווחים או סמלי @"
 
+msgid "SIP connect server not specified"
+msgstr "לא הוגדר שרת חיבור SIP"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9139,175 +8630,60 @@ msgstr "משתמש לאימות"
 msgid "Auth Domain"
 msgstr "דומיין לאימות"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "מחפש את %s..."
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "ההתחברות אל %s לא הצליחה."
-
-#, c-format
-msgid "Signon: %s"
-msgstr "מתחבר: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "אין אפשרות לכתוב אל הקובץ %s"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "אין אפשרות לקרוא את הקובץ %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "הודעה ארוכה מדי, %s הבייטים האחרונים נקטמו."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s אינו מחובר כרגע."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "אזהרה של %s  אינה מותרת."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "אבדה הודעה; אתה עובר על הגבלת המהירות של השרת."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "צ'אט ב-%s אינו זמין."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "אתה שולח הודעות אל %s מהר מדיי."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "פספסת הודעה מ-%s כיוון שהיא הייתה ארוכה מדי."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "פספסת הודעה מ-%s כיוון שהיא נשלחה מהר מדי."
-
-#, c-format
-msgid "Failure."
-msgstr "כישלון."
-
-#, c-format
-msgid "Too many matches."
-msgstr "יותר מידי תוצאות"
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "החיפוש זקוק ליותר מגדירים."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "שירות המדריך אינו זמין זמנית."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "חיפוש הדוא\"ל מוגבל."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "יתעלם ממילת המפתח."
-
-#, c-format
-msgid "No keywords."
-msgstr "אין מילות מפתח."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "אין מידע עבור משתמש זה"
-
-#, c-format
-msgid "Country not supported."
-msgstr "המדינה אינה נתמכת."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "כשל מוכר: %s"
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "שם משתמש או סיסמא שגויים."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "השירות אינו זמין זמנית."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "רמת האזהרה שלך גבוהה מדיי כרגע מכדי להיכנס למערכת."
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"התחברת והתנתקת בתדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, "
-"תיאלץ להמתין אפילו יותר."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "ארעה שגיאה לא ידועה בזמן ניסיון לפתיחת %s"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "ארעה שגיאה לא מוכרת, %d, מידע: %s"
-
-msgid "Invalid Groupname"
-msgstr "שם הקבוצה שגוי"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;חדר&gt;:  הצטרף לחדר צ'אט ברשת Yahoo"
 
-msgid "Connection Closed"
-msgstr "החיבור נסגר."
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: הצג את רשימת החדרים ברשת Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "ממתין לתשובה..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: לבקש מהמשתמש להתחיל ב- Doodle"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC חזר מן ה-pause שלו. ניתן לשלוח הודעות שוב."
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
 
-msgid "Password Change Successful"
-msgstr "הסיסמה שלך שונתה בהצלחה."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "תוסף פרוטוקול Yahoo!"
 
-msgid "_Group:"
-msgstr "_קבוצה:"
+msgid "Pager server"
+msgstr "שרת ה-Pager"
 
-msgid "Get Dir Info"
-msgstr "השג מידע על המשתמש"
+msgid "Pager port"
+msgstr "יציאת Pager"
 
-msgid "Set Dir Info"
-msgstr "קבע מידע על המשתמש"
+msgid "File transfer server"
+msgstr "שרת העברת קבצים"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "לא ניתן לפתוח %s לכתיבה"
+msgid "File transfer port"
+msgstr "יציאה להעברת קבצים"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "כשל בהעברת הקובץ, כנראה צד שני ביטל"
+msgid "Chat room locale"
+msgstr "הגדרה איזורית לחדר צ'אט"
 
-msgid "Could not connect for transfer."
-msgstr "לא ניתן לחבר את ההעברה."
+msgid "Ignore conference and chatroom invitations"
+msgstr "התעלם מהזמנות לשיחות-ועידה ולחדרי-צ'אט"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "לא ניתן לכתוב את רישת הקובץ. הקובץ לא יועבר."
+msgid "Chat room list URL"
+msgstr "מיקום של רשימת חדרי הצ'אט"
 
-msgid "Save As..."
-msgstr "שמור בשם..."
+msgid "Yahoo Chat server"
+msgstr "שרת צ'אט של Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s מבקש מ-%s לקבל %d קובץ: %s (%.2f %s)%s%s"
-msgstr[1] "%s מבקש מ-%s לקבל %d קבצים: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "כניסת שרת Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s מבקש/ת ממך לשלוח לו/לה קובץ"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo יפן ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9319,12 +8695,11 @@ msgstr "%s מבקש/ת ממך לשלוח לו/לה קובץ"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "תוסף פרוטוקול TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "תוסף פרוטוקול Yahoo! יפן"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s שלח לך"
+msgid "Your SMS was not delivered"
+msgstr "הסמס שלך לא הגיע ליעדו"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "הודעת ה Yahoo שלך לא נשלחה."
@@ -9334,12 +8709,8 @@ msgid "Yahoo! system message for %s:"
 msgstr "הודעת מערכת עבור %s מ-Yahoo!:"
 
 #, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך. מהסיבה הבאה: "
-"%s."
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך. מהסיבה הבאה: %s."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
@@ -9348,25 +8719,32 @@ msgstr "%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך
 msgid "Add buddy rejected"
 msgstr "הוספת איש קשר נדחתה"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "התקבל מידע שגוי"
+
+#. security lock from too many failed login attempts
+msgid "Account locked: Too many failed login attempts.  Logging into the Yahoo! website may fix this."
+msgstr "החשבון נעול: יותר מדי ניסיון התחברות כושלים. התחברות באתר Yahoo! אולי תתקן את זה."
+
+#. indicates a lock of some description
+msgid "Account locked: Unknown reason.  Logging into the Yahoo! website may fix this."
+msgstr "החשבון נעול: סיבה לא ידועה. התחברות באתר Yahoo! אולי תתקן את זה."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "שם משתמש או סיסמה חסרים"
+
 #, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-msgstr ""
-"ביקש תצורת אימות לא מוכרת. קרוב לוודאי שלא תוכל להתחבר בהצלחה לשרת ה-Yahoo. "
-"בדוק ב-%s לעידכונים."
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "ביקש תצורת אימות לא מוכרת. קרוב לוודאי שלא תוכל להתחבר בהצלחה לשרת ה-Yahoo. בדוק ב-%s לעידכונים."
 
 msgid "Failed Yahoo! Authentication"
 msgstr "כישלון באימות מול Yahoo!"
 
 #, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"ניסית להתעלם מ-%s, אך משתמש זה נמצא ברשימת אנשי הקשר שלך. לחיצה על \"כן\" "
-"תסיר ותתעלם מן המשתמש."
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "ניסית להתעלם מ-%s, אך משתמש זה נמצא ברשימת אנשי הקשר שלך. לחיצה על \"כן\" תסיר ותתעלם מן המשתמש."
 
 msgid "Ignore buddy?"
 msgstr "התעלם ממשתמש?"
@@ -9379,37 +8757,26 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "שגיאה לא מוכרת מספר %d. התחברות באתר Yahoo! אולי יתקן את זה."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "לא ניתן להוסיף את איש הקשר %s לקבוצה %s ברשימה על השרת בחשבון %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "לא ניתן להוסיף את החבר %s לקבוצה %s ברשימה בשרת בחשבון %s."
 
-msgid "Could not add buddy to server list"
-msgstr "לא ניתן להוסיף את איש הקשר לרשימה בשרת"
+msgid "Unable to add buddy to server list"
+msgstr "לא ניתן להוסיף את החבר לרשימה בשרת"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ בר-שמיעה %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "התקבלה תגובת HTTP לא-צפויה מן השרת."
-
-msgid "Connection problem"
-msgstr "תקלת תקשורת"
+msgid "Received unexpected HTTP response from server"
+msgstr "התקבלה תגובת HTTP לא-צפויה מן השרת"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"אבד החיבור עם %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "אבד החיבור עם %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"לא היה ניתן ליצור חיבור עם %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "לא ניתן ליצור חיבור עם %s: %s"
 
 msgid "Not at Home"
 msgstr "לא נמצא בבית"
@@ -9456,8 +8823,8 @@ msgstr "אפשרויות נוכחות"
 msgid "Start Doodling"
 msgstr "התחל לקשקש"
 
-msgid "Activate which ID?"
-msgstr "איזה ID להפעיל?"
+msgid "Select the ID you want to activate"
+msgstr "יש לבחור את המזהה ברצונך להפעיל"
 
 msgid "Join whom in chat?"
 msgstr "להצטרף למי בצ'אט?"
@@ -9471,74 +8838,15 @@ msgstr "הצטרף למשתמש בצ'אט..."
 msgid "Open Inbox"
 msgstr "פתח את תיבת הדואר שלי"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;חדר&gt;:  הצטרף לחדר צ'אט ברשת Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: הצג את רשימת החדרים ברשת Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: לבקש מהמשתמש להתחיל ב- Doodle"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "תוסף פרוטוקול Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo יפן"
-
-msgid "Pager server"
-msgstr "שרת ה-Pager"
-
-msgid "Japan Pager server"
-msgstr "שרת ה-Pager ביפן"
-
-msgid "Pager port"
-msgstr "יציאת Pager"
-
-msgid "File transfer server"
-msgstr "שרת העברת קבצים"
-
-msgid "Japan file transfer server"
-msgstr "שרת יפני להעברת קבצים"
-
-msgid "File transfer port"
-msgstr "יציאה להעברת קבצים"
-
-msgid "Chat room locale"
-msgstr "הגדרה איזורית לחדר צ'אט"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "התעלם מהזמנות לשיחות-ועידה ולחדרי-צ'אט"
-
-msgid "Chat room list URL"
-msgstr "מיקום של רשימת חדרי הצ'אט"
-
-msgid "Yahoo Chat server"
-msgstr "שרת צ'אט של Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "כניסת שרת Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "נשלחה בקשר לקשקש."
 
+msgid "Unable to connect."
+msgstr "לא ניתן להתחבר"
+
 msgid "Unable to establish file descriptor."
 msgstr "לא ניתן לברר את מספר החיבור לקובץ."
 
@@ -9546,20 +8854,19 @@ msgstr "לא ניתן לברר את מספר החיבור לקובץ."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s מציע/ה לשלוח אליך אוסף של %d קבצים.\n"
 
+msgid "Write Error"
+msgstr "שגיאה בכתיבה"
+
 msgid "Yahoo! Japan Profile"
 msgstr "פרופיל Yahoo! יפן"
 
 msgid "Yahoo! Profile"
 msgstr "פרופיל Yahoo!"
 
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "סליחה, אך פרופילים המסומנים כמכילים מידע למבוגרים בלבד לא נתמכים כרגע."
 
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
 msgstr "אם ברצונך לראות פרופיל זה, יש להשתמש בקישור הזה בדפדפן האינטרנט שלך:"
 
 msgid "Yahoo! ID"
@@ -9586,40 +8893,21 @@ msgstr "קישור מגניב 3"
 msgid "Last Update"
 msgstr "עודכן לאחרונה"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "פרטי המשתמש %s אינם זמינים"
+msgid "This profile is in a language or format that is not supported at this time."
+msgstr "פרופיל זה אינו בשפה או פורמט אשר אינם נתמכים כרגע."
 
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
-msgstr "סליחה, אך נראה כי פרופיל זה הוא בשפה או פורמט שלא נתמכים כרגע."
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זוהי תקלה זמנית בשרת. יש לנסות שנית מאוחר יותר."
 
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זוהי תקלה זמנית בשרת. יש לנסות "
-"שנית מאוחר יותר."
-
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זה אומר שהמשתמש לא קיים; ברם, "
-"לעיתים Yahoo! לא מצליח למצוא פרופיל משתמש. אם את/ה בטוח/ה שהמשתמש קיים, נס/י "
-"שנית מאוחר יותר."
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זה אומר שהמשתמש לא קיים; ברם, לעיתים Yahoo! לא מצליח למצוא פרופיל משתמש. אם את/ה בטוח/ה שהמשתמש קיים, נס/י שנית מאוחר יותר."
 
 msgid "The user's profile is empty."
 msgstr "פרופיל המשתמש ריק."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s סרב את ההזמנה שלך לועידה בחדר \"%s\" כיוון ש-\"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "ההזמנה נדחתה"
+msgid "%s has declined to join."
+msgstr "%s לא רוצה להצטרף."
 
 msgid "Failed to join chat"
 msgstr "לא ניתן להצטרף לשיחה"
@@ -9636,12 +8924,8 @@ msgstr "אולי החדר מלא"
 msgid "Not available"
 msgstr "לא זמין"
 
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"שגיאה לא מוכרת. עליך להתנתק ולחכות כחמש דקות לפני שיהיה אפשר להצטרף שוב לחדר "
-"צ'אט"
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "שגיאה לא מוכרת. עליך להתנתק ולחכות כחמש דקות לפני שיהיה אפשר להצטרף שוב לחדר צ'אט"
 
 #, c-format
 msgid "You are now chatting in %s."
@@ -9662,26 +8946,19 @@ msgstr "קולות"
 msgid "Webcams"
 msgstr "מצלמות אינטרנט"
 
+msgid "Connection problem"
+msgstr "תקלת תקשורת"
+
 msgid "Unable to fetch room list."
 msgstr "לא ניתן לקבל רשימת החדרים."
 
 msgid "User Rooms"
 msgstr "חדרים של משתמשים"
 
-msgid "Connection problem with the YCHT server."
-msgstr "שגיאה בתקשורת עם שרת ה-YCHT."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"אבד החיבור עם השרת\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "שגיאה עם החיבור אל שרת ה-YCHT."
 
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
 msgstr "(הייתה שגיאה בהמרת ההודעה.\t בדוק את הגדרות ה'קידוד' בעורך החשבונות)"
 
 #, c-format
@@ -9729,29 +9006,17 @@ msgstr "topic &lt;ישות&gt;: קבע את הישות לשימוש במחלקה
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: הצטרף לצ'אט חדש"
 
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;ישות&gt;: שלח הודעה ל-&lt;הודעה, <i>ישות</i>,*&gt;"
 
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;מחלקה&gt; &lt;ישות&gt;: שלח הודעה ל-&lt;<i>מחלקה</i>,<i>ישות</i>*&gt;"
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;מחלקה&gt; &lt;ישות&gt;: שלח הודעה ל-&lt;<i>מחלקה</i>,<i>ישות</i>*&gt;"
 
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,"
-"<i>ישות</i>,<i>נמען</i>&gt;"
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,<i>ישות</i>,<i>נמען</i>&gt;"
 
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;הודעה,<i>ישות</i>,<i>נמען</"
-"i>&gt;"
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;הודעה,<i>ישות</i>,<i>נמען</i>&gt;"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;מחלקה&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,אישי,*&gt;"
@@ -9800,32 +9065,21 @@ msgid "Exposure"
 msgstr "חשיפה"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"אין אפשרות ליצור שקע:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "לא ניתן לעכל את תשובת שרת התיווך של HTTP: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "לא ניתן לעבד את משוב שרת התיווך של HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "שגיאה בשרת התיווך של HTTP %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "אין הרשאה: שרת התיווך אוסר על תיעול ליציאה %d."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "אין הרשאה: שרת התיווך אוסר על תיעול ליציאה %d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "שגיאה במציאת הכתובת של %s"
 
-msgid "Could not resolve host name"
-msgstr "לא ניתן למצוא כתובת שרת"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "מבקש/ת את תשומת-הלב של %s..."
@@ -9912,9 +9166,6 @@ msgstr "נא לא להפריע"
 msgid "Extended away"
 msgstr "העדרות ממושכת"
 
-msgid "Mobile"
-msgstr "נייד"
-
 msgid "Listening to music"
 msgstr "מקשיב/ה למוזיקה"
 
@@ -9956,17 +9207,6 @@ msgstr "+++ %s החל בפעילות"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "שגיאה בקריאת %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"חלה שגיאה בעת קריאת ה-%s שלך.  הם לא נטענו, ושם הקובץ הישן הוחלף ל-%s~."
-
 msgid "Calculating..."
 msgstr "מחשב..."
 
@@ -10017,17 +9257,13 @@ msgstr "לא יכול לפתוח %s: יותר מדי העברות"
 msgid "Unable to connect to %s"
 msgstr "לא ניתן להתחבר אל %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "שגיאה בקריאה מתוך %s: %s"
+msgstr "שגיאה בקריאה מתוך %s: אורך המשוב ארוך מדי (מוגבל עד %d בייט)"
 
 #, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-"לא ניתן להקצות מספיק זיכרון להחזיק את התוכן מ-%s.  שרת האתר אולי מנסה לעשות "
-"משהו מזיק."
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "לא ניתן להקצות מספיק זיכרון להחזיק את התוכן מ-%s.  שרת האתר אולי מנסה לעשות משהו מזיק."
 
 #, c-format
 msgid "Error reading from %s: %s"
@@ -10074,6 +9310,14 @@ msgstr "החיבור סורב."
 msgid "Address already in use."
 msgstr "כתובת כבר בשימוש."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "שגיאה בקריאת %s"
+
+#, c-format
+msgid "An error was encountered reading your %s.  The file has not been loaded, and the old file has been renamed to %s~."
+msgstr "חלה שגיאה בעת קריאת ה-%s שלך. הקובץ לא נטען, ושם ההובץ הישן שונה ל-%s~."
+
 msgid "Internet Messenger"
 msgstr "למסרים באינטרנט"
 
@@ -10116,10 +9360,8 @@ msgstr "הודעה על דואר חדש"
 msgid "Use this buddy _icon for this account:"
 msgstr "השתמש בתמונה זו לחשבון זה:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s אפשרויות"
+msgid "Ad_vanced"
+msgstr "_מתקדם"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "השתמש בהגדרות פרוקסי של GNOME"
@@ -10154,9 +9396,6 @@ msgstr "אם תביט ממש מקרוב"
 msgid "you can see the butterflies mating"
 msgstr "ניתן לראות פרפרים מזדווגים"
 
-msgid "Proxy Options"
-msgstr "אפשרויות פרוקסי"
-
 msgid "Proxy _type:"
 msgstr "סוג ה_פרוקסי"
 
@@ -10184,8 +9423,8 @@ msgstr "_בסיסי"
 msgid "Create _this new account on the server"
 msgstr "צור חשבון חדש זה על השרת"
 
-msgid "_Advanced"
-msgstr "_מתקדם"
+msgid "P_roxy"
+msgstr "מת_ווך"
 
 msgid "Enabled"
 msgstr "פעיל"
@@ -10193,56 +9432,40 @@ msgstr "פעיל"
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add...</b> button below and configure your first account. If you want %s "
-"to connect to multiple IM accounts, press <b>Add...</b> again to configure "
-"them all.\n"
+"You have no IM accounts configured. To start connecting with %s press the <b>Add...</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add...</b> again to configure them all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Manage Accounts</b> in the Buddy List window"
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
-"<span size='larger' weight='bold'>ברוכים הבאים ל-%s!</span>\n"
+"<span size='larger' weight='bold'>ברוכים הבאים אל%s!</span>\n"
 "\n"
-"אין ברשותך שם חשבונות מוגדרים. להתחיל התחברות עם %s יש ללחוץ על הכפתור "
-"<b>הוסף</b> שלמטה ולהגדיר את החשבון הראשון שלך. אם ברצונך ש-%s יתחבר לכמה "
-"חשבונות, יש ללחוץ על <b>הוסף</b> שוב על-מנת להגדיר את כולם.\n"
+"אין ברשותך שם חשבונות מוגדרים. על מנת להתחבר עם %s יש ללחוץ על הכפתור <b>הוסף...</b> שלהלן להגדיר את חשבונך הראשון. אם ברצונך ש-%s יתחבר לכמה חשבונות, יש ללחוץ על <b>הוסף...</b> שוב על מנת להגדיר את כולם.\n"
 "\n"
-"ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי "
-"<b>חשבונות->הוסף/ערוך</b> שבחלון רשימת אנשי-הקשר"
+"ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי <b>חשבונות->נהל חשבונות</b> שבחלון רשימת החברים"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural ""
-"You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "יש לך %d איש-קשר בשם %s. האם ברצונך למזג אותך?"
 msgstr[1] "יש לך כעת %d אנשי-קשר בשם %s. האם ברצונך למזג אותך?"
 
-msgid ""
-"Merging these contacts will cause them to share a single entry on the buddy "
-"list and use a single conversation window. You can separate them again by "
-"choosing 'Expand' from the contact's context menu"
-msgstr ""
-"מיזוג אנשי-קשר אלה יגרום להם להיות תחת פריט יחיד ברשימת אנשי הקשר, ולהשתמש "
-"בחלון שיחה יחיד. ניתן להפריד אותם אח\"כ על ידי בחירת 'הרחב' מהתפריט עבור איש "
-"הקשר"
+msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
+msgstr "מיזוג אנשי-קשר אלה יגרום להם להיות תחת פריט יחיד ברשימת אנשי הקשר, ולהשתמש בחלון שיחה יחיד. ניתן להפריד אותם אח\"כ על ידי בחירת 'הרחב' מהתפריט עבור איש הקשר"
 
 msgid "Please update the necessary fields."
 msgstr "יש לעדכן את השדות הנחוצים."
 
-msgid "Room _List"
-msgstr "רשימת _חדרים"
+msgid "A_ccount"
+msgstr "ח_שבון"
 
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "יש להזין את המידע המתאים על הצ'אט שברצונך להצטרף אליו.\n"
 
-msgid "_Account:"
-msgstr "חש_בון:"
+msgid "Room _List"
+msgstr "רשימת _חדרים"
 
 msgid "_Block"
 msgstr "חסום"
@@ -10259,6 +9482,15 @@ msgstr "הצג _פרטים"
 msgid "I_M"
 msgstr "הודעה"
 
+msgid "_Audio Call"
+msgstr "שיחה _קולית"
+
+msgid "Audio/_Video Call"
+msgstr "שיחה קולית או שיחת וידאו"
+
+msgid "_Video Call"
+msgstr "שיחת וי_דאו"
+
 msgid "_Send File..."
 msgstr "שלח קובץ..."
 
@@ -10268,9 +9500,12 @@ msgstr "הוסף תגובה לפעולת איש קשר..."
 msgid "View _Log"
 msgstr "הצ_ג רישום"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "החבא כאשר לא-מקוון"
 
+msgid "Show When Offline"
+msgstr "הצג כאשר לא-מקוון"
+
 msgid "_Alias..."
 msgstr "_שם נוסף..."
 
@@ -10317,8 +9552,7 @@ msgstr "ה_רחב"
 msgid "/Tools/Mute Sounds"
 msgstr "/כלים/השתק צלילים"
 
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "אינך מחובר/ת כרגע עם החשבון שמסוגל להוסיף איש קשר זה."
 
 #. I don't believe this can happen currently, I think
@@ -10393,6 +9627,9 @@ msgstr "/כלים/ת_גובות פעילות אנשי קשר"
 msgid "/Tools/_Certificates"
 msgstr "/כלים/תעודות"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/כלים/_חייכן שלי"
+
 msgid "/Tools/Plu_gins"
 msgstr "/כלים/תו_ספים"
 
@@ -10402,9 +9639,6 @@ msgstr "/כלים/_העדפות"
 msgid "/Tools/Pr_ivacy"
 msgstr "/כלים/_פרטיות"
 
-msgid "/Tools/Smile_y"
-msgstr "/כלים/_חייכן"
-
 msgid "/Tools/_File Transfers"
 msgstr "/כלים/העברת _קבצים..."
 
@@ -10522,8 +9756,8 @@ msgstr "ידנית"
 msgid "By status"
 msgstr "לפי מצב"
 
-msgid "By log size"
-msgstr "לפי גודל יומן השיחות"
+msgid "By recent log activity"
+msgstr "על פי פעילות אחרונה ביומן הרישום"
 
 #, c-format
 msgid "%s disconnected"
@@ -10539,13 +9773,15 @@ msgstr "התחבר מחדש"
 msgid "Re-enable"
 msgstr "הפעל מחדש"
 
+msgid "SSL FAQs"
+msgstr "שו\"ת SSL"
+
 msgid "Welcome back!"
 msgstr "ברוך שובך!"
 
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
-msgid_plural ""
-"%d accounts were disabled because you signed on from another location:"
+msgid_plural "%d accounts were disabled because you signed on from another location:"
 msgstr[0] "חשבון %d סומן כלא-פעיל כי התחברת ממיקום נוסף:"
 msgstr[1] "%d חשבונות סומנו כלא-פעילים כי התחברת ממיקום נוסף:"
 
@@ -10566,15 +9802,11 @@ msgstr "/חשבונות"
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
-"you'll be able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>ברוכים הבאים ל-%s!</span>\n"
 "\n"
-"אין ברשותך חשבונות מופעלים. ניתן להפעיל את החשבונות שלך מתוך חלון "
-"<b>חשבונות</b> דרך <b>חשבונות->נהל</b>. ברגע שיהיו חשבונות פעילים, תהיה לך "
-"אפשרות להתחבר, לקבוע את המצב שלך, ולדבר עם חבריך."
+"אין ברשותך חשבונות מופעלים. ניתן להפעיל את החשבונות שלך מתוך חלון <b>חשבונות</b> דרך <b>חשבונות->נהל</b>. ברגע שיהיו חשבונות פעילים, תהיה לך אפשרות להתחבר, לקבוע את המצב שלך, ולדבר עם חבריך."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10609,26 +9841,23 @@ msgstr "הוספת איש קשר ל_קבוצה:"
 msgid "This protocol does not support chat rooms."
 msgstr "פרוטוקול זה אינו תומך בחדרי צ'אט"
 
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
+msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "אינך מחובר/ת בפרוטוקול כלשהו המאפשר שימוש בצ'אט."
 
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"יש להזין שם נוסף, ומידע מתאים על הצ'אט שברצונך להוסיף לרשימת אנשי הקשר שלך.\n"
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "יש להזין שם נוסף, ומידע מתאים על הצ'אט שברצונך להוסיף לרשימת אנשי הקשר שלך.\n"
 
 msgid "A_lias:"
 msgstr "שם:"
 
+msgid "_Group:"
+msgstr "_קבוצה:"
+
 msgid "Auto_join when account becomes online."
 msgstr "הצטרפות אוטומטית כאשר החשבון נעשה מקוון."
 
-#, fuzzy
 msgid "_Remain in chat after window is closed."
-msgstr "ה_סתר צ'אט כאשר החלון נסגר."
+msgstr "הש_אר בצ'אט אחרי שהחלון נסגר."
 
 msgid "Please enter the name of the group to be added."
 msgstr "יש להזין את שם הקבוצה החדשה."
@@ -10657,6 +9886,99 @@ msgstr "/_כלים"
 msgid "/Buddies/Sort Buddies"
 msgstr "/אנשי קשר/מיין אנשי-קשר"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "צבע הרקע"
+
+msgid "The background color for the buddy list"
+msgstr "צבע הרקע עבור רשימת החברים"
+
+msgid "Layout"
+msgstr "מתווה"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "מיקומי הסמלים, השמות והמצבים ברשימת אנשי-הקשר"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "צבע רקע עבור מורחב"
+
+msgid "The background color of an expanded group"
+msgstr "צבע-הרקע של קבוצה שהורחבה"
+
+msgid "Expanded Text"
+msgstr "טקסט מורחב"
+
+msgid "The text information for when a group is expanded"
+msgstr "טקסט למידע כשקבוצה מורחבת"
+
+msgid "Collapsed Background Color"
+msgstr "צבע רקע עבור עבור מקופל"
+
+msgid "The background color of a collapsed group"
+msgstr "צבע-הרקע של קבוצה שצומצמה"
+
+msgid "Collapsed Text"
+msgstr "טקסט מקופל"
+
+msgid "The text information for when a group is collapsed"
+msgstr "טקסט למידע כשקבוצה מצומצמת"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "צבע רקע עבור צ'אט/איש-קשר"
+
+msgid "The background color of a contact or chat"
+msgstr "צבע-הרקע של איש-קשר או צ'אט"
+
+msgid "Contact Text"
+msgstr "טקסט איש-קשר"
+
+msgid "The text information for when a contact is expanded"
+msgstr "טקסט למידע כשאיש-קשר מורחב"
+
+msgid "On-line Text"
+msgstr "טקסט כשמחובר"
+
+msgid "The text information for when a buddy is online"
+msgstr "טקסט למידע כשאיש-קשר מחובר"
+
+msgid "Away Text"
+msgstr "טקסט כשרחוק מהמחשב"
+
+msgid "The text information for when a buddy is away"
+msgstr "טקסט למידע כשאיש-קשר מרוחק מהמחשב"
+
+msgid "Off-line Text"
+msgstr "טקסט כשמנותק"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "טקסט למידע כשאיש-קשר מנותק"
+
+msgid "Idle Text"
+msgstr "טקסט כשחסר-פעילות"
+
+msgid "The text information for when a buddy is idle"
+msgstr "טקסט למידע כשאיש-קשר חסר-פעילות"
+
+msgid "Message Text"
+msgstr "טקסט הודעת"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "טקסט למידע כשלאיש-קשר יש הודעות שלא נקראו"
+
+msgid "Message (Nick Said) Text"
+msgstr "טקסט הודעות (מישהו אמר)"
+
+msgid "The text information for when a chat has an unread message that mentions your nick"
+msgstr "טקסט להציג כשצ'אט מכיל הודעה שלא-נקראה שמזכירה את הכינוי שלך"
+
+msgid "The text information for a buddy's status"
+msgstr "הטקסט עבור מצבו של חבר"
+
+msgid "Type the host name for this certificate."
+msgstr "יש להקליד את שם השרת שעבורו נועדה תעודה זו"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "שרתי SSL"
@@ -10667,19 +9989,12 @@ msgstr "פקודה לא מוכרת."
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "איש קשר זה אינו באותו פרוטוקול של צ'אט זה"
 
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
+msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "אינך מחובר/ת בחשבון שיכול להזמין את איש הקשר הזה."
 
 msgid "Invite Buddy Into Chat Room"
 msgstr "הזמן איש קשר לתוך חדר צ'אט"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "יש להזין את שם המשתמש שברצונך להזמין, יחד עם הודעת הזמנה אופציונלית."
-
 msgid "_Buddy:"
 msgstr "_איש הקשר:"
 
@@ -10708,7 +10023,7 @@ msgstr "התעלם"
 msgid "Get Away Message"
 msgstr "השג את הודעת ההתרחקות"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "נאמר לאחרונה"
 
 msgid "Unable to save icon file to disk."
@@ -10754,6 +10069,18 @@ msgstr "/שיחה/_שמור בשם..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/שיחה/נ_קה גלילה לאחור"
 
+msgid "/Conversation/M_edia"
+msgstr "/שיחה/_מדיה"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/שיחה _קולית/שיחה/מדיה"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/שיחת _וידאו/שיחה/מדיה"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/שיחת ו_ידאו/\\קול/שיחה/מדיה"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/שיחה/ש_לח קובץ..."
 
@@ -10826,6 +10153,15 @@ msgstr "/שיחה"
 msgid "/Conversation/View Log"
 msgstr "/שיחה/הצג יומן שיחות"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/שיחת קול/שיחה/מדיה"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/שיחת וידאו/שיחה/מדיה"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/שיחת וידאו/\\קול/שיחה/מדיה"
+
 msgid "/Conversation/Send File..."
 msgstr "/שיחה/שלח קובץ..."
 
@@ -10999,9 +10335,8 @@ msgid "Fatal Error"
 msgstr "שגיאה קטלנית"
 
 msgid "bug master"
-msgstr ""
+msgstr "שר-הבאגים"
 
-#, fuzzy
 msgid "artist"
 msgstr "אמן"
 
@@ -11009,12 +10344,14 @@ msgstr "אמן"
 msgid "Ka-Hing Cheung"
 msgstr "קא-הינג צ'אונג"
 
+msgid "voice and video"
+msgstr "קול ווידאו"
+
 msgid "support"
 msgstr "תמיכה"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "מפתח ומנהל אתר"
+msgstr "מנהל אתר"
 
 msgid "Senior Contributor/QA"
 msgstr "תורם בכיר/QA"
@@ -11036,7 +10373,7 @@ msgid "support/QA"
 msgstr "תמיכה/QA"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "מתכנת מקורי"
@@ -11113,9 +10450,8 @@ msgstr "פינית"
 msgid "French"
 msgstr "צרפתית"
 
-#, fuzzy
 msgid "Irish"
-msgstr "כורדית"
+msgstr "אירית"
 
 msgid "Galician"
 msgstr "גליסיאנית"
@@ -11135,6 +10471,9 @@ msgstr "הינדית"
 msgid "Hungarian"
 msgstr "הונגרית"
 
+msgid "Armenian"
+msgstr "ארמנית"
+
 msgid "Indonesian"
 msgstr "אינדונזית"
 
@@ -11150,6 +10489,9 @@ msgstr "גאורגנית (גרוזינית)"
 msgid "Ubuntu Georgian Translators"
 msgstr "מתרגמי הגרוזינית של אובונטו"
 
+msgid "Khmer"
+msgstr "קמבודית"
+
 msgid "Kannada"
 msgstr "קאנאדית"
 
@@ -11171,6 +10513,9 @@ msgstr "ליטואנית"
 msgid "Macedonian"
 msgstr "מקדונית"
 
+msgid "Mongolian"
+msgstr "מונגולית"
+
 msgid "Bokmål Norwegian"
 msgstr "נורבגית ספרותית"
 
@@ -11225,6 +10570,9 @@ msgstr "סרי-לנקית"
 msgid "Swedish"
 msgstr "שוודית"
 
+msgid "Swahili"
+msgstr "סוואהילי"
+
 msgid "Tamil"
 msgstr "תמיל"
 
@@ -11263,29 +10611,24 @@ msgid "About %s"
 msgstr "אודות %s"
 
 #, c-format
-msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr ""
-"%s הינה תוכנת שליחת הודעות מיידיות גרפית מודולרית מבוססת libpurple אשר לבצע "
-"חיבורים אל AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, QQ ובכולם "
-"בו- זמנית. התוכנה נכתבה בעזרת GTK+.<BR><BR>מותר לערוך שינויים ולהפיץ את "
-"התוכנה תחת הנחיות רישיון הGPL (גרסא 2 והלאה). יותר). העתק של ה-GPL מוכל בתוך "
-"הקובץ 'COPYING' המופץ עם %s. %s היא תחת זכויות המפתחים והתורמים לפיתוח. ראה "
-"את הקובץ 'COPYRIGHT' לרשימה מלאה של התורמים. איננו מספקים שום אחריות לתוכנה "
-"זו.<BR><BR>"
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "%s הינה תוכנת שליחת הודעות מיידיות גרפית מודולרית מבוססת libpurple אשר לבצע חיבורים אל AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, QQ ובכולם בו- זמנית. התוכנה נכתבה בעזרת GTK+.<BR><BR>מותר לערוך שינויים ולהפיץ את התוכנה תחת הנחיות רישיון הGPL (גרסא 2 והלאה). יותר). העתק של ה-GPL מוכל בתוך הקובץ 'COPYING' המופץ עם %s. %s היא תחת זכויות המפתחים והתורמים לפיתוח. ראה את הקובץ 'COPYRIGHT' לרשימה מלאה של התורמים. איננו מספקים שום אחריות לתוכנה זו.<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr "<FONT SIZE=\"4\">שו\"ת:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+msgstr "<FONT SIZE=\"4\">עזרה דרך האימייל:</FONT> <A HREF=\"mailto:support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">ערוץ IRC:</FONT> #pidgin על irc.freenode.net<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin ב- irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "מפתחים"
@@ -11317,9 +10660,7 @@ msgstr " חשבון"
 msgid "Get User Info"
 msgstr "מידע כללי על המשתמש"
 
-msgid ""
-"Please enter the username or alias of the person whose info you would like "
-"to view."
+msgid "Please enter the username or alias of the person whose info you would like to view."
 msgstr "יש להזין את שם המשתמש או הכינוי של האדם עליו תרצו לקרוא מידע."
 
 msgid "View User Log"
@@ -11345,18 +10686,10 @@ msgid "Enter an alias for this chat."
 msgstr "הזן שם נוסף לשיחה זו."
 
 #, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d איש קשר אחר בתוכו "
-"מתוך רשימת אנשי הקשר שלך?"
-msgstr[1] ""
-"האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d אנשי קשר אחרים "
-"בתוכו מתוך רשימת אנשי הקשר שלך?"
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr[0] "האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d איש קשר אחר בתוכו מתוך רשימת אנשי הקשר שלך?"
+msgstr[1] "האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d אנשי קשר אחרים בתוכו מתוך רשימת אנשי הקשר שלך?"
 
 msgid "Remove Contact"
 msgstr "הסר איש קשר"
@@ -11365,9 +10698,7 @@ msgid "_Remove Contact"
 msgstr "ה_סר איש קשר"
 
 #, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
 msgstr "האם הנך בטוח/ה שברצונך לאחד את הקבוצה %s לתוך הקבוצה %s?"
 
 msgid "Merge Groups"
@@ -11377,9 +10708,7 @@ msgid "_Merge Groups"
 msgstr "מזג קבוצות"
 
 #, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את הקבוצה %s וכל חבריה מרשימת אנשי הקשר שלך?"
 
 msgid "Remove Group"
@@ -11389,8 +10718,7 @@ msgid "_Remove Group"
 msgstr "הסר _קבוצה"
 
 #, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את %s מרשימת אנשי הקשר שלך?"
 
 msgid "Remove Buddy"
@@ -11400,9 +10728,7 @@ msgid "_Remove Buddy"
 msgstr "הסר איש קשר"
 
 #, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את הצ'אט %s מרשימת אנשי הקשר שלך?"
 
 msgid "Remove Chat"
@@ -11502,14 +10828,6 @@ msgstr "_נקה קבצים שהועברו"
 msgid "File transfer _details"
 msgstr "פרטי העברות קבצים"
 
-#. Pause button
-msgid "_Pause"
-msgstr "השהייה"
-
-#. Resume button
-msgid "_Resume"
-msgstr "ה_משך"
-
 msgid "Paste as Plain _Text"
 msgstr "הדבק בתור _טקסט רגיל"
 
@@ -11525,13 +10843,11 @@ msgstr "צבע קישורים"
 msgid "Color to draw hyperlinks."
 msgstr "צבע לצבוע בו קישורים."
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "צבע קישורים"
+msgstr "צבע קישור שביקרת"
 
-#, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
-msgstr "הצבע לצבוע בו קישורים כאשר העכבר מעליהם."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr "הצבע עבור קישורים שכבר בוקרו (או הופעלו)."
 
 msgid "Hyperlink prelight color"
 msgstr "צבע קישורים לפני לחיצה"
@@ -11566,14 +10882,20 @@ msgstr "הצבע עבור שם של הודעות-פעולה."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "צבע עבור שמות הודעות-פעולה להודעות שנלחשות"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "הצבע עבור השם של הודעת פעולה שנלחשה."
+
 msgid "Whisper Message Name Color"
 msgstr "צבע עבור שם הודעה שנלחשה"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "הצבע עבור השם של הודעה שנלחשה."
+
 msgid "Typing notification color"
 msgstr "צבע התרעת-הקלדה"
 
-msgid "The color to use for the typing notification font"
-msgstr "הצבע בו תוצג התרעת ההקלדה"
+msgid "The color to use for the typing notification"
+msgstr "הצבע עבור התרעת ההקלדה."
 
 msgid "Typing notification font"
 msgstr "גופן התרעת-הקלדה"
@@ -11584,15 +10906,6 @@ msgstr "הגופן בו תוצג התרעת ההקלדה"
 msgid "Enable typing notification"
 msgstr "הפעל התרעת הקלדה"
 
-msgid "_Copy Email Address"
-msgstr "העתק _כתובת הדוא\"ל"
-
-msgid "_Open Link in Browser"
-msgstr "_פתח את הקישור בדפדפן"
-
-msgid "_Copy Link Location"
-msgstr "ה_עתק מיקום הקישור"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11634,11 +10947,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "שמור תמונה"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "שמור _תמונה..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "הוסף סמייליים שלי..."
 
@@ -11657,9 +10968,7 @@ msgstr "_קישור"
 msgid "_Description"
 msgstr "_תיאור"
 
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "יש להזין כתובת ותיאור עבור הקישור ברצונך להכניס. לא חובה להזין תיאור."
 
 msgid "Please enter the URL of the link that you want to insert."
@@ -11725,9 +11034,6 @@ msgstr "הקטן את גודל הגופן"
 msgid "Font Face"
 msgstr "צורת הגופן"
 
-msgid "Background Color"
-msgstr "צבע הרקע"
-
 msgid "Foreground Color"
 msgstr "צבע הגופן"
 
@@ -11792,21 +11098,15 @@ msgid "Check permissions and try again."
 msgstr "יש לבדוק הרשאות ולנסות בשנית."
 
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
 msgstr "האם ברצונך למחוק את רישום השיחה עם %s שהתחלת ב- %s?"
 
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
 msgstr "האם ברצונך למחוק את רישום השיחה ב- %s שהתחיל ב- %s?"
 
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
 msgstr "האם ברצונך למחוק את רישום יומן המערכת שהחל ב- %s?"
 
 msgid "Delete Log?"
@@ -11838,6 +11138,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11852,6 +11153,7 @@ msgstr ""
 "\n"
 "  -c, --config=ספריה  השתמש בספרייה לקבצי הגדרות\n"
 "  -d, --debug         שלח הודעות ניפוי באגים ל-stdout\n"
+"  -f, --force-online  אלץ מצב מקוון, בלי להתחשב במצב הרשת\n"
 "  -h, --help          הצג הודעה זו וצא\n"
 "  -m, --multiple      אל תוודא שרק עותק אחד רץ\n"
 "  -n, --nologin       אל תתחבר אוטומטית\n"
@@ -11867,6 +11169,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11880,6 +11183,7 @@ msgstr ""
 "\n"
 "  -c, --config=ספריה  השתמש בספרייה לקבצי הגדרות\n"
 "  -d, --debug         שלח הודעות ניפוי באגים ל-stdout\n"
+"  -f, --force-online  אלץ מצב מקוון, בלי להתחשב במצב הרשת\n"
 "  -h, --help          הצג הודעה זו וצא\n"
 "  -m, --multiple      אל תוודא שרק עותק אחד רץ\n"
 "  -n, --nologin       אל תתחבר אוטומטית\n"
@@ -11888,7 +11192,7 @@ msgstr ""
 "  --display=DISPLAY   מספר התצוגה להשתמש בו בחלונות X\n"
 "  -v, --version       הצג את הגרסה של התוכנה וצא\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
@@ -11906,28 +11210,45 @@ msgstr ""
 "%s %s נפל וניסה לכתוב קובץ של הזיכרון לקובץ.\n"
 "זהו באג בתוכנה, שקרה ללא שום אשמה מצידך.\n"
 "\n"
-"אם באפשרותך לגרום לנפילה לקרות שוב, אנא הודע על כך למפתחים דרך:\n"
+"אם באפשרותך לגרום לנפילה לקרות שוב, אנא הודע על כך למפתחים\n"
+"על ידי דיווח באג באתר:\n"
 "%ssimpleticket/\n"
 "\n"
-"יש לפרט בדיוק מה עשית בזמן הנפילה, ולשלוח את הודעות ה-backtrace מהקובץ "
-"core.\n"
+"יש לפרט בדיוק מה עשית בזמן הנפילה, ולשלוח את הודעות ה-backtrace מהקובץ core.\n"
 "אם אינך יודע/ת להוציא את ה-backtrace, אנא קרא את ההוראות ב:\n"
 "%swiki/GetABacktrace\n"
-"\n"
-"אם יש צורך בעזרה נוספת, אנא פנה בהודעה אל SeanEgn או LSchiere דרך AIM.\n"
-"מידע ליצור קשר עם שון ולוק בפרוטוקולים אחרים נמצא ב:\n"
-"%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 msgid "Pidgin"
 msgstr "פידג'ין"
 
-msgid "Open All Messages"
-msgstr "פתח את כל ההודעות"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "מסיים מכיוון שכבר רצה תוכנה אחרת שהמשתמש בספריית libpurple.\n"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">דואר חדש נכנס!</span>"
+msgid "/_Media"
+msgstr "/_מדיה"
+
+msgid "/Media/_Hangup"
+msgstr "/מדיה/_ניתוק"
+
+msgid "Calling..."
+msgstr "מתקשר..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "נתקבלה בקשה מאת %s להתחיל התקשרות קול/וידאו איתך."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "נתקבלה בקשה מאת %s להתחיל התקשרות וידאו איתך."
+
+msgid "Incoming Call"
+msgstr "שיחה נכנסת"
+
+msgid "_Pause"
+msgstr "השהייה"
 
 #, c-format
 msgid "%s has %d new message."
@@ -11952,10 +11273,27 @@ msgstr "URLלא ניתן לפתוח את ה-"
 msgid "Error launching \"%s\": %s"
 msgstr "שגיאה בהפעלת הפקודה \"%s\": %s"
 
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "נבחרה לביצוע הפקודה 'הידנית' של הדפדפן, אבל לא נקבעה הוראה לביצוע."
 
+msgid "No message"
+msgstr "ללא הודעה"
+
+msgid "Open All Messages"
+msgstr "פתח את כל ההודעות"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">דואר חדש נכנס!</span>"
+
+msgid "New Pounces"
+msgstr "צור תגובות פעילות חדשות"
+
+msgid "Dismiss"
+msgstr "סגור"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">הפעלת פעולת-תגובה!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "התוספים שלהלן ייפרקו מן הזיכרון."
 
@@ -11968,9 +11306,7 @@ msgstr "פרוק תוספים"
 msgid "Could not unload plugin"
 msgstr "לא ניתן להפסיק את פעולת התוסף"
 
-msgid ""
-"The plugin could not be unloaded now, but will be disabled at the next "
-"startup."
+msgid "The plugin could not be unloaded now, but will be disabled at the next startup."
 msgstr "לא ניתן לכבות את התוסף כרגע, אבל הוא יכובה בהפעלה הבאה של התוכנה."
 
 #, c-format
@@ -12002,10 +11338,16 @@ msgstr "<b>פרטי התוסף</b>"
 msgid "Select a file"
 msgstr "בחר קובץ"
 
+msgid "Modify Buddy Pounce"
+msgstr "ערוך שינויים בתגובת פעילות"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "למי להגיב"
 
+msgid "_Account:"
+msgstr "חש_בון:"
+
 msgid "_Buddy name:"
 msgstr "שם איש הקשר:"
 
@@ -12072,18 +11414,64 @@ msgstr "חוזר"
 msgid "Pounce Target"
 msgstr "מטרת התגובה"
 
-msgid "Smiley theme failed to unpack."
-msgstr "כישלון בעת פתיחת ערכת סמייליים"
+#, c-format
+msgid "Started typing"
+msgstr "התחיל/ה להקליד"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "עצר/ה בעת הקלדה"
+
+#, c-format
+msgid "Signed on"
+msgstr "התחבר/ה"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "חזר/ה מחוסר-פעילות"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "חזר/ה למחשב"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "כבר לא מקליד/ה"
+
+#, c-format
+msgid "Signed off"
+msgstr "התנתק/ה"
+
+#, c-format
+msgid "Became idle"
+msgstr "הפכ/ה לחסרת-פעילות"
+
+#, c-format
+msgid "Went away"
+msgstr "נעשה מרוחק"
+
+#, c-format
+msgid "Sent a message"
+msgstr "שלח הודעה"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "לא מוכר. אנא דווח על כך!"
+
+msgid "Theme failed to unpack."
+msgstr "כישלון בעת פתיחת ערכת מוטיב."
+
+msgid "Theme failed to load."
+msgstr "כישלון בעת טעינת ערכת מוטיב."
+
+msgid "Theme failed to copy."
+msgstr "כישלון בעת העתקת ערכת מוטיב."
 
 msgid "Install Theme"
 msgstr "התקן עיצוב"
 
-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 ""
-"בחר ערכת החיוכים מרשימה למטה. ערכות חדשות ניתן להתקין ע\"י גרירתם על רשימת "
-"הערכות."
+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 "בחר ערכת החיוכים מרשימה למטה. ערכות חדשות ניתן להתקין ע\"י גרירתם על רשימת הערכות."
 
 msgid "Icon"
 msgstr "סמל"
@@ -12094,6 +11482,11 @@ msgstr "קיצורי-מקלדת"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_סגור חלונות שיחה עם כפתור האסקייפ"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "מוטיבי תצוגה עבור רשימת החברים"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "סמל מגש המערכת"
 
@@ -12103,8 +11496,8 @@ msgstr "הצג את סמל מגש המערכת:"
 msgid "On unread messages"
 msgstr "בהגעת הודעות שלא נקראו"
 
-msgid "Conversation Window Hiding"
-msgstr "הסתרת חלונות שיחה"
+msgid "Conversation Window"
+msgstr "חלון שיחה"
 
 msgid "_Hide new IM conversations:"
 msgstr "ה_סתר שיחות חדשות"
@@ -12112,6 +11505,9 @@ msgstr "ה_סתר שיחות חדשות"
 msgid "When away"
 msgstr "כאשר מרוחק"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "מזער חלונות שיחה חדשים"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "כרטיסיות"
@@ -12170,9 +11566,6 @@ msgstr "התשתמש בגלילה-חלקה"
 msgid "F_lash window when IMs are received"
 msgstr "_הבהב את חלון השיחה בעת קבלת הודעות"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "מזער חלונות שיחה חדשים"
-
 msgid "Minimum input area height in lines:"
 msgstr "גובה מינימלי בשורות של איזור הקלט:"
 
@@ -12191,12 +11584,8 @@ msgstr "גופן שיחות:"
 msgid "Default Formatting"
 msgstr "פורמט ברירת המחדל"
 
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-msgstr ""
-"ככה ייראה הטקסט של הודעות יוצאות כאשר תשתמש/י בפרוטוקולים שתומכים בפירמוט "
-"טקסט."
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
+msgstr "ככה ייראה הטקסט של הודעות יוצאות כאשר תשתמש/י בפרוטוקולים שתומכים בפירמוט טקסט."
 
 msgid "Cannot start proxy configuration program."
 msgstr "לא יכול להפעיל את תוכנת הגדרת שרת התיווך."
@@ -12204,14 +11593,12 @@ msgstr "לא יכול להפעיל את תוכנת הגדרת שרת התיוו�
 msgid "Cannot start browser configuration program."
 msgstr "לא יכול להפעיל את תוכנת הגדרות הדפדפן."
 
-msgid "ST_UN server:"
-msgstr "שרת STUN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">לדוגמא: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "מצ_א כתובת IP אוטומטית"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "התשמש ב_כתובת ה-IP שזוההתה אוטומטית: %s"
 
 msgid "Public _IP:"
 msgstr "כתובת IP חיצונית:"
@@ -12231,6 +11618,10 @@ msgstr "יציאה _ראשונה:"
 msgid "_End port:"
 msgstr "יציאה _אחרונה:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "שרת העברה (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "שרת תיווך ודפדפן"
 
@@ -12259,6 +11650,10 @@ msgstr "הגדרות המתווך"
 msgid "No proxy"
 msgstr "ללא מתווך"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr "השתמש בשירות DNS מרוחק עם שרתי-תיווך SOCKS"
+
 msgid "_User:"
 msgstr "_משתמש:"
 
@@ -12380,20 +11775,17 @@ msgstr ""
 "צליל לפקו_דה:\n"
 "(%s עבור קובץ)"
 
-#, fuzzy
 msgid "M_ute sounds"
 msgstr "ה_שתק צלילים"
 
 msgid "Sounds when conversation has _focus"
 msgstr "צלילים כאשר יש לחלון השיחה מי_קוד"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "הפעל צלילים:"
+msgstr "ה_פעל צלילים"
 
-#, fuzzy
 msgid "V_olume:"
-msgstr "עוצמת-שמע:"
+msgstr "עו_צמת-שמע"
 
 msgid "Play"
 msgstr "נגן"
@@ -12420,12 +11812,12 @@ msgstr "כאשר מרוחק וגם חסר פעילות"
 msgid "Auto-away"
 msgstr "ריחוק אוטומטי"
 
-msgid "Change status when _idle"
-msgstr "קבע ריחוק בעת חוסר פעילות"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_דקות לפני קביעת ריחוק:"
 
+msgid "Change status when _idle"
+msgstr "קבע ריחוק בעת חוסר פעילות"
+
 msgid "Change _status to:"
 msgstr "שנה ריחוק ל:"
 
@@ -12573,52 +11965,46 @@ msgstr "שמור והשתמש"
 msgid "Status for %s"
 msgstr "מצב עבור %s"
 
+#, c-format
+msgid "A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr "כבר קיים חייכן משלך עבור '%s'. יש לנסות קיצור-דרך אחר."
+
 msgid "Custom Smiley"
 msgstr "חייכן שלך"
 
-msgid "More Data needed"
-msgstr "נחוץ מידע נוסף"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "נא להזין קיצור-דרך לקשר עם החייכן."
-
 msgid "Duplicate Shortcut"
 msgstr "כפילות בקיצורי-הדרך"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr "חייכן שלך כבר קיים לקיצור-הדרך שנבחר. יש לבחור קיצור-דרך אחר."
-
-msgid "Please select an image for the smiley."
-msgstr "יש לבחור תמונה עבור החייכן."
-
 msgid "Edit Smiley"
 msgstr "_ערוך חייכן"
 
 msgid "Add Smiley"
 msgstr "הוס_ף חייכן"
 
-msgid "Smiley _Image"
-msgstr "_תמונת חייכן"
+msgid "_Image:"
+msgstr "ת_מונה"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "קיצורים ל_חייכנים"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "טקסט לק_יצור-דרך:"
 
 msgid "Smiley"
 msgstr "חייכן"
 
+msgid "Shortcut Text"
+msgstr "טקסט לקיצור-דרך"
+
 msgid "Custom Smiley Manager"
 msgstr "מנהל החייכנים שלך"
 
-#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "בחירת תמונה עבור חבר"
+
 msgid "Click to change your buddyicon for this account."
-msgstr "השתמש בתמונה זו לחשבון זה:"
+msgstr "ניתן ללחוץ על מנת להחליף את תמונת החבר של חשבון זה."
 
-#, fuzzy
 msgid "Click to change your buddyicon for all accounts."
-msgstr "השתמש בתמונה זו לחשבון זה:"
+msgstr "ניתן ללחוץ על מנת להחליף את תמונת החבר של כל החשבונות."
 
 msgid "Waiting for network connection"
 msgstr "ממתין לחיבור לרשת"
@@ -12647,20 +12033,14 @@ msgid "Cannot send folder %s."
 msgstr "לא ניתן לשלוח את הספריה %s."
 
 #, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
+msgid "%s cannot transfer a folder. You will need to send the files within individually."
 msgstr "%s לא יכול להעביר ספריה. תיאלצ/י לשלוח את הקבצים בתוך הספריה אחד-אחד."
 
 msgid "You have dragged an image"
 msgstr "גררת תמונה"
 
-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 ""
-"ניתן לשלוח תמונה זו כקובץ מועבר, לשים אותה בהודעה זו, או להשתמש בה בתור סמל "
-"עבור איש הקשר הזה."
+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 "ניתן לשלוח תמונה זו כקובץ מועבר, לשים אותה בהודעה זו, או להשתמש בה בתור סמל עבור איש הקשר הזה."
 
 msgid "Set as buddy icon"
 msgstr "קבע להיות סמל איש הקשר"
@@ -12674,14 +12054,10 @@ msgstr "הכנס לתוך ההודעה"
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "האם ברצונך לקבוע את זה להיות הסמל של איש קשר זה?"
 
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
+msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
 msgstr "ניתן לשלוח תמונה זו כקובץ מועבר, או להשתמש בה בתור סמל עבור משתמש זה."
 
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
+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
@@ -12692,12 +12068,8 @@ msgstr "ניתן להכניס תמונה זו לתוך ההודעה, או להש
 msgid "Cannot send launcher"
 msgstr "לא ניתן לשלוח את קובץ המפעיל"
 
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"גררת קובץ מפעיל של שולחן העבודה. קרוב לודאי שרצית לשלוח את מה שהמפעיל "
-"מצביעעליו, ולא את המפעיל עצמו."
+msgid "You dragged a desktop launcher. Most likely you wanted to send the target of this launcher instead of this launcher itself."
+msgstr "גררת קובץ מפעיל של שולחן העבודה. קרוב לודאי שרצית לשלוח את מה שהמפעיל מצביע עליו, ולא את המפעיל עצמו."
 
 #, c-format
 msgid ""
@@ -12724,13 +12096,33 @@ msgid "Failed to open file '%s': %s"
 msgstr "כישלון בעת פתיחת הקובץ '%s': %s"
 
 #, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "כישלון בעת טעינת התמונה '%s': סיבה לא ידועה, כנראה קובץ תמונה פגום"
 
+msgid "_Open Link"
+msgstr "_פתח קישור"
+
+msgid "_Copy Link Location"
+msgstr "ה_עתק מיקום הקישור"
+
+msgid "_Copy Email Address"
+msgstr "העתק _כתובת הדוא\"ל"
+
+msgid "_Open File"
+msgstr "פתח קוב_ץ"
+
+msgid "Open _Containing Directory"
+msgstr "פתח ספרייה _מכילה"
+
 msgid "Save File"
 msgstr "שמור קובץ"
 
+msgid "_Play Sound"
+msgstr "_נגן צליל"
+
+msgid "_Save File"
+msgstr "_שמור קובץ"
+
 msgid "Select color"
 msgstr "בחר צבע"
 
@@ -12746,13 +12138,11 @@ msgstr "הצג פרטים"
 msgid "_Invite"
 msgstr "הזמן"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_ערוך"
+msgstr "_ערוך..."
 
-#, fuzzy
 msgid "_Add..."
-msgstr "הוסף"
+msgstr "_הוסף..."
 
 msgid "_Open Mail"
 msgstr "_פתח דואר"
@@ -12775,12 +12165,11 @@ msgstr "בבחירת זה מבוטלים סמלי-הרגשות הגרפיים."
 msgid "none"
 msgstr "ללא"
 
-#, fuzzy
 msgid "Small"
-msgstr "דואר"
+msgstr "קטן"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "גירסאות מוקטנות של חייכני ברירת המחדל"
 
 msgid "Response Probability:"
 msgstr "התסברות תגובה:"
@@ -12821,6 +12210,62 @@ msgstr "תוסף ניבוי זמינות אנשי-קשר"
 msgid "Displays statistical information about your buddies' availability"
 msgstr "מציג מידע סטטיסטי על זמינות אנשי-הקשר שלך"
 
+msgid "Server name request"
+msgstr "בקשת שם שרת"
+
+msgid "Enter an XMPP Server"
+msgstr "יש להזין שרת XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "יש לבחור שרת XMPP לתישאול"
+
+msgid "Find Services"
+msgstr "מצא שירות"
+
+msgid "Add to Buddy List"
+msgstr "הוסף לרשימת אנשי-הקשר"
+
+msgid "Gateway"
+msgstr "שער"
+
+msgid "Directory"
+msgstr "ספרייה"
+
+msgid "PubSub Collection"
+msgstr "אוסף PubSub"
+
+msgid "PubSub Leaf"
+msgstr "עלה PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>תיאור:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "גילוי שרותים"
+
+msgid "_Browse"
+msgstr "_עיין"
+
+msgid "Server does not exist"
+msgstr "השרת אינו קיים"
+
+msgid "Server does not support service discovery"
+msgstr "השרת לא תומך בגילוי שירותים"
+
+msgid "XMPP Service Discovery"
+msgstr "גילוי שירות XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "מאפשר רישום ועיון ברשימת השירותים"
+
+msgid "This plugin is useful for registering with legacy transports or other XMPP services."
+msgstr "תוסף זה שימושי לטובת רישום עם פרוטוקולי תקשורת ישנים או שירותי XMPP אחרים."
+
 msgid "Buddy is idle"
 msgstr "איש הקשר במנוחה"
 
@@ -12840,9 +12285,7 @@ msgstr "איש הקשר איננו מחובר"
 msgid "Point values to use when..."
 msgstr "ערכי ניקוד שיש להשתמש בהם כאשר..."
 
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
 msgstr "איש הקשר עם הניקוד <i>הגבוה</i> יהיה איש הקשר עם העדיפות.\n"
 
 msgid "Use last buddy when scores are equal"
@@ -12863,17 +12306,12 @@ msgstr "שנה עדיפות"
 #. *< name
 #. *< version
 #. *< summary
-msgid ""
-"Allows for controlling the values associated with different buddy states."
+msgid "Allows for controlling the values associated with different buddy states."
 msgstr "מאפשר שליטה על הערכים המיוחסים למצבים השונים של אנשי הקשר."
 
 #. *< description
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"מאפשר לשנות את ערכי הניקוד לחוסר פעילות/ריחוק/ניתוק אשר נעשה בו שימוש "
-"בחישובי הדירוג של אנשי הקשר."
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "מאפשר לשנות את ערכי הניקוד לחוסר פעילות/ריחוק/ניתוק אשר נעשה בו שימוש בחישובי הדירוג של אנשי הקשר."
 
 msgid "Conversation Colors"
 msgstr "צבעי שיחה"
@@ -12917,11 +12355,8 @@ msgid "Conversation Placement"
 msgstr "מיקום חלון שיחה"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-msgid ""
-"Note: The preference for \"New conversations\" must be set to \"By "
-"conversation count\"."
-msgstr ""
-"הערה: ההעדפה עבור \"שיחות חדשות\" חייבת להקבע להיות \"על פי מספר השיחות\"."
+msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgstr "הערה: ההעדפה עבור \"שיחות חדשות\" חייבת להקבע להיות \"על פי מספר השיחות\"."
 
 msgid "Number of conversations per window"
 msgstr "מספר שיחות בכל חלון"
@@ -12945,9 +12380,7 @@ msgstr "אפשרויות נוספות למיקום שיחות"
 
 #. *< summary
 #. *  description
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
 msgstr "הגבל את מספר השיחות בכל חלון-שיחה, עם אפשרות להפריד בין הודעות לצ'אטים"
 
 #. Configuration frame
@@ -12981,14 +12414,12 @@ msgstr "מוסיף תמיכה לפעולות עכבר"
 
 #. *  description
 msgid ""
-"Allows support for mouse gestures in conversation windows. Drag the middle "
-"mouse button to perform certain actions:\n"
+"Allows support for mouse gestures in conversation windows. Drag the middle mouse button to perform certain actions:\n"
 " • Drag down and then to the right to close a conversation.\n"
 " • Drag up and then to the left to switch to the previous conversation.\n"
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"מאפשר תמיכה בפעולות עכבר בחלונות שיחה. גרור/י עם הכפתור האמצעי כדי לבצע "
-"פעולות מסוימות:\n"
+"מאפשר תמיכה בפעולות עכבר בחלונות שיחה. גרור/י עם הכפתור האמצעי כדי לבצע פעולות מסוימות:\n"
 " • גרור/י מטה ואז לימין לסגור חלון.\n"
 " • גרור/י מעלה ואז שמאלה לעבור לשיחה הקודמת.\n"
 " • גרור/י מעלה ואז ימינה לעבור לשיחה הבאה."
@@ -13012,12 +12443,8 @@ msgid "Select Buddy"
 msgstr "בחר איש קשר"
 
 #. Add the label.
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"יש לבחור משתמש מרשימת הכתובות שלך כדי להוסיף אליו את איש הקשר הזה, או ליצור "
-"חדש"
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "יש לבחור משתמש מרשימת הכתובות שלך כדי להוסיף אליו את איש הקשר הזה, או ליצור חדש"
 
 #. Add the expander
 msgid "User _details"
@@ -13158,9 +12585,7 @@ msgstr "חלונות הודעה"
 msgid "C_hat windows"
 msgstr "חלונות _שיחה"
 
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
 msgstr "התקבלה בקשה לשיחת מוזיקה. נא ללחוץ על כפתור ה-MM להסכים."
 
 msgid "Music messaging session confirmed."
@@ -13200,11 +12625,8 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "תוסף להודעות מוזיקה להלחנה משותפת."
 
 #. *  summary
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"התוסף להודעות מוזיקה מאפשר למספר משתמשים לעבוד יחד על הלחנת יצירה בזמן אמת."
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editing a common score in real-time."
+msgstr "התוסף להודעות מוזיקה מאפשר למספר משתמשים לעבוד יחד על יצירה מוזיקלית על ידי עריכה של לחן משותף בזמן אמת."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -13235,9 +12657,8 @@ msgstr "הכנס מס_פר ההודעות החדשות לתוך המאפיין X
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "קבע את רמז ה-\"URGENT\" של מנהל החלונות"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "חלונות _שיחה"
+msgstr "הבהב ח_לון"
 
 #. Raise window method button
 msgid "R_aise conversation window"
@@ -13314,22 +12735,18 @@ msgstr ""
 "- זה הופך את כל הטקסט הנכנס\n"
 "- זה שולי הודעה לאנשי הקשר ברגע שהם מתחברים"
 
-msgid "Cursor Color"
-msgstr "צבע הסמן"
-
-msgid "Secondary Cursor Color"
-msgstr "צבע משני של הסמן"
-
 msgid "Hyperlink Color"
 msgstr "צבע קישורים"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "צבע קישורים"
+msgstr "צבע קישורים שביקרת"
 
 msgid "Highlighted Message Name Color"
 msgstr "צבע לסימון שמות בהודעות"
 
+msgid "Typing Notification Color"
+msgstr "צבע התרעת-הקלדה"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "מפריד אופקי"
 
@@ -13359,35 +12776,21 @@ msgstr "גופן הממשק של GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "מוטיב קיצור הדרך הטקסטואלי של GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "צבעי ממשק"
+msgid "Disable Typing Notification Text"
+msgstr "כבה טקסט התרעת הקלדה"
 
-msgid "Widget Sizes"
-msgstr "גדלי פריטי ממשק"
+msgid "GTK+ Theme Control Settings"
+msgstr "בקרת מוטיבים של GTK+"
+
+msgid "Colors"
+msgstr "צבעים"
 
 msgid "Fonts"
 msgstr "גופנים"
 
+msgid "Miscellaneous"
+msgstr "שונות"
+
 msgid "Gtkrc File Tools"
 msgstr "כלים לקובץ Gtkrc"
 
@@ -13410,27 +12813,21 @@ msgstr "גולמי"
 msgid "Lets you send raw input to text-based protocols."
 msgstr "מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט."
 
-msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט (XMPP, MSN, IRC, TOC).לחץ "
-"'Enter' בתיבת ההזנה לשלוח. צפה בחלון ניפוי הבאגים."
+msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט (XMPP, MSN, IRC, TOC).לחץ 'Enter' בתיבת ההזנה לשלוח. צפה בחלון ניפוי הבאגים."
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "ניתן לשדרג אל %s %s היום."
 
 msgid "New Version Available"
 msgstr "קיימת גירסה חדשה"
 
-#, fuzzy
 msgid "Later"
-msgstr "תאריך"
+msgstr "מאוחר יותר"
 
-#, fuzzy
 msgid "Download Now"
-msgstr "הורדת %s: %s"
+msgstr "הורד כעת"
 
 #. *< type
 #. *< ui_requirement
@@ -13448,11 +12845,8 @@ msgid "Checks periodically for new releases."
 msgstr "בודק מדי-פעם אם יצאו גרסאות חדשות."
 
 #. *  description
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"בודק מדי פעם אם יצאו גרסאות חדשות ומודיע למשתמש, בצירוף רשימת השינויים."
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "בודק מדי פעם אם יצאו גרסאות חדשות ומודיע למשתמש, בצירוף רשימת השינויים."
 
 #. *< major version
 #. *< minor version
@@ -13471,12 +12865,8 @@ msgid "Conversation Window Send Button."
 msgstr "כפתור שליחה בחלון שיחה."
 
 #. *< summary
-msgid ""
-"Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
-msgstr ""
-"מוסיף כפתור שליחה לאיזור הקלט של חלון השיחה. נועד לשימוש כאשר אין מקלדת "
-"פיזית."
+msgid "Adds a Send button to the entry area of the conversation window. Intended for use when no physical keyboard is present."
+msgstr "מוסיף כפתור שליחה לאיזור הקלט של חלון השיחה. נועד לתרחיש שאין בנמצא מקלדת פיזית."
 
 msgid "Duplicate Correction"
 msgstr "כפילות בתיקונים"
@@ -13527,6 +12917,98 @@ msgstr "החלפת הטקסט"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "מחליף טקסט בהודעות יוצאות עפ\"י חוקים שנקבעים ע\"י המשתמש."
 
+msgid "Just logged in"
+msgstr "רק התחבר"
+
+msgid "Just logged out"
+msgstr "רק התנתק"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"סמל עבור איש-קשר\n"
+"סמל עבור אדם לא מוכר"
+
+msgid "Icon for Chat"
+msgstr "סמל לשיחה"
+
+msgid "Ignored"
+msgstr "התעלם"
+
+msgid "Founder"
+msgstr "מייסד"
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "מפעיל"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr "חצי-מפעיל"
+
+msgid "Authorization dialog"
+msgstr "חלון הרשאה"
+
+msgid "Error dialog"
+msgstr "חלון שגיאה "
+
+msgid "Information dialog"
+msgstr "חלון מידע"
+
+msgid "Mail dialog"
+msgstr "חלון דואר"
+
+msgid "Question dialog"
+msgstr "חלון שאלה"
+
+msgid "Warning dialog"
+msgstr "חלון אזהרה"
+
+msgid "What kind of dialog is this?"
+msgstr "איזה סוג חלון זה?"
+
+msgid "Status Icons"
+msgstr "סמלי מצב"
+
+msgid "Chatroom Emblems"
+msgstr "תגיות חדרי-צ'אט"
+
+msgid "Dialog Icons"
+msgstr "סמלי חלונות דו-שיח"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "עורך מוטיבים של סמלים בפידג'ין"
+
+msgid "Contact"
+msgstr "איש הקשר"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "עורך המוטיבים של רשימת החברים בפידג'ין"
+
+msgid "Edit Buddylist Theme"
+msgstr "ערוך מוטיבים של רשימת החברים"
+
+msgid "Edit Icon Theme"
+msgstr "ערוך מוטיב-סמלים"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "עורך מוטיבים בפידג'ין"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "עורך מוטיבים בפידג'ין."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13603,9 +13085,7 @@ msgid "Customizes the message timestamp formats."
 msgstr "מגדיר את פורמט חותמות-הזמן בהודעות."
 
 #. *  description
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
 msgstr "תוסף זה מאפשר למשתמש לקבוע אפשרויות שיחה וחותמות-זמן ליומני שיחה."
 
 msgid "Opacity:"
@@ -13654,8 +13134,7 @@ msgstr "שקיפות משתנה עבור רשימת אנשי הקשר וחלונ
 
 #. *  description
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
@@ -13685,20 +13164,14 @@ msgstr "וודא שחלון רשימת אנשי הקשר תמיד עליו_ן:"
 msgid "Only when docked"
 msgstr "רק בעגינה"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_הבהב את חלון השיחה בעת קבלת הודעות צ'אט"
-
 msgid "Windows Pidgin Options"
 msgstr "הגדרות פידג'ין לחלונות"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "אפשרויות לפידג'ין היחודיות לחלונות."
 
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-"מאפשר גישה לאפשרויות הייחודיות לפידג'ין בחלונות, כגון עגינה של רשימת אנשי "
-"הקשר."
+msgid "Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "מאפשר גישה לאפשרויות הייחודיות לפידג'ין בחלונות, כגון עגינה של רשימת אנשי הקשר."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>התנתק.</font>"
@@ -13737,12 +13210,411 @@ msgstr "שלח וקבל סטנזות XMPP גולמיות."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP."
 
+#~ msgid "Failed to open the file"
+#~ msgstr "כישלון בעת פתיחת הקובץ"
+#~ msgid "_Resume"
+#~ msgstr "ה_משך"
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "שרת חיבור BOSH משובש"
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "לא ניתן שלא לטעון את זוג מפתחות ה-SILC"
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s סרב את ההזמנה שלך לועידה בחדר \"%s\" כיוון ש-\"%s\"."
+#~ msgid "Invitation Rejected"
+#~ msgstr "ההזמנה נדחתה"
+
+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "מתווך"
+#~ msgid "Cannot open socket"
+#~ msgstr "אין אפשרות לפתוח שקע"
+#~ msgid "Could not listen on socket"
+#~ msgstr "אין אפשרות להקשיב בשקע זה"
+#~ msgid "Unable to read socket"
+#~ msgstr "אין אפשרות לקרוא את השקע"
+#~ msgid "Connection failed."
+#~ msgstr "ההתחברות נכשלה."
+#~ msgid "Server has disconnected"
+#~ msgstr "השרת התנתק"
+#~ msgid "Couldn't create socket"
+#~ msgstr "אין אפשרות ליצור שקע"
+#~ msgid "Couldn't connect to host"
+#~ msgstr "לא ניתן להתחבר לשרת"
+#~ msgid "Read error"
+#~ msgstr "שגיאה בקריאה"
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "לא ניתן ליצור חיבור עם השרת:\n"
+#~ "%s"
+#~ msgid "Write error"
+#~ msgstr "שגיאה בכתיבה"
+#~ msgid "Last Activity"
+#~ msgstr "פעילות אחרונה"
+#~ msgid "Service Discovery Info"
+#~ msgstr "מידע של שירות תגלית"
+#~ msgid "Service Discovery Items"
+#~ msgstr "פריטי שירות תגלית"
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "כתובות מורחבות לסטאנזות"
+#~ msgid "Multi-User Chat"
+#~ msgstr "צ'אט מרובה משתמשים"
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "מידע נוכחותי בצ'אט מרובה משתמשים"
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "זרמי-נתונים לפי הסדר"
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "פקודות זמניות"
+#~ msgid "PubSub Service"
+#~ msgstr "שירות PubSub"
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "זרמי-נתונים של SOCKS5"
+#~ msgid "Out of Band Data"
+#~ msgstr "מידע שלא לפי סדר"
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+#~ msgid "In-Band Registration"
+#~ msgstr "רישום דרך התור"
+#~ msgid "User Location"
+#~ msgstr "מיקום משתמש"
+#~ msgid "User Avatar"
+#~ msgstr "תמונת משתמש"
+#~ msgid "Chat State Notifications"
+#~ msgstr "התרעות על מצבי צ'אט"
+#~ msgid "Software Version"
+#~ msgstr "גירסת תוכנה"
+#~ msgid "Stream Initiation"
+#~ msgstr "איתחול זרם"
+#~ msgid "User Mood"
+#~ msgstr "מצב-רוח המשתמש"
+#~ msgid "User Activity"
+#~ msgstr "פעילות משתמש"
+#~ msgid "Entity Capabilities"
+#~ msgstr "יכולות ישות"
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "מיקוחים לחיבור מוצפן"
+#~ msgid "User Tune"
+#~ msgstr "שיר משתמש"
+#~ msgid "Roster Item Exchange"
+#~ msgstr "החלפת פריטי רשימה"
+#~ msgid "Reachability Address"
+#~ msgstr "כתובת זמינות"
+#~ msgid "User Profile"
+#~ msgstr "פרופיל משתמש"
+#~ msgid "Jingle"
+#~ msgstr "ג'ינגל"
+#~ msgid "Jingle Audio"
+#~ msgstr "צליל ג'ינגל"
+#~ msgid "User Nickname"
+#~ msgstr "כינוי משתמש"
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ג'ינגל ICE UDP"
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ג'ינגל ICE TCP"
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "ג'ינגל UDP לא-מעובד"
+#~ msgid "Jingle Video"
+#~ msgstr "ג'ינגל וידאו"
+#~ msgid "Jingle DTMF"
+#~ msgstr "ג'ינגל DTMF"
+#~ msgid "Message Receipts"
+#~ msgstr "קבלות הודעות"
+#~ msgid "Public Key Publishing"
+#~ msgstr "פירסום מפתח ציבורי"
+#~ msgid "User Chatting"
+#~ msgstr "משתמש מצ'וטט"
+#~ msgid "User Browsing"
+#~ msgstr "משתמש גולש"
+#~ msgid "User Gaming"
+#~ msgstr "משתמש משחק"
+#~ msgid "User Viewing"
+#~ msgstr "משתמש צופה"
+#~ msgid "Stanza Encryption"
+#~ msgstr "הצפנת סטנזה"
+#~ msgid "Entity Time"
+#~ msgstr "זמן ישות"
+#~ msgid "Delayed Delivery"
+#~ msgstr "משלוח מעוכב"
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "אובייקטי מידע שיתופיים"
+#~ msgid "File Repository and Sharing"
+#~ msgstr "ספריית קבצים ושיתוף"
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "שירות תגלית STUN עבור ג'ינגל"
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "מיקוח פשוט לחיבור המוצפן"
+#~ msgid "Hop Check"
+#~ msgstr "בדיקת קפיצות"
+#~ msgid "Read Error"
+#~ msgstr "שגיאה בקריאה"
+#~ msgid "Failed to connect to server."
+#~ msgstr "כשל בהתחברות לשרת"
+#~ msgid "Read buffer full (2)"
+#~ msgstr "תור-הקריאה מלא (2)"
+#~ msgid "Unparseable message"
+#~ msgstr "הודעת שלא ניתנת לפיענוח"
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "לא ניתן להתחבר לשרת: %s (%d)"
+#~ msgid "Login failed (%s)."
+#~ msgstr "לא ניתן להתחבר (%s)."
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "נותקת כיוון שהתחברת ממחשב אחר."
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "שגיאה. לא מותקנת תמיכה ב-SSL."
+#~ msgid "Incorrect password."
+#~ msgstr "סיסמה לא נכונה."
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "לא ניתן להתחבר לשרת ה-BOS:\n"
+#~ "%s"
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "ייתכן ותנותק/י בקרוב. יש לבדוק את %s לעידכונים."
+#~ msgid "Could Not Connect"
+#~ msgstr "לא ניתן להתחבר"
+#~ msgid "Invalid username."
+#~ msgstr "שם משתמש לא תקף."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
+#~ msgid "Connection lost"
+#~ msgstr "החיבור אבד"
+#~ msgid "Couldn't resolve host"
+#~ msgstr "לא ניתן למצוא כתובת שרת"
+#~ msgid "Connection closed (writing)"
+#~ msgstr "החיבור נסגר (כתיבה)"
+#~ msgid "Connection reset"
+#~ msgstr "החיבור אותחל"
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "שגיאה בקריאת נתונים מהשקע: %s"
+#~ msgid "Unable to connect to host"
+#~ msgstr "לא ניתן להתחבר לשרת"
+#~ msgid "Could not write"
+#~ msgstr "לא ניתן לכתוב"
+#~ msgid "Could not connect"
+#~ msgstr "לא ניתן להתחבר"
+#~ msgid "Could not create listen socket"
+#~ msgstr "אין אפשרות ליצור שקע-קשב"
+#~ msgid "Could not resolve hostname"
+#~ msgstr "לא ניתן למצוא כתובת שרת"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "סיסמה לא נכונה"
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "לא היה ניתן ליצור חיבור עם %s:\n"
+#~ "%s"
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo יפן"
+#~ msgid "Japan Pager server"
+#~ msgstr "שרת ה-Pager ביפן"
+#~ msgid "Japan file transfer server"
+#~ msgstr "שרת יפני להעברת קבצים"
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "אבד החיבור עם השרת\n"
+#~ "%s"
+#~ msgid "Could not resolve host name"
+#~ msgstr "לא ניתן למצוא כתובת שרת"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "השרת דורש TLS/SSL להתחברות. לא נמצאה תמיכה ל-TLS/SSL."
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "הסתרת חלונות שיחה"
+#~ msgid "More Data needed"
+#~ msgstr "נחוץ מידע נוסף"
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "נא להזין קיצור-דרך לקשר עם החייכן."
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "יש לבחור תמונה עבור החייכן."
+#~ msgid "Activate which ID?"
+#~ msgstr "איזה ID להפעיל?"
+#~ msgid "Cursor Color"
+#~ msgstr "צבע הסמן"
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "צבע משני של הסמן"
+#~ msgid "Interface colors"
+#~ msgstr "צבעי ממשק"
+#~ msgid "Widget Sizes"
+#~ msgstr "גדלי פריטי ממשק"
+#~ msgid "Invite message"
+#~ msgstr "הודעת הזמנה"
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "יש להזין את שם המשתמש שברצונך להזמין,\n"
+#~ "יחד עם הודעת הזמנה אופציונלית."
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "לא יכול לאחזר את רשימת הכתובות של MSN"
+#~ msgid "Connection to server lost (no data received within %d second)"
+#~ msgid_plural ""
+#~ "Connection to server lost (no data received within %d seconds)"
+#~ msgstr[0] "אבד החיבור אל השרת (לא התקבל מידע תוך %d שניה)"
+#~ msgstr[1] "אבד החיבור אל השרת (לא התקבל מידע תוך %d שניות)"
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "ייתכן ותנותק/י בקרוב. אולי תרצ/י להיעזר ב-TOC עד אשר זה יתוקן. אפשר לבדוק "
+#~ "ב%s לעידכונים."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "הוסף איש קשר"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
+#~ msgid "Keep alive error"
+#~ msgstr "שגיאה בהשאר-חי"
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "אבדה התקשורת עם שרת:\n"
+#~ "%d, %s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "שרת ההתחברות"
+#~ msgid "Failed to send IM."
+#~ msgstr "כישלון בשליחת הודעה."
+
+#, fuzzy
+#~ msgid "Not a member of room \"%s\"\n"
+#~ msgstr "אינך חבר/ה בקבוצה \"%s\"\n"
+#~ msgid "Looking up %s"
+#~ msgstr "מחפש את %s..."
+#~ msgid "Connect to %s failed"
+#~ msgstr "ההתחברות אל %s לא הצליחה."
+#~ msgid "Signon: %s"
+#~ msgstr "מתחבר: %s"
+#~ msgid "Unable to write file %s."
+#~ msgstr "אין אפשרות לכתוב אל הקובץ %s"
+#~ msgid "Unable to read file %s."
+#~ msgstr "אין אפשרות לקרוא את הקובץ %s."
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "הודעה ארוכה מדי, %s הבייטים האחרונים נקטמו."
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s אינו מחובר כרגע."
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "אזהרה של %s  אינה מותרת."
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "אבדה הודעה; אתה עובר על הגבלת המהירות של השרת."
+#~ msgid "Chat in %s is not available."
+#~ msgstr "צ'אט ב-%s אינו זמין."
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "אתה שולח הודעות אל %s מהר מדיי."
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "פספסת הודעה מ-%s כיוון שהיא הייתה ארוכה מדי."
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "פספסת הודעה מ-%s כיוון שהיא נשלחה מהר מדי."
+#~ msgid "Failure."
+#~ msgstr "כישלון."
+#~ msgid "Too many matches."
+#~ msgstr "יותר מידי תוצאות"
+#~ msgid "Need more qualifiers."
+#~ msgstr "החיפוש זקוק ליותר מגדירים."
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "שירות המדריך אינו זמין זמנית."
+#~ msgid "Email lookup restricted."
+#~ msgstr "חיפוש הדוא\"ל מוגבל."
+#~ msgid "Keyword ignored."
+#~ msgstr "יתעלם ממילת המפתח."
+#~ msgid "No keywords."
+#~ msgstr "אין מילות מפתח."
+#~ msgid "User has no directory information."
+#~ msgstr "אין מידע עבור משתמש זה"
+#~ msgid "Country not supported."
+#~ msgstr "המדינה אינה נתמכת."
+#~ msgid "Failure unknown: %s."
+#~ msgstr "כשל מוכר: %s"
+#~ msgid "Incorrect username or password."
+#~ msgstr "שם משתמש או סיסמא שגויים."
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "השירות אינו זמין זמנית."
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "רמת האזהרה שלך גבוהה מדיי כרגע מכדי להיכנס למערכת."
+#~ msgid ""
+#~ "You have been connecting and disconnecting too frequently.  Wait ten "
+#~ "minutes and try again.  If you continue to try, you will need to wait "
+#~ "even longer."
+#~ msgstr ""
+#~ "התחברת והתנתקת בתדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך "
+#~ "לנסות, תיאלץ להמתין אפילו יותר."
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "ארעה שגיאה לא ידועה בזמן ניסיון לפתיחת %s"
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "ארעה שגיאה לא מוכרת, %d, מידע: %s"
+#~ msgid "Invalid Groupname"
+#~ msgstr "שם הקבוצה שגוי"
+#~ msgid "Connection Closed"
+#~ msgstr "החיבור נסגר."
+#~ msgid "Waiting for reply..."
+#~ msgstr "ממתין לתשובה..."
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC חזר מן ה-pause שלו. ניתן לשלוח הודעות שוב."
+#~ msgid "Password Change Successful"
+#~ msgstr "הסיסמה שלך שונתה בהצלחה."
+#~ msgid "Get Dir Info"
+#~ msgstr "השג מידע על המשתמש"
+#~ msgid "Set Dir Info"
+#~ msgstr "קבע מידע על המשתמש"
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "לא ניתן לפתוח %s לכתיבה"
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "כשל בהעברת הקובץ, כנראה צד שני ביטל"
+#~ msgid "Could not connect for transfer."
+#~ msgstr "לא ניתן לחבר את ההעברה."
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "לא ניתן לכתוב את רישת הקובץ. הקובץ לא יועבר."
+#~ msgid "Save As..."
+#~ msgstr "שמור בשם..."
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s מבקש מ-%s לקבל %d קובץ: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s מבקש מ-%s לקבל %d קבצים: %s (%.2f %s)%s%s"
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s מבקש/ת ממך לשלוח לו/לה קובץ"
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "תוסף פרוטוקול TOC"
+#~ msgid "User information for %s unavailable"
+#~ msgstr "פרטי המשתמש %s אינם זמינים"
+#~ msgid "%s Options"
+#~ msgstr "%s אפשרויות"
+#~ msgid "Proxy Options"
+#~ msgstr "אפשרויות פרוקסי"
+#~ msgid "By log size"
+#~ msgstr "לפי גודל יומן השיחות"
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_פתח את הקישור בדפדפן"
+#~ msgid "ST_UN server:"
+#~ msgstr "שרת STUN:"
+#~ msgid "Smiley _Image"
+#~ msgstr "_תמונת חייכן"
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "קיצורים ל_חייכנים"
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_הבהב את חלון השיחה בעת קבלת הודעות צ'אט"
 #~ msgid "A group with the name already exists."
 #~ msgstr "קבוצה בשם זה כבר קיימת."
-
 #~ msgid "Primary Information"
 #~ msgstr "מידע ראשי"
-
 #~ msgid "Blood Type"
 #~ msgstr "סוג דם"
 
@@ -13753,21 +13625,16 @@ msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקו
 #, fuzzy
 #~ msgid "Successed:"
 #~ msgstr "מהירות:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
 #~ msgstr "אין כרגע תמיכה בהתאמה אישית של פרצופים. יש לבחור בתמונה מתוך %s."
-
 #~ msgid "Invalid QQ Face"
 #~ msgstr "פרצוף QQ לא תקף"
-
 #~ msgid "You rejected %d's request"
 #~ msgstr "דחית את בקשת %d"
-
 #~ msgid "Reject request"
 #~ msgstr "דחה בקשה"
-
 #~ msgid "Add buddy with auth request failed"
 #~ msgstr "כישלון בהוספת איש-קשר עם בקשת אימות"
 
@@ -13778,13 +13645,10 @@ msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקו
 #, fuzzy
 #~ msgid "QQ Number Error"
 #~ msgstr "מספר QQ"
-
 #~ msgid "Group Description"
 #~ msgstr "תיאור הקבוצה"
-
 #~ msgid "Auth"
 #~ msgstr "אימות"
-
 #~ msgid "Approve"
 #~ msgstr "אשר"
 
@@ -13799,30 +13663,24 @@ msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקו
 #, fuzzy
 #~ msgid "[%d] added to Qun \"%d\""
 #~ msgstr "את/ה [%d] נוספת אל הקבוצה \"%d\""
-
 #~ msgid "I am a member"
 #~ msgstr "אני הנני חבר/ה"
 
 #, fuzzy
 #~ msgid "I am requesting"
 #~ msgstr "בקשה שגויה"
-
 #~ msgid "I am the admin"
 #~ msgstr "אני המנהל/ת"
-
 #~ msgid "Unknown status"
 #~ msgstr "מצב לא ידוע"
 
 #, fuzzy
 #~ msgid "Remove from Qun"
 #~ msgstr "הסר קבוצה"
-
 #~ msgid "You entered a group ID outside the acceptable range"
 #~ msgstr "הזנת מזהה-קבוצה מחוץ לטווח התקף"
-
 #~ msgid "Are you sure you want to leave this Qun?"
 #~ msgstr "האם ברצונך לעזוב את Qun זה?"
-
 #~ msgid "Do you want to approve the request?"
 #~ msgstr "האם ברצונך לאשר את הבקשה?"
 
@@ -13833,33 +13691,20 @@ msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקו
 #, fuzzy
 #~ msgid "Change Qun information"
 #~ msgstr "מידע על הערוץ"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "הודעת מערכת"
-
 #~ msgid "<b>Last Login IP</b>: %s<br>\n"
 #~ msgstr "<b>כתובת חיבור אחרונה</b>: %s<br>\n"
-
 #~ msgid "<b>Last Login Time</b>: %s\n"
 #~ msgstr "<b>זמן חיבור אחרון</b>: %s\n"
-
 #~ msgid "Set My Information"
 #~ msgstr "קבע את המידע שלי"
 
 #, fuzzy
 #~ msgid "Leave the QQ Qun"
 #~ msgstr "עזוב QQ Qun זה"
-
 #~ msgid "Block this buddy"
 #~ msgstr "חסום משתמש זה"
-
 #~ msgid "Invalid token reply code, 0x%02X"
 #~ msgstr "קוד-תגובה שגוי, 0x%02X"
 
@@ -13870,7 +13715,6 @@ msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקו
 #, fuzzy
 #~ msgid "Failed to connect all servers"
 #~ msgstr "כישלון בהתחברות לשרת"
-
 #~ msgid "Connecting server %s, retries %d"
 #~ msgstr "מתחבר עם שרת %s, ניסיונות %d"
 
@@ -13889,7 +13733,6 @@ msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקו
 #, fuzzy
 #~ msgid "QQ Budy"
 #~ msgstr "איש הקשר"
-
 #~ msgid "%s wants to add you [%s] as a friend"
 #~ msgstr "%s רוצה להוסיף אותך [%s] כחבר"
 
@@ -13900,7 +13743,6 @@ msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקו
 #, fuzzy
 #~ msgid "Would you add?"
 #~ msgstr "האם ברצונך להוסיף אותו?"
-
 #~ msgid "%s"
 #~ msgstr "%s"
 
@@ -13911,175 +13753,116 @@ msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקו
 #, fuzzy
 #~ msgid "Network disconnected"
 #~ msgstr "הצד המרוחק מנותק"
-
 #~ msgid "developer"
 #~ msgstr "מפתח"
-
 #~ msgid "XMPP developer"
 #~ msgstr "מפתח XMPP"
-
 #~ msgid "Artists"
 #~ msgstr "אמנים"
-
 #~ msgid ""
 #~ "You are using %s version %s.  The current version is %s.  You can get it "
 #~ "from <a href=\"%s\">%s</a><hr>"
 #~ msgstr ""
 #~ "%s שבשימוש הוא גירסא %s. הגירסא הנוכחית היא %s.  ניתן להשיג אותה מ-<a "
 #~ "href=\"%s\">%s</a><hr>"
-
 #~ msgid "<b>ChangeLog:</b><br>%s"
 #~ msgstr "<b>רשימת שינויים:</b><br>%s"
-
 #~ msgid "EOF while reading from resolver process"
 #~ msgstr "קבלת סיום-קובץ בעת קריאה מתהליך ה-resolver"
-
 #~ msgid "Your information has been updated"
 #~ msgstr "המידע שלך עודכן"
-
 #~ msgid "Input your reason:"
 #~ msgstr "הזנ/י את סיבתך:"
-
 #~ msgid "You have successfully removed a buddy"
 #~ msgstr "הסרת איש-קשר בהצלחה"
-
 #~ msgid "You have successfully removed yourself from your friend's buddy list"
 #~ msgstr "הסרת את עצמך בהצלחה מרשימת אנשי הקשר של חברך"
-
 #~ msgid "You have added %d to buddy list"
 #~ msgstr "הוספת את %d לרשימת אנשי-קשר"
-
 #~ msgid "Invalid QQid"
 #~ msgstr "QQid לא תקף"
-
 #~ msgid "Please enter external group ID"
 #~ msgstr "יש להזין ID של הקבוצה החיצונית"
-
 #~ msgid "Reason: %s"
 #~ msgstr "סיבה: %s"
-
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "בקשתך להצטרף לקבוצה %d אושרה על ידי המנהל %d"
-
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "קבוצה זו נוספה לרשימת אנשי הקשר שלך"
-
 #~ msgid "I am applying to join"
 #~ msgstr "אני מבקש/ת להצטרף"
-
 #~ msgid "You have successfully left the group"
 #~ msgstr "עבת את הקבוצה בהצלחה "
-
 #~ msgid "QQ Group Auth"
 #~ msgstr "אימות לקבוצת QQ"
-
 #~ msgid "Your authorization request has been accepted by the QQ server"
 #~ msgstr "בקשת האימות שלך התקבלה בחיוב על ידי שרת ה-QQ"
-
 #~ msgid "Enter your reason:"
 #~ msgstr "הזנ/י את סיבתך:"
-
 #~ msgid " Space"
 #~ msgstr " ספייס"
-
 #~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
 #~ msgstr "<b>שם מחשב אמיתי</b>: %s: %d<br>\n"
-
 #~ msgid "Show Login Information"
 #~ msgstr "הצג מידע על החיבור"
-
 #~ msgid "resend interval(s)"
 #~ msgstr "פרק זמן בין שליחות חוזרות"
-
 #~ msgid "hostname is NULL or port is 0"
 #~ msgstr "שם המחשב ריק, או מספר השקע 0"
-
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "לא ניתן להיכנס. יש לבדוק ביומן רישום הבאגים"
-
-#~ msgid "Unable to login"
-#~ msgstr "לא ניתן להתחבר"
-
 #~ msgid "Failed room reply"
 #~ msgstr "כשל במשוב מהחדר"
-
 #~ msgid "User %s rejected your request"
 #~ msgstr "המשתמש %s סרב לבקשתך"
-
 #~ msgid "User %s approved your request"
 #~ msgstr "המשתמש %s אישר את בקשתך"
-
 #~ msgid "Notice from: %s"
 #~ msgstr "הודעה מאת: %s"
-
 #~ msgid "Code [0x%02X]: %s"
 #~ msgstr "קוד [0x%02X]: %s"
-
 #~ msgid "Group Operation Error"
 #~ msgstr "שגיאה בפעולת-קבוצה"
-
 #~ msgid "Error setting socket options"
 #~ msgstr "שגיאה בקביעת הגדרות השקע"
-
 #~ msgid ""
 #~ "Windows Live ID authentication: cannot find authenticate token in server "
 #~ "response"
 #~ msgstr "אימות מזהה Windows Live: לא ניתן למצוא סמל אימות בתגובת השרת"
-
 #~ msgid "Windows Live ID authentication Failed"
 #~ msgstr "אימות מזהה Windows Live נכשלה"
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "השולח מרושע מדי"
-
 #~ msgid "Too evil (receiver)"
 #~ msgstr "המקבל מרושע מדי"
-
 #~ msgid "Available Message"
 #~ msgstr "הודעת זמינות"
-
 #~ msgid "Away Message"
 #~ msgstr "הודעת ריחוק מהמחשב"
-
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(שולף)</i>"
-
-#~ msgid "Error requesting login token"
-#~ msgstr "שגיאה בבקשת אסימון כניסה"
-
 #~ msgid "TCP Address"
 #~ msgstr "כתובת TCP"
-
 #~ msgid "UDP Address"
 #~ msgstr "כתובת UDP"
 
 #, fuzzy
 #~ msgid "Display Statistics"
 #~ msgstr "סטטיסטיקות של השרת"
-
 #~ msgid "Screen name:"
 #~ msgstr "שם לתצוגה:"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "מישהו מזכיר את שמך בצ'אט"
-
 #~ msgid ""
 #~ "This server requires plaintext authentication over an unencrypted "
 #~ "connection.  Allow this and continue authentication?"
 #~ msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת.להמשיך בכל זאת?"
-
 #~ msgid "Use GSSAPI (Kerberos v5) for authentication"
 #~ msgstr "השתמש בGSSAPI (קרברוס גירסה 5) לצורך אימות"
-
 #~ msgid "Invalid screen name"
 #~ msgstr "שם לתצוגה לא תקין"
-
 #~ msgid "Invalid screen name."
 #~ msgstr "שם-תצוגה לא תקין."
-
 #~ msgid "Screen _name:"
 #~ msgstr "שם לתצוגה:"
-
 #~ msgid ""
 #~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
 #~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
@@ -14088,10 +13871,10 @@ msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקו
 #~ "%s%s<span weight=\"bold\">נכתב ע\"י:</span>\t%s\n"
 #~ "<span weight=\"bold\">אתר:</span>\t\t%s\n"
 #~ "<span weight=\"bold\">שם קובץ:</span>\t\t%s"
-
 #~ msgid ""
 #~ "The contact availability plugin (cap) is used to display statistical "
 #~ "information about buddies in a users contact list."
 #~ msgstr ""
 #~ "התוסף לניבוי זמינות אנשי-קשר מציג מידע סטטיסטי על החברים ברשימת אנשי הקשר "
 #~ "של המשתמש."
+
diff --git a/po/hi.po b/po/hi.po
index 028a883b78..1f6f3d0141 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-05-29 20:43+0530\n"
 "Last-Translator: Akash <akash@ncb.ernet.in>\n"
 "Language-Team: Akash <matrubhasha@ncb.ernet.in>\n"
@@ -30,7 +30,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -649,21 +649,6 @@ msgstr ""
 msgid "Send To"
 msgstr "ऐसे भेजें(_S)"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "(1 सन्देश)"
-
-msgid "Invite"
-msgstr "आमंत्रण दें"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"कृपया उपयोगकर्ता का नाम डालिए जिन्हे आप आमंत्रित करना चाहते हैं। अगर आप चाहे तो आमंत्रण "
-"संदेश भी भेज सकते हैं।"
-
 #  Conversations
 #, fuzzy
 msgid "Conversation"
@@ -943,6 +928,42 @@ msgid "System Log"
 msgstr "तंत्र लौग"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "गणना जारी..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "स्वीकारें"
+
+#, fuzzy
+msgid "Reject"
+msgstr "पुनः स्थापित करो"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "आप चैनल छोड़ चुके हैं%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "इमेल"
 
@@ -980,6 +1001,9 @@ msgstr "कनेक्ट कर रहा है"
 msgid "IM"
 msgstr "आईएम(IM)"
 
+msgid "Invite"
+msgstr "आमंत्रण दें"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(कोई नाम नहीं)"
@@ -1207,7 +1231,6 @@ msgstr "%s अनुपस्थित है। (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s आपको भेजना चाहता है %s (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "अज्ञात झपटा घटना। कृप्या इसकी रपट करें!"
 
@@ -1264,7 +1287,6 @@ msgid "Change status to"
 msgstr "पता बदलें:"
 
 #  Conversations
-#. Conversations
 msgid "Conversations"
 msgstr "वार्तालाप"
 
@@ -1625,7 +1647,6 @@ msgstr ""
 "जब नया वार्तालाप खोला जाता है तो यह प्लगइन पिछले वार्तालाप को वर्तमान वार्तालाप में "
 "जोड़ देता है."
 
-#, c-format
 msgid "Online"
 msgstr "ऑनलाइन"
 
@@ -1674,6 +1695,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "यू आर एल"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 #  And now for the buttons
 #, fuzzy
 msgid "accounts"
@@ -1783,14 +1826,6 @@ msgstr "चैट आमंत्रण स्वीकारें?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "स्वीकारें"
-
-#, fuzzy
-msgid "Reject"
-msgstr "पुनः स्थापित करो"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1884,6 +1919,8 @@ msgstr "%s साइन्ड ऑफ कर चुका है"
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "अज्ञात त्रुटि"
 
@@ -1931,6 +1968,18 @@ msgstr "%s ने कक्ष से प्रस्थान किया ।"
 msgid "%s left the room (%s)."
 msgstr "%s ने कक्ष से प्रस्थान किया (%s)।"
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "सम्मेलन आरम्भ करें"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"कृपया उपयोगकर्ता का नाम डालिए जिन्हे आप आमंत्रित करना चाहते हैं। अगर आप चाहे तो आमंत्रण "
+"संदेश भी भेज सकते हैं।"
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "%s के लिए सीमोड तय करने में असफल"
@@ -2073,7 +2122,6 @@ msgstr "%s से फाइल स्थानांतर प्रार्थ
 msgid "Transfer of file %s complete"
 msgstr "%s का हस्तांतरण पूरा हुआ"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "फ़ाइल हस्तांतरण पूरा हुआ"
 
@@ -2081,7 +2129,6 @@ msgstr "फ़ाइल हस्तांतरण पूरा हुआ"
 msgid "You canceled the transfer of %s"
 msgstr "आपने %s के स्थानांतर को रद्द किया"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "फ़ाइल हस्तांतरण रद्द"
 
@@ -2266,11 +2313,14 @@ msgstr "<font color=\"red\"><b>फा़इल पढ़ नहीं पाय�
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <स्वतः जवाब दें>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "कनेक्शन बनाने में त्रुटि"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2734,7 +2784,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2786,7 +2836,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2815,6 +2865,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "पासवर्ड बदलें"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3037,19 +3113,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "नया कनेक्शन बनाने में असमर्थ।"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 #, fuzzy
 msgid "First name"
 msgstr "पहिला नाम"
@@ -3089,6 +3164,11 @@ msgstr "याहू प्रोटोकाल प्लगइन"
 msgid "Purple Person"
 msgstr "नया व्यक्ति"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "नगर"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -3101,17 +3181,17 @@ msgstr "%s इस वार्तालाप के लिए आमंत्�
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "संदेश भेजने में असफल: संदेश बहुत बढ़ा है।"
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "सोकेट खोलने में असमर्थ"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "सोकेट बनाने में असमर्थ"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "सॉकट नहीं बना सका"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "सॉकट नहीं बना सका"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "सोकेट बनाने में असमर्थ"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3174,15 +3254,15 @@ msgstr "बड्डी सूची भेजें"
 msgid "Load buddylist from file..."
 msgstr "सर्वर से बड्डी सूची का आयात करें"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "नया पासवर्ड मेल नहीं खाता."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "नया कनेक्शन बनाने में असमर्थ।"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3195,17 +3275,15 @@ msgstr "रजिस्ट्रेशन सफल रहा"
 msgid "Password"
 msgstr "पासवर्ड "
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "पासवर्ड भेजा दिया"
+msgid "Password (again)"
+msgstr "पासवर्ड (फिर से)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s ने अभी लॉग-इन किया है"
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "अभी है"
+msgid "Captcha"
+msgstr "चित्र संचित करें"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3267,6 +3345,18 @@ msgid "Current password"
 msgstr "गलत पासवर्ड "
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "पासवर्ड भेजा दिया"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s ने अभी लॉग-इन किया है"
+
+#, fuzzy
+msgid "Current token"
+msgstr "अभी है"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "कृपया अपना वर्तमान पासवर्ड भरें तथा आपका नया  पासवर्ड भरें."
 
@@ -3282,13 +3372,13 @@ msgstr "चैट को अपनी बड्डी सूची में स
 msgid "Add to chat..."
 msgstr "चैट जोड़ें(_h)"
 
+#. Global
 msgid "Available"
 msgstr "उपलब्ध"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "दूर"
 
@@ -3320,7 +3410,8 @@ msgstr "कोइ मिलता हुआ होस्ट नहीं"
 msgid "There are no users matching your search criteria."
 msgstr "कृपया आपका नया पासवर्ड डालें।"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "सोकेट पढ़ने में असमर्थ"
 
 #, fuzzy
@@ -3339,8 +3430,14 @@ msgstr "बड्डी द्रश्य"
 msgid "Your buddy list was stored on the server."
 msgstr "गाडू-गाडू सवर्र पर कोइ भी बड्डी सूची नहीं है।"
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "कनेक्ट"
+
+msgid "Connection failed"
 msgstr "कनेक्शन असफल हुआ"
 
 #, fuzzy
@@ -3351,6 +3448,15 @@ msgstr "चैट जोड़ें"
 msgid "Chat _name:"
 msgstr "अंतिम नाम"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "सर्वर को पींग नहीं कर पाया"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "कनेक्ट कर रहा है"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "पढ़ने में त्रुटि"
@@ -3360,7 +3466,7 @@ msgid "This chat name is already in use"
 msgstr "फ़ाइल पहले से है"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
 
 #, fuzzy
@@ -3410,6 +3516,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "गाडू-गाडू खोज यन्त्र"
 
+#, fuzzy
+msgid "GG server"
+msgstr "उपयोगकर्ता की जानकारी दृढ़ करें..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "अज्ञात आदेश: %s"
@@ -3426,7 +3536,7 @@ msgid "File Transfer Failed"
 msgstr "फ़ाइल हस्तांतरण रद्द"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "गेम सुनने के लिए पोर्ट नहीं खोल सका।"
 
 msgid "Error displaying MOTD"
@@ -3442,8 +3552,16 @@ msgstr "इस कनेक्शन के साथ कोइ ऐम औ ट�
 msgid "MOTD for %s"
 msgstr "%s के लिए ऐम औ टी डी"
 
-msgid "Server has disconnected"
-msgstr "सर्वर ने कनेक्शन तोड़ा"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
 
 msgid "View MOTD"
 msgstr "ऐमऔटीडी(MOTD) देखें"
@@ -3458,25 +3576,24 @@ msgstr "चैनल(_C):"
 msgid "_Password:"
 msgstr "पासवर्ड:(_P)"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "आइ आर सी उपनामों में वाइटस्पेस नहीं हो सकती"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "कनेक्ट कर रहा है"
-
 msgid "SSL support unavailable"
 msgstr "एस एस एल समर्थन उपलब्ध नहीं है"
 
-msgid "Couldn't create socket"
-msgstr "सॉकट नहीं बना सका"
+msgid "Unable to connect"
+msgstr "कनेक्ट करने में असमर्थ"
 
-msgid "Couldn't connect to host"
-msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
 
-msgid "Read error"
-msgstr "पढ़ने में त्रुटि"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "कनेक्शन बनाने में त्रुटि"
 
 msgid "Users"
 msgstr "उपयोगकर्ता"
@@ -3663,6 +3780,17 @@ msgid ""
 "invalid characters."
 msgstr "आपका चुना खाता नाम सवर्र द्वारा अस्वीकार हो गया। शायद उसमें अवैध अश्रर मोजूद हैं।"
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "फ़ाइल पहले से है"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "उपनाम"
+
 msgid "Cannot change nick"
 msgstr "उपनाम नहीं बदल सकता"
 
@@ -3908,13 +4036,14 @@ msgstr "कमांड असमर्थ"
 msgid "execute"
 msgstr "अपेक्षित नहीं"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "सवर्र पर लॉग इन करने के लिए टी एल एस / एस एस एल चाहिए. टी एल एस / एस एस एल "
 "समर्थन नहीं मिला।"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "सवर्र पर लॉग इन करने के लिए टी एल एस / एस एस एल चाहिए. टी एल एस / एस एस एल "
 "समर्थन नहीं मिला।"
@@ -3933,19 +4062,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "साधारण टेक्सट प्रमाणीकरण"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "प्रमाणीकरण असफल"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "सवर्र ने अवैध उत्तर दिया।"
 
 msgid "Server does not use any supported authentication method"
 msgstr "सवर्र कोइ भी समर्थित प्रमाणिकरण विधी का प्रयोग नहीं करता"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "सवर्र द्वारा अवैध चुनौती"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "पढ़ने में त्रुटि"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "कोई कारण नहीं दिया"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "असमर्थित आवर्तन"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "नया कनेक्शन बनाने में असमर्थ।"
+
 msgid "Full Name"
 msgstr "पूरा नाम"
 
@@ -4013,187 +4173,9 @@ msgstr "नगर"
 msgid "Operating System"
 msgstr "ऑपरेटिंग सिस्टम छिपायें"
 
-msgid "Last Activity"
-msgstr ""
-
 #, fuzzy
-msgid "Service Discovery Info"
-msgstr "डिर जानकारी दृढ़ करें..."
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "विस्तृत पता"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "चैट का उपनाम"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "उपयोगकर्ता के पास कोइ डायरक्ट्री की जानकारी नहीं है।"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "कमांड"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "ऐचटीऐमऐल(HTML)"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "रजिस्ट्रेशन त्रुटि"
-
-#, fuzzy
-msgid "User Location"
-msgstr "स्थान निरूप"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "बड्डी स्थिति सूचना"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "असमर्थित आवर्तन"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "दिशा"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "फ़ाइल हस्तांतरण"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "उपयोगकर्ता ढंग"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "उपयोगकर्ता सीमा"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "योग्यताऐं"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "उपयोगकर्ता-नाम"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "आई एम कुंजी विनिमय"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "इमेल पता"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "प्रोफ़ाइल द्रद्द करें"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "पिंग"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "उपनाम"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "प्रत्यक्ष विडीयो"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "प्राप्त सन्देश"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "सार्वजनिक कुंजी बैबलप्रिंट"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "उपयोगकर्ता विकल्प"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "उपयोगकर्ता ढंग"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "उपयोगकर्ता सीमा"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "उपयोगकर्ता सीमा"
-
-msgid "Ping"
-msgstr "पिंग"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ट्रिलियन एनक्रिपशन"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "योग्यताऐं"
+msgid "Local Time"
+msgstr "स्थानिय फा़इल"
 
 #, fuzzy
 msgid "Priority"
@@ -4202,6 +4184,14 @@ msgstr "पोर्ट"
 msgid "Resource"
 msgstr "सहारा"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "लौग आउट हो चुका है"
+
 msgid "Middle Name"
 msgstr "मध्यस्थित नाम"
 
@@ -4250,7 +4240,6 @@ msgstr "चैटी"
 msgid "Extended Away"
 msgstr "बहुत देर के लिए अनुपस्थित"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "परेशान ना करें"
 
@@ -4384,28 +4373,27 @@ msgstr "सम्मेलन सवर्र को सवाल करने �
 msgid "Find Rooms"
 msgstr "कक्ष खोजें"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "उपनाम:"
 
-msgid "Write error"
-msgstr "लिखने में त्रुटी"
+#, fuzzy
+msgid "No users found"
+msgstr "कोइ मिलता हुआ होस्ट नहीं"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "सादा टेक्स्ट्"
+msgid "Roles:"
+msgstr "कार्य भाग"
 
-msgid "Read Error"
-msgstr "पढ़ने में त्रुटि"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "सादा टेक्स्ट्"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "सोकेट बनाने में असमर्थ"
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "अमान्य आई डी"
@@ -4413,6 +4401,10 @@ msgstr "अमान्य आई डी"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "सर्वर से कनेक्ट करने में असफल।"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s का रेजिस्ट्रेशन सफल"
@@ -4439,9 +4431,6 @@ msgstr "रजिस्ट्रेशन सफल रहा"
 msgid "Unregistration Failed"
 msgstr "रजिस्ट्रेशन असफल रहा"
 
-msgid "Already Registered"
-msgstr "पहले से रेजिस्टर्ड है"
-
 msgid "State"
 msgstr "स्थिति"
 
@@ -4455,6 +4444,9 @@ msgstr "फोन"
 msgid "Date"
 msgstr "दिनांक"
 
+msgid "Already Registered"
+msgstr "पहले से रेजिस्टर्ड है"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "रिजिस्टर"
@@ -4487,6 +4479,10 @@ msgid "Change Registration"
 msgstr "रजिस्ट्रेशन त्रुटि"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "सर्वर से कनेक्ट करने में असफल।"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "खाता जानकारी बदलनें में त्रुटी"
 
@@ -4506,9 +4502,18 @@ msgstr "प्रमाणित कर रहा है"
 msgid "Re-initializing Stream"
 msgstr "धारा की पुनः शुरुआत"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "अप्रमाणित"
 
+msgid "Mood"
+msgstr "स्वभाव"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "दोनो"
 
@@ -4530,12 +4535,6 @@ msgstr "कोई नहीं"
 msgid "Subscription"
 msgstr "सबस्क्रिप्शन"
 
-msgid "Mood"
-msgstr "स्वभाव"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "स्वभाव"
@@ -4583,9 +4582,6 @@ msgstr "आपका पासवर्ड बदल दिया गया ह�
 msgid "Error changing password"
 msgstr "पासवर्ड बदलते समय त्रुटि"
 
-msgid "Password (again)"
-msgstr "पासवर्ड (फिर से)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "पासवर्ड बदलें"
@@ -4799,18 +4795,24 @@ msgstr "%s उपयोगकर्ता को लात मारने म�
 msgid "Unable to ping user %s"
 msgstr "%s उपयोगकर्ता को निषेध करने में असमर्थ"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "ध्वनी चलाने में असर्मथ क्योंकि चुनी हुइ फा़इल (%s) नहीं है।"
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "ध्वनी चलाने में असर्मथ क्योंकि चुनी हुइ फा़इल (%s) नहीं है।"
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "ध्वनी चलाने में असर्मथ क्योंकि चुनी हुइ फा़इल (%s) नहीं है।"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4821,9 +4823,37 @@ msgstr "बज़्ज़!!"
 msgid "%s has buzzed you!"
 msgstr "उपयोगकर्ता ने आपको अवरोधित किया है"
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "%s को संदेश भेजने में असमर्थ"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+"%s को फा़इल हसतांत्रण में असर्मथ क्योंकि उपयोगकर्ता फा़इल हसतांत्रण समर्थन नहीं है करता।"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
+"%s को फा़इल हसतांत्रण में असर्मथ क्योंकि उपयोगकर्ता फा़इल हसतांत्रण समर्थन नहीं है करता।"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "रजिस्ट्रेशन असफल रहा"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "कृप्या उस व्यक्ति का स्क्रीन नाम भरें जिसके बारे में आप जानकारी देखना चाहतें हैं।"
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "फाइल को चुनो"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "चैट शुरू करें(_C)"
 
 msgid "config:  Configure a chat room."
 msgstr "कंफिग: चैट कमरे की संरचना करें।"
@@ -4845,13 +4875,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;उपयोगकर्ता&gt; [कक्ष]:  किसी उपयोगकर्ता को कक्ष से निषिध करें।"
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4920,6 +4950,9 @@ msgstr "सर्वर कनेक्ट करें"
 msgid "File transfer proxies"
 msgstr "फ़ाइल हस्तांतरण पोर्ट"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4960,6 +4993,14 @@ msgstr "एक्सएमएल पदभंजन त्रुटी"
 msgid "Unknown Error in presence"
 msgstr "उपस्थिति में अज्ञात त्रुटी"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "चैट में शामिल होने में त्रुटि %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "चैट में त्रुटि %s"
+
 msgid "Create New Room"
 msgstr "नया कक्ष बनायें"
 
@@ -4977,13 +5018,32 @@ msgstr "कमरे की संरचना"
 msgid "_Accept Defaults"
 msgstr "डिफाल्ट स्वीकारें"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "चैट में शामिल होने में त्रुटि %s"
+#, fuzzy
+msgid "No reason"
+msgstr "कोई कारण नहीं दिया"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "चैट में त्रुटि %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "आपको %s: (%s) ने लात मारी"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s) से लात पड़ी"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "फ़ाइल को खोलने में त्रुटि '"
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "फ़ाइल हस्तांतरण रद्द"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "चित्र संचय करने में असफल: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -5012,10 +5072,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "कृप्या उस व्यक्ति का स्क्रीन नाम भरें जिसके बारे में आप जानकारी देखना चाहतें हैं।"
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "फाइल को चुनो"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "उपयोगकर्ता ढंग"
 
@@ -5056,9 +5112,20 @@ msgstr "खाता"
 msgid "Select an action"
 msgstr "फाइल को चुनो"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
+msgstr "%s फा़इल पढ़ने में असमर्थ।"
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "बड्डी सूची नहीं ला पाया"
+msgid "Buddy Add error"
+msgstr "बड्डी सूची त्रुटि"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "डाली गयी सेक्योर आई डी कुंजी अवैध है।"
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5288,7 +5355,7 @@ msgstr "बच्चों का पासपोर्ट माता-पि�
 msgid "Passport account not yet verified"
 msgstr "पासपोर्ट खाता अभी तक सिद्ध नहीं"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "पासपोर्ट खाता अभी तक सिद्ध नहीं"
 
@@ -5326,6 +5393,10 @@ msgstr "पसन्दीदा संपर्क"
 msgid "Non-IM Contacts"
 msgstr "संपर्क निकालें"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5396,6 +5467,13 @@ msgstr "मोबाइल संदेश भेजें।"
 msgid "Page"
 msgstr "पन्ना"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "चेतावनी दें"
+
 msgid "Has you"
 msgstr "के पास आप हैं"
 
@@ -5439,6 +5517,14 @@ msgid "Album"
 msgstr ""
 
 #, fuzzy
+msgid "Game Title"
+msgstr "शीर्षक"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "शीर्षक"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "सरल नाम दृढ़ करें"
 
@@ -5481,9 +5567,6 @@ msgstr ""
 "वाचनालय की स्थापना करें। अधिक जानकारी के लिए पर http://Pidgin.sf.net/faq-ssl.php "
 "जाएँ।"
 
-msgid "Failed to connect to server."
-msgstr "सर्वर से कनेक्ट करने में असफल।"
-
 msgid "Error retrieving profile"
 msgstr "प्रोफ़ाइल लाने में त्रुटी"
 
@@ -5663,8 +5746,9 @@ msgstr ""
 "गेम उपयोगकर्ता कि प्रोफा़ल में कोइ जानकारी खोज नहीं सका। शायद इस नाम का उपयोगकर्ता "
 "नहीं है।"
 
-msgid "Profile URL"
-msgstr "प्रोफा़इल यू आर एल"
+#, fuzzy
+msgid "View web profile"
+msgstr "जब आप ऑफलाइन हैं तब आज्ञा नहीं"
 
 #. *< type
 #. *< ui_requirement
@@ -5708,21 +5792,6 @@ msgstr "समान्य प्रमाणीकरण नाकाम"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "समान्य प्रमाणीकरण नाकाम"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s वैध समूह नाम नहीं है"
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-msgid "Unknown error."
-msgstr "अज्ञात त्रुटि।"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s पे %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s आपको भेजना चाहता है"
@@ -5731,52 +5800,29 @@ msgstr "%s आपको भेजना चाहता है"
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "अज्ञात त्रुटि"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "%s उपयोगकर्ता को निषेध करने में असमर्थ"
 
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "अज्ञात त्रुटि"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s उपयोगकर्ता को जोड़ने में असमर्थ (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s उपयोगकर्ता को निषिध करने में असमर्थ (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s उपयोगकर्ता को स्वीकृत करने में असमर्थ (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s को जोड़ नही पाया क्योंकि बड्डी सूची भर चुकी है।"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s एक वैध पासपोर्ट खाता नहीं है।"
-
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "यह सेवा अस्थाई तोर से उपलब्ध नहीं है।"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "संदेश भेजा नहीं जा सका क्योंकि उपयोगकर्ता ऑफ-लाइन है"
 
-msgid "Unable to rename group"
-msgstr "समूह का नाम बदलने में असमर्थ"
-
-msgid "Unable to delete group"
-msgstr "समूह को हटाने में असमर्थ"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5812,9 +5858,6 @@ msgstr "संदेश भेजा नहीं जा सका क्यो�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "संदेश भेजा नहीं जा सका क्योंकि अज्ञात त्रुटी हुई"
 
-msgid "Unable to connect"
-msgstr "कनेक्ट करने में असमर्थ"
-
 msgid "Writing error"
 msgstr "लिखने में त्रुटी"
 
@@ -5833,20 +5876,24 @@ msgstr ""
 "%s सवर्र से कनेक्शन त्रुटी (%s):\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "हमारे प्रोटॅकॉल का इस सवर्र में समर्थन नहीं है।"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "ऐच टी टी पी पढ़ने में त्रुटी"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "आपने किसी दूसरी जगह से साइन-इन किया है।"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "एम एस एन सवर्र अस्थाई रुप से उपलब्ध नहीं है। कृपया कुछ देर प्रतीक्षा कर फिर प्रयास करें।"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "एम एस एन के सवर्र कुछ देर के लिए बंद हो रहे हैं।"
 
 #, c-format
@@ -5877,6 +5924,14 @@ msgstr "कुकी भेज रहा है"
 msgid "Retrieving buddy list"
 msgstr "बड्डी सूची ला रहा है"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "कमप्युटर से अनुपस्थिति"
 
@@ -5914,14 +5969,6 @@ msgstr "संदेश भेजा नहीं जा सका क्यो�
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "संदेश भेजा नहीं जा सका क्योंकि अज्ञात त्रुटी हुई"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "उपयोगकर्ता %s को %s अपनी बड्डी सूची में जोड़ना चाहतें हैं।"
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "उपयोगकर्ता %s को %s अपनी बड्डी सूची में जोड़ना चाहतें हैं।"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "पता  पुस्तक में जोङे "
@@ -5930,13 +5977,6 @@ msgstr "पता  पुस्तक में जोङे "
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "क्या आप इस बड्डी को बड्डी सूची मे डालना चाहतें हैं?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, fuzzy, c-format
-msgid "Unable to add \"%s\"."
-msgstr "%s फा़इल पढ़ने में असमर्थ।"
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "डाली गयी सेक्योर आई डी कुंजी अवैध है।"
@@ -5944,6 +5984,9 @@ msgstr "डाली गयी सेक्योर आई डी कुंज�
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "प्रोफा़इल यू आर एल"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5958,18 +6001,68 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "ऐ आई एम/आई सी क्यू प्रोटॅकोल प्लगइन"
 
-msgid "Missing Cipher"
-msgstr ""
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s वैध समूह नाम नहीं है"
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+msgid "Unknown error."
+msgstr "अज्ञात त्रुटि।"
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s पे %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s उपयोगकर्ता को जोड़ने में असमर्थ (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s उपयोगकर्ता को निषिध करने में असमर्थ (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s उपयोगकर्ता को स्वीकृत करने में असमर्थ (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s को जोड़ नही पाया क्योंकि बड्डी सूची भर चुकी है।"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s एक वैध पासपोर्ट खाता नहीं है।"
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "यह सेवा अस्थाई तोर से उपलब्ध नहीं है।"
+
+msgid "Unable to rename group"
+msgstr "समूह का नाम बदलने में असमर्थ"
+
+msgid "Unable to delete group"
+msgstr "समूह को हटाने में असमर्थ"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "उपयोगकर्ता %s को %s अपनी बड्डी सूची में जोड़ना चाहतें हैं।"
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "उपयोगकर्ता %s को %s अपनी बड्डी सूची में जोड़ना चाहतें हैं।"
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "उपभोक्ता कक्ष"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "डैटा को पढ़ रहा है"
 
@@ -5981,13 +6074,23 @@ msgstr "सवर्र द्वारा अवैध चुनौती"
 msgid "Logging in"
 msgstr "लोग कर रहा है"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "कोई स्क्रीन-नाम नहीं दिया है."
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "नया अनुपस्थिति संदेश"
@@ -6008,21 +6111,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "कोई स्क्रीन-नाम नहीं दिया है."
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "आईएम विंडोस (_I)"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connected"
-msgstr "कनेक्ट"
+msgid "Add contacts from server"
+msgstr "सवर्र ने अवैध उत्तर दिया।"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -6030,16 +6134,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "अवैध उपनाम या पासवर्ड"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "कनेक्शन को निर्णायक कर रहा है"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "बड्डी के साथ चैट में जुड़ने में असफल"
 
@@ -6051,14 +6162,6 @@ msgstr "सर्वर से बड्डी सूची का आयात
 msgid "persist command failed"
 msgstr "स्विच्बोर्ड विफल"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "उपभोक्ता कक्ष"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "बड्डी के साथ चैट में जुड़ने में असफल"
@@ -6070,39 +6173,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "स्विच्बोर्ड विफल"
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "कनेक्शन को निर्णायक कर रहा है"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "कतार पूरी"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "संदेश पदभंजन में असमर्थ"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "आईएम विंडोस (_I)"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "सवर्र ने अवैध उत्तर दिया।"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -6150,9 +6230,6 @@ msgstr "बड़ा फॉन्ट आकार"
 msgid "User"
 msgstr "उपयोगकर्ता"
 
-msgid "Profile"
-msgstr "प्रोफ़ाइल"
-
 #, fuzzy
 msgid "Headline"
 msgstr "मना करें"
@@ -6169,15 +6246,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "वार्तालाप बंद करें"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "कोई स्क्रीन-नाम नहीं दिया है."
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -6190,6 +6262,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "इस थीम के पास कोइ स्माइली उपलब्ध नहीं है।"
@@ -6198,6 +6273,14 @@ msgstr "इस थीम के पास कोइ स्माइली उप
 msgid "Please try another username:"
 msgstr "कृपया चुने हुए समूह के लिए नया नाम भरें।"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "कोई स्क्रीन-नाम नहीं दिया है."
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6395,10 +6478,6 @@ msgid "Master archive is misconfigured"
 msgstr "प्रमुख ग्रन्थरक्षा ग्रह कि संरचना खोटी है"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "अवैध उपनाम या पासवर्ड"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "जिस उपयोगकर्ता का नाम आपने डाला है उसका होस्ट पहचान नहीं पाया"
 
@@ -6443,9 +6522,9 @@ msgstr "उपयोगकर्ता या तो औफ-लाइन है
 msgid "Unknown error: 0x%X"
 msgstr "अज्ञात त्रुटि: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "लॉग-इन असफल (%s)। "
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s उपयोगकर्ता को निषेध करने में असमर्थ"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6545,9 +6624,6 @@ msgstr "ग्रुपवाइज़ सम्मेलन %d"
 msgid "Authenticating..."
 msgstr "प्रमाणित कर रहा है"
 
-msgid "Unable to connect to server."
-msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
-
 msgid "Waiting for response..."
 msgstr "उत्तर कि प्रतीक्षा कर रहें हैं"
 
@@ -6573,24 +6649,18 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "क्या आप संवाद में शामिल होना चाहेंगे?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "आपको लॉग-आउट कर दिया गया है क्योंकि आपने दूसरे कार्य स्थल से लॉग-इन किया।"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s अनुपस्थित लग रहा है और उसको आपका अभी भेजा गया संदेश नहीं मिला।"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "सवर्र से कनेक्ट करने में असमर्थ। कृपया सवर्र का पता डालें जिससे आप कनेक्ट करना चाहतें हैं।"
 
-msgid "Error. SSL support is not installed."
-msgstr "त्रुटी । एस एस एल समर्थन स्थापित नहीं है।"
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "यह सम्मेलन बंद कर दिया गया है। और संदेश नहीं भेजे जा सकते।"
 
@@ -6614,6 +6684,25 @@ msgid "Server port"
 msgstr "सवर्र पोर्ट"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "सवर्र ने अवैध उत्तर दिया।"
+
+#. username connecting too frequently
+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 ""
+"आप बार-बार कनेक्ट और डिसकनेक्ट हों रहें हैं। दस मिनट प्रतीक्षा करें फिर प्रयास करें। अगर आप "
+"बिना रुके प्रयास करते रहे तब आपको ज़्यादा प्रतीक्षा करनी पड़ेगी।"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "कनेक्शन बनाने में त्रुटि"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "कनेक्ट नहीं कर पाया"
 
@@ -6622,17 +6711,7 @@ msgid "Invalid chat room name"
 msgstr "गलत कक्ष नाम"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "कनेक्शन बनाने में त्रुटि"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
 
 #. *< type
@@ -6685,8 +6764,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6859,23 +6939,18 @@ msgstr "कॉमेरा"
 msgid "Screen Sharing"
 msgstr "स्क्रीन-नाम:"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "चैट के लिए समय है"
 
-#, c-format
 msgid "Not Available"
 msgstr "उपलब्ध नहीं"
 
-#, c-format
 msgid "Occupied"
 msgstr "व्यस्त"
 
-#, c-format
 msgid "Web Aware"
 msgstr "वैब अवगत"
 
-#, c-format
 msgid "Invisible"
 msgstr "अद्रश्य"
 
@@ -6889,16 +6964,12 @@ msgid "Buddy Comment"
 msgstr "बड्डी टिप्पणी"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "हसतांतरण करने के लिए कनेक्ट नहीं कर पाया।"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "सर्वर से कनेक्ट करने में असफल।"
+msgid "Unable to connect to BOS server: %s"
+msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
 
 #, fuzzy
 msgid "Username sent"
@@ -6913,51 +6984,62 @@ msgstr "कनेक्शन को निर्णायक कर रहा �
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "लॉगिन करने में असमर्थ: %s को साइन औन न कर सका क्योंकि स्क्रीन-नाम अवैध है। स्क्रीन-नाम "
 "किसी अक्षर से शुरु होना चाहीए और उसमें केवल अक्षर, अंक और खाली जगह होने चाहीए, नहीं तो "
 "केवल अंक होने चाहीए।"
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"आप जल्दी डिसकनेक्ट हो जाएंगे। जब तक यह ठीक होगा आप टी औ सी का प्रयोग करना चाहेंगे। "
+"अपडेट्स के लिए %s देखें।"
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "अवैध उपयोगकर्ता-नाम"
+msgid "Unable to get a valid AIM login hash."
+msgstr "गेम वैध ऐ आई एम लॉगिन हैश लाने में असमर्थ रहा।"
 
-msgid "Incorrect password."
-msgstr "गलत पासवर्ड "
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "गेम वैध लॉगिन हैश लाने में असमर्थ रहा।"
+
+msgid "Received authorization"
+msgstr "प्रमानिकरण मिला"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "उपयोगकर्ता नहीं है"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "आपका खाता अभी निलंबित है।"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "ऐ औ एल इंसटेंट मैसंजर सेवा अस्थाई रुप से उपलब्ध नहीं है।"
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "यह क्लायंट अनुवाद बहुत पुराना है। कृपया अपग्रेड करें यहा पर %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "आप बार-बार कनेक्ट और डिसकनेक्ट हों रहें हैं। दस मिनट प्रतीक्षा करें फिर प्रयास करें। अगर आप "
 "बिना रुके प्रयास करते रहे तब आपको ज़्यादा प्रतीक्षा करनी पड़ेगी।"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "यह क्लायंट अनुवाद बहुत पुराना है। कृपया अपग्रेड करें यहा पर %s"
-
-msgid "Could Not Connect"
-msgstr "कनेक्ट नहीं कर पाया"
-
-msgid "Received authorization"
-msgstr "प्रमानिकरण मिला"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "डाली गयी सेक्योर आई डी कुंजी अवैध है।"
 
 msgid "Enter SecurID"
@@ -6975,28 +7057,6 @@ msgstr "डिजीटल डिसप्ले से 6 अंको का �
 msgid "_OK"
 msgstr "ठीक"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"आप जल्दी डिसकनेक्ट हो जाएंगे। जब तक यह ठीक होगा आप टी औ सी का प्रयोग करना चाहेंगे। "
-"अपडेट्स के लिए %s देखें।"
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "गेम वैध ऐ आई एम लॉगिन हैश लाने में असमर्थ रहा।"
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"आप जल्दी डिसकनेक्ट हो जाएंगे। जब तक यह ठीक होगा आप टी औ सी का प्रयोग करना चाहेंगे। "
-"अपडेट्स के लिए %s देखें।"
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "गेम वैध लॉगिन हैश लाने में असमर्थ रहा।"
-
 msgid "Password sent"
 msgstr "पासवर्ड भेजा दिया"
 
@@ -7129,7 +7189,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "आपको अज्ञात कारनों से साइन-ऑफ करा गया है।"
 msgstr[1] "आपको अज्ञात कारनों से साइन-ऑफ करा गया है।"
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "संदेश भेजने में असमर्थ: %s"
@@ -7155,6 +7215,12 @@ msgstr "से औनलाइन"
 msgid "Member Since"
 msgstr "से सदस्य"
 
+msgid "Capabilities"
+msgstr "योग्यताऐं"
+
+msgid "Profile"
+msgstr "प्रोफ़ाइल"
+
 msgid "Your AIM connection may be lost."
 msgstr "आपका ऐ आई एम कनेक्शन शायद टूट गया है।"
 
@@ -7325,7 +7391,7 @@ msgstr "अनुपस्थिति संदेश बहुत लम्ब
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7351,9 +7417,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "लावारिस"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "बड्डी %s को जोड़ नहीं पाया क्योंकि आपकी सूची में बहुत ज्यादा बड्डी हैं। किसी एक को हटा कर "
@@ -7363,7 +7429,7 @@ msgid "(no name)"
 msgstr "(कोई नाम नहीं)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "आपका निर्देष अज्ञात कारण से असफल हो गया।"
 
 #, fuzzy, c-format
@@ -7433,6 +7499,7 @@ msgstr "कनेक्ट"
 msgid "Get AIM Info"
 msgstr "जानकारी लाऐं"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "बड्डी टिप्पणी का संपादन\" "
 
@@ -7496,6 +7563,7 @@ msgstr "खोजें"
 msgid "Set User Info (web)..."
 msgstr "उपयोगकर्ता की जानकारी दृढ़ करें(यू आर एल)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "पासवर्ड बदलें (यू आर ऐल )"
@@ -7532,6 +7600,10 @@ msgstr "बड्डी की खोज ईमेल द्वारा कर�
 msgid "Search for Buddy by Information"
 msgstr "बड्डी की खोज जानकारी द्वारा करें"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "उपयोगकर्ता लौग्ड नहीं है"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7549,7 +7621,7 @@ msgstr "%s को %s पर कनेक्ट करने के लिए प
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s को %s पर कनेक्ट करने का प्रयास कर रहा है:%hu सीधे आई एम के लिए।"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "%s को %s पर कनेक्ट करने का प्रयास कर रहा है:%hu सीधे आई एम के लिए।"
 
@@ -7662,7 +7734,7 @@ msgstr "ओपेरा(Opera)"
 msgid "Visible"
 msgstr "अद्रश्य"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7759,17 +7831,51 @@ msgstr "पिछली बार कब अपडेट किया गया\
 msgid "Could not change buddy information."
 msgstr "कृप्या झपटा मारने के लिए बड्डी का नाम भरें।"
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "मोबाइल फोन"
+
+msgid "Note"
+msgstr "नोट"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "बड्डी आइकोन"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "बड्डी चुनिये"
+msgid "_Modify"
+msgstr "बदलें(_M)"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "बदलें(_M)"
 
-msgid "Input answer here"
+#, fuzzy
+msgid "Server says:"
+msgstr "सर्वर व्यस्त है"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "प्रमाणिकरन का अनुरोध करें"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "उपयोगकर्ता को अपनी बड्डी सूची में जोड़ें।"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "फ़ाइल नहीं भेज सकता।"
+
 msgid "Send"
 msgstr "भेजो"
 
@@ -7781,19 +7887,20 @@ msgstr "अवैध पासवर्ड"
 msgid "Authorization denied message:"
 msgstr "प्रमाणिकरन मनाही संदेश:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "प्रमाणिकरन शुरु कर रहा है"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "उपयोगकर्ता को अपनी बड्डी सूची में जोड़ें।"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "सम्मेलन सवर्र में घुसें"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7816,7 +7923,7 @@ msgid "Failed sending authorize"
 msgstr "कृपया मुझे प्रमाणित करें!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "बड्डी के साथ चैट में जुड़ने में असफल"
 
 #, fuzzy, c-format
@@ -7862,6 +7969,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "अवैध प्रोक्सी निर्धारण"
+
+#, fuzzy
 msgid "Not member"
 msgstr "से सदस्य"
 
@@ -7904,15 +8015,18 @@ msgstr "इस आवर्तन में दस से ज़्यादा
 msgid "Join QQ Qun"
 msgstr "चैट में शामिल हों"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "टैलीफोन नंबर"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7923,7 +8037,7 @@ msgstr "धव्नि विकल्प"
 msgid "Failed:"
 msgstr "असफल हुआ"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7935,11 +8049,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
-msgstr ""
+#, fuzzy
+msgid "Sorry, you are not our style"
+msgstr "माफ कीजीएगा, कुछ देर के लिए में बाहर गया था!"
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "टैलीफोन नंबर"
 
 #, fuzzy
@@ -7950,7 +8065,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "क्या आप संवाद में शामिल होना चाहेंगे?"
 
 #, fuzzy
@@ -7958,28 +8073,28 @@ msgid "Setup"
 msgstr "नियत करें (_S)"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "बड्डी के साथ चैट में जुड़ने में असफल"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "बड्डी निकालें"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "बड्डी निकालें"
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
@@ -8103,6 +8218,13 @@ msgstr "<b>उपभोक्ता:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>उपनाम:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>उपभोक्ता:</b> %s<br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -8110,7 +8232,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "गेम के बारे में"
 
 #, fuzzy
@@ -8131,6 +8253,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "गेम के बारे में"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "घर का पता"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8162,7 +8288,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "कनेक्ट कर रहा है"
@@ -8175,6 +8300,9 @@ msgstr "कुछ विकल्प दिखाओ"
 msgid "Show server news"
 msgstr "कुछ विकल्प दिखाओ"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "पढ़ने में त्रुटि"
@@ -8184,11 +8312,7 @@ msgid "Update interval (seconds)"
 msgstr "पढ़ने में त्रुटि"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "सर्वर की जानकारी नहीं मिली"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "सर्वर की जानकारी नहीं मिली"
 
 #, c-format
@@ -8211,21 +8335,19 @@ msgid "Activation required"
 msgstr "रजिस्ट्रेशन आवशयक"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "पढ़ने में त्रुटि"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "अस्पष्ट अनुरोध"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "याहू! प्रमाणीकरण असफल"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -8235,7 +8357,7 @@ msgstr "चित्र संचित करें"
 msgid "Enter code"
 msgstr "पासवर्ड बदलें"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -8243,19 +8365,15 @@ msgid "Enter the text from the image"
 msgstr "कृपया उस समूह का नाम भरीये जिसे आप जोड़ना चाहतें हैं।"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "कनेक्ट करने में असमर्थ"
-
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
@@ -8264,52 +8382,30 @@ msgstr "कनेक्ट करने में असमर्थ"
 msgid "Socket error"
 msgstr "अज्ञात त्रुटि"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "सोकेट पढ़ने में असमर्थ"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "लिखने में त्रुटी"
-
 #, fuzzy
-msgid "Connection lost"
-msgstr "कनेक्शन बंद हो गया"
-
-#, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "उपयोगकर्ता की जानकारी दृढ़ करें..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "अनुरोध निषेध"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
+msgid "Unable to resolve hostname"
+msgstr "सर्वर को पींग नहीं कर पाया"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "अवैध उपयोगकर्ता-नाम या पासवर्ड"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "सर्वर कनेक्ट करें"
+msgid "Connecting to server"
+msgstr "एस एल आइ सी  सर्वर से कनेक्शन कर रहा है"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "पढ़ने में त्रुटि"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "वार्तालाप में जुड़ने में असफल"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8319,6 +8415,10 @@ msgid ""
 msgstr "आइ सी क्यू सवर्र रीले"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s पे %s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "से"
 
@@ -8328,32 +8428,34 @@ msgid ""
 "%s"
 msgstr "सर्वर की जानकारी"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "अज्ञात कारण"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "कमांड"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "सर्वर की जानकारी नहीं मिली"
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "अज्ञात कारण"
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
@@ -8361,7 +8463,7 @@ msgstr "अज्ञात कारण"
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "अज्ञात कारण"
 
 #, fuzzy, c-format
@@ -8376,10 +8478,6 @@ msgstr "फ़ाइल भेजना असफल"
 msgid "%d canceled the transfer of %s"
 msgstr "%s ने %s के स्थानांतर को रद्द किया"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "कनेक्शन बंद हो गया"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>उपभोक्ता:</b> %s<br>"
@@ -8441,19 +8539,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "कनेक्शन बंद हो गया"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "सॉकेट से पढ़ने में त्रुटि।"
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8485,6 +8570,10 @@ msgid "Video Camera"
 msgstr "विडीयो चैट"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "फ़ाइल हस्तांतरण"
+
+#, fuzzy
 msgid "Supports"
 msgstr "समर्थन"
 
@@ -9237,9 +9326,6 @@ msgstr "संस्था"
 msgid "Unit"
 msgstr "इकाई"
 
-msgid "Note"
-msgstr "नोट"
-
 msgid "Join Chat"
 msgstr "चैट में शामिल हों"
 
@@ -9343,6 +9429,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "नेटवर्क के आंकड़े"
 
+msgid "Ping"
+msgstr "पिंग"
+
 msgid "Ping failed"
 msgstr "पिंग असफल"
 
@@ -9408,7 +9497,8 @@ msgstr "असमर्थित सार्वजनिक कुंजी प
 msgid "Disconnected by server"
 msgstr "सर्वर ने कनेक्शन तोड़ा"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "एस आई एल सी कनेक्शन के दोरान त्रुटी"
 
 msgid "Key Exchange failed"
@@ -9418,29 +9508,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "प्रथक काल का पुनः आरम्भ विफल"
 
-msgid "Connection failed"
-msgstr "कनेक्शन असफल हुआ"
-
 msgid "Performing key exchange"
 msgstr "कुंजी विनियम निभा रहा है"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "नया कनेक्शन बनाने में असमर्थ।"
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "सार्वजनिक कुंजी नहीं लोड कर पा रहा"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "एस एल आइ सी  सर्वर से कनेक्शन कर रहा है"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "सार्वजनिक कुंजी नहीं लोड कर पा रहा"
+
 msgid "Out of memory"
 msgstr "अपर्याप्त मेमरी"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "एस आई एल सी कनेक्शन नहीं शुरु कर पाया"
 
 #, fuzzy
@@ -9742,7 +9829,7 @@ msgid "Creating SILC key pair..."
 msgstr "एस आइ एल सी कुंजी जोड़ा बना रहा है..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "एस आइ एल सी कुंजी जोड़ा बना रहा है..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9836,6 +9923,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "सवर्र के आंकड़े उपलब्ध नहीं हैं"
 
+msgid "Error during connecting to SILC Server"
+msgstr "एस आई एल सी कनेक्शन के दोरान त्रुटी"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "असफलता: अनुवाद असमानता, क्लायंट को अपग्रेड करें"
@@ -9876,7 +9966,8 @@ msgstr "असफलता: अवैध कुकी"
 msgid "Failure: Authentication failed"
 msgstr "असफलता: प्रमाणीकरण असफल"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "एस आई एल सी कनेक्शन नहीं शुरु कर पाया"
 
 #, fuzzy
@@ -9884,36 +9975,33 @@ msgid "John Noname"
 msgstr "अंतिम नाम"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "सार्वजनिक कुंजी नहीं लोड कर पा रहा"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "भेज नहीं सका"
-
-msgid "Could not connect"
-msgstr "कनेक्ट नहीं कर पाया"
+msgid "Unable to create connection"
+msgstr "नया कनेक्शन बनाने में असमर्थ।"
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "अज्ञात त्रुटि।"
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "सॉकट नहीं बना सका"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "होस्ट का नाम ढूंड नहीं पाया।"
+msgid "Unable to create listen socket"
+msgstr "सोकेट बनाने में असमर्थ"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "आइ आर सी उपनामों में वाइटस्पेस नहीं हो सकती"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "कुछ विकल्प दिखाओ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9954,177 +10042,69 @@ msgstr "ऐ पी उपयोगकर्ता"
 msgid "Auth Domain"
 msgstr "स्वचालित"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s को देख रहा है"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s को कनेक्ट असफल"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "साइन-औन: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "%s फा़इल लिखने में असमर्थ।"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "%s फा़इल पढ़ने में असमर्थ।"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "संदेश बहुत लम्बा है, आखिर के %s बाइट काटें गये हैं।"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s ने अभी लॉग-इन किया है"
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s के लिए चेतावनी पर पाबंदी है।"
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "एक संदेश को फैंक दिया गया, आप सवर्र की गति सीमा का उलंघन कर रहें है।"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s में चैट उपलब्ध नहीं है।"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "आप %s को संदेश बहुत तेज़ी से भेज रहें हैं।"
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत बड़ा था।"
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत तेज़ भेजा गया था।"
-
-#, c-format
-msgid "Failure."
-msgstr "असफलता।"
-
-#, c-format
-msgid "Too many matches."
-msgstr "बहुत सारी उपयुक्तियां"
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "और अधिक क्वालीफायर्स की आवशयकता है।"
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "डिर सेवा अस्थाई रुप से उपलब्ध नहीं है।"
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "इमेल का देखना सीमाबद्ध किया गया।"
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "कुंजीशब्द कि अपेक्षा हुई"
-
-#, c-format
-msgid "No keywords."
-msgstr "कोइ कुंजीशब्द नहीं।"
-
-#, c-format
-msgid "User has no directory information."
-msgstr "उपयोगकर्ता के पास कोइ डायरक्ट्री की जानकारी नहीं है।"
-
-#, c-format
-msgid "Country not supported."
-msgstr "देश समर्थित नहीं है"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "अज्ञात असफलता: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "अवैध उपनाम या पासवर्ड"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "यह सेवा अस्थाई तोर से उपलब्ध नहीं है।"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;कक्ष&gt;:  याहू नेटवर्क पर किसी चैट कक्ष में जाएं"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "आपका चेतावनी स्तर लॉग-इन करने के लिए बहुत ऊँचा है।"
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "सूची: इस नेटवर्क पर चैनलों कि सूची दिखायें"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"आप लगातार जल्दी-जल्दी कनेक्ट और डिसकनेक्ट हो रहें हैं। दस मिनट प्रतीक्षा करें और फिर प्रयास "
-"करें। अगर आप प्रयास जारी रखेंगे तो आपको और ज़्यादा प्रतीक्षा करनी पड़ेगी।"
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "एक अज्ञात साइन-औन त्रुटी हुइ: %s।"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "एक अज्ञात त्रुटी, %d , हुआ है। जानकारी: %s"
 
 #, fuzzy
-msgid "Invalid Groupname"
-msgstr "अवैध समूह-नाम"
-
-msgid "Connection Closed"
-msgstr "कनेक्शन बंद हो गया"
-
-msgid "Waiting for reply..."
-msgstr "उत्तर कि प्रतीक्षा कर रहें हैं"
+msgid "Yahoo ID..."
+msgstr "याहू! आइ डी"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "टी औ सी ठहर कर वापस आया। अब आप संदेश भेज सकतें हैं।"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "याहू प्रोटोकाल प्लगइन"
 
-msgid "Password Change Successful"
-msgstr "पासवर्ड बदलने में सफल"
+#, fuzzy
+msgid "Pager server"
+msgstr "प्रोक्सी सर्वर"
 
-msgid "_Group:"
-msgstr "समूह:(_G)"
+msgid "Pager port"
+msgstr "पैजर पोर्ट"
 
-msgid "Get Dir Info"
-msgstr "डिर जानकारी लायें"
+#, fuzzy
+msgid "File transfer server"
+msgstr "फ़ाइल हस्तांतरण होस्ट"
 
-msgid "Set Dir Info"
-msgstr "डिर जानकारी दृढ़ करें..."
+msgid "File transfer port"
+msgstr "फ़ाइल हस्तांतरण पोर्ट"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "%s को खोल नहीं पाया लिखने के लिए!"
+#, fuzzy
+msgid "Chat room locale"
+msgstr "चैट कक्ष सूची की कड़ी"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "फा़इल हसतांत्रण विफल; शायद दूसरी और से रद्द हुआ।"
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
 
-msgid "Could not connect for transfer."
-msgstr "हसतांतरण करने के लिए कनेक्ट नहीं कर पाया।"
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "चैट कक्ष सूची की कड़ी"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "फा़इल का हैडर लिख नहीं पाया। यह फा़इन हसतांत्रित नहीं होगी।"
+msgid "Yahoo Chat server"
+msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "अइकॉन इस तरह संचित करें..."
-
-#, 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] ""
+msgid "Yahoo Chat port"
+msgstr "याहू जापान"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s आपसे फा़इल भेजने का अनुरोध कर रहें हैं"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "याहू! आइ डी"
 
 #. *< type
 #. *< ui_requirement
@@ -10136,11 +10116,11 @@ msgstr "%s आपसे फा़इल भेजने का अनुरो�
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "टीऔसी प्रोटोकॉल प्लगइन"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "याहू प्रोटोकाल प्लगइन"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -10163,6 +10143,30 @@ msgstr "%s ने आपके उनको बड्डी सूची मे�
 msgid "Add buddy rejected"
 msgstr "बड्डी को जोड़ना मना हो गया "
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "अज्ञात त्रुटी संखया %d। याहू में लॉग-इन करने से शायद ठीक हो जाय।"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "अज्ञात त्रुटी संखया %d। याहू में लॉग-इन करने से शायद ठीक हो जाय।"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "अवैध उपनाम या पासवर्ड"
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10193,11 +10197,12 @@ msgstr "आपके खाते पर ताला लगा है, कृ�
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "अज्ञात त्रुटी संखया %d। याहू में लॉग-इन करने से शायद ठीक हो जाय।"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "इस खाते %s पर बड्डी %s को %s समुह में जोड़ नहीं पाया।"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "बड्डी को सवर्र सूची में नहीं डाल सका।"
 
 #, c-format
@@ -10205,24 +10210,17 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "सवर्र ने अवैध उत्तर दिया।"
 
-msgid "Connection problem"
-msgstr "कनेक्शन में कठिनाई"
-
 #  Conversations
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "%s के साथ वार्तालाप"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
 
 #, fuzzy
 msgid "Not at Home"
@@ -10277,9 +10275,8 @@ msgstr " विकल्प का उपयोग करो"
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "कोनसा आइ डी क्रियांवित करें?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "किससे संवाद करें ?"
@@ -10294,82 +10291,15 @@ msgstr "उपयोगकर्ता से संवाद में जु�
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;कक्ष&gt;:  याहू नेटवर्क पर किसी चैट कक्ष में जाएं"
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "सूची: इस नेटवर्क पर चैनलों कि सूची दिखायें"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "याहू! आइ डी"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "याहू प्रोटोकाल प्लगइन"
-
-msgid "Yahoo Japan"
-msgstr "याहू जापान"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "प्रोक्सी सर्वर"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "जापान पैजर होस्ट"
-
-msgid "Pager port"
-msgstr "पैजर पोर्ट"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "फ़ाइल हस्तांतरण होस्ट"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "जापान फ़ाइल हस्तांतरण होस्ट"
-
-msgid "File transfer port"
-msgstr "फ़ाइल हस्तांतरण पोर्ट"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "चैट कक्ष सूची की कड़ी"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "चैट कक्ष सूची की कड़ी"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "याहू जापान"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "कनेक्ट करने में असमर्थ"
+
 msgid "Unable to establish file descriptor."
 msgstr "फाइल डिसक्रिपट्र स्थापित करनें में असमर्थ।"
 
@@ -10377,6 +10307,10 @@ msgstr "फाइल डिसक्रिपट्र स्थापित क
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s को %s भेजने का प्रस्ताव"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "लिखने में त्रुटी"
+
 msgid "Yahoo! Japan Profile"
 msgstr "याहू जापान प्रोफ़ाइल"
 
@@ -10420,14 +10354,9 @@ msgstr "बढ़ीया कड़ी 3"
 msgid "Last Update"
 msgstr "पिछली बार कब अपडेट किया गया\" "
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "उपयोगकर्ता %s हेतु जानकारी उपलब्ध नहीं"
-
 #, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr "क्षमा करें, यह प्रोफाइल जिस भाषा में है वह अभी तक समर्थित नहीं है।"
 
 msgid ""
@@ -10502,21 +10431,19 @@ msgstr "आवाज़ें"
 msgid "Webcams"
 msgstr "वेब केमरे"
 
+msgid "Connection problem"
+msgstr "कनेक्शन में कठिनाई"
+
 msgid "Unable to fetch room list."
 msgstr "कक्ष सूची नहीं ला पाया"
 
 msgid "User Rooms"
 msgstr "उपभोक्ता कक्ष"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "वाय सी एच टी YCHT सर्वर से कनेक्शन में कठिनाई"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10646,13 +10573,7 @@ msgid "Exposure"
 msgstr "दिखावा"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "सोकेट बनाने में असमर्थ"
-
-#, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "%s को संदेश भेजने में असमर्थ"
 
 #, fuzzy, c-format
@@ -10660,17 +10581,13 @@ msgid "HTTP proxy connection error %d"
 msgstr "प्रोक्सी कनेक्शन में त्रुटि %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "प्रवेश निषेध: प्रोक्सी सर्वर पोर्ट %d टनलिंग वर्जित करता है।"
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "चैट में शामिल होने में त्रुटि %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "होस्ट का नाम ढूंड नहीं पाया।"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10773,10 +10690,6 @@ msgstr "परेशान ना करें"
 msgid "Extended away"
 msgstr "बहुत देर के लिए अनुपस्थित"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "मोबाइल फोन"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10818,20 +10731,6 @@ msgstr "%s सक्रिय हो गया है."
 msgid "%x %X"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr ""
-"%s:पढ़ने में त्रुटि\n"
-"%s.\n"
-
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"आपकी बड्डी सूची के विश्लेषण करने में त्रुटि हुई. यह लोड नहीं हुआ है और पिछली फा़इल का नाम "
-"blist.xml~ रख दिया गया है."
-
 msgid "Calculating..."
 msgstr "गणना जारी..."
 
@@ -10947,6 +10846,20 @@ msgstr "कनेक्शन बंद हो गया"
 msgid "Address already in use."
 msgstr "फ़ाइल पहले से है"
 
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"%s:पढ़ने में त्रुटि\n"
+"%s.\n"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"आपकी बड्डी सूची के विश्लेषण करने में त्रुटि हुई. यह लोड नहीं हुआ है और पिछली फा़इल का नाम "
+"blist.xml~ रख दिया गया है."
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "इन्सटन्ट मैसेजर्स"
@@ -10995,10 +10908,13 @@ msgstr "नयी डाक की सूचनाऐँ"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s के विकल्प"
+# #-#-#-#-#  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.
+#, fuzzy
+msgid "_Advanced"
+msgstr "रद्द(_C)"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -11034,9 +10950,6 @@ msgstr "अगर आप ध्यान से देखें"
 msgid "you can see the butterflies mating"
 msgstr "आप तितलीयों को मिलते देख सकतें हैं"
 
-msgid "Proxy Options"
-msgstr "प्रोक्सी विकल्प"
-
 msgid "Proxy _type:"
 msgstr "प्रोक्सी की प्रकार(_t):"
 
@@ -11067,13 +10980,9 @@ msgstr "पीछे"
 msgid "Create _this new account on the server"
 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.
 #, fuzzy
-msgid "_Advanced"
-msgstr "रद्द(_C)"
+msgid "_Proxy"
+msgstr "कोई प्रॉक्सी नहीं"
 
 #, fuzzy
 msgid "Enabled"
@@ -11111,18 +11020,19 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr ""
 
+#  And now for the buttons
 #, fuzzy
-msgid "Room _List"
-msgstr "कक्ष सूची"
+msgid "A_ccount"
+msgstr "खाता:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "कृप्या जिस चैट में आप शामिल होना चाहतें हैं उसके बारे में उचित जानकारी भरें।\n"
 
-#  And now for the buttons
-msgid "_Account:"
-msgstr "खाता:(_A)"
+#, fuzzy
+msgid "Room _List"
+msgstr "कक्ष सूची"
 
 #, fuzzy
 msgid "_Block"
@@ -11142,6 +11052,17 @@ msgid "I_M"
 msgstr "आइ एम(_M)"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "चैट जोड़ें"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "विडीयो चैट"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "फ़ाइल भेजें(_S)"
 
@@ -11153,7 +11074,11 @@ msgid "View _Log"
 msgstr "लॉग देखें(_L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "जब आप ऑफलाइन हैं तब आज्ञा नहीं"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "जब आप ऑफलाइन हैं तब आज्ञा नहीं"
 
 msgid "_Alias..."
@@ -11305,6 +11230,10 @@ msgstr "/औजार/बड्डी पर झपटा(_P)"
 msgid "/Tools/_Certificates"
 msgstr "/औज़ार/पसंदें(_e)"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/औजार/अनुपस्थित(_A)"
+
 #  And now for the buttons
 #, fuzzy
 msgid "/Tools/Plu_gins"
@@ -11316,10 +11245,6 @@ msgstr "/औज़ार/पसंदें(_e)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/औजार/गुप्तता(_i)"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/औजार/अनुपस्थित(_A)"
-
 msgid "/Tools/_File Transfers"
 msgstr "/औज़ार/फा़इल हसतांत्रन(_F)"
 
@@ -11452,8 +11377,8 @@ msgstr "मान्युवल"
 msgid "By status"
 msgstr "वस्तुस्थिति द्वारा"
 
-msgid "By log size"
-msgstr "लॉग आकार द्वारा"
+msgid "By recent log activity"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "%s disconnected"
@@ -11478,6 +11403,9 @@ msgstr "फिर कनेक्ट करें(_R)"
 msgid "Re-enable"
 msgstr "नया जैबर खाता रेजिस्टर करें"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "\"%s पीछे आया"
@@ -11576,6 +11504,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "उपनाम:"
 
+msgid "_Group:"
+msgstr "समूह:(_G)"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11616,6 +11547,120 @@ msgstr "औजार(_T)"
 msgid "/Buddies/Sort Buddies"
 msgstr "/बड्डी/ऑफलाइन बड्डी दिखायें"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "पृष्ठभूमि रंग"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "क्या आप इस बड्डी को बड्डी सूची मे डालना चाहतें हैं?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "लौग आउट हो चुका है"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "पृष्ठभूमि रंग"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "फैलाइये(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "पृष्ठभूमि का रंग चुनो"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "सिकुड़िये(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "पृष्ठभूमि का रंग चुनो"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "शोर्टकट"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "ऑनलाइन"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "चुने हुए बड्डी की जानकारी लाऐं"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "दूर"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "चुने हुए बड्डी की जानकारी लाऐं"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "ऑफलैन"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "चुने हुए बड्डी की जानकारी लाऐं"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "स्वभाव"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "चुने हुए बड्डी की जानकारी लाऐं"
+
+msgid "Message Text"
+msgstr "सन्देश टेक्स्ट्"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "सन्देश टेक्स्ट्"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11640,14 +11685,6 @@ msgstr "आप अभी ऐसे किसी खाते के साथ �
 msgid "Invite Buddy Into Chat Room"
 msgstr "बड्डी को चैट कक्ष में आमंत्रित करें"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"कृपया उपयोगकर्ता का नाम डालिए जिन्हे आप आमंत्रित करना चाहते हैं। अगर आप चाहे तो आमंत्रण "
-"संदेश भी भेज सकते हैं।"
-
 msgid "_Buddy:"
 msgstr "बड्डी(_B):"
 
@@ -11680,7 +11717,7 @@ msgid "Get Away Message"
 msgstr "नया अनुपस्थिति संदेश"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "अंतिम नाम"
 
 msgid "Unable to save icon file to disk."
@@ -11735,6 +11772,26 @@ msgid "/Conversation/Clea_r Scrollback"
 msgstr "/वार्ता/साफ करें"
 
 #  Conversations
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/वार्ता/बंद(_C)"
+
+#  Conversations
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/वार्ता/बंद(_C)"
+
+#  Conversations
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/वार्ता/बंद(_C)"
+
+#  Conversations
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/वार्ता/लॉग देखें(_L)"
+
+#  Conversations
 msgid "/Conversation/Se_nd File..."
 msgstr "/वार्ता/फा़इल भेज़ें(_n)..."
 
@@ -11830,6 +11887,21 @@ msgid "/Conversation/View Log"
 msgstr "/वार्ता/लॉग देखें"
 
 #  Conversations
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/वार्ता/बंद(_C)"
+
+#  Conversations
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/वार्ता/लॉग देखें"
+
+#  Conversations
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/वार्ता/बंद(_C)"
+
+#  Conversations
 msgid "/Conversation/Send File..."
 msgstr "/वार्ता/फा़इल भेजें..."
 
@@ -12043,6 +12115,9 @@ msgstr "पता"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "समर्थन"
 
@@ -12177,6 +12252,10 @@ msgid "Hungarian"
 msgstr "हंगेरियाई"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "रोमानी"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "मेसिडोनियन"
 
@@ -12194,6 +12273,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "वर्तमान अनुवादक - रविशंकर श्रीवास्तव (raviratlami@yahoo.com)"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "ओपेरा(Opera)"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "निषेधित"
 
@@ -12217,6 +12300,10 @@ msgid "Macedonian"
 msgstr "मेसिडोनियन"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "मेसिडोनियन"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "नारवेजियन "
 
@@ -12274,6 +12361,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "स्वीडिश"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "टर्मिनल"
@@ -12325,8 +12415,25 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"3\">IRC:</FONT> #गेम irc.freenode.net पर<BR><BR>"
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> #गेम irc.freenode.net पर<BR><BR>"
 
 #, fuzzy
@@ -12658,7 +12765,7 @@ msgid "Hyperlink visited color"
 msgstr "हाइपरलिंक रंग"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "हाइपरलिंक खींचना का रंग।"
 
 #, fuzzy
@@ -12698,16 +12805,23 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #  ---------- "Notification Removals" ----------
 #, fuzzy
 msgid "Typing notification color"
 msgstr "सूचक हटाना"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "नयी डाक की सूचनाऐँ"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12720,15 +12834,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "नयी डाक की सूचनाऐँ"
 
-msgid "_Copy Email Address"
-msgstr "इमेल पते की प्रतिलिपि बनायें(_C)"
-
-msgid "_Open Link in Browser"
-msgstr "कड़ी को ब्राउज़र में खोलें(_O)"
-
-msgid "_Copy Link Location"
-msgstr "कड़ी के स्थान की प्रतिलिपि बनायें(_C)"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12761,11 +12866,9 @@ msgstr "चित्र को संचित करने में त्र�
 msgid "Save Image"
 msgstr "चित्र संचित करें"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "चित्र संचित करें...(_S)"
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12856,10 +12959,6 @@ msgid "Font Face"
 msgstr "फॉन्ट का चेहरा"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "पृष्ठभूमि रंग"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "अग्रभूमि फोन्ट रंग"
 
@@ -12993,6 +13092,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -13010,6 +13110,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -13041,16 +13142,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "पेजिंग"
 
-#, fuzzy
-msgid "Open All Messages"
-msgstr "संदेश भेजें"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
 
 #, fuzzy
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "Calling..."
+msgstr "गणना जारी..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">आपके लिए मेल है!</span>\n"
-"\n"
-"%s"
 
 #, c-format
 msgid "%s has %d new message."
@@ -13079,6 +13191,35 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'स्वयं' ब्राउज़र कमांड चुनी गयी है, परंतु कोइ कमांड को दृढ़ नहीं किया गया है।"
 
+#, fuzzy
+msgid "No message"
+msgstr "(1 सन्देश)"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "संदेश भेजें"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">आपके लिए मेल है!</span>\n"
+"\n"
+"%s"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "नया बड्डी झपटा"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">आपके लिए मेल है!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -13132,11 +13273,19 @@ msgstr ""
 msgid "Select a file"
 msgstr "फाइल को चुनो"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "बड्डी झपटे का संपादन"
+
 #. Create the "Pounce on Whom" frame.
 #, fuzzy
 msgid "Pounce on Whom"
 msgstr "किसे झपटें"
 
+#  And now for the buttons
+msgid "_Account:"
+msgstr "खाता:(_A)"
+
 msgid "_Buddy name:"
 msgstr "बड्डी नाम:(_B)"
 
@@ -13218,7 +13367,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr "कब झपटें"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "बड्डी ने टाईप करना चालू किया(_t)"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "उपयोगकर्ता टाईप कर रहा है"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "साइनऑन(_g)"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "बेकारी से वापस आयें(_n)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "अनुपस्थिति से वापस आयें(_R)"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "पिंग"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "साइनऑफ(_o)"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s निष्क्रिय हो गया है."
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "जब अनुपस्थित"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "सन्देश भेजो(_m)"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "अज्ञात झपटा घटना। कृप्या इसकी रपट करें!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "चित्र संचय करने में असफल: %s\n"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -13243,6 +13443,12 @@ msgstr "शोर्टकट"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "%s के साथ वार्तालाप"
 
+#  Buddy List
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "बड्डी सूची"
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -13250,6 +13456,7 @@ msgstr "%s के साथ वार्तालाप"
 #  *< dependencies
 #  *< priority
 #  *< id
+#. System Tray
 msgid "System Tray Icon"
 msgstr "तंत्र तश्तरी आइकन"
 
@@ -13270,7 +13477,7 @@ msgstr "सन्देश भेजो(_m)"
 
 #  IM Convo trans options
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "आईएम वार्तालाप विंडो"
 
 #  Conversations
@@ -13281,6 +13488,11 @@ msgstr "वार्तालाप बंद करें"
 msgid "When away"
 msgstr "जब अनुपस्थित"
 
+#  IM Convo trans options
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "आईएम वार्तालाप विंडो"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13346,11 +13558,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "जब संदेश मिलें तो विंडो चमकाएँ (_F)"
 
-#  IM Convo trans options
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "आईएम वार्तालाप विंडो"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13387,15 +13594,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "उपयोगकर्ता की जानकारी नहीं मिली"
 
-#, fuzzy
-msgid "ST_UN server:"
-msgstr "सर्वर:(_S)"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "स्वतः जाने आइ पी पता(_A)"
 
 msgid "Public _IP:"
@@ -13418,6 +13621,10 @@ msgstr "आरम्भ  पोर्ट:(_S)"
 msgid "_End port:"
 msgstr "अंत पोर्ट:(_E)"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "प्रोक्सी सर्वर"
@@ -13447,6 +13654,10 @@ msgstr "प्रोक्सी सर्वर"
 msgid "No proxy"
 msgstr "कोई प्रॉक्सी नहीं"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "उपभोक्ता(_U):"
 
@@ -13625,14 +13836,14 @@ msgid "Auto-away"
 msgstr "स्वतः अनुपस्थित"
 
 #, fuzzy
-msgid "Change status when _idle"
-msgstr "जब बेकार हो तब अनुपस्थित दृढ़ करें(_w)"
-
-#, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "अनुपस्थिति दृढ़ करें कितने मिनट में(_M)"
 
 #, fuzzy
+msgid "Change status when _idle"
+msgstr "जब बेकार हो तब अनुपस्थित दृढ़ करें(_w)"
+
+#, fuzzy
 msgid "Change _status to:"
 msgstr "पता बदलें:"
 
@@ -13791,29 +14002,19 @@ msgstr "संचय करें और प्रयोग करें(_v)"
 msgid "Status for %s"
 msgstr "वस्तुस्थिति: %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "स्माइली डालें"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "सार्वजनिक कुंजी फा़इल"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "कृपया चुने हुए समूह के लिए नया नाम भरें।"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "स्माइली डालें"
@@ -13823,21 +14024,29 @@ msgid "Add Smiley"
 msgstr "मुसकुरायैं!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "चित्र संचित करें"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "शोर्टकट"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "मुसकुरायैं!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "शोर्टकट"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "बड्डी चुनिये"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13928,8 +14137,8 @@ msgid "Cannot send launcher"
 msgstr "फ़ाइल नहीं भेज पाया"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13968,6 +14177,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "कड़ी को इस में खोलें:(_O)"
+
+msgid "_Copy Link Location"
+msgstr "कड़ी के स्थान की प्रतिलिपि बनायें(_C)"
+
+msgid "_Copy Email Address"
+msgstr "इमेल पते की प्रतिलिपि बनायें(_C)"
+
+#, fuzzy
 msgid "Save File"
 msgstr "फाइल को संचित करें..."
 
@@ -14071,6 +14290,79 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "सवर्र पता"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "सम्मेलन सवर्र में घुसें"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "सम्मेलन सवर्र को सवाल करने के लिए चुने"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "औनलाइन अभिन्यास"
+
+#  Buddy List
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "बड्डी सूची भेजें"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "जब अनुपस्थित"
+
+#, fuzzy
+msgid "Directory"
+msgstr "के लिए खोज(_S):"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "ध्वनि का चुनाव"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>विवरण:</b> डरावना"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "डिर जानकारी दृढ़ करें..."
+
+#, fuzzy
+msgid "_Browse"
+msgstr "ब्रउज़र(_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "उपयोगकर्ता नहीं है"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "सवर्र कोइ भी समर्थित प्रमाणिकरण विधी का प्रयोग नहीं करता"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "डिर जानकारी दृढ़ करें..."
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "बड्डी निष्क्रिय हैः"
 
@@ -14524,7 +14816,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #  ---------- "Notify For" ----------
@@ -14667,12 +14959,6 @@ msgstr ""
 " - यह सभी आने वाले शब्दों को उलट देता है\n"
 " -यह आपकी सूची के व्यक्तियों को जब वे लागिन करते हैं, तुरंत संदेश भेजता है."
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "हाइपरलिंक रंग"
@@ -14685,6 +14971,11 @@ msgstr "हाइपरलिंक रंग"
 msgid "Highlighted Message Name Color"
 msgstr "संदेश भेजें"
 
+#  ---------- "Notification Removals" ----------
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "सूचक हटाना"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14721,38 +15012,33 @@ msgstr "अन्तरमुख विकल्प"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "रगों पर ध्यान न दें(_o)"
+msgid "Disable Typing Notification Text"
+msgstr "नयी डाक की सूचनाऐँ"
 
-msgid "Widget Sizes"
-msgstr ""
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "गेम फ़ाइल नियंत्रण"
+
+#, fuzzy
+msgid "Colors"
+msgstr "बंद करें"
 
 #  And now for the buttons
 #, fuzzy
 msgid "Fonts"
 msgstr "खाता"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -14859,7 +15145,7 @@ msgstr "आईएम वार्तालाप विंडो"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14912,6 +15198,137 @@ msgstr "बदलने हेतु पाठ"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "उपयोगकर्ता  द्वारा पारिभाषित नियमों के तहत बाहर जाने वाले संदेशों में पाठ बदलता है"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "लौग्ड नहीं है"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s ने लॉग आउट किया।"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "गपशप से जुड़ें"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "उपेक्षा"
+
+#, fuzzy
+msgid "Founder"
+msgstr "घंटा"
+
+#, fuzzy
+msgid "Operator"
+msgstr "ओपेरा(Opera)"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "प्रमानिकरण दिया"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "त्रुटी"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "सूचना"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "अस्पष्ट अनुरोध"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "चेतावनी स्तर"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "वस्तुस्थिति: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "चैट कक्ष सूची की कड़ी"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "अइकॉन संचित करें"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "गेम फ़ाइल नियंत्रण"
+
+#  And now for the buttons
+#, fuzzy
+msgid "Contact"
+msgstr "खाता विवरण"
+
+#  Buddy List
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "बड्डी सूची"
+
+#  Buddy List
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "बड्डी सूची"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "गेम फ़ाइल नियंत्रण"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "गेम फ़ाइल नियंत्रण"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15097,10 +15514,6 @@ msgid "Only when docked"
 msgstr ""
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "जब संदेश मिलें तो विंडो चमकाएँ (_F)"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "लॉगइन विकल्प"
 
@@ -15108,9 +15521,10 @@ msgstr "लॉगइन विकल्प"
 msgid "Options specific to Pidgin for Windows."
 msgstr "विंडोस गेम हेतु विशेष विकल्प"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "विंडोस गेम हेतु विशेष विकल्प"
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -15153,6 +15567,512 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "सोकेट खोलने में असमर्थ"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "सॉकट नहीं बना सका"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "सोकेट पढ़ने में असमर्थ"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "कनेक्शन असफल हुआ"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "सर्वर ने कनेक्शन तोड़ा"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "सॉकट नहीं बना सका"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
+
+#~ msgid "Read error"
+#~ msgstr "पढ़ने में त्रुटि"
+
+#~ msgid "Write error"
+#~ msgstr "लिखने में त्रुटी"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "डिर जानकारी दृढ़ करें..."
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "विस्तृत पता"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "चैट का उपनाम"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "उपयोगकर्ता के पास कोइ डायरक्ट्री की जानकारी नहीं है।"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "कमांड"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "ऐचटीऐमऐल(HTML)"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "रजिस्ट्रेशन त्रुटि"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "स्थान निरूप"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "बड्डी स्थिति सूचना"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "असमर्थित आवर्तन"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "दिशा"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "उपयोगकर्ता ढंग"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "उपयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "योग्यताऐं"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "उपयोगकर्ता-नाम"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "आई एम कुंजी विनिमय"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "इमेल पता"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "प्रोफ़ाइल द्रद्द करें"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "पिंग"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "उपनाम"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "प्रत्यक्ष विडीयो"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "प्राप्त सन्देश"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "सार्वजनिक कुंजी बैबलप्रिंट"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "उपयोगकर्ता विकल्प"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "उपयोगकर्ता ढंग"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "उपयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "उपयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ट्रिलियन एनक्रिपशन"
+
+#~ msgid "Read Error"
+#~ msgstr "पढ़ने में त्रुटि"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "सर्वर से कनेक्ट करने में असफल।"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "कतार पूरी"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "संदेश पदभंजन में असमर्थ"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "लॉग-इन असफल (%s)। "
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "आपको लॉग-आउट कर दिया गया है क्योंकि आपने दूसरे कार्य स्थल से लॉग-इन किया।"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "त्रुटी । एस एस एल समर्थन स्थापित नहीं है।"
+
+#~ msgid "Incorrect password."
+#~ msgstr "गलत पासवर्ड "
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "सर्वर से कनेक्ट करने में असफल।"
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "आप जल्दी डिसकनेक्ट हो जाएंगे। जब तक यह ठीक होगा आप टी औ सी का प्रयोग करना चाहेंगे। "
+#~ "अपडेट्स के लिए %s देखें।"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "कनेक्ट नहीं कर पाया"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "अवैध उपयोगकर्ता-नाम"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "सर्वर की जानकारी नहीं मिली"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "कनेक्शन बंद हो गया"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "कनेक्शन बंद हो गया"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "कनेक्शन बंद हो गया"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "सॉकेट से पढ़ने में त्रुटि।"
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "भेज नहीं सका"
+
+#~ msgid "Could not connect"
+#~ msgstr "कनेक्ट नहीं कर पाया"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "सॉकट नहीं बना सका"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "होस्ट का नाम ढूंड नहीं पाया।"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "गलत पासवर्ड "
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "याहू जापान"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "जापान पैजर होस्ट"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "जापान फ़ाइल हस्तांतरण होस्ट"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "होस्ट का नाम ढूंड नहीं पाया।"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "सवर्र पर लॉग इन करने के लिए टी एल एस / एस एस एल चाहिए. टी एल एस / एस एस एल "
+#~ "समर्थन नहीं मिला।"
+
+#  IM Convo trans options
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "आईएम वार्तालाप विंडो"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "कृपया चुने हुए समूह के लिए नया नाम भरें।"
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "कोनसा आइ डी क्रियांवित करें?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "रगों पर ध्यान न दें(_o)"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "(1 सन्देश)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "कृपया उपयोगकर्ता का नाम डालिए जिन्हे आप आमंत्रित करना चाहते हैं। अगर आप चाहे तो "
+#~ "आमंत्रण संदेश भी भेज सकते हैं।"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "बड्डी सूची नहीं ला पाया"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "आप जल्दी डिसकनेक्ट हो जाएंगे। जब तक यह ठीक होगा आप टी औ सी का प्रयोग करना चाहेंगे। "
+#~ "अपडेट्स के लिए %s देखें।"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "बड्डी चुनिये"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "सर्वर की जानकारी नहीं मिली"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "पढ़ने में त्रुटि"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "सर्वर कनेक्ट करें"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "वार्तालाप में जुड़ने में असफल"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s को देख रहा है"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s को कनेक्ट असफल"
+
+#~ msgid "Signon: %s"
+#~ msgstr "साइन-औन: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "%s फा़इल लिखने में असमर्थ।"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "%s फा़इल पढ़ने में असमर्थ।"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "संदेश बहुत लम्बा है, आखिर के %s बाइट काटें गये हैं।"
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s ने अभी लॉग-इन किया है"
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s के लिए चेतावनी पर पाबंदी है।"
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "एक संदेश को फैंक दिया गया, आप सवर्र की गति सीमा का उलंघन कर रहें है।"
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%s में चैट उपलब्ध नहीं है।"
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "आप %s को संदेश बहुत तेज़ी से भेज रहें हैं।"
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत बड़ा था।"
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत तेज़ भेजा गया था।"
+
+#~ msgid "Failure."
+#~ msgstr "असफलता।"
+
+#~ msgid "Too many matches."
+#~ msgstr "बहुत सारी उपयुक्तियां"
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "और अधिक क्वालीफायर्स की आवशयकता है।"
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "डिर सेवा अस्थाई रुप से उपलब्ध नहीं है।"
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "इमेल का देखना सीमाबद्ध किया गया।"
+
+#~ msgid "Keyword ignored."
+#~ msgstr "कुंजीशब्द कि अपेक्षा हुई"
+
+#~ msgid "No keywords."
+#~ msgstr "कोइ कुंजीशब्द नहीं।"
+
+#~ msgid "User has no directory information."
+#~ msgstr "उपयोगकर्ता के पास कोइ डायरक्ट्री की जानकारी नहीं है।"
+
+#~ msgid "Country not supported."
+#~ msgstr "देश समर्थित नहीं है"
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "अज्ञात असफलता: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "अवैध उपनाम या पासवर्ड"
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "यह सेवा अस्थाई तोर से उपलब्ध नहीं है।"
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "आपका चेतावनी स्तर लॉग-इन करने के लिए बहुत ऊँचा है।"
+
+#~ 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 ""
+#~ "आप लगातार जल्दी-जल्दी कनेक्ट और डिसकनेक्ट हो रहें हैं। दस मिनट प्रतीक्षा करें और फिर "
+#~ "प्रयास करें। अगर आप प्रयास जारी रखेंगे तो आपको और ज़्यादा प्रतीक्षा करनी पड़ेगी।"
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "एक अज्ञात साइन-औन त्रुटी हुइ: %s।"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "एक अज्ञात त्रुटी, %d , हुआ है। जानकारी: %s"
+
+#, fuzzy
+#~ msgid "Invalid Groupname"
+#~ msgstr "अवैध समूह-नाम"
+
+#~ msgid "Connection Closed"
+#~ msgstr "कनेक्शन बंद हो गया"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "उत्तर कि प्रतीक्षा कर रहें हैं"
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "टी औ सी ठहर कर वापस आया। अब आप संदेश भेज सकतें हैं।"
+
+#~ msgid "Password Change Successful"
+#~ msgstr "पासवर्ड बदलने में सफल"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "डिर जानकारी लायें"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "डिर जानकारी दृढ़ करें..."
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "%s को खोल नहीं पाया लिखने के लिए!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "फा़इल हसतांत्रण विफल; शायद दूसरी और से रद्द हुआ।"
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "हसतांतरण करने के लिए कनेक्ट नहीं कर पाया।"
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "फा़इल का हैडर लिख नहीं पाया। यह फा़इन हसतांत्रित नहीं होगी।"
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "अइकॉन इस तरह संचित करें..."
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s आपसे फा़इल भेजने का अनुरोध कर रहें हैं"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "टीऔसी प्रोटोकॉल प्लगइन"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "उपयोगकर्ता %s हेतु जानकारी उपलब्ध नहीं"
+
+#~ msgid "%s Options"
+#~ msgstr "%s के विकल्प"
+
+#~ msgid "Proxy Options"
+#~ msgstr "प्रोक्सी विकल्प"
+
+#~ msgid "By log size"
+#~ msgstr "लॉग आकार द्वारा"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "कड़ी को ब्राउज़र में खोलें(_O)"
+
+#, fuzzy
+#~ msgid "ST_UN server:"
+#~ msgstr "सर्वर:(_S)"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "चित्र संचित करें"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "शोर्टकट"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "जब संदेश मिलें तो विंडो चमकाएँ (_F)"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "उसी नाम का एक फोल्डर पहले से मोजूद है"
 
@@ -15232,13 +16152,6 @@ msgstr ""
 #~ msgstr "क्या आप निश्चिता से \"%s\" अनुपस्थित संदेश को मिटाना चाहते है?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s पे %s (%s)"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "संदेश भेजें"
 
@@ -15386,9 +16299,6 @@ msgstr ""
 #~ msgid "Invalid screen name"
 #~ msgstr "अवैध उपयोगकर्ता-नाम"
 
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "बहुत बुरा (भेजने वाला)"
 
@@ -15449,10 +16359,6 @@ msgstr ""
 #~ msgstr "उपयोगकर्ता है %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "क्या आप इस बड्डी को बड्डी सूची मे डालना चाहतें हैं?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "फाइल कार्यवाही में गलती"
 
@@ -15461,10 +16367,6 @@ msgstr ""
 #~ msgstr "%s ने अभी लॉग-इन किया है"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "कनेक्शन बनाने में त्रुटि"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "ऐ आई एम में लॉगिन करने में असमर्थ"
 
@@ -15584,18 +16486,9 @@ msgstr ""
 #~ msgstr "अभी है"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "संदेश(_M)"
 
-#  And now for the buttons
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "खाता:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "कनेक्शन टूटने की त्रुटियां छुपाएं"
 
@@ -15758,13 +16651,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>वस्तुस्थिति:</b> ओफलाइन"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>विवरण:</b> डरावना"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -15865,9 +16751,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "बेकार(_I)"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "बेकारी से वापस आयें(_n)"
-
 #~ msgid "Pounce Action"
 #~ msgstr "झपटे कि क्रिया"
 
@@ -16158,8 +17041,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "जब ऐसा होता है तब टी औ सी किसी भी संदेश पर ध्यान नहीं देगा और आपके संदेश भेजने पर वह "
 #~ "आपको लात भी मार सकता है। गेम कुछ भी जाने से रोक देगा। यह केवल अस्थाई है, कृपया संयम "
@@ -16177,8 +17060,8 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "समान्य प्रमाणिकरण असफल हो गया है। इसका मतलब है कि या तो आपका पासवर्ड गलत है या "
 #~ "याहू! कि प्रमाणिकरण प्रणाली बदल गयी है। गेम अब वैब मेसंजर प्रमाणिकरण का प्रयोग करके "
@@ -16206,9 +17089,6 @@ msgstr ""
 #~ msgstr[0] "(1 सन्देश)"
 #~ msgstr[1] "(1 सन्देश)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 सन्देश)"
-
 #, fuzzy
 #~ msgid "Default auto-away"
 #~ msgstr "स्वतः अनुपस्थित"
@@ -16322,9 +17202,6 @@ msgstr ""
 #~ msgid "Away title: "
 #~ msgstr "अनुपस्थिति / शीर्षक:"
 
-#~ msgid "Buddy List Error"
-#~ msgstr "बड्डी सूची त्रुटि"
-
 #~ msgid "Unable to send message. The message is too large."
 #~ msgstr "संदेश भेजने में असफल। संदेश बहुत बढ़ा है।"
 
@@ -16460,9 +17337,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "चुने हुए उपयोगकर्ता को संदेश भेजें"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "चुने हुए बड्डी की जानकारी लाऐं"
-
 #~ msgid "_Chat"
 #~ msgstr "चैट(_C)"
 
@@ -16693,9 +17567,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "सारांश"
 
-#~ msgid "Message Text"
-#~ msgstr "सन्देश टेक्स्ट्"
-
 #~ msgid "Away Messages"
 #~ msgstr "अनुपस्थिति संदेश"
 
@@ -16755,8 +17626,8 @@ msgstr ""
 #~ msgstr "पसंद लोड करने में असमर्थ"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
 #~ "गेम आपकी पसंदों को लोड नहीं कर पाया क्योंकि वह पुरानी रचना में है जोकि अब प्रयोग में "
@@ -16795,9 +17666,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "जीजी वाचनालय में नाजु़क त्रुटी\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "सर्वर को पींग नहीं कर पाया"
-
 #~ msgid "Send as message"
 #~ msgstr "संदेश कि तरह भेजें"
 
@@ -16862,15 +17730,15 @@ msgstr ""
 #~ msgstr "डायरेक्टरी तक पहुंच नहीं पाया"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "गेम डायरेक्टरी को खोज नहीं सका क्योंकि वह डायरेक्टरी सवर्र से कनेक्ट नहीं कर पाया। "
 #~ "कृप्या कुछ समय पशचात प्रयास करें।"
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
 #~ "गेम पासवर्ड बदलने में विफल रहा क्योंकि गाडू-गाडू सवर्र से कनेक्ट करते समय त्रुटी हुई। कृप्या "
 #~ "कुछ समय पशचात प्रयास करें।"
@@ -16882,8 +17750,8 @@ msgstr ""
 #~ msgstr "उपयोकर्ता प्रोफाइल लाने में असमर्थ।"
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "गेम उपयोकर्ता प्रोफाइल लाने में असमर्थ रहा क्योंकि वह डायरेक्टरी सवर्र से कनेक्ट नहीं कर "
 #~ "पाया। कृप्या कुछ समय पशचात प्रयास करें।"
@@ -17003,9 +17871,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s लॉग-इन कर चुका है।"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ने लॉग आउट किया।"
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -17023,9 +17888,6 @@ msgstr ""
 #~ "%s ने %s को %s चेट कक्ष में आमन्त्रित किया\n"
 #~ "<b>%s</b>"
 
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "माफ कीजीएगा, कुछ देर के लिए में बाहर गया था!"
-
 #~ msgid ""
 #~ "Unable to guess the image type based on the file extension supplied.  "
 #~ "Defaulting to PNG."
diff --git a/po/hu.po b/po/hu.po
index 63d3ba51ce..807d49c155 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,14 +5,15 @@
 #
 # Zoltan Sutto <suttozoltan@chello.hu>, 2003.
 # Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006, 2007, 2008, 2009.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-25 03:23+0100\n"
-"PO-Revision-Date: 2009-02-25 03:21+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
-"Language-Team: Hungarian <gnome@fsf.hu>\n"
+"POT-Creation-Date: 2009-08-14 20:04+0200\n"
+"PO-Revision-Date: 2009-08-14 19:58+0200\n"
+"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
+"Language-Team: Hungarian <gnome at gnome dot hu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,7 +44,8 @@ msgstr ""
 "Használat: %s [KAPCSOLÓ]…\n"
 "\n"
 "  -c, --config=KÖNYVTÁR  A KÖNYVTÁR használata a beállítófájlokhoz\n"
-"  -d, --debug         hibakereső üzenetek kiírása a szabványos hibakimenetre\n"
+"  -d, --debug         hibakereső üzenetek kiírása a szabványos "
+"hibakimenetre\n"
 "  -h, --help          ezen súgó megjelenítése és kilépés\n"
 "  -n, --nologin       ne jelentkezzen be automatikusan\n"
 "  -v, --version       az aktuális verzió megjelenítése és kilépés\n"
@@ -609,19 +611,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Küldés ennek"
 
-msgid "Invite message"
-msgstr "Meghívóüzenet"
-
-msgid "Invite"
-msgstr "Meghívás"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Adja meg a meghívandó partner nevét,\n"
-"egy elhagyható meghívóüzenettel együtt."
-
 msgid "Conversation"
 msgstr "Társalgás"
 
@@ -880,6 +869,39 @@ msgstr "Minden társalgás"
 msgid "System Log"
 msgstr "Rendszernapló"
 
+msgid "Calling ... "
+msgstr "Hívás…"
+
+msgid "Hangup"
+msgstr "Lerakás"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Elfogadás"
+
+msgid "Reject"
+msgstr "Visszautasítás"
+
+msgid "Call in progress."
+msgstr "Hívás folyamatban."
+
+msgid "The call has been terminated."
+msgstr "A hívás befejezve."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s beszélni szeretne Önnel."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s nem támogatott típusú médiaátvitelt próbál indítani."
+
+msgid "You have rejected the call."
+msgstr "Visszautasította a hívást."
+
+msgid "call: Make an audio call."
+msgstr "call: Hanghívás kezdeményezése."
+
 msgid "Emails"
 msgstr "E-mailek"
 
@@ -914,6 +936,9 @@ msgstr "Folytatás"
 msgid "IM"
 msgstr "Azonnali üzenet"
 
+msgid "Invite"
+msgstr "Meghívás"
+
 msgid "(none)"
 msgstr "(nincs)"
 
@@ -1117,7 +1142,6 @@ msgstr "%s távol van. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s egy üzenetet küldött. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ismeretlen figyelmeztetési esemény. Kérjük jelentse ezt!"
 
@@ -1527,6 +1551,31 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Lastlog bővítmény."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"TinyURL lekérése…"
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "TinyURL készítése csak a legalább ilyen hosszú URL-címekhez"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (vagy más) címelőtag"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL bővítmény"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"URL-címeket tartalmazó üzenetek fogadásakor URL-rövidítés a másolás "
+"megkönnyítéséhez"
+
 msgid "accounts"
 msgstr "fiókok"
 
@@ -1627,41 +1676,40 @@ msgstr "Elfogadja a következő tanúsítványát: %s?"
 msgid "SSL Certificate Verification"
 msgstr "SSL tanúsítvány-ellenőrzés"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Elfogadás"
-
-msgid "Reject"
-msgstr "Visszautasítás"
-
 msgid "_View Certificate..."
 msgstr "_Tanúsítvány megjelenítése…"
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
-"A(z) „%s” által bemutatott tanúsítvány saját aláírású. Nem ellenőrizhető "
-"automatikusan."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "A következőhöz bemutatott tanúsítványlánc nem érvényes: %s."
+"A(z) „%s” által bemutatott tanúsítvány a következőtől származónak mondja "
+"magát: „%s”. Ez azt jelentheti, hogy a kívánttól eltérő szolgáltatáshoz "
+"kapcsolódik."
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL tanúsítványhiba"
 
 msgid "Invalid certificate chain"
 msgstr "Érvénytelen tanúsítványlánc"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1670,6 +1718,21 @@ msgstr ""
 "A gyökértanúsítványok adatbázisa nem érhető el, így ez a tanúsítvány nem "
 "ellenőrizhető."
 
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"A(z) „%s” által bemutatott tanúsítvány saját aláírású. Nem ellenőrizhető "
+"automatikusan."
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "A következőhöz bemutatott tanúsítványlánc nem érvényes: %s."
+
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1688,19 +1751,6 @@ msgstr ""
 msgid "Invalid certificate authority signature"
 msgstr "A hitelesítésszolgáltató aláírása érvénytelen"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"A(z) „%s” által bemutatott tanúsítvány a következőtől származónak mondja "
-"magát: „%s”. Ez azt jelentheti, hogy a kívánttól eltérő szolgáltatáshoz "
-"kapcsolódik."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1736,6 +1786,8 @@ msgstr "+++ %s belépett"
 msgid "+++ %s signed off"
 msgstr "+++ %s kilépett"
 
+#. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -1782,6 +1834,17 @@ msgstr "%s elhagyta a szobát."
 msgid "%s left the room (%s)."
 msgstr "%s elhagyta a szobát (%s)."
 
+msgid "Invite to chat"
+msgstr "Meghívás csevegésre"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy "
+"tetszőleges meghívóüzenettel együtt."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Nem hozható létre kapcsolat: %s"
@@ -1913,6 +1976,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "%s átvitelének megkezdése a következőtől: %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "<A HREF=\"file://%s\">%s</A> fájl átvitele befejeződött"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "%s fájl átvitele befejeződött"
 
@@ -2126,6 +2193,9 @@ msgstr "<font color=\"red\"><b>A fájl olvasása sikertelen: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATIKUS VÁLASZ>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Hiba a konferencia létrehozásakor."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "A(z) %s programot használja, de a bővítmény a következőt igényli: %s."
@@ -2530,13 +2600,13 @@ msgstr "Felveszi más azonnaliüzenő-kliensek naplóit a naplómegjelenítőbe.
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Naplók megjelenítésekor ez a bővítmény felveszi más azonnali üzenők naplóit. "
-"Jelenleg a következők támogatottak: Adium, MSN Messenger és Trillian.\n"
+"Jelenleg a következők támogatottak: Adium, MSN Messenger, aMSN és Trillian.\n"
 "\n"
 "FIGYELMEZTETÉS: Ez a bővítmény még alfa minőségű kód és gyakran "
 "összeomolhat. Csak saját felelősségére használja!"
@@ -2585,11 +2655,11 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "A kilépett felhasználónak küldött üzenetek mentése figyelmeztetésként."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "A további üzenetek figyelmeztetésként kerülnek mentésre. A figyelmeztetést a "
-"Partnerfigyelmeztetés párbeszédablakban szerkesztheti/törölheti."
+"„Partnerfigyelmeztetés” párbeszédablakban szerkesztheti/törölheti."
 
 #, c-format
 msgid ""
@@ -2619,6 +2689,34 @@ msgstr "Offline üzenetek mentése figyelmeztetésben"
 msgid "Do not ask. Always save in pounce."
 msgstr "Ne kérdezzen. Mindig mentsen figyelmeztetésben."
 
+msgid "One Time Password"
+msgstr "Eldobható jelszó"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Eldobható jelszó támogatása"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "A jelszavak egyszeri használatának kikényszerítése."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Lehetővé teszi fiókonként kikényszeríteni, hogy a nem mentett jelszavak csak "
+"egy sikeres csatlakozáshoz legyenek felhasználva.\n"
+"Megjegyzés: a fiókjelszavakat ennek működéséhez nem szabad menteni."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2813,14 +2911,14 @@ msgstr ""
 "akkor telepítse az ActiveTCL-t a http://www.activestate.com címről\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Az Apple Bonjour For Windows eszközkészlet nem található, további "
+"Az Apple „Bonjour For Windows” eszközkészlet nem található, további "
 "információkat a http://d.pidgin.im/BonjourWindows oldalon találhat."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Nem lehetséges a bejövő azonnali üzenő kapcsolatokat figyelni\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "A bejövő azonnaliüzenő-kapcsolatok figyelése nem lehetséges"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2872,14 +2970,17 @@ msgstr "%s bezárta a társalgást."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nem küldhető el az üzenet, a társalgás nem kezdhető el."
 
-msgid "Cannot open socket"
-msgstr "Nem nyitható meg a foglalat"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nem lehet létrehozni a foglalatot: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Nem köthető a foglalat a porthoz"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Nem köthető a foglalat a porthoz: %s"
 
-msgid "Could not listen on socket"
-msgstr "Nem lehet figyelni a foglalatot"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Nem lehet figyelni a foglalaton: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Hiba a helyi mDNSResponderrel végzett kommunikációban."
@@ -2928,14 +3029,14 @@ msgstr "Partnerlista mentése…"
 msgid "Load buddylist from file..."
 msgstr "Partnerlista betöltése fájlból…"
 
-msgid "Fill in the registration fields."
-msgstr "Töltse ki a regisztrációs mezőket."
+msgid "You must fill in all registration fields"
+msgstr "Az összes regisztrációs mezőt ki kell töltenie"
 
-msgid "Passwords do not match."
-msgstr "A jelszavak nem egyeznek."
+msgid "Passwords do not match"
+msgstr "A jelszavak nem egyeznek"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Nem regisztrálható új fiók. Hiba történt.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Nem regisztrálható új fiók. Ismeretlen hiba történt."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Az új Gadu-Gadu fiók regisztrálva"
@@ -2946,14 +3047,14 @@ msgstr "A regisztráció sikeresen befejeződött!"
 msgid "Password"
 msgstr "Jelszó"
 
-msgid "Password (retype)"
-msgstr "Jelszó (megerősítés)"
+msgid "Password (again)"
+msgstr "Jelszó (még egyszer)"
 
-msgid "Enter current token"
-msgstr "Adja meg az aktuális jelsort"
+msgid "Enter captcha text"
+msgstr "Adja meg a captcha szövegét"
 
-msgid "Current token"
-msgstr "Aktuális jelsor"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Új Gadu-Gadu fiók regisztrálása"
@@ -3006,6 +3107,15 @@ msgstr "A jelszó sikeresen megváltoztatva!"
 msgid "Current password"
 msgstr "Jelenlegi jelszó"
 
+msgid "Password (retype)"
+msgstr "Jelszó (megerősítés)"
+
+msgid "Enter current token"
+msgstr "Adja meg az aktuális jelsort"
+
+msgid "Current token"
+msgstr "Aktuális jelsor"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Adja meg a jelenlegi jelszavát és az új jelszót az UIM-hez: "
 
@@ -3019,6 +3129,7 @@ msgstr "Válasszon egy csevegést a következő partnerhez: %s"
 msgid "Add to chat..."
 msgstr "Felvétel csevegéshez…"
 
+#. Global
 msgid "Available"
 msgstr "Elérhető"
 
@@ -3052,8 +3163,8 @@ msgstr "Nem találhatók megfelelő felhasználók"
 msgid "There are no users matching your search criteria."
 msgstr "Nincsenek a keresési feltételnek megfelelő felhasználók."
 
-msgid "Unable to read socket"
-msgstr "A foglalatot nem lehet olvasni"
+msgid "Unable to read from socket"
+msgstr "A foglalatból nem lehet olvasni"
 
 msgid "Buddy list downloaded"
 msgstr "A partnerlista letöltve"
@@ -3067,8 +3178,14 @@ msgstr "A partnerlista feltöltve"
 msgid "Your buddy list was stored on the server."
 msgstr "A partnerlista tárolva a kiszolgálón."
 
-msgid "Connection failed."
-msgstr "A kapcsolódás meghiúsult."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Kapcsolódva"
+
+msgid "Connection failed"
+msgstr "Kapcsolódás sikertelen"
 
 msgid "Add to chat"
 msgstr "Felvétel csevegéshez"
@@ -3076,14 +3193,23 @@ msgstr "Felvétel csevegéshez"
 msgid "Chat _name:"
 msgstr "Csevegés _neve:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Nem oldható fel a gépnév („%s”): %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Kapcsolódás"
+
 msgid "Chat error"
 msgstr "Csevegéshiba"
 
 msgid "This chat name is already in use"
 msgstr "Ez a csevegésnév már használatban van"
 
-msgid "Not connected to the server."
-msgstr "Nincs kapcsolat a kiszolgálóval."
+msgid "Not connected to the server"
+msgstr "Nincs kapcsolat a kiszolgálóval"
 
 msgid "Find buddies..."
 msgstr "Partnerek keresése…"
@@ -3124,6 +3250,9 @@ msgstr "Népszerű lengyel azonnali üzenő"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu felhasználó"
 
+msgid "GG server"
+msgstr "GG kiszolgáló"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ismeretlen parancs: %s"
@@ -3138,7 +3267,7 @@ msgstr "Nincs beállítva téma"
 msgid "File Transfer Failed"
 msgstr "A fájlátvitel meghiúsult"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Nem nyitható meg figyelőport."
 
 msgid "Error displaying MOTD"
@@ -3154,8 +3283,16 @@ msgstr "Nincs MOTD társítva ehhez a kapcsolathoz."
 msgid "MOTD for %s"
 msgstr "MOTD a következőhöz: %s"
 
-msgid "Server has disconnected"
-msgstr "A kiszolgáló bontotta a kapcsolatot"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Elveszett a kapcsolat a kiszolgálóhoz: %s"
 
 msgid "View MOTD"
 msgstr "MOTD megjelenítése"
@@ -3166,25 +3303,23 @@ msgstr "Cs_atorna:"
 msgid "_Password:"
 msgstr "_Jelszó:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "Az IRC becenevek nem tartalmazhatnak szóközt"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Kapcsolódás"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "Az IRC becenevek és a kiszolgálónév nem tartalmazhatnak szóközt"
 
 msgid "SSL support unavailable"
 msgstr "Az SSL támogatás nem érhető el"
 
-msgid "Couldn't create socket"
-msgstr "Nem sikerült létrehozni a foglalatot"
+msgid "Unable to connect"
+msgstr "Nem lehet kapcsolódni"
 
-msgid "Couldn't connect to host"
-msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Nem lehet csatlakozni: %s"
 
-msgid "Read error"
-msgstr "Olvasási hiba"
+#, c-format
+msgid "Server closed the connection"
+msgstr "A kiszolgáló lezárta a kapcsolatot"
 
 msgid "Users"
 msgstr "Felhasználók"
@@ -3342,7 +3477,7 @@ msgstr "%s kirúgta Önt: (%s)"
 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "%s kizárta (%s)"
+msgstr "%s kirúgta (%s)"
 
 #, c-format
 msgid "mode (%s %s) by %s"
@@ -3365,6 +3500,16 @@ msgstr ""
 "Az Ön által választott fióknevet a kiszolgáló visszautasította. Valószínűleg "
 "érvénytelen karaktereket tartalmaz."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "A becenév („%s”) már használatban van."
+
+msgid "Nickname in use"
+msgstr "A becenév használatban van"
+
 msgid "Cannot change nick"
 msgstr "A becenév nem változtatható meg"
 
@@ -3609,13 +3754,13 @@ msgstr "Az eseti parancs meghiúsult"
 msgid "execute"
 msgstr "végrehajtás"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek "
-"támogatása nem található."
+"A kiszolgáló megköveteli a TLS/SSL használatát, de ezek támogatása nem "
+"található."
 
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "Titkosítást kér, de a TLS/SSL támogatása nem található."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Megköveteli a titkosítást, de a TLS/SSL támogatás nem található."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
@@ -3632,17 +3777,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Egyszerű szöveges hitelesítés"
 
-msgid "Invalid response from server."
-msgstr "Érvénytelen válasz a kiszolgálótól."
+msgid "SASL authentication failed"
+msgstr "A SASL hitelesítés meghiúsult"
+
+msgid "Invalid response from server"
+msgstr "Érvénytelen válasz a kiszolgálótól"
 
 msgid "Server does not use any supported authentication method"
 msgstr "A kiszolgáló nem használ egyetlen támogatott hitelesítési eljárást sem"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Titkosítást igényel, de az nem áll rendelkezésre ezen a kiszolgálón."
+
 msgid "Invalid challenge from server"
 msgstr "Érvénytelen hívás a kiszolgálótól"
 
-msgid "SASL error"
-msgstr "SASL hiba"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL hiba: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "A BOSH kapcsolatkezelő megszakította a munkamenetét."
+
+msgid "No session ID given"
+msgstr "Nincs megadva munkamenet-azonosító"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "A BOSH protokoll verziója nem támogatott"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Nem hozható létre kapcsolat a kiszolgálóval"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Nem hozható létre kapcsolat a következő kiszolgálóval: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Az SSL kapcsolat hozható létre"
 
 msgid "Full Name"
 msgstr "Teljes név"
@@ -3659,6 +3830,11 @@ msgstr "URL"
 msgid "Street Address"
 msgstr "Utca"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "További cím"
 
@@ -3710,168 +3886,22 @@ msgstr "Kliens"
 msgid "Operating System"
 msgstr "Operációs rendszer"
 
-# fixme: innentől egy jó darabon xmpp protokollkiegészítések nevei vannak, lásd: http://www.xmpp.org/extensions/
-msgid "Last Activity"
-msgstr "Utolsó művelet"
-
-msgid "Service Discovery Info"
-msgstr "Szolgáltatásfeltérképezési információk"
-
-msgid "Service Discovery Items"
-msgstr "Szolgáltatásfeltérképezési elemek"
-
-msgid "Extended Stanza Addressing"
-msgstr "Kibővített kifejezéscímzés"
-
-msgid "Multi-User Chat"
-msgstr "Többfelhasználós csevegés"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Többfelhasználós csevegés kibővített jelenlét-információi"
-
-msgid "In-Band Bytestreams"
-msgstr "Beágyazott bájtsorozat"
-
-msgid "Ad-Hoc Commands"
-msgstr "Eseti parancsok"
-
-msgid "PubSub Service"
-msgstr "PubSub szolgáltatás"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 bájtsorozat"
-
-msgid "Out of Band Data"
-msgstr "Külső adatok"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-# fixme: mi a rák ez?
-msgid "In-Band Registration"
-msgstr "Beágyazott regisztráció"
-
-msgid "User Location"
-msgstr "Felhasználó helye"
-
-msgid "User Avatar"
-msgstr "Felhasználói avatar"
-
-msgid "Chat State Notifications"
-msgstr "Csevegésállapot-értesítések"
-
-msgid "Software Version"
-msgstr "Szoftververzió"
-
-msgid "Stream Initiation"
-msgstr "Adatátvitel kezdeményezése"
-
-msgid "File Transfer"
-msgstr "Fájlátvitel"
-
-msgid "User Mood"
-msgstr "Felhasználó hangulata"
-
-msgid "User Activity"
-msgstr "Felhasználói tevékenység"
-
-msgid "Entity Capabilities"
-msgstr "Egyed képességei"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Titkosított munkamenet-egyeztetések"
-
-msgid "User Tune"
-msgstr "Hallgatott zene"
-
-msgid "Roster Item Exchange"
-msgstr "Partnerlista-elemek cseréje"
-
-msgid "Reachability Address"
-msgstr "Elérhetőségi cím"
-
-msgid "User Profile"
-msgstr "Felhasználói profil"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle hang"
-
-msgid "User Nickname"
-msgstr "Felhasználó beceneve"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle videó"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Tértivevények"
-
-msgid "Public Key Publishing"
-msgstr "Nyilvános kulcs közzététele"
-
-msgid "User Chatting"
-msgstr "Csevegőszobák"
-
-msgid "User Browsing"
-msgstr "Böngészett oldalak"
-
-msgid "User Gaming"
-msgstr "Játékok"
-
-msgid "User Viewing"
-msgstr "Videók"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Kifejezéstitkosítás"
-
-msgid "Entity Time"
+msgid "Local Time"
 msgstr "Helyi idő"
 
-msgid "Delayed Delivery"
-msgstr "Késleltetett kézbesítés"
-
-msgid "Collaborative Data Objects"
-msgstr "Együttműködési adatobjektumok"
-
-msgid "File Repository and Sharing"
-msgstr "Fájllerakat és -megosztás"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN szolgáltatásfeltérképezés a Jingle-höz"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Egyszerűsített titkosított munkamenet-egyeztetés"
-
-# fixme: idáig egy jó darabon xmpp protokollkiegészítések nevei voltak, lásd: http://www.xmpp.org/extensions/
-msgid "Hop Check"
-msgstr "Ugrásellenőrzés"
-
-msgid "Capabilities"
-msgstr "Képességek"
-
 msgid "Priority"
 msgstr "Prioritás"
 
 msgid "Resource"
 msgstr "Erőforrás"
 
+#, c-format
+msgid "%s ago"
+msgstr "ennyi ideje: %s"
+
+msgid "Logged Off"
+msgstr "Kijelentkezett"
+
 msgid "Middle Name"
 msgstr "Középső név"
 
@@ -3893,14 +3923,12 @@ msgstr "Rejtettség visszavonása"
 msgid "Temporarily Hide From"
 msgstr "Ideiglenesen elrejt"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Jelenlét-értesítés törlése"
 
 msgid "(Re-)Request authorization"
 msgstr "Engedélyezés (újra)kérése"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4039,28 +4067,24 @@ msgstr "Válassza ki a lekérdezendő konferenciakiszolgálót"
 msgid "Find Rooms"
 msgstr "Szobák keresése"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Titkosítást igényel, de az nem áll rendelkezésre ezen a kiszolgálón."
+msgid "Affiliations:"
+msgstr "Kapcsolatok:"
 
-msgid "Write error"
-msgstr "Írási hiba"
+msgid "No users found"
+msgstr "Nem találhatók felhasználók"
 
-msgid "Ping timeout"
-msgstr "Ping időtúllépése"
+msgid "Roles:"
+msgstr "Szerepek:"
 
-msgid "Read Error"
-msgstr "Olvasási hiba"
+msgid "Ping timed out"
+msgstr "A ping túllépte az időkorlátot"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Nem hozható létre kapcsolat a következő kiszolgálóval:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Nem lehet létrehozni foglalatot"
+"Nem található alternatív XMPP kapcsolódási módszer, miután a közvetlen "
+"kapcsolódás meghiúsult."
 
 msgid "Invalid XMPP ID"
 msgstr "Érvénytelen XMPP azonosító"
@@ -4068,6 +4092,9 @@ msgstr "Érvénytelen XMPP azonosító"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Érvénytelen XMPP azonosító. A tartományt be kell állítani."
 
+msgid "Malformed BOSH URL"
+msgstr "Rosszul formázott BOSH URL"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s regisztrációja sikeres"
@@ -4092,9 +4119,6 @@ msgstr "A regisztráció megszüntetése sikeres"
 msgid "Unregistration Failed"
 msgstr "A regisztráció megszüntetése sikertelen"
 
-msgid "Already Registered"
-msgstr "Már regisztrálva van"
-
 msgid "State"
 msgstr "Állam"
 
@@ -4107,6 +4131,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Dátum"
 
+msgid "Already Registered"
+msgstr "Már regisztrálva van"
+
 msgid "Unregister"
 msgstr "Regisztráció megszüntetése"
 
@@ -4158,6 +4185,12 @@ msgstr "A kiszolgáló nem támogatja a blokkolást"
 msgid "Not Authorized"
 msgstr "Nem engedélyezett"
 
+msgid "Mood"
+msgstr "Hangulat"
+
+msgid "Now Listening"
+msgstr "Most hallgatott"
+
 msgid "Both"
 msgstr "Mindkettő"
 
@@ -4179,12 +4212,6 @@ msgstr "Nincs"
 msgid "Subscription"
 msgstr "Feliratkozás"
 
-msgid "Mood"
-msgstr "Hangulat"
-
-msgid "Now Listening"
-msgstr "Most hallgatott"
-
 msgid "Mood Text"
 msgstr "Hangulatszöveg"
 
@@ -4227,9 +4254,6 @@ msgstr "A jelszava meg lett változtatva."
 msgid "Error changing password"
 msgstr "Hiba a jelszó módosításakor"
 
-msgid "Password (again)"
-msgstr "Jelszó (még egyszer)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP jelszó módosítása"
 
@@ -4423,16 +4447,24 @@ msgid "Unable to ping user %s"
 msgstr "%s felhasználó nem pingelhető"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Nem lehet csörgetni, mivel nem érhető el információ %s felhasználóról."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Nem lehet csörgetni, mivel %s felhasználó kiléphetett."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Nem lehet csörgetni, mivel %s felhasználó nem támogatja azt."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"Nem lehet csörgetni, mivel %s felhasználó nem támogatja azt, vagy most nem "
+"kívánja fogadni a csörgetéseket."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s csörgetése…"
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4444,8 +4476,38 @@ msgid "%s has buzzed you!"
 msgstr "%s megcsörgette!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "%s csörgetése…"
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr ""
+"Nem indítható multimédiás kapcsolat a következőhöz: %s, a JID érvénytelen"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+"Nem indítható multimédiás kapcsolat a következőhöz: %s, a felhasználó nem "
+"érhető el"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Nem indítható multimédiás kapcsolat a következőhöz: %s, nincs feliratkozva a "
+"felhasználó jelenlétére"
+
+msgid "Media Initiation Failed"
+msgstr "A multimédiás kapcsolat indítása sikertelen"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Válassza ki %s azon erőforrását, ahová multimédiás kapcsolatot kíván "
+"indítani."
+
+msgid "Select a Resource"
+msgstr "Válasszon erőforrást"
+
+msgid "Initiate Media"
+msgstr "Multimédiás kapcsolat indítása"
 
 msgid "config:  Configure a chat room."
 msgstr "config:   Csevegőszoba beállítása."
@@ -4466,18 +4528,20 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;felhasználó&gt; [ok]:  Felhasználó kitiltása a szobából."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;felhasználó&gt; &lt;owner|admin|member|outcast|none&gt;: Egy "
-"felhasználó a szobával fennálló kapcsolatának beállítása."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [1. becenév] [2. becenév]"
+"… : Adott kapcsolattal rendelkező felhasználók lekérése vagy felhasználók "
+"kapcsolatának beállítása a szobával."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;felhasználó&gt; &lt;moderator|participant|visitor|none&gt;: "
-"Beállítja a felhasználó szerepét a szobában."
+"role &lt;moderator|participant|visitor|none&gt;: [1. becenév] [2. becenév]"
+"… : Adott szereppel rendelkező felhasználók lekérése vagy a felhasználók "
+"szerepének beállítása a szobával."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;felhasználó&gt; [üzenet]:  Felhasználó meghívása a szobába."
@@ -4538,6 +4602,9 @@ msgstr "Kapcsolatkiszolgáló"
 msgid "File transfer proxies"
 msgstr "Fájlátviteli proxy-k"
 
+msgid "BOSH URL"
+msgstr "BOSH URL"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4576,6 +4643,14 @@ msgstr "XML elemzési hiba"
 msgid "Unknown Error in presence"
 msgstr "Ismeretlen hiba a jelenlétben"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Hiba a(z) %s csevegéshez csatlakozás közben"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Hiba a(z) %s csevegésben"
+
 msgid "Create New Room"
 msgstr "Új szoba létrehozása"
 
@@ -4592,13 +4667,25 @@ msgstr "Sz_oba beállítása"
 msgid "_Accept Defaults"
 msgstr "Alapértel_mezések elfogadása"
 
+msgid "No reason"
+msgstr "Nincs ok"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Hiba a(z) %s csevegéshez csatlakozás közben"
+msgid "You have been kicked: (%s)"
+msgstr "Kirúgták Önt: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Hiba a(z) %s csevegésben"
+msgid "Kicked (%s)"
+msgstr "Kirúgva (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Hiba történt a bejövő adatfolyam átvitelében\n"
+
+msgid "Transfer was closed."
+msgstr "Az átvitel lezárva."
+
+msgid "Failed to open in-band bytestream"
+msgstr "A bejövő adatfolyam megnyitása meghiúsult"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4627,9 +4714,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Válassza ki %s azon erőforrását, ahová fájlt kíván küldeni"
 
-msgid "Select a Resource"
-msgstr "Válasszon erőforrást"
-
 msgid "Edit User Mood"
 msgstr "Felhasználói hangulat szerkesztése"
 
@@ -4926,6 +5010,30 @@ msgstr "Egyéb partnerek"
 msgid "Non-IM Contacts"
 msgstr "Nem azonnali üzenetváltási partnerek"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s kacsintást küldött. <a href='msn-wink://%s'>A lejátszásához kattintson "
+"ide</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s kacsintást küldött, de az nem menthető"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s hangklipet küldött. <a href='audio://%s'>A lejátszásához kattintson ide</"
+"a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s hangklipet küldött, de az nem menthető"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s hangcsevegés-meghívást küldött, ami még nem támogatott."
+
 msgid "Nudge"
 msgstr "Bökés"
 
@@ -5081,8 +5189,28 @@ msgstr ""
 "Az MSN használatához SSL támogatás szükséges. Telepítsen egy támogatott SSL "
 "könyvtárat."
 
-msgid "Failed to connect to server."
-msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A "
+"felhasználóneveknek érvényes e-mail címnek kell lenniük."
+
+msgid "Unable to Add"
+msgstr "Nem sikerült felvenni"
+
+msgid "Authorization Request Message:"
+msgstr "Engedélyezést kérő üzenet:"
+
+msgid "Please authorize me!"
+msgstr "Kérem engedélyezze, hogy felvegyem!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Hiba a profil letöltése közben"
@@ -5273,63 +5401,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live azonosító hitelesítése: érvénytelen válasz"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s érvénytelen csoport."
-
-msgid "Unknown error."
-msgstr "Ismeretlen hiba."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ezen: %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s megbökte!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Ismeretlen hiba (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Ismeretlen hiba (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Nem vehető fel a felhasználó"
 
-msgid "The following users are missing from your addressbook"
-msgstr "A következő felhasználók hiányoznak a címjegyzékéből"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nem lehet felhasználót felvenni ehhez: %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nem lehet letiltani a felhasználót ezen: %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nem lehet engedélyezni a felhasználót ezen: %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nem adható hozzá, mert a partnerlista tele van."
-
+#. Unknown error!
 #, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s érvénytelen passport fiók."
+msgid "Unknown error (%d)"
+msgstr "Ismeretlen hiba (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "A szolgáltatás átmenetileg nem érhető el."
+msgid "The following users are missing from your addressbook"
+msgstr "A következő felhasználók hiányoznak a címjegyzékéből"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "A mobilüzenet nem küldhető el, mert túl hosszú."
 
-msgid "Unable to rename group"
-msgstr "Nem lehet átnevezni a csoportot"
-
-msgid "Unable to delete group"
-msgstr "Nem lehet törölni a csoportot"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5374,9 +5466,6 @@ msgstr "Az üzenet nem küldhető el, mivel ismeretlen kódolási hiba történt
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Az üzenet nem küldhető el, mivel ismeretlen hiba történt."
 
-msgid "Unable to connect"
-msgstr "Nem lehet kapcsolódni"
-
 msgid "Writing error"
 msgstr "Írási hiba"
 
@@ -5391,22 +5480,22 @@ msgstr ""
 "Kapcsolódási hiba a(z) %s kiszolgálótól:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "A protokollt nem támogatja a kiszolgáló."
+msgid "Our protocol is not supported by the server"
+msgstr "A protokollt nem támogatja a kiszolgáló"
 
-msgid "Error parsing HTTP."
-msgstr "Hiba a HTTP feldolgozása közben."
+msgid "Error parsing HTTP"
+msgstr "Hiba a HTTP feldolgozása közben"
 
-msgid "You have signed on from another location."
-msgstr "Bejelentkezett egy másik helyről."
+msgid "You have signed on from another location"
+msgstr "Bejelentkezett egy másik helyről"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Az MSN kiszolgálók átmenetileg nem érhetők el. Kérem várjon és próbálja újra "
 "később."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "Az MSN kiszolgálók átmenetileg leállnak."
+msgid "The MSN servers are going down temporarily"
+msgstr "Az MSN kiszolgálók átmenetileg leállnak"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5436,6 +5525,15 @@ msgstr "Süti küldése"
 msgid "Retrieving buddy list"
 msgstr "Partnerlista fogadása"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s meg szeretné tekinteni az Ön webkameráját, de ez még nem támogatott."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s webkamera-meghívást küldött, ami még nem támogatott."
+
 msgid "Away From Computer"
 msgstr "Nem vagyok a gépnél"
 
@@ -5476,14 +5574,6 @@ msgstr "Az üzenet nem küldhető el, mivel hiba lépett fel a közvetítés kö
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Az üzenet ismeretlen hiba miatt lehet, hogy nem lett elküldve:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s felvette Önt a partnerlistájára."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s eltávolította Önt a partnerlistájáról."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Törli a partnert a címjegyzékből?"
 
@@ -5513,6 +5603,54 @@ msgid "MSN Protocol Plugin"
 msgstr "MSN protokollbővítmény"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s érvénytelen csoport."
+
+msgid "Unknown error."
+msgstr "Ismeretlen hiba."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ezen: %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nem lehet felhasználót felvenni ehhez: %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nem lehet letiltani a felhasználót ezen: %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nem lehet engedélyezni a felhasználót ezen: %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nem adható hozzá, mert a partnerlista tele van."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s érvénytelen passport fiók."
+
+msgid "Service Temporarily Unavailable."
+msgstr "A szolgáltatás átmenetileg nem érhető el."
+
+msgid "Unable to rename group"
+msgstr "Nem lehet átnevezni a csoportot"
+
+msgid "Unable to delete group"
+msgstr "Nem lehet törölni a csoportot"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s felvette Önt a partnerlistájára."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s eltávolította Önt a partnerlistájáról."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Nincs ilyen felhasználó: %s"
 
@@ -5541,6 +5679,8 @@ msgid "Lost connection with server"
 msgstr "A kapcsolat elveszett a kiszolgálóval"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Új levelek"
 
@@ -5579,26 +5719,22 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Kapcsolatok felvétele a kiszolgálóról"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Kapcsolódva"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollhiba, %d. kód: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s A jelszava %d karakter hosszú, ami nagyobb a MySpaceIM esetén várt %d "
-"értéknél. Rövidítse jelszavát a következő címen: http://profileedit.myspace."
-"com/index.cfm?fuseaction=accountSettings.changePassword és próbálkozzon újra."
+"%s A jelszava %zu karakter hosszú, ami hosszabb a maximális %d értéknél. "
+"Rövidítse jelszavát a következő címen: http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword és próbálkozzon újra."
+
+msgid "Incorrect username or password"
+msgstr "Hibás felhasználónév vagy jelszó"
 
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM hiba"
@@ -5606,16 +5742,6 @@ msgstr "MySpaceIM hiba"
 msgid "Invalid input condition"
 msgstr "Érvénytelen bemeneti feltétel"
 
-msgid "Read buffer full (2)"
-msgstr "Az olvasási puffer megtelt (2)"
-
-msgid "Unparseable message"
-msgstr "Értelmezhetetlen üzenet"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "A partner felvétele sikertelen"
 
@@ -5700,6 +5826,15 @@ msgstr "Barátok összesen"
 msgid "Client Version"
 msgstr "Kliensverzió"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Hiba történt a felhasználónév beállításakor. Próbálja újra, vagy a http://"
+"editprofile.myspace.com/index.cfm?fuseaction=profile.username oldalon "
+"állítsa be a felhasználónevét."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM – A felhasználónév elérhető"
 
@@ -5920,9 +6055,6 @@ msgstr "Önmagát nem adhatja hozzá"
 msgid "Master archive is misconfigured"
 msgstr "A főarchívum hibásan van beállítva"
 
-msgid "Incorrect username or password"
-msgstr "Hibás felhasználónév vagy jelszó"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "A megadott felhasználónévhez tartozó kiszolgáló nem ismerhető fel"
 
@@ -5963,8 +6095,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Ismeretlen hiba: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "A bejelentkezés sikertelen (%s)."
+msgid "Unable to login: %s"
+msgstr "Nem lehet bejelentkezni: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6072,9 +6204,6 @@ msgstr "GroupWise konferencia %d"
 msgid "Authenticating..."
 msgstr "Hitelesítés…"
 
-msgid "Unable to connect to server."
-msgstr "Nem lehet a kiszolgálóhoz kapcsolódni."
-
 msgid "Waiting for response..."
 msgstr "Várakozás válaszra…"
 
@@ -6098,24 +6227,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Szeretne csatlakozni a társalgáshoz?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Ki lett jelentkeztetve, mivel bejelentkezett egy másik munkaállomásról."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "Úgy tűnik, %s kilépett, és nem kapta meg az utoljára küldött üzenetet."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
-"Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, "
-"amelyikhez kapcsolódni szeretne."
-
-msgid "Error. SSL support is not installed."
-msgstr "Hiba: az SSL támogatás nincs telepítve."
+"Nem lehet kapcsolódni a kiszolgálóhoz. Adja meg a kiszolgáló címét, amelyhez "
+"kapcsolódni szeretne."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ez a konferencia le lett zárva. További üzenetek már nem küldhetőek."
@@ -6139,25 +6261,32 @@ msgstr "Kiszolgáló címe"
 msgid "Server port"
 msgstr "Kiszolgáló portja"
 
+msgid "Received unexpected response from "
+msgstr "Váratlan válasz érkezett a következőtől: "
+
+#. username connecting too frequently
+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 ""
+"Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha "
+"tovább folytatja, még többet kell majd várnia."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Hiba a kéréskor: "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "Az AOL nem engedélyezi ezen megjelenő név hitelesítését"
+
 msgid "Could not join chat room"
 msgstr "Nem sikerült kapcsolódni a csevegőszobához"
 
 msgid "Invalid chat room name"
 msgstr "Érvénytelen csevegőszobanév"
 
-msgid "Server closed the connection."
-msgstr "A kiszolgáló lezárta a kapcsolatot."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Elveszett a kapcsolat a kiszolgálóhoz:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól."
+msgid "Received invalid data on connection with server"
+msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól"
 
 #. *< type
 #. *< ui_requirement
@@ -6204,7 +6333,7 @@ msgstr "A távoli felhasználóhoz elveszett a kapcsolat:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Érvénytelen adatok érkeztek a kapcsolaton a távoli felhasználótól."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Nem hozható létre kapcsolat a távoli felhasználóval."
 
 msgid "Direct IM established"
@@ -6405,20 +6534,12 @@ msgid "Buddy Comment"
 msgstr "Partnermegjegyzés"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Nem sikerült kapcsolódni a hitelesítési kiszolgálóhoz:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Nem lehet kapcsolódni a hitelesítési kiszolgálóhoz: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Nem sikerült kapcsolódni a BOS kiszolgálóhoz:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nem lehet a BOS kiszolgálóhoz kapcsolódni: %s"
 
 msgid "Username sent"
 msgstr "Felhasználónév elküldve"
@@ -6432,54 +6553,61 @@ msgstr "Kapcsolódás befejezése"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév "
-"érvénytelen. A felhasználóneveknek érvényes e-mail címnek kell lennie, vagy "
-"betűvel kell kezdődniük és betűket, számokat, szóközöket, vagy csak számokat "
+"Nem lehet belépni %s néven, mert a felhasználónév érvénytelen. A "
+"felhasználóneveknek érvényes e-mail címnek kell lennie, vagy betűvel kell "
+"kezdődniük és betűket, számokat, szóközöket, vagy csak számokat "
 "tartalmazhatnak."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Érvénytelen felhasználónév."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Hamarosan megszakadhat a kapcsolat. Ebben az esetben keressen frissítéseket "
+"a következő címen: %s."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nem kérhető le érvényes AIM belépő hash."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nem kérhető le érvényes belépő hash."
 
-msgid "Incorrect password."
-msgstr "Helytelen jelszó."
+msgid "Received authorization"
+msgstr "A hitelesítés fogadva"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "A felhasználónév nem létezik"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "A fiókja jelenleg fel van függesztve."
+msgid "Your account is currently suspended"
+msgstr "A fiókja jelenleg fel van függesztve"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Az AOL azonnali üzenő szolgáltatás átmenetileg nem érhető el."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha "
-"tovább folytatja, még többet kell majd várnia."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A használt kliensprogram verziója túl régi. Kérem töltse le a frissítést a "
 "következő helyről: %s"
 
-msgid "Could Not Connect"
-msgstr "Nem sikerült kapcsolódni"
-
-msgid "Received authorization"
-msgstr "A hitelesítés fogadva"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Ön túl gyakran jelentkezik ki/be. Várjon egy percet és próbálja meg újra. Ha "
+"tovább folytatja, még többet kell majd várnia."
 
-msgid "The SecurID key entered is invalid."
-msgstr "A megadott SecurID kulcs érvénytelen."
+msgid "The SecurID key entered is invalid"
+msgstr "A megadott SecurID kulcs érvénytelen"
 
 msgid "Enter SecurID"
 msgstr "Adja meg a SecurID-t"
@@ -6487,30 +6615,6 @@ msgstr "Adja meg a SecurID-t"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Írja be a hatjegyű számot a digitális képernyőről."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Hamarosan megszakadhat a kapcsolat. Ebbben az esetben keressen frissítéseket "
-"a következő címen: %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Nem kérhető le érvényes AIM belépő hash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Hamarosan megszakad a kapcsolat. Frissítésekért keresse fel a következő "
-"címet: %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Nem kérhető le érvényes belépő hash."
-
 msgid "Password sent"
 msgstr "Jelszó elküldve"
 
@@ -6520,12 +6624,6 @@ msgstr "A kapcsolat nem inicializálható"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Kérem engedélyezze, hogy felvehessem a partnereim közé."
 
-msgid "Authorization Request Message:"
-msgstr "Engedélyezést kérő üzenet:"
-
-msgid "Please authorize me!"
-msgstr "Kérem engedélyezze, hogy felvegyem!"
-
 msgid "No reason given."
 msgstr "Nincs ok megadva."
 
@@ -6660,7 +6758,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, ismeretlen okból."
 msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, ismeretlen okból."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Az üzenetet nem lehet elküldeni: %s"
@@ -6682,6 +6780,9 @@ msgstr "Kapcsolódva ezóta"
 msgid "Member Since"
 msgstr "Tagság kezdete"
 
+msgid "Capabilities"
+msgstr "Képességek"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -6865,17 +6966,14 @@ msgstr "A távollét-üzenet túl hosszú."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
 "Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A "
 "felhasználóneveknek érvényes e-mail címnek kell lenniük, vagy betűvel kell "
-"kezdődniük, és betűket, számokat és szóközöket, vagy csak számokból "
-"állhatnak."
-
-msgid "Unable to Add"
-msgstr "Nem sikerült felvenni"
+"kezdődniük, és betűket, számokat és szóközöket tartalmazhatnak, vagy csak "
+"számokból állhatnak."
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "Nem lehet lekérni a partnerek listáját"
@@ -6893,7 +6991,7 @@ msgstr "Árvák"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "%s partnert nem lehet felvenni, mert túl sok partner van a partnerlistáján. "
@@ -6903,7 +7001,7 @@ msgid "(no name)"
 msgstr "(nincs név)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "A(z) %s partner ismeretlen ok miatt nem adható hozzá."
 
 #, c-format
@@ -7034,6 +7132,7 @@ msgstr "_Keresés"
 msgid "Set User Info (web)..."
 msgstr "Felhasználói információk beállítása (web)…"
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Jelszó módosítása (web)"
 
@@ -7063,6 +7162,9 @@ msgstr "Partner keresése e-mail cím szerint…"
 msgid "Search for Buddy by Information"
 msgstr "Partner keresése információ alapján"
 
+msgid "Use clientLogin"
+msgstr "Kliensbejelentkezés használata"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7253,6 +7355,34 @@ msgstr "Frissítés"
 msgid "Could not change buddy information."
 msgstr "A partnerinformációk nem módosíthatók."
 
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Note"
+msgstr "Megjegyzés"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Partnerfeljegyzés"
+
+msgid "Change his/her memo as you like"
+msgstr "Módosítsa a megjegyzést"
+
+msgid "_Modify"
+msgstr "_Módosítás"
+
+msgid "Memo Modify"
+msgstr "Megjegyzés módosítása"
+
+msgid "Server says:"
+msgstr "A kiszolgáló válasza:"
+
+msgid "Your request was accepted."
+msgstr "A kérés elfogadva."
+
+msgid "Your request was rejected."
+msgstr "A kérés visszautasítva."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u ellenőrzést igényel"
@@ -7564,6 +7694,9 @@ msgstr "<p><b>Köszönetnyilvánítás</b>:<br>\n"
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>Lelkiismeretes tesztelők</b>:<br>\n"
 
+msgid "and more, please let me know... thank you!))"
+msgstr "és sokan mások, köszönjük :)"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>és a háttéremberek...</i><br>\n"
 
@@ -7638,7 +7771,7 @@ msgstr "Kapcsolat-fenntartási időköz (mp)"
 msgid "Update interval (seconds)"
 msgstr "Frissítési időköz (mp)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Nem fejthető vissza a kiszolgáló válasza"
 
 #, c-format
@@ -7663,9 +7796,6 @@ msgstr "Aktiválás szükséges"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Ismeretlen válaszkód bejelentkezéskor (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Nem fejthető vissza a kiszolgáló válasza"
-
 msgid "Requesting captcha"
 msgstr "Captcha kérése"
 
@@ -7699,30 +7829,17 @@ msgstr ""
 "Ismeretlen válaszkód bejelentkezéskor (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Nem lehet kapcsolódni."
-
 msgid "Socket error"
 msgstr "Foglalathiba"
 
-msgid "Unable to read from socket"
-msgstr "A foglalatból nem lehet olvasni"
-
-msgid "Write Error"
-msgstr "Írási hiba"
-
-msgid "Connection lost"
-msgstr "A kapcsolat elveszett"
-
 msgid "Getting server"
 msgstr "Kiszolgáló lekérdezése"
 
 msgid "Requesting token"
 msgstr "Jelsor kérése"
 
-msgid "Couldn't resolve host"
-msgstr "Nem sikerült a kiszolgáló feloldása"
+msgid "Unable to resolve hostname"
+msgstr "Nem oldható fel a gépnév"
 
 msgid "Invalid server or port"
 msgstr "Érvénytelen kiszolgáló vagy port"
@@ -7775,8 +7892,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun parancs"
 
-msgid "Could not decrypt login reply"
-msgstr "Nem fejthető vissza a bejelentkezési válas"
+msgid "Unable to decrypt login reply"
+msgstr "Nem fejthető vissza a bejelentkezési válasz"
 
 msgid "Unknown LOGIN CMD"
 msgstr "Ismeretlen bejelentkezési parancs"
@@ -7795,9 +7912,6 @@ msgstr "Fájlküldés"
 msgid "%d canceled the transfer of %s"
 msgstr "%d megszakította a(z) %s átvitelét"
 
-msgid "Connection closed (writing)"
-msgstr "Kapcsolat lezárva (írás)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Csoport címe:</b> %s<br>"
@@ -7853,17 +7967,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime adminisztrátori bejelentés"
 
-msgid "Connection reset"
-msgstr "Kapcsolat visszaállítva"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Hiba a foglalatból olvasás közben: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Nem lehet a kiszolgálóhoz kapcsolódni"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Bejelentés a következőtől: %s"
@@ -7886,6 +7989,9 @@ msgstr "Hangszórók"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Fájlátvitel"
+
 msgid "Supports"
 msgstr "Támogatja"
 
@@ -8610,9 +8716,6 @@ msgstr "Szervezet"
 msgid "Unit"
 msgstr "Egység"
 
-msgid "Note"
-msgstr "Megjegyzés"
-
 msgid "Join Chat"
 msgstr "Csatlakozás csevegéshez"
 
@@ -8712,6 +8815,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Hálózati statisztika"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping sikertelen"
 
@@ -8776,7 +8882,7 @@ msgstr "Nem támogatott típusú nyilvános kulcs"
 msgid "Disconnected by server"
 msgstr "A kiszolgáló bontotta a kapcsolatot"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Hiba a SILC kiszolgálóhoz kapcsolódás közben"
 
 msgid "Key Exchange failed"
@@ -8788,17 +8894,11 @@ msgstr ""
 "A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás "
 "gombra egy új kapcsolat létrehozásához."
 
-msgid "Connection failed"
-msgstr "Kapcsolódás sikertelen"
-
 msgid "Performing key exchange"
 msgstr "Kulcscsere elvégzése"
 
-msgid "Unable to create connection"
-msgstr "Nem hozható létre kapcsolat"
-
-msgid "Could not load SILC key pair"
-msgstr "Nem sikerült a SILC kulcspárt betölteni"
+msgid "Unable to load SILC key pair"
+msgstr "Nem lehet a SILC kulcspárt betölteni"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -8807,8 +8907,8 @@ msgstr "Kapcsolódás a SILC kiszolgálóhoz"
 msgid "Out of memory"
 msgstr "Elfogyott a memória"
 
-msgid "Cannot initialize SILC protocol"
-msgstr "Nem lehet inicializálni a SILC protokollt"
+msgid "Unable to initialize SILC protocol"
+msgstr "Nem lehet előkészíteni a SILC protokollt"
 
 msgid "Error loading SILC key pair"
 msgstr "Hiba a SILC kulcspár betöltésekor"
@@ -9116,8 +9216,8 @@ msgstr "Minden üzenet digitális aláírása és ellenőrzése"
 msgid "Creating SILC key pair..."
 msgstr "SILC kulcspár létrehozása…"
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Nem hozható létre SILC kulcspár\n"
+msgid "Unable to create SILC key pair"
+msgstr "Nem hozható létre SILC kulcspár"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9212,6 +9312,9 @@ msgstr "Rajzlap"
 msgid "No server statistics available"
 msgstr "Nincsenek elérhető kiszolgálóstatisztikák"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Hiba a SILC kiszolgálóhoz kapcsolódás közben"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Hiba: A verziók különböznek, kérem frissítse a kliensét"
@@ -9253,30 +9356,24 @@ msgstr "Hiba: Érvénytelen süti"
 msgid "Failure: Authentication failed"
 msgstr "Hiba: Hitelesítés sikertelen"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "Nem lehet inicializálni a SILC kliens kapcsolatot"
+msgid "Unable to initialize SILC Client connection"
+msgstr "Nem lehet előkészíteni a SILC klienskapcsolatot"
 
 msgid "John Noname"
 msgstr "Névtelen"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nem sikerült a SILC kulcspárt betölteni: %s"
 
-msgid "Could not write"
-msgstr "Nem sikerült az írás"
-
-msgid "Could not connect"
-msgstr "Nem sikerült kapcsolódni"
-
-msgid "Unknown server response."
-msgstr "Ismeretlen kiszolgálóválasz."
+msgid "Unable to create connection"
+msgstr "Nem hozható létre kapcsolat"
 
-msgid "Could not create listen socket"
-msgstr "Nem sikerült létrehozni a figyelő foglalatot"
+msgid "Unknown server response"
+msgstr "Ismeretlen kiszolgálóválasz"
 
-msgid "Could not resolve hostname"
-msgstr "A gépnév nem oldható fel"
+msgid "Unable to create listen socket"
+msgstr "Nem lehet létrehozni figyelőfoglalatot"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9319,178 +9416,60 @@ msgstr "Felhasználó hitelesítése"
 msgid "Auth Domain"
 msgstr "Tartomány hitelesítése"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s keresése"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Kapcsolódás sikertelen a következőhöz: %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Bejelentkezés: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Nem lehet írni a(z) %s fájlba."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Nem lehet olvasni a(z) %s fájlt."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Az üzenet túl hosszú, az utolsó %s bájt csonkítva."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s jelenleg nincs bejelentkezve."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s figyelmeztetése nincs engedélyezve."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Egy üzenet el lett dobva, Ön túllépte a kiszolgáló átviteli sebességhatárát."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Nem lehet csevegni a következőben: %s."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Túl gyorsan küld üzeneteket a következőnek: %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Nem kapott meg egy üzenetet a következőtől: %s, mert az túl nagy volt."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Nem kapott meg egy üzenetet a következőtől: %s, mert a feladó túl gyorsan "
-"küldte."
-
-#, c-format
-msgid "Failure."
-msgstr "Hiba."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Túl sok találat."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Több feltétel szükséges."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Könyvtárszolgáltatás átmenetileg nem érhető el."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "E-mail keresés korlátozva."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Kulcsszó figyelmen kívül hagyva."
-
-#, c-format
-msgid "No keywords."
-msgstr "Nincsenek kulcsszavak."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "A felhasználó nem rendelkezik címtár-információkkal."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Nem támogatott ország."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Ismeretlen hiba: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Helytelen felhasználónév vagy jelszó."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "A szolgáltatás átmenetileg nem érhető el."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "A figyelmeztetési szintje jelenleg túl magas a bejelentkezéshez."
-
-#, c-format
-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 ""
-"Túl gyakran jelentkezik be/ki. Várjon tíz percet, és próbálja meg újra. Ha "
-"tovább folytatja, akkor még tovább kell majd várnia."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Ismeretlen bejelentkezési hiba történt: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Ismeretlen hiba történt: %d. Információ: %s"
-
-msgid "Invalid Groupname"
-msgstr "Érvénytelen csoportnév"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;szoba&gt;:  Csatlakozás csevegőszobához a Yahoo hálózatán"
 
-msgid "Connection Closed"
-msgstr "Kapcsolat lezárva"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Csatornák listázása a Yahoo hálózatán"
 
-msgid "Waiting for reply..."
-msgstr "Várakozás válaszra…"
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Kérés a felhasználóhoz egy firkálási folyamat indítására"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "A TOC ismét működőképes. Mostantól újra küldhet üzeneteket."
+msgid "Yahoo ID..."
+msgstr "Yahoo azonosító…"
 
-msgid "Password Change Successful"
-msgstr "Jelszó sikeresen megváltoztatva"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! protokollbővítmény"
 
-msgid "_Group:"
-msgstr "_Csoport:"
+msgid "Pager server"
+msgstr "Személyhívó kiszolgáló"
 
-msgid "Get Dir Info"
-msgstr "Könyvtárinformációk lekérése"
+msgid "Pager port"
+msgstr "Személyhívó Port"
 
-msgid "Set Dir Info"
-msgstr "Könyvtárinformációk beállítása"
+msgid "File transfer server"
+msgstr "Fájlátviteli kiszolgáló"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "%s nem nyitható meg írásra!"
+msgid "File transfer port"
+msgstr "Fájlátviteli port"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "A fájlátvitel sikertelen; valószínűleg a másik oldal megszakította."
+msgid "Chat room locale"
+msgstr "Csevegőszoba nyelve"
 
-msgid "Could not connect for transfer."
-msgstr "Az átvitelhez nem sikerült a kapcsolatot létrehozni."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Konferencia- és csevegőszoba-meghívások figyelmen kívül hagyása"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "A fájl fejlécét nem sikerült kiírni. A fájl nem lesz elküldve."
+msgid "Chat room list URL"
+msgstr "Csevegőszobák listájának URL címe"
 
-msgid "Save As..."
-msgstr "Mentés másként…"
+msgid "Yahoo Chat server"
+msgstr "Yahoo csevegőkiszolgáló"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s kéri %s partnert %d fájl fogadására: %s (%.2f %s)%s%s"
-msgstr[1] "%s kéri %s partnert %d fájl fogadására: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo csevegőport"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s egy fájl elküldésére kéri"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo Japán azonosító…"
 
 #. *< type
 #. *< ui_requirement
@@ -9502,12 +9481,11 @@ msgstr "%s egy fájl elküldésére kéri"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC protokollbővítmény"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! Japán protokollbővítmény"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s webkamera-meghívást küldött, ami még nem támogatott."
+msgid "Your SMS was not delivered"
+msgstr "Az SMS nem lett kézbesítve"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Az Ön Yahoo! üzenete nem lett elküldve."
@@ -9533,6 +9511,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Partner felvétele megtagadva"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Érvénytelen adatok érkeztek"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"A fiók zárolva: túl sok meghiúsult bejelentkezési kísérlet. A Yahoo! "
+"weboldalára bejelentkezés talán megoldhatja ezt a problémát."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"A fiók zárolva: Ismeretlen ok. A Yahoo! weboldalára bejelentkezés talán "
+"megoldhatja ezt a problémát."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "A felhasználónév vagy jelszó hiányzik"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9568,39 +9570,28 @@ msgstr ""
 "megoldhatja ezt a problémát."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz "
-"tartozó kiszolgálóoldali listán."
+"Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiók "
+"kiszolgálóoldali listáján."
 
-msgid "Could not add buddy to server list"
-msgstr "Nem sikerült a partnert hozzáadni a kiszolgálóoldali listához"
+msgid "Unable to add buddy to server list"
+msgstr "Nem sikerült a partnert hozzáadni a kiszolgáló listájához"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hallható %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Váratlan HTTP válasz érkezett a kiszolgálótól."
-
-msgid "Connection problem"
-msgstr "Kapcsolathiba"
+msgid "Received unexpected HTTP response from server"
+msgstr "Váratlan HTTP válasz érkezett a kiszolgálótól"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Elveszett a kapcsolat a következővel: %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Elveszett a kapcsolat a következővel: %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Nem hozható létre kapcsolat a következővel: %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Nem hozható létre kapcsolat a következővel: %s: %s"
 
 msgid "Not at Home"
 msgstr "Nem vagyok itthon"
@@ -9647,8 +9638,8 @@ msgstr "Jelenlét beállításai"
 msgid "Start Doodling"
 msgstr "Firkálás megkezdése"
 
-msgid "Activate which ID?"
-msgstr "Melyik azonosítót aktiválja?"
+msgid "Select the ID you want to activate"
+msgstr "Válassza ki az aktiválandó azonosítót"
 
 msgid "Join whom in chat?"
 msgstr "Kihez csatlakozik a csevegésben?"
@@ -9662,73 +9653,15 @@ msgstr "Felhasználó csatlakoztatása csevegéshez…"
 msgid "Open Inbox"
 msgstr "Bejövő levelek megnyitása"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;szoba&gt;:  Csatlakozás csevegőszobához a Yahoo hálózatán"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Csatornák listázása a Yahoo hálózatán"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Kérés a felhasználóhoz egy firkálási folyamat indítására"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo azonosító…"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo protokollbővítmény"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japán"
-
-msgid "Pager server"
-msgstr "Személyhívó kiszolgáló"
-
-msgid "Japan Pager server"
-msgstr "Japán személyhívó kiszolgáló"
-
-msgid "Pager port"
-msgstr "Személyhívó Port"
-
-msgid "File transfer server"
-msgstr "Fájlátviteli kiszolgáló"
-
-msgid "Japan file transfer server"
-msgstr "Japán fájlátviteli kiszolgáló"
-
-msgid "File transfer port"
-msgstr "Fájlátviteli port"
-
-msgid "Chat room locale"
-msgstr "Csevegőszoba nyelve"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Konferencia- és csevegőszoba-meghívások figyelmen kívül hagyása"
-
-msgid "Chat room list URL"
-msgstr "Csevegőszobák listájának URL címe"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo csevegőkiszolgáló"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo csevegőport"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Firkálási kérés elküldve."
 
+msgid "Unable to connect."
+msgstr "Nem lehet kapcsolódni."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nem lehet a fájlleírót létrehozni."
 
@@ -9736,6 +9669,9 @@ msgstr "Nem lehet a fájlleírót létrehozni."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s felajánlja egy %d fájlból álló csoport elküldését.\n"
 
+msgid "Write Error"
+msgstr "Írási hiba"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japán profil"
 
@@ -9805,12 +9741,8 @@ msgid "The user's profile is empty."
 msgstr "A felhasználó profilja üres."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s visszalépett az Ön meghívásától a(z) „%s” konferenciaszobába, mivel: „%s”."
-
-msgid "Invitation Rejected"
-msgstr "Meghívás visszautasítva"
+msgid "%s has declined to join."
+msgstr "%s visszautasította a belépést."
 
 msgid "Failed to join chat"
 msgstr "Nem sikerült kapcsolódni a csevegéshez"
@@ -9853,22 +9785,17 @@ msgstr "Hangok"
 msgid "Webcams"
 msgstr "Webkamerák"
 
+msgid "Connection problem"
+msgstr "Kapcsolathiba"
+
 msgid "Unable to fetch room list."
 msgstr "Nem lehet letölteni a szobalistát."
 
 msgid "User Rooms"
 msgstr "Felhasználói szobák"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Kapcsolathiba a YCHT kiszolgálóval."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"A kapcsolat elveszett a kiszolgálóval\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Kapcsolathiba a YCHT kiszolgálóval"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10000,34 +9927,23 @@ msgid "Exposure"
 msgstr "Exportálás"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Nem lehet létrehozni a foglalatot:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "A válasz nem dolgozható fel a HTTP proxytól: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "A válasz nem dolgozható fel a HTTP proxytól: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "%d HTTP proxy kapcsolathiba"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) %"
-"d. porton."
+"d. porton"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Hiba %s feloldásakor"
 
-msgid "Could not resolve host name"
-msgstr "A gépnév nem oldható fel"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "%s figyelmének kérése…"
@@ -10114,9 +10030,6 @@ msgstr "Ne zavarjanak"
 msgid "Extended away"
 msgstr "Bővített távollét"
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Listening to music"
 msgstr "Zenét hallgat"
 
@@ -10158,18 +10071,6 @@ msgstr "+++ %s már nem inaktív"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Hiba %s olvasásakor"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Hiba lépett fel a(z) %s feldolgozása közben. Ezek nem lettek betöltve, a "
-"régi fájl %s~ néven lett elmentve."
-
 msgid "Calculating..."
 msgstr "Számítás…"
 
@@ -10277,6 +10178,18 @@ msgstr "Kapcsolat visszautasítva."
 msgid "Address already in use."
 msgstr "A cím már használatban van."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Hiba %s olvasásakor"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Hiba történt a(z) %s olvasásakor. Ez a fájl nem lett betöltve, a régi fájl %"
+"s~ néven lett elmentve."
+
 msgid "Internet Messenger"
 msgstr "Azonnali üzenetküldés"
 
@@ -10319,10 +10232,8 @@ msgstr "Értesítések új le_vélre"
 msgid "Use this buddy _icon for this account:"
 msgstr "Ezen _partnerikon használata a fiókhoz:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s beállításai"
+msgid "Ad_vanced"
+msgstr "Spe_ciális"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "GNOME proxybeállítások használata"
@@ -10357,9 +10268,6 @@ msgstr "ha igazán közelről nézi"
 msgid "you can see the butterflies mating"
 msgstr "láthatja a pillangók nászát"
 
-msgid "Proxy Options"
-msgstr "Proxy beállításai"
-
 msgid "Proxy _type:"
 msgstr "Proxy _típusa:"
 
@@ -10387,8 +10295,8 @@ msgstr "_Alap"
 msgid "Create _this new account on the server"
 msgstr "Ezen új fió_k létrehozása a kiszolgálón"
 
-msgid "_Advanced"
-msgstr "_Haladó"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Engedélyezve"
@@ -10439,8 +10347,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Frissítse a szükséges mezőket."
 
-msgid "Room _List"
-msgstr "Sz_obalista"
+msgid "A_ccount"
+msgstr "_Fiók"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10449,8 +10357,8 @@ msgstr ""
 "Adja meg a megfelelő információt arról a csevegésről, amelyhez csatlakozni "
 "kíván.\n"
 
-msgid "_Account:"
-msgstr "F_iók:"
+msgid "Room _List"
+msgstr "Sz_obalista"
 
 msgid "_Block"
 msgstr "_Tiltás"
@@ -10467,6 +10375,15 @@ msgstr "_Info"
 msgid "I_M"
 msgstr "Ü_zenet"
 
+msgid "_Audio Call"
+msgstr "_Hanghívás"
+
+msgid "Audio/_Video Call"
+msgstr "Hang/_videóhívás"
+
+msgid "_Video Call"
+msgstr "_Videóhívás"
+
 msgid "_Send File..."
 msgstr "_Fájl küldése…"
 
@@ -10476,9 +10393,12 @@ msgstr "_Partnerfigyelmeztetés felvétele…"
 msgid "View _Log"
 msgstr "Nap_ló megtekintése"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Elrejtés, ha nem érhető el"
 
+msgid "Show When Offline"
+msgstr "Megjelenítés, ha elérhető"
+
 msgid "_Alias..."
 msgstr "Ál_név…"
 
@@ -10603,6 +10523,9 @@ msgstr "/Eszközök/_Partnerfigyelmeztetések"
 msgid "/Tools/_Certificates"
 msgstr "/Eszközök/_Tanúsítványok"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Eszközök/Egyéni mosol_yok"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Eszközök/Bő_vítmények"
 
@@ -10612,9 +10535,6 @@ msgstr "/Eszközök/_Beállítások"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eszközök/Ma_gánszféra"
 
-msgid "/Tools/Smile_y"
-msgstr "/Eszközök/Mosol_y"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Eszközök/_Fájlátvitelek"
 
@@ -10732,8 +10652,8 @@ msgstr "Kézi"
 msgid "By status"
 msgstr "Állapot szerint"
 
-msgid "By log size"
-msgstr "Napló mérete szerint"
+msgid "By recent log activity"
+msgstr "Legutóbbi naplóaktivitás szerint"
 
 #, c-format
 msgid "%s disconnected"
@@ -10749,6 +10669,9 @@ msgstr "Újracsatlakozás"
 msgid "Re-enable"
 msgstr "Újraengedélyezés"
 
+msgid "SSL FAQs"
+msgstr "SSL FAQ-ok"
+
 msgid "Welcome back!"
 msgstr "Üdvözöljük újra!"
 
@@ -10837,6 +10760,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Ál_név:"
 
+msgid "_Group:"
+msgstr "_Csoport:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Automatikus _csatlakozás a fiók elérhetővé válásakor."
 
@@ -10870,6 +10796,103 @@ msgstr "/Eszközök"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Partnerek/Partnerek rendezése"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Háttérszín"
+
+msgid "The background color for the buddy list"
+msgstr "A partnerlista háttérszíne"
+
+msgid "Layout"
+msgstr "Elrendezés"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "A partnerlista ikonjainak, nevének és állapotának elrendezése"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Kibontott háttérszín"
+
+msgid "The background color of an expanded group"
+msgstr "Kibontott csoport háttérszíne"
+
+msgid "Expanded Text"
+msgstr "Kibontott szöveg"
+
+msgid "The text information for when a group is expanded"
+msgstr "Szöveges információk kibontott csoport esetén"
+
+msgid "Collapsed Background Color"
+msgstr "Összecsukott háttérszín"
+
+msgid "The background color of a collapsed group"
+msgstr "Összecsukott csoport háttérszíne"
+
+msgid "Collapsed Text"
+msgstr "Összecsukott szöveg"
+
+msgid "The text information for when a group is collapsed"
+msgstr "A szöveges információk összecsukott csoport esetén"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Partner/csevegés háttérszíne"
+
+msgid "The background color of a contact or chat"
+msgstr "Partner vagy csevegés háttérszíne"
+
+msgid "Contact Text"
+msgstr "Partnerszöveg"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Kibontott partner szöveges információi"
+
+msgid "On-line Text"
+msgstr "Elérhető szöveg"
+
+msgid "The text information for when a buddy is online"
+msgstr "Elérhető partner szöveges információi"
+
+msgid "Away Text"
+msgstr "Távol szöveg"
+
+msgid "The text information for when a buddy is away"
+msgstr "Távol lévő partner szöveges információi"
+
+msgid "Off-line Text"
+msgstr "Kilépett szöveg"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Kilépett partner szöveges információi"
+
+msgid "Idle Text"
+msgstr "Ráérő szöveg"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Ráérő partner szöveges információi"
+
+msgid "Message Text"
+msgstr "Üzenetszöveg"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Olvasatlan üzenetekkel rendelkező partner szöveges információi"
+
+msgid "Message (Nick Said) Text"
+msgstr "Üzenetszöveg (becenév említve)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"Szöveges információk, ha a csevegés olvasatlan üzeneteket tartalmaz, amelyek "
+"az Ön becenevét említik"
+
+msgid "The text information for a buddy's status"
+msgstr "Partner állapotának szöveges információi"
+
+msgid "Type the host name for this certificate."
+msgstr "Írja be a tanúsítványt birtokló gép nevét."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL kiszolgálók"
@@ -10889,14 +10912,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Partner meghívása a csevegőszobába"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy "
-"tetszőleges meghívóüzenettel együtt."
-
 msgid "_Buddy:"
 msgstr "_Partner:"
 
@@ -10925,7 +10940,7 @@ msgstr "Mellőzés"
 msgid "Get Away Message"
 msgstr "Távollét üzenet lekérdezése"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Utoljára ezt mondta"
 
 msgid "Unable to save icon file to disk."
@@ -10971,6 +10986,18 @@ msgstr "/Társalgás/_Mentés másként…"
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Társalgás/Elő_zmények törlése"
 
+msgid "/Conversation/M_edia"
+msgstr "/Társalgás/Mé_dia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Társalgás/Média/_Hanghívás"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Társalgás/Média/_Videohívás"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Társalgás/Média/Hang\\/vi_deóhívás"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Társalgás/Fájl kül_dése…"
 
@@ -11043,6 +11070,15 @@ msgstr "/Társalgás"
 msgid "/Conversation/View Log"
 msgstr "/Társalgás/Napló megtekintése"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Társalgás/Média/Hanghívás"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Társalgás/Média/Videohívás"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Társalgás/Média/Hang\\/videóhívás"
+
 msgid "/Conversation/Send File..."
 msgstr "/Társalgás/Fájl küldése…"
 
@@ -11226,6 +11262,9 @@ msgstr "grafikus"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "hang és videó"
+
 msgid "support"
 msgstr "támogató"
 
@@ -11350,6 +11389,9 @@ msgstr "hindi"
 msgid "Hungarian"
 msgstr "magyar"
 
+msgid "Armenian"
+msgstr "Örmény"
+
 msgid "Indonesian"
 msgstr "indonéz"
 
@@ -11365,6 +11407,9 @@ msgstr "grúz"
 msgid "Ubuntu Georgian Translators"
 msgstr "Grúz Ubuntu fordítók"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "kannada"
 
@@ -11443,6 +11488,9 @@ msgstr "Szimhala"
 msgid "Swedish"
 msgstr "svéd"
 
+msgid "Swahili"
+msgstr "Szuahéli"
+
 msgid "Tamil"
 msgstr "tamil"
 
@@ -11751,14 +11799,6 @@ msgstr "B_efejezett átvitelek törlése"
 msgid "File transfer _details"
 msgstr "Fájlát_vitel részletei"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Szünet"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Folytatás"
-
 msgid "Paste as Plain _Text"
 msgstr "Beillesztés egyszerű szö_vegként"
 
@@ -11777,7 +11817,7 @@ msgstr "Hiperhivatkozások rajzolásához használt szín."
 msgid "Hyperlink visited color"
 msgstr "Meglátogatott hiperhivatkozás színe"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Meglátogatott (aktivált) hiperhivatkozások rajzolásához használt szín."
 
 msgid "Hyperlink prelight color"
@@ -11814,14 +11854,20 @@ msgstr "Műveletüzenet nevének rajzszíne."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Műveletüzenet névszíne suttogott üzenethez"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Suttogott műveletüzenet nevének rajzszíne."
+
 msgid "Whisper Message Name Color"
 msgstr "Suttogott üzenet névszíne"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Suttogott üzenet nevének rajzszíne."
+
 msgid "Typing notification color"
 msgstr "Gépelésértesítés színe"
 
-msgid "The color to use for the typing notification font"
-msgstr "A gépelésértesítés betűkészletének színe"
+msgid "The color to use for the typing notification"
+msgstr "A gépelésértesítés színe"
 
 msgid "Typing notification font"
 msgstr "Gépelésértesítés betűkészlete"
@@ -11832,15 +11878,6 @@ msgstr "A gépelésértesítés betűkészlete"
 msgid "Enable typing notification"
 msgstr "Gépelésértesítés engedélyezése"
 
-msgid "_Copy Email Address"
-msgstr "E-mail cím _másolása"
-
-msgid "_Open Link in Browser"
-msgstr "Hivatk_ozás megnyitása böngészőben"
-
-msgid "_Copy Link Location"
-msgstr "_Hivatkozás helyének másolása"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11882,11 +11919,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Kép mentése"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Kép menté_se…"
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Egyéni hangulatjel hozzáadása…"
 
@@ -11975,9 +12010,6 @@ msgstr "Betűméret csökkentése"
 msgid "Font Face"
 msgstr "Betűkészlet"
 
-msgid "Background Color"
-msgstr "Háttérszín"
-
 msgid "Foreground Color"
 msgstr "Előtérszín"
 
@@ -12094,6 +12126,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12108,6 +12141,8 @@ msgstr ""
 "\n"
 "  -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n"
 "  -d, --debug         hibakereső üzenetek kiírása a szabványos kimenetre\n"
+"  -f, --force-online  elérhető állapot kényszerítése, a hálózat állapotától\n"
+"                        függetlenül\n"
 "  -h, --help          ezen súgó megjelenítése és kilépés\n"
 "  -m, --multiple      ne csak egy példány futhasson\n"
 "  -n, --nologin       ne jelentkezzen be automatikusan\n"
@@ -12123,6 +12158,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12136,6 +12172,8 @@ msgstr ""
 "\n"
 "  -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n"
 "  -d, --debug         hibakereső üzenetek kiírása a szabványos kimenetre\n"
+"  -f, --force-online  elérhető állapot kényszerítése, a hálózat állapotától\n"
+"                        függetlenül\n"
 "  -h, --help          ezen súgó megjelenítése és kilépés\n"
 "  -m, --multiple      ne csak egy példány futhasson\n"
 "  -n, --nologin       ne jelentkezzen be automatikusan\n"
@@ -12159,7 +12197,7 @@ msgid ""
 "%swiki/GetABacktrace\n"
 msgstr ""
 "A %s %s összeomlott és megpróbált kiírni egy magfájlt.\n"
-"Ez a szoftver és nem az Ön hibája miatt történt.\n"
+"Ez a szoftver, és nem az Ön hibája miatt történt.\n"
 "\n"
 "Ha ismételten elő tudja állítani az összeomlást, akkor\n"
 "értesítse a Pidgin fejlesztőit a következő címen:\n"
@@ -12180,11 +12218,28 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Kilépés, mert már fut egy másik libpurple kliens.\n"
 
-msgid "Open All Messages"
-msgstr "Összes üzenet megnyitása"
+msgid "/_Media"
+msgstr "/_Média"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Levele érkezett!</span>"
+msgid "/Media/_Hangup"
+msgstr "/Média/_Lerakás"
+
+msgid "Calling..."
+msgstr "Hívás…"
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s hang/videókapcsolatot szeretne indítani."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s videókapcsolatot szeretne indítani."
+
+msgid "Incoming Call"
+msgstr "Bejövő hívás"
+
+msgid "_Pause"
+msgstr "_Szünet"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12213,6 +12268,24 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "A „Kézi” böngészőparancsot választotta, de nem adott meg parancsot."
 
+msgid "No message"
+msgstr "Nincs üzenet"
+
+msgid "Open All Messages"
+msgstr "Összes üzenet megnyitása"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Levele érkezett!</span>"
+
+msgid "New Pounces"
+msgstr "Új partnerfigyelmeztetések"
+
+msgid "Dismiss"
+msgstr "Rendben"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Üzenete érkezett!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "A következő bővítmények lesznek eltávolítva."
 
@@ -12261,10 +12334,16 @@ msgstr "<b>Bővítmény részletei</b>"
 msgid "Select a file"
 msgstr "Fájl kiválasztása"
 
+msgid "Modify Buddy Pounce"
+msgstr "Partnerfigyelmeztetés módosítása"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Kinél figyelmeztet"
 
+msgid "_Account:"
+msgstr "F_iók:"
+
 msgid "_Buddy name:"
 msgstr "_Partner neve:"
 
@@ -12331,8 +12410,58 @@ msgstr "_Ismétlődő"
 msgid "Pounce Target"
 msgstr "Figyelmeztetés címzettje"
 
-msgid "Smiley theme failed to unpack."
-msgstr "A hangulatjel-téma kicsomagolása meghiúsult."
+#, c-format
+msgid "Started typing"
+msgstr "Elkezdett gépelni"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Félbehagyta a gépelést"
+
+#, c-format
+msgid "Signed on"
+msgstr "Bejelentkezett"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Visszatért inaktív állapotból"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Visszatért távollétből"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Abbahagyta a gépelést"
+
+#, c-format
+msgid "Signed off"
+msgstr "Kijelentkezett"
+
+#, c-format
+msgid "Became idle"
+msgstr "Inaktív lett"
+
+#, c-format
+msgid "Went away"
+msgstr "Elment"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Üzenetet küldött"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Ismeretlen… Kérjük jelentse ezt!"
+
+msgid "Theme failed to unpack."
+msgstr "A téma kicsomagolása meghiúsult."
+
+msgid "Theme failed to load."
+msgstr "A téma betöltése meghiúsult."
+
+msgid "Theme failed to copy."
+msgstr "A téma másolása meghiúsult."
 
 msgid "Install Theme"
 msgstr "Téma telepítése"
@@ -12353,6 +12482,11 @@ msgstr "Gyorsbillentyűk"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Társalgások bezárása az _Escape billentyűvel"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Partnerlista-téma"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Rendszertálca-ikon"
 
@@ -12362,8 +12496,8 @@ msgstr "_Rendszertálca-ikon megjelenítése:"
 msgid "On unread messages"
 msgstr "Olvasatlan üzenetek esetén"
 
-msgid "Conversation Window Hiding"
-msgstr "Társalgási ablak elrejtése"
+msgid "Conversation Window"
+msgstr "Társalgási ablak"
 
 msgid "_Hide new IM conversations:"
 msgstr "Új társal_gások elrejtése:"
@@ -12371,6 +12505,9 @@ msgstr "Új társal_gások elrejtése:"
 msgid "When away"
 msgstr "Ha távol vagyok"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Új társalgási ablakok _minimalizálása"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Lapok"
@@ -12429,9 +12566,6 @@ msgstr "Finom görgetés használata"
 msgid "F_lash window when IMs are received"
 msgstr "_Villanjon az ablak új üzenetek fogadásakor"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Új társalgási ablakok _minimalizálása"
-
 msgid "Minimum input area height in lines:"
 msgstr "Beviteli terület minimális magassága sorokban:"
 
@@ -12463,14 +12597,12 @@ msgstr "Nem indítható a proxykonfigurációs program."
 msgid "Cannot start browser configuration program."
 msgstr "Nem indítható a böngészőkonfigurációs program."
 
-msgid "ST_UN server:"
-msgstr "ST_UN kiszolgáló:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Például: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_IP cím automatikus felismerése"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Automatikusan felismert _IP cím használata: %s"
 
 msgid "Public _IP:"
 msgstr "_Nyilvános IP:"
@@ -12490,6 +12622,10 @@ msgstr "_Első port:"
 msgid "_End port:"
 msgstr "_Utolsó port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Továbbító kiszolgáló (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy-kiszolgáló és böngésző"
 
@@ -12680,12 +12816,12 @@ msgstr "Ha távol van és inaktív"
 msgid "Auto-away"
 msgstr "Automatikus távollét"
 
-msgid "Change status when _idle"
-msgstr "Állapot módosítása, _ha inaktív"
-
 msgid "_Minutes before becoming idle:"
 msgstr "Üresjárat ennyi _perc után:"
 
+msgid "Change status when _idle"
+msgstr "Állapot módosítása, _ha inaktív"
+
 msgid "Change _status to:"
 msgstr "Állap_ot módosítása a következőre:"
 
@@ -12835,47 +12971,44 @@ msgstr "Menté_s és használat"
 msgid "Status for %s"
 msgstr "%s állapota"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Már létezik egyéni hangulatjel ehhez: „%s”. Adjon meg másik "
+"billentyűparancsot."
+
 msgid "Custom Smiley"
 msgstr "Egyéni hangulatjel"
 
-msgid "More Data needed"
-msgstr "További adatok szükségesek"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Adja meg a hangulatjelhez társítandó billentyűparancsot."
-
 msgid "Duplicate Shortcut"
 msgstr "Kettőzött billentyűparancs"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Már létezik egyéni hangulatjel a kiválasztott billentyűparancshoz. Adjon meg "
-"másik billentyűparancsot."
-
-msgid "Please select an image for the smiley."
-msgstr "Válassza ki a képet a hangulatjelhez."
-
 msgid "Edit Smiley"
 msgstr "Hangulatjel szerkesztése"
 
 msgid "Add Smiley"
 msgstr "Hangulatjel hozzáadása"
 
-msgid "Smiley _Image"
-msgstr "Hangulatjel _kép"
+msgid "_Image:"
+msgstr "Ké_p:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "_Hangulatjel billentyűparancsa"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "Bille_ntyűparancs szövege:"
 
 msgid "Smiley"
 msgstr "Hangulatjel"
 
+msgid "Shortcut Text"
+msgstr "Billentyűparancs szövege"
+
 msgid "Custom Smiley Manager"
 msgstr "Egyénihangulatjel-kezelő"
 
+msgid "Select Buddy Icon"
+msgstr "Válasszon partnerikont"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Kattintson a fiók partnerikonjának módosításához."
 
@@ -12961,11 +13094,11 @@ msgid "Cannot send launcher"
 msgstr "Az indítóikon nem küldhető el"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
-"Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott "
-"objektumot akarta elküldeni az indítóikon helyett."
+"Egy asztali indítóikont húzott be. Valószínűleg az indítóikon célobjektumát "
+"akarta elküldeni az indítóikon helyett."
 
 #, c-format
 msgid ""
@@ -12999,9 +13132,30 @@ msgstr ""
 "A(z) „%s” kép betöltése sikertelen: az ok nem ismert, valószínűleg sérült a "
 "képfájl"
 
+msgid "_Open Link"
+msgstr "_Hivatkozás megnyitása"
+
+msgid "_Copy Link Location"
+msgstr "_Hivatkozás helyének másolása"
+
+msgid "_Copy Email Address"
+msgstr "E-mail cím _másolása"
+
+msgid "_Open File"
+msgstr "_Fájl megnyitása"
+
+msgid "Open _Containing Directory"
+msgstr "_Tartalmazó könyvtár megnyitása"
+
 msgid "Save File"
 msgstr "Fájl mentése"
 
+msgid "_Play Sound"
+msgstr "H_ang lejátszása"
+
+msgid "_Save File"
+msgstr "Fájl m_entése"
+
 msgid "Select color"
 msgstr "Szín kiválasztása"
 
@@ -13089,6 +13243,66 @@ msgstr "Partnerelérhetőség-előrejelző bővítmény."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Statisztikai információk megjelenítése a partnerek elérhetőségéről"
 
+msgid "Server name request"
+msgstr "Kiszolgálónév-kérés"
+
+msgid "Enter an XMPP Server"
+msgstr "Adjon meg egy XMPP kiszolgálót"
+
+msgid "Select an XMPP server to query"
+msgstr "Válassza ki a lekérdezendő XMPP kiszolgálót"
+
+msgid "Find Services"
+msgstr "Szolgáltatások keresése"
+
+msgid "Add to Buddy List"
+msgstr "Felvétel a partnerlistára"
+
+msgid "Gateway"
+msgstr "Átjáró"
+
+msgid "Directory"
+msgstr "Címtár"
+
+msgid "PubSub Collection"
+msgstr "PubSub gyűjtemény"
+
+msgid "PubSub Leaf"
+msgstr "PubSub levél"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Leírás:</b>"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Szolgáltatásfeltérképezés"
+
+msgid "_Browse"
+msgstr "_Tallózás"
+
+msgid "Server does not exist"
+msgstr "A kiszolgáló nem létezik"
+
+msgid "Server does not support service discovery"
+msgstr "A kiszolgáló nem támogatja a szolgáltatásfeltérképezést"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP szolgáltatásfeltérképezés"
+
+msgid "Allows browsing and registering services."
+msgstr "Lehetővé teszi szolgáltatások tallózását és regisztrálását."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Ez a bővítmény örökölt átvitelekkel történő, vagy más XMPP szolgáltatásokhoz "
+"való regisztráláshoz hasznos."
+
 msgid "Buddy is idle"
 msgstr "A partner inaktív"
 
@@ -13486,7 +13700,7 @@ msgstr "Zenei üzenetküldő bővítmény együttműködő zeneszerzéshez."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több "
 "felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
@@ -13599,12 +13813,6 @@ msgstr ""
 "– Visszafordít minden bejövő szöveget\n"
 "– Üzenetet küld a partnerlistán lévő partnereinek, amikor belépnek"
 
-msgid "Cursor Color"
-msgstr "Kurzor színe"
-
-msgid "Secondary Cursor Color"
-msgstr "Másodlagos kurzor színe"
-
 msgid "Hyperlink Color"
 msgstr "Hiperhivatkozás színe"
 
@@ -13614,6 +13822,9 @@ msgstr "Meglátogatott hiperhivatkozás színe"
 msgid "Highlighted Message Name Color"
 msgstr "Kiemelt üzenet névszíne"
 
+msgid "Typing Notification Color"
+msgstr "Gépelésértesítés színe"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView vízszintes elválasztás"
 
@@ -13643,35 +13854,21 @@ msgstr "GTK+ felület betűkészlete"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ szöveges gyorsbillentyű téma"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Felület színei"
+msgid "Disable Typing Notification Text"
+msgstr "Gépelésértesítés szövegének letiltása"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ témavezérlés beállításai"
 
-msgid "Widget Sizes"
-msgstr "Felületi elemek méretei"
+msgid "Colors"
+msgstr "Színek"
 
 msgid "Fonts"
 msgstr "Betűkészletek"
 
+msgid "Miscellaneous"
+msgstr "Egyebek"
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc fájleszközök"
 
@@ -13757,7 +13954,7 @@ msgstr "Társalgási ablak küldés gombja."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Egy Küldés gombot ad a társalgási ablak beviteli területéhez. Hasznos, ha "
 "nincs jelen fizikai billentyűzet."
@@ -13815,6 +14012,98 @@ msgstr ""
 "A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a "
 "kimenő üzenetekben."
 
+msgid "Just logged in"
+msgstr "Épp bejelentkezett"
+
+msgid "Just logged out"
+msgstr "Épp kijelentkezett"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Partner ikonja/\n"
+"Ismeretlen ikonja"
+
+msgid "Icon for Chat"
+msgstr "Csevegés ikonja"
+
+msgid "Ignored"
+msgstr "Mellőzve"
+
+msgid "Founder"
+msgstr "Alapító"
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "Operátor"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr "Féloperátor"
+
+msgid "Authorization dialog"
+msgstr "Hitelesítési ablak"
+
+msgid "Error dialog"
+msgstr "Hibaablak"
+
+msgid "Information dialog"
+msgstr "Információs ablak"
+
+msgid "Mail dialog"
+msgstr "Levél ablak"
+
+msgid "Question dialog"
+msgstr "Kérdező ablak"
+
+msgid "Warning dialog"
+msgstr "Figyelmeztető ablak"
+
+msgid "What kind of dialog is this?"
+msgstr "Milyen típusú ablak ez?"
+
+msgid "Status Icons"
+msgstr "Állapotikonok"
+
+msgid "Chatroom Emblems"
+msgstr "Csevegőszoba matricái"
+
+msgid "Dialog Icons"
+msgstr "Ablak ikonjai"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin ikontéma-szerkesztő"
+
+msgid "Contact"
+msgstr "Partner"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin partnerlistatéma-szerkesztő"
+
+msgid "Edit Buddylist Theme"
+msgstr "Partnerlista-téma szerkesztése"
+
+msgid "Edit Icon Theme"
+msgstr "Ikontéma szerkesztése"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin témaszerkesztő"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin témaszerkesztő."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13983,7 +14272,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "A windowsos Pidginre jellemző beállítások."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "A windowsos Pidginre jellemző beállításokat biztosít, mint például a "
 "partnerlista dokkolása."
diff --git a/po/hy.po b/po/hy.po
new file mode 100644
index 0000000000..0920dd847e
--- /dev/null
+++ b/po/hy.po
@@ -0,0 +1,13415 @@
+# translation of am.po to Armenian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# David Avsharyan <avsharyan@gmail.com>, 2009.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: am\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
+"PO-Revision-Date: 2009-05-20 17:37+0400\n"
+"Last-Translator: David Avsharyan <avsharyan@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Finch"
+msgstr "Սերինոս"
+
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Ավելի շատ ինֆորմացիայի համար հավագեք `%s -h'.\n"
+
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stderr\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"Կիրառում: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    օգտագործել DIR կոնֆիգուրացիոն ֆայլերի համար\n"
+"  -d, --debug         կարգաբերվող հաղորդագրությունները տպել դեպի ստանդարտ "
+"սխալների հոսք\n"
+"  -h, --help          ցույց տալ այս օգնությունը և դուրս գալ\n"
+"  -n, --nologin       ոչ ինքնաբերաբար մուտք\n"
+"  -v, --version       ցույց տալ ընթացիկ տարբերակը և դուրս գալ\n"
+
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+
+#, fuzzy
+msgid "Error"
+msgstr "Սխալներզ"
+
+msgid "Account was not added"
+msgstr ""
+
+msgid "Username of an account must be non-empty."
+msgstr "Օգտագործողի անունը  ..."
+
+msgid "New mail notifications"
+msgstr "Նոր նամակի ծանուցումներ"
+
+msgid "Remember password"
+msgstr "Հիշել գաղտնաբառը"
+
+msgid "There are no protocol plugins installed."
+msgstr "Այնտեղ տեղադրված չէ պրոտոկոլի ավելացումներ․"
+
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(Հավանաբար դուք  մոռացել եք անեք 'make install'.)"
+
+msgid "Modify Account"
+msgstr "Ձևափոխել Հաշիվը"
+
+msgid "New Account"
+msgstr "Նոր Հաշիվ"
+
+msgid "Protocol:"
+msgstr "Արձանագրություն։"
+
+msgid "Username:"
+msgstr "Օգտագործողի անունը։"
+
+msgid "Password:"
+msgstr "Գաղտնաբառ։"
+
+msgid "Alias:"
+msgstr "Փոխանուն։"
+
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Ստեղծել այս հաշիվը սերվերի վրա"
+
+#. Cancel button
+#. Cancel
+msgid "Cancel"
+msgstr "Չեղյալ համարել"
+
+#. Save button
+#. Save
+msgid "Save"
+msgstr "Պահպանել"
+
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Դուք համոզված եք, որ ցանկանում եք ջնջել %s?"
+
+msgid "Delete Account"
+msgstr "Ջնջել Հաշիվը"
+
+#. Delete button
+msgid "Delete"
+msgstr "Ջնջել"
+
+msgid "Accounts"
+msgstr "Հաշիվներ"
+
+msgid "You can enable/disable accounts from the following list."
+msgstr "Դուք կարող եք միացնել/անջատել հաշիվները հետևյալ ցանկից․"
+
+#. Add button
+msgid "Add"
+msgstr "Ավելացնել"
+
+#. Modify button
+msgid "Modify"
+msgstr "Փոփոխել"
+
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr ""
+
+msgid "Add buddy to your list?"
+msgstr ""
+
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr ""
+
+msgid "Authorize buddy?"
+msgstr ""
+
+msgid "Authorize"
+msgstr "Լիազորում"
+
+msgid "Deny"
+msgstr "Մերժել"
+
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Կապի մեջ: %d\n"
+"Ընդհանուր: %d"
+
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Հաշիվ: %s (%s"
+
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Last Seen: %s ago"
+
+msgid "Default"
+msgstr ""
+
+msgid "You must provide a username for the buddy."
+msgstr ""
+
+msgid "You must provide a group."
+msgstr ""
+
+msgid "You must select an account."
+msgstr ""
+
+msgid "The selected account is not online."
+msgstr ""
+
+msgid "Error adding buddy"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Alias (optional)"
+msgstr ""
+
+msgid "Add in group"
+msgstr ""
+
+msgid "Account"
+msgstr ""
+
+msgid "Add Buddy"
+msgstr ""
+
+msgid "Please enter buddy information."
+msgstr ""
+
+msgid "Chats"
+msgstr ""
+
+#. Extract their Name and put it in
+msgid "Name"
+msgstr ""
+
+msgid "Alias"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "Auto-join"
+msgstr ""
+
+msgid "Add Chat"
+msgstr ""
+
+msgid "You can edit more information from the context menu later."
+msgstr ""
+
+msgid "Error adding group"
+msgstr ""
+
+msgid "You must give a name for the group to add."
+msgstr ""
+
+msgid "Add Group"
+msgstr ""
+
+msgid "Enter the name of the group"
+msgstr ""
+
+msgid "Edit Chat"
+msgstr ""
+
+msgid "Please Update the necessary fields."
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Edit Settings"
+msgstr ""
+
+msgid "Information"
+msgstr ""
+
+msgid "Retrieving..."
+msgstr ""
+
+msgid "Get Info"
+msgstr ""
+
+msgid "Add Buddy Pounce"
+msgstr ""
+
+msgid "Send File"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid "Show when offline"
+msgstr ""
+
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr ""
+
+msgid "Rename"
+msgstr ""
+
+msgid "Set Alias"
+msgstr ""
+
+msgid "Enter empty string to reset the name."
+msgstr ""
+
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr ""
+
+#. XXX: anything to do with the returned ui-handle?
+msgid "Confirm Remove"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+#. Buddy List
+msgid "Buddy List"
+msgstr ""
+
+msgid "Place tagged"
+msgstr ""
+
+msgid "Toggle Tag"
+msgstr ""
+
+msgid "View Log"
+msgstr ""
+
+#. General
+msgid "Nickname"
+msgstr ""
+
+#. Never know what those translations might end up like...
+#. Idle stuff
+msgid "Idle"
+msgstr ""
+
+msgid "On Mobile"
+msgstr ""
+
+msgid "New..."
+msgstr ""
+
+msgid "Saved..."
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Block/Unblock"
+msgstr ""
+
+msgid "Block"
+msgstr ""
+
+msgid "Unblock"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+
+#. Not multiline
+#. Not masked?
+#. No hints?
+msgid "OK"
+msgstr "OK"
+
+msgid "New Instant Message"
+msgstr ""
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+
+msgid "Channel"
+msgstr "Ալիք"
+
+msgid "Join a Chat"
+msgstr "Միանալ զրույցին"
+
+msgid "Please enter the name of the chat you want to join."
+msgstr ""
+
+msgid "Join"
+msgstr "Միանալ"
+
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+
+#. Create the "Options" frame.
+msgid "Options"
+msgstr ""
+
+msgid "Send IM..."
+msgstr ""
+
+msgid "Block/Unblock..."
+msgstr "Փակել/Բացել"
+
+msgid "Join Chat..."
+msgstr "Միանալ զրույցին ... "
+
+msgid "View Log..."
+msgstr "Նայել գրառումները․․․"
+
+msgid "View All Logs"
+msgstr "Նայել մատյանի բոլոր գրառումները"
+
+msgid "Show"
+msgstr "Ցույց տալ"
+
+msgid "Empty groups"
+msgstr "Դատարկ խմբեր"
+
+msgid "Offline buddies"
+msgstr ""
+
+msgid "Sort"
+msgstr "Դասակարգել"
+
+msgid "By Status"
+msgstr "Ըստ "
+
+msgid "Alphabetically"
+msgstr ""
+
+msgid "By Log Size"
+msgstr ""
+
+msgid "Buddy"
+msgstr ""
+
+msgid "Chat"
+msgstr "Զրույց"
+
+msgid "Grouping"
+msgstr ""
+
+msgid "Certificate Import"
+msgstr ""
+
+msgid "Specify a hostname"
+msgstr ""
+
+msgid "Type the host name this certificate is for."
+msgstr ""
+
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+
+msgid "Certificate Import Error"
+msgstr ""
+
+msgid "X.509 certificate import failed"
+msgstr ""
+
+msgid "Select a PEM certificate"
+msgstr ""
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+
+msgid "Certificate Export Error"
+msgstr ""
+
+msgid "X.509 certificate export failed"
+msgstr ""
+
+msgid "PEM X.509 Certificate Export"
+msgstr ""
+
+#, c-format
+msgid "Certificate for %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+
+msgid "SSL Host Certificate"
+msgstr ""
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr ""
+
+msgid "Confirm certificate delete"
+msgstr ""
+
+msgid "Certificate Manager"
+msgstr ""
+
+#. Creating the user splits
+msgid "Hostname"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+#. Close button
+msgid "Close"
+msgstr ""
+
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s disconnected."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+
+msgid "Re-enable Account"
+msgstr ""
+
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+
+msgid "No such command."
+msgstr ""
+
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+
+msgid "Your command failed for an unknown reason."
+msgstr ""
+
+msgid "That command only works in chats, not IMs."
+msgstr ""
+
+msgid "That command only works in IMs, not chats."
+msgstr ""
+
+msgid "That command doesn't work on this protocol."
+msgstr ""
+
+msgid "Message was not sent, because you are not signed on."
+msgstr ""
+
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr ""
+
+#, c-format
+msgid "%s [%s]"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+
+msgid "You have left this chat."
+msgstr ""
+
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+
+msgid "Send To"
+msgstr ""
+
+msgid "Conversation"
+msgstr ""
+
+msgid "Clear Scrollback"
+msgstr ""
+
+msgid "Show Timestamps"
+msgstr ""
+
+msgid "Add Buddy Pounce..."
+msgstr ""
+
+msgid "Invite..."
+msgstr ""
+
+msgid "Enable Logging"
+msgstr ""
+
+msgid "Enable Sounds"
+msgstr ""
+
+msgid "<AUTO-REPLY> "
+msgstr ""
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Supported debug options are:  version"
+msgstr ""
+
+msgid "No such command (in this context)."
+msgstr ""
+
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+
+msgid "clear: Clears the conversation scrollback."
+msgstr ""
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr ""
+
+msgid "users:  Show the list of users in the chat."
+msgstr ""
+
+msgid "plugins: Show the plugins window."
+msgstr ""
+
+msgid "buddylist: Show the buddylist."
+msgstr ""
+
+msgid "accounts: Show the accounts window."
+msgstr ""
+
+msgid "debugwin: Show the debug window."
+msgstr ""
+
+msgid "prefs: Show the preference window."
+msgstr ""
+
+msgid "statuses: Show the savedstatuses window."
+msgstr ""
+
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+
+msgid "Unable to open file."
+msgstr ""
+
+msgid "Debug Window"
+msgstr ""
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+msgid "Clear"
+msgstr ""
+
+msgid "Filter:"
+msgstr ""
+
+msgid "Pause"
+msgstr ""
+
+#, c-format
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Create the window.
+msgid "File Transfers"
+msgstr ""
+
+msgid "Progress"
+msgstr ""
+
+msgid "Filename"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Speed"
+msgstr ""
+
+msgid "Remaining"
+msgstr ""
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+msgid "Status"
+msgstr ""
+
+msgid "Close this window when all transfers finish"
+msgstr ""
+
+msgid "Clear finished transfers"
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "Waiting for transfer to begin"
+msgstr ""
+
+msgid "Canceled"
+msgstr ""
+
+msgid "Failed"
+msgstr ""
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+msgid "Sent"
+msgstr ""
+
+msgid "Received"
+msgstr ""
+
+msgid "Finished"
+msgstr ""
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr ""
+
+msgid "Sending"
+msgstr ""
+
+msgid "Receiving"
+msgstr ""
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr ""
+
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr ""
+
+msgid "%B %Y"
+msgstr ""
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+msgid "No logs were found"
+msgstr ""
+
+msgid "Total log size:"
+msgstr ""
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr ""
+
+#, c-format
+msgid "Conversations in %s"
+msgstr ""
+
+#, c-format
+msgid "Conversations with %s"
+msgstr ""
+
+msgid "All Conversations"
+msgstr ""
+
+msgid "System Log"
+msgstr ""
+
+msgid "Calling ... "
+msgstr ""
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr ""
+
+msgid "Reject"
+msgstr ""
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+msgid "You have rejected the call."
+msgstr ""
+
+msgid "call: Make an audio call."
+msgstr ""
+
+msgid "Emails"
+msgstr ""
+
+msgid "You have mail!"
+msgstr ""
+
+msgid "Sender"
+msgstr ""
+
+msgid "Subject"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "New Mail"
+msgstr ""
+
+#, c-format
+msgid "Info for %s"
+msgstr ""
+
+msgid "Buddy Information"
+msgstr ""
+
+msgid "Continue"
+msgstr ""
+
+msgid "IM"
+msgstr ""
+
+msgid "Invite"
+msgstr ""
+
+msgid "(none)"
+msgstr ""
+
+msgid "URI"
+msgstr ""
+
+msgid "ERROR"
+msgstr ""
+
+msgid "loading plugin failed"
+msgstr ""
+
+msgid "unloading plugin failed"
+msgstr ""
+
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+
+msgid "Plugin need to be loaded before you can configure it."
+msgstr ""
+
+msgid "No configuration options for this plugin."
+msgstr ""
+
+msgid "Error loading plugin"
+msgstr ""
+
+msgid "The selected file is not a valid plugin."
+msgstr ""
+
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+
+msgid "Select plugin to install"
+msgstr ""
+
+msgid "You can (un)load plugins from the following list."
+msgstr ""
+
+msgid "Install Plugin..."
+msgstr ""
+
+msgid "Configure Plugin"
+msgstr ""
+
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+msgid "Preferences"
+msgstr ""
+
+msgid "Please enter a buddy to pounce."
+msgstr ""
+
+msgid "New Buddy Pounce"
+msgstr ""
+
+msgid "Edit Buddy Pounce"
+msgstr ""
+
+msgid "Pounce Who"
+msgstr ""
+
+#. Account:
+msgid "Account:"
+msgstr ""
+
+msgid "Buddy name:"
+msgstr ""
+
+#. Create the "Pounce When Buddy..." frame.
+msgid "Pounce When Buddy..."
+msgstr ""
+
+msgid "Signs on"
+msgstr ""
+
+msgid "Signs off"
+msgstr ""
+
+msgid "Goes away"
+msgstr ""
+
+msgid "Returns from away"
+msgstr ""
+
+msgid "Becomes idle"
+msgstr ""
+
+msgid "Is no longer idle"
+msgstr ""
+
+msgid "Starts typing"
+msgstr ""
+
+msgid "Pauses while typing"
+msgstr ""
+
+msgid "Stops typing"
+msgstr ""
+
+msgid "Sends a message"
+msgstr ""
+
+#. Create the "Action" frame.
+msgid "Action"
+msgstr ""
+
+msgid "Open an IM window"
+msgstr ""
+
+msgid "Pop up a notification"
+msgstr ""
+
+msgid "Send a message"
+msgstr ""
+
+msgid "Execute a command"
+msgstr ""
+
+msgid "Play a sound"
+msgstr ""
+
+msgid "Pounce only when my status is not Available"
+msgstr ""
+
+msgid "Recurring"
+msgstr ""
+
+msgid "Cannot create pounce"
+msgstr ""
+
+msgid "You do not have any accounts."
+msgstr ""
+
+msgid "You must create an account first before you can create a pounce."
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr ""
+
+msgid "Buddy Pounces"
+msgstr ""
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr ""
+
+msgid "Unknown pounce event. Please report this!"
+msgstr ""
+
+msgid "Based on keyboard use"
+msgstr ""
+
+msgid "From last sent message"
+msgstr ""
+
+msgid "Never"
+msgstr ""
+
+msgid "Show Idle Time"
+msgstr ""
+
+msgid "Show Offline Buddies"
+msgstr ""
+
+msgid "Notify buddies when you are typing"
+msgstr ""
+
+msgid "Log format"
+msgstr ""
+
+msgid "Log IMs"
+msgstr ""
+
+msgid "Log chats"
+msgstr ""
+
+msgid "Log status change events"
+msgstr ""
+
+msgid "Report Idle time"
+msgstr ""
+
+msgid "Change status when idle"
+msgstr ""
+
+msgid "Minutes before changing status"
+msgstr ""
+
+msgid "Change status to"
+msgstr ""
+
+msgid "Conversations"
+msgstr ""
+
+msgid "Logging"
+msgstr ""
+
+msgid "You must fill all the required fields."
+msgstr ""
+
+msgid "The required fields are underlined."
+msgstr ""
+
+msgid "Not implemented yet."
+msgstr ""
+
+msgid "Save File..."
+msgstr ""
+
+msgid "Open File..."
+msgstr ""
+
+msgid "Choose Location..."
+msgstr ""
+
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr ""
+
+msgid "Get"
+msgstr ""
+
+#. Create the window.
+msgid "Room List"
+msgstr ""
+
+msgid "Buddy logs in"
+msgstr ""
+
+msgid "Buddy logs out"
+msgstr ""
+
+msgid "Message received"
+msgstr ""
+
+msgid "Message received begins conversation"
+msgstr ""
+
+msgid "Message sent"
+msgstr ""
+
+msgid "Person enters chat"
+msgstr ""
+
+msgid "Person leaves chat"
+msgstr ""
+
+msgid "You talk in chat"
+msgstr ""
+
+msgid "Others talk in chat"
+msgstr ""
+
+msgid "Someone says your username in chat"
+msgstr ""
+
+msgid "GStreamer Failure"
+msgstr ""
+
+msgid "GStreamer failed to initialize."
+msgstr ""
+
+msgid "(default)"
+msgstr ""
+
+msgid "Select Sound File ..."
+msgstr ""
+
+msgid "Sound Preferences"
+msgstr ""
+
+msgid "Profiles"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Console Beep"
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "No Sound"
+msgstr ""
+
+msgid "Sound Method"
+msgstr ""
+
+msgid "Method: "
+msgstr ""
+
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+
+#. Sound options
+msgid "Sound Options"
+msgstr ""
+
+msgid "Sounds when conversation has focus"
+msgstr ""
+
+msgid "Always"
+msgstr ""
+
+msgid "Only when available"
+msgstr ""
+
+msgid "Only when not available"
+msgstr ""
+
+msgid "Volume(0-100):"
+msgstr ""
+
+#. Sound events
+msgid "Sound Events"
+msgstr ""
+
+msgid "Event"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Test"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Choose..."
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr ""
+
+msgid "Delete Status"
+msgstr ""
+
+msgid "Saved Statuses"
+msgstr ""
+
+msgid "Title"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. saveable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+msgid "Message"
+msgstr ""
+
+#. Use
+msgid "Use"
+msgstr ""
+
+msgid "Invalid title"
+msgstr ""
+
+msgid "Please enter a non-empty title for the status."
+msgstr ""
+
+msgid "Duplicate title"
+msgstr ""
+
+msgid "Please enter a different title for the status."
+msgstr ""
+
+msgid "Substatus"
+msgstr ""
+
+msgid "Status:"
+msgstr ""
+
+msgid "Message:"
+msgstr ""
+
+msgid "Edit Status"
+msgstr ""
+
+msgid "Use different status for following accounts"
+msgstr ""
+
+#. Save & Use
+msgid "Save & Use"
+msgstr ""
+
+msgid "Certificates"
+msgstr ""
+
+msgid "Sounds"
+msgstr ""
+
+msgid "Statuses"
+msgstr ""
+
+msgid "Error loading the plugin."
+msgstr ""
+
+msgid "Couldn't find X display"
+msgstr ""
+
+msgid "Couldn't find window"
+msgstr ""
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+
+msgid "GntClipboard"
+msgstr ""
+
+msgid "Clipboard plugin"
+msgstr ""
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+
+#, c-format
+msgid "%s just signed on"
+msgstr ""
+
+#, c-format
+msgid "%s just signed off"
+msgstr ""
+
+#, c-format
+msgid "%s sent you a message"
+msgstr ""
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr ""
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr ""
+
+msgid "Buddy signs on/off"
+msgstr ""
+
+msgid "You receive an IM"
+msgstr ""
+
+msgid "Someone speaks in a chat"
+msgstr ""
+
+msgid "Someone says your name in a chat"
+msgstr ""
+
+msgid "Notify with a toaster when"
+msgstr ""
+
+msgid "Beep too!"
+msgstr ""
+
+msgid "Set URGENT for the terminal window."
+msgstr ""
+
+msgid "GntGf"
+msgstr ""
+
+msgid "Toaster plugin"
+msgstr ""
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr ""
+
+msgid "History Plugin Requires Logging"
+msgstr ""
+
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+
+msgid "GntHistory"
+msgstr ""
+
+msgid "Shows recently logged conversations in new conversations."
+msgstr ""
+
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+
+msgid "Online"
+msgstr ""
+
+msgid "Offline"
+msgstr ""
+
+msgid "Online Buddies"
+msgstr ""
+
+msgid "Offline Buddies"
+msgstr ""
+
+msgid "Online/Offline"
+msgstr ""
+
+msgid "Meebo"
+msgstr ""
+
+msgid "No Grouping"
+msgstr ""
+
+msgid "Nested Subgroup"
+msgstr ""
+
+msgid "Nested Grouping (experimental)"
+msgstr ""
+
+msgid "Provides alternate buddylist grouping options."
+msgstr ""
+
+msgid "Lastlog"
+msgstr ""
+
+#. Translator Note: The "backlog" is the conversation buffer/history.
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr ""
+
+msgid "GntLastlog"
+msgstr ""
+
+msgid "Lastlog plugin."
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+msgid "TinyURL"
+msgstr ""
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
+msgid "accounts"
+msgstr ""
+
+msgid "Password is required to sign on."
+msgstr ""
+
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr ""
+
+msgid "Enter Password"
+msgstr ""
+
+msgid "Save password"
+msgstr ""
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr ""
+
+msgid "Connection Error"
+msgstr ""
+
+msgid "New passwords do not match."
+msgstr ""
+
+msgid "Fill out all fields completely."
+msgstr ""
+
+msgid "Original password"
+msgstr ""
+
+msgid "New password"
+msgstr ""
+
+msgid "New password (again)"
+msgstr ""
+
+#, c-format
+msgid "Change password for %s"
+msgstr ""
+
+msgid "Please enter your current password and your new password."
+msgstr ""
+
+#, c-format
+msgid "Change user information for %s"
+msgstr ""
+
+msgid "Set User Info"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Buddies"
+msgstr ""
+
+msgid "buddy list"
+msgstr ""
+
+msgid "(DOES NOT MATCH)"
+msgstr ""
+
+#. Make messages
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr ""
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+msgid "Single-use Certificate Verification"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+msgid "Certificate Authorities"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+msgid "SSL Peers Cache"
+msgstr ""
+
+#. Make messages
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+msgid "SSL Certificate Verification"
+msgstr ""
+
+msgid "_View Certificate..."
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr ""
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+msgid "SSL Certificate Error"
+msgstr ""
+
+msgid "Invalid certificate chain"
+msgstr ""
+
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+
+#. vrq will be completed by user_auth
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+
+msgid "Invalid certificate authority signature"
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+
+#. Make messages
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+msgid "Certificate Information"
+msgstr ""
+
+msgid "Registration Error"
+msgstr ""
+
+msgid "Unregistration Error"
+msgstr ""
+
+#, c-format
+msgid "+++ %s signed on"
+msgstr ""
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr ""
+
+#. Unknown error
+#. Unknown error!
+msgid "Unknown error"
+msgstr ""
+
+msgid "Unable to send message: The message is too large."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s."
+msgstr ""
+
+msgid "The message is too large."
+msgstr ""
+
+msgid "Unable to send message."
+msgstr ""
+
+msgid "Send Message"
+msgstr ""
+
+msgid "_Send Message"
+msgstr ""
+
+#, c-format
+msgid "%s entered the room."
+msgstr ""
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr ""
+
+#, c-format
+msgid "You are now known as %s"
+msgstr ""
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr ""
+
+#, c-format
+msgid "%s left the room."
+msgstr ""
+
+#, c-format
+msgid "%s left the room (%s)."
+msgstr ""
+
+msgid "Invite to chat"
+msgstr ""
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr ""
+
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr ""
+
+msgid "No name"
+msgstr ""
+
+msgid "Unable to create new resolver process\n"
+msgstr ""
+
+msgid "Unable to send request to resolver process\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr ""
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr ""
+
+msgid "Unknown reason"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+
+msgid "Directory is not writable."
+msgstr ""
+
+msgid "Cannot send a file of 0 bytes."
+msgstr ""
+
+msgid "Cannot send a directory."
+msgstr ""
+
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr ""
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr ""
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr ""
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr ""
+
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr ""
+
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr ""
+
+msgid "File transfer complete"
+msgstr ""
+
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr ""
+
+msgid "File transfer cancelled"
+msgstr ""
+
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr ""
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr ""
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr ""
+
+msgid "Run the command in a terminal"
+msgstr ""
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr ""
+
+msgid "The handler for \"aim\" URLs"
+msgstr ""
+
+msgid "The handler for \"gg\" URLs"
+msgstr ""
+
+msgid "The handler for \"icq\" URLs"
+msgstr ""
+
+msgid "The handler for \"irc\" URLs"
+msgstr ""
+
+msgid "The handler for \"msnim\" URLs"
+msgstr ""
+
+msgid "The handler for \"sip\" URLs"
+msgstr ""
+
+msgid "The handler for \"xmpp\" URLs"
+msgstr ""
+
+msgid "The handler for \"ymsgr\" URLs"
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr ""
+
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr ""
+
+msgid "HTML"
+msgstr ""
+
+msgid "Plain text"
+msgstr ""
+
+msgid "Old flat format"
+msgstr ""
+
+msgid "Logging of this conversation failed."
+msgstr ""
+
+msgid "XML"
+msgstr ""
+
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr ""
+
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr ""
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr ""
+
+msgid "Error creating conference."
+msgstr ""
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr ""
+
+msgid "This plugin has not defined an ID."
+msgstr ""
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr ""
+
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr ""
+
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+
+msgid "Unable to load the plugin"
+msgstr ""
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr ""
+
+msgid "Unable to load your plugin."
+msgstr ""
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr ""
+
+msgid "Autoaccept"
+msgstr ""
+
+msgid "Auto-accept file transfer requests from selected users."
+msgstr ""
+
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr ""
+
+msgid "Autoaccept complete"
+msgstr ""
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr ""
+
+msgid "Set Autoaccept Setting"
+msgstr ""
+
+msgid "_Save"
+msgstr ""
+
+msgid "_Cancel"
+msgstr ""
+
+msgid "Ask"
+msgstr ""
+
+msgid "Auto Accept"
+msgstr ""
+
+msgid "Auto Reject"
+msgstr ""
+
+msgid "Autoaccept File Transfers..."
+msgstr ""
+
+#. XXX: Is there a better way than this? There really should be.
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+
+msgid "Automatically reject from users not in buddy list"
+msgstr ""
+
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+
+msgid "Create a new directory for each user"
+msgstr ""
+
+msgid "Notes"
+msgstr ""
+
+msgid "Enter your notes below..."
+msgstr ""
+
+msgid "Edit Notes..."
+msgstr ""
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Notes"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Store notes on particular buddies."
+msgstr ""
+
+#. *< summary
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Cipher Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests the ciphers that ship with libpurple."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "DBus Example"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "DBus Plugin Example"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "File Control"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Allows control by entering commands in a file."
+msgstr ""
+
+msgid "Minutes"
+msgstr ""
+
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+msgid "I'dle Mak'er"
+msgstr ""
+
+msgid "Set Account Idle Time"
+msgstr ""
+
+msgid "_Set"
+msgstr ""
+
+msgid "None of your accounts are idle."
+msgstr ""
+
+msgid "Unset Account Idle Time"
+msgstr ""
+
+msgid "_Unset"
+msgstr ""
+
+msgid "Set Idle Time for All Accounts"
+msgstr ""
+
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr ""
+
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Client"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a client."
+msgstr ""
+
+#. *  description
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Server"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a server."
+msgstr ""
+
+#. *  description
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+
+msgid "Join/Part Hiding Configuration"
+msgstr ""
+
+msgid "Minimum Room Size"
+msgstr ""
+
+msgid "User Inactivity Timeout (in minutes)"
+msgstr ""
+
+msgid "Apply hiding rules to buddies"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Join/Part Hiding"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Hides extraneous join/part messages."
+msgstr ""
+
+#. *  description
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+
+#. This is used in the place of a timezone abbreviation if the
+#. * offset is way off.  The user should never really see it, but
+#. * it's here just in case.  The parens are to make it clear it's
+#. * not a real timezone.
+msgid "(UTC)"
+msgstr ""
+
+msgid "User is offline."
+msgstr ""
+
+msgid "Auto-response sent:"
+msgstr ""
+
+#, c-format
+msgid "%s has signed off."
+msgstr ""
+
+msgid "One or more messages may have been undeliverable."
+msgstr ""
+
+msgid "You were disconnected from the server."
+msgstr ""
+
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr ""
+
+msgid "Message could not be sent."
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Adium"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Fire"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Messenger Plus!"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "QIP"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "MSN Messenger"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Trillian"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "aMSN"
+msgstr ""
+
+#. Add general preferences.
+msgid "General Log Reading Configuration"
+msgstr ""
+
+msgid "Fast size calculations"
+msgstr ""
+
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+msgid "Log Directory"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Log Reader"
+msgstr ""
+
+#. *< name
+#. *< version
+#. * summary
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr ""
+
+#. * description
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+
+msgid "Mono Plugin Loader"
+msgstr ""
+
+msgid "Loads .NET plugins with Mono."
+msgstr ""
+
+msgid "Add new line in IMs"
+msgstr ""
+
+msgid "Add new line in Chats"
+msgstr ""
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "New Line"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Prepends a newline to displayed message."
+msgstr ""
+
+#. *< summary
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the username in the conversation window."
+msgstr ""
+
+msgid "Offline Message Emulation"
+msgstr ""
+
+msgid "Save messages sent to an offline user as pounce."
+msgstr ""
+
+msgid ""
+"The rest of the messages will be saved as pounces. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+
+#, c-format
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+
+msgid "Offline Message"
+msgstr ""
+
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Save offline messages in pounce"
+msgstr ""
+
+msgid "Do not ask. Always save in pounce."
+msgstr ""
+
+msgid "One Time Password"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Perl Plugin Loader"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+msgid "Provides support for loading perl plugins."
+msgstr ""
+
+msgid "Psychic Mode"
+msgstr ""
+
+msgid "Psychic mode for incoming conversation"
+msgstr ""
+
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+
+msgid "You feel a disturbance in the force..."
+msgstr ""
+
+msgid "Only enable for users on the buddy list"
+msgstr ""
+
+msgid "Disable when away"
+msgstr ""
+
+msgid "Display notification message in conversations"
+msgstr ""
+
+msgid "Raise psychic conversations"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all signals are working properly."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Simple Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests to see that most things are working."
+msgstr ""
+
+#. Scheme name
+msgid "X.509 Certificates"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "NSS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through Mozilla NSS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+
+#, c-format
+msgid "%s is no longer away."
+msgstr ""
+
+#, c-format
+msgid "%s has gone away."
+msgstr ""
+
+#, c-format
+msgid "%s has become idle."
+msgstr ""
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr ""
+
+#, c-format
+msgid "%s has signed on."
+msgstr ""
+
+msgid "Notify When"
+msgstr ""
+
+msgid "Buddy Goes _Away"
+msgstr ""
+
+msgid "Buddy Goes _Idle"
+msgstr ""
+
+msgid "Buddy _Signs On/Off"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy State Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+
+msgid "Tcl Plugin Loader"
+msgstr ""
+
+msgid "Provides support for loading Tcl plugins"
+msgstr ""
+
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+
+msgid ""
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr ""
+
+msgid "Unable to listen for incoming IM connections"
+msgstr ""
+
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+
+msgid "First name"
+msgstr ""
+
+msgid "Last name"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "AIM Account"
+msgstr ""
+
+msgid "XMPP Account"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Bonjour Protocol Plugin"
+msgstr ""
+
+msgid "Purple Person"
+msgstr ""
+
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr ""
+
+msgid "Bonjour"
+msgstr ""
+
+#, c-format
+msgid "%s has closed the conversation."
+msgstr ""
+
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr ""
+
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+
+msgid "Error communicating with local mDNSResponder."
+msgstr ""
+
+msgid "Invalid proxy settings"
+msgstr ""
+
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+
+msgid "Token Error"
+msgstr ""
+
+msgid "Unable to fetch the token.\n"
+msgstr ""
+
+msgid "Save Buddylist..."
+msgstr ""
+
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr ""
+
+msgid "Buddylist saved successfully!"
+msgstr ""
+
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr ""
+
+msgid "Couldn't load buddylist"
+msgstr ""
+
+msgid "Load Buddylist..."
+msgstr ""
+
+msgid "Buddylist loaded successfully!"
+msgstr ""
+
+msgid "Save buddylist..."
+msgstr ""
+
+msgid "Load buddylist from file..."
+msgstr ""
+
+msgid "You must fill in all registration fields"
+msgstr ""
+
+msgid "Passwords do not match"
+msgstr ""
+
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+
+msgid "New Gadu-Gadu Account Registered"
+msgstr ""
+
+msgid "Registration completed successfully!"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password (again)"
+msgstr ""
+
+msgid "Enter captcha text"
+msgstr ""
+
+msgid "Captcha"
+msgstr ""
+
+msgid "Register New Gadu-Gadu Account"
+msgstr ""
+
+msgid "Please, fill in the following fields"
+msgstr ""
+
+msgid "City"
+msgstr ""
+
+msgid "Year of birth"
+msgstr ""
+
+msgid "Gender"
+msgstr ""
+
+msgid "Male or female"
+msgstr ""
+
+msgid "Male"
+msgstr ""
+
+msgid "Female"
+msgstr ""
+
+msgid "Only online"
+msgstr ""
+
+msgid "Find buddies"
+msgstr ""
+
+msgid "Please, enter your search criteria below"
+msgstr ""
+
+msgid "Fill in the fields."
+msgstr ""
+
+msgid "Your current password is different from the one that you specified."
+msgstr ""
+
+msgid "Unable to change password. Error occurred.\n"
+msgstr ""
+
+msgid "Change password for the Gadu-Gadu account"
+msgstr ""
+
+msgid "Password was changed successfully!"
+msgstr ""
+
+msgid "Current password"
+msgstr ""
+
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
+msgid "Please, enter your current password and your new password for UIN: "
+msgstr ""
+
+msgid "Change Gadu-Gadu Password"
+msgstr ""
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr ""
+
+msgid "Add to chat..."
+msgstr ""
+
+#. Global
+msgid "Available"
+msgstr ""
+
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+msgid "Away"
+msgstr ""
+
+msgid "UIN"
+msgstr ""
+
+msgid "First Name"
+msgstr ""
+
+msgid "Birth Year"
+msgstr ""
+
+msgid "Unable to display the search results."
+msgstr ""
+
+msgid "Gadu-Gadu Public Directory"
+msgstr ""
+
+msgid "Search results"
+msgstr ""
+
+msgid "No matching users found"
+msgstr ""
+
+msgid "There are no users matching your search criteria."
+msgstr ""
+
+msgid "Unable to read from socket"
+msgstr ""
+
+msgid "Buddy list downloaded"
+msgstr ""
+
+msgid "Your buddy list was downloaded from the server."
+msgstr ""
+
+msgid "Buddy list uploaded"
+msgstr ""
+
+msgid "Your buddy list was stored on the server."
+msgstr ""
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr ""
+
+msgid "Connection failed"
+msgstr ""
+
+msgid "Add to chat"
+msgstr ""
+
+msgid "Chat _name:"
+msgstr ""
+
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr ""
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
+msgid "Chat error"
+msgstr ""
+
+msgid "This chat name is already in use"
+msgstr ""
+
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "Ստեղծել այս հաշիվը սերվերի վրա"
+
+msgid "Find buddies..."
+msgstr ""
+
+msgid "Change password..."
+msgstr ""
+
+msgid "Upload buddylist to Server"
+msgstr ""
+
+msgid "Download buddylist from Server"
+msgstr ""
+
+msgid "Delete buddylist from Server"
+msgstr ""
+
+msgid "Save buddylist to file..."
+msgstr ""
+
+#. magic
+#. major_version
+#. minor_version
+#. plugin type
+#. ui_requirement
+#. flags
+#. dependencies
+#. priority
+#. id
+#. name
+#. version
+msgid "Gadu-Gadu Protocol Plugin"
+msgstr ""
+
+#. summary
+msgid "Polish popular IM"
+msgstr ""
+
+msgid "Gadu-Gadu User"
+msgstr ""
+
+msgid "GG server"
+msgstr ""
+
+#, c-format
+msgid "Unknown command: %s"
+msgstr ""
+
+#, c-format
+msgid "current topic is: %s"
+msgstr ""
+
+msgid "No topic is set"
+msgstr ""
+
+msgid "File Transfer Failed"
+msgstr ""
+
+msgid "Unable to open a listening port."
+msgstr ""
+
+msgid "Error displaying MOTD"
+msgstr ""
+
+msgid "No MOTD available"
+msgstr ""
+
+msgid "There is no MOTD associated with this connection."
+msgstr ""
+
+#, c-format
+msgid "MOTD for %s"
+msgstr ""
+
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+
+msgid "View MOTD"
+msgstr ""
+
+msgid "_Channel:"
+msgstr ""
+
+msgid "_Password:"
+msgstr ""
+
+msgid "IRC nick and server may not contain whitespace"
+msgstr ""
+
+msgid "SSL support unavailable"
+msgstr ""
+
+msgid "Unable to connect"
+msgstr ""
+
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr ""
+
+#, c-format
+msgid "Server closed the connection"
+msgstr ""
+
+msgid "Users"
+msgstr ""
+
+msgid "Topic"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "IRC Protocol Plugin"
+msgstr ""
+
+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr ""
+
+#. host to connect to
+msgid "Server"
+msgstr ""
+
+#. port to connect to
+msgid "Port"
+msgstr ""
+
+msgid "Encodings"
+msgstr ""
+
+msgid "Auto-detect incoming UTF-8"
+msgstr ""
+
+msgid "Real name"
+msgstr ""
+
+#.
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#.
+msgid "Use SSL"
+msgstr ""
+
+msgid "Bad mode"
+msgstr ""
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr ""
+
+#, c-format
+msgid "Ban on %s"
+msgstr ""
+
+msgid "End of ban list"
+msgstr ""
+
+#, c-format
+msgid "You are banned from %s."
+msgstr ""
+
+msgid "Banned"
+msgstr ""
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr ""
+
+msgid " <i>(ircop)</i>"
+msgstr ""
+
+msgid " <i>(identified)</i>"
+msgstr ""
+
+msgid "Nick"
+msgstr ""
+
+msgid "Currently on"
+msgstr ""
+
+msgid "Idle for"
+msgstr ""
+
+msgid "Online since"
+msgstr ""
+
+msgid "<b>Defining adjective:</b>"
+msgstr ""
+
+msgid "Glorious"
+msgstr ""
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr ""
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr ""
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr ""
+
+msgid "Unknown message"
+msgstr ""
+
+msgid "The IRC server received a message it did not understand."
+msgstr ""
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr ""
+
+msgid "Time Response"
+msgstr ""
+
+msgid "The IRC server's local time is:"
+msgstr ""
+
+msgid "No such channel"
+msgstr ""
+
+#. does this happen?
+msgid "no such channel"
+msgstr ""
+
+msgid "User is not logged in"
+msgstr ""
+
+msgid "No such nick or channel"
+msgstr ""
+
+msgid "Could not send"
+msgstr ""
+
+#, c-format
+msgid "Joining %s requires an invitation."
+msgstr ""
+
+msgid "Invitation only"
+msgstr ""
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr ""
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr ""
+
+msgid "Invalid nickname"
+msgstr ""
+
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+msgid "Nickname in use"
+msgstr ""
+
+msgid "Cannot change nick"
+msgstr ""
+
+msgid "Could not change nick"
+msgstr ""
+
+#, c-format
+msgid "You have parted the channel%s%s"
+msgstr ""
+
+msgid "Error: invalid PONG from server"
+msgstr ""
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr ""
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr ""
+
+msgid "Cannot join channel"
+msgstr ""
+
+msgid "Nick or channel is temporarily unavailable."
+msgstr ""
+
+#, c-format
+msgid "Wallops from %s"
+msgstr ""
+
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+
+msgid "chanserv: Send a command to chanserv"
+msgstr ""
+
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+
+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 ""
+
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+msgid "memoserv: Send a command to memoserv"
+msgstr ""
+
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+msgid "names [channel]:  List the users currently in a channel."
+msgstr ""
+
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr ""
+
+msgid "nickserv: Send a command to nickserv"
+msgstr ""
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+
+msgid "operserv: Send a command to operserv"
+msgstr ""
+
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+
+msgid "quote [...]:  Send a raw command to the server."
+msgstr ""
+
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+
+msgid "time: Displays the current local time at the IRC server."
+msgstr ""
+
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr ""
+
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr ""
+
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr ""
+
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr ""
+
+msgid "PONG"
+msgstr ""
+
+msgid "CTCP PING reply"
+msgstr ""
+
+msgid "Disconnected."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr ""
+
+msgid "Ad-Hoc Command Failed"
+msgstr ""
+
+msgid "execute"
+msgstr ""
+
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+
+msgid "Plaintext Authentication"
+msgstr ""
+
+msgid "SASL authentication failed"
+msgstr ""
+
+msgid "Invalid response from server"
+msgstr ""
+
+msgid "Server does not use any supported authentication method"
+msgstr ""
+
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+#, c-format
+msgid "SASL error: %s"
+msgstr ""
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr ""
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+msgid "Unable to establish a connection with the server"
+msgstr ""
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+
+msgid "Unable to establish SSL connection"
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "Family Name"
+msgstr ""
+
+msgid "Given Name"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "Street Address"
+msgstr ""
+
+msgid "Extended Address"
+msgstr ""
+
+msgid "Locality"
+msgstr ""
+
+msgid "Region"
+msgstr ""
+
+msgid "Postal Code"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
+msgid "Telephone"
+msgstr ""
+
+msgid "Organization Name"
+msgstr ""
+
+msgid "Organization Unit"
+msgstr ""
+
+msgid "Role"
+msgstr ""
+
+msgid "Birthday"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Edit XMPP vCard"
+msgstr ""
+
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "Operating System"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Priority"
+msgstr ""
+
+msgid "Resource"
+msgstr ""
+
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+msgid "Logged Off"
+msgstr ""
+
+msgid "Middle Name"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "P.O. Box"
+msgstr ""
+
+msgid "Photo"
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "Un-hide From"
+msgstr ""
+
+msgid "Temporarily Hide From"
+msgstr ""
+
+#. && NOT ME
+msgid "Cancel Presence Notification"
+msgstr ""
+
+msgid "(Re-)Request authorization"
+msgstr ""
+
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+msgid "Unsubscribe"
+msgstr ""
+
+msgid "Log In"
+msgstr ""
+
+msgid "Log Out"
+msgstr ""
+
+msgid "Chatty"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "JID"
+msgstr ""
+
+msgid "Last Name"
+msgstr ""
+
+msgid "The following are the results of your search"
+msgstr ""
+
+#. current comment from Jabber User Directory users.jabber.org
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+
+msgid "Directory Query Failed"
+msgstr ""
+
+msgid "Could not query the directory server."
+msgstr ""
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#, c-format
+msgid "Server Instructions: %s"
+msgstr ""
+
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+
+msgid "Email Address"
+msgstr ""
+
+msgid "Search for XMPP users"
+msgstr ""
+
+#. "Search"
+msgid "Search"
+msgstr ""
+
+msgid "Invalid Directory"
+msgstr ""
+
+msgid "Enter a User Directory"
+msgstr ""
+
+msgid "Select a user directory to search"
+msgstr ""
+
+msgid "Search Directory"
+msgstr ""
+
+msgid "_Room:"
+msgstr ""
+
+msgid "_Server:"
+msgstr ""
+
+msgid "_Handle:"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid room name"
+msgstr ""
+
+msgid "Invalid Room Name"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr ""
+
+msgid "Invalid Server Name"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr ""
+
+msgid "Invalid Room Handle"
+msgstr ""
+
+msgid "Configuration error"
+msgstr ""
+
+msgid "Unable to configure"
+msgstr ""
+
+msgid "Room Configuration Error"
+msgstr ""
+
+msgid "This room is not capable of being configured"
+msgstr ""
+
+msgid "Registration error"
+msgstr ""
+
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr ""
+
+msgid "Error retrieving room list"
+msgstr ""
+
+msgid "Invalid Server"
+msgstr ""
+
+msgid "Enter a Conference Server"
+msgstr ""
+
+msgid "Select a conference server to query"
+msgstr ""
+
+msgid "Find Rooms"
+msgstr ""
+
+msgid "Affiliations:"
+msgstr ""
+
+msgid "No users found"
+msgstr ""
+
+msgid "Roles:"
+msgstr ""
+
+msgid "Ping timed out"
+msgstr ""
+
+msgid ""
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
+msgstr ""
+
+msgid "Invalid XMPP ID"
+msgstr ""
+
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr ""
+
+msgid "Malformed BOSH URL"
+msgstr ""
+
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr ""
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr ""
+
+msgid "Registration Successful"
+msgstr ""
+
+msgid "Registration Failed"
+msgstr ""
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr ""
+
+msgid "Unregistration Successful"
+msgstr ""
+
+msgid "Unregistration Failed"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Postal code"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
+msgid "Already Registered"
+msgstr ""
+
+msgid "Unregister"
+msgstr ""
+
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+
+msgid "Please fill out the information below to register your new account."
+msgstr ""
+
+msgid "Register New XMPP Account"
+msgstr ""
+
+msgid "Register"
+msgstr ""
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr ""
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr ""
+
+msgid "Change Registration"
+msgstr ""
+
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
+msgid "Error unregistering account"
+msgstr ""
+
+msgid "Account successfully unregistered"
+msgstr ""
+
+msgid "Initializing Stream"
+msgstr ""
+
+msgid "Initializing SSL/TLS"
+msgstr ""
+
+msgid "Authenticating"
+msgstr ""
+
+msgid "Re-initializing Stream"
+msgstr ""
+
+msgid "Server doesn't support blocking"
+msgstr ""
+
+msgid "Not Authorized"
+msgstr ""
+
+msgid "Mood"
+msgstr ""
+
+msgid "Now Listening"
+msgstr ""
+
+msgid "Both"
+msgstr ""
+
+msgid "From (To pending)"
+msgstr ""
+
+msgid "From"
+msgstr ""
+
+msgid "To"
+msgstr ""
+
+msgid "None (To pending)"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Subscription"
+msgstr ""
+
+msgid "Mood Text"
+msgstr ""
+
+msgid "Allow Buzz"
+msgstr ""
+
+msgid "Tune Artist"
+msgstr ""
+
+msgid "Tune Title"
+msgstr ""
+
+msgid "Tune Album"
+msgstr ""
+
+msgid "Tune Genre"
+msgstr ""
+
+msgid "Tune Comment"
+msgstr ""
+
+msgid "Tune Track"
+msgstr ""
+
+msgid "Tune Time"
+msgstr ""
+
+msgid "Tune Year"
+msgstr ""
+
+msgid "Tune URL"
+msgstr ""
+
+msgid "Password Changed"
+msgstr ""
+
+msgid "Your password has been changed."
+msgstr ""
+
+msgid "Error changing password"
+msgstr ""
+
+msgid "Change XMPP Password"
+msgstr ""
+
+msgid "Please enter your new password"
+msgstr ""
+
+msgid "Set User Info..."
+msgstr ""
+
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+msgid "Change Password..."
+msgstr ""
+
+#. }
+msgid "Search for Users..."
+msgstr ""
+
+msgid "Bad Request"
+msgstr ""
+
+msgid "Conflict"
+msgstr ""
+
+msgid "Feature Not Implemented"
+msgstr ""
+
+msgid "Forbidden"
+msgstr ""
+
+msgid "Gone"
+msgstr ""
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Item Not Found"
+msgstr ""
+
+msgid "Malformed XMPP ID"
+msgstr ""
+
+msgid "Not Acceptable"
+msgstr ""
+
+msgid "Not Allowed"
+msgstr ""
+
+msgid "Payment Required"
+msgstr ""
+
+msgid "Recipient Unavailable"
+msgstr ""
+
+msgid "Registration Required"
+msgstr ""
+
+msgid "Remote Server Not Found"
+msgstr ""
+
+msgid "Remote Server Timeout"
+msgstr ""
+
+msgid "Server Overloaded"
+msgstr ""
+
+msgid "Service Unavailable"
+msgstr ""
+
+msgid "Subscription Required"
+msgstr ""
+
+msgid "Unexpected Request"
+msgstr ""
+
+msgid "Authorization Aborted"
+msgstr ""
+
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+msgid "Invalid authzid"
+msgstr ""
+
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+msgid "Authorization mechanism too weak"
+msgstr ""
+
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+msgid "Authentication Failure"
+msgstr ""
+
+msgid "Bad Format"
+msgstr ""
+
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+msgid "Resource Conflict"
+msgstr ""
+
+msgid "Connection Timeout"
+msgstr ""
+
+msgid "Host Gone"
+msgstr ""
+
+msgid "Host Unknown"
+msgstr ""
+
+msgid "Improper Addressing"
+msgstr ""
+
+msgid "Invalid ID"
+msgstr ""
+
+msgid "Invalid Namespace"
+msgstr ""
+
+msgid "Invalid XML"
+msgstr ""
+
+msgid "Non-matching Hosts"
+msgstr ""
+
+msgid "Policy Violation"
+msgstr ""
+
+msgid "Remote Connection Failed"
+msgstr ""
+
+msgid "Resource Constraint"
+msgstr ""
+
+msgid "Restricted XML"
+msgstr ""
+
+msgid "See Other Host"
+msgstr ""
+
+msgid "System Shutdown"
+msgstr ""
+
+msgid "Undefined Condition"
+msgstr ""
+
+msgid "Unsupported Encoding"
+msgstr ""
+
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+msgid "Unsupported Version"
+msgstr ""
+
+msgid "XML Not Well Formed"
+msgstr ""
+
+msgid "Stream Error"
+msgstr ""
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+msgid "Buzz"
+msgstr ""
+
+#, c-format
+msgid "%s has buzzed you!"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+msgid "Media Initiation Failed"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+msgid "Select a Resource"
+msgstr ""
+
+msgid "Initiate Media"
+msgstr ""
+
+msgid "config:  Configure a chat room."
+msgstr ""
+
+msgid "configure:  Configure a chat room."
+msgstr ""
+
+msgid "part [room]:  Leave the room."
+msgstr ""
+
+msgid "register:  Register with a chat room."
+msgstr ""
+
+msgid "topic [new topic]:  View or change the topic."
+msgstr ""
+
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr ""
+
+msgid ""
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
+msgstr ""
+
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
+msgstr ""
+
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr ""
+
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr ""
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr ""
+
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+
+msgid "buzz: Buzz a user to get their attention"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr ""
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+msgid "Domain"
+msgstr ""
+
+msgid "Require SSL/TLS"
+msgstr ""
+
+msgid "Force old (port 5223) SSL"
+msgstr ""
+
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+msgid "Connect port"
+msgstr ""
+
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
+#. Account options
+msgid "Connect server"
+msgstr ""
+
+msgid "File transfer proxies"
+msgstr ""
+
+msgid "BOSH URL"
+msgstr ""
+
+#. this should probably be part of global smiley theme settings later on,
+#. shared with MSN
+msgid "Show Custom Smileys"
+msgstr ""
+
+#, c-format
+msgid "%s has left the conversation."
+msgstr ""
+
+#, c-format
+msgid "Message from %s"
+msgstr ""
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr ""
+
+#, c-format
+msgid "The topic is: %s"
+msgstr ""
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr ""
+
+msgid "XMPP Message Error"
+msgstr ""
+
+#, c-format
+msgid "(Code %s)"
+msgstr ""
+
+msgid "XML Parse error"
+msgstr ""
+
+msgid "Unknown Error in presence"
+msgstr ""
+
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
+msgid "Create New Room"
+msgstr ""
+
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+
+msgid "_Configure Room"
+msgstr ""
+
+msgid "_Accept Defaults"
+msgstr ""
+
+msgid "No reason"
+msgstr ""
+
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr ""
+
+#, c-format
+msgid "Kicked (%s)"
+msgstr ""
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr ""
+
+msgid "Failed to open the file"
+msgstr ""
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr ""
+
+msgid "File Send Failed"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr ""
+
+msgid "Edit User Mood"
+msgstr ""
+
+msgid "Please select your mood from the list."
+msgstr ""
+
+msgid "Set"
+msgstr ""
+
+msgid "Set Mood..."
+msgstr ""
+
+msgid "Set User Nickname"
+msgstr ""
+
+msgid "Please specify a new nickname for you."
+msgstr ""
+
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+msgid "Set Nickname..."
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Select an action"
+msgstr ""
+
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr ""
+
+msgid "Buddy Add error"
+msgstr ""
+
+msgid "The username specified does not exist."
+msgstr ""
+
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+
+#, c-format
+msgid "Unable to parse message"
+msgstr ""
+
+#, c-format
+msgid "Syntax Error (probably a client bug)"
+msgstr ""
+
+#, c-format
+msgid "Invalid email address"
+msgstr ""
+
+#, c-format
+msgid "User does not exist"
+msgstr ""
+
+#, c-format
+msgid "Fully qualified domain name missing"
+msgstr ""
+
+#, c-format
+msgid "Already logged in"
+msgstr ""
+
+#, c-format
+msgid "Invalid username"
+msgstr ""
+
+#, c-format
+msgid "Invalid friendly name"
+msgstr ""
+
+#, c-format
+msgid "List full"
+msgstr ""
+
+#, c-format
+msgid "Already there"
+msgstr ""
+
+#, c-format
+msgid "Not on list"
+msgstr ""
+
+#, c-format
+msgid "User is offline"
+msgstr ""
+
+#, c-format
+msgid "Already in the mode"
+msgstr ""
+
+#, c-format
+msgid "Already in opposite list"
+msgstr ""
+
+#, c-format
+msgid "Too many groups"
+msgstr ""
+
+#, c-format
+msgid "Invalid group"
+msgstr ""
+
+#, c-format
+msgid "User not in group"
+msgstr ""
+
+#, c-format
+msgid "Group name too long"
+msgstr ""
+
+#, c-format
+msgid "Cannot remove group zero"
+msgstr ""
+
+#, c-format
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr ""
+
+#, c-format
+msgid "Switchboard failed"
+msgstr ""
+
+#, c-format
+msgid "Notify transfer failed"
+msgstr ""
+
+#, c-format
+msgid "Required fields missing"
+msgstr ""
+
+#, c-format
+msgid "Too many hits to a FND"
+msgstr ""
+
+#, c-format
+msgid "Not logged in"
+msgstr ""
+
+#, c-format
+msgid "Service temporarily unavailable"
+msgstr ""
+
+#, c-format
+msgid "Database server error"
+msgstr ""
+
+#, c-format
+msgid "Command disabled"
+msgstr ""
+
+#, c-format
+msgid "File operation error"
+msgstr ""
+
+#, c-format
+msgid "Memory allocation error"
+msgstr ""
+
+#, c-format
+msgid "Wrong CHL value sent to server"
+msgstr ""
+
+#, c-format
+msgid "Server busy"
+msgstr ""
+
+#, c-format
+msgid "Server unavailable"
+msgstr ""
+
+#, c-format
+msgid "Peer notification server down"
+msgstr ""
+
+#, c-format
+msgid "Database connect error"
+msgstr ""
+
+#, c-format
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#, c-format
+msgid "Error creating connection"
+msgstr ""
+
+#, c-format
+msgid "CVR parameters are either unknown or not allowed"
+msgstr ""
+
+#, c-format
+msgid "Unable to write"
+msgstr ""
+
+#, c-format
+msgid "Session overload"
+msgstr ""
+
+#, c-format
+msgid "User is too active"
+msgstr ""
+
+#, c-format
+msgid "Too many sessions"
+msgstr ""
+
+#, c-format
+msgid "Passport not verified"
+msgstr ""
+
+#, c-format
+msgid "Bad friend file"
+msgstr ""
+
+#, c-format
+msgid "Not expected"
+msgstr ""
+
+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr ""
+
+#, c-format
+msgid "Server too busy"
+msgstr ""
+
+#, c-format
+msgid "Authentication failed"
+msgstr ""
+
+#, c-format
+msgid "Not allowed when offline"
+msgstr ""
+
+#, c-format
+msgid "Not accepting new users"
+msgstr ""
+
+#, c-format
+msgid "Kids Passport without parental consent"
+msgstr ""
+
+#, c-format
+msgid "Passport account not yet verified"
+msgstr ""
+
+msgid "Passport account suspended"
+msgstr ""
+
+#, c-format
+msgid "Bad ticket"
+msgstr ""
+
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr ""
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr ""
+
+msgid "Other Contacts"
+msgstr ""
+
+msgid "Non-IM Contacts"
+msgstr ""
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
+msgid "Nudge"
+msgstr ""
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr ""
+
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
+
+msgid "Email Address..."
+msgstr ""
+
+msgid "Your new MSN friendly name is too long."
+msgstr ""
+
+msgid "Set your friendly name."
+msgstr ""
+
+msgid "This is the name that other MSN buddies will see you as."
+msgstr ""
+
+msgid "Set your home phone number."
+msgstr ""
+
+msgid "Set your work phone number."
+msgstr ""
+
+msgid "Set your mobile phone number."
+msgstr ""
+
+msgid "Allow MSN Mobile pages?"
+msgstr ""
+
+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 ""
+
+msgid "Allow"
+msgstr ""
+
+msgid "Disallow"
+msgstr ""
+
+#, c-format
+msgid "Blocked Text for %s"
+msgstr ""
+
+msgid "No text is blocked for this account."
+msgstr ""
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+
+msgid "This account does not have email enabled."
+msgstr ""
+
+msgid "Send a mobile message."
+msgstr ""
+
+msgid "Page"
+msgstr ""
+
+msgid "Playing a game"
+msgstr ""
+
+msgid "Working"
+msgstr ""
+
+msgid "Has you"
+msgstr ""
+
+msgid "Home Phone Number"
+msgstr ""
+
+msgid "Work Phone Number"
+msgstr ""
+
+msgid "Mobile Phone Number"
+msgstr ""
+
+msgid "Be Right Back"
+msgstr ""
+
+msgid "Busy"
+msgstr ""
+
+msgid "On the Phone"
+msgstr ""
+
+msgid "Out to Lunch"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+msgid "Artist"
+msgstr ""
+
+msgid "Album"
+msgstr ""
+
+msgid "Game Title"
+msgstr ""
+
+msgid "Office Title"
+msgstr ""
+
+msgid "Set Friendly Name..."
+msgstr ""
+
+msgid "Set Home Phone Number..."
+msgstr ""
+
+msgid "Set Work Phone Number..."
+msgstr ""
+
+msgid "Set Mobile Phone Number..."
+msgstr ""
+
+msgid "Enable/Disable Mobile Devices..."
+msgstr ""
+
+msgid "Allow/Disallow Mobile Pages..."
+msgstr ""
+
+msgid "View Blocked Text..."
+msgstr ""
+
+msgid "Open Hotmail Inbox"
+msgstr ""
+
+msgid "Send to Mobile"
+msgstr ""
+
+msgid "Initiate _Chat"
+msgstr ""
+
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+
+msgid "Error retrieving profile"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Age"
+msgstr ""
+
+msgid "Occupation"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Hobbies and Interests"
+msgstr ""
+
+msgid "A Little About Me"
+msgstr ""
+
+msgid "Social"
+msgstr ""
+
+msgid "Marital Status"
+msgstr ""
+
+msgid "Interests"
+msgstr ""
+
+msgid "Pets"
+msgstr ""
+
+msgid "Hometown"
+msgstr ""
+
+msgid "Places Lived"
+msgstr ""
+
+msgid "Fashion"
+msgstr ""
+
+msgid "Humor"
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Favorite Quote"
+msgstr ""
+
+msgid "Contact Info"
+msgstr ""
+
+msgid "Personal"
+msgstr ""
+
+msgid "Significant Other"
+msgstr ""
+
+msgid "Home Phone"
+msgstr ""
+
+msgid "Home Phone 2"
+msgstr ""
+
+msgid "Home Address"
+msgstr ""
+
+msgid "Personal Mobile"
+msgstr ""
+
+msgid "Home Fax"
+msgstr ""
+
+msgid "Personal Email"
+msgstr ""
+
+msgid "Personal IM"
+msgstr ""
+
+msgid "Anniversary"
+msgstr ""
+
+#. Business
+msgid "Work"
+msgstr ""
+
+msgid "Job Title"
+msgstr ""
+
+msgid "Company"
+msgstr ""
+
+msgid "Department"
+msgstr ""
+
+msgid "Profession"
+msgstr ""
+
+msgid "Work Phone"
+msgstr ""
+
+msgid "Work Phone 2"
+msgstr ""
+
+msgid "Work Address"
+msgstr ""
+
+msgid "Work Mobile"
+msgstr ""
+
+msgid "Work Pager"
+msgstr ""
+
+msgid "Work Fax"
+msgstr ""
+
+msgid "Work Email"
+msgstr ""
+
+msgid "Work IM"
+msgstr ""
+
+msgid "Start Date"
+msgstr ""
+
+msgid "Favorite Things"
+msgstr ""
+
+msgid "Last Updated"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "The user has not created a public profile."
+msgstr ""
+
+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 ""
+
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+
+msgid "View web profile"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *< summary
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr ""
+
+msgid "Use HTTP Method"
+msgstr ""
+
+msgid "HTTP Method Server"
+msgstr ""
+
+msgid "Show custom smileys"
+msgstr ""
+
+msgid "nudge: nudge a user to get their attention"
+msgstr ""
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr ""
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr ""
+
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr ""
+
+#, c-format
+msgid "Unknown error (%d): %s"
+msgstr ""
+
+msgid "Unable to add user"
+msgstr ""
+
+#, c-format
+msgid "Unknown error (%d)"
+msgstr ""
+
+msgid "The following users are missing from your addressbook"
+msgstr ""
+
+msgid "Mobile message was not sent because it was too long."
+msgstr ""
+
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr ""
+
+msgid "Writing error"
+msgstr ""
+
+msgid "Reading error"
+msgstr ""
+
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
+"%s"
+msgstr ""
+
+msgid "Our protocol is not supported by the server"
+msgstr ""
+
+msgid "Error parsing HTTP"
+msgstr ""
+
+msgid "You have signed on from another location"
+msgstr ""
+
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr ""
+
+msgid "The MSN servers are going down temporarily"
+msgstr ""
+
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr ""
+
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+
+msgid "Handshaking"
+msgstr ""
+
+msgid "Transferring"
+msgstr ""
+
+msgid "Starting authentication"
+msgstr ""
+
+msgid "Getting cookie"
+msgstr ""
+
+msgid "Sending cookie"
+msgstr ""
+
+msgid "Retrieving buddy list"
+msgstr ""
+
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+msgid "Away From Computer"
+msgstr ""
+
+msgid "On The Phone"
+msgstr ""
+
+msgid "Out To Lunch"
+msgstr ""
+
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr ""
+
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr ""
+
+msgid "Message could not be sent because the user is offline:"
+msgstr ""
+
+msgid "Message could not be sent because a connection error occurred:"
+msgstr ""
+
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr ""
+
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr ""
+
+msgid "Delete Buddy from Address Book?"
+msgstr ""
+
+msgid "Do you want to delete this buddy from your address book as well?"
+msgstr ""
+
+msgid "The username specified is invalid."
+msgstr ""
+
+msgid "This Hotmail account may not be active."
+msgstr ""
+
+msgid "Profile URL"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "MSN Protocol Plugin"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+msgid "Unknown error."
+msgstr ""
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+msgid "User lookup"
+msgstr ""
+
+msgid "Reading challenge"
+msgstr ""
+
+msgid "Unexpected challenge length from server"
+msgstr ""
+
+msgid "Logging in"
+msgstr ""
+
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+msgid "Lost connection with server"
+msgstr ""
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
+msgid "New mail messages"
+msgstr ""
+
+msgid "New blog comments"
+msgstr ""
+
+msgid "New profile comments"
+msgstr ""
+
+msgid "New friend requests!"
+msgstr ""
+
+msgid "New picture comments"
+msgstr ""
+
+msgid "MySpace"
+msgstr ""
+
+msgid "IM Friends"
+msgstr ""
+
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Add contacts from server"
+msgstr ""
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr ""
+
+msgid "Incorrect username or password"
+msgstr ""
+
+msgid "MySpaceIM Error"
+msgstr ""
+
+msgid "Invalid input condition"
+msgstr ""
+
+msgid "Failed to add buddy"
+msgstr ""
+
+msgid "'addbuddy' command failed."
+msgstr ""
+
+msgid "persist command failed"
+msgstr ""
+
+msgid "Failed to remove buddy"
+msgstr ""
+
+msgid "'delbuddy' command failed"
+msgstr ""
+
+msgid "blocklist command failed"
+msgstr ""
+
+msgid "Missing Cipher"
+msgstr ""
+
+msgid "The RC4 cipher could not be found"
+msgstr ""
+
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+
+msgid "Add friends from MySpace.com"
+msgstr ""
+
+msgid "Importing friends failed"
+msgstr ""
+
+#. TODO: find out how
+msgid "Find people..."
+msgstr ""
+
+msgid "Change IM name..."
+msgstr ""
+
+msgid "myim URL handler"
+msgstr ""
+
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+msgid "Show display name in status text"
+msgstr ""
+
+msgid "Show headline in status text"
+msgstr ""
+
+msgid "Send emoticons"
+msgstr ""
+
+msgid "Screen resolution (dots per inch)"
+msgstr ""
+
+msgid "Base font size (points)"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Headline"
+msgstr ""
+
+msgid "Song"
+msgstr ""
+
+msgid "Total Friends"
+msgstr ""
+
+msgid "Client Version"
+msgstr ""
+
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
+msgid "MySpaceIM - Username Available"
+msgstr ""
+
+msgid "This username is available. Would you like to set it?"
+msgstr ""
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr ""
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
+msgid "This username is unavailable."
+msgstr ""
+
+msgid "Please try another username:"
+msgstr ""
+
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr ""
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
+#. TODO: icons for each zap
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+msgid "Zap"
+msgstr ""
+
+#, c-format
+msgid "%s has zapped you!"
+msgstr ""
+
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#. Whack means "to hit or strike someone with a sharp blow"
+msgid "Whack"
+msgstr ""
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr ""
+
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+msgid "Torch"
+msgstr ""
+
+#, c-format
+msgid "%s has torched you!"
+msgstr ""
+
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr ""
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr ""
+
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#. A hug is a display of affection; wrapping your arms around someone
+msgid "Hug"
+msgstr ""
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr ""
+
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr ""
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr ""
+
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#. Goose means "to pinch someone on their butt"
+msgid "Goose"
+msgstr ""
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr ""
+
+#, c-format
+msgid "Goosing %s..."
+msgstr ""
+
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+msgid "High-five"
+msgstr ""
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr ""
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr ""
+
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+msgid "Punk"
+msgstr ""
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr ""
+
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+msgid "Raspberry"
+msgstr ""
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr ""
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
+msgid "Required parameters not passed in"
+msgstr ""
+
+msgid "Unable to write to network"
+msgstr ""
+
+msgid "Unable to read from network"
+msgstr ""
+
+msgid "Error communicating with server"
+msgstr ""
+
+msgid "Conference not found"
+msgstr ""
+
+msgid "Conference does not exist"
+msgstr ""
+
+msgid "A folder with that name already exists"
+msgstr ""
+
+msgid "Not supported"
+msgstr ""
+
+msgid "Password has expired"
+msgstr ""
+
+msgid "Incorrect password"
+msgstr ""
+
+msgid "User not found"
+msgstr ""
+
+msgid "Account has been disabled"
+msgstr ""
+
+msgid "The server could not access the directory"
+msgstr ""
+
+msgid "Your system administrator has disabled this operation"
+msgstr ""
+
+msgid "The server is unavailable; try again later"
+msgstr ""
+
+msgid "Cannot add a contact to the same folder twice"
+msgstr ""
+
+msgid "Cannot add yourself"
+msgstr ""
+
+msgid "Master archive is misconfigured"
+msgstr ""
+
+msgid "Could not recognize the host of the username you entered"
+msgstr ""
+
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+
+msgid "You cannot add the same person twice to a conversation"
+msgstr ""
+
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr ""
+
+msgid "You have entered an incorrect username"
+msgstr ""
+
+msgid "An error occurred while updating the directory"
+msgstr ""
+
+msgid "Incompatible protocol version"
+msgstr ""
+
+msgid "The user has blocked you"
+msgstr ""
+
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+
+msgid "The user is either offline or you are blocked"
+msgstr ""
+
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr ""
+
+#, c-format
+msgid "Unable to login: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr ""
+
+#. TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr ""
+
+msgid "Error communicating with server. Closing connection."
+msgstr ""
+
+msgid "Telephone Number"
+msgstr ""
+
+msgid "Personal Title"
+msgstr ""
+
+msgid "Mailstop"
+msgstr ""
+
+msgid "User ID"
+msgstr ""
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. purple_notify_user_info_add_pair(user_info, tag, value);
+#. }
+#.
+msgid "Full name"
+msgstr ""
+
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr ""
+
+msgid "Authenticating..."
+msgstr ""
+
+msgid "Waiting for response..."
+msgstr ""
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr ""
+
+msgid "Invitation to Conversation"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+
+msgid "Would you like to join the conversation?"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+
+msgid ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr ""
+
+msgid "This conference has been closed. No more messages can be sent."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr ""
+
+msgid "Server address"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+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 ""
+
+#, c-format
+msgid "Error requesting "
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+msgid "Could not join chat room"
+msgstr ""
+
+msgid "Invalid chat room name"
+msgstr ""
+
+msgid "Received invalid data on connection with server"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr ""
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr ""
+
+msgid "Encoding"
+msgstr ""
+
+msgid "The remote user has closed the connection."
+msgstr ""
+
+msgid "The remote user has declined your request."
+msgstr ""
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
+
+msgid "Received invalid data on connection with remote user."
+msgstr ""
+
+msgid "Unable to establish a connection with the remote user."
+msgstr ""
+
+msgid "Direct IM established"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+
+msgid "Invalid error"
+msgstr ""
+
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Rate to host"
+msgstr ""
+
+msgid "Rate to client"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr ""
+
+msgid "Service not defined"
+msgstr ""
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+msgid "Not supported by host"
+msgstr ""
+
+msgid "Not supported by client"
+msgstr ""
+
+msgid "Refused by client"
+msgstr ""
+
+msgid "Reply too big"
+msgstr ""
+
+msgid "Responses lost"
+msgstr ""
+
+msgid "Request denied"
+msgstr ""
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr ""
+
+msgid "In local permit/deny"
+msgstr ""
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr ""
+
+msgid "No match"
+msgstr ""
+
+msgid "List overflow"
+msgstr ""
+
+msgid "Request ambiguous"
+msgstr ""
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+
+#, c-format
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "Free For Chat"
+msgstr ""
+
+msgid "Not Available"
+msgstr ""
+
+msgid "Occupied"
+msgstr ""
+
+msgid "Web Aware"
+msgstr ""
+
+msgid "Invisible"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr ""
+
+msgid "Username sent"
+msgstr ""
+
+msgid "Connection established, cookie sent"
+msgstr ""
+
+#. TODO: Don't call this with ssi
+msgid "Finalizing connection"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr ""
+
+#. Suspended account
+msgid "Your account is currently suspended"
+msgstr ""
+
+#. service temporarily unavailable
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr ""
+
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr ""
+
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+msgid "The SecurID key entered is invalid"
+msgstr ""
+
+msgid "Enter SecurID"
+msgstr ""
+
+msgid "Enter the 6 digit number from the digital display."
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr ""
+
+msgid "Password sent"
+msgstr ""
+
+msgid "Unable to initialize connection"
+msgstr ""
+
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "Authorization Request Message:"
+msgstr ""
+
+msgid "Please authorize me!"
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+
+msgid "ICQ authorization denied."
+msgstr ""
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr ""
+
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr ""
+
+msgid "_Add"
+msgstr ""
+
+msgid "_Decline"
+msgstr ""
+
+#, 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] ""
+
+#, 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] ""
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#, 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] ""
+
+#. Data is assumed to be the destination bn
+#, c-format
+msgid "Unable to send message: %s"
+msgstr ""
+
+msgid "Unknown reason."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Your AIM connection may be lost."
+msgstr ""
+
+#. The conversion failed!
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+
+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 ""
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr ""
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr ""
+
+msgid "Position"
+msgstr ""
+
+msgid "Web Page"
+msgstr ""
+
+msgid "Pop-Up Message"
+msgstr ""
+
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "No results found for email address %s"
+msgstr ""
+
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr ""
+
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many usernames associated with it."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+msgid "Error Changing Account Info"
+msgstr ""
+
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+msgid "Account Info"
+msgstr ""
+
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+
+msgid "Unable to set AIM profile."
+msgstr ""
+
+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 ""
+
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Profile too long."
+msgstr ""
+
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Away message too long."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+msgid "Unable to Add"
+msgstr ""
+
+msgid "Unable to Retrieve Buddy List"
+msgstr ""
+
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few minutes."
+msgstr ""
+
+msgid "Orphans"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+
+msgid "(no name)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr ""
+
+#, c-format
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+
+msgid "Authorization Given"
+msgstr ""
+
+#. Granted
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+
+msgid "Authorization Granted"
+msgstr ""
+
+#. Denied
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+
+msgid "Authorization Denied"
+msgstr ""
+
+msgid "_Exchange:"
+msgstr ""
+
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+
+msgid "iTunes Music Store Link"
+msgstr ""
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr ""
+
+msgid "Buddy Comment:"
+msgstr ""
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+msgid "C_onnect"
+msgstr ""
+
+msgid "Get AIM Info"
+msgstr ""
+
+#. We only do this if the user is in our buddy list
+msgid "Edit Buddy Comment"
+msgstr ""
+
+msgid "Get Status Msg"
+msgstr ""
+
+msgid "Direct IM"
+msgstr ""
+
+msgid "Re-request Authorization"
+msgstr ""
+
+msgid "Require authorization"
+msgstr ""
+
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr ""
+
+msgid "ICQ Privacy Options"
+msgstr ""
+
+msgid "The new formatting is invalid."
+msgstr ""
+
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr ""
+
+msgid "Change Address To:"
+msgstr ""
+
+msgid "<i>you are not waiting for authorization</i>"
+msgstr ""
+
+msgid "You are awaiting authorization from the following buddies"
+msgstr ""
+
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+
+msgid "Find Buddy by Email"
+msgstr ""
+
+msgid "Search for a buddy by email address"
+msgstr ""
+
+msgid "Type the email address of the buddy you are searching for."
+msgstr ""
+
+msgid "_Search"
+msgstr ""
+
+msgid "Set User Info (web)..."
+msgstr ""
+
+#. This only happens when connecting with the old-style BUCP login
+msgid "Change Password (web)"
+msgstr ""
+
+msgid "Configure IM Forwarding (web)"
+msgstr ""
+
+#. ICQ actions
+msgid "Set Privacy Options..."
+msgstr ""
+
+#. AIM actions
+msgid "Confirm Account"
+msgstr ""
+
+msgid "Display Currently Registered Email Address"
+msgstr ""
+
+msgid "Change Currently Registered Email Address..."
+msgstr ""
+
+msgid "Show Buddies Awaiting Authorization"
+msgstr ""
+
+msgid "Search for Buddy by Email Address..."
+msgstr ""
+
+msgid "Search for Buddy by Information"
+msgstr ""
+
+msgid "Use clientLogin"
+msgstr ""
+
+msgid ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
+msgstr ""
+
+msgid "Allow multiple simultaneous logins"
+msgstr ""
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr ""
+
+msgid "Attempting to connect via proxy server."
+msgstr ""
+
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr ""
+
+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 ""
+
+msgid "Aquarius"
+msgstr ""
+
+msgid "Pisces"
+msgstr ""
+
+msgid "Aries"
+msgstr ""
+
+msgid "Taurus"
+msgstr ""
+
+msgid "Gemini"
+msgstr ""
+
+msgid "Cancer"
+msgstr ""
+
+msgid "Leo"
+msgstr ""
+
+msgid "Virgo"
+msgstr ""
+
+msgid "Libra"
+msgstr ""
+
+msgid "Scorpio"
+msgstr ""
+
+msgid "Sagittarius"
+msgstr ""
+
+msgid "Capricorn"
+msgstr ""
+
+msgid "Rat"
+msgstr ""
+
+msgid "Ox"
+msgstr ""
+
+msgid "Tiger"
+msgstr ""
+
+msgid "Rabbit"
+msgstr ""
+
+msgid "Dragon"
+msgstr ""
+
+msgid "Snake"
+msgstr ""
+
+msgid "Horse"
+msgstr ""
+
+msgid "Goat"
+msgstr ""
+
+msgid "Monkey"
+msgstr ""
+
+msgid "Rooster"
+msgstr ""
+
+msgid "Dog"
+msgstr ""
+
+msgid "Pig"
+msgstr ""
+
+msgid "Other"
+msgstr ""
+
+msgid "Visible"
+msgstr ""
+
+msgid "Friend Only"
+msgstr ""
+
+msgid "Private"
+msgstr ""
+
+msgid "QQ Number"
+msgstr ""
+
+msgid "Country/Region"
+msgstr ""
+
+msgid "Province/State"
+msgstr ""
+
+msgid "Zipcode"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
+msgid "Authorize adding"
+msgstr ""
+
+msgid "Cellphone Number"
+msgstr ""
+
+msgid "Personal Introduction"
+msgstr ""
+
+msgid "City/Area"
+msgstr ""
+
+msgid "Publish Mobile"
+msgstr ""
+
+msgid "Publish Contact"
+msgstr ""
+
+msgid "College"
+msgstr ""
+
+msgid "Horoscope"
+msgstr ""
+
+msgid "Zodiac"
+msgstr ""
+
+msgid "Blood"
+msgstr ""
+
+msgid "True"
+msgstr ""
+
+msgid "False"
+msgstr ""
+
+msgid "Modify Contact"
+msgstr ""
+
+msgid "Modify Address"
+msgstr ""
+
+msgid "Modify Extended Information"
+msgstr ""
+
+msgid "Modify Information"
+msgstr ""
+
+msgid "Update"
+msgstr ""
+
+msgid "Could not change buddy information."
+msgstr ""
+
+msgid "Mobile"
+msgstr ""
+
+msgid "Note"
+msgstr ""
+
+#. callback
+msgid "Buddy Memo"
+msgstr ""
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+msgid "_Modify"
+msgstr ""
+
+msgid "Memo Modify"
+msgstr ""
+
+msgid "Server says:"
+msgstr ""
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, c-format
+msgid "%u requires verification"
+msgstr ""
+
+msgid "Add buddy question"
+msgstr ""
+
+msgid "Enter answer here"
+msgstr ""
+
+msgid "Send"
+msgstr ""
+
+msgid "Invalid answer."
+msgstr ""
+
+msgid "Authorization denied message:"
+msgstr ""
+
+msgid "Sorry, you're not my style."
+msgstr ""
+
+#, c-format
+msgid "%u needs authorization"
+msgstr ""
+
+msgid "Add buddy authorize"
+msgstr ""
+
+msgid "Enter request here"
+msgstr ""
+
+msgid "Would you be my friend?"
+msgstr ""
+
+msgid "QQ Buddy"
+msgstr ""
+
+msgid "Add buddy"
+msgstr ""
+
+msgid "Invalid QQ Number"
+msgstr ""
+
+msgid "Failed sending authorize"
+msgstr ""
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr ""
+
+#, c-format
+msgid "Failed removing me from %d's buddy list"
+msgstr ""
+
+msgid "No reason given"
+msgstr ""
+
+#. only need to get value
+#, c-format
+msgid "You have been added by %s"
+msgstr ""
+
+msgid "Would you like to add him?"
+msgstr ""
+
+#, c-format
+msgid "Rejected by %s"
+msgstr ""
+
+#, c-format
+msgid "Message: %s"
+msgstr ""
+
+msgid "ID: "
+msgstr ""
+
+msgid "Group ID"
+msgstr ""
+
+msgid "QQ Qun"
+msgstr ""
+
+msgid "Please enter Qun number"
+msgstr ""
+
+msgid "You can only search for permanent Qun\n"
+msgstr ""
+
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
+msgid "Not member"
+msgstr ""
+
+msgid "Member"
+msgstr ""
+
+msgid "Requesting"
+msgstr ""
+
+msgid "Admin"
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Detail"
+msgstr ""
+
+msgid "Creator"
+msgstr ""
+
+msgid "About me"
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "The Qun does not allow others to join"
+msgstr ""
+
+msgid "Join QQ Qun"
+msgstr ""
+
+msgid "Input request here"
+msgstr ""
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr ""
+
+msgid "Successfully joined Qun"
+msgstr ""
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr ""
+
+msgid "QQ Qun Operation"
+msgstr ""
+
+msgid "Failed:"
+msgstr ""
+
+msgid "Join Qun, Unknown Reply"
+msgstr ""
+
+msgid "Quit Qun"
+msgstr ""
+
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+
+msgid "Sorry, you are not our style"
+msgstr ""
+
+msgid "Successfully changed Qun members"
+msgstr ""
+
+msgid "Successfully changed Qun information"
+msgstr ""
+
+msgid "You have successfully created a Qun"
+msgstr ""
+
+msgid "Would you like to set up detailed information now?"
+msgstr ""
+
+msgid "Setup"
+msgstr ""
+
+#, c-format
+msgid "%u requested to join Qun %u for %s"
+msgstr ""
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr ""
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr ""
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr ""
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr ""
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr ""
+
+#, c-format
+msgid "Unknown-%d"
+msgstr ""
+
+msgid "Level"
+msgstr ""
+
+msgid " VIP"
+msgstr ""
+
+msgid " TCP"
+msgstr ""
+
+msgid " FromMobile"
+msgstr ""
+
+msgid " BindMobile"
+msgstr ""
+
+msgid " Video"
+msgstr ""
+
+msgid " Zone"
+msgstr ""
+
+msgid "Flag"
+msgstr ""
+
+msgid "Ver"
+msgstr ""
+
+msgid "Invalid name"
+msgstr ""
+
+msgid "Select icon..."
+msgstr ""
+
+#, c-format
+msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Total Online Buddies</b>: %d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Server</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Client Tag</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>My Internet IP</b>: %s:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Sent</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Resend</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Lost</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Received</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Received Duplicate</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>IP</b>: %s<br>\n"
+msgstr ""
+
+msgid "Login Information"
+msgstr ""
+
+msgid "<p><b>Original Author</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Code Contributors</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Acknowledgement</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr ""
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
+msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
+msgstr ""
+
+msgid "<i>Feel free to join us!</i> :)"
+msgstr ""
+
+#, c-format
+msgid "About OpenQ %s"
+msgstr ""
+
+msgid "Change Icon"
+msgstr ""
+
+msgid "Change Password"
+msgstr ""
+
+msgid "Account Information"
+msgstr ""
+
+msgid "Update all QQ Quns"
+msgstr ""
+
+msgid "About OpenQ"
+msgstr ""
+
+msgid "Modify Buddy Memo"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "QQ Protocol Plugin"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Select Server"
+msgstr ""
+
+msgid "QQ2005"
+msgstr ""
+
+msgid "QQ2007"
+msgstr ""
+
+msgid "QQ2008"
+msgstr ""
+
+msgid "Connect by TCP"
+msgstr ""
+
+msgid "Show server notice"
+msgstr ""
+
+msgid "Show server news"
+msgstr ""
+
+msgid "Show chat room when msg comes"
+msgstr ""
+
+msgid "Keep alive interval (seconds)"
+msgstr ""
+
+msgid "Update interval (seconds)"
+msgstr ""
+
+msgid "Unable to decrypt server reply"
+msgstr ""
+
+#, c-format
+msgid "Failed requesting token, 0x%02X"
+msgstr ""
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr ""
+
+#. extend redirect used in QQ2006
+msgid "Redirect_EX is not currently supported"
+msgstr ""
+
+#. need activation
+#. need activation
+#. need activation
+msgid "Activation required"
+msgstr ""
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr ""
+
+msgid "Requesting captcha"
+msgstr ""
+
+msgid "Checking captcha"
+msgstr ""
+
+msgid "Failed captcha verification"
+msgstr ""
+
+msgid "Captcha Image"
+msgstr ""
+
+msgid "Enter code"
+msgstr ""
+
+msgid "QQ Captcha Verification"
+msgstr ""
+
+msgid "Enter the text from the image"
+msgstr ""
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
+"%s"
+msgstr ""
+
+msgid "Socket error"
+msgstr ""
+
+msgid "Getting server"
+msgstr ""
+
+msgid "Requesting token"
+msgstr ""
+
+msgid "Unable to resolve hostname"
+msgstr ""
+
+msgid "Invalid server or port"
+msgstr ""
+
+msgid "Connecting to server"
+msgstr ""
+
+msgid "QQ Error"
+msgstr ""
+
+#, c-format
+msgid ""
+"Server News:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "%s:%s"
+msgstr ""
+
+#, c-format
+msgid "From %s:"
+msgstr ""
+
+#, c-format
+msgid ""
+"Server notice From %s: \n"
+"%s"
+msgstr ""
+
+msgid "Unknown SERVER CMD"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
+msgstr ""
+
+msgid "QQ Qun Command"
+msgstr ""
+
+msgid "Unable to decrypt login reply"
+msgstr ""
+
+msgid "Unknown LOGIN CMD"
+msgstr ""
+
+msgid "Unknown CLIENT CMD"
+msgstr ""
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr ""
+
+msgid "File Send"
+msgstr ""
+
+#, c-format
+msgid "%d canceled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr ""
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr ""
+
+#, c-format
+msgid "Info for Group %s"
+msgstr ""
+
+msgid "Notes Address Book Information"
+msgstr ""
+
+msgid "Invite Group to Conference..."
+msgstr ""
+
+msgid "Get Notes Address Book Info"
+msgstr ""
+
+msgid "Sending Handshake"
+msgstr ""
+
+msgid "Waiting for Handshake Acknowledgement"
+msgstr ""
+
+msgid "Handshake Acknowledged, Sending Login"
+msgstr ""
+
+msgid "Waiting for Login Acknowledgement"
+msgstr ""
+
+msgid "Login Redirected"
+msgstr ""
+
+msgid "Forcing Login"
+msgstr ""
+
+msgid "Login Acknowledged"
+msgstr ""
+
+msgid "Starting Services"
+msgstr ""
+
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+
+msgid "Sametime Administrator Announcement"
+msgstr ""
+
+#, c-format
+msgid "Announcement from %s"
+msgstr ""
+
+msgid "Conference Closed"
+msgstr ""
+
+msgid "Unable to send message: "
+msgstr ""
+
+msgid "Place Closed"
+msgstr ""
+
+msgid "Microphone"
+msgstr ""
+
+msgid "Speakers"
+msgstr ""
+
+msgid "Video Camera"
+msgstr ""
+
+msgid "File Transfer"
+msgstr ""
+
+msgid "Supports"
+msgstr ""
+
+msgid "External User"
+msgstr ""
+
+msgid "Create conference with user"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+
+msgid "New Conference"
+msgstr ""
+
+msgid "Create"
+msgstr ""
+
+msgid "Available Conferences"
+msgstr ""
+
+msgid "Create New Conference..."
+msgstr ""
+
+msgid "Invite user to a conference"
+msgstr ""
+
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+
+msgid "Invite to Conference"
+msgstr ""
+
+msgid "Invite to Conference..."
+msgstr ""
+
+msgid "Send TEST Announcement"
+msgstr ""
+
+msgid "Topic:"
+msgstr ""
+
+msgid "No Sametime Community Server specified"
+msgstr ""
+
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+
+msgid "Meanwhile Connection Setup"
+msgstr ""
+
+msgid "No Sametime Community Server Specified"
+msgstr ""
+
+msgid "Connect"
+msgstr ""
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr ""
+
+msgid "Last Known Client"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Sametime ID"
+msgstr ""
+
+msgid "An ambiguous user ID was entered"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+
+msgid "Select User"
+msgstr ""
+
+msgid "Unable to add user: user not found"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+
+msgid "Remotely Stored Buddy List"
+msgstr ""
+
+msgid "Buddy List Storage Mode"
+msgstr ""
+
+msgid "Local Buddy List Only"
+msgstr ""
+
+msgid "Merge List from Server"
+msgstr ""
+
+msgid "Merge and Save List to Server"
+msgstr ""
+
+msgid "Synchronize List with Server"
+msgstr ""
+
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr ""
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr ""
+
+msgid "Unable to add group: group exists"
+msgstr ""
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr ""
+
+msgid "Unable to add group"
+msgstr ""
+
+msgid "Possible Matches"
+msgstr ""
+
+msgid "Notes Address Book group results"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+
+msgid "Select Notes Address Book"
+msgstr ""
+
+msgid "Unable to add group: group not found"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+
+msgid "Notes Address Book Group"
+msgstr ""
+
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+
+#, c-format
+msgid "Search results for '%s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+
+msgid "Search Results"
+msgstr ""
+
+msgid "No matches"
+msgstr ""
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+
+msgid "No Matches"
+msgstr ""
+
+msgid "Search for a user"
+msgstr ""
+
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+
+msgid "User Search"
+msgstr ""
+
+msgid "Import Sametime List..."
+msgstr ""
+
+msgid "Export Sametime List..."
+msgstr ""
+
+msgid "Add Notes Address Book Group..."
+msgstr ""
+
+msgid "User Search..."
+msgstr ""
+
+msgid "Force login (ignore server redirects)"
+msgstr ""
+
+#. pretend to be Sametime Connect
+msgid "Hide client identity"
+msgstr ""
+
+#, c-format
+msgid "User %s is not present in the network"
+msgstr ""
+
+msgid "Key Agreement"
+msgstr ""
+
+msgid "Cannot perform the key agreement"
+msgstr ""
+
+msgid "Error occurred during key agreement"
+msgstr ""
+
+msgid "Key Agreement failed"
+msgstr ""
+
+msgid "Timeout during key agreement"
+msgstr ""
+
+msgid "Key agreement was aborted"
+msgstr ""
+
+msgid "Key agreement is already started"
+msgstr ""
+
+msgid "Key agreement cannot be started with yourself"
+msgstr ""
+
+msgid "The remote user is not present in the network any more"
+msgstr ""
+
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+msgid "Key Agreement Request"
+msgstr ""
+
+msgid "IM With Password"
+msgstr ""
+
+msgid "Cannot set IM key"
+msgstr ""
+
+msgid "Set IM Password"
+msgstr ""
+
+msgid "Get Public Key"
+msgstr ""
+
+msgid "Cannot fetch the public key"
+msgstr ""
+
+msgid "Show Public Key"
+msgstr ""
+
+msgid "Could not load public key"
+msgstr ""
+
+msgid "User Information"
+msgstr ""
+
+msgid "Cannot get user information"
+msgstr ""
+
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr ""
+
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+
+#. Open file selector to select the public key.
+msgid "Open..."
+msgstr ""
+
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr ""
+
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+
+msgid "_Import..."
+msgstr ""
+
+msgid "Select correct user"
+msgstr ""
+
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+
+msgid "Detached"
+msgstr ""
+
+msgid "Indisposed"
+msgstr ""
+
+msgid "Wake Me Up"
+msgstr ""
+
+msgid "Hyper Active"
+msgstr ""
+
+msgid "Robot"
+msgstr ""
+
+msgid "Happy"
+msgstr ""
+
+msgid "Sad"
+msgstr ""
+
+msgid "Angry"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Invincible"
+msgstr ""
+
+msgid "In Love"
+msgstr ""
+
+msgid "Sleepy"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Anxious"
+msgstr ""
+
+msgid "User Modes"
+msgstr ""
+
+msgid "Preferred Contact"
+msgstr ""
+
+msgid "Preferred Language"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Timezone"
+msgstr ""
+
+msgid "Geolocation"
+msgstr ""
+
+msgid "Reset IM Key"
+msgstr ""
+
+msgid "IM with Key Exchange"
+msgstr ""
+
+msgid "IM with Password"
+msgstr ""
+
+msgid "Get Public Key..."
+msgstr ""
+
+msgid "Kill User"
+msgstr ""
+
+msgid "Draw On Whiteboard"
+msgstr ""
+
+msgid "_Passphrase:"
+msgstr ""
+
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr ""
+
+msgid "Channel Information"
+msgstr ""
+
+msgid "Cannot get channel information"
+msgstr ""
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr ""
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Modes:</b> "
+msgstr ""
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr ""
+
+msgid "Add Channel Public Key"
+msgstr ""
+
+#. Add new public key
+msgid "Open Public Key..."
+msgstr ""
+
+msgid "Channel Passphrase"
+msgstr ""
+
+msgid "Channel Public Keys List"
+msgstr ""
+
+#, c-format
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+
+msgid "Channel Authentication"
+msgstr ""
+
+msgid "Add / Remove"
+msgstr ""
+
+msgid "Group Name"
+msgstr ""
+
+msgid "Passphrase"
+msgstr ""
+
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr ""
+
+msgid "Add Channel Private Group"
+msgstr ""
+
+msgid "User Limit"
+msgstr ""
+
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+
+msgid "Invite List"
+msgstr ""
+
+msgid "Ban List"
+msgstr ""
+
+msgid "Add Private Group"
+msgstr ""
+
+msgid "Reset Permanent"
+msgstr ""
+
+msgid "Set Permanent"
+msgstr ""
+
+msgid "Set User Limit"
+msgstr ""
+
+msgid "Reset Topic Restriction"
+msgstr ""
+
+msgid "Set Topic Restriction"
+msgstr ""
+
+msgid "Reset Private Channel"
+msgstr ""
+
+msgid "Set Private Channel"
+msgstr ""
+
+msgid "Reset Secret Channel"
+msgstr ""
+
+msgid "Set Secret Channel"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+
+msgid "Join Private Group"
+msgstr ""
+
+msgid "Cannot join private group"
+msgstr ""
+
+msgid "Call Command"
+msgstr ""
+
+msgid "Cannot call command"
+msgstr ""
+
+msgid "Unknown command"
+msgstr ""
+
+msgid "Secure File Transfer"
+msgstr ""
+
+msgid "Error during file transfer"
+msgstr ""
+
+msgid "Remote disconnected"
+msgstr ""
+
+msgid "Permission denied"
+msgstr ""
+
+msgid "Key agreement failed"
+msgstr ""
+
+msgid "Connection timed out"
+msgstr ""
+
+msgid "Creating connection failed"
+msgstr ""
+
+msgid "File transfer session does not exist"
+msgstr ""
+
+msgid "No file transfer session active"
+msgstr ""
+
+msgid "File transfer already started"
+msgstr ""
+
+msgid "Could not perform key agreement for file transfer"
+msgstr ""
+
+msgid "Could not start the file transfer"
+msgstr ""
+
+msgid "Cannot send file"
+msgstr ""
+
+msgid "Error occurred"
+msgstr ""
+
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr ""
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr ""
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr ""
+
+msgid "Server signoff"
+msgstr ""
+
+msgid "Personal Information"
+msgstr ""
+
+msgid "Birth Day"
+msgstr ""
+
+msgid "Job Role"
+msgstr ""
+
+msgid "Organization"
+msgstr ""
+
+msgid "Unit"
+msgstr ""
+
+msgid "Join Chat"
+msgstr ""
+
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr ""
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr ""
+
+msgid "Real Name"
+msgstr ""
+
+msgid "Status Text"
+msgstr ""
+
+msgid "Public Key Fingerprint"
+msgstr ""
+
+msgid "Public Key Babbleprint"
+msgstr ""
+
+msgid "_More..."
+msgstr ""
+
+msgid "Detach From Server"
+msgstr ""
+
+msgid "Cannot detach"
+msgstr ""
+
+msgid "Cannot set topic"
+msgstr ""
+
+msgid "Failed to change nickname"
+msgstr ""
+
+msgid "Roomlist"
+msgstr ""
+
+msgid "Cannot get room list"
+msgstr ""
+
+msgid "Network is empty"
+msgstr ""
+
+msgid "No public key was received"
+msgstr ""
+
+msgid "Server Information"
+msgstr ""
+
+msgid "Cannot get server information"
+msgstr ""
+
+msgid "Server Statistics"
+msgstr ""
+
+msgid "Cannot get server statistics"
+msgstr ""
+
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+
+msgid "Network Statistics"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping failed"
+msgstr ""
+
+msgid "Ping reply received from server"
+msgstr ""
+
+msgid "Could not kill user"
+msgstr ""
+
+msgid "WATCH"
+msgstr ""
+
+msgid "Cannot watch user"
+msgstr ""
+
+msgid "Resuming session"
+msgstr ""
+
+msgid "Authenticating connection"
+msgstr ""
+
+msgid "Verifying server public key"
+msgstr ""
+
+msgid "Passphrase required"
+msgstr ""
+
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+
+msgid "Verify Public Key"
+msgstr ""
+
+msgid "_View..."
+msgstr ""
+
+msgid "Unsupported public key type"
+msgstr ""
+
+msgid "Disconnected by server"
+msgstr ""
+
+msgid "Error connecting to SILC Server"
+msgstr ""
+
+msgid "Key Exchange failed"
+msgstr ""
+
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+
+msgid "Performing key exchange"
+msgstr ""
+
+msgid "Unable to load SILC key pair"
+msgstr ""
+
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr ""
+
+msgid "Unable to not load SILC key pair"
+msgstr ""
+
+msgid "Out of memory"
+msgstr ""
+
+msgid "Unable to initialize SILC protocol"
+msgstr ""
+
+msgid "Error loading SILC key pair"
+msgstr ""
+
+#, c-format
+msgid "Download %s: %s"
+msgstr ""
+
+msgid "Your Current Mood"
+msgstr ""
+
+#, c-format
+msgid "Normal"
+msgstr ""
+
+msgid "In love"
+msgstr ""
+
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+
+msgid "SMS"
+msgstr ""
+
+msgid "MMS"
+msgstr ""
+
+msgid "Video conferencing"
+msgstr ""
+
+msgid "Your Current Status"
+msgstr ""
+
+msgid "Online Services"
+msgstr ""
+
+msgid "Let others see what services you are using"
+msgstr ""
+
+msgid "Let others see what computer you are using"
+msgstr ""
+
+msgid "Your VCard File"
+msgstr ""
+
+msgid "Timezone (UTC)"
+msgstr ""
+
+msgid "User Online Status Attributes"
+msgstr ""
+
+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 ""
+
+msgid "Message of the Day"
+msgstr ""
+
+msgid "No Message of the Day available"
+msgstr ""
+
+msgid "There is no Message of the Day associated with this connection"
+msgstr ""
+
+msgid "Create New SILC Key Pair"
+msgstr ""
+
+msgid "Passphrases do not match"
+msgstr ""
+
+msgid "Key Pair Generation failed"
+msgstr ""
+
+msgid "Key length"
+msgstr ""
+
+msgid "Public key file"
+msgstr ""
+
+msgid "Private key file"
+msgstr ""
+
+msgid "Passphrase (retype)"
+msgstr ""
+
+msgid "Generate Key Pair"
+msgstr ""
+
+msgid "Online Status"
+msgstr ""
+
+msgid "View Message of the Day"
+msgstr ""
+
+msgid "Create SILC Key Pair..."
+msgstr ""
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr ""
+
+msgid "Topic too long"
+msgstr ""
+
+msgid "You must specify a nick"
+msgstr ""
+
+#, c-format
+msgid "channel %s not found"
+msgstr ""
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr ""
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr ""
+
+msgid "part [channel]:  Leave the chat"
+msgstr ""
+
+msgid "leave [channel]:  Leave the chat"
+msgstr ""
+
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr ""
+
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+
+msgid "list:  List channels on this network"
+msgstr ""
+
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+
+msgid "motd:  View the server's Message Of The Day"
+msgstr ""
+
+msgid "detach:  Detach this session"
+msgstr ""
+
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr ""
+
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr ""
+
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr ""
+
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr ""
+
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+
+msgid "info [server]:  View server administrative details"
+msgstr ""
+
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+
+msgid "stats:  View server and network statistics"
+msgstr ""
+
+msgid "ping:  Send PING to the connected server"
+msgstr ""
+
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr ""
+
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr ""
+
+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Public Key file"
+msgstr ""
+
+msgid "Private Key file"
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid "HMAC"
+msgstr ""
+
+msgid "Use Perfect Forward Secrecy"
+msgstr ""
+
+msgid "Public key authentication"
+msgstr ""
+
+msgid "Block IMs without Key Exchange"
+msgstr ""
+
+msgid "Block messages to whiteboard"
+msgstr ""
+
+msgid "Automatically open whiteboard"
+msgstr ""
+
+msgid "Digitally sign and verify all messages"
+msgstr ""
+
+msgid "Creating SILC key pair..."
+msgstr ""
+
+msgid "Unable to create SILC key pair"
+msgstr ""
+
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr ""
+
+#, c-format
+msgid "Version: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+
+msgid "Public Key Information"
+msgstr ""
+
+msgid "Paging"
+msgstr ""
+
+msgid "Video Conferencing"
+msgstr ""
+
+msgid "Computer"
+msgstr ""
+
+msgid "PDA"
+msgstr ""
+
+msgid "Terminal"
+msgstr ""
+
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+
+msgid "Whiteboard"
+msgstr ""
+
+msgid "No server statistics available"
+msgstr ""
+
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
+#, c-format
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed KE group"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed hash function"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr ""
+
+#, c-format
+msgid "Failure: Incorrect signature"
+msgstr ""
+
+#, c-format
+msgid "Failure: Invalid cookie"
+msgstr ""
+
+#, c-format
+msgid "Failure: Authentication failed"
+msgstr ""
+
+msgid "Unable to initialize SILC Client connection"
+msgstr ""
+
+msgid "John Noname"
+msgstr ""
+
+#, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr ""
+
+msgid "Unable to create connection"
+msgstr ""
+
+msgid "Unknown server response"
+msgstr ""
+
+msgid "Unable to create listen socket"
+msgstr ""
+
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr ""
+
+msgid "SIP connect server not specified"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr ""
+
+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr ""
+
+msgid "Publish status (note: everyone may watch you)"
+msgstr ""
+
+msgid "Use UDP"
+msgstr ""
+
+msgid "Use proxy"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Auth User"
+msgstr ""
+
+msgid "Auth Domain"
+msgstr ""
+
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+msgid "Yahoo ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr ""
+
+msgid "Pager server"
+msgstr ""
+
+msgid "Pager port"
+msgstr ""
+
+msgid "File transfer server"
+msgstr ""
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+msgid "Yahoo JAPAN ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr ""
+
+msgid "Your SMS was not delivered"
+msgstr ""
+
+msgid "Your Yahoo! message did not get sent."
+msgstr ""
+
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+
+msgid "Add buddy rejected"
+msgstr ""
+
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr ""
+
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+
+msgid "Failed Yahoo! Authentication"
+msgstr ""
+
+#, 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 ""
+
+msgid "Ignore buddy?"
+msgstr ""
+
+msgid "Your account is locked, please log in to the Yahoo! website."
+msgstr ""
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr ""
+
+msgid "Unable to add buddy to server list"
+msgstr ""
+
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr ""
+
+msgid "Received unexpected HTTP response from server"
+msgstr ""
+
+#, c-format
+msgid "Lost connection with %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr ""
+
+msgid "Not at Home"
+msgstr ""
+
+msgid "Not at Desk"
+msgstr ""
+
+msgid "Not in Office"
+msgstr ""
+
+msgid "On Vacation"
+msgstr ""
+
+msgid "Stepped Out"
+msgstr ""
+
+msgid "Not on server list"
+msgstr ""
+
+msgid "Appear Online"
+msgstr ""
+
+msgid "Appear Permanently Offline"
+msgstr ""
+
+msgid "Presence"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Permanently Offline"
+msgstr ""
+
+msgid "Join in Chat"
+msgstr ""
+
+msgid "Initiate Conference"
+msgstr ""
+
+msgid "Presence Settings"
+msgstr ""
+
+msgid "Start Doodling"
+msgstr ""
+
+msgid "Select the ID you want to activate"
+msgstr ""
+
+msgid "Join whom in chat?"
+msgstr ""
+
+msgid "Activate ID..."
+msgstr ""
+
+msgid "Join User in Chat..."
+msgstr ""
+
+msgid "Open Inbox"
+msgstr ""
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+msgid "Sent Doodle request."
+msgstr ""
+
+msgid "Unable to connect."
+msgstr ""
+
+msgid "Unable to establish file descriptor."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr ""
+
+msgid "Write Error"
+msgstr ""
+
+msgid "Yahoo! Japan Profile"
+msgstr ""
+
+msgid "Yahoo! Profile"
+msgstr ""
+
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr ""
+
+msgid "Yahoo! ID"
+msgstr ""
+
+msgid "Hobbies"
+msgstr ""
+
+msgid "Latest News"
+msgstr ""
+
+msgid "Home Page"
+msgstr ""
+
+msgid "Cool Link 1"
+msgstr ""
+
+msgid "Cool Link 2"
+msgstr ""
+
+msgid "Cool Link 3"
+msgstr ""
+
+msgid "Last Update"
+msgstr ""
+
+msgid ""
+"This profile is in a language or format that is not supported at this time."
+msgstr ""
+
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+
+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 ""
+
+msgid "The user's profile is empty."
+msgstr ""
+
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+
+msgid "Invitation Rejected"
+msgstr ""
+
+msgid "Failed to join chat"
+msgstr ""
+
+#. -6
+msgid "Unknown room"
+msgstr ""
+
+#. -15
+msgid "Maybe the room is full"
+msgstr ""
+
+#. -35
+msgid "Not available"
+msgstr ""
+
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+
+#, c-format
+msgid "You are now chatting in %s."
+msgstr ""
+
+msgid "Failed to join buddy in chat"
+msgstr ""
+
+msgid "Maybe they're not in a chat?"
+msgstr ""
+
+msgid "Fetching the room list failed."
+msgstr ""
+
+msgid "Voices"
+msgstr ""
+
+msgid "Webcams"
+msgstr ""
+
+msgid "Connection problem"
+msgstr ""
+
+msgid "Unable to fetch room list."
+msgstr ""
+
+msgid "User Rooms"
+msgstr ""
+
+msgid "Connection problem with the YCHT server"
+msgstr ""
+
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr ""
+
+msgid "Hidden or not logged-in"
+msgstr ""
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr ""
+
+msgid "Anyone"
+msgstr ""
+
+msgid "_Class:"
+msgstr ""
+
+msgid "_Instance:"
+msgstr ""
+
+msgid "_Recipient:"
+msgstr ""
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr ""
+
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr ""
+
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr ""
+
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+
+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 ""
+
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr ""
+
+msgid "Resubscribe"
+msgstr ""
+
+msgid "Retrieve subscriptions from server"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Zephyr Protocol Plugin"
+msgstr ""
+
+msgid "Use tzc"
+msgstr ""
+
+msgid "tzc command"
+msgstr ""
+
+msgid "Export to .anyone"
+msgstr ""
+
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+msgid "Import from .anyone"
+msgstr ""
+
+msgid "Import from .zephyr.subs"
+msgstr ""
+
+msgid "Realm"
+msgstr ""
+
+msgid "Exposure"
+msgstr ""
+
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr ""
+
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr ""
+
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr ""
+
+#, c-format
+msgid "Error resolving %s"
+msgstr ""
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+msgid "_Yes"
+msgstr ""
+
+msgid "_No"
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+msgid "_Accept"
+msgstr ""
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+msgid "I'm not here right now"
+msgstr ""
+
+msgid "saved statuses"
+msgstr ""
+
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr ""
+
+msgid "Accept chat invitation?"
+msgstr ""
+
+#. Shortcut
+msgid "Shortcut"
+msgstr ""
+
+msgid "The text-shortcut for the smiley"
+msgstr ""
+
+#. Stored Image
+msgid "Stored Image"
+msgstr ""
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr ""
+
+msgid "SSL Connection Failed"
+msgstr ""
+
+msgid "SSL Handshake Failed"
+msgstr ""
+
+msgid "SSL peer presented an invalid certificate"
+msgstr ""
+
+msgid "Unknown SSL error"
+msgstr ""
+
+msgid "Unset"
+msgstr ""
+
+msgid "Do not disturb"
+msgstr ""
+
+msgid "Extended away"
+msgstr ""
+
+msgid "Listening to music"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr ""
+
+#, c-format
+msgid "%s became idle"
+msgstr ""
+
+#, c-format
+msgid "%s became unidle"
+msgstr ""
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr ""
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr ""
+
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
+#, c-format
+msgid "%x %X"
+msgstr ""
+
+msgid "Calculating..."
+msgstr ""
+
+msgid "Unknown."
+msgstr ""
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#, c-format
+msgid " - %s"
+msgstr ""
+
+#, c-format
+msgid " (%s)"
+msgstr ""
+
+#. 10053
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr ""
+
+#. 10054
+#, c-format
+msgid "Remote host closed connection."
+msgstr ""
+
+#. 10060
+#, c-format
+msgid "Connection timed out."
+msgstr ""
+
+#. 10061
+#, c-format
+msgid "Connection refused."
+msgstr ""
+
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr ""
+
+#, c-format
+msgid "Error Reading %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
+msgid "Internet Messenger"
+msgstr ""
+
+msgid "Pidgin Internet Messenger"
+msgstr ""
+
+msgid "Send instant messages over multiple protocols"
+msgstr ""
+
+msgid "Orientation"
+msgstr ""
+
+msgid "The orientation of the tray."
+msgstr ""
+
+#. Build the login options frame.
+msgid "Login Options"
+msgstr ""
+
+msgid "Pro_tocol:"
+msgstr ""
+
+msgid "_Username:"
+msgstr ""
+
+msgid "Remember pass_word"
+msgstr ""
+
+#. Build the user options frame.
+msgid "User Options"
+msgstr ""
+
+msgid "_Local alias:"
+msgstr ""
+
+msgid "New _mail notifications"
+msgstr ""
+
+#. Buddy icon
+msgid "Use this buddy _icon for this account:"
+msgstr ""
+
+msgid "_Advanced"
+msgstr ""
+
+msgid "Use GNOME Proxy Settings"
+msgstr ""
+
+msgid "Use Global Proxy Settings"
+msgstr ""
+
+msgid "No Proxy"
+msgstr ""
+
+msgid "HTTP"
+msgstr ""
+
+msgid "SOCKS 4"
+msgstr ""
+
+msgid "SOCKS 5"
+msgstr ""
+
+msgid "Use Environmental Settings"
+msgstr ""
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+msgid "If you look real closely"
+msgstr ""
+
+#. This is an easter egg. See the comment on the previous line in the source.
+msgid "you can see the butterflies mating"
+msgstr ""
+
+msgid "Proxy _type:"
+msgstr ""
+
+msgid "_Host:"
+msgstr ""
+
+msgid "_Port:"
+msgstr ""
+
+msgid "Pa_ssword:"
+msgstr ""
+
+msgid "Unable to save new account"
+msgstr ""
+
+msgid "An account already exists with the specified criteria."
+msgstr ""
+
+msgid "Add Account"
+msgstr ""
+
+msgid "_Basic"
+msgstr ""
+
+msgid "Create _this new account on the server"
+msgstr ""
+
+msgid "_Proxy"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add...</b> button below and configure your first account. If you want %s "
+"to connect to multiple IM accounts, press <b>Add...</b> again to configure "
+"them all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
+msgstr ""
+
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+msgid "Please update the necessary fields."
+msgstr ""
+
+msgid "A_ccount"
+msgstr ""
+
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+
+msgid "Room _List"
+msgstr ""
+
+msgid "_Block"
+msgstr ""
+
+msgid "Un_block"
+msgstr ""
+
+msgid "Move to"
+msgstr ""
+
+msgid "Get _Info"
+msgstr ""
+
+msgid "I_M"
+msgstr ""
+
+msgid "_Audio Call"
+msgstr ""
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
+msgid "_Send File..."
+msgstr ""
+
+msgid "Add Buddy _Pounce..."
+msgstr ""
+
+msgid "View _Log"
+msgstr ""
+
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
+msgstr ""
+
+msgid "_Alias..."
+msgstr ""
+
+msgid "_Remove"
+msgstr ""
+
+msgid "Set Custom Icon"
+msgstr ""
+
+msgid "Remove Custom Icon"
+msgstr ""
+
+msgid "Add _Buddy..."
+msgstr ""
+
+msgid "Add C_hat..."
+msgstr ""
+
+msgid "_Delete Group"
+msgstr ""
+
+msgid "_Rename"
+msgstr ""
+
+#. join button
+msgid "_Join"
+msgstr ""
+
+msgid "Auto-Join"
+msgstr ""
+
+msgid "Persistent"
+msgstr ""
+
+msgid "_Edit Settings..."
+msgstr ""
+
+msgid "_Collapse"
+msgstr ""
+
+msgid "_Expand"
+msgstr ""
+
+msgid "/Tools/Mute Sounds"
+msgstr ""
+
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+msgid "Unknown node type"
+msgstr ""
+
+#. Buddies menu
+msgid "/_Buddies"
+msgstr ""
+
+msgid "/Buddies/New Instant _Message..."
+msgstr ""
+
+msgid "/Buddies/Join a _Chat..."
+msgstr ""
+
+msgid "/Buddies/Get User _Info..."
+msgstr ""
+
+msgid "/Buddies/View User _Log..."
+msgstr ""
+
+msgid "/Buddies/Sh_ow"
+msgstr ""
+
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr ""
+
+msgid "/Buddies/Show/_Empty Groups"
+msgstr ""
+
+msgid "/Buddies/Show/Buddy _Details"
+msgstr ""
+
+msgid "/Buddies/Show/Idle _Times"
+msgstr ""
+
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr ""
+
+msgid "/Buddies/_Sort Buddies"
+msgstr ""
+
+msgid "/Buddies/_Add Buddy..."
+msgstr ""
+
+msgid "/Buddies/Add C_hat..."
+msgstr ""
+
+msgid "/Buddies/Add _Group..."
+msgstr ""
+
+msgid "/Buddies/_Quit"
+msgstr ""
+
+#. Accounts menu
+msgid "/_Accounts"
+msgstr ""
+
+msgid "/Accounts/Manage Accounts"
+msgstr ""
+
+#. Tools
+msgid "/_Tools"
+msgstr ""
+
+msgid "/Tools/Buddy _Pounces"
+msgstr ""
+
+msgid "/Tools/_Certificates"
+msgstr ""
+
+msgid "/Tools/Custom Smile_ys"
+msgstr ""
+
+msgid "/Tools/Plu_gins"
+msgstr ""
+
+msgid "/Tools/Pr_eferences"
+msgstr ""
+
+msgid "/Tools/Pr_ivacy"
+msgstr ""
+
+msgid "/Tools/_File Transfers"
+msgstr ""
+
+msgid "/Tools/R_oom List"
+msgstr ""
+
+msgid "/Tools/System _Log"
+msgstr ""
+
+msgid "/Tools/Mute _Sounds"
+msgstr ""
+
+#. Help
+msgid "/_Help"
+msgstr ""
+
+msgid "/Help/Online _Help"
+msgstr ""
+
+msgid "/Help/_Debug Window"
+msgstr ""
+
+msgid "/Help/_About"
+msgstr ""
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+
+msgid "(no topic set)"
+msgstr ""
+
+msgid "Buddy Alias"
+msgstr ""
+
+msgid "Logged In"
+msgstr ""
+
+msgid "Last Seen"
+msgstr ""
+
+msgid "Spooky"
+msgstr ""
+
+msgid "Awesome"
+msgstr ""
+
+msgid "Rockin'"
+msgstr ""
+
+msgid "Total Buddies"
+msgstr ""
+
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr ""
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr ""
+
+#, c-format
+msgid "Idle %dm"
+msgstr ""
+
+msgid "/Buddies/New Instant Message..."
+msgstr ""
+
+msgid "/Buddies/Join a Chat..."
+msgstr ""
+
+msgid "/Buddies/Get User Info..."
+msgstr ""
+
+msgid "/Buddies/Add Buddy..."
+msgstr ""
+
+msgid "/Buddies/Add Chat..."
+msgstr ""
+
+msgid "/Buddies/Add Group..."
+msgstr ""
+
+msgid "/Tools/Privacy"
+msgstr ""
+
+msgid "/Tools/Room List"
+msgstr ""
+
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "By status"
+msgstr ""
+
+msgid "By recent log activity"
+msgstr ""
+
+#, c-format
+msgid "%s disconnected"
+msgstr ""
+
+#, c-format
+msgid "%s disabled"
+msgstr ""
+
+msgid "Reconnect"
+msgstr ""
+
+msgid "Re-enable"
+msgstr ""
+
+msgid "SSL FAQs"
+msgstr ""
+
+msgid "Welcome back!"
+msgstr ""
+
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "<b>Username:</b>"
+msgstr ""
+
+msgid "<b>Password:</b>"
+msgstr ""
+
+msgid "_Login"
+msgstr ""
+
+msgid "/Accounts"
+msgstr ""
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
+msgstr ""
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+msgid "/Buddies/Show/Offline Buddies"
+msgstr ""
+
+msgid "/Buddies/Show/Empty Groups"
+msgstr ""
+
+msgid "/Buddies/Show/Buddy Details"
+msgstr ""
+
+msgid "/Buddies/Show/Idle Times"
+msgstr ""
+
+msgid "/Buddies/Show/Protocol Icons"
+msgstr ""
+
+msgid "Add a buddy.\n"
+msgstr ""
+
+msgid "Buddy's _username:"
+msgstr ""
+
+msgid "(Optional) A_lias:"
+msgstr ""
+
+msgid "Add buddy to _group:"
+msgstr ""
+
+msgid "This protocol does not support chat rooms."
+msgstr ""
+
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+
+msgid "A_lias:"
+msgstr ""
+
+msgid "_Group:"
+msgstr ""
+
+msgid "Auto_join when account becomes online."
+msgstr ""
+
+msgid "_Remain in chat after window is closed."
+msgstr ""
+
+msgid "Please enter the name of the group to be added."
+msgstr ""
+
+msgid "Enable Account"
+msgstr ""
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr ""
+
+msgid "<PurpleMain>/Accounts/"
+msgstr ""
+
+msgid "_Edit Account"
+msgstr ""
+
+msgid "No actions available"
+msgstr ""
+
+msgid "_Disable"
+msgstr ""
+
+msgid "/Tools"
+msgstr ""
+
+msgid "/Buddies/Sort Buddies"
+msgstr ""
+
+#. Buddy List
+msgid "Background Color"
+msgstr ""
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+msgid "Layout"
+msgstr ""
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+msgid "Expanded Background Color"
+msgstr ""
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+msgid "Collapsed Background Color"
+msgstr ""
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr ""
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+msgid "Contact Text"
+msgstr ""
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+msgid "On-line Text"
+msgstr ""
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+msgid "Away Text"
+msgstr ""
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+msgid "Off-line Text"
+msgstr ""
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+msgid "Idle Text"
+msgstr ""
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+msgid "Message Text"
+msgstr ""
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
+#. Widget creation function
+msgid "SSL Servers"
+msgstr ""
+
+msgid "Unknown command."
+msgstr ""
+
+msgid "That buddy is not on the same protocol as this chat."
+msgstr ""
+
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+
+msgid "Invite Buddy Into Chat Room"
+msgstr ""
+
+msgid "_Buddy:"
+msgstr ""
+
+msgid "_Message:"
+msgstr ""
+
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr ""
+
+msgid "Save Conversation"
+msgstr ""
+
+msgid "Find"
+msgstr ""
+
+msgid "_Search for:"
+msgstr ""
+
+msgid "Un-Ignore"
+msgstr ""
+
+msgid "Ignore"
+msgstr ""
+
+msgid "Get Away Message"
+msgstr ""
+
+msgid "Last Said"
+msgstr ""
+
+msgid "Unable to save icon file to disk."
+msgstr ""
+
+msgid "Save Icon"
+msgstr ""
+
+msgid "Animate"
+msgstr ""
+
+msgid "Hide Icon"
+msgstr ""
+
+msgid "Save Icon As..."
+msgstr ""
+
+msgid "Set Custom Icon..."
+msgstr ""
+
+msgid "Change Size"
+msgstr ""
+
+msgid "Show All"
+msgstr ""
+
+#. Conversation menu
+msgid "/_Conversation"
+msgstr ""
+
+msgid "/Conversation/New Instant _Message..."
+msgstr ""
+
+msgid "/Conversation/_Find..."
+msgstr ""
+
+msgid "/Conversation/View _Log"
+msgstr ""
+
+msgid "/Conversation/_Save As..."
+msgstr ""
+
+msgid "/Conversation/Clea_r Scrollback"
+msgstr ""
+
+msgid "/Conversation/M_edia"
+msgstr ""
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/_Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr ""
+
+msgid "/Conversation/Se_nd File..."
+msgstr ""
+
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr ""
+
+msgid "/Conversation/_Get Info"
+msgstr ""
+
+msgid "/Conversation/In_vite..."
+msgstr ""
+
+msgid "/Conversation/M_ore"
+msgstr ""
+
+msgid "/Conversation/Al_ias..."
+msgstr ""
+
+msgid "/Conversation/_Block..."
+msgstr ""
+
+msgid "/Conversation/_Unblock..."
+msgstr ""
+
+msgid "/Conversation/_Add..."
+msgstr ""
+
+msgid "/Conversation/_Remove..."
+msgstr ""
+
+msgid "/Conversation/Insert Lin_k..."
+msgstr ""
+
+msgid "/Conversation/Insert Imag_e..."
+msgstr ""
+
+msgid "/Conversation/_Close"
+msgstr ""
+
+#. Options
+msgid "/_Options"
+msgstr ""
+
+msgid "/Options/Enable _Logging"
+msgstr ""
+
+msgid "/Options/Enable _Sounds"
+msgstr ""
+
+msgid "/Options/Show Formatting _Toolbars"
+msgstr ""
+
+msgid "/Options/Show Ti_mestamps"
+msgstr ""
+
+msgid "/Conversation/More"
+msgstr ""
+
+msgid "/Options"
+msgstr ""
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+msgid "/Conversation"
+msgstr ""
+
+msgid "/Conversation/View Log"
+msgstr ""
+
+msgid "/Conversation/Media/Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr ""
+
+msgid "/Conversation/Send File..."
+msgstr ""
+
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr ""
+
+msgid "/Conversation/Get Info"
+msgstr ""
+
+msgid "/Conversation/Invite..."
+msgstr ""
+
+msgid "/Conversation/Alias..."
+msgstr ""
+
+msgid "/Conversation/Block..."
+msgstr ""
+
+msgid "/Conversation/Unblock..."
+msgstr ""
+
+msgid "/Conversation/Add..."
+msgstr ""
+
+msgid "/Conversation/Remove..."
+msgstr ""
+
+msgid "/Conversation/Insert Link..."
+msgstr ""
+
+msgid "/Conversation/Insert Image..."
+msgstr ""
+
+msgid "/Options/Enable Logging"
+msgstr ""
+
+msgid "/Options/Enable Sounds"
+msgstr ""
+
+msgid "/Options/Show Formatting Toolbars"
+msgstr ""
+
+msgid "/Options/Show Timestamps"
+msgstr ""
+
+msgid "User is typing..."
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+
+#. Build the Send To menu
+msgid "S_end To"
+msgstr ""
+
+msgid "_Send"
+msgstr ""
+
+#. Setup the label telling how many people are in the room.
+msgid "0 people in room"
+msgstr ""
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Typing"
+msgstr ""
+
+msgid "Stopped Typing"
+msgstr ""
+
+msgid "Nick Said"
+msgstr ""
+
+msgid "Unread Messages"
+msgstr ""
+
+msgid "New Event"
+msgstr ""
+
+msgid "clear: Clears all conversation scrollbacks."
+msgstr ""
+
+msgid "Confirm close"
+msgstr ""
+
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr ""
+
+msgid "Close other tabs"
+msgstr ""
+
+msgid "Close all tabs"
+msgstr ""
+
+msgid "Detach this tab"
+msgstr ""
+
+msgid "Close this tab"
+msgstr ""
+
+msgid "Close conversation"
+msgstr ""
+
+msgid "Last created window"
+msgstr ""
+
+msgid "Separate IM and Chat windows"
+msgstr ""
+
+msgid "New window"
+msgstr ""
+
+msgid "By group"
+msgstr ""
+
+msgid "By account"
+msgstr ""
+
+msgid "Save Debug Log"
+msgstr ""
+
+msgid "Invert"
+msgstr ""
+
+msgid "Highlight matches"
+msgstr ""
+
+msgid "_Icon Only"
+msgstr ""
+
+msgid "_Text Only"
+msgstr ""
+
+msgid "_Both Icon & Text"
+msgstr ""
+
+msgid "Filter"
+msgstr ""
+
+msgid "Right click for more options."
+msgstr ""
+
+msgid "Level "
+msgstr ""
+
+msgid "Select the debug filter level."
+msgstr ""
+
+msgid "All"
+msgstr ""
+
+msgid "Misc"
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Error "
+msgstr ""
+
+msgid "Fatal Error"
+msgstr ""
+
+msgid "bug master"
+msgstr ""
+
+msgid "artist"
+msgstr ""
+
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr ""
+
+msgid "voice and video"
+msgstr ""
+
+msgid "support"
+msgstr ""
+
+msgid "webmaster"
+msgstr ""
+
+msgid "Senior Contributor/QA"
+msgstr ""
+
+msgid "win32 port"
+msgstr ""
+
+msgid "maintainer"
+msgstr ""
+
+msgid "libfaim maintainer"
+msgstr ""
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+msgid "hacker and designated driver [lazy bum]"
+msgstr ""
+
+msgid "support/QA"
+msgstr ""
+
+msgid "XMPP"
+msgstr ""
+
+msgid "original author"
+msgstr ""
+
+msgid "lead developer"
+msgstr ""
+
+msgid "Afrikaans"
+msgstr ""
+
+msgid "Arabic"
+msgstr ""
+
+msgid "Belarusian Latin"
+msgstr ""
+
+msgid "Bulgarian"
+msgstr ""
+
+msgid "Bengali"
+msgstr ""
+
+msgid "Bosnian"
+msgstr ""
+
+msgid "Catalan"
+msgstr ""
+
+msgid "Valencian-Catalan"
+msgstr ""
+
+msgid "Czech"
+msgstr ""
+
+msgid "Danish"
+msgstr ""
+
+msgid "German"
+msgstr ""
+
+msgid "Dzongkha"
+msgstr ""
+
+msgid "Greek"
+msgstr ""
+
+msgid "Australian English"
+msgstr ""
+
+msgid "Canadian English"
+msgstr ""
+
+msgid "British English"
+msgstr ""
+
+msgid "Esperanto"
+msgstr ""
+
+msgid "Spanish"
+msgstr ""
+
+msgid "Estonian"
+msgstr ""
+
+msgid "Euskera(Basque)"
+msgstr ""
+
+msgid "Persian"
+msgstr ""
+
+msgid "Finnish"
+msgstr ""
+
+msgid "French"
+msgstr ""
+
+msgid "Irish"
+msgstr ""
+
+msgid "Galician"
+msgstr ""
+
+msgid "Gujarati"
+msgstr ""
+
+msgid "Gujarati Language Team"
+msgstr ""
+
+msgid "Hebrew"
+msgstr ""
+
+msgid "Hindi"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Armenian"
+msgstr ""
+
+msgid "Indonesian"
+msgstr ""
+
+msgid "Italian"
+msgstr ""
+
+msgid "Japanese"
+msgstr ""
+
+msgid "Georgian"
+msgstr ""
+
+msgid "Ubuntu Georgian Translators"
+msgstr ""
+
+msgid "Khmer"
+msgstr ""
+
+msgid "Kannada"
+msgstr ""
+
+msgid "Kannada Translation team"
+msgstr ""
+
+msgid "Korean"
+msgstr ""
+
+msgid "Kurdish"
+msgstr ""
+
+msgid "Lao"
+msgstr ""
+
+msgid "Lithuanian"
+msgstr ""
+
+msgid "Macedonian"
+msgstr ""
+
+msgid "Mongolian"
+msgstr ""
+
+msgid "Bokmål Norwegian"
+msgstr ""
+
+msgid "Nepali"
+msgstr ""
+
+msgid "Dutch, Flemish"
+msgstr ""
+
+msgid "Norwegian Nynorsk"
+msgstr ""
+
+msgid "Occitan"
+msgstr ""
+
+msgid "Punjabi"
+msgstr ""
+
+msgid "Polish"
+msgstr ""
+
+msgid "Portuguese"
+msgstr ""
+
+msgid "Portuguese-Brazil"
+msgstr ""
+
+msgid "Pashto"
+msgstr ""
+
+msgid "Romanian"
+msgstr ""
+
+msgid "Russian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""
+
+msgid "Slovenian"
+msgstr ""
+
+msgid "Albanian"
+msgstr ""
+
+msgid "Serbian"
+msgstr ""
+
+msgid "Sinhala"
+msgstr ""
+
+msgid "Swedish"
+msgstr ""
+
+msgid "Swahili"
+msgstr ""
+
+msgid "Tamil"
+msgstr ""
+
+msgid "Telugu"
+msgstr ""
+
+msgid "Thai"
+msgstr ""
+
+msgid "Turkish"
+msgstr ""
+
+msgid "Urdu"
+msgstr ""
+
+msgid "Vietnamese"
+msgstr ""
+
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr ""
+
+msgid "Simplified Chinese"
+msgstr ""
+
+msgid "Hong Kong Chinese"
+msgstr ""
+
+msgid "Traditional Chinese"
+msgstr ""
+
+msgid "Amharic"
+msgstr ""
+
+#, c-format
+msgid "About %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr ""
+
+msgid "Current Developers"
+msgstr ""
+
+msgid "Crazy Patch Writers"
+msgstr ""
+
+msgid "Retired Developers"
+msgstr ""
+
+msgid "Retired Crazy Patch Writers"
+msgstr ""
+
+msgid "Current Translators"
+msgstr ""
+
+msgid "Past Translators"
+msgstr ""
+
+msgid "Debugging Information"
+msgstr ""
+
+msgid "_Name"
+msgstr ""
+
+msgid "_Account"
+msgstr ""
+
+msgid "Get User Info"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+
+msgid "View User Log"
+msgstr ""
+
+msgid "Alias Contact"
+msgstr ""
+
+msgid "Enter an alias for this contact."
+msgstr ""
+
+#, c-format
+msgid "Enter an alias for %s."
+msgstr ""
+
+msgid "Alias Buddy"
+msgstr ""
+
+msgid "Alias Chat"
+msgstr ""
+
+msgid "Enter an alias for this chat."
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Remove Contact"
+msgstr ""
+
+msgid "_Remove Contact"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+
+msgid "Merge Groups"
+msgstr ""
+
+msgid "_Merge Groups"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+
+msgid "Remove Group"
+msgstr ""
+
+msgid "_Remove Group"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+
+msgid "Remove Buddy"
+msgstr ""
+
+msgid "_Remove Buddy"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+
+msgid "Remove Chat"
+msgstr ""
+
+msgid "_Remove Chat"
+msgstr ""
+
+msgid "Right-click for more unread messages...\n"
+msgstr ""
+
+msgid "_Change Status"
+msgstr ""
+
+msgid "Show Buddy _List"
+msgstr ""
+
+msgid "_Unread Messages"
+msgstr ""
+
+msgid "New _Message..."
+msgstr ""
+
+msgid "_Accounts"
+msgstr ""
+
+msgid "Plu_gins"
+msgstr ""
+
+msgid "Pr_eferences"
+msgstr ""
+
+msgid "Mute _Sounds"
+msgstr ""
+
+msgid "_Blink on New Message"
+msgstr ""
+
+msgid "_Quit"
+msgstr ""
+
+msgid "Not started"
+msgstr ""
+
+msgid "<b>Receiving As:</b>"
+msgstr ""
+
+msgid "<b>Receiving From:</b>"
+msgstr ""
+
+msgid "<b>Sending To:</b>"
+msgstr ""
+
+msgid "<b>Sending As:</b>"
+msgstr ""
+
+msgid "There is no application configured to open this type of file."
+msgstr ""
+
+msgid "An error occurred while opening the file."
+msgstr ""
+
+#, c-format
+msgid "Error launching %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Error running %s"
+msgstr ""
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr ""
+
+msgid "Filename:"
+msgstr ""
+
+msgid "Local File:"
+msgstr ""
+
+msgid "Speed:"
+msgstr ""
+
+msgid "Time Elapsed:"
+msgstr ""
+
+msgid "Time Remaining:"
+msgstr ""
+
+msgid "Close this window when all transfers _finish"
+msgstr ""
+
+msgid "C_lear finished transfers"
+msgstr ""
+
+#. "Download Details" arrow
+msgid "File transfer _details"
+msgstr ""
+
+#. Pause button
+msgid "_Pause"
+msgstr ""
+
+#. Resume button
+msgid "_Resume"
+msgstr ""
+
+msgid "Paste as Plain _Text"
+msgstr ""
+
+msgid "_Reset formatting"
+msgstr ""
+
+msgid "Disable _smileys in selected text"
+msgstr ""
+
+msgid "Hyperlink color"
+msgstr ""
+
+msgid "Color to draw hyperlinks."
+msgstr ""
+
+msgid "Hyperlink visited color"
+msgstr ""
+
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr ""
+
+msgid "Hyperlink prelight color"
+msgstr ""
+
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr ""
+
+msgid "Sent Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you sent."
+msgstr ""
+
+msgid "Received Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received."
+msgstr ""
+
+msgid "\"Attention\" Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received containing your name."
+msgstr ""
+
+msgid "Action Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of an action message."
+msgstr ""
+
+msgid "Action Message Name Color for Whispered Message"
+msgstr ""
+
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
+msgid "Whisper Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
+msgid "Typing notification color"
+msgstr ""
+
+msgid "The color to use for the typing notification"
+msgstr ""
+
+msgid "Typing notification font"
+msgstr ""
+
+msgid "The font to use for the typing notification"
+msgstr ""
+
+msgid "Enable typing notification"
+msgstr ""
+
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+
+msgid "Save Image"
+msgstr ""
+
+msgid "_Save Image..."
+msgstr ""
+
+msgid "_Add Custom Smiley..."
+msgstr ""
+
+msgid "Select Font"
+msgstr ""
+
+msgid "Select Text Color"
+msgstr ""
+
+msgid "Select Background Color"
+msgstr ""
+
+msgid "_URL"
+msgstr ""
+
+msgid "_Description"
+msgstr ""
+
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+
+msgid "Please enter the URL of the link that you want to insert."
+msgstr ""
+
+msgid "Insert Link"
+msgstr ""
+
+msgid "_Insert"
+msgstr ""
+
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr ""
+
+msgid "Insert Image"
+msgstr ""
+
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+
+msgid "Smile!"
+msgstr ""
+
+msgid "_Manage custom smileys"
+msgstr ""
+
+msgid "This theme has no available smileys."
+msgstr ""
+
+msgid "_Font"
+msgstr ""
+
+msgid "Group Items"
+msgstr ""
+
+msgid "Ungroup Items"
+msgstr ""
+
+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Underline"
+msgstr ""
+
+msgid "Strikethrough"
+msgstr ""
+
+msgid "Increase Font Size"
+msgstr ""
+
+msgid "Decrease Font Size"
+msgstr ""
+
+msgid "Font Face"
+msgstr ""
+
+msgid "Foreground Color"
+msgstr ""
+
+msgid "Reset Formatting"
+msgstr ""
+
+msgid "Insert IM Image"
+msgstr ""
+
+msgid "Insert Smiley"
+msgstr ""
+
+msgid "<b>_Bold</b>"
+msgstr ""
+
+msgid "<i>_Italic</i>"
+msgstr ""
+
+msgid "<u>_Underline</u>"
+msgstr ""
+
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr ""
+
+msgid "<span size='larger'>_Larger</span>"
+msgstr ""
+
+msgid "_Normal"
+msgstr ""
+
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr ""
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+msgid "_Font face"
+msgstr ""
+
+msgid "Foreground _color"
+msgstr ""
+
+msgid "Bac_kground color"
+msgstr ""
+
+msgid "_Image"
+msgstr ""
+
+msgid "_Link"
+msgstr ""
+
+msgid "_Horizontal rule"
+msgstr ""
+
+msgid "_Smile!"
+msgstr ""
+
+msgid "Log Deletion Failed"
+msgstr ""
+
+msgid "Check permissions and try again."
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr ""
+
+msgid "Delete Log?"
+msgstr ""
+
+msgid "Delete Log..."
+msgstr ""
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr ""
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr ""
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+msgid "_Browse logs folder"
+msgstr ""
+
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  --display=DISPLAY   X display to use\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%swiki/GetABacktrace\n"
+msgstr ""
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Pidgin"
+msgstr ""
+
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+msgid "Calling..."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr ""
+
+msgid "Unable to open URL"
+msgstr ""
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr ""
+
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+
+msgid "No message"
+msgstr ""
+
+msgid "Open All Messages"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+msgid "New Pounces"
+msgstr ""
+
+msgid "Dismiss"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
+msgid "The following plugins will be unloaded."
+msgstr ""
+
+msgid "Multiple plugins will be unloaded."
+msgstr ""
+
+msgid "Unload Plugins"
+msgstr ""
+
+msgid "Could not unload plugin"
+msgstr ""
+
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+
+#, c-format
+msgid ""
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+
+msgid "Author"
+msgstr ""
+
+msgid "<b>Written by:</b>"
+msgstr ""
+
+msgid "<b>Web site:</b>"
+msgstr ""
+
+msgid "<b>Filename:</b>"
+msgstr ""
+
+msgid "Configure Pl_ugin"
+msgstr ""
+
+msgid "<b>Plugin Details</b>"
+msgstr ""
+
+msgid "Select a file"
+msgstr ""
+
+msgid "Modify Buddy Pounce"
+msgstr ""
+
+#. Create the "Pounce on Whom" frame.
+msgid "Pounce on Whom"
+msgstr ""
+
+msgid "_Account:"
+msgstr ""
+
+msgid "_Buddy name:"
+msgstr ""
+
+msgid "Si_gns on"
+msgstr ""
+
+msgid "Signs o_ff"
+msgstr ""
+
+msgid "Goes a_way"
+msgstr ""
+
+msgid "Ret_urns from away"
+msgstr ""
+
+msgid "Becomes _idle"
+msgstr ""
+
+msgid "Is no longer i_dle"
+msgstr ""
+
+msgid "Starts _typing"
+msgstr ""
+
+msgid "P_auses while typing"
+msgstr ""
+
+msgid "Stops t_yping"
+msgstr ""
+
+msgid "Sends a _message"
+msgstr ""
+
+msgid "Ope_n an IM window"
+msgstr ""
+
+msgid "_Pop up a notification"
+msgstr ""
+
+msgid "Send a _message"
+msgstr ""
+
+msgid "E_xecute a command"
+msgstr ""
+
+msgid "P_lay a sound"
+msgstr ""
+
+msgid "Brows_e..."
+msgstr ""
+
+msgid "Br_owse..."
+msgstr ""
+
+msgid "Pre_view"
+msgstr ""
+
+msgid "P_ounce only when my status is not Available"
+msgstr ""
+
+msgid "_Recurring"
+msgstr ""
+
+msgid "Pounce Target"
+msgstr ""
+
+#, c-format
+msgid "Started typing"
+msgstr ""
+
+#, c-format
+msgid "Paused while typing"
+msgstr ""
+
+#, c-format
+msgid "Signed on"
+msgstr ""
+
+#, c-format
+msgid "Returned from being idle"
+msgstr ""
+
+#, c-format
+msgid "Returned from being away"
+msgstr ""
+
+#, c-format
+msgid "Stopped typing"
+msgstr ""
+
+#, c-format
+msgid "Signed off"
+msgstr ""
+
+#, c-format
+msgid "Became idle"
+msgstr ""
+
+#, c-format
+msgid "Went away"
+msgstr ""
+
+#, c-format
+msgid "Sent a message"
+msgstr ""
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
+msgstr ""
+
+msgid "Install Theme"
+msgstr ""
+
+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 ""
+
+msgid "Icon"
+msgstr ""
+
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr ""
+
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr ""
+
+#. System Tray
+msgid "System Tray Icon"
+msgstr ""
+
+msgid "_Show system tray icon:"
+msgstr ""
+
+msgid "On unread messages"
+msgstr ""
+
+msgid "Conversation Window"
+msgstr ""
+
+msgid "_Hide new IM conversations:"
+msgstr ""
+
+msgid "When away"
+msgstr ""
+
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
+#. All the tab options!
+msgid "Tabs"
+msgstr ""
+
+msgid "Show IMs and chats in _tabbed windows"
+msgstr ""
+
+msgid "Show close b_utton on tabs"
+msgstr ""
+
+msgid "_Placement:"
+msgstr ""
+
+msgid "Top"
+msgstr ""
+
+msgid "Bottom"
+msgstr ""
+
+msgid "Left"
+msgstr ""
+
+msgid "Right"
+msgstr ""
+
+msgid "Left Vertical"
+msgstr ""
+
+msgid "Right Vertical"
+msgstr ""
+
+msgid "N_ew conversations:"
+msgstr ""
+
+msgid "Show _formatting on incoming messages"
+msgstr ""
+
+msgid "Close IMs immediately when the tab is closed"
+msgstr ""
+
+msgid "Show _detailed information"
+msgstr ""
+
+msgid "Enable buddy ic_on animation"
+msgstr ""
+
+msgid "_Notify buddies that you are typing to them"
+msgstr ""
+
+msgid "Highlight _misspelled words"
+msgstr ""
+
+msgid "Use smooth-scrolling"
+msgstr ""
+
+msgid "F_lash window when IMs are received"
+msgstr ""
+
+msgid "Minimum input area height in lines:"
+msgstr ""
+
+msgid "Font"
+msgstr ""
+
+msgid "Use document font from _theme"
+msgstr ""
+
+msgid "Use font from _theme"
+msgstr ""
+
+msgid "Conversation _font:"
+msgstr ""
+
+msgid "Default Formatting"
+msgstr ""
+
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+
+msgid "Cannot start proxy configuration program."
+msgstr ""
+
+msgid "Cannot start browser configuration program."
+msgstr ""
+
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr ""
+
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr ""
+
+msgid "Public _IP:"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "_Enable automatic router port forwarding"
+msgstr ""
+
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+msgid "_Start port:"
+msgstr ""
+
+msgid "_End port:"
+msgstr ""
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
+msgid "Proxy Server &amp; Browser"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+
+msgid "Configure _Proxy"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr ""
+
+msgid "Proxy Server"
+msgstr ""
+
+msgid "No proxy"
+msgstr ""
+
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
+msgid "_User:"
+msgstr ""
+
+msgid "Seamonkey"
+msgstr ""
+
+msgid "Opera"
+msgstr ""
+
+msgid "Netscape"
+msgstr ""
+
+msgid "Mozilla"
+msgstr ""
+
+msgid "Konqueror"
+msgstr ""
+
+msgid "Desktop Default"
+msgstr ""
+
+msgid "GNOME Default"
+msgstr ""
+
+msgid "Galeon"
+msgstr ""
+
+msgid "Firefox"
+msgstr ""
+
+msgid "Firebird"
+msgstr ""
+
+msgid "Epiphany"
+msgstr ""
+
+msgid "Manual"
+msgstr ""
+
+msgid "Browser Selection"
+msgstr ""
+
+msgid "_Browser:"
+msgstr ""
+
+msgid "_Open link in:"
+msgstr ""
+
+msgid "Browser default"
+msgstr ""
+
+msgid "Existing window"
+msgstr ""
+
+msgid "New tab"
+msgstr ""
+
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+
+msgid "Log _format:"
+msgstr ""
+
+msgid "Log all _instant messages"
+msgstr ""
+
+msgid "Log all c_hats"
+msgstr ""
+
+msgid "Log all _status changes to system log"
+msgstr ""
+
+msgid "Sound Selection"
+msgstr ""
+
+#, c-format
+msgid "Quietest"
+msgstr ""
+
+#, c-format
+msgid "Quieter"
+msgstr ""
+
+#, c-format
+msgid "Quiet"
+msgstr ""
+
+#, c-format
+msgid "Loud"
+msgstr ""
+
+#, c-format
+msgid "Louder"
+msgstr ""
+
+#, c-format
+msgid "Loudest"
+msgstr ""
+
+msgid "_Method:"
+msgstr ""
+
+msgid "Console beep"
+msgstr ""
+
+msgid "No sounds"
+msgstr ""
+
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+
+msgid "M_ute sounds"
+msgstr ""
+
+msgid "Sounds when conversation has _focus"
+msgstr ""
+
+msgid "_Enable sounds:"
+msgstr ""
+
+msgid "V_olume:"
+msgstr ""
+
+msgid "Play"
+msgstr ""
+
+msgid "_Browse..."
+msgstr ""
+
+msgid "_Reset"
+msgstr ""
+
+msgid "_Report idle time:"
+msgstr ""
+
+msgid "Based on keyboard or mouse use"
+msgstr ""
+
+msgid "_Auto-reply:"
+msgstr ""
+
+msgid "When both away and idle"
+msgstr ""
+
+#. Auto-away stuff
+msgid "Auto-away"
+msgstr ""
+
+msgid "_Minutes before becoming idle:"
+msgstr ""
+
+msgid "Change status when _idle"
+msgstr ""
+
+msgid "Change _status to:"
+msgstr ""
+
+#. Signon status stuff
+msgid "Status at Startup"
+msgstr ""
+
+msgid "Use status from last _exit at startup"
+msgstr ""
+
+msgid "Status to a_pply at startup:"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Smiley Themes"
+msgstr ""
+
+msgid "Browser"
+msgstr ""
+
+msgid "Status / Idle"
+msgstr ""
+
+msgid "Allow all users to contact me"
+msgstr ""
+
+msgid "Allow only the users on my buddy list"
+msgstr ""
+
+msgid "Allow only the users below"
+msgstr ""
+
+msgid "Block all users"
+msgstr ""
+
+msgid "Block only the users below"
+msgstr ""
+
+msgid "Privacy"
+msgstr ""
+
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+msgid "Set privacy for:"
+msgstr ""
+
+#. Remove All button
+msgid "Remove Al_l"
+msgstr ""
+
+msgid "Permit User"
+msgstr ""
+
+msgid "Type a user you permit to contact you."
+msgstr ""
+
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr ""
+
+msgid "_Permit"
+msgstr ""
+
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr ""
+
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr ""
+
+msgid "Block User"
+msgstr ""
+
+msgid "Type a user to block."
+msgstr ""
+
+msgid "Please enter the name of the user you wish to block."
+msgstr ""
+
+#, c-format
+msgid "Block %s?"
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr ""
+
+msgid "Apply"
+msgstr ""
+
+msgid "That file already exists"
+msgstr ""
+
+msgid "Would you like to overwrite it?"
+msgstr ""
+
+msgid "Overwrite"
+msgstr ""
+
+msgid "Choose New Name"
+msgstr ""
+
+msgid "Select Folder..."
+msgstr ""
+
+#. list button
+msgid "_Get List"
+msgstr ""
+
+#. add button
+msgid "_Add Chat"
+msgstr ""
+
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr ""
+
+#. Use button
+msgid "_Use"
+msgstr ""
+
+msgid "Title already in use.  You must choose a unique title."
+msgstr ""
+
+msgid "Different"
+msgstr ""
+
+msgid "_Title:"
+msgstr ""
+
+msgid "_Status:"
+msgstr ""
+
+#. Different status message expander
+msgid "Use a _different status for some accounts"
+msgstr ""
+
+#. Save & Use button
+msgid "Sa_ve & Use"
+msgstr ""
+
+#, c-format
+msgid "Status for %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
+msgid "Custom Smiley"
+msgstr ""
+
+msgid "Duplicate Shortcut"
+msgstr ""
+
+msgid "Edit Smiley"
+msgstr ""
+
+msgid "Add Smiley"
+msgstr ""
+
+msgid "_Image:"
+msgstr ""
+
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr ""
+
+msgid "Smiley"
+msgstr ""
+
+msgid "Shortcut Text"
+msgstr ""
+
+msgid "Custom Smiley Manager"
+msgstr ""
+
+msgid "Select Buddy Icon"
+msgstr ""
+
+msgid "Click to change your buddyicon for this account."
+msgstr ""
+
+msgid "Click to change your buddyicon for all accounts."
+msgstr ""
+
+msgid "Waiting for network connection"
+msgstr ""
+
+msgid "New status..."
+msgstr ""
+
+msgid "Saved statuses..."
+msgstr ""
+
+msgid "Status Selector"
+msgstr ""
+
+msgid "Google Talk"
+msgstr ""
+
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr ""
+
+msgid "Failed to load image"
+msgstr ""
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+
+msgid "You have dragged an image"
+msgstr ""
+
+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 ""
+
+msgid "Set as buddy icon"
+msgstr ""
+
+msgid "Send image file"
+msgstr ""
+
+msgid "Insert in message"
+msgstr ""
+
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr ""
+
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+
+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
+msgid "Cannot send launcher"
+msgstr ""
+
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
+msgstr ""
+
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+
+msgid "Icon Error"
+msgstr ""
+
+msgid "Could not set icon"
+msgstr ""
+
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+msgid "_Open Link"
+msgstr ""
+
+msgid "_Copy Link Location"
+msgstr ""
+
+msgid "_Copy Email Address"
+msgstr ""
+
+msgid "Save File"
+msgstr ""
+
+msgid "Select color"
+msgstr ""
+
+msgid "_Alias"
+msgstr ""
+
+msgid "Close _tabs"
+msgstr ""
+
+msgid "_Get Info"
+msgstr ""
+
+msgid "_Invite"
+msgstr ""
+
+msgid "_Modify..."
+msgstr ""
+
+msgid "_Add..."
+msgstr ""
+
+msgid "_Open Mail"
+msgstr ""
+
+msgid "_Edit"
+msgstr ""
+
+msgid "Pidgin Tooltip"
+msgstr ""
+
+msgid "Pidgin smileys"
+msgstr ""
+
+msgid "Penguin Pimps"
+msgstr ""
+
+msgid "Selecting this disables graphical emoticons."
+msgstr ""
+
+msgid "none"
+msgstr ""
+
+msgid "Small"
+msgstr ""
+
+msgid "Smaller versions of the default smilies"
+msgstr ""
+
+msgid "Response Probability:"
+msgstr ""
+
+msgid "Statistics Configuration"
+msgstr ""
+
+#. msg_difference spinner
+msgid "Maximum response timeout:"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
+#. last_seen spinner
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#. threshold spinner
+msgid "Threshold:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Availability Prediction"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Contact Availability Prediction plugin."
+msgstr ""
+
+#. *  summary
+msgid "Displays statistical information about your buddies' availability"
+msgstr ""
+
+msgid "Server name request"
+msgstr ""
+
+msgid "Enter an XMPP Server"
+msgstr ""
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+msgid "Add to Buddy List"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+msgid "_Browse"
+msgstr ""
+
+msgid "Server does not exist"
+msgstr ""
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+msgid "Buddy is idle"
+msgstr ""
+
+msgid "Buddy is away"
+msgstr ""
+
+msgid "Buddy is \"extended\" away"
+msgstr ""
+
+#. Not used yet.
+msgid "Buddy is mobile"
+msgstr ""
+
+msgid "Buddy is offline"
+msgstr ""
+
+msgid "Point values to use when..."
+msgstr ""
+
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+
+msgid "Use last buddy when scores are equal"
+msgstr ""
+
+msgid "Point values to use for account..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Priority"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
+msgid "Conversation Colors"
+msgstr ""
+
+msgid "Customize colors in the conversation window"
+msgstr ""
+
+msgid "Error Messages"
+msgstr ""
+
+msgid "Highlighted Messages"
+msgstr ""
+
+msgid "System Messages"
+msgstr ""
+
+msgid "Sent Messages"
+msgstr ""
+
+msgid "Received Messages"
+msgstr ""
+
+#, c-format
+msgid "Select Color for %s"
+msgstr ""
+
+msgid "Ignore incoming format"
+msgstr ""
+
+msgid "Apply in Chats"
+msgstr ""
+
+msgid "Apply in IMs"
+msgstr ""
+
+msgid "By conversation count"
+msgstr ""
+
+msgid "Conversation Placement"
+msgstr ""
+
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+
+msgid "Number of conversations per window"
+msgstr ""
+
+msgid "Separate IM and Chat windows when placing by number"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "ExtPlacement"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Extra conversation placement options."
+msgstr ""
+
+#. *< summary
+#. *  description
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+
+#. Configuration frame
+msgid "Mouse Gestures Configuration"
+msgstr ""
+
+msgid "Middle mouse button"
+msgstr ""
+
+msgid "Right mouse button"
+msgstr ""
+
+#. "Visual gesture display" checkbox
+msgid "_Visual gesture display"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Mouse Gestures"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Provides support for mouse gestures"
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
+msgstr ""
+
+msgid "Instant Messaging"
+msgstr ""
+
+#. Add the label.
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+
+msgid "Group:"
+msgstr ""
+
+#. "New Person" button
+msgid "New Person"
+msgstr ""
+
+#. "Select Buddy" button
+msgid "Select Buddy"
+msgstr ""
+
+#. Add the label.
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+
+#. Add the expander
+msgid "User _details"
+msgstr ""
+
+#. "Associate Buddy" button
+msgid "_Associate Buddy"
+msgstr ""
+
+msgid "Unable to send email"
+msgstr ""
+
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
+msgid "An email address was not found for this buddy."
+msgstr ""
+
+msgid "Add to Address Book"
+msgstr ""
+
+msgid "Send Email"
+msgstr ""
+
+#. Configuration frame
+msgid "Evolution Integration Configuration"
+msgstr ""
+
+#. Label
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Evolution Integration"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides integration with Evolution."
+msgstr ""
+
+msgid "Please enter the person's information below."
+msgstr ""
+
+msgid "Please enter the buddy's username and account type below."
+msgstr ""
+
+msgid "Account type:"
+msgstr ""
+
+#. Optional Information section
+msgid "Optional information:"
+msgstr ""
+
+msgid "First name:"
+msgstr ""
+
+msgid "Last name:"
+msgstr ""
+
+msgid "Email:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GTK Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+
+msgid "History"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Iconify on Away"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr ""
+
+msgid "Mail Checker"
+msgstr ""
+
+msgid "Checks for new local mail."
+msgstr ""
+
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+
+msgid "Markerline"
+msgstr ""
+
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr ""
+
+msgid "Jump to markerline"
+msgstr ""
+
+msgid "Draw Markerline in "
+msgstr ""
+
+msgid "_IM windows"
+msgstr ""
+
+msgid "C_hat windows"
+msgstr ""
+
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+
+msgid "Music messaging session confirmed."
+msgstr ""
+
+msgid "Music Messaging"
+msgstr ""
+
+msgid "There was a conflict in running the command:"
+msgstr ""
+
+msgid "Error Running Editor"
+msgstr ""
+
+msgid "The following error has occurred:"
+msgstr ""
+
+#. Configuration frame
+msgid "Music Messaging Configuration"
+msgstr ""
+
+msgid "Score Editor Path"
+msgstr ""
+
+msgid "_Apply"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr ""
+
+#. *  summary
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editing a common score in real-time."
+msgstr ""
+
+#. ---------- "Notify For" ----------
+msgid "Notify For"
+msgstr ""
+
+msgid "\t_Only when someone says your username"
+msgstr ""
+
+msgid "_Focused windows"
+msgstr ""
+
+#. ---------- "Notification Methods" ----------
+msgid "Notification Methods"
+msgstr ""
+
+msgid "Prepend _string into window title:"
+msgstr ""
+
+#. Count method button
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#. Count xprop method button
+msgid "Insert count of new message into _X property"
+msgstr ""
+
+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr ""
+
+msgid "_Flash window"
+msgstr ""
+
+#. Raise window method button
+msgid "R_aise conversation window"
+msgstr ""
+
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr ""
+
+#. ---------- "Notification Removals" ----------
+msgid "Notification Removal"
+msgstr ""
+
+#. Remove on focus button
+msgid "Remove when conversation window _gains focus"
+msgstr ""
+
+#. Remove on click button
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#. Remove on type button
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#. Remove on message send button
+msgid "Remove when a _message gets sent"
+msgstr ""
+
+#. Remove on conversation switch button
+msgid "Remove on switch to conversation ta_b"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Pidgin Demonstration Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "An example plugin that does stuff - see the description."
+msgstr ""
+
+#. *  description
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+
+msgid "Hyperlink Color"
+msgstr ""
+
+msgid "Visited Hyperlink Color"
+msgstr ""
+
+msgid "Highlighted Message Name Color"
+msgstr ""
+
+msgid "Typing Notification Color"
+msgstr ""
+
+msgid "GtkTreeView Horizontal Separation"
+msgstr ""
+
+msgid "Conversation Entry"
+msgstr ""
+
+msgid "Request Dialog"
+msgstr ""
+
+msgid "Notify Dialog"
+msgstr ""
+
+msgid "Select Color"
+msgstr ""
+
+#, c-format
+msgid "Select Interface Font"
+msgstr ""
+
+#, c-format
+msgid "Select Font for %s"
+msgstr ""
+
+msgid "GTK+ Interface Font"
+msgstr ""
+
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+msgid "Disable Typing Notification Text"
+msgstr ""
+
+msgid "GTK+ Theme Control Settings"
+msgstr ""
+
+msgid "Colors"
+msgstr ""
+
+msgid "Fonts"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "Gtkrc File Tools"
+msgstr ""
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr ""
+
+msgid "Re-read gtkrc files"
+msgstr ""
+
+msgid "Pidgin GTK+ Theme Control"
+msgstr ""
+
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+
+#, c-format
+msgid "You can upgrade to %s %s today."
+msgstr ""
+
+msgid "New Version Available"
+msgstr ""
+
+msgid "Later"
+msgstr ""
+
+msgid "Download Now"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Release Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Checks periodically for new releases."
+msgstr ""
+
+#. *  description
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Conversation Window Send Button."
+msgstr ""
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for use when no physical keyboard is present."
+msgstr ""
+
+msgid "Duplicate Correction"
+msgstr ""
+
+msgid "The specified word already exists in the correction list."
+msgstr ""
+
+msgid "Text Replacements"
+msgstr ""
+
+msgid "You type"
+msgstr ""
+
+msgid "You send"
+msgstr ""
+
+msgid "Whole words only"
+msgstr ""
+
+msgid "Case sensitive"
+msgstr ""
+
+msgid "Add a new text replacement"
+msgstr ""
+
+msgid "You _type:"
+msgstr ""
+
+msgid "You _send:"
+msgstr ""
+
+#. Created here so it can be passed to whole_words_button_toggled.
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+
+msgid "Only replace _whole words"
+msgstr ""
+
+msgid "General Text Replacement Options"
+msgstr ""
+
+msgid "Enable replacement of last word on send"
+msgstr ""
+
+msgid "Text replacement"
+msgstr ""
+
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+
+msgid "Just logged in"
+msgstr ""
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Միանալ զրույցին"
+
+msgid "Ignored"
+msgstr ""
+
+msgid "Founder"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Half Operator"
+msgstr ""
+
+msgid "Authorization dialog"
+msgstr ""
+
+msgid "Error dialog"
+msgstr ""
+
+msgid "Information dialog"
+msgstr ""
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+msgid "Warning dialog"
+msgstr ""
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+msgid "Status Icons"
+msgstr ""
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+msgid "Dialog Icons"
+msgstr ""
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr ""
+
+msgid "Edit Buddylist Theme"
+msgstr ""
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Ticker"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "A horizontal scrolling version of the buddy list."
+msgstr ""
+
+msgid "Display Timestamps Every"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Timestamp"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Display iChat-style timestamps"
+msgstr ""
+
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr ""
+
+msgid "Timestamp Format Options"
+msgstr ""
+
+#, c-format
+msgid "_Force 24-hour time format"
+msgstr ""
+
+msgid "Show dates in..."
+msgstr ""
+
+msgid "Co_nversations:"
+msgstr ""
+
+msgid "For delayed messages"
+msgstr ""
+
+msgid "For delayed messages and in chats"
+msgstr ""
+
+msgid "_Message Logs:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Timestamp Formats"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Customizes the message timestamp formats."
+msgstr ""
+
+#. *  description
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+
+msgid "Opacity:"
+msgstr ""
+
+#. IM Convo trans options
+msgid "IM Conversation Windows"
+msgstr ""
+
+msgid "_IM window transparency"
+msgstr ""
+
+msgid "_Show slider bar in IM window"
+msgstr ""
+
+msgid "Remove IM window transparency on focus"
+msgstr ""
+
+msgid "Always on top"
+msgstr ""
+
+#. Buddy List trans options
+msgid "Buddy List Window"
+msgstr ""
+
+msgid "_Buddy List window transparency"
+msgstr ""
+
+msgid "Remove Buddy List window transparency on focus"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Transparency"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr ""
+
+#. *  description
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+
+msgid "GTK+ Runtime Version"
+msgstr ""
+
+#. Autostart
+msgid "Startup"
+msgstr ""
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr ""
+
+msgid "_Dockable Buddy List"
+msgstr ""
+
+#. Blist On Top
+msgid "_Keep Buddy List window on top:"
+msgstr ""
+
+#. XXX: Did this ever work?
+msgid "Only when docked"
+msgstr ""
+
+msgid "Windows Pidgin Options"
+msgstr ""
+
+msgid "Options specific to Pidgin for Windows."
+msgstr ""
+
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr ""
+
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "XMPP Console"
+msgstr ""
+
+msgid "Account: "
+msgstr ""
+
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr ""
+
+msgid "Insert an <iq/> stanza."
+msgstr ""
+
+msgid "Insert a <presence/> stanza."
+msgstr ""
+
+msgid "Insert a <message/> stanza."
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr ""
diff --git a/po/id.po b/po/id.po
index 71201e49b9..bb3f65f048 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-10-28 02:39+0800\n"
 "Last-Translator: Rai S. Regawa <raireg@yahoo.com>\n"
 "Language-Team: Rai S. Regawa <raireg@yahoo.com>\n"
@@ -28,13 +28,13 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Coba `%s -h' untuk informasi lebih lanjut.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -628,21 +628,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Kirim Kepada"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "Masukkan dalam pesan"
-
-msgid "Invite"
-msgstr "Undang"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Mohon masukkan nama dari pengguna yang ingin anda undang, berikut dengan "
-"pesan undangan pilihan."
-
 msgid "Conversation"
 msgstr "Percakapan"
 
@@ -899,6 +884,41 @@ msgstr "Percakapan-percakapan"
 msgid "System Log"
 msgstr "Log Sistem"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Menghitung..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Terima"
+
+msgid "Reject"
+msgstr "Tolak"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Anda telah meninggalkan saluran%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "Email-email"
 
@@ -933,6 +953,9 @@ msgstr "Lanjutkan"
 msgid "IM"
 msgstr "PI"
 
+msgid "Invite"
+msgstr "Undang"
+
 msgid "(none)"
 msgstr "(tidak ada)"
 
@@ -1140,7 +1163,6 @@ msgstr "%s telah menjauh. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s telah mengirim sebuah pesan. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Peristiwa tos tak dikenal. Mohon laporkan ini!"
 
@@ -1186,7 +1208,6 @@ msgstr "Menit-menit ketika merubah status"
 msgid "Change status to"
 msgstr "Rubah status pada"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Percakapan-percakapan"
 
@@ -1512,7 +1533,6 @@ msgstr ""
 "Ketika percakapan baru dibuka plugin ini akan memasukkanpercakapan terakhir "
 "ke dalam percakapan baru."
 
-#, c-format
 msgid "Online"
 msgstr "Online"
 
@@ -1561,6 +1581,28 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Plugin Logterakhir."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL Nada"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "akun-akun"
 
@@ -1661,13 +1703,6 @@ msgstr "Terima sertifikat untuk %s?"
 msgid "SSL Certificate Verification"
 msgstr "Verfikasi Sertifikat SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Terima"
-
-msgid "Reject"
-msgstr "Tolak"
-
 msgid "_View Certificate..."
 msgstr "_Lihat Sertifikat..."
 
@@ -1771,6 +1806,8 @@ msgstr "+++ %s tergabung"
 msgid "+++ %s signed off"
 msgstr "+++ %s keluar"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Kesalahan Tidak Dikenal"
 
@@ -1817,6 +1854,18 @@ msgstr "%s meninggalkan kamar."
 msgid "%s left the room (%s)."
 msgstr "%s meninggalkan kamar (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Undang ke Konferensi"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Mohon masukkan nama dari pengguna yang ingin anda undang, berikut dengan "
+"pesan undangan pilihan."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Gagal mendapatkan sambungan: %s"
@@ -1951,7 +2000,6 @@ msgstr "Memulai transfer %s dari %s"
 msgid "Transfer of file %s complete"
 msgstr "Transfer file %s selesai"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Transfer file selesai"
 
@@ -1959,7 +2007,6 @@ msgstr "Transfer file selesai"
 msgid "You canceled the transfer of %s"
 msgstr "Anda membatalkan transfer %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Transfer file dibatalkan"
 
@@ -2165,11 +2212,14 @@ msgstr "<font color=\"red\"><b>Tidak dapat membaca file: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Kesalahan membuat sambungan"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Anda menggunakan %s, tetapi plugin ini memerlukan %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Plugin ini tidak mendefinisikan ID."
 
@@ -2566,9 +2616,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Menyertakan log klien PI lainnya dalam penglihat log."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2624,8 +2675,9 @@ msgstr "Pesan Emulasi Offline"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Simpan pesan-pesan yang dikrim ke pengguan offline sebagai tos."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Pesan-pesan selebihnya akan disimpan sebagai tos. Anda dapat merubah/"
@@ -2657,6 +2709,32 @@ msgstr "Simpan pesan offline dalam tos"
 msgid "Do not ask. Always save in pounce."
 msgstr "Jangan tanya. Selalu simpan dalam tos."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Masukkan kata sandi"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2850,18 +2928,18 @@ msgstr ""
 "plugin TCL, instal ActiveTCL dari http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Tidak dapat mendengarkan sambungan masuk PI\n"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Tidak dapat menjalin sambungan dengan sever mDNS lokal - apakah aktif?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Nama Depan"
 
@@ -2893,6 +2971,11 @@ msgstr "Protokol Plugin Bonjour"
 msgid "Purple Person"
 msgstr "Orang Ungu"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Lokalitas"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2903,14 +2986,21 @@ msgstr "%s telah menutup percakapan."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Tidak dapat mengirim pesan: percakapan tidak dapat dimulai."
 
-msgid "Cannot open socket"
-msgstr "Tidak dapat membuka soket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Tidak dapat membuat soket:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Tidak dapat mengikat soket ke port"
 
-msgid "Could not listen on socket"
-msgstr "Tidak dapat mendengar pada soket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Tidak dapat membuat soket:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -2960,13 +3050,16 @@ msgstr "Simpan daftar teman..."
 msgid "Load buddylist from file..."
 msgstr "Muat daftar teman dari file..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Isi bagian-dalam dalam pendaftaran."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Kata sandi tidak sama."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Tidak dapat mendaftarkan akun baru. Kesalahan terjadi.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2978,14 +3071,15 @@ msgstr "Pendaftaran selesai dengan sukses!"
 msgid "Password"
 msgstr "Kata sandi"
 
-msgid "Password (retype)"
-msgstr "Kata sandi (ketik ulang)"
+msgid "Password (again)"
+msgstr "Kata Sandi (lagi)"
 
-msgid "Enter current token"
-msgstr "Masukkan token sekarang"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Token sekarang"
+#, fuzzy
+msgid "Captcha"
+msgstr "Simpan Gambar"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Daftarkan Akun Gadu-Gadu Baru"
@@ -3038,6 +3132,15 @@ msgstr "Kata sandi diganti dengan sukses!"
 msgid "Current password"
 msgstr "Kata sandi sekarang"
 
+msgid "Password (retype)"
+msgstr "Kata sandi (ketik ulang)"
+
+msgid "Enter current token"
+msgstr "Masukkan token sekarang"
+
+msgid "Current token"
+msgstr "Token sekarang"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Mohon masukkan kata sandi anda sekarang dan kata sandi baru untuk UIN: "
@@ -3052,13 +3155,13 @@ msgstr "Pilih percakapan untuk teman: %s"
 msgid "Add to chat..."
 msgstr "Tambahkan ke percakapan..."
 
+#. Global
 msgid "Available"
 msgstr "Tersedia"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Menjauh"
 
@@ -3086,8 +3189,8 @@ msgstr "Pengguna yang sesuai tidak ditemukan"
 msgid "There are no users matching your search criteria."
 msgstr "Tidak terdapat pengguna yang sesuai dengan kriteria pencarian anda."
 
-msgid "Unable to read socket"
-msgstr "Tidak dapat membaca soket"
+msgid "Unable to read from socket"
+msgstr "Tidak dapat membaca dari soket"
 
 msgid "Buddy list downloaded"
 msgstr "Daftar teman terdownload"
@@ -3101,8 +3204,14 @@ msgstr "Daftar teman diupload"
 msgid "Your buddy list was stored on the server."
 msgstr "Daftar teman anda telah disimpan pada server."
 
-msgid "Connection failed."
-msgstr "Sambungan gagal."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Tersambung"
+
+msgid "Connection failed"
+msgstr "Sambungan gagal"
 
 msgid "Add to chat"
 msgstr "Tambahkan ke percakapan"
@@ -3110,13 +3219,23 @@ msgstr "Tambahkan ke percakapan"
 msgid "Chat _name:"
 msgstr "_Nama percakapan:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Tidak dapat menyambung ke server."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Menyambungkan"
+
 msgid "Chat error"
 msgstr "Kesalahan percakapan"
 
 msgid "This chat name is already in use"
 msgstr "Nama percakapan ini telah digunakan"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Tidak tersambung ke server."
 
 msgid "Find buddies..."
@@ -3158,6 +3277,10 @@ msgstr "Sistem PI orang Polandia populer"
 msgid "Gadu-Gadu User"
 msgstr "Pengguna Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Atur Info Pengguna..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Perintah tidak dikenal: %s"
@@ -3172,7 +3295,8 @@ msgstr "Tidak ada topik terpasang"
 msgid "File Transfer Failed"
 msgstr "Transfer File Gagal"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Tidak dapat membuka port pendengar."
 
 msgid "Error displaying MOTD"
@@ -3188,8 +3312,18 @@ msgstr "Tidak terdapat MOTD yang berasosiasi dengan sambungan ini."
 msgid "MOTD for %s"
 msgstr "MOTD untuk %s"
 
-msgid "Server has disconnected"
-msgstr "Server telah memutuskan sambungan"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Kehilangan sambungan dengan server:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Lihat MOTD"
@@ -3200,25 +3334,24 @@ msgstr "_Saluran:"
 msgid "_Password:"
 msgstr "_Kata sandi:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Nama panggilan IRC tidak dapat mengandung sepasi"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Menyambungkan"
-
 msgid "SSL support unavailable"
 msgstr "Dukungan SSL tidak tersedia"
 
-msgid "Couldn't create socket"
-msgstr "Tidak dapat menciptakan soket"
+msgid "Unable to connect"
+msgstr "Tidak dapat tersambung"
 
-msgid "Couldn't connect to host"
-msgstr "Tidak dapat tersambung ke host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Tidak dapat menyambung ke %s"
 
-msgid "Read error"
-msgstr "Kesalahan baca"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server menutup sambungan."
 
 msgid "Users"
 msgstr "Pengguna"
@@ -3400,6 +3533,17 @@ msgstr ""
 "Pilihan anda anda ditolak server.  Kemungkinan mengandung karakter tidak "
 "valid."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Nama percakapan ini telah digunakan"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Nama Panggilan"
+
 msgid "Cannot change nick"
 msgstr "Tidak bisa mengganti nama panggilan"
 
@@ -3643,12 +3787,13 @@ msgstr "Perintah Ad-Hoc Gagal"
 msgid "execute"
 msgstr "laksanakan"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Server memerlukan TLS/SSL untuk login.  Dukungan TLS/SSL tidak ditemukan."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Server memerlukan TLS/SSL untuk login.  Dukungan TLS/SSL tidak ditemukan."
 
@@ -3668,18 +3813,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Otentifikasi Teks biasa"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Otentikasi gagal"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Respon tidak valid dari server"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server tidak menggunakan metode otentifikasi yang didukung"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Anda memerlukan enkripsi, tetapi tidak tersedia pada server ini."
+
 msgid "Invalid challenge from server"
 msgstr "Tantangan tidak valid dari server"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "kesalahan SASL"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Tidak diberikan alasan."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Versi Tidak Didukung"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Tidak dapat membuat sambungan dengan server:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Tidak dapat membuat sambungan dengan server:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Tidak dapat menginisialisasi sambungan"
+
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
@@ -3746,158 +3927,9 @@ msgstr "Klien"
 msgid "Operating System"
 msgstr "Sistem Operasi"
 
-msgid "Last Activity"
-msgstr "Aktifitas Terakhir"
-
-msgid "Service Discovery Info"
-msgstr "Layani Info Temuan"
-
-msgid "Service Discovery Items"
-msgstr "Layani Item Temuan"
-
-msgid "Extended Stanza Addressing"
-msgstr "Alamat Stanza Lengkap"
-
-msgid "Multi-User Chat"
-msgstr "Percakapan Banyak-Pengguna"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Informasi Lengkap Kehadiran Percakpan Banyak-Pengguna"
-
-msgid "In-Band Bytestreams"
-msgstr "Arus byte Dalam-Pita"
-
-msgid "Ad-Hoc Commands"
-msgstr "Perintah Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Layanan PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Arus byte SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Kehabisan Pita Data"
-
-msgid "XHTML-IM"
-msgstr "PI-XHTML"
-
-msgid "In-Band Registration"
-msgstr "Pendaftaran Dalam-Pita"
-
-msgid "User Location"
-msgstr "Lokasi Pengguna"
-
-msgid "User Avatar"
-msgstr "Avatar Pengguna"
-
-msgid "Chat State Notifications"
-msgstr "Pemberitahuan Keadaan Percakapan"
-
-msgid "Software Version"
-msgstr "Versi Piranti Lunak"
-
-msgid "Stream Initiation"
-msgstr "Inisasi Arus"
-
-msgid "File Transfer"
-msgstr "Transfer File"
-
-msgid "User Mood"
-msgstr "Mood Pengguna"
-
-msgid "User Activity"
-msgstr "Aktifitas Pengguna"
-
-msgid "Entity Capabilities"
-msgstr "Kemampuan Entitas"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Sesi Negosiasi Terenkripsi"
-
-msgid "User Tune"
-msgstr "Musik Pengguna"
-
-msgid "Roster Item Exchange"
-msgstr "Daftar Item Pertukaran"
-
-msgid "Reachability Address"
-msgstr "Alamat Tetap"
-
-msgid "User Profile"
-msgstr "Profil Pengguna"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Audio Jingle"
-
-msgid "User Nickname"
-msgstr "Nama Panggilan Pengguna"
-
-msgid "Jingle ICE UDP"
-msgstr "ICE UDP Jingle"
-
-msgid "Jingle ICE TCP"
-msgstr "ICE TCP Jingle"
-
-msgid "Jingle Raw UDP"
-msgstr "Raw UDP Jingle"
-
-msgid "Jingle Video"
-msgstr "Video Jingle"
-
-msgid "Jingle DTMF"
-msgstr "DTMF Jingle"
-
-msgid "Message Receipts"
-msgstr "Tanda Terima Pesan"
-
-msgid "Public Key Publishing"
-msgstr "Penerbitan Kunci Publik"
-
-msgid "User Chatting"
-msgstr "Percakapan Pengguna"
-
-msgid "User Browsing"
-msgstr "Browsing Pengguna"
-
-msgid "User Gaming"
-msgstr "Permainan Pengguna"
-
-msgid "User Viewing"
-msgstr "Pandangan Pengguna"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Enkripsi Stanza"
-
-msgid "Entity Time"
-msgstr "Waktu Entitas"
-
-msgid "Delayed Delivery"
-msgstr "Pengiriman Tertunda"
-
-msgid "Collaborative Data Objects"
-msgstr "Obyek Data Kolaboratif"
-
-msgid "File Repository and Sharing"
-msgstr "Repoistory dan Sharing File"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Temuan Layanan STUN untuk Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negosiasi Sesi Enkripsi yang Disederhanakan"
-
-msgid "Hop Check"
-msgstr "Pemeriksaan Hop"
-
-msgid "Capabilities"
-msgstr "Kemampuan"
+#, fuzzy
+msgid "Local Time"
+msgstr "File Lokal:"
 
 msgid "Priority"
 msgstr "Prioritas"
@@ -3905,6 +3937,14 @@ msgstr "Prioritas"
 msgid "Resource"
 msgstr "Sumber Daya"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Terlogin"
+
 msgid "Middle Name"
 msgstr "Nama Tengah"
 
@@ -3951,7 +3991,6 @@ msgstr "Sedang Ingin Ngobrol"
 msgid "Extended Away"
 msgstr "Menjauh untuk Lama"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Jangan Diganggu"
 
@@ -4074,29 +4113,26 @@ msgstr "Pilih server konferensi untuk dicari"
 msgid "Find Rooms"
 msgstr "Cari Kamar"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Anda memerlukan enkripsi, tetapi tidak tersedia pada server ini."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Nama Alias:"
 
-msgid "Write error"
-msgstr "Kesalahan penulisan"
+#, fuzzy
+msgid "No users found"
+msgstr "Pengguna yang sesuai tidak ditemukan"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Teks biasa"
+msgid "Roles:"
+msgstr "Peranan"
 
-msgid "Read Error"
-msgstr "Kesalahan Baca"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Teks biasa"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Tidak dapat membuat sambungan dengan server:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Tidak dapat menciptakan soket"
 
 msgid "Invalid XMPP ID"
 msgstr "ID XMPP Tidak Valid"
@@ -4104,6 +4140,10 @@ msgstr "ID XMPP Tidak Valid"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP Tidak Valid. Domain harus diset."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Gagal tersambung ke server."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Pendaftaran dari %s@%s sukses"
@@ -4128,9 +4168,6 @@ msgstr "Daftar Keluar Sukses"
 msgid "Unregistration Failed"
 msgstr "Daftar Keluar Gagal"
 
-msgid "Already Registered"
-msgstr "Sudah Terdaftar"
-
 msgid "State"
 msgstr "Negara"
 
@@ -4143,6 +4180,9 @@ msgstr "Telepon"
 msgid "Date"
 msgstr "Tanggal"
 
+msgid "Already Registered"
+msgstr "Sudah Terdaftar"
+
 msgid "Unregister"
 msgstr "Daftar Keluar"
 
@@ -4172,6 +4212,10 @@ msgstr "Daftarkan Akun Baru pada %s"
 msgid "Change Registration"
 msgstr "Rubah Registrasi"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Gagal tersambung ke server."
+
 msgid "Error unregistering account"
 msgstr "Kesalahan dalam membatalkan registrasi akun"
 
@@ -4190,9 +4234,18 @@ msgstr "Mengotentikasi"
 msgid "Re-initializing Stream"
 msgstr "Menginisialisasi Ulang Aliran"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Tidak Diijinkan"
 
+msgid "Mood"
+msgstr "Mood"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Keduanya"
 
@@ -4214,12 +4267,6 @@ msgstr "Tidak Ada"
 msgid "Subscription"
 msgstr "Langganan"
 
-msgid "Mood"
-msgstr "Mood"
-
-msgid "Now Listening"
-msgstr ""
-
 msgid "Mood Text"
 msgstr "Teks Mood"
 
@@ -4262,9 +4309,6 @@ msgstr "Kata sandi anda telah diganti."
 msgid "Error changing password"
 msgstr "Kesalahan penggantian kata sandi"
 
-msgid "Password (again)"
-msgstr "Kata Sandi (lagi)"
-
 msgid "Change XMPP Password"
 msgstr "Rubah Kata Sandi XMPP"
 
@@ -4457,18 +4501,24 @@ msgstr "Tidak dapat menendang pengguna %s"
 msgid "Unable to ping user %s"
 msgstr "Tidak dapat mem-ping pengguna %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Tidak dapat mem-buzz, tidak ada yang diketahui tentang pengguna %s."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Tidak dapat mem-buzz, karena pengguna %s sedang tidak ada."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Tidak dapat mem-buss, karena pengguna %s tidak mendukungnya."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Mem-buzz %s..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4478,9 +4528,35 @@ msgstr "Buzz"
 msgid "%s has buzzed you!"
 msgstr "%s telah mem-buzz anda!"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Mem-buzz %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Tidak dapat mengirim file kepada %s, JID tidak valid"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+"Tidak dapat mengirim file ke %s, pengguna tidak mendukung transfer file"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Tidak dapat mengirim file ke %s, tidak terdafatar pada daftar hadir"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Pendaftaran Gagal"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Tolong pilih ke sumber mana dari %s anda ingin mengirim file"
+
+msgid "Select a Resource"
+msgstr "Pilih sebuah sumber"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Memulai _Percakapan"
 
 msgid "config:  Configure a chat room."
 msgstr "konfig:  Konfigurasi kamar percakapan."
@@ -4501,16 +4577,18 @@ msgstr "topik [topik baru]:  Lihat atau ganti topik."
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [kamar]:  Ban pengguna dari kamar."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "afiliasi &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Atur afiliasi "
 "pengguna dengan kamar."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "peranan &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Atur "
 "peranan pengguna dalam kamar."
@@ -4576,6 +4654,9 @@ msgstr "Sambungkan server"
 msgid "File transfer proxies"
 msgstr "Port Transfer File"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4615,6 +4696,14 @@ msgstr "Kesalahan Parse XML"
 msgid "Unknown Error in presence"
 msgstr "Kesalahan tidak dikenal hadir"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Kesalahan bergabung percakapan %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Kesalahan dalam percakapan %s"
+
 msgid "Create New Room"
 msgstr "Buat Kamar Baru"
 
@@ -4631,13 +4720,32 @@ msgstr "_Konfigurasi Kamar"
 msgid "_Accept Defaults"
 msgstr "_Terima Standar"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Kesalahan bergabung percakapan %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Tidak diberikan alasan."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Kesalahan dalam percakapan %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Anda telah ditendang oleh %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Ditendang oleh %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Kesalahan terjadi ketika membuka file."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Transfer File Gagal"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Gagal membuka file \"%s\": %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4664,9 +4772,6 @@ msgstr "Tidak dapat mengirim file ke %s, tidak terdafatar pada daftar hadir"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Tolong pilih ke sumber mana dari %s anda ingin mengirim file"
 
-msgid "Select a Resource"
-msgstr "Pilih sebuah sumber"
-
 msgid "Edit User Mood"
 msgstr "Rubah Mood Pengguna"
 
@@ -4701,8 +4806,19 @@ msgstr "Aksi-aksi"
 msgid "Select an action"
 msgstr "Pilih sebuah aksi"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Tidak dapat memanggil Buku Alamat MSN"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Tidak dapat menambahkan \"%s\"."
+
+msgid "Buddy Add error"
+msgstr ""
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Nama layar yang ditentukan tidak valid."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4932,7 +5048,7 @@ msgstr "Paspor Anak tanpa ijin orang tua"
 msgid "Passport account not yet verified"
 msgstr "Akun paspor belum diverifikasi"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Akun paspor belum diverifikasi"
 
@@ -4956,6 +5072,10 @@ msgstr "Kontak Pilihan"
 msgid "Non-IM Contacts"
 msgstr "Hilangkan Kontak"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s telah mengirimkan anda undangan webcam yang belum didukung."
+
 msgid "Nudge"
 msgstr "Senggol"
 
@@ -5029,6 +5149,13 @@ msgstr "Simpan pesan mobile."
 msgid "Page"
 msgstr "Halaman"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Pekerjaan"
+
 msgid "Has you"
 msgstr "Memiliki anda"
 
@@ -5070,6 +5197,14 @@ msgstr "Artis-artis"
 msgid "Album"
 msgstr "Album Nada"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "Judul Nada"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Judul Nada"
+
 msgid "Set Friendly Name..."
 msgstr "Atur Nama Bersahabat..."
 
@@ -5104,9 +5239,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Dukungan SSL diperlukan untuk MSN. Mohon instal pustaka SSL yang didukung. "
 
-msgid "Failed to connect to server."
-msgstr "Gagal tersambung ke server."
-
 msgid "Error retrieving profile"
 msgstr "Kesalahan pemanggilan profil"
 
@@ -5261,8 +5393,9 @@ msgstr ""
 "Tidak dapat menemukan informasi dalam profil pengguna. Pengguna kemungkinan "
 "besar tidak ada."
 
-msgid "Profile URL"
-msgstr "URL Profil"
+#, fuzzy
+msgid "View web profile"
+msgstr "Sembunyikan saat tidak tersambung"
 
 #. *< type
 #. *< ui_requirement
@@ -5296,65 +5429,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Otentikasi Windows Live ID:Tidak dapat tersambung"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s bukan kelompok yang valid."
-
-msgid "Unknown error."
-msgstr "Kesalahan tidak dikenal."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s pada %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s barusan mengirim anda Sikutan!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Kesalahan Tidak Dikenal (%d)"
 
 msgid "Unable to add user"
 msgstr "Tidak dapat menambahkan pengguna"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Kesalahan Tidak Dikenal (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Berikut ini adalah hasil pencarian anda"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Tidak dapat menambahkan pengguna pada %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Tidak dapat memblokir pengguna pada %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Tidak dapat mengijinkan pengguna pada %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s tidak dapat ditambahkan karena daftar teman anda penuh."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s adalah kata sandi akun yang tidak valid."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Layanan Sementara Tidak Tersedia."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Pesan tidak dapat dikirim, karena anda tidak tersambung."
 
-msgid "Unable to rename group"
-msgstr "Tidak dapan mengubah nama kelompok"
-
-msgid "Unable to delete group"
-msgstr "TIdak dapat menghapus kelompok"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5400,9 +5496,6 @@ msgstr "Pesan mungkin tidak terkirim karena kesalahan tidak dikenal terjadi:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Pesan mungkin tidak terkirim karena kesalahan tidak dikenal terjadi:"
 
-msgid "Unable to connect"
-msgstr "Tidak dapat tersambung"
-
 msgid "Writing error"
 msgstr "Kesalahan penulisan"
 
@@ -5417,20 +5510,24 @@ msgstr ""
 "Kesalahan sambungan dari server %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Protokol kami tidak didukung oleh server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Kesalahan parsing HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Anda telah bergabung dari lokasi yang berbeda."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Server-server MSN sementara tidak tersedia. Mohon tunggu dan coba lagi."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Server-server MSN akan sementara mati."
 
 #, c-format
@@ -5460,6 +5557,14 @@ msgstr "Mengirim cookie"
 msgid "Retrieving buddy list"
 msgstr "Mengambil daftar teman"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s telah mengirimkan anda undangan webcam yang belum didukung."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s telah mengirimkan anda undangan webcam yang belum didukung."
+
 msgid "Away From Computer"
 msgstr "Menjauh Dari Komputer"
 
@@ -5498,14 +5603,6 @@ msgstr "Pesan tidak dapat dikirim karena kesalahan dengan switchboard terjadi:"
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Pesan mungkin tidak terkirim karena kesalahan tidak dikenal terjadi:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s telah menambahkan anda pada daftar temannya."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s menghilangkan anda dari daftar temannya."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Tambahkan ke Buku Alamat"
@@ -5514,13 +5611,6 @@ msgstr "Tambahkan ke Buku Alamat"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Apakah anda ingin menambahkan teman ini ke daftar teman anda?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Tidak dapat menambahkan \"%s\"."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "Nama layar yang ditentukan tidak valid."
@@ -5528,6 +5618,9 @@ msgstr "Nama layar yang ditentukan tidak valid."
 msgid "This Hotmail account may not be active."
 msgstr "Akun Hotmail ini mungkin tidak aktif."
 
+msgid "Profile URL"
+msgstr "URL Profil"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5542,18 +5635,60 @@ msgstr "Akun Hotmail ini mungkin tidak aktif."
 msgid "MSN Protocol Plugin"
 msgstr "Plugin Protokol AIM"
 
-msgid "Missing Cipher"
-msgstr "Cipher Kurang"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s bukan kelompok yang valid."
 
-msgid "The RC4 cipher could not be found"
-msgstr "Cipher RC$ tidak dapat ditemukan"
+msgid "Unknown error."
+msgstr "Kesalahan tidak dikenal."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"Perbaharui ke libpurple dengan dukungan RC4 (>= 2.0.1). Plugin MySpaceIM "
-"tidak akan dimuat."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s pada %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Tidak dapat menambahkan pengguna pada %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Tidak dapat memblokir pengguna pada %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Tidak dapat mengijinkan pengguna pada %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s tidak dapat ditambahkan karena daftar teman anda penuh."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s adalah kata sandi akun yang tidak valid."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Layanan Sementara Tidak Tersedia."
+
+msgid "Unable to rename group"
+msgstr "Tidak dapan mengubah nama kelompok"
+
+msgid "Unable to delete group"
+msgstr "TIdak dapat menghapus kelompok"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s telah menambahkan anda pada daftar temannya."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s menghilangkan anda dari daftar temannya."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "Tidak ada pengguna: %s"
+
+msgid "User lookup"
+msgstr "Pencarian pengguna"
 
 msgid "Reading challenge"
 msgstr "Tantangan Pembacaan"
@@ -5564,13 +5699,25 @@ msgstr "Tantangan panjang tak terduga dari dari server"
 msgid "Logging in"
 msgstr "Logging masuk"
 
-#, fuzzy, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] "Sambungan ke server putus (tidak ada data diterima dalam %d detik)"
-msgstr[1] "Sambungan ke server putus (tidak ada data diterima dalam %d detik)"
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "Nama pengguan tidak diatur"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"Kehilangan sambungan dengan sever\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Pesan surat baru"
 
@@ -5589,21 +5736,25 @@ msgstr "Komentar gambar baru"
 msgid "MySpace"
 msgstr "MySpace"
 
-#, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "Nama pengguan tidak diatur"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "Teman-teman PI"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d teman ditambahakan atau diperbaharui dari server (termasuk teman yang "
+"sudah berada pada daftar di sisi server)"
+msgstr[1] ""
+"%d teman ditambahakan atau diperbaharui dari server (termasuk teman yang "
+"sudah berada pada daftar di sisi server)"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Tersambung"
+msgid "Add contacts from server"
+msgstr "Tambahkan kontak dari server"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5611,15 +5762,21 @@ msgstr "Kesalahan protokol, kode %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Nama layar atau kata sandi salah."
+
 msgid "MySpaceIM Error"
 msgstr "Kesalahan MySpaceIM"
 
+msgid "Invalid input condition"
+msgstr "Kondisi input tidak valid"
+
 msgid "Failed to add buddy"
 msgstr "Gagal menambahkan teman"
 
@@ -5629,13 +5786,6 @@ msgstr "Perintah addbuddy' gagal."
 msgid "persist command failed"
 msgstr "perintah bertahan gagal"
 
-#, c-format
-msgid "No such user: %s"
-msgstr "Tidak ada pengguna: %s"
-
-msgid "User lookup"
-msgstr "Pencarian pengguna"
-
 msgid "Failed to remove buddy"
 msgstr "Gagal menghapus teman"
 
@@ -5645,39 +5795,18 @@ msgstr "perintah delbuddy' gagal"
 msgid "blocklist command failed"
 msgstr "perintah blocklist gagal"
 
-msgid "Invalid input condition"
-msgstr "Kondisi input tidak valid"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Buffer baca penuh"
-
-msgid "Unparseable message"
-msgstr "Pesan yang tidak dapat dipecah"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Tidak dapat tersambung ke host: %s (%d)"
+msgid "Missing Cipher"
+msgstr "Cipher Kurang"
 
-msgid "IM Friends"
-msgstr "Teman-teman PI"
+msgid "The RC4 cipher could not be found"
+msgstr "Cipher RC$ tidak dapat ditemukan"
 
-#, fuzzy, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-"%d teman ditambahakan atau diperbaharui dari server (termasuk teman yang "
-"sudah berada pada daftar di sisi server)"
-msgstr[1] ""
-"%d teman ditambahakan atau diperbaharui dari server (termasuk teman yang "
-"sudah berada pada daftar di sisi server)"
-
-msgid "Add contacts from server"
-msgstr "Tambahkan kontak dari server"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Perbaharui ke libpurple dengan dukungan RC4 (>= 2.0.1). Plugin MySpaceIM "
+"tidak akan dimuat."
 
 msgid "Add friends from MySpace.com"
 msgstr "Tambahkan teman dari MySpace.com"
@@ -5719,9 +5848,6 @@ msgstr "Ukuran huruf dasar (point)r"
 msgid "User"
 msgstr "Pengguna"
 
-msgid "Profile"
-msgstr "Profil"
-
 msgid "Headline"
 msgstr "Judul"
 
@@ -5734,15 +5860,14 @@ msgstr "Total Teman"
 msgid "Client Version"
 msgstr "Versi Klien"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "Nama pengguan tidak diatur"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
+"Mohon kunjungi http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"nama pengguna dan pilih nama pengguna dan coba login kembali."
 
 #, fuzzy
 msgid "MySpaceIM - Username Available"
@@ -5755,6 +5880,9 @@ msgstr "%s mengirim pesan ke papan tulis. Apakah anda ingin buka papan tulis?"
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "Tema ini tidak memiliki kumpulan senyuman."
@@ -5763,6 +5891,13 @@ msgstr "Tema ini tidak memiliki kumpulan senyuman."
 msgid "Please try another username:"
 msgstr "Mohon masukkan nama baru untuk %s"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Nama pengguan tidak diatur"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5955,10 +6090,6 @@ msgid "Master archive is misconfigured"
 msgstr "Arsip utama salah konfigurasi"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Nama layar atau kata sandi salah."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Tidak dapat mengenali host dari nama layar yang anda masukkan"
 
@@ -6002,9 +6133,9 @@ msgstr "Pengguna sedang offline atau anda diblokir"
 msgid "Unknown error: 0x%X"
 msgstr "Kesalahan tidak dikenal: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login gagal (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Tidak dapat mem-ping pengguna %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6109,9 +6240,6 @@ msgstr "Konferensi GroupWise %d"
 msgid "Authenticating..."
 msgstr "Mengotentikasi..."
 
-msgid "Unable to connect to server."
-msgstr "Tidak dapat menyambung ke server."
-
 msgid "Waiting for response..."
 msgstr "Menunggu tanggapan..."
 
@@ -6135,26 +6263,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Apakah anda ingin bergabung ke percakapan?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Anda telah terlogout karena anda login pada komputer yang lain."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s tampaknya offline dan tidak menerima pesan yang baru saja anda kirim."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Tidak dapat menyambung ke server. Mohon masukkan alamat server ke mana anda "
 "ingin menyambung."
 
-msgid "Error. SSL support is not installed."
-msgstr "Kesalahan: dukungan SSL tidak terinstal."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Konferensi ini ditutup. Tidak ada pesan yang dapat dikirim."
 
@@ -6178,6 +6300,26 @@ msgid "Server port"
 msgstr "Port Server"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Menerima respon HTTP tidak terduga dari server."
+
+#. username connecting too frequently
+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 ""
+"Anda telah menyambung dan memutuskan terlalu sering. Tunggu sepuluh menit "
+"dan coba lagi. Apabila anda meneruskan mencoba, anda akan harus menuggu "
+"lebih lama"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Kesalahan dalam memohon token login"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Tidak dapat menyambung"
 
@@ -6185,18 +6327,8 @@ msgstr "Tidak dapat menyambung"
 msgid "Invalid chat room name"
 msgstr "Nama Kamar Tidak Valid"
 
-msgid "Server closed the connection."
-msgstr "Server menutup sambungan."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Kehilangan sambungan dengan server:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Menerima data tidak valid pada sambungan dengan server."
 
 #. *< type
@@ -6244,7 +6376,8 @@ msgstr "Kehilangan sambungan dengan pengguna terpisah:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Menerima data tidak valid pada sambungan dengan pengguna terpisah."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Tidak dapat melakukan sambungan dengan pengguna terpisah."
 
 msgid "Direct IM established"
@@ -6419,23 +6552,18 @@ msgstr "Kamera"
 msgid "Screen Sharing"
 msgstr "Nama Layar"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Bebas Untuk Percakapan"
 
-#, c-format
 msgid "Not Available"
 msgstr "Tidak Bersedia"
 
-#, c-format
 msgid "Occupied"
 msgstr "Sibuk"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#, c-format
 msgid "Invisible"
 msgstr "Tak Terlihat"
 
@@ -6448,21 +6576,15 @@ msgstr "Tingkat Peringatan"
 msgid "Buddy Comment"
 msgstr "Komentar Teman"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Tidak dapat tersambung ke server otentikasi:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Tidak dapat tersambung ke server BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Tidak dapat menyambung ke server OIM"
 
 #, fuzzy
 msgid "Username sent"
@@ -6477,54 +6599,61 @@ msgstr "Memfinalkan sambungan"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Tidak dapat login: Tidak dapat gabung sebagai %s karena nama layar tidak "
 "valid.  Nama layar harus merupakan email yang valid, atau dimulai dengan "
 "huruf dan mengandung hanya huruf, angka dan sepasi, atau mengandung hanya "
 "nomor."
 
-#. Unregistered screen name
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Anda dapat terputus sebentar lagi.  Periksa %s untuk pembaharuan."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Tidak berhasil mendapatkan hash login AIM yang valid."
+
+msgid "Unable to get a valid login hash."
+msgstr "Tidak berhasil mendapatkan hash login yang valid."
+
+msgid "Received authorization"
+msgstr "Menerima Otorisasi"
+
+#. Unregistered username
 #. uid is not exist
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Nama tidak valid"
-
-msgid "Incorrect password."
-msgstr "Kata sandi salah."
+msgid "Username does not exist"
+msgstr "Pengguna tidak pernah ada"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Akun anda sementara ditahan."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Layanan AOL Instant Messenger sementara tidak tersedia."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr ""
+"Versi klien yang anda gunakan adalah terlalu lama. Mohon perbaharui di %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Anda telah menyambung dan memutuskan terlalu sering. Tunggu sepuluh menit "
 "dan coba lagi. Apabila anda meneruskan mencoba, anda akan harus menuggu "
 "lebih lama"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"Versi klien yang anda gunakan adalah terlalu lama. Mohon perbaharui di %s"
-
-msgid "Could Not Connect"
-msgstr "Tidak Dapat Menyambung"
-
-msgid "Received authorization"
-msgstr "Menerima Otorisasi"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Kunci SecurID yang dimasukkan tidak valid."
 
 msgid "Enter SecurID"
@@ -6539,24 +6668,6 @@ msgstr "Masukkan nomor 6 digit dari tampilan digital."
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Anda dapat terputus sebentar lagi.  Anda dapat menggunakan TOC sampai ini "
-"diperbaiki.  Periksa %s untuk pembaharuan."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Tidak berhasil mendapatkan hash login AIM yang valid."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Anda dapat terputus sebentar lagi.  Periksa %s untuk pembaharuan."
-
-msgid "Unable to get a valid login hash."
-msgstr "Tidak berhasil mendapatkan hash login yang valid."
-
 msgid "Password sent"
 msgstr "Kata sandi terkirim"
 
@@ -6692,7 +6803,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Anda melewatkan %hu pesan dari %s karena alasan tidak jelas."
 msgstr[1] "Anda melewatkan %hu pesan-pesan dari %s karena alasan tidak jelas."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Tidak dapat mengirim pesan: %s"
@@ -6714,6 +6825,12 @@ msgstr "Online Sejak"
 msgid "Member Since"
 msgstr "Anggota Sejak"
 
+msgid "Capabilities"
+msgstr "Kemampuan"
+
+msgid "Profile"
+msgstr "Profil"
+
 msgid "Your AIM connection may be lost."
 msgstr "Sambungan AIM anda mungkin hilang."
 
@@ -6894,7 +7011,7 @@ msgstr "Pesan menjauh terlalu panjang."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6921,9 +7038,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Yatim Piatu"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Tidak dapat menambahkan teman %s karena anda memiliki terlalu banyak teman "
@@ -6932,8 +7049,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(tanpa nama)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Tidak dapat menambahkan teman %s karena alasan yang tidak jelas."
 
 #, fuzzy, c-format
@@ -7006,6 +7123,7 @@ msgstr "S_ambung"
 msgid "Get AIM Info"
 msgstr "Dapatkan Info AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Rubah Komentar Teman"
 
@@ -7066,6 +7184,7 @@ msgstr "_Cari"
 msgid "Set User Info (web)..."
 msgstr "Atur Info Pengguna (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Rubah Kata Sandi (URL)"
@@ -7098,6 +7217,10 @@ msgid "Search for Buddy by Information"
 msgstr "Cari Teman berdasarkan Informasi"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "Pengguna tidak sedang login"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7117,7 +7240,6 @@ msgstr "Meminta %s untuk bersambung ke kita pada %s:%hu untuk PI Langsung."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Berusaha menyambung ke %s:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Berusaha menyambung via server proxy."
 
@@ -7213,7 +7335,7 @@ msgstr "Lain"
 msgid "Visible"
 msgstr "Tak Terlihat"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7304,16 +7426,48 @@ msgstr "Pembaharuan Terakhir"
 msgid "Could not change buddy information."
 msgstr "Mohon masukkan informasi teman."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "Mobile"
+
+msgid "Note"
+msgstr "Catatan"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Ikon Teman"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Tambahkan Teman"
+msgid "_Modify"
+msgstr "Modifikasi"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Modifikasi"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Server says:"
+msgstr "Server sibuk"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Memerlukan Otorisasi"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Tambahkan teman kepada daftar anda?"
+
+#, fuzzy
+msgid "Enter answer here"
 msgstr "Masukkan permohonan di sini"
 
 msgid "Send"
@@ -7327,18 +7481,19 @@ msgid "Authorization denied message:"
 msgstr "Otorisasi menolak pesan:"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "Maaf, anda bukan jenis saya..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Pengguna %d memerlukan otentikasi"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Tambahkan teman kepada daftar anda?"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "Masukkan permohonan di sini"
 
 msgid "Would you be my friend?"
@@ -7361,7 +7516,7 @@ msgid "Failed sending authorize"
 msgstr "Mohon otorisasi saya!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Gagal menghapus teman"
 
 #, fuzzy, c-format
@@ -7406,6 +7561,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr "Anda hanya dapat mencari kelompok QQ permanen\n"
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Pengaturan proxy tidak valid"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Saya bukan anggota"
 
@@ -7448,16 +7607,19 @@ msgstr "Kelompok ini tidak mengijinkan orang lain bergabung"
 msgid "Join QQ Qun"
 msgstr "Gabung Percakapan"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "Masukkan permohonan di sini"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Anda telah sukses memodifikasi anggota Qun"
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "Anda telah sukses memodifikasi anggota Qun"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7467,7 +7629,7 @@ msgstr "Operasi QQ Qun"
 msgid "Failed:"
 msgstr "Gagal"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7482,11 +7644,11 @@ msgstr ""
 "operasi ini pada akhirnya akan menghilangkan Qun ini."
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "Maaf, anda bukan jenis saya..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Anda telah sukses memodifikasi anggota Qun"
 
 #, fuzzy
@@ -7497,35 +7659,35 @@ msgid "You have successfully created a Qun"
 msgstr "Anda telah sukses menciptakan sebuah Qun"
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Apakah anda ingin mengatur detail Qun sekarang?"
 
 msgid "Setup"
 msgstr "Atur"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "Pengguna %d mengajukan untuk bergabung ke kelompok %d"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "Pengguna %d mengajukan untuk bergabung ke kelompok %d"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Gagal menggabungkan teman dlam percakapan"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Hilangkan Teman"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Hilangkan Teman"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7642,6 +7804,13 @@ msgstr "<b>Terakhir Diperkini</b>: %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Sedang Online</b>: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Terakhir Diperkini</b>: %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7649,7 +7818,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Tentang %s"
 
 #, fuzzy
@@ -7670,6 +7839,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Tentang %s"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Alamat Rumah"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7701,7 +7874,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Menyambung menggunakan TCP"
@@ -7714,6 +7886,9 @@ msgstr "Port Server"
 msgid "Show server news"
 msgstr "Alamat Server"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Pertahankan kesalahan"
@@ -7723,11 +7898,7 @@ msgid "Update interval (seconds)"
 msgstr "Pertahankan kesalahan"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Tidak bisa mendapatkan informasi server"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Tidak bisa mendapatkan informasi server"
 
 #, c-format
@@ -7750,21 +7921,20 @@ msgid "Activation required"
 msgstr "Disyaratkan Pendaftaran"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Keep alive error"
-msgstr "Pertahankan kesalahan"
-
 #, fuzzy
-msgid "Requesting captcha ..."
+msgid "Requesting captcha"
 msgstr "Memohon perhatian %s ..."
 
-msgid "Checking code of captcha ..."
-msgstr ""
+#, fuzzy
+msgid "Checking captcha"
+msgstr "Memohon perhatian %s ..."
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Otentikasi Yahoo! Gagal"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7774,73 +7944,51 @@ msgstr "Simpan Gambar"
 msgid "Enter code"
 msgstr "Masukkan kata sandi"
 
-msgid "QQ Captcha Verifing"
-msgstr ""
+#, fuzzy
+msgid "QQ Captcha Verification"
+msgstr "Verfikasi Sertifikat SSL"
 
 #, fuzzy
 msgid "Enter the text from the image"
 msgstr "Masukan nama dari kelompok tersebut"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Tidak dapat menyambung."
-
 msgid "Socket error"
 msgstr "Kesalahan Soket"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"Kehilangan sambungan dengan server:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "Tidak dapat membaca dari soket"
-
-msgid "Write Error"
-msgstr "Kesalahan Penulisan"
-
-msgid "Connection lost"
-msgstr "Sambungan putus"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Atur Info Pengguna..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Permintaan ditolak"
 
-msgid "Couldn't resolve host"
-msgstr "Tidak dapat me-resolve host"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Tidak dapat menyambung ke server."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Kesalahan tidak valid"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Sambungkan server"
+msgid "Connecting to server"
+msgstr "Menyambung ke Server SILC"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Kesalahan QQid"
 
-msgid "Failed to send IM."
-msgstr "Gagal mengirimkan PI."
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7850,6 +7998,10 @@ msgid ""
 msgstr "Relay Server ICQ"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Dari"
 
@@ -7859,32 +8011,30 @@ msgid ""
 "%s"
 msgstr "Instruksi Server: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Alasan tidak jelas"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Perintah"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Tidak bisa mendapatkan informasi server"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Alasan tidak jelas"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Alasan tidak jelas"
 
 #, c-format
@@ -7898,9 +8048,6 @@ msgstr "File Terkirim"
 msgid "%d canceled the transfer of %s"
 msgstr "%d membatalkan trasnfer dari %s"
 
-msgid "Connection closed (writing)"
-msgstr "Sambugan tertutup (menulis)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Judul Kelompok:</b> %s<br>"
@@ -7955,17 +8102,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Pemberitahuan Administrator Sametime"
 
-msgid "Connection reset"
-msgstr "Sambungan di-reset"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Kesalahan membaca dari soket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Tidak dapat menyambung ke host"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Pengumuman dari %s"
@@ -7988,6 +8124,9 @@ msgstr "Pengeras Suara"
 msgid "Video Camera"
 msgstr "Kamera Video"
 
+msgid "File Transfer"
+msgstr "Transfer File"
+
 msgid "Supports"
 msgstr "Dukungan-dukungan"
 
@@ -8708,9 +8847,6 @@ msgstr "Organisasi"
 msgid "Unit"
 msgstr "Unit"
 
-msgid "Note"
-msgstr "Catatan"
-
 msgid "Join Chat"
 msgstr "Gabung Percakapan"
 
@@ -8810,6 +8946,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistik Jaringan"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping gagal"
 
@@ -8873,7 +9012,8 @@ msgstr "Jenis kunci publik tidak didukung"
 msgid "Disconnected by server"
 msgstr "Diputuskan oleh server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Kesalahan selama menyambung ke Server SILC"
 
 msgid "Key Exchange failed"
@@ -8885,26 +9025,26 @@ msgstr ""
 "Meneruskan melepas sesi gagal. Tekan Sambung Kembali untuk membuat sambugan "
 "baru"
 
-msgid "Connection failed"
-msgstr "Sambungan gagal"
-
 msgid "Performing key exchange"
 msgstr "Melakukan pertukaran kunci"
 
-msgid "Unable to create connection"
-msgstr "Tidak dapat membuat sambungan"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Tidak dapat memuat pasangan kunci SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Menyambung ke Server SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Tidak dapat memuat pasangan kunci SILC"
+
 msgid "Out of memory"
 msgstr "Kehabisan memori"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Tidak dapat menginisialisasi protokol SILC"
 
 msgid "Error loading SILC key pair"
@@ -9197,7 +9337,8 @@ msgstr "Verifikasi dan tanda tangani semua pesan secara digital"
 msgid "Creating SILC key pair..."
 msgstr "Membuat pasangan kunci SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Tidak dapat membuat pasangan kunci SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9293,6 +9434,9 @@ msgstr "Papan tulis"
 msgid "No server statistics available"
 msgstr "Statistik server tidak tersedia"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Kesalahan selama menyambung ke Server SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Kegagalan: Versi tidak cocok, perbaharui klien anda"
@@ -9334,35 +9478,36 @@ msgstr "Kegagalan: Cookie tidak valid"
 msgid "Failure: Authentication failed"
 msgstr "Kegagalan: Otentikasi gagal"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Tidak dapat menginisialisasi sambungan Klien SILC"
 
 msgid "John Noname"
 msgstr "John Tanpa nama"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Tidak dapat memuat pasangan kunci SILC: %s"
 
-msgid "Could not write"
-msgstr "Tidak dapat menulis"
-
-msgid "Could not connect"
-msgstr "Tidak dapat menyambung"
+msgid "Unable to create connection"
+msgstr "Tidak dapat membuat sambungan"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Respon server tidak dikenal."
 
-msgid "Could not create listen socket"
-msgstr "Tidak dapat membuat soket pendengar"
-
-msgid "Could not resolve hostname"
-msgstr "Tidak dapat me-resolve nama host"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Tidak dapat menciptakan soket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Nama layar SIP tidak dapat mengandung sepasi atau simbol @"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Port Server"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9396,175 +9541,63 @@ msgstr "Otorisasi Pengguna"
 msgid "Auth Domain"
 msgstr "Otorisasi Domain"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Melihat ke atas %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Sambungan ke %s gagal"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Signon: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Tidak dapat menulis file %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Tidak dapat membaca file %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Pesan terlalu panjang, %s byte terakhir dibuang."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s sedang tidak ter-login."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Peringatan %s tidak diijinkan."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Pesan telah dijatuhkan, anda melebihi batas kecepatan server."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Percakapan dalam %s tidak tersedia."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Anda mengirim pesan terlalu cepat kepada %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Anda kehilangan PI dari %s karena terlalu besar."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Anda kehilangan PI dari %s karena dikirim terlalu cepat."
-
-#, c-format
-msgid "Failure."
-msgstr "Kegagalan."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Terlalu banyak kecocokan."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Perlu lebih banyak kulifikasi."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Layanan dir sementara tidak tersedia."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Pencarian Email dibatasi."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Kata kunci diabaikan."
-
-#, c-format
-msgid "No keywords."
-msgstr "Tidak ada kata kunci."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Pengguna tidak memiliki informasi direktori."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Negara tidak didukung."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Kegagalan tidak dikenal: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Nama layar atau kata sandi salah."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Layanan sementara tidak tersedia."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Tingkat peringatan anda sekarang terlalu tinggi untuk login."
-
-#, c-format
-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 ""
-"Anda telah menyambung dan terputus terlalu sering. Tunggu sepuluh menit dan "
-"coba lagi.  Apabila terus mencoba, anda harus menunggu bahkan lebih lama."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Kesalahan signon tidak dikenal terjadi: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Kesalahan tidak dikenal, %d, telah terjadi.  Info: %s"
-
-msgid "Invalid Groupname"
-msgstr "Nama Kelompok Tidak Valid"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  Gabung kamar percakapan pada jaringan Yahoo"
 
-msgid "Connection Closed"
-msgstr "Sambungan Tertutup"
+msgid "list: List rooms on the Yahoo network"
+msgstr "daftar:  Daftar kamar pada jaringan Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Menunggu jawaban..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Minta pengguna untuk memulasi sesi Doodle"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC kembali dari perhentian. Anda dapat mengirim pesan lagi."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ID Yahoo!"
 
-msgid "Password Change Successful"
-msgstr "Kata Sandi Berubah dengan Sukses"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Protokol Plugin Yahoo"
 
-msgid "_Group:"
-msgstr "_Kelompok:"
+msgid "Pager server"
+msgstr "Server Penyeranta"
 
-msgid "Get Dir Info"
-msgstr "Dapatkan Info Dir"
+msgid "Pager port"
+msgstr "Port Penyeranta"
 
-msgid "Set Dir Info"
-msgstr "Atur Info Dir"
+msgid "File transfer server"
+msgstr "Server transfer file"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "%s tidak dapat dibuka untuk penulisan!"
+msgid "File transfer port"
+msgstr "Port Transfer File"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Transfer file gagal; sisi lainnya kemungkinan membatalkan."
+msgid "Chat room locale"
+msgstr "Kamar Pengguna Lokal"
 
-msgid "Could not connect for transfer."
-msgstr "Tidak dapat tersambung untuk transfer."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Abaikan undangan konferensi dan kamar percakapan"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Tidak dapat menulis kepala file. File tidak akan ditransfer."
+msgid "Chat room list URL"
+msgstr "Daftar URL kamar percakapan"
 
-msgid "Save As..."
-msgstr "Simpan Sebagai..."
+msgid "Yahoo Chat server"
+msgstr "Server Percakapan Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s permohonan %s untuk menerima %d file: %s (%.2f %s)%s%s"
-msgstr[1] "%s permohonan %s untuk menerima %d file: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Port Percakapan Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s minta anda mengirimnya file"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID Yahoo!"
 
 #. *< type
 #. *< ui_requirement
@@ -9576,12 +9609,12 @@ msgstr "%s minta anda mengirimnya file"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Plugin Protokol TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Protokol Plugin Yahoo"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s telah mengirimkan anda undangan webcam yang belum didukung."
+msgid "Your SMS was not delivered"
+msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Pesan Yahoo! anda tidak terkirim."
@@ -9607,6 +9640,34 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Penambahan teman ditolak"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Menerima data tidak valid pada sambungan dengan server."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Kesalahan nomor tidak dikenal %d. Login ke situs Yahoo! dapat memperbaiki "
+"ini."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Kesalahan nomor tidak dikenal %d. Login ke situs Yahoo! dapat memperbaiki "
+"ini."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Nama layar atau kata sandi salah."
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9640,39 +9701,34 @@ msgstr ""
 "Kesalahan nomor tidak dikenal %d. Login ke situs Yahoo! dapat memperbaiki "
 "ini."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Tidak dapat menambahkan teman %s ke kelompok %s pada daftar server atas akun "
 "%s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Tidak dapat menambahkan teman ke daftar server"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ %s/%s/%s.swf dengan suara ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Menerima respon HTTP tidak terduga dari server."
 
-msgid "Connection problem"
-msgstr "Masalah sambungan"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Kehilangan sambungan dengan %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Tidak dapat membuat sambungan dengan %s:\n"
+"Tidak dapat membuat sambungan dengan server:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9720,8 +9776,8 @@ msgstr "Pengaturan Kehadiran"
 msgid "Start Doodling"
 msgstr "Mulai Doodling"
 
-msgid "Activate which ID?"
-msgstr "Aktifkan ID yang mana?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Gabung siapa dalam percakapan?"
@@ -9735,74 +9791,15 @@ msgstr "Gabung Pengguna dalam Percakapan..."
 msgid "Open Inbox"
 msgstr "Buka Inbox"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Gabung kamar percakapan pada jaringan Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "daftar:  Daftar kamar pada jaringan Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Minta pengguna untuk memulasi sesi Doodle"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ID Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Protokol Plugin Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Jepang"
-
-msgid "Pager server"
-msgstr "Server Penyeranta"
-
-msgid "Japan Pager server"
-msgstr "Server Penyeranta Jepang"
-
-msgid "Pager port"
-msgstr "Port Penyeranta"
-
-msgid "File transfer server"
-msgstr "Server transfer file"
-
-msgid "Japan file transfer server"
-msgstr "Server Transfer File Jepang"
-
-msgid "File transfer port"
-msgstr "Port Transfer File"
-
-msgid "Chat room locale"
-msgstr "Kamar Pengguna Lokal"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Abaikan undangan konferensi dan kamar percakapan"
-
-msgid "Chat room list URL"
-msgstr "Daftar URL kamar percakapan"
-
-msgid "Yahoo Chat server"
-msgstr "Server Percakapan Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Port Percakapan Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Mengirim permohonan Doodle."
 
+msgid "Unable to connect."
+msgstr "Tidak dapat menyambung."
+
 msgid "Unable to establish file descriptor."
 msgstr "Gagal menetapkan deskriptor file."
 
@@ -9810,6 +9807,9 @@ msgstr "Gagal menetapkan deskriptor file."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s menawarkan untuk mengirim file %s"
 
+msgid "Write Error"
+msgstr "Kesalahan Penulisan"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Jepang"
 
@@ -9854,13 +9854,9 @@ msgstr "Link Keren 3"
 msgid "Last Update"
 msgstr "Pembaharuan Terakhir"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Iformasi untuk pengguna %s tidak tersedia"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Maaf, profil ini tampaknya dalam bahasa atau format yang tidak didukung pada "
 "saat ini."
@@ -9932,23 +9928,19 @@ msgstr "Suara-suara"
 msgid "Webcams"
 msgstr "Webcam"
 
+msgid "Connection problem"
+msgstr "Masalah sambungan"
+
 msgid "Unable to fetch room list."
 msgstr "Tidak dapat memanggil daftar kamar."
 
 msgid "User Rooms"
 msgstr "Kamar Pengguna"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Masalah sambungan dengan sever YCNT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Kehilangan sambungan dengan sever\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10073,33 +10065,22 @@ msgstr "Area"
 msgid "Exposure"
 msgstr "Tingkat Ekspos"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Tidak dapat membuat soket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Tidak dapat mem-parse tanggapan dari proxy HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Kesalahan sambungan HTTP proxy %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Akses ditolak: Sever procy HTTP melarang penerowongan port %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Kesalahan dalam me-resolve %s"
 
-msgid "Could not resolve host name"
-msgstr "Tidak dapat resolve nama host"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Memohon perhatian %s ..."
@@ -10189,9 +10170,6 @@ msgstr "Jangan menggangu"
 msgid "Extended away"
 msgstr "Menjauh untuk lama"
 
-msgid "Mobile"
-msgstr "Mobile"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10233,18 +10211,6 @@ msgstr "+++ %s tidak lagi diam"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Kesalahan Membaca %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Kesalahan ditemukan dalam membaca %s anda.  File belum dimuat, dan file lama "
-"anda telah dirubah namanya menjadi %s~."
-
 msgid "Calculating..."
 msgstr "Menghitung..."
 
@@ -10352,6 +10318,18 @@ msgstr "Sambungan ditolak"
 msgid "Address already in use."
 msgstr "Nama percakapan ini telah digunakan"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Kesalahan Membaca %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Kesalahan ditemukan dalam membaca %s anda.  File belum dimuat, dan file lama "
+"anda telah dirubah namanya menjadi %s~."
+
 msgid "Internet Messenger"
 msgstr "Pengirim Pesan Internet"
 
@@ -10394,10 +10372,8 @@ msgstr "Pemberitahuan e_mail baru"
 msgid "Use this buddy _icon for this account:"
 msgstr "Gunakan _ikon teman ini untuk akun ini:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Pilihan-pilihan"
+msgid "_Advanced"
+msgstr "_Lanjutan"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Gunakan Pengaturan Proxy GNOME"
@@ -10432,9 +10408,6 @@ msgstr "Jika anda perhatikan sangat dekat"
 msgid "you can see the butterflies mating"
 msgstr "anda dapat melihat kupu-kupu bersatu"
 
-msgid "Proxy Options"
-msgstr "Pilihan-pilihan Proxy"
-
 msgid "Proxy _type:"
 msgstr "_Jenis Proxy:"
 
@@ -10463,8 +10436,9 @@ msgstr "_Dasar"
 msgid "Create _this new account on the server"
 msgstr "Buat akun baru ini pada server."
 
-msgid "_Advanced"
-msgstr "_Lanjutan"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Proxy"
 
 msgid "Enabled"
 msgstr "Diaktifkan"
@@ -10519,8 +10493,8 @@ msgid "Please update the necessary fields."
 msgstr "Mohon perbaharui bagian yang diperlukan."
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Daftar Kamar"
+msgid "A_ccount"
+msgstr "A_kun:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10529,8 +10503,9 @@ msgstr ""
 "Mohon masukkan informasi yang sesuai mengenai percakapan ke mana anda ingin "
 "bergabung.\n"
 
-msgid "_Account:"
-msgstr "_Akun:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Daftar Kamar"
 
 msgid "_Block"
 msgstr "_Blokir"
@@ -10547,6 +10522,17 @@ msgstr "Dapatkan _Info"
 msgid "I_M"
 msgstr "P_I"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "_Tambahkan Pecakapan"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Percakapan Video"
+
 msgid "_Send File..."
 msgstr "_Kirim File..."
 
@@ -10556,9 +10542,14 @@ msgstr "Tambahkan _Tos Teman..."
 msgid "View _Log"
 msgstr "Lihat _Log"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Sembunyikan saat tidak tersambung"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Tampilkan saat tidak tersambung"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -10687,6 +10678,10 @@ msgstr "/Piranti/_Tos Teman"
 msgid "/Tools/_Certificates"
 msgstr "/Piranti/_Sertifikat"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Piranti/Privasi"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Piranti/Plu_g-ins"
 
@@ -10696,10 +10691,6 @@ msgstr "/Piranti/Pr_eferensi"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Piranti/Pr_ivasi"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Piranti/Privasi"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Piranti/Transfer _File"
 
@@ -10821,8 +10812,8 @@ msgstr "Secara Manual"
 msgid "By status"
 msgstr "Berdasarkan status"
 
-msgid "By log size"
-msgstr "Berdasarkan ukuran log"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10840,6 +10831,9 @@ msgstr "Sambung"
 msgid "Re-enable"
 msgstr "Aktifkan kembali Akun"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10932,6 +10926,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Nama A_lias:"
 
+msgid "_Group:"
+msgstr "_Kelompok:"
+
 #, fuzzy
 msgid "Auto_join when account becomes online."
 msgstr "Gabung otomatis ketika akun tersembung."
@@ -10967,6 +10964,116 @@ msgstr "/Piranti"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Teman-teman/Atur Teman-teman"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Warna Latar Belakang"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Kelompok ini telah ditambahkan ke daftar teman anda"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Warna Latar Belakang"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Lebarkan"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Pilih Warna Latar Belakanga"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Ringkas"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Pilih Warna Latar Belakanga"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Urut"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Menjauh"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Teks Mood"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Pesan terkirim"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Rubah informasi pengguna untuk %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Ketik nama host sesuai sertifikat ini"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Server SSL"
@@ -10986,14 +11093,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Undang Teman ke dalam Kamar Percakapan"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Mohon masukkan nama dari pengguna yang ingin anda undang, berikut dengan "
-"pesan undangan pilihan."
-
 msgid "_Buddy:"
 msgstr "_Teman:"
 
@@ -11022,7 +11121,8 @@ msgstr "Acuhkan"
 msgid "Get Away Message"
 msgstr "Pesan Sedang Tidak di Tempat"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Terakhir dikatakan"
 
 msgid "Unable to save icon file to disk."
@@ -11069,6 +11169,22 @@ msgstr "/Percakapan/_Sipan Sebagai..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Percakapan/Bersihka_n RangkaianGulungan"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Percakapan/Le_bih"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Percakapan/Le_bih"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Percakapan/Le_bih"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Percakapan/Lihat _Log"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Percakapan/Kiri_m File..."
 
@@ -11141,6 +11257,18 @@ msgstr "/Percakapan"
 msgid "/Conversation/View Log"
 msgstr "/Percakapan/Lihat Log"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Percakapan/Lebih"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Percakapan/Lihat Log"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Percakapan/Lebih"
+
 msgid "/Conversation/Send File..."
 msgstr "/Percakapan/Kirim File..."
 
@@ -11324,6 +11452,9 @@ msgstr "Artis-artis"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "dukungan"
 
@@ -11450,6 +11581,10 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Hongaria"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumania"
+
 msgid "Indonesian"
 msgstr "Indonesia"
 
@@ -11465,6 +11600,10 @@ msgstr "Georgia"
 msgid "Ubuntu Georgian Translators"
 msgstr "Penerjemah Ubuntu Gregoria"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Lain"
+
 msgid "Kannada"
 msgstr "Kanada"
 
@@ -11486,6 +11625,10 @@ msgstr "Lithuania"
 msgid "Macedonian"
 msgstr "Makedonia"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "Makedonia"
+
 msgid "Bokmål Norwegian"
 msgstr "Norwegia Bokmål"
 
@@ -11541,6 +11684,9 @@ msgstr "Sosial"
 msgid "Swedish"
 msgstr "Swedia"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11601,7 +11747,24 @@ msgstr ""
 "menyediakan jaminan apapun untuk program ini.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pada irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pada irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11867,7 +12030,7 @@ msgid "Hyperlink visited color"
 msgstr "Warna Hyperlink"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Warna untuk menggambar hyperlink saat mouse berada di atasnya."
 
 msgid "Hyperlink prelight color"
@@ -11905,15 +12068,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Penghilangan Pemberitahuan"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Pemberitahuan email baru"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11926,15 +12096,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Pemberitahuan email baru"
 
-msgid "_Copy Email Address"
-msgstr "_Salin Alamat Email"
-
-msgid "_Open Link in Browser"
-msgstr "_Buka Link dalam Browser"
-
-msgid "_Copy Link Location"
-msgstr "_Salin Lokasi Link"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11976,11 +12137,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "Simpan Gambar"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Simpan Gambar..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Tampilkan senyuman kustom"
 
@@ -12068,9 +12228,6 @@ msgstr "Kecilkan Ukuran Huruf"
 msgid "Font Face"
 msgstr "Muka Huruf"
 
-msgid "Background Color"
-msgstr "Warna Latar Belakang"
-
 msgid "Foreground Color"
 msgstr "Warna Latar Depan"
 
@@ -12189,6 +12346,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12217,6 +12375,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12275,11 +12434,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Buka Semua Pesan"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Anda memiliki email!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Menghitung..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12310,6 +12485,27 @@ msgstr ""
 "Perintah 'Manual' browser telah dipilih, tapi tidak ada perintah yang "
 "dipasang."
 
+#, fuzzy
+msgid "No message"
+msgstr "Pesan tidak dikenal"
+
+msgid "Open All Messages"
+msgstr "Buka Semua Pesan"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Anda memiliki email!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Tos Teman Baru"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Anda memiliki email!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Plugin-plugin ini akan dilepaskan."
 
@@ -12362,10 +12558,17 @@ msgstr "<b>Detail Plugin</b>"
 msgid "Select a file"
 msgstr "Pilih sebuah file"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Ubah Tos Teman"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Tos pada Siapa"
 
+msgid "_Account:"
+msgstr "_Akun:"
+
 msgid "_Buddy name:"
 msgstr "_Nama Teman:"
 
@@ -12432,7 +12635,60 @@ msgstr "_Berulang-ulang"
 msgid "Pounce Target"
 msgstr "Sasaran Tos"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Mulai mengetik"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Berhenti saat mengetik"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Bergabung"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s telah kembali dari berdiam (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Kembali dari menjauh"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Berhenti Mengetik"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Keluar"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Menjadi diam"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Ketika menjauh"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Kirim sebuah pesan"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Peristiwa tos tak dikenal. Mohon laporkan ini!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Tema senyuman gagal dibuka."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Tema senyuman gagal dibuka."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Tema senyuman gagal dibuka."
 
 msgid "Install Theme"
@@ -12455,6 +12711,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Percakapan denganh %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Daftar Teman"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ikon Baki Sistem"
 
@@ -12464,8 +12726,9 @@ msgstr "_Tampikan ikon baki sistem:"
 msgid "On unread messages"
 msgstr "Pada pesan-pesan yang tidak dibaca"
 
-msgid "Conversation Window Hiding"
-msgstr "Persembunyian Jendela Percakapan"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Jendela Percakapan PI"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Sembunyikan pecakapan PI baru:"
@@ -12473,6 +12736,9 @@ msgstr "_Sembunyikan pecakapan PI baru:"
 msgid "When away"
 msgstr "Ketika menjauh"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Kecil_kan jendela-jendela percakapan baru"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Tab-tab"
@@ -12531,9 +12797,6 @@ msgstr "Gunakan scrolling-halus"
 msgid "F_lash window when IMs are received"
 msgstr "K_edipkan jendela saat PI diterima"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Kecil_kan jendela-jendela percakapan baru"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12566,13 +12829,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Tidak dapat memperoleh informasi pengguna"
 
-msgid "ST_UN server:"
-msgstr "Server ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Contoh: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Deteksi otomatis alamat IP"
 
 msgid "Public _IP:"
@@ -12593,6 +12854,10 @@ msgstr "_Mulai port:"
 msgid "_End port:"
 msgstr "_Akhiri port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "Server Proxy"
@@ -12622,6 +12887,10 @@ msgstr "Server Proxy"
 msgid "No proxy"
 msgstr "Tanpa proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Pengguna:"
 
@@ -12786,12 +13055,12 @@ msgstr "Saat baik menjauh dan diam"
 msgid "Auto-away"
 msgstr "Menjauh-otomatis"
 
-msgid "Change status when _idle"
-msgstr "Rubah staus ketika _diam"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Menit sebelum menjadi idle:"
 
+msgid "Change status when _idle"
+msgstr "Rubah staus ketika _diam"
+
 msgid "Change _status to:"
 msgstr "Rubah _status pada:"
 
@@ -12940,29 +13209,19 @@ msgstr "Si_mpan & Gunakan"
 msgid "Status for %s"
 msgstr "Status untuk %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Masukkan Senyuman"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Gandakan Perbaikan"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Mohon pilih mood anda dari daftar."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Masukkan Senyuman"
@@ -12972,22 +13231,31 @@ msgid "Add Smiley"
 msgstr "Senyum!"
 
 #, fuzzy
-msgid "Smiley _Image"
-msgstr "Simpan Gambar"
+msgid "_Image:"
+msgstr "_Gambar"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Urut"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Senyum!"
 
 #, fuzzy
+msgid "Shortcut Text"
+msgstr "Urut"
+
+#, fuzzy
 msgid "Custom Smiley Manager"
 msgstr "Manajer Sertifikat"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Pilih Teman"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Gunakan _ikon teman ini untuk akun ini:"
 
@@ -13076,9 +13344,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Tidak dapat mengirim peluncur"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Anda menarik peluncur desktop. Besar kemungkinan anda ingin mengirim apapun "
 "yang ditunjuk peluncur ini daripada peluncurnya itu sendiri."
@@ -13115,6 +13384,16 @@ msgstr ""
 "Gagal memuat gambar \"%s\": alasan tidak jelas; kemungkinan file gambar yang "
 "korup"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Buka Link in:"
+
+msgid "_Copy Link Location"
+msgstr "_Salin Lokasi Link"
+
+msgid "_Copy Email Address"
+msgstr "_Salin Alamat Email"
+
 msgid "Save File"
 msgstr "Simpan File"
 
@@ -13210,6 +13489,78 @@ msgstr "Plugin Prediksi Ketersediaan Kontak."
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Alamat Server"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Masukkan Server Konferensi"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Pilih server konferensi untuk dicari"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Layanan Online"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Kirim Daftar Teman"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Pergi menjauh"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Direktori Log"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Pilihan Suara"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Layanan PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Deskripsi"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Layani Info Temuan"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Pengguna tidak pernah ada"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server tidak menggunakan metode otentifikasi yang didukung"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Layani Info Temuan"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
+
 msgid "Buddy is idle"
 msgstr "Teman sedang diam"
 
@@ -13502,7 +13853,8 @@ msgstr "Tes Signal GTK"
 #. *  summary
 #. *  description
 msgid "Test to see that all ui signals are working properly."
-msgstr "Tes untuk melihat bahwa semua signal UI bekerja sebaPidginana mestinya."
+msgstr ""
+"Tes untuk melihat bahwa semua signal UI bekerja sebaPidginana mestinya."
 
 #, c-format
 msgid ""
@@ -13603,9 +13955,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plugin Pesan Musik untuk komposisi kolaboratif."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Plugin Pesan Musik memungkinkan sejumlah pengguna untuk bekerja secara "
 "simultan pada sebuah musik dengan mengedit gubahan (musik) umum secara real-"
@@ -13723,12 +14076,6 @@ msgstr ""
 "- Membalikkan semua teks masuk\n"
 "- Mengirim pesan kepada orang-orang di daftar anda begitu mereka bergabung"
 
-msgid "Cursor Color"
-msgstr "Warna Kursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Warna Kedua Kursor"
-
 msgid "Hyperlink Color"
 msgstr "Warna Hyperlink"
 
@@ -13740,6 +14087,10 @@ msgstr "Warna Hyperlink"
 msgid "Highlighted Message Name Color"
 msgstr "Pesan-pesan yang Ditandai"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Penghilangan Pemberitahuan"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Pemisah Horisontal GtkTreeView"
 
@@ -13769,35 +14120,24 @@ msgstr "Huruf Antarmuka GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema Tekx Shortcut GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Warna antarmuka"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Pemberitahuan email baru"
 
-msgid "Widget Sizes"
-msgstr "Ukuran Widget"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Kontrol Tema GTK+ Pidgin"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Tutup"
 
 msgid "Fonts"
 msgstr "Huruf"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Piranti Arsip Gtkrc"
 
@@ -13887,7 +14227,7 @@ msgstr "Persembunyian Jendela Percakapan"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13941,6 +14281,113 @@ msgstr ""
 "Mengganti teks dalam pesan yang dikirim menurut aturan yang didefinisikan "
 "pengguna."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Tidak ter-login"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Tidak ter-login"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Gabung Percakapan"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Acuhkan"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Lebih Keras"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Otorisasi Diberikan"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Kesalahan "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informasi"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Dialog Pengajuan"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Tingkat Peringatan"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status untuk %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Kamar Pengguna Lokal"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Simpan Ikon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Kontrol Tema GTK+ Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Info Kontak"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Daftar Teman"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Daftar Teman"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Kontrol Tema GTK+ Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Kontrol Tema GTK+ Pidgin"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14102,17 +14549,15 @@ msgstr "_Biarkan jendela Daftar Teman di atas:"
 msgid "Only when docked"
 msgstr "Hanya saat dilabuhkan"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_Kedipkan jendela ketika pesan percakapan diterima"
-
 msgid "Windows Pidgin Options"
 msgstr "Pilihan-pilihan Pidgin Windows"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Pilihan khusus untuk Pidgin Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Menyediakan pilihan khusus untuk Pidgin Windows , seperti labuhan daftar "
 "teman."
@@ -14154,6 +14599,550 @@ msgstr "Kirim dan terima bait-bait XMPP mentah."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Tidak dapat membuka soket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Tidak dapat mendengar pada soket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Tidak dapat membaca soket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Sambungan gagal."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server telah memutuskan sambungan"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Tidak dapat menciptakan soket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Tidak dapat tersambung ke host"
+
+#~ msgid "Read error"
+#~ msgstr "Kesalahan baca"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat membuat sambungan dengan server:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Kesalahan penulisan"
+
+#~ msgid "Last Activity"
+#~ msgstr "Aktifitas Terakhir"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Layani Info Temuan"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Layani Item Temuan"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Alamat Stanza Lengkap"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Percakapan Banyak-Pengguna"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Informasi Lengkap Kehadiran Percakpan Banyak-Pengguna"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Arus byte Dalam-Pita"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Perintah Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Layanan PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Arus byte SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Kehabisan Pita Data"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "PI-XHTML"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Pendaftaran Dalam-Pita"
+
+#~ msgid "User Location"
+#~ msgstr "Lokasi Pengguna"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar Pengguna"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Pemberitahuan Keadaan Percakapan"
+
+#~ msgid "Software Version"
+#~ msgstr "Versi Piranti Lunak"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Inisasi Arus"
+
+#~ msgid "User Mood"
+#~ msgstr "Mood Pengguna"
+
+#~ msgid "User Activity"
+#~ msgstr "Aktifitas Pengguna"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Kemampuan Entitas"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Sesi Negosiasi Terenkripsi"
+
+#~ msgid "User Tune"
+#~ msgstr "Musik Pengguna"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Daftar Item Pertukaran"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Alamat Tetap"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil Pengguna"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Audio Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Nama Panggilan Pengguna"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ICE UDP Jingle"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ICE TCP Jingle"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Raw UDP Jingle"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Video Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "DTMF Jingle"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Tanda Terima Pesan"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Penerbitan Kunci Publik"
+
+#~ msgid "User Chatting"
+#~ msgstr "Percakapan Pengguna"
+
+#~ msgid "User Browsing"
+#~ msgstr "Browsing Pengguna"
+
+#~ msgid "User Gaming"
+#~ msgstr "Permainan Pengguna"
+
+#~ msgid "User Viewing"
+#~ msgstr "Pandangan Pengguna"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Enkripsi Stanza"
+
+#~ msgid "Entity Time"
+#~ msgstr "Waktu Entitas"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Pengiriman Tertunda"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Obyek Data Kolaboratif"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Repoistory dan Sharing File"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Temuan Layanan STUN untuk Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negosiasi Sesi Enkripsi yang Disederhanakan"
+
+#~ msgid "Hop Check"
+#~ msgstr "Pemeriksaan Hop"
+
+#~ msgid "Read Error"
+#~ msgstr "Kesalahan Baca"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Gagal tersambung ke server."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Buffer baca penuh"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Pesan yang tidak dapat dipecah"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Tidak dapat tersambung ke host: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login gagal (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Tidak dapat menyambung ke server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Anda telah terlogout karena anda login pada komputer yang lain."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Kesalahan: dukungan SSL tidak terinstal."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Kata sandi salah."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat tersambung ke server BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Anda dapat terputus sebentar lagi.  Periksa %s untuk pembaharuan."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Tidak Dapat Menyambung"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Nama tidak valid"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Tidak bisa mendapatkan informasi server"
+
+#~ msgid "Connection lost"
+#~ msgstr "Sambungan putus"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Tidak dapat me-resolve host"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Sambugan tertutup (menulis)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Sambungan di-reset"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Kesalahan membaca dari soket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Tidak dapat menyambung ke host"
+
+#~ msgid "Could not write"
+#~ msgstr "Tidak dapat menulis"
+
+#~ msgid "Could not connect"
+#~ msgstr "Tidak dapat menyambung"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Tidak dapat membuat soket pendengar"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Tidak dapat me-resolve nama host"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Kata sandi salah"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat membuat sambungan dengan %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Jepang"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Server Penyeranta Jepang"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Server Transfer File Jepang"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kehilangan sambungan dengan sever\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Tidak dapat resolve nama host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Server memerlukan TLS/SSL untuk login.  Dukungan TLS/SSL tidak ditemukan."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Persembunyian Jendela Percakapan"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Mohon pilih mood anda dari daftar."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktifkan ID yang mana?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Warna Kursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Warna Kedua Kursor"
+
+#~ msgid "Interface colors"
+#~ msgstr "Warna antarmuka"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Ukuran Widget"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "Masukkan dalam pesan"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Mohon masukkan nama dari pengguna yang ingin anda undang, berikut dengan "
+#~ "pesan undangan pilihan."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Tidak dapat memanggil Buku Alamat MSN"
+
+#, fuzzy
+#~ msgid "Connection to server lost (no data received within %d second)"
+#~ msgid_plural ""
+#~ "Connection to server lost (no data received within %d seconds)"
+#~ msgstr[0] ""
+#~ "Sambungan ke server putus (tidak ada data diterima dalam %d detik)"
+#~ msgstr[1] ""
+#~ "Sambungan ke server putus (tidak ada data diterima dalam %d detik)"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Anda dapat terputus sebentar lagi.  Anda dapat menggunakan TOC sampai ini "
+#~ "diperbaiki.  Periksa %s untuk pembaharuan."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Tambahkan Teman"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Tidak bisa mendapatkan informasi server"
+
+#~ msgid "Keep alive error"
+#~ msgstr "Pertahankan kesalahan"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "Kehilangan sambungan dengan server:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Sambungkan server"
+
+#~ msgid "Failed to send IM."
+#~ msgstr "Gagal mengirimkan PI."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Melihat ke atas %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Sambungan ke %s gagal"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Signon: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Tidak dapat menulis file %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Tidak dapat membaca file %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Pesan terlalu panjang, %s byte terakhir dibuang."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s sedang tidak ter-login."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Peringatan %s tidak diijinkan."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Pesan telah dijatuhkan, anda melebihi batas kecepatan server."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Percakapan dalam %s tidak tersedia."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Anda mengirim pesan terlalu cepat kepada %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Anda kehilangan PI dari %s karena terlalu besar."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Anda kehilangan PI dari %s karena dikirim terlalu cepat."
+
+#~ msgid "Failure."
+#~ msgstr "Kegagalan."
+
+#~ msgid "Too many matches."
+#~ msgstr "Terlalu banyak kecocokan."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Perlu lebih banyak kulifikasi."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Layanan dir sementara tidak tersedia."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Pencarian Email dibatasi."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Kata kunci diabaikan."
+
+#~ msgid "No keywords."
+#~ msgstr "Tidak ada kata kunci."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Pengguna tidak memiliki informasi direktori."
+
+#~ msgid "Country not supported."
+#~ msgstr "Negara tidak didukung."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Kegagalan tidak dikenal: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Nama layar atau kata sandi salah."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Layanan sementara tidak tersedia."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Tingkat peringatan anda sekarang terlalu tinggi untuk login."
+
+#~ 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 ""
+#~ "Anda telah menyambung dan terputus terlalu sering. Tunggu sepuluh menit "
+#~ "dan coba lagi.  Apabila terus mencoba, anda harus menunggu bahkan lebih "
+#~ "lama."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Kesalahan signon tidak dikenal terjadi: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Kesalahan tidak dikenal, %d, telah terjadi.  Info: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Nama Kelompok Tidak Valid"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Sambungan Tertutup"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Menunggu jawaban..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC kembali dari perhentian. Anda dapat mengirim pesan lagi."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Kata Sandi Berubah dengan Sukses"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Dapatkan Info Dir"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Atur Info Dir"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "%s tidak dapat dibuka untuk penulisan!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Transfer file gagal; sisi lainnya kemungkinan membatalkan."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Tidak dapat tersambung untuk transfer."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Tidak dapat menulis kepala file. File tidak akan ditransfer."
+
+#~ msgid "Save As..."
+#~ msgstr "Simpan Sebagai..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s permohonan %s untuk menerima %d file: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s permohonan %s untuk menerima %d file: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s minta anda mengirimnya file"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Plugin Protokol TOC"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Iformasi untuk pengguna %s tidak tersedia"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Pilihan-pilihan"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Pilihan-pilihan Proxy"
+
+#~ msgid "By log size"
+#~ msgstr "Berdasarkan ukuran log"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Buka Link dalam Browser"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Server ST_UN:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Simpan Gambar"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Kedipkan jendela ketika pesan percakapan diterima"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "Kelompok dengan nama tersebut sudah ada."
 
@@ -14254,13 +15243,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ msgid "Change Qun information"
 #~ msgstr "Informasi Saluran"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "Pesan Sistem"
 
@@ -14391,9 +15373,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ msgid "Windows Live ID authentication Failed"
 #~ msgstr "Otentikasi Windows Live ID gagal"
 
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Tidak dapat menyambung ke server OIM"
-
 #~ msgid ""
 #~ "Sorry, passwords over %d characters in length (yours is %d) are not "
 #~ "supported by MySpace."
@@ -14401,14 +15380,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ "Maaf, kata sandi melebihi %d karakter (milik anda %d) tidak didukung oleh "
 #~ "MySpace."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Mohon kunjungi http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.nama pengguna dan pilih nama pengguna dan coba login "
-#~ "kembali."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Tidak dapat membuat sambungan SSL ke server."
 
@@ -14481,9 +15452,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ msgstr ""
 #~ "Permohonan anda untuk gabung kelompok %d telah diterima oleh admin %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Kelompok ini telah ditambahkan ke daftar teman anda"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Saya mengajukan untuk bergabung"
 
@@ -14505,9 +15473,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ msgid "Enter your reason:"
 #~ msgstr "Masukkan alasan anda:"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Kesalahan dalam memohon token login"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Tidak dapat login, periksa log debug"
 
@@ -14561,9 +15526,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ "panggilan,  untuk teman ini. Nama alias akan ditampilkan pada tempat nama "
 #~ "layar asal memungkinkan.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "A_kun:"
-
 #~ msgid "_Screen name:"
 #~ msgstr "_Nama layar:"
 
@@ -14709,8 +15671,8 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ "You can get version %s from:<br><a href=\"http://Pidgin.sourceforge.net/"
 #~ "\">http://Pidgin.sourceforge.net</a>."
 #~ msgstr ""
-#~ "Anda bisa mendapatkan versi %s dari <br><a href=\"http://Pidgin.sourceforge."
-#~ "net/\">http://Pidgin.sourceforge.net</a>."
+#~ "Anda bisa mendapatkan versi %s dari <br><a href=\"http://Pidgin."
+#~ "sourceforge.net/\">http://Pidgin.sourceforge.net</a>."
 
 #~ msgid "WinPidgin Options"
 #~ msgstr "Pilihan WinPidgin"
@@ -14943,8 +15905,8 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "Ketika ini terjadi, TOC mengacuhkan pesan apapun yang dikirm kepadanya, "
 #~ "dan dapat menendang anda bila mengirim pesan. Pidgin akan mencegah apapun "
@@ -14956,8 +15918,8 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "Metode otentikasi normal gagal. Ini berarti kata sandi anda salah, atau "
 #~ "skema otentikasi Yahoo! telah berubah. Pidgin sekarang akan mencoba untuk "
diff --git a/po/it.po b/po/it.po
index ae86a0da32..a6fd1e4485 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,6 +1,6 @@
 # Pidgin Italian translation
 # Copyright (C) 2002, Salvatore di Maggio <titanicus@libero.it>
-# Copyright (C) 2003-2008, Claudio Satriano <satriano@na.infn.it>
+# Copyright (C) 2003-2009, Claudio Satriano <satriano@na.infn.it>
 #
 # This file is distributed under the same license as the Pidgin package.
 #
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
-"PO-Revision-Date: 2008-08-26 14:12+0100\n"
+"POT-Creation-Date: 2009-08-05 09:08-0700\n"
+"PO-Revision-Date: 2009-08-05 14:56+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -71,7 +71,6 @@ msgstr "Notifica i nuovi messaggi di posta"
 msgid "Remember password"
 msgstr "Ricorda la password"
 
-#, fuzzy
 msgid "There are no protocol plugins installed."
 msgstr "Non c'è nessun plugin per i protocolli installato."
 
@@ -277,7 +276,7 @@ msgid "Blocked"
 msgstr "Bloccato"
 
 msgid "Show when offline"
-msgstr "Mostra quando non sei in linea"
+msgstr "Mostra quando non è in linea"
 
 #, c-format
 msgid "Please enter the new name for %s"
@@ -614,19 +613,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Invia a"
 
-msgid "Invite message"
-msgstr "Messaggio di invito"
-
-msgid "Invite"
-msgstr "Invita"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Inserisci il nome del contatto che vuoi invitare,\n"
-"insieme a un messaggio di invito (opzionale)."
-
 msgid "Conversation"
 msgstr "Conversazione"
 
@@ -842,7 +828,7 @@ msgid "Conversation with %s on %s"
 msgstr "Conversazioni con %s su %s"
 
 msgid "%B %Y"
-msgstr ""
+msgstr "%B %Y"
 
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
@@ -888,6 +874,40 @@ msgstr "Tutte le conversazioni"
 msgid "System Log"
 msgstr "Log di sistema"
 
+msgid "Calling ... "
+msgstr "Chiamata in corso..."
+
+msgid "Hangup"
+msgstr "Riaggancia"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Accetta"
+
+msgid "Reject"
+msgstr "Rifiuta"
+
+msgid "Call in progress."
+msgstr "Chiamata in corso."
+
+msgid "The call has been terminated."
+msgstr "La chiamata è stata terminata."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s desidera avviare una sessione audio con te."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+"%s sta cercando di avviare una sessione multimediale non supportata con te."
+
+msgid "You have rejected the call."
+msgstr "Hai rifiutato la chiamata."
+
+msgid "call: Make an audio call."
+msgstr "call: Fai una chiamata audio."
+
 msgid "Emails"
 msgstr "Email"
 
@@ -922,6 +942,9 @@ msgstr "Continua"
 msgid "IM"
 msgstr "Messaggio"
 
+msgid "Invite"
+msgstr "Invita"
+
 msgid "(none)"
 msgstr "(nessuno)"
 
@@ -1124,7 +1147,6 @@ msgstr "%s è andato via. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ti ha inviato un messaggio. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento sconosciuto. Per piacere riporta questo errore!"
 
@@ -1170,7 +1192,6 @@ msgstr "Minuti prima di modificare lo stato:"
 msgid "Change status to"
 msgstr "Cambia lo stato in"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Conversazioni"
 
@@ -1404,16 +1425,17 @@ msgstr ""
 "supporto X11."
 
 msgid "GntClipboard"
-msgstr ""
+msgstr "Appunti gnt"
 
-#, fuzzy
 msgid "Clipboard plugin"
-msgstr "Configura il plugin"
+msgstr "Plugin appunti"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
+"Quando il contenuto degli appunti gnt cambia, queso è reso disponibile a X, "
+"se possibile."
 
 #, c-format
 msgid "%s just signed on"
@@ -1447,9 +1469,8 @@ msgstr "Qualcuno parla in una chat"
 msgid "Someone says your name in a chat"
 msgstr "Qualcuno pronuncia il tuo nome in una chat"
 
-#, fuzzy
 msgid "Notify with a toaster when"
-msgstr "Segnala ai contatti che stai scrivendo"
+msgstr "Notifica con un popup quando"
 
 msgid "Beep too!"
 msgstr "Emetti anche un bip!"
@@ -1460,9 +1481,8 @@ msgstr "Imposta lo stato URGENTE per la finestra del terminale."
 msgid "GntGf"
 msgstr "GntGf"
 
-#, fuzzy
 msgid "Toaster plugin"
-msgstr "Configura il plugin"
+msgstr "Plugin popup"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
@@ -1483,9 +1503,8 @@ msgstr ""
 "L'abilitazione del log per i messaggi immediati e/o per le chat attiverà lo "
 "storico per il corrispondente tipo di conversazione."
 
-#, fuzzy
 msgid "GntHistory"
-msgstr "Storico"
+msgstr "Storico gnt"
 
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
@@ -1499,7 +1518,6 @@ msgstr ""
 "Quando viene aperta una nuova conversazione, questo plugin inserirà l'ultima "
 "conversazione in quella corrente."
 
-#, c-format
 msgid "Online"
 msgstr "Online"
 
@@ -1522,10 +1540,10 @@ msgid "No Grouping"
 msgstr "Nessun raggruppamento"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "Sottogruppo annidato"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "Raggruppamento annidato (sperimentale)"
 
 msgid "Provides alternate buddylist grouping options."
 msgstr ""
@@ -1538,13 +1556,39 @@ msgstr "Lastlog"
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: cerca una sottostringa nel registro della conversazione."
 
-#, fuzzy
 msgid "GntLastlog"
-msgstr "Storico"
+msgstr "Lastlog gnt"
 
 msgid "Lastlog plugin."
 msgstr "Plugin Lastlog"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Recupero del TinyURL in corso..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+"Crea un TinyURL solamente per indirizzi di lunghezza maggiore o uguale alla "
+"seguente"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Prefisso per gli indirizzi TinyURL (o altri)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Plugin TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"Quando ricevi un messaggio con degli URL, trasformali in TinyURL per poterli "
+"copiare più facilmente"
+
 msgid "accounts"
 msgstr "account"
 
@@ -1646,41 +1690,40 @@ msgstr "Accettare il certificato per %s?"
 msgid "SSL Certificate Verification"
 msgstr "Verifica certificato SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Accetta"
-
-msgid "Reject"
-msgstr "Rifiuta"
-
 msgid "_View Certificate..."
 msgstr "_Visualizza certificato..."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
-"Il certificato presentato da \"%s\" è auto-firmato. Non può essere "
-"verificato automaticamente."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "La catena di certificati presentata per %s non è valida."
+"Il certificato presentato da \"%s\" afferma invece di provenire da \"%s\". "
+"Questo può significare che non ti stai connettendo al servizio al quale "
+"credi."
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Errore certificato SSL"
 
 msgid "Invalid certificate chain"
 msgstr "Catena di certificati non valida"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1689,6 +1732,21 @@ msgstr ""
 "Non hai alcun database di certificati root. Pertanto, questo certificato non "
 "può essere validato."
 
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Il certificato presentato da \"%s\" è auto-firmato. Non può essere "
+"verificato automaticamente."
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "La catena di certificati presentata per %s non è valida."
+
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1708,19 +1766,6 @@ msgstr ""
 msgid "Invalid certificate authority signature"
 msgstr "Firma dell'autorità per i certificati non valida"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Il certificato presentato da \"%s\" afferma invece di provenire da \"%s\". "
-"Questo può significare che non ti stai connettendo al servizio al quale "
-"credi."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1756,6 +1801,8 @@ msgstr "+++ %s si è connesso"
 msgid "+++ %s signed off"
 msgstr "+++ %s si è disconnesso"
 
+#. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -1802,6 +1849,17 @@ msgstr "%s ha abbandonato la stanza."
 msgid "%s left the room (%s)."
 msgstr "%s ha abbandonato la stanza (%s)."
 
+msgid "Invite to chat"
+msgstr "Invita in chat"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Inserisci il nome del contatto che vuoi invitare, insieme a un messaggio di "
+"invito (opzionale)."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Impossibile creare la connessione: %s"
@@ -1815,9 +1873,7 @@ msgid "Failed to get serv name: %s"
 msgstr "Impossibile ottenere il nome del server: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
-"Il server D-BUS di Purple non è in esecuzione per il motivo indicato di "
-"seguito"
+msgstr "Il server D-BUS di Purple non è in esecuzione per il seguente motivo"
 
 msgid "No name"
 msgstr "Nessun nome"
@@ -1851,6 +1907,8 @@ msgstr ""
 #, c-format
 msgid "Resolver process exited without answering our request"
 msgstr ""
+"Il processo del resolver DNS è terminato senza fornire una risposta alla "
+"nostra richiesta"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -1936,10 +1994,13 @@ msgid "Starting transfer of %s from %s"
 msgstr "Inizio del trasferimento di %s da %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Trasferimento del file <A HREF=\"file://%s\">%s</A> completato"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Trasferimento del file %s completato"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Trasferimento file completato"
 
@@ -1947,7 +2008,6 @@ msgstr "Trasferimento file completato"
 msgid "You canceled the transfer of %s"
 msgstr "Hai annullato il trasferimento di %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Trasferimento file annullato"
 
@@ -2154,11 +2214,13 @@ msgstr "<font color=\"red\"><b>Impossibile leggere il file: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RISPOSTA AUTOMATICA>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Errore nella creazione della conferenza."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Stai usando %s, ma questo plugin richiede %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Questo plugin non ha definito alcun ID."
 
@@ -2306,7 +2368,7 @@ msgstr "Test di cifratura"
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "Verifica le cifre fornite con libpurple."
 
 #. *< type
 #. *< ui_requirement
@@ -2426,7 +2488,7 @@ msgid "User Inactivity Timeout (in minutes)"
 msgstr "Tempo massimo di inattività per l'utente (in minuti)"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "Applica le regole per nascondere i contatti"
 
 #. *< type
 #. *< ui_requirement
@@ -2564,13 +2626,13 @@ msgstr "Consente di visualizzare i log di altri client MI."
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Quando si visualizzano i log, questo plugin include i log da altri client "
-"MI. Al momento sono supportati Adium, MSN Messenger e Trillian.\n"
+"Quando si visualizzano i log, questo plugin includerà i log da altri client "
+"di MI. Al momento sono supportati Adium, MSN Messenger, aMSN e Trillian.\n"
 "\n"
 "ATTENZIONE: questo plugin è ancora in versione alfa e potrebbe andare in "
 "crash frequentemente. Utilizzalo a tuo rischio e pericolo!"
@@ -2620,10 +2682,10 @@ msgstr ""
 "Salva i messaggi inviati ad un utente non in linea sotto forma di allarmi."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Il resto del messaggio sarà salvato sotto forma di allarme. Puoi modificare/"
+"Il resto del messaggio sarà salvato sotto forma di allarmi. Puoi modificare/"
 "cancellare l'allarme dalla finestra 'Allarmi'."
 
 #, c-format
@@ -2653,6 +2715,34 @@ msgstr "Salva i messaggi non in linea come allarmi"
 msgid "Do not ask. Always save in pounce."
 msgstr "Non chiedere. Salva sempre come allarme."
 
+msgid "One Time Password"
+msgstr "Password non riutilizzabile"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Supporto per password non riutilizzabile"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Obbliga ad utilizzare le password una sola volta."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Consente di richiedere in maniera obbligatoria, per uno o più account, che "
+"le password non salvate siano usate soltanto per una sola connessione.\n"
+"Nota: è necessario che la password dell'account non sia salvata."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2846,14 +2936,14 @@ msgstr ""
 "TCL, installa ActiveTCL da http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Il toolkit Apple Bonjour per Windows non è stato trovato. Leggi le FAQ su: "
-"http://d.pidgin.im/BonjourWindows per maggiori informazioni."
+"Il toolkit di Apple \"Bonjour per Windows\" non è stato trovato. Leggi le "
+"FAQ su: http://d.pidgin.im/BonjourWindows per maggiori informazioni."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Impossibile mettersi in ascolto per le connessioni MI in entrata\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Impossibile mettersi in ascolto per le connessioni MI in entrata"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2861,7 +2951,6 @@ msgstr ""
 "Impossibile stabilire una connessione con il server mDNS locale. È in "
 "funzione?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Nome"
 
@@ -2893,6 +2982,10 @@ msgstr "Plugin per il protocollo Bonjour"
 msgid "Purple Person"
 msgstr "Persona Purple"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "Porta locale"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2904,14 +2997,17 @@ msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Impossibile inviare il messaggio. La conversazione non può essere avviata."
 
-msgid "Cannot open socket"
-msgstr "Impossibile aprire il socket"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Impossibile creare il socket: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Impossibile associare il socket alla porta"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Impossibile associare il socket alla porta: %s"
 
-msgid "Could not listen on socket"
-msgstr "Impossibile ascoltare sul socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Impossibile mettersi in ascolto sul socket: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Errore di comunicazione con il responder mDNS locale."
@@ -2958,14 +3054,14 @@ msgstr "Salva lista contatti..."
 msgid "Load buddylist from file..."
 msgstr "Importa la lista contatti da file..."
 
-msgid "Fill in the registration fields."
-msgstr "Riempi i campi per la registrazione."
+msgid "You must fill in all registration fields"
+msgstr "Devi riempire tutti i campi per la registrazione"
 
-msgid "Passwords do not match."
-msgstr "Le password non coincidono."
+msgid "Passwords do not match"
+msgstr "Le password non coincidono"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Impossibile registrare il nuovo account. Si è verificato un errore.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Impossibile registrare il nuovo account. Si è verificato un errore."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nuovo account Gadu-Gadu registrato"
@@ -2976,14 +3072,14 @@ msgstr "Registrazione completata con successo!"
 msgid "Password"
 msgstr "Password"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Password (di nuovo)"
 
-msgid "Enter current token"
-msgstr "Inserisci il token corrente"
+msgid "Enter captcha text"
+msgstr "Inserire il testo captcha"
 
-msgid "Current token"
-msgstr "Token corrente"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un nuovo account Gadu-Gadu"
@@ -3036,6 +3132,15 @@ msgstr "Password modificata con successo!"
 msgid "Current password"
 msgstr "Password attuale"
 
+msgid "Password (retype)"
+msgstr "Password (di nuovo)"
+
+msgid "Enter current token"
+msgstr "Inserisci il token corrente"
+
+msgid "Current token"
+msgstr "Token corrente"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Inserisci la tua password attuale e la nuova password per UIN:"
 
@@ -3049,13 +3154,13 @@ msgstr "Scegli una chat per il contatto: %s"
 msgid "Add to chat..."
 msgstr "Aggiungi alla chat..."
 
+#. Global
 msgid "Available"
 msgstr "Presente"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Assente"
 
@@ -3083,8 +3188,8 @@ msgstr "Non è stato trovato nessun utente corrispondente"
 msgid "There are no users matching your search criteria."
 msgstr "Non ci sono utenti che corrispondono ai tuoi criteri di ricerca."
 
-msgid "Unable to read socket"
-msgstr "Impossibile leggere il socket"
+msgid "Unable to read from socket"
+msgstr "Impossibile leggere dal socket"
 
 msgid "Buddy list downloaded"
 msgstr "Lista contatti scaricata"
@@ -3098,8 +3203,14 @@ msgstr "Lista contatti esportata"
 msgid "Your buddy list was stored on the server."
 msgstr "La tua lista contatti è stata salvata sul server."
 
-msgid "Connection failed."
-msgstr "Connessione fallita."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connesso"
+
+msgid "Connection failed"
+msgstr "Connessione fallita"
 
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
@@ -3107,14 +3218,23 @@ msgstr "Aggiungi alla chat"
 msgid "Chat _name:"
 msgstr "_Nome chat:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Impossibile risolvere il nome host '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connessione in corso"
+
 msgid "Chat error"
 msgstr "Errore nella chat"
 
 msgid "This chat name is already in use"
 msgstr "Questo nome chat è già in uso"
 
-msgid "Not connected to the server."
-msgstr "Non connesso al server."
+msgid "Not connected to the server"
+msgstr "Non connesso al server"
 
 msgid "Find buddies..."
 msgstr "Cerca contatti..."
@@ -3155,6 +3275,9 @@ msgstr "IM popolare in Polonia"
 msgid "Gadu-Gadu User"
 msgstr "Utente Gadu-Gadu"
 
+msgid "GG server"
+msgstr "Server GG"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando sconosciuto: %s"
@@ -3169,7 +3292,7 @@ msgstr "Non è impostato nessun argomento"
 msgid "File Transfer Failed"
 msgstr "Trasferimento file fallito"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Impossibile aprire una porta in ascolto."
 
 msgid "Error displaying MOTD"
@@ -3185,8 +3308,16 @@ msgstr "Non c'è nessun MOTD associato con questa connessione."
 msgid "MOTD for %s"
 msgstr "MOTD per %s"
 
-msgid "Server has disconnected"
-msgstr "Il server ti ha disconnesso"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Connessione persa col server: %s"
 
 msgid "View MOTD"
 msgstr "Leggi il MOTD"
@@ -3197,25 +3328,23 @@ msgstr "_Canale:"
 msgid "_Password:"
 msgstr "_Password:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "I nick IRC non devono contenere spazi bianchi"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connessione in corso"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "Il nick IRC e il nome del server non devono contenere spazi bianchi"
 
 msgid "SSL support unavailable"
 msgstr "Supporto SSL non disponibile"
 
-msgid "Couldn't create socket"
-msgstr "Impossibile creare il socket"
+msgid "Unable to connect"
+msgstr "Impossibile connettersi"
 
-msgid "Couldn't connect to host"
-msgstr "Impossibile connettersi all'host"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Impossibile connettersi: %s"
 
-msgid "Read error"
-msgstr "Errore di lettura"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Il server ha chiuso la connessione"
 
 msgid "Users"
 msgstr "Utenti"
@@ -3397,6 +3526,16 @@ msgstr ""
 "Il nome per l'account selezionato è stato rifiutato dal server. "
 "Probabilmente contiene caratteri non validi."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Il nickname \"%s\" è già in uso."
+
+msgid "Nickname in use"
+msgstr "Nickname già in uso"
+
 msgid "Cannot change nick"
 msgstr "Impossibile cambiare nick"
 
@@ -3492,8 +3631,9 @@ msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list: Mostra la lista delle chat room presenti sulla rete. <i>Attenzione. "
-"Alcuni server potrebbero disconnetterti dopo questo comando.</i>"
+"list: Mostra la lista delle stanze di discussione presenti sulla rete. "
+"<i>Attenzione. Alcuni server potrebbero disconnetterti dopo questo comando.</"
+"i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;azione da eseguire&gt;: Esegue un'azione."
@@ -3636,11 +3776,10 @@ msgstr "Comando ad-hoc fallito"
 msgid "execute"
 msgstr "esegui"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"Il server richiede TLS/SSL per il login. Nessun supporto TLS/SSL trovato."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Il server richiede TLS/SSL. Nessun supporto TLS/SSL trovato."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Hai bisogno della crittografia, ma non è presente nessun supporto TLS/SSL."
 
@@ -3660,17 +3799,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticazione come testo semplice"
 
-msgid "Invalid response from server."
-msgstr "Risposta non valida da parte del server."
+msgid "SASL authentication failed"
+msgstr "Autenticazione SASL fallita"
+
+msgid "Invalid response from server"
+msgstr "Risposta non valida da parte del server"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Il server non usa nessun metodo di autenticazione supportato"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Hai richiesto la criptatura, ma non è disponibile su questo server."
+
 msgid "Invalid challenge from server"
 msgstr "Challenge non valido dal server"
 
-msgid "SASL error"
-msgstr "Errore SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Errore SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "Il gestore di connessione BOSH ha terminato la tua sessione."
+
+msgid "No session ID given"
+msgstr "Nessun ID di sessione fornito"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Versione del protocollo BOSH non supportata"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Impossibile stabilire una connessione con il server"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Impossibile stabilire una connessione con il server: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Impossibile stabilire una connessione SSL"
 
 msgid "Full Name"
 msgstr "Nome"
@@ -3687,6 +3852,11 @@ msgstr "Sito Web"
 msgid "Street Address"
 msgstr "Indirizzo"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Indirizzo esteso"
 
@@ -3738,179 +3908,8 @@ msgstr "Client"
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-msgid "Last Activity"
-msgstr "Ultima attività"
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "/Conversazione/_Info"
-
-#, fuzzy
-msgid "Service Discovery Items"
-msgstr "<b>Oggetti da sincronizzare</b>"
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Tipo di stanza non supportato"
-
-msgid "Multi-User Chat"
-msgstr "Chat multi-utente"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Non c'è nessuna informazione sull'utente nella directory."
-
-#, fuzzy
-msgid "In-Band Bytestreams"
-msgstr "Email nella cartella:"
-
-msgid "Ad-Hoc Commands"
-msgstr "Comandi ad-hoc"
-
-#, fuzzy
-msgid "PubSub Service"
-msgstr "Servizio non disponibile"
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Out of Band Data"
-msgstr "Tempo limite esaurito per il socket dati"
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "Finestre dei _messaggi immediati"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Riempi i campi per la registrazione."
-
-msgid "User Location"
-msgstr "Posizione dell'utente"
-
-msgid "User Avatar"
-msgstr "Avatar dell'utente"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Notifica i nuovi messaggi di posta"
-
-msgid "Software Version"
-msgstr "Versione del software"
-
-msgid "Stream Initiation"
-msgstr "Inizializzazione dello stream"
-
-msgid "File Transfer"
-msgstr "Trasferimento file"
-
-msgid "User Mood"
-msgstr "Umore dell'utente"
-
-msgid "User Activity"
-msgstr "Attività dell'utente"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Capacità"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negoziazione della sessione crittografata"
-
-msgid "User Tune"
-msgstr "Brano ascoltato dall'utente"
-
-msgid "Roster Item Exchange"
-msgstr "Scambio degli elementi del roster"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Indirizzo notiziario:"
-
-msgid "User Profile"
-msgstr "Profilo dell'utente"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle audio"
-
-msgid "User Nickname"
-msgstr "Nickname dell'utente"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Ricevute per il messaggio"
-
-msgid "Public Key Publishing"
-msgstr "Pubblicazione della chiave pubblica"
-
-msgid "User Chatting"
-msgstr "Chat con l'utente"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Per utente"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Per utente"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Per utente"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Crittazione di trillian"
-
-#, fuzzy
-msgid "Entity Time"
-msgstr "Tempo di inattività"
-
-#, fuzzy
-msgid "Delayed Delivery"
-msgstr "Per i messaggi ritardati"
-
-#, fuzzy
-msgid "Collaborative Data Objects"
-msgstr "Mostra oggetti in database"
-
-#, fuzzy
-msgid "File Repository and Sharing"
-msgstr "%s: nessuna entry per il file `%s' e per la entry del menu `%s'"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negoziazione di una sessione criptata semplificata"
-
-#, fuzzy
-msgid "Hop Check"
-msgstr "controllo annullato.\n"
-
-msgid "Capabilities"
-msgstr "Capacità"
+msgid "Local Time"
+msgstr "Ora locale"
 
 msgid "Priority"
 msgstr "Priorità"
@@ -3918,6 +3917,13 @@ msgstr "Priorità"
 msgid "Resource"
 msgstr "Risorsa"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s fa"
+
+msgid "Logged Off"
+msgstr "Si è disconnesso"
+
 msgid "Middle Name"
 msgstr "Secondo nome"
 
@@ -3939,14 +3945,12 @@ msgstr "Annulla nascondi \"Da\""
 msgid "Temporarily Hide From"
 msgstr "Nascondi temporaneamente \"Da\""
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Elimina la notifica di presenza"
 
 msgid "(Re-)Request authorization"
 msgstr "Richiedi nuovamente l'autorizzazione"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -3959,12 +3963,11 @@ msgid "Log Out"
 msgstr "Disconnetti"
 
 msgid "Chatty"
-msgstr "È in chat"
+msgstr "In chat"
 
 msgid "Extended Away"
-msgstr "Ancora assente"
+msgstr "Assente per molto"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Non disturbare"
 
@@ -4029,11 +4032,11 @@ msgid "_Server:"
 msgstr "_Server:"
 
 msgid "_Handle:"
-msgstr "_Handle:"
+msgstr "_Identificativo:"
 
 #, c-format
 msgid "%s is not a valid room name"
-msgstr "%s non è un nome della stanza valido"
+msgstr "%s non è un nome di stanza valido"
 
 msgid "Invalid Room Name"
 msgstr "Nome della stanza non valido"
@@ -4047,10 +4050,10 @@ msgstr "Nome del server non valido"
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s non è un gestore della stanza valido"
+msgstr "%s non è un identificativo di stanza valido"
 
 msgid "Invalid Room Handle"
-msgstr "Handle della stanza non valido"
+msgstr "Identificativo di stanza non valido"
 
 msgid "Configuration error"
 msgstr "Errore di configurazione"
@@ -4068,7 +4071,8 @@ msgid "Registration error"
 msgstr "Errore di registrazione"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "La modifica del nick non è supportata nelle chat room non MUC"
+msgstr ""
+"La modifica del nick non è supportata nelle stanze di discussione non MUC"
 
 msgid "Error retrieving room list"
 msgstr "Errore nella ricezione della lista delle stanze"
@@ -4085,28 +4089,24 @@ msgstr "Scegli un server per le conferenze al quale connettersi"
 msgid "Find Rooms"
 msgstr "Cerca stanze"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Hai richiesto la criptatura, ma non è disponibile su questo server."
+msgid "Affiliations:"
+msgstr "Affiliazioni:"
 
-msgid "Write error"
-msgstr "Errore di scrittura"
+msgid "No users found"
+msgstr "Nessun utente trovato"
 
-msgid "Ping timeout"
-msgstr "Timeout per il ping"
+msgid "Roles:"
+msgstr "Ruoli:"
 
-msgid "Read Error"
-msgstr "Errore di lettura"
+msgid "Ping timed out"
+msgstr "Ping scaduto"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Impossibile stabilire una connessione con il server:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Impossibile creare il socket"
+"Impossibile trovare metodi alternativi per la connessione XMPP, dal momento "
+"che la connessione diretta è fallita."
 
 msgid "Invalid XMPP ID"
 msgstr "ID XMMP non valido"
@@ -4114,6 +4114,9 @@ msgstr "ID XMMP non valido"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP invalido. Deve essere impostato il dominio."
 
+msgid "Malformed BOSH URL"
+msgstr "Formato URL BOSH non valido"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrazione di %s@%s avvenuta con successo"
@@ -4138,9 +4141,6 @@ msgstr "Rimozione dell'iscrizione riuscita"
 msgid "Unregistration Failed"
 msgstr "Rimozione dell'iscrizione fallita"
 
-msgid "Already Registered"
-msgstr "Già registrato"
-
 msgid "State"
 msgstr "Stato"
 
@@ -4153,6 +4153,9 @@ msgstr "Telefono"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Già registrato"
+
 msgid "Unregister"
 msgstr "Rimuovi iscrizione"
 
@@ -4198,23 +4201,32 @@ msgstr "Autenticazione"
 msgid "Re-initializing Stream"
 msgstr "Reinizializzazione dello stream"
 
+msgid "Server doesn't support blocking"
+msgstr "Il server non supporta il blocco"
+
 msgid "Not Authorized"
 msgstr "Non autorizzato"
 
+msgid "Mood"
+msgstr "Umore"
+
+msgid "Now Listening"
+msgstr "In ascolto"
+
 msgid "Both"
 msgstr "Entrambi"
 
 msgid "From (To pending)"
-msgstr "Da (In attesa di \"Per\")"
+msgstr "Da (In attesa di \"Verso\")"
 
 msgid "From"
 msgstr "Da"
 
 msgid "To"
-msgstr "Per"
+msgstr "Verso"
 
 msgid "None (To pending)"
-msgstr "Nessuna (In attesa di \"Per\")"
+msgstr "Nessuna (In attesa di \"Verso\")"
 
 msgid "None"
 msgstr "Nessuno"
@@ -4222,15 +4234,8 @@ msgstr "Nessuno"
 msgid "Subscription"
 msgstr "Sottoscrizione"
 
-msgid "Mood"
-msgstr "Umore"
-
-msgid "Now Listening"
-msgstr "In ascolto"
-
-#, fuzzy
 msgid "Mood Text"
-msgstr "Testo identificato"
+msgstr "Messaggio di umore"
 
 msgid "Allow Buzz"
 msgstr "Permetti i buzz"
@@ -4271,9 +4276,6 @@ msgstr "La tua password è stata modificata."
 msgid "Error changing password"
 msgstr "Errore nella modifica della password"
 
-msgid "Password (again)"
-msgstr "Password (di nuovo)"
-
 msgid "Change XMPP Password"
 msgstr "Cambia la password XMPP"
 
@@ -4372,9 +4374,8 @@ msgstr "Autenticazione fallita"
 msgid "Bad Format"
 msgstr "Formato non valido"
 
-#, fuzzy
 msgid "Bad Namespace Prefix"
-msgstr "<Inode numero 1>"
+msgstr "Prefisso del namespace non corretto"
 
 msgid "Resource Conflict"
 msgstr "Conflitto di risorsa"
@@ -4468,18 +4469,26 @@ msgid "Unable to ping user %s"
 msgstr "Impossibile fare ping sull'utente %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Impossibile richiamare %s con un buzz: non conosco nulla dell'utente."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "Impossibile richiamare %s con un buzz: l'utente potrebbe non essere in "
 "linea. "
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Impossibile richiamare %s con un buzz: l'utente non lo supporta."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"Impossibile richiamare %s con un buzz: l'utente non supporta questa "
+"caratteristica oppure non desidera ricevere buzz al momento."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Sto richiamando l'attenzione di %s con un buzz..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4491,20 +4500,47 @@ msgid "%s has buzzed you!"
 msgstr "%s ti ha richiamato con un buzz!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Sto richiamando l'attenzione di %s con un buzz..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Impossibile avviare una sessione multimediale con %s: JID non valido"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+"Impossibile avviare una sessione multimediale con %s: l'utente non è in linea"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Impossibile avviare una sessione multimediale con %s: non sei iscritto alla "
+"presenza dell'utente"
+
+msgid "Media Initiation Failed"
+msgstr "Avvio sessione multimediale fallito"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Scegli la risorsa per %s con la quale vuoi avviare una sessione multimediale"
+
+msgid "Select a Resource"
+msgstr "Scegli una risorsa"
+
+msgid "Initiate Media"
+msgstr "Avvia sessione multimediale"
 
 msgid "config:  Configure a chat room."
-msgstr "config: Configura una chat room."
+msgstr "config: Configura una stanza di discussione."
 
 msgid "configure:  Configure a chat room."
-msgstr "configure: Configura una chat room."
+msgstr "configure: Configura una stanza di discussione."
 
 msgid "part [room]:  Leave the room."
 msgstr "part [stanza]: Abbandona la stanza."
 
 msgid "register:  Register with a chat room."
-msgstr "register: Iscrizione ad una chat room."
+msgstr "register: Iscriviti ad una stanza di discussione."
 
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuovo argomento]: Visualizza o modifica l'argomento."
@@ -4513,18 +4549,20 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;utente&gt; [motivo]: Allontana un utente dalla stanza."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;utente&gt; &lt;owner|admin|member|outcast|none&gt;: Imposta "
-"un'affiliazione per l'utente nella stanza."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: "
+"Ottieni il nome degli utenti con una certa affiliazione oppure imposta "
+"l'affiliazione degli utenti con la stanza."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;utente&gt; &lt;moderator|participant|visitor|none&gt;: Imposta un "
-"ruolo per l'utente nella stanza."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...:  "
+"Ottieni il nome degli utenti con un certo ruolo oppure imposta il ruolo "
+"degli utenti con la stanza."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;utente&gt; [messaggio]: Invita un utente nella stanza."
@@ -4587,9 +4625,11 @@ msgstr "Server di connessione"
 msgid "File transfer proxies"
 msgstr "Server proxy per il trasferimento file"
 
+msgid "BOSH URL"
+msgstr "URL BOSH"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
 msgstr "Mostra gli smiley personalizzati"
 
@@ -4626,6 +4666,14 @@ msgstr "Errore di parsing XML"
 msgid "Unknown Error in presence"
 msgstr "Errore sconosciuto nella presenza"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Errore nell'ingresso nella chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Errore nella chat %s"
+
 msgid "Create New Room"
 msgstr "Crea una nuova stanza"
 
@@ -4642,13 +4690,29 @@ msgstr "_Configura la stanza"
 msgid "_Accept Defaults"
 msgstr "_Accetta impostazioni predefinite"
 
+msgid "No reason"
+msgstr "Nessun motivo"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Errore nell'ingresso nella chat %s"
+msgid "You have been kicked: (%s)"
+msgstr "Sei stato cacciato: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Errore nella chat %s"
+msgid "Kicked (%s)"
+msgstr "Cacciato (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+"Si è verificato un errore nel trasferimento del flusso di dati in-band\n"
+
+msgid "Transfer was closed."
+msgstr "Il trasferimento è stato chiuso."
+
+msgid "Failed to open the file"
+msgstr "Impossibile aprire il file"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Impossibile aprire il flusso di byte in-band"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4666,17 +4730,15 @@ msgstr "Impossibile inviare il file a %s. JID non valido"
 msgid "Unable to send file to %s, user is not online"
 msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
+msgstr ""
+"Impossibile inviare il file a %s. Non iscritto alla presenza dell'utente"
 
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Scegli a quale risorsa di %s vuoi inviare un file"
 
-msgid "Select a Resource"
-msgstr "Scegli una risorsa"
-
 msgid "Edit User Mood"
 msgstr "Modifica l'umore dell'utente"
 
@@ -4711,8 +4773,18 @@ msgstr "Azioni"
 msgid "Select an action"
 msgstr "Scegli un'azione"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Impossibile ottenere la rubrica MSN"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Impossibile aggiungere \"%s\"."
+
+msgid "Buddy Add error"
+msgstr "Errore nell'aggiungere il contatto"
+
+msgid "The username specified does not exist."
+msgstr "Il nome utente specificato non esiste."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4828,7 +4900,7 @@ msgstr "Mancano dei campi richiesti"
 
 #, c-format
 msgid "Too many hits to a FND"
-msgstr ""
+msgstr "Troppe risposte ad un FND"
 
 #, c-format
 msgid "Not logged in"
@@ -4906,9 +4978,9 @@ msgstr "Troppe sessioni"
 msgid "Passport not verified"
 msgstr "Profilo Passport non verificato"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Bad friend file"
-msgstr "Invia un file a %s"
+msgstr ""
 
 #, c-format
 msgid "Not expected"
@@ -4942,9 +5014,8 @@ msgstr "Kids Passport senza il consenso parentale"
 msgid "Passport account not yet verified"
 msgstr "Profilo Passport non ancora verificato"
 
-#, fuzzy, c-format
 msgid "Passport account suspended"
-msgstr "Profilo Passport non ancora verificato"
+msgstr "Account Passport sospeso"
 
 #, c-format
 msgid "Bad ticket"
@@ -4958,13 +5029,36 @@ msgstr "Codice di errore sconosciuto %d"
 msgid "MSN Error: %s\n"
 msgstr "Errore di MSN: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "Contatti preferiti"
+msgstr "Altri contatti"
 
-#, fuzzy
 msgid "Non-IM Contacts"
-msgstr "Rimuovi lista"
+msgstr "Contatti non-MI"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s ha inviato un wink. <a href='msn-wink://%s'>Fai clic per riprodurlo</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s ha inviato un wink, ma non può essere salvato"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s ha inviato un clip vocale. <a href='audio://%s'>Fai clic per riprodurlo</"
+"a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s ha inviato un clip vocale, ma non può essere salvato"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s ti ha inviato un invito alla chat vocale. Questa caratteristica non è "
+"ancora supportata."
 
 msgid "Nudge"
 msgstr "Trillo"
@@ -5037,6 +5131,12 @@ msgstr "Invia un messaggio ad un dispositivo portatile."
 msgid "Page"
 msgstr "Page"
 
+msgid "Playing a game"
+msgstr "Giocando"
+
+msgid "Working"
+msgstr "Al lavoro"
+
 msgid "Has you"
 msgstr "Sei nella sua lista"
 
@@ -5073,6 +5173,12 @@ msgstr "Artista"
 msgid "Album"
 msgstr "Album"
 
+msgid "Game Title"
+msgstr "Nome del gioco"
+
+msgid "Office Title"
+msgstr "Nome del lavoro"
+
 msgid "Set Friendly Name..."
 msgstr "Imposta un alias..."
 
@@ -5107,8 +5213,28 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Il supporto SSL è necessario per MSN. Installare una libreria SSL supportata."
 
-msgid "Failed to connect to server."
-msgstr "Impossibile connettersi al server."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Impossibile aggiungere il contatto %s poiché il nome utente non è valido. I "
+"nomi utente devono essere indirizzi email validi."
+
+msgid "Unable to Add"
+msgstr "Impossibile aggiungere"
+
+msgid "Authorization Request Message:"
+msgstr "Messaggio di richiesta di autorizzazione:"
+
+msgid "Please authorize me!"
+msgstr "Mi autorizzi, per favore?"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Errore nella ricezione del profilo"
@@ -5265,8 +5391,8 @@ msgstr ""
 "Nessuna informazione trovata nel profilo dell'utente. Molto probabilmente "
 "l'utente non esiste."
 
-msgid "Profile URL"
-msgstr "URL del profilo"
+msgid "View web profile"
+msgstr "Mostra il profilo web"
 
 #. *< type
 #. *< ui_requirement
@@ -5299,64 +5425,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticazione Windows Live ID: risposta non valida"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s non è un gruppo valido"
-
-msgid "Unknown error."
-msgstr "Errore sconosciuto."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s su %s: (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ti ha appena inviato un trillo!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Errore sconosciuto (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Errore sconosciuto (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Impossibile aggiungere l'utente"
 
-#, fuzzy
-msgid "The following users are missing from your addressbook"
-msgstr "Ecco i risultati della tua ricerca"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Impossibile aggiungere l'utente su %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Impossibile bloccare l'utente su %s (%s)"
-
+#. Unknown error!
 #, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Impossibile autorizzare l'utente su %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s non può essere aggiunto perché la tua lista contatti è piena."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s non è un profilo passport valido"
+msgid "Unknown error (%d)"
+msgstr "Errore sconosciuto (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Servizio temporaneamente non disponibile."
+msgid "The following users are missing from your addressbook"
+msgstr "I seguenti utenti non sono presenti nella tua rubrica"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Il messaggio mobile non è stato inviato perché è troppo lungo."
 
-msgid "Unable to rename group"
-msgstr "Impossibile rinominare il gruppo"
-
-msgid "Unable to delete group"
-msgstr "Impossibile cancellare il gruppo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5405,9 +5494,6 @@ msgstr ""
 "Il messaggio potrebbe non essere stato inviato a causa di un errore "
 "sconosciuto."
 
-msgid "Unable to connect"
-msgstr "Impossibile connettersi"
-
 msgid "Writing error"
 msgstr "Errore in scrittura"
 
@@ -5422,20 +5508,20 @@ msgstr ""
 "Errore di connessione dal server %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Il nostro protocollo non è supportato dal server."
+msgid "Our protocol is not supported by the server"
+msgstr "Il nostro protocollo non è supportato dal server"
 
-msgid "Error parsing HTTP."
-msgstr "Errore di parsing HTTP."
+msgid "Error parsing HTTP"
+msgstr "Errore di parsing HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Sei connesso da un'altra postazione."
+msgid "You have signed on from another location"
+msgstr "Sei connesso da un'altra postazione"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "I server MSN sono temporaneamente non disponibili. Riprova più tardi."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "I server MSN sono temporaneamente disattivi."
+msgid "The MSN servers are going down temporarily"
+msgstr "I server MSN sono temporaneamente disattivi"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5465,6 +5551,18 @@ msgstr "Invio cookie in corso"
 msgid "Retrieving buddy list"
 msgstr "Ricezione della lista contatti in corso"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s chiede di vedere il tuo video, ma questa caratteristica non è ancora "
+"supportata."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non è "
+"ancora supportata."
+
 msgid "Away From Computer"
 msgstr "Lontano dal computer"
 
@@ -5510,28 +5608,11 @@ msgstr ""
 "Il messaggio potrebbe non essere stato inviato a causa di un errore "
 "sconosciuto:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ti ha aggiunto alla sua lista contatti."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ti ha rimosso dalla sua lista contatti."
-
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "Aggiungi alla rubrica"
+msgstr "Rimuovere il contatto dalla Rubrica?"
 
-#, fuzzy
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Vuoi aggiungere questo contatto alla tua lista?"
-
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Impossibile aggiungere \"%s\"."
+msgstr "Vuoi cancellare questo contatto anche dalla tua rubrica?"
 
 msgid "The username specified is invalid."
 msgstr "Il nome utente specificato non è valido."
@@ -5539,6 +5620,9 @@ msgstr "Il nome utente specificato non è valido."
 msgid "This Hotmail account may not be active."
 msgstr "Questo account Hotmail potrebbe essere non attivo."
 
+msgid "Profile URL"
+msgstr "URL del profilo"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5552,39 +5636,85 @@ msgstr "Questo account Hotmail potrebbe essere non attivo."
 msgid "MSN Protocol Plugin"
 msgstr "Plugin per il protocollo MSN"
 
-msgid "Missing Cipher"
-msgstr "Cifra mancante"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s non è un gruppo valido"
 
-msgid "The RC4 cipher could not be found"
-msgstr "Impossibile trovare la cifra RC4"
+msgid "Unknown error."
+msgstr "Errore sconosciuto."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"Aggiorna libpurple ad una versione che supporta RC4 (>= 2.0.1). Il plugin "
-"MySpaceIM non sarà caricato."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s su %s: (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Impossibile aggiungere l'utente su %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Impossibile bloccare l'utente su %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Impossibile autorizzare l'utente su %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s non può essere aggiunto perché la tua lista contatti è piena."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s non è un profilo passport valido"
+
+msgid "Service Temporarily Unavailable."
+msgstr "Servizio temporaneamente non disponibile."
+
+msgid "Unable to rename group"
+msgstr "Impossibile rinominare il gruppo"
+
+msgid "Unable to delete group"
+msgstr "Impossibile cancellare il gruppo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ti ha aggiunto alla sua lista contatti."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ti ha rimosso dalla sua lista contatti."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "Utente inesistente: %s"
+
+msgid "User lookup"
+msgstr "Ricerca utente"
 
-#, fuzzy
 msgid "Reading challenge"
 msgstr ""
-"Errore di lettura di %s: \n"
-"%s.\n"
 
-#, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
+msgstr ""
 
 msgid "Logging in"
 msgstr "Login in corso"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] "Connessione al server persa (nessun dato ricevuto in %d secondo)"
-msgstr[1] "Connessione al server persa (nessun dato ricevuto in %d secondi)"
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Nessun nome utente impostato"
+
+msgid "You appear to have no MySpace username."
+msgstr "Sembra che tu non abbia nessun nome utente MySpace."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Vuoi impostarne uno adesso? (Nota: NON PUO' ESSERE PIU' CAMBIATO!)"
+
+msgid "Lost connection with server"
+msgstr "Connessione persa con il server"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nuovi messaggi di posta"
 
@@ -5603,20 +5733,25 @@ msgstr "Nuovi commenti sulle foto"
 msgid "MySpace"
 msgstr "MySpace"
 
-msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM - Nessun nome utente impostato"
-
-msgid "You appear to have no MySpace username."
-msgstr "Sembra che tu non abbia nessun nome utente MySpace."
+msgid "IM Friends"
+msgstr "Amici MI"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr "Vuoi impostarne uno adesso? (Nota: NON PUO' ESSERE PIU' CAMBIATO!)"
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d contatto è stato aggiunto o aggiornato dal server (inclusi i contatti già "
+"presenti sulla lista del server)"
+msgstr[1] ""
+"%d contatti sono stati aggiunti o aggiornati dal server (inclusi i contatti "
+"già presenti sulla lista del server)"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connesso"
+msgid "Add contacts from server"
+msgstr "Aggiungi contatti dal server"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5624,35 +5759,31 @@ msgstr "Errore di protocollo. Codice %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s La tua password è di %d caratteri, più grande della lunghezza massima "
-"attesa di %d per MySpaceIM. Accorcia la tua password, collegandoti su http://"
-"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
-"e riprova."
+"%s La tua password è di %zu caratteri, più grande della lunghezza massima "
+"attesa di %d. Accorcia la tua password, collegandoti su http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword e riprova."
+
+msgid "Incorrect username or password"
+msgstr "Password o nome utente non corretti"
 
 msgid "MySpaceIM Error"
 msgstr "Errore MySpaceIM"
 
+msgid "Invalid input condition"
+msgstr "Condizione di input non valida"
+
 msgid "Failed to add buddy"
 msgstr "Impossibile aggiungere il contatto"
 
 msgid "'addbuddy' command failed."
 msgstr "Comando 'addbuddy' fallito."
 
-#, fuzzy
 msgid "persist command failed"
-msgstr "Comando 'addbuddy' fallito."
-
-#, c-format
-msgid "No such user: %s"
-msgstr "Utente inesistente: %s"
-
-msgid "User lookup"
-msgstr "Ricerca utente"
+msgstr "Comando 'persist' fallito"
 
 msgid "Failed to remove buddy"
 msgstr "Impossibile rimuovere il contatto"
@@ -5663,38 +5794,18 @@ msgstr "Comando 'delbuddy' fallito"
 msgid "blocklist command failed"
 msgstr "Comando blocklist fallito"
 
-msgid "Invalid input condition"
-msgstr "Condizione di input non valida"
-
-msgid "Read buffer full (2)"
-msgstr "Buffer di lettura pieno (2)"
-
-msgid "Unparseable message"
-msgstr "Messaggio indecifrabile"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Impossibile connettersi all'host: %s (%d)"
+msgid "Missing Cipher"
+msgstr "Cifra mancante"
 
-msgid "IM Friends"
-msgstr "Amici MI"
+msgid "The RC4 cipher could not be found"
+msgstr "Impossibile trovare la cifra RC4"
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-"%d contatto è stato aggiunto o aggiornato dal server (inclusi i contatti già "
-"presenti sulla lista del server)"
-msgstr[1] ""
-"%d contatti sono stati aggiunti o aggiornati dal server (inclusi i contatti "
-"già presenti sulla lista del server)"
-
-msgid "Add contacts from server"
-msgstr "Aggiungi contatti dal server"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Aggiorna libpurple ad una versione che supporta RC4 (>= 2.0.1). Il plugin "
+"MySpaceIM non sarà caricato."
 
 msgid "Add friends from MySpace.com"
 msgstr "Aggiungi amici da MySpace.com"
@@ -5722,9 +5833,8 @@ msgstr "Abilita l'account MySpaceIM appropriato e riprova."
 msgid "Show display name in status text"
 msgstr "Mostra il nome utente nel messaggio di stato"
 
-#, fuzzy
 msgid "Show headline in status text"
-msgstr "Mostra il nome utente nel messaggio di stato"
+msgstr "Mostra l'intestazione nel messaggio di stato"
 
 msgid "Send emoticons"
 msgstr "Invia emoticon"
@@ -5738,12 +5848,8 @@ msgstr "Dimensione del font di base (punti)"
 msgid "User"
 msgstr "Utente"
 
-msgid "Profile"
-msgstr "Profilo"
-
-#, fuzzy
 msgid "Headline"
-msgstr "_Handle:"
+msgstr "Intestazione"
 
 msgid "Song"
 msgstr "Canzone"
@@ -5754,15 +5860,14 @@ msgstr "Numero di amici"
 msgid "Client Version"
 msgstr "Versione del client"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "Nessun nome utente impostato"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM - Imposta un nome utente"
-
-msgid "Please enter a username to check its availability:"
-msgstr "Inserisci un nome utente per verificarne la disponibilità:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Si è verificato un errore nell'impostare il nome utente.  Riprova, o visita "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username per "
+"impostare il tuo nome utente."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nome utente disponibile"
@@ -5773,12 +5878,22 @@ msgstr "Il nome utente è disponibile. Vuoi impostare questo nome?"
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "UNA VOLTA IMPOSTATO, NON PUO' ESSERE CAMBIATO!"
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Imposta un nome utente"
+
 msgid "This username is unavailable."
 msgstr "Questo nome utente non è disponibile."
 
 msgid "Please try another username:"
 msgstr "Prova con un altro nome utente:"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Nessun nome utente impostato"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Inserisci un nome utente per verificarne la disponibilità:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5786,55 +5901,53 @@ msgstr "Prova con un altro nome utente:"
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
+msgstr "Fulmina"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha fulminato!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Zapping %s..."
-msgstr "Numero del pager"
+msgstr "Stai fulminando %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#, fuzzy
 msgid "Whack"
-msgstr "Avviso"
+msgstr "Picchia"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha picchiato!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Whacking %s..."
-msgstr "Avviso"
+msgstr "Stai picchiando %s..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
-msgstr "Distaccato"
+msgstr "Brucia"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has torched you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha bruciato!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "Stai bruciando %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "Bacia"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha baciato!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "Stai baciando %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
@@ -5849,60 +5962,56 @@ msgid "Hugging %s..."
 msgstr "Stai abbracciando %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "Assonnato"
+msgstr "Da' uno schiaffo"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha dato uno schiaffo!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "Stai dando uno schiaffo a %s..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "Gallo"
+msgstr "Da' un pizzicotto"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha dato un pizzicotto!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Goosing %s..."
-msgstr "Ricerca di %s in corso"
+msgstr "Stai dando un pizzicotto a %s..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#, fuzzy
 msgid "High-five"
-msgstr "Priorità alta"
+msgstr "Da' il cinque"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s ti ha inviato un messaggio. (%s)"
+msgstr "%s ti ha dato il cinque!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "High-fiving %s..."
-msgstr "Priorità alta"
+msgstr "Stai dando il cinque a %s..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#, fuzzy
 msgid "Punk"
-msgstr "Punk"
+msgstr "Prendi in giro"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha preso in giro!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Punking %s..."
-msgstr "Ping"
+msgstr "Stai prendendo in giro %s..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -5911,17 +6020,16 @@ msgstr "Ping"
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#, fuzzy
 msgid "Raspberry"
-msgstr "Trasferimento in corso"
+msgstr "Fai un pernacchio"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha fatto un pernacchio!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Raspberrying %s..."
-msgstr "Trasferimento in corso"
+msgstr "Stai facendo un pernacchio a %s..."
 
 msgid "Required parameters not passed in"
 msgstr "Dei parametri richiesti non sono stati passati"
@@ -5977,9 +6085,6 @@ msgstr "Impossibile aggiungere te stesso"
 msgid "Master archive is misconfigured"
 msgstr "L'archivio principale non è configurato propriamente"
 
-msgid "Incorrect username or password"
-msgstr "Password o nome utente non corretti"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Impossibile riconoscere l'host del nome utente inserito"
 
@@ -6024,8 +6129,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Errore sconosciuto: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Login non riuscito (%s)."
+msgid "Unable to login: %s"
+msgstr "Impossibile effettuare il login: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6132,9 +6237,6 @@ msgstr "Conferenza GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autenticazione in corso..."
 
-msgid "Unable to connect to server."
-msgstr "Impossibile connettersi al server."
-
 msgid "Waiting for response..."
 msgstr "In attesa di risposta..."
 
@@ -6158,9 +6260,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Vuoi entrare nella conversazione?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Sei stato disconnesso perché ti sei collegato da un'altra macchina."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6169,16 +6268,12 @@ msgstr ""
 "inviato."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Impossibile connettersi al server. Inserisci l'indirizzo del server al quale "
-"connettersi."
-
-msgid "Error. SSL support is not installed."
-msgstr "Errore. Il supporto SSL non è installato."
+"desideri collegarti."
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Questa conferenza è stata chiusa. Non può essere più inviato nessun "
@@ -6203,25 +6298,32 @@ msgstr "Indirizzo del server"
 msgid "Server port"
 msgstr "Porta del server"
 
-msgid "Could not join chat room"
-msgstr "Impossibile entrare nella chat room"
+msgid "Received unexpected response from "
+msgstr "È stata ricevuta una risposta inattesa da parte di"
 
-msgid "Invalid chat room name"
-msgstr "Nome della chat room non valido"
-
-msgid "Server closed the connection."
-msgstr "Il server ha chiuso la connessione."
-
-#, c-format
+#. username connecting too frequently
 msgid ""
-"Lost connection with server:\n"
-"%s"
+"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 ""
-"Connessione persa col server:\n"
-"%s"
+"Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
+"riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Errore nella richiesta"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL non autorizza il tuo nome utente ad autenticarsi qui"
 
-msgid "Received invalid data on connection with server."
-msgstr "Ricevuti dati non validi durante la connessione con il server."
+msgid "Could not join chat room"
+msgstr "Impossibile entrare nella stanza di discussione"
+
+msgid "Invalid chat room name"
+msgstr "Nome della stanza di discussione non valido"
+
+msgid "Received invalid data on connection with server"
+msgstr "Ricevuti dati non validi durante la connessione con il server"
 
 #. *< type
 #. *< ui_requirement
@@ -6237,7 +6339,7 @@ msgid "AIM Protocol Plugin"
 msgstr "Plugin per il protocollo AIM"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "UIN ICQ..."
 
 #. *< type
 #. *< ui_requirement
@@ -6268,7 +6370,7 @@ msgstr "Connessione persa con l'utente remoto:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Ricevuti dati non validi durante la connessione con l'utente remoto."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Impossibile stabilire una connessione con l'utente remoto."
 
 msgid "Direct IM established"
@@ -6326,16 +6428,14 @@ msgstr "Risposte perse"
 msgid "Request denied"
 msgstr "Richiesta rifiutata"
 
-#, fuzzy
 msgid "Busted SNAC payload"
-msgstr "carico di %d byte sovradimensionato"
+msgstr "Carico SNAC non corretto"
 
 msgid "Insufficient rights"
 msgstr "Permessi insufficienti"
 
-#, fuzzy
 msgid "In local permit/deny"
-msgstr "Imposta bitrate massimo locale (in kbit/s)."
+msgstr "Nell'autorizzazione/divieto locale"
 
 msgid "Warning level too high (sender)"
 msgstr "Livello di allerta troppo alto (mittente)"
@@ -6448,23 +6548,18 @@ msgstr "Fotocamera"
 msgid "Screen Sharing"
 msgstr "Condivisone dello schermo"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Disponibile alla chat"
 
-#, c-format
 msgid "Not Available"
 msgstr "Non disponibile"
 
-#, c-format
 msgid "Occupied"
 msgstr "Occupato"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Rendi visibile il tuo stato sul web"
 
-#, c-format
 msgid "Invisible"
 msgstr "Invisibile"
 
@@ -6478,20 +6573,12 @@ msgid "Buddy Comment"
 msgstr "Commento per il contatto"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Impossibile connettersi al server di autenticazione:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Impossibile connettersi al server di autenticazione: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Impossibile connettersi al server BOS:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Impossibile connettersi al server BOS: %s"
 
 msgid "Username sent"
 msgstr "Nome utente inviato"
@@ -6505,53 +6592,60 @@ msgstr "Finalizzazione della connessione"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Impossibile connettersi. Impossibile effettuare il login come %s poiché il "
-"nome utente non è valido. I nomi utente devono essere indirizzi email "
-"validi. In alternativa devono iniziare con una lettera e contenere solo "
-"lettere, numeri e spazi; oppure devono contenere solo numeri."
+"Impossibile effettuare il login come %s poiché il nome utente non è valido. "
+"I nomi utente devono essere indirizzi email validi. In alternativa devono "
+"iniziare con una lettera e contenere solo lettere, numeri e spazi; oppure "
+"devono contenere solo numeri."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Nome utente non valido."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Potresti essere disconnesso a breve. In tal caso, controlla %s per "
+"aggiornamenti."
 
-msgid "Incorrect password."
-msgstr "Password non corretta."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Impossibile ottenere un hash di login valido per AIM."
+
+msgid "Unable to get a valid login hash."
+msgstr "Impossibile ottenere un hash di login valido."
+
+msgid "Received authorization"
+msgstr "Autorizzazione ricevuta"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Il nome utente non esiste"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Il tuo account è attualmente sospeso."
+msgid "Your account is currently suspended"
+msgstr "Il tuo account è attualmente sospeso"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Il servizio AOL Instant Messenger è temporaneamente non disponibile."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
-"riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versione del client che stai usando è troppo vecchia. Aggiornala su %s"
 
-msgid "Could Not Connect"
-msgstr "Impossibile connettersi"
-
-msgid "Received authorization"
-msgstr "Autorizzazione ricevuta"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Ti sei connesso e disconnesso con troppa frequenza. Aspetta un minuto e "
+"riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
 
-msgid "The SecurID key entered is invalid."
-msgstr "La chiave SecurID immessa non è valida."
+msgid "The SecurID key entered is invalid"
+msgstr "La chiave SecurID immessa non è valida"
 
 msgid "Enter SecurID"
 msgstr "Immettere SecurID"
@@ -6559,30 +6653,6 @@ msgstr "Immettere SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Immettere il numero di 6 cifre del display digitale."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Verrai disconnesso a breve. Potresti voler utilizzare TOC finché non è "
-"risolto il problema. Controlla %s per aggiornamenti."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Impossibile ottenere un hash di login valido per AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
-
-msgid "Unable to get a valid login hash."
-msgstr "Impossibile ottenere un hash di login valido."
-
 msgid "Password sent"
 msgstr "Password inviata"
 
@@ -6592,12 +6662,6 @@ msgstr "Impossibile inizializzare la connessione"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorizzami ad includerti nella mia lista contatti."
 
-msgid "Authorization Request Message:"
-msgstr "Messaggio di richiesta di autorizzazione:"
-
-msgid "Please authorize me!"
-msgstr "Mi autorizzi, per favore?"
-
 msgid "No reason given."
 msgstr "Nessun motivo fornito."
 
@@ -6726,7 +6790,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s per un motivo sconosciuto"
 msgstr[1] "Non hai ricevuto %hu messaggi da %s per un motivo sconosciuto"
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossibile inviare il messaggio: %s"
@@ -6748,6 +6812,12 @@ msgstr "Online da"
 msgid "Member Since"
 msgstr "Membro da"
 
+msgid "Capabilities"
+msgstr "Capacità"
+
+msgid "Profile"
+msgstr "Profilo"
+
 msgid "Your AIM connection may be lost."
 msgstr "La tua connessione ad AIM potrebbe essere perduta."
 
@@ -6768,7 +6838,7 @@ msgstr ""
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Sei stato disconnesso dalla chat room %s."
+msgstr "Sei stato disconnesso dalla stanza di discussione %s."
 
 msgid "Mobile Phone"
 msgstr "Cellulare"
@@ -6929,7 +6999,7 @@ msgstr "Messaggio di assenza troppo lungo."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6938,11 +7008,6 @@ msgstr ""
 "lettera e contenere solo lettere, numeri e spazi; oppure devono contenere "
 "solo numeri."
 
-#, fuzzy
-msgid "Unable to Add"
-msgstr "Impossibile aggiungere"
-
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
 msgstr "Impossibile ricevere la lista contatti"
 
@@ -6959,7 +7024,7 @@ msgstr "Orfani"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Impossibile aggiungere il contatto %s poiché hai troppi contatti nella tua "
@@ -6969,7 +7034,7 @@ msgid "(no name)"
 msgstr "(nessun nome)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Impossibile aggiungere il contatto %s per un motivo sconosciuto."
 
 #, c-format
@@ -7042,6 +7107,7 @@ msgstr "C_onnetti"
 msgid "Get AIM Info"
 msgstr "Ottieni info AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Modifica il commento per il contatto"
 
@@ -7103,6 +7169,7 @@ msgstr "_Cerca"
 msgid "Set User Info (web)..."
 msgstr "Imposta le informazioni utente (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Cambia la password (web)"
 
@@ -7132,6 +7199,9 @@ msgstr "Cerca un contatto per indirizzo email..."
 msgid "Search for Buddy by Information"
 msgstr "Cerca un contatto per informazione"
 
+msgid "Use clientLogin"
+msgstr "Usa clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7154,7 +7224,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr "Tentativo di connessione con %s: %hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Tentativo di connessione attraverso un server proxy."
 
@@ -7210,9 +7279,8 @@ msgstr "Capricorno"
 msgid "Rat"
 msgstr "Topo"
 
-#, fuzzy
 msgid "Ox"
-msgstr "OK"
+msgstr "Bue"
 
 msgid "Tiger"
 msgstr "Tigre"
@@ -7247,16 +7315,14 @@ msgstr "Maiale"
 msgid "Other"
 msgstr "Altro"
 
-#, fuzzy
 msgid "Visible"
-msgstr "Invisibile"
+msgstr "Visibile"
 
-msgid "Firend Only"
-msgstr ""
+msgid "Friend Only"
+msgstr "Solo amici"
 
-#, fuzzy
 msgid "Private"
-msgstr "Privacy"
+msgstr "Privato"
 
 msgid "QQ Number"
 msgstr "Numero QQ"
@@ -7273,9 +7339,8 @@ msgstr "Codice postale"
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Autorizzare l'utente?"
+msgstr "Autorizzare l'aggiunta"
 
 msgid "Cellphone Number"
 msgstr "Numero di cellulare"
@@ -7283,132 +7348,136 @@ msgstr "Numero di cellulare"
 msgid "Personal Introduction"
 msgstr "Presentazione personale"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "Città"
+msgstr "Città/Area"
 
-#, fuzzy
 msgid "Publish Mobile"
-msgstr "Cellulare personale"
+msgstr "Pubblica il numero di cellulare"
 
-#, fuzzy
 msgid "Publish Contact"
-msgstr "Imposta un alias per la lista"
+msgstr "Pubblica le informazioni sul contatto"
 
 msgid "College"
 msgstr "Scuola superiore"
 
-#, fuzzy
 msgid "Horoscope"
-msgstr "Simbolo zodiacale"
+msgstr "Oroscopo"
 
-#, fuzzy
 msgid "Zodiac"
-msgstr "Segno zodiacale"
+msgstr "Zodiaco"
 
-#, fuzzy
 msgid "Blood"
-msgstr "Bloccato"
+msgstr "Gruppo sanguigno"
 
-#, fuzzy
 msgid "True"
-msgstr "Toro"
+msgstr "Vero"
 
-#, fuzzy
 msgid "False"
-msgstr "Fallito"
+msgstr "Falso"
 
-#, fuzzy
 msgid "Modify Contact"
-msgstr "Modifica l'account"
+msgstr "Modifica il contatto"
 
-#, fuzzy
 msgid "Modify Address"
-msgstr "Indirizzo di casa"
+msgstr "Modifica l'indirizzo"
 
-#, fuzzy
 msgid "Modify Extended Information"
-msgstr "Modifica le mie informazioni"
+msgstr "Modifica le informazioni estese"
 
-#, fuzzy
 msgid "Modify Information"
-msgstr "Modifica le mie informazioni"
+msgstr "Modifica le informazioni"
 
-#, fuzzy
 msgid "Update"
-msgstr "Ultimo aggiornamento"
+msgstr "Aggiorna"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "Inserisci le informazioni sul contatto."
+msgstr "Impossibile modificare le informazioni sul contatto."
+
+msgid "Mobile"
+msgstr "Cellulare"
+
+msgid "Note"
+msgstr "Note"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Promemoria per il contatto"
+
+msgid "Change his/her memo as you like"
+msgstr "Modifica a piacimento il promemoria per il contatto"
+
+msgid "_Modify"
+msgstr "_Modifica"
+
+msgid "Memo Modify"
+msgstr "Modifica promemoria"
+
+msgid "Server says:"
+msgstr "Il server dice:"
+
+msgid "Your request was accepted."
+msgstr "La tua richiesta è stata accettata."
+
+msgid "Your request was rejected."
+msgstr "La tua richiesta è stata rifiutata."
 
 #, c-format
-msgid "%d needs Q&A"
-msgstr ""
+msgid "%u requires verification"
+msgstr "%u necessita di verifica"
 
-#, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Aggiungi un contatto"
+msgid "Add buddy question"
+msgstr "Domanda per l'aggiunta del contatto"
 
-#, fuzzy
-msgid "Input answer here"
-msgstr "Inserisci la tua richiesta qui"
+msgid "Enter answer here"
+msgstr "Inserisci qui la risposta"
 
 msgid "Send"
 msgstr "Invia"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Nome utente non valido."
+msgstr "Risposta non valida."
 
 msgid "Authorization denied message:"
 msgstr "Messaggio di autorizzazione rifiutata:"
 
-#, fuzzy
-msgid "Sorry, You are not my style."
-msgstr "Mi dispiace ma non sei il mio tipo..."
+msgid "Sorry, you're not my style."
+msgstr "Mi dispiace ma non sei il mio tipo."
 
-#, fuzzy, c-format
-msgid "%d needs authentication"
-msgstr "L'utente %d necessita di autenticazione"
+#, c-format
+msgid "%u needs authorization"
+msgstr "%u necessita di autorizzazione"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "Vuoi aggiungere il contatto alla tua lista?"
+msgstr "Autorizzazione per l'aggiunta del contatto"
 
-msgid "Input request here"
-msgstr "Inserisci la tua richiesta qui"
+msgid "Enter request here"
+msgstr "Inserisci la richiesta qui"
 
 msgid "Would you be my friend?"
 msgstr "Vuoi essere mio amico?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Contatto"
+msgstr "Contatto QQ"
 
-#, fuzzy
 msgid "Add buddy"
-msgstr "Aggiungi un contatto"
+msgstr "Aggiungi contatto"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "Volto QQ non valido"
+msgstr "Numero QQ non valido"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "Mi autorizzi, per favore?"
+msgstr "Invio dell'autorizzazione non riuscito"
 
-#, fuzzy, c-format
-msgid "Failed removing buddy %d"
-msgstr "Impossibile rimuovere il contatto"
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "Rimozione del contatto %u non riuscita"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s ti ha rimosso dalla sua lista contatti."
+msgstr "Impossibile rimuovere me stesso dalla lista contatti di %d"
 
-#, fuzzy
 msgid "No reason given"
-msgstr "Nessun motivo fornito."
+msgstr "Nessun motivo fornito"
 
 #. only need to get value
 #, c-format
@@ -7418,9 +7487,9 @@ msgstr "Sei stato aggiunto da %s"
 msgid "Would you like to add him?"
 msgstr "Vuoi aggiungerlo?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Rifiuta"
+msgstr "Rifiutato da %s"
 
 #, c-format
 msgid "Message: %s"
@@ -7435,81 +7504,73 @@ msgstr "ID del gruppo"
 msgid "QQ Qun"
 msgstr "Qun QQ"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Inserire un nuovo nome per %s"
+msgstr "Inserisci un numero Qun"
 
-#, fuzzy
 msgid "You can only search for permanent Qun\n"
-msgstr "Puoi solamente cercare i gruppi QQ permanenti\n"
+msgstr "Puoi solamente cercare Qun permanenti\n"
+
+msgid "(Invalid UTF-8 string)"
+msgstr "(Stringa UTF-8 non valida)"
 
-#, fuzzy
 msgid "Not member"
-msgstr "Non sono un membro"
+msgstr "Non è membro"
 
 msgid "Member"
 msgstr "Membro"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "Finestra di richiesta"
+msgstr "Richiesta in corso"
 
-#, fuzzy
 msgid "Admin"
-msgstr "Adium"
+msgstr "Amministratore"
 
-#, fuzzy
 msgid "Notice"
-msgstr "Note"
+msgstr "Avviso"
 
-#, fuzzy
 msgid "Detail"
-msgstr "Predefinito"
+msgstr "Dettaglio"
 
 msgid "Creator"
 msgstr "Creatore"
 
-#, fuzzy
 msgid "About me"
-msgstr "Informazioni su %s"
+msgstr "Informazioni su di me"
 
-#, fuzzy
 msgid "Category"
-msgstr "Errore nella chat"
+msgstr "Categoria"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr "Questo gruppo non consente ad altri di entrare"
+msgstr "Il Qun non consente ad altri di entrare"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "Entra in chat"
+msgstr "Entra in un Qun QQ"
+
+msgid "Input request here"
+msgstr "Inserisci la tua richiesta qui"
 
 #, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Ingresso nel Qun %s (%u) riuscito"
 
-#, fuzzy
 msgid "Successfully joined Qun"
-msgstr "Membro Qun modificato con successo"
+msgstr "Ingresso nel Qun riuscito"
 
 #, c-format
-msgid "Qun %d denied to join"
-msgstr ""
+msgid "Qun %u denied from joining"
+msgstr "L'ingresso nel Qun %u è stato rifiutato"
 
 msgid "QQ Qun Operation"
 msgstr "Operatore Qun QQ"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Fallito"
+msgstr "Fallito:"
 
-msgid "Join Qun, Unknow Reply"
-msgstr ""
+msgid "Join Qun, Unknown Reply"
+msgstr "Ingresso nel Qun, risposta sconosciuta"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "Qun QQ"
+msgstr "Abbandona il Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -7518,51 +7579,47 @@ msgstr ""
 "Nota, se sei il creatore, \n"
 "questa operazione rimuoverà questo Qun."
 
-#, fuzzy
-msgid "Sorry, you are not our style ..."
-msgstr "Mi dispiace ma non sei il mio tipo..."
+msgid "Sorry, you are not our style"
+msgstr "Mi dispiace, ma non sei il nostro tipo"
 
-#, fuzzy
-msgid "Successfully changed Qun member"
-msgstr "Membro Qun modificato con successo"
+msgid "Successfully changed Qun members"
+msgstr "Membri del Qun modificati con successo"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
-msgstr "Informazione Qun modificata con successo"
+msgstr "Informazione sul Qun modificata con successo"
 
 msgid "You have successfully created a Qun"
 msgstr "Qun creato con successo"
 
-#, fuzzy
-msgid "Would you like to set detailed information now?"
-msgstr "Vuoi impostare i dettagli Qun adesso?"
+msgid "Would you like to set up detailed information now?"
+msgstr "Vuoi impostare le informazioni dettagliate adesso?"
 
 msgid "Setup"
 msgstr "Impostazione"
 
-#, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
-msgstr "L'utente %d ha chiesto di entrare nel gruppo %d"
+#, c-format
+msgid "%u requested to join Qun %u for %s"
+msgstr "L'utente %u ha chiesto di entrare nel Qun %u per %s"
 
-#, fuzzy, c-format
-msgid "%d request to join Qun %d"
-msgstr "L'utente %d ha chiesto di entrare nel gruppo %d"
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr "L'utente %u ha chiesto di entrare nel Qun %u"
 
-#, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
-msgstr "Impossibile unirsi al contatto in chat"
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "Impossibile entrare nel Qun %u, gestito dall'admin %u"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
-msgstr ""
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr "<b>L'ingresso nel Qun %u è approvato dall'amministratore %u per %s</b>"
 
-#, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
-msgstr "Rimuovi il contatto"
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>Il contatto %u è stato rimosso.</b>"
 
 #, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>Il nuovo contatto %u è entrato.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7572,140 +7629,139 @@ msgid "Level"
 msgstr "Livello"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
+msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "Cellulare"
+msgstr " FromMobile"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "Cellulare"
+msgstr " BindMobile"
 
-#, fuzzy
 msgid " Video"
-msgstr "Video live"
+msgstr "Video"
 
-#, fuzzy
 msgid " Zone"
-msgstr "Nessuno"
+msgstr "Zona"
 
 msgid "Flag"
-msgstr ""
+msgstr "Flag"
 
 msgid "Ver"
-msgstr ""
+msgstr "Versione"
 
 msgid "Invalid name"
 msgstr "Nome non valido"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "Scegli cartella..."
+msgstr "Scegli un'icona..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Orario di login</b>: %s<br>\n"
+msgstr "<b>Orario di login</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Attualmente online</b>: %d<br>\n"
+msgstr "<b>Numero di contatti online</b>: %d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
+msgstr "<b>Ultimo aggiornamento</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Server</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Orario di login</b>: %s<br>\n"
+msgstr "<b>Etichetta del client</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Modalità di connessione</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>Modalità di connessione</b>: %s<br>\n"
+msgstr "<b>Il mio indirizzo IP</b>: %s:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Inviato</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
+msgstr "<b>Invia nuovamente</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
+msgstr "<b>Perso</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Ricevuto</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>Il mio IP pubblico</b>: %s<br>\n"
+msgstr "<b>Ricevuto duplicato</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Orario di login</b>: %s<br>\n"
+msgstr "<b>Data e ora</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
 msgstr "Informazioni sul login"
 
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Autore originale</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Hanno contribuito al codice</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
+msgstr "<p><b>Gli Amabili Scrittori Patch</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
+msgstr "<p><b>Ringraziamento</b>:<br>\n"
+
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Tester scrupolosi</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "ed altri ancora, fatemi sapere... grazie!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>E tutti i ragazzi del retrobottega...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
+msgstr "<i>Unisciti a noi!</i> :)"
 
-#, fuzzy, c-format
-msgid "About OpenQ r%s"
-msgstr "Informazioni su %s"
+#, c-format
+msgid "About OpenQ %s"
+msgstr "Informazioni su OpenQ %s"
 
-#, fuzzy
 msgid "Change Icon"
-msgstr "Salva l'icona"
+msgstr "Cambia icona"
 
 msgid "Change Password"
 msgstr "Cambia password"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Informazioni sul login"
+msgstr "Informazioni sull'account"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "Aggiorna tutti i Qun di QQ"
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "Informazioni su %s"
+msgstr "Informazioni su OpenQ"
+
+msgid "Modify Buddy Memo"
+msgstr "Modifica il promemoria per il contatto"
 
 #. *< type
 #. *< ui_requirement
@@ -7717,59 +7773,48 @@ msgstr "Informazioni su %s"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "Plugin per il protocollo QQ"
 
-#, fuzzy
 msgid "Auto"
-msgstr "Autore"
+msgstr "Automatico"
 
-#, fuzzy
 msgid "Select Server"
-msgstr "Scegli l'utente"
+msgstr "Scegli un server"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
+msgstr "QQ2008"
 
-#. #endif
-#, fuzzy
 msgid "Connect by TCP"
 msgstr "Connetti utilizzando TCP"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "Porta del server"
+msgstr "Mostra gli avvisi dal server"
 
-#, fuzzy
 msgid "Show server news"
-msgstr "Indirizzo del server"
+msgstr "Mostra le news del server"
+
+msgid "Show chat room when msg comes"
+msgstr "Mostra la stanza di discussione all'arrivo di un messaggio"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "Errore nell'aggiunta del contatto"
+msgstr "Intervallo di \"Keep alive\" (secondi)"
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "Intervallo(i) per l'aggiornamento"
+msgstr "Intervallo di aggiornamento (secondi)"
 
-#, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Impossibile decrittare la risposta al login"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
-msgstr "Impossibile decrittare la risposta al login"
+msgid "Unable to decrypt server reply"
+msgstr "Impossibile decrittare la risposta del server"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "Impossibile richiedere il token, 0x%02X"
 
 #, c-format
 msgid "Invalid token len, %d"
@@ -7777,157 +7822,122 @@ msgstr "Lunghezza del token non valida, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Il Redirect_EX non è attualmente supportato"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Richiesta registrazione"
+msgstr "Richiesta attivazione"
 
-#, fuzzy, c-format
-msgid "Unknow reply code when login (0x%02X)"
-msgstr "Token non valido nel codice di risposta, 0x%02X"
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "Codice di risposta sconosciuto durante il login (0x%02X)"
 
-#, fuzzy
-msgid "Keep alive error"
-msgstr "Errore nell'aggiunta del contatto"
+msgid "Requesting captcha"
+msgstr "Richiesta del codice captcha in corso"
 
-#, fuzzy
-msgid "Requesting captcha ..."
-msgstr "Richiedi l'attenzione di %s..."
+msgid "Checking captcha"
+msgstr "Verifica del codice captcha in corso"
 
-msgid "Checking code of captcha ..."
-msgstr ""
+msgid "Failed captcha verification"
+msgstr "Verifica del codice captcha fallita"
 
-msgid "Failed captcha verify"
-msgstr ""
-
-#, fuzzy
 msgid "Captcha Image"
-msgstr "Salva l'immagine"
+msgstr "Immagine Captcha"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "Inserisci la password"
+msgstr "Inserisci il codice"
 
-msgid "QQ Captcha Verifing"
-msgstr ""
+msgid "QQ Captcha Verification"
+msgstr "Verifica captcha di QQ"
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "Inserisci il nome del gruppo"
+msgstr "Inserisci il testo che appare nell'immagine"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
-msgstr ""
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "Risposta sconosciuta durante la verifica della password (0x%02X)"
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Impossibile connettersi."
+"Codice di risposta sconosciuto durante il login (0x%02X):\n"
+"%s"
 
 msgid "Socket error"
 msgstr "Errore socket"
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"Connessione persa col server:\n"
-"%d, %s"
-
-msgid "Unable to read from socket"
-msgstr "Impossibile leggere dal socket"
+msgid "Getting server"
+msgstr "Ricezione server in corso"
 
-msgid "Write Error"
-msgstr "Errore di scrittura"
+msgid "Requesting token"
+msgstr "Richiesta del token in corso"
 
-msgid "Connection lost"
-msgstr "Connessione persa"
-
-#, fuzzy
-msgid "Get server ..."
-msgstr "Imposta le informazioni utente..."
-
-#, fuzzy
-msgid "Request token"
-msgstr "Richiesta rifiutata"
-
-msgid "Couldn't resolve host"
-msgstr "Impossibile risolvere l'host"
+msgid "Unable to resolve hostname"
+msgstr "Impossibile risolvere il nome dell'host"
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "Errore non valido"
+msgstr "Server o porta non validi"
 
-#, fuzzy
-msgid "Connecting server ..."
-msgstr "Server di connessione"
+msgid "Connecting to server"
+msgstr "Connessione al server in corso"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "Errore QQid"
-
-msgid "Failed to send IM."
-msgstr "Impossibile inviare il messaggio immediato"
+msgstr "Errore di QQ"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Server relay ICQ"
+msgstr ""
+"News dal server:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
+msgid "%s:%s"
+msgstr "%s: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "From %s:"
-msgstr "Da"
+msgstr "Da %s:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Istruzioni per il server: %s"
-
-msgid "Unknow SERVER CMD"
 msgstr ""
+"Avviso del server da %s: \n"
+"%s"
+
+msgid "Unknown SERVER CMD"
+msgstr "Comando SERVER sconosciuto"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
-"Risposta %s(0x%02X )\n"
-"Inviato %s(0x%02X )\n"
-"Id della stanza %d, risposta [0x%02X]: \n"
-"%s"
+"Risposta di errore di %s(0x%02X)\n"
+"Stanza %u, risposta 0x%02X"
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "Comando"
+msgstr "Comando Qun QQ"
 
-#, fuzzy, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr "Non sei un membro del gruppo \"%s\"\n"
-
-msgid "Can not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Impossibile decrittare la risposta al login"
 
-#, fuzzy
-msgid "Unknow LOGIN CMD"
-msgstr "Motivo sconosciuto"
+msgid "Unknown LOGIN CMD"
+msgstr "Comando LOGIN sconosciuto"
 
-#, fuzzy
-msgid "Unknow CLIENT CMD"
-msgstr "Motivo sconosciuto"
+msgid "Unknown CLIENT CMD"
+msgstr "Comando CLIENT sconosciuto"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -7940,9 +7950,6 @@ msgstr "File inviato"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ha annullato il trasferimento di %s"
 
-msgid "Connection closed (writing)"
-msgstr "Connessione chiusa (scrittura in corso)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titolo del gruppo:</b> %s<br>"
@@ -7997,17 +8004,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Annuncio dell'amministratore Sametime"
 
-msgid "Connection reset"
-msgstr "Connessione reimpostata"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Errore di lettura dal socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Impossibile connettersi all'host"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Annuncio da %s"
@@ -8030,6 +8026,9 @@ msgstr "Altoparlanti"
 msgid "Video Camera"
 msgstr "Video camera"
 
+msgid "File Transfer"
+msgstr "Trasferimento file"
+
 msgid "Supports"
 msgstr "Supporta"
 
@@ -8650,9 +8649,8 @@ msgstr "Entra nel gruppo privato"
 msgid "Cannot join private group"
 msgstr "Impossibile entrare nel gruppo privato"
 
-#, fuzzy
 msgid "Call Command"
-msgstr "Impossibile richiamare il comando"
+msgstr "Comando per la chiamata"
 
 msgid "Cannot call command"
 msgstr "Impossibile richiamare il comando"
@@ -8752,9 +8750,6 @@ msgstr "Organizzazione"
 msgid "Unit"
 msgstr "Unità"
 
-msgid "Note"
-msgstr "Note"
-
 msgid "Join Chat"
 msgstr "Entra in chat"
 
@@ -8854,6 +8849,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistiche sulla rete"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping non riuscito"
 
@@ -8864,11 +8862,10 @@ msgid "Could not kill user"
 msgstr "Impossibile uccidere (kill) l'utente"
 
 msgid "WATCH"
-msgstr ""
+msgstr "GUARDA"
 
-#, fuzzy
 msgid "Cannot watch user"
-msgstr "Impossibile ottenere le informazioni sull'utente"
+msgstr "Impossibile osservare l'utente"
 
 msgid "Resuming session"
 msgstr "Ripristino della sessione in corso"
@@ -8918,7 +8915,7 @@ msgstr "Tipo di chiave pubblica non supportato"
 msgid "Disconnected by server"
 msgstr "Disconnesso dal server"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Errore nella connessione al server SILC"
 
 msgid "Key Exchange failed"
@@ -8930,16 +8927,10 @@ msgstr ""
 "Ripristino della sessione distaccata non riuscito. Fai clic su \"Connetti di "
 "nuovo\" per creare una nuova connessione."
 
-msgid "Connection failed"
-msgstr "Connessione fallita"
-
 msgid "Performing key exchange"
 msgstr "Scambio delle chiavi in corso"
 
-msgid "Unable to create connection"
-msgstr "Impossibile creare la connessione"
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Impossibile caricare la coppia di chiavi SILC"
 
 #. Progress
@@ -8949,7 +8940,7 @@ msgstr "Connessione al server SILC in corso"
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Impossibile inizializzare il protocollo SILC"
 
 msgid "Error loading SILC key pair"
@@ -9229,7 +9220,7 @@ msgid "HMAC"
 msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "Usa PFS (Perfect Forward Secrecy)"
 
 msgid "Public key authentication"
 msgstr "Autenticazione con chiave pubblica"
@@ -9249,8 +9240,8 @@ msgstr "Firma digitalmente e verifica tutti i messaggi"
 msgid "Creating SILC key pair..."
 msgstr "Creazione della coppia di chiavi SILC in corso..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Impossibile creare la coppia di chiavi SILC\n"
+msgid "Unable to create SILC key pair"
+msgstr "Impossibile creare la coppia di chiavi SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9345,6 +9336,9 @@ msgstr "Lavagna"
 msgid "No server statistics available"
 msgstr "Statistiche sul server non disponibili"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Errore nella connessione al server SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Non riuscito: Versioni non coincidenti. Aggiorna il tuo client"
@@ -9387,35 +9381,31 @@ msgstr "Non riuscito: Cookie non valido"
 msgid "Failure: Authentication failed"
 msgstr "Non riuscito: Autenticazione fallita"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "Impossibile inizializzare la connessione client SILC"
 
-#, fuzzy
 msgid "John Noname"
-msgstr "Nessun nome"
+msgstr "Giovanni Senzanome"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Impossibile caricare la coppia di chiavi SILC: %s"
 
-msgid "Could not write"
-msgstr "Impossibile scrivere"
-
-msgid "Could not connect"
-msgstr "Impossibile connettersi"
+msgid "Unable to create connection"
+msgstr "Impossibile creare la connessione"
 
-msgid "Unknown server response."
-msgstr "Risposta sconosciuta dal server."
+msgid "Unknown server response"
+msgstr "Risposta sconosciuta da parte del server"
 
-msgid "Could not create listen socket"
+msgid "Unable to create listen socket"
 msgstr "Impossibile creare il socket in ascolto"
 
-msgid "Could not resolve hostname"
-msgstr "Impossibile risolvere il nome dell'host"
-
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "I nomi utente SIP non devono contenere spazi bianchi o simboli @"
 
+msgid "SIP connect server not specified"
+msgstr "Server di connessione SIP non specificato"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9451,181 +9441,61 @@ msgstr "Utente Auth"
 msgid "Auth Domain"
 msgstr "Dominio Auth"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Ricerca di %s in corso"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Connessione a %s fallita"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Connessione a: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Impossibile scrivere il file %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Impossibile leggere il file %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Messaggio troppo lungo. Troncati gli ultimi %s byte."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s non è attualmente connesso."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Richiamo a %s non consentito."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Un messaggio è stato rifiutato. Stai superando il limite di velocità del "
-"server."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "La chat in %s non è disponibile."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Stai inviando troppo velocemente messaggi a %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Non hai ricevuto un messaggio da %s poiché era troppo grande."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Non hai ricevuto un messaggio da %s poiché è stato spedito troppo "
-"velocemente."
-
-#, c-format
-msgid "Failure."
-msgstr "Fallimento."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Troppe corrispondenze."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Servono più qualificatori."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Servizio di directory temporaneamente non disponibile."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Ricerca email limitata."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Parola chiave ignorata."
-
-#, c-format
-msgid "No keywords."
-msgstr "Nessuna parola chiave."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Non c'è nessuna informazione sull'utente nella directory."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Paese non supportato."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Errore sconosciuto: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Nome utente o password non corretti."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Il servizio è temporaneamente non disponibile."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-"Il tuo livello di richiamo è attualmente troppo alto per poterti connettere."
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
-"Ti sei connesso e disconnesso troppo frequentemente. Attendi 10 minuti e "
-"riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
+"join &lt;stanza&gt;: Entra in una stanza di discussione sul network Yahoo"
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Si è verificato un errore sconosciuto di connessione: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Si è verificato un errore sconosciuto, %d. Info: %s"
-
-msgid "Invalid Groupname"
-msgstr "Nome gruppo non valido"
-
-msgid "Connection Closed"
-msgstr "Connessione chiusa"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Elenca le stanze presenti sul network Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "In attesa di risposta..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Richiedi all'utente di avviare una sessione di scarabocchi"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC è ritornato dalla pausa. Puoi nuovamente inviare messaggi."
+msgid "Yahoo ID..."
+msgstr "ID Yahoo..."
 
-msgid "Password Change Successful"
-msgstr "Password modificata con successo"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Plugin per il protocollo Yahoo!"
 
-msgid "_Group:"
-msgstr "_Gruppo:"
+msgid "Pager server"
+msgstr "Sever pager"
 
-msgid "Get Dir Info"
-msgstr "Ottieni informazioni dalla Directory"
+msgid "Pager port"
+msgstr "Porta Yahoo Pager"
 
-msgid "Set Dir Info"
-msgstr "Imposta le informazioni sulla Directory"
+msgid "File transfer server"
+msgstr "Server per il trasferimento file"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Impossibile aprire %s in scrittura!"
+msgid "File transfer port"
+msgstr "Porta trasferimento file"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Trasferimento file fallito: probabilmente è stato annullato dall'altra parte."
+msgid "Chat room locale"
+msgstr "Lingua della stanza di discussione"
 
-msgid "Could not connect for transfer."
-msgstr "Impossibile connettersi per il trasferimento."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignora gli inviti a conferenze e a stanze di discussione"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Impossibile scrivere l'header del file. Il file non verrà inviato."
+msgid "Chat room list URL"
+msgstr "URL della lista delle stanze di discussione"
 
-msgid "Save As..."
-msgstr "Salva con nome..."
+msgid "Yahoo Chat server"
+msgstr "Server Yahoo Chat"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
-msgstr[1] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Porta Yahoo Chat"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s chiede che tu gli invii un file"
+msgid "Yahoo JAPAN ID..."
+msgstr "ID Yahoo Giappone..."
 
 #. *< type
 #. *< ui_requirement
@@ -9637,14 +9507,11 @@ msgstr "%s chiede che tu gli invii un file"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Plugin per il protocollo TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Plugin per il protocollo Yahoo! Giappone"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non è "
-"ancora supportata."
+msgid "Your SMS was not delivered"
+msgstr "Il tuo SMS non è stato consegnato"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Il tuo messaggio di Yahoo! non è stato inviato."
@@ -9670,6 +9537,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Aggiungi un contatto rifiutato"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Ricevuti dati non validi"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Account bloccato: troppi tentativi di accesso falliti. Il problema potrebbe "
+"essere risolto effettuando l'accesso dal sito web di Yahoo!."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Account bloccato: motivo sconosciuto. Il problema potrebbe essere risolto "
+"effettuando l'accesso dal sito web di Yahoo!."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Non è stata specificata la password o il nome utente"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9706,39 +9597,28 @@ msgstr ""
 "effettuando il login sul sito web di Yahoo!."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossibile aggiungere il contatto %s al gruppo %s alla lista del server per "
 "l'account %s."
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "Impossibile aggiungere il contatto alla lista del server"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
+msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
-
-msgid "Connection problem"
-msgstr "Problema di connessione"
+msgid "Received unexpected HTTP response from server"
+msgstr "È stata ricevuta una risposta HTTP inattesa da parte del server"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Connessione persa con %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Connessione persa con %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Impossibile stabilire una connessione con %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Impossibile stabilire una connessione con %s: %s"
 
 msgid "Not at Home"
 msgstr "Non a casa"
@@ -9782,12 +9662,11 @@ msgstr "Inizia una conferenza"
 msgid "Presence Settings"
 msgstr "Impostazioni di presenza"
 
-#, fuzzy
 msgid "Start Doodling"
-msgstr "_Prima porta:"
+msgstr "Inizia a scarabocchiare"
 
-msgid "Activate which ID?"
-msgstr "Quale ID vuoi attivare?"
+msgid "Select the ID you want to activate"
+msgstr "Scegli l'ID che vuoi attivare"
 
 msgid "Join whom in chat?"
 msgstr "A chi vuoi unirti nella chat?"
@@ -9801,74 +9680,14 @@ msgstr "Unisciti ad un utente in chat..."
 msgid "Open Inbox"
 msgstr "Apri posta in arrivo"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;stanza&gt;: Entra in una chat room sul network Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Elenca le stanze presenti sul network Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ID Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Plugin per il protocollo Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Giappone"
-
-msgid "Pager server"
-msgstr "Sever pager"
-
-msgid "Japan Pager server"
-msgstr "Server pager (Giappone)"
-
-msgid "Pager port"
-msgstr "Porta Yahoo Pager"
-
-msgid "File transfer server"
-msgstr "Server per il trasferimento file"
-
-msgid "Japan file transfer server"
-msgstr "Server per il trasferimento file (Giappone)"
-
-msgid "File transfer port"
-msgstr "Porta trasferimento file"
-
-msgid "Chat room locale"
-msgstr "Lingua della chat room"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignora gli inviti a conferenze e a chat room"
-
-msgid "Chat room list URL"
-msgstr "URL della lista delle chat room"
-
-msgid "Yahoo Chat server"
-msgstr "Server Yahoo Chat"
-
-msgid "Yahoo Chat port"
-msgstr "Porta Yahoo Chat"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#, fuzzy
 msgid "Sent Doodle request."
-msgstr "Richiedi nuovamente l'autorizzazione"
+msgstr "Invia una richiesta per una sessione di scarabocchi"
+
+msgid "Unable to connect."
+msgstr "Impossibile connettersi."
 
 msgid "Unable to establish file descriptor."
 msgstr "Impossibile creare un descrittore di file."
@@ -9877,6 +9696,9 @@ msgstr "Impossibile creare un descrittore di file."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s sta cercando di inviarti un gruppo di %d file.\n"
 
+msgid "Write Error"
+msgstr "Errore di scrittura"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profilo Yahoo! Giappone"
 
@@ -9920,16 +9742,10 @@ msgstr "Link preferito 3"
 msgid "Last Update"
 msgstr "Ultimo aggiornamento"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Informazioni sull'utente %s non disponibili"
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
-"Spiacente, questo profilo sembra essere in un linguaggio non supportato al "
-"momento."
+"Questo profilo è in un linguaggio o in un formato non supportato al momento."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -9952,13 +9768,8 @@ msgid "The user's profile is empty."
 msgstr "Il profilo dell'utente è vuoto."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s ha rifiutato il tuo invito alla conferenza nella stanza \"%s\" per il "
-"seguente motivo \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Invito rifiutato"
+msgid "%s has declined to join."
+msgstr "%s ha rifiutato l'ingresso."
 
 msgid "Failed to join chat"
 msgstr "Impossibile entrare nella chat"
@@ -9980,7 +9791,7 @@ msgid ""
 "able to rejoin a chatroom"
 msgstr ""
 "Errore sconosciuto. Potrebbe essere necessario disconnettersi ed aspettare "
-"cinque minuti prima di poter entrare nuovamente nella chat room"
+"cinque minuti prima di poter entrare nuovamente in una stanza di discussione"
 
 #, c-format
 msgid "You are now chatting in %s."
@@ -10001,22 +9812,17 @@ msgstr "Voci"
 msgid "Webcams"
 msgstr "Webcam"
 
+msgid "Connection problem"
+msgstr "Problema di connessione"
+
 msgid "Unable to fetch room list."
 msgstr "Impossibile recuperare la lista delle stanze."
 
 msgid "User Rooms"
 msgstr "Stanze utente"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Problema di connessione con il server YCHT."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Connessione persa con il server\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Problema di connessione con il server YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10139,42 +9945,30 @@ msgstr "Importa da .anyone"
 msgid "Import from .zephyr.subs"
 msgstr "Importa da .zephyr.subs"
 
-#, fuzzy
 msgid "Realm"
-msgstr "Vero nome"
+msgstr "Dominio"
 
 msgid "Exposure"
 msgstr "Esposizione"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Impossibile creare il socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Impossibile interpretare la risposta dal proxy HTTP: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Impossibile interpretare la risposta dal proxy HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Errore di connessione al proxy HTTP: %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Accesso negato: il server proxy HTTP non permette il tunnelling sulla porta %"
-"d."
+"d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Errore nella risoluzione di %s"
 
-msgid "Could not resolve host name"
-msgstr "Impossibile risolvere il nome dell'host"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Richiedi l'attenzione di %s..."
@@ -10216,12 +10010,12 @@ msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"%s ha invitato %s nella chat room: %s\n"
+"%s ha invitato %s nella stanza di discussione: %s\n"
 "%s"
 
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s ha invitato %s nella chat room: %s\n"
+msgstr "%s ha invitato %s nella stanza di discussione: %s\n"
 
 msgid "Accept chat invitation?"
 msgstr "Accetti l'invito alla chat?"
@@ -10238,7 +10032,7 @@ msgid "Stored Image"
 msgstr "Immagine salvata"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "Immagine archiviata. (questo è sufficiente per ora)"
 
 msgid "SSL Connection Failed"
 msgstr "Connessione SSL fallita"
@@ -10259,10 +10053,7 @@ msgid "Do not disturb"
 msgstr "Non disturbare"
 
 msgid "Extended away"
-msgstr "Ancora assente"
-
-msgid "Mobile"
-msgstr "Cellulare"
+msgstr "Assente per molto"
 
 msgid "Listening to music"
 msgstr "Sta ascoltando musica"
@@ -10305,18 +10096,6 @@ msgstr "+++ %s è ritornato attivo"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Errore nella lettura di %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Si è verificato un errore nella lettura dei tuoi %s. Non sono stati caricati "
-"e il vecchio file è stato rinominato in %s~."
-
 msgid "Calculating..."
 msgstr "Calcolo in corso..."
 
@@ -10367,9 +10146,10 @@ msgstr "Impossibile aprire %s: redirezionato troppe volte"
 msgid "Unable to connect to %s"
 msgstr "Impossibile connettersi a %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Errore di lettura da %s: %s"
+msgstr ""
+"Errore di lettura da %s: risposta troppo lunga (il limite è di %d byte)"
 
 #, c-format
 msgid ""
@@ -10393,7 +10173,7 @@ msgstr "Impossibile connettersi a %s: %s"
 
 #, c-format
 msgid " - %s"
-msgstr ""
+msgstr "- %s"
 
 #, c-format
 msgid " (%s)"
@@ -10424,6 +10204,18 @@ msgstr "Connessione rifiutata."
 msgid "Address already in use."
 msgstr "Indirizzo già in uso."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Errore nella lettura di %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Si è verificato un errore nella lettura del tuo %s. Il file non è stato "
+"caricato e il vecchio file è stato rinominato in %s~."
+
 msgid "Internet Messenger"
 msgstr "Internet Messenger"
 
@@ -10466,10 +10258,8 @@ msgstr "Notifica i nuovi messaggi di _posta"
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizza per questo account la seguente _icona:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Opzioni %s"
+msgid "Ad_vanced"
+msgstr "A_vanzate"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Utilizza le opzioni del proxy di GNOME"
@@ -10504,9 +10294,6 @@ msgstr "Se guardi da vicino"
 msgid "you can see the butterflies mating"
 msgstr "puoi vedere le farfalle accoppiarsi"
 
-msgid "Proxy Options"
-msgstr "Opzioni del proxy"
-
 msgid "Proxy _type:"
 msgstr "_Tipo di proxy:"
 
@@ -10534,8 +10321,8 @@ msgstr "Di _base"
 msgid "Create _this new account on the server"
 msgstr "Crea _questo nuovo account sul server"
 
-msgid "_Advanced"
-msgstr "_Avanzate"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Abilitato"
@@ -10543,7 +10330,7 @@ msgstr "Abilitato"
 msgid "Protocol"
 msgstr "Protocollo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -10558,9 +10345,9 @@ msgstr ""
 "<span size='larger' weight='bold'>Benvenuto in %s!</span>\n"
 "\n"
 "Non hai nessun account configurato. Per iniziare a connetterti con %s, premi "
-"il pulsante <b>Aggiungi</b> qui sotto e configura il tuo primo account. Se "
-"vuoi che %s si connetta a diversi account di messaggistica, premi nuovamente "
-"<b>Aggiungi</b> per configurarli tutti.\n"
+"il pulsante <b>Aggiungi...</b> qui sotto e configura il tuo primo account. "
+"Se vuoi che %s si connetta a diversi account di messaggistica, premi "
+"nuovamente <b>Aggiungi...</b> per configurarli tutti.\n"
 "\n"
 "Puoi tornare a questa finestra, per aggiungere, modificare o rimuovere un "
 "account, attraverso <b>Account->Gestisci account</b> nella finestra della "
@@ -10585,8 +10372,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Aggiorna i campi necessari."
 
-msgid "Room _List"
-msgstr "_Lista delle stanze"
+msgid "A_ccount"
+msgstr "A_ccount"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10594,8 +10381,8 @@ msgid ""
 msgstr ""
 "Inserisci le informazioni appropriate per la chat nella quale vuoi entrare.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+msgid "Room _List"
+msgstr "_Lista delle stanze"
 
 msgid "_Block"
 msgstr "_Blocca"
@@ -10612,6 +10399,15 @@ msgstr "_Info"
 msgid "I_M"
 msgstr "_MI"
 
+msgid "_Audio Call"
+msgstr "Chiamata _audio"
+
+msgid "Audio/_Video Call"
+msgstr "Chiamata audio/_video"
+
+msgid "_Video Call"
+msgstr "Chiamata _video"
+
 msgid "_Send File..."
 msgstr "_Invia file..."
 
@@ -10621,8 +10417,11 @@ msgstr "Aggiungi un _allarme..."
 msgid "View _Log"
 msgstr "Mostra il _log"
 
-msgid "Hide when offline"
-msgstr "Nascondi quando non sei in linea"
+msgid "Hide When Offline"
+msgstr "Nascondi quando non è in linea"
+
+msgid "Show When Offline"
+msgstr "Mostra quando non è in linea"
 
 msgid "_Alias..."
 msgstr "_Alias..."
@@ -10679,9 +10478,8 @@ msgstr ""
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#, fuzzy
 msgid "Unknown node type"
-msgstr "tipo di compressione sconosciuto `%s'!"
+msgstr "Tipo di nodo sconosciuto"
 
 #. Buddies menu
 msgid "/_Buddies"
@@ -10749,6 +10547,9 @@ msgstr "/Strumenti/A_llarmi"
 msgid "/Tools/_Certificates"
 msgstr "/Strumenti/_Certificati"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Strumenti/Smile_y personalizzati"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Strumenti/Plu_gin"
 
@@ -10758,9 +10559,6 @@ msgstr "/Strumenti/Pr_eferenze"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Strumenti/Pr_ivacy"
 
-msgid "/Tools/Smile_y"
-msgstr "/Strumenti/Smile_y"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Strumenti/Trasferimento _file"
 
@@ -10878,8 +10676,8 @@ msgstr "Manualmente"
 msgid "By status"
 msgstr "Per stato"
 
-msgid "By log size"
-msgstr "Per dimensione del log"
+msgid "By recent log activity"
+msgstr "Per discussioni recenti"
 
 #, c-format
 msgid "%s disconnected"
@@ -10895,6 +10693,9 @@ msgstr "Riconnetti"
 msgid "Re-enable"
 msgstr "Riabilita"
 
+msgid "SSL FAQs"
+msgstr "FAQ su SSL"
+
 msgid "Welcome back!"
 msgstr "Bentornato!"
 
@@ -10966,7 +10767,7 @@ msgid "Add buddy to _group:"
 msgstr "Aggiungi un contatto al _gruppo:"
 
 msgid "This protocol does not support chat rooms."
-msgstr "Questo protocollo non supporta le chat room."
+msgstr "Questo protocollo non supporta le stanze di discussione."
 
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
@@ -10984,12 +10785,14 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Gruppo:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Entra _automaticamente quando l'account si connette."
 
-#, fuzzy
 msgid "_Remain in chat after window is closed."
-msgstr "_Nascondi la chat quando la finestra è chiusa."
+msgstr "_Resta in chat alla chiusura della finestra."
 
 msgid "Please enter the name of the group to be added."
 msgstr "Inserisci il nome del gruppo da aggiungere."
@@ -11018,6 +10821,103 @@ msgstr "/Strumenti"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contatti/Ordina contatti"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Colore dello sfondo"
+
+msgid "The background color for the buddy list"
+msgstr "Il colore di sfondo per la lista contatti"
+
+msgid "Layout"
+msgstr "Layout"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Il layout di icone, nome e stato della lista contatti"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Colore di sfondo per i gruppi massimizzati"
+
+msgid "The background color of an expanded group"
+msgstr "Il colore di sfondo per un gruppo massimizzato"
+
+msgid "Expanded Text"
+msgstr "Testo per i gruppi massimizzati"
+
+msgid "The text information for when a group is expanded"
+msgstr "L'informazione testuale per un gruppo massimizzato"
+
+msgid "Collapsed Background Color"
+msgstr "Colore di sfondo per i gruppi minimizzati"
+
+msgid "The background color of a collapsed group"
+msgstr "Il colore di sfondo per un gruppo minimizzato"
+
+msgid "Collapsed Text"
+msgstr "Testo per i gruppi minimizzati"
+
+msgid "The text information for when a group is collapsed"
+msgstr "L'informazione testuale per un gruppo minimizzato"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Colore di sfondo per contatti/chat"
+
+msgid "The background color of a contact or chat"
+msgstr "Il colore di sfondo per un contatto o una chat"
+
+msgid "Contact Text"
+msgstr "Testo per i contatti"
+
+msgid "The text information for when a contact is expanded"
+msgstr "L'informazione testuale quando un contatto è massimizzato"
+
+msgid "On-line Text"
+msgstr "Testo per i contatti in linea"
+
+msgid "The text information for when a buddy is online"
+msgstr "L'informazione testuale quando un contatto è in linea"
+
+msgid "Away Text"
+msgstr "Testo per i contatti assenti"
+
+msgid "The text information for when a buddy is away"
+msgstr "L'informazione testuale quando un contatto è assente"
+
+msgid "Off-line Text"
+msgstr "Testo per i contatti non in linea"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "L'informazione testuale quando un contatto non è in linea"
+
+msgid "Idle Text"
+msgstr "Testo per i contatti inattivi"
+
+msgid "The text information for when a buddy is idle"
+msgstr "L'informazione testuale quando un contatto è inattivo"
+
+msgid "Message Text"
+msgstr "Testo per i messaggi non letti"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "L'informazione testuale quando un contatto ha un messaggio non letto"
+
+msgid "Message (Nick Said) Text"
+msgstr "Testo per i messaggi con nick"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"L'informazione testuale quando una chat ha un messaggio non letto dove è "
+"citato il tuo nickname"
+
+msgid "The text information for a buddy's status"
+msgstr "L'informazione testuale sullo stato di un contatto"
+
+msgid "Type the host name for this certificate."
+msgstr "Immetti il nome dell'host al quale è associato questo certificato."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Server SSL"
@@ -11036,15 +10936,7 @@ msgstr ""
 "contatto."
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "Invita un contatto nella chat room"
-
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Inserisci il nome del contatto che vuoi invitare, insieme a un messaggio di "
-"invito (opzionale)."
+msgstr "Invita un contatto nella stanza di discussione"
 
 msgid "_Buddy:"
 msgstr "_Contatto:"
@@ -11074,8 +10966,8 @@ msgstr "Ignora"
 msgid "Get Away Message"
 msgstr "Ottieni messaggio di assenza"
 
-msgid "Last said"
-msgstr "Ultimo messaggio"
+msgid "Last Said"
+msgstr "Ultime parole"
 
 msgid "Unable to save icon file to disk."
 msgstr "Impossibile salvare il file dell'icona sul disco."
@@ -11120,6 +11012,18 @@ msgstr "/Conversazione/_Salva con nome..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversazione/Rimuovi lo _storico"
 
+msgid "/Conversation/M_edia"
+msgstr "/Conversazione/M_edia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversazione/Media/Chiamata _audio"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversazione/Media/Chiamata _video"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversazione/Media/_Chiamata audio\\/video"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversazione/_Invia file..."
 
@@ -11192,6 +11096,15 @@ msgstr "/Conversazione"
 msgid "/Conversation/View Log"
 msgstr "/Conversazione/Mostra il log"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversazione/Media/Chiamata audio"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversazione/Media/Chiamata video"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversazione/Media/Chiamata audio\\/video"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversazione/Invia file..."
 
@@ -11271,9 +11184,8 @@ msgstr "Sta scrivendo"
 msgid "Stopped Typing"
 msgstr "Ha smesso di scrivere"
 
-#, fuzzy
 msgid "Nick Said"
-msgstr "%s ha pronunciato il tuo nick in %s"
+msgstr "È stato pronunciato il tuo nickname"
 
 msgid "Unread Messages"
 msgstr "Messaggi non letti"
@@ -11366,22 +11278,23 @@ msgid "Fatal Error"
 msgstr "Errore fatale"
 
 msgid "bug master"
-msgstr ""
+msgstr "signore dei bug"
 
-#, fuzzy
 msgid "artist"
-msgstr "Artista"
+msgstr "artista"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "voce e video"
+
 msgid "support"
 msgstr "supporto"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "sviluppatore e webmaster"
+msgstr "webmaster"
 
 msgid "Senior Contributor/QA"
 msgstr "Collaboratore senior/QA"
@@ -11403,7 +11316,7 @@ msgid "support/QA"
 msgstr "supporto/QA"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "autore originale"
@@ -11480,9 +11393,8 @@ msgstr "Finlandese"
 msgid "French"
 msgstr "Francese"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Curdo"
+msgstr "Irlandese"
 
 msgid "Galician"
 msgstr "Galiziano"
@@ -11502,6 +11414,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Ungherese"
 
+msgid "Armenian"
+msgstr "Armeno"
+
 msgid "Indonesian"
 msgstr "Indonesiano"
 
@@ -11517,6 +11432,9 @@ msgstr "Georgiano"
 msgid "Ubuntu Georgian Translators"
 msgstr "Traduttori georgiani di Ubuntu"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11538,6 +11456,9 @@ msgstr "Lituano"
 msgid "Macedonian"
 msgstr "Macedone"
 
+msgid "Mongolian"
+msgstr "Mongolo"
+
 msgid "Bokmål Norwegian"
 msgstr "Norvegese Bokmål"
 
@@ -11592,6 +11513,9 @@ msgstr "Singalese"
 msgid "Swedish"
 msgstr "Svedese"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11652,8 +11576,30 @@ msgstr ""
 "programma è fornito senza nessuna garanzia.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin su irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">Help via email:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">Canale IRC:</FONT> #pidgin su irc.freenode.net<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr "<FONT SIZE=\"4\">MUC XMPP:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Sviluppatori attuali"
@@ -11685,13 +11631,12 @@ msgstr "_Account"
 msgid "Get User Info"
 msgstr "Informazioni sull'utente"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Inserisci il nome utente o l'alias della persona della quale vuoi "
-"informazioni."
+"Inserisci il nome utente o l'alias della persona della quale desideri "
+"ricevere informazioni."
 
 msgid "View User Log"
 msgstr "Mostra il log dell'utente"
@@ -11880,14 +11825,6 @@ msgstr "_Pulisci i trasferimenti ultimati"
 msgid "File transfer _details"
 msgstr "_Dettagli trasferimento file"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Pausa"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Riprendi"
-
 msgid "Paste as Plain _Text"
 msgstr "Incolla come _testo semplice"
 
@@ -11898,43 +11835,37 @@ msgid "Disable _smileys in selected text"
 msgstr "Disabilita gli _smileys nel testo selezionato"
 
 msgid "Hyperlink color"
-msgstr "Colore dei collegamenti"
+msgstr "Colore per i collegamenti"
 
 msgid "Color to draw hyperlinks."
-msgstr "Colore per disegnare i collegamenti."
+msgstr "Colore per indicare i collegamenti."
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "Colore dei collegamenti"
+msgstr "Colore per i collegamenti visitati"
 
-#, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
-msgstr "Colore per i collegamenti al passaggio del mouse."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr "Colore per i collegamenti visitati (o attivi)."
 
-#, fuzzy
 msgid "Hyperlink prelight color"
-msgstr "Inserire un codice colore"
+msgstr "Colore per i collegamenti al passaggio del mouse"
 
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Colore per i collegamenti al passaggio del mouse."
 
-#, fuzzy
 msgid "Sent Message Name Color"
-msgstr "%s ti ha inviato un messaggio. (%s)"
+msgstr "Colore per il nome dei messaggi inviati"
 
 msgid "Color to draw the name of a message you sent."
 msgstr "Colore per il nome in un messaggio che hai inviato."
 
-#, fuzzy
 msgid "Received Message Name Color"
-msgstr "Il messaggio ricevuto inizia la conversazione"
+msgstr "Colore per il nome dei messaggi ricevuti"
 
 msgid "Color to draw the name of a message you received."
 msgstr "Colore per il nome in un messaggio che hai ricevuto."
 
-#, fuzzy
 msgid "\"Attention\" Name Color"
-msgstr "Inserire un codice colore"
+msgstr ""
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
@@ -11950,15 +11881,20 @@ msgstr "Colore per il nome di un messaggio di azione."
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
-#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
-msgstr "%s ti ha inviato un messaggio. (%s)"
+msgstr ""
+
+msgid "Color to draw the name of a whispered message."
+msgstr ""
 
 msgid "Typing notification color"
 msgstr "Colore per la notifica di scrittura"
 
-msgid "The color to use for the typing notification font"
-msgstr "Il colore da usare per il carattere della notifica di scrittura"
+msgid "The color to use for the typing notification"
+msgstr "Il colore da usare per la notifica di scrittura"
 
 msgid "Typing notification font"
 msgstr "Carattere per la notifica di scrittura"
@@ -11969,15 +11905,6 @@ msgstr "Il carattere da usare per la notifica di scrittura"
 msgid "Enable typing notification"
 msgstr "Abilita la notifica di scrittura"
 
-msgid "_Copy Email Address"
-msgstr "_Copia l'indirizzo email"
-
-msgid "_Open Link in Browser"
-msgstr "_Apri il collegamento nel browser"
-
-msgid "_Copy Link Location"
-msgstr "_Copia l'indirizzo del collegamento"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12020,11 +11947,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Salva l'immagine"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Salva l'immagine..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Aggiungi uno smiley personalizzato..."
 
@@ -12114,9 +12039,6 @@ msgstr "Diminuisci la dimensione del carattere"
 msgid "Font Face"
 msgstr "Tipo di carattere"
 
-msgid "Background Color"
-msgstr "Colore dello sfondo"
-
 msgid "Foreground Color"
 msgstr "Colore del carattere"
 
@@ -12231,6 +12153,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12245,6 +12168,8 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    usa DIR per i file di configurazione\n"
 "  -d, --debug         stampa messaggi di debug sullo standard output\n"
+"  -f, --force-online  forza la connessione, qualunque sia lo stato della "
+"rete\n"
 "  -h, --help          mostra questo aiuto ed esce\n"
 "  -m, --multiple      non assicurare una singola istanza\n"
 "  -n, --nologin       non effettuare il login\n"
@@ -12261,6 +12186,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12274,6 +12200,8 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    usa DIR per i file di configurazione\n"
 "  -d, --debug         stampa messaggi di debug sullo standard output\n"
+"  -f, --force-online  forza la connessione, qualunque sia lo stato della "
+"rete\n"
 "  -h, --help          mostra questo aiuto ed esce\n"
 "  -m, --multiple      non assicurare una singola istanza\n"
 "  -n, --nologin       non effettuare il login\n"
@@ -12283,7 +12211,7 @@ msgstr ""
 "  --display=DISPLAY   display X da utilizzare\n"
 "  -v, --version       mostra la versione attuale ed esce\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
@@ -12309,22 +12237,32 @@ msgstr ""
 "al momento del crash ed allega il backtrace del file core.\n"
 "Se non sai come ottenere il backtrace, puoi trovare le istruzioni su\n"
 "%swiki/GetABacktrace\n"
-"\n"
-"Se hai bisogno di ulteriore assistenza, invia un messaggio\n"
-"a SeanEgn o a LSchiere (via AIM). Informazioni su come contattare\n"
-"Sean o Luke su altri protocolli sono disponibili su\n"
-"%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Apri tutti i messaggi"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "Uscita in corso, poiché è in esecuzione un altro client libpurple.\n"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>"
+msgid "/_Media"
+msgstr "/_Media"
+
+msgid "/Media/_Hangup"
+msgstr "/Media/_Riaggancia"
+
+msgid "Calling..."
+msgstr "Chiamata in corso..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s vuole avviare una sessione audio/video con te."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s vuole avviare una sessione video con te."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12355,6 +12293,24 @@ msgstr ""
 "È stato scelto di impostare il browser manualmente, ma non è stato immesso "
 "nessun comando."
 
+msgid "No message"
+msgstr "Nessun messaggio"
+
+msgid "Open All Messages"
+msgstr "Apri tutti i messaggi"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>"
+
+msgid "New Pounces"
+msgstr "Nuovi allarmi"
+
+msgid "Dismiss"
+msgstr "Chiudi"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Hai degli avvisi!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "I seguenti plugin saranno rimossi."
 
@@ -12403,10 +12359,16 @@ msgstr "<b>Dettagli sul plugin</b>"
 msgid "Select a file"
 msgstr "Scegli un file"
 
+msgid "Modify Buddy Pounce"
+msgstr "Modifica l'allarme"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Contatto da controllare"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "Nome del _contatto:"
 
@@ -12473,8 +12435,58 @@ msgstr "_Ricorrente"
 msgid "Pounce Target"
 msgstr "Contatto da controllare"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Impossibile spacchettare il tema degli smiley."
+#, c-format
+msgid "Started typing"
+msgstr "Ha iniziato a scrivere"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Si è fermato mentre scriveva"
+
+#, c-format
+msgid "Signed on"
+msgstr "Si è connesso"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "È tornato attivo"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "È tornato dall'assenza"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Ha smesso di scrivere"
+
+#, c-format
+msgid "Signed off"
+msgstr "Si è disconnesso"
+
+#, c-format
+msgid "Became idle"
+msgstr "È diventato inattivo"
+
+#, c-format
+msgid "Went away"
+msgstr "È andato via"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Ha inviato un messaggio"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Sconosciuto... Per piacere riporta questo errore!"
+
+msgid "Theme failed to unpack."
+msgstr "Impossibile spacchettare il tema."
+
+msgid "Theme failed to load."
+msgstr "Impossibile caricare il tema."
+
+msgid "Theme failed to copy."
+msgstr "Impossibile copiare il tema."
 
 msgid "Install Theme"
 msgstr "Installa tema"
@@ -12495,6 +12507,11 @@ msgstr "Scorciatoie da tastiera"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Ch_iudi le conversazioni con il tasto Esc"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Tema per la lista contatti"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Icona di notifica"
 
@@ -12504,8 +12521,8 @@ msgstr "_Mostra l'icona di notifica:"
 msgid "On unread messages"
 msgstr "Se ci sono messaggi non letti"
 
-msgid "Conversation Window Hiding"
-msgstr "Finestre di conversazione nascoste"
+msgid "Conversation Window"
+msgstr "Finestra di conversazione"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Nascondi le nuove conversazioni:"
@@ -12513,6 +12530,9 @@ msgstr "_Nascondi le nuove conversazioni:"
 msgid "When away"
 msgstr "Se assente"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zza le nuove finestre di conversazione"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Schede"
@@ -12551,7 +12571,7 @@ msgid "Show _formatting on incoming messages"
 msgstr "Mostra la _formattazione per i messaggi in entrata"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr "Chiudi istantaneamente i messaggi immediati alla chiusura della scheda"
+msgstr "Chiudi subito i messaggi immediati alla chiusura della scheda"
 
 msgid "Show _detailed information"
 msgstr "Mostra informazioni _dettagliate"
@@ -12571,9 +12591,6 @@ msgstr "Usa scrolling fluido"
 msgid "F_lash window when IMs are received"
 msgstr "_Illumina la finestra quando arriva un messaggio"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zza le nuove finestre di conversazione"
-
 msgid "Minimum input area height in lines:"
 msgstr "Altezza minima in linee della casella di testo:"
 
@@ -12605,14 +12622,12 @@ msgstr "Impossibile avviare il programma per la configurazione del proxy."
 msgid "Cannot start browser configuration program."
 msgstr "Impossibile avviare il programma di configurazione del browser."
 
-msgid "ST_UN server:"
-msgstr "Server ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esempio: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "Rileva _automaticamente l'indirizzo IP"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Usa l'indirizzo IP rilevato _automaticamente: %s"
 
 msgid "Public _IP:"
 msgstr "_IP pubblico:"
@@ -12633,6 +12648,10 @@ msgstr "_Prima porta:"
 msgid "_End port:"
 msgstr "_Ultima porta:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Server di relay (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Server proxy &amp; Browser"
 
@@ -12663,6 +12682,10 @@ msgstr "Server proxy"
 msgid "No proxy"
 msgstr "Nessun proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr "Usa un DNS remoto con proxy SOCKS4"
+
 msgid "_User:"
 msgstr "_Utente:"
 
@@ -12784,7 +12807,6 @@ msgstr ""
 "C_omando da eseguire:\n"
 "(%s per il nome del file)"
 
-#, fuzzy
 msgid "M_ute sounds"
 msgstr "Nessun _suono"
 
@@ -12792,13 +12814,11 @@ msgid "Sounds when conversation has _focus"
 msgstr ""
 "Riproduci i suoni quando la finestra di conversazione va in _primo piano"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "Abilita i suoni:"
+msgstr "_Abilita i suoni:"
 
-#, fuzzy
 msgid "V_olume:"
-msgstr "Volume:"
+msgstr "V_olume:"
 
 msgid "Play"
 msgstr "Riproduci"
@@ -12825,12 +12845,12 @@ msgstr "Se assente e inattivo"
 msgid "Auto-away"
 msgstr "Assente automatico"
 
-msgid "Change status when _idle"
-msgstr "Modifica lo stato quando sei _inattivo"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuti prima di diventare inattivo:"
 
+msgid "Change status when _idle"
+msgstr "Modifica lo stato quando sei _inattivo"
+
 msgid "Change _status to:"
 msgstr "Cambia lo _stato in:"
 
@@ -12978,54 +12998,49 @@ msgstr "Sa_lva e utilizza"
 msgid "Status for %s"
 msgstr "Stato per %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Esiste già uno smiley personalizzato per '%s'. Specifica una scorciatoia "
+"differente."
+
 msgid "Custom Smiley"
 msgstr "Smiley personalizzato"
 
-msgid "More Data needed"
-msgstr "C'è bisogno di più dati"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Scegli una scorciatoia da tastiera da associare con lo smiley."
-
 msgid "Duplicate Shortcut"
 msgstr "Scorciatoia già esistente"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Esiste già uno smiley personalizzato per la scorciatoia da tastiera "
-"selezionata. Specifica una scorciatoia differente."
-
-msgid "Please select an image for the smiley."
-msgstr "Scegli un'immagine per lo smiley."
-
 msgid "Edit Smiley"
 msgstr "Modifica lo smiley"
 
 msgid "Add Smiley"
 msgstr "Aggiungi uno smiley"
 
-msgid "Smiley _Image"
-msgstr "_Immagine per lo smiley"
+msgid "_Image:"
+msgstr "_Immagine:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "S_corciatoia per lo smiley"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "Testo della scorciatoia:"
 
 msgid "Smiley"
 msgstr "Smiley"
 
+msgid "Shortcut Text"
+msgstr "Testo della scorciatoia"
+
 msgid "Custom Smiley Manager"
 msgstr "Gestione degli smiley personalizzati"
 
-#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Seleziona l'icona per il contatto"
+
 msgid "Click to change your buddyicon for this account."
-msgstr "Utilizza per questo account la seguente _icona:"
+msgstr "Fai clic per cambiare la tua icona per questo account."
 
-#, fuzzy
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Utilizza per questo account la seguente _icona:"
+msgstr "Fai clic per cambiare la tua icona per tutti gli account."
 
 msgid "Waiting for network connection"
 msgstr "In attesa della connessione di rete"
@@ -13106,8 +13121,8 @@ msgid "Cannot send launcher"
 msgstr "Impossibile inviare l'icona di avvio"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Hai trascinato un'icona di avvio. Molto probabilmente vuoi inviare ciò cui "
 "l'icona si riferisce piuttosto che l'icona stessa."
@@ -13144,9 +13159,30 @@ msgstr ""
 "Impossibile caricare l'immagine '%s' per un motivo sconosciuto. "
 "Probabilmente il file dell'immagine è danneggiato."
 
+msgid "_Open Link"
+msgstr "_Apri il collegamento"
+
+msgid "_Copy Link Location"
+msgstr "_Copia l'indirizzo del collegamento"
+
+msgid "_Copy Email Address"
+msgstr "_Copia l'indirizzo email"
+
+msgid "_Open File"
+msgstr "_Apri il file"
+
+msgid "Open _Containing Directory"
+msgstr "Apri la _cartella del file"
+
 msgid "Save File"
 msgstr "Salva il file"
 
+msgid "_Play Sound"
+msgstr "_Riproduci il suono"
+
+msgid "_Save File"
+msgstr "_Salva il file"
+
 msgid "Select color"
 msgstr "Scegli il colore"
 
@@ -13162,17 +13198,18 @@ msgstr "_Info"
 msgid "_Invite"
 msgstr "_Invita"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_Modifica"
+msgstr "_Modifica..."
 
-#, fuzzy
 msgid "_Add..."
-msgstr "_Aggiungi"
+msgstr "_Aggiungi..."
 
 msgid "_Open Mail"
 msgstr "_Leggi la Posta"
 
+msgid "_Pause"
+msgstr "_Pausa"
+
 msgid "_Edit"
 msgstr "_Modifica"
 
@@ -13191,12 +13228,11 @@ msgstr "Selezionando questo tema disabiliti gli emoticon grafici."
 msgid "none"
 msgstr "nessuno"
 
-#, fuzzy
 msgid "Small"
-msgstr "Email"
+msgstr "Piccolo"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "Versione più piccola degli smiley predefiniti"
 
 msgid "Response Probability:"
 msgstr "Probabilità di risposta:"
@@ -13237,6 +13273,66 @@ msgstr "Plugin per la predizione della disponibilità del contatto."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Mostra informazioni statistiche sulla disponibilità dei tuoi contatti"
 
+msgid "Server name request"
+msgstr "Richiesta nome server"
+
+msgid "Enter an XMPP Server"
+msgstr "Specifica un server XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Scegli un server XMPP da interrogare"
+
+msgid "Find Services"
+msgstr "Cerca servizi"
+
+msgid "Add to Buddy List"
+msgstr "Aggiungi alla lista contatti"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Directory"
+msgstr "Directory"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descrizione:</b>"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Scoperta servizi"
+
+msgid "_Browse"
+msgstr "_Sfoglia"
+
+msgid "Server does not exist"
+msgstr "Il server non esiste"
+
+msgid "Server does not support service discovery"
+msgstr "Il server non supporta la scoperta dei servizi"
+
+msgid "XMPP Service Discovery"
+msgstr "Scoperta servizi XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Permette di sfogliare e registrare i servizi."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Questo plugin è utile per registrarsi a versioni precedenti del protocollo o "
+"ad altri servizi XMPP."
+
 msgid "Buddy is idle"
 msgstr "Il contatto è inattivo"
 
@@ -13244,7 +13340,7 @@ msgid "Buddy is away"
 msgstr "Il contatto è assente"
 
 msgid "Buddy is \"extended\" away"
-msgstr "Il contatto è ancora assente"
+msgstr "Il contatto è assente per molto"
 
 #. Not used yet.
 msgid "Buddy is mobile"
@@ -13640,7 +13736,7 @@ msgstr "Messaggi musicali, per la composizione collaborativa."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Il plugin per i messaggi musicali consente ad un gruppo di utenti di "
 "lavorare simultaneamente su di un brano musicale modificando in tempo reale "
@@ -13675,9 +13771,8 @@ msgstr "Inserisci il conteggio dei nuovi messaggi nelle proprietà di _X"
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Invia il messaggio \"_URGENTE\" al window manager"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "Finestre delle _chat"
+msgstr "Fai _lampeggiare la finestra"
 
 #. Raise window method button
 msgid "R_aise conversation window"
@@ -13685,7 +13780,7 @@ msgstr "Porta la finestra di conversazione in _primo piano"
 
 #. Present conversation method button
 msgid "_Present conversation window"
-msgstr "Finestra di conversazione _attuale"
+msgstr "Mostra la _finestra di conversazione"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -13754,26 +13849,20 @@ msgstr ""
 "- Inverte il testo dei messaggi in arrivo\n"
 "- Invia un messaggio ai tuoi contatti non appena questi si connettono"
 
-msgid "Cursor Color"
-msgstr "Colore del cursore"
-
-msgid "Secondary Cursor Color"
-msgstr "Colore per il cursore secondario"
-
 msgid "Hyperlink Color"
 msgstr "Colore per i collegamenti"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "Colore per i collegamenti"
+msgstr "Colore per i collegamenti visitati"
 
-#, fuzzy
 msgid "Highlighted Message Name Color"
-msgstr "Messaggi evidenziati"
+msgstr "Colore per i messaggi evidenziati"
+
+msgid "Typing Notification Color"
+msgstr "Colore per la notifica di scrittura"
 
-#, fuzzy
 msgid "GtkTreeView Horizontal Separation"
-msgstr "Una versione a scorrimento orizzontale della lista contatti."
+msgstr "Separazione orizzontale per GtkTreeView"
 
 msgid "Conversation Entry"
 msgstr "Finestra di conversazione"
@@ -13798,39 +13887,24 @@ msgstr "Scegli il carattere per %s"
 msgid "GTK+ Interface Font"
 msgstr "Carattere per l'interfaccia GTK+"
 
-#, fuzzy
 msgid "GTK+ Text Shortcut Theme"
-msgstr "Controllo del tema GTK+"
+msgstr "Scorciatoia per il nome del tema GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Colori dell'interfaccia"
+msgid "Disable Typing Notification Text"
+msgstr "Disabilita il testo per la notifica di scrittura"
 
-msgid "Widget Sizes"
-msgstr "Dimensioni dei widget"
+msgid "GTK+ Theme Control Settings"
+msgstr "Impostazioni per il controllo del tema GTK+"
+
+msgid "Colors"
+msgstr "Colori"
 
 msgid "Fonts"
 msgstr "Caratteri"
 
+msgid "Miscellaneous"
+msgstr "Miscellanea"
+
 msgid "Gtkrc File Tools"
 msgstr "Strumenti per il file gtkrc"
 
@@ -13863,18 +13937,16 @@ msgstr ""
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "Puoi aggiornare a %s %s oggi."
 
 msgid "New Version Available"
 msgstr "Nuova versione disponibile"
 
-#, fuzzy
 msgid "Later"
-msgstr "Data"
+msgstr "Più tardi"
 
-#, fuzzy
 msgid "Download Now"
-msgstr "Scarica %s: %s"
+msgstr "Scarica adesso"
 
 #. *< type
 #. *< ui_requirement
@@ -13918,7 +13990,7 @@ msgstr "Pulsante 'Invia' per la finestra di conversazione."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Aggiunge un pulsante 'Invia' accanto alla casella di testo. Utile quando non "
 "si usa una tastiera reale."
@@ -13976,6 +14048,98 @@ msgstr ""
 "Sostituisce il testo nei messaggi in uscita secondo delle regole definite "
 "dall'utente."
 
+msgid "Just logged in"
+msgstr "Appena entrato"
+
+msgid "Just logged out"
+msgstr "Appena uscito"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Icona per il contatto/\n"
+"Icona per persone sconosciute"
+
+msgid "Icon for Chat"
+msgstr "Icona per la chat"
+
+msgid "Ignored"
+msgstr "Ignorato"
+
+msgid "Founder"
+msgstr "Fondatore"
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "Operatore"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr "Mezzo operatore"
+
+msgid "Authorization dialog"
+msgstr "Finestra di autorizzazione"
+
+msgid "Error dialog"
+msgstr "Finestra di errore"
+
+msgid "Information dialog"
+msgstr "Finestra di informazione"
+
+msgid "Mail dialog"
+msgstr "Finestra della posta"
+
+msgid "Question dialog"
+msgstr "Finestra di richiesta"
+
+msgid "Warning dialog"
+msgstr "Finestra di avviso"
+
+msgid "What kind of dialog is this?"
+msgstr "Che tipo di finestra è questa?"
+
+msgid "Status Icons"
+msgstr "Icone di stato"
+
+msgid "Chatroom Emblems"
+msgstr "Emblemi per le stanze di discussione"
+
+msgid "Dialog Icons"
+msgstr "Icone delle finestre"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Editor del tema delle icone di Pidgin"
+
+msgid "Contact"
+msgstr "Contatto"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Editor del tema della lista contatti di Pidgin"
+
+msgid "Edit Buddylist Theme"
+msgstr "Modifica il tema della lista contatti"
+
+msgid "Edit Icon Theme"
+msgstr "Modifica il tema delle icone"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Editor del tema di Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Editor del tema di Pidgin."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14138,9 +14302,6 @@ msgstr "Mantieni la finestra della lista contatti in _primo piano:"
 msgid "Only when docked"
 msgstr "Solo in modalità dock"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_Illumina la finestra quando arriva un messaggio di chat"
-
 msgid "Windows Pidgin Options"
 msgstr "Opzioni di Pidgin per Windows"
 
@@ -14148,7 +14309,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Opzioni specifiche di Pidgin per Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Fornisce opzioni specifiche per Pidgin per Windows, come la lista contatti "
 "in modalità dock."
@@ -14184,293 +14345,12 @@ msgstr "Inserisci una stanza <message/>"
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr ""
+msgstr "Invia e riceve blocchi XMPP"
 
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
 
-#~ msgid "A group with the name already exists."
-#~ msgstr "Esiste già una gruppo con questo nome."
-
-#~ msgid "Primary Information"
-#~ msgstr "Informazioni primarie"
-
-#~ msgid "Blood Type"
-#~ msgstr "Gruppo sanguigno"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "Aggiorna le mie informazioni"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Velocità:"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "I volti personalizzati non sono attualmente supportati. Scegli "
-#~ "un'immagine da %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Volto QQ non valido"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Hai rifiutato la richiesta di %d"
-
-#~ msgid "Reject request"
-#~ msgstr "Rifiuta la richiesta"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr ""
-#~ "Impossibile aggiungere il contatto attraverso la richiesta di "
-#~ "autorizzazione"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Impossibile caricare la lista contatti"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "Numero QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "Descrizione del gruppo"
-
-#~ msgid "Auth"
-#~ msgstr "Autorizzazione"
-
-#~ msgid "Approve"
-#~ msgstr "Approva"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr ""
-#~ "La tua richiesta di entrare nel gruppo %d è stata rifiutata "
-#~ "dall'amministratore %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "Tu [%d] hai lasciato il gruppo \"%d\""
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "Tu [%d] sei stato aggiunto al gruppo \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "Sono un membro"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Richiesta non valida"
-
-#~ msgid "I am the admin"
-#~ msgstr "Sono l'amministratore"
-
-#~ msgid "Unknown status"
-#~ msgstr "Stato sconosciuto"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Rimuovi il gruppo"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr ""
-#~ "Hai inserito un ID di gruppo al di fuori dell'intervallo accettabile"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Sei sicuro di voler abbandonare questo Qun?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Vuoi approvare la richiesta?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Numero di telefono"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Informazioni sul canale"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
-#~ msgid "System Message"
-#~ msgstr "Messaggio di sistema"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>Ultimo IP di login</b>: %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Ultimo orario di login</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Imposta le mie informazioni"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Abbandona questo Qun QQ"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Blocca questo utente"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "Token non valido nel codice di risposta, 0x%02X"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Errore nella modifica della password"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Impossibile connettersi al server"
-
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Connessione in corso al server %s, tentativi %d"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Vuoi approvare la richiesta?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Vuoi aggiungere questo contatto?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s ti [%s] ha aggiunto alla sua lista contatti"
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Contatto"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s vuole aggiungerti [%s] come amico"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s non è nella tua lista contatti"
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Vuoi aggiungerlo?"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Porta del server"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "La controparte si è disconnessa"
-
-#~ msgid "developer"
-#~ msgstr "sviluppatore"
-
-#~ msgid "XMPP developer"
-#~ msgstr "sviluppatore XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "Artisti"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Stai utilizzando %s, versione %s. La versione corrente è la %s. Puoi "
-#~ "scaricarla da <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Elenco delle modifiche:</b><br>%s"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "EOF durante la lettura dal processo del resolver"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Le tue informazioni sono state aggiornate"
-
-#~ msgid "Input your reason:"
-#~ msgstr "Inserisci la tua motivazione:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "Contatto rimosso con successo"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "Hai rimosso con successo te stesso dalla lista del tuo amico"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "Hai aggiunto %d alla lista contatti"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "QQid non valido"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Inserisci un ID per il gruppo esterno"
-
-#~ msgid "Reason: %s"
-#~ msgstr "Motivo: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr ""
-#~ "La tua richiesta di entrare nel gruppo %d è stata approvata "
-#~ "dall'amministratore %d"
-
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Questo gruppo è stato aggiunto alla tua lista dei contatti."
-
-#~ msgid "I am applying to join"
-#~ msgstr "Ho richiesto di entrare"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "Hai abbandonato il gruppo con successo"
-
-#, fuzzy
-#~ msgid "QQ Group Auth"
-#~ msgstr "IMAP errore di autorizzazione"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "La tua richiesta di autorizzazione è stata accettata dal server QQ"
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Inserisci la tua motivazione:"
-
-#, fuzzy
-#~ msgid " Space"
-#~ msgstr "MySpace"
-
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>Nome host reale</b>: %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Mostra le informazioni sul login"
-
-#~ msgid "resend interval(s)"
-#~ msgstr "Intervallo(i) per il reinvio"
-
-#~ msgid "hostname is NULL or port is 0"
-#~ msgstr "il nome host è NULL o la porta è 0"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "Impossibile effettuare il login. Verifica il log di debug."
-
-#~ msgid "Unable to login"
-#~ msgstr "Impossibile effettuare il login"
-
-#, fuzzy
-#~ msgid "Failed room reply"
-#~ msgstr "Impossibile rimuovere il contatto"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "L'utente %s ha rifiutato la tua richiesta"
-
-#~ msgid "User %s approved your request"
-#~ msgstr "L'utente %s ha accettato la tua richiesta"
-
-#~ msgid "Notice from: %s"
-#~ msgstr "Annuncio da: %s"
+#~ msgid ": %s"
+#~ msgstr ": %s"
diff --git a/po/ja.po b/po/ja.po
index f0be5ea3fe..4baa9d6fbf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-06-30 14:57+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -28,13 +28,13 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s (詳しい情報は `%s -h' と入力して下さい)\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -616,19 +616,6 @@ msgstr "ログの記録を停止しました。これ以降の会話はログに
 msgid "Send To"
 msgstr "送信先"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "メッセージの中に埋め込む"
-
-msgid "Invite"
-msgstr "招待する"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr "招待したい相手の名前と、オプションで招待メッセージを入力して下さい:"
-
 msgid "Conversation"
 msgstr "会話ウィンドウ"
 
@@ -890,6 +877,42 @@ msgstr "会話ウィンドウ"
 msgid "System Log"
 msgstr "システム・ログ"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "計算中..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "許可する(_A)"
+
+msgid "Reject"
+msgstr "拒否する"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "チャンネル %s%s から離脱しました"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "E-メール"
 
@@ -924,6 +947,9 @@ msgstr "続行する"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "招待する"
+
 msgid "(none)"
 msgstr "(なし)"
 
@@ -1133,7 +1159,6 @@ msgstr "%s さんが離席しました (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s さんがあなたにメッセージを送信しました (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "不明な \"つかみ\" イベントです。ぜひバグ報告して下さい！"
 
@@ -1183,7 +1208,6 @@ msgstr "状態を変更するまでの時間(分)(_M):"
 msgid "Change status to"
 msgstr "次の状態に変更する(_S):"
 
-#. Conversations
 msgid "Conversations"
 msgstr "会話ウィンドウ"
 
@@ -1519,7 +1543,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr "新しい会話を開始したら前回会話した最後のメッセージを先頭に追加します。"
 
-#, c-format
 msgid "Online"
 msgstr "オンライン"
 
@@ -1568,6 +1591,28 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Lastlog のプラグインです"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "アカウント"
 
@@ -1666,14 +1711,6 @@ msgstr "チャットへの招待を受けますか？"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "許可する(_A)"
-
-msgid "Reject"
-msgstr "拒否する"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1764,6 +1801,8 @@ msgstr "+++ %s さんがサイン・インしました"
 msgid "+++ %s signed off"
 msgstr "+++ %s さんがサイン・アウトしました"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "原因不明のエラー"
 
@@ -1810,6 +1849,16 @@ msgstr "%s さんがチャットルームから退室しました"
 msgid "%s left the room (%s)."
 msgstr "%s さんがチャットルーム (%s) から退室しました"
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "会議に招待する"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "招待したい相手の名前と、オプションで招待メッセージを入力して下さい:"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "新しい接続を開けません: %s"
@@ -1944,7 +1993,6 @@ msgstr "%s を %s から転送を開始しています"
 msgid "Transfer of file %s complete"
 msgstr "ファイル %s の転送が完了しました"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "ファイルの転送が完了しました"
 
@@ -1952,7 +2000,6 @@ msgstr "ファイルの転送が完了しました"
 msgid "You canceled the transfer of %s"
 msgstr "%s の転送をキャンセルしました"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "ファイルの転送がキャンセルされました"
 
@@ -2158,11 +2205,14 @@ msgstr "<font color=\"red\"><b>ファイルを読み込めませんでした: %s
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "接続を開始する際にエラー"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s を使用していますが、このプラグインには %s が必要です。"
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "このプラグインは ID を定義していません。"
 
@@ -2556,9 +2606,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "他の IM クライアントのログをログ・ビューアで表示します"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2615,8 +2666,9 @@ msgstr "オフライン・メッセージ"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "オフラインのユーザに送信できなかったメッセージを保存します"
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "送信できなかった残りのメッセージを保存します。\"仲間をつかむ\" ダイアログで編"
@@ -2648,6 +2700,32 @@ msgstr "オフライン時のメッセージの保存"
 msgid "Do not ask. Always save in pounce."
 msgstr "常に保存しておく"
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "パスワードの入力"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2842,11 +2920,12 @@ msgstr ""
 "い。\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "受信した IM 接続を確立できませんでした\n"
 
 msgid ""
@@ -2855,7 +2934,6 @@ msgstr ""
 "ローカルの mDNS サーバを使った接続は確立できませんでした。サーバは正しく起動"
 "されていますか？"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "名"
 
@@ -2887,6 +2965,11 @@ msgstr "Bonjour プロトコルのプラグイン"
 msgid "Purple Person"
 msgstr "Purple な人物"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "区"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2897,14 +2980,21 @@ msgstr "%s さんが会話ウインドウを閉じました"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "メッセージを送信できません (会話を開始できませんでした)"
 
-msgid "Cannot open socket"
-msgstr "ソケットを開けません"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"ソケットを生成できません:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "ポートにソケットを割り当てられませんでした"
 
-msgid "Could not listen on socket"
-msgstr "ソケットを監視できませんでした"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"ソケットを生成できません:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -2952,13 +3042,16 @@ msgstr "仲間リストの保存..."
 msgid "Load buddylist from file..."
 msgstr "仲間リストのインポート..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "登録情報の書き込みに失敗しました。"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "パスワードが一致しません。"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "新しいアカウントを登録できません。エラーが発生しました。\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2970,14 +3063,15 @@ msgstr "登録が完了しました！"
 msgid "Password"
 msgstr "パスワード"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "パスワード (確認用)"
 
-msgid "Enter current token"
-msgstr "現在のトークンを入力して下さい"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "現在のトークン"
+#, fuzzy
+msgid "Captcha"
+msgstr "画像の保存"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "新しい Gadu-Gadu アカウントの登録"
@@ -3030,6 +3124,15 @@ msgstr "パスワードの変更が完了しました！"
 msgid "Current password"
 msgstr "現在のパスワード"
 
+msgid "Password (retype)"
+msgstr "パスワード (確認用)"
+
+msgid "Enter current token"
+msgstr "現在のトークンを入力して下さい"
+
+msgid "Current token"
+msgstr "現在のトークン"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "現在使用しているパスワードと UIN の新しいパスワードを入力して下さい:"
 
@@ -3043,13 +3146,13 @@ msgstr "チャットの選択: %s"
 msgid "Add to chat..."
 msgstr "チャットの追加..."
 
+#. Global
 msgid "Available"
 msgstr "在席しています"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "離席中"
 
@@ -3077,7 +3180,7 @@ msgstr "一致するユーザが見つかりませんでした"
 msgid "There are no users matching your search criteria."
 msgstr "検索条件に一致するユーザが存在しませんでした。"
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "ソケットを読めません"
 
 msgid "Buddy list downloaded"
@@ -3092,8 +3195,14 @@ msgstr "仲間リストをアップロードしました"
 msgid "Your buddy list was stored on the server."
 msgstr "仲間リストをサーバに格納しました。"
 
-msgid "Connection failed."
-msgstr "接続に失敗しました"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "接続しました"
+
+msgid "Connection failed"
+msgstr "接続に失敗"
 
 msgid "Add to chat"
 msgstr "チャットに追加"
@@ -3101,13 +3210,23 @@ msgstr "チャットに追加"
 msgid "Chat _name:"
 msgstr "チャット名(_N):"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "サーバへ接続できません"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "接続中です"
+
 msgid "Chat error"
 msgstr "チャットのエラー"
 
 msgid "This chat name is already in use"
 msgstr "そのチャット名は既に使用されています。"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "サーバへ接続していません。"
 
 msgid "Find buddies..."
@@ -3149,6 +3268,10 @@ msgstr "ポーランドで人気のある IM です"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ユーザ"
 
+#, fuzzy
+msgid "GG server"
+msgstr "ユーザ情報のセット..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "不明なコマンド: %s"
@@ -3163,7 +3286,8 @@ msgstr "トピックが設定されていません"
 msgid "File Transfer Failed"
 msgstr "ファイルの転送が失敗しました"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "監視するポートを開けませんでした"
 
 msgid "Error displaying MOTD"
@@ -3179,8 +3303,18 @@ msgstr "この接続に関連した MOTD がありません。"
 msgid "MOTD for %s"
 msgstr "%s の MOTD"
 
-msgid "Server has disconnected"
-msgstr "サーバが接続を切りました"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"サーバとの接続を失いました:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTD の表示"
@@ -3191,25 +3325,24 @@ msgstr "チャンネル(_C):"
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC のニックネームには空白が含まれていないかもしれません"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "接続中です"
-
 msgid "SSL support unavailable"
 msgstr "SSL サポートは無効です"
 
-msgid "Couldn't create socket"
-msgstr "ソケットを生成できませんでした"
+msgid "Unable to connect"
+msgstr "接続できません"
 
-msgid "Couldn't connect to host"
-msgstr "ホストへ接続できませんでした"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s へ接続できません"
 
-msgid "Read error"
-msgstr "読み込みエラーです"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "サーバが接続を閉じました"
 
 msgid "Users"
 msgstr "ユーザ数"
@@ -3391,6 +3524,17 @@ msgstr ""
 "指定したアカウント名がサーバ側で拒否されました。おそらく不正な文字が含まれて"
 "いると思われます。"
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "そのチャット名は既に使用されています。"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "ニックネーム"
+
 msgid "Cannot change nick"
 msgstr "ニックネームを変更できません"
 
@@ -3633,13 +3777,14 @@ msgstr "コマンドが無効です"
 msgid "execute"
 msgstr "予想していないデータ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポートし"
 "ていません。"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポートし"
 "ていません。"
@@ -3658,18 +3803,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "プレーンテキスト認証"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "認証に失敗しました"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "サーバからの応答が不正です。"
 
 msgid "Server does not use any supported authentication method"
 msgstr "サーバはサポートしている認証手法を利用しません"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "サーバからの不正な challenge です"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL のエラー"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "理由はわかりません。"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "サポートしていないバージョン"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"サーバとの接続を確立できませんでした:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"サーバとの接続を確立できませんでした:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "新しい接続を開けません"
+
 msgid "Full Name"
 msgstr "氏名"
 
@@ -3736,187 +3917,9 @@ msgstr "クライアント"
 msgid "Operating System"
 msgstr "オペレーティング・システム"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "フォルダ情報の設定"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "その他"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "チャットの別名"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "フォルダ情報がありません"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "コマンド指定"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML 形式"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "登録エラー"
-
-#, fuzzy
-msgid "User Location"
-msgstr "場所"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "ユーザの検索"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "仲間の状態の通知"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "サポートしていないバージョン"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "向き"
-
-msgid "File Transfer"
-msgstr "ファイルの転送"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "ユーザ・モード"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "ユーザの制限"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "機能"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "ユーザ名"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "キー交換付き IM"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "E-メール・アドレス"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "プロフィール"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "参加する"
-
-msgid "Jingle Audio"
-msgstr ""
-
 #, fuzzy
-msgid "User Nickname"
-msgstr "ユーザ名"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "ライブ・ビデオ"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "メッセージを受信しました"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "公開鍵の Babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "ユーザのオプション"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "ユーザ・モード"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "ユーザ名"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "ユーザの制限"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian 暗号化"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "機能"
+msgid "Local Time"
+msgstr "ローカル・ファイル:"
 
 msgid "Priority"
 msgstr "優先順位"
@@ -3924,6 +3927,14 @@ msgstr "優先順位"
 msgid "Resource"
 msgstr "リソース"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "既にログインしています"
+
 msgid "Middle Name"
 msgstr "ミドル・ネーム"
 
@@ -3972,7 +3983,6 @@ msgstr "チャッティー"
 msgid "Extended Away"
 msgstr "逃走中"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "邪魔しないでね"
 
@@ -4093,29 +4103,26 @@ msgstr "問い合わせる会議サーバの選択"
 msgid "Find Rooms"
 msgstr "部屋の検索"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "別名:"
 
-msgid "Write error"
-msgstr "書き込みエラー"
+#, fuzzy
+msgid "No users found"
+msgstr "一致するユーザが見つかりませんでした"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "通常のテキスト"
+msgid "Roles:"
+msgstr "役職"
 
-msgid "Read Error"
-msgstr "読み込みエラー"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "通常のテキスト"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"サーバとの接続を確立できませんでした:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "ソケットを生成できません"
 
 msgid "Invalid XMPP ID"
 msgstr "不正な XMPP ID"
@@ -4123,6 +4130,10 @@ msgstr "不正な XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID が間違っています (ドメインを指定して下さい)"
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "サーバへの接続に失敗しました"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s の登録が完了しました"
@@ -4149,9 +4160,6 @@ msgstr "登録の完了"
 msgid "Unregistration Failed"
 msgstr "登録の失敗"
 
-msgid "Already Registered"
-msgstr "既に登録されています"
-
 msgid "State"
 msgstr "州"
 
@@ -4164,6 +4172,9 @@ msgstr "電話番号"
 msgid "Date"
 msgstr "日付"
 
+msgid "Already Registered"
+msgstr "既に登録されています"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "登録"
@@ -4195,6 +4206,10 @@ msgid "Change Registration"
 msgstr "登録エラー"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "サーバへの接続に失敗しました"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "アカウント情報変更エラー"
 
@@ -4215,9 +4230,18 @@ msgstr "認証中"
 msgid "Re-initializing Stream"
 msgstr "ストリームの再初期化中"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "承認されていません"
 
+msgid "Mood"
+msgstr "不機嫌"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "両方"
 
@@ -4239,12 +4263,6 @@ msgstr "なし"
 msgid "Subscription"
 msgstr "購読"
 
-msgid "Mood"
-msgstr "不機嫌"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "血液型"
@@ -4292,9 +4310,6 @@ msgstr "パスワードを変更しました。"
 msgid "Error changing password"
 msgstr "パスワードを変更する際にエラー"
 
-msgid "Password (again)"
-msgstr "パスワード (確認用)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP パスワードの変更"
 
@@ -4487,20 +4502,30 @@ msgstr "ユーザの %s さんをキックできません"
 msgid "Unable to ping user %s"
 msgstr "ユーザの %s さんを追い出せません"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
+"%s さんへファイルを送信できません (ユーザはファイル転送をサポートしていませ"
+"ん)"
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
+"%s さんへファイルを送信できません (ユーザはファイル転送をサポートしていませ"
+"ん)"
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 "%s さんへファイルを送信できません (ユーザはファイル転送をサポートしていませ"
 "ん)"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4510,9 +4535,35 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr "%s さんがあなた [%s] を追加しました"
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "%s さんへファイルを送信できません (JID が間違っています)"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "%s さんへファイルを送信できません (ユーザはオフラインです)"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
+"%s さんへファイルを送信できません (ユーザの在席情報が登録されていません)"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "登録の失敗"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "ファイルとして送信する %s のリソースを選択して下さい"
+
+msgid "Select a Resource"
+msgstr "リソースの選択"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "チャットの開始(_C)"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  チャット・ルームを設定します"
@@ -4535,16 +4586,18 @@ msgstr ""
 "ban &lt;ユーザ&gt; [ルーム]:  指定したチャット・ルームからユーザを追い出しま"
 "す"
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;ユーザ&gt; &lt;owner|admin|member|outcast|none&gt;: ユーザの関"
 "係をセットします"
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;ユーザ&gt; &lt;moderator|participant|visitor|none&gt;: チャトルーム"
 "での役割をセットします"
@@ -4613,6 +4666,9 @@ msgstr "サーバへ接続"
 msgid "File transfer proxies"
 msgstr "ファイル転送のポート番号"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4652,6 +4708,14 @@ msgstr "XML 解析エラー"
 msgid "Unknown Error in presence"
 msgstr "不明なエラーが起きています"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "チャット %s に参加する際にエラー"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "チャット %s でエラー"
+
 msgid "Create New Room"
 msgstr "新しいチャット・ルームの生成"
 
@@ -4668,13 +4732,32 @@ msgstr "ルームの設定(_C)"
 msgid "_Accept Defaults"
 msgstr "デフォルト値を適用する(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "チャット %s に参加する際にエラー"
+#, fuzzy
+msgid "No reason"
+msgstr "理由はわかりません。"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "チャット %s でエラー"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "あなたは %s に蹴られました: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s) に蹴られました"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "ファイルをオープンする際にエラーが発生しました。"
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "ファイルの転送が失敗しました"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "ファイル '%s' を開けませんでした: %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4702,9 +4785,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "ファイルとして送信する %s のリソースを選択して下さい"
 
-msgid "Select a Resource"
-msgstr "リソースの選択"
-
 #, fuzzy
 msgid "Edit User Mood"
 msgstr "ユーザ・モード"
@@ -4745,9 +4825,19 @@ msgstr "つかんだら何をするか..."
 msgid "Select an action"
 msgstr "ファイルの選択"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\" さんを追加できません"
+
+msgid "Buddy Add error"
+msgstr ""
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Notes アドレス帳の選択"
+msgid "The username specified does not exist."
+msgstr "指定したスクリーン名が間違っています"
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4978,7 +5068,7 @@ msgstr "親の承諾がない Kids パスポートです"
 msgid "Passport account not yet verified"
 msgstr "まだパスポートのアカウントは確認されていません"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "まだパスポートのアカウントは確認されていません"
 
@@ -5002,6 +5092,10 @@ msgstr "お好みの連絡先"
 msgid "Non-IM Contacts"
 msgstr "コンタクトの削除"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5074,6 +5168,13 @@ msgstr "モバイル・メッセージを送信します。"
 msgid "Page"
 msgstr "ページ"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "職種"
+
 msgid "Has you"
 msgstr "あなたを仲間リストに登録しているか"
 
@@ -5115,6 +5216,14 @@ msgstr "アーティスト"
 msgid "Album"
 msgstr "Adium"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "題名"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "題名"
+
 msgid "Set Friendly Name..."
 msgstr "公開する名前の設定..."
 
@@ -5150,9 +5259,6 @@ msgstr ""
 "MSN では SSL サポートが必要です (サポートする SSL ライブラリをインストールし"
 "て下さい)"
 
-msgid "Failed to connect to server."
-msgstr "サーバへの接続に失敗しました"
-
 msgid "Error retrieving profile"
 msgstr "プロフィールを取得する際にエラー"
 
@@ -5308,8 +5414,9 @@ msgstr ""
 "ユーザのプロフィールから情報を取得できませんでした。そのユーザはおそらく存在"
 "していないと思われます。"
 
-msgid "Profile URL"
-msgstr "プロフィールの URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "オフラインの時は許可できません"
 
 #. *< type
 #. *< ui_requirement
@@ -5346,65 +5453,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "失敗: 認証に失敗しました"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s は正しいグループではありません"
-
-msgid "Unknown error."
-msgstr "原因不明のエラーです"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2$s (%3$s) の %1$s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s さんが合図を送りたがっています！"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "原因不明のエラー"
 
 msgid "Unable to add user"
 msgstr "ユーザを追加できません"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "原因不明のエラー"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "検索結果です"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) のユーザを追加できません"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) のユーザをブロックできません"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) のユーザを許可できません"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "仲間リストが満杯なので、%s さんを追加できませんでした"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s さんのパスポート・アカウントは正しくありません"
-
-msgid "Service Temporarily Unavailable."
-msgstr "サービスを一時的に利用できません"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "送信するタイミングが早過ぎたので、メッセージを送信できませんでした:"
 
-msgid "Unable to rename group"
-msgstr "グループ名を変更できません"
-
-msgid "Unable to delete group"
-msgstr "グループを削除できません"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5448,9 +5518,6 @@ msgstr "不明なエラーの発生により、メッセージは送信されま
 msgid "Message was not sent because an unknown error occurred."
 msgstr "不明なエラーの発生により、メッセージは送信されませんでした:"
 
-msgid "Unable to connect"
-msgstr "接続できません"
-
 msgid "Writing error"
 msgstr "書き込み時にエラー"
 
@@ -5465,13 +5532,16 @@ msgstr ""
 "サーバ %s で接続エラー:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "サーバはこのプロトコルをサポートしていません"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP を解析する際にエラーが発生しました"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "別の場所からサイン・インしています"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5479,7 +5549,8 @@ msgstr ""
 "MSN サーバが一時的に利用不可になっています。時間をあけて後で試してみて下さ"
 "い。"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN サーバが一時的にダウンしています"
 
 #, c-format
@@ -5510,6 +5581,14 @@ msgstr "クッキーを送信しています"
 msgid "Retrieving buddy list"
 msgstr "仲間リストを受信しています"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "コンピュータから離れてます"
 
@@ -5549,14 +5628,6 @@ msgstr "交換機系の接続エラーが発生したので、メッセージを
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "不明なエラーの発生により、メッセージは送信されませんでした:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s さんはあなたを仲間リストに追加しています"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s さんはあなたを仲間リストから削除しています"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "アドレス帳へ追加する"
@@ -5565,13 +5636,6 @@ msgstr "アドレス帳へ追加する"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "この相手を仲間リストに追加しますか？"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "\"%s\" さんを追加できません"
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "指定したスクリーン名が間違っています"
@@ -5579,6 +5643,9 @@ msgstr "指定したスクリーン名が間違っています"
 msgid "This Hotmail account may not be active."
 msgstr "この Hotmail のアカウントは有効でないようです。"
 
+msgid "Profile URL"
+msgstr "プロフィールの URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5592,19 +5659,63 @@ msgstr "この Hotmail のアカウントは有効でないようです。"
 msgid "MSN Protocol Plugin"
 msgstr "MSN プロトコルのプラグイン"
 
-#, fuzzy
-msgid "Missing Cipher"
-msgstr "暗号"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s は正しいグループではありません"
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "原因不明のエラーです"
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s (%3$s) の %1$s"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) のユーザを追加できません"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) のユーザをブロックできません"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) のユーザを許可できません"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "仲間リストが満杯なので、%s さんを追加できませんでした"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s さんのパスポート・アカウントは正しくありません"
+
+msgid "Service Temporarily Unavailable."
+msgstr "サービスを一時的に利用できません"
+
+msgid "Unable to rename group"
+msgstr "グループ名を変更できません"
+
+msgid "Unable to delete group"
+msgstr "グループを削除できません"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s さんはあなたを仲間リストに追加しています"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s さんはあなたを仲間リストから削除しています"
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "ユーザの部屋"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "読み込み時にエラー"
 
@@ -5616,13 +5727,25 @@ msgstr "サーバからの不正な challenge です"
 msgid "Logging in"
 msgstr "ログの記録"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "名前なし"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"サーバとの接続が切れました\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "メッセージを送信する"
@@ -5643,20 +5766,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "名前なし"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "IM ウィンドウ(_I)"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "接続しました"
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "サーバからの応答が不正です。"
 
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
@@ -5664,16 +5789,23 @@ msgstr "プロセスがエラー・コード %d を返してきました"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "スクリーン名またはパスワードが間違っています"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "接続の最終調整中"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "チャットの仲間に参加できません"
 
@@ -5685,14 +5817,6 @@ msgstr "仲間リストのインポート..."
 msgid "persist command failed"
 msgstr "スイッチボードに失敗しました"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "ユーザの部屋"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "チャットの仲間に参加できません"
@@ -5705,38 +5829,16 @@ msgid "blocklist command failed"
 msgstr "スイッチボードに失敗しました"
 
 #, fuzzy
-msgid "Invalid input condition"
-msgstr "接続の最終調整中"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "キューが一杯です"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "メッセージを解読できません"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "ホストへ接続できませんでした"
+msgid "Missing Cipher"
+msgstr "暗号"
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "IM ウィンドウ(_I)"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "サーバからの応答が不正です。"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5783,9 +5885,6 @@ msgstr "フォントのサイズを大きくします"
 msgid "User"
 msgstr "ユーザ"
 
-msgid "Profile"
-msgstr "プロフィール"
-
 #, fuzzy
 msgid "Headline"
 msgstr "ハンドル(_H):"
@@ -5801,15 +5900,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "会話ウィンドウを閉じます"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "名前なし"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5825,6 +5919,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "このテーマには利用可能なスマイリーがありません。"
@@ -5833,6 +5930,14 @@ msgstr "このテーマには利用可能なスマイリーがありません。
 msgid "Please try another username:"
 msgstr "%s さんの新しい名前を入力して下さい"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "名前なし"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6028,10 +6133,6 @@ msgid "Master archive is misconfigured"
 msgstr "マスター・アーカイブの設定が間違っています"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "スクリーン名またはパスワードが間違っています"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "入力したスクリーン名のホストを認識できませんでした"
 
@@ -6073,9 +6174,9 @@ msgstr "ユーザはオフラインか、あるいはブロックされていま
 msgid "Unknown error: 0x%X"
 msgstr "不明なエラー: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "ログインに失敗しました (%s)。"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "ユーザの %s さんを追い出せません"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6178,9 +6279,6 @@ msgstr "GroupWise 会議 %d"
 msgid "Authenticating..."
 msgstr "認証中..."
 
-msgid "Unable to connect to server."
-msgstr "サーバへ接続できません"
-
 msgid "Waiting for response..."
 msgstr "応答待ちです..."
 
@@ -6204,25 +6302,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "会議に出席しますか？"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"別のワークステーションからログインしているので、強制的にログアウトされまし"
-"た。"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s さんはオフラインのため、送信したメッセージを受け取りませんでした。"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "サーバへ接続できません。接続するサーバのアドレスを入力して下さい。"
 
-msgid "Error. SSL support is not installed."
-msgstr "エラーです。SSL サポートがインストールされていません。"
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "この会議は閉会しています。メッセージを送信することはできません。"
 
@@ -6246,6 +6336,25 @@ msgid "Server port"
 msgstr "サーバのポート"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "サーバから想定外の HTTP 応答を受け取りました"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"接続と切断を繰り返し行いました。10 分程待ってから再び試みてください。そのまま"
+"続行すると、さらに長く待たなければならなくなりますよ。"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "接続を開始する際にエラー"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "接続できませんでした"
 
@@ -6253,18 +6362,8 @@ msgstr "接続できませんでした"
 msgid "Invalid chat room name"
 msgstr "不正なルーム名"
 
-msgid "Server closed the connection."
-msgstr "サーバが接続を閉じました"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"サーバとの接続を失いました:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "サーバと接続する際に不正なデータを受け取りました"
 
 #. *< type
@@ -6312,7 +6411,8 @@ msgstr "リモート・ユーザとの接続が切れました:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "リモート・ユーザとの接続で不正なデータを受け取りました"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "リモート・ユーザとの接続を確立できませんでした"
 
 msgid "Direct IM established"
@@ -6488,23 +6588,18 @@ msgstr "カメラ"
 msgid "Screen Sharing"
 msgstr "スクリーン名"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "チャットできます"
 
-#, c-format
 msgid "Not Available"
 msgstr "不在です"
 
-#, c-format
 msgid "Occupied"
 msgstr "多忙です"
 
-#, c-format
 msgid "Web Aware"
 msgstr "ウェブは見てます"
 
-#, c-format
 msgid "Invisible"
 msgstr "隠れています"
 
@@ -6517,21 +6612,15 @@ msgstr "警告レベル"
 msgid "Buddy Comment"
 msgstr "仲間のコメント"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "認証サーバに接続できませんでした:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS サーバに接続できませんでした:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "サーバへ接続できません"
 
 #, fuzzy
 msgid "Username sent"
@@ -6546,51 +6635,58 @@ msgstr "接続の最終調整中"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "ログインできません: スクリーン名が間違っているため %s としてサイン・オンでき"
 "ませんでした。スクリーン名の先頭は文字にし、文字と数字とスペースのみ、または"
 "数字のみにして下さい。"
 
-#. Unregistered screen name
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "まもなく切断されるでしょう。更新のために、%s をチェックして下さい。"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "妥当な AIM ログインの hash 値を取得することができませんでした。"
+
+msgid "Unable to get a valid login hash."
+msgstr "妥当なログインの hash 値を取得できませんでした。"
+
+msgid "Received authorization"
+msgstr "承認を受信しました"
+
+#. Unregistered username
 #. uid is not exist
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "名前が間違っています"
-
-msgid "Incorrect password."
-msgstr "パスワードが間違っています。"
+msgid "Username does not exist"
+msgstr "ユーザがいません"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "お使いのアカウントは現在停止中です"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL インスタント・メッセンジャー・サービスは一時的に利用不可です"
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "クライアントのバージョンが古すぎます。%s にアップグレードしましょう。"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "接続と切断を繰り返し行いました。10 分程待ってから再び試みてください。そのまま"
 "続行すると、さらに長く待たなければならなくなりますよ。"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "クライアントのバージョンが古すぎます。%s にアップグレードしましょう。"
-
-msgid "Could Not Connect"
-msgstr "接続できませんでした"
-
-msgid "Received authorization"
-msgstr "承認を受信しました"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "入力したセキュア ID 鍵は不正です。"
 
 msgid "Enter SecurID"
@@ -6605,24 +6701,6 @@ msgstr "デジタル表示から６桁の数字を入力して下さい。"
 msgid "_OK"
 msgstr "OK(_O)"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"まもなく切断されるでしょう。修正されたら TOC を利用してかまいません。更新のた"
-"めに、%s をチェックして下さい。"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "妥当な AIM ログインの hash 値を取得することができませんでした。"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "まもなく切断されるでしょう。更新のために、%s をチェックして下さい。"
-
-msgid "Unable to get a valid login hash."
-msgstr "妥当なログインの hash 値を取得できませんでした。"
-
 msgid "Password sent"
 msgstr "パスワードの送信中"
 
@@ -6771,7 +6849,7 @@ msgstr[1] ""
 "原因は不明ですが、%2$s さんからの %1$hu 個のメッセージを受け取れませんでし"
 "た。"
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "メッセージを送信できません: %s"
@@ -6793,6 +6871,12 @@ msgstr "サイン・インした日時"
 msgid "Member Since"
 msgstr "メンバになった日時"
 
+msgid "Capabilities"
+msgstr "機能"
+
+msgid "Profile"
+msgstr "プロフィール"
+
 msgid "Your AIM connection may be lost."
 msgstr "AIM への接続が切れたようです"
 
@@ -6963,7 +7047,7 @@ msgstr "離席メッセージが長すぎます"
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6989,9 +7073,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "みなしご"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "仲間の %s さんを追加することができませんでした。仲間の数が多すぎます。一人削"
@@ -7001,7 +7085,7 @@ msgid "(no name)"
 msgstr "(名前無し)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "原因不明ですが、コマンド適用に失敗しました"
 
 #, fuzzy, c-format
@@ -7071,6 +7155,7 @@ msgstr "接続する(_O)"
 msgid "Get AIM Info"
 msgstr "AIM 情報の取得"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "仲間のコメントの編集"
 
@@ -7132,6 +7217,7 @@ msgstr "検索(_S)"
 msgid "Set User Info (web)..."
 msgstr "ユーザ情報のセット(URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "パスワード変更 (URL)"
@@ -7164,6 +7250,10 @@ msgid "Search for Buddy by Information"
 msgstr "情報で仲間の検索..."
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "ユーザはログインしていません"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7183,7 +7273,6 @@ msgstr "Direct IM で %s は %s:%hu で問い合わせがきています。"
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s:%hu にコンタクトを試みています"
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "プロキシ・サーバを介してコンタクトを試みています..."
 
@@ -7279,7 +7368,7 @@ msgstr "その他"
 msgid "Visible"
 msgstr "隠れています"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7370,16 +7459,48 @@ msgstr "最終更新日"
 msgid "Could not change buddy information."
 msgstr "仲間の情報を入力して下さい:"
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "移動中"
+
+msgid "Note"
+msgstr "備考"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "仲間アイコン"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "仲間の追加"
+msgid "_Modify"
+msgstr "変更する"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "変更する"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "サーバがビジーです"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "承認が必要です"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "仲間をリストに追加しますか？"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Enter answer here"
 msgstr "ここにリクエストをどうぞ"
 
 msgid "Send"
@@ -7393,18 +7514,19 @@ msgid "Authorization denied message:"
 msgstr "承認を拒否する旨のメッセージ:"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "すみませんが、私のタイプではありません..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "ユーザ %d さんは承認が必要です"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "仲間をリストに追加しますか？"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "ここにリクエストをどうぞ"
 
 msgid "Would you be my friend?"
@@ -7427,7 +7549,7 @@ msgid "Failed sending authorize"
 msgstr "私を承認してください！"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "チャットの仲間に参加できません"
 
 #, fuzzy, c-format
@@ -7472,6 +7594,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr "半永久的に使用できる QQ グループのみ検索できます\n"
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "不正なプロキシ設定"
+
+#, fuzzy
 msgid "Not member"
 msgstr "私はメンバではありません"
 
@@ -7514,16 +7640,19 @@ msgstr "このグループでは他の人たちの参加を許可していませ
 msgid "Join QQ Qun"
 msgstr "チャットに参加"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "ここにリクエストをどうぞ"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Qun メンバの変更が完了しました"
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "Qun メンバの変更が完了しました"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7533,7 +7662,7 @@ msgstr "QQ Qun の操作"
 msgid "Failed:"
 msgstr "失敗しました"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7548,11 +7677,11 @@ msgstr ""
 "この操作によって最終的に Qun が完全に削除されます。"
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "すみませんが、私のタイプではありません..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Qun メンバの変更が完了しました"
 
 #, fuzzy
@@ -7563,35 +7692,35 @@ msgid "You have successfully created a Qun"
 msgstr "Qun の生成が完了しました"
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "今すぐ Qun の詳細な情報を入力しますか？"
 
 msgid "Setup"
 msgstr "入力する"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "ユーザ %d さんがグループ %d に参加しました"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "ユーザ %d さんがグループ %d に参加しました"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "チャットの仲間に参加できません"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "仲間の削除"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "仲間の削除"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7708,6 +7837,13 @@ msgstr "<b>Last Refresh</b>: %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>現在のオンライン</b>: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Last Refresh</b>: %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7715,7 +7851,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "%s について"
 
 #, fuzzy
@@ -7736,6 +7872,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "%s について"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "自宅の住所"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7767,7 +7907,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "接続中です"
@@ -7780,6 +7919,9 @@ msgstr "サーバのポート"
 msgid "Show server news"
 msgstr "サーバのアドレス"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "読み込み時にエラー"
@@ -7789,11 +7931,7 @@ msgid "Update interval (seconds)"
 msgstr "読み込み時にエラー"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "サーバの情報を取得できません"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "サーバの情報を取得できません"
 
 #, c-format
@@ -7816,21 +7954,19 @@ msgid "Activation required"
 msgstr "登録が必要です"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "読み込み時にエラー"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "質問ダイアログの文字"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Yahoo! 認証に失敗"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7840,7 +7976,7 @@ msgstr "画像の保存"
 msgid "Enter code"
 msgstr "パスワードの入力"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7848,66 +7984,42 @@ msgid "Enter the text from the image"
 msgstr "追加するグループの名前を入力して下さい:"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "接続できません"
-
 msgid "Socket error"
 msgstr "ソケットのエラー"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"サーバとの接続を失いました:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "ソケットを読めません"
-
-msgid "Write Error"
-msgstr "書き込みエラー"
-
-msgid "Connection lost"
-msgstr "接続を閉じました"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "ユーザ情報のセット..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "リクエストが拒否されました"
 
-msgid "Couldn't resolve host"
-msgstr "ホスト名を解決できませんでした"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "サーバへ接続できません"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "不正なエラー"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "サーバへ接続"
+msgid "Connecting to server"
+msgstr "SILC サーバへ接続中"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "QQid のエラー"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "名前の取得に失敗しました: %s"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7917,6 +8029,10 @@ msgid ""
 msgstr "ICQ サーバ中継"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "差出人"
 
@@ -7926,32 +8042,30 @@ msgid ""
 "%s"
 msgstr "サーバの情報: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "原因は不明です"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "コマンド指定"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "サーバの情報を取得できません"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "原因は不明です"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "原因は不明です"
 
 #, c-format
@@ -7965,9 +8079,6 @@ msgstr "ファイルの送信"
 msgid "%d canceled the transfer of %s"
 msgstr "%d さんは %s の転送をキャンセルしました"
 
-msgid "Connection closed (writing)"
-msgstr "書き込み用の接続を閉じました"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>グループ名:</b> %s<br>"
@@ -8021,17 +8132,6 @@ msgstr "Sametime 管理者がサーバ %s で次のアナウンスを発表し�
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理者のアナウンス"
 
-msgid "Connection reset"
-msgstr "接続のリセット"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "ソケットから読み込む際にエラー: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "ホストに接続できません"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s からのお知らせ"
@@ -8054,6 +8154,9 @@ msgstr "スピーカ"
 msgid "Video Camera"
 msgstr "ビデオ・カメラ"
 
+msgid "File Transfer"
+msgstr "ファイルの転送"
+
 msgid "Supports"
 msgstr "サポート"
 
@@ -8767,9 +8870,6 @@ msgstr "担当部署"
 msgid "Unit"
 msgstr "グループ"
 
-msgid "Note"
-msgstr "備考"
-
 msgid "Join Chat"
 msgstr "チャットに参加"
 
@@ -8869,6 +8969,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ネットワークの統計情報"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping に失敗しました"
 
@@ -8932,7 +9035,8 @@ msgstr "サポートしていない公開鍵の種類"
 msgid "Disconnected by server"
 msgstr "サーバが接続を切断しました"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC サーバへ接続する際にエラー"
 
 msgid "Key Exchange failed"
@@ -8944,26 +9048,26 @@ msgstr ""
 "切り離したセッションの復帰に失敗しました。新しい接続を確立する際は、ボタン "
 "[再接続] をクリックして下さい。"
 
-msgid "Connection failed"
-msgstr "接続に失敗"
-
 msgid "Performing key exchange"
 msgstr "鍵の交換の実行中"
 
-msgid "Unable to create connection"
-msgstr "新しい接続を開けません"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "SILC の鍵ペアを読み込めませんでした"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC サーバへ接続中"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC の鍵ペアを読み込めませんでした"
+
 msgid "Out of memory"
 msgstr "メモリが足りません"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC プロトコルを初期化できません"
 
 msgid "Error loading SILC key pair"
@@ -9264,7 +9368,8 @@ msgstr "電子署名して全てのメッセージを検証する"
 msgid "Creating SILC key pair..."
 msgstr "SILC 鍵ペアの生成中..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "SILC 鍵ペアを生成できません\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9362,6 +9467,9 @@ msgstr "ホワイトボード"
 msgid "No server statistics available"
 msgstr "サーバの統計情報は利用できません"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC サーバへ接続する際にエラー"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗: バージョン不整合、クライアントをアップグレードして下さい"
@@ -9403,36 +9511,36 @@ msgstr "失敗: 不正なクッキーです"
 msgid "Failure: Authentication failed"
 msgstr "失敗: 認証に失敗しました"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC クライアント接続を初期化できません"
 
 msgid "John Noname"
 msgstr "名前なし"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC の鍵ペアを読み込めませんでした: %s"
 
-msgid "Could not write"
-msgstr "書き込めませんでした"
-
-msgid "Could not connect"
-msgstr "接続できませんでした"
+msgid "Unable to create connection"
+msgstr "新しい接続を開けません"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "原因は不明です"
 
-msgid "Could not create listen socket"
-msgstr "ソケットを生成できませんでした"
-
-msgid "Could not resolve hostname"
-msgstr "ホスト名を解決できませんでした"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "ソケットを生成できません"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP のスクリーン名に空白または @ 記号が含まれていないようです"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "サーバのポート"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9466,176 +9574,63 @@ msgstr "ユーザ認証"
 msgid "Auth Domain"
 msgstr "ドメイン認証"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s の検索中"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s への接続に失敗しました"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "サイン・イン: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "ファイル %s を書き込めません"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "ファイル %s を読み込めません"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "メッセージが長過ぎるので最後の %s バイトを切りつめました"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s さんは正しくログインしていません"
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s の警告は許されません"
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "サーバの速度制限を越えたためメッセージは落されました"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s でのチャットはできません"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "早すぎて %s へメッセージを送信できません"
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "大きすぎるため %s からの IM を無視しました"
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "早く送りすぎたので %s さんからの IM を無視しました"
-
-#, c-format
-msgid "Failure."
-msgstr "失敗しました"
-
-#, c-format
-msgid "Too many matches."
-msgstr "一致するものが多すぎます"
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "より多くの修飾語を必要とします"
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "一時的にディレクトリ・サービスが利用できません"
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "E-メール検索が拒否されました"
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "キーワードが無効です"
-
-#, c-format
-msgid "No keywords."
-msgstr "キーワードがありません"
-
-#, c-format
-msgid "User has no directory information."
-msgstr "フォルダ情報がありません"
-
-#, c-format
-msgid "Country not supported."
-msgstr "サポートされていない国です"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "原因不明の失敗: %s"
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "スクリーン名またはパスワードが間違っています"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "一時的にサービスが利用できません"
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "ログインする警告レベルが高すぎます"
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"接続と切断を繰り返し行いました。10 分程待ってから再び試みてください。そのまま"
-"続行すると、さらに長く待たなければならなくなりますよ。"
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "原因不明のサイン・オン・エラーが起こりました: %s"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "不明なエラー %d が発生しました (情報: %s)"
-
-msgid "Invalid Groupname"
-msgstr "グループ名が間違っています"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;ルーム&gt;: Yahoo ネットワーク上にあるチャットへ参加する"
 
-msgid "Connection Closed"
-msgstr "接続を閉じました"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Yahoo ネットワーク上にあるルームを一覧表示します"
 
-msgid "Waiting for reply..."
-msgstr "返答待ちです..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: いたずら書きを始めることをユーザに要求する"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC は一時停止状態から戻りました。メッセージを再送できます。"
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-msgid "Password Change Successful"
-msgstr "パスワードの変更が完了しました"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! プロトコル・プラグイン"
 
-msgid "_Group:"
-msgstr "グループ(_G):"
+msgid "Pager server"
+msgstr "ページャのサーバ"
 
-msgid "Get Dir Info"
-msgstr "フォルダ情報の取得"
+msgid "Pager port"
+msgstr "ページャのポート番号"
 
-msgid "Set Dir Info"
-msgstr "フォルダ情報の設定"
+msgid "File transfer server"
+msgstr "ファイル転送サーバ"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "書き込みモードで %s を開けません！"
+msgid "File transfer port"
+msgstr "ファイル転送のポート番号"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"ファイル転送が失敗しました。おそらく向こう側がキャンセルしたのでしょう。"
+msgid "Chat room locale"
+msgstr "チャット・ルームの場所"
 
-msgid "Could not connect for transfer."
-msgstr "転送できませんでした！"
+msgid "Ignore conference and chatroom invitations"
+msgstr "会議とチャットルームの招待を無視する"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "ファイルヘッダを書けません。ファイルは送信されません。"
+msgid "Chat room list URL"
+msgstr "チャット・ルームの URL リスト"
 
-msgid "Save As..."
-msgstr "別名で保存..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo チャット・サーバ"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s さんから %s さんへの %d個のファイルの要求: %s (%.2f %s)%s%s"
-msgstr[1] "%s さんから %s さんへの %d個のファイルの要求: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo チャットのポート番号"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s さんがファイルを送るよう要求しています"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9647,11 +9642,11 @@ msgstr "%s さんがファイルを送るよう要求しています"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC プロトコル・プラグイン"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! プロトコル・プラグイン"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9677,6 +9672,34 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "拒否する仲間の追加"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "サーバと接続する際に不正なデータを受け取りました"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
+"れません。"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
+"れません。"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "スクリーン名またはパスワードが間違っています"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9712,39 +9735,34 @@ msgstr ""
 "不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
 "れません。"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "グループ %2$s の仲間 %1$s をアカウント %3$s でサーバ・リストに追加できません"
 "でした。"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "仲間をサーバ・リストに追加できませんでした"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 演奏可能 %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "サーバから想定外の HTTP 応答を受け取りました"
 
-msgid "Connection problem"
-msgstr "接続エラー"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "%s との接続を失いました:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"%s との接続を確立できませんでした:\n"
+"サーバとの接続を確立できませんでした:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9792,9 +9810,8 @@ msgstr "在席状態の設定"
 msgid "Start Doodling"
 msgstr "いたずら書きする"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "どの ID を有効化しますか？"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "どのチャットへ参加しますか？"
@@ -9809,74 +9826,15 @@ msgstr "チャットに参加する..."
 msgid "Open Inbox"
 msgstr "Hotmail の受信箱を開く"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;ルーム&gt;: Yahoo ネットワーク上にあるチャットへ参加する"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Yahoo ネットワーク上にあるルームを一覧表示します"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: いたずら書きを始めることをユーザに要求する"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo! プロトコル・プラグイン"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan! に接続する"
-
-msgid "Pager server"
-msgstr "ページャのサーバ"
-
-msgid "Japan Pager server"
-msgstr "日本のページャ・サーバ"
-
-msgid "Pager port"
-msgstr "ページャのポート番号"
-
-msgid "File transfer server"
-msgstr "ファイル転送サーバ"
-
-msgid "Japan file transfer server"
-msgstr "日本のファイル転送サーバ"
-
-msgid "File transfer port"
-msgstr "ファイル転送のポート番号"
-
-msgid "Chat room locale"
-msgstr "チャット・ルームの場所"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "会議とチャットルームの招待を無視する"
-
-msgid "Chat room list URL"
-msgstr "チャット・ルームの URL リスト"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo チャット・サーバ"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo チャットのポート番号"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Doodle 要求を送信する"
 
+msgid "Unable to connect."
+msgstr "接続できません"
+
 msgid "Unable to establish file descriptor."
 msgstr "ファイル・デスクリプタを取得できません"
 
@@ -9884,6 +9842,9 @@ msgstr "ファイル・デスクリプタを取得できません"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s さんがファイル %s の送信を要求しています"
 
+msgid "Write Error"
+msgstr "書き込みエラー"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan プロファイル"
 
@@ -9928,13 +9889,9 @@ msgstr "クールなリンク３"
 msgid "Last Update"
 msgstr "最終更新日"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s のユーザ情報は有効ではありません"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "すみません、このプロファイルはこのバージョンではサポートされていない書式/言語"
 "のようです。"
@@ -10007,23 +9964,19 @@ msgstr "音声"
 msgid "Webcams"
 msgstr "ウェブカム"
 
+msgid "Connection problem"
+msgstr "接続エラー"
+
 msgid "Unable to fetch room list."
 msgstr "部屋一覧を取得できません"
 
 msgid "User Rooms"
 msgstr "ユーザの部屋"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT サーバを使った接続に問題があります。"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"サーバとの接続が切れました\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10155,24 +10108,16 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "Exposure"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"ソケットを生成できません:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP プロキシからの応答を解析できません: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP プロキシの接続エラー %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "アクセスが拒否されました: HTTP プロキシ・サーバがポート番号 %d のトンネリング"
 "を拒否しました"
@@ -10181,9 +10126,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "%s を解決する際にエラー"
 
-msgid "Could not resolve host name"
-msgstr "ホスト名を解決できませんでした"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10277,9 +10219,6 @@ msgstr "邪魔しないでね"
 msgid "Extended away"
 msgstr "逃走中"
 
-msgid "Mobile"
-msgstr "移動中"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10321,18 +10260,6 @@ msgstr "+++ %s さんが待機中から復帰しました"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s を読み込む際にエラー"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"%s を読み込む際にエラーが発生しました。その情報は読み込まれません。また、古い"
-"ファイルの名前を \"%s~\" に変更しました。"
-
 msgid "Calculating..."
 msgstr "計算中..."
 
@@ -10440,6 +10367,18 @@ msgstr "接続が拒否されました"
 msgid "Address already in use."
 msgstr "そのチャット名は既に使用されています。"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s を読み込む際にエラー"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"%s を読み込む際にエラーが発生しました。その情報は読み込まれません。また、古い"
+"ファイルの名前を \"%s~\" に変更しました。"
+
 msgid "Internet Messenger"
 msgstr "インターネット・メッセンジャー"
 
@@ -10482,10 +10421,8 @@ msgstr "新着メールを通知する(_M)"
 msgid "Use this buddy _icon for this account:"
 msgstr "次の仲間アイコンを使用する(_I):"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s のオプション"
+msgid "_Advanced"
+msgstr "拡張(_A)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "GNOME のプロキシ設定を使う"
@@ -10520,9 +10457,6 @@ msgstr "近づいてよく見れば"
 msgid "you can see the butterflies mating"
 msgstr "蝶が仲間になっているのが分かります"
 
-msgid "Proxy Options"
-msgstr "プロキシのオプション"
-
 msgid "Proxy _type:"
 msgstr "プロキシの種類(_T):"
 
@@ -10551,8 +10485,9 @@ msgstr "基本(_B)"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "拡張(_A)"
+#, fuzzy
+msgid "_Proxy"
+msgstr "プロキシ"
 
 msgid "Enabled"
 msgstr "有効"
@@ -10600,16 +10535,17 @@ msgid "Please update the necessary fields."
 msgstr "必要な項目を更新して下さい"
 
 #, fuzzy
-msgid "Room _List"
-msgstr "ルームの一覧"
+msgid "A_ccount"
+msgstr "アカウント:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "参加するチャットについて適切な情報を入力して下さい。\n"
 
-msgid "_Account:"
-msgstr "アカウント(_A):"
+#, fuzzy
+msgid "Room _List"
+msgstr "ルームの一覧"
 
 msgid "_Block"
 msgstr "拒否する(_B)"
@@ -10627,6 +10563,17 @@ msgid "I_M"
 msgstr "IM(_M)"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "チャットの追加(_A)"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "ビデオ・チャット"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "ファイルの送信(_S)"
 
@@ -10638,7 +10585,11 @@ msgid "View _Log"
 msgstr "ログの表示(_L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "オフラインの時は許可できません"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "オフラインの時は許可できません"
 
 msgid "_Alias..."
@@ -10777,6 +10728,10 @@ msgstr "/ツール/仲間をつかむ(_P)"
 msgid "/Tools/_Certificates"
 msgstr "/ツール/設定(_E)"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/ツール/個人情報"
+
 msgid "/Tools/Plu_gins"
 msgstr "/ツール/プラグイン(_G)"
 
@@ -10786,10 +10741,6 @@ msgstr "/ツール/設定(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ツール/個人情報(_I)"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/ツール/個人情報"
-
 msgid "/Tools/_File Transfers"
 msgstr "/ツール/ファイルの転送(_F)"
 
@@ -10911,8 +10862,8 @@ msgstr "手動"
 msgid "By status"
 msgstr "状態順"
 
-msgid "By log size"
-msgstr "ログ・サイズ順"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10930,6 +10881,9 @@ msgstr "接続"
 msgid "Re-enable"
 msgstr "アカウントを再び有効にする"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -11023,6 +10977,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "別名(_L):"
 
+msgid "_Group:"
+msgstr "グループ(_G):"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11056,6 +11013,116 @@ msgstr "/ツール"
 msgid "/Buddies/Sort Buddies"
 msgstr "/仲間/仲間の並び替え"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "背景色を変更します"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "このグループは仲間リストに追加されています"
+
+#, fuzzy
+msgid "Layout"
+msgstr "獅子座"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "背景色を変更します"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "広げる(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "背景色の選択"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "畳む(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "背景色の選択"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "ポート番号"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "オンライン"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "離席中"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "オフライン"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "血液型"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "メッセージを送信しました"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s のユーザ情報の変更"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11075,12 +11142,6 @@ msgstr "現在、その仲間を招待できるアカウントでサイン・イ
 msgid "Invite Buddy Into Chat Room"
 msgstr "仲間をチャット・ルームへ招待"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "招待したい相手の名前と、オプションで招待メッセージを入力して下さい:"
-
 msgid "_Buddy:"
 msgstr "仲間(_B):"
 
@@ -11109,7 +11170,8 @@ msgstr "無視する対象"
 msgid "Get Away Message"
 msgstr "離席メッセージの取得"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "最後のメッセージ:"
 
 msgid "Unable to save icon file to disk."
@@ -11156,6 +11218,22 @@ msgstr "/会話/別名で保存(_S)..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/会話/クリア(_R)"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/会話/その他(_O)"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/会話/その他(_O)"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/会話/その他(_O)"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/会話/ログの表示(_L)"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/会話/ファイルの送信(_N)..."
 
@@ -11229,6 +11307,18 @@ msgstr "/会話"
 msgid "/Conversation/View Log"
 msgstr "/会話/ログの表示"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/会話/その他(_O)"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/会話/ログの表示"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/会話/その他(_O)"
+
 msgid "/Conversation/Send File..."
 msgstr "/会話/ファイルの送信..."
 
@@ -11413,6 +11503,9 @@ msgstr "アーティスト"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "サポート"
 
@@ -11540,6 +11633,10 @@ msgstr "ヒンズー語"
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "ルーマニア語"
+
 msgid "Indonesian"
 msgstr "インドネシア語"
 
@@ -11555,6 +11652,10 @@ msgstr "グルジア語"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu グルジア語の翻訳者"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "その他"
+
 msgid "Kannada"
 msgstr "カンナダ語"
 
@@ -11577,6 +11678,10 @@ msgstr "リトアニア語"
 msgid "Macedonian"
 msgstr "マケドニア語"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "マケドニア語"
+
 msgid "Bokmål Norwegian"
 msgstr "ボックマル・ノルウェー語"
 
@@ -11633,6 +11738,9 @@ msgstr "パーティ"
 msgid "Swedish"
 msgstr "スウェーデン語"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "タミル語"
 
@@ -11692,7 +11800,25 @@ msgstr ""
 "ログラムは完全無保証です。<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #pidgin チャンネル<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #pidgin チャンネル<BR><BR>"
 
@@ -11959,7 +12085,7 @@ msgid "Hyperlink visited color"
 msgstr "ハイパーリンクの色"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "ハイパーリンクの上にマウスをのせた時の色です"
 
 msgid "Hyperlink prelight color"
@@ -11997,15 +12123,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "通知を削除する時期"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "新着メールを通知する"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12018,15 +12151,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "新着メールを通知する"
 
-msgid "_Copy Email Address"
-msgstr "E-メール・アドレスのコピー(_C)"
-
-msgid "_Open Link in Browser"
-msgstr "リンク先をブラウザで開く(_O)"
-
-msgid "_Copy Link Location"
-msgstr "リンク先のコピー(_C)"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12068,11 +12192,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "画像の保存"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "画像の保存(_S)..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "独自のスマイリーを表示する"
 
@@ -12163,10 +12286,6 @@ msgid "Font Face"
 msgstr "フォントの種類を変更します"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "背景色を変更します"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "メッセージの色を変更します"
 
@@ -12298,6 +12417,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12327,6 +12447,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12388,11 +12509,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "全てのメッセージを開く"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">新着メールがあります！</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "計算中..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12423,6 +12560,27 @@ msgstr ""
 "ブラウザのコマンドを '手動設定' したようですが、コマンドが指定されていませ"
 "ん。"
 
+#, fuzzy
+msgid "No message"
+msgstr "不明なメッセージ"
+
+msgid "Open All Messages"
+msgstr "全てのメッセージを開く"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">新着メールがあります！</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "新しい仲間をつかむ"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">新着メールがあります！</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "次のプラグインを解放します。"
 
@@ -12475,10 +12633,17 @@ msgstr "<b>プラグインの詳細</b>"
 msgid "Select a file"
 msgstr "ファイルの選択"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "つかむ仲間の編集"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "どのアカウントで誰をつかむか..."
 
+msgid "_Account:"
+msgstr "アカウント(_A):"
+
 msgid "_Buddy name:"
 msgstr "つかむ仲間(_B):"
 
@@ -12545,7 +12710,60 @@ msgstr "繰り返す(_R)"
 msgid "Pounce Target"
 msgstr "つかむ相手"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "入力を開始した時"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "入力を一旦停止した時"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "サイン・インした時"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s さんが待機中から戻ってきました (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "離席中から戻った時"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "入力を止めたようです"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "サイン・アウトした時"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "待機中になった時"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "離席する時だけ"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "メッセージを送信する"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "不明な \"つかみ\" イベントです。ぜひバグ報告して下さい！"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "スマイリーのテーマを展開できませんでした"
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "スマイリーのテーマを展開できませんでした"
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "スマイリーのテーマを展開できませんでした"
 
 msgid "Install Theme"
@@ -12568,6 +12786,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "%s さんとの会話"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "仲間リスト"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "システム・トレイのアイコン"
 
@@ -12577,8 +12801,9 @@ msgstr "いつアイコンを表示するか...(_S):"
 msgid "On unread messages"
 msgstr "メッセージが届いた時"
 
-msgid "Conversation Window Hiding"
-msgstr "会話ウィンドウを隠す"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "IM の会話ウィンドウ"
 
 msgid "_Hide new IM conversations:"
 msgstr "いつ新しい会話ウィンドウを隠すか...(_H):"
@@ -12586,6 +12811,10 @@ msgstr "いつ新しい会話ウィンドウを隠すか...(_H):"
 msgid "When away"
 msgstr "離席する時だけ"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "会話ウィンドウを前面に出す(_A)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "タブ"
@@ -12645,10 +12874,6 @@ msgstr "スクロールを滑らかにする"
 msgid "F_lash window when IMs are received"
 msgstr "メッセージを受け取ったらウィンドウを点滅させる(_L)"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "会話ウィンドウを前面に出す(_A)"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12682,13 +12907,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "ユーザ情報を取得できません"
 
-msgid "ST_UN server:"
-msgstr "STUN サーバ(_U):"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP-アドレスを自動的に検出する(_A)"
 
 msgid "Public _IP:"
@@ -12709,6 +12932,10 @@ msgstr "開始のポート番号(_S):"
 msgid "_End port:"
 msgstr "終了のポート番号(_E):"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "プロキシ・サーバ"
@@ -12738,6 +12965,10 @@ msgstr "プロキシ・サーバ"
 msgid "No proxy"
 msgstr "プロキシなし"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "ユーザ名(_U):"
 
@@ -12902,13 +13133,13 @@ msgstr "離席中で待機中の時"
 msgid "Auto-away"
 msgstr "自動離席"
 
-msgid "Change status when _idle"
-msgstr "待機中になったら状態を変更する(_I)"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "状態を変更するまでの時間(分)(_M):"
 
+msgid "Change status when _idle"
+msgstr "待機中になったら状態を変更する(_I)"
+
 msgid "Change _status to:"
 msgstr "次の状態に変更する(_S):"
 
@@ -13057,29 +13288,19 @@ msgstr "保存して使う(_V)"
 msgid "Status for %s"
 msgstr "%s の状態"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "スマイリー (顔文字) を挿入します"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "文字列が重複しています"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "%s さんの新しい名前を入力して下さい"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "スマイリー (顔文字) を挿入します"
@@ -13089,21 +13310,30 @@ msgid "Add Smiley"
 msgstr "スマイリー (顔文字) ！"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "画像の保存"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "ポート番号"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "スマイリー (顔文字) ！"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "ポート番号"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "仲間の選択"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "次の仲間アイコンを使用する(_I):"
 
@@ -13191,9 +13421,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "ランチャは転送できません"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "ドラッグしたのはデスクトップのランチャです。おそらくランチャ自身ではなく、ラ"
 "ンチャが指しているオブジェクトを転送したいのでしょう。"
@@ -13231,6 +13462,16 @@ msgstr ""
 "画像 '%s' の読み込みに失敗しました: 原因は不明ですが、おそらく画像ファイルが"
 "壊れているようです"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "リンクを開く方法(_O):"
+
+msgid "_Copy Link Location"
+msgstr "リンク先のコピー(_C)"
+
+msgid "_Copy Email Address"
+msgstr "E-メール・アドレスのコピー(_C)"
+
 msgid "Save File"
 msgstr "ファイルの保存"
 
@@ -13326,6 +13567,78 @@ msgstr "仲間と会話する可能性を予測するプラグインです"
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "サーバのアドレス"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "会議サーバの入力"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "問い合わせる会議サーバの選択"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "オンライン・サービス"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "仲間リストの送信"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "離席中になった時"
+
+#, fuzzy
+msgid "Directory"
+msgstr "ログを記録するフォルダ"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "サウンドの選択"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "説明"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "フォルダ情報の設定"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "ブラウザ(_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "ユーザがいません"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "サーバはサポートしている認証手法を利用しません"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "フォルダ情報の設定"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"これは XMPP サービスやクライアントをデバッグする際に便利なプラグインです。"
+
 msgid "Buddy is idle"
 msgstr "待機中の仲間"
 
@@ -13709,9 +14022,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "コラボレートするための楽曲メッセージ・プラグインです"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "リアルタイムで共通スコアを編集することにより、複数の仲間との間で、楽曲を一部"
 "分を同時に演奏することを可能にする楽曲メッセージのプラグインです。"
@@ -13826,12 +14140,6 @@ msgstr ""
 "- 受信した全てのテキストを反転します\n"
 "- サイン・インしたら仲間リストの人たちにメッセージを速攻で送信します"
 
-msgid "Cursor Color"
-msgstr "カーソルの色"
-
-msgid "Secondary Cursor Color"
-msgstr "二番目のカーソルの色"
-
 msgid "Hyperlink Color"
 msgstr "ハイパーリンクの色"
 
@@ -13843,6 +14151,10 @@ msgstr "ハイパーリンクの色"
 msgid "Highlighted Message Name Color"
 msgstr "強調表示したメッセージ"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "通知を削除する時期"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView の水平方向のセパレータ"
 
@@ -13872,35 +14184,24 @@ msgstr "GTK+ インタフェースで使用するフォント"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ テキストのショートカットのテーマ"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "インタフェースの色"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "新着メールを通知する"
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ テーマのカスタマイズ"
 
-msgid "Widget Sizes"
-msgstr "ウィジットの大きさ"
+#, fuzzy
+msgid "Colors"
+msgstr "閉じる"
 
 msgid "Fonts"
 msgstr "フォント"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13989,7 +14290,7 @@ msgstr "会話ウィンドウを隠す"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14041,6 +14342,113 @@ msgstr "メッセージの置換"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "ユーザが定義した規則に従って、実際に送信するメッセージを書き換えます"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "ログインしていません"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "ログインしていません"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "チャットに参加"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "無視する対象"
+
+#, fuzzy
+msgid "Founder"
+msgstr "まあまあ大きい"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "承認が得られました"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "エラー"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "情報"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "質問ダイアログの文字"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "警告レベル"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s の状態"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "チャット・ルームの場所"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "アイコンの保存"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "GTK+ テーマのカスタマイズ"
+
+#, fuzzy
+msgid "Contact"
+msgstr "連絡先の情報"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "仲間リスト"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "仲間リスト"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "GTK+ テーマのカスタマイズ"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "GTK+ テーマのカスタマイズ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14202,17 +14610,15 @@ msgstr "仲間リストを前面に配置したままにする(_K):"
 msgid "Only when docked"
 msgstr "格納した時にだけ"
 
-msgid "_Flash window when chat messages are received"
-msgstr "チャットでメッセージを受け取ったらウィンドウを点滅させる(_F)"
-
 msgid "Windows Pidgin Options"
 msgstr "Windows 版 Pidgin のオプション"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 専用のオプション機能を提供します"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Windows 版の Pidgin に特化したオプション機能 (会話ウィンドウの組み込みなど) "
 "を提供します"
@@ -14255,6 +14661,520 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "これは XMPP サービスやクライアントをデバッグする際に便利なプラグインです。"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "ソケットを開けません"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "ソケットを監視できませんでした"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "ソケットを読めません"
+
+#~ msgid "Connection failed."
+#~ msgstr "接続に失敗しました"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "サーバが接続を切りました"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "ソケットを生成できませんでした"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "ホストへ接続できませんでした"
+
+#~ msgid "Read error"
+#~ msgstr "読み込みエラーです"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "サーバとの接続を確立できませんでした:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "書き込みエラー"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "フォルダ情報の設定"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "その他"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "チャットの別名"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "フォルダ情報がありません"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "コマンド指定"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML 形式"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "登録エラー"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "場所"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "ユーザの検索"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "仲間の状態の通知"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "サポートしていないバージョン"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "向き"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "ユーザ・モード"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "ユーザの制限"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "機能"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "ユーザ名"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "キー交換付き IM"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "E-メール・アドレス"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "プロフィール"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "参加する"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "ユーザ名"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "ライブ・ビデオ"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "メッセージを受信しました"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "公開鍵の Babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "ユーザのオプション"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "ユーザ・モード"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "ユーザ名"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "ユーザの制限"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian 暗号化"
+
+#~ msgid "Read Error"
+#~ msgstr "読み込みエラー"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "サーバへの接続に失敗しました"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "キューが一杯です"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "メッセージを解読できません"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "ホストへ接続できませんでした"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "ログインに失敗しました (%s)。"
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "サーバへ接続できません"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "別のワークステーションからログインしているので、強制的にログアウトされまし"
+#~ "た。"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "エラーです。SSL サポートがインストールされていません。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "パスワードが間違っています。"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS サーバに接続できませんでした:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "まもなく切断されるでしょう。更新のために、%s をチェックして下さい。"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "接続できませんでした"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "名前が間違っています"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "サーバの情報を取得できません"
+
+#~ msgid "Connection lost"
+#~ msgstr "接続を閉じました"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "ホスト名を解決できませんでした"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "書き込み用の接続を閉じました"
+
+#~ msgid "Connection reset"
+#~ msgstr "接続のリセット"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "ソケットから読み込む際にエラー: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "ホストに接続できません"
+
+#~ msgid "Could not write"
+#~ msgstr "書き込めませんでした"
+
+#~ msgid "Could not connect"
+#~ msgstr "接続できませんでした"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "ソケットを生成できませんでした"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ホスト名を解決できませんでした"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "パスワードが間違っています"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s との接続を確立できませんでした:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan! に接続する"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "日本のページャ・サーバ"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "日本のファイル転送サーバ"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "サーバとの接続が切れました\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "ホスト名を解決できませんでした"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポー"
+#~ "トしていません。"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "会話ウィンドウを隠す"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "%s さんの新しい名前を入力して下さい"
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "どの ID を有効化しますか？"
+
+#~ msgid "Cursor Color"
+#~ msgstr "カーソルの色"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "二番目のカーソルの色"
+
+#~ msgid "Interface colors"
+#~ msgstr "インタフェースの色"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "ウィジットの大きさ"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "メッセージの中に埋め込む"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "招待したい相手の名前と、オプションで招待メッセージを入力して下さい:"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Notes アドレス帳の選択"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "まもなく切断されるでしょう。修正されたら TOC を利用してかまいません。更新"
+#~ "のために、%s をチェックして下さい。"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "仲間の追加"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "サーバの情報を取得できません"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "読み込み時にエラー"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "サーバとの接続を失いました:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "サーバへ接続"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "名前の取得に失敗しました: %s"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s の検索中"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s への接続に失敗しました"
+
+#~ msgid "Signon: %s"
+#~ msgstr "サイン・イン: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "ファイル %s を書き込めません"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "ファイル %s を読み込めません"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "メッセージが長過ぎるので最後の %s バイトを切りつめました"
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s さんは正しくログインしていません"
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s の警告は許されません"
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "サーバの速度制限を越えたためメッセージは落されました"
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%s でのチャットはできません"
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "早すぎて %s へメッセージを送信できません"
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "大きすぎるため %s からの IM を無視しました"
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "早く送りすぎたので %s さんからの IM を無視しました"
+
+#~ msgid "Failure."
+#~ msgstr "失敗しました"
+
+#~ msgid "Too many matches."
+#~ msgstr "一致するものが多すぎます"
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "より多くの修飾語を必要とします"
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "一時的にディレクトリ・サービスが利用できません"
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "E-メール検索が拒否されました"
+
+#~ msgid "Keyword ignored."
+#~ msgstr "キーワードが無効です"
+
+#~ msgid "No keywords."
+#~ msgstr "キーワードがありません"
+
+#~ msgid "User has no directory information."
+#~ msgstr "フォルダ情報がありません"
+
+#~ msgid "Country not supported."
+#~ msgstr "サポートされていない国です"
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "原因不明の失敗: %s"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "スクリーン名またはパスワードが間違っています"
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "一時的にサービスが利用できません"
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "ログインする警告レベルが高すぎます"
+
+#~ msgid ""
+#~ "You have been connecting and disconnecting too frequently.  Wait ten "
+#~ "minutes and try again.  If you continue to try, you will need to wait "
+#~ "even longer."
+#~ msgstr ""
+#~ "接続と切断を繰り返し行いました。10 分程待ってから再び試みてください。その"
+#~ "まま続行すると、さらに長く待たなければならなくなりますよ。"
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "原因不明のサイン・オン・エラーが起こりました: %s"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "不明なエラー %d が発生しました (情報: %s)"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "グループ名が間違っています"
+
+#~ msgid "Connection Closed"
+#~ msgstr "接続を閉じました"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "返答待ちです..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC は一時停止状態から戻りました。メッセージを再送できます。"
+
+#~ msgid "Password Change Successful"
+#~ msgstr "パスワードの変更が完了しました"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "フォルダ情報の取得"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "フォルダ情報の設定"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "書き込みモードで %s を開けません！"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "ファイル転送が失敗しました。おそらく向こう側がキャンセルしたのでしょう。"
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "転送できませんでした！"
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "ファイルヘッダを書けません。ファイルは送信されません。"
+
+#~ msgid "Save As..."
+#~ msgstr "別名で保存..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s さんから %s さんへの %d個のファイルの要求: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s さんから %s さんへの %d個のファイルの要求: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s さんがファイルを送るよう要求しています"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC プロトコル・プラグイン"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%s のユーザ情報は有効ではありません"
+
+#~ msgid "%s Options"
+#~ msgstr "%s のオプション"
+
+#~ msgid "Proxy Options"
+#~ msgstr "プロキシのオプション"
+
+#~ msgid "By log size"
+#~ msgstr "ログ・サイズ順"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "リンク先をブラウザで開く(_O)"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN サーバ(_U):"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "画像の保存"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "チャットでメッセージを受け取ったらウィンドウを点滅させる(_F)"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "その名前のグループは既に存在します"
 
@@ -14358,13 +15278,6 @@ msgstr ""
 #~ msgid "Change Qun information"
 #~ msgstr "チャンネル情報"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "システム・メッセージ"
 
@@ -14567,9 +15480,6 @@ msgstr ""
 #~ msgstr ""
 #~ "グループ %d に参加するあなたの要求が管理者 %d によって承認されました"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "このグループは仲間リストに追加されています"
-
 #~ msgid "I am applying to join"
 #~ msgstr "I am applying to join"
 
@@ -14594,10 +15504,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "理由を入力して下さい:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "接続を開始する際にエラー"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "ログインできません (デバッグ・ログを確認して下さい)"
 
@@ -14716,17 +15622,9 @@ msgstr ""
 #~ msgstr "現在のトークン"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "サーバへ接続できません"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "メッセージ(_M):"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "アカウント:"
-
 #~ msgid "Commands are not supported yet. Message was NOT sent."
 #~ msgstr "まだコマンドはサポートしていません (メッセージを送信しませんでした)"
 
diff --git a/po/ka.po b/po/ka.po
index 14d97f8d9d..df24739b53 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0 CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-02-05 23:19+0100\n"
 "Last-Translator: Ubuntu Georgian Translators <>\n"
 "Language-Team: Georgian <ka@li.org>\n"
@@ -32,7 +32,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -621,18 +621,6 @@ msgid "Send To"
 msgstr "_გაგზავნა"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "გახსენი ყველა შეტყობინება"
-
-msgid "Invite"
-msgstr "დაპატიჟება"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-
-#, fuzzy
 msgid "Conversation"
 msgstr "საუბრები"
 
@@ -885,6 +873,43 @@ msgid "System Log"
 msgstr "სისტემის პროტოკოლი"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "გაანგარიშება..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "_აქცეპტირება"
+
+#, fuzzy
+msgid "Reject"
+msgstr "განულება"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "თქვენ"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "ელ.ფოსტა"
 
@@ -920,6 +945,9 @@ msgstr "დაკავშირება"
 msgid "IM"
 msgstr "მოკ-შე"
 
+msgid "Invite"
+msgstr "დაპატიჟება"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(უსახელო)"
@@ -1137,7 +1165,6 @@ msgstr "%s გავიდა. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr ""
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1191,7 +1218,6 @@ msgstr "_დრო სტატუსის შეცვლამდე(წუ�
 msgid "Change status to"
 msgstr "სტატუსის შეცვლა"
 
-#. Conversations
 msgid "Conversations"
 msgstr "საუბრები"
 
@@ -1528,7 +1554,6 @@ msgid ""
 msgstr ""
 "პლაგინი, ახალი საუბრის ჩართვისას გიჩვენებთ ბოლო საუბრარს მოცემულ ფანჯარაში."
 
-#, c-format
 msgid "Online"
 msgstr "ხაზზე"
 
@@ -1577,6 +1602,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "ანგარიშები"
 
@@ -1675,15 +1722,6 @@ msgstr ""
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "_აქცეპტირება"
-
-#, fuzzy
-msgid "Reject"
-msgstr "განულება"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1773,6 +1811,8 @@ msgstr "+++ %s შემოვიდა ქსელში"
 msgid "+++ %s signed off"
 msgstr "+++ %s გავიდა ქსელიდან"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "უცნობი შეცდომა"
 
@@ -1821,6 +1861,16 @@ msgstr "%s გავიდა ოთახიდან."
 msgid "%s left the room (%s)."
 msgstr "%s გავიდა ოთახიდან (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "დაპატიჟება კონფერენციაზე"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "ახალი კავშირის დამყარება შეუძლებელია"
@@ -1956,7 +2006,6 @@ msgstr ""
 msgid "Transfer of file %s complete"
 msgstr "%s ფაილის გადატანა დასრულდა"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "ფაილის გადაგზავნა შესრულდა"
 
@@ -1964,7 +2013,6 @@ msgstr "ფაილის გადაგზავნა შესრულდ�
 msgid "You canceled the transfer of %s"
 msgstr "თქვენ შეწყვიტეთ %s ფაილის გადატანა"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "ფაილის გადაგზავნა შეწყვეტილია"
 
@@ -2145,11 +2193,14 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <ავტო-პასუხი>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "ვერ ვქმნი კონფერენციას (%s)."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2545,7 +2596,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2596,7 +2647,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2625,6 +2676,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "შეიყვანე პაროლი"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2815,18 +2892,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "ახალი კავშირის დამყარება შეუძლებელია"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "სახელი"
 
@@ -2861,6 +2938,11 @@ msgstr "Bonjour პროტოკოლის პლაგინი"
 msgid "Purple Person"
 msgstr "ახალი პერსონა"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "მდებარეობა"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2873,17 +2955,17 @@ msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "პროტოკოლირება გამორთულია. ამ მომენტიდან საუბრის პროტოკოლირება შეწყვეტილია."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "ვერ ვაგზავნი ფაილს"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ვერ ვქმნი სოკეტს"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "შეუძლებელია სოკეტის შექმნა"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "ვერ ვქმნი სოკეტს"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2930,13 +3012,14 @@ msgstr "მეგობრების სიის შენახვა..."
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "პაროლები არ ემთხვევა ერთმანეთს."
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2948,14 +3031,15 @@ msgstr "რეგისტრაცია მოხერხდა!"
 msgid "Password"
 msgstr "პაროლი"
 
-msgid "Password (retype)"
-msgstr "პაროლი (მეორედ)"
+msgid "Password (again)"
+msgstr "პაროლი (კიდევ ერთხელ)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "სურათის შენახვა"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -3008,6 +3092,15 @@ msgstr "პაროლი შეიცვალა!"
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr "პაროლი (მეორედ)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3021,13 +3114,13 @@ msgstr ""
 msgid "Add to chat..."
 msgstr "დაამატე ჩატს..."
 
+#. Global
 msgid "Available"
 msgstr "მისაწვდომია"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "გასული"
 
@@ -3056,7 +3149,8 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "ვერ ვკითხულობ სოკეტს"
 
 msgid "Buddy list downloaded"
@@ -3071,8 +3165,14 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
-msgstr "კავშირი ვერ განხორციელდა."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "შეერთებული"
+
+msgid "Connection failed"
+msgstr ""
 
 msgid "Add to chat"
 msgstr ""
@@ -3080,13 +3180,23 @@ msgstr ""
 msgid "Chat _name:"
 msgstr "ჩატის _სახელი:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "დაკავშირება"
+
 msgid "Chat error"
 msgstr "ჩატის შეცდომა"
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "არ ვარ დაკავშირებული სერვერთან."
 
 #, fuzzy
@@ -3129,6 +3239,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu მომხმარებელი"
 
+#, fuzzy
+msgid "GG server"
+msgstr "მომხმარებლის ინფორმაციის შეტანა..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "უცნობი ბრძანება: %s"
@@ -3145,7 +3259,7 @@ msgid "File Transfer Failed"
 msgstr "ფაილის გადაგზავნა ვერ მოხერხდა"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin ვერ ხსნის მხმენელ პორტს."
 
 msgid "Error displaying MOTD"
@@ -3161,8 +3275,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
-msgstr "სერვერი გაითიშა"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "არ ვარ დაკავშირებული სერვერთან."
 
 msgid "View MOTD"
 msgstr ""
@@ -3173,26 +3295,24 @@ msgstr "_არხი:"
 msgid "_Password:"
 msgstr "_პაროლი:"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "დაკავშირება"
-
 #, fuzzy
 msgid "SSL support unavailable"
 msgstr "SSL სუპორტი"
 
-msgid "Couldn't create socket"
-msgstr "შეუძლებელია სოკეტის შექმნა"
+msgid "Unable to connect"
+msgstr "დაკავშირება შეუძლებელია"
 
-msgid "Couldn't connect to host"
-msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
-msgid "Read error"
-msgstr "კითხვის შეცდომა"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "სერვერი გაითიშა"
 
 msgid "Users"
 msgstr "მომხმარებლები"
@@ -3374,6 +3494,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "მეტსახელი"
+
 msgid "Cannot change nick"
 msgstr ""
 
@@ -3575,10 +3706,10 @@ msgstr "ბრძანება გაუქმებულია"
 msgid "execute"
 msgstr "მოულოდნელი"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3593,18 +3724,49 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "ტექსტური დადასტურება"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "აუტენტიფიკაცია ვერ მოხერხდა"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "სერვერის არასწორი პასუხი"
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL შეცდომა"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "მიზეზი მითითებული არაა"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "ახალი კავშირის დამყარება შეუძლებელია"
+
 msgid "Full Name"
 msgstr "სრული სახელი"
 
@@ -3671,183 +3833,9 @@ msgstr "ქალაქი"
 msgid "Operating System"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "მთლიანი მისამართი"
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "ბრძანება"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr ""
-
 #, fuzzy
-msgid "In-Band Registration"
-msgstr "რეგისტრაციის შეცდომა"
-
-#, fuzzy
-msgid "User Location"
-msgstr "ადგილმდებარეობა"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "მომხმარებლის ძებნა"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "მდგომარეობა შეტყობინება"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "საუბრის შენახვა"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "ორიენტაცია"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "ფაილის გადაგზავნა"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "მომხმარებლის ოთახები"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "მომხმარებელთა ლიმიტი"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "შეუძლია"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "მომხმარებლის სახელი"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Email მისამართი"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "MSN პროფაილი"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "მომხმარებლის სახელი"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "ცოცხალი ვიდეო"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "შეტყობინება მიღებულია"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "ავთენტურობის დადგენა ღია გასაღებით"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "მომხმარებლის პარამეტრები"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "მომხმარებლის ოთახები"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "მომხმარებლის სახელი"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "მომხმარებელთა ლიმიტი"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian შიფრი"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "შეუძლია"
+msgid "Local Time"
+msgstr "ლოკალური ფაილი:"
 
 msgid "Priority"
 msgstr "პრიორიტეტი"
@@ -3855,6 +3843,14 @@ msgstr "პრიორიტეტი"
 msgid "Resource"
 msgstr "რესურსი"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "პროტოკოლირება"
+
 msgid "Middle Name"
 msgstr "ოჯახური სახელი"
 
@@ -3904,7 +3900,6 @@ msgstr ""
 msgid "Extended Away"
 msgstr "გაფართოებული გასული"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
@@ -4024,28 +4019,27 @@ msgstr ""
 msgid "Find Rooms"
 msgstr "იპოვე ოთახები"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "სინონიმი:"
 
-msgid "Write error"
-msgstr "წერის შეცდომა"
+#, fuzzy
+msgid "No users found"
+msgstr "ვერ ვიპოვე პროტოკოლები"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "ტექსტი"
+msgid "Roles:"
+msgstr "როლი"
 
-msgid "Read Error"
-msgstr "კითხვის შეცდომა"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "ტექსტი"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "ვერ ვქმნი სოკეტს"
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "არასწორი ID"
@@ -4053,6 +4047,10 @@ msgstr "არასწორი ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
@@ -4079,9 +4077,6 @@ msgstr "რეგისტრაცია მოხერხდა"
 msgid "Unregistration Failed"
 msgstr "რეგისტრაცია ვერ მოხერხდა"
 
-msgid "Already Registered"
-msgstr "უკვე რესგისტრირებულია"
-
 #, fuzzy
 msgid "State"
 msgstr "მდგომარეობა"
@@ -4096,6 +4091,9 @@ msgstr "ტელეფონი"
 msgid "Date"
 msgstr "თარიღი"
 
+msgid "Already Registered"
+msgstr "უკვე რესგისტრირებულია"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "რესგისტრაცია"
@@ -4127,6 +4125,10 @@ msgid "Change Registration"
 msgstr "რეგისტრაციის შეცდომა"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "შეცდომა ანგარიში ინფორმაცია"
 
@@ -4148,10 +4150,19 @@ msgstr "მიმდენარეობს აუტენტიფიკა�
 msgid "Re-initializing Stream"
 msgstr "სტრიმი"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 #, fuzzy
 msgid "Not Authorized"
 msgstr "ავტორიზაცია"
 
+msgid "Mood"
+msgstr ""
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "ორივე"
 
@@ -4175,12 +4186,6 @@ msgstr "არაფერი"
 msgid "Subscription"
 msgstr "აბონირება"
 
-msgid "Mood"
-msgstr ""
-
-msgid "Now Listening"
-msgstr ""
-
 msgid "Mood Text"
 msgstr ""
 
@@ -4225,9 +4230,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr "შეცდომა პაროლის შეცვლისას"
 
-msgid "Password (again)"
-msgstr "პაროლი (კიდევ ერთხელ)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "შეცვალე პაროლი"
@@ -4426,19 +4428,27 @@ msgstr ""
 msgid "Unable to ping user %s"
 msgstr "შეუძლებელია შეტყობინების გაგზავნა: %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
+"ვერ ვეგზავნი ფაილს %s -თან. მომხმარებლის პროგრამას არ შეუძლია ფაილების მიღება"
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
+"ვერ ვეგზავნი ფაილს %s -თან. მომხმარებლის პროგრამას არ შეუძლია ფაილების მიღება"
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 "ვერ ვეგზავნი ფაილს %s -თან. მომხმარებლის პროგრამას არ შეუძლია ფაილების მიღება"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4448,8 +4458,35 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr "%s შემოვიდა ქსელში."
 
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "შეუძლებელია შეტყობინების გაგზავნა %s -თან"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+"ვერ ვეგზავნი ფაილს %s -თან. მომხმარებლის პროგრამას არ შეუძლია ფაილების მიღება"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"ვერ ვეგზავნი ფაილს %s -თან. მომხმარებლის პროგრამას არ შეუძლია ფაილების მიღება"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "რეგისტრაცია ვერ მოხერხდა"
+
 #, c-format
-msgid "Buzzing %s..."
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "ფაილის არჩევა"
+
+msgid "Initiate Media"
 msgstr ""
 
 msgid "config:  Configure a chat room."
@@ -4471,13 +4508,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4541,6 +4578,9 @@ msgstr "კავშირის სერვერი"
 msgid "File transfer proxies"
 msgstr "ფაილების გადაგზავნა"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4581,6 +4621,14 @@ msgstr "შეცდომა XML ფაილის შეტანისას
 msgid "Unknown Error in presence"
 msgstr "უცნობი შეცდომის კოდი"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr "შექმენი ახალი ოთახი"
 
@@ -4595,12 +4643,30 @@ msgstr "ოთახის _კონფიგურაცია"
 msgid "_Accept Defaults"
 msgstr ""
 
+#, fuzzy
+msgid "No reason"
+msgstr "მიზეზი მითითებული არაა"
+
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s გახდა უმოქმედო (%s)"
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "Kicked (%s)"
 msgstr ""
 
-#, c-format
-msgid "Error in chat %s"
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "ფაილის გადაგზავნა ვერ მოხერხდა"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "ფაილის გახსნა შეუძლებელია."
+
+msgid "Failed to open in-band bytestream"
 msgstr ""
 
 #, c-format
@@ -4629,10 +4695,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-#, fuzzy
-msgid "Select a Resource"
-msgstr "ფაილის არჩევა"
-
 msgid "Edit User Mood"
 msgstr ""
 
@@ -4671,9 +4733,19 @@ msgstr "მოქმედება"
 msgid "Select an action"
 msgstr "ფაილის არჩევა"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "ვერ ვამატებ \"%s\"-ს"
+
+msgid "Buddy Add error"
+msgstr ""
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "ვერ ვქმნი სოკეტს"
+msgid "The username specified does not exist."
+msgstr "მომხმარებელი არ არსებობს"
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4899,7 +4971,6 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4923,6 +4994,10 @@ msgstr "კონტატის წაშლა"
 msgid "Non-IM Contacts"
 msgstr "კონტატის წაშლა"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -4991,6 +5066,13 @@ msgstr ""
 msgid "Page"
 msgstr "გვერდი"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "შენშვნის დონე"
+
 msgid "Has you"
 msgstr "ხართ მის სიაში"
 
@@ -5031,6 +5113,14 @@ msgstr "მისამართი"
 msgid "Album"
 msgstr ""
 
+#, fuzzy
+msgid "Game Title"
+msgstr "სათაური"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "სათაური"
+
 msgid "Set Friendly Name..."
 msgstr "შეიტანე მეტსახელი..."
 
@@ -5064,9 +5154,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr "შეცდომა პროფაილის ჩამოტანისას"
 
@@ -5234,8 +5321,9 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
-msgstr "პროფაილის URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "მომხმარებელი გასულია ქსელიდან"
 
 #. *< type
 #. *< ui_requirement
@@ -5271,64 +5359,27 @@ msgstr "ჩვეულებრივი ავთენტურობის �
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "ჩვეულებრივი ავთენტურობის დადგენა ვერ მოხერხდა!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr "უცნობი შეცდომა."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "შეტყობინების გაგზავნა"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "უცნობი შეცდომა"
 
 msgid "Unable to add user"
 msgstr ""
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "უცნობი შეცდომა"
 
-#, c-format
-msgid "%s is not a valid passport account."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
-msgid "Service Temporarily Unavailable."
-msgstr "სერვისი დროებით მიუწვდომელია."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr "ვერ ვცვლი ჯგუფის სახელს"
-
-msgid "Unable to delete group"
-msgstr "ვერ ვშლი ჯგუფს"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5360,9 +5411,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "დაკავშირება შეუძლებელია"
-
 msgid "Writing error"
 msgstr "წერის შეცდომა"
 
@@ -5375,19 +5423,21 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
-msgstr ""
+#, fuzzy
+msgid "Our protocol is not supported by the server"
+msgstr "ეს პროტოკოლს არ ააქ chat-ოთახების მხარდაჭერა."
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "შეცდომა პროფაილის ჩამოტანისას"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5416,6 +5466,14 @@ msgstr "ქუკის გაგზავნა"
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "კომპიუტერისგან გასული"
 
@@ -5452,14 +5510,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "მისამართების წიგნში ჩამატება"
@@ -5467,19 +5517,15 @@ msgstr "მისამართების წიგნში ჩამატ�
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr ""
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "ვერ ვამატებ \"%s\"-ს"
-
 msgid "The username specified is invalid."
 msgstr ""
 
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "პროფაილის URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5494,18 +5540,63 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "AIM/ICQ პროტოკოლის პლაგინი"
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+msgid "Unknown error."
+msgstr "უცნობი შეცდომა."
+
+#, c-format
+msgid "%s on %s (%s)"
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr "სერვისი დროებით მიუწვდომელია."
+
+msgid "Unable to rename group"
+msgstr "ვერ ვცვლი ჯგუფის სახელს"
+
+msgid "Unable to delete group"
+msgstr "ვერ ვშლი ჯგუფს"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "მომხმარებლის ოთახები"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "კითხვის შეცდომა"
 
@@ -5517,12 +5608,23 @@ msgstr "ვერ ვკიტხულობ"
 msgid "Logging in"
 msgstr "პროტოკოლირება"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "უსახელო"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "არ ვარ დაკავშირებული სერვერთან."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "შეტყობინების გაგზავნა"
@@ -5543,20 +5645,21 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "უსახელო"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_მოკლე შეტყობინებების ფანჯრები"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "შეერთებული"
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "სერვერის არასწორი პასუხი"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5564,15 +5667,22 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "არასწორია მეტსახელი ან პაროლი"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
+#, fuzzy
+msgid "Invalid input condition"
+msgstr "კავშირის დასრულება"
+
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5582,14 +5692,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "მომხმარებლის ოთახები"
-
 msgid "Failed to remove buddy"
 msgstr ""
 
@@ -5599,37 +5701,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "კავშირის დასრულება"
-
-msgid "Read buffer full (2)"
+msgid "Missing Cipher"
 msgstr ""
 
-#, fuzzy
-msgid "Unparseable message"
-msgstr "შეტყობინების გაგზავნა"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
-
-#, fuzzy
-msgid "IM Friends"
-msgstr "_მოკლე შეტყობინებების ფანჯრები"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "სერვერის არასწორი პასუხი"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5677,10 +5758,6 @@ msgid "User"
 msgstr "მომხმარებლები"
 
 #, fuzzy
-msgid "Profile"
-msgstr "MSN პროფაილი"
-
-#, fuzzy
 msgid "Headline"
 msgstr "ნამდვილი სახელი"
 
@@ -5695,15 +5772,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "დაასრულე საუბარი"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "უსახელო"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5716,6 +5788,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "სერვერი მიუწვდომელია"
@@ -5724,6 +5799,14 @@ msgstr "სერვერი მიუწვდომელია"
 msgid "Please try another username:"
 msgstr "გთხოვთ შეიყვანოთ თქვენი ახალი პაროლი"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "უსახელო"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5921,10 +6004,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "არასწორია მეტსახელი ან პაროლი"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5963,9 +6042,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr "უცნობი შეცდომა: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "შეუძლებელია შეტყობინების გაგზავნა: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6063,9 +6142,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr "მიმდენარეობს აუტენტიფიკაცია..."
 
-msgid "Unable to connect to server."
-msgstr "შეუძლებელია სერვერთან დაკავშირება"
-
 msgid "Waiting for response..."
 msgstr "ველოდები პასუხს..."
 
@@ -6086,23 +6162,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -6126,6 +6195,23 @@ msgid "Server port"
 msgstr "სერვერი-პორტი"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "სერვერის არასწორი პასუხი"
+
+#. username connecting too frequently
+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 ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "შეცდომა პროფაილის ჩამოტანისას"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "ვერ ვუკავშირდები"
 
@@ -6134,17 +6220,7 @@ msgid "Invalid chat room name"
 msgstr "არასწორი ოთახის სახელი"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "სერვერი გაითიშა"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "არ ვარ დაკავშირებული სერვერთან."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #. *< type
@@ -6194,8 +6270,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 msgid "Direct IM established"
 msgstr ""
@@ -6363,23 +6440,19 @@ msgstr "კამერა"
 msgid "Screen Sharing"
 msgstr "მომხმარებელი"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Free For Chat"
 msgstr "თავისუფალი Chat-ი"
 
-#, c-format
 msgid "Not Available"
 msgstr "ხელმიუწვდომელია"
 
-#, c-format
 msgid "Occupied"
 msgstr "დაკავებულია"
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr "უხილავია"
 
@@ -6393,16 +6466,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "არ ვარ დაკავშირებული სერვერთან."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
+msgid "Unable to connect to BOS server: %s"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #, fuzzy
 msgid "Username sent"
@@ -6417,46 +6486,52 @@ msgstr "კავშირის დასრულება"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "არასწორი"
+msgid "Unable to get a valid AIM login hash."
+msgstr "ვერ ვკითხულობ ფაილს %s."
 
-msgid "Incorrect password."
-msgstr "არასწორი პაროლი."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "ვერ ვკითხულობ ფაილს %s."
+
+msgid "Received authorization"
+msgstr "მივიღე ავტორიზაცია"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "მომხმარებელი არ არსებობს"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr "ვერ ვუკავშირდები"
-
-msgid "Received authorization"
-msgstr "მივიღე ავტორიზაცია"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6472,24 +6547,6 @@ msgstr ""
 msgid "_OK"
 msgstr "OK"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "ვერ ვკითხულობ ფაილს %s."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "ვერ ვკითხულობ ფაილს %s."
-
 msgid "Password sent"
 msgstr "პაროლი გაგზავნილია"
 
@@ -6599,7 +6656,7 @@ 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] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "შეუძლებელია შეტყობინების გაგზავნა: %s"
@@ -6621,6 +6678,13 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr "შეუძლია"
+
+#, fuzzy
+msgid "Profile"
+msgstr "MSN პროფაილი"
+
 msgid "Your AIM connection may be lost."
 msgstr ""
 
@@ -6774,7 +6838,7 @@ msgstr "გასულობის შეტყობინება ძალ�
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6797,7 +6861,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6805,7 +6869,7 @@ msgid "(no name)"
 msgstr "(უსახელო)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -6870,6 +6934,7 @@ msgstr "დაკავშირება"
 msgid "Get AIM Info"
 msgstr "გამოიძახე ინფორმაცია"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr ""
 
@@ -6929,6 +6994,7 @@ msgstr "ძებნა"
 msgid "Set User Info (web)..."
 msgstr "მომხმარებლის ინფორმაციის შეცვლა (URL)"
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "პაროლის შეცვლა (URL)"
@@ -6959,6 +7025,10 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "მომხმარებელი არ არის ხაზზე"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6976,7 +7046,7 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
@@ -7082,7 +7152,7 @@ msgstr "Opera"
 msgid "Visible"
 msgstr "უხილავია"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7176,17 +7246,50 @@ msgstr "ბოლო განახლება"
 msgid "Could not change buddy information."
 msgstr "გთხოვთ ქვემოთ შეიტანოთ ინფორმაცია პერსონის შესახებ"
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
 msgstr ""
 
+msgid "Note"
+msgstr "შენიშვნა"
+
+#. callback
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "დაამატე მეგობარი"
+msgid "Buddy Memo"
+msgstr "მეგობრის მინი-სურათი"
+
+msgid "Change his/her memo as you like"
+msgstr ""
 
-msgid "Input answer here"
+#, fuzzy
+msgid "_Modify"
+msgstr "შეცვლა"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "შეცვლა"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "სერვერი დაკავებულია"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "დადასტურების მოთხოვნა"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "დავამატო მეგობარი შენ სიას?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "შეიყვანეთ კონფერენციების სერვერი"
+
 #, fuzzy
 msgid "Send"
 msgstr "_გაგზავნა"
@@ -7199,19 +7302,20 @@ msgstr "არასწორი პაროლი"
 msgid "Authorization denied message:"
 msgstr "ავტორიზაციის უარყოფის შეტყობინება"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "ვიწყებ ავთენტურობის დადგენას"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "დავამატო მეგობარი შენ სიას?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "შეიყვანეთ კონფერენციების სერვერი"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7234,7 +7338,7 @@ msgid "Failed sending authorize"
 msgstr "გთხოვთ გამიკეთოთ ავტორიზაცია!"
 
 #, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr ""
 
 #, c-format
@@ -7279,6 +7383,9 @@ msgstr "გთხოვთ შეიყვანოთ თქვენი ახ
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
 msgid "Not member"
 msgstr ""
 
@@ -7319,15 +7426,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "ჩაერთე საუბარში"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "ტელეფონის ნომერი"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7338,7 +7448,7 @@ msgstr "ხმის პარამეტრები"
 msgid "Failed:"
 msgstr "ოპერაცია ვერ/არ ჩატარდა"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7350,11 +7460,11 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "ტელეფონის ნომერი"
 
 #, fuzzy
@@ -7365,7 +7475,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "გადავაწერო მას?"
 
 #, fuzzy
@@ -7373,28 +7483,28 @@ msgid "Setup"
 msgstr "შენახვა"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr ""
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "ამოშალე მეგობარი"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "ამოშალე მეგობარი"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7515,6 +7625,13 @@ msgstr "<b>მომხმარებელი:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>ჯგუფის სათაური:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>გარე მომხმარებელი</b><br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7522,7 +7639,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Pidgin-ის შესახებ"
 
 #, fuzzy
@@ -7543,6 +7660,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Pidgin-ის შესახებ"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "სახლის მისამართი"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7574,7 +7695,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "დაკავშირება"
@@ -7587,6 +7707,9 @@ msgstr "სერვერი-პორტი"
 msgid "Show server news"
 msgstr "სერვერის მისამართი"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "კითხვის შეცდომა"
@@ -7596,12 +7719,9 @@ msgid "Update interval (seconds)"
 msgstr "კითხვის შეცდომა"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "კავშირის სერვერი"
 
-msgid "Can not decrypt get server reply"
-msgstr ""
-
 #, c-format
 msgid "Failed requesting token, 0x%02X"
 msgstr ""
@@ -7622,20 +7742,17 @@ msgid "Activation required"
 msgstr "საჭიროა რეგისტრაცია"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "კითხვის შეცდომა"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "პრივატი"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
+msgid "Failed captcha verification"
 msgstr ""
 
 #, fuzzy
@@ -7646,7 +7763,7 @@ msgstr "სურათის შენახვა"
 msgid "Enter code"
 msgstr "შეიყვანე პაროლი"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7654,68 +7771,43 @@ msgid "Enter the text from the image"
 msgstr "ჩასამატებელი ჯგუფის სახელი"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "დაკავშირება შეუძლებელია"
-
 #, fuzzy
 msgid "Socket error"
 msgstr "ჩატის შეცდომა"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "არ ვარ დაკავშირებული სერვერთან."
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "ვერ ვკითხულობ სოკეტს"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "წერის შეცდომა"
-
 #, fuzzy
-msgid "Connection lost"
-msgstr "კავშირის შეცდომა"
-
-#, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "მომხმარებლის ინფორმაციის შეტანა..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "პრივატი"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "არასწორია მომხმარებელი ან პაროლი"
 
 #, fuzzy
-msgid "Connecting server ..."
+msgid "Connecting to server"
 msgstr "კავშირის სერვერი"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "კითხვის შეცდომა"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "შეუძლებელია შეტყობინების გაგზავნა."
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7724,6 +7816,10 @@ msgid ""
 "%s"
 msgstr "ICQ-ზე სერვერზე დაყრდნობა"
 
+#, c-format
+msgid "%s:%s"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "ვისგან"
@@ -7734,32 +7830,30 @@ msgid ""
 "%s"
 msgstr "ინფორმაცია სერვერის შესახებ"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "უცნობი მიზეზი."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "ბრძანება"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "კავშირის სერვერი"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "უცნობი მიზეზი."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "უცნობი მიზეზი."
 
 #, fuzzy, c-format
@@ -7774,9 +7868,6 @@ msgstr "ფაილის გაგზავნა ვერ მოხერხ
 msgid "%d canceled the transfer of %s"
 msgstr "%s -მა შეწყვიტა %s ფაილის გადატანა"
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>ჯგუფის სათაური:</b> %s<br>"
@@ -7831,17 +7922,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7865,6 +7945,10 @@ msgid "Video Camera"
 msgstr "ვიდეო კამერა"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "ფაილის გადაგზავნა"
+
+#, fuzzy
 msgid "Supports"
 msgstr "სუპორტი"
 
@@ -8547,9 +8631,6 @@ msgstr "ორგანიზაცია"
 msgid "Unit"
 msgstr "განყოფილება"
 
-msgid "Note"
-msgstr "შენიშვნა"
-
 msgid "Join Chat"
 msgstr "ჩაერთე საუბარში"
 
@@ -8635,6 +8716,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ქსელის სტატისტიკა"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8694,8 +8778,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "კავშირის სერვერი"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8704,27 +8789,27 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
-msgstr ""
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "Pidgin-მა ვერ შეძლო თქვენი პლაგინის ჩატვირთვა"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Pidgin-მა ვერ შეძლო თქვენი პლაგინის ჩატვირთვა"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "ახალი კავშირის დამყარება შეუძლებელია"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -9004,8 +9089,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "ვერ ვქმნი სოკეტს"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9093,6 +9179,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9133,39 +9222,36 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "ახალი კავშირის დამყარება შეუძლებელია"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "უსახელო"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-#, fuzzy
-msgid "Could not write"
-msgstr "ვერ ვაგზავნი"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "Pidgin-მა ვერ შეძლო თქვენი პლაგინის ჩატვირთვა"
 
-#, fuzzy
-msgid "Could not connect"
-msgstr "ვერ ვუკავშირდები"
+msgid "Unable to create connection"
+msgstr ""
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "სერვერის უცნობი შეცდომა."
 
-msgid "Could not create listen socket"
-msgstr ""
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "ვერ ვაგზავნი"
+msgid "Unable to create listen socket"
+msgstr "ვერ ვქმნი სოკეტს"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "სერვერი-პორტი"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9199,173 +9285,66 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr ""
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "ვერ ვკითხულობ ფაილს %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr ""
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr "შეცდომა."
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr ""
-
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
-
-#, c-format
-msgid "No keywords."
-msgstr ""
-
-#, c-format
-msgid "User has no directory information."
-msgstr ""
-
-#, c-format
-msgid "Country not supported."
-msgstr ""
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "არასწორია მეტსახელი ან პაროლი"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-msgid "Invalid Groupname"
-msgstr ""
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-msgid "Connection Closed"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo პროტოკოლის პლაგინი"
 
-msgid "Waiting for reply..."
-msgstr "ველოდები პასუხს..."
+#, fuzzy
+msgid "Pager server"
+msgstr "პროქსი სერვერი"
 
-msgid "TOC has come back from its pause. You may now send messages again."
+msgid "Pager port"
 msgstr ""
 
-msgid "Password Change Successful"
-msgstr "პაროლი შეიცვალა!"
-
-msgid "_Group:"
-msgstr "_ჯგუფი:"
-
-msgid "Get Dir Info"
-msgstr ""
+#, fuzzy
+msgid "File transfer server"
+msgstr "ფაილების გადაგზავნა"
 
-msgid "Set Dir Info"
+msgid "File transfer port"
 msgstr ""
 
-#, c-format
-msgid "Could not open %s for writing!"
+msgid "Chat room locale"
 msgstr ""
 
-msgid "File transfer failed; other side probably canceled."
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Could not connect for transfer."
+msgid "Chat room list URL"
 msgstr ""
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat server"
 msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "შეინახე ხატულა როგორც..."
-
-#, 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] ""
+msgid "Yahoo Chat port"
+msgstr "Yahoo იაპონია"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr ""
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9377,11 +9356,11 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC პროტოკოლის პლაგინი"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo პროტოკოლის პლაგინი"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9404,6 +9383,28 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "არასწორია მეტსახელი ან პაროლი"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9431,34 +9432,28 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "სერვერის არასწორი პასუხი"
 
-msgid "Connection problem"
-msgstr ""
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "საუბარი %s-თან"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 msgid "Not at Home"
 msgstr ""
@@ -9505,7 +9500,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -9521,79 +9516,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr "Hotmail საფოსტო ყუთის გახსნა"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo პროტოკოლის პლაგინი"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo იაპონია"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "პროქსი სერვერი"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "იაპონური"
-
-msgid "Pager port"
-msgstr ""
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "ფაილების გადაგზავნა"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "ფაილის გადაგზავნა შესრულდა"
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo იაპონია"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "დაკავშირება შეუძლებელია"
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9601,6 +9532,10 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s სურს გამოგიგზავნოთ ფაილი"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "წერის შეცდომა"
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9641,13 +9576,8 @@ msgstr "საინტერესო ლინკი 3"
 msgid "Last Update"
 msgstr "ბოლო განახლება"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr ""
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9710,19 +9640,17 @@ msgstr "ხმები"
 msgid "Webcams"
 msgstr "ვებ კამერები"
 
+msgid "Connection problem"
+msgstr ""
+
 msgid "Unable to fetch room list."
 msgstr ""
 
 msgid "User Rooms"
 msgstr "მომხმარებლის ოთახები"
 
-msgid "Connection problem with the YCHT server."
-msgstr ""
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "არ ვარ დაკავშირებული სერვერთან."
 
 msgid ""
@@ -9843,31 +9771,21 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "ვერ ვქმნი სოკეტს"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "შეუძლებელია შეტყობინების გაგზავნა: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "კავშირის შეცდომა"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "შეცდომა"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "ვერ ვაგზავნი"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9961,9 +9879,6 @@ msgstr ""
 msgid "Extended away"
 msgstr "გაფართოებული გასული"
 
-msgid "Mobile"
-msgstr ""
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10005,16 +9920,6 @@ msgstr "%s გახდა უმოქმედო."
 msgid "%x %X"
 msgstr ""
 
-#, c-format
-msgid "Error Reading %s"
-msgstr ""
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr "გაანგარიშება..."
 
@@ -10120,6 +10025,16 @@ msgstr "კავშირი ვერ განხორციელდა."
 msgid "Address already in use."
 msgstr ""
 
+#, c-format
+msgid "Error Reading %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "მოკლე-შეტყობინება"
@@ -10167,10 +10082,8 @@ msgstr "ახალი ელ.ფოსტის შეტყობინებ
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s პარამეტრები"
+msgid "_Advanced"
+msgstr "_დამატებითი"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10206,9 +10119,6 @@ msgstr ""
 msgid "you can see the butterflies mating"
 msgstr ""
 
-msgid "Proxy Options"
-msgstr "პროქსის პარამეტრები"
-
 msgid "Proxy _type:"
 msgstr "პროქსის ტიპი"
 
@@ -10237,8 +10147,9 @@ msgstr "_ძირითადი"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_დამატებითი"
+#, fuzzy
+msgid "_Proxy"
+msgstr "პროქსი"
 
 msgid "Enabled"
 msgstr "აქტიური"
@@ -10275,16 +10186,17 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "ოთახების სია"
+msgid "A_ccount"
+msgstr "ანგარიში:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "_ანგარიში:"
+#, fuzzy
+msgid "Room _List"
+msgstr "ოთახების სია"
 
 msgid "_Block"
 msgstr "_ბლოკირება"
@@ -10303,6 +10215,17 @@ msgid "I_M"
 msgstr "მოკ_შე"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "ჩატის _დამატება"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "ვიდეო ჩატი"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "ფაილის გაგზავნა"
 
@@ -10314,7 +10237,11 @@ msgid "View _Log"
 msgstr "დაათვალიერე _ლოგი"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "მომხმარებელი გასულია ქსელიდან"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "მომხმარებელი გასულია ქსელიდან"
 
 msgid "_Alias..."
@@ -10455,6 +10382,10 @@ msgstr "ხელსაწყო"
 msgid "/Tools/_Certificates"
 msgstr "/ხელსაწყოები/პარამ_ეტრები"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/ხელსაწყოები/პრივატობა"
+
 msgid "/Tools/Plu_gins"
 msgstr "/ხელსაწყოები/_პლაგინები"
 
@@ -10464,10 +10395,6 @@ msgstr "/ხელსაწყოები/პარამ_ეტრები"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ხელსაწყოები/პრი_ვატობა"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/ხელსაწყოები/პრივატობა"
-
 msgid "/Tools/_File Transfers"
 msgstr "/ხელსაწყოები/_ფაილების გადაგზავნა"
 
@@ -10591,8 +10518,8 @@ msgstr "მანუალურად"
 msgid "By status"
 msgstr "სტატუსის მიხედვით"
 
-msgid "By log size"
-msgstr "პროტოკოლის ზომის მიხედვით"
+msgid "By recent log activity"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "%s disconnected"
@@ -10610,6 +10537,9 @@ msgstr "დაკავშირება"
 msgid "Re-enable"
 msgstr "ანგარიშის გააქტიურება"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s დაბრუნდა"
@@ -10701,6 +10631,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "სინონიმი:"
 
+msgid "_Group:"
+msgstr "_ჯგუფი:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10734,6 +10667,113 @@ msgstr "/ხელსაწყოები"
 msgid "/Buddies/Sort Buddies"
 msgstr "/მეგობრები/მეგობრების სორტირება"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "ფონის ფერი"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "შესვლის პარამეტრები"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "ფონის ფერი"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "ფონიდ ფერის არჩევა"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "ფონიდ ფერის არჩევა"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "პორტი"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "ხაზზე"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "გასული"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "გასული ქსელიდან"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "უმოქმედო"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "შეტყობინება გაგზავნილია"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "ინფორმაციის შეცვლა %s მომხმარებლისათვის"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -10753,12 +10793,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "მოიწვიე მეგობარი Chat-ოთახში"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
 msgid "_Buddy:"
 msgstr "_მეგობარი:"
 
@@ -10788,7 +10822,8 @@ msgstr "იგნორირება"
 msgid "Get Away Message"
 msgstr "მიიღე გასულობის შეტყობინება"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "ბოლოს ნათქვამი"
 
 msgid "Unable to save icon file to disk."
@@ -10837,6 +10872,22 @@ msgstr "/საუბარი/_შეინახე როგორც..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/საუბარი/გაწმინდე"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/საუბარი/_დახურვა"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/საუბარი/_დახურვა"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/საუბარი/_დახურვა"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/საუბარი/_მანახე ლოგი"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/საუბარი/გააგზავნე ფაილი..."
 
@@ -10916,6 +10967,18 @@ msgstr "/_საუბარი"
 msgid "/Conversation/View Log"
 msgstr "/საუბარი/მოჩვენე ლოგი"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/საუბარი/_დახურვა"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/საუბარი/მოჩვენე ლოგი"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/საუბარი/_დახურვა"
+
 msgid "/Conversation/Send File..."
 msgstr "/საუბარი/გააგზავნე ფაილი..."
 
@@ -11105,6 +11168,9 @@ msgstr "მისამართი"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "სუპორტი"
 
@@ -11235,6 +11301,10 @@ msgid "Hungarian"
 msgstr "უნგრული"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "რუმინული"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "მაკედონიური"
 
@@ -11251,6 +11321,10 @@ msgstr "ქართული"
 msgid "Ubuntu Georgian Translators"
 msgstr "მიმდინარე თარგმანები"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Opera"
+
 msgid "Kannada"
 msgstr ""
 
@@ -11273,6 +11347,10 @@ msgid "Macedonian"
 msgstr "მაკედონიური"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "მაკედონიური"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "ნორვეგიული"
 
@@ -11332,6 +11410,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "შვედური"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "თამილური"
@@ -11386,8 +11467,25 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11648,7 +11746,7 @@ msgid "Hyperlink visited color"
 msgstr "ლინკების ფერი"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "ლინკების ფერი მაუსის შეხებისას."
 
 msgid "Hyperlink prelight color"
@@ -11686,15 +11784,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "ახალი ელ.ფოსტის შეტყობინებები"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "ახალი ელ.ფოსტის შეტყობინებები"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11707,15 +11812,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "ახალი ელ.ფოსტის შეტყობინებები"
 
-msgid "_Copy Email Address"
-msgstr "_Email მისამართის კოპირება"
-
-msgid "_Open Link in Browser"
-msgstr "_ლინკის ბრაუზერში გახსნა"
-
-msgid "_Copy Link Location"
-msgstr "_ლინკის კოპირება"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11748,11 +11844,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "სურათის შენახვა"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "სურათის შენახვა...."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11840,10 +11934,6 @@ msgid "Font Face"
 msgstr "ფონტი"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "ფონის ფერი"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "ფონტის ფერი"
 
@@ -11970,6 +12060,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11987,6 +12078,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12018,10 +12110,26 @@ msgstr ""
 msgid "Pidgin"
 msgstr "პლაგინები"
 
-msgid "Open All Messages"
-msgstr "გახსენი ყველა შეტყობინება"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "გაანგარიშება..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
 
 #, c-format
@@ -12049,6 +12157,30 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "უცნობი შეტყობინება"
+
+msgid "Open All Messages"
+msgstr "გახსენი ყველა შეტყობინება"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "ახალი პერსონა"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">მოსულია ახალი წერილი!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12101,10 +12233,17 @@ msgstr "<b>პლაგინის დეტალები</b>"
 msgid "Select a file"
 msgstr "ფაილის არჩევა"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "დაამატე მეგობარი"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "_ანგარიში:"
+
 msgid "_Buddy name:"
 msgstr "_მეგობრის სახელი:"
 
@@ -12171,7 +12310,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "ჩართვის დროს"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "მომხმარებელი კრიფავს..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "სიგნალების ტესტი"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr ""
+
+#, c-format
+msgid "Returned from being away"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "%s შემოვიდა ქსელში."
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "%s გავიდა ქსელიდან"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s გახდა უმოქმედო."
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "როდესაც გასულია"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "შეტყობინების გაგზავნა"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "შეტყობინება ძალიან დიდია"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12192,6 +12382,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "საუბარი %s-თან"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "მეგობრების სია"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "სისტემური პანელის ნახატი"
 
@@ -12204,7 +12400,7 @@ msgid "On unread messages"
 msgstr "შეტყობინების გაგზავნა"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IMის საუბრის ფანჯარა"
 
 #, fuzzy
@@ -12214,6 +12410,10 @@ msgstr "_ახალი საუბარი:"
 msgid "When away"
 msgstr "როდესაც გასულია"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IMის საუბრის ფანჯარა"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12273,10 +12473,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IMის საუბრის ფანჯარა"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12311,13 +12507,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-msgid "ST_UN server:"
-msgstr "ST_UN სერვერი:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP მისამართის _ავტომატური დადგენა"
 
 msgid "Public _IP:"
@@ -12338,6 +12532,10 @@ msgstr "_საწყისი პორტი:"
 msgid "_End port:"
 msgstr "სა_ბოლოო პორტი:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "პროქსი სერვერი"
@@ -12367,6 +12565,10 @@ msgstr "პროქსი სერვერი"
 msgid "No proxy"
 msgstr "უპროქსიოდ"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_მომხმარებელი:"
 
@@ -12527,13 +12729,13 @@ msgstr ""
 msgid "Auto-away"
 msgstr "თვითგასვლა"
 
-msgid "Change status when _idle"
-msgstr ""
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_დრო სტატუსის შეცვლამდე(წუთებში):"
 
+msgid "Change status when _idle"
+msgstr ""
+
 msgid "Change _status to:"
 msgstr ""
 
@@ -12687,28 +12889,18 @@ msgstr "შენახვა და გამოყენება"
 msgid "Status for %s"
 msgstr ""
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "სიცილაკის ჩამატება"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 msgid "Duplicate Shortcut"
 msgstr ""
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "გთხოვთ შეიყვანოთ თქვენი ახალი პაროლი"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "სიცილაკის ჩამატება"
@@ -12718,20 +12910,29 @@ msgid "Add Smiley"
 msgstr "სიცილაკი"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "სურათის შენახვა"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "პორტი"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "სიცილაკი"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "პორტი"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "ფონტის არჩევა"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -12813,8 +13014,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -12849,6 +13050,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "გახსნას მაჩვენებელი :"
+
+msgid "_Copy Link Location"
+msgstr "_ლინკის კოპირება"
+
+msgid "_Copy Email Address"
+msgstr "_Email მისამართის კოპირება"
+
+#, fuzzy
 msgid "Save File"
 msgstr "ფაილის შენახვა..."
 
@@ -12947,6 +13158,75 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "სერვერის მისამართი"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "შეიყვანეთ კონფერენციების სერვერი"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+#, fuzzy
+msgid "Find Services"
+msgstr "იპოვე მეგობრები"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "მეგობრების სია"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "როდესაც გასულია"
+
+#, fuzzy
+msgid "Directory"
+msgstr "პროტოკოლირების დირექტორია"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "ხმის არჩევა"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>აღწერა:</b> Spooky"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "მომხმარებელი არ არსებობს"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Jabber"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "მომხმარებელი უმოქმედოთაა"
 
@@ -13338,7 +13618,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13447,12 +13727,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr "კურსორის ფერი"
-
-msgid "Secondary Cursor Color"
-msgstr "მეორადი კურსორის ფერი"
-
 msgid "Hyperlink Color"
 msgstr "ლინკის ფერი"
 
@@ -13464,6 +13738,10 @@ msgstr "ლინკის ფერი"
 msgid "Highlighted Message Name Color"
 msgstr "შეტყობინების გაგზავნა"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "ახალი ელ.ფოსტის შეტყობინებები"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13497,36 +13775,23 @@ msgstr "GTK+ ინტერფეისის ფონტი"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "ტექსტი მალსახმობი გაფორმება"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "ინტერფეისის ფერები"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "ახალი ელ.ფოსტის შეტყობინებები"
+
+msgid "GTK+ Theme Control Settings"
+msgstr ""
 
 #, fuzzy
-msgid "Widget Sizes"
-msgstr "Widget ზომები"
+msgid "Colors"
+msgstr "დახურვა"
 
 msgid "Fonts"
 msgstr "ფონტები"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin - ის ფაილკონტროლი"
@@ -13611,7 +13876,7 @@ msgstr "IMის საუბრის ფანჯარა"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13663,6 +13928,109 @@ msgstr "ტექსტის შენაცვლება"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "მომხმარებელი არ არის ხაზზე"
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "საუბარში ჩართვა"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "იგნორირება"
+
+#, fuzzy
+msgid "Founder"
+msgstr "ჩატვირთვა"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "ავტორიზაცია მიღებულია"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "შეცდომა"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "ინფორმაცია სამსახურის შესახებ"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "პრივატი"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "შენშვნის დონე"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "სტატუსი"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "ხატულას შენახვა"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "ინფორმაცია ანგარიშის შესახებ"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "მეგობრების სია"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "მეგობრების სია"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin-ის მომხმარებელი"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13822,9 +14190,6 @@ msgstr "_დატოვე მეგობრების სიის ფა�
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr ""
-
 #, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "შესვლის პარამეტრები"
@@ -13833,9 +14198,10 @@ msgstr "შესვლის პარამეტრები"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows Pidgin-ის სპეციფიკური პარამეტრები."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Windows Pidgin-ის სპეციფიკური პარამეტრები."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -13876,6 +14242,292 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "ვერ ვაგზავნი ფაილს"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "შეუძლებელია სოკეტის შექმნა"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "ვერ ვკითხულობ სოკეტს"
+
+#~ msgid "Connection failed."
+#~ msgstr "კავშირი ვერ განხორციელდა."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "სერვერი გაითიშა"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "შეუძლებელია სოკეტის შექმნა"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
+
+#~ msgid "Read error"
+#~ msgstr "კითხვის შეცდომა"
+
+#~ msgid "Write error"
+#~ msgstr "წერის შეცდომა"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "მთლიანი მისამართი"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "ბრძანება"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "რეგისტრაციის შეცდომა"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "ადგილმდებარეობა"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "მომხმარებლის ძებნა"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "მდგომარეობა შეტყობინება"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "საუბრის შენახვა"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "ორიენტაცია"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "მომხმარებლის ოთახები"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "მომხმარებელთა ლიმიტი"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "შეუძლია"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "მომხმარებლის სახელი"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Email მისამართი"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "MSN პროფაილი"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "მომხმარებლის სახელი"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "ცოცხალი ვიდეო"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "შეტყობინება მიღებულია"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "ავთენტურობის დადგენა ღია გასაღებით"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "მომხმარებლის პარამეტრები"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "მომხმარებლის ოთახები"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "მომხმარებლის სახელი"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "მომხმარებელთა ლიმიტი"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian შიფრი"
+
+#~ msgid "Read Error"
+#~ msgstr "კითხვის შეცდომა"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "შეტყობინების გაგზავნა"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
+
+#~ msgid "Incorrect password."
+#~ msgstr "არასწორი პაროლი."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "ვერ ვუკავშირდები"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "არასწორი"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "კავშირის სერვერი"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "კავშირის შეცდომა"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "ვერ ვაგზავნი"
+
+#, fuzzy
+#~ msgid "Could not connect"
+#~ msgstr "ვერ ვუკავშირდები"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ვერ ვაგზავნი"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "არასწორი პაროლი."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo იაპონია"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "იაპონური"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "ფაილის გადაგზავნა შესრულდა"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "არ ვარ დაკავშირებული სერვერთან."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "ვერ ვაგზავნი"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IMის საუბრის ფანჯარა"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "გთხოვთ შეიყვანოთ თქვენი ახალი პაროლი"
+
+#~ msgid "Cursor Color"
+#~ msgstr "კურსორის ფერი"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "მეორადი კურსორის ფერი"
+
+#~ msgid "Interface colors"
+#~ msgstr "ინტერფეისის ფერები"
+
+#, fuzzy
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget ზომები"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "გახსენი ყველა შეტყობინება"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "ვერ ვქმნი სოკეტს"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "დაამატე მეგობარი"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "კითხვის შეცდომა"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "არ ვარ დაკავშირებული სერვერთან."
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "შეუძლებელია შეტყობინების გაგზავნა."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "ვერ ვკითხულობ ფაილს %s."
+
+#~ msgid "Failure."
+#~ msgstr "შეცდომა."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "არასწორია მეტსახელი ან პაროლი"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "ველოდები პასუხს..."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "პაროლი შეიცვალა!"
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "შეინახე ხატულა როგორც..."
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC პროტოკოლის პლაგინი"
+
+#~ msgid "%s Options"
+#~ msgstr "%s პარამეტრები"
+
+#~ msgid "Proxy Options"
+#~ msgstr "პროქსის პარამეტრები"
+
+#~ msgid "By log size"
+#~ msgstr "პროტოკოლის ზომის მიხედვით"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_ლინკის ბრაუზერში გახსნა"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN სერვერი:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "სურათის შენახვა"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "ფალი უკვე არსებობს"
 
@@ -13940,10 +14592,6 @@ msgstr ""
 #~ msgstr "შეცდომა პაროლის შეცვლისას"
 
 #, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "შეუძლებელია სერვერთან დაკავშირება"
-
-#, fuzzy
 #~ msgid "Connecting server %s, retries %d"
 #~ msgstr "კავშირის სერვერი"
 
@@ -13980,10 +14628,6 @@ msgstr ""
 #~ msgstr "სერვერი გაითიშა"
 
 #, fuzzy
-#~ msgid "XMPP developer"
-#~ msgstr "Jabber"
-
-#, fuzzy
 #~ msgid ""
 #~ "You are using %s version %s.  The current version is %s.  You can get it "
 #~ "from <a href=\"%s\">%s</a><hr>"
@@ -14060,10 +14704,6 @@ msgstr ""
 #~ msgstr "რეგისტრაციის შეცდომა"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "შეცდომა პროფაილის ჩამოტანისას"
-
-#, fuzzy
 #~ msgid "TCP Address"
 #~ msgstr "IP მისამართი"
 
@@ -14124,17 +14764,9 @@ msgstr ""
 #~ msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "შეუძლებელია სერვერთან დაკავშირება"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_შეტყობინება:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "ანგარიში:"
-
 #~ msgid "TCP port"
 #~ msgstr "TCP პორტი"
 
@@ -14207,13 +14839,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>აღწერა:</b> Spooky"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -14264,15 +14889,6 @@ msgstr ""
 #~ msgid "_Mute"
 #~ msgstr "_გაჩუმება"
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">მოსულია ახალი წერილი!</span>\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Send unknown \"_slash\" commands as messages"
 #~ msgstr "გავაგზავნოთ უცნობი 'დახრილი ხაზი' ბრძანებები როგორც შეტყობინებები"
 
@@ -14292,9 +14908,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>სტატუსი:</b> %s"
 
-#~ msgid "Pidgin User"
-#~ msgstr "Pidgin-ის მომხმარებელი"
-
 #~ msgid "Invalid Jabber ID"
 #~ msgstr "არასწორი Jabber ID"
 
diff --git a/po/km.po b/po/km.po
index 771ca9250b..66a60f5d46 100644
--- a/po/km.po
+++ b/po/km.po
@@ -1,14 +1,14 @@
-# translation of pidgin.po to Khmer
+# translation of km_new_update.po to Khmer
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Khoem Sokhem <khoemsokhem@khmeros.info>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin\n"
+"Project-Id-Version: km_new_update\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-27 16:37-0800\n"
-"PO-Revision-Date: 2009-02-25 11:49+0700\n"
+"POT-Creation-Date: 2009-07-20 21:11-0700\n"
+"PO-Revision-Date: 2009-07-21 08:40+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
 "MIME-Version: 1.0\n"
@@ -207,7 +207,7 @@ msgid "Add Buddy"
 msgstr "បន្ថែម​មិត្តភក្ដិ"
 
 msgid "Please enter buddy information."
-msgstr "សូម​បញ្ចូល​ព័ត៌មាន​របស់មិត្តភក្ដិ ។"
+msgstr "សូម​បញ្ចូល​ព័ត៌មាន​​មិត្តភក្ដិ ។"
 
 msgid "Chats"
 msgstr "ជជែក"
@@ -364,7 +364,7 @@ msgid "New Instant Message"
 msgstr "សារ​បន្ទាន់​ថ្មី"
 
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "សូម​បញ្ចូល​ឈ្មោះ​អ្នកប្រើ ឬ​ឈ្មោះ​ក្លែងក្លាយ​របស់​មនុស្ស​ ដែលអ្នក​ចង់​ IM ។"
+msgstr "សូម​បញ្ចូល​ឈ្មោះ​អ្នកប្រើ ឬ​ឈ្មោះ​ក្លែងក្លាយ​របស់​មនុស្ស​ ដែលអ្នក​ចង់​ជជែក ។"
 
 msgid "Channel"
 msgstr "ឆានែល"
@@ -594,19 +594,6 @@ msgstr "បានបញ្ចប់​ការ​ចុះ​កំណត់ហ
 msgid "Send To"
 msgstr "ផ្ញើ​ទៅ"
 
-msgid "Invite message"
-msgstr "សារ​អញ្ជើញ"
-
-msgid "Invite"
-msgstr "អញ្ជើញ"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"សូម​បញ្ចូល​ឈ្មោះ​អ្នកប្រើ​ដែល​អ្នកចង់​អញ្ជើញ\n"
-"រួម​ជា​មួយ​នឹង​សារ​អញ្ជើញ​ជា​ជម្រើស ។"
-
 msgid "Conversation"
 msgstr "ការ​សន្ទនា"
 
@@ -853,6 +840,39 @@ msgstr "កា​រសន្ទនា​ទាំង​អស់"
 msgid "System Log"
 msgstr "​កំណត់ហេតុ​ប្រព័ន្ធ"
 
+msgid "Calling ... "
+msgstr "កំពុង​ហៅ... "
+
+msgid "Hangup"
+msgstr "រង់ចាំ"
+
+#. Number of actions
+msgid "Accept"
+msgstr "ទទួលរម​"
+
+msgid "Reject"
+msgstr "ច្រានចោលល"
+
+msgid "Call in progress."
+msgstr "កា​រហៅ​កំពុង​ដំណើរការ ។"
+
+msgid "The call has been terminated."
+msgstr "ការ​ហៅ​ត្រូវ​បានបញ្ចប់ ។"
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s មាន​បំណង​ចាប់ផ្ដើម​សម័យ​អូឌីយ៉ូ​ជា​មួយ​អ្នក ។"
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s កំពុង​ព្យាយាម​ចាប់ផ្ដើម​​ប្រភេទ​សម័យ​មេឌៀ​ដែល​មិនបានគាំទ្រ​ជាមួយ​អ្នក ។"
+
+msgid "You have rejected the call."
+msgstr "អ្នក​បានបដិសេធ​ការ​ហៅ ។"
+
+msgid "call: Make an audio call."
+msgstr "ហៅ ៖ បង្កើត​ការ​ហៅ​អូឌីយ៉ូ ។"
+
 msgid "Emails"
 msgstr "អ៊ីមែល"
 
@@ -886,6 +906,9 @@ msgstr "បន្ត"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "អញ្ជើញ"
+
 msgid "(none)"
 msgstr "​(គ្មាន)​"
 
@@ -1087,7 +1110,6 @@ msgstr "%s មាន​ទៅ​ឆ្ងាយ ។ (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s បាន​ផ្ញើ​សារ​ឲ្យ​អ្នក ។ (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "មិនស្គាល់​ព្រឹត្តិការណ៍​ក្រុម ។ សូម​រាយការណ៍​វា !"
 
@@ -1494,6 +1516,29 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "កម្មវិធី​ជំនួយ​កំណត់ហេតុ​ចុងក្រោយ ។"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"កំពុង​ទៅយក​ TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "បង្កើត​តែ TinyURL សម្រាប់ urls របស់​ប្រវែង​នេះ ឬ​ធំជាង​នេះ"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "បុព្វបទ​អាសយដ្ឋាន TinyURL (ឬ​ផ្សេងៗ)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "កម្មវិធី​ជំនួយ TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "នៅពេល​ទទួល​សារ​ដែល​មាន URL(s), TinyURL សម្រាប់​ចម្លង​កាន់តែ​ងាយ"
+
 msgid "accounts"
 msgstr "គណនី"
 
@@ -1594,13 +1639,6 @@ msgstr "ទទួល​វិញ្ញាបនបត្រ​សម្រាប
 msgid "SSL Certificate Verification"
 msgstr "កា​រផ្ទៀងផ្ទាត់​វិញ្ញាបនបត្រ SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "ទទួលរម​"
-
-msgid "Reject"
-msgstr "ច្រានចោលល"
-
 msgid "_View Certificate..."
 msgstr "មើល​វិញ្ញាបនបត្រ..."
 
@@ -1701,6 +1739,7 @@ msgstr "+++ %s បាន​ចូល"
 msgid "+++ %s signed off"
 msgstr "+++ %s បានបិទ"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "មិនស្គាល់​កំហុស"
 
@@ -1747,6 +1786,15 @@ msgstr "%s បាន​ចេញ​ពី​បន្ទប់ ។"
 msgid "%s left the room (%s)."
 msgstr "%s បាន​ចេញ​ពី​បន្ទប់ (%s) ។"
 
+msgid "Invite to chat"
+msgstr "អញ្ជើញ​ឲ្យ​ចូលរួម​ក្នុងការ​ជជែក"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "សូម​បញ្ចូល​ឈ្មោះ​របស់​អ្នកប្រើ​ដែល​អ្នក​ចង់​អញ្ជើញ រួម​ជា​មួយ​នឹង​សារ​អញ្ជើញ​ជា​ជម្រើស ។"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "បានបរាជ័យ​ក្នុងការ​តភ្ជាប់ ៖ %s"
@@ -1877,6 +1925,10 @@ msgstr "ផ្ដល់​ដើម្បី​ផ្ញើ %s ទៅឲ្យ %
 msgid "Starting transfer of %s from %s"
 msgstr "ចាប់ផ្ដើម​ផ្ទេរ %s ពី %s"
 
+#, fuzzy, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "ផ្ទេរ​ឯកសារ %s ចប់​ហើយ"
+
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "ផ្ទេរ​ឯកសារ %s ចប់​ហើយ"
@@ -2075,6 +2127,10 @@ msgstr "<font color=\"red\"><b>មិនអាច​អាន​ឯកសារ�
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "កំហុស​ក្នុងការ​បង្កើត​ការ​តភ្ជាប់"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "អ្នក​កំពុង​ប្រើ %s ប៉ុន្តែ​កម្មវិធី​ជំនួយ​នេះ​ទាមទារ %s ។"
@@ -2466,9 +2522,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "រួម​បញ្ចូល​កំណត់​ហេតុ​របស់​ម៉ាស៊ីនភ្ញៀវ IM ផ្សេងៗ​ទៀត​នៅ​ក្នុង​កម្មវិធីមើល​កំណត់​ហេតុ ។"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2521,8 +2578,9 @@ msgstr "ក្លែង​ធ្វើសារ​ក្រៅ​បណ្ដា
 msgid "Save messages sent to an offline user as pounce."
 msgstr "រក្សាទុកសារ​ដែល​បានផ្ញើ​ទៅ​កាន់​អ្នក​ប្រើ​ក្រៅ​ជា​ក្រុម ។"
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr "សារ​ដែល​នៅ​សល់​នឹង​ត្រូវ​បានរក្សាទុកជា​ក្រុម ។ អ្នកអាច​កែសម្រួល/លុប​ក្រុម​ពី​ប្រអប់​ `ក្រុម​មិត្តភក្ដិ' ។"
 
@@ -2552,6 +2610,34 @@ msgstr "រក្សាទុក​សារ​ក្រៅ​បណ្ដាញ
 msgid "Do not ask. Always save in pounce."
 msgstr "កុំសួរ ។ រក្សាទុក​ជា​ក្រុម​ជា​និច្ច ។"
 
+msgid "One Time Password"
+msgstr "បញ្ចូល​ពាក្យ​សម្ងាត់​តែ​ម្ដង"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "គាំទ្រ​តែ​កា​របញ្ចូលពាក្យ​សម្ងាត់​តែ​ម្ដង​"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "បង្ខំ​ពាក្យ​សម្ងាត់​នោះ​ឲ្យ​ប្រើ​តែ​ម្ដង​ប៉ុណ្ណោះ ។"
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"អនុញ្ញាត​ឲ្យ​អ្នក​បង្ខំ​នៅ​លើ​មូលដ្ឋាន​ក្នុង​មួយ​គណនី ដែល​ពាក្យ​សម្ងាត់​មិន​កំពុង​ត្រូវ​បាន​រក្សាទុក​ទេ គឺ​ត្រូវ​បាន​"
+"រក្សាទុក​តែ​ការ​តភ្ជាប់​ដោយ​ជោគជ័យ​តែ​មួយ​ប៉ុណ្ណោះ ។\n"
+"ចំណាំ​ ៖ ពាក្យ​សម្ងាត់​គណនី​មិន​ត្រូវ​បាន​រក្សាទុក​​វា​សម្រាប់​ការ​ងារ​នោះទេ ។"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2742,14 +2828,16 @@ msgstr ""
 "មិនអាច​រក​ឃើញ​ការ​ដំឡើងTCL ដែល​សកម្ម ។ ប្រសិន​បើ​អ្នក​ចង់​ប្រើ​កម្មវិធី​ជំនួយ TCL ដំឡើង TCL សកម្ម​ពី "
 "http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Apple Bonjour សម្រាប់​ប្រអប់​ឧបករណ៍​វីនដូ​ដែល​រក​មិនឃើញ សូម​មើល FAQ នៅ ៖ http://d.pidgin.im/"
 "BonjourWindows ចំពោះ​ព័ត៌មាន​លម្អិត ។"
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "មិនអាច​ស្ដាប់​ការ​តភ្ជាប់ IM ចូល​\n"
 
 msgid ""
@@ -2801,14 +2889,21 @@ msgstr "%s បានបិទ​ការ​សន្ទនា ។"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "មិនអាច​ផ្ញើ​សារ​បានទេ ការ​សន្ទនា​មិនអាច​ត្រូវ​បាន​ចាប់ផ្ដើម​ទេ ។"
 
-msgid "Cannot open socket"
-msgstr "មិនអាច​បើក​រន្ធ​បានទេ"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"មិនអាច​បង្កើត​រន្ធ ៖\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "មិនអាច​ចង​រន្ធ​ទៅ​ច្រក​បានទេ"
 
-msgid "Could not listen on socket"
-msgstr "មិនអាច​ស្ដាប់​នៅ​លើ​រន្ធ​បានទេ"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"មិនអាច​បង្កើត​រន្ធ ៖\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "កំហុស​ក្នុងការ​ទាក់ទង​ជា​មួយ​នឹង mDNSResponder មូលដ្ឋាន ។"
@@ -2855,13 +2950,16 @@ msgstr "រក្សា​​ទុក​​បញ្ជីមិត្តភក
 msgid "Load buddylist from file..."
 msgstr "ផ្ទុក​បញ្ជីមិត្តភក្ដិ​ពី​ឯកសារ..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "បំពេញ​វាល​ចុះឈ្មោះ ។"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "ពាក្យ​សម្ងាត់​មិន​ផ្គូផ្គង ។"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "មិនអាច​ចុះឈ្មោះ​គណនី​ថ្មី​ទេ ។ កំហុស​បាន​កើត​ឡើង ។\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2873,14 +2971,15 @@ msgstr "ការ​ចុះឈ្មោះ​បានបញ្ចប់​ដ
 msgid "Password"
 msgstr "ពាក្យ​​​សម្ងាត់"
 
-msgid "Password (retype)"
-msgstr "ពាក្យ​​​សម្ងាត់ (វាយ​ឡើង​វិញ)"
+msgid "Password (again)"
+msgstr "ពាក្យ​សម្ងាត់ (ម្ដង​ទៀត)"
 
-msgid "Enter current token"
-msgstr "បញ្ចូល​ថូខឹន​បច្ចុប្បន្ន"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "ថូខឹន​បច្ចុប្បន្ន"
+#, fuzzy
+msgid "Captcha"
+msgstr "រូបភាព Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ចុះឈ្មោះ​គណនី Gadu-Gadu ថ្មី"
@@ -2933,6 +3032,15 @@ msgstr "ពាក្យ​សម្ងាត់​ត្រូវ​បាន​
 msgid "Current password"
 msgstr "ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន"
 
+msgid "Password (retype)"
+msgstr "ពាក្យ​​​សម្ងាត់ (វាយ​ឡើង​វិញ)"
+
+msgid "Enter current token"
+msgstr "បញ្ចូល​ថូខឹន​បច្ចុប្បន្ន"
+
+msgid "Current token"
+msgstr "ថូខឹន​បច្ចុប្បន្ន"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន និង​ពាក្យ​សម្ងាត់​ថ្មី​របស់​អ្នក​សម្រាប់ UIN ៖ "
 
@@ -2946,8 +3054,9 @@ msgstr "ជ្រើស​ការ​ជជែក​សម្រាប់មិ
 msgid "Add to chat..."
 msgstr "បន្ថែម​ទៅ​កា​រជជែក..."
 
+#. Global
 msgid "Available"
-msgstr "ដែល​អាច​ប្រើបាន"
+msgstr "លើ​បណ្ដាញ"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -2979,8 +3088,8 @@ msgstr "រក​មិនឃើញ​អ្នក​ប្រើ​ដែលផ
 msgid "There are no users matching your search criteria."
 msgstr "មិនមាន​អ្នក​ប្រើ​ដែល​ផ្គូផ្គង​នឹង​លក្ខខណ្ឌ​ស្វែងរក​របស់​អ្នក ។"
 
-msgid "Unable to read socket"
-msgstr "មិនអាច​អាន​រន្ធ​បានទេ"
+msgid "Unable to read from socket"
+msgstr "មិនអាច​អាន​ពី​រន្ធ​បានទេ"
 
 msgid "Buddy list downloaded"
 msgstr "បានទាញយក​បញ្ជីមិត្តភក្ដិ"
@@ -2994,8 +3103,14 @@ msgstr "បានផ្ទុក​បញ្ជីមិត្តភក្ដិ
 msgid "Your buddy list was stored on the server."
 msgstr "បញ្ជី​មិត្តភក្ដិ​របស់​អ្នក​ត្រូ​វបាន​ទុក​នៅ​លើ​ម៉ាស៊ីនបម្រើ ។"
 
-msgid "Connection failed."
-msgstr "បានបរាជ័យ​ក្នុងការ​តភ្ជាប់ ។"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "បាន​តភ្ជាប់"
+
+msgid "Connection failed"
+msgstr "បានបរាជ័យ​ក្នុងការ​តភ្ជាប់"
 
 msgid "Add to chat"
 msgstr "បន្ថែម​ទៅ​កាន់​ការ​ជជែក"
@@ -3003,13 +3118,23 @@ msgstr "បន្ថែម​ទៅ​កាន់​ការ​ជជែក"
 msgid "Chat _name:"
 msgstr "ឈ្មោះការ​ជជែក ៖"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "មិនអាច​ដោះស្រាយ​ម៉ាស៊ីន​បម្រើ​បានទេ"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "តភ្ជាប់"
+
 msgid "Chat error"
 msgstr "កំហុស​ក្នុងកា​រជជែក"
 
 msgid "This chat name is already in use"
 msgstr "ឈ្មោះការ​ជជែក​នេះ​កំពុង​ប្រើ​រួច​ហើយ"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "មិន​បានតភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីនបម្រើ​ទេ ។"
 
 msgid "Find buddies..."
@@ -3051,6 +3176,9 @@ msgstr "សម្អាត​ប្រជាប្រិយភាព​របស
 msgid "Gadu-Gadu User"
 msgstr "អ្នក​ប្រើ Gadu-Gadu"
 
+msgid "GG server"
+msgstr "ម៉ាស៊ីន​បម្រើ GG"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "មិនស្គាល់​ពាក្យ​បញ្ជា ៖ %s"
@@ -3065,7 +3193,8 @@ msgstr "គ្មាន​ប្រធាន​បទ​ត្រូវ​បា
 msgid "File Transfer Failed"
 msgstr "បាន​បរាជ័យ​ក្នុងកា​រផ្ទេរ​ឯកសារ"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "មិនអាច​បើក​ច្រក​ស្ដាប់​បានទេ ។"
 
 msgid "Error displaying MOTD"
@@ -3081,8 +3210,18 @@ msgstr "មិនមាន​ MOTD បាន​ភ្ជាប់​ជា​ម
 msgid "MOTD for %s"
 msgstr "MOTD សម្រាប់ %s"
 
-msgid "Server has disconnected"
-msgstr "ម៉ាស៊ីន​បម្រើ​បាន​ផ្ដាច់"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"បាត់​បង់​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ ៖\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "មើល MOTD"
@@ -3093,25 +3232,23 @@ msgstr "ឆានែល ៖"
 msgid "_Password:"
 msgstr "ពាក្យ​​​សម្ងាត់ ៖"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "សម្មតិនាម IRC អាច​​​​​​មិនមាន​ចន្លោះ"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "តភ្ជាប់"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "សម្មតិនាម IRC និង​ម៉ាស៊ីន​បម្រើ​មិនអាច​មាន​ចន្លោះ​មិនឃើញទេ"
 
 msgid "SSL support unavailable"
 msgstr "មិនមានការគាំទ្រ SSL"
 
-msgid "Couldn't create socket"
-msgstr "មិនអាច​បង្កើត​រន្ធ​បានទេ"
+msgid "Unable to connect"
+msgstr "មិនអាច​តភ្ជាប់​ទេ"
 
-msgid "Couldn't connect to host"
-msgstr "មិនអាច​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីនបាន​ទេ"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "មិនអាច​តភ្ជាប់​ទៅ %s"
 
-msgid "Read error"
-msgstr "កំហុស​ក្នុងការ​អាន"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "ម៉ាស៊ីនបម្រើ​បានបិទ​ការ​តភ្ជាប់ ។"
 
 msgid "Users"
 msgstr "អ្នក​ប្រើ"
@@ -3290,6 +3427,16 @@ msgid ""
 msgstr ""
 "ឈ្មោះ​គណនី​ដែល​អ្នកបានជ្រើស​ត្រូវ​បានបដិសេធ​ដោយ​ម៉ាស៊ីនបម្រើ ។ វា​ប្រហែលជា​មាន​តួអក្សរ​មិនត្រឹមត្រូវ ។"
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "សម្មតិនាម \"%s\" កំពុង​ប្រើ​រួច​ហើយ ។"
+
+msgid "Nickname in use"
+msgstr "សម្មតិនាម​កំពុង​ប្រើ"
+
 msgid "Cannot change nick"
 msgstr "មិនអាច​ផ្លាស់ប្ដូរ​សម្មតិនាម​បានទេ"
 
@@ -3520,10 +3667,12 @@ msgstr "ពាក្យ​បញ្ជា​ Ad-Hoc បាន​បរាជ័�
 msgid "execute"
 msgstr "ប្រតិបត្តិ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "ម៉ាស៊ីន​បម្រើ​ត្រូវការ TLS/SSL ដើម្បី​ចូល ។ រក​មិនឃើញការគាំទ្រ TLS/SSL នោះ​ទេ ។"
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "អ្នក​ត្រូវការ​ការ​អ៊ិនគ្រីប ប៉ុន្តែ​រក​មិនឃើញ​ការគាំទ្រ TLS/SSL ។"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3540,18 +3689,46 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "ផ្ទៀងផ្ទាត់​ភាព​​ត្រឹមត្រូវ​ធម្មតា"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "បាន​បរាជ័យ​ក្នុងកា​រផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "កា​រឆ្លើយ​តប​មិនត្រឹមត្រូវ​ពី​ម៉ាស៊ីន​បម្រើ ។"
 
 msgid "Server does not use any supported authentication method"
 msgstr "ម៉ាស៊ិនបម្រើ​មិន​ប្រើ​វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ដែល​បានគាំទ្រ​ណាមួយ​ទេ"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "អ្នកត្រូវកា​រការ​អ៊ិនគ្រីប ប៉ុន្តែ​មិនអាច​ប្រើ​បាន​នៅ​លើ​​ម៉ាស៊ីន​បម្រើនេះ​ទេ ។"
+
 msgid "Invalid challenge from server"
 msgstr "ការ​ប្រខិតខំ​មិនត្រឹមត្រូវ​ពី​ម៉ាស៊ីនបម្រើ"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "កំហុស SASL"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr "កម្មវិធី​គ្រប់គ្រង​កា​រតភ្ជាប់ BOSH បាន​បញ្ចប់​សម័យ​របស់​អ្នក ។"
+
+msgid "No session ID given"
+msgstr "គ្មាន​លេខសម្គាល់​សម័យ​ត្រូវ​បានផ្ដល់​ទេ"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "កំណែ​មិន​បានគាំទ្រ​ពិធីការ BOSH"
+
+msgid "Unable to establish a connection with the server"
+msgstr "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីម​បម្រើ​ទេ"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីម​បម្រើ​ទេ"
+
+msgid "Unable to establish SSL connection"
+msgstr "មិន​អាច​បង្កើត​ការ​តភ្ជាប់ SSL"
+
 msgid "Full Name"
 msgstr "ឈ្មោះ​ពេញ"
 
@@ -3616,164 +3793,22 @@ msgstr "ម៉ាស៊ីន​ភ្ញៀវ"
 msgid "Operating System"
 msgstr "ប្រព័ន្ធ​ប្រតិបត្តិការ"
 
-msgid "Last Activity"
-msgstr "សកម្មភាព​ចុងក្រោយ"
-
-msgid "Service Discovery Info"
-msgstr "ព័ត៌មាន​រកឃើញ​សេវា"
-
-msgid "Service Discovery Items"
-msgstr "ធាតុ​រក​ឃើញ​ព័ត៌មាន"
-
-msgid "Extended Stanza Addressing"
-msgstr "កំណត់​អាសយដ្ឋាន Stanza ដែល​បាន​ពង្រីក"
-
-msgid "Multi-User Chat"
-msgstr "ការ​ជជែក​ដែល​មាន​អ្នក​ប្រើច្រើន​នាក់"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "ព័ត៌មាន​វត្តមាន​ដែល​បាន​ពង្រីក​នៃ​កា​រជជែក​ដែល​មាន​អ្នកប្រើ​ច្រើននាក់"
-
-msgid "In-Band Bytestreams"
-msgstr "ស្ទ្រីម​បៃ​ក្នុងក្រុម"
-
-msgid "Ad-Hoc Commands"
-msgstr "ពាក្យ​បញ្ជា Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "សេវា PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "ស្ទ្រីម​បៃ SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "ទិន្នន័យ​ក្រៅ​ក្រុម"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "ការ​ចុះឈ្មោះ​ក្នុងក្រុម"
-
-msgid "User Location"
-msgstr "ទីតាំង​របស់​អ្នក​ប្រើ"
-
-msgid "User Avatar"
-msgstr "រូបភាព​របស់​អ្នក"
-
-msgid "Chat State Notifications"
-msgstr "ការ​ជូនដំណឹង​ស្ថានភាព​ជជែក"
-
-msgid "Software Version"
-msgstr "កំណែ​​កម្មវិធី"
-
-msgid "Stream Initiation"
-msgstr "ការ​ចាប់ផ្ដើម​ស្ទ្រីម​"
-
-msgid "File Transfer"
-msgstr "កា​រផ្ទេរ​ឯកសារ"
-
-msgid "User Mood"
-msgstr "អារម្មណ៍​អ្នក​ប្រើ"
-
-msgid "User Activity"
-msgstr "សកម្មភាព​អ្នក​ប្រើ"
-
-msgid "Entity Capabilities"
-msgstr "សមត្ថភាព​អង្គភាព"
-
-msgid "Encrypted Session Negotiations"
-msgstr "ការ​ចរចារ​សម័យ​ដែល​បាន​អ៊ិនគ្រីប"
-
-msgid "User Tune"
-msgstr "អ្នក​ប្រើ​"
-
-msgid "Roster Item Exchange"
-msgstr "ផ្លាស់ប្ដូរ​ធាតុ​បញ្ជីឈ្មោះ"
-
-msgid "Reachability Address"
-msgstr "អាសយដ្ឋាន​ដែល​អាច​ចូល​បាន"
-
-msgid "User Profile"
-msgstr "ទម្រង់​អ្នក​ប្រើ"
-
-msgid "Jingle"
-msgstr "ឃ្លា​ខ្លីៗ"
-
-msgid "Jingle Audio"
-msgstr "អូឌីយ៉ូ​ឃ្លា​ខ្លីៗ"
-
-msgid "User Nickname"
-msgstr "សម្មតិនាម​អ្នក​ប្រើ"
-
-msgid "Jingle ICE UDP"
-msgstr "ឃ្លាខ្លីៗ​របស់ ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "ឃ្លាខ្លីៗ​របស់ ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "ឃ្លាខ្លីៗ​របស់ UDP ដើម"
-
-msgid "Jingle Video"
-msgstr "វីដេអូ​ឃ្លាខ្លីៗ"
-
-msgid "Jingle DTMF"
-msgstr "ឃ្លាខ្លីៗ DTMF"
-
-msgid "Message Receipts"
-msgstr "ទទួលសារ"
-
-msgid "Public Key Publishing"
-msgstr "បោះពុម្ព​គ្រាប់ចុច​សាធារណៈ"
-
-msgid "User Chatting"
-msgstr "ការ​ជជែក​របស់​អ្នក​ប្រើ"
-
-msgid "User Browsing"
-msgstr "កា​ររុករក​របស់​អ្នក​ប្រើ"
-
-msgid "User Gaming"
-msgstr "ការ​លេង​ល្បែង​របស់​អ្នក​ប្រើ"
-
-msgid "User Viewing"
-msgstr "កា​រមើលរបស់​អ្នក​ប្រើ"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "ការ​អ៊ិនគ្រីប Stanza"
-
-msgid "Entity Time"
-msgstr "ពេល​វេលា​​របស់​អង្គភាព"
-
-msgid "Delayed Delivery"
-msgstr "ការ​បញ្ជូន​បាន​ពន្យារពេល"
-
-msgid "Collaborative Data Objects"
-msgstr "វត្ថុ​ទិន្នន័យ​សហការណ៍"
-
-msgid "File Repository and Sharing"
-msgstr "ឃ្លាំង​ឯកសារ និង​ការ​ចែករំលែក"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "ការ​រកឃើញសេវា STUN សម្រាប់​ឃ្លាខ្លីៗ"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "ការ​ចរចារ​សម័យ​ដែល​បាន​អ៊ិនគ្រីប​សាមញ្ញ"
-
-msgid "Hop Check"
-msgstr "ពិនិត្យមើល​ដំណាក់"
-
-msgid "Capabilities"
-msgstr "សមត្ថភាព"
+msgid "Local Time"
+msgstr "ពេលវេលា​ក្នុង​ស្រុក"
 
 msgid "Priority"
 msgstr "អាទិភាព"
 
 msgid "Resource"
-msgstr "ធមធាម"
+msgstr "ធនធាន"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s កន្លង​ទៅ"
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "បាន​ចេញ"
 
 msgid "Middle Name"
 msgstr "ឈ្មោះ​កណ្ដាល"
@@ -3941,28 +3976,25 @@ msgstr "ជ្រើស​ម៉ាស៊ីនបម្រើ​សន្និ
 msgid "Find Rooms"
 msgstr "រក​បន្ទប់"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "អ្នកត្រូវកា​រការ​អ៊ិនគ្រីប ប៉ុន្តែ​មិនអាច​ប្រើ​បាន​នៅ​លើ​​ម៉ាស៊ីន​បម្រើនេះ​ទេ ។"
+msgid "Affiliations:"
+msgstr "ឈ្មោះ​ក្លែងក្លាយ ៖"
 
-msgid "Write error"
-msgstr "កំហុស​ក្នុងកា​រសរសេរ"
+msgid "No users found"
+msgstr "រក​មិនឃើញ​អ្នក​ប្រើ"
 
-msgid "Ping timeout"
-msgstr "Ping អស់ពេល"
+msgid "Roles:"
+msgstr "តួនាទី ៖"
 
-msgid "Read Error"
-msgstr "កំហុស​ក្នុងការ​អាន"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Ping អស់ពេល"
 
-#, c-format
+#, fuzzy
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ ៖\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "មិន​អាច​បង្កើត​រន្ធ​បានទេ"
+"មិនអាច​រក​វិធីសាស្ត្រ​តភ្ជាប់ XMPP ជា​ជម្រើស​បានទេ បន្ទាប់​ពី​បរាជ័យ​ក្នុងការតភ្ជាប់​ដោយ​ផ្ទាល់ ។\n"
 
 msgid "Invalid XMPP ID"
 msgstr "លេខសម្គាល់ XMPP មិន​ត្រឹមត្រូវ"
@@ -3970,6 +4002,10 @@ msgstr "លេខសម្គាល់ XMPP មិន​ត្រឹមត្រ
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "លេខសម្គាល់ XMPP មិនត្រឹមត្រូវ ។ ដែន​ត្រូវ​តែ​បានកំណត់ ។"
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "កា​រតភ្ជាប់​ម៉ាស៊ីន​បម្រើ BOSH មិន​ត្រឹមត្រូវ"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "ការ​ចុះឈ្មោះ​ %s@%s ដោយ​ជោគជ័យ"
@@ -3994,9 +4030,6 @@ msgstr "លុប​ការ​ចុះឈ្មោះ​ដោយ​ជោគ
 msgid "Unregistration Failed"
 msgstr "បានបរាជ័យ​ក្នុងការ​លុប​ការ​ចុះឈ្មោះ"
 
-msgid "Already Registered"
-msgstr "បានចុះឈ្មោះ​រួច​ហើយ"
-
 msgid "State"
 msgstr "ស្ថាន​​ភាព"
 
@@ -4009,6 +4042,9 @@ msgstr "ទូរស័ព្ទ​"
 msgid "Date"
 msgstr "កាល​​បរិច្ឆេទ"
 
+msgid "Already Registered"
+msgstr "បានចុះឈ្មោះ​រួច​ហើយ"
+
 msgid "Unregister"
 msgstr "មិន​ចុះឈ្មោះ"
 
@@ -4060,6 +4096,12 @@ msgstr "ម៉ាស៊ីន​បម្រើ​មិន​គាំទ្រ
 msgid "Not Authorized"
 msgstr "មិន​បានផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ទេ"
 
+msgid "Mood"
+msgstr "អារម្មណ៍"
+
+msgid "Now Listening"
+msgstr "ឥឡូវ​កំពុង​ស្ដាប់"
+
 msgid "Both"
 msgstr "ទាំង​ពីរ​"
 
@@ -4081,12 +4123,6 @@ msgstr "គ្មាន"
 msgid "Subscription"
 msgstr "ការ​ជាវ"
 
-msgid "Mood"
-msgstr "អារម្មណ៍"
-
-msgid "Now Listening"
-msgstr "ឥឡូវ​កំពុង​ស្ដាប់"
-
 msgid "Mood Text"
 msgstr "អត្ថបទ​អារម្មណ៍"
 
@@ -4129,9 +4165,6 @@ msgstr "ពាក្យ​សម្ងាត់​របស់​អ្នក​
 msgid "Error changing password"
 msgstr "កំហុស​ក្នុងកា​រផ្លាស់ប្ដូរ​ពាក្យសម្ងាត់"
 
-msgid "Password (again)"
-msgstr "ពាក្យ​សម្ងាត់ (ម្ដង​ទៀត)"
-
 msgid "Change XMPP Password"
 msgstr "ផ្លាស់ប្ដូរ​ពាក្យ​សម្ងាត់ XMPP"
 
@@ -4325,16 +4358,22 @@ msgid "Unable to ping user %s"
 msgstr "មិនអាច ping អ្នក​ប្រើ %s បានទេ"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "មិនអាច​កេះកៀវ​បានទេ ពីព្រោះ​មិន​ស្គាល់​អំពី​អ្នកប្រើ %s ។"
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "មិនអាច​កេះកៀវ​បានទេ ពីព្រោះ​មិន​ស្គាល់​​អ្វី​ទាំង​អស់​​ពី​អ្នកប្រើ %s ។"
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "មិន​អាច​កេះកៀវ​បានទេ ពីព្រោះ %s នៅ​ក្រៅ​បណ្ដាញ ។"
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "មិនអាចកេះកៀង​បានទេ ពីព្រើ​អ្នកប្រើ %s នៅ​ក្រៅ​បណ្ដាញ ។"
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr "មិនអាច​កេះកៀវ​បានទេ ពីព្រោះ %s មិន​គាំទ្រ​វា​ទេ ឬ​មិនមាន​បំណង​​ទទួល​ការ​កេះកៀវ​​ឥឡូវ​នោះ​ទេ ។"
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "មិនអាច​កេះកៀវ​បានទេ ពីព្រោះ​អ្នក​ប្រើ %s មិន​គាំទ្រ​វា​ទេ ។"
+msgid "Buzzing %s..."
+msgstr "កំពុងកេះកៀវ %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4346,8 +4385,31 @@ msgid "%s has buzzed you!"
 msgstr "%s បានកេះកៀវ​អ្នក !"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "កំពុងកេះកៀវ %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "មិន​អាច​ចាប់ផ្ដើម​មេឌៀជា​មួយ​ %s បានទេ ៖ JID មិន​ត្រឹមត្រូវ"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "មិនអាច​ចាប់ផ្ដើម​មេឌៀ​ជា​មួយ %s ៖ អ្នក​ប្រើ​មិន​នៅ​លើ​បណ្ដាញ​ទេ"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "មិន​អាច​ចាប់ផ្ដើម​មេឌៀ​ជា​មួយ %s បានទេ ៖ មិន​បានជាវ​ទៅ​វត្តមាន​អ្នក​ប្រើ​បានទេ"
+
+msgid "Media Initiation Failed"
+msgstr "បានបរាជ័យ​ក្នុងកា​រចាប់ផ្ដើម​មេឌៀ"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "សូម​ជ្រើស​ធនធាន %s ដែល​អ្នក​ចង់​ចាប់ផ្ដើម​សម័យ​មេឌៀ ។"
+
+msgid "Select a Resource"
+msgstr "ជ្រើស​ធនធាន"
+
+msgid "Initiate Media"
+msgstr "ចាប់ផ្ដើម​មេឌៀ"
 
 msgid "config:  Configure a chat room."
 msgstr "config ៖  កំណត់​រចនាសម្ព័ន្ធ​បន្ទប់​ជជែក ។"
@@ -4368,18 +4430,18 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ហាមឃាត់ &lt;អ្នក​ប្រើ&gt; [ហេតុផល] ៖  ហាមឃាត់​អ្នកប្រើ​ពី​បន្ទប់ ។"
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"ទាក់ទង &lt;អ្នក​ប្រើ&gt; &lt;ម្ចាស់|អ្នកគ្រប់គ្រង|សមាជិក|outcast|គ្មាន&gt; ៖ កំណត់​ទំនាក់ទំនង​"
-"របស់​អ្នក​ប្រើ​ជា​មួយ​នឹង​បន្ទប់ ។"
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: យក​អ្នក​"
+"ប្រើ​ជា​មួយទំនាក់ទំនង ឬ​កំណត់​ទំនាក់ទំនង​របស់​អ្នកប្រើ​​ក្នុង​បន្ទប់នេះ ។"
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"តួនាទី &lt;អ្នក​ប្រើ&gt; &lt;អ្នកអន្តរការី|អ្នក​ចូលរួម|អ្នក​ទស្សនា|គ្មាន&gt; ៖ កំណត់​តួនាទី​របស់​អ្នក​"
-"ប្រើ​នៅ​ក្នុង​បន្ទប់ ។"
+"តួនាទី &lt;អន្តរការី|អ្នក​ចូលរួម|អ្នក​ទស្សនា|គ្មាន&gt; [nick1] [nick2] ...: យក​អ្នក​ប្រើ​"
+"ដែលមានតួនាទី ឬ​កំណត់​តួនាទី​របស់​អ្នក​ក្នុង​បន្ទប់ ។"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "អញ្ជើញ &lt;អ្នក​ប្រើ&gt; [សារ] ៖  អញ្ជើញ​អ្នក​ប្រើ​ឲ្យ​ចូល​បន្ទប់ ។"
@@ -4438,6 +4500,9 @@ msgstr "តភ្ជាប់​ម៉ាស៊ីន​បម្រើ"
 msgid "File transfer proxies"
 msgstr "ប្រូកស៊ី​ការ​ផ្ទេរ​ឯកសារ"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4476,6 +4541,14 @@ msgstr "កំហុស​ក្នុងកា​រញែក XML"
 msgid "Unknown Error in presence"
 msgstr "មិន​ស្គាល់​កំហុស​នៅ​ក្នុងវត្តមាន"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "កំហុស​ក្នុងកា​រចូល​ក្នុងការ​ជជែក %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "កំហុស​​នៅ​ក្នុង​ការ​ជជែក %s"
+
 msgid "Create New Room"
 msgstr "បង្កើត​បន្ទប់​ថ្មី"
 
@@ -4490,13 +4563,30 @@ msgstr "កំណត់​រចនាសម្ព័ន្ធ​បន្ទប
 msgid "_Accept Defaults"
 msgstr "ព្រមទទួល​លំនាំដើម"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "កំហុស​ក្នុងកា​រចូល​ក្នុងការ​ជជែក %s"
+#, fuzzy
+msgid "No reason"
+msgstr "គ្មាន​ហេតុផល​បាន​ផ្ដល់"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "កំហុស​​នៅ​ក្នុង​ការ​ជជែក %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "អ្នក​ត្រូ​វបាន​ធាក់ចេញ​ដោយ %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "បាន​ធាក់ចេញ​ដោយ %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "កំហុស​មួយ​បានកើតឡើង​នៅ​លើ​កា​រផ្ទេរ​ស្ទ្រីមបៃ​ក្នុង​ក្រុម\n"
+
+msgid "Transfer was closed."
+msgstr "កា​រផ្ទេរ​ត្រូវ​បាន​បិទ ។"
+
+msgid "Failed to open the file"
+msgstr "បានបរាជ័យ​ក្នុងការ​បើក​ឯកសារ"
+
+msgid "Failed to open in-band bytestream"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​នៅ​ក្នុង​ស្ទ្រីម​បៃ​ក្នុងក្រុម"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4521,9 +4611,6 @@ msgstr "មិនអាច​ផ្ញើ​ឯកសារ %s បានទេ �
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "សូម​ជ្រើស​ធនធាន​របស់ %s ដែល​អ្នក​ចង់​ផ្ញើ​ឯកសារ"
 
-msgid "Select a Resource"
-msgstr "ជ្រើស​ធនធាន"
-
 msgid "Edit User Mood"
 msgstr "កែសម្រួល​អារម្មណ៍​អ្នកប្រើ"
 
@@ -4818,6 +4905,26 @@ msgstr "ទំនាក់ទំនង​ផ្សេងៗ"
 msgid "Non-IM Contacts"
 msgstr "ទំនាក់ទំនង​ដែល​មិនមាន​ជា IM"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s បានផ្ញើ​ការ​អញ្ជើញ​អ្នក​ឲ្យ​បើក​ម៉ាស៊ីន​ថត​តាមបណ្ដាញ ដែល​មិន​ត្រូវ​បាន​គាំទ្រ​នៅ​ឡើយទេ ។"
+
 msgid "Nudge"
 msgstr "ច្រាន"
 
@@ -4968,8 +5075,28 @@ msgstr "ចាប់ផ្ដើមជជែក"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "ការ​គាំទ្រ SSL ត្រូវ​បានទាមទារ​សម្រាប់ MSN ។ សូម​ដំឡើង​បណ្ណាល័យ SSL ដែល​បានគាំទ្រ ។"
 
-msgid "Failed to connect to server."
-msgstr "បាន​បរាជ័យ​ក្នុងការ​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​បម្រើ ។"
+#, fuzzy, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ពីព្រោះ​ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ ។ ឈ្មោះ​អ្នកប្រើ​ត្រូវ​តែ​ជា​"
+"អាសយដ្ឋានអ៊ីមែល​ត្រឹមត្រូវ ឬ​ចាប់ផ្ដើម​ដោយ​អក្សរ ហើយមាន​តែ​អក្សរ លេខ និង​ចន្លោះ ឬ​មាន​តែ​លេខ ។"
+
+msgid "Unable to Add"
+msgstr "មិនអាច​បន្ថែម"
+
+msgid "Authorization Request Message:"
+msgstr "សារ​សំណើ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ៖"
+
+msgid "Please authorize me!"
+msgstr "សូម​អនុញ្ញាត​ខ្ញុំ !"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "យល់ព្រម"
 
 msgid "Error retrieving profile"
 msgstr "កំហុសក្នុងការ​ទៅ​ទទួល​យក​ទម្រង់"
@@ -5157,63 +5284,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "កា​រផ្ទៀងផ្ទាត់​​ភាព​ត្រឹមត្រូវ​នៃ​លេខសម្គាល់​របស់ Windows Live ៖ ការ​ឆ្លើយតប​មិនត្រឹមត្រូវ"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s មិន​មែន​ជា​ក្រុម​ត្រឹមត្រូវ​ទេ ។"
-
-msgid "Unknown error."
-msgstr "មិន​ស្គាល់​កំហុស ។"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s នៅលើ %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s គ្រាន់​តែ​​បានផ្ញើ​ឲ្យ​អ្នក​នូវ​កា​រច្រានចេញ !"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "មិន​ស្គាល់​កំហុស (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "មិន​ស្គាល់​កំហុស (%d) ៖ %s"
 
 msgid "Unable to add user"
 msgstr "មិនអាច​បន្ថែម​អ្នក​ប្រើ​បានទេ"
 
-msgid "The following users are missing from your addressbook"
-msgstr "អ្នក​ប្រើ​ដូច​ខាងក្រោម​បាត់​ពី​សៀវភៅ​អាសយដ្ឋាន​របស់​អ្នក"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "មិនអាច​បន្ថែម​អ្នកប្រើ​នៅ​លើ %s (%s) បានទេ"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "មិនអាច​ទប់ស្កាត់​អ្នកប្រើ​នៅ​លើ %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "មិនអាច​អនុញ្ញាត​​អ្នកប្រើ​នៅ​លើ %s (%s) បានទេ"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s មិនអាច​ត្រូវ​បាន​បន្ថែម​បាន​ទេ ដោយ​សារ​តែ​បញ្ជី​​មិត្តភក្ដិ​របស់​អ្នក​ពេញ​ហើយ ។"
-
+#. Unknown error!
 #, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s មិនមែន​ជា​គណនី​លិខិត​ឆ្លងដែន​ត្រឹមត្រូវ​ទេ ។"
+msgid "Unknown error (%d)"
+msgstr "មិន​ស្គាល់​កំហុស (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "សេវា​មិនអាច​ប្រើបានជា​បណ្ដោះ​អាសន្ន ។"
+msgid "The following users are missing from your addressbook"
+msgstr "អ្នក​ប្រើ​ដូច​ខាងក្រោម​បាត់​ពី​សៀវភៅ​អាសយដ្ឋាន​របស់​អ្នក"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "សារ​ចល័ត​មិនត្រូវ​បានផ្ញើ​ទេ ដោយ​សារ​តែ​វា​វែង​ពេក ។"
 
-msgid "Unable to rename group"
-msgstr "មិន​អាច​ប្ដូរ​ឈ្មោះ​ក្រុម​បានទេ"
-
-msgid "Unable to delete group"
-msgstr "មិនអាចលុប​ក្រុម​បាន​ទេ"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5251,9 +5342,6 @@ msgstr "សារ​មិន​ត្រូវ​បាន​ផ្ញើ​ទ
 msgid "Message was not sent because an unknown error occurred."
 msgstr "សារ​មិន​ត្រូវ​បាន​ផ្ញើ​បានទេ ពីព្រោះ​មាន​កំហុស​ដែលមិនស្គាល់​បានកើត​ឡើង ។"
 
-msgid "Unable to connect"
-msgstr "មិនអាច​តភ្ជាប់​ទេ"
-
 msgid "Writing error"
 msgstr "កំហុស​ក្នុងការ​សរសេរ"
 
@@ -5268,19 +5356,23 @@ msgstr ""
 "កំហុស​ក្នុងការ​តភ្ជាប់​ពី​ម៉ាស៊ីន​បម្រើ %s ៖\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "ពិធីការ​របស់​យើង​មិន​ត្រូវ​បានគាំទ្រ​ដោយ​ម៉ាស៊ីនបម្រើ​ទេ ។"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "កំហុស​ក្នុងកា​រញែក HTTP ។"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "អ្នក​បាន​ចុះហត្ថលេខា​ពី​ទីតាំង​ផ្សេង ។"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "ម៉ាស៊ីន​បម្រើ MSN មិនអាច​ប្រើ​បាន​ជា​បណ្ដោះ​អាសន្ន ។ សូម​រង់ចាំ ហើយ​ព្យាយាម​ម្ដង​ទៀត ។"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "ម៉ាស៊ីន​បម្រើ MSN នឹង​ខូច​ជា​បណ្ដោះ​អាសន្ន ។"
 
 #, c-format
@@ -5309,6 +5401,14 @@ msgstr "ផ្ញើ​ខូគី"
 msgid "Retrieving buddy list"
 msgstr "ទៅ​យក​បញ្ជី​មិត្តភក្ដិ"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s បានផ្ញើ​ការ​អញ្ជើញ​អ្នក​ឲ្យ​បើក​ម៉ាស៊ីន​ថត​តាមបណ្ដាញ ដែល​មិន​ត្រូវ​បាន​គាំទ្រ​នៅ​ឡើយទេ ។"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s បានផ្ញើ​ការ​អញ្ជើញ​អ្នក​ឲ្យ​បើក​ម៉ាស៊ីន​ថត​តាមបណ្ដាញ ដែល​មិន​ត្រូវ​បាន​គាំទ្រ​នៅ​ឡើយទេ ។"
+
 msgid "Away From Computer"
 msgstr "ចាកឆ្ងាយ​ពី​កុំព្យូទ័រ"
 
@@ -5347,14 +5447,6 @@ msgstr "សារ​មិនអាច​ត្រូវ​បាន​ផ្ញ
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "សារ​មិន​​អាច​ត្រូវ​បាន​ទេ ពីព្រោះ​មាន​កំហុស​ដែល​មិន​ស្គាល់​បាន​កើតឡើង ៖"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s បាន​បន្ថែម​អ្នក​ទៅ​កាន់​បញ្ជី​មិត្តភក្ដិ​របស់គាត់ ។"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s បានយក​អ្នក​ចេញ​ពី​បញ្ជី​មិត្តភក្ដិ​របស់​គាត់ ។"
-
 msgid "Delete Buddy from Address Book?"
 msgstr "លុប​មិត្តភក្ដិ​ពី​សៀវភៅ​អាសយដ្ឋាន ?"
 
@@ -5384,6 +5476,54 @@ msgid "MSN Protocol Plugin"
 msgstr "កម្មវិធី​ជំនួយ​ពិធីការ​​របស់ MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s មិន​មែន​ជា​ក្រុម​ត្រឹមត្រូវ​ទេ ។"
+
+msgid "Unknown error."
+msgstr "មិន​ស្គាល់​កំហុស ។"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s នៅលើ %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "មិនអាច​បន្ថែម​អ្នកប្រើ​នៅ​លើ %s (%s) បានទេ"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "មិនអាច​ទប់ស្កាត់​អ្នកប្រើ​នៅ​លើ %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "មិនអាច​អនុញ្ញាត​​អ្នកប្រើ​នៅ​លើ %s (%s) បានទេ"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s មិនអាច​ត្រូវ​បាន​បន្ថែម​បាន​ទេ ដោយ​សារ​តែ​បញ្ជី​​មិត្តភក្ដិ​របស់​អ្នក​ពេញ​ហើយ ។"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s មិនមែន​ជា​គណនី​លិខិត​ឆ្លងដែន​ត្រឹមត្រូវ​ទេ ។"
+
+msgid "Service Temporarily Unavailable."
+msgstr "សេវា​មិនអាច​ប្រើបានជា​បណ្ដោះ​អាសន្ន ។"
+
+msgid "Unable to rename group"
+msgstr "មិន​អាច​ប្ដូរ​ឈ្មោះ​ក្រុម​បានទេ"
+
+msgid "Unable to delete group"
+msgstr "មិនអាចលុប​ក្រុម​បាន​ទេ"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s បាន​បន្ថែម​អ្នក​ទៅ​កាន់​បញ្ជី​មិត្តភក្ដិ​របស់គាត់ ។"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s បានយក​អ្នក​ចេញ​ពី​បញ្ជី​មិត្តភក្ដិ​របស់​គាត់ ។"
+
+#, c-format
 msgid "No such user: %s"
 msgstr "គ្មាន​អ្នក​ប្រើ​បែបនេះ​ទេ ៖ %s"
 
@@ -5412,6 +5552,8 @@ msgid "Lost connection with server"
 msgstr "បាត់​បង់ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "សារ​សំបុត្រ​ថ្មី"
 
@@ -5447,43 +5589,29 @@ msgstr[0] ""
 msgid "Add contacts from server"
 msgstr "បន្ថែម​ទំនាក់ទំនង​ពី​ម៉ាស៊ីន​បម្រើ"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "បាន​តភ្ជាប់"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "កំហុស​ពិធីការ កូដ %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s ពាក្យ​សម្ងាត់​របស់​អ្នកមាន %d តួអក្សរ ធំជាង​ប្រវែង​អតិបរមា​ដែលបាន​រំពឹង​ទុក​របស់ %d សម្រាប់ "
 "MySpaceIM ។ សូម​ធ្វើ​ឲ្យ​ពាក្យ​សម្ងាត់​របស់​អ្នក​ខ្លី​​នៅ http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings ។ ផ្លាស់ប្ដូរ​ពាក្យ​សម្ងាត់ ហើយ​ព្យាយាម​ម្ដង​ទៀត ។"
 
+msgid "Incorrect username or password"
+msgstr "ឈ្មោះ​អ្នក​ប្រើ ឬ​ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
+
 msgid "MySpaceIM Error"
 msgstr "កំហុស MySpaceIM"
 
 msgid "Invalid input condition"
 msgstr "លក្ខខណ្ឌ​បញ្ចូល​មិនត្រឹមត្រូវ"
 
-msgid "Read buffer full (2)"
-msgstr "អាន​សតិ​បណ្ដោះអាសន្ន​ពេញលេញ (២)"
-
-msgid "Unparseable message"
-msgstr "សារ​ដែល​មិន​អាច​ញែក​បាន"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន ៖ %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "បាន​បរាជ័យ​ក្នុងការ​បន្ថែម​មិត្តភក្ដិ"
 
@@ -5567,6 +5695,12 @@ msgstr "មិត្តភក្ដិ​សរុប"
 msgid "Client Version"
 msgstr "កំណែ​ម៉ាស៊ីន​ភ្ញៀវ"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - មាន​ឈ្មោះ​អ្នក​ប្រើ"
 
@@ -5783,9 +5917,6 @@ msgstr "មិនអាច​បន្ថែម​ខ្លួន​អ្នក
 msgid "Master archive is misconfigured"
 msgstr "ប័ណ្ណសារ​មេ​បាត់ misconfigured"
 
-msgid "Incorrect username or password"
-msgstr "ឈ្មោះ​អ្នក​ប្រើ ឬ​ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "មិនអាច​ស្គាល់​ឈ្មោះ​​អ្នកប្រើ​ម៉ាស៊ីន​ដែល​អ្នក​បានបញ្ចូល​ទេ"
 
@@ -5824,9 +5955,9 @@ msgstr "អ្នក​ប្រើ​នៅ​ក្រៅ​បណ្ដាញ
 msgid "Unknown error: 0x%X"
 msgstr "មិន​ស្គាល់​កំហុស ៖ 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "បាន​បរាជ័យ​ក្នុងកា​រចូល (%s) ។"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "មិនអាច ping អ្នក​ប្រើ %s បានទេ"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5926,9 +6057,6 @@ msgstr "GroupWise សន្និសីទ %d"
 msgid "Authenticating..."
 msgstr "កំពុង​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ..."
 
-msgid "Unable to connect to server."
-msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។"
-
 msgid "Waiting for response..."
 msgstr "កំពុង​រង់ចាំ​ការ​ឆ្លើយ​តប..."
 
@@ -5952,22 +6080,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "តើ​អ្នក​ចង់​ចូល​រួម​ក្នុងការ​សន្ទនា​ដែរឬទេ ?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "អ្នក​ត្រូវ​បាន​ចេញ ដោយ​សារ​តែ​អ្នក​បាន​ចូល​ក្នុងស្ថានីយការងារ​ផ្សេង​ទៀត ។"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s បង្ហាញថា​នៅ​ក្រៅបណ្ដាញ ហើយ​មិន​បានទទួល​សារ​ដែល​អ្នក​ទើប​តែ​បាន​ផ្ញើ​នោះ​ទេ ។"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។ សូម​បញ្ចូល​អាសយដ្ឋាន​ម៉ាស៊ីនបម្រើ​ដែល​អ្នក​ចង់​តភ្ជាប់ ។"
 
-msgid "Error. SSL support is not installed."
-msgstr "កំហុស ។ ការ​គាំទ្រ SSL មិន​ត្រូវ​បាន​ដំឡើង​ទេ ។"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "សន្និសីទ​នេះ​ត្រូ​វបាន​បិទ ។ គ្មាន​សារ​អាច​ត្រូវ​បាន​ផ្ញើ​ទេ ។"
 
@@ -5990,24 +6113,33 @@ msgstr "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ"
 msgid "Server port"
 msgstr "ច្រក​ម៉ាស៊ីនបម្រើ"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "បាន​ទទួល​កា​រឆ្លើយ​តប HTTP ពី​ម៉ាស៊ីនបម្រើ ។"
+
+#. username connecting too frequently
+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 ""
+"អ្នក​កំពុង​ត្រូវ​បានតភ្ជាប់ និង​ផ្ដាច់​ញឹក​ញាប់​ណាស់ ។ រង់ចាំ​ដប់នាទី ហើយ​ព្យាយាម​ម្ដង​ទៀត ។ ប្រសិនបើ​អ្នក​បន្ត​"
+"ដើម្បី​ព្យាយាម អ្នកនឹង​ត្រូវ​រង់ចាំ​យូរ​បន្តិច ។"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "កំហុស​ក្នុងការ​ដោះស្រាយ %s"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "មិនអាច​ចូល​រួម​ក្នុង​បន្ទប់​ជជែក​បានទេ"
 
 msgid "Invalid chat room name"
 msgstr "ឈ្មោះ​បន្ទប់​ជជែក​មិន​ត្រឹមត្រូវ"
 
-msgid "Server closed the connection."
-msgstr "ម៉ាស៊ីនបម្រើ​បានបិទ​ការ​តភ្ជាប់ ។"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"បាត់​បង់​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ ៖\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "បាន​ទទួល​ទិន្នន័យ​មិនត្រឹមត្រូវ​នៅ​លើ​កា​រតភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ ។ "
 
 #. *< type
@@ -6055,7 +6187,8 @@ msgstr "បាត់បង់​ការ​តភ្ជាប់​ជា​ម
 msgid "Received invalid data on connection with remote user."
 msgstr "បាន​ទទួល​ទិន្នន័យ​មិន​ត្រឹមត្រូវ​នៅ​ពេល​តភ្ជាប់​ជា​មួយ​អ្នកប្រើពី​ចម្ងាយ ។"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​អ្នក​ប្រើ​ពី​ចម្ងាយ​បាន​ទេ ។"
 
 msgid "Direct IM established"
@@ -6254,21 +6387,15 @@ msgstr "កម្រិត​ព្រមាន"
 msgid "Buddy Comment"
 msgstr "មតិយោបល់​មិត្តភក្ដិ"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​បានទេ ៖\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ BOS ៖\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។"
 
 msgid "Username sent"
 msgstr "បានផ្ញើ​ឈ្មោះ​អ្នក​ប្រើ"
@@ -6280,51 +6407,60 @@ msgstr "បានបង្កើត​ការ​តភ្ជាប់ បា�
 msgid "Finalizing connection"
 msgstr "បញ្ចប់​ការ​តភ្ជាប់"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "មិនអាច​ចូល​បានទេ ៖ មិនអាច​ចូល​ជា​ %s ពីព្រោះ​ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ ។ អ្នក​ប្រើ​ត្រូវ​តែ​មានអាសយដ្ឋាន​"
 "អ៊ីមែល ឬ​ចាប់ផ្ដើម​ដោយ​អក្សរ និង​មានតែ​អក្សរ លេខ និង​ចន្លោះ ឬ​មាន​តែ​លេខ ។"
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "ឈ្មោះ​អ្នកប្រើ​មិន​ត្រឹមត្រូវ ។"
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"អ្នក​អាច​ត្រូ​វបាន​ផ្ដាច់​ក្នុង​រយៈពេលបន្តិចទៀត​នេះ ។ ប្រសិនបើ​ដូច្នេះ​មែន ពិនិត្យ​មើល​ភាពទាន់សម័យ %s ។"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "មិនអាច​យក​សញ្ញា​ចូល AIM ត្រឹមត្រូវ​ទេ ។"
+
+msgid "Unable to get a valid login hash."
+msgstr "មិនអាច​យក​សញ្ញា​ចូល​ត្រឹមត្រូវ​បានទេ ។"
+
+msgid "Received authorization"
+msgstr "បានទទួល​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
 
-msgid "Incorrect password."
-msgstr "ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ ។"
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "មិនមាន​​ឈ្មោះ​អ្នក​ប្រើ"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "គណនី​របស់​អ្នក​បច្ចុប្បន្ន​ត្រូវ​បានផ្អាក ។"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "សេវា​កម្មវិធី​ផ្ញើសារបន្ទាន់ AOL បច្ចុប្បន្ន​ប្រើ​មិនបានទេ ។"
 
-#. screen name connecting too frequently
+#. client too old
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "កំណែ​ម៉ាស៊ីន​ភ្ញៀវ​ដែល​អ្នក​កំពុង​ប្រើ​ចាស់​ពេក ។ សូម​ធ្វើ​ឲ្យ​ប្រសើរ​នៅ %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "អ្នក​កំពុង​ត្រូវ​បានតភ្ជាប់ និង​ផ្ដាច់​ញឹក​ញាប់​ណាស់ ។ រង់ចាំ​ដប់នាទី ហើយ​ព្យាយាម​ម្ដង​ទៀត ។ ប្រសិនបើ​អ្នក​បន្ត​"
 "ដើម្បី​ព្យាយាម អ្នកនឹង​ត្រូវ​រង់ចាំ​យូរ​បន្តិច ។"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "កំណែ​ម៉ាស៊ីន​ភ្ញៀវ​ដែល​អ្នក​កំពុង​ប្រើ​ចាស់​ពេក ។ សូម​ធ្វើ​ឲ្យ​ប្រសើរ​នៅ %s"
-
-msgid "Could Not Connect"
-msgstr "មិនអាច​តភ្ជាប់​បានទេ"
-
-msgid "Received authorization"
-msgstr "បានទទួល​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "សោ SecurID ដែល​​បាន​បញ្ចូល​មិនត្រឹមត្រូវ ។"
 
 msgid "Enter SecurID"
@@ -6333,27 +6469,6 @@ msgstr "បញ្ចូល SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "បញ្ចូលលេខ ៦ តួលេខ​ពី​ការ​បង្ហាញឌីជីថល ។"
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "យល់ព្រម"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"អ្នក​អាច​ត្រូ​វបាន​ផ្ដាច់​ក្នុង​រយៈពេលបន្តិចទៀត​នេះ ។ ប្រសិនបើ​ដូច្នេះ​មែន ពិនិត្យ​មើល​ភាពទាន់សម័យ %s ។"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "មិនអាច​យក​សញ្ញា​ចូល AIM ត្រឹមត្រូវ​ទេ ។"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "អ្នក​អាច​ត្រូវ​បានផ្ដាច់​ក្នុង​រយៈពេល​បន្តិចទៀត​នេះ ។ ពិនិត្យ​មើលភាព​ទាន់សម័យ %s ។"
-
-msgid "Unable to get a valid login hash."
-msgstr "មិនអាច​យក​សញ្ញា​ចូល​ត្រឹមត្រូវ​បានទេ ។"
-
 msgid "Password sent"
 msgstr "បានផ្ញើ​ពាក្យ​​​សម្ងាត់"
 
@@ -6363,12 +6478,6 @@ msgstr "មិនអាច​ចាប់ផ្ដើម​កា​រតភ្
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "សូម​អនុញ្ញាត​ខ្ញុំ ដូច្នេះ​ខ្ញុំ​អាច​បន្ថែម​អ្នក​នៅកាន់​បញ្ជី​មិត្តភក្ដិ​របស់​​ខ្ញុំ ។"
 
-msgid "Authorization Request Message:"
-msgstr "សារ​សំណើ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ៖"
-
-msgid "Please authorize me!"
-msgstr "សូម​អនុញ្ញាត​ខ្ញុំ !"
-
 msgid "No reason given."
 msgstr "គ្មាន​ហេតុផល​បានផ្ដល់ ។"
 
@@ -6477,7 +6586,7 @@ msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "អ្នកបាត់​សារ %hu ពី %s ដោយសារ​ហេតុផល​ដែល​មិនស្គាល់ ។"
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "មិនអាច​ផ្ញើ​សារ ៖ %s"
@@ -6499,6 +6608,9 @@ msgstr "លើ​បណ្ដាញ​តាំងពី"
 msgid "Member Since"
 msgstr "សមាជិក​តាំង​ពី"
 
+msgid "Capabilities"
+msgstr "សមត្ថភាព"
+
 msgid "Profile"
 msgstr "ទម្រង់"
 
@@ -6660,18 +6772,15 @@ msgstr[0] ""
 msgid "Away message too long."
 msgstr "សារ​ចាកឆ្ងាយ​វែង​ពេក ។"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
 "មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ពីព្រោះ​ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ ។ ឈ្មោះ​អ្នកប្រើ​ត្រូវ​តែ​ជា​"
 "អាសយដ្ឋានអ៊ីមែល​ត្រឹមត្រូវ ឬ​ចាប់ផ្ដើម​ដោយ​អក្សរ ហើយមាន​តែ​អក្សរ លេខ និង​ចន្លោះ ឬ​មាន​តែ​លេខ ។"
 
-msgid "Unable to Add"
-msgstr "មិនអាច​បន្ថែម"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "មិនអាច​ទៅ​យក​បញ្ជីមិត្តភ្ដិ​បានទេ"
 
@@ -6685,9 +6794,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "កំព្រា"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ពីព្រោះ​អ្នក​មាន​មិត្តភក្ដិជា​ច្រើន​នៅ​ក្នុង​បញ្ជីមិត្តភក្ដិ​របស់​អ្នក ។ សូមយក​​"
@@ -6696,8 +6805,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(គ្មាន​ឈ្មោះ)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ដោយ​សារ​មិន​ស្គាល់​ហេតុផល ។"
 
 #, c-format
@@ -6827,6 +6936,7 @@ msgstr "ស្វែងរក"
 msgid "Set User Info (web)..."
 msgstr "កំណត់​ព័ត៌មាន​របស់​អ្នកប្រើ (បណ្ដាញ)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "ផ្លាស់ប្ដូរ​ពាក្យ​សម្ងាត់ (បណ្ដាញ)"
 
@@ -6856,6 +6966,10 @@ msgstr "ស្វែងរក​មិត្តភក្ដិ​តាម​អ
 msgid "Search for Buddy by Information"
 msgstr "ស្វែងរក​មិត្តភក្ដិ​តាម​ព័ត៌មាន"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "អ្នកប្រើ​មិន​បាន​ចូល​ទេ"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7043,6 +7157,34 @@ msgstr "ធ្វើ​​ឲ្យ​​ទាន់សម័យ\t"
 msgid "Could not change buddy information."
 msgstr "មិនអាច​ផ្លាស់ប្ដូរ​ព័ត៌មាន​មិត្តភក្ដិ​បានទេ ។"
 
+msgid "Mobile"
+msgstr "ចល័ត"
+
+msgid "Note"
+msgstr "ចំណាំ"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "អនុស្សារណ​មិត្តភក្ដិ"
+
+msgid "Change his/her memo as you like"
+msgstr "ផ្លាស់ប្ដូរ​កំណត់​ហេតុ​រំលឹក​របស​គាត់​តាម​ដែល​អ្នក​ពេញ​ចិត្ត"
+
+msgid "_Modify"
+msgstr "កែប្រែ "
+
+msgid "Memo Modify"
+msgstr "កែប្រែ​កំណត់​ហេតុ​រំលឹក"
+
+msgid "Server says:"
+msgstr "ម៉ាស៊ីនបម្រើ​​និយាយ ៖"
+
+msgid "Your request was accepted."
+msgstr "សំណើ​របស់​អ្នក​ត្រូវបាន​ទទួល​យក ។"
+
+msgid "Your request was rejected."
+msgstr "សំណើ​របស់​អ្នក​ត្រូវ​បាន​ច្រានចោល ។"
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u ត្រូវការ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
@@ -7352,6 +7494,9 @@ msgstr "<p><b>ទទួល​ស្គាល់</b> ៖<br>\n"
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>អ្នក​សាកល្បង​ហ្មតចត់</b> ៖<br>\n"
 
+msgid "and more, please let me know... thank you!))"
+msgstr "និង​ផ្សេងៗ​ទៀត សូម​ឲ្យ​ខ្ញុំ​ដឹង... អរគុណ !))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>ប្រុសៗ​ទាំង​អស់​នៅ​ក្នុង​បន្ទប់...</i><br>\n"
 
@@ -7426,7 +7571,8 @@ msgstr "ទុក​ខាងក្នុង (វិនាទី)"
 msgid "Update interval (seconds)"
 msgstr "ធ្វើ​ឲ្យ​ចន្លោះ​ទាន់សម័យ (វិនាទី)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "មិនអាច​ឌិគ្រីប​កា​រឆ្លើយ​តប​របស់​ម៉ាស៊ីន​បម្រើ​បានទេ"
 
 #, c-format
@@ -7451,9 +7597,6 @@ msgstr "ត្រូវការ​ធ្វើ​ឲ្យ​សកម្ម"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "កូដ​ឆ្លើយតប​មិន​​ស្គាល់​នៅ​ពេល​ចូល (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "មិនអាច​ឌិគ្រីប​ការ​​ឆ្លើយតប​របស់​ម៉ាស៊ីន​បម្រើ​បាន​ទេ"
-
 msgid "Requesting captcha"
 msgstr "ស្នើ captcha"
 
@@ -7487,30 +7630,18 @@ msgstr ""
 "កូដ​ឆ្លើយតប​មិនស្គាល់ នៅពេល​ចូល (0x%02X) ៖\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "មិនអាច​តភ្ជាប់​បានទេ ។"
-
 msgid "Socket error"
 msgstr "កំហុស​រន្ធ"
 
-msgid "Unable to read from socket"
-msgstr "មិនអាច​អាន​ពី​រន្ធ​បានទេ"
-
-msgid "Write Error"
-msgstr "កំហុស​ក្នុងកា​រសរសេរ"
-
-msgid "Connection lost"
-msgstr "បាត់បង់​ការ​តភ្ជាប់"
-
 msgid "Getting server"
 msgstr "យក​ម៉ាស៊ីនបម្រើ"
 
 msgid "Requesting token"
 msgstr "ស្នើ​ថូខឹន"
 
-msgid "Couldn't resolve host"
-msgstr "មិនអាច​ដោះស្រាយ​ម៉ាស៊ីនបានទេ"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "មិនអាច​ដោះស្រាយ​ម៉ាស៊ីន​បម្រើ​បានទេ"
 
 msgid "Invalid server or port"
 msgstr "ម៉ាស៊ីន​បម្រើ ឬ​ច្រក​មិន​ត្រឹមត្រូវ"
@@ -7563,7 +7694,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "ពាក្យ​បញ្ជា QQ Qun"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "មិនអាច​ឌិគ្រីប​ការ​ឆ្លើយ​តប​ការ​ចូល​បានទេ"
 
 msgid "Unknown LOGIN CMD"
@@ -7583,9 +7715,6 @@ msgstr "ផ្ញើ​ឯកសារ"
 msgid "%d canceled the transfer of %s"
 msgstr "%d បានបោះបង់​ការ​ផ្ទេរ %s"
 
-msgid "Connection closed (writing)"
-msgstr "បាន​បិទ​ការ​តភ្ជាប់ (សរសេរ)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>ចំណង​ជ្រើ​ក្រុម ៖</b> %s<br>"
@@ -7639,17 +7768,6 @@ msgstr "ពេលមួយ​នោះ អ្នកគ្រប់គ្រង�
 msgid "Sametime Administrator Announcement"
 msgstr "ការ​ប្រកាស​របស់​អ្នកគ្រប់គ្រង​ពេល​តែ​មួយ"
 
-msgid "Connection reset"
-msgstr "កំណត់​ការ​តភ្ជាប់​ឡើង​វិញ"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "កំហុស​ក្នុងការ​អាន​ពី​រន្ធ ៖ %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​ទេ"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "ការ​ប្រកាស​ពី %s"
@@ -7672,6 +7790,9 @@ msgstr "ធុងបាស"
 msgid "Video Camera"
 msgstr "ម៉ាស៊ីន​ថត​​វីដេអូ"
 
+msgid "File Transfer"
+msgstr "កា​រផ្ទេរ​ឯកសារ"
+
 msgid "Supports"
 msgstr "គាំទ្រ"
 
@@ -8377,9 +8498,6 @@ msgstr "អង្គការ"
 msgid "Unit"
 msgstr "ផ្នែក"
 
-msgid "Note"
-msgstr "ចំណាំ"
-
 msgid "Join Chat"
 msgstr "ចូលរួម​ជជែក"
 
@@ -8479,6 +8597,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ស្ថិតិ​បណ្ដាញ"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "បានបរាជ័យក្នុងការ Ping"
 
@@ -8542,7 +8663,8 @@ msgstr "ប្រភេទ​សោ​សាធារណៈ​មិន​បា
 msgid "Disconnected by server"
 msgstr "បានផ្ដាច់​ដោយ​ម៉ាស៊ីនបម្រើ"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "កំហុស​កំឡុងពេល​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីន​បម្រើ SILC"
 
 msgid "Key Exchange failed"
@@ -8552,16 +8674,11 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "បានបរាជ័យ​ក្នុងការ​បន្ត​សម័យ​ដែលបានផ្ដាច់ ។ ចុច​តភ្ជាប់ឡើង​វិញ​ដើម្បី​បង្កើត​ការ​តភ្ជាប់ថ្មី ។"
 
-msgid "Connection failed"
-msgstr "បានបរាជ័យ​ក្នុងការ​តភ្ជាប់"
-
 msgid "Performing key exchange"
 msgstr "អនុវត្ត​ការ​ផ្លាស់ប្ដូរ​សោ"
 
-msgid "Unable to create connection"
-msgstr "មិនអាច​បង្កើត​ការតភ្ជាប់​បានទេ"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "មិនអាច​ផ្ទុក​ការ​​ផ្គូផ្គង​សោ SILC បានទេ"
 
 #. Progress
@@ -8571,7 +8688,8 @@ msgstr "តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​
 msgid "Out of memory"
 msgstr "អស់​សតិOut of memory"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "មិនអាច​ចាប់ផ្ដើម​ពិធីការ SILC បានទេ"
 
 msgid "Error loading SILC key pair"
@@ -8860,7 +8978,8 @@ msgstr "ចុះហត្ថលេខា​ឌីជីថល និង​ផ�
 msgid "Creating SILC key pair..."
 msgstr "កំពុង​បង្កើត​គូសោ SILC​..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "មិនអាច​បង្កើត​គូ​សោ SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -8954,6 +9073,9 @@ msgstr "ក្ដារខៀន"
 msgid "No server statistics available"
 msgstr "មិនមាន​ស្ថិតិ​ម៉ាស៊ីន​បម្រើ"
 
+msgid "Error during connecting to SILC Server"
+msgstr "កំហុស​កំឡុងពេល​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីន​បម្រើ SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "បរាជ័យ ៖ កំណែ​មិនផ្គូផ្គង ធ្វើ​ឲ្យ​​ម៉ាស៊ីន​ភ្ញៀវ​របស់​អ្នក​ប្រសើរ​ឡើង"
@@ -8994,30 +9116,27 @@ msgstr "បរាជ័យ ៖ ខូគី​មិន​ត្រឹមត្�
 msgid "Failure: Authentication failed"
 msgstr "បរាជ័យ ៖ បានបរាជ័យ​ក្នុងការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ការ​តភ្ជាប់ម៉ាស៊ីន​ភ្ញៀវ SILC បានទេ"
 
 msgid "John Noname"
 msgstr "John Noname"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "មិនអាច​ផ្ទុក​គូសោ SILC ៖ %s"
 
-msgid "Could not write"
-msgstr "មិនអាច​សរសេរ​បានទេ"
-
-msgid "Could not connect"
-msgstr "មិនអាច​តភ្ជាប់"
+msgid "Unable to create connection"
+msgstr "មិនអាច​បង្កើត​ការតភ្ជាប់​បានទេ"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "មិនស្គាល់​ការ​ឆ្លើយតប​របស់ម៉ាស៊ីនបម្រើ"
 
-msgid "Could not create listen socket"
-msgstr "មិនអាច​បង្កើត​រន្ធ​ស្ដាប់បានទេ"
-
-msgid "Could not resolve hostname"
-msgstr "មិនអាច​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីនបានទេ"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "មិន​អាច​បង្កើត​រន្ធ​បានទេ"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "ឈ្មោះអ្នកប្រើ SIP អាច​មិនមាន​ចន្លោះ​មិនឃើញ ឬ​និមិត្តសញ្ញា @"
@@ -9058,174 +9177,62 @@ msgstr "ផ្ទៀងផ្ទាត់​អ្នកប្រើ"
 msgid "Auth Domain"
 msgstr "ផ្ទៀងផ្ទាត់​ដែន"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "រកមើល %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "បាន​បរាជ័យ​ក្នុងការ​តភ្ជាប់ %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "ចូល ៖ %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "មិនអាច​សរសេរ​ឯកសារ %s បាននោះទេ ។"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "មិន​អាច​អាន​ឯកសារ %s បានទេ ។"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "សារ​វែងពេក បានកាត់​ឲ្យ​ខ្លីចុងក្រោយ​ត្រឹម %s បៃ ។"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s បច្ចុប្បន្នមិន​បានចូល​ទេ ។"
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "មិន​បានអនុញ្ញាត​ការ​ព្រមានរបស់ %s ទេ ។"
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "សារ​ត្រូវ​បានទម្លាក់ អ្នកបានលើស​ដែន​កំណត់ល្បឿន​របស់​ម៉ាស៊ីនបម្រើ ។"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "មិនមានការ​​ជជែក​នៅ​ក្នុង %s ទេ ។"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "អ្នកកំពុង​ផ្ញើសារ​យ៉ាង​លឿន​ទៅ %s ។"
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "អ្នកបាត់ IM ពី %s ពីព្រោះ​វា​ធំពេក ។"
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "អ្នកបានបាត់ IM ពី %s ពីព្រោះ​វា​លឿន​ពេក ។"
-
-#, c-format
-msgid "Failure."
-msgstr "បរាជ័យ ។"
-
-#, c-format
-msgid "Too many matches."
-msgstr "មានការ​ផ្គូផ្គង​ច្រើនពេក ។"
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "ត្រូវការ​ឧបករណ៍​បញ្ជាក់​បន្ថែមទៀត ។"
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "សេវា Dir មិន​អាច​ប្រើបាន​ជា​បណ្ដោះអាសន្ន ។"
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "បានដាក់កម្ងិរ​ការ​រកមើល​អ៊ីមែល ។"
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "បានមិនអើពើ​ពាក្យគន្លឹះ ។"
-
-#, c-format
-msgid "No keywords."
-msgstr "គ្មាន​ពាក្យ​គន្លឹះ ។"
-
-#, c-format
-msgid "User has no directory information."
-msgstr "អ្នកប្រើ​មិនមាន​​ព័ត៌មាន​ថត​ទៀតទេ ។"
-
-#, c-format
-msgid "Country not supported."
-msgstr "មិន​បានគាំទ្រ​ប្រទេស​ទេ ។"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "មិនស្គាល់​ភាព​បរាជ័យ ៖ %s ។"
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "ឈ្មោះ​អ្នកប្រើ ឬ​ពាក្យសម្ងាត់​មិន​ត្រឹមត្រូវ ។"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "សេវា​មិន​អាច​ប្រើបាន​ជា​បណ្ដោះអាសន្ន ។"
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "កម្រិត​ព្រមាន​របស់​អ្នកបច្ចុប្បន្ន​ខ្ពស់​ពេក​ត្រូវ​ចូល ។"
-
-#, c-format
-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 ""
-"អ្នក​បានតភ្ជាប់​ និង​ផ្ដាច់​ញឹកញាប់ពេក ។ រង់ចាំ​រយៈពេល​ ១០ នាទី ហើយ​ព្យាយាម​ម្ដង​ទៀត ។ ប្រសិន​បើ​អ្នកបន្ត​"
-"ព្យាយាម អ្នក​នឹង​ត្រូវ​រង់ចាំ​យូរ​ជាង​នេះ ។"
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "មិនស្គាល់​កំហុស​ក្នុងការ​ចូល​បានកើតឡើង ៖ %s ។"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "មិនស្គាល់​កំហុស %d ដែល​បានកើត​ឡើង ។ ព័ត៌មាន ៖ %s"
-
-msgid "Invalid Groupname"
-msgstr "ឈ្មោះក្រុម​មិនត្រឹមត្រូវ"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "ចូលរួម &lt;room&gt; ៖  ចូលរួម​បន្ទប់​ជជែក​នៅ​ក្នុង​បណ្ដាញ​យ៉ាហ៊ូ"
 
-msgid "Connection Closed"
-msgstr "បានបិទ​ការ​តភ្ជាប់"
+msgid "list: List rooms on the Yahoo network"
+msgstr "បញ្ជី ៖ រាយ​បន្ទប់​នៅ​ក្នុង​បណ្ដាញ​របស់​យ៉ាហ៊ូ"
 
-msgid "Waiting for reply..."
-msgstr "កំពុង​រង់ចាំ​ការ​ឆ្លើយតប..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle ៖ ស្នើ​អ្នកប្រើ​ឲ្យ​ចាប់ផ្ដើម​សម័យ​របស់ Doodle"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC បាន​ត្រឡប់​ពី​ការ​ផ្អាក​របស់​វា ។ ឥឡូវ​អ្នក​ផ្ញើសារ​ម្ដង​ទៀត ។"
+msgid "Yahoo ID..."
+msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ..."
 
-msgid "Password Change Successful"
-msgstr "ផ្លាស់ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "កម្មវិធី​ជំនួយ​ពិធីការ​របស់យ៉ាហ៊ូ"
 
-msgid "_Group:"
-msgstr " ក្រុម ៖"
+msgid "Pager server"
+msgstr "ម៉ាស៊ីនបម្រើ​ភេយ័រ"
 
-msgid "Get Dir Info"
-msgstr "យក​ព័ត៌មាន Dir"
+msgid "Pager port"
+msgstr "ច្រក​ភេយ័រ"
 
-msgid "Set Dir Info"
-msgstr "កំណត់​ព័ត៌មាន Dir"
+msgid "File transfer server"
+msgstr "ម៉ាស៊ីនបម្រើ​ផ្ទេរ​ឯកសារ"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "មិន​អាច​បើក %s ដើម្បីសរសេរ​បានទេ !"
+msgid "File transfer port"
+msgstr "ច្រក​ផ្ទេរ​ឯកសារ"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "បានបរាជ័យ​ក្នុងការ​ផ្ទេរ​ឯកសារ ផ្នែកផ្សេង​ប្រហែលជា​បានបោះបង់​ហើយ "
+msgid "Chat room locale"
+msgstr "បន្ទប់​ជជែក​មូលដ្ឋាន"
 
-msgid "Could not connect for transfer."
-msgstr "មិនអាច​តភ្ជាប់​ដើម្បី​ផ្ទេរ​បានទេ ។"
+msgid "Ignore conference and chatroom invitations"
+msgstr "មិនអើពើ​សន្និសីទ និង​ការ​អញ្ជើញ​របស់​បន្ទប់​ជជែក"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "មិនអាច​សរសេរ​បឋមកថា​ឯកសារ​បានទេ ។ ឯកសារ​នឹង​មិន​ត្រូវ​បានផ្ទេរ​ទេ ។"
+msgid "Chat room list URL"
+msgstr "URL បញ្ជី​បន្ទប់​ជជែក"
 
-msgid "Save As..."
-msgstr "រក្សាទុកជា..."
+msgid "Yahoo Chat server"
+msgstr "ម៉ាស៊ីនបម្រើ​ជជែក​យ៉ាហ៊ូ"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s ស្នើ %s ឲ្យ​ទទួលឯកសារ %d ៖ %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "ច្រក​ជជែក​យ៉ាហ៊ូ"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s ស្នើ​អ្នក​ឲ្យ​ផ្ញើ​ឯកសារ​ឲ្យ​ពួកវា"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ..."
 
 #. *< type
 #. *< ui_requirement
@@ -9237,12 +9244,12 @@ msgstr "%s ស្នើ​អ្នក​ឲ្យ​ផ្ញើ​ឯកសា
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "កម្មវិធី​ពិធីការ TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "កម្មវិធី​ជំនួយ​ពិធីការ​របស់យ៉ាហ៊ូ"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s បានផ្ញើ​ការ​អញ្ជើញ​អ្នក​ឲ្យ​បើក​ម៉ាស៊ីន​ថត​តាមបណ្ដាញ ដែល​មិន​ត្រូវ​បាន​គាំទ្រ​នៅ​ឡើយទេ ។"
+msgid "Your SMS was not delivered"
+msgstr "SMS របស់​អ្នក​មិន​ត្រូវ​បាន​បញ្ជូន​ទេ"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "យ៉ាហ៊ូ​របស់​អ្នក ! សារ​មិន​ត្រូវ​បានផ្ញើ​ទេ ។"
@@ -9266,6 +9273,32 @@ msgstr "%s បាន​ (ប្រតិសកម្ម) បដិសេធ​�
 msgid "Add buddy rejected"
 msgstr "បន្ថែម​មិត្តភក្ដិ​ដែល​បាន​ច្រានចេញ"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "បាន​ទទួល​ទិន្នន័យ​មិន​ត្រឹមត្រូវ"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"គណនី​ជាប់សោ ៖ ប៉ុនប៉ង​ចូល​ច្រើន​​ដង​ពេក ។\n"
+"ចូល​ក្នុង Yahoo! តំបន់​បណ្ដាញ​អាច​ជួសជុល​វា ។"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"គណនី​ជាប់សោ ៖ មិនស្គាល់​ហេតុផល​ទេ ។\n"
+"ចូល​ក្នុង Yahoo! តំបន់​បណ្ដាញ​អាចជួសជុល​វា ។"
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "បាត់​ឈ្មោះ​អ្នក​ប្រើ ឬ​ពាក្យ​សម្ងាត់"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9296,38 +9329,31 @@ msgstr "គណនី​របស់​អ្នកត្រូវ​បាន​
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "មិន​ស្គាល់លេខ​កំហុស %d ។ ចូល​ក្នុង​តំបន់យ៉ាហ៊ូ ! អាចជួសជុល​វា​បាន ។"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "មិនអាច​បន្ថែម​មិត្តភក្ដិ %s ដើម្បីដាក់ %s ជា​ក្រុម​ទៅកាន់​បញ្ជីម៉ាស៊ីន​បម្រើ​នៅ​ក្នុងគណនី %s ។"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "មិនអាច​បន្ថែម​មិត្តភក្ដិ​ទៅ​កាន់បញ្ជី​ម៉ាស៊ីន​បម្រើ​ទេ"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "បាន​ទទួល​កា​រឆ្លើយ​តប HTTP ពី​ម៉ាស៊ីនបម្រើ ។"
 
-msgid "Connection problem"
-msgstr "បញ្ហា​ក្នុង​ការ​តភ្ជាប់"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "បាត់បង់​ការ​តភ្ជាប់​ជា​មួយ %s ៖\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ %s បានទេ ៖\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីម​បម្រើ​ទេ"
 
 msgid "Not at Home"
 msgstr "មិននៅ​ផ្ទះ​ទេ"
@@ -9374,8 +9400,8 @@ msgstr "ការ​កំណត់​វត្តមាន"
 msgid "Start Doodling"
 msgstr "ចាប់ផ្ដើម Doodling"
 
-msgid "Activate which ID?"
-msgstr "ធ្វើ​ឲ្យ​សកម្ម​នូវ​លេខសម្គាល់​ណា​មួយ ?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "អ្នកណា​ចូលរួម​ក្នុងកា​រជជែក ?"
@@ -9389,73 +9415,15 @@ msgstr "ចូលរួម​អ្នកប្រើ​នៅ​ក្នុង
 msgid "Open Inbox"
 msgstr "បើក​ប្រអប់"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "ចូលរួម &lt;room&gt; ៖  ចូលរួម​បន្ទប់​ជជែក​នៅ​ក្នុង​បណ្ដាញ​យ៉ាហ៊ូ"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "បញ្ជី ៖ រាយ​បន្ទប់​នៅ​ក្នុង​បណ្ដាញ​របស់​យ៉ាហ៊ូ"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle ៖ ស្នើ​អ្នកប្រើ​ឲ្យ​ចាប់ផ្ដើម​សម័យ​របស់ Doodle"
-
-msgid "Yahoo ID..."
-msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "កម្មវិធី​ជំនួយ​ពិធីការ​របស់យ៉ាហ៊ូ"
-
-msgid "Yahoo Japan"
-msgstr "យ៉ាហ៊ូ​ ជប៉ុន"
-
-msgid "Pager server"
-msgstr "ម៉ាស៊ីនបម្រើ​ភេយ័រ"
-
-msgid "Japan Pager server"
-msgstr "ម៉ាស៊ីន​បម្រើ​ភេយ័រ​ជប៉ុន"
-
-msgid "Pager port"
-msgstr "ច្រក​ភេយ័រ"
-
-msgid "File transfer server"
-msgstr "ម៉ាស៊ីនបម្រើ​ផ្ទេរ​ឯកសារ"
-
-msgid "Japan file transfer server"
-msgstr "ម៉ាស៊ីនបម្រើ​ផ្ទេរ​ឯកសារ​ជប៉ុន"
-
-msgid "File transfer port"
-msgstr "ច្រក​ផ្ទេរ​ឯកសារ"
-
-msgid "Chat room locale"
-msgstr "បន្ទប់​ជជែក​មូលដ្ឋាន"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "មិនអើពើ​សន្និសីទ និង​ការ​អញ្ជើញ​របស់​បន្ទប់​ជជែក"
-
-msgid "Chat room list URL"
-msgstr "URL បញ្ជី​បន្ទប់​ជជែក"
-
-msgid "Yahoo Chat server"
-msgstr "ម៉ាស៊ីនបម្រើ​ជជែក​យ៉ាហ៊ូ"
-
-msgid "Yahoo Chat port"
-msgstr "ច្រក​ជជែក​យ៉ាហ៊ូ"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "បានផ្ញើ​សំណើ Doodle ។"
 
+msgid "Unable to connect."
+msgstr "មិនអាច​តភ្ជាប់​បានទេ ។"
+
 msgid "Unable to establish file descriptor."
 msgstr "មិនអាច​បង្កើត​​ឧបករណ៍​ពិពណ៌នា​ឯកសារ​បានទេ ។"
 
@@ -9463,6 +9431,9 @@ msgstr "មិនអាច​បង្កើត​​ឧបករណ៍​ពិ
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s កំពុង​ព្យាយាម​ផ្ញើ​ឲ្យ​អ្នក​នូវ​ក្រុម​ឯកសារ %d ។\n"
 
+msgid "Write Error"
+msgstr "កំហុស​ក្នុងកា​រសរសេរ"
+
 msgid "Yahoo! Japan Profile"
 msgstr "ទម្រង់​យ៉ាហ៊ូ ជប៉ុន"
 
@@ -9526,12 +9497,9 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "ទម្រង់​របស់​អ្នកប្រើ​ទទេរ ។"
 
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s បានបដិសេធ​ការ​អញ្ជើញ​សន្និសីទ​របស់​អ្នក​​ក្នុង​បន្ទប់ \"%s\" ដោយ​សារតែ \"%s\" ។"
-
-msgid "Invitation Rejected"
-msgstr "បានបដិសេធ​ការ​អញ្ជើញ"
+#, fuzzy, c-format
+msgid "%s has declined to join."
+msgstr "%s បានចូល ។"
 
 msgid "Failed to join chat"
 msgstr "បានបរាជ័យ​ក្នុងការ​ចូលរួម​ក្នុងការ​ជជែក"
@@ -9572,23 +9540,19 @@ msgstr "សំឡេង"
 msgid "Webcams"
 msgstr "ម៉ាស៊ីន​ថត​តាមបណ្ដាញ"
 
+msgid "Connection problem"
+msgstr "បញ្ហា​ក្នុង​ការ​តភ្ជាប់"
+
 msgid "Unable to fetch room list."
 msgstr "មិនអាច​ទៅ​យក​បញ្ជី​បន្ទប់​បានទេ ។"
 
 msgid "User Rooms"
 msgstr "បន្ទប់​អ្នកប្រើ"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "បញ្ហា​ក្នុងកា​រតភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ YCHT ។"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"បាត់បង់​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9711,33 +9675,22 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "បង្ហាញ"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"មិនអាច​បង្កើត​រន្ធ ៖\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "មិនអាច​ញែក​ការ​ឆ្លើយតប​ពី​ប្រូកស៊ី HTTP ៖ %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "កំហុសក្នុងការ​តភ្ជាប់ប្រូកស៊ី HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "បដិសេធ ៖ ម៉ាស៊ីនបម្រើប្រូកស៊ី HTTP ហាមឃាត់​ច្រក %d ។"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "កំហុស​ក្នុងការ​ដោះស្រាយ %s"
 
-msgid "Could not resolve host name"
-msgstr "មិនអាច​ដោះស្រាយ​ឈ្មោះម៉ាស៊ីនបានទេ"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "កំពុងស្នើ​កា​រចាប់អារម្មណ៍​​របស់ %s..."
@@ -9824,9 +9777,6 @@ msgstr "កុំ​រំខាន"
 msgid "Extended away"
 msgstr "បាន​ពង្រីក​ការ​ចាកឆ្ងាយ"
 
-msgid "Mobile"
-msgstr "ចល័ត"
-
 msgid "Listening to music"
 msgstr "ស្ដាប់​តន្ត្រី"
 
@@ -9868,18 +9818,6 @@ msgstr "+++ %s ក្លាយ​ជា​មិន​ទំនេរ"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "កំហុស​ក្នុងការ​អាន %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"មាន​កំហុស​ក្នុងការ​អាន​ %s របស់​​អ្នក ។ ពួកវា​មិន​ត្រូវ​បានផ្ទុក​ទេ ហើយ​ឯកសារ​ចាស់​ត្រូវ​បាន​ប្ដូរ​ឈ្មោះ​ទៅជា %"
-"s~."
-
 msgid "Calculating..."
 msgstr "កំពុង​គណនា..."
 
@@ -9981,6 +9919,18 @@ msgstr "បានបដិសេធ​កា​រតភ្ជាប់ ។"
 msgid "Address already in use."
 msgstr "អាសយដ្ឋាន​កំពុង​ប្រើ​ហើយ ។"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "កំហុស​ក្នុងការ​អាន %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"មានកំហុស​មួយ​ក្នុងការ​អាន​ %s របស់​អ្នក ។ ឯកសារ​មិន​ត្រូវ​បានផ្ទុក​ទេ ហើយ​ឯកសារ​ចាស់​ត្រូវ​បាន​ប្ដូរ​ឈ្មោះ​ទៅ​"
+"ជា %s~ ។"
+
 msgid "Internet Messenger"
 msgstr "កម្មវិធី​ផ្ញើសារ​អ៊ីនធឺណិត"
 
@@ -10023,10 +9973,9 @@ msgstr "ការ​ជូនដំណឹង​សំបុត្រ​ថ្ម
 msgid "Use this buddy _icon for this account:"
 msgstr "ប្រើ​រូបតំណាង​មិត្តភក្ដិ​នេះ​សម្រាប់គណនី​នេះ ៖"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "ជម្រើស %s"
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "កម្រិត​ខ្ពស់"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "ប្រើ​ការ​កំណត់​ប្រូកស៊ី​របស់ GNOME"
@@ -10061,9 +10010,6 @@ msgstr "ប្រសិនបើ​អ្នក​មើល​ទៅ​ពិត
 msgid "you can see the butterflies mating"
 msgstr "អ្នកអាច​មើល​ butterflies mating"
 
-msgid "Proxy Options"
-msgstr "ជម្រើសប្រូកស៊ី"
-
 msgid "Proxy _type:"
 msgstr "ប្រភេទ​ប្រូកស៊ី ៖"
 
@@ -10091,8 +10037,9 @@ msgstr "មូលដ្ឋាន"
 msgid "Create _this new account on the server"
 msgstr "បង្កើត​គណនី​ថ្មី​នៅ​លើ​ម៉ាស៊ីនបម្រើ"
 
-msgid "_Advanced"
-msgstr "កម្រិត​ខ្ពស់"
+#, fuzzy
+msgid "P_roxy"
+msgstr "ប្រូកស៊ី"
 
 msgid "Enabled"
 msgstr "បានបើក"
@@ -10138,16 +10085,16 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "សូម​ធ្វើ​ឲ្យ​វាល​ដែល​ចាំបាច់ទាន់សម័យ ។"
 
-msgid "Room _List"
-msgstr "បញ្ជី​បន្ទប់"
+msgid "A_ccount"
+msgstr "គណនី "
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "សូម​បញ្ចូល​ព័ត៌មាន​ដេល​សមរម្យ​អំពីការជជែក​ដែល​នឹង​ចូលរួម ។\n"
 
-msgid "_Account:"
-msgstr "គណនី ៖"
+msgid "Room _List"
+msgstr "បញ្ជី​បន្ទប់"
 
 msgid "_Block"
 msgstr "ទប់ស្កាត់"
@@ -10164,6 +10111,15 @@ msgstr "យក​ព័ត៌មាន"
 msgid "I_M"
 msgstr "IM"
 
+msgid "_Audio Call"
+msgstr "ការហៅ​អូឌីយ៉ូ"
+
+msgid "Audio/_Video Call"
+msgstr "អូឌីយ៉ូ/ការ​ហៅ​វីដេអូ"
+
+msgid "_Video Call"
+msgstr "ការ​ហៅ​វីដេអូ "
+
 msgid "_Send File..."
 msgstr "ផ្ញើ​ឯកសារ..."
 
@@ -10173,9 +10129,14 @@ msgstr "បន្ថែម​ក្រុម​មិត្តភក្ដិ...
 msgid "View _Log"
 msgstr "កំណត់​ហេតុ​មើល"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "លាក់​នៅពេល​នៅ​ក្រៅបណ្ដាញ"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "បង្ហាញ​​នៅពេល​នៅ​ក្រៅបណ្ដាញ"
+
 msgid "_Alias..."
 msgstr "ឈ្មោះ​ក្លែងក្លាយ..."
 
@@ -10298,6 +10259,9 @@ msgstr "/ឧបករណ៍/ក្រុមមិត្តភក្ដិ"
 msgid "/Tools/_Certificates"
 msgstr "/ឧបករណ៍/វិញ្ញាបនបត្រ"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/ឧបករណ៍/សញ្ញាណ​អារម្មណ៍​ផ្ទាល់ខ្លួន"
+
 msgid "/Tools/Plu_gins"
 msgstr "/ឧបករណ៍/កម្មវិធី​ជំនួយ"
 
@@ -10307,9 +10271,6 @@ msgstr "/ឧបករណ៍/ចំណូល​ចិត្ត"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ឧបករណ៍/ភាព​ឯកជន"
 
-msgid "/Tools/Smile_y"
-msgstr "/ឧបករណ៍/សញ្ញាណ​អារម្មណ៍"
-
 msgid "/Tools/_File Transfers"
 msgstr "/ឧបករណ៍/ការ​ផ្ទេរ​ឯកសារ"
 
@@ -10426,8 +10387,8 @@ msgstr "ដោយដៃ"
 msgid "By status"
 msgstr "តាម​ស្ថានភាព"
 
-msgid "By log size"
-msgstr "តាម​ទំហំ​កំណត់ហេតុ"
+msgid "By recent log activity"
+msgstr "តាម​សកម្មភាព​កំណត់ហេតុ​ថ្មីៗ"
 
 #, c-format
 msgid "%s disconnected"
@@ -10443,6 +10404,9 @@ msgstr "តភ្ជាប់​ឡើង​វិញ"
 msgid "Re-enable"
 msgstr "បើក​ឡើង​វិញ"
 
+msgid "SSL FAQs"
+msgstr "SSL FAQs"
+
 msgid "Welcome back!"
 msgstr "សូម​ស្វាគមន៍ការ​​ត្រឡប់​មក​វិញ !"
 
@@ -10526,6 +10490,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "ឈ្មោះ​ក្លែងក្លាយ ៖"
 
+msgid "_Group:"
+msgstr " ក្រុម ៖"
+
 msgid "Auto_join when account becomes online."
 msgstr "ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ​ នៅពេល​គណនី​ក្លាយ​ជា​នៅ​លើ​បណ្ដាញ ។"
 
@@ -10533,7 +10500,7 @@ msgid "_Remain in chat after window is closed."
 msgstr "នៅ​ក្នុង​ការជជែក​បន្ទាប់​ពី​បង្អួច​ត្រូវ​បានបិទ ។"
 
 msgid "Please enter the name of the group to be added."
-msgstr "សូម​បញ្ចូល​ឈ្មោះ​របស​ក្រុម​ដែល​ត្រូ​វ​បន្ថែម ។"
+msgstr "សូម​បញ្ចូល​ឈ្មោះ​​​ក្រុម​ដែល​ត្រូ​វ​បន្ថែម ។"
 
 msgid "Enable Account"
 msgstr "បើក​គណនី"
@@ -10559,6 +10526,115 @@ msgstr "/ឧបករណ៍"
 msgid "/Buddies/Sort Buddies"
 msgstr "/មិត្តភក្ដិ/តម្រៀប​មិត្តភក្ដិ"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "ពណ៌​ផ្ទៃ​ខាង​ក្រោយ​"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "ឡាវ"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "ពណ៌​ផ្ទៃ​ខាង​ក្រោយ​"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "ពង្រីក"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "ជ្រើស​ពណ៌​ផ្ទៃ​ខាងក្រោយ"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "វេញ"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "ជ្រើស​ពណ៌​ផ្ទៃ​ខាងក្រោយ"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "អត្ថបទ​ផ្លូវកាត់"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "លើ​បណ្ដាញ"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "ចាកឆ្ងាយ"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "ក្រៅ​បណ្តាញ"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "អត្ថបទ​អារម្មណ៍"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "បាន​ផ្ញើសារ"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "ផ្លាស់ប្ដូរ​ព័ត៌មាន​អ្នក​ប្រើ​សម្រាប់ %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "វាយ​ឈ្មោះ​ម៉ាស៊ីន​នៃ​វិញ្ញាបនបត្រ​នេះ​គឺ​សម្រាប់ ។"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "ម៉ាស៊ីនបម្រើស SSL"
@@ -10576,12 +10652,6 @@ msgstr "អ្នកបច្ចុប្បន្នមិនបាន​ចូ
 msgid "Invite Buddy Into Chat Room"
 msgstr "អញ្ជើញ​មិត្តភក្ដិ​ទៅ​ក្នុង​បន្ទប់​ជជែក"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "សូម​បញ្ចូល​ឈ្មោះ​របស់​អ្នកប្រើ​ដែល​អ្នក​ចង់​អញ្ជើញ រួម​ជា​មួយ​នឹង​សារ​អញ្ជើញ​ជា​ជម្រើស ។"
-
 msgid "_Buddy:"
 msgstr "មិត្តភក្ដិ ៖"
 
@@ -10610,7 +10680,8 @@ msgstr "មិន​អើពើ"
 msgid "Get Away Message"
 msgstr "យក​សារ​ចាកឆ្ងាយ"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "បាន​និយាយ​ចុង​ក្រោយ"
 
 msgid "Unable to save icon file to disk."
@@ -10656,6 +10727,18 @@ msgstr "/សន្ទនា/រក្សាទុកជា..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/សន្ទនា/ជំម្រះ"
 
+msgid "/Conversation/M_edia"
+msgstr "/សន្ទនា/មេឌៀ"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/សន្ទនា/មេឌៀ/ការ​ហៅ​អូឌីយ៉ូ"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/សន្ទនា/មេឌៀ/ការ​ហៅ​វីដេអូ"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/សន្ទនា/មេឌៀ/អូឌីយ៉ូ/ការ​ហៅ​វីដេអូ"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/សន្ទនា/ផ្ញើ​ឯកសារ..."
 
@@ -10728,6 +10811,15 @@ msgstr "/សន្ទនា"
 msgid "/Conversation/View Log"
 msgstr "/សន្ទនា/មើល​កំណត់​ហេតុ"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/សន្ទនា/មេឌៀ/ការហៅ​អូឌីយ៉ូ"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/សន្ទនា/មេឌៀ/ការ​ហៅ​វីដេអូ"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/សន្ទនា/មេឌៀ/អូឌីយ៉ូ\\/ការ​ហៅ​វីដេអូ"
+
 msgid "/Conversation/Send File..."
 msgstr "/សន្ទនា/ផ្ញើ​ឯកសារ..."
 
@@ -10909,6 +11001,9 @@ msgstr "សិល្បករ"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "សំឡេង និង​វីដេអូ"
+
 msgid "support"
 msgstr "គាំទ្រ"
 
@@ -11033,6 +11128,9 @@ msgstr "ហិណ្ឌូ"
 msgid "Hungarian"
 msgstr "ហុងគ្រី"
 
+msgid "Armenian"
+msgstr "អាម៉ីនៀន"
+
 msgid "Indonesian"
 msgstr "ឥណ្ឌូនេស៊ី"
 
@@ -11048,6 +11146,9 @@ msgstr "ហ្សកហ្ស៊ី"
 msgid "Ubuntu Georgian Translators"
 msgstr "អ្នកប្រើ​ប្រែ​​ហ្សកហ្ស៊ី​របស់​អូប៊ុនទូ"
 
+msgid "Khmer"
+msgstr "ខ្មែរ"
+
 msgid "Kannada"
 msgstr "កិណាដា"
 
@@ -11126,6 +11227,9 @@ msgstr "ស៊ីនហាលា"
 msgid "Swedish"
 msgstr "ស៊ុយអែដ"
 
+msgid "Swahili"
+msgstr "ស្វាហ៊ីលី"
+
 msgid "Tamil"
 msgstr "តាមីល"
 
@@ -11447,7 +11551,8 @@ msgstr "ពណ៌​ត្រូវគូ​តំណខ្ពស់ ។"
 msgid "Hyperlink visited color"
 msgstr "ពណ៌ដែល​បាន​ទស្សនា​តំណខ្ពស់"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "ពណ៌​ត្រូវគូ​តំណខ្ពស់​បន្ទាប់ពី​វា​ត្រូវ​បានទស្សនា (ឬ​ធ្វើ​ឲ្យ​សកម្ម) ។"
 
 msgid "Hyperlink prelight color"
@@ -11483,13 +11588,22 @@ msgstr "ពណ៌​ត្រូវគូរ​ឈ្មោះ​សារ​ស
 msgid "Action Message Name Color for Whispered Message"
 msgstr "សកម្មភាព​ពណ៌​ឈ្មោះ​សារ​​សម្រាប់​សារ​ដែល​ខ្សឹប"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "ពណ៌​ត្រូវគូរ​ឈ្មោះ​សារ​សកម្មភាព ។"
+
 msgid "Whisper Message Name Color"
 msgstr "ពណ៌​ឈ្មោះ​សារ​ខ្សឹប"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "ពណ៌​ត្រូវគូរ​ឈ្មោះ​សារ​សកម្មភាព ។"
+
 msgid "Typing notification color"
 msgstr "វាយ​ពណ៌​ជូនដំណឹង"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "ពណ៌​ត្រូវ​ប្រើ​ដើម្បីវាយ​ពុម្ពអក្សរ​ជូនដំណឹង"
 
 msgid "Typing notification font"
@@ -11501,15 +11615,6 @@ msgstr "ពុម្ពអក្សរ​ត្រូវ​ប្រើ​សម
 msgid "Enable typing notification"
 msgstr "អនុញ្ញាត​វាយ​ការជូនដំណឹង"
 
-msgid "_Copy Email Address"
-msgstr "ចម្លង​អាសយដ្ឋាន​អ៊ីមែល"
-
-msgid "_Open Link in Browser"
-msgstr "បើក​តំណ​នៅ​ក្នុង​កម្មវិធីរុករក"
-
-msgid "_Copy Link Location"
-msgstr "ចម្លង​ទីតាំង​តំណ"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11551,11 +11656,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "រក្សា​​ទុក​​​រូបភាព"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "រក្សាទុក​រូបភាព..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "បន្ថែម​សញ្ញាណ​អារម្មណ៍​ផ្ទាល់ខ្លួន..."
 
@@ -11642,9 +11745,6 @@ msgstr "បន្ថយ​ទំហំ​ពុម្ពអក្សរ"
 msgid "Font Face"
 msgstr "លក្ខណៈ​ពុម្ព​អក្សរ"
 
-msgid "Background Color"
-msgstr "ពណ៌​ផ្ទៃ​ខាង​ក្រោយ​"
-
 msgid "Foreground Color"
 msgstr "ពណ៌​ផ្ទៃ​ខាងមុខ"
 
@@ -11755,6 +11855,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11765,16 +11866,17 @@ msgid ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"ការ​ប្រើប្រាស់ ៖ %s [ជម្រើស]...\n"
+"ការប្រើប្រាស់ ៖ %s [ជម្រើស]...\n"
 "\n"
 "  -c, --config=DIR    ប្រើ DIR សម្រាប់​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ\n"
-"  -d, --debug         បោះពុម្ព​សារ​បំបាត់​កំហុស​ទៅ stdout\n"
+"  -d, --debug         បោះពុម្ព​សារ​បំបាត់កំហុស​ទៅ​កាន់ stdout\n"
+"  -f, --force-online  បង្ខំ​លើបណ្ដាញ ទាក់ទង​នឹង​ស្ថានភាព​បណ្ដាញ\n"
 "  -h, --help          បង្ហាញ​ជំនួយ​នេះ ហើយ​ចេញ\n"
-"  -m, --multiple      មិនប្រាកដ​ធាតុ​តែ​មួយ\n"
+"  -m, --multiple      កុំ​ប្រាកដ​លើធាតុ​តែ​មួយ\n"
 "  -n, --nologin       កុំ​ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ\n"
-"  -l, --login[=NAME]  បើក​គណនី​ដែល​បានបញ្ជាក់ (អាគុយម៉ង​ជម្រើស NAME\n"
-"                      បញ្ជាក់​គណនី​ត្រូវ​ប្រើ បំបែក​ដោយ​សញ្ញា (,) ។\n"
-"                      ដោយ​គ្មាន​គណនី​ដំបូង​នេះ​នឹង​ត្រូវ​បានបើក) ។\n"
+"  -l, --login[=NAME]  បើក​គណនី​ដែលបាន​បញ្ជាក់ (អាគុយម៉ង់​ជម្រើស NAME\n"
+"                      បញ្ជាក់គណនី​ត្រូវ​ប្រើ បំបែក​ដោយ​សញ្ញា(,) ។\n"
+"                      ដោយ​មិនមាន​តែ​គណនី​ដំបូង​នឹង​ត្រូវ​បាន​បើក) ។\n"
 "  --display=DISPLAY   ការ​បង្ហាញ X ត្រូវ​ប្រើ\n"
 "  -v, --version       បង្ហាញ​កំណែ​បច្ចុប្បន្ន ហើយ​ចេញ\n"
 
@@ -11785,6 +11887,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11843,11 +11946,22 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ចេញ ដោយ​សារ​តែ​ម៉ាស៊ីន​ភ្ញើ libpurple ផ្សេង​ទៀត​កំពុង​រត់​រួច​ហើយ ។\n"
 
-msgid "Open All Messages"
-msgstr "បើក​សារ​ទាំងអស់"
+msgid "/_Media"
+msgstr "/មេឌៀ"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">អ្នក​មាន​សំបុត្រ !</span>"
+msgid "/Media/_Hangup"
+msgstr "/មេឌៀ/រង់ចាំ"
+
+msgid "Calling..."
+msgstr "កំពុង​ហៅ..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s មាន​បំណង​ចាប់ផ្ដើម​សម័យ​អូឌីយ៉ូ/វីដេអូ​ជា​មួយ​អ្នក ។"
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s មាន​បំណង​ចាប់ផ្ដើម​សម័យ​វីដេអូ​ជាមួយ​អ្នក ។"
 
 #, c-format
 msgid "%s has %d new message."
@@ -11874,6 +11988,24 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "ពាក្យ​បញ្ជា​កម្មវិធី​រុករក 'ដោយដៃ' ត្រូវ​បាន​ជ្រើស ប៉ុន្តែ​គ្មាន​ពាក្យ​បញ្ជា​ត្រូវ​បាន​ជ្រើស​ទេ ។"
 
+msgid "No message"
+msgstr "គ្មាន​សារ"
+
+msgid "Open All Messages"
+msgstr "បើក​សារ​ទាំងអស់"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">អ្នក​មាន​សំបុត្រ !</span>"
+
+msgid "New Pounces"
+msgstr "ក្រុម​មិត្តភក្ដិ​ថ្មី"
+
+msgid "Dismiss"
+msgstr "បណ្ដេញ​ចេញ"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">អ្នក​​បាន​ដាក់​ជា​ក្រុម​មិត្តភក្ដិ !</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "កម្មវិធី​ជំនួយ​ដូច​ខាងក្រោម​នឹង​ត្រូវ​បានផ្ទុក​ឡើង ។"
 
@@ -11920,10 +12052,16 @@ msgstr "<b>សេចក្ដី​លម្អិត​កម្មវិធី
 msgid "Select a file"
 msgstr "ជ្រើស​ឯកសារ"
 
+msgid "Modify Buddy Pounce"
+msgstr "កែសម្រួល​ក្រុម​មិត្តភក្ដិ"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "ក្រុម​នៅ​លើ​អ្នកណា"
 
+msgid "_Account:"
+msgstr "គណនី ៖"
+
 msgid "_Buddy name:"
 msgstr "ឈ្មោះ​មិត្តភក្ដិ ៖"
 
@@ -11990,7 +12128,60 @@ msgstr "កើតឡើង​វិញ"
 msgid "Pounce Target"
 msgstr "ក្រុម​គោល​ដៅ​"
 
-msgid "Smiley theme failed to unpack."
+#, c-format
+msgid "Started typing"
+msgstr "បាន​ចាប់ផ្ដើម​វាយ"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "បានផ្អាក​ខណៈពេល​វាយ"
+
+#, c-format
+msgid "Signed on"
+msgstr "បាន​ចូល"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "បាន​ត្រឡប់​ពី​ស្ថានភាព​ទំនេរ"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "បាន​ត្រឡប់​ពី​ស្ថានភាព​ចាកឆ្ងាយ"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "បញ្ឈប់​ការ​វាយ"
+
+#, c-format
+msgid "Signed off"
+msgstr "បាន​ចេញ"
+
+#, c-format
+msgid "Became idle"
+msgstr "ក្លាយ​ជា​ទំនេរ"
+
+#, c-format
+msgid "Went away"
+msgstr "នៅ​ពេល​ចាកឆ្ងាយ"
+
+#, c-format
+msgid "Sent a message"
+msgstr "បាន​ផ្ញើសារ"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "មិនស្គាល់.... សូម​រាយការណ៍​អំពី​បញ្ហា​នេះ !"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "ស្បែក​សញ្ញាណអារម្មណ៍​បានបរាជ័យ​ក្នុងការ​ស្រាយ ។"
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "ស្បែក​សញ្ញាណអារម្មណ៍​បានបរាជ័យ​ក្នុងការ​ស្រាយ ។"
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "ស្បែក​សញ្ញាណអារម្មណ៍​បានបរាជ័យ​ក្នុងការ​ស្រាយ ។"
 
 msgid "Install Theme"
@@ -12012,6 +12203,11 @@ msgstr "ផ្លូវ​កាត់​ក្តារចុច"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "បិទ​ការ​សន្ទនា​ដោយ​ប្រើ​គ្រាប់ចុច​គេច (Escape)"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "ស្បែក​បញ្ជី​មិត្តភក្ដិ"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "រូបតំណាង​ថាស​ប្រព័ន្ធ"
 
@@ -12021,8 +12217,9 @@ msgstr "បង្ហាញ​​រូបតំណាង​ថាស​ប្រ
 msgid "On unread messages"
 msgstr "សារ​មិន​ទាន់អាន"
 
-msgid "Conversation Window Hiding"
-msgstr "លាក់​បង្អួច​សន្ទនា"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "បង្អួច​សន្ទនា IM"
 
 msgid "_Hide new IM conversations:"
 msgstr "លាក់​កា​រសន្ទនា IM ថ្មី ៖"
@@ -12030,6 +12227,9 @@ msgstr "លាក់​កា​រសន្ទនា IM ថ្មី ៖"
 msgid "When away"
 msgstr "នៅពេល​ចាកឆ្ងាយ"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "បង្រួម​បង្អួច​សន្ទនា​ថ្មី​អប្បបរមា"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "ថេប"
@@ -12088,9 +12288,6 @@ msgstr "ប្រើ​រមូរ​រលូន"
 msgid "F_lash window when IMs are received"
 msgstr "បង្អួច Flash នៅពេល​បានទទួល IMs"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "បង្រួម​បង្អួច​សន្ទនា​ថ្មី​អប្បបរមា"
-
 msgid "Minimum input area height in lines:"
 msgstr "បង្រួម​កម្ពស់​ផ្ទៃ​បញ្ចូល​គិតជា​បន្ទាត់ ៖"
 
@@ -12121,13 +12318,11 @@ msgstr "មិនអាច​ចាប់ផ្ដើម​កម្មវិធ
 msgid "Cannot start browser configuration program."
 msgstr "មិនអាច​ចាប់ផ្ដើម​កម្មវិធី​កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​រុករក​បានទេ ។"
 
-msgid "ST_UN server:"
-msgstr "ម៉ាស៊ីនបម្រើ STUN ៖"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">ឧទាហរណ៍ ៖ stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "រកឃើញ​អាសយដ្ឋាន IP ដោយ​ស្វ័យ​ប្រវត្តិ"
 
 msgid "Public _IP:"
@@ -12148,6 +12343,10 @@ msgstr "ច្រក​ចាប់ផ្ដើម ៖"
 msgid "_End port:"
 msgstr "ច្រក​បញ្ចប់ ៖"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "បញ្ជូន​ម៉ាស៊ីន​បម្រើ​ត (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "ម៉ាស៊ីនបម្រើ​ប្រូកស៊ី &amp; កម្មវិធី​រុករក​"
 
@@ -12336,12 +12535,12 @@ msgstr "នៅពេល​អ្នកទាំង​ពីរ​ចាកឆ្
 msgid "Auto-away"
 msgstr "ចាកឆ្ងាយ​ស្វ័យ​ប្រវត្តិ"
 
-msgid "Change status when _idle"
-msgstr "ផ្លាស់ប្ដូរ​ស្ថានភាព​នៅពេល​ទំនេរ"
-
 msgid "_Minutes before becoming idle:"
 msgstr "ប៉ុន្មាន​នាទី​មុន​នឹង​ក្លាយជា​ទំនេរ ៖"
 
+msgid "Change status when _idle"
+msgstr "ផ្លាស់ប្ដូរ​ស្ថានភាព​នៅពេល​ទំនេរ"
+
 msgid "Change _status to:"
 msgstr "ផ្លាស់ប្ដូរ​ស្ថានភាព​ទៅជា ៖"
 
@@ -12489,45 +12688,42 @@ msgstr "រក្សាទុក​ការ​ប្រើ"
 msgid "Status for %s"
 msgstr "ស្ថានភាព​សម្រាប់ %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr "មាន​សញ្ញាណអារម្មណ៍​ផ្ទាល់ខ្លួន​សម្រាប់ '%s' រួច​ហើយ ។ សូម​ប្រើ​ផ្លូវកាត់​ផ្សេង ​។"
+
 msgid "Custom Smiley"
 msgstr "សញ្ញា​អារម្មណ៍​ផ្ទាល់ខ្លួន"
 
-msgid "More Data needed"
-msgstr "ត្រូវការ​ទិន្នន័យ​បន្ថែម​ទៀត"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "សូម​ផ្ដល់​នូវ​ផ្លូវកាត់​ដើម្បី​ភ្ជាប់​ជា​មួយ​នឹង​សញ្ញា​អារម្មណ៍ ។"
-
 msgid "Duplicate Shortcut"
 msgstr "ផ្លូវកាត់​ស្ទួន"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr "សញ្ញា​អារម្មណ៍​ផ្ទាល់ខ្លួន​សម្រាប់​ផ្លូវកាត់​ដែល​បាន​ជ្រើស​មាន​រួច​ហើយ ។ សូម​បញ្ជី​ផ្លូវកាត់​ផ្សេង ។"
-
-msgid "Please select an image for the smiley."
-msgstr "សូម​ជ្រើស​រូបភាព​សម្រាប់​សញ្ញាអារម្មណ៍ ។"
-
 msgid "Edit Smiley"
 msgstr "កែ​សម្រួល​សញ្ញាអារម្មណ៍"
 
 msgid "Add Smiley"
 msgstr "បន្ថែម​សញ្ញាអារម្មណ៍"
 
-msgid "Smiley _Image"
-msgstr "រូបភាព​សញ្ញាអារម្មណ៍"
+msgid "_Image:"
+msgstr "រូបភាព ៖"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "ផ្លូវ​កាត់​សញ្ញាអារម្មណ៍"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "អត្ថបទ​ផ្លូវកាត់ ៖"
 
 msgid "Smiley"
 msgstr "សញ្ញាអារម្មណ៍"
 
+msgid "Shortcut Text"
+msgstr "អត្ថបទ​ផ្លូវកាត់"
+
 msgid "Custom Smiley Manager"
 msgstr "កម្មវិធី​គ្រប់គ្រង​សញ្ញាអារម្មណ៍​ផ្ទាល់ខ្លួន"
 
+msgid "Select Buddy Icon"
+msgstr "ជ្រើស​រូបតំណាង​មិត្តភក្ដិ"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "ចុច​ដើម្បី​ផ្លាស់ប្ដូរ​រូបតំណាង​មិត្តភក្ដិ​របស់​អ្នកសម្រាប់គណនី​នេះ ។"
 
@@ -12606,9 +12802,10 @@ msgstr "អ្នក​អាច​បញ្ចូល​រូបភាព​ន
 msgid "Cannot send launcher"
 msgstr "មិនអាច​ផ្ញើ​កម្មវិធី​ចាប់ផ្ដើម​បានទេ"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "អ្នកបានអូស​កម្មវិធី​ចាប់ផ្ដើម​ផ្ទៃតុ ។ ទំនង​ជា​អ្នក​ចង់​ផ្ញើ​អ្វី​កម្មវិធី​នេះ​ចង្អុល​​ទៅ​កម្មវិធី​ចាប់ផ្ដើម​នេះ​ជំនួស​វិញ "
 "។"
@@ -12642,9 +12839,34 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "បានបរាជ័យ​ក្នុងការ​ផ្ទុក​រូបភាព '%s' ៖ មិនស្គាល់ហេតុផល ប្រហែលជា​ឯកសារ​រូបភាព​តូច"
 
+msgid "_Open Link"
+msgstr "បើក​តំណ "
+
+msgid "_Copy Link Location"
+msgstr "ចម្លង​ទីតាំង​តំណ"
+
+msgid "_Copy Email Address"
+msgstr "ចម្លង​អាសយដ្ឋាន​អ៊ីមែល"
+
+#, fuzzy
+msgid "_Open File"
+msgstr "បើក​ឯកសារ..."
+
+#, fuzzy
+msgid "Open _Containing Directory"
+msgstr "ថត​កំណត់ហេតុ"
+
 msgid "Save File"
 msgstr "រក្សា​​ទុក​​​ឯកសារ"
 
+#, fuzzy
+msgid "_Play Sound"
+msgstr "ចាក់​សំឡេង"
+
+#, fuzzy
+msgid "_Save File"
+msgstr "រក្សា​​ទុក​​​ឯកសារ"
+
 msgid "Select color"
 msgstr "ជ្រើស​ពណ៌"
 
@@ -12732,6 +12954,78 @@ msgstr "មាន​កម្មវិធី​ជំនួយ​ទាយ​ទ
 msgid "Displays statistical information about your buddies' availability"
 msgstr "បង្ហាញ​ព័ត៌មាន​ស្ថិតិ​អំពី​ភាព​អាច​ប្រើ​បាន​នៃ​មិត្តភក្ដិ​របស់​អ្នក"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "បញ្ចូល​ម៉ាស៊ីន​បម្រើ​សន្និសីទ"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "ជ្រើស​ម៉ាស៊ីនបម្រើ​សន្និសីទ​ត្រូវ​សួរ"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "សេវា​លើ​បណ្ដាញ"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "ផ្ញើ​បញ្ជី​មិត្តភក្ដិ"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "ចាកឆ្ងាយ"
+
+#, fuzzy
+msgid "Directory"
+msgstr "ថត​កំណត់ហេតុ"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "ការ​ជ្រើស​សំឡេង"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "សេវា PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "សេចក្ដី​ពិពណ៌នា"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "ព័ត៌មាន​រកឃើញ​សេវា"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "កម្មវិធី​រុករក ៖"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "មិន​មាន​​អ្នក​ប្រើ​ទេ"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "ម៉ាស៊ីន​បម្រើ​មិន​គាំទ្រ​ការ​ទប់ស្កាត់​ទេ"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "ព័ត៌មាន​រកឃើញ​សេវា"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "កម្មវិធី​ជំនួយ​នេះ​មានប្រយោជន៍​សម្រាប់បំបាត់​កំហុស​ម៉ាស៊ីនបម្រើ ឬ​ម៉ាស៊ីន​ភ្ញៀវ XMPP ។"
+
 msgid "Buddy is idle"
 msgstr "មិត្តភក្ដិ​ទំនេរ"
 
@@ -13107,9 +13401,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "កម្មវិធី​ជំនួយ​ផ្ញើសារ​តន្ត្រី​សម្រាប់​ការ​តែង​សហការណ៍ ។"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "កម្មវិធី​ផ្ញើសារ​តន្ត្រី​អនុញ្ញាត​ឲ្យ​អ្នកប្រើជា​ច្រើន​ធ្វើការ​ដំណាល​គ្នា​លើ​ផ្នែក​តន្ត្រី​ដោយ​កែសម្រួល​ពិន្ទុ​ធម្មតា​នៅ​"
 "ក្នុង​ពេលវេលា​ពិតប្រាកដ ។"
@@ -13221,12 +13516,6 @@ msgstr ""
 "- វា​បម្រុង​ទុក​អត្ថបទ​ចូល​ទាំង​អស់\n"
 "- វា​ផ្ញើ​សារ​ទៅមនុស្ស​នៅ​ក្នុង​បញ្ជី​របស់​អ្នក​ភ្លាមៗ នៅពេល​ពួកគេ​ចូល"
 
-msgid "Cursor Color"
-msgstr "ពណ៌​ទស្សន៍ទ្រនិច"
-
-msgid "Secondary Cursor Color"
-msgstr "ពណ៌​ទស្សន៍​ទ្រនិចទីពីរ"
-
 msgid "Hyperlink Color"
 msgstr "ពណ៌​តំណខ្ពស់"
 
@@ -13236,6 +13525,9 @@ msgstr "ពណ៌​តំណខ្ពស់​ដែលបានទស្សន
 msgid "Highlighted Message Name Color"
 msgstr "ពណ៌​ឈ្មោះសារ​ដែល​បាន​បន្លិច"
 
+msgid "Typing Notification Color"
+msgstr "វាយ​ពណ៌​ជូន​ដំណឹង"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "ការ​បំបែក​ផ្ដេក​របស់ GtkTreeView"
 
@@ -13265,35 +13557,21 @@ msgstr "GTK+ ពុម្ពអក្សរ​ចំណុច​ប្រទា�
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ស្បែក​ផ្លូវកាត់អត្ថបទ"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "ពណ៌​ចំណុច​ប្រទាក់"
+msgid "Disable Typing Notification Text"
+msgstr "បិទ​ការ​វាយ​អត្ថបទ​ជូន​ដំណឹង"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ កា​រកំណត់​វត្ថុ​បញ្ជា​ស្បែក"
 
-msgid "Widget Sizes"
-msgstr "ទំហំ​ធាតុក្រាហ្វិក"
+msgid "Colors"
+msgstr "ពណ៌​"
 
 msgid "Fonts"
 msgstr "ពុម្ព​​អក្សរ"
 
+msgid "Miscellaneous"
+msgstr "ផ្សេងៗ"
+
 msgid "Gtkrc File Tools"
 msgstr "ឧបករណ៍​ឯកសារ Gtkrc"
 
@@ -13374,9 +13652,10 @@ msgid "Conversation Window Send Button."
 msgstr "ប៊ូតុង​​ផ្ញើ​បង្អួច​សន្ទនា ។"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr "បន្ថែម​ប៊ូតុង​ផ្ញើ​ទៅ​ផ្ទៃ​ធាតុ​របស់​បង្អួច​សន្ទនា ។ បំណង​សម្រាប់នៅពេល​ដែល​គ្មាន​ក្ដារចុច​ពិត ។"
 
 msgid "Duplicate Correction"
@@ -13428,6 +13707,113 @@ msgstr "កា​រជំនួស​អត្ថបទ"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "ជំនួស​អត្ថបទ​នៅ​ក្នុង​សារ​ចេញ ដោយ​យោង​តាម​ក្បួន​កំណត់​ដោយ​អ្នកប្រើ ។"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "មិនបានចូល​ទេ"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "មិនបានចូល​ទេ"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "ចូលរួម​ក្នុងការ​ជជែក"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "មិន​អើពើ"
+
+#, fuzzy
+msgid "Founder"
+msgstr "ឮខ្លាំង​ជាង"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "បានផ្ដល់កា​រផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "កំហុស"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "ព័ត៌មាន"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "ប្រអប់​សំណើ"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "កម្រិត​ព្រមាន"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "ស្ថានភាព​សម្រាប់ %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "បន្ទប់​ជជែក​មូលដ្ឋាន"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "ផ្លាស់ប្ដូរ​រូបតំណាង"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "កម្មវិធី​ជំនួយ GTK+ ការ​ត្រួតពិនិត្យ​ស្បែក"
+
+#, fuzzy
+msgid "Contact"
+msgstr "ព័ត៌មាន​​ទំនាក់ទំនង"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "ស្បែក​បញ្ជី​មិត្តភក្ដិ"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "ស្បែក​បញ្ជី​មិត្តភក្ដិ"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "កម្មវិធី​ជំនួយ GTK+ ការ​ត្រួតពិនិត្យ​ស្បែក"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "កម្មវិធី​ជំនួយ GTK+ ការ​ត្រួតពិនិត្យ​ស្បែក"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13594,8 +13980,9 @@ msgstr "ជម្រើស​​បង្អួច​របស់ Pidgin"
 msgid "Options specific to Pidgin for Windows."
 msgstr "ជម្រើស​ជាក់លាក់​ទៅ Pidgin សម្រាប់​បង្អួច ។"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "ផ្ដល់​នូវ​ជម្រើស​ជាក់លាក់​ទៅ Pidgin សម្រាប់​វីនដូច​ជា​បញ្ជី​មិត្តភក្ដិ​ចូលផែ ។"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13634,3 +14021,313 @@ msgstr "ផ្ញើ​ និង​ទទួល​ XMPP stanzas ដើម ។"
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "កម្មវិធី​ជំនួយ​នេះ​មានប្រយោជន៍​សម្រាប់បំបាត់​កំហុស​ម៉ាស៊ីនបម្រើ ឬ​ម៉ាស៊ីន​ភ្ញៀវ XMPP ។"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "មិនអាច​បើក​រន្ធ​បានទេ"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "មិនអាច​ស្ដាប់​នៅ​លើ​រន្ធ​បានទេ"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "មិនអាច​អាន​រន្ធ​បានទេ"
+
+#~ msgid "Connection failed."
+#~ msgstr "បានបរាជ័យ​ក្នុងការ​តភ្ជាប់ ។"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "ម៉ាស៊ីន​បម្រើ​បាន​ផ្ដាច់"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "មិនអាច​បង្កើត​រន្ធ​បានទេ"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "មិនអាច​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីនបាន​ទេ"
+
+#~ msgid "Read error"
+#~ msgstr "កំហុស​ក្នុងការ​អាន"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ ៖\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "កំហុស​ក្នុងកា​រសរសេរ"
+
+#~ msgid "Last Activity"
+#~ msgstr "សកម្មភាព​ចុងក្រោយ"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "ធាតុ​រក​ឃើញ​ព័ត៌មាន"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "កំណត់​អាសយដ្ឋាន Stanza ដែល​បាន​ពង្រីក"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "ការ​ជជែក​ដែល​មាន​អ្នក​ប្រើច្រើន​នាក់"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "ព័ត៌មាន​វត្តមាន​ដែល​បាន​ពង្រីក​នៃ​កា​រជជែក​ដែល​មាន​អ្នកប្រើ​ច្រើននាក់"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "ស្ទ្រីម​បៃ​ក្នុងក្រុម"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "ពាក្យ​បញ្ជា Ad-Hoc"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "ស្ទ្រីម​បៃ SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "ទិន្នន័យ​ក្រៅ​ក្រុម"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "ការ​ចុះឈ្មោះ​ក្នុងក្រុម"
+
+#~ msgid "User Location"
+#~ msgstr "ទីតាំង​របស់​អ្នក​ប្រើ"
+
+#~ msgid "User Avatar"
+#~ msgstr "រូបភាព​របស់​អ្នក"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "ការ​ជូនដំណឹង​ស្ថានភាព​ជជែក"
+
+#~ msgid "Software Version"
+#~ msgstr "កំណែ​​កម្មវិធី"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "ការ​ចាប់ផ្ដើម​ស្ទ្រីម​"
+
+#~ msgid "User Mood"
+#~ msgstr "អារម្មណ៍​អ្នក​ប្រើ"
+
+#~ msgid "User Activity"
+#~ msgstr "សកម្មភាព​អ្នក​ប្រើ"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "សមត្ថភាព​អង្គភាព"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "ការ​ចរចារ​សម័យ​ដែល​បាន​អ៊ិនគ្រីប"
+
+#~ msgid "User Tune"
+#~ msgstr "អ្នក​ប្រើ​"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "ផ្លាស់ប្ដូរ​ធាតុ​បញ្ជីឈ្មោះ"
+
+#~ msgid "Reachability Address"
+#~ msgstr "អាសយដ្ឋាន​ដែល​អាច​ចូល​បាន"
+
+#~ msgid "User Profile"
+#~ msgstr "ទម្រង់​អ្នក​ប្រើ"
+
+#~ msgid "Jingle"
+#~ msgstr "ឃ្លា​ខ្លីៗ"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "អូឌីយ៉ូ​ឃ្លា​ខ្លីៗ"
+
+#~ msgid "User Nickname"
+#~ msgstr "សម្មតិនាម​អ្នក​ប្រើ"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ឃ្លាខ្លីៗ​របស់ ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ឃ្លាខ្លីៗ​របស់ ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "ឃ្លាខ្លីៗ​របស់ UDP ដើម"
+
+#~ msgid "Jingle Video"
+#~ msgstr "វីដេអូ​ឃ្លាខ្លីៗ"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "ឃ្លាខ្លីៗ DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "ទទួលសារ"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "បោះពុម្ព​គ្រាប់ចុច​សាធារណៈ"
+
+#~ msgid "User Chatting"
+#~ msgstr "ការ​ជជែក​របស់​អ្នក​ប្រើ"
+
+#~ msgid "User Browsing"
+#~ msgstr "កា​ររុករក​របស់​អ្នក​ប្រើ"
+
+#~ msgid "User Gaming"
+#~ msgstr "ការ​លេង​ល្បែង​របស់​អ្នក​ប្រើ"
+
+#~ msgid "User Viewing"
+#~ msgstr "កា​រមើលរបស់​អ្នក​ប្រើ"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "ការ​អ៊ិនគ្រីប Stanza"
+
+#~ msgid "Entity Time"
+#~ msgstr "ពេល​វេលា​​របស់​អង្គភាព"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "ការ​បញ្ជូន​បាន​ពន្យារពេល"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "វត្ថុ​ទិន្នន័យ​សហការណ៍"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "ឃ្លាំង​ឯកសារ និង​ការ​ចែករំលែក"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "ការ​រកឃើញសេវា STUN សម្រាប់​ឃ្លាខ្លីៗ"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "ការ​ចរចារ​សម័យ​ដែល​បាន​អ៊ិនគ្រីប​សាមញ្ញ"
+
+#~ msgid "Hop Check"
+#~ msgstr "ពិនិត្យមើល​ដំណាក់"
+
+#~ msgid "Read Error"
+#~ msgstr "កំហុស​ក្នុងការ​អាន"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "បាន​បរាជ័យ​ក្នុងការ​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​បម្រើ ។"
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "អាន​សតិ​បណ្ដោះអាសន្ន​ពេញលេញ (២)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "សារ​ដែល​មិន​អាច​ញែក​បាន"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន ៖ %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "បាន​បរាជ័យ​ក្នុងកា​រចូល (%s) ។"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "អ្នក​ត្រូវ​បាន​ចេញ ដោយ​សារ​តែ​អ្នក​បាន​ចូល​ក្នុងស្ថានីយការងារ​ផ្សេង​ទៀត ។"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "កំហុស ។ ការ​គាំទ្រ SSL មិន​ត្រូវ​បាន​ដំឡើង​ទេ ។"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ BOS ៖\n"
+#~ "%s"
+
+#~ msgid "Invalid username."
+#~ msgstr "ឈ្មោះ​អ្នកប្រើ​មិន​ត្រឹមត្រូវ ។"
+
+#~ msgid "Incorrect password."
+#~ msgstr "ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ ។"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "មិនអាច​តភ្ជាប់​បានទេ"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "អ្នក​អាច​ត្រូវ​បានផ្ដាច់​ក្នុង​រយៈពេល​បន្តិចទៀត​នេះ ។ ពិនិត្យ​មើលភាព​ទាន់សម័យ %s ។"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "មិនអាច​ឌិគ្រីប​ការ​​ឆ្លើយតប​របស់​ម៉ាស៊ីន​បម្រើ​បាន​ទេ"
+
+#~ msgid "Connection lost"
+#~ msgstr "បាត់បង់​ការ​តភ្ជាប់"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "មិនអាច​ដោះស្រាយ​ម៉ាស៊ីនបានទេ"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "បាន​បិទ​ការ​តភ្ជាប់ (សរសេរ)"
+
+#~ msgid "Connection reset"
+#~ msgstr "កំណត់​ការ​តភ្ជាប់​ឡើង​វិញ"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "កំហុស​ក្នុងការ​អាន​ពី​រន្ធ ៖ %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​ទេ"
+
+#~ msgid "Could not write"
+#~ msgstr "មិនអាច​សរសេរ​បានទេ"
+
+#~ msgid "Could not connect"
+#~ msgstr "មិនអាច​តភ្ជាប់"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "មិនអាច​បង្កើត​រន្ធ​ស្ដាប់បានទេ"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "មិនអាច​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីនបានទេ"
+
+#~ msgid "Incorrect Password"
+#~ msgstr "ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ %s បានទេ ៖\n"
+#~ "%s"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "ធ្វើ​ឲ្យ​សកម្ម​នូវ​លេខសម្គាល់​ណា​មួយ ?"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "យ៉ាហ៊ូ​ ជប៉ុន"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "ម៉ាស៊ីន​បម្រើ​ភេយ័រ​ជប៉ុន"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "ម៉ាស៊ីនបម្រើ​ផ្ទេរ​ឯកសារ​ជប៉ុន"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s បានបដិសេធ​ការ​អញ្ជើញ​សន្និសីទ​របស់​អ្នក​​ក្នុង​បន្ទប់ \"%s\" ដោយ​សារតែ \"%s\" ។"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "បានបដិសេធ​ការ​អញ្ជើញ"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "បាត់បង់​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "មិនអាច​ដោះស្រាយ​ឈ្មោះម៉ាស៊ីនបានទេ"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "មិន​អាច​តភ្ជាប់​ទៅ​កាន់ %s បានទេ ៖ ម៉ាស៊ីន​បម្រើ​ត្រូវការ TLS/SSL ប៉ុន្តែ​រក​មិនឃើញ​​ការ​គាំទ្រ TLS/"
+#~ "SSL នោះ​ទេ ។"
+
+#~ msgid "_Proxy"
+#~ msgstr "ប្រូកស៊ី "
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "លាក់​បង្អួច​សន្ទនា"
+
+#~ msgid "More Data needed"
+#~ msgstr "ត្រូវការ​ទិន្នន័យ​បន្ថែម​ទៀត"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "សូម​ផ្ដល់​នូវ​ផ្លូវកាត់​ដើម្បី​ភ្ជាប់​ជា​មួយ​នឹង​សញ្ញា​អារម្មណ៍ ។"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "សូម​ជ្រើស​រូបភាព​សម្រាប់​សញ្ញាអារម្មណ៍ ។"
diff --git a/po/kn.po b/po/kn.po
index 1676d5a8cb..33edd99839 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-01-28 17:51+0530\n"
 "Last-Translator: Kannada Localization Team <translation@sampada.info>\n"
 "Language-Team: Kannada <translation@sampada.info>\n"
@@ -32,7 +32,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -609,21 +609,6 @@ msgid "Send To"
 msgstr "_ಇವರಿಗೆ ಕಳಿಸಿ"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "ಸಂದೇಶದಲ್ಲಿ ಸೇರಿಸಿ"
-
-msgid "Invite"
-msgstr "ಆಮಂತ್ರಿಸಿ"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"ನೀವು ಆಮಂತ್ರಿಸಬಯಸುವ ಬಳಕೆದಾರನ ಹೆಸರು ಬರೆಯಿರಿ (ಬೇಕೆಂದರೆ ನೀವು ಬಯಸುವ ಆಮಂತ್ರಣ "
-"ಸಂದೇಶದೊಂದಿಗೆ)"
-
-#, fuzzy
 msgid "Conversation"
 msgstr "ಮಾತುಕತೆಗಳು"
 
@@ -881,6 +866,43 @@ msgstr "ಮಾತುಕತೆಗಳು"
 msgid "System Log"
 msgstr "ಸಿಸ್ಟಂ ಲಾಗ್ "
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "ಲೆಖ್ಕಹಾಕುತ್ತಿದೆ"
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "ಸ್ವೀಕರಿಸಿ(A)"
+
+#  ತಿರಸ�ಕರಿಸ�  ಸರಿಯಾದ ಶಬ�ದ .    ನಿರಾಕರಿಸ�   ಅಂದರೆ   ಡಿನೈ ! .
+msgid "Reject"
+msgstr "ತಿರಸ್ಕರಿಸು"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "ನೀವು %s%s ವಾಹಿನಿಯನ್ನು ತೊರೆದಿದ್ದೀರಿ"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "ಇ-ಮೇಯ್ಲುಗಳು"
 
@@ -916,6 +938,9 @@ msgstr "ಮುಂದುವರಿಸಿ"
 msgid "IM"
 msgstr "ತಕ್ಷಣ ದೂತ"
 
+msgid "Invite"
+msgstr "ಆಮಂತ್ರಿಸಿ"
+
 msgid "(none)"
 msgstr "(ಯಾವುದೂ ಇಲ್ಲ}"
 
@@ -1141,7 +1166,6 @@ msgstr " %s ಆಚೆ ಹೋಗಿದ್ದಾರೆ . (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ನಿಮಗೆ ಒಂದು ಸಂದೇಶ ಕಳಿಸಿದ್ದಾರೆ. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "ಗುರುತುಹಿಡಿಯಲಾಗದ ಪೌನ್ಸ್ ಈವೆಂಟ್; ಇದನ್ನು ವರದಿ ಮಾಡಿ!"
 
@@ -1191,7 +1215,6 @@ msgstr ""
 msgid "Change status to"
 msgstr "ಸ್ಥಿತಿಯನ್ನು ಹೀಗೆ ಬದಲಿಸಿ(s):"
 
-#. Conversations
 msgid "Conversations"
 msgstr "ಮಾತುಕತೆಗಳು"
 
@@ -1526,7 +1549,6 @@ msgstr ""
 "ಈ ಪ್ಲಗ್ಗಿನ್, ಹೊಸ ಮಾತುಕತೆ ಶುರುವಾದಾಗ ಹಿಂದಿನ ಮಾತುಕತೆಯನ್ನು ಸದ್ಯದ ಮಾತುಕತೆಯೊಂದಿಗೆ "
 "ಸೇರಿಸುವದು"
 
-#, c-format
 msgid "Online"
 msgstr "ಆನ್‍ಲೈನ್"
 
@@ -1574,6 +1596,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "ಖಾತೆಗಳು"
 
@@ -1672,15 +1716,6 @@ msgstr "ಮಾತುಕತೆಗೆ ಆಮಂತ್ರಣ ಸ್ವೀಕರಿ�
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "ಸ್ವೀಕರಿಸಿ(A)"
-
-#  ತಿರಸ�ಕರಿಸ�  ಸರಿಯಾದ ಶಬ�ದ .    ನಿರಾಕರಿಸ�   ಅಂದರೆ   ಡಿನೈ ! .
-msgid "Reject"
-msgstr "ತಿರಸ್ಕರಿಸು"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1771,6 +1806,8 @@ msgstr " +++ %s ಒಳಬಂದಿದ್ದಾರೆ"
 msgid "+++ %s signed off"
 msgstr "+++ %s ಹೊರಹೋದರು"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
 
@@ -1819,6 +1856,18 @@ msgstr "%s ಕೋಣೆಯಿಂದ ಹೊರಹೋದರು."
 msgid "%s left the room (%s)."
 msgstr "%s  ಇವರು (%s) ಕೋಣೆಯಿಂದ ಹೊರಹೋದರು."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "ಅಧಿವೇಶನಕ್ಕೆ ಆಮಂತ್ರಿಸಿ"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"ನೀವು ಆಮಂತ್ರಿಸಬಯಸುವ ಬಳಕೆದಾರನ ಹೆಸರು ಬರೆಯಿರಿ (ಬೇಕೆಂದರೆ ನೀವು ಬಯಸುವ ಆಮಂತ್ರಣ "
+"ಸಂದೇಶದೊಂದಿಗೆ)"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "%s  ಸಂಪರ್ಕ ಪಡೆಯಲು ವಿಫಲ."
@@ -1947,7 +1996,6 @@ msgstr " %s ಕಡತವನ್ನು  %s ರಿಗೆ ವರ್ಗಾಯಿಸ�
 msgid "Transfer of file %s complete"
 msgstr "%s ಕಡತದ ವರ್ಗಾವಣೆ ಸಂಪೂರ್ಣಗೊಂಡಿದೆ."
 
-#, c-format
 msgid "File transfer complete"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಪೂರ್ತಿ."
 
@@ -1955,7 +2003,6 @@ msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಪೂರ್ತಿ."
 msgid "You canceled the transfer of %s"
 msgstr " %s ದ ವರ್ಗಾವಣೆಯನ್ನು ನೀವು ರದ್ದು ಮಾಡಿದಿರಿ"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "ಕಡತದ ವರ್ಗಾವಣೆ ರದ್ದಾಗಿದೆ."
 
@@ -2140,11 +2187,14 @@ msgstr "<font color=\"red\"><b>%s ಕಡತ ಓದಲು ಆಗಲಿಲ್ಲ</
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <ತಂತಾನೇ-ಉತ್ತರ>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2539,7 +2589,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2590,7 +2640,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2619,6 +2669,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "ಪ್ರವೇಶಪದ ಬರೆಯಿರಿ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2807,18 +2883,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "ಮೊದಲ ಹೆಸರು"
 
@@ -2852,6 +2928,11 @@ msgstr ""
 msgid "Purple Person"
 msgstr "ಹೊಸ ವ್ಯಕ್ತಿ"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "ಇರುವ ಸ್ಥಳ"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2862,14 +2943,17 @@ msgstr "%s ಮಾತುಕತೆಯನ್ನು ಮುಕ್ತಾಯಗೊಳ�
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "%s ಬಳಕೆದಾರರನ್ನು  ನಿಷೇಧಿಸಲು ಆಗಲಿಲ್ಲ"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2916,13 +3000,16 @@ msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಉಳಿಸಿ..."
 msgid "Load buddylist from file..."
 msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಈ ಕಡತದಿಂದ  ತೆಗೆದುಕೊಳ್ಳಿ ..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "ನೋದಾವಣೆಗಾಗಿ ವಿವರಗಳನ್ನು ತುಂಬಿರಿ"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "ಪ್ರವೇಶಪದಗಳು ತಾಳೆಯಾಗುವದಿಲ್ಲ"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "ಹೊಸ ಖಾತೆಯನ್ನು ನೋಂದಾಯಿಸಲು ಅಗಲಿಲ್ಲ . ದೋಷ ಸಂಭವಿಸಿದೆ.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2934,14 +3021,15 @@ msgstr "ಯಶಸ್ವೀ ನೋಂದಾವಣೆ"
 msgid "Password"
 msgstr "ಪ್ರವೇಶ ಪದ"
 
-msgid "Password (retype)"
-msgstr "ಪ್ರವೇಶಪದ(ಪುನ:ಬರೆಯಿರಿ)"
+msgid "Password (again)"
+msgstr "ಪ್ರವೇಶಪದ(ಇನ್ನೊಮ್ಮೆ)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ಹೊಸ Gadu-Gadu ಖಾತೆ ನೋಂದಾಯಿಸಿ"
@@ -2995,6 +3083,15 @@ msgstr "ಪ್ರವೇಶಪದದ ಬದಲಾವಣೆ ಯಶಸ್ವಿ!"
 msgid "Current password"
 msgstr "ಈಗಿನ ಪ್ರವೇಶಪದ"
 
+msgid "Password (retype)"
+msgstr "ಪ್ರವೇಶಪದ(ಪುನ:ಬರೆಯಿರಿ)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3008,13 +3105,13 @@ msgstr "ಗೆಳೆಯ  %s ರಿಗಾಗಿ ಒಂದು ಮಾತುಕತ�
 msgid "Add to chat..."
 msgstr "ಮಾತುಕತೆಗೆ ಸೇರಿಸಿ..."
 
+#. Global
 msgid "Available"
 msgstr "ಲಭ್ಯ"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "ಆಚೆ"
 
@@ -3042,7 +3139,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -3057,8 +3154,14 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
-msgstr "ಸಂಪರ್ಕ ವಿಫಲವಾಗಿದೆ."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "ಸಂಪರ್ಕ ಹೊಂದಿದೆ"
+
+msgid "Connection failed"
+msgstr "ಸಂಪರ್ಕ ವಿಫಲ"
 
 msgid "Add to chat"
 msgstr "ಮಾತುಕತೆಗೆ ಸೇರಿಸಿ"
@@ -3066,13 +3169,23 @@ msgstr "ಮಾತುಕತೆಗೆ ಸೇರಿಸಿ"
 msgid "Chat _name:"
 msgstr "ಮಾತುಕತೆ ಹೆಸರು(n)"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "ಸಂಪರ್ಕಿಸುತ್ತಿದೆ"
+
 msgid "Chat error"
 msgstr "ಮಾತುಕತೆ ದೋಷ"
 
 msgid "This chat name is already in use"
 msgstr "ಈ ಮಾತುಕತೆ ಹೆಸರು ಆಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
 
 msgid "Find buddies..."
@@ -3114,6 +3227,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ಬಳಕೆದಾರ"
 
+#, fuzzy
+msgid "GG server"
+msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಕೊಡಿ.."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಆದೇಶ: %s"
@@ -3129,7 +3246,7 @@ msgid "File Transfer Failed"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ."
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "ಬರೆಯುವದಕ್ಕಾಗಿ  %s ತೆರೆಯಲು ಆಗಲಿಲ್ಲ"
 
 msgid "Error displaying MOTD"
@@ -3145,8 +3262,16 @@ msgstr "ಈ ಸಂಪರ್ಕಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ದೈನ
 msgid "MOTD for %s"
 msgstr "%s ಗೆ ದಿನದ ಸಂದೇಶ"
 
-msgid "Server has disconnected"
-msgstr ""
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
 
 msgid "View MOTD"
 msgstr "ದಿನದ ಸಂದೇಶ ನೋಡಿರಿ"
@@ -3157,25 +3282,23 @@ msgstr "ವಾಹಿನಿ(C)"
 msgid "_Password:"
 msgstr "ಪ್ರವೇಶಪದ:(P)"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "ಸಂಪರ್ಕಿಸುತ್ತಿದೆ"
-
 msgid "SSL support unavailable"
 msgstr "SSL ಬೆಂಬಲ ಅಲಭ್ಯ"
 
-msgid "Couldn't create socket"
-msgstr ""
+msgid "Unable to connect"
+msgstr "ಸಂಪರ್ಕಿಸಲು ವಿಫಲ"
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ "
 
-msgid "Read error"
-msgstr "ಓದುವಲ್ಲಿ ದೋಷ"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕ ಮುಚ್ಚಿದೆ"
 
 msgid "Users"
 msgstr "ಬಳಕೆದಾರರು"
@@ -3356,6 +3479,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "ಈ ಮಾತುಕತೆ ಹೆಸರು ಆಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "ಅಡ್ಡಹೆಸರು"
+
 msgid "Cannot change nick"
 msgstr "ಅಡ್ದ ಹೆಸರು ಬದಲಿಸಲಾಗದು "
 
@@ -3558,10 +3692,10 @@ msgstr "ಆದೇಶ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದ�
 msgid "execute"
 msgstr "ನಿರೀಕ್ಷಿತ ಅಲ್ಲ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3576,18 +3710,49 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "ಧೃಡೀಕರಣ ವಿಫಲ"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "ತಪ್ಪು ಸರ್ವರ್"
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "MSN ದೋಷ: %s\n"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "ಕಾರಣ ಕೊಟ್ಟಿಲ್ಲ"
+
+msgid "Unsupported version of BOSH protocol"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+
 msgid "Full Name"
 msgstr "ಪೂರ್ಣ ಹೆಸರು"
 
@@ -3653,182 +3818,9 @@ msgstr "ಕಕ್ಷಿ"
 msgid "Operating System"
 msgstr "ಕಾರ್ಯಾಚರಣೆ ವ್ಯವಸ್ಥೆ"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "ಬಳಕೆದಾರ ಮಾಹಿತಿ  ಬರೆಯಿರಿ"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "ವಿಸ್ತೃತ ವಿಳಾಸ"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "ಅಲಿಯಾಸ್ ಮಾತುಕತೆ"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "ಬಳಕೆದಾರನಿಗೆ ಕಡತಕೋಶದ ಮಾಹಿತಿಯಿಲ್ಲ"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "ಆದೇಶ"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "ಹೆಚ್.ಟಿ.ಎಮ್.ಎಲ್/ಅತಿ ಪಠ್ಯ"
-
 #, fuzzy
-msgid "In-Band Registration"
-msgstr "ನೋಂದಣಿ ದೋಷ"
-
-#, fuzzy
-msgid "User Location"
-msgstr "ಸ್ಥಳ"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "ಬಳಕೆದಾರರ ಹುಡುಕುವಿಕೆ"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "ಗೆಳೆಯನ ಸ್ಥಿತಿ ಸೂಚನೆ"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "ಮಾತುಕತೆಯನ್ನು ಉಳಿಸಿ"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
-
-msgid "File Transfer"
-msgstr "ಕಡತ ವರ್ಗಾವಣೆ "
-
-#, fuzzy
-msgid "User Mood"
-msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "ಬಳಕೆದಾರ ಮಿತಿ"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "MSN ವ್ಯಕ್ತಿಪರಿಚಯ"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "ಸೇರಿಕೊಳ್ಳಿ"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "ಸಂದೇಶ ಸಿಕ್ಕಿದೆ"
-
-msgid "Public Key Publishing"
-msgstr ""
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "ಬಳಕೆದಾರ ಆಯ್ಕೆಗಳು"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "ಬಳಕೆದಾರ ಮಿತಿ"
-
-msgid "Ping"
-msgstr "ಪಿಂಗ್"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
+msgid "Local Time"
+msgstr "ಸ್ಥಳೀಯ ಕಡತ:"
 
 msgid "Priority"
 msgstr "ಆದ್ಯತೆ"
@@ -3836,6 +3828,14 @@ msgstr "ಆದ್ಯತೆ"
 msgid "Resource"
 msgstr "ಸಂಪನ್ಮೂಲ"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "ಈಗಾಗಲೇ ಲಾಗಿನ್ ಮಾಡಲಾಗಿದೆ"
+
 msgid "Middle Name"
 msgstr "ನಡುವಿನ  ಹೆಸರು"
 
@@ -3884,7 +3884,6 @@ msgstr ""
 msgid "Extended Away"
 msgstr ""
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "ಡಿಸ್ಟರ್ಬ್ ಮಾಡ್ಬೇಡಿ"
 
@@ -4004,26 +4003,25 @@ msgstr ""
 msgid "Find Rooms"
 msgstr "ಕೋಣೆಗಳನ್ನು ಹುಡುಕಿ"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "ಅಲಿಯಾಸ್:"
 
-msgid "Write error"
-msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
+#, fuzzy
+msgid "No users found"
+msgstr "ಲಾಗ್‍ಗಳು ಸಿಗಲಿಲ್ಲ"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "ಸಾದಾ ಪಠ್ಯ"
+msgid "Roles:"
+msgstr "ಪಾತ್ರ"
 
-msgid "Read Error"
-msgstr "ಓದುವಲ್ಲಿ ದೋಷ"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "ಸಾದಾ ಪಠ್ಯ"
 
-#, fuzzy, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
-
-msgid "Unable to create socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4032,6 +4030,10 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr " %s@%s ಯ  ನೋಂದಣಿ ಯಶಸ್ವಿ"
@@ -4058,9 +4060,6 @@ msgstr "ನೋಂದಣಿ ಯಶಸ್ವಿ"
 msgid "Unregistration Failed"
 msgstr "ನೋಂದಣಿ ವಿಫಲ"
 
-msgid "Already Registered"
-msgstr "ಈಗಾಗಲೇ ನೋಂದಣಿಯಾಗಿದೆ "
-
 msgid "State"
 msgstr "ಸ್ಥಿತಿ"
 
@@ -4073,6 +4072,9 @@ msgstr "ದೂರವಾಣಿ ಸಂಖ್ಯೆ"
 msgid "Date"
 msgstr "ದಿನಾಂಕ"
 
+msgid "Already Registered"
+msgstr "ಈಗಾಗಲೇ ನೋಂದಣಿಯಾಗಿದೆ "
+
 #, fuzzy
 msgid "Unregister"
 msgstr "ನೋಂದಾಯಿಸಿ"
@@ -4105,6 +4107,10 @@ msgid "Change Registration"
 msgstr "ಸ್ಥಿತಿಯನ್ನು ಹೀಗೆ ಬದಲಿಸಿ(s):"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "ಖಾತೆಮಾಹಿತಿ ಬದಲಿಸುವಲ್ಲಿ ದೋಷ"
 
@@ -4124,9 +4130,18 @@ msgstr "ಧೃಡೀಕರಿಸಲಾಗುತ್ತಿದೆ"
 msgid "Re-initializing Stream"
 msgstr ""
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "ಅಧಿಕಾರ ಪಡೆದಿಲ್ಲ"
 
+msgid "Mood"
+msgstr "ಲಹರಿ"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr ""
 
@@ -4148,12 +4163,6 @@ msgstr "ಏನೂ ಇಲ್ಲ"
 msgid "Subscription"
 msgstr "ಚಂದಾದಾರಿಕೆ"
 
-msgid "Mood"
-msgstr "ಲಹರಿ"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "ರಕ್ತದ ಗುಂಪು"
@@ -4199,9 +4208,6 @@ msgstr "ನಿಮ್ಮ ಪ್ರವೇಶಪದ ಬದಲಾಗಿದೆ"
 msgid "Error changing password"
 msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸುವಲ್ಲಿ ದೋಷ"
 
-msgid "Password (again)"
-msgstr "ಪ್ರವೇಶಪದ(ಇನ್ನೊಮ್ಮೆ)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ"
@@ -4395,18 +4401,24 @@ msgstr "ಬಳಕೆದಾರ %s ರನ್ನು ಒದೆಯಲು ಆಗಲಿ
 msgid "Unable to ping user %s"
 msgstr "%s ಬಳಕೆದಾರರನ್ನು  ನಿಷೇಧಿಸಲು ಆಗಲಿಲ್ಲ"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್ಲ , ಬಳಕೆದಾರರು ಕಡತವರ್ಗಾವಣೆ ಬೆಂಬಲಿಸುವದಿಲ್ಲ "
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್ಲ , ಬಳಕೆದಾರರು ಕಡತವರ್ಗಾವಣೆ ಬೆಂಬಲಿಸುವದಿಲ್ಲ "
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್ಲ , ಬಳಕೆದಾರರು ಕಡತವರ್ಗಾವಣೆ ಬೆಂಬಲಿಸುವದಿಲ್ಲ "
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4416,9 +4428,35 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr "%s ರವರು  ನಿಮ್ಮನ್ನು [%s] ಸೇರಿಸಿದ್ದಾರೆ"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "%s ರಿಗೆ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್ಲ , ಬಳಕೆದಾರರು ಕಡತವರ್ಗಾವಣೆ ಬೆಂಬಲಿಸುವದಿಲ್ಲ "
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್ಲ , ಬಳಕೆದಾರರು ಕಡತವರ್ಗಾವಣೆ ಬೆಂಬಲಿಸುವದಿಲ್ಲ "
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "ನೋಂದಣಿ ವಿಫಲ"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "ನೀವು ಸೇರಬಯಸುವ ಮಾತುಕತೆ ಕುರಿತು ಮಾಹಿತಿ ಕೊಡಿ.\n"
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "ಒಂದು ಸಂಖ್ಯೆ ಆಯ್ದುಕೊಳ್ಳಿ"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "ಮಾತುಕತೆ ಆರಂಭಿಸಿ(C)"
 
 msgid "config:  Configure a chat room."
 msgstr "config:ಮಾತುಕತೆ ಕೋಣೆಯನ್ನು ಸಂರಚಿಸಿ"
@@ -4439,13 +4477,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4508,6 +4546,9 @@ msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕಿಸಿ"
 msgid "File transfer proxies"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಪೋರ್ಟ್"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4547,6 +4588,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "%s ಮಾತುಕತೆ ಸೇರುವಲ್ಲಿ ದೋಷ"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr " %s ಮಾತುಕತೆಯಲ್ಲಿ ದೋಷ"
+
 msgid "Create New Room"
 msgstr "ಹೊಸಕೋಣೆ ನಿರ್ಮಿಸಿ"
 
@@ -4561,13 +4610,32 @@ msgstr "ಮಾತುಕತೆ ಸಂರಚಿಸಿ(C)"
 msgid "_Accept Defaults"
 msgstr ""
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "%s ಮಾತುಕತೆ ಸೇರುವಲ್ಲಿ ದೋಷ"
+#, fuzzy
+msgid "No reason"
+msgstr "ಕಾರಣ ಕೊಟ್ಟಿಲ್ಲ"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr " %s ಮಾತುಕತೆಯಲ್ಲಿ ದೋಷ"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s: (%s) ನಿಮ್ಮನ್ನು ಒದ್ದಿದ್ದಾರೆ"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s) ರಿಂದ ಒದೆತ"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "ಕಡತವನ್ನು ತೆರೆಯುವಾಗ ದೋಷವುಂಟಾಯಿತು"
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ."
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr " '%s' ಕಡತ ತೆರೆಯಲು ಆಗಲಿಲ್ಲ: %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4592,10 +4660,6 @@ msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "ನೀವು ಸೇರಬಯಸುವ ಮಾತುಕತೆ ಕುರಿತು ಮಾಹಿತಿ ಕೊಡಿ.\n"
 
-#, fuzzy
-msgid "Select a Resource"
-msgstr "ಒಂದು ಸಂಖ್ಯೆ ಆಯ್ದುಕೊಳ್ಳಿ"
-
 msgid "Edit User Mood"
 msgstr ""
 
@@ -4635,9 +4699,20 @@ msgstr "ಕ್ರಿಯೆ"
 msgid "Select an action"
 msgstr "ಆಯ್ಕೆ"
 
-msgid "Unable to retrieve MSN Address Book"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\"  ಸೇರಿಸಲಾಗಲಿಲ್ಲ. "
+
+msgid "Buddy Add error"
 msgstr ""
 
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "ಜಾಲವೀಕ್ಷಣಾ ಆದೇಶ  \"%s\" ತಪ್ಪಾಗಿದೆ"
+
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
@@ -4862,7 +4937,6 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4886,6 +4960,10 @@ msgstr "ಬಯಕೆಯ ಸಂಪರ್ಕ"
 msgid "Non-IM Contacts"
 msgstr "ಸಂಪರ್ಕವನ್ನು ತೆಗೆದುಹಾಕಿ"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -4956,6 +5034,13 @@ msgstr "ಮೊಬೈಲ್ ಸಂದೇಶ ಕಳಿಸಿ"
 msgid "Page"
 msgstr "ಪುಟ"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "ಕಛೇರಿ ಫ್ಯಾಕ್ಸ"
+
 msgid "Has you"
 msgstr ""
 
@@ -4996,6 +5081,14 @@ msgstr "ವಿಳಾಸ"
 msgid "Album"
 msgstr ""
 
+#, fuzzy
+msgid "Game Title"
+msgstr "ಶೀರ್ಷಿಕೆ"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "ಶೀರ್ಷಿಕೆ"
+
 msgid "Set Friendly Name..."
 msgstr ""
 
@@ -5029,9 +5122,6 @@ msgstr "ಮಾತುಕತೆ ಆರಂಭಿಸಿ(C)"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5185,8 +5275,9 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
-msgstr "ಕಿರುಪರಿಚಯದ ಜಾಲಕೊಂಡಿ"
+#, fuzzy
+msgid "View web profile"
+msgstr "ಗೆಳೆಯನು ಆಫ್ಲೈನ್ ಆಗಿದ್ದಾನೆ"
 
 #. *< type
 #. *< ui_requirement
@@ -5222,66 +5313,29 @@ msgstr "ಸಾಮಾನ್ಯ ಧೃಡೀಕರಣ ವಿಫಲ"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "ಸಾಮಾನ್ಯ ಧೃಡೀಕರಣ ವಿಫಲ"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s  ರು %s (%s) ಮೇಲೆ  "
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ನಿಮಗೆ ಸಂದೇಶ ಕಳುಹಿಸಿದ್ದಾರೆ"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
 
 msgid "Unable to add user"
 msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "ನಿಮ್ಮ ಹುಡುಕುವಿಕೆಯ ಫಲಿತಾಂಶಗಳು ಇಲ್ಲಿವೆ"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr " %s (%s) ಮೇಲೆ ಬಲಕೆದಾರರನ್ನು ಸೇರಿಸಲು ಆಗಲಿಲ್ಲ"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s)ಮೇಲೆ ಬಳಕೆದಾರನನ್ನು ತಡೆಗಟ್ಟಲು ಆಗಲಿಲ್ಲ"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿ ಭರತಿಯಾಗಿದ್ದರಿಂದ %s ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr "ಸೇವೆ ಸದ್ಯಕ್ಕೆ ಅಲಭ್ಯ"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "ಬಹಳ ತೀವ್ರಗತಿಯಲ್ಲಿ ನಾವು ಕಳಿಸುತ್ತಿರುವದರಿಂದಾಗಿ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ "
 
-msgid "Unable to rename group"
-msgstr "ಗುಂಪಿನ ಹೆಸರು ಬದಲಿಸಲು ಆಗಲಿಲ್ಲ"
-
-msgid "Unable to delete group"
-msgstr "ಗುಂಪನ್ನು ಅಳಿಸಲು ಆಗಲಿಲ್ಲ"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5317,9 +5371,6 @@ msgstr "ಯಾವುದೋ ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಭವ
 msgid "Message was not sent because an unknown error occurred."
 msgstr "ಯಾವುದೋ ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಭವಿಸಿದ್ದರಿಂದ ಸಂದೇಶವು ಕಳಿಸಲ್ಪಟ್ಟಿರಲಿಕ್ಕಿಲ್ಲ."
 
-msgid "Unable to connect"
-msgstr "ಸಂಪರ್ಕಿಸಲು ವಿಫಲ"
-
 msgid "Writing error"
 msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
 
@@ -5332,19 +5383,21 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
-msgstr ""
+#, fuzzy
+msgid "Our protocol is not supported by the server"
+msgstr "ಈ ಪ್ರೋಟೋಕಾಲ್ ಮಾತುಕತೆ ಕೋಣೆಗಳನ್ನು ಅಳವಡಿಸಿಲ್ಲ"
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5373,6 +5426,14 @@ msgstr "ಕುಕೀಗಳನ್ನು  ಕಳಿಸಲಾಗುತ್ತಿದ�
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 "&#3223;&#3235;&#3221;&#3238;&#3263;&#3202;&#3238; &#3238;&#3266;&#3248;"
@@ -5410,14 +5471,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "ಯಾವುದೋ ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಭವಿಸಿದ್ದರಿಂದ ಸಂದೇಶವು ಕಳಿಸಲ್ಪಟ್ಟಿರಲಿಕ್ಕಿಲ್ಲ."
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ನಿಮ್ಮನ್ನು ತಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಿದ್ದಾರೆ"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ನಿಮ್ಮನ್ನು ತಮ್ಮ ಗೆಳೆಯರಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕಿದ್ದಾರೆ "
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "ವಿಳಾಸಪುಸ್ತಕಕ್ಕೆ ಸೇರಿಸಿ"
@@ -5425,13 +5478,6 @@ msgstr "ವಿಳಾಸಪುಸ್ತಕಕ್ಕೆ ಸೇರಿಸಿ"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr ""
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "\"%s\"  ಸೇರಿಸಲಾಗಲಿಲ್ಲ. "
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "ಜಾಲವೀಕ್ಷಣಾ ಆದೇಶ  \"%s\" ತಪ್ಪಾಗಿದೆ"
@@ -5439,6 +5485,9 @@ msgstr "ಜಾಲವೀಕ್ಷಣಾ ಆದೇಶ  \"%s\" ತಪ್ಪಾಗ�
 msgid "This Hotmail account may not be active."
 msgstr "ಈ ಹಾಟ್‍ಮೇಲ್ ಖಾತೆಯು ಸಕ್ರಿಯವಾಗಿರಲಿಕ್ಕಿಲ್ಲ"
 
+msgid "Profile URL"
+msgstr "ಕಿರುಪರಿಚಯದ ಜಾಲಕೊಂಡಿ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5453,18 +5502,63 @@ msgstr "ಈ ಹಾಟ್‍ಮೇಲ್ ಖಾತೆಯು ಸಕ್ರಿಯವ
 msgid "MSN Protocol Plugin"
 msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+msgid "Unknown error."
+msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s  ರು %s (%s) ಮೇಲೆ  "
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr " %s (%s) ಮೇಲೆ ಬಲಕೆದಾರರನ್ನು ಸೇರಿಸಲು ಆಗಲಿಲ್ಲ"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s)ಮೇಲೆ ಬಳಕೆದಾರನನ್ನು ತಡೆಗಟ್ಟಲು ಆಗಲಿಲ್ಲ"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿ ಭರತಿಯಾಗಿದ್ದರಿಂದ %s ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr "ಸೇವೆ ಸದ್ಯಕ್ಕೆ ಅಲಭ್ಯ"
+
+msgid "Unable to rename group"
+msgstr "ಗುಂಪಿನ ಹೆಸರು ಬದಲಿಸಲು ಆಗಲಿಲ್ಲ"
+
+msgid "Unable to delete group"
+msgstr "ಗುಂಪನ್ನು ಅಳಿಸಲು ಆಗಲಿಲ್ಲ"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ನಿಮ್ಮನ್ನು ತಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಿದ್ದಾರೆ"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ನಿಮ್ಮನ್ನು ತಮ್ಮ ಗೆಳೆಯರಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕಿದ್ದಾರೆ "
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "ಓದುವಲ್ಲಿ ದೋಷ "
 
@@ -5475,13 +5569,23 @@ msgstr ""
 msgid "Logging in"
 msgstr "ದಾಖಲಾತಿ"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "ಹೆಸರು ಇಲ್ಲ."
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "ಒಂದು ಸಂದೇಶ ಕಳಿಸಿ(m)"
@@ -5501,21 +5605,21 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-#, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "ಹೆಸರು ಇಲ್ಲ."
-
-msgid "You appear to have no MySpace username."
+msgid "IM Friends"
 msgstr ""
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "ಸಂಪರ್ಕ ಹೊಂದಿದೆ"
+msgid "Add contacts from server"
+msgstr ""
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5523,16 +5627,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "ತಪ್ಪು ಶೀರ್ಷಿಕೆ"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಗೆಳೆಯನನ್ನು ಸೇರಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
 
@@ -5543,14 +5654,6 @@ msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಈ ಕಡತದಿಂ
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಗೆಳೆಯನನ್ನು ಸೇರಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
@@ -5561,36 +5664,15 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "ತಪ್ಪು ಶೀರ್ಷಿಕೆ"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "ಸರತಿಯಸಾಲು ಭರತಿಯಾಗಿದೆ"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ :%s"
+msgid "Missing Cipher"
+msgstr ""
 
-msgid "IM Friends"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Add contacts from server"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
 msgstr ""
 
 msgid "Add friends from MySpace.com"
@@ -5638,10 +5720,6 @@ msgstr "ದೊಡ್ಡ ಅಕ್ಷರಗಾತ್ರ"
 msgid "User"
 msgstr "ಬಳಕೆದಾರರು"
 
-#, fuzzy
-msgid "Profile"
-msgstr "MSN ವ್ಯಕ್ತಿಪರಿಚಯ"
-
 msgid "Headline"
 msgstr ""
 
@@ -5656,15 +5734,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "ಮಾತುಕತೆಯನ್ನು ಮುಗಿಸಿರಿ"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "ಹೆಸರು ಇಲ್ಲ."
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5677,6 +5750,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "ಸೇವೆಯು ತಾತ್ಪೂರ್ತಿಕವಾಗಿ ಲಭ್ಯವಿಲ್ಲ"
@@ -5685,6 +5761,14 @@ msgstr "ಸೇವೆಯು ತಾತ್ಪೂರ್ತಿಕವಾಗಿ ಲಭ�
 msgid "Please try another username:"
 msgstr "%sಗಾಗಿ ಹೊಸ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "ಹೆಸರು ಇಲ್ಲ."
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5880,10 +5964,6 @@ msgstr "ನಿಮ್ಮನ್ನೇ ಸೇರಿಸಿಕೊಳ್ಳಲು ಸ�
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5923,9 +6003,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "ಲಾಗಿನ್ ವಿಫಲ(%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s ಬಳಕೆದಾರರನ್ನು  ನಿಷೇಧಿಸಲು ಆಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6023,9 +6103,6 @@ msgstr "ಗುಂಪುವಾರು ಸಮ್ಮೇಳನ %d"
 msgid "Authenticating..."
 msgstr "ಧೃಡೀಕರಿಸಲಾಗುತ್ತಿದೆ..."
 
-msgid "Unable to connect to server."
-msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
-
 msgid "Waiting for response..."
 msgstr "ಉತ್ತರಕ್ಕಾಗಿ ದಾರಿಕಾಯಲಾಗುತ್ತಿದೆ..."
 
@@ -6049,23 +6126,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "ಈ ಮಾತುಕತೆಯಲ್ಲಿ ಸೇರಬಯಸುವಿರಾ?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
-msgstr ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr "ನೀವು ತಡೆಗಟ್ಟ ಬಯಸುವ ಬಳಕೆದಾರರ ಹೆಸರು ಬರೆಯಿರಿ"
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ಈ ಸಮ್ಮೇಳನ ಮುಗಿದಿದೆ . ಇನ್ನು ಸಂದೇಶಗಳನ್ನು ಕಳಿಸಲು ಆಗುವದಿಲ್ಲ"
 
@@ -6088,6 +6159,22 @@ msgstr "ಸರ್ವರ್ ವಿಳಾಸ"
 msgid "Server port"
 msgstr ""
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+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 ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
@@ -6096,18 +6183,10 @@ msgstr "ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
 msgid "Invalid chat room name"
 msgstr "ತಪ್ಪು ಕೋಣೆಯ ಹೆಸರು"
 
-msgid "Server closed the connection."
-msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕ ಮುಚ್ಚಿದೆ"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
 
-msgid "Received invalid data on connection with server."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6155,8 +6234,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 msgid "Direct IM established"
 msgstr ""
@@ -6324,23 +6404,18 @@ msgstr ""
 msgid "Screen Sharing"
 msgstr "ಬಳಕೆಯ ಹೆಸರು"
 
-#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#, c-format
 msgid "Not Available"
 msgstr "ಲಭ್ಯವಿಲ್ಲ"
 
-#, c-format
 msgid "Occupied"
 msgstr ""
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr "ಅದೃಶ್ಯ"
 
@@ -6354,16 +6429,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "ವರ್ಗಾವಣೆಗಾಗಿ ಸಂಪರ್ಕಿಸಲು ಅಗಲಿಲ್ಲ"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "ವರ್ಗಾವಣೆಗಾಗಿ ಸಂಪರ್ಕಿಸಲು ಅಗಲಿಲ್ಲ"
+msgid "Unable to connect to BOS server: %s"
+msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
 
 #, fuzzy
 msgid "Username sent"
@@ -6378,47 +6449,54 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "ತಪ್ಪು ಹೆಸರು"
+msgid "Unable to get a valid AIM login hash."
+msgstr "%s ಕಡತ ಓದಲು ಆಗಲಿಲ್ಲ"
 
-msgid "Incorrect password."
-msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "%s ಕಡತ ಓದಲು ಆಗಲಿಲ್ಲ"
+
+msgid "Received authorization"
+msgstr ""
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "ಬಲಕೆದಾರರು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr "ಸಂಪರ್ಕ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "ಜಾಲವೀಕ್ಷಣಾ ಆದೇಶ  \"%s\" ತಪ್ಪಾಗಿದೆ"
 
 msgid "Enter SecurID"
 msgstr ""
@@ -6433,24 +6511,6 @@ msgstr ""
 msgid "_OK"
 msgstr "ಸರಿ"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "%s ಕಡತ ಓದಲು ಆಗಲಿಲ್ಲ"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "%s ಕಡತ ಓದಲು ಆಗಲಿಲ್ಲ"
-
 msgid "Password sent"
 msgstr "ಪ್ರವೇಶಪದ ಕಳುಹಿಸಲಾಗಿದೆ"
 
@@ -6566,7 +6626,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "ಸಂದೇಶ: %s  ಕಳಿಸಲಾಗಲಿಲ್ಲ"
@@ -6588,6 +6648,13 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
+#, fuzzy
+msgid "Profile"
+msgstr "MSN ವ್ಯಕ್ತಿಪರಿಚಯ"
+
 msgid "Your AIM connection may be lost."
 msgstr ""
 
@@ -6741,7 +6808,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6762,9 +6829,9 @@ msgstr ""
 msgid "Orphans"
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿ ಬಹಳಷ್ಟು ಗೆಳೆಯರಿರುವದರಿಂದ ಗೆಳೆಯ %s ರನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ . . "
@@ -6774,7 +6841,7 @@ msgid "(no name)"
 msgstr "(ಹೆಸರು ಇಲ್ಲ)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "ನಿಮ್ಮ ಆದೇಶವು ವಿಫಲವಾಯಿತು. ಕಾರಣ ತಿಳಿದುಬರಲಿಲ್ಲ."
 
 #, fuzzy, c-format
@@ -6837,6 +6904,7 @@ msgstr "ಕನೆಕ್ಟ್ ಆಗಿ"
 msgid "Get AIM Info"
 msgstr ""
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr ""
 
@@ -6895,6 +6963,7 @@ msgstr "ಹುಡುಕಿ"
 msgid "Set User Info (web)..."
 msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಕೊಡಿ.."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ"
@@ -6925,6 +6994,10 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "ಬಳಕೆದಾರರು ಲಾಗಿನ್ ಆಗಿಲ್ಲ"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6942,7 +7015,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
@@ -7049,7 +7121,7 @@ msgstr "ಇತರ"
 msgid "Visible"
 msgstr "ಅದೃಶ್ಯ"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7139,16 +7211,48 @@ msgstr "ಪರಿಷ್ಕರಿಸಿ"
 msgid "Could not change buddy information."
 msgstr "ದಯವಿಟ್ಟು ನಿಮ್ಮ ಸ್ನೇಹಿತರ ವಿವರಗಳನ್ನು ಸೇರಿಸಿ"
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "ಸಂಚಾರಿ"
+
+msgid "Note"
+msgstr "ಟಿಪ್ಪಣಿ"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "_ಗೆಳೆಯ"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "ಸ್ನೇಹಿತರನ್ನು ಸೇರಿಸಿ"
+msgid "_Modify"
+msgstr "ಬದಲಾಯಿಸು"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "ಬದಲಾಯಿಸು"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Server says:"
+msgstr "ಸರ್ವರ್ ಬಿಝಿ ಇದೆ"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "%s ಸೇರಲು ಆಮಂತ್ರಣ ಅಗತ್ಯ"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "ನಿಮ್ಮ ಸ್ನೇಹಿತರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬಹುದೇ?"
+
+#, fuzzy
+msgid "Enter answer here"
 msgstr "ಕೋರಿಕೆಯನ್ನು ಇಲ್ಲಿ ಸಲ್ಲಿಸಿ"
 
 msgid "Send"
@@ -7163,18 +7267,19 @@ msgid "Authorization denied message:"
 msgstr "ಅಧಿಕಾರ ಕೋರಿಕೆ"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "ಕ್ಷಮಿಸಿ , ನೀವು ನನ್ನ ತರಹದವರಲ್ಲ..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "%d  ಬಳಕೆದಾರರಿಗೆ ಧೃಡೀಕರಣ ಅಗತ್ಯವಿದೆ"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "ನಿಮ್ಮ ಸ್ನೇಹಿತರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬಹುದೇ?"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "ಕೋರಿಕೆಯನ್ನು ಇಲ್ಲಿ ಸಲ್ಲಿಸಿ"
 
 msgid "Would you be my friend?"
@@ -7197,7 +7302,7 @@ msgid "Failed sending authorize"
 msgstr "ದಯವಿಟ್ಟು ನನಗೆ ಅಧಿಕಾರ ನೀಡಿ!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಗೆಳೆಯನನ್ನು ಸೇರಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
 
 #, fuzzy, c-format
@@ -7241,6 +7346,9 @@ msgstr "%sಗಾಗಿ ಹೊಸ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
 #, fuzzy
 msgid "Not member"
 msgstr "ನಾನು ಸದಸ್ಯನಲ್ಲ"
@@ -7283,16 +7391,19 @@ msgstr "ಈ ಗುಂಪು ಇತರರನ್ನು ಸೇರಲು ಅನು�
 msgid "Join QQ Qun"
 msgstr "ಮಾತುಕತೆ ಸೇರಿರಿ"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "ಕೋರಿಕೆಯನ್ನು ಇಲ್ಲಿ ಸಲ್ಲಿಸಿ"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "ನೀವು ಒಬ್ಬ ಸ್ನೇಹಿತರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ತೆಗೆದು ಹಾಕಿದ್ದೀರಿ."
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "ನೀವು ಒಬ್ಬ ಸ್ನೇಹಿತರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ತೆಗೆದು ಹಾಕಿದ್ದೀರಿ."
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7302,7 +7413,7 @@ msgstr ""
 msgid "Failed:"
 msgstr "ವಿಫಲವಾಗಿದೆ"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7315,11 +7426,11 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "ಕ್ಷಮಿಸಿ , ನೀವು ನನ್ನ ತರಹದವರಲ್ಲ..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "ನೀವು ಒಬ್ಬ ಸ್ನೇಹಿತರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ತೆಗೆದು ಹಾಕಿದ್ದೀರಿ."
 
 #, fuzzy
@@ -7330,35 +7441,35 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "ಈ ಮಾತುಕತೆಯಲ್ಲಿ ಸೇರಬಯಸುವಿರಾ?"
 
 msgid "Setup"
 msgstr "ಸಿದ್ಧತೆ"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr " %d ಈ ಬಳಕೆದಾರರು  %d ಗುಂಪನ್ನು ಸೇರಲು ಕೋರಿಕೆ ಸಲ್ಲಿಸಿದ್ದಾರೆ"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr " %d ಈ ಬಳಕೆದಾರರು  %d ಗುಂಪನ್ನು ಸೇರಲು ಕೋರಿಕೆ ಸಲ್ಲಿಸಿದ್ದಾರೆ"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಗೆಳೆಯನನ್ನು ಸೇರಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "ಗೆಳೆಯನನ್ನು ತೆಗೆದುಹಾಕಿ"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "ಗೆಳೆಯನನ್ನು ತೆಗೆದುಹಾಕಿ"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7476,6 +7587,13 @@ msgstr ""
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr " <b>ಬಳಕೆದಾರ:</b> %s<br> "
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>ಬಾಹ್ಯ ಬಳಕೆದಾರ</b><br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7483,7 +7601,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "'ಗೈಮ್ ಕುರಿತು"
 
 #, fuzzy
@@ -7504,6 +7622,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "'ಗೈಮ್ ಕುರಿತು"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "ಮನೆವಿಳಾಸ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7535,7 +7657,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "ಸಂಪರ್ಕಿಸುತ್ತಿದೆ"
@@ -7548,6 +7669,9 @@ msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
 msgid "Show server news"
 msgstr "ಸರ್ವರ್ ವಿಳಾಸ"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "ಓದುವಲ್ಲಿ ದೋಷ "
@@ -7557,11 +7681,7 @@ msgid "Update interval (seconds)"
 msgstr "ಓದುವಲ್ಲಿ ದೋಷ "
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
 #, c-format
@@ -7584,21 +7704,19 @@ msgid "Activation required"
 msgstr "ನೋಂದಣಿ ಅಗತ್ಯ"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "ಓದುವಲ್ಲಿ ದೋಷ "
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "ಸಂವಾದ ಕೋರಿರಿ"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "ಯಾಹೂ! ಧೃಡೀಕರಣ ವಿಫಲ"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7608,7 +7726,7 @@ msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
 msgid "Enter code"
 msgstr "ಪ್ರವೇಶಪದ ಬರೆಯಿರಿ"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7616,65 +7734,42 @@ msgid "Enter the text from the image"
 msgstr "ಗುಂಪಿನ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "ಸಂಪರ್ಕಿಸಲು ವಿಫಲ"
-
 msgid "Socket error"
 msgstr ""
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
-
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "ಸಂಪರ್ಕ ಕಳೆದಿದೆ"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಕೊಡಿ.."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "ಕೋರಿಕೆ ನಿರಾಕರಿಸಲಾಗಿದೆ."
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "ತಪ್ಪು ದೋಷ"
 
 #, fuzzy
-msgid "Connecting server ..."
+msgid "Connecting to server"
 msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕಿಸಿ"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "ದೋಷ"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "ಹೆಸರು ಪಡೆಯಲು ವಿಫಲ: %s"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7684,6 +7779,10 @@ msgid ""
 msgstr "ಸರ್ವರ್ ವಿಳಾಸ"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "ಇವರಿಂದ"
 
@@ -7693,32 +7792,30 @@ msgid ""
 "%s"
 msgstr "ಸರ್ವರ್ ಸೂಚನೆಗಳು %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "ಆದೇಶ"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ."
 
 #, fuzzy, c-format
@@ -7732,9 +7829,6 @@ msgstr "ಕಡತ  ಕಳಿಸಿ"
 msgid "%d canceled the transfer of %s"
 msgstr "%s ರವರು %s  ಕಡತದ ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದುಗೊಳಿಸಿದರು."
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>ಗುಂಪಿನ ಶೀರ್ಷಿಕೆ:</b> %s<br>"
@@ -7788,17 +7882,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "ಆತಿಥೇಯಗಣಕ ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s ರಿಂದ ಘೋಷಣೆ"
@@ -7821,6 +7904,9 @@ msgstr "ಸ್ಪೀಕರ್‍‍ಗಳು"
 msgid "Video Camera"
 msgstr "ವೀಡಿಯೋ ಕ್ಯಾಮೆರಾ"
 
+msgid "File Transfer"
+msgstr "ಕಡತ ವರ್ಗಾವಣೆ "
+
 #, fuzzy
 msgid "Supports"
 msgstr "ಬೆಂಬಲ"
@@ -8501,9 +8587,6 @@ msgstr "ಸಂಸ್ಠೆ"
 msgid "Unit"
 msgstr "ಘಟಕ"
 
-msgid "Note"
-msgstr "ಟಿಪ್ಪಣಿ"
-
 msgid "Join Chat"
 msgstr "ಮಾತುಕತೆ ಸೇರಿರಿ"
 
@@ -8589,6 +8672,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ಜಾಲದ ಅಂಕಿಸಂಖ್ಯೆ"
 
+msgid "Ping"
+msgstr "ಪಿಂಗ್"
+
 msgid "Ping failed"
 msgstr "ಪಿಂಗ್ ವಿಫಲ"
 
@@ -8647,7 +8733,8 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC ಸರ್ವರ್ ಸಂಪರ್ಕಿಸುವಾಗ  ದೋಷ"
 
 msgid "Key Exchange failed"
@@ -8657,27 +8744,27 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "ಸಂಪರ್ಕ ವಿಫಲ"
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
-
-msgid "Could not load SILC key pair"
-msgstr ""
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -8954,8 +9041,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9043,6 +9131,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "ಸರ್ವರ್ ಅಂಕಿಸಂಖ್ಯೆ ಲಭ್ಯವಿಲ್ಲ"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC ಸರ್ವರ್ ಸಂಪರ್ಕಿಸುವಾಗ  ದೋಷ"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9083,36 +9174,36 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "ಹೆಸರು ಇಲ್ಲ."
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr "ಬರೆಯಲಾಗಲಿಲ್ಲ"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
 
-msgid "Could not connect"
-msgstr "ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
+msgid "Unable to create connection"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ:"
 
-msgid "Could not create listen socket"
-msgstr ""
-
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9146,176 +9237,63 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s ಗೆ ಸಂಪರ್ಕ ವಿಫಲ"
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "%s ಕಡತ ಬರೆಯಲು ಆಗಲಿಲ್ಲ"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "%s ಕಡತ ಓದಲು ಆಗಲಿಲ್ಲ"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "ಸಂದೇಶ ಬಹಳ ಉದ್ದ . ಕೊನೆಯ %s ಬೈಟ್‍ಗಳನ್ನು ಕತ್ತರಿಸಿದೆ"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s ಎಚ್ಚರಿಕೆಗೆ ಅನುಮತಿಯಿಲ್ಲ"
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s ನಲ್ಲಿ ಮಾತುಕತೆ ಲಭ್ಯವಿಲ್ಲ"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr "ವಿಫಲ."
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Email lookup restricted."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:ಯಾಹೂ ಜಾಲದಲ್ಲಿನ ಕೋಣೆಗಳ ಪಟ್ಟಿ ಮಾಡಿ"
 
-#, c-format
-msgid "No keywords."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-#, c-format
-msgid "User has no directory information."
-msgstr "ಬಳಕೆದಾರನಿಗೆ ಕಡತಕೋಶದ ಮಾಹಿತಿಯಿಲ್ಲ"
-
-#, c-format
-msgid "Country not supported."
-msgstr "ಈ ದೇಶ  ಬೆಂಬಲಿತವಲ್ಲ"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "ಗೊತ್ತಿಲ್ಲದ ಸೋಲು: %s"
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "ಸೇವೆಯು ತಾತ್ಪೂರ್ತಿಕವಾಗಿ ಲಭ್ಯವಿಲ್ಲ"
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ಯಾಹೂ! ಗುರುತು"
 
-#, c-format
-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 ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
+msgid "Pager server"
 msgstr ""
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ, %d,  ಸಂಭವಿಸಿದೆ.  ಮಾಹಿತಿ : %s"
-
-msgid "Invalid Groupname"
-msgstr "ಗುಂಪಿನ ಹೆಸರು ತಪ್ಪಾಗಿದೆ "
-
-msgid "Connection Closed"
-msgstr "ಸಂಪರ್ಕ ಮುಚ್ಚಿದೆ"
-
-msgid "Waiting for reply..."
-msgstr "ಉತ್ತರ ಪಡೆಯಲು ವಿಫಲ..."
-
-msgid "TOC has come back from its pause. You may now send messages again."
+msgid "Pager port"
 msgstr ""
 
-msgid "Password Change Successful"
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಾವಣೆ ಯಶಸ್ವಿ"
+msgid "File transfer server"
+msgstr "ಕಡತವರ್ಗಾವಣೆ ಸರ್ವರ್ "
 
-msgid "_Group:"
-msgstr "ಗುಂಪು(G)"
+msgid "File transfer port"
+msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಪೋರ್ಟ್"
 
-msgid "Get Dir Info"
+msgid "Chat room locale"
 msgstr ""
 
-msgid "Set Dir Info"
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "ಬರೆಯುವದಕ್ಕಾಗಿ  %s ತೆರೆಯಲು ಆಗಲಿಲ್ಲ"
-
-msgid "File transfer failed; other side probably canceled."
-msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ ; ಬಹುಶ: ಆಚೆಯವರು ರದ್ದು ಮಾಡಿದರು"
+msgid "Chat room list URL"
+msgstr "ಮಾತುಕತೆಕೋಣೆಗಳ ಪಟ್ಟಿಯ  URL"
 
-msgid "Could not connect for transfer."
-msgstr "ವರ್ಗಾವಣೆಗಾಗಿ ಸಂಪರ್ಕಿಸಲು ಅಗಲಿಲ್ಲ"
+msgid "Yahoo Chat server"
+msgstr "ಯಾಹೂ  ಮಾತುಕತೆಯ ಸರ್ವರ್"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "ಕಡತದ ಶಿರೋಭಾಗವನ್ನು ಬರೆಯಲು ಆಗಲಿಲ್ಲ ; ಕಡತದ  ವರ್ಗಾವಣೆ ಆಗುವದಿಲ್ಲ"
+msgid "Yahoo Chat port"
+msgstr "ಯಾಹೂ  ಮಾತುಕತೆಯ ಪೋರ್ಟ್"
 
 #, fuzzy
-msgid "Save As..."
-msgstr "ಲಾಂಛನವನ್ನು ಈ ಹೆಸರಿನಲ್ಲಿ ಉಳಿಸಿ..."
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] ""
-"%s ರವರು  %s ರನ್ನು    %d ಕದತವನ್ನು ಸ್ವೀಕರಿಸುವಂತೆ ಕೋರುತ್ತಾರೆ : %s (%.2f %s)%s%s"
-msgstr[1] ""
-"%s ರು  %sರನ್ನು   %d files ಕದತಗಳನ್ನು ಸ್ವೀಕರಿಸುವಂತೆ ಕೋರುತ್ತಾರೆ : %s (%.2f %s)%s%s"
-
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s ಕಡತವೊಂದನ್ನು ಕಳಿಸಲು ನಿಮ್ಮನ್ನು ಕೋರಿದ್ದಾರೆ"
+msgid "Yahoo JAPAN ID..."
+msgstr "ಯಾಹೂ! ಗುರುತು"
 
 #. *< type
 #. *< ui_requirement
@@ -9327,11 +9305,11 @@ msgstr "%s ಕಡತವೊಂದನ್ನು ಕಳಿಸಲು ನಿಮ್ಮ�
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr ""
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9354,6 +9332,31 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಖ್ಯೆ %d. ಯಾಹೂ! ತಾಣಕ್ಕೆ ಲಾಗಿನ್ ಆಗುವುದರಿಂದ ಇದನ್ನು ಸರಿಪಡಿಸಬಹುದು. "
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಖ್ಯೆ %d. ಯಾಹೂ! ತಾಣಕ್ಕೆ ಲಾಗಿನ್ ಆಗುವುದರಿಂದ ಇದನ್ನು ಸರಿಪಡಿಸಬಹುದು. "
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9381,33 +9384,27 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಖ್ಯೆ %d. ಯಾಹೂ! ತಾಣಕ್ಕೆ ಲಾಗಿನ್ ಆಗುವುದರಿಂದ ಇದನ್ನು ಸರಿಪಡಿಸಬಹುದು. "
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "ಗೆಳೆಯ %s ರನ್ನು  %s  ಗುಂಪಿಗೆ  ಸರ್ವರ್‍ಪಟ್ಟಿ‍ಗೆ %s ಖಾತೆಯಲ್ಲಿ ಸೇರಿಸಲಾಗಲಿಲ್ಲ  ."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "ಗೆಳೆಯನನ್ನು ಸರ್ವರ್ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[  %s/%s/%s.swf ಕೇಳಬಹುದು] %s"
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-msgid "Connection problem"
-msgstr "ಸಂಪರ್ಕ ಸಮಸ್ಯೆ"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ :%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 msgid "Not at Home"
@@ -9455,7 +9452,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -9470,74 +9467,15 @@ msgstr "ಬಳಕೆದಾರರನ್ನು ಮಾತುಕತೆಯಲ್ಲ�
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:ಯಾಹೂ ಜಾಲದಲ್ಲಿನ ಕೋಣೆಗಳ ಪಟ್ಟಿ ಮಾಡಿ"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ಯಾಹೂ! ಗುರುತು"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
-
-msgid "Yahoo Japan"
-msgstr "ಯಾಹೂ ಜಪಾನ್"
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr "ಕಡತವರ್ಗಾವಣೆ ಸರ್ವರ್ "
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಪೋರ್ಟ್"
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr "ಮಾತುಕತೆಕೋಣೆಗಳ ಪಟ್ಟಿಯ  URL"
-
-msgid "Yahoo Chat server"
-msgstr "ಯಾಹೂ  ಮಾತುಕತೆಯ ಸರ್ವರ್"
-
-msgid "Yahoo Chat port"
-msgstr "ಯಾಹೂ  ಮಾತುಕತೆಯ ಪೋರ್ಟ್"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "ಸಂಪರ್ಕಿಸಲು ವಿಫಲ"
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9545,6 +9483,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr " %s ರವರು %s ಕಡತವನ್ನು ಕಳಿಸಲು ಸಿದ್ಧರಿದ್ದಾರೆ."
 
+msgid "Write Error"
+msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9585,13 +9526,8 @@ msgstr "ಒಳ್ಳೆಯ ಕೊಂಡಿ ೩"
 msgid "Last Update"
 msgstr "ಇತ್ತೀಚಿನ ಪರಿಷ್ಕರಣೆ"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s ಬಳಕೆದಾರರ ಮಹಿತಿ ಲಭ್ಯವಿಲ್ಲ"
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9656,21 +9592,19 @@ msgstr "ದನಿಗಳು"
 msgid "Webcams"
 msgstr ""
 
+msgid "Connection problem"
+msgstr "ಸಂಪರ್ಕ ಸಮಸ್ಯೆ"
+
 msgid "Unable to fetch room list."
 msgstr "ಕೋಣೆಪಟ್ಟಿಗಳನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
 msgid "User Rooms"
 msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT ಸರ್ವರಿನೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಮಸ್ಯೆ"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9788,30 +9722,21 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr " \"%s\" ಪಾತ್ರವನ್ನು   %s ಇವರಿಗೆ  ಗೊತ್ತುಪಡಿಸಲು ಆಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP ಪ್ರಾಕ್ಸಿ ಸಂಪರ್ಕ ದೋಷ %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "%s: %s ದೋಷ ಪರಿಹರಿಸಲಾಗುತ್ತಿದೆ "
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9907,9 +9832,6 @@ msgstr "ಡಿಸ್ಟರ್ಬ್ ಮಾಡ್ಬೇಡಿ"
 msgid "Extended away"
 msgstr "ಆಚೆ ಹೋಗಿರುವಾಗ"
 
-msgid "Mobile"
-msgstr "ಸಂಚಾರಿ"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -9951,16 +9873,6 @@ msgstr "+++ %s  ಈಗ ಸಕ್ರಿಯರಾಗಿದ್ದಾರೆ"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s ಓದುವಲ್ಲಿ ದೋಷ"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr "ಲೆಖ್ಕಹಾಕುತ್ತಿದೆ"
 
@@ -10068,6 +9980,16 @@ msgstr "ಸಂಪರ್ಕ ನಿರಾಕರಿಸಲಾಗಿದೆ"
 msgid "Address already in use."
 msgstr "ಈ ಮಾತುಕತೆ ಹೆಸರು ಆಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s ಓದುವಲ್ಲಿ ದೋಷ"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 msgid "Internet Messenger"
 msgstr "ಇಂಟರ್ನೆಟ್ ಮೆಸ್ಸೆಂಜರ್ "
 
@@ -10116,10 +10038,8 @@ msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
 msgid "Use this buddy _icon for this account:"
 msgstr "ಈ ಗೆಳೆಯ ಚಿನ್ಹೆಯನ್ನು ಈ ಖಾತೆಗೆ ಬಳಸಿ"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s ಆಯ್ಕೆಗಳು"
+msgid "_Advanced"
+msgstr "_ಮುಂದುವರಿದ"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10155,9 +10075,6 @@ msgstr "ನೀವು ಬಹಳ ಸಮೀಪದಿಂದ ನೋಡಿದರೆ"
 msgid "you can see the butterflies mating"
 msgstr "ನೀವು ಸಂಧಿಸುತ್ತಿರುವ ಚಿಟ್ಟೆಗಳನ್ನು ನೋಡಬಹುದು"
 
-msgid "Proxy Options"
-msgstr "ಪ್ರಾಕ್ಸಿ ಆಯ್ಕೆಗಳು"
-
 msgid "Proxy _type:"
 msgstr "ಪ್ರಾಕ್ಸಿ _ಬಗೆ"
 
@@ -10186,8 +10103,9 @@ msgstr "_ಸರಳ"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_ಮುಂದುವರಿದ"
+#, fuzzy
+msgid "_Proxy"
+msgstr "ಪ್ರಾಕ್ಸಿ "
 
 msgid "Enabled"
 msgstr "ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
@@ -10226,16 +10144,17 @@ msgid "Please update the necessary fields."
 msgstr "ದಯವಿಟ್ಟು ಎಲ್ಲ ಖಡ್ಡಾಯ ವಿವರಗಳನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ"
 
 #, fuzzy
-msgid "Room _List"
-msgstr "ಕೋಣೆಗಳ ಪಟ್ಟಿ"
+msgid "A_ccount"
+msgstr "ಖಾತೆ:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "ನೀವು ಸೇರಬಯಸುವ ಮಾತುಕತೆ ಕುರಿತು ಮಾಹಿತಿ ಕೊಡಿ.\n"
 
-msgid "_Account:"
-msgstr "_ಖಾತೆ:"
+#, fuzzy
+msgid "Room _List"
+msgstr "ಕೋಣೆಗಳ ಪಟ್ಟಿ"
 
 msgid "_Block"
 msgstr "ನಿಷೇಧಿಸಿ(B)"
@@ -10254,6 +10173,17 @@ msgid "I_M"
 msgstr "_ತ್ವರಿತ ಸಂದೇಶ"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "ಮಾತುಕತೆ ಸೇರಿಸಿ (A)"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "ವೀಡಿಯೋ ಕ್ಯಾಮೆರಾ"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "_ಕಡತವನ್ನು ಕಳುಹಿಸಿ"
 
@@ -10265,7 +10195,11 @@ msgid "View _Log"
 msgstr "ಲಾಗ್ ಅನ್ನು ನೋಡಿ(L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "ಗೆಳೆಯನು ಆಫ್ಲೈನ್ ಆಗಿದ್ದಾನೆ"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "ಗೆಳೆಯನು ಆಫ್ಲೈನ್ ಆಗಿದ್ದಾನೆ"
 
 msgid "_Alias..."
@@ -10405,6 +10339,10 @@ msgstr "/ಸಾಧನಗಳು/ಗೆಳೆಯರ _ಪ್ರವೇಶ ತಿಳ�
 msgid "/Tools/_Certificates"
 msgstr "/ಸಾಧನಗಳು/ಇಚ್ಛೆಗಳು"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/ಸಾಧನಗಳು/ಖಾಸಗಿ ಮಾಹಿತಿ"
+
 msgid "/Tools/Plu_gins"
 msgstr "/ಸಾಧನಗಳು/ಪ್ಲಗ್ಗಿನ್ನುಗಳು"
 
@@ -10414,10 +10352,6 @@ msgstr "/ಸಾಧನಗಳು/ಇಚ್ಛೆಗಳು"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ಸಾಧನಗಳು/_ಖಾಸಗಿಮಾಹಿತಿ"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/ಸಾಧನಗಳು/ಖಾಸಗಿ ಮಾಹಿತಿ"
-
 msgid "/Tools/_File Transfers"
 msgstr "/ಸಾಧನಗಳು/_ಕಡತ ವರ್ಗಾವಣೆಗಳು"
 
@@ -10542,8 +10476,8 @@ msgstr "ಕೈಯಾರೆ "
 msgid "By status"
 msgstr "ಸ್ಥಿತಿವಾರು"
 
-msgid "By log size"
-msgstr "ಲಾಗ್ ಗಾತ್ರವಾರು"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10561,6 +10495,9 @@ msgstr "ಕನೆಕ್ಟ್ ಆಗಿ"
 msgid "Re-enable"
 msgstr "ಖಾತೆಯನ್ನು ಪುನ: ಸಕ್ರಿಯಗೊಳಿಸಿ"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10652,6 +10589,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "ಅಲಿಯಾಸ್:"
 
+msgid "_Group:"
+msgstr "ಗುಂಪು(G)"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10685,6 +10625,116 @@ msgstr "/ಸಾಧನಗಳು"
 msgid "/Buddies/Sort Buddies"
 msgstr "/ಗೆಳೆಯರು/ಗೆಳೆಯರನ್ನು ವಿಂಗಡಿಸಿ"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣ"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "%d ರನ್ನು ನೀವು ಸ್ನೇಹಿತರಪಟ್ಟಿಗೆ ಸೇರಿಸಿದ್ದೀರಿ"
+
+#, fuzzy
+msgid "Layout"
+msgstr "ಮಾತುಕತೆಗಳನ್ನು ದಾಖಲಿಸಿ "
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣ"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_ವಿಸ್ತರಿಸಿ"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_ಕುಗ್ಗಿಸಿ"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "ಪೋರ್ಟ್"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "ಆನ್‍ಲೈನ್"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "ಆಚೆ"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "ಆಫ್‍ಲೈನ್"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "ರಕ್ತದ ಗುಂಪು"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "ಸಂದೇಶ ಕಳಿಸಲಾಗಿದೆ"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ಬಳಕೆದಾರ ಮಾಹಿತಿ ಬದಲಾಯಿಸಿ"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -10704,14 +10754,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "ಗೆಳೆಯನನ್ನು ಮಾತುಕತೆಕೋಣೆಗೆ ಆಮಂತ್ರಿಸಿ"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"ನೀವು ಆಮಂತ್ರಿಸಬಯಸುವ ಬಳಕೆದಾರನ ಹೆಸರು ಬರೆಯಿರಿ (ಬೇಕೆಂದರೆ ನೀವು ಬಯಸುವ ಆಮಂತ್ರಣ "
-"ಸಂದೇಶದೊಂದಿಗೆ)"
-
 msgid "_Buddy:"
 msgstr "_ಗೆಳೆಯ"
 
@@ -10740,7 +10782,8 @@ msgstr "ನಿರ್ಲಕ್ಷಿಸಿ"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "ಕೊನೆಯಾಗಿ ಹೇಳಿದ್ದು"
 
 msgid "Unable to save icon file to disk."
@@ -10788,6 +10831,22 @@ msgstr "/ಮಾತುಕತೆ/ಉಳಿಸಿ ಈ ಹೆಸರಿನಲ್ಲ�
 msgid "/Conversation/Clea_r Scrollback"
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/ಮಾತುಕತೆ/_ಇನ್ನಷ್ಟು"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/ಮಾತುಕತೆ/_ಇನ್ನಷ್ಟು"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/ಮಾತುಕತೆ/_ಇನ್ನಷ್ಟು"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/ಮಾತುಕತೆ/ಲಾಗ್ _ನೋಡಿ"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/ಮಾತುಕತೆ/ಕಡತ _ಕಳಿಸಿ"
 
@@ -10862,6 +10921,18 @@ msgstr "/ಮಾತುಕತೆ"
 msgid "/Conversation/View Log"
 msgstr "/ಮಾತುಕತೆ/ಲಾಗ್ ನೋಡಿ"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/ಮಾತುಕತೆ/ಇನ್ನಷ್ಟು"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/ಮಾತುಕತೆ/ಲಾಗ್ ನೋಡಿ"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/ಮಾತುಕತೆ/ಇನ್ನಷ್ಟು"
+
 msgid "/Conversation/Send File..."
 msgstr "/ಮಾತುಕತೆ/ಕಡತ ಕಳಿಸಿ..."
 
@@ -11051,6 +11122,9 @@ msgstr "ವಿಳಾಸ"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "ಬೆಂಬಲ"
 
@@ -11180,6 +11254,10 @@ msgid "Hungarian"
 msgstr "ಹಂಗೇರಿಯನ್"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "ರೋಮೇನಿಯನ್"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "ಮ್ಯಾಕೆಡೊನಿಯನ್"
 
@@ -11197,6 +11275,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "ಹಾಲೀ ಅನುವಾದಕರು"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "ಇತರ"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "ನಿಷೇಧಿಸಲಾಗಿದೆ"
 
@@ -11219,6 +11301,10 @@ msgid "Macedonian"
 msgstr "ಮ್ಯಾಕೆಡೊನಿಯನ್"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "ಮ್ಯಾಕೆಡೊನಿಯನ್"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "ನಾರ್ವೇಜಿಯನ್"
 
@@ -11276,6 +11362,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "ಸ್ವೀಡಿಶ್"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "ತಮಿಳು"
 
@@ -11327,7 +11416,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 
 msgid "Current Developers"
@@ -11588,7 +11694,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr "ಕೊಂಡಿಯ ಬಣ್ಣ"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11626,15 +11732,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "ಸೂಚನೆ ತೆಗೆದುಹಾಕುವಿಕೆ"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11647,15 +11760,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
 
-msgid "_Copy Email Address"
-msgstr "_ಇ-ಮೇಯ್ಲ್ ವಿಳಾಸವನ್ನು ನಕಲು ಮಾಡಿ"
-
-msgid "_Open Link in Browser"
-msgstr ""
-
-msgid "_Copy Link Location"
-msgstr ""
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11691,11 +11795,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_ಚಿತ್ರ ಉಳಿಸಿ..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11783,10 +11885,6 @@ msgid "Font Face"
 msgstr ""
 
 #, fuzzy
-msgid "Background Color"
-msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣ"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "ಮುನ್ನೆಲೆ ಅಕ್ಷರಶೈಲಿ ಬಣ್ಣ"
 
@@ -11913,6 +12011,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11930,6 +12029,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11961,11 +12061,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "ಪ್ಲಗಿನ್‍ಗಳು"
 
-msgid "Open All Messages"
-msgstr "ಎಲ್ಲ ಸಂದೇಶಗಳನ್ನು ತೆರೆಯಿರಿ"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">ನಿಮಗೆ ಸಂದೇಶ ಬಂದಿದೆ!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "ಲೆಖ್ಕಹಾಕುತ್ತಿದೆ"
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -11994,6 +12110,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "ಗೊತ್ತಿಲ್ಲದ ಸಂದೇಶ"
+
+msgid "Open All Messages"
+msgstr "ಎಲ್ಲ ಸಂದೇಶಗಳನ್ನು ತೆರೆಯಿರಿ"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">ನಿಮಗೆ ಸಂದೇಶ ಬಂದಿದೆ!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "ಹೊಸ ಗೆಳೆಯನ-ಮೇಲೆ-ಎರಗಪ್ಪ"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">ನಿಮಗೆ ಸಂದೇಶ ಬಂದಿದೆ!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "ಕೆಳಕಂಡ ಪ್ಲಗ್ಗಿನ್‍ಗಳನ್ನು  ತೆಗೆದುಹಾಕಿ"
 
@@ -12043,10 +12180,17 @@ msgstr "<b>ಪ್ಲಗ್ಗಿನ್ ವಿವರಗಳು</b>"
 msgid "Select a file"
 msgstr "ಒಂದು ಕಡತವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "ಬಡ್ಡಿ ಪೌನ್ಸ್ ತಿದ್ದಿ"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "ಯಾರ ಮೇಲೆ ನಿಗಾ ಇಡಬೇಕು"
 
+msgid "_Account:"
+msgstr "_ಖಾತೆ:"
+
 msgid "_Buddy name:"
 msgstr "_ಗೆಳೆಯನ ಹೆಸರು:"
 
@@ -12113,7 +12257,58 @@ msgstr "ಪುನರಾವರ್ತಿಸುವ (R)"
 msgid "Pounce Target"
 msgstr "ಗುರಿಯ ಮೇಲೆರಗಿ"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "ಟೈಪಿಸಲು ಆರಂಭಿಸಿದಾಗ(t)"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "ಟೈಪಿಸುತ್ತಿರುವಾಗ ತಡೆದಾಗ(a)"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "ಒಳಬಂದಾಗ(g)"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "ನಿಶ್ಚಲರಾಗಿದ್ದ  %s  ಮರಳಿದ್ದಾರೆ (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "ಈಚೆಬಂದಾಗ(u)"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "ಬರೆಯುವುದನ್ನು ನಿಲ್ಲಿಸಿದ್ದಾರೆ"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "ಹೊರಹೋದಾಗ(f)"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "ನಿಶ್ಚಲನಾದಾಗ(I)"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "ಆಚೆ ಹೋಗಿರುವಾಗ"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "ಒಂದು ಸಂದೇಶ ಕಳಿಸಿ(m)"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "ಗುರುತುಹಿಡಿಯಲಾಗದ ಪೌನ್ಸ್ ಈವೆಂಟ್; ಇದನ್ನು ವರದಿ ಮಾಡಿ!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "ಸಂದೇಶವು ಬಹಳ ದೊಡ್ಡದು."
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12134,6 +12329,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "%s ಜತೆ ಮಾತುಕತೆ "
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "ಸ್ನೇಹಿತರ ಪಟ್ಟಿ"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr ""
 
@@ -12145,7 +12346,7 @@ msgid "On unread messages"
 msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr " %s ದಲ್ಲಿ ಮಾತುಕತೆ"
 
 #, fuzzy
@@ -12155,6 +12356,10 @@ msgstr "ಹೊಸ ಮಾತುಕತೆಗಳು(e):"
 msgid "When away"
 msgstr "ಆಚೆ ಹೋಗಿರುವಾಗ"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "ಪ್ರತಿ ಕಿಟಕಿಗೆ ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆ"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12215,10 +12420,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "ತಕ್ಷಣ ಸಂದೇಶಗಳು ಬಂದಾಗ ಕಿಟಕಿಯನ್ನು ಮಿಂಚಿಸಿ(F)"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "ಪ್ರತಿ ಕಿಟಕಿಗೆ ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆ"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12251,13 +12452,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "ಬಳಕೆದಾರನ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
-msgid "ST_UN server:"
-msgstr ""
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -12278,6 +12477,10 @@ msgstr "ಆರಂಭ ಪೋರ್ಟ್(S):"
 msgid "_End port:"
 msgstr "ಅಂತ್ಯದ ಪೋರ್ಟ್(E):"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "ಪ್ರಾಕ್ಸಿ ದೋಷ"
@@ -12307,6 +12510,10 @@ msgstr "ಪ್ರಾಕ್ಸಿ ದೋಷ"
 msgid "No proxy"
 msgstr "ಪ್ರಾಕ್ಸಿ ಇಲ್ಲ"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "ಬಳಕೆದಾರ(U)"
 
@@ -12469,12 +12676,12 @@ msgstr ""
 msgid "Auto-away"
 msgstr "ಆಟೋಮ್ಯಾಟಿಕ್ಕಾಗಿ-ಆಚೆ"
 
-msgid "Change status when _idle"
-msgstr "ಉಪಯೋಸುತ್ತಿಲ್ಲದಾಗ ಸ್ಟೇಟಸ್ ಬದಲಾಯಿಸಿ"
-
 msgid "_Minutes before becoming idle:"
 msgstr ""
 
+msgid "Change status when _idle"
+msgstr "ಉಪಯೋಸುತ್ತಿಲ್ಲದಾಗ ಸ್ಟೇಟಸ್ ಬದಲಾಯಿಸಿ"
+
 msgid "Change _status to:"
 msgstr "ಸ್ಥಿತಿಯನ್ನು ಹೀಗೆ ಬದಲಿಸಿ(s):"
 
@@ -12626,29 +12833,19 @@ msgstr "ಉಳಿಸಿ ಹಾಗೂ ಬಳಸಿ"
 msgid "Status for %s"
 msgstr "%s ನ ಸ್ಥಿತಿ"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "ಸ್ಮೈಲಿ ಸೇರಿಸಿ"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "ಡೂಪ್ಲಿಕೇಟ್ ತಿದ್ದುಪಡಿ"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "%sಗಾಗಿ ಹೊಸ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "ಸ್ಮೈಲಿ ಸೇರಿಸಿ"
@@ -12658,21 +12855,30 @@ msgid "Add Smiley"
 msgstr "ಮುಗುಳ್ನಗಿ!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "ಪೋರ್ಟ್"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "ಮುಗುಳ್ನಗಿ!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "ಪೋರ್ಟ್"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "ಗೆಳೆಯನನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "ಈ ಗೆಳೆಯ ಚಿನ್ಹೆಯನ್ನು ಈ ಖಾತೆಗೆ ಬಳಸಿ"
 
@@ -12755,8 +12961,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -12787,6 +12993,16 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_ಕೊಂಡಿಯನ್ನು ಇದರಲ್ಲಿ ತೆರೆಯಿರಿ ->"
+
+msgid "_Copy Link Location"
+msgstr ""
+
+msgid "_Copy Email Address"
+msgstr "_ಇ-ಮೇಯ್ಲ್ ವಿಳಾಸವನ್ನು ನಕಲು ಮಾಡಿ"
+
 msgid "Save File"
 msgstr "ಕಡತ ಉಳಿಸಿ"
 
@@ -12883,6 +13099,76 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "ಸರ್ವರ್ ವಿಳಾಸ"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "ಕೋರಿಕೆಯನ್ನು ಇಲ್ಲಿ ಸಲ್ಲಿಸಿ"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+#, fuzzy
+msgid "Find Services"
+msgstr "ಆನ್‍ಲೈನ್ ಸೇವೆಗಳು"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಕಳಿಸಿ"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "ಆಚೆ ಹೋದಾಗ(w)"
+
+#, fuzzy
+msgid "Directory"
+msgstr "ಲಾಗ್ ಕಡತಕೋಶ"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "ಸದ್ದಿನ ಆಯ್ಕೆ"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>ವಿವರ:</b> ಹೆದರಿ ನಡುಗುತ್ತ"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "ಬಳಕೆದಾರ ಮಾಹಿತಿ  ಬರೆಯಿರಿ"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_ಜಾಲವೀಕ್ಷಕ:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "ಬಲಕೆದಾರರು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "ಬಳಕೆದಾರ ಮಾಹಿತಿ  ಬರೆಯಿರಿ"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -13265,7 +13551,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13374,12 +13660,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr "ಜಾಲಕೊಂಡಿಯ ಬಣ್ಣ"
 
@@ -13391,6 +13671,10 @@ msgstr "ಜಾಲಕೊಂಡಿಯ ಬಣ್ಣ"
 msgid "Highlighted Message Name Color"
 msgstr "ತಾಳೆಯಾದ ಅಂಶಗಳನ್ನು ಎತ್ತಿತೋರಿಸಿ"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "ಸೂಚನೆ ತೆಗೆದುಹಾಕುವಿಕೆ"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13420,35 +13704,23 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr ""
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "ಮರೆಯಾಗಿಸಿ"
+
 msgid "Fonts"
 msgstr "ಅಕ್ಷರಶೈಲಿಗಳು"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "ಗೈಮ್ ಕಡತ  ನಿಯಂತ್ರಣ"
@@ -13536,7 +13808,7 @@ msgstr " %s ದಲ್ಲಿ ಮಾತುಕತೆ"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13588,6 +13860,111 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "ಲಾಗಿನ್ ಮಾಡಿಲ್ಲ"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "ಲಾಗಿನ್ ಮಾಡಿಲ್ಲ"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "ಮಾತುಕತೆಗೆ ಸೇರಿಕೊಳ್ಳಿ"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "ನಿರ್ಲಕ್ಷಿಸಿ"
+
+#, fuzzy
+msgid "Founder"
+msgstr "ಹೆಚ್ಚು ಜೋರಾಗಿ"
+
+#, fuzzy
+msgid "Operator"
+msgstr "ಒಪೆರಾ"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "ಅಧಿಕಾರ ಕೊಟ್ಟಿದೆ"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "ದೋಷ"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "ಕೆಲಸದ ಮಾಹಿತಿ"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "ಸಂವಾದ ಕೋರಿರಿ"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "ಉಳಿದಿರುವ(ದು/ವು)"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ನ ಸ್ಥಿತಿ"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "ಮಾತುಕತೆಕೋಣೆಗಳ ಪಟ್ಟಿಯ  URL"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "ಲಾಂಛನವನ್ನು ಉಳಿಸಿ"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "ಖಾತೆಯ ಮಾಹಿತಿ"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "ಸ್ನೇಹಿತರ ಪಟ್ಟಿ"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "ಸ್ನೇಹಿತರ ಪಟ್ಟಿ"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "ಗೈಮ್ ಬಳಕೆದಾರ"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13745,9 +14122,6 @@ msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯ ಕಿಟಕಿ ಮೇಲಿರಲ
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr "ಮಾತುಕತೆಸಂದೇಶಗಳು ಬಂದಾಗ ಕಿಟಕಿಯನ್ನು ಮಿಂಚಿಸಿ(F)"
-
 #, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "ಪ್ರವೇಶದ ಆಯ್ಕೆಗಳು"
@@ -13756,9 +14130,10 @@ msgstr "ಪ್ರವೇಶದ ಆಯ್ಕೆಗಳು"
 msgid "Options specific to Pidgin for Windows."
 msgstr "ವಿಂಡೋಸ್ ಗೈಮ್ ಗೆ ವಿಶಿಷ್ಟವಾದ ಆಯ್ಕೆಗಳು"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "ವಿಂಡೋಸ್ ಗೈಮ್ ಗೆ ವಿಶಿಷ್ಟವಾದ ಆಯ್ಕೆಗಳು"
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -13799,6 +14174,326 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Connection failed."
+#~ msgstr "ಸಂಪರ್ಕ ವಿಫಲವಾಗಿದೆ."
+
+#~ msgid "Read error"
+#~ msgstr "ಓದುವಲ್ಲಿ ದೋಷ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+
+#~ msgid "Write error"
+#~ msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "ಬಳಕೆದಾರ ಮಾಹಿತಿ  ಬರೆಯಿರಿ"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "ವಿಸ್ತೃತ ವಿಳಾಸ"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "ಅಲಿಯಾಸ್ ಮಾತುಕತೆ"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "ಬಳಕೆದಾರನಿಗೆ ಕಡತಕೋಶದ ಮಾಹಿತಿಯಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "ಆದೇಶ"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "ಹೆಚ್.ಟಿ.ಎಮ್.ಎಲ್/ಅತಿ ಪಠ್ಯ"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "ನೋಂದಣಿ ದೋಷ"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "ಸ್ಥಳ"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "ಬಳಕೆದಾರರ ಹುಡುಕುವಿಕೆ"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "ಗೆಳೆಯನ ಸ್ಥಿತಿ ಸೂಚನೆ"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "ಮಾತುಕತೆಯನ್ನು ಉಳಿಸಿ"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "ಬಳಕೆದಾರ ಮಿತಿ"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "MSN ವ್ಯಕ್ತಿಪರಿಚಯ"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "ಸೇರಿಕೊಳ್ಳಿ"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "ಸಂದೇಶ ಸಿಕ್ಕಿದೆ"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "ಬಳಕೆದಾರ ಆಯ್ಕೆಗಳು"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "ಬಳಕೆದಾರ ಮಿತಿ"
+
+#~ msgid "Read Error"
+#~ msgstr "ಓದುವಲ್ಲಿ ದೋಷ"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "ಸರತಿಯಸಾಲು ಭರತಿಯಾಗಿದೆ"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ :%s"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "ಲಾಗಿನ್ ವಿಫಲ(%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
+
+#~ msgid "Incorrect password."
+#~ msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "ವರ್ಗಾವಣೆಗಾಗಿ ಸಂಪರ್ಕಿಸಲು ಅಗಲಿಲ್ಲ"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "ಸಂಪರ್ಕ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "ತಪ್ಪು ಹೆಸರು"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "ಸಂಪರ್ಕ ಕಳೆದಿದೆ"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "ಆತಿಥೇಯಗಣಕ ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
+
+#~ msgid "Could not write"
+#~ msgstr "ಬರೆಯಲಾಗಲಿಲ್ಲ"
+
+#~ msgid "Could not connect"
+#~ msgstr "ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "ಯಾಹೂ ಜಪಾನ್"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "%sಗಾಗಿ ಹೊಸ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "ಸಂದೇಶದಲ್ಲಿ ಸೇರಿಸಿ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "ನೀವು ಆಮಂತ್ರಿಸಬಯಸುವ ಬಳಕೆದಾರನ ಹೆಸರು ಬರೆಯಿರಿ (ಬೇಕೆಂದರೆ ನೀವು ಬಯಸುವ ಆಮಂತ್ರಣ "
+#~ "ಸಂದೇಶದೊಂದಿಗೆ)"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "ಸ್ನೇಹಿತರನ್ನು ಸೇರಿಸಿ"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "ಓದುವಲ್ಲಿ ದೋಷ "
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "ಹೆಸರು ಪಡೆಯಲು ವಿಫಲ: %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s ಗೆ ಸಂಪರ್ಕ ವಿಫಲ"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "%s ಕಡತ ಬರೆಯಲು ಆಗಲಿಲ್ಲ"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "%s ಕಡತ ಓದಲು ಆಗಲಿಲ್ಲ"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "ಸಂದೇಶ ಬಹಳ ಉದ್ದ . ಕೊನೆಯ %s ಬೈಟ್‍ಗಳನ್ನು ಕತ್ತರಿಸಿದೆ"
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s ಎಚ್ಚರಿಕೆಗೆ ಅನುಮತಿಯಿಲ್ಲ"
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%s ನಲ್ಲಿ ಮಾತುಕತೆ ಲಭ್ಯವಿಲ್ಲ"
+
+#~ msgid "Failure."
+#~ msgstr "ವಿಫಲ."
+
+#~ msgid "User has no directory information."
+#~ msgstr "ಬಳಕೆದಾರನಿಗೆ ಕಡತಕೋಶದ ಮಾಹಿತಿಯಿಲ್ಲ"
+
+#~ msgid "Country not supported."
+#~ msgstr "ಈ ದೇಶ  ಬೆಂಬಲಿತವಲ್ಲ"
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "ಗೊತ್ತಿಲ್ಲದ ಸೋಲು: %s"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "ಸೇವೆಯು ತಾತ್ಪೂರ್ತಿಕವಾಗಿ ಲಭ್ಯವಿಲ್ಲ"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ, %d,  ಸಂಭವಿಸಿದೆ.  ಮಾಹಿತಿ : %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "ಗುಂಪಿನ ಹೆಸರು ತಪ್ಪಾಗಿದೆ "
+
+#~ msgid "Connection Closed"
+#~ msgstr "ಸಂಪರ್ಕ ಮುಚ್ಚಿದೆ"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "ಉತ್ತರ ಪಡೆಯಲು ವಿಫಲ..."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "ಪ್ರವೇಶಪದ ಬದಲಾವಣೆ ಯಶಸ್ವಿ"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "ಬರೆಯುವದಕ್ಕಾಗಿ  %s ತೆರೆಯಲು ಆಗಲಿಲ್ಲ"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ ; ಬಹುಶ: ಆಚೆಯವರು ರದ್ದು ಮಾಡಿದರು"
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "ವರ್ಗಾವಣೆಗಾಗಿ ಸಂಪರ್ಕಿಸಲು ಅಗಲಿಲ್ಲ"
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "ಕಡತದ ಶಿರೋಭಾಗವನ್ನು ಬರೆಯಲು ಆಗಲಿಲ್ಲ ; ಕಡತದ  ವರ್ಗಾವಣೆ ಆಗುವದಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "ಲಾಂಛನವನ್ನು ಈ ಹೆಸರಿನಲ್ಲಿ ಉಳಿಸಿ..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] ""
+#~ "%s ರವರು  %s ರನ್ನು    %d ಕದತವನ್ನು ಸ್ವೀಕರಿಸುವಂತೆ ಕೋರುತ್ತಾರೆ : %s (%.2f %s)%s%s"
+#~ msgstr[1] ""
+#~ "%s ರು  %sರನ್ನು   %d files ಕದತಗಳನ್ನು ಸ್ವೀಕರಿಸುವಂತೆ ಕೋರುತ್ತಾರೆ : %s (%.2f %s)%s%"
+#~ "s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s ಕಡತವೊಂದನ್ನು ಕಳಿಸಲು ನಿಮ್ಮನ್ನು ಕೋರಿದ್ದಾರೆ"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%s ಬಳಕೆದಾರರ ಮಹಿತಿ ಲಭ್ಯವಿಲ್ಲ"
+
+#~ msgid "%s Options"
+#~ msgstr "%s ಆಯ್ಕೆಗಳು"
+
+#~ msgid "Proxy Options"
+#~ msgstr "ಪ್ರಾಕ್ಸಿ ಆಯ್ಕೆಗಳು"
+
+#~ msgid "By log size"
+#~ msgstr "ಲಾಗ್ ಗಾತ್ರವಾರು"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "ಮಾತುಕತೆಸಂದೇಶಗಳು ಬಂದಾಗ ಕಿಟಕಿಯನ್ನು ಮಿಂಚಿಸಿ(F)"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "ಈ ಹೆಸರಿನ ಗುಂಪು ಈಗಾಗಲೇ ಉಂಟು"
 
@@ -13888,13 +14583,6 @@ msgstr ""
 #~ msgid "Change Qun information"
 #~ msgstr "ವಾಹಿನಿಯ ಮಾಹಿತಿ"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "ಗಣಕವ್ಯವಸ್ಥೆಯ ಸಂದೇಶ"
 
@@ -13914,10 +14602,6 @@ msgstr ""
 #~ msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸುವಲ್ಲಿ ದೋಷ"
 
 #, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
-
-#, fuzzy
 #~ msgid "Connecting server %s, retries %d"
 #~ msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕಿಸಿ"
 
@@ -14050,10 +14734,6 @@ msgstr ""
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr " %d ಗುಂಪನ್ನು ಸೇರುವ ನಿಮ್ಮ ಕೋರಿಕೆಯನ್ನು  %d ಆಡಳಿತಗಾರರು ಅನುಮೋದಿಸಿದ್ದಾರೆ."
 
-#, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "%d ರನ್ನು ನೀವು ಸ್ನೇಹಿತರಪಟ್ಟಿಗೆ ಸೇರಿಸಿದ್ದೀರಿ"
-
 #~ msgid "I am applying to join"
 #~ msgstr "ನಾನು ಸೇರಲು ಕೋರುತ್ತಿದ್ದೇನೆ."
 
@@ -14068,10 +14748,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "ನಿಮ್ಮ ಕಾರಣವನ್ನು ಬರೆಯಿರಿ:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "ಲಾಗಿನ್ ಮಾಡಲಾಗಲಿಲ್ಲ , ದೋಷನಿವಾರಣೆಯ ಲಾಗ್ ನೋಡಿರಿ"
 
@@ -14154,17 +14830,9 @@ msgstr ""
 #~ msgstr "ಈಗಿನ ಪ್ರವೇಶಪದ"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_ಸಂದೇಶ:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "ಖಾತೆ:"
-
 #~ msgid ""
 #~ "\n"
 #~ "Idle: %s"
@@ -14221,13 +14889,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>ವಿವರ:</b> ಹೆದರಿ ನಡುಗುತ್ತ"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -14326,9 +14987,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>ಸಂದೇಶ:</b> %s"
 
-#~ msgid "Pidgin User"
-#~ msgstr "ಗೈಮ್ ಬಳಕೆದಾರ"
-
 #~ msgid "<b>%s:</b> %s"
 #~ msgstr "<b>%s:</b> %s"
 
diff --git a/po/ko.po b/po/ko.po
index 32df2883ce..48ca9a4b4e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-10-01 16:15+0900\n"
 "Last-Translator: sushizang <sushizang@empal.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
@@ -31,13 +31,13 @@ msgstr "프랑스어"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s 상세 정보는 `%s -h' 를 입력해 주십시오.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -623,20 +623,6 @@ msgid "Send To"
 msgstr "받을 사람(_S)"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "메시지 안에 삽입"
-
-msgid "Invite"
-msgstr "초대"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"초대하고자 하는 상대의 이름과 초대 메시지(선택 사항)을 입력해 주십시오."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "대화 창"
 
@@ -899,6 +885,42 @@ msgstr "대화 창"
 msgid "System Log"
 msgstr "시스템 로그"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "계산 중..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "허가(_A)"
+
+msgid "Reject"
+msgstr "거부"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "채널 %s%s (으)로부터 이탈했습니다."
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "이메일"
 
@@ -933,6 +955,9 @@ msgstr "계속"
 msgid "IM"
 msgstr "인스턴트 메시지"
 
+msgid "Invite"
+msgstr "초대"
+
 msgid "(none)"
 msgstr "(없음)"
 
@@ -1157,7 +1182,6 @@ msgstr "%s 님이 자리 비움 상태로 되었습니다. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 님이 나에게 메시지를 보냈습니다. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "알 수 없는 \"알림\" 이벤트입니다. 꼭 보고해 주십시오!"
 
@@ -1208,7 +1232,6 @@ msgstr "상태를 변경할 때까지의 시간(분)(_M):"
 msgid "Change status to"
 msgstr "다음 상태로 변경(_S):"
 
-#. Conversations
 msgid "Conversations"
 msgstr "대화 창"
 
@@ -1542,7 +1565,6 @@ msgid ""
 msgstr ""
 "새로운 대화가 시작되면 이전 대화의 맨 마지막 메시지를 앞 부분에 추가합니다."
 
-#, c-format
 msgid "Online"
 msgstr "온라인"
 
@@ -1592,6 +1614,28 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Lastlog 플러그인입니다."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "계정"
 
@@ -1693,14 +1737,6 @@ msgstr "%s 인증"
 msgid "SSL Certificate Verification"
 msgstr "SSL 호스트 인증"
 
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "허가(_A)"
-
-msgid "Reject"
-msgstr "거부"
-
 #, fuzzy
 msgid "_View Certificate..."
 msgstr "인증"
@@ -1792,6 +1828,8 @@ msgstr "+++ %s 님이 접속했습니다."
 msgid "+++ %s signed off"
 msgstr "+++ %s 님이 접속을 끊었습니다."
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "알 수 없는 오류"
 
@@ -1838,6 +1876,17 @@ msgstr "%s 님이 대화실을 나갔습니다."
 msgid "%s left the room (%s)."
 msgstr "%s 님이 대화실 (%s) (으)로부터 나갔습니다."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "회의에 초대"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"초대하고자 하는 상대의 이름과 초대 메시지(선택 사항)을 입력해 주십시오."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "새 접속을 열 수 없습니다: %s"
@@ -1972,7 +2021,6 @@ msgstr "%s 을(를) %s (으)로부터 전송을 시작하고 있습니다."
 msgid "Transfer of file %s complete"
 msgstr "파일 %s 의 전송이 완료되었습니다."
 
-#, c-format
 msgid "File transfer complete"
 msgstr "파일 전송이 완료되었습니다."
 
@@ -1980,7 +2028,6 @@ msgstr "파일 전송이 완료되었습니다."
 msgid "You canceled the transfer of %s"
 msgstr "%s 의 전송이 취소되었습니다."
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "파일 전송이 취소되었습니다."
 
@@ -2178,11 +2225,14 @@ msgstr "<font color=\"red\"><b>파일을 읽지 못했습니다: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "접속 생성 중 오류"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s 을(를) 사용하고 있으나, 이 플러그인은 %s 이(가) 필요합니다."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2577,9 +2627,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "다른 메시지 클라이언트의 로그를 로그 뷰어로 표시"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2636,8 +2687,9 @@ msgstr "Offline Message Emulation"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "오프라인 사용자에게 보내지 못한 메시지를 저장합니다."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "보내지 못한 남은 메시지를 저장합니다. \"친구 알림\" 창에서 편집 또는 삭제할 "
@@ -2669,6 +2721,32 @@ msgstr "오프라인 시의 메시지 저장"
 msgid "Do not ask. Always save in pounce."
 msgstr "항상 저장"
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "비밀번호 입력"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2863,11 +2941,12 @@ msgstr ""
 "http://www.activestate.com 에 있는 ActiveTCL 을 설치해 주십시오.\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "수신한 메시지 접속을 확립할 수 없었습니다.\n"
 
 msgid ""
@@ -2876,7 +2955,6 @@ msgstr ""
 "로컬 mDNS 서버를 사용한 접속을 확립할 수 없었습니다. 서버가 올바르게 작동되"
 "고 있습니까?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "이름"
 
@@ -2910,6 +2988,11 @@ msgstr "Bonjour 프로토콜 플러그인"
 msgid "Purple Person"
 msgstr "새 친구"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "시/도"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2920,14 +3003,21 @@ msgstr "%s 님이 대화 계정을 닫았습니다."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "메시지를 보낼 수 없습니다. 대화를 시작할 수 없었습니다."
 
-msgid "Cannot open socket"
-msgstr "소켓을 열 수 없습니다."
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"소켓을 생성할 수 없습니다:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "포트에 소켓을 할당할 수 없었습니다."
 
-msgid "Could not listen on socket"
-msgstr "소켓을 감시할 수 없었습니다."
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"소켓을 생성할 수 없습니다:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -2975,13 +3065,16 @@ msgstr "친구 목록 저장..."
 msgid "Load buddylist from file..."
 msgstr "친구 목록 가져오기..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "등록 정보 항목을 입력해 주십시오."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "비밀번호가 일치하지 않습니다."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "새 계정을 등록할 수 없습니다. 오류가 발생했습니다.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2993,14 +3086,15 @@ msgstr "등록이 성공적으로 완료되었습니다!"
 msgid "Password"
 msgstr "비밀번호"
 
-msgid "Password (retype)"
-msgstr "비밀번호 (재입력)"
+msgid "Password (again)"
+msgstr "비밀번호 (재확인)"
 
-msgid "Enter current token"
-msgstr "현재의 토큰을 입력해 주십시오."
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "현재의 토큰"
+#, fuzzy
+msgid "Captcha"
+msgstr "이미지 저장"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "새로운 Gadu-Gadu 계정 등록"
@@ -3053,6 +3147,15 @@ msgstr "비밀번호를 성공적으로 변경했습니다!"
 msgid "Current password"
 msgstr "현재의 비밀번호"
 
+msgid "Password (retype)"
+msgstr "비밀번호 (재입력)"
+
+msgid "Enter current token"
+msgstr "현재의 토큰을 입력해 주십시오."
+
+msgid "Current token"
+msgstr "현재의 토큰"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "현재 사용하고 있는 비밀번호와 UIN 의 새 비밀번호를 입력해 주십시오:"
 
@@ -3066,13 +3169,13 @@ msgstr "대화 선택: %s"
 msgid "Add to chat..."
 msgstr "대화 추가..."
 
+#. Global
 msgid "Available"
 msgstr "사용 가능"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "자리 비움"
 
@@ -3100,8 +3203,8 @@ msgstr "일치하는 사용자를 찾지 못했습니다."
 msgid "There are no users matching your search criteria."
 msgstr "검색 조건에 일치하는 사용자가 존재하지 않았습니다."
 
-msgid "Unable to read socket"
-msgstr "소켓을 읽을 수 없습니다."
+msgid "Unable to read from socket"
+msgstr "소켓으로부터 읽을 수 없습니다."
 
 msgid "Buddy list downloaded"
 msgstr "친구 목록을 다운로드 했습니다."
@@ -3115,8 +3218,14 @@ msgstr "친구 목록을 업로드 했습니다."
 msgid "Your buddy list was stored on the server."
 msgstr "친구 목록을 서버에 업로드 했습니다."
 
-msgid "Connection failed."
-msgstr "접속에 실패했습니다."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "접속되었습니다."
+
+msgid "Connection failed"
+msgstr "접속 실패"
 
 msgid "Add to chat"
 msgstr "대화에 추가"
@@ -3124,13 +3233,23 @@ msgstr "대화에 추가"
 msgid "Chat _name:"
 msgstr "대화명(_N):"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "서버에 접속할 수 없습니다."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "접속 중입니다."
+
 msgid "Chat error"
 msgstr "대화 오류"
 
 msgid "This chat name is already in use"
 msgstr "이 대화명은 이미 사용 중입니다."
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "서버에 접속되어 있지 않습니다."
 
 msgid "Find buddies..."
@@ -3172,6 +3291,10 @@ msgstr "폴란드에서 인기있는 메신저입니다."
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 사용자"
 
+#, fuzzy
+msgid "GG server"
+msgstr "사용자 정보 설정..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "알 수 없는 명령: %s"
@@ -3186,7 +3309,8 @@ msgstr "주제가 설정되어 있지 않습니다."
 msgid "File Transfer Failed"
 msgstr "파일 전송이 실패했습니다."
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "감시 포트를 열 수 없었습니다."
 
 msgid "Error displaying MOTD"
@@ -3202,8 +3326,18 @@ msgstr "이 접속에 관련있는 MOTD 가 없습니다."
 msgid "MOTD for %s"
 msgstr "%s 의 MOTD"
 
-msgid "Server has disconnected"
-msgstr "서버가 접속을 끊었습니다."
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"서버와의 접속에 실패했습니다:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTD 보기"
@@ -3214,25 +3348,25 @@ msgstr "채널(_C):"
 msgid "_Password:"
 msgstr "비밀번호(_P):"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC 별명에 공백이 포함되어 있을 지도 모릅니다."
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "접속 중입니다."
-
 msgid "SSL support unavailable"
 msgstr "SSL 지원은 사용할 수 없습니다."
 
-msgid "Couldn't create socket"
-msgstr "소켓을 생성하지 못했습니다."
+msgid "Unable to connect"
+msgstr "접속할 수 없습니다."
 
-msgid "Couldn't connect to host"
-msgstr "호스트에 접속하지 못했습니다."
+# msgstr[1] "%d 분"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s (으)로 접속할 수 없습니다."
 
-msgid "Read error"
-msgstr "읽기 오류입니다."
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "서버가 접속을 닫았습니다."
 
 msgid "Users"
 msgstr "사용자 수"
@@ -3414,6 +3548,17 @@ msgstr ""
 "지정한 계정명이 서버로부터 거부되었습니다. 잘못된 문자가 포함되어 있을 수 있"
 "습니다."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "이 대화명은 이미 사용 중입니다."
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "별명"
+
 msgid "Cannot change nick"
 msgstr "별명을 변경할 수 없습니다."
 
@@ -3652,13 +3797,14 @@ msgstr "명령을 사용할 수 없습니다."
 msgid "execute"
 msgstr "예상치 못한 데이터"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니"
 "다."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니"
 "다."
@@ -3677,18 +3823,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "문자열 인증"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "인증에 실패했습니다."
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "서버로부터의 응답이 잘못되었습니다."
 
 msgid "Server does not use any supported authentication method"
 msgstr "서버는 지원하고 있는 인증 방식을 이용하지 않습니다."
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "서버로부터의 잘못된 challenge 입니다."
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL 오류"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "이유를 알 수 없습니다."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "지원되지 않는 버전"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"서버와의 접속을 확립하지 못했습니다:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"서버와의 접속을 확립하지 못했습니다:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "새로운 접속을 열 수 없습니다."
+
 msgid "Full Name"
 msgstr "전체 이름"
 
@@ -3754,187 +3936,9 @@ msgstr "클라이언트"
 msgid "Operating System"
 msgstr "운영 체제"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "폴더 정보 설정"
-
-msgid "Service Discovery Items"
-msgstr ""
-
 #, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "주소2"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "대화 별칭"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "디렉토리 정보가 없습니다."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "명령 지정"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML 형식"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "등록 오류"
-
-#, fuzzy
-msgid "User Location"
-msgstr "위치"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "사용자 검색"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Buddy State Notification"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "지원되지 않는 버전"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "방향"
-
-msgid "File Transfer"
-msgstr "파일 전송"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "사용자 모드"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "사용자 제한"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "기능"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "사용자명"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "키 교환 첨부 IM"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "이메일 주소"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "프로파일"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "참가"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "사용자명"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "라이브 영상"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "메시지를 받았습니다."
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "공개 키 Babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "사용자 설정"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "사용자 모드"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "사용자명"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "사용자 제한"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian 암호화"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "기능"
+msgid "Local Time"
+msgstr "로컬 파일:"
 
 msgid "Priority"
 msgstr "우선 순위"
@@ -3942,6 +3946,14 @@ msgstr "우선 순위"
 msgid "Resource"
 msgstr "자원"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "접속 시간"
+
 msgid "Middle Name"
 msgstr "가운데 이름"
 
@@ -3990,7 +4002,6 @@ msgstr "Chatty"
 msgid "Extended Away"
 msgstr "장기 자리 비움"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "다른 용무 중"
 
@@ -4113,29 +4124,26 @@ msgstr "질의할 회의 서버 선택"
 msgid "Find Rooms"
 msgstr "대화실 찾기"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "별칭:"
 
-msgid "Write error"
-msgstr "쓰기 오류"
+#, fuzzy
+msgid "No users found"
+msgstr "일치하는 사용자를 찾지 못했습니다."
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "일반 문자열"
+msgid "Roles:"
+msgstr "직위"
 
-msgid "Read Error"
-msgstr "읽기 오류"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "일반 문자열"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"서버와의 접속을 확립하지 못했습니다:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "소켓을 생성할 수 없습니다."
 
 #, fuzzy
 msgid "Invalid XMPP ID"
@@ -4144,6 +4152,10 @@ msgstr "잘못된 ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "서버 접속에 실패했습니다."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 의 등록이 성공적으로 완료되었습니다."
@@ -4170,9 +4182,6 @@ msgstr "등록 완료"
 msgid "Unregistration Failed"
 msgstr "등록 실패"
 
-msgid "Already Registered"
-msgstr "이미 등록되어 있습니다."
-
 msgid "State"
 msgstr "주"
 
@@ -4185,6 +4194,9 @@ msgstr "전화"
 msgid "Date"
 msgstr "날짜"
 
+msgid "Already Registered"
+msgstr "이미 등록되어 있습니다."
+
 #, fuzzy
 msgid "Unregister"
 msgstr "등록"
@@ -4217,6 +4229,10 @@ msgid "Change Registration"
 msgstr "다음 상태로 변경(_S):"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "서버 접속에 실패했습니다."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "계정 정보 변경 오류"
 
@@ -4237,9 +4253,18 @@ msgstr "인증 중"
 msgid "Re-initializing Stream"
 msgstr "스트림 재초기화 중"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "인증되어 있지 않습니다."
 
+msgid "Mood"
+msgstr "기분"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "둘 다"
 
@@ -4261,12 +4286,6 @@ msgstr "없음"
 msgid "Subscription"
 msgstr "구독"
 
-msgid "Mood"
-msgstr "기분"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "혈액형"
@@ -4313,9 +4332,6 @@ msgstr "비밀번호가 변경되었습니다."
 msgid "Error changing password"
 msgstr "비밀번호 변경 오류"
 
-msgid "Password (again)"
-msgstr "비밀번호 (재확인)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "비밀번호 변경"
@@ -4510,19 +4526,27 @@ msgstr "사용자 %s 님을 차단할 수 없습니다."
 msgid "Unable to ping user %s"
 msgstr "사용자 %s 님을 차단할 수 없습니다."
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
+"%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
+"%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 "%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4533,9 +4557,37 @@ msgstr "버저!!"
 msgid "%s has buzzed you!"
 msgstr "%s 님이 나 [%s] 을(를) 추가했습니다."
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "%s 님에게 메시지를 보낼 수 없습니다."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
 msgstr ""
+"%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "등록 실패"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "정보를 표시할 상대의 아이디 또는 별칭을 입력해 주십시오."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "파일 선택"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "대화 시작(_C)"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  대화실을 설정합니다."
@@ -4556,16 +4608,18 @@ msgstr "topic [새 주제]:  주제를 표시 또는 변경합니다."
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;사용자&gt; [대화실]:  지정한 대화실로부터 사용자를 차단합니다."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;사용자&gt; &lt;owner|admin|member|outcast|none&gt;: 사용자 관계"
 "를 설정합니다."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;사용자&gt; &lt;moderator|participant|visitor|none&gt;: 대화실에서 역"
 "할을 설정합니다."
@@ -4634,6 +4688,9 @@ msgstr "서버에 접속"
 msgid "File transfer proxies"
 msgstr "파일 전송 포트"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4674,6 +4731,14 @@ msgstr "XML 해석 오류"
 msgid "Unknown Error in presence"
 msgstr "알 수 없는 오류가 발생했습니다."
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "대화 %s 에 참가하는 중 오류"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "대화 %s 에서 오류"
+
 msgid "Create New Room"
 msgstr "새 대화실 만들기"
 
@@ -4690,13 +4755,32 @@ msgstr "대화실 설정(_C)"
 msgid "_Accept Defaults"
 msgstr "기본값 적용(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "대화 %s 에 참가하는 중 오류"
+#, fuzzy
+msgid "No reason"
+msgstr "이유를 알 수 없습니다."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "대화 %s 에서 오류"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s 에게 차였습니다: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s) 에게 차였습니다"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "파일을 여는 중 오류가 발생했습니다."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "파일 전송이 실패했습니다."
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "파일 '%s' 을(를) 열 수 없었습니다: %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4725,10 +4809,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "정보를 표시할 상대의 아이디 또는 별칭을 입력해 주십시오."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "파일 선택"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "사용자 모드"
 
@@ -4768,9 +4848,19 @@ msgstr "알림을 받은 후 동작"
 msgid "Select an action"
 msgstr "파일 선택"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\" 님을 추가할 수 없습니다."
+
+msgid "Buddy Add error"
+msgstr ""
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Notes 주소록 선택"
+msgid "The username specified does not exist."
+msgstr "지정한 아이디가 잘못되었습니다."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5001,7 +5091,7 @@ msgstr "부모의 승인이 없는 어린이 패스포트입니다."
 msgid "Passport account not yet verified"
 msgstr "아직 패스포트 계정은 확인되지 않았습니다."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "아직 패스포트 계정은 확인되지 않았습니다."
 
@@ -5026,6 +5116,10 @@ msgstr "선호하는 연락처"
 msgid "Non-IM Contacts"
 msgstr "연락처 삭제"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5098,6 +5192,13 @@ msgstr "모바일 메시지를 전송합니다."
 msgid "Page"
 msgstr "호출"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "직종"
+
 msgid "Has you"
 msgstr "내가 등록됨"
 
@@ -5139,6 +5240,14 @@ msgstr "양치기자리"
 msgid "Album"
 msgstr "Adium"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "제목"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "제목"
+
 msgid "Set Friendly Name..."
 msgstr "공개명 설정..."
 
@@ -5173,9 +5282,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "MSN 에서는 SSL 지원이 필요합니다. 지원하는 SSL 라이브러리를 설치해 주십시오."
 
-msgid "Failed to connect to server."
-msgstr "서버 접속에 실패했습니다."
-
 msgid "Error retrieving profile"
 msgstr "프로파일을 가져오는 중 오류"
 
@@ -5330,8 +5436,9 @@ msgstr ""
 "사용자 프로파일로부터 정보를 가져오지 못했습니다. 그 사용자는 존재하지 않는 "
 "것 같습니다."
 
-msgid "Profile URL"
-msgstr "프로파일 URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "오프라인일 때에는 허가되지 않았습니다."
 
 #. *< type
 #. *< ui_requirement
@@ -5366,66 +5473,29 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID 인증: 연결할 수 없음"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s 은(는) 올바은 그룹이 아닙니다."
-
-msgid "Unknown error."
-msgstr "알 수 없는 오류입니다."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2$s (%3$s) 의 %1$s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 님이 신호를 보내고 싶어 합니다!"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "알 수 없는 오류"
 
 msgid "Unable to add user"
 msgstr "사용자를 추가할 수 없습니다."
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "알 수 없는 오류"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "검색 결과입니다."
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) 사용자를 추가할 수 없습니다."
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) 사용자를 차단할 수 없습니다."
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) 사용자를 허가할 수 없습니다."
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "친구 목록이 가득 차서, %s 님을 추가할 수 없었습니다."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s 님의 패스포트 계정이 올바르지 않습니다."
-
-msgid "Service Temporarily Unavailable."
-msgstr "서비스를 일시적으로 이용할 수 없습니다."
-
 # msgstr[1] "%2$s 님으로부터의 %1$hu 개의 메시지는 타당하지 않아 받지 못했습니다."
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "%2$s 님으로부터의 %1$hu개의 메시지는 너무 커서 받지 못했습니다."
 
-msgid "Unable to rename group"
-msgstr "그룹명을 변경할 수 없습니다."
-
-msgid "Unable to delete group"
-msgstr "그룹을 삭제할 수 없습니다."
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5464,9 +5534,6 @@ msgstr "알 수 없는 오류로 인해 메시지를 보내지 못했습니다:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "알 수 없는 오류로 인해 메시지를 보내지 못했습니다:"
 
-msgid "Unable to connect"
-msgstr "접속할 수 없습니다."
-
 # msgstr[1] ""
 # "MSN 서비스가 유지보수를 위해 %d 분간 정지하고 있습니다. 자동으로 접속이 끊길 예정이므로, 지금 수행되고 있는 대화를 종료해 주십시오.\n"
 # "\n"
@@ -5485,13 +5552,16 @@ msgstr ""
 "서버 %s 에서 접속 오류:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "서버는 이 프로토콜을 지원하지 않습니다."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP 해석 중 오류가 발생했습니다."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "다른 장소로부터 접속되어 있습니다."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5499,7 +5569,8 @@ msgstr ""
 "MSN 서버가 일시적으로 이용할 수 없게 되었습니다. 잠시 후 다시 시도해 보시기 "
 "바랍니다."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN 서버가 일시적으로 다운되어 있습니다."
 
 #, c-format
@@ -5530,6 +5601,14 @@ msgstr "쿠키를 보내는 중입니다."
 msgid "Retrieving buddy list"
 msgstr "친구 목록을 수신하고 있습니다."
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "컴퓨터로부터 떨어져 있습니다."
 
@@ -5566,14 +5645,6 @@ msgstr "교환 기관의 접속 오류로 인해 메시지를 보내지 못했�
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "알 수 없는 오류로 인해 메시지를 보내지 못했습니다:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s 님은 나를 친구 목록에 추가했습니다."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s 님은 나를 친구 목록에서 삭제했습니다."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "주소록에 추가"
@@ -5582,13 +5653,6 @@ msgstr "주소록에 추가"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "이 상대를 친구 목록에 추가하시겠습니까?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "\"%s\" 님을 추가할 수 없습니다."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "지정한 아이디가 잘못되었습니다."
@@ -5596,6 +5660,9 @@ msgstr "지정한 아이디가 잘못되었습니다."
 msgid "This Hotmail account may not be active."
 msgstr "이 Hotmail 계정은 사용 불가능한 것 같습니다."
 
+msgid "Profile URL"
+msgstr "프로파일 URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5609,19 +5676,63 @@ msgstr "이 Hotmail 계정은 사용 불가능한 것 같습니다."
 msgid "MSN Protocol Plugin"
 msgstr "MSN 프로토콜 플러그인"
 
-#, fuzzy
-msgid "Missing Cipher"
-msgstr "암호"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s 은(는) 올바은 그룹이 아닙니다."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "알 수 없는 오류입니다."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s (%3$s) 의 %1$s"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) 사용자를 추가할 수 없습니다."
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) 사용자를 차단할 수 없습니다."
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) 사용자를 허가할 수 없습니다."
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "친구 목록이 가득 차서, %s 님을 추가할 수 없었습니다."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s 님의 패스포트 계정이 올바르지 않습니다."
+
+msgid "Service Temporarily Unavailable."
+msgstr "서비스를 일시적으로 이용할 수 없습니다."
+
+msgid "Unable to rename group"
+msgstr "그룹명을 변경할 수 없습니다."
+
+msgid "Unable to delete group"
+msgstr "그룹을 삭제할 수 없습니다."
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s 님은 나를 친구 목록에 추가했습니다."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s 님은 나를 친구 목록에서 삭제했습니다."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "사용자실"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "읽는 중 오류"
 
@@ -5633,12 +5744,24 @@ msgstr "서버로부터의 잘못된 challenge 입니다."
 msgid "Logging in"
 msgstr "로그 기록"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"서버와의 접속이 끊어졌습니다.\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "메시지 보내기(_M)"
@@ -5658,20 +5781,22 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-msgid "MySpaceIM - No Username Set"
-msgstr ""
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+#, fuzzy
+msgid "IM Friends"
+msgstr "메시지 창(_I)"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "접속되었습니다."
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "서버로부터의 응답이 잘못되었습니다."
 
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
@@ -5679,16 +5804,23 @@ msgstr "프로세스가 오류 코드 %d 을(를) 반환했습니다."
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "아이디 또는 비밀번호가 틀립니다."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "최종 접속 조정 중"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "대화 중인 친구에게 참가할 수 없습니다."
 
@@ -5700,14 +5832,6 @@ msgstr "친구 목록 가져오기..."
 msgid "persist command failed"
 msgstr "Switchboard 에 실패했습니다."
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "사용자실"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "대화 중인 친구에게 참가할 수 없습니다."
@@ -5720,36 +5844,16 @@ msgid "blocklist command failed"
 msgstr "Switchboard 에 실패했습니다."
 
 #, fuzzy
-msgid "Invalid input condition"
-msgstr "최종 접속 조정 중"
+msgid "Missing Cipher"
+msgstr "암호"
 
-msgid "Read buffer full (2)"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#, fuzzy
-msgid "Unparseable message"
-msgstr "메시지를 해독할 수 없습니다."
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "호스트에 접속하지 못했습니다."
-
-#, fuzzy
-msgid "IM Friends"
-msgstr "메시지 창(_I)"
-
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "서버로부터의 응답이 잘못되었습니다."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5795,9 +5899,6 @@ msgstr ""
 msgid "User"
 msgstr "사용자"
 
-msgid "Profile"
-msgstr "프로파일"
-
 #, fuzzy
 msgid "Headline"
 msgstr "핸들(_H):"
@@ -5813,15 +5914,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "대화 창을 닫습니다."
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "이름 없음"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5836,6 +5932,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "이 테마에는 이용 가능한 이모티콘이 없습니다."
@@ -5844,6 +5943,14 @@ msgstr "이 테마에는 이용 가능한 이모티콘이 없습니다."
 msgid "Please try another username:"
 msgstr "%s 님의 새 이름을 입력해 주십시오."
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "이름 없음"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6039,10 +6146,6 @@ msgid "Master archive is misconfigured"
 msgstr "Master archive 설정이 틀렸습니다."
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "아이디 또는 비밀번호가 틀립니다."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "입력한 아이디의 호스트를 인식할 수 없었습니다."
 
@@ -6083,9 +6186,9 @@ msgstr "사용자는 오프라인 또는 차단되어 있습니다."
 msgid "Unknown error: 0x%X"
 msgstr "알 수 없는 오류: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "로그인에 실패했습니다. (%s)。"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "사용자 %s 님을 차단할 수 없습니다."
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6188,9 +6291,6 @@ msgstr "GroupWise 회의 %d"
 msgid "Authenticating..."
 msgstr "인증 중..."
 
-msgid "Unable to connect to server."
-msgstr "서버에 접속할 수 없습니다."
-
 msgid "Waiting for response..."
 msgstr "응답을 기다리고 있습니다..."
 
@@ -6214,25 +6314,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "회의에 참석하시겠습니까?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"다른 워크스테이션으로부터 로그인 되어 있기 때문에, 강제적으로 로그아웃 되었습"
-"니다."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 님은 오프라인이기 때문에, 전송한 메시지를 받지 못했습니다."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "서버에 접속할 수 없습니다. 접속할 서버의 주소를 입력해 주십시오."
 
-msgid "Error. SSL support is not installed."
-msgstr "오류입니다. SSL 지원이 설치되어 있지 않습니다."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "이 회의는 폐회되었습니다. 메시지를 전송할 수 없습니다."
 
@@ -6256,6 +6348,25 @@ msgid "Server port"
 msgstr "서버 포트"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "서버로부터 예상치 못한 HTTP 응답을 받았습니다."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"접속과 해제를 반복 수행했습니다. 10분 정도 후 다시 시도해 보시기 바랍니다. 이"
+"대로 계속하면 더 오래 기다려야 합니다."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "%s 을(를) 해석하는 중 오류"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "접속할 수 없었습니다."
 
@@ -6263,18 +6374,8 @@ msgstr "접속할 수 없었습니다."
 msgid "Invalid chat room name"
 msgstr "잘못된 대화실명"
 
-msgid "Server closed the connection."
-msgstr "서버가 접속을 닫았습니다."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"서버와의 접속에 실패했습니다:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "서버와 접속하는 동안에 잘못된 데이터를 받았습니다."
 
 #. *< type
@@ -6322,7 +6423,8 @@ msgstr "리모트 사용자와 접속이 끊어졌습니다:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "리모트 사용자의 접속에서 잘못된 데이터를 받았습니다."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "리모트 사용자와의 접속을 확립하지 못했습니다."
 
 msgid "Direct IM established"
@@ -6496,23 +6598,18 @@ msgstr "카메라"
 msgid "Screen Sharing"
 msgstr "아이디"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "대화할 수 있습니다."
 
-#, c-format
 msgid "Not Available"
 msgstr "사용 불가"
 
-#, c-format
 msgid "Occupied"
 msgstr "사용 중입니다."
 
-#, c-format
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#, c-format
 msgid "Invisible"
 msgstr "숨김 상태"
 
@@ -6525,21 +6622,15 @@ msgstr "경고 수준"
 msgid "Buddy Comment"
 msgstr "친구의 코멘트"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "인증 서버에 접속할 수 없었습니다:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS 서버에 접속할 수 없었습니다:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "서버에 접속할 수 없습니다."
 
 #, fuzzy
 msgid "Username sent"
@@ -6554,50 +6645,57 @@ msgstr "최종 접속 조정 중"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "로그인 할 수 없습니다: 아이디가 틀렸기 때문에 %s (으)로서 접속할 수 없었습니"
 "다. 아이디의 앞 부분은 문자, 문자와 숫자와 공백 또는 숫자만이 가능합니다."
 
-#. Unregistered screen name
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "곧 접속이 끊깁니다. 갱신을 위해 %s 을(를) 선택하십시오."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "올바른 AIM 로그인 hash를 가져올 수 없습니다."
+
+msgid "Unable to get a valid login hash."
+msgstr "올바른 로그인 hash를 가져올 수 없습니다."
+
+msgid "Received authorization"
+msgstr "인증을 받았습니다."
+
+#. Unregistered username
 #. uid is not exist
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "이름이 잘못되었습니다."
-
-msgid "Incorrect password."
-msgstr "비밀번호가 틀립니다."
+msgid "Username does not exist"
+msgstr "사용자가 없습니다."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "사용 중인 계정은 현재 정지 중입니다."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 인스턴트 메신저 서비스는 일시적으로 이용할 수 없습니다."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "클라이언트 버전이 너무 오래 되었습니다. %s (으)로 업그레이드 하십시오."
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "접속과 해제를 반복 수행했습니다. 10분 정도 후 다시 시도해 보시기 바랍니다. 이"
 "대로 계속하면 더 오래 기다려야 합니다."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "클라이언트 버전이 너무 오래 되었습니다. %s (으)로 업그레이드 하십시오."
-
-msgid "Could Not Connect"
-msgstr "접속할 수 없었습니다."
-
-msgid "Received authorization"
-msgstr "인증을 받았습니다."
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "입력한 보안 ID 키는 잘못되었습니다."
 
 msgid "Enter SecurID"
@@ -6612,24 +6710,6 @@ msgstr "디지털 표시 방식으로 6자리의 숫자를 입력해 주십시�
 msgid "_OK"
 msgstr "확인(_O)"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"곧 접속이 끊깁니다. 이것이 수정되면 TOC 를 사용합니다. 갱신을 위해 %s 을(를) "
-"선택하십시오."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "올바른 AIM 로그인 hash를 가져올 수 없습니다."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "곧 접속이 끊깁니다. 갱신을 위해 %s 을(를) 선택하십시오."
-
-msgid "Unable to get a valid login hash."
-msgstr "올바른 로그인 hash를 가져올 수 없습니다."
-
 msgid "Password sent"
 msgstr "비밀번호 전송 중"
 
@@ -6761,7 +6841,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 "원인은 알 수 없지만, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "메시지를 보낼 수 없습니다: %s"
@@ -6783,6 +6863,12 @@ msgstr "접속한 일시"
 msgid "Member Since"
 msgstr "멤버가 된 일시"
 
+msgid "Capabilities"
+msgstr "기능"
+
+msgid "Profile"
+msgstr "프로파일"
+
 msgid "Your AIM connection may be lost."
 msgstr "AIM 으로의 접속이 끊어진 것 같습니다."
 
@@ -6951,7 +7037,7 @@ msgstr "자리 비움 메시지가 너무 깁니다."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6977,9 +7063,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "고아"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "치구 %s 님을 추가할 수 없었습니다. 친구 수가 너무 많습니다. 한 명을 삭제한 "
@@ -6989,7 +7075,7 @@ msgid "(no name)"
 msgstr "(이름 없음)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "알 수 없는 이유로 명령 적용에 실패했습니다."
 
 #, fuzzy, c-format
@@ -7058,6 +7144,7 @@ msgstr "접속(_O)"
 msgid "Get AIM Info"
 msgstr "AIM 정보 가져오기"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "친구 코멘트 편집"
 
@@ -7118,6 +7205,7 @@ msgstr "검색(_S)"
 msgid "Set User Info (web)..."
 msgstr "사용자 정보 설정(URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "비밀번호 변경 (URL)"
@@ -7150,6 +7238,10 @@ msgid "Search for Buddy by Information"
 msgstr "정보로 친구 검색..."
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "사용자는 접속 중이 아닙니다."
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7169,7 +7261,6 @@ msgstr "Direct IM 으로 %s 은(는) %s:%hu 에게 질의가 들어와 있습니
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s:%hu (으)로 연락처를 시험하고 있습니다."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "프록시 서버를 통해 연락처를 시험하고 있습니다."
 
@@ -7265,7 +7356,7 @@ msgstr "기타"
 msgid "Visible"
 msgstr "숨김 상태"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7356,16 +7447,48 @@ msgstr "최종 갱신일"
 msgid "Could not change buddy information."
 msgstr "친구의 정보를 입력해 주십시오."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "휴대 기기"
+
+msgid "Note"
+msgstr "비고"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "친구 아이콘"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "친구 추가"
+msgid "_Modify"
+msgstr "변경"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "변경"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "서버 바쁨"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "승인이 필요합니다."
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Add buddy question"
+msgstr "친구 목록에 추가하시겠습니까?"
+
+#, fuzzy
+msgid "Enter answer here"
 msgstr "이곳에 요청 사항을 입력하십시오."
 
 msgid "Send"
@@ -7379,18 +7502,19 @@ msgid "Authorization denied message:"
 msgstr "인증 거부 메시지:"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "죄송합니다, 제 스타일이 아닙니다..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "사용자 %d 님은 인증이 필요합니다."
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "친구 목록에 추가하시겠습니까?"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "이곳에 요청 사항을 입력하십시오."
 
 msgid "Would you be my friend?"
@@ -7413,7 +7537,7 @@ msgid "Failed sending authorize"
 msgstr "저를 승인해 주세요!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "대화 중인 친구에게 참가할 수 없습니다."
 
 #, fuzzy, c-format
@@ -7458,6 +7582,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr "영구적으로 사용 가능한 QQ 그룹만을 검색할 수 있습니다.\n"
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "잘못된 프록시 설정"
+
+#, fuzzy
 msgid "Not member"
 msgstr "저는 멤버가 아닙니다."
 
@@ -7500,16 +7628,19 @@ msgstr "이 그룹에서는 다른 사람들의 참가를 허가하지 않고 �
 msgid "Join QQ Qun"
 msgstr "대화에 참가"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "이곳에 요청 사항을 입력하십시오."
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Qun 생성이 성공적으로 완료했습니다."
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "Qun 생성이 성공적으로 완료했습니다."
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7519,7 +7650,7 @@ msgstr "QQ Qun 조작"
 msgid "Failed:"
 msgstr "실패했습니다."
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7534,11 +7665,11 @@ msgstr ""
 "이 조작에 의해 최종적으로 Qun 이 완전히 삭제됩니다."
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "죄송합니다, 제 스타일이 아닙니다..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Qun 멤버 변경이 성공적으로 완료되었습니다."
 
 #, fuzzy
@@ -7549,35 +7680,35 @@ msgid "You have successfully created a Qun"
 msgstr "Qun 생성이 성공적으로 완료했습니다."
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "지금 바로 Qun 의 상세 정보를 입력하시겠습니까?"
 
 msgid "Setup"
 msgstr "입력"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "그룹 %d 에의 내 참가 요구가 관리자 %d 에 의해 거부되었습니다."
 
-#, c-format
-msgid "%d request to join Qun %d"
-msgstr ""
+#, fuzzy, c-format
+msgid "%u request to join Qun %u"
+msgstr "그룹 %d 에의 내 참가 요구가 관리자 %d 에 의해 거부되었습니다."
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "대화 중인 친구에게 참가할 수 없습니다."
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "친구 삭제"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "친구 삭제"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7694,6 +7825,13 @@ msgstr "<b>마지막 갱신</b>: %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>현재의 온라인</b>: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>마지막 갱신</b>: %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7701,7 +7839,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "%s 정보"
 
 #, fuzzy
@@ -7722,6 +7860,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "%s 정보"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "자택 주소"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7753,7 +7895,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "접속"
@@ -7766,6 +7907,9 @@ msgstr "서버 포트"
 msgid "Show server news"
 msgstr "서버 주소"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "읽는 중 오류"
@@ -7775,11 +7919,7 @@ msgid "Update interval (seconds)"
 msgstr "정보 갱신"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "서버 정보를 가져올 수 없습니다."
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "서버 정보를 가져올 수 없습니다."
 
 #, c-format
@@ -7802,21 +7942,19 @@ msgid "Activation required"
 msgstr "등록이 필요합니다."
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "읽는 중 오류"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "질문 창의 글꼴"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Yahoo! 인증 실패"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7826,74 +7964,51 @@ msgstr "이미지 저장"
 msgid "Enter code"
 msgstr "비밀번호 입력"
 
-msgid "QQ Captcha Verifing"
-msgstr ""
+#, fuzzy
+msgid "QQ Captcha Verification"
+msgstr "SSL 호스트 인증"
 
 #, fuzzy
 msgid "Enter the text from the image"
 msgstr "추가할 그룹의 이름을 입력해 주십시오."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "접속할 수 없습니다."
-
 msgid "Socket error"
 msgstr "소켓 오류"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"서버와의 접속에 실패했습니다:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "소켓으로부터 읽을 수 없습니다."
-
-msgid "Write Error"
-msgstr "쓰기 오류"
-
-msgid "Connection lost"
-msgstr "접속을 닫았습니다."
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "사용자 정보 설정..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "요청이 거부되었습니다."
 
-msgid "Couldn't resolve host"
-msgstr "호스트명을 해석할 수 없었습니다."
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "서버에 접속할 수 없습니다."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "잘못된 오류"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "서버에 접속"
+msgid "Connecting to server"
+msgstr "SILC 서버에 접속 중"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "QQid 오류"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "이름 가져오기에 실패했습니다: %s"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7903,6 +8018,10 @@ msgid ""
 msgstr "ICQ 서버 중계"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "보낸 사람"
 
@@ -7912,32 +8031,30 @@ msgid ""
 "%s"
 msgstr "서버 정보: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "이유를 알 수 없습니다."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "명령 지정"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "서버 정보를 가져올 수 없습니다."
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "이유를 알 수 없습니다."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "이유를 알 수 없습니다."
 
 #, c-format
@@ -7951,9 +8068,6 @@ msgstr "파일 보내기"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 님이 %s 의 전송을 취소했습니다."
 
-msgid "Connection closed (writing)"
-msgstr "쓰기 연결을 닫았습니다."
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>그룹명:</b> %s<br>"
@@ -8007,17 +8121,6 @@ msgstr "Sametime 관리자가 서버 %s 에서 다음의 공지를 발표했습�
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 관리자 공지"
 
-msgid "Connection reset"
-msgstr "접속 초기화"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "소켓으로부터 읽는 중 오류: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "호스트에 접속할 수 없습니다."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s (으)로부터의 공지"
@@ -8040,6 +8143,9 @@ msgstr "스피커"
 msgid "Video Camera"
 msgstr "비디오 카메라"
 
+msgid "File Transfer"
+msgstr "파일 전송"
+
 msgid "Supports"
 msgstr "지원"
 
@@ -8755,9 +8861,6 @@ msgstr "조직"
 msgid "Unit"
 msgstr "그룹"
 
-msgid "Note"
-msgstr "비고"
-
 msgid "Join Chat"
 msgstr "대화에 참가"
 
@@ -8858,6 +8961,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "네트워크 통계 정보"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping 에 실패했습니다."
 
@@ -8922,7 +9028,8 @@ msgstr "지원하지 않는 공개 키 형식"
 msgid "Disconnected by server"
 msgstr "서버가 접속을 끊었습니다."
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC 서버에 접속하는 중 오류"
 
 msgid "Key Exchange failed"
@@ -8934,27 +9041,26 @@ msgstr ""
 "분리된 세션의 복귀에 실패했습니다. 새로운 접속을 확립하려면 [재접속] 버튼을 "
 "눌러 주십시오."
 
-msgid "Connection failed"
-msgstr "접속 실패"
-
 msgid "Performing key exchange"
 msgstr "키 교환 실행 중"
 
-msgid "Unable to create connection"
-msgstr "새로운 접속을 생성할 수 없습니다."
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "SILC 의 키 쌍을 읽을 수 없습니다: %s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC 서버에 접속 중"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC 의 키 쌍을 읽을 수 없습니다: %s"
+
 msgid "Out of memory"
 msgstr "메모리가 부족합니다."
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC 프로토콜을 초기화 할 수 없습니다."
 
 #, fuzzy
@@ -9255,7 +9361,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILC 키 쌍 생성 중..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "SILC 키 쌍 생성 중..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9352,6 +9458,9 @@ msgstr "화이트보드"
 msgid "No server statistics available"
 msgstr "서버 통계 정보를 사용할 수 없습니다."
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC 서버에 접속하는 중 오류"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "실패: 버전 불일치, 클라이언트를 업그레이드 하십시오."
@@ -9392,37 +9501,37 @@ msgstr "실패: 잘못된 쿠키입니다."
 msgid "Failure: Authentication failed"
 msgstr "실패: 인증에 실패했습니다."
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC 클라이언트 접속을 초기화 할 수 없습니다."
 
 #, fuzzy
 msgid "John Noname"
 msgstr "이름 없음"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC 의 키 쌍을 읽을 수 없습니다: %s"
 
-msgid "Could not write"
-msgstr "쓸 수 없었습니다."
-
-msgid "Could not connect"
-msgstr "접속할 수 없었습니다."
+msgid "Unable to create connection"
+msgstr "새로운 접속을 생성할 수 없습니다."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "원인을 알 수 없습니다."
 
-msgid "Could not create listen socket"
-msgstr "감시 소켓을 생성할 수 없었습니다."
-
-msgid "Could not resolve hostname"
-msgstr "호스트명을 해석할 수 없었습니다."
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "소켓을 생성할 수 없습니다."
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 의 아이디에 공백 또는 @ 기호가 포함되어 있지 않은 것 같습니다."
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "서버 포트"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9456,175 +9565,63 @@ msgstr "사용자 인증"
 msgid "Auth Domain"
 msgstr "도메인 인증"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s 검색 중"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s (으)로의 접속에 실패했습니다."
-
-#, c-format
-msgid "Signon: %s"
-msgstr "접속: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "파일 %s 을(를) 쓸 수 없습니다."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "파일 %s 을(를) 읽을 수 없습니다."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "메시지가 너무 길어 마지막 %s 바이트가 잘렸습니다."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s 님은 현재 로그인 되어 있지 않습니다."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s 경고는 허가되어 있지 않습니다."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "사용자 속도 제한을 초과하였기 때문에, 메시지가 유실되었습니다."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s 에서의 대화는 가능하지 않습니다."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "너무 빨라 %s 메시지를 전송할 수 없습니다."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "너무 커서 %s (으)로부터의 IM 을 무시했습니다."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "너무 빨라 %s 님으로부터의 IM 을 무시했습니다."
-
-#, c-format
-msgid "Failure."
-msgstr "실패했습니다."
-
-#, c-format
-msgid "Too many matches."
-msgstr "너무 많이 일치합니다."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "더 많은 수식어가 필요합니다."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "일시적으로 디렉토리 서비스를 이용할 수 없습니다."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "이메일 검색이 거부되었습니다."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "검색어가 무시되었습니다."
-
-#, c-format
-msgid "No keywords."
-msgstr "검색어가 없습니다."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "디렉토리 정보가 없습니다."
-
-#, c-format
-msgid "Country not supported."
-msgstr "지원되지 않는 국가입니다."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "원인을 알 수 없는 실패: %s"
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "아이디 또는 비밀번호가 틀립니다."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "일시적으로 서비스를 이용할 수 없습니다."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "로그인 경고 수준이 너무 높습니다."
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"접속과 해제를 반복 수행했습니다. 10분 정도 후에 재시도 하십시오. 이대로 계속"
-"하면 더 많이 시간을 기다려야 합니다."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "원인을 알 수 없는 접속 오류가 발생했습니다: %s"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "알 수 없는 오류 %d 이(가) 발생했습니다 (정보: %s)."
-
-msgid "Invalid Groupname"
-msgstr "그룹명이 잘못되었습니다."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;대화실&gt;: Yahoo 네트워크 상에 있는 대화에 참가"
 
-msgid "Connection Closed"
-msgstr "접속을 닫았습니다."
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Yahoo 네트워크 상에 있는 대화실 목록 표시"
 
-msgid "Waiting for reply..."
-msgstr "응답을 기다리는 중입니다..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: 사용자에게 낙서 요구"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC 가 일시정지 상태에서 복귀했습니다. 메시지를 다시 보낼 수 있습니다."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-msgid "Password Change Successful"
-msgstr "비밀번호 변경이 성공적으로 완료되었습니다."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! 프로토콜 플러그인"
 
-msgid "_Group:"
-msgstr "그룹(_G):"
+msgid "Pager server"
+msgstr "호출기 서버"
 
-msgid "Get Dir Info"
-msgstr "폴더 정보 가져오기"
+msgid "Pager port"
+msgstr "호출기 포트"
 
-msgid "Set Dir Info"
-msgstr "폴더 정보 설정"
+msgid "File transfer server"
+msgstr "파일 전송 서버"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "쓰기 모드에서 %s 을(를) 열 수 없습니다!"
+msgid "File transfer port"
+msgstr "파일 전송 포트"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "파일 전송에 실패했습니다. 아마도 상대측에서 취소한 것 같습니다."
+msgid "Chat room locale"
+msgstr "대화실 위치"
 
-msgid "Could not connect for transfer."
-msgstr "전송할 수 없었습니다."
+msgid "Ignore conference and chatroom invitations"
+msgstr "회의 및 대화실 초대 무시"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "파일 헤더를 기록할 수 없습니다. 파일은 전송되지 않습니다."
+msgid "Chat room list URL"
+msgstr "대화실 URL 목록"
 
-msgid "Save As..."
-msgstr "다른 이름으로 저장..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo 대화 서버"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s 님으로부터 %s 님에게 %d 개의 파일 요청: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo 대화 포트 번호"
 
-# msgstr[1] "%s 님으로부터 %s 님에게 %d 개의 파일 요청: %s (%.2f %s)%s%s"
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s 님이 파일을 보내도록 요청하고 있습니다."
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9636,11 +9633,11 @@ msgstr "%s 님이 파일을 보내도록 요청하고 있습니다."
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC 프로토콜 플러그인"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! 프로토콜 플러그인"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9667,6 +9664,34 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "거부할 친구 추가"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "서버와 접속하는 동안에 잘못된 데이터를 받았습니다."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"알 수 없는 오류 번호 %d 입니다. Yahoo! 웹사이트로 로그인하면 해결될 수도 있습"
+"니다."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"알 수 없는 오류 번호 %d 입니다. Yahoo! 웹사이트로 로그인하면 해결될 수도 있습"
+"니다."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "아이디 또는 비밀번호가 틀립니다."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9700,37 +9725,32 @@ msgstr ""
 "알 수 없는 오류 번호 %d 입니다. Yahoo! 웹사이트로 로그인하면 해결될 수도 있습"
 "니다."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "그룹 %2$s 의 친구 %1$s 을(를) 계정 %3$s (으)로 서버 목록에 추가할 수 없었습니"
 "다."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "친구를 서버 목록에 추가할 수 없었습니다."
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 재생 가능 %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "서버로부터 예상치 못한 HTTP 응답을 받았습니다."
 
-msgid "Connection problem"
-msgstr "접속 오류"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 "서버와의 접속에 실패했습니다:\n"
 "%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 "서버와의 접속을 확립하지 못했습니다:\n"
 "%s"
@@ -9780,9 +9800,8 @@ msgstr "자리 있음 상태 설정"
 msgid "Start Doodling"
 msgstr "낙서 시작"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "어느 ID 를 활성화 하시겠습니까?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 #, fuzzy
 msgid "Join whom in chat?"
@@ -9798,74 +9817,15 @@ msgstr "대화에 참가..."
 msgid "Open Inbox"
 msgstr "Hotmail의 받은 편지함 열기"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;대화실&gt;: Yahoo 네트워크 상에 있는 대화에 참가"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Yahoo 네트워크 상에 있는 대화실 목록 표시"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: 사용자에게 낙서 요구"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo! 프로토콜 플러그인"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Korea! 에 접속"
-
-msgid "Pager server"
-msgstr "호출기 서버"
-
-msgid "Japan Pager server"
-msgstr "한국 호출기 서버"
-
-msgid "Pager port"
-msgstr "호출기 포트"
-
-msgid "File transfer server"
-msgstr "파일 전송 서버"
-
-msgid "Japan file transfer server"
-msgstr "한국 파일 전송 서버"
-
-msgid "File transfer port"
-msgstr "파일 전송 포트"
-
-msgid "Chat room locale"
-msgstr "대화실 위치"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "회의 및 대화실 초대 무시"
-
-msgid "Chat room list URL"
-msgstr "대화실 URL 목록"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo 대화 서버"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 대화 포트 번호"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "낙서 요청을 보냄"
 
+msgid "Unable to connect."
+msgstr "접속할 수 없습니다."
+
 msgid "Unable to establish file descriptor."
 msgstr "파일 기술자를 가져올 수 없습니다."
 
@@ -9873,6 +9833,9 @@ msgstr "파일 기술자를 가져올 수 없습니다."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 님이 파일 %s 의 전송을 요구하고 있습니다."
 
+msgid "Write Error"
+msgstr "쓰기 오류"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Korea 프로파일"
 
@@ -9917,13 +9880,9 @@ msgstr "추천 링크 3"
 msgid "Last Update"
 msgstr "최종 갱신일"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s 의 사용자 정보는 사용할 수 없습니다."
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "죄송합니다. 이 프로파일은 이 버전에서는 지원하지 않는 서식 혹은 언어입니다."
 
@@ -9994,23 +9953,19 @@ msgstr "음성"
 msgid "Webcams"
 msgstr "웹카메라"
 
+msgid "Connection problem"
+msgstr "접속 오류"
+
 msgid "Unable to fetch room list."
 msgstr "대화실 목록 가져올 수 없습니다."
 
 msgid "User Rooms"
 msgstr "사용자실"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT 서버를 사용한 접속에 문제가 있습니다."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"서버와의 접속이 끊어졌습니다.\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10137,24 +10092,16 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "노출"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"소켓을 생성할 수 없습니다:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP 프록시로부터의 응답을 해석할 수 없습니다: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 프록시 접속 오류 %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "접근이 거부되었습니다: HTTP 프록시 서버가 포트 번호 %d 의 터널링을 거부했습니"
 "다."
@@ -10163,9 +10110,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "%s 을(를) 해석하는 중 오류"
 
-msgid "Could not resolve host name"
-msgstr "호스트명을 해석할 수 없었습니다."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10256,9 +10200,6 @@ msgstr "다른 용무 중"
 msgid "Extended away"
 msgstr "장기 자리 비움"
 
-msgid "Mobile"
-msgstr "휴대 기기"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10300,18 +10241,6 @@ msgstr "+++ %s 님이 대기 중으로부터 복귀했습니다."
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s 을(를) 읽는 중 오류"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"%s 을(를) 읽는 중 오류가 발생했습니다. 이 정보는 읽을 수 없습니다. 또한, 오래"
-"된 파일 이름을 \"%s~\" (으)로 변경했습니다."
-
 msgid "Calculating..."
 msgstr "계산 중..."
 
@@ -10419,6 +10348,18 @@ msgstr "접속이 거부되었습니다."
 msgid "Address already in use."
 msgstr "이 대화명은 이미 사용 중입니다."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s 을(를) 읽는 중 오류"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"%s 을(를) 읽는 중 오류가 발생했습니다. 이 정보는 읽을 수 없습니다. 또한, 오래"
+"된 파일 이름을 \"%s~\" (으)로 변경했습니다."
+
 msgid "Internet Messenger"
 msgstr "인터넷 메신저"
 
@@ -10461,10 +10402,8 @@ msgstr "새 메일 알림"
 msgid "Use this buddy _icon for this account:"
 msgstr "다음 아이콘 사용:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s 설정"
+msgid "_Advanced"
+msgstr "고급 설정(_A)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "GNOME 프록시 설정 사용"
@@ -10499,9 +10438,6 @@ msgstr "가까이 잘 보면"
 msgid "you can see the butterflies mating"
 msgstr "나비가 친구가 되어 있는 것을 알 수 있습니다."
 
-msgid "Proxy Options"
-msgstr "프록시 설정"
-
 msgid "Proxy _type:"
 msgstr "프록시 형식(_T):"
 
@@ -10530,8 +10466,9 @@ msgstr "기본 설정(_B)"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "고급 설정(_A)"
+#, fuzzy
+msgid "_Proxy"
+msgstr "프록시"
 
 msgid "Enabled"
 msgstr "사용"
@@ -10578,16 +10515,17 @@ msgid "Please update the necessary fields."
 msgstr "필요한 항목을 갱신해 주십시오."
 
 #, fuzzy
-msgid "Room _List"
-msgstr "대화실 목록"
+msgid "A_ccount"
+msgstr "계정"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "참가할 대화에 대해 적당한 정보를 입력해 주십시오.\n"
 
-msgid "_Account:"
-msgstr "계정(_A):"
+#, fuzzy
+msgid "Room _List"
+msgstr "대화실 목록"
 
 msgid "_Block"
 msgstr "거부(_B)"
@@ -10605,6 +10543,17 @@ msgid "I_M"
 msgstr "인스턴트 메시지(_M)"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "대화 추가(_A)"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "영상 대화"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "파일 전송(_S)"
 
@@ -10616,7 +10565,11 @@ msgid "View _Log"
 msgstr "로그 보기(_L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "오프라인일 때에는 허가되지 않았습니다."
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "오프라인일 때에는 허가되지 않았습니다."
 
 msgid "_Alias..."
@@ -10749,6 +10702,10 @@ msgstr "/도구/친구 알림(_P)"
 msgid "/Tools/_Certificates"
 msgstr "/도구/인증(_C)"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/도구/개인 정보"
+
 msgid "/Tools/Plu_gins"
 msgstr "/도구/플러그인(_G)"
 
@@ -10758,10 +10715,6 @@ msgstr "/도구/설정(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/도구/개인 정보(_I)"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/도구/개인 정보"
-
 msgid "/Tools/_File Transfers"
 msgstr "/도구/파일 전송(_F)"
 
@@ -10883,8 +10836,8 @@ msgstr "수동 정렬"
 msgid "By status"
 msgstr "상태순"
 
-msgid "By log size"
-msgstr "로그 크기순"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10902,6 +10855,9 @@ msgstr "접속"
 msgid "Re-enable"
 msgstr "계정 재사용"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10995,6 +10951,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "별칭:"
 
+msgid "_Group:"
+msgstr "그룹(_G):"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11030,6 +10989,116 @@ msgstr "/도구"
 msgid "/Buddies/Sort Buddies"
 msgstr "/친구/친구 정렬"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "배경색"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "이 그룹은 친구 목록에 추가되어 있습니다."
+
+#, fuzzy
+msgid "Layout"
+msgstr "사자자리"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "배경색"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "보이기(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "배경색 선택"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "숨기기(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "배경색 선택"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "상태 문자"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "온라인"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "자리 비움"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "오프라인"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "혈액형"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "메시지를 보냈습니다."
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s 의 사용자 정보 변경"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "이 인증을 위한 호스트명을 입력하십시오."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL 서버"
@@ -11048,13 +11117,6 @@ msgstr "지금 그 친구를 초대 가능한 계정으로 접속되어 있지 �
 msgid "Invite Buddy Into Chat Room"
 msgstr "친구를 대화실로 초대"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"초대하고자 하는 상대의 이름과 초대 메시지(선택 사항)을 입력해 주십시오."
-
 msgid "_Buddy:"
 msgstr "친구(_B):"
 
@@ -11083,7 +11145,8 @@ msgstr "무시할 대상"
 msgid "Get Away Message"
 msgstr "자리 비움 메시지"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "마지막 메시지:"
 
 msgid "Unable to save icon file to disk."
@@ -11130,6 +11193,22 @@ msgstr "/대화/다른 이름으로 저장(_S)..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/대화/화면 비우기(_R)"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/대화/자세히(_O)"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/대화/자세히(_O)"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/대화/자세히(_O)"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/대화/로그 보기(_L)"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/대화/파일 전송(_N)..."
 
@@ -11204,6 +11283,18 @@ msgstr "/대화"
 msgid "/Conversation/View Log"
 msgstr "/대화/로그 보기"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/대화/자세히(_O)"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/대화/로그 보기"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/대화/자세히(_O)"
+
 msgid "/Conversation/Send File..."
 msgstr "/대화/파일 전송..."
 
@@ -11388,6 +11479,9 @@ msgstr "양치기자리"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "지원"
 
@@ -11516,6 +11610,10 @@ msgid "Hungarian"
 msgstr "헝가리어"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "루마니아어"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "마케도니아어"
 
@@ -11533,6 +11631,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "현재 번역자"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "기타"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "차단되었습니다."
 
@@ -11556,6 +11658,10 @@ msgid "Macedonian"
 msgstr "마케도니아어"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "마케도니아어"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "노르웨이어"
 
@@ -11613,6 +11719,9 @@ msgstr "파티"
 msgid "Swedish"
 msgstr "스웨덴어"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "타밀어"
 
@@ -11671,7 +11780,24 @@ msgstr ""
 "를 참조해 주십시오. 본 프로그램은 어떠한 보증도 하지 않습니다.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net의 #pidgin 채널<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net의 #pidgin 채널<BR><BR>"
 
 msgid "Current Developers"
@@ -11929,7 +12055,7 @@ msgid "Hyperlink visited color"
 msgstr "하이퍼링크 색상"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "하이퍼링크 위에 커서가 놓였을 때의 색상입니다."
 
 msgid "Hyperlink prelight color"
@@ -11967,15 +12093,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "알림을 삭제할 시기"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "새 메일 알림"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11988,15 +12121,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "새 메일 알림"
 
-msgid "_Copy Email Address"
-msgstr "이메일 주소 복사(_C)"
-
-msgid "_Open Link in Browser"
-msgstr "링크를 브라우저로 열기(_O)"
-
-msgid "_Copy Link Location"
-msgstr "링크 주소 복사(_C)"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12038,11 +12162,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "이미지 저장"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "이미지 저장(_S)..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "사용자 이모티콘 표시"
 
@@ -12129,9 +12252,6 @@ msgstr "글자 크기 작게"
 msgid "Font Face"
 msgstr "글꼴 종류"
 
-msgid "Background Color"
-msgstr "배경색"
-
 msgid "Foreground Color"
 msgstr "글자색"
 
@@ -12245,6 +12365,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12272,6 +12393,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12332,12 +12454,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "해(돼지)"
 
-msgid "Open All Messages"
-msgstr "모든 메시지 열기"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "계산 중..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">새로운 메일이 도착했습니다!</span>"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12366,6 +12503,29 @@ msgid ""
 msgstr ""
 "브라우저 명령이 '수동설정'으로 되어 있지만, 명령이 지정되어 있지 않습니다."
 
+#, fuzzy
+msgid "No message"
+msgstr "알 수 없는 메시지"
+
+msgid "Open All Messages"
+msgstr "모든 메시지 열기"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">새로운 메일이 도착했습니다!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "새 친구 알림"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">새로운 메일이 도착했습니다!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "다음의 플러그인을 해제합니다."
 
@@ -12418,10 +12578,17 @@ msgstr "<b>플러그인 상세</b>"
 msgid "Select a file"
 msgstr "파일 선택"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "친구 알림 편집"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "알림을 받을 친구"
 
+msgid "_Account:"
+msgstr "계정(_A):"
+
 msgid "_Buddy name:"
 msgstr "친구 이름(_B):"
 
@@ -12489,7 +12656,60 @@ msgstr "반복(_R)"
 msgid "Pounce Target"
 msgstr "알림 받을 상대"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "입력 시작했을 때(_T)"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "입력을 일시 중지했을 때(_A)"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "접속했을 때(_G)"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s 대기로부터 복귀했습니다. (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "자리 비움으로부터 복귀했을 때(_U)"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "입력을 중지했습니다."
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "접속을 해제했을 때(_F)"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "대기 상태가 되었을 때(_I)"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "자리 비움일 때만"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "메시지 보내기(_M)"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "알 수 없는 \"알림\" 이벤트입니다. 꼭 보고해 주십시오!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "이모티콘 테마를 풀 수 없습니다."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "이모티콘 테마를 풀 수 없습니다."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "이모티콘 테마를 풀 수 없습니다."
 
 msgid "Install Theme"
@@ -12512,6 +12732,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "%s 님과의 대화"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "친구 목록"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "시스템 트레이 아이콘"
 
@@ -12521,8 +12747,9 @@ msgstr "시스템 트레이 아이콘 표시(_S):"
 msgid "On unread messages"
 msgstr "메시지를 받았을 때"
 
-msgid "Conversation Window Hiding"
-msgstr "대화 창 숨기기"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "메시지 대화 창"
 
 msgid "_Hide new IM conversations:"
 msgstr "새 대화 창 숨기기(_H):"
@@ -12530,6 +12757,9 @@ msgstr "새 대화 창 숨기기(_H):"
 msgid "When away"
 msgstr "자리 비움일 때만"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "최소화로 새 대화창 열기(_Z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "탭"
@@ -12588,9 +12818,6 @@ msgstr "부드러운 스크롤 사용"
 msgid "F_lash window when IMs are received"
 msgstr "메시지를 받으면 창을 깜빡거림(_L)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "최소화로 새 대화창 열기(_Z)"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12623,13 +12850,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "사용자 정보를 가져오지 못했습니다."
 
-msgid "ST_UN server:"
-msgstr "STUN 서버(_U):"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">예: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP 주소를 자동으로 감지(_A)"
 
 msgid "Public _IP:"
@@ -12650,6 +12875,10 @@ msgstr "시작 포트 번호(_S):"
 msgid "_End port:"
 msgstr "종료 포트 번호(_E):"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "프록시 서버"
@@ -12679,6 +12908,10 @@ msgstr "프록시 서버"
 msgid "No proxy"
 msgstr "프록시 없음"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "사용자명(_U):"
 
@@ -12843,12 +13076,12 @@ msgstr "자리 비움으로 대기 상태일 때"
 msgid "Auto-away"
 msgstr "자동 자리 비움"
 
-msgid "Change status when _idle"
-msgstr "대기 상태가 되면 상태 변경(_I)"
-
 msgid "_Minutes before becoming idle:"
 msgstr "대기 시간 간격(분)(_M)"
 
+msgid "Change status when _idle"
+msgstr "대기 상태가 되면 상태 변경(_I)"
+
 msgid "Change _status to:"
 msgstr "다음 상태로 변경(_S):"
 
@@ -12997,29 +13230,19 @@ msgstr "저장 후 사용(_V)"
 msgid "Status for %s"
 msgstr "%s 의 상태"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "이모티콘을 삽입합니다."
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "문자열이 중복되고 있습니다."
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "상태 제목을 입력해 주십시오."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "이모티콘을 삽입합니다."
@@ -13029,11 +13252,11 @@ msgid "Add Smiley"
 msgstr "이모티콘(_S)"
 
 #, fuzzy
-msgid "Smiley _Image"
-msgstr "이미지 저장"
+msgid "_Image:"
+msgstr "이미지(_I)"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
+#. Shortcut text
+msgid "S_hortcut text:"
 msgstr ""
 
 #, fuzzy
@@ -13041,10 +13264,18 @@ msgid "Smiley"
 msgstr "이모티콘(_S)"
 
 #, fuzzy
+msgid "Shortcut Text"
+msgstr "상태 문자"
+
+#, fuzzy
 msgid "Custom Smiley Manager"
 msgstr "인증 관리자"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "친구 선택"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "다음 아이콘 사용:"
 
@@ -13134,9 +13365,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "실행기는 전송할 수 없습니다."
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "드래그 한 것은 데스크탑 실행기입니다. 아마도 실행기 자신이 아닌, 실행기가 지"
 "시하고 있는 오브젝트를 전송하고자 할 것입니다."
@@ -13173,6 +13405,16 @@ msgstr ""
 "이미지 '%s' 의 불러오기에 실패했습니다: 원인은 알 수 없으나, 아마도 잘못된 이"
 "미지 파일인 것 같습니다."
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "링크를 여는 방식(_O):"
+
+msgid "_Copy Link Location"
+msgstr "링크 주소 복사(_C)"
+
+msgid "_Copy Email Address"
+msgstr "이메일 주소 복사(_C)"
+
 msgid "Save File"
 msgstr "파일 저장"
 
@@ -13268,6 +13510,78 @@ msgstr "친구와 대화할 가능성을 예측하는 플러그인입니다."
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "서버 주소"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "회의 서버 입력"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "질의할 회의 서버 선택"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "온라인 서비스"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "친구 목록 보내기"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "자리 비움이 되었을 때(_W)"
+
+#, fuzzy
+msgid "Directory"
+msgstr "로그 기록 폴더"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "소리 선택"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "설명"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "폴더 정보 설정"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "브라우저(_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "사용자가 없습니다."
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "서버는 지원하고 있는 인증 방식을 이용하지 않습니다."
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "폴더 정보 설정"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"이것은 XMPP 서버 또는 클라이언트를 디버그 할 때에 편리한 플러그인입니다."
+
 msgid "Buddy is idle"
 msgstr "대기 중인 친구"
 
@@ -13651,9 +13965,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "합작하기 위한 음악 메시지 플러그인입니다."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "실시간으로 공통 점수를 편집함으로써 여러 명의 친구 사이에서 음악의 일부분을 "
 "동시에 연주할 수 있도록 하는 음악 메시지 플러그인입니다."
@@ -13768,12 +14083,6 @@ msgstr ""
 "- 수신한 모든 문자를 반전시킵니다.\n"
 "- 로그인하면 친구 목록의 사람들에게 메시지를 즉시 보냅니다."
 
-msgid "Cursor Color"
-msgstr "커서 색상"
-
-msgid "Secondary Cursor Color"
-msgstr "두번째 커서 색상"
-
 msgid "Hyperlink Color"
 msgstr "하이퍼링크 색상"
 
@@ -13785,6 +14094,10 @@ msgstr "하이퍼링크 색상"
 msgid "Highlighted Message Name Color"
 msgstr "강조 표시 메시지"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "알림을 삭제할 시기"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 수평방향 분리자"
 
@@ -13814,35 +14127,24 @@ msgstr "GTK+ 인터페이스 글꼴"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ 글자 바로 가기 테마"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "인터페이스 색상"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "새 메일 알림"
 
-msgid "Widget Sizes"
-msgstr "Widget 크기"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ 테마 정의"
+
+#, fuzzy
+msgid "Colors"
+msgstr "닫기"
 
 msgid "Fonts"
 msgstr "글꼴"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13933,7 +14235,7 @@ msgstr "대화 창 숨기기"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13985,6 +14287,113 @@ msgstr "Text replacement"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "사용자가 정의한 규칙에 따라 실제로 전송할 메지시를 대체합니다."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "로그인되어 있지 않습니다."
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "로그인되어 있지 않습니다."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "대화 참가"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "무시할 대상"
+
+#, fuzzy
+msgid "Founder"
+msgstr "약간 크게"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "승인을 받았습니다."
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "오류"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "직업"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "질문 창의 글꼴"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "경고 수준"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s 의 상태"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "대화실 위치"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "아이콘 저장"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ 테마 정의"
+
+#, fuzzy
+msgid "Contact"
+msgstr "연락처 정보"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "친구 목록"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "친구 목록"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ 테마 정의"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ 테마 정의"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14145,17 +14554,15 @@ msgstr "친구 목록을 맨 위로 배치한 상태 유지(_K):"
 msgid "Only when docked"
 msgstr "결합했을 때만"
 
-msgid "_Flash window when chat messages are received"
-msgstr "대화에서 메시지를 받으면 창을 깜박거림(_F)"
-
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin 설정"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows를 위한 Pidgin 설정을 제공합니다."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "친구 목록 도킹과 같은 Windows에 대한 Pidgin 설정을 제공합니다."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14196,6 +14603,515 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "이것은 XMPP 서버 또는 클라이언트를 디버그 할 때에 편리한 플러그인입니다."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "소켓을 열 수 없습니다."
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "소켓을 감시할 수 없었습니다."
+
+#~ msgid "Unable to read socket"
+#~ msgstr "소켓을 읽을 수 없습니다."
+
+#~ msgid "Connection failed."
+#~ msgstr "접속에 실패했습니다."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "서버가 접속을 끊었습니다."
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "소켓을 생성하지 못했습니다."
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "호스트에 접속하지 못했습니다."
+
+#~ msgid "Read error"
+#~ msgstr "읽기 오류입니다."
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "서버와의 접속을 확립하지 못했습니다:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "쓰기 오류"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "폴더 정보 설정"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "주소2"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "대화 별칭"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "디렉토리 정보가 없습니다."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "명령 지정"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML 형식"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "등록 오류"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "위치"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "사용자 검색"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Buddy State Notification"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "지원되지 않는 버전"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "방향"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "사용자 모드"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "사용자 제한"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "기능"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "사용자명"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "키 교환 첨부 IM"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "이메일 주소"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "프로파일"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "참가"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "사용자명"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "라이브 영상"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "메시지를 받았습니다."
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "공개 키 Babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "사용자 설정"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "사용자 모드"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "사용자명"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "사용자 제한"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian 암호화"
+
+#~ msgid "Read Error"
+#~ msgstr "읽기 오류"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "서버 접속에 실패했습니다."
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "메시지를 해독할 수 없습니다."
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "호스트에 접속하지 못했습니다."
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "로그인에 실패했습니다. (%s)。"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "다른 워크스테이션으로부터 로그인 되어 있기 때문에, 강제적으로 로그아웃 되"
+#~ "었습니다."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "오류입니다. SSL 지원이 설치되어 있지 않습니다."
+
+#~ msgid "Incorrect password."
+#~ msgstr "비밀번호가 틀립니다."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS 서버에 접속할 수 없었습니다:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "곧 접속이 끊깁니다. 갱신을 위해 %s 을(를) 선택하십시오."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "접속할 수 없었습니다."
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "이름이 잘못되었습니다."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "서버 정보를 가져올 수 없습니다."
+
+#~ msgid "Connection lost"
+#~ msgstr "접속을 닫았습니다."
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "호스트명을 해석할 수 없었습니다."
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "쓰기 연결을 닫았습니다."
+
+#~ msgid "Connection reset"
+#~ msgstr "접속 초기화"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "소켓으로부터 읽는 중 오류: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "호스트에 접속할 수 없습니다."
+
+#~ msgid "Could not write"
+#~ msgstr "쓸 수 없었습니다."
+
+#~ msgid "Could not connect"
+#~ msgstr "접속할 수 없었습니다."
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "감시 소켓을 생성할 수 없었습니다."
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "호스트명을 해석할 수 없었습니다."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "비밀번호가 틀립니다."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "서버와의 접속을 확립하지 못했습니다:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Korea! 에 접속"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "한국 호출기 서버"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "한국 파일 전송 서버"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "서버와의 접속이 끊어졌습니다.\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "호스트명을 해석할 수 없었습니다."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습"
+#~ "니다."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "대화 창 숨기기"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "상태 제목을 입력해 주십시오."
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "어느 ID 를 활성화 하시겠습니까?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "커서 색상"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "두번째 커서 색상"
+
+#~ msgid "Interface colors"
+#~ msgstr "인터페이스 색상"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget 크기"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "메시지 안에 삽입"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "초대하고자 하는 상대의 이름과 초대 메시지(선택 사항)을 입력해 주십시오."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Notes 주소록 선택"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "곧 접속이 끊깁니다. 이것이 수정되면 TOC 를 사용합니다. 갱신을 위해 %s 을"
+#~ "(를) 선택하십시오."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "친구 추가"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "서버 정보를 가져올 수 없습니다."
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "읽는 중 오류"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "서버와의 접속에 실패했습니다:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "서버에 접속"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "이름 가져오기에 실패했습니다: %s"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s 검색 중"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s (으)로의 접속에 실패했습니다."
+
+#~ msgid "Signon: %s"
+#~ msgstr "접속: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "파일 %s 을(를) 쓸 수 없습니다."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "파일 %s 을(를) 읽을 수 없습니다."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "메시지가 너무 길어 마지막 %s 바이트가 잘렸습니다."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s 님은 현재 로그인 되어 있지 않습니다."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s 경고는 허가되어 있지 않습니다."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "사용자 속도 제한을 초과하였기 때문에, 메시지가 유실되었습니다."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%s 에서의 대화는 가능하지 않습니다."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "너무 빨라 %s 메시지를 전송할 수 없습니다."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "너무 커서 %s (으)로부터의 IM 을 무시했습니다."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "너무 빨라 %s 님으로부터의 IM 을 무시했습니다."
+
+#~ msgid "Failure."
+#~ msgstr "실패했습니다."
+
+#~ msgid "Too many matches."
+#~ msgstr "너무 많이 일치합니다."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "더 많은 수식어가 필요합니다."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "일시적으로 디렉토리 서비스를 이용할 수 없습니다."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "이메일 검색이 거부되었습니다."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "검색어가 무시되었습니다."
+
+#~ msgid "No keywords."
+#~ msgstr "검색어가 없습니다."
+
+#~ msgid "User has no directory information."
+#~ msgstr "디렉토리 정보가 없습니다."
+
+#~ msgid "Country not supported."
+#~ msgstr "지원되지 않는 국가입니다."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "원인을 알 수 없는 실패: %s"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "아이디 또는 비밀번호가 틀립니다."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "일시적으로 서비스를 이용할 수 없습니다."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "로그인 경고 수준이 너무 높습니다."
+
+#~ msgid ""
+#~ "You have been connecting and disconnecting too frequently.  Wait ten "
+#~ "minutes and try again.  If you continue to try, you will need to wait "
+#~ "even longer."
+#~ msgstr ""
+#~ "접속과 해제를 반복 수행했습니다. 10분 정도 후에 재시도 하십시오. 이대로 계"
+#~ "속하면 더 많이 시간을 기다려야 합니다."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "원인을 알 수 없는 접속 오류가 발생했습니다: %s"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "알 수 없는 오류 %d 이(가) 발생했습니다 (정보: %s)."
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "그룹명이 잘못되었습니다."
+
+#~ msgid "Connection Closed"
+#~ msgstr "접속을 닫았습니다."
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "응답을 기다리는 중입니다..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "TOC 가 일시정지 상태에서 복귀했습니다. 메시지를 다시 보낼 수 있습니다."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "비밀번호 변경이 성공적으로 완료되었습니다."
+
+#~ msgid "Get Dir Info"
+#~ msgstr "폴더 정보 가져오기"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "폴더 정보 설정"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "쓰기 모드에서 %s 을(를) 열 수 없습니다!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "파일 전송에 실패했습니다. 아마도 상대측에서 취소한 것 같습니다."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "전송할 수 없었습니다."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "파일 헤더를 기록할 수 없습니다. 파일은 전송되지 않습니다."
+
+#~ msgid "Save As..."
+#~ msgstr "다른 이름으로 저장..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s 님으로부터 %s 님에게 %d 개의 파일 요청: %s (%.2f %s)%s%s"
+
+# msgstr[1] "%s 님으로부터 %s 님에게 %d 개의 파일 요청: %s (%.2f %s)%s%s"
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s 님이 파일을 보내도록 요청하고 있습니다."
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC 프로토콜 플러그인"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%s 의 사용자 정보는 사용할 수 없습니다."
+
+#~ msgid "%s Options"
+#~ msgstr "%s 설정"
+
+#~ msgid "Proxy Options"
+#~ msgstr "프록시 설정"
+
+#~ msgid "By log size"
+#~ msgstr "로그 크기순"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "링크를 브라우저로 열기(_O)"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN 서버(_U):"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "이미지 저장"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "대화에서 메시지를 받으면 창을 깜박거림(_F)"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "같은 이름의 그룹이 이미 존재합니다."
 
@@ -14287,13 +15203,6 @@ msgstr ""
 #~ msgid "Change Qun information"
 #~ msgstr "채널 정보"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "시스템 메시지"
 
@@ -14798,9 +15707,6 @@ msgstr ""
 #~ msgid "You [%d] has exit group \"%d\""
 #~ msgstr "나 [%d] 은(는) 그룹 \"%d\" (으)로부터 퇴거했습니다."
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "이 그룹은 친구 목록에 추가되어 있습니다."
-
 #~ msgid "I am applying to join"
 #~ msgstr "저는 가입 신청 중입니다."
 
@@ -14896,8 +15802,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "이것이 발생한 경우, TOC 는 메시지 송신을 무시하기 때문에 메시지를 보낼 수 "
 #~ "없습니다. Pidgin은 모든 송신 데이터를 차단합니다. 일시적인 현상이므로 잠시"
@@ -14909,8 +15815,8 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "표준 인증 방식으로 실패했습니다. 이것은 사용 중인 비밀번호가 틀리거나 혹"
 #~ "은 Yahoo! 의 인증 절차가 변경된 경우입니다. Pidgin은 웹 메신저 인증 방식"
diff --git a/po/ku.po b/po/ku.po
index 8eaf885314..ab44a7cce0 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-02-26 09:48+0000\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <gnu-ku-wergerandin@lists.sourceforge.net>\n"
@@ -36,7 +36,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -634,20 +634,6 @@ msgid "Send To"
 msgstr "_Bişîne"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "Peyam berde"
-
-msgid "Invite"
-msgstr "Vexwîne"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Heke bixwazî bi peyameke vewxendinê navê kesê ku dixwazî vexwînî jî têkevê."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "Nivîsandin"
 
@@ -910,6 +896,42 @@ msgid "System Log"
 msgstr "Tomarên Pergalê"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "Tê hesibandin..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Bipejirîne"
+
+#, fuzzy
+msgid "Reject"
+msgstr "Vala Bike"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Te kanal da patkirin%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "E-peyam"
 
@@ -946,6 +968,9 @@ msgstr "Girêde"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "Vexwîne"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(nav tune)"
@@ -1166,7 +1191,6 @@ msgstr "%s li derve. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s peyam ji te re şandiye. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Çalakiya hişyarkar a nayê zanîn. Ji kerema xwe re ragihîne!"
 
@@ -1221,7 +1245,6 @@ msgstr "_Xulke berê neamade bê diyar kirin:"
 msgid "Change status to"
 msgstr "_Rewşê biguherîne:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Nivîsandin"
 
@@ -1578,7 +1601,6 @@ msgstr ""
 "Dema ku axaftineke nû vebe, ev pêvek dê axaftina dawî li axaftina derbasdar "
 "zê de bike."
 
-#, c-format
 msgid "Online"
 msgstr "Girêdayî"
 
@@ -1627,6 +1649,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "Hesab"
 
@@ -1725,14 +1769,6 @@ msgstr "Tu vexwendina axaftinê qebûl dikî?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Bipejirîne"
-
-#, fuzzy
-msgid "Reject"
-msgstr "Vala Bike"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1823,6 +1859,8 @@ msgstr "%s ketiyê"
 msgid "+++ %s signed off"
 msgstr "%s derketiye"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Çewtiya nenas"
 
@@ -1870,6 +1908,17 @@ msgstr "%s ji odê derket."
 msgid "%s left the room (%s)."
 msgstr "%s ji odê derket (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Dest Bi Sohbetê Bike"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Heke bixwazî bi peyameke vewxendinê navê kesê ku dixwazî vexwînî jî têkevê."
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "Li makekompîturê nehate girêdan."
@@ -2007,7 +2056,6 @@ msgstr "Veguhastina %s ji aliyê %s tê destpêkirin."
 msgid "Transfer of file %s complete"
 msgstr "Veguhêztina %s qediya"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Derbaskirina pelan temam e"
 
@@ -2015,7 +2063,6 @@ msgstr "Derbaskirina pelan temam e"
 msgid "You canceled the transfer of %s"
 msgstr "Te şandina %s'yê betal kir"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Şandina pelî hat betalkirin"
 
@@ -2200,11 +2247,14 @@ msgstr "<font color=\"red\"><b>Pel nehat xwendin: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Bersiva-Bixweber>: %s↵\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Çewtiya pêkanîna girêdanan"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2616,7 +2666,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2667,7 +2717,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2696,6 +2746,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Şîfreyê Binivîse"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2889,18 +2965,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "Girêdana nû nehat çêkirin."
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Nav"
 
@@ -2935,6 +3011,11 @@ msgstr "Pêveka Protokla Yahooyê"
 msgid "Purple Person"
 msgstr "Kesê/a nû"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Herêm"
+
 msgid "Bonjour"
 msgstr "Rojbaş"
 
@@ -2945,16 +3026,17 @@ msgstr "%s Deriyê sohbetê girt"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Girêdan venabe"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Bi pêşkêşkar re têkilî nehat danîn"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Soket nehat afirandin"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Girêdan venabe"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3002,13 +3084,16 @@ msgstr "Lîsteya Kesan Tomar Bike..."
 msgid "Load buddylist from file..."
 msgstr "Lîsteya hevalan ji pelî bar bike..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Qadên tomarkirinê tije bike."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Şîfre ne weke hev in."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Hesabekî nû nehate tomarkirin. Çewtî çêbû.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3020,14 +3105,15 @@ msgstr "Tomarkirin bi awayekî serkeftî hate bidawîkirin!"
 msgid "Password"
 msgstr "Şîfre"
 
-msgid "Password (retype)"
-msgstr "Şîfre (dubare bike)"
+msgid "Password (again)"
+msgstr "Şîfre (dîsa)"
 
-msgid "Enter current token"
-msgstr "Bikarhêner %s danişîn venekiriye"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Niha vekirî ye"
+#, fuzzy
+msgid "Captcha"
+msgstr "Wêneyê Tomar Bike"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Hesabekî nû yê Gadu-Gadu Çêbike"
@@ -3081,6 +3167,15 @@ msgstr "Şîfre bi rengekî serkeftî hate guhertin"
 msgid "Current password"
 msgstr "Şîfreya heyî"
 
+msgid "Password (retype)"
+msgstr "Şîfre (dubare bike)"
+
+msgid "Enter current token"
+msgstr "Bikarhêner %s danişîn venekiriye"
+
+msgid "Current token"
+msgstr "Niha vekirî ye"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Ji kerema xwe bo UIN şîfreya xwe ya niha û ya nû binivîse: "
 
@@ -3094,13 +3189,13 @@ msgstr "Ji bo kes sohbetekê hilbijêr: %s"
 msgid "Add to chat..."
 msgstr "Sohbetekê lê zêde bike..."
 
+#. Global
 msgid "Available"
 msgstr "Amade"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Li derve"
 
@@ -3128,7 +3223,8 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Xwendina socket serneket"
 
 msgid "Buddy list downloaded"
@@ -3143,8 +3239,14 @@ msgstr "Lîsteya heval hate daxistin"
 msgid "Your buddy list was stored on the server."
 msgstr "Lîsteya te ya heval di pêşkêşker de hate bicihkirin"
 
-msgid "Connection failed."
-msgstr "Girêdan pêk nehat."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Girêdayî"
+
+msgid "Connection failed"
+msgstr "Girêdan serneket"
 
 msgid "Add to chat"
 msgstr "Têxe Sohbetê"
@@ -3152,13 +3254,23 @@ msgstr "Têxe Sohbetê"
 msgid "Chat _name:"
 msgstr "_Navê sohbetê:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Bi pêşkêşkarê re girêdan pêk nehat"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Girêdide"
+
 msgid "Chat error"
 msgstr "Çewtiya sohbetê"
 
 msgid "This chat name is already in use"
 msgstr "Vî navê sohbetê vêga dixebite"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Li pêşkêşkerê nehate girêdan."
 
 msgid "Find buddies..."
@@ -3200,6 +3312,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Bikarhênerê Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Agahiya Bikarhêner Biguherîne..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Fermana nayê zanîn: %s"
@@ -3215,7 +3331,7 @@ msgid "File Transfer Failed"
 msgstr "Guheztina Pelgehê Bi Ser Neket"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidginê porteke guhdarkirinê venekir."
 
 msgid "Error displaying MOTD"
@@ -3231,8 +3347,16 @@ msgstr "MOTD'eke têkilî girêdanê nehat dîtin."
 msgid "MOTD for %s"
 msgstr "MOTD ji bo %s"
 
-msgid "Server has disconnected"
-msgstr "Girêdana pêşkêşkar qut bû"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Li pêşkêşkerê nehate girêdan."
 
 msgid "View MOTD"
 msgstr "MOTD'ê nîşan bide"
@@ -3243,25 +3367,24 @@ msgstr "_Kanal:"
 msgid "_Password:"
 msgstr "Şî_fre:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Navên IRC'ê bi valahî çênabin"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Girêdide"
-
 msgid "SSL support unavailable"
 msgstr "Desteka SSL tune"
 
-msgid "Couldn't create socket"
-msgstr "Soket nehat afirandin"
+msgid "Unable to connect"
+msgstr "Nayê girêdan"
 
-msgid "Couldn't connect to host"
-msgstr "Bi pêşkêşkar re têkilî nehat danîn"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Bi pêşkêşkarê re girêdan pêk nehat."
 
-msgid "Read error"
-msgstr "Xeletiya xwendinê"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "%s Deriyê sohbetê girt"
 
 msgid "Users"
 msgstr "Bikarhêner"
@@ -3444,6 +3567,17 @@ msgstr ""
 "Navê hesabê te yê hilbijartî ji alî pêşkêşker ve hate redkirin. Dibe ku "
 "sembolên çewt hewandibe."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Vî navê sohbetê vêga dixebite"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Leqeb"
+
 msgid "Cannot change nick"
 msgstr "Navê bikarhêner nayê guherandin"
 
@@ -3677,13 +3811,14 @@ msgstr "Fermana nederbasdar"
 msgid "execute"
 msgstr "Ya ne li bendê"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Daxwaza TLS/SSL a pêşkêşkar ji bo têketinê. Tu piştgiriyeke TLS/SSL nehat "
 "dîtin."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Daxwaza TLS/SSL a pêşkêşkar ji bo têketinê. Tu piştgiriyeke TLS/SSL nehat "
 "dîtin."
@@ -3704,18 +3839,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Pelgekirina nivîsên neşifrekirî"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Têketin serneket"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Ji pêşkêşkarê bersiva xeletiyê"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Pêşkêşker ti şêwazê pelgekirinê nade bikaranîn"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Xeletî: Ji pêşkêşkar bersiva nederbasdar"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Çewtiya SASL"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Navê xuya dibe tune."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Guhertoya Nederbasdar"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Girêdana nû nehat çêkirin."
+
 msgid "Full Name"
 msgstr "Nav û paşnav"
 
@@ -3784,186 +3951,9 @@ msgstr "Bajar"
 msgid "Operating System"
 msgstr "Pergala Xebatê Veşêre"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Agahiyên Bikarhêner Têkevê"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Navnîşan (dûmahîk)"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Chata Xuya Dibe"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
 #, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Ferman"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Şaşîtiya Tomarkirinê"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Cih"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "Navê bikarhêner"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Hişyarkirina Rewşa Kesan"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Guhertoya Nederbasdar"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Beralîkirin"
-
-msgid "File Transfer"
-msgstr "Şandina Pelgehê"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Modên Bikarhêner"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Sînorkirina Bikarhêner"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Taybetmendî"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Navê bikarhêner"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "Bi IMê re Guhertina Mifteyan"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Navnîşana E-peyamê"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Profîla Jabber"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Navê bikarhêner"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Vîdeoya Zindî"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Peyam hat standin"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Pelgeha Mifteyên Giştî"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Vebijartokên Bikarhêneran"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Modên Bikarhêner"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Navê bikarhêner"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Sînorkirina Bikarhêner"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Şîfrekirina Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Taybetmendî"
+msgid "Local Time"
+msgstr "Bikarhênera Herêmî"
 
 msgid "Priority"
 msgstr "Pêşî"
@@ -3971,6 +3961,14 @@ msgstr "Pêşî"
 msgid "Resource"
 msgstr "Çavkanî"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Daniştin hat girtin"
+
 msgid "Middle Name"
 msgstr "Navê navîn"
 
@@ -4018,7 +4016,6 @@ msgstr "Amadeyê sohbetê"
 msgid "Extended Away"
 msgstr "Demeke Dirêj e Li Derve ye"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Mijûl Nekin"
 
@@ -4141,28 +4138,27 @@ msgstr "Pêşkêşkerê konferansê hilbijêre ji bo lêpirsînê"
 msgid "Find Rooms"
 msgstr "Li Odeyan Bigere"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Navê ku xuya dibe"
 
-msgid "Write error"
-msgstr "Xeletiya Nivîsandinê"
+#, fuzzy
+msgid "No users found"
+msgstr "Tomara rojenûskê nehate dîtin"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Deqa rast"
+msgid "Roles:"
+msgstr "Rol"
 
-msgid "Read Error"
-msgstr "Çewtiya Xwendinê"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Deqa rast"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "Girêdan venabe"
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "ID'a nederbasdar"
@@ -4170,6 +4166,10 @@ msgstr "ID'a nederbasdar"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Li makekompîturê nehate girêdan."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Tomarkirina %s@%s qediya"
@@ -4196,9 +4196,6 @@ msgstr "Tomarkirin Qediya"
 msgid "Unregistration Failed"
 msgstr "Tomarkirin Neqediya"
 
-msgid "Already Registered"
-msgstr "Jixwe Tomarbûyî ye"
-
 msgid "State"
 msgstr "Dewlet"
 
@@ -4211,6 +4208,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Dîrok"
 
+msgid "Already Registered"
+msgstr "Jixwe Tomarbûyî ye"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Tomarkirin"
@@ -4243,6 +4243,10 @@ msgid "Change Registration"
 msgstr "Şaşîtiya Tomarkirinê"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Li makekompîturê nehate girêdan."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Çewtiya pêkanîna girêdanan"
 
@@ -4262,9 +4266,18 @@ msgstr "Belgekirin"
 msgid "Re-initializing Stream"
 msgstr "Ji nû destpêkirina herikandinê"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Destûr Nehat Dayîn"
 
+msgid "Mood"
+msgstr "Baş"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Her du"
 
@@ -4286,12 +4299,6 @@ msgstr "Ne yek jî"
 msgid "Subscription"
 msgstr "Abone"
 
-msgid "Mood"
-msgstr "Baş"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "Baş"
@@ -4339,9 +4346,6 @@ msgstr "Şîfreya te hat guherandin"
 msgid "Error changing password"
 msgstr "Xeletiya guherandina şîfreyê"
 
-msgid "Password (again)"
-msgstr "Şîfre (dîsa)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Şîfreyê Biguherîne"
@@ -4536,18 +4540,24 @@ msgstr "%s nehat şandin"
 msgid "Unable to ping user %s"
 msgstr "%s nehat qedexekirin"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Nikare deng bixebitîne (%s) ji ber ku pelê hilbijartî ne li gorê ye"
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Nikare deng bixebitîne (%s) ji ber ku pelê hilbijartî ne li gorê ye"
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Nikare deng bixebitîne (%s) ji ber ku pelê hilbijartî ne li gorê ye"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4558,9 +4568,39 @@ msgstr "Gurimm!!"
 msgid "%s has buzzed you!"
 msgstr "%s têketin pêk aniye."
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Peyam ji %s re nehate şandin."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+"Ji %s re pel nayê şandin, bikarhêner ji bo verêkirina pelan destûrê nade"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
+"Ji %s re pel nayê şandin, bikarhêner ji bo verêkirina pelan destûrê nade"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Tomarkirin Neqediya"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Ji kerema xwe re navê ekrayê yê bikarhênera/ê ku dixwazî agahiyên wê/î "
+"bibînî."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "Pelekî hilbijêre"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Dest Bi Sohbetê Bike"
 
 msgid "config:  Configure a chat room."
 msgstr "config: Odeyeke sohbetê serast bike"
@@ -4582,13 +4622,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "berîdan &lt;bikarhêner&gt; [ode]: Ji odê bera bikarhênerekê/î bide."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4657,6 +4697,9 @@ msgstr "Digel pêşkêşkar girêdan çêke"
 msgid "File transfer proxies"
 msgstr "Porta veguheztina pelan"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4697,6 +4740,14 @@ msgstr "Xeletiya jeveqetandina XML"
 msgid "Unknown Error in presence"
 msgstr "Xeletiya Nayê Zanîn"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Di tevlibûna sohbeta %s de xeletî"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Di sohbeta %s de xeletî"
+
 msgid "Create New Room"
 msgstr "Odeya Nû Biafirîne"
 
@@ -4711,13 +4762,32 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Di tevlibûna sohbeta %s de xeletî"
+#, fuzzy
+msgid "No reason"
+msgstr "Navê xuya dibe tune."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Di sohbeta %s de xeletî"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Ji hêla %s ve hatî dakirin: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Ji hêla %s ve hatî dakirin (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Di vekirina pelî de xeletiyek çêbû."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Guheztina Pelgehê Bi Ser Neket"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Wêne nehat tomarkirin: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4748,10 +4818,6 @@ msgstr ""
 "bibînî."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "Pelekî hilbijêre"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "Modên Bikarhêner"
 
@@ -4791,9 +4857,20 @@ msgstr "Çalakî"
 msgid "Select an action"
 msgstr "Pelekî hilbijêre"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Nikare \"%s\" lê zêde bike."
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Girêdan venabe"
+msgid "Buddy Add error"
+msgstr "Şaşîtiya Lîsteya Kesan"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5023,7 +5100,7 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr "Hesabê passport hê nehatiye piştrastkirin"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Hesabê passport hê nehatiye piştrastkirin"
 
@@ -5047,6 +5124,10 @@ msgstr "Têkiliya ku tê Pêşniyarkirin"
 msgid "Non-IM Contacts"
 msgstr "Têkiliyê Rake"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5118,6 +5199,13 @@ msgstr "SMS bişîne."
 msgid "Page"
 msgstr "Rûpel"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Faqsa Kar"
+
 msgid "Has you"
 msgstr "Dixwazî"
 
@@ -5158,6 +5246,14 @@ msgstr "Navnîşan"
 msgid "Album"
 msgstr ""
 
+#, fuzzy
+msgid "Game Title"
+msgstr "Sernivîs"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Sernivîs"
+
 msgid "Set Friendly Name..."
 msgstr ""
 
@@ -5195,9 +5291,6 @@ msgstr ""
 "derbasdar bar bike. Ji bo zêdetir agahî here navnîşana http://Pidgin.sf.net/"
 "faq-ssl.php ."
 
-msgid "Failed to connect to server."
-msgstr "Li makekompîturê nehate girêdan."
-
 msgid "Error retrieving profile"
 msgstr "Di standina Profîlê de xeletî"
 
@@ -5369,8 +5462,9 @@ msgid ""
 msgstr ""
 "Profîla bikarhêner a Pidgin venabe, dibe ku bikarhênereke/î wisa tune be."
 
-msgid "Profile URL"
-msgstr "URL'a Profîlê"
+#, fuzzy
+msgid "View web profile"
+msgstr "Dema negirêdayî be destûrê nade"
 
 #. *< type
 #. *< ui_requirement
@@ -5407,65 +5501,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Çewtî: Venihêrtina Nasnameyê Neserkeftî ye"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ne grubeke derbasdar e."
-
-msgid "Unknown error."
-msgstr "Xeletiya nayê zanîn."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s - %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s lerizandinek ji te re şand"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Çewtiya nenas"
 
 msgid "Unable to add user"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Çewtiya nenas"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Ancamên lêgerîna te"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Bikarhêner li %s nayê zêdekirin (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Bikarhêner li %s nayê qedexekirin (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Li %s ji bo bikarhêner destûr nayê dayîn (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Ji ber ku lîsteya te tije ye %s lê nayê zêdekirin."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ne hesabeke derbasdar a passport e."
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Ji ber ku bikarhêner negirêdayî ye, peyam nehat şandin:"
 
-msgid "Unable to rename group"
-msgstr "Navê komê nayê guherandin"
-
-msgid "Unable to delete group"
-msgstr "Kom jê nayê birin"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5509,9 +5566,6 @@ msgstr "Ji ber xeletiyeke nayê zanîn peyam nehat şandin:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Ji ber xeletiyeke nayê zanîn peyam nehat şandin:"
 
-msgid "Unable to connect"
-msgstr "Nayê girêdan"
-
 msgid "Writing error"
 msgstr "Çewtiya nivîsandinê"
 
@@ -5526,13 +5580,16 @@ msgstr ""
 "Çewtiya têkiliyê ji pêşkêşker%s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Protokola me ji hêla pêşkêşkar ve nayê destekirin."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Xeletiya jevcihêkirina HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Te bi pernameyeke din daniştin vekir"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5540,7 +5597,8 @@ msgstr ""
 "Bi lîsteya te ya MSN'ê re ji bo demekê têkilî nayê danîn. Ji kerema xwe re "
 "dû re dîsa biceribîne."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Pêşkêşkara MSN'ê ji bo demekê tê girtin."
 
 #, c-format
@@ -5571,6 +5629,14 @@ msgstr "Çerez tê şandin"
 msgid "Retrieving buddy list"
 msgstr "Lîste tê standin"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Ji Komputerê Dûr"
 
@@ -5608,14 +5674,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Ji ber xeletiyeke nayê zanîn peyam nehat şandin:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Têxe Deftera Navnîşanan"
@@ -5624,13 +5682,6 @@ msgstr "Têxe Deftera Navnîşanan"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Tu dixwazî vî/ê li lîsteya xwe ya hevalan zêde bikî?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Nikare \"%s\" lê zêde bike."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
@@ -5638,6 +5689,9 @@ msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 msgid "This Hotmail account may not be active."
 msgstr "Dibe ku vî hesabê Hotmaîlê ne çalak be"
 
+msgid "Profile URL"
+msgstr "URL'a Profîlê"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5652,17 +5706,62 @@ msgstr "Dibe ku vî hesabê Hotmaîlê ne çalak be"
 msgid "MSN Protocol Plugin"
 msgstr "Pêveka Protokola IRC"
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s ne grubeke derbasdar e."
+
+msgid "Unknown error."
+msgstr "Xeletiya nayê zanîn."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s - %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Bikarhêner li %s nayê zêdekirin (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Bikarhêner li %s nayê qedexekirin (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Li %s ji bo bikarhêner destûr nayê dayîn (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Ji ber ku lîsteya te tije ye %s lê nayê zêdekirin."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ne hesabeke derbasdar a passport e."
+
+msgid "Service Temporarily Unavailable."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+msgid "Unable to rename group"
+msgstr "Navê komê nayê guherandin"
+
+msgid "Unable to delete group"
+msgstr "Kom jê nayê birin"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s has removed you from his or her buddy list."
 msgstr ""
 
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+#, fuzzy
+msgid "User lookup"
+msgstr "Jûrên Bikarhêneran"
+
 #, fuzzy
 msgid "Reading challenge"
 msgstr "Dane tê xwendin"
@@ -5675,13 +5774,23 @@ msgstr "Xeletî: Ji pêşkêşkar bersiva nederbasdar"
 msgid "Logging in"
 msgstr "Tomar"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "Nav tune"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "Li pêşkêşkerê nehate girêdan."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Peyama li derve ya nû"
@@ -5702,20 +5811,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "Nav tune"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_Paceya peyaman"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Girêdayî"
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "Ji pêşkêşkarê bersiva xeletiyê"
 
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
@@ -5723,16 +5834,23 @@ msgstr "Di xebatê de çewtî. koda çewtiyê %d"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Bernavê şaş yan jî şîfre"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "GirÊdan qut bû."
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Bi kes re beşdarî sohbetê nebû"
 
@@ -5744,14 +5862,6 @@ msgstr "Lîsteya hevalan ji pelî bar bike..."
 msgid "persist command failed"
 msgstr "Tabloya mifteyan biserneket"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "Jûrên Bikarhêneran"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Bi kes re beşdarî sohbetê nebû"
@@ -5763,39 +5873,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "Tabloya mifteyan biserneket"
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "GirÊdan qut bû."
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Lîste tije ye"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Peyam ji hev nayê veqetandin"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Bi pêşkêşkar re têkilî nehat danîn"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "_Paceya peyaman"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "Ji pêşkêşkarê bersiva xeletiyê"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5844,9 +5931,6 @@ msgstr "Mezinahiya Fontê ya mezintirîn"
 msgid "User"
 msgstr "Bikarhêner"
 
-msgid "Profile"
-msgstr "Profîl"
-
 #, fuzzy
 msgid "Headline"
 msgstr "Red Bike"
@@ -5862,15 +5946,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "Axaftinê dade"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "Nav tune"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5883,6 +5962,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "Di vê temayê de smiley nîn in."
@@ -5891,6 +5973,14 @@ msgstr "Di vê temayê de smiley nîn in."
 msgid "Please try another username:"
 msgstr "Ji kerema xwe re ji bo gruba ku hatiye hilbijartin navekî din bibîne."
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "Nav tune"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6088,10 +6178,6 @@ msgid "Master archive is misconfigured"
 msgstr "Makearşîv şaş hatiye veavakirin"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Bernavê şaş yan jî şîfre"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Pêşkêşkerê navê bikarhêner yê te nivîsand nehate nasîn"
 
@@ -6135,9 +6221,9 @@ msgstr "An bikarhêner negirêdayî ye an jî tu hatiyê qedexekirin"
 msgid "Unknown error: 0x%X"
 msgstr "Xeletiya nayê zanîn: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Daniştin venebû (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s nehat qedexekirin"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6237,9 +6323,6 @@ msgstr "Konferansa GroupWise %d"
 msgid "Authenticating..."
 msgstr "Têdikeve..."
 
-msgid "Unable to connect to server."
-msgstr "Bi pêşkêşkarê re girêdan pêk nehat."
-
 msgid "Waiting for response..."
 msgstr "Bo bersivdanê tê rawestandin..."
 
@@ -6262,25 +6345,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Tu dixwazî li sohbetê were girêdan?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Danişîna te hate girtin, te ji dereke din danişîn vekir"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s girêdayî dixuye û peyamên ku te jê re şandiye nikare bistîne."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Li pêşkêşker nehate girêdan. Ji kerema xwe re navnîşana ku tu dixwazî lê "
 "were girêdan binivîse."
 
-msgid "Error. SSL support is not installed."
-msgstr "Xeletî. Desteka SSL nehatiye sazkirin."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ev konferans hat girtin. Êdî peyam nayên şandin."
 
@@ -6304,6 +6381,26 @@ msgid "Server port"
 msgstr "Porta pêşkêşkar"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Ji pêşkêşkarê bersiva xeletiyê"
+
+#. username connecting too frequently
+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 ""
+"Tu pir zêde lê te girêdan û jê qut dibe.Ji kerema xwe deh xulekan xwe "
+"ragirin û dîsa biceribîne. Heke tu ceribandinê zêde berdewam bike tu yê "
+"mecbûr bimîne ku pir zêde li bendê bisekine."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Çewtiya pêkanîna girêdanan"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Nekarî girêbide"
 
@@ -6312,17 +6409,7 @@ msgid "Invalid chat room name"
 msgstr "Navê Nederbasdar ê Odeyan"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "%s Deriyê sohbetê girt"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Li pêşkêşkerê nehate girêdan."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
 #. *< type
@@ -6375,8 +6462,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6545,23 +6633,18 @@ msgstr "Kamera"
 msgid "Screen Sharing"
 msgstr "Navê Ekranê"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Li Benda Sohbetê ye"
 
-#, c-format
 msgid "Not Available"
 msgstr "Tune"
 
-#, c-format
 msgid "Occupied"
 msgstr "Mijûl"
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr "Nexuya"
 
@@ -6575,16 +6658,12 @@ msgid "Buddy Comment"
 msgstr "Raveya Hevalan"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Li pêşkêşkerê nehate girêdan."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Li makekompîturê nehate girêdan."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Bi pêşkêşkarê re girêdan pêk nehat."
 
 #, fuzzy
 msgid "Username sent"
@@ -6599,50 +6678,59 @@ msgstr "GirÊdan qut bû."
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Girêdana te ya bi pêşkêşkerê re qut bû."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "Nicka nederbasdar"
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pelgeh nayê vekirin %s."
 
-msgid "Incorrect password."
-msgstr "Şîfre şaş e."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pelgeh nayê vekirin %s."
+
+msgid "Received authorization"
+msgstr "Peyam hat standin"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Bikarhêner ne mevcûd e"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Hesabê ye ji bo niha hatiye rawestandin."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Guhertoya te ya bernameyê pir kevn e. Ji kerema xwe re rojane bike: %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Tu pir zêde lê te girêdan û jê qut dibe.Ji kerema xwe deh xulekan xwe "
 "ragirin û dîsa biceribîne. Heke tu ceribandinê zêde berdewam bike tu yê "
 "mecbûr bimîne ku pir zêde li bendê bisekine."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Guhertoya te ya bernameyê pir kevn e. Ji kerema xwe re rojane bike: %s"
-
-msgid "Could Not Connect"
-msgstr "Nehat Girêdan"
-
-msgid "Received authorization"
-msgstr "Peyam hat standin"
-
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
 msgid "Enter SecurID"
 msgstr "Enter Dişîne"
@@ -6657,24 +6745,6 @@ msgstr ""
 msgid "_OK"
 msgstr "Temam"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pelgeh nayê vekirin %s."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Girêdana te ya bi pêşkêşkerê re qut bû."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pelgeh nayê vekirin %s."
-
 msgid "Password sent"
 msgstr "Şîfre hat andinş"
 
@@ -6804,7 +6874,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Peyama %hu a ji %s ji ber sedemeke nayê zanîn, nehat ber destê te."
 msgstr[1] "Peyama %hu a ji %s ji ber sedemeke nayê zanîn, nehat ber destê te."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Peyam nehat şandin: %s"
@@ -6827,6 +6897,12 @@ msgstr "Maweya ku girêdayî mayî"
 msgid "Member Since"
 msgstr "Maweyê Girêdanê:"
 
+msgid "Capabilities"
+msgstr "Taybetmendî"
+
+msgid "Profile"
+msgstr "Profîl"
+
 msgid "Your AIM connection may be lost."
 msgstr "Dibe ku girêdana te ya AIM winda bûbe."
 
@@ -6981,7 +7057,7 @@ msgstr "Peyama te pir dirêj e."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7004,7 +7080,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -7012,7 +7088,7 @@ msgid "(no name)"
 msgstr "(nav tune)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Ji ber sedemeke ku nayêzanîn fermana ku te da bicih nehat."
 
 #, fuzzy, c-format
@@ -7085,6 +7161,7 @@ msgstr "Girêde"
 msgid "Get AIM Info"
 msgstr "agahiyan bistîne"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr ""
 
@@ -7146,6 +7223,7 @@ msgstr "Lêgerîn :"
 msgid "Set User Info (web)..."
 msgstr "Agahiya Bikarhêner Biguherîne..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Ş3ifreya  (URL) biguherîne"
@@ -7179,6 +7257,10 @@ msgstr "Ji Xwe re bi E-peyaman li Hevalan Bigere"
 msgid "Search for Buddy by Information"
 msgstr ""
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Bekarhêner neteketiye"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7196,7 +7278,7 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr "Beralîkirina girêdanê tê ceribandin."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "Beralîkirina girêdanê tê ceribandin."
 
@@ -7303,7 +7385,7 @@ msgstr "Opera"
 msgid "Visible"
 msgstr "Nexuya"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7399,17 +7481,50 @@ msgstr "Rojanekirina dawî"
 msgid "Could not change buddy information."
 msgstr "Ji bo hişyarkirinê kesekê/î têkevê."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "Telefona Destan"
+
+msgid "Note"
+msgstr "Not"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Wêne"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Kesekê/î lê zêde bike"
+msgid "_Modify"
+msgstr "_Biguherîne"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "_Biguherîne"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Pêşkêşkar mijûl e"
+
+msgid "Your request was accepted."
+msgstr ""
 
-msgid "Input answer here"
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Ji bo têketina %s 'ê vexwendin divê."
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Vê/î kesê/î li lîsteya xwe ya kesan zêde bike"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Peldankeke Bikarhêner Hilbijêre"
+
 msgid "Send"
 msgstr "Bişîne"
 
@@ -7421,19 +7536,20 @@ msgstr "Şîfreya nederbasdar"
 msgid "Authorization denied message:"
 msgstr "Mezinahiya Peyamê ya Xelet:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Nasname tê kontrolkirin"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Vê/î kesê/î li lîsteya xwe ya kesan zêde bike"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "Têkeve Pêşkêşkara Konferansekê"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7456,7 +7572,7 @@ msgid "Failed sending authorize"
 msgstr "Ji kerema xwe re hesabekî çêbikin."
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Bi kes re beşdarî sohbetê nebû"
 
 #, fuzzy, c-format
@@ -7502,6 +7618,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Mîhengên nederbasdar yên proxyê"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Maweyê Girêdanê:"
 
@@ -7546,15 +7666,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "Têkeve Sohbetê"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Hejmara Telefonê"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7565,7 +7688,7 @@ msgstr "Vebijartokên Deng"
 msgid "Failed:"
 msgstr "Serneket"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7577,11 +7700,11 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Hejmara Telefonê"
 
 #, fuzzy
@@ -7592,7 +7715,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Tu dixwazî ku vê wekî îkona heval mîheng bikî?"
 
 #, fuzzy
@@ -7600,28 +7723,28 @@ msgid "Setup"
 msgstr "_Mîheng bike"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Bi kes re beşdarî sohbetê nebû"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Jê bibe"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Jê bibe"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7742,6 +7865,13 @@ msgstr "<b>Bikarhêner:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Maxlas:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<br><b>Şexsî</b><br>%s"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7749,7 +7879,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Derbarê Pidginê de"
 
 #, fuzzy
@@ -7770,6 +7900,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Derbarê Pidginê de"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Navnîşana malê"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7801,7 +7935,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Girêdide"
@@ -7814,6 +7947,9 @@ msgstr "hindik vebijartok nîşan bide"
 msgid "Show server news"
 msgstr "Hûragahiyên bikarhêneran nîşan bide"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Xeletiya xwendinê"
@@ -7823,11 +7959,7 @@ msgid "Update interval (seconds)"
 msgstr "Xeletiya xwendinê"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Agahiyên pêşkêşkerê nayên wergirtin"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Agahiyên pêşkêşkerê nayên wergirtin"
 
 #, c-format
@@ -7850,20 +7982,17 @@ msgid "Activation required"
 msgstr "Tomarbûn Divê"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "Xeletiya xwendinê"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "Diyaloga Daxwazan"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
+msgid "Failed captcha verification"
 msgstr ""
 
 #, fuzzy
@@ -7874,7 +8003,7 @@ msgstr "Wêneyê Tomar Bike"
 msgid "Enter code"
 msgstr "Şîfreyê Binivîse"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7882,67 +8011,43 @@ msgid "Enter the text from the image"
 msgstr "Ji kerema xwe re navê gruba ku dixwazî bikeviyê, bikevê"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Girêdan serneket."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Çewtiya Diyarkirinê"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "Li pêşkêşkerê nehate girêdan."
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "Xwendina socket serneket"
-
-msgid "Write Error"
-msgstr "Çewtiya Nivîsandinê"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Girêdan Hate Qutkirin"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Agahiya Bikarhêner Biguherîne..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Daxwaz hat redkirin"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Bi pêşkêşkarê re girêdan pêk nehat"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Nav an jî şîfre çewt e"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Digel pêşkêşkar girêdan çêke"
+msgid "Connecting to server"
+msgstr "Li Pêşkêşkera SILC tê Girêdan"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Çewtiya Xwendinê"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "Peyam nehat şandin."
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7952,6 +8057,10 @@ msgid ""
 msgstr "Navnîşana pêşkêşkar"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s - %s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Ji"
 
@@ -7961,32 +8070,30 @@ msgid ""
 "%s"
 msgstr "Avakerên pêşkêşker: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Sedema nenas."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Ferman"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Agahiyên pêşkêşkerê nayên wergirtin"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Sedema nenas."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Sedema nenas."
 
 #, fuzzy, c-format
@@ -8001,9 +8108,6 @@ msgstr "Verêkirina Pelî Bi Ser Neket"
 msgid "%d canceled the transfer of %s"
 msgstr "%s, şandina %s'yê betal kir"
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -8057,17 +8161,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8090,6 +8183,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr "Şandina Pelgehê"
+
 #, fuzzy
 msgid "Supports"
 msgstr "piştgirî"
@@ -8776,9 +8872,6 @@ msgstr "Rêxistin"
 msgid "Unit"
 msgstr "Yekitî"
 
-msgid "Note"
-msgstr "Not"
-
 msgid "Join Chat"
 msgstr "Têkeve Sohbetê"
 
@@ -8864,6 +8957,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Îstatîstîkên Torê"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Pîng ne serkeftî bû"
 
@@ -8925,7 +9021,8 @@ msgstr "Nirxên mifteyên ku nayên destekkirin"
 msgid "Disconnected by server"
 msgstr "Girêdana bi pêşkêşkerê re hate birrîn"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Dema li Pêşkêşkera SILC dihate girêdan çewtî çêbû"
 
 msgid "Key Exchange failed"
@@ -8937,28 +9034,27 @@ msgstr ""
 "Li danişîna ku hatibû cveqetandin nehate domandin. Ji bo avakirina "
 "girêdaneke din pel Dîsa Girê Bide bike"
 
-msgid "Connection failed"
-msgstr "Girêdan serneket"
-
 msgid "Performing key exchange"
 msgstr "Guherandina mifteyan tê kirin"
 
-msgid "Unable to create connection"
-msgstr ""
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Mifteya giştî nayê barkirin"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Li Pêşkêşkera SILC tê Girêdan"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Mifteya giştî nayê barkirin"
+
 msgid "Out of memory"
 msgstr "Bîr têrê nake"
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "Girêdana nû nehat çêkirin."
 
 #, fuzzy
 msgid "Error loading SILC key pair"
@@ -9246,7 +9342,7 @@ msgid "Creating SILC key pair..."
 msgstr "Fera mifteya SILC tê afirandin..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Fera mifteya SILC tê afirandin..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9335,6 +9431,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Îstatîstîkên pêşkêşkerê ne mevcûd e"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Dema li Pêşkêşkera SILC dihate girêdan çewtî çêbû"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Neserkeftî: Guherto li hev nakin, bernameyê rojane bike"
@@ -9377,38 +9476,37 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr "Çewtî: Venihêrtina Nasnameyê Neserkeftî ye"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Girêdana SILC Client nehate destpêkirin"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "Nav tune"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "Mifteya giştî nayê barkirin"
 
-msgid "Could not write"
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not connect"
-msgstr "Nekarî girêbide"
-
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Çewtiya Pêşkêşkerê ya nenas."
 
-msgid "Could not create listen socket"
-msgstr ""
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Girêdan venabe."
+msgid "Unable to create listen socket"
+msgstr "Girêdan venabe"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Navên IRC'ê bi valahî çênabin"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "hindik vebijartok nîşan bide"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9442,177 +9540,66 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Girêdan serneket (%s)"
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Pelgeh nayê nivîsîn %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Pelgeh nayê vekirin %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "Bikarhêner %s danişîn venekiriye."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Destûrê nade hişyariya %s."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Di %s de sohbet ne gengaz e."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Tu pir zû peyaman ji bikarhênerê %s re dişîne."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-"Peyama ku ji aliyê %s hate şandin ji ber ku pir dirêj bû nehate xwendin."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Peyama ku ji aliyê %s hate şandin ji ber ku pir zû dihate şandin nehate "
-"stendin."
-
-#, c-format
-msgid "Failure."
-msgstr "Neserkeftî."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Gelek encam heye."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Email lookup restricted."
-msgstr "Lêgerîna e-peyaman hate qedexekirin."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
-
-#, c-format
-msgid "No keywords."
-msgstr ""
-
-#, c-format
-msgid "User has no directory information."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "Country not supported."
-msgstr "Welat nayê destekkirin."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Çewtiya nenas: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Bernavê şaş yan jî şîfre"
-
-#, c-format
-msgid "The service is temporarily unavailable."
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Asta te ya hişyariyan ji bo vekirina danişînê pir berz e."
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Çewtiyeke nenas ya girêdanê çêbû. %s"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Çewtiya nenas, %d, çêbû. Agahî: %s"
-
-msgid "Invalid Groupname"
-msgstr "Navê Komê Nederbasdar e."
-
-msgid "Connection Closed"
-msgstr "Girêdan Hate Qutkirin"
-
-msgid "Waiting for reply..."
-msgstr "Ji bo bersivê radiweste..."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ID ya Yahoo!"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Pêveka Protokola Yahooyê"
 
-msgid "Password Change Successful"
-msgstr "Şîfreya Te bi Awayekî Serkeftî Hate Guhertin."
+#, fuzzy
+msgid "Pager server"
+msgstr "Pêşkêşkara Proxyê"
 
-msgid "_Group:"
-msgstr "_Kom:"
+msgid "Pager port"
+msgstr "Porta Bangkirinê"
 
-msgid "Get Dir Info"
-msgstr ""
+#, fuzzy
+msgid "File transfer server"
+msgstr "Porta veguheztina pelan"
 
-msgid "Set Dir Info"
-msgstr ""
+msgid "File transfer port"
+msgstr "Porta veguheztina pelan"
 
-#, c-format
-msgid "Could not open %s for writing!"
+msgid "Chat room locale"
 msgstr ""
 
-msgid "File transfer failed; other side probably canceled."
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Could not connect for transfer."
+msgid "Chat room list URL"
 msgstr ""
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat server"
 msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "Îkonê Veşêre, Wekî..."
-
-#, 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] ""
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japon"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr ""
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID ya Yahoo!"
 
 #. *< type
 #. *< ui_requirement
@@ -9624,11 +9611,11 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Pêveka Protokola TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Pêveka Protokola Yahooyê"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9651,6 +9638,34 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Lêzêdekirina kesan hate redkirin"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Hesabê te yê bikarhêneriyê hate quflekirin, ji kerema xwe re têkeve malpera "
+"Yahoo!"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Hesabê te yê bikarhêneriyê hate quflekirin, ji kerema xwe re têkeve malpera "
+"Yahoo!"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Bernavê şaş yan jî şîfre"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9679,11 +9694,12 @@ msgstr ""
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "%s nekete lîsteya bi destûr (%s)."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Hevalê/a te nekete lîsteya pêşkêşkeran"
 
 #, c-format
@@ -9691,23 +9707,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Ji pêşkêşkarê bersiva xeletiyê"
 
-msgid "Connection problem"
-msgstr "Pirsgirêka girêdanê"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Bi %s 'ê re axaftin"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
 msgid "Not at Home"
 msgstr ""
@@ -9754,9 +9763,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "IDê çalak bike..."
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr ""
@@ -9771,79 +9779,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr "Qutiya Peyamên Hatiye ya Hotmaîlê Veke"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ID ya Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Pêveka Protokola Yahooyê"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japon"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Pêşkêşkara Proxyê"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Hosta Bangkirinê ya Japonan"
-
-msgid "Pager port"
-msgstr "Porta Bangkirinê"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Porta veguheztina pelan"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Danişîna şandina pelgehên çalak tuneye"
-
-msgid "File transfer port"
-msgstr "Porta veguheztina pelan"
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japon"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Girêdan serneket."
+
 msgid "Unable to establish file descriptor."
 msgstr "Danaskerê pelgehê nehate sazkirin."
 
@@ -9851,6 +9795,9 @@ msgstr "Danaskerê pelgehê nehate sazkirin."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s şandina pelê %s pêşniyar dike"
 
+msgid "Write Error"
+msgstr "Çewtiya Nivîsandinê"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profîla Japonan ya Yahoo!yê"
 
@@ -9891,13 +9838,8 @@ msgstr "Girêdana sar 3"
 msgid "Last Update"
 msgstr "Rojanekirina dawî"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Agahiyên bikarhiner ji bo %s tune"
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9962,21 +9904,19 @@ msgstr "Deng"
 msgid "Webcams"
 msgstr "Kamera"
 
+msgid "Connection problem"
+msgstr "Pirsgirêka girêdanê"
+
 msgid "Unable to fetch room list."
 msgstr ""
 
 msgid "User Rooms"
 msgstr "Jûrên Bikarhêneran"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Teşqeleya girêdana bi pêşkêşker YCHT re"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Li pêşkêşkerê nehate girêdan."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10094,13 +10034,7 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Girêdan venabe"
-
-#, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nikare pêwira \"%s\" bixebitîne ji bo bikarhêner: %s"
 
 #, fuzzy, c-format
@@ -10108,17 +10042,13 @@ msgid "HTTP proxy connection error %d"
 msgstr "Çewtiya girêdana proxy %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "%s çewtiya xebitandinê"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Girêdan venabe."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10213,9 +10143,6 @@ msgstr "Mijûl Nekin"
 msgid "Extended away"
 msgstr "Demeke Dirêj e Li Derve ye"
 
-msgid "Mobile"
-msgstr "Telefona Destan"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10257,16 +10184,6 @@ msgstr ""
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Dema %s Dihate Xwendin Çewtî"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr "Tê hesibandin..."
 
@@ -10378,6 +10295,16 @@ msgstr "Girêdan pêk nehat."
 msgid "Address already in use."
 msgstr "Vî navê sohbetê vêga dixebite"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Dema %s Dihate Xwendin Çewtî"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 msgid "Internet Messenger"
 msgstr "Peyamnêra înternetê"
 
@@ -10425,10 +10352,8 @@ msgstr "Danezankarê peyamên nû"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Vebijartokên %s'yê"
+msgid "_Advanced"
+msgstr "_Pêşketî"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10464,9 +10389,6 @@ msgstr "Heke tu bi rastî girtî xuyabikî"
 msgid "you can see the butterflies mating"
 msgstr "cotbûna perperîkan dibînî"
 
-msgid "Proxy Options"
-msgstr "Mîhengên Proxyê"
-
 msgid "Proxy _type:"
 msgstr "Cureyê_Proxyê:"
 
@@ -10495,8 +10417,9 @@ msgstr "_Bingehîn"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_Pêşketî"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Pêşkêşkera cîgir (Proxy)"
 
 msgid "Enabled"
 msgstr "Çalak"
@@ -10534,8 +10457,8 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Lîsteya odê"
+msgid "A_ccount"
+msgstr "Hesab:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10544,8 +10467,9 @@ msgstr ""
 "Ji kerema xwe re agahiya guncaw a derbarê chata ku dixwazî tevli bibî, "
 "têkevê\n"
 
-msgid "_Account:"
-msgstr "_Hesab:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Lîsteya odê"
 
 msgid "_Block"
 msgstr ""
@@ -10564,6 +10488,17 @@ msgid "I_M"
 msgstr "Peyam"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "_Sohbetekê lê zêde bike"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Sohbeta Bi Dîmen"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "Pelî _Bişîne"
 
@@ -10575,7 +10510,11 @@ msgid "View _Log"
 msgstr "_Tomarkirinan Nîşan Bide"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Dema negirêdayî be destûrê nade"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Dema negirêdayî be destûrê nade"
 
 msgid "_Alias..."
@@ -10716,6 +10655,10 @@ msgstr ""
 msgid "/Tools/_Certificates"
 msgstr "/_Amûr/_Vebijêrk"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Amûr/_Li derve"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Amûr/Pê_vek"
 
@@ -10725,10 +10668,6 @@ msgstr "/_Amûr/_Vebijêrk"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Amûr/Ew_lekarî"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Amûr/_Li derve"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Amûr/_Şandina Pelan"
 
@@ -10853,8 +10792,8 @@ msgstr "Bi destan"
 msgid "By status"
 msgstr "Li Gorî rewşê"
 
-msgid "By log size"
-msgstr "Li gorî mezinahiya tomarbûnê"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10872,6 +10811,9 @@ msgstr "_Dîsa xwe girê bide"
 msgid "Re-enable"
 msgstr "Hesabeke Nû ya Jabber Biafirîne"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s dîsa hat"
@@ -10968,6 +10910,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Navê ku xuya dibe"
 
+msgid "_Group:"
+msgstr "_Kom:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11001,6 +10946,120 @@ msgstr "/Amûr"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kes/Kesan Rêz Bike"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Rengê zemînê"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Tu dixwazî vî/ê li lîsteya xwe ya hevalan zêde bikî?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Derkeve"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Rengê zemînê"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Dîmena Firehkirinê"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Rengê Rûerdê Hilbijêre"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Teng bike"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Rengê Rûerdê Hilbijêre"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Kurterê"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Girêdayî"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Agahiyên kesa/ê hatiye hilbijartin bistîne"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Li derve"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Agahiyên kesa/ê hatiye hilbijartin bistîne"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Negirêdayî"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Agahiyên kesa/ê hatiye hilbijartin bistîne"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Baş"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Agahiyên kesa/ê hatiye hilbijartin bistîne"
+
+msgid "Message Text"
+msgstr "Nivîsa Peyamê"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Nivîsa Peyamê"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Ji bo %s agahiyên bikarhêneran biguherîne"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11021,13 +11080,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kesan Vexwîne Odeya Axaftinê"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Heke bixwazî bi peyameke vewxendinê navê kesê ku dixwazî vexwînî jî têkevê."
-
 msgid "_Buddy:"
 msgstr "_Kes:"
 
@@ -11056,7 +11108,8 @@ msgstr "Guh medê"
 msgid "Get Away Message"
 msgstr "Peyama Li Derve ye! Bistîne"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Gotinên dawî"
 
 msgid "Unable to save icon file to disk."
@@ -11104,6 +11157,22 @@ msgstr "/Ligelhevaxaftin/_Tomar Bike, Wekî..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Ligelhevaxaftin/_Dade"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Ligelhevaxaftin/_Dade"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Ligelhevaxaftin/_Dade"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Nivîsandin/Tomarbûnan Nîşan Bide"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Nivîsandin/_Pelî Bişîne..."
 
@@ -11181,6 +11250,18 @@ msgstr "/_Ligelhevaxaftin"
 msgid "/Conversation/View Log"
 msgstr "/Nivîsandin/Tomaran Nîşan Bide"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Ligelhevaxaftin/_Dade"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Nivîsandin/Tomaran Nîşan Bide"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Ligelhevaxaftin/_Dade"
+
 msgid "/Conversation/Send File..."
 msgstr "/Ligelhevaxaftin/Pelî Bişîne..."
 
@@ -11371,6 +11452,9 @@ msgstr "Navnîşan"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "piştgirî"
 
@@ -11500,6 +11584,10 @@ msgid "Hungarian"
 msgstr "Macarî"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Romanî"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Makedonî"
 
@@ -11517,6 +11605,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "Wergêrên Niha"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "Opera"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "Qedexe"
 
@@ -11539,6 +11631,10 @@ msgid "Macedonian"
 msgstr "Makedonî"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "Makedonî"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norwecî"
 
@@ -11596,6 +11692,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "Swêdî"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11647,8 +11746,25 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11915,7 +12031,7 @@ msgid "Hyperlink visited color"
 msgstr "Rengê girêdanê"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Dema mişk hate ser girêdanan birengîne."
 
 msgid "Hyperlink prelight color"
@@ -11953,15 +12069,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Rakirina Hişyariyan"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Danezankarê peyamên nû"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11974,16 +12097,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Danezankarê peyamên nû"
 
-#, fuzzy
-msgid "_Copy Email Address"
-msgstr "E-Peyamê _Ji Ber Bigire"
-
-msgid "_Open Link in Browser"
-msgstr "Girêdanê Di Gerokê de Veke"
-
-msgid "_Copy Link Location"
-msgstr "Girêdanê _Ji Ber Bigire"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12022,11 +12135,9 @@ msgstr "Di tomarkirina wêneyê de xeletî: %s"
 msgid "Save Image"
 msgstr "Wêneyê Tomar Bike"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Wêneyê _Tomar Bike..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12117,10 +12228,6 @@ msgid "Font Face"
 msgstr "Font"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Rengê zemînê"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Rengê nivîsê"
 
@@ -12248,6 +12355,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12265,6 +12373,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12296,10 +12405,26 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Rûpelkirin"
 
-msgid "Open All Messages"
-msgstr "Hemû peyaman veke"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Tê hesibandin..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
 
 #, c-format
@@ -12331,6 +12456,30 @@ msgstr ""
 "Fermana gerok a \"Bi destan mîheng bike\" hat hilbijartin lê tu ferman nehat "
 "nivîsandin."
 
+#, fuzzy
+msgid "No message"
+msgstr "(peyamek)"
+
+msgid "Open All Messages"
+msgstr "Hemû peyaman veke"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Hişyarkara Nû"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Peyam heye!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12385,10 +12534,17 @@ msgstr "<b>Hûragahiyên têketanê</b>"
 msgid "Select a file"
 msgstr "Pelekî hilbijêre"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Hişyarkarê Mîheng Bike"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "_Hesab:"
+
 msgid "_Buddy name:"
 msgstr "Navê _Heval"
 
@@ -12457,7 +12613,58 @@ msgstr "_Cardin xuyakirin"
 msgid "Pounce Target"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Destpêkên_nivisandinê"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Bikarhêner dinivîse..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Têketin"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "Ji rewşa betal _vegere"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Ji derve vegriya"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Dev Ji Nivîsandinê Berda"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Derketin"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s neçalak bû"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Dema Li derve be"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Peyamekê bişîne"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Çalakiya hişyarkar a nayê zanîn. Ji kerema xwe re ragihîne!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Di dema tomarkirina wêneyan de çewtî"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12481,6 +12688,12 @@ msgstr "Kurterê"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Bi %s 'ê re axaftin"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Lîsteya Hevalan"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Îkona negihiştî ya Pergalê"
 
@@ -12493,7 +12706,7 @@ msgid "On unread messages"
 msgstr "Peyamên nexwendî"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "Paceyên Nivîsandinê"
 
 #, fuzzy
@@ -12503,6 +12716,10 @@ msgstr "Hevpeyvîneke n_û:"
 msgid "When away"
 msgstr "Dema Li derve be"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Paceya hevpeyvînê B_ilind bike"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12563,10 +12780,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Dema ku peyam bighîjin paceyê hişyar bike"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Paceya hevpeyvînê B_ilind bike"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12603,14 +12816,12 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Agahiya bikarhêner nayê stendin"
 
-msgid "ST_UN server:"
-msgstr ""
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
-msgstr ""
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Navnîşana IP'ê bixweber bistîne"
 
 msgid "Public _IP:"
 msgstr "_IP'a herêmî"
@@ -12630,6 +12841,10 @@ msgstr "_Destpêka bendergehê"
 msgid "_End port:"
 msgstr "_Dawiya Bêndergehê"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "Pêşkêşkara Proxyê"
@@ -12659,6 +12874,10 @@ msgstr "Pêşkêşkara Proxyê"
 msgid "No proxy"
 msgstr "Proxy tune"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Bikarhêner:"
 
@@ -12823,13 +13042,13 @@ msgstr ""
 msgid "Auto-away"
 msgstr "Li derveya bixweber"
 
-msgid "Change status when _idle"
-msgstr "Dema _vala be rewşê biguherîne"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Xulke berê neamade bê diyar kirin:"
 
+msgid "Change status when _idle"
+msgstr "Dema _vala be rewşê biguherîne"
+
 msgid "Change _status to:"
 msgstr "_Rewşê biguherîne:"
 
@@ -12984,29 +13203,19 @@ msgstr "_Tomar bike & Bikar bîne"
 msgid "Status for %s"
 msgstr "Rewşa %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Smily têxê"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Pelgeha Mifteyên Giştî"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Ji kerema xwe re ji bo gruba ku hatiye hilbijartin navekî din bibîne."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Smily têxê"
@@ -13016,21 +13225,29 @@ msgid "Add Smiley"
 msgstr "Smile!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "Wêneyê Tomar Bike"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "Kurterê"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Smile!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Kurterê"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Heval hilbijêre"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13117,8 +13334,8 @@ msgid "Cannot send launcher"
 msgstr "Xebatker nikare bişîne"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13152,6 +13369,17 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "Girêdanê veke:"
+
+msgid "_Copy Link Location"
+msgstr "Girêdanê _Ji Ber Bigire"
+
+#, fuzzy
+msgid "_Copy Email Address"
+msgstr "E-Peyamê _Ji Ber Bigire"
+
 msgid "Save File"
 msgstr "Pelgehê Tomar Bike"
 
@@ -13251,6 +13479,78 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Navnîşana pêşkêşkar"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Têkeve Pêşkêşkara Konferansekê"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Pêşkêşkerê konferansê hilbijêre ji bo lêpirsînê"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Xizmetên Girêdayî"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Lîste bişîne"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Çûye derve"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Peldanka Lêgerînê"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Hilbijartina Deng"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Ravekirin:</b> Tirsnak"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Agahiyên Bikarhêner Têkevê"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Gerok"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Bikarhêner ne mevcûd e"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Pêşkêşker ti şêwazê pelgekirinê nade bikaranîn"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Agahiyên Bikarhêner Têkevê"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "Heval betal ye"
 
@@ -13655,7 +13955,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13770,12 +14070,6 @@ msgstr ""
 "- Hemû gotarên ku tên şûnde vedigerîne.\n"
 "- Dema ku tu têketiyê, peyamekê ji hemû kesên di lîsteya te de ne re dişîne."
 
-msgid "Cursor Color"
-msgstr "Rengê Nîşanker"
-
-msgid "Secondary Cursor Color"
-msgstr "Rengê duyemîn ê nîşanker"
-
 msgid "Hyperlink Color"
 msgstr "Rengê girêdanê"
 
@@ -13788,6 +14082,10 @@ msgid "Highlighted Message Name Color"
 msgstr "Peyamên nexwendî"
 
 #, fuzzy
+msgid "Typing Notification Color"
+msgstr "Rakirina Hişyariyan"
+
+#, fuzzy
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Dîtina dara Gtk / meznahiya dirêjahnayê"
 
@@ -13817,35 +14115,24 @@ msgstr "Nivîsa Dirûvê Navîn yê GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Kurteriya mijara nivîsê"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Rengê dirûvê navîn"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Danezankarê peyamên nû"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ Kontrola mijarê"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Bigire"
 
 msgid "Fonts"
 msgstr "Curenivîs"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Kontrolkirina pelên Pidgin'ê"
@@ -13937,7 +14224,7 @@ msgstr "Paceyên Nivîsandinê"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13990,6 +14277,112 @@ msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Li gorî zagonên hatine daxuyakirin peyvên di peyamêm diçin de diguherîne."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Daniştin nehatiye vekirin"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Daniştin nehatiye vekirin"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Beşdarî Chatekê bibe"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Guh medê"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Zayend"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Navê Dixuye"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Çewtî"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Agahî"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Diyaloga Daxwazan"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Asta Hişyarkirinê"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Rewş: %s"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Îkonê Tomar Bike"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ Kontrola mijarê"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Agahiya hesabê"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Lîsteya Hevalan"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lîsteya Hevalan"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ Kontrola mijarê"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ Kontrola mijarê"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14152,10 +14545,6 @@ msgid "Only when docked"
 msgstr ""
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "_Dema ku peyam bighîjin paceyê hişyar bike"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "Vebijartokên Têketinê"
 
@@ -14163,9 +14552,10 @@ msgstr "Vebijartokên Têketinê"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Vebijartokên ku ji bo WinPidginê taybet in."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Vebijartokên ku ji bo WinPidginê taybet in."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14207,6 +14597,411 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Soket nehat afirandin"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Xwendina socket serneket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Girêdan pêk nehat."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Girêdana pêşkêşkar qut bû"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Soket nehat afirandin"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Bi pêşkêşkar re têkilî nehat danîn"
+
+#~ msgid "Read error"
+#~ msgstr "Xeletiya xwendinê"
+
+#~ msgid "Write error"
+#~ msgstr "Xeletiya Nivîsandinê"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Agahiyên Bikarhêner Têkevê"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Navnîşan (dûmahîk)"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Chata Xuya Dibe"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ferman"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Şaşîtiya Tomarkirinê"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Cih"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "Navê bikarhêner"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Hişyarkirina Rewşa Kesan"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Guhertoya Nederbasdar"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Beralîkirin"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Modên Bikarhêner"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Sînorkirina Bikarhêner"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Taybetmendî"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Navê bikarhêner"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Bi IMê re Guhertina Mifteyan"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Navnîşana E-peyamê"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Profîla Jabber"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Navê bikarhêner"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Vîdeoya Zindî"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Peyam hat standin"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Pelgeha Mifteyên Giştî"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Vebijartokên Bikarhêneran"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Modên Bikarhêner"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Navê bikarhêner"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Sînorkirina Bikarhêner"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Şîfrekirina Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "Çewtiya Xwendinê"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Li makekompîturê nehate girêdan."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Lîste tije ye"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Peyam ji hev nayê veqetandin"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Bi pêşkêşkar re têkilî nehat danîn"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Daniştin venebû (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Bi pêşkêşkarê re girêdan pêk nehat."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Danişîna te hate girtin, te ji dereke din danişîn vekir"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Xeletî. Desteka SSL nehatiye sazkirin."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Şîfre şaş e."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Li makekompîturê nehate girêdan."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Girêdana te ya bi pêşkêşkerê re qut bû."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Nehat Girêdan"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Nicka nederbasdar"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Agahiyên pêşkêşkerê nayên wergirtin"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Girêdan Hate Qutkirin"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nekarî girêbide"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Girêdan venabe."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Şîfre şaş e."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japon"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Hosta Bangkirinê ya Japonan"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Danişîna şandina pelgehên çalak tuneye"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Li pêşkêşkerê nehate girêdan."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Girêdan venabe."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Daxwaza TLS/SSL a pêşkêşkar ji bo têketinê. Tu piştgiriyeke TLS/SSL nehat "
+#~ "dîtin."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Paceyên Nivîsandinê"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr ""
+#~ "Ji kerema xwe re ji bo gruba ku hatiye hilbijartin navekî din bibîne."
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "IDê çalak bike..."
+
+#~ msgid "Cursor Color"
+#~ msgstr "Rengê Nîşanker"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Rengê duyemîn ê nîşanker"
+
+#~ msgid "Interface colors"
+#~ msgstr "Rengê dirûvê navîn"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "Peyam berde"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Heke bixwazî bi peyameke vewxendinê navê kesê ku dixwazî vexwînî jî "
+#~ "têkevê."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Girêdan venabe"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Kesekê/î lê zêde bike"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Agahiyên pêşkêşkerê nayên wergirtin"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "Xeletiya xwendinê"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "Li pêşkêşkerê nehate girêdan."
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Digel pêşkêşkar girêdan çêke"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "Peyam nehat şandin."
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Girêdan serneket (%s)"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Pelgeh nayê nivîsîn %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Pelgeh nayê vekirin %s."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "Bikarhêner %s danişîn venekiriye."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Destûrê nade hişyariya %s."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Di %s de sohbet ne gengaz e."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Tu pir zû peyaman ji bikarhênerê %s re dişîne."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr ""
+#~ "Peyama ku ji aliyê %s hate şandin ji ber ku pir dirêj bû nehate xwendin."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Peyama ku ji aliyê %s hate şandin ji ber ku pir zû dihate şandin nehate "
+#~ "stendin."
+
+#~ msgid "Failure."
+#~ msgstr "Neserkeftî."
+
+#~ msgid "Too many matches."
+#~ msgstr "Gelek encam heye."
+
+#, fuzzy
+#~ msgid "Email lookup restricted."
+#~ msgstr "Lêgerîna e-peyaman hate qedexekirin."
+
+#~ msgid "Country not supported."
+#~ msgstr "Welat nayê destekkirin."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Çewtiya nenas: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Bernavê şaş yan jî şîfre"
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Asta te ya hişyariyan ji bo vekirina danişînê pir berz e."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Çewtiyeke nenas ya girêdanê çêbû. %s"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Çewtiya nenas, %d, çêbû. Agahî: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Navê Komê Nederbasdar e."
+
+#~ msgid "Connection Closed"
+#~ msgstr "Girêdan Hate Qutkirin"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Ji bo bersivê radiweste..."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Şîfreya Te bi Awayekî Serkeftî Hate Guhertin."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Îkonê Veşêre, Wekî..."
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Pêveka Protokola TOC"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Agahiyên bikarhiner ji bo %s tune"
+
+#~ msgid "%s Options"
+#~ msgstr "Vebijartokên %s'yê"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Mîhengên Proxyê"
+
+#~ msgid "By log size"
+#~ msgstr "Li gorî mezinahiya tomarbûnê"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "Girêdanê Di Gerokê de Veke"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Wêneyê Tomar Bike"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Kurterê"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Dema ku peyam bighîjin paceyê hişyar bike"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "Peldankeke bi vî navê jixwe heye"
 
@@ -14275,13 +15070,6 @@ msgstr ""
 #~ msgstr "Tu li xwe bawer î ku tu dixwazî peyama li derve \"%s\" rakî?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s - %s (%s)"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Peyamê Bişîne"
 
@@ -14422,9 +15210,6 @@ msgstr ""
 #~ msgid "Invalid screen name"
 #~ msgstr "Navê Bikarhêner Nederbasdar e"
 
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "Gelek şandekên ne baş"
 
@@ -14478,10 +15263,6 @@ msgstr ""
 #~ msgstr "Bikarhêner %s:%s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Tu dixwazî vî/ê li lîsteya xwe ya hevalan zêde bikî?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "Xeletiya kiryara palî"
 
@@ -14490,10 +15271,6 @@ msgstr ""
 #~ msgstr "Bikarhêner %s danişîn venekiriye"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Çewtiya pêkanîna girêdanan"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Daniştina AIM'ê venabe"
 
@@ -14587,17 +15364,9 @@ msgstr ""
 #~ msgstr "Niha vekirî ye"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Bi pêşkêşkarê re girêdan pêk nehat."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Peyam"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Hesab:"
-
 #~ msgid "DBus"
 #~ msgstr "DBus"
 
@@ -14665,13 +15434,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Ravekirin:</b> Tirsnak"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -14720,15 +15482,6 @@ msgstr ""
 #~ msgid "Insert image"
 #~ msgstr "Wêne têxê"
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Peyam heye!</span>\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Send unknown \"_slash\" commands as messages"
 #~ msgstr "Peyameke nenas \"_slash\" wekî ferman dişîne"
 
@@ -15046,7 +15799,8 @@ msgstr ""
 #~ "Gives Pidgin the ability to be remote-controlled through third-party "
 #~ "applications or through the Pidgin-remote tool."
 #~ msgstr ""
-#~ "Pidgin bi sepanên guhertoya sêyem an jî bi Pidgin-remoteyê tê kontrolkirin."
+#~ "Pidgin bi sepanên guhertoya sêyem an jî bi Pidgin-remoteyê tê "
+#~ "kontrolkirin."
 
 #~ msgid "Hide user details"
 #~ msgstr "Hûragahiyên bikarhêneran veşêre"
@@ -15104,9 +15858,6 @@ msgstr ""
 #~ msgid "Away title: "
 #~ msgstr "Sernava li derve: "
 
-#~ msgid "Buddy List Error"
-#~ msgstr "Şaşîtiya Lîsteya Kesan"
-
 #~ msgid "Unable to send message. The message is too large."
 #~ msgstr "Ji ber ku peyama te zêde dirêj e, nehate şandin."
 
@@ -15122,9 +15873,6 @@ msgstr ""
 #~ msgid "File transfer from %s aborted.\n"
 #~ msgstr "Şandina pelî ya ji %s'yê di şandinê de hat betalkirin.\n"
 
-#~ msgid "Expander Size"
-#~ msgstr "Dîmena Firehkirinê"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Dîmena tîra firehkirinê"
 
@@ -15256,9 +16004,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Ji kesa/ê hatiye hilbijartin re peyamekê bişîne"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Agahiyên kesa/ê hatiye hilbijartin bistîne"
-
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
 
@@ -15459,9 +16204,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "_Amadeyê de"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "Ji rewşa betal _vegere"
-
 #~ msgid "Buddy starts _typing"
 #~ msgstr "Destpêkirina nivîsandinê de"
 
@@ -15567,9 +16309,6 @@ msgstr ""
 #~ msgid "New conversation _placement:"
 #~ msgstr "Bicîkirina nivîsandina nû"
 
-#~ msgid "_Autodetect IP Address"
-#~ msgstr "Navnîşana IP'ê bixweber bistîne"
-
 #~ msgid "_Start Port:"
 #~ msgstr "Porta Destpêkê:"
 
@@ -15646,9 +16385,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Kurte"
 
-#~ msgid "Message Text"
-#~ msgstr "Nivîsa Peyamê"
-
 #~ msgid "Permit"
 #~ msgstr "Destûrê bide"
 
@@ -15688,15 +16424,9 @@ msgstr ""
 #~ msgid "Unknown Error Code."
 #~ msgstr "Koda Xeletiyê ya Nayê Zanîn."
 
-#~ msgid "Status: %s"
-#~ msgstr "Rewş: %s"
-
 #~ msgid "Reading server key"
 #~ msgstr "Kilîta pêşkêşkar tê xwendin"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Bi pêşkêşkarê re girêdan pêk nehat"
-
 #~ msgid "Send as message"
 #~ msgstr "Wekî peyam bişîne"
 
@@ -15746,8 +16476,8 @@ msgstr ""
 #~ "Pidgin was unable to connect to the buddy list server.  Please try again "
 #~ "later."
 #~ msgstr ""
-#~ "Pidginê bi lîsteya te ya hevalan re têkilî daneynî. Ji kerema xwe re dû re "
-#~ "dîsa biceribîne."
+#~ "Pidginê bi lîsteya te ya hevalan re têkilî daneynî. Ji kerema xwe re dû "
+#~ "re dîsa biceribîne."
 
 #~ msgid "Unable to access directory"
 #~ msgstr "Negihîşt peldankê"
@@ -15875,9 +16605,6 @@ msgstr ""
 #~ msgstr[0] "(%d peyam)"
 #~ msgstr[1] "(peyamên %d )"
 
-#~ msgid "(1 message)"
-#~ msgstr "(peyamek)"
-
 #~ msgid "second"
 #~ msgid_plural "seconds"
 #~ msgstr[0] "çirke"
diff --git a/po/lo.po b/po/lo.po
index 48a7a8b3be..4a6a3926e2 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -1,25 +1,26 @@
-# SOME DESCRIPTIVE TITLE.
+# translation of lo.po to Lao
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+# Anousak Souphavanh <anousak@gmail.com>, 2007, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: lo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
-"PO-Revision-Date: 2007-09-28 09:52+0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
+"PO-Revision-Date: 2009-04-29 09:28+0700\n"
 "Last-Translator: Anousak Souphavanh <anousak@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 
 # "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 msgid "Finch"
-msgstr ""
+msgstr "ຟີນຊ໌"
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
@@ -31,7 +32,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -48,40 +49,40 @@ msgid "Error"
 msgstr "ຜິດພາດ"
 
 msgid "Account was not added"
-msgstr ""
+msgstr "ບໍ່ໃດ້ເພີ້ມບັນຊີ "
 
 msgid "Username of an account must be non-empty."
-msgstr ""
+msgstr "ລະຫັດຜູ້ໃຊ້ຕ້ອງໃຫ້ມີຂໍ້ມູນ"
 
 msgid "New mail notifications"
-msgstr ""
+msgstr "ອີເເມວລ໌ໃຫ່ມເຕືອນ"
 
 msgid "Remember password"
-msgstr ""
+msgstr "ຈື່ລະຫັດພານ"
 
 msgid "There are no protocol plugins installed."
 msgstr ""
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr ""
+msgstr "ຄິດວ່າທ່ານລືມຂຽນ 'make install'"
 
 msgid "Modify Account"
-msgstr ""
+msgstr "ປັບບັນຊີ"
 
 msgid "New Account"
-msgstr ""
+msgstr "ບັນຊີໃຫມ່"
 
 msgid "Protocol:"
-msgstr ""
+msgstr "ໂປໂຕໂກນ:"
 
 msgid "Username:"
-msgstr ""
+msgstr "ຊື່ຜູ້ໃຊ້:"
 
 msgid "Password:"
-msgstr ""
+msgstr "ລະຫັດພ່ານ:"
 
 msgid "Alias:"
-msgstr ""
+msgstr "ຊື່ຫລີ້ນ:"
 
 #. Register checkbox
 msgid "Create this account on the server"
@@ -90,37 +91,37 @@ msgstr ""
 #. Cancel button
 #. Cancel
 msgid "Cancel"
-msgstr ""
+msgstr "ຍົກເລີອກ"
 
 #. Save button
 #. Save
 msgid "Save"
-msgstr ""
+msgstr "ບັນທຶກ"
 
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr ""
+msgstr "ເເນ່ທີ່ຈະລຶບ %s?"
 
 msgid "Delete Account"
-msgstr ""
+msgstr "ລຶບບັນຊີ"
 
 #. Delete button
 msgid "Delete"
-msgstr ""
+msgstr "ລຶບ"
 
 msgid "Accounts"
-msgstr ""
+msgstr "ບັນຊີທົວໄປ"
 
 msgid "You can enable/disable accounts from the following list."
 msgstr ""
 
 #. Add button
 msgid "Add"
-msgstr ""
+msgstr "ເພີ້ມ"
 
 #. Modify button
 msgid "Modify"
-msgstr ""
+msgstr "ປັບ"
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
@@ -137,20 +138,22 @@ msgid "Authorize buddy?"
 msgstr ""
 
 msgid "Authorize"
-msgstr ""
+msgstr "ອະນຸມັດ"
 
 msgid "Deny"
-msgstr ""
+msgstr "ປະຕິເສດ"
 
 #, c-format
 msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
+"ອອນລາຍ: %d\n"
+"ຈໍານວນລວມ: %d"
 
 #, c-format
 msgid "Account: %s (%s)"
-msgstr ""
+msgstr "ບັນຊີ: %s (%s)"
 
 #, c-format
 msgid ""
@@ -564,17 +567,6 @@ msgstr ""
 msgid "Send To"
 msgstr ""
 
-msgid "Invite message"
-msgstr ""
-
-msgid "Invite"
-msgstr ""
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-
 msgid "Conversation"
 msgstr ""
 
@@ -812,6 +804,39 @@ msgstr ""
 msgid "System Log"
 msgstr ""
 
+msgid "Calling ... "
+msgstr ""
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr ""
+
+msgid "Reject"
+msgstr ""
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+msgid "You have rejected the call."
+msgstr ""
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr ""
 
@@ -846,6 +871,9 @@ msgstr ""
 msgid "IM"
 msgstr ""
 
+msgid "Invite"
+msgstr ""
+
 msgid "(none)"
 msgstr ""
 
@@ -1041,7 +1069,6 @@ msgstr ""
 msgid "%s has sent you a message. (%s)"
 msgstr ""
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1087,7 +1114,6 @@ msgstr ""
 msgid "Change status to"
 msgstr ""
 
-#. Conversations
 msgid "Conversations"
 msgstr ""
 
@@ -1398,7 +1424,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr ""
 
-#, c-format
 msgid "Online"
 msgstr ""
 
@@ -1442,6 +1467,27 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+msgid "TinyURL"
+msgstr ""
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr ""
 
@@ -1540,13 +1586,6 @@ msgstr ""
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr ""
-
-msgid "Reject"
-msgstr ""
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1633,6 +1672,8 @@ msgstr ""
 msgid "+++ %s signed off"
 msgstr ""
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr ""
 
@@ -1679,6 +1720,15 @@ msgstr ""
 msgid "%s left the room (%s)."
 msgstr ""
 
+msgid "Invite to chat"
+msgstr ""
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr ""
@@ -1800,7 +1850,6 @@ msgstr ""
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#, c-format
 msgid "File transfer complete"
 msgstr ""
 
@@ -1808,7 +1857,6 @@ msgstr ""
 msgid "You canceled the transfer of %s"
 msgstr ""
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr ""
 
@@ -1989,11 +2037,13 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+msgid "Error creating conference."
+msgstr ""
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2374,7 +2424,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2422,7 +2472,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2450,6 +2500,31 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+msgid "One Time Password"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2637,18 +2712,17 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr ""
 
@@ -2680,6 +2754,10 @@ msgstr ""
 msgid "Purple Person"
 msgstr ""
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr ""
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2690,13 +2768,16 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
+#, c-format
+msgid "Unable to create socket: %s"
 msgstr ""
 
-msgid "Could not bind socket to port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr ""
 
-msgid "Could not listen on socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
 msgstr ""
 
 msgid "Error communicating with local mDNSResponder."
@@ -2744,13 +2825,13 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr ""
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2762,13 +2843,13 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr ""
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
+msgid "Captcha"
 msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
@@ -2822,6 +2903,15 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2835,13 +2925,13 @@ msgstr ""
 msgid "Add to chat..."
 msgstr ""
 
+#. Global
 msgid "Available"
 msgstr ""
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr ""
 
@@ -2869,7 +2959,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -2884,7 +2974,13 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr ""
+
+msgid "Connection failed"
 msgstr ""
 
 msgid "Add to chat"
@@ -2893,13 +2989,22 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr ""
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
 msgid "Chat error"
 msgstr ""
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr ""
 
 msgid "Find buddies..."
@@ -2941,6 +3046,9 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+msgid "GG server"
+msgstr ""
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -2955,7 +3063,7 @@ msgstr ""
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr ""
 
 msgid "Error displaying MOTD"
@@ -2971,7 +3079,15 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
 msgstr ""
 
 msgid "View MOTD"
@@ -2983,24 +3099,22 @@ msgstr ""
 msgid "_Password:"
 msgstr ""
 
-msgid "IRC nicks may not contain whitespace"
-msgstr ""
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
 msgstr ""
 
-msgid "Read error"
+#, c-format
+msgid "Server closed the connection"
 msgstr ""
 
 msgid "Users"
@@ -3178,6 +3292,16 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+msgid "Nickname in use"
+msgstr ""
+
 msgid "Cannot change nick"
 msgstr ""
 
@@ -3376,10 +3500,10 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3394,16 +3518,42 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
+msgid "SASL authentication failed"
+msgstr ""
+
+msgid "Invalid response from server"
 msgstr ""
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, c-format
+msgid "SASL error: %s"
+msgstr ""
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr ""
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+msgid "Unable to establish a connection with the server"
+msgstr ""
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+
+msgid "Unable to establish SSL connection"
 msgstr ""
 
 msgid "Full Name"
@@ -3470,163 +3620,20 @@ msgstr ""
 msgid "Operating System"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr ""
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr ""
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr ""
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr ""
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
+msgid "Local Time"
 msgstr ""
 
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
+msgid "Priority"
 msgstr ""
 
-msgid "Capabilities"
+msgid "Resource"
 msgstr ""
 
-msgid "Priority"
+#, c-format
+msgid "%s ago"
 msgstr ""
 
-msgid "Resource"
+msgid "Logged Off"
 msgstr ""
 
 msgid "Middle Name"
@@ -3675,7 +3682,6 @@ msgstr ""
 msgid "Extended Away"
 msgstr ""
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
@@ -3794,25 +3800,22 @@ msgstr ""
 msgid "Find Rooms"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "ຊື່ຫລີ້ນ:"
 
-msgid "Write error"
+msgid "No users found"
 msgstr ""
 
-msgid "Ping timeout"
+msgid "Roles:"
 msgstr ""
 
-msgid "Read Error"
+msgid "Ping timed out"
 msgstr ""
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-
-msgid "Unable to create socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -3821,6 +3824,9 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+msgid "Malformed BOSH URL"
+msgstr ""
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
@@ -3845,9 +3851,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr ""
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr ""
 
@@ -3860,6 +3863,9 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -3887,6 +3893,9 @@ msgstr ""
 msgid "Change Registration"
 msgstr ""
 
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -3905,9 +3914,18 @@ msgstr ""
 msgid "Re-initializing Stream"
 msgstr ""
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr ""
 
+msgid "Mood"
+msgstr ""
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr ""
 
@@ -3929,12 +3947,6 @@ msgstr ""
 msgid "Subscription"
 msgstr ""
 
-msgid "Mood"
-msgstr ""
-
-msgid "Now Listening"
-msgstr ""
-
 msgid "Mood Text"
 msgstr ""
 
@@ -3977,9 +3989,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 msgid "Change XMPP Password"
 msgstr ""
 
@@ -4173,15 +4182,21 @@ msgid "Unable to ping user %s"
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4194,7 +4209,30 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+msgid "Media Initiation Failed"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+msgid "Select a Resource"
+msgstr ""
+
+msgid "Initiate Media"
 msgstr ""
 
 msgid "config:  Configure a chat room."
@@ -4216,13 +4254,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4282,6 +4320,9 @@ msgstr ""
 msgid "File transfer proxies"
 msgstr ""
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4320,6 +4361,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4334,12 +4383,27 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
+msgid "No reason"
+msgstr ""
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
 #, c-format
-msgid "Error in chat %s"
+msgid "Kicked (%s)"
+msgstr ""
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr ""
+
+msgid "Failed to open the file"
+msgstr ""
+
+msgid "Failed to open in-band bytestream"
 msgstr ""
 
 #, c-format
@@ -4365,9 +4429,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Select a Resource"
-msgstr ""
-
 msgid "Edit User Mood"
 msgstr ""
 
@@ -4400,7 +4461,17 @@ msgstr ""
 msgid "Select an action"
 msgstr ""
 
-msgid "Unable to retrieve MSN Address Book"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr ""
+
+msgid "Buddy Add error"
+msgstr ""
+
+msgid "The username specified does not exist."
 msgstr ""
 
 #, c-format
@@ -4627,7 +4698,6 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4649,6 +4719,10 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -4716,6 +4790,12 @@ msgstr ""
 msgid "Page"
 msgstr ""
 
+msgid "Playing a game"
+msgstr ""
+
+msgid "Working"
+msgstr ""
+
 msgid "Has you"
 msgstr ""
 
@@ -4752,6 +4832,12 @@ msgstr ""
 msgid "Album"
 msgstr ""
 
+msgid "Game Title"
+msgstr ""
+
+msgid "Office Title"
+msgstr ""
+
 msgid "Set Friendly Name..."
 msgstr ""
 
@@ -4785,9 +4871,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -4938,7 +5021,7 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
+msgid "View web profile"
 msgstr ""
 
 #. *< type
@@ -4972,63 +5055,26 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr ""
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr ""
 
 msgid "Unable to add user"
 msgstr ""
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
 #, c-format
-msgid "%s is not a valid passport account."
+msgid "Unknown error (%d)"
 msgstr ""
 
-msgid "Service Temporarily Unavailable."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr ""
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5061,9 +5107,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr ""
 
@@ -5076,19 +5119,19 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr ""
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5117,6 +5160,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5153,33 +5204,21 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 msgid "Delete Buddy from Address Book?"
 msgstr ""
 
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr ""
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr ""
-
 msgid "The username specified is invalid."
 msgstr ""
 
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5193,15 +5232,59 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+msgid "Unknown error."
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+msgid "User lookup"
 msgstr ""
 
 msgid "Reading challenge"
@@ -5213,13 +5296,21 @@ msgstr ""
 msgid "Logging in"
 msgstr ""
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+msgid "Lost connection with server"
+msgstr ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr ""
 
@@ -5238,19 +5329,20 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-msgid "MySpaceIM - No Username Set"
-msgstr ""
-
-msgid "You appear to have no MySpace username."
+msgid "IM Friends"
 msgstr ""
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
+msgid "Add contacts from server"
 msgstr ""
 
 #, c-format
@@ -5259,29 +5351,27 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
-msgid "MySpaceIM Error"
+msgid "Incorrect username or password"
 msgstr ""
 
-msgid "Failed to add buddy"
+msgid "MySpaceIM Error"
 msgstr ""
 
-msgid "'addbuddy' command failed."
+msgid "Invalid input condition"
 msgstr ""
 
-msgid "persist command failed"
+msgid "Failed to add buddy"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
+msgid "'addbuddy' command failed."
 msgstr ""
 
-msgid "User lookup"
+msgid "persist command failed"
 msgstr ""
 
 msgid "Failed to remove buddy"
@@ -5293,33 +5383,15 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-msgid "Invalid input condition"
-msgstr ""
-
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
+msgid "Missing Cipher"
 msgstr ""
 
-msgid "IM Friends"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Add contacts from server"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
 msgstr ""
 
 msgid "Add friends from MySpace.com"
@@ -5362,9 +5434,6 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-msgid "Profile"
-msgstr ""
-
 msgid "Headline"
 msgstr ""
 
@@ -5377,14 +5446,10 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr ""
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 msgid "MySpaceIM - Username Available"
@@ -5396,12 +5461,22 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 msgid "This username is unavailable."
 msgstr ""
 
 msgid "Please try another username:"
 msgstr ""
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr ""
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5593,9 +5668,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr ""
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5635,7 +5707,7 @@ msgid "Unknown error: 0x%X"
 msgstr ""
 
 #, c-format
-msgid "Login failed (%s)."
+msgid "Unable to login: %s"
 msgstr ""
 
 #, c-format
@@ -5734,9 +5806,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -5757,23 +5826,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -5796,22 +5858,29 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-msgid "Could not join chat room"
+msgid "Received unexpected response from "
 msgstr ""
 
-msgid "Invalid chat room name"
+#. username connecting too frequently
+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 ""
 
-msgid "Server closed the connection."
+#, c-format
+msgid "Error requesting "
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+msgid "Could not join chat room"
 msgstr ""
 
-msgid "Received invalid data on connection with server."
+msgid "Invalid chat room name"
+msgstr ""
+
+msgid "Received invalid data on connection with server"
 msgstr ""
 
 #. *< type
@@ -5859,7 +5928,7 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
 msgid "Direct IM established"
@@ -6027,23 +6096,18 @@ msgstr ""
 msgid "Screen Sharing"
 msgstr ""
 
-#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#, c-format
 msgid "Not Available"
 msgstr ""
 
-#, c-format
 msgid "Occupied"
 msgstr ""
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr ""
 
@@ -6057,15 +6121,11 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr ""
 
 msgid "Username sent"
@@ -6080,45 +6140,49 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Received authorization"
 msgstr ""
 
-msgid "Incorrect password."
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
 msgstr ""
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr ""
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6133,22 +6197,6 @@ msgstr ""
 msgid "_OK"
 msgstr ""
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -6263,7 +6311,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
@@ -6285,6 +6333,12 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
 msgid "Your AIM connection may be lost."
 msgstr ""
 
@@ -6438,7 +6492,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6459,7 +6513,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6467,7 +6521,7 @@ msgid "(no name)"
 msgstr ""
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -6529,6 +6583,7 @@ msgstr ""
 msgid "Get AIM Info"
 msgstr ""
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr ""
 
@@ -6585,6 +6640,7 @@ msgstr ""
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr ""
 
@@ -6614,6 +6670,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6631,7 +6690,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
@@ -6723,7 +6781,7 @@ msgstr ""
 msgid "Visible"
 msgstr ""
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 msgid "Private"
@@ -6798,14 +6856,42 @@ msgstr ""
 msgid "Could not change buddy information."
 msgstr ""
 
+msgid "Mobile"
+msgstr ""
+
+msgid "Note"
+msgstr ""
+
+#. callback
+msgid "Buddy Memo"
+msgstr ""
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+msgid "_Modify"
+msgstr ""
+
+msgid "Memo Modify"
+msgstr ""
+
+msgid "Server says:"
+msgstr ""
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
 #, c-format
-msgid "%d needs Q&A"
+msgid "%u requires verification"
 msgstr ""
 
-msgid "Add buddy Q&A"
+msgid "Add buddy question"
 msgstr ""
 
-msgid "Input answer here"
+msgid "Enter answer here"
 msgstr ""
 
 msgid "Send"
@@ -6817,17 +6903,17 @@ msgstr ""
 msgid "Authorization denied message:"
 msgstr ""
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr ""
 
 msgid "Add buddy authorize"
 msgstr ""
 
-msgid "Input request here"
+msgid "Enter request here"
 msgstr ""
 
 msgid "Would you be my friend?"
@@ -6846,7 +6932,7 @@ msgid "Failed sending authorize"
 msgstr ""
 
 #, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr ""
 
 #, c-format
@@ -6887,6 +6973,9 @@ msgstr ""
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
 msgid "Not member"
 msgstr ""
 
@@ -6920,15 +7009,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr ""
 
+msgid "Input request here"
+msgstr ""
+
 #, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Successfully joined Qun %s (%u)"
 msgstr ""
 
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -6937,7 +7029,7 @@ msgstr ""
 msgid "Failed:"
 msgstr ""
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 msgid "Quit Qun"
@@ -6948,10 +7040,10 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr ""
 
 msgid "Successfully changed Qun information"
@@ -6960,34 +7052,34 @@ msgstr ""
 msgid "You have successfully created a Qun"
 msgstr ""
 
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr ""
 
 msgid "Setup"
 msgstr ""
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr ""
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr ""
 
 #, c-format
-msgid "<b>New buddy %d joined.</b>"
+msgid "<b>New buddy %u joined.</b>"
 msgstr ""
 
 #, c-format
@@ -7098,6 +7190,12 @@ msgstr ""
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr ""
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr ""
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7105,7 +7203,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr ""
 
 msgid "Change Icon"
@@ -7123,6 +7221,9 @@ msgstr ""
 msgid "About OpenQ"
 msgstr ""
 
+msgid "Modify Buddy Memo"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7151,7 +7252,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 msgid "Connect by TCP"
 msgstr ""
 
@@ -7161,16 +7261,16 @@ msgstr ""
 msgid "Show server news"
 msgstr ""
 
-msgid "Keep alive interval (seconds)"
+msgid "Show chat room when msg comes"
 msgstr ""
 
-msgid "Update interval (seconds)"
+msgid "Keep alive interval (seconds)"
 msgstr ""
 
-msgid "Can not decrypt server reply"
+msgid "Update interval (seconds)"
 msgstr ""
 
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr ""
 
 #, c-format
@@ -7192,19 +7292,16 @@ msgid "Activation required"
 msgstr ""
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Keep alive error"
+msgid "Requesting captcha"
 msgstr ""
 
-msgid "Requesting captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Checking code of captcha ..."
-msgstr ""
-
-msgid "Failed captcha verify"
+msgid "Failed captcha verification"
 msgstr ""
 
 msgid "Captcha Image"
@@ -7213,66 +7310,44 @@ msgstr ""
 msgid "Enter code"
 msgstr ""
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 msgid "Enter the text from the image"
 msgstr ""
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr ""
-
 msgid "Socket error"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr ""
-
-msgid "Connection lost"
-msgstr ""
-
-msgid "Get server ..."
+msgid "Getting server"
 msgstr ""
 
-msgid "Request token"
+msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
+msgid "Unable to resolve hostname"
 msgstr ""
 
 msgid "Invalid server or port"
 msgstr ""
 
-msgid "Connecting server ..."
+msgid "Connecting to server"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "ຜິດພາດ"
 
-msgid "Failed to send IM."
-msgstr ""
-
 #, c-format
 msgid ""
 "Server News:\n"
@@ -7282,6 +7357,10 @@ msgid ""
 msgstr ""
 
 #, c-format
+msgid "%s:%s"
+msgstr ""
+
+#, c-format
 msgid "From %s:"
 msgstr ""
 
@@ -7291,29 +7370,25 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unknow SERVER CMD"
+msgid "Unknown SERVER CMD"
 msgstr ""
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 msgid "QQ Qun Command"
 msgstr ""
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
+msgid "Unable to decrypt login reply"
 msgstr ""
 
-msgid "Can not decrypt login reply"
+msgid "Unknown LOGIN CMD"
 msgstr ""
 
-msgid "Unknow LOGIN CMD"
-msgstr ""
-
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr ""
 
 #, c-format
@@ -7327,9 +7402,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7383,17 +7455,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7416,6 +7477,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr ""
+
 msgid "Supports"
 msgstr ""
 
@@ -8087,9 +8151,6 @@ msgstr ""
 msgid "Unit"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Join Chat"
 msgstr ""
 
@@ -8174,6 +8235,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8231,7 +8295,7 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr ""
 
 msgid "Key Exchange failed"
@@ -8241,26 +8305,23 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr ""
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+msgid "Unable to not load SILC key pair"
+msgstr ""
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr ""
 
 msgid "Error loading SILC key pair"
@@ -8537,7 +8598,7 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -8626,6 +8687,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -8666,32 +8730,29 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr ""
 
 msgid "John Noname"
 msgstr ""
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr ""
 
-msgid "Could not write"
-msgstr ""
-
-msgid "Could not connect"
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr ""
 
-msgid "Could not create listen socket"
+msgid "Unable to create listen socket"
 msgstr ""
 
-msgid "Could not resolve hostname"
+msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
-msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgid "SIP connect server not specified"
 msgstr ""
 
 #. *< type
@@ -8727,172 +8788,59 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr ""
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr ""
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr ""
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr ""
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr ""
-
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
-
-#, c-format
-msgid "No keywords."
-msgstr ""
-
-#, c-format
-msgid "User has no directory information."
-msgstr ""
-
-#, c-format
-msgid "Country not supported."
-msgstr ""
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr ""
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-
-#, c-format
-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 ""
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr ""
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-msgid "Invalid Groupname"
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-msgid "Connection Closed"
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-msgid "Waiting for reply..."
+msgid "Yahoo ID..."
 msgstr ""
 
-msgid "TOC has come back from its pause. You may now send messages again."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
 msgstr ""
 
-msgid "Password Change Successful"
+msgid "Pager server"
 msgstr ""
 
-msgid "_Group:"
+msgid "Pager port"
 msgstr ""
 
-msgid "Get Dir Info"
+msgid "File transfer server"
 msgstr ""
 
-msgid "Set Dir Info"
+msgid "File transfer port"
 msgstr ""
 
-#, c-format
-msgid "Could not open %s for writing!"
+msgid "Chat room locale"
 msgstr ""
 
-msgid "File transfer failed; other side probably canceled."
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Could not connect for transfer."
+msgid "Chat room list URL"
 msgstr ""
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat server"
 msgstr ""
 
-msgid "Save As..."
+msgid "Yahoo Chat port"
 msgstr ""
 
-#, 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] ""
-
-#, c-format
-msgid "%s requests you to send them a file"
+msgid "Yahoo JAPAN ID..."
 msgstr ""
 
 #. *< type
@@ -8905,11 +8853,10 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
+msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -8932,6 +8879,26 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr ""
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -8959,32 +8926,25 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr ""
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
-msgstr ""
-
-msgid "Connection problem"
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
 msgid "Not at Home"
@@ -9032,7 +8992,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -9047,73 +9007,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-msgid "Yahoo ID..."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr ""
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9121,6 +9023,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr ""
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9161,13 +9066,8 @@ msgstr ""
 msgid "Last Update"
 msgstr ""
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr ""
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9230,19 +9130,16 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
-msgid "Unable to fetch room list."
+msgid "Connection problem"
 msgstr ""
 
-msgid "User Rooms"
+msgid "Unable to fetch room list."
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
+msgid "User Rooms"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
+msgid "Connection problem with the YCHT server"
 msgstr ""
 
 msgid ""
@@ -9361,13 +9258,7 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9375,16 +9266,13 @@ msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9469,9 +9357,6 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Mobile"
-msgstr ""
-
 msgid "Listening to music"
 msgstr ""
 
@@ -9513,16 +9398,6 @@ msgstr ""
 msgid "%x %X"
 msgstr ""
 
-#, c-format
-msgid "Error Reading %s"
-msgstr ""
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr ""
 
@@ -9628,6 +9503,16 @@ msgstr ""
 msgid "Address already in use."
 msgstr ""
 
+#, c-format
+msgid "Error Reading %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 msgid "Internet Messenger"
 msgstr ""
 
@@ -9670,9 +9555,7 @@ msgstr ""
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
+msgid "_Advanced"
 msgstr ""
 
 msgid "Use GNOME Proxy Settings"
@@ -9708,9 +9591,6 @@ msgstr ""
 msgid "you can see the butterflies mating"
 msgstr ""
 
-msgid "Proxy Options"
-msgstr ""
-
 msgid "Proxy _type:"
 msgstr ""
 
@@ -9738,7 +9618,7 @@ msgstr ""
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
+msgid "_Proxy"
 msgstr ""
 
 msgid "Enabled"
@@ -9776,15 +9656,16 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr ""
 
-msgid "Room _List"
-msgstr ""
+#, fuzzy
+msgid "A_ccount"
+msgstr "ບັນຊີທົວໄປ"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
+msgid "Room _List"
 msgstr ""
 
 msgid "_Block"
@@ -9802,6 +9683,15 @@ msgstr ""
 msgid "I_M"
 msgstr ""
 
+msgid "_Audio Call"
+msgstr ""
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
 msgid "_Send File..."
 msgstr ""
 
@@ -9811,7 +9701,10 @@ msgstr ""
 msgid "View _Log"
 msgstr ""
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
 msgstr ""
 
 msgid "_Alias..."
@@ -9936,6 +9829,9 @@ msgstr ""
 msgid "/Tools/_Certificates"
 msgstr ""
 
+msgid "/Tools/Custom Smile_ys"
+msgstr ""
+
 msgid "/Tools/Plu_gins"
 msgstr ""
 
@@ -9945,9 +9841,6 @@ msgstr ""
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
-msgid "/Tools/Smile_y"
-msgstr ""
-
 msgid "/Tools/_File Transfers"
 msgstr ""
 
@@ -10061,7 +9954,7 @@ msgstr ""
 msgid "By status"
 msgstr ""
 
-msgid "By log size"
+msgid "By recent log activity"
 msgstr ""
 
 #, c-format
@@ -10078,6 +9971,9 @@ msgstr ""
 msgid "Re-enable"
 msgstr ""
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10156,6 +10052,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr ""
 
+msgid "_Group:"
+msgstr ""
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10189,6 +10088,101 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+msgid "Background Color"
+msgstr ""
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+msgid "Layout"
+msgstr ""
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+msgid "Expanded Background Color"
+msgstr ""
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+msgid "Collapsed Background Color"
+msgstr ""
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr ""
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+msgid "Contact Text"
+msgstr ""
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+msgid "On-line Text"
+msgstr ""
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+msgid "Away Text"
+msgstr ""
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+msgid "Off-line Text"
+msgstr ""
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+msgid "Idle Text"
+msgstr ""
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+msgid "Message Text"
+msgstr ""
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr ""
@@ -10206,12 +10200,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
 msgid "_Buddy:"
 msgstr ""
 
@@ -10240,7 +10228,7 @@ msgstr ""
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
+msgid "Last Said"
 msgstr ""
 
 msgid "Unable to save icon file to disk."
@@ -10286,6 +10274,18 @@ msgstr ""
 msgid "/Conversation/Clea_r Scrollback"
 msgstr ""
 
+msgid "/Conversation/M_edia"
+msgstr ""
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/_Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr ""
+
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
@@ -10358,6 +10358,15 @@ msgstr ""
 msgid "/Conversation/View Log"
 msgstr ""
 
+msgid "/Conversation/Media/Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr ""
+
 msgid "/Conversation/Send File..."
 msgstr ""
 
@@ -10538,6 +10547,9 @@ msgstr ""
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr ""
 
@@ -10662,6 +10674,9 @@ msgstr ""
 msgid "Hungarian"
 msgstr ""
 
+msgid "Armenian"
+msgstr ""
+
 msgid "Indonesian"
 msgstr ""
 
@@ -10677,6 +10692,9 @@ msgstr ""
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
+msgid "Khmer"
+msgstr ""
+
 msgid "Kannada"
 msgstr ""
 
@@ -10698,6 +10716,9 @@ msgstr ""
 msgid "Macedonian"
 msgstr ""
 
+msgid "Mongolian"
+msgstr ""
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -10752,6 +10773,9 @@ msgstr ""
 msgid "Swedish"
 msgstr ""
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr ""
 
@@ -10803,7 +10827,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 
 msgid "Current Developers"
@@ -11044,7 +11085,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11080,13 +11121,19 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 
 msgid "Typing notification font"
@@ -11098,15 +11145,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr ""
 
-msgid "_Copy Email Address"
-msgstr ""
-
-msgid "_Open Link in Browser"
-msgstr ""
-
-msgid "_Copy Link Location"
-msgstr ""
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11136,11 +11174,9 @@ msgstr ""
 msgid "Save Image"
 msgstr ""
 
-#, c-format
 msgid "_Save Image..."
 msgstr ""
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11225,9 +11261,6 @@ msgstr ""
 msgid "Font Face"
 msgstr ""
 
-msgid "Background Color"
-msgstr ""
-
 msgid "Foreground Color"
 msgstr ""
 
@@ -11338,6 +11371,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11355,6 +11389,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11385,10 +11420,25 @@ msgstr ""
 msgid "Pidgin"
 msgstr ""
 
-msgid "Open All Messages"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+msgid "Calling..."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
 
 #, c-format
@@ -11418,6 +11468,24 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+msgid "No message"
+msgstr ""
+
+msgid "Open All Messages"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+msgid "New Pounces"
+msgstr ""
+
+msgid "Dismiss"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -11462,10 +11530,16 @@ msgstr ""
 msgid "Select a file"
 msgstr ""
 
+msgid "Modify Buddy Pounce"
+msgstr ""
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr ""
+
 msgid "_Buddy name:"
 msgstr ""
 
@@ -11532,7 +11606,57 @@ msgstr ""
 msgid "Pounce Target"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+#, c-format
+msgid "Started typing"
+msgstr ""
+
+#, c-format
+msgid "Paused while typing"
+msgstr ""
+
+#, c-format
+msgid "Signed on"
+msgstr ""
+
+#, c-format
+msgid "Returned from being idle"
+msgstr ""
+
+#, c-format
+msgid "Returned from being away"
+msgstr ""
+
+#, c-format
+msgid "Stopped typing"
+msgstr ""
+
+#, c-format
+msgid "Signed off"
+msgstr ""
+
+#, c-format
+msgid "Became idle"
+msgstr ""
+
+#, c-format
+msgid "Went away"
+msgstr ""
+
+#, c-format
+msgid "Sent a message"
+msgstr ""
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -11552,6 +11676,11 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr ""
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr ""
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr ""
 
@@ -11561,7 +11690,7 @@ msgstr ""
 msgid "On unread messages"
 msgstr ""
 
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr ""
 
 msgid "_Hide new IM conversations:"
@@ -11570,6 +11699,9 @@ msgstr ""
 msgid "When away"
 msgstr ""
 
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -11628,9 +11760,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-msgid "Minimi_ze new conversation windows"
-msgstr ""
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -11660,13 +11789,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-msgid "ST_UN server:"
-msgstr ""
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -11687,6 +11814,10 @@ msgstr ""
 msgid "_End port:"
 msgstr ""
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr ""
 
@@ -11713,6 +11844,10 @@ msgstr ""
 msgid "No proxy"
 msgstr ""
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr ""
 
@@ -11867,10 +12002,10 @@ msgstr ""
 msgid "Auto-away"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-msgid "_Minutes before becoming idle:"
+msgid "Change status when _idle"
 msgstr ""
 
 msgid "Change _status to:"
@@ -12020,45 +12155,42 @@ msgstr ""
 msgid "Status for %s"
 msgstr ""
 
-msgid "Custom Smiley"
-msgstr ""
-
-msgid "More Data needed"
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Please provide a shortcut to associate with the smiley."
+msgid "Custom Smiley"
 msgstr ""
 
 msgid "Duplicate Shortcut"
 msgstr ""
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-msgid "Please select an image for the smiley."
-msgstr ""
-
 msgid "Edit Smiley"
 msgstr ""
 
 msgid "Add Smiley"
 msgstr ""
 
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr ""
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
+#. Shortcut text
+msgid "S_hortcut text:"
 msgstr ""
 
 msgid "Smiley"
 msgstr ""
 
+msgid "Shortcut Text"
+msgstr ""
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+msgid "Select Buddy Icon"
+msgstr ""
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -12136,8 +12268,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -12166,6 +12298,15 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
+msgid "_Open Link"
+msgstr ""
+
+msgid "_Copy Link Location"
+msgstr ""
+
+msgid "_Copy Email Address"
+msgstr ""
+
 msgid "Save File"
 msgstr ""
 
@@ -12256,6 +12397,63 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+msgid "Server name request"
+msgstr ""
+
+msgid "Enter an XMPP Server"
+msgstr ""
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+msgid "Add to Buddy List"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "ບັນຊີ:"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+msgid "_Browse"
+msgstr ""
+
+msgid "Server does not exist"
+msgstr ""
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -12624,7 +12822,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -12730,12 +12928,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -12745,6 +12937,9 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+msgid "Typing Notification Color"
+msgstr ""
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -12774,35 +12969,21 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+msgid "Disable Typing Notification Text"
+msgstr ""
+
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
-msgid "Widget Sizes"
+msgid "Colors"
 msgstr ""
 
 msgid "Fonts"
 msgstr ""
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -12883,7 +13064,7 @@ msgstr ""
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -12935,6 +13116,93 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+msgid "Just logged in"
+msgstr ""
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+msgid "Icon for Chat"
+msgstr ""
+
+msgid "Ignored"
+msgstr ""
+
+msgid "Founder"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Half Operator"
+msgstr ""
+
+msgid "Authorization dialog"
+msgstr ""
+
+msgid "Error dialog"
+msgstr ""
+
+msgid "Information dialog"
+msgstr ""
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+msgid "Warning dialog"
+msgstr ""
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+msgid "Status Icons"
+msgstr ""
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+msgid "Dialog Icons"
+msgstr ""
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr ""
+
+msgid "Edit Buddylist Theme"
+msgstr ""
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13090,9 +13358,6 @@ msgstr ""
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr ""
-
 msgid "Windows Pidgin Options"
 msgstr "ຈໍ ພິດຈິນ ໂຕເລືກ "
 
@@ -13100,7 +13365,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
diff --git a/po/lt.po b/po/lt.po
index 2557c9fc7d..c993837d36 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,14398 +1,14695 @@
-# Pidgin eilučių vertimai į lietuvių kalbą

-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Pidgin authors

-# This file is distributed under the same license as the Pidgin package.

-# Laurynas Biveinis <laurynas.biveinis@gmail.com>, 2005, 2006, 2007, 2008, 2009.

-# Marius Karnauskas <marius@akl.lt>, 2005.

-# Gediminas Čičinskas. <gediminas@parok.lt>, 2004, 2005.

-#

-#

-msgid ""

-msgstr ""

-"Project-Id-Version: Pidgin\n"

-"Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-02-24 09:03+0100\n"

-"PO-Revision-Date: 2009-02-24 09:02+0100\n"

-"Last-Translator: Laurynas Biveinis <laurynas.biveinis@gmail.com>\n"

-"Language-Team:\n"

-"MIME-Version: 1.0\n"

-"Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=3;     plural=n%10==1 && n%100!=11 ? 0 :            n%"

-"10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

-

-#. Translators may want to transliterate the name.

-#. It is not to be translated.

-msgid "Finch"

-msgstr "Finch"

-

-#, c-format

-msgid "%s. Try `%s -h' for more information.\n"

-msgstr "%s. Daugiau informacijos suteikia `%s -h'.\n"

-

-#, c-format

-msgid ""

-"%s\n"

-"Usage: %s [OPTION]...\n"

-"\n"

-"  -c, --config=DIR    use DIR for config files\n"

-"  -d, --debug         print debugging messages to stderr\n"

-"  -h, --help          display this help and exit\n"

-"  -n, --nologin       don't automatically login\n"

-"  -v, --version       display the current version and exit\n"

-msgstr ""

-"%s\n"

-"Vartojimas: %s [PARINKTIS] ...\n"

-"\n"

-"  -c, --config=KATALOGAS  naudoti KATALOGAS konfigūracinių failų paieškai\n"

-"  -d, --debug             išvesti derinimo pranešimus į standartinę išvestį\n"

-"  -h, --help              parodyti šią pagalbą ir baigti\n"

-"  -n, --nologin           automatiškai neprisijungti\n"

-"  -v, --version           parodyti šios programos versiją ir baigti\n"

-

-#, c-format

-msgid ""

-"%s encountered errors migrating your settings from %s to %s. Please "

-"investigate and complete the migration by hand. Please report this error at "

-"http://developer.pidgin.im"

-msgstr ""

-"%s aptiko klaidų Jūsų nustatymų perkėlimo iš %s į %s metu.  Jums teks "

-"surasti klaidų priežastis ir pabaigti perkėlimą pačiam.  Praneškite apie šią "

-"klaidą adresu http://developer.pidgin.im"

-

-msgid "Error"

-msgstr "Klaida"

-

-msgid "Account was not added"

-msgstr "Paskyra nebuvo sukurta"

-

-msgid "Username of an account must be non-empty."

-msgstr "Paskyros vardas negali būti tuščias"

-

-msgid "New mail notifications"

-msgstr "Pranešimai apie naujus laiškus"

-

-msgid "Remember password"

-msgstr "Prisiminti slaptažodį"

-

-msgid "There are no protocol plugins installed."

-msgstr "Neįdiegtas nė vienas protokolo papildinys."

-

-msgid "(You probably forgot to 'make install'.)"

-msgstr "(Turbūt pamiršote paleisti „make install“.)"

-

-msgid "Modify Account"

-msgstr "Redaguoti paskyrą"

-

-msgid "New Account"

-msgstr "Nauja paskyra"

-

-msgid "Protocol:"

-msgstr "Protokolas:"

-

-msgid "Username:"

-msgstr "Naudotojo vardas:"

-

-msgid "Password:"

-msgstr "Slaptažodis:"

-

-msgid "Alias:"

-msgstr "Alternatyvusis vardas:"

-

-#. Register checkbox

-msgid "Create this account on the server"

-msgstr "Sukurti šią paskyrą serveryje"

-

-#. Cancel button

-#. Cancel

-msgid "Cancel"

-msgstr "A_tšaukti"

-

-#. Save button

-#. Save

-msgid "Save"

-msgstr "Įrašyti"

-

-#, c-format

-msgid "Are you sure you want to delete %s?"

-msgstr "Ar Jūs tikrai norite šalinti %s?"

-

-msgid "Delete Account"

-msgstr "Pašalinti paskyrą"

-

-#. Delete button

-msgid "Delete"

-msgstr "Šalinti"

-

-msgid "Accounts"

-msgstr "Paskyros"

-

-msgid "You can enable/disable accounts from the following list."

-msgstr "Jūs galite aktyvuoti ir deaktyvuoti paskyras iš šio sąrašo."

-

-#. Add button

-msgid "Add"

-msgstr "Pridėti"

-

-#. Modify button

-msgid "Modify"

-msgstr "Keisti"

-

-#, c-format

-msgid "%s%s%s%s has made %s his or her buddy%s%s"

-msgstr "%s%s%s%s padarė %s savo bičiuliu%s%s"

-

-msgid "Add buddy to your list?"

-msgstr "Pridėti bičiulį į Jūsų sąrašą?"

-

-#, c-format

-msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"

-msgstr "Vartotojas %s%s%s%s nori pridėti %s į savo bičiulių sąrašą%s%s."

-

-msgid "Authorize buddy?"

-msgstr "Ar leisti?"

-

-msgid "Authorize"

-msgstr "Leisti"

-

-msgid "Deny"

-msgstr "Drausti"

-

-#, c-format

-msgid ""

-"Online: %d\n"

-"Total: %d"

-msgstr ""

-"Prisijungusių: %d\n"

-"Iš viso: %d"

-

-#, c-format

-msgid "Account: %s (%s)"

-msgstr "Paskyra: %s (%s)"

-

-#, c-format

-msgid ""

-"\n"

-"Last Seen: %s ago"

-msgstr ""

-"\n"

-"Paskutinį kartą matytas prieš: %s"

-

-msgid "Default"

-msgstr "Numatytosios"

-

-msgid "You must provide a username for the buddy."

-msgstr "Turite duoti bičiuliui vardą."

-

-msgid "You must provide a group."

-msgstr "Turite nurodyti grupę."

-

-msgid "You must select an account."

-msgstr "Jūs privalote pasirinkti paskyrą"

-

-msgid "The selected account is not online."

-msgstr "Pasirinktoji paskyra nėra prisijungusi."

-

-msgid "Error adding buddy"

-msgstr "Bičiulio pridėjimo klaida"

-

-msgid "Username"

-msgstr "Vartotojo vardas"

-

-msgid "Alias (optional)"

-msgstr "Alternatyvusis vardas (neprivalomas)"

-

-msgid "Add in group"

-msgstr "Pridėti grupėje"

-

-msgid "Account"

-msgstr "Paskyra"

-

-msgid "Add Buddy"

-msgstr "Pridėti bičiulį"

-

-msgid "Please enter buddy information."

-msgstr "Įveskite bičiulio informaciją."

-

-msgid "Chats"

-msgstr "Pokalbiai"

-

-#. Extract their Name and put it in

-msgid "Name"

-msgstr "Vardas"

-

-msgid "Alias"

-msgstr "Sukurti alternatyvųjį vardą"

-

-msgid "Group"

-msgstr "Grupė"

-

-msgid "Auto-join"

-msgstr "Automatiškai prisijungti"

-

-msgid "Add Chat"

-msgstr "Pridėti pokalbių kambarį"

-

-msgid "You can edit more information from the context menu later."

-msgstr ""

-"Daugiau informacijos galite keisti vėliau naudodamiesi kontekstiniu meniu."

-

-msgid "Error adding group"

-msgstr "Grupės sukūrimo klaida"

-

-msgid "You must give a name for the group to add."

-msgstr "Jūs turite kuriamai grupei suteikti pavadinimą."

-

-msgid "Add Group"

-msgstr "Pridėti grupę"

-

-msgid "Enter the name of the group"

-msgstr "Įveskite grupės pavadinimą"

-

-msgid "Edit Chat"

-msgstr "Keisti pokalbių kambarį"

-

-msgid "Please Update the necessary fields."

-msgstr "Pataisykite būtinus laukus."

-

-msgid "Edit"

-msgstr "Keisti"

-

-#  Use Environmental Settings

-msgid "Edit Settings"

-msgstr "Keisti nuostatas"

-

-msgid "Information"

-msgstr "Informacija"

-

-msgid "Retrieving..."

-msgstr "Išrenkama..."

-

-msgid "Get Info"

-msgstr "Gauti informaciją"

-

-msgid "Add Buddy Pounce"

-msgstr "Sukurti reakciją į bičiulį"

-

-#  Send File button

-msgid "Send File"

-msgstr "Siųsti failą"

-

-#  Block button

-msgid "Blocked"

-msgstr "Blokuotas"

-

-msgid "Show when offline"

-msgstr "Rodyti, kai neprisijungęs"

-

-#, c-format

-msgid "Please enter the new name for %s"

-msgstr "Įveskite naują „%s“ vardą"

-

-msgid "Rename"

-msgstr "Pervadinti"

-

-msgid "Set Alias"

-msgstr "Nustatyti alternatyvųjį vardą"

-

-msgid "Enter empty string to reset the name."

-msgstr "Įveskite tuščią eilutę, jei norite atstatyti vardą."

-

-msgid "Removing this contact will also remove all the buddies in the contact"

-msgstr "Šio kontakto pašalinimas taip pat pašalins ir visus bičiulius jame"

-

-msgid "Removing this group will also remove all the buddies in the group"

-msgstr "Šios grupės pašalinimas taip pat pašalins ir visus bičiulius joje"

-

-#, c-format

-msgid "Are you sure you want to remove %s?"

-msgstr "Ar tikrai norite pašalinti %s?"

-

-#. XXX: anything to do with the returned ui-handle?

-msgid "Confirm Remove"

-msgstr "Patvirtinkite pašalinimą"

-

-msgid "Remove"

-msgstr "Pašalinti"

-

-#. Buddy List

-msgid "Buddy List"

-msgstr "Bičiulių sąrašas"

-

-msgid "Place tagged"

-msgstr "Vieta pažymėta"

-

-msgid "Toggle Tag"

-msgstr "Perjungti žymę"

-

-msgid "View Log"

-msgstr "Žiūrėti žurnalą"

-

-#. General

-msgid "Nickname"

-msgstr "Vardas"

-

-#. Never know what those translations might end up like...

-#. Idle stuff

-msgid "Idle"

-msgstr "Neveiklus"

-

-msgid "On Mobile"

-msgstr "Pasiekiamas mobiliuoju telefonu"

-

-msgid "New..."

-msgstr "Nauja..."

-

-msgid "Saved..."

-msgstr "Įrašyta..."

-

-msgid "Plugins"

-msgstr "Papildiniai"

-

-#  Block button

-msgid "Block/Unblock"

-msgstr "Blokuoti/nebeblokuoti"

-

-#  Block button

-msgid "Block"

-msgstr "Blokuoti"

-

-#  Block button

-msgid "Unblock"

-msgstr "Nebeblokuoti"

-

-msgid ""

-"Please enter the username or alias of the person you would like to Block/"

-"Unblock."

-msgstr ""

-"Įveskite vardą arba alternatyvųjį vardą asmens, kurį norite užblokuoti arba "

-"nebeblokuoti."

-

-#. Not multiline

-#. Not masked?

-#. No hints?

-msgid "OK"

-msgstr "Gerai"

-

-msgid "New Instant Message"

-msgstr "Nauja greitoji žinutė"

-

-msgid "Please enter the username or alias of the person you would like to IM."

-msgstr ""

-"Įveskite vardą arba alternatyvųjį vardą asmens, su kuriuo norite bendrauti."

-

-msgid "Channel"

-msgstr "Kanalas"

-

-msgid "Join a Chat"

-msgstr "Prisijungti prie pokalbio"

-

-msgid "Please enter the name of the chat you want to join."

-msgstr "Prašome įvesti vardą pokalbių kambario, prie kurio norite prisijungti."

-

-#  join button

-msgid "Join"

-msgstr "Prisijungti"

-

-msgid ""

-"Please enter the username or alias of the person whose log you would like to "

-"view."

-msgstr ""

-"Įveskite vardą arba alternatyvųjį vardą asmens, kurio pokalbių žurnalą "

-"norite peržiūrėti."

-

-#  Options

-#. Create the "Options" frame.

-msgid "Options"

-msgstr "Parinktys"

-

-msgid "Send IM..."

-msgstr "Rašyti žinutę..."

-

-#  Block button

-msgid "Block/Unblock..."

-msgstr "Blokuoti/nebeblokuoti..."

-

-msgid "Join Chat..."

-msgstr "Prisijungti prie pokalbio..."

-

-msgid "View Log..."

-msgstr "Žiūrėti žurnalą..."

-

-msgid "View All Logs"

-msgstr "Žiūrėti visus žurnalus"

-

-msgid "Show"

-msgstr "Rodyti"

-

-msgid "Empty groups"

-msgstr "tuščias grupes"

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-msgid "Offline buddies"

-msgstr "neprisijungusius bičiulius"

-

-msgid "Sort"

-msgstr "Rikiuoti"

-

-msgid "By Status"

-msgstr "pagal statusą"

-

-msgid "Alphabetically"

-msgstr "pagal abėcėlę"

-

-msgid "By Log Size"

-msgstr "pagal žurnalo dydį"

-

-msgid "Buddy"

-msgstr "bičiulį"

-

-msgid "Chat"

-msgstr "Pokalbis"

-

-msgid "Grouping"

-msgstr "Grupavimas"

-

-msgid "Certificate Import"

-msgstr "Liudijimo importavimas"

-

-msgid "Specify a hostname"

-msgstr "Įveskite mazgo vardą"

-

-msgid "Type the host name this certificate is for."

-msgstr "Įveskite mazgo, kuriam skirtas šis liudijimas, vardą"

-

-#, c-format

-msgid ""

-"File %s could not be imported.\n"

-"Make sure that the file is readable and in PEM format.\n"

-msgstr ""

-"Nepavyko importuoti failo %s.\n"

-"Įsitikinte, kad failą galima perskaityti ir jis yra PEM formato.\n"

-

-msgid "Certificate Import Error"

-msgstr "Liudijimo importavimo klaida"

-

-msgid "X.509 certificate import failed"

-msgstr "Nepavyko importuoti X.509 liudijimo "

-

-msgid "Select a PEM certificate"

-msgstr "Pasirinkite PEM liudijimą"

-

-#, c-format

-msgid ""

-"Export to file %s failed.\n"

-"Check that you have write permission to the target path\n"

-msgstr ""

-"Nepavyko eksportavimas į failą %s.\n"

-"Patikrinkite, ar turite rašymo prieigos teisę šiuo keliu\n"

-

-msgid "Certificate Export Error"

-msgstr "Liudijimo eksporto klaida"

-

-msgid "X.509 certificate export failed"

-msgstr "Nepavyko eksportuoti X.509 liudijimo"

-

-msgid "PEM X.509 Certificate Export"

-msgstr "PEM X.509 liudijimo eksportas"

-

-#, c-format

-msgid "Certificate for %s"

-msgstr "Liudijimas, skirtas %s"

-

-#, c-format

-msgid ""

-"Common name: %s\n"

-"\n"

-"SHA1 fingerprint:\n"

-"%s"

-msgstr ""

-"Įprastas vardas: %s\n"

-"\n"

-"SHA1 kontrolinis kodas:\n"

-"%s"

-

-msgid "SSL Host Certificate"

-msgstr "SSL mazgo liudijimas"

-

-#, c-format

-msgid "Really delete certificate for %s?"

-msgstr "Ar tikrai pašalinti %s liudijimą?"

-

-msgid "Confirm certificate delete"

-msgstr "Patvirtinkite liudijimo pašalinimą"

-

-msgid "Certificate Manager"

-msgstr "Liudijimų tvarkytuvė"

-

-#. Creating the user splits

-msgid "Hostname"

-msgstr "Mazgo vardas"

-

-#  Info button

-msgid "Info"

-msgstr "Informacija"

-

-#. Close button

-msgid "Close"

-msgstr "Užverti"

-

-#, c-format

-msgid "%s (%s)"

-msgstr "%s (%s)"

-

-#, c-format

-msgid "%s disconnected."

-msgstr "%s atsijungė."

-

-#, c-format

-msgid ""

-"%s\n"

-"\n"

-"Finch will not attempt to reconnect the account until you correct the error "

-"and re-enable the account."

-msgstr ""

-"%s\n"

-"\n"

-"Finch nebebandys prisijungti su šia paskyra, kol nepataisysite klaidos ir "

-"paskyros neaktyvuosite iš naujo."

-

-msgid "Re-enable Account"

-msgstr "Iš naujo aktyvuoti paskyrą"

-

-msgid ""

-"The account has disconnected and you are no longer in this chat. You will be "

-"automatically rejoined in the chat when the account reconnects."

-msgstr ""

-"Paskyra atsijungė, todėl jūs nebedalyvaujate šiame pokalbyje.  Kai bus "

-"prisijungta su šia paskyra iš naujo, jūs automatiškai grįšite į šį pokalbį."

-

-msgid "No such command."

-msgstr "Tokios komandos nėra."

-

-msgid "Syntax Error:  You typed the wrong number of arguments to that command."

-msgstr ""

-"Sintaksės klaida: Jūs įvedėte neteisingą argumentų skaičių tai komandai."

-

-msgid "Your command failed for an unknown reason."

-msgstr "Jūsų komanda nepavyko dėl nežinomos priežasties."

-

-msgid "That command only works in chats, not IMs."

-msgstr ""

-"Ta komanda veikia tik pokalbių kambariuose, o ne asmeniniuose pokalbiuose."

-

-msgid "That command only works in IMs, not chats."

-msgstr ""

-"Ta komanda veikia tik asmeniniuose pokalbiuose, o ne pokalbių kambariuose."

-

-msgid "That command doesn't work on this protocol."

-msgstr "Ta komanda neveikia šiame protokole."

-

-msgid "Message was not sent, because you are not signed on."

-msgstr "Žinutė neišsiųsta, nes nesate prisijungęs."

-

-#, c-format

-msgid "%s (%s -- %s)"

-msgstr "%s (%s -- %s)"

-

-#, c-format

-msgid "%s [%s]"

-msgstr "%s [%s]"

-

-#, c-format

-msgid ""

-"\n"

-"%s is typing..."

-msgstr ""

-"\n"

-"%s rašo..."

-

-msgid "You have left this chat."

-msgstr "Jūs palikote šį pokalbį."

-

-msgid "Logging started. Future messages in this conversation will be logged."

-msgstr ""

-"Žurnalų vedimas įjungtas. Būsimos šio pokalbio žinutės bus įvestos į žurnalą."

-

-msgid ""

-"Logging stopped. Future messages in this conversation will not be logged."

-msgstr ""

-"Žurnalų vedimas išjungtas. Būsimos šio pokalbio žinutės nebus įvestos į "

-"žurnalą."

-

-#  Build the Send As menu

-msgid "Send To"

-msgstr "Siųsti kam"

-

-msgid "Invite message"

-msgstr "Pakvietimo žinutė"

-

-#  Invite

-msgid "Invite"

-msgstr "Pakviesti"

-

-#  Put our happy label in it.

-msgid ""

-"Please enter the name of the user you wish to invite,\n"

-"along with an optional invite message."

-msgstr ""

-"Prašom įvesti vartotojo, kurį norite pakviesti, vardą kartu su neprivaloma "

-"pakvietimo žinute."

-

-msgid "Conversation"

-msgstr "Pokalbis"

-

-msgid "Clear Scrollback"

-msgstr "Išvalyti langą"

-

-msgid "Show Timestamps"

-msgstr "Rodyti laiko žymas"

-

-msgid "Add Buddy Pounce..."

-msgstr "Sukurti reakciją į bičiulį..."

-

-#  Invite

-msgid "Invite..."

-msgstr "Pakviesti..."

-

-msgid "Enable Logging"

-msgstr "Įjungti žurnalų vedimą"

-

-msgid "Enable Sounds"

-msgstr "Įjungti garsus"

-

-msgid "<AUTO-REPLY> "

-msgstr "<AUTOMATINIS-ATSAKYMAS> "

-

-#, c-format

-msgid "List of %d user:\n"

-msgid_plural "List of %d users:\n"

-msgstr[0] "Sąrašas su %d vartotoju:\n"

-msgstr[1] "Sąrašas su %d vartotojais:\n"

-msgstr[2] "Sąrašas su %d vartotojų:\n"

-

-msgid "Supported debug options are:  version"

-msgstr "Palaikomi derinimo parametrai yra:  version"

-

-msgid "No such command (in this context)."

-msgstr "Šiame kontekste tokios komandos nėra."

-

-msgid ""

-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"

-"The following commands are available in this context:\n"

-msgstr ""

-"Naudokite \"/help &lt;komanda&gt;\" pagalbai apie konkrečią komandą.\n"

-"Tolimesnės komandos yra prieinamos šiame kontekste:\n"

-

-#, c-format

-msgid ""

-"%s is not a valid message class. See '/help msgcolor' for valid message "

-"classes."

-msgstr ""

-"„%s“ nėra teisingas žinutės tipas.  Teisingus tipus galite pažiūrėti „/help "

-"msgcolor“."

-

-#, c-format

-msgid "%s is not a valid color. See '/help msgcolor' for valid colors."

-msgstr ""

-"„%s“ nėra teisinga spalva.  Teisingas spalvas galite pažiūrėti „/help "

-"msgcolor“."

-

-msgid ""

-"say &lt;message&gt;:  Send a message normally as if you weren't using a "

-"command."

-msgstr ""

-"say &lt;žinutė&gt;:  nusiųsti žinutę įprastai, kaip ir nenaudojant šios "

-"komandos."

-

-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."

-msgstr ""

-"me &lt;veiksmas&gt;:  nusiųsti IRC stiliaus veiksmą bičiuliui ar pokalbių "

-"kambariui."

-

-msgid ""

-"debug &lt;option&gt;:  Send various debug information to the current "

-"conversation."

-msgstr ""

-"debug &lt;parametras&gt;:  nusiųsti įvairią derinimo informaciją į šį "

-"pokalbį."

-

-msgid "clear: Clears the conversation scrollback."

-msgstr "clear: išvalo pokalbių žinučių langą."

-

-msgid "help &lt;command&gt;:  Help on a specific command."

-msgstr "help &lt;komanda&gt;:  suteikia pagalbą apie konkrečią komanda."

-

-msgid "users:  Show the list of users in the chat."

-msgstr "users: parodo pokalbio dalyvių sąrašą."

-

-msgid "plugins: Show the plugins window."

-msgstr "plugins: parodo papildinių langą."

-

-msgid "buddylist: Show the buddylist."

-msgstr "buddylist: parodo bičiulių sąrašą."

-

-msgid "accounts: Show the accounts window."

-msgstr "accounts: parodo paskyrų langą."

-

-msgid "debugwin: Show the debug window."

-msgstr "debugwin: parodo derinimo langą."

-

-msgid "prefs: Show the preference window."

-msgstr "prefs: parodo nuostatų langą."

-

-msgid "statuses: Show the savedstatuses window."

-msgstr "statuses: parodo išsaugotų būsenų langą."

-

-msgid ""

-"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "

-"for different classes of messages in the conversation window.<br>    &lt;"

-"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"

-"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "

-"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"

-msgstr ""

-"msgcolor &lt;tipas&gt; &lt;tekstospalva&gt; &lt;fonospalva&gt;:  nustatyti "

-"spalvas įvairiems žinučių tipams pokalbių lange.<br>\n"

-"&lt;tipas&gt;: receive, send, highlight, action, timestamp<br>\n"

-"&lt;tekstospalva/fonospalva&gt;: black, red, green, blue, white, gray, "

-"darkgray, magenta, cyan, default<br>\n"

-"<br>\n"

-"PAVYZDYS:<br>\n"

-"msgcolor send cyan default"

-

-msgid "Unable to open file."

-msgstr "Negalima atidaryti failo."

-

-msgid "Debug Window"

-msgstr "Derinimo langas"

-

-#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now

-#. * it's necessary to make the width of the debug window resizable ... like I said,

-#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.

-#.

-msgid "Clear"

-msgstr "Išvalyti"

-

-msgid "Filter:"

-msgstr "Filtras: "

-

-msgid "Pause"

-msgstr "Pristabdyti"

-

-#, c-format

-msgid "File Transfers - %d%% of %d file"

-msgid_plural "File Transfers - %d%% of %d files"

-msgstr[0] "Failų perdavimai – %d%% iš %d failo"

-msgstr[1] "Failų perdavimai – %d%% iš %d failų"

-msgstr[2] "Failų perdavimai – %d%% iš %d failų"

-

-#. Create the window.

-msgid "File Transfers"

-msgstr "Failų perdavimai"

-

-msgid "Progress"

-msgstr "Eiga"

-

-msgid "Filename"

-msgstr "Failo pavadinimas"

-

-msgid "Size"

-msgstr "Dydis"

-

-msgid "Speed"

-msgstr "Greitis"

-

-msgid "Remaining"

-msgstr "Liko"

-

-#. XXX: Use of ggp_str_to_uin() is an ugly hack!

-msgid "Status"

-msgstr "Būsena"

-

-msgid "Close this window when all transfers finish"

-msgstr "Uždaryti ši langą pasibaigus visiems failų perdavimams"

-

-msgid "Clear finished transfers"

-msgstr "Pašalinti pabaigtus perdavimus"

-

-msgid "Stop"

-msgstr "Sustabdyti"

-

-msgid "Waiting for transfer to begin"

-msgstr "Laukiama perdavimo pradžios"

-

-msgid "Canceled"

-msgstr "Atšaukta"

-

-msgid "Failed"

-msgstr "Nepavyko"

-

-#, c-format

-msgid "%.2f KiB/s"

-msgstr "%.2f KB/s"

-

-msgid "Sent"

-msgstr "Išsiųstas"

-

-msgid "Received"

-msgstr "Gautas"

-

-msgid "Finished"

-msgstr "Baigta"

-

-#, c-format

-msgid "The file was saved as %s."

-msgstr "Failas įrašytas vardu %s."

-

-#  Build the Send As menu

-msgid "Sending"

-msgstr "Siunčiama"

-

-msgid "Receiving"

-msgstr "Gaunama"

-

-#, c-format

-msgid "Conversation in %s on %s"

-msgstr "Pokalbiai kambaryje %s, %s"

-

-#, c-format

-msgid "Conversation with %s on %s"

-msgstr "Pokalbiai su %s, %s"

-

-msgid "%B %Y"

-msgstr "%Y %B"

-

-msgid ""

-"System events will only be logged if the \"Log all status changes to system "

-"log\" preference is enabled."

-msgstr ""

-"Sisteminiai įvykiai įrašomi į žurnalą, jei įjungta nuostata „Rašyti visus "

-"būsenos pasikeitimus į sistemos žurnalą“."

-

-msgid ""

-"Instant messages will only be logged if the \"Log all instant messages\" "

-"preference is enabled."

-msgstr ""

-"Skubiosios žinutės įrašomos į žurnalą, jei įjungta nuostata „Rašyti visas "

-"skubiąsias žinutes į žurnalą“."

-

-msgid ""

-"Chats will only be logged if the \"Log all chats\" preference is enabled."

-msgstr ""

-"Pokalbiai kambariuose įrašomi į žurnalą, jei įjungta nuostata „Rašyti visus "

-"pokalbius kambariuoe į žurnalą“.\""

-

-msgid "No logs were found"

-msgstr "Žurnalų nerasta"

-

-msgid "Total log size:"

-msgstr "Viso žurnalo dydis:"

-

-#. Search box *********

-msgid "Scroll/Search: "

-msgstr "Slinkti/ieškoti: "

-

-#, c-format

-msgid "Conversations in %s"

-msgstr "Pokalbiai kambaryje %s"

-

-#, c-format

-msgid "Conversations with %s"

-msgstr "Pokalbiai su %s"

-

-msgid "All Conversations"

-msgstr "Visi pokalbiai"

-

-#  Window **********

-msgid "System Log"

-msgstr "Sistemos žurnalas"

-

-msgid "Emails"

-msgstr "El. laiškai"

-

-msgid "You have mail!"

-msgstr "Jūs turite pašto!"

-

-msgid "Sender"

-msgstr "Siuntėjas"

-

-msgid "Subject"

-msgstr "Tema"

-

-#, c-format

-msgid "%s (%s) has %d new message."

-msgid_plural "%s (%s) has %d new messages."

-msgstr[0] "%s (%s) turi %d naują pranešimą."

-msgstr[1] "%s (%s) turi %d naujus pranešimus."

-msgstr[2] "%s (%s) turi %d naujų pranešimų."

-

-msgid "New Mail"

-msgstr "Naujas paštas"

-

-#, c-format

-msgid "Info for %s"

-msgstr "Informacija apie %s"

-

-msgid "Buddy Information"

-msgstr "Informacija apie bičiulį"

-

-msgid "Continue"

-msgstr "Tęsti"

-

-msgid "IM"

-msgstr "Kalbėtis"

-

-msgid "(none)"

-msgstr "(nieko)"

-

-msgid "URI"

-msgstr "URI"

-

-msgid "ERROR"

-msgstr "KLAIDA"

-

-msgid "loading plugin failed"

-msgstr "nepavyko įkelti papildinio"

-

-msgid "unloading plugin failed"

-msgstr "nepavyko iškelti papildinio"

-

-#, c-format

-msgid ""

-"Name: %s\n"

-"Version: %s\n"

-"Description: %s\n"

-"Author: %s\n"

-"Website: %s\n"

-"Filename: %s\n"

-msgstr ""

-"Pavadinimas: %s\n"

-"Versija: %s\n"

-"Aprašymas: %s\n"

-"Autorius: %s\n"

-"Svetainė: %s\n"

-"Failo vardas: %s\n"

-

-msgid "Plugin need to be loaded before you can configure it."

-msgstr "Prieš konfigūruojant papildinį, jį reikia įkelti."

-

-msgid "No configuration options for this plugin."

-msgstr "Šis papildinys neturi konfigūruojamų parinkčių."

-

-msgid "Error loading plugin"

-msgstr "Papildinio įkėlimo klaida"

-

-msgid "The selected file is not a valid plugin."

-msgstr "Pasirinktasis failas nėra tikras papildinys."

-

-msgid ""

-"Please open the debug window and try again to see the exact error message."

-msgstr ""

-"Prašau atidaryti derinimo langą ir pabandyti vėl, kad pamatytumėte tikslų "

-"klaidos pranešimą."

-

-msgid "Select plugin to install"

-msgstr "Pasirinkite papildinį įdiegimui"

-

-msgid "You can (un)load plugins from the following list."

-msgstr "Jūs galite įkelti ar iškelti papildinius iš šio sąrašo."

-

-msgid "Install Plugin..."

-msgstr "Įdiegti papildinį..."

-

-msgid "Configure Plugin"

-msgstr "Konfigūruoti papildinį"

-

-#. copy the preferences to tmp values...

-#. * I liked "take affect immediately" Oh well :-(

-#. (that should have been "effect," right?)

-#. Back to instant-apply! I win!  BU-HAHAHA!

-#. Create the window

-msgid "Preferences"

-msgstr "Nuostatos"

-

-msgid "Please enter a buddy to pounce."

-msgstr "Įveskite bičiulį, į kurį reaguoti"

-

-#  "New Buddy Pounce"

-msgid "New Buddy Pounce"

-msgstr "Nauja reakcija į bičiulį"

-

-msgid "Edit Buddy Pounce"

-msgstr "Redaguoti reakciją į bičiulį"

-

-#  Create the "Pounce Who" frame.

-msgid "Pounce Who"

-msgstr "Į kokį bičiulį reaguoti"

-

-#  Set up stuff for the account box

-#. Account:

-msgid "Account:"

-msgstr "Paskyra:"

-

-msgid "Buddy name:"

-msgstr "Bičiulio vardas:"

-

-#  Create the "Pounce When" frame.

-#. Create the "Pounce When Buddy..." frame.

-msgid "Pounce When Buddy..."

-msgstr "Reaguoti, kai bičiulis..."

-

-msgid "Signs on"

-msgstr "prisijungia"

-

-msgid "Signs off"

-msgstr "atsijungia"

-

-msgid "Goes away"

-msgstr "pasitraukia"

-

-msgid "Returns from away"

-msgstr "sugrįžta"

-

-msgid "Becomes idle"

-msgstr "tampa neveiklus"

-

-msgid "Is no longer idle"

-msgstr "tampa veiklus"

-

-msgid "Starts typing"

-msgstr "pradeda rašyti"

-

-msgid "Pauses while typing"

-msgstr "trumpam nustoja rašyti"

-

-msgid "Stops typing"

-msgstr "nustoja rašyti"

-

-msgid "Sends a message"

-msgstr "išsiunčia žinutę"

-

-#. Create the "Action" frame.

-msgid "Action"

-msgstr "Veiksmas"

-

-msgid "Open an IM window"

-msgstr "Atidaryti pokalbių langą"

-

-msgid "Pop up a notification"

-msgstr "Parodyti pranešimo langą"

-

-msgid "Send a message"

-msgstr "Nusiųsti žinutę"

-

-msgid "Execute a command"

-msgstr "Įvykdyti komandą"

-

-msgid "Play a sound"

-msgstr "Groti garsą"

-

-msgid "Pounce only when my status is not Available"

-msgstr "Reaguoti tik tada, kai esu neprieinamoje būsenoje"

-

-msgid "Recurring"

-msgstr "Pasikartojanti reakcija"

-

-msgid "Cannot create pounce"

-msgstr "Negalima sukurti reakcijos"

-

-msgid "You do not have any accounts."

-msgstr "Neturite jokių paskyrų."

-

-msgid "You must create an account first before you can create a pounce."

-msgstr "Prieš kurdamas reakciją privalote pirma sukurti paskyrą."

-

-#, c-format

-msgid "Are you sure you want to delete the pounce on %s for %s?"

-msgstr "Ar tikrai norite pašalinti reakciją į %s nuo %s?"

-

-#  "New Buddy Pounce"

-msgid "Buddy Pounces"

-msgstr "Reakcijos į bičiulius"

-

-#, c-format

-msgid "%s has started typing to you (%s)"

-msgstr "%s pradėjo Jums rašyti (%s)"

-

-#, c-format

-msgid "%s has paused while typing to you (%s)"

-msgstr "Pradėjęs Jums rašyti %s sustojo (%s)"

-

-#, c-format

-msgid "%s has signed on (%s)"

-msgstr "%s prisijungė (%s)"

-

-#, c-format

-msgid "%s has returned from being idle (%s)"

-msgstr "%s tapo veiklus (%s)"

-

-#, c-format

-msgid "%s has returned from being away (%s)"

-msgstr "%s sugrįžo (%s)"

-

-#, c-format

-msgid "%s has stopped typing to you (%s)"

-msgstr "%s nustojo Jums rašyti (%s)"

-

-#, c-format

-msgid "%s has signed off (%s)"

-msgstr "%s atsijungė (%s)"

-

-#, c-format

-msgid "%s has become idle (%s)"

-msgstr "%s tapo neveiklus (%s)"

-

-#, c-format

-msgid "%s has gone away. (%s)"

-msgstr "%s pasitraukė. (%s)"

-

-#, c-format

-msgid "%s has sent you a message. (%s)"

-msgstr "%s atsiuntė Jums žinutę. (%s)"

-

-#, c-format

-msgid "Unknown pounce event. Please report this!"

-msgstr "Nežinomas reakcijos veiksmas. Prašome apie tai pranešti!"

-

-msgid "Based on keyboard use"

-msgstr "pagal klaviatūros naudojimą"

-

-msgid "From last sent message"

-msgstr "nuo paskutinės išsiųstos žinutės"

-

-msgid "Never"

-msgstr "niekada"

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-msgid "Show Idle Time"

-msgstr "Rodyti neveiklumo laikus"

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-msgid "Show Offline Buddies"

-msgstr "Rodyti neprisijungusius bičiulius"

-

-msgid "Notify buddies when you are typing"

-msgstr "Informuoti bičiulius, kai jiems rašote"

-

-msgid "Log format"

-msgstr "Žurnalo formatas"

-

-msgid "Log IMs"

-msgstr "Į žurnalą rašyti asmeninius pokalbius"

-

-msgid "Log chats"

-msgstr "Į žurnalą rašyti pokalbius kambariuose"

-

-msgid "Log status change events"

-msgstr "Į žurnalą rašyti būsenos pasikeitimus"

-

-msgid "Report Idle time"

-msgstr "Rodyti neveiklumo laiką"

-

-msgid "Change status when idle"

-msgstr "Pakeisti būseną tapus neveikliu"

-

-msgid "Minutes before changing status"

-msgstr "Kiek minučių turi praeiti iki būsenos pakeitimo"

-

-msgid "Change status to"

-msgstr "Pakeisti būseną į"

-

-msgid "Conversations"

-msgstr "Pokalbiai"

-

-msgid "Logging"

-msgstr "Žurnalų vedimas"

-

-msgid "You must fill all the required fields."

-msgstr "Turite užpildyti visus privalomus laukus."

-

-msgid "The required fields are underlined."

-msgstr "Privalomi laukai yra pabraukti."

-

-msgid "Not implemented yet."

-msgstr "Funkcija dar nerealizuota."

-

-msgid "Save File..."

-msgstr "Įrašyti failą..."

-

-msgid "Open File..."

-msgstr "Atverti failą..."

-

-msgid "Choose Location..."

-msgstr "Parinkite kelią..."

-

-msgid "Hit 'Enter' to find more rooms of this category."

-msgstr ""

-"Paspauskite įvedimo klavišą, kad rastumėte daugiau šios kategorijos kambarių."

-

-msgid "Get"

-msgstr "Gauti"

-

-#. Create the window.

-msgid "Room List"

-msgstr "Kambarių sąrašas"

-

-msgid "Buddy logs in"

-msgstr "Bičiulis prisijungia"

-

-msgid "Buddy logs out"

-msgstr "Bičiulis atsijungia"

-

-msgid "Message received"

-msgstr "Gauta žinutė"

-

-msgid "Message received begins conversation"

-msgstr "Gauta žinutė, pradedanti pokalbį"

-

-msgid "Message sent"

-msgstr "Išsiųsta žinutė"

-

-msgid "Person enters chat"

-msgstr "Asmuo ateina į pokalbių kambarį"

-

-msgid "Person leaves chat"

-msgstr "Asmuo palieka pokalbių kambarį"

-

-msgid "You talk in chat"

-msgstr "Jūs kalbate pokalbių kambaryje"

-

-msgid "Others talk in chat"

-msgstr "Kiti kalba pokalbių kambaryje"

-

-msgid "Someone says your username in chat"

-msgstr "Kas nors pokalbyje pasako Jūsų vardą"

-

-msgid "GStreamer Failure"

-msgstr "GStreamer klaida"

-

-msgid "GStreamer failed to initialize."

-msgstr "Nepavyko paleisti GStreamer."

-

-msgid "(default)"

-msgstr "(numatytasis)"

-

-msgid "Select Sound File ..."

-msgstr "Pasirinkite garso failą..."

-

-msgid "Sound Preferences"

-msgstr "Garsų nuostatos"

-

-msgid "Profiles"

-msgstr "Profiliai"

-

-msgid "Automatic"

-msgstr "automatinis"

-

-msgid "Console Beep"

-msgstr "pyptelėjimai"

-

-msgid "Command"

-msgstr "komanda"

-

-msgid "No Sound"

-msgstr "be garsų"

-

-msgid "Sound Method"

-msgstr "Garso grojimo būdas:"

-

-msgid "Method: "

-msgstr "Būdas:"

-

-#, c-format

-msgid ""

-"Sound Command\n"

-"(%s for filename)"

-msgstr ""

-"Garso komanda:\n"

-"(%s reiškia failo vardą)"

-

-#. Sound options

-msgid "Sound Options"

-msgstr "Garso parinktys"

-

-msgid "Sounds when conversation has focus"

-msgstr "Groti garsus, kai pokalbio langas yra veikiamasis"

-

-msgid "Always"

-msgstr "visada"

-

-msgid "Only when available"

-msgstr "tik kai esu pasiekiamas"

-

-msgid "Only when not available"

-msgstr "tik kai esu nepasiekiamas"

-

-msgid "Volume(0-100):"

-msgstr "Garsumas (0--100):"

-

-#. Sound events

-msgid "Sound Events"

-msgstr "Garsai ir veiksmai"

-

-msgid "Event"

-msgstr "Įvykis"

-

-msgid "File"

-msgstr "Failas"

-

-msgid "Test"

-msgstr "Testuoti"

-

-msgid "Reset"

-msgstr "Atstatyti"

-

-msgid "Choose..."

-msgstr "Pasirinkti..."

-

-#, c-format

-msgid "Are you sure you want to delete \"%s\""

-msgstr "Ar Jūs tikrai norite šalinti „%s“?"

-

-msgid "Delete Status"

-msgstr "Pašalinti būseną"

-

-msgid "Saved Statuses"

-msgstr "Išsaugotos būsenos"

-

-msgid "Title"

-msgstr "Pavadinimas"

-

-msgid "Type"

-msgstr "Rūšis"

-

-#. Statuses are almost all the same. Define a macro to reduce code repetition.

-#. PurpleStatusPrimitive

-#. id - use default

-#. name - use default

-#. saveable

-#. user_settable

-#. not independent

-#. Attributes - each status can have a message.

-msgid "Message"

-msgstr "Žinutė"

-

-#. Use

-msgid "Use"

-msgstr "Naudoti"

-

-msgid "Invalid title"

-msgstr "Neteisingas pavadinimas"

-

-msgid "Please enter a non-empty title for the status."

-msgstr "Įveskite netuščią būsenos pavadinimą."

-

-msgid "Duplicate title"

-msgstr "Pasikartojantis pavadinimas"

-

-msgid "Please enter a different title for the status."

-msgstr "Prašome įvesti skirtingą pavadinimą šiai būsenai."

-

-msgid "Substatus"

-msgstr "Smulkesnė būsena"

-

-msgid "Status:"

-msgstr "Būsena:"

-

-msgid "Message:"

-msgstr "Žinutė:"

-

-msgid "Edit Status"

-msgstr "Redaguoti būseną"

-

-msgid "Use different status for following accounts"

-msgstr "Šioms paskyroms naudoti kitą būseną"

-

-#. Save & Use

-msgid "Save & Use"

-msgstr "Išsaugoti ir naudoti"

-

-msgid "Certificates"

-msgstr "Liudijimai"

-

-msgid "Sounds"

-msgstr "Garsai"

-

-msgid "Statuses"

-msgstr "Būsenos"

-

-msgid "Error loading the plugin."

-msgstr "Papildinio įkėlimo klaida."

-

-msgid "Couldn't find X display"

-msgstr "Nepavyko surasti X ekrano"

-

-msgid "Couldn't find window"

-msgstr "Nepavyko surasti lango"

-

-msgid "This plugin cannot be loaded because it was not built with X11 support."

-msgstr ""

-"Nepavyko įkelti šio papildinio, nes jis sukonstruotas be X11 palaikymo."

-

-msgid "GntClipboard"

-msgstr "„Gnt“ iškarpinė"

-

-msgid "Clipboard plugin"

-msgstr "Iškarpinės papildinys"

-

-msgid ""

-"When the gnt clipboard contents change, the contents are made available to "

-"X, if possible."

-msgstr "Kai „Gnt“ iškarpinės turinys pasikeičia, jis perduodamas X iškarpinei"

-

-#, c-format

-msgid "%s just signed on"

-msgstr "%s ką tik prisijungė"

-

-#, c-format

-msgid "%s just signed off"

-msgstr "%s atsijungė"

-

-#, c-format

-msgid "%s sent you a message"

-msgstr "%s atsiuntė žinutę"

-

-#, c-format

-msgid "%s said your nick in %s"

-msgstr "%s pasakė Jūsų vardą pokalbyje %s"

-

-#, c-format

-msgid "%s sent a message in %s"

-msgstr "%s parašė žinutę pokalbyje %s"

-

-msgid "Buddy signs on/off"

-msgstr "Bičiulis pradeda arba baigia seansą"

-

-msgid "You receive an IM"

-msgstr "Gaunate žinutę"

-

-msgid "Someone speaks in a chat"

-msgstr "Kas nors parašo į pokalbį"

-

-msgid "Someone says your name in a chat"

-msgstr "Kas nors pokalbyje pasako Jūsų vardą"

-

-msgid "Notify with a toaster when"

-msgstr "Informuoti iššokančiu langeliu, kai:"

-

-msgid "Beep too!"

-msgstr "Taip pat ir pyptelėti!"

-

-msgid "Set URGENT for the terminal window."

-msgstr "Nustatyti „URGENT“ požymį terminalo langui."

-

-msgid "GntGf"

-msgstr "GntGf"

-

-msgid "Toaster plugin"

-msgstr "Iššokančių langelių papildinys"

-

-#, c-format

-msgid "<b>Conversation with %s on %s:</b><br>"

-msgstr "<b>Pokalbis su %s, įvykęs %s:</b><br>"

-

-msgid "History Plugin Requires Logging"

-msgstr "Istorijos papildinys reikalauja žurnalų vedimo"

-

-msgid ""

-"Logging can be enabled from Tools -> Preferences -> Logging.\n"

-"\n"

-"Enabling logs for instant messages and/or chats will activate history for "

-"the same conversation type(s)."

-msgstr ""

-"Žurnalų vedimas gali būti įjungtas iš meniu pasirinkus Įrankiai -> Nuostatos "

-"-> Žurnalų vedimas.\n"

-"\n"

-"Žurnalų vedimo įjungimas greitosioms žinutėms ar pokalbiams kambariuose "

-"aktyvuos ir jų istoriją."

-

-msgid "GntHistory"

-msgstr "GntHistory"

-

-msgid "Shows recently logged conversations in new conversations."

-msgstr "Parodo neseniai įrašytus pokalbius naujuose pokalbiuose."

-

-msgid ""

-"When a new conversation is opened this plugin will insert the last "

-"conversation into the current conversation."

-msgstr ""

-"Kai pradedamas naujas pokalbis, šis papildinys įterps paskutinio pokalbio "

-"tekstą su tuo pačiu pašnekovu į pokalbių langą."

-

-msgid "Online"

-msgstr "Prisijungęs"

-

-msgid "Offline"

-msgstr "Atsijungęs"

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-msgid "Online Buddies"

-msgstr "Prisijungusių bičiulių"

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-msgid "Offline Buddies"

-msgstr "Neprisijungusių bičiulių"

-

-msgid "Online/Offline"

-msgstr "Prisijungęs/neprisijungęs"

-

-msgid "Meebo"

-msgstr "Meebo"

-

-msgid "No Grouping"

-msgstr "Be grupavimo"

-

-msgid "Nested Subgroup"

-msgstr "Įdėtas pogrupis"

-

-msgid "Nested Grouping (experimental)"

-msgstr "Įdėtinis grupavimas (eksperimentinis)"

-

-msgid "Provides alternate buddylist grouping options."

-msgstr "Siūlo papildomus bičiulių sąrašo grupavimo būdus."

-

-msgid "Lastlog"

-msgstr "Lastlog"

-

-#. Translator Note: The "backlog" is the conversation buffer/history.

-msgid "lastlog: Searches for a substring in the backlog."

-msgstr "lastlog: ieško eilutės žurnaluose."

-

-msgid "GntLastlog"

-msgstr "GntLastLog"

-

-msgid "Lastlog plugin."

-msgstr "„Lastlog“ papildinys."

-

-msgid "accounts"

-msgstr "paskyros"

-

-msgid "Password is required to sign on."

-msgstr "Prisijungimui būtinas slaptažoidis."

-

-#, c-format

-msgid "Enter password for %s (%s)"

-msgstr "Įveskite %s (%s) slaptažodį"

-

-msgid "Enter Password"

-msgstr "Įveskite slaptažodį"

-

-msgid "Save password"

-msgstr "Išsaugoti slaptažodį"

-

-#, c-format

-msgid "Missing protocol plugin for %s"

-msgstr "Trūksta %s protokolo papildinio"

-

-msgid "Connection Error"

-msgstr "Sujungimo klaida"

-

-msgid "New passwords do not match."

-msgstr "Nauji slaptažodžiai nesutampa."

-

-msgid "Fill out all fields completely."

-msgstr "Pilnai užpildykite visus laukus."

-

-msgid "Original password"

-msgstr "Pradinis slaptažodis"

-

-msgid "New password"

-msgstr "Naujas slaptažodis"

-

-msgid "New password (again)"

-msgstr "Naujas slaptažodis (vėl)"

-

-#, c-format

-msgid "Change password for %s"

-msgstr "Keisti %s slaptažodį"

-

-msgid "Please enter your current password and your new password."

-msgstr "Prašome įvesti Jūsų pradinį slaptažodį ir Jūsų naują slaptažodį."

-

-#, c-format

-msgid "Change user information for %s"

-msgstr "Pakeisti vartotojo %s informaciją"

-

-msgid "Set User Info"

-msgstr "Nustatyti vartotojo informaciją"

-

-msgid "Unknown"

-msgstr "Nežinoma"

-

-msgid "Buddies"

-msgstr "Bičiuliai"

-

-msgid "buddy list"

-msgstr "bičiulių sąrašas"

-

-msgid "(DOES NOT MATCH)"

-msgstr "(NESUTAMPA)"

-

-#. Make messages

-#, c-format

-msgid "%s has presented the following certificate for just-this-once use:"

-msgstr "%s pateikė šį liudijimą vienkartiniam naudojimui:"

-

-#, c-format

-msgid ""

-"Common name: %s %s\n"

-"Fingerprint (SHA1): %s"

-msgstr ""

-"Įprastas vardas: %s %s\n"

-"SHA1 liudijimo kodas: %s"

-

-#. TODO: Find what the handle ought to be

-msgid "Single-use Certificate Verification"

-msgstr "Vienkartinio liudijimo patikra"

-

-#. Scheme name

-#. Pool name

-msgid "Certificate Authorities"

-msgstr "Liudijimų įstaigos"

-

-#. Scheme name

-#. Pool name

-msgid "SSL Peers Cache"

-msgstr "SSL partnerių podėlis"

-

-#. Make messages

-#, c-format

-msgid "Accept certificate for %s?"

-msgstr "Ar priimti liudijimą iš %s?"

-

-#. TODO: Find what the handle ought to be

-msgid "SSL Certificate Verification"

-msgstr "SSL liudijimo patikra"

-

-#. Number of actions

-msgid "Accept"

-msgstr "Priimti"

-

-msgid "Reject"

-msgstr "Atmesti"

-

-msgid "_View Certificate..."

-msgstr "_Rodyti liudijimą..."

-

-#. Prompt the user to authenticate the certificate

-#. vrq will be completed by user_auth

-#, c-format

-msgid ""

-"The certificate presented by \"%s\" is self-signed. It cannot be "

-"automatically checked."

-msgstr ""

-"Liudijimas, kurį pateikė „%s“, yra paties pasirašytas.  Jis negali būti "

-"automatiškai patikrintas."

-

-#, c-format

-msgid "The certificate chain presented for %s is not valid."

-msgstr "Liudijimų grandinė, pateikta %s, yra neteisinga."

-

-#. TODO: Make this error either block the ensuing SSL

-#. connection error until the user dismisses this one, or

-#. stifle it.

-#. TODO: Probably wrong.

-#. TODO: Probably wrong

-msgid "SSL Certificate Error"

-msgstr "SSL liudijimo klaida"

-

-msgid "Invalid certificate chain"

-msgstr "Neteisinga liudijimų grandinė"

-

-#. vrq will be completed by user_auth

-msgid ""

-"You have no database of root certificates, so this certificate cannot be "

-"validated."

-msgstr ""

-"Neturite pagrindinių liudijimų duomenų bazės, todėl šis liudijimas negali "

-"būti patikrintas."

-

-#. vrq will be completed by user_auth

-msgid ""

-"The root certificate this one claims to be issued by is unknown to Pidgin."

-msgstr ""

-"Šis liudijimas nurodo jį išleidusį pagrindinį liudijimą, kurio Pidgin nežino."

-

-#, c-format

-msgid ""

-"The certificate chain presented by %s does not have a valid digital "

-"signature from the Certificate Authority from which it claims to have a "

-"signature."

-msgstr ""

-"Liudijimų grandinė, kurią pateikė %s, neturi galiojančio skaitmeninio parašo "

-"iš liudijimų įstaigos, iš kurios ji teigia gavusi parašą."

-

-msgid "Invalid certificate authority signature"

-msgstr "Neteisingas liudijimų įstaigos parašas"

-

-#. Prompt the user to authenticate the certificate

-#. TODO: Provide the user with more guidance about why he is

-#. being prompted

-#. vrq will be completed by user_auth

-#, c-format

-msgid ""

-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "

-"could mean that you are not connecting to the service you believe you are."

-msgstr ""

-"Liudijimas, pateiktas „%s“, tvirtina, kad iš tikrųjų priklauso „%s“.  Galbūt "

-"jūs jungiatės ne prie tos paslaugos, prie kurios manote, kad jungiatės."

-

-#. Make messages

-#, c-format

-msgid ""

-"Common name: %s\n"

-"\n"

-"Fingerprint (SHA1): %s\n"

-"\n"

-"Activation date: %s\n"

-"Expiration date: %s\n"

-msgstr ""

-"Įprastas vardas: %s\n"

-"\n"

-"SHA1 kontrolinis kodas: %s\n"

-"\n"

-"Galiojimo pradžia: %s\n"

-"Galiojimo pabaiga: %s\n"

-

-#. TODO: Find what the handle ought to be

-msgid "Certificate Information"

-msgstr "Liudijimo informacija"

-

-msgid "Registration Error"

-msgstr "Registravimo klaida"

-

-msgid "Unregistration Error"

-msgstr "Išregistravimo klaida"

-

-#, c-format

-msgid "+++ %s signed on"

-msgstr "+++ %s prisijungė"

-

-#, c-format

-msgid "+++ %s signed off"

-msgstr "+++ %s atsijungė"

-

-msgid "Unknown error"

-msgstr "Nežinoma klaida"

-

-msgid "Unable to send message: The message is too large."

-msgstr "Negalima išsiųsti žinutės: ji per ilga."

-

-#, c-format

-msgid "Unable to send message to %s."

-msgstr "Negalima išsiųsti žinutės vartotojui %s."

-

-msgid "The message is too large."

-msgstr "Žinutė per ilga."

-

-msgid "Unable to send message."

-msgstr "Negalima išsiųsti žinutės."

-

-msgid "Send Message"

-msgstr "Nusiųsti žinutę"

-

-msgid "_Send Message"

-msgstr "Nu_siųsti žinutę"

-

-#, c-format

-msgid "%s entered the room."

-msgstr "%s atėjo į kambarį."

-

-#, c-format

-msgid "%s [<I>%s</I>] entered the room."

-msgstr "%s [<I>%s</I>] atėjo į kambarį."

-

-#, c-format

-msgid "You are now known as %s"

-msgstr "Dabar esate žinomas kaip %s"

-

-#, c-format

-msgid "%s is now known as %s"

-msgstr "%s dabar yra žinomas kaip %s"

-

-#, c-format

-msgid "%s left the room."

-msgstr "%s paliko kambarį."

-

-#, c-format

-msgid "%s left the room (%s)."

-msgstr "%s paliko kambarį (%s)."

-

-#, c-format

-msgid "Failed to get connection: %s"

-msgstr "Nepavyko gauti jungties: %s"

-

-#, c-format

-msgid "Failed to get name: %s"

-msgstr "Nepavyko gauti vardo: %s"

-

-#, c-format

-msgid "Failed to get serv name: %s"

-msgstr "Nepavyko gauti serverio pavadinimo: %s"

-

-msgid "Purple's D-BUS server is not running for the reason listed below"

-msgstr "Purple D-BUS serveris nėra paleistas dėl žemiau pateiktos priežasties"

-

-msgid "No name"

-msgstr "Be vardo"

-

-msgid "Unable to create new resolver process\n"

-msgstr "Negalima sukurti naujo DNS adresų keitiklio proceso\n"

-

-msgid "Unable to send request to resolver process\n"

-msgstr "Nepavyko išsiųsti užklausos DNS adresų keitiklio procesui\n"

-

-#, c-format

-msgid ""

-"Error resolving %s:\n"

-"%s"

-msgstr ""

-"Klaida verčiant DNS adresą %s:\n"

-"%s"

-

-#, c-format

-msgid "Error resolving %s: %d"

-msgstr "Klaida keičiant DNS adresą %s: %d"

-

-#, c-format

-msgid ""

-"Error reading from resolver process:\n"

-"%s"

-msgstr ""

-"Skaitymo iš DNS adresų keitiklio proceso klaida:\n"

-"%s"

-

-#, c-format

-msgid "Resolver process exited without answering our request"

-msgstr "Adresų keitiklio procesas baigė darbą neatsakęs į mūsų užklausą"

-

-#, c-format

-msgid "Thread creation failure: %s"

-msgstr "Nepavyko sukurti gijos: %s"

-

-msgid "Unknown reason"

-msgstr "Nežinoma priežastis"

-

-#, c-format

-msgid ""

-"Error reading %s: \n"

-"%s.\n"

-msgstr ""

-"%s skaitymo klaida:\n"

-"%s.\n"

-

-#, c-format

-msgid ""

-"Error writing %s: \n"

-"%s.\n"

-msgstr ""

-"%s rašymo klaida:\n"

-"%s.\n"

-

-#, c-format

-msgid ""

-"Error accessing %s: \n"

-"%s.\n"

-msgstr ""

-"%s prieigos klaida:\n"

-"%s.\n"

-

-msgid "Directory is not writable."

-msgstr "Į katalogą negalima rašyti."

-

-msgid "Cannot send a file of 0 bytes."

-msgstr "Negalima siųsti 0 baitų dydžio failo."

-

-msgid "Cannot send a directory."

-msgstr "Negalima siųsti katalogo."

-

-#, c-format

-msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"

-msgstr "%s nėra paprastas failas, todėl nebuvo pakeistas.\n"

-

-#, c-format

-msgid "%s wants to send you %s (%s)"

-msgstr "%s nori Jums atsiųsti %s (%s)"

-

-#, c-format

-msgid "%s wants to send you a file"

-msgstr "%s nori Jums atsiųsti failą"

-

-#, c-format

-msgid "Accept file transfer request from %s?"

-msgstr "Ar priimti perduodamą failą iš %s?"

-

-#, c-format

-msgid ""

-"A file is available for download from:\n"

-"Remote host: %s\n"

-"Remote port: %d"

-msgstr ""

-"Failas yra prieinamas parsisiuntimui iš:\n"

-"Nutolęs mazgas: %s\n"

-"Nutolęs prievadas: %d"

-

-#, c-format

-msgid "%s is offering to send file %s"

-msgstr "%s siūlo atsiųsti failą %s"

-

-#, c-format

-msgid "%s is not a valid filename.\n"

-msgstr "%s nėra teisingas failo vardas.\n"

-

-#, c-format

-msgid "Offering to send %s to %s"

-msgstr "Siūloma nusiųsti %s bičiuliui %s"

-

-#, c-format

-msgid "Starting transfer of %s from %s"

-msgstr "Pradedamas %s gavimas iš %s"

-

-#, c-format

-msgid "Transfer of file %s complete"

-msgstr "Failo %s perdavimas baigtas"

-

-msgid "File transfer complete"

-msgstr "Failo perdavimas baigtas"

-

-#, c-format

-msgid "You canceled the transfer of %s"

-msgstr "Jūs nutraukėte %s perdavimą"

-

-msgid "File transfer cancelled"

-msgstr "Failo perdavimas nutrauktas"

-

-#, c-format

-msgid "%s canceled the transfer of %s"

-msgstr "%s nutraukė %s perdavimą"

-

-#, c-format

-msgid "%s canceled the file transfer"

-msgstr "%s nutraukė failo perdavimą"

-

-#, c-format

-msgid "File transfer to %s failed."

-msgstr "Įvyko failo perdavimo bičiuliui %s klaida."

-

-#, c-format

-msgid "File transfer from %s failed."

-msgstr "Įvyko failo gavimo iš %s klaida."

-

-msgid "Run the command in a terminal"

-msgstr "Vykdyti komandą terminale"

-

-msgid "The command used to handle \"aim\" URLs, if enabled."

-msgstr "Komanda „aim“ universaliųjų adresų apdorojimui, jei aktyvuota."

-

-msgid "The command used to handle \"gg\" URLs, if enabled."

-msgstr "Komanda „gg“ universaliųjų adresų apdorojimui, jei aktyvuota."

-

-msgid "The command used to handle \"icq\" URLs, if enabled."

-msgstr "Komanda „icq“ universaliųjų adresų apdorojimui, jei aktyvuota."

-

-msgid "The command used to handle \"irc\" URLs, if enabled."

-msgstr "Komanda „irc“ universaliųjų adresų apdorojimui, jei aktyvuota."

-

-msgid "The command used to handle \"msnim\" URLs, if enabled."

-msgstr "Komanda „msnim“ universaliųjų adresų apdorojimui, jei aktyvuota."

-

-msgid "The command used to handle \"sip\" URLs, if enabled."

-msgstr "Komanda „sip“ universaliųjų adresų apdorojimui, jei aktyvuota."

-

-msgid "The command used to handle \"xmpp\" URLs, if enabled."

-msgstr "Komanda „xmpp“ universaliųjų adresų apdorojimui, jei aktyvuota."

-

-msgid "The command used to handle \"ymsgr\" URLs, if enabled."

-msgstr "Komanda „ysmgr“ universaliųjų adresų apdorojimui, jei aktyvuota."

-

-msgid "The handler for \"aim\" URLs"

-msgstr "Komanda „aim“ universaliųjų adresų apdorojimui"

-

-msgid "The handler for \"gg\" URLs"

-msgstr "Komanda „aim“ universaliųjų adresų apdorojimui"

-

-msgid "The handler for \"icq\" URLs"

-msgstr "Komanda „icq“ universaliųjų adresų apdorojimui"

-

-msgid "The handler for \"irc\" URLs"

-msgstr "Komanda „irc“ universaliųjų adresų apdorojimui"

-

-msgid "The handler for \"msnim\" URLs"

-msgstr "Komanda „msnim“ universaliųjų adresų apdorojimui"

-

-msgid "The handler for \"sip\" URLs"

-msgstr "Komanda „sip“ universaliųjų adresų apdorojimui"

-

-msgid "The handler for \"xmpp\" URLs"

-msgstr "Komanda „xmpp“ universaliųjų adresų apdorojimui"

-

-msgid "The handler for \"ymsgr\" URLs"

-msgstr "Komanda „ysmgr“ universaliųjų adresų apdorojimui"

-

-msgid ""

-"True if the command specified in the \"command\" key should handle \"aim\" "

-"URLs."

-msgstr ""

-"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „aim“ "

-"universaliuosius adresus."

-

-msgid ""

-"True if the command specified in the \"command\" key should handle \"gg\" "

-"URLs."

-msgstr ""

-"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „gg“ "

-"universaliuosius adresus."

-

-msgid ""

-"True if the command specified in the \"command\" key should handle \"icq\" "

-"URLs."

-msgstr ""

-"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „icq“ "

-"universaliuosius adresus."

-

-msgid ""

-"True if the command specified in the \"command\" key should handle \"irc\" "

-"URLs."

-msgstr ""

-"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „irc“ "

-"universaliuosius adresus."

-

-msgid ""

-"True if the command specified in the \"command\" key should handle \"msnim\" "

-"URLs."

-msgstr ""

-"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „msnim“ "

-"universaliuosius adresus."

-

-msgid ""

-"True if the command specified in the \"command\" key should handle \"sip\" "

-"URLs."

-msgstr ""

-"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „sip“ "

-"universaliuosius adresus."

-

-msgid ""

-"True if the command specified in the \"command\" key should handle \"xmpp\" "

-"URLs."

-msgstr ""

-"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „xmpp“ "

-"universaliuosius adresus."

-

-msgid ""

-"True if the command specified in the \"command\" key should handle \"ymsgr\" "

-"URLs."

-msgstr ""

-"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „ysmgr“ "

-"universaliuosius adresus."

-

-msgid ""

-"True if the command used to handle this type of URL should be run in a "

-"terminal."

-msgstr ""

-"„True“, jeigu komanda, turinti apdoroti šio tipo universaliuosius adresus, "

-"turi būti leidžiama terminale."

-

-msgid "Whether the specified command should handle \"aim\" URLs"

-msgstr "Ar nurodytoji komanda turėtų apdoroti „aim“ universaliuosius adresus"

-

-msgid "Whether the specified command should handle \"gg\" URLs"

-msgstr "Ar nurodytoji komanda turėtų apdoroti „gg“ universaliuosius adresus"

-

-msgid "Whether the specified command should handle \"icq\" URLs"

-msgstr "Ar nurodytoji komanda turėtų apdoroti „icq“ universaliuosius adresus"

-

-msgid "Whether the specified command should handle \"irc\" URLs"

-msgstr "Ar nurodytoji komanda turėtų apdoroti „irc“ universaliuosius adresus"

-

-msgid "Whether the specified command should handle \"msnim\" URLs"

-msgstr "Ar nurodytoji komanda turėtų apdoroti „msnim“ universaliuosius adresus"

-

-msgid "Whether the specified command should handle \"sip\" URLs"

-msgstr "Ar nurodytoji komanda turėtų apdoroti „sip“ universaliuosius adresus"

-

-msgid "Whether the specified command should handle \"xmpp\" URLs"

-msgstr "Ar nurodytoji komanda turėtų apdoroti „xmpp“ universaliuosius adresus"

-

-msgid "Whether the specified command should handle \"ymsgr\" URLs"

-msgstr "Ar nurodytoji komanda turėtų apdoroti „ysmgr“ universaliuosius adresus"

-

-msgid "<b><font color=\"red\">The logger has no read function</font></b>"

-msgstr ""

-"<b><font color=\"red\">Žurnalų tvarkytuvė neturi skaitymo funkcijos</font></"

-"b>"

-

-msgid "HTML"

-msgstr "HTML"

-

-msgid "Plain text"

-msgstr "Grynasis tekstas"

-

-msgid "Old flat format"

-msgstr "Senasis plokščias formatas"

-

-msgid "Logging of this conversation failed."

-msgstr "Nepavyko šio pokalbio įrašyti į žurnalą."

-

-msgid "XML"

-msgstr "XML"

-

-#, c-format

-msgid ""

-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"

-"REPLY&gt;:</b></font> %s<br/>\n"

-msgstr ""

-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATINIS "

-"ATSAKYMAS&gt;:</b></font> %s<br/>\n"

-

-#, c-format

-msgid ""

-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"

-"REPLY&gt;:</b></font> %s<br/>\n"

-msgstr ""

-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATINIS "

-"ATSAKYMAS&gt;:</b></font> %s<br/>\n"

-

-msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"

-msgstr "<font color=\"red\"><b>Negalima rasti žurnalų kelio!</b></font>"

-

-#, c-format

-msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"

-msgstr "<font color=\"red\"><b>Negalima perskaityti failo: %s</b></font>"

-

-#, c-format

-msgid "(%s) %s <AUTO-REPLY>: %s\n"

-msgstr "(%s) %s <AUTOMATINIS-ATSAKYMAS>: %s\n"

-

-#, c-format

-msgid "You are using %s, but this plugin requires %s."

-msgstr "Jūs naudojatės %s, bet šiam papildiniui reikia %s."

-

-msgid "This plugin has not defined an ID."

-msgstr "Šis papildinys nenustatė ID"

-

-#, c-format

-msgid "Plugin magic mismatch %d (need %d)"

-msgstr "Neatitinka papildinio kontrolinis skaičius %d (turėtų būti %d)"

-

-#, c-format

-msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"

-msgstr "ABI versija %d.%d.x neatitinka (turėtų būti %d.%d.x)"

-

-msgid ""

-"Plugin does not implement all required functions (list_icon, login and close)"

-msgstr ""

-"Papildinys nerealizuoja visų reikallingų funkcijų (list_icon, login ir close)"

-

-#, c-format

-msgid ""

-"The required plugin %s was not found. Please install this plugin and try "

-"again."

-msgstr ""

-"Reikalautas papildinys %s nerastas. Prašome įdiegti šį papildinį ir bandyti "

-"iš naujo."

-

-msgid "Unable to load the plugin"

-msgstr "Papildinio įkelti nepavyko"

-

-#, c-format

-msgid "The required plugin %s was unable to load."

-msgstr "Reikalauto papildinio %s nepavyko įkelti."

-

-msgid "Unable to load your plugin."

-msgstr "Nepavyko įkelti Jūsų nurodyto papildinio."

-

-#, c-format

-msgid "%s requires %s, but it failed to unload."

-msgstr "%s reikalauja %s, bet pastarojo papildinio iškelti nepavyko."

-

-msgid "Autoaccept"

-msgstr "Automatinis priėmimas"

-

-msgid "Auto-accept file transfer requests from selected users."

-msgstr "Automatiškai priima failų siuntimus iš pasirinktų vartotojų."

-

-#, c-format

-msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."

-msgstr "Automatiškai priimtas failo „%s“ siuntimas iš „%s“ baigtas."

-

-msgid "Autoaccept complete"

-msgstr "Automatinis priėmimas baigtas"

-

-#, c-format

-msgid "When a file-transfer request arrives from %s"

-msgstr "Kai gaunamas failo perdavimo prašymas iš %s"

-

-msgid "Set Autoaccept Setting"

-msgstr "Nustatyti automatinį prėmimą"

-

-msgid "_Save"

-msgstr "_Įrašyti"

-

-msgid "_Cancel"

-msgstr "_Atsisakyti"

-

-msgid "Ask"

-msgstr "Paklausti"

-

-msgid "Auto Accept"

-msgstr "Automatiškai priimti"

-

-msgid "Auto Reject"

-msgstr "Automatiškai atmesti"

-

-msgid "Autoaccept File Transfers..."

-msgstr "Automatiškai priimti failų perdavimus..."

-

-#. XXX: Is there a better way than this? There really should be.

-msgid ""

-"Path to save the files in\n"

-"(Please provide the full path)"

-msgstr ""

-"Kelias, kuriame išsaugoti failus\n"

-"(Nurodykite pilną kelią)"

-

-msgid "Automatically reject from users not in buddy list"

-msgstr "Automatiškai atmesti iš vartotojų, nesančių bičiulių sąraše"

-

-msgid ""

-"Notify with a popup when an autoaccepted file transfer is complete\n"

-"(only when there's no conversation with the sender)"

-msgstr ""

-"Pranešti iššokančiu langu, kai baigtas automatiškai priimtas failo "

-"perdavimas\n"

-"(tik jei nevyko pokalbis su siuntėju)"

-

-msgid "Create a new directory for each user"

-msgstr "Sukurti po naują katalogą kiekvienam naudotojui"

-

-msgid "Notes"

-msgstr "Pastabos"

-

-msgid "Enter your notes below..."

-msgstr "Įveskite savo pastabas žemiau..."

-

-msgid "Edit Notes..."

-msgstr "Redaguoti pastabas..."

-

-#  "New Buddy Pounce"

-#. *< major version

-#. *< minor version

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Buddy Notes"

-msgstr "Pastabos apie bičiulius"

-

-#. *< name

-#. *< version

-msgid "Store notes on particular buddies."

-msgstr "Saugo pastabas apie konkrečius bičiulius."

-

-#. *< summary

-msgid "Adds the option to store notes for buddies on your buddy list."

-msgstr ""

-"Siūlo galimybę saugoti pastabas apie bičiulius iš Jūsų bičiulių sąrašo."

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Cipher Test"

-msgstr "Šifrų testas"

-

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Tests the ciphers that ship with libpurple."

-msgstr "Testuoja su „libpurple“ pateikiamus šifrus."

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "DBus Example"

-msgstr "DBus papildinio pavyzdys"

-

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "DBus Plugin Example"

-msgstr "DBus papildinio pavyzdys"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "File Control"

-msgstr "Valdymas failu"

-

-#  *< name

-#  *< version

-#  *  summary

-#  *  description

-#  *< name

-#  *< version

-#  *  summary

-#  *  description

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Allows control by entering commands in a file."

-msgstr "Leidžia valdyti programą faile surašytomis komandomis."

-

-msgid "Minutes"

-msgstr "Minutės"

-

-#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.

-#. If that doesn't translate well into your language, drop the 's before translating.

-msgid "I'dle Mak'er"

-msgstr "Neveiklumo meistras"

-

-msgid "Set Account Idle Time"

-msgstr "Nustatyti abonento neveiklumo laiką"

-

-msgid "_Set"

-msgstr "_Nustatyti"

-

-msgid "None of your accounts are idle."

-msgstr "Nėra neveiklių paskyrų."

-

-msgid "Unset Account Idle Time"

-msgstr "Panaikinti abonento neveiklumo laiko nustatymą"

-

-msgid "_Unset"

-msgstr "_Panaikinti"

-

-msgid "Set Idle Time for All Accounts"

-msgstr "Nustatyti neveiklumo laiką visoms paskyroms"

-

-msgid "Unset Idle Time for All Idled Accounts"

-msgstr "Panaikinti neveiklumo laiko nustatymą visoms paskyroms"

-

-msgid "Allows you to hand-configure how long you've been idle"

-msgstr "Leidžia Jums rankiniu būdu nustatyti Jūsų neveiklumo laiką"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "IPC Test Client"

-msgstr "Testinis IPC klientas"

-

-#. *< name

-#. *< version

-#. *  summary

-msgid "Test plugin IPC support, as a client."

-msgstr "Patikrina papildinių IPC palaikymą klientams."

-

-#. *  description

-msgid ""

-"Test plugin IPC support, as a client. This locates the server plugin and "

-"calls the commands registered."

-msgstr ""

-"Patikrina papildinių IPC palaikymą klientams.  Suranda IPC serverio "

-"papildinį ir iškviečia registruotas komandas."

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "IPC Test Server"

-msgstr "Testinis IPC serveris"

-

-#. *< name

-#. *< version

-#. *  summary

-msgid "Test plugin IPC support, as a server."

-msgstr "Patikrina papildinių IPC palaikymą serveriams."

-

-#. *  description

-msgid "Test plugin IPC support, as a server. This registers the IPC commands."

-msgstr ""

-"Patikrina papildinių IPC palaikymą serveriams. Priregistruoja IPC komandas."

-

-msgid "Join/Part Hiding Configuration"

-msgstr "Prisijungimų ir atsijungimų slėpimo parinktys"

-

-msgid "Minimum Room Size"

-msgstr "Mažiausias kambario dydis"

-

-msgid "User Inactivity Timeout (in minutes)"

-msgstr "Vartotojo neveiklumo laukimo laikas (minutėmis)"

-

-msgid "Apply hiding rules to buddies"

-msgstr "Pritaikyti bičiuliams slėpimo taisykles"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Join/Part Hiding"

-msgstr "Prisijungimų ir atsijungimų slėpimas"

-

-#. *< name

-#. *< version

-#. *  summary

-msgid "Hides extraneous join/part messages."

-msgstr "Slepia šalutines prisijungimų ir atsijungimų žinutes."

-

-#. *  description

-msgid ""

-"This plugin hides join/part messages in large rooms, except for those users "

-"actively taking part in a conversation."

-msgstr ""

-"Šis papildinys paslepia prisijungimų ir atsijungimų žinutes dideliuose "

-"kambariuose, išskyrus tų naudotojų, kurie aktyviai dalyvauja pokalbyje."

-

-#. This is used in the place of a timezone abbreviation if the

-#. * offset is way off.  The user should never really see it, but

-#. * it's here just in case.  The parens are to make it clear it's

-#. * not a real timezone.

-msgid "(UTC)"

-msgstr "(UTC)"

-

-msgid "User is offline."

-msgstr "Vartotojas atsijungęs."

-

-msgid "Auto-response sent:"

-msgstr "Nusiųstas automatinis atsakymas:"

-

-#, c-format

-msgid "%s has signed off."

-msgstr "%s atsijungė."

-

-msgid "One or more messages may have been undeliverable."

-msgstr "Viena ar daugiau žinučių galėjo būti nepristatytos gavėjui."

-

-msgid "You were disconnected from the server."

-msgstr "Jūs buvote atjungtas nuo serverio."

-

-msgid ""

-"You are currently disconnected. Messages will not be received unless you are "

-"logged in."

-msgstr ""

-"Šiuo metu esate atsijungęs, todėl negausite žinučių, kol neprisijungsite."

-

-msgid "Message could not be sent because the maximum length was exceeded."

-msgstr "Žinutė neišsiųsta, nes viršytas jos didžiausias leistinas ilgis"

-

-msgid "Message could not be sent."

-msgstr "Žinutė nebuvo išsiųsta."

-

-#. The names of IM clients are marked for translation at the request of

-#. translators who wanted to transliterate them.  Many translators

-#. choose to leave them alone.  Choose what's best for your language.

-msgid "Adium"

-msgstr "Adium"

-

-#. The names of IM clients are marked for translation at the request of

-#. translators who wanted to transliterate them.  Many translators

-#. choose to leave them alone.  Choose what's best for your language.

-msgid "Fire"

-msgstr "Fire"

-

-#. The names of IM clients are marked for translation at the request of

-#. translators who wanted to transliterate them.  Many translators

-#. choose to leave them alone.  Choose what's best for your language.

-msgid "Messenger Plus!"

-msgstr "Messenger Plus!"

-

-#. The names of IM clients are marked for translation at the request of

-#. translators who wanted to transliterate them.  Many translators

-#. choose to leave them alone.  Choose what's best for your language.

-msgid "QIP"

-msgstr "QIP"

-

-#. The names of IM clients are marked for translation at the request of

-#. translators who wanted to transliterate them.  Many translators

-#. choose to leave them alone.  Choose what's best for your language.

-msgid "MSN Messenger"

-msgstr "MSN Messenger"

-

-#. The names of IM clients are marked for translation at the request of

-#. translators who wanted to transliterate them.  Many translators

-#. choose to leave them alone.  Choose what's best for your language.

-msgid "Trillian"

-msgstr "Trillian"

-

-#. The names of IM clients are marked for translation at the request of

-#. translators who wanted to transliterate them.  Many translators

-#. choose to leave them alone.  Choose what's best for your language.

-msgid "aMSN"

-msgstr "aMSN"

-

-#. Add general preferences.

-msgid "General Log Reading Configuration"

-msgstr "Bendros žurnalų skaitymo parinktys"

-

-msgid "Fast size calculations"

-msgstr "Greitas dydžio apskaičiavimas"

-

-msgid "Use name heuristics"

-msgstr "Naudoti vardų euristiką"

-

-#. Add Log Directory preferences.

-msgid "Log Directory"

-msgstr "Žurnalų katalogas"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Log Reader"

-msgstr "Žurnalų skaityklė"

-

-#. *< name

-#. *< version

-#. * summary

-msgid "Includes other IM clients' logs in the log viewer."

-msgstr "Žurnalų žiūryklėje parodo ir kitų pokalbių programų žurnalus."

-

-#. * description

-msgid ""

-"When viewing logs, this plugin will include logs from other IM clients. "

-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"

-"\n"

-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "

-"at your own risk!"

-msgstr ""

-"Į žurnalų žiūryklę papildomai įtraukia žurnalus iš kitų pokalbių programų.  "

-"Šiuo metu yra galimybė rodyti Adium, MSN Messenger ir Trillian programų "

-"žurnalus.<\n"

-"\n"

-"PERSPĖJIMAS: šis papildinys yra vis dar bandomasis ir gali dažnai lūžti.  "

-"Naudokite jį savo rizika!"

-

-msgid "Mono Plugin Loader"

-msgstr "Mono papildinių paleidyklė"

-

-msgid "Loads .NET plugins with Mono."

-msgstr "Su Mono įkelia .NET papildinius."

-

-msgid "Add new line in IMs"

-msgstr "Pridėti naują eilutę asmeninėse žinutėse"

-

-msgid "Add new line in Chats"

-msgstr "Pridėti naują eilutę pokalbių kambariuose"

-

-#. *< magic

-#. *< major version

-#. *< minor version

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "New Line"

-msgstr "Nauja eilutė"

-

-#. *< name

-#. *< version

-msgid "Prepends a newline to displayed message."

-msgstr "Prieš rodomą žinutę įterpia naują eilutę"

-

-#. *< summary

-msgid ""

-"Prepends a newline to messages so that the rest of the message appears below "

-"the username in the conversation window."

-msgstr ""

-"Įterpia naują eilutę pokalbių lange tarp žinutės autoriaus ir žinutės teksto."

-

-msgid "Offline Message Emulation"

-msgstr "Atjungtų žinučių imitavimas"

-

-msgid "Save messages sent to an offline user as pounce."

-msgstr ""

-"Išsaugo žinutes, išsiųstas atsijungusiems bičiuliams, kaip reakcijas į juos."

-

-msgid ""

-"The rest of the messages will be saved as pounce. You can edit/delete the "

-"pounce from the `Buddy Pounce' dialog."

-msgstr ""

-"Likusios žinutės bus išsaugotos kaip reakcija į bičiulį.  Galite keisti arba "

-"ištrinti šią reakciją dialoge „Reakcijos į bičiulius“."

-

-#, c-format

-msgid ""

-"\"%s\" is currently offline. Do you want to save the rest of the messages in "

-"a pounce and automatically send them when \"%s\" logs back in?"

-msgstr ""

-"„%s“ šiuo metu yra atsijungęs.  Ar norite išsaugoti likusias žinutes kaip "

-"reakciją į bičiulį ir automatiškai jas išsiųsti, kai „%s“ vėl prisijungs?"

-

-msgid "Offline Message"

-msgstr "Atjungta žinutė"

-

-msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"

-msgstr "Galite keisti arba ištrinti reakciją dialoge „Reakcijos į bičiulius“."

-

-#  *

-#  * A wrapper for Pidgin_request_action() that uses Yes and No buttons.

-msgid "Yes"

-msgstr "Taip"

-

-msgid "No"

-msgstr "Ne"

-

-msgid "Save offline messages in pounce"

-msgstr "Išsaugoti atjungtas žinutes reakcijoje"

-

-msgid "Do not ask. Always save in pounce."

-msgstr "Neklausti. Visada išsaugoti reakcijoje."

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Perl Plugin Loader"

-msgstr "Perl papildinių paleidyklė"

-

-#. *< name

-#. *< version

-#. *< summary

-msgid "Provides support for loading perl plugins."

-msgstr "Suteikia galimybę įkelti Perl papildinius."

-

-msgid "Psychic Mode"

-msgstr "Aiškiaregystė"

-

-msgid "Psychic mode for incoming conversation"

-msgstr "Išankstinis įeinančių žinučių numatymas"

-

-msgid ""

-"Causes conversation windows to appear as other users begin to message you.  "

-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"

-msgstr ""

-"Atidaro pokalbių langą iškart, kai kitas vartotojas pradeda rašyti Jums "

-"žinutę.  Ši funkcija veikia AIM, ICQ, XMPP, Sametime ir Yahoo! protokoluose."

-

-msgid "You feel a disturbance in the force..."

-msgstr "Jaučiate sutrikdymą jėgoje..."

-

-msgid "Only enable for users on the buddy list"

-msgstr "Įjungti tik vartotojams iš bičiulių sąrašo"

-

-msgid "Disable when away"

-msgstr "Išjungti, kai aš pasitraukęs"

-

-msgid "Display notification message in conversations"

-msgstr "Rodyti informacinį pranešimą pokalbyje"

-

-msgid "Raise psychic conversations"

-msgstr "Pakelti nujaučiamų pokalbių langus"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Signals Test"

-msgstr "Signalų testas"

-

-#  *< name

-#  *< version

-#  *  summary

-#  *  description

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Test to see that all signals are working properly."

-msgstr "Testas, skirtas nustatyti, ar visi signalai veikia teisingai."

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Simple Plugin"

-msgstr "Paprastas papildinys"

-

-#  *< name

-#  *< version

-#  *  summary

-#  *  description

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Tests to see that most things are working."

-msgstr "Patikrina, ar dauguma dalykų veikia"

-

-#. Scheme name

-msgid "X.509 Certificates"

-msgstr "X.509 liudijimai"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "GNUTLS"

-msgstr "GNUTLS biblioteka"

-

-#  *< name

-#  *< version

-#  *  summary

-#  *  description

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Provides SSL support through GNUTLS."

-msgstr "GNUTLS pagalba suteikia SSL palaikymą."

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "NSS"

-msgstr "NSS"

-

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Provides SSL support through Mozilla NSS."

-msgstr "Mozilla NSS pagalba suteikia SSL palaikymą."

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "SSL"

-msgstr "SSL protokolo palaikymas"

-

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Provides a wrapper around SSL support libraries."

-msgstr "Suteikia apvalkalą SSL palaikymo bibliotekoms"

-

-#, c-format

-msgid "%s is no longer away."

-msgstr "%s sugrįžo."

-

-#, c-format

-msgid "%s has gone away."

-msgstr "%s pasitraukė."

-

-#, c-format

-msgid "%s has become idle."

-msgstr "%s tapo neveiklus."

-

-#, c-format

-msgid "%s is no longer idle."

-msgstr "%s tapo veiklus."

-

-#, c-format

-msgid "%s has signed on."

-msgstr "%s prisijungė."

-

-msgid "Notify When"

-msgstr "Informuoti, kai"

-

-msgid "Buddy Goes _Away"

-msgstr "bičiulis išein_a"

-

-msgid "Buddy Goes _Idle"

-msgstr "b_ičiulis tampa neveiklus"

-

-msgid "Buddy _Signs On/Off"

-msgstr "Bičiulis pradeda arba baigia seansą"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Buddy State Notification"

-msgstr "Pranešimai apie bičiulių būsenas"

-

-#  *< name

-#  *< version

-#  *  summary

-#  *  description

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid ""

-"Notifies in a conversation window when a buddy goes or returns from away or "

-"idle."

-msgstr ""

-"Pokalbių lange praneša apie bičiulio pasitraukimą, grįžimą, tapimą veikliu "

-"ar neveikliu."

-

-msgid "Tcl Plugin Loader"

-msgstr "Tcl papildinių paleidyklė"

-

-msgid "Provides support for loading Tcl plugins"

-msgstr "Suteikia galimybę įkelti Tcl papildinius"

-

-msgid ""

-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "

-"install ActiveTCL from http://www.activestate.com\n"

-msgstr ""

-"Nepavyko rasti įdiegto „ActiveTCL“.  Jei norite naudoti TCL papildinius, "

-"įdiekite „ActiveTCL“ iš http://www.activestate.com\n"

-

-msgid ""

-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."

-"pidgin.im/BonjourWindows for more information."

-msgstr ""

-"Apple Bonjour Windows priemonių rinkinys nerastas.  Adresu http://d.pidgin."

-"im/BonjourWindow rasite daugiau informacijos."

-

-msgid "Unable to listen for incoming IM connections\n"

-msgstr ""

-"Nepavyko sukurti klausymo prievado įeinančioms greitųjų žinučių jungtims\n"

-

-msgid ""

-"Unable to establish connection with the local mDNS server.  Is it running?"

-msgstr "Nepavyko prisijungti su vietiniu mDNS serveriu.  Ar jis paleistas?"

-

-msgid "First name"

-msgstr "Tikrasis vardas"

-

-msgid "Last name"

-msgstr "Pavardė"

-

-msgid "Email"

-msgstr "El. paštas"

-

-msgid "AIM Account"

-msgstr "AIM paskyra"

-

-msgid "XMPP Account"

-msgstr "XMPP paskyra"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Bonjour Protocol Plugin"

-msgstr "Bonjour protokolo papildinys"

-

-msgid "Purple Person"

-msgstr "(nežinomas vardas)"

-

-#. Creating the options for the protocol

-msgid "Local Port"

-msgstr "Vietinis prievadas"

-

-msgid "Bonjour"

-msgstr "Bonjour"

-

-#, c-format

-msgid "%s has closed the conversation."

-msgstr "%s uždarė pokalbio langą."

-

-msgid "Unable to send the message, the conversation couldn't be started."

-msgstr "Negalima išsiųsti žinutės ir pradėti pokalbio."

-

-msgid "Cannot open socket"

-msgstr "Nepavyko atidaryti prievado"

-

-msgid "Could not bind socket to port"

-msgstr "Nepavyko susieti jungties su prievadu"

-

-msgid "Could not listen on socket"

-msgstr "Nepavyko nustatyti jungties klausymuisi"

-

-msgid "Error communicating with local mDNSResponder."

-msgstr "Komunikacijos su vietiniu mDNSResponder klaida"

-

-msgid "Invalid proxy settings"

-msgstr "Neteisingi tarpininko nustatymai"

-

-msgid ""

-"Either the host name or port number specified for your given proxy type is "

-"invalid."

-msgstr ""

-"Jūsų pasirinktam tarpininko tipui neteisingai nurodytas mazgo vardas arba "

-"prievado numeris."

-

-msgid "Token Error"

-msgstr "Žymės klaida"

-

-msgid "Unable to fetch the token.\n"

-msgstr "Nepavyko gauti žymės.\n"

-

-msgid "Save Buddylist..."

-msgstr "Išsaugoti bičiulių sąrašą..."

-

-msgid "Your buddylist is empty, nothing was written to the file."

-msgstr "Jūsų bičiulių sąrašas tuščias, todėl į failą nieko nebuvo įrašyta."

-

-msgid "Buddylist saved successfully!"

-msgstr "Bičiulių sąrašas sėkmingai išsaugotas!"

-

-#, c-format

-msgid "Couldn't write buddy list for %s to %s"

-msgstr "Paskyros %s bičiulių sąrašo nepavyko įrašyti į %s"

-

-msgid "Couldn't load buddylist"

-msgstr "Nepavyko įkelti bičiulių sąrašo"

-

-msgid "Load Buddylist..."

-msgstr "Įkelti bičiulių sąrašą..."

-

-msgid "Buddylist loaded successfully!"

-msgstr "Bičiulių sąrašas sėkmingai įkeltas!"

-

-msgid "Save buddylist..."

-msgstr "Išsaugoti bičiulių sąrašą..."

-

-msgid "Load buddylist from file..."

-msgstr "Įkelti bičiulių sąrašą iš failo..."

-

-msgid "Fill in the registration fields."

-msgstr "Užpildykite registracijos formos laukus."

-

-msgid "Passwords do not match."

-msgstr "Slaptažodžiai nesutampa."

-

-msgid "Unable to register new account. Error occurred.\n"

-msgstr "Nepavyko registruoti naujos paskyros, nes įvyko klaida.\n"

-

-msgid "New Gadu-Gadu Account Registered"

-msgstr "Užregistruotas naujas Gadu-Gadu abonentas"

-

-msgid "Registration completed successfully!"

-msgstr "Registracija sėkmingai užbaigta!"

-

-msgid "Password"

-msgstr "Slaptažodis"

-

-msgid "Password (retype)"

-msgstr "Pakartotas slaptažodis"

-

-msgid "Enter current token"

-msgstr "Įveskite dabartinę žymę"

-

-msgid "Current token"

-msgstr "Dabartinė žymė"

-

-msgid "Register New Gadu-Gadu Account"

-msgstr "Registruoti naują Gadu-Gadu abonentą"

-

-msgid "Please, fill in the following fields"

-msgstr "Prašome užpildyti tolimesnius laukus"

-

-msgid "City"

-msgstr "Miestas"

-

-msgid "Year of birth"

-msgstr "Gimimo metai"

-

-msgid "Gender"

-msgstr "Lytis"

-

-msgid "Male or female"

-msgstr "Vyras ar moteris"

-

-msgid "Male"

-msgstr "Vyras"

-

-msgid "Female"

-msgstr "Moteris"

-

-msgid "Only online"

-msgstr "Šiuo metu prisijungęs"

-

-msgid "Find buddies"

-msgstr "Ieškoti bičiulių"

-

-msgid "Please, enter your search criteria below"

-msgstr "Prašome žemiau įvesti, pagal ką ieškosite"

-

-msgid "Fill in the fields."

-msgstr "Užpildykite laukus."

-

-msgid "Your current password is different from the one that you specified."

-msgstr "Jūsų dabartinis slaptažodis skiriasi nuo nurodytojo."

-

-msgid "Unable to change password. Error occurred.\n"

-msgstr "Slaptažodis nepakeistas, įvyko klaida.\n"

-

-msgid "Change password for the Gadu-Gadu account"

-msgstr "Pakeisti Gadu-Gadu paskyros slaptažodį"

-

-msgid "Password was changed successfully!"

-msgstr "Slaptažodis buvo sėkmingai pakeistas!"

-

-msgid "Current password"

-msgstr "Dabartinis slaptažodis"

-

-msgid "Please, enter your current password and your new password for UIN: "

-msgstr "Prašome įvesti Jūsų dabartinį slaptažodį ir Jūsų naują UIN slaptažodį:"

-

-msgid "Change Gadu-Gadu Password"

-msgstr "Pakeisti Gadu-Gadu slaptažodį"

-

-#, c-format

-msgid "Select a chat for buddy: %s"

-msgstr "Pasirinkite pokalbių kambarį bičiuliui %s"

-

-msgid "Add to chat..."

-msgstr "Įtraukti į pokalbių kambarį..."

-

-msgid "Available"

-msgstr "Pasiekiamas"

-

-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for

-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message

-#. Away stuff

-msgid "Away"

-msgstr "Pasitraukęs"

-

-msgid "UIN"

-msgstr "UIN"

-

-msgid "First Name"

-msgstr "Vardas"

-

-msgid "Birth Year"

-msgstr "Gimimo metai"

-

-msgid "Unable to display the search results."

-msgstr "Negalima parodyti paieškos rezultatų."

-

-msgid "Gadu-Gadu Public Directory"

-msgstr "Viešasis Gadu-Gadu katalogas"

-

-msgid "Search results"

-msgstr "Paieškos rezultatai"

-

-msgid "No matching users found"

-msgstr "Ieškotų vartotojų nerasta"

-

-msgid "There are no users matching your search criteria."

-msgstr "Vartotojų, tenkinančių paieškos kriterijus, nėra."

-

-msgid "Unable to read socket"

-msgstr "Nepavyko skaityti iš jungties"

-

-#  Buddy List trans options

-msgid "Buddy list downloaded"

-msgstr "Bičiulių sąrašas atsisiųstas"

-

-msgid "Your buddy list was downloaded from the server."

-msgstr "Jūsų bičiulių sąrašas atsisiųstas iš serverio."

-

-msgid "Buddy list uploaded"

-msgstr "Bičiulių sąrašas nusiųstas į serverį"

-

-msgid "Your buddy list was stored on the server."

-msgstr "Jūsų bičiulių sąrašas išsaugotas serveryje."

-

-msgid "Connection failed."

-msgstr "Nepavyko prisijungti."

-

-msgid "Add to chat"

-msgstr "Įtraukti į pokalbių kambarį"

-

-msgid "Chat _name:"

-msgstr "Ka_nalo pavadinimas:"

-

-msgid "Chat error"

-msgstr "Pokalbių kambario klaida"

-

-msgid "This chat name is already in use"

-msgstr "Toks pokalbių kambario vardas jau yra vartojamas"

-

-msgid "Not connected to the server."

-msgstr "Neprisijungta prie serverio."

-

-msgid "Find buddies..."

-msgstr "Ieškoti bičiulių..."

-

-msgid "Change password..."

-msgstr "Pakeisti slaptažodį..."

-

-msgid "Upload buddylist to Server"

-msgstr "Nusiųsti bičiulių sąrašą į serverį"

-

-msgid "Download buddylist from Server"

-msgstr "Atsisiųsti bičiulių sąrašą iš serverio"

-

-msgid "Delete buddylist from Server"

-msgstr "Ištrinti bičiulių sąrašą iš serverio"

-

-msgid "Save buddylist to file..."

-msgstr "Įšsaugoti bičiulių sąrašą faile..."

-

-#. magic

-#. major_version

-#. minor_version

-#. plugin type

-#. ui_requirement

-#. flags

-#. dependencies

-#. priority

-#. id

-#. name

-#. version

-msgid "Gadu-Gadu Protocol Plugin"

-msgstr "Gadu-Gadu protokolo papildinys"

-

-#. summary

-msgid "Polish popular IM"

-msgstr "Populiarus lenkiškas bendravimo tinklas"

-

-msgid "Gadu-Gadu User"

-msgstr "Gadu-Gadu vartotojas"

-

-#, c-format

-msgid "Unknown command: %s"

-msgstr "Nežinoma komanda: %s"

-

-#, c-format

-msgid "current topic is: %s"

-msgstr "dabartinė tema yra: %s"

-

-msgid "No topic is set"

-msgstr "Temos nėra"

-

-msgid "File Transfer Failed"

-msgstr "Failo perdavimas nepavyko"

-

-msgid "Could not open a listening port."

-msgstr "Nepavyko atverti prievado klausymui."

-

-msgid "Error displaying MOTD"

-msgstr "MOTD pavaizdavimo klaida"

-

-msgid "No MOTD available"

-msgstr "Nėra MOTD"

-

-msgid "There is no MOTD associated with this connection."

-msgstr "Nėra su šia jungtimi susieto MOTD."

-

-#, c-format

-msgid "MOTD for %s"

-msgstr "%s MOTD"

-

-msgid "Server has disconnected"

-msgstr "Serveris atsijungė"

-

-msgid "View MOTD"

-msgstr "Žiūrėti MOTD"

-

-msgid "_Channel:"

-msgstr "_Kanalas:"

-

-msgid "_Password:"

-msgstr "Sla_ptažodis:"

-

-msgid "IRC nicks may not contain whitespace"

-msgstr "IRC vardai negali turėti matomų tarpų"

-

-#. 1. connect to server

-#. connect to the server

-msgid "Connecting"

-msgstr "Jungiamasi"

-

-msgid "SSL support unavailable"

-msgstr "Nėra SSL palaikymo"

-

-msgid "Couldn't create socket"

-msgstr "Nepavyko sukurti jungties"

-

-msgid "Couldn't connect to host"

-msgstr "Nepavyko prisijungti prie mazgo"

-

-msgid "Read error"

-msgstr "Skaitymo klaida"

-

-msgid "Users"

-msgstr "Vartotojai"

-

-msgid "Topic"

-msgstr "Tema"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#  *< name

-#  *< version

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-msgid "IRC Protocol Plugin"

-msgstr "IRC protokolo papildinys"

-

-#  *  summary

-#. *  summary

-msgid "The IRC Protocol Plugin that Sucks Less"

-msgstr "Mažiau knisantis IRC protokolo papildinys"

-

-#. host to connect to

-msgid "Server"

-msgstr "Serveris"

-

-#. port to connect to

-msgid "Port"

-msgstr "Prievadas"

-

-msgid "Encodings"

-msgstr "Koduotės"

-

-msgid "Auto-detect incoming UTF-8"

-msgstr "Automatiškai nustatyti gaunamą UTF-8"

-

-msgid "Real name"

-msgstr "Tikras vardas"

-

-#.

-#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);

-#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);

-#.

-msgid "Use SSL"

-msgstr "Naudoti SSL"

-

-msgid "Bad mode"

-msgstr "Bloga būsena"

-

-#, c-format

-msgid "Ban on %s by %s, set %s ago"

-msgstr "Vartotojui %s uždraudė prisijungti %s prieš %s sekundžių"

-

-#, c-format

-msgid "Ban on %s"

-msgstr "Vartotojui %s uždrausta prisijungti"

-

-msgid "End of ban list"

-msgstr "Draudimų sąrašo pabaiga"

-

-#, c-format

-msgid "You are banned from %s."

-msgstr "Jums uždrausta prisijungti prie kanalo %s."

-

-msgid "Banned"

-msgstr "Uždrausta prisijungti prie kanalo"

-

-#, c-format

-msgid "Cannot ban %s: banlist is full"

-msgstr ""

-"Negalima uždrausti %s prisijungti prie kanalo, nes draudimų sąrašas pilnas"

-

-msgid " <i>(ircop)</i>"

-msgstr "<i>(IRC operatorius)</i>"

-

-msgid " <i>(identified)</i>"

-msgstr "<i>(identifikavęsis)</i>"

-

-msgid "Nick"

-msgstr "Vardas"

-

-msgid "Currently on"

-msgstr "Kanaluose"

-

-msgid "Idle for"

-msgstr "Neveiklus jau"

-

-msgid "Online since"

-msgstr "Prisijungęs nuo"

-

-msgid "<b>Defining adjective:</b>"

-msgstr "<b>Aprašantis būdvardis:</b>"

-

-msgid "Glorious"

-msgstr "Šlovingas"

-

-#, c-format

-msgid "%s has changed the topic to: %s"

-msgstr "%s pakeitė temą į: %s"

-

-#, c-format

-msgid "%s has cleared the topic."

-msgstr "%s ištrynė temą."

-

-#, c-format

-msgid "The topic for %s is: %s"

-msgstr "Kanalo %s tema: %s"

-

-#, c-format

-msgid "Unknown message '%s'"

-msgstr "Nežinomas pranešimas „%s“"

-

-msgid "Unknown message"

-msgstr "Nežinoma pranešimas"

-

-msgid "The IRC server received a message it did not understand."

-msgstr "IRC serveris gavo nesuprantamą pranešimą."

-

-#, c-format

-msgid "Users on %s: %s"

-msgstr "Vartotojai, esantys %s: %s"

-

-msgid "Time Response"

-msgstr "Laiko atsakas"

-

-msgid "The IRC server's local time is:"

-msgstr "IRC serverio vietinis laikas yra:"

-

-msgid "No such channel"

-msgstr "Tokio kanalo nėra"

-

-#  does this happen?

-#. does this happen?

-msgid "no such channel"

-msgstr "tokio kanalo nėra"

-

-msgid "User is not logged in"

-msgstr "Vartotojas neprisijungęs"

-

-msgid "No such nick or channel"

-msgstr "Nėra tokio vardo ar kanalo"

-

-msgid "Could not send"

-msgstr "Nepavyko išsiųsti"

-

-#, c-format

-msgid "Joining %s requires an invitation."

-msgstr "Prisijungimui prie %s būtinas pakvietimas."

-

-msgid "Invitation only"

-msgstr "Tik su pakvietimais"

-

-#, c-format

-msgid "You have been kicked by %s: (%s)"

-msgstr "Tave išspyrė %s: %s"

-

-#. Remove user from channel

-#, c-format

-msgid "Kicked by %s (%s)"

-msgstr "Išspyrė %s (%s)"

-

-#, c-format

-msgid "mode (%s %s) by %s"

-msgstr "Būseną (%s %s) nustatė %s"

-

-msgid "Invalid nickname"

-msgstr "Neteisingas vardas"

-

-msgid ""

-"Your selected nickname was rejected by the server.  It probably contains "

-"invalid characters."

-msgstr ""

-"Serveris atmetė Jūsų pasirinktą vardą.  Greičiausiai jame yra neleistinų "

-"simbolių."

-

-msgid ""

-"Your selected account name was rejected by the server.  It probably contains "

-"invalid characters."

-msgstr ""

-"Serveris atmetė Jūsų pasirinktą abonento vardą.  Greičiausiai jame yra "

-"neleistinų simbolių."

-

-msgid "Cannot change nick"

-msgstr "Negalima pakeisti vardo"

-

-msgid "Could not change nick"

-msgstr "Vardo pakeisti nepavyko"

-

-#, c-format

-msgid "You have parted the channel%s%s"

-msgstr "Jūs palikote kanalą%s%s"

-

-msgid "Error: invalid PONG from server"

-msgstr "Klaida: neteisingas PONG iš serverio"

-

-#, c-format

-msgid "PING reply -- Lag: %lu seconds"

-msgstr "Atsakymas į skimbtelėjimą -- delsa: %lu sek."

-

-#, c-format

-msgid "Cannot join %s: Registration is required."

-msgstr "Nepavyko prisijungti prie %s, nes reikalinga registracija."

-

-msgid "Cannot join channel"

-msgstr "Nepavyko prisijungti prie kanalo"

-

-msgid "Nick or channel is temporarily unavailable."

-msgstr "Vardas ar kanalas yra laikinai neprieinamas."

-

-#, c-format

-msgid "Wallops from %s"

-msgstr "Žinutė (wallops) iš %s"

-

-msgid "action &lt;action to perform&gt;:  Perform an action."

-msgstr "action &lt;veiksmas&gt;:  atlieka veiksmą."

-

-msgid ""

-"away [message]:  Set an away message, or use no message to return from being "

-"away."

-msgstr ""

-"away [žinutė]:  nustato pasitraukimp žinutę. Jei žinutė nenurodyta, grįžta "

-"iš pasitraukimo."

-

-msgid "ctcp <nick> <msg>: sends ctcp msg to nick."

-msgstr "ctcp <vardas> <žinutė>: nusiunčia CTCP žinutę nurodytu vardu."

-

-msgid "chanserv: Send a command to chanserv"

-msgstr "chanserv: nusiunčia chanserv komandą"

-

-msgid ""

-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "

-"someone. You must be a channel operator to do this."

-msgstr ""

-"deop &lt;vardas1&gt; [vardas2] ...:  pašalina nurodyto vardo(-ų) "

-"operatoriaus statusą. Tam Jūs turite būti kanalo operatorius."

-

-msgid ""

-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "

-"someone, preventing them from speaking if the channel is moderated (+m). You "

-"must be a channel operator to do this."

-msgstr ""

-"devoice &lt;vardas1&gt; [vardas2] ...:  pašalina nurodyto vardo(-ų) "

-"kalbėjimo teisę, taip užkertant kelią jam kalbėti, jei kanalas yra "

-"prižiūrimas (+m). Tam Jūs turite būti kanalo operatorius."

-

-msgid ""

-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "

-"channel, or the current channel."

-msgstr ""

-"invite &lt;vardas&gt; [room]:  pakviesti vartotoją su nurodytu vardu į "

-"nurodytą arba dabartinį kanalą."

-

-msgid ""

-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "

-"channels, optionally providing a channel key for each if needed."

-msgstr ""

-"j &lt;kanalas1&gt;[,kanalas2][,...] [raktas1[,raktas2][,...]]:  prisijungti "

-"prie vieno ar daugiau kanalų, papildomai kiekvienam iš jų nurodant po raktą, "

-"jei reikia."

-

-msgid ""

-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "

-"channels, optionally providing a channel key for each if needed."

-msgstr ""

-"join &lt;kanalas1&gt;[,kanalas2][,...] [raktas1[,raktas2][,...]]:  "

-"prisijungti prie vieno ar daugiau kanalų, papildomai kiekvienam iš jų "

-"nurodant po raktą, jei reikia."

-

-msgid ""

-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "

-"channel operator to do this."

-msgstr ""

-"kick &lt;vardas&gt; [pranešimas]:  išspirti vartotoją su nurodytu vardu iš "

-"kanalo. Tam Jūs turite būti kanalo operatorius."

-

-msgid ""

-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "

-"may disconnect you upon doing this.</i>"

-msgstr ""

-"list:  parodyti tinklo kanalų sąrašą. <i>Dėmesio, kai kurie serveriai gali "

-"Jus už tai atjungti.</i>"

-

-msgid "me &lt;action to perform&gt;:  Perform an action."

-msgstr "me &lt;veiksmas&gt;:  įvykdyti veiksmą."

-

-msgid "memoserv: Send a command to memoserv"

-msgstr "memoserv: nusiunčia memoserv komandą"

-

-msgid ""

-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "

-"or user mode."

-msgstr ""

-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;vardas|kanalas&gt;:  nustatyti arba "

-"atšaukti kanalo arba vartotojo būseną."

-

-msgid ""

-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "

-"opposed to a channel)."

-msgstr ""

-"msg &lt;vardas&gt; &lt;žinutė&gt;:  siunčia privačią žinutę vartotojui su "

-"nurodytu vardu.  Rašyti į kanalą su šia komanda negalima."

-

-msgid "names [channel]:  List the users currently in a channel."

-msgstr "names [kanalas]:  parodo šiuo metu kanale esančių vartotojų sąrašą."

-

-msgid "nick &lt;new nickname&gt;:  Change your nickname."

-msgstr "nick &lt;naujas slapyvardis&gt;:  pakeičia Jūsų vardą"

-

-msgid "nickserv: Send a command to nickserv"

-msgstr "nickserv: nusiunčia nickserv komandą"

-

-msgid "notice &lt;target&lt;:  Send a notice to a user or channel."

-msgstr "notice &lt;gavėjas&gt;:  nusiųsti pranešimą naudotojui ar kanalui."

-

-msgid ""

-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "

-"must be a channel operator to do this."

-msgstr ""

-"op &lt;vardas1&gt; [vardas2] ...:  suteikia kanalo operatoriaus statusą "

-"nurodytam vardui(-ams).  Tam Jūs turite būti kanalo operatorius."

-

-msgid ""

-"operwall &lt;message&gt;:  If you don't know what this is, you probably "

-"can't use it."

-msgstr ""

-"operwall &lt;žinutė&gt;:  jei nežinote, kas tai yra, tai greičiausiai ir "

-"negalite šios komandos naudoti."

-

-msgid "operserv: Send a command to operserv"

-msgstr "operserv: nusiunčia operserv komandą"

-

-msgid ""

-"part [room] [message]:  Leave the current channel, or a specified channel, "

-"with an optional message."

-msgstr ""

-"part [kanalas] [žinutė]:  išeiti iš dabartinio ar nurodyto kanalo, "

-"neprivalomai nurodant išėjimo žinutę."

-

-msgid ""

-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "

-"has."

-msgstr ""

-"ping [vardas]:  nustato, kokia yra vartotojo (arba serverio, jei slapyvardis "

-"nenurodytas) delsa."

-

-msgid ""

-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "

-"opposed to a channel)."

-msgstr ""

-"query &lt;vardas&gt; &lt;žinutė&gt;: siunčia privačią žinutę vartotojui su "

-"nurodytu vardu.  Rašyti į kanalą su šia komanda negalima."

-

-msgid "quit [message]:  Disconnect from the server, with an optional message."

-msgstr ""

-"quit [žinutė]:  atsijungia nuo serverio su papildoma neprivaloma žinute."

-

-msgid "quote [...]:  Send a raw command to the server."

-msgstr "quote [...]:  siunčia komandą serveriui be papildomo apdorojimo."

-

-msgid ""

-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "

-"channel operator to do this."

-msgstr ""

-"remove &lt;vardas&gt; [žinutė]:  pašalinti vartotoją su nurodytu vardu iš "

-"kanalo. Tam Jūs turite būti kanalo operatorius."

-

-msgid "time: Displays the current local time at the IRC server."

-msgstr "time:  parodyti dabartinį vietinį IRC serverio laiko."

-

-msgid "topic [new topic]:  View or change the channel topic."

-msgstr "topic [nauja tema]:  pažiurėti arba pakeisti kanalo antraštę."

-

-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."

-msgstr ""

-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  keisti arba atstatyti vartotojo būseną."

-

-msgid "version [nick]: send CTCP VERSION request to a user"

-msgstr "version [vardas]: nusiųsti vartotojui CTCP VERSION užklausą"

-

-msgid ""

-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "

-"must be a channel operator to do this."

-msgstr ""

-"voice &lt;vardas1&gt; [vardas2] ...: suteikti vartotojui(-ams) kalbėjimo "

-"teisę.  Tam Jūs turite būti kanalo operatorius."

-

-msgid ""

-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "

-"use it."

-msgstr ""

-"wallops &lt;žinutė&gt;:  jei nežinote, kas tai yra, tai greičiausiai ir "

-"negalite šios komandos naudoti."

-

-msgid "whois [server] &lt;nick&gt;:  Get information on a user."

-msgstr "whois [serveris] &lt;vardas&gt;:  gauti informaciją apie vartotoją."

-

-msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."

-msgstr "whowas &lt;vardas&gt;:  gauti informaciją apie atsijungusį vartotoją."

-

-#, c-format

-msgid "Reply time from %s: %lu seconds"

-msgstr "Atsakymo laikas iš %s: %lu sek."

-

-# Būna poroje su „PING“. Nelabai aišku, kaip versti

-msgid "PONG"

-msgstr "PONG"

-

-# CTCP yra akronimas, PING neišversta.

-msgid "CTCP PING reply"

-msgstr "CTCP PING atsakas"

-

-msgid "Disconnected."

-msgstr "Atjungta."

-

-msgid "Unknown Error"

-msgstr "Nežinoma klaida"

-

-msgid "Ad-Hoc Command Failed"

-msgstr "Specialios (ad hoc) komandos klaida"

-

-msgid "execute"

-msgstr "vykdyti"

-

-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."

-msgstr "Serveris reikalauja TLS/SSL prisijungimui.  Nėra TLS/SSL palaikymo."

-

-msgid "You require encryption, but no TLS/SSL support found."

-msgstr "Jūs reikalaujate šifravimo, bet TLS/SSL palaikymas nerastas."

-

-msgid "Server requires plaintext authentication over an unencrypted stream"

-msgstr ""

-"Serveris reikalauja tapatybės nustatymo grynu tekstu nekoduojamame duomenų "

-"sraute"

-

-#, c-format

-msgid ""

-"%s requires plaintext authentication over an unencrypted connection.  Allow "

-"this and continue authentication?"

-msgstr ""

-"%s reikalauja tapatybės nustatymo grynu tekstu nekoduojamame duomenu "

-"kanale.  Ar leisti tai ir tęsti tapatybės nustatymą?"

-

-msgid "Plaintext Authentication"

-msgstr "Tapatybės nustatymas grynu tekstu"

-

-msgid "Invalid response from server."

-msgstr "Neteisingas atsakas iš serverio."

-

-msgid "Server does not use any supported authentication method"

-msgstr "Serveris nenaudoja jokio Pidgin palaikomo tapatybės nustatymo metodo"

-

-msgid "Invalid challenge from server"

-msgstr "Neteisingas serverio iššūkis"

-

-msgid "SASL error"

-msgstr "SASL klaida"

-

-msgid "Full Name"

-msgstr "Pilnas vardas"

-

-msgid "Family Name"

-msgstr "Pavardė"

-

-msgid "Given Name"

-msgstr "Vardas"

-

-msgid "URL"

-msgstr "URL"

-

-msgid "Street Address"

-msgstr "Adresas"

-

-msgid "Extended Address"

-msgstr "Išplėstas adresas"

-

-msgid "Locality"

-msgstr "Vietovė"

-

-msgid "Region"

-msgstr "Regionas"

-

-msgid "Postal Code"

-msgstr "Pašto indeksas"

-

-#  Country

-msgid "Country"

-msgstr "Šalis"

-

-#. lots of clients (including purple) do this, but it's

-#. * out of spec

-msgid "Telephone"

-msgstr "Telefonas"

-

-msgid "Organization Name"

-msgstr "Organizacijos pavadinimas"

-

-msgid "Organization Unit"

-msgstr "Organizacijos padalinys"

-

-msgid "Role"

-msgstr "Pareigos"

-

-msgid "Birthday"

-msgstr "Gimtadienis"

-

-msgid "Description"

-msgstr "Aprašymas"

-

-msgid "Edit XMPP vCard"

-msgstr "Redaguoti XMPP vCard vizitinę kortelę"

-

-msgid ""

-"All items below are optional. Enter only the information with which you feel "

-"comfortable."

-msgstr ""

-"Visi tolimesni įrašai yra neprivalomi.  Įveskite tik tą informaciją, kurią "

-"norite viešinti."

-

-msgid "Client"

-msgstr "Klientas"

-

-msgid "Operating System"

-msgstr "Operacinė sistema"

-

-msgid "Last Activity"

-msgstr "Paskutinis veiksmas"

-

-msgid "Service Discovery Info"

-msgstr "Paslaugų paieškos informacija"

-

-msgid "Service Discovery Items"

-msgstr "Paslaugų paieškos elementai"

-

-msgid "Extended Stanza Addressing"

-msgstr "Išplėstinių strofų adresavimas"

-

-msgid "Multi-User Chat"

-msgstr "Pokalbis su keliais vartotojais"

-

-msgid "Multi-User Chat Extended Presence Information"

-msgstr "Išplėstinė buvimo informacija pokalbiuose su keliais vartotojais"

-

-msgid "In-Band Bytestreams"

-msgstr "Kanalo vidaus baitų srautai"

-

-msgid "Ad-Hoc Commands"

-msgstr "Specialios (ad hoc) komandos"

-

-msgid "PubSub Service"

-msgstr "PubSub paslauga"

-

-msgid "SOCKS5 Bytestreams"

-msgstr "SOCKS5 baitų srautai"

-

-msgid "Out of Band Data"

-msgstr "Užkanaliniai duomenys"

-

-msgid "XHTML-IM"

-msgstr "XHTML-IM"

-

-msgid "In-Band Registration"

-msgstr "Registracija kanalo viduje"

-

-msgid "User Location"

-msgstr "Naudotojo vietovė"

-

-msgid "User Avatar"

-msgstr "Naudotojo avataras"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-msgid "Chat State Notifications"

-msgstr "Pranešimai apie pokalbio būseną"

-

-msgid "Software Version"

-msgstr "Programinės įrangos versija"

-

-msgid "Stream Initiation"

-msgstr "Kanalo inicijavimas"

-

-msgid "File Transfer"

-msgstr "Failų perdavimas"

-

-msgid "User Mood"

-msgstr "Naudotojo nuotaika"

-

-msgid "User Activity"

-msgstr "Naudotojo aktyvumas"

-

-msgid "Entity Capabilities"

-msgstr "Objektų gebos"

-

-msgid "Encrypted Session Negotiations"

-msgstr "Šifruoti seansų susitarimai"

-

-msgid "User Tune"

-msgstr "Naudotojo daina"

-

-msgid "Roster Item Exchange"

-msgstr "Sąrašo objektų apsikeitimas"

-

-msgid "Reachability Address"

-msgstr "Pasiekiamumo adresas"

-

-msgid "User Profile"

-msgstr "Naudotojo profilis"

-

-#  join button

-msgid "Jingle"

-msgstr "Jingle"

-

-msgid "Jingle Audio"

-msgstr "Jingle Audio"

-

-msgid "User Nickname"

-msgstr "Naudotojo vardas"

-

-msgid "Jingle ICE UDP"

-msgstr "Jingle ICE UDP"

-

-msgid "Jingle ICE TCP"

-msgstr "Jingle ICE TCP"

-

-msgid "Jingle Raw UDP"

-msgstr "Jingle grynu UDP"

-

-msgid "Jingle Video"

-msgstr "Jingle Video"

-

-msgid "Jingle DTMF"

-msgstr "Jingle DTMF"

-

-msgid "Message Receipts"

-msgstr "Pranešimai apie žinučių pristatymą"

-

-msgid "Public Key Publishing"

-msgstr "Viešojo rakto skelbimas"

-

-msgid "User Chatting"

-msgstr "Naudotojas šnekasi"

-

-msgid "User Browsing"

-msgstr "Naudotojas naršo"

-

-msgid "User Gaming"

-msgstr "Naudotojas žaidžia"

-

-msgid "User Viewing"

-msgstr "Naudotojas žiūri"

-

-msgid "Ping"

-msgstr "Skimbtelėti"

-

-msgid "Stanza Encryption"

-msgstr "Strofų šifravimas"

-

-msgid "Entity Time"

-msgstr "Objekto laikas"

-

-msgid "Delayed Delivery"

-msgstr "Uždelstinis pristatymas"

-

-msgid "Collaborative Data Objects"

-msgstr "Bendradarbiavimo duomenų objektai"

-

-msgid "File Repository and Sharing"

-msgstr "Failų saugykla ir dalinimasis"

-

-msgid "STUN Service Discovery for Jingle"

-msgstr "STUN paslaugos paieška, skirta Jingle"

-

-msgid "Simplified Encrypted Session Negotiation"

-msgstr "Supaprastintas susitarimas dėl šifruoto seanso"

-

-msgid "Hop Check"

-msgstr "Šuolių patikrinimas"

-

-msgid "Capabilities"

-msgstr "Sugebėjimai"

-

-msgid "Priority"

-msgstr "Prioritetas"

-

-msgid "Resource"

-msgstr "Išteklius"

-

-msgid "Middle Name"

-msgstr "Antras vardas"

-

-msgid "Address"

-msgstr "Adresas"

-

-msgid "P.O. Box"

-msgstr "Abonentinė pašto dėžutė"

-

-msgid "Photo"

-msgstr "Nuotrauka"

-

-msgid "Logo"

-msgstr "Logotipas"

-

-msgid "Un-hide From"

-msgstr "Nustoti slėpti nuo"

-

-msgid "Temporarily Hide From"

-msgstr "Laikinai paslėpti nuo"

-

-#. && NOT ME

-msgid "Cancel Presence Notification"

-msgstr "Nutraukti informavimą apie buvimą"

-

-msgid "(Re-)Request authorization"

-msgstr "Pareikalauti (iš naujo) prieigos teisės"

-

-#  if(NOT ME)

-#  shouldn't this just happen automatically when the buddy is

-#  removed?

-#. if(NOT ME)

-#. shouldn't this just happen automatically when the buddy is

-#. removed?

-msgid "Unsubscribe"

-msgstr "Išsiregistruoti"

-

-msgid "Log In"

-msgstr "Prisijungti"

-

-msgid "Log Out"

-msgstr "Atsijungti"

-

-msgid "Chatty"

-msgstr "Plepiai nusiteikęs"

-

-msgid "Extended Away"

-msgstr "Ilgam pasitraukęs"

-

-msgid "Do Not Disturb"

-msgstr "Netrukdyti"

-

-msgid "JID"

-msgstr "JID"

-

-msgid "Last Name"

-msgstr "Pavardė"

-

-msgid "The following are the results of your search"

-msgstr "Toliau yra Jūsų paieškos rezultatai"

-

-#. current comment from Jabber User Directory users.jabber.org

-msgid ""

-"Find a contact by entering the search criteria in the given fields. Note: "

-"Each field supports wild card searches (%)"

-msgstr ""

-"Ieškokite kontakto įvesdami paieškos požymius pateiktuose laukuose.  "

-"Pastaba: kiekvienas laukas palaiko pakaitos simbolius (%)"

-

-msgid "Directory Query Failed"

-msgstr "Katalogo užklausa nepavyko"

-

-msgid "Could not query the directory server."

-msgstr "Nepavyko užklausti katalogo serverio."

-

-#. Try to translate the message (see static message

-#. list in jabber_user_dir_comments[])

-#, c-format

-msgid "Server Instructions: %s"

-msgstr "Serverio instrukcijos: %s"

-

-msgid "Fill in one or more fields to search for any matching XMPP users."

-msgstr "Užpildykite vieną ar daugiau laukų XMPP vartotojų paieškai."

-

-msgid "Email Address"

-msgstr "El. pašto adresas"

-

-msgid "Search for XMPP users"

-msgstr "Ieškoti XMPP vartotojų"

-

-#. "Search"

-msgid "Search"

-msgstr "Ieškoti"

-

-msgid "Invalid Directory"

-msgstr "Neteisingas katalogas"

-

-msgid "Enter a User Directory"

-msgstr "Įveskite vartotojų katalogą"

-

-msgid "Select a user directory to search"

-msgstr "Pasirinkite vartotojų katalogą paieškai"

-

-msgid "Search Directory"

-msgstr "Paieškos katalogas"

-

-msgid "_Room:"

-msgstr "Kamba_rys:"

-

-msgid "_Server:"

-msgstr "_Serveris:"

-

-msgid "_Handle:"

-msgstr "Ra_nkenėlė:"

-

-#, c-format

-msgid "%s is not a valid room name"

-msgstr "%s yra neteisingas kambario pavadinimas"

-

-msgid "Invalid Room Name"

-msgstr "Neteisingas kambario pavadinimas"

-

-#, c-format

-msgid "%s is not a valid server name"

-msgstr "%s yra neteisingas serverio pavadinimas"

-

-msgid "Invalid Server Name"

-msgstr "Neteisingas serverio pavadinimas"

-

-#, c-format

-msgid "%s is not a valid room handle"

-msgstr "%s yra neteisinga kambario rankenėlė"

-

-msgid "Invalid Room Handle"

-msgstr "Neteisinga kambario rankenėlė"

-

-msgid "Configuration error"

-msgstr "Konfigūracijos klaida"

-

-msgid "Unable to configure"

-msgstr "Negalima konfigūruoti"

-

-msgid "Room Configuration Error"

-msgstr "Kambario konfigūracijos klaida"

-

-msgid "This room is not capable of being configured"

-msgstr "Šis kambarys neturi konfigūravimo galimybės"

-

-msgid "Registration error"

-msgstr "Registracijos klaida"

-

-msgid "Nick changing not supported in non-MUC chatrooms"

-msgstr "Ne MUC kambariuose vardo keitimas nėra palaikomas"

-

-msgid "Error retrieving room list"

-msgstr "Kambarių sąrašo gavimo klaida"

-

-msgid "Invalid Server"

-msgstr "Neteisingas serveris"

-

-msgid "Enter a Conference Server"

-msgstr "Įveskite konferencijų serverį"

-

-msgid "Select a conference server to query"

-msgstr "Pasirinkite konferencijų serverį užklausai"

-

-msgid "Find Rooms"

-msgstr "Rasti kambarius"

-

-msgid "You require encryption, but it is not available on this server."

-msgstr "Jūs reikalaujate šifravimo, bet jo šis serveris nesiūlo."

-

-msgid "Write error"

-msgstr "Rašymo klaida"

-

-msgid "Ping timeout"

-msgstr "Baigėsi skimbtelėjimo laukimo laikas"

-

-msgid "Read Error"

-msgstr "Skaitymo klaida"

-

-#, c-format

-msgid ""

-"Could not establish a connection with the server:\n"

-"%s"

-msgstr ""

-"Nepavyko prisijungti prie serverio:\n"

-"%s"

-

-msgid "Unable to create socket"

-msgstr "Negalima sukurti jungties"

-

-msgid "Invalid XMPP ID"

-msgstr "Neteisingas XMPP ID"

-

-msgid "Invalid XMPP ID. Domain must be set."

-msgstr "Neteisingas XMPP ID.  Sritis privalo būti nustatyta."

-

-#, c-format

-msgid "Registration of %s@%s successful"

-msgstr "%s@%s registracija sėkminga"

-

-#, c-format

-msgid "Registration to %s successful"

-msgstr "Registracija prie %s sėkminga"

-

-msgid "Registration Successful"

-msgstr "Sėkminga registracija"

-

-msgid "Registration Failed"

-msgstr "Registracija nepavyko"

-

-#, c-format

-msgid "Registration from %s successfully removed"

-msgstr "Sėkmingai išsiregistruota iš %s"

-

-msgid "Unregistration Successful"

-msgstr "Sėkmingas išsiregistravimas"

-

-msgid "Unregistration Failed"

-msgstr "Išsiregistravimas nepavyko"

-

-msgid "Already Registered"

-msgstr "Jau registruota"

-

-msgid "State"

-msgstr "Valstija"

-

-msgid "Postal code"

-msgstr "Pašto indeksas"

-

-msgid "Phone"

-msgstr "Telefonas"

-

-msgid "Date"

-msgstr "Data"

-

-msgid "Unregister"

-msgstr "Išsiregistruoti"

-

-msgid ""

-"Please fill out the information below to change your account registration."

-msgstr ""

-"Jūsų paskyros registracijos keitimui prašome įvesti informaciją žemiau."

-

-msgid "Please fill out the information below to register your new account."

-msgstr "Jūsų naujo abonento registravimui prašome įvesti informaciją žemiau."

-

-msgid "Register New XMPP Account"

-msgstr "Registruoti naują XMPP abonentą"

-

-msgid "Register"

-msgstr "Registruotis"

-

-#, c-format

-msgid "Change Account Registration at %s"

-msgstr "Pakeisti paskyros %s registraciją"

-

-#, c-format

-msgid "Register New Account at %s"

-msgstr "Registruoti naują paskyrą %s"

-

-msgid "Change Registration"

-msgstr "Pakeisti registraciją"

-

-msgid "Error unregistering account"

-msgstr "Paskyros išregistravimo klaida"

-

-msgid "Account successfully unregistered"

-msgstr "Paskyra sėkmingai išregistruota"

-

-msgid "Initializing Stream"

-msgstr "Inicializuojamas duomenų srautas"

-

-msgid "Initializing SSL/TLS"

-msgstr "Inicializuojama SSL/TLS"

-

-msgid "Authenticating"

-msgstr "Nustatoma tapatybė"

-

-msgid "Re-initializing Stream"

-msgstr "Iš naujo inicializuojamas duomenų srautas"

-

-msgid "Server doesn't support blocking"

-msgstr "Serveris nepalaiko blokavimo"

-

-msgid "Not Authorized"

-msgstr "Prieiga nesuteikta"

-

-msgid "Both"

-msgstr "abipusė"

-

-msgid "From (To pending)"

-msgstr "patvirtinta Jūsų, laukiama bičiulio patvirtinimo"

-

-msgid "From"

-msgstr "Iš"

-

-msgid "To"

-msgstr "bičiulio patvirtinta"

-

-msgid "None (To pending)"

-msgstr "Jokia (laukiama patvirtinimo iš bičiulio)"

-

-msgid "None"

-msgstr "niekaip"

-

-msgid "Subscription"

-msgstr "Registracija"

-

-msgid "Mood"

-msgstr "Nuotaika"

-

-msgid "Now Listening"

-msgstr "Dabar klausosi"

-

-msgid "Mood Text"

-msgstr "Nuotaikos tekstas"

-

-msgid "Allow Buzz"

-msgstr "Leisti zyzimus"

-

-msgid "Tune Artist"

-msgstr "Dainos atlikėjas"

-

-msgid "Tune Title"

-msgstr "Dainos pavadinimas"

-

-msgid "Tune Album"

-msgstr "Dainos albumas"

-

-msgid "Tune Genre"

-msgstr "Dainos žanras"

-

-msgid "Tune Comment"

-msgstr "Dainos komentaras"

-

-msgid "Tune Track"

-msgstr "Dainos takelis"

-

-msgid "Tune Time"

-msgstr "Dainos laikas"

-

-msgid "Tune Year"

-msgstr "Dainos metai"

-

-msgid "Tune URL"

-msgstr "Dainos URL"

-

-msgid "Password Changed"

-msgstr "Slaptažodis pakeistas"

-

-msgid "Your password has been changed."

-msgstr "Jūsų slaptažodis pakeistas."

-

-msgid "Error changing password"

-msgstr "Slaptažodžio keitimo klaida"

-

-msgid "Password (again)"

-msgstr "Pakartotas slaptažodis"

-

-msgid "Change XMPP Password"

-msgstr "Pakeiskite XMPP slaptažodį"

-

-msgid "Please enter your new password"

-msgstr "Prašome įvesti Jūsų naują slaptažodį"

-

-msgid "Set User Info..."

-msgstr "Nustatyti vartotojo informaciją..."

-

-#. if (js->protocol_options & CHANGE_PASSWORD) {

-msgid "Change Password..."

-msgstr "Pakeisti slaptažodį..."

-

-#. }

-msgid "Search for Users..."

-msgstr "Ieškoti vartotojų..."

-

-msgid "Bad Request"

-msgstr "Bloga užklausa"

-

-msgid "Conflict"

-msgstr "Konfliktas"

-

-msgid "Feature Not Implemented"

-msgstr "Funkcija neįgyvendinta"

-

-msgid "Forbidden"

-msgstr "Uždrausta"

-

-msgid "Gone"

-msgstr "Dingo"

-

-msgid "Internal Server Error"

-msgstr "Vidinė serverio klaida"

-

-msgid "Item Not Found"

-msgstr "Nerastas elementas"

-

-msgid "Malformed XMPP ID"

-msgstr "Neteisingai suformuotas XMPP ID"

-

-msgid "Not Acceptable"

-msgstr "Nepriimtina"

-

-msgid "Not Allowed"

-msgstr "Neleistina"

-

-msgid "Payment Required"

-msgstr "Reikalingas apmokėjimas"

-

-msgid "Recipient Unavailable"

-msgstr "Gavėjas neprieinamas"

-

-msgid "Registration Required"

-msgstr "Rekalinga registracija"

-

-msgid "Remote Server Not Found"

-msgstr "Nuotolinis serveris nerastas"

-

-msgid "Remote Server Timeout"

-msgstr "Nuotolinio serverio laukimo laikas baigėsi"

-

-msgid "Server Overloaded"

-msgstr "Serveris perkrautas"

-

-msgid "Service Unavailable"

-msgstr "Paslauga neteikiama"

-

-msgid "Subscription Required"

-msgstr "Reikalinga registracija"

-

-msgid "Unexpected Request"

-msgstr "Nelaukta užklausa"

-

-msgid "Authorization Aborted"

-msgstr "Prieigos suteikimas nutrauktas"

-

-msgid "Incorrect encoding in authorization"

-msgstr "Neteisinga koduotė prieigos suteikime"

-

-msgid "Invalid authzid"

-msgstr "Neteisingas prieigos suteikimo identifikatorius"

-

-msgid "Invalid Authorization Mechanism"

-msgstr "Neteisingas prieigos suteikimo mechanizmas"

-

-msgid "Authorization mechanism too weak"

-msgstr "Prieigos suteikimo mechanizmas per silpnas"

-

-msgid "Temporary Authentication Failure"

-msgstr "Laikina prieigos suteikimo nesekmė"

-

-msgid "Authentication Failure"

-msgstr "Prieigos suteikimo nesekmė"

-

-msgid "Bad Format"

-msgstr "Blogas formatas"

-

-msgid "Bad Namespace Prefix"

-msgstr "Blogas vardų erdvės priešdėlis"

-

-msgid "Resource Conflict"

-msgstr "Išteklių konfliktas"

-

-msgid "Connection Timeout"

-msgstr "Jungties laukimo laikas baigėsi"

-

-msgid "Host Gone"

-msgstr "Dingo mazgas"

-

-msgid "Host Unknown"

-msgstr "Nežinomas mazgas"

-

-msgid "Improper Addressing"

-msgstr "Neteisingas adresavimas"

-

-msgid "Invalid ID"

-msgstr "Neteisingas ID"

-

-msgid "Invalid Namespace"

-msgstr "Neteisinga vardų erdvė"

-

-msgid "Invalid XML"

-msgstr "Neteisingas XML"

-

-msgid "Non-matching Hosts"

-msgstr "Neatitinkantys mazgai"

-

-msgid "Policy Violation"

-msgstr "Taisyklių pažeidimas"

-

-msgid "Remote Connection Failed"

-msgstr "Nuotolinė jungtis nepavyko"

-

-msgid "Resource Constraint"

-msgstr "Išteklių apribojimas"

-

-msgid "Restricted XML"

-msgstr "Apribotas XML"

-

-msgid "See Other Host"

-msgstr "Aplankykite kitą mazgą"

-

-msgid "System Shutdown"

-msgstr "Sistemos sustabdymas"

-

-msgid "Undefined Condition"

-msgstr "Neapibrėžta salyga"

-

-msgid "Unsupported Encoding"

-msgstr "Nepalaikoma koduotė"

-

-msgid "Unsupported Stanza Type"

-msgstr "Nepalaikomas strofos tipas"

-

-msgid "Unsupported Version"

-msgstr "Nepalaikoma versija"

-

-msgid "XML Not Well Formed"

-msgstr "Neteisingai suformuotas XML"

-

-msgid "Stream Error"

-msgstr "Duomenų srauto klaida"

-

-#, c-format

-msgid "Unable to ban user %s"

-msgstr "Negalima uždrausti vartotojui %s prisijungti prie kanalo"

-

-#, c-format

-msgid "Unknown affiliation: \"%s\""

-msgstr "Nežinomas statusas: „%s“"

-

-#, c-format

-msgid "Unable to affiliate user %s as \"%s\""

-msgstr "Vartotojui %s negalima priskirti statuso „%s“"

-

-#, c-format

-msgid "Unknown role: \"%s\""

-msgstr "Nežinomas vaidmuo: „%s“"

-

-#  Data is assumed to be the destination sn

-#, c-format

-msgid "Unable to set role \"%s\" for user: %s"

-msgstr "Nepavyko nustatyti vaidmens „%s“ vartotojui: %s"

-

-#, c-format

-msgid "Unable to kick user %s"

-msgstr "Negalima išspirti vartotojo %s"

-

-#, c-format

-msgid "Unable to ping user %s"

-msgstr "Nepavyko skimbtelėti naudotojui %s"

-

-#, c-format

-msgid "Unable to buzz, because there is nothing known about user %s."

-msgstr "Negalima pazyzti, nes nieko nežinoma apie naudotoją %s."

-

-#, c-format

-msgid "Unable to buzz, because user %s might be offline."

-msgstr "Negalima pazyzti, nes naudotojas %s gali būti neprisijungęs."

-

-#, c-format

-msgid "Unable to buzz, because the user %s does not support it."

-msgstr "Nepavyko pazyzti, nes naudotojas %s to nepalaiko."

-

-#. Yahoo only supports one attention command: the 'buzz'.

-#. This is index number YAHOO_BUZZ.

-msgid "Buzz"

-msgstr "Zvimbt"

-

-#, c-format

-msgid "%s has buzzed you!"

-msgstr "%s jums pazyzė!"

-

-#, c-format

-msgid "Buzzing %s..."

-msgstr "Zyziama %s..."

-

-msgid "config:  Configure a chat room."

-msgstr "config:  konfigūruoti pokalbių kambarį."

-

-msgid "configure:  Configure a chat room."

-msgstr "configure:  konfigūruoti pokalbių kambarį."

-

-msgid "part [room]:  Leave the room."

-msgstr "part [kambarys]:  palikti kambarį."

-

-msgid "register:  Register with a chat room."

-msgstr "register:  prisiregistruoti pokalbių kambaryje."

-

-msgid "topic [new topic]:  View or change the topic."

-msgstr "topic [nauja tema]:  žiūrėti arba pakeisti temą."

-

-msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."

-msgstr ""

-"ban &lt;vartotojas&gt; [priežastis]:  uždrausti vartotojui ateiti į kambarį."

-

-msgid ""

-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "

-"affiliation with the room."

-msgstr ""

-"affilliate &lt;vartotojas;&gt; &lt;owner|admin|member|outcast|none&gt;:  "

-"nustatyti vartotojo statusą kambaryje."

-

-msgid ""

-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "

-"role in the room."

-msgstr ""

-"role &lt;vartotojas&gt; &lt;moderator|participant|visitor|none&gt;: "

-"nustatyti vartotojo vaidmenį kambaryje."

-

-msgid "invite &lt;user&gt; [message]:  Invite a user to the room."

-msgstr "invite &lt;vartotojas&gt; [žinutė]:  pakviesti vartotoją į kambarį."

-

-msgid "join: &lt;room&gt; [password]:  Join a chat on this server."

-msgstr ""

-"join: &lt;kambarys&gt; [slaptažodis]:  prisijungti prie pokalbių kambario "

-"šiame serveryje."

-

-msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."

-msgstr "kick &lt;vartotojas&gt; [priežastis]:  išspirti vartotoją iš kambario."

-

-msgid ""

-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."

-msgstr ""

-"msg &lt;vartotojas&gt; &lt;žinutė&gt;:  nusiųsti asmeninę žinutę kitam "

-"vartotojui."

-

-msgid "ping &lt;jid&gt;:\tPing a user/component/server."

-msgstr ""

-"ping &lt;jid&gt;:       pasignalizuoti naudotojui, komponentui arba "

-"serveriui."

-

-msgid "buzz: Buzz a user to get their attention"

-msgstr "buzz:  pazyzti kontaktui, kad atkreipti jo dėmesį"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "XMPP Protocol Plugin"

-msgstr "XMPP protokolo papildinys"

-

-#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im

-msgid "Domain"

-msgstr "Sritis"

-

-msgid "Require SSL/TLS"

-msgstr "Reikalauti SSL/TLS"

-

-msgid "Force old (port 5223) SSL"

-msgstr "Priverstinai naudoti seną 5223 prievado SSL"

-

-msgid "Allow plaintext auth over unencrypted streams"

-msgstr "Leisti tapatybės nustatymą grynu tekstu nekoduojamame duomenų sraute"

-

-msgid "Connect port"

-msgstr "Jungties prievadas"

-

-#. TODO: default to automatically try different ports. Make the user be

-#. * able to set the first port to try (like LastConnectedPort in Windows client).

-#. Account options

-msgid "Connect server"

-msgstr "Prisijungimo serveris"

-

-msgid "File transfer proxies"

-msgstr "Failų perdavimo tarpininkaujantys serveriai"

-

-#. this should probably be part of global smiley theme settings later on,

-#. shared with MSN

-msgid "Show Custom Smileys"

-msgstr "Rodyti nestandartines šypsenėles"

-

-#, c-format

-msgid "%s has left the conversation."

-msgstr "%s paliko pokalbį."

-

-#, c-format

-msgid "Message from %s"

-msgstr "Žinutė nuo %s"

-

-#, c-format

-msgid "%s has set the topic to: %s"

-msgstr "%s pakeitė temą į: %s"

-

-#, c-format

-msgid "The topic is: %s"

-msgstr "Tema: %s"

-

-#, c-format

-msgid "Message delivery to %s failed: %s"

-msgstr "Žinutės pristatymas gavėjui %s nepavyko: %s"

-

-msgid "XMPP Message Error"

-msgstr "XMPP pranešimo klaida"

-

-#, c-format

-msgid "(Code %s)"

-msgstr "(Kodas %s)"

-

-msgid "XML Parse error"

-msgstr "XML sintaksinės analizės klaida"

-

-msgid "Unknown Error in presence"

-msgstr "Nežinoma būsenos klaida"

-

-msgid "Create New Room"

-msgstr "Sukurti naują kambarį"

-

-msgid ""

-"You are creating a new room.  Would you like to configure it, or accept the "

-"default settings?"

-msgstr ""

-"Jūs kuriate naują kambarį.  Ar norėtumėte jį sukonfigūruoti, ar priimti "

-"numatytąsias nuostatas?"

-

-msgid "_Configure Room"

-msgstr "_Konfigūruoti kambarį"

-

-msgid "_Accept Defaults"

-msgstr "_Priimti numatytąsias nuostatas"

-

-#, c-format

-msgid "Error joining chat %s"

-msgstr "Prisijungimo prie pokalbio %s klaida"

-

-#, c-format

-msgid "Error in chat %s"

-msgstr "Klaida pokalbyje %s"

-

-#, c-format

-msgid "Unable to send file to %s, user does not support file transfers"

-msgstr ""

-"Negalima siųsti failo vartotojui %s, nes jo kliento programa nepalaiko failų "

-"perdavimo"

-

-msgid "File Send Failed"

-msgstr "Failo siuntimas nepavyko"

-

-#, c-format

-msgid "Unable to send file to %s, invalid JID"

-msgstr "Negalima nusiųsti failo vartotojui %s, nes neteisingas JID"

-

-#, c-format

-msgid "Unable to send file to %s, user is not online"

-msgstr "Negalima nusiųsti failo vartotojui %s, nes jis neprisijungęs"

-

-#, c-format

-msgid "Unable to send file to %s, not subscribed to user presence"

-msgstr ""

-"Negalima siųsti failo vartotojui %s, nes jis neįtrauktas į bičiulių sąrašą"

-

-#, c-format

-msgid "Please select the resource of %s to which you would like to send a file"

-msgstr "Parinkite %s išteklių, į kurį norite nusiųsti failą"

-

-msgid "Select a Resource"

-msgstr "Parinkite išteklių"

-

-msgid "Edit User Mood"

-msgstr "Nustatyti vartotojo nuotaiką"

-

-msgid "Please select your mood from the list."

-msgstr "Pasirinkite savo nuotaiką iš sąrašo."

-

-msgid "Set"

-msgstr "Nustatyti"

-

-msgid "Set Mood..."

-msgstr "Nustatyti nuotaiką..."

-

-msgid "Set User Nickname"

-msgstr "Nustatyti naudotojo vardą"

-

-msgid "Please specify a new nickname for you."

-msgstr "Prašau įvesti naują savo vardą."

-

-msgid ""

-"This information is visible to all contacts on your contact list, so choose "

-"something appropriate."

-msgstr ""

-"Ši informacija matoma visiems naudotojams jūsų kontaktų sąraše, todėl "

-"pasirinkite ką nors tinkamo."

-

-msgid "Set Nickname..."

-msgstr "Nustatyti vardą..."

-

-msgid "Actions"

-msgstr "Veiksmai"

-

-msgid "Select an action"

-msgstr "Pasirinkite veiksmą"

-

-#. only notify the user about problems adding to the friends list

-#. * maybe we should do something else for other lists, but it probably

-#. * won't cause too many problems if we just ignore it

-#, c-format

-msgid "Unable to add \"%s\"."

-msgstr "Negalima pridėti \"%s\"."

-

-msgid "Buddy Add error"

-msgstr "Bičiulio pridėjimo klaida"

-

-msgid "The username specified does not exist."

-msgstr "Nurodyto naudotojo vardo nėra."

-

-#, c-format

-msgid "Buddy list synchronization issue in %s (%s)"

-msgstr "Bičiulių sąrašo suvienodinimo klaida vartotojui %s (%s)"

-

-#, c-format

-msgid ""

-"%s on the local list is inside the group \"%s\" but not on the server list. "

-"Do you want this buddy to be added?"

-msgstr ""

-"Vietiniame sąraše bičiulis %s yra \"%s\" grupėje, bet serverio sąraše jo "

-"nėra. Ar norite įtraukti šį bičiulį į serverio sąrašą?"

-

-#, c-format

-msgid ""

-"%s is on the local list but not on the server list. Do you want this buddy "

-"to be added?"

-msgstr ""

-"Bičiulis %s yra vietiniame sąraše, tačiau jo nėra serverio sąraše.  Ar "

-"norite įtraukti šį bičiulį į serverio sąrašą?"

-

-#, c-format

-msgid "Unable to parse message"

-msgstr "Negalima išanalizuoti pranešimo"

-

-#, c-format

-msgid "Syntax Error (probably a client bug)"

-msgstr "Sintaksės klaida (greičiausiai Pidgin riktas)"

-

-#, c-format

-msgid "Invalid email address"

-msgstr "Neteisingas el. pašto adresas"

-

-#, c-format

-msgid "User does not exist"

-msgstr "Vartotojas neegzistuoja"

-

-#, c-format

-msgid "Fully qualified domain name missing"

-msgstr "Trūksta viso srities vardo"

-

-#, c-format

-msgid "Already logged in"

-msgstr "Jau prisijungęs"

-

-#, c-format

-msgid "Invalid username"

-msgstr "Neteisingas vardas"

-

-#, c-format

-msgid "Invalid friendly name"

-msgstr "Neteisingas patogusis vardas"

-

-#, c-format

-msgid "List full"

-msgstr "Sąrašas pilnas"

-

-#, c-format

-msgid "Already there"

-msgstr "Jau yra ten"

-

-#, c-format

-msgid "Not on list"

-msgstr "Sąraše nėra"

-

-#, c-format

-msgid "User is offline"

-msgstr "Vartotojas atsijungęs"

-

-#, c-format

-msgid "Already in the mode"

-msgstr "Jau yra būsenoje"

-

-#, c-format

-msgid "Already in opposite list"

-msgstr "Jau yra priešingame sąraše"

-

-#, c-format

-msgid "Too many groups"

-msgstr "Per daug grupių"

-

-#, c-format

-msgid "Invalid group"

-msgstr "Neteisinga grupė"

-

-#, c-format

-msgid "User not in group"

-msgstr "Vartotojo nėra grupėje"

-

-#, c-format

-msgid "Group name too long"

-msgstr "Grupės pavadinimas per ilgas"

-

-#, c-format

-msgid "Cannot remove group zero"

-msgstr "Negalima pašalinti nulinės grupės"

-

-#, c-format

-msgid "Tried to add a user to a group that doesn't exist"

-msgstr "Bandyta įtraukti vartotoją į neegzistuojančią grupę"

-

-#, c-format

-msgid "Switchboard failed"

-msgstr "Komutatoriaus klaida"

-

-#, c-format

-msgid "Notify transfer failed"

-msgstr "Nepavyko perduoti informavimo"

-

-#, c-format

-msgid "Required fields missing"

-msgstr "Trūksta reikalingų laukų"

-

-#, c-format

-msgid "Too many hits to a FND"

-msgstr "Per daug pataikymų į FND"

-

-#, c-format

-msgid "Not logged in"

-msgstr "Neprisijungęs"

-

-#, c-format

-msgid "Service temporarily unavailable"

-msgstr "Tarnyba laikinai neprieinama"

-

-#, c-format

-msgid "Database server error"

-msgstr "Duomenų bazės serverio klaida"

-

-#, c-format

-msgid "Command disabled"

-msgstr "Komanda išjungta"

-

-#, c-format

-msgid "File operation error"

-msgstr "Failo operacijos klaida"

-

-#, c-format

-msgid "Memory allocation error"

-msgstr "Atminties paskyrimo klaida"

-

-#, c-format

-msgid "Wrong CHL value sent to server"

-msgstr "Serveriui nusiųsta bloga CHL reikšmė"

-

-#, c-format

-msgid "Server busy"

-msgstr "Serveris užimtas"

-

-#, c-format

-msgid "Server unavailable"

-msgstr "Serveris neprieinamas"

-

-# Kaip išversti „peer“?

-#, c-format

-msgid "Peer notification server down"

-msgstr "Kitų vartotojų informavimo serveris neprieinamas"

-

-#, c-format

-msgid "Database connect error"

-msgstr "Prisijungimo prie duomenų bazės klaida"

-

-#, c-format

-msgid "Server is going down (abandon ship)"

-msgstr "Serveris išjungiamas (palikite laivą)"

-

-#, c-format

-msgid "Error creating connection"

-msgstr "Jungties kūrimo klaida"

-

-#, c-format

-msgid "CVR parameters are either unknown or not allowed"

-msgstr "CVR parametrai yra nežinomi arba neleistini"

-

-#, c-format

-msgid "Unable to write"

-msgstr "Negalima rašyti"

-

-#, c-format

-msgid "Session overload"

-msgstr "Seanso perkrova"

-

-#, c-format

-msgid "User is too active"

-msgstr "Vartotojas yra per daug aktyvus"

-

-#, c-format

-msgid "Too many sessions"

-msgstr "Per daug seansų"

-

-#, c-format

-msgid "Passport not verified"

-msgstr "Microsoft .NET pasas nepatikrintas"

-

-#, c-format

-msgid "Bad friend file"

-msgstr "Blogas draugų failas"

-

-#, c-format

-msgid "Not expected"

-msgstr "Netikėta"

-

-#, c-format

-msgid "Friendly name changes too rapidly"

-msgstr "Patogusis vardas keičiasi per dažnai"

-

-#, c-format

-msgid "Server too busy"

-msgstr "Serveris per daug užimtas"

-

-#, c-format

-msgid "Authentication failed"

-msgstr "Nepavyko nustatyti tapatybę"

-

-#, c-format

-msgid "Not allowed when offline"

-msgstr "Atsijungus neleidžiama"

-

-#, c-format

-msgid "Not accepting new users"

-msgstr "Nauji vartotojai nepriimami"

-

-#, c-format

-msgid "Kids Passport without parental consent"

-msgstr "Vaikiškas Microsoft .NET pasas be tėvų sutikimo"

-

-#, c-format

-msgid "Passport account not yet verified"

-msgstr "Microsoft .NET paso paskyra dar nepatikrinta"

-

-msgid "Passport account suspended"

-msgstr "Microsoft .NET paso paskyra suspenduota"

-

-#, c-format

-msgid "Bad ticket"

-msgstr "Blogas bilietas"

-

-#, c-format

-msgid "Unknown Error Code %d"

-msgstr "Nežinomas klaidos kodas %d"

-

-#, c-format

-msgid "MSN Error: %s\n"

-msgstr "MSN klaida: %s\n"

-

-msgid "Other Contacts"

-msgstr "Kiti kontaktai"

-

-msgid "Non-IM Contacts"

-msgstr "Kontaktai ne iš greitųjų žinučių tinklų"

-

-msgid "Nudge"

-msgstr "Bakstelėjimas"

-

-#, c-format

-msgid "%s has nudged you!"

-msgstr "%s bakstelėjo jums!"

-

-#, c-format

-msgid "Nudging %s..."

-msgstr "Bakstelėju %s..."

-

-msgid "Email Address..."

-msgstr "El. pašto adresas..."

-

-msgid "Your new MSN friendly name is too long."

-msgstr "Jūsų naujas patogusis MSN vardas yra per ilgas"

-

-msgid "Set your friendly name."

-msgstr "Nustatyti Jūsų patogųjį vardą."

-

-msgid "This is the name that other MSN buddies will see you as."

-msgstr "Tai yra vardas, kuriuo Jus matys kiti MSN bičiuliai."

-

-msgid "Set your home phone number."

-msgstr "Nustatyti Jūsų namų telefono numerį."

-

-msgid "Set your work phone number."

-msgstr "Nustatyti Jūsų darbo telefono numerį."

-

-msgid "Set your mobile phone number."

-msgstr "Nustatyti Jūsų mobilaus telefono numerį."

-

-msgid "Allow MSN Mobile pages?"

-msgstr "Ar leisti mobiliąsias MSN žinutes?"

-

-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 ""

-"Ar Jūs norite leisti ar neleisti asmenims Jūsų bičiulių sąraše siųsti Jums "

-"mobiliąsias MSN žinutes į Jūsų mobilųjį telefoną ar kitą mobilųjį įrenginį?"

-

-msgid "Allow"

-msgstr "Leisti"

-

-msgid "Disallow"

-msgstr "Neleisti"

-

-#, c-format

-msgid "Blocked Text for %s"

-msgstr "Blokuotas tekstas iš %s"

-

-msgid "No text is blocked for this account."

-msgstr "Šiai paskyrai blokuoto teksto nėra."

-

-#, c-format

-msgid ""

-"MSN servers are currently blocking the following regular expressions:<br/>%s"

-msgstr ""

-"MSN serveriai šiuo metu blokuojas šias reguliariuosius reiškinius:<br/>%s"

-

-msgid "This account does not have email enabled."

-msgstr "Ši paskyra neturi aktyvaus el. pašto adreso."

-

-msgid "Send a mobile message."

-msgstr "Nusiųsti mobiliąją žinutę"

-

-msgid "Page"

-msgstr "Siųsti"

-

-msgid "Playing a game"

-msgstr "Žaidžia žaidimą"

-

-msgid "Working"

-msgstr "Dirba"

-

-msgid "Has you"

-msgstr "Turi Jus"

-

-msgid "Home Phone Number"

-msgstr "Namų telefono numeris"

-

-msgid "Work Phone Number"

-msgstr "Darbo telefono numeris"

-

-msgid "Mobile Phone Number"

-msgstr "Mobilaus telefono numeris"

-

-msgid "Be Right Back"

-msgstr "tuoj pat grįš"

-

-msgid "Busy"

-msgstr "užimtas"

-

-msgid "On the Phone"

-msgstr "kalba telefonu"

-

-msgid "Out to Lunch"

-msgstr "išėjęs papietauti"

-

-#. primitive

-#. ID

-#. name - use default

-#. saveable

-#. should be user_settable some day

-#. independent

-msgid "Artist"

-msgstr "Dailininkas"

-

-msgid "Album"

-msgstr "Albumas"

-

-msgid "Game Title"

-msgstr "Žaidimo pavadinimas"

-

-msgid "Office Title"

-msgstr "Ofiso pavadinimas"

-

-msgid "Set Friendly Name..."

-msgstr "Nustatyti patogųjį vardą..."

-

-msgid "Set Home Phone Number..."

-msgstr "Nustatyti namų telefono numerį..."

-

-msgid "Set Work Phone Number..."

-msgstr "Nustatyti darbo telefono numerį..."

-

-msgid "Set Mobile Phone Number..."

-msgstr "Nustatyti mobilaus telefono numerį..."

-

-msgid "Enable/Disable Mobile Devices..."

-msgstr "Leisti arba neleisti mobiliuosius įrenginius..."

-

-msgid "Allow/Disallow Mobile Pages..."

-msgstr "Leisti arba neleisti mobiliąsias žinutes..."

-

-msgid "View Blocked Text..."

-msgstr "Žiūrėti užblokuotą tekstą..."

-

-msgid "Open Hotmail Inbox"

-msgstr "Atidaryti Hotmail pašto dėžutę"

-

-msgid "Send to Mobile"

-msgstr "Siųsti į mobilų įrenginį"

-

-msgid "Initiate _Chat"

-msgstr "_Pradėti pokalbį"

-

-msgid "SSL support is needed for MSN. Please install a supported SSL library."

-msgstr ""

-"MSN protokolui SSL palaikymas yra būtinas.  Prašome įdiegti palaikomą SSL "

-"biblioteką."

-

-msgid "Failed to connect to server."

-msgstr "Nepavyko prisijungti prie serverio."

-

-msgid "Error retrieving profile"

-msgstr "Profilio gavimo klaida"

-

-msgid "General"

-msgstr "Bendros parinktys"

-

-msgid "Age"

-msgstr "Amžius"

-

-msgid "Occupation"

-msgstr "Profesija"

-

-msgid "Location"

-msgstr "Vietovė"

-

-msgid "Hobbies and Interests"

-msgstr "Hobi ir interesai"

-

-msgid "A Little About Me"

-msgstr "Truputį apie mane"

-

-msgid "Social"

-msgstr "Draugijai"

-

-msgid "Marital Status"

-msgstr "Šeimyninė padėtis"

-

-msgid "Interests"

-msgstr "Pomėgiai"

-

-msgid "Pets"

-msgstr "Naminiai gyvūnai"

-

-msgid "Hometown"

-msgstr "Gimtasis miestas"

-

-msgid "Places Lived"

-msgstr "Kur gyveno"

-

-msgid "Fashion"

-msgstr "Mada"

-

-msgid "Humor"

-msgstr "Humoras"

-

-msgid "Music"

-msgstr "Muzika"

-

-msgid "Favorite Quote"

-msgstr "Mėgstamiausia citata"

-

-msgid "Contact Info"

-msgstr "Kontaktinė informacija"

-

-msgid "Personal"

-msgstr "Asmeninė"

-

-msgid "Significant Other"

-msgstr "Antra pusė"

-

-msgid "Home Phone"

-msgstr "Namų telefonas"

-

-msgid "Home Phone 2"

-msgstr "Antras namų telefonas"

-

-msgid "Home Address"

-msgstr "Namų adresas"

-

-# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???

-msgid "Personal Mobile"

-msgstr "Asmeninis mobilusis telefonas"

-

-msgid "Home Fax"

-msgstr "Namų faksas"

-

-# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???

-msgid "Personal Email"

-msgstr "Asmeninis el. pašto adresas"

-

-# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???

-msgid "Personal IM"

-msgstr "Asmeninis skubiųjų žinučių kontaktas"

-

-msgid "Anniversary"

-msgstr "Sukaktis"

-

-#. Business

-msgid "Work"

-msgstr "Darbas"

-

-msgid "Job Title"

-msgstr "Pareigos"

-

-msgid "Company"

-msgstr "Kompanija"

-

-msgid "Department"

-msgstr "Skyrius"

-

-msgid "Profession"

-msgstr "Profesija"

-

-msgid "Work Phone"

-msgstr "Darbo telefonas"

-

-msgid "Work Phone 2"

-msgstr "Antras darbo telefonas"

-

-msgid "Work Address"

-msgstr "Darbo adresas"

-

-msgid "Work Mobile"

-msgstr "Darbo mobilusis telefonas"

-

-msgid "Work Pager"

-msgstr "Darbo pranešimų gaviklis"

-

-msgid "Work Fax"

-msgstr "Darbo faksas"

-

-msgid "Work Email"

-msgstr "Darbo el. pašto adresas"

-

-msgid "Work IM"

-msgstr "Darbo skubiųjų žinučių kontaktas"

-

-msgid "Start Date"

-msgstr "Pradžios data"

-

-msgid "Favorite Things"

-msgstr "Mėgstu"

-

-msgid "Last Updated"

-msgstr "Paskutinį kartą atnaujinta"

-

-msgid "Homepage"

-msgstr "Namų puslapis"

-

-msgid "The user has not created a public profile."

-msgstr "Šis vartotojas nesukūrė viešo profilio."

-

-msgid ""

-"MSN reported not being able to find the user's profile. This either means "

-"that the user does not exist, or that the user exists but has not created a "

-"public profile."

-msgstr ""

-"MSN nerado vartotojo profilio. Tai reiškia, kad arba tokio vartotojo nėra, "

-"arba kad vartotojas yra, bet neturi sukūręs viešo profilio."

-

-msgid ""

-"Could not find any information in the user's profile. The user most likely "

-"does not exist."

-msgstr ""

-"Nepavyko rasti jokios informacijos vartotojo profilyje. Greičiausiai toks "

-"vartotojas neegzistuoja."

-

-msgid "View web profile"

-msgstr "Žiūrėti profilį žiniatinklyje"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *< summary

-msgid "Windows Live Messenger Protocol Plugin"

-msgstr "Windows Live Messenger protokolo papildinys"

-

-msgid "Use HTTP Method"

-msgstr "Naudoti HTTP metodą"

-

-msgid "HTTP Method Server"

-msgstr "HTTP metodo serveris"

-

-msgid "Show custom smileys"

-msgstr "Rodyti nestandartines šypsenėles"

-

-msgid "nudge: nudge a user to get their attention"

-msgstr "nudge: bakstelėti vartotojui, kad atkreipti jo dėmesį"

-

-msgid "Windows Live ID authentication:Unable to connect"

-msgstr "Nepavyko prisijungti prie Windows Live ID tapatybės nustatymo serverio"

-

-msgid "Windows Live ID authentication:Invalid response"

-msgstr "Windows Live ID tapatybės nustatymas: neteisingas atsakas"

-

-#, c-format

-msgid "%s is not a valid group."

-msgstr "%s nėra teisinga grupė"

-

-msgid "Unknown error."

-msgstr "Nežinoma klaida."

-

-#, c-format

-msgid "%s on %s (%s)"

-msgstr "%s. Vartotojas %s (%s)."

-

-#, c-format

-msgid "%s just sent you a Nudge!"

-msgstr "%s nori bakstelėjo Jums!"

-

-#. char *adl = g_strndup(payload, len);

-#, c-format

-msgid "Unknown error (%d)"

-msgstr "Nežinoma klaida (%d)"

-

-msgid "Unable to add user"

-msgstr "Nepavyko pridėti vartotojo"

-

-msgid "The following users are missing from your addressbook"

-msgstr "Tolesnių vartotojų nėra Jūsų adresų knygoje"

-

-#, c-format

-msgid "Unable to add user on %s (%s)"

-msgstr "Negalima pridėti vartotojo paskyroje %s (%s)"

-

-#  Data is assumed to be the destination sn

-#, c-format

-msgid "Unable to block user on %s (%s)"

-msgstr "Negalima blokuoti vartotojo paskyroje %s (%s)"

-

-#, c-format

-msgid "Unable to permit user on %s (%s)"

-msgstr "Negalima leisti vartotojo paskyroje %s (%s)"

-

-#, c-format

-msgid "%s could not be added because your buddy list is full."

-msgstr "Negalima pridėti %s, nes Jūsų bičiulių sąrašas pilnas."

-

-#, c-format

-msgid "%s is not a valid passport account."

-msgstr "%s nėra teisinga Microsoft .NET paso paskyra"

-

-msgid "Service Temporarily Unavailable."

-msgstr "Tarnyba laikinai neprieinama"

-

-msgid "Mobile message was not sent because it was too long."

-msgstr "Mobilioji žinutė nebuvo išsiųsta, nes ji per ilga."

-

-msgid "Unable to rename group"

-msgstr "Negalima pervadinti grupės"

-

-msgid "Unable to delete group"

-msgstr "Negalima pašalinti grupės"

-

-#, c-format

-msgid ""

-"The MSN server will shut down for maintenance in %d minute. You will "

-"automatically be signed out at that time.  Please finish any conversations "

-"in progress.\n"

-"\n"

-"After the maintenance has been completed, you will be able to successfully "

-"sign in."

-msgid_plural ""

-"The MSN server will shut down for maintenance in %d minutes. You will "

-"automatically be signed out at that time.  Please finish any conversations "

-"in progress.\n"

-"\n"

-"After the maintenance has been completed, you will be able to successfully "

-"sign in."

-msgstr[0] ""

-"MSN serveris bus išjungtas priežiūrai už %d minutės.  Tada Jūs būsite "

-"automatiškai atjungtas.  Prašome pabaigti visus vykstančius pokalbius.\n"

-"\n"

-"Kai serverio priežiūra bus baigta, Jūs galėsite sėkmingai prisijungti."

-msgstr[1] ""

-"MSN serveris bus išjungtas priežiūrai už %d minučių.  Tada Jūs būsite "

-"automatiškai atjungtas.  Prašome pabaigti visus vykstančius pokalbius.\n"

-"\n"

-"Kai serverio priežiūra bus baigta, Jūs galėsite sėkmingai prisijungti."

-msgstr[2] ""

-"MSN serveris bus išjungtas priežiūrai už %d minučių.  Tada Jūs būsite "

-"automatiškai atjungtas.  Prašome pabaigti visus vykstančius pokalbius.\n"

-"\n"

-"Kai serverio priežiūra bus baigta, Jūs galėsite sėkmingai prisijungti."

-

-msgid ""

-"Message was not sent because the system is unavailable. This normally "

-"happens when the user is blocked or does not exist."

-msgstr ""

-"Žinutė nebuvo nusiųsta, nes sistema neprieinama.  Paprastai taip atsitinka, "

-"kai naudotojas yra užblokuotas arba iš viso neegzistuoja."

-

-msgid "Message was not sent because messages are being sent too quickly."

-msgstr "Žinutė nebuvo išsiųsta nes žinutės yra išsiuntinėjamos per greitai."

-

-msgid "Message was not sent because an unknown encoding error occurred."

-msgstr "Žinutė nebuvo išsiųsta, nes įvyko nežinoma užkodavimo klaida."

-

-msgid "Message was not sent because an unknown error occurred."

-msgstr "Žinutė nebuvo išsiųsta, nes įvyko nežinoma klaida."

-

-msgid "Unable to connect"

-msgstr "Negalima prisijungti"

-

-msgid "Writing error"

-msgstr "Rašymo klaida"

-

-msgid "Reading error"

-msgstr "Skaitymo klaida"

-

-#, c-format

-msgid ""

-"Connection error from %s server:\n"

-"%s"

-msgstr ""

-"Jungties klaida su severiu %s:\n"

-"%s"

-

-msgid "Our protocol is not supported by the server."

-msgstr "Mūsų protokolo serveris nepalaiko."

-

-msgid "Error parsing HTTP."

-msgstr "HTTP sintaksinės analizės klaida."

-

-msgid "You have signed on from another location."

-msgstr "Jūs prisijungėte iš kitur."

-

-msgid "The MSN servers are temporarily unavailable. Please wait and try again."

-msgstr ""

-"MSN serveriai yra laikinai neprieinami. Prašome palaukti ir pabandyti iš "

-"naujo."

-

-msgid "The MSN servers are going down temporarily."

-msgstr "MSN serveriai yra laikinai išjungiami."

-

-#  Data is assumed to be the destination sn

-#, c-format

-msgid "Unable to authenticate: %s"

-msgstr "Negalima patikrinti tapatybės: %s"

-

-msgid ""

-"Your MSN buddy list is temporarily unavailable. Please wait and try again."

-msgstr ""

-"Jūsų MSN bičiulių sąrašas yra laikinai neprieinamas. Prašome palaukti ir "

-"pabandyti iš naujo."

-

-msgid "Handshaking"

-msgstr "Pasisveikinimas"

-

-msgid "Transferring"

-msgstr "Perdavimas"

-

-msgid "Starting authentication"

-msgstr "Pradedamas tapatybės nustatymas"

-

-msgid "Getting cookie"

-msgstr "Gaunamas slapukas"

-

-msgid "Sending cookie"

-msgstr "Siunčiamas slapukas"

-

-msgid "Retrieving buddy list"

-msgstr "Gaunamas bičiulių sąrašas"

-

-msgid "Away From Computer"

-msgstr "Pasitraukęs nuo kompiuterio"

-

-msgid "On The Phone"

-msgstr "Kalba telefonu"

-

-msgid "Out To Lunch"

-msgstr "Išėjęs papietauti"

-

-msgid "Message may have not been sent because a timeout occurred:"

-msgstr "Žinutė galėjo būti neišsiųsta, nes baigėsi laukimo laikas:"

-

-msgid "Message could not be sent, not allowed while invisible:"

-msgstr "Žinutės negalima išsiųsti esant nematomu:"

-

-msgid "Message could not be sent because the user is offline:"

-msgstr "Žinutė neišsiųsta, nes vartotojas atsijungęs:"

-

-msgid "Message could not be sent because a connection error occurred:"

-msgstr "Žinutė neišsiųsta, nes įvyko jungties klaida:"

-

-msgid "Message could not be sent because we are sending too quickly:"

-msgstr "Žinutė neišsiųsta, nes bandyta išsiųsti per greitai:"

-

-msgid ""

-"Message could not be sent because we were unable to establish a session with "

-"the server. This is likely a server problem, try again in a few minutes:"

-msgstr ""

-"Žinutės išsiųsti nepavyko, nes nepavyko sukurti seanso su serveriu.  "

-"Greičiausiai tai serverio problema, pabandykite vėl po kelių minučių:"

-

-msgid ""

-"Message could not be sent because an error with the switchboard occurred:"

-msgstr "Žinutė neišsiųsta, nes įvyko komutatoriaus klaida:"

-

-msgid "Message may have not been sent because an unknown error occurred:"

-msgstr "Žinutė neišsiųsta, nes įvyko nežinoma klaida:"

-

-#, c-format

-msgid "%s has added you to his or her buddy list."

-msgstr "Vartotojas %s įtraukė Jus į savo bičiulių sąrašo."

-

-#, c-format

-msgid "%s has removed you from his or her buddy list."

-msgstr "Vartotojas %s pašalino Jus iš savo bičiulių sąrašo."

-

-msgid "Delete Buddy from Address Book?"

-msgstr "Ar pašalinti bičiulį iš adresų knygos?"

-

-msgid "Do you want to delete this buddy from your address book as well?"

-msgstr "Ar norite pašalinti šį bičiulį taip pat ir iš adresų knygos?"

-

-msgid "The username specified is invalid."

-msgstr "Nurodytas neteisingas vardas."

-

-msgid "This Hotmail account may not be active."

-msgstr "Ši Hotmail paskyra gali būti neaktyvi."

-

-msgid "Profile URL"

-msgstr "Profilio URL"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "MSN Protocol Plugin"

-msgstr "MSN protokolo papildinys"

-

-#, c-format

-msgid "No such user: %s"

-msgstr "Naudotojas nerastas: %s"

-

-msgid "User lookup"

-msgstr "Naudotojo paieška"

-

-msgid "Reading challenge"

-msgstr "Skaitomas serverio iššūkis"

-

-msgid "Unexpected challenge length from server"

-msgstr "Neteisingas serverio iššūkio ilgis"

-

-msgid "Logging in"

-msgstr "Prisijungiama"

-

-msgid "MySpaceIM - No Username Set"

-msgstr "MySpaceIM – nenustatytas naudotojo vardas"

-

-msgid "You appear to have no MySpace username."

-msgstr "Atrodo, kad neturite MySpace naudojo vardo."

-

-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"

-msgstr "Ar norite dabar jį nustatyti? (Pastaba: jis negalės būti keičiamas!)"

-

-msgid "Lost connection with server"

-msgstr "Prarastas prisijungimas prie serverio"

-

-#. Can't write _()'d strings in array initializers. Workaround.

-msgid "New mail messages"

-msgstr "Nauji laiškai"

-

-msgid "New blog comments"

-msgstr "Nauji tinklaraščio komentarai"

-

-msgid "New profile comments"

-msgstr "Nauji profilio komentarai"

-

-msgid "New friend requests!"

-msgstr "Nauji pasiūlymai draugauti!"

-

-msgid "New picture comments"

-msgstr "Nauji nuotraukų komentarai"

-

-msgid "MySpace"

-msgstr "MySpace"

-

-msgid "IM Friends"

-msgstr "IM draugai"

-

-#, c-format

-msgid ""

-"%d buddy was added or updated from the server (including buddies already on "

-"the server-side list)"

-msgid_plural ""

-"%d buddies were added or updated from the server (including buddies already "

-"on the server-side list)"

-msgstr[0] ""

-"%d bičiulis buvo pridėtas ar atnaujintas iš serverio (įskaitant ir "

-"bičiulius, jau esančius serverio sąraše)"

-msgstr[1] ""

-"%d bičiuliai buvo pridėti ar atnaujinti iš serverio (įskaitant ir bičiulius, "

-"jau esančius serverio sąraše)"

-msgstr[2] ""

-"%d bičiulių buvo pridėta ar atnaujinta iš serverio (įskaitant ir bičiulius, "

-"jau esančius serverio sąraše)"

-

-msgid "Add contacts from server"

-msgstr "Pridėti kontaktus iš serverio"

-

-#. The session is now set up, ready to be connected. This emits the

-#. * signedOn signal, so clients can now do anything with msimprpl, and

-#. * we're ready for it (session key, userid, username all setup).

-msgid "Connected"

-msgstr "Prisijungta"

-

-#, c-format

-msgid "Protocol error, code %d: %s"

-msgstr "Protokolo klaida, kodas %d: %s"

-

-#, c-format

-msgid ""

-"%s Your password is %d characters, greater than the expected maximum length "

-"of %d for MySpaceIM. Please shorten your password at http://profileedit."

-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "

-"again."

-msgstr ""

-"%s Jūsų slaptažodis yra %d simbolių, daugiau negu didžiausias MySpaceIM "

-"leidžiamas ilgis %d.  Sutrumpinkite savo slaptažodį adresu http://"

-"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "

-"ir pabandykite iš naujo."

-

-msgid "MySpaceIM Error"

-msgstr "MySpaceIM klaida"

-

-msgid "Invalid input condition"

-msgstr "Neteisinga įvesties sąlyga"

-

-msgid "Read buffer full (2)"

-msgstr "Skaitymo buferis pripildytas (2)"

-

-msgid "Unparseable message"

-msgstr "Nepavyko išanalizuoti pranešimo"

-

-#, c-format

-msgid "Couldn't connect to host: %s (%d)"

-msgstr "Nepavyko prisijungti prie mazgo: %s (%d)"

-

-msgid "Failed to add buddy"

-msgstr "Nepavyko pridėti bičiulio"

-

-msgid "'addbuddy' command failed."

-msgstr "Komanda „addbuddy“ nepavyko."

-

-msgid "persist command failed"

-msgstr "Komanda „persist“ nepavyko."

-

-msgid "Failed to remove buddy"

-msgstr "Nepavyko pašalinti bičiulio"

-

-msgid "'delbuddy' command failed"

-msgstr "Komanda „delbuddy“ nepavyko"

-

-msgid "blocklist command failed"

-msgstr "Komanda „blocklist“ nepavyko"

-

-msgid "Missing Cipher"

-msgstr "Šifras nerastas"

-

-msgid "The RC4 cipher could not be found"

-msgstr "RC4 šifras nerastas"

-

-msgid ""

-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "

-"not be loaded."

-msgstr ""

-"Atnaujinkite libpurple į versiją su RC4 palaikymu (>= 2.0.1).  MySpaceIM "

-"papildinys nebus įkeltas."

-

-msgid "Add friends from MySpace.com"

-msgstr "Pridėti draugus iš MySpace.com"

-

-msgid "Importing friends failed"

-msgstr "Nepavyko importuoti draugų"

-

-#. TODO: find out how

-msgid "Find people..."

-msgstr "Ieškoti žmonių..."

-

-msgid "Change IM name..."

-msgstr "Pakeisti vardą skubiosioms žinutėms..."

-

-msgid "myim URL handler"

-msgstr "myim URL doroklė"

-

-msgid "No suitable MySpaceIM account could be found to open this myim URL."

-msgstr "Nerasta tinkama MySpaceIM paskyra šio myim URL atidarymui."

-

-msgid "Enable the proper MySpaceIM account and try again."

-msgstr "Įjunkite tinkamą MySpaceIM paskyrą ir bandykite iš naujo."

-

-msgid "Show display name in status text"

-msgstr "Rodyti vardą būsenos tekste"

-

-msgid "Show headline in status text"

-msgstr "Rodyti antraštę būsenos tekste"

-

-msgid "Send emoticons"

-msgstr "Siųsti jaustukus"

-

-msgid "Screen resolution (dots per inch)"

-msgstr "Ekrano skiriamoji geba (taškais colyje)"

-

-msgid "Base font size (points)"

-msgstr "Numatytojo šrifto dydis (punktais)"

-

-msgid "User"

-msgstr "Vartotojas"

-

-msgid "Headline"

-msgstr "Antraštė"

-

-msgid "Song"

-msgstr "Daina"

-

-msgid "Total Friends"

-msgstr "Iš viso draugų"

-

-msgid "Client Version"

-msgstr "Kliento programos versija"

-

-msgid "MySpaceIM - Username Available"

-msgstr "MySpaceIM – naudotojo vardas laisvas"

-

-msgid "This username is available. Would you like to set it?"

-msgstr "Šis naudotojo vardas laisvas.  Ar norite juo pasivadinti?"

-

-msgid "ONCE SET, THIS CANNOT BE CHANGED!"

-msgstr "KARTĄ NUSTATYTAS, JIS NEGALI BŪTI PAKEISTAS!"

-

-msgid "MySpaceIM - Please Set a Username"

-msgstr "MySpaceIM – nustatykite naudotojo vardą"

-

-msgid "This username is unavailable."

-msgstr "Šis naudotojo vardas užimtas."

-

-msgid "Please try another username:"

-msgstr "Pabandykite kitokį naudotojo vardą:"

-

-#. Protocol won't log in now without a username set.. Disconnect

-msgid "No username set"

-msgstr "Nenustatytas naudotojo vardas"

-

-msgid "Please enter a username to check its availability:"

-msgstr "Įveskite naudotojo vardą, kad patikrintumėte, ar jis laisvas:"

-

-#. TODO: icons for each zap

-#. Lots of comments for translators:

-#. Zap means "to strike suddenly and forcefully as if with a

-#. * projectile or weapon."  This term often has an electrical

-#. * connotation, for example, "he was zapped by electricity when

-#. * he put a fork in the toaster."

-msgid "Zap"

-msgstr "Pykšt"

-

-#, c-format

-msgid "%s has zapped you!"

-msgstr "%s pykštelėjo jums!"

-

-#, c-format

-msgid "Zapping %s..."

-msgstr "Pykšteliu į %s..."

-

-#. Whack means "to hit or strike someone with a sharp blow"

-msgid "Whack"

-msgstr "Bumpt"

-

-#, c-format

-msgid "%s has whacked you!"

-msgstr "%s bumptelėjo jums!"

-

-#, c-format

-msgid "Whacking %s..."

-msgstr "Bumpteliu į %s..."

-

-#. Torch means "to set on fire."  Don't worry, this doesn't

-#. * make a whole lot of sense in English, either.  Feel free

-#. * to translate it literally.

-msgid "Torch"

-msgstr "Padegimas"

-

-#, c-format

-msgid "%s has torched you!"

-msgstr "%s jus padegė!"

-

-#, c-format

-msgid "Torching %s..."

-msgstr "Padegu %s..."

-

-#. Smooch means "to kiss someone, often enthusiastically"

-msgid "Smooch"

-msgstr "Bučkis"

-

-#, c-format

-msgid "%s has smooched you!"

-msgstr "%s pabučiavo jus!"

-

-#, c-format

-msgid "Smooching %s..."

-msgstr "Bučiuoju %s..."

-

-#. A hug is a display of affection; wrapping your arms around someone

-msgid "Hug"

-msgstr "Apkabinimas"

-

-#, c-format

-msgid "%s has hugged you!"

-msgstr "%s apkabino jus!"

-

-#, c-format

-msgid "Hugging %s..."

-msgstr "Apkabinu %s..."

-

-#. Slap means "to hit someone with an open/flat hand"

-msgid "Slap"

-msgstr "Pliaukšt"

-

-#, c-format

-msgid "%s has slapped you!"

-msgstr "%s pliaukštelėjo jums!"

-

-#, c-format

-msgid "Slapping %s..."

-msgstr "Pliaukšteliu %s..."

-

-#. Goose means "to pinch someone on their butt"

-msgid "Goose"

-msgstr "Žnybt"

-

-#, c-format

-msgid "%s has goosed you!"

-msgstr "%s jums įžnybo!"

-

-#, c-format

-msgid "Goosing %s..."

-msgstr "Įžnybiu %s..."

-

-#. A high-five is when two people's hands slap each other

-#. * in the air above their heads.  It is done to celebrate

-#. * something, often a victory, or to congratulate someone.

-msgid "High-five"

-msgstr "Duodam penkis"

-

-#, c-format

-msgid "%s has high-fived you!"

-msgstr "%s davė jums penkis!"

-

-#, c-format

-msgid "High-fiving %s..."

-msgstr "Duodu penkis %s..."

-

-#. We're not entirely sure what the MySpace people mean by

-#. * this... but we think it's the equivalent of "prank."  Or, for

-#. * someone to perform a mischievous trick or practical joke.

-msgid "Punk"

-msgstr "Punkt"

-

-#, c-format

-msgid "%s has punk'd you!"

-msgstr "%s punktelėjo jums!"

-

-#, c-format

-msgid "Punking %s..."

-msgstr "Punkteliu %s..."

-

-#. Raspberry is a slang term for the vibrating sound made

-#. * when you stick your tongue out of your mouth with your

-#. * lips closed and blow.  It is typically done when

-#. * gloating or bragging.  Nowadays it's a pretty silly

-#. * gesture, so it does not carry a harsh negative

-#. * connotation.  It is generally used in a playful tone

-#. * with friends.

-msgid "Raspberry"

-msgstr "Parodyti liežuvį"

-

-#, c-format

-msgid "%s has raspberried you!"

-msgstr "%s parodė jums liežuvį!"

-

-#, c-format

-msgid "Raspberrying %s..."

-msgstr "Rodau liežuvį %s..."

-

-msgid "Required parameters not passed in"

-msgstr "Neperduoti reikalingi parametrai"

-

-msgid "Unable to write to network"

-msgstr "Negalima rašyti į tinklą"

-

-msgid "Unable to read from network"

-msgstr "Negalima skaityti iš tinklo"

-

-msgid "Error communicating with server"

-msgstr "Komunikacijos su serveriu klaida"

-

-msgid "Conference not found"

-msgstr "Konferencija nerasta"

-

-msgid "Conference does not exist"

-msgstr "Konferencija neegzistuoja"

-

-msgid "A folder with that name already exists"

-msgstr "Aplankas su tokiu vardu jau yra"

-

-msgid "Not supported"

-msgstr "Nepalaikoma"

-

-msgid "Password has expired"

-msgstr "Slaptažodžio galiojimo laikas pasibaigė"

-

-msgid "Incorrect password"

-msgstr "Neteisingas slaptažodis"

-

-msgid "User not found"

-msgstr "Vartotojas nerastas"

-

-msgid "Account has been disabled"

-msgstr "Neveiksni paskyra"

-

-msgid "The server could not access the directory"

-msgstr "Serveris negalėjo kreiptis į katalogą"

-

-msgid "Your system administrator has disabled this operation"

-msgstr "Jūsų sistemos administratorius išjungė šią operaciją"

-

-msgid "The server is unavailable; try again later"

-msgstr "Serveris neprieinamas; pabandykite vėliau vėl"

-

-msgid "Cannot add a contact to the same folder twice"

-msgstr "Negalima pridėti kontakto į tą patį katalogą du kartus"

-

-msgid "Cannot add yourself"

-msgstr "Negalima pridėti savęs"

-

-msgid "Master archive is misconfigured"

-msgstr "Pagrindinis archyvas yra blogai sukonfigūruotas"

-

-msgid "Incorrect username or password"

-msgstr "Neteisingas naudotojo vardas ar slaptažodis"

-

-msgid "Could not recognize the host of the username you entered"

-msgstr "Nepavyko atpažinti mazgo, priklausančio šiam naudotojo vardui"

-

-msgid ""

-"Your account has been disabled because too many incorrect passwords were "

-"entered"

-msgstr ""

-"Jūsų paskyra padaryta neveiksnia dėl per daug kartų neteisingai įvesto "

-"slaptažodžio"

-

-msgid "You cannot add the same person twice to a conversation"

-msgstr "Negalite du kartus įtraukti to paties asmens į pokalbį"

-

-msgid "You have reached your limit for the number of contacts allowed"

-msgstr "Jūs pasiekėte savo leistinų kontaktų skaičiaus ribą."

-

-msgid "You have entered an incorrect username"

-msgstr "Jūs įvedėte neteisingą naudotojo vardą"

-

-msgid "An error occurred while updating the directory"

-msgstr "Katalogo atnaujinimo metu įvyko klaida"

-

-msgid "Incompatible protocol version"

-msgstr "Nesuderinama protokolo versija"

-

-msgid "The user has blocked you"

-msgstr "Vartotojas Jus užblokavo"

-

-msgid ""

-"This evaluation version does not allow more than ten users to log in at one "

-"time"

-msgstr ""

-"Ši laikinoji versija neleidžia daugiau kaip dešimčiai vartotojų prisijungti "

-"tuo pačiu metu"

-

-msgid "The user is either offline or you are blocked"

-msgstr "Vartotojas yra atsijungęs arba Jūs esate užblokuotas"

-

-#, c-format

-msgid "Unknown error: 0x%X"

-msgstr "Nežinoma klaida: 0x%X"

-

-#, c-format

-msgid "Login failed (%s)."

-msgstr "Prisijungimas nepavyko (%s)."

-

-#, c-format

-msgid "Unable to send message. Could not get details for user (%s)."

-msgstr "Neįmanoma išsiųsti pranešimo. Nepavyko gauti vartotojo detalių (%s)."

-

-#, c-format

-msgid "Unable to add %s to your buddy list (%s)."

-msgstr "Negalima pridėti %s į Jūsų bičiulių sąrašą (%s)."

-

-#. TODO: Improve this! message to who or for what conference?

-#, c-format

-msgid "Unable to send message (%s)."

-msgstr "Negalima išsiųsti žinutės (%s)."

-

-#, c-format

-msgid "Unable to invite user (%s)."

-msgstr "Negalima pakviesti vartotojo (%s)."

-

-#, c-format

-msgid "Unable to send message to %s. Could not create the conference (%s)."

-msgstr ""

-"Negalima išsiųsti žinutės vartotojui %s. Nepavyko sukurti konferencijos (%s)."

-

-#, c-format

-msgid "Unable to send message. Could not create the conference (%s)."

-msgstr "Nepavyko išsiųsti žinutės. Nepavyko sukurti konferencijos (%s)."

-

-#, c-format

-msgid ""

-"Unable to move user %s to folder %s in the server side list. Error while "

-"creating folder (%s)."

-msgstr ""

-"Nepavyko perkelti vartotojo %s į aplanką %s serverio sąraše. Aplanko kūrimo "

-"klaida (%s)."

-

-#, c-format

-msgid ""

-"Unable to add %s to your buddy list. Error creating folder in server side "

-"list (%s)."

-msgstr ""

-"Nepavyko įtraukti vartotojo %s į Jūsų bičiulių sąrašą. Aplanko kūrimo "

-"serverio sąraše klaida (%s)."

-

-#, c-format

-msgid "Could not get details for user %s (%s)."

-msgstr "Nepavyko gauti detalių apie vartotoją %s (%s)."

-

-#, c-format

-msgid "Unable to add user to privacy list (%s)."

-msgstr "Nepavyko įtraukti vartotojo į privatumo sąrašą (%s)."

-

-#, c-format

-msgid "Unable to add %s to deny list (%s)."

-msgstr "Nepavyko įtraukti %s į draudimo sąrašą (%s)."

-

-#, c-format

-msgid "Unable to add %s to permit list (%s)."

-msgstr "Nepavyko įtraukti %s į leidimo sąrašą (%s)."

-

-#, c-format

-msgid "Unable to remove %s from privacy list (%s)."

-msgstr "Nepavyko pašalinti %s iš privatumo sąrašo (%s)."

-

-#, c-format

-msgid "Unable to change server side privacy settings (%s)."

-msgstr "Nepavyko pakeisti privatumo nuostatų serveryje (%s)."

-

-#, c-format

-msgid "Unable to create conference (%s)."

-msgstr "Nepavyko sukurti konferencijos (%s)."

-

-msgid "Error communicating with server. Closing connection."

-msgstr "Komunikacijos su serveriu klaida. Jungtis uždaroma."

-

-msgid "Telephone Number"

-msgstr "Telefonas"

-

-# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???

-msgid "Personal Title"

-msgstr "Asmens pavadinimas"

-

-msgid "Mailstop"

-msgstr "Mailstop"

-

-msgid "User ID"

-msgstr "Vartotojo ID"

-

-#. tag = _("DN");

-#. value = nm_user_record_get_dn(user_record);

-#. if (value) {

-#. purple_notify_user_info_add_pair(user_info, tag, value);

-#. }

-#.

-msgid "Full name"

-msgstr "Pilnas vardas"

-

-#, c-format

-msgid "GroupWise Conference %d"

-msgstr "GroupWise konferencija %d"

-

-msgid "Authenticating..."

-msgstr "Nustatoma tapatybė..."

-

-msgid "Unable to connect to server."

-msgstr "Nepavyko prisijungti prie serverio."

-

-msgid "Waiting for response..."

-msgstr "Laukiama atsako..."

-

-#, c-format

-msgid "%s has been invited to this conversation."

-msgstr "%s pakviestas į šį pokalbį"

-

-msgid "Invitation to Conversation"

-msgstr "Kvietimas į pokalbį"

-

-#, c-format

-msgid ""

-"Invitation from: %s\n"

-"\n"

-"Sent: %s"

-msgstr ""

-"Kvietimas nuo: %s\n"

-"\n"

-"Išsiųstas: %s"

-

-msgid "Would you like to join the conversation?"

-msgstr "Ar norite prisijungti prie pokalbio?"

-

-msgid "You have been logged out because you logged in at another workstation."

-msgstr "Jūs buvote atjungtas, kadangi prisijungėte kitoje darbo vietoje."

-

-#, c-format

-msgid ""

-"%s appears to be offline and did not receive the message that you just sent."

-msgstr ""

-"Atrodo, kad %s yra atsijungęs ir negavo žinutės, kurią ką tik išsiuntėte."

-

-msgid ""

-"Unable to connect to server. Please enter the address of the server you wish "

-"to connect to."

-msgstr ""

-"Negalima prisijungti prie servrio.  Prašome įvesti serverio, prie kurio "

-"norite prisijungti, adresą."

-

-msgid "Error. SSL support is not installed."

-msgstr "Klaida. SSL palaikymas neįdiegtas."

-

-msgid "This conference has been closed. No more messages can be sent."

-msgstr "Ši konferencija uždaryta. Daugiau žinučių siųsti negalima."

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Novell GroupWise Messenger Protocol Plugin"

-msgstr "Novell GroupWise Messenger protokolo papildinys"

-

-msgid "Server address"

-msgstr "Serverio adresas"

-

-msgid "Server port"

-msgstr "Serverio prievadas"

-

-msgid "Could not join chat room"

-msgstr "Nepavyko prisijungti prie pokalbių kambario"

-

-msgid "Invalid chat room name"

-msgstr "Neteisingas pokalbių kambario pavadinimas"

-

-msgid "Server closed the connection."

-msgstr "Serveris uždarė jungtį."

-

-#, c-format

-msgid ""

-"Lost connection with server:\n"

-"%s"

-msgstr ""

-"Dingo jungtis su serveriu:\n"

-"%s"

-

-msgid "Received invalid data on connection with server."

-msgstr "Jungtimi su serveriu gauti neteisingi duomenys."

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#  *< name

-#  *< version

-#  *  summary

-#  *  description

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "AIM Protocol Plugin"

-msgstr "AIM protokolo papildinys"

-

-msgid "ICQ UIN..."

-msgstr "ICQ UIN..."

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#  *< name

-#  *< version

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "ICQ Protocol Plugin"

-msgstr "ICQ protokolo papildinys"

-

-msgid "Encoding"

-msgstr "Koduotė"

-

-msgid "The remote user has closed the connection."

-msgstr "Nutolęs vartotojas uždarė jungtį."

-

-msgid "The remote user has declined your request."

-msgstr "Nutolęs vartotojas atmetė Jūsų prašymą."

-

-#, c-format

-msgid "Lost connection with the remote user:<br>%s"

-msgstr "Prarastas ryšys su nutolusiu vartotoju:<br>%s"

-

-msgid "Received invalid data on connection with remote user."

-msgstr "Gauti neteisingi duomenys ryšiu su nutolusiu vartotoju."

-

-msgid "Could not establish a connection with the remote user."

-msgstr "Nepavyko sukurti jungties su nutolusiu vartotoju."

-

-msgid "Direct IM established"

-msgstr "Sukurtas tiesioginis pokalbių ryšis"

-

-#, c-format

-msgid ""

-"%s tried to send you a %s file, but we only allow files up to %s over Direct "

-"IM.  Try using file transfer instead.\n"

-msgstr ""

-"%s bandė jums atsiųsti failą %s, tačiau tiesioginiu ryšiu failai leidžiami "

-"tik iki %s.  Pabandykite naudoti failų perdavimą vietoje tiesioginio ryšio.\n"

-

-#, c-format

-msgid "File %s is %s, which is larger than the maximum size of %s."

-msgstr ""

-"Failas „%s“ yra %s dydžio – didesnis nei maksimalus leidžiamas dydis %s."

-

-msgid "Invalid error"

-msgstr "Neteisinga klaida"

-

-msgid "Invalid SNAC"

-msgstr "Neteisingas SNAC"

-

-msgid "Rate to host"

-msgstr "Sparta į mazgą"

-

-msgid "Rate to client"

-msgstr "Sparta į klientą"

-

-msgid "Service unavailable"

-msgstr "Tarnyba neprieinama"

-

-msgid "Service not defined"

-msgstr "Tarnyba neaprašyta"

-

-msgid "Obsolete SNAC"

-msgstr "SNAC pasenęs"

-

-msgid "Not supported by host"

-msgstr "Nepalaikoma mazgo"

-

-msgid "Not supported by client"

-msgstr "Nepalaikoma kliento"

-

-msgid "Refused by client"

-msgstr "Atsisakyta kliento"

-

-msgid "Reply too big"

-msgstr "Atsakas per didelis"

-

-msgid "Responses lost"

-msgstr "Prarasti atsakai"

-

-msgid "Request denied"

-msgstr "Užklausa negalima"

-

-msgid "Busted SNAC payload"

-msgstr "Neteisingas SNAC turinys"

-

-msgid "Insufficient rights"

-msgstr "Nepakankamos teisės"

-

-msgid "In local permit/deny"

-msgstr "Yra vietiniame leidimo ar draudimo sąraše"

-

-msgid "Warning level too high (sender)"

-msgstr "Per aukštas siuntėjo perspėjimo lygis"

-

-msgid "Warning level too high (receiver)"

-msgstr "Per aukštas gavėjo perspėjimo lygis"

-

-msgid "User temporarily unavailable"

-msgstr "Vartotojas laikinai neprieinamas"

-

-msgid "No match"

-msgstr "Nėra atitikmens"

-

-msgid "List overflow"

-msgstr "Sąrašo perpildymas"

-

-msgid "Request ambiguous"

-msgstr "Nevienareikšmė užklausa"

-

-msgid "Queue full"

-msgstr "Eilė pilna"

-

-msgid "Not while on AOL"

-msgstr "Negalima prisijungus per AOL"

-

-msgid ""

-"(There was an error receiving this message.  The buddy you are speaking with "

-"is probably using a different encoding than expected.  If you know what "

-"encoding he is using, you can specify it in the advanced account options for "

-"your AIM/ICQ account.)"

-msgstr ""

-"(Priimant šią žinutę įvyko klaida.  Greičiausiai bičiulis su kuriuo "

-"bendraujate naudoja kitokią koduotę nei buvo numatyta.  Jei žinote, kokią "

-"koduotę jis naudoja, galite ją nurodyti papildomose AIM/ICQ paskyros "

-"nuostatose."

-

-#, c-format

-msgid ""

-"(There was an error receiving this message.  Either you and %s have "

-"different encodings selected, or %s has a buggy client.)"

-msgstr ""

-"(Šio pranešimo gavimo metu įvyko klaida.  Arba Jūs ir %s esate pasirinkę "

-"skirtingas koduotes, arba %s naudoja kliento programą su riktais.)"

-

-#  Label

-#. Label

-msgid "Buddy Icon"

-msgstr "Vartotojo paveiksliukas"

-

-msgid "Voice"

-msgstr "Balsas"

-

-msgid "AIM Direct IM"

-msgstr "AIM tiesioginės greitosios žinutės"

-

-msgid "Get File"

-msgstr "Gauti failai"

-

-msgid "Games"

-msgstr "Žaidimai"

-

-msgid "Add-Ins"

-msgstr "Papildiniai"

-

-msgid "Send Buddy List"

-msgstr "Nusiųsti bičiulių sąrašą"

-

-msgid "ICQ Direct Connect"

-msgstr "ICQ tiesioginė jungtis"

-

-msgid "AP User"

-msgstr "AP vartotojas"

-

-msgid "ICQ RTF"

-msgstr "ICQ RTF"

-

-msgid "Nihilist"

-msgstr "Nihilistas"

-

-msgid "ICQ Server Relay"

-msgstr "Perdavimas per ICQ serverį"

-

-msgid "Old ICQ UTF8"

-msgstr "Senas ICQ UTF8"

-

-msgid "Trillian Encryption"

-msgstr "Trillian užkodavimas"

-

-msgid "ICQ UTF8"

-msgstr "ICQ UTF8"

-

-msgid "Hiptop"

-msgstr "Hiptop"

-

-msgid "Security Enabled"

-msgstr "Su saugumu"

-

-msgid "Video Chat"

-msgstr "Vaizdinis pokalbis"

-

-msgid "iChat AV"

-msgstr "iChat AV"

-

-msgid "Live Video"

-msgstr "Tiesioginis vaizdas"

-

-msgid "Camera"

-msgstr "Kamera"

-

-msgid "Screen Sharing"

-msgstr "Ekrano dalinimasis"

-

-msgid "Free For Chat"

-msgstr "Prieinamas pokalbiui"

-

-msgid "Not Available"

-msgstr "Neprieinamas"

-

-msgid "Occupied"

-msgstr "Užimtas"

-

-msgid "Web Aware"

-msgstr "Žinantis apie žiniatinklį"

-

-msgid "Invisible"

-msgstr "Nematomas"

-

-msgid "IP Address"

-msgstr "IP adresas"

-

-msgid "Warning Level"

-msgstr "Perspėjimo lygis"

-

-msgid "Buddy Comment"

-msgstr "Bičiulio komentaras"

-

-#, c-format

-msgid ""

-"Could not connect to authentication server:\n"

-"%s"

-msgstr ""

-"Nepavyko prisijungti prie tapatybės nustatymo serverio:\n"

-"%s"

-

-#, c-format

-msgid ""

-"Could not connect to BOS server:\n"

-"%s"

-msgstr ""

-"Nepavyko prisijungti prie BOS serverio:\n"

-"%s"

-

-msgid "Username sent"

-msgstr "Vartotojo vardas nusiųstas"

-

-msgid "Connection established, cookie sent"

-msgstr "Jungtis nustatyta, nusiųstas slapukas"

-

-#. TODO: Don't call this with ssi

-msgid "Finalizing connection"

-msgstr "Pabaigiama jungtis"

-

-#, c-format

-msgid ""

-"Unable to login: Could not sign on as %s because the username is invalid.  "

-"Usernames must be a valid email address, or start with a letter and contain "

-"only letters, numbers and spaces, or contain only numbers."

-msgstr ""

-"Negalima prisijungti: vardu %s prisijungti nepavyko, nes naudotojo vardas "

-"neteisingas.  Naudotojo vardas turi būti arba teisingas el. pašto adresas, "

-"arba prasidėti raide ir turėti tik raides, skaitmenis ir tarpus, arba turėti "

-"tik skaitmenis."

-

-#. Unregistered screen name

-#. uid is not exist

-msgid "Invalid username."

-msgstr "Neteisingas naudotojo vardas"

-

-msgid "Incorrect password."

-msgstr "Neteisingas slaptažodis."

-

-#. Suspended account

-msgid "Your account is currently suspended."

-msgstr "Jūsų abonentas šiuo metu suspenduotas."

-

-#. service temporarily unavailable

-msgid "The AOL Instant Messenger service is temporarily unavailable."

-msgstr "AOL IM tarnyba laikinai neprieinama"

-

-#. screen name connecting too frequently

-#. IP address connecting too frequently

-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 ""

-"Jūs per dažnai prisijunginėjote ir atsijunginėjote. Palaukite dešimt minučių "

-"ir bandykite vėl. Jei vis tiek bandysite jungtis, Jums reikės laukti dar "

-"ilgiau."

-

-#, c-format

-msgid "The client version you are using is too old. Please upgrade at %s"

-msgstr ""

-"Jūsų naudojama kliento programos versija yra per sena. Prašome atnaujinti "

-"svetainėje %s"

-

-msgid "Could Not Connect"

-msgstr "Nepavyko prisijungti"

-

-msgid "Received authorization"

-msgstr "Gauta prieigos teisė"

-

-msgid "The SecurID key entered is invalid."

-msgstr "Įvestas SecurID raktas yra neteisingas."

-

-msgid "Enter SecurID"

-msgstr "Įveskite SecurID"

-

-msgid "Enter the 6 digit number from the digital display."

-msgstr "Įveskite 6 skaitmenų skaičių iš skaitmeninio displėjaus."

-

-#. *

-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.

-#.

-msgid "_OK"

-msgstr "_Gerai"

-

-#, c-format

-msgid "You may be disconnected shortly.  If so, check %s for updates."

-msgstr ""

-"Jus netrukus gali atjungti.  Jei taip atsitiks, patikrinkite %s, ar nėra "

-"atnaujinimų."

-

-msgid "Unable to get a valid AIM login hash."

-msgstr "Nepavyko gauti teisingos AIM prisijungimo maišos."

-

-#, c-format

-msgid "You may be disconnected shortly.  Check %s for updates."

-msgstr "Jus netrukus gali atjungti.  Patikrinkite %s, ar nėra atnaujinimų."

-

-msgid "Unable to get a valid login hash."

-msgstr "Nepavyko gauti teisingos prisijungimo maišos."

-

-msgid "Password sent"

-msgstr "Išsiųstas slaptažodis"

-

-msgid "Unable to initialize connection"

-msgstr "Nepavyko sukurti jungties"

-

-msgid "Please authorize me so I can add you to my buddy list."

-msgstr ""

-"Prašau suteikti man prieigos teisę, kad aš galėčiau įtraukti Jus į savo "

-"bičiulių sąrašą."

-

-msgid "Authorization Request Message:"

-msgstr "Prieigos teisės prašymo žinutė:"

-

-msgid "Please authorize me!"

-msgstr "Prašau suteikti man prieigos teisę!"

-

-msgid "No reason given."

-msgstr "Nenurodyta priežastis."

-

-msgid "Authorization Denied Message:"

-msgstr "Prieigos teisės nesuteikimo žinutė:"

-

-#, c-format

-msgid ""

-"The user %u has denied your request to add them to your buddy list for the "

-"following reason:\n"

-"%s"

-msgstr ""

-"Vartotojas %u atmetė Jūsų prašymą įtraukti jį į Jūsų bičiulių sąrašą dėl "

-"šios priežasties:\n"

-"%s"

-

-msgid "ICQ authorization denied."

-msgstr "ICQ prieigos teisė nesuteikta."

-

-#. Someone has granted you authorization

-#, c-format

-msgid "The user %u has granted your request to add them to your buddy list."

-msgstr "Vartotojas %u suteikė Jums teisę įtraukti jį į Jūsų bičiulių sąrašą."

-

-#, c-format

-msgid ""

-"You have received a special message\n"

-"\n"

-"From: %s [%s]\n"

-"%s"

-msgstr ""

-"Jūs gavote ypatingą žinutę\n"

-"\n"

-"Nuo: %s [%s]\n"

-"%s"

-

-#, c-format

-msgid ""

-"You have received an ICQ page\n"

-"\n"

-"From: %s [%s]\n"

-"%s"

-msgstr ""

-"Jūs gavote ICQ mobiliąją žinutę\n"

-"\n"

-"Nuo: %s [%s]\n"

-"%s"

-

-#, c-format

-msgid ""

-"You have received an ICQ email from %s [%s]\n"

-"\n"

-"Message is:\n"

-"%s"

-msgstr ""

-"Jūs gavote ICQ el. pašto laišką nuo %s [%s]\n"

-"\n"

-"Laiškas yra:\n"

-"%s"

-

-#, c-format

-msgid "ICQ user %u has sent you a buddy: %s (%s)"

-msgstr "ICQ vartotojas %u atsiuntė bičiulio adresą: %s (%s)"

-

-msgid "Do you want to add this buddy to your buddy list?"

-msgstr "Ar norite įtraukti šį bičiulį į Jūsų bičiulių sąrašą?"

-

-msgid "_Add"

-msgstr "_Pridėti"

-

-msgid "_Decline"

-msgstr "_Atsisakyti"

-

-#, 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] "Jūs praleidote %hu neteisingą pranešimą nuo vartotojo %s."

-msgstr[1] "Jūs praleidote %hu neteisingus pranešimus nuo vartotojo %s."

-msgstr[2] "Jūs praleidote %hu neteisingų pranešimų nuo vartotojo %s."

-

-#, 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] "Jūs praleidote %hu per ilgą pranešimą nuo vartotojo %s."

-msgstr[1] "Jūs praleidote %hu per ilgus pranešimus nuo vartotojo %s."

-msgstr[2] "Jūs praleidote %hu per ilgų pranešimų nuo vartotojo %s."

-

-#, c-format

-msgid ""

-"You missed %hu message from %s because the rate limit has been exceeded."

-msgid_plural ""

-"You missed %hu messages from %s because the rate limit has been exceeded."

-msgstr[0] ""

-"Jūs praleidote %hu pranešimą nuo vartotojo %s, kadangi viršyta spartos riba."

-msgstr[1] ""

-"Jūs praleidote %hu pranešimus nuo vartotojo %s, kadangi viršyta spartos riba."

-msgstr[2] ""

-"Jūs praleidote %hu pranešimų nuo vartotojo %s, kadangi viršyta spartos riba."

-

-#, c-format

-msgid ""

-"You missed %hu message from %s because his/her warning level is too high."

-msgid_plural ""

-"You missed %hu messages from %s because his/her warning level is too high."

-msgstr[0] ""

-"Jūs praleidote %hu žinutę nuo vartotojo %s, kadangi jo/jos perspėjimo lygis "

-"yra per aukštas."

-msgstr[1] ""

-"Jūs praleidote %hu žinutes nuo vartotojo %s, kadangi jo/jos perspėjimo lygis "

-"yra per aukštas."

-msgstr[2] ""

-"Jūs praleidote %hu žinučių nuo vartotojo %s, kadangi jo/jos perspėjimo lygis "

-"yra yra per aukštas."

-

-#, c-format

-msgid "You missed %hu message from %s because your warning level is too high."

-msgid_plural ""

-"You missed %hu messages from %s because your warning level is too high."

-msgstr[0] ""

-"Jūs praleidote %hu žinutę nuo vartotojo %s, kadangi Jūsų perspėjimo lygis "

-"yra per aukštas."

-msgstr[1] ""

-"Jūs praleidote %hu žinutes nuo vartotojo %s, kadangi Jūsų perspėjimo lygis "

-"yra per aukštas."

-msgstr[2] ""

-"Jūs praleidote %hu žinučių nuo vartotojo %s, kadangi Jūsų perspėjimo lygis "

-"yra per aukštas."

-

-#, 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] ""

-"Jūs praleidote %hu pranešimą nuo vartotojo %s dėl nežinomos priežasties."

-msgstr[1] ""

-"Jūs praleidote %hu pranešimus nuo vartotojo %s dėl nežinomos priežasties."

-msgstr[2] ""

-"Jūs praleidote %hu pranešimų nuo vartotojo %s dėl nežinomos priežasties."

-

-#  Data is assumed to be the destination sn

-#. Data is assumed to be the destination sn

-#, c-format

-msgid "Unable to send message: %s"

-msgstr "Negalima išsiųsti žinutės: %s"

-

-msgid "Unknown reason."

-msgstr "Nežinoma priežastis."

-

-#, c-format

-msgid "Unable to send message to %s:"

-msgstr "Negalima išsiųsti žinutės vartotojui %s:"

-

-#, c-format

-msgid "User information not available: %s"

-msgstr "Vartotojo informacija neprieinama: %s"

-

-msgid "Online Since"

-msgstr "Prisijungęs nuo"

-

-msgid "Member Since"

-msgstr "Narys nuo"

-

-msgid "Profile"

-msgstr "Profilis"

-

-msgid "Your AIM connection may be lost."

-msgstr "Jūsų AIM jungtis gali būti prarasta."

-

-#  The conversion failed!

-#. The conversion failed!

-msgid ""

-"[Unable to display a message from this user because it contained invalid "

-"characters.]"

-msgstr ""

-"[Negalima pavaizduoti žinutės nuo šio vartotojo, kadangi joje yra neteisingų "

-"simbolių.]"

-

-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 ""

-"Paskutinis Jūsų bandytas veiksmas negalėjo būti įvykdytas, nes Jūs viršyjate "

-"spartos ribą. Prašome palaukti 10 sekundžių ir bandyti iš naujo."

-

-#, c-format

-msgid "You have been disconnected from chat room %s."

-msgstr "Jūs buvote atjungtas nuo pokalbių kambario %s."

-

-msgid "Mobile Phone"

-msgstr "Mobilus telefonas"

-

-msgid "Personal Web Page"

-msgstr "Asmeninė svetainė"

-

-#. aim_userinfo_t

-#. strip_html_tags

-msgid "Additional Information"

-msgstr "Papildoma informacija"

-

-msgid "Zip Code"

-msgstr "Pašto kodas"

-

-msgid "Work Information"

-msgstr "Darbovietės informacija"

-

-msgid "Division"

-msgstr "Skyrius"

-

-msgid "Position"

-msgstr "Pareigos"

-

-msgid "Web Page"

-msgstr "Svetainė"

-

-msgid "Pop-Up Message"

-msgstr "Iššokanti žinutė"

-

-#, c-format

-msgid "The following username is associated with %s"

-msgid_plural "The following usernames are associated with %s"

-msgstr[0] "Tolesni naudotojų vardai yra susieti su %s"

-msgstr[1] "Tolesni naudotojų vardai yra susieti su %s"

-msgstr[2] "Tolesni naudotojų vardai yra susieti su %s"

-

-#, c-format

-msgid "No results found for email address %s"

-msgstr "Pagal el. pašto adresą %s jokių rezultatų nerasta"

-

-#, c-format

-msgid "You should receive an email asking to confirm %s."

-msgstr "Jūs turėtumėte gauti el. laišką, prašantį patvirtinti %s."

-

-msgid "Account Confirmation Requested"

-msgstr "Paprašyta abonento patvirtinimo"

-

-#, c-format

-msgid ""

-"Error 0x%04x: Unable to format username because the requested name differs "

-"from the original."

-msgstr ""

-"Klaida 0x%04x: neįmanoma taikyti formato naudotojo vardui, nes paprašytasis "

-"vardas skiriasi nuo pradinio vardo."

-

-#, c-format

-msgid "Error 0x%04x: Unable to format username because it is invalid."

-msgstr ""

-"Klaida 0x%04x: neįmanoma taikyti formato naudotojo vardui, nes paprašytasis "

-"vardas yra neteisingas."

-

-#, c-format

-msgid ""

-"Error 0x%04x: Unable to format username because the requested name is too "

-"long."

-msgstr ""

-"Klaida 0x%04x: neįmanoma taikyti formato naudotojo vardui, nes paprašytasis "

-"vardas yra per ilgas."

-

-#, c-format

-msgid ""

-"Error 0x%04x: Unable to change email address because there is already a "

-"request pending for this username."

-msgstr ""

-"Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi šiuo metu laukia "

-"užklausa šiam naudotojo vardui."

-

-#, c-format

-msgid ""

-"Error 0x%04x: Unable to change email address because the given address has "

-"too many usernames associated with it."

-msgstr ""

-"Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi duotas adresas "

-"turi per daug su juo susietų naudotojų vardų."

-

-#, c-format

-msgid ""

-"Error 0x%04x: Unable to change email address because the given address is "

-"invalid."

-msgstr ""

-"Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi duotas adresas "

-"yra neteisingas."

-

-#, c-format

-msgid "Error 0x%04x: Unknown error."

-msgstr "Klaida 0x%04x: nežinoma klaida."

-

-msgid "Error Changing Account Info"

-msgstr "Abonento informacijos keitimo klaida"

-

-#, c-format

-msgid "The email address for %s is %s"

-msgstr "Vartotojo %s el. pašto adresas yra %s"

-

-msgid "Account Info"

-msgstr "Abonento informacija"

-

-msgid ""

-"Your IM Image was not sent. You must be Direct Connected to send IM Images."

-msgstr ""

-"Jūsų IM vaizdas negalėjo būti išsiųstas. IM vaizdų siuntimui jūs turite būti "

-"tiesiogiai prisijungęs."

-

-msgid "Unable to set AIM profile."

-msgstr "Negalima nustatyti AIM profilio."

-

-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 ""

-"Turbūt Jūs pabandėte nustatyti profilį dar nepasibaigus seanso pradžios "

-"procedūrai.  Jūsų profilis lieka nenustatytas.  Pabandykite jį nustatyti dar "

-"kartą, kai būsite galutinai prisijungęs."

-

-#, c-format

-msgid ""

-"The maximum profile length of %d byte has been exceeded.  It has been "

-"truncated for you."

-msgid_plural ""

-"The maximum profile length of %d bytes has been exceeded.  It has been "

-"truncated for you."

-msgstr[0] ""

-"Viršytas maksimalus %d baito profilio ilgis, todėl profilis buvo "

-"sutrumpintas."

-msgstr[1] ""

-"Viršytas maksimalus %d baitų profilio ilgis, todėl profilis buvo "

-"sutrumpintas."

-msgstr[2] ""

-"Viršytas maksimalus %d baitų profilio ilgis, todėl profilis buvo "

-"sutrumpintas."

-

-msgid "Profile too long."

-msgstr "Profilis per ilgas."

-

-#, c-format

-msgid ""

-"The maximum away message length of %d byte has been exceeded.  It has been "

-"truncated for you."

-msgid_plural ""

-"The maximum away message length of %d bytes has been exceeded.  It has been "

-"truncated for you."

-msgstr[0] ""

-"Viršytas maksimalus %d baito pasitraukimo žinutės ilgis, todėl žinutė buvo "

-"sutrumpinta."

-msgstr[1] ""

-"Viršytas maksimalus %d baitų pasitraukimo žinutės ilgis, todėl žinutė buvo "

-"sutrumpinta."

-msgstr[2] ""

-"Viršytas maksimalus %d baitų pasitraukimo žinutės ilgis, todėl žinutė buvo "

-"sutrumpinta."

-

-msgid "Away message too long."

-msgstr "Pasitraukimo žinutė per ilga."

-

-#, c-format

-msgid ""

-"Could not add the buddy %s because the username is invalid.  Usernames must "

-"be a valid email address, or start with a letter and contain only letters, "

-"numbers and spaces, or contain only numbers."

-msgstr ""

-"Nepavyko pridėti bičiulio %s, nes šis naudotojo vardas neteisingas.  Vardai "

-"turi būti arba teisingi el. pašto adresai, arba turi prasidėti raide ir "

-"turėti tik raides, skaitmenis ir tarpus, arba turėti tik skaitmenis."

-

-msgid "Unable to Add"

-msgstr "Negalima pridėti"

-

-msgid "Unable to Retrieve Buddy List"

-msgstr "Negalima gauti bičiulių sąrašo"

-

-msgid ""

-"The AIM servers were temporarily unable to send your buddy list.  Your buddy "

-"list is not lost, and will probably become available in a few minutes."

-msgstr ""

-"AIM serveriai laikinai negalėjo išsiųsti Jūsų bičiulių sąrašo.  Jis nėra "

-"prarastas ir greičiausiai taps prieinamas už kelių minučių."

-

-msgid "Orphans"

-msgstr "Našlaičiai"

-

-#, 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 ""

-"Nepavyko pridėti bičiulio %s, nes Jūs turite per daug bičiulių savo bičiulių "

-"sąraše.  Prašome vieną pašalinti ir bandyti iš naujo."

-

-msgid "(no name)"

-msgstr "(nėra vardo)"

-

-#, c-format

-msgid "Could not add the buddy %s for an unknown reason."

-msgstr "Bičiulio %s pridėti nepavyko dėl nežinamos priežasties."

-

-#, c-format

-msgid ""

-"The user %s has given you permission to add him or her to your buddy list.  "

-"Do you want to add this user?"

-msgstr ""

-"Naudotojas %s suteikė Jums teisę pridėti jį į savo bičiulių sąrašą.  Ar "

-"norite tai padaryti?"

-

-msgid "Authorization Given"

-msgstr "Suteikta prieigos teisė"

-

-#. Granted

-#, c-format

-msgid "The user %s has granted your request to add them to your buddy list."

-msgstr ""

-"Vartotojas %s patenkino Jūsų prašymą įtrauktį jį į Jūsų bičiulių sarašą."

-

-msgid "Authorization Granted"

-msgstr "Suteikta prieigos teisė"

-

-#. Denied

-#, c-format

-msgid ""

-"The user %s has denied your request to add them to your buddy list for the "

-"following reason:\n"

-"%s"

-msgstr ""

-"Vartotojas %s atmetė Jūsų prašymą įtraukti jį į Jūsų bičiulių sąrašą dėl "

-"šios priežasties:\n"

-"%s"

-

-msgid "Authorization Denied"

-msgstr "Nesuteikta prieigos teisė"

-

-msgid "_Exchange:"

-msgstr "Kom_utatorius:"

-

-msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."

-msgstr ""

-"Jūsų IM vaizdas nebuvo nusiųstas. Jūs negalite siųsti IM vaizdų AIM "

-"pokalbiuose."

-

-msgid "iTunes Music Store Link"

-msgstr "Muzikos parduotuvės „iTunes“ nuoroda"

-

-#, c-format

-msgid "Buddy Comment for %s"

-msgstr "Bičiulio komentaras apie %s"

-

-msgid "Buddy Comment:"

-msgstr "Bičiulio komentaras:"

-

-#, c-format

-msgid "You have selected to open a Direct IM connection with %s."

-msgstr "Jūs pasirinkote sukurti tiesioginį ryšį su %s."

-

-msgid ""

-"Because this reveals your IP address, it may be considered a security risk.  "

-"Do you wish to continue?"

-msgstr ""

-"Kadangi tai atskleidžia Jūsų IP adresą, tai gali būti pavojus saugumui.  Ar "

-"norite tęsti?"

-

-msgid "C_onnect"

-msgstr "_Jungtis"

-

-msgid "Get AIM Info"

-msgstr "Gauti AIM informaciją"

-

-#. We only do this if the user is in our buddy list

-msgid "Edit Buddy Comment"

-msgstr "Redaguoti bičiulio komentarą"

-

-msgid "Get Status Msg"

-msgstr "Gauti būsenos pranešimą"

-

-msgid "Direct IM"

-msgstr "Tiesioginis ryšys"

-

-msgid "Re-request Authorization"

-msgstr "Iš naujo paprašyti prieigos teisės"

-

-msgid "Require authorization"

-msgstr "Būtina prieigos teisė"

-

-msgid "Web aware (enabling this will cause you to receive SPAM!)"

-msgstr ""

-"Pasiekiamas per žiniatinklį (angl. web aware).  Parinkties aktyvavimas gali "

-"tapti šlamšto gavimo priežastimi!"

-

-msgid "ICQ Privacy Options"

-msgstr "ICQ privatumo parinktys"

-

-msgid "The new formatting is invalid."

-msgstr "Nauja formato informacija yra neteisinga."

-

-msgid "Username formatting can change only capitalization and whitespace."

-msgstr ""

-"Naudotojo vardo formatavimas gali pakeisti tik keitimą didžiosiomis raidėmis "

-"ir matomus tarpus."

-

-msgid "Change Address To:"

-msgstr "Pakeisti adresą į:"

-

-msgid "<i>you are not waiting for authorization</i>"

-msgstr "<i>jūs nelaukiate prieigos suteikimo</i>"

-

-msgid "You are awaiting authorization from the following buddies"

-msgstr "Jūs laukiate prieigos suteikimo iš šių bičiulių"

-

-msgid ""

-"You can re-request authorization from these buddies by right-clicking on "

-"them and selecting \"Re-request Authorization.\""

-msgstr ""

-"Jūs galite iš naujo paprašyti prieigos suteikimo iš šių bičiulių "

-"spragtelėdamas dešiniuoju klavišu ant jų ir pasirinkdamas „Iš naujo "

-"paprašyti prieigos teisės“."

-

-msgid "Find Buddy by Email"

-msgstr "Surasti bičiulį pagal el. pašto adresą"

-

-msgid "Search for a buddy by email address"

-msgstr "Ieškoti bičiulio pagal el. pašto adresą"

-

-msgid "Type the email address of the buddy you are searching for."

-msgstr "Įveskite bičiulio, kurio ieškote, el. pašto adresą."

-

-msgid "_Search"

-msgstr "_Ieškoti"

-

-msgid "Set User Info (web)..."

-msgstr "Nustatyti naudotojo informaciją (žiniatinklis)..."

-

-msgid "Change Password (web)"

-msgstr "Pakeisti slaptažodį (žiniatinklis)..."

-

-msgid "Configure IM Forwarding (web)"

-msgstr "Konfigūruoti žinučių persiuntimą (žiniatinklis)..."

-

-#. ICQ actions

-msgid "Set Privacy Options..."

-msgstr "Nustatyti privatumo parinktis..."

-

-#. AIM actions

-msgid "Confirm Account"

-msgstr "Patvirtinti abonentą"

-

-msgid "Display Currently Registered Email Address"

-msgstr "Parodyti šiuo metu registruotą el. pašto adresą"

-

-msgid "Change Currently Registered Email Address..."

-msgstr "Pakeisti šiuo metu registruotą el. pašto adresą..."

-

-msgid "Show Buddies Awaiting Authorization"

-msgstr "Parodyti bičiulius, laukiančius prieigos suteikimo"

-

-msgid "Search for Buddy by Email Address..."

-msgstr "Ieškoti bičiulio pagal el. pašto adresą..."

-

-msgid "Search for Buddy by Information"

-msgstr "Ieškoti bičiulio pagal informaciją"

-

-msgid ""

-"Always use AIM/ICQ proxy server for\n"

-"file transfers and direct IM (slower,\n"

-"but does not reveal your IP address)"

-msgstr ""

-"Visada naudoti ICQ tarpininkaujantį serverį failų perdavimams ir "

-"tiesioginiam bendravimui (lėčiau, bet neatskleidžia Jūsų IP adreso.)"

-

-msgid "Allow multiple simultaneous logins"

-msgstr "Leisti kelis prisijungimus vienu metu"

-

-#, c-format

-msgid "Asking %s to connect to us at %s:%hu for Direct IM."

-msgstr "Prašoma %s prisijungti prie mūsų tiesioginiu ryšiu adresu %s:%hu."

-

-#, c-format

-msgid "Attempting to connect to %s:%hu."

-msgstr "Bandoma prisijungti prie %s:%hu."

-

-msgid "Attempting to connect via proxy server."

-msgstr "Bandoma jungtis per tarpininką serverį."

-

-#, c-format

-msgid "%s has just asked to directly connect to %s"

-msgstr "%s ką tik paprašė tiesiogiai prisijungti prie %s"

-

-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 ""

-"Tai reikalauja tiesioginės jungties tarp dviejų kompiuterių ir yra būtina IM "

-"vaizdams.  Kadangi Jūsų IP adresas bus atskleistas, tai gali būti privatumo "

-"rizika."

-

-msgid "Aquarius"

-msgstr "Vandenis"

-

-msgid "Pisces"

-msgstr "Žuvys"

-

-msgid "Aries"

-msgstr "Avinas"

-

-msgid "Taurus"

-msgstr "Jautis"

-

-msgid "Gemini"

-msgstr "Dvyniai"

-

-msgid "Cancer"

-msgstr "Vėžys"

-

-msgid "Leo"

-msgstr "Liūtas"

-

-msgid "Virgo"

-msgstr "Mergelė"

-

-msgid "Libra"

-msgstr "Svarstyklės"

-

-msgid "Scorpio"

-msgstr "Skorpionas"

-

-msgid "Sagittarius"

-msgstr "Šaulys"

-

-msgid "Capricorn"

-msgstr "Ožiaragis"

-

-msgid "Rat"

-msgstr "Žiurkė"

-

-msgid "Ox"

-msgstr "Jautis"

-

-msgid "Tiger"

-msgstr "Tigras"

-

-msgid "Rabbit"

-msgstr "Triušis"

-

-msgid "Dragon"

-msgstr "Drakonas"

-

-msgid "Snake"

-msgstr "Gyvatė"

-

-msgid "Horse"

-msgstr "Arklys"

-

-msgid "Goat"

-msgstr "Ožys"

-

-msgid "Monkey"

-msgstr "Beždžionė"

-

-msgid "Rooster"

-msgstr "Gaidys"

-

-msgid "Dog"

-msgstr "Šuo"

-

-msgid "Pig"

-msgstr "Kiaulė"

-

-msgid "Other"

-msgstr "Kitas"

-

-msgid "Visible"

-msgstr "Matomas"

-

-msgid "Friend Only"

-msgstr "Tik draugams"

-

-msgid "Private"

-msgstr "Privatus"

-

-msgid "QQ Number"

-msgstr "QQ numeris"

-

-#  Country

-msgid "Country/Region"

-msgstr "Šalis ar regionas"

-

-msgid "Province/State"

-msgstr "Provincija ar valstija"

-

-msgid "Zipcode"

-msgstr "Pašto kodas"

-

-msgid "Phone Number"

-msgstr "Telefonas"

-

-msgid "Authorize adding"

-msgstr "Leisti pridėjimą"

-

-msgid "Cellphone Number"

-msgstr "Mobilus telefonas"

-

-msgid "Personal Introduction"

-msgstr "Asmeninis prisistatymas"

-

-msgid "City/Area"

-msgstr "Miestas/vietovė"

-

-msgid "Publish Mobile"

-msgstr "Skelbti mobilaus telefono numerį"

-

-msgid "Publish Contact"

-msgstr "Skelbti kontaktą"

-

-msgid "College"

-msgstr "Koledžas"

-

-msgid "Horoscope"

-msgstr "Horoskopas"

-

-msgid "Zodiac"

-msgstr "Zodiako ženklas"

-

-#  Block button

-msgid "Blood"

-msgstr "Kraujas"

-

-# True ir False išversti buddy_info kontekste

-msgid "True"

-msgstr "Taip"

-

-msgid "False"

-msgstr "Ne"

-

-msgid "Modify Contact"

-msgstr "Redaguoti kontaktą"

-

-msgid "Modify Address"

-msgstr "Redaguoti adresą"

-

-msgid "Modify Extended Information"

-msgstr "Redaguoti išplėstinę informaciją"

-

-msgid "Modify Information"

-msgstr "Keisti informaciją"

-

-msgid "Update"

-msgstr "Atnaujinti"

-

-msgid "Could not change buddy information."

-msgstr "Nepavyko pakeisti bičiulio informacijos."

-

-#, c-format

-msgid "%u requires verification"

-msgstr "%u reikalauja patikrinimo"

-

-msgid "Add buddy question"

-msgstr "Pridėti klausimą bičiuliui"

-

-msgid "Enter answer here"

-msgstr "Čia įveskite atsakymą"

-

-#  Build the Send As menu

-msgid "Send"

-msgstr "Siųsti"

-

-msgid "Invalid answer."

-msgstr "Atsakymas neteisingas."

-

-msgid "Authorization denied message:"

-msgstr "Prieigos teisės nesuteikimo žinutė:"

-

-msgid "Sorry, you're not my style."

-msgstr "Atleisk, tu ne mano tipo."

-

-#, c-format

-msgid "%u needs authorization"

-msgstr "%u reikia leidimo pridėti"

-

-msgid "Add buddy authorize"

-msgstr "Leidimas pridėti bičiulį"

-

-msgid "Enter request here"

-msgstr "Čia įveskite prašymą"

-

-msgid "Would you be my friend?"

-msgstr "Ar draugausi su manimi?"

-

-msgid "QQ Buddy"

-msgstr "QQ bičiulis"

-

-msgid "Add buddy"

-msgstr "Pridėti bičiulį"

-

-msgid "Invalid QQ Number"

-msgstr "Neteisingas QQ numeris"

-

-msgid "Failed sending authorize"

-msgstr "Nepavyko išsiųsti leidimo prašymo"

-

-#, c-format

-msgid "Failed removing buddy %u"

-msgstr "Nepavyko pašalinti bičiulio %u"

-

-#, c-format

-msgid "Failed removing me from %d's buddy list"

-msgstr "Nepavyko pašalinti savęs iš %d bičiulių sąrašo"

-

-msgid "No reason given"

-msgstr "Priežastis nenurodyta"

-

-#. only need to get value

-#, c-format

-msgid "You have been added by %s"

-msgstr "Jus prisidėjo %s"

-

-msgid "Would you like to add him?"

-msgstr "Ar norite jį prisidėti?"

-

-#, c-format

-msgid "Rejected by %s"

-msgstr "Atmesta %s"

-

-#, c-format

-msgid "Message: %s"

-msgstr "Žinutė: %s"

-

-msgid "ID: "

-msgstr "ID: "

-

-msgid "Group ID"

-msgstr "Grupės ID"

-

-msgid "QQ Qun"

-msgstr "QQ Qun"

-

-msgid "Please enter Qun number"

-msgstr "Įveskite QQ pokalbių kambario numerį"

-

-msgid "You can only search for permanent Qun\n"

-msgstr "Galite ieškoti tik pastovių QQ kambarių\n"

-

-msgid "(Invalid UTF-8 string)"

-msgstr "(Neteisinga UTF-8 eilutė)"

-

-msgid "Not member"

-msgstr "Ne narys"

-

-msgid "Member"

-msgstr "Narys"

-

-msgid "Requesting"

-msgstr "Prašoma"

-

-msgid "Admin"

-msgstr "Administratorius"

-

-msgid "Notice"

-msgstr "Pastaba"

-

-msgid "Detail"

-msgstr "Išsamiau"

-

-msgid "Creator"

-msgstr "Kūrėjas"

-

-msgid "About me"

-msgstr "Apie mane"

-

-msgid "Category"

-msgstr "Kategorija"

-

-msgid "The Qun does not allow others to join"

-msgstr "Šis QQ pokalbių kambarys neleidžia prisijungti pašaliniams"

-

-msgid "Join QQ Qun"

-msgstr "Prisijungti prie QQ pokalbių kambario"

-

-msgid "Input request here"

-msgstr "Įveskite prašymą čia"

-

-#, c-format

-msgid "Successfully joined Qun %s (%u)"

-msgstr "Sėkmingai prisijungta prie QQ pokalbių kambario %s (%u)"

-

-msgid "Successfully joined Qun"

-msgstr "Sėkmingai prisijungta prie QQ pokalbių kambario"

-

-#, c-format

-msgid "Qun %u denied from joining"

-msgstr "QQ pokalbių kambarys %u neleido prisijungti"

-

-msgid "QQ Qun Operation"

-msgstr "Operacija su QQ pokalbių kambariu"

-

-msgid "Failed:"

-msgstr "Nepavyko:"

-

-msgid "Join Qun, Unknown Reply"

-msgstr "Prisijungimas prie QQ pokalbių kambario, atsakymas nežinomas"

-

-msgid "Quit Qun"

-msgstr "Palikti QQ pokalbių kambarį"

-

-msgid ""

-"Note, if you are the creator, \n"

-"this operation will eventually remove this Qun."

-msgstr ""

-"Jeigu esate grupės sukūrėjas, ši operacija galiausiai pašalins šį pokalbių "

-"kambarį."

-

-msgid "Sorry, you are not our style"

-msgstr "Atleisk, tu ne mano tipo"

-

-msgid "Successfully changed Qun members"

-msgstr "Sėkmingai pakoregavote QQ pokalbių kambario narius"

-

-msgid "Successfully changed Qun information"

-msgstr "Sėkmingai pakeitėte QQ pokalbių kambario informaciją"

-

-msgid "You have successfully created a Qun"

-msgstr "Jūs sėkmingai sukūrėte pokalbių kambarį"

-

-msgid "Would you like to set up detailed information now?"

-msgstr "Ar norėtumėte nustatyti išsamesnę informaciją dabar?"

-

-msgid "Setup"

-msgstr "Nustatyti"

-

-#, c-format

-msgid "%u requested to join Qun %u for %s"

-msgstr "%u paprašė būti įleistas į QQ pokalbių kambarį %u dėl %s"

-

-#, c-format

-msgid "%u request to join Qun %u"

-msgstr "%u paprašė būti įleistas į QQ pokalbių kambarį %u"

-

-#, c-format

-msgid "Failed to join Qun %u, operated by admin %u"

-msgstr ""

-"Nepavyko prisijungti prie QQ pokalbių kambario %u, kurį administruoja %u"

-

-#, c-format

-msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"

-msgstr ""

-"<b>Prisijungimas prie QQ pokalbių kambario %u patvirtintas administratoriaus "

-"%u vartotojui %s</b>"

-

-#, c-format

-msgid "<b>Removed buddy %u.</b>"

-msgstr "<b>Pašalintas bičiulis %u.</b>"

-

-#, c-format

-msgid "<b>New buddy %u joined.</b>"

-msgstr "<b>Naujas bičiulis %u prisijungė.</b>"

-

-#, c-format

-msgid "Unknown-%d"

-msgstr "Nežinomas: %d"

-

-msgid "Level"

-msgstr "Lygis"

-

-msgid " VIP"

-msgstr " VIP"

-

-msgid " TCP"

-msgstr " TCP"

-

-msgid " FromMobile"

-msgstr " „FromMobile“"

-

-msgid " BindMobile"

-msgstr " „BindMobile“"

-

-msgid " Video"

-msgstr " Vaizdas"

-

-msgid " Zone"

-msgstr " Zona"

-

-msgid "Flag"

-msgstr "Vėliava"

-

-msgid "Ver"

-msgstr "Versija"

-

-msgid "Invalid name"

-msgstr "Neteisingas vardas"

-

-msgid "Select icon..."

-msgstr "Pasirinkite piktogramą..."

-

-#, c-format

-msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"

-msgstr "<b>Prisijungimo laikas</b>: %d-%d-%d, %d:%d:%d<br>\n"

-

-#, c-format

-msgid "<b>Total Online Buddies</b>: %d<br>\n"

-msgstr "<b>Iš viso prisijungusių bičiulių</b>: %d<br>\n"

-

-#, c-format

-msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"

-msgstr "<b>Paskutinis atnaujinimas</b>: %d-%d-%d, %d:%d:%d<br>\n"

-

-#, c-format

-msgid "<b>Server</b>: %s<br>\n"

-msgstr "<b>Serveris</b>: %s<br>\n"

-

-#, c-format

-msgid "<b>Client Tag</b>: %s<br>\n"

-msgstr "<b>Kliento žymė</b>: %s<br>\n"

-

-#, c-format

-msgid "<b>Connection Mode</b>: %s<br>\n"

-msgstr "<b>Jungties režimas</b>: %s<br>\n"

-

-#, c-format

-msgid "<b>My Internet IP</b>: %s:%d<br>\n"

-msgstr "<b>Mano internetinis adresas</b>: %s:%d<br>\n"

-

-#, c-format

-msgid "<b>Sent</b>: %lu<br>\n"

-msgstr "<b>Išsiųsta</b>: %lu<br>\n"

-

-#, c-format

-msgid "<b>Resend</b>: %lu<br>\n"

-msgstr "<b>Persiųsta</b>: %lu<br>\n"

-

-#, c-format

-msgid "<b>Lost</b>: %lu<br>\n"

-msgstr "<b>Prarasta</b>: %lu<br>\n"

-

-#, c-format

-msgid "<b>Received</b>: %lu<br>\n"

-msgstr "<b>Gauta</b>: %lu<br>\n"

-

-#, c-format

-msgid "<b>Received Duplicate</b>: %lu<br>\n"

-msgstr "<b>Gauta po kelis kartus</b>: %lu<br>\n"

-

-#, c-format

-msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"

-msgstr "<b>Laikas</b>: %d-%d-%d, %d:%d:%d<br>\n"

-

-#, c-format

-msgid "<b>IP</b>: %s<br>\n"

-msgstr "<b>IP</b>: %s<br>\n"

-

-msgid "Login Information"

-msgstr "Prisijungimo informacija"

-

-msgid "<p><b>Original Author</b>:<br>\n"

-msgstr "<p><b>Pirmasis autorius</b>:<br>\n"

-

-msgid "<p><b>Code Contributors</b>:<br>\n"

-msgstr "<p><b>Prie programavimo prisidėjo</b>:<br>\n"

-

-msgid "<p><b>Lovely Patch Writers</b>:<br>\n"

-msgstr "<p><b>Mieli pataisų rašytojai</b>:<br>\n"

-

-msgid "<p><b>Acknowledgement</b>:<br>\n"

-msgstr "<p><b>Padėkos</b>:<br>\n"

-

-msgid "<p><i>And, all the boys in the backroom...</i><br>\n"

-msgstr ""

-"<p><i>Ir visi kiti mažiau žinomi, bet ne mažiau svarbūs vaikinai...</i><br>\n"

-

-msgid "<i>Feel free to join us!</i> :)"

-msgstr "<i>Prašom prisijungti prie mūsų!</i> :)"

-

-#, c-format

-msgid "About OpenQ %s"

-msgstr "Apie OpenQ %s"

-

-msgid "Change Icon"

-msgstr "Pakeisti paveiksliuką"

-

-msgid "Change Password"

-msgstr "Pakeisti slaptažodį"

-

-msgid "Account Information"

-msgstr "Paskyro informacija"

-

-msgid "Update all QQ Quns"

-msgstr "Atnaujinti visus QQ pokalbių kambarius"

-

-msgid "About OpenQ"

-msgstr "Apie OpenQ"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#  *< name

-#  *< version

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "QQ Protocol Plugin"

-msgstr "QQ protokolo papildinys"

-

-msgid "Auto"

-msgstr "Automatiškai"

-

-msgid "Select Server"

-msgstr "Pasirinkite serverį"

-

-msgid "QQ2005"

-msgstr "QQ2005"

-

-msgid "QQ2007"

-msgstr "QQ2007"

-

-msgid "QQ2008"

-msgstr "QQ2008"

-

-msgid "Connect by TCP"

-msgstr "Prisijungti naudojant TCP"

-

-msgid "Show server notice"

-msgstr "Rodyti serverio žinutę"

-

-msgid "Show server news"

-msgstr "Rodyti serverio naujienas"

-

-msgid "Show chat room when msg comes"

-msgstr "Atėjus žinutei parodyti pokalbių kambarį"

-

-msgid "Keep alive interval (seconds)"

-msgstr "Jungties palaikymo intervalas (sekundėmis)"

-

-msgid "Update interval (seconds)"

-msgstr "Atnaujinimo intervalas (sekundėmis)"

-

-msgid "Cannot decrypt server reply"

-msgstr "Nepavyko iššifruoti serverio atsakymo"

-

-#, c-format

-msgid "Failed requesting token, 0x%02X"

-msgstr "Nepavyko gauti žetono, 0x%02X"

-

-#, c-format

-msgid "Invalid token len, %d"

-msgstr "Neteisingas žymės ilgis %d"

-

-#. extend redirect used in QQ2006

-msgid "Redirect_EX is not currently supported"

-msgstr "„Redirect_EX“ šiuo metu nepalaikoma"

-

-#. need activation

-#. need activation

-#. need activation

-msgid "Activation required"

-msgstr "Būtinas aktyvavimas"

-

-#, c-format

-msgid "Unknown reply code when logging in (0x%02X)"

-msgstr "Nežinomas atsakymo kodas prisijungimo metu (0x%02X)"

-

-msgid "Could not decrypt server reply"

-msgstr "Nepavyko iššifruoti serverio atsakymo"

-

-msgid "Requesting captcha"

-msgstr "Prašoma „captcha“"

-

-msgid "Checking captcha"

-msgstr "Tikrinama „captcha“"

-

-msgid "Failed captcha verification"

-msgstr "Nepavyko „captcha“ patikrinimas"

-

-msgid "Captcha Image"

-msgstr "„Captcha“ paveiksliukas"

-

-msgid "Enter code"

-msgstr "Įveskite kodą"

-

-msgid "QQ Captcha Verification"

-msgstr "QQ „captcha“ patikrinimas"

-

-msgid "Enter the text from the image"

-msgstr "Įveskite tekstą iš paveiksliuko"

-

-#, c-format

-msgid "Unknown reply when checking password (0x%02X)"

-msgstr "Nežinomas atsakymas tikrinant slaptažodį (0x%02X)"

-

-#, c-format

-msgid ""

-"Unknown reply code when logging in (0x%02X):\n"

-"%s"

-msgstr ""

-"Neteisingas atsakymo kodas prisijungimo metu (0x%02X):\n"

-"%s"

-

-#. we didn't successfully connect. tdt->toc_fd is valid here

-msgid "Unable to connect."

-msgstr "Nepavyko prisijungti."

-

-msgid "Socket error"

-msgstr "Jungties klaida"

-

-msgid "Unable to read from socket"

-msgstr "Nepavyko skaityti iš jungties"

-

-msgid "Write Error"

-msgstr "Rašymo klaida"

-

-msgid "Connection lost"

-msgstr "Prisijungimas prarastas"

-

-msgid "Getting server"

-msgstr "Gaunamas serveris"

-

-msgid "Requesting token"

-msgstr "Prašoma žymės"

-

-msgid "Couldn't resolve host"

-msgstr "Nepavyko nustatyti mazgo IP adreso"

-

-msgid "Invalid server or port"

-msgstr "Neteisingas serveris ar prievadas"

-

-msgid "Connecting to server"

-msgstr "Jungiamasi prie serverio"

-

-msgid "QQ Error"

-msgstr "QQ klaida"

-

-#, c-format

-msgid ""

-"Server News:\n"

-"%s\n"

-"%s\n"

-"%s"

-msgstr ""

-"Serverio naujienos:\n"

-"%s\n"

-"%s\n"

-"%s"

-

-#, c-format

-msgid "%s:%s"

-msgstr "%s:%s"

-

-#, c-format

-msgid "From %s:"

-msgstr "Nuo %s:"

-

-#, c-format

-msgid ""

-"Server notice From %s: \n"

-"%s"

-msgstr ""

-"Serverio žinutė iš %s: \n"

-"%s"

-

-msgid "Unknown SERVER CMD"

-msgstr "Nežinoma „SERVER CMD“"

-

-#, c-format

-msgid ""

-"Error reply of %s(0x%02X)\n"

-"Room %u, reply 0x%02X"

-msgstr ""

-"Klaidos atsakymas iš %s(0x%02X)\n"

-"Kambarys %u, atsakymas 0x%02X"

-

-msgid "QQ Qun Command"

-msgstr "QQ pokalbių kambario komanda"

-

-msgid "Could not decrypt login reply"

-msgstr "Nepavyko iššifruoti prisijungimo atsakymo"

-

-msgid "Unknown LOGIN CMD"

-msgstr "Nežinoma „LOGIN CMD“"

-

-msgid "Unknown CLIENT CMD"

-msgstr "Nežinoma „CLIENT CMD“"

-

-#, c-format

-msgid "%d has declined the file %s"

-msgstr "%d atmetė failą %s"

-

-msgid "File Send"

-msgstr "Failo siuntimas"

-

-#, c-format

-msgid "%d canceled the transfer of %s"

-msgstr "%d nutraukė %s perdavimą"

-

-msgid "Connection closed (writing)"

-msgstr "Jungtis uždaryta (rašoma)"

-

-#, c-format

-msgid "<b>Group Title:</b> %s<br>"

-msgstr "<b>Grupės pavadinimas:</b> %s<br>"

-

-#, c-format

-msgid "<b>Notes Group ID:</b> %s<br>"

-msgstr "<b>„Notes“ grupės identifikatorius:</b> %s<br>"

-

-#, c-format

-msgid "Info for Group %s"

-msgstr "Informacija apie grupę %s"

-

-msgid "Notes Address Book Information"

-msgstr "„Notes“ adresų knygos informacija"

-

-msgid "Invite Group to Conference..."

-msgstr "Pakviesti grupę į konferenciją..."

-

-msgid "Get Notes Address Book Info"

-msgstr "Gauti „Notes“ adresų knygos informaciją"

-

-msgid "Sending Handshake"

-msgstr "Siunčiamas pasisveikinimas"

-

-msgid "Waiting for Handshake Acknowledgement"

-msgstr "Laukiama pasisveikinimo patvirtinimo"

-

-msgid "Handshake Acknowledged, Sending Login"

-msgstr "Pasisveikinimas patvirtintas, siunčiama prisijungimo informacija"

-

-msgid "Waiting for Login Acknowledgement"

-msgstr "Laukiama prisijungimo patvirtinimo"

-

-msgid "Login Redirected"

-msgstr "Prisijungimas nukreiptas kitur"

-

-msgid "Forcing Login"

-msgstr "Jungiamasi"

-

-msgid "Login Acknowledged"

-msgstr "Prisijungimas patvirtintas"

-

-msgid "Starting Services"

-msgstr "Paleidžiami servisai"

-

-#, c-format

-msgid ""

-"A Sametime administrator has issued the following announcement on server %s"

-msgstr "„Sametime“ administratoriaus skelbimas serveryje %s"

-

-msgid "Sametime Administrator Announcement"

-msgstr "„Sametime“ administratoriaus skelbimas"

-

-msgid "Connection reset"

-msgstr "Jungtis atidaryta iš naujo"

-

-#, c-format

-msgid "Error reading from socket: %s"

-msgstr "Skaitymo iš jungties klaida: %s"

-

-#. this is a regular connect, error out

-msgid "Unable to connect to host"

-msgstr "Nepavyko prisijungti prie mazgo"

-

-#, c-format

-msgid "Announcement from %s"

-msgstr "Abonento %s skelbimas"

-

-msgid "Conference Closed"

-msgstr "Konferencija uždaryta"

-

-#  Data is assumed to be the destination sn

-msgid "Unable to send message: "

-msgstr "Negalima išsiųsti žinutės: "

-

-msgid "Place Closed"

-msgstr "Vieta uždaryta"

-

-msgid "Microphone"

-msgstr "Mikrofonas"

-

-msgid "Speakers"

-msgstr "Garsiakalbiai"

-

-msgid "Video Camera"

-msgstr "Videokamera"

-

-msgid "Supports"

-msgstr "Palaiko"

-

-msgid "External User"

-msgstr "Išorinis vartotoajs"

-

-msgid "Create conference with user"

-msgstr "Sukurti konferenciją su vartotoju"

-

-#, c-format

-msgid ""

-"Please enter a topic for the new conference, and an invitation message to be "

-"sent to %s"

-msgstr "Įveskite naujos konferencijos temą ir pakvietimo žinutę vartotojui %s"

-

-msgid "New Conference"

-msgstr "Nauja konferencija"

-

-msgid "Create"

-msgstr "Sukurti"

-

-msgid "Available Conferences"

-msgstr "Esamos konferencijos"

-

-msgid "Create New Conference..."

-msgstr "Sukurti naują konferenciją..."

-

-msgid "Invite user to a conference"

-msgstr "Pakviesti vartotoją į konferenciją"

-

-#, c-format

-msgid ""

-"Select a conference from the list below to send an invite to user %s. Select "

-"\"Create New Conference\" if you'd like to create a new conference to invite "

-"this user to."

-msgstr ""

-"Pasirinkite konferenciją iš sąrašo žemiau, į kurią kviesite vartotoją %s.  "

-"Pasirinkite „Sukurti naują konferenciją“, jei norite sukurti naują "

-"konfereciją ir į ją pakviesti šį vartotoją."

-

-msgid "Invite to Conference"

-msgstr "Pakviesti į konferenciją"

-

-msgid "Invite to Conference..."

-msgstr "Pakviesti į konferenciją..."

-

-msgid "Send TEST Announcement"

-msgstr "Nusiųsti „TEST“ skelbimą"

-

-msgid "Topic:"

-msgstr "Tema:"

-

-msgid "No Sametime Community Server specified"

-msgstr "Nenurodytas „Sametime“ bendruomenės serveris"

-

-#, c-format

-msgid ""

-"No host or IP address has been configured for the Meanwhile account %s. "

-"Please enter one below to continue logging in."

-msgstr ""

-"Nenustatytas mazgo vardas ar IP adresas „Meanwhile“ paskyrai %s.  Įveskite "

-"vieną iš jų žemiau, jei norite pradėti seansą."

-

-msgid "Meanwhile Connection Setup"

-msgstr "„Meanwhile“ jungties sąranka"

-

-msgid "No Sametime Community Server Specified"

-msgstr "Nenurodytas „Sametime“ bendruomenės serveris"

-

-msgid "Connect"

-msgstr "Jungtis"

-

-#, c-format

-msgid "Unknown (0x%04x)<br>"

-msgstr "Nežinomas (0x%04x)<br>"

-

-msgid "Last Known Client"

-msgstr "Paskutinis žinomas klientas"

-

-msgid "User Name"

-msgstr "Vartotojo vardas"

-

-msgid "Sametime ID"

-msgstr "„Sametime“ identifikatorius"

-

-msgid "An ambiguous user ID was entered"

-msgstr "Įvestas nevienareikšmiškas vartotojo identifikatorius"

-

-#, c-format

-msgid ""

-"The identifier '%s' may possibly refer to any of the following users. Please "

-"select the correct user from the list below to add them to your buddy list."

-msgstr ""

-"Rastas daugiau nei vienas vartotojas su tokiu pačiu identifikatoriumi „%s“.  "

-"Pasirinkite norimą vartotoją iš žemiau esančio sąrašo, kuris bus įtrauktas į "

-"bičiulių sąrašą."

-

-msgid "Select User"

-msgstr "Pasirinkite vartotoją"

-

-msgid "Unable to add user: user not found"

-msgstr "Negalima pridėti vartotojo: jis nerastas"

-

-#, c-format

-msgid ""

-"The identifier '%s' did not match any users in your Sametime community. This "

-"entry has been removed from your buddy list."

-msgstr ""

-"Identifikatorius „%s“ neatitiko jokių vartotojų Jūsų „Sametime“ "

-"bendruomenėje.  Šis įrašas pašalintas iš Jūsų bičiulių sąrašo."

-

-#, c-format

-msgid ""

-"Error reading file %s: \n"

-"%s\n"

-msgstr ""

-"Failo %s skaitymo klaida:\n"

-"%s\n"

-

-msgid "Remotely Stored Buddy List"

-msgstr "Nutolusiai saugomas bičiulių sąrašas"

-

-msgid "Buddy List Storage Mode"

-msgstr "Bičiulių sąrašo saugojimo būdas"

-

-msgid "Local Buddy List Only"

-msgstr "Tik vietinis bičiulių sąrašas"

-

-msgid "Merge List from Server"

-msgstr "Prijungti sąrašą iš serverio"

-

-msgid "Merge and Save List to Server"

-msgstr "Prijungti ir išsaugoti sąrašą serveryje"

-

-msgid "Synchronize List with Server"

-msgstr "Suvienodinti sąrašą su serveriu"

-

-#, c-format

-msgid "Import Sametime List for Account %s"

-msgstr "Importuoti „Sametime“ sąrašą paskyrai %s"

-

-#, c-format

-msgid "Export Sametime List for Account %s"

-msgstr "Eksportuoti „Sametime“ sąrašą paskyrai %s"

-

-msgid "Unable to add group: group exists"

-msgstr "Nepavyko pridėti grupės: ji jau yra"

-

-#, c-format

-msgid "A group named '%s' already exists in your buddy list."

-msgstr "Grupė pavadinimu „%s“ jau yra Jūsų bičiulių sąraše."

-

-msgid "Unable to add group"

-msgstr "Nepavyko pridėti grupės"

-

-msgid "Possible Matches"

-msgstr "Galimi variantai"

-

-msgid "Notes Address Book group results"

-msgstr "Grupės iš „Notes“ adresų knygos"

-

-#, c-format

-msgid ""

-"The identifier '%s' may possibly refer to any of the following Notes Address "

-"Book groups. Please select the correct group from the list below to add it "

-"to your buddy list."

-msgstr ""

-"Identifikatorius „%s“ gali nurodyti bet kurią iš žemiau esančių „Notes“ "

-"adresų knygos grupių. Pasirinkite iš žemiau esančio sąrašo grupę, kurią "

-"norite įtraukti į savo bičiulių sąrašą."

-

-msgid "Select Notes Address Book"

-msgstr "Pasirinkite „Notes“ adresų knygos grupę"

-

-msgid "Unable to add group: group not found"

-msgstr "Negalima pridėti grupės: ji nerasta"

-

-#, c-format

-msgid ""

-"The identifier '%s' did not match any Notes Address Book groups in your "

-"Sametime community."

-msgstr ""

-"Identifikatorius „%s“ neatitiko jokių „Notes“ adresų knygos grupių Jūsų "

-"„Sametime“ bendruomenėje."

-

-msgid "Notes Address Book Group"

-msgstr "„Notes“ adresų knygos grupė"

-

-msgid ""

-"Enter the name of a Notes Address Book group in the field below to add the "

-"group and its members to your buddy list."

-msgstr ""

-"Įveskite „Notes“ adresų knygos grupės pavadinimą žemiau esančiame lauke, kad "

-"pridėtumėte grupę ir jos narius į savo bičiulių sąrašą."

-

-#, c-format

-msgid "Search results for '%s'"

-msgstr "„%s“ paieškos rezultatai"

-

-#, c-format

-msgid ""

-"The identifier '%s' may possibly refer to any of the following users. You "

-"may add these users to your buddy list or send them messages with the action "

-"buttons below."

-msgstr ""

-"Identifikatorius „%s“ gali nurodyti bet kurį iš žemiau esančių vartotojų.  "

-"Galite įtraukti šiuos vartotojus į savo bičiulių sąrašą arba nusiųsti jiems "

-"žinutes žemiau esančių mygtukų pagalba."

-

-msgid "Search Results"

-msgstr "Paieškos rezultatai"

-

-msgid "No matches"

-msgstr "Nėra atitikimų"

-

-#, c-format

-msgid "The identifier '%s' did not match any users in your Sametime community."

-msgstr ""

-"Identifikatorius „%s“ neatitiko jokių vartotojų Jūsų „Sametime“ "

-"bendruomenėje."

-

-msgid "No Matches"

-msgstr "Nėra atitikimų"

-

-msgid "Search for a user"

-msgstr "Ieškoti vartotojo"

-

-msgid ""

-"Enter a name or partial ID in the field below to search for matching users "

-"in your Sametime community."

-msgstr ""

-"Įveskite vardą ar identifikatoriaus dalį žemiau esančiame lauke, kad "

-"ieškotumėte atitinkančių vartotojų Jūsų „Sametime“ bendruomenėje."

-

-msgid "User Search"

-msgstr "Vartotojų paieška"

-

-msgid "Import Sametime List..."

-msgstr "Importuoti „Sametime“ sąrašą..."

-

-msgid "Export Sametime List..."

-msgstr "Eksportuoti „Sametime“ sąrašą..."

-

-msgid "Add Notes Address Book Group..."

-msgstr "Pridėti „Notes“ adresų knygos grupę..."

-

-msgid "User Search..."

-msgstr "Ieškoti vartotojų..."

-

-msgid "Force login (ignore server redirects)"

-msgstr "Jungtis priverstinai (ignoruoti serverio nukreipimus kitur)"

-

-#. pretend to be Sametime Connect

-msgid "Hide client identity"

-msgstr "Slėpti kliento tapatybę"

-

-#, c-format

-msgid "User %s is not present in the network"

-msgstr "Vartotojo %s nėra tinkle"

-

-msgid "Key Agreement"

-msgstr "Susitarimas dėl raktų"

-

-msgid "Cannot perform the key agreement"

-msgstr "Nepavyko susitarti dėl raktų"

-

-msgid "Error occurred during key agreement"

-msgstr "Susitarimo dėl raktų metu įvyko klaida"

-

-msgid "Key Agreement failed"

-msgstr "Susitarimas dėl raktų nepavyko"

-

-msgid "Timeout during key agreement"

-msgstr "Baigėsi susitarimo dėl raktų laukimo laikas"

-

-msgid "Key agreement was aborted"

-msgstr "Susitarimas dėl raktų buvo nutrauktas"

-

-msgid "Key agreement is already started"

-msgstr "Susitarimas dėl raktų jau pradėtas"

-

-msgid "Key agreement cannot be started with yourself"

-msgstr "Negalima susitarti dėl raktų su savimi pačiu"

-

-msgid "The remote user is not present in the network any more"

-msgstr "Nuotolinio vartotojo nebėra tinkle"

-

-#, c-format

-msgid ""

-"Key agreement request received from %s. Would you like to perform the key "

-"agreement?"

-msgstr ""

-"Susitarimo dėl raktų prašymas gautas iš vartotojo %s. Ar norite susitarti?"

-

-#, c-format

-msgid ""

-"The remote user is waiting key agreement on:\n"

-"Remote host: %s\n"

-"Remote port: %d"

-msgstr ""

-"Nuotolinis vartotojas laukia susitarimo dėl raktų\n"

-"nuotoliniame mazge: %s\n"

-"nuotoliniame prievade: %d"

-

-msgid "Key Agreement Request"

-msgstr "Susitarymo dėl raktų prašymas"

-

-msgid "IM With Password"

-msgstr "IM su slaptažodžiu"

-

-msgid "Cannot set IM key"

-msgstr "Negalima nustatyti IM rakto"

-

-msgid "Set IM Password"

-msgstr "Nustatyti IM slaptažodį"

-

-msgid "Get Public Key"

-msgstr "Gauti viešąjį raktą"

-

-msgid "Cannot fetch the public key"

-msgstr "Negalima gauti viešojo rakto"

-

-msgid "Show Public Key"

-msgstr "Rodyti viešąjį raktą"

-

-msgid "Could not load public key"

-msgstr "Nepavyko įkelti viešojo rakto"

-

-msgid "User Information"

-msgstr "Vartotojo informacija"

-

-msgid "Cannot get user information"

-msgstr "Nepavyko gauti vartotojo informacijos"

-

-#, c-format

-msgid "The %s buddy is not trusted"

-msgstr "Bičiulis %s nėra patikimas"

-

-msgid ""

-"You cannot receive buddy notifications until you import his/her public key.  "

-"You can use the Get Public Key command to get the public key."

-msgstr ""

-"Jūs negalite gauti informavimo apie bičiulį, kol neimportavote jo viešojo "

-"rakto.  Tam jūs galite naudoti „Gauti viešąjį raktą\"."

-

-#. Open file selector to select the public key.

-msgid "Open..."

-msgstr "Atverti..."

-

-#, c-format

-msgid "The %s buddy is not present in the network"

-msgstr "Bičiulio %s nėra tinkle"

-

-msgid ""

-"To add the buddy you must import his/her public key. Press Import to import "

-"a public key."

-msgstr ""

-"Norėdami pridėti bičiulį, privalote importuoti jo viešąjį raktą.  Tam "

-"paspauskite „Importuoti...“."

-

-msgid "_Import..."

-msgstr "_Importuoti..."

-

-msgid "Select correct user"

-msgstr "Pasirinkite teisingą vartotoją"

-

-msgid ""

-"More than one user was found with the same public key. Select the correct "

-"user from the list to add to the buddy list."

-msgstr ""

-"Rastas daugiau nei vienas vartotojas su tokiu pačiu viešuoju raktu.  "

-"Pasirinkite teisingą vartotoją iš sąrašo, kuris bus įtrauktas į bičiulių "

-"sąrašą."

-

-msgid ""

-"More than one user was found with the same name. Select the correct user "

-"from the list to add to the buddy list."

-msgstr ""

-"Rastas daugiau nei vienas vartotojas su tokiu pačiu vardu.  Pasirinkite "

-"teisingą vartotoją iš sąrašo, kuris bus įtrauktas į bičiulių sąrašą."

-

-msgid "Detached"

-msgstr "Atskirtas"

-

-msgid "Indisposed"

-msgstr "Nelinkęs"

-

-msgid "Wake Me Up"

-msgstr "Pažadink mane"

-

-msgid "Hyper Active"

-msgstr "Hiperaktyvus"

-

-msgid "Robot"

-msgstr "Robotas"

-

-msgid "Happy"

-msgstr "Laimingas"

-

-msgid "Sad"

-msgstr "Liūdnas"

-

-msgid "Angry"

-msgstr "Piktas"

-

-msgid "Jealous"

-msgstr "Pavydus"

-

-msgid "Ashamed"

-msgstr "Susigėdęs"

-

-msgid "Invincible"

-msgstr "Nenugalimas"

-

-msgid "In Love"

-msgstr "Įsimylėjęs"

-

-msgid "Sleepy"

-msgstr "Mieguistas"

-

-msgid "Bored"

-msgstr "Nuobuodžiaujantis"

-

-msgid "Excited"

-msgstr "Susijaudinęs"

-

-msgid "Anxious"

-msgstr "Neramus"

-

-msgid "User Modes"

-msgstr "Vartotojo būsenos"

-

-msgid "Preferred Contact"

-msgstr "Labiausiai mėgstamas kontaktas"

-

-msgid "Preferred Language"

-msgstr "Labiausiai mėgstama kalba"

-

-msgid "Device"

-msgstr "Įrenginys"

-

-msgid "Timezone"

-msgstr "Laiko juosta"

-

-msgid "Geolocation"

-msgstr "Geografinė vietovė"

-

-msgid "Reset IM Key"

-msgstr "Atstatyti IM raktą"

-

-msgid "IM with Key Exchange"

-msgstr "Pokalbiai su raktų apsikeitimu"

-

-msgid "IM with Password"

-msgstr "Pokalbiai su slaptažodžiu"

-

-msgid "Get Public Key..."

-msgstr "Gauti viešąjį raktą..."

-

-msgid "Kill User"

-msgstr "Išmesti vartotoją"

-

-msgid "Draw On Whiteboard"

-msgstr "Piešti ant lentos"

-

-msgid "_Passphrase:"

-msgstr "Sla_ptafrazė:"

-

-#, c-format

-msgid "Channel %s does not exist in the network"

-msgstr "Kanalas %s tinkle neegzistuoja"

-

-msgid "Channel Information"

-msgstr "Kanalo informacija"

-

-msgid "Cannot get channel information"

-msgstr "Nepavyko gauti kanalo informacijos"

-

-#, c-format

-msgid "<b>Channel Name:</b> %s"

-msgstr "<b>Kanalo pavadinimas:</b> %s"

-

-#, c-format

-msgid "<br><b>User Count:</b> %d"

-msgstr "<br><b>Vartotojų skaičius:</b> %d"

-

-#, c-format

-msgid "<br><b>Channel Founder:</b> %s"

-msgstr "<br><b>Kanalo įkūrėjas:</b> %s"

-

-#, c-format

-msgid "<br><b>Channel Cipher:</b> %s"

-msgstr "<br><b>Kanalo šifras:</b> %s"

-

-#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC

-#, c-format

-msgid "<br><b>Channel HMAC:</b> %s"

-msgstr "<br><b>Kanalo HMAC:</b> %s"

-

-#, c-format

-msgid "<br><b>Channel Topic:</b><br>%s"

-msgstr "<br><b>Kanalo tema:</b><br>%s"

-

-#, c-format

-msgid "<br><b>Channel Modes:</b> "

-msgstr "<br><b>Kanalo būsenos:</b> "

-

-#, c-format

-msgid "<br><b>Founder Key Fingerprint:</b><br>%s"

-msgstr "<br><b>Įkūrėjo rakto kontrolinis kodas:</b><br>%s"

-

-#, c-format

-msgid "<br><b>Founder Key Babbleprint:</b><br>%s"

-msgstr "<br><b>Įkūrėjo rakto žodinis kontrolinis kodas:</b><br>%s"

-

-msgid "Add Channel Public Key"

-msgstr "Pridėti kanalo viešąjį raktą"

-

-#. Add new public key

-msgid "Open Public Key..."

-msgstr "Atverti viešąjį raktą..."

-

-msgid "Channel Passphrase"

-msgstr "Kanalo slaptafrazė"

-

-msgid "Channel Public Keys List"

-msgstr "Kanalo viešųjų raktų sąrašas"

-

-#, c-format

-msgid ""

-"Channel authentication is used to secure the channel from unauthorized "

-"access. The authentication may be based on passphrase and digital "

-"signatures. If passphrase is set, it is required to be able to join. If "

-"channel public keys are set then only users whose public keys are listed are "

-"able to join."

-msgstr ""

-"Tapatybės nustatymas kanale skirtas apsaugoti kanalą nuo nesankcionuotos "

-"prieigos.  Tapatybės nustatymas gali būti pagrįstas slaptafraze ir "

-"skaitmeniniais parašais.  Jei yra nustatyta slaptafrazė, ji yra reikalinga "

-"norint prisijungti prie kanalo.  Jei kanalo viešieji raktai yra nustatyti, "

-"gali prisijungti tik vartotojai, kurių viešieji raktai yra priskirti."

-

-msgid "Channel Authentication"

-msgstr "Tapatybės nustatymas kanale"

-

-msgid "Add / Remove"

-msgstr "Įdėti / Pašalinti"

-

-msgid "Group Name"

-msgstr "Grupės pavadinimas"

-

-msgid "Passphrase"

-msgstr "Slaptafrazė"

-

-#, c-format

-msgid "Please enter the %s channel private group name and passphrase."

-msgstr "Prašom įvesti kanalo %s privačios grupės pavadinimą ir slaptafrazę."

-

-msgid "Add Channel Private Group"

-msgstr "Pridėti kanalo privačią grupę"

-

-msgid "User Limit"

-msgstr "Vartotojų skaičiaus riba"

-

-msgid "Set user limit on channel. Set to zero to reset user limit."

-msgstr ""

-"Nustatyti kanalo vartotojų skaičiaus ribą.  Nulio reikšmė pašalina ribą."

-

-msgid "Invite List"

-msgstr "Pakvietimų sąrašas"

-

-msgid "Ban List"

-msgstr "Draudimų sąrašas"

-

-msgid "Add Private Group"

-msgstr "Pridėti privačią grupę"

-

-msgid "Reset Permanent"

-msgstr "Atšaukti pastovumą"

-

-msgid "Set Permanent"

-msgstr "Nustatyti pastovumą"

-

-msgid "Set User Limit"

-msgstr "Nustatyti vartotojų skaičiaus ribą"

-

-msgid "Reset Topic Restriction"

-msgstr "Atšaukti temos apribojimą"

-

-msgid "Set Topic Restriction"

-msgstr "Nustatyti temos apribojimą"

-

-msgid "Reset Private Channel"

-msgstr "Atšaukti kanalo privatumą"

-

-msgid "Set Private Channel"

-msgstr "Nustatyti kanalo privatumą"

-

-msgid "Reset Secret Channel"

-msgstr "Atšaukti kanalo slaptumą"

-

-msgid "Set Secret Channel"

-msgstr "Nustatyti kanalo slaptumą"

-

-#, c-format

-msgid ""

-"You have to join the %s channel before you are able to join the private group"

-msgstr ""

-"Jūs turite prisijungti prie kanalo %s, kad galėtumėte prisijungti prie "

-"privačios grupės"

-

-msgid "Join Private Group"

-msgstr "Prisijungti prie privačios grupės"

-

-msgid "Cannot join private group"

-msgstr "Negalima prisijungti prie privačios grupės"

-

-msgid "Call Command"

-msgstr "Komandos iškvietimas"

-

-msgid "Cannot call command"

-msgstr "Negalima iškviesti komandos"

-

-msgid "Unknown command"

-msgstr "Nežinoma komanda"

-

-msgid "Secure File Transfer"

-msgstr "Saugus failų perdavimas"

-

-msgid "Error during file transfer"

-msgstr "Failų perdavimo klaida"

-

-msgid "Remote disconnected"

-msgstr "Kitas vartotojas atsijungė"

-

-msgid "Permission denied"

-msgstr "Neduotas leidimas"

-

-msgid "Key agreement failed"

-msgstr "Raktų sutikimas nepavyko"

-

-msgid "Connection timed out"

-msgstr "Jungties laukimo laikas baigėsi"

-

-msgid "Creating connection failed"

-msgstr "Jungties sukūrimo klaida"

-

-msgid "File transfer session does not exist"

-msgstr "Failų perdavimo seansas neegzistuoja"

-

-msgid "No file transfer session active"

-msgstr "Nėra aktyvaus failų perdavimo seanso"

-

-msgid "File transfer already started"

-msgstr "Failo perdavimas jau pradėtas"

-

-msgid "Could not perform key agreement for file transfer"

-msgstr "Nepavyko atlikti raktų sutarimo failų perdavimui"

-

-msgid "Could not start the file transfer"

-msgstr "Nepavyko pradėti failų perdavimo"

-

-msgid "Cannot send file"

-msgstr "Negalima išsiųsti failo"

-

-msgid "Error occurred"

-msgstr "Įvyko klaida"

-

-#, c-format

-msgid "%s has changed the topic of <I>%s</I> to: %s"

-msgstr "%s pakeitė kanalo <I>%s</I> temą į: %s"

-

-#, c-format

-msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"

-msgstr "<I>%s</I> pakeitė kanalo <I>%s</I> būsenas į: %s"

-

-#, c-format

-msgid "<I>%s</I> removed all channel <I>%s</I> modes"

-msgstr "<I>%s</s> pašalino visus kanalo <i>%s</i> būsenas"

-

-#, c-format

-msgid "<I>%s</I> set <I>%s's</I> modes to: %s"

-msgstr "<I>%s</I> pakeitė vartotojo <I>%s</I> būsenas į: %s"

-

-#, c-format

-msgid "<I>%s</I> removed all <I>%s's</I> modes"

-msgstr "<i>%s</i> pašalino visas vartotojo <i>%s</i> būsenas"

-

-#, c-format

-msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"

-msgstr "Iš <i>%s</i> Jus išspyrė <i>%s</i> (%s)"

-

-#, c-format

-msgid "You have been killed by %s (%s)"

-msgstr "Jus išmetė %s (%s)"

-

-#, c-format

-msgid "Killed by %s (%s)"

-msgstr "Išmestas vartotojo %s (%s)"

-

-msgid "Server signoff"

-msgstr "Serverio atjungimas"

-

-msgid "Personal Information"

-msgstr "Asmeninė informacija"

-

-msgid "Birth Day"

-msgstr "Gimtadienis"

-

-msgid "Job Role"

-msgstr "Vaidmuo darbe"

-

-msgid "Organization"

-msgstr "Organizacija"

-

-msgid "Unit"

-msgstr "Padalinys"

-

-msgid "Note"

-msgstr "Pastabos"

-

-msgid "Join Chat"

-msgstr "Prisijungti prie pokalbių kambario"

-

-#, c-format

-msgid "You are channel founder on <I>%s</I>"

-msgstr "Jūs esate <i>%s</i> kanalo įkūrėjas"

-

-#, c-format

-msgid "Channel founder on <I>%s</I> is <I>%s</I>"

-msgstr "Kanalo <i>%s</i> įkūrėjas yra <i>%s</i>"

-

-msgid "Real Name"

-msgstr "Tikras vardas"

-

-msgid "Status Text"

-msgstr "Būsenos tekstas"

-

-msgid "Public Key Fingerprint"

-msgstr "Viešojo rakto kontrolinis kodas"

-

-msgid "Public Key Babbleprint"

-msgstr "Viešojo rakto žodinis kontrolinis kodas"

-

-msgid "_More..."

-msgstr "_Daugiau..."

-

-msgid "Detach From Server"

-msgstr "Atsiskirti nuo serverio"

-

-msgid "Cannot detach"

-msgstr "Atsiskirti negalima"

-

-msgid "Cannot set topic"

-msgstr "Negalima nustatyti temos"

-

-msgid "Failed to change nickname"

-msgstr "Vardo pakeisti nepavyko"

-

-msgid "Roomlist"

-msgstr "Kambarių sąrašas"

-

-msgid "Cannot get room list"

-msgstr "Nepavyko gauti kambarių sąrašo"

-

-msgid "Network is empty"

-msgstr "Tinklas yra tuščias"

-

-msgid "No public key was received"

-msgstr "Joks viešasis raktas nebuvo gautas"

-

-msgid "Server Information"

-msgstr "Serverio informacija"

-

-msgid "Cannot get server information"

-msgstr "Nepavyko gauti informacijos apie serverį"

-

-msgid "Server Statistics"

-msgstr "Serverio statistika"

-

-msgid "Cannot get server statistics"

-msgstr "Nepavyko gauti serverio statistikos"

-

-#, c-format

-msgid ""

-"Local server start time: %s\n"

-"Local server uptime: %s\n"

-"Local server clients: %d\n"

-"Local server channels: %d\n"

-"Local server operators: %d\n"

-"Local router operators: %d\n"

-"Local cell clients: %d\n"

-"Local cell channels: %d\n"

-"Local cell servers: %d\n"

-"Total clients: %d\n"

-"Total channels: %d\n"

-"Total servers: %d\n"

-"Total routers: %d\n"

-"Total server operators: %d\n"

-"Total router operators: %d\n"

-msgstr ""

-"Vietinio serverio paleidimo laikas: %s\n"

-"Vietinio serverio veikimo laikas: %s\n"

-"Vietinio serverio klientai: %d\n"

-"Vietinio serverio kanalai: %d\n"

-"Vietinio serverio operatoriai: %d\n"

-"Vietinio maršruto parinktuvo operatoriai: %d\n"

-"Vietinio narvelio klientai: %d\n"

-"Vietinio narvelio kanalai: %d\n"

-"Vietinio narvelio serveriai: %d\n"

-"Iš viso klientų: %d\n"

-"Iš viso kanalų: %d\n"

-"Iš viso serverių: %d\n"

-"Iš viso maršruto parinktuvų: %d\n"

-"Iš viso serverio operatorių: %d\n"

-"Iš viso maršruto parinktuvų operatorių: %d\n"

-

-msgid "Network Statistics"

-msgstr "Tinklo statistika"

-

-msgid "Ping failed"

-msgstr "Nepavyko skimbtelėti"

-

-msgid "Ping reply received from server"

-msgstr "Atsakas į skimbtelėjimą gautas iš serverio"

-

-msgid "Could not kill user"

-msgstr "Nepavyko išmesti vartotojo"

-

-msgid "WATCH"

-msgstr "STEBĖTI"

-

-msgid "Cannot watch user"

-msgstr "Negalima stebėti vartotojo"

-

-msgid "Resuming session"

-msgstr "Pratęsiamas seansas"

-

-msgid "Authenticating connection"

-msgstr "Jungties tapatybės nustatymas"

-

-msgid "Verifying server public key"

-msgstr "Tikrinamas serverio viešasis raktas"

-

-msgid "Passphrase required"

-msgstr "Reikalinga slaptafrazė"

-

-#, c-format

-msgid ""

-"Received %s's public key. Your local copy does not match this key. Would you "

-"still like to accept this public key?"

-msgstr ""

-"Gautas vartotojo %s viešasis raktas.  Jūsų vietinė kopija nesutampa su šiuo "

-"raktu.  Ar vis tiek norite priimti šį viešąjį raktą?"

-

-#, c-format

-msgid "Received %s's public key. Would you like to accept this public key?"

-msgstr ""

-"Gautas vartotojo %s viešasis raktas.  Ar norite priimti šį viešąjį raktą?"

-

-#, c-format

-msgid ""

-"Fingerprint and babbleprint for the %s key are:\n"

-"\n"

-"%s\n"

-"%s\n"

-msgstr ""

-"Kontrolinis ir žodinis kontrolinis vartotojo %s rakto kodas yra:\n"

-"\n"

-"%s\n"

-"%s\n"

-

-msgid "Verify Public Key"

-msgstr "Patikrinti viešąjį raktą"

-

-msgid "_View..."

-msgstr "_Peržiūrėti..."

-

-msgid "Unsupported public key type"

-msgstr "Nepalaikomas viešojo rakto tipas"

-

-msgid "Disconnected by server"

-msgstr "Atjungtas serverio"

-

-msgid "Error during connecting to SILC Server"

-msgstr "Jungimosi į SILC serverį klaida"

-

-msgid "Key Exchange failed"

-msgstr "Apsikeitimas raktais nepavyko"

-

-msgid ""

-"Resuming detached session failed. Press Reconnect to create new connection."

-msgstr ""

-"Atskirto seanso pratęsimas nepavyko. Paspauskite „Jungtis iš naujo\", kad "

-"sukurtumėtę naują jungtį."

-

-msgid "Connection failed"

-msgstr "Jungties klaida"

-

-msgid "Performing key exchange"

-msgstr "Apsikeičiama raktais"

-

-msgid "Unable to create connection"

-msgstr "Nepavyko sukurti jungties."

-

-msgid "Could not load SILC key pair"

-msgstr "Nepavyko įkelti SILC raktų poros"

-

-#. Progress

-msgid "Connecting to SILC Server"

-msgstr "Jungiamasi prie SILC serverio"

-

-msgid "Out of memory"

-msgstr "Trūksta atminties"

-

-msgid "Cannot initialize SILC protocol"

-msgstr "Nepavyko inicijuoti SILC protokolo"

-

-msgid "Error loading SILC key pair"

-msgstr "SILC raktų poros įkėlimo klaida"

-

-#, c-format

-msgid "Download %s: %s"

-msgstr "Atsisiųsk %s: %s"

-

-msgid "Your Current Mood"

-msgstr "Jūsų dabartinė nuotaika"

-

-#, c-format

-msgid "Normal"

-msgstr "Normaliai"

-

-msgid "In love"

-msgstr "Įsimylėjęs"

-

-msgid ""

-"\n"

-"Your Preferred Contact Methods"

-msgstr ""

-"\n"

-"Jūsų labiausiai mėgstami kontaktavimo būdai"

-

-msgid "SMS"

-msgstr "SMS"

-

-msgid "MMS"

-msgstr "MMS"

-

-msgid "Video conferencing"

-msgstr "Kontaktas vaizdo konferencijoms"

-

-msgid "Your Current Status"

-msgstr "Jūsų dabartinė būsena"

-

-msgid "Online Services"

-msgstr "Tiesioginės tarnybos"

-

-msgid "Let others see what services you are using"

-msgstr "Leisti kitiems pamatyti, kokiomis tarnybomis Jūs naudojatės"

-

-msgid "Let others see what computer you are using"

-msgstr "Leisti kitiems pamatyti, kokiu kompiuteriu Jūs naudojatės"

-

-# „vCard“ yra tikrinis žodis

-msgid "Your VCard File"

-msgstr "Jūsų vCard failas"

-

-msgid "Timezone (UTC)"

-msgstr "Laiko juosta (UTC)"

-

-msgid "User Online Status Attributes"

-msgstr "Vartotojo prisijungimo būsenos atributai"

-

-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 ""

-"Jūs galite leisti kitiems vartotojams matyti Jūsų prisijungimo būsenos "

-"informaciją ir Jūsų asmeninę informaciją.  Prašome užpildyti informaciją, "

-"kurią matys kiti vartotojai apie Jus."

-

-msgid "Message of the Day"

-msgstr "Dienos žinutė"

-

-msgid "No Message of the Day available"

-msgstr "Dienos žinutės nėra"

-

-msgid "There is no Message of the Day associated with this connection"

-msgstr "Nėra susietos su šia jungtimi dienos žinutės"

-

-msgid "Create New SILC Key Pair"

-msgstr "Kuriama nauja SILC raktų pora..."

-

-msgid "Passphrases do not match"

-msgstr "Slaptafrazės nesutampa"

-

-msgid "Key Pair Generation failed"

-msgstr "Raktų poros sukūrimas nepavyko"

-

-msgid "Key length"

-msgstr "Rakto ilgis"

-

-msgid "Public key file"

-msgstr "Viešojo rakto failas"

-

-msgid "Private key file"

-msgstr "Privataus rakto failas"

-

-msgid "Passphrase (retype)"

-msgstr "Slaptafrazė (pakartoti)"

-

-msgid "Generate Key Pair"

-msgstr "Sukurti raktų porą"

-

-msgid "Online Status"

-msgstr "Prisijungimo būsena"

-

-msgid "View Message of the Day"

-msgstr "Žiūrėti dienos žinutę"

-

-msgid "Create SILC Key Pair..."

-msgstr "Sukurti SILC raktų porą..."

-

-#, c-format

-msgid "User <I>%s</I> is not present in the network"

-msgstr "Vartotojo <i>%s</i> nėra tinkle"

-

-msgid "Topic too long"

-msgstr "Tema per ilga"

-

-msgid "You must specify a nick"

-msgstr "Jūs privalote nurodyti vardą"

-

-#, c-format

-msgid "channel %s not found"

-msgstr "kanalas %s nerastas"

-

-#, c-format

-msgid "channel modes for %s: %s"

-msgstr "Kanalo %s būsenos: %s"

-

-#, c-format

-msgid "no channel modes are set on %s"

-msgstr "kanalas %s neturi būsenų"

-

-#, c-format

-msgid "Failed to set cmodes for %s"

-msgstr "Nepavyko nustatyti %s kanalo būsenų"

-

-#, c-format

-msgid "Unknown command: %s, (may be a client bug)"

-msgstr "Nežinoma komanda: %s, (gali būti programos riktas)"

-

-msgid "part [channel]:  Leave the chat"

-msgstr "part [kanalas]:  palikti kanalą"

-

-msgid "leave [channel]:  Leave the chat"

-msgstr "leave [channel]  palikti kanalą"

-

-msgid "topic [&lt;new topic&gt;]:  View or change the topic"

-msgstr "topic [nauja tema]:  rodyti arba pakeisti temą"

-

-msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"

-msgstr ""

-"join &lt;kanalas&gt; [slaptažodis]:  prisijungti prie pokalbių kanalo šiame "

-"tinkle"

-

-msgid "list:  List channels on this network"

-msgstr "list:  parodyti šio tinklo kanalų sąrašą"

-

-msgid "whois &lt;nick&gt;:  View nick's information"

-msgstr "whois &lt;vardas&gt;  rodyti informaciją apie vartotoją"

-

-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"

-msgstr ""

-"msg &lt;vardas&gt; &lt;žinutė&gt;:  vartotojui nusiųsti privačią žinutę"

-

-msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"

-msgstr "query &lt;vardas&gt; [žinutė]:  vartotojui nusiųsti privačią žinutę"

-

-msgid "motd:  View the server's Message Of The Day"

-msgstr "motd:  rodyti serverio dienos žinutę"

-

-msgid "detach:  Detach this session"

-msgstr "detach:  atskirti šią sesiją"

-

-msgid "quit [message]:  Disconnect from the server, with an optional message"

-msgstr ""

-"quit [žinutė]:  atsijungti nuo serverio su papildoma neprivaloma žinute"

-

-msgid "call &lt;command&gt;:  Call any silc client command"

-msgstr "call &lt;komanda&gt;  iškviesti bet kokią SILC kliento komandą"

-

-msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"

-msgstr ""

-"kill &lt;vardas&gt; [-viešasis raktas|&lt;priežastis&gt;]:  išmesti vartotoją"

-

-msgid "nick &lt;newnick&gt;:  Change your nickname"

-msgstr "nick &lt;naujas-vardas&gt;:  pakeisti Jūsų vardą"

-

-msgid "whowas &lt;nick&gt;:  View nick's information"

-msgstr "whowas &lt;slapyvardis&gt;:  rodyti informaciją apie vartotoją"

-

-msgid ""

-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "

-"channel modes"

-msgstr ""

-"cmode &lt;kanalas&gt; [+|-&lt;būsenos&gt;] [argumentai]:  keisti arba rodyti "

-"kanalo būsenas"

-

-msgid ""

-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "

-"on channel"

-msgstr ""

-"cumode &lt;kanalas&gt; +|-&lt;būsenos&gr; &lt;slapyvardis&gt;:  keisti "

-"vartotojo būsenas kanale"

-

-msgid "umode &lt;usermodes&gt;:  Set your modes in the network"

-msgstr "umode &lt;vartotojo-būsenos&gt;:  nustatyti Jūsų būsenas tinkle"

-

-msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"

-msgstr ""

-"oper &lt;slapyvardis&gt; [-viešasis raktas]:  gauti serverio operatoriaus "

-"privilegijas"

-

-msgid ""

-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "

-"channel invite list"

-msgstr ""

-"invite &lt;kanalas&gt; [-|+]&lt;slapyvardis&gt;:  pakviesti vartotoją arba "

-"įterpti/pašalinti iš kanalo pakvietimų sąrašo"

-

-msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"

-msgstr ""

-"kick &lt;kanalas&gt; &lt;slapyvardis&gt; [komentaras]:  išspirti vartotoją "

-"iš kanalog"

-

-msgid "info [server]:  View server administrative details"

-msgstr "info [serveris]:  rodyti serverio administracines detales"

-

-msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"

-msgstr ""

-"ban [&lt;kanalas&gt; +|-&lt;slapyvardis&gt;]:  uždrausti vartotojui "

-"prisijungti prie kanalo"

-

-msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"

-msgstr ""

-"getkey &lt;nick|server&gt;:  gauti vartotojo arba serverio viešąjį raktą"

-

-msgid "stats:  View server and network statistics"

-msgstr "stats:  rodyti serverio ir tinklo statistiką"

-

-msgid "ping:  Send PING to the connected server"

-msgstr "ping:  skimbtelėti serveriui"

-

-msgid "users &lt;channel&gt;:  List users in channel"

-msgstr "users &lt;kanalas&gt;:  rodyti vartotojus kanale"

-

-msgid ""

-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "

-"specific users in channel(s)"

-msgstr ""

-"names [-count|-ops|-halfops|-voices|-normal] &lt;kanalas(-ai)&gt;:  rodyti "

-"tam tikrus vartotojus kanale(-uose)"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#  *< name

-#  *< version

-#  *  summary

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *  summary

-msgid "SILC Protocol Plugin"

-msgstr "SILC protokolo papildinys"

-

-#  *  description

-#. *  description

-msgid "Secure Internet Live Conferencing (SILC) Protocol"

-msgstr "SILC papildinys"

-

-msgid "Network"

-msgstr "Tinklas"

-

-msgid "Public Key file"

-msgstr "Viešojo rakto failas"

-

-msgid "Private Key file"

-msgstr "Privataus rakto failas"

-

-msgid "Cipher"

-msgstr "Šifras"

-

-msgid "HMAC"

-msgstr "HMAC"

-

-msgid "Use Perfect Forward Secrecy"

-msgstr "Naudoti „Perfect Forward Secrecy“ (PFC)"

-

-msgid "Public key authentication"

-msgstr "Tapatybės nustatymas viešuoju raktu"

-

-msgid "Block IMs without Key Exchange"

-msgstr "Blokuoti greitąsias žinutes be raktų apsikeitimo"

-

-msgid "Block messages to whiteboard"

-msgstr "Blokuoti rašymo ant lentos žinutes"

-

-msgid "Automatically open whiteboard"

-msgstr "Automatiškai atidaryti rašymo lentą"

-

-msgid "Digitally sign and verify all messages"

-msgstr "Skaitmeniškai pasirašyti ir patikrinti visas greitąsias žinutes"

-

-msgid "Creating SILC key pair..."

-msgstr "Kuriama SILC raktų pora..."

-

-msgid "Cannot create SILC key pair\n"

-msgstr "Negalima sukurti SILC raktų poros\n"

-

-#. Hint for translators: Please check the tabulator width here and in

-#. the next strings (short strings: 2 tabs, longer strings 1 tab,

-#. sum: 3 tabs or 24 characters)

-#, c-format

-msgid "Real Name: \t%s\n"

-msgstr "Asmenvardis: \t%s\n"

-

-#, c-format

-msgid "User Name: \t%s\n"

-msgstr "Vartotojo vardas: \t%s\n"

-

-#, c-format

-msgid "Email: \t\t%s\n"

-msgstr "El. paštas: \t\t%s\n"

-

-#, c-format

-msgid "Host Name: \t%s\n"

-msgstr "Mazgo vardas:   %s\n"

-

-#, c-format

-msgid "Organization: \t%s\n"

-msgstr "Organizacija: \t%s\n"

-

-#, c-format

-msgid "Country: \t%s\n"

-msgstr "Šalis: \t%s\n"

-

-#, c-format

-msgid "Algorithm: \t%s\n"

-msgstr "Algoritmas:  \t%s\n"

-

-#, c-format

-msgid "Key Length: \t%d bits\n"

-msgstr "Rakto ilgis, bitais: \t%d\n"

-

-#, c-format

-msgid "Version: \t%s\n"

-msgstr "Versija:        %s\n"

-

-#, c-format

-msgid ""

-"Public Key Fingerprint:\n"

-"%s\n"

-"\n"

-msgstr ""

-"Viešojo rakto kontrolinė suma:\n"

-"%s\n"

-

-#, c-format

-msgid ""

-"Public Key Babbleprint:\n"

-"%s"

-msgstr ""

-"Viešojo rakto žodinė kontrolinė suma:\n"

-"%s"

-

-msgid "Public Key Information"

-msgstr "Viešojo rakto informacija"

-

-msgid "Paging"

-msgstr "Žinutės į pranešimų gaviklį"

-

-msgid "Video Conferencing"

-msgstr "Vaizdo konferencija"

-

-msgid "Computer"

-msgstr "Kompiuteris"

-

-msgid "PDA"

-msgstr "PDA"

-

-msgid "Terminal"

-msgstr "Terminalas"

-

-#, c-format

-msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"

-msgstr "„%s“ atsiuntė rašymo ant lentos žinutę. Ar norite atidaryti lentą?"

-

-#, c-format

-msgid ""

-"%s sent message to whiteboard on %s channel. Would you like to open the "

-"whiteboard?"

-msgstr ""

-"„%s“ atsiuntė rašymo ant lentos žinutę kanale „%s“. Ar norite atidaryti "

-"lentą?"

-

-msgid "Whiteboard"

-msgstr "Lenta"

-

-msgid "No server statistics available"

-msgstr "Nėra prieinamos serverio statistikos"

-

-#, c-format

-msgid "Failure: Version mismatch, upgrade your client"

-msgstr "Nesėkmė: versijų neatitikimas, atnaujinkite savo klientą"

-

-#, c-format

-msgid "Failure: Remote does not trust/support your public key"

-msgstr ""

-"Nesekmė: nuotolinis mazgas nepasitiki arba nepalaiko Jūsų viešojo rakto"

-

-#, c-format

-msgid "Failure: Remote does not support proposed KE group"

-msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomos KE grupės"

-

-#, c-format

-msgid "Failure: Remote does not support proposed cipher"

-msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomo šifro"

-

-#, c-format

-msgid "Failure: Remote does not support proposed PKCS"

-msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomo PKCS"

-

-#, c-format

-msgid "Failure: Remote does not support proposed hash function"

-msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomos maišos funkcijos"

-

-#, c-format

-msgid "Failure: Remote does not support proposed HMAC"

-msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomo HMAC"

-

-#, c-format

-msgid "Failure: Incorrect signature"

-msgstr "Nesekmė: neteisingas parašas"

-

-#, c-format

-msgid "Failure: Invalid cookie"

-msgstr "Nesekmė: neteisingas slapukas"

-

-#, c-format

-msgid "Failure: Authentication failed"

-msgstr "Nesekmė: tapatybės nustatymas nepavyko"

-

-msgid "Cannot initialize SILC Client connection"

-msgstr "Nepavyko inicijuoti SILC kliento jungties"

-

-msgid "John Noname"

-msgstr "Vardenis Pavardenis"

-

-#, c-format

-msgid "Could not load SILC key pair: %s"

-msgstr "Nepavyko įkelti SILC raktų poros: %s"

-

-msgid "Could not write"

-msgstr "Nepavyko rašyti"

-

-msgid "Could not connect"

-msgstr "Nepavyko prisijungti"

-

-msgid "Unknown server response."

-msgstr "Nežinomas serverio atsakymas."

-

-msgid "Could not create listen socket"

-msgstr "Nepavyko sukurti jungties klausymuisi"

-

-msgid "Could not resolve hostname"

-msgstr "Nepavyko nustatyti mazgo IP adreso"

-

-msgid "SIP usernames may not contain whitespaces or @ symbols"

-msgstr "SIP naudotojų vardai negali turėti matomų tarpų arba „@“ simbolių"

-

-msgid "SIP connect server not specified"

-msgstr "Nenurodytas SIP prisijungimo serveris"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#  *< name

-#  *< version

-#  *  summary

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-msgid "SIP/SIMPLE Protocol Plugin"

-msgstr "SIP/SIMPLE protokolo papildinys"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#  *< name

-#  *< version

-#  *  summary

-#. *  summary

-msgid "The SIP/SIMPLE Protocol Plugin"

-msgstr "SIP/SIMPLE protokolo papildinys"

-

-msgid "Publish status (note: everyone may watch you)"

-msgstr "Skelbti būseną (pastaba: bet kas galės Jus stebėti)"

-

-msgid "Use UDP"

-msgstr "Naudoti UDP"

-

-msgid "Use proxy"

-msgstr "Be tarpininko"

-

-msgid "Proxy"

-msgstr "Tarpininkas"

-

-msgid "Auth User"

-msgstr "Vartotojas prieigos teisės tikrinimui"

-

-msgid "Auth Domain"

-msgstr "Sritis prieigos teisės tikrinimui"

-

-#, c-format

-msgid "Looking up %s"

-msgstr "Ieškoma %s"

-

-#, c-format

-msgid "Connect to %s failed"

-msgstr "Prisijungimas prie %s nepavyko"

-

-#, c-format

-msgid "Signon: %s"

-msgstr "Prisijungiama: %s"

-

-#, c-format

-msgid "Unable to write file %s."

-msgstr "Negalima rašyti failo %s."

-

-#, c-format

-msgid "Unable to read file %s."

-msgstr "Negalima skaityti failo %s."

-

-#, c-format

-msgid "Message too long, last %s bytes truncated."

-msgstr "Žinutė per ilga, paskutiniai %s bitai nukąsti."

-

-#, c-format

-msgid "%s not currently logged in."

-msgstr "%s nėra šiuo metu prisijungęs"

-

-#, c-format

-msgid "Warning of %s not allowed."

-msgstr "Vartotojo %s perspėjimas neleidžiamas"

-

-#, c-format

-msgid "A message has been dropped, you are exceeding the server speed limit."

-msgstr "Žinutė prarasta, Jūs viršijote maksimalią serverio greičio ribą"

-

-#, c-format

-msgid "Chat in %s is not available."

-msgstr "Pokalbis %s nepasiekiamas"

-

-#, c-format

-msgid "You are sending messages too fast to %s."

-msgstr "Žinutes gavėjui %s Jūs siunčiate per greitai."

-

-#, c-format

-msgid "You missed an IM from %s because it was too big."

-msgstr "Jūs praleidote žinutę iš %s, nes ji buvo išsiųsta per didelė"

-

-#, c-format

-msgid "You missed an IM from %s because it was sent too fast."

-msgstr "Jūs praleidote žinutę iš %s, nes ji buvo išsiųsta per greitai."

-

-#, c-format

-msgid "Failure."

-msgstr "Nesekmė."

-

-#, c-format

-msgid "Too many matches."

-msgstr "Per daug atitikimų."

-

-#, c-format

-msgid "Need more qualifiers."

-msgstr "Reikia labiau apibrėžti."

-

-#, c-format

-msgid "Dir service temporarily unavailable."

-msgstr "Katalogo tarnyba laikinai neprieinama."

-

-#, c-format

-msgid "Email lookup restricted."

-msgstr "El. pašto adresų paieška apribota."

-

-#, c-format

-msgid "Keyword ignored."

-msgstr "Ignoruotas bazinis žodis"

-

-#, c-format

-msgid "No keywords."

-msgstr "Nėra bazinių žodžių"

-

-#, c-format

-msgid "User has no directory information."

-msgstr "Vartotojas neturi katalogo informacijos"

-

-#, c-format

-msgid "Country not supported."

-msgstr "Nepalaikoma šalis."

-

-#, c-format

-msgid "Failure unknown: %s."

-msgstr "Nežinoma nesekmė: %s."

-

-#, c-format

-msgid "Incorrect username or password."

-msgstr "Neteisingas naudotojo vardas arba slaptažodis"

-

-#, c-format

-msgid "The service is temporarily unavailable."

-msgstr "Paslauga laikinai nepasiekiama"

-

-#, c-format

-msgid "Your warning level is currently too high to log in."

-msgstr ""

-"Jūsų perspėjimo lygis šiuo metu yra per aukštas, kad galėtumėte prisijungti."

-

-#, c-format

-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 ""

-"Jūs prisijunginėjote ir atsijunginėjote per dažnai.  Palaukite dešimt "

-"minučių ir pabandykite iš naujo.  Jei ir toliau bandysite, Jums reikės "

-"laukti dar ilgiau."

-

-#, c-format

-msgid "An unknown signon error has occurred: %s."

-msgstr "Įvyko nežinoma prisijungimo klaida: %s."

-

-#, c-format

-msgid "An unknown error, %d, has occurred.  Info: %s"

-msgstr "Įvyko nežinoma klaida %d.  Informacija: %s"

-

-msgid "Invalid Groupname"

-msgstr "Neteisingas grupės pavadinimas"

-

-msgid "Connection Closed"

-msgstr "Jungtis uždaryta"

-

-msgid "Waiting for reply..."

-msgstr "Laukiama atsako..."

-

-msgid "TOC has come back from its pause. You may now send messages again."

-msgstr "TOC protokolo užlaikymas baigėsi. Dabar Jūs vėl galite siųsti žinutes."

-

-msgid "Password Change Successful"

-msgstr "Slaptažodis pakeistas sėkmingai"

-

-msgid "_Group:"

-msgstr "_Grupė:"

-

-msgid "Get Dir Info"

-msgstr "Gauti katalogo informaciją"

-

-msgid "Set Dir Info"

-msgstr "Nustatyti katalogo informaciją"

-

-#, c-format

-msgid "Could not open %s for writing!"

-msgstr "Nepavyko atverti %s rašymui!"

-

-msgid "File transfer failed; other side probably canceled."

-msgstr "Failų perdavimas nepavyko; greičiausiai kita pusė jį nutraukė."

-

-msgid "Could not connect for transfer."

-msgstr "Nepavyko prisijungti perdavimui."

-

-msgid "Could not write file header.  The file will not be transferred."

-msgstr "Nepavyko rašyti failo antraštės.  Failas nebus perduotas."

-

-msgid "Save As..."

-msgstr "Įrašyti kaip..."

-

-#, c-format

-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"

-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"

-msgstr[0] "%s prašo %s priimti %d failą: %s (%.2f %s)%s%s"

-msgstr[1] "%s prašo %s priimti %d failus: %s (%.2f %s)%s%s"

-msgstr[2] "%s prašo %s priimti %d failų: %s (%.2f %s)%s%s"

-

-#, c-format

-msgid "%s requests you to send them a file"

-msgstr "%s prašo nusiųsti jam failą"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "TOC Protocol Plugin"

-msgstr "TOC protokolo papildinys"

-

-#, c-format

-msgid "%s has sent you a webcam invite, which is not yet supported."

-msgstr ""

-"%s atsiuntė kvietimą internetinės vaizdo kameros pokalbiui, ko Pidgin dar "

-"nepalaiko."

-

-msgid "Your Yahoo! message did not get sent."

-msgstr "Jūsų Yahoo! žinutė nebuvo išsiųsta."

-

-#, c-format

-msgid "Yahoo! system message for %s:"

-msgstr "Yahoo! sisteminis pranešimas vartotojui %s:"

-

-#, c-format

-msgid ""

-"%s has (retroactively) denied your request to add them to your list for the "

-"following reason: %s."

-msgstr ""

-"%s atmeteė (atgaline data) Jūsų prašymą įtraukti jį į Jūsų bičiulių sąrašą "

-"dėl šios priežasties: %s."

-

-#, c-format

-msgid "%s has (retroactively) denied your request to add them to your list."

-msgstr ""

-"%s atmetė (atgaline data) Jūsų prašymą įtraukti jį į Jūsų bičiulių sąrašą."

-

-msgid "Add buddy rejected"

-msgstr "Bičiulio pridėjimas atmestas"

-

-#, c-format

-msgid ""

-"The Yahoo server has requested the use of an unrecognized authentication "

-"method.  You will probably not be able to successfully sign on to Yahoo.  "

-"Check %s for updates."

-msgstr ""

-"Yahoo serveris pareikalavo nežinomo tapatybės nustatymo metodo.   Jums "

-"turbūt nepavyks sėkmingai prisijungti prie Yahoo.  Paieškokite atnaujinimų "

-"adresu %s."

-

-msgid "Failed Yahoo! Authentication"

-msgstr "Yahoo! tapatybės nustatymas nepavyko"

-

-#, 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 ""

-"Jūs bandėte ignoruoti vartotoją %s, bet jis yra Jūsų bičiulių sąraše.  "

-"Paspauskite „Taip“, jei norite pašalinti ir ignoruoti bičiulį."

-

-msgid "Ignore buddy?"

-msgstr "Ar ignoruoti bičiulį?"

-

-msgid "Your account is locked, please log in to the Yahoo! website."

-msgstr "Jūsų abonentas užblokuotas, prisijunkite prie Yahoo! svetainės."

-

-#, c-format

-msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."

-msgstr ""

-"Nežinomas klaidos numeris %d.  Prisijungimas prie Yahoo! svetainės galbūt "

-"tai pataisys."

-

-#, c-format

-msgid "Could not add buddy %s to group %s to the server list on account %s."

-msgstr "Nepavyko pridėti bičiulio %s į grupę %s serverio sąraše paskyroje %s."

-

-msgid "Could not add buddy to server list"

-msgstr "Nepavyko pridėti bičiulio į serverio sarašą"

-

-#, c-format

-msgid "[ Audible %s/%s/%s.swf ] %s"

-msgstr "[ Garsinė žinutė %s/%s/%s.swf ] %s"

-

-msgid "Received unexpected HTTP response from server."

-msgstr "Gautas nelauktas HTTP atsakymas iš serverio."

-

-msgid "Connection problem"

-msgstr "Jungties klaida"

-

-#, c-format

-msgid ""

-"Lost connection with %s:\n"

-"%s"

-msgstr ""

-"Prarasta jungtis su %s:\n"

-"%s"

-

-#, c-format

-msgid ""

-"Could not establish a connection with %s:\n"

-"%s"

-msgstr ""

-"Nepavyko sukurti jungties su %s:\n"

-"%s"

-

-msgid "Not at Home"

-msgstr "Ne namie"

-

-msgid "Not at Desk"

-msgstr "Ne darbo vietoje"

-

-msgid "Not in Office"

-msgstr "Ne biure"

-

-msgid "On Vacation"

-msgstr "Atostogose"

-

-msgid "Stepped Out"

-msgstr "Trumpam išėjęs"

-

-msgid "Not on server list"

-msgstr "Nėra serverio sąraše"

-

-msgid "Appear Online"

-msgstr "Atrodyti prisijungusiu"

-

-msgid "Appear Permanently Offline"

-msgstr "Atrodyti atsijungusiu"

-

-msgid "Presence"

-msgstr "Būsena"

-

-msgid "Appear Offline"

-msgstr "Atrodyti atsijungusiu"

-

-msgid "Don't Appear Permanently Offline"

-msgstr "Neatrodyti atsijungusiu"

-

-msgid "Join in Chat"

-msgstr "Prisijungti prie pokalbio"

-

-msgid "Initiate Conference"

-msgstr "Inicijuoti konferenciją"

-

-#  Use Environmental Settings

-msgid "Presence Settings"

-msgstr "Būsenos nuostatos"

-

-msgid "Start Doodling"

-msgstr "Pradėti paišinėjimą"

-

-msgid "Activate which ID?"

-msgstr "Kurį ID aktyvuoti?"

-

-msgid "Join whom in chat?"

-msgstr "Prisijungti prie ko į pokalbį?"

-

-msgid "Activate ID..."

-msgstr "Aktyvuoti ID..."

-

-msgid "Join User in Chat..."

-msgstr "Prisijungti prie vartotojo pokalbyje..."

-

-msgid "Open Inbox"

-msgstr "Atidaryti pašto dėžutę"

-

-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"

-msgstr ""

-"join &lt;kambarys&gt;:  prisijungti prie pokalbių kambario Yahoo tinkle"

-

-msgid "list: List rooms on the Yahoo network"

-msgstr "list:  parodyti šio Yahoo tinklo kanalų sąrašą"

-

-msgid "doodle: Request user to start a Doodle session"

-msgstr "doodle:  paprašyti kontakto pradėti su juo paišymo seansą"

-

-msgid "Yahoo ID..."

-msgstr "Yahoo ID..."

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Yahoo Protocol Plugin"

-msgstr "Yahoo protokolo papildinys"

-

-msgid "Yahoo Japan"

-msgstr "Yahoo Japonija"

-

-msgid "Pager server"

-msgstr "Pranešimų gaviklio serveris"

-

-msgid "Japan Pager server"

-msgstr "Japonijos pranešimų gaviklio serveris"

-

-msgid "Pager port"

-msgstr "Pranešimų gaviklio prievadas"

-

-msgid "File transfer server"

-msgstr "Failų perdavimo serveris"

-

-msgid "Japan file transfer server"

-msgstr "Japonijos failų perdavimo serveris"

-

-msgid "File transfer port"

-msgstr "Failų perdavimo prievadas"

-

-msgid "Chat room locale"

-msgstr "Pokalbių kambario lokalė"

-

-msgid "Ignore conference and chatroom invitations"

-msgstr "Ignoruoti kvietimus į konferencijas ir pokalbių kambarius"

-

-msgid "Chat room list URL"

-msgstr "Pokalbių kambarių sąrašo URL"

-

-msgid "Yahoo Chat server"

-msgstr "Yahoo pokalbių serveris"

-

-msgid "Yahoo Chat port"

-msgstr "Yahoo pokalbių serverio prievadas"

-

-#. Write a local message to this conversation showing that a request for a

-#. * Doodle session has been made

-#.

-msgid "Sent Doodle request."

-msgstr "Nusiųsta Doodle užklausa."

-

-msgid "Unable to establish file descriptor."

-msgstr "Negalima nustatyti failo deskriptoriaus."

-

-#, c-format

-msgid "%s is trying to send you a group of %d files.\n"

-msgstr "%s siūlo atsiųsti %d failo(-ų) grupę\n"

-

-msgid "Yahoo! Japan Profile"

-msgstr "Yahoo! Japonija profilis"

-

-msgid "Yahoo! Profile"

-msgstr "Yahoo! profilis"

-

-msgid ""

-"Sorry, profiles marked as containing adult content are not supported at this "

-"time."

-msgstr ""

-"Atsiprašome, profiliai, pažymėti kaip tik suaugusiems, nėra palaikomi šiuo "

-"metu."

-

-msgid ""

-"If you wish to view this profile, you will need to visit this link in your "

-"web browser:"

-msgstr "Jeigu norite pamatyti šį profilį, turite šį saitą atverti naršyklėje:"

-

-msgid "Yahoo! ID"

-msgstr "Yahoo! ID"

-

-msgid "Hobbies"

-msgstr "Hobiai"

-

-msgid "Latest News"

-msgstr "Naujienos"

-

-msgid "Home Page"

-msgstr "Namų puslapis"

-

-msgid "Cool Link 1"

-msgstr "Puiki nuoroda 1"

-

-msgid "Cool Link 2"

-msgstr "Puiki nuoroda 2"

-

-msgid "Cool Link 3"

-msgstr "Puiki nuoroda 3"

-

-msgid "Last Update"

-msgstr "Paskutinis atnaujinimas"

-

-msgid ""

-"This profile is in a language or format that is not supported at this time."

-msgstr "Šis profilis parašytas šiuo metu nepalaikoma kalba ar formatu."

-

-msgid ""

-"Could not retrieve the user's profile. This most likely is a temporary "

-"server-side problem. Please try again later."

-msgstr ""

-"Nepavyko gauti vartotojo profilio.  Greičiausiai tai yra laikina serverio "

-"problema.  Prašome pabandyti vėliau iš naujo."

-

-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 ""

-"Nepavyko gauti vartotojo profilio.  Greičiausiai tai reiškia, kad toks "

-"vartuotojas neegzistuoja.  Tačiau kartais Yahoo! nepavyksta surasti "

-"egzistuojančio vartotojo profilio, todėl jei žinote, kad toks vartotojas "

-"egzistuoja, pabandykite vėliau iš naujo."

-

-msgid "The user's profile is empty."

-msgstr "Tuščias vartotojo profilis."

-

-#, c-format

-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."

-msgstr ""

-"Vartotojas %s atmetė Jūsų konferencijos pakvietimą į kambarį „%s“ dėl "

-"priežasties „%s“."

-

-msgid "Invitation Rejected"

-msgstr "Pakvietimas atmestas"

-

-msgid "Failed to join chat"

-msgstr "Nepavyko prisijungti prie pokalbio"

-

-#. -6

-msgid "Unknown room"

-msgstr "Nežinomas kambarys"

-

-#. -15

-msgid "Maybe the room is full"

-msgstr "Galbūt kambarys yra pilnas"

-

-#. -35

-msgid "Not available"

-msgstr "Neprieinamas"

-

-msgid ""

-"Unknown error. You may need to logout and wait five minutes before being "

-"able to rejoin a chatroom"

-msgstr ""

-"Nežinoma klaida. Jums gali tektis atsijungti ir palaukti penkias minutės "

-"prieš atgaunant galimybę prisijungti prie pokalbių kambario"

-

-#, c-format

-msgid "You are now chatting in %s."

-msgstr "Jūs dabar kalbate %s."

-

-msgid "Failed to join buddy in chat"

-msgstr "Nepavyko prisijungti prie bičiulio pokalbių kambaryje"

-

-msgid "Maybe they're not in a chat?"

-msgstr "Galbūt jie nėra pokalbių kambaryje?"

-

-msgid "Fetching the room list failed."

-msgstr "Nepavyko gauti kambarių sąrašo."

-

-msgid "Voices"

-msgstr "Balsai"

-

-msgid "Webcams"

-msgstr "Internetinės kameros"

-

-msgid "Unable to fetch room list."

-msgstr "Nepavyko gauti kambarių sąrašo."

-

-msgid "User Rooms"

-msgstr "Vartotojų kambariai"

-

-msgid "Connection problem with the YCHT server."

-msgstr "Jungties su YCHT serveriu problemos."

-

-#, c-format

-msgid ""

-"Lost connection with server\n"

-"%s"

-msgstr ""

-"Prarastas prisijungimas prie serverio\n"

-"%s"

-

-msgid ""

-"(There was an error converting this message.\t Check the 'Encoding' option "

-"in the Account Editor)"

-msgstr ""

-"(Įvyko pranešimo konvertavimo klaida. Patikrinkite parinktį „Koduotė“ "

-"paskyrų redaktoriuje)"

-

-#, c-format

-msgid "Unable to send to chat %s,%s,%s"

-msgstr "Nepavyko išsiųsti žinutės į pokalbių kambarį %s,%s,%s"

-

-msgid "Hidden or not logged-in"

-msgstr "Pasislėpęs arba neprisijungęs"

-

-#, c-format

-msgid "<br>At %s since %s"

-msgstr "<br>Prisijungęs prie %s nuo %s"

-

-msgid "Anyone"

-msgstr "Bet kas"

-

-msgid "_Class:"

-msgstr "_Klasė"

-

-msgid "_Instance:"

-msgstr "_Instancija"

-

-msgid "_Recipient:"

-msgstr "_Gavėjas:"

-

-#, c-format

-msgid "Attempt to subscribe to %s,%s,%s failed"

-msgstr "Bandymas užsirašyti į %s,%s,%s nepavyko"

-

-msgid "zlocate &lt;nick&gt;: Locate user"

-msgstr "zlocate &lt;slapyvardis&gt;:  surasti vartotoją"

-

-msgid "zl &lt;nick&gt;: Locate user"

-msgstr "zl &lt;slapyvardis&gt;:  surasti vartotoją"

-

-msgid "instance &lt;instance&gt;: Set the instance to be used on this class"

-msgstr ""

-"instance &lt;instancija&gt;:  nustatyti šioje klasėje vartojamą instanciją"

-

-msgid "inst &lt;instance&gt;: Set the instance to be used on this class"

-msgstr "inst &lt;instancija&gt;:  nustatyti šioje klasėje vartojamą instanciją"

-

-msgid "topic &lt;instance&gt;: Set the instance to be used on this class"

-msgstr ""

-"topic &lt;instancija&gt;:  nustatyti šioje klasėje vartojamą instanciją"

-

-msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"

-msgstr ""

-"sub &lt;klasė&gt; &lt;instancija&gt; &lt;gavėjas&gt;:  prisijungti prie "

-"naujo pokalbio"

-

-msgid ""

-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"

-msgstr ""

-"zi &lt;instancija&gt;:  siųsti žinutę adresu &lt;ŽINUTĖ,<i>instancija</i>,"

-"*&gt;"

-

-msgid ""

-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"

-"<i>instance</i>,*&gt;"

-msgstr ""

-"zci &lt;klasė&gt; &lt;instancija&gt;:  siųsti žinutę adresu &lt;<i>klasė</"

-"i>, <i>instancija</i>,*&gt;"

-

-msgid ""

-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"

-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"

-msgstr ""

-"zcir &lt;klasė&gt; &lt;instancija&gt; &lt;gavėjas&gt;:  siųsti žinutę adresu "

-"&lt;<i>klasė</i>,<i>instancija</i>,<i>gavėjas</i>&gt;"

-

-msgid ""

-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"

-"<i>instance</i>,<i>recipient</i>&gt;"

-msgstr ""

-"zir &lt;instancija&gt; &lt;gavėjas&gt;:  siųsti žinutę adresu &lt;ŽINUTĖ,"

-"<i>instancija</i>,<i>gavėjas</i>&gt;"

-

-msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"

-msgstr ""

-"zc &lt;klasė&gt;:  siųsti žinutę adresu &lt;<i>klasė</i>,ASMENINĖ,*&gt;"

-

-msgid "Resubscribe"

-msgstr "Prisiregistruoti iš naujo"

-

-msgid "Retrieve subscriptions from server"

-msgstr "Gauti registracijas iš serverio"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Zephyr Protocol Plugin"

-msgstr "Zephyr protokolo papildinys"

-

-msgid "Use tzc"

-msgstr "Naudoti „tzc“"

-

-msgid "tzc command"

-msgstr "„tzc“ komanda"

-

-msgid "Export to .anyone"

-msgstr "Eksportuoti į .anyone"

-

-msgid "Export to .zephyr.subs"

-msgstr "Eksportuoti į .zephyr.subs"

-

-msgid "Import from .anyone"

-msgstr "Importuoti iš .anyone"

-

-msgid "Import from .zephyr.subs"

-msgstr "Importuoti iš .zephyr.subs"

-

-msgid "Realm"

-msgstr "Sritis"

-

-msgid "Exposure"

-msgstr "Atskleidimas"

-

-#, c-format

-msgid ""

-"Unable to create socket:\n"

-"%s"

-msgstr ""

-"Nepavyko sukurti jungties:\n"

-"%s"

-

-#  Data is assumed to be the destination sn

-#, c-format

-msgid "Unable to parse response from HTTP proxy: %s\n"

-msgstr "Nepavyko suprasti HTTP tarpininko serverio atsakymo: %s\n"

-

-#, c-format

-msgid "HTTP proxy connection error %d"

-msgstr "HTTP tarpininko serverio jungties klaida %d"

-

-#, c-format

-msgid "Access denied: HTTP proxy server forbids port %d tunneling."

-msgstr ""

-"Kreiptis atmesta: tarpininkaujantis serveris draudžia prievado %d "

-"tuneliavimą."

-

-#, c-format

-msgid "Error resolving %s"

-msgstr "Klaida nustatant %s"

-

-msgid "Could not resolve host name"

-msgstr "Nepavyko nustatyti mazgo IP adreso"

-

-#, c-format

-msgid "Requesting %s's attention..."

-msgstr "Prašoma %s dėmesio..."

-

-#, c-format

-msgid "%s has requested your attention!"

-msgstr "%s paprašė jūsų dėmesio!"

-

-#  *

-#  * A wrapper for Pidgin_request_action() that uses Yes and No buttons.

-#. *

-#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.

-#.

-msgid "_Yes"

-msgstr "_Taip"

-

-msgid "_No"

-msgstr "_Ne"

-

-#. *

-#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.

-#.

-msgid "_Accept"

-msgstr "_Priimti"

-

-#. *

-#. * The default message to use when the user becomes auto-away.

-#.

-msgid "I'm not here right now"

-msgstr "Manęs čia nėra šiuo metu"

-

-msgid "saved statuses"

-msgstr "išsaugotos būsenos"

-

-#, c-format

-msgid "%s is now known as %s.\n"

-msgstr "%s dabar žinomas kaip %s.\n"

-

-#, c-format

-msgid ""

-"%s has invited %s to the chat room %s:\n"

-"%s"

-msgstr ""

-"Vartotojas %s pakvietė bičiulį %s į pokalbių kambarį %s:\n"

-"%s"

-

-#, c-format

-msgid "%s has invited %s to the chat room %s\n"

-msgstr "Vartotojas %s pakvietė bičiulį %s į pokalbių kambarį %s\n"

-

-msgid "Accept chat invitation?"

-msgstr "Ar priimti pakvietimą į pokalbių kambarį?"

-

-#. Shortcut

-msgid "Shortcut"

-msgstr "Klavišų seka"

-

-msgid "The text-shortcut for the smiley"

-msgstr "Šypsenėlės klavišų seka"

-

-#. Stored Image

-msgid "Stored Image"

-msgstr "Įrašytas vaizdas"

-

-msgid "Stored Image. (that'll have to do for now)"

-msgstr "Įrašytas paveiksliukas. (kol kas reikia tenkintis tuo)"

-

-msgid "SSL Connection Failed"

-msgstr "SSL prisijungimas nepavyko"

-

-msgid "SSL Handshake Failed"

-msgstr "SSL pasisveikinimas nepavyko"

-

-msgid "SSL peer presented an invalid certificate"

-msgstr "SSL partneris pristatė neteisingą liudijimą"

-

-msgid "Unknown SSL error"

-msgstr "Nežinoma SSL klaida"

-

-msgid "Unset"

-msgstr "Atstatyti"

-

-msgid "Do not disturb"

-msgstr "Netrukdyti"

-

-msgid "Extended away"

-msgstr "Ilgam pasitraukęs"

-

-msgid "Mobile"

-msgstr "Mobilus"

-

-msgid "Listening to music"

-msgstr "Klausausi muzikos"

-

-#, c-format

-msgid "%s (%s) changed status from %s to %s"

-msgstr "%s (%s) pakeitė būseną iš %s į %s"

-

-#, c-format

-msgid "%s (%s) is now %s"

-msgstr "%s (%s) dabar %s"

-

-#, c-format

-msgid "%s (%s) is no longer %s"

-msgstr "%s (%s) nebe %s"

-

-#, c-format

-msgid "%s became idle"

-msgstr "%s tapo neveiklus"

-

-#, c-format

-msgid "%s became unidle"

-msgstr "%s tapo veiklus"

-

-#, c-format

-msgid "+++ %s became idle"

-msgstr "+++ %s tapo neveiklus"

-

-#, c-format

-msgid "+++ %s became unidle"

-msgstr "+++ %s tapo veiklus"

-

-#.

-#. * This string determines how some dates are displayed.  The default

-#. * string "%x %X" shows the date then the time.  Translators can

-#. * change this to "%X %x" if they want the time to be shown first,

-#. * followed by the date.

-#.

-#, c-format

-msgid "%x %X"

-msgstr "%x %X"

-

-#, c-format

-msgid "Error Reading %s"

-msgstr "%s skaitymo klaida"

-

-#, c-format

-msgid ""

-"An error was encountered reading your %s.  They have not been loaded, and "

-"the old file has been renamed to %s~."

-msgstr ""

-"Failo %s skaitymo metu įvyko klaida.  Failas įkeltas nebuvo, o senasis "

-"failas pervadintas į %s~."

-

-msgid "Calculating..."

-msgstr "Skaičiuojama..."

-

-msgid "Unknown."

-msgstr "Nežinoma."

-

-#, c-format

-msgid "%d second"

-msgid_plural "%d seconds"

-msgstr[0] "%d sekundė"

-msgstr[1] "%d sekundės"

-msgstr[2] "%d sekundžių"

-

-#, c-format

-msgid "%d day"

-msgid_plural "%d days"

-msgstr[0] "%d diena"

-msgstr[1] "%d dienos"

-msgstr[2] "%d dienų"

-

-#, c-format

-msgid "%s, %d hour"

-msgid_plural "%s, %d hours"

-msgstr[0] "%s, %d valanda"

-msgstr[1] "%s, %d valandos"

-msgstr[2] "%s, %d valandų"

-

-#, c-format

-msgid "%d hour"

-msgid_plural "%d hours"

-msgstr[0] "%d valanda"

-msgstr[1] "%d valandos"

-msgstr[2] "%d valandų"

-

-#, c-format

-msgid "%s, %d minute"

-msgid_plural "%s, %d minutes"

-msgstr[0] "%s, %d minutė"

-msgstr[1] "%s, %d minutės"

-msgstr[2] "%s, %d minučių"

-

-#, c-format

-msgid "%d minute"

-msgid_plural "%d minutes"

-msgstr[0] "%d minutė"

-msgstr[1] "%d minutės"

-msgstr[2] "%d minučių"

-

-#, c-format

-msgid "Could not open %s: Redirected too many times"

-msgstr "Nepavyko atverti %s: per daug peradresavimų"

-

-#, c-format

-msgid "Unable to connect to %s"

-msgstr "Nepavyko prisijungti prie %s"

-

-#, c-format

-msgid "Error reading from %s: response too long (%d bytes limit)"

-msgstr ""

-"Skaitymo iš %s klaida: atsakymas per ilgas (maksimalus ilgis baitais: %d)"

-

-#, c-format

-msgid ""

-"Unable to allocate enough memory to hold the contents from %s.  The web "

-"server may be trying something malicious."

-msgstr ""

-"Negalima išskirti pakankamai atminties %s turinio saugojimui.  Galbūt\n"

-"žiniatinklio serveris tyčia bando padaryti kažką blogo."

-

-#, c-format

-msgid "Error reading from %s: %s"

-msgstr "Skaitymo iš %s klaida: %s"

-

-#, c-format

-msgid "Error writing to %s: %s"

-msgstr "Rašymo į %s klaida: %s"

-

-#, c-format

-msgid "Unable to connect to %s: %s"

-msgstr "Nepavyko prisijungti prie %s: %s"

-

-#, c-format

-msgid " - %s"

-msgstr " – %s"

-

-#, c-format

-msgid " (%s)"

-msgstr " (%s)"

-

-#. 10053

-#, c-format

-msgid "Connection interrupted by other software on your computer."

-msgstr "Jungtis nutraukta kitos programos jūsų kompiuteryje."

-

-#. 10054

-#, c-format

-msgid "Remote host closed connection."

-msgstr "Nutolęs mazgas uždarė jungtį."

-

-#. 10060

-#, c-format

-msgid "Connection timed out."

-msgstr "Jungties laukimo laikas baigėsi."

-

-#. 10061

-#, c-format

-msgid "Connection refused."

-msgstr "Jungtis atmesta."

-

-#. 10048

-#, c-format

-msgid "Address already in use."

-msgstr "Adresas jau užimtas"

-

-msgid "Internet Messenger"

-msgstr "Pokalbiai internete"

-

-msgid "Pidgin Internet Messenger"

-msgstr "Pidgin pokalbiai internete"

-

-msgid "Send instant messages over multiple protocols"

-msgstr "Bendrauti keliais interneto pokalbių protokolais"

-

-msgid "Orientation"

-msgstr "Orientacija"

-

-msgid "The orientation of the tray."

-msgstr "Juostelės orientacija"

-

-#. Build the login options frame.

-msgid "Login Options"

-msgstr "Seanso pradžios parinktys"

-

-msgid "Pro_tocol:"

-msgstr "Pro_tokolas:"

-

-msgid "_Username:"

-msgstr "_Vartotojo vardas:"

-

-msgid "Remember pass_word"

-msgstr "P_risiminti slaptažodį"

-

-#. Build the user options frame.

-msgid "User Options"

-msgstr "Vartotojo parinktys"

-

-msgid "_Local alias:"

-msgstr "Vietinis a_lternatyvusis vardas:"

-

-msgid "New _mail notifications"

-msgstr "Praneši_mai apie naujus laiškus"

-

-#. Buddy icon

-msgid "Use this buddy _icon for this account:"

-msgstr "Naudot_i tokį vartotojo paveiksliuką šiai paskyrai:"

-

-#. Build the protocol options frame.

-#, c-format

-msgid "%s Options"

-msgstr "%s parinktys"

-

-#  Use Global Proxy Settings

-#  Use Global Proxy Settings

-msgid "Use GNOME Proxy Settings"

-msgstr "naudoti GNOME tarpininkų nuostatas"

-

-#  Use Global Proxy Settings

-#  Use Global Proxy Settings

-msgid "Use Global Proxy Settings"

-msgstr "naudoti visuotines tarpininkų nuostatas"

-

-msgid "No Proxy"

-msgstr "be tarpininkų"

-

-msgid "HTTP"

-msgstr "HTTP"

-

-msgid "SOCKS 4"

-msgstr "SOCKS 4"

-

-msgid "SOCKS 5"

-msgstr "SOCKS 5"

-

-#  Use Environmental Settings

-msgid "Use Environmental Settings"

-msgstr "naudoti aplinkos nuostatas"

-

-#. This is an easter egg.

-#. It means one of two things, both intended as humourus:

-#. A) your network is really slow and you have nothing better to do than

-#. look at butterflies.

-#. B)You are looking really closely at something that shouldn't matter.

-msgid "If you look real closely"

-msgstr "Jei pažiūrėtumėte tikrai iš arti,"

-

-#. This is an easter egg. See the comment on the previous line in the source.

-msgid "you can see the butterflies mating"

-msgstr "galėtumėte matyti besiporuojancius drugelius"

-

-msgid "Proxy Options"

-msgstr "Tarpininko parinktys"

-

-msgid "Proxy _type:"

-msgstr "Tarpininko _tipas:"

-

-msgid "_Host:"

-msgstr "_Mazgas:"

-

-msgid "_Port:"

-msgstr "_Prievadas:"

-

-msgid "Pa_ssword:"

-msgstr "_Slaptažodis:"

-

-msgid "Unable to save new account"

-msgstr "Nepavyko įrašyti naujos paskyros"

-

-msgid "An account already exists with the specified criteria."

-msgstr "Paskyra su tokiais požymiais jau yra."

-

-msgid "Add Account"

-msgstr "Pridėti paskyrą"

-

-msgid "_Basic"

-msgstr "_Pagrindinės nuostatos"

-

-msgid "Create _this new account on the server"

-msgstr "Sukur_ti šią naują paskyrą serveryje"

-

-msgid "_Advanced"

-msgstr "Papildomos _nuostatos"

-

-msgid "Enabled"

-msgstr "Įjungta"

-

-msgid "Protocol"

-msgstr "Protokolas"

-

-#, c-format

-msgid ""

-"<span size='larger' weight='bold'>Welcome to %s!</span>\n"

-"\n"

-"You have no IM accounts configured. To start connecting with %s press the "

-"<b>Add...</b> button below and configure your first account. If you want %s "

-"to connect to multiple IM accounts, press <b>Add...</b> again to configure "

-"them all.\n"

-"\n"

-"You can come back to this window to add, edit, or remove accounts from "

-"<b>Accounts->Manage Accounts</b> in the Buddy List window"

-msgstr ""

-"<span size='larger' weight='bold'>Sveikiname pradėjus naudoti %s!</span>\n"

-"\n"

-"Jūs neturite nustatytų paskyrų.  Norėdami su %s prisijungti, paspauskite "

-"<b>Pridėti...</b> mygtuką žemiau ir sukonfigūruokite pirmąją savo paskyrą.  "

-"Jei norite, kad %s prisijungtų prie daugiau paskyrų, paspauskite "

-"<b>Pridėti...</b> daugiau kartų ir sukonfigūruokite visas paskyras.\n"

-"\n"

-"Vėliau galite sugrįžti į šį langą sukurti, keisti, ar pašalinti paskyrų per "

-"<b>Paskyros->Tvarkyti paskyras</b> meniu bičiulių sąrašo lange."

-

-#, c-format

-msgid "You have %d contact named %s. Would you like to merge them?"

-msgid_plural ""

-"You currently have %d contacts named %s. Would you like to merge them?"

-msgstr[0] "Šiuo metu turite %d kontaktą vardu %s.  Ar norite juos sujungti?"

-msgstr[1] "Šiuo metu turite %d kontaktus vardu %s.  Ar norite juos sujungti?"

-msgstr[2] "Šiuo metu turite %d kontaktų vardu %s.  Ar norite juos sujungti?"

-

-msgid ""

-"Merging these contacts will cause them to share a single entry on the buddy "

-"list and use a single conversation window. You can separate them again by "

-"choosing 'Expand' from the contact's context menu"

-msgstr ""

-"Po šių kontaktų suliejimo jie dalinsis bendrą įrašą bičiulių sąraše ir "

-"naudos brendrą pokalbių langą.  Galite juos vėl atskirti pasirinkdami "

-"„Išskleisti“ kontakto kontekstiniame meniu."

-

-msgid "Please update the necessary fields."

-msgstr "Pataisykite būtinus laukus."

-

-msgid "Room _List"

-msgstr "Ka_mbarių sąrašas"

-

-msgid ""

-"Please enter the appropriate information about the chat you would like to "

-"join.\n"

-msgstr ""

-"Prašome įvesti atitinkamą informaciją apie pokalbį, prie kurio norite "

-"prisijungti\n"

-

-msgid "_Account:"

-msgstr "P_askyra:"

-

-#  Block button

-msgid "_Block"

-msgstr "_Blokuoti"

-

-#  Block button

-msgid "Un_block"

-msgstr "_Nebeblokuoti"

-

-msgid "Move to"

-msgstr "Perkelti į"

-

-msgid "Get _Info"

-msgstr "Gauti _informaciją"

-

-msgid "I_M"

-msgstr "_Kalbėtis"

-

-msgid "_Send File..."

-msgstr "_Siųsti failą..."

-

-msgid "Add Buddy _Pounce..."

-msgstr "Sukurti #reakciją į bičiulį..."

-

-msgid "View _Log"

-msgstr "Žiūrėti žurna_lą"

-

-msgid "Hide when offline"

-msgstr "Paslėpti, kai neprisijungęs"

-

-msgid "_Alias..."

-msgstr "N_aujas alternatyvusis vardas..."

-

-msgid "_Remove"

-msgstr "_Pašalinti"

-

-msgid "Set Custom Icon"

-msgstr "Nustatyti specialų paveiksliuką"

-

-msgid "Remove Custom Icon"

-msgstr "Pašalinti specialų vartotojo paveiksliuką"

-

-msgid "Add _Buddy..."

-msgstr "Pridėti _bičiulį..."

-

-msgid "Add C_hat..."

-msgstr "Pridėti pokalbių _kambarį..."

-

-msgid "_Delete Group"

-msgstr "_Pašalinti grupę"

-

-msgid "_Rename"

-msgstr "P_ervadinti"

-

-#  join button

-#. join button

-msgid "_Join"

-msgstr "Prisi_jungti"

-

-msgid "Auto-Join"

-msgstr "Automatiškai prisijungti"

-

-msgid "Persistent"

-msgstr "Pastovus"

-

-#  Use Environmental Settings

-msgid "_Edit Settings..."

-msgstr "K_eisti nuostatas..."

-

-msgid "_Collapse"

-msgstr "_Suskleisti"

-

-msgid "_Expand"

-msgstr "Išskl_eisti"

-

-msgid "/Tools/Mute Sounds"

-msgstr "/Įrankiai/Išjungti garsus"

-

-msgid ""

-"You are not currently signed on with an account that can add that buddy."

-msgstr ""

-"Šiuo metu Jūs nesate prisijungęs su paskyra, kuri leistų įtraukti šį bičiulį."

-

-#. I don't believe this can happen currently, I think

-#. * everything that calls this function checks for one of the

-#. * above node types first.

-msgid "Unknown node type"

-msgstr "Nežinomas mazgo tipas"

-

-#  Buddies menu

-#. Buddies menu

-msgid "/_Buddies"

-msgstr "/_Bičiuliai"

-

-msgid "/Buddies/New Instant _Message..."

-msgstr "/Bičiuliai/_Nauja žinutė..."

-

-msgid "/Buddies/Join a _Chat..."

-msgstr "/Bičiuliai/Prisijungti prie _pokalbio..."

-

-msgid "/Buddies/Get User _Info..."

-msgstr "/Bičiuliai/Ga_uti vartotojo informaciją..."

-

-msgid "/Buddies/View User _Log..."

-msgstr "/Buddies/_Rodyti vartotojo žurnalus..."

-

-#  Buddies menu

-msgid "/Buddies/Sh_ow"

-msgstr "/Bičiuliai/R_odyti"

-

-msgid "/Buddies/Show/_Offline Buddies"

-msgstr "/Bičiuliai/Rodyti/_atsijungusius bičiulius"

-

-msgid "/Buddies/Show/_Empty Groups"

-msgstr "/Bičiuliai/Rodyti/_tuščias grupes"

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-msgid "/Buddies/Show/Buddy _Details"

-msgstr "/Bičiuliai/Rodyti/_informaciją apie bičiulius"

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-msgid "/Buddies/Show/Idle _Times"

-msgstr "/Bičiuliai/Rodyti/n_eveiklumo laikus"

-

-msgid "/Buddies/Show/_Protocol Icons"

-msgstr "/Bičiuliai/Rodyti/_protokolų piktogramas"

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-msgid "/Buddies/_Sort Buddies"

-msgstr "/Bičiuliai/_Surikiuoti bičiulius"

-

-msgid "/Buddies/_Add Buddy..."

-msgstr "/Bičiuliai/Pri_dėti bičiulį..."

-

-msgid "/Buddies/Add C_hat..."

-msgstr "/Bičiuliai/Pridėti pokalbių _kambarį..."

-

-msgid "/Buddies/Add _Group..."

-msgstr "/Bičiuliai/Prid_ėti grupę..."

-

-msgid "/Buddies/_Quit"

-msgstr "/Bičiuliai/Bai_gti"

-

-#. Accounts menu

-msgid "/_Accounts"

-msgstr "/_Paskyros"

-

-msgid "/Accounts/Manage Accounts"

-msgstr "/Paskyros/Tvarkyti paskyras"

-

-#  Tools

-#. Tools

-msgid "/_Tools"

-msgstr "/_Įrankiai"

-

-msgid "/Tools/Buddy _Pounces"

-msgstr "/Įrankiai/_Reakcijos į bičiulius"

-

-msgid "/Tools/_Certificates"

-msgstr "/Įrankiai/_Liudijimai"

-

-msgid "/Tools/Plu_gins"

-msgstr "/Įrankiai/_Papildiniai"

-

-msgid "/Tools/Pr_eferences"

-msgstr "/Įrankiai/_Nuostatos"

-

-msgid "/Tools/Pr_ivacy"

-msgstr "/Įrankiai/Pr_ivatumas"

-

-msgid "/Tools/Smile_y"

-msgstr "/Įrankiai/_Šypsenėlės"

-

-msgid "/Tools/_File Transfers"

-msgstr "/Įrankiai/_Failų perdavimas"

-

-msgid "/Tools/R_oom List"

-msgstr "/Įrankiai/_Kambarių sąrašas"

-

-msgid "/Tools/System _Log"

-msgstr "/Įrankiai/_Sistemos žurnalas"

-

-msgid "/Tools/Mute _Sounds"

-msgstr "/Tools/Išjungti _garsus"

-

-#  Help

-#. Help

-msgid "/_Help"

-msgstr "/Pa_galba"

-

-msgid "/Help/Online _Help"

-msgstr "/Pagalba/_Žinynas internete"

-

-msgid "/Help/_Debug Window"

-msgstr "/Pagalba/_Derinimo langas"

-

-msgid "/Help/_About"

-msgstr "/Pagalba/_Apie"

-

-#, c-format

-msgid "<b>Account:</b> %s"

-msgstr "<b>Paskyra:</b> %s"

-

-#, c-format

-msgid ""

-"\n"

-"<b>Occupants:</b> %d"

-msgstr ""

-"\n"

-"<b>Dalyvių:</b> %d"

-

-#, c-format

-msgid ""

-"\n"

-"<b>Topic:</b> %s"

-msgstr ""

-"\n"

-"<b>Tema:</b> %s"

-

-msgid "(no topic set)"

-msgstr "(temos nėra)"

-

-msgid "Buddy Alias"

-msgstr "Alternatyvusis bičiulio vardas"

-

-msgid "Logged In"

-msgstr "Prisijungęs"

-

-msgid "Last Seen"

-msgstr "Paskutinį kartą matytas"

-

-msgid "Spooky"

-msgstr "Vaiduokliškas"

-

-msgid "Awesome"

-msgstr "Stulbinantis"

-

-msgid "Rockin'"

-msgstr "Pavarantis"

-

-msgid "Total Buddies"

-msgstr "Iš viso bičiulių"

-

-#, c-format

-msgid "Idle %dd %dh %02dm"

-msgstr "Neveiklus %d d. %d val. %02d min. "

-

-#, c-format

-msgid "Idle %dh %02dm"

-msgstr "Neveiklus %d val. %02d min. "

-

-#, c-format

-msgid "Idle %dm"

-msgstr "Neveiklus %d min. "

-

-msgid "/Buddies/New Instant Message..."

-msgstr "/Bičiuliai/Nauja žinutė..."

-

-#  Make menu items sensitive/insensitive where appropriate

-msgid "/Buddies/Join a Chat..."

-msgstr "/Bičiuliai/Prisijungti prie pokalbio..."

-

-msgid "/Buddies/Get User Info..."

-msgstr "/Bičiuliai/Gauti vartotojo informaciją..."

-

-msgid "/Buddies/Add Buddy..."

-msgstr "/Bičiuliai/Pridėti bičiulį..."

-

-msgid "/Buddies/Add Chat..."

-msgstr "/Bičiuliai/Pridėti pokalbių kambarį..."

-

-msgid "/Buddies/Add Group..."

-msgstr "/Bičiuliai/Pridėti grupę..."

-

-msgid "/Tools/Privacy"

-msgstr "/Įrankiai/Privatumas"

-

-msgid "/Tools/Room List"

-msgstr "/Įrankiai/Kambarių sąrašas"

-

-#, c-format

-msgid "%d unread message from %s\n"

-msgid_plural "%d unread messages from %s\n"

-msgstr[0] "%d neperskaityta žinutė iš %s\n"

-msgstr[1] "%d neperskaitytos žinutės iš %s\n"

-msgstr[2] "%d neperskaitytų žinučių iš %s\n"

-

-msgid "Manually"

-msgstr "rankiniu būdu"

-

-msgid "By status"

-msgstr "pagal statusą"

-

-msgid "By log size"

-msgstr "pagal žurnalo dydį"

-

-#, c-format

-msgid "%s disconnected"

-msgstr "%s atsijungė"

-

-#, c-format

-msgid "%s disabled"

-msgstr "%s išjungtas"

-

-msgid "Reconnect"

-msgstr "Jungtis iš naujo"

-

-msgid "Re-enable"

-msgstr "Aktyvuoti vėl"

-

-msgid "Welcome back!"

-msgstr "Sveiki sugrįžę!"

-

-#, c-format

-msgid "%d account was disabled because you signed on from another location:"

-msgid_plural ""

-"%d accounts were disabled because you signed on from another location:"

-msgstr[0] "%d paskyra buvo išjungta, nes prisijungėte iš kitur:"

-msgstr[1] "%d paskyros buvo išjungtos, nes prisijungėte iš kitur:"

-msgstr[2] "%d paskyrų buvo išjungta, nes prisijungėte iš kitur:"

-

-msgid "<b>Username:</b>"

-msgstr "<b>Vartotojo vardas:</b>"

-

-msgid "<b>Password:</b>"

-msgstr "<b>Slaptažodis:</b>"

-

-msgid "_Login"

-msgstr "_Prisijungti"

-

-msgid "/Accounts"

-msgstr "/Paskyros"

-

-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy

-#, c-format

-msgid ""

-"<span weight='bold' size='larger'>Welcome to %s!</span>\n"

-"\n"

-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"

-"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "

-"you'll be able to sign on, set your status, and talk to your friends."

-msgstr ""

-"<span weight='bold' size='larger'>Sveikiname pradėjus naudoti %s!</span>\n"

-"\n"

-"Jūs neturite aktyvuotų paskyrų.  Aktyvuokite jas lange <b>„Paskyros“</b>, "

-"pasiekiamame per <b>Paskyros->Tvarkyti paskyras</b> meniu bičiulių sąrašo "

-"lange.  Aktyvavę paskyras, galėsite prisijungti, nustatyti savo būseną ir "

-"šnekėtis su draugais."

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-#. set the Show Offline Buddies option. must be done

-#. * after the treeview or faceprint gets mad. -Robot101

-#.

-msgid "/Buddies/Show/Offline Buddies"

-msgstr "/Bičiuliai/Rodyti/atsijungusius bičiulius"

-

-msgid "/Buddies/Show/Empty Groups"

-msgstr "/Bičiuliai/Rodyti/tuščias grupes"

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-msgid "/Buddies/Show/Buddy Details"

-msgstr "/Bičiuliai/Rodyti/informaciją apie bičiulius"

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-msgid "/Buddies/Show/Idle Times"

-msgstr "/Bičiuliai/Rodyti/neveiklumo laikus"

-

-msgid "/Buddies/Show/Protocol Icons"

-msgstr "/Bičiuliai/Rodyti/protokolų piktogramas"

-

-msgid "Add a buddy.\n"

-msgstr "Pridėti bičiulį.\n"

-

-msgid "Buddy's _username:"

-msgstr "_Bičiulio naudotojo vardas:"

-

-#  Optional Information section

-msgid "(Optional) A_lias:"

-msgstr "(Neprivaloma) A_lternatyvus vardas:"

-

-msgid "Add buddy to _group:"

-msgstr "Bičiulį pridėti į _grupę:"

-

-msgid "This protocol does not support chat rooms."

-msgstr "Šis protokolas nepalaiko pokalbių kambarių."

-

-msgid ""

-"You are not currently signed on with any protocols that have the ability to "

-"chat."

-msgstr ""

-"Šiuo metu nesate prisijungęs su jokiu pokalbių kambarius palaikančiu "

-"protokolu."

-

-msgid ""

-"Please enter an alias, and the appropriate information about the chat you "

-"would like to add to your buddy list.\n"

-msgstr ""

-"Prašome įvesti alternatyvųjį vardą ir kitą informaciją apie pokalbių "

-"kambarį, kurį norite įtraukti į bičiulių sąrašą.\n"

-

-msgid "A_lias:"

-msgstr "A_lternatyvusis vardas:"

-

-msgid "Auto_join when account becomes online."

-msgstr "Automatiškai prisi_jungti, kai paskyra aktyvuojama."

-

-msgid "_Remain in chat after window is closed."

-msgstr "_Pasilikti pokalbyje ir uždarius langą."

-

-msgid "Please enter the name of the group to be added."

-msgstr "Prašome įvesti pridedamos grupės pavadinimą."

-

-msgid "Enable Account"

-msgstr "Aktyvuoti paskyrą"

-

-msgid "<PurpleMain>/Accounts/Enable Account"

-msgstr "<PurpleMain>/Paskyros/Aktyvuoti paskyrą"

-

-msgid "<PurpleMain>/Accounts/"

-msgstr "<PurpleMain>/Paskyros/"

-

-msgid "_Edit Account"

-msgstr "K_eisti paskyrą..."

-

-msgid "No actions available"

-msgstr "Veiksmų nėra"

-

-msgid "_Disable"

-msgstr "_Deaktyvuoti"

-

-#  Tools

-msgid "/Tools"

-msgstr "/Įrankiai"

-

-#  set the Show Offline Buddies option. must be done

-#  * after the treeview or faceprint gets mad. -Robot101

-msgid "/Buddies/Sort Buddies"

-msgstr "/Bičiuliai/Surikiuoti bičiulius"

-

-#. Widget creation function

-msgid "SSL Servers"

-msgstr "SSL serveriai"

-

-msgid "Unknown command."

-msgstr "Nežinoma komanda."

-

-msgid "That buddy is not on the same protocol as this chat."

-msgstr "Tas bičiulis nenaudoja to paties protokolo kaip šis pokalbių kambarys."

-

-msgid ""

-"You are not currently signed on with an account that can invite that buddy."

-msgstr ""

-"Šiuo metu Jūs nesate prisijungęs su jokia paskyra, kuri leistų pakviesti tą "

-"bičiulį."

-

-msgid "Invite Buddy Into Chat Room"

-msgstr "Pakviesti bičiulį į pokalbių kambarį"

-

-#  Put our happy label in it.

-#. Put our happy label in it.

-msgid ""

-"Please enter the name of the user you wish to invite, along with an optional "

-"invite message."

-msgstr ""

-"Prašom įvesti vartotojo, kurį norite pakviesti, vardą, kartu su neprivaloma "

-"pakvietimo žinute."

-

-msgid "_Buddy:"

-msgstr "_Bičiulis:"

-

-msgid "_Message:"

-msgstr "Ž_inutė:"

-

-#, c-format

-msgid "<h1>Conversation with %s</h1>\n"

-msgstr "<h1>Pokalbis su %s</h1>\n"

-

-msgid "Save Conversation"

-msgstr "Įrašyti pokalbį"

-

-msgid "Find"

-msgstr "Paieška"

-

-msgid "_Search for:"

-msgstr "_Ieškoti:"

-

-msgid "Un-Ignore"

-msgstr "Nebeignoruoti"

-

-msgid "Ignore"

-msgstr "Ignoruoti"

-

-msgid "Get Away Message"

-msgstr "Gauti pasitraukimo žinutę"

-

-msgid "Last said"

-msgstr "Paskutinė žinutė"

-

-msgid "Unable to save icon file to disk."

-msgstr "Negalima įrašyti vartotojo paveiksliuko failo į diską."

-

-msgid "Save Icon"

-msgstr "Įrašyti vartotojo paveiksliuką"

-

-msgid "Animate"

-msgstr "Animuoti"

-

-msgid "Hide Icon"

-msgstr "Paslėpti vartotojo paveiksliuką"

-

-msgid "Save Icon As..."

-msgstr "Įrasyti vartotojo paveiksliuką kaip..."

-

-msgid "Set Custom Icon..."

-msgstr "Nustatyti specialų vartotojo paveiksliuką..."

-

-msgid "Change Size"

-msgstr "Keisti dydį"

-

-msgid "Show All"

-msgstr "Viską rodyti"

-

-#  Conversation menu

-#. Conversation menu

-msgid "/_Conversation"

-msgstr "/_Pokalbis"

-

-msgid "/Conversation/New Instant _Message..."

-msgstr "/Pokalbis/_Nauja žinutė..."

-

-msgid "/Conversation/_Find..."

-msgstr "/Pokalbis/_Ieškoti..."

-

-msgid "/Conversation/View _Log"

-msgstr "/Pokalbis/Žiūrėti žurna_lą"

-

-msgid "/Conversation/_Save As..."

-msgstr "/Pokalbis/Įrašyti _kaip..."

-

-msgid "/Conversation/Clea_r Scrollback"

-msgstr "/Pokalbis/Iš_valyti langą"

-

-msgid "/Conversation/Se_nd File..."

-msgstr "/Pokalbis/Nusiųsti _failą..."

-

-msgid "/Conversation/Add Buddy _Pounce..."

-msgstr "/Pokalbis/_Pridėti reakciją į bičiulį..."

-

-msgid "/Conversation/_Get Info"

-msgstr "/Pokalbis/_Gauti informaciją"

-

-msgid "/Conversation/In_vite..."

-msgstr "/Pokalbis/_Pakviesti..."

-

-msgid "/Conversation/M_ore"

-msgstr "/Pokalbis/_Daugiau"

-

-msgid "/Conversation/Al_ias..."

-msgstr "/Pokalbis/Al_ternatyvusis vardas..."

-

-msgid "/Conversation/_Block..."

-msgstr "/Pokalbis/_Blokuoti..."

-

-msgid "/Conversation/_Unblock..."

-msgstr "/Pokalbis/Atbl_okuoti..."

-

-msgid "/Conversation/_Add..."

-msgstr "/Pokalbis/P_ridėti..."

-

-msgid "/Conversation/_Remove..."

-msgstr "/Pokalbis/P_ašalinti..."

-

-msgid "/Conversation/Insert Lin_k..."

-msgstr "/Pokalbis/_Įterpti nuorodą..."

-

-msgid "/Conversation/Insert Imag_e..."

-msgstr "/Pokalbis/Įt_erpti paveiksliuką..."

-

-msgid "/Conversation/_Close"

-msgstr "/Pokalbis/U_žverti"

-

-#  Options

-#. Options

-msgid "/_Options"

-msgstr "/P_arinktys"

-

-msgid "/Options/Enable _Logging"

-msgstr "/Parinktys/Įjungti ž_urnalų vedimą"

-

-msgid "/Options/Enable _Sounds"

-msgstr "/Parinktys/Įjungti gar_sus"

-

-msgid "/Options/Show Formatting _Toolbars"

-msgstr "/Parinktys/Rodyti forma_to taikymo priemonių juostas"

-

-msgid "/Options/Show Ti_mestamps"

-msgstr "/Parinktys/Rodyti laiko žy_mas"

-

-msgid "/Conversation/More"

-msgstr "/Pokalbis/Daugiau"

-

-#  Options

-msgid "/Options"

-msgstr "/Parinktys"

-

-#  Conversation menu

-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time

-#. * the 'Conversation' menu pops up.

-#. Make sure the 'Conversation -> More' menuitems are regenerated whenever

-#. * the 'Conversation' menu pops up because the entries can change after the

-#. * conversation is created.

-msgid "/Conversation"

-msgstr "/Pokalbis"

-

-msgid "/Conversation/View Log"

-msgstr "/Pokalbis/Rodyti žurnalą"

-

-msgid "/Conversation/Send File..."

-msgstr "/Pokalbis/Siųsti failą..."

-

-msgid "/Conversation/Add Buddy Pounce..."

-msgstr "/Pokalbis/Pridėti reakciją į bičiulį..."

-

-msgid "/Conversation/Get Info"

-msgstr "/Pokalbis/Gauti informaciją"

-

-msgid "/Conversation/Invite..."

-msgstr "/Pokalbis/Pakviesti..."

-

-msgid "/Conversation/Alias..."

-msgstr "/Pokalbis/Alternatyvusis vardas..."

-

-msgid "/Conversation/Block..."

-msgstr "/Pokalbis/Blokuoti..."

-

-msgid "/Conversation/Unblock..."

-msgstr "/Pokalbis/Atblokuoti..."

-

-msgid "/Conversation/Add..."

-msgstr "/Pokalbis/Pridėti..."

-

-msgid "/Conversation/Remove..."

-msgstr "/Pokalbis/Pašalinti..."

-

-msgid "/Conversation/Insert Link..."

-msgstr "/Pokalbis/Įterpti nuorodą..."

-

-msgid "/Conversation/Insert Image..."

-msgstr "/Pokalbis/Įterpti paveiksliuką..."

-

-msgid "/Options/Enable Logging"

-msgstr "/Parinktys/Įjungti žurnalų vedimą"

-

-msgid "/Options/Enable Sounds"

-msgstr "/Parinktys/Įjungti garsus"

-

-msgid "/Options/Show Formatting Toolbars"

-msgstr "/Parinktys/Rodyti formato taikymo priemonių juostas"

-

-msgid "/Options/Show Timestamps"

-msgstr "/Parinktys/Rodyti laiko žymas"

-

-msgid "User is typing..."

-msgstr "Vartotojas rašo..."

-

-#, c-format

-msgid ""

-"\n"

-"%s has stopped typing"

-msgstr ""

-"\n"

-"%s nustojo rašyti"

-

-#  Build the Send As menu

-#. Build the Send To menu

-msgid "S_end To"

-msgstr "_Siųsti paskyrai"

-

-#  Build the Send As menu

-msgid "_Send"

-msgstr "_Siųsti"

-

-#  Setup the label telling how many people are in the room.

-#. Setup the label telling how many people are in the room.

-msgid "0 people in room"

-msgstr "0 žmonių kambaryje"

-

-#  Setup the label telling how many people are in the room.

-#, c-format

-msgid "%d person in room"

-msgid_plural "%d people in room"

-msgstr[0] "%d asmuo kambaryje"

-msgstr[1] "%d asmenys kambaryje"

-msgstr[2] "%d asmenų kambaryje"

-

-msgid "Typing"

-msgstr "Renkamas tekstas"

-

-msgid "Stopped Typing"

-msgstr "Nustota rinkti tekstą"

-

-msgid "Nick Said"

-msgstr "Pasakytas vardas"

-

-msgid "Unread Messages"

-msgstr "Neperskaitytos žinutės"

-

-msgid "New Event"

-msgstr "Naujas įvykis"

-

-msgid "clear: Clears all conversation scrollbacks."

-msgstr "clear: išvalo visus pokalbių žinučių langus."

-

-msgid "Confirm close"

-msgstr "Patvirtinkite uždarymą"

-

-msgid "You have unread messages. Are you sure you want to close the window?"

-msgstr "Turite neperskaitytų žinučių. Ar tikrai norite uždaryti langą?"

-

-msgid "Close other tabs"

-msgstr "Uždaryti kitas korteles"

-

-msgid "Close all tabs"

-msgstr "Uždaryti visas korteles"

-

-msgid "Detach this tab"

-msgstr "Atskirti šią kortelę"

-

-msgid "Close this tab"

-msgstr "Uždaryti šią kortelę"

-

-msgid "Close conversation"

-msgstr "Uždaryti pokalbį"

-

-msgid "Last created window"

-msgstr "Paskutiniame sukurtame lange"

-

-msgid "Separate IM and Chat windows"

-msgstr "Atskiruose asmeninių pokalbių ir pokalbių kambarių languose"

-

-msgid "New window"

-msgstr "Naujame lange"

-

-msgid "By group"

-msgstr "Grupuoti pagal grupę"

-

-msgid "By account"

-msgstr "Grupuoti pagal paskyrą"

-

-msgid "Save Debug Log"

-msgstr "Įrašyti derinimo žurnalą"

-

-msgid "Invert"

-msgstr "Priešingai"

-

-msgid "Highlight matches"

-msgstr "Paryškinti rastus rezultatus"

-

-msgid "_Icon Only"

-msgstr "T_ik piktogramos"

-

-msgid "_Text Only"

-msgstr "_Tik tekstai"

-

-msgid "_Both Icon & Text"

-msgstr "_Piktogramos ir tekstai"

-

-msgid "Filter"

-msgstr "Filtras"

-

-msgid "Right click for more options."

-msgstr "Spustelėkite dešinįjį pelės mygtuką kitų parinkčių rodymui."

-

-msgid "Level "

-msgstr "Lygis "

-

-msgid "Select the debug filter level."

-msgstr "Pasirinkite derinimo informacijos filtravimo lygį."

-

-msgid "All"

-msgstr "Viskas"

-

-msgid "Misc"

-msgstr "Kiti"

-

-msgid "Warning"

-msgstr "Perspėjimai"

-

-msgid "Error "

-msgstr "Klaidos "

-

-msgid "Fatal Error"

-msgstr "Lemtingos klaidos"

-

-msgid "bug master"

-msgstr "Riktų šeimininkas"

-

-msgid "artist"

-msgstr "dailininkas"

-

-#. feel free to not translate this

-msgid "Ka-Hing Cheung"

-msgstr "Ka-Hing Cheung"

-

-msgid "support"

-msgstr "palaikymas"

-

-msgid "webmaster"

-msgstr "svetainės administratorius"

-

-msgid "Senior Contributor/QA"

-msgstr "Vyresnysis bendradarbis/kokybės kontrolė"

-

-msgid "win32 port"

-msgstr "perkėlimas į win32"

-

-msgid "maintainer"

-msgstr "prižiūrėtojas"

-

-msgid "libfaim maintainer"

-msgstr "libfaim prižiūrėtojas"

-

-#. If "lazy bum" translates literally into a serious insult, use something else or omit it.

-msgid "hacker and designated driver [lazy bum]"

-msgstr "hakeris ir negeriantis, nes prie vairo [tingus bastūnas]"

-

-msgid "support/QA"

-msgstr "priežiūra ir kokybės kontrolė"

-

-msgid "XMPP"

-msgstr "XMPP"

-

-msgid "original author"

-msgstr "pradinis autorius"

-

-msgid "lead developer"

-msgstr "pagrindinis kūrėjas"

-

-msgid "Afrikaans"

-msgstr "Būrų kalba"

-

-msgid "Arabic"

-msgstr "Arabų kalba"

-

-msgid "Belarusian Latin"

-msgstr "Baltarusų kalba lotynu abėcėle"

-

-msgid "Bulgarian"

-msgstr "Bulgarų kalba"

-

-msgid "Bengali"

-msgstr "Bengalų kalba"

-

-msgid "Bosnian"

-msgstr "Bosnių kalba"

-

-msgid "Catalan"

-msgstr "Katalonų kalba"

-

-msgid "Valencian-Catalan"

-msgstr "Valenciečių-katalonų kalba"

-

-msgid "Czech"

-msgstr "Čekų kalba"

-

-msgid "Danish"

-msgstr "Danų kalba"

-

-msgid "German"

-msgstr "Vokiečių kalba"

-

-msgid "Dzongkha"

-msgstr "Botijų kalba"

-

-msgid "Greek"

-msgstr "Graikų kalba"

-

-msgid "Australian English"

-msgstr "Australų anglų kalba"

-

-msgid "Canadian English"

-msgstr "Kanadiečių anglų kalba"

-

-msgid "British English"

-msgstr "Britų anglų kalba"

-

-msgid "Esperanto"

-msgstr "Esperanto"

-

-msgid "Spanish"

-msgstr "Ispanų kalba"

-

-msgid "Estonian"

-msgstr "Estų kalba"

-

-msgid "Euskera(Basque)"

-msgstr "Baskų kalba"

-

-msgid "Persian"

-msgstr "Persų kalba"

-

-msgid "Finnish"

-msgstr "Suomių kalba"

-

-msgid "French"

-msgstr "Prancūzų kalba"

-

-msgid "Irish"

-msgstr "Airių kalba"

-

-msgid "Galician"

-msgstr "Galeganų kalba"

-

-msgid "Gujarati"

-msgstr "Gudžaratų kalba"

-

-msgid "Gujarati Language Team"

-msgstr "Gudžarati kalbos komanda"

-

-msgid "Hebrew"

-msgstr "Hebrajų kalba"

-

-msgid "Hindi"

-msgstr "Hindi kalba"

-

-msgid "Hungarian"

-msgstr "Vengrų kalba"

-

-msgid "Indonesian"

-msgstr "Indoneziečių kalba"

-

-msgid "Italian"

-msgstr "Italų kalba"

-

-msgid "Japanese"

-msgstr "Japonų kalba"

-

-msgid "Georgian"

-msgstr "Gruzinų kalba"

-

-msgid "Ubuntu Georgian Translators"

-msgstr "Ubuntu vertėjai į gruzinų kalbą"

-

-msgid "Kannada"

-msgstr "Kanadų kalba"

-

-msgid "Kannada Translation team"

-msgstr "Kanadų kalbos vertimo komanda"

-

-msgid "Korean"

-msgstr "Korėjiečių kalba"

-

-msgid "Kurdish"

-msgstr "Kurdų kalba"

-

-msgid "Lao"

-msgstr "Laosiečių kalba"

-

-msgid "Lithuanian"

-msgstr "Lietuvių kalba"

-

-msgid "Macedonian"

-msgstr "Makedoniečių kalba"

-

-msgid "Mongolian"

-msgstr "Mongolų kalba"

-

-msgid "Bokmål Norwegian"

-msgstr "Norvegų kalba (Bokmål)"

-

-msgid "Nepali"

-msgstr "Nepalų kalba"

-

-msgid "Dutch, Flemish"

-msgstr "Olandų, flamandų kalba"

-

-msgid "Norwegian Nynorsk"

-msgstr "Norvegų kalba (nynorsk)"

-

-msgid "Occitan"

-msgstr "Oksitanų kalba"

-

-msgid "Punjabi"

-msgstr "Pandžabų kalba"

-

-msgid "Polish"

-msgstr "Lenkų kalba"

-

-msgid "Portuguese"

-msgstr "Portugalų kalba"

-

-msgid "Portuguese-Brazil"

-msgstr "Brazilų portugalų kalba"

-

-msgid "Pashto"

-msgstr "Puštūnų kalba"

-

-msgid "Romanian"

-msgstr "Rumunų kalba"

-

-msgid "Russian"

-msgstr "Rusų kalba"

-

-msgid "Slovak"

-msgstr "Slovakų kalba"

-

-msgid "Slovenian"

-msgstr "Slovėnų kalba"

-

-msgid "Albanian"

-msgstr "Albanų kalba"

-

-msgid "Serbian"

-msgstr "Serbų kalba"

-

-msgid "Sinhala"

-msgstr "Sinhalų kalba"

-

-msgid "Swedish"

-msgstr "Švedų kalba"

-

-msgid "Tamil"

-msgstr "Tamilų kalba"

-

-msgid "Telugu"

-msgstr "Telugu kalba"

-

-msgid "Thai"

-msgstr "Tajų kalba"

-

-msgid "Turkish"

-msgstr "Turkų kalba"

-

-msgid "Urdu"

-msgstr "Urdu kalba"

-

-msgid "Vietnamese"

-msgstr "Vietnamiečių kalba"

-

-msgid "T.M.Thanh and the Gnome-Vi Team"

-msgstr "T.M. Thanh ir Gnome-Vi komanda"

-

-msgid "Simplified Chinese"

-msgstr "Supaprastinta kinų kalba"

-

-msgid "Hong Kong Chinese"

-msgstr "Hongkongo kinų kalba"

-

-msgid "Traditional Chinese"

-msgstr "Tradicinė kinų kalba"

-

-msgid "Amharic"

-msgstr "Amharų kalba"

-

-#, c-format

-msgid "About %s"

-msgstr "Apie %s"

-

-#, c-format

-msgid ""

-"%s is a graphical modular messaging client based on libpurple which is "

-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "

-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "

-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "

-"redistribute the program under the terms of the GPL (version 2 or later).  A "

-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "

-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "

-"complete list of contributors.  We provide no warranty for this program."

-"<BR><BR>"

-msgstr ""

-"%s yra grafine modulinė pokalbių programa libpurple pagrindu, su kuria "

-"galima bendrauti AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "

-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu ir QQ "

-"tinkluose – visuose vienu metu.  Programa parašyta naudojant GTK+."

-"<br><br>Jūs galite keisti ir platinti šią programą GPL (2-os ar vėlesnės "

-"versijos) sąlygomis.  GPL kopija yra faile „COPYING“, platinamame kartu su %"

-"s.  %s autorinės teisės priklauso programos autoriams.  Faile „COPYRIGHT“ "

-"pateiktas pilnas autorių sąrašas.  Mes neteikiame jokios garantijos šiai "

-"programai.<br><br>"

-

-#, c-format

-msgid ""

-"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"

-"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"

-msgstr ""

-"<FONT SIZE=\"4\">DUK:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"

-"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"

-

-#, c-format

-msgid ""

-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"

-"\">support@pidgin.im</A><BR/><BR/>"

-msgstr ""

-"<FONT SIZE=\"4\">Pagalba el. paštu:</FONT> <A HREF=\"mailto:support@pidgin.im"

-"\">support@pidgin.im</A><BR/><BR/>"

-

-#, c-format

-msgid ""

-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"

-msgstr ""

-"<FONT SIZE=\"4\">IRC kanalas:</FONT> #pidgin serveryje irc.freenode."

-"net<BR><BR>"

-

-#, c-format

-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"

-msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"

-

-msgid "Current Developers"

-msgstr "Dabartiniai kūrėjai"

-

-msgid "Crazy Patch Writers"

-msgstr "Pakvaišę pataisų rašytojai"

-

-msgid "Retired Developers"

-msgstr "Buvę kūrėjai"

-

-msgid "Retired Crazy Patch Writers"

-msgstr "Atsistadydinę pakvaišę pataisų rašytojai"

-

-msgid "Current Translators"

-msgstr "Dabartiniai vertėjai"

-

-msgid "Past Translators"

-msgstr "Buvę vertėjai"

-

-msgid "Debugging Information"

-msgstr "Derinimo informacija"

-

-msgid "_Name"

-msgstr "_Vardas"

-

-msgid "_Account"

-msgstr "_Paskyra"

-

-msgid "Get User Info"

-msgstr "Gauti vartotojo informaciją"

-

-msgid ""

-"Please enter the username or alias of the person whose info you would like "

-"to view."

-msgstr ""

-"Įveskite naudotojo vardą arba alternatyvųjį vardą asmens, kurio informaciją "

-"Jūs norite pažiūrėti."

-

-msgid "View User Log"

-msgstr "Žiūrėti vartotojo žurnalą"

-

-msgid "Alias Contact"

-msgstr "Alternatyvusis kontakto vardas"

-

-msgid "Enter an alias for this contact."

-msgstr "Įveskite alternatyvųjį vardą šiam kontaktui."

-

-#, c-format

-msgid "Enter an alias for %s."

-msgstr "Įveskite alternatyvųjį vardą vartotojui %s."

-

-msgid "Alias Buddy"

-msgstr "Alternatyvusis bičiulio vardas"

-

-msgid "Alias Chat"

-msgstr "Alternatyvusis pokalbių kambario vardas"

-

-msgid "Enter an alias for this chat."

-msgstr "Įveskite alternatyvųjį vardą šiam pokalbių kambariui."

-

-#, c-format

-msgid ""

-"You are about to remove the contact containing %s and %d other buddy from "

-"your buddy list.  Do you want to continue?"

-msgid_plural ""

-"You are about to remove the contact containing %s and %d other buddies from "

-"your buddy list.  Do you want to continue?"

-msgstr[0] ""

-"Jūs ruošiates pašalinti konktaktą su %s ir turintį dar %d kitą šio bičiulio "

-"paskyrą iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"

-msgstr[1] ""

-"Jūs ruošiates pašalinti konktaktą su %s ir turintį dar %d kitas bičiulio "

-"paskyras iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"

-msgstr[2] ""

-"Jūs ruošiatės pašalinti kontaktą su %s ir turintį dar %d kitų bičiulio "

-"paskyrų iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"

-

-msgid "Remove Contact"

-msgstr "Pašalinti kontaktą"

-

-msgid "_Remove Contact"

-msgstr "_Pašalinti kontaktą"

-

-#, c-format

-msgid ""

-"You are about to merge the group called %s into the group called %s. Do you "

-"want to continue?"

-msgstr "Jūs ruošiates grupę %s prijungti prie grupės %s. Ar norite tęsti?"

-

-msgid "Merge Groups"

-msgstr "Sujungti grupes"

-

-msgid "_Merge Groups"

-msgstr "_Sujungti grupes"

-

-#, c-format

-msgid ""

-"You are about to remove the group %s and all its members from your buddy "

-"list.  Do you want to continue?"

-msgstr ""

-"Jūs ruošiates pašalinti grupę %s ir visus jos narius iš Jūsų bičiulių "

-"sąrašo.  Ar norite tęsti?"

-

-msgid "Remove Group"

-msgstr "Pašalinti grupę"

-

-msgid "_Remove Group"

-msgstr "_Pašalinti grupę"

-

-#, c-format

-msgid ""

-"You are about to remove %s from your buddy list.  Do you want to continue?"

-msgstr "Jūs ruošiates pašalinti %s iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"

-

-msgid "Remove Buddy"

-msgstr "Pašalinti bičiulį"

-

-msgid "_Remove Buddy"

-msgstr "_Pašalinti bičiulį"

-

-#, c-format

-msgid ""

-"You are about to remove the chat %s from your buddy list.  Do you want to "

-"continue?"

-msgstr ""

-"Jūs ruošiates pašalinti pokalbių kambarį %s iš Jūsų bičiulių sąrašo.  Ar "

-"norite tęsti?"

-

-msgid "Remove Chat"

-msgstr "Pašalinti pokalbių kambarį"

-

-msgid "_Remove Chat"

-msgstr "_Pašalinti pokalbių kambarį"

-

-msgid "Right-click for more unread messages...\n"

-msgstr ""

-"Spustelėkite dešinį pelės mygtuką, kad pamatytumėte kitas neperskaitytas "

-"žinutes...\n"

-

-msgid "_Change Status"

-msgstr "_Keisti būseną"

-

-msgid "Show Buddy _List"

-msgstr "_Rodyti bičiulių sąrašą"

-

-msgid "_Unread Messages"

-msgstr "_Neperskaitytos žinutės"

-

-msgid "New _Message..."

-msgstr "Nauja _žinutė..."

-

-msgid "_Accounts"

-msgstr "_Paskyros"

-

-msgid "Plu_gins"

-msgstr "P_apildiniai"

-

-msgid "Pr_eferences"

-msgstr "N_uostatos"

-

-msgid "Mute _Sounds"

-msgstr "_Išjungti garsus"

-

-msgid "_Blink on New Message"

-msgstr "_Mirksėti gavus naują žinutę"

-

-msgid "_Quit"

-msgstr "I_šeiti"

-

-msgid "Not started"

-msgstr "Nepradėta"

-

-msgid "<b>Receiving As:</b>"

-msgstr "<b>Gaunama kaip:</b>"

-

-msgid "<b>Receiving From:</b>"

-msgstr "<b>Gaunama iš:</b>"

-

-msgid "<b>Sending To:</b>"

-msgstr "<b>Siunčiama kam:</b>"

-

-msgid "<b>Sending As:</b>"

-msgstr "<b>Siunčiama kaip:</b>"

-

-msgid "There is no application configured to open this type of file."

-msgstr "Jokia programa nėra sukonfigūruota atverti šio tipo failą."

-

-msgid "An error occurred while opening the file."

-msgstr "Failo atvėrimo metu įvyko klaida."

-

-#, c-format

-msgid "Error launching %s: %s"

-msgstr "Programos %s paleidimo klaida: %s"

-

-#, c-format

-msgid "Error running %s"

-msgstr "Programos %s vykdymo klaida"

-

-#, c-format

-msgid "Process returned error code %d"

-msgstr "Procesas grąžino klaidos kodą %d"

-

-msgid "Filename:"

-msgstr "Failo pavadinimas:"

-

-msgid "Local File:"

-msgstr "Vietinis failas:"

-

-msgid "Speed:"

-msgstr "Greitis:"

-

-msgid "Time Elapsed:"

-msgstr "Praėjo laiko:"

-

-msgid "Time Remaining:"

-msgstr "Liko laiko:"

-

-msgid "Close this window when all transfers _finish"

-msgstr "_Uždaryti ši langą pasibaigus visiems failų perdavimams"

-

-msgid "C_lear finished transfers"

-msgstr "_Pašalinti pabaigtus perdavimus"

-

-#. "Download Details" arrow

-msgid "File transfer _details"

-msgstr "_Informacija apie perdavimą"

-

-#  Pause button

-#. Pause button

-msgid "_Pause"

-msgstr "_Sustabdyti"

-

-#  Resume button

-#. Resume button

-msgid "_Resume"

-msgstr "_Tęsti"

-

-msgid "Paste as Plain _Text"

-msgstr "Įdėti kaip gryną _tekstą"

-

-msgid "_Reset formatting"

-msgstr "Atstatyti fo_rmato taikymą"

-

-msgid "Disable _smileys in selected text"

-msgstr "Pa_sirinktame tekste išjungti šypsenėles"

-

-msgid "Hyperlink color"

-msgstr "Hipersaito spalva"

-

-msgid "Color to draw hyperlinks."

-msgstr "Spalva hipersaitų vaizdavimui."

-

-msgid "Hyperlink visited color"

-msgstr "Aplankyto hipersaito spalva"

-

-msgid "Color to draw hyperlinks after it has been visited (or activated)."

-msgstr "Aplankyto ar aktyvuoto hipersaito spalva."

-

-msgid "Hyperlink prelight color"

-msgstr "Hipersaito paryškinimo spalva"

-

-msgid "Color to draw hyperlinks when mouse is over them."

-msgstr "Hipersaito spalva, kai virš jo yra pelės žymeklis."

-

-msgid "Sent Message Name Color"

-msgstr "Vardo spalva išsiunčiamose žinutėse"

-

-msgid "Color to draw the name of a message you sent."

-msgstr "Spalva vardui išsiunčiamoje žinutėje."

-

-msgid "Received Message Name Color"

-msgstr "Vardo spalva gaunamose žinutėse"

-

-msgid "Color to draw the name of a message you received."

-msgstr "Spalva vardui gaunamoje žinutėje."

-

-msgid "\"Attention\" Name Color"

-msgstr "Vardo spalva „dėmesio“ žinutėse"

-

-msgid "Color to draw the name of a message you received containing your name."

-msgstr "Spalva vardui gaunamoje žinutėje, kurioje minimas jūsų vardas."

-

-msgid "Action Message Name Color"

-msgstr "Vardo spalva veiksmo žinutėse"

-

-msgid "Color to draw the name of an action message."

-msgstr "Spalva vardui veiksmo žinutėje."

-

-msgid "Action Message Name Color for Whispered Message"

-msgstr "Veiksmo žinutės vardo spalva pašnibždėtoms žinutėms"

-

-msgid "Whisper Message Name Color"

-msgstr "Vardo spalva pašnibždėtose žinutėse"

-

-#  ---------- "Notification Removals" ----------

-msgid "Typing notification color"

-msgstr "Pranešimo apie pašnekovo renkamą žinutę spalva"

-

-msgid "The color to use for the typing notification font"

-msgstr "Spalva pranešimui apie pašnekovo renkamą žinutę"

-

-msgid "Typing notification font"

-msgstr "Pranešimo apie pašnekovo renkamą žinutę šriftas"

-

-msgid "The font to use for the typing notification"

-msgstr "Šriftas pranešimui apie pašnekovo renkamą žinutę"

-

-msgid "Enable typing notification"

-msgstr "Rodyti pranešimus apie pašnekovų renkamas žinutes"

-

-msgid "_Copy Email Address"

-msgstr "Kopijuoti _el. pašto adresą"

-

-msgid "_Open Link in Browser"

-msgstr "_Atverti saitą naršyklėje"

-

-msgid "_Copy Link Location"

-msgstr "Kopijuoti _saito adresą"

-

-msgid ""

-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"

-"\n"

-"Defaulting to PNG."

-msgstr ""

-"<span size='larger' weigth='bold'>Neatpažintas failo tipas</span>\n"

-"\n"

-"Laikyti, kad failas yra PNG tipo."

-

-msgid ""

-"Unrecognized file type\n"

-"\n"

-"Defaulting to PNG."

-msgstr ""

-"Neatpažintas failo tipas\n"

-"\n"

-"Naudojamas numatytasis tipas PNG."

-

-#, c-format

-msgid ""

-"<span size='larger' weight='bold'>Error saving image</span>\n"

-"\n"

-"%s"

-msgstr ""

-"<span size='larger' weight='bold'>Vaizdo įrašymo klaida</span>\n"

-"\n"

-"%s"

-

-#, c-format

-msgid ""

-"Error saving image\n"

-"\n"

-"%s"

-msgstr ""

-"Vaizdo įrašymo klaida\n"

-"\n"

-"%s"

-

-msgid "Save Image"

-msgstr "Įrašyti vaizdą"

-

-#, c-format

-msgid "_Save Image..."

-msgstr "Įrašyti vai_zdą..."

-

-#, c-format

-msgid "_Add Custom Smiley..."

-msgstr "_Pridėti tinkintą šypsenėlę"

-

-msgid "Select Font"

-msgstr "Pasirinkti šriftą"

-

-msgid "Select Text Color"

-msgstr "Pasirinkti teksto spalvą"

-

-msgid "Select Background Color"

-msgstr "Pasirinkti fono spalvą"

-

-msgid "_URL"

-msgstr "_URL"

-

-msgid "_Description"

-msgstr "_Aprašymas"

-

-msgid ""

-"Please enter the URL and description of the link that you want to insert. "

-"The description is optional."

-msgstr ""

-"Prašome įvesti norimo įterpti saito URL ir aprašymą. Aprašymas nėra būtinas."

-

-msgid "Please enter the URL of the link that you want to insert."

-msgstr "Prašome įvesti norimo įterpti saito URL."

-

-msgid "Insert Link"

-msgstr "Įterpti saitą"

-

-msgid "_Insert"

-msgstr "_Įterpti"

-

-#, c-format

-msgid "Failed to store image: %s\n"

-msgstr "Nepavyko išsaugoti vaizdo: %s\n"

-

-msgid "Insert Image"

-msgstr "Įterpti vaizdą"

-

-#, c-format

-msgid ""

-"This smiley is disabled because a custom smiley exists for this shortcut:\n"

-" %s"

-msgstr ""

-"Ši šypsenėlė yra išjungta, nes šiai klavišų sekai jau yra tinkinta "

-"šypsenelė:\n"

-"%s"

-

-#  show everything

-msgid "Smile!"

-msgstr "Šypsokis!"

-

-msgid "_Manage custom smileys"

-msgstr "_Tvarkyti tinkintas šypsenėles"

-

-msgid "This theme has no available smileys."

-msgstr "Šis apipavidalinimas neturi šypsenėlių."

-

-msgid "_Font"

-msgstr "_Šriftas"

-

-msgid "Group Items"

-msgstr "Grupuoti elementus"

-

-msgid "Ungroup Items"

-msgstr "Negrupuoti elementų"

-

-msgid "Bold"

-msgstr "Pusjuodis"

-

-msgid "Italic"

-msgstr "Kursyvas"

-

-msgid "Underline"

-msgstr "Pabraukimas"

-

-msgid "Strikethrough"

-msgstr "Perbraukimas"

-

-msgid "Increase Font Size"

-msgstr "Padidinti šriftą"

-

-msgid "Decrease Font Size"

-msgstr "Sumažinti šriftą"

-

-msgid "Font Face"

-msgstr "Šrifto garnitūras"

-

-msgid "Background Color"

-msgstr "Fono spalva"

-

-msgid "Foreground Color"

-msgstr "Šrifto spalva"

-

-msgid "Reset Formatting"

-msgstr "Atstatyti formato taikymą"

-

-msgid "Insert IM Image"

-msgstr "Įterpti vaizdą"

-

-msgid "Insert Smiley"

-msgstr "Įterpti šypsenėlę"

-

-msgid "<b>_Bold</b>"

-msgstr "<b>_Pusjuodis</b>"

-

-msgid "<i>_Italic</i>"

-msgstr "<i>_Kursyvas</i>"

-

-msgid "<u>_Underline</u>"

-msgstr "<u>P_abraukimas</u>"

-

-msgid "<span strikethrough='true'>Strikethrough</span>"

-msgstr "<span strikethrough='true'>Perbraukimas</span>"

-

-msgid "<span size='larger'>_Larger</span>"

-msgstr "<span size='larger'>_Didesnis</span>"

-

-msgid "_Normal"

-msgstr "_Normalus"

-

-msgid "<span size='smaller'>_Smaller</span>"

-msgstr "<span size='smaller'>_Mažesnis</span>"

-

-#. If we want to show the formatting for the following items, we would

-#. * need to update them when formatting changes. The above items don't need

-#. * no updating nor nothin'

-msgid "_Font face"

-msgstr "_Šrifto garnitūras"

-

-msgid "Foreground _color"

-msgstr "Š_rifto spalva"

-

-msgid "Bac_kground color"

-msgstr "_Fono spalva"

-

-msgid "_Image"

-msgstr "_paveiksliuką"

-

-msgid "_Link"

-msgstr "_nuorodą"

-

-msgid "_Horizontal rule"

-msgstr "_Horizontali linija"

-

-#  show everything

-msgid "_Smile!"

-msgstr "_Šypsokitės!"

-

-msgid "Log Deletion Failed"

-msgstr "Žurnalo pašalinimas nepavyko"

-

-msgid "Check permissions and try again."

-msgstr "Patikrinkite teises ir bandykite iš naujo."

-

-#, c-format

-msgid ""

-"Are you sure you want to permanently delete the log of the conversation with "

-"%s which started at %s?"

-msgstr ""

-"Ar tikrai norite negrįžtamai ištrinti pokalbių su %s žurnalą, pradėtą %s?"

-

-#, c-format

-msgid ""

-"Are you sure you want to permanently delete the log of the conversation in %"

-"s which started at %s?"

-msgstr "Ar tikrai norite negrįžtamai ištrinti pokalbių %s žurnalą, pradėtą %s?"

-

-#, c-format

-msgid ""

-"Are you sure you want to permanently delete the system log which started at %"

-"s?"

-msgstr "Ar tikrai norite negrįžtamai ištrinti sistemos žurnalą, pradėtą %s?"

-

-msgid "Delete Log?"

-msgstr "Ar pašalinti žurnalą?"

-

-msgid "Delete Log..."

-msgstr "Pašalinti žurnalą..."

-

-#, c-format

-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"

-msgstr "<span size='larger' weight='bold'>Pokalbis kambaryje %s (%s)</span>"

-

-#, c-format

-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"

-msgstr "<span size='larger' weight='bold'>Pokalbis su %s (%s)</span>"

-

-#. Steal the "HELP" response and use it to trigger browsing to the logs folder

-msgid "_Browse logs folder"

-msgstr "_Naršyti žurnalų aplanką"

-

-#, c-format

-msgid "%s %s. Try `%s -h' for more information.\n"

-msgstr "%s %s. Daugiau informacijos suteikia komanda „%s -h“.\n"

-

-#, c-format

-msgid ""

-"%s %s\n"

-"Usage: %s [OPTION]...\n"

-"\n"

-"  -c, --config=DIR    use DIR for config files\n"

-"  -d, --debug         print debugging messages to stdout\n"

-"  -h, --help          display this help and exit\n"

-"  -m, --multiple      do not ensure single instance\n"

-"  -n, --nologin       don't automatically login\n"

-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"

-"                      specifies account(s) to use, separated by commas.\n"

-"                      Without this only the first account will be enabled).\n"

-"  --display=DISPLAY   X display to use\n"

-"  -v, --version       display the current version and exit\n"

-msgstr ""

-"%s %s\n"

-"Vartojimas: %s [PARINKTIS]...\n"

-"\n"

-"  -c, --config=KATALOGAS  naudoti „KATALOGAS“ konfigūracinių failų paieškai\n"

-"  -d, --debug             išvesti derinimo pranešimus į standartinę išvestį\n"

-"  -h, --help              parodyti šią pagalbą ir baigti\n"

-"  -m, --multiple          netikrinti, ar vienu metu paleista tik viena "

-"kopija\n"

-"  -n, --nologin           neprisijungti automatiškai\n"

-"  -l, --login[=VARDAS]    prisijungti automatiškai (neprivalomas argumentas\n"

-"                          „VARDAS“ nurodo paskyrą ar kableliais atskirtas \n"

-"                          paskyras)\n"

-"  --display=DISPLAY       X displėjus naudojimui\n"

-"  -v, --version           parodyti šios programos versiją ir baigti\n"

-

-#, c-format

-msgid ""

-"%s %s\n"

-"Usage: %s [OPTION]...\n"

-"\n"

-"  -c, --config=DIR    use DIR for config files\n"

-"  -d, --debug         print debugging messages to stdout\n"

-"  -h, --help          display this help and exit\n"

-"  -m, --multiple      do not ensure single instance\n"

-"  -n, --nologin       don't automatically login\n"

-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"

-"                      specifies account(s) to use, separated by commas.\n"

-"                      Without this only the first account will be enabled).\n"

-"  -v, --version       display the current version and exit\n"

-msgstr ""

-"%s %s\n"

-"Vartojimas: %s [PARINKTIS]...\n"

-"\n"

-"  -c, --config=KATALOGAS  naudoti „KATALOGAS“ konfigūracinių failų paieškai\n"

-"  -d, --debug             išvesti derinimo pranešimus į standartinę išvestį\n"

-"  -h, --help              parodyti šią pagalbą ir baigti\n"

-"  -m, --multiple          netikrinti, ar vienu metu paleista tik viena "

-"kopija\n"

-"  -n, --nologin           neprisijungti automatiškai\n"

-"  -l, --login[=VARDAS]    prisijungti automatiškai (neprivalomas argumentas\n"

-"                          „VARDAS“ nurodo paskyrą ar kableliais atskirtas \n"

-"                          paskyras.)  Be šio argumento bus įjungta tik "

-"pirmoji\n"

-"                          paskyra.\n"

-"  -v, --version           parodyti šios programos versiją ir baigti\n"

-

-#, c-format

-msgid ""

-"%s %s has segfaulted and attempted to dump a core file.\n"

-"This is a bug in the software and has happened through\n"

-"no fault of your own.\n"

-"\n"

-"If you can reproduce the crash, please notify the developers\n"

-"by reporting a bug at:\n"

-"%ssimpleticket/\n"

-"\n"

-"Please make sure to specify what you were doing at the time\n"

-"and post the backtrace from the core file.  If you do not know\n"

-"how to get the backtrace, please read the instructions at\n"

-"%swiki/GetABacktrace\n"

-msgstr ""

-"%s %s padarė segmentacijos klaidą ir pabandė išvesti atminties išklotinę.\n"

-"Tai yra programos riktas ir atsitiko be jokios Jūsų kaltės.\n"

-"\n"

-"Jeigu Jūs galite atkartoti šią klaidą, prašome informuoti kūrėjus apie "

-"klaidą\n"

-"adresu:\n"

-"%ssimpleticket/\n"

-"\n"

-"Įsitikinkite, kad nurodote, ką darėte, kai įvyko klaida, ir pridėkite \n"

-"programos steko išklotinę (angl. „backtrace“) iš atminties išklotinės \n"

-"failo.  Jeigu nežinote, kaip gauti programos steko išklotinę, perskaitykite\n"

-"instrukcijas adresu %swiki/GetABacktrace\n"

-

-#. Translators may want to transliterate the name.

-#. It is not to be translated.

-msgid "Pidgin"

-msgstr "Pidgin"

-

-#, c-format

-msgid "Exiting because another libpurple client is already running.\n"

-msgstr "Programa uždaroma, nes jau yra paleistas kitas libpurple klientas.\n"

-

-msgid "Open All Messages"

-msgstr "Atidaryti visas žinutes"

-

-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"

-msgstr "<span weight=\"bold\" size=\"larger\">Jūs gavote laišką!</span>"

-

-#, c-format

-msgid "%s has %d new message."

-msgid_plural "%s has %d new messages."

-msgstr[0] "%s turi %d naują pranešimą."

-msgstr[1] "%s turi %d naujus pranešimus."

-msgstr[2] "%s turi %d naujų pranešimų."

-

-#, c-format

-msgid "<b>%d new email.</b>"

-msgid_plural "<b>%d new emails.</b>"

-msgstr[0] "<b>%d naujas laiškas.</b>"

-msgstr[1] "<b>%d nauji laiškai.</b>"

-msgstr[2] "<b>%d naujų laiškų.</b>"

-

-#, c-format

-msgid "The browser command \"%s\" is invalid."

-msgstr "Neteisinga naršyklės komanda „%s“."

-

-msgid "Unable to open URL"

-msgstr "Negalima atverti URL"

-

-#, c-format

-msgid "Error launching \"%s\": %s"

-msgstr "Programos „%s“ paleidimo klaida: %s"

-

-msgid ""

-"The 'Manual' browser command has been chosen, but no command has been set."

-msgstr "Pasirinkta 'Rankinė' naršyklės komanda, tačiau komanda nenustatyta."

-

-msgid "The following plugins will be unloaded."

-msgstr "Šie papildiniai bus iškelti."

-

-msgid "Multiple plugins will be unloaded."

-msgstr "Keletas papildinių bus iškelta."

-

-msgid "Unload Plugins"

-msgstr "Iškelti papildinius"

-

-msgid "Could not unload plugin"

-msgstr "Nepavyko iškelti papildinio"

-

-msgid ""

-"The plugin could not be unloaded now, but will be disabled at the next "

-"startup."

-msgstr ""

-"Šiuo metu papildinio iškelti nepavyko, bet jis bus išjungtas sekančio Pidgin "

-"paleidimo metu."

-

-#, c-format

-msgid ""

-"<span foreground=\"red\" weight=\"bold\">Error: %s\n"

-"Check the plugin website for an update.</span>"

-msgstr ""

-"<span foreground=\"red\" weight=\"bold\">Klaida: %s\n"

-"Patikrinkite, ar papildinio internetinėje svetainėje nėra atnaujinimo.</span>"

-

-msgid "Author"

-msgstr "Autorius"

-

-msgid "<b>Written by:</b>"

-msgstr "<b>Parašė:</b>"

-

-msgid "<b>Web site:</b>"

-msgstr "<b>Internetinis puslapis:</b>"

-

-msgid "<b>Filename:</b>"

-msgstr "<b>Failo vardas:</b>"

-

-msgid "Configure Pl_ugin"

-msgstr "Konfigūr_uoti papildinį"

-

-msgid "<b>Plugin Details</b>"

-msgstr "<b>Informacija apie papildinį</b>"

-

-msgid "Select a file"

-msgstr "Pasirinkite failą"

-

-#  Create the "Pounce Who" frame.

-#. Create the "Pounce on Whom" frame.

-msgid "Pounce on Whom"

-msgstr "Į ką reaguoti"

-

-msgid "_Buddy name:"

-msgstr "_Bičiulio vardas:"

-

-msgid "Si_gns on"

-msgstr "pr_isijungia"

-

-msgid "Signs o_ff"

-msgstr "atsi_jungia"

-

-msgid "Goes a_way"

-msgstr "_pasitraukia"

-

-msgid "Ret_urns from away"

-msgstr "su_grįžta"

-

-msgid "Becomes _idle"

-msgstr "tampa neve_iklus"

-

-msgid "Is no longer i_dle"

-msgstr "ta_mpa veiklus"

-

-msgid "Starts _typing"

-msgstr "pradeda rašy_ti"

-

-msgid "P_auses while typing"

-msgstr "trumpam nustoja raš_yti"

-

-msgid "Stops t_yping"

-msgstr "nustoja raš_yti"

-

-msgid "Sends a _message"

-msgstr "i_šsiunčia žinutę"

-

-msgid "Ope_n an IM window"

-msgstr "Atidaryti pokalbių la_ngą"

-

-msgid "_Pop up a notification"

-msgstr "_Parodyti pranešimo langą"

-

-msgid "Send a _message"

-msgstr "Nusiųsti _žinutę"

-

-msgid "E_xecute a command"

-msgstr "_Įvykdyti komandą"

-

-msgid "P_lay a sound"

-msgstr "_Groti garsą"

-

-msgid "Brows_e..."

-msgstr "Nar_šyti...."

-

-msgid "Br_owse..."

-msgstr "_Naršyti...."

-

-msgid "Pre_view"

-msgstr "Pa_klausyti"

-

-msgid "P_ounce only when my status is not Available"

-msgstr "Reaguoti tik tada, kai aš es_u neprieinamoje būsenoje"

-

-msgid "_Recurring"

-msgstr "_Reakcija yra pasikartojanti"

-

-#  Create the "Pounce When" frame.

-msgid "Pounce Target"

-msgstr "Reakcija į"

-

-msgid "Smiley theme failed to unpack."

-msgstr "Nepavyko išpakuoti šypsenėlių apipavidalinimo failo."

-

-msgid "Install Theme"

-msgstr "Įdiegti apipavidalinimą"

-

-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 ""

-"Pasirinkite norimą naudoti šypsenėlių apipavidalinimą iš sąrašo žemiau. "

-"Nauji apipavidalinimai gali būti įdiegti nutempiant juos pele į "

-"apipavidalinimų sąrašą."

-

-msgid "Icon"

-msgstr "Piktograma"

-

-msgid "Keyboard Shortcuts"

-msgstr "Spartieji klavišai"

-

-msgid "Cl_ose conversations with the Escape key"

-msgstr "Uždaryti p_okalbius grįžimo („Escape“) klavišu"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-msgid "System Tray Icon"

-msgstr "Piktograma sistemos juostelėje"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-msgid "_Show system tray icon:"

-msgstr "_Rodyti piktogramą sistemos juostelėje:"

-

-msgid "On unread messages"

-msgstr "kai yra neperskaitytų žinučių"

-

-#  IM Convo trans options

-msgid "Conversation Window Hiding"

-msgstr "Pokalbių langų slėpimas"

-

-msgid "_Hide new IM conversations:"

-msgstr "_Slėpti naujus pokalbius"

-

-msgid "When away"

-msgstr "kai pasitraukęs"

-

-#. All the tab options!

-msgid "Tabs"

-msgstr "Kortelės"

-

-msgid "Show IMs and chats in _tabbed windows"

-msgstr "Rodyti pokalbius ir kambarius languose su kor_telėmis"

-

-msgid "Show close b_utton on tabs"

-msgstr "Rodyti _uždarymo mygtuką ant kortelių"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas?

-msgid "_Placement:"

-msgstr "Tal_pinimas:"

-

-msgid "Top"

-msgstr "viršuje"

-

-msgid "Bottom"

-msgstr "apačioje"

-

-msgid "Left"

-msgstr "kairėje"

-

-msgid "Right"

-msgstr "dešinėje"

-

-msgid "Left Vertical"

-msgstr "vertikalus kairėje"

-

-msgid "Right Vertical"

-msgstr "vertikalus dešinėje"

-

-msgid "N_ew conversations:"

-msgstr "Nau_ji pokalbiai:"

-

-msgid "Show _formatting on incoming messages"

-msgstr "Gaunamas žinutes rodyti su _formatavimu"

-

-msgid "Close IMs immediately when the tab is closed"

-msgstr "Uždaryti pokalbius iškart po kortelės uždarymo"

-

-msgid "Show _detailed information"

-msgstr "Ro_dyti smulkią informaciją"

-

-msgid "Enable buddy ic_on animation"

-msgstr "Leisti bičiulių pikt_ogramų animaciją"

-

-msgid "_Notify buddies that you are typing to them"

-msgstr "I_nformuoti bičiulius, kai jiems rašote"

-

-msgid "Highlight _misspelled words"

-msgstr "_Paryškinti neteisingai parašytus žodžius"

-

-msgid "Use smooth-scrolling"

-msgstr "Naudoti _tolygią slinktį"

-

-msgid "F_lash window when IMs are received"

-msgstr "Mirginti _langą, kai gaunamos žinutės"

-

-#  IM Convo trans options

-msgid "Minimi_ze new conversation windows"

-msgstr "_Suskleisti naujus pokalbių langus"

-

-msgid "Minimum input area height in lines:"

-msgstr "Mažiausias įvedimo srities aukštis linijomis:"

-

-msgid "Font"

-msgstr "Šriftas"

-

-msgid "Use document font from _theme"

-msgstr "Naudo_ti dokumento šriftą iš apipavidalinimo"

-

-msgid "Use font from _theme"

-msgstr "Naudo_ti šriftą iš apipavidalinimo"

-

-msgid "Conversation _font:"

-msgstr "P_okalbio šriftas:"

-

-msgid "Default Formatting"

-msgstr "Numatytasis formato taikymas"

-

-# Šitaip atrodys Jūsų išsiunčiamų žinučių tekstas su protokolais kurie palaiko formato taikymą. :)

-msgid ""

-"This is how your outgoing message text will appear when you use protocols "

-"that support formatting."

-msgstr ""

-"Šitaip atrodys Jūsų išsiunčiamų žinučių tekstas protokoluose, palaikančiuose "

-"formato taikymą."

-

-msgid "Cannot start proxy configuration program."

-msgstr "Nepavyko paleisti tinklo tarpininko nustatymų programos."

-

-msgid "Cannot start browser configuration program."

-msgstr "Nepavyko paleisti naršyklės nustatymų programos."

-

-msgid "ST_UN server:"

-msgstr "ST_UN Serveris:"

-

-msgid "<span style=\"italic\">Example: stunserver.org</span>"

-msgstr "<span style=\\\"italic\\\">Pavyzdžiui: stunserver.org</span>"

-

-msgid "_Autodetect IP address"

-msgstr "_Automatiškai aptikti IP adresą"

-

-msgid "Public _IP:"

-msgstr "Viešas _IP:"

-

-msgid "Ports"

-msgstr "Prievadai"

-

-msgid "_Enable automatic router port forwarding"

-msgstr "_Įjungti automatinį maršruto parinktuvo prievadų persiuntimą"

-

-msgid "_Manually specify range of ports to listen on"

-msgstr "Rankiniu būdu nurodyti klauso_mų prievadų režį"

-

-msgid "_Start port:"

-msgstr "Pirmas prievada_s:"

-

-msgid "_End port:"

-msgstr "Paskutinis pri_evadas:"

-

-msgid "Proxy Server &amp; Browser"

-msgstr "Tarpininkaujantis serveris ir naršyklė"

-

-msgid "<b>Proxy configuration program was not found.</b>"

-msgstr "<b>Nerasta tinklo tarpininko nustatymų programa.</b>"

-

-msgid "<b>Browser configuration program was not found.</b>"

-msgstr "<b>Nerasta naršyklės nustatymų programa.</b>"

-

-msgid ""

-"Proxy & Browser preferences are configured\n"

-"in GNOME Preferences"

-msgstr ""

-"Tinklo tarpininko ir naršyklės nustatymai yra tvarkomi GNOME parinktyse"

-

-msgid "Configure _Proxy"

-msgstr "_Konfigūruoti tarpininkaujantį serverį"

-

-msgid "Configure _Browser"

-msgstr "Konfigūruoti _naršyklę"

-

-msgid "Proxy Server"

-msgstr "Tarpininkaujantis serveris"

-

-msgid "No proxy"

-msgstr "be tarpininko"

-

-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings

-msgid "Use remote DNS with SOCKS4 proxies"

-msgstr "Naudoti nutolusį DNS su SOCKS4 tarpininku"

-

-msgid "_User:"

-msgstr "_Vartotojas:"

-

-msgid "Seamonkey"

-msgstr "SeaMonkey"

-

-msgid "Opera"

-msgstr "Opera"

-

-msgid "Netscape"

-msgstr "Netscape"

-

-msgid "Mozilla"

-msgstr "Mozilla"

-

-msgid "Konqueror"

-msgstr "Konqueror"

-

-msgid "Desktop Default"

-msgstr "Darbalaukio numatytasis"

-

-msgid "GNOME Default"

-msgstr "GNOME numatytasis"

-

-msgid "Galeon"

-msgstr "Galeon"

-

-msgid "Firefox"

-msgstr "Firefox"

-

-msgid "Firebird"

-msgstr "Firebird"

-

-msgid "Epiphany"

-msgstr "Epiphany"

-

-msgid "Manual"

-msgstr "Rankinis"

-

-msgid "Browser Selection"

-msgstr "Naršyklės išrinkimas"

-

-msgid "_Browser:"

-msgstr "_Naršyklė:"

-

-msgid "_Open link in:"

-msgstr "_Atverti saitą kame:"

-

-msgid "Browser default"

-msgstr "pagal naršyklės nustatymą"

-

-msgid "Existing window"

-msgstr "esamame lange"

-

-msgid "New tab"

-msgstr "naujoje kortelėje"

-

-#, c-format

-msgid ""

-"_Manual:\n"

-"(%s for URL)"

-msgstr ""

-"_Rankinis:\n"

-"(%s žymi URL)"

-

-msgid "Log _format:"

-msgstr "Žurnalo _formatas:"

-

-msgid "Log all _instant messages"

-msgstr "Rašyti visus asmeninius pokalbius į žurna_lą"

-

-msgid "Log all c_hats"

-msgstr "Raš_yti visus pokalbius kambariuose į žurnalą"

-

-msgid "Log all _status changes to system log"

-msgstr "Ra_šyti visus būsenos pasikeitimus į sistemos žurnalą"

-

-msgid "Sound Selection"

-msgstr "Garso išrinkimas"

-

-#, c-format

-msgid "Quietest"

-msgstr "Tyliausiai"

-

-#, c-format

-msgid "Quieter"

-msgstr "Tyliau"

-

-#, c-format

-msgid "Quiet"

-msgstr "Tyliai"

-

-#, c-format

-msgid "Loud"

-msgstr "Garsiai"

-

-#, c-format

-msgid "Louder"

-msgstr "Garsiau"

-

-#, c-format

-msgid "Loudest"

-msgstr "Garsiausiai"

-

-msgid "_Method:"

-msgstr "_Būdas:"

-

-msgid "Console beep"

-msgstr "pyptelėjimai"

-

-msgid "No sounds"

-msgstr "be garsų"

-

-#, c-format

-msgid ""

-"Sound c_ommand:\n"

-"(%s for filename)"

-msgstr ""

-"Garso k_omanda:\n"

-"(%s reiškia failo vardą)"

-

-msgid "M_ute sounds"

-msgstr "Išj_ungti garsus"

-

-msgid "Sounds when conversation has _focus"

-msgstr "Groti _garsus, kai pokalbio langas yra veikiamasis"

-

-msgid "_Enable sounds:"

-msgstr "_Įjungti garsus:"

-

-msgid "V_olume:"

-msgstr "_Garsumas:"

-

-msgid "Play"

-msgstr "Groti"

-

-msgid "_Browse..."

-msgstr "_Naršyti...."

-

-msgid "_Reset"

-msgstr "_Atstatyti"

-

-msgid "_Report idle time:"

-msgstr "_Rodyti neveiklumo laiką:"

-

-msgid "Based on keyboard or mouse use"

-msgstr "pagal klaviatūros ir pelės naudojimą"

-

-msgid "_Auto-reply:"

-msgstr "_Automatinis atsakymas:"

-

-msgid "When both away and idle"

-msgstr "ir kai pasitraukęs, ir kai neveiklus"

-

-#. Auto-away stuff

-msgid "Auto-away"

-msgstr "Automatinis pasitraukimas"

-

-msgid "Change status when _idle"

-msgstr "Pake_isti būseną, kai neveiklus"

-

-msgid "_Minutes before becoming idle:"

-msgstr "Kiek minučių turi praeiti iki tapimo neveikliu:"

-

-msgid "Change _status to:"

-msgstr "Pakei_sti būseną į:"

-

-#. Signon status stuff

-msgid "Status at Startup"

-msgstr "Būsena programos paleidimo metu"

-

-msgid "Use status from last _exit at startup"

-msgstr "Programos paleidimo metu nustatyti paskutinę prieš tai naudotą būseną"

-

-msgid "Status to a_pply at startup:"

-msgstr "Programos paleidimo metu nustatyti būseną:"

-

-msgid "Interface"

-msgstr "Sąsaja"

-

-msgid "Smiley Themes"

-msgstr "Šypsenėlių apipavidalinimai"

-

-#  We use the registered default browser in windows

-msgid "Browser"

-msgstr "Naršyklė"

-

-msgid "Status / Idle"

-msgstr "Būsenos ir neveiklumas"

-

-msgid "Allow all users to contact me"

-msgstr "Leisti visiems vartotojams susisiekti su manimi"

-

-msgid "Allow only the users on my buddy list"

-msgstr "Leisti tik vartotojus iš mano bičiulių sąrašo"

-

-msgid "Allow only the users below"

-msgstr "Leisti žemiau išvardintus vartotojus"

-

-msgid "Block all users"

-msgstr "Blokuoti visus vartotojus"

-

-msgid "Block only the users below"

-msgstr "Blokuoti žemiau išvardintus vartotojus"

-

-msgid "Privacy"

-msgstr "Privatumas"

-

-msgid "Changes to privacy settings take effect immediately."

-msgstr "Privatumo nuostatų pakeitimai iš karto tampa aktyvūs"

-

-msgid "Set privacy for:"

-msgstr "Nustatyti privatumo parinktis vartotojui:"

-

-#. Remove All button

-msgid "Remove Al_l"

-msgstr "Paša_linti visus"

-

-msgid "Permit User"

-msgstr "Leisti vartotoją"

-

-msgid "Type a user you permit to contact you."

-msgstr "Įveskite vartotojo, kuriam leidžiate su jumis susisiekti, vardą"

-

-msgid "Please enter the name of the user you wish to be able to contact you."

-msgstr ""

-"Prašau įvesti vartotojo, kuriam norite leisti su jumis susisiekti, vardą"

-

-msgid "_Permit"

-msgstr "_Leisti"

-

-#, c-format

-msgid "Allow %s to contact you?"

-msgstr "Ar leisti vartotojui %s susisiekti su Jumis?"

-

-#, c-format

-msgid "Are you sure you wish to allow %s to contact you?"

-msgstr "Ar esate tikras, kad norite leisti vartotojui %s susisiekti su Jumis?"

-

-msgid "Block User"

-msgstr "Blokuoti vartotoją"

-

-msgid "Type a user to block."

-msgstr "Įveskite vartotoją, kurį blokuojate, vardą."

-

-msgid "Please enter the name of the user you wish to block."

-msgstr "Prašau įvesti vartotojo, kurį norite blokuoti, vardą."

-

-#, c-format

-msgid "Block %s?"

-msgstr "Ar blokuoti vartotoją %s?"

-

-#, c-format

-msgid "Are you sure you want to block %s?"

-msgstr "Ar esate tikras, kad norite blokuoti vartotoją %s?"

-

-msgid "Apply"

-msgstr "Vykdyti"

-

-msgid "That file already exists"

-msgstr "Toks failas jau yra"

-

-msgid "Would you like to overwrite it?"

-msgstr "Ar norite jį perrašyti?"

-

-msgid "Overwrite"

-msgstr "Perrašyti"

-

-msgid "Choose New Name"

-msgstr "Parinkti kitą vardą"

-

-msgid "Select Folder..."

-msgstr "Pasirinkite aplanką..."

-

-#. list button

-msgid "_Get List"

-msgstr "_Gauti sąrašą"

-

-#. add button

-msgid "_Add Chat"

-msgstr "_Pridėti pokalbių kambarį"

-

-msgid "Are you sure you want to delete the selected saved statuses?"

-msgstr "Ar tikrai norite pašalinti pasirinktas įrašytas būsenas?"

-

-#. Use button

-msgid "_Use"

-msgstr "Pasi_šalinti"

-

-msgid "Title already in use.  You must choose a unique title."

-msgstr "Toks pavadinimas jau yra.  Privalote pasirinkti unikalų pavadinimą."

-

-msgid "Different"

-msgstr "Skirtinga"

-

-msgid "_Title:"

-msgstr "_Pavadinimas:"

-

-msgid "_Status:"

-msgstr "_Būsena:"

-

-#. Different status message expander

-msgid "Use a _different status for some accounts"

-msgstr "Kai kurioms paskyroms naudoti kitokią būseną"

-

-#. Save & Use button

-msgid "Sa_ve & Use"

-msgstr "I_šsaugoti ir pasišalinti"

-

-#, c-format

-msgid "Status for %s"

-msgstr "Paskyros %s būsena"

-

-msgid "Custom Smiley"

-msgstr "Tinkinta šypsenėlė"

-

-msgid "More Data needed"

-msgstr "Reikia daugiau duomenų"

-

-msgid "Please provide a shortcut to associate with the smiley."

-msgstr "Nurodykite klavišų seką susiejimui su šypsenėle."

-

-msgid "Duplicate Shortcut"

-msgstr "Klavišų seka jau priskirta"

-

-msgid ""

-"A custom smiley for the selected shortcut already exists. Please specify a "

-"different shortcut."

-msgstr ""

-"Šiai klavišų sekai jau priskirta tinkinta šypsenelė.  Pasirinkite kitokią "

-"kombinaciją."

-

-msgid "Please select an image for the smiley."

-msgstr "Parinkite šypsenėlei paveiksliuką."

-

-msgid "Edit Smiley"

-msgstr "Keisti šypsenėlę"

-

-#  show everything

-msgid "Add Smiley"

-msgstr "Pridėti šypsenėlę"

-

-msgid "Smiley _Image"

-msgstr "_Šypsenėlės paveiksliukas"

-

-#. Smiley shortcut

-msgid "Smiley S_hortcut"

-msgstr "_Šypsenėlės klavišų seka"

-

-#  show everything

-msgid "Smiley"

-msgstr "Šypsenėlė"

-

-msgid "Custom Smiley Manager"

-msgstr "Tinkintų šypsenėlių tvarkytuvė"

-

-msgid "Click to change your buddyicon for this account."

-msgstr "Paspauskite, kad pakeistumėte savo paveiksliuką šiai paskyrai."

-

-msgid "Click to change your buddyicon for all accounts."

-msgstr "Paspauskite, kad pakeistumėte savo paveiksliuką visoms paskyroms."

-

-msgid "Waiting for network connection"

-msgstr "Laukiama tinklo jungties"

-

-msgid "New status..."

-msgstr "Nauja būsena..."

-

-msgid "Saved statuses..."

-msgstr "Išsaugotos būsenos..."

-

-msgid "Status Selector"

-msgstr "Būsenos rinkiklis"

-

-msgid "Google Talk"

-msgstr "Google Talk"

-

-#, c-format

-msgid "The following error has occurred loading %s: %s"

-msgstr "Įkeliant %s įvyko klaida: %s"

-

-msgid "Failed to load image"

-msgstr "Nepavyko įkelti vaizdo"

-

-#, c-format

-msgid "Cannot send folder %s."

-msgstr "Negalima išsiųsti katalogo %s."

-

-#, c-format

-msgid ""

-"%s cannot transfer a folder. You will need to send the files within "

-"individually."

-msgstr ""

-"%s negali perduoti katalogo.  Jums reikia perduoti jame esančius failus po "

-"vieną."

-

-msgid "You have dragged an image"

-msgstr "Jūs atitempėte pele paveiksliuką"

-

-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 ""

-"Galite šį paveiksliuką nusiųsti kaip failą, įterpti į šią žinutę, arba "

-"naudoti kaip paveiksliuką šiam vartotojui."

-

-msgid "Set as buddy icon"

-msgstr "Naudoti kaip vartotojo paveiksliuką"

-

-msgid "Send image file"

-msgstr "Nusiųsti kaip failą"

-

-msgid "Insert in message"

-msgstr "Įterpti į žinutę"

-

-msgid "Would you like to set it as the buddy icon for this user?"

-msgstr "Ar norite paveiksliuką naudoti kaip šio vartotojo paveiksliuką?"

-

-msgid ""

-"You can send this image as a file transfer, or use it as the buddy icon for "

-"this user."

-msgstr ""

-"Galite šį paveiksliuką nusiųsti kaip failą arba nustatyti kaip šio vartotojo "

-"paveiksliuką."

-

-msgid ""

-"You can insert this image into this message, or use it as the buddy icon for "

-"this user"

-msgstr ""

-"Galite šį paveiksliuką įterpti į žinutę arba naudoti kaip šio vartotojo "

-"paveiksliuką."

-

-#. 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

-msgid "Cannot send launcher"

-msgstr "Negalima išsiųsti paleidyklės"

-

-msgid ""

-"You dragged a desktop launcher. Most likely you wanted to send whatever this "

-"launcher points to instead of this launcher itself."

-msgstr ""

-"Jūs atitempėte pele darbastalio paleidyklę.  Greičiausiai norite siųsti ne "

-"pačią paleidyklę, o jos paleidžiamą objektą."

-

-#, c-format

-msgid ""

-"<b>File:</b> %s\n"

-"<b>File size:</b> %s\n"

-"<b>Image size:</b> %dx%d"

-msgstr ""

-"<b>Failas:</b> %s\n"

-"<b>Failo dydis:</b> %s\n"

-"<b>Vaizdo dydis:</b> %dx%d"

-

-#, c-format

-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"

-msgstr ""

-"Failas „%s“ yra per didelis %s.  Pabandykite su mažesniu paveiksliuku.\n"

-

-msgid "Icon Error"

-msgstr "Paveiksliuko klaida"

-

-msgid "Could not set icon"

-msgstr "Nepavyko nustatyti paveiksliuko"

-

-#, c-format

-msgid "Failed to open file '%s': %s"

-msgstr "Nepavyko atverti failo „%s“: %s"

-

-#, c-format

-msgid ""

-"Failed to load image '%s': reason not known, probably a corrupt image file"

-msgstr ""

-"Paveiksliuko „%s“ nepavyko įkelti dėl nežinomos priežasties, turbūt tai yra "

-"sugadintas paveiksliuko failas"

-

-msgid "Save File"

-msgstr "Įrašyti failą"

-

-msgid "Select color"

-msgstr "Pasirinkite spalvą"

-

-msgid "_Alias"

-msgstr "_Alternatyvusis vardas"

-

-msgid "Close _tabs"

-msgstr "Uždaryti kor_teles"

-

-msgid "_Get Info"

-msgstr "_Gauti informaciją"

-

-#  Invite

-msgid "_Invite"

-msgstr "Pakv_iesti"

-

-msgid "_Modify..."

-msgstr "_Keisti..."

-

-msgid "_Add..."

-msgstr "_Pridėti..."

-

-msgid "_Open Mail"

-msgstr "_Atverti paštą"

-

-msgid "_Edit"

-msgstr "K_eisti"

-

-msgid "Pidgin Tooltip"

-msgstr "Pidgin mygtukų etiketės"

-

-msgid "Pidgin smileys"

-msgstr "Pidgin šypsenėlės"

-

-msgid "Penguin Pimps"

-msgstr "Pingvinai sąvadautojai"

-

-msgid "Selecting this disables graphical emoticons."

-msgstr "Išjungia grafines šypsenėles"

-

-msgid "none"

-msgstr "Jokių šypsenėlių"

-

-msgid "Small"

-msgstr "Mažas"

-

-msgid "Smaller versions of the default smilies"

-msgstr "Mažesni numatytųjų šypsenėlių variantai"

-

-msgid "Response Probability:"

-msgstr "Atsakymo tikimybė:"

-

-msgid "Statistics Configuration"

-msgstr "Statistikos parinktys"

-

-#. msg_difference spinner

-msgid "Maximum response timeout:"

-msgstr "Didžiausias atsakymo laukimo laikas:"

-

-msgid "minutes"

-msgstr "minutės"

-

-#. last_seen spinner

-msgid "Maximum last-seen difference:"

-msgstr "Didžiausias paskutinio pamatymo laiko skirtumas:"

-

-#. threshold spinner

-msgid "Threshold:"

-msgstr "Slenkstis:"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Contact Availability Prediction"

-msgstr "Kontaktų prieinamumo nuspėjimas"

-

-#. *< name

-#. *< version

-msgid "Contact Availability Prediction plugin."

-msgstr "Kontaktų prieinamumo nuspėjimo papildinys."

-

-#. *  summary

-msgid "Displays statistical information about your buddies' availability"

-msgstr "Rodo statistiką apie bičiulių prieinamumą"

-

-msgid "Buddy is idle"

-msgstr "bičiulis yra neveiklus"

-

-msgid "Buddy is away"

-msgstr "bičiulis yra pasitraukęs"

-

-msgid "Buddy is \"extended\" away"

-msgstr "bičiulis yra ilgam pasitraukęs"

-

-#. Not used yet.

-msgid "Buddy is mobile"

-msgstr "bičiulis yra mobilus"

-

-msgid "Buddy is offline"

-msgstr "bičiulis yra atsijungęs"

-

-msgid "Point values to use when..."

-msgstr "Kiek taškų skiriama, kai..."

-

-msgid ""

-"The buddy with the <i>largest score</i> is the buddy who will have priority "

-"in the contact.\n"

-msgstr "Bičiulis su <i>daugiausia taškų</i> turės kontakto pirmenybę.\n"

-

-msgid "Use last buddy when scores are equal"

-msgstr "Jeigu keli bičiuliai surinko vienodai taškų, pasirinkti paskutinį"

-

-msgid "Point values to use for account..."

-msgstr "Kiek taškų skiriama paskyrai..."

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Contact Priority"

-msgstr "Kontakto pirmenybė"

-

-#. *< name

-#. *< version

-#. *< summary

-msgid ""

-"Allows for controlling the values associated with different buddy states."

-msgstr "Leidžia keisti reikšmes, susietas su skirtingomis bičiulių būsenomis."

-

-#. *< description

-msgid ""

-"Allows for changing the point values of idle/away/offline states for buddies "

-"in contact priority computations."

-msgstr ""

-"Leidžia keisti reikšmes, susietas su įvairiomis bičiulių būsenomis, "

-"naudojamas kontakto pirmenybės skaičiavimuose."

-

-msgid "Conversation Colors"

-msgstr "Pokalbių spalvos"

-

-#  IM Convo trans options

-msgid "Customize colors in the conversation window"

-msgstr "Nustatyti pokalbių lango spalvas"

-

-msgid "Error Messages"

-msgstr "Klaidų pranešimai"

-

-msgid "Highlighted Messages"

-msgstr "Paryškintos žinutės"

-

-msgid "System Messages"

-msgstr "Sisteminės žinutės"

-

-msgid "Sent Messages"

-msgstr "Išsiųstos žinutės"

-

-msgid "Received Messages"

-msgstr "Gautos žinutės"

-

-#, c-format

-msgid "Select Color for %s"

-msgstr "Pasirinkite sąsajos elemento „%s“ spalvą"

-

-msgid "Ignore incoming format"

-msgstr "Ignoruoti gaunamų žinučių formato taikymą"

-

-msgid "Apply in Chats"

-msgstr "Taikyti pokalbių kambariuose"

-

-msgid "Apply in IMs"

-msgstr "Taikyti asmeniniams pokalbiams"

-

-msgid "By conversation count"

-msgstr "Pagal pokalbių skaičių"

-

-msgid "Conversation Placement"

-msgstr "Pokalbių patalpinimas"

-

-#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above

-msgid ""

-"Note: The preference for \"New conversations\" must be set to \"By "

-"conversation count\"."

-msgstr ""

-"Pastaba: parinktis „Nauji pokalbiai“ turi būti nustatyta kaip „Pagal "

-"pokalbių skaičių.“"

-

-msgid "Number of conversations per window"

-msgstr "Pokalbių skaičius langui"

-

-msgid "Separate IM and Chat windows when placing by number"

-msgstr ""

-"Talpinant pagal skaičių atskirti asmeninių pokalbių ir pokalbių kambarių "

-"langus"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas?

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "ExtPlacement"

-msgstr "ExtPlacement"

-

-#  *< name

-#  *< version

-#. *< name

-#. *< version

-msgid "Extra conversation placement options."

-msgstr "Papildomi pokalbių talpinimo į langus nustatymai"

-

-#  *< summary

-#  *  description

-#. *< summary

-#. *  description

-msgid ""

-"Restrict the number of conversations per windows, optionally separating IMs "

-"and Chats"

-msgstr ""

-"Apriboja pokalbių skaičių viename lange ir gali suskirstyti asmeninius "

-"pokalbius ir pokalbius kambariuose į atskirus langus"

-

-#. Configuration frame

-msgid "Mouse Gestures Configuration"

-msgstr "Pelės gestų konfigūracija"

-

-msgid "Middle mouse button"

-msgstr "Vidurinis pelės klavišas"

-

-msgid "Right mouse button"

-msgstr "Dešinysis pelės klavišas"

-

-#  "Visual gesture display" checkbox

-#. "Visual gesture display" checkbox

-msgid "_Visual gesture display"

-msgstr "_Vizualus gesto pavaizdavimas"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Mouse Gestures"

-msgstr "Pelės gestai"

-

-#  *< name

-#  *< version

-#  *  summary

-#. *< name

-#. *< version

-#. *  summary

-msgid "Provides support for mouse gestures"

-msgstr "Leidžia naudoti pelės gestus"

-

-#  *  description

-#. *  description

-msgid ""

-"Allows support for mouse gestures in conversation windows. Drag the middle "

-"mouse button to perform certain actions:\n"

-" • Drag down and then to the right to close a conversation.\n"

-" • Drag up and then to the left to switch to the previous conversation.\n"

-" • Drag up and then to the right to switch to the next conversation."

-msgstr ""

-"Suteikia galimybę naudoti pelės gestus pokalbių kambariuose.\n"

-"Tempdami vidurinį klavišą galite atlikti tokius veiksmus:\n"

-"\n"

-" • Tempkite žemyn ir į dešinę pokalbio užvėrimui.\n"

-" • Tempkite aukštyn ir į kairę persijungimui į prieš tai buvusį pokalbį.\n"

-" • Tempkite aukštyn ir į dešinę persijungimui į kitą pokalbį."

-

-msgid "Instant Messaging"

-msgstr "Greitasis bendravimas"

-

-#. Add the label.

-msgid "Select a person from your address book below, or add a new person."

-msgstr ""

-"Pasirinkite asmenį iš Jūsų adresų knygos arba sukurkite naują asmens įrašą."

-

-msgid "Group:"

-msgstr "Grupė:"

-

-#. "New Person" button

-msgid "New Person"

-msgstr "Naujas asmuo"

-

-#. "Select Buddy" button

-msgid "Select Buddy"

-msgstr "Pasirinkti bičiulį"

-

-#  Add the label.

-#. Add the label.

-msgid ""

-"Select a person from your address book to add this buddy to, or create a new "

-"person."

-msgstr ""

-"Pasirinkti asmenį iš Jūsų adresų knygos, prie kurio pridėti šį bičiulį, arba "

-"sukurti naują asmenį."

-

-#. Add the expander

-msgid "User _details"

-msgstr "Vartotojo _duomenys"

-

-#  "Associate Buddy" button

-#. "Associate Buddy" button

-msgid "_Associate Buddy"

-msgstr "_Susieti bičiulį"

-

-msgid "Unable to send email"

-msgstr "Negalima išsiųsti el. laiško"

-

-msgid "The evolution executable was not found in the PATH."

-msgstr "Vykdomasis Evolution failas nerastas PATH kintamajame."

-

-msgid "An email address was not found for this buddy."

-msgstr "Nerastas šio bičiulio el. pašto adresas."

-

-msgid "Add to Address Book"

-msgstr "Įtraukti į adresų knygą"

-

-msgid "Send Email"

-msgstr "Nusiųsti el. laišką"

-

-#  Configuration frame

-#. Configuration frame

-msgid "Evolution Integration Configuration"

-msgstr "Evolution integracijos konfigūravimas"

-

-#  Label

-#. Label

-msgid "Select all accounts that buddies should be auto-added to."

-msgstr ""

-"Pasirinkite visas paskyras, į kurias bičiuliai turėtų būti pridedami "

-"automatiškai."

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Evolution Integration"

-msgstr "Evolution integracija"

-

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Provides integration with Evolution."

-msgstr "Suteikia integraciją su Evolution"

-

-msgid "Please enter the person's information below."

-msgstr "Prašau žemiau įvesti asmens informaciją."

-

-msgid "Please enter the buddy's username and account type below."

-msgstr "Prašau žemiau įvesti bičiulio naudotojo vardą ir paskyros tipą."

-

-msgid "Account type:"

-msgstr "Paskyros tipas:"

-

-#  Optional Information section

-#. Optional Information section

-msgid "Optional information:"

-msgstr "Nebūtina informacija:"

-

-msgid "First name:"

-msgstr "Vardas:"

-

-msgid "Last name:"

-msgstr "Pavardė:"

-

-msgid "Email:"

-msgstr "El. pašto adresas:"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "GTK Signals Test"

-msgstr "GTK signalų testas"

-

-#  *< name

-#  *< version

-#  *  summary

-#  *  description

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Test to see that all ui signals are working properly."

-msgstr "Testas, skirtas nustatyti, ar visi sąsajos signalai veikia teisingai."

-

-#  "New Buddy Pounce"

-#, c-format

-msgid ""

-"\n"

-"<b>Buddy Note</b>: %s"

-msgstr ""

-"\n"

-"<b>Bičiulio pastaba</b>: %s"

-

-msgid "History"

-msgstr "Istorija"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Iconify on Away"

-msgstr "Suskleisti pasitraukiant"

-

-#  *< name

-#  *< version

-#  *  summary

-#  *  description

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Iconifies the buddy list and your conversations when you go away."

-msgstr "Suskleidžia bičiulių sąrašą ir Jūsų pokalbius, kai Jūs pasitraukiate."

-

-msgid "Mail Checker"

-msgstr "Pašto tikrinimas"

-

-msgid "Checks for new local mail."

-msgstr "Patikrina, ar negautas naujas vietinis paštas."

-

-msgid "Adds a small box to the buddy list that shows if you have new mail."

-msgstr ""

-"Įdeda mažą langelį į bičiulių sąrašą, kuris parodo, ar turite naujo pašto."

-

-msgid "Markerline"

-msgstr "Skirtukas"

-

-msgid "Draw a line to indicate new messages in a conversation."

-msgstr "Pokalbių lange nubrėžia naujas žinutes atskiriančią liniją"

-

-msgid "Jump to markerline"

-msgstr "Peršokti prie skirtuko"

-

-msgid "Draw Markerline in "

-msgstr "Skirtuką piešti "

-

-msgid "_IM windows"

-msgstr "_asmeninių pokalbių languose"

-

-msgid "C_hat windows"

-msgstr "_pokalbių kambarių languose"

-

-msgid ""

-"A music messaging session has been requested. Please click the MM icon to "

-"accept."

-msgstr ""

-"Prašoma pradėti muzikinių žinučių seansą.  Spustelėkite MM piktogramą seanso "

-"pradėjimui."

-

-msgid "Music messaging session confirmed."

-msgstr "Muzikinių žinučių seansas patvirtintas."

-

-msgid "Music Messaging"

-msgstr "Muzikinės žinutės"

-

-msgid "There was a conflict in running the command:"

-msgstr "Komandos vykdymo metu įvyko konfliktas"

-

-msgid "Error Running Editor"

-msgstr "Redaktoriaus vykdymo klaida"

-

-msgid "The following error has occurred:"

-msgstr "Įvyko klaida:"

-

-#. Configuration frame

-msgid "Music Messaging Configuration"

-msgstr "Muzikinių žinučių parinktys"

-

-msgid "Score Editor Path"

-msgstr "Partitūrų redaktoriaus kelias"

-

-msgid "_Apply"

-msgstr "_Vykdyti"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-#. *< name

-#. *< version

-msgid "Music Messaging Plugin for collaborative composition."

-msgstr "Muzikinių žinučių papildinys kolektyviniam muzikos kūrimui."

-

-#. *  summary

-msgid ""

-"The Music Messaging Plugin allows a number of users to simultaneously work "

-"on a piece of music by editting a common score in real-time."

-msgstr ""

-"Muzikinių žinučių papildinys leidžia keliems vartotojams vienu metu kurti tą "

-"patį muzikinį kūrinį."

-

-#  ---------- "Notify For" ----------

-#. ---------- "Notify For" ----------

-msgid "Notify For"

-msgstr "Pranešti apie:"

-

-msgid "\t_Only when someone says your username"

-msgstr "        tik kai kas n_ors pasako Jūsų naudotojo vardą"

-

-msgid "_Focused windows"

-msgstr "_veikiamuosius langus"

-

-#  ---------- "Notification Methods" ----------

-#. ---------- "Notification Methods" ----------

-msgid "Notification Methods"

-msgstr "Pranešimo būdai:"

-

-msgid "Prepend _string into window title:"

-msgstr "p_ridėti eilutę prieš lango pavadinimą:"

-

-#  Count method button

-#. Count method button

-msgid "Insert c_ount of new messages into window title"

-msgstr "į_terpti naujų žinučių skaičių į lango pavadinimą"

-

-#  Count method button

-#. Count xprop method button

-msgid "Insert count of new message into _X property"

-msgstr "įterpti naujų žinučių skaičių į _X sąvybę"

-

-#  Urgent method button

-#. Urgent method button

-msgid "Set window manager \"_URGENT\" hint"

-msgstr "nustatyti langų tvarkytuvės „_URGENT“ patarimą"

-

-msgid "_Flash window"

-msgstr "_Mirginti langą"

-

-#  IM Convo trans options

-#. Raise window method button

-msgid "R_aise conversation window"

-msgstr "P_akelti pokalbių langą"

-

-#  IM Convo trans options

-#. Present conversation method button

-msgid "_Present conversation window"

-msgstr "_Pristatyti pokalbių langą"

-

-#  ---------- "Notification Removals" ----------

-#. ---------- "Notification Removals" ----------

-msgid "Notification Removal"

-msgstr "Baigti pranešimą, kai:"

-

-#  Remove on focus button

-#. Remove on focus button

-msgid "Remove when conversation window _gains focus"

-msgstr "pokalbių _langas tampa veikiamasis"

-

-#  Remove on click button

-#. Remove on click button

-msgid "Remove when conversation window _receives click"

-msgstr "spragtelėjama ant pokalbių la_ngo"

-

-#  Remove on type button

-#. Remove on type button

-msgid "Remove when _typing in conversation window"

-msgstr "rašo_ma į pokalbių langą"

-

-#  Remove on message send button

-#  Remove on message send button

-#. Remove on message send button

-msgid "Remove when a _message gets sent"

-msgstr "iš_siunčiama žinutė"

-

-#  Remove on conversation switch button

-#  Remove on conversation switch button

-#. Remove on conversation switch button

-msgid "Remove on switch to conversation ta_b"

-msgstr "kai pers_ijungiama į pokalbio kortelę"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Message Notification"

-msgstr "Pranešimai apie žinutes"

-

-#  *< name

-#  *< version

-#  *  summary

-#  *  description

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "Provides a variety of ways of notifying you of unread messages."

-msgstr "Siūlo keletą būdų, kaip Jums pranešti apie neperskaitytas žinutes"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Pidgin Demonstration Plugin"

-msgstr "Demonstracinis Pidgin papildinys"

-

-#. *< name

-#. *< version

-#. *  summary

-msgid "An example plugin that does stuff - see the description."

-msgstr "Pavyzdinis papildinis, kuris daro šį bei tą – skaitykite jo aprašymą."

-

-#. *  description

-msgid ""

-"This is a really cool plugin that does a lot of stuff:\n"

-"- It tells you who wrote the program when you log in\n"

-"- It reverses all incoming text\n"

-"- It sends a message to people on your list immediately when they sign on"

-msgstr ""

-"Tai yra tikrai kietas papildinys, mokantis daug ką daryti:\n"

-"- jis Jums pasako, kas parašė programą, kai prisijungiate;\n"

-"- jis apsuka visą gaunamą tekstą\n"

-"- jis nusiunčia žinutę Jūsų bičiuliams iškart, kai jie prisijungia."

-

-msgid "Cursor Color"

-msgstr "Žymeklio spalva"

-

-msgid "Secondary Cursor Color"

-msgstr "Antrinė žymeklio spalva"

-

-msgid "Hyperlink Color"

-msgstr "Hipersaito spalva"

-

-msgid "Visited Hyperlink Color"

-msgstr "Aplankyhto hipersaito spalva"

-

-msgid "Highlighted Message Name Color"

-msgstr "Vardo paryškintoje žinutėje spalva"

-

-msgid "GtkTreeView Horizontal Separation"

-msgstr "GtkTreeView horizontalus atskyrimo tarpas"

-

-msgid "Conversation Entry"

-msgstr "Pokalbio įrašas"

-

-msgid "Request Dialog"

-msgstr "Užklausos dialogas"

-

-#  ---------- "Notify For" ----------

-msgid "Notify Dialog"

-msgstr "Informacinis dialogas"

-

-msgid "Select Color"

-msgstr "Pasirinkite spalvą"

-

-#, c-format

-msgid "Select Interface Font"

-msgstr "Pasirinkite sąsajos šriftą"

-

-#, c-format

-msgid "Select Font for %s"

-msgstr "Pasirinkite sąsajos elemento „%s“ šriftą"

-

-msgid "GTK+ Interface Font"

-msgstr "GTK+ sąsajos šriftas"

-

-msgid "GTK+ Text Shortcut Theme"

-msgstr "GTK+ prieigos klavišų parinktis"

-

-#.

-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {

-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);

-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);

-#.

-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),

-#. widget_bool_prefs_set[i], hbox);

-#. gtk_size_group_add_widget(labelsg, check);

-#.

-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);

-#. *

-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);

-#. *

-#. gtk_widget_set_sensitive(widget_bool_widgets[i],

-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));

-#. g_signal_connect(G_OBJECT(check), "toggled",

-#. G_CALLBACK(pidgin_toggle_sensitive),

-#. widget_bool_widgets[i]);

-#. }

-#.

-msgid "Interface colors"

-msgstr "Sąsajos spalvos"

-

-msgid "Widget Sizes"

-msgstr "Sąsajos elementų dydžiai"

-

-msgid "Fonts"

-msgstr "Šriftai"

-

-msgid "Gtkrc File Tools"

-msgstr "Gtkrc failų įrankiai"

-

-#, c-format

-msgid "Write settings to %s%sgtkrc-2.0"

-msgstr "Įrašyti nuostatas į %s%sgtkrc-2.0"

-

-msgid "Re-read gtkrc files"

-msgstr "Iš naujo įkelti gtkrc failus"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-msgid "Pidgin GTK+ Theme Control"

-msgstr "Pidgin GTK+ apipavidalinimo parinktys"

-

-msgid "Provides access to commonly used gtkrc settings."

-msgstr "Leidžia keisti dažnai naudojamas gtkrc parinktis."

-

-msgid "Raw"

-msgstr "Neapdorota įvestis"

-

-msgid "Lets you send raw input to text-based protocols."

-msgstr "Leidžia Jums tiesiogiai įvesti tekstinių protokolų komandas."

-

-msgid ""

-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "

-"'Enter' in the entry box to send. Watch the debug window."

-msgstr ""

-"Leidžia Jums siųsti neapdorotą įvestį tekstiniams protokolams (Jabber, MSN, "

-"IRC, TOC).  Paspauskite „Enter“ įvedimo langelyje išsiuntimui.  Stebėkite "

-"derinimo langą."

-

-#, c-format

-msgid "You can upgrade to %s %s today."

-msgstr "Šiandien jau galite atnaujinti į %s %s."

-

-msgid "New Version Available"

-msgstr "Pasirodė nauja versija"

-

-msgid "Later"

-msgstr "Vėliau"

-

-msgid "Download Now"

-msgstr "Atsisiųsti dabar"

-

-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Release Notification"

-msgstr "Pranešimas apie laidą"

-

-#  *< name

-#  *< version

-#  *  summary

-#. *< name

-#. *< version

-#. *  summary

-msgid "Checks periodically for new releases."

-msgstr "Periodiškai patikrina, ar neišleistos naujos versijos"

-

-#  *  description

-#. *  description

-msgid ""

-"Checks periodically for new releases and notifies the user with the "

-"ChangeLog."

-msgstr ""

-"Periodiškai patikrina, ar neišleistos naujos versijos ir praneša apie tai "

-"vartotojui kartu su pakeitimų sąrašu."

-

-#  Build the Send As menu

-#. *< major version

-#. *< minor version

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Send Button"

-msgstr "Siuntimo mygtukas"

-

-#  IM Convo trans options

-#. *< name

-#. *< version

-msgid "Conversation Window Send Button."

-msgstr "Mygtukas „Siųsti“ pokalbių languose"

-

-#. *< summary

-msgid ""

-"Adds a Send button to the entry area of the conversation window. Intended "

-"for when no physical keyboard is present."

-msgstr ""

-"Prideda mygtuką „Siųsti“ į pokalbių lango įvedimo sritį.  Skirta naudojimui, "

-"kai nėra realios klaviatūros."

-

-msgid "Duplicate Correction"

-msgstr "Pakartoto žodžio pataisymas"

-

-msgid "The specified word already exists in the correction list."

-msgstr "Toks žodis jau yra pataisymų sąraše."

-

-msgid "Text Replacements"

-msgstr "Teksto pakeitimai"

-

-msgid "You type"

-msgstr "Jūs parašote"

-

-msgid "You send"

-msgstr "Jūs išsiunčiate"

-

-msgid "Whole words only"

-msgstr "Tik ištisi žodžiai"

-

-msgid "Case sensitive"

-msgstr "Skirti mažąsias ir didžiąsias raides"

-

-msgid "Add a new text replacement"

-msgstr "Sukurti naują teksto pakeitimą"

-

-msgid "You _type:"

-msgstr "Jūs parašo_te:"

-

-msgid "You _send:"

-msgstr "Jūs iš_siunčiate:"

-

-#. Created here so it can be passed to whole_words_button_toggled.

-msgid "_Exact case match (uncheck for automatic case handling)"

-msgstr ""

-"Tikslus didžiųjų ir mažųjų raidžių sutapimas (panaikinkite žymėjimą "

-"automatiniam apdorojimui)"

-

-msgid "Only replace _whole words"

-msgstr "Keisti tik _ištisus žodžius"

-

-msgid "General Text Replacement Options"

-msgstr "Bendrosios teksto pakeitimo parinktys"

-

-msgid "Enable replacement of last word on send"

-msgstr "Leisti paskutinio žodžio pakeitimą išsiuntimo metu"

-

-msgid "Text replacement"

-msgstr "Teksto pakeitimas"

-

-msgid "Replaces text in outgoing messages according to user-defined rules."

-msgstr ""

-"Pakeičia tekstą išsiunčiamose žinutėse pagal vartotojo sukurtas taisykles."

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Buddy Ticker"

-msgstr "Bičiulių juosta"

-

-#. *< name

-#. *< version

-#. *  summary

-#. *  description

-msgid "A horizontal scrolling version of the buddy list."

-msgstr "Horizontalus slenkantis bičiulių sąrašo variantas."

-

-msgid "Display Timestamps Every"

-msgstr "Rodyti laiko žymes kas"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Timestamp"

-msgstr "Laiko žymos"

-

-#. *< name

-#. *< version

-#. *  summary

-msgid "Display iChat-style timestamps"

-msgstr "Rodo iChat stiliaus laiko žymas"

-

-#. *  description

-msgid "Display iChat-style timestamps every N minutes."

-msgstr "Kas N minučių rodo iChat stiliaus laiko žymes"

-

-msgid "Timestamp Format Options"

-msgstr "Laiko žymių formato parinktys"

-

-#, c-format

-msgid "_Force 24-hour time format"

-msgstr "_Būtinai naudoti 24 valandų laiko formatą"

-

-msgid "Show dates in..."

-msgstr "Rodyti datas..."

-

-msgid "Co_nversations:"

-msgstr "pokalbiuose:"

-

-msgid "For delayed messages"

-msgstr "uždelstoms žinutėms"

-

-msgid "For delayed messages and in chats"

-msgstr "uždelstoms žinutėms ir pokalbių kambariams"

-

-msgid "_Message Logs:"

-msgstr "Ž_urnaluose:"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Message Timestamp Formats"

-msgstr "Žinučių laiko žymių formatai"

-

-#. *< name

-#. *< version

-#. *  summary

-msgid "Customizes the message timestamp formats."

-msgstr "Parenka žinučių laiko žymių formatus."

-

-#. *  description

-msgid ""

-"This plugin allows the user to customize conversation and logging message "

-"timestamp formats."

-msgstr ""

-"Šis papildinys leidžia vartotojui pasirinkti pokalbių ir žurnalų žinučių "

-"laiko žymių formatus."

-

-msgid "Opacity:"

-msgstr "Nepermatomumas:"

-

-#  IM Convo trans options

-#. IM Convo trans options

-msgid "IM Conversation Windows"

-msgstr "Pokalbių langai"

-

-msgid "_IM window transparency"

-msgstr "Pokalb_ių langų permatotumas"

-

-msgid "_Show slider bar in IM window"

-msgstr "Rodyti šliaužiklio juo_stą pokalbių lange"

-

-msgid "Remove IM window transparency on focus"

-msgstr "Aktyvavus pokalbių langą pašalinti jo permatomumą"

-

-msgid "Always on top"

-msgstr "Visada viršuje"

-

-#  Buddy List trans options

-#. Buddy List trans options

-msgid "Buddy List Window"

-msgstr "Bičiulių sąrašo langas"

-

-msgid "_Buddy List window transparency"

-msgstr "_Bičiulių sąrašo lango permatomumas"

-

-msgid "Remove Buddy List window transparency on focus"

-msgstr "Aktyvavus bičiulių sąrašo langą pašalinti jo permatomumą"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "Transparency"

-msgstr "Permatomumas"

-

-#  *< name

-#  *< version

-#  *  summary

-#. *< name

-#. *< version

-#. *  summary

-msgid "Variable Transparency for the buddy list and conversations."

-msgstr "Kintamas permatumomas bičiulių sąrašo ir pokalbių langams."

-

-#  *  description

-#. *  description

-msgid ""

-"This plugin enables variable alpha transparency on conversation windows and "

-"the buddy list.\n"

-"\n"

-"* Note: This plugin requires Win2000 or greater."

-msgstr ""

-"Šis papildinys suteikia reguliuojamą alfa permatomumą pokalbių ir bičiulių "

-"sąrašo langams.\n"

-"\n"

-"* Pastaba: šis papildinys reikalauja Windows 2000 arba vėlesnės versijos."

-

-msgid "GTK+ Runtime Version"

-msgstr "GTK+ vykdymo laiko bibliotekos versija"

-

-#  Autostart

-#  Autostart

-#. Autostart

-msgid "Startup"

-msgstr "Paleidimas"

-

-#, c-format

-msgid "_Start %s on Windows startup"

-msgstr "Paleisti %s Window_s paleidimo metu"

-

-msgid "_Dockable Buddy List"

-msgstr "_Pritvirtinamas bičiulių langas"

-

-#  Blist On Top

-#. Blist On Top

-msgid "_Keep Buddy List window on top:"

-msgstr "Lai_kyti bičiulių sąrašo langą viršuje:"

-

-#. XXX: Did this ever work?

-msgid "Only when docked"

-msgstr "tik kai pritvirtintas"

-

-msgid "Windows Pidgin Options"

-msgstr "Windows Pidgin parinktys"

-

-msgid "Options specific to Pidgin for Windows."

-msgstr "Specifinės Pidgin parinktys Windows operacinei sistemai."

-

-msgid ""

-"Provides options specific to Pidgin for Windows , such as buddy list docking."

-msgstr ""

-"Leidžia keisti Pidgin parinktis, kurios yra specifinės Windows operacinėje "

-"sistemoje, pavyzdžiui, bičiulių sąrašo lango pritvirtinimą."

-

-msgid "<font color='#777777'>Logged out.</font>"

-msgstr "<font color='#777777'>Atsijungė.</font>"

-

-#. *< type

-#. *< ui_requirement

-#. *< flags

-#. *< dependencies

-#. *< priority

-#. *< id

-msgid "XMPP Console"

-msgstr "XMPP pultas"

-

-#  Set up stuff for the account box

-msgid "Account: "

-msgstr "Paskyra:"

-

-msgid "<font color='#777777'>Not connected to XMPP</font>"

-msgstr "<font color='#777777'>Neprisijungta prie XMPP</font>"

-

-msgid "Insert an <iq/> stanza."

-msgstr "Įterpti <iq/> strofą."

-

-msgid "Insert a <presence/> stanza."

-msgstr "Įterpti <presence/> strofą."

-

-msgid "Insert a <message/> stanza."

-msgstr "Įterpti <message/> strofą."

-

-#. *< name

-#. *< version

-#. *  summary

-msgid "Send and receive raw XMPP stanzas."

-msgstr "Siųsti ir gauti neapdorotas XMPP strofas."

-

-#. *  description

-msgid "This plugin is useful for debbuging XMPP servers or clients."

-msgstr "Šis papildinys naudingas XMPP serverių ir klientų derinimui."

+# Pidgin eilučių vertimai į lietuvių kalbą


+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Pidgin authors


+# This file is distributed under the same license as the Pidgin package.


+# Laurynas Biveinis <laurynas.biveinis@gmail.com>, 2005, 2006, 2007, 2008, 2009.


+# Marius Karnauskas <marius@akl.lt>, 2005.


+# Gediminas Čičinskas. <gediminas@parok.lt>, 2004, 2005.


+# 


+# 


+msgid ""
+msgstr ""
+"Project-Id-Version: Pidgin\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-28 22:02+0200\n"
+"PO-Revision-Date: 2009-07-28 22:01+0200\n"
+"Last-Translator: Laurynas Biveinis <laurynas.biveinis@gmail.com>\n"
+"Language-Team:\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3;     plural=n%10==1 && n%100!=11 ? 0 :            n%"
+"10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Finch"
+msgstr "Finch"
+
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Daugiau informacijos suteikia `%s -h'.\n"
+
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stderr\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"Vartojimas: %s [PARINKTIS] ...\n"
+"\n"
+"  -c, --config=KATALOGAS  naudoti KATALOGAS konfigūracinių failų paieškai\n"
+"  -d, --debug             išvesti derinimo pranešimus į standartinę išvestį\n"
+"  -h, --help              parodyti šią pagalbą ir baigti\n"
+"  -n, --nologin           automatiškai neprisijungti\n"
+"  -v, --version           parodyti šios programos versiją ir baigti\n"
+
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s aptiko klaidų Jūsų nustatymų perkėlimo iš %s į %s metu.  Jums teks "
+"surasti klaidų priežastis ir pabaigti perkėlimą pačiam.  Praneškite apie šią "
+"klaidą adresu http://developer.pidgin.im"
+
+msgid "Error"
+msgstr "Klaida"
+
+msgid "Account was not added"
+msgstr "Paskyra nebuvo sukurta"
+
+msgid "Username of an account must be non-empty."
+msgstr "Paskyros vardas negali būti tuščias"
+
+msgid "New mail notifications"
+msgstr "Pranešimai apie naujus laiškus"
+
+msgid "Remember password"
+msgstr "Prisiminti slaptažodį"
+
+msgid "There are no protocol plugins installed."
+msgstr "Neįdiegtas nė vienas protokolo papildinys."
+
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(Turbūt pamiršote paleisti „make install“.)"
+
+msgid "Modify Account"
+msgstr "Redaguoti paskyrą"
+
+msgid "New Account"
+msgstr "Nauja paskyra"
+
+msgid "Protocol:"
+msgstr "Protokolas:"
+
+msgid "Username:"
+msgstr "Naudotojo vardas:"
+
+msgid "Password:"
+msgstr "Slaptažodis:"
+
+msgid "Alias:"
+msgstr "Alternatyvusis vardas:"
+
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Sukurti šią paskyrą serveryje"
+
+#. Cancel button
+#. Cancel
+msgid "Cancel"
+msgstr "A_tšaukti"
+
+#. Save button
+#. Save
+msgid "Save"
+msgstr "Įrašyti"
+
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Ar Jūs tikrai norite šalinti %s?"
+
+msgid "Delete Account"
+msgstr "Pašalinti paskyrą"
+
+#. Delete button
+msgid "Delete"
+msgstr "Šalinti"
+
+msgid "Accounts"
+msgstr "Paskyros"
+
+msgid "You can enable/disable accounts from the following list."
+msgstr "Jūs galite aktyvuoti ir deaktyvuoti paskyras iš šio sąrašo."
+
+#. Add button
+msgid "Add"
+msgstr "Pridėti"
+
+#. Modify button
+msgid "Modify"
+msgstr "Keisti"
+
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s padarė %s savo bičiuliu%s%s"
+
+msgid "Add buddy to your list?"
+msgstr "Pridėti bičiulį į Jūsų sąrašą?"
+
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "Vartotojas %s%s%s%s nori pridėti %s į savo bičiulių sąrašą%s%s."
+
+msgid "Authorize buddy?"
+msgstr "Ar leisti?"
+
+msgid "Authorize"
+msgstr "Leisti"
+
+msgid "Deny"
+msgstr "Drausti"
+
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Prisijungusių: %d\n"
+"Iš viso: %d"
+
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Paskyra: %s (%s)"
+
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Paskutinį kartą matytas prieš: %s"
+
+msgid "Default"
+msgstr "Numatytosios"
+
+msgid "You must provide a username for the buddy."
+msgstr "Turite duoti bičiuliui vardą."
+
+msgid "You must provide a group."
+msgstr "Turite nurodyti grupę."
+
+msgid "You must select an account."
+msgstr "Jūs privalote pasirinkti paskyrą"
+
+msgid "The selected account is not online."
+msgstr "Pasirinktoji paskyra nėra prisijungusi."
+
+msgid "Error adding buddy"
+msgstr "Bičiulio pridėjimo klaida"
+
+msgid "Username"
+msgstr "Vartotojo vardas"
+
+msgid "Alias (optional)"
+msgstr "Alternatyvusis vardas (neprivalomas)"
+
+msgid "Add in group"
+msgstr "Pridėti grupėje"
+
+msgid "Account"
+msgstr "Paskyra"
+
+msgid "Add Buddy"
+msgstr "Pridėti bičiulį"
+
+msgid "Please enter buddy information."
+msgstr "Įveskite bičiulio informaciją."
+
+msgid "Chats"
+msgstr "Pokalbiai"
+
+#. Extract their Name and put it in
+msgid "Name"
+msgstr "Vardas"
+
+msgid "Alias"
+msgstr "Sukurti alternatyvųjį vardą"
+
+msgid "Group"
+msgstr "Grupė"
+
+msgid "Auto-join"
+msgstr "Automatiškai prisijungti"
+
+msgid "Add Chat"
+msgstr "Pridėti pokalbių kambarį"
+
+msgid "You can edit more information from the context menu later."
+msgstr ""
+"Daugiau informacijos galite keisti vėliau naudodamiesi kontekstiniu meniu."
+
+msgid "Error adding group"
+msgstr "Grupės sukūrimo klaida"
+
+msgid "You must give a name for the group to add."
+msgstr "Jūs turite kuriamai grupei suteikti pavadinimą."
+
+msgid "Add Group"
+msgstr "Pridėti grupę"
+
+msgid "Enter the name of the group"
+msgstr "Įveskite grupės pavadinimą"
+
+msgid "Edit Chat"
+msgstr "Keisti pokalbių kambarį"
+
+msgid "Please Update the necessary fields."
+msgstr "Pataisykite būtinus laukus."
+
+msgid "Edit"
+msgstr "Keisti"
+
+#  Use Environmental Settings


+msgid "Edit Settings"
+msgstr "Keisti nuostatas"
+
+msgid "Information"
+msgstr "Informacija"
+
+msgid "Retrieving..."
+msgstr "Išrenkama..."
+
+msgid "Get Info"
+msgstr "Gauti informaciją"
+
+msgid "Add Buddy Pounce"
+msgstr "Sukurti reakciją į bičiulį"
+
+#  Send File button


+msgid "Send File"
+msgstr "Siųsti failą"
+
+#  Block button


+msgid "Blocked"
+msgstr "Blokuotas"
+
+msgid "Show when offline"
+msgstr "Rodyti, kai neprisijungęs"
+
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Įveskite naują „%s“ vardą"
+
+msgid "Rename"
+msgstr "Pervadinti"
+
+msgid "Set Alias"
+msgstr "Nustatyti alternatyvųjį vardą"
+
+msgid "Enter empty string to reset the name."
+msgstr "Įveskite tuščią eilutę, jei norite atstatyti vardą."
+
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "Šio kontakto pašalinimas taip pat pašalins ir visus bičiulius jame"
+
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Šios grupės pašalinimas taip pat pašalins ir visus bičiulius joje"
+
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Ar tikrai norite pašalinti %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+msgid "Confirm Remove"
+msgstr "Patvirtinkite pašalinimą"
+
+msgid "Remove"
+msgstr "Pašalinti"
+
+#. Buddy List
+msgid "Buddy List"
+msgstr "Bičiulių sąrašas"
+
+msgid "Place tagged"
+msgstr "Vieta pažymėta"
+
+msgid "Toggle Tag"
+msgstr "Perjungti žymę"
+
+msgid "View Log"
+msgstr "Žiūrėti žurnalą"
+
+#. General
+msgid "Nickname"
+msgstr "Vardas"
+
+#. Never know what those translations might end up like...
+#. Idle stuff
+msgid "Idle"
+msgstr "Neveiklus"
+
+msgid "On Mobile"
+msgstr "Pasiekiamas mobiliuoju telefonu"
+
+msgid "New..."
+msgstr "Nauja..."
+
+msgid "Saved..."
+msgstr "Įrašyta..."
+
+msgid "Plugins"
+msgstr "Papildiniai"
+
+#  Block button


+msgid "Block/Unblock"
+msgstr "Blokuoti/nebeblokuoti"
+
+#  Block button


+msgid "Block"
+msgstr "Blokuoti"
+
+#  Block button


+msgid "Unblock"
+msgstr "Nebeblokuoti"
+
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+"Įveskite vardą arba alternatyvųjį vardą asmens, kurį norite užblokuoti arba "
+"nebeblokuoti."
+
+#. Not multiline
+#. Not masked?
+#. No hints?
+msgid "OK"
+msgstr "Gerai"
+
+msgid "New Instant Message"
+msgstr "Nauja greitoji žinutė"
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+"Įveskite vardą arba alternatyvųjį vardą asmens, su kuriuo norite bendrauti."
+
+msgid "Channel"
+msgstr "Kanalas"
+
+msgid "Join a Chat"
+msgstr "Prisijungti prie pokalbio"
+
+msgid "Please enter the name of the chat you want to join."
+msgstr "Prašome įvesti vardą pokalbių kambario, prie kurio norite prisijungti."
+
+#  join button


+msgid "Join"
+msgstr "Prisijungti"
+
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+"Įveskite vardą arba alternatyvųjį vardą asmens, kurio pokalbių žurnalą "
+"norite peržiūrėti."
+
+#  Options


+#. Create the "Options" frame.
+msgid "Options"
+msgstr "Parinktys"
+
+msgid "Send IM..."
+msgstr "Rašyti žinutę..."
+
+#  Block button


+msgid "Block/Unblock..."
+msgstr "Blokuoti/nebeblokuoti..."
+
+msgid "Join Chat..."
+msgstr "Prisijungti prie pokalbio..."
+
+msgid "View Log..."
+msgstr "Žiūrėti žurnalą..."
+
+msgid "View All Logs"
+msgstr "Žiūrėti visus žurnalus"
+
+msgid "Show"
+msgstr "Rodyti"
+
+msgid "Empty groups"
+msgstr "tuščias grupes"
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+msgid "Offline buddies"
+msgstr "neprisijungusius bičiulius"
+
+msgid "Sort"
+msgstr "Rikiuoti"
+
+msgid "By Status"
+msgstr "pagal statusą"
+
+msgid "Alphabetically"
+msgstr "pagal abėcėlę"
+
+msgid "By Log Size"
+msgstr "pagal žurnalo dydį"
+
+msgid "Buddy"
+msgstr "bičiulį"
+
+msgid "Chat"
+msgstr "Pokalbis"
+
+msgid "Grouping"
+msgstr "Grupavimas"
+
+msgid "Certificate Import"
+msgstr "Liudijimo importavimas"
+
+msgid "Specify a hostname"
+msgstr "Įveskite mazgo vardą"
+
+msgid "Type the host name this certificate is for."
+msgstr "Įveskite mazgo, kuriam skirtas šis liudijimas, vardą"
+
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"Nepavyko importuoti failo %s.\n"
+"Įsitikinte, kad failą galima perskaityti ir jis yra PEM formato.\n"
+
+msgid "Certificate Import Error"
+msgstr "Liudijimo importavimo klaida"
+
+msgid "X.509 certificate import failed"
+msgstr "Nepavyko importuoti X.509 liudijimo "
+
+msgid "Select a PEM certificate"
+msgstr "Pasirinkite PEM liudijimą"
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"Nepavyko eksportavimas į failą %s.\n"
+"Patikrinkite, ar turite rašymo prieigos teisę šiuo keliu\n"
+
+msgid "Certificate Export Error"
+msgstr "Liudijimo eksporto klaida"
+
+msgid "X.509 certificate export failed"
+msgstr "Nepavyko eksportuoti X.509 liudijimo"
+
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509 liudijimo eksportas"
+
+#, c-format
+msgid "Certificate for %s"
+msgstr "Liudijimas, skirtas %s"
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"Įprastas vardas: %s\n"
+"\n"
+"SHA1 kontrolinis kodas:\n"
+"%s"
+
+msgid "SSL Host Certificate"
+msgstr "SSL mazgo liudijimas"
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "Ar tikrai pašalinti %s liudijimą?"
+
+msgid "Confirm certificate delete"
+msgstr "Patvirtinkite liudijimo pašalinimą"
+
+msgid "Certificate Manager"
+msgstr "Liudijimų tvarkytuvė"
+
+#. Creating the user splits
+msgid "Hostname"
+msgstr "Mazgo vardas"
+
+#  Info button


+msgid "Info"
+msgstr "Informacija"
+
+#. Close button
+msgid "Close"
+msgstr "Užverti"
+
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#, c-format
+msgid "%s disconnected."
+msgstr "%s atsijungė."
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"Finch nebebandys prisijungti su šia paskyra, kol nepataisysite klaidos ir "
+"paskyros neaktyvuosite iš naujo."
+
+msgid "Re-enable Account"
+msgstr "Iš naujo aktyvuoti paskyrą"
+
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"Paskyra atsijungė, todėl jūs nebedalyvaujate šiame pokalbyje.  Kai bus "
+"prisijungta su šia paskyra iš naujo, jūs automatiškai grįšite į šį pokalbį."
+
+msgid "No such command."
+msgstr "Tokios komandos nėra."
+
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+"Sintaksės klaida: Jūs įvedėte neteisingą argumentų skaičių tai komandai."
+
+msgid "Your command failed for an unknown reason."
+msgstr "Jūsų komanda nepavyko dėl nežinomos priežasties."
+
+msgid "That command only works in chats, not IMs."
+msgstr ""
+"Ta komanda veikia tik pokalbių kambariuose, o ne asmeniniuose pokalbiuose."
+
+msgid "That command only works in IMs, not chats."
+msgstr ""
+"Ta komanda veikia tik asmeniniuose pokalbiuose, o ne pokalbių kambariuose."
+
+msgid "That command doesn't work on this protocol."
+msgstr "Ta komanda neveikia šiame protokole."
+
+msgid "Message was not sent, because you are not signed on."
+msgstr "Žinutė neišsiųsta, nes nesate prisijungęs."
+
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s rašo..."
+
+msgid "You have left this chat."
+msgstr "Jūs palikote šį pokalbį."
+
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Žurnalų vedimas įjungtas. Būsimos šio pokalbio žinutės bus įvestos į žurnalą."
+
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Žurnalų vedimas išjungtas. Būsimos šio pokalbio žinutės nebus įvestos į "
+"žurnalą."
+
+#  Build the Send As menu


+msgid "Send To"
+msgstr "Siųsti kam"
+
+msgid "Conversation"
+msgstr "Pokalbis"
+
+msgid "Clear Scrollback"
+msgstr "Išvalyti langą"
+
+msgid "Show Timestamps"
+msgstr "Rodyti laiko žymas"
+
+msgid "Add Buddy Pounce..."
+msgstr "Sukurti reakciją į bičiulį..."
+
+#  Invite


+msgid "Invite..."
+msgstr "Pakviesti..."
+
+msgid "Enable Logging"
+msgstr "Įjungti žurnalų vedimą"
+
+msgid "Enable Sounds"
+msgstr "Įjungti garsus"
+
+msgid "<AUTO-REPLY> "
+msgstr "<AUTOMATINIS-ATSAKYMAS> "
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Sąrašas su %d vartotoju:\n"
+msgstr[1] "Sąrašas su %d vartotojais:\n"
+msgstr[2] "Sąrašas su %d vartotojų:\n"
+
+msgid "Supported debug options are:  version"
+msgstr "Palaikomi derinimo parametrai yra:  version"
+
+msgid "No such command (in this context)."
+msgstr "Šiame kontekste tokios komandos nėra."
+
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Naudokite \"/help &lt;komanda&gt;\" pagalbai apie konkrečią komandą.\n"
+"Tolimesnės komandos yra prieinamos šiame kontekste:\n"
+
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"„%s“ nėra teisingas žinutės tipas.  Teisingus tipus galite pažiūrėti „/help "
+"msgcolor“."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+"„%s“ nėra teisinga spalva.  Teisingas spalvas galite pažiūrėti „/help "
+"msgcolor“."
+
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;žinutė&gt;:  nusiųsti žinutę įprastai, kaip ir nenaudojant šios "
+"komandos."
+
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+"me &lt;veiksmas&gt;:  nusiųsti IRC stiliaus veiksmą bičiuliui ar pokalbių "
+"kambariui."
+
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;parametras&gt;:  nusiųsti įvairią derinimo informaciją į šį "
+"pokalbį."
+
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: išvalo pokalbių žinučių langą."
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;komanda&gt;:  suteikia pagalbą apie konkrečią komanda."
+
+msgid "users:  Show the list of users in the chat."
+msgstr "users: parodo pokalbio dalyvių sąrašą."
+
+msgid "plugins: Show the plugins window."
+msgstr "plugins: parodo papildinių langą."
+
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: parodo bičiulių sąrašą."
+
+msgid "accounts: Show the accounts window."
+msgstr "accounts: parodo paskyrų langą."
+
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: parodo derinimo langą."
+
+msgid "prefs: Show the preference window."
+msgstr "prefs: parodo nuostatų langą."
+
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: parodo išsaugotų būsenų langą."
+
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;tipas&gt; &lt;tekstospalva&gt; &lt;fonospalva&gt;:  nustatyti "
+"spalvas įvairiems žinučių tipams pokalbių lange.<br>\n"
+"&lt;tipas&gt;: receive, send, highlight, action, timestamp<br>\n"
+"&lt;tekstospalva/fonospalva&gt;: black, red, green, blue, white, gray, "
+"darkgray, magenta, cyan, default<br>\n"
+"<br>\n"
+"PAVYZDYS:<br>\n"
+"msgcolor send cyan default"
+
+msgid "Unable to open file."
+msgstr "Negalima atidaryti failo."
+
+msgid "Debug Window"
+msgstr "Derinimo langas"
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+msgid "Clear"
+msgstr "Išvalyti"
+
+msgid "Filter:"
+msgstr "Filtras: "
+
+msgid "Pause"
+msgstr "Pristabdyti"
+
+#, c-format
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Failų perdavimai – %d%% iš %d failo"
+msgstr[1] "Failų perdavimai – %d%% iš %d failų"
+msgstr[2] "Failų perdavimai – %d%% iš %d failų"
+
+#. Create the window.
+msgid "File Transfers"
+msgstr "Failų perdavimai"
+
+msgid "Progress"
+msgstr "Eiga"
+
+msgid "Filename"
+msgstr "Failo pavadinimas"
+
+msgid "Size"
+msgstr "Dydis"
+
+msgid "Speed"
+msgstr "Greitis"
+
+msgid "Remaining"
+msgstr "Liko"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+msgid "Status"
+msgstr "Būsena"
+
+msgid "Close this window when all transfers finish"
+msgstr "Uždaryti ši langą pasibaigus visiems failų perdavimams"
+
+msgid "Clear finished transfers"
+msgstr "Pašalinti pabaigtus perdavimus"
+
+msgid "Stop"
+msgstr "Sustabdyti"
+
+msgid "Waiting for transfer to begin"
+msgstr "Laukiama perdavimo pradžios"
+
+msgid "Canceled"
+msgstr "Atšaukta"
+
+msgid "Failed"
+msgstr "Nepavyko"
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KB/s"
+
+msgid "Sent"
+msgstr "Išsiųstas"
+
+msgid "Received"
+msgstr "Gautas"
+
+msgid "Finished"
+msgstr "Baigta"
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Failas įrašytas vardu %s."
+
+#  Build the Send As menu


+msgid "Sending"
+msgstr "Siunčiama"
+
+msgid "Receiving"
+msgstr "Gaunama"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "Pokalbiai kambaryje %s, %s"
+
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "Pokalbiai su %s, %s"
+
+msgid "%B %Y"
+msgstr "%Y %B"
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"Sisteminiai įvykiai įrašomi į žurnalą, jei įjungta nuostata „Rašyti visus "
+"būsenos pasikeitimus į sistemos žurnalą“."
+
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Skubiosios žinutės įrašomos į žurnalą, jei įjungta nuostata „Rašyti visas "
+"skubiąsias žinutes į žurnalą“."
+
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Pokalbiai kambariuose įrašomi į žurnalą, jei įjungta nuostata „Rašyti visus "
+"pokalbius kambariuoe į žurnalą“.\""
+
+msgid "No logs were found"
+msgstr "Žurnalų nerasta"
+
+msgid "Total log size:"
+msgstr "Viso žurnalo dydis:"
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr "Slinkti/ieškoti: "
+
+#, c-format
+msgid "Conversations in %s"
+msgstr "Pokalbiai kambaryje %s"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "Pokalbiai su %s"
+
+msgid "All Conversations"
+msgstr "Visi pokalbiai"
+
+#  Window **********


+msgid "System Log"
+msgstr "Sistemos žurnalas"
+
+msgid "Calling ... "
+msgstr "Skambinama ..."
+
+msgid "Hangup"
+msgstr "Padėti ragelį"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Priimti"
+
+msgid "Reject"
+msgstr "Atmesti"
+
+msgid "Call in progress."
+msgstr "Vyksta skambutis."
+
+msgid "The call has been terminated."
+msgstr "Skambutis buvo baigtas."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s nori pradėti garsinį pokalbį su jumis."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s nori pradėti nepalaikomo terpės tipo pokalbį su jumis."
+
+msgid "You have rejected the call."
+msgstr "Jūs atmetėte skambutį."
+
+msgid "call: Make an audio call."
+msgstr "skambinti: paskambinti garsiniam pokalbiui."
+
+msgid "Emails"
+msgstr "El. laiškai"
+
+msgid "You have mail!"
+msgstr "Jūs turite pašto!"
+
+msgid "Sender"
+msgstr "Siuntėjas"
+
+msgid "Subject"
+msgstr "Tema"
+
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] "%s (%s) turi %d naują pranešimą."
+msgstr[1] "%s (%s) turi %d naujus pranešimus."
+msgstr[2] "%s (%s) turi %d naujų pranešimų."
+
+msgid "New Mail"
+msgstr "Naujas paštas"
+
+#, c-format
+msgid "Info for %s"
+msgstr "Informacija apie %s"
+
+msgid "Buddy Information"
+msgstr "Informacija apie bičiulį"
+
+msgid "Continue"
+msgstr "Tęsti"
+
+msgid "IM"
+msgstr "Kalbėtis"
+
+#  Invite


+msgid "Invite"
+msgstr "Pakviesti"
+
+msgid "(none)"
+msgstr "(nieko)"
+
+msgid "URI"
+msgstr "URI"
+
+msgid "ERROR"
+msgstr "KLAIDA"
+
+msgid "loading plugin failed"
+msgstr "nepavyko įkelti papildinio"
+
+msgid "unloading plugin failed"
+msgstr "nepavyko iškelti papildinio"
+
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+"Pavadinimas: %s\n"
+"Versija: %s\n"
+"Aprašymas: %s\n"
+"Autorius: %s\n"
+"Svetainė: %s\n"
+"Failo vardas: %s\n"
+
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "Prieš konfigūruojant papildinį, jį reikia įkelti."
+
+msgid "No configuration options for this plugin."
+msgstr "Šis papildinys neturi konfigūruojamų parinkčių."
+
+msgid "Error loading plugin"
+msgstr "Papildinio įkėlimo klaida"
+
+msgid "The selected file is not a valid plugin."
+msgstr "Pasirinktasis failas nėra tikras papildinys."
+
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Prašau atidaryti derinimo langą ir pabandyti vėl, kad pamatytumėte tikslų "
+"klaidos pranešimą."
+
+msgid "Select plugin to install"
+msgstr "Pasirinkite papildinį įdiegimui"
+
+msgid "You can (un)load plugins from the following list."
+msgstr "Jūs galite įkelti ar iškelti papildinius iš šio sąrašo."
+
+msgid "Install Plugin..."
+msgstr "Įdiegti papildinį..."
+
+msgid "Configure Plugin"
+msgstr "Konfigūruoti papildinį"
+
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+msgid "Preferences"
+msgstr "Nuostatos"
+
+msgid "Please enter a buddy to pounce."
+msgstr "Įveskite bičiulį, į kurį reaguoti"
+
+#  "New Buddy Pounce"


+msgid "New Buddy Pounce"
+msgstr "Nauja reakcija į bičiulį"
+
+msgid "Edit Buddy Pounce"
+msgstr "Redaguoti reakciją į bičiulį"
+
+#  Create the "Pounce Who" frame.


+msgid "Pounce Who"
+msgstr "Į kokį bičiulį reaguoti"
+
+#  Set up stuff for the account box


+#. Account:
+msgid "Account:"
+msgstr "Paskyra:"
+
+msgid "Buddy name:"
+msgstr "Bičiulio vardas:"
+
+#  Create the "Pounce When" frame.


+#. Create the "Pounce When Buddy..." frame.
+msgid "Pounce When Buddy..."
+msgstr "Reaguoti, kai bičiulis..."
+
+msgid "Signs on"
+msgstr "prisijungia"
+
+msgid "Signs off"
+msgstr "atsijungia"
+
+msgid "Goes away"
+msgstr "pasitraukia"
+
+msgid "Returns from away"
+msgstr "sugrįžta"
+
+msgid "Becomes idle"
+msgstr "tampa neveiklus"
+
+msgid "Is no longer idle"
+msgstr "tampa veiklus"
+
+msgid "Starts typing"
+msgstr "pradeda rašyti"
+
+msgid "Pauses while typing"
+msgstr "trumpam nustoja rašyti"
+
+msgid "Stops typing"
+msgstr "nustoja rašyti"
+
+msgid "Sends a message"
+msgstr "išsiunčia žinutę"
+
+#. Create the "Action" frame.
+msgid "Action"
+msgstr "Veiksmas"
+
+msgid "Open an IM window"
+msgstr "Atidaryti pokalbių langą"
+
+msgid "Pop up a notification"
+msgstr "Parodyti pranešimo langą"
+
+msgid "Send a message"
+msgstr "Nusiųsti žinutę"
+
+msgid "Execute a command"
+msgstr "Įvykdyti komandą"
+
+msgid "Play a sound"
+msgstr "Groti garsą"
+
+msgid "Pounce only when my status is not Available"
+msgstr "Reaguoti tik tada, kai esu neprieinamoje būsenoje"
+
+msgid "Recurring"
+msgstr "Pasikartojanti reakcija"
+
+msgid "Cannot create pounce"
+msgstr "Negalima sukurti reakcijos"
+
+msgid "You do not have any accounts."
+msgstr "Neturite jokių paskyrų."
+
+msgid "You must create an account first before you can create a pounce."
+msgstr "Prieš kurdamas reakciją privalote pirma sukurti paskyrą."
+
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Ar tikrai norite pašalinti reakciją į %s nuo %s?"
+
+#  "New Buddy Pounce"


+msgid "Buddy Pounces"
+msgstr "Reakcijos į bičiulius"
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s pradėjo Jums rašyti (%s)"
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "Pradėjęs Jums rašyti %s sustojo (%s)"
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s prisijungė (%s)"
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s tapo veiklus (%s)"
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s sugrįžo (%s)"
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s nustojo Jums rašyti (%s)"
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s atsijungė (%s)"
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s tapo neveiklus (%s)"
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s pasitraukė. (%s)"
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s atsiuntė Jums žinutę. (%s)"
+
+msgid "Unknown pounce event. Please report this!"
+msgstr "Nežinomas reakcijos veiksmas. Prašome apie tai pranešti!"
+
+msgid "Based on keyboard use"
+msgstr "pagal klaviatūros naudojimą"
+
+msgid "From last sent message"
+msgstr "nuo paskutinės išsiųstos žinutės"
+
+msgid "Never"
+msgstr "niekada"
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+msgid "Show Idle Time"
+msgstr "Rodyti neveiklumo laikus"
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+msgid "Show Offline Buddies"
+msgstr "Rodyti neprisijungusius bičiulius"
+
+msgid "Notify buddies when you are typing"
+msgstr "Informuoti bičiulius, kai jiems rašote"
+
+msgid "Log format"
+msgstr "Žurnalo formatas"
+
+msgid "Log IMs"
+msgstr "Į žurnalą rašyti asmeninius pokalbius"
+
+msgid "Log chats"
+msgstr "Į žurnalą rašyti pokalbius kambariuose"
+
+msgid "Log status change events"
+msgstr "Į žurnalą rašyti būsenos pasikeitimus"
+
+msgid "Report Idle time"
+msgstr "Rodyti neveiklumo laiką"
+
+msgid "Change status when idle"
+msgstr "Pakeisti būseną tapus neveikliu"
+
+msgid "Minutes before changing status"
+msgstr "Kiek minučių turi praeiti iki būsenos pakeitimo"
+
+msgid "Change status to"
+msgstr "Pakeisti būseną į"
+
+msgid "Conversations"
+msgstr "Pokalbiai"
+
+msgid "Logging"
+msgstr "Žurnalų vedimas"
+
+msgid "You must fill all the required fields."
+msgstr "Turite užpildyti visus privalomus laukus."
+
+msgid "The required fields are underlined."
+msgstr "Privalomi laukai yra pabraukti."
+
+msgid "Not implemented yet."
+msgstr "Funkcija dar nerealizuota."
+
+msgid "Save File..."
+msgstr "Įrašyti failą..."
+
+msgid "Open File..."
+msgstr "Atverti failą..."
+
+msgid "Choose Location..."
+msgstr "Parinkite kelią..."
+
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr ""
+"Paspauskite įvedimo klavišą, kad rastumėte daugiau šios kategorijos kambarių."
+
+msgid "Get"
+msgstr "Gauti"
+
+#. Create the window.
+msgid "Room List"
+msgstr "Kambarių sąrašas"
+
+msgid "Buddy logs in"
+msgstr "Bičiulis prisijungia"
+
+msgid "Buddy logs out"
+msgstr "Bičiulis atsijungia"
+
+msgid "Message received"
+msgstr "Gauta žinutė"
+
+msgid "Message received begins conversation"
+msgstr "Gauta žinutė, pradedanti pokalbį"
+
+msgid "Message sent"
+msgstr "Išsiųsta žinutė"
+
+msgid "Person enters chat"
+msgstr "Asmuo ateina į pokalbių kambarį"
+
+msgid "Person leaves chat"
+msgstr "Asmuo palieka pokalbių kambarį"
+
+msgid "You talk in chat"
+msgstr "Jūs kalbate pokalbių kambaryje"
+
+msgid "Others talk in chat"
+msgstr "Kiti kalba pokalbių kambaryje"
+
+msgid "Someone says your username in chat"
+msgstr "Kas nors pokalbyje pasako Jūsų vardą"
+
+msgid "GStreamer Failure"
+msgstr "GStreamer klaida"
+
+msgid "GStreamer failed to initialize."
+msgstr "Nepavyko paleisti GStreamer."
+
+msgid "(default)"
+msgstr "(numatytasis)"
+
+msgid "Select Sound File ..."
+msgstr "Pasirinkite garso failą..."
+
+msgid "Sound Preferences"
+msgstr "Garsų nuostatos"
+
+msgid "Profiles"
+msgstr "Profiliai"
+
+msgid "Automatic"
+msgstr "automatinis"
+
+msgid "Console Beep"
+msgstr "pyptelėjimai"
+
+msgid "Command"
+msgstr "komanda"
+
+msgid "No Sound"
+msgstr "be garsų"
+
+msgid "Sound Method"
+msgstr "Garso grojimo būdas:"
+
+msgid "Method: "
+msgstr "Būdas:"
+
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Garso komanda:\n"
+"(%s reiškia failo vardą)"
+
+#. Sound options
+msgid "Sound Options"
+msgstr "Garso parinktys"
+
+msgid "Sounds when conversation has focus"
+msgstr "Groti garsus, kai pokalbio langas yra veikiamasis"
+
+msgid "Always"
+msgstr "visada"
+
+msgid "Only when available"
+msgstr "tik kai esu pasiekiamas"
+
+msgid "Only when not available"
+msgstr "tik kai esu nepasiekiamas"
+
+msgid "Volume(0-100):"
+msgstr "Garsumas (0--100):"
+
+#. Sound events
+msgid "Sound Events"
+msgstr "Garsai ir veiksmai"
+
+msgid "Event"
+msgstr "Įvykis"
+
+msgid "File"
+msgstr "Failas"
+
+msgid "Test"
+msgstr "Testuoti"
+
+msgid "Reset"
+msgstr "Atstatyti"
+
+msgid "Choose..."
+msgstr "Pasirinkti..."
+
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "Ar Jūs tikrai norite šalinti „%s“?"
+
+msgid "Delete Status"
+msgstr "Pašalinti būseną"
+
+msgid "Saved Statuses"
+msgstr "Išsaugotos būsenos"
+
+msgid "Title"
+msgstr "Pavadinimas"
+
+msgid "Type"
+msgstr "Rūšis"
+
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. saveable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+msgid "Message"
+msgstr "Žinutė"
+
+#. Use
+msgid "Use"
+msgstr "Naudoti"
+
+msgid "Invalid title"
+msgstr "Neteisingas pavadinimas"
+
+msgid "Please enter a non-empty title for the status."
+msgstr "Įveskite netuščią būsenos pavadinimą."
+
+msgid "Duplicate title"
+msgstr "Pasikartojantis pavadinimas"
+
+msgid "Please enter a different title for the status."
+msgstr "Prašome įvesti skirtingą pavadinimą šiai būsenai."
+
+msgid "Substatus"
+msgstr "Smulkesnė būsena"
+
+msgid "Status:"
+msgstr "Būsena:"
+
+msgid "Message:"
+msgstr "Žinutė:"
+
+msgid "Edit Status"
+msgstr "Redaguoti būseną"
+
+msgid "Use different status for following accounts"
+msgstr "Šioms paskyroms naudoti kitą būseną"
+
+#. Save & Use
+msgid "Save & Use"
+msgstr "Išsaugoti ir naudoti"
+
+msgid "Certificates"
+msgstr "Liudijimai"
+
+msgid "Sounds"
+msgstr "Garsai"
+
+msgid "Statuses"
+msgstr "Būsenos"
+
+msgid "Error loading the plugin."
+msgstr "Papildinio įkėlimo klaida."
+
+msgid "Couldn't find X display"
+msgstr "Nepavyko surasti X ekrano"
+
+msgid "Couldn't find window"
+msgstr "Nepavyko surasti lango"
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+"Nepavyko įkelti šio papildinio, nes jis sukonstruotas be X11 palaikymo."
+
+msgid "GntClipboard"
+msgstr "„Gnt“ iškarpinė"
+
+msgid "Clipboard plugin"
+msgstr "Iškarpinės papildinys"
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr "Kai „Gnt“ iškarpinės turinys pasikeičia, jis perduodamas X iškarpinei"
+
+#, c-format
+msgid "%s just signed on"
+msgstr "%s ką tik prisijungė"
+
+#, c-format
+msgid "%s just signed off"
+msgstr "%s atsijungė"
+
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s atsiuntė žinutę"
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s pasakė Jūsų vardą pokalbyje %s"
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s parašė žinutę pokalbyje %s"
+
+msgid "Buddy signs on/off"
+msgstr "Bičiulis pradeda arba baigia seansą"
+
+msgid "You receive an IM"
+msgstr "Gaunate žinutę"
+
+msgid "Someone speaks in a chat"
+msgstr "Kas nors parašo į pokalbį"
+
+msgid "Someone says your name in a chat"
+msgstr "Kas nors pokalbyje pasako Jūsų vardą"
+
+msgid "Notify with a toaster when"
+msgstr "Informuoti iššokančiu langeliu, kai:"
+
+msgid "Beep too!"
+msgstr "Taip pat ir pyptelėti!"
+
+msgid "Set URGENT for the terminal window."
+msgstr "Nustatyti „URGENT“ požymį terminalo langui."
+
+msgid "GntGf"
+msgstr "GntGf"
+
+msgid "Toaster plugin"
+msgstr "Iššokančių langelių papildinys"
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>Pokalbis su %s, įvykęs %s:</b><br>"
+
+msgid "History Plugin Requires Logging"
+msgstr "Istorijos papildinys reikalauja žurnalų vedimo"
+
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+"Žurnalų vedimas gali būti įjungtas iš meniu pasirinkus Įrankiai -> Nuostatos "
+"-> Žurnalų vedimas.\n"
+"\n"
+"Žurnalų vedimo įjungimas greitosioms žinutėms ar pokalbiams kambariuose "
+"aktyvuos ir jų istoriją."
+
+msgid "GntHistory"
+msgstr "GntHistory"
+
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Parodo neseniai įrašytus pokalbius naujuose pokalbiuose."
+
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Kai pradedamas naujas pokalbis, šis papildinys įterps paskutinio pokalbio "
+"tekstą su tuo pačiu pašnekovu į pokalbių langą."
+
+msgid "Online"
+msgstr "Prisijungęs"
+
+msgid "Offline"
+msgstr "Atsijungęs"
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+msgid "Online Buddies"
+msgstr "Prisijungusių bičiulių"
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+msgid "Offline Buddies"
+msgstr "Neprisijungusių bičiulių"
+
+msgid "Online/Offline"
+msgstr "Prisijungęs/neprisijungęs"
+
+msgid "Meebo"
+msgstr "Meebo"
+
+msgid "No Grouping"
+msgstr "Be grupavimo"
+
+msgid "Nested Subgroup"
+msgstr "Įdėtas pogrupis"
+
+msgid "Nested Grouping (experimental)"
+msgstr "Įdėtinis grupavimas (eksperimentinis)"
+
+msgid "Provides alternate buddylist grouping options."
+msgstr "Siūlo papildomus bičiulių sąrašo grupavimo būdus."
+
+msgid "Lastlog"
+msgstr "Lastlog"
+
+#. Translator Note: The "backlog" is the conversation buffer/history.
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr "lastlog: ieško eilutės žurnaluose."
+
+msgid "GntLastlog"
+msgstr "GntLastLog"
+
+msgid "Lastlog plugin."
+msgstr "„Lastlog“ papildinys."
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Gaunamas „TinyURL“..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+"Kurti „TinyURL“ tik URL adresams, esantiems bent tokio ilgio arba ilgesniems."
+
+msgid "TinyURL (or other) address prefix"
+msgstr "„TinyURL“ (ar kitos tarnybos) adreso prefiksas"
+
+msgid "TinyURL"
+msgstr "„TinyURL“"
+
+msgid "TinyURL plugin"
+msgstr "„TinyURL“ papildinys"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "„TinyURL“ paslauga lengvesniam URL adresų kopijavimui iš gautų žinučių"
+
+msgid "accounts"
+msgstr "paskyros"
+
+msgid "Password is required to sign on."
+msgstr "Prisijungimui būtinas slaptažoidis."
+
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Įveskite %s (%s) slaptažodį"
+
+msgid "Enter Password"
+msgstr "Įveskite slaptažodį"
+
+msgid "Save password"
+msgstr "Išsaugoti slaptažodį"
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Trūksta %s protokolo papildinio"
+
+msgid "Connection Error"
+msgstr "Sujungimo klaida"
+
+msgid "New passwords do not match."
+msgstr "Nauji slaptažodžiai nesutampa."
+
+msgid "Fill out all fields completely."
+msgstr "Pilnai užpildykite visus laukus."
+
+msgid "Original password"
+msgstr "Pradinis slaptažodis"
+
+msgid "New password"
+msgstr "Naujas slaptažodis"
+
+msgid "New password (again)"
+msgstr "Naujas slaptažodis (vėl)"
+
+#, c-format
+msgid "Change password for %s"
+msgstr "Keisti %s slaptažodį"
+
+msgid "Please enter your current password and your new password."
+msgstr "Prašome įvesti Jūsų pradinį slaptažodį ir Jūsų naują slaptažodį."
+
+#, c-format
+msgid "Change user information for %s"
+msgstr "Pakeisti vartotojo %s informaciją"
+
+msgid "Set User Info"
+msgstr "Nustatyti vartotojo informaciją"
+
+msgid "Unknown"
+msgstr "Nežinoma"
+
+msgid "Buddies"
+msgstr "Bičiuliai"
+
+msgid "buddy list"
+msgstr "bičiulių sąrašas"
+
+msgid "(DOES NOT MATCH)"
+msgstr "(NESUTAMPA)"
+
+#. Make messages
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s pateikė šį liudijimą vienkartiniam naudojimui:"
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"Įprastas vardas: %s %s\n"
+"SHA1 liudijimo kodas: %s"
+
+#. TODO: Find what the handle ought to be
+msgid "Single-use Certificate Verification"
+msgstr "Vienkartinio liudijimo patikra"
+
+#. Scheme name
+#. Pool name
+msgid "Certificate Authorities"
+msgstr "Liudijimų įstaigos"
+
+#. Scheme name
+#. Pool name
+msgid "SSL Peers Cache"
+msgstr "SSL partnerių podėlis"
+
+#. Make messages
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "Ar priimti liudijimą iš %s?"
+
+#. TODO: Find what the handle ought to be
+msgid "SSL Certificate Verification"
+msgstr "SSL liudijimo patikra"
+
+msgid "_View Certificate..."
+msgstr "_Rodyti liudijimą..."
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Liudijimas, kurį pateikė „%s“, yra paties pasirašytas.  Jis negali būti "
+"automatiškai patikrintas."
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "Liudijimų grandinė, pateikta %s, yra neteisinga."
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL liudijimo klaida"
+
+msgid "Invalid certificate chain"
+msgstr "Neteisinga liudijimų grandinė"
+
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Neturite pagrindinių liudijimų duomenų bazės, todėl šis liudijimas negali "
+"būti patikrintas."
+
+#. vrq will be completed by user_auth
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Šis liudijimas nurodo jį išleidusį pagrindinį liudijimą, kurio Pidgin nežino."
+
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"Liudijimų grandinė, kurią pateikė %s, neturi galiojančio skaitmeninio parašo "
+"iš liudijimų įstaigos, iš kurios ji teigia gavusi parašą."
+
+msgid "Invalid certificate authority signature"
+msgstr "Neteisingas liudijimų įstaigos parašas"
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Liudijimas, pateiktas „%s“, tvirtina, kad iš tikrųjų priklauso „%s“.  Galbūt "
+"jūs jungiatės ne prie tos paslaugos, prie kurios manote, kad jungiatės."
+
+#. Make messages
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+"Įprastas vardas: %s\n"
+"\n"
+"SHA1 kontrolinis kodas: %s\n"
+"\n"
+"Galiojimo pradžia: %s\n"
+"Galiojimo pabaiga: %s\n"
+
+#. TODO: Find what the handle ought to be
+msgid "Certificate Information"
+msgstr "Liudijimo informacija"
+
+msgid "Registration Error"
+msgstr "Registravimo klaida"
+
+msgid "Unregistration Error"
+msgstr "Išregistravimo klaida"
+
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s prisijungė"
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s atsijungė"
+
+#. Unknown error
+msgid "Unknown error"
+msgstr "Nežinoma klaida"
+
+msgid "Unable to send message: The message is too large."
+msgstr "Negalima išsiųsti žinutės: ji per ilga."
+
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "Negalima išsiųsti žinutės vartotojui %s."
+
+msgid "The message is too large."
+msgstr "Žinutė per ilga."
+
+msgid "Unable to send message."
+msgstr "Negalima išsiųsti žinutės."
+
+msgid "Send Message"
+msgstr "Nusiųsti žinutę"
+
+msgid "_Send Message"
+msgstr "Nu_siųsti žinutę"
+
+#, c-format
+msgid "%s entered the room."
+msgstr "%s atėjo į kambarį."
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] atėjo į kambarį."
+
+#, c-format
+msgid "You are now known as %s"
+msgstr "Dabar esate žinomas kaip %s"
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s dabar yra žinomas kaip %s"
+
+#, c-format
+msgid "%s left the room."
+msgstr "%s paliko kambarį."
+
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s paliko kambarį (%s)."
+
+msgid "Invite to chat"
+msgstr "Pakviesti į pokalbį"
+
+#  Put our happy label in it.


+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Prašom įvesti vartotojo, kurį norite pakviesti, vardą, kartu su neprivaloma "
+"pakvietimo žinute."
+
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "Nepavyko gauti jungties: %s"
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "Nepavyko gauti vardo: %s"
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "Nepavyko gauti serverio pavadinimo: %s"
+
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "Purple D-BUS serveris nėra paleistas dėl žemiau pateiktos priežasties"
+
+msgid "No name"
+msgstr "Be vardo"
+
+msgid "Unable to create new resolver process\n"
+msgstr "Negalima sukurti naujo DNS adresų keitiklio proceso\n"
+
+msgid "Unable to send request to resolver process\n"
+msgstr "Nepavyko išsiųsti užklausos DNS adresų keitiklio procesui\n"
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"Klaida verčiant DNS adresą %s:\n"
+"%s"
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "Klaida keičiant DNS adresą %s: %d"
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"Skaitymo iš DNS adresų keitiklio proceso klaida:\n"
+"%s"
+
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr "Adresų keitiklio procesas baigė darbą neatsakęs į mūsų užklausą"
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "Nepavyko sukurti gijos: %s"
+
+msgid "Unknown reason"
+msgstr "Nežinoma priežastis"
+
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"%s skaitymo klaida:\n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"%s rašymo klaida:\n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"%s prieigos klaida:\n"
+"%s.\n"
+
+msgid "Directory is not writable."
+msgstr "Į katalogą negalima rašyti."
+
+msgid "Cannot send a file of 0 bytes."
+msgstr "Negalima siųsti 0 baitų dydžio failo."
+
+msgid "Cannot send a directory."
+msgstr "Negalima siųsti katalogo."
+
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s nėra paprastas failas, todėl nebuvo pakeistas.\n"
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s nori Jums atsiųsti %s (%s)"
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s nori Jums atsiųsti failą"
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Ar priimti perduodamą failą iš %s?"
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Failas yra prieinamas parsisiuntimui iš:\n"
+"Nutolęs mazgas: %s\n"
+"Nutolęs prievadas: %d"
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s siūlo atsiųsti failą %s"
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s nėra teisingas failo vardas.\n"
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "Siūloma nusiųsti %s bičiuliui %s"
+
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Pradedamas %s gavimas iš %s"
+
+#, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Failo <A HREF=\\\"file://%s\\\">%s</A> perdavimas baigtas"
+
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "Failo %s perdavimas baigtas"
+
+msgid "File transfer complete"
+msgstr "Failo perdavimas baigtas"
+
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "Jūs nutraukėte %s perdavimą"
+
+msgid "File transfer cancelled"
+msgstr "Failo perdavimas nutrauktas"
+
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s nutraukė %s perdavimą"
+
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s nutraukė failo perdavimą"
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "Įvyko failo perdavimo bičiuliui %s klaida."
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "Įvyko failo gavimo iš %s klaida."
+
+msgid "Run the command in a terminal"
+msgstr "Vykdyti komandą terminale"
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "Komanda „aim“ universaliųjų adresų apdorojimui, jei aktyvuota."
+
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "Komanda „gg“ universaliųjų adresų apdorojimui, jei aktyvuota."
+
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "Komanda „icq“ universaliųjų adresų apdorojimui, jei aktyvuota."
+
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "Komanda „irc“ universaliųjų adresų apdorojimui, jei aktyvuota."
+
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "Komanda „msnim“ universaliųjų adresų apdorojimui, jei aktyvuota."
+
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "Komanda „sip“ universaliųjų adresų apdorojimui, jei aktyvuota."
+
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "Komanda „xmpp“ universaliųjų adresų apdorojimui, jei aktyvuota."
+
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "Komanda „ysmgr“ universaliųjų adresų apdorojimui, jei aktyvuota."
+
+msgid "The handler for \"aim\" URLs"
+msgstr "Komanda „aim“ universaliųjų adresų apdorojimui"
+
+msgid "The handler for \"gg\" URLs"
+msgstr "Komanda „aim“ universaliųjų adresų apdorojimui"
+
+msgid "The handler for \"icq\" URLs"
+msgstr "Komanda „icq“ universaliųjų adresų apdorojimui"
+
+msgid "The handler for \"irc\" URLs"
+msgstr "Komanda „irc“ universaliųjų adresų apdorojimui"
+
+msgid "The handler for \"msnim\" URLs"
+msgstr "Komanda „msnim“ universaliųjų adresų apdorojimui"
+
+msgid "The handler for \"sip\" URLs"
+msgstr "Komanda „sip“ universaliųjų adresų apdorojimui"
+
+msgid "The handler for \"xmpp\" URLs"
+msgstr "Komanda „xmpp“ universaliųjų adresų apdorojimui"
+
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "Komanda „ysmgr“ universaliųjų adresų apdorojimui"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „aim“ "
+"universaliuosius adresus."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „gg“ "
+"universaliuosius adresus."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „icq“ "
+"universaliuosius adresus."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „irc“ "
+"universaliuosius adresus."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „msnim“ "
+"universaliuosius adresus."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „sip“ "
+"universaliuosius adresus."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „xmpp“ "
+"universaliuosius adresus."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"„True“, jeigu komanda, nurodyta „command“ rakte, turi apdoroti „ysmgr“ "
+"universaliuosius adresus."
+
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"„True“, jeigu komanda, turinti apdoroti šio tipo universaliuosius adresus, "
+"turi būti leidžiama terminale."
+
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "Ar nurodytoji komanda turėtų apdoroti „aim“ universaliuosius adresus"
+
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "Ar nurodytoji komanda turėtų apdoroti „gg“ universaliuosius adresus"
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "Ar nurodytoji komanda turėtų apdoroti „icq“ universaliuosius adresus"
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "Ar nurodytoji komanda turėtų apdoroti „irc“ universaliuosius adresus"
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "Ar nurodytoji komanda turėtų apdoroti „msnim“ universaliuosius adresus"
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "Ar nurodytoji komanda turėtų apdoroti „sip“ universaliuosius adresus"
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "Ar nurodytoji komanda turėtų apdoroti „xmpp“ universaliuosius adresus"
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "Ar nurodytoji komanda turėtų apdoroti „ysmgr“ universaliuosius adresus"
+
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr ""
+"<b><font color=\"red\">Žurnalų tvarkytuvė neturi skaitymo funkcijos</font></"
+"b>"
+
+msgid "HTML"
+msgstr "HTML"
+
+msgid "Plain text"
+msgstr "Grynasis tekstas"
+
+msgid "Old flat format"
+msgstr "Senasis plokščias formatas"
+
+msgid "Logging of this conversation failed."
+msgstr "Nepavyko šio pokalbio įrašyti į žurnalą."
+
+msgid "XML"
+msgstr "XML"
+
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATINIS "
+"ATSAKYMAS&gt;:</b></font> %s<br/>\n"
+
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATINIS "
+"ATSAKYMAS&gt;:</b></font> %s<br/>\n"
+
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr "<font color=\"red\"><b>Negalima rasti žurnalų kelio!</b></font>"
+
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr "<font color=\"red\"><b>Negalima perskaityti failo: %s</b></font>"
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <AUTOMATINIS-ATSAKYMAS>: %s\n"
+
+msgid "Error creating conference."
+msgstr "Konferencijos sukūrimo klaida."
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "Jūs naudojatės %s, bet šiam papildiniui reikia %s."
+
+msgid "This plugin has not defined an ID."
+msgstr "Šis papildinys nenustatė ID"
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "Neatitinka papildinio kontrolinis skaičius %d (turėtų būti %d)"
+
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "ABI versija %d.%d.x neatitinka (turėtų būti %d.%d.x)"
+
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"Papildinys nerealizuoja visų reikallingų funkcijų (list_icon, login ir close)"
+
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+"Reikalautas papildinys %s nerastas. Prašome įdiegti šį papildinį ir bandyti "
+"iš naujo."
+
+msgid "Unable to load the plugin"
+msgstr "Papildinio įkelti nepavyko"
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr "Reikalauto papildinio %s nepavyko įkelti."
+
+msgid "Unable to load your plugin."
+msgstr "Nepavyko įkelti Jūsų nurodyto papildinio."
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s reikalauja %s, bet pastarojo papildinio iškelti nepavyko."
+
+msgid "Autoaccept"
+msgstr "Automatinis priėmimas"
+
+msgid "Auto-accept file transfer requests from selected users."
+msgstr "Automatiškai priima failų siuntimus iš pasirinktų vartotojų."
+
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr "Automatiškai priimtas failo „%s“ siuntimas iš „%s“ baigtas."
+
+msgid "Autoaccept complete"
+msgstr "Automatinis priėmimas baigtas"
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "Kai gaunamas failo perdavimo prašymas iš %s"
+
+msgid "Set Autoaccept Setting"
+msgstr "Nustatyti automatinį prėmimą"
+
+msgid "_Save"
+msgstr "_Įrašyti"
+
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+msgid "Ask"
+msgstr "Paklausti"
+
+msgid "Auto Accept"
+msgstr "Automatiškai priimti"
+
+msgid "Auto Reject"
+msgstr "Automatiškai atmesti"
+
+msgid "Autoaccept File Transfers..."
+msgstr "Automatiškai priimti failų perdavimus..."
+
+#. XXX: Is there a better way than this? There really should be.
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+"Kelias, kuriame išsaugoti failus\n"
+"(Nurodykite pilną kelią)"
+
+msgid "Automatically reject from users not in buddy list"
+msgstr "Automatiškai atmesti iš vartotojų, nesančių bičiulių sąraše"
+
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+"Pranešti iššokančiu langu, kai baigtas automatiškai priimtas failo "
+"perdavimas\n"
+"(tik jei nevyko pokalbis su siuntėju)"
+
+msgid "Create a new directory for each user"
+msgstr "Sukurti po naują katalogą kiekvienam naudotojui"
+
+msgid "Notes"
+msgstr "Pastabos"
+
+msgid "Enter your notes below..."
+msgstr "Įveskite savo pastabas žemiau..."
+
+msgid "Edit Notes..."
+msgstr "Redaguoti pastabas..."
+
+#  "New Buddy Pounce"


+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Notes"
+msgstr "Pastabos apie bičiulius"
+
+#. *< name
+#. *< version
+msgid "Store notes on particular buddies."
+msgstr "Saugo pastabas apie konkrečius bičiulius."
+
+#. *< summary
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr ""
+"Siūlo galimybę saugoti pastabas apie bičiulius iš Jūsų bičiulių sąrašo."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Cipher Test"
+msgstr "Šifrų testas"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests the ciphers that ship with libpurple."
+msgstr "Testuoja su „libpurple“ pateikiamus šifrus."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "DBus Example"
+msgstr "DBus papildinio pavyzdys"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "DBus Plugin Example"
+msgstr "DBus papildinio pavyzdys"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "File Control"
+msgstr "Valdymas failu"
+
+#  *< name


+#  *< version


+#  *  summary


+#  *  description


+#  *< name


+#  *< version


+#  *  summary


+#  *  description


+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Allows control by entering commands in a file."
+msgstr "Leidžia valdyti programą faile surašytomis komandomis."
+
+msgid "Minutes"
+msgstr "Minutės"
+
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+msgid "I'dle Mak'er"
+msgstr "Neveiklumo meistras"
+
+msgid "Set Account Idle Time"
+msgstr "Nustatyti abonento neveiklumo laiką"
+
+msgid "_Set"
+msgstr "_Nustatyti"
+
+msgid "None of your accounts are idle."
+msgstr "Nėra neveiklių paskyrų."
+
+msgid "Unset Account Idle Time"
+msgstr "Panaikinti abonento neveiklumo laiko nustatymą"
+
+msgid "_Unset"
+msgstr "_Panaikinti"
+
+msgid "Set Idle Time for All Accounts"
+msgstr "Nustatyti neveiklumo laiką visoms paskyroms"
+
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "Panaikinti neveiklumo laiko nustatymą visoms paskyroms"
+
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "Leidžia Jums rankiniu būdu nustatyti Jūsų neveiklumo laiką"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Client"
+msgstr "Testinis IPC klientas"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a client."
+msgstr "Patikrina papildinių IPC palaikymą klientams."
+
+#. *  description
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Patikrina papildinių IPC palaikymą klientams.  Suranda IPC serverio "
+"papildinį ir iškviečia registruotas komandas."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Server"
+msgstr "Testinis IPC serveris"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a server."
+msgstr "Patikrina papildinių IPC palaikymą serveriams."
+
+#. *  description
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+"Patikrina papildinių IPC palaikymą serveriams. Priregistruoja IPC komandas."
+
+msgid "Join/Part Hiding Configuration"
+msgstr "Prisijungimų ir atsijungimų slėpimo parinktys"
+
+msgid "Minimum Room Size"
+msgstr "Mažiausias kambario dydis"
+
+msgid "User Inactivity Timeout (in minutes)"
+msgstr "Vartotojo neveiklumo laukimo laikas (minutėmis)"
+
+msgid "Apply hiding rules to buddies"
+msgstr "Pritaikyti bičiuliams slėpimo taisykles"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Join/Part Hiding"
+msgstr "Prisijungimų ir atsijungimų slėpimas"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Hides extraneous join/part messages."
+msgstr "Slepia šalutines prisijungimų ir atsijungimų žinutes."
+
+#. *  description
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+"Šis papildinys paslepia prisijungimų ir atsijungimų žinutes dideliuose "
+"kambariuose, išskyrus tų naudotojų, kurie aktyviai dalyvauja pokalbyje."
+
+#. This is used in the place of a timezone abbreviation if the
+#. * offset is way off.  The user should never really see it, but
+#. * it's here just in case.  The parens are to make it clear it's
+#. * not a real timezone.
+msgid "(UTC)"
+msgstr "(UTC)"
+
+msgid "User is offline."
+msgstr "Vartotojas atsijungęs."
+
+msgid "Auto-response sent:"
+msgstr "Nusiųstas automatinis atsakymas:"
+
+#, c-format
+msgid "%s has signed off."
+msgstr "%s atsijungė."
+
+msgid "One or more messages may have been undeliverable."
+msgstr "Viena ar daugiau žinučių galėjo būti nepristatytos gavėjui."
+
+msgid "You were disconnected from the server."
+msgstr "Jūs buvote atjungtas nuo serverio."
+
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Šiuo metu esate atsijungęs, todėl negausite žinučių, kol neprisijungsite."
+
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "Žinutė neišsiųsta, nes viršytas jos didžiausias leistinas ilgis"
+
+msgid "Message could not be sent."
+msgstr "Žinutė nebuvo išsiųsta."
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Adium"
+msgstr "Adium"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Fire"
+msgstr "Fire"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "QIP"
+msgstr "QIP"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Trillian"
+msgstr "Trillian"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "aMSN"
+msgstr "aMSN"
+
+#. Add general preferences.
+msgid "General Log Reading Configuration"
+msgstr "Bendros žurnalų skaitymo parinktys"
+
+msgid "Fast size calculations"
+msgstr "Greitas dydžio apskaičiavimas"
+
+msgid "Use name heuristics"
+msgstr "Naudoti vardų euristiką"
+
+#. Add Log Directory preferences.
+msgid "Log Directory"
+msgstr "Žurnalų katalogas"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Log Reader"
+msgstr "Žurnalų skaityklė"
+
+#. *< name
+#. *< version
+#. * summary
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Žurnalų žiūryklėje parodo ir kitų pokalbių programų žurnalus."
+
+#. * description
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+"Į žurnalų žiūryklę papildomai įtraukia žurnalus iš kitų pokalbių programų.  "
+"Šiuo metu yra galimybė rodyti Adium, MSN Messenger, aMSN ir Trillian "
+"programų žurnalus.<\n"
+"\n"
+"PERSPĖJIMAS: šis papildinys yra vis dar bandomasis ir gali dažnai lūžti.  "
+"Naudokite jį savo rizika!"
+
+msgid "Mono Plugin Loader"
+msgstr "Mono papildinių paleidyklė"
+
+msgid "Loads .NET plugins with Mono."
+msgstr "Su Mono įkelia .NET papildinius."
+
+msgid "Add new line in IMs"
+msgstr "Pridėti naują eilutę asmeninėse žinutėse"
+
+msgid "Add new line in Chats"
+msgstr "Pridėti naują eilutę pokalbių kambariuose"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "New Line"
+msgstr "Nauja eilutė"
+
+#. *< name
+#. *< version
+msgid "Prepends a newline to displayed message."
+msgstr "Prieš rodomą žinutę įterpia naują eilutę"
+
+#. *< summary
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the username in the conversation window."
+msgstr ""
+"Įterpia naują eilutę pokalbių lange tarp žinutės autoriaus ir žinutės teksto."
+
+msgid "Offline Message Emulation"
+msgstr "Atjungtų žinučių imitavimas"
+
+msgid "Save messages sent to an offline user as pounce."
+msgstr ""
+"Išsaugo žinutes, išsiųstas atsijungusiems bičiuliams, kaip reakcijas į juos."
+
+msgid ""
+"The rest of the messages will be saved as pounces. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+"Likusios žinutės bus išsaugotos kaip reakcija į bičiulį.  Galite keisti arba "
+"ištrinti šią reakciją dialoge „Reakcijos į bičiulius“."
+
+#, c-format
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+"„%s“ šiuo metu yra atsijungęs.  Ar norite išsaugoti likusias žinutes kaip "
+"reakciją į bičiulį ir automatiškai jas išsiųsti, kai „%s“ vėl prisijungs?"
+
+msgid "Offline Message"
+msgstr "Atjungta žinutė"
+
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr "Galite keisti arba ištrinti reakciją dialoge „Reakcijos į bičiulius“."
+
+#  *


+#  * A wrapper for Pidgin_request_action() that uses Yes and No buttons.


+msgid "Yes"
+msgstr "Taip"
+
+msgid "No"
+msgstr "Ne"
+
+msgid "Save offline messages in pounce"
+msgstr "Išsaugoti atjungtas žinutes reakcijoje"
+
+msgid "Do not ask. Always save in pounce."
+msgstr "Neklausti. Visada išsaugoti reakcijoje."
+
+msgid "One Time Password"
+msgstr "Vienkartiniai slaptažodžiai"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Vienkartinių slaptažodžių palaikymas"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Užtikrinti, kad slaptažodžiai yra panaudojami tik po vieną kartą."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Leidžia užtikrinti pasirinktoms paskyroms, kad neįrašyti slaptažodžiai būtų "
+"naudojami tik vienam sėkmingam prisijungimui.\n"
+"Pastaba: tokios paskyros slaptažodis negali būti įrašytas."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Perl Plugin Loader"
+msgstr "Perl papildinių paleidyklė"
+
+#. *< name
+#. *< version
+#. *< summary
+msgid "Provides support for loading perl plugins."
+msgstr "Suteikia galimybę įkelti Perl papildinius."
+
+msgid "Psychic Mode"
+msgstr "Aiškiaregystė"
+
+msgid "Psychic mode for incoming conversation"
+msgstr "Išankstinis įeinančių žinučių numatymas"
+
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"Atidaro pokalbių langą iškart, kai kitas vartotojas pradeda rašyti Jums "
+"žinutę.  Ši funkcija veikia AIM, ICQ, XMPP, Sametime ir Yahoo! protokoluose."
+
+msgid "You feel a disturbance in the force..."
+msgstr "Jaučiate sutrikdymą jėgoje..."
+
+msgid "Only enable for users on the buddy list"
+msgstr "Įjungti tik vartotojams iš bičiulių sąrašo"
+
+msgid "Disable when away"
+msgstr "Išjungti, kai aš pasitraukęs"
+
+msgid "Display notification message in conversations"
+msgstr "Rodyti informacinį pranešimą pokalbyje"
+
+msgid "Raise psychic conversations"
+msgstr "Pakelti nujaučiamų pokalbių langus"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Signals Test"
+msgstr "Signalų testas"
+
+#  *< name


+#  *< version


+#  *  summary


+#  *  description


+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all signals are working properly."
+msgstr "Testas, skirtas nustatyti, ar visi signalai veikia teisingai."
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Simple Plugin"
+msgstr "Paprastas papildinys"
+
+#  *< name


+#  *< version


+#  *  summary


+#  *  description


+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests to see that most things are working."
+msgstr "Patikrina, ar dauguma dalykų veikia"
+
+#. Scheme name
+msgid "X.509 Certificates"
+msgstr "X.509 liudijimai"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr "GNUTLS biblioteka"
+
+#  *< name


+#  *< version


+#  *  summary


+#  *  description


+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS pagalba suteikia SSL palaikymą."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Mozilla NSS pagalba suteikia SSL palaikymą."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr "SSL protokolo palaikymas"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Suteikia apvalkalą SSL palaikymo bibliotekoms"
+
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s sugrįžo."
+
+#, c-format
+msgid "%s has gone away."
+msgstr "%s pasitraukė."
+
+#, c-format
+msgid "%s has become idle."
+msgstr "%s tapo neveiklus."
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s tapo veiklus."
+
+#, c-format
+msgid "%s has signed on."
+msgstr "%s prisijungė."
+
+msgid "Notify When"
+msgstr "Informuoti, kai"
+
+msgid "Buddy Goes _Away"
+msgstr "bičiulis išein_a"
+
+msgid "Buddy Goes _Idle"
+msgstr "b_ičiulis tampa neveiklus"
+
+msgid "Buddy _Signs On/Off"
+msgstr "Bičiulis pradeda arba baigia seansą"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy State Notification"
+msgstr "Pranešimai apie bičiulių būsenas"
+
+#  *< name


+#  *< version


+#  *  summary


+#  *  description


+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Pokalbių lange praneša apie bičiulio pasitraukimą, grįžimą, tapimą veikliu "
+"ar neveikliu."
+
+msgid "Tcl Plugin Loader"
+msgstr "Tcl papildinių paleidyklė"
+
+msgid "Provides support for loading Tcl plugins"
+msgstr "Suteikia galimybę įkelti Tcl papildinius"
+
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+"Nepavyko rasti įdiegto „ActiveTCL“.  Jei norite naudoti TCL papildinius, "
+"įdiekite „ActiveTCL“ iš http://www.activestate.com\n"
+
+msgid ""
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr ""
+"Apple „Bonjour for Windows“ priemonių rinkinys nerastas.  Adresu http://d."
+"pidgin.im/BonjourWindow rasite daugiau informacijos."
+
+msgid "Unable to listen for incoming IM connections"
+msgstr ""
+"Nepavyko sukurti klausymo prievado įeinančioms greitųjų žinučių jungtims"
+
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "Nepavyko prisijungti su vietiniu mDNS serveriu.  Ar jis paleistas?"
+
+msgid "First name"
+msgstr "Tikrasis vardas"
+
+msgid "Last name"
+msgstr "Pavardė"
+
+msgid "Email"
+msgstr "El. paštas"
+
+msgid "AIM Account"
+msgstr "AIM paskyra"
+
+msgid "XMPP Account"
+msgstr "XMPP paskyra"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Bonjour Protocol Plugin"
+msgstr "Bonjour protokolo papildinys"
+
+msgid "Purple Person"
+msgstr "(nežinomas vardas)"
+
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "Vietinis prievadas"
+
+msgid "Bonjour"
+msgstr "Bonjour"
+
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s uždarė pokalbio langą."
+
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Negalima išsiųsti žinutės ir pradėti pokalbio."
+
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nepavyko sukurti jungties: %s"
+
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Nepavyko susieti jungties su prievadu: %s"
+
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Nepavyko klausytis jungties: %s"
+
+msgid "Error communicating with local mDNSResponder."
+msgstr "Komunikacijos su vietiniu mDNSResponder klaida"
+
+msgid "Invalid proxy settings"
+msgstr "Neteisingi tarpininko nustatymai"
+
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"Jūsų pasirinktam tarpininko tipui neteisingai nurodytas mazgo vardas arba "
+"prievado numeris."
+
+msgid "Token Error"
+msgstr "Žymės klaida"
+
+msgid "Unable to fetch the token.\n"
+msgstr "Nepavyko gauti žymės.\n"
+
+msgid "Save Buddylist..."
+msgstr "Išsaugoti bičiulių sąrašą..."
+
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr "Jūsų bičiulių sąrašas tuščias, todėl į failą nieko nebuvo įrašyta."
+
+msgid "Buddylist saved successfully!"
+msgstr "Bičiulių sąrašas sėkmingai išsaugotas!"
+
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "Paskyros %s bičiulių sąrašo nepavyko įrašyti į %s"
+
+msgid "Couldn't load buddylist"
+msgstr "Nepavyko įkelti bičiulių sąrašo"
+
+msgid "Load Buddylist..."
+msgstr "Įkelti bičiulių sąrašą..."
+
+msgid "Buddylist loaded successfully!"
+msgstr "Bičiulių sąrašas sėkmingai įkeltas!"
+
+msgid "Save buddylist..."
+msgstr "Išsaugoti bičiulių sąrašą..."
+
+msgid "Load buddylist from file..."
+msgstr "Įkelti bičiulių sąrašą iš failo..."
+
+msgid "You must fill in all registration fields"
+msgstr "Privalote užpildyti visus registracijos formos laukus"
+
+msgid "Passwords do not match"
+msgstr "Slaptažodžiai nesutampa"
+
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Nepavyko registruoti naujos paskyros.  Įvyko nežinoma klaida."
+
+msgid "New Gadu-Gadu Account Registered"
+msgstr "Užregistruotas naujas Gadu-Gadu abonentas"
+
+msgid "Registration completed successfully!"
+msgstr "Registracija sėkmingai užbaigta!"
+
+msgid "Password"
+msgstr "Slaptažodis"
+
+msgid "Password (again)"
+msgstr "Pakartotas slaptažodis"
+
+msgid "Enter captcha text"
+msgstr "Įveskite „captcha“ tekstą:"
+
+msgid "Captcha"
+msgstr "„Captcha“"
+
+msgid "Register New Gadu-Gadu Account"
+msgstr "Registruoti naują Gadu-Gadu abonentą"
+
+msgid "Please, fill in the following fields"
+msgstr "Prašome užpildyti tolimesnius laukus"
+
+msgid "City"
+msgstr "Miestas"
+
+msgid "Year of birth"
+msgstr "Gimimo metai"
+
+msgid "Gender"
+msgstr "Lytis"
+
+msgid "Male or female"
+msgstr "Vyras ar moteris"
+
+msgid "Male"
+msgstr "Vyras"
+
+msgid "Female"
+msgstr "Moteris"
+
+msgid "Only online"
+msgstr "Šiuo metu prisijungęs"
+
+msgid "Find buddies"
+msgstr "Ieškoti bičiulių"
+
+msgid "Please, enter your search criteria below"
+msgstr "Prašome žemiau įvesti, pagal ką ieškosite"
+
+msgid "Fill in the fields."
+msgstr "Užpildykite laukus."
+
+msgid "Your current password is different from the one that you specified."
+msgstr "Jūsų dabartinis slaptažodis skiriasi nuo nurodytojo."
+
+msgid "Unable to change password. Error occurred.\n"
+msgstr "Slaptažodis nepakeistas, įvyko klaida.\n"
+
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Pakeisti Gadu-Gadu paskyros slaptažodį"
+
+msgid "Password was changed successfully!"
+msgstr "Slaptažodis buvo sėkmingai pakeistas!"
+
+msgid "Current password"
+msgstr "Dabartinis slaptažodis"
+
+msgid "Password (retype)"
+msgstr "Pakartotas slaptažodis"
+
+msgid "Enter current token"
+msgstr "Įveskite dabartinę žymę"
+
+msgid "Current token"
+msgstr "Dabartinė žymė"
+
+msgid "Please, enter your current password and your new password for UIN: "
+msgstr "Prašome įvesti Jūsų dabartinį slaptažodį ir Jūsų naują UIN slaptažodį:"
+
+msgid "Change Gadu-Gadu Password"
+msgstr "Pakeisti Gadu-Gadu slaptažodį"
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "Pasirinkite pokalbių kambarį bičiuliui %s"
+
+msgid "Add to chat..."
+msgstr "Įtraukti į pokalbių kambarį..."
+
+#. Global
+msgid "Available"
+msgstr "Pasiekiamas"
+
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+msgid "Away"
+msgstr "Pasitraukęs"
+
+msgid "UIN"
+msgstr "UIN"
+
+msgid "First Name"
+msgstr "Vardas"
+
+msgid "Birth Year"
+msgstr "Gimimo metai"
+
+msgid "Unable to display the search results."
+msgstr "Negalima parodyti paieškos rezultatų."
+
+msgid "Gadu-Gadu Public Directory"
+msgstr "Viešasis Gadu-Gadu katalogas"
+
+msgid "Search results"
+msgstr "Paieškos rezultatai"
+
+msgid "No matching users found"
+msgstr "Ieškotų vartotojų nerasta"
+
+msgid "There are no users matching your search criteria."
+msgstr "Vartotojų, tenkinančių paieškos kriterijus, nėra."
+
+msgid "Unable to read from socket"
+msgstr "Nepavyko skaityti iš jungties"
+
+#  Buddy List trans options


+msgid "Buddy list downloaded"
+msgstr "Bičiulių sąrašas atsisiųstas"
+
+msgid "Your buddy list was downloaded from the server."
+msgstr "Jūsų bičiulių sąrašas atsisiųstas iš serverio."
+
+msgid "Buddy list uploaded"
+msgstr "Bičiulių sąrašas nusiųstas į serverį"
+
+msgid "Your buddy list was stored on the server."
+msgstr "Jūsų bičiulių sąrašas išsaugotas serveryje."
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Prisijungta"
+
+msgid "Connection failed"
+msgstr "Jungties klaida"
+
+msgid "Add to chat"
+msgstr "Įtraukti į pokalbių kambarį"
+
+msgid "Chat _name:"
+msgstr "Ka_nalo pavadinimas:"
+
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Nepavyko nustatyti IP adreso pagal vardą '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Jungiamasi"
+
+msgid "Chat error"
+msgstr "Pokalbių kambario klaida"
+
+msgid "This chat name is already in use"
+msgstr "Toks pokalbių kambario vardas jau yra vartojamas"
+
+msgid "Not connected to the server"
+msgstr "Neprisijungta prie serverio"
+
+msgid "Find buddies..."
+msgstr "Ieškoti bičiulių..."
+
+msgid "Change password..."
+msgstr "Pakeisti slaptažodį..."
+
+msgid "Upload buddylist to Server"
+msgstr "Nusiųsti bičiulių sąrašą į serverį"
+
+msgid "Download buddylist from Server"
+msgstr "Atsisiųsti bičiulių sąrašą iš serverio"
+
+msgid "Delete buddylist from Server"
+msgstr "Ištrinti bičiulių sąrašą iš serverio"
+
+msgid "Save buddylist to file..."
+msgstr "Įšsaugoti bičiulių sąrašą faile..."
+
+#. magic
+#. major_version
+#. minor_version
+#. plugin type
+#. ui_requirement
+#. flags
+#. dependencies
+#. priority
+#. id
+#. name
+#. version
+msgid "Gadu-Gadu Protocol Plugin"
+msgstr "Gadu-Gadu protokolo papildinys"
+
+#. summary
+msgid "Polish popular IM"
+msgstr "Populiarus lenkiškas bendravimo tinklas"
+
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu vartotojas"
+
+msgid "GG server"
+msgstr "GG serveris"
+
+#, c-format
+msgid "Unknown command: %s"
+msgstr "Nežinoma komanda: %s"
+
+#, c-format
+msgid "current topic is: %s"
+msgstr "dabartinė tema yra: %s"
+
+msgid "No topic is set"
+msgstr "Temos nėra"
+
+msgid "File Transfer Failed"
+msgstr "Failo perdavimas nepavyko"
+
+msgid "Unable to open a listening port."
+msgstr "Nepavyko atverti prievado klausymui."
+
+msgid "Error displaying MOTD"
+msgstr "MOTD pavaizdavimo klaida"
+
+msgid "No MOTD available"
+msgstr "Nėra MOTD"
+
+msgid "There is no MOTD associated with this connection."
+msgstr "Nėra su šia jungtimi susieto MOTD."
+
+#, c-format
+msgid "MOTD for %s"
+msgstr "%s MOTD"
+
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Dingo jungtis su serveriu: %s"
+
+msgid "View MOTD"
+msgstr "Žiūrėti MOTD"
+
+msgid "_Channel:"
+msgstr "_Kanalas:"
+
+msgid "_Password:"
+msgstr "Sla_ptažodis:"
+
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC vardai ir serverio adresas negali turėti tarpų"
+
+msgid "SSL support unavailable"
+msgstr "Nėra SSL palaikymo"
+
+msgid "Unable to connect"
+msgstr "Negalima prisijungti"
+
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Nepavyko prisijungti: %s"
+
+#, c-format
+msgid "Server closed the connection"
+msgstr "Serveris uždarė jungtį"
+
+msgid "Users"
+msgstr "Vartotojai"
+
+msgid "Topic"
+msgstr "Tema"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#  *< name


+#  *< version


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "IRC Protocol Plugin"
+msgstr "IRC protokolo papildinys"
+
+#  *  summary


+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "Mažiau knisantis IRC protokolo papildinys"
+
+#. host to connect to
+msgid "Server"
+msgstr "Serveris"
+
+#. port to connect to
+msgid "Port"
+msgstr "Prievadas"
+
+msgid "Encodings"
+msgstr "Koduotės"
+
+msgid "Auto-detect incoming UTF-8"
+msgstr "Automatiškai nustatyti gaunamą UTF-8"
+
+msgid "Real name"
+msgstr "Tikras vardas"
+
+#.
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#.
+msgid "Use SSL"
+msgstr "Naudoti SSL"
+
+msgid "Bad mode"
+msgstr "Bloga būsena"
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Vartotojui %s uždraudė prisijungti %s prieš %s sekundžių"
+
+#, c-format
+msgid "Ban on %s"
+msgstr "Vartotojui %s uždrausta prisijungti"
+
+msgid "End of ban list"
+msgstr "Draudimų sąrašo pabaiga"
+
+#, c-format
+msgid "You are banned from %s."
+msgstr "Jums uždrausta prisijungti prie kanalo %s."
+
+msgid "Banned"
+msgstr "Uždrausta prisijungti prie kanalo"
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr ""
+"Negalima uždrausti %s prisijungti prie kanalo, nes draudimų sąrašas pilnas"
+
+msgid " <i>(ircop)</i>"
+msgstr "<i>(IRC operatorius)</i>"
+
+msgid " <i>(identified)</i>"
+msgstr "<i>(identifikavęsis)</i>"
+
+msgid "Nick"
+msgstr "Vardas"
+
+msgid "Currently on"
+msgstr "Kanaluose"
+
+msgid "Idle for"
+msgstr "Neveiklus jau"
+
+msgid "Online since"
+msgstr "Prisijungęs nuo"
+
+msgid "<b>Defining adjective:</b>"
+msgstr "<b>Aprašantis būdvardis:</b>"
+
+msgid "Glorious"
+msgstr "Šlovingas"
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s pakeitė temą į: %s"
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s ištrynė temą."
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "Kanalo %s tema: %s"
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr "Nežinomas pranešimas „%s“"
+
+msgid "Unknown message"
+msgstr "Nežinoma pranešimas"
+
+msgid "The IRC server received a message it did not understand."
+msgstr "IRC serveris gavo nesuprantamą pranešimą."
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr "Vartotojai, esantys %s: %s"
+
+msgid "Time Response"
+msgstr "Laiko atsakas"
+
+msgid "The IRC server's local time is:"
+msgstr "IRC serverio vietinis laikas yra:"
+
+msgid "No such channel"
+msgstr "Tokio kanalo nėra"
+
+#  does this happen?


+#. does this happen?
+msgid "no such channel"
+msgstr "tokio kanalo nėra"
+
+msgid "User is not logged in"
+msgstr "Vartotojas neprisijungęs"
+
+msgid "No such nick or channel"
+msgstr "Nėra tokio vardo ar kanalo"
+
+msgid "Could not send"
+msgstr "Nepavyko išsiųsti"
+
+#, c-format
+msgid "Joining %s requires an invitation."
+msgstr "Prisijungimui prie %s būtinas pakvietimas."
+
+msgid "Invitation only"
+msgstr "Tik su pakvietimais"
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr "Tave išspyrė %s: %s"
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "Išspyrė %s (%s)"
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "Būseną (%s %s) nustatė %s"
+
+msgid "Invalid nickname"
+msgstr "Neteisingas vardas"
+
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Serveris atmetė Jūsų pasirinktą vardą.  Greičiausiai jame yra neleistinų "
+"simbolių."
+
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Serveris atmetė Jūsų pasirinktą abonento vardą.  Greičiausiai jame yra "
+"neleistinų simbolių."
+
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Pokalbių kambario vardas „%s“ jau užimtas."
+
+msgid "Nickname in use"
+msgstr "Užimtas vardas"
+
+msgid "Cannot change nick"
+msgstr "Negalima pakeisti vardo"
+
+msgid "Could not change nick"
+msgstr "Vardo pakeisti nepavyko"
+
+#, c-format
+msgid "You have parted the channel%s%s"
+msgstr "Jūs palikote kanalą%s%s"
+
+msgid "Error: invalid PONG from server"
+msgstr "Klaida: neteisingas PONG iš serverio"
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr "Atsakymas į skimbtelėjimą -- delsa: %lu sek."
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "Nepavyko prisijungti prie %s, nes reikalinga registracija."
+
+msgid "Cannot join channel"
+msgstr "Nepavyko prisijungti prie kanalo"
+
+msgid "Nick or channel is temporarily unavailable."
+msgstr "Vardas ar kanalas yra laikinai neprieinamas."
+
+#, c-format
+msgid "Wallops from %s"
+msgstr "Žinutė (wallops) iš %s"
+
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr "action &lt;veiksmas&gt;:  atlieka veiksmą."
+
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"away [žinutė]:  nustato pasitraukimp žinutę. Jei žinutė nenurodyta, grįžta "
+"iš pasitraukimo."
+
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <vardas> <žinutė>: nusiunčia CTCP žinutę nurodytu vardu."
+
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: nusiunčia chanserv komandą"
+
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;vardas1&gt; [vardas2] ...:  pašalina nurodyto vardo(-ų) "
+"operatoriaus statusą. Tam Jūs turite būti kanalo operatorius."
+
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+"devoice &lt;vardas1&gt; [vardas2] ...:  pašalina nurodyto vardo(-ų) "
+"kalbėjimo teisę, taip užkertant kelią jam kalbėti, jei kanalas yra "
+"prižiūrimas (+m). Tam Jūs turite būti kanalo operatorius."
+
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;vardas&gt; [room]:  pakviesti vartotoją su nurodytu vardu į "
+"nurodytą arba dabartinį kanalą."
+
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;kanalas1&gt;[,kanalas2][,...] [raktas1[,raktas2][,...]]:  prisijungti "
+"prie vieno ar daugiau kanalų, papildomai kiekvienam iš jų nurodant po raktą, "
+"jei reikia."
+
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;kanalas1&gt;[,kanalas2][,...] [raktas1[,raktas2][,...]]:  "
+"prisijungti prie vieno ar daugiau kanalų, papildomai kiekvienam iš jų "
+"nurodant po raktą, jei reikia."
+
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;vardas&gt; [pranešimas]:  išspirti vartotoją su nurodytu vardu iš "
+"kanalo. Tam Jūs turite būti kanalo operatorius."
+
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:  parodyti tinklo kanalų sąrašą. <i>Dėmesio, kai kurie serveriai gali "
+"Jus už tai atjungti.</i>"
+
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;veiksmas&gt;:  įvykdyti veiksmą."
+
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv: nusiunčia memoserv komandą"
+
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;vardas|kanalas&gt;:  nustatyti arba "
+"atšaukti kanalo arba vartotojo būseną."
+
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;vardas&gt; &lt;žinutė&gt;:  siunčia privačią žinutę vartotojui su "
+"nurodytu vardu.  Rašyti į kanalą su šia komanda negalima."
+
+msgid "names [channel]:  List the users currently in a channel."
+msgstr "names [kanalas]:  parodo šiuo metu kanale esančių vartotojų sąrašą."
+
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;naujas slapyvardis&gt;:  pakeičia Jūsų vardą"
+
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: nusiunčia nickserv komandą"
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;gavėjas&gt;:  nusiųsti pranešimą naudotojui ar kanalui."
+
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;vardas1&gt; [vardas2] ...:  suteikia kanalo operatoriaus statusą "
+"nurodytam vardui(-ams).  Tam Jūs turite būti kanalo operatorius."
+
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;žinutė&gt;:  jei nežinote, kas tai yra, tai greičiausiai ir "
+"negalite šios komandos naudoti."
+
+msgid "operserv: Send a command to operserv"
+msgstr "operserv: nusiunčia operserv komandą"
+
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [kanalas] [žinutė]:  išeiti iš dabartinio ar nurodyto kanalo, "
+"neprivalomai nurodant išėjimo žinutę."
+
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [vardas]:  nustato, kokia yra vartotojo (arba serverio, jei slapyvardis "
+"nenurodytas) delsa."
+
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;vardas&gt; &lt;žinutė&gt;: siunčia privačią žinutę vartotojui su "
+"nurodytu vardu.  Rašyti į kanalą su šia komanda negalima."
+
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+"quit [žinutė]:  atsijungia nuo serverio su papildoma neprivaloma žinute."
+
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]:  siunčia komandą serveriui be papildomo apdorojimo."
+
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;vardas&gt; [žinutė]:  pašalinti vartotoją su nurodytu vardu iš "
+"kanalo. Tam Jūs turite būti kanalo operatorius."
+
+msgid "time: Displays the current local time at the IRC server."
+msgstr "time:  parodyti dabartinį vietinį IRC serverio laiko."
+
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [nauja tema]:  pažiurėti arba pakeisti kanalo antraštę."
+
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  keisti arba atstatyti vartotojo būseną."
+
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [vardas]: nusiųsti vartotojui CTCP VERSION užklausą"
+
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;vardas1&gt; [vardas2] ...: suteikti vartotojui(-ams) kalbėjimo "
+"teisę.  Tam Jūs turite būti kanalo operatorius."
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;žinutė&gt;:  jei nežinote, kas tai yra, tai greičiausiai ir "
+"negalite šios komandos naudoti."
+
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [serveris] &lt;vardas&gt;:  gauti informaciją apie vartotoją."
+
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;vardas&gt;:  gauti informaciją apie atsijungusį vartotoją."
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr "Atsakymo laikas iš %s: %lu sek."
+
+# Būna poroje su „PING“. Nelabai aišku, kaip versti


+msgid "PONG"
+msgstr "PONG"
+
+# CTCP yra akronimas, PING neišversta.


+msgid "CTCP PING reply"
+msgstr "CTCP PING atsakas"
+
+msgid "Disconnected."
+msgstr "Atjungta."
+
+msgid "Unknown Error"
+msgstr "Nežinoma klaida"
+
+msgid "Ad-Hoc Command Failed"
+msgstr "Specialios (ad hoc) komandos klaida"
+
+msgid "execute"
+msgstr "vykdyti"
+
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"Serveris reikalauja TLS/SSL prisijungimui, bet TLS/SSL palaikymas nerastas."
+
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Jūs reikalaujate šifravimo, bet TLS/SSL palaikymas nerastas."
+
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
+"Serveris reikalauja tapatybės nustatymo grynu tekstu nekoduojamame duomenų "
+"sraute"
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s reikalauja tapatybės nustatymo grynu tekstu nekoduojamame duomenu "
+"kanale.  Ar leisti tai ir tęsti tapatybės nustatymą?"
+
+msgid "Plaintext Authentication"
+msgstr "Tapatybės nustatymas grynu tekstu"
+
+msgid "SASL authentication failed"
+msgstr "SASL atpažinimas nepavyko"
+
+msgid "Invalid response from server"
+msgstr "Neteisingas atsakas iš serverio"
+
+msgid "Server does not use any supported authentication method"
+msgstr "Serveris nenaudoja jokio Pidgin palaikomo tapatybės nustatymo metodo"
+
+msgid "You require encryption, but it is not available on this server."
+msgstr "Jūs reikalaujate šifravimo, bet jo šis serveris nesiūlo."
+
+msgid "Invalid challenge from server"
+msgstr "Neteisingas serverio iššūkis"
+
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL klaida: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "BOSH jungčių tvarkytuvė nutraukė jūsų sesiją."
+
+msgid "No session ID given"
+msgstr "Neduotas seanso ID"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Nepalaikoma BOSH protokolo versija"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Nepavyko prisijungti prie serverio"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Nepavyko prisijungti prie serverio: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Nepavyko sukurti SSL jungties"
+
+msgid "Full Name"
+msgstr "Pilnas vardas"
+
+msgid "Family Name"
+msgstr "Pavardė"
+
+msgid "Given Name"
+msgstr "Vardas"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Street Address"
+msgstr "Adresas"
+
+msgid "Extended Address"
+msgstr "Išplėstas adresas"
+
+msgid "Locality"
+msgstr "Vietovė"
+
+msgid "Region"
+msgstr "Regionas"
+
+msgid "Postal Code"
+msgstr "Pašto indeksas"
+
+#  Country


+msgid "Country"
+msgstr "Šalis"
+
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
+msgid "Telephone"
+msgstr "Telefonas"
+
+msgid "Organization Name"
+msgstr "Organizacijos pavadinimas"
+
+msgid "Organization Unit"
+msgstr "Organizacijos padalinys"
+
+msgid "Role"
+msgstr "Pareigos"
+
+msgid "Birthday"
+msgstr "Gimtadienis"
+
+msgid "Description"
+msgstr "Aprašymas"
+
+msgid "Edit XMPP vCard"
+msgstr "Redaguoti XMPP vCard vizitinę kortelę"
+
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+"Visi tolimesni įrašai yra neprivalomi.  Įveskite tik tą informaciją, kurią "
+"norite viešinti."
+
+msgid "Client"
+msgstr "Klientas"
+
+msgid "Operating System"
+msgstr "Operacinė sistema"
+
+msgid "Local Time"
+msgstr "Vietinis laikas"
+
+msgid "Priority"
+msgstr "Prioritetas"
+
+msgid "Resource"
+msgstr "Išteklius"
+
+#, c-format
+msgid "%s ago"
+msgstr "prieš %s"
+
+msgid "Logged Off"
+msgstr "Atsijungęs"
+
+msgid "Middle Name"
+msgstr "Antras vardas"
+
+msgid "Address"
+msgstr "Adresas"
+
+msgid "P.O. Box"
+msgstr "Abonentinė pašto dėžutė"
+
+msgid "Photo"
+msgstr "Nuotrauka"
+
+msgid "Logo"
+msgstr "Logotipas"
+
+msgid "Un-hide From"
+msgstr "Nustoti slėpti nuo"
+
+msgid "Temporarily Hide From"
+msgstr "Laikinai paslėpti nuo"
+
+#. && NOT ME
+msgid "Cancel Presence Notification"
+msgstr "Nutraukti informavimą apie buvimą"
+
+msgid "(Re-)Request authorization"
+msgstr "Pareikalauti (iš naujo) prieigos teisės"
+
+#  if(NOT ME)


+#  shouldn't this just happen automatically when the buddy is


+#  removed?


+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+msgid "Unsubscribe"
+msgstr "Išsiregistruoti"
+
+msgid "Log In"
+msgstr "Prisijungti"
+
+msgid "Log Out"
+msgstr "Atsijungti"
+
+msgid "Chatty"
+msgstr "Plepiai nusiteikęs"
+
+msgid "Extended Away"
+msgstr "Ilgam pasitraukęs"
+
+msgid "Do Not Disturb"
+msgstr "Netrukdyti"
+
+msgid "JID"
+msgstr "JID"
+
+msgid "Last Name"
+msgstr "Pavardė"
+
+msgid "The following are the results of your search"
+msgstr "Toliau yra Jūsų paieškos rezultatai"
+
+#. current comment from Jabber User Directory users.jabber.org
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+"Ieškokite kontakto įvesdami paieškos požymius pateiktuose laukuose.  "
+"Pastaba: kiekvienas laukas palaiko pakaitos simbolius (%)"
+
+msgid "Directory Query Failed"
+msgstr "Katalogo užklausa nepavyko"
+
+msgid "Could not query the directory server."
+msgstr "Nepavyko užklausti katalogo serverio."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "Serverio instrukcijos: %s"
+
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Užpildykite vieną ar daugiau laukų XMPP vartotojų paieškai."
+
+msgid "Email Address"
+msgstr "El. pašto adresas"
+
+msgid "Search for XMPP users"
+msgstr "Ieškoti XMPP vartotojų"
+
+#. "Search"
+msgid "Search"
+msgstr "Ieškoti"
+
+msgid "Invalid Directory"
+msgstr "Neteisingas katalogas"
+
+msgid "Enter a User Directory"
+msgstr "Įveskite vartotojų katalogą"
+
+msgid "Select a user directory to search"
+msgstr "Pasirinkite vartotojų katalogą paieškai"
+
+msgid "Search Directory"
+msgstr "Paieškos katalogas"
+
+msgid "_Room:"
+msgstr "Kamba_rys:"
+
+msgid "_Server:"
+msgstr "_Serveris:"
+
+msgid "_Handle:"
+msgstr "Ra_nkenėlė:"
+
+#, c-format
+msgid "%s is not a valid room name"
+msgstr "%s yra neteisingas kambario pavadinimas"
+
+msgid "Invalid Room Name"
+msgstr "Neteisingas kambario pavadinimas"
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr "%s yra neteisingas serverio pavadinimas"
+
+msgid "Invalid Server Name"
+msgstr "Neteisingas serverio pavadinimas"
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s yra neteisinga kambario rankenėlė"
+
+msgid "Invalid Room Handle"
+msgstr "Neteisinga kambario rankenėlė"
+
+msgid "Configuration error"
+msgstr "Konfigūracijos klaida"
+
+msgid "Unable to configure"
+msgstr "Negalima konfigūruoti"
+
+msgid "Room Configuration Error"
+msgstr "Kambario konfigūracijos klaida"
+
+msgid "This room is not capable of being configured"
+msgstr "Šis kambarys neturi konfigūravimo galimybės"
+
+msgid "Registration error"
+msgstr "Registracijos klaida"
+
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr "Ne MUC kambariuose vardo keitimas nėra palaikomas"
+
+msgid "Error retrieving room list"
+msgstr "Kambarių sąrašo gavimo klaida"
+
+msgid "Invalid Server"
+msgstr "Neteisingas serveris"
+
+msgid "Enter a Conference Server"
+msgstr "Įveskite konferencijų serverį"
+
+msgid "Select a conference server to query"
+msgstr "Pasirinkite konferencijų serverį užklausai"
+
+msgid "Find Rooms"
+msgstr "Rasti kambarius"
+
+msgid "Affiliations:"
+msgstr "Narystės:"
+
+msgid "No users found"
+msgstr "Naudotojų nerasta"
+
+msgid "Roles:"
+msgstr "Vaidmenys:"
+
+msgid "Ping timed out"
+msgstr "Baigėsi skimbtelėjimo laukimo laikas"
+
+msgid ""
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
+msgstr ""
+"Negalima rasti alternatyvių XMPP prisijungimo būdų nepavykus prisijungti "
+"tiesiai."
+
+msgid "Invalid XMPP ID"
+msgstr "Neteisingas XMPP ID"
+
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "Neteisingas XMPP ID.  Sritis privalo būti nustatyta."
+
+msgid "Malformed BOSH URL"
+msgstr "Neteisingas BOSH URL adresas"
+
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "%s@%s registracija sėkminga"
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr "Registracija prie %s sėkminga"
+
+msgid "Registration Successful"
+msgstr "Sėkminga registracija"
+
+msgid "Registration Failed"
+msgstr "Registracija nepavyko"
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "Sėkmingai išsiregistruota iš %s"
+
+msgid "Unregistration Successful"
+msgstr "Sėkmingas išsiregistravimas"
+
+msgid "Unregistration Failed"
+msgstr "Išsiregistravimas nepavyko"
+
+msgid "State"
+msgstr "Valstija"
+
+msgid "Postal code"
+msgstr "Pašto indeksas"
+
+msgid "Phone"
+msgstr "Telefonas"
+
+msgid "Date"
+msgstr "Data"
+
+msgid "Already Registered"
+msgstr "Jau registruota"
+
+msgid "Unregister"
+msgstr "Išsiregistruoti"
+
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+"Jūsų paskyros registracijos keitimui prašome įvesti informaciją žemiau."
+
+msgid "Please fill out the information below to register your new account."
+msgstr "Jūsų naujo abonento registravimui prašome įvesti informaciją žemiau."
+
+msgid "Register New XMPP Account"
+msgstr "Registruoti naują XMPP abonentą"
+
+msgid "Register"
+msgstr "Registruotis"
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "Pakeisti paskyros %s registraciją"
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr "Registruoti naują paskyrą %s"
+
+msgid "Change Registration"
+msgstr "Pakeisti registraciją"
+
+msgid "Error unregistering account"
+msgstr "Paskyros išregistravimo klaida"
+
+msgid "Account successfully unregistered"
+msgstr "Paskyra sėkmingai išregistruota"
+
+msgid "Initializing Stream"
+msgstr "Inicializuojamas duomenų srautas"
+
+msgid "Initializing SSL/TLS"
+msgstr "Inicializuojama SSL/TLS"
+
+msgid "Authenticating"
+msgstr "Nustatoma tapatybė"
+
+msgid "Re-initializing Stream"
+msgstr "Iš naujo inicializuojamas duomenų srautas"
+
+msgid "Server doesn't support blocking"
+msgstr "Serveris nepalaiko blokavimo"
+
+msgid "Not Authorized"
+msgstr "Prieiga nesuteikta"
+
+msgid "Mood"
+msgstr "Nuotaika"
+
+msgid "Now Listening"
+msgstr "Dabar klausosi"
+
+msgid "Both"
+msgstr "abipusė"
+
+msgid "From (To pending)"
+msgstr "patvirtinta Jūsų, laukiama bičiulio patvirtinimo"
+
+msgid "From"
+msgstr "Iš"
+
+msgid "To"
+msgstr "bičiulio patvirtinta"
+
+msgid "None (To pending)"
+msgstr "Jokia (laukiama patvirtinimo iš bičiulio)"
+
+msgid "None"
+msgstr "niekaip"
+
+msgid "Subscription"
+msgstr "Registracija"
+
+msgid "Mood Text"
+msgstr "Nuotaikos tekstas"
+
+msgid "Allow Buzz"
+msgstr "Leisti zyzimus"
+
+msgid "Tune Artist"
+msgstr "Dainos atlikėjas"
+
+msgid "Tune Title"
+msgstr "Dainos pavadinimas"
+
+msgid "Tune Album"
+msgstr "Dainos albumas"
+
+msgid "Tune Genre"
+msgstr "Dainos žanras"
+
+msgid "Tune Comment"
+msgstr "Dainos komentaras"
+
+msgid "Tune Track"
+msgstr "Dainos takelis"
+
+msgid "Tune Time"
+msgstr "Dainos laikas"
+
+msgid "Tune Year"
+msgstr "Dainos metai"
+
+msgid "Tune URL"
+msgstr "Dainos URL"
+
+msgid "Password Changed"
+msgstr "Slaptažodis pakeistas"
+
+msgid "Your password has been changed."
+msgstr "Jūsų slaptažodis pakeistas."
+
+msgid "Error changing password"
+msgstr "Slaptažodžio keitimo klaida"
+
+msgid "Change XMPP Password"
+msgstr "Pakeiskite XMPP slaptažodį"
+
+msgid "Please enter your new password"
+msgstr "Prašome įvesti Jūsų naują slaptažodį"
+
+msgid "Set User Info..."
+msgstr "Nustatyti vartotojo informaciją..."
+
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+msgid "Change Password..."
+msgstr "Pakeisti slaptažodį..."
+
+#. }
+msgid "Search for Users..."
+msgstr "Ieškoti vartotojų..."
+
+msgid "Bad Request"
+msgstr "Bloga užklausa"
+
+msgid "Conflict"
+msgstr "Konfliktas"
+
+msgid "Feature Not Implemented"
+msgstr "Funkcija neįgyvendinta"
+
+msgid "Forbidden"
+msgstr "Uždrausta"
+
+msgid "Gone"
+msgstr "Dingo"
+
+msgid "Internal Server Error"
+msgstr "Vidinė serverio klaida"
+
+msgid "Item Not Found"
+msgstr "Nerastas elementas"
+
+msgid "Malformed XMPP ID"
+msgstr "Neteisingai suformuotas XMPP ID"
+
+msgid "Not Acceptable"
+msgstr "Nepriimtina"
+
+msgid "Not Allowed"
+msgstr "Neleistina"
+
+msgid "Payment Required"
+msgstr "Reikalingas apmokėjimas"
+
+msgid "Recipient Unavailable"
+msgstr "Gavėjas neprieinamas"
+
+msgid "Registration Required"
+msgstr "Rekalinga registracija"
+
+msgid "Remote Server Not Found"
+msgstr "Nuotolinis serveris nerastas"
+
+msgid "Remote Server Timeout"
+msgstr "Nuotolinio serverio laukimo laikas baigėsi"
+
+msgid "Server Overloaded"
+msgstr "Serveris perkrautas"
+
+msgid "Service Unavailable"
+msgstr "Paslauga neteikiama"
+
+msgid "Subscription Required"
+msgstr "Reikalinga registracija"
+
+msgid "Unexpected Request"
+msgstr "Nelaukta užklausa"
+
+msgid "Authorization Aborted"
+msgstr "Prieigos suteikimas nutrauktas"
+
+msgid "Incorrect encoding in authorization"
+msgstr "Neteisinga koduotė prieigos suteikime"
+
+msgid "Invalid authzid"
+msgstr "Neteisingas prieigos suteikimo identifikatorius"
+
+msgid "Invalid Authorization Mechanism"
+msgstr "Neteisingas prieigos suteikimo mechanizmas"
+
+msgid "Authorization mechanism too weak"
+msgstr "Prieigos suteikimo mechanizmas per silpnas"
+
+msgid "Temporary Authentication Failure"
+msgstr "Laikina prieigos suteikimo nesekmė"
+
+msgid "Authentication Failure"
+msgstr "Prieigos suteikimo nesekmė"
+
+msgid "Bad Format"
+msgstr "Blogas formatas"
+
+msgid "Bad Namespace Prefix"
+msgstr "Blogas vardų erdvės priešdėlis"
+
+msgid "Resource Conflict"
+msgstr "Išteklių konfliktas"
+
+msgid "Connection Timeout"
+msgstr "Jungties laukimo laikas baigėsi"
+
+msgid "Host Gone"
+msgstr "Dingo mazgas"
+
+msgid "Host Unknown"
+msgstr "Nežinomas mazgas"
+
+msgid "Improper Addressing"
+msgstr "Neteisingas adresavimas"
+
+msgid "Invalid ID"
+msgstr "Neteisingas ID"
+
+msgid "Invalid Namespace"
+msgstr "Neteisinga vardų erdvė"
+
+msgid "Invalid XML"
+msgstr "Neteisingas XML"
+
+msgid "Non-matching Hosts"
+msgstr "Neatitinkantys mazgai"
+
+msgid "Policy Violation"
+msgstr "Taisyklių pažeidimas"
+
+msgid "Remote Connection Failed"
+msgstr "Nuotolinė jungtis nepavyko"
+
+msgid "Resource Constraint"
+msgstr "Išteklių apribojimas"
+
+msgid "Restricted XML"
+msgstr "Apribotas XML"
+
+msgid "See Other Host"
+msgstr "Aplankykite kitą mazgą"
+
+msgid "System Shutdown"
+msgstr "Sistemos sustabdymas"
+
+msgid "Undefined Condition"
+msgstr "Neapibrėžta salyga"
+
+msgid "Unsupported Encoding"
+msgstr "Nepalaikoma koduotė"
+
+msgid "Unsupported Stanza Type"
+msgstr "Nepalaikomas strofos tipas"
+
+msgid "Unsupported Version"
+msgstr "Nepalaikoma versija"
+
+msgid "XML Not Well Formed"
+msgstr "Neteisingai suformuotas XML"
+
+msgid "Stream Error"
+msgstr "Duomenų srauto klaida"
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "Negalima uždrausti vartotojui %s prisijungti prie kanalo"
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr "Nežinomas statusas: „%s“"
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "Vartotojui %s negalima priskirti statuso „%s“"
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "Nežinomas vaidmuo: „%s“"
+
+#  Data is assumed to be the destination sn


+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "Nepavyko nustatyti vaidmens „%s“ vartotojui: %s"
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "Negalima išspirti vartotojo %s"
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "Nepavyko skimbtelėti naudotojui %s"
+
+#, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Negalima pazyzti, nes nieko nežinoma apie naudotoją %s."
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Negalima pazyzti, nes %s gali būti neprisijungęs/-usi."
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr "Nepavyko pazyzti, nes %s to nepalaiko arba nenori gauti zyzimų."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Zyziama %s..."
+
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+msgid "Buzz"
+msgstr "Zvimbt"
+
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s jums pazyzė!"
+
+#, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Nepavyko pradėti medijos seanso su %s: neteisingas JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Nepavyko pradėti medijos seanso su %s, nes jis neprisijungęs"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Nepavyko pradėti medijos seanso su %s: nėra registracijos prie šio vartotojo "
+"buvimo informacijos"
+
+msgid "Media Initiation Failed"
+msgstr "Medijos seanso klaida"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Parinkite %s išteklių, su kuriuo norite pradėti medijos seansą."
+
+msgid "Select a Resource"
+msgstr "Parinkite išteklių"
+
+msgid "Initiate Media"
+msgstr "Pradėti medijos seansą"
+
+msgid "config:  Configure a chat room."
+msgstr "config:  konfigūruoti pokalbių kambarį."
+
+msgid "configure:  Configure a chat room."
+msgstr "configure:  konfigūruoti pokalbių kambarį."
+
+msgid "part [room]:  Leave the room."
+msgstr "part [kambarys]:  palikti kambarį."
+
+msgid "register:  Register with a chat room."
+msgstr "register:  prisiregistruoti pokalbių kambaryje."
+
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [nauja tema]:  žiūrėti arba pakeisti temą."
+
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr ""
+"ban &lt;vartotojas&gt; [priežastis]:  uždrausti vartotojui ateiti į kambarį."
+
+msgid ""
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
+msgstr ""
+"affilliate &lt;owner|admin|member|outcast|none&gt; [vardas1] [vardas2] ...:  "
+"gauti vartotojus su nurodyta naryste arba nustatyti naudotojų narystę "
+"kambaryje."
+
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
+msgstr ""
+"role &lt;moderator|participant|visitor|none&gt; [vardas1] [vardas2] ...: "
+"Gauti naudotojus su nurodytu vaidmeniu arba nustatyti vartotojų vaidmenį "
+"kambaryje."
+
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr "invite &lt;vartotojas&gt; [žinutė]:  pakviesti vartotoją į kambarį."
+
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr ""
+"join: &lt;kambarys&gt; [slaptažodis]:  prisijungti prie pokalbių kambario "
+"šiame serveryje."
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;vartotojas&gt; [priežastis]:  išspirti vartotoją iš kambario."
+
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;vartotojas&gt; &lt;žinutė&gt;:  nusiųsti asmeninę žinutę kitam "
+"vartotojui."
+
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+"ping &lt;jid&gt;:       pasignalizuoti naudotojui, komponentui arba "
+"serveriui."
+
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz:  pazyzti kontaktui, kad atkreipti jo dėmesį"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP protokolo papildinys"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+msgid "Domain"
+msgstr "Sritis"
+
+msgid "Require SSL/TLS"
+msgstr "Reikalauti SSL/TLS"
+
+msgid "Force old (port 5223) SSL"
+msgstr "Priverstinai naudoti seną 5223 prievado SSL"
+
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr "Leisti tapatybės nustatymą grynu tekstu nekoduojamame duomenų sraute"
+
+msgid "Connect port"
+msgstr "Jungties prievadas"
+
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
+#. Account options
+msgid "Connect server"
+msgstr "Prisijungimo serveris"
+
+msgid "File transfer proxies"
+msgstr "Failų perdavimo tarpininkaujantys serveriai"
+
+msgid "BOSH URL"
+msgstr "BOSH URL adresas"
+
+#. this should probably be part of global smiley theme settings later on,
+#. shared with MSN
+msgid "Show Custom Smileys"
+msgstr "Rodyti nestandartines šypsenėles"
+
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s paliko pokalbį."
+
+#, c-format
+msgid "Message from %s"
+msgstr "Žinutė nuo %s"
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s pakeitė temą į: %s"
+
+#, c-format
+msgid "The topic is: %s"
+msgstr "Tema: %s"
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "Žinutės pristatymas gavėjui %s nepavyko: %s"
+
+msgid "XMPP Message Error"
+msgstr "XMPP pranešimo klaida"
+
+#, c-format
+msgid "(Code %s)"
+msgstr "(Kodas %s)"
+
+msgid "XML Parse error"
+msgstr "XML sintaksinės analizės klaida"
+
+msgid "Unknown Error in presence"
+msgstr "Nežinoma būsenos klaida"
+
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Prisijungimo prie pokalbio %s klaida"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Klaida pokalbyje %s"
+
+msgid "Create New Room"
+msgstr "Sukurti naują kambarį"
+
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Jūs kuriate naują kambarį.  Ar norėtumėte jį sukonfigūruoti, ar priimti "
+"numatytąsias nuostatas?"
+
+msgid "_Configure Room"
+msgstr "_Konfigūruoti kambarį"
+
+msgid "_Accept Defaults"
+msgstr "_Priimti numatytąsias nuostatas"
+
+msgid "No reason"
+msgstr "Priežastis nenurodyta"
+
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Tave išspyrė (%s)"
+
+#, c-format
+msgid "Kicked (%s)"
+msgstr "Išspyrė (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+"Įvyko klaida perdavime, naudojančiame baitų srautą pagrindiniame XMPP sraute "
+"(„in-band“)\n"
+
+msgid "Transfer was closed."
+msgstr "Perdavimas buvo uždarytas."
+
+msgid "Failed to open the file"
+msgstr "Nepavyko atverti failo"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Nepavyko atidaryti baitų srauto pagrindiniame XMPP sraute („in-band“)"
+
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr ""
+"Negalima siųsti failo vartotojui %s, nes jo kliento programa nepalaiko failų "
+"perdavimo"
+
+msgid "File Send Failed"
+msgstr "Failo siuntimas nepavyko"
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Negalima nusiųsti failo vartotojui %s, nes neteisingas JID"
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "Negalima nusiųsti failo vartotojui %s, nes jis neprisijungęs"
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"Negalima siųsti failo vartotojui %s, nes jis neįtrauktas į bičiulių sąrašą"
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr "Parinkite %s išteklių, į kurį norite nusiųsti failą"
+
+msgid "Edit User Mood"
+msgstr "Nustatyti vartotojo nuotaiką"
+
+msgid "Please select your mood from the list."
+msgstr "Pasirinkite savo nuotaiką iš sąrašo."
+
+msgid "Set"
+msgstr "Nustatyti"
+
+msgid "Set Mood..."
+msgstr "Nustatyti nuotaiką..."
+
+msgid "Set User Nickname"
+msgstr "Nustatyti naudotojo vardą"
+
+msgid "Please specify a new nickname for you."
+msgstr "Prašau įvesti naują savo vardą."
+
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"Ši informacija matoma visiems naudotojams jūsų kontaktų sąraše, todėl "
+"pasirinkite ką nors tinkamo."
+
+msgid "Set Nickname..."
+msgstr "Nustatyti vardą..."
+
+msgid "Actions"
+msgstr "Veiksmai"
+
+msgid "Select an action"
+msgstr "Pasirinkite veiksmą"
+
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Negalima pridėti \"%s\"."
+
+msgid "Buddy Add error"
+msgstr "Bičiulio pridėjimo klaida"
+
+msgid "The username specified does not exist."
+msgstr "Nurodyto naudotojo vardo nėra."
+
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Bičiulių sąrašo suvienodinimo klaida vartotojui %s (%s)"
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"Vietiniame sąraše bičiulis %s yra \"%s\" grupėje, bet serverio sąraše jo "
+"nėra. Ar norite įtraukti šį bičiulį į serverio sąrašą?"
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"Bičiulis %s yra vietiniame sąraše, tačiau jo nėra serverio sąraše.  Ar "
+"norite įtraukti šį bičiulį į serverio sąrašą?"
+
+#, c-format
+msgid "Unable to parse message"
+msgstr "Negalima išanalizuoti pranešimo"
+
+#, c-format
+msgid "Syntax Error (probably a client bug)"
+msgstr "Sintaksės klaida (greičiausiai Pidgin riktas)"
+
+#, c-format
+msgid "Invalid email address"
+msgstr "Neteisingas el. pašto adresas"
+
+#, c-format
+msgid "User does not exist"
+msgstr "Vartotojas neegzistuoja"
+
+#, c-format
+msgid "Fully qualified domain name missing"
+msgstr "Trūksta viso srities vardo"
+
+#, c-format
+msgid "Already logged in"
+msgstr "Jau prisijungęs"
+
+#, c-format
+msgid "Invalid username"
+msgstr "Neteisingas vardas"
+
+#, c-format
+msgid "Invalid friendly name"
+msgstr "Neteisingas patogusis vardas"
+
+#, c-format
+msgid "List full"
+msgstr "Sąrašas pilnas"
+
+#, c-format
+msgid "Already there"
+msgstr "Jau yra ten"
+
+#, c-format
+msgid "Not on list"
+msgstr "Sąraše nėra"
+
+#, c-format
+msgid "User is offline"
+msgstr "Vartotojas atsijungęs"
+
+#, c-format
+msgid "Already in the mode"
+msgstr "Jau yra būsenoje"
+
+#, c-format
+msgid "Already in opposite list"
+msgstr "Jau yra priešingame sąraše"
+
+#, c-format
+msgid "Too many groups"
+msgstr "Per daug grupių"
+
+#, c-format
+msgid "Invalid group"
+msgstr "Neteisinga grupė"
+
+#, c-format
+msgid "User not in group"
+msgstr "Vartotojo nėra grupėje"
+
+#, c-format
+msgid "Group name too long"
+msgstr "Grupės pavadinimas per ilgas"
+
+#, c-format
+msgid "Cannot remove group zero"
+msgstr "Negalima pašalinti nulinės grupės"
+
+#, c-format
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "Bandyta įtraukti vartotoją į neegzistuojančią grupę"
+
+#, c-format
+msgid "Switchboard failed"
+msgstr "Komutatoriaus klaida"
+
+#, c-format
+msgid "Notify transfer failed"
+msgstr "Nepavyko perduoti informavimo"
+
+#, c-format
+msgid "Required fields missing"
+msgstr "Trūksta reikalingų laukų"
+
+#, c-format
+msgid "Too many hits to a FND"
+msgstr "Per daug pataikymų į FND"
+
+#, c-format
+msgid "Not logged in"
+msgstr "Neprisijungęs"
+
+#, c-format
+msgid "Service temporarily unavailable"
+msgstr "Tarnyba laikinai neprieinama"
+
+#, c-format
+msgid "Database server error"
+msgstr "Duomenų bazės serverio klaida"
+
+#, c-format
+msgid "Command disabled"
+msgstr "Komanda išjungta"
+
+#, c-format
+msgid "File operation error"
+msgstr "Failo operacijos klaida"
+
+#, c-format
+msgid "Memory allocation error"
+msgstr "Atminties paskyrimo klaida"
+
+#, c-format
+msgid "Wrong CHL value sent to server"
+msgstr "Serveriui nusiųsta bloga CHL reikšmė"
+
+#, c-format
+msgid "Server busy"
+msgstr "Serveris užimtas"
+
+#, c-format
+msgid "Server unavailable"
+msgstr "Serveris neprieinamas"
+
+# Kaip išversti „peer“?


+#, c-format
+msgid "Peer notification server down"
+msgstr "Kitų vartotojų informavimo serveris neprieinamas"
+
+#, c-format
+msgid "Database connect error"
+msgstr "Prisijungimo prie duomenų bazės klaida"
+
+#, c-format
+msgid "Server is going down (abandon ship)"
+msgstr "Serveris išjungiamas (palikite laivą)"
+
+#, c-format
+msgid "Error creating connection"
+msgstr "Jungties kūrimo klaida"
+
+#, c-format
+msgid "CVR parameters are either unknown or not allowed"
+msgstr "CVR parametrai yra nežinomi arba neleistini"
+
+#, c-format
+msgid "Unable to write"
+msgstr "Negalima rašyti"
+
+#, c-format
+msgid "Session overload"
+msgstr "Seanso perkrova"
+
+#, c-format
+msgid "User is too active"
+msgstr "Vartotojas yra per daug aktyvus"
+
+#, c-format
+msgid "Too many sessions"
+msgstr "Per daug seansų"
+
+#, c-format
+msgid "Passport not verified"
+msgstr "Microsoft .NET pasas nepatikrintas"
+
+#, c-format
+msgid "Bad friend file"
+msgstr "Blogas draugų failas"
+
+#, c-format
+msgid "Not expected"
+msgstr "Netikėta"
+
+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "Patogusis vardas keičiasi per dažnai"
+
+#, c-format
+msgid "Server too busy"
+msgstr "Serveris per daug užimtas"
+
+#, c-format
+msgid "Authentication failed"
+msgstr "Nepavyko nustatyti tapatybę"
+
+#, c-format
+msgid "Not allowed when offline"
+msgstr "Atsijungus neleidžiama"
+
+#, c-format
+msgid "Not accepting new users"
+msgstr "Nauji vartotojai nepriimami"
+
+#, c-format
+msgid "Kids Passport without parental consent"
+msgstr "Vaikiškas Microsoft .NET pasas be tėvų sutikimo"
+
+#, c-format
+msgid "Passport account not yet verified"
+msgstr "Microsoft .NET paso paskyra dar nepatikrinta"
+
+msgid "Passport account suspended"
+msgstr "Microsoft .NET paso paskyra suspenduota"
+
+#, c-format
+msgid "Bad ticket"
+msgstr "Blogas bilietas"
+
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr "Nežinomas klaidos kodas %d"
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN klaida: %s\n"
+
+msgid "Other Contacts"
+msgstr "Kiti kontaktai"
+
+msgid "Non-IM Contacts"
+msgstr "Kontaktai ne iš greitųjų žinučių tinklų"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s atsiuntė mirksniuką. <a href='msn-wink://%s'>Paspauskite čia, kad "
+"pažiūrėtumėte</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s atsiuntė mirksniuką, bet nepavyko jo įrašyti"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s atsiuntė garso įrašą. <a href='audio://%s'>Paspauskite čia, kad "
+"pasiklausytumėte</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s atsiuntė vaizdo įrašą, bet jo išsaugoti nepavyko"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s atsiuntė kvietimą pokalbiui su vaizdu, kas dar nėra palaikoma."
+
+msgid "Nudge"
+msgstr "Bakstelėjimas"
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s bakstelėjo jums!"
+
+#, c-format
+msgid "Nudging %s..."
+msgstr "Bakstelėju %s..."
+
+msgid "Email Address..."
+msgstr "El. pašto adresas..."
+
+msgid "Your new MSN friendly name is too long."
+msgstr "Jūsų naujas patogusis MSN vardas yra per ilgas"
+
+msgid "Set your friendly name."
+msgstr "Nustatyti Jūsų patogųjį vardą."
+
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "Tai yra vardas, kuriuo Jus matys kiti MSN bičiuliai."
+
+msgid "Set your home phone number."
+msgstr "Nustatyti Jūsų namų telefono numerį."
+
+msgid "Set your work phone number."
+msgstr "Nustatyti Jūsų darbo telefono numerį."
+
+msgid "Set your mobile phone number."
+msgstr "Nustatyti Jūsų mobilaus telefono numerį."
+
+msgid "Allow MSN Mobile pages?"
+msgstr "Ar leisti mobiliąsias MSN žinutes?"
+
+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 ""
+"Ar Jūs norite leisti ar neleisti asmenims Jūsų bičiulių sąraše siųsti Jums "
+"mobiliąsias MSN žinutes į Jūsų mobilųjį telefoną ar kitą mobilųjį įrenginį?"
+
+msgid "Allow"
+msgstr "Leisti"
+
+msgid "Disallow"
+msgstr "Neleisti"
+
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "Blokuotas tekstas iš %s"
+
+msgid "No text is blocked for this account."
+msgstr "Šiai paskyrai blokuoto teksto nėra."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"MSN serveriai šiuo metu blokuojas šias reguliariuosius reiškinius:<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "Ši paskyra neturi aktyvaus el. pašto adreso."
+
+msgid "Send a mobile message."
+msgstr "Nusiųsti mobiliąją žinutę"
+
+msgid "Page"
+msgstr "Siųsti"
+
+msgid "Playing a game"
+msgstr "Žaidžia žaidimą"
+
+msgid "Working"
+msgstr "Dirba"
+
+msgid "Has you"
+msgstr "Turi Jus"
+
+msgid "Home Phone Number"
+msgstr "Namų telefono numeris"
+
+msgid "Work Phone Number"
+msgstr "Darbo telefono numeris"
+
+msgid "Mobile Phone Number"
+msgstr "Mobilaus telefono numeris"
+
+msgid "Be Right Back"
+msgstr "tuoj pat grįš"
+
+msgid "Busy"
+msgstr "užimtas"
+
+msgid "On the Phone"
+msgstr "kalba telefonu"
+
+msgid "Out to Lunch"
+msgstr "išėjęs papietauti"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+msgid "Artist"
+msgstr "Dailininkas"
+
+msgid "Album"
+msgstr "Albumas"
+
+msgid "Game Title"
+msgstr "Žaidimo pavadinimas"
+
+msgid "Office Title"
+msgstr "Ofiso pavadinimas"
+
+msgid "Set Friendly Name..."
+msgstr "Nustatyti patogųjį vardą..."
+
+msgid "Set Home Phone Number..."
+msgstr "Nustatyti namų telefono numerį..."
+
+msgid "Set Work Phone Number..."
+msgstr "Nustatyti darbo telefono numerį..."
+
+msgid "Set Mobile Phone Number..."
+msgstr "Nustatyti mobilaus telefono numerį..."
+
+msgid "Enable/Disable Mobile Devices..."
+msgstr "Leisti arba neleisti mobiliuosius įrenginius..."
+
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "Leisti arba neleisti mobiliąsias žinutes..."
+
+msgid "View Blocked Text..."
+msgstr "Žiūrėti užblokuotą tekstą..."
+
+msgid "Open Hotmail Inbox"
+msgstr "Atidaryti Hotmail pašto dėžutę"
+
+msgid "Send to Mobile"
+msgstr "Siųsti į mobilų įrenginį"
+
+msgid "Initiate _Chat"
+msgstr "_Pradėti pokalbį"
+
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+"MSN protokolui SSL palaikymas yra būtinas.  Prašome įdiegti palaikomą SSL "
+"biblioteką."
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Nepavyko pridėti bičiulio %s, nes neteisingas naudotojo vardas.  Jis turi "
+"būti galiojantis el. pašto adresas."
+
+msgid "Unable to Add"
+msgstr "Negalima pridėti"
+
+msgid "Authorization Request Message:"
+msgstr "Prieigos teisės prašymo žinutė:"
+
+msgid "Please authorize me!"
+msgstr "Prašau suteikti man prieigos teisę!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Gerai"
+
+msgid "Error retrieving profile"
+msgstr "Profilio gavimo klaida"
+
+msgid "General"
+msgstr "Bendros parinktys"
+
+msgid "Age"
+msgstr "Amžius"
+
+msgid "Occupation"
+msgstr "Profesija"
+
+msgid "Location"
+msgstr "Vietovė"
+
+msgid "Hobbies and Interests"
+msgstr "Hobi ir interesai"
+
+msgid "A Little About Me"
+msgstr "Truputį apie mane"
+
+msgid "Social"
+msgstr "Draugijai"
+
+msgid "Marital Status"
+msgstr "Šeimyninė padėtis"
+
+msgid "Interests"
+msgstr "Pomėgiai"
+
+msgid "Pets"
+msgstr "Naminiai gyvūnai"
+
+msgid "Hometown"
+msgstr "Gimtasis miestas"
+
+msgid "Places Lived"
+msgstr "Kur gyveno"
+
+msgid "Fashion"
+msgstr "Mada"
+
+msgid "Humor"
+msgstr "Humoras"
+
+msgid "Music"
+msgstr "Muzika"
+
+msgid "Favorite Quote"
+msgstr "Mėgstamiausia citata"
+
+msgid "Contact Info"
+msgstr "Kontaktinė informacija"
+
+msgid "Personal"
+msgstr "Asmeninė"
+
+msgid "Significant Other"
+msgstr "Antra pusė"
+
+msgid "Home Phone"
+msgstr "Namų telefonas"
+
+msgid "Home Phone 2"
+msgstr "Antras namų telefonas"
+
+msgid "Home Address"
+msgstr "Namų adresas"
+
+# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???


+msgid "Personal Mobile"
+msgstr "Asmeninis mobilusis telefonas"
+
+msgid "Home Fax"
+msgstr "Namų faksas"
+
+# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???


+msgid "Personal Email"
+msgstr "Asmeninis el. pašto adresas"
+
+# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???


+msgid "Personal IM"
+msgstr "Asmeninis skubiųjų žinučių kontaktas"
+
+msgid "Anniversary"
+msgstr "Sukaktis"
+
+#. Business
+msgid "Work"
+msgstr "Darbas"
+
+msgid "Job Title"
+msgstr "Pareigos"
+
+msgid "Company"
+msgstr "Kompanija"
+
+msgid "Department"
+msgstr "Skyrius"
+
+msgid "Profession"
+msgstr "Profesija"
+
+msgid "Work Phone"
+msgstr "Darbo telefonas"
+
+msgid "Work Phone 2"
+msgstr "Antras darbo telefonas"
+
+msgid "Work Address"
+msgstr "Darbo adresas"
+
+msgid "Work Mobile"
+msgstr "Darbo mobilusis telefonas"
+
+msgid "Work Pager"
+msgstr "Darbo pranešimų gaviklis"
+
+msgid "Work Fax"
+msgstr "Darbo faksas"
+
+msgid "Work Email"
+msgstr "Darbo el. pašto adresas"
+
+msgid "Work IM"
+msgstr "Darbo skubiųjų žinučių kontaktas"
+
+msgid "Start Date"
+msgstr "Pradžios data"
+
+msgid "Favorite Things"
+msgstr "Mėgstu"
+
+msgid "Last Updated"
+msgstr "Paskutinį kartą atnaujinta"
+
+msgid "Homepage"
+msgstr "Namų puslapis"
+
+msgid "The user has not created a public profile."
+msgstr "Šis vartotojas nesukūrė viešo profilio."
+
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"MSN nerado vartotojo profilio. Tai reiškia, kad arba tokio vartotojo nėra, "
+"arba kad vartotojas yra, bet neturi sukūręs viešo profilio."
+
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+"Nepavyko rasti jokios informacijos vartotojo profilyje. Greičiausiai toks "
+"vartotojas neegzistuoja."
+
+msgid "View web profile"
+msgstr "Žiūrėti profilį žiniatinklyje"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *< summary
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Windows Live Messenger protokolo papildinys"
+
+msgid "Use HTTP Method"
+msgstr "Naudoti HTTP metodą"
+
+msgid "HTTP Method Server"
+msgstr "HTTP metodo serveris"
+
+msgid "Show custom smileys"
+msgstr "Rodyti nestandartines šypsenėles"
+
+msgid "nudge: nudge a user to get their attention"
+msgstr "nudge: bakstelėti vartotojui, kad atkreipti jo dėmesį"
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Nepavyko prisijungti prie Windows Live ID tapatybės nustatymo serverio"
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live ID tapatybės nustatymas: neteisingas atsakas"
+
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s nori bakstelėjo Jums!"
+
+#, c-format
+msgid "Unknown error (%d): %s"
+msgstr "Nežinoma klaida (%d): %s"
+
+msgid "Unable to add user"
+msgstr "Nepavyko pridėti vartotojo"
+
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Nežinoma klaida (%d)"
+
+msgid "The following users are missing from your addressbook"
+msgstr "Tolesnių vartotojų nėra Jūsų adresų knygoje"
+
+msgid "Mobile message was not sent because it was too long."
+msgstr "Mobilioji žinutė nebuvo išsiųsta, nes ji per ilga."
+
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
+"MSN serveris bus išjungtas priežiūrai už %d minutės.  Tada Jūs būsite "
+"automatiškai atjungtas.  Prašome pabaigti visus vykstančius pokalbius.\n"
+"\n"
+"Kai serverio priežiūra bus baigta, Jūs galėsite sėkmingai prisijungti."
+msgstr[1] ""
+"MSN serveris bus išjungtas priežiūrai už %d minučių.  Tada Jūs būsite "
+"automatiškai atjungtas.  Prašome pabaigti visus vykstančius pokalbius.\n"
+"\n"
+"Kai serverio priežiūra bus baigta, Jūs galėsite sėkmingai prisijungti."
+msgstr[2] ""
+"MSN serveris bus išjungtas priežiūrai už %d minučių.  Tada Jūs būsite "
+"automatiškai atjungtas.  Prašome pabaigti visus vykstančius pokalbius.\n"
+"\n"
+"Kai serverio priežiūra bus baigta, Jūs galėsite sėkmingai prisijungti."
+
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"Žinutė nebuvo nusiųsta, nes sistema neprieinama.  Paprastai taip atsitinka, "
+"kai naudotojas yra užblokuotas arba iš viso neegzistuoja."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "Žinutė nebuvo išsiųsta nes žinutės yra išsiuntinėjamos per greitai."
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "Žinutė nebuvo išsiųsta, nes įvyko nežinoma užkodavimo klaida."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "Žinutė nebuvo išsiųsta, nes įvyko nežinoma klaida."
+
+msgid "Writing error"
+msgstr "Rašymo klaida"
+
+msgid "Reading error"
+msgstr "Skaitymo klaida"
+
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
+"%s"
+msgstr ""
+"Jungties klaida su severiu %s:\n"
+"%s"
+
+msgid "Our protocol is not supported by the server"
+msgstr "Mūsų protokolo nepalaiko serveris"
+
+msgid "Error parsing HTTP"
+msgstr "HTTP sintaksinės analizės klaida"
+
+msgid "You have signed on from another location"
+msgstr "Jūs prisijungėte iš kitur"
+
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr ""
+"MSN serveriai yra laikinai neprieinami. Prašome palaukti ir pabandyti iš "
+"naujo."
+
+msgid "The MSN servers are going down temporarily"
+msgstr "MSN serveriai yra laikinai išjungiami"
+
+#  Data is assumed to be the destination sn


+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "Negalima patikrinti tapatybės: %s"
+
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"Jūsų MSN bičiulių sąrašas yra laikinai neprieinamas. Prašome palaukti ir "
+"pabandyti iš naujo."
+
+msgid "Handshaking"
+msgstr "Pasisveikinimas"
+
+msgid "Transferring"
+msgstr "Perdavimas"
+
+msgid "Starting authentication"
+msgstr "Pradedamas tapatybės nustatymas"
+
+msgid "Getting cookie"
+msgstr "Gaunamas slapukas"
+
+msgid "Sending cookie"
+msgstr "Siunčiamas slapukas"
+
+msgid "Retrieving buddy list"
+msgstr "Gaunamas bičiulių sąrašas"
+
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s atsiuntė kvietimą internetinės vaizdo kameros pokalbiui, ko Pidgin dar "
+"nepalaiko."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s atsiuntė kvietimą internetinės vaizdo kameros pokalbiui, ko Pidgin dar "
+"nepalaiko."
+
+msgid "Away From Computer"
+msgstr "Pasitraukęs nuo kompiuterio"
+
+msgid "On The Phone"
+msgstr "Kalba telefonu"
+
+msgid "Out To Lunch"
+msgstr "Išėjęs papietauti"
+
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr "Žinutė galėjo būti neišsiųsta, nes baigėsi laukimo laikas:"
+
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr "Žinutės negalima išsiųsti esant nematomu:"
+
+msgid "Message could not be sent because the user is offline:"
+msgstr "Žinutė neišsiųsta, nes vartotojas atsijungęs:"
+
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "Žinutė neišsiųsta, nes įvyko jungties klaida:"
+
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "Žinutė neišsiųsta, nes bandyta išsiųsti per greitai:"
+
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"Žinutės išsiųsti nepavyko, nes nepavyko sukurti seanso su serveriu.  "
+"Greičiausiai tai serverio problema, pabandykite vėl po kelių minučių:"
+
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr "Žinutė neišsiųsta, nes įvyko komutatoriaus klaida:"
+
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr "Žinutė neišsiųsta, nes įvyko nežinoma klaida:"
+
+msgid "Delete Buddy from Address Book?"
+msgstr "Ar pašalinti bičiulį iš adresų knygos?"
+
+msgid "Do you want to delete this buddy from your address book as well?"
+msgstr "Ar norite pašalinti šį bičiulį taip pat ir iš adresų knygos?"
+
+msgid "The username specified is invalid."
+msgstr "Nurodytas neteisingas vardas."
+
+msgid "This Hotmail account may not be active."
+msgstr "Ši Hotmail paskyra gali būti neaktyvi."
+
+msgid "Profile URL"
+msgstr "Profilio URL"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "MSN Protocol Plugin"
+msgstr "MSN protokolo papildinys"
+
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s nėra teisinga grupė"
+
+msgid "Unknown error."
+msgstr "Nežinoma klaida."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s. Vartotojas %s (%s)."
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Negalima pridėti vartotojo paskyroje %s (%s)"
+
+#  Data is assumed to be the destination sn


+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Negalima blokuoti vartotojo paskyroje %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Negalima leisti vartotojo paskyroje %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Negalima pridėti %s, nes Jūsų bičiulių sąrašas pilnas."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nėra teisinga Microsoft .NET paso paskyra"
+
+msgid "Service Temporarily Unavailable."
+msgstr "Tarnyba laikinai neprieinama"
+
+msgid "Unable to rename group"
+msgstr "Negalima pervadinti grupės"
+
+msgid "Unable to delete group"
+msgstr "Negalima pašalinti grupės"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Vartotojas %s įtraukė Jus į savo bičiulių sąrašo."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Vartotojas %s pašalino Jus iš savo bičiulių sąrašo."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "Naudotojas nerastas: %s"
+
+msgid "User lookup"
+msgstr "Naudotojo paieška"
+
+msgid "Reading challenge"
+msgstr "Skaitomas serverio iššūkis"
+
+msgid "Unexpected challenge length from server"
+msgstr "Neteisingas serverio iššūkio ilgis"
+
+msgid "Logging in"
+msgstr "Prisijungiama"
+
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM – nenustatytas naudotojo vardas"
+
+msgid "You appear to have no MySpace username."
+msgstr "Atrodo, kad neturite MySpace naudojo vardo."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Ar norite dabar jį nustatyti? (Pastaba: jis negalės būti keičiamas!)"
+
+msgid "Lost connection with server"
+msgstr "Prarastas prisijungimas prie serverio"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
+msgid "New mail messages"
+msgstr "Nauji laiškai"
+
+msgid "New blog comments"
+msgstr "Nauji tinklaraščio komentarai"
+
+msgid "New profile comments"
+msgstr "Nauji profilio komentarai"
+
+msgid "New friend requests!"
+msgstr "Nauji pasiūlymai draugauti!"
+
+msgid "New picture comments"
+msgstr "Nauji nuotraukų komentarai"
+
+msgid "MySpace"
+msgstr "MySpace"
+
+msgid "IM Friends"
+msgstr "IM draugai"
+
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d bičiulis buvo pridėtas ar atnaujintas iš serverio (įskaitant ir "
+"bičiulius, jau esančius serverio sąraše)"
+msgstr[1] ""
+"%d bičiuliai buvo pridėti ar atnaujinti iš serverio (įskaitant ir bičiulius, "
+"jau esančius serverio sąraše)"
+msgstr[2] ""
+"%d bičiulių buvo pridėta ar atnaujinta iš serverio (įskaitant ir bičiulius, "
+"jau esančius serverio sąraše)"
+
+msgid "Add contacts from server"
+msgstr "Pridėti kontaktus iš serverio"
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Protokolo klaida, kodas %d: %s"
+
+#, c-format
+msgid ""
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr ""
+"%s Jūsų slaptažodis yra %zu simbolių, daugiau negu didžiausias leidžiamas "
+"ilgis %d.  Sutrumpinkite savo slaptažodį adresu http://profileedit.myspace."
+"com/index.cfm?fuseaction=accountSettings.changePassword ir pabandykite iš "
+"naujo."
+
+msgid "Incorrect username or password"
+msgstr "Neteisingas naudotojo vardas ar slaptažodis"
+
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM klaida"
+
+msgid "Invalid input condition"
+msgstr "Neteisinga įvesties sąlyga"
+
+msgid "Failed to add buddy"
+msgstr "Nepavyko pridėti bičiulio"
+
+msgid "'addbuddy' command failed."
+msgstr "Komanda „addbuddy“ nepavyko."
+
+msgid "persist command failed"
+msgstr "Komanda „persist“ nepavyko."
+
+msgid "Failed to remove buddy"
+msgstr "Nepavyko pašalinti bičiulio"
+
+msgid "'delbuddy' command failed"
+msgstr "Komanda „delbuddy“ nepavyko"
+
+msgid "blocklist command failed"
+msgstr "Komanda „blocklist“ nepavyko"
+
+msgid "Missing Cipher"
+msgstr "Šifras nerastas"
+
+msgid "The RC4 cipher could not be found"
+msgstr "RC4 šifras nerastas"
+
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Atnaujinkite libpurple į versiją su RC4 palaikymu (>= 2.0.1).  MySpaceIM "
+"papildinys nebus įkeltas."
+
+msgid "Add friends from MySpace.com"
+msgstr "Pridėti draugus iš MySpace.com"
+
+msgid "Importing friends failed"
+msgstr "Nepavyko importuoti draugų"
+
+#. TODO: find out how
+msgid "Find people..."
+msgstr "Ieškoti žmonių..."
+
+msgid "Change IM name..."
+msgstr "Pakeisti vardą skubiosioms žinutėms..."
+
+msgid "myim URL handler"
+msgstr "myim URL doroklė"
+
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "Nerasta tinkama MySpaceIM paskyra šio myim URL atidarymui."
+
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Įjunkite tinkamą MySpaceIM paskyrą ir bandykite iš naujo."
+
+msgid "Show display name in status text"
+msgstr "Rodyti vardą būsenos tekste"
+
+msgid "Show headline in status text"
+msgstr "Rodyti antraštę būsenos tekste"
+
+msgid "Send emoticons"
+msgstr "Siųsti jaustukus"
+
+msgid "Screen resolution (dots per inch)"
+msgstr "Ekrano skiriamoji geba (taškais colyje)"
+
+msgid "Base font size (points)"
+msgstr "Numatytojo šrifto dydis (punktais)"
+
+msgid "User"
+msgstr "Vartotojas"
+
+msgid "Headline"
+msgstr "Antraštė"
+
+msgid "Song"
+msgstr "Daina"
+
+msgid "Total Friends"
+msgstr "Iš viso draugų"
+
+msgid "Client Version"
+msgstr "Kliento programos versija"
+
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Vardo nustatymo metu įvyko klaida.  Pabandykite iš naujo, arba aplankykite "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username ir "
+"nustatykite vardą ten."
+
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM – naudotojo vardas laisvas"
+
+msgid "This username is available. Would you like to set it?"
+msgstr "Šis naudotojo vardas laisvas.  Ar norite juo pasivadinti?"
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "KARTĄ NUSTATYTAS, JIS NEGALI BŪTI PAKEISTAS!"
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM – nustatykite naudotojo vardą"
+
+msgid "This username is unavailable."
+msgstr "Šis naudotojo vardas užimtas."
+
+msgid "Please try another username:"
+msgstr "Pabandykite kitokį naudotojo vardą:"
+
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Nenustatytas naudotojo vardas"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Įveskite naudotojo vardą, kad patikrintumėte, ar jis laisvas:"
+
+#. TODO: icons for each zap
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+msgid "Zap"
+msgstr "Pykšt"
+
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s pykštelėjo jums!"
+
+#, c-format
+msgid "Zapping %s..."
+msgstr "Pykšteliu į %s..."
+
+#. Whack means "to hit or strike someone with a sharp blow"
+msgid "Whack"
+msgstr "Bumpt"
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s bumptelėjo jums!"
+
+#, c-format
+msgid "Whacking %s..."
+msgstr "Bumpteliu į %s..."
+
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+msgid "Torch"
+msgstr "Padegimas"
+
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s jus padegė!"
+
+#, c-format
+msgid "Torching %s..."
+msgstr "Padegu %s..."
+
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr "Bučkis"
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s pabučiavo jus!"
+
+#, c-format
+msgid "Smooching %s..."
+msgstr "Bučiuoju %s..."
+
+#. A hug is a display of affection; wrapping your arms around someone
+msgid "Hug"
+msgstr "Apkabinimas"
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s apkabino jus!"
+
+#, c-format
+msgid "Hugging %s..."
+msgstr "Apkabinu %s..."
+
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr "Pliaukšt"
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s pliaukštelėjo jums!"
+
+#, c-format
+msgid "Slapping %s..."
+msgstr "Pliaukšteliu %s..."
+
+#. Goose means "to pinch someone on their butt"
+msgid "Goose"
+msgstr "Žnybt"
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s jums įžnybo!"
+
+#, c-format
+msgid "Goosing %s..."
+msgstr "Įžnybiu %s..."
+
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+msgid "High-five"
+msgstr "Duodam penkis"
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s davė jums penkis!"
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr "Duodu penkis %s..."
+
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+msgid "Punk"
+msgstr "Punkt"
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s punktelėjo jums!"
+
+#, c-format
+msgid "Punking %s..."
+msgstr "Punkteliu %s..."
+
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+msgid "Raspberry"
+msgstr "Parodyti liežuvį"
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr "%s parodė jums liežuvį!"
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "Rodau liežuvį %s..."
+
+msgid "Required parameters not passed in"
+msgstr "Neperduoti reikalingi parametrai"
+
+msgid "Unable to write to network"
+msgstr "Negalima rašyti į tinklą"
+
+msgid "Unable to read from network"
+msgstr "Negalima skaityti iš tinklo"
+
+msgid "Error communicating with server"
+msgstr "Komunikacijos su serveriu klaida"
+
+msgid "Conference not found"
+msgstr "Konferencija nerasta"
+
+msgid "Conference does not exist"
+msgstr "Konferencija neegzistuoja"
+
+msgid "A folder with that name already exists"
+msgstr "Aplankas su tokiu vardu jau yra"
+
+msgid "Not supported"
+msgstr "Nepalaikoma"
+
+msgid "Password has expired"
+msgstr "Slaptažodžio galiojimo laikas pasibaigė"
+
+msgid "Incorrect password"
+msgstr "Neteisingas slaptažodis"
+
+msgid "User not found"
+msgstr "Vartotojas nerastas"
+
+msgid "Account has been disabled"
+msgstr "Neveiksni paskyra"
+
+msgid "The server could not access the directory"
+msgstr "Serveris negalėjo kreiptis į katalogą"
+
+msgid "Your system administrator has disabled this operation"
+msgstr "Jūsų sistemos administratorius išjungė šią operaciją"
+
+msgid "The server is unavailable; try again later"
+msgstr "Serveris neprieinamas; pabandykite vėliau vėl"
+
+msgid "Cannot add a contact to the same folder twice"
+msgstr "Negalima pridėti kontakto į tą patį katalogą du kartus"
+
+msgid "Cannot add yourself"
+msgstr "Negalima pridėti savęs"
+
+msgid "Master archive is misconfigured"
+msgstr "Pagrindinis archyvas yra blogai sukonfigūruotas"
+
+msgid "Could not recognize the host of the username you entered"
+msgstr "Nepavyko atpažinti mazgo, priklausančio šiam naudotojo vardui"
+
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+"Jūsų paskyra padaryta neveiksnia dėl per daug kartų neteisingai įvesto "
+"slaptažodžio"
+
+msgid "You cannot add the same person twice to a conversation"
+msgstr "Negalite du kartus įtraukti to paties asmens į pokalbį"
+
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "Jūs pasiekėte savo leistinų kontaktų skaičiaus ribą."
+
+msgid "You have entered an incorrect username"
+msgstr "Jūs įvedėte neteisingą naudotojo vardą"
+
+msgid "An error occurred while updating the directory"
+msgstr "Katalogo atnaujinimo metu įvyko klaida"
+
+msgid "Incompatible protocol version"
+msgstr "Nesuderinama protokolo versija"
+
+msgid "The user has blocked you"
+msgstr "Vartotojas Jus užblokavo"
+
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Ši laikinoji versija neleidžia daugiau kaip dešimčiai vartotojų prisijungti "
+"tuo pačiu metu"
+
+msgid "The user is either offline or you are blocked"
+msgstr "Vartotojas yra atsijungęs arba Jūs esate užblokuotas"
+
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "Nežinoma klaida: 0x%X"
+
+#, c-format
+msgid "Unable to login: %s"
+msgstr "Nepavyko prisijungti: %s"
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "Neįmanoma išsiųsti pranešimo. Nepavyko gauti vartotojo detalių (%s)."
+
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "Negalima pridėti %s į Jūsų bičiulių sąrašą (%s)."
+
+#. TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "Negalima išsiųsti žinutės (%s)."
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "Negalima pakviesti vartotojo (%s)."
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr ""
+"Negalima išsiųsti žinutės vartotojui %s. Nepavyko sukurti konferencijos (%s)."
+
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "Nepavyko išsiųsti žinutės. Nepavyko sukurti konferencijos (%s)."
+
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+"Nepavyko perkelti vartotojo %s į aplanką %s serverio sąraše. Aplanko kūrimo "
+"klaida (%s)."
+
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+"Nepavyko įtraukti vartotojo %s į Jūsų bičiulių sąrašą. Aplanko kūrimo "
+"serverio sąraše klaida (%s)."
+
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "Nepavyko gauti detalių apie vartotoją %s (%s)."
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "Nepavyko įtraukti vartotojo į privatumo sąrašą (%s)."
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "Nepavyko įtraukti %s į draudimo sąrašą (%s)."
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "Nepavyko įtraukti %s į leidimo sąrašą (%s)."
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "Nepavyko pašalinti %s iš privatumo sąrašo (%s)."
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "Nepavyko pakeisti privatumo nuostatų serveryje (%s)."
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "Nepavyko sukurti konferencijos (%s)."
+
+msgid "Error communicating with server. Closing connection."
+msgstr "Komunikacijos su serveriu klaida. Jungtis uždaroma."
+
+msgid "Telephone Number"
+msgstr "Telefonas"
+
+# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???


+msgid "Personal Title"
+msgstr "Asmens pavadinimas"
+
+msgid "Mailstop"
+msgstr "Mailstop"
+
+msgid "User ID"
+msgstr "Vartotojo ID"
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. purple_notify_user_info_add_pair(user_info, tag, value);
+#. }
+#.
+msgid "Full name"
+msgstr "Pilnas vardas"
+
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "GroupWise konferencija %d"
+
+msgid "Authenticating..."
+msgstr "Nustatoma tapatybė..."
+
+msgid "Waiting for response..."
+msgstr "Laukiama atsako..."
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s pakviestas į šį pokalbį"
+
+msgid "Invitation to Conversation"
+msgstr "Kvietimas į pokalbį"
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"Kvietimas nuo: %s\n"
+"\n"
+"Išsiųstas: %s"
+
+msgid "Would you like to join the conversation?"
+msgstr "Ar norite prisijungti prie pokalbio?"
+
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+"Atrodo, kad %s yra atsijungęs ir negavo žinutės, kurią ką tik išsiuntėte."
+
+msgid ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr ""
+"Negalima prisijungti prie servrio.  Prašome įvesti serverio, prie kurio "
+"norite prisijungti, adresą."
+
+msgid "This conference has been closed. No more messages can be sent."
+msgstr "Ši konferencija uždaryta. Daugiau žinučių siųsti negalima."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr "Novell GroupWise Messenger protokolo papildinys"
+
+msgid "Server address"
+msgstr "Serverio adresas"
+
+msgid "Server port"
+msgstr "Serverio prievadas"
+
+msgid "Received unexpected response from "
+msgstr "Gautas nelauktas atsakymas iš "
+
+#. username connecting too frequently
+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 ""
+"Jūs per dažnai prisijunginėjote ir atsijunginėjote. Palaukite dešimt minučių "
+"ir bandykite vėl. Jei vis tiek bandysite jungtis, Jums reikės laukti dar "
+"ilgiau."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Užklausos klaida: "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL neleidžia jūsų vardui prisijungti"
+
+msgid "Could not join chat room"
+msgstr "Nepavyko prisijungti prie pokalbių kambario"
+
+msgid "Invalid chat room name"
+msgstr "Neteisingas pokalbių kambario pavadinimas"
+
+msgid "Received invalid data on connection with server"
+msgstr "Jungtimi su serveriu gauti neteisingi duomenys."
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#  *< name


+#  *< version


+#  *  summary


+#  *  description


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM protokolo papildinys"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#  *< name


+#  *< version


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ protokolo papildinys"
+
+msgid "Encoding"
+msgstr "Koduotė"
+
+msgid "The remote user has closed the connection."
+msgstr "Nutolęs vartotojas uždarė jungtį."
+
+msgid "The remote user has declined your request."
+msgstr "Nutolęs vartotojas atmetė Jūsų prašymą."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Prarastas ryšys su nutolusiu vartotoju:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "Gauti neteisingi duomenys ryšiu su nutolusiu vartotoju."
+
+msgid "Unable to establish a connection with the remote user."
+msgstr "Nepavyko užmegzti ryšio su nutolusiu vartotoju."
+
+msgid "Direct IM established"
+msgstr "Sukurtas tiesioginis pokalbių ryšis"
+
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s bandė jums atsiųsti failą %s, tačiau tiesioginiu ryšiu failai leidžiami "
+"tik iki %s.  Pabandykite naudoti failų perdavimą vietoje tiesioginio ryšio.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+"Failas „%s“ yra %s dydžio – didesnis nei maksimalus leidžiamas dydis %s."
+
+msgid "Invalid error"
+msgstr "Neteisinga klaida"
+
+msgid "Invalid SNAC"
+msgstr "Neteisingas SNAC"
+
+msgid "Rate to host"
+msgstr "Sparta į mazgą"
+
+msgid "Rate to client"
+msgstr "Sparta į klientą"
+
+msgid "Service unavailable"
+msgstr "Tarnyba neprieinama"
+
+msgid "Service not defined"
+msgstr "Tarnyba neaprašyta"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC pasenęs"
+
+msgid "Not supported by host"
+msgstr "Nepalaikoma mazgo"
+
+msgid "Not supported by client"
+msgstr "Nepalaikoma kliento"
+
+msgid "Refused by client"
+msgstr "Atsisakyta kliento"
+
+msgid "Reply too big"
+msgstr "Atsakas per didelis"
+
+msgid "Responses lost"
+msgstr "Prarasti atsakai"
+
+msgid "Request denied"
+msgstr "Užklausa negalima"
+
+msgid "Busted SNAC payload"
+msgstr "Neteisingas SNAC turinys"
+
+msgid "Insufficient rights"
+msgstr "Nepakankamos teisės"
+
+msgid "In local permit/deny"
+msgstr "Yra vietiniame leidimo ar draudimo sąraše"
+
+msgid "Warning level too high (sender)"
+msgstr "Per aukštas siuntėjo perspėjimo lygis"
+
+msgid "Warning level too high (receiver)"
+msgstr "Per aukštas gavėjo perspėjimo lygis"
+
+msgid "User temporarily unavailable"
+msgstr "Vartotojas laikinai neprieinamas"
+
+msgid "No match"
+msgstr "Nėra atitikmens"
+
+msgid "List overflow"
+msgstr "Sąrašo perpildymas"
+
+msgid "Request ambiguous"
+msgstr "Nevienareikšmė užklausa"
+
+msgid "Queue full"
+msgstr "Eilė pilna"
+
+msgid "Not while on AOL"
+msgstr "Negalima prisijungus per AOL"
+
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+"(Priimant šią žinutę įvyko klaida.  Greičiausiai bičiulis su kuriuo "
+"bendraujate naudoja kitokią koduotę nei buvo numatyta.  Jei žinote, kokią "
+"koduotę jis naudoja, galite ją nurodyti papildomose AIM/ICQ paskyros "
+"nuostatose."
+
+#, c-format
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+"(Šio pranešimo gavimo metu įvyko klaida.  Arba Jūs ir %s esate pasirinkę "
+"skirtingas koduotes, arba %s naudoja kliento programą su riktais.)"
+
+#  Label


+#. Label
+msgid "Buddy Icon"
+msgstr "Vartotojo paveiksliukas"
+
+msgid "Voice"
+msgstr "Balsas"
+
+msgid "AIM Direct IM"
+msgstr "AIM tiesioginės greitosios žinutės"
+
+msgid "Get File"
+msgstr "Gauti failai"
+
+msgid "Games"
+msgstr "Žaidimai"
+
+msgid "Add-Ins"
+msgstr "Papildiniai"
+
+msgid "Send Buddy List"
+msgstr "Nusiųsti bičiulių sąrašą"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ tiesioginė jungtis"
+
+msgid "AP User"
+msgstr "AP vartotojas"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilistas"
+
+msgid "ICQ Server Relay"
+msgstr "Perdavimas per ICQ serverį"
+
+msgid "Old ICQ UTF8"
+msgstr "Senas ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian užkodavimas"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Su saugumu"
+
+msgid "Video Chat"
+msgstr "Vaizdinis pokalbis"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Tiesioginis vaizdas"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Ekrano dalinimasis"
+
+msgid "Free For Chat"
+msgstr "Prieinamas pokalbiui"
+
+msgid "Not Available"
+msgstr "Neprieinamas"
+
+msgid "Occupied"
+msgstr "Užimtas"
+
+msgid "Web Aware"
+msgstr "Žinantis apie žiniatinklį"
+
+msgid "Invisible"
+msgstr "Nematomas"
+
+msgid "IP Address"
+msgstr "IP adresas"
+
+msgid "Warning Level"
+msgstr "Perspėjimo lygis"
+
+msgid "Buddy Comment"
+msgstr "Bičiulio komentaras"
+
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr "Nepavyko prisijungti prie tapatybės nustatymo serverio: %s"
+
+#, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nepavyko prisijungti prie BOS serverio: %s"
+
+msgid "Username sent"
+msgstr "Vartotojo vardas nusiųstas"
+
+msgid "Connection established, cookie sent"
+msgstr "Jungtis nustatyta, nusiųstas slapukas"
+
+#. TODO: Don't call this with ssi
+msgid "Finalizing connection"
+msgstr "Pabaigiama jungtis"
+
+#, c-format
+msgid ""
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+"Nepavyko prisijungti vardu %s, nes jis neteisingas.  Naudotojo vardas turi "
+"būti arba teisingas el. pašto adresas, arba prasidėti raide ir turėti tik "
+"raides, skaitmenis ir tarpus, arba turėti tik skaitmenis."
+
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Jus netrukus gali atjungti.  Jei taip atsitiks, patikrinkite %s, ar nėra "
+"atnaujinimų."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nepavyko gauti teisingos AIM prisijungimo maišos."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nepavyko gauti teisingos prisijungimo maišos."
+
+msgid "Received authorization"
+msgstr "Gauta prieigos teisė"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Naudotojas neegzistuoja"
+
+#. Suspended account
+msgid "Your account is currently suspended"
+msgstr "Jūsų paskyra šiuo metu suspenduota"
+
+#. service temporarily unavailable
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "AOL IM tarnyba laikinai neprieinama"
+
+#. client too old
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr ""
+"Jūsų naudojama kliento programos versija yra per sena. Prašome atnaujinti "
+"svetainėje %s"
+
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Jūs per dažnai prisijunginėjote ir atsijunginėjote.  Palaukite dešimt minutę "
+"ir bandykite vėl. Jeigu nepaisydami bandysite jungtis iškart, gali reikėti "
+"palaukti dar ilgiau."
+
+msgid "The SecurID key entered is invalid"
+msgstr "Įvestas SecurID raktas yra neteisingas."
+
+msgid "Enter SecurID"
+msgstr "Įveskite SecurID"
+
+msgid "Enter the 6 digit number from the digital display."
+msgstr "Įveskite 6 skaitmenų skaičių iš skaitmeninio displėjaus."
+
+msgid "Password sent"
+msgstr "Išsiųstas slaptažodis"
+
+msgid "Unable to initialize connection"
+msgstr "Nepavyko sukurti jungties"
+
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Prašau suteikti man prieigos teisę, kad aš galėčiau įtraukti Jus į savo "
+"bičiulių sąrašą."
+
+msgid "No reason given."
+msgstr "Nenurodyta priežastis."
+
+msgid "Authorization Denied Message:"
+msgstr "Prieigos teisės nesuteikimo žinutė:"
+
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+"Vartotojas %u atmetė Jūsų prašymą įtraukti jį į Jūsų bičiulių sąrašą dėl "
+"šios priežasties:\n"
+"%s"
+
+msgid "ICQ authorization denied."
+msgstr "ICQ prieigos teisė nesuteikta."
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "Vartotojas %u suteikė Jums teisę įtraukti jį į Jūsų bičiulių sąrašą."
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"Jūs gavote ypatingą žinutę\n"
+"\n"
+"Nuo: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"Jūs gavote ICQ mobiliąją žinutę\n"
+"\n"
+"Nuo: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+"Jūs gavote ICQ el. pašto laišką nuo %s [%s]\n"
+"\n"
+"Laiškas yra:\n"
+"%s"
+
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ vartotojas %u atsiuntė bičiulio adresą: %s (%s)"
+
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "Ar norite įtraukti šį bičiulį į Jūsų bičiulių sąrašą?"
+
+msgid "_Add"
+msgstr "_Pridėti"
+
+msgid "_Decline"
+msgstr "_Atsisakyti"
+
+#, 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] "Jūs praleidote %hu neteisingą pranešimą nuo vartotojo %s."
+msgstr[1] "Jūs praleidote %hu neteisingus pranešimus nuo vartotojo %s."
+msgstr[2] "Jūs praleidote %hu neteisingų pranešimų nuo vartotojo %s."
+
+#, 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] "Jūs praleidote %hu per ilgą pranešimą nuo vartotojo %s."
+msgstr[1] "Jūs praleidote %hu per ilgus pranešimus nuo vartotojo %s."
+msgstr[2] "Jūs praleidote %hu per ilgų pranešimų nuo vartotojo %s."
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+"Jūs praleidote %hu pranešimą nuo vartotojo %s, kadangi viršyta spartos riba."
+msgstr[1] ""
+"Jūs praleidote %hu pranešimus nuo vartotojo %s, kadangi viršyta spartos riba."
+msgstr[2] ""
+"Jūs praleidote %hu pranešimų nuo vartotojo %s, kadangi viršyta spartos riba."
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Jūs praleidote %hu žinutę nuo vartotojo %s, kadangi jo/jos perspėjimo lygis "
+"yra per aukštas."
+msgstr[1] ""
+"Jūs praleidote %hu žinutes nuo vartotojo %s, kadangi jo/jos perspėjimo lygis "
+"yra per aukštas."
+msgstr[2] ""
+"Jūs praleidote %hu žinučių nuo vartotojo %s, kadangi jo/jos perspėjimo lygis "
+"yra yra per aukštas."
+
+#, c-format
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Jūs praleidote %hu žinutę nuo vartotojo %s, kadangi Jūsų perspėjimo lygis "
+"yra per aukštas."
+msgstr[1] ""
+"Jūs praleidote %hu žinutes nuo vartotojo %s, kadangi Jūsų perspėjimo lygis "
+"yra per aukštas."
+msgstr[2] ""
+"Jūs praleidote %hu žinučių nuo vartotojo %s, kadangi Jūsų perspėjimo lygis "
+"yra per aukštas."
+
+#, 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] ""
+"Jūs praleidote %hu pranešimą nuo vartotojo %s dėl nežinomos priežasties."
+msgstr[1] ""
+"Jūs praleidote %hu pranešimus nuo vartotojo %s dėl nežinomos priežasties."
+msgstr[2] ""
+"Jūs praleidote %hu pranešimų nuo vartotojo %s dėl nežinomos priežasties."
+
+#  Data is assumed to be the destination sn


+#. Data is assumed to be the destination bn
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Negalima išsiųsti žinutės: %s"
+
+msgid "Unknown reason."
+msgstr "Nežinoma priežastis."
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "Negalima išsiųsti žinutės vartotojui %s:"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Vartotojo informacija neprieinama: %s"
+
+msgid "Online Since"
+msgstr "Prisijungęs nuo"
+
+msgid "Member Since"
+msgstr "Narys nuo"
+
+msgid "Capabilities"
+msgstr "Sugebėjimai"
+
+msgid "Profile"
+msgstr "Profilis"
+
+msgid "Your AIM connection may be lost."
+msgstr "Jūsų AIM jungtis gali būti prarasta."
+
+#  The conversion failed!


+#. The conversion failed!
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+"[Negalima pavaizduoti žinutės nuo šio vartotojo, kadangi joje yra neteisingų "
+"simbolių.]"
+
+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 ""
+"Paskutinis Jūsų bandytas veiksmas negalėjo būti įvykdytas, nes Jūs viršyjate "
+"spartos ribą. Prašome palaukti 10 sekundžių ir bandyti iš naujo."
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "Jūs buvote atjungtas nuo pokalbių kambario %s."
+
+msgid "Mobile Phone"
+msgstr "Mobilus telefonas"
+
+msgid "Personal Web Page"
+msgstr "Asmeninė svetainė"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Papildoma informacija"
+
+msgid "Zip Code"
+msgstr "Pašto kodas"
+
+msgid "Work Information"
+msgstr "Darbovietės informacija"
+
+msgid "Division"
+msgstr "Skyrius"
+
+msgid "Position"
+msgstr "Pareigos"
+
+msgid "Web Page"
+msgstr "Svetainė"
+
+msgid "Pop-Up Message"
+msgstr "Iššokanti žinutė"
+
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] "Tolesni naudotojų vardai yra susieti su %s"
+msgstr[1] "Tolesni naudotojų vardai yra susieti su %s"
+msgstr[2] "Tolesni naudotojų vardai yra susieti su %s"
+
+#, c-format
+msgid "No results found for email address %s"
+msgstr "Pagal el. pašto adresą %s jokių rezultatų nerasta"
+
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr "Jūs turėtumėte gauti el. laišką, prašantį patvirtinti %s."
+
+msgid "Account Confirmation Requested"
+msgstr "Paprašyta abonento patvirtinimo"
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+"Klaida 0x%04x: neįmanoma taikyti formato naudotojo vardui, nes paprašytasis "
+"vardas skiriasi nuo pradinio vardo."
+
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr ""
+"Klaida 0x%04x: neįmanoma taikyti formato naudotojo vardui, nes paprašytasis "
+"vardas yra neteisingas."
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+"Klaida 0x%04x: neįmanoma taikyti formato naudotojo vardui, nes paprašytasis "
+"vardas yra per ilgas."
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+"Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi šiuo metu laukia "
+"užklausa šiam naudotojo vardui."
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many usernames associated with it."
+msgstr ""
+"Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi duotas adresas "
+"turi per daug su juo susietų naudotojų vardų."
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+"Klaida 0x%04x: neįmanoma pakeisti el. pašto adreso, kadangi duotas adresas "
+"yra neteisingas."
+
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr "Klaida 0x%04x: nežinoma klaida."
+
+msgid "Error Changing Account Info"
+msgstr "Abonento informacijos keitimo klaida"
+
+#, c-format
+msgid "The email address for %s is %s"
+msgstr "Vartotojo %s el. pašto adresas yra %s"
+
+msgid "Account Info"
+msgstr "Abonento informacija"
+
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"Jūsų IM vaizdas negalėjo būti išsiųstas. IM vaizdų siuntimui jūs turite būti "
+"tiesiogiai prisijungęs."
+
+msgid "Unable to set AIM profile."
+msgstr "Negalima nustatyti AIM profilio."
+
+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 ""
+"Turbūt Jūs pabandėte nustatyti profilį dar nepasibaigus seanso pradžios "
+"procedūrai.  Jūsų profilis lieka nenustatytas.  Pabandykite jį nustatyti dar "
+"kartą, kai būsite galutinai prisijungęs."
+
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+"Viršytas maksimalus %d baito profilio ilgis, todėl profilis buvo "
+"sutrumpintas."
+msgstr[1] ""
+"Viršytas maksimalus %d baitų profilio ilgis, todėl profilis buvo "
+"sutrumpintas."
+msgstr[2] ""
+"Viršytas maksimalus %d baitų profilio ilgis, todėl profilis buvo "
+"sutrumpintas."
+
+msgid "Profile too long."
+msgstr "Profilis per ilgas."
+
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+"Viršytas maksimalus %d baito pasitraukimo žinutės ilgis, todėl žinutė buvo "
+"sutrumpinta."
+msgstr[1] ""
+"Viršytas maksimalus %d baitų pasitraukimo žinutės ilgis, todėl žinutė buvo "
+"sutrumpinta."
+msgstr[2] ""
+"Viršytas maksimalus %d baitų pasitraukimo žinutės ilgis, todėl žinutė buvo "
+"sutrumpinta."
+
+msgid "Away message too long."
+msgstr "Pasitraukimo žinutė per ilga."
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+"Nepavyko pridėti bičiulio %s, nes toks naudotojo vardas neteisingas.  Vardas "
+"turi būti arba teisingas el. pašto adresaas, arba turi prasidėti raide ir "
+"turėti tik raides, skaitmenis ir tarpus, arba turėti tik skaitmenis."
+
+msgid "Unable to Retrieve Buddy List"
+msgstr "Negalima gauti bičiulių sąrašo"
+
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few minutes."
+msgstr ""
+"AIM serveriai laikinai negalėjo išsiųsti Jūsų bičiulių sąrašo.  Jis nėra "
+"prarastas ir greičiausiai taps prieinamas už kelių minučių."
+
+msgid "Orphans"
+msgstr "Našlaičiai"
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+"Nepavyko pridėti bičiulio %s, nes turite per daug bičiulių savo bičiulių "
+"sąraše.  Prašome vieną pašalinti ir bandyti iš naujo."
+
+msgid "(no name)"
+msgstr "(nėra vardo)"
+
+#, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "Bičiulio %s pridėti nepavyko dėl nežinomos priežasties."
+
+#, c-format
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+"Naudotojas %s suteikė Jums teisę pridėti jį į savo bičiulių sąrašą.  Ar "
+"norite tai padaryti?"
+
+msgid "Authorization Given"
+msgstr "Suteikta prieigos teisė"
+
+#. Granted
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+"Vartotojas %s patenkino Jūsų prašymą įtrauktį jį į Jūsų bičiulių sarašą."
+
+msgid "Authorization Granted"
+msgstr "Suteikta prieigos teisė"
+
+#. Denied
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+"Vartotojas %s atmetė Jūsų prašymą įtraukti jį į Jūsų bičiulių sąrašą dėl "
+"šios priežasties:\n"
+"%s"
+
+msgid "Authorization Denied"
+msgstr "Nesuteikta prieigos teisė"
+
+msgid "_Exchange:"
+msgstr "Kom_utatorius:"
+
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+"Jūsų IM vaizdas nebuvo nusiųstas. Jūs negalite siųsti IM vaizdų AIM "
+"pokalbiuose."
+
+msgid "iTunes Music Store Link"
+msgstr "Muzikos parduotuvės „iTunes“ nuoroda"
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "Bičiulio komentaras apie %s"
+
+msgid "Buddy Comment:"
+msgstr "Bičiulio komentaras:"
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "Jūs pasirinkote sukurti tiesioginį ryšį su %s."
+
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Kadangi tai atskleidžia Jūsų IP adresą, tai gali būti pavojus saugumui.  Ar "
+"norite tęsti?"
+
+msgid "C_onnect"
+msgstr "_Jungtis"
+
+msgid "Get AIM Info"
+msgstr "Gauti AIM informaciją"
+
+#. We only do this if the user is in our buddy list
+msgid "Edit Buddy Comment"
+msgstr "Redaguoti bičiulio komentarą"
+
+msgid "Get Status Msg"
+msgstr "Gauti būsenos pranešimą"
+
+msgid "Direct IM"
+msgstr "Tiesioginis ryšys"
+
+msgid "Re-request Authorization"
+msgstr "Iš naujo paprašyti prieigos teisės"
+
+msgid "Require authorization"
+msgstr "Būtina prieigos teisė"
+
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr ""
+"Pasiekiamas per žiniatinklį (angl. web aware).  Parinkties aktyvavimas gali "
+"tapti šlamšto gavimo priežastimi!"
+
+msgid "ICQ Privacy Options"
+msgstr "ICQ privatumo parinktys"
+
+msgid "The new formatting is invalid."
+msgstr "Nauja formato informacija yra neteisinga."
+
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr ""
+"Naudotojo vardo formatavimas gali pakeisti tik keitimą didžiosiomis raidėmis "
+"ir matomus tarpus."
+
+msgid "Change Address To:"
+msgstr "Pakeisti adresą į:"
+
+msgid "<i>you are not waiting for authorization</i>"
+msgstr "<i>jūs nelaukiate prieigos suteikimo</i>"
+
+msgid "You are awaiting authorization from the following buddies"
+msgstr "Jūs laukiate prieigos suteikimo iš šių bičiulių"
+
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"Jūs galite iš naujo paprašyti prieigos suteikimo iš šių bičiulių "
+"spragtelėdamas dešiniuoju klavišu ant jų ir pasirinkdamas „Iš naujo "
+"paprašyti prieigos teisės“."
+
+msgid "Find Buddy by Email"
+msgstr "Surasti bičiulį pagal el. pašto adresą"
+
+msgid "Search for a buddy by email address"
+msgstr "Ieškoti bičiulio pagal el. pašto adresą"
+
+msgid "Type the email address of the buddy you are searching for."
+msgstr "Įveskite bičiulio, kurio ieškote, el. pašto adresą."
+
+msgid "_Search"
+msgstr "_Ieškoti"
+
+msgid "Set User Info (web)..."
+msgstr "Nustatyti naudotojo informaciją (žiniatinklis)..."
+
+#. This only happens when connecting with the old-style BUCP login
+msgid "Change Password (web)"
+msgstr "Pakeisti slaptažodį (žiniatinklis)..."
+
+msgid "Configure IM Forwarding (web)"
+msgstr "Konfigūruoti žinučių persiuntimą (žiniatinklis)..."
+
+#. ICQ actions
+msgid "Set Privacy Options..."
+msgstr "Nustatyti privatumo parinktis..."
+
+#. AIM actions
+msgid "Confirm Account"
+msgstr "Patvirtinti abonentą"
+
+msgid "Display Currently Registered Email Address"
+msgstr "Parodyti šiuo metu registruotą el. pašto adresą"
+
+msgid "Change Currently Registered Email Address..."
+msgstr "Pakeisti šiuo metu registruotą el. pašto adresą..."
+
+msgid "Show Buddies Awaiting Authorization"
+msgstr "Parodyti bičiulius, laukiančius prieigos suteikimo"
+
+msgid "Search for Buddy by Email Address..."
+msgstr "Ieškoti bičiulio pagal el. pašto adresą..."
+
+msgid "Search for Buddy by Information"
+msgstr "Ieškoti bičiulio pagal informaciją"
+
+msgid "Use clientLogin"
+msgstr "Naudoti „clientLogin“"
+
+msgid ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
+msgstr ""
+"Visada naudoti ICQ tarpininkaujantį serverį failų perdavimams ir "
+"tiesioginiam bendravimui (lėčiau, bet neatskleidžia Jūsų IP adreso.)"
+
+msgid "Allow multiple simultaneous logins"
+msgstr "Leisti kelis prisijungimus vienu metu"
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "Prašoma %s prisijungti prie mūsų tiesioginiu ryšiu adresu %s:%hu."
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Bandoma prisijungti prie %s:%hu."
+
+msgid "Attempting to connect via proxy server."
+msgstr "Bandoma jungtis per tarpininką serverį."
+
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s ką tik paprašė tiesiogiai prisijungti prie %s"
+
+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 ""
+"Tai reikalauja tiesioginės jungties tarp dviejų kompiuterių ir yra būtina IM "
+"vaizdams.  Kadangi Jūsų IP adresas bus atskleistas, tai gali būti privatumo "
+"rizika."
+
+msgid "Aquarius"
+msgstr "Vandenis"
+
+msgid "Pisces"
+msgstr "Žuvys"
+
+msgid "Aries"
+msgstr "Avinas"
+
+msgid "Taurus"
+msgstr "Jautis"
+
+msgid "Gemini"
+msgstr "Dvyniai"
+
+msgid "Cancer"
+msgstr "Vėžys"
+
+msgid "Leo"
+msgstr "Liūtas"
+
+msgid "Virgo"
+msgstr "Mergelė"
+
+msgid "Libra"
+msgstr "Svarstyklės"
+
+msgid "Scorpio"
+msgstr "Skorpionas"
+
+msgid "Sagittarius"
+msgstr "Šaulys"
+
+msgid "Capricorn"
+msgstr "Ožiaragis"
+
+msgid "Rat"
+msgstr "Žiurkė"
+
+msgid "Ox"
+msgstr "Jautis"
+
+msgid "Tiger"
+msgstr "Tigras"
+
+msgid "Rabbit"
+msgstr "Triušis"
+
+msgid "Dragon"
+msgstr "Drakonas"
+
+msgid "Snake"
+msgstr "Gyvatė"
+
+msgid "Horse"
+msgstr "Arklys"
+
+msgid "Goat"
+msgstr "Ožys"
+
+msgid "Monkey"
+msgstr "Beždžionė"
+
+msgid "Rooster"
+msgstr "Gaidys"
+
+msgid "Dog"
+msgstr "Šuo"
+
+msgid "Pig"
+msgstr "Kiaulė"
+
+msgid "Other"
+msgstr "Kitas"
+
+msgid "Visible"
+msgstr "Matomas"
+
+msgid "Friend Only"
+msgstr "Tik draugams"
+
+msgid "Private"
+msgstr "Privatus"
+
+msgid "QQ Number"
+msgstr "QQ numeris"
+
+#  Country


+msgid "Country/Region"
+msgstr "Šalis ar regionas"
+
+msgid "Province/State"
+msgstr "Provincija ar valstija"
+
+msgid "Zipcode"
+msgstr "Pašto kodas"
+
+msgid "Phone Number"
+msgstr "Telefonas"
+
+msgid "Authorize adding"
+msgstr "Leisti pridėjimą"
+
+msgid "Cellphone Number"
+msgstr "Mobilus telefonas"
+
+msgid "Personal Introduction"
+msgstr "Asmeninis prisistatymas"
+
+msgid "City/Area"
+msgstr "Miestas/vietovė"
+
+msgid "Publish Mobile"
+msgstr "Skelbti mobilaus telefono numerį"
+
+msgid "Publish Contact"
+msgstr "Skelbti kontaktą"
+
+msgid "College"
+msgstr "Koledžas"
+
+msgid "Horoscope"
+msgstr "Horoskopas"
+
+msgid "Zodiac"
+msgstr "Zodiako ženklas"
+
+#  Block button


+msgid "Blood"
+msgstr "Kraujas"
+
+# True ir False išversti buddy_info kontekste


+msgid "True"
+msgstr "Taip"
+
+msgid "False"
+msgstr "Ne"
+
+msgid "Modify Contact"
+msgstr "Redaguoti kontaktą"
+
+msgid "Modify Address"
+msgstr "Redaguoti adresą"
+
+msgid "Modify Extended Information"
+msgstr "Redaguoti išplėstinę informaciją"
+
+msgid "Modify Information"
+msgstr "Keisti informaciją"
+
+msgid "Update"
+msgstr "Atnaujinti"
+
+msgid "Could not change buddy information."
+msgstr "Nepavyko pakeisti bičiulio informacijos."
+
+msgid "Mobile"
+msgstr "Mobilus"
+
+msgid "Note"
+msgstr "Pastabos"
+
+#  Label


+#. callback
+msgid "Buddy Memo"
+msgstr "Pastabos apie bičiulį"
+
+msgid "Change his/her memo as you like"
+msgstr "Įveskite savo pastabas apie jį"
+
+msgid "_Modify"
+msgstr "_Keisti"
+
+msgid "Memo Modify"
+msgstr "Keisti pastabas"
+
+msgid "Server says:"
+msgstr "Serveris sako:"
+
+msgid "Your request was accepted."
+msgstr "Jūsų užklausta priimta."
+
+msgid "Your request was rejected."
+msgstr "Jūsų užklausta atmesta."
+
+#, c-format
+msgid "%u requires verification"
+msgstr "%u reikalauja patikrinimo"
+
+msgid "Add buddy question"
+msgstr "Pridėti klausimą bičiuliui"
+
+msgid "Enter answer here"
+msgstr "Čia įveskite atsakymą"
+
+#  Build the Send As menu


+msgid "Send"
+msgstr "Siųsti"
+
+msgid "Invalid answer."
+msgstr "Atsakymas neteisingas."
+
+msgid "Authorization denied message:"
+msgstr "Prieigos teisės nesuteikimo žinutė:"
+
+msgid "Sorry, you're not my style."
+msgstr "Atleisk, tu ne mano tipo."
+
+#, c-format
+msgid "%u needs authorization"
+msgstr "%u reikia leidimo pridėti"
+
+msgid "Add buddy authorize"
+msgstr "Leidimas pridėti bičiulį"
+
+msgid "Enter request here"
+msgstr "Čia įveskite prašymą"
+
+msgid "Would you be my friend?"
+msgstr "Ar draugausi su manimi?"
+
+msgid "QQ Buddy"
+msgstr "QQ bičiulis"
+
+msgid "Add buddy"
+msgstr "Pridėti bičiulį"
+
+msgid "Invalid QQ Number"
+msgstr "Neteisingas QQ numeris"
+
+msgid "Failed sending authorize"
+msgstr "Nepavyko išsiųsti leidimo prašymo"
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "Nepavyko pašalinti bičiulio %u"
+
+#, c-format
+msgid "Failed removing me from %d's buddy list"
+msgstr "Nepavyko pašalinti savęs iš %d bičiulių sąrašo"
+
+msgid "No reason given"
+msgstr "Priežastis nenurodyta"
+
+#. only need to get value
+#, c-format
+msgid "You have been added by %s"
+msgstr "Jus prisidėjo %s"
+
+msgid "Would you like to add him?"
+msgstr "Ar norite jį prisidėti?"
+
+#, c-format
+msgid "Rejected by %s"
+msgstr "Atmesta %s"
+
+#, c-format
+msgid "Message: %s"
+msgstr "Žinutė: %s"
+
+msgid "ID: "
+msgstr "ID: "
+
+msgid "Group ID"
+msgstr "Grupės ID"
+
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+msgid "Please enter Qun number"
+msgstr "Įveskite QQ pokalbių kambario numerį"
+
+msgid "You can only search for permanent Qun\n"
+msgstr "Galite ieškoti tik pastovių QQ kambarių\n"
+
+msgid "(Invalid UTF-8 string)"
+msgstr "(Neteisinga UTF-8 eilutė)"
+
+msgid "Not member"
+msgstr "Ne narys"
+
+msgid "Member"
+msgstr "Narys"
+
+msgid "Requesting"
+msgstr "Prašoma"
+
+msgid "Admin"
+msgstr "Administratorius"
+
+msgid "Notice"
+msgstr "Pastaba"
+
+msgid "Detail"
+msgstr "Išsamiau"
+
+msgid "Creator"
+msgstr "Kūrėjas"
+
+msgid "About me"
+msgstr "Apie mane"
+
+msgid "Category"
+msgstr "Kategorija"
+
+msgid "The Qun does not allow others to join"
+msgstr "Šis QQ pokalbių kambarys neleidžia prisijungti pašaliniams"
+
+msgid "Join QQ Qun"
+msgstr "Prisijungti prie QQ pokalbių kambario"
+
+msgid "Input request here"
+msgstr "Įveskite prašymą čia"
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Sėkmingai prisijungta prie QQ pokalbių kambario %s (%u)"
+
+msgid "Successfully joined Qun"
+msgstr "Sėkmingai prisijungta prie QQ pokalbių kambario"
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr "QQ pokalbių kambarys %u neleido prisijungti"
+
+msgid "QQ Qun Operation"
+msgstr "Operacija su QQ pokalbių kambariu"
+
+msgid "Failed:"
+msgstr "Nepavyko:"
+
+msgid "Join Qun, Unknown Reply"
+msgstr "Prisijungimas prie QQ pokalbių kambario, atsakymas nežinomas"
+
+msgid "Quit Qun"
+msgstr "Palikti QQ pokalbių kambarį"
+
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"Jeigu esate grupės sukūrėjas, ši operacija galiausiai pašalins šį pokalbių "
+"kambarį."
+
+msgid "Sorry, you are not our style"
+msgstr "Atleisk, tu ne mano tipo"
+
+msgid "Successfully changed Qun members"
+msgstr "Sėkmingai pakoregavote QQ pokalbių kambario narius"
+
+msgid "Successfully changed Qun information"
+msgstr "Sėkmingai pakeitėte QQ pokalbių kambario informaciją"
+
+msgid "You have successfully created a Qun"
+msgstr "Jūs sėkmingai sukūrėte pokalbių kambarį"
+
+msgid "Would you like to set up detailed information now?"
+msgstr "Ar norėtumėte nustatyti išsamesnę informaciją dabar?"
+
+msgid "Setup"
+msgstr "Nustatyti"
+
+#, c-format
+msgid "%u requested to join Qun %u for %s"
+msgstr "%u paprašė būti įleistas į QQ pokalbių kambarį %u dėl %s"
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr "%u paprašė būti įleistas į QQ pokalbių kambarį %u"
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr ""
+"Nepavyko prisijungti prie QQ pokalbių kambario %u, kurį administruoja %u"
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr ""
+"<b>Prisijungimas prie QQ pokalbių kambario %u patvirtintas administratoriaus "
+"%u vartotojui %s</b>"
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>Pašalintas bičiulis %u.</b>"
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>Naujas bičiulis %u prisijungė.</b>"
+
+#, c-format
+msgid "Unknown-%d"
+msgstr "Nežinomas: %d"
+
+msgid "Level"
+msgstr "Lygis"
+
+msgid " VIP"
+msgstr " VIP"
+
+msgid " TCP"
+msgstr " TCP"
+
+msgid " FromMobile"
+msgstr " „FromMobile“"
+
+msgid " BindMobile"
+msgstr " „BindMobile“"
+
+msgid " Video"
+msgstr " Vaizdas"
+
+msgid " Zone"
+msgstr " Zona"
+
+msgid "Flag"
+msgstr "Vėliava"
+
+msgid "Ver"
+msgstr "Versija"
+
+msgid "Invalid name"
+msgstr "Neteisingas vardas"
+
+msgid "Select icon..."
+msgstr "Pasirinkite piktogramą..."
+
+#, c-format
+msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>Prisijungimo laikas</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Total Online Buddies</b>: %d<br>\n"
+msgstr "<b>Iš viso prisijungusių bičiulių</b>: %d<br>\n"
+
+#, c-format
+msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>Paskutinis atnaujinimas</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Server</b>: %s<br>\n"
+msgstr "<b>Serveris</b>: %s<br>\n"
+
+#, c-format
+msgid "<b>Client Tag</b>: %s<br>\n"
+msgstr "<b>Kliento žymė</b>: %s<br>\n"
+
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Jungties režimas</b>: %s<br>\n"
+
+#, c-format
+msgid "<b>My Internet IP</b>: %s:%d<br>\n"
+msgstr "<b>Mano internetinis adresas</b>: %s:%d<br>\n"
+
+#, c-format
+msgid "<b>Sent</b>: %lu<br>\n"
+msgstr "<b>Išsiųsta</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Resend</b>: %lu<br>\n"
+msgstr "<b>Persiųsta</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Lost</b>: %lu<br>\n"
+msgstr "<b>Prarasta</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received</b>: %lu<br>\n"
+msgstr "<b>Gauta</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received Duplicate</b>: %lu<br>\n"
+msgstr "<b>Gauta po kelis kartus</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>Laikas</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>IP</b>: %s<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"
+
+msgid "Login Information"
+msgstr "Prisijungimo informacija"
+
+msgid "<p><b>Original Author</b>:<br>\n"
+msgstr "<p><b>Pirmasis autorius</b>:<br>\n"
+
+msgid "<p><b>Code Contributors</b>:<br>\n"
+msgstr "<p><b>Prie programavimo prisidėjo</b>:<br>\n"
+
+msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
+msgstr "<p><b>Mieli pataisų rašytojai</b>:<br>\n"
+
+msgid "<p><b>Acknowledgement</b>:<br>\n"
+msgstr "<p><b>Padėkos</b>:<br>\n"
+
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Kruopštūs testuotojai</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "ir kiti, parašykite man... ačiū!))"
+
+msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
+msgstr ""
+"<p><i>Ir visi kiti mažiau žinomi, bet ne mažiau svarbūs vaikinai...</i><br>\n"
+
+msgid "<i>Feel free to join us!</i> :)"
+msgstr "<i>Prašom prisijungti prie mūsų!</i> :)"
+
+#, c-format
+msgid "About OpenQ %s"
+msgstr "Apie OpenQ %s"
+
+msgid "Change Icon"
+msgstr "Pakeisti paveiksliuką"
+
+msgid "Change Password"
+msgstr "Pakeisti slaptažodį"
+
+msgid "Account Information"
+msgstr "Paskyro informacija"
+
+msgid "Update all QQ Quns"
+msgstr "Atnaujinti visus QQ pokalbių kambarius"
+
+msgid "About OpenQ"
+msgstr "Apie OpenQ"
+
+msgid "Modify Buddy Memo"
+msgstr "Keisti pastabas apie bičiulį"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#  *< name


+#  *< version


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "QQ Protocol Plugin"
+msgstr "QQ protokolo papildinys"
+
+msgid "Auto"
+msgstr "Automatiškai"
+
+msgid "Select Server"
+msgstr "Pasirinkite serverį"
+
+msgid "QQ2005"
+msgstr "QQ2005"
+
+msgid "QQ2007"
+msgstr "QQ2007"
+
+msgid "QQ2008"
+msgstr "QQ2008"
+
+msgid "Connect by TCP"
+msgstr "Prisijungti naudojant TCP"
+
+msgid "Show server notice"
+msgstr "Rodyti serverio žinutę"
+
+msgid "Show server news"
+msgstr "Rodyti serverio naujienas"
+
+msgid "Show chat room when msg comes"
+msgstr "Atėjus žinutei parodyti pokalbių kambarį"
+
+msgid "Keep alive interval (seconds)"
+msgstr "Jungties palaikymo intervalas (sekundėmis)"
+
+msgid "Update interval (seconds)"
+msgstr "Atnaujinimo intervalas (sekundėmis)"
+
+msgid "Unable to decrypt server reply"
+msgstr "Nepavyko iššifruoti serverio atsakymo"
+
+#, c-format
+msgid "Failed requesting token, 0x%02X"
+msgstr "Nepavyko gauti žetono, 0x%02X"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "Neteisingas žymės ilgis %d"
+
+#. extend redirect used in QQ2006
+msgid "Redirect_EX is not currently supported"
+msgstr "„Redirect_EX“ šiuo metu nepalaikoma"
+
+#. need activation
+#. need activation
+#. need activation
+msgid "Activation required"
+msgstr "Būtinas aktyvavimas"
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "Nežinomas atsakymo kodas prisijungimo metu (0x%02X)"
+
+msgid "Requesting captcha"
+msgstr "Prašoma „captcha“"
+
+msgid "Checking captcha"
+msgstr "Tikrinama „captcha“"
+
+msgid "Failed captcha verification"
+msgstr "Nepavyko „captcha“ patikrinimas"
+
+msgid "Captcha Image"
+msgstr "„Captcha“ paveiksliukas"
+
+msgid "Enter code"
+msgstr "Įveskite kodą"
+
+msgid "QQ Captcha Verification"
+msgstr "QQ „captcha“ patikrinimas"
+
+msgid "Enter the text from the image"
+msgstr "Įveskite tekstą iš paveiksliuko"
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "Nežinomas atsakymas tikrinant slaptažodį (0x%02X)"
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
+"%s"
+msgstr ""
+"Neteisingas atsakymo kodas prisijungimo metu (0x%02X):\n"
+"%s"
+
+msgid "Socket error"
+msgstr "Jungties klaida"
+
+msgid "Getting server"
+msgstr "Gaunamas serveris"
+
+msgid "Requesting token"
+msgstr "Prašoma žymės"
+
+msgid "Unable to resolve hostname"
+msgstr "Nepavyko gauti IP adreso pagal mazgo vardą"
+
+msgid "Invalid server or port"
+msgstr "Neteisingas serveris ar prievadas"
+
+msgid "Connecting to server"
+msgstr "Jungiamasi prie serverio"
+
+msgid "QQ Error"
+msgstr "QQ klaida"
+
+#, c-format
+msgid ""
+"Server News:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+"Serverio naujienos:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#, c-format
+msgid "From %s:"
+msgstr "Nuo %s:"
+
+#, c-format
+msgid ""
+"Server notice From %s: \n"
+"%s"
+msgstr ""
+"Serverio žinutė iš %s: \n"
+"%s"
+
+msgid "Unknown SERVER CMD"
+msgstr "Nežinoma „SERVER CMD“"
+
+#, c-format
+msgid ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
+msgstr ""
+"Klaidos atsakymas iš %s(0x%02X)\n"
+"Kambarys %u, atsakymas 0x%02X"
+
+msgid "QQ Qun Command"
+msgstr "QQ pokalbių kambario komanda"
+
+msgid "Unable to decrypt login reply"
+msgstr "Nepavyko iššifruoti prisijungimo atsakymo"
+
+msgid "Unknown LOGIN CMD"
+msgstr "Nežinoma „LOGIN CMD“"
+
+msgid "Unknown CLIENT CMD"
+msgstr "Nežinoma „CLIENT CMD“"
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d atmetė failą %s"
+
+msgid "File Send"
+msgstr "Failo siuntimas"
+
+#, c-format
+msgid "%d canceled the transfer of %s"
+msgstr "%d nutraukė %s perdavimą"
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>Grupės pavadinimas:</b> %s<br>"
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>„Notes“ grupės identifikatorius:</b> %s<br>"
+
+#, c-format
+msgid "Info for Group %s"
+msgstr "Informacija apie grupę %s"
+
+msgid "Notes Address Book Information"
+msgstr "„Notes“ adresų knygos informacija"
+
+msgid "Invite Group to Conference..."
+msgstr "Pakviesti grupę į konferenciją..."
+
+msgid "Get Notes Address Book Info"
+msgstr "Gauti „Notes“ adresų knygos informaciją"
+
+msgid "Sending Handshake"
+msgstr "Siunčiamas pasisveikinimas"
+
+msgid "Waiting for Handshake Acknowledgement"
+msgstr "Laukiama pasisveikinimo patvirtinimo"
+
+msgid "Handshake Acknowledged, Sending Login"
+msgstr "Pasisveikinimas patvirtintas, siunčiama prisijungimo informacija"
+
+msgid "Waiting for Login Acknowledgement"
+msgstr "Laukiama prisijungimo patvirtinimo"
+
+msgid "Login Redirected"
+msgstr "Prisijungimas nukreiptas kitur"
+
+msgid "Forcing Login"
+msgstr "Jungiamasi"
+
+msgid "Login Acknowledged"
+msgstr "Prisijungimas patvirtintas"
+
+msgid "Starting Services"
+msgstr "Paleidžiami servisai"
+
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr "„Sametime“ administratoriaus skelbimas serveryje %s"
+
+msgid "Sametime Administrator Announcement"
+msgstr "„Sametime“ administratoriaus skelbimas"
+
+#, c-format
+msgid "Announcement from %s"
+msgstr "Abonento %s skelbimas"
+
+msgid "Conference Closed"
+msgstr "Konferencija uždaryta"
+
+#  Data is assumed to be the destination sn


+msgid "Unable to send message: "
+msgstr "Negalima išsiųsti žinutės: "
+
+msgid "Place Closed"
+msgstr "Vieta uždaryta"
+
+msgid "Microphone"
+msgstr "Mikrofonas"
+
+msgid "Speakers"
+msgstr "Garsiakalbiai"
+
+msgid "Video Camera"
+msgstr "Videokamera"
+
+msgid "File Transfer"
+msgstr "Failų perdavimas"
+
+msgid "Supports"
+msgstr "Palaiko"
+
+msgid "External User"
+msgstr "Išorinis vartotoajs"
+
+msgid "Create conference with user"
+msgstr "Sukurti konferenciją su vartotoju"
+
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr "Įveskite naujos konferencijos temą ir pakvietimo žinutę vartotojui %s"
+
+msgid "New Conference"
+msgstr "Nauja konferencija"
+
+msgid "Create"
+msgstr "Sukurti"
+
+msgid "Available Conferences"
+msgstr "Esamos konferencijos"
+
+msgid "Create New Conference..."
+msgstr "Sukurti naują konferenciją..."
+
+msgid "Invite user to a conference"
+msgstr "Pakviesti vartotoją į konferenciją"
+
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+"Pasirinkite konferenciją iš sąrašo žemiau, į kurią kviesite vartotoją %s.  "
+"Pasirinkite „Sukurti naują konferenciją“, jei norite sukurti naują "
+"konfereciją ir į ją pakviesti šį vartotoją."
+
+msgid "Invite to Conference"
+msgstr "Pakviesti į konferenciją"
+
+msgid "Invite to Conference..."
+msgstr "Pakviesti į konferenciją..."
+
+msgid "Send TEST Announcement"
+msgstr "Nusiųsti „TEST“ skelbimą"
+
+msgid "Topic:"
+msgstr "Tema:"
+
+msgid "No Sametime Community Server specified"
+msgstr "Nenurodytas „Sametime“ bendruomenės serveris"
+
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"Nenustatytas mazgo vardas ar IP adresas „Meanwhile“ paskyrai %s.  Įveskite "
+"vieną iš jų žemiau, jei norite pradėti seansą."
+
+msgid "Meanwhile Connection Setup"
+msgstr "„Meanwhile“ jungties sąranka"
+
+msgid "No Sametime Community Server Specified"
+msgstr "Nenurodytas „Sametime“ bendruomenės serveris"
+
+msgid "Connect"
+msgstr "Jungtis"
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "Nežinomas (0x%04x)<br>"
+
+msgid "Last Known Client"
+msgstr "Paskutinis žinomas klientas"
+
+msgid "User Name"
+msgstr "Vartotojo vardas"
+
+msgid "Sametime ID"
+msgstr "„Sametime“ identifikatorius"
+
+msgid "An ambiguous user ID was entered"
+msgstr "Įvestas nevienareikšmiškas vartotojo identifikatorius"
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"Rastas daugiau nei vienas vartotojas su tokiu pačiu identifikatoriumi „%s“.  "
+"Pasirinkite norimą vartotoją iš žemiau esančio sąrašo, kuris bus įtrauktas į "
+"bičiulių sąrašą."
+
+msgid "Select User"
+msgstr "Pasirinkite vartotoją"
+
+msgid "Unable to add user: user not found"
+msgstr "Negalima pridėti vartotojo: jis nerastas"
+
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"Identifikatorius „%s“ neatitiko jokių vartotojų Jūsų „Sametime“ "
+"bendruomenėje.  Šis įrašas pašalintas iš Jūsų bičiulių sąrašo."
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"Failo %s skaitymo klaida:\n"
+"%s\n"
+
+msgid "Remotely Stored Buddy List"
+msgstr "Nutolusiai saugomas bičiulių sąrašas"
+
+msgid "Buddy List Storage Mode"
+msgstr "Bičiulių sąrašo saugojimo būdas"
+
+msgid "Local Buddy List Only"
+msgstr "Tik vietinis bičiulių sąrašas"
+
+msgid "Merge List from Server"
+msgstr "Prijungti sąrašą iš serverio"
+
+msgid "Merge and Save List to Server"
+msgstr "Prijungti ir išsaugoti sąrašą serveryje"
+
+msgid "Synchronize List with Server"
+msgstr "Suvienodinti sąrašą su serveriu"
+
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "Importuoti „Sametime“ sąrašą paskyrai %s"
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "Eksportuoti „Sametime“ sąrašą paskyrai %s"
+
+msgid "Unable to add group: group exists"
+msgstr "Nepavyko pridėti grupės: ji jau yra"
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "Grupė pavadinimu „%s“ jau yra Jūsų bičiulių sąraše."
+
+msgid "Unable to add group"
+msgstr "Nepavyko pridėti grupės"
+
+msgid "Possible Matches"
+msgstr "Galimi variantai"
+
+msgid "Notes Address Book group results"
+msgstr "Grupės iš „Notes“ adresų knygos"
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+"Identifikatorius „%s“ gali nurodyti bet kurią iš žemiau esančių „Notes“ "
+"adresų knygos grupių. Pasirinkite iš žemiau esančio sąrašo grupę, kurią "
+"norite įtraukti į savo bičiulių sąrašą."
+
+msgid "Select Notes Address Book"
+msgstr "Pasirinkite „Notes“ adresų knygos grupę"
+
+msgid "Unable to add group: group not found"
+msgstr "Negalima pridėti grupės: ji nerasta"
+
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+"Identifikatorius „%s“ neatitiko jokių „Notes“ adresų knygos grupių Jūsų "
+"„Sametime“ bendruomenėje."
+
+msgid "Notes Address Book Group"
+msgstr "„Notes“ adresų knygos grupė"
+
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+"Įveskite „Notes“ adresų knygos grupės pavadinimą žemiau esančiame lauke, kad "
+"pridėtumėte grupę ir jos narius į savo bičiulių sąrašą."
+
+#, c-format
+msgid "Search results for '%s'"
+msgstr "„%s“ paieškos rezultatai"
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+"Identifikatorius „%s“ gali nurodyti bet kurį iš žemiau esančių vartotojų.  "
+"Galite įtraukti šiuos vartotojus į savo bičiulių sąrašą arba nusiųsti jiems "
+"žinutes žemiau esančių mygtukų pagalba."
+
+msgid "Search Results"
+msgstr "Paieškos rezultatai"
+
+msgid "No matches"
+msgstr "Nėra atitikimų"
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+"Identifikatorius „%s“ neatitiko jokių vartotojų Jūsų „Sametime“ "
+"bendruomenėje."
+
+msgid "No Matches"
+msgstr "Nėra atitikimų"
+
+msgid "Search for a user"
+msgstr "Ieškoti vartotojo"
+
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"Įveskite vardą ar identifikatoriaus dalį žemiau esančiame lauke, kad "
+"ieškotumėte atitinkančių vartotojų Jūsų „Sametime“ bendruomenėje."
+
+msgid "User Search"
+msgstr "Vartotojų paieška"
+
+msgid "Import Sametime List..."
+msgstr "Importuoti „Sametime“ sąrašą..."
+
+msgid "Export Sametime List..."
+msgstr "Eksportuoti „Sametime“ sąrašą..."
+
+msgid "Add Notes Address Book Group..."
+msgstr "Pridėti „Notes“ adresų knygos grupę..."
+
+msgid "User Search..."
+msgstr "Ieškoti vartotojų..."
+
+msgid "Force login (ignore server redirects)"
+msgstr "Jungtis priverstinai (ignoruoti serverio nukreipimus kitur)"
+
+#. pretend to be Sametime Connect
+msgid "Hide client identity"
+msgstr "Slėpti kliento tapatybę"
+
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "Vartotojo %s nėra tinkle"
+
+msgid "Key Agreement"
+msgstr "Susitarimas dėl raktų"
+
+msgid "Cannot perform the key agreement"
+msgstr "Nepavyko susitarti dėl raktų"
+
+msgid "Error occurred during key agreement"
+msgstr "Susitarimo dėl raktų metu įvyko klaida"
+
+msgid "Key Agreement failed"
+msgstr "Susitarimas dėl raktų nepavyko"
+
+msgid "Timeout during key agreement"
+msgstr "Baigėsi susitarimo dėl raktų laukimo laikas"
+
+msgid "Key agreement was aborted"
+msgstr "Susitarimas dėl raktų buvo nutrauktas"
+
+msgid "Key agreement is already started"
+msgstr "Susitarimas dėl raktų jau pradėtas"
+
+msgid "Key agreement cannot be started with yourself"
+msgstr "Negalima susitarti dėl raktų su savimi pačiu"
+
+msgid "The remote user is not present in the network any more"
+msgstr "Nuotolinio vartotojo nebėra tinkle"
+
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Susitarimo dėl raktų prašymas gautas iš vartotojo %s. Ar norite susitarti?"
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Nuotolinis vartotojas laukia susitarimo dėl raktų\n"
+"nuotoliniame mazge: %s\n"
+"nuotoliniame prievade: %d"
+
+msgid "Key Agreement Request"
+msgstr "Susitarymo dėl raktų prašymas"
+
+msgid "IM With Password"
+msgstr "IM su slaptažodžiu"
+
+msgid "Cannot set IM key"
+msgstr "Negalima nustatyti IM rakto"
+
+msgid "Set IM Password"
+msgstr "Nustatyti IM slaptažodį"
+
+msgid "Get Public Key"
+msgstr "Gauti viešąjį raktą"
+
+msgid "Cannot fetch the public key"
+msgstr "Negalima gauti viešojo rakto"
+
+msgid "Show Public Key"
+msgstr "Rodyti viešąjį raktą"
+
+msgid "Could not load public key"
+msgstr "Nepavyko įkelti viešojo rakto"
+
+msgid "User Information"
+msgstr "Vartotojo informacija"
+
+msgid "Cannot get user information"
+msgstr "Nepavyko gauti vartotojo informacijos"
+
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr "Bičiulis %s nėra patikimas"
+
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"Jūs negalite gauti informavimo apie bičiulį, kol neimportavote jo viešojo "
+"rakto.  Tam jūs galite naudoti „Gauti viešąjį raktą\"."
+
+#. Open file selector to select the public key.
+msgid "Open..."
+msgstr "Atverti..."
+
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "Bičiulio %s nėra tinkle"
+
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"Norėdami pridėti bičiulį, privalote importuoti jo viešąjį raktą.  Tam "
+"paspauskite „Importuoti...“."
+
+msgid "_Import..."
+msgstr "_Importuoti..."
+
+msgid "Select correct user"
+msgstr "Pasirinkite teisingą vartotoją"
+
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"Rastas daugiau nei vienas vartotojas su tokiu pačiu viešuoju raktu.  "
+"Pasirinkite teisingą vartotoją iš sąrašo, kuris bus įtrauktas į bičiulių "
+"sąrašą."
+
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+"Rastas daugiau nei vienas vartotojas su tokiu pačiu vardu.  Pasirinkite "
+"teisingą vartotoją iš sąrašo, kuris bus įtrauktas į bičiulių sąrašą."
+
+msgid "Detached"
+msgstr "Atskirtas"
+
+msgid "Indisposed"
+msgstr "Nelinkęs"
+
+msgid "Wake Me Up"
+msgstr "Pažadink mane"
+
+msgid "Hyper Active"
+msgstr "Hiperaktyvus"
+
+msgid "Robot"
+msgstr "Robotas"
+
+msgid "Happy"
+msgstr "Laimingas"
+
+msgid "Sad"
+msgstr "Liūdnas"
+
+msgid "Angry"
+msgstr "Piktas"
+
+msgid "Jealous"
+msgstr "Pavydus"
+
+msgid "Ashamed"
+msgstr "Susigėdęs"
+
+msgid "Invincible"
+msgstr "Nenugalimas"
+
+msgid "In Love"
+msgstr "Įsimylėjęs"
+
+msgid "Sleepy"
+msgstr "Mieguistas"
+
+msgid "Bored"
+msgstr "Nuobuodžiaujantis"
+
+msgid "Excited"
+msgstr "Susijaudinęs"
+
+msgid "Anxious"
+msgstr "Neramus"
+
+msgid "User Modes"
+msgstr "Vartotojo būsenos"
+
+msgid "Preferred Contact"
+msgstr "Labiausiai mėgstamas kontaktas"
+
+msgid "Preferred Language"
+msgstr "Labiausiai mėgstama kalba"
+
+msgid "Device"
+msgstr "Įrenginys"
+
+msgid "Timezone"
+msgstr "Laiko juosta"
+
+msgid "Geolocation"
+msgstr "Geografinė vietovė"
+
+msgid "Reset IM Key"
+msgstr "Atstatyti IM raktą"
+
+msgid "IM with Key Exchange"
+msgstr "Pokalbiai su raktų apsikeitimu"
+
+msgid "IM with Password"
+msgstr "Pokalbiai su slaptažodžiu"
+
+msgid "Get Public Key..."
+msgstr "Gauti viešąjį raktą..."
+
+msgid "Kill User"
+msgstr "Išmesti vartotoją"
+
+msgid "Draw On Whiteboard"
+msgstr "Piešti ant lentos"
+
+msgid "_Passphrase:"
+msgstr "Sla_ptafrazė:"
+
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "Kanalas %s tinkle neegzistuoja"
+
+msgid "Channel Information"
+msgstr "Kanalo informacija"
+
+msgid "Cannot get channel information"
+msgstr "Nepavyko gauti kanalo informacijos"
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>Kanalo pavadinimas:</b> %s"
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>Vartotojų skaičius:</b> %d"
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>Kanalo įkūrėjas:</b> %s"
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>Kanalo šifras:</b> %s"
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>Kanalo HMAC:</b> %s"
+
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>Kanalo tema:</b><br>%s"
+
+#, c-format
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>Kanalo būsenos:</b> "
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>Įkūrėjo rakto kontrolinis kodas:</b><br>%s"
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>Įkūrėjo rakto žodinis kontrolinis kodas:</b><br>%s"
+
+msgid "Add Channel Public Key"
+msgstr "Pridėti kanalo viešąjį raktą"
+
+#. Add new public key
+msgid "Open Public Key..."
+msgstr "Atverti viešąjį raktą..."
+
+msgid "Channel Passphrase"
+msgstr "Kanalo slaptafrazė"
+
+msgid "Channel Public Keys List"
+msgstr "Kanalo viešųjų raktų sąrašas"
+
+#, c-format
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"Tapatybės nustatymas kanale skirtas apsaugoti kanalą nuo nesankcionuotos "
+"prieigos.  Tapatybės nustatymas gali būti pagrįstas slaptafraze ir "
+"skaitmeniniais parašais.  Jei yra nustatyta slaptafrazė, ji yra reikalinga "
+"norint prisijungti prie kanalo.  Jei kanalo viešieji raktai yra nustatyti, "
+"gali prisijungti tik vartotojai, kurių viešieji raktai yra priskirti."
+
+msgid "Channel Authentication"
+msgstr "Tapatybės nustatymas kanale"
+
+msgid "Add / Remove"
+msgstr "Įdėti / Pašalinti"
+
+msgid "Group Name"
+msgstr "Grupės pavadinimas"
+
+msgid "Passphrase"
+msgstr "Slaptafrazė"
+
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "Prašom įvesti kanalo %s privačios grupės pavadinimą ir slaptafrazę."
+
+msgid "Add Channel Private Group"
+msgstr "Pridėti kanalo privačią grupę"
+
+msgid "User Limit"
+msgstr "Vartotojų skaičiaus riba"
+
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+"Nustatyti kanalo vartotojų skaičiaus ribą.  Nulio reikšmė pašalina ribą."
+
+msgid "Invite List"
+msgstr "Pakvietimų sąrašas"
+
+msgid "Ban List"
+msgstr "Draudimų sąrašas"
+
+msgid "Add Private Group"
+msgstr "Pridėti privačią grupę"
+
+msgid "Reset Permanent"
+msgstr "Atšaukti pastovumą"
+
+msgid "Set Permanent"
+msgstr "Nustatyti pastovumą"
+
+msgid "Set User Limit"
+msgstr "Nustatyti vartotojų skaičiaus ribą"
+
+msgid "Reset Topic Restriction"
+msgstr "Atšaukti temos apribojimą"
+
+msgid "Set Topic Restriction"
+msgstr "Nustatyti temos apribojimą"
+
+msgid "Reset Private Channel"
+msgstr "Atšaukti kanalo privatumą"
+
+msgid "Set Private Channel"
+msgstr "Nustatyti kanalo privatumą"
+
+msgid "Reset Secret Channel"
+msgstr "Atšaukti kanalo slaptumą"
+
+msgid "Set Secret Channel"
+msgstr "Nustatyti kanalo slaptumą"
+
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+"Jūs turite prisijungti prie kanalo %s, kad galėtumėte prisijungti prie "
+"privačios grupės"
+
+msgid "Join Private Group"
+msgstr "Prisijungti prie privačios grupės"
+
+msgid "Cannot join private group"
+msgstr "Negalima prisijungti prie privačios grupės"
+
+msgid "Call Command"
+msgstr "Komandos iškvietimas"
+
+msgid "Cannot call command"
+msgstr "Negalima iškviesti komandos"
+
+msgid "Unknown command"
+msgstr "Nežinoma komanda"
+
+msgid "Secure File Transfer"
+msgstr "Saugus failų perdavimas"
+
+msgid "Error during file transfer"
+msgstr "Failų perdavimo klaida"
+
+msgid "Remote disconnected"
+msgstr "Kitas vartotojas atsijungė"
+
+msgid "Permission denied"
+msgstr "Neduotas leidimas"
+
+msgid "Key agreement failed"
+msgstr "Raktų sutikimas nepavyko"
+
+msgid "Connection timed out"
+msgstr "Jungties laukimo laikas baigėsi"
+
+msgid "Creating connection failed"
+msgstr "Jungties sukūrimo klaida"
+
+msgid "File transfer session does not exist"
+msgstr "Failų perdavimo seansas neegzistuoja"
+
+msgid "No file transfer session active"
+msgstr "Nėra aktyvaus failų perdavimo seanso"
+
+msgid "File transfer already started"
+msgstr "Failo perdavimas jau pradėtas"
+
+msgid "Could not perform key agreement for file transfer"
+msgstr "Nepavyko atlikti raktų sutarimo failų perdavimui"
+
+msgid "Could not start the file transfer"
+msgstr "Nepavyko pradėti failų perdavimo"
+
+msgid "Cannot send file"
+msgstr "Negalima išsiųsti failo"
+
+msgid "Error occurred"
+msgstr "Įvyko klaida"
+
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr "%s pakeitė kanalo <I>%s</I> temą į: %s"
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> pakeitė kanalo <I>%s</I> būsenas į: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</s> pašalino visus kanalo <i>%s</i> būsenas"
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> pakeitė vartotojo <I>%s</I> būsenas į: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<i>%s</i> pašalino visas vartotojo <i>%s</i> būsenas"
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "Iš <i>%s</i> Jus išspyrė <i>%s</i> (%s)"
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "Jus išmetė %s (%s)"
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "Išmestas vartotojo %s (%s)"
+
+msgid "Server signoff"
+msgstr "Serverio atjungimas"
+
+msgid "Personal Information"
+msgstr "Asmeninė informacija"
+
+msgid "Birth Day"
+msgstr "Gimtadienis"
+
+msgid "Job Role"
+msgstr "Vaidmuo darbe"
+
+msgid "Organization"
+msgstr "Organizacija"
+
+msgid "Unit"
+msgstr "Padalinys"
+
+msgid "Join Chat"
+msgstr "Prisijungti prie pokalbių kambario"
+
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Jūs esate <i>%s</i> kanalo įkūrėjas"
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "Kanalo <i>%s</i> įkūrėjas yra <i>%s</i>"
+
+msgid "Real Name"
+msgstr "Tikras vardas"
+
+msgid "Status Text"
+msgstr "Būsenos tekstas"
+
+msgid "Public Key Fingerprint"
+msgstr "Viešojo rakto kontrolinis kodas"
+
+msgid "Public Key Babbleprint"
+msgstr "Viešojo rakto žodinis kontrolinis kodas"
+
+msgid "_More..."
+msgstr "_Daugiau..."
+
+msgid "Detach From Server"
+msgstr "Atsiskirti nuo serverio"
+
+msgid "Cannot detach"
+msgstr "Atsiskirti negalima"
+
+msgid "Cannot set topic"
+msgstr "Negalima nustatyti temos"
+
+msgid "Failed to change nickname"
+msgstr "Vardo pakeisti nepavyko"
+
+msgid "Roomlist"
+msgstr "Kambarių sąrašas"
+
+msgid "Cannot get room list"
+msgstr "Nepavyko gauti kambarių sąrašo"
+
+msgid "Network is empty"
+msgstr "Tinklas yra tuščias"
+
+msgid "No public key was received"
+msgstr "Joks viešasis raktas nebuvo gautas"
+
+msgid "Server Information"
+msgstr "Serverio informacija"
+
+msgid "Cannot get server information"
+msgstr "Nepavyko gauti informacijos apie serverį"
+
+msgid "Server Statistics"
+msgstr "Serverio statistika"
+
+msgid "Cannot get server statistics"
+msgstr "Nepavyko gauti serverio statistikos"
+
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+"Vietinio serverio paleidimo laikas: %s\n"
+"Vietinio serverio veikimo laikas: %s\n"
+"Vietinio serverio klientai: %d\n"
+"Vietinio serverio kanalai: %d\n"
+"Vietinio serverio operatoriai: %d\n"
+"Vietinio maršruto parinktuvo operatoriai: %d\n"
+"Vietinio narvelio klientai: %d\n"
+"Vietinio narvelio kanalai: %d\n"
+"Vietinio narvelio serveriai: %d\n"
+"Iš viso klientų: %d\n"
+"Iš viso kanalų: %d\n"
+"Iš viso serverių: %d\n"
+"Iš viso maršruto parinktuvų: %d\n"
+"Iš viso serverio operatorių: %d\n"
+"Iš viso maršruto parinktuvų operatorių: %d\n"
+
+msgid "Network Statistics"
+msgstr "Tinklo statistika"
+
+msgid "Ping"
+msgstr "Skimbtelėti"
+
+msgid "Ping failed"
+msgstr "Nepavyko skimbtelėti"
+
+msgid "Ping reply received from server"
+msgstr "Atsakas į skimbtelėjimą gautas iš serverio"
+
+msgid "Could not kill user"
+msgstr "Nepavyko išmesti vartotojo"
+
+msgid "WATCH"
+msgstr "STEBĖTI"
+
+msgid "Cannot watch user"
+msgstr "Negalima stebėti vartotojo"
+
+msgid "Resuming session"
+msgstr "Pratęsiamas seansas"
+
+msgid "Authenticating connection"
+msgstr "Jungties tapatybės nustatymas"
+
+msgid "Verifying server public key"
+msgstr "Tikrinamas serverio viešasis raktas"
+
+msgid "Passphrase required"
+msgstr "Reikalinga slaptafrazė"
+
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"Gautas vartotojo %s viešasis raktas.  Jūsų vietinė kopija nesutampa su šiuo "
+"raktu.  Ar vis tiek norite priimti šį viešąjį raktą?"
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr ""
+"Gautas vartotojo %s viešasis raktas.  Ar norite priimti šį viešąjį raktą?"
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"Kontrolinis ir žodinis kontrolinis vartotojo %s rakto kodas yra:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+msgid "Verify Public Key"
+msgstr "Patikrinti viešąjį raktą"
+
+msgid "_View..."
+msgstr "_Peržiūrėti..."
+
+msgid "Unsupported public key type"
+msgstr "Nepalaikomas viešojo rakto tipas"
+
+msgid "Disconnected by server"
+msgstr "Atjungtas serverio"
+
+msgid "Error connecting to SILC Server"
+msgstr "Jungimosi prie SILC serverio klaida"
+
+msgid "Key Exchange failed"
+msgstr "Apsikeitimas raktais nepavyko"
+
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Atskirto seanso pratęsimas nepavyko. Paspauskite „Jungtis iš naujo\", kad "
+"sukurtumėtę naują jungtį."
+
+msgid "Performing key exchange"
+msgstr "Apsikeičiama raktais"
+
+msgid "Unable to load SILC key pair"
+msgstr "Nepavyko įkelti SILC raktų poros"
+
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "Jungiamasi prie SILC serverio"
+
+msgid "Out of memory"
+msgstr "Trūksta atminties"
+
+msgid "Unable to initialize SILC protocol"
+msgstr "Nepavyko inicijuoti SILC protokolo"
+
+msgid "Error loading SILC key pair"
+msgstr "SILC raktų poros įkėlimo klaida"
+
+#, c-format
+msgid "Download %s: %s"
+msgstr "Atsisiųsk %s: %s"
+
+msgid "Your Current Mood"
+msgstr "Jūsų dabartinė nuotaika"
+
+#, c-format
+msgid "Normal"
+msgstr "Normaliai"
+
+msgid "In love"
+msgstr "Įsimylėjęs"
+
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"Jūsų labiausiai mėgstami kontaktavimo būdai"
+
+msgid "SMS"
+msgstr "SMS"
+
+msgid "MMS"
+msgstr "MMS"
+
+msgid "Video conferencing"
+msgstr "Kontaktas vaizdo konferencijoms"
+
+msgid "Your Current Status"
+msgstr "Jūsų dabartinė būsena"
+
+msgid "Online Services"
+msgstr "Tiesioginės tarnybos"
+
+msgid "Let others see what services you are using"
+msgstr "Leisti kitiems pamatyti, kokiomis tarnybomis Jūs naudojatės"
+
+msgid "Let others see what computer you are using"
+msgstr "Leisti kitiems pamatyti, kokiu kompiuteriu Jūs naudojatės"
+
+# „vCard“ yra tikrinis žodis


+msgid "Your VCard File"
+msgstr "Jūsų vCard failas"
+
+msgid "Timezone (UTC)"
+msgstr "Laiko juosta (UTC)"
+
+msgid "User Online Status Attributes"
+msgstr "Vartotojo prisijungimo būsenos atributai"
+
+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 ""
+"Jūs galite leisti kitiems vartotojams matyti Jūsų prisijungimo būsenos "
+"informaciją ir Jūsų asmeninę informaciją.  Prašome užpildyti informaciją, "
+"kurią matys kiti vartotojai apie Jus."
+
+msgid "Message of the Day"
+msgstr "Dienos žinutė"
+
+msgid "No Message of the Day available"
+msgstr "Dienos žinutės nėra"
+
+msgid "There is no Message of the Day associated with this connection"
+msgstr "Nėra susietos su šia jungtimi dienos žinutės"
+
+msgid "Create New SILC Key Pair"
+msgstr "Kuriama nauja SILC raktų pora..."
+
+msgid "Passphrases do not match"
+msgstr "Slaptafrazės nesutampa"
+
+msgid "Key Pair Generation failed"
+msgstr "Raktų poros sukūrimas nepavyko"
+
+msgid "Key length"
+msgstr "Rakto ilgis"
+
+msgid "Public key file"
+msgstr "Viešojo rakto failas"
+
+msgid "Private key file"
+msgstr "Privataus rakto failas"
+
+msgid "Passphrase (retype)"
+msgstr "Slaptafrazė (pakartoti)"
+
+msgid "Generate Key Pair"
+msgstr "Sukurti raktų porą"
+
+msgid "Online Status"
+msgstr "Prisijungimo būsena"
+
+msgid "View Message of the Day"
+msgstr "Žiūrėti dienos žinutę"
+
+msgid "Create SILC Key Pair..."
+msgstr "Sukurti SILC raktų porą..."
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "Vartotojo <i>%s</i> nėra tinkle"
+
+msgid "Topic too long"
+msgstr "Tema per ilga"
+
+msgid "You must specify a nick"
+msgstr "Jūs privalote nurodyti vardą"
+
+#, c-format
+msgid "channel %s not found"
+msgstr "kanalas %s nerastas"
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "Kanalo %s būsenos: %s"
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "kanalas %s neturi būsenų"
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "Nepavyko nustatyti %s kanalo būsenų"
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "Nežinoma komanda: %s, (gali būti programos riktas)"
+
+msgid "part [channel]:  Leave the chat"
+msgstr "part [kanalas]:  palikti kanalą"
+
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [channel]  palikti kanalą"
+
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr "topic [nauja tema]:  rodyti arba pakeisti temą"
+
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+"join &lt;kanalas&gt; [slaptažodis]:  prisijungti prie pokalbių kanalo šiame "
+"tinkle"
+
+msgid "list:  List channels on this network"
+msgstr "list:  parodyti šio tinklo kanalų sąrašą"
+
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;vardas&gt;  rodyti informaciją apie vartotoją"
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+"msg &lt;vardas&gt; &lt;žinutė&gt;:  vartotojui nusiųsti privačią žinutę"
+
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr "query &lt;vardas&gt; [žinutė]:  vartotojui nusiųsti privačią žinutę"
+
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd:  rodyti serverio dienos žinutę"
+
+msgid "detach:  Detach this session"
+msgstr "detach:  atskirti šią sesiją"
+
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+"quit [žinutė]:  atsijungti nuo serverio su papildoma neprivaloma žinute"
+
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;komanda&gt;  iškviesti bet kokią SILC kliento komandą"
+
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr ""
+"kill &lt;vardas&gt; [-viešasis raktas|&lt;priežastis&gt;]:  išmesti vartotoją"
+
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;naujas-vardas&gt;:  pakeisti Jūsų vardą"
+
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;slapyvardis&gt;:  rodyti informaciją apie vartotoją"
+
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;kanalas&gt; [+|-&lt;būsenos&gt;] [argumentai]:  keisti arba rodyti "
+"kanalo būsenas"
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;kanalas&gt; +|-&lt;būsenos&gr; &lt;slapyvardis&gt;:  keisti "
+"vartotojo būsenas kanale"
+
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;vartotojo-būsenos&gt;:  nustatyti Jūsų būsenas tinkle"
+
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+"oper &lt;slapyvardis&gt; [-viešasis raktas]:  gauti serverio operatoriaus "
+"privilegijas"
+
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;kanalas&gt; [-|+]&lt;slapyvardis&gt;:  pakviesti vartotoją arba "
+"įterpti/pašalinti iš kanalo pakvietimų sąrašo"
+
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+"kick &lt;kanalas&gt; &lt;slapyvardis&gt; [komentaras]:  išspirti vartotoją "
+"iš kanalog"
+
+msgid "info [server]:  View server administrative details"
+msgstr "info [serveris]:  rodyti serverio administracines detales"
+
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+"ban [&lt;kanalas&gt; +|-&lt;slapyvardis&gt;]:  uždrausti vartotojui "
+"prisijungti prie kanalo"
+
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+"getkey &lt;nick|server&gt;:  gauti vartotojo arba serverio viešąjį raktą"
+
+msgid "stats:  View server and network statistics"
+msgstr "stats:  rodyti serverio ir tinklo statistiką"
+
+msgid "ping:  Send PING to the connected server"
+msgstr "ping:  skimbtelėti serveriui"
+
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;kanalas&gt;:  rodyti vartotojus kanale"
+
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;kanalas(-ai)&gt;:  rodyti "
+"tam tikrus vartotojus kanale(-uose)"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#  *< name


+#  *< version


+#  *  summary


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr "SILC protokolo papildinys"
+
+#  *  description


+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "SILC papildinys"
+
+msgid "Network"
+msgstr "Tinklas"
+
+msgid "Public Key file"
+msgstr "Viešojo rakto failas"
+
+msgid "Private Key file"
+msgstr "Privataus rakto failas"
+
+msgid "Cipher"
+msgstr "Šifras"
+
+msgid "HMAC"
+msgstr "HMAC"
+
+msgid "Use Perfect Forward Secrecy"
+msgstr "Naudoti „Perfect Forward Secrecy“ (PFC)"
+
+msgid "Public key authentication"
+msgstr "Tapatybės nustatymas viešuoju raktu"
+
+msgid "Block IMs without Key Exchange"
+msgstr "Blokuoti greitąsias žinutes be raktų apsikeitimo"
+
+msgid "Block messages to whiteboard"
+msgstr "Blokuoti rašymo ant lentos žinutes"
+
+msgid "Automatically open whiteboard"
+msgstr "Automatiškai atidaryti rašymo lentą"
+
+msgid "Digitally sign and verify all messages"
+msgstr "Skaitmeniškai pasirašyti ir patikrinti visas greitąsias žinutes"
+
+msgid "Creating SILC key pair..."
+msgstr "Kuriama SILC raktų pora..."
+
+msgid "Unable to create SILC key pair"
+msgstr "Negalima sukurti SILC raktų poros"
+
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "Asmenvardis: \t%s\n"
+
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "Vartotojo vardas: \t%s\n"
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr "El. paštas: \t\t%s\n"
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "Mazgo vardas:   %s\n"
+
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "Organizacija: \t%s\n"
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "Šalis: \t%s\n"
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "Algoritmas:  \t%s\n"
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "Rakto ilgis, bitais: \t%d\n"
+
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Versija:        %s\n"
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"Viešojo rakto kontrolinė suma:\n"
+"%s\n"
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"Viešojo rakto žodinė kontrolinė suma:\n"
+"%s"
+
+msgid "Public Key Information"
+msgstr "Viešojo rakto informacija"
+
+msgid "Paging"
+msgstr "Žinutės į pranešimų gaviklį"
+
+msgid "Video Conferencing"
+msgstr "Vaizdo konferencija"
+
+msgid "Computer"
+msgstr "Kompiuteris"
+
+msgid "PDA"
+msgstr "PDA"
+
+msgid "Terminal"
+msgstr "Terminalas"
+
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr "„%s“ atsiuntė rašymo ant lentos žinutę. Ar norite atidaryti lentą?"
+
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+"„%s“ atsiuntė rašymo ant lentos žinutę kanale „%s“. Ar norite atidaryti "
+"lentą?"
+
+msgid "Whiteboard"
+msgstr "Lenta"
+
+msgid "No server statistics available"
+msgstr "Nėra prieinamos serverio statistikos"
+
+msgid "Error during connecting to SILC Server"
+msgstr "Jungimosi į SILC serverį klaida"
+
+#, c-format
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Nesėkmė: versijų neatitikimas, atnaujinkite savo klientą"
+
+#, c-format
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+"Nesekmė: nuotolinis mazgas nepasitiki arba nepalaiko Jūsų viešojo rakto"
+
+#, c-format
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomos KE grupės"
+
+#, c-format
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomo šifro"
+
+#, c-format
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomo PKCS"
+
+#, c-format
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomos maišos funkcijos"
+
+#, c-format
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Nesekmė: nuotolinis mazgas nepalaiko siūlomo HMAC"
+
+#, c-format
+msgid "Failure: Incorrect signature"
+msgstr "Nesekmė: neteisingas parašas"
+
+#, c-format
+msgid "Failure: Invalid cookie"
+msgstr "Nesekmė: neteisingas slapukas"
+
+#, c-format
+msgid "Failure: Authentication failed"
+msgstr "Nesekmė: tapatybės nustatymas nepavyko"
+
+msgid "Unable to initialize SILC Client connection"
+msgstr "Nepavyko inicijuoti SILC kliento jungties"
+
+msgid "John Noname"
+msgstr "Vardenis Pavardenis"
+
+#, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "Nepavyko įkelti SILC raktų poros: %s"
+
+msgid "Unable to create connection"
+msgstr "Nepavyko sukurti jungties."
+
+msgid "Unknown server response"
+msgstr "Nežinomas serverio atsakymas"
+
+msgid "Unable to create listen socket"
+msgstr "Nepavyko sukurti jungties klausymuisi"
+
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "SIP naudotojų vardai negali turėti matomų tarpų arba „@“ simbolių"
+
+msgid "SIP connect server not specified"
+msgstr "Nenurodytas SIP prisijungimo serveris"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#  *< name


+#  *< version


+#  *  summary


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE protokolo papildinys"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#  *< name


+#  *< version


+#  *  summary


+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE protokolo papildinys"
+
+msgid "Publish status (note: everyone may watch you)"
+msgstr "Skelbti būseną (pastaba: bet kas galės Jus stebėti)"
+
+msgid "Use UDP"
+msgstr "Naudoti UDP"
+
+msgid "Use proxy"
+msgstr "Be tarpininko"
+
+msgid "Proxy"
+msgstr "Tarpininkas"
+
+msgid "Auth User"
+msgstr "Vartotojas prieigos teisės tikrinimui"
+
+msgid "Auth Domain"
+msgstr "Sritis prieigos teisės tikrinimui"
+
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+"join &lt;kambarys&gt;:  prisijungti prie pokalbių kambario Yahoo tinkle"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  parodyti šio Yahoo tinklo kanalų sąrašą"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle:  paprašyti kontakto pradėti su juo paišymo seansą"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! protokolo papildinys"
+
+msgid "Pager server"
+msgstr "Pranešimų gaviklio serveris"
+
+msgid "Pager port"
+msgstr "Pranešimų gaviklio prievadas"
+
+msgid "File transfer server"
+msgstr "Failų perdavimo serveris"
+
+msgid "File transfer port"
+msgstr "Failų perdavimo prievadas"
+
+msgid "Chat room locale"
+msgstr "Pokalbių kambario lokalė"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignoruoti kvietimus į konferencijas ir pokalbių kambarius"
+
+msgid "Chat room list URL"
+msgstr "Pokalbių kambarių sąrašo URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo pokalbių serveris"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo pokalbių serverio prievadas"
+
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo Japonija ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! Japonija protokolo papildinys"
+
+msgid "Your SMS was not delivered"
+msgstr "Jūsų SMS nebuvo pristatyta"
+
+msgid "Your Yahoo! message did not get sent."
+msgstr "Jūsų Yahoo! žinutė nebuvo išsiųsta."
+
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "Yahoo! sisteminis pranešimas vartotojui %s:"
+
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+"%s atmeteė (atgaline data) Jūsų prašymą įtraukti jį į Jūsų bičiulių sąrašą "
+"dėl šios priežasties: %s."
+
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"%s atmetė (atgaline data) Jūsų prašymą įtraukti jį į Jūsų bičiulių sąrašą."
+
+msgid "Add buddy rejected"
+msgstr "Bičiulio pridėjimas atmestas"
+
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Gauti neteisingi duomenys"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Paskyra užblokuota: per daug nepavykusių bandymų prisijungti.  Prisijungimas "
+"prie Yahoo! svetainės galbūt tai pataisys."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Paskyra užblokuota dėl nežinomos priežasties.  Prisijungimas prie Yahoo! "
+"svetainės galbūt tai pataisys."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Trūksta naudotojo vardo ar slaptažodžio"
+
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+"Yahoo serveris pareikalavo nežinomo tapatybės nustatymo metodo.   Jums "
+"turbūt nepavyks sėkmingai prisijungti prie Yahoo.  Paieškokite atnaujinimų "
+"adresu %s."
+
+msgid "Failed Yahoo! Authentication"
+msgstr "Yahoo! tapatybės nustatymas nepavyko"
+
+#, 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 ""
+"Jūs bandėte ignoruoti vartotoją %s, bet jis yra Jūsų bičiulių sąraše.  "
+"Paspauskite „Taip“, jei norite pašalinti ir ignoruoti bičiulį."
+
+msgid "Ignore buddy?"
+msgstr "Ar ignoruoti bičiulį?"
+
+msgid "Your account is locked, please log in to the Yahoo! website."
+msgstr "Jūsų abonentas užblokuotas, prisijunkite prie Yahoo! svetainės."
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+"Nežinomas klaidos numeris %d.  Prisijungimas prie Yahoo! svetainės galbūt "
+"tai pataisys."
+
+#, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "Nepavyko pridėti bičiulio %s į grupę %s serverio sąraše paskyroje %s."
+
+msgid "Unable to add buddy to server list"
+msgstr "Nepavyko pridėti bičiulio į serverio sarašą"
+
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr "[ Garsinė žinutė %s/%s/%s.swf ] %s"
+
+msgid "Received unexpected HTTP response from server"
+msgstr "Gautas nelauktas HTTP atsakymas iš serverio."
+
+#, c-format
+msgid "Lost connection with %s: %s"
+msgstr "Prarasta jungtis su %s: %s"
+
+#, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Nepavyko prisijungti prie serverio %s: %s"
+
+msgid "Not at Home"
+msgstr "Ne namie"
+
+msgid "Not at Desk"
+msgstr "Ne darbo vietoje"
+
+msgid "Not in Office"
+msgstr "Ne biure"
+
+msgid "On Vacation"
+msgstr "Atostogose"
+
+msgid "Stepped Out"
+msgstr "Trumpam išėjęs"
+
+msgid "Not on server list"
+msgstr "Nėra serverio sąraše"
+
+msgid "Appear Online"
+msgstr "Atrodyti prisijungusiu"
+
+msgid "Appear Permanently Offline"
+msgstr "Atrodyti atsijungusiu"
+
+msgid "Presence"
+msgstr "Būsena"
+
+msgid "Appear Offline"
+msgstr "Atrodyti atsijungusiu"
+
+msgid "Don't Appear Permanently Offline"
+msgstr "Neatrodyti atsijungusiu"
+
+msgid "Join in Chat"
+msgstr "Prisijungti prie pokalbio"
+
+msgid "Initiate Conference"
+msgstr "Inicijuoti konferenciją"
+
+#  Use Environmental Settings


+msgid "Presence Settings"
+msgstr "Būsenos nuostatos"
+
+msgid "Start Doodling"
+msgstr "Pradėti paišinėjimą"
+
+msgid "Select the ID you want to activate"
+msgstr "Pasirinkite ID, kurį norite aktyvuoti"
+
+msgid "Join whom in chat?"
+msgstr "Prisijungti prie ko į pokalbį?"
+
+msgid "Activate ID..."
+msgstr "Aktyvuoti ID..."
+
+msgid "Join User in Chat..."
+msgstr "Prisijungti prie vartotojo pokalbyje..."
+
+msgid "Open Inbox"
+msgstr "Atidaryti pašto dėžutę"
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+msgid "Sent Doodle request."
+msgstr "Nusiųsta Doodle užklausa."
+
+msgid "Unable to connect."
+msgstr "Nepavyko prisijungti."
+
+msgid "Unable to establish file descriptor."
+msgstr "Negalima nustatyti failo deskriptoriaus."
+
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s siūlo atsiųsti %d failo(-ų) grupę\n"
+
+msgid "Write Error"
+msgstr "Rašymo klaida"
+
+msgid "Yahoo! Japan Profile"
+msgstr "Yahoo! Japonija profilis"
+
+msgid "Yahoo! Profile"
+msgstr "Yahoo! profilis"
+
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+"Atsiprašome, profiliai, pažymėti kaip tik suaugusiems, nėra palaikomi šiuo "
+"metu."
+
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr "Jeigu norite pamatyti šį profilį, turite šį saitą atverti naršyklėje:"
+
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+msgid "Hobbies"
+msgstr "Hobiai"
+
+msgid "Latest News"
+msgstr "Naujienos"
+
+msgid "Home Page"
+msgstr "Namų puslapis"
+
+msgid "Cool Link 1"
+msgstr "Puiki nuoroda 1"
+
+msgid "Cool Link 2"
+msgstr "Puiki nuoroda 2"
+
+msgid "Cool Link 3"
+msgstr "Puiki nuoroda 3"
+
+msgid "Last Update"
+msgstr "Paskutinis atnaujinimas"
+
+msgid ""
+"This profile is in a language or format that is not supported at this time."
+msgstr "Šis profilis parašytas šiuo metu nepalaikoma kalba ar formatu."
+
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"Nepavyko gauti vartotojo profilio.  Greičiausiai tai yra laikina serverio "
+"problema.  Prašome pabandyti vėliau iš naujo."
+
+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 ""
+"Nepavyko gauti vartotojo profilio.  Greičiausiai tai reiškia, kad toks "
+"vartuotojas neegzistuoja.  Tačiau kartais Yahoo! nepavyksta surasti "
+"egzistuojančio vartotojo profilio, todėl jei žinote, kad toks vartotojas "
+"egzistuoja, pabandykite vėliau iš naujo."
+
+msgid "The user's profile is empty."
+msgstr "Tuščias vartotojo profilis."
+
+#, c-format
+msgid "%s has declined to join."
+msgstr "%s atsisakė prisijungti."
+
+msgid "Failed to join chat"
+msgstr "Nepavyko prisijungti prie pokalbio"
+
+#. -6
+msgid "Unknown room"
+msgstr "Nežinomas kambarys"
+
+#. -15
+msgid "Maybe the room is full"
+msgstr "Galbūt kambarys yra pilnas"
+
+#. -35
+msgid "Not available"
+msgstr "Neprieinamas"
+
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Nežinoma klaida. Jums gali tektis atsijungti ir palaukti penkias minutės "
+"prieš atgaunant galimybę prisijungti prie pokalbių kambario"
+
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Jūs dabar kalbate %s."
+
+msgid "Failed to join buddy in chat"
+msgstr "Nepavyko prisijungti prie bičiulio pokalbių kambaryje"
+
+msgid "Maybe they're not in a chat?"
+msgstr "Galbūt jie nėra pokalbių kambaryje?"
+
+msgid "Fetching the room list failed."
+msgstr "Nepavyko gauti kambarių sąrašo."
+
+msgid "Voices"
+msgstr "Balsai"
+
+msgid "Webcams"
+msgstr "Internetinės kameros"
+
+msgid "Connection problem"
+msgstr "Jungties klaida"
+
+msgid "Unable to fetch room list."
+msgstr "Nepavyko gauti kambarių sąrašo."
+
+msgid "User Rooms"
+msgstr "Vartotojų kambariai"
+
+msgid "Connection problem with the YCHT server"
+msgstr "Jungties su YCHT serveriu problema"
+
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(Įvyko pranešimo konvertavimo klaida. Patikrinkite parinktį „Koduotė“ "
+"paskyrų redaktoriuje)"
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr "Nepavyko išsiųsti žinutės į pokalbių kambarį %s,%s,%s"
+
+msgid "Hidden or not logged-in"
+msgstr "Pasislėpęs arba neprisijungęs"
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr "<br>Prisijungęs prie %s nuo %s"
+
+msgid "Anyone"
+msgstr "Bet kas"
+
+msgid "_Class:"
+msgstr "_Klasė"
+
+msgid "_Instance:"
+msgstr "_Instancija"
+
+msgid "_Recipient:"
+msgstr "_Gavėjas:"
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "Bandymas užsirašyti į %s,%s,%s nepavyko"
+
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;slapyvardis&gt;:  surasti vartotoją"
+
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;slapyvardis&gt;:  surasti vartotoją"
+
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+"instance &lt;instancija&gt;:  nustatyti šioje klasėje vartojamą instanciją"
+
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instancija&gt;:  nustatyti šioje klasėje vartojamą instanciją"
+
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+"topic &lt;instancija&gt;:  nustatyti šioje klasėje vartojamą instanciją"
+
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+"sub &lt;klasė&gt; &lt;instancija&gt; &lt;gavėjas&gt;:  prisijungti prie "
+"naujo pokalbio"
+
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;instancija&gt;:  siųsti žinutę adresu &lt;ŽINUTĖ,<i>instancija</i>,"
+"*&gt;"
+
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;klasė&gt; &lt;instancija&gt;:  siųsti žinutę adresu &lt;<i>klasė</"
+"i>, <i>instancija</i>,*&gt;"
+
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zcir &lt;klasė&gt; &lt;instancija&gt; &lt;gavėjas&gt;:  siųsti žinutę adresu "
+"&lt;<i>klasė</i>,<i>instancija</i>,<i>gavėjas</i>&gt;"
+
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;instancija&gt; &lt;gavėjas&gt;:  siųsti žinutę adresu &lt;ŽINUTĖ,"
+"<i>instancija</i>,<i>gavėjas</i>&gt;"
+
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr ""
+"zc &lt;klasė&gt;:  siųsti žinutę adresu &lt;<i>klasė</i>,ASMENINĖ,*&gt;"
+
+msgid "Resubscribe"
+msgstr "Prisiregistruoti iš naujo"
+
+msgid "Retrieve subscriptions from server"
+msgstr "Gauti registracijas iš serverio"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Zephyr Protocol Plugin"
+msgstr "Zephyr protokolo papildinys"
+
+msgid "Use tzc"
+msgstr "Naudoti „tzc“"
+
+msgid "tzc command"
+msgstr "„tzc“ komanda"
+
+msgid "Export to .anyone"
+msgstr "Eksportuoti į .anyone"
+
+msgid "Export to .zephyr.subs"
+msgstr "Eksportuoti į .zephyr.subs"
+
+msgid "Import from .anyone"
+msgstr "Importuoti iš .anyone"
+
+msgid "Import from .zephyr.subs"
+msgstr "Importuoti iš .zephyr.subs"
+
+msgid "Realm"
+msgstr "Sritis"
+
+msgid "Exposure"
+msgstr "Atskleidimas"
+
+#  Data is assumed to be the destination sn


+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Nepavyko suprasti HTTP tarpininko serverio atsakymo: %s"
+
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr "HTTP tarpininko serverio jungties klaida %d"
+
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr ""
+"Kreiptis atmesta: HTTP serveris tarpininkas draudžia prievado %d tuneliavimą."
+
+#, c-format
+msgid "Error resolving %s"
+msgstr "Klaida nustatant %s"
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Prašoma %s dėmesio..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s paprašė jūsų dėmesio!"
+
+#  *


+#  * A wrapper for Pidgin_request_action() that uses Yes and No buttons.


+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+msgid "_Yes"
+msgstr "_Taip"
+
+msgid "_No"
+msgstr "_Ne"
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+msgid "_Accept"
+msgstr "_Priimti"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+msgid "I'm not here right now"
+msgstr "Manęs čia nėra šiuo metu"
+
+msgid "saved statuses"
+msgstr "išsaugotos būsenos"
+
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr "%s dabar žinomas kaip %s.\n"
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+"Vartotojas %s pakvietė bičiulį %s į pokalbių kambarį %s:\n"
+"%s"
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "Vartotojas %s pakvietė bičiulį %s į pokalbių kambarį %s\n"
+
+msgid "Accept chat invitation?"
+msgstr "Ar priimti pakvietimą į pokalbių kambarį?"
+
+#. Shortcut
+msgid "Shortcut"
+msgstr "Klavišų seka"
+
+msgid "The text-shortcut for the smiley"
+msgstr "Šypsenėlės klavišų seka"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Įrašytas vaizdas"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Įrašytas paveiksliukas. (kol kas reikia tenkintis tuo)"
+
+msgid "SSL Connection Failed"
+msgstr "SSL prisijungimas nepavyko"
+
+msgid "SSL Handshake Failed"
+msgstr "SSL pasisveikinimas nepavyko"
+
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL partneris pristatė neteisingą liudijimą"
+
+msgid "Unknown SSL error"
+msgstr "Nežinoma SSL klaida"
+
+msgid "Unset"
+msgstr "Atstatyti"
+
+msgid "Do not disturb"
+msgstr "Netrukdyti"
+
+msgid "Extended away"
+msgstr "Ilgam pasitraukęs"
+
+msgid "Listening to music"
+msgstr "Klausausi muzikos"
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) pakeitė būseną iš %s į %s"
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) dabar %s"
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) nebe %s"
+
+#, c-format
+msgid "%s became idle"
+msgstr "%s tapo neveiklus"
+
+#, c-format
+msgid "%s became unidle"
+msgstr "%s tapo veiklus"
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s tapo neveiklus"
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s tapo veiklus"
+
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+msgid "Calculating..."
+msgstr "Skaičiuojama..."
+
+msgid "Unknown."
+msgstr "Nežinoma."
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekundė"
+msgstr[1] "%d sekundės"
+msgstr[2] "%d sekundžių"
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d diena"
+msgstr[1] "%d dienos"
+msgstr[2] "%d dienų"
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d valanda"
+msgstr[1] "%s, %d valandos"
+msgstr[2] "%s, %d valandų"
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d valanda"
+msgstr[1] "%d valandos"
+msgstr[2] "%d valandų"
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d minutė"
+msgstr[1] "%s, %d minutės"
+msgstr[2] "%s, %d minučių"
+
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutė"
+msgstr[1] "%d minutės"
+msgstr[2] "%d minučių"
+
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "Nepavyko atverti %s: per daug peradresavimų"
+
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "Nepavyko prisijungti prie %s"
+
+#, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+msgstr ""
+"Skaitymo iš %s klaida: atsakymas per ilgas (maksimalus ilgis baitais: %d)"
+
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"Negalima išskirti pakankamai atminties %s turinio saugojimui.  Galbūt\n"
+"žiniatinklio serveris tyčia bando padaryti kažką blogo."
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "Skaitymo iš %s klaida: %s"
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "Rašymo į %s klaida: %s"
+
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "Nepavyko prisijungti prie %s: %s"
+
+#, c-format
+msgid " - %s"
+msgstr " – %s"
+
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr "Jungtis nutraukta kitos programos jūsų kompiuteryje."
+
+#. 10054
+#, c-format
+msgid "Remote host closed connection."
+msgstr "Nutolęs mazgas uždarė jungtį."
+
+#. 10060
+#, c-format
+msgid "Connection timed out."
+msgstr "Jungties laukimo laikas baigėsi."
+
+#. 10061
+#, c-format
+msgid "Connection refused."
+msgstr "Jungtis atmesta."
+
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "Adresas jau užimtas"
+
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s skaitymo klaida"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Failo %s skaitymo metu įvyko klaida.  Failas įkeltas nebuvo, o senasis "
+"failas pervadintas į %s~."
+
+msgid "Internet Messenger"
+msgstr "Pokalbiai internete"
+
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin pokalbiai internete"
+
+msgid "Send instant messages over multiple protocols"
+msgstr "Bendrauti keliais interneto pokalbių protokolais"
+
+msgid "Orientation"
+msgstr "Orientacija"
+
+msgid "The orientation of the tray."
+msgstr "Juostelės orientacija"
+
+#. Build the login options frame.
+msgid "Login Options"
+msgstr "Seanso pradžios parinktys"
+
+msgid "Pro_tocol:"
+msgstr "Pro_tokolas:"
+
+msgid "_Username:"
+msgstr "_Vartotojo vardas:"
+
+msgid "Remember pass_word"
+msgstr "P_risiminti slaptažodį"
+
+#. Build the user options frame.
+msgid "User Options"
+msgstr "Vartotojo parinktys"
+
+msgid "_Local alias:"
+msgstr "Vietinis a_lternatyvusis vardas:"
+
+msgid "New _mail notifications"
+msgstr "Praneši_mai apie naujus laiškus"
+
+#. Buddy icon
+msgid "Use this buddy _icon for this account:"
+msgstr "Naudot_i tokį vartotojo paveiksliuką šiai paskyrai:"
+
+msgid "Ad_vanced"
+msgstr "Papildomos _nuostatos"
+
+#  Use Global Proxy Settings


+#  Use Global Proxy Settings


+msgid "Use GNOME Proxy Settings"
+msgstr "naudoti GNOME tarpininkų nuostatas"
+
+#  Use Global Proxy Settings


+#  Use Global Proxy Settings


+msgid "Use Global Proxy Settings"
+msgstr "naudoti visuotines tarpininkų nuostatas"
+
+msgid "No Proxy"
+msgstr "be tarpininkų"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#  Use Environmental Settings


+msgid "Use Environmental Settings"
+msgstr "naudoti aplinkos nuostatas"
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+msgid "If you look real closely"
+msgstr "Jei pažiūrėtumėte tikrai iš arti,"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+msgid "you can see the butterflies mating"
+msgstr "galėtumėte matyti besiporuojancius drugelius"
+
+msgid "Proxy _type:"
+msgstr "Tarpininko _tipas:"
+
+msgid "_Host:"
+msgstr "_Mazgas:"
+
+msgid "_Port:"
+msgstr "_Prievadas:"
+
+msgid "Pa_ssword:"
+msgstr "_Slaptažodis:"
+
+msgid "Unable to save new account"
+msgstr "Nepavyko įrašyti naujos paskyros"
+
+msgid "An account already exists with the specified criteria."
+msgstr "Paskyra su tokiais požymiais jau yra."
+
+msgid "Add Account"
+msgstr "Pridėti paskyrą"
+
+msgid "_Basic"
+msgstr "_Pagrindinės nuostatos"
+
+msgid "Create _this new account on the server"
+msgstr "Sukur_ti šią naują paskyrą serveryje"
+
+msgid "P_roxy"
+msgstr "Ta_rpininkas"
+
+msgid "Enabled"
+msgstr "Įjungta"
+
+msgid "Protocol"
+msgstr "Protokolas"
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add...</b> button below and configure your first account. If you want %s "
+"to connect to multiple IM accounts, press <b>Add...</b> again to configure "
+"them all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
+msgstr ""
+"<span size='larger' weight='bold'>Sveikiname pradėjus naudoti %s!</span>\n"
+"\n"
+"Jūs neturite nustatytų paskyrų.  Norėdami su %s prisijungti, paspauskite "
+"<b>Pridėti...</b> mygtuką žemiau ir sukonfigūruokite pirmąją savo paskyrą.  "
+"Jei norite, kad %s prisijungtų prie daugiau paskyrų, paspauskite "
+"<b>Pridėti...</b> daugiau kartų ir sukonfigūruokite visas paskyras.\n"
+"\n"
+"Vėliau galite sugrįžti į šį langą sukurti, keisti, ar pašalinti paskyrų per "
+"<b>Paskyros->Tvarkyti paskyras</b> meniu bičiulių sąrašo lange."
+
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "Šiuo metu turite %d kontaktą vardu %s.  Ar norite juos sujungti?"
+msgstr[1] "Šiuo metu turite %d kontaktus vardu %s.  Ar norite juos sujungti?"
+msgstr[2] "Šiuo metu turite %d kontaktų vardu %s.  Ar norite juos sujungti?"
+
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"Po šių kontaktų suliejimo jie dalinsis bendrą įrašą bičiulių sąraše ir "
+"naudos brendrą pokalbių langą.  Galite juos vėl atskirti pasirinkdami "
+"„Išskleisti“ kontakto kontekstiniame meniu."
+
+msgid "Please update the necessary fields."
+msgstr "Pataisykite būtinus laukus."
+
+msgid "A_ccount"
+msgstr "_Paskyra"
+
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Prašome įvesti atitinkamą informaciją apie pokalbį, prie kurio norite "
+"prisijungti\n"
+
+msgid "Room _List"
+msgstr "Ka_mbarių sąrašas"
+
+#  Block button


+msgid "_Block"
+msgstr "_Blokuoti"
+
+#  Block button


+msgid "Un_block"
+msgstr "_Nebeblokuoti"
+
+msgid "Move to"
+msgstr "Perkelti į"
+
+msgid "Get _Info"
+msgstr "Gauti _informaciją"
+
+msgid "I_M"
+msgstr "_Kalbėtis"
+
+msgid "_Audio Call"
+msgstr "Pok_albis su garsu"
+
+msgid "Audio/_Video Call"
+msgstr "Audio/_Video skambutis"
+
+msgid "_Video Call"
+msgstr "Pokalbis su _vaizdu"
+
+msgid "_Send File..."
+msgstr "_Siųsti failą..."
+
+msgid "Add Buddy _Pounce..."
+msgstr "Sukurti #reakciją į bičiulį..."
+
+msgid "View _Log"
+msgstr "Žiūrėti žurna_lą"
+
+msgid "Hide When Offline"
+msgstr "Paslėpti, kai neprisijungęs"
+
+msgid "Show When Offline"
+msgstr "Rodyti, kai neprisijungęs"
+
+msgid "_Alias..."
+msgstr "N_aujas alternatyvusis vardas..."
+
+msgid "_Remove"
+msgstr "_Pašalinti"
+
+msgid "Set Custom Icon"
+msgstr "Nustatyti specialų paveiksliuką"
+
+msgid "Remove Custom Icon"
+msgstr "Pašalinti specialų vartotojo paveiksliuką"
+
+msgid "Add _Buddy..."
+msgstr "Pridėti _bičiulį..."
+
+msgid "Add C_hat..."
+msgstr "Pridėti pokalbių _kambarį..."
+
+msgid "_Delete Group"
+msgstr "_Pašalinti grupę"
+
+msgid "_Rename"
+msgstr "P_ervadinti"
+
+#  join button


+#. join button
+msgid "_Join"
+msgstr "Prisi_jungti"
+
+msgid "Auto-Join"
+msgstr "Automatiškai prisijungti"
+
+msgid "Persistent"
+msgstr "Pastovus"
+
+#  Use Environmental Settings


+msgid "_Edit Settings..."
+msgstr "K_eisti nuostatas..."
+
+msgid "_Collapse"
+msgstr "_Suskleisti"
+
+msgid "_Expand"
+msgstr "Išskl_eisti"
+
+msgid "/Tools/Mute Sounds"
+msgstr "/Įrankiai/Išjungti garsus"
+
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"Šiuo metu Jūs nesate prisijungęs su paskyra, kuri leistų įtraukti šį bičiulį."
+
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+msgid "Unknown node type"
+msgstr "Nežinomas mazgo tipas"
+
+#  Buddies menu


+#. Buddies menu
+msgid "/_Buddies"
+msgstr "/_Bičiuliai"
+
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Bičiuliai/_Nauja žinutė..."
+
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Bičiuliai/Prisijungti prie _pokalbio..."
+
+msgid "/Buddies/Get User _Info..."
+msgstr "/Bičiuliai/Ga_uti vartotojo informaciją..."
+
+msgid "/Buddies/View User _Log..."
+msgstr "/Buddies/_Rodyti vartotojo žurnalus..."
+
+#  Buddies menu


+msgid "/Buddies/Sh_ow"
+msgstr "/Bičiuliai/R_odyti"
+
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Bičiuliai/Rodyti/_atsijungusius bičiulius"
+
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Bičiuliai/Rodyti/_tuščias grupes"
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Bičiuliai/Rodyti/_informaciją apie bičiulius"
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Bičiuliai/Rodyti/n_eveiklumo laikus"
+
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Bičiuliai/Rodyti/_protokolų piktogramas"
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+msgid "/Buddies/_Sort Buddies"
+msgstr "/Bičiuliai/_Surikiuoti bičiulius"
+
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Bičiuliai/Pri_dėti bičiulį..."
+
+msgid "/Buddies/Add C_hat..."
+msgstr "/Bičiuliai/Pridėti pokalbių _kambarį..."
+
+msgid "/Buddies/Add _Group..."
+msgstr "/Bičiuliai/Prid_ėti grupę..."
+
+msgid "/Buddies/_Quit"
+msgstr "/Bičiuliai/Bai_gti"
+
+#. Accounts menu
+msgid "/_Accounts"
+msgstr "/_Paskyros"
+
+msgid "/Accounts/Manage Accounts"
+msgstr "/Paskyros/Tvarkyti paskyras"
+
+#  Tools


+#. Tools
+msgid "/_Tools"
+msgstr "/_Įrankiai"
+
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Įrankiai/_Reakcijos į bičiulius"
+
+msgid "/Tools/_Certificates"
+msgstr "/Įrankiai/_Liudijimai"
+
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Įrankiai/Indvidualios _šypsenėlės"
+
+msgid "/Tools/Plu_gins"
+msgstr "/Įrankiai/_Papildiniai"
+
+msgid "/Tools/Pr_eferences"
+msgstr "/Įrankiai/_Nuostatos"
+
+msgid "/Tools/Pr_ivacy"
+msgstr "/Įrankiai/Pr_ivatumas"
+
+msgid "/Tools/_File Transfers"
+msgstr "/Įrankiai/_Failų perdavimas"
+
+msgid "/Tools/R_oom List"
+msgstr "/Įrankiai/_Kambarių sąrašas"
+
+msgid "/Tools/System _Log"
+msgstr "/Įrankiai/_Sistemos žurnalas"
+
+msgid "/Tools/Mute _Sounds"
+msgstr "/Tools/Išjungti _garsus"
+
+#  Help


+#. Help
+msgid "/_Help"
+msgstr "/Pa_galba"
+
+msgid "/Help/Online _Help"
+msgstr "/Pagalba/_Žinynas internete"
+
+msgid "/Help/_Debug Window"
+msgstr "/Pagalba/_Derinimo langas"
+
+msgid "/Help/_About"
+msgstr "/Pagalba/_Apie"
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>Paskyra:</b> %s"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+"\n"
+"<b>Dalyvių:</b> %d"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>Tema:</b> %s"
+
+msgid "(no topic set)"
+msgstr "(temos nėra)"
+
+msgid "Buddy Alias"
+msgstr "Alternatyvusis bičiulio vardas"
+
+msgid "Logged In"
+msgstr "Prisijungęs"
+
+msgid "Last Seen"
+msgstr "Paskutinį kartą matytas"
+
+msgid "Spooky"
+msgstr "Vaiduokliškas"
+
+msgid "Awesome"
+msgstr "Stulbinantis"
+
+msgid "Rockin'"
+msgstr "Pavarantis"
+
+msgid "Total Buddies"
+msgstr "Iš viso bičiulių"
+
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Neveiklus %d d. %d val. %02d min. "
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Neveiklus %d val. %02d min. "
+
+#, c-format
+msgid "Idle %dm"
+msgstr "Neveiklus %d min. "
+
+msgid "/Buddies/New Instant Message..."
+msgstr "/Bičiuliai/Nauja žinutė..."
+
+#  Make menu items sensitive/insensitive where appropriate


+msgid "/Buddies/Join a Chat..."
+msgstr "/Bičiuliai/Prisijungti prie pokalbio..."
+
+msgid "/Buddies/Get User Info..."
+msgstr "/Bičiuliai/Gauti vartotojo informaciją..."
+
+msgid "/Buddies/Add Buddy..."
+msgstr "/Bičiuliai/Pridėti bičiulį..."
+
+msgid "/Buddies/Add Chat..."
+msgstr "/Bičiuliai/Pridėti pokalbių kambarį..."
+
+msgid "/Buddies/Add Group..."
+msgstr "/Bičiuliai/Pridėti grupę..."
+
+msgid "/Tools/Privacy"
+msgstr "/Įrankiai/Privatumas"
+
+msgid "/Tools/Room List"
+msgstr "/Įrankiai/Kambarių sąrašas"
+
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d neperskaityta žinutė iš %s\n"
+msgstr[1] "%d neperskaitytos žinutės iš %s\n"
+msgstr[2] "%d neperskaitytų žinučių iš %s\n"
+
+msgid "Manually"
+msgstr "rankiniu būdu"
+
+msgid "By status"
+msgstr "pagal statusą"
+
+msgid "By recent log activity"
+msgstr "pagal paskutinius įrašus žurnale"
+
+#, c-format
+msgid "%s disconnected"
+msgstr "%s atsijungė"
+
+#, c-format
+msgid "%s disabled"
+msgstr "%s išjungtas"
+
+msgid "Reconnect"
+msgstr "Jungtis iš naujo"
+
+msgid "Re-enable"
+msgstr "Aktyvuoti vėl"
+
+msgid "SSL FAQs"
+msgstr "DUK apie SSL"
+
+msgid "Welcome back!"
+msgstr "Sveiki sugrįžę!"
+
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] "%d paskyra buvo išjungta, nes prisijungėte iš kitur:"
+msgstr[1] "%d paskyros buvo išjungtos, nes prisijungėte iš kitur:"
+msgstr[2] "%d paskyrų buvo išjungta, nes prisijungėte iš kitur:"
+
+msgid "<b>Username:</b>"
+msgstr "<b>Vartotojo vardas:</b>"
+
+msgid "<b>Password:</b>"
+msgstr "<b>Slaptažodis:</b>"
+
+msgid "_Login"
+msgstr "_Prisijungti"
+
+msgid "/Accounts"
+msgstr "/Paskyros"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span weight='bold' size='larger'>Sveikiname pradėjus naudoti %s!</span>\n"
+"\n"
+"Jūs neturite aktyvuotų paskyrų.  Aktyvuokite jas lange <b>„Paskyros“</b>, "
+"pasiekiamame per <b>Paskyros->Tvarkyti paskyras</b> meniu bičiulių sąrašo "
+"lange.  Aktyvavę paskyras, galėsite prisijungti, nustatyti savo būseną ir "
+"šnekėtis su draugais."
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Bičiuliai/Rodyti/atsijungusius bičiulius"
+
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Bičiuliai/Rodyti/tuščias grupes"
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Bičiuliai/Rodyti/informaciją apie bičiulius"
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+msgid "/Buddies/Show/Idle Times"
+msgstr "/Bičiuliai/Rodyti/neveiklumo laikus"
+
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Bičiuliai/Rodyti/protokolų piktogramas"
+
+msgid "Add a buddy.\n"
+msgstr "Pridėti bičiulį.\n"
+
+msgid "Buddy's _username:"
+msgstr "_Bičiulio naudotojo vardas:"
+
+#  Optional Information section


+msgid "(Optional) A_lias:"
+msgstr "(Neprivaloma) A_lternatyvus vardas:"
+
+msgid "Add buddy to _group:"
+msgstr "Bičiulį pridėti į _grupę:"
+
+msgid "This protocol does not support chat rooms."
+msgstr "Šis protokolas nepalaiko pokalbių kambarių."
+
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Šiuo metu nesate prisijungęs su jokiu pokalbių kambarius palaikančiu "
+"protokolu."
+
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Prašome įvesti alternatyvųjį vardą ir kitą informaciją apie pokalbių "
+"kambarį, kurį norite įtraukti į bičiulių sąrašą.\n"
+
+msgid "A_lias:"
+msgstr "A_lternatyvusis vardas:"
+
+msgid "_Group:"
+msgstr "_Grupė:"
+
+msgid "Auto_join when account becomes online."
+msgstr "Automatiškai prisi_jungti, kai paskyra aktyvuojama."
+
+msgid "_Remain in chat after window is closed."
+msgstr "_Pasilikti pokalbyje ir uždarius langą."
+
+msgid "Please enter the name of the group to be added."
+msgstr "Prašome įvesti pridedamos grupės pavadinimą."
+
+msgid "Enable Account"
+msgstr "Aktyvuoti paskyrą"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Paskyros/Aktyvuoti paskyrą"
+
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/Paskyros/"
+
+msgid "_Edit Account"
+msgstr "K_eisti paskyrą..."
+
+msgid "No actions available"
+msgstr "Veiksmų nėra"
+
+msgid "_Disable"
+msgstr "_Deaktyvuoti"
+
+#  Tools


+msgid "/Tools"
+msgstr "/Įrankiai"
+
+#  set the Show Offline Buddies option. must be done


+#  * after the treeview or faceprint gets mad. -Robot101


+msgid "/Buddies/Sort Buddies"
+msgstr "/Bičiuliai/Surikiuoti bičiulius"
+
+#. Buddy List
+msgid "Background Color"
+msgstr "Fono spalva"
+
+msgid "The background color for the buddy list"
+msgstr "Bičiulių sąrašo fono spalvo"
+
+msgid "Layout"
+msgstr "Išdėstymas"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Piktogramų, vardų ir būklės pranešimų išdėstymas bičiulių sąraše"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Išskleisto fono spalva"
+
+msgid "The background color of an expanded group"
+msgstr "Išskleistos grupės fono spalva"
+
+msgid "Expanded Text"
+msgstr "Išskleistas tekstas"
+
+msgid "The text information for when a group is expanded"
+msgstr "Tekstas, kai grupė išskleidžiama"
+
+msgid "Collapsed Background Color"
+msgstr "Suskleisto fono spalva"
+
+msgid "The background color of a collapsed group"
+msgstr "Suskleistos grupės fono spalva"
+
+msgid "Collapsed Text"
+msgstr "Suskleistas tekstas"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Tekstas, kai grupė suskleidžiama"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Kontakto/pokalbio fono spalva"
+
+msgid "The background color of a contact or chat"
+msgstr "Fono spalva kontaktui arba pokalbiui"
+
+msgid "Contact Text"
+msgstr "Kontakto tekstas"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Tekstas, kai kontaktas išskleidžiamas"
+
+msgid "On-line Text"
+msgstr "Prisijungusio bičiulio tekstas"
+
+msgid "The text information for when a buddy is online"
+msgstr "Tekstas, kai bičiulis yra prisijungęs"
+
+msgid "Away Text"
+msgstr "Pasitraukusio bičiulio tekstas"
+
+msgid "The text information for when a buddy is away"
+msgstr "Tekstas, kai bičiulis yra pasišalinęs"
+
+msgid "Off-line Text"
+msgstr "Atsijungusio bičiulio tekstas"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Tekstas, kai bičiulis yra atsijungęs"
+
+msgid "Idle Text"
+msgstr "Neveiklaus bičiulio tekstas"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Tekstas, kai bičiulis yra neveiklus"
+
+msgid "Message Text"
+msgstr "Žinutės tekstas"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Tekstas, kai bičiulis yra gavęs neperskaitytą žinutę"
+
+msgid "Message (Nick Said) Text"
+msgstr "Žinutės (pasakytas vardas) tekstas"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr "Tekstas, kai pokalbis turi neperskaitytą žinutė, kuri mini jūsų vardą"
+
+msgid "The text information for a buddy's status"
+msgstr "Teksto informacija bičiulio būklei"
+
+msgid "Type the host name for this certificate."
+msgstr "Įveskite mazgo, kuriam skirtas šis liudijimas, vardą"
+
+#. Widget creation function
+msgid "SSL Servers"
+msgstr "SSL serveriai"
+
+msgid "Unknown command."
+msgstr "Nežinoma komanda."
+
+msgid "That buddy is not on the same protocol as this chat."
+msgstr "Tas bičiulis nenaudoja to paties protokolo kaip šis pokalbių kambarys."
+
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"Šiuo metu Jūs nesate prisijungęs su jokia paskyra, kuri leistų pakviesti tą "
+"bičiulį."
+
+msgid "Invite Buddy Into Chat Room"
+msgstr "Pakviesti bičiulį į pokalbių kambarį"
+
+msgid "_Buddy:"
+msgstr "_Bičiulis:"
+
+msgid "_Message:"
+msgstr "Ž_inutė:"
+
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Pokalbis su %s</h1>\n"
+
+msgid "Save Conversation"
+msgstr "Įrašyti pokalbį"
+
+msgid "Find"
+msgstr "Paieška"
+
+msgid "_Search for:"
+msgstr "_Ieškoti:"
+
+msgid "Un-Ignore"
+msgstr "Nebeignoruoti"
+
+msgid "Ignore"
+msgstr "Ignoruoti"
+
+msgid "Get Away Message"
+msgstr "Gauti pasitraukimo žinutę"
+
+msgid "Last Said"
+msgstr "Paskutinė žinutė"
+
+msgid "Unable to save icon file to disk."
+msgstr "Negalima įrašyti vartotojo paveiksliuko failo į diską."
+
+msgid "Save Icon"
+msgstr "Įrašyti vartotojo paveiksliuką"
+
+msgid "Animate"
+msgstr "Animuoti"
+
+msgid "Hide Icon"
+msgstr "Paslėpti vartotojo paveiksliuką"
+
+msgid "Save Icon As..."
+msgstr "Įrasyti vartotojo paveiksliuką kaip..."
+
+msgid "Set Custom Icon..."
+msgstr "Nustatyti specialų vartotojo paveiksliuką..."
+
+msgid "Change Size"
+msgstr "Keisti dydį"
+
+msgid "Show All"
+msgstr "Viską rodyti"
+
+#  Conversation menu


+#. Conversation menu
+msgid "/_Conversation"
+msgstr "/_Pokalbis"
+
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Pokalbis/_Nauja žinutė..."
+
+msgid "/Conversation/_Find..."
+msgstr "/Pokalbis/_Ieškoti..."
+
+msgid "/Conversation/View _Log"
+msgstr "/Pokalbis/Žiūrėti žurna_lą"
+
+msgid "/Conversation/_Save As..."
+msgstr "/Pokalbis/Įrašyti _kaip..."
+
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Pokalbis/Iš_valyti langą"
+
+msgid "/Conversation/M_edia"
+msgstr "/Pokalbis/_Terpė"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Pokalbis/Terpė/Sk_ambutis su garsu"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Pokalbis/Terpė/Skambutis su _vaizdu"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Pokalbis/Terpė/_Skambutis su garsu ir vaizdu"
+
+msgid "/Conversation/Se_nd File..."
+msgstr "/Pokalbis/Nusiųsti _failą..."
+
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Pokalbis/_Pridėti reakciją į bičiulį..."
+
+msgid "/Conversation/_Get Info"
+msgstr "/Pokalbis/_Gauti informaciją"
+
+msgid "/Conversation/In_vite..."
+msgstr "/Pokalbis/_Pakviesti..."
+
+msgid "/Conversation/M_ore"
+msgstr "/Pokalbis/_Daugiau"
+
+msgid "/Conversation/Al_ias..."
+msgstr "/Pokalbis/Al_ternatyvusis vardas..."
+
+msgid "/Conversation/_Block..."
+msgstr "/Pokalbis/_Blokuoti..."
+
+msgid "/Conversation/_Unblock..."
+msgstr "/Pokalbis/Atbl_okuoti..."
+
+msgid "/Conversation/_Add..."
+msgstr "/Pokalbis/P_ridėti..."
+
+msgid "/Conversation/_Remove..."
+msgstr "/Pokalbis/P_ašalinti..."
+
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Pokalbis/_Įterpti nuorodą..."
+
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Pokalbis/Įt_erpti paveiksliuką..."
+
+msgid "/Conversation/_Close"
+msgstr "/Pokalbis/U_žverti"
+
+#  Options


+#. Options
+msgid "/_Options"
+msgstr "/P_arinktys"
+
+msgid "/Options/Enable _Logging"
+msgstr "/Parinktys/Įjungti ž_urnalų vedimą"
+
+msgid "/Options/Enable _Sounds"
+msgstr "/Parinktys/Įjungti gar_sus"
+
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Parinktys/Rodyti forma_to taikymo priemonių juostas"
+
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Parinktys/Rodyti laiko žy_mas"
+
+msgid "/Conversation/More"
+msgstr "/Pokalbis/Daugiau"
+
+#  Options


+msgid "/Options"
+msgstr "/Parinktys"
+
+#  Conversation menu


+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+msgid "/Conversation"
+msgstr "/Pokalbis"
+
+msgid "/Conversation/View Log"
+msgstr "/Pokalbis/Rodyti žurnalą"
+
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Pokalbis/Terpė/Skambutis su garsu"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Pokalbis/Terpė/Skambutis su vaizdu"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Pokalbis/Terpė/Skambutis su garsu ir vaizdu"
+
+msgid "/Conversation/Send File..."
+msgstr "/Pokalbis/Siųsti failą..."
+
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Pokalbis/Pridėti reakciją į bičiulį..."
+
+msgid "/Conversation/Get Info"
+msgstr "/Pokalbis/Gauti informaciją"
+
+msgid "/Conversation/Invite..."
+msgstr "/Pokalbis/Pakviesti..."
+
+msgid "/Conversation/Alias..."
+msgstr "/Pokalbis/Alternatyvusis vardas..."
+
+msgid "/Conversation/Block..."
+msgstr "/Pokalbis/Blokuoti..."
+
+msgid "/Conversation/Unblock..."
+msgstr "/Pokalbis/Atblokuoti..."
+
+msgid "/Conversation/Add..."
+msgstr "/Pokalbis/Pridėti..."
+
+msgid "/Conversation/Remove..."
+msgstr "/Pokalbis/Pašalinti..."
+
+msgid "/Conversation/Insert Link..."
+msgstr "/Pokalbis/Įterpti nuorodą..."
+
+msgid "/Conversation/Insert Image..."
+msgstr "/Pokalbis/Įterpti paveiksliuką..."
+
+msgid "/Options/Enable Logging"
+msgstr "/Parinktys/Įjungti žurnalų vedimą"
+
+msgid "/Options/Enable Sounds"
+msgstr "/Parinktys/Įjungti garsus"
+
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Parinktys/Rodyti formato taikymo priemonių juostas"
+
+msgid "/Options/Show Timestamps"
+msgstr "/Parinktys/Rodyti laiko žymas"
+
+msgid "User is typing..."
+msgstr "Vartotojas rašo..."
+
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s nustojo rašyti"
+
+#  Build the Send As menu


+#. Build the Send To menu
+msgid "S_end To"
+msgstr "_Siųsti paskyrai"
+
+#  Build the Send As menu


+msgid "_Send"
+msgstr "_Siųsti"
+
+#  Setup the label telling how many people are in the room.


+#. Setup the label telling how many people are in the room.
+msgid "0 people in room"
+msgstr "0 žmonių kambaryje"
+
+#  Setup the label telling how many people are in the room.


+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d asmuo kambaryje"
+msgstr[1] "%d asmenys kambaryje"
+msgstr[2] "%d asmenų kambaryje"
+
+msgid "Typing"
+msgstr "Renkamas tekstas"
+
+msgid "Stopped Typing"
+msgstr "Nustota rinkti tekstą"
+
+msgid "Nick Said"
+msgstr "Pasakytas vardas"
+
+msgid "Unread Messages"
+msgstr "Neperskaitytos žinutės"
+
+msgid "New Event"
+msgstr "Naujas įvykis"
+
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: išvalo visus pokalbių žinučių langus."
+
+msgid "Confirm close"
+msgstr "Patvirtinkite uždarymą"
+
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "Turite neperskaitytų žinučių. Ar tikrai norite uždaryti langą?"
+
+msgid "Close other tabs"
+msgstr "Uždaryti kitas korteles"
+
+msgid "Close all tabs"
+msgstr "Uždaryti visas korteles"
+
+msgid "Detach this tab"
+msgstr "Atskirti šią kortelę"
+
+msgid "Close this tab"
+msgstr "Uždaryti šią kortelę"
+
+msgid "Close conversation"
+msgstr "Uždaryti pokalbį"
+
+msgid "Last created window"
+msgstr "Paskutiniame sukurtame lange"
+
+msgid "Separate IM and Chat windows"
+msgstr "Atskiruose asmeninių pokalbių ir pokalbių kambarių languose"
+
+msgid "New window"
+msgstr "Naujame lange"
+
+msgid "By group"
+msgstr "Grupuoti pagal grupę"
+
+msgid "By account"
+msgstr "Grupuoti pagal paskyrą"
+
+msgid "Save Debug Log"
+msgstr "Įrašyti derinimo žurnalą"
+
+msgid "Invert"
+msgstr "Priešingai"
+
+msgid "Highlight matches"
+msgstr "Paryškinti rastus rezultatus"
+
+msgid "_Icon Only"
+msgstr "T_ik piktogramos"
+
+msgid "_Text Only"
+msgstr "_Tik tekstai"
+
+msgid "_Both Icon & Text"
+msgstr "_Piktogramos ir tekstai"
+
+msgid "Filter"
+msgstr "Filtras"
+
+msgid "Right click for more options."
+msgstr "Spustelėkite dešinįjį pelės mygtuką kitų parinkčių rodymui."
+
+msgid "Level "
+msgstr "Lygis "
+
+msgid "Select the debug filter level."
+msgstr "Pasirinkite derinimo informacijos filtravimo lygį."
+
+msgid "All"
+msgstr "Viskas"
+
+msgid "Misc"
+msgstr "Kiti"
+
+msgid "Warning"
+msgstr "Perspėjimai"
+
+msgid "Error "
+msgstr "Klaidos "
+
+msgid "Fatal Error"
+msgstr "Lemtingos klaidos"
+
+msgid "bug master"
+msgstr "Riktų šeimininkas"
+
+msgid "artist"
+msgstr "dailininkas"
+
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "Ka-Hing Cheung"
+
+msgid "voice and video"
+msgstr "garsas ir vaizdas"
+
+msgid "support"
+msgstr "palaikymas"
+
+msgid "webmaster"
+msgstr "svetainės administratorius"
+
+msgid "Senior Contributor/QA"
+msgstr "Vyresnysis bendradarbis/kokybės kontrolė"
+
+msgid "win32 port"
+msgstr "perkėlimas į win32"
+
+msgid "maintainer"
+msgstr "prižiūrėtojas"
+
+msgid "libfaim maintainer"
+msgstr "libfaim prižiūrėtojas"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hakeris ir negeriantis, nes prie vairo [tingus bastūnas]"
+
+msgid "support/QA"
+msgstr "priežiūra ir kokybės kontrolė"
+
+msgid "XMPP"
+msgstr "XMPP"
+
+msgid "original author"
+msgstr "pradinis autorius"
+
+msgid "lead developer"
+msgstr "pagrindinis kūrėjas"
+
+msgid "Afrikaans"
+msgstr "Būrų kalba"
+
+msgid "Arabic"
+msgstr "Arabų kalba"
+
+msgid "Belarusian Latin"
+msgstr "Baltarusų kalba lotynu abėcėle"
+
+msgid "Bulgarian"
+msgstr "Bulgarų kalba"
+
+msgid "Bengali"
+msgstr "Bengalų kalba"
+
+msgid "Bosnian"
+msgstr "Bosnių kalba"
+
+msgid "Catalan"
+msgstr "Katalonų kalba"
+
+msgid "Valencian-Catalan"
+msgstr "Valenciečių-katalonų kalba"
+
+msgid "Czech"
+msgstr "Čekų kalba"
+
+msgid "Danish"
+msgstr "Danų kalba"
+
+msgid "German"
+msgstr "Vokiečių kalba"
+
+msgid "Dzongkha"
+msgstr "Botijų kalba"
+
+msgid "Greek"
+msgstr "Graikų kalba"
+
+msgid "Australian English"
+msgstr "Australų anglų kalba"
+
+msgid "Canadian English"
+msgstr "Kanadiečių anglų kalba"
+
+msgid "British English"
+msgstr "Britų anglų kalba"
+
+msgid "Esperanto"
+msgstr "Esperanto"
+
+msgid "Spanish"
+msgstr "Ispanų kalba"
+
+msgid "Estonian"
+msgstr "Estų kalba"
+
+msgid "Euskera(Basque)"
+msgstr "Baskų kalba"
+
+msgid "Persian"
+msgstr "Persų kalba"
+
+msgid "Finnish"
+msgstr "Suomių kalba"
+
+msgid "French"
+msgstr "Prancūzų kalba"
+
+msgid "Irish"
+msgstr "Airių kalba"
+
+msgid "Galician"
+msgstr "Galeganų kalba"
+
+msgid "Gujarati"
+msgstr "Gudžaratų kalba"
+
+msgid "Gujarati Language Team"
+msgstr "Gudžarati kalbos komanda"
+
+msgid "Hebrew"
+msgstr "Hebrajų kalba"
+
+msgid "Hindi"
+msgstr "Hindi kalba"
+
+msgid "Hungarian"
+msgstr "Vengrų kalba"
+
+msgid "Armenian"
+msgstr "Armėnų kalba"
+
+msgid "Indonesian"
+msgstr "Indoneziečių kalba"
+
+msgid "Italian"
+msgstr "Italų kalba"
+
+msgid "Japanese"
+msgstr "Japonų kalba"
+
+msgid "Georgian"
+msgstr "Gruzinų kalba"
+
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu vertėjai į gruzinų kalbą"
+
+msgid "Khmer"
+msgstr "Khmerų kalba"
+
+msgid "Kannada"
+msgstr "Kanadų kalba"
+
+msgid "Kannada Translation team"
+msgstr "Kanadų kalbos vertimo komanda"
+
+msgid "Korean"
+msgstr "Korėjiečių kalba"
+
+msgid "Kurdish"
+msgstr "Kurdų kalba"
+
+msgid "Lao"
+msgstr "Laosiečių kalba"
+
+msgid "Lithuanian"
+msgstr "Lietuvių kalba"
+
+msgid "Macedonian"
+msgstr "Makedoniečių kalba"
+
+msgid "Mongolian"
+msgstr "Mongolų kalba"
+
+msgid "Bokmål Norwegian"
+msgstr "Norvegų kalba (Bokmål)"
+
+msgid "Nepali"
+msgstr "Nepalų kalba"
+
+msgid "Dutch, Flemish"
+msgstr "Olandų, flamandų kalba"
+
+msgid "Norwegian Nynorsk"
+msgstr "Norvegų kalba (nynorsk)"
+
+msgid "Occitan"
+msgstr "Oksitanų kalba"
+
+msgid "Punjabi"
+msgstr "Pandžabų kalba"
+
+msgid "Polish"
+msgstr "Lenkų kalba"
+
+msgid "Portuguese"
+msgstr "Portugalų kalba"
+
+msgid "Portuguese-Brazil"
+msgstr "Brazilų portugalų kalba"
+
+msgid "Pashto"
+msgstr "Puštūnų kalba"
+
+msgid "Romanian"
+msgstr "Rumunų kalba"
+
+msgid "Russian"
+msgstr "Rusų kalba"
+
+msgid "Slovak"
+msgstr "Slovakų kalba"
+
+msgid "Slovenian"
+msgstr "Slovėnų kalba"
+
+msgid "Albanian"
+msgstr "Albanų kalba"
+
+msgid "Serbian"
+msgstr "Serbų kalba"
+
+msgid "Sinhala"
+msgstr "Sinhalų kalba"
+
+msgid "Swedish"
+msgstr "Švedų kalba"
+
+msgid "Swahili"
+msgstr "Suahilių kalba"
+
+msgid "Tamil"
+msgstr "Tamilų kalba"
+
+msgid "Telugu"
+msgstr "Telugu kalba"
+
+msgid "Thai"
+msgstr "Tajų kalba"
+
+msgid "Turkish"
+msgstr "Turkų kalba"
+
+msgid "Urdu"
+msgstr "Urdu kalba"
+
+msgid "Vietnamese"
+msgstr "Vietnamiečių kalba"
+
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M. Thanh ir Gnome-Vi komanda"
+
+msgid "Simplified Chinese"
+msgstr "Supaprastinta kinų kalba"
+
+msgid "Hong Kong Chinese"
+msgstr "Hongkongo kinų kalba"
+
+msgid "Traditional Chinese"
+msgstr "Tradicinė kinų kalba"
+
+msgid "Amharic"
+msgstr "Amharų kalba"
+
+#, c-format
+msgid "About %s"
+msgstr "Apie %s"
+
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+"%s yra grafine modulinė pokalbių programa libpurple pagrindu, su kuria "
+"galima bendrauti AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu ir QQ "
+"tinkluose – visuose vienu metu.  Programa parašyta naudojant GTK+."
+"<br><br>Jūs galite keisti ir platinti šią programą GPL (2-os ar vėlesnės "
+"versijos) sąlygomis.  GPL kopija yra faile „COPYING“, platinamame kartu su %"
+"s.  %s autorinės teisės priklauso programos autoriams.  Faile „COPYRIGHT“ "
+"pateiktas pilnas autorių sąrašas.  Mes neteikiame jokios garantijos šiai "
+"programai.<br><br>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">DUK:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">Pagalba el. paštu:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC kanalas:</FONT> #pidgin serveryje irc.freenode."
+"net<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+
+msgid "Current Developers"
+msgstr "Dabartiniai kūrėjai"
+
+msgid "Crazy Patch Writers"
+msgstr "Pakvaišę pataisų rašytojai"
+
+msgid "Retired Developers"
+msgstr "Buvę kūrėjai"
+
+msgid "Retired Crazy Patch Writers"
+msgstr "Atsistadydinę pakvaišę pataisų rašytojai"
+
+msgid "Current Translators"
+msgstr "Dabartiniai vertėjai"
+
+msgid "Past Translators"
+msgstr "Buvę vertėjai"
+
+msgid "Debugging Information"
+msgstr "Derinimo informacija"
+
+msgid "_Name"
+msgstr "_Vardas"
+
+msgid "_Account"
+msgstr "_Paskyra"
+
+msgid "Get User Info"
+msgstr "Gauti vartotojo informaciją"
+
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+"Įveskite naudotojo vardą arba alternatyvųjį vardą asmens, kurio informaciją "
+"Jūs norite pažiūrėti."
+
+msgid "View User Log"
+msgstr "Žiūrėti vartotojo žurnalą"
+
+msgid "Alias Contact"
+msgstr "Alternatyvusis kontakto vardas"
+
+msgid "Enter an alias for this contact."
+msgstr "Įveskite alternatyvųjį vardą šiam kontaktui."
+
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Įveskite alternatyvųjį vardą vartotojui %s."
+
+msgid "Alias Buddy"
+msgstr "Alternatyvusis bičiulio vardas"
+
+msgid "Alias Chat"
+msgstr "Alternatyvusis pokalbių kambario vardas"
+
+msgid "Enter an alias for this chat."
+msgstr "Įveskite alternatyvųjį vardą šiam pokalbių kambariui."
+
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"Jūs ruošiates pašalinti konktaktą su %s ir turintį dar %d kitą šio bičiulio "
+"paskyrą iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
+msgstr[1] ""
+"Jūs ruošiates pašalinti konktaktą su %s ir turintį dar %d kitas bičiulio "
+"paskyras iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
+msgstr[2] ""
+"Jūs ruošiatės pašalinti kontaktą su %s ir turintį dar %d kitų bičiulio "
+"paskyrų iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
+
+msgid "Remove Contact"
+msgstr "Pašalinti kontaktą"
+
+msgid "_Remove Contact"
+msgstr "_Pašalinti kontaktą"
+
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr "Jūs ruošiates grupę %s prijungti prie grupės %s. Ar norite tęsti?"
+
+msgid "Merge Groups"
+msgstr "Sujungti grupes"
+
+msgid "_Merge Groups"
+msgstr "_Sujungti grupes"
+
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"Jūs ruošiates pašalinti grupę %s ir visus jos narius iš Jūsų bičiulių "
+"sąrašo.  Ar norite tęsti?"
+
+msgid "Remove Group"
+msgstr "Pašalinti grupę"
+
+msgid "_Remove Group"
+msgstr "_Pašalinti grupę"
+
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "Jūs ruošiates pašalinti %s iš Jūsų bičiulių sąrašo.  Ar norite tęsti?"
+
+msgid "Remove Buddy"
+msgstr "Pašalinti bičiulį"
+
+msgid "_Remove Buddy"
+msgstr "_Pašalinti bičiulį"
+
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"Jūs ruošiates pašalinti pokalbių kambarį %s iš Jūsų bičiulių sąrašo.  Ar "
+"norite tęsti?"
+
+msgid "Remove Chat"
+msgstr "Pašalinti pokalbių kambarį"
+
+msgid "_Remove Chat"
+msgstr "_Pašalinti pokalbių kambarį"
+
+msgid "Right-click for more unread messages...\n"
+msgstr ""
+"Spustelėkite dešinį pelės mygtuką, kad pamatytumėte kitas neperskaitytas "
+"žinutes...\n"
+
+msgid "_Change Status"
+msgstr "_Keisti būseną"
+
+msgid "Show Buddy _List"
+msgstr "_Rodyti bičiulių sąrašą"
+
+msgid "_Unread Messages"
+msgstr "_Neperskaitytos žinutės"
+
+msgid "New _Message..."
+msgstr "Nauja _žinutė..."
+
+msgid "_Accounts"
+msgstr "_Paskyros"
+
+msgid "Plu_gins"
+msgstr "P_apildiniai"
+
+msgid "Pr_eferences"
+msgstr "N_uostatos"
+
+msgid "Mute _Sounds"
+msgstr "_Išjungti garsus"
+
+msgid "_Blink on New Message"
+msgstr "_Mirksėti gavus naują žinutę"
+
+msgid "_Quit"
+msgstr "I_šeiti"
+
+msgid "Not started"
+msgstr "Nepradėta"
+
+msgid "<b>Receiving As:</b>"
+msgstr "<b>Gaunama kaip:</b>"
+
+msgid "<b>Receiving From:</b>"
+msgstr "<b>Gaunama iš:</b>"
+
+msgid "<b>Sending To:</b>"
+msgstr "<b>Siunčiama kam:</b>"
+
+msgid "<b>Sending As:</b>"
+msgstr "<b>Siunčiama kaip:</b>"
+
+msgid "There is no application configured to open this type of file."
+msgstr "Jokia programa nėra sukonfigūruota atverti šio tipo failą."
+
+msgid "An error occurred while opening the file."
+msgstr "Failo atvėrimo metu įvyko klaida."
+
+#, c-format
+msgid "Error launching %s: %s"
+msgstr "Programos %s paleidimo klaida: %s"
+
+#, c-format
+msgid "Error running %s"
+msgstr "Programos %s vykdymo klaida"
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr "Procesas grąžino klaidos kodą %d"
+
+msgid "Filename:"
+msgstr "Failo pavadinimas:"
+
+msgid "Local File:"
+msgstr "Vietinis failas:"
+
+msgid "Speed:"
+msgstr "Greitis:"
+
+msgid "Time Elapsed:"
+msgstr "Praėjo laiko:"
+
+msgid "Time Remaining:"
+msgstr "Liko laiko:"
+
+msgid "Close this window when all transfers _finish"
+msgstr "_Uždaryti ši langą pasibaigus visiems failų perdavimams"
+
+msgid "C_lear finished transfers"
+msgstr "_Pašalinti pabaigtus perdavimus"
+
+#. "Download Details" arrow
+msgid "File transfer _details"
+msgstr "_Informacija apie perdavimą"
+
+msgid "Paste as Plain _Text"
+msgstr "Įdėti kaip gryną _tekstą"
+
+msgid "_Reset formatting"
+msgstr "Atstatyti fo_rmato taikymą"
+
+msgid "Disable _smileys in selected text"
+msgstr "Pa_sirinktame tekste išjungti šypsenėles"
+
+msgid "Hyperlink color"
+msgstr "Hipersaito spalva"
+
+msgid "Color to draw hyperlinks."
+msgstr "Spalva hipersaitų vaizdavimui."
+
+msgid "Hyperlink visited color"
+msgstr "Aplankyto hipersaito spalva"
+
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr "Jau aplankyto ar aktyvuoto hipersaito spalva."
+
+msgid "Hyperlink prelight color"
+msgstr "Hipersaito paryškinimo spalva"
+
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "Hipersaito spalva, kai virš jo yra pelės žymeklis."
+
+msgid "Sent Message Name Color"
+msgstr "Vardo spalva išsiunčiamose žinutėse"
+
+msgid "Color to draw the name of a message you sent."
+msgstr "Spalva vardui išsiunčiamoje žinutėje."
+
+msgid "Received Message Name Color"
+msgstr "Vardo spalva gaunamose žinutėse"
+
+msgid "Color to draw the name of a message you received."
+msgstr "Spalva vardui gaunamoje žinutėje."
+
+msgid "\"Attention\" Name Color"
+msgstr "Vardo spalva „dėmesio“ žinutėse"
+
+msgid "Color to draw the name of a message you received containing your name."
+msgstr "Spalva vardui gaunamoje žinutėje, kurioje minimas jūsų vardas."
+
+msgid "Action Message Name Color"
+msgstr "Vardo spalva veiksmo žinutėse"
+
+msgid "Color to draw the name of an action message."
+msgstr "Spalva vardui veiksmo žinutėje."
+
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Veiksmo žinutės vardo spalva pašnibždėtoms žinutėms"
+
+msgid "Color to draw the name of a whispered action message."
+msgstr "Spalva pažnibždėtos veiksmo žinutės pavadinimui."
+
+msgid "Whisper Message Name Color"
+msgstr "Vardo spalva pašnibždėtose žinutėse"
+
+msgid "Color to draw the name of a whispered message."
+msgstr "Spalva pažnibždėtos žinutės pavadinimui."
+
+#  ---------- "Notification Removals" ----------


+msgid "Typing notification color"
+msgstr "Pranešimo apie pašnekovo renkamą žinutę spalva"
+
+msgid "The color to use for the typing notification"
+msgstr "Spalva pranešimui apie pašnekovo renkamą žinutę"
+
+msgid "Typing notification font"
+msgstr "Pranešimo apie pašnekovo renkamą žinutę šriftas"
+
+msgid "The font to use for the typing notification"
+msgstr "Šriftas pranešimui apie pašnekovo renkamą žinutę"
+
+msgid "Enable typing notification"
+msgstr "Rodyti pranešimus apie pašnekovų renkamas žinutes"
+
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weigth='bold'>Neatpažintas failo tipas</span>\n"
+"\n"
+"Laikyti, kad failas yra PNG tipo."
+
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"Neatpažintas failo tipas\n"
+"\n"
+"Naudojamas numatytasis tipas PNG."
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>Vaizdo įrašymo klaida</span>\n"
+"\n"
+"%s"
+
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"Vaizdo įrašymo klaida\n"
+"\n"
+"%s"
+
+msgid "Save Image"
+msgstr "Įrašyti vaizdą"
+
+msgid "_Save Image..."
+msgstr "Įrašyti vai_zdą..."
+
+msgid "_Add Custom Smiley..."
+msgstr "_Pridėti tinkintą šypsenėlę"
+
+msgid "Select Font"
+msgstr "Pasirinkti šriftą"
+
+msgid "Select Text Color"
+msgstr "Pasirinkti teksto spalvą"
+
+msgid "Select Background Color"
+msgstr "Pasirinkti fono spalvą"
+
+msgid "_URL"
+msgstr "_URL"
+
+msgid "_Description"
+msgstr "_Aprašymas"
+
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Prašome įvesti norimo įterpti saito URL ir aprašymą. Aprašymas nėra būtinas."
+
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Prašome įvesti norimo įterpti saito URL."
+
+msgid "Insert Link"
+msgstr "Įterpti saitą"
+
+msgid "_Insert"
+msgstr "_Įterpti"
+
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Nepavyko išsaugoti vaizdo: %s\n"
+
+msgid "Insert Image"
+msgstr "Įterpti vaizdą"
+
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Ši šypsenėlė yra išjungta, nes šiai klavišų sekai jau yra tinkinta "
+"šypsenelė:\n"
+"%s"
+
+#  show everything


+msgid "Smile!"
+msgstr "Šypsokis!"
+
+msgid "_Manage custom smileys"
+msgstr "_Tvarkyti tinkintas šypsenėles"
+
+msgid "This theme has no available smileys."
+msgstr "Šis apipavidalinimas neturi šypsenėlių."
+
+msgid "_Font"
+msgstr "_Šriftas"
+
+msgid "Group Items"
+msgstr "Grupuoti elementus"
+
+msgid "Ungroup Items"
+msgstr "Negrupuoti elementų"
+
+msgid "Bold"
+msgstr "Pusjuodis"
+
+msgid "Italic"
+msgstr "Kursyvas"
+
+msgid "Underline"
+msgstr "Pabraukimas"
+
+msgid "Strikethrough"
+msgstr "Perbraukimas"
+
+msgid "Increase Font Size"
+msgstr "Padidinti šriftą"
+
+msgid "Decrease Font Size"
+msgstr "Sumažinti šriftą"
+
+msgid "Font Face"
+msgstr "Šrifto garnitūras"
+
+msgid "Foreground Color"
+msgstr "Šrifto spalva"
+
+msgid "Reset Formatting"
+msgstr "Atstatyti formato taikymą"
+
+msgid "Insert IM Image"
+msgstr "Įterpti vaizdą"
+
+msgid "Insert Smiley"
+msgstr "Įterpti šypsenėlę"
+
+msgid "<b>_Bold</b>"
+msgstr "<b>_Pusjuodis</b>"
+
+msgid "<i>_Italic</i>"
+msgstr "<i>_Kursyvas</i>"
+
+msgid "<u>_Underline</u>"
+msgstr "<u>P_abraukimas</u>"
+
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Perbraukimas</span>"
+
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_Didesnis</span>"
+
+msgid "_Normal"
+msgstr "_Normalus"
+
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>_Mažesnis</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+msgid "_Font face"
+msgstr "_Šrifto garnitūras"
+
+msgid "Foreground _color"
+msgstr "Š_rifto spalva"
+
+msgid "Bac_kground color"
+msgstr "_Fono spalva"
+
+msgid "_Image"
+msgstr "_paveiksliuką"
+
+msgid "_Link"
+msgstr "_nuorodą"
+
+msgid "_Horizontal rule"
+msgstr "_Horizontali linija"
+
+#  show everything


+msgid "_Smile!"
+msgstr "_Šypsokitės!"
+
+msgid "Log Deletion Failed"
+msgstr "Žurnalo pašalinimas nepavyko"
+
+msgid "Check permissions and try again."
+msgstr "Patikrinkite teises ir bandykite iš naujo."
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+"Ar tikrai norite negrįžtamai ištrinti pokalbių su %s žurnalą, pradėtą %s?"
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr "Ar tikrai norite negrįžtamai ištrinti pokalbių %s žurnalą, pradėtą %s?"
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr "Ar tikrai norite negrįžtamai ištrinti sistemos žurnalą, pradėtą %s?"
+
+msgid "Delete Log?"
+msgstr "Ar pašalinti žurnalą?"
+
+msgid "Delete Log..."
+msgstr "Pašalinti žurnalą..."
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Pokalbis kambaryje %s (%s)</span>"
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Pokalbis su %s (%s)</span>"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+msgid "_Browse logs folder"
+msgstr "_Naršyti žurnalų aplanką"
+
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. Daugiau informacijos suteikia komanda „%s -h“.\n"
+
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  --display=DISPLAY   X display to use\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Vartojimas: %s [PARINKTIS]...\n"
+"\n"
+"  -c, --config=KATALOGAS  naudoti „KATALOGAS“ konfigūracinių failų paieškai\n"
+"  -d, --debug             išvesti derinimo pranešimus į standartinę išvestį\n"
+"  -f, --force-online      priversti prisijungti, nepaisant tinklo būklės\n"
+"  -h, --help              parodyti šią pagalbą ir baigti\n"
+"  -m, --multiple          netikrinti, ar vienu metu paleista tik viena "
+"kopija\n"
+"  -n, --nologin           neprisijungti automatiškai\n"
+"  -l, --login[=VARDAS]    prisijungti automatiškai (neprivalomas argumentas\n"
+"                          „VARDAS“ nurodo paskyrą ar kableliais atskirtas \n"
+"                          paskyras)\n"
+"  --display=DISPLAY       X displėjus naudojimui\n"
+"  -v, --version           parodyti šios programos versiją ir baigti\n"
+
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Vartojimas: %s [PARINKTIS]...\n"
+"\n"
+"  -c, --config=KATALOGAS  naudoti „KATALOGAS“ konfigūracinių failų paieškai\n"
+"  -d, --debug             išvesti derinimo pranešimus į standartinę išvestį\n"
+"  -f, --force-online      priversti prisijungti nepaisant tinklo būklės\n"
+"  -h, --help              parodyti šią pagalbą ir baigti\n"
+"  -m, --multiple          netikrinti, ar vienu metu paleista tik viena "
+"kopija\n"
+"  -n, --nologin           neprisijungti automatiškai\n"
+"  -l, --login[=VARDAS]    prisijungti automatiškai (neprivalomas argumentas\n"
+"                          „VARDAS“ nurodo paskyrą ar kableliais atskirtas \n"
+"                          paskyras.)  Be šio argumento bus įjungta tik "
+"pirmoji\n"
+"                          paskyra.\n"
+"  -v, --version           parodyti šios programos versiją ir baigti\n"
+
+#, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%swiki/GetABacktrace\n"
+msgstr ""
+"%s %s padarė segmentacijos klaidą ir pabandė išvesti atminties išklotinę.\n"
+"Tai yra programos riktas ir atsitiko be jokios Jūsų kaltės.\n"
+"\n"
+"Jeigu Jūs galite atkartoti šią klaidą, prašome informuoti kūrėjus apie "
+"klaidą\n"
+"adresu:\n"
+"%ssimpleticket/\n"
+"\n"
+"Įsitikinkite, kad nurodote, ką darėte, kai įvyko klaida, ir pridėkite \n"
+"programos steko išklotinę (angl. „backtrace“) iš atminties išklotinės \n"
+"failo.  Jeigu nežinote, kaip gauti programos steko išklotinę, perskaitykite\n"
+"instrukcijas adresu %swiki/GetABacktrace\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "Programa uždaroma, nes jau yra paleistas kitas libpurple klientas.\n"
+
+msgid "/_Media"
+msgstr "/_Terpė"
+
+msgid "/Media/_Hangup"
+msgstr "/Terpė/_Baigti skambutį"
+
+msgid "Calling..."
+msgstr "Skambinama..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s nori pradėti garso ir vaizdo pokalbį su jumis."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s nori pradėti vaizdo pokalbį su jumis."
+
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s turi %d naują pranešimą."
+msgstr[1] "%s turi %d naujus pranešimus."
+msgstr[2] "%s turi %d naujų pranešimų."
+
+#, c-format
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>%d naujas laiškas.</b>"
+msgstr[1] "<b>%d nauji laiškai.</b>"
+msgstr[2] "<b>%d naujų laiškų.</b>"
+
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Neteisinga naršyklės komanda „%s“."
+
+msgid "Unable to open URL"
+msgstr "Negalima atverti URL"
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Programos „%s“ paleidimo klaida: %s"
+
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "Pasirinkta 'Rankinė' naršyklės komanda, tačiau komanda nenustatyta."
+
+msgid "No message"
+msgstr "Žinutės nėra"
+
+msgid "Open All Messages"
+msgstr "Atidaryti visas žinutes"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Jūs gavote laišką!</span>"
+
+#  "New Buddy Pounce"


+msgid "New Pounces"
+msgstr "Naujos reakcijos į bičiulį"
+
+msgid "Dismiss"
+msgstr "Uždaryti"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Į jus kažkas sureagavo!</span>"
+
+msgid "The following plugins will be unloaded."
+msgstr "Šie papildiniai bus iškelti."
+
+msgid "Multiple plugins will be unloaded."
+msgstr "Keletas papildinių bus iškelta."
+
+msgid "Unload Plugins"
+msgstr "Iškelti papildinius"
+
+msgid "Could not unload plugin"
+msgstr "Nepavyko iškelti papildinio"
+
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"Šiuo metu papildinio iškelti nepavyko, bet jis bus išjungtas sekančio Pidgin "
+"paleidimo metu."
+
+#, c-format
+msgid ""
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"<span foreground=\"red\" weight=\"bold\">Klaida: %s\n"
+"Patikrinkite, ar papildinio internetinėje svetainėje nėra atnaujinimo.</span>"
+
+msgid "Author"
+msgstr "Autorius"
+
+msgid "<b>Written by:</b>"
+msgstr "<b>Parašė:</b>"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>Internetinis puslapis:</b>"
+
+msgid "<b>Filename:</b>"
+msgstr "<b>Failo vardas:</b>"
+
+msgid "Configure Pl_ugin"
+msgstr "Konfigūr_uoti papildinį"
+
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Informacija apie papildinį</b>"
+
+msgid "Select a file"
+msgstr "Pasirinkite failą"
+
+msgid "Modify Buddy Pounce"
+msgstr "Redaguoti reakciją į bičiulį"
+
+#  Create the "Pounce Who" frame.


+#. Create the "Pounce on Whom" frame.
+msgid "Pounce on Whom"
+msgstr "Į ką reaguoti"
+
+msgid "_Account:"
+msgstr "P_askyra:"
+
+msgid "_Buddy name:"
+msgstr "_Bičiulio vardas:"
+
+msgid "Si_gns on"
+msgstr "pr_isijungia"
+
+msgid "Signs o_ff"
+msgstr "atsi_jungia"
+
+msgid "Goes a_way"
+msgstr "_pasitraukia"
+
+msgid "Ret_urns from away"
+msgstr "su_grįžta"
+
+msgid "Becomes _idle"
+msgstr "tampa neve_iklus"
+
+msgid "Is no longer i_dle"
+msgstr "ta_mpa veiklus"
+
+msgid "Starts _typing"
+msgstr "pradeda rašy_ti"
+
+msgid "P_auses while typing"
+msgstr "trumpam nustoja raš_yti"
+
+msgid "Stops t_yping"
+msgstr "nustoja raš_yti"
+
+msgid "Sends a _message"
+msgstr "i_šsiunčia žinutę"
+
+msgid "Ope_n an IM window"
+msgstr "Atidaryti pokalbių la_ngą"
+
+msgid "_Pop up a notification"
+msgstr "_Parodyti pranešimo langą"
+
+msgid "Send a _message"
+msgstr "Nusiųsti _žinutę"
+
+msgid "E_xecute a command"
+msgstr "_Įvykdyti komandą"
+
+msgid "P_lay a sound"
+msgstr "_Groti garsą"
+
+msgid "Brows_e..."
+msgstr "Nar_šyti...."
+
+msgid "Br_owse..."
+msgstr "_Naršyti...."
+
+msgid "Pre_view"
+msgstr "Pa_klausyti"
+
+msgid "P_ounce only when my status is not Available"
+msgstr "Reaguoti tik tada, kai aš es_u neprieinamoje būsenoje"
+
+msgid "_Recurring"
+msgstr "_Reakcija yra pasikartojanti"
+
+#  Create the "Pounce When" frame.


+msgid "Pounce Target"
+msgstr "Reakcija į"
+
+#, c-format
+msgid "Started typing"
+msgstr "pradeda rašyti"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "trumpam nustoja rašyti"
+
+#, c-format
+msgid "Signed on"
+msgstr "prisijungia"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "sugrįžta iš neveiklumo"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "sugrįžta iš pasišalinimo"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "nustoja rinkti tekstą"
+
+#, c-format
+msgid "Signed off"
+msgstr "atsijungia"
+
+#, c-format
+msgid "Became idle"
+msgstr "tampa neveiklus"
+
+#, c-format
+msgid "Went away"
+msgstr "pasišalina"
+
+#, c-format
+msgid "Sent a message"
+msgstr "nusiuntė žinutę"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Nežinoma... Prašome apie tai pranešti!"
+
+msgid "Theme failed to unpack."
+msgstr "Nepavyko išpakuoti apipavidalinimo."
+
+msgid "Theme failed to load."
+msgstr "Nepavyko įkelti apipavidalinimo."
+
+msgid "Theme failed to copy."
+msgstr "Nepavyko nukopijuoti apipavidalinimo."
+
+msgid "Install Theme"
+msgstr "Įdiegti apipavidalinimą"
+
+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 ""
+"Pasirinkite norimą naudoti šypsenėlių apipavidalinimą iš sąrašo žemiau. "
+"Nauji apipavidalinimai gali būti įdiegti nutempiant juos pele į "
+"apipavidalinimų sąrašą."
+
+msgid "Icon"
+msgstr "Piktograma"
+
+msgid "Keyboard Shortcuts"
+msgstr "Spartieji klavišai"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr "Uždaryti p_okalbius grįžimo („Escape“) klavišu"
+
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Bičiulių sąrašo apipavidalinimas"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. System Tray
+msgid "System Tray Icon"
+msgstr "Piktograma sistemos juostelėje"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+msgid "_Show system tray icon:"
+msgstr "_Rodyti piktogramą sistemos juostelėje:"
+
+msgid "On unread messages"
+msgstr "kai yra neperskaitytų žinučių"
+
+#  IM Convo trans options


+msgid "Conversation Window"
+msgstr "Pokalbių langas"
+
+msgid "_Hide new IM conversations:"
+msgstr "_Slėpti naujus pokalbius"
+
+msgid "When away"
+msgstr "kai pasitraukęs"
+
+#  IM Convo trans options


+msgid "Minimi_ze new conversation windows"
+msgstr "_Suskleisti naujus pokalbių langus"
+
+#. All the tab options!
+msgid "Tabs"
+msgstr "Kortelės"
+
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Rodyti pokalbius ir kambarius languose su kor_telėmis"
+
+msgid "Show close b_utton on tabs"
+msgstr "Rodyti _uždarymo mygtuką ant kortelių"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas?


+msgid "_Placement:"
+msgstr "Tal_pinimas:"
+
+msgid "Top"
+msgstr "viršuje"
+
+msgid "Bottom"
+msgstr "apačioje"
+
+msgid "Left"
+msgstr "kairėje"
+
+msgid "Right"
+msgstr "dešinėje"
+
+msgid "Left Vertical"
+msgstr "vertikalus kairėje"
+
+msgid "Right Vertical"
+msgstr "vertikalus dešinėje"
+
+msgid "N_ew conversations:"
+msgstr "Nau_ji pokalbiai:"
+
+msgid "Show _formatting on incoming messages"
+msgstr "Gaunamas žinutes rodyti su _formatavimu"
+
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Uždaryti pokalbius iškart po kortelės uždarymo"
+
+msgid "Show _detailed information"
+msgstr "Ro_dyti smulkią informaciją"
+
+msgid "Enable buddy ic_on animation"
+msgstr "Leisti bičiulių pikt_ogramų animaciją"
+
+msgid "_Notify buddies that you are typing to them"
+msgstr "I_nformuoti bičiulius, kai jiems rašote"
+
+msgid "Highlight _misspelled words"
+msgstr "_Paryškinti neteisingai parašytus žodžius"
+
+msgid "Use smooth-scrolling"
+msgstr "Naudoti _tolygią slinktį"
+
+msgid "F_lash window when IMs are received"
+msgstr "Mirginti _langą, kai gaunamos žinutės"
+
+msgid "Minimum input area height in lines:"
+msgstr "Mažiausias įvedimo srities aukštis eilutėmis"
+
+msgid "Font"
+msgstr "Šriftas"
+
+msgid "Use document font from _theme"
+msgstr "Naudo_ti dokumento šriftą iš apipavidalinimo"
+
+msgid "Use font from _theme"
+msgstr "Naudo_ti šriftą iš apipavidalinimo"
+
+msgid "Conversation _font:"
+msgstr "P_okalbio šriftas:"
+
+msgid "Default Formatting"
+msgstr "Numatytasis formato taikymas"
+
+# Šitaip atrodys Jūsų išsiunčiamų žinučių tekstas su protokolais kurie palaiko formato taikymą. :)


+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+"Šitaip atrodys Jūsų išsiunčiamų žinučių tekstas protokoluose, palaikančiuose "
+"formato taikymą."
+
+msgid "Cannot start proxy configuration program."
+msgstr "Nepavyko paleisti tinklo tarpininko nustatymų programos."
+
+msgid "Cannot start browser configuration program."
+msgstr "Nepavyko paleisti naršyklės nustatymų programos."
+
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\\\"italic\\\">Pavyzdžiui: stunserver.org</span>"
+
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Naudoti _automatiškai aptiktą IP adresą: %s"
+
+msgid "Public _IP:"
+msgstr "Viešas _IP:"
+
+msgid "Ports"
+msgstr "Prievadai"
+
+msgid "_Enable automatic router port forwarding"
+msgstr "_Įjungti automatinį maršruto parinktuvo prievadų persiuntimą"
+
+msgid "_Manually specify range of ports to listen on"
+msgstr "Rankiniu būdu nurodyti klauso_mų prievadų režį"
+
+msgid "_Start port:"
+msgstr "Pirmas prievada_s:"
+
+msgid "_End port:"
+msgstr "Paskutinis pri_evadas:"
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Perdavimo serveris (TURN)"
+
+msgid "Proxy Server &amp; Browser"
+msgstr "Tarpininkaujantis serveris ir naršyklė"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Nerasta tinklo tarpininko nustatymų programa.</b>"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Nerasta naršyklės nustatymų programa.</b>"
+
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"Tinklo tarpininko ir naršyklės nustatymai yra tvarkomi GNOME parinktyse"
+
+msgid "Configure _Proxy"
+msgstr "_Konfigūruoti tarpininkaujantį serverį"
+
+msgid "Configure _Browser"
+msgstr "Konfigūruoti _naršyklę"
+
+msgid "Proxy Server"
+msgstr "Tarpininkaujantis serveris"
+
+msgid "No proxy"
+msgstr "be tarpininko"
+
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr "Naudoti nutolusį DNS su SOCKS4 tarpininku"
+
+msgid "_User:"
+msgstr "_Vartotojas:"
+
+msgid "Seamonkey"
+msgstr "SeaMonkey"
+
+msgid "Opera"
+msgstr "Opera"
+
+msgid "Netscape"
+msgstr "Netscape"
+
+msgid "Mozilla"
+msgstr "Mozilla"
+
+msgid "Konqueror"
+msgstr "Konqueror"
+
+msgid "Desktop Default"
+msgstr "Darbalaukio numatytasis"
+
+msgid "GNOME Default"
+msgstr "GNOME numatytasis"
+
+msgid "Galeon"
+msgstr "Galeon"
+
+msgid "Firefox"
+msgstr "Firefox"
+
+msgid "Firebird"
+msgstr "Firebird"
+
+msgid "Epiphany"
+msgstr "Epiphany"
+
+msgid "Manual"
+msgstr "Rankinis"
+
+msgid "Browser Selection"
+msgstr "Naršyklės išrinkimas"
+
+msgid "_Browser:"
+msgstr "_Naršyklė:"
+
+msgid "_Open link in:"
+msgstr "_Atverti saitą kame:"
+
+msgid "Browser default"
+msgstr "pagal naršyklės nustatymą"
+
+msgid "Existing window"
+msgstr "esamame lange"
+
+msgid "New tab"
+msgstr "naujoje kortelėje"
+
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"_Rankinis:\n"
+"(%s žymi URL)"
+
+msgid "Log _format:"
+msgstr "Žurnalo _formatas:"
+
+msgid "Log all _instant messages"
+msgstr "Rašyti visus asmeninius pokalbius į žurna_lą"
+
+msgid "Log all c_hats"
+msgstr "Raš_yti visus pokalbius kambariuose į žurnalą"
+
+msgid "Log all _status changes to system log"
+msgstr "Ra_šyti visus būsenos pasikeitimus į sistemos žurnalą"
+
+msgid "Sound Selection"
+msgstr "Garso išrinkimas"
+
+#, c-format
+msgid "Quietest"
+msgstr "Tyliausiai"
+
+#, c-format
+msgid "Quieter"
+msgstr "Tyliau"
+
+#, c-format
+msgid "Quiet"
+msgstr "Tyliai"
+
+#, c-format
+msgid "Loud"
+msgstr "Garsiai"
+
+#, c-format
+msgid "Louder"
+msgstr "Garsiau"
+
+#, c-format
+msgid "Loudest"
+msgstr "Garsiausiai"
+
+msgid "_Method:"
+msgstr "_Būdas:"
+
+msgid "Console beep"
+msgstr "pyptelėjimai"
+
+msgid "No sounds"
+msgstr "be garsų"
+
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"Garso k_omanda:\n"
+"(%s reiškia failo vardą)"
+
+msgid "M_ute sounds"
+msgstr "Išj_ungti garsus"
+
+msgid "Sounds when conversation has _focus"
+msgstr "Groti _garsus, kai pokalbio langas yra veikiamasis"
+
+msgid "_Enable sounds:"
+msgstr "_Įjungti garsus:"
+
+msgid "V_olume:"
+msgstr "_Garsumas:"
+
+msgid "Play"
+msgstr "Groti"
+
+msgid "_Browse..."
+msgstr "_Naršyti...."
+
+msgid "_Reset"
+msgstr "_Atstatyti"
+
+msgid "_Report idle time:"
+msgstr "_Rodyti neveiklumo laiką:"
+
+msgid "Based on keyboard or mouse use"
+msgstr "pagal klaviatūros ir pelės naudojimą"
+
+msgid "_Auto-reply:"
+msgstr "_Automatinis atsakymas:"
+
+msgid "When both away and idle"
+msgstr "ir kai pasitraukęs, ir kai neveiklus"
+
+#. Auto-away stuff
+msgid "Auto-away"
+msgstr "Automatinis pasitraukimas"
+
+msgid "_Minutes before becoming idle:"
+msgstr "Kiek minučių turi praeiti iki tapimo neveikliu:"
+
+msgid "Change status when _idle"
+msgstr "Pake_isti būseną, kai neveiklus"
+
+msgid "Change _status to:"
+msgstr "Pakei_sti būseną į:"
+
+#. Signon status stuff
+msgid "Status at Startup"
+msgstr "Būsena programos paleidimo metu"
+
+msgid "Use status from last _exit at startup"
+msgstr "Programos paleidimo metu nustatyti paskutinę prieš tai naudotą būseną"
+
+msgid "Status to a_pply at startup:"
+msgstr "Programos paleidimo metu nustatyti būseną:"
+
+msgid "Interface"
+msgstr "Sąsaja"
+
+msgid "Smiley Themes"
+msgstr "Šypsenėlių apipavidalinimai"
+
+#  We use the registered default browser in windows


+msgid "Browser"
+msgstr "Naršyklė"
+
+msgid "Status / Idle"
+msgstr "Būsenos ir neveiklumas"
+
+msgid "Allow all users to contact me"
+msgstr "Leisti visiems vartotojams susisiekti su manimi"
+
+msgid "Allow only the users on my buddy list"
+msgstr "Leisti tik vartotojus iš mano bičiulių sąrašo"
+
+msgid "Allow only the users below"
+msgstr "Leisti žemiau išvardintus vartotojus"
+
+msgid "Block all users"
+msgstr "Blokuoti visus vartotojus"
+
+msgid "Block only the users below"
+msgstr "Blokuoti žemiau išvardintus vartotojus"
+
+msgid "Privacy"
+msgstr "Privatumas"
+
+msgid "Changes to privacy settings take effect immediately."
+msgstr "Privatumo nuostatų pakeitimai iš karto tampa aktyvūs"
+
+msgid "Set privacy for:"
+msgstr "Nustatyti privatumo parinktis vartotojui:"
+
+#. Remove All button
+msgid "Remove Al_l"
+msgstr "Paša_linti visus"
+
+msgid "Permit User"
+msgstr "Leisti vartotoją"
+
+msgid "Type a user you permit to contact you."
+msgstr "Įveskite vartotojo, kuriam leidžiate su jumis susisiekti, vardą"
+
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr ""
+"Prašau įvesti vartotojo, kuriam norite leisti su jumis susisiekti, vardą"
+
+msgid "_Permit"
+msgstr "_Leisti"
+
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "Ar leisti vartotojui %s susisiekti su Jumis?"
+
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "Ar esate tikras, kad norite leisti vartotojui %s susisiekti su Jumis?"
+
+msgid "Block User"
+msgstr "Blokuoti vartotoją"
+
+msgid "Type a user to block."
+msgstr "Įveskite vartotoją, kurį blokuojate, vardą."
+
+msgid "Please enter the name of the user you wish to block."
+msgstr "Prašau įvesti vartotojo, kurį norite blokuoti, vardą."
+
+#, c-format
+msgid "Block %s?"
+msgstr "Ar blokuoti vartotoją %s?"
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "Ar esate tikras, kad norite blokuoti vartotoją %s?"
+
+msgid "Apply"
+msgstr "Vykdyti"
+
+msgid "That file already exists"
+msgstr "Toks failas jau yra"
+
+msgid "Would you like to overwrite it?"
+msgstr "Ar norite jį perrašyti?"
+
+msgid "Overwrite"
+msgstr "Perrašyti"
+
+msgid "Choose New Name"
+msgstr "Parinkti kitą vardą"
+
+msgid "Select Folder..."
+msgstr "Pasirinkite aplanką..."
+
+#. list button
+msgid "_Get List"
+msgstr "_Gauti sąrašą"
+
+#. add button
+msgid "_Add Chat"
+msgstr "_Pridėti pokalbių kambarį"
+
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "Ar tikrai norite pašalinti pasirinktas įrašytas būsenas?"
+
+#. Use button
+msgid "_Use"
+msgstr "Pasi_šalinti"
+
+msgid "Title already in use.  You must choose a unique title."
+msgstr "Toks pavadinimas jau yra.  Privalote pasirinkti unikalų pavadinimą."
+
+msgid "Different"
+msgstr "Skirtinga"
+
+msgid "_Title:"
+msgstr "_Pavadinimas:"
+
+msgid "_Status:"
+msgstr "_Būsena:"
+
+#. Different status message expander
+msgid "Use a _different status for some accounts"
+msgstr "Kai kurioms paskyroms naudoti kitokią būseną"
+
+#. Save & Use button
+msgid "Sa_ve & Use"
+msgstr "I_šsaugoti ir pasišalinti"
+
+#, c-format
+msgid "Status for %s"
+msgstr "Paskyros %s būsena"
+
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Nuosavas šypsniukas kombinacijai „%s“ jau priskirtas.  Pasirinkite kitokią "
+"kombinaciją."
+
+msgid "Custom Smiley"
+msgstr "Tinkinta šypsenėlė"
+
+msgid "Duplicate Shortcut"
+msgstr "Klavišų seka jau priskirta"
+
+msgid "Edit Smiley"
+msgstr "Keisti šypsenėlę"
+
+#  show everything


+msgid "Add Smiley"
+msgstr "Pridėti šypsenėlę"
+
+msgid "_Image:"
+msgstr "_Paveiksliukas:"
+
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "_Sekos klavišų kombinacija:"
+
+#  show everything


+msgid "Smiley"
+msgstr "Šypsenėlė"
+
+msgid "Shortcut Text"
+msgstr "Sekos klavišų kombinacija"
+
+msgid "Custom Smiley Manager"
+msgstr "Nuosavų šypsenėlių tvarkytuvė"
+
+msgid "Select Buddy Icon"
+msgstr "Pasirinkti bičiulio paveiksliuką"
+
+msgid "Click to change your buddyicon for this account."
+msgstr "Paspauskite, kad pakeistumėte savo paveiksliuką šiai paskyrai."
+
+msgid "Click to change your buddyicon for all accounts."
+msgstr "Paspauskite, kad pakeistumėte savo paveiksliuką visoms paskyroms."
+
+msgid "Waiting for network connection"
+msgstr "Laukiama tinklo jungties"
+
+msgid "New status..."
+msgstr "Nauja būsena..."
+
+msgid "Saved statuses..."
+msgstr "Išsaugotos būsenos..."
+
+msgid "Status Selector"
+msgstr "Būsenos rinkiklis"
+
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "Įkeliant %s įvyko klaida: %s"
+
+msgid "Failed to load image"
+msgstr "Nepavyko įkelti vaizdo"
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "Negalima išsiųsti katalogo %s."
+
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+"%s negali perduoti katalogo.  Jums reikia perduoti jame esančius failus po "
+"vieną."
+
+msgid "You have dragged an image"
+msgstr "Jūs atitempėte pele paveiksliuką"
+
+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 ""
+"Galite šį paveiksliuką nusiųsti kaip failą, įterpti į šią žinutę, arba "
+"naudoti kaip paveiksliuką šiam vartotojui."
+
+msgid "Set as buddy icon"
+msgstr "Naudoti kaip vartotojo paveiksliuką"
+
+msgid "Send image file"
+msgstr "Nusiųsti kaip failą"
+
+msgid "Insert in message"
+msgstr "Įterpti į žinutę"
+
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "Ar norite paveiksliuką naudoti kaip šio vartotojo paveiksliuką?"
+
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"Galite šį paveiksliuką nusiųsti kaip failą arba nustatyti kaip šio vartotojo "
+"paveiksliuką."
+
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"Galite šį paveiksliuką įterpti į žinutę arba naudoti kaip šio vartotojo "
+"paveiksliuką."
+
+#. 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
+msgid "Cannot send launcher"
+msgstr "Negalima išsiųsti paleidyklės"
+
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
+msgstr ""
+"Jūs atitempėte pele darbastalio paleidyklę.  Greičiausiai norite siųsti ne "
+"pačią paleidyklę, o tai, ką ji paleidžia."
+
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Failas:</b> %s\n"
+"<b>Failo dydis:</b> %s\n"
+"<b>Vaizdo dydis:</b> %dx%d"
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+"Failas „%s“ yra per didelis %s.  Pabandykite su mažesniu paveiksliuku.\n"
+
+msgid "Icon Error"
+msgstr "Paveiksliuko klaida"
+
+msgid "Could not set icon"
+msgstr "Nepavyko nustatyti paveiksliuko"
+
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Nepavyko atverti failo „%s“: %s"
+
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"Paveiksliuko „%s“ nepavyko įkelti dėl nežinomos priežasties, turbūt tai yra "
+"sugadintas paveiksliuko failas"
+
+msgid "_Open Link"
+msgstr "_Atverti saitą"
+
+msgid "_Copy Link Location"
+msgstr "Kopijuoti _saito adresą"
+
+msgid "_Copy Email Address"
+msgstr "Kopijuoti _el. pašto adresą"
+
+msgid "_Open File"
+msgstr "_Atverti failą"
+
+msgid "Open _Containing Directory"
+msgstr "Atverti _katalogą"
+
+msgid "Save File"
+msgstr "Įrašyti failą"
+
+msgid "_Play Sound"
+msgstr "_Groti garsą"
+
+msgid "_Save File"
+msgstr "_Įrašyti failą"
+
+msgid "Select color"
+msgstr "Pasirinkite spalvą"
+
+msgid "_Alias"
+msgstr "_Alternatyvusis vardas"
+
+msgid "Close _tabs"
+msgstr "Uždaryti kor_teles"
+
+msgid "_Get Info"
+msgstr "_Gauti informaciją"
+
+#  Invite


+msgid "_Invite"
+msgstr "Pakv_iesti"
+
+msgid "_Modify..."
+msgstr "_Keisti..."
+
+msgid "_Add..."
+msgstr "_Pridėti..."
+
+msgid "_Open Mail"
+msgstr "_Atverti paštą"
+
+#  Pause button


+msgid "_Pause"
+msgstr "_Sustabdyti"
+
+msgid "_Edit"
+msgstr "K_eisti"
+
+msgid "Pidgin Tooltip"
+msgstr "Pidgin mygtukų etiketės"
+
+msgid "Pidgin smileys"
+msgstr "Pidgin šypsenėlės"
+
+msgid "Penguin Pimps"
+msgstr "Pingvinai sąvadautojai"
+
+msgid "Selecting this disables graphical emoticons."
+msgstr "Išjungia grafines šypsenėles"
+
+msgid "none"
+msgstr "Jokių šypsenėlių"
+
+msgid "Small"
+msgstr "Mažas"
+
+msgid "Smaller versions of the default smilies"
+msgstr "Mažesni numatytųjų šypsenėlių variantai"
+
+msgid "Response Probability:"
+msgstr "Atsakymo tikimybė:"
+
+msgid "Statistics Configuration"
+msgstr "Statistikos parinktys"
+
+#. msg_difference spinner
+msgid "Maximum response timeout:"
+msgstr "Didžiausias atsakymo laukimo laikas:"
+
+msgid "minutes"
+msgstr "minutės"
+
+#. last_seen spinner
+msgid "Maximum last-seen difference:"
+msgstr "Didžiausias paskutinio pamatymo laiko skirtumas:"
+
+#. threshold spinner
+msgid "Threshold:"
+msgstr "Slenkstis:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Availability Prediction"
+msgstr "Kontaktų prieinamumo nuspėjimas"
+
+#. *< name
+#. *< version
+msgid "Contact Availability Prediction plugin."
+msgstr "Kontaktų prieinamumo nuspėjimo papildinys."
+
+#. *  summary
+msgid "Displays statistical information about your buddies' availability"
+msgstr "Rodo statistiką apie bičiulių prieinamumą"
+
+msgid "Server name request"
+msgstr "Serverio vardo užklausa"
+
+msgid "Enter an XMPP Server"
+msgstr "Įveskite XMPP serverį"
+
+msgid "Select an XMPP server to query"
+msgstr "Pasirinkite XMPP serverį užklausai"
+
+msgid "Find Services"
+msgstr "Rasti servisus"
+
+msgid "Add to Buddy List"
+msgstr "Pridėti į bičiulių sąrašą"
+
+msgid "Gateway"
+msgstr "Tinklų sąsaja („Gateway“)"
+
+msgid "Directory"
+msgstr "Katalogas"
+
+msgid "PubSub Collection"
+msgstr "„PubSub Collection“"
+
+msgid "PubSub Leaf"
+msgstr "„PubSub Leaf“"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Aprašymas:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Servisų suradimas"
+
+msgid "_Browse"
+msgstr "_Naršyti"
+
+msgid "Server does not exist"
+msgstr "Serveris neegzistuoja"
+
+msgid "Server does not support service discovery"
+msgstr "Serveris nepalaiko servisų suradimo"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP servisų suradimas"
+
+msgid "Allows browsing and registering services."
+msgstr "Leidžia naršymo ir registravimo paslaugas."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Šis papildinys naudingas registravimuisi su senais transporto protokolais ar "
+"kitais XMPP servisais."
+
+msgid "Buddy is idle"
+msgstr "bičiulis yra neveiklus"
+
+msgid "Buddy is away"
+msgstr "bičiulis yra pasitraukęs"
+
+msgid "Buddy is \"extended\" away"
+msgstr "bičiulis yra ilgam pasitraukęs"
+
+#. Not used yet.
+msgid "Buddy is mobile"
+msgstr "bičiulis yra mobilus"
+
+msgid "Buddy is offline"
+msgstr "bičiulis yra atsijungęs"
+
+msgid "Point values to use when..."
+msgstr "Kiek taškų skiriama, kai..."
+
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr "Bičiulis su <i>daugiausia taškų</i> turės kontakto pirmenybę.\n"
+
+msgid "Use last buddy when scores are equal"
+msgstr "Jeigu keli bičiuliai surinko vienodai taškų, pasirinkti paskutinį"
+
+msgid "Point values to use for account..."
+msgstr "Kiek taškų skiriama paskyrai..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Priority"
+msgstr "Kontakto pirmenybė"
+
+#. *< name
+#. *< version
+#. *< summary
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr "Leidžia keisti reikšmes, susietas su skirtingomis bičiulių būsenomis."
+
+#. *< description
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Leidžia keisti reikšmes, susietas su įvairiomis bičiulių būsenomis, "
+"naudojamas kontakto pirmenybės skaičiavimuose."
+
+msgid "Conversation Colors"
+msgstr "Pokalbių spalvos"
+
+#  IM Convo trans options


+msgid "Customize colors in the conversation window"
+msgstr "Nustatyti pokalbių lango spalvas"
+
+msgid "Error Messages"
+msgstr "Klaidų pranešimai"
+
+msgid "Highlighted Messages"
+msgstr "Paryškintos žinutės"
+
+msgid "System Messages"
+msgstr "Sisteminės žinutės"
+
+msgid "Sent Messages"
+msgstr "Išsiųstos žinutės"
+
+msgid "Received Messages"
+msgstr "Gautos žinutės"
+
+#, c-format
+msgid "Select Color for %s"
+msgstr "Pasirinkite sąsajos elemento „%s“ spalvą"
+
+msgid "Ignore incoming format"
+msgstr "Ignoruoti gaunamų žinučių formato taikymą"
+
+msgid "Apply in Chats"
+msgstr "Taikyti pokalbių kambariuose"
+
+msgid "Apply in IMs"
+msgstr "Taikyti asmeniniams pokalbiams"
+
+msgid "By conversation count"
+msgstr "Pagal pokalbių skaičių"
+
+msgid "Conversation Placement"
+msgstr "Pokalbių patalpinimas"
+
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"Pastaba: parinktis „Nauji pokalbiai“ turi būti nustatyta kaip „Pagal "
+"pokalbių skaičių.“"
+
+msgid "Number of conversations per window"
+msgstr "Pokalbių skaičius langui"
+
+msgid "Separate IM and Chat windows when placing by number"
+msgstr ""
+"Talpinant pagal skaičių atskirti asmeninių pokalbių ir pokalbių kambarių "
+"langus"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas?


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#  *< name


+#  *< version


+#. *< name
+#. *< version
+msgid "Extra conversation placement options."
+msgstr "Papildomi pokalbių talpinimo į langus nustatymai"
+
+#  *< summary


+#  *  description


+#. *< summary
+#. *  description
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Apriboja pokalbių skaičių viename lange ir gali suskirstyti asmeninius "
+"pokalbius ir pokalbius kambariuose į atskirus langus"
+
+#. Configuration frame
+msgid "Mouse Gestures Configuration"
+msgstr "Pelės gestų konfigūracija"
+
+msgid "Middle mouse button"
+msgstr "Vidurinis pelės klavišas"
+
+msgid "Right mouse button"
+msgstr "Dešinysis pelės klavišas"
+
+#  "Visual gesture display" checkbox


+#. "Visual gesture display" checkbox
+msgid "_Visual gesture display"
+msgstr "_Vizualus gesto pavaizdavimas"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Mouse Gestures"
+msgstr "Pelės gestai"
+
+#  *< name


+#  *< version


+#  *  summary


+#. *< name
+#. *< version
+#. *  summary
+msgid "Provides support for mouse gestures"
+msgstr "Leidžia naudoti pelės gestus"
+
+#  *  description


+#. *  description
+msgid ""
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Suteikia galimybę naudoti pelės gestus pokalbių kambariuose.\n"
+"Tempdami vidurinį klavišą galite atlikti tokius veiksmus:\n"
+"\n"
+" • Tempkite žemyn ir į dešinę pokalbio užvėrimui.\n"
+" • Tempkite aukštyn ir į kairę persijungimui į prieš tai buvusį pokalbį.\n"
+" • Tempkite aukštyn ir į dešinę persijungimui į kitą pokalbį."
+
+msgid "Instant Messaging"
+msgstr "Greitasis bendravimas"
+
+#. Add the label.
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+"Pasirinkite asmenį iš Jūsų adresų knygos arba sukurkite naują asmens įrašą."
+
+msgid "Group:"
+msgstr "Grupė:"
+
+#. "New Person" button
+msgid "New Person"
+msgstr "Naujas asmuo"
+
+#. "Select Buddy" button
+msgid "Select Buddy"
+msgstr "Pasirinkti bičiulį"
+
+#  Add the label.


+#. Add the label.
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Pasirinkti asmenį iš Jūsų adresų knygos, prie kurio pridėti šį bičiulį, arba "
+"sukurti naują asmenį."
+
+#. Add the expander
+msgid "User _details"
+msgstr "Vartotojo _duomenys"
+
+#  "Associate Buddy" button


+#. "Associate Buddy" button
+msgid "_Associate Buddy"
+msgstr "_Susieti bičiulį"
+
+msgid "Unable to send email"
+msgstr "Negalima išsiųsti el. laiško"
+
+msgid "The evolution executable was not found in the PATH."
+msgstr "Vykdomasis Evolution failas nerastas PATH kintamajame."
+
+msgid "An email address was not found for this buddy."
+msgstr "Nerastas šio bičiulio el. pašto adresas."
+
+msgid "Add to Address Book"
+msgstr "Įtraukti į adresų knygą"
+
+msgid "Send Email"
+msgstr "Nusiųsti el. laišką"
+
+#  Configuration frame


+#. Configuration frame
+msgid "Evolution Integration Configuration"
+msgstr "Evolution integracijos konfigūravimas"
+
+#  Label


+#. Label
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+"Pasirinkite visas paskyras, į kurias bičiuliai turėtų būti pridedami "
+"automatiškai."
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Evolution Integration"
+msgstr "Evolution integracija"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides integration with Evolution."
+msgstr "Suteikia integraciją su Evolution"
+
+msgid "Please enter the person's information below."
+msgstr "Prašau žemiau įvesti asmens informaciją."
+
+msgid "Please enter the buddy's username and account type below."
+msgstr "Prašau žemiau įvesti bičiulio naudotojo vardą ir paskyros tipą."
+
+msgid "Account type:"
+msgstr "Paskyros tipas:"
+
+#  Optional Information section


+#. Optional Information section
+msgid "Optional information:"
+msgstr "Nebūtina informacija:"
+
+msgid "First name:"
+msgstr "Vardas:"
+
+msgid "Last name:"
+msgstr "Pavardė:"
+
+msgid "Email:"
+msgstr "El. pašto adresas:"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GTK Signals Test"
+msgstr "GTK signalų testas"
+
+#  *< name


+#  *< version


+#  *  summary


+#  *  description


+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr "Testas, skirtas nustatyti, ar visi sąsajos signalai veikia teisingai."
+
+#  "New Buddy Pounce"


+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Bičiulio pastaba</b>: %s"
+
+msgid "History"
+msgstr "Istorija"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Iconify on Away"
+msgstr "Suskleisti pasitraukiant"
+
+#  *< name


+#  *< version


+#  *  summary


+#  *  description


+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "Suskleidžia bičiulių sąrašą ir Jūsų pokalbius, kai Jūs pasitraukiate."
+
+msgid "Mail Checker"
+msgstr "Pašto tikrinimas"
+
+msgid "Checks for new local mail."
+msgstr "Patikrina, ar negautas naujas vietinis paštas."
+
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+"Įdeda mažą langelį į bičiulių sąrašą, kuris parodo, ar turite naujo pašto."
+
+msgid "Markerline"
+msgstr "Skirtukas"
+
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Pokalbių lange nubrėžia naujas žinutes atskiriančią liniją"
+
+msgid "Jump to markerline"
+msgstr "Peršokti prie skirtuko"
+
+msgid "Draw Markerline in "
+msgstr "Skirtuką piešti "
+
+msgid "_IM windows"
+msgstr "_asmeninių pokalbių languose"
+
+msgid "C_hat windows"
+msgstr "_pokalbių kambarių languose"
+
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Prašoma pradėti muzikinių žinučių seansą.  Spustelėkite MM piktogramą seanso "
+"pradėjimui."
+
+msgid "Music messaging session confirmed."
+msgstr "Muzikinių žinučių seansas patvirtintas."
+
+msgid "Music Messaging"
+msgstr "Muzikinės žinutės"
+
+msgid "There was a conflict in running the command:"
+msgstr "Komandos vykdymo metu įvyko konfliktas"
+
+msgid "Error Running Editor"
+msgstr "Redaktoriaus vykdymo klaida"
+
+msgid "The following error has occurred:"
+msgstr "Įvyko klaida:"
+
+#. Configuration frame
+msgid "Music Messaging Configuration"
+msgstr "Muzikinių žinučių parinktys"
+
+msgid "Score Editor Path"
+msgstr "Partitūrų redaktoriaus kelias"
+
+msgid "_Apply"
+msgstr "_Vykdyti"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Muzikinių žinučių papildinys kolektyviniam muzikos kūrimui."
+
+#. *  summary
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editing a common score in real-time."
+msgstr ""
+"Muzikinių žinučių papildinys leidžia keliems vartotojams vienu metu kurti tą "
+"patį muzikinį kūrinį redaguojant tą pačią partitūrą."
+
+#  ---------- "Notify For" ----------


+#. ---------- "Notify For" ----------
+msgid "Notify For"
+msgstr "Pranešti apie:"
+
+msgid "\t_Only when someone says your username"
+msgstr "        tik kai kas n_ors pasako Jūsų naudotojo vardą"
+
+msgid "_Focused windows"
+msgstr "_veikiamuosius langus"
+
+#  ---------- "Notification Methods" ----------


+#. ---------- "Notification Methods" ----------
+msgid "Notification Methods"
+msgstr "Pranešimo būdai:"
+
+msgid "Prepend _string into window title:"
+msgstr "p_ridėti eilutę prieš lango pavadinimą:"
+
+#  Count method button


+#. Count method button
+msgid "Insert c_ount of new messages into window title"
+msgstr "į_terpti naujų žinučių skaičių į lango pavadinimą"
+
+#  Count method button


+#. Count xprop method button
+msgid "Insert count of new message into _X property"
+msgstr "įterpti naujų žinučių skaičių į _X sąvybę"
+
+#  Urgent method button


+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "nustatyti langų tvarkytuvės „_URGENT“ patarimą"
+
+msgid "_Flash window"
+msgstr "_Mirginti langą"
+
+#  IM Convo trans options


+#. Raise window method button
+msgid "R_aise conversation window"
+msgstr "P_akelti pokalbių langą"
+
+#  IM Convo trans options


+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr "_Pristatyti pokalbių langą"
+
+#  ---------- "Notification Removals" ----------


+#. ---------- "Notification Removals" ----------
+msgid "Notification Removal"
+msgstr "Baigti pranešimą, kai:"
+
+#  Remove on focus button


+#. Remove on focus button
+msgid "Remove when conversation window _gains focus"
+msgstr "pokalbių _langas tampa veikiamasis"
+
+#  Remove on click button


+#. Remove on click button
+msgid "Remove when conversation window _receives click"
+msgstr "spragtelėjama ant pokalbių la_ngo"
+
+#  Remove on type button


+#. Remove on type button
+msgid "Remove when _typing in conversation window"
+msgstr "rašo_ma į pokalbių langą"
+
+#  Remove on message send button


+#  Remove on message send button


+#. Remove on message send button
+msgid "Remove when a _message gets sent"
+msgstr "iš_siunčiama žinutė"
+
+#  Remove on conversation switch button


+#  Remove on conversation switch button


+#. Remove on conversation switch button
+msgid "Remove on switch to conversation ta_b"
+msgstr "kai pers_ijungiama į pokalbio kortelę"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Notification"
+msgstr "Pranešimai apie žinutes"
+
+#  *< name


+#  *< version


+#  *  summary


+#  *  description


+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "Siūlo keletą būdų, kaip Jums pranešti apie neperskaitytas žinutes"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Pidgin Demonstration Plugin"
+msgstr "Demonstracinis Pidgin papildinys"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "An example plugin that does stuff - see the description."
+msgstr "Pavyzdinis papildinis, kuris daro šį bei tą – skaitykite jo aprašymą."
+
+#. *  description
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Tai yra tikrai kietas papildinys, mokantis daug ką daryti:\n"
+"- jis Jums pasako, kas parašė programą, kai prisijungiate;\n"
+"- jis apsuka visą gaunamą tekstą\n"
+"- jis nusiunčia žinutę Jūsų bičiuliams iškart, kai jie prisijungia."
+
+msgid "Hyperlink Color"
+msgstr "Hipersaito spalva"
+
+msgid "Visited Hyperlink Color"
+msgstr "Aplankyhto hipersaito spalva"
+
+msgid "Highlighted Message Name Color"
+msgstr "Vardo paryškintoje žinutėje spalva"
+
+#  ---------- "Notification Removals" ----------


+msgid "Typing Notification Color"
+msgstr "Pranešimo apie renkamą žinutę spalva"
+
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView horizontalus atskyrimo tarpas"
+
+msgid "Conversation Entry"
+msgstr "Pokalbio įrašas"
+
+msgid "Request Dialog"
+msgstr "Užklausos dialogas"
+
+#  ---------- "Notify For" ----------


+msgid "Notify Dialog"
+msgstr "Informacinis dialogas"
+
+msgid "Select Color"
+msgstr "Pasirinkite spalvą"
+
+#, c-format
+msgid "Select Interface Font"
+msgstr "Pasirinkite sąsajos šriftą"
+
+#, c-format
+msgid "Select Font for %s"
+msgstr "Pasirinkite sąsajos elemento „%s“ šriftą"
+
+msgid "GTK+ Interface Font"
+msgstr "GTK+ sąsajos šriftas"
+
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ prieigos klavišų parinktis"
+
+msgid "Disable Typing Notification Text"
+msgstr "Išjungti pranešimų apie renkamą žinutę tekstą"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ apipavidalinimų parinktys"
+
+msgid "Colors"
+msgstr "Spalvos"
+
+msgid "Fonts"
+msgstr "Šriftai"
+
+msgid "Miscellaneous"
+msgstr "Kita"
+
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc failų įrankiai"
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Įrašyti nuostatas į %s%sgtkrc-2.0"
+
+msgid "Re-read gtkrc files"
+msgstr "Iš naujo įkelti gtkrc failus"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+msgid "Pidgin GTK+ Theme Control"
+msgstr "Pidgin GTK+ apipavidalinimo parinktys"
+
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Leidžia keisti dažnai naudojamas gtkrc parinktis."
+
+msgid "Raw"
+msgstr "Neapdorota įvestis"
+
+msgid "Lets you send raw input to text-based protocols."
+msgstr "Leidžia Jums tiesiogiai įvesti tekstinių protokolų komandas."
+
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Leidžia Jums siųsti neapdorotą įvestį tekstiniams protokolams (Jabber, MSN, "
+"IRC, TOC).  Paspauskite „Enter“ įvedimo langelyje išsiuntimui.  Stebėkite "
+"derinimo langą."
+
+#, c-format
+msgid "You can upgrade to %s %s today."
+msgstr "Šiandien jau galite atnaujinti į %s %s."
+
+msgid "New Version Available"
+msgstr "Pasirodė nauja versija"
+
+msgid "Later"
+msgstr "Vėliau"
+
+msgid "Download Now"
+msgstr "Atsisiųsti dabar"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Release Notification"
+msgstr "Pranešimas apie laidą"
+
+#  *< name


+#  *< version


+#  *  summary


+#. *< name
+#. *< version
+#. *  summary
+msgid "Checks periodically for new releases."
+msgstr "Periodiškai patikrina, ar neišleistos naujos versijos"
+
+#  *  description


+#. *  description
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Periodiškai patikrina, ar neišleistos naujos versijos ir praneša apie tai "
+"vartotojui kartu su pakeitimų sąrašu."
+
+#  Build the Send As menu


+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr "Siuntimo mygtukas"
+
+#  IM Convo trans options


+#. *< name
+#. *< version
+msgid "Conversation Window Send Button."
+msgstr "Mygtukas „Siųsti“ pokalbių languose"
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for use when no physical keyboard is present."
+msgstr ""
+"Prideda mygtuką „Siųsti“ į pokalbių lango įvedimo sritį.  Naudinga, kai nėra "
+"fizinės klaviatūros."
+
+msgid "Duplicate Correction"
+msgstr "Pakartoto žodžio pataisymas"
+
+msgid "The specified word already exists in the correction list."
+msgstr "Toks žodis jau yra pataisymų sąraše."
+
+msgid "Text Replacements"
+msgstr "Teksto pakeitimai"
+
+msgid "You type"
+msgstr "Jūs parašote"
+
+msgid "You send"
+msgstr "Jūs išsiunčiate"
+
+msgid "Whole words only"
+msgstr "Tik ištisi žodžiai"
+
+msgid "Case sensitive"
+msgstr "Skirti mažąsias ir didžiąsias raides"
+
+msgid "Add a new text replacement"
+msgstr "Sukurti naują teksto pakeitimą"
+
+msgid "You _type:"
+msgstr "Jūs parašo_te:"
+
+msgid "You _send:"
+msgstr "Jūs iš_siunčiate:"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+"Tikslus didžiųjų ir mažųjų raidžių sutapimas (panaikinkite žymėjimą "
+"automatiniam apdorojimui)"
+
+msgid "Only replace _whole words"
+msgstr "Keisti tik _ištisus žodžius"
+
+msgid "General Text Replacement Options"
+msgstr "Bendrosios teksto pakeitimo parinktys"
+
+msgid "Enable replacement of last word on send"
+msgstr "Leisti paskutinio žodžio pakeitimą išsiuntimo metu"
+
+msgid "Text replacement"
+msgstr "Teksto pakeitimas"
+
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+"Pakeičia tekstą išsiunčiamose žinutėse pagal vartotojo sukurtas taisykles."
+
+msgid "Just logged in"
+msgstr "Ką tik prisijungė"
+
+msgid "Just logged out"
+msgstr "Ką tik atsijungė"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Piktograma kontaktui/\n"
+"Piktograma nežinomam asmeniui"
+
+msgid "Icon for Chat"
+msgstr "Piktograma pokalbiui"
+
+msgid "Ignored"
+msgstr "Ignoruojamas"
+
+msgid "Founder"
+msgstr "Steigėjas"
+
+msgid "Operator"
+msgstr "Operatorius"
+
+msgid "Half Operator"
+msgstr "Pusiau operatorius"
+
+msgid "Authorization dialog"
+msgstr "Prieigos teisės dialogo langas"
+
+msgid "Error dialog"
+msgstr "Klaidos dialogo langas"
+
+msgid "Information dialog"
+msgstr "Informacijos dialogo langas"
+
+msgid "Mail dialog"
+msgstr "Pašto dialogo langas"
+
+msgid "Question dialog"
+msgstr "Klausimo dialogo langas"
+
+msgid "Warning dialog"
+msgstr "Perspėjimo dialogo langas"
+
+msgid "What kind of dialog is this?"
+msgstr "Kokios rūšies dialogo langas tai yra?"
+
+msgid "Status Icons"
+msgstr "Būsenų piktogramos"
+
+msgid "Chatroom Emblems"
+msgstr "Pokalbių kambarių emblemos"
+
+msgid "Dialog Icons"
+msgstr "Dialogų langų piktogramos"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin piktogramų apipavidalinimo redaktorius"
+
+msgid "Contact"
+msgstr "Kontaktas"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin bičiulių sąrašo apipavidalinimo redaktorius"
+
+msgid "Edit Buddylist Theme"
+msgstr "Redaguoti bičiulių sąrašo apipavidalinimą"
+
+msgid "Edit Icon Theme"
+msgstr "Redaguoti piktogramų apipavidalinimą"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin apipavidalinimo redaktorius"
+
+#  *< api_version


+#  *< type


+#  *< ui_requirement


+#  *< flags


+#  *< dependencies


+#  *< priority


+#  *< id


+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin apipavidalinimo redaktorius"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Ticker"
+msgstr "Bičiulių juosta"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "Horizontalus slenkantis bičiulių sąrašo variantas."
+
+msgid "Display Timestamps Every"
+msgstr "Rodyti laiko žymes kas"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Timestamp"
+msgstr "Laiko žymos"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Display iChat-style timestamps"
+msgstr "Rodo iChat stiliaus laiko žymas"
+
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "Kas N minučių rodo iChat stiliaus laiko žymes"
+
+msgid "Timestamp Format Options"
+msgstr "Laiko žymių formato parinktys"
+
+#, c-format
+msgid "_Force 24-hour time format"
+msgstr "_Būtinai naudoti 24 valandų laiko formatą"
+
+msgid "Show dates in..."
+msgstr "Rodyti datas..."
+
+msgid "Co_nversations:"
+msgstr "pokalbiuose:"
+
+msgid "For delayed messages"
+msgstr "uždelstoms žinutėms"
+
+msgid "For delayed messages and in chats"
+msgstr "uždelstoms žinutėms ir pokalbių kambariams"
+
+msgid "_Message Logs:"
+msgstr "Ž_urnaluose:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Timestamp Formats"
+msgstr "Žinučių laiko žymių formatai"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Customizes the message timestamp formats."
+msgstr "Parenka žinučių laiko žymių formatus."
+
+#. *  description
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Šis papildinys leidžia vartotojui pasirinkti pokalbių ir žurnalų žinučių "
+"laiko žymių formatus."
+
+msgid "Opacity:"
+msgstr "Nepermatomumas:"
+
+#  IM Convo trans options


+#. IM Convo trans options
+msgid "IM Conversation Windows"
+msgstr "Pokalbių langai"
+
+msgid "_IM window transparency"
+msgstr "Pokalb_ių langų permatotumas"
+
+msgid "_Show slider bar in IM window"
+msgstr "Rodyti šliaužiklio juo_stą pokalbių lange"
+
+msgid "Remove IM window transparency on focus"
+msgstr "Aktyvavus pokalbių langą pašalinti jo permatomumą"
+
+msgid "Always on top"
+msgstr "Visada viršuje"
+
+#  Buddy List trans options


+#. Buddy List trans options
+msgid "Buddy List Window"
+msgstr "Bičiulių sąrašo langas"
+
+msgid "_Buddy List window transparency"
+msgstr "_Bičiulių sąrašo lango permatomumas"
+
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Aktyvavus bičiulių sąrašo langą pašalinti jo permatomumą"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Transparency"
+msgstr "Permatomumas"
+
+#  *< name


+#  *< version


+#  *  summary


+#. *< name
+#. *< version
+#. *  summary
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Kintamas permatumomas bičiulių sąrašo ir pokalbių langams."
+
+#  *  description


+#. *  description
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"Šis papildinys suteikia reguliuojamą alfa permatomumą pokalbių ir bičiulių "
+"sąrašo langams.\n"
+"\n"
+"* Pastaba: šis papildinys reikalauja Windows 2000 arba vėlesnės versijos."
+
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ vykdymo laiko bibliotekos versija"
+
+#  Autostart


+#  Autostart


+#. Autostart
+msgid "Startup"
+msgstr "Paleidimas"
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "Paleisti %s Window_s paleidimo metu"
+
+msgid "_Dockable Buddy List"
+msgstr "_Pritvirtinamas bičiulių langas"
+
+#  Blist On Top


+#. Blist On Top
+msgid "_Keep Buddy List window on top:"
+msgstr "Lai_kyti bičiulių sąrašo langą viršuje:"
+
+#. XXX: Did this ever work?
+msgid "Only when docked"
+msgstr "tik kai pritvirtintas"
+
+msgid "Windows Pidgin Options"
+msgstr "Windows Pidgin parinktys"
+
+msgid "Options specific to Pidgin for Windows."
+msgstr "Specifinės Pidgin parinktys Windows operacinei sistemai."
+
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr ""
+"Leidžia keisti Pidgin parinktis, kurios yra specifinės Windows operacinėje "
+"sistemoje, pavyzdžiui, bičiulių sąrašo lango pritvirtinimą."
+
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>Atsijungė.</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "XMPP Console"
+msgstr "XMPP pultas"
+
+#  Set up stuff for the account box


+msgid "Account: "
+msgstr "Paskyra:"
+
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>Neprisijungta prie XMPP</font>"
+
+msgid "Insert an <iq/> stanza."
+msgstr "Įterpti <iq/> strofą."
+
+msgid "Insert a <presence/> stanza."
+msgstr "Įterpti <presence/> strofą."
+
+msgid "Insert a <message/> stanza."
+msgstr "Įterpti <message/> strofą."
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr "Siųsti ir gauti neapdorotas XMPP strofas."
+
+#. *  description
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr "Šis papildinys naudingas XMPP serverių ir klientų derinimui."
diff --git a/po/mk.po b/po/mk.po
index ca87e842be..4ee35649d8 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-05-07 12:24+0200\n"
 "Last-Translator: Arangel Angov <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -30,13 +30,13 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Пробајте `%s -h' за повеќе информации.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -615,21 +615,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Испрати на"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "Внеси во пораката"
-
-msgid "Invite"
-msgstr "Покани"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Внесете го името на пријателот што сакате да го поканите, заедно со пораката "
-"за покана."
-
 msgid "Conversation"
 msgstr "Разговор"
 
@@ -886,6 +871,41 @@ msgstr "Разговори"
 msgid "System Log"
 msgstr "Системски лог"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "_Пресметувам..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Прифати"
+
+msgid "Reject"
+msgstr "Одбиј"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Го разделивте каналот%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "Е-пошти"
 
@@ -921,6 +941,9 @@ msgstr "Продолжи"
 msgid "IM"
 msgstr "Порака"
 
+msgid "Invite"
+msgstr "Покани"
+
 msgid "(none)"
 msgstr "(ништо)"
 
@@ -1124,7 +1147,6 @@ msgstr "%s стана отсутен. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s Ви испрати порака. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Непознат настан за дејство. Ве молам пријавете го ова!"
 
@@ -1170,7 +1192,6 @@ msgstr "Минути пред промена на статусот"
 msgid "Change status to"
 msgstr "Смени го статусот во"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Разговори"
 
@@ -1492,7 +1513,6 @@ msgstr ""
 "Кога се отвора нов разговор, овој приклучок ќе го вметнe последниот во "
 "тековниот разговор."
 
-#, c-format
 msgid "Online"
 msgstr "Поврзано"
 
@@ -1536,6 +1556,28 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Додаток за последен лог."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL за песната"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "сметки"
 
@@ -1636,13 +1678,6 @@ msgstr "Прифати сертификат за %s?"
 msgid "SSL Certificate Verification"
 msgstr "Проверка на SSL сертификат"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Прифати"
-
-msgid "Reject"
-msgstr "Одбиј"
-
 msgid "_View Certificate..."
 msgstr "_Види сертификат..."
 
@@ -1733,6 +1768,8 @@ msgstr "+++ %s се најави"
 msgid "+++ %s signed off"
 msgstr "+++ %s се одјави"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
@@ -1779,6 +1816,18 @@ msgstr "%s ја напушти собата."
 msgid "%s left the room (%s)."
 msgstr "%s ја напушти собата (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Покани на конференција"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Внесете го името на пријателот што сакате да го поканите, заедно со пораката "
+"за покана."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Не успеав да добијам врска: %s"
@@ -1914,7 +1963,6 @@ msgstr "Започнувам пренос на %s од %s"
 msgid "Transfer of file %s complete"
 msgstr "Преносот на %s е завршен"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Преносот на датотеки е завршен"
 
@@ -1922,7 +1970,6 @@ msgstr "Преносот на датотеки е завршен"
 msgid "You canceled the transfer of %s"
 msgstr "Ја прекинавте размената на %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Преносот на датотеки е откажан"
 
@@ -2133,11 +2180,14 @@ msgstr "<font color=\"red\"><b>Не можам да ја читам датоте
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <АВТОМАТСКИ ОДГОВОР>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Грешка во креирањето на врска"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Вие користите %s, но овој приклучок бара %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Овој приклучок нема дефинирано Ид."
 
@@ -2539,9 +2589,10 @@ msgstr ""
 "на логови."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2597,8 +2648,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Зачувај ги пораките испратени до офлајн корисниците како дејство за пријател."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Остатокот од пораката ќе биде зачуван како дејство за пријател. Можете да "
@@ -2631,6 +2683,32 @@ msgstr "Зачувај ја офлајн пораката како дејств�
 msgid "Do not ask. Always save in pounce."
 msgstr "Не прашувај. Секогаш зачувувај во дејство."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Внесете лозинка:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2824,11 +2902,12 @@ msgstr ""
 "приклучоци, инсталирајте ActiveTCL од http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Не можам да слушам за доаѓачки врски\n"
 
 msgid ""
@@ -2836,7 +2915,6 @@ msgid ""
 msgstr ""
 "Не можам да воспоставам врска со локалниот mDNS сервер. Дали се извршува?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Име"
 
@@ -2868,6 +2946,11 @@ msgstr "Приклучок за Bonjour протоколот"
 msgid "Purple Person"
 msgstr "Лилакова личност"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Локалитет"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2878,14 +2961,21 @@ msgstr "%s го затвори разговорот."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не можам да ја испратам пораката, разговорот не може да биде започнат."
 
-msgid "Cannot open socket"
-msgstr "Не можам да го отворам сокетот."
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Не можам да креирам сокет:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Не можам да го врзам сокетот за портата"
 
-msgid "Could not listen on socket"
-msgstr "Не можам да слушам на сокетот"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Не можам да креирам сокет:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Грешка во комуникацијата со локалниот mDNSResponder."
@@ -2935,13 +3025,16 @@ msgstr "Зачувај листа со пријатели..."
 msgid "Load buddylist from file..."
 msgstr "Вчитај ја листата со пријатели од датотека..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Пополнете ги полињата за регистрирање."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Лозинките не се совпаѓаат."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Не можам да регистрирам нова сметка. Се случи грешка.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2953,14 +3046,15 @@ msgstr "Регистрацијата успешно е завршена!"
 msgid "Password"
 msgstr "Лозинка"
 
-msgid "Password (retype)"
-msgstr "Лозинка (повторно внесување)"
+msgid "Password (again)"
+msgstr "Лозинка (повторно)"
 
-msgid "Enter current token"
-msgstr "Внесете го тековниот знак"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Тековен знак"
+#, fuzzy
+msgid "Captcha"
+msgstr "Зачувај ја сликата"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Регистрирај нова Gadu-Gadu сметка"
@@ -3013,6 +3107,15 @@ msgstr "Лозинката успешно е променета!"
 msgid "Current password"
 msgstr "Тековната лозинка"
 
+msgid "Password (retype)"
+msgstr "Лозинка (повторно внесување)"
+
+msgid "Enter current token"
+msgstr "Внесете го тековниот знак"
+
+msgid "Current token"
+msgstr "Тековен знак"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Ве молам внесете ја тековната лозинка и новата лозинка за Вашиот UIN: "
 
@@ -3026,13 +3129,13 @@ msgstr "Одберете разговор за пријателот: %s"
 msgid "Add to chat..."
 msgstr "Додај во разговорот..."
 
+#. Global
 msgid "Available"
 msgstr "Достапен"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Отсутен"
 
@@ -3060,7 +3163,7 @@ msgstr "Нема пронајдени корисници"
 msgid "There are no users matching your search criteria."
 msgstr "Нема корисници кои што се совпаѓаат со Вашето пребарување."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Не можам да го прочитам сокетот"
 
 msgid "Buddy list downloaded"
@@ -3075,8 +3178,14 @@ msgstr "Листата на пријатели е качена"
 msgid "Your buddy list was stored on the server."
 msgstr "Вашата листа на пријатели беше зачувана на серверот."
 
-msgid "Connection failed."
-msgstr "Поврзување е неуспешно."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Врзано"
+
+msgid "Connection failed"
+msgstr "Поврзувањето не успеа"
 
 msgid "Add to chat"
 msgstr "Додај во разговор"
@@ -3084,13 +3193,23 @@ msgstr "Додај во разговор"
 msgid "Chat _name:"
 msgstr "_Име на разговор:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Не можам да се поврзам со серверот."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Поврзување"
+
 msgid "Chat error"
 msgstr "Грешка во разговорот"
 
 msgid "This chat name is already in use"
 msgstr "Ова име на разговор веќе постои"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Не сум поврзан со серверот."
 
 msgid "Find buddies..."
@@ -3132,6 +3251,10 @@ msgstr "Популарен полски IM"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu корисник"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Постави ги информациите за корисникот..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Непозната команда: %s"
@@ -3146,7 +3269,8 @@ msgstr "Не е поставен наслов"
 msgid "File Transfer Failed"
 msgstr "Преносот на датотеки не успеа"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Не можам да отворам порта за слушање."
 
 msgid "Error displaying MOTD"
@@ -3162,8 +3286,18 @@ msgstr "Нема MOTD поврзан со оваа врска"
 msgid "MOTD for %s"
 msgstr "MOTD за %s"
 
-msgid "Server has disconnected"
-msgstr "Серверот ја прекина врската"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Изгубив врска со серверот:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Види MOTD"
@@ -3174,25 +3308,24 @@ msgstr "_Канал:"
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC прекарите не смеат да содржат празни места"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Поврзување"
-
 msgid "SSL support unavailable"
 msgstr "SSL поддршката не е достапна"
 
-msgid "Couldn't create socket"
-msgstr "Не можам да креирам сокет"
+msgid "Unable to connect"
+msgstr "Не можам да се поврзам"
 
-msgid "Couldn't connect to host"
-msgstr "Не може да се врзе со серверот"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Не можам да се поврзам со %s"
 
-msgid "Read error"
-msgstr "Грешка во читањето"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Грешка во креирањето на врска."
 
 msgid "Users"
 msgstr "Корисници"
@@ -3373,6 +3506,17 @@ msgstr ""
 "Избравте име на сметка кое беше одбиено од серверот.  Најверојатно содржи "
 "невалидни знаци."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Ова име на разговор веќе постои"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Прекар"
+
 msgid "Cannot change nick"
 msgstr "Не можам да го променам прекарот"
 
@@ -3610,10 +3754,12 @@ msgstr "Ад-хок командата не успеа"
 msgid "execute"
 msgstr "изврши"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Серверот бара TLS/SSL за најавување.  Не пронајдов TLS/SSL поддршка."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Серверот бара TLS/SSL за најавување, но не пронајдов поддршка за тоа."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3631,18 +3777,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Проверка со обичен текст"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Проверката не успеа"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Невалиден одговор од серверот."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Серверот не користи поддржан метод за проверка"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Барате енкрипција, но не е достапна на овој сервер."
+
 msgid "Invalid challenge from server"
 msgstr "Невалиден предизвик од серверот"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL грешка"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Не е дадена причина."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Неподдржана верзија"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Не можам да воспоставам врска со серверот:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Не можам да воспоставам врска со серверот:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Не можам да иницијализирам врска"
+
 msgid "Full Name"
 msgstr "Целосно име"
 
@@ -3709,158 +3891,9 @@ msgstr "Клиент"
 msgid "Operating System"
 msgstr "Оперативен систем"
 
-msgid "Last Activity"
-msgstr "Последна активност"
-
-msgid "Service Discovery Info"
-msgstr "Информации за откривање на сервиси"
-
-msgid "Service Discovery Items"
-msgstr "Предмети за откривање на сервиси"
-
-msgid "Extended Stanza Addressing"
-msgstr "Проширена stanza адреса"
-
-msgid "Multi-User Chat"
-msgstr "Мулти-кориснички разговор"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Информации за продолежно присуство за мулти-кориснички разговор"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ад-хок команди"
-
-msgid "PubSub Service"
-msgstr "PubSub сервис"
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Грешка во регистрацијата"
-
-msgid "User Location"
-msgstr "Локација на корисникот"
-
-msgid "User Avatar"
-msgstr "Аватар на корисникот"
-
-msgid "Chat State Notifications"
-msgstr "Известување за состојбата на разговорот"
-
-msgid "Software Version"
-msgstr "Верзија на софтверот"
-
-msgid "Stream Initiation"
-msgstr "Иницирање на стримот"
-
-msgid "File Transfer"
-msgstr "Пренос на датотеки"
-
-msgid "User Mood"
-msgstr "Расположение на корисникот"
-
-msgid "User Activity"
-msgstr "Активност на корисникот"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr "Преговори за енкриптирана сесија"
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr "Адреса за достапност"
-
-msgid "User Profile"
-msgstr "Кориснички профил"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle аудио"
-
-msgid "User Nickname"
-msgstr "Кориснички прекар"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle видео"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Примачи на пораката"
-
-msgid "Public Key Publishing"
-msgstr "Објавување на јавниот клуч"
-
-msgid "User Chatting"
-msgstr "Корисникот разговара"
-
-msgid "User Browsing"
-msgstr "Корисникот сурфа"
-
-msgid "User Gaming"
-msgstr "Корисникот игра"
-
-msgid "User Viewing"
-msgstr "Корисникот гледа"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza енкрипција"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr "Одложено праќање"
-
-msgid "Collaborative Data Objects"
-msgstr "Колаборативни објекти со податоци"
-
-msgid "File Repository and Sharing"
-msgstr "Складирање и споделување на датотеки"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Откривање на STUN за Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Можности"
+#, fuzzy
+msgid "Local Time"
+msgstr "Локална датотека:"
 
 msgid "Priority"
 msgstr "Приоритет"
@@ -3868,6 +3901,14 @@ msgstr "Приоритет"
 msgid "Resource"
 msgstr "Ресурс"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Најавен"
+
 msgid "Middle Name"
 msgstr "Средно име"
 
@@ -3914,7 +3955,6 @@ msgstr "Ми се прави муабет"
 msgid "Extended Away"
 msgstr "Не сум тука подолго време"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Не вознемирувај"
 
@@ -4037,28 +4077,26 @@ msgstr "Изберете сервер за конференција"
 msgid "Find Rooms"
 msgstr "Пронајди соби"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Барате енкрипција, но не е достапна на овој сервер."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Алиjас:"
 
-msgid "Write error"
-msgstr "Грешка во запишувањето"
+#, fuzzy
+msgid "No users found"
+msgstr "Нема пронајдени корисници"
 
-msgid "Ping timeout"
-msgstr "Времето за ping истече"
+#, fuzzy
+msgid "Roles:"
+msgstr "Улога"
 
-msgid "Read Error"
-msgstr "Грешка во читањето"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Времето за ping истече"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Не можам да воспоставам врска со серверот:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Не можам да креирам сокет"
 
 msgid "Invalid XMPP ID"
 msgstr "Невалидно XMPP ID."
@@ -4066,6 +4104,10 @@ msgstr "Невалидно XMPP ID."
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Невалиден XMPP ид. Мора да поставите домен."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Не можам да се поврзам со серверот."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Регистрирањето на %s@%s е успешно"
@@ -4090,9 +4132,6 @@ msgstr "Дерегистрирањето е успешно"
 msgid "Unregistration Failed"
 msgstr "Дерегистрацијата не успеа"
 
-msgid "Already Registered"
-msgstr "Веќе сте регистрирани"
-
 msgid "State"
 msgstr "Состојба"
 
@@ -4105,6 +4144,9 @@ msgstr "Телефон"
 msgid "Date"
 msgstr "Датум"
 
+msgid "Already Registered"
+msgstr "Веќе сте регистрирани"
+
 msgid "Unregister"
 msgstr "Дерегистрирај"
 
@@ -4136,6 +4178,10 @@ msgstr "Регистрирајте нова сметка на %s"
 msgid "Change Registration"
 msgstr "Сменете регистрација"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Не можам да се поврзам со серверот."
+
 msgid "Error unregistering account"
 msgstr "Грешка при дерегистрација на сметката"
 
@@ -4154,9 +4200,18 @@ msgstr "Авторизирање"
 msgid "Re-initializing Stream"
 msgstr "Го реиницијализирам протокот"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Не сте авторизирани"
 
+msgid "Mood"
+msgstr "Расположение"
+
+msgid "Now Listening"
+msgstr "Слушам"
+
 msgid "Both"
 msgstr "Двете"
 
@@ -4178,12 +4233,6 @@ msgstr "Ништо"
 msgid "Subscription"
 msgstr "Претплата"
 
-msgid "Mood"
-msgstr "Расположение"
-
-msgid "Now Listening"
-msgstr "Слушам"
-
 msgid "Mood Text"
 msgstr "Текст за расположение"
 
@@ -4226,9 +4275,6 @@ msgstr "Вашата лозинка е променета."
 msgid "Error changing password"
 msgstr "Грешка во промената на лозинката"
 
-msgid "Password (again)"
-msgstr "Лозинка (повторно)"
-
 msgid "Change XMPP Password"
 msgstr "Промени ја лозинката за XMPP"
 
@@ -4421,18 +4467,24 @@ msgstr "Не успеав да го исфрлам корисникот %s"
 msgid "Unable to ping user %s"
 msgstr "Не можам да го пингнам корисникот %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Не успеав да испратам buzz, бидејќи корисникот %s тоа не го дозволува."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Не успеав да испратам buzz, бидејќи корисникот %s не е на интернет."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Не успеав да испратам buzz, бидејќи корисникот %s тоа не го дозволува."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Испраќам buzz на %s..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4442,9 +4494,35 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr "%s Ви испрати buzz!"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Испраќам buzz на %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Не успеав да испратам датотека до %s, невалиден JID"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Не може да испратите датотека дo %s, корисникот не онлајн"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Не може да испратите датотека дo %s, не се авторизирани од корисникот"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Регистрирањето не успеа"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Ве молам изберете на кој ресурс од %s сакате да му ја испратите датотеката"
+
+msgid "Select a Resource"
+msgstr "Изберете ресурс"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Иницирај _разговор"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Конфигурирај соба за разговор"
@@ -4464,16 +4542,18 @@ msgstr "topic [new topic]:  преглед или промена на насло
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [причина]:  Банирај го корисникот од собата"
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Постави ја "
 "врската на корисникот со собата."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Постави ја "
 "улогата на корисникот во собата."
@@ -4538,6 +4618,9 @@ msgstr "Сервер за врзување"
 msgid "File transfer proxies"
 msgstr "Proxy сервери за пренос на датотеки"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4577,6 +4660,14 @@ msgstr "Грешка во анализирањето на XML"
 msgid "Unknown Error in presence"
 msgstr "Непозната грешка во присуство"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Грешка при приклучување во разговорот %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Грешка во разговорот %s"
+
 msgid "Create New Room"
 msgstr "Креирај нова соба"
 
@@ -4593,13 +4684,32 @@ msgstr "_Конфигурирај соба"
 msgid "_Accept Defaults"
 msgstr "_Прифати стандардно"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Грешка при приклучување во разговорот %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Не е дадена причина."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Грешка во разговорот %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Бевте исфрлени од %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Исфрлен/а од %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Се случи грешка при отворање на датотеката."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Преносот на датотеки не успеа"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Не успеав да ја отворам датотеката '%s': %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4625,9 +4735,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 "Ве молам изберете на кој ресурс од %s сакате да му ја испратите датотеката"
 
-msgid "Select a Resource"
-msgstr "Изберете ресурс"
-
 msgid "Edit User Mood"
 msgstr "Уреди располо жение"
 
@@ -4662,8 +4769,19 @@ msgstr "Дејства"
 msgid "Select an action"
 msgstr "Изберете дејство"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Не успеав да го добијам адресарот за MSN"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Не можам да додадам \"%s\"."
+
+msgid "Buddy Add error"
+msgstr ""
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Името за екранот е невалидно."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4893,7 +5011,7 @@ msgstr "Passport за деца без родителска согласност"
 msgid "Passport account not yet verified"
 msgstr "Сметката за пасошот сеуште не е проверена"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Сметката за пасошот сеуште не е проверена"
 
@@ -4917,6 +5035,10 @@ msgstr "Префериран контакт"
 msgid "Non-IM Contacts"
 msgstr "Отстрани контакт"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s Ви испрати покана за webcam но ова сеуште не е поддржано."
+
 msgid "Nudge"
 msgstr "Nudge"
 
@@ -4989,6 +5111,13 @@ msgstr "Испрати порака за мобилен"
 msgid "Page"
 msgstr "Страница"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Работа"
+
 msgid "Has you"
 msgstr "Ве има"
 
@@ -5025,6 +5154,14 @@ msgstr "Артист"
 msgid "Album"
 msgstr "Албум"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "Наслов на песната"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Наслов на песната"
+
 msgid "Set Friendly Name..."
 msgstr "Постави пријателско име..."
 
@@ -5060,9 +5197,6 @@ msgstr ""
 "SSL поддршка е потребна за MSN. Ве молам, инсталирајте поддржана SSL "
 "библиотека."
 
-msgid "Failed to connect to server."
-msgstr "Не можам да се поврзам со серверот."
-
 msgid "Error retrieving profile"
 msgstr "Грешка при добивањето на профилот"
 
@@ -5218,8 +5352,9 @@ msgstr ""
 "Не успеав да најдам информации за корисничкиот профил. Корисникот "
 "најверојатно не постои."
 
-msgid "Profile URL"
-msgstr "URL на профил"
+#, fuzzy
+msgid "View web profile"
+msgstr "Скриј кога не сум на интернет"
 
 #. *< type
 #. *< ui_requirement
@@ -5253,65 +5388,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Автентикација за Windows Live ID:Не успеав да се врзам"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s не е валидна група."
-
-msgid "Unknown error."
-msgstr "Непозната грешка."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s на %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s штотуку ти испрати Nudge!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Непозната грешка (%d)"
 
 msgid "Unable to add user"
 msgstr "Не успеав да го додадам корисникот"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Непозната грешка (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Следниве се резултатите од Вашето пребарување"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Не можам да го додадам корисникот на %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Не можам да го блокирам корисникот на %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Не можам да му дадам дозвола на корисникот %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s не може да се додаде, бидејќи групата е полна."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s не е валидна passport сметка."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Сервисот е привремено недостапен."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Пораката не може да се испрати бидејќи не сте најавени."
 
-msgid "Unable to rename group"
-msgstr "Не можам да ја преименувам групата"
-
-msgid "Unable to delete group"
-msgstr "Не можам да ја избришам групата"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5363,9 +5461,6 @@ msgstr "Пораката може да не е испратена бидејќи
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Пораката може да не е испратена бидејќи се појави непозната грешка:"
 
-msgid "Unable to connect"
-msgstr "Не можам да се поврзам"
-
 msgid "Writing error"
 msgstr "Грешка во запишувањето"
 
@@ -5380,19 +5475,23 @@ msgstr ""
 "Грешка во поврзувањето од %s серверот:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Нашиот протокол не е поддржан од серверот."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Грешка во парсирањето на HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Се имате најавено од друга локација."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN серверите се моментално недостапни. Ве молам, обидете се повторно."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN серверите ќе се недостапни привремено."
 
 #, c-format
@@ -5423,6 +5522,14 @@ msgstr "Испраќам колаче"
 msgid "Retrieving buddy list"
 msgstr "Земам листа на пријатели"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s Ви испрати покана за webcam но ова сеуште не е поддржано."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s Ви испрати покана за webcam но ова сеуште не е поддржано."
+
 msgid "Away From Computer"
 msgstr "Отсутен/а од компјутерот"
 
@@ -5465,14 +5572,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Пораката може да не е испратена бидејќи се појави непозната грешка:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s Ве додаде на неговата/нејзината листа со пријатели."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s Ве отстрани од неговата/нејзината листа со на пријатели."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Додај во адресар"
@@ -5481,19 +5580,15 @@ msgstr "Додај во адресар"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Дали сакате да го додадете овој пријател во Вашата листа со пријатели?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Не можам да додадам \"%s\"."
-
 msgid "The username specified is invalid."
 msgstr "Името за екранот е невалидно."
 
 msgid "This Hotmail account may not be active."
 msgstr "Оваа Hotmail сметка можеби не е активна."
 
+msgid "Profile URL"
+msgstr "URL на профил"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5507,16 +5602,60 @@ msgstr "Оваа Hotmail сметка можеби не е активна."
 msgid "MSN Protocol Plugin"
 msgstr "Приклучок за MSN протоколот"
 
-msgid "Missing Cipher"
-msgstr "Недостасува cipher"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s не е валидна група."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "Непозната грешка."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s на %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Не можам да го додадам корисникот на %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Не можам да го блокирам корисникот на %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Не можам да му дадам дозвола на корисникот %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s не може да се додаде, бидејќи групата е полна."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s не е валидна passport сметка."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Сервисот е привремено недостапен."
+
+msgid "Unable to rename group"
+msgstr "Не можам да ја преименувам групата"
+
+msgid "Unable to delete group"
+msgstr "Не можам да ја избришам групата"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s Ве додаде на неговата/нејзината листа со пријатели."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s Ве отстрани од неговата/нејзината листа со на пријатели."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "Нема таков корисник: %s"
+
+msgid "User lookup"
+msgstr "Проверка на корисникот"
 
 msgid "Reading challenge"
 msgstr ""
@@ -5527,14 +5666,24 @@ msgstr "Невалиден должина на предизвик од серв�
 msgid "Logging in"
 msgstr "Се најавувам"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Не е поставено корисничко име"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"Врската со серверот е изгубена\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Нова пошта"
 
@@ -5553,20 +5702,22 @@ msgstr "Нови коментари на слика"
 msgid "MySpace"
 msgstr "MySpace"
 
-msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM - Не е поставено корисничко име"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "IM пријатели"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Врзано"
+msgid "Add contacts from server"
+msgstr "Додај контакти од серверот"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5574,15 +5725,20 @@ msgstr "Грешка во протоколот, код %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr "Неточен прекар или лозинка"
+
 msgid "MySpaceIM Error"
 msgstr "Грешка со MySpaceIM"
 
+msgid "Invalid input condition"
+msgstr "Невалиден влезен услов"
+
 msgid "Failed to add buddy"
 msgstr "Не успеав да го додадам пријателот"
 
@@ -5592,13 +5748,6 @@ msgstr "командата 'addbuddy' не успеа."
 msgid "persist command failed"
 msgstr "командата persist не успеа"
 
-#, c-format
-msgid "No such user: %s"
-msgstr "Нема таков корисник: %s"
-
-msgid "User lookup"
-msgstr "Проверка на корисникот"
-
 msgid "Failed to remove buddy"
 msgstr "Не успеав да го отстранам пријателот"
 
@@ -5608,35 +5757,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "командата blocklist не успеа"
 
-msgid "Invalid input condition"
-msgstr "Невалиден влезен услов"
-
-msgid "Read buffer full (2)"
-msgstr "Баферот за читање е полн (2)"
-
-msgid "Unparseable message"
-msgstr "Порака што не може да се парсира"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Не можам да се поврзам со хостот: %s (%d)"
+msgid "Missing Cipher"
+msgstr "Недостасува cipher"
 
-msgid "IM Friends"
-msgstr "IM пријатели"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-msgid "Add contacts from server"
-msgstr "Додај контакти од серверот"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr "Додај пријатели од MySpace.com"
@@ -5678,9 +5808,6 @@ msgstr "Основна големина на фонт (points)"
 msgid "User"
 msgstr "Корисник"
 
-msgid "Profile"
-msgstr "Профил"
-
 msgid "Headline"
 msgstr "Наслов"
 
@@ -5693,16 +5820,12 @@ msgstr "Вкупно пријатели"
 msgid "Client Version"
 msgstr "Верзија на клиентот"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "Не е поставено корисничко име"
-
-msgid "MySpaceIM - Please Set a Username"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
-msgid "Please enter a username to check its availability:"
-msgstr "Ве молам внесете корисничко име за проверка на достапноста:"
-
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Корисничкото име е достапно"
 
@@ -5712,12 +5835,22 @@ msgstr "Ова корисничко име е достапно. Дали сак�
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "ЕДНАШ ПОСТАВЕНО, ОВА НЕ МОЖЕ ДА СЕ СМЕНИ!"
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 msgid "This username is unavailable."
 msgstr "Ова корисничко име не е достапно."
 
 msgid "Please try another username:"
 msgstr "Ве молам обидете се со друго корисничко име:"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Не е поставено корисничко име"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Ве молам внесете корисничко име за проверка на достапноста:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5909,9 +6042,6 @@ msgstr "Не можете да се додадете самите"
 msgid "Master archive is misconfigured"
 msgstr "Главната архива е погрешно конфигурирана"
 
-msgid "Incorrect username or password"
-msgstr "Неточен прекар или лозинка"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Не можам да го препознам хостот на корисничкото име кое го внесовте"
 
@@ -5952,9 +6082,9 @@ msgstr "Или корисникот е офлајн или сте блокира
 msgid "Unknown error: 0x%X"
 msgstr "Непозната грешка: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Најавата не успеа (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Не можам да ве најавам"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6063,9 +6193,6 @@ msgstr "GroupWise конференција %d"
 msgid "Authenticating..."
 msgstr "Автентицирање..."
 
-msgid "Unable to connect to server."
-msgstr "Не можам да се поврзам со серверот."
-
 msgid "Waiting for response..."
 msgstr "Чекам одговор..."
 
@@ -6089,26 +6216,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Дали сакате да се приклучите на разговорот?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Одјавени сте бидејќи се најавивте од друга работна станица."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s изгледа дека е исклучен(a) и не ја прими пораката која што ја испративте."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Не можам да се врзам на серверот. Ве молам внесете ја адресата на серверот "
 "на кој што сакате да се врзете."
 
-msgid "Error. SSL support is not installed."
-msgstr "Грешка. SSL поддршката не е инсталирана."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Оваа конференција е затворена. Не може да се испраќаат пораки."
 
@@ -6131,24 +6252,33 @@ msgstr "Адреса на серверот"
 msgid "Server port"
 msgstr "Порта на серверот"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Добив неочекуван HTTP одговор од серверот."
+
+#. username connecting too frequently
+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 ""
+"Се поврзувате и исклучувате пречесто. Почекајте десет минути и обидете се "
+"повторно. Ако продолжите со обидeте, ќе треба да чекате уште повеќе."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Грешка при барањето на токенот за најава"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Не можам да се приклучам на собата за чет"
 
 msgid "Invalid chat room name"
 msgstr "Невалидно име на соба за чет"
 
-msgid "Server closed the connection."
-msgstr "Грешка во креирањето на врска."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Изгубив врска со серверот:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Примив невалидни податоци на врската со серверот."
 
 #. *< type
@@ -6196,7 +6326,8 @@ msgstr "Се изгуби врската со оддалечениот кори�
 msgid "Received invalid data on connection with remote user."
 msgstr "Примив невалидни податоци за врската со оддалечениот корисник."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Не можам да воспоставам врска со оддалечениот сервер."
 
 msgid "Direct IM established"
@@ -6370,23 +6501,18 @@ msgstr "Камера"
 msgid "Screen Sharing"
 msgstr ""
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Слободен/на за разговор"
 
-#, c-format
 msgid "Not Available"
 msgstr "Не е достапно"
 
-#, c-format
 msgid "Occupied"
 msgstr "Зафатен"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Свесен за веб"
 
-#, c-format
 msgid "Invisible"
 msgstr "Невидлив"
 
@@ -6399,21 +6525,15 @@ msgstr "Ниво на предупредување"
 msgid "Buddy Comment"
 msgstr "Коментар за пријател"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Не можам да се поврзам со серверот за проверка:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Не можам да се поврзам со BOS серверот:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Не можам да се поврзам со серверот."
 
 msgid "Username sent"
 msgstr "Корисничкото име е испратено"
@@ -6425,53 +6545,61 @@ msgstr "Врската е воспоставена, испраќам колач�
 msgid "Finalizing connection"
 msgstr "Привршување на поврзувањето"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Не можам да се најавам: Не можам да се најавам како %s, бидејќи корисничкото "
 "именајава е невалидно.  Имињата за најава мора да започнуваат со буква и да "
 "содржат само букви, бројки и празни места или пак да содржат само бројки."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Невалидно корисничко име."
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Може да бидете накратко исклучени.  Проверете %s за надградби.."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Не можам да добијам валиден AIM хеш за најава."
+
+msgid "Unable to get a valid login hash."
+msgstr "Не можам да добијам валиден хеш за најава."
+
+msgid "Received authorization"
+msgstr "Примена е авторизација"
 
-msgid "Incorrect password."
-msgstr "Грешна лозинка."
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Корисникот не постои"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Вашата сметка е моментално суспендирана."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL сервисот за инстант пораки е привремено недостапен."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Се поврзувате и исклучувате пречесто. Почекајте десет минути и обидете се "
-"повторно. Ако продолжите со обидeте, ќе треба да чекате уште повеќе."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Верзијата на клиентот кој го користите е престара. Ве молам, надградете на %s"
 
-msgid "Could Not Connect"
-msgstr "Не можам да се поврзам"
-
-msgid "Received authorization"
-msgstr "Примена е авторизација"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Се поврзувате и исклучувате пречесто. Почекајте десет минути и обидете се "
+"повторно. Ако продолжите со обидeте, ќе треба да чекате уште повеќе."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "SecurID клучот кој го внесовте е невалиден."
 
 msgid "Enter SecurID"
@@ -6486,24 +6614,6 @@ msgstr "Внесете го 6 цифрениот број од дигиталн�
 msgid "_OK"
 msgstr "_Во ред"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Може да Ве исклучат за кратко.  Можете да ја користете табелата со содржини "
-"додека ова не се поправи.  Проверете на %s за ажурирања."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Не можам да добијам валиден AIM хеш за најава."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Може да бидете накратко исклучени.  Проверете %s за надградби.."
-
-msgid "Unable to get a valid login hash."
-msgstr "Не можам да добијам валиден хеш за најава."
-
 msgid "Password sent"
 msgstr "Лозинката е пратена"
 
@@ -6648,7 +6758,7 @@ msgstr[0] "Пропуштивте %hu порака од %s поради непо
 msgstr[1] "Пропуштивте %hu пораки од %s поради непозната причина."
 msgstr[2] "Пропуштивте %hu пораки од %s поради непозната причина."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Не можам да ја испратам пораката: %s"
@@ -6670,6 +6780,12 @@ msgstr "Поврзан од"
 msgid "Member Since"
 msgstr "Член од"
 
+msgid "Capabilities"
+msgstr "Можности"
+
+msgid "Profile"
+msgstr "Профил"
+
 msgid "Your AIM connection may be lost."
 msgstr "Вашата AIM врска можеби е прекината."
 
@@ -6858,9 +6974,9 @@ msgstr[2] ""
 msgid "Away message too long."
 msgstr "Пораката за отсутност е предолга."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6888,9 +7004,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Без родител"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Не можам да го додадам пријателот %s, бидејќи имате премногу пријатели во "
@@ -6899,8 +7015,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(без име)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Не можам да го додадам пријателот %s поради непозната причина."
 
 #, c-format
@@ -6973,6 +7089,7 @@ msgstr "П_оврзи се"
 msgid "Get AIM Info"
 msgstr "Собери инфо за AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Уреди коментар за пријател"
 
@@ -7033,6 +7150,7 @@ msgstr "_Барај"
 msgid "Set User Info (web)..."
 msgstr "Постави кориснички информации (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Промени лозинка (web)"
 
@@ -7062,6 +7180,10 @@ msgstr "Барај пријател преку е-пошта..."
 msgid "Search for Buddy by Information"
 msgstr "Барај пријател со некоја информација"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Корисникот не е најавен"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7082,7 +7204,6 @@ msgstr "Барам %s да се поврзи со нас на %s:%hu за дир
 msgid "Attempting to connect to %s:%hu."
 msgstr "Се обидувам да се поврзам со %s:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Пробувам да се поврзам преку proxy сервер."
 
@@ -7178,7 +7299,7 @@ msgstr "Друго"
 msgid "Visible"
 msgstr "Невидлив"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7269,16 +7390,48 @@ msgstr "Последно ажурирање"
 msgid "Could not change buddy information."
 msgstr "Ве молам внесетете информации за пријателот."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "Мобилен"
+
+msgid "Note"
+msgstr "Белешка"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Икона на пријател:"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Додај пријател"
+msgid "_Modify"
+msgstr "Измени"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Memo Modify"
+msgstr "Измени"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Серверот е зафатен"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Барај авторизација"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Да го додадам пријателот во листата?"
+
+#, fuzzy
+msgid "Enter answer here"
 msgstr "Внесете го барањето овде"
 
 msgid "Send"
@@ -7292,18 +7445,19 @@ msgid "Authorization denied message:"
 msgstr "Порака за одбиена авторизација:"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "Жалам, не си мој тип..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Корисникот %d бара автентикација"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Да го додадам пријателот во листата?"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "Внесете го барањето овде"
 
 msgid "Would you be my friend?"
@@ -7326,7 +7480,7 @@ msgid "Failed sending authorize"
 msgstr "Те молам, авторизирај ме!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Не успеав да го отстранам пријателот"
 
 #, fuzzy, c-format
@@ -7371,6 +7525,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr "Можете да пребарувате само за трајни QQ групи\n"
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Невалидни поставувања за proxy"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Не сум член"
 
@@ -7413,16 +7571,19 @@ msgstr "Во групата не е дозволено зачленување н
 msgid "Join QQ Qun"
 msgstr "Приклучи се на разговор"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "Внесете го барањето овде"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Успешно изменивте член на Qun"
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "Успешно изменивте член на Qun"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7432,7 +7593,7 @@ msgstr "QQ Qun операција"
 msgid "Failed:"
 msgstr "Неуспешно"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7447,11 +7608,11 @@ msgstr ""
 "овој оператор најверојатно ќе го отстрани овој Qun."
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "Жалам, не си мој тип..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Успешно изменивте член на Qun"
 
 #, fuzzy
@@ -7462,35 +7623,35 @@ msgid "You have successfully created a Qun"
 msgstr "Успешно креиравте Qun"
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Дали сакате да поставите детали за Qun веднаш?"
 
 msgid "Setup"
 msgstr "Постави"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "Корисникот %d се пријави да се приклучи во групата %d"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "Корисникот %d се пријави да се приклучи во групата %d"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Не можам да приклучам пријател во разговорот"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Отстрани пријател"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Отстрани пријател"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7607,6 +7768,13 @@ msgstr "<b>Послден пат освежено</b>: %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Моментално онлајн</b>: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Послден пат освежено</b>: %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7614,7 +7782,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "За %s"
 
 #, fuzzy
@@ -7635,6 +7803,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "За %s"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Домашна адреса"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7666,7 +7838,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Се поврзувам преку TCP"
@@ -7679,6 +7850,9 @@ msgstr "Порта на серверот"
 msgid "Show server news"
 msgstr "Адреса на серверот"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Грешка"
@@ -7688,11 +7862,7 @@ msgid "Update interval (seconds)"
 msgstr "Грешка"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Не можам да добијам информации за серверот"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Не можам да добијам информации за серверот"
 
 #, c-format
@@ -7715,21 +7885,20 @@ msgid "Activation required"
 msgstr "Потребна е регистрација"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Keep alive error"
-msgstr "Грешка"
-
 #, fuzzy
-msgid "Requesting captcha ..."
+msgid "Requesting captcha"
 msgstr "Го барам вниманието на %s..."
 
-msgid "Checking code of captcha ..."
-msgstr ""
+#, fuzzy
+msgid "Checking captcha"
+msgstr "Го барам вниманието на %s..."
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Авторизирањето на Yahoo! не успеа"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7739,73 +7908,51 @@ msgstr "Зачувај ја сликата"
 msgid "Enter code"
 msgstr "Внесете лозинка:"
 
-msgid "QQ Captcha Verifing"
-msgstr ""
+#, fuzzy
+msgid "QQ Captcha Verification"
+msgstr "Проверка на SSL сертификат"
 
 #, fuzzy
 msgid "Enter the text from the image"
 msgstr "Внесете го името на групата"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Не можам да се поврзам."
-
 msgid "Socket error"
 msgstr "Грешка во сокетот"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"Изгубив врска со серверот:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "Не можам да го прочитам сокетот"
-
-msgid "Write Error"
-msgstr "Грешка во запишувањето"
-
-msgid "Connection lost"
-msgstr "Врската е изгубена"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Постави ги информациите за корисникот..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Барањето е одбиено"
 
-msgid "Couldn't resolve host"
-msgstr "Не можам да го преведам хостот"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Не можам да се поврзам со серверот."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Невалидна грешка"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Сервер за врзување"
+msgid "Connecting to server"
+msgstr "Се поврзувам на SILC сервер"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "QQid грешка"
 
-msgid "Failed to send IM."
-msgstr "Не успеав да испратам ИП."
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7815,6 +7962,10 @@ msgid ""
 msgstr "Пренесување на ICQ сервер"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Од"
 
@@ -7824,32 +7975,30 @@ msgid ""
 "%s"
 msgstr "Инструкции за серверот: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Непозната причина"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Команда"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Не можам да добијам информации за серверот"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Непозната причина"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Непозната причина"
 
 #, c-format
@@ -7863,9 +8012,6 @@ msgstr "Испраќање на датотека"
 msgid "%d canceled the transfer of %s"
 msgstr "%d го откажа преносот на %s"
 
-msgid "Connection closed (writing)"
-msgstr "Врската се затвори (пишувам)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Наслов на групата:</b> %s<br>"
@@ -7919,17 +8065,6 @@ msgstr "Администратор на Sametime ја издаде следна�
 msgid "Sametime Administrator Announcement"
 msgstr "Администраторска најава на Sametime"
 
-msgid "Connection reset"
-msgstr "Врската се ресетира"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Грешка при читање од сокетот: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Не можам да се поврзам со хостот"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Најава од %s"
@@ -7952,6 +8087,9 @@ msgstr "Звучници"
 msgid "Video Camera"
 msgstr "Видео камера"
 
+msgid "File Transfer"
+msgstr "Пренос на датотеки"
+
 msgid "Supports"
 msgstr "Поддржува"
 
@@ -8675,9 +8813,6 @@ msgstr "Организација"
 msgid "Unit"
 msgstr "Единица"
 
-msgid "Note"
-msgstr "Белешка"
-
 msgid "Join Chat"
 msgstr "Приклучи се на разговор"
 
@@ -8777,6 +8912,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Мрежни статистики"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Пинг не успеа"
 
@@ -8841,7 +8979,8 @@ msgstr "Неподдржан тип на јавен клуч"
 msgid "Disconnected by server"
 msgstr "Исклучен од серверот"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Грешка со поврзувањето на SILC серверот"
 
 msgid "Key Exchange failed"
@@ -8853,26 +8992,26 @@ msgstr ""
 "Продолжувањето на одделената сесија не успеа. Притиснете на „Поврзи се "
 "повторно“ за да креирате нова врска."
 
-msgid "Connection failed"
-msgstr "Поврзувањето не успеа"
-
 msgid "Performing key exchange"
 msgstr "Извршувам размена на клучеви"
 
-msgid "Unable to create connection"
-msgstr "Не можам да креирам врска"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Не можам да ги вчитам клучевите за SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Се поврзувам на SILC сервер"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Не можам да ги вчитам клучевите за SILC"
+
 msgid "Out of memory"
 msgstr "Без меморија"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Не можам да го иницијализирам протоколот SILC"
 
 msgid "Error loading SILC key pair"
@@ -9167,7 +9306,8 @@ msgstr "Дигитално потпиши ги сите инстант пора�
 msgid "Creating SILC key pair..."
 msgstr "Креирам SILC пар од клучеви..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Не можам да креирам пар од SILC пар од клучеви\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9263,6 +9403,9 @@ msgstr "Табла"
 msgid "No server statistics available"
 msgstr "Нема достапни статистики за серверот"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Грешка со поврзувањето на SILC серверот"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Неуспех: Несогласување на верзијата, надградете го Вашиот клиент"
@@ -9304,35 +9447,36 @@ msgstr "Неуспех: Невалидно колаче"
 msgid "Failure: Authentication failed"
 msgstr "Неуспех: Авторизирањето не успеа"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Не можам да ја иницијализирам SILC врската со клиентот"
 
 msgid "John Noname"
 msgstr "Џон Безименко"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Не можам да го вчитам клучот за SILC: %s"
 
-msgid "Could not write"
-msgstr "Не можам да запишам"
-
-msgid "Could not connect"
-msgstr "Не можам да се поврзам"
+msgid "Unable to create connection"
+msgstr "Не можам да креирам врска"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Непознат одговор од серверот."
 
-msgid "Could not create listen socket"
-msgstr "Не можам да креирам сокет за слушање"
-
-msgid "Could not resolve hostname"
-msgstr "Не можам да го преведам името на хостот"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Не можам да креирам сокет"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 "SIP имињата на корисници не смеат да содржат празни места или симболот @"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Порта на серверот"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9366,179 +9510,63 @@ msgstr "Автентицирај корисник"
 msgid "Auth Domain"
 msgstr "Домен за проверка"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Го барам %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Поврзувањето со %s не успеа"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Најавување: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Не можам да ја запишам датотеката %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Не можам да ја прочитам датотеката %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Пораката е предолга. Последните %s бајти се скратени."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s не е најавен/а."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Предупредувањето за %s не е дозволено."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Беше испуштена порака, бидејќи ја надминувате брзината на серверот."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Разговорот во %s не е достапен."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Пребрзо испраќате пораки до %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Пропуштивте инстант порака од %s бидејќи беше преголема."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Пропуштивте инстант порака од %s бидејќи беше испратена пребрзо."
-
-#, c-format
-msgid "Failure."
-msgstr "Неуспех."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Премногу совпаѓања."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Требаат повеќе квалификатори."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Сервисот за директориуми е привремено недостапен."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Барањето на е-пошта е ограничено."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Клучниот збор е игнориран."
-
-#, c-format
-msgid "No keywords."
-msgstr "Нема клучни зборови."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Корисникот нема информации за директориумот."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Државата не е поддржана."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Причината за неуспех е непозната: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Неточно корисничко име или лозинка."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Сервисот е привремено недостапен."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Вашето ниво за предупредување е превисоко за да се најавите."
-
-#, c-format
-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 ""
-"Се поврзувавте и се исклучувавте пречесто.  Почекајте десет минути и "
-"пробајте повторно.  Ако продолжете со обидeте сега, ќе треба да чекате уште "
-"подолго."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Непозната грешка при најавување: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Се случи непозната грешка %d.  Информации: %s"
-
-msgid "Invalid Groupname"
-msgstr "Невалидно име на група"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;соба&gt;:  Приклучи се во соба на Yahoo мрежата"
 
-msgid "Connection Closed"
-msgstr "Врската се затвори"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Ги листа сите соби на Yahoo мрежата"
 
-msgid "Waiting for reply..."
-msgstr "Чекам одговор..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Побарајте од некој корисник да започне Doodle сесија"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC се врати од паузата. Сега можете повторно да испраќате пораки."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! Ид."
 
-msgid "Password Change Successful"
-msgstr "Лозинката успешно е промената."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Приклучок за Yahoo протоколот"
 
-msgid "_Group:"
-msgstr "_Група:"
+msgid "Pager server"
+msgstr "Пејџер сервер"
 
-msgid "Get Dir Info"
-msgstr "Собери информации за директориумот"
+msgid "Pager port"
+msgstr "Порта на пејџер"
 
-msgid "Set Dir Info"
-msgstr "Постави информации за директориумот"
+msgid "File transfer server"
+msgstr "Сервер за размена на датотеки"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Не можам да ја отворам %s за запишување!"
+msgid "File transfer port"
+msgstr "Порта за размена на датотеки"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Размената на датотека не успеа. Другата страна веројатно откажа."
+msgid "Chat room locale"
+msgstr "Locale на собата за разговор"
 
-msgid "Could not connect for transfer."
-msgstr "Не можам да се поврзам за размена."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Игнорирај покани за разговори и конференции"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-"Не можам да го запишам заглавјето на датотеката.  Датотеката не може да се "
-"размени."
+msgid "Chat room list URL"
+msgstr "Url на листата со соби"
 
-msgid "Save As..."
-msgstr "Зачувај како..."
+msgid "Yahoo Chat server"
+msgstr "Сервер за разговор на Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s бара %s да ја прифатите %d датотеката: %s (%.2f %s)%s%s"
-msgstr[1] "%s бара %s да ги прифатите %d датотеките: %s (%.2f %s)%s%s"
-msgstr[2] "%s бара %s да ги прифатите %d датотеките: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Порта за разговор на Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s бара да му/ѝ испратите датотека"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! Ид."
 
 #. *< type
 #. *< ui_requirement
@@ -9550,12 +9578,12 @@ msgstr "%s бара да му/ѝ испратите датотека"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Приклучок за TOC протоколот"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Приклучок за Yahoo протоколот"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s Ви испрати покана за webcam но ова сеуште не е поддржано."
+msgid "Your SMS was not delivered"
+msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Вашата Yahoo! порака не се испрати."
@@ -9579,6 +9607,34 @@ msgstr "%s (ретроактивно) го одби Вашето барање з
 msgid "Add buddy rejected"
 msgstr "Додавањето на пријател е одбиено"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Примив невалидни податоци на врската со серверот."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Непозната грешка со број %d. Најавувањет на страницата на Yahoo! може да го "
+"поправи ова."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Непозната грешка со број %d. Најавувањет на страницата на Yahoo! може да го "
+"поправи ова."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Неточен прекар или лозинка"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9613,39 +9669,34 @@ msgstr ""
 "Непозната грешка со број %d. Најавувањет на страницата на Yahoo! може да го "
 "поправи ова."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Не можам да го додадам пријателот %s во групата %s на листата на серверот на "
 "сметката %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Не можам да го додадам пријателот во листата на серверот"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Звучен %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Добив неочекуван HTTP одговор од серверот."
 
-msgid "Connection problem"
-msgstr "Проблем со врската"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Изгубив врска со %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Не можам да воспоставам врска со %s:\n"
+"Не можам да воспоставам врска со серверот:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9693,8 +9744,8 @@ msgstr "Поставувања за присуство"
 msgid "Start Doodling"
 msgstr "Започни со дудлање"
 
-msgid "Activate which ID?"
-msgstr "Кој ID. да го активирам?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "На кој да му се приклучам во разговорот?"
@@ -9708,74 +9759,15 @@ msgstr "Приклучи корисник во разговор..."
 msgid "Open Inbox"
 msgstr "Отвори сандаче"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;соба&gt;:  Приклучи се во соба на Yahoo мрежата"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Ги листа сите соби на Yahoo мрежата"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Побарајте од некој корисник да започне Doodle сесија"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! Ид."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Приклучок за Yahoo протоколот"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Пејџер сервер"
-
-msgid "Japan Pager server"
-msgstr "Јапонски пејџер сервер"
-
-msgid "Pager port"
-msgstr "Порта на пејџер"
-
-msgid "File transfer server"
-msgstr "Сервер за размена на датотеки"
-
-msgid "Japan file transfer server"
-msgstr "Јапонски сервер за пренос на датотеки"
-
-msgid "File transfer port"
-msgstr "Порта за размена на датотеки"
-
-msgid "Chat room locale"
-msgstr "Locale на собата за разговор"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Игнорирај покани за разговори и конференции"
-
-msgid "Chat room list URL"
-msgstr "Url на листата со соби"
-
-msgid "Yahoo Chat server"
-msgstr "Сервер за разговор на Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Порта за разговор на Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Испрати барање за Doodle."
 
+msgid "Unable to connect."
+msgstr "Не можам да се поврзам."
+
 msgid "Unable to establish file descriptor."
 msgstr "Не можам да воспоставам опишувач за датотеката."
 
@@ -9783,6 +9775,9 @@ msgstr "Не можам да воспоставам опишувач за дат
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s се обидува да ви испрати група од %d датотеки\n"
 
+msgid "Write Error"
+msgstr "Грешка во запишувањето"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan профил"
 
@@ -9827,13 +9822,9 @@ msgstr "Cool Link 3"
 msgid "Last Update"
 msgstr "Последно ажурирање"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Информациите за корисникот %s не се достапни"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Извинете но овој профил изгледа е на јазик кој не е поддржан моментално."
 
@@ -9906,23 +9897,19 @@ msgstr "Гласови"
 msgid "Webcams"
 msgstr "Веб камери"
 
+msgid "Connection problem"
+msgstr "Проблем со врската"
+
 msgid "Unable to fetch room list."
 msgstr "Не можам да добијам листа со соби."
 
 msgid "User Rooms"
 msgstr "Кориснички соби"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Грешка во поврзувањето со YCHT серверот."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Врската со серверот е изгубена\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10053,33 +10040,22 @@ msgstr "Област"
 msgid "Exposure"
 msgstr "Појавување"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Не можам да креирам сокет:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Не можам да го парсирам одговорот од HTTP proxy-то: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Грешки при поврзување со HTTP proxy-то %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Пристапот е одбиен: HTTP proxy серверот забранува тунелирање на %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Грешка при преведување на %s"
 
-msgid "Could not resolve host name"
-msgstr "Не можам да го преведам името на хостот"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Го барам вниманието на %s..."
@@ -10169,9 +10145,6 @@ msgstr "Не вознемирувај"
 msgid "Extended away"
 msgstr "Не сум тука подолго време"
 
-msgid "Mobile"
-msgstr "Мобилен"
-
 msgid "Listening to music"
 msgstr "Слушам музика"
 
@@ -10213,18 +10186,6 @@ msgstr "+++ %s стана активен"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Грешка при читањето на %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Произлезе грешка при читањето на Вашите %s.  Тие не се вчитани и "
-"старатадатотека беше преименувана во %s~."
-
 msgid "Calculating..."
 msgstr "_Пресметувам..."
 
@@ -10338,6 +10299,18 @@ msgstr "Врската е одбиена."
 msgid "Address already in use."
 msgstr "Ова име на разговор веќе постои"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Грешка при читањето на %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Произлезе грешка при читањето на Вашите %s.  Тие не се вчитани и "
+"старатадатотека беше преименувана во %s~."
+
 msgid "Internet Messenger"
 msgstr "Инстант пораки"
 
@@ -10380,10 +10353,8 @@ msgstr "Известувања_ за пошта"
 msgid "Use this buddy _icon for this account:"
 msgstr "Користи ја оваа _икона за оваа сметка:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Опции"
+msgid "_Advanced"
+msgstr "_Напредно"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Користи поставувања од GNOME за proxy"
@@ -10418,9 +10389,6 @@ msgstr "Ако погледнеш од блиску"
 msgid "you can see the butterflies mating"
 msgstr "можеш да ги видиш пеперутките кај што се парат"
 
-msgid "Proxy Options"
-msgstr "Proxy Опции"
-
 msgid "Proxy _type:"
 msgstr "_Тип на proxy:"
 
@@ -10449,8 +10417,9 @@ msgstr "_Основно"
 msgid "Create _this new account on the server"
 msgstr "Креирај ја оваа нова сметка на серверот"
 
-msgid "_Advanced"
-msgstr "_Напредно"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Прокси"
 
 msgid "Enabled"
 msgstr "Вклучено"
@@ -10498,8 +10467,9 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Ве молам ажурирајте ги потребните полиња."
 
-msgid "Room _List"
-msgstr "Листа на _соби"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Сметка"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10508,8 +10478,8 @@ msgstr ""
 "Внесете ги соодветните информации за разговорот во кој што сакате да се "
 "приклучите.\n"
 
-msgid "_Account:"
-msgstr "_Сметка:"
+msgid "Room _List"
+msgstr "Листа на _соби"
 
 msgid "_Block"
 msgstr "_Блокирај"
@@ -10526,6 +10496,17 @@ msgstr "Инфо"
 msgid "I_M"
 msgstr "Порака"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "_Додај разговор"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Видео разговор"
+
 msgid "_Send File..."
 msgstr "_Испрати датотека..."
 
@@ -10535,9 +10516,14 @@ msgstr "Додај дејство за _пријател..."
 msgid "View _Log"
 msgstr "Прегледај _лог"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Скриј кога не сум на интернет"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Прикажи додека не сум на интернет"
+
 msgid "_Alias..."
 msgstr "_Алиjас..."
 
@@ -10663,6 +10649,10 @@ msgstr "/Алатки/Дејства за _пријател"
 msgid "/Tools/_Certificates"
 msgstr "/Алатки/_Сертификати"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Алатки/Приватност"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Алатки/Дод_атоци"
 
@@ -10672,10 +10662,6 @@ msgstr "/Алатки/Пр_еференци"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Алатки/При_ватност"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Алатки/Приватност"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Алатки/_Пренос на датотеки"
 
@@ -10794,8 +10780,8 @@ msgstr "Рачно"
 msgid "By status"
 msgstr "По статус"
 
-msgid "By log size"
-msgstr "По големина на лог"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10811,6 +10797,9 @@ msgstr "Поврзи се повторно"
 msgid "Re-enable"
 msgstr "Повторно овозможи сметка"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Добредојде пак!"
 
@@ -10898,6 +10887,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "А_лијас:"
 
+msgid "_Group:"
+msgstr "_Група:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Автоматски _вклучи се по врзувањето."
 
@@ -10932,6 +10924,116 @@ msgstr "/Алатки"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Пријатели/Подреди пријатели"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Боја на позадина"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Оваа група е додадена на Вашата листа на пријатели"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Боја на позадина"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Прошири сѐ"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Избери боја за позадина"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Собери сѐ"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Избери боја за позадина"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Подреди"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Поврзано"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Отсутен"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Офлајн"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Текст за расположение"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Пораката е испратена"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Промени корисничко инфо за %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Внесете име на хост за сертификатот."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL сервери"
@@ -10950,14 +11052,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Покани пријател во соба за разговор"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Внесете го името на пријателот што сакате да го поканите, заедно со пораката "
-"за покана."
-
 msgid "_Buddy:"
 msgstr "_Пријател:"
 
@@ -10986,7 +11080,8 @@ msgstr "Игнорирај"
 msgid "Get Away Message"
 msgstr "Нова порака за отсуство"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Последно"
 
 msgid "Unable to save icon file to disk."
@@ -11032,6 +11127,22 @@ msgstr "/Разговор/_Зачувај како..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Разговор/Исчист_и стар разговор"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Разговор/П_овеќе"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Разговор/П_овеќе"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Разговор/П_овеќе"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Разговор/Преглед на _лог"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Разговор/Исп_рати датотека..."
 
@@ -11104,6 +11215,18 @@ msgstr "/Разговор"
 msgid "/Conversation/View Log"
 msgstr "/Разговор/Види лог"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Разговор/Повеќе"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Разговор/Види лог"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Разговор/Повеќе"
+
 msgid "/Conversation/Send File..."
 msgstr "/Разговор/Испрати датотека..."
 
@@ -11290,6 +11413,9 @@ msgstr "Артист"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "поддршка"
 
@@ -11416,6 +11542,10 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Hungarian"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
 msgid "Indonesian"
 msgstr "Indonesian"
 
@@ -11431,6 +11561,10 @@ msgstr "Georgian"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu Georgian Translators"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Друго"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11452,6 +11586,10 @@ msgstr "Lithuanian"
 msgid "Macedonian"
 msgstr "Македонски"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "Македонски"
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegian"
 
@@ -11506,6 +11644,9 @@ msgstr "Sinhala"
 msgid "Swedish"
 msgstr "Swedish"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11566,7 +11707,24 @@ msgstr ""
 "придонесували.  Не нудиме никаква гаранција за оваа програма.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin на irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin на irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11835,7 +11993,7 @@ msgid "Hyperlink visited color"
 msgstr "Боја на хиперврски"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Боја за исцртување на хиперврските кога глувчето е над нив."
 
 msgid "Hyperlink prelight color"
@@ -11873,13 +12031,22 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr "Име на боја на порака за дејство"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Боја за исцртување на името на пораката за дејство."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "Име на бојата на испратени пораки"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Боја за исцртување на името на пораката за дејство."
+
 msgid "Typing notification color"
 msgstr "Боја на известувања при куцање"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Бојата на фонтот за известувањата"
 
 msgid "Typing notification font"
@@ -11891,15 +12058,6 @@ msgstr "Фонтот кој што ќе се користи за известу�
 msgid "Enable typing notification"
 msgstr "Вклучи известување при куцање"
 
-msgid "_Copy Email Address"
-msgstr "_Копирај е-пошта"
-
-msgid "_Open Link in Browser"
-msgstr "_Отвори ја врската во прелистувач"
-
-msgid "_Copy Link Location"
-msgstr "_Копирај ја локацијата на врската"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11941,11 +12099,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "Зачувај ја сликата"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Зачувај слика..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Прикажи посебни емоции"
 
@@ -12033,9 +12190,6 @@ msgstr "Намали големина на фонт"
 msgid "Font Face"
 msgstr "Изглед на фонт"
 
-msgid "Background Color"
-msgstr "Боја на позадина"
-
 msgid "Foreground Color"
 msgstr "Боја на фонт"
 
@@ -12145,13 +12299,14 @@ msgstr "_Разгледај ја папката со логови"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Пробајте `%s -h' за повеќе информации.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12175,13 +12330,14 @@ msgstr ""
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12241,11 +12397,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Отвори ги сите пораки"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Имате пошта!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "_Пресметувам..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12276,6 +12448,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Избрана е рачната команда на прелистувачот, но не е поставена команда."
 
+#, fuzzy
+msgid "No message"
+msgstr "Непозната порака"
+
+msgid "Open All Messages"
+msgstr "Отвори ги сите пораки"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Имате пошта!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Ново дејство за пријател"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Имате пошта!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Следниве додатоци ќе бидат извадени."
 
@@ -12324,10 +12517,17 @@ msgstr "<b>Детали за додатоците</b>"
 msgid "Select a file"
 msgstr "Изберете датотека"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Уреди дејство за пријател"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Дејство за кој"
 
+msgid "_Account:"
+msgstr "_Сметка:"
+
 msgid "_Buddy name:"
 msgstr "_Име на пријател:"
 
@@ -12394,7 +12594,60 @@ msgstr "_Од време на време"
 msgid "Pounce Target"
 msgstr "Изврши дејство кога"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Почнува да куца"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Паузира кога куца"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Се најавува"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s се врати од неактивност (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Се враќа"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Прекина да пишува"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Се одјавува"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Станува неактивен"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Кога сум отсутен"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Испрати порака"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Непознат настан за дејство. Ве молам пријавете го ова!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Темата со емоции не успеа да се отпакува."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Темата со емоции не успеа да се отпакува."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Темата со емоции не успеа да се отпакува."
 
 msgid "Install Theme"
@@ -12416,6 +12669,12 @@ msgstr "Кратенки на тастатурата"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Затворај ги разговорите со копчето Escape"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Листа на пријатели"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Системска икона во фиока"
 
@@ -12425,8 +12684,9 @@ msgstr "_Покажи системска икона на панелот:"
 msgid "On unread messages"
 msgstr "Не непрочитани пораки"
 
-msgid "Conversation Window Hiding"
-msgstr "Криење на прозорците при разговор"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Прозорците за IM разговори"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Криј ги новите инстант разговори:"
@@ -12434,6 +12694,9 @@ msgstr "_Криј ги новите инстант разговори:"
 msgid "When away"
 msgstr "Кога сум отсутен"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Мини_мизирај нови прозореци за разговор"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Јазичиња"
@@ -12492,9 +12755,6 @@ msgstr "Користи мазно лизгање"
 msgid "F_lash window when IMs are received"
 msgstr "Т_репкање на прозорецот кога е примена порака"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Мини_мизирај нови прозореци за разговор"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12526,13 +12786,11 @@ msgstr "Не можам да ја подигнам програмата за к�
 msgid "Cannot start browser configuration program."
 msgstr "Не можам да ја подигнам програмата за конфигурација на прелистувачот."
 
-msgid "ST_UN server:"
-msgstr "ST_UN сервер:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Автоматски детектирај IP адреса"
 
 msgid "Public _IP:"
@@ -12553,6 +12811,10 @@ msgstr "_Почетна порта:"
 msgid "_End port:"
 msgstr "_Крајна порта:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy сервер &amp; Прелистувач"
 
@@ -12581,6 +12843,10 @@ msgstr "Proxy сервер"
 msgid "No proxy"
 msgstr "Без proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Корисник:"
 
@@ -12744,12 +13010,12 @@ msgstr "При отсуство и неактивност"
 msgid "Auto-away"
 msgstr "Автомаско отсуство"
 
-msgid "Change status when _idle"
-msgstr "Промени го статусот при _неактивност"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Минути пред промена на статусот:"
 
+msgid "Change status when _idle"
+msgstr "Промени го статусот при _неактивност"
+
 msgid "Change _status to:"
 msgstr "Смени го _статусот во:"
 
@@ -12899,29 +13165,19 @@ msgstr "Зач_увај и користи"
 msgid "Status for %s"
 msgstr "Статус за %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Внеси смајли"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Корекција на дупликати"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Ве молам изберете го расположението од листата."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Внеси смајли"
@@ -12931,23 +13187,31 @@ msgid "Add Smiley"
 msgstr "Смајли!"
 
 #, fuzzy
-msgid "Smiley _Image"
-msgstr "Зачувај ја сликата"
+msgid "_Image:"
+msgstr "_Зачувај ја сликата"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
-msgstr "Кратенки на тастатурата"
+msgid "S_hortcut text:"
+msgstr "Подреди"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Смајли!"
 
 #, fuzzy
+msgid "Shortcut Text"
+msgstr "Подреди"
+
+#, fuzzy
 msgid "Custom Smiley Manager"
 msgstr "Менаџер за сертификати"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Избери пријател"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Користи ја оваа _икона за оваа сметка:"
 
@@ -13033,9 +13297,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Не може да се испрати стартувач"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Влечевте стартувач од работната површина. Најверојатно сакавте да го "
 "испратите тоа што стартувачот го стартува, наместо самиот стартувач."
@@ -13072,6 +13337,16 @@ msgstr ""
 "Не успеав да ја вчитам сликата „%s“: причините не се познати, најверојатно "
 "сликата е оштетена"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Отворај врски во:"
+
+msgid "_Copy Link Location"
+msgstr "_Копирај ја локацијата на врската"
+
+msgid "_Copy Email Address"
+msgstr "_Копирај е-пошта"
+
 msgid "Save File"
 msgstr "Зачувај датотека"
 
@@ -13166,6 +13441,78 @@ msgstr "Приклучок за достапност на пријателот."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Прикажува статистички информации за достапноста на пријателите"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Адреса на серверот"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Внесете конференциски сервер"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Изберете сервер за конференција"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Онлајн сервиси"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Испрати листа на пријатели"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Е отсутен"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Директориум за логови"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Избор на звук"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub сервис"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Опис"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Информации за откривање на сервиси"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Прелистувач:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Корисникот не постои"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Серверот не користи поддржан метод за проверка"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Информации за откривање на сервиси"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Овој приклучок е корисен за дебагирање на XMPP сервери или клиенти."
+
 msgid "Buddy is idle"
 msgstr "Пријателот е неактивен"
 
@@ -13555,9 +13902,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Приклучок за музичко допишување за заедничко компонирање."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Приклучокот за музичко допишување овозможува корисниците истовремено да "
 "работат на исто парче музика со уредување на основна скала."
@@ -13670,12 +14018,6 @@ msgstr ""
 "- Пораките што ги добиваш ги испишува инверзно\n"
 "- Испраќа порака до пријателите веднаш по нивната најава"
 
-msgid "Cursor Color"
-msgstr "Боја на стрелката"
-
-msgid "Secondary Cursor Color"
-msgstr "Боја на секундарната стрелка"
-
 msgid "Hyperlink Color"
 msgstr "Боја на хиперврска"
 
@@ -13686,6 +14028,10 @@ msgstr "Боја на хиперврска"
 msgid "Highlighted Message Name Color"
 msgstr "Име на боја на осветлени пораки"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Боја на известувања при куцање"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView хоризонтално разделување"
 
@@ -13715,35 +14061,24 @@ msgstr "Фонт за GTK+ интерфејсот"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ тема за текстуална кратенка"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Бои на интерфејсот"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Вклучи известување при куцање"
 
-msgid "Widget Sizes"
-msgstr "Големина на графичките контроли"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Контрола на теми за Pidgin GTK+"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Затвори"
 
 msgid "Fonts"
 msgstr "Фонтови"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc алатки за датотеки"
 
@@ -13833,7 +14168,7 @@ msgstr "Копче за испраќање во прозорецот за раз
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13889,6 +14224,113 @@ msgstr ""
 "Го заменува текстот на пораките кои штотуку треба да се испратат според "
 "правила дефинирани од корисникот."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Не сте најавени"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Не сте најавени"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Приклучи се во разговор"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Игнорирај"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Погласно"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Дадена е авторизацијаџ"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Грешка "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Информации"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Дијалог со барање"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Ниво на предупредување"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Статус за %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Locale на собата за разговор"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Зачувај ја иконата"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Контрола на теми за Pidgin GTK+"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Контакт инфоромации"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Листа на пријатели"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Листа на пријатели"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Контрола на теми за Pidgin GTK+"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Контрола на теми за Pidgin GTK+"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14051,17 +14493,15 @@ msgstr "_Задржи го прозорецот со листа на прија�
 msgid "Only when docked"
 msgstr "Само кога е спуштена"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_Трепкање на прозорецот кога е примена порака"
-
 msgid "Windows Pidgin Options"
 msgstr "Опции за Pidgin за Windows"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Опции наменети за Pidgin за Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Овозможува опции наменети за Pidgin за Windows, како што се прикачување на "
 "листата со пријатели и трепкање на разговорите."
@@ -14103,6 +14543,515 @@ msgstr "Испрати и прими чисти XMPP делови."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Овој приклучок е корисен за дебагирање на XMPP сервери или клиенти."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Не можам да го отворам сокетот."
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Не можам да слушам на сокетот"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Не можам да го прочитам сокетот"
+
+#~ msgid "Connection failed."
+#~ msgstr "Поврзување е неуспешно."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Серверот ја прекина врската"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Не можам да креирам сокет"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Не може да се врзе со серверот"
+
+#~ msgid "Read error"
+#~ msgstr "Грешка во читањето"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не можам да воспоставам врска со серверот:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Грешка во запишувањето"
+
+#~ msgid "Last Activity"
+#~ msgstr "Последна активност"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Информации за откривање на сервиси"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Предмети за откривање на сервиси"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Проширена stanza адреса"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Мулти-кориснички разговор"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Информации за продолежно присуство за мулти-кориснички разговор"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ад-хок команди"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub сервис"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Грешка во регистрацијата"
+
+#~ msgid "User Location"
+#~ msgstr "Локација на корисникот"
+
+#~ msgid "User Avatar"
+#~ msgstr "Аватар на корисникот"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Известување за состојбата на разговорот"
+
+#~ msgid "Software Version"
+#~ msgstr "Верзија на софтверот"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Иницирање на стримот"
+
+#~ msgid "User Mood"
+#~ msgstr "Расположение на корисникот"
+
+#~ msgid "User Activity"
+#~ msgstr "Активност на корисникот"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Преговори за енкриптирана сесија"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Адреса за достапност"
+
+#~ msgid "User Profile"
+#~ msgstr "Кориснички профил"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle аудио"
+
+#~ msgid "User Nickname"
+#~ msgstr "Кориснички прекар"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle видео"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Примачи на пораката"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Објавување на јавниот клуч"
+
+#~ msgid "User Chatting"
+#~ msgstr "Корисникот разговара"
+
+#~ msgid "User Browsing"
+#~ msgstr "Корисникот сурфа"
+
+#~ msgid "User Gaming"
+#~ msgstr "Корисникот игра"
+
+#~ msgid "User Viewing"
+#~ msgstr "Корисникот гледа"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanza енкрипција"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Одложено праќање"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Колаборативни објекти со податоци"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Складирање и споделување на датотеки"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Откривање на STUN за Jingle"
+
+#~ msgid "Read Error"
+#~ msgstr "Грешка во читањето"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Не можам да се поврзам со серверот."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Баферот за читање е полн (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Порака што не може да се парсира"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Не можам да се поврзам со хостот: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Најавата не успеа (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Одјавени сте бидејќи се најавивте од друга работна станица."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Грешка. SSL поддршката не е инсталирана."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Грешна лозинка."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не можам да се поврзам со BOS серверот:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Може да бидете накратко исклучени.  Проверете %s за надградби.."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Не можам да се поврзам"
+
+#~ msgid "Invalid username."
+#~ msgstr "Невалидно корисничко име."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Не можам да добијам информации за серверот"
+
+#~ msgid "Connection lost"
+#~ msgstr "Врската е изгубена"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Не можам да го преведам хостот"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Врската се затвори (пишувам)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Врската се ресетира"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Грешка при читање од сокетот: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Не можам да се поврзам со хостот"
+
+#~ msgid "Could not write"
+#~ msgstr "Не можам да запишам"
+
+#~ msgid "Could not connect"
+#~ msgstr "Не можам да се поврзам"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Не можам да креирам сокет за слушање"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Не можам да го преведам името на хостот"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Грешна лозинка"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не можам да воспоставам врска со %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Јапонски пејџер сервер"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Јапонски сервер за пренос на датотеки"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Врската со серверот е изгубена\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Не можам да го преведам името на хостот"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Серверот бара TLS/SSL за најавување.  Не пронајдов TLS/SSL поддршка."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Криење на прозорците при разговор"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Ве молам изберете го расположението од листата."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Кој ID. да го активирам?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Боја на стрелката"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Боја на секундарната стрелка"
+
+#~ msgid "Interface colors"
+#~ msgstr "Бои на интерфејсот"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Големина на графичките контроли"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "Внеси во пораката"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Внесете го името на пријателот што сакате да го поканите, заедно со "
+#~ "пораката за покана."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Не успеав да го добијам адресарот за MSN"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Може да Ве исклучат за кратко.  Можете да ја користете табелата со "
+#~ "содржини додека ова не се поправи.  Проверете на %s за ажурирања."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Додај пријател"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Не можам да добијам информации за серверот"
+
+#~ msgid "Keep alive error"
+#~ msgstr "Грешка"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "Изгубив врска со серверот:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Сервер за врзување"
+
+#~ msgid "Failed to send IM."
+#~ msgstr "Не успеав да испратам ИП."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Го барам %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Поврзувањето со %s не успеа"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Најавување: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Не можам да ја запишам датотеката %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Не можам да ја прочитам датотеката %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Пораката е предолга. Последните %s бајти се скратени."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s не е најавен/а."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Предупредувањето за %s не е дозволено."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Беше испуштена порака, бидејќи ја надминувате брзината на серверот."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Разговорот во %s не е достапен."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Пребрзо испраќате пораки до %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Пропуштивте инстант порака од %s бидејќи беше преголема."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Пропуштивте инстант порака од %s бидејќи беше испратена пребрзо."
+
+#~ msgid "Failure."
+#~ msgstr "Неуспех."
+
+#~ msgid "Too many matches."
+#~ msgstr "Премногу совпаѓања."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Требаат повеќе квалификатори."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Сервисот за директориуми е привремено недостапен."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Барањето на е-пошта е ограничено."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Клучниот збор е игнориран."
+
+#~ msgid "No keywords."
+#~ msgstr "Нема клучни зборови."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Корисникот нема информации за директориумот."
+
+#~ msgid "Country not supported."
+#~ msgstr "Државата не е поддржана."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Причината за неуспех е непозната: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Неточно корисничко име или лозинка."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Сервисот е привремено недостапен."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Вашето ниво за предупредување е превисоко за да се најавите."
+
+#~ 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 ""
+#~ "Се поврзувавте и се исклучувавте пречесто.  Почекајте десет минути и "
+#~ "пробајте повторно.  Ако продолжете со обидeте сега, ќе треба да чекате "
+#~ "уште подолго."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Непозната грешка при најавување: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Се случи непозната грешка %d.  Информации: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Невалидно име на група"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Врската се затвори"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Чекам одговор..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC се врати од паузата. Сега можете повторно да испраќате пораки."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Лозинката успешно е промената."
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Собери информации за директориумот"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Постави информации за директориумот"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Не можам да ја отворам %s за запишување!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Размената на датотека не успеа. Другата страна веројатно откажа."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Не можам да се поврзам за размена."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr ""
+#~ "Не можам да го запишам заглавјето на датотеката.  Датотеката не може да "
+#~ "се размени."
+
+#~ msgid "Save As..."
+#~ msgstr "Зачувај како..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s бара %s да ја прифатите %d датотеката: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s бара %s да ги прифатите %d датотеките: %s (%.2f %s)%s%s"
+#~ msgstr[2] "%s бара %s да ги прифатите %d датотеките: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s бара да му/ѝ испратите датотека"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Приклучок за TOC протоколот"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Информациите за корисникот %s не се достапни"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Опции"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxy Опции"
+
+#~ msgid "By log size"
+#~ msgstr "По големина на лог"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Отвори ја врската во прелистувач"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN сервер:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Зачувај ја сликата"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Кратенки на тастатурата"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Трепкање на прозорецот кога е примена порака"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "Папка со тоа име веќе постои."
 
@@ -14204,13 +15153,6 @@ msgstr "Овој приклучок е корисен за дебагирање
 #~ msgid "Change Qun information"
 #~ msgstr "Информации за каналот"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "Системска порака"
 
@@ -14351,9 +15293,6 @@ msgstr "Овој приклучок е корисен за дебагирање
 #~ "Вашето барање за придружување кон групата %d беше одобрено од "
 #~ "администраторот %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Оваа група е додадена на Вашата листа на пријатели"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Прифаќам да се придружам"
 
@@ -14375,15 +15314,9 @@ msgstr "Овој приклучок е корисен за дебагирање
 #~ msgid "Enter your reason:"
 #~ msgstr "Внесете ја причината:"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Грешка при барањето на токенот за најава"
-
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Не можам да ве најавам. Проверете го логот за дебагирање."
 
-#~ msgid "Unable to login"
-#~ msgstr "Не можам да ве најавам"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP адреса"
 
diff --git a/po/mn.po b/po/mn.po
index ce9ae45342..7ca2944936 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-06-17 23:22-0800\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr "Финч"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Дэлгэрэнгүй мэдээллийг авахыг хүсвэл `%s -h' үз нүү.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -596,17 +596,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Илгээх"
 
-msgid "Invite message"
-msgstr ""
-
-msgid "Invite"
-msgstr ""
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-
 msgid "Conversation"
 msgstr "Харилцаа"
 
@@ -849,6 +838,41 @@ msgstr "Харилцаа"
 msgid "System Log"
 msgstr "Системийн архив"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Тооцоолж байна..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Зөвшөөрөх"
+
+msgid "Reject"
+msgstr "Татгалзах"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Та чатаас гарсан."
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "Мэйл"
 
@@ -883,6 +907,9 @@ msgstr "Үргэлжлүүлэх"
 msgid "IM"
 msgstr "Мессеж"
 
+msgid "Invite"
+msgstr ""
+
 msgid "(none)"
 msgstr "(байхгүй)"
 
@@ -1084,7 +1111,6 @@ msgstr "%s гарсан. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s мессеж илгээсэн."
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1130,7 +1156,6 @@ msgstr "Төлөв өөрчлөхийн өмнөх минут"
 msgid "Change status to"
 msgstr "Төлөв өөрчлөх"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Харилцаа"
 
@@ -1443,7 +1468,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr ""
 
-#, c-format
 msgid "Online"
 msgstr "Онлайн"
 
@@ -1487,6 +1511,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "Вэбийн нөөц заагч"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "бүртгэлүүд"
 
@@ -1587,13 +1633,6 @@ msgstr "%s ийн сертификатыг зөвшөөрөх үү?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Зөвшөөрөх"
-
-msgid "Reject"
-msgstr "Татгалзах"
-
 msgid "_View Certificate..."
 msgstr "Сертификатыг Харах..."
 
@@ -1686,6 +1725,8 @@ msgstr "+++ %s мессенжерд орж ирсэн"
 msgid "+++ %s signed off"
 msgstr "+++ %s мессенжерээс гарсан"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Үл мэдэгдэх алдаа"
 
@@ -1732,6 +1773,16 @@ msgstr "%s өрөөнөөс гарсан."
 msgid "%s left the room (%s)."
 msgstr "%s (%s) өрөөнөөс гарсан."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Зөвлөгөөнд урих"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Холболт үүсгэхэд алдаа гарлаа: %s"
@@ -1862,7 +1913,6 @@ msgstr "%s ээс файл шилжүүлэлтийг эхлүүлж байна"
 msgid "Transfer of file %s complete"
 msgstr "%s файл шилжүүлэлт дууслаа"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Файл шилжүүлэлт дууссан"
 
@@ -1870,7 +1920,6 @@ msgstr "Файл шилжүүлэлт дууссан"
 msgid "You canceled the transfer of %s"
 msgstr "Та %s ийн шилжүүлэлтийг цуцалсан"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Файл шилжүүлэлтийг цуцалсан"
 
@@ -2055,11 +2104,14 @@ msgstr "<font color=\"red\"><b>Файлыг унших боломжгүй: %s</b
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Холболт үүсгэх алдаа"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Та %s г ашиглаж байна,гэхдээ энэ нэмэлт програмд %s шаардлагатай ."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2443,7 +2495,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2490,10 +2542,11 @@ msgstr ""
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
-msgstr ""
+msgstr "`Харилцагчийн Сануулга' аас сануулгыг засварлаж, устгаж болно"
 
 #, c-format
 msgid ""
@@ -2519,6 +2572,32 @@ msgstr "Сануулаганд оффлайн мессеж хадгалах"
 msgid "Do not ask. Always save in pounce."
 msgstr "Битгий асуу. Үргэлж сануулаганд хадгалана."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Нууц үг оруул"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2706,18 +2785,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "Холболтыг эхлүүлэх боломжгүй байна"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Өөрийн нэр"
 
@@ -2749,6 +2828,11 @@ msgstr "Bonjour Протоколын Нэмэлт Програм"
 msgid "Purple Person"
 msgstr ""
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Байршил"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2759,14 +2843,21 @@ msgstr "%s харилцааг хаасан."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Харилцааг эхлүүлэхгүй бол, мессежийг илгээх боломжгүй."
 
-msgid "Cannot open socket"
-msgstr "Сокетыг нээж чадсангүй"
-
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
 msgstr ""
+"Сокет үүсгэх боломжгүй:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "%s харилцагчийг хориглох боломжгүй"
 
-msgid "Could not listen on socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
 msgstr ""
+"Сокет үүсгэх боломжгүй:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2813,13 +2904,16 @@ msgstr "Харилцагчийн жагсаалтыг хадгалах..."
 msgid "Load buddylist from file..."
 msgstr "Файлаас харилцагчдын жагсаалтыг ачаалах"
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Бүртгэлийн талбаруудыг бөглө."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Нууц үг тохирохгүй байна."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Шинэ бүртгэл  бүртгэх боломжгүй.Алдаа гарлаа.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2831,14 +2925,15 @@ msgstr "Бүртгэл ажилттай боллоо"
 msgid "Password"
 msgstr "Нууц үг"
 
-msgid "Password (retype)"
-msgstr "Нууц үг (дахин оруул)"
+msgid "Password (again)"
+msgstr "Нууц үг (дахиад)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "Зургийг Хадгалах"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Шинэ Gadu-Gadu бүртгэлийг бүртгэх"
@@ -2891,6 +2986,15 @@ msgstr "Нууц үгийг амжилттай өөрчиллөө"
 msgid "Current password"
 msgstr "Одоогийн нууц үг"
 
+msgid "Password (retype)"
+msgstr "Нууц үг (дахин оруул)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2904,13 +3008,13 @@ msgstr "Харилцагчийн чатыг сонгох: %s"
 msgid "Add to chat..."
 msgstr "Чатад нэмэх..."
 
+#. Global
 msgid "Available"
 msgstr "Онлайн"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Хол байна"
 
@@ -2938,8 +3042,8 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
-msgstr "Сокет унших боломжгүй"
+msgid "Unable to read from socket"
+msgstr "Сокетоос унших боломжгүй"
 
 msgid "Buddy list downloaded"
 msgstr "Харилцагчийн жагсаалтыг татаж авсан"
@@ -2953,8 +3057,14 @@ msgstr "Харилцагчийн жагсаалтыг сервер лүү хуу
 msgid "Your buddy list was stored on the server."
 msgstr "Таны харилцагчийн жагсаалт серверт хадгалагдлаа."
 
-msgid "Connection failed."
-msgstr "Холболт амжилтгүй боллоо."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Холбогдсон"
+
+msgid "Connection failed"
+msgstr "Холболт амжилтгүй боллоо"
 
 msgid "Add to chat"
 msgstr "Чатад нэмэх"
@@ -2962,13 +3072,23 @@ msgstr "Чатад нэмэх"
 msgid "Chat _name:"
 msgstr "Чатын нэр:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Сервертэй холбогдох боломжгүй."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
 msgid "Chat error"
 msgstr "Чатын алдаа"
 
 msgid "This chat name is already in use"
 msgstr "Энэ чатын нэрийг ашиглаж байна"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Сервертэй холбогдож чадсангүй."
 
 msgid "Find buddies..."
@@ -3010,6 +3130,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ийн хэрэглэгч"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Харилцагчийн мэдээллийг тохируулах..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Үл мэдэгдэх алдаа: %s"
@@ -3024,8 +3148,9 @@ msgstr "Ямар ч сэдэвийг тохируулаагүй байна"
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "Файл нээх боломжгүй."
 
 msgid "Error displaying MOTD"
 msgstr ""
@@ -3040,8 +3165,18 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
 msgstr ""
+"Сервертэй холболт тасарсан:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr ""
@@ -3052,25 +3187,23 @@ msgstr ""
 msgid "_Password:"
 msgstr "Нууц үг"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr ""
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 msgid "SSL support unavailable"
 msgstr "SSL дэмжлэг бэлэн биш байна"
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s рүү холбогдох боломжгүй"
 
-msgid "Read error"
-msgstr "Унших алдаа"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Сервер холболтыг тасалсан. "
 
 msgid "Users"
 msgstr "Хэрэглэгчид"
@@ -3251,6 +3384,17 @@ msgstr ""
 "Таны бүртгэлийн нэрийг сервер зөвшөөрөхгүй байна. Энэ нь буруу тэмдэгт "
 "агуулсан байж магадгүй."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Энэ чатын нэрийг ашиглаж байна"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Хоч нэр"
+
 msgid "Cannot change nick"
 msgstr ""
 
@@ -3451,10 +3595,12 @@ msgstr "Ad-Hoc Команд Биелэгдээгүй"
 msgid "execute"
 msgstr "гүйцэтгэх"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Кодчилол шаардлагатай, гэхдээ ямар ч TLS/SSL дэмжлэг олдсонгүй."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Кодчилол шаардлагатай, гэхдээ ямар ч TLS/SSL дэмжлэг олдсонгүй."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3469,18 +3615,53 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "SSL Холболт амжилтгүй болсон"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Алдаа: серверийн буруу PONG "
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL алдаа"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr ""
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Дэмжигдэхгүй хувилбар"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Сервертэй холбогдож чадсангүй:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Сервертэй холбогдож чадсангүй:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Холболтыг эхлүүлэх боломжгүй байна"
+
 msgid "Full Name"
 msgstr "Бүтэн нэр"
 
@@ -3545,164 +3726,23 @@ msgstr "Клиент"
 msgid "Operating System"
 msgstr "Үйлдлийн систем"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc ийн командууд"
-
-msgid "PubSub Service"
-msgstr "PubSub үйлчилгээ"
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Харилцагчийн байрлал"
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr "Програм хангамжийн хувилбар"
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr "Файл шилжүүлэлт"
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Хэрэглэгчийн товч мэдээлэл"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Хэрэглэгчийн хоч нэр"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+#, fuzzy
+msgid "Local Time"
+msgstr "Локал Файл:"
 
-msgid "Hop Check"
+msgid "Priority"
 msgstr ""
 
-msgid "Capabilities"
+msgid "Resource"
 msgstr ""
 
-msgid "Priority"
+#, c-format
+msgid "%s ago"
 msgstr ""
 
-msgid "Resource"
-msgstr ""
+#, fuzzy
+msgid "Logged Off"
+msgstr "Мессенжерээс гарах"
 
 msgid "Middle Name"
 msgstr ""
@@ -3750,7 +3790,6 @@ msgstr ""
 msgid "Extended Away"
 msgstr ""
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
@@ -3869,28 +3908,26 @@ msgstr ""
 msgid "Find Rooms"
 msgstr "Өрөөг хайх"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Өөр нэр:"
 
-msgid "Write error"
-msgstr "Бичих алдаа"
+#, fuzzy
+msgid "No users found"
+msgstr "Ямар ч архив байхгүй байна"
 
-msgid "Ping timeout"
-msgstr ""
+#, fuzzy
+msgid "Roles:"
+msgstr "Үүрэг"
 
-msgid "Read Error"
-msgstr "Унших алдаа"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Холболтын хугацаа дууссан."
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Сервертэй холбогдож чадсангүй:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Сокет үүсгэх боломжгүй"
 
 msgid "Invalid XMPP ID"
 msgstr "Буруу  XMPP ID"
@@ -3898,6 +3935,10 @@ msgstr "Буруу  XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Буруу XMPP ID. Домэйныг тохируулах хэрэгтэй."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Сервертэй холбогдох боломжгүй."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
@@ -3922,9 +3963,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr ""
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr ""
 
@@ -3937,6 +3975,9 @@ msgstr "Утас"
 msgid "Date"
 msgstr "Он сар"
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -3964,6 +4005,10 @@ msgstr "%s ээр шинэ бүртгэл үүсгэх"
 msgid "Change Registration"
 msgstr "Бүртгэлийг өөрчилөх"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Сервертэй холбогдох боломжгүй."
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -3982,9 +4027,18 @@ msgstr ""
 msgid "Re-initializing Stream"
 msgstr ""
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr ""
 
+msgid "Mood"
+msgstr ""
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr ""
 
@@ -4006,12 +4060,6 @@ msgstr ""
 msgid "Subscription"
 msgstr ""
 
-msgid "Mood"
-msgstr ""
-
-msgid "Now Listening"
-msgstr ""
-
 msgid "Mood Text"
 msgstr ""
 
@@ -4054,9 +4102,6 @@ msgstr "Таны нууц үг өөрчилөгдсөн"
 msgid "Error changing password"
 msgstr "Нууц үг өөрчлөхөд алдаа гарлаа"
 
-msgid "Password (again)"
-msgstr "Нууц үг (дахиад)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP ийн нууц үгийг өөрчлөх"
 
@@ -4250,15 +4295,21 @@ msgid "Unable to ping user %s"
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+
+#, c-format
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4270,10 +4321,34 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr " %s рүү файл илгээх боломжгүй,  буруу JID"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "%s рүү файл илгээх боломжгүй, онлайнд байхгүй байна"
+
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
 
+msgid "Media Initiation Failed"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+msgid "Select a Resource"
+msgstr "Нөөц Сонгох"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Чатыг эхлүүлэх"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Чат өрөөг тохируулах."
 
@@ -4293,13 +4368,14 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [reason]: Өрөөнөөс хэрэглэгчийг хориглох."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Өрөөнд "
 "хэрэглэгчийн үүргийг тохируулах."
@@ -4362,6 +4438,9 @@ msgstr "Серверт холбогдох"
 msgid "File transfer proxies"
 msgstr "Файл дамжуулах прокси"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4400,6 +4479,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Чат %s д холбогдоход алдаа гарлаа"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Чат %s алдаа "
+
 msgid "Create New Room"
 msgstr "Шинэ Өрөө Үүсгэх"
 
@@ -4416,13 +4503,32 @@ msgstr "Өрөөний Тохиргоог Хийх"
 msgid "_Accept Defaults"
 msgstr "Стандарт байдлаар нь хэрэглэх"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Чат %s д холбогдоход алдаа гарлаа"
+#, fuzzy
+msgid "No reason"
+msgstr "Үл мэдэгдэх шалтгаан"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Чат %s алдаа "
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s таныг нэмсэн"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr " (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Файл нээхэд алдаа гарлаа"
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Файл шилжүүлэлтийг цуцалсан"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Файл нээх боломжгүй."
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4449,9 +4555,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Select a Resource"
-msgstr "Нөөц Сонгох"
-
 msgid "Edit User Mood"
 msgstr ""
 
@@ -4484,9 +4587,20 @@ msgstr "Үйлдэл"
 msgid "Select an action"
 msgstr "Үйлдэл сонгох"
 
-msgid "Unable to retrieve MSN Address Book"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\" нэмэх боломжгүй."
+
+msgid "Buddy Add error"
 msgstr ""
 
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Зөвлөгөөн байхгүй байна"
+
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
@@ -4713,7 +4827,7 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Таны бүртгэлийг одоогоор түр зогссон байна."
 
@@ -4736,6 +4850,10 @@ msgstr "Бусад нь чатаар байхад"
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -4804,6 +4922,13 @@ msgstr "Гар утасны мессежийг илгээх."
 msgid "Page"
 msgstr "Хуудас"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Ажил"
+
 msgid "Has you"
 msgstr ""
 
@@ -4840,6 +4965,14 @@ msgstr "Уран бүтээлч"
 msgid "Album"
 msgstr "Цомог"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "Аяны нэр"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Аяны нэр"
+
 msgid "Set Friendly Name..."
 msgstr "Нөхөрсөг нэрээ оруул..."
 
@@ -4873,9 +5006,6 @@ msgstr "Чатыг эхлүүлэх"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr "Профилыг харуулах алдаа"
 
@@ -5026,8 +5156,9 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
-msgstr ""
+#, fuzzy
+msgid "View web profile"
+msgstr "Оффлайн байхад нуух"
 
 #. *< type
 #. *< ui_requirement
@@ -5060,64 +5191,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
+msgid "%s just sent you a Nudge!"
 msgstr ""
 
-msgid "Unknown error."
-msgstr "Үл мэдэгдэх алдаа."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s (%s) ийн тухай %s "
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
+msgstr "Үл мэдэгдэх алдаа"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
+msgid "Unable to add user"
+msgstr "Харилцагч нэмэх боломжгүй"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
 msgid "Unknown error (%d)"
 msgstr ""
 
-msgid "Unable to add user"
-msgstr "Харилцагч нэмэх боломжгүй"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s)д харилцагч нэмэх боломжгүй"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s)д харилцагч нэмэх боломжгүй"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s)д харилцагчийг зөвшөөрөх боломжгүй"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Таны харилцагчийн жагсаалт дүүрсэн учраас %sийг нэмэж чадсангүй."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s нь буруу бүртгэл байна."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Үйлчилгээ түр хугацаагаар ажиллахгүй байгаа"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Та холбогдоогүй учраас мессеж илгээгдсэнгүй."
 
-msgid "Unable to rename group"
-msgstr "Бүлгийн нэр өөрчилөх боломжгүй"
-
-msgid "Unable to delete group"
-msgstr "Бүлэг устгах боломжгүй"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5153,9 +5247,6 @@ msgstr "Холболтын алдаа гарсан учраас мессеж и�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Холболтын алдаа гарсан учраас мессеж илгээгдсэнгүй"
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr "Бичих Алдаа"
 
@@ -5170,19 +5261,21 @@ msgstr ""
 "%s сервертэй холбогдох алдаа:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Энэ протоколыг сервер дэмжихгүй байна."
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "%s ажилуулахад алдаа гарлаа"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5211,6 +5304,14 @@ msgstr "Күүкийг илгээж байна"
 msgid "Retrieving buddy list"
 msgstr "Харилцагчийн жагсаалтыг хайж байна"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Компьютероос хол байгаа"
 
@@ -5249,14 +5350,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Хаягийн Бүртгэлд Нэмэх"
@@ -5265,19 +5358,15 @@ msgstr "Хаягийн Бүртгэлд Нэмэх"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Харилцагчийн жагсаалтанд энэ харилцагчийг нэмэхийг хүсэж байн уу?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "\"%s\" нэмэх боломжгүй."
-
 msgid "The username specified is invalid."
 msgstr ""
 
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5291,15 +5380,59 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+msgid "Unknown error."
+msgstr "Үл мэдэгдэх алдаа."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s (%s) ийн тухай %s "
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s)д харилцагч нэмэх боломжгүй"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s)д харилцагч нэмэх боломжгүй"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s)д харилцагчийг зөвшөөрөх боломжгүй"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Таны харилцагчийн жагсаалт дүүрсэн учраас %sийг нэмэж чадсангүй."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s нь буруу бүртгэл байна."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Үйлчилгээ түр хугацаагаар ажиллахгүй байгаа"
+
+msgid "Unable to rename group"
+msgstr "Бүлгийн нэр өөрчилөх боломжгүй"
+
+msgid "Unable to delete group"
+msgstr "Бүлэг устгах боломжгүй"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+msgid "User lookup"
 msgstr ""
 
 msgid "Reading challenge"
@@ -5311,13 +5444,24 @@ msgstr ""
 msgid "Logging in"
 msgstr ""
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Одоо тохируулах уу? (Анхааруулга: Энэ өөрчилөгдөхгүй!)"
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"Сервертэй холболт тасарсан:\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Шинэ мэйл "
 
@@ -5336,20 +5480,21 @@ msgstr "Шинэ зургийн тайлбар"
 msgid "MySpace"
 msgstr "Миний зай"
 
-msgid "MySpaceIM - No Username Set"
-msgstr ""
-
-msgid "You appear to have no MySpace username."
+msgid "IM Friends"
 msgstr ""
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr "Одоо тохируулах уу? (Анхааруулга: Энэ өөрчилөгдөхгүй!)"
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Холбогдсон"
+msgid "Add contacts from server"
+msgstr ""
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5357,15 +5502,20 @@ msgstr "Протоколын алдаа, код %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr "Хэрэглэгчийн нэр эсвэл нууц үг буруу"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
+msgid "Invalid input condition"
+msgstr ""
+
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5375,13 +5525,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-msgid "User lookup"
-msgstr ""
-
 msgid "Failed to remove buddy"
 msgstr ""
 
@@ -5391,33 +5534,15 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-msgid "Invalid input condition"
-msgstr ""
-
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
+msgid "Missing Cipher"
 msgstr ""
 
-msgid "IM Friends"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Add contacts from server"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
 msgstr ""
 
 msgid "Add friends from MySpace.com"
@@ -5460,9 +5585,6 @@ msgstr ""
 msgid "User"
 msgstr "Хэрэглэгч"
 
-msgid "Profile"
-msgstr "Товч мэдээлэл"
-
 msgid "Headline"
 msgstr ""
 
@@ -5475,14 +5597,10 @@ msgstr "Нийт найзууд"
 msgid "Client Version"
 msgstr "Клиентын хувилбар"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "Ямар ч хэрэглэгчийн нэрийг тохируулаагүй"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM - Хэрэглэгчийн нэрээ тохируул"
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 msgid "MySpaceIM - Username Available"
@@ -5494,12 +5612,22 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Хэрэглэгчийн нэрээ тохируул"
+
 msgid "This username is unavailable."
 msgstr ""
 
 msgid "Please try another username:"
 msgstr ""
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Ямар ч хэрэглэгчийн нэрийг тохируулаагүй"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5691,9 +5819,6 @@ msgstr "Өөрийгөө нэмэж болохгүй"
 msgid "Master archive is misconfigured"
 msgstr "Мастер архивыг буруу тохируулсан"
 
-msgid "Incorrect username or password"
-msgstr "Хэрэглэгчийн нэр эсвэл нууц үг буруу"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5732,9 +5857,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Нэвтэрэхэд алдаа гарлаа (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Нэвтрэх боломжгүй байна"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5836,9 +5961,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr "Сервертэй холбогдох боломжгүй."
-
 msgid "Waiting for response..."
 msgstr "Хариулт хүлээж байна..."
 
@@ -5859,23 +5981,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
-msgstr "Алдаа. SSL дэмжлэгийг суулгаагүй байна."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr "Хаахыг хүсэж байгаа харилцагчийн нэрийг оруул."
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Энэ зөвлөгөөнийг хаасан. Ямар ч мессеж илгээгдээгүй."
 
@@ -5898,26 +6014,34 @@ msgstr "Серверийн хаяг"
 msgid "Server port"
 msgstr "Серверийн порт"
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+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 ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "%s ажилуулахад алдаа гарлаа"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Чат өрөөнд холбогдох боломжгүй"
 
 msgid "Invalid chat room name"
 msgstr "Буруу чат өрөөний нэр"
 
-msgid "Server closed the connection."
-msgstr "Сервер холболтыг тасалсан. "
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr ""
 "Сервертэй холболт тасарсан:\n"
 "%s"
 
-msgid "Received invalid data on connection with server."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5963,7 +6087,8 @@ msgstr "Алсын харилцагчтай холболт тасарсан:<br>
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Алсын хэрэглэгчтэй холболтыг үүсгэх боломжгүй."
 
 msgid "Direct IM established"
@@ -6136,23 +6261,18 @@ msgstr "Камер"
 msgid "Screen Sharing"
 msgstr ""
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Чатад үнэгүй"
 
-#, c-format
 msgid "Not Available"
 msgstr "Боломжгүй"
 
-#, c-format
 msgid "Occupied"
 msgstr "Эзэнтэй"
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr "Харагдахгүй"
 
@@ -6165,21 +6285,15 @@ msgstr "Анхааруулах Түвшин"
 msgid "Buddy Comment"
 msgstr "Харилцагчийн Тайлбар"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Баталгаажсан сервер лүү холбогдож чадсангүй:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS сервер лүү холбогдож чадсангүй с:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Сервертэй холбогдох боломжгүй."
 
 msgid "Username sent"
 msgstr "Хэрэглэгчийн нэрийг илгээсэн"
@@ -6191,49 +6305,58 @@ msgstr "Холболтыг хийж, күүкиг илгээсэн"
 msgid "Finalizing connection"
 msgstr "Холболтыг дуусгаж байна"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Холбогдох боломжгүй: Хэрэглэгчийн нэр буруу учраас холбогдож чадсангүй. "
 "Хэрэглэгчийн нэр нь мэйлийн хаяг байх ёстой."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Хэрэглэгчийн нэр буруу."
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
 
-msgid "Incorrect password."
-msgstr "Нууц үг буруу."
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Received authorization"
+msgstr "Хүлээж авсан зөвшөөрөл"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Харилцагч үүсээгүй байна"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Таны бүртгэлийг одоогоор түр зогссон байна."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Мессенжерийн үйлчилгээ түр хугацаагаар ажиллахгүй байна."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Таны ашиглаж байгаа хувилбар хуучин байна. Шинэчилнэ үү."
 
-msgid "Could Not Connect"
-msgstr "Холбогдож Чадсангүй"
-
-msgid "Received authorization"
-msgstr "Хүлээж авсан зөвшөөрөл"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Оруулсан SecurID түлхүүр буруу байна."
 
 msgid "Enter SecurID"
@@ -6248,24 +6371,6 @@ msgstr "6 оронтой тоо оруул."
 msgid "_OK"
 msgstr ""
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr "Нууц үгийг илгээсэн"
 
@@ -6392,7 +6497,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Мессеж илгээх боломжгүй: %s"
@@ -6414,6 +6519,12 @@ msgstr "Онлайн болсоноос хойш"
 msgid "Member Since"
 msgstr "Гишүүн болсоноос хойш"
 
+msgid "Capabilities"
+msgstr ""
+
+msgid "Profile"
+msgstr "Товч мэдээлэл"
+
 msgid "Your AIM connection may be lost."
 msgstr "Таны  AIM -ын холболт тасарсан байж магадгүй."
 
@@ -6567,12 +6678,14 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
+"Холбогдох боломжгүй: Хэрэглэгчийн нэр буруу учраас холбогдож чадсангүй. "
+"Хэрэглэгчийн нэр нь мэйлийн хаяг байх ёстой."
 
 #, fuzzy
 msgid "Unable to Add"
@@ -6594,15 +6707,15 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
 msgid "(no name)"
 msgstr "(нэргүй)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Тодорхойгүй шалтгаанаас болоод %s харилцагчийг нэмж чадсангүй."
 
 #, c-format
@@ -6664,6 +6777,7 @@ msgstr "Холбогдох"
 msgid "Get AIM Info"
 msgstr "AIM мэдээлэл авах"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Харилцагчийн Тайлбарыг Засварлах"
 
@@ -6720,6 +6834,7 @@ msgstr "Хайх"
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Нууц үг өөрчилөх (вэб)"
 
@@ -6749,6 +6864,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6766,7 +6884,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
@@ -6859,7 +6976,7 @@ msgstr ""
 msgid "Visible"
 msgstr "Харагдахгүй"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -6947,17 +7064,50 @@ msgstr "Сүүлийн Шинэчлэл"
 msgid "Could not change buddy information."
 msgstr "Харилцагчийн мэдээллийг оруулна уу."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "Гар утас"
+
+msgid "Note"
+msgstr "Тэмдэглэл"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Харилцагчийн Зураг"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Харилцагч нэмэх"
+msgid "_Modify"
+msgstr "Өөрчлөх"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Өөрчлөх"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Сервер ачаалалтай байна"
+
+msgid "Your request was accepted."
+msgstr ""
 
-msgid "Input answer here"
+msgid "Your request was rejected."
 msgstr ""
 
+#, c-format
+msgid "%u requires verification"
+msgstr ""
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Жагсаалтандаа харилцагч нэмэх үү ?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Хэрэглэгчийн хавтасыг оруулах"
+
 msgid "Send"
 msgstr "Илгээх"
 
@@ -6969,18 +7119,18 @@ msgid "Authorization denied message:"
 msgstr ""
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "Уучилаарай, та миний төрөлд хамаарахгүй байна..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Хүлээж авсан зөвшөөрөл"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Жагсаалтандаа харилцагч нэмэх үү ?"
 
-msgid "Input request here"
+msgid "Enter request here"
 msgstr ""
 
 msgid "Would you be my friend?"
@@ -7003,7 +7153,7 @@ msgid "Failed sending authorize"
 msgstr "Намайг зөвшөөрнө үү!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Харилцагчийн жагсаалтыг хайж байна"
 
 #, fuzzy, c-format
@@ -7046,6 +7196,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Прокси тохиргоо буруу"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Би гишүүн биш"
 
@@ -7086,16 +7240,19 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "Чатад холбогдох"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Qun гишүүнийг амжилттай шинэчлэлээ."
+
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "Qun гишүүнийг амжилттай шинэчлэлээ."
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7105,7 +7262,7 @@ msgstr ""
 msgid "Failed:"
 msgstr "Амжилтгүй болсон"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7118,11 +7275,11 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "Уучилаарай, та миний төрөлд хамаарахгүй байна..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Qun гишүүнийг амжилттай шинэчлэлээ."
 
 #, fuzzy
@@ -7133,35 +7290,35 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Үүнийг энэ харилцагчийн дүрс зураг болгож тохируулахыг хүсэж байна уу?"
 
 msgid "Setup"
 msgstr ""
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr ""
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Харилцагч Устгах"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Харилцагч Устгах"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7278,6 +7435,13 @@ msgstr "<b>Сүүлийн шинэчлэлт</b>: %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Одоо онлайн байгаа</b>: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Сүүлийн шинэчлэлт</b>: %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7285,7 +7449,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "%s ийн талаар"
 
 #, fuzzy
@@ -7306,6 +7470,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "%s ийн талаар"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Гэрийн хаяг"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7337,7 +7505,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "TCP ашиглан холбох"
@@ -7350,6 +7517,9 @@ msgstr "Серверийн порт"
 msgid "Show server news"
 msgstr "Серверийн хаяг"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 msgid "Keep alive interval (seconds)"
 msgstr ""
 
@@ -7358,11 +7528,7 @@ msgid "Update interval (seconds)"
 msgstr "Миний мэдээллийг шинчлэх"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Серверийн мэдээллийг авам боложгүй"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Серверийн мэдээллийг авам боложгүй"
 
 #, c-format
@@ -7384,19 +7550,17 @@ msgid "Activation required"
 msgstr ""
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Keep alive error"
-msgstr ""
-
-msgid "Requesting captcha ..."
-msgstr ""
+#, fuzzy
+msgid "Requesting captcha"
+msgstr "Буруу хүсэлт"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
+msgid "Failed captcha verification"
 msgstr ""
 
 #, fuzzy
@@ -7407,7 +7571,7 @@ msgstr "Зургийг Хадгалах"
 msgid "Enter code"
 msgstr "Нууц үг оруул"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7415,65 +7579,42 @@ msgid "Enter the text from the image"
 msgstr "Бүлгийн нэр оруул"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Холбогдох боломжгүй байна."
-
 msgid "Socket error"
 msgstr "Сокетын алдаа"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"Сервертэй холболт тасарсан:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "Сокетоос унших боломжгүй"
-
-msgid "Write Error"
-msgstr "Бичих алдаа"
-
-msgid "Connection lost"
-msgstr "Холболтыг тасалсан"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Харилцагчийн мэдээллийг тохируулах..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Хүсэлтийг татгалзсан"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Сервертэй холбогдох боломжгүй."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Хүчингүй алдаа"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Серверт холбогдох"
+msgid "Connecting to server"
+msgstr "SILC сервертэй холбогдож байна"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "QQid Алдаа"
 
-msgid "Failed to send IM."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7483,6 +7624,10 @@ msgid ""
 msgstr "ICQ Серверийн Хариу"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Аас"
 
@@ -7492,32 +7637,30 @@ msgid ""
 "%s"
 msgstr "Серверийн зааварчилгаа: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Үл мэдэгдэх шалтгаан"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Команд"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Серверийн мэдээллийг авам боложгүй"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Үл мэдэгдэх шалтгаан"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Үл мэдэгдэх шалтгаан"
 
 #, c-format
@@ -7531,9 +7674,6 @@ msgstr "Файл илгээх"
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr "Холболтыг хаасан"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Бүлгийн Гарчиг:</b> %s<br>"
@@ -7587,17 +7727,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr "Холболтыг дахин тохируулах"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Хост руу холбогдох боломжгүй"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7620,6 +7749,9 @@ msgstr "Чанга яригч"
 msgid "Video Camera"
 msgstr "Видео Камер"
 
+msgid "File Transfer"
+msgstr "Файл шилжүүлэлт"
+
 msgid "Supports"
 msgstr "Дэмжлэг"
 
@@ -8304,9 +8436,6 @@ msgstr "Байгууллага"
 msgid "Unit"
 msgstr "Нэгж"
 
-msgid "Note"
-msgstr "Тэмдэглэл"
-
 msgid "Join Chat"
 msgstr "Чатад холбогдох"
 
@@ -8391,6 +8520,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Сүлжээний статистик"
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr "Ping команд би"
 
@@ -8448,7 +8580,8 @@ msgstr "Дэмжигдэхгүй нийтийн түлхүүрийн төрөл"
 msgid "Disconnected by server"
 msgstr "Сервер холболтыг тасалсан"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC сервертэй холбогдох үед алдаа гарлаа"
 
 msgid "Key Exchange failed"
@@ -8458,26 +8591,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "Холболт амжилтгүй боллоо"
-
 msgid "Performing key exchange"
 msgstr "Түлхүүр солилцоог гүйцэтгэж байна"
 
-msgid "Unable to create connection"
-msgstr "Холболт үүсгэх боломжгүй"
-
-msgid "Could not load SILC key pair"
-msgstr ""
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "Нэмэлт програмыг ачаалах боломжгүй"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC сервертэй холбогдож байна"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Нэмэлт програмыг ачаалах боломжгүй"
+
 msgid "Out of memory"
 msgstr "Санах ой дүүрсэн"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC протоколыг эхлүүлж чадсангүйl"
 
 msgid "Error loading SILC key pair"
@@ -8755,8 +8888,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "Сокет үүсгэх боломжгүй"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -8844,6 +8978,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC сервертэй холбогдох үед алдаа гарлаа"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -8884,34 +9021,35 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "Холболтыг эхлүүлэх боломжгүй байна"
 
 msgid "John Noname"
 msgstr ""
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr "Бичиж чадсангүй"
-
-msgid "Could not connect"
-msgstr "Холбогдож чадсангүй"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "Нэмэлт програмыг ачаалах боломжгүй"
 
-msgid "Unknown server response."
-msgstr ""
+msgid "Unable to create connection"
+msgstr "Холболт үүсгэх боломжгүй"
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "Үл мэдэгдэх шалтгаан"
 
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Сокет үүсгэх боломжгүй"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Серверийн порт"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8945,173 +9083,63 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s ийг хайж байна"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s рүү холбогдоход алдаа гарлаа"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Эхлэл: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr " %s файлд бичих боломжгүй."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "%s файлыг унших боломжгүй."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Мессеж хэтэрхий урт байна, сүүлийн  %s байтыг хассан."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr ""
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr ""
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr ""
-
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
-
-#, c-format
-msgid "No keywords."
-msgstr ""
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  Yahoo сүлжээний чат өрөөнд холбогдох"
 
-#, c-format
-msgid "User has no directory information."
-msgstr ""
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Yahoo сүлжээний чат өрөөнүүдийг жагсаах"
 
-#, c-format
-msgid "Country not supported."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Хэрэглэгчийн нэр эсвэл нууц үг буруу."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Портокол Нэмэлт програм"
 
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Энэ үйлчилгээ одоогоор бэлэн биш байна."
+msgid "Pager server"
+msgstr "Пежер сервер"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
+msgid "Pager port"
+msgstr "Пежер порт"
 
-#, c-format
-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 ""
+msgid "File transfer server"
+msgstr "Файл шилжүүлэх сервер"
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr ""
+msgid "File transfer port"
+msgstr "Файл шилжүүлэх порт"
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
+msgid "Chat room locale"
 msgstr ""
 
-msgid "Invalid Groupname"
-msgstr "Буруу бүлгийн нэр"
-
-msgid "Connection Closed"
-msgstr "Холболтыг тасалсан"
-
-msgid "Waiting for reply..."
-msgstr "Хариу хүлээж байна..."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Зөвлөгөөн, чат өрөөний урилгыг татгалзах"
 
-msgid "TOC has come back from its pause. You may now send messages again."
+msgid "Chat room list URL"
 msgstr ""
 
-msgid "Password Change Successful"
-msgstr "Нууц үг амжилттай өөрчлөгдлөө"
-
-msgid "_Group:"
-msgstr "Бүлэг:"
-
-msgid "Get Dir Info"
-msgstr "Хавтасны талаархи мэдээлэл авах"
-
-msgid "Set Dir Info"
-msgstr "Хавтасны мэдэээллийг тохируулах"
-
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Завсар хийхээр %sийг нээж чадсангүй!"
-
-msgid "File transfer failed; other side probably canceled."
-msgstr "Файл дамжуулалт амжилттгүй боллоо."
-
-msgid "Could not connect for transfer."
-msgstr "Дамжуулахаар холбогдож чадсангүй."
-
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Файлын толгойд бичих боломжгүй. Файл дамжигдахгүй."
-
-msgid "Save As..."
-msgstr "Нэр өөрчилж хадгалах..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo Чат сервер"
 
-#, 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] ""
+msgid "Yahoo Chat port"
+msgstr "Yahoo Чат порт"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr ""
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9123,11 +9151,11 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr ""
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Портокол Нэмэлт програм"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9150,6 +9178,28 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Хүлээж авсан зөвшөөрөл"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Хэрэглэгчийн нэр эсвэл нууц үг буруу"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9176,37 +9226,31 @@ msgstr ""
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "Зөвшөөрөх жагсаалтанд  (%s) %sийг нэмэх боломжгүй."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Серверийн жагсаалтанд харилцагч нэмж чадсангүй"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-msgid "Connection problem"
-msgstr "Холболтын асуудал"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "%s тэй холболт тасарсан:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"%sтэй холболт үүсгэж чадсангүй:\n"
+"Сервертэй холбогдож чадсангүй:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9254,8 +9298,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "Аль ID ийг идэвхжүүлэх вэ?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Чатад хэнийг холбох вэ?"
@@ -9269,74 +9313,15 @@ msgstr "Чатад хэрэглэгчийг холбох"
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Yahoo сүлжээний чат өрөөнд холбогдох"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Yahoo сүлжээний чат өрөөнүүдийг жагсаах"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Портокол Нэмэлт програм"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Япон"
-
-msgid "Pager server"
-msgstr "Пежер сервер"
-
-msgid "Japan Pager server"
-msgstr "Японы Пежер сервер"
-
-msgid "Pager port"
-msgstr "Пежер порт"
-
-msgid "File transfer server"
-msgstr "Файл шилжүүлэх сервер"
-
-msgid "Japan file transfer server"
-msgstr "Японы файл шилжүүлэх сервер"
-
-msgid "File transfer port"
-msgstr "Файл шилжүүлэх порт"
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Зөвлөгөөн, чат өрөөний урилгыг татгалзах"
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Чат сервер"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Чат порт"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Холбогдох боломжгүй байна."
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9344,6 +9329,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr "Бичих алдаа"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Япон Профиль"
 
@@ -9384,13 +9372,8 @@ msgstr ""
 msgid "Last Update"
 msgstr "Сүүлийн Шинэчлэл"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr ""
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9455,20 +9438,20 @@ msgstr ""
 msgid "Webcams"
 msgstr "Вэб камер"
 
+msgid "Connection problem"
+msgstr "Холболтын асуудал"
+
 msgid "Unable to fetch room list."
 msgstr "Өрөөний жагсаалтыг тусгаарлах боломжгүй."
 
 msgid "User Rooms"
 msgstr "Хэрэглэгчийн Өрөө"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
+"Сервертэй холболт тасарсан:\n"
 "%s"
-msgstr ""
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9593,33 +9576,22 @@ msgstr ""
 msgid "Exposure"
 msgstr ""
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Сокет үүсгэх боломжгүй:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "%s рүү мессеж илгээх боломжгүй."
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9706,9 +9678,6 @@ msgstr "Битгий саад бол"
 msgid "Extended away"
 msgstr ""
 
-msgid "Mobile"
-msgstr "Гар утас"
-
 msgid "Listening to music"
 msgstr "Хөгжим сонсох"
 
@@ -9750,16 +9719,6 @@ msgstr "+++ %s идэвхтэй болсон"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s г унших алдаа"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr "Тооцоолж байна..."
 
@@ -9865,6 +9824,16 @@ msgstr "Холболтыг зөвшөөрөөгүй"
 msgid "Address already in use."
 msgstr "Энэ чатын нэрийг ашиглаж байна"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s г унших алдаа"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 msgid "Internet Messenger"
 msgstr "Интернет Мессенжер"
 
@@ -9907,10 +9876,8 @@ msgstr "Шинэ мэйлийн мэдэгдэл"
 msgid "Use this buddy _icon for this account:"
 msgstr "Энэ бүртгэлд харилцагчийн энэ дүрс зургийг ашиглах"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s сонголт"
+msgid "_Advanced"
+msgstr ""
 
 msgid "Use GNOME Proxy Settings"
 msgstr "ГНОМЕ-ийн прокси тохиргоог ашиглах"
@@ -9945,9 +9912,6 @@ msgstr ""
 msgid "you can see the butterflies mating"
 msgstr ""
 
-msgid "Proxy Options"
-msgstr "Прокси сонгох"
-
 msgid "Proxy _type:"
 msgstr "Проксийн төрөл:"
 
@@ -9975,8 +9939,9 @@ msgstr "Үндсэн"
 msgid "Create _this new account on the server"
 msgstr "Сервер дээр шинэ бүртгэл үүсгэх"
 
-msgid "_Advanced"
-msgstr ""
+#, fuzzy
+msgid "_Proxy"
+msgstr "Прокси"
 
 msgid "Enabled"
 msgstr "Идэвхжүүлэх"
@@ -10020,8 +9985,9 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Шаардлагатай талбаруудыг шинэчилнэ үү."
 
-msgid "Room _List"
-msgstr "Өрөөний жагсаалт"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Бүртгэл"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10029,8 +9995,8 @@ msgid ""
 msgstr ""
 "Холбогдохыг хүсэж байгаа чатын талаархи тохирох мэдээллийг оруулна уу.\n"
 
-msgid "_Account:"
-msgstr "Бүртгэл:"
+msgid "Room _List"
+msgstr "Өрөөний жагсаалт"
 
 msgid "_Block"
 msgstr "Хаах"
@@ -10047,6 +10013,17 @@ msgstr "Мэдээлэл Авах"
 msgid "I_M"
 msgstr ""
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "Чат Нэмэх "
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Видео Чат"
+
 msgid "_Send File..."
 msgstr "Файл илгээх..."
 
@@ -10056,9 +10033,14 @@ msgstr "Харилцагчийн Сануулга нэмэх..."
 msgid "View _Log"
 msgstr "Архив үзэх"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Оффлайн байхад нуух"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Оффлайн байхад харуулах"
+
 msgid "_Alias..."
 msgstr "Өөр нэр..."
 
@@ -10182,6 +10164,10 @@ msgstr "/Хэрэгсэл/Харилцагчийн _Сануулга"
 msgid "/Tools/_Certificates"
 msgstr "/Хэрэгсэл/_Сертификат"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Хэрэгсэл/Өрөөний Жагсаалт"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Хэрэгсэл/Нэмэлт програмууд"
 
@@ -10191,9 +10177,6 @@ msgstr "/Хэрэгсэл/Тохиргоо"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Хэрэгсэл/Эрх"
 
-msgid "/Tools/Smile_y"
-msgstr ""
-
 msgid "/Tools/_File Transfers"
 msgstr "/Хэрэгсэл/Файл Шилжүүлэлт"
 
@@ -10309,8 +10292,8 @@ msgstr "Гар аргаар"
 msgid "By status"
 msgstr "Төлөвөөр"
 
-msgid "By log size"
-msgstr "Архивын хэмжээгээр"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10326,6 +10309,9 @@ msgstr "Дахин холбогдох"
 msgid "Re-enable"
 msgstr "Дахин идэвхжүүлэх"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Дахин тавтай морилно уу!"
 
@@ -10411,6 +10397,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Өөр нэр:"
 
+msgid "_Group:"
+msgstr "Бүлэг:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Бүртгэл онлайн болоход шууд холбогдох"
 
@@ -10445,6 +10434,113 @@ msgstr "/Хэрэгсэл"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Харилцагч/Харилцагчийг эрэмбэлэх"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Арын дэвсгэр өнгө"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Лаос хэл"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Арын дэвсгэр өнгө"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Арын дэвсгэр өнгийг сонгох"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Арын дэвсгэр өнгийг сонгох"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Товчны хослол"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Онлайн"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Хол байна"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Оффлайн"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Идэвхгүй "
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Мессеж илгээхэд"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ийн мэдээллийг өөрчлөх"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Энэ сертификатыг авах хостын нэрийг бич."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Сервер"
@@ -10462,12 +10558,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
 msgid "_Buddy:"
 msgstr "Харилцагч:"
 
@@ -10496,8 +10586,9 @@ msgstr "Татгалзах"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
-msgstr ""
+#, fuzzy
+msgid "Last Said"
+msgstr "Овог"
 
 msgid "Unable to save icon file to disk."
 msgstr "Дискэнд зургийн файл хадгалах боломжгүй."
@@ -10542,6 +10633,22 @@ msgstr "/Харилцаа/Нэр өөрчилж хадгалах..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Харилцаа/Дэлгэцийг цэвэрлэх"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Харилцаа/Дэлгэрэнгүй"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Харилцаа/Дэлгэрэнгүй"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Харилцаа/Дэлгэрэнгүй"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Харилцаа/Архив Үзэх"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Харилцаа/Файл Илгээх..."
 
@@ -10614,6 +10721,18 @@ msgstr "/Харилцаа"
 msgid "/Conversation/View Log"
 msgstr "/Харилцаа/Архив үзэх"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Харилцаа/Дэлгэрэнгүй"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Харилцаа/Архив үзэх"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Харилцаа/Дэлгэрэнгүй"
+
 msgid "/Conversation/Send File..."
 msgstr "/Харилцаа/Файл илгээх..."
 
@@ -10797,6 +10916,9 @@ msgstr "Уран бүтээлч"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "дэмжлэг"
 
@@ -10923,6 +11045,10 @@ msgstr "Хинди хэл"
 msgid "Hungarian"
 msgstr "Унгар хэл"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Румын хэл"
+
 msgid "Indonesian"
 msgstr "Индонези хэл"
 
@@ -10938,6 +11064,9 @@ msgstr "Гүрж хэл"
 msgid "Ubuntu Georgian Translators"
 msgstr "Убунту Линукс үйлдлийн системийн Гүрж хэлний Орчуулагчид"
 
+msgid "Khmer"
+msgstr ""
+
 msgid "Kannada"
 msgstr "Каннада хэл"
 
@@ -10959,6 +11088,10 @@ msgstr "Литви хэл"
 msgid "Macedonian"
 msgstr "Македони хэл"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "Македони хэл"
+
 msgid "Bokmål Norwegian"
 msgstr "Норвеги хэл"
 
@@ -11013,6 +11146,9 @@ msgstr "Синхала хэл"
 msgid "Swedish"
 msgstr "Швев хэл"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Тамил хэл"
 
@@ -11064,7 +11200,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11309,7 +11462,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr "Доогуур холбоосын өнгө"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11345,13 +11498,19 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 
 msgid "Typing notification font"
@@ -11363,15 +11522,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr ""
 
-msgid "_Copy Email Address"
-msgstr "Мэйл Хаягийг Хуулах"
-
-msgid "_Open Link in Browser"
-msgstr "Холбоосыг браузер дээр нээх"
-
-msgid "_Copy Link Location"
-msgstr "Холбоосын байрлалыг хуулах"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11413,11 +11563,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Зургийг Хадгалах"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Зургийг Хадгалах..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11504,9 +11652,6 @@ msgstr "Фонтын хэмжээг багасгах"
 msgid "Font Face"
 msgstr "Фонтын Загвар"
 
-msgid "Background Color"
-msgstr "Арын дэвсгэр өнгө"
-
 msgid "Foreground Color"
 msgstr "Нүүрний дэсвгэр өнгө"
 
@@ -11610,13 +11755,14 @@ msgstr "Архивын хавтасыг харах"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Дэлгэрэнгүй мэдээллийг авахдаа`%s -h' үз.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11626,14 +11772,23 @@ msgid ""
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
+"%s\n"
+"Хэрэглэгээ: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    файлд DIR ийг ашиглах\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          Тусламжийг харуулах\n"
+"  -n, --nologin       Автоматаар холбогдохгүй \n"
+"  -v, --version       Хувилбарыг харуулах\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11642,6 +11797,14 @@ msgid ""
 "                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
+"%s\n"
+"Хэрэглэгээ: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    файлд DIR ийг ашиглах\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          Тусламжийг харуулах\n"
+"  -n, --nologin       Автоматаар холбогдохгүй \n"
+"  -v, --version       Хувилбарыг харуулах\n"
 
 #, c-format
 msgid ""
@@ -11664,11 +11827,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Пизин"
 
-msgid "Open All Messages"
-msgstr "Бүх мессежийг нээх"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Танд мэйл ирсэн байна!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Тооцоолж байна..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -11697,6 +11876,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "Мессеж"
+
+msgid "Open All Messages"
+msgstr "Бүх мессежийг нээх"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Танд мэйл ирсэн байна!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Шинэ харилцагчийн сануулга"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Танд мэйл ирсэн байна!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -11743,10 +11943,17 @@ msgstr "<b>Нэмэлт програмын мэдээлэл</b>"
 msgid "Select a file"
 msgstr "Файл сонгох"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Харилцагчийн сануулгыг засварлах"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Хэнд сануулах"
 
+msgid "_Account:"
+msgstr "Бүртгэл:"
+
 msgid "_Buddy name:"
 msgstr "Харилцагчийн нэр:"
 
@@ -11813,7 +12020,58 @@ msgstr "Давтах"
 msgid "Pounce Target"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Бичиж эхлэх"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Бичиж байгаад түр зогссон"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Мессенжерт нэвтрэх"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s (%s) идэвхгүй байж байгаад эргэж ирсэн"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Эргэж ирэх"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Бичихээ больсон"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Мессенжерээс гарах"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Идэвхгүй болох"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Гарахад"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Мессеж илгээх"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Зураг ачаалах амжилтгүй боллоо"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -11833,6 +12091,12 @@ msgstr "Товчны хослол"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Esc товчоор харилцааг хаах"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Харилцагчийн жагсаалт"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Системийн сануулах дүрс"
 
@@ -11842,8 +12106,9 @@ msgstr "Системийн сануулах дүрсийг харуулах"
 msgid "On unread messages"
 msgstr "Уншаагүй мессеж"
 
-msgid "Conversation Window Hiding"
-msgstr "Харилцааны Цонхыг Нуух"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Мессеж харилцааны цонх"
 
 msgid "_Hide new IM conversations:"
 msgstr "Шинэ харилцааг нуух"
@@ -11851,6 +12116,9 @@ msgstr "Шинэ харилцааг нуух"
 msgid "When away"
 msgstr "Гарахад"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Харилцааны шинэ цонхыг багасгах"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Табууд"
@@ -11909,9 +12177,6 @@ msgstr "Гүйлгэх сумыг ашиглах"
 msgid "F_lash window when IMs are received"
 msgstr "Мессеж ирэхэд цонхыг шууд харуулах"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Харилцааны шинэ цонхыг багасгах"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -11943,13 +12208,11 @@ msgstr "Прокси тохируулах програмыг эхлүүлж ча
 msgid "Cannot start browser configuration program."
 msgstr "Браузер тохируулах програмыг тохируулах"
 
-msgid "ST_UN server:"
-msgstr "ST_UN сервер:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Жишээ нь: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP хаягийг автоматаар таних"
 
 msgid "Public _IP:"
@@ -11970,6 +12233,10 @@ msgstr "Эхлэх порт:"
 msgid "_End port:"
 msgstr "Төгсгөх порт:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy Server &amp; Браузер"
 
@@ -11996,6 +12263,10 @@ msgstr "Прокси Сервер"
 msgid "No proxy"
 msgstr "Ямар ч прокси байхгүй"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "Хэрэглэгч:"
 
@@ -12157,12 +12428,12 @@ msgstr "Гарах болон идэвхгүй болоход"
 msgid "Auto-away"
 msgstr ""
 
-msgid "Change status when _idle"
-msgstr "Идэвхгүй болоход төлөвийг өөрчлөх"
-
 msgid "_Minutes before becoming idle:"
 msgstr "Идэвхгүй болохын өмнөх минут:"
 
+msgid "Change status when _idle"
+msgstr "Идэвхгүй болоход төлөвийг өөрчлөх"
+
 msgid "Change _status to:"
 msgstr "Төлөв өөрчлөх:"
 
@@ -12310,46 +12581,47 @@ msgstr "Хадгалах & Ашиглах"
 msgid "Status for %s"
 msgstr "%s ийн төлөв"
 
-msgid "Custom Smiley"
-msgstr ""
-
-msgid "More Data needed"
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Please provide a shortcut to associate with the smiley."
+msgid "Custom Smiley"
 msgstr ""
 
 msgid "Duplicate Shortcut"
 msgstr ""
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-msgid "Please select an image for the smiley."
-msgstr ""
-
 msgid "Edit Smiley"
 msgstr ""
 
 msgid "Add Smiley"
 msgstr ""
 
-msgid "Smiley _Image"
-msgstr ""
+#, fuzzy
+msgid "_Image:"
+msgstr "Зураг"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Товчны хослол"
 
 msgid "Smiley"
 msgstr ""
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Товчны хослол"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Харилцагч Сонгох"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Энэ бүртгэлд харилцагчийн энэ дүрс зургийг ашиглах"
 
@@ -12428,8 +12700,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -12461,6 +12733,16 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "Холбоосыг Нээх:"
+
+msgid "_Copy Link Location"
+msgstr "Холбоосын байрлалыг хуулах"
+
+msgid "_Copy Email Address"
+msgstr "Мэйл Хаягийг Хуулах"
+
 msgid "Save File"
 msgstr "Файлыг Хадгалах"
 
@@ -12555,6 +12837,76 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Серверийн хаяг"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Хэрэглэгчийн хавтасыг оруулах"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Хайлт хийх хавтасаа сонго"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Онлайн үйлчилгээ"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Харилцагчийн Жагсаалтыг Илгээх"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Гарах"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Архивын хавтас"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Дуу сонгох"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub үйлчилгээ"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Тайлбар"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Хавтас хайх"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "Браузер:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Харилцагч үүсээгүй байна"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "XMPP-ийн хөгжүүлэгч"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "Харилцагч идэвхгүй байна"
 
@@ -12925,7 +13277,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13032,12 +13384,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr "Заагчийн Өнгө"
-
-msgid "Secondary Cursor Color"
-msgstr "Курсорын хоёр дахь өнгө"
-
 msgid "Hyperlink Color"
 msgstr "Доогуур холбоосын өнгө"
 
@@ -13048,6 +13394,9 @@ msgstr "Доогуур холбоосын өнгө"
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+msgid "Typing Notification Color"
+msgstr ""
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13077,35 +13426,22 @@ msgstr "GTK+ Интерфэйсийн Фонт"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Интерфэйсийн өнгөнүүд"
+msgid "Disable Typing Notification Text"
+msgstr ""
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "Хаах"
+
 msgid "Fonts"
 msgstr "Фонтууд"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc Файлын Хэрэгсэл"
 
@@ -13187,7 +13523,7 @@ msgstr ""
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13239,6 +13575,107 @@ msgstr "Текстын байрлал"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+msgid "Just logged in"
+msgstr ""
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Харилцагч мессенжерээс гарахад"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Чатад холбогдох"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Татгалзах"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Нилээн чанга"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Опера"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "ICQ зөвшөөрөлийг татгалзсан."
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Алдаа"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Мэдээлэл"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Анхааруулах Түвшин"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ийн төлөв"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Дүрс зургийг хадгалах"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "Бусад нь чатаар байхад"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Харилцагчийн жагсаалт"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Харилцагчийн жагсаалт"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13394,9 +13831,6 @@ msgstr ""
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr ""
-
 msgid "Windows Pidgin Options"
 msgstr ""
 
@@ -13404,7 +13838,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13444,6 +13878,223 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Сокетыг нээж чадсангүй"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Сокет унших боломжгүй"
+
+#~ msgid "Connection failed."
+#~ msgstr "Холболт амжилтгүй боллоо."
+
+#~ msgid "Read error"
+#~ msgstr "Унших алдаа"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Сервертэй холбогдож чадсангүй:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Бичих алдаа"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc ийн командууд"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub үйлчилгээ"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Харилцагчийн байрлал"
+
+#~ msgid "Software Version"
+#~ msgstr "Програм хангамжийн хувилбар"
+
+#~ msgid "User Profile"
+#~ msgstr "Хэрэглэгчийн товч мэдээлэл"
+
+#~ msgid "User Nickname"
+#~ msgstr "Хэрэглэгчийн хоч нэр"
+
+#~ msgid "Read Error"
+#~ msgstr "Унших алдаа"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Нэвтэрэхэд алдаа гарлаа (%s)."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Алдаа. SSL дэмжлэгийг суулгаагүй байна."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Нууц үг буруу."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS сервер лүү холбогдож чадсангүй с:\n"
+#~ "%s"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Холбогдож Чадсангүй"
+
+#~ msgid "Invalid username."
+#~ msgstr "Хэрэглэгчийн нэр буруу."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Серверийн мэдээллийг авам боложгүй"
+
+#~ msgid "Connection lost"
+#~ msgstr "Холболтыг тасалсан"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Холболтыг хаасан"
+
+#~ msgid "Connection reset"
+#~ msgstr "Холболтыг дахин тохируулах"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Хост руу холбогдох боломжгүй"
+
+#~ msgid "Could not write"
+#~ msgstr "Бичиж чадсангүй"
+
+#~ msgid "Could not connect"
+#~ msgstr "Холбогдож чадсангүй"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Буруу нууц үг"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%sтэй холболт үүсгэж чадсангүй:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Япон"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Японы Пежер сервер"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Японы файл шилжүүлэх сервер"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Харилцааны Цонхыг Нуух"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Аль ID ийг идэвхжүүлэх вэ?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Заагчийн Өнгө"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Курсорын хоёр дахь өнгө"
+
+#~ msgid "Interface colors"
+#~ msgstr "Интерфэйсийн өнгөнүүд"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Харилцагч нэмэх"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Серверийн мэдээллийг авам боложгүй"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "Сервертэй холболт тасарсан:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Серверт холбогдох"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s ийг хайж байна"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s рүү холбогдоход алдаа гарлаа"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Эхлэл: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr " %s файлд бичих боломжгүй."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "%s файлыг унших боломжгүй."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Мессеж хэтэрхий урт байна, сүүлийн  %s байтыг хассан."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Хэрэглэгчийн нэр эсвэл нууц үг буруу."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Энэ үйлчилгээ одоогоор бэлэн биш байна."
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Буруу бүлгийн нэр"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Холболтыг тасалсан"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Хариу хүлээж байна..."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Нууц үг амжилттай өөрчлөгдлөө"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Хавтасны талаархи мэдээлэл авах"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Хавтасны мэдэээллийг тохируулах"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Завсар хийхээр %sийг нээж чадсангүй!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Файл дамжуулалт амжилттгүй боллоо."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Дамжуулахаар холбогдож чадсангүй."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Файлын толгойд бичих боломжгүй. Файл дамжигдахгүй."
+
+#~ msgid "Save As..."
+#~ msgstr "Нэр өөрчилж хадгалах..."
+
+#~ msgid "%s Options"
+#~ msgstr "%s сонголт"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Прокси сонгох"
+
+#~ msgid "By log size"
+#~ msgstr "Архивын хэмжээгээр"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "Холбоосыг браузер дээр нээх"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN сервер:"
+
 #~ msgid "Primary Information"
 #~ msgstr "Үндсэн мэдээлэл"
 
@@ -13494,13 +14145,6 @@ msgstr ""
 #~ msgid "Change Qun information"
 #~ msgstr "Харилцагчийн мэдээллийг авах боломжгүй"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "Системийн Мессеж"
 
@@ -13518,10 +14162,6 @@ msgstr ""
 #~ msgstr "Нууц үг өөрчлөхөд алдаа гарлаа"
 
 #, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Сервертэй холбогдох боломжгүй."
-
-#, fuzzy
 #~ msgid "Connecting server %s, retries %d"
 #~ msgstr ""
 #~ "%s сервертэй холбогдох алдаа:\n"
@@ -13562,9 +14202,6 @@ msgstr ""
 #~ msgid "developer"
 #~ msgstr "хөгжүүлэгч"
 
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP-ийн хөгжүүлэгч"
-
 #~ msgid "Artists"
 #~ msgstr "Уран бүтээлчид"
 
@@ -13598,9 +14235,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "Шалтгаанаа оруул:"
 
-#~ msgid "Unable to login"
-#~ msgstr "Нэвтрэх боломжгүй байна"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP Хаяг"
 
diff --git a/po/my_MM.po b/po/my_MM.po
index 7e604d8fe9..557cd842f0 100644
--- a/po/my_MM.po
+++ b/po/my_MM.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2004-01-14 12:26+0000\n"
 "Last-Translator: Minn Myat Soe <mmyatsoe@gmail.com>\n"
 "Language-Team: \n"
@@ -32,7 +32,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -637,21 +637,6 @@ msgid "Send To"
 msgstr "_Send As"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "(1 message)"
-
-msgid "Invite"
-msgstr "Invite"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "စကားမ္ယား"
 
@@ -914,6 +899,42 @@ msgid "System Log"
 msgstr "System Log"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "Calculating..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Accept"
+
+#, fuzzy
+msgid "Reject"
+msgstr "Reset"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "You have parted the channel%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "Email"
 
@@ -951,6 +972,9 @@ msgstr "Connecting"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "Invite"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(no name)"
@@ -1174,7 +1198,6 @@ msgstr "%s has gone away. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s က %s (%s) ကို ပို့ခ္ယင္ေနတယ္"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
@@ -1230,7 +1253,6 @@ msgstr "_Minutes before setting away:"
 msgid "Change status to"
 msgstr "Change Address To:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "စကားမ္ယား"
 
@@ -1581,7 +1603,6 @@ msgstr ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 
-#, c-format
 msgid "Online"
 msgstr "Online"
 
@@ -1630,6 +1651,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 #, fuzzy
 msgid "accounts"
 msgstr "Accounts"
@@ -1733,14 +1776,6 @@ msgstr "Accept chat invitation?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Accept"
-
-#, fuzzy
-msgid "Reject"
-msgstr "Reset"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1830,6 +1865,8 @@ msgstr "%s signed on"
 msgid "+++ %s signed off"
 msgstr "%s signed off"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -1879,6 +1916,18 @@ msgstr "%s အခန္းထဲမ္ဟ ထ္ဝက္‌သ္ဝားပ�
 msgid "%s left the room (%s)."
 msgstr "%s (%s) အခန္းထဲမ္ဟ ထ္ဝက္‌သ္ဝားပ္ရီ။"
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Initiate Chat"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "Failed to set cmodes for %s"
@@ -2017,7 +2066,7 @@ msgstr "%s ဆီက ဖိုင္‌ အရ္ဝေ့အပ္ရောင�
 msgid "Transfer of file %s complete"
 msgstr "%s ကို ကူးပ္ရောင္းတာ ပ္ရီးသ္ဝားပ္ရီ"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "File transfer complete"
 msgstr "File transfer host"
 
@@ -2025,7 +2074,7 @@ msgstr "File transfer host"
 msgid "You canceled the transfer of %s"
 msgstr "%s ကို ကူးပ္ရောင္းတာ ဆက္‌မလုပ္‌ေတာ့ပာ"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "File transfer cancelled"
 msgstr "File transfer already started"
 
@@ -2210,11 +2259,14 @@ msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Error creating connection"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2627,7 +2679,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2679,7 +2731,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2708,6 +2760,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Change Password"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2901,19 +2979,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Unable to create new connection."
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 #, fuzzy
 msgid "First name"
 msgstr "First name:"
@@ -2951,6 +3028,11 @@ msgstr "Yahoo Protocol Plugin"
 msgid "Purple Person"
 msgstr "လူသစ္‌"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Locality"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2962,17 +3044,17 @@ msgstr "%s has been invited to this conversation."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Message ပို့လို့ မရပာ။ အလ္ဝန္‌ရ္ဟည္‌လ္ဟသည္။"
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "socket ဖ္ဝင့္လို့ မရပာ"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Couldn't create socket"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Couldn't create socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3031,15 +3113,15 @@ msgstr "Send Buddy List"
 msgid "Load buddylist from file..."
 msgstr "Import Buddy List from Server"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "Password မ္ယား မတူက္ရပာ။"
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Unable to create new connection."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3052,17 +3134,15 @@ msgstr "Registration Successful"
 msgid "Password"
 msgstr "Password"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Password sent"
+msgid "Password (again)"
+msgstr "Password (again)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s not currently logged in."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Currently on"
+msgid "Captcha"
+msgstr "Save Image"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3124,6 +3204,18 @@ msgid "Current password"
 msgstr "Incorrect password."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Password sent"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s not currently logged in."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Currently on"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "လက္‌ရ္ဟိ password န္ဟင့္ password အသစ္‌ကို ရိုက္‌ထည့္ပာ"
 
@@ -3139,13 +3231,13 @@ msgstr "Remove the chat from your buddy list"
 msgid "Add to chat..."
 msgstr "(_h) chat ထပ္‌ထည့္မယ္‌"
 
+#. Global
 msgid "Available"
 msgstr "Available"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Away"
 
@@ -3177,7 +3269,8 @@ msgstr "Non-matching Hosts"
 msgid "There are no users matching your search criteria."
 msgstr "Please enter your new password"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Unable to read socket"
 
 #, fuzzy
@@ -3196,8 +3289,14 @@ msgstr "Buddy Display"
 msgid "Your buddy list was stored on the server."
 msgstr "There is no Buddy List stored on the Gadu-Gadu server."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Connect"
+
+msgid "Connection failed"
 msgstr "Connection failed"
 
 #, fuzzy
@@ -3208,6 +3307,15 @@ msgstr "Chat ထပ္‌ထည့္မယ္‌"
 msgid "Chat _name:"
 msgstr "Last name:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Unable to ping server"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connecting"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Read error"
@@ -3217,7 +3325,7 @@ msgid "This chat name is already in use"
 msgstr "That file already exists"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "You were disconnected from the server."
 
 #, fuzzy
@@ -3266,6 +3374,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Search Engine"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Set User Info..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
@@ -3282,7 +3394,7 @@ msgid "File Transfer Failed"
 msgstr "File transfer already started"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin could not open a listening port."
 
 msgid "Error displaying MOTD"
@@ -3298,8 +3410,16 @@ msgstr "There is no MOTD associated with this connection."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "You were disconnected from the server."
 
 msgid "View MOTD"
 msgstr "View MOTD"
@@ -3310,25 +3430,24 @@ msgstr "_Channel:"
 msgid "_Password:"
 msgstr "_Password:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connecting"
-
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-msgid "Couldn't create socket"
-msgstr "Couldn't create socket"
+msgid "Unable to connect"
+msgstr "Unable to connect"
 
-msgid "Couldn't connect to host"
-msgstr "Couldn't connect to host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Unable to connect to server"
 
-msgid "Read error"
-msgstr "Read error"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Error creating connection"
 
 msgid "Users"
 msgstr "Users"
@@ -3513,6 +3632,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "That file already exists"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Nickname"
+
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
@@ -3760,11 +3890,11 @@ msgid "execute"
 msgstr "Not expected"
 
 #, fuzzy
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server requires SSL for login"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Server requires SSL for login"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3781,19 +3911,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Authentication failed"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Invalid response from server."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Read error"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "No reason given."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Unsupported Version"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "Unable to make SSL connection to server."
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Unable to make SSL connection to server."
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Unable to create new connection."
+
 msgid "Full Name"
 msgstr "Full Name"
 
@@ -3863,187 +4024,9 @@ msgstr "City"
 msgid "Operating System"
 msgstr "Hide Operating System"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Set Dir Info"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Extended Address"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Alias Chat"
-
 #, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "User has no directory information."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Command"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Registration Error"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Location"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "ေဘာ္‌ဒာရဲ့ အခ္ရေအနေကို အသိပေးခ္ရင္း"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Unsupported Version"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Organisation"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "ဖိုင္ အရ္ဝေ့အပ္ရောင္းမ္ယား"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Capabilities"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Username"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM with Key Exchange"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Email Address"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Set Profile"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Nickname"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Live Video"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Message received"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Public Key Babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "User Options"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "User Limit"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian Encryption"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Capabilities"
+msgid "Local Time"
+msgstr "Local Users"
 
 #, fuzzy
 msgid "Priority"
@@ -4052,6 +4035,14 @@ msgstr "Port"
 msgid "Resource"
 msgstr "Resource"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Logged out"
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4100,7 +4091,6 @@ msgstr "Chatty"
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
@@ -4227,28 +4217,27 @@ msgstr "Select a conference server to query"
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
-msgid "Write error"
-msgstr "Write error"
+#, fuzzy
+msgid "No users found"
+msgstr "Non-matching Hosts"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Plain text"
+msgid "Roles:"
+msgstr "Role"
 
-msgid "Read Error"
-msgstr "Read Error"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Plain text"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "Unable to create socket"
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "Invalid ID"
@@ -4256,6 +4245,10 @@ msgstr "Invalid ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Unable to connect to server."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
@@ -4282,9 +4275,6 @@ msgstr "Registration Successful"
 msgid "Unregistration Failed"
 msgstr "Registration Failed"
 
-msgid "Already Registered"
-msgstr "Already Registered"
-
 msgid "State"
 msgstr "County/State"
 
@@ -4298,6 +4288,9 @@ msgstr "Telephone"
 msgid "Date"
 msgstr "Date"
 
+msgid "Already Registered"
+msgstr "Already Registered"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "မ္ဟတ္‌ပံုတင္‌မယ္‌"
@@ -4330,6 +4323,10 @@ msgid "Change Registration"
 msgstr "Registration Error"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Unable to connect to server."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Error Changing Account Info"
 
@@ -4349,9 +4346,18 @@ msgstr "Authenticating"
 msgid "Re-initializing Stream"
 msgstr "Re-initialising Stream"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
+msgid "Mood"
+msgstr "Mood"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Both"
 
@@ -4373,12 +4379,6 @@ msgstr "မရ္ဟိပာ"
 msgid "Subscription"
 msgstr "Subscription"
 
-msgid "Mood"
-msgstr "Mood"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "Mood"
@@ -4426,9 +4426,6 @@ msgstr "Your password has been changed."
 msgid "Error changing password"
 msgstr "Error changing password"
 
-msgid "Password (again)"
-msgstr "Password (again)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Change Password"
@@ -4624,18 +4621,24 @@ msgstr "Unable to kick user %s"
 msgid "Unable to ping user %s"
 msgstr "Unable to ban user %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4646,9 +4649,36 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr "The user has blocked you"
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Unable to send message to %s:"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Unable to send file to %s, user does not support file transfers"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Unable to send file to %s, user does not support file transfers"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Registration Failed"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
 msgstr ""
+"Please enter the screen name of the person whose info you would like to view."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "Select a file"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Initiate Chat"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
@@ -4670,13 +4700,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4745,6 +4775,9 @@ msgstr "Connect server"
 msgid "File transfer proxies"
 msgstr "File transfer port"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4784,6 +4817,14 @@ msgstr "XML Parse error"
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error joining chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error in chat %s"
+
 msgid "Create New Room"
 msgstr "Create New Room"
 
@@ -4802,13 +4843,32 @@ msgstr "Configure Room"
 msgid "_Accept Defaults"
 msgstr "Accept Defaults"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Error joining chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "No reason given."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Error in chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Kicked by %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "An error occurred while opening the file."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "File transfer already started"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Failed to store image: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4835,10 +4895,6 @@ msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "Select a file"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "User Modes"
 
@@ -4878,9 +4934,20 @@ msgstr "Accounts"
 msgid "Select an action"
 msgstr "Select a file"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Unable to read file %s."
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Unable To Retrieve Buddy List"
+msgid "Buddy Add error"
+msgstr "Buddy List Error"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "The new formatting is invalid."
 
 #, fuzzy, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5110,7 +5177,7 @@ msgstr "Kids Passport without parental consent"
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Passport account not yet verified"
 
@@ -5134,6 +5201,10 @@ msgstr "Preferred Contact"
 msgid "Non-IM Contacts"
 msgstr "Remove Contact"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5204,6 +5275,13 @@ msgstr "Send a mobile message."
 msgid "Page"
 msgstr "Page"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Warn"
+
 msgid "Has you"
 msgstr "Has you"
 
@@ -5247,6 +5325,14 @@ msgid "Album"
 msgstr ""
 
 #, fuzzy
+msgid "Game Title"
+msgstr "Title"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Title"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "Set Friendly Name"
 
@@ -5288,10 +5374,6 @@ msgstr ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://Pidgin.sf.net/faq-ssl.php for more information."
 
-#, fuzzy
-msgid "Failed to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
 
@@ -5467,8 +5549,9 @@ msgstr ""
 "Pidgin could not find any information in the user's profile. The user most "
 "likely does not exist."
 
-msgid "Profile URL"
-msgstr "Profile URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "Not allowed when offline"
 
 #. *< type
 #. *< ui_requirement
@@ -5505,69 +5588,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Normal authentication failed!"
 
 #, fuzzy, c-format
-msgid "%s is not a valid group."
-msgstr "%s is not a valid room name"
-
-#, fuzzy
-msgid "Unknown error."
-msgstr "Unknown error"
-
-#, fuzzy, c-format
-msgid "%s on %s (%s)"
-msgstr "Users on %s: %s"
-
-#, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s က %s (%s) ကို ပို့ခ္ယင္ေနတယ္"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Unknown error"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Unable to ban user %s"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Unable to add user to privacy list (%s)."
-
-#, fuzzy, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Unable to kick user %s"
-
 #, fuzzy, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Unable to invite user (%s)."
+msgid "Unknown error (%d)"
+msgstr "Unknown error"
 
-#, c-format
-msgid "%s could not be added because your buddy list is full."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is not a valid server name"
-
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Service Temporarily Unavailable"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "You missed %hu message from %s because it was too large."
 
-#, fuzzy
-msgid "Unable to rename group"
-msgstr "Unable to read"
-
-#, fuzzy
-msgid "Unable to delete group"
-msgstr "Unable to create socket"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5612,9 +5654,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "Unable to connect"
-
 #, fuzzy
 msgid "Writing error"
 msgstr "Write error"
@@ -5630,21 +5669,23 @@ msgid ""
 msgstr "Unknown error from %s server"
 
 #, fuzzy
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr "အခု protocol ဖ္ရင့္ chat room မ္ယားမခ္ယိတ္‌နုိင္‌ပာ။"
 
 #, fuzzy
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr "Error displaying MOTD"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "You have signed on from another location."
 
 #, fuzzy
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "The service is temporarily unavailable."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "The MSN servers are going down temporarily."
 
 #, fuzzy, c-format
@@ -5676,6 +5717,14 @@ msgstr "Send to Mobile"
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
@@ -5712,14 +5761,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Address Book ထဲ ထည့္လိုက္‌မယ္‌"
@@ -5728,13 +5769,6 @@ msgstr "Address Book ထဲ ထည့္လိုက္‌မယ္‌"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Do you want to add this buddy to your buddy list?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, fuzzy, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Unable to read file %s."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "The new formatting is invalid."
@@ -5742,6 +5776,9 @@ msgstr "The new formatting is invalid."
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "Profile URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5756,18 +5793,67 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-msgid "Missing Cipher"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s is not a valid group."
+msgstr "%s is not a valid room name"
 
-msgid "The RC4 cipher could not be found"
+#, fuzzy
+msgid "Unknown error."
+msgstr "Unknown error"
+
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
+msgstr "Users on %s: %s"
+
+#, fuzzy, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Unable to add user to privacy list (%s)."
+
+#, fuzzy, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Unable to kick user %s"
+
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Unable to invite user (%s)."
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, fuzzy, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is not a valid server name"
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Service Temporarily Unavailable"
+
+#, fuzzy
+msgid "Unable to rename group"
+msgstr "Unable to read"
+
+#, fuzzy
+msgid "Unable to delete group"
+msgstr "Unable to create socket"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "User Rooms"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "Reading data"
 
@@ -5779,13 +5865,23 @@ msgstr "Invalid challenge from server"
 msgid "Logging in"
 msgstr "Logging"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "screenname မပေးရသေးပာ"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "You were disconnected from the server."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Away message အသစ္‌"
@@ -5806,21 +5902,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "screenname မပေးရသေးပာ"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_IM windows"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connected"
-msgstr "Connect"
+msgid "Add contacts from server"
+msgstr "Invalid response from server."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5828,16 +5925,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Incorrect nickname or password."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "Finalizing connection"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Failed to join buddy in chat"
 
@@ -5849,14 +5953,6 @@ msgstr "Import Buddy List from Server"
 msgid "persist command failed"
 msgstr "Switchboard failed"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "User Rooms"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Failed to join buddy in chat"
@@ -5868,39 +5964,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "Switchboard failed"
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "Finalizing connection"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Queue full"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Unable to parse message"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Couldn't connect to host"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "_IM windows"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "Invalid response from server."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5948,9 +6021,6 @@ msgstr "Larger font size"
 msgid "User"
 msgstr "Users"
 
-msgid "Profile"
-msgstr "Profile"
-
 #, fuzzy
 msgid "Headline"
 msgstr "Decline"
@@ -5966,15 +6036,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "Close conversation"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "screenname မပေးရသေးပာ"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5987,6 +6052,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "This theme has no available smileys."
@@ -5995,6 +6063,14 @@ msgstr "This theme has no available smileys."
 msgid "Please try another username:"
 msgstr "Please enter a new name for the selected group."
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "screenname မပေးရသေးပာ"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6192,10 +6268,6 @@ msgid "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Incorrect nickname or password."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Could not recognise the host of the username you entered"
 
@@ -6240,9 +6312,9 @@ msgstr "The user is either offline or you are blocked"
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login failed (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Unable to ban user %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6344,9 +6416,6 @@ msgstr "GroupWise Conference %d"
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-msgid "Unable to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
@@ -6370,9 +6439,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "You have been logged out because you logged in at another workstation."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6380,17 +6446,14 @@ msgstr ""
 "%s appears to be offline and did not receive the message that you have just "
 "sent."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error: SSL support is not installed."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
@@ -6414,6 +6477,25 @@ msgid "Server port"
 msgstr "Server port"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Invalid response from server."
+
+#. username connecting too frequently
+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 ""
+"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."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Error creating connection"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
 
@@ -6422,17 +6504,7 @@ msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Error creating connection"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "You were disconnected from the server."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Unable to make SSL connection to server."
 
 #. *< type
@@ -6485,8 +6557,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6657,23 +6730,18 @@ msgstr "Camera"
 msgid "Screen Sharing"
 msgstr "Screen Name"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#, c-format
 msgid "Not Available"
 msgstr "Not Available"
 
-#, c-format
 msgid "Occupied"
 msgstr "Occupied"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#, c-format
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -6687,16 +6755,12 @@ msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Could not connect for transfer."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Unable to connect to server."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Unable to connect to server"
 
 #, fuzzy
 msgid "Username sent"
@@ -6711,52 +6775,63 @@ msgstr "Finalizing connection"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "Invalid Username"
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin was unable to get a valid AIM login hash."
 
-msgid "Incorrect password."
-msgstr "Incorrect password."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin was unable to get a valid login hash."
+
+msgid "Received authorization"
+msgstr "Received authorisation"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "User does not exist"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "The client version you are using is too old. Please upgrade at %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "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."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "The client version you are using is too old. Please upgrade at %s"
-
-msgid "Could Not Connect"
-msgstr "Could Not Connect"
-
-msgid "Received authorization"
-msgstr "Received authorisation"
-
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "The new formatting is invalid."
 
 msgid "Enter SecurID"
 msgstr ""
@@ -6771,28 +6846,6 @@ msgstr ""
 msgid "_OK"
 msgstr "ကောင္းပာပ္ရီ"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin was unable to get a valid AIM login hash."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin was unable to get a valid login hash."
-
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -6927,7 +6980,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
@@ -6949,6 +7002,12 @@ msgstr "Online Since"
 msgid "Member Since"
 msgstr "Member Since"
 
+msgid "Capabilities"
+msgstr "Capabilities"
+
+msgid "Profile"
+msgstr "Profile"
+
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
@@ -7102,8 +7161,8 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"The maximum profile length of %d byte has been exceeded.  Pidgin has truncated "
-"it for you."
+"The maximum profile length of %d byte has been exceeded.  Pidgin has "
+"truncated it for you."
 msgstr[1] ""
 "The maximum profile length of %d bytes has been exceeded.  Pidgin has "
 "truncated it for you."
@@ -7130,7 +7189,7 @@ msgstr "Away message too long."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7158,9 +7217,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orphans"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7170,7 +7229,7 @@ msgid "(no name)"
 msgstr "(no name)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
 #, fuzzy, c-format
@@ -7242,6 +7301,7 @@ msgstr "Connect"
 msgid "Get AIM Info"
 msgstr "Get Info"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
@@ -7305,6 +7365,7 @@ msgstr "ရ္ဟာမယ္‌"
 msgid "Set User Info (web)..."
 msgstr "Set User Info (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Change Password (URL)"
@@ -7340,6 +7401,10 @@ msgstr "Search for Buddy by Email..."
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "User is not logged in"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7357,7 +7422,7 @@ msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
 
@@ -7466,7 +7531,7 @@ msgstr "Opera"
 msgid "Visible"
 msgstr "Invisible"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7561,17 +7626,51 @@ msgstr "Last Updated"
 msgid "Could not change buddy information."
 msgstr "Please enter a buddy to pounce."
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "Mobile Phone"
+
+msgid "Note"
+msgstr "Note"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "ေဘာ္‌ဒာ Icon"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Add Buddy"
+msgid "_Modify"
+msgstr "_Modify"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "_Modify"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Server busy"
+
+msgid "Your request was accepted."
+msgstr ""
 
-msgid "Input answer here"
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Request Authorisation"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "စာရင္းထဲကို ေဘာ္ဒာထည့္မလား"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Directory လိုက္‌က္ရီး ပို့လို့ မရပာ။"
+
 msgid "Send"
 msgstr "Send"
 
@@ -7583,19 +7682,20 @@ msgstr "Invalid password"
 msgid "Authorization denied message:"
 msgstr "Authorisation Denied Message:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Plaintext Authentication"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "စာရင္းထဲကို ေဘာ္ဒာထည့္မလား"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "Enter a Conference Server"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7618,7 +7718,7 @@ msgid "Failed sending authorize"
 msgstr "Please authorise me!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Failed to join buddy in chat"
 
 #, fuzzy, c-format
@@ -7664,6 +7764,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Invalid proxy settings"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Member Since"
 
@@ -7708,15 +7812,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "Join Chat"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Telephone Number"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7727,7 +7834,7 @@ msgstr "Sound Options"
 msgid "Failed:"
 msgstr "Failed"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7739,11 +7846,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
-msgstr ""
+#, fuzzy
+msgid "Sorry, you are not our style"
+msgstr "Sorry, I ran out for a bit!"
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Telephone Number"
 
 #, fuzzy
@@ -7754,7 +7862,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Would you like to join the conversation?"
 
 #, fuzzy
@@ -7762,28 +7870,28 @@ msgid "Setup"
 msgstr "(_S) လုပ္‌လိုက္‌ေတာ့"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Failed to join buddy in chat"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Remove Buddy"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Remove Buddy"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7903,6 +8011,13 @@ msgstr "<b>User:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Alias:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>User:</b> %s<br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7910,7 +8025,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "About Pidgin"
 
 #, fuzzy
@@ -7931,6 +8046,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "About Pidgin"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Home Address"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7962,7 +8081,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Connecting"
@@ -7975,6 +8093,9 @@ msgstr "Option နည္းနည္းပဲ ပ္ရပာ"
 msgid "Show server news"
 msgstr "Option နည္းနည္းပဲ ပ္ရပာ"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Read error"
@@ -7984,11 +8105,7 @@ msgid "Update interval (seconds)"
 msgstr "Read error"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Cannot get server information"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Cannot get server information"
 
 #, c-format
@@ -8011,21 +8128,19 @@ msgid "Activation required"
 msgstr "Registration Required"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "Read error"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "Request ambiguous"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Failed Yahoo! Authentication"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -8035,7 +8150,7 @@ msgstr "Save Image"
 msgid "Enter code"
 msgstr "Change Password"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -8043,69 +8158,43 @@ msgid "Enter the text from the image"
 msgstr "Please enter the name of the group to be added."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Unable to connect."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Unknown Error"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "You were disconnected from the server."
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "Unable to read socket"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Write error"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Connection Closed"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Set User Info..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Request denied"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Couldn't connect to host"
+msgid "Unable to resolve hostname"
+msgstr "Unable to ping server"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Invalid username or password"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Connect server"
+msgid "Connecting to server"
+msgstr "Connecting to SILC Server"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Read Error"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "Failed to join chat"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8115,6 +8204,10 @@ msgid ""
 msgstr "ICQ Server Relay"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "Users on %s: %s"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "From"
 
@@ -8124,32 +8217,30 @@ msgid ""
 "%s"
 msgstr "Server Information"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Unknown reason."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Command"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Cannot get server information"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Unknown reason."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Unknown reason."
 
 #, fuzzy, c-format
@@ -8164,10 +8255,6 @@ msgstr "File Send Failed"
 msgid "%d canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Connection Closed"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
@@ -8229,19 +8316,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Connection Closed"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Error while reading from socket."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Unable to connect to server"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8269,6 +8343,10 @@ msgid "Video Camera"
 msgstr "Video Chat"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "ဖိုင္ အရ္ဝေ့အပ္ရောင္းမ္ယား"
+
+#, fuzzy
 msgid "Supports"
 msgstr "support"
 
@@ -9002,9 +9080,6 @@ msgstr "Organisation"
 msgid "Unit"
 msgstr "Unit"
 
-msgid "Note"
-msgstr "Note"
-
 msgid "Join Chat"
 msgstr "Join Chat"
 
@@ -9107,6 +9182,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping failed"
 
@@ -9172,7 +9250,8 @@ msgstr "Unsupported public key type"
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
 msgid "Key Exchange failed"
@@ -9183,29 +9262,26 @@ msgid ""
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-msgid "Connection failed"
-msgstr "Connection failed"
-
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Unable to create new connection."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Could not load public key"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Could not load public key"
+
 msgid "Out of memory"
 msgstr "Out of memory"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Cannot initialise SILC Client connection"
 
 #, fuzzy
@@ -9514,7 +9590,7 @@ msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Creating SILC key pair..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9608,6 +9684,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Error during connecting to SILC Server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
@@ -9648,7 +9727,8 @@ msgstr "Failure: Invalid cookie"
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Cannot initialise SILC Client connection"
 
 #, fuzzy
@@ -9656,32 +9736,29 @@ msgid "John Noname"
 msgstr "Last name:"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Could not load public key"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Could not send"
-
-msgid "Could not connect"
-msgstr "Could not connect"
+msgid "Unable to create connection"
+msgstr "Unable to create new connection."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Unknown error"
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "Couldn't create socket"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Unable to resolve hostname."
+msgid "Unable to create listen socket"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "IRC nicks may not contain whitespace"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Option နည္းနည္းပဲ ပ္ရပာ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9722,177 +9799,70 @@ msgstr "AP User"
 msgid "Auth Domain"
 msgstr "Automatic"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Looking up %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Connect to %s failed"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Signon: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Unable to write file %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Unable to read file %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Message too long, last %s bytes truncated."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s not currently logged in."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Warning of %s not allowed."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "A message has been dropped, you are exceeding the server speed limit."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat in %s is not available."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "You are sending messages too fast to %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "You missed an IM from %s because it was too big."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "You missed an IM from %s because it was sent too fast."
-
-#, c-format
-msgid "Failure."
-msgstr "Failure."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Too many matches."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Need more qualifiers."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Dir service temporarily unavailable."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Email lookup restricted."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Keyword ignored."
-
-#, c-format
-msgid "No keywords."
-msgstr "No keywords."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "User has no directory information."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Country not supported."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Failure unknown: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Incorrect nickname or password."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "The service is temporarily unavailable."
+#, fuzzy
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Your warning level is currently too high to log in."
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  List channels on this network"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"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."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "An unknown signon error has occurred: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "An unknown error, %d, has occurred.  Info: %s"
 
 #, fuzzy
-msgid "Invalid Groupname"
-msgstr "Invalid group"
-
-msgid "Connection Closed"
-msgstr "Connection Closed"
-
-msgid "Waiting for reply..."
-msgstr "Waiting for reply..."
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC has come back from its pause. You may now send messages again."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
 
-msgid "Password Change Successful"
-msgstr "Password Change Successful"
+#, fuzzy
+msgid "Pager server"
+msgstr "Proxy Server"
 
-msgid "_Group:"
-msgstr "_Group:"
+msgid "Pager port"
+msgstr "Pager port"
 
-msgid "Get Dir Info"
-msgstr "Get Dir Info"
+#, fuzzy
+msgid "File transfer server"
+msgstr "File transfer host"
 
-msgid "Set Dir Info"
-msgstr "Set Dir Info"
+msgid "File transfer port"
+msgstr "File transfer port"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Could not open %s for writing!"
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Chat Room List Url"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "File transfer failed; other side probably cancelled."
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
 
-msgid "Could not connect for transfer."
-msgstr "Could not connect for transfer."
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Chat Room List Url"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat server"
+msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "Save Icon As..."
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s requests you to send them a file"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9904,11 +9874,11 @@ msgstr "%s requests you to send them a file"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC Protocol Plugin"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9933,6 +9903,30 @@ msgstr "%s has (retroactively) denied your request to add them to your list."
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Unable to make SSL connection to server."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Incorrect nickname or password."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9964,11 +9958,12 @@ msgstr "Your account is locked, please log in to the Yahoo! website."
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Could not add buddy to server list"
 
 #, c-format
@@ -9976,23 +9971,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Invalid response from server."
 
-msgid "Connection problem"
-msgstr "Connection problem"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Conversations with %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10047,9 +10035,8 @@ msgstr "Environmental Setting ကိုပဲသံုးမယ္‌"
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Active which ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Join whom in chat?"
@@ -10064,83 +10051,15 @@ msgstr "Join user in chat..."
 msgid "Open Inbox"
 msgstr ""
 
-#, fuzzy
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  List channels on this network"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy Server"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japan Pager host"
-
-msgid "Pager port"
-msgstr "Pager port"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "File transfer host"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japan File transfer host"
-
-msgid "File transfer port"
-msgstr "File transfer port"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Chat Room List Url"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Chat Room List Url"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Unable to connect."
+
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
@@ -10148,6 +10067,10 @@ msgstr "Unable to establish file descriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Offering to send %s to %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Write error"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
@@ -10194,14 +10117,9 @@ msgstr "Cool Link 3"
 msgid "Last Update"
 msgstr "Last Updated"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "User information for %s unavailable"
-
 #, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
@@ -10274,21 +10192,19 @@ msgstr "Voices"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Connection problem"
+
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
 msgid "User Rooms"
 msgstr "User Rooms"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Connection problem with the YCHT server."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "You were disconnected from the server."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10421,31 +10337,21 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Unable to create socket"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Unable to send message: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Proxy connection error %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Error joining chat %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Unable to resolve hostname."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10542,10 +10448,6 @@ msgstr "Do Not Disturb"
 msgid "Extended away"
 msgstr "Extended Away"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Mobile Phone"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10587,20 +10489,6 @@ msgstr "%s is no longer idle"
 msgid "%x %X"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr ""
-"Error reading %s: \n"
-"%s.\n"
-
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"An error was encountered parsing your buddy list.  It has not been loaded, "
-"and the old file has been moved to blist.xml~."
-
 msgid "Calculating..."
 msgstr "Calculating..."
 
@@ -10708,6 +10596,20 @@ msgstr "Connection Closed"
 msgid "Address already in use."
 msgstr "That file already exists"
 
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"Error reading %s: \n"
+"%s.\n"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has been moved to blist.xml~."
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "Instant Messagers"
@@ -10757,10 +10659,9 @@ msgstr "Mail အသစ္‌ အခ္ယက္‌ေပးခ္ရင္း"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Options"
+#, fuzzy
+msgid "_Advanced"
+msgstr "(_C) မလုပ္‌ေတာ့ဘူး"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10796,9 +10697,6 @@ msgstr "ေသသေခ္ယာခ္ယာ အနီးကပ္‌က္ရ�
 msgid "you can see the butterflies mating"
 msgstr "လိပ္‌ပ္ရာမ္ယား မိတ္‌လိုက္‌ေနသည္‌ကို ေတ္ဝ့နိုင္‌ပာတယ္‌"
 
-msgid "Proxy Options"
-msgstr "Proxy Options"
-
 msgid "Proxy _type:"
 msgstr "(_t) Proxy အမ္ယိုးအစား :"
 
@@ -10829,8 +10727,8 @@ msgid "Create _this new account on the server"
 msgstr ""
 
 #, fuzzy
-msgid "_Advanced"
-msgstr "(_C) မလုပ္‌ေတာ့ဘူး"
+msgid "_Proxy"
+msgstr "Proxy မသံုးပာ"
 
 #, fuzzy
 msgid "Enabled"
@@ -10869,16 +10767,17 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Room List"
+msgid "A_ccount"
+msgstr "Account:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "သင္‌ဝင္‌ေရာက္‌မည့္ chat ရဲ့ သင့္ေတာ္‌မည့္ အခ္ယက္‌အလက္‌မ္ယားကို ထည့္ပာ \n"
 
-msgid "_Account:"
-msgstr "_Account:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Room List"
 
 #, fuzzy
 msgid "_Block"
@@ -10898,6 +10797,17 @@ msgid "I_M"
 msgstr "I_M"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "Chat ထပ္‌ထည့္မယ္‌"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Video Chat"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "(_S) ဖိုင္‌ပို့မယ္‌"
 
@@ -10909,7 +10819,11 @@ msgid "View _Log"
 msgstr "(_L) log ကိုက္ရည့္မယ္‌"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Not allowed when offline"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Not allowed when offline"
 
 msgid "_Alias..."
@@ -11055,6 +10969,10 @@ msgid "/Tools/_Certificates"
 msgstr "/Tools/(_e) စိတ္‌က္ရိုက္‌မ္ယား"
 
 #, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Tools/(_A) အဝေး"
+
+#, fuzzy
 msgid "/Tools/Plu_gins"
 msgstr "/Tools/Plugin Actions"
 
@@ -11064,10 +10982,6 @@ msgstr "/Tools/(_e) စိတ္‌က္ရိုက္‌မ္ယား"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Tools/(_A) အဝေး"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/(_F) ဖိုင္‌ အဝင္‌အထ္ဝက္‌"
 
@@ -11200,8 +11114,8 @@ msgstr "Manual"
 msgid "By status"
 msgstr "By status"
 
-msgid "By log size"
-msgstr "By log size"
+msgid "By recent log activity"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "%s disconnected"
@@ -11219,6 +11133,9 @@ msgstr "(_R) ပ္ရန္‌လည္‌ ဆက္‌သ္ဝယ္‌မယ
 msgid "Re-enable"
 msgstr "Register New Jabber Account"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s came back"
@@ -11318,6 +11235,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Alias:"
 
+msgid "_Group:"
+msgstr "_Group:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11356,6 +11276,120 @@ msgstr "/_Tools"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Background colour"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Do you want to add this buddy to your buddy list?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Logged out"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Background colour"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "(_E) ဖ္ရန့္ခ္ယလိုက္‌မယ္‌"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "(_C) ပ္ရန္‌စုလိုက္‌မယ္‌"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Shortcuts"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Away"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Mood"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Get information on the selected buddy"
+
+msgid "Message Text"
+msgstr "Message Text"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Message Text"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s အတ္ဝက္‌ အခ္ယက္‌အလက္‌တ္ဝေကို ပ္ရောင္းမယ္‌"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11377,14 +11411,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
@@ -11415,7 +11441,7 @@ msgid "Get Away Message"
 msgstr "Away Message အသစ္‌"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Last name:"
 
 msgid "Unable to save icon file to disk."
@@ -11464,6 +11490,22 @@ msgstr "/Conversation/_Save As..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/Clear"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversation/View _Log"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
@@ -11544,6 +11586,18 @@ msgstr "/_Conversation"
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversation/_Close"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversation/View Log"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversation/_Close"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
@@ -11744,6 +11798,9 @@ msgstr "Address"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "support"
 
@@ -11879,6 +11936,10 @@ msgid "Hungarian"
 msgstr "Hungarian"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Macedonian"
 
@@ -11897,6 +11958,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "Current Translators"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "Opera"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "Banned"
 
@@ -11919,6 +11984,10 @@ msgid "Macedonian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "Macedonian"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norwegian"
 
@@ -11977,6 +12046,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "Swedish"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Terminal"
@@ -12028,8 +12100,25 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
 
 #, fuzzy
@@ -12311,7 +12400,7 @@ msgid "Hyperlink visited color"
 msgstr "Hyperlink colour"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Colour to draw hyperlinks."
 
 #, fuzzy
@@ -12351,15 +12440,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Notification Removal"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Mail အသစ္‌ အခ္ယက္‌ေပးခ္ရင္း"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12372,15 +12468,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Mail အသစ္‌ အခ္ယက္‌ေပးခ္ရင္း"
 
-msgid "_Copy Email Address"
-msgstr "_Copy Email Address"
-
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
-
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12413,11 +12500,9 @@ msgstr "Error saving image: %s"
 msgid "Save Image"
 msgstr "Save Image"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12508,10 +12593,6 @@ msgid "Font Face"
 msgstr "Font Face"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Background colour"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Foreground font colour"
 
@@ -12645,6 +12726,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12662,6 +12744,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12693,16 +12776,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Paging"
 
-#, fuzzy
-msgid "Open All Messages"
-msgstr "Send Message"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
 
 #, fuzzy
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "Calling..."
+msgstr "Calculating..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12732,6 +12826,35 @@ msgid ""
 msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
+#, fuzzy
+msgid "No message"
+msgstr "(1 message)"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "Send Message"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "New Buddy Pounce"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12785,11 +12908,18 @@ msgstr ""
 msgid "Select a file"
 msgstr "Select a file"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Edit Buddy Pounce"
+
 #. Create the "Pounce on Whom" frame.
 #, fuzzy
 msgid "Pounce on Whom"
 msgstr "Pounce Who"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
@@ -12870,7 +13000,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr "Pounce When"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Buddy starts _typing"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "User is typing..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Si_gn on"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "Retur_n from idle"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "_Return from away"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Ping"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Sign _off"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s became idle"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "When away"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Send a _message"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Unknown pounce event. Please report this!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Failed to store image: %s\n"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12894,6 +13075,12 @@ msgstr "Shortcuts"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Conversations with %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "ဘော္ဒာ စာရင္း"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
@@ -12906,7 +13093,7 @@ msgid "On unread messages"
 msgstr "Send a _message"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM Conversation Windows"
 
 #, fuzzy
@@ -12916,6 +13103,10 @@ msgstr "Close conversation"
 msgid "When away"
 msgstr "When away"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM Conversation Windows"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12980,10 +13171,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "(_F) messages ရောက္‌လာက windows ကို‌ flash လုပ္‌ပ္ရပာ"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM Conversation Windows"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13019,15 +13206,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Cannot get user information"
 
-#, fuzzy
-msgid "ST_UN server:"
-msgstr "_Server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Autodetect IP Address"
 
 msgid "Public _IP:"
@@ -13050,6 +13233,10 @@ msgstr "_Start Port:"
 msgid "_End port:"
 msgstr "_End Port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy Server"
@@ -13079,6 +13266,10 @@ msgstr "Proxy Server"
 msgid "No proxy"
 msgstr "No proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_User:"
 
@@ -13249,14 +13440,14 @@ msgid "Auto-away"
 msgstr "Auto-away"
 
 #, fuzzy
-msgid "Change status when _idle"
-msgstr "Set away _when idle"
-
-#, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes before setting away:"
 
 #, fuzzy
+msgid "Change status when _idle"
+msgstr "Set away _when idle"
+
+#, fuzzy
 msgid "Change _status to:"
 msgstr "Change Address To:"
 
@@ -13414,29 +13605,19 @@ msgstr "(_v) သိမ္းမယ္။ ပ္ရီးရင္‌ သံု�
 msgid "Status for %s"
 msgstr "Status: %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Insert smiley"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Public key file"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Please enter a new name for the selected group."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Insert smiley"
@@ -13446,21 +13627,29 @@ msgid "Add Smiley"
 msgstr "Smile!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "Save Image"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "Shortcuts"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Smile!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Shortcuts"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "ေဘာ္ဒာ ရ္ဝေးမယ္‌"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13550,8 +13739,8 @@ msgid "Cannot send launcher"
 msgstr "Cannot send file"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13586,6 +13775,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "_Open Link in:"
+
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
+
+msgid "_Copy Email Address"
+msgstr "_Copy Email Address"
+
+#, fuzzy
 msgid "Save File"
 msgstr "Save File..."
 
@@ -13689,6 +13888,78 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Server address"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Enter a Conference Server"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Select a conference server to query"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online Services"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send Buddy List"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "When away"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Search for:"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Sound Selection"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Description:</b> Spooky"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Set Dir Info"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "User does not exist"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Set Dir Info"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Buddy is idle:"
 
@@ -14098,7 +14369,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14214,12 +14485,6 @@ msgstr ""
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Hyperlink colour"
@@ -14232,6 +14497,10 @@ msgstr "Hyperlink colour"
 msgid "Highlighted Message Name Color"
 msgstr "Send Message"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Notification Removal"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14266,38 +14535,27 @@ msgstr "Interface Options"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ignore c_olours"
+msgid "Disable Typing Notification Text"
+msgstr "Mail အသစ္‌ အခ္ယက္‌ေပးခ္ရင္း"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin File Control"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Close"
 
 #, fuzzy
 msgid "Fonts"
 msgstr "Accounts"
 
 #, fuzzy
+msgid "Miscellaneous"
+msgstr "Miscellaneous error"
+
+#, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin File Control"
 
@@ -14388,7 +14646,7 @@ msgstr "IM Conversation Windows"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14441,6 +14699,113 @@ msgstr "Text replacement"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Not logged in"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s logged out."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Chat န္ဟင့္ဆက္‌သ္ဝယ္‌"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignore"
+
+#, fuzzy
+msgid "Founder"
+msgstr "hour"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Authorisation Given"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Error"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Request ambiguous"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Warning Level"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Chat Room List Url"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Save Icon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin File Control"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Account Info"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "ဘော္ဒာ စာရင္း"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "ဘော္ဒာ စာရင္း"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin File Control"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin File Control"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14613,10 +14978,6 @@ msgid "Only when docked"
 msgstr ""
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "(_F) messages ရောက္‌လာက windows ကို‌ flash လုပ္‌ပ္ရပာ"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "Login Options"
 
@@ -14624,9 +14985,10 @@ msgstr "Login Options"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Windows Pidgin."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Options specific to Windows Pidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14668,6 +15030,518 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "socket ဖ္ဝင့္လို့ မရပာ"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Unable to read socket"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Connection failed"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server has disconnected"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Read error"
+#~ msgstr "Read error"
+
+#~ msgid "Write error"
+#~ msgstr "Write error"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Set Dir Info"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Extended Address"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Alias Chat"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "User has no directory information."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Command"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Registration Error"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Location"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "ေဘာ္‌ဒာရဲ့ အခ္ရေအနေကို အသိပေးခ္ရင္း"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Unsupported Version"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Organisation"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capabilities"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Username"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM with Key Exchange"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Email Address"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Set Profile"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Live Video"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Message received"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Public Key Babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "User Options"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian Encryption"
+
+#~ msgid "Read Error"
+#~ msgstr "Read Error"
+
+#, fuzzy
+#~ msgid "Failed to connect to server."
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Queue full"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Unable to parse message"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login failed (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Unable to connect to server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "You have been logged out because you logged in at another workstation."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error: SSL support is not installed."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Incorrect password."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Could Not Connect"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Invalid Username"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Cannot get server information"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Couldn't connect to host"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Error while reading from socket."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Unable to connect to server"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Could not send"
+
+#~ msgid "Could not connect"
+#~ msgstr "Could not connect"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Couldn't create socket"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Incorrect password."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan Pager host"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan File transfer host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "You were disconnected from the server."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server requires SSL for login"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM Conversation Windows"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Please enter a new name for the selected group."
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Active which ID?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ignore c_olours"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "(1 message)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Please enter the name of the user you wish to invite, along with an "
+#~ "optional invite message."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Unable To Retrieve Buddy List"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Add Buddy"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Cannot get server information"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "Read error"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "You were disconnected from the server."
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Connect server"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "Failed to join chat"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Looking up %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Connect to %s failed"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Signon: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Unable to write file %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Unable to read file %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Message too long, last %s bytes truncated."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s not currently logged in."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Warning of %s not allowed."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Chat in %s is not available."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "You are sending messages too fast to %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "You missed an IM from %s because it was too big."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "You missed an IM from %s because it was sent too fast."
+
+#~ msgid "Failure."
+#~ msgstr "Failure."
+
+#~ msgid "Too many matches."
+#~ msgstr "Too many matches."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Need more qualifiers."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Dir service temporarily unavailable."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Email lookup restricted."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Keyword ignored."
+
+#~ msgid "No keywords."
+#~ msgstr "No keywords."
+
+#~ msgid "User has no directory information."
+#~ msgstr "User has no directory information."
+
+#~ msgid "Country not supported."
+#~ msgstr "Country not supported."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Failure unknown: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Incorrect nickname or password."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "The service is temporarily unavailable."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Your warning level is currently too high to log in."
+
+#~ 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 ""
+#~ "You have been connecting and disconnecting too frequently.  Wait ten "
+#~ "minutes and try again.  If you continue to try, you will need to wait "
+#~ "even longer."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "An unknown signon error has occurred: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "An unknown error, %d, has occurred.  Info: %s"
+
+#, fuzzy
+#~ msgid "Invalid Groupname"
+#~ msgstr "Invalid group"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Connection Closed"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Waiting for reply..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC has come back from its pause. You may now send messages again."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Password Change Successful"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Get Dir Info"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Set Dir Info"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Could not open %s for writing!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "File transfer failed; other side probably cancelled."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Could not connect for transfer."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Could not write file header.  The file will not be transferred."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Save Icon As..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s requests you to send them a file"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC Protocol Plugin"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "User information for %s unavailable"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Options"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxy Options"
+
+#~ msgid "By log size"
+#~ msgstr "By log size"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Open Link in Browser"
+
+#, fuzzy
+#~ msgid "ST_UN server:"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Save Image"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Shortcuts"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "(_F) messages ရောက္‌လာက windows ကို‌ flash လုပ္‌ပ္ရပာ"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "A folder with that name already exists"
 
@@ -14736,13 +15610,6 @@ msgstr ""
 #~ msgstr "ဒီ \"%s\" message ကို ဖယ္‌လိုက္‌ရတော့မ္ဟာလား"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "Users on %s: %s"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Send Message"
 
@@ -14881,9 +15748,6 @@ msgstr ""
 #~ msgid "Invalid screen name"
 #~ msgstr "Invalid Username"
 
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Unable to make SSL connection to server."
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "Too evil (sender)"
 
@@ -14944,10 +15808,6 @@ msgstr ""
 #~ msgstr "Users on %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Do you want to add this buddy to your buddy list?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "File operation error"
 
@@ -14956,10 +15816,6 @@ msgstr ""
 #~ msgstr "%s not currently logged in."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Error creating connection"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Unable to login to AIM"
 
@@ -15078,17 +15934,9 @@ msgstr ""
 #~ msgstr "Currently on"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Unable to connect to server"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Message:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Account:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "ဆက္‌သ္ဝယ္‌လို့ မရသောအမ္ဟားမ္ယားကို မပ္ရပာန္ဟင့္"
 
@@ -15244,13 +16092,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> Offline"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -15352,9 +16193,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "_Idle"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "Retur_n from idle"
-
 #~ msgid "Pounce Action"
 #~ msgstr "Pounce Action"
 
@@ -15646,12 +16484,12 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 
 #~ msgid "Pidgin - Save As..."
 #~ msgstr "Pidgin - Save As..."
@@ -15665,13 +16503,13 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, will "
-#~ "which result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "will which result in reduced functionality and features."
 
 #~ msgid "Unable to read"
 #~ msgstr "Unable to read"
@@ -15694,9 +16532,6 @@ msgstr ""
 #~ msgstr[0] "(%d message)"
 #~ msgstr[1] "(%d messages)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 message)"
-
 #, fuzzy
 #~ msgid "Default auto-away"
 #~ msgstr "Auto-away"
@@ -15799,9 +16634,6 @@ msgstr ""
 #~ msgid "Away title: "
 #~ msgstr "Away title: "
 
-#~ msgid "Buddy List Error"
-#~ msgstr "Buddy List Error"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Size of the expander arrow"
 
@@ -15933,9 +16765,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Send a message to the selected buddy"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Get information on the selected buddy"
-
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
 
@@ -16138,9 +16967,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Summary"
 
-#~ msgid "Message Text"
-#~ msgstr "Message Text"
-
 #~ msgid "Away Messages"
 #~ msgstr "Away Messages"
 
@@ -16198,12 +17024,12 @@ msgstr ""
 #~ msgstr "Unable to load preferences"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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."
 
 #~ msgid "Slightly less boring default"
@@ -16239,9 +17065,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Critical error in GG library\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Unable to ping server"
-
 #~ msgid "Send as message"
 #~ msgstr "Send as message"
 
@@ -16309,18 +17132,18 @@ msgstr ""
 #~ msgstr "Unable to access directory"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 
 #~ msgid "Directory Search"
 #~ msgstr "Directory Search"
@@ -16329,11 +17152,11 @@ msgstr ""
 #~ msgstr "Unable to access user profile."
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 
 #~ msgid "Pidgin encountered an error communicating with the ICQ server."
 #~ msgstr "Pidgin encountered an error communicating with the ICQ server."
@@ -16455,9 +17278,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s logged in."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s logged out."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -16475,9 +17295,6 @@ msgstr ""
 #~ "%s has invited %s to the chat room %s:\n"
 #~ "<b>%s</b>"
 
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Sorry, I ran out for a bit!"
-
 #~ msgid ""
 #~ "Unable to guess the image type based on the file extension supplied.  "
 #~ "Defaulting to PNG."
@@ -16501,12 +17318,6 @@ msgstr ""
 #~ "(There was an error converting this message.  Check the 'Encoding' option "
 #~ "in the Account Editor)"
 
-#~ msgid "Miscellaneous error"
-#~ msgstr "Miscellaneous error"
-
-#~ msgid "Initiate Chat"
-#~ msgstr "Initiate Chat"
-
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr "Unknown error when attempting to authorise with MSN login server."
 
diff --git a/po/nb.po b/po/nb.po
index 7b222bc182..18ba2820f7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-24 09:57-0500\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-24 18:47+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -378,8 +378,8 @@ msgstr "Ny lynmelding"
 
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"Skriv inn brukernavnet eller aliaset på den personen du vil sende "
-"lynmelding til."
+"Skriv inn brukernavnet eller aliaset på den personen du vil sende lynmelding "
+"til."
 
 msgid "Channel"
 msgstr "Kanal"
@@ -613,19 +613,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Send til"
 
-msgid "Invite message"
-msgstr "Invitasjonsbeskjed"
-
-msgid "Invite"
-msgstr "Inviter"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Skriv inn navnet på brukeren som du vil invitere, \n"
-"og en eventuell invitasjonsbeskjed."
-
 msgid "Conversation"
 msgstr "Samtale"
 
@@ -850,8 +837,8 @@ msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"Lynmeldinger vil bare bli logget om \"Logg alle lynmeldinger\" har "
-"blitt slått på."
+"Lynmeldinger vil bare bli logget om \"Logg alle lynmeldinger\" har blitt "
+"slått på."
 
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
@@ -882,6 +869,41 @@ msgstr "Alle samtaler"
 msgid "System Log"
 msgstr "Systemlogg"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Beregner..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Godta"
+
+msgid "Reject"
+msgstr "Avslå"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Du har forlatt kanalen%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "E-poster"
 
@@ -916,6 +938,9 @@ msgstr "Fortsett"
 msgid "IM"
 msgstr "Lynmelding"
 
+msgid "Invite"
+msgstr "Inviter"
+
 msgid "(none)"
 msgstr "(uten navn)"
 
@@ -1118,7 +1143,6 @@ msgstr "%s er borte. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s har sendt deg en beskjed. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukjent varslingshendelse. Vennligst rapporter dette!"
 
@@ -1528,6 +1552,28 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Lastlog tillegg."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "Melodiens nettadresse"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "kontoer"
 
@@ -1629,13 +1675,6 @@ msgstr "Aksepter sertifikat for %s?"
 msgid "SSL Certificate Verification"
 msgstr "SSL Sertifikat Verifisering"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Godta"
-
-msgid "Reject"
-msgstr "Avslå"
-
 msgid "_View Certificate..."
 msgstr "_Se på sertfikat..."
 
@@ -1737,6 +1776,8 @@ msgstr "+++ %s logget på"
 msgid "+++ %s signed off"
 msgstr "+++ %s logget av"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -1783,6 +1824,18 @@ msgstr "%s forlot rommet."
 msgid "%s left the room (%s)."
 msgstr "%s forlot rommet (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Innviter til Konferanse"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Skriv inn navnet på brukeren som du vil invitere, og en eventuell "
+"invitasjonsbeskjed."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Feilet i å få tilkobling: %s"
@@ -2128,6 +2181,10 @@ msgstr "<font color=\"red\"><b>Klarte ikke lese fil: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Feil: kunne ikke koble til"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Du bruker %s, men dette tillegget krever %s."
@@ -2528,9 +2585,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Inkluderer andre lynmeldingsklienters logger i logg-viseren."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2586,8 +2644,9 @@ msgstr "Emulering av avlogget-beskjed"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Lagre beskjeder sendt til en avlogget bruker som pounce."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Resten av beskjedene vil bli lagret som varsling. Du kan forandre/slette "
@@ -2619,6 +2678,32 @@ msgstr "Lagre avloggede beskjeder som varsling"
 msgid "Do not ask. Always save in pounce."
 msgstr "Ikke spør. Alltid lagre som varsling."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Oppgi passord"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2814,14 +2899,16 @@ msgstr ""
 "Klarte ikke finne en ActiveTCL installasjon. Om du ønsker å bruke TCL "
 "tillegg, installer ActiveTCL fra http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Fant ikke verktøysamlingen til Apple Bonjour for Windows. Du finner flere "
 "opplysninger på adressa http://d.pidgin.im/BonjourWindows."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Klarte ikke lage ny tilkobling\n"
 
 msgid ""
@@ -2875,14 +2962,21 @@ msgstr "%s har lukket samtalen."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Klarte ikke sende beskjeden, samtalen kunne ikke startes."
 
-msgid "Cannot open socket"
-msgstr "Klarte ikke åpne endepunkt"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Klarte ikke lage endepunkt:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Klarte ikke binde endepunkt til port"
 
-msgid "Could not listen on socket"
-msgstr "Klarte ikke lytte på endepunkt"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Klarte ikke lage endepunkt:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Feil i kommunikasjonen med lokal mDNSResponder."
@@ -2929,13 +3023,16 @@ msgstr "Lagre kontaktliste ..."
 msgid "Load buddylist from file..."
 msgstr "Last inn kontaktliste fra fil..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Fyll inn registrerings feltene."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Passordene stemmer ikke overens."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Klarte ikke registere ny konto. En feil oppsto.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2947,14 +3044,15 @@ msgstr "Registreringen var vellykket!"
 msgid "Password"
 msgstr "Passord"
 
-msgid "Password (retype)"
-msgstr "Passord (gjenta)"
+msgid "Password (again)"
+msgstr "Passord (igjen)"
 
-msgid "Enter current token"
-msgstr "Skriv inn gjeldende symbol"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Gjeldende symbol"
+#, fuzzy
+msgid "Captcha"
+msgstr "Captcha-bilde"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrere ny Gadu-Gadu-konto"
@@ -3007,6 +3105,15 @@ msgstr "Endring av passord vellykket!"
 msgid "Current password"
 msgstr "Nåværende passord"
 
+msgid "Password (retype)"
+msgstr "Passord (gjenta)"
+
+msgid "Enter current token"
+msgstr "Skriv inn gjeldende symbol"
+
+msgid "Current token"
+msgstr "Gjeldende symbol"
+
 #
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Skriv inn ditt nåværende passord og ditt nye passord for UIN: "
@@ -3021,6 +3128,7 @@ msgstr "Velg en samtale for kontakt: %s"
 msgid "Add to chat..."
 msgstr "Legg til samtale..."
 
+#. Global
 msgid "Available"
 msgstr "Tilgjengelig"
 
@@ -3054,8 +3162,8 @@ msgstr "Ingen passende brukere funnet."
 msgid "There are no users matching your search criteria."
 msgstr "Skriv inn ditt nye passord."
 
-msgid "Unable to read socket"
-msgstr "Klarte ikke lese endepunkt"
+msgid "Unable to read from socket"
+msgstr "Klarte ikke lese fra endepunkt"
 
 msgid "Buddy list downloaded"
 msgstr "Kontaktliste nedlastet"
@@ -3069,8 +3177,14 @@ msgstr "Kontaktliste lastet opp"
 msgid "Your buddy list was stored on the server."
 msgstr "Kontaktlisten ble lagret på serveren."
 
-msgid "Connection failed."
-msgstr "Tilkobling feilet."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Koblet til"
+
+msgid "Connection failed"
+msgstr "Tilkobling feilet"
 
 msgid "Add to chat"
 msgstr "Legg til samtale"
@@ -3078,13 +3192,23 @@ msgstr "Legg til samtale"
 msgid "Chat _name:"
 msgstr "Samtale _navn:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Kan ikke koble til tjener."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Kobler til"
+
 msgid "Chat error"
 msgstr "Samtalefeil"
 
 msgid "This chat name is already in use"
 msgstr "Dette samtalenavnet er allerede i bruk"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Ikke koblet til tjeneren."
 
 msgid "Find buddies..."
@@ -3126,6 +3250,10 @@ msgstr "Populær Polsk Lynmeldingsklient"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Bruker"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Henter tjener"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ukjent kommando: %s"
@@ -3140,7 +3268,8 @@ msgstr "Intet tema for kanalen"
 msgid "File Transfer Failed"
 msgstr "Filoverføring feilet"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Klarte ikke åpne port for lytting."
 
 msgid "Error displaying MOTD"
@@ -3156,8 +3285,18 @@ msgstr "Det er ingen MOTD assosiert med denne tilkoblingen."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Tjeneren har koplet fra"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Mistet forbindelse med server:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Vis MOTD"
@@ -3168,25 +3307,24 @@ msgstr "_Kanal:"
 msgid "_Password:"
 msgstr "_Passord:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-kallenavn kan ikke inneholde mellomrom"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Kobler til"
-
 msgid "SSL support unavailable"
 msgstr "SSL-støtte utilgjengelig"
 
-msgid "Couldn't create socket"
-msgstr "Klarte ikke opprette endepunkt"
-
-msgid "Couldn't connect to host"
+msgid "Unable to connect"
 msgstr "Klarte ikke koble til"
 
-msgid "Read error"
-msgstr "Lesefeil"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Kan ikke koble til %s"
+
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Tjeneren lukket forbindelsen."
 
 msgid "Users"
 msgstr "Brukere"
@@ -3367,6 +3505,17 @@ msgstr ""
 "Ditt valgte kontonavn ble avvist av tjeneren. Sannsynligvis inneholder det "
 "ugyldige tegn."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Dette samtalenavnet er allerede i bruk"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Kallenavn"
+
 msgid "Cannot change nick"
 msgstr "Kan ikke endre kallenavn"
 
@@ -3600,12 +3749,14 @@ msgstr "Ad-hoc kommando feilet"
 msgid "execute"
 msgstr "utfør"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Tjeneren krever TLS/SSL for å logge inn, men støtte for dette ble ikke "
 "funnet."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Du krever kryptering, men ingen støtte for TLS/SSL ble funnet."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3624,18 +3775,55 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Identitetsbekreftelse i ren tekst"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autentisering feilet"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Ugyldig svar fra tjener."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Tjeneren bruker ikke noen av de støttede autentiseringsmetodene"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+"Du krever kryptering, men det er ikke støtte for det på denne serveren."
+
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring fra tjener"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL-feil"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Ingen grunn spesifisert"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Denne versjonen er ikke støttet"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Klarte ikke etablere kontakt med serveren:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Klarte ikke etablere kontakt med serveren:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Klarte ikke lage ny tilkobling"
+
 msgid "Full Name"
 msgstr "Fullt navn"
 
@@ -3702,161 +3890,9 @@ msgstr "Klient"
 msgid "Operating System"
 msgstr "Operativsystem"
 
-msgid "Last Activity"
-msgstr "Siste aktivitet"
-
-msgid "Service Discovery Info"
-msgstr "Tjenesteoppdagingsinfo"
-
-msgid "Service Discovery Items"
-msgstr "Service Discovery Items"
-
-msgid "Extended Stanza Addressing"
-msgstr "Utvida Stanza-adressering"
-
-msgid "Multi-User Chat"
-msgstr "Flerbrukersamtale"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Brukeren har ingen kataloginformasjon"
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band Bytestreams"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc Kommandoer"
-
-msgid "PubSub Service"
-msgstr "PubSub Service"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreams"
-
-msgid "Out of Band Data"
-msgstr "Out of Band Data"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-# må setjast om seinare
-msgid "In-Band Registration"
-msgstr "Samtidsegistrering"
-
-msgid "User Location"
-msgstr "Brukerens sted"
-
-msgid "User Avatar"
-msgstr "Bruker Avatar"
-
-msgid "Chat State Notifications"
-msgstr "Samtaletilstandsvarsling"
-
-msgid "Software Version"
-msgstr "Programvareversjon"
-
-msgid "Stream Initiation"
-msgstr "Strømoppstart"
-
-msgid "File Transfer"
-msgstr "Filoverføring"
-
-msgid "User Mood"
-msgstr "Brukerens tilstander"
-
-msgid "User Activity"
-msgstr "Brukerens aktivitet"
-
-msgid "Entity Capabilities"
-msgstr "Entitetsegenskaper"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Krypterte formidlinger av økt"
-
-msgid "User Tune"
-msgstr "Brukerens melodi"
-
-msgid "Roster Item Exchange"
-msgstr "Listeelement-utveksling"
-
-# Gjer betre
-msgid "Reachability Address"
-msgstr "Adresse en kan nåes på"
-
-msgid "User Profile"
-msgstr "Brukers profil"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle-audio"
-
-msgid "User Nickname"
-msgstr "Brukers kallenavn"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle-video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Beskjedkvitteringer"
-
-# Veldig, veldig fuzzy....
-msgid "Public Key Publishing"
-msgstr "Offentlig nøkkelpublisering"
-
-msgid "User Chatting"
-msgstr "Bruker som snakker"
-
-msgid "User Browsing"
-msgstr "Bruker som surfer"
-
-msgid "User Gaming"
-msgstr "Bruker som spiller"
-
-msgid "User Viewing"
-msgstr "Bruker som ser på"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza-kryptering"
-
-msgid "Entity Time"
-msgstr "Enhetstid"
-
-msgid "Delayed Delivery"
-msgstr "Forsinket Levering"
-
-msgid "Collaborative Data Objects"
-msgstr "Samarbeidende Data Objekter"
-
-msgid "File Repository and Sharing"
-msgstr "Fil Oppbevaring og Deling"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN Service Discovery for Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Forenklet formidling av kryptert økt"
-
-msgid "Hop Check"
-msgstr "Hop Sjekk"
-
-msgid "Capabilities"
-msgstr "Evner"
+#, fuzzy
+msgid "Local Time"
+msgstr "Lokal fil:"
 
 msgid "Priority"
 msgstr "Prioritet"
@@ -3864,6 +3900,14 @@ msgstr "Prioritet"
 msgid "Resource"
 msgstr "Ressurs"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Logget inn"
+
 msgid "Middle Name"
 msgstr "Mellomnavn"
 
@@ -4034,29 +4078,26 @@ msgstr "Velg en konferanseserver å spørre"
 msgid "Find Rooms"
 msgstr "Finn samtalerom"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-"Du krever kryptering, men det er ikke støtte for det på denne serveren."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
-msgid "Write error"
-msgstr "Feil ved skriving"
+#, fuzzy
+msgid "No users found"
+msgstr "Ingen passende brukere funnet."
 
-msgid "Ping timeout"
-msgstr "Tidsavbrudd for ping"
+#, fuzzy
+msgid "Roles:"
+msgstr "Rolle"
 
-msgid "Read Error"
-msgstr "Lesefeil"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Tidsavbrudd for ping"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Klarte ikke etablere kontakt med serveren:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Klarte ikke opprette endepunkt"
 
 msgid "Invalid XMPP ID"
 msgstr "Ugyldig XMPP ID"
@@ -4064,6 +4105,10 @@ msgstr "Ugyldig XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ugyldig XMPP ID. Domenet må være satt."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Klarte ikke koble til tjener."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrering av %s@%s vellykket"
@@ -4088,9 +4133,6 @@ msgstr "Registreringen var vellykket"
 msgid "Unregistration Failed"
 msgstr "Avregistrering feilet"
 
-msgid "Already Registered"
-msgstr "Du er allerede registrert"
-
 msgid "State"
 msgstr "Fylke/stat"
 
@@ -4103,6 +4145,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Dato"
 
+msgid "Already Registered"
+msgstr "Du er allerede registrert"
+
 msgid "Unregister"
 msgstr "Avregistrer"
 
@@ -4131,6 +4176,10 @@ msgstr "Registrere Ny Konto på %s"
 msgid "Change Registration"
 msgstr "Forandre Registrering"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Klarte ikke koble til tjener."
+
 msgid "Error unregistering account"
 msgstr "Feil ved avregistrering av konto"
 
@@ -4155,6 +4204,12 @@ msgstr "Tjener støtter ikke blokkering"
 msgid "Not Authorized"
 msgstr "Ikke godkjent"
 
+msgid "Mood"
+msgstr "Sinnsstemning"
+
+msgid "Now Listening"
+msgstr "Lytter nå"
+
 msgid "Both"
 msgstr "Begge"
 
@@ -4177,12 +4232,6 @@ msgstr "Ingen"
 msgid "Subscription"
 msgstr "Abonnement"
 
-msgid "Mood"
-msgstr "Sinnsstemning"
-
-msgid "Now Listening"
-msgstr "Lytter nå"
-
 msgid "Mood Text"
 msgstr "Sinnsstemningstekst"
 
@@ -4226,9 +4275,6 @@ msgstr "Passordet ditt har blitt endret."
 msgid "Error changing password"
 msgstr "Feil ved endring av passord"
 
-msgid "Password (again)"
-msgstr "Passord (igjen)"
-
 msgid "Change XMPP Password"
 msgstr "Endre XMPP-passord"
 
@@ -4422,18 +4468,24 @@ msgstr "Klarte ikke sparke brukeren %s"
 msgid "Unable to ping user %s"
 msgstr "Klarte ikke pinge brukeren %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Klarte ikke alarmere, fordi det er ingenting kjent med bruker %s."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Klarte ikke alarmere, fordi bruker %s kan være avlogget."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Klarer ikke alarmere fordi brukeren %s ikke støtter dette."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Alarmerer %s ..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4443,9 +4495,34 @@ msgstr "Alarm"
 msgid "%s has buzzed you!"
 msgstr "%s har alarmert deg!"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Alarmerer %s ..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Klarte ikke sende fil til %s, ugyldig JID"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Klarte ikke sende fil til %s - brukeren er ikke pålogget"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Klarte ikke sende fila til %s. Abonnerer ikke på brukernærvær"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Registrering feilet"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Velg hvilken ressurs av %s du ønskjer å senda fila til"
+
+msgid "Select a Resource"
+msgstr "Velg en ressurs"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Start gruppesamtale"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Endre innstillingene for et samtalerom."
@@ -4465,16 +4542,18 @@ msgstr "topic [nytt emne]:  Vis eller endre emnet."
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;bruker&gt; [grunn]:  Forby en bruker fra rommet."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "Knytt &lt;bruker&gt; &lt;eier|admin|medlem|utstøtt|ingen&gt;: Sett en "
 "brukers tilknyting til rommet."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "rolle &lt;user&gt; &lt;moderator|deltaker|besøkende|ingen&gt;: Sett en "
 "brukers rolle i rommet."
@@ -4539,6 +4618,9 @@ msgstr "Koble til tjener"
 msgid "File transfer proxies"
 msgstr "Filoverføringsproxyer"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4577,6 +4659,14 @@ msgstr "XML-parsefeil"
 msgid "Unknown Error in presence"
 msgstr "Ukjent feil i tilstedeværelse"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Klarte ikke bli med i gruppesamtale %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Feil i gruppesamtale %s"
+
 msgid "Create New Room"
 msgstr "Skap nytt samtalerom"
 
@@ -4593,13 +4683,32 @@ msgstr "_Konfigurer rom"
 msgid "_Accept Defaults"
 msgstr "_Aksepter standardinnstillinger"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Klarte ikke bli med i gruppesamtale %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Ingen grunn spesifisert"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Feil i gruppesamtale %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Du har blitt sparket ut fra %s: %s"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Sparket av %s: %s"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "En feil oppsto under åpningen av filen."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Filoverføring feilet"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Klarte ikke å åpne fil '%s': %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4624,9 +4733,6 @@ msgstr "Klarte ikke sende fila til %s. Abonnerer ikke på brukernærvær"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Velg hvilken ressurs av %s du ønskjer å senda fila til"
 
-msgid "Select a Resource"
-msgstr "Velg en ressurs"
-
 msgid "Edit User Mood"
 msgstr "Rediger brukertilstander"
 
@@ -4924,6 +5030,10 @@ msgstr "Andre kontakter"
 msgid "Non-IM Contacts"
 msgstr "Ikke-lynmeldingskontakter"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s har sendt deg en webcam invitasjon som enda ikke er støttet."
+
 msgid "Nudge"
 msgstr "Dytt"
 
@@ -5074,9 +5184,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "SSL-støtte kreves for MSN. Vennligst installer et støttet SSL-bibliotek."
 
-msgid "Failed to connect to server."
-msgstr "Klarte ikke koble til tjener."
-
 msgid "Error retrieving profile"
 msgstr "Klarte ikke hente profil"
 
@@ -5266,64 +5373,26 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID autentisering: Ugyldig svar"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s er ikke et gyldig navn på en gruppe."
-
-msgid "Unknown error."
-msgstr "Ukjent feil."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s på %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s har nettopp gitt deg en dytt!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Ukjent feil (%d)"
 
 msgid "Unable to add user"
 msgstr "Klarte ikke legge til bruker"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Følgende brukere mangler i din adressebok"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Klarte ikke legge til bruker på %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Klarte ikke blokkere brukeren på %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Klarte ikke tillate bruker på %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-"%s kunne ikke bli lagt til kontaktlista, fordi din kontaktliste er full."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s er ikke en gyldig passport-konto."
+msgid "Unknown error (%d)"
+msgstr "Ukjent feil (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Tjenesten Midlertidig Utilgjengelig."
+msgid "The following users are missing from your addressbook"
+msgstr "Følgende brukere mangler i din adressebok"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilbeskjeden ble ikke bli sendt fordi den var for lang."
 
-msgid "Unable to rename group"
-msgstr "Klarte ikke endre navn på gruppe"
-
-msgid "Unable to delete group"
-msgstr "Klarte ikke slette gruppe"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5366,9 +5435,6 @@ msgstr "Meldingen ble ikke sendt fordi en ukjent kodingsfeil oppstod."
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Meldingen ble ikke sendt fordi en ukjent feil oppstod."
 
-msgid "Unable to connect"
-msgstr "Klarte ikke koble til"
-
 msgid "Writing error"
 msgstr "Feil ved skriving"
 
@@ -5383,20 +5449,24 @@ msgstr ""
 "Tilkoblingsfeil fra %s tjener:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Vår protokoll er ikke støttet av tjeneren."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Feil under tolkning av HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Du ble logget av fordi du har logget på et annet sted."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tjenerene er midlertidig utilgjengelig.Vennligst prøv igjen senere."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN-tjenerne vil bli utilgjengelig en liten stund."
 
 #, c-format
@@ -5427,6 +5497,14 @@ msgstr "Sender informasjonskapsel"
 msgid "Retrieving buddy list"
 msgstr "Henter kontaktliste"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s har sendt deg en webcam invitasjon som enda ikke er støttet."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s har sendt deg en webcam invitasjon som enda ikke er støttet."
+
 msgid "Away From Computer"
 msgstr "Borte"
 
@@ -5468,14 +5546,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Meldingen kunne ikke bli sendt på grunn av en ukjent feil:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s har lagt deg til i kontaktlisten sin."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s har fjernet deg fra sin kontaktliste."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Slette kontakt fra adresseboka?"
 
@@ -5505,6 +5575,55 @@ msgid "MSN Protocol Plugin"
 msgstr "MSN-protokolltillegg"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s er ikke et gyldig navn på en gruppe."
+
+msgid "Unknown error."
+msgstr "Ukjent feil."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s på %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Klarte ikke legge til bruker på %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Klarte ikke blokkere brukeren på %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Klarte ikke tillate bruker på %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+"%s kunne ikke bli lagt til kontaktlista, fordi din kontaktliste er full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s er ikke en gyldig passport-konto."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Tjenesten Midlertidig Utilgjengelig."
+
+msgid "Unable to rename group"
+msgstr "Klarte ikke endre navn på gruppe"
+
+msgid "Unable to delete group"
+msgstr "Klarte ikke slette gruppe"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s har lagt deg til i kontaktlisten sin."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s har fjernet deg fra sin kontaktliste."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Ingen slik bruker: %s"
 
@@ -5533,6 +5652,8 @@ msgid "Lost connection with server"
 msgstr "Mistet forbindelsen med tjener"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nye e-post beskjeder"
 
@@ -5571,43 +5692,29 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Ugyldig svar fra tjener"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Koblet til"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokoll feil, kode %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Passordet ditt er på %d tegn. MySpaceIM godtar bare %d tegn. Gjør "
 "passordet ditt kortere på nettsiden http://profileedit.myspace.com/index.cfm?"
 "fuseaction=accountSettings.changePassword og prøv på nytt."
 
+msgid "Incorrect username or password"
+msgstr "Feil brukernavn eller passord"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-feil"
 
 msgid "Invalid input condition"
 msgstr "Ugyldig inndatabetingelse"
 
-msgid "Read buffer full (2)"
-msgstr "Lesemellomlager fullt (2)"
-
-msgid "Unparseable message"
-msgstr "Klarte ikke tolke beskjed"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Klarte ikke koble til vert: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Klarte ikke legge til kontakt"
 
@@ -5691,6 +5798,15 @@ msgstr "Antall venner"
 msgid "Client Version"
 msgstr "Klientversjon"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Vennligst gå til http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username og velg et brukernavn og prøv å logge inn igjen."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - brukernavn tilgjengelig"
 
@@ -5907,9 +6023,6 @@ msgstr "Kan ikke legge til degselv"
 msgid "Master archive is misconfigured"
 msgstr "Hovedarkiv er feil satt opp"
 
-msgid "Incorrect username or password"
-msgstr "Feil brukernavn eller passord"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Klarte ikke kjenne igjen verten til det brukernavnet du tastet inn"
 
@@ -5951,9 +6064,9 @@ msgstr "Brukeren er enten frakoplet, eller så er du blokkert"
 msgid "Unknown error: 0x%X"
 msgstr "Ukjent feil: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Pålogging feilet (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Klarte ikke pinge brukeren %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6057,9 +6170,6 @@ msgstr "GroupWise-konferanse %d"
 msgid "Authenticating..."
 msgstr "Autentiserer..."
 
-msgid "Unable to connect to server."
-msgstr "Kan ikke koble til tjener."
-
 msgid "Waiting for response..."
 msgstr "Venter på svar..."
 
@@ -6083,25 +6193,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Ønsker du å bli med i samtalen?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Du ble logget av fordi du har logget på med dette skjermnavnet et annet sted."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ser ut til å være  frakoplet, og mottok ikke meldingen du sendte."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Klarte ikke kople til tjener, skriv inn adressen til tjeneren du ønsker å "
 "kople til."
 
-msgid "Error. SSL support is not installed."
-msgstr "Feil: SSL-støtte er ikke installert."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Denne konferansen har blitt stengt, ingen flere meldinger kan bli sendt."
@@ -6125,24 +6229,33 @@ msgstr "Tjeneradresse"
 msgid "Server port"
 msgstr "Tjenerport"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Mottok uventet HTTP-svar fra tjener."
+
+#. username connecting too frequently
+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 ""
+"Du har koblet til og koblet fra for hurtig. Vent ti minutter og prøv igjen. "
+"Hvis du fortsetter å prøve nå, vil du måtte vente enda lenger."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Feil: kunne ikke koble til"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Klarte ikke ble med i samtalerom"
 
 msgid "Invalid chat room name"
 msgstr "Ugyldig samtaleromnavn"
 
-msgid "Server closed the connection."
-msgstr "Tjeneren lukket forbindelsen."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Mistet forbindelse med server:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Mottok ugyldige data over forbindelsen med tjeneren."
 
 #. *< type
@@ -6190,7 +6303,8 @@ msgstr "Mistet forbindelse til bruker:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Mottok ugyldig data på forbindelse med annen bruker."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Klarte ikke etablere en forbindelse med bruker."
 
 msgid "Direct IM established"
@@ -6390,21 +6504,15 @@ msgstr "Advarselsnivåer"
 msgid "Buddy Comment"
 msgstr "Kontakt Kommentar"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Klarte ikke koble til autentiseringstjener:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Klarte ikke koble til BOS server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Kan ikke koble til OIM server"
 
 msgid "Username sent"
 msgstr "Brukernavn sendt"
@@ -6416,53 +6524,63 @@ msgstr "Tilkoblet, informasjonskapsel sendt"
 msgid "Finalizing connection"
 msgstr "Fullfører tilkobling"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Får ikke til å logge inn: Klarte ikke logge på som %s fordi brukernavnet er "
 "ugyldig. Brukernavn må være en gyldig e-postadresse, eller begynna med en "
 "bokstav og bare inneholde bokstaver, tall og mellomrom, eller bare inneholde "
 "tall."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Ugyldig brukernavn."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Du kan bli frakoblet ganske snart. Hvis det skjer, sjekk %s for "
+"oppdateringer."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Klarte ikke å motta gyldig AIM-påloggingshash."
+
+msgid "Unable to get a valid login hash."
+msgstr "Klarte ikke å motta en gyldig påloggingshash."
+
+msgid "Received authorization"
+msgstr "Mottok godkjenning"
 
-msgid "Incorrect password."
-msgstr "Feil passord."
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Brukeren eksisterer ikke"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Kontoen din er frosset."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger-tjenesten er midlertidig utilgjengelig."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Klientversjonen av programmet er for gammel. Vennligst oppgrader på %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Du har koblet til og koblet fra for hurtig. Vent ti minutter og prøv igjen. "
 "Hvis du fortsetter å prøve nå, vil du måtte vente enda lenger."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Klientversjonen av programmet er for gammel. Vennligst oppgrader på %s"
-
-msgid "Could Not Connect"
-msgstr "Klarte ikke koble til"
-
-msgid "Received authorization"
-msgstr "Mottok godkjenning"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Den inntastede SecurID-nøkkelen er ugyldig."
 
 msgid "Enter SecurID"
@@ -6477,22 +6595,6 @@ msgstr "Tast inn det sekssifrede tallet fra displayet."
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Du kan bli frakoblet ganske snart. Hvis det skjer, sjekk %s for "
-"oppdateringer."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Klarte ikke å motta gyldig AIM-påloggingshash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Du kan bli frakoblet ganske snart. Sjekk %s for oppdateringer."
-
-msgid "Unable to get a valid login hash."
-msgstr "Klarte ikke å motta en gyldig påloggingshash."
-
 msgid "Password sent"
 msgstr "Passord sendt"
 
@@ -6635,7 +6737,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du har gått glipp av %hu beskjed fra %s, ingen grunn oppgitt."
 msgstr[1] "Du har gått glipp av %hu beskjeder fra %s, ingen grunn oppgitt."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Klarte ikke sende beskjed: %s"
@@ -6657,6 +6759,9 @@ msgstr "Pålogget siden"
 msgid "Member Since"
 msgstr "Medlem siden"
 
+msgid "Capabilities"
+msgstr "Evner"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -6838,9 +6943,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Fraværsbeskjeden er for lang."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6864,9 +6969,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Ugrupperte"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Klarte ikke legge til kontakten %s fordi du har for mange kontakter i "
@@ -6875,8 +6980,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(uten navn)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Klarte ikke legge til kontakten %s pga ukjent årsak."
 
 #, c-format
@@ -6919,8 +7024,8 @@ msgstr "_Utveksling:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"Ditt lynmeldingsbilde ble ikke sendt. Du kan ikke sende "
-"lynmeldingsbilder i AIM-samtalegrupper."
+"Ditt lynmeldingsbilde ble ikke sendt. Du kan ikke sende lynmeldingsbilder i "
+"AIM-samtalegrupper."
 
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
@@ -7009,6 +7114,7 @@ msgstr "_Søk"
 msgid "Set User Info (web)..."
 msgstr "Sett brukerinfo (nett) ..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Endre passord (nett)"
 
@@ -7038,6 +7144,10 @@ msgstr "Søk etter kontakter ved hjelp av e-postadresser..."
 msgid "Search for Buddy by Information"
 msgstr "Vennesøk etter informasjon"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Brukeren er ikke pålogget"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7228,6 +7338,38 @@ msgstr "Oppdater"
 msgid "Could not change buddy information."
 msgstr "Klarte ikke endre kontaktinformasjon."
 
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Note"
+msgstr "Merknad"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Endre kontaktmemo"
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "Endre"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Endre"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Tjeneren er opptatt"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u krever godkjenning"
@@ -7539,6 +7681,9 @@ msgstr "<p><b>Takk til</b>:<br>\n"
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>Nøyaktige testere</b>:<br>\n"
 
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Og, alle guttene på bakrommet ...</i><br>\n"
 
@@ -7614,7 +7759,8 @@ msgstr "Intervall vedlikeholdstilkobling (sekund)"
 msgid "Update interval (seconds)"
 msgstr "Oppdateringsintervall (sekund)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Klarte ikke dekryptere tjenersvaret"
 
 #, c-format
@@ -7639,9 +7785,6 @@ msgstr "Aktivering kreves"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Ukjent svarkode under innlogging (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Klarte ikke dekryptere tjenersvaret"
-
 msgid "Requesting captcha"
 msgstr "Spør etter tastetest («captcha»)"
 
@@ -7675,30 +7818,18 @@ msgstr ""
 "Ukjent feilkode under innlogging (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Klarte ikke koble til."
-
 msgid "Socket error"
 msgstr "Endepunktfeil"
 
-msgid "Unable to read from socket"
-msgstr "Klarte ikke lese fra endepunkt"
-
-msgid "Write Error"
-msgstr "Feil ved skriving"
-
-msgid "Connection lost"
-msgstr "Tilkobling mistet"
-
 msgid "Getting server"
 msgstr "Henter tjener"
 
 msgid "Requesting token"
 msgstr "Spør etter symbol"
 
-msgid "Couldn't resolve host"
-msgstr "Vertsoppslaget feilet"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Kan ikke koble til tjener."
 
 msgid "Invalid server or port"
 msgstr "Ugyldig tjener eller port"
@@ -7754,7 +7885,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun-kommando"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Klarte ikke dekryptere innloggingssvaret"
 
 msgid "Unknown LOGIN CMD"
@@ -7774,9 +7906,6 @@ msgstr "Filsending"
 msgid "%d canceled the transfer of %s"
 msgstr "%d avbrøt overføringen av %s"
 
-msgid "Connection closed (writing)"
-msgstr "Tilkoblingen lukket (skriver)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppetittel:</b> %s<br>"
@@ -7830,17 +7959,6 @@ msgstr "En Sametime administrator har satt følgende kunngjøring på tjeneren %
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime administratorkunngjøring"
 
-msgid "Connection reset"
-msgstr "Tilkobling nullstilt"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Feil ved lesing fra endepunkt: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Kan ikke koble til tjener"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Kunngjøring fra %s"
@@ -7863,6 +7981,9 @@ msgstr "Høytalere"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Filoverføring"
+
 #
 msgid "Supports"
 msgstr "Støtter"
@@ -8582,9 +8703,6 @@ msgstr "Organisasjon"
 msgid "Unit"
 msgstr "Enhet"
 
-msgid "Note"
-msgstr "Merknad"
-
 msgid "Join Chat"
 msgstr "Bli med i samtalegruppe"
 
@@ -8685,6 +8803,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Nettverksstatistikk"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping mislyktes"
 
@@ -8748,7 +8869,8 @@ msgstr "Ustøttet offentlig nøkkeltype"
 msgid "Disconnected by server"
 msgstr "Frakoplet av tjener"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Feil under tilkobling til SILC-tjener"
 
 msgid "Key Exchange failed"
@@ -8761,26 +8883,26 @@ msgstr ""
 "Fortsettelse av løsnet økt misslyktes. Trykk Kople til på nytt for å lage en "
 "ny forbindelse."
 
-msgid "Connection failed"
-msgstr "Tilkobling feilet"
-
 msgid "Performing key exchange"
 msgstr "Gjennomfører nøkkelutveksling"
 
-msgid "Unable to create connection"
-msgstr "Klarte ikke lage ny tilkobling"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Klarte ikke laste SILC nøkkelpar"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Kobler til SILC-tjener"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Klarte ikke laste SILC nøkkelpar"
+
 msgid "Out of memory"
 msgstr "Tom for minne"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Klarte ikke kjøre SILC-protokollen"
 
 msgid "Error loading SILC key pair"
@@ -9077,7 +9199,8 @@ msgstr "Signer og verifiser alle meldinger digitalt"
 msgid "Creating SILC key pair..."
 msgstr "Genererer SILC-nøkkelpar..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Genererer SILC-nøkkelpar\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9171,6 +9294,9 @@ msgstr "Tavle"
 msgid "No server statistics available"
 msgstr "Ingen tjenerstatistikk tilgjengelig"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Feil under tilkobling til SILC-tjener"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Feil: Versjonskonflikt, oppgrader din klient"
@@ -9212,30 +9338,27 @@ msgstr "Ugyldig informasjonskapsel"
 msgid "Failure: Authentication failed"
 msgstr "Autentisering feilet"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Kan ikke klargjøre SILC klientforbindelse"
 
 msgid "John Noname"
 msgstr "Ola Normann"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Klarte ikke laste inn SILC nøkkelparet: %s"
 
-msgid "Could not write"
-msgstr "Klarte ikke skrive"
-
-msgid "Could not connect"
-msgstr "Klarte ikke koble til"
+msgid "Unable to create connection"
+msgstr "Klarte ikke lage ny tilkobling"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Ukjent tjenersvar"
 
-msgid "Could not create listen socket"
-msgstr "Klarte ikke opprette lytteendepunkt"
-
-msgid "Could not resolve hostname"
-msgstr "Kan ikke finne datamaskinnavnet"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Klarte ikke opprette endepunkt"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-brukernavn kan ikke inneholde mellomrom eller alfakrøll"
@@ -9276,175 +9399,62 @@ msgstr "Autentiser bruker"
 msgid "Auth Domain"
 msgstr "Autentiseringsdomene"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Slår opp %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Tilkobling til %s feilet"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Pålogget: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Klarte ikke skrive fil %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Klarte ikke lese fil %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Beskjeden er for lang, siste %s bytes kom ikke med."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s er ikke pålogget."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Advarsel %s er ikke tillatt."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "En beskjed ble forkastet. Du overskrider tjenerens fartsgrense."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Snakkerom i %s er ikke tilgjengelig."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Du sender beskjeder for raskt til %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Du gikk glipp av en beskjed fra %s fordi den var for stor."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Du gikk glipp av en beskjed fra %s fordi den ble sendt for raskt."
-
-#, c-format
-msgid "Failure."
-msgstr "Feil."
-
-#, c-format
-msgid "Too many matches."
-msgstr "For mange treff."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Trenger flere parametre."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Katalogtjenesten er midlertidig utilgjengelig."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "E-postoppslag er begrenset."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Nøkkelord ignorert."
-
-#, c-format
-msgid "No keywords."
-msgstr "Ingen nøkkelord."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Brukeren har ingen kataloginformasjon."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Land ikke støttet."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Ukjent feil: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Feil brukernavn eller passord."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Tjenesten er midlertidig utilgjengelig."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Advarselsnivået ditt er satt for høyt for å logge inn."
-
-#, c-format
-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 ""
-"Du har koblet til og koblet fra for hurtig. Vent ti minutter og prøv igjen. "
-"Hvis du fortsetter å prøve nå, vil du måtte vente enda lenger."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "En ukjent påloggingsfeil har inntruffet: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "En ukjent feil, %d, har inntruffet. Info: %s"
-
-msgid "Invalid Groupname"
-msgstr "Ugyldig gruppenavn"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;rom&gt;:  Bli med i et samtalerom på Yahoo!-nettverket"
 
-msgid "Connection Closed"
-msgstr "Tilkoblingen lukket"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Vis rom på Yahoo!-nettverket"
 
-msgid "Waiting for reply..."
-msgstr "Venter på svar..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Forespør en bruker om å starte en Doodle session"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC har kommet tilbake fra pausen. Du kan nå sende beskjeder igjen."
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID ..."
 
-msgid "Password Change Successful"
-msgstr "Passordet er endret"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo-protokolltillegg"
 
-msgid "_Group:"
-msgstr "_Gruppe:"
+msgid "Pager server"
+msgstr "Søketjenestetjener"
 
-msgid "Get Dir Info"
-msgstr "Hent kataloginfo"
+msgid "Pager port"
+msgstr "Personsøker-port"
 
-msgid "Set Dir Info"
-msgstr "Lagre kataloginfo"
+msgid "File transfer server"
+msgstr "Filoverføringstjener"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Klarte ikke åpne %s for skriving!"
+msgid "File transfer port"
+msgstr "Filoverføringsport"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden."
+msgid "Chat room locale"
+msgstr "Samtaleroms språk"
 
-msgid "Could not connect for transfer."
-msgstr "Klarte ikke koble til for dataoverføring."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorer konferanse og samtalerom invitasjoner"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Klarte ikke skrive filhode. Filen vil ikke bli overført."
+msgid "Chat room list URL"
+msgstr "Samtaleroms URL"
 
-msgid "Save As..."
-msgstr "Lagre som..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo Chat server"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s forespør %s om å ta imot %d fil: %s (%.2f %s)%s%s"
-msgstr[1] "%s forespør %s om å ta imot %d filer: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Chat port"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s venter på at du skal sende dem en fil"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID ..."
 
 #. *< type
 #. *< ui_requirement
@@ -9456,12 +9466,12 @@ msgstr "%s venter på at du skal sende dem en fil"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC-protokolltillegg"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo-protokolltillegg"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s har sendt deg en webcam invitasjon som enda ikke er støttet."
+msgid "Your SMS was not delivered"
+msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Din Yahoo!-beskjed ble ikke sendt."
@@ -9487,6 +9497,32 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Legge til kontakt avslått"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Mottok ugyldige data over forbindelsen med tjeneren."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Ukjent feilkode %d. Å logge inn på Yahoo!s nettside, kan kanskje løse dette."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Ukjent feilkode %d. Å logge inn på Yahoo!s nettside, kan kanskje løse dette."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Feil brukernavn eller passord"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9519,38 +9555,33 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Ukjent feilkode %d. Å logge inn på Yahoo!s nettside, kan kanskje løse dette."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Klarte ikke legge til kontakt %s i gruppen %s i tjenerlisten på konto %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Klarte ikke legge kontakt til tjenerens kontaktliste"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørbar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Mottok uventet HTTP-svar fra tjener."
 
-msgid "Connection problem"
-msgstr "Problem ved tilkobling"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Mistet forbindelse med %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Klarte ikke koble til med %s:\n"
+"Klarte ikke etablere kontakt med serveren:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9598,8 +9629,8 @@ msgstr "Nærværsinnstillinger"
 msgid "Start Doodling"
 msgstr "Start kruseduller"
 
-msgid "Activate which ID?"
-msgstr "Aktiver hvilken ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Bli med hvem i samtalegruppe?"
@@ -9613,73 +9644,15 @@ msgstr "Bli med bruker i samtale ..."
 msgid "Open Inbox"
 msgstr "Åpne innboks"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;rom&gt;:  Bli med i et samtalerom på Yahoo!-nettverket"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Vis rom på Yahoo!-nettverket"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Forespør en bruker om å starte en Doodle session"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-protokolltillegg"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Søketjenestetjener"
-
-msgid "Japan Pager server"
-msgstr "Japansk Personsøker server"
-
-msgid "Pager port"
-msgstr "Personsøker-port"
-
-msgid "File transfer server"
-msgstr "Filoverføringstjener"
-
-msgid "Japan file transfer server"
-msgstr "Japansk filoverføringstjener"
-
-msgid "File transfer port"
-msgstr "Filoverføringsport"
-
-msgid "Chat room locale"
-msgstr "Samtaleroms språk"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorer konferanse og samtalerom invitasjoner"
-
-msgid "Chat room list URL"
-msgstr "Samtaleroms URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Chat server"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chat port"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Sendte Doodle forespørsel."
 
+msgid "Unable to connect."
+msgstr "Klarte ikke koble til."
+
 msgid "Unable to establish file descriptor."
 msgstr "Klarte ikke etablere fildeskriptor."
 
@@ -9687,6 +9660,9 @@ msgstr "Klarte ikke etablere fildeskriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s prøver å sende deg en gruppe med %d filer.\n"
 
+msgid "Write Error"
+msgstr "Feil ved skriving"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profil"
 
@@ -9803,23 +9779,19 @@ msgstr "Stemmer"
 msgid "Webcams"
 msgstr "Webkameraer"
 
+msgid "Connection problem"
+msgstr "Problem ved tilkobling"
+
 msgid "Unable to fetch room list."
 msgstr "Klarte ikke hente ned romliste."
 
 msgid "User Rooms"
 msgstr "Brukerrom"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problem ved tilkobling til YHCT-tjener."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Du har blitt koblet fra tjeneren\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9947,33 +9919,22 @@ msgstr "Domene"
 msgid "Exposure"
 msgstr "Eksponering"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Klarte ikke lage endepunkt:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Klarte ikke analysere syntaktisk respons fra HTTP proxy: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Feil %d i forbindelsen mot HTTP-mellomtjeneren"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Tilgang nektet: Mellomtjener nekter å formidle tunell for port %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error resolving %s"
 
-msgid "Could not resolve host name"
-msgstr "Kan ikke finne datamaskinnavnet"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Forespør %s's oppmerksomhet..."
@@ -10060,9 +10021,6 @@ msgstr "Ikke forstyrr"
 msgid "Extended away"
 msgstr "Utvidet borte"
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Listening to music"
 msgstr "Lytter til musikk"
 
@@ -10104,18 +10062,6 @@ msgstr "%s har blitt aktiv"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Feil ved lesing av %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Det oppstod en feil under lesing av %s. Den har ikke blitt lastet, og den "
-"gamle filen ble flyttet til %s~."
-
 msgid "Calculating..."
 msgstr "Beregner..."
 
@@ -10223,6 +10169,18 @@ msgstr "Tilkoblingen avvist."
 msgid "Address already in use."
 msgstr "Adressen er allerede i bruk"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Feil ved lesing av %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Det oppstod en feil under lesing av %s. Den har ikke blitt lastet, og den "
+"gamle filen ble flyttet til %s~."
+
 msgid "Internet Messenger"
 msgstr "Lynmeldingsklient"
 
@@ -10265,10 +10223,8 @@ msgstr "_Varsling om ny e-post"
 msgid "Use this buddy _icon for this account:"
 msgstr "Bruk dette kontakt _ikon for denne kontoen:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s brukervalg"
+msgid "_Advanced"
+msgstr "_Avansert"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Bruk GNOMEs proxyinnstilinger"
@@ -10303,9 +10259,6 @@ msgstr "hvis du ser virkelig godt etter"
 msgid "you can see the butterflies mating"
 msgstr "sommerfugler svermer"
 
-msgid "Proxy Options"
-msgstr "Proxyinnstillinger"
-
 msgid "Proxy _type:"
 msgstr "Proxy_type:"
 
@@ -10333,8 +10286,9 @@ msgstr "_Generell"
 msgid "Create _this new account on the server"
 msgstr "Opprett denne _nye kontoen på tjeneren"
 
-msgid "_Advanced"
-msgstr "_Avansert"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Proxy"
 
 msgid "Enabled"
 msgstr "Aktivert"
@@ -10383,16 +10337,17 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Oppdater de nødvendige feltene."
 
-msgid "Room _List"
-msgstr "Rom_liste"
+#, fuzzy
+msgid "A_ccount"
+msgstr "K_onto:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Skriv inn informasjon om samtalegruppen du ønsker å bli med i.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Rom_liste"
 
 msgid "_Block"
 msgstr "_Blokker"
@@ -10409,6 +10364,17 @@ msgstr "Hent _informasjon"
 msgid "I_M"
 msgstr "Direkte_melding"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "_Legg til samtale"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Videosamtale"
+
 msgid "_Send File..."
 msgstr "_Send fil..."
 
@@ -10418,9 +10384,14 @@ msgstr "Legg til _kontaktvarsling..."
 msgid "View _Log"
 msgstr "Vis _logg"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Skjul når avlogget"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Vis når avlogget"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -10543,6 +10514,10 @@ msgstr "/Verktøy/_Kontaktvarsling"
 msgid "/Tools/_Certificates"
 msgstr "/Verktøy/S_ertifikater"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Verktøy/S_milefjes"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Verktøy/ _Tillegg"
 
@@ -10552,9 +10527,6 @@ msgstr "/Verktøy/_Innstillinger"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Sikkerhet"
 
-msgid "/Tools/Smile_y"
-msgstr "/Verktøy/S_milefjes"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringer"
 
@@ -10672,8 +10644,8 @@ msgstr "Manuelt"
 msgid "By status"
 msgstr "Etter status"
 
-msgid "By log size"
-msgstr "Etter loggstørrelse"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10689,6 +10661,9 @@ msgstr "Koble til på nytt"
 msgid "Re-enable"
 msgstr "Reaktiver"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Velkommen tilbake!"
 
@@ -10773,6 +10748,9 @@ msgstr "Skriv inn et aliasnavn og annen informasjon for samtalegruppen.\n"
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Gruppe:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Bli med automatisk når kontoen er pålogget."
 
@@ -10806,6 +10784,116 @@ msgstr "/Verktøy"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kontakter/Sorter kontakter"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Bakgrunnsfarge"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Denne gruppen har blitt lagt til kontaktlisten din"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Bakgrunnsfarge"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Utvid"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Velg bakgrunnsfarge"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Lukk"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Velg bakgrunnsfarge"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Snarvei"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Pålogget"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Borte"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Avlogget"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Sinnsstemningstekst"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Beskjed sendt"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Endre brukerinformasjon for %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Skriv inn vertsnavnet som dette sertifikatet er for."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-tjenere"
@@ -10825,14 +10913,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter kontakten inn i samtalerom"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Skriv inn navnet på brukeren som du vil invitere, og en eventuell "
-"invitasjonsbeskjed."
-
 msgid "_Buddy:"
 msgstr "_Kontakt:"
 
@@ -10861,7 +10941,8 @@ msgstr "Ignorer"
 msgid "Get Away Message"
 msgstr "Hent fraværsbeskjed"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Sa sist"
 
 msgid "Unable to save icon file to disk."
@@ -10907,6 +10988,22 @@ msgstr "/Samtale/_Lagre som..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Samtale/Tø_m tilbakeblikk"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Samtale/M_ere"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Samtale/M_ere"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Samtale/M_ere"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Samtale/_Vis logg"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/Se_nd fil..."
 
@@ -10980,6 +11077,19 @@ msgstr "/Samtale"
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis logg"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Samtale/Mere"
+
+#
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Samtale/Vis logg"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Samtale/Mere"
+
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil..."
 
@@ -11162,6 +11272,9 @@ msgstr "artist"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr ""
+
 #
 msgid "support"
 msgstr "støtte"
@@ -11287,6 +11400,10 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Ungarsk"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumensk"
+
 msgid "Indonesian"
 msgstr "Indonesisk"
 
@@ -11302,6 +11419,10 @@ msgstr "Georgisk"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu georgisk-oversettere"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Andre"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11380,6 +11501,9 @@ msgstr "Singalesisk"
 msgid "Swedish"
 msgstr "Svensk"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11712,7 +11836,8 @@ msgstr "Fargen som lenker skal ha."
 msgid "Hyperlink visited color"
 msgstr "Farge på besøkte lenker"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Lenkefarge etter at lenka er besøkt (eller tatt i bruk)."
 
 msgid "Hyperlink prelight color"
@@ -11749,13 +11874,22 @@ msgstr "Farge for å tegne navnet på en handlingsbeskjed."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Farge for navn på handlingsmelding for hviska beskjeder"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Farge for å tegne navnet på en handlingsbeskjed."
+
 msgid "Whisper Message Name Color"
 msgstr "Farge på navn på hviskebeskjed"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Farge for å tegne navnet på en handlingsbeskjed."
+
 msgid "Typing notification color"
 msgstr "Skrivevarslingsfarge"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Skrifttypefargen som skal brukes ved skrivevarsling"
 
 msgid "Typing notification font"
@@ -11767,15 +11901,6 @@ msgstr "Skrifttypen som skal brukes ved skrivevarsling"
 msgid "Enable typing notification"
 msgstr "Aktiver varsling om skriving"
 
-msgid "_Copy Email Address"
-msgstr "_Kopier e-postadresse"
-
-msgid "_Open Link in Browser"
-msgstr "_Åpne lenke i nettleser"
-
-msgid "_Copy Link Location"
-msgstr "_Kopier lenkemål"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11817,11 +11942,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Lagre bilde..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Legg til tilpassede smilefjes"
 
@@ -11913,9 +12036,6 @@ msgstr "Minsk skriftstørrelse"
 msgid "Font Face"
 msgstr "Skrifttype"
 
-msgid "Background Color"
-msgstr "Bakgrunnsfarge"
-
 msgid "Foreground Color"
 msgstr "Forgrunnsfarge"
 
@@ -12024,13 +12144,14 @@ msgstr "_Let gjennom loggmappe"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Prøv '%s -h' for mer informasjon.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12055,13 +12176,14 @@ msgstr ""
 "  --display=DISPLAY   X display for bruk\n"
 "  -v, --version       Vis den nårværende versjon og avslutt\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12121,11 +12243,23 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Avslutter fordi en annen libpurple-klient allerede kjører.\n"
 
-msgid "Open All Messages"
-msgstr "Åpne alle beskjeder"
+msgid "/_Media"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-post!</span>"
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Beregner..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12156,6 +12290,27 @@ msgstr ""
 "Klarte ikke å starte en nettleser fordi 'Manuell' nettleserkommando er "
 "valgt, men ingen kommando for denne har blitt satt."
 
+#, fuzzy
+msgid "No message"
+msgstr "Ukjent beskjed"
+
+msgid "Open All Messages"
+msgstr "Åpne alle beskjeder"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-post!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Legg til kontaktvarsling"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-post!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Følgende tillegg kunne ikke losses."
 
@@ -12202,10 +12357,17 @@ msgstr "<b>Tillegget Detaljer</b>"
 msgid "Select a file"
 msgstr "Velg fil"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Rediger kontaktvarsling"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Varsling for hvem"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "_Kontaktnavn:"
 
@@ -12272,7 +12434,60 @@ msgstr "_Gjentar"
 msgid "Pounce Target"
 msgstr "Pounce mål"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Starter å skrive"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Brukeren skriver en melding"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Logger på"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s har blitt aktiv igjen (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Returnerer fra fravær"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Stoppet å skrive"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Logger av"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Blir inaktiv"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Når fraværende"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Send en beskjed"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Ukjent varslingshendelse. Vennligst rapporter dette!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Smiley tema feilet å pakke ut."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Smiley tema feilet å pakke ut."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Smiley tema feilet å pakke ut."
 
 msgid "Install Theme"
@@ -12294,6 +12509,12 @@ msgstr "Tastatursnarveier"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Lukk samtaler med Esc-tasten"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Kontaktliste"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "System-trayikon"
 
@@ -12303,8 +12524,9 @@ msgstr "_Vis system tray ikon:"
 msgid "On unread messages"
 msgstr "Ved uleste beskjeder"
 
-msgid "Conversation Window Hiding"
-msgstr "Skjuling av samtalevindu"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Samtalevinduer for lynmeldinger"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Gjem nye lynmeldingssamtaler:"
@@ -12312,6 +12534,9 @@ msgstr "_Gjem nye lynmeldingssamtaler:"
 msgid "When away"
 msgstr "Når fraværende"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Mini_mer nye samtalevinduer"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Faner"
@@ -12370,9 +12595,6 @@ msgstr "Bruk behagelig scrolling"
 msgid "F_lash window when IMs are received"
 msgstr "B_link vinduet når nye lynmeldinger mottas"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Mini_mer nye samtalevinduer"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimum høyde for inntastingsområde i linjer:"
 
@@ -12404,13 +12626,11 @@ msgstr "Klarte ikke starte innstillingsprogrammet for mellomlageret."
 msgid "Cannot start browser configuration program."
 msgstr "Klarte ikke starte oppsettsprogram for nettleser."
 
-msgid "ST_UN server:"
-msgstr "ST_UN-tjener:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Eksempel: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Finn IP-adresse _automatisk"
 
 msgid "Public _IP:"
@@ -12431,6 +12651,10 @@ msgstr "_Startport:"
 msgid "_End port:"
 msgstr "_Sluttport:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxytjener &amp; nettleser"
 
@@ -12621,12 +12845,12 @@ msgstr "Når både fraværende og inaktiv"
 msgid "Auto-away"
 msgstr "Automatisk fraværsmarkering"
 
-msgid "Change status when _idle"
-msgstr "Endre status hvis _inaktiv"
-
 msgid "_Minutes before becoming idle:"
 msgstr "Antall _minutter før man regnes som inaktiv:"
 
+msgid "Change status when _idle"
+msgstr "Endre status hvis _inaktiv"
+
 msgid "Change _status to:"
 msgstr "Endre _status til:"
 
@@ -12667,8 +12891,9 @@ msgstr "Blokker alle brukere"
 msgid "Block only the users below"
 msgstr "Blokker kun brukerne vist nedenfor"
 
-msgid "Personvern"
-msgstr "Sikkerhet"
+#, fuzzy
+msgid "Privacy"
+msgstr "Privat"
 
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Endringer i sikkerhetsinnstillingene skjer umiddelbart."
@@ -12774,27 +12999,18 @@ msgstr "Lagre & bruk"
 msgid "Status for %s"
 msgstr "Status for %s"
 
-msgid "Custom Smiley"
-msgstr "Tilpassede smilefjes"
-
-msgid "More Data needed"
-msgstr "Mer data trengs"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Oppgi en snarvei som skal forbindes med smilefjeset."
-
-msgid "Duplicate Shortcut"
-msgstr "Duplikat snarvei"
-
+#, fuzzy, c-format
 msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 "Et tilpasset smilefjes finnes allerede for den valgte snarveien. Oppgi en "
 "annen snarvei."
 
-msgid "Please select an image for the smiley."
-msgstr "Velg et bilde for smilefjeset."
+msgid "Custom Smiley"
+msgstr "Tilpassede smilefjes"
+
+msgid "Duplicate Shortcut"
+msgstr "Duplikat snarvei"
 
 msgid "Edit Smiley"
 msgstr "Endre smilefjes"
@@ -12802,19 +13018,29 @@ msgstr "Endre smilefjes"
 msgid "Add Smiley"
 msgstr "Legg til smilefjes"
 
-msgid "Smiley _Image"
-msgstr "Smilefjesbilde"
+#, fuzzy
+msgid "_Image:"
+msgstr "_Bilde"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Snar_vei for smilefjes"
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Snarvei"
 
 msgid "Smiley"
 msgstr "Smilefjes"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Snarvei"
+
 msgid "Custom Smiley Manager"
 msgstr "Tilpassede smilefjes"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Velg kontakt"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klikk for å endre kontaktikonet for denne kontoen."
 
@@ -12897,9 +13123,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Klarte ikke sende lasteren"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Du dro en skrivebordstarter. Sannsynligvis ville du sende det som starteren "
 "peker til og ikke selve starteren."
@@ -12934,6 +13161,16 @@ msgid ""
 msgstr ""
 "Feilet å laste bilde '%s': grunn ukjent, sannsynligvis en korrupt bilde fil"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Åpne lenke i:"
+
+msgid "_Copy Link Location"
+msgstr "_Kopier lenkemål"
+
+msgid "_Copy Email Address"
+msgstr "_Kopier e-postadresse"
+
 msgid "Save File"
 msgstr "Lagre fil"
 
@@ -13024,6 +13261,80 @@ msgstr "Forutsigelse av Kontaktens Tilgjengelighet tillegg."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Vis statistikk om dine kontakters tilgjengelighet"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Tjeneradresse"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Skriv inn en konferansetjener"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Velg en konferanseserver å spørre"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Tjenester på nett"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send kontaktliste"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Forlater"
+
+#
+#, fuzzy
+msgid "Directory"
+msgstr "Logg Katalog"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Lydvalg"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub Service"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Beskrivelse"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Tjenesteoppdagingsinfo"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Nettleser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Brukeren eksisterer ikke"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Tjener støtter ikke blokkering"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Tjenesteoppdagingsinfo"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Dette tillegget er kjekt å ha for debugging av XMPP servere og klienter."
+
 msgid "Buddy is idle"
 msgstr "Kontakt er inaktiv"
 
@@ -13134,8 +13445,7 @@ msgstr "Antall samtaler per vindu"
 
 msgid "Separate IM and Chat windows when placing by number"
 msgstr ""
-"Separere lynmeldings- og chattevinduer når programet plasserer etter "
-"nummer"
+"Separere lynmeldings- og chattevinduer når programet plasserer etter nummer"
 
 #. *< type
 #. *< ui_requirement
@@ -13417,9 +13727,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musikk Samtale Tillegg for samarbeids komposisjon."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Musikk Samtale Tillegg tillater flere brukere å arbeide på et stykke musikk "
 "samtidig ved å redigere et felles resultat i samtid."
@@ -13535,12 +13846,6 @@ msgstr ""
 "- Det reverserer all tekst som du mottar\n"
 "- Det sender en beskjed til kontaktene i kontaktlisten straks de logger på"
 
-msgid "Cursor Color"
-msgstr "Peker Farge"
-
-msgid "Secondary Cursor Color"
-msgstr "Andre Peker Farge"
-
 msgid "Hyperlink Color"
 msgstr "Farge på lenker"
 
@@ -13550,6 +13855,10 @@ msgstr "Farge på besøkte lenker"
 msgid "Highlighted Message Name Color"
 msgstr "Farge for fremhevede beskjednavn"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Skrivevarslingsfarge"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView Horizontal Separation"
 
@@ -13579,35 +13888,24 @@ msgstr "GTK+ Grensesnitt Font"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Tekst Tema Snarvei"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Grensesnitt farger"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Aktiver varsling om skriving"
 
-msgid "Widget Sizes"
-msgstr "Widget Sizes"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ Tema Kontroll"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Lukk"
 
 msgid "Fonts"
 msgstr "Fonter"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc Fil Verktøy"
 
@@ -13689,9 +13987,10 @@ msgid "Conversation Window Send Button."
 msgstr "Send-knapp i samtalevindu"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Legg til en Send-knapp i samtalevinduet. Tenkt brukt når intet fysisk "
 "tastatur er tilgjengelig."
@@ -13745,6 +14044,113 @@ msgstr "Teksterstatter"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstatter tekst i utgående beskjeder etter regler som du bestemmer."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Ikke pålogget"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Ikke pålogget"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Bli med i en samtalegruppe"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorer"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Høyere"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Godkjent"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Feil"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informasjon"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Forespørselsdialog"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Advarselsnivåer"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status for %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Samtaleroms språk"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Endre ikon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ Tema Kontroll"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktinformasjon"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Kontaktliste"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Kontaktliste"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ Tema Kontroll"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ Tema Kontroll"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13914,8 +14320,9 @@ msgstr "Valg for Windows Pidgin"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Innstillinger som er spesifikke for Pidgin på Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Gir spesifikke innstillinger for Pidgin på Windows, slik som skjuling av "
 "kontaktliste i systemstatusfeltet."
@@ -13958,6 +14365,509 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Dette tillegget er kjekt å ha for debugging av XMPP servere og klienter."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Klarte ikke åpne endepunkt"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Klarte ikke lytte på endepunkt"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Klarte ikke lese endepunkt"
+
+#~ msgid "Connection failed."
+#~ msgstr "Tilkobling feilet."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Tjeneren har koplet fra"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Klarte ikke opprette endepunkt"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Klarte ikke koble til"
+
+#~ msgid "Read error"
+#~ msgstr "Lesefeil"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikke etablere kontakt med serveren:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Feil ved skriving"
+
+#~ msgid "Last Activity"
+#~ msgstr "Siste aktivitet"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Tjenesteoppdagingsinfo"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Service Discovery Items"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Utvida Stanza-adressering"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Flerbrukersamtale"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Brukeren har ingen kataloginformasjon"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band Bytestreams"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc Kommandoer"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub Service"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Bytestreams"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Out of Band Data"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+# må setjast om seinare
+#~ msgid "In-Band Registration"
+#~ msgstr "Samtidsegistrering"
+
+#~ msgid "User Location"
+#~ msgstr "Brukerens sted"
+
+#~ msgid "User Avatar"
+#~ msgstr "Bruker Avatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Samtaletilstandsvarsling"
+
+#~ msgid "Software Version"
+#~ msgstr "Programvareversjon"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Strømoppstart"
+
+#~ msgid "User Mood"
+#~ msgstr "Brukerens tilstander"
+
+#~ msgid "User Activity"
+#~ msgstr "Brukerens aktivitet"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Entitetsegenskaper"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Krypterte formidlinger av økt"
+
+#~ msgid "User Tune"
+#~ msgstr "Brukerens melodi"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Listeelement-utveksling"
+
+# Gjer betre
+#~ msgid "Reachability Address"
+#~ msgstr "Adresse en kan nåes på"
+
+#~ msgid "User Profile"
+#~ msgstr "Brukers profil"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle-audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "Brukers kallenavn"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle-video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Beskjedkvitteringer"
+
+# Veldig, veldig fuzzy....
+#~ msgid "Public Key Publishing"
+#~ msgstr "Offentlig nøkkelpublisering"
+
+#~ msgid "User Chatting"
+#~ msgstr "Bruker som snakker"
+
+#~ msgid "User Browsing"
+#~ msgstr "Bruker som surfer"
+
+#~ msgid "User Gaming"
+#~ msgstr "Bruker som spiller"
+
+#~ msgid "User Viewing"
+#~ msgstr "Bruker som ser på"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanza-kryptering"
+
+#~ msgid "Entity Time"
+#~ msgstr "Enhetstid"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Forsinket Levering"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Samarbeidende Data Objekter"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Fil Oppbevaring og Deling"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN Service Discovery for Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Forenklet formidling av kryptert økt"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hop Sjekk"
+
+#~ msgid "Read Error"
+#~ msgstr "Lesefeil"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Klarte ikke koble til tjener."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Lesemellomlager fullt (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Klarte ikke tolke beskjed"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Klarte ikke koble til vert: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Pålogging feilet (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Kan ikke koble til tjener."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Du ble logget av fordi du har logget på med dette skjermnavnet et annet "
+#~ "sted."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Feil: SSL-støtte er ikke installert."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Feil passord."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikke koble til BOS server:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Du kan bli frakoblet ganske snart. Sjekk %s for oppdateringer."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Klarte ikke koble til"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ugyldig brukernavn."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Klarte ikke dekryptere tjenersvaret"
+
+#~ msgid "Connection lost"
+#~ msgstr "Tilkobling mistet"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Vertsoppslaget feilet"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Tilkoblingen lukket (skriver)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Tilkobling nullstilt"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Feil ved lesing fra endepunkt: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Kan ikke koble til tjener"
+
+#~ msgid "Could not write"
+#~ msgstr "Klarte ikke skrive"
+
+#~ msgid "Could not connect"
+#~ msgstr "Klarte ikke koble til"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Klarte ikke opprette lytteendepunkt"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Kan ikke finne datamaskinnavnet"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Feil passord"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikke koble til med %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japansk Personsøker server"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japansk filoverføringstjener"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Du har blitt koblet fra tjeneren\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Kan ikke finne datamaskinnavnet"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Tjeneren krever TLS/SSL for å logge inn, men støtte for dette ble ikke "
+#~ "funnet."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skjuling av samtalevindu"
+
+#~ msgid "More Data needed"
+#~ msgstr "Mer data trengs"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Oppgi en snarvei som skal forbindes med smilefjeset."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Velg et bilde for smilefjeset."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktiver hvilken ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Peker Farge"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Andre Peker Farge"
+
+#~ msgid "Interface colors"
+#~ msgstr "Grensesnitt farger"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget Sizes"
+
+#~ msgid "Invite message"
+#~ msgstr "Invitasjonsbeskjed"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Skriv inn navnet på brukeren som du vil invitere, \n"
+#~ "og en eventuell invitasjonsbeskjed."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Slår opp %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Tilkobling til %s feilet"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Pålogget: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Klarte ikke skrive fil %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Klarte ikke lese fil %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Beskjeden er for lang, siste %s bytes kom ikke med."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s er ikke pålogget."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Advarsel %s er ikke tillatt."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "En beskjed ble forkastet. Du overskrider tjenerens fartsgrense."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Snakkerom i %s er ikke tilgjengelig."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Du sender beskjeder for raskt til %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Du gikk glipp av en beskjed fra %s fordi den var for stor."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Du gikk glipp av en beskjed fra %s fordi den ble sendt for raskt."
+
+#~ msgid "Failure."
+#~ msgstr "Feil."
+
+#~ msgid "Too many matches."
+#~ msgstr "For mange treff."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Trenger flere parametre."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Katalogtjenesten er midlertidig utilgjengelig."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "E-postoppslag er begrenset."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Nøkkelord ignorert."
+
+#~ msgid "No keywords."
+#~ msgstr "Ingen nøkkelord."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Brukeren har ingen kataloginformasjon."
+
+#~ msgid "Country not supported."
+#~ msgstr "Land ikke støttet."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Ukjent feil: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Feil brukernavn eller passord."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Tjenesten er midlertidig utilgjengelig."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Advarselsnivået ditt er satt for høyt for å logge inn."
+
+#~ 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 ""
+#~ "Du har koblet til og koblet fra for hurtig. Vent ti minutter og prøv "
+#~ "igjen. Hvis du fortsetter å prøve nå, vil du måtte vente enda lenger."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "En ukjent påloggingsfeil har inntruffet: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "En ukjent feil, %d, har inntruffet. Info: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Ugyldig gruppenavn"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Tilkoblingen lukket"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Venter på svar..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC har kommet tilbake fra pausen. Du kan nå sende beskjeder igjen."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Passordet er endret"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Hent kataloginfo"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Lagre kataloginfo"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Klarte ikke åpne %s for skriving!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Klarte ikke koble til for dataoverføring."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Klarte ikke skrive filhode. Filen vil ikke bli overført."
+
+#~ msgid "Save As..."
+#~ msgstr "Lagre som..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s forespør %s om å ta imot %d fil: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s forespør %s om å ta imot %d filer: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s venter på at du skal sende dem en fil"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC-protokolltillegg"
+
+#~ msgid "%s Options"
+#~ msgstr "%s brukervalg"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxyinnstillinger"
+
+#~ msgid "By log size"
+#~ msgstr "Etter loggstørrelse"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Åpne lenke i nettleser"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN-tjener:"
+
+#~ msgid "Personvern"
+#~ msgstr "Sikkerhet"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Smilefjesbilde"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Snar_vei for smilefjes"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Klarte ikke hente MSN-adressebok"
 
@@ -14249,14 +15159,6 @@ msgstr ""
 #~ "supported by MySpace."
 #~ msgstr "Sorry, passord over %d tegn (du har %d) er ikke støttet av MySpace."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Vennligst gå til http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username og velg et brukernavn og prøv å logge inn "
-#~ "igjen."
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "Altfor ond (sender)"
 
@@ -14314,9 +15216,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Din forespørsel til å bli med i gruppen %d har blitt godkjent av admin %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Denne gruppen har blitt lagt til kontaktlisten din"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Jeg søker om å bli med"
 
@@ -14339,10 +15238,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "Skriv din grunn:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Feil: kunne ikke koble til"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Klarte ikke logge inn, sjekk debug logg"
 
@@ -14386,9 +15281,6 @@ msgstr ""
 #~ "for kontakten. Aliaset vil bli vist i stedet for skjermnavnet der det er "
 #~ "mulig.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "K_onto:"
-
 #~ msgid "_Screen name:"
 #~ msgstr "_Skjermnavn:"
 
@@ -14430,9 +15322,6 @@ msgstr ""
 #~ msgid "Unable to connect to contact server"
 #~ msgstr "Kan ikke koble til tjener"
 
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Kan ikke koble til OIM server"
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Klarte ikke opprette SSL-forbindelse med tjeneren."
 
diff --git a/po/ne.po b/po/ne.po
index 3c673906f3..281ce99421 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-06-27 21:08+0545\n"
 "Last-Translator: Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -35,7 +35,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -630,21 +630,6 @@ msgid "Send To"
 msgstr "पठाउनुहोस्"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "सन्देश अन्त्य गर्नुहोस्"
-
-msgid "Invite"
-msgstr "आमन्त्रण गर्नुहोस्"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"कृपया तपाईँले निमन्त्रणा गर्न चाहेको प्रयोगकर्ताको नाम प्रविष्टि गर्नुहोस्,एच्छिक निमन्त्रणा "
-"सन्देश बराबर हुन्छ ।"
-
-#, fuzzy
 msgid "Conversation"
 msgstr "वार्तालापहरू"
 
@@ -904,6 +889,42 @@ msgid "System Log"
 msgstr "प्रणाली लग"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "गणना गर्दैछ..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "स्वीकार गर्नुहोस्"
+
+#, fuzzy
+msgid "Reject"
+msgstr "रिसेट गर्नुहोस्"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "तपाईँले च्यानल %s%s विभाजन गर्नुभयो"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "इमेल"
 
@@ -941,6 +962,9 @@ msgstr "जडान"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "आमन्त्रण गर्नुहोस्"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(नाम छैन)"
@@ -1164,7 +1188,6 @@ msgstr "%s टाढा गइसकेको छ । (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ले तपाईँलाई %s पठाउन चाहन्छ (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "अज्ञात घटना पाउन्स गर्नुहोस् । कृपया यो प्रतिवेदन गर्नुहोस्!"
 
@@ -1220,7 +1243,6 @@ msgstr " 'टाढा सेट' गर्नु अघि मिनेटह�
 msgid "Change status to"
 msgstr "ठेगाना परिवर्तन गर्नुहोस्:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "वार्तालापहरू"
 
@@ -1566,7 +1588,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr "जब नयाँ वार्तालाप खोल्छ यो प्लगइनले हालको वार्तालापमा अन्तिम वार्तालाप घुसाउछ ।"
 
-#, c-format
 msgid "Online"
 msgstr "अनलाइन"
 
@@ -1615,6 +1636,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 #, fuzzy
 msgid "accounts"
 msgstr "खाताहरू"
@@ -1718,14 +1761,6 @@ msgstr "कुराकानी निमन्त्रणा स्विक�
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "स्वीकार गर्नुहोस्"
-
-#, fuzzy
-msgid "Reject"
-msgstr "रिसेट गर्नुहोस्"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1815,6 +1850,8 @@ msgstr "%s साइनअन भयो"
 msgid "+++ %s signed off"
 msgstr "%s साइनअफ भयो"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "अज्ञात त्रुटि"
 
@@ -1863,6 +1900,18 @@ msgstr "%s कोठा बाट बाहिरियो ।"
 msgid "%s left the room (%s)."
 msgstr "%s कोठा (%s) बाट बाहिरियो ।"
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "सम्मेलन थालनी गर्नुहोस्"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"कृपया तपाईँले निमन्त्रणा गर्न चाहेको प्रयोगकर्ताको नाम प्रविष्टि गर्नुहोस्,एच्छिक निमन्त्रणा "
+"सन्देश बराबर हुन्छ ।"
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "%s का लागि सिमोडहरू सेट गर्न असफल"
@@ -2001,7 +2050,6 @@ msgstr "%s को फाइल स्थानान्तरण अनुरो
 msgid "Transfer of file %s complete"
 msgstr "%s फाइलको स्थानान्तरण  पूरा भयो"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "फाइल स्थानान्तरण पूरा भयो ।"
 
@@ -2009,7 +2057,6 @@ msgstr "फाइल स्थानान्तरण पूरा भयो �
 msgid "You canceled the transfer of %s"
 msgstr "तपाईँले %s को स्थानान्तण रद्द गर्नुभयो"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "फाइल स्थानान्तरण रद्द भयो"
 
@@ -2194,11 +2241,14 @@ msgstr "<font color=\"red\"><b>फाइल पढ्न सकेन: %s</b></f
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "जडान सिर्जना गर्दा त्रुटि"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2612,7 +2662,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2664,7 +2714,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2693,6 +2743,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "पासवर्ड परिवर्तन गर्नुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2885,19 +2961,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 #, fuzzy
 msgid "First name"
 msgstr "पहिलो नाम:"
@@ -2935,6 +3010,11 @@ msgstr "याहू प्रोटोकल प्लगइन"
 msgid "Purple Person"
 msgstr "नयाँ व्यक्ति"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "स्थानीयता"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2946,17 +3026,17 @@ msgstr "%s लाई यो वार्तालापमा निमन्त
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "सन्देश पठाउन अक्षम भयो । सन्देश अति ठूलो छ ।"
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "सकेट खोल्न अक्षम भयो"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "सकेट सिर्जना गर्न अक्षम भयो"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "होस्टमा जडान गर्न सकिएन"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "सकेट सिर्जना गर्न सकिएन"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "सकेट सिर्जना गर्न अक्षम भयो"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3013,15 +3093,15 @@ msgstr "साथी सूची पठाउनुहोस्"
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "नयाँ पासवर्डहरू मेल खाएन ।"
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3034,17 +3114,15 @@ msgstr "दर्ता सफल भयो"
 msgid "Password"
 msgstr "पासवर्ड"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "पासवर्ड पठाइयो"
+msgid "Password (again)"
+msgstr "पासवर्ड(फेरि)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s अहिले लगइन छैन ।"
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "हालसालै"
+msgid "Captcha"
+msgstr "छवि बचत गर्नुहोस्"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3106,6 +3184,18 @@ msgid "Current password"
 msgstr "गलत पासवर्ड ।"
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "पासवर्ड पठाइयो"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s अहिले लगइन छैन ।"
+
+#, fuzzy
+msgid "Current token"
+msgstr "हालसालै"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "कृपया तपाईँको हालको पासवर्ड र तपाईँको नयाँ पासवर्ड प्रविष्टि गर्नुहोस् ।"
 
@@ -3121,13 +3211,13 @@ msgstr "तपाईँको साथी सूचीबाट कुराक
 msgid "Add to chat..."
 msgstr "कुराकानी थप्नुहोस्"
 
+#. Global
 msgid "Available"
 msgstr "उपलब्ध छ"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "टाढा"
 
@@ -3158,7 +3248,8 @@ msgstr "अमिल्दा होस्टहरू"
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "सकेट पढ्न अक्षम भयो"
 
 #, fuzzy
@@ -3177,8 +3268,14 @@ msgstr "साथी प्रदर्शन"
 msgid "Your buddy list was stored on the server."
 msgstr "त्यहाँ Gadu-Gadu सर्भरमा कुनै साथी सूची भण्डारण गरिएको छैन ।"
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "जडान गर्नुहोस्"
+
+msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
 #, fuzzy
@@ -3189,6 +3286,15 @@ msgstr "कुराकानी थप्नुहोस्"
 msgid "Chat _name:"
 msgstr "अन्तिम नाम:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "सर्भर पिङ्ग गर्न अक्षम"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "जडान"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "त्रुटि पढ्नुहोस्"
@@ -3198,7 +3304,7 @@ msgid "This chat name is already in use"
 msgstr "त्यो फाइल पहिलेनै अवस्थित छ"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "तपाईँ सर्भरबाट बिच्छेदन हुनुभयो ।"
 
 #, fuzzy
@@ -3246,6 +3352,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu खोजी इन्जिन"
 
+#, fuzzy
+msgid "GG server"
+msgstr "प्रयोगकर्ता सूचना सेट गर्नुहोस्..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "अज्ञात आदेश: %s"
@@ -3262,7 +3372,7 @@ msgid "File Transfer Failed"
 msgstr "फाइल स्थानान्तरण रद्द भयो"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "गाइमले सुन्ने पोर्ट खोल्न सकेन ।"
 
 msgid "Error displaying MOTD"
@@ -3278,8 +3388,16 @@ msgstr "त्यहाँ यो जडान सँग  MOTD संगठि�
 msgid "MOTD for %s"
 msgstr "%s का लागि MOTD"
 
-msgid "Server has disconnected"
-msgstr "सर्भर विच्छेद भएको छ"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
 
 msgid "View MOTD"
 msgstr "MOTD हेर्नुहोस्"
@@ -3290,25 +3408,24 @@ msgstr "च्यानल:"
 msgid "_Password:"
 msgstr "पासवर्ड:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC उपनामहरुले सेतो खाली ठाउँ समाविष्ट नगर्न सक्छ"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "जडान"
-
 msgid "SSL support unavailable"
 msgstr "SSL समर्थन उपलब्ध छैन"
 
-msgid "Couldn't create socket"
-msgstr "सकेट सिर्जना गर्न सकिएन"
+msgid "Unable to connect"
+msgstr "जडान गर्न अक्षम छ"
 
-msgid "Couldn't connect to host"
-msgstr "होस्टमा जडान गर्न सकिएन"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "सर्भरमा जडान गर्न अक्षम ।"
 
-msgid "Read error"
-msgstr "त्रुटि पढ्नुहोस्"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "जडान सिर्जना गर्दा त्रुटि"
 
 msgid "Users"
 msgstr "प्रयोगकर्ताहरू"
@@ -3495,6 +3612,17 @@ msgstr ""
 "तपाईँले सर्भरद्वारा अस्विकार गरिएको खाता मान चयन गर्नु भएको छ । यसमा सम्भवत अवैध "
 "क्यारेक्टरहरू समावेश छन् ।"
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "त्यो फाइल पहिलेनै अवस्थित छ"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "उपनाम"
+
 msgid "Cannot change nick"
 msgstr "उपनाम परिवर्तन गर्न सकिदैन"
 
@@ -3740,11 +3868,12 @@ msgstr "आदेश निस्क्रिय भयो"
 msgid "execute"
 msgstr "अपेक्षा गरिएको छैन"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "सर्भर लगइनका लागि TLS/SSL आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "सर्भर लगइनका लागि TLS/SSL आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3761,19 +3890,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "खाली पाठ प्रमाणीकरण"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "प्रमाणीकरण असफल भयो"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "सर्भरबाट अवैध जवाफ ।"
 
 msgid "Server does not use any supported authentication method"
 msgstr "सर्भरले कुनै पनि समर्थित प्रमाणीकरण विधी प्रयोग गर्दैन"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "सर्भर बाट अवैध चुनौती"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "त्रुटि पढ्नुहोस्"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "कारण दिइएको छैन ।"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "असमर्थित संस्करण"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
+
 msgid "Full Name"
 msgstr "पूरा नाम"
 
@@ -3843,187 +4003,9 @@ msgstr "शहर"
 msgid "Operating System"
 msgstr "सञ्चालन प्रणाली लुकाउनुहोस्"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "डाइरेक्टरी सूचना सेट गर्नुहोस्"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "विस्तृत ठेगाना"
-
 #, fuzzy
-msgid "Multi-User Chat"
-msgstr "कुराकानीलाई उपनाम दिनुहोस्"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "प्रयोगकर्ता सँग  डाइरेक्टरी सूचना छैन ।"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "आदेश"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "एच टि एम एल"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "दर्ता त्रुटि"
-
-#, fuzzy
-msgid "User Location"
-msgstr "स्थान"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "साथी स्थितिको सूचना"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "असमर्थित संस्करण"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "अभिमुखीकरण"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "फाइल स्थानान्तरणहरू"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "प्रयोगकर्ता मोडहरू"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "प्रयोगकर्ता सीमा"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "क्षमताहरू"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "प्रयोगकर्ता नाम"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "कुञ्जी साटासाटमा IM गर्नुहोस् "
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "इमेल ठेगाना"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "प्रोफाइल सेट गर्नुहोस्"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "पिङ्ग गर्नुहोस्"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "प्रयोगकर्ता नाम"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "प्रत्यक्ष भिडियो"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "सन्देश प्राप्त हुँदा"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "सार्वजनिक कुञ्जी ब्याबलप्रिन्ट"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "प्रयोगकर्ता विकल्पहरू"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "प्रयोगकर्ता मोडहरू"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "प्रयोगकर्ता सीमा"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "प्रयोगकर्ता सीमा"
-
-msgid "Ping"
-msgstr "पिङ्ग गर्नुहोस्"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ट्रिलियन गुप्तिकरण"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "क्षमताहरू"
+msgid "Local Time"
+msgstr "स्थानीय फाइल:"
 
 #, fuzzy
 msgid "Priority"
@@ -4032,6 +4014,14 @@ msgstr "सम्पर्क प्राथमिकता"
 msgid "Resource"
 msgstr "संसाधन"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "लग बाहिरियो"
+
 msgid "Middle Name"
 msgstr "बिचको नाम"
 
@@ -4080,7 +4070,6 @@ msgstr "कुरौटे"
 msgid "Extended Away"
 msgstr "टाढा फैल्याउनुहोस्"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "कृपया अवरोध नगर्नुहोस्"
 
@@ -4207,28 +4196,27 @@ msgstr "क्वेरीमा सम्मेलन सर्भर चयन
 msgid "Find Rooms"
 msgstr "कोठाहरू फेला पार्नुहोस्"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "उपनाम:"
 
-msgid "Write error"
-msgstr "त्रुटि लेख्नुहोस्"
+#, fuzzy
+msgid "No users found"
+msgstr "अमिल्दा होस्टहरू"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "सादा पाठ"
+msgid "Roles:"
+msgstr "भूमिका"
 
-msgid "Read Error"
-msgstr "त्रुटि पढ्नुहोस्"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "सादा पाठ"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "सकेट सिर्जना गर्न अक्षम भयो"
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "अवैध ID"
@@ -4236,6 +4224,10 @@ msgstr "अवैध ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "सर्भरमा जडान गर्न असफल भयो ।"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s को दर्ता सफल भयो"
@@ -4262,9 +4254,6 @@ msgstr "दर्ता सफल भयो"
 msgid "Unregistration Failed"
 msgstr "दर्ता असफल भयो"
 
-msgid "Already Registered"
-msgstr "पहिल्यै रजिष्टार भएको छ"
-
 msgid "State"
 msgstr "स्थिति"
 
@@ -4278,6 +4267,9 @@ msgstr "फोन"
 msgid "Date"
 msgstr "मिति"
 
+msgid "Already Registered"
+msgstr "पहिल्यै रजिष्टार भएको छ"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "दर्ता"
@@ -4310,6 +4302,10 @@ msgid "Change Registration"
 msgstr "दर्ता त्रुटि"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "सर्भरमा जडान गर्न असफल भयो ।"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "खाता सूचना परिवर्तन गर्दा त्रुटि"
 
@@ -4329,9 +4325,18 @@ msgstr "प्रमाणित गर्दा"
 msgid "Re-initializing Stream"
 msgstr "स्ट्रीम पुन: सुरू गर्दा"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "अधिकार प्राप्त छैन"
 
+msgid "Mood"
+msgstr "मुड"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "दुवै"
 
@@ -4353,12 +4358,6 @@ msgstr "कुनै पनि होइन"
 msgid "Subscription"
 msgstr "सदस्यता"
 
-msgid "Mood"
-msgstr "मुड"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "पाठ"
@@ -4406,9 +4405,6 @@ msgstr "तपाईँको पासवर्ड परिवर्तन भ
 msgid "Error changing password"
 msgstr "पासवर्ड परिवर्तन गर्दा त्रुटि"
 
-msgid "Password (again)"
-msgstr "पासवर्ड(फेरि)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "पासवर्ड परिवर्तन गर्नुहोस्"
@@ -4604,18 +4600,24 @@ msgstr "%s प्रयोगकर्ता हुत्याउन असफ�
 msgid "Unable to ping user %s"
 msgstr "%s प्रयोगकर्तालाई रोक्न अक्षम भयो"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "ध्वनि प्ले गर्न अक्षम भयो किनभने रोजेको फाइल (%s)अवस्थित छैन ।"
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "ध्वनि प्ले गर्न अक्षम भयो किनभने रोजेको फाइल (%s)अवस्थित छैन ।"
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "ध्वनि प्ले गर्न अक्षम भयो किनभने रोजेको फाइल (%s)अवस्थित छैन ।"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4626,9 +4628,35 @@ msgstr "बज्!!"
 msgid "%s has buzzed you!"
 msgstr "प्रयोगकर्ताले तपाईँलाई रोकेको छ"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "%s मा सन्देश पठाउन अक्षम:"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "%s मा फाइल पठाउन अक्षम भयो,प्रयोगकर्ताले फाइल स्थानान्तरणहरू समर्थन गर्दैन"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "%s मा फाइल पठाउन अक्षम भयो,प्रयोगकर्ताले फाइल स्थानान्तरणहरू समर्थन गर्दैन"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "दर्ता असफल भयो"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "कृपया तपाईँले जानकारी प्राप्त गर्न चाहेको व्यक्तिको पर्दा नाम प्रविष्टि गर्नुहोस् ।"
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "एउटा फाइल चयन गर्नुहोस् "
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "कुराकानी सुरू गर्नुहोस्"
 
 msgid "config:  Configure a chat room."
 msgstr "कन्फिग:कुराकानी कोठा कन्फिगर गर्नुहोस् ।"
@@ -4649,17 +4677,18 @@ msgstr "विषय [नयाँ विषय]:  विषय दृश्य
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "रोक्नुहोस् &lt;प्रयोगकर्ता&gt; [कोठा]:कोठाबाट प्रयोगकर्ता रोक्नुहोस् ।"
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "सम्बद्धन &lt;प्रयोगकर्ता&gt; &lt;मालिक|प्रशासन|सद्स्य|अन्तरजात|कुनै पनि हैन &gt;: "
 "कोठासहित प्रयोगकर्ताको सम्बद्धन सेट गर्नुहोस् ।"
 
 #, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "सम्बद्धन &lt;प्रयोगकर्ता&gt; &lt;मालिक|प्रशासन|सद्स्य|अन्तरजात|कुनै पनि हैन &gt;: "
 "कोठासहित प्रयोगकर्ताको सम्बद्धन सेट गर्नुहोस् ।"
@@ -4731,6 +4760,9 @@ msgstr "सर्भर जडान गर्नुहोस्"
 msgid "File transfer proxies"
 msgstr "फाइल स्थान्तरण पोर्ट"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4771,6 +4803,14 @@ msgstr "XML पद वर्णन त्रुटि"
 msgid "Unknown Error in presence"
 msgstr "उपस्थितिमा अज्ञात त्रुटि"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "%s कुराकानी जडान गर्दा त्रुटि"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "%s कुराकानीमा त्रुटि"
+
 msgid "Create New Room"
 msgstr "नयाँ कोठा सिर्जना गर्नुहोस्"
 
@@ -4789,13 +4829,32 @@ msgstr "कोठा कन्फिगर गर्नुहोस्"
 msgid "_Accept Defaults"
 msgstr "पूर्वनिर्धारणहरू स्विकार गर्नुहोस्"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "%s कुराकानी जडान गर्दा त्रुटि"
+#, fuzzy
+msgid "No reason"
+msgstr "कारण दिइएको छैन ।"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "%s कुराकानीमा त्रुटि"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "तपाईँ %s द्वारा बाहिरिनु भएको छ : (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s द्वारा फ्याँकिएको (%s)छ"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "फाइल खोलिरहेको बेलामा त्रुटि उत्पन्न भयो ।"
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "फाइल स्थानान्तरण रद्द भयो"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "छवि भण्डारण गर्न असफल भयो: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4821,10 +4880,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "कृपया तपाईँले जानकारी प्राप्त गर्न चाहेको व्यक्तिको पर्दा नाम प्रविष्टि गर्नुहोस् ।"
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "एउटा फाइल चयन गर्नुहोस् "
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "प्रयोगकर्ता मोडहरू"
 
@@ -4863,9 +4918,20 @@ msgstr "खाताहरू"
 msgid "Select an action"
 msgstr "एउटा फाइल चयन गर्नुहोस् "
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\" लाई थप गर्न अक्षम छ ।"
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "साथी सूची पुन:प्राप्त गर्न अक्षम भयो"
+msgid "Buddy Add error"
+msgstr "साथी सूची त्रुटि"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "निर्दिष्ट गरिएको पर्दा नाम अवैध हो।"
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5093,7 +5159,7 @@ msgstr "पैत्रिक सहमति बिनाका किड्क
 msgid "Passport account not yet verified"
 msgstr "पासवर्ड खाता अहिले सम्म प्रमाणीत भएको छैन"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "पासवर्ड खाता अहिले सम्म प्रमाणीत भएको छैन"
 
@@ -5117,6 +5183,10 @@ msgstr "रुचाइएको सम्पर्क"
 msgid "Non-IM Contacts"
 msgstr "सम्पर्क हटाउनुहोस्"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5187,6 +5257,13 @@ msgstr "मोवाइल सन्देश पठाउनुहोस् ।
 msgid "Page"
 msgstr "पृष्ठ"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "चेतावनी दिनुहोस्"
+
 msgid "Has you"
 msgstr "तपाईँ सँग  छ"
 
@@ -5230,6 +5307,14 @@ msgid "Album"
 msgstr ""
 
 #, fuzzy
+msgid "Game Title"
+msgstr "शीर्षक"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "शीर्षक"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "सहज नाम सेट गर्नुहोस्"
 
@@ -5271,9 +5356,6 @@ msgstr ""
 "MSNका लागि SSL समर्थन आवश्यक पर्दछ । कृपया, SSL समर्थित लाइब्रेरि स्थापना गर्नुहोस् । "
 "धेरै जानकारीका लागि http://Pidgin.sf.net/faq-ssl.php हेर्नुहोस् ।"
 
-msgid "Failed to connect to server."
-msgstr "सर्भरमा जडान गर्न असफल भयो ।"
-
 msgid "Error retrieving profile"
 msgstr "प्रोफाइल पुन: प्राप्त गर्दा त्रुटि"
 
@@ -5449,8 +5531,9 @@ msgstr ""
 "गाइमले प्रयोगकर्ताको प्रोफाइलमा कुनैपनि जानकारी फेला पार्न सकेन । प्रयोगकर्ता जरुर "
 "अवस्थित नहुनै पर्छ ।"
 
-msgid "Profile URL"
-msgstr "प्रोफाइल URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "जब अफ लाइन मा हुन्छ अनुमति दिइदैन"
 
 #. *< type
 #. *< ui_requirement
@@ -5488,67 +5571,29 @@ msgstr "सामान्य प्रमाणीकरण असफल!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "सामान्य प्रमाणीकरण असफल!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s वैध समूह हैन ।"
-
-msgid "Unknown error."
-msgstr "अज्ञात त्रुटि"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s (%s)मा%s"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ले तपाईँ फाइल पठाउन चाहन्छ"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "अज्ञात त्रुटि"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "%s प्रयोगकर्तालाई रोक्न अक्षम भयो"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "अज्ञात त्रुटि"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s)मा प्रयोगकर्ता थप्न अक्षम छ ।"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s)मा प्रयोगकर्ता रोक्न अक्षम छ"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s)मा प्रयोगकर्ता अनुमति दिन अक्षम छ"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s थप्न सकिएन किनभने तपाईँको साथी सूची भरिएको छ ।"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s वैध खाता पासपोर्ट होइन ।"
-
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "सेवा अस्थायी रुपमा उपलब्ध छैन"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "प्रयोगकर्ता अफलाइन भएका कारण सन्देश पठाउन सकिएन:"
 
-msgid "Unable to rename group"
-msgstr "समूहको नाम पुन:नामकरण गर्न अक्षम छ"
-
-msgid "Unable to delete group"
-msgstr "समूह मेटाउन अक्षम छ"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5592,9 +5637,6 @@ msgstr "सन्देश नगएको पनि हुनसक्छ क�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "सन्देश नगएको पनि हुनसक्छ किनभने अज्ञात त्रुटि आएको छ :"
 
-msgid "Unable to connect"
-msgstr "जडान गर्न अक्षम छ"
-
 msgid "Writing error"
 msgstr "लेखन त्रुटि"
 
@@ -5609,20 +5651,24 @@ msgstr ""
 "%s बाट (%s) सर्भरमा जडान त्रुटि:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "सर्भरद्वारा हाम्रो प्रोटोकल समर्थन हुदैन ।"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP पद वर्णन गर्दा त्रुटि ।"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "तपाईँले अर्को स्थानबाट साइनअन गर्नुभएको छ।"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN सर्भरहरू अस्थायी रुपमा उपलब्ध छैनन् । कृपया प्रतिक्षा गर्नुहोस् र फेरी प्रयास गर्नुहोस् ।"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN सर्भरहरू अस्थायी रुपमा बन्द हुन लाग्दैछन् ।"
 
 #, c-format
@@ -5653,6 +5699,14 @@ msgstr "कुकी पठाउँदैछ"
 msgid "Retrieving buddy list"
 msgstr "साथी सूची पुन:प्राप्ति गर्दैछ"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "कम्प्युटरबाट टाढा छ"
 
@@ -5690,14 +5744,6 @@ msgstr "स्विचबोर्डमा त्रुटि आएकाल�
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "सन्देश नगएको पनि हुनसक्छ किनभने अज्ञात त्रुटि आएको छ :"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s प्रयोगकर्ताले आफ्नो साथी सूचीमा %s थप्न चाहन्छ।"
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s प्रयोगकर्ताले आफ्नो साथी सूचीमा %s थप्न चाहन्छ।"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "ठेगाना पुस्तकमा थप्नुहोस्"
@@ -5706,13 +5752,6 @@ msgstr "ठेगाना पुस्तकमा थप्नुहोस्"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "के तपाईँं आफ्नो साथी सूचीमा यो साथी थप्न चाहानुहुन्छ?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "\"%s\" लाई थप गर्न अक्षम छ ।"
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "निर्दिष्ट गरिएको पर्दा नाम अवैध हो।"
@@ -5720,6 +5759,9 @@ msgstr "निर्दिष्ट गरिएको पर्दा नाम
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "प्रोफाइल URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5734,18 +5776,64 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "AIM/ICQ प्रोटोकल प्लगइन"
 
-msgid "Missing Cipher"
-msgstr ""
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s वैध समूह हैन ।"
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "अज्ञात त्रुटि"
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s (%s)मा%s"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s)मा प्रयोगकर्ता थप्न अक्षम छ ।"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s)मा प्रयोगकर्ता रोक्न अक्षम छ"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s)मा प्रयोगकर्ता अनुमति दिन अक्षम छ"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s थप्न सकिएन किनभने तपाईँको साथी सूची भरिएको छ ।"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s वैध खाता पासपोर्ट होइन ।"
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "सेवा अस्थायी रुपमा उपलब्ध छैन"
+
+msgid "Unable to rename group"
+msgstr "समूहको नाम पुन:नामकरण गर्न अक्षम छ"
+
+msgid "Unable to delete group"
+msgstr "समूह मेटाउन अक्षम छ"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s प्रयोगकर्ताले आफ्नो साथी सूचीमा %s थप्न चाहन्छ।"
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s प्रयोगकर्ताले आफ्नो साथी सूचीमा %s थप्न चाहन्छ।"
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "प्रयोगकर्ता कोठाहरू"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "डेटा पढ्दै"
 
@@ -5756,13 +5844,23 @@ msgstr "सर्भर बाट अवैध चुनौती"
 msgid "Logging in"
 msgstr "लगइन प्रक्रिया"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "कुनै पर्दानाम दिइएको छैन ।"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "नयाँ टाढा सन्देश"
@@ -5783,21 +5881,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "कुनै पर्दानाम दिइएको छैन ।"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "IM सञ्झ्यालहरू"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connected"
-msgstr "जडान गर्नुहोस्"
+msgid "Add contacts from server"
+msgstr "सर्भरबाट अवैध जवाफ ।"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5805,16 +5904,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "गलत उपनाम वा पासवर्ड ।"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "जडानलाई अन्तिम रुप दिँदै"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "कुराकानीमा साथी जडान गर्न असफल"
 
@@ -5825,14 +5931,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr "स्विच बोर्ड असफल भयो"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "प्रयोगकर्ता कोठाहरू"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "कुराकानीमा साथी जडान गर्न असफल"
@@ -5844,39 +5942,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "स्विच बोर्ड असफल भयो"
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "जडानलाई अन्तिम रुप दिँदै"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "भरिएको लाम"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "यो सन्देश पद वर्णन गर्न अक्षम छ"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "होस्टमा जडान गर्न सकिएन"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "IM सञ्झ्यालहरू"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "सर्भरबाट अवैध जवाफ ।"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5924,9 +5999,6 @@ msgstr "फन्ट साइज ठूलो पार्नुहोस्"
 msgid "User"
 msgstr "प्रयोगकर्ताहरू"
 
-msgid "Profile"
-msgstr "प्रोफाइल"
-
 #, fuzzy
 msgid "Headline"
 msgstr "घटाउनुहोस्"
@@ -5942,15 +6014,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "वार्तालाप बन्द गर्नुहोस्"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "कुनै पर्दानाम दिइएको छैन ।"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5963,6 +6030,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "यो विषयवस्तुसँग  कुनै उपलब्ध स्माइली छैनन् ।"
@@ -5971,6 +6041,14 @@ msgstr "यो विषयवस्तुसँग  कुनै उपलब�
 msgid "Please try another username:"
 msgstr "चयन गरिएको समूहका लागि एउटा नयाँ नाम प्रविष्टि गर्नुहोस् ।"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "कुनै पर्दानाम दिइएको छैन ।"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6168,10 +6246,6 @@ msgid "Master archive is misconfigured"
 msgstr "मास्टर संग्रह अनियमित कन्फिगर भएको छ"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "गलत उपनाम वा पासवर्ड ।"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "तपाईँले प्रविष्टि गराउनुभएको प्रयोगकर्तानाम होस्टले संगठित गर्न सकेन"
 
@@ -6213,9 +6287,9 @@ msgstr "या त प्रयोगकर्ता अफलाइनमा �
 msgid "Unknown error: 0x%X"
 msgstr "अज्ञात त्रुटि:0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "(%s)लगइन असफल भयो ।"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s प्रयोगकर्तालाई रोक्न अक्षम भयो"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6316,9 +6390,6 @@ msgstr "समूहगत सम्मेलन %d"
 msgid "Authenticating..."
 msgstr "प्रमाणीकरण गर्दैछ..."
 
-msgid "Unable to connect to server."
-msgstr "सर्भरमा जडान गर्न अक्षम ।"
-
 msgid "Waiting for response..."
 msgstr "प्रतिक्रियाका लागि पर्खिदैछ..."
 
@@ -6342,26 +6413,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "के तपाईँ वार्तालाप जडान गर्न चाहानुहुन्छ ?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"तपाईँ लगआउट भइसक्नु भएको छ किनभने तपाईँले अर्को कार्यक्षेत्रमा लगइन गरिसक्नु भएको छ ।"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s अफलाइन भएको देखिन्छ र तपाईँले पठाएको सन्देश प्राप्त गरेन ।"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "सर्भरमा जडान गर्न अक्षम भयो । कृपया तपाईँले जडान गर्न चाहानु भएको सर्भरको ठेगाना "
 "प्रविष्टि गर्नुहोस् ।"
 
-msgid "Error. SSL support is not installed."
-msgstr "त्रुटि. SSL समर्थन स्थापित छैन ।"
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "यो सम्मेलन बन्द भयो । कुनै सन्देशहरू पठाउन सकिदैन ।"
 
@@ -6385,6 +6449,26 @@ msgid "Server port"
 msgstr "सर्भर पोर्ट"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "सर्भरबाट अवैध जवाफ ।"
+
+#. username connecting too frequently
+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 ""
+"तपाईँले बारम्बार जडान र जडान विच्छेद गर्दै हुनुहुन्छ । दश मिनेट प्रतिक्षा गर्नुहोस् र फेरि "
+"प्रयास गर्नुहोस् । यदि तपाईँंले प्रयास गर्न जारी राख्नुभयो भने, तपाईँले झन बढी प्रतिक्षा "
+"गर्नुपर्ने हुन्छ ।"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "जडान सिर्जना गर्दा त्रुटि"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "जडान गर्न सकिएन"
 
@@ -6393,17 +6477,7 @@ msgid "Invalid chat room name"
 msgstr "अवैध कोठा नाम"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "जडान सिर्जना गर्दा त्रुटि"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
 
 #. *< type
@@ -6456,8 +6530,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6628,23 +6703,18 @@ msgstr "क्यामेरा"
 msgid "Screen Sharing"
 msgstr "पर्दा नाम"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "कुराकानी गर्न स्वतन्त्र"
 
-#, c-format
 msgid "Not Available"
 msgstr "उपलब्ध छैन"
 
-#, c-format
 msgid "Occupied"
 msgstr "आविष्ट"
 
-#, c-format
 msgid "Web Aware"
 msgstr "वेब सावधान"
 
-#, c-format
 msgid "Invisible"
 msgstr "अदृश्य"
 
@@ -6658,16 +6728,12 @@ msgid "Buddy Comment"
 msgstr "साथी टिप्पणी"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "स्थान्तरणका लागि जडान गर्न सकिएन"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "सर्भरमा जडान गर्न असफल भयो ।"
+msgid "Unable to connect to BOS server: %s"
+msgstr "सर्भरमा जडान गर्न अक्षम ।"
 
 #, fuzzy
 msgid "Username sent"
@@ -6682,53 +6748,64 @@ msgstr "जडानलाई अन्तिम रुप दिँदै"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "लगइन गर्न अक्षम: %s को रुपमा साइनअन गर्न सकेन किनभने पर्दा नाम अवैध छ ।  पर्दा नामहरू "
 "एउटा अक्षरबाट सुरू हुनुपर्दछ र अक्षरहरू, संख्याहरू र खाली स्थानहरू समाहित गर्न सक्दछ, वा "
 "केवल संख्याहरू मात्र समाहित गर्न सक्दछ ।"
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"तपाईँले क्रमबद्धरूपले जडान विच्छेद गर्न सक्नुहुन्छ ।  तपाईँं यो स्थिर TOC इकाइ प्रयोग गर्न "
+"चाहानुहुन्छ ।   अद्यावधिकका लागि %s जाँच गर्नुहोस् ।"
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "अवैध उपनाम"
+msgid "Unable to get a valid AIM login hash."
+msgstr "गाइम एउटा वैध AIM लगइन ह्यास प्राप्त गर्न अक्षम भयो ।"
 
-msgid "Incorrect password."
-msgstr "गलत पासवर्ड ।"
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "गाइम एउटा वैध लगइन ह्यास प्राप्त गर्न अक्षम भयो ।"
+
+msgid "Received authorization"
+msgstr "प्राप्त प्रमाणीकरण"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "प्रयोगकर्ता अवस्थित छैन"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "तपाईँको खाता हाल बन्द गरिएको छ ।"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL तयारी मेसेन्जर सेवा अस्थायी रुपमा उपलब्ध छैन ।"
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr ""
+"तपाईँले प्रयोग गरिरहनु भएको ग्राहक संस्करण अति पुरानो छ । कृपया %s मा स्तरवृद्धि गर्नुहोस्"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "तपाईँले बारम्बार जडान र जडान विच्छेद गर्दै हुनुहुन्छ । दश मिनेट प्रतिक्षा गर्नुहोस् र फेरि "
 "प्रयास गर्नुहोस् । यदि तपाईँंले प्रयास गर्न जारी राख्नुभयो भने, तपाईँले झन बढी प्रतिक्षा "
 "गर्नुपर्ने हुन्छ ।"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"तपाईँले प्रयोग गरिरहनु भएको ग्राहक संस्करण अति पुरानो छ । कृपया %s मा स्तरवृद्धि गर्नुहोस्"
-
-msgid "Could Not Connect"
-msgstr "जडान गर्न सकेन"
-
-msgid "Received authorization"
-msgstr "प्राप्त प्रमाणीकरण"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
 
 msgid "Enter SecurID"
@@ -6744,28 +6821,6 @@ msgstr "डिजिटल प्रदर्शन बाट ६ अङ्क �
 msgid "_OK"
 msgstr "ठीक छ"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"तपाईँले क्रमबद्धरूपले जडान विच्छेद गर्न सक्नुहुन्छ ।  तपाईँं यो स्थिर TOC इकाइ प्रयोग गर्न "
-"चाहानुहुन्छ ।   अद्यावधिकका लागि %s जाँच गर्नुहोस् ।"
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "गाइम एउटा वैध AIM लगइन ह्यास प्राप्त गर्न अक्षम भयो ।"
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"तपाईँले क्रमबद्धरूपले जडान विच्छेद गर्न सक्नुहुन्छ ।  तपाईँं यो स्थिर TOC इकाइ प्रयोग गर्न "
-"चाहानुहुन्छ ।   अद्यावधिकका लागि %s जाँच गर्नुहोस् ।"
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "गाइम एउटा वैध लगइन ह्यास प्राप्त गर्न अक्षम भयो ।"
-
 msgid "Password sent"
 msgstr "पासवर्ड पठाइयो"
 
@@ -6900,7 +6955,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "तपाईँले एउटा अज्ञात कारणका लागि %hu सन्देश %s बाट हराउनु भयो ।"
 msgstr[1] "तपाईँले एउटा अज्ञात कारणका लागि %hu सन्देश %s बाट हराउनु भयो ।"
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "सन्देश पठाउन अक्षम: %s"
@@ -6922,6 +6977,12 @@ msgstr "अनलाइन अवधि"
 msgid "Member Since"
 msgstr "सदस्य अवधि"
 
+msgid "Capabilities"
+msgstr "क्षमताहरू"
+
+msgid "Profile"
+msgstr "प्रोफाइल"
+
 msgid "Your AIM connection may be lost."
 msgstr "तपाईँंको AIM जडान हराएको हुनुपर्छ ।"
 
@@ -7096,7 +7157,7 @@ msgstr "टाढा सन्देश अति लामो भयो।"
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7123,9 +7184,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "अर्फन"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "साथी %s थप्न सकिएन किनभने तपाईँ सँग  साथी सूचिमा अति धेरै साथीहरू छन् । कृपया एउटा "
@@ -7135,7 +7196,7 @@ msgid "(no name)"
 msgstr "(नाम छैन)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "अज्ञात कारणका लागि तपाईँको आदेश असफल भयो ।"
 
 #, fuzzy, c-format
@@ -7208,6 +7269,7 @@ msgstr "जडान गर्नुहोस्"
 msgid "Get AIM Info"
 msgstr "जानकारी प्राप्त गर्नुहोस्"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "साथी टिप्पणी सम्पादन गर्नुहोस्"
 
@@ -7272,6 +7334,7 @@ msgstr "खोजी गर्नुहोस्"
 msgid "Set User Info (web)..."
 msgstr "(URL)प्रयोगकर्ता सूचना सेट गर्नुहोस्..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "पासवर्ड (URL) परिवर्तन गर्नुहोस्"
@@ -7307,6 +7370,10 @@ msgstr "इमेल द्वारा साथीको खोजी गर�
 msgid "Search for Buddy by Information"
 msgstr "सूचना द्वारा साथीको खोजी गर्नुहोस्"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "प्रयोगकर्ता लगइन भएको छैन"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7324,7 +7391,7 @@ msgstr "प्रत्यक्ष IM का लागि %s सँग  %s:%hu
 msgid "Attempting to connect to %s:%hu."
 msgstr "प्रत्यक्ष IM का लागि %s सँग  %s:%hu मा जडान गर्न प्रयास गर्दैछ।"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "जडान पुनर्निर्देशित गर्न प्रयत्न गरिदैछ..."
 
@@ -7433,7 +7500,7 @@ msgstr "ओपेरा"
 msgid "Visible"
 msgstr "अदृश्य"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7529,17 +7596,51 @@ msgstr "अन्तिम अद्यावधिक"
 msgid "Could not change buddy information."
 msgstr "पाउन्स गर्न साथी प्रविष्टि गर्नुहोस्"
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "मोबाइल फोन"
+
+msgid "Note"
+msgstr "द्रष्टव्य"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "साथी प्रतिमा"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "साथी थप्नुहोस्"
+msgid "_Modify"
+msgstr "परिमार्जन गर्नुहोस्"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "परिमार्जन गर्नुहोस्"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "सर्भर ब्यस्त छ"
 
-msgid "Input answer here"
+msgid "Your request was accepted."
 msgstr ""
 
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "प्रमाणीकरण अनुरोध गर्नुहोस्"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "तपाईँको सूचीमा साथी थप्नुहुन्छ?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "डाइरेक्टरी पठाउन सकिदैन ।"
+
 msgid "Send"
 msgstr "पठाउनुहोस्"
 
@@ -7551,19 +7652,20 @@ msgstr "अवैध पासवर्ड"
 msgid "Authorization denied message:"
 msgstr "प्रमाणीकरण अस्विकृत सन्देश:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "प्रमाणीकरण सुरू हुँदैछ"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "तपाईँको सूचीमा साथी थप्नुहुन्छ?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "एउटा सम्मेलन सर्भर प्रविष्ट गर्नुहोस्"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7586,7 +7688,7 @@ msgid "Failed sending authorize"
 msgstr "कृपया मलाई अधिकार दिनुहोस्!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "कुराकानीमा साथी जडान गर्न असफल"
 
 #, fuzzy, c-format
@@ -7632,6 +7734,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "अवैध प्रोक्सी सेटिङ्हरू"
+
+#, fuzzy
 msgid "Not member"
 msgstr "सदस्य अवधि"
 
@@ -7674,15 +7780,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "कुराकानीमा जडान गर्नुहोस्"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "टेलिफोन नम्बर"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7693,7 +7802,7 @@ msgstr "ध्वन विकल्पहरू"
 msgid "Failed:"
 msgstr "असफल भयो"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7705,11 +7814,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
-msgstr ""
+#, fuzzy
+msgid "Sorry, you are not our style"
+msgstr "माफ गर्नुहोस्, म केहिबेरका लागि बाहिर हिडेँ!"
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "टेलिफोन नम्बर"
 
 #, fuzzy
@@ -7720,7 +7830,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "के तपाईँ वार्तालाप जडान गर्न चाहानुहुन्छ ?"
 
 #, fuzzy
@@ -7728,28 +7838,28 @@ msgid "Setup"
 msgstr "सेट गर्नुहोस्"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "कुराकानीमा साथी जडान गर्न असफल"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "साथी हटाउनुहोस्"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "साथी हटाउनुहोस्"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7869,6 +7979,13 @@ msgstr "<b>प्रयोगकर्ता:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>उपनामहरू:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>प्रयोगकर्ता:</b> %s<br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7876,7 +7993,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "गाइमको बारेमा"
 
 #, fuzzy
@@ -7897,6 +8014,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "गाइमको बारेमा"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "गृह ठेगाना"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7928,7 +8049,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "जडान"
@@ -7941,6 +8061,9 @@ msgstr "कम विकल्पहरू देखाउनुहोस्"
 msgid "Show server news"
 msgstr "कम विकल्पहरू देखाउनुहोस्"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "पढाइ त्रुटि"
@@ -7950,11 +8073,7 @@ msgid "Update interval (seconds)"
 msgstr "पढाइ त्रुटि"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "सर्भर सूचना प्राप्त गर्न सक्दैन"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "सर्भर सूचना प्राप्त गर्न सक्दैन"
 
 #, c-format
@@ -7977,21 +8096,19 @@ msgid "Activation required"
 msgstr "आवश्यक दर्ता "
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "पढाइ त्रुटि"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "अनुरोध अस्पष्ट"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "याहू! प्रमाणीकरण असफल"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -8001,7 +8118,7 @@ msgstr "छवि बचत गर्नुहोस्"
 msgid "Enter code"
 msgstr "पासवर्ड परिवर्तन गर्नुहोस्"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -8009,69 +8126,43 @@ msgid "Enter the text from the image"
 msgstr "कृपया थप्नुपर्ने समूहको नाम प्रविष्टि गर्नुहोस् ।"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "जडान गर्न अक्षम ।"
-
 #, fuzzy
 msgid "Socket error"
 msgstr "त्रुटि पढ्नुहोस्"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "सकेट पढ्न अक्षम भयो"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "त्रुटि लेख्नुहोस्"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "जडान बन्द भयो"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "प्रयोगकर्ता सूचना सेट गर्नुहोस्..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "अनुरोध अस्वीकृत गरियो"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "होस्टमा जडान गर्न सकिएन"
+msgid "Unable to resolve hostname"
+msgstr "सर्भर पिङ्ग गर्न अक्षम"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "अवैध प्रयोगकर्तानाम वा पासवर्ड"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "सर्भर जडान गर्नुहोस्"
+msgid "Connecting to server"
+msgstr "SILC सर्भरमा जडान हुँदैछ"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "त्रुटि पढ्नुहोस्"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "कुराकानी जडान गर्न असफल"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8081,6 +8172,10 @@ msgid ""
 msgstr "ICQ सर्भर रिले"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)मा%s"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "बाट"
 
@@ -8090,32 +8185,30 @@ msgid ""
 "%s"
 msgstr "सर्भर सूचना "
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "अज्ञात कारण ।"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "आदेश"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "सर्भर सूचना प्राप्त गर्न सक्दैन"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "अज्ञात कारण ।"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "अज्ञात कारण ।"
 
 #, fuzzy, c-format
@@ -8130,10 +8223,6 @@ msgstr "फाइल पठाउन असफल भयो"
 msgid "%d canceled the transfer of %s"
 msgstr "%s ले %s को स्थानान्तरण रद्द गर्यो"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "जडान बन्द भयो"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>प्रयोगकर्ता:</b> %s<br>"
@@ -8195,19 +8284,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "जडान बन्द भयो"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "सकेटबाट पढ्दा त्रुटि ।"
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "सर्भरमा जडान गर्न अक्षम ।"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8235,6 +8311,10 @@ msgid "Video Camera"
 msgstr "भिडियो कुराकानी"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "फाइल स्थानान्तरणहरू"
+
+#, fuzzy
 msgid "Supports"
 msgstr "समर्थन"
 
@@ -8965,9 +9045,6 @@ msgstr "संस्था"
 msgid "Unit"
 msgstr "एकाइ"
 
-msgid "Note"
-msgstr "द्रष्टव्य"
-
 msgid "Join Chat"
 msgstr "कुराकानीमा जडान गर्नुहोस्"
 
@@ -9070,6 +9147,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "सञ्जाल तथ्याङ्क"
 
+msgid "Ping"
+msgstr "पिङ्ग गर्नुहोस्"
+
 msgid "Ping failed"
 msgstr "पिङ्ग असफल भयो"
 
@@ -9136,7 +9216,8 @@ msgstr "असमर्थित सार्वजनिक कुञ्जी
 msgid "Disconnected by server"
 msgstr "सर्भर बाट जडान विच्छेदन गरियो"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC सर्भरमा जडान गर्दा त्रुटि"
 
 msgid "Key Exchange failed"
@@ -9147,29 +9228,26 @@ msgid ""
 msgstr ""
 "असंलग्न सत्रको पुन: निरन्तरता असफल भयो । नयाँ जडान सिर्जना गर्न 'पुन:जडान' थिच्नुहोस् ।"
 
-msgid "Connection failed"
-msgstr "जडान असफल भयो"
-
 msgid "Performing key exchange"
 msgstr "कुञ्जी साटासाट सम्पादन"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "सार्वजनिक कुञ्जी लोड गर्न सकिएन"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC सर्भरमा जडान हुँदैछ"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "सार्वजनिक कुञ्जी लोड गर्न सकिएन"
+
 msgid "Out of memory"
 msgstr "स्मृती बाहिर"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC ग्राहक जडान सुरू गर्न सक्दैन"
 
 #, fuzzy
@@ -9481,7 +9559,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILC कुञ्जी जोडी सिर्जना गर्दैछ..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "SILC कुञ्जी जोडी सिर्जना गर्दैछ..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9575,6 +9653,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "सर्भर तथ्याङ्क उपलब्ध छैन"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC सर्भरमा जडान गर्दा त्रुटि"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "असफल:संस्करण मेल खाएन,तपाईँंको ग्राहक स्तरबृद्धि गर्नुहोस्"
@@ -9615,7 +9696,8 @@ msgstr "असफल: अवैध कुकी"
 msgid "Failure: Authentication failed"
 msgstr "असफल: प्रमाणीकरण असफल भयो"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC ग्राहक जडान सुरू गर्न सक्दैन"
 
 #, fuzzy
@@ -9623,32 +9705,29 @@ msgid "John Noname"
 msgstr "(नाम छैन)"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "सार्वजनिक कुञ्जी लोड गर्न सकिएन"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "पठाउन सकिएन"
-
-msgid "Could not connect"
-msgstr "जडान गर्न सकिएन"
+msgid "Unable to create connection"
+msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "अज्ञात कारण ।"
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "सकेट सिर्जना गर्न सकिएन"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "होस्टनाम निश्चय गर्न अक्षम भयो ।"
+msgid "Unable to create listen socket"
+msgstr "सकेट सिर्जना गर्न अक्षम भयो"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "IRC उपनामहरुले सेतो खाली ठाउँ समाविष्ट नगर्न सक्छ"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "कम विकल्पहरू देखाउनुहोस्"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9689,178 +9768,69 @@ msgstr "AP प्रयोगकर्ता"
 msgid "Auth Domain"
 msgstr "स्वचालित"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s को खोजी"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s जडान गर्न असफल"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "साइनअन: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "फाइल %s लेख्नका लागि अक्षम ।"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "फाइल %s पढ्नका लागि अक्षम ।"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "सन्देश धेरै लामो भयो, अन्तिम %s बाइटहरू पतन भयो ।"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s अहिले लगइन छैन ।"
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s को चेतावनी अनुमति छैन ।"
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "एउटा सन्देश छोडिएको छ, तपाईँ सर्भरलाई सिमित गतिमा बढाई रहनुभएको छ ।"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s मा कुराकानी उपलब्ध छैन ।"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "तपाईँले %s मा सन्देशहरू धेरै छिटो पठाई रहनु भएको छ ।"
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "तपाईँले %s बाट IM हराउनु भयो किनभने यो धेरै ठूलो थियो ।"
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "तपाईँले %s बाट IM हराउनु भयो किनभने यो पठउने कार्य धेरै छिटो भयो ।"
-
-#, c-format
-msgid "Failure."
-msgstr "असफलता ।"
-
-#, c-format
-msgid "Too many matches."
-msgstr "अति धेरै जोडीहरू ।"
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "अरू धेरै क्वालिफायरहरुको आवश्यकता ।"
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "डाइरेक्टरी सेवा अस्थायी रुपमा उपलब्ध छैन ।"
-
-#, fuzzy, c-format
-msgid "Email lookup restricted."
-msgstr "इमेल खोजी प्रतिबन्धित भयो ।"
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "कुञ्जीशब्द बेवास्ता गरियो।"
-
-#, c-format
-msgid "No keywords."
-msgstr "कुञ्जीशब्द्वहरू छैनन् ।"
-
-#, c-format
-msgid "User has no directory information."
-msgstr "प्रयोगकर्ता सँग  डाइरेक्टरी सूचना छैन ।"
-
-#, c-format
-msgid "Country not supported."
-msgstr "देश समर्थन गरिदैन "
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "अज्ञात असफलता: %s ।"
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "गलत उपनाम वा पासवर्ड ।"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "सेवा अस्थायी रुपमा उपलब्ध छैन ।"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  याहू सञ्झ्यालमा कुराकानी कोठा जडान गर्नुहोस्"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "लगइन गर्न तपाईँको चेतावनी स्तर एकदमै उच्च छ ।"
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "सूची:  यो सञ्जालमा च्यानलहरू सूचीबद्ध गर्नुहोस्"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"तपाईँ लगातार जडान गर्दै र बिच्छेदन गर्दै हुनुहुन्छ । दस मिनेट प्रतिक्षा गर्नुहोस् र फेरि प्रयास "
-"गर्नुहोस् ।  यदि तपाईँले प्रयास गर्न निरन्तरता दिनु भयो भने, तपाईँले लामो समय सम्म प्रतिक्ष "
-"गर्नु पर्नेछ ।"
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "एउटा अज्ञात साइनअन त्रुटि देखा पर्यो: %s ।"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "एउटा अज्ञात त्रुटि, %d, देखापर्यो ।  सूचना: %s"
 
 #, fuzzy
-msgid "Invalid Groupname"
-msgstr "अवैध समूह"
-
-msgid "Connection Closed"
-msgstr "जडान बन्द भयो"
-
-msgid "Waiting for reply..."
-msgstr "जवाफका लागि प्रतिक्षा गर्दैछ..."
+msgid "Yahoo ID..."
+msgstr "याहू! ID"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC यसको पजबाट फर्कियो । तपाईँ अब फेरि सन्देश पठाउन सक्नुहुन्छ ।"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "याहू प्रोटोकल प्लगइन"
 
-msgid "Password Change Successful"
-msgstr "पासवर्ड सफलतापूर्वक परिवर्तन भयो"
+#, fuzzy
+msgid "Pager server"
+msgstr "प्रोक्सि सर्भर"
 
-msgid "_Group:"
-msgstr "समूह:"
+msgid "Pager port"
+msgstr "पेजर पोर्ट"
 
-msgid "Get Dir Info"
-msgstr "डाइरेक्टरी सूचना प्राप्त गर्नुहोस्"
+#, fuzzy
+msgid "File transfer server"
+msgstr "फाइल स्थान्तरण होस्ट"
 
-msgid "Set Dir Info"
-msgstr "डाइरेक्टरी सूचना सेट गर्नुहोस्"
+msgid "File transfer port"
+msgstr "फाइल स्थान्तरण पोर्ट"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "लेख्नका लागि %s खोल्न सकिदैन!"
+#, fuzzy
+msgid "Chat room locale"
+msgstr "कुराकानी कोठा स्थानीयता"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "फाइल स्थान्तरणमा असफल; अन्य साइड सम्भवत: रद्द गरियो ।"
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
 
-msgid "Could not connect for transfer."
-msgstr "स्थान्तरणका लागि जडान गर्न सकिएन"
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "कुराकानी कोठा सूची युआरएल"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "फाइल हेडर लेख्न सकिएन ।  फाइल स्थान्तरण हुँदैन ।"
+msgid "Yahoo Chat server"
+msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "प्रतिमा यस रुपमा बचत गर्नुहोस्..."
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s ले %s लाई %d फाइल स्विकार गर्न अनुरोध गर्यो: %s (%.2f %s)%s%s"
-msgstr[1] "%s ले %s लाई %d फाइल स्विकार गर्न अनुरोध गर्यो: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "याहू जापान"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s ले तपाईँलाई तिनीहरुलाई फाइल पठाउन अनुरोध गर्दछ"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "याहू! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9872,11 +9842,11 @@ msgstr "%s ले तपाईँलाई तिनीहरुलाई फा
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC प्रोटोकल प्लगइन"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "याहू प्रोटोकल प्लगइन"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9902,6 +9872,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "साथी थप्न अस्वीकार गरियो"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "अज्ञात त्रुटि सङ्ख्या %d । याहू! वेबसाइटमा लगइन गर्नाले यसलाई स्थिर गर्न सक्छ ।"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "अज्ञात त्रुटि सङ्ख्या %d । याहू! वेबसाइटमा लगइन गर्नाले यसलाई स्थिर गर्न सक्छ ।"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "गलत उपनाम वा पासवर्ड ।"
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9932,11 +9926,12 @@ msgstr "तपाईँको खातामा ताल्चा लगाइ
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "अज्ञात त्रुटि सङ्ख्या %d । याहू! वेबसाइटमा लगइन गर्नाले यसलाई स्थिर गर्न सक्छ ।"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "खाता %s को सर्भर सूचीमा समूह %s मा साथी %s थप्न सकेन ।"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "सर्भर सूचीमा साथी थप्न सकेन"
 
 #, c-format
@@ -9944,23 +9939,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "सर्भरबाट अवैध जवाफ ।"
 
-msgid "Connection problem"
-msgstr "जडान समस्या"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "%s सँग  वार्तालाप"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
 
 #, fuzzy
 msgid "Not at Home"
@@ -10015,9 +10003,8 @@ msgstr "परिवेष सेटिङ्हरू प्रयोग गर
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "कुन ID सक्रिय गर्ने?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "जडान गर्नुहोस् को कुराकानीमा छ?"
@@ -10032,82 +10019,15 @@ msgstr "कुराकानीमा प्रयोगकर्ता जड�
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  याहू सञ्झ्यालमा कुराकानी कोठा जडान गर्नुहोस्"
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "सूची:  यो सञ्जालमा च्यानलहरू सूचीबद्ध गर्नुहोस्"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "याहू! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "याहू प्रोटोकल प्लगइन"
-
-msgid "Yahoo Japan"
-msgstr "याहू जापान"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "प्रोक्सि सर्भर"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "जापान पेजर होस्ट"
-
-msgid "Pager port"
-msgstr "पेजर पोर्ट"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "फाइल स्थान्तरण होस्ट"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "जापान फाइल स्थान्तरण होस्ट"
-
-msgid "File transfer port"
-msgstr "फाइल स्थान्तरण पोर्ट"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "कुराकानी कोठा स्थानीयता"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "कुराकानी कोठा सूची युआरएल"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "याहू जापान"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "जडान गर्न अक्षम ।"
+
 msgid "Unable to establish file descriptor."
 msgstr "फाइल वर्णनकर्ता स्थापना गर्न अक्षम ।"
 
@@ -10115,6 +10035,10 @@ msgstr "फाइल वर्णनकर्ता स्थापना गर
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s ले फाइल फठाउने प्रस्ताव गरिरहेको छ %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "त्रुटि लेख्नुहोस्"
+
 msgid "Yahoo! Japan Profile"
 msgstr "याहू! जापान प्रोफाइल"
 
@@ -10160,14 +10084,9 @@ msgstr "कूल लिङ्क ३"
 msgid "Last Update"
 msgstr "अन्तिम अद्यावधिक"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s का लागि प्रयोगकर्ता सूचना उपलब्ध छैन"
-
 #, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr "माफ गर्नुहोला, यो प्रोफाइल हाल समर्थन प्राप्त नभएको भाषामा देखिन्छ ।"
 
 msgid ""
@@ -10238,21 +10157,19 @@ msgstr "स्वरहरू"
 msgid "Webcams"
 msgstr "वेबक्यामहरू"
 
+msgid "Connection problem"
+msgstr "जडान समस्या"
+
 msgid "Unable to fetch room list."
 msgstr "कोठा सूची तान्न अक्षम ।"
 
 msgid "User Rooms"
 msgstr "प्रयोगकर्ता कोठाहरू"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT सर्भरसँग  जडान समस्या छ ।"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10385,21 +10302,15 @@ msgid "Exposure"
 msgstr "प्रदर्शक"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "सकेट सिर्जना गर्न अक्षम भयो"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "सन्देश पठाउन अक्षम: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "प्रोक्सी जडान त्रुटि %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "पहुँच अस्विकार: प्रोक्सी सर्भरले पोर्ट %d ट्युन्नेलिङ्ग रोकावट गर्दछ"
 
 #, fuzzy, c-format
@@ -10409,10 +10320,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "होस्टनाम निश्चय गर्न अक्षम भयो ।"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10509,10 +10416,6 @@ msgstr "कृपया अवरोध नगर्नुहोस्"
 msgid "Extended away"
 msgstr "टाढा फैल्याउनुहोस्"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "मोबाइल फोन"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10554,20 +10457,6 @@ msgstr "%s निष्क्रिय भएन"
 msgid "%x %X"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr ""
-"%s पढ्दा त्रुटि: \n"
-"%s.\n"
-
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"एउटा त्रुटि तपाईँको साथी सूची पद वर्णन गरेर देखा पर्यो । यो लोड भएको छैन, र पुरानो "
-"फाइल blist.xml~ मा सर्यो ।"
-
 msgid "Calculating..."
 msgstr "गणना गर्दैछ..."
 
@@ -10679,6 +10568,20 @@ msgstr "जडान बन्द भयो"
 msgid "Address already in use."
 msgstr "त्यो फाइल पहिलेनै अवस्थित छ"
 
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"%s पढ्दा त्रुटि: \n"
+"%s.\n"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"एउटा त्रुटि तपाईँको साथी सूची पद वर्णन गरेर देखा पर्यो । यो लोड भएको छैन, र पुरानो "
+"फाइल blist.xml~ मा सर्यो ।"
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "तात्कालिक मेसेन्जरहरू"
@@ -10727,10 +10630,9 @@ msgstr "नयाँ प्रत्र सूचनाहरू"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s विकल्पहरू"
+#, fuzzy
+msgid "_Advanced"
+msgstr "रद्द गर्नुहोस्"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10766,9 +10668,6 @@ msgstr "यदि तपाईँ वास्तविकता नजिकब
 msgid "you can see the butterflies mating"
 msgstr "तपाईँले पुतलीहरू जोडिएको हेर्नु सक्नुहुन्छ"
 
-msgid "Proxy Options"
-msgstr "प्रोक्सि विकल्पहरू "
-
 msgid "Proxy _type:"
 msgstr "प्रोक्सि प्रकार:"
 
@@ -10799,8 +10698,8 @@ msgid "Create _this new account on the server"
 msgstr ""
 
 #, fuzzy
-msgid "_Advanced"
-msgstr "रद्द गर्नुहोस्"
+msgid "_Proxy"
+msgstr "प्रोक्सि छैन"
 
 #, fuzzy
 msgid "Enabled"
@@ -10839,8 +10738,8 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "कोठा सूची"
+msgid "A_ccount"
+msgstr "खाता:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10848,8 +10747,9 @@ msgid ""
 msgstr ""
 "कृपया तपाईँले जडान गर्न चाहेको कुराकानीको बारेमा उचित जानकारीहरू प्रविष्टि गराउनुहोस् ।\n"
 
-msgid "_Account:"
-msgstr "खाता:"
+#, fuzzy
+msgid "Room _List"
+msgstr "कोठा सूची"
 
 #, fuzzy
 msgid "_Block"
@@ -10869,6 +10769,17 @@ msgid "I_M"
 msgstr "IM "
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "कुराकानी थप्नुहोस्"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "भिडियो कुराकानी"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "फाइल पठाउनुहोस्"
 
@@ -10880,7 +10791,11 @@ msgid "View _Log"
 msgstr "लग हेर्नुहोस्"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "जब अफ लाइन मा हुन्छ अनुमति दिइदैन"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "जब अफ लाइन मा हुन्छ अनुमति दिइदैन"
 
 msgid "_Alias..."
@@ -11025,6 +10940,10 @@ msgid "/Tools/_Certificates"
 msgstr "/उपकरणहरू/प्रथमिकताहरू"
 
 #, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/उपकरणहरू/ टाढा"
+
+#, fuzzy
 msgid "/Tools/Plu_gins"
 msgstr "/उपकरणहरू/प्लगइन कार्यहरू"
 
@@ -11034,10 +10953,6 @@ msgstr "/उपकरणहरू/प्रथमिकताहरू"
 msgid "/Tools/Pr_ivacy"
 msgstr "/उपकरणहरू/गोपनीयता"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/उपकरणहरू/ टाढा"
-
 msgid "/Tools/_File Transfers"
 msgstr "/उपकरणहरू/फाइल स्थानान्तरणहरू"
 
@@ -11170,8 +11085,8 @@ msgstr "म्यानुअल"
 msgid "By status"
 msgstr "वस्तुस्थिति द्वारा"
 
-msgid "By log size"
-msgstr "लग साइज द्वारा"
+msgid "By recent log activity"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "%s disconnected"
@@ -11189,6 +11104,9 @@ msgstr "पुन:जडान गर्नुहोस्"
 msgid "Re-enable"
 msgstr "नयाँ ज्याबर खाता रजिष्टार गर्नुहोस्"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s फर्कियो"
@@ -11288,6 +11206,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "उपनाम:"
 
+msgid "_Group:"
+msgstr "समूह:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11326,6 +11247,120 @@ msgstr "/उपकरणहरू"
 msgid "/Buddies/Sort Buddies"
 msgstr "/साथीहरू/अफलाइन साथीहरू देखाउनुहोस्"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "पृष्ठभूमि रङ"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "के तपाईँं आफ्नो साथी सूचीमा यो साथी थप्न चाहानुहुन्छ?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "लग बाहिरियो"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "पृष्ठभूमि रङ"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "विस्तारक साइज"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "पृष्ठभूमि रङ् चयन गर्नुहोस्"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "नष्ट गर्नुहोस्"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "पृष्ठभूमि रङ् चयन गर्नुहोस्"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "सर्टकटहरू"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "अनलाइन"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "चयन गरिएको साथीमा जानकारी प्राप्त गर्नुहोस्"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "टाढा"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "चयन गरिएको साथीमा जानकारी प्राप्त गर्नुहोस्"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "अफलाइन"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "चयन गरिएको साथीमा जानकारी प्राप्त गर्नुहोस्"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "पाठ"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "चयन गरिएको साथीमा जानकारी प्राप्त गर्नुहोस्"
+
+msgid "Message Text"
+msgstr "सन्देश पाठ"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "सन्देश पाठ"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s का लागि प्रयोगकर्ता सूचना परिवर्तन गर्नुहोस्"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11347,14 +11382,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "कुराकानी कोठा भित्र साथीलाई निमन्त्रणा गर्नुहोस्"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"कृपया तपाईँले निमन्त्रणा गर्न चाहेको प्रयोगकर्ताको नाम प्रविष्टि गर्नुहोस्,एच्छिक निमन्त्रणा "
-"सन्देश बराबर हुन्छ ।"
-
 msgid "_Buddy:"
 msgstr "साथी:"
 
@@ -11385,7 +11412,7 @@ msgid "Get Away Message"
 msgstr "नयाँ टाढा सन्देश"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "अन्तिम नाम"
 
 msgid "Unable to save icon file to disk."
@@ -11434,6 +11461,22 @@ msgstr "/वार्तालाप/यस रुपमा बचत गर्�
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/वार्तालाप/सफा गर्नुहोस्"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/वार्तालाप/बन्द गर्नुहोस्"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/वार्तालाप/बन्द गर्नुहोस्"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/वार्तालाप/बन्द गर्नुहोस्"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/वार्तालाप/दृश्य लग"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/वार्तालाप/फाइल पठाउनुहोस्..."
 
@@ -11512,6 +11555,18 @@ msgstr "/वार्तालाप"
 msgid "/Conversation/View Log"
 msgstr "/वार्तालाप/लग हेर्नुहोस्"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/वार्तालाप/बन्द गर्नुहोस्"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/वार्तालाप/लग हेर्नुहोस्"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/वार्तालाप/बन्द गर्नुहोस्"
+
 msgid "/Conversation/Send File..."
 msgstr "/वार्तालाप/फाइल पठाउनुहोस्..."
 
@@ -11711,6 +11766,9 @@ msgstr "ठेगाना"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "समर्थन"
 
@@ -11843,6 +11901,10 @@ msgid "Hungarian"
 msgstr "हन्गेरियन"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "रोमानियन"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "म्यासिडोनियन"
 
@@ -11860,6 +11922,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "हालका अनुवादकहरू"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "ओपेरा"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "निषेधित गरियो"
 
@@ -11883,6 +11949,10 @@ msgid "Macedonian"
 msgstr "म्यासिडोनियन"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "म्यासिडोनियन"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "नर्वेयीयन"
 
@@ -11940,6 +12010,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "स्विडिस"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "टर्मिनल"
@@ -11991,8 +12064,25 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
 
 #, fuzzy
@@ -12269,7 +12359,7 @@ msgid "Hyperlink visited color"
 msgstr "हाईपरलिंक रङ"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "हाइपरलिङ्कहरू कोर्न रङ्"
 
 #, fuzzy
@@ -12309,15 +12399,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "हटाउन मिल्ने सूचना"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "नयाँ प्रत्र सूचनाहरू"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12330,15 +12427,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "नयाँ प्रत्र सूचनाहरू"
 
-msgid "_Copy Email Address"
-msgstr "इ-मेल ठेगाना प्रतिलिपि गर्नुहोस्"
-
-msgid "_Open Link in Browser"
-msgstr "ब्राउजरमा लिङ्क खोल्नुहोस्"
-
-msgid "_Copy Link Location"
-msgstr "लिङ्क स्थान प्रतिलिपि बनाउनुहोस्"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12380,11 +12468,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "छवि बचत गर्नुहोस्"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "छवि बचत गर्नुहोस्..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "प्रयोगकर्ता विवरणहरू देखाउनुहोस्"
 
@@ -12476,10 +12563,6 @@ msgid "Font Face"
 msgstr "फन्ट मोहडा"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "पृष्ठभूमि रङ"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "अग्रभुमि फन्ट रङ"
 
@@ -12613,6 +12696,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12630,6 +12714,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12661,16 +12746,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "पेगिङ्ग"
 
-#, fuzzy
-msgid "Open All Messages"
-msgstr "सन्देश पठाउनुहोस्"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
 
 #, fuzzy
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "Calling..."
+msgstr "गणना गर्दैछ..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">तपाईँको मेल छ!</span>\n"
-"\n"
-"%s"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12703,6 +12799,35 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'म्यानुअल' ब्राउजर आदेश रोजिएको छ, तर कुनै आदेश सेट गरिएको छैन ।"
 
+#, fuzzy
+msgid "No message"
+msgstr "(१ सन्देश)"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "सन्देश पठाउनुहोस्"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">तपाईँको मेल छ!</span>\n"
+"\n"
+"%s"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "नयाँ साथी पाउन्स"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">तपाईँको मेल छ!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12761,11 +12886,18 @@ msgstr ""
 msgid "Select a file"
 msgstr "एउटा फाइल चयन गर्नुहोस् "
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "साथी पाउन्स सम्पादन गर्नुहोस्"
+
 #. Create the "Pounce on Whom" frame.
 #, fuzzy
 msgid "Pounce on Whom"
 msgstr "कसलाई पाउन्स गर्नुहुन्छ"
 
+msgid "_Account:"
+msgstr "खाता:"
+
 msgid "_Buddy name:"
 msgstr "साथी नाम:"
 
@@ -12846,7 +12978,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr "कहिले पाउन्स गर्नुहुन्छ"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "साथीले टाइप गर्न सुरू गर्दै हुनुहुन्छ"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "प्रयोगकर्ता टाइप गर्दै हुनुहुन्छ..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "साइनअन"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "निष्क्रिय बाट फर्कनुहोस्"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "टाढा बाट फर्कनुहोस्"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "साथीले टाइप गर्न रोक्नुभयो"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "साइनअफ"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s निष्क्रिय भयो"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "टाढा गएको बेला"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "सन्देश पठाउनुहोस्"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "अज्ञात घटना पाउन्स गर्नुहोस् । कृपया यो प्रतिवेदन गर्नुहोस्!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "छवि भण्डारण गर्न असफल भयो: %s\n"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12870,6 +13053,12 @@ msgstr "सर्टकटहरू"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "%s सँग  वार्तालाप"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "साथी सूची"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "प्रणाली ट्रे प्रतिमा"
 
@@ -12882,7 +13071,7 @@ msgid "On unread messages"
 msgstr "सन्देश पठाउनुहोस्"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM वार्तालाप सञ्झ्यालहरू"
 
 #, fuzzy
@@ -12892,6 +13081,10 @@ msgstr "वार्तालाप बन्द गर्नुहोस्"
 msgid "When away"
 msgstr "टाढा गएको बेला"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM वार्तालाप सञ्झ्यालहरू"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12956,10 +13149,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "सन्देशहरू प्राप्त गरिसके पछि सञ्झ्याल फ्ल्यास गर्नुहोस्"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM वार्तालाप सञ्झ्यालहरू"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12995,15 +13184,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "प्रयोगकर्ता जानकारी प्राप्त गर्न सक्दैन"
 
-#, fuzzy
-msgid "ST_UN server:"
-msgstr "सर्भर:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP ठेगाना स्वत:पत्ता लागाउनुहोस्"
 
 msgid "Public _IP:"
@@ -13026,6 +13211,10 @@ msgstr "पोर्ट सुरू गर्नुहोस्:"
 msgid "_End port:"
 msgstr "पोर्ट अन्त्य गर्नुहोस्:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "प्रोक्सि सर्भर"
@@ -13055,6 +13244,10 @@ msgstr "प्रोक्सि सर्भर"
 msgid "No proxy"
 msgstr "प्रोक्सि छैन"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "प्रयोगकर्ता:"
 
@@ -13225,14 +13418,14 @@ msgid "Auto-away"
 msgstr "स्वत: टाढा"
 
 #, fuzzy
-msgid "Change status when _idle"
-msgstr "निस्क्रिय बस्दा 'टाढा' सेट गर्नुहोस्"
-
-#, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr " 'टाढा सेट' गर्नु अघि मिनेटहरू:"
 
 #, fuzzy
+msgid "Change status when _idle"
+msgstr "निस्क्रिय बस्दा 'टाढा' सेट गर्नुहोस्"
+
+#, fuzzy
 msgid "Change _status to:"
 msgstr "ठेगाना परिवर्तन गर्नुहोस्:"
 
@@ -13389,29 +13582,19 @@ msgstr "बचत गर्नुहोस् र प्रयोग गर्�
 msgid "Status for %s"
 msgstr "वस्तुस्थिति: %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "स्माइली घुसाउनुहोस्"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "सार्वजनिक कुञ्जी फाइल"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "चयन गरिएको समूहका लागि एउटा नयाँ नाम प्रविष्टि गर्नुहोस् ।"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "स्माइली घुसाउनुहोस्"
@@ -13421,21 +13604,29 @@ msgid "Add Smiley"
 msgstr "मुस्कान!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "छवि बचत गर्नुहोस्"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "सर्टकटहरू"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "मुस्कान!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "सर्टकटहरू"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "साथी चयन गर्नुहोस्"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13524,8 +13715,8 @@ msgid "Cannot send launcher"
 msgstr "फाइल पठाउन सकिएन"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13560,6 +13751,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "लिङ्क यसमा खोल्नुहोस्:"
+
+msgid "_Copy Link Location"
+msgstr "लिङ्क स्थान प्रतिलिपि बनाउनुहोस्"
+
+msgid "_Copy Email Address"
+msgstr "इ-मेल ठेगाना प्रतिलिपि गर्नुहोस्"
+
+#, fuzzy
 msgid "Save File"
 msgstr "फाइल बचत गर्नुहोस्..."
 
@@ -13663,6 +13864,78 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "सर्भर ठेगाना"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "एउटा सम्मेलन सर्भर प्रविष्ट गर्नुहोस्"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "क्वेरीमा सम्मेलन सर्भर चयन गर्नुहोस्"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "अनलाइन सेवाहरू"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "साथी सूची पठाउनुहोस्"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "टाढा गएको बेला"
+
+#, fuzzy
+msgid "Directory"
+msgstr "डाइरेक्टरी खोजी"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "ध्वनि चयन"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>वर्णन:</b> स्पूकी"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "डाइरेक्टरी सूचना सेट गर्नुहोस्"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "ब्राउजर:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "प्रयोगकर्ता अवस्थित छैन"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "सर्भरले कुनै पनि समर्थित प्रमाणीकरण विधी प्रयोग गर्दैन"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "डाइरेक्टरी सूचना सेट गर्नुहोस्"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "साथी आइडल छ:"
 
@@ -14072,7 +14345,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14188,12 +14461,6 @@ msgstr ""
 "- यसले सबै आएका पाठहरू उल्ट्याउछ\n"
 "- यसले तपाईँको सूचीमा रहेका मानिसले साइनअन गर्ने बित्तिकै सन्देश पठाउँछ"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "हाईपरलिंक रङ"
@@ -14206,6 +14473,10 @@ msgstr "हाईपरलिंक रङ"
 msgid "Highlighted Message Name Color"
 msgstr "सन्देश पठाउनुहोस्"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "हटाउन मिल्ने सूचना"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14240,37 +14511,24 @@ msgstr "इन्टरफेस विकल्पहरू"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "रङहरू उपेक्षा गर्नुहोस्"
+msgid "Disable Typing Notification Text"
+msgstr "नयाँ प्रत्र सूचनाहरू"
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
 #, fuzzy
+msgid "Colors"
+msgstr "बन्द गर्नुहोस्"
+
+#, fuzzy
 msgid "Fonts"
 msgstr "खाताहरू"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "गाइम फाइल नियन्त्रण"
@@ -14361,7 +14619,7 @@ msgstr "IM वार्तालाप सञ्झ्यालहरू"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14414,6 +14672,111 @@ msgstr "पाठ प्रतिस्थापन"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "प्रयोगकर्ता परिभाषित नियम अनुसार बाहिर जाने सन्देशहरूमा पाठ बदल्छ ।"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "लगइन छैन"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s लगआउट भयो ।"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "एउटा कुराकानीमा भाग लिनुहोस्"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "उपेक्षा गर्नुहोस्"
+
+#, fuzzy
+msgid "Founder"
+msgstr "लोड गर्नुहोस्"
+
+#, fuzzy
+msgid "Operator"
+msgstr "ओपेरा"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "दिइएको प्रमाणीकरण"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "त्रुटि"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "सूचना"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "अनुरोध अस्पष्ट"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "चेतावनी स्तर"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "वस्तुस्थिति: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "कुराकानी कोठा स्थानीयता"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "प्रतिमा बचत गर्नुहोस्"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "खाता सूचना"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "साथी सूची"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "साथी सूची"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "गाइम प्रयोगकर्ता"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14584,10 +14947,6 @@ msgid "Only when docked"
 msgstr ""
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "सन्देशहरू प्राप्त गरिसके पछि सञ्झ्याल फ्ल्यास गर्नुहोस्"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "लगइन विकल्पहरू"
 
@@ -14595,9 +14954,10 @@ msgstr "लगइन विकल्पहरू"
 msgid "Options specific to Pidgin for Windows."
 msgstr "सञ्झ्यालको गाइममा विशेष विकल्पहरू"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "सञ्झ्यालको गाइममा विशेष विकल्पहरू"
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14639,6 +14999,517 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "सकेट खोल्न अक्षम भयो"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "सकेट सिर्जना गर्न सकिएन"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "सकेट पढ्न अक्षम भयो"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "जडान असफल भयो"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "सर्भर विच्छेद भएको छ"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "सकेट सिर्जना गर्न सकिएन"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "होस्टमा जडान गर्न सकिएन"
+
+#~ msgid "Read error"
+#~ msgstr "त्रुटि पढ्नुहोस्"
+
+#~ msgid "Write error"
+#~ msgstr "त्रुटि लेख्नुहोस्"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "डाइरेक्टरी सूचना सेट गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "विस्तृत ठेगाना"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "कुराकानीलाई उपनाम दिनुहोस्"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "प्रयोगकर्ता सँग  डाइरेक्टरी सूचना छैन ।"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "आदेश"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "एच टि एम एल"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "दर्ता त्रुटि"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "स्थान"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "साथी स्थितिको सूचना"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "असमर्थित संस्करण"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "अभिमुखीकरण"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "प्रयोगकर्ता मोडहरू"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "प्रयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "क्षमताहरू"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "प्रयोगकर्ता नाम"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "कुञ्जी साटासाटमा IM गर्नुहोस् "
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "इमेल ठेगाना"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "प्रोफाइल सेट गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "पिङ्ग गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "प्रयोगकर्ता नाम"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "प्रत्यक्ष भिडियो"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "सन्देश प्राप्त हुँदा"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "सार्वजनिक कुञ्जी ब्याबलप्रिन्ट"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "प्रयोगकर्ता विकल्पहरू"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "प्रयोगकर्ता मोडहरू"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "प्रयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "प्रयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ट्रिलियन गुप्तिकरण"
+
+#~ msgid "Read Error"
+#~ msgstr "त्रुटि पढ्नुहोस्"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "सर्भरमा जडान गर्न असफल भयो ।"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "भरिएको लाम"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "यो सन्देश पद वर्णन गर्न अक्षम छ"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "होस्टमा जडान गर्न सकिएन"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "(%s)लगइन असफल भयो ।"
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "सर्भरमा जडान गर्न अक्षम ।"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "तपाईँ लगआउट भइसक्नु भएको छ किनभने तपाईँले अर्को कार्यक्षेत्रमा लगइन गरिसक्नु भएको छ ।"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "त्रुटि. SSL समर्थन स्थापित छैन ।"
+
+#~ msgid "Incorrect password."
+#~ msgstr "गलत पासवर्ड ।"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "सर्भरमा जडान गर्न असफल भयो ।"
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "तपाईँले क्रमबद्धरूपले जडान विच्छेद गर्न सक्नुहुन्छ ।  तपाईँं यो स्थिर TOC इकाइ प्रयोग गर्न "
+#~ "चाहानुहुन्छ ।   अद्यावधिकका लागि %s जाँच गर्नुहोस् ।"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "जडान गर्न सकेन"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "अवैध उपनाम"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "सर्भर सूचना प्राप्त गर्न सक्दैन"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "जडान बन्द भयो"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "होस्टमा जडान गर्न सकिएन"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "जडान बन्द भयो"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "जडान बन्द भयो"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "सकेटबाट पढ्दा त्रुटि ।"
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "सर्भरमा जडान गर्न अक्षम ।"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "पठाउन सकिएन"
+
+#~ msgid "Could not connect"
+#~ msgstr "जडान गर्न सकिएन"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "सकेट सिर्जना गर्न सकिएन"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "होस्टनाम निश्चय गर्न अक्षम भयो ।"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "गलत पासवर्ड ।"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "याहू जापान"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "जापान पेजर होस्ट"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "जापान फाइल स्थान्तरण होस्ट"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "होस्टनाम निश्चय गर्न अक्षम भयो ।"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "सर्भर लगइनका लागि TLS/SSL आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM वार्तालाप सञ्झ्यालहरू"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "चयन गरिएको समूहका लागि एउटा नयाँ नाम प्रविष्टि गर्नुहोस् ।"
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "कुन ID सक्रिय गर्ने?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "रङहरू उपेक्षा गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "सन्देश अन्त्य गर्नुहोस्"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "कृपया तपाईँले निमन्त्रणा गर्न चाहेको प्रयोगकर्ताको नाम प्रविष्टि गर्नुहोस्,एच्छिक "
+#~ "निमन्त्रणा सन्देश बराबर हुन्छ ।"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "साथी सूची पुन:प्राप्त गर्न अक्षम भयो"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "तपाईँले क्रमबद्धरूपले जडान विच्छेद गर्न सक्नुहुन्छ ।  तपाईँं यो स्थिर TOC इकाइ प्रयोग गर्न "
+#~ "चाहानुहुन्छ ।   अद्यावधिकका लागि %s जाँच गर्नुहोस् ।"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "साथी थप्नुहोस्"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "सर्भर सूचना प्राप्त गर्न सक्दैन"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "पढाइ त्रुटि"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "सर्भर जडान गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "कुराकानी जडान गर्न असफल"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s को खोजी"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s जडान गर्न असफल"
+
+#~ msgid "Signon: %s"
+#~ msgstr "साइनअन: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "फाइल %s लेख्नका लागि अक्षम ।"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "फाइल %s पढ्नका लागि अक्षम ।"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "सन्देश धेरै लामो भयो, अन्तिम %s बाइटहरू पतन भयो ।"
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s अहिले लगइन छैन ।"
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s को चेतावनी अनुमति छैन ।"
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "एउटा सन्देश छोडिएको छ, तपाईँ सर्भरलाई सिमित गतिमा बढाई रहनुभएको छ ।"
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%s मा कुराकानी उपलब्ध छैन ।"
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "तपाईँले %s मा सन्देशहरू धेरै छिटो पठाई रहनु भएको छ ।"
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "तपाईँले %s बाट IM हराउनु भयो किनभने यो धेरै ठूलो थियो ।"
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "तपाईँले %s बाट IM हराउनु भयो किनभने यो पठउने कार्य धेरै छिटो भयो ।"
+
+#~ msgid "Failure."
+#~ msgstr "असफलता ।"
+
+#~ msgid "Too many matches."
+#~ msgstr "अति धेरै जोडीहरू ।"
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "अरू धेरै क्वालिफायरहरुको आवश्यकता ।"
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "डाइरेक्टरी सेवा अस्थायी रुपमा उपलब्ध छैन ।"
+
+#, fuzzy
+#~ msgid "Email lookup restricted."
+#~ msgstr "इमेल खोजी प्रतिबन्धित भयो ।"
+
+#~ msgid "Keyword ignored."
+#~ msgstr "कुञ्जीशब्द बेवास्ता गरियो।"
+
+#~ msgid "No keywords."
+#~ msgstr "कुञ्जीशब्द्वहरू छैनन् ।"
+
+#~ msgid "User has no directory information."
+#~ msgstr "प्रयोगकर्ता सँग  डाइरेक्टरी सूचना छैन ।"
+
+#~ msgid "Country not supported."
+#~ msgstr "देश समर्थन गरिदैन "
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "अज्ञात असफलता: %s ।"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "गलत उपनाम वा पासवर्ड ।"
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "सेवा अस्थायी रुपमा उपलब्ध छैन ।"
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "लगइन गर्न तपाईँको चेतावनी स्तर एकदमै उच्च छ ।"
+
+#~ 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 ""
+#~ "तपाईँ लगातार जडान गर्दै र बिच्छेदन गर्दै हुनुहुन्छ । दस मिनेट प्रतिक्षा गर्नुहोस् र फेरि "
+#~ "प्रयास गर्नुहोस् ।  यदि तपाईँले प्रयास गर्न निरन्तरता दिनु भयो भने, तपाईँले लामो समय "
+#~ "सम्म प्रतिक्ष गर्नु पर्नेछ ।"
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "एउटा अज्ञात साइनअन त्रुटि देखा पर्यो: %s ।"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "एउटा अज्ञात त्रुटि, %d, देखापर्यो ।  सूचना: %s"
+
+#, fuzzy
+#~ msgid "Invalid Groupname"
+#~ msgstr "अवैध समूह"
+
+#~ msgid "Connection Closed"
+#~ msgstr "जडान बन्द भयो"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "जवाफका लागि प्रतिक्षा गर्दैछ..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC यसको पजबाट फर्कियो । तपाईँ अब फेरि सन्देश पठाउन सक्नुहुन्छ ।"
+
+#~ msgid "Password Change Successful"
+#~ msgstr "पासवर्ड सफलतापूर्वक परिवर्तन भयो"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "डाइरेक्टरी सूचना प्राप्त गर्नुहोस्"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "डाइरेक्टरी सूचना सेट गर्नुहोस्"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "लेख्नका लागि %s खोल्न सकिदैन!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "फाइल स्थान्तरणमा असफल; अन्य साइड सम्भवत: रद्द गरियो ।"
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "स्थान्तरणका लागि जडान गर्न सकिएन"
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "फाइल हेडर लेख्न सकिएन ।  फाइल स्थान्तरण हुँदैन ।"
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "प्रतिमा यस रुपमा बचत गर्नुहोस्..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s ले %s लाई %d फाइल स्विकार गर्न अनुरोध गर्यो: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s ले %s लाई %d फाइल स्विकार गर्न अनुरोध गर्यो: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s ले तपाईँलाई तिनीहरुलाई फाइल पठाउन अनुरोध गर्दछ"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC प्रोटोकल प्लगइन"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%s का लागि प्रयोगकर्ता सूचना उपलब्ध छैन"
+
+#~ msgid "%s Options"
+#~ msgstr "%s विकल्पहरू"
+
+#~ msgid "Proxy Options"
+#~ msgstr "प्रोक्सि विकल्पहरू "
+
+#~ msgid "By log size"
+#~ msgstr "लग साइज द्वारा"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "ब्राउजरमा लिङ्क खोल्नुहोस्"
+
+#, fuzzy
+#~ msgid "ST_UN server:"
+#~ msgstr "सर्भर:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "छवि बचत गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "सर्टकटहरू"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "सन्देशहरू प्राप्त गरिसके पछि सञ्झ्याल फ्ल्यास गर्नुहोस्"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "त्यो नाम सहितको फोल्डर पहिल्यै अवस्थित छ"
 
@@ -14707,13 +15578,6 @@ msgstr ""
 #~ msgstr "के तपाईँ टाढा सन्देश हटाउने कुरामा निश्चिन्त हुनुहुन्छ \"%s\"?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)मा%s"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "सन्देश पठाउनुहोस्"
 
@@ -14852,9 +15716,6 @@ msgstr ""
 #~ msgid "Invalid screen name"
 #~ msgstr "अवैध प्रयोगकर्तानाम"
 
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "अति दुष्ट (प्रेसक)"
 
@@ -14915,18 +15776,10 @@ msgstr ""
 #~ msgstr "%s मा प्रयोगकर्ताहरू: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "के तपाईँं आफ्नो साथी सूचीमा यो साथी थप्न चाहानुहुन्छ?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "फाइल सञ्चालन त्रुटि"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "जडान सिर्जना गर्दा त्रुटि"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "AIM मा लगइन गर्न अक्षम"
 
@@ -15045,17 +15898,9 @@ msgstr ""
 #~ msgstr "हालसालै"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "सर्भरमा जडान गर्न अक्षम ।"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "सन्देश:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "खाता:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "विच्छेद त्रुटिहरू लुकाउनुहोस्"
 
@@ -15157,8 +16002,8 @@ msgstr ""
 #~ "You can get version %s from:<br><a href=\"http://Pidgin.sourceforge.net/"
 #~ "\">http://Pidgin.sourceforge.net</a>."
 #~ msgstr ""
-#~ "%s बाट तपाईँले संस्करण पाउन सक्नुहुन्छ :<br><a href=\"http://Pidgin.sourceforge.net/"
-#~ "\">http://Pidgin.sourceforge.net</a> ।"
+#~ "%s बाट तपाईँले संस्करण पाउन सक्नुहुन्छ :<br><a href=\"http://Pidgin.sourceforge."
+#~ "net/\">http://Pidgin.sourceforge.net</a> ।"
 
 #~ msgid "Delay"
 #~ msgstr "ढिला"
@@ -15214,18 +16059,12 @@ msgstr ""
 #~ msgid "Group not removed"
 #~ msgstr "समूह हटेको छैन"
 
-#~ msgid "Buddy List Error"
-#~ msgstr "साथी सूची त्रुटि"
-
 #~ msgid "(+%d more)"
 #~ msgstr "(+%d धेरै)"
 
 #~ msgid " left the room (%s)."
 #~ msgstr "कोठा (%s) बाट बाहिरियो ।"
 
-#~ msgid "Expander Size"
-#~ msgstr "विस्तारक साइज"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "विस्तारक बाँणको साइज"
 
@@ -15396,13 +16235,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>वर्णन:</b> स्पूकी"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status</b>: Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15430,9 +16262,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "चयन गरिएको साथीमा एउटा सन्देश पठाउनुहोस्"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "चयन गरिएको साथीमा जानकारी प्राप्त गर्नुहोस्"
-
 #~ msgid "_Chat"
 #~ msgstr "कुराकानी"
 
@@ -15589,9 +16418,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "निष्क्रिय"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "निष्क्रिय बाट फर्कनुहोस्"
-
 #~ msgid "Pounce Action"
 #~ msgstr "कार्य पाउन्स गर्नुहोस्"
 
@@ -15728,9 +16554,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "सारांश"
 
-#~ msgid "Message Text"
-#~ msgstr "सन्देश पाठ"
-
 #~ msgid "Away Messages"
 #~ msgstr "टाढा सन्देशहरू"
 
@@ -15799,8 +16622,8 @@ msgstr ""
 #~ msgstr "प्राथमिकताहरुलाई लोड गर्न अक्षम"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
 #~ "गाइम तपाईँको प्राथमिकताहरू लोड गर्न सक्षम भएन किनभने तिनीहरू पुरानो ढाँचामा भण्डारण "
@@ -15843,9 +16666,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "GG लाइब्रेरिमा संवेदनशील त्रुटि\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "सर्भर पिङ्ग गर्न अक्षम"
-
 #~ msgid "Send as message"
 #~ msgstr "सन्देशको रुपमा पठाउनुहोस्"
 
@@ -15914,15 +16734,15 @@ msgstr ""
 #~ msgstr "डाइरेक्टरी पहुँच गर्न अक्षम भयो"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "गाइम डाइरेक्टरी खोजी गर्न अक्षम थियो किनभने यो डाइरेक्टरी सर्भरमा जडान हुन सकेको "
 #~ "थिएन । कृपया फेरी प्रयास गर्नुहोस् ।"
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
 #~ "गाइम Gadu-Gadu सर्भरमा एउटा त्रुटि जडान भएको कारणले गर्दा तपाईँको पासवर्ड "
 #~ "परिवर्तन गर्न सक्षम भएन ।  कृपया पछि फेरी प्रयास गर्नुहोस् ।"
@@ -15934,8 +16754,8 @@ msgstr ""
 #~ msgstr "प्रयोगकर्ता प्रोफाइल पहुँच गर्न अक्षम भयो ।"
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "डाइरेक्टरी सर्भरमा एउटा त्रुटि जडान भएको कारणले गर्दा यो प्रयोगकर्ताको फाइल गाइमले "
 #~ "पहुँच गर्न सकेन । कृपया पछि फेरी प्रयास गर्नुहोस् । "
@@ -15952,9 +16772,6 @@ msgstr ""
 #~ msgid "Nick:"
 #~ msgstr "उपनाम:"
 
-#~ msgid "Pidgin User"
-#~ msgstr "गाइम प्रयोगकर्ता"
-
 #~ msgid "File Transfer Aborted"
 #~ msgstr "फाइल स्थानान्तर परित्याग गरियो"
 
@@ -16205,8 +17022,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "जब यो हुन्छ, TOC ले यसमा पठाइएको कुनै सन्देशहरुलाई उपेक्षा गर्दछ, र तपाईँले सन्देश पठाउनु "
 #~ "भयो भने फालिदिन्छ ।गाइमले कुनै पनि मार्फत गएकोलाई रोक्छ । यो मात्र अस्थायी हो, "
@@ -16253,8 +17070,8 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "सामान्य प्रमाणीकरण विधि असफल भयो । यसको मतलब कि त तपाईँको पासवर्ड गलत छ, वा "
 #~ "याहूको प्रमाणीकरण योजना परिवर्तन भयो । वेब मेसेन्जर प्रमाणीकरण प्रयोग गरेर गाइमले "
@@ -16284,15 +17101,9 @@ msgstr ""
 #~ msgstr[0] "(%d सन्देश)"
 #~ msgstr[1] "(%d सन्देशहरू)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(१ सन्देश)"
-
 #~ msgid "%s logged in."
 #~ msgstr "%s लग भयो ।"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s लगआउट भयो ।"
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -16310,9 +17121,6 @@ msgstr ""
 #~ "%s ले %s लाई कुराकानी कोठा %s मा निमन्त्रणा गर्यो:\n"
 #~ "<b>%s</b>"
 
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "माफ गर्नुहोस्, म केहिबेरका लागि बाहिर हिडेँ!"
-
 #~ msgid "_Warn"
 #~ msgstr "चेतावनि दिनुहोस्"
 
diff --git a/po/nl.po b/po/nl.po
index 5910a4d587..79c610336e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-08 22:34-0500\n"
-"PO-Revision-Date: 2009-01-06 17:27+0100\n"
+"POT-Creation-Date: 2009-07-21 08:28-0700\n"
+"PO-Revision-Date: 2009-07-20 12:53+0100\n"
 "Last-Translator: Daniël Heres <danielheres@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -29,13 +29,13 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Probeer '%s -h' voor meer informatie.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -610,19 +610,6 @@ msgstr "Logboek wordt vanaf nu niet meer bijgehouden."
 msgid "Send To"
 msgstr "Verzenden aan"
 
-msgid "Invite message"
-msgstr "Uitnodiging"
-
-msgid "Invite"
-msgstr "Uitnodigen"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Geef de naam van de persoon die u wilt uitnodigen,\n"
-"eventueel met een uitnodigende tekst."
-
 msgid "Conversation"
 msgstr "Gesprek"
 
@@ -878,6 +865,39 @@ msgstr "Alle gesprekken"
 msgid "System Log"
 msgstr "Systeemlogboek"
 
+msgid "Calling ... "
+msgstr "Bellen..."
+
+msgid "Hangup"
+msgstr "Ophangen"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Accepteren"
+
+msgid "Reject"
+msgstr "Weigeren"
+
+msgid "Call in progress."
+msgstr "Gesprek bezig"
+
+msgid "The call has been terminated."
+msgstr "Het gesprek is stopgezet"
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s wil een audiogesprek starten."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s probeert een niet ondersteund mediagesprek te starten."
+
+msgid "You have rejected the call."
+msgstr "Het telefoontje is genegeerd."
+
+msgid "call: Make an audio call."
+msgstr "gesprek: Bel op."
+
 msgid "Emails"
 msgstr "E-mails"
 
@@ -912,6 +932,9 @@ msgstr "Doorgaan"
 msgid "IM"
 msgstr "Bericht"
 
+msgid "Invite"
+msgstr "Uitnodigen"
+
 msgid "(none)"
 msgstr "(geen)"
 
@@ -1115,7 +1138,6 @@ msgstr "%s is weggegaan. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s heeft u een bericht toegestuurd. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Onbekend contactalarm. Rapporteer dit alstublieft!"
 
@@ -1161,7 +1183,6 @@ msgstr "Minuten voor wijzigen van status"
 msgid "Change status to"
 msgstr "Status veranderen in "
 
-#. Conversations
 msgid "Conversations"
 msgstr "Gesprekken"
 
@@ -1531,6 +1552,29 @@ msgstr "GntGeschiedenis"
 msgid "Lastlog plugin."
 msgstr "Geschiedenis-plug-in."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Ophalen TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Alleen TinyURL aanmaken voor koppelingen van deze lengte of langer"
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL plug-in"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "accounts"
 
@@ -1634,13 +1678,6 @@ msgstr "Certificaat voor %s accepteren?"
 msgid "SSL Certificate Verification"
 msgstr "SSL-certificaat-controle"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Accepteren"
-
-msgid "Reject"
-msgstr "Weigeren"
-
 msgid "_View Certificate..."
 msgstr "_Bekijk certificaat..."
 
@@ -1654,6 +1691,7 @@ msgstr ""
 "Het certificaat van \"%s\" is zelf-gesigneerd. Het kan niet automatisch "
 "gecontroleerd worden."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "De certificaat-keten van %s is niet geldig."
@@ -1663,6 +1701,7 @@ msgstr "De certificaat-keten van %s is niet geldig."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL-certificaat fout"
 
@@ -1743,6 +1782,7 @@ msgstr "+++ %s heeft zich aangemeld"
 msgid "+++ %s signed off"
 msgstr "+++ %s heeft zich afgemeld"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -1789,6 +1829,17 @@ msgstr "%s is weggegaan."
 msgid "%s left the room (%s)."
 msgstr "%s is weggegaan (%s)."
 
+msgid "Invite to chat"
+msgstr "Uitnodigen voor gesprek"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Geef de bijnaam van de persoon die u wilt uitnodigen, eventueel met een "
+"uitnodigende tekst"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kan geen nieuwe verbinding maken: %s"
@@ -1923,6 +1974,10 @@ msgstr "Aanbieden om %s naar %s te sturen"
 msgid "Starting transfer of %s from %s"
 msgstr "Overdracht van %s van %s wordt gestart"
 
+#, fuzzy, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Bestandsoverdracht van %s voltooid"
+
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Bestandsoverdracht van %s voltooid"
@@ -2152,6 +2207,10 @@ msgstr "<font color=\"red\"><b>Kan bestand niet lezen: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-ANTWOORD>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Fout bij maken verbinding"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "je gebruikt %s, maar de plug-in heeft %s nodig."
@@ -2574,9 +2633,10 @@ msgstr "Logboeken van andere clients tonen in ons logboek."
 
 #  * description
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2631,8 +2691,9 @@ msgstr "Offline berichten emulatie"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Berichten aan een offline gebruiker opslaan in alarm"
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr "De rest van de berichten zal in het alarm worden opgeslagen. Je kan"
 
@@ -2662,6 +2723,32 @@ msgstr "Offline berichten in alarm opslaan."
 msgid "Do not ask. Always save in pounce."
 msgstr "Vraag niet. Altijd in alarm opslaan."
 
+# wachtwoord invoeren
+msgid "One Time Password"
+msgstr "Eenmalig wachtwoord"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Ondersteuning eenmalig wachtwoord"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2856,14 +2943,16 @@ msgstr ""
 "te maken van TCL-plug-ins, installeer ActiveTCL vanaf http://www.activestate."
 "com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "De Apple Bonjour For Windows toolkit is niet geconden, bekijk de FAQ op "
 "http://d.pidgin.im/BonjourWindow voor meer informatie."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Kan niet luisteren naar binnenkomende gespreksverzoeken\n"
 
 msgid ""
@@ -2871,7 +2960,6 @@ msgid ""
 msgstr ""
 "Kan geen verbinding maken met de lokale mDNS server. Is deze wel gestart?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Voornaam"
 
@@ -2903,6 +2991,10 @@ msgstr "Bonjour-protocol plug-in"
 msgid "Purple Person"
 msgstr "Purple mens"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "Locale poort"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2913,14 +3005,17 @@ msgstr "%s heeft het gesprek gesloten."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kan het bericht niet verzenden. Kan geen gesprek starten."
 
-msgid "Cannot open socket"
-msgstr "Kan socket niet openen"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Kan geen socket aanmaken: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Kan socket niet koppelen aan poort"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Kan socket niet koppelen aan poort: %s"
 
-msgid "Could not listen on socket"
-msgstr "Kan niet luisteren naar socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Kan niet aan socket luisteren: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Fout bij het communiceren met lokale mDNSResponder"
@@ -2967,14 +3062,15 @@ msgstr "Contactenlijst opslaan..."
 msgid "Load buddylist from file..."
 msgstr "Contactenlijst laden uit bestand..."
 
-msgid "Fill in the registration fields."
-msgstr "Registratievelden invullen."
+msgid "You must fill in all registration fields"
+msgstr "Alle registratievelden moeten ingevuld worden"
 
-msgid "Passwords do not match."
-msgstr "Wachtwoorden komen niet overeen."
+msgid "Passwords do not match"
+msgstr "Wachtwoorden komen niet overeen"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Kan geen nieuw account registreren. Er is een fout opgetreden.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+"Kan geen nieuw account registreren. Er is eenonbekende fout opgetreden."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nieuw Gadu-Gadu account geregistreerd"
@@ -2985,14 +3081,14 @@ msgstr "Registratie voltooid."
 msgid "Password"
 msgstr "Wachtwoord"
 
-msgid "Password (retype)"
-msgstr "Wachtwoord (nogmaals)"
+msgid "Password (again)"
+msgstr "Nieuw wachtwoord (herhalen)"
 
-msgid "Enter current token"
-msgstr "Geef huidige teken"
+msgid "Enter captcha text"
+msgstr "Captcha tekst invoeren"
 
-msgid "Current token"
-msgstr "Huidige teken"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Nieuw Gadu-gadu-account registreren"
@@ -3045,6 +3141,15 @@ msgstr "Wachtwoord gewijzigd."
 msgid "Current password"
 msgstr "Huidige wachtwoord"
 
+msgid "Password (retype)"
+msgstr "Wachtwoord (nogmaals)"
+
+msgid "Enter current token"
+msgstr "Geef huidige teken"
+
+msgid "Current token"
+msgstr "Huidige teken"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Geef je huidige wachtwoord en nieuwe wachtwoord voor UIN: "
 
@@ -3058,6 +3163,7 @@ msgstr "Kies een chatgesprek voor het contact: %s"
 msgid "Add to chat..."
 msgstr "Toevoegen aan chatgesprek..."
 
+#. Global
 msgid "Available"
 msgstr "Beschikbaar"
 
@@ -3091,8 +3197,8 @@ msgstr "Niet overeenkomende gebruikers gevonden"
 msgid "There are no users matching your search criteria."
 msgstr "Er zijn geen overeenkomende gebruikers voor uw zoekcriteria"
 
-msgid "Unable to read socket"
-msgstr "Kan niet lezen van socket."
+msgid "Unable to read from socket"
+msgstr "Kan niet lezen van socket"
 
 msgid "Buddy list downloaded"
 msgstr "Contactenlijst gedownload"
@@ -3106,8 +3212,14 @@ msgstr "Contactenlijst verzonden"
 msgid "Your buddy list was stored on the server."
 msgstr "Uw contactenlijst is opgeslagen op de server."
 
-msgid "Connection failed."
-msgstr "Verbinding mislukt."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Verbonden"
+
+msgid "Connection failed"
+msgstr "Verbinding mislukt"
 
 msgid "Add to chat"
 msgstr "Toevoegen aan chatgesprek"
@@ -3115,14 +3227,23 @@ msgstr "Toevoegen aan chatgesprek"
 msgid "Chat _name:"
 msgstr "_Naam chatgesprek:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Kan geen verbinding maken met de computer."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Verbinding wordt gemaakt"
+
 msgid "Chat error"
 msgstr "Chatfout"
 
 msgid "This chat name is already in use"
 msgstr "De naam bestaat reeds"
 
-msgid "Not connected to the server."
-msgstr "Niet verbonden met de server."
+msgid "Not connected to the server"
+msgstr "Niet verbonden met de server"
 
 msgid "Find buddies..."
 msgstr "Contacten zoeken..."
@@ -3164,6 +3285,9 @@ msgstr "Populaire Poolse client voor berichten"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-gadu-gebruiker"
 
+msgid "GG server"
+msgstr "GG-server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Onbekende opdracht: %s"
@@ -3178,7 +3302,7 @@ msgstr "Geen onderwerp ingesteld"
 msgid "File Transfer Failed"
 msgstr "Bestandsoverdracht mislukt"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Kon geen poort openen om te luisteren."
 
 msgid "Error displaying MOTD"
@@ -3194,8 +3318,16 @@ msgstr "Er is geen MOTD geassocieerd met deze verbinding."
 msgid "MOTD for %s"
 msgstr "MOTD voor %s"
 
-msgid "Server has disconnected"
-msgstr "Server heeft verbinding verbroken"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Verbinding verloren met server: %s"
 
 msgid "View MOTD"
 msgstr "MOTD weergeven"
@@ -3206,25 +3338,24 @@ msgstr "_Ruimte:"
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-bijnamen mogen geen spaties bevatten"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Verbinding wordt gemaakt"
-
 msgid "SSL support unavailable"
 msgstr "SSL niet beschikbaar"
 
-msgid "Couldn't create socket"
-msgstr "Kan geen socket aanmaken"
+msgid "Unable to connect"
+msgstr "Kan geen verbinding maken"
 
-msgid "Couldn't connect to host"
-msgstr "Kan geen verbinding maken met host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Kan geen verbinding maken met %s"
 
-msgid "Read error"
-msgstr "Leesfout"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server heeft de verbinding verbroken."
 
 msgid "Users"
 msgstr "Gebruikers"
@@ -3405,6 +3536,16 @@ msgstr ""
 "Uw gekozen accountnaam is geweigerd door de server. Het bevat waarschijnlijk "
 "onacceptabele tekens."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "De bijnaam \"%s\" bestaat al"
+
+msgid "Nickname in use"
+msgstr "Bijnaam in gebruik"
+
 msgid "Cannot change nick"
 msgstr "Kan bijnaam niet veranderen"
 
@@ -3646,12 +3787,14 @@ msgstr "Ad-Hoc opdracht mislukt"
 msgid "execute"
 msgstr "uitvoeren"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Server vereist TLS/SSL voor aanmelding. Geen ondersteuning voor TLS/SSL "
 "gevonden."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Server vereist versleuteling, maar er is geen ondersteuning voor TLS/SSL "
 "gevonden."
@@ -3672,17 +3815,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Tekstaanmelding"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Identificatie mislukt"
+
+msgid "Invalid response from server"
 msgstr "Ongeldig antwoord van server"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server gebruikt geen van de ondersteunde identificatiemethoden"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Je hebt encryptie nodig, maar het is niet mogelijk op deze server."
+
 msgid "Invalid challenge from server"
 msgstr "Ongeldige vraag van server"
 
-msgid "SASL error"
-msgstr "SASL-fout"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL-fout: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr "Geen sessie-ID gegeven"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Versie van BOSH niet ondersteund"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Kan geen verbinding maken met de server:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Kan geen verbinding maken met de server:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Kan verbinding niet initialiseren"
 
 msgid "Full Name"
 msgstr "Volledige naam"
@@ -3750,162 +3926,8 @@ msgstr "Client"
 msgid "Operating System"
 msgstr "Besturingssysteem"
 
-msgid "Last Activity"
-msgstr "Laatste activiteit"
-
-msgid "Service Discovery Info"
-msgstr "Directory info instellen"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr "Stanza adresbijvoeging"
-
-msgid "Multi-User Chat"
-msgstr "Groepsgesprek"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Deze gebruiker heeft geen profiel."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc opdrachten"
-
-msgid "PubSub Service"
-msgstr "PubSub dienst"
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Registratiefout"
-
-msgid "User Location"
-msgstr "Gebruikerslocatie"
-
-msgid "User Avatar"
-msgstr "Avatar"
-
-msgid "Chat State Notifications"
-msgstr "Contactstatusmelding"
-
-msgid "Software Version"
-msgstr "Software versie"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Oriëntatie"
-
-msgid "File Transfer"
-msgstr "Bestandsoverdracht"
-
-msgid "User Mood"
-msgstr "Humeur gebruiker"
-
-msgid "User Activity"
-msgstr "Activiteit gebruiker"
-
-msgid "Entity Capabilities"
-msgstr "Entiteit mogelijkheden"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Gecodeerde sessie onderhandelingen"
-
-msgid "User Tune"
-msgstr "Gebruikers tune"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM met sleuteluitwisseling"
-
-msgid "Reachability Address"
-msgstr "Beschikbaarheid adres"
-
-msgid "User Profile"
-msgstr "Profiel"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Geluid jingle"
-
-msgid "User Nickname"
-msgstr "Gebruikersnaam"
-
-msgid "Jingle ICE UDP"
-msgstr "ICE UDP Jingle"
-
-msgid "Jingle ICE TCP"
-msgstr "ICE TCP Jingle"
-
-msgid "Jingle Raw UDP"
-msgstr "Raw UDP Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "DTMF DTMF"
-
-msgid "Message Receipts"
-msgstr "Bericht ontvangen"
-
-msgid "Public Key Publishing"
-msgstr "Openbare sleutel openbaren"
-
-msgid "User Chatting"
-msgstr "Chattende gebruiker"
-
-msgid "User Browsing"
-msgstr "Browsende gebruiker"
-
-msgid "User Gaming"
-msgstr "Gamende gebruiker"
-
-msgid "User Viewing"
-msgstr "Kijkende gebruiker"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza codering"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr "Vertraagde afgifte"
-
-msgid "Collaborative Data Objects"
-msgstr "Samenwerkende data-objecten"
-
-msgid "File Repository and Sharing"
-msgstr "Bestandsbronnen en delen"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr "Hop-controle"
-
-msgid "Capabilities"
-msgstr "Mogelijkheden"
+msgid "Local Time"
+msgstr "Lokale tijd"
 
 msgid "Priority"
 msgstr "Prioriteit"
@@ -3913,6 +3935,13 @@ msgstr "Prioriteit"
 msgid "Resource"
 msgstr "Hulpmiddel"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s geleden"
+
+msgid "Logged Off"
+msgstr "UItgelogd"
+
 msgid "Middle Name"
 msgstr "Tweede naam"
 
@@ -4079,28 +4108,22 @@ msgstr "Kies een te raadplegen conferentieserver"
 msgid "Find Rooms"
 msgstr "Ruimtes zoeken"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Je hebt encryptie nodig, maar het is niet mogelijk op deze server."
+msgid "Affiliations:"
+msgstr "Verbanden:"
 
-msgid "Write error"
-msgstr "Schrijffout"
+msgid "No users found"
+msgstr "Geen gebruikers gevonden"
 
-msgid "Ping timeout"
-msgstr "Ping Verlopen"
+msgid "Roles:"
+msgstr "Rollen:"
 
-msgid "Read Error"
-msgstr "Leesfout"
+msgid "Ping timed out"
+msgstr "Ping verlopen"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Kan geen verbinding maken met de server:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Kan geen socket aanmaken"
 
 msgid "Invalid XMPP ID"
 msgstr "Ongeldig XMPP-ID"
@@ -4108,6 +4131,10 @@ msgstr "Ongeldig XMPP-ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ongeldige XMPP ID. Domein moet ingesteld worden"
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Kan geen verbinding maken met de server."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registratie van %s@%s voltooid"
@@ -4132,9 +4159,6 @@ msgstr "Registratie Ongedaan Maken Voltooid"
 msgid "Unregistration Failed"
 msgstr "Registratie Ongedaan Maken Mislukt"
 
-msgid "Already Registered"
-msgstr "Al geregistreerd"
-
 msgid "State"
 msgstr "Staat"
 
@@ -4147,6 +4171,9 @@ msgstr "Telefoon"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Al geregistreerd"
+
 msgid "Unregister"
 msgstr "Registratie ongedaan maken"
 
@@ -4193,11 +4220,17 @@ msgid "Re-initializing Stream"
 msgstr "Herstarten van datastroom"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "Server ondersteunt blokkeren niet"
 
 msgid "Not Authorized"
 msgstr "Geen toestemming"
 
+msgid "Mood"
+msgstr "Stemming"
+
+msgid "Now Listening"
+msgstr "Luistert nu"
+
 msgid "Both"
 msgstr "Beide"
 
@@ -4219,12 +4252,6 @@ msgstr "Niet"
 msgid "Subscription"
 msgstr "Abonnement"
 
-msgid "Mood"
-msgstr "Stemming"
-
-msgid "Now Listening"
-msgstr "Luistert nu"
-
 msgid "Mood Text"
 msgstr "Humeur-tekst"
 
@@ -4267,9 +4294,6 @@ msgstr "Wachtwoord is veranderd"
 msgid "Error changing password"
 msgstr "Fout bij veranderen van wachtwoord"
 
-msgid "Password (again)"
-msgstr "Nieuw wachtwoord (herhalen)"
-
 msgid "Change XMPP Password"
 msgstr "Veranderen XMPP-wachtwoord"
 
@@ -4462,18 +4486,24 @@ msgstr "Kan gebruiker %s niet schoppen"
 msgid "Unable to ping user %s"
 msgstr "Kan gebruiker %s niet pingen"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Trillen niet mogelijk, omdat er niets bekend is over gebruiker %s."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Trillen niet mogelijk, omdar gebruiker %s offline zou kunnen zijn."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Trillen niet mogelijk, omdat de gebruiker %s het niet ondersteund."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s trillen..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4483,9 +4513,34 @@ msgstr "Trill"
 msgid "%s has buzzed you!"
 msgstr "%s heeft je laten trillen!"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "%s trillen..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Kan bestand niet verzenden naar %s, ongeldige JID"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Kan bestand niet verzenden naar %s, gebruiker is niet online"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Kan bestand niet verzenden naar %s, niet aangemeld bij gebruikers-"
+"aanwezigheid."
+
+msgid "Media Initiation Failed"
+msgstr "Opstarten media mislukt"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Geef de bron van %s naar degene wie je een bestand wil sturen"
+
+msgid "Select a Resource"
+msgstr "Kies een bron"
+
+msgid "Initiate Media"
+msgstr "Media opstarten"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Chatruimte instellen"
@@ -4506,16 +4561,18 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 "ban &lt;gebruiker&gt; [reden]:  Een gebruiker uit een ruimte verbannen."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;naam&gt; &lt;owner|admin|member|outcast|none&gt;:Relatie tot "
 "een ruimte/kanaal instellen."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;naam&gt; &lt;moderator|participant|visitor|none&gt;:Rol van "
 "gebruiker in de ruimte instellen"
@@ -4580,7 +4637,10 @@ msgid "Connect server"
 msgstr "Verbinden met server"
 
 msgid "File transfer proxies"
-msgstr "Bestandsoverdracht poortnummer"
+msgstr "Bestandsoverdracht proxy"
+
+msgid "BOSH URL"
+msgstr "BOSH koppeling"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4620,6 +4680,14 @@ msgstr "XML analysefout"
 msgid "Unknown Error in presence"
 msgstr "Onbekende fout in aanwezigheid"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Fout bij meedoen aan chat: %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Fout in chat: %s"
+
 msgid "Create New Room"
 msgstr "Nieuwe ruimte maken"
 
@@ -4636,13 +4704,29 @@ msgstr "Ruimte _instellen"
 msgid "_Accept Defaults"
 msgstr "_Standaardinstellingen gebruiken"
 
+msgid "No reason"
+msgstr "Geen reden"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Fout bij meedoen aan chat: %s"
+msgid "You have been kicked: (%s)"
+msgstr "Je bent eruit gegooid:(%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Fout in chat: %s"
+msgid "Kicked (%s)"
+msgstr "Eruit gegooid (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Er is een fout opgetreden bij het openen van het bestand."
+
+msgid "Transfer was closed."
+msgstr "Bestandsoverdracht gesloten."
+
+msgid "Failed to open the file"
+msgstr "Bestand openen mislukt"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4671,9 +4755,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Geef de bron van %s naar degene wie je een bestand wil sturen"
 
-msgid "Select a Resource"
-msgstr "Kies een bron"
-
 msgid "Edit User Mood"
 msgstr "Humeur instellen"
 
@@ -4708,9 +4789,6 @@ msgstr "Acties"
 msgid "Select an action"
 msgstr "Selecteer een actie"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Ophalen MSN Adressenlijst niet mogelijk"
-
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
@@ -4972,6 +5050,32 @@ msgstr "Andere contacten"
 msgid "Non-IM Contacts"
 msgstr "Niet-chat contacten"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s verzond een wink. <a href='msn-wink://%s'>Klik hier om af te spelen</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s verzond een wink, maar kon niet worden opgeslagen"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s verzond een voice-clip. <a href='audio://%s'>Klik hier om af te spelen</a>"
+
+#, fuzzy, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr ""
+"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
+"ondersteund."
+
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
+"ondersteund."
+
 msgid "Nudge"
 msgstr "Aanstoten"
 
@@ -5123,8 +5227,29 @@ msgstr "_Chat starten"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL-ondersteuning is vereist voor MSN. Installeer een SSL-bibliotheek."
 
-msgid "Failed to connect to server."
-msgstr "Kan geen verbinding maken met de server."
+#, fuzzy, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Kan het contact %s niet toevoegen omdat de gebruikersnaam ongeldig is. "
+"Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een "
+"letter en slechts cijfers en letters bevatten, of slechts nummers bevatten."
+
+msgid "Unable to Add"
+msgstr "Kan niet toevoegen"
+
+msgid "Authorization Request Message:"
+msgstr "Tekst van toestemmingsaanvraag"
+
+msgid "Please authorize me!"
+msgstr "Geef mij toestemming, alstublieft!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Fout bij ophalen van profiel"
@@ -5315,64 +5440,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID autenticatie: ongeldig antwoord."
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s is geen geldige groep."
-
-msgid "Unknown error."
-msgstr "Onbekende fout."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s op %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s heeft u zojuist een duwtje gegeven!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Onbekende fout (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Onbekende fout (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Kan gebruiker niet toevoegen"
 
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Onbekende fout (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Resultaten van uw zoekopdracht"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kan gebruiker niet toevoegen op %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Kan gebruiker niet blokkeren op %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Kan gebruiker geen toestemming geven op %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Kan %s niet toevoegen omdat uw contactenlijst vol is."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is geen geldig passport-account."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Service momenteel niet beschikbaar."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiel bericht is niet verstuurd omdat het te lang is."
 
-msgid "Unable to rename group"
-msgstr "Kan groep niet hernoemen"
-
-msgid "Unable to delete group"
-msgstr "Kan groep niet verwijderen"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5416,9 +5505,6 @@ msgstr "Bericht is niet verstuurd wegens een onbekende coderingsfout:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Bericht is niet verstuurd wegens een onbekende fout:"
 
-msgid "Unable to connect"
-msgstr "Kan geen verbinding maken"
-
 msgid "Writing error"
 msgstr "Schrijffout"
 
@@ -5433,13 +5519,15 @@ msgstr ""
 "Verbindingsfout van %s-server: \n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Ons protocol wordt niet ondersteund door de server."
 
-msgid "Error parsing HTTP."
-msgstr "Fout bij analyseren HTTP."
+msgid "Error parsing HTTP"
+msgstr "Fout bij parsen HTTP"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Je hebt jezelf aangemeld vanaf een andere locatie."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5447,8 +5535,8 @@ msgstr ""
 "De MSN-servers zijn op dit moment niet beschikbaar. Probeer het later nog "
 "eens."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "De MSN-servers worden tijdelijk uitgeschakeld."
+msgid "The MSN servers are going down temporarily"
+msgstr "De MSN-servers worden tijdelijk uitgeschakeld"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5478,6 +5566,18 @@ msgstr "Verzenden van cookie"
 msgid "Retrieving buddy list"
 msgstr "Opvragen van contactenlijst"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
+"ondersteund."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
+"ondersteund."
+
 msgid "Away From Computer"
 msgstr "Weg van de computer"
 
@@ -5521,20 +5621,11 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Bericht is misschien niet verstuurd wegens een onbekende fout:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s heeft u aan zijn/haar contactenlijst toegevoegd."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s heeft u van zijn/haar contactenlijst verwijderd."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Contact verwijderen uit adresboek?"
 
-#, fuzzy
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Wilt u deze persoon toevoegen aan uw contactenlijst?"
+msgstr "Dit contact ook verwijderen uit adresboek?"
 
 msgid "The username specified is invalid."
 msgstr "Ingevoerde gebruikersnaam is ongeldig."
@@ -5559,6 +5650,54 @@ msgid "MSN Protocol Plugin"
 msgstr "MSN-protocol-plug-in"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s is geen geldige groep."
+
+msgid "Unknown error."
+msgstr "Onbekende fout."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s op %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kan gebruiker niet toevoegen op %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Kan gebruiker niet blokkeren op %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Kan gebruiker geen toestemming geven op %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Kan %s niet toevoegen omdat uw contactenlijst vol is."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is geen geldig passport-account."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Service momenteel niet beschikbaar."
+
+msgid "Unable to rename group"
+msgstr "Kan groep niet hernoemen"
+
+msgid "Unable to delete group"
+msgstr "Kan groep niet verwijderen"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s heeft u aan zijn/haar contactenlijst toegevoegd."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s heeft u van zijn/haar contactenlijst verwijderd."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Onbekende gerbuiker: %s"
 
@@ -5590,6 +5729,8 @@ msgid "Lost connection with server"
 msgstr "Verbinding met de server verloren"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nieuwe e-mailberichten"
 
@@ -5628,44 +5769,30 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Contacten toevoegen van de server"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Verbonden"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protocol fout, code %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Je wachtwoord bestaat uit %d characters, groter dan de verwachte maximum "
 "waarde van %d voor MySpaceIM. Verkort je wachtwoord op http://profileedit."
 "myspace.com/index.cfm?fuseaction=accountSettings.changePassword en probeer "
 "het opnieuw."
 
+msgid "Incorrect username or password"
+msgstr "Ongeldige gebruikersnaam of wachtwoord"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-fout"
 
 msgid "Invalid input condition"
 msgstr "Ongeldige invoer voorwaarde"
 
-msgid "Read buffer full (2)"
-msgstr "Wachtrij vol (2)"
-
-msgid "Unparseable message"
-msgstr "Kan het bericht niet analyseren"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Kan geen verbinding maken met host: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Contact toevoegen mislukt"
 
@@ -5752,6 +5879,12 @@ msgstr "Totaal aantal vrienden"
 msgid "Client Version"
 msgstr "Client-versie"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Gebruikersnaam Beschikbaar"
 
@@ -5969,9 +6102,6 @@ msgstr "Kan eigen account niet toevoegen"
 msgid "Master archive is misconfigured"
 msgstr "Hoofdarchief onjuist geconfigureerd"
 
-msgid "Incorrect username or password"
-msgstr "Ongeldige gebruikersnaam of wachtwoord"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Kan de host van de gebruikersnaam die je hebt ingevoerd niet vinden"
 
@@ -6015,8 +6145,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Onbekende fout: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Aanmelden mislukt (%s)."
+msgid "Unable to login: %s"
+msgstr "Kan niet inloggen: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6122,9 +6252,6 @@ msgstr "Groupwise bijeenkomst %d"
 msgid "Authenticating..."
 msgstr "Identificatie..."
 
-msgid "Unable to connect to server."
-msgstr "Kan geen verbinding maken met de computer."
-
 msgid "Waiting for response..."
 msgstr "Wacht op antwoord..."
 
@@ -6148,26 +6275,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Wilt u het gesprek bijwonen?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"De verbinding is verbroken omdat u zich heeft aangemeld op een andere "
-"computer."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s lijkt niet aangemeld te zijn en heeft uw bericht niet ontvangen."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Kan geen verbinding makenmet server. Geef de naam op van de server waarmee u "
 "contact wilt maken."
 
-msgid "Error. SSL support is not installed."
-msgstr "Fout! Geen SSL-ondersteuning geïnstalleerd."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Deze bijeenkomst is afgesloten. Er kunnen geen nieuwe berichten verzonden "
@@ -6192,24 +6312,33 @@ msgstr "Server-adres"
 msgid "Server port"
 msgstr "Server-poort"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
+
+#. username connecting too frequently
+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 ""
+"Je hebt je te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
+"keer. Als je verdergaat moet je nog langer wachten "
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Fout oplossing %s"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Kon gesprek-ruimte niet binnenkomen"
 
 msgid "Invalid chat room name"
 msgstr "Ongeldige naam voor ruimte"
 
-msgid "Server closed the connection."
-msgstr "Server heeft de verbinding verbroken."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Verbinding verloren met server:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Ongeldige data ontvangen van server."
 
 #. *< type
@@ -6257,7 +6386,8 @@ msgstr "De verbinding is verbroken met de volgende gebruiker:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Ongeldige data ontvangen via directe verbinding."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Kan geen verbinding maken met de andere gebruiker."
 
 msgid "Direct IM established"
@@ -6462,21 +6592,15 @@ msgstr "Waarschuwingsniveau"
 msgid "Buddy Comment"
 msgstr "Contactopmerking"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Kan niet verbinden met identificatieserver:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Kan niet verbinden met BOS-server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Kan geen verbinding maken met de computer."
 
 msgid "Username sent"
 msgstr "Gebruikersnaam verzonden"
@@ -6488,54 +6612,64 @@ msgstr "Verbinding hersteld, Cookie verzonden"
 msgid "Finalizing connection"
 msgstr "Afronden van verbinding"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Kan niet aanmelden: Kan niet aanmelden als %s omdat de gebruikersnaam "
 "ongeldig is. Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen "
 "met een letter en slechts cijfers, letters en spaties bevatten, of slechts "
 "nummers bevatten."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Ongeldige gebruikersnaam."
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kon geen geldige AIM aanmeld-hash krijgen."
+
+msgid "Unable to get a valid login hash."
+msgstr "Kon geen geldige aanmeld-hash krijgen."
+
+msgid "Received authorization"
+msgstr "Toestemming gekregen"
 
-msgid "Incorrect password."
-msgstr "Ongeldig wachtwoord."
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Gebruiker bestaat niet"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Uw Account is momenteel afgesloten"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "De AOL service is momenteel niet bereikbaar."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Je hebt je te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
-"keer. Als je verdergaat moet je nog langer wachten "
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Het programma wat u gebruikt is te oud. Haal een nieuwe versie op bij %s"
 
-msgid "Could Not Connect"
-msgstr "Kan geen verbinding maken"
-
-msgid "Received authorization"
-msgstr "Toestemming gekregen"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Je hebt je te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
+"keer. Als je verdergaat moet je nog langer wachten "
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Ingevoerde SecurID sleutel is ongeldig."
 
 msgid "Enter SecurID"
@@ -6544,28 +6678,6 @@ msgstr "Geef SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Geef het 6-cijferige nummer van het digitale display."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Kon geen geldige AIM aanmeld-hash krijgen."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
-
-msgid "Unable to get a valid login hash."
-msgstr "Kon geen geldige aanmeld-hash krijgen."
-
 msgid "Password sent"
 msgstr "Wachtwoord verzonden"
 
@@ -6575,12 +6687,6 @@ msgstr "Kan verbinding niet initialiseren"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Geef mij toestemming zodat ik u kan toevoegen aan mijn contactenlijst."
 
-msgid "Authorization Request Message:"
-msgstr "Tekst van toestemmingsaanvraag"
-
-msgid "Please authorize me!"
-msgstr "Geef mij toestemming, alstublieft!"
-
 msgid "No reason given."
 msgstr "Geen reden gegeven."
 
@@ -6709,7 +6815,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "%hu bericht van %s is niet overgekomen om een onbekende reden."
 msgstr[1] "%hu berichten van %s zijn niet overgekomen om een onbekende reden."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan het bericht niet verzenden: %s"
@@ -6731,6 +6837,9 @@ msgstr "Online sinds"
 msgid "Member Since"
 msgstr "Lid sinds"
 
+msgid "Capabilities"
+msgstr "Mogelijkheden"
+
 msgid "Profile"
 msgstr "Profiel"
 
@@ -6910,9 +7019,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Afwezigheidsbericht te lang."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6920,9 +7029,6 @@ msgstr ""
 "Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een "
 "letter en slechts cijfers en letters bevatten, of slechts nummers bevatten."
 
-msgid "Unable to Add"
-msgstr "Kan niet toevoegen"
-
 #, fuzzy
 msgid "Unable to Retrieve Buddy List"
 msgstr "Kan contactenlijst niet ophalen"
@@ -6937,9 +7043,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Wezen"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Kon %s niet als contact toevoegen omdat u te veel contacten in uw lijst "
@@ -6948,8 +7054,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Kan contact %s niet toevoegen voor een onbekende reden."
 
 #, c-format
@@ -7022,6 +7128,7 @@ msgstr "_Verbinden"
 msgid "Get AIM Info"
 msgstr "AIM-info ophalen"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Opmerking bewerken"
 
@@ -7082,6 +7189,7 @@ msgstr "_Zoeken"
 msgid "Set User Info (web)..."
 msgstr "Gebruikersinfo Instellen (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Wachtwoord veranderen (web)"
 
@@ -7111,6 +7219,10 @@ msgstr "Contact zoeken door middel van e-mail..."
 msgid "Search for Buddy by Information"
 msgstr "Contact zoeken via informatie"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Gebruiker is niet aangemeld"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7272,13 +7384,11 @@ msgstr "School"
 msgid "Horoscope"
 msgstr "Horoscoop"
 
-#, fuzzy
 msgid "Zodiac"
-msgstr "Sterrenbeeld"
+msgstr "Dierenriem"
 
-#, fuzzy
 msgid "Blood"
-msgstr "Geblokkeerd"
+msgstr "Bloed"
 
 msgid "True"
 msgstr "Juist"
@@ -7306,6 +7416,39 @@ msgstr "Bijwerken"
 msgid "Could not change buddy information."
 msgstr "Contactinformatie veranderen."
 
+msgid "Mobile"
+msgstr "Mobiel"
+
+msgid "Note"
+msgstr "Opmerking"
+
+# msgstr ""
+# "(Er is een fout opgetreden bij het ontvangen van het bericht. Of jij en %s "
+# "hebben verschillende coderingen geselecteerd of de andere persoon gebruikt "
+# "een chatprogramma met fouten.)"
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "pictogram"
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+msgid "_Modify"
+msgstr "_Bewerken"
+
+msgid "Memo Modify"
+msgstr "Memo wijzigen"
+
+msgid "Server says:"
+msgstr "Server zegt:"
+
+msgid "Your request was accepted."
+msgstr "De aanvraag werd geaccepteerd."
+
+msgid "Your request was rejected."
+msgstr "De aanvraag werd afgewezen."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u vereist identificatie"
@@ -7439,14 +7582,14 @@ msgstr "Geef hier uw verzoek"
 
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr ""
+msgstr "Succesvolle deelname Qun %s (%u)"
 
 msgid "Successfully joined Qun"
 msgstr "Succesvol aan Qun deelgenmen"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "Qun %u afgewezen voor deelname"
 
 msgid "QQ Qun Operation"
 msgstr "QQ Qun operatie"
@@ -7539,13 +7682,13 @@ msgid "Flag"
 msgstr "Vlag"
 
 msgid "Ver"
-msgstr ""
+msgstr "Versie"
 
 msgid "Invalid name"
 msgstr "Ongeldige bijnaam"
 
 msgid "Select icon..."
-msgstr "Icoon selecteren..."
+msgstr "Pictogram selecteren..."
 
 #, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
@@ -7621,6 +7764,13 @@ msgstr "<p><b>Geweldige patchschrijvers</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Verzonden</b>: %lu<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Oorspronkelijke auteur</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>En, alle jongens in de achterkamer...</i><br>\n"
 
@@ -7632,7 +7782,7 @@ msgid "About OpenQ %s"
 msgstr "Over OpenQ %s"
 
 msgid "Change Icon"
-msgstr "Icoon veranderen"
+msgstr "Pictogram veranderen"
 
 msgid "Change Password"
 msgstr "Wachtwoord veranderen"
@@ -7641,11 +7791,14 @@ msgid "Account Information"
 msgstr "Accountinformatie"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "Alle QQ Quns vernieuwen"
 
 msgid "About OpenQ"
 msgstr "Over OpenQ"
 
+msgid "Modify Buddy Memo"
+msgstr "Contactmemo wijzigen"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7683,6 +7836,9 @@ msgstr "Server-notificatie weergeven"
 msgid "Show server news"
 msgstr "Server-nieuwe weergeven"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 msgid "Keep alive interval (seconds)"
 msgstr "Behoud-interval (in seconden)"
 
@@ -7690,7 +7846,7 @@ msgid "Update interval (seconds)"
 msgstr "Vernieuw-interval (in seconden)"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Kan login-antwoord niet decoderen"
 
 #, c-format
@@ -7715,10 +7871,6 @@ msgstr "Activatie vereist"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Ongeldig antwoord-code, 0x%02X"
 
-#, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Kan login-antwoord niet decoderen"
-
 msgid "Requesting captcha"
 msgstr "Captcha aanvragen"
 
@@ -7751,30 +7903,18 @@ msgid ""
 "%s"
 msgstr "Ongeldig antwoord-code, 0x%02X"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Kan geen verbinding maken."
-
 msgid "Socket error"
 msgstr "Socketfout"
 
-msgid "Unable to read from socket"
-msgstr "Kan niet lezen van socket"
-
-msgid "Write Error"
-msgstr "Schrijffout"
-
-msgid "Connection lost"
-msgstr "Verbinding verbroken"
-
 msgid "Getting server"
 msgstr "Server verkrijgen"
 
 msgid "Requesting token"
 msgstr "Tekenreeks aanvragen"
 
-msgid "Couldn't resolve host"
-msgstr "Kan host niet vinden"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Kan geen verbinding maken met de computer."
 
 msgid "Invalid server or port"
 msgstr "Ongeldige server of poort"
@@ -7826,7 +7966,7 @@ msgid "QQ Qun Command"
 msgstr "QQ Qun-opdracht"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Kan login-antwoord niet decoderen"
 
 #, fuzzy
@@ -7848,9 +7988,6 @@ msgstr "Bestanden sturen"
 msgid "%d canceled the transfer of %s"
 msgstr "%d heeft de overdracht van %s afgebroken"
 
-msgid "Connection closed (writing)"
-msgstr "Verbinding verbroken (schrijven)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Groepstitel:</b> %s<br>"
@@ -7905,17 +8042,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Aankondiging sametime-beheerder"
 
-msgid "Connection reset"
-msgstr "Verbindingsfout"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Er is een fout opgetreden bij het lezen van de socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Kan geen verbinding maken met de computer"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aankondiging van %s"
@@ -7938,6 +8064,9 @@ msgstr "Speakers"
 msgid "Video Camera"
 msgstr "Videocamera"
 
+msgid "File Transfer"
+msgstr "Bestandsoverdracht"
+
 msgid "Supports"
 msgstr "Ondersteuning"
 
@@ -8656,9 +8785,6 @@ msgstr "Organisatie"
 msgid "Unit"
 msgstr "Afdeling"
 
-msgid "Note"
-msgstr "Opmerking"
-
 msgid "Join Chat"
 msgstr "Chat openen"
 
@@ -8758,6 +8884,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Netwerkstatistieken"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping mislukt"
 
@@ -8822,7 +8951,8 @@ msgstr "Type openbare sleutel niet ondersteund"
 msgid "Disconnected by server"
 msgstr "Verbinding verbroken door server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Fout bij verbinden met SILC-server"
 
 msgid "Key Exchange failed"
@@ -8834,16 +8964,11 @@ msgstr ""
 "Hervatten van losgekoppelde sessie mislukt. Klik op \"Opnieuw verbinden\" om "
 "een nieuwe verbinding te maken."
 
-msgid "Connection failed"
-msgstr "Verbinding mislukt"
-
 msgid "Performing key exchange"
 msgstr "Bezig met sleuteluitwisseling"
 
-msgid "Unable to create connection"
-msgstr "Kan geen nieuwe verbinding maken"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Kan SILC sleutelpaar niet laden"
 
 #. Progress
@@ -8853,7 +8978,8 @@ msgstr "Verbinden met SILC-server"
 msgid "Out of memory"
 msgstr "Te weinig geheugen"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Kan SILC-protocol niet starten"
 
 msgid "Error loading SILC key pair"
@@ -9158,7 +9284,8 @@ msgstr "Alle berichten ondertekenen en controleren"
 msgid "Creating SILC key pair..."
 msgstr "Aanmaken van SILC sleutelpaar..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Kan geen SILC sleutelpaar aanmaken\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9255,6 +9382,9 @@ msgstr "Whiteboard"
 msgid "No server statistics available"
 msgstr "Geen serverstatistieken beschikbaar"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Fout bij verbinden met SILC-server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9297,30 +9427,27 @@ msgstr "Mislukt: Ongeldig cookie"
 msgid "Failure: Authentication failed"
 msgstr "Mislukt: Certificering mislukt"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Kan SILC-verbinding niet starten"
 
 msgid "John Noname"
 msgstr "John Zondernaam"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "kan SILC sleutelpaar niet laden: %s"
 
-msgid "Could not write"
-msgstr "Kan niet schrijven"
-
-msgid "Could not connect"
-msgstr "Kon geen verbinding maken"
+msgid "Unable to create connection"
+msgstr "Kan geen nieuwe verbinding maken"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Onbekend server-antwoord."
 
-msgid "Could not create listen socket"
-msgstr "Kan geen socket aanmaken om te luisteren"
-
-msgid "Could not resolve hostname"
-msgstr "Kan hostnaam niet vinden"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Kan geen socket aanmaken"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-bijnamen mogen geen spaties of @-tekens bevatten"
@@ -9362,180 +9489,62 @@ msgstr "Gebruiker"
 msgid "Auth Domain"
 msgstr "Domein"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s wordt opgezocht"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Verbinding met %s verbroken"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Aanmelding: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Kan niet naar bestand %s schrijven."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Kan het bestand %s niet lezen."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Bericht te lang, laatste %s Bytes afgekort."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s is niet aangemeld."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Waarschuwing van %s is niet toegestaan."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Een bericht is verloren gegaan. U overschreidt de snelheid van de server."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chatruimte in %s is niet beschikbaar."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "U verzend te snel berichten naar %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Een Bericht van %s is niet overgekomen omdat het te groot was."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
-"Een Bericht van %s is niet overgekomen omdat het te snel verzonden werd."
-
-#, c-format
-msgid "Failure."
-msgstr "Fout."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Te veel overeenkomsten."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Meer gegevens nodig."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Profielen service is momenteel niet toegankelijk."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Zoekfunctie e-mail beperkt."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Sleutelwoord genegeerd."
-
-#, c-format
-msgid "No keywords."
-msgstr "Geen sleutelwoorden."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Deze gebruiker heeft geen profiel."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Land wordt niet ondersteund."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Onbekende Fout: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Ongeldige gebruikersnaam of wachtwoord."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "De service is momenteel niet bereikbaar."
+"join: &lt;ruimte&gt;:  Meedoen aan een chatruimte op het Yahoo-netwerk."
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Uw waarschuwingsniveau is momenteel te hoog om in te loggen."
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Lijst van kanalen op dit netwerk"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"U hebt zich te snel aan en afgemeld. Wacht 10 Minuten en probeer het nog een "
-"keer."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Onbekende aanmeldingsfout: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Onbekende fout %d opgetreden. Info: %s"
-
-msgid "Invalid Groupname"
-msgstr "Ongeldige groep"
 
-msgid "Connection Closed"
-msgstr "Verbinding verbroken"
-
-msgid "Waiting for reply..."
-msgstr "Wacht op antwoord..."
-
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC werkt weer. U kunt nu weer berichten versturen."
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID..."
 
-msgid "Password Change Successful"
-msgstr "Wachtwoord succesvol veranderd"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo-protocol-plug-in"
 
-msgid "_Group:"
-msgstr "_Groep:"
+msgid "Pager server"
+msgstr "Semafoonserver"
 
-msgid "Get Dir Info"
-msgstr "Directory info ophalen"
+msgid "Pager port"
+msgstr "Semafoon-poort"
 
-msgid "Set Dir Info"
-msgstr "Directory info instellen"
+msgid "File transfer server"
+msgstr "Server voor bestandsoverdrachten"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Kon %s niet openen om naar te schrijven!"
+msgid "File transfer port"
+msgstr "Bestandsoverdracht poortnummer"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Bestandsoverdracht mislukt; de andere kant heeft waarschijnl;ijk afgebroken."
+msgid "Chat room locale"
+msgstr "Taal van chatruimte"
 
-msgid "Could not connect for transfer."
-msgstr "Kan niet verbinden voor overdracht."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Conferentie- en chatruimteverzoeken negeren"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-"Kon koptekst van bestand niet instellen. Het bestand zal niet verzonden "
-"worden."
+msgid "Chat room list URL"
+msgstr "URL voor lijst van ruimtes"
 
-msgid "Save As..."
-msgstr "Opslaan als..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo chatserver"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s vraagt aan %s om %d bestand te accepteren: %s (%.2f %s)%s%s"
-msgstr[1] "%s vraagt aan %s om %d bestanden te accepteren: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Chatpoort Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s vraagt u om een bestand te verzenden"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9547,14 +9556,11 @@ msgstr "%s vraagt u om een bestand te verzenden"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC-protocol plug-in"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! JAPAN protocol-plug-in"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
-"ondersteund."
+msgid "Your SMS was not delivered"
+msgstr "De SMS werd niet afgeleverd"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Uw Yahoo! bericht is niet verzonden."
@@ -9580,6 +9586,33 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Contact toevoegen geweigerd"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Ongeldige data ontvangen"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
+"kunnen lossen."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
+"kunnen lossen."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Ongeldige gebruikersnaam of wachtwoord"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9614,39 +9647,34 @@ msgstr ""
 "Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
 "kunnen lossen."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Kan contact %s niet toevoegen aan de groep %s in de server-lijst van account "
 "%s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Kan contact niet toevoegen aan serverlijst"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hoorbaar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
 
-msgid "Connection problem"
-msgstr "Verbindingprobleem"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Verbinding met %s:\n"
 "%s verloren"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Kan geen verbinding maken met %s:\n"
+"Kan geen verbinding maken met de server:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9694,8 +9722,8 @@ msgstr "Aanwezigheidsinstellingen"
 msgid "Start Doodling"
 msgstr "Wakker schudden"
 
-msgid "Activate which ID?"
-msgstr "Welk ID activeren?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Deelnemen aan wiens chat?"
@@ -9709,74 +9737,15 @@ msgstr "Deelnemen aan chat van gebruiker..."
 msgid "Open Inbox"
 msgstr "Iinbox Openen"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join: &lt;ruimte&gt;:  Meedoen aan een chatruimte op het Yahoo-netwerk."
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Lijst van kanalen op dit netwerk"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-protocol-plug-in"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Semafoonserver"
-
-msgid "Japan Pager server"
-msgstr "Japanse semafoonserver"
-
-msgid "Pager port"
-msgstr "Semafoon-poort"
-
-msgid "File transfer server"
-msgstr "Server voor bestandsoverdrachten"
-
-msgid "Japan file transfer server"
-msgstr "Japanse server voor bestandsoverdrachten"
-
-msgid "File transfer port"
-msgstr "Bestandsoverdracht poortnummer"
-
-msgid "Chat room locale"
-msgstr "Taal van chatruimte"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Conferentie- en chatruimteverzoeken negeren"
-
-msgid "Chat room list URL"
-msgstr "URL voor lijst van ruimtes"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo chatserver"
-
-msgid "Yahoo Chat port"
-msgstr "Chatpoort Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Kan geen verbinding maken."
+
 msgid "Unable to establish file descriptor."
 msgstr "Kan geen bestandsbeschrijving aanmaken."
 
@@ -9784,6 +9753,9 @@ msgstr "Kan geen bestandsbeschrijving aanmaken."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s biedt u een collectie van %d bestanden aan.\n"
 
+msgid "Write Error"
+msgstr "Schrijffout"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profiel van Yahoo! Japan"
 
@@ -9854,12 +9826,9 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "Gebruikersprofiel is leeg."
 
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s heeft uw uitnodiging voor ruimte \"%s\" afgeslagen omdat \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Uitnodiging geweigerd"
+#, fuzzy, c-format
+msgid "%s has declined to join."
+msgstr "%s heeft zich aangemeld."
 
 msgid "Failed to join chat"
 msgstr "Kan niet deelnemen aan chat"
@@ -9903,23 +9872,19 @@ msgstr "Stemmen"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Verbindingprobleem"
+
 msgid "Unable to fetch room list."
 msgstr "Kan lijst van ruimtes niet opvragen."
 
 msgid "User Rooms"
 msgstr "Ruimtes van gebruiker"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Verbindingprobleem met de YCHT-server."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Verbinding met de server \n"
-"%s verloren"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10040,38 +10005,27 @@ msgid "Import from .zephyr.subs"
 msgstr "Importeren van .zephyr.subs"
 
 msgid "Realm"
-msgstr ""
+msgstr "Gebied"
 
 msgid "Exposure"
 msgstr "Ontmaskering"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Kan geen socket aanmaken:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Kan antwoord van HTTP-proxy niet parsen: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxy verbindingsfout %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Toegang geweigerd: HTTP-proxy-server verbied tunnelen op poort %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fout oplossing %s"
 
-msgid "Could not resolve host name"
-msgstr "Kan host niet vinden"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "%s's aandacht vragen..."
@@ -10158,9 +10112,6 @@ msgstr "Niet storen"
 msgid "Extended away"
 msgstr "Uitgebreide weg"
 
-msgid "Mobile"
-msgstr "Mobiel"
-
 msgid "Listening to music"
 msgstr "Luisteren naar muziek"
 
@@ -10202,18 +10153,6 @@ msgstr "+++ %s is actief"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Fout bij lezen van %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Er is een fout opgetreden bij lezen van uw %s. Deze is niet geladen. Het "
-"oude bestand is verplaatst naar %s~."
-
 msgid "Calculating..."
 msgstr "Berekenen..."
 
@@ -10321,6 +10260,18 @@ msgstr "Verbinding geweigerd."
 msgid "Address already in use."
 msgstr "Adres al in gebruik."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Fout bij lezen van %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Er is een fout opgetreden bij lezen van uw %s. Deze is niet geladen. Het "
+"oude bestand is verplaatst naar %s~."
+
 msgid "Internet Messenger"
 msgstr "Expresberichten"
 
@@ -10363,10 +10314,8 @@ msgstr "Nieuwe e-_mail-meldingen"
 msgid "Use this buddy _icon for this account:"
 msgstr "Dit contact_plaatje gebruiken voor dit account:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Opties"
+msgid "Ad_vanced"
+msgstr "Gea_vanceerd"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Gebruik GNOME Proxy-instellingen"
@@ -10401,9 +10350,6 @@ msgstr "Als je zeer aandachtig kijkt"
 msgid "you can see the butterflies mating"
 msgstr "kun je de vlinders zien paren"
 
-msgid "Proxy Options"
-msgstr "Proxy-opties"
-
 msgid "Proxy _type:"
 msgstr "Proxy_type:"
 
@@ -10431,8 +10377,8 @@ msgstr "_Simpel"
 msgid "Create _this new account on the server"
 msgstr "_Dit account op de server aanmaken"
 
-msgid "_Advanced"
-msgstr "_Geavanceerd"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Ingeschakeld"
@@ -10482,16 +10428,16 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Update de belangrijke velden."
 
-msgid "Room _List"
-msgstr "_Lijst Van Ruimtes"
+msgid "A_ccount"
+msgstr "A_ccount"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Geef de benodigde informatie van de chat die u wilt openen.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+msgid "Room _List"
+msgstr "_Lijst Van Ruimtes"
 
 msgid "_Block"
 msgstr "_Blokkeren"
@@ -10500,7 +10446,7 @@ msgid "Un_block"
 msgstr "De_blokkeren"
 
 msgid "Move to"
-msgstr "Ga naar"
+msgstr "Verplaatsen naar"
 
 msgid "Get _Info"
 msgstr "_Info opzoeken"
@@ -10508,6 +10454,15 @@ msgstr "_Info opzoeken"
 msgid "I_M"
 msgstr "_Bericht sturen"
 
+msgid "_Audio Call"
+msgstr "_Audio-gesprek"
+
+msgid "Audio/_Video Call"
+msgstr "Audio/_Videogesprek"
+
+msgid "_Video Call"
+msgstr "Video-gesprek"
+
 msgid "_Send File..."
 msgstr "Bestand _sturen"
 
@@ -10517,8 +10472,11 @@ msgstr "_Contactalarm toevoegen"
 msgid "View _Log"
 msgstr "_Logboek"
 
-msgid "Hide when offline"
-msgstr "Verberg tijdens offline zijn"
+msgid "Hide When Offline"
+msgstr "Verbergen indien offline"
+
+msgid "Show When Offline"
+msgstr "Weergeven indien offline"
 
 msgid "_Alias..."
 msgstr "_Alias..."
@@ -10644,6 +10602,9 @@ msgstr "/Extra/_Contactalarm"
 msgid "/Tools/_Certificates"
 msgstr "/Extra/_Certificaten"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Extra/Eigen smiley_s"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Extra/_Plug-ins"
 
@@ -10653,9 +10614,6 @@ msgstr "/Extra/_Voorkeuren"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Extra/Pr_ivacy"
 
-msgid "/Tools/Smile_y"
-msgstr "/Extra/Smile_y"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Extra/_Bestandsoverdrachten"
 
@@ -10773,8 +10731,8 @@ msgstr "Handmatig"
 msgid "By status"
 msgstr "Op status"
 
-msgid "By log size"
-msgstr "Op logboekgrootte"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10790,6 +10748,9 @@ msgstr "Verbinding herstellen"
 msgid "Re-enable"
 msgstr "Weer aanzetten"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Welkom terug!"
 
@@ -10880,6 +10841,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Groep:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Automatisch deelnemen wanneer account online komt."
 
@@ -10914,6 +10878,105 @@ msgstr "/Extra"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacten/Sorteren"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Achtergrondkleur"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+msgid "Layout"
+msgstr "Lay-out"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Achtergrondkleur"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr "Uitgevouwde tekst"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Achtergrondkleur selecteren"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr "Samengevoegde tekst"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Contact/Achtergrondkleur gesprek"
+
+msgid "The background color of a contact or chat"
+msgstr "De achtergrond voor een contact of gesprek"
+
+msgid "Contact Text"
+msgstr "Contact tekst"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+msgid "On-line Text"
+msgstr ""
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+msgid "Away Text"
+msgstr "Afwezig tekst"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+msgid "Off-line Text"
+msgstr "Offline tejst"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+msgid "Idle Text"
+msgstr "Tekst inactief"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+msgid "Message Text"
+msgstr "Berichttekst"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Gebruikersinformatie aanpassen voor %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Geef de computernaam waar dit certificaat voor is."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Servers"
@@ -10934,14 +10997,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Contact uitnodigen in chatruimte"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Geef de bijnaam van de persoon die u wilt uitnodigen, eventueel met een "
-"uitnodigende tekst"
-
 msgid "_Buddy:"
 msgstr "_Contact:"
 
@@ -10970,7 +11025,7 @@ msgstr "Negeren"
 msgid "Get Away Message"
 msgstr "Afwezigheidsbericht"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Laatst gezegd"
 
 msgid "Unable to save icon file to disk."
@@ -11016,6 +11071,18 @@ msgstr "/Gesprek/Opslaan _als..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Gesprek/_Opschonen"
 
+msgid "/Conversation/M_edia"
+msgstr "/Gesprek/M_edia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Gesprek/Media/_Audiogesprek"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Gesprek/Media/Videogesprek"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Gesprek/Media/Audio\\/Videogesprek"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Gesprek/Bestand ver_zenden..."
 
@@ -11088,6 +11155,15 @@ msgstr "/Gesprek"
 msgid "/Conversation/View Log"
 msgstr "/Gesprek/Logboek weergeven"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Gesprek/Media/Audiogesprek"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Gesprek/Media/Videogesprek"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Gesprek/Media/Audio\\/Videogesprek"
+
 msgid "/Conversation/Send File..."
 msgstr "/Gesprek/Bestand verzenden..."
 
@@ -11274,6 +11350,9 @@ msgstr "artiest"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "spraak en video"
+
 msgid "support"
 msgstr "ondersteuning"
 
@@ -11398,6 +11477,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Hongaars"
 
+msgid "Armenian"
+msgstr "Armeens"
+
 msgid "Indonesian"
 msgstr "Indonesisch"
 
@@ -11413,6 +11495,9 @@ msgstr "Georgisch"
 msgid "Ubuntu Georgian Translators"
 msgstr "Georgische vertalers van Ubuntu"
 
+msgid "Khmer"
+msgstr "Cambodjaans"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11434,6 +11519,9 @@ msgstr "Litouws"
 msgid "Macedonian"
 msgstr "Macedonisch"
 
+msgid "Mongolian"
+msgstr "Mongools"
+
 msgid "Bokmål Norwegian"
 msgstr "Noors"
 
@@ -11488,6 +11576,9 @@ msgstr "Singalees"
 msgid "Swedish"
 msgstr "Zweeds"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 # ui/preferences.glade.h:192
 msgid "Tamil"
 msgstr "Tamil"
@@ -11551,7 +11642,24 @@ msgstr ""
 "enige garantie.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin op irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin op irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11806,7 +11914,7 @@ msgid "Hyperlink visited color"
 msgstr "Kleur van reeds bezochte verwijzing"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Kleur van de verwijzingen wanneer muis erboven hangt"
 
 msgid "Hyperlink prelight color"
@@ -11843,13 +11951,22 @@ msgstr "De kleur van een naam van een melding."
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "De kleur van een naam van een melding."
+
 msgid "Whisper Message Name Color"
 msgstr "Fluisterend berichtkleur"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "De kleur van een naam van een melding."
+
 msgid "Typing notification color"
 msgstr "Kleur van melding van typen"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "De kleur die gebruikt wordt voor het lettertype van de typmelding"
 
 msgid "Typing notification font"
@@ -11861,15 +11978,6 @@ msgstr "Het lettertype dat gebruikt wordt bij het typmelding."
 msgid "Enable typing notification"
 msgstr "Schakel typmelding in"
 
-msgid "_Copy Email Address"
-msgstr "E-mailadres _kopiëren"
-
-msgid "_Open Link in Browser"
-msgstr "Verwijzing _openen met webbrowser"
-
-msgid "_Copy Link Location"
-msgstr "Verwijzing _kopiëren"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11911,11 +12019,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Afbeelding opslaan"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Afbeelding _opslaan..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Eigen smiley toevoegen"
 
@@ -12005,9 +12111,6 @@ msgstr "Kleiner lettertype"
 msgid "Font Face"
 msgstr "Lettertype"
 
-msgid "Background Color"
-msgstr "Achtergrondkleur"
-
 msgid "Foreground Color"
 msgstr "Tekstkleur"
 
@@ -12117,13 +12220,14 @@ msgstr "_Bekijk logboek-folder"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Probeer '%s -h' voor meer informatie.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12145,13 +12249,14 @@ msgstr ""
 "                      (kommagescheiden)te gebruiken account(s) aan)\n"
 "  -v, --version       versie-info weergeven\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12210,11 +12315,26 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Alle berichten openen"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Je hebt postl!</span>"
+msgid "/_Media"
+msgstr "/_Media"
+
+msgid "/Media/_Hangup"
+msgstr "/Media/Op_hangen"
+
+msgid "Calling..."
+msgstr "Bellen..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s wil een audio-/videogesprek starten."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s wil een videogesprek starten."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12245,6 +12365,26 @@ msgstr ""
 "Kan handmatige browser niet starten omdat er geen correcte opdracht is "
 "ingesteld."
 
+msgid "No message"
+msgstr "Geen bericht"
+
+msgid "Open All Messages"
+msgstr "Alle berichten openen"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Je hebt postl!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Nieuw contactalarm"
+
+msgid "Dismiss"
+msgstr "Afwijzen"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Je hebt postl!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "De volgende plug-ins zullen uitgeschakeld worden"
 
@@ -12293,10 +12433,17 @@ msgstr "<b>Details plug-in</b>"
 msgid "Select a file"
 msgstr "Kies een bestand"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Contactalarm bewerken"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Wie alarmeren"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Contactnaam:"
 
@@ -12363,8 +12510,58 @@ msgstr "_Herhalend"
 msgid "Pounce Target"
 msgstr "Alarmdoel"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Kan smileythema niet uitpakken."
+#, c-format
+msgid "Started typing"
+msgstr "Gestart met typen"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Pauzeert tijdens het typen"
+
+#, c-format
+msgid "Signed on"
+msgstr "Aangemeld"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Is weer terug na inactief geweest te zijn"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Is weer terug na weg geweest te zijn"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Stopte met typen"
+
+#, c-format
+msgid "Signed off"
+msgstr "Afgemeld"
+
+#, c-format
+msgid "Became idle"
+msgstr "Werd incatief"
+
+#, c-format
+msgid "Went away"
+msgstr "Ging weg"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Verzond een bericht"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Onbekend... Rapporteer dit alsjeblieft!"
+
+msgid "Theme failed to unpack."
+msgstr "Kan thema niet uitpakken."
+
+msgid "Theme failed to load."
+msgstr "Kan thema niet laden."
+
+msgid "Theme failed to copy."
+msgstr "Kan thema niet kopiëren."
 
 msgid "Install Theme"
 msgstr "Installeer thema"
@@ -12385,6 +12582,11 @@ msgstr "Sneltoetsen"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Sluit gesprekken af met de Escape toets"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Thema contactenlijst"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Systeemvakpictogram"
 
@@ -12394,8 +12596,8 @@ msgstr "_Systeemvakpictogram weergeven:"
 msgid "On unread messages"
 msgstr "Bij ongelezen berichten"
 
-msgid "Conversation Window Hiding"
-msgstr "Gespreksvenster verbergen"
+msgid "Conversation Window"
+msgstr "Gespreksvenster"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Nieuwe gesprekken verbergen:"
@@ -12403,6 +12605,9 @@ msgstr "_Nieuwe gesprekken verbergen:"
 msgid "When away"
 msgstr "Bij afwezigheid"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimalizeer nieuwe gespreksvensters "
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Tabs"
@@ -12461,9 +12666,6 @@ msgstr "Vloeiend schuiven"
 msgid "F_lash window when IMs are received"
 msgstr "Venster laten _knipperen wanneer gespreksberichten worden ontvangen"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimalizeer nieuwe gespreksvensters "
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimale invoerhoogte in regels:"
 
@@ -12495,13 +12697,11 @@ msgstr "Kan het programma voor proxy-instellingen niet starten."
 msgid "Cannot start browser configuration program."
 msgstr "Kan het programma voor browser-instellingen niet starten."
 
-msgid "ST_UN server:"
-msgstr "ST_UN-server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Bijvoorbeeld: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP-adres _automatisch bepalen"
 
 msgid "Public _IP:"
@@ -12522,6 +12722,10 @@ msgstr "_Beginpoort:"
 msgid "_End port:"
 msgstr "_Eindpoort:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Relay Server (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy-server &amp; browser"
 
@@ -12550,6 +12754,10 @@ msgstr "Proxy-server"
 msgid "No proxy"
 msgstr "Geen proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Gebruiker:"
 
@@ -12708,12 +12916,12 @@ msgstr "Bij afwezigheid en inactiviteit"
 msgid "Auto-away"
 msgstr "Automatisch afwezig"
 
-msgid "Change status when _idle"
-msgstr "Status op afwezig zetten _wanneer ik inactief ben"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuten voor inactief worden:"
 
+msgid "Change status when _idle"
+msgstr "Status op afwezig zetten _wanneer ik inactief ben"
+
 msgid "Change _status to:"
 msgstr "_Status veranderen in: "
 
@@ -12863,27 +13071,18 @@ msgstr "Op_slaan & gebruiken"
 msgid "Status for %s"
 msgstr "Status van %s"
 
-msgid "Custom Smiley"
-msgstr "Eigen smiley"
-
-msgid "More Data needed"
-msgstr "Meer gegevens vereist"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Geef een snelkoppeling om te associëren met de smiley."
-
-msgid "Duplicate Shortcut"
-msgstr "Dubbele snelkoppeling"
-
+#, fuzzy, c-format
 msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 "Een eigen smiley voor de geselecteerde snelkoppeling bestaat al reeds. Geef "
 "alsjeblieft een andere snelkoppeling."
 
-msgid "Please select an image for the smiley."
-msgstr "Selecteer een afbeelding uit de lijst voor de smiley"
+msgid "Custom Smiley"
+msgstr "Eigen smiley"
+
+msgid "Duplicate Shortcut"
+msgstr "Dubbele snelkoppeling"
 
 msgid "Edit Smiley"
 msgstr "Smiley bewerken"
@@ -12891,19 +13090,25 @@ msgstr "Smiley bewerken"
 msgid "Add Smiley"
 msgstr "Smiley toevoegen"
 
-msgid "Smiley _Image"
-msgstr "_Smiley-afbeelding"
+msgid "_Image:"
+msgstr "_Afbeelding:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Sneltoets smiley"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "_Tekst snelkoppeling"
 
 msgid "Smiley"
 msgstr "Eigen smileys"
 
+msgid "Shortcut Text"
+msgstr "Tekst snelkoppeling"
+
 msgid "Custom Smiley Manager"
 msgstr "Eigen smileys beheren"
 
+msgid "Select Buddy Icon"
+msgstr "Pictogram contact selecteren"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klik om het contactplaatje voor dit account te veranderen."
 
@@ -12989,11 +13194,11 @@ msgid "Cannot send launcher"
 msgstr "Kan starter niet sturen"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Je hebt een starter hierheen gesleept. Waarschijnlijk wil je het waar deze "
-"starter naar verwijst sturen."
+"starter naar verwijst sturen in plaats van de starter zelf."
 
 #, c-format
 msgid ""
@@ -13011,7 +13216,7 @@ msgstr ""
 "Het bestand '%s' is te groot voor %s. Probeer een kleinere afbeelding\n"
 
 msgid "Icon Error"
-msgstr "Icoonfout"
+msgstr "Pictogramfout"
 
 msgid "Could not set icon"
 msgstr "Kan plaatje niet instellen"
@@ -13027,9 +13232,30 @@ msgstr ""
 "kan afbeelding '%s' niet laden: reden onbekend, waarschijnlijk een kapotte "
 "afbeelding"
 
+msgid "_Open Link"
+msgstr "Koppeling _openen"
+
+msgid "_Copy Link Location"
+msgstr "Verwijzing _kopiëren"
+
+msgid "_Copy Email Address"
+msgstr "E-mailadres _kopiëren"
+
+msgid "_Open File"
+msgstr "Bestand _openen"
+
+msgid "Open _Containing Directory"
+msgstr "Ma_p openen"
+
 msgid "Save File"
 msgstr "Bestand opslaan"
 
+msgid "_Play Sound"
+msgstr "Geluid afs_pelen"
+
+msgid "_Save File"
+msgstr "Bestand op_slaan"
+
 msgid "Select color"
 msgstr "Selecteer kleur"
 
@@ -13117,6 +13343,72 @@ msgstr "Contact-beschikbaarheids-voorspellings-plug-in"
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Geeft statististieke informatie over de beschikbaarheid van je contact"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Server-adres"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Verbinden met server voor groepsgesprekken"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Kies een te raadplegen conferentieserver"
+
+msgid "Find Services"
+msgstr "Diensten zoeken"
+
+msgid "Add to Buddy List"
+msgstr "Aan contactenlijst toevoegen"
+
+msgid "Gateway"
+msgstr "Poort"
+
+msgid "Directory"
+msgstr "Map"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Geluid selecteren"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub dienst"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Beschrijving"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Directory info instellen"
+
+msgid "_Browse"
+msgstr "_Bladeren"
+
+msgid "Server does not exist"
+msgstr "Server bestaat niet"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server gebruikt geen van de ondersteunde identificatiemethoden"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Directory info instellen"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Deze plug-in is handig voor het debuggen van XMPP servers of clienten."
+
 msgid "Buddy is idle"
 msgstr "Contact is inactief"
 
@@ -13525,9 +13817,10 @@ msgstr "Muzieksessie-plug-in voor gezamenlijk componeren."
 
 #  *  summary
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "De muzieksessie-plug-in geeft enkele gebruikers de mogelijkheid om "
 "tegelijkertijd gezamenlijk aan een muziekstuk te werken."
@@ -13640,12 +13933,6 @@ msgstr ""
 "- Het keert alle binnenkomende tekst om\n"
 "- Het stuurt direct een bericht naar mensen wanneer ze online komen"
 
-msgid "Cursor Color"
-msgstr "Cursorkleur"
-
-msgid "Secondary Cursor Color"
-msgstr "Secundaire cursorkleur"
-
 msgid "Hyperlink Color"
 msgstr "Kleur van verwijzing"
 
@@ -13655,6 +13942,10 @@ msgstr "Kleur van reeds bezochte verwijzing"
 msgid "Highlighted Message Name Color"
 msgstr "Gemarkeerde bericht-kleur"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Kleur van melding van typen"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horizontale scheiding"
 
@@ -13685,35 +13976,22 @@ msgstr "GTK+ lettertype"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ snelkoppelingtekst-thema"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Kleuren van interface"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Schakel typmelding in"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Instellingen GTK+ themabeheer"
 
-msgid "Widget Sizes"
-msgstr "Elementgrootte"
+msgid "Colors"
+msgstr "Kleuren"
 
 msgid "Fonts"
 msgstr "Lettertypen"
 
+msgid "Miscellaneous"
+msgstr "Diversen"
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc bestandsbesturing"
 
@@ -13799,9 +14077,10 @@ msgid "Conversation Window Send Button."
 msgstr "Gespreksvenser verzendknop"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Voegt een verzendknop toe bij de invoerruimte van het gespreksvenster. Dit "
 "is bedoeld wanneer er geen fysiek keyboard aanwezig is."
@@ -13856,6 +14135,96 @@ msgstr "Tekstvervanging"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Vervangt tekst in uitgaande berichten volgens uw eigen regels."
 
+msgid "Just logged in"
+msgstr "Aangemeld"
+
+msgid "Just logged out"
+msgstr "Afgemeld"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Pictogram voor contact/\n"
+"Pictograam voor onbekend persoon"
+
+msgid "Icon for Chat"
+msgstr "Pictgram voor gesprek"
+
+msgid "Ignored"
+msgstr "Genegeerd"
+
+msgid "Founder"
+msgstr "Oprichter"
+
+msgid "Operator"
+msgstr "Operator"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Toestemming gegeven"
+
+msgid "Error dialog"
+msgstr "Foutdialoogvenster"
+
+msgid "Information dialog"
+msgstr "Informatiedialoogvenster"
+
+msgid "Mail dialog"
+msgstr "Maildialoogvenster"
+
+msgid "Question dialog"
+msgstr "Dialoogvenster voor vragen"
+
+msgid "Warning dialog"
+msgstr "Waarschuwingsdialoogvenster"
+
+msgid "What kind of dialog is this?"
+msgstr "Wat voor soort dialoogvenster is dit?"
+
+msgid "Status Icons"
+msgstr "Status-pictogrammen"
+
+msgid "Chatroom Emblems"
+msgstr "Symbolen gespreksruimte"
+
+msgid "Dialog Icons"
+msgstr "Pictogrammen voor dialoogvensters"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin pictogram themabeheer"
+
+msgid "Contact"
+msgstr "Contact"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Thema bewerken contactenlijst Pidgin"
+
+msgid "Edit Buddylist Theme"
+msgstr "Thema contactenlijst bewerken"
+
+msgid "Edit Icon Theme"
+msgstr "Pictogram-thema bewerken"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin themabewerker"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin themabewerker"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14028,17 +14397,15 @@ msgstr "Contactenlijst bovenop _houden:"
 msgid "Only when docked"
 msgstr "Alleen wanneer aangekoppeld"
 
-msgid "_Flash window when chat messages are received"
-msgstr "Venster laten _knipperen wanneer chatberichten worden ontvangen"
-
 msgid "Windows Pidgin Options"
 msgstr "Windows pidgin opties"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opties van Pidgin voor Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "Specifieke Windows-opties voor Pidgin, zoals contactenlijst."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14078,6 +14445,516 @@ msgstr "Verstuur en ontvang ruwe XMPP stanza's."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Deze plug-in is handig voor het debuggen van XMPP servers of clienten."
 
+#, fuzzy
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "Kan geen verbinding maken met de server."
+
+#, fuzzy
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Kan SILC sleutelpaar niet laden"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s heeft uw uitnodiging voor ruimte \"%s\" afgeslagen omdat \"%s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Uitnodiging geweigerd"
+
+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "Proxy"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Kan socket niet openen"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Kan niet luisteren naar socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Kan niet lezen van socket."
+
+#~ msgid "Connection failed."
+#~ msgstr "Verbinding mislukt."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server heeft verbinding verbroken"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Kan geen socket aanmaken"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Kan geen verbinding maken met host"
+
+#~ msgid "Read error"
+#~ msgstr "Leesfout"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan geen verbinding maken met de server:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Schrijffout"
+
+#~ msgid "Last Activity"
+#~ msgstr "Laatste activiteit"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Directory info instellen"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Stanza adresbijvoeging"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Groepsgesprek"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Deze gebruiker heeft geen profiel."
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc opdrachten"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub dienst"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Registratiefout"
+
+#~ msgid "User Location"
+#~ msgstr "Gebruikerslocatie"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Contactstatusmelding"
+
+#~ msgid "Software Version"
+#~ msgstr "Software versie"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Oriëntatie"
+
+#~ msgid "User Mood"
+#~ msgstr "Humeur gebruiker"
+
+#~ msgid "User Activity"
+#~ msgstr "Activiteit gebruiker"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Entiteit mogelijkheden"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Gecodeerde sessie onderhandelingen"
+
+#~ msgid "User Tune"
+#~ msgstr "Gebruikers tune"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM met sleuteluitwisseling"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Beschikbaarheid adres"
+
+#~ msgid "User Profile"
+#~ msgstr "Profiel"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Geluid jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Gebruikersnaam"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ICE UDP Jingle"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ICE TCP Jingle"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Raw UDP Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "DTMF DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Bericht ontvangen"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Openbare sleutel openbaren"
+
+#~ msgid "User Chatting"
+#~ msgstr "Chattende gebruiker"
+
+#~ msgid "User Browsing"
+#~ msgstr "Browsende gebruiker"
+
+#~ msgid "User Gaming"
+#~ msgstr "Gamende gebruiker"
+
+#~ msgid "User Viewing"
+#~ msgstr "Kijkende gebruiker"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanza codering"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Vertraagde afgifte"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Samenwerkende data-objecten"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Bestandsbronnen en delen"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hop-controle"
+
+#~ msgid "Read Error"
+#~ msgstr "Leesfout"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Kan geen verbinding maken met de server."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Wachtrij vol (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Kan het bericht niet analyseren"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Kan geen verbinding maken met host: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Aanmelden mislukt (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "De verbinding is verbroken omdat u zich heeft aangemeld op een andere "
+#~ "computer."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Fout! Geen SSL-ondersteuning geïnstalleerd."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Ongeldig wachtwoord."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan niet verbinden met BOS-server:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe "
+#~ "versies."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Kan geen verbinding maken"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ongeldige gebruikersnaam."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Kan login-antwoord niet decoderen"
+
+#~ msgid "Connection lost"
+#~ msgstr "Verbinding verbroken"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Kan host niet vinden"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Verbinding verbroken (schrijven)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Verbindingsfout"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Er is een fout opgetreden bij het lezen van de socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Kan geen verbinding maken met de computer"
+
+#~ msgid "Could not write"
+#~ msgstr "Kan niet schrijven"
+
+#~ msgid "Could not connect"
+#~ msgstr "Kon geen verbinding maken"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kan geen socket aanmaken om te luisteren"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Kan hostnaam niet vinden"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Ongeldig wachtwoord"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan geen verbinding maken met %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japanse semafoonserver"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japanse server voor bestandsoverdrachten"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Verbinding met de server \n"
+#~ "%s verloren"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Kan host niet vinden"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Server vereist TLS/SSL voor aanmelding. Geen ondersteuning voor TLS/SSL "
+#~ "gevonden."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Gespreksvenster verbergen"
+
+#~ msgid "More Data needed"
+#~ msgstr "Meer gegevens vereist"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Geef een snelkoppeling om te associëren met de smiley."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Selecteer een afbeelding uit de lijst voor de smiley"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Welk ID activeren?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Cursorkleur"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Secundaire cursorkleur"
+
+#~ msgid "Interface colors"
+#~ msgstr "Kleuren van interface"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Elementgrootte"
+
+#~ msgid "Invite message"
+#~ msgstr "Uitnodiging"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Geef de naam van de persoon die u wilt uitnodigen,\n"
+#~ "eventueel met een uitnodigende tekst."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Ophalen MSN Adressenlijst niet mogelijk"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s wordt opgezocht"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Verbinding met %s verbroken"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Aanmelding: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Kan niet naar bestand %s schrijven."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Kan het bestand %s niet lezen."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Bericht te lang, laatste %s Bytes afgekort."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s is niet aangemeld."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Waarschuwing van %s is niet toegestaan."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "Een bericht is verloren gegaan. U overschreidt de snelheid van de server."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Chatruimte in %s is niet beschikbaar."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "U verzend te snel berichten naar %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Een Bericht van %s is niet overgekomen omdat het te groot was."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Een Bericht van %s is niet overgekomen omdat het te snel verzonden werd."
+
+#~ msgid "Failure."
+#~ msgstr "Fout."
+
+#~ msgid "Too many matches."
+#~ msgstr "Te veel overeenkomsten."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Meer gegevens nodig."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Profielen service is momenteel niet toegankelijk."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Zoekfunctie e-mail beperkt."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Sleutelwoord genegeerd."
+
+#~ msgid "No keywords."
+#~ msgstr "Geen sleutelwoorden."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Deze gebruiker heeft geen profiel."
+
+#~ msgid "Country not supported."
+#~ msgstr "Land wordt niet ondersteund."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Onbekende Fout: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Ongeldige gebruikersnaam of wachtwoord."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "De service is momenteel niet bereikbaar."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Uw waarschuwingsniveau is momenteel te hoog om in te loggen."
+
+#~ 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 ""
+#~ "U hebt zich te snel aan en afgemeld. Wacht 10 Minuten en probeer het nog "
+#~ "een keer."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Onbekende aanmeldingsfout: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Onbekende fout %d opgetreden. Info: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Ongeldige groep"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Verbinding verbroken"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Wacht op antwoord..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC werkt weer. U kunt nu weer berichten versturen."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Wachtwoord succesvol veranderd"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Directory info ophalen"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Directory info instellen"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Kon %s niet openen om naar te schrijven!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Bestandsoverdracht mislukt; de andere kant heeft waarschijnl;ijk "
+#~ "afgebroken."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Kan niet verbinden voor overdracht."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr ""
+#~ "Kon koptekst van bestand niet instellen. Het bestand zal niet verzonden "
+#~ "worden."
+
+#~ msgid "Save As..."
+#~ msgstr "Opslaan als..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s vraagt aan %s om %d bestand te accepteren: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s vraagt aan %s om %d bestanden te accepteren: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s vraagt u om een bestand te verzenden"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC-protocol plug-in"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Opties"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxy-opties"
+
+#~ msgid "By log size"
+#~ msgstr "Op logboekgrootte"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "Verwijzing _openen met webbrowser"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN-server:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "_Smiley-afbeelding"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Sneltoets smiley"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "Venster laten _knipperen wanneer chatberichten worden ontvangen"
+
 #~ msgid ""
 #~ "You may be disconnected shortly.  You may want to use TOC until this is "
 #~ "fixed.  Check %s for updates."
diff --git a/po/nn.po b/po/nn.po
index 2436d13bb2..5a68c60e56 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-22 11:04-0500\n"
-"PO-Revision-Date: 2009-02-20 23:45+0100\n"
-"Last-Translator: YS Landro <nynorsk@strilen.net>\n"
+"POT-Creation-Date: 2009-08-09 19:06-0700\n"
+"PO-Revision-Date: 2009-08-09 02:41+0100\n"
+"Last-Translator: Yngve Spjeld Landro <nynorsk@landro.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +38,7 @@ msgstr ""
 "  -d, --debug         skriv ut feilsøkingsmeldingar til standard utkanal\n"
 "  -h, --help          vis denne hjelpa og avslutt\n"
 "  -n, --nologin       loggar ikkje på automatisk\n"
-"  -v, --version       vis noverande versjon og avslutt\n"
+"  -v, --version       vis noverande utgåve og avslutt\n"
 
 #, c-format
 msgid ""
@@ -596,19 +596,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Send til"
 
-msgid "Invite message"
-msgstr "Invitasjonsmelding"
-
-msgid "Invite"
-msgstr "Inviter"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Skriv inn namnet på brukaren du ønskjer å invitera.\n"
-"Du kan velja om du vil ha med ei invitasjonsmelding."
-
 msgid "Conversation"
 msgstr "Samtale"
 
@@ -867,6 +854,39 @@ msgstr "Alle samtaler"
 msgid "System Log"
 msgstr "Systemlogg"
 
+msgid "Calling ... "
+msgstr "Ringjer…"
+
+msgid "Hangup"
+msgstr "Legg på"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Godta"
+
+msgid "Reject"
+msgstr "Avvis"
+
+msgid "Call in progress."
+msgstr "Held på å ringja."
+
+msgid "The call has been terminated."
+msgstr "Oppringinga er blitt avbroten."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s ønskjer å starta ei lydøkt med deg."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s prøver å starta ein mediaøkttype som ikkje er støtta."
+
+msgid "You have rejected the call."
+msgstr "Du har avvist samtala."
+
+msgid "call: Make an audio call."
+msgstr "call: lag ei lydoppringing."
+
 msgid "Emails"
 msgstr "E-postmeldingar"
 
@@ -901,6 +921,9 @@ msgstr "Hald fram"
 msgid "IM"
 msgstr "Lynmeldingar"
 
+msgid "Invite"
+msgstr "Inviter"
+
 msgid "(none)"
 msgstr "(ingen)"
 
@@ -1105,7 +1128,6 @@ msgstr "%s har gått vekk . (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s har sendt deg ei melding. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukjend varselhending. Rapporter feilen."
 
@@ -1516,6 +1538,31 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Lastlog-programtillegg."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Hentar TinyURL…"
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Lag berre TinyURL for adresser med denne eller større lengd"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL-adresseprefiks (eller annan) "
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL-programtillegg"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"Ved mottak av meldingar med adresser (URL), bruk TinyURL som gjev lettare "
+"kopiering"
+
 msgid "accounts"
 msgstr "kontoar"
 
@@ -1616,41 +1663,39 @@ msgstr "Godtek du sertifikatet til %s?"
 msgid "SSL Certificate Verification"
 msgstr "SSL-sertifikatstadfesting"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Godta"
-
-msgid "Reject"
-msgstr "Avvis"
-
 msgid "_View Certificate..."
 msgstr "Vis _sertifikat…"
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
-"Sertifikatet som \"%s\" presenterte, er sjølvsignert. Det kan ikkje "
-"kontrollerast automatisk."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
+"Sertifikatet som \"%s\" presenterte seier at det er frå \"%s\" i staden for. "
+"Dette kan bety at du ikkje koplar deg til den tenesta du trur du gjer."
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL sertifikatfeil"
 
 msgid "Invalid certificate chain"
 msgstr "Ugyldig sertifikatkjede"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1659,6 +1704,21 @@ msgstr ""
 "Du har ingen database over rotsertifikat. Dermed kan ikkje dette "
 "sertifikatet validerast."
 
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Sertifikatet som \"%s\" presenterte, er sjølvsignert. Det kan ikkje "
+"kontrollerast automatisk."
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
+
 # ?
 #. vrq will be completed by user_auth
 msgid ""
@@ -1677,18 +1737,6 @@ msgstr ""
 msgid "Invalid certificate authority signature"
 msgstr "Ugyldig sertifikatautoritetssignatur"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Sertifikatet som \"%s\" presenterte seier at det er frå \"%s\" i staden for. "
-"Dette kan bety at du ikkje koplar deg til den tenesta du trur du gjer."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1724,6 +1772,8 @@ msgstr "+++ %s logga på"
 msgid "+++ %s signed off"
 msgstr "+++ %s logga av"
 
+#. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -1770,6 +1820,17 @@ msgstr "%s har gått ut av rommet."
 msgid "%s left the room (%s)."
 msgstr "%s har gått ut av rommet (%s)."
 
+msgid "Invite to chat"
+msgstr "Inviter til å prata"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Skriv inn namnet på brukaren du ønskjer å invitera. Du kan ta med ei valfri "
+"velkomstmelding."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Klarte ikkje å oppnå samband: %s"
@@ -1902,6 +1963,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Startar overføring av %s frå %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Overføringa av fila <a href=\"file://%s\">%s</a> er ferdig"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Overføringa av fila %s er ferdig"
 
@@ -2114,6 +2179,9 @@ msgstr "<font color=\"red\"><b>Klarte ikkje å lesa fila: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Klarte ikkje å laga konferansen"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Du nyttar %s, men dette tillegget krev %s."
@@ -2127,7 +2195,7 @@ msgstr "Samsvarsfeil %d i det magiske nummeret til tillegget (treng %d)"
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "Samsvarsfeil %d i ABI-versjonen.%d.x (treng %d.%d.x)"
+msgstr "Samsvarsfeil %d i ABI-utgåva.%d.x (treng %d.%d.x)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
@@ -2513,15 +2581,15 @@ msgstr "Tek med loggar frå andre lynmeldingsklientar i loggvisaren."
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Når ein les loggar, vil dette programtillegget ta med loggar frå andre "
-"klientar. For tida gjeld dette Adium, MSN Messenger og Trillian.\n"
+"klientar. For tida gjeld dette Adium, MSN Messenger, aMSN og Trillian.\n"
 "\n"
-"ÅTVARING: Dette tillegget er framleis ein alfa-versjon og vil kanskje krasja "
+"ÅTVARING: Dette tillegget er framleis ei alfa-utgåve og vil kanskje krasja "
 "ofte. Bruk det på eigen risiko!"
 
 msgid "Mono Plugin Loader"
@@ -2567,12 +2635,13 @@ msgstr "Emulering av fråkopla meldingar"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Lagra meldingar som er sende til ein fråkopla brukar som varsel."
 
+# `? '?
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Resten av meldingane vil bli lagra som eit varsel. Du kan endra/sletta "
-"varselet frå vennevarsel-vindauget."
+"Resten av meldingane vil bli lagra som varsel. Du kan endra/sletta varselet "
+"frå `vennevarsel'-vindauget."
 
 #, c-format
 msgid ""
@@ -2600,6 +2669,34 @@ msgstr "Lagra fråkopla meldingar som eit varsel"
 msgid "Do not ask. Always save in pounce."
 msgstr "Spør ikkje. Lagra alltid som eit varsel."
 
+msgid "One Time Password"
+msgstr "Eingongspassord"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Eingongspassordstøtte"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Sjå til at passord berre kan nyttast éin gong."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Tillèt deg å krevja på kontonivå at passord som ikkje blir lagra, berre kan "
+"nyttast éin gong. \n"
+"Merk: kontopassordet må ikkje vera lagra for at dette skal verka."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2793,14 +2890,14 @@ msgstr ""
 "tillegg må du installera ActiveTCL frå http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Fann ikkje verktøysamlinga til Apple Bonjour for Windows. Du finn fleire "
-"opplysningar på adressa http://d.pidgin.im/BonjourWindows."
+"Fann ikkje verktøysamlinga til Apple sin  \"Bonjour for Windows\". Du finn "
+"fleire opplysningar på adressa http://d.pidgin.im/BonjourWindows."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Klarer ikkje å lytta etter innkomande meldingstilkoplingar\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Klarer ikkje å lytta etter innkomande meldingstilkoplingar"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2838,9 +2935,8 @@ msgid "Purple Person"
 msgstr "Purple-person"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Stad"
+msgstr "Lokalport"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2852,14 +2948,17 @@ msgstr "%s har lukka samtala."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Klarte ikkje å senda meldinga. Samtala kunne ikkje startast."
 
-msgid "Cannot open socket"
-msgstr "Klarte ikkje å opna endepunkt"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Klarte ikkje å laga endepunktet:%s"
 
-msgid "Could not bind socket to port"
-msgstr "Klarte ikkje å binda endepunktet til port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Klarte ikkje å knyta endepunktet til porten: %s"
 
-msgid "Could not listen on socket"
-msgstr "Klarte ikkje å lytta til endepunktet"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Klarte ikkje å lytta på endepunktet: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Feil i sambandet med lokal mDNSResponder."
@@ -2907,14 +3006,14 @@ msgstr "Lagra venneliste…"
 msgid "Load buddylist from file..."
 msgstr "Hent vennelista frå fil…"
 
-msgid "Fill in the registration fields."
-msgstr "Fyll ut registreringsfelta."
+msgid "You must fill in all registration fields"
+msgstr "Du må fylla ut alle registreringsfelta"
 
-msgid "Passwords do not match."
-msgstr "Passorda samsvarer ikkje."
+msgid "Passwords do not match"
+msgstr "Passorda samsvarer ikkje"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Klarer ikkje å registrera ny konto. Det oppstod ein feil.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Klarer ikkje å registrera ein ny konto. Det oppstod ein ukjend feil."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Ein ny Gadu-gadu-konto er registrert"
@@ -2925,14 +3024,15 @@ msgstr "Registreringa er ferdig."
 msgid "Password"
 msgstr "Passord"
 
-msgid "Password (retype)"
-msgstr "Passord (éin gong til)"
+msgid "Password (again)"
+msgstr "Passord (om att)"
 
-msgid "Enter current token"
-msgstr "Skriv inn noverande markør"
+# ?! ;-)
+msgid "Enter captcha text"
+msgstr "Skriv teksten til tastetestbiletet"
 
-msgid "Current token"
-msgstr "Noverande markør"
+msgid "Captcha"
+msgstr "Tastetestbilete"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrera ny Gadu-Gadu-konto"
@@ -2985,6 +3085,15 @@ msgstr "Passordet blei endra."
 msgid "Current password"
 msgstr "Noverande passord"
 
+msgid "Password (retype)"
+msgstr "Passord (éin gong til)"
+
+msgid "Enter current token"
+msgstr "Skriv inn noverande markør"
+
+msgid "Current token"
+msgstr "Noverande markør"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Skriv inn det noverande og det nye passordet til UIN:"
 
@@ -2998,6 +3107,7 @@ msgstr "Vel eit praterom for vennen: %s"
 msgid "Add to chat..."
 msgstr "Legg til praterom…"
 
+#. Global
 msgid "Available"
 msgstr "Tilgjengeleg"
 
@@ -3031,8 +3141,8 @@ msgstr "Fann ingen brukarar"
 msgid "There are no users matching your search criteria."
 msgstr "Det er ingen brukarar som høver til søkjekriteria dine."
 
-msgid "Unable to read socket"
-msgstr "Klarte ikkje å lesa endepunkt"
+msgid "Unable to read from socket"
+msgstr "Klarte ikkje å lesa frå endepunktet"
 
 msgid "Buddy list downloaded"
 msgstr "Lasta ned venneliste"
@@ -3046,8 +3156,14 @@ msgstr "Vennelista blei lasta opp"
 msgid "Your buddy list was stored on the server."
 msgstr "Vennelista di blei lagra på tenaren."
 
-msgid "Connection failed."
-msgstr "Tilkoplinga feila."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Tilkopla"
+
+msgid "Connection failed"
+msgstr "Tilkoplinga feila"
 
 msgid "Add to chat"
 msgstr "Legg til praterom"
@@ -3055,14 +3171,23 @@ msgstr "Legg til praterom"
 msgid "Chat _name:"
 msgstr "Prate_namn:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Klarer ikkje å finna tenarnamnet '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Koplar til"
+
 msgid "Chat error"
 msgstr "Prateromsfeil"
 
 msgid "This chat name is already in use"
 msgstr "Prateromsnamnet er allereie i bruk"
 
-msgid "Not connected to the server."
-msgstr "Ikkje tilkopla tenaren."
+msgid "Not connected to the server"
+msgstr "Ikkje tilkopla tenaren"
 
 msgid "Find buddies..."
 msgstr "Søk etter venner…"
@@ -3103,6 +3228,9 @@ msgstr "Populær polsk lynmeldingsteneste"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-brukar"
 
+msgid "GG server"
+msgstr "GG-tenar"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ukjend kommando: %s"
@@ -3117,7 +3245,7 @@ msgstr "Emne er ikkje vald"
 msgid "File Transfer Failed"
 msgstr "Filoverføringa feila"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Klarte ikkje å opna ein lytteport."
 
 msgid "Error displaying MOTD"
@@ -3133,8 +3261,16 @@ msgstr "Inga \"Dagens melding\" er knytt til denne tilkoplinga."
 msgid "MOTD for %s"
 msgstr "\"Dagens melding\" frå %s"
 
-msgid "Server has disconnected"
-msgstr "Tenaren har kopla frå"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Mista sambandet med tenaren: %s"
 
 msgid "View MOTD"
 msgstr "Vis \"Dagens melding\""
@@ -3145,25 +3281,23 @@ msgstr "_Kanal:"
 msgid "_Password:"
 msgstr "_Passord:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC-kallenamn kan ikkje innehalda mellomrom"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Koplar til"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC-kallenamn og -tenar kan ikkje innehalda mellomrom"
 
 msgid "SSL support unavailable"
 msgstr "SSL-støtte er ikkje tilgjengeleg"
 
-msgid "Couldn't create socket"
-msgstr "Klarte ikkje å laga endepunkt"
+msgid "Unable to connect"
+msgstr "Klarte ikkje å kopla til"
 
-msgid "Couldn't connect to host"
-msgstr "Klarte ikkje å kopla til verten"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Klarer ikkje å kopla til: %s"
 
-msgid "Read error"
-msgstr "Lesefeil"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Tenaren lukka tilkoplinga"
 
 msgid "Users"
 msgstr "Brukarar"
@@ -3344,6 +3478,16 @@ msgstr ""
 "Tenaren avviste kontonamnet du valde. Det kan vera at det inneheld ugyldige "
 "teikn."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Kallenamnet \"%s\" er allereie i bruk."
+
+msgid "Nickname in use"
+msgstr "Kallenamnet er i bruk"
+
 msgid "Cannot change nick"
 msgstr "Kan ikkje endra kallenamn"
 
@@ -3581,11 +3725,11 @@ msgstr "Ad hoc-kommandoen feila"
 msgid "execute"
 msgstr "utfør"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Tenaren krev TLS/SSL for pålogging. Fann inga TLS/SSL-støtte."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Tenaren krev TLS/SSL, men fann inga TLS/SSL-støtte."
 
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "Du krev kryptering, men TLS/SSL-støtte blei ikkje funne."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Du krev kryptering, men fann inga TLS/SSL-støtte."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Tenaren krev autentisering i klartekst over eit ukryptert samband"
@@ -3601,17 +3745,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autentisering i klartekst"
 
-msgid "Invalid response from server."
-msgstr "Ugyldig svar frå tenaren."
+msgid "SASL authentication failed"
+msgstr "SASL-autentiseringa feila"
+
+msgid "Invalid response from server"
+msgstr "Ugyldig svar frå tenaren"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Tenaren nyttar ikkje ein autentiseringsmetode som er støtta "
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Du krev kryptering som ikkje er tilgjengeleg på denne tenaren."
+
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring frå tenaren"
 
-msgid "SASL error"
-msgstr "SASL-feil"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL-feil: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "Styringstenaren til BOSH avslutta økta di."
+
+msgid "No session ID given"
+msgstr "Ingen økt-ID er oppgjeven"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "BOSH-protokollutgåva er ikkje støtta"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Klarte ikkje å kopla til tenaren"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Klarte ikkje å kopla til tenaren: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Klarte ikkje å setja i gang SSL-sambandet"
 
 msgid "Full Name"
 msgstr "Fullt namn"
@@ -3628,6 +3798,11 @@ msgstr "Nettadresse"
 msgid "Street Address"
 msgstr "Gateadresse"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Tilleggsadressefelt"
 
@@ -3679,160 +3854,8 @@ msgstr "Klient"
 msgid "Operating System"
 msgstr "Operativsystem"
 
-msgid "Last Activity"
-msgstr "Siste aktivitet"
-
-msgid "Service Discovery Info"
-msgstr "Tenesteoppdagingsinfo"
-
-msgid "Service Discovery Items"
-msgstr "Tenesteoppdagingselement"
-
-msgid "Extended Stanza Addressing"
-msgstr "Utvida blokkadressering"
-
-msgid "Multi-User Chat"
-msgstr "Fleirbrukarprat"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Utvida nærvereopplysningar fleirbrukarsamtale"
-
-msgid "In-Band Bytestreams"
-msgstr "Samtidssamband"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad hoc-kommandoar"
-
-msgid "PubSub Service"
-msgstr "PubSub-teneste"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 bytesamband"
-
-msgid "Out of Band Data"
-msgstr "Eksterne data"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-# må setjast om seinare
-msgid "In-Band Registration"
-msgstr "Samtidsegistrering"
-
-msgid "User Location"
-msgstr "Brukarstad"
-
-msgid "User Avatar"
-msgstr "Brukaravatar"
-
-msgid "Chat State Notifications"
-msgstr "Pratetilstandsvarsel"
-
-msgid "Software Version"
-msgstr "Programvareversjon"
-
-msgid "Stream Initiation"
-msgstr "Straumoppstart"
-
-msgid "File Transfer"
-msgstr "Filoverføring"
-
-msgid "User Mood"
-msgstr "Brukarsinnsstemning"
-
-msgid "User Activity"
-msgstr "Brukaraktivitet"
-
-msgid "Entity Capabilities"
-msgstr "Entitetseigenskapar"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Krypterte øktforhandlingar"
-
-msgid "User Tune"
-msgstr "Brukarlåt"
-
-msgid "Roster Item Exchange"
-msgstr "Listeelement-utveksling"
-
-# Gjer betre
-msgid "Reachability Address"
-msgstr "Adresse ein kan nåast på"
-
-msgid "User Profile"
-msgstr "Brukarprofil"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle-lyd"
-
-msgid "User Nickname"
-msgstr "Brukarkallenamn"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle rein UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Meldingskvitteringar"
-
-msgid "Public Key Publishing"
-msgstr "Offentleg nøkkel-publisering"
-
-msgid "User Chatting"
-msgstr "Brukar pratar"
-
-msgid "User Browsing"
-msgstr "Brukar er på Internett"
-
-msgid "User Gaming"
-msgstr "Brukar speler"
-
-msgid "User Viewing"
-msgstr "Brukar ser på"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Blokkryptering"
-
-msgid "Entity Time"
-msgstr "Entitetstid"
-
-msgid "Delayed Delivery"
-msgstr "Forseinka levering"
-
-msgid "Collaborative Data Objects"
-msgstr "Samarbeidsdataobjekt"
-
-msgid "File Repository and Sharing"
-msgstr "Fillager og -deling"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-tenesteoppdaging for Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Forenkla  Encrypted Session Negotiation"
-
-msgid "Hop Check"
-msgstr "Hoppkontroll"
-
-msgid "Capabilities"
-msgstr "Evner"
+msgid "Local Time"
+msgstr "Lokaltid"
 
 msgid "Priority"
 msgstr "Prioritet"
@@ -3840,6 +3863,13 @@ msgstr "Prioritet"
 msgid "Resource"
 msgstr "Ressurs"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s sidan"
+
+msgid "Logged Off"
+msgstr "Avlogga"
+
 msgid "Middle Name"
 msgstr "Mellomnamn"
 
@@ -3861,14 +3891,12 @@ msgstr "Ikkje vekke frå"
 msgid "Temporarily Hide From"
 msgstr "Mellombels vekke frå"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Avbryt nærværsvarsling"
 
 msgid "(Re-)Request authorization"
 msgstr "Send godkjenningsførespurnaden (ein gong til)"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4007,28 +4035,24 @@ msgstr "Vel ein konferansetenar å spørja"
 msgid "Find Rooms"
 msgstr "Finn rom"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Du krev kryptering som ikkje er tilgjengeleg på denne tenaren."
+msgid "Affiliations:"
+msgstr "Tilknytingar:"
 
-msgid "Write error"
-msgstr "Skrivefeil"
+msgid "No users found"
+msgstr "Fann ingen brukarar"
 
-msgid "Ping timeout"
-msgstr "Tidsavbrot ping"
+msgid "Roles:"
+msgstr "Roller:"
 
-msgid "Read Error"
-msgstr "Lesefeil"
+msgid "Ping timed out"
+msgstr "Tidsavbrot ping"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Klarte ikkje å laga eit samband til tenaren:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Klarte ikkje å laga endepunkt"
+"Klarte ikkje å finna alternative XMPP-tilkoplingar etter mislykka forsøk på "
+"å kopla til direkte."
 
 msgid "Invalid XMPP ID"
 msgstr "Ugyldig XMPP-id"
@@ -4036,6 +4060,9 @@ msgstr "Ugyldig XMPP-id"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ulovleg XMPP-id. Domene må vera vald."
 
+msgid "Malformed BOSH URL"
+msgstr "BOSH-adressa er ikkje velforma"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registreringa av %s@%s blei gjennomført"
@@ -4060,9 +4087,6 @@ msgstr "Vellykka avregistrering"
 msgid "Unregistration Failed"
 msgstr "Avregistreringa feila"
 
-msgid "Already Registered"
-msgstr "Allereie registrert"
-
 msgid "State"
 msgstr "Fylke/region/stat"
 
@@ -4075,6 +4099,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Dato"
 
+msgid "Already Registered"
+msgstr "Allereie registrert"
+
 msgid "Unregister"
 msgstr "Avregistrer"
 
@@ -4126,6 +4153,12 @@ msgstr "Tenaren støttar ikkje blokkering"
 msgid "Not Authorized"
 msgstr "Ikkje godkjent"
 
+msgid "Mood"
+msgstr "Sinnsstemning"
+
+msgid "Now Listening"
+msgstr "Lyttar"
+
 msgid "Both"
 msgstr "Begge"
 
@@ -4147,12 +4180,6 @@ msgstr "Ingen"
 msgid "Subscription"
 msgstr "Abonnement"
 
-msgid "Mood"
-msgstr "Sinnsstemning"
-
-msgid "Now Listening"
-msgstr "Lyttar"
-
 msgid "Mood Text"
 msgstr "Sinnsstemningstekst"
 
@@ -4195,9 +4222,6 @@ msgstr "Passordet ditt er blitt endra"
 msgid "Error changing password"
 msgstr "Feil under  endringa av passordet"
 
-msgid "Password (again)"
-msgstr "Passord (om att)"
-
 msgid "Change XMPP Password"
 msgstr "Endra XMPP-passord"
 
@@ -4354,7 +4378,7 @@ msgid "Unsupported Stanza Type"
 msgstr "Blokktypen er ikkje støtta"
 
 msgid "Unsupported Version"
-msgstr "Versjonen er ikkje støtta"
+msgstr "Utgåva er ikkje støtta"
 
 msgid "XML Not Well Formed"
 msgstr "XML-koden er ikkje velforma"
@@ -4391,16 +4415,24 @@ msgid "Unable to ping user %s"
 msgstr "Klarer ikkje å pinga brukaren %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "Klarer ikkje å alarmera sidan ein ikkje veit noko om brukaren %s."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Klarer ikkje å alarmera sidan ein ikkje veit noko om %s."
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Klarer ikkje å alarmera sidan %s kan vera fråkopla."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "Klarer ikkje å alarmera sidan brukaren %s kan vera fråkopla."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"Klarer ikkje å alarmera fordi %s støttar ikkje dette eller ikkje ønskjer å "
+"ta i mot alarmar no."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Klarer ikkje å alarmera fordi brukaren %s støttar ikkje dette."
+msgid "Buzzing %s..."
+msgstr "Alarmerer %s…"
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4412,8 +4444,31 @@ msgid "%s has buzzed you!"
 msgstr "%s har alarmert deg!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Alarmerer %s…"
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Klarte ikkje å klargjera media med %s: ugyldig JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Klarte ikkje å klargjera media med %s: brukaren er ikkje tilkopla"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Klarte ikkje å klargjera media med %s: abonnerer ikkje på brukarnærvær"
+
+msgid "Media Initiation Failed"
+msgstr "Medieklargjeringa feila"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Vel kva for ressurs av %s du ønskjer å starta ei medieøkt med."
+
+msgid "Select a Resource"
+msgstr "Vel ein ressurs"
+
+msgid "Initiate Media"
+msgstr "Klargjer media"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Endra prateromsinnstillingane."
@@ -4434,18 +4489,19 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;brukar&gt; [årsak]:  utesteng brukaren frå rommet."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;brukar&gt; &lt;owner|admin|member|outcast|none&gt;: vel kva "
-"tilknyting brukaren har til rommet."
+"affiliate &lt;brukar|eigar|admin|medlem|outcast|ingen&gt;[kallenamn1]"
+"[kallenamn2]…: hent brukarar med ei tilknyting til rommet eller lag slik "
+"tilknyting."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;brukar&gt; &lt;moderator|participant|visitor|none&gt;: vel kva "
-"rolle brukaren har i rommet."
+"role &lt;moderator|deltakar|besøkjar|none&gt;: hent brukarar med ei rolle i "
+"rommet eller lag slik rolle."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;brukar&gt; [melding]:  Invitér ein brukar til rommet."
@@ -4506,6 +4562,9 @@ msgstr "Tilkoplingstenar"
 msgid "File transfer proxies"
 msgstr "Mellomlager filoverføringar"
 
+msgid "BOSH URL"
+msgstr "BOSH-adresse"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4544,6 +4603,14 @@ msgstr "Feil i XML-tolkinga"
 msgid "Unknown Error in presence"
 msgstr "Ukjend feil til stades"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Klarte ikkje å kopla til praterommet %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Feil i praterommet %s"
+
 msgid "Create New Room"
 msgstr "Lag eit nytt rom"
 
@@ -4560,13 +4627,28 @@ msgstr "Endra rom_innstillingane"
 msgid "_Accept Defaults"
 msgstr "_Godta standardinnstillingane"
 
+msgid "No reason"
+msgstr "Ingen årsak"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Klarte ikkje å kopla til praterommet %s"
+msgid "You have been kicked: (%s)"
+msgstr "Du er blitt sparka ut av: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Feil i praterommet %s"
+msgid "Kicked (%s)"
+msgstr "Sparka ut (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Overføringa av samtidsdatastraumen feila\n"
+
+msgid "Transfer was closed."
+msgstr "Overføringa blei lukka."
+
+msgid "Failed to open the file"
+msgstr "Klarte ikkje å opna fila"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Klarte ikkje å opna samtidsdatastraum"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4592,9 +4674,6 @@ msgstr "Klarte ikkje å senda fila til %s. Abonnerer ikkje på brukarnærvær"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Vel kva for ressurs av %s du ønskjer å senda fila til"
 
-msgid "Select a Resource"
-msgstr "Vel ein ressurs"
-
 msgid "Edit User Mood"
 msgstr "Endra brukarsinnsstemning"
 
@@ -4891,6 +4970,31 @@ msgstr "Andre kontaktar"
 msgid "Non-IM Contacts"
 msgstr "Andre enn lynmeldingskontaktar"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s sende deg ein blunk. <a href='msn-wink://%s'>Klikk her for å spela han "
+"av</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s sende deg ein blunk, men han blei ikkje lagra"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s sende eit taleklipp. <a href='audio://%s'>Klikk her for å spela det av</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s sende deg eit lydklipp, men det kunne ikkje lagrast"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s har sendt deg ein lydpratinvitasjon. Denne funksjonen er enno ikkje "
+"støtta."
+
 msgid "Nudge"
 msgstr "Dytt"
 
@@ -5041,8 +5145,28 @@ msgstr "Start ein _prat"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN krev bruk av SSL. Last ned eit støtta SSL-bibliotek. "
 
-msgid "Failed to connect to server."
-msgstr "Klarte ikkje å kopla til tenaren."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Klarte ikkje å leggja til vennen %s fordi brukarnamnet er ugyldig. "
+"Brukarnamn må vera ei gyldig e-postadresse."
+
+msgid "Unable to Add"
+msgstr "Klarer ikkje å leggja til"
+
+msgid "Authorization Request Message:"
+msgstr "Godtakingførespurnad:"
+
+msgid "Please authorize me!"
+msgstr "Gjer vel og godta meg."
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Klarte ikkje å henta profilen"
@@ -5232,63 +5356,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID-autentisering: ugyldig svar"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s er ikkje ei gyldig gruppe."
-
-msgid "Unknown error."
-msgstr "Ukjend feil."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s på %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s har nettopp sendt deg ein dytt!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "ukjend feil (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Ukjend feil (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Klarte ikkje å leggja til brukar"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Desse brukarane er ikkje i adresseboka di"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Klarte ikkje å leggja til brukaren på %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Klarte ikkje å blokkera brukaren på %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Klarte ikkje å tillata brukaren på %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Klarte ikkje å leggja til %s fordi vennelista di er full."
-
+#. Unknown error!
 #, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s er ikkje ein gyldig Passport-konto."
+msgid "Unknown error (%d)"
+msgstr "ukjend feil (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Tenesta er mellombels utilgjengeleg."
+msgid "The following users are missing from your addressbook"
+msgstr "Desse brukarane er ikkje i adresseboka di"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilmeldinga blei ikkje sendt sidan ho var for lang."
 
-msgid "Unable to rename group"
-msgstr "Klarte ikkje å endra namnet til gruppa"
-
-msgid "Unable to delete group"
-msgstr "Klarer ikkje å sletta gruppa"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5332,9 +5420,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Meldinga blei ikkje sendt sidan det oppstod ein ukjend feil."
 
-msgid "Unable to connect"
-msgstr "Klarte ikkje å kopla til"
-
 msgid "Writing error"
 msgstr "Skrivefeil"
 
@@ -5349,21 +5434,21 @@ msgstr ""
 "Tilkoplingsfeil frå %s-tenaren:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Protokollen vår er ikkje støtta av tenaren."
+msgid "Our protocol is not supported by the server"
+msgstr "Protokollen vår er ikkje støtta av tenaren"
 
-msgid "Error parsing HTTP."
-msgstr "Feil i HTTP-tolkinga."
+msgid "Error parsing HTTP"
+msgstr "Feil i HTTP-tolkinga"
 
-msgid "You have signed on from another location."
-msgstr "Du har logga på frå ein annan stad."
+msgid "You have signed on from another location"
+msgstr "Du har logga på frå ein annan stad"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tenarane er mellombels utilgjengelege. Vent ei stund og prøv igjen."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "MSN-tenarane vil vera mellombels nede."
+msgid "The MSN servers are going down temporarily"
+msgstr "MSN-tenarane vil vera mellombels nede"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5392,6 +5477,18 @@ msgstr "Sender informasjonskapsel"
 msgid "Retrieving buddy list"
 msgstr "Hentar vennelista"
 
+# dårleg formulering?
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s spør om å få sjå nettkameraet ditt. Denne funksjonen er enno ikkje støtta."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje "
+"støtta."
+
 msgid "Away From Computer"
 msgstr "Vekke frå datamaskina"
 
@@ -5431,14 +5528,6 @@ msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Det kan vera at meldinga ikkje blei sendt sidan ein ukjend feil oppstod:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s har lagt deg til i vennelista si."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s har fjerna deg frå vennelista si."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Sletta venn frå adresseboka?"
 
@@ -5468,6 +5557,54 @@ msgid "MSN Protocol Plugin"
 msgstr "MSN-protokolltillegg"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s er ikkje ei gyldig gruppe."
+
+msgid "Unknown error."
+msgstr "Ukjend feil."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s på %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Klarte ikkje å leggja til brukaren på %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Klarte ikkje å blokkera brukaren på %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Klarte ikkje å tillata brukaren på %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Klarte ikkje å leggja til %s fordi vennelista di er full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s er ikkje ein gyldig Passport-konto."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Tenesta er mellombels utilgjengeleg."
+
+msgid "Unable to rename group"
+msgstr "Klarte ikkje å endra namnet til gruppa"
+
+msgid "Unable to delete group"
+msgstr "Klarer ikkje å sletta gruppa"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s har lagt deg til i vennelista si."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s har fjerna deg frå vennelista si."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Brukaren %s finst ikkje"
 
@@ -5496,6 +5633,8 @@ msgid "Lost connection with server"
 msgstr "Mista sambandet til tenaren"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nye e-postmeldingar"
 
@@ -5534,26 +5673,22 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Legg til kontaktar frå tenaren"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Tilkopla"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfeil, kode %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Passordet ditt er på %d teikn. MySpaceIM godtek berre %d teikn. Gjer "
-"passordet ditt kortare på nettsida http://profileedit.myspace.com/index.cfm?"
-"fuseaction=accountSettings.changePassword og prøv på nytt."
+"%s Passordet ditt er på %zu teikn, som er lengre enn største lengda som er %"
+"d. Gjer passordet ditt kortare på nettsida http://profileedit.myspace.com/"
+"index.cfm?fuseaction=accountSettings.changePassword og prøv på nytt."
+
+msgid "Incorrect username or password"
+msgstr "Feil brukarnamn eller passord"
 
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-feil"
@@ -5561,16 +5696,6 @@ msgstr "MySpaceIM-feil"
 msgid "Invalid input condition"
 msgstr "Ugyldig inndatavilkår"
 
-msgid "Read buffer full (2)"
-msgstr "Fullt lesemellomlager (2)"
-
-msgid "Unparseable message"
-msgstr "Meldinga kan ikkje tolkast"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Klarte ikkje å kopla til verten: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Klarte ikkje å leggja til venn"
 
@@ -5652,7 +5777,16 @@ msgid "Total Friends"
 msgstr "Tal på venner totalt"
 
 msgid "Client Version"
-msgstr "Klientversjon"
+msgstr "Klientutgåve"
+
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Det oppstod ein feil då brukarnamnet skulle lagrast. Prøv igjen, eller besøk "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username for å "
+"lagra brukarnamnet ditt."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - brukarnamnet er tilgjengeleg"
@@ -5871,9 +6005,6 @@ msgstr "Kan ikkje leggja til ein sjølv"
 msgid "Master archive is misconfigured"
 msgstr "Hovudarkivet har feile innstillingar"
 
-msgid "Incorrect username or password"
-msgstr "Feil brukarnamn eller passord"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Fann ikkje verten til brukarnamnet du skreiv inn"
 
@@ -5903,7 +6034,7 @@ msgstr "Brukaren har blokkert deg"
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
-msgstr "Prøveversjonen tillèt ikkje meir enn ti samstundes pålogga brukarar"
+msgstr "Prøveutgåva tillèt ikkje meir enn ti samstundes pålogga brukarar"
 
 msgid "The user is either offline or you are blocked"
 msgstr "Brukaren er anten fråkopla eller du er blokkert"
@@ -5913,8 +6044,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Ukjend feil: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Pålogginga feila (%s)."
+msgid "Unable to login: %s"
+msgstr "Klarer ikkje å logga på: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6016,9 +6147,6 @@ msgstr "GroupWise-konferanse %d"
 msgid "Authenticating..."
 msgstr "Autentiserer…"
 
-msgid "Unable to connect to server."
-msgstr "Klarer ikkje å kopla til tenaren."
-
 msgid "Waiting for response..."
 msgstr "Venatr på svar…"
 
@@ -6042,24 +6170,18 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Vil du bli med i praten?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Du er blitt logga ut fordi du logga deg på frå ei anna maskin."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s verkar vera fråkopla. Brukaren fekk ikkje meldinga du nett sendte."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Klarer ikkje å kopla til tenaren. Skriv inn adressa til tenaren du vil kopla "
 "deg til."
 
-msgid "Error. SSL support is not installed."
-msgstr "Feil. SSL-støtte er ikkje installert."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Denne konferanse er blitt lukka. Kan ikkje senda fleire meldingar."
 
@@ -6082,25 +6204,32 @@ msgstr "Tenaradresse"
 msgid "Server port"
 msgstr "Tenarport"
 
+msgid "Received unexpected response from "
+msgstr "Fekk uventa svar frå "
+
+#. username connecting too frequently
+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 ""
+"Du har kopla til og blitt fråkopla for ofte. Vent i ti minutt og prøv igjen. "
+"Held du fram med å prøva, vil du måtta venta endå lenger."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Klarte ikkje å spørja"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL tillèt ikkje at brukarnamnet ditt kan autentiserast her"
+
 msgid "Could not join chat room"
 msgstr "Klarte ikkje å bli med i praterommet"
 
 msgid "Invalid chat room name"
 msgstr "Ugyldig prateromsnamn"
 
-msgid "Server closed the connection."
-msgstr "Tenaren lukka tilkoplinga."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Mista sambandet med tenaren:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Det kom ugyldige data frå sambandet med tenaren."
+msgid "Received invalid data on connection with server"
+msgstr "Det kom ugyldige data frå sambandet med tenaren"
 
 #. *< type
 #. *< ui_requirement
@@ -6147,7 +6276,7 @@ msgstr "Mista sambandet til fjernbrukaren:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Det kom ugyldige data ved tilkoplinga til fjerntenaren."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Klarer ikkje å laga til eit samband med fjernbrukaren."
 
 msgid "Direct IM established"
@@ -6347,20 +6476,12 @@ msgid "Buddy Comment"
 msgstr "Vennenotat"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Klarte ikkje å kopla opp mot autentiseringstenaren:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Klarte ikkje å kopla opp mot autentiseringstenaren: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Klarte ikkje å kopla til BOS-tenaren:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Klarer ikkje å kopla til mot BOS-tenaren: %s"
 
 msgid "Username sent"
 msgstr "Finch"
@@ -6374,52 +6495,57 @@ msgstr "Fullfører tilkoplinga"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Får ikkje til å logga på: klarer ikkje å logga på som %s fordi brukarnamnet "
-"er ugyldig. Brukarnamn må vera ei gyldig e-postadresse, eller begynna med "
-"ein bokstav og berre innehalda bokstavar. tal og mellomrom, eller berre "
-"innehalda tal."
+"Får ikkje til å logga på som %s fordi brukarnamnet er ugyldig. Brukarnamn må "
+"vera ei gyldig e-postadresse, eller begynna med ein bokstav og berre "
+"innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Ugyldig rukarnamn."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Du kan bli fråkopla snart. Dersom du blir det, sjå etter oppdateringar på %s."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Klarer ikkje å henta ein gyldig AIM påloggingsnøkkel."
+
+msgid "Unable to get a valid login hash."
+msgstr "Klarer ikkje å henta ein gyldig påloggingsnøkkel."
 
-msgid "Incorrect password."
-msgstr "Feil passord."
+msgid "Received authorization"
+msgstr "Godkjenning motteken"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Brukarnamnet finst ikkje"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Kontoen din er for tida sperra for bruk."
+msgid "Your account is currently suspended"
+msgstr "Kontoen din er for tida sperra for bruk"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL si lynmeldingsteneste er mellombels utilgjengeleg."
 
-#. screen name connecting too frequently
+#. client too old
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Klientutgåva du bruker er for gammal. Oppgrader på %s"
+
 #. IP address connecting too frequently
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"Du har kopla til og blitt fråkopla for ofte. Vent i ti minutt og prøv igjen. "
+"Du har kopla til og blitt fråkopla for ofte. Vent ei stund og prøv igjen. "
 "Held du fram med å prøva, vil du måtta venta endå lenger."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Klientversjonen du bruker er for gammal. Oppgrader på %s"
-
-msgid "Could Not Connect"
-msgstr "Klarte ikkje å kopla til"
-
-msgid "Received authorization"
-msgstr "Godkjenning motteken"
-
-msgid "The SecurID key entered is invalid."
-msgstr "Den innskrivne SecurID-nøkkelen er ugyldig."
+msgid "The SecurID key entered is invalid"
+msgstr "Den innskrivne SecurID-nøkkelen er ugyldig"
 
 msgid "Enter SecurID"
 msgstr "Skriv inn SecurID"
@@ -6427,27 +6553,6 @@ msgstr "Skriv inn SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Før opp dei seks tala frå den digitale teiknruta."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Du kan bli fråkopla snart. Dersom du blir det, sjå etter oppdateringar på %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Klarer ikkje å henta ein gyldig AIM påloggingsnøkkel."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Du kan bli fråkopla snart. Sjå etter oppdateringar på %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Klarer ikkje å henta ein gyldig påloggingsnøkkel."
-
 msgid "Password sent"
 msgstr "Passordet er sendt"
 
@@ -6457,12 +6562,6 @@ msgstr "Klarte ikkje å setja i gang sambandet"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Om du godtek meg, kan eg leggja deg til i vennelista mi."
 
-msgid "Authorization Request Message:"
-msgstr "Godtakingførespurnad:"
-
-msgid "Please authorize me!"
-msgstr "Gjer vel og godta meg."
-
 msgid "No reason given."
 msgstr "Ingen årsak oppgjeven."
 
@@ -6584,7 +6683,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du fekk ikkje %hu melding frå %s av uviss årsak."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s av uviss årsak."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Klarer ikkje å senda melding: %s"
@@ -6606,6 +6705,9 @@ msgstr "Tilkopla sidan"
 msgid "Member Since"
 msgstr "Medlem sidan"
 
+msgid "Capabilities"
+msgstr "Evner"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -6788,17 +6890,14 @@ msgstr "Fråværsmeldinga er for lang."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Klarte ikkje å leggja til vennen %s fordi brukarnamnet ikkje er gyldig. "
+"Klarte ikkje å leggja til vennen %s fordi brukarnamnet er ugyldig. "
 "Brukarnamn må vera ei gyldig e-postadresse, eller begynna med ein bokstav og "
 "berre innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
 
-msgid "Unable to Add"
-msgstr "Klarer ikkje å leggja til"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Klarer ikkje å henta vennelista"
 
@@ -6814,7 +6913,7 @@ msgstr "Foreldrelause"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Kan ikkje leggja til vennen %s sidan vennelista er full. Slett ein venn frå "
@@ -6824,8 +6923,8 @@ msgid "(no name)"
 msgstr "(ikkje noko namn)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr "Klarte ikkje av ukjend årsak å leggja til vennen %s."
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "Klarte ikkje av uviss årsak å leggja til vennen %s."
 
 #, c-format
 msgid ""
@@ -6956,6 +7055,7 @@ msgstr "_Søk"
 msgid "Set User Info (web)..."
 msgstr "Skriv inn brukarinfo (nett)…"
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Endra passordet (nett)"
 
@@ -6985,6 +7085,9 @@ msgstr "Finn venn utfrå e-postadressa…"
 msgid "Search for Buddy by Information"
 msgstr "Søk etter venn utfrå opplysningar"
 
+msgid "Use clientLogin"
+msgstr "Bruk klientpålogging"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7174,6 +7277,34 @@ msgstr "Oppdater"
 msgid "Could not change buddy information."
 msgstr "Klarte ikkje å endra venneopplysningane."
 
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Note"
+msgstr "Notat"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Kontaktnotat"
+
+msgid "Change his/her memo as you like"
+msgstr "Endra hans/hennar notat som du vil"
+
+msgid "_Modify"
+msgstr "_Endra"
+
+msgid "Memo Modify"
+msgstr "Endra notat"
+
+msgid "Server says:"
+msgstr "Tenaren seier:"
+
+msgid "Your request was accepted."
+msgstr "Førespurnaden blei godteken."
+
+msgid "Your request was rejected."
+msgstr "Førespurnaden din blei avvist."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u krev stadfesting"
@@ -7483,6 +7614,12 @@ msgstr "<p><b>Herlege lappeskrivarar</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Hyllest</b>: %lu<br>\n"
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Grundige testarar</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "ån og meir, gjer vel å la meg få vita det… takk! :-)"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Og alle gutane på bakrommet…</i><br>\n"
 
@@ -7508,6 +7645,9 @@ msgstr "Oppdater alle QQ Qun-romma"
 msgid "About OpenQ"
 msgstr "Om OpenQ"
 
+msgid "Modify Buddy Memo"
+msgstr "Endra kontaktnotat"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7555,7 +7695,7 @@ msgstr "Intervall vedlikehaldstilkopling (sekund)"
 msgid "Update interval (seconds)"
 msgstr "Oppdateringsintervall (sekund)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Klarer ikkje å dekryptera tenarsvaret"
 
 #, c-format
@@ -7580,9 +7720,6 @@ msgstr "Må slåast på"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Får ikkje logga på. Ukjend svarkode (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Klarte ikkje å dekryptera tenarsvaret"
-
 msgid "Requesting captcha"
 msgstr "Spør etter tastetest (\"captcha\")"
 
@@ -7616,30 +7753,17 @@ msgstr ""
 "Pålogginga gav ukjend feilkode (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Klarte ikkje å kopla til."
-
 msgid "Socket error"
 msgstr "Endepunktsfeil"
 
-msgid "Unable to read from socket"
-msgstr "Klarte ikkje å lesa frå endepunktet"
-
-msgid "Write Error"
-msgstr "Skrivefeil"
-
-msgid "Connection lost"
-msgstr "Tapt tilkopling"
-
 msgid "Getting server"
 msgstr "Hentar tenar"
 
 msgid "Requesting token"
 msgstr "Spør etter symbol"
 
-msgid "Couldn't resolve host"
-msgstr "Vertsoppslaget feila"
+msgid "Unable to resolve hostname"
+msgstr "Klarer ikkje å finna tenarnamnet"
 
 msgid "Invalid server or port"
 msgstr "Ugyldig tenar eller port"
@@ -7694,7 +7818,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ-gruppekommando"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Klarte ikkje å dekryptera påloggingssvaret"
 
 msgid "Unknown LOGIN CMD"
@@ -7714,9 +7838,6 @@ msgstr "Filsending"
 msgid "%d canceled the transfer of %s"
 msgstr "%d avbraut overføringa av %s"
 
-msgid "Connection closed (writing)"
-msgstr "Tilkoplinga er lukka (skrivande)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppetittel</b> %s<br>"
@@ -7770,17 +7891,6 @@ msgstr "Ein Sametime-administrator har sendt ut denne meldinga på tenaren %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-administratormelding"
 
-msgid "Connection reset"
-msgstr "Tilkoplinga tilbakestilt"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Feil under lesing frå endepunkt: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Klarer ikkje å kopla til tenaren"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Melding frå %s"
@@ -7803,6 +7913,9 @@ msgstr "Høgtalarar"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Filoverføring"
+
 msgid "Supports"
 msgstr "Støttar"
 
@@ -8519,9 +8632,6 @@ msgstr "Organisasjon"
 msgid "Unit"
 msgstr "Eining"
 
-msgid "Note"
-msgstr "Notat"
-
 msgid "Join Chat"
 msgstr "Bli med i praterom"
 
@@ -8621,6 +8731,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Nettverkstatistikk"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping feila"
 
@@ -8684,8 +8797,8 @@ msgstr "Denne offentlege nøkkel-typen er ikkje støtta"
 msgid "Disconnected by server"
 msgstr "Fråkopla av tenaren"
 
-msgid "Error during connecting to SILC Server"
-msgstr "Feil under tilkopling mot SILC-tenaren"
+msgid "Error connecting to SILC Server"
+msgstr "Feil under tilkoplinga mot SILC-tenaren"
 
 msgid "Key Exchange failed"
 msgstr "Nøkkelutvekslinga feila"
@@ -8696,17 +8809,11 @@ msgstr ""
 "Klarte ikkje å ta opp att den fråkopla økta. Trykk Kopla til att for å laga "
 "ei ny tilkopling."
 
-msgid "Connection failed"
-msgstr "Tilkoplinga feila"
-
 msgid "Performing key exchange"
 msgstr "Utfører nøkkelutveksling"
 
-msgid "Unable to create connection"
-msgstr "Klarte ikkje å oppretta samband"
-
-msgid "Could not load SILC key pair"
-msgstr "Klarte ikkje å lasta SILC nøkkelpar"
+msgid "Unable to load SILC key pair"
+msgstr "Klarte ikkje å lasta SILC-nøkkelparet"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -8715,11 +8822,11 @@ msgstr "Koplar til SILC-tenar"
 msgid "Out of memory"
 msgstr "Ikkje nok minne"
 
-msgid "Cannot initialize SILC protocol"
-msgstr "Klarer ikkje å kjøra SILC-protokollen"
+msgid "Unable to initialize SILC protocol"
+msgstr "Klarer ikkje å starta SILC-protokollen"
 
 msgid "Error loading SILC key pair"
-msgstr "Feil under lasting av SILC nøkkelpar"
+msgstr "Feil under lastinga av SILC-nøkkelparet"
 
 #, c-format
 msgid "Download %s: %s"
@@ -8791,7 +8898,7 @@ msgid "There is no Message of the Day associated with this connection"
 msgstr "Det er inga \"Dagens melding\" knytt til dette sambandet"
 
 msgid "Create New SILC Key Pair"
-msgstr "Lag nytt SILC nøkkelpar"
+msgstr "Lag nytt SILC-nøkkelpar"
 
 msgid "Passphrases do not match"
 msgstr "Tilgangsfrasene samsvarer ikkje"
@@ -8821,7 +8928,7 @@ msgid "View Message of the Day"
 msgstr "Sjå \"Dagens melding\""
 
 msgid "Create SILC Key Pair..."
-msgstr "Lag SILC nøkkelpar…"
+msgstr "Lag SILC-nøkkelpar…"
 
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
@@ -9013,10 +9120,10 @@ msgid "Digitally sign and verify all messages"
 msgstr "Skriv under digitalt og stadfest alle meldingar"
 
 msgid "Creating SILC key pair..."
-msgstr "Lagar SILC nøkkelpar…"
+msgstr "Lagar SILC-nøkkelpar…"
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Klarer ikkje å laga SILC nøkkelpar\n"
+msgid "Unable to create SILC key pair"
+msgstr "Klarer ikkje å laga SILC-nøkkelparet"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9055,7 +9162,7 @@ msgstr "Nøkkellengd: \t%d bits\n"
 
 #, c-format
 msgid "Version: \t%s\n"
-msgstr "Versjon: \t%s\n"
+msgstr "Utgåve: \t%s\n"
 
 #, c-format
 msgid ""
@@ -9109,9 +9216,12 @@ msgstr "Tavle"
 msgid "No server statistics available"
 msgstr "Ingen tilgjengelege tenarstatistikkar"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Feil under tilkopling mot SILC-tenaren"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Feil: versjonsfeil - oppgrader klienten din"
+msgstr "Feil: utgåvefeil - oppgrader klienten din"
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
@@ -9157,30 +9267,24 @@ msgstr "Feil: ugyldig informasjonskapsel"
 msgid "Failure: Authentication failed"
 msgstr "Feil: autentiseringa feila"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "Klarer ikkje å oppretta eit SILC klientsamband"
+msgid "Unable to initialize SILC Client connection"
+msgstr "Klarer ikkje å starta eit SILC-klientsamband"
 
 msgid "John Noname"
 msgstr "Utan namn"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Klarte ikkje å lasta SILC nøkkelparet: %s"
-
-msgid "Could not write"
-msgstr "Klarte ikkje å lagra"
-
-msgid "Could not connect"
-msgstr "Klarte ikkje å kopla til"
+msgid "Unable to load SILC key pair: %s"
+msgstr "Klarer ikkje å lasta SILC-nøkkelparet: %s"
 
-msgid "Unknown server response."
-msgstr "Ukjent tenarsvar."
+msgid "Unable to create connection"
+msgstr "Klarte ikkje å oppretta samband"
 
-msgid "Could not create listen socket"
-msgstr "Klarte ikkje å laga lytte-endepunkt"
+msgid "Unknown server response"
+msgstr "Ukjent tenarsvar"
 
-msgid "Could not resolve hostname"
-msgstr "Vertsnamnoppslaget feila"
+msgid "Unable to create listen socket"
+msgstr "Klarte ikkje å laga lytteendepunktet"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-brukarnamn kan ikkje innehalda mellomrom eller @-teikn"
@@ -9221,175 +9325,60 @@ msgstr "Autentiser brukar"
 msgid "Auth Domain"
 msgstr "Autentiseringsdomene"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Slår opp %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Tilkoplinga mot %s feila"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Pålogging: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Klarer ikkje å lagra fila %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Klarer ikkje å lesa fila %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Meldinga er for lang - dei siste %s bytane er klipte vekk."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s er ikkje pålogga no."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Det er ikkje tillate å åtvara mot %s."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Ei melding er blitt vraka - du går ut over tenaren si fartsgrense."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Prat i %s er ikkje tilgjengeleg."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Du sender meldingane for fort til %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "%s sendte deg ei melding som ikkje kom fram: ho var for stor."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "%s sendte deg ei melding som ikkje kom fram: ho var sendt for fort."
-
-#, c-format
-msgid "Failure."
-msgstr "Svikt."
-
-#, c-format
-msgid "Too many matches."
-msgstr "For mange treff."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Treng fleire parametrar."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Katalogtenesta er mellombels utilgjengeleg."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "E-postoppslag er avgrensa."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Nøkkelord er ignorert."
-
-#, c-format
-msgid "No keywords."
-msgstr "Ingen nøkkelord."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Brukaren har ingen katalogopplysningar."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Land er ikkje støtta."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Ukjent svikt: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Feil brukarnamn eller passord."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Tenesta er mellombels utilgjengeleg."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Åtvaringsnivået ditt er for tida for høgt til at du kan logga på."
-
-#, c-format
-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 ""
-"Du har kopla til og frå for ofte i løpet av kort tid. Vent i ti minutt og "
-"prøv igjen. Held du fram med å prøva, vil du måtta venta endå lenger."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Det oppstod ein ukjent påloggingsfeil: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Det oppstod ein ukjent feil, %d. Info: %s"
-
-msgid "Invalid Groupname"
-msgstr "Ugyldig gruppenamn"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;rom&gt;: bli med i eit praterom på Yahoo-nettverket"
 
-msgid "Connection Closed"
-msgstr "Sambandet er lukka"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: list romma på Yahoo-nettverket"
 
-msgid "Waiting for reply..."
-msgstr "Ventar på svar…"
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: spør ein brukar om å starta ei teikneøkt"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC er attende frå pausen sin. Du kan no senda meldingar igjen."
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID …"
 
-msgid "Password Change Successful"
-msgstr "Passordet er endra"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo-protokolltillegg"
 
-msgid "_Group:"
-msgstr "_Gruppe:"
+msgid "Pager server"
+msgstr "Søkjetenestetenar"
 
-msgid "Get Dir Info"
-msgstr "Hent kataloginformasjon"
+msgid "Pager port"
+msgstr "S_økjeport"
 
-msgid "Set Dir Info"
-msgstr "Vel kataloginformasjon"
+msgid "File transfer server"
+msgstr "Filoverføringstenar"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Fekk ikkje opna %s for skriving"
+msgid "File transfer port"
+msgstr "Filoverførings_port"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Filoverføringa feila. Truleg avbroten av den andre parten."
+msgid "Chat room locale"
+msgstr "Pratero_mslokalitet"
 
-msgid "Could not connect for transfer."
-msgstr "Fekk ikkje kopla til for overføring."
+msgid "Ignore conference and chatroom invitations"
+msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Klarte ikkje å skriva filhovudet. Fila vil ikkje bli overført."
+msgid "Chat room list URL"
+msgstr "Prateromslisteadresse"
 
-msgid "Save As..."
-msgstr "Lagra som…"
+msgid "Yahoo Chat server"
+msgstr "Yahoo pratetenar"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s spør %s om å godta %d fil: %s (%.2f %s)%s%s"
-msgstr[1] "%s spør %s om å godta %d filer: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo prateport"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s spør deg om å senda dei ei fil"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN-id…"
 
 #. *< type
 #. *< ui_requirement
@@ -9401,14 +9390,11 @@ msgstr "%s spør deg om å senda dei ei fil"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC-protokolltillegg"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo JAPAN-protokolltillegg"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje "
-"støtta."
+msgid "Your SMS was not delivered"
+msgstr "ra"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-meldinga di blei ikkje sendt."
@@ -9434,6 +9420,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Er blitt nekta å leggja til venn"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Det kom ugyldige data"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Kontoen er låst grunna for mange forsøk på å logga på. Du kan kanskje løysa "
+"problemet ved å logga deg på Yahoo! sin nettstad."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Kontoen er låst av ukjent grunn. Du kan kanskje løysa problemet ved å logga "
+"deg på Yahoo! sin nettstad."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Brukarnamnet eller passordet finst ikkje"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9468,38 +9478,27 @@ msgstr ""
 "nettstad for å logga deg på."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Klarte ikkje å leggja til vennen %s i gruppa %s i tenarlista til kontoen %s."
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "Klarte ikkje å leggja til vennen i tenarlista"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørleg %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Fekk uventa HTTP-svar frå tenar."
-
-msgid "Connection problem"
-msgstr "Tilkoplingsproblem"
+msgid "Received unexpected HTTP response from server"
+msgstr "Fekk uventa HTTP-svar frå tenaren"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Mista sambandet med %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Mista sambandet med %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Klaret ikkje å få til samband med %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Klarte ikkje å kopla til %s: %s"
 
 msgid "Not at Home"
 msgstr "Ikkje heime"
@@ -9546,8 +9545,8 @@ msgstr "Nærværsinnstillingar"
 msgid "Start Doodling"
 msgstr "Laga krusedullar"
 
-msgid "Activate which ID?"
-msgstr "Kva ID skal takast i bruk?"
+msgid "Select the ID you want to activate"
+msgstr "Vel ID-en du vil ta i bruk"
 
 msgid "Join whom in chat?"
 msgstr "Bli med kven i praterommet?"
@@ -9561,73 +9560,15 @@ msgstr "Bli med brukaren i praterommet…"
 msgid "Open Inbox"
 msgstr "Opna innkorga"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;rom&gt;: bli med i eit praterom på Yahoo-nettverket"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: list romma på Yahoo-nettverket"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: spør ein brukar om å starta ei teikneøkt"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-ID …"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-protokolltillegg"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Søkjetenestetenar"
-
-msgid "Japan Pager server"
-msgstr "Søkjetenestetenar (_Japan)"
-
-msgid "Pager port"
-msgstr "S_økjeport"
-
-msgid "File transfer server"
-msgstr "Filoverføringstenar"
-
-msgid "Japan file transfer server"
-msgstr "Filoverføringstenar (Japa_n)"
-
-msgid "File transfer port"
-msgstr "Filoverførings_port"
-
-msgid "Chat room locale"
-msgstr "Pratero_mslokalitet"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
-
-msgid "Chat room list URL"
-msgstr "Prateromslisteadresse"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo pratetenar"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo prateport"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Sendt teikneførespurnad."
 
+msgid "Unable to connect."
+msgstr "Klarte ikkje å kopla til."
+
 msgid "Unable to establish file descriptor."
 msgstr "Klarer ikkje å laga filskildring."
 
@@ -9635,6 +9576,9 @@ msgstr "Klarer ikkje å laga filskildring."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s prøver å senda deg ei gruppe med %d-filer.\n"
 
+msgid "Write Error"
+msgstr "Skrivefeil"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profil"
 
@@ -9702,12 +9646,8 @@ msgid "The user's profile is empty."
 msgstr "Brukarprofilen er tom."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s har avvist konferanseinvitasjonen din til rommet \"%s\" grunna \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Invitasjonen avvist"
+msgid "%s has declined to join."
+msgstr "%s har avslått å bli med."
 
 msgid "Failed to join chat"
 msgstr "Klarte ikkje å bli med i praterommet"
@@ -9750,22 +9690,17 @@ msgstr "Stemmer"
 msgid "Webcams"
 msgstr "Nettkamera"
 
+msgid "Connection problem"
+msgstr "Tilkoplingsproblem"
+
 msgid "Unable to fetch room list."
 msgstr "Klarer ikkje å henta romlista."
 
 msgid "User Rooms"
 msgstr "Brukarrom"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Tilkoplingsproblem med YCHT-tenaren."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Mista sambandet med tenar\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Tilkoplingsproblem med YCHT-tenaren"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9896,32 +9831,21 @@ msgid "Exposure"
 msgstr "Framvising"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Klarte ikkje å laga endepunkt:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Klarer ikkje å tolka svaret frå HTTP-mellomtenaren: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Klarer ikkje å tolka svaret frå HTTP-mellomtenaren: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Feil i ambandet mot HTTP-mellomtenaren: %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Tilgang avvist: HTTP-mellomtenaren tillèt ikkje tunnel over port %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Klarte ikkje å slå opp %s"
 
-msgid "Could not resolve host name"
-msgstr "Klarte ikkje å slå opp vertsnamnet"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Ber om merksemda til %s…"
@@ -10008,9 +9932,6 @@ msgstr "Ikkje forstyrr meg"
 msgid "Extended away"
 msgstr "Utvida vekke"
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Listening to music"
 msgstr "Lyttar til musikk"
 
@@ -10052,18 +9973,6 @@ msgstr "%s vart verksam igjen"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Klarte ikkje å lesa %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Ein feil oppstod under lesinga av %s. Dei er ikkje blitt lasta, og den gamle "
-"fila har fått namnet %s~."
-
 msgid "Calculating..."
 msgstr "Reknar…"
 
@@ -10171,6 +10080,18 @@ msgstr "Tilkoplinga blei avvist."
 msgid "Address already in use."
 msgstr "Adressa er allereie i bruk."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Klarte ikkje å lesa %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Ein feil oppstod under lesinga av %s di. Fila er ikkje blitt lasta og den "
+"gamle fila har fått det nye namnet %s~."
+
 msgid "Internet Messenger"
 msgstr "Lynmeldingsklient"
 
@@ -10213,10 +10134,8 @@ msgstr "Varsling av ny _e-post"
 msgid "Use this buddy _icon for this account:"
 msgstr "Bruk dette venne-_ikonet for denne kontoen:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s-val"
+msgid "Ad_vanced"
+msgstr "A_vansert"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Bruk GNOME mellomlagerinnstillingar"
@@ -10251,9 +10170,6 @@ msgstr "Om du verkeleg ser godt etter"
 msgid "you can see the butterflies mating"
 msgstr "kan du sjå sommarfuglane kurtisera"
 
-msgid "Proxy Options"
-msgstr "Mellomtenarval"
-
 msgid "Proxy _type:"
 msgstr "_Mellomtenartype:"
 
@@ -10281,8 +10197,8 @@ msgstr "_Grunnleggjande"
 msgid "Create _this new account on the server"
 msgstr "Opprett denne _nye kontoen på tenaren"
 
-msgid "_Advanced"
-msgstr "A_vansert"
+msgid "P_roxy"
+msgstr "_Mellomlager"
 
 msgid "Enabled"
 msgstr "I bruk"
@@ -10332,8 +10248,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Oppdater dei nødvendige felta."
 
-msgid "Room _List"
-msgstr "Rom_liste"
+msgid "A_ccount"
+msgstr "_Konto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10341,8 +10257,8 @@ msgid ""
 msgstr ""
 "Skriv inn nødvendig informasjon om praterommet du ønskjer å gå inn i.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Rom_liste"
 
 msgid "_Block"
 msgstr "_Blokker"
@@ -10359,6 +10275,15 @@ msgstr "Hent _info"
 msgid "I_M"
 msgstr "_Lynmelding"
 
+msgid "_Audio Call"
+msgstr "_Lydsamtale"
+
+msgid "Audio/_Video Call"
+msgstr "Lyd-/_biletsamtale"
+
+msgid "_Video Call"
+msgstr "_Biletsamtale"
+
 msgid "_Send File..."
 msgstr "_Send fil…"
 
@@ -10368,8 +10293,11 @@ msgstr "Legg til _vennevarsling…"
 msgid "View _Log"
 msgstr "Vis l_ogg"
 
-msgid "Hide when offline"
-msgstr "Skjul  når du er fråkopla"
+msgid "Hide When Offline"
+msgstr "Skjul når du er fråkopla"
+
+msgid "Show When Offline"
+msgstr "Vis når du er fråkopla"
 
 msgid "_Alias..."
 msgstr "Ka_llenamn…"
@@ -10493,6 +10421,9 @@ msgstr "/Verktøy/Venne_varsling"
 msgid "/Tools/_Certificates"
 msgstr "/Verktøy/_Sertifikat"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Verktøy/_Tilpassa smilefjes"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Verktøy/Program_tillegg"
 
@@ -10502,9 +10433,6 @@ msgstr "/Verktøy/_Innstillingar"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Personvern"
 
-msgid "/Tools/Smile_y"
-msgstr "/Verktøy/Smile_fjes"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringar"
 
@@ -10622,8 +10550,8 @@ msgstr "Manuelt"
 msgid "By status"
 msgstr "Etter status"
 
-msgid "By log size"
-msgstr "Etter loggstorleiken"
+msgid "By recent log activity"
+msgstr "Etter nyleg loggaktivitet"
 
 #, c-format
 msgid "%s disconnected"
@@ -10639,6 +10567,9 @@ msgstr "Kopla til att"
 msgid "Re-enable"
 msgstr "Slå på  att "
 
+msgid "SSL FAQs"
+msgstr "SSL OSS (FAQ)"
+
 msgid "Welcome back!"
 msgstr "Velkomen tilbake"
 
@@ -10725,6 +10656,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Al_ias:"
 
+msgid "_Group:"
+msgstr "_Gruppe:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Bli automatisk _med når kontoen koplar seg til att."
 
@@ -10758,6 +10692,104 @@ msgstr "/V_erktøy"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Venner/Sorter venner"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Bakgrunnsfarge"
+
+msgid "The background color for the buddy list"
+msgstr "Bakgrunnsfargen til vennelista"
+
+msgid "Layout"
+msgstr "Utforming"
+
+# blist = vennelista?
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Utforminga av ikona, namna og statusen til vennelista"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Utvida bakgrunnsfarge"
+
+msgid "The background color of an expanded group"
+msgstr "Bakgrunnsfargen til utvida grupper"
+
+msgid "Expanded Text"
+msgstr "Utvida tekst"
+
+msgid "The text information for when a group is expanded"
+msgstr "Tekstopplysningar når ei gruppe blir utvida"
+
+msgid "Collapsed Background Color"
+msgstr "Samanslått bakgrunnsfarge"
+
+msgid "The background color of a collapsed group"
+msgstr "Bakgrunnsfargen til ei samanslått gruppe"
+
+msgid "Collapsed Text"
+msgstr "Samanslått tekst"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Tekstopplysningar når ei gruppe blir samanslått"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Bakgrunnsfarge kontakt/prat"
+
+msgid "The background color of a contact or chat"
+msgstr "Bakgrunnsfargen til ein kontakt eller prat"
+
+msgid "Contact Text"
+msgstr "Kontakttekst"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Tekstopplysningar når ein kontakt blir utvida"
+
+msgid "On-line Text"
+msgstr "Tilkopla-tekst"
+
+msgid "The text information for when a buddy is online"
+msgstr "Tekstopplysningar når ein venn er tilkopla"
+
+msgid "Away Text"
+msgstr "Vekke-tekst"
+
+msgid "The text information for when a buddy is away"
+msgstr "Tekstopplysningar når ein venn er vekke"
+
+msgid "Off-line Text"
+msgstr "Fråkopla-tekst"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Tekstopplysningar når ein venn er fråkopla"
+
+msgid "Idle Text"
+msgstr "Uverksam-tekst"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Tekstopplysningar når ein venn er uverksam"
+
+msgid "Message Text"
+msgstr "Meldingstekst"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Tekstopplysningar når ein venn har ei ulesen melding"
+
+msgid "Message (Nick Said) Text"
+msgstr "Meldingstekst (kallenamnet sa)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"Tekstopplysningar når eit rom har ei ulesen melding som nemner kallenamnet "
+"ditt"
+
+msgid "The text information for a buddy's status"
+msgstr "Tekstopplysningar om vennestatusen"
+
+msgid "Type the host name for this certificate."
+msgstr "Skriv inn vertsnamnet til dette sertifikatet."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-tenarar"
@@ -10776,14 +10808,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter venn til praterommet"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Skriv inn namnet på brukaren du ønskjer å invitera. Du kan ta med ei valfri "
-"velkomstmelding."
-
 msgid "_Buddy:"
 msgstr "_Venn:"
 
@@ -10812,7 +10836,7 @@ msgstr "Blokker"
 msgid "Get Away Message"
 msgstr "Hent fråværsmelding"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Sist sagt"
 
 msgid "Unable to save icon file to disk."
@@ -10858,6 +10882,18 @@ msgstr "/Samtale/Lagra _som…"
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Samtale/T_øm skjermen"
 
+msgid "/Conversation/M_edia"
+msgstr "/Samtale/M_edia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Samtale/Media/_Lydsamtale"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Samtale/Media/_Biletsamtale"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Samtale/Media/Lyd\\/_Biletsamtale"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/S_end fil…"
 
@@ -10930,6 +10966,15 @@ msgstr "/Samtale"
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis logg"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Samtale/Media/Lydsamtale"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Samtale/Media/Biletsamtale"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Samtale/Media/Lyd\\/Biletsamtale"
+
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil…"
 
@@ -11112,6 +11157,9 @@ msgstr "kunstnar"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "tale og video"
+
 msgid "support"
 msgstr "brukarstøtte"
 
@@ -11237,6 +11285,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Ungarsk"
 
+msgid "Armenian"
+msgstr "Armensk"
+
 msgid "Indonesian"
 msgstr "Indonesisk"
 
@@ -11252,6 +11303,9 @@ msgstr "Georgisk"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu georgisk-omsetjarar"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11330,6 +11384,9 @@ msgstr "Singalesisk"
 msgid "Swedish"
 msgstr "Svensk"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11383,10 +11440,10 @@ msgstr ""
 "til å kopla seg opp mot AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
 "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu og QQ - alle på "
 "éin gong. Han er skriven ved å nytta GTK+.<BR><BR>Du kan endra og "
-"vidareformidla programmet i samsvar med vilkåra i GPL (versjon 2 eller "
+"vidareformidla programmet i samsvar med vilkåra i GPL (utgåve 2 eller "
 "seinare). Ein kopi av GPL ligg i fila 'COPYING' som kjem saman med %s.  "
 "Opphavsretten til %s ligg hos bidragsytarane. Sjå i fila 'COPYRIGHT' for ei "
-"fullstendig liste over bidragsytarar. Programmet kjem utan nokon som helst "
+"fullstendig liste over bidragsytarar. Programmet kjem utan noka som helst "
 "form for garanti.<BR><BR>"
 
 #, c-format
@@ -11637,14 +11694,6 @@ msgstr "_Fjern ferdige overføringar"
 msgid "File transfer _details"
 msgstr "Filoverføringsdetaljar"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Pause"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Hald fram"
-
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
 
@@ -11663,7 +11712,7 @@ msgstr "Farge til å teikna lenkje."
 msgid "Hyperlink visited color"
 msgstr "Farge på besøkte lenkjer"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Lenkjefarge etter at lenkja er besøkt (eller teken i bruk)."
 
 msgid "Hyperlink prelight color"
@@ -11700,14 +11749,20 @@ msgstr "Farge for å teikna namnet til ei handlingsmelding."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Handlingsmeldingsfarge for kviskra melding"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Farge for å teikna namnet til ei kviskrehandlingsmelding."
+
 msgid "Whisper Message Name Color"
 msgstr "Fargenamn kviskremelding"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Farge for å teikna namnet til ei kviskra melding."
+
 msgid "Typing notification color"
 msgstr "Skrivevarselfarge"
 
-msgid "The color to use for the typing notification font"
-msgstr "Skrifttypefarge som skal nyttast ved skrivevarsel"
+msgid "The color to use for the typing notification"
+msgstr "Farge som skal nyttast ved skrivevarsel"
 
 msgid "Typing notification font"
 msgstr "Skrifttype skrivevarsel"
@@ -11718,15 +11773,6 @@ msgstr "Skrifttypen som skal nyttast ved skrivevarsel"
 msgid "Enable typing notification"
 msgstr "Slå på skrivevarsel"
 
-msgid "_Copy Email Address"
-msgstr "_Kopier e-postadressa"
-
-msgid "_Open Link in Browser"
-msgstr "_Opna lenkja i nettlesar"
-
-msgid "_Copy Link Location"
-msgstr "_Kopier lenkje"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11768,11 +11814,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Lagra bilete"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Lagra bilete…"
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Legg til eige smilefjes…"
 
@@ -11830,7 +11874,7 @@ msgid "_Manage custom smileys"
 msgstr "_Smilefjesbehandling"
 
 msgid "This theme has no available smileys."
-msgstr "Temaet har ingen tilgjengelege smilefjes."
+msgstr "Denne drakta inneheld ingen tilgjengelege smilefjes."
 
 msgid "_Font"
 msgstr "Skriftt_ype"
@@ -11862,9 +11906,6 @@ msgstr "Minsk skriftstorleiken"
 msgid "Font Face"
 msgstr "Skrifttype"
 
-msgid "Background Color"
-msgstr "Bakgrunnsfarge"
-
 msgid "Foreground Color"
 msgstr "Forgrunnsfarge"
 
@@ -11980,6 +12021,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11994,6 +12036,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    bruk DIR for innstillingsfilene\n"
 "  -d, --debug         skriv ut feilsøkingsmeldingar til standard utkanal\n"
+"  -f, --force-online  slå på tilkopling, uavhengig av nettverksstatus\n"
 "  -h, --help          vis denne hjelpa og avslutt\n"
 "  -m, --multiple      avgrens ikkje til berre éin instans\n"
 "  -n, --nologin       logg ikkje automatisk på\n"
@@ -12001,7 +12044,8 @@ msgstr ""
 "spesifiserer\n"
 "                      konto(ar) å bruka, skilde med komma.\n"
 "                      Utan denne vil berre den første kontoen bli teken i "
-"bruk).  -v, --version       vis noverande versjon og avslutt\n"
+"bruk).    --display=DISPLAY   kva for X-skjerm som skal nyttast \n"
+" -v, --version       vis noverande utgåve og avslutt\n"
 
 #, c-format
 msgid ""
@@ -12010,6 +12054,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12023,14 +12068,15 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    bruk DIR for innstillingsfilene\n"
 "  -d, --debug         skriv ut feilsøkingsmeldingar til standard utkanal\n"
+"  -f, --force-online  slå på tilkopling, uavhengig av nettverksstatus\n"
 "  -h, --help          vis denne hjelpa og avslutt\n"
 "  -m, --multiple      avgrens ikkje til berre éin instans\n"
 "  -n, --nologin       logg ikkje automatisk på\n"
-"  -l, --login[=NAMN] automatisk pålogging (valfritt argument NAMN "
+"  -l, --login[=NAMN] slå på spesifisert(e) konto(ar) (valfritt argument NAMN "
 "spesifiserer\n"
 "                       konto(ar) å bruka, skilde med komma.\n"
-"                      Utan denne vil berre den første kontoen bli teken i "
-"bruk).  -v, --version       vis noverande versjon og avslutt\n"
+"                       Utan denne vil berre den første kontoen bli teken i "
+"bruk).  -v, --version       vis noverande utgåve og avslutt\n"
 
 #, c-format
 msgid ""
@@ -12056,7 +12102,7 @@ msgstr ""
 "%ssimpleticket/\n"
 "\n"
 "Sjå til at du fortel om kva du gjorde då feilen oppstod,\n"
-"og send sporingsloggen (backtrace) frå minnefila.  Om du ikkje veit korleis\n"
+"og send sporingsloggen (backtrace) frå minnefila. Om du ikkje veit korleis\n"
 "laga sporingsloggen, les rettleiinga på\n"
 "%swiki/GetABacktrace\n"
 
@@ -12069,12 +12115,25 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Avsluttar sidan en annan libpurple-klient allereie kjører.\n"
 
-msgid "Open All Messages"
-msgstr "Opna alle meldingar"
+msgid "/_Media"
+msgstr "/_Media"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Du har fått e-postmeldingar</span>"
+msgid "/Media/_Hangup"
+msgstr "/Media/_Legg på"
+
+msgid "Calling..."
+msgstr "Ringjer…"
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s ønskjer å starta ei lyd-/biletøkt med deg."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s ønskjer å starta ei biletøkt med deg."
+
+msgid "_Pause"
+msgstr "_Pause"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12103,6 +12162,25 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'Manuell' nettlesarkommando er vald, men ingen kommando er brukt."
 
+msgid "No message"
+msgstr "Inga melding"
+
+msgid "Open All Messages"
+msgstr "Opna alle meldingar"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Du har fått e-postmeldingar</span>"
+
+msgid "New Pounces"
+msgstr "Nye vennevarsel"
+
+msgid "Dismiss"
+msgstr "Avvis"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har fått vennevarsel!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Dei følgjande programtillegga vil bli lasta ut."
 
@@ -12151,10 +12229,16 @@ msgstr "<b>Programtilleggsdetaljar</b>"
 msgid "Select a file"
 msgstr "Vel ei fil"
 
+msgid "Modify Buddy Pounce"
+msgstr "Endra vennevarsel"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Varsling for"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "_Vennenamn:"
 
@@ -12221,18 +12305,68 @@ msgstr "_Gjentakande"
 msgid "Pounce Target"
 msgstr "Varslingsmål"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Feil under utpakkinga av smilefjestemaet."
+#, c-format
+msgid "Started typing"
+msgstr "Starta å skriva"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Tek pause frå skrivinga"
+
+#, c-format
+msgid "Signed on"
+msgstr "Pålogga"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Er ikkje uverksam lenger"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Kjem attende"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Stoppa å skriva"
+
+#, c-format
+msgid "Signed off"
+msgstr "Logga av"
+
+#, c-format
+msgid "Became idle"
+msgstr "Blei uverksam"
+
+#, c-format
+msgid "Went away"
+msgstr "Gjekk vekk"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Sendt ei melding"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Ukjend… . Rapporter feilen."
+
+msgid "Theme failed to unpack."
+msgstr "Klarte ikkje å pakka ut drakta. "
+
+msgid "Theme failed to load."
+msgstr "Klarte ikkje å lasta drakta."
+
+msgid "Theme failed to copy."
+msgstr "Klarte ikkje å kopiera drakta."
 
 msgid "Install Theme"
-msgstr "Installer tema"
+msgstr "Installer drakta"
 
 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 ""
-"Vel smilefjestema frå lista nedanfor. Du kan installera nye tema ved å dra "
-"og sleppa dei ned i temalista."
+"Vel smilefjesdrakt frå lista nedanfor. Du kan installera nye drakter ved å "
+"dra og sleppa dei ned i draktlista."
 
 msgid "Icon"
 msgstr "Ikon"
@@ -12240,9 +12374,15 @@ msgstr "Ikon"
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarvegar"
 
+# Trur det skal vera liten bokstav i escape :-)
 msgid "Cl_ose conversations with the Escape key"
-msgstr "L_ukk samtaler med Escape-tasten"
+msgstr "L_ukk samtaler med escape-tasten"
+
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Vennelistedrakt"
 
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Systempanelikon"
 
@@ -12252,15 +12392,18 @@ msgstr "Vis systempanel_ikon:"
 msgid "On unread messages"
 msgstr "Ved ulesne meldingar"
 
-msgid "Conversation Window Hiding"
-msgstr "Skjul samtalevindauget"
+msgid "Conversation Window"
+msgstr "Samtalevindauge"
 
 msgid "_Hide new IM conversations:"
-msgstr "_Skjul  nye lynmeldingssamtaler:"
+msgstr "_Skjul nye lynmeldingssamtaler:"
 
 msgid "When away"
 msgstr "Når vekke"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Mi_nimer nye pratevindauge"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Faner"
@@ -12319,9 +12462,6 @@ msgstr "Bruk jamn rulling"
 msgid "F_lash window when IMs are received"
 msgstr "La vindauget _blinka når nye lynmmeldingar kjem"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Mi_nimer nye pratevindauge"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimumshøgda til inndataområdet (i linjer):"
 
@@ -12329,10 +12469,10 @@ msgid "Font"
 msgstr "Skrifttype"
 
 msgid "Use document font from _theme"
-msgstr "Bruk dokumentskrifttype frå _tema"
+msgstr "Bruk dokumentskrifttype frå _drakta"
 
 msgid "Use font from _theme"
-msgstr "Bruk skrifttype frå _tema"
+msgstr "Bruk skrifttype frå _drakta"
 
 msgid "Conversation _font:"
 msgstr "Samtaleskrift:"
@@ -12353,14 +12493,12 @@ msgstr "Klarte ikkje å starta innstillingsprogrammet til mellomlageret."
 msgid "Cannot start browser configuration program."
 msgstr "Klarer ikkje å starta nettlesaren sitt innstillingsprogram."
 
-msgid "ST_UN server:"
-msgstr "ST_UN-tenar:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Døme: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "Finn IP-adressa _automatisk"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Bruk _automatisk funnen IP-adresse: %s"
 
 msgid "Public _IP:"
 msgstr "Offentleg _IP:"
@@ -12380,6 +12518,10 @@ msgstr "_Startport:"
 msgid "_End port:"
 msgstr "Sluttp_ort:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "s"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Mellomtenar &amp; nettlesar"
 
@@ -12534,7 +12676,7 @@ msgstr ""
 "(%s for filnamn)"
 
 msgid "M_ute sounds"
-msgstr "&Demp lydar"
+msgstr "_Demp lydar"
 
 msgid "Sounds when conversation has _focus"
 msgstr "Lydar medan samtalevindauget har _fokus"
@@ -12549,7 +12691,7 @@ msgid "Play"
 msgstr "Spel"
 
 msgid "_Browse..."
-msgstr "Bla &gjennom…"
+msgstr "Bla _gjennom…"
 
 msgid "_Reset"
 msgstr "_Nullstill"
@@ -12570,12 +12712,12 @@ msgstr "Både når vekke og uverksam"
 msgid "Auto-away"
 msgstr "Automatisk vekke"
 
-msgid "Change status when _idle"
-msgstr "_Endra tilstand når uverksam"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutt før ein blir uverksam:"
 
+msgid "Change status when _idle"
+msgstr "_Endra tilstand når uverksam"
+
 msgid "Change _status to:"
 msgstr "Endra _tilstand til:"
 
@@ -12593,7 +12735,7 @@ msgid "Interface"
 msgstr "Grensesnitt"
 
 msgid "Smiley Themes"
-msgstr "Smilefjestema"
+msgstr "Smilefjesdrakt"
 
 msgid "Browser"
 msgstr "Nettlesar"
@@ -12723,47 +12865,43 @@ msgstr "L_agra og bruk"
 msgid "Status for %s"
 msgstr "Status for %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Det finst allereie eit tilpassa smilefjes til '%s'. Vel ein annan snarveg."
+
 msgid "Custom Smiley"
 msgstr "Tilpassa smilefjes"
 
-msgid "More Data needed"
-msgstr "Treng fleire opplysningar"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Før opp ein snarveg knytt til smilefjeset."
-
 msgid "Duplicate Shortcut"
 msgstr "Duplisert snarveg"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Det finst allereie eit tilpassa smilefjes til denne snarvegen. Vel ein annan "
-"snarveg."
-
-msgid "Please select an image for the smiley."
-msgstr "Vel eit bilete til smilefjeset."
-
 msgid "Edit Smiley"
 msgstr "Endra smilefjes"
 
 msgid "Add Smiley"
 msgstr "Legg til smilefjes"
 
-msgid "Smiley _Image"
-msgstr "Smilefjesbilete"
+msgid "_Image:"
+msgstr "_Bilete:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "_Smilefjessnarveg"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "Snar_vegstekst"
 
 msgid "Smiley"
 msgstr "Smilefjes"
 
+msgid "Shortcut Text"
+msgstr "Snarvegstekst"
+
 msgid "Custom Smiley Manager"
 msgstr "Tilpassa smilefjesbehandling"
 
+msgid "Select Buddy Icon"
+msgstr "Vel venneikon"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klikk for å endra venneikonet til denne kontoen."
 
@@ -12848,8 +12986,8 @@ msgid "Cannot send launcher"
 msgstr "Klarer ikkje å senda lastaren"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Du drog ein arbeidsflatestartar. Truleg ønskte du å senda det oppstartaren "
 "peiker mot i staden for oppstartaren sjølv."
@@ -12885,9 +13023,30 @@ msgstr ""
 "Klarte ikkje å lasta biletet '%s': grunnen er ikkje kjend, men er truleg "
 "grunna ei øydelagt biletfil"
 
+msgid "_Open Link"
+msgstr "_Opna lenkje"
+
+msgid "_Copy Link Location"
+msgstr "_Kopier lenkje"
+
+msgid "_Copy Email Address"
+msgstr "_Kopier e-postadressa"
+
+msgid "_Open File"
+msgstr "_Opna fil"
+
+msgid "Open _Containing Directory"
+msgstr "Opna _innhaldskatalogen"
+
 msgid "Save File"
 msgstr "Lagra fil"
 
+msgid "_Play Sound"
+msgstr "_Spel lyden"
+
+msgid "_Save File"
+msgstr "_Lagra fila"
+
 msgid "Select color"
 msgstr "Vel farge"
 
@@ -12975,6 +13134,67 @@ msgstr "Programtillegg for kontakttilgjengespådom."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Syner statistikkopplysningar om vennen din sitt tilgjenge"
 
+msgid "Server name request"
+msgstr "Tenarnamnførespurnad"
+
+msgid "Enter an XMPP Server"
+msgstr "Før opp ein XMPP-tenar"
+
+msgid "Select an XMPP server to query"
+msgstr "Vel ein XMPP-tenar å spørja"
+
+msgid "Find Services"
+msgstr "Finn tenester"
+
+msgid "Add to Buddy List"
+msgstr "Legg til vennelista"
+
+# Kanttenar?
+msgid "Gateway"
+msgstr "Sambandstenar"
+
+msgid "Directory"
+msgstr "Katalog"
+
+msgid "PubSub Collection"
+msgstr "PubSub-samling"
+
+msgid "PubSub Leaf"
+msgstr "PubSub-teneste"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Skildring:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Tenesteoppdaging"
+
+msgid "_Browse"
+msgstr "_Bla:"
+
+msgid "Server does not exist"
+msgstr "Tenaren finst ikkje"
+
+msgid "Server does not support service discovery"
+msgstr "Tenaren støttar ikkje tenesteoppdaging"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP-tenesteoppdaging"
+
+msgid "Allows browsing and registering services."
+msgstr "Tillat tenesteblaing og -registrering."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Dette programtillegget er nyttig ved registrering av eldre transportmetodar "
+"eller andre XMPP-tenester."
+
 msgid "Buddy is idle"
 msgstr "Vennen er uverksam"
 
@@ -13362,7 +13582,7 @@ msgstr "Musikkmeldingstillegg for samkomponering."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Musikkmeldingstillegget tillèt fleire brukarar å arbeida samstundes på eit "
 "musikkstykke ved å endra eit felles noteark i sanntid."
@@ -13469,17 +13689,11 @@ msgid ""
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"Det her er verkeleg eit kjekt programtillegg som gjer eit utal ting:\n"
-"- Det seier i frå om kven som skreiv programmet når du loggar på\n"
-"- det snur all innkommande tekst til å bli baklengs\n"
+"Dette er verkeleg eit tøft programtillegg som gjer mange ting:\n"
+"- det seier i frå om kven som skreiv programmet når du loggar på\n"
+"- det snur all innkomande tekst til å bli baklengs\n"
 "- det sender ei melding til personar i vennelista di når dei loggar på"
 
-msgid "Cursor Color"
-msgstr "Peikarfarge"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekundær peikarfarge"
-
 msgid "Hyperlink Color"
 msgstr "Lenkjefarge"
 
@@ -13489,6 +13703,9 @@ msgstr "Farge besøkte lenkjer"
 msgid "Highlighted Message Name Color"
 msgstr "Framheva melding"
 
+msgid "Typing Notification Color"
+msgstr "Skrivevarselfarge"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Horisontal deling GtkTreeView"
 
@@ -13517,37 +13734,23 @@ msgid "GTK+ Interface Font"
 msgstr "GTK+ grensesnittskrift"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ snarvegstema tekst"
+msgstr "Snarvegsdrakt GTK+-tekst"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Grensesnittfargar"
+msgid "Disable Typing Notification Text"
+msgstr "Slå av skrivevarsel"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Kontrollinnstillingar GTK+-drakt"
 
-msgid "Widget Sizes"
-msgstr "Grafiske element-storleikar"
+msgid "Colors"
+msgstr "Fargar"
 
 msgid "Fonts"
 msgstr "Skrifttypar"
 
+msgid "Miscellaneous"
+msgstr "Diverse"
+
 msgid "Gtkrc File Tools"
 msgstr "Filverktøy Gtkrc"
 
@@ -13559,7 +13762,7 @@ msgid "Re-read gtkrc files"
 msgstr "Les gtkrc-filene på nytt"
 
 msgid "Pidgin GTK+ Theme Control"
-msgstr "Pidgin GTK+ temabehandling"
+msgstr "Pidgin GTK+-draktbehandling"
 
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Gjev tilgang til ofte brukte gtkrc-innstillingar."
@@ -13583,7 +13786,7 @@ msgid "You can upgrade to %s %s today."
 msgstr "Du kan oppgradera til %s %s i dag."
 
 msgid "New Version Available"
-msgstr "Ny versjon er tilgjengeleg"
+msgstr "Ny utgåve er tilgjengeleg"
 
 msgid "Later"
 msgstr "Seinare"
@@ -13632,7 +13835,7 @@ msgstr "Send-knapp samtalevindauge."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Legg til ein sendeknapp på inntastingsområdet i samtalevindauget. Tenkt for "
 "dei tilfella der ein ikkje har eit fysisk tastatur."
@@ -13687,6 +13890,99 @@ msgstr "Teksterstatning"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstattar tekst i utgåande meldingar etter dine reglar."
 
+msgid "Just logged in"
+msgstr "Nettopp innlogga"
+
+msgid "Just logged out"
+msgstr "Nettopp avlogga"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Ikon for kontakt/\n"
+"ikon for ukjend person"
+
+msgid "Icon for Chat"
+msgstr "Prateromikon"
+
+msgid "Ignored"
+msgstr "Ignorert"
+
+msgid "Founder"
+msgstr "Grunnleggjar"
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "Operatør"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr "Halv-operatør"
+
+msgid "Authorization dialog"
+msgstr "Godkjenningsvindauge"
+
+msgid "Error dialog"
+msgstr "Feilvindauge"
+
+msgid "Information dialog"
+msgstr "Opplysningsvindauge"
+
+msgid "Mail dialog"
+msgstr "E-postvindauge"
+
+# Vindauge eller meldingsvindauge?
+msgid "Question dialog"
+msgstr "Spørjevindauge"
+
+msgid "Warning dialog"
+msgstr "Åtvaringsvindauge"
+
+msgid "What kind of dialog is this?"
+msgstr "Kva for vindauge er dette?"
+
+msgid "Status Icons"
+msgstr "Statusikon"
+
+msgid "Chatroom Emblems"
+msgstr "Prateroms_emblem"
+
+msgid "Dialog Icons"
+msgstr "Vindaugeikon"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+-draktbehandlar"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin vennelistedraktbehandlar"
+
+msgid "Edit Buddylist Theme"
+msgstr "Endra vennelistedrakta"
+
+msgid "Edit Icon Theme"
+msgstr "Endra ikondrakta"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin draktbehandlar"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin draktbehandlar."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13701,7 +13997,7 @@ msgstr "Rullande kontaktliste"
 #. *  summary
 #. *  description
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "Ein rullande, vassrett versjon av vennelista."
+msgstr "Ei rullande, vassrett utgåve av vennelista."
 
 msgid "Display Timestamps Every"
 msgstr "Vis tidsstempel kvar(t)"
@@ -13829,7 +14125,7 @@ msgstr ""
 "*Merk: Tillegget krev Windows 2000 eller seinare utgåver."
 
 msgid "GTK+ Runtime Version"
-msgstr "GTK+ kjøremiljøversjon"
+msgstr "GTK+ kjøremiljøutgåve"
 
 #. Autostart
 msgid "Startup"
@@ -13857,9 +14153,9 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Innstillingar som berre gjeld Pidgin under Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Tilbyr val som berre gjeld Pidgin under Windows, som til dømes festing av "
+"Tilbyr val som berre gjeld Pidgin under Windows, slik som festing av "
 "vennelista."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13900,78 +14196,92 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
 
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Klarer ikkje å hente MSN-adresseboka"
+#~ msgid "_Resume"
+#~ msgstr "_Hald fram"
+
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "BOSH-tilkoplingstenaren er ikkje velforma"
 
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "La vindauget _blinka når det kjem nye meldingar"
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Klarte ikkje å lasta SILC-nøkkelparet"
 
 #~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
 #~ msgstr ""
-#~ "Du kan bli frå kopla snart. Du vil kanskje nytta TOC fram til dette blir "
-#~ "ordna. Sjå på %s etter oppdateringar."
+#~ "%s har avvist konferanseinvitasjonen din til rommet \"%s\" grunna \"%s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Invitasjonen avvist"
+
+#~ msgid "_Proxy"
+#~ msgstr "_Mellomlager"
 
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] ""
-#~ "Mista sambandet til tenaren (ingen data er mottekne på %d sekund)"
-#~ msgstr[1] ""
-#~ "Mista sambandet til tenaren (ingen data er mottekne på %d sekund)"
+#~ msgid "Cannot open socket"
+#~ msgstr "Klarte ikkje å opna endepunkt"
 
-#~ msgid "%d needs Q&A"
-#~ msgstr "%d treng SOS (Q&A)"
+#~ msgid "Could not listen on socket"
+#~ msgstr "Klarte ikkje å lytta til endepunktet"
 
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Legg til vennespørsmål og -svar"
+#~ msgid "Unable to read socket"
+#~ msgstr "Klarte ikkje å lesa endepunkt"
 
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Klarer ikkje å dekryptera tenarsvaret"
+#~ msgid "Connection failed."
+#~ msgstr "Tilkoplinga feila."
 
-#~ msgid "Keep alive error"
-#~ msgstr "Feil på vedlikehaldssambandet"
+#~ msgid "Server has disconnected"
+#~ msgstr "Tenaren har kopla frå"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Klarte ikkje å laga endepunkt"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Klarte ikkje å kopla til verten"
+
+#~ msgid "Read error"
+#~ msgstr "Lesefeil"
 
 #~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
 #~ msgstr ""
-#~ "Tapt samband med tenaren:\n"
-#~ "%d, %s"
+#~ "Klarte ikkje å laga eit samband til tenaren:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Skrivefeil"
 
-#~ msgid "Connecting server ..."
-#~ msgstr "Koplar til tenaren…"
+#~ msgid "Last Activity"
+#~ msgstr "Siste aktivitet"
 
-#~ msgid "Failed to send IM."
-#~ msgstr "Klarte ikkje å senda lynmeldinga."
+#~ msgid "Service Discovery Info"
+#~ msgstr "Tenesteoppdagingsinfo"
 
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Er ikkje med i rommet \"%s\"\n"
+#~ msgid "Service Discovery Items"
+#~ msgstr "Tenesteoppdagingselement"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Brukaropplysningar om %s er ikkje tilgjengelege"
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Utvida blokkadressering"
 
-#~ msgid "Can not get face number in file name (%s)"
-#~ msgstr "Klarer ikkje å henta andletsnummeret frå filnamnet (%s)"
+#~ msgid "Multi-User Chat"
+#~ msgstr "Fleirbrukarprat"
 
-#~ msgid "Failed change icon"
-#~ msgstr "Klarte ikkje å endra ikonet"
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Utvida nærvereopplysningar fleirbrukarsamtale"
 
-#~ msgid "Not support Redirect_EX now"
-#~ msgstr "Støttar ikkje Redirect_EX no"
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Samtidssamband"
 
-#~ msgid "Error password"
-#~ msgstr "Passordfeil"
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad hoc-kommandoar"
 
-#~ msgid "Need active"
-#~ msgstr "Treng å vera i bruk"
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub-teneste"
 
-#~ msgid "Please fill code according to image"
-#~ msgstr "Skriv inn koden slik som på biletet"
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 bytesamband"
 
-#~ msgid "invalid user name"
-#~ msgstr "Ugyldig brukarnamn"
+#~ msgid "Out of Band Data"
+#~ msgstr "Eksterne data"
 
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Klarte ikkje å kopla opp alle tenarane"
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
diff --git a/po/oc.po b/po/oc.po
index 0667d1505e..3c620a2b0d 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-05-09 01:31+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -41,7 +41,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -577,18 +577,6 @@ msgstr ""
 msgid "Send To"
 msgstr ""
 
-#, fuzzy
-msgid "Invite message"
-msgstr "Messatges enviats"
-
-msgid "Invite"
-msgstr "Convidar"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-
 msgid "Conversation"
 msgstr ""
 
@@ -829,6 +817,40 @@ msgstr ""
 msgid "System Log"
 msgstr ""
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "A calcular..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Acceptar"
+
+msgid "Reject"
+msgstr ""
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+msgid "You have rejected the call."
+msgstr ""
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "Messatges electronics"
 
@@ -863,6 +885,9 @@ msgstr "Contunhar"
 msgid "IM"
 msgstr ""
 
+msgid "Invite"
+msgstr "Convidar"
+
 msgid "(none)"
 msgstr "(pas cap)"
 
@@ -1059,7 +1084,6 @@ msgstr ""
 msgid "%s has sent you a message. (%s)"
 msgstr ""
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1105,7 +1129,6 @@ msgstr ""
 msgid "Change status to"
 msgstr ""
 
-#. Conversations
 msgid "Conversations"
 msgstr ""
 
@@ -1416,7 +1439,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr ""
 
-#, c-format
 msgid "Online"
 msgstr "En linha"
 
@@ -1460,6 +1482,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "comptes"
 
@@ -1558,13 +1602,6 @@ msgstr ""
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Acceptar"
-
-msgid "Reject"
-msgstr ""
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1651,6 +1688,8 @@ msgstr ""
 msgid "+++ %s signed off"
 msgstr ""
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Error desconeguda"
 
@@ -1697,6 +1736,16 @@ msgstr ""
 msgid "%s left the room (%s)."
 msgstr ""
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Convidar"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr ""
@@ -1818,7 +1867,6 @@ msgstr ""
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#, c-format
 msgid "File transfer complete"
 msgstr ""
 
@@ -1826,7 +1874,6 @@ msgstr ""
 msgid "You canceled the transfer of %s"
 msgstr ""
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr ""
 
@@ -2007,11 +2054,13 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+msgid "Error creating conference."
+msgstr ""
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2392,7 +2441,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2440,7 +2489,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2468,6 +2517,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Picatz lo mot de pas"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2655,18 +2730,17 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Pichon nom"
 
@@ -2698,6 +2772,10 @@ msgstr ""
 msgid "Purple Person"
 msgstr ""
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr ""
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2708,13 +2786,16 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
+#, c-format
+msgid "Unable to create socket: %s"
 msgstr ""
 
-msgid "Could not bind socket to port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr ""
 
-msgid "Could not listen on socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
 msgstr ""
 
 msgid "Error communicating with local mDNSResponder."
@@ -2762,13 +2843,14 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Los mots de pas son pas los meteisses."
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2780,14 +2862,15 @@ msgstr ""
 msgid "Password"
 msgstr "Mot de pas"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr ""
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "Enregistrar l'imatge"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -2840,6 +2923,15 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2853,13 +2945,13 @@ msgstr ""
 msgid "Add to chat..."
 msgstr ""
 
+#. Global
 msgid "Available"
 msgstr "Disponible"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Absent(a)"
 
@@ -2887,7 +2979,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -2902,7 +2994,13 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connectat"
+
+msgid "Connection failed"
 msgstr ""
 
 msgid "Add to chat"
@@ -2911,14 +3009,24 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Impossible de dobrir le fichièr '%s' : %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connexion"
+
 msgid "Chat error"
 msgstr ""
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
-msgstr ""
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "Connectat"
 
 msgid "Find buddies..."
 msgstr ""
@@ -2959,6 +3067,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+#, fuzzy
+msgid "GG server"
+msgstr "Connectat"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -2973,7 +3085,7 @@ msgstr ""
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr ""
 
 msgid "Error displaying MOTD"
@@ -2989,8 +3101,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
-msgstr ""
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Connectat"
 
 msgid "View MOTD"
 msgstr ""
@@ -3001,24 +3121,22 @@ msgstr "_Canal :"
 msgid "_Password:"
 msgstr "Mot de _pas :"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connexion"
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
 msgstr ""
 
-msgid "Read error"
+#, c-format
+msgid "Server closed the connection"
 msgstr ""
 
 msgid "Users"
@@ -3196,6 +3314,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Escais"
+
 msgid "Cannot change nick"
 msgstr ""
 
@@ -3394,10 +3523,10 @@ msgstr ""
 msgid "execute"
 msgstr "executar"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3412,16 +3541,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "L'autentificacion a abocat"
+
+msgid "Invalid response from server"
 msgstr ""
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, c-format
+msgid "SASL error: %s"
+msgstr ""
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr ""
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+msgid "Unable to establish a connection with the server"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Connectat"
+
+msgid "Unable to establish SSL connection"
 msgstr ""
 
 msgid "Full Name"
@@ -3488,158 +3644,9 @@ msgstr ""
 msgid "Operating System"
 msgstr "Sistèma d'explotacion"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr ""
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr "Transferiment de fichièr"
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr ""
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr ""
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ajuston"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
+#, fuzzy
+msgid "Local Time"
+msgstr "Fichièr local :"
 
 msgid "Priority"
 msgstr "Prioritat"
@@ -3647,6 +3654,13 @@ msgstr "Prioritat"
 msgid "Resource"
 msgstr "Ressorga"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+msgid "Logged Off"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3694,7 +3708,6 @@ msgstr ""
 msgid "Extended Away"
 msgstr ""
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
@@ -3813,25 +3826,25 @@ msgstr ""
 msgid "Find Rooms"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Aliàs :"
 
-msgid "Write error"
-msgstr ""
+#, fuzzy
+msgid "No users found"
+msgstr "Utilizaire pas trobat"
 
-msgid "Ping timeout"
-msgstr ""
+#, fuzzy
+msgid "Roles:"
+msgstr "Ròtle"
 
-msgid "Read Error"
-msgstr ""
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Connectat"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-
-msgid "Unable to create socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -3840,6 +3853,9 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+msgid "Malformed BOSH URL"
+msgstr ""
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
@@ -3864,9 +3880,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr ""
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr "Estat"
 
@@ -3879,6 +3892,9 @@ msgstr "Telefòn"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -3906,6 +3922,9 @@ msgstr ""
 msgid "Change Registration"
 msgstr ""
 
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -3924,9 +3943,18 @@ msgstr ""
 msgid "Re-initializing Stream"
 msgstr ""
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr ""
 
+msgid "Mood"
+msgstr ""
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Los dos"
 
@@ -3948,12 +3976,6 @@ msgstr "Pas cap"
 msgid "Subscription"
 msgstr ""
 
-msgid "Mood"
-msgstr ""
-
-msgid "Now Listening"
-msgstr ""
-
 msgid "Mood Text"
 msgstr ""
 
@@ -3996,9 +4018,6 @@ msgstr "Vòstre mot de pas es estat modificat."
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 msgid "Change XMPP Password"
 msgstr ""
 
@@ -4192,15 +4211,21 @@ msgid "Unable to ping user %s"
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+
+#, c-format
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4213,7 +4238,31 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "L'autentificacion a abocat"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+msgid "Select a Resource"
+msgstr ""
+
+msgid "Initiate Media"
 msgstr ""
 
 msgid "config:  Configure a chat room."
@@ -4235,13 +4284,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4301,6 +4350,9 @@ msgstr ""
 msgid "File transfer proxies"
 msgstr ""
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4339,6 +4391,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4353,12 +4413,29 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
+#, fuzzy
+msgid "No reason"
+msgstr "Rason desconeguda"
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
 #, c-format
-msgid "Error in chat %s"
+msgid "Kicked (%s)"
+msgstr ""
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr ""
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Impossible de dobrir le fichièr '%s' : %s"
+
+msgid "Failed to open in-band bytestream"
 msgstr ""
 
 #, c-format
@@ -4384,9 +4461,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Select a Resource"
-msgstr ""
-
 msgid "Edit User Mood"
 msgstr ""
 
@@ -4419,7 +4493,17 @@ msgstr "Accions"
 msgid "Select an action"
 msgstr ""
 
-msgid "Unable to retrieve MSN Address Book"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr ""
+
+msgid "Buddy Add error"
+msgstr ""
+
+msgid "The username specified does not exist."
 msgstr ""
 
 #, c-format
@@ -4646,7 +4730,6 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4668,6 +4751,10 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -4736,6 +4823,13 @@ msgstr ""
 msgid "Page"
 msgstr "Pagina"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Professional"
+
 msgid "Has you"
 msgstr ""
 
@@ -4772,6 +4866,13 @@ msgstr "Artista"
 msgid "Album"
 msgstr "Albom"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "Títol"
+
+msgid "Office Title"
+msgstr ""
+
 msgid "Set Friendly Name..."
 msgstr ""
 
@@ -4805,9 +4906,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -4958,7 +5056,7 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
+msgid "View web profile"
 msgstr ""
 
 #. *< type
@@ -4992,63 +5090,26 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr "Error desconeguda."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
+msgstr "Error desconeguda"
 
 msgid "Unable to add user"
 msgstr ""
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
+msgid "Unknown error (%d)"
 msgstr ""
 
-msgid "Service Temporarily Unavailable."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr ""
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5081,9 +5142,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr ""
 
@@ -5096,19 +5154,19 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr ""
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5137,6 +5195,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5173,33 +5239,21 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 msgid "Delete Buddy from Address Book?"
 msgstr ""
 
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr ""
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr ""
-
 msgid "The username specified is invalid."
 msgstr ""
 
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5213,15 +5267,59 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+msgid "Unknown error."
+msgstr "Error desconeguda."
+
+#, c-format
+msgid "%s on %s (%s)"
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+msgid "User lookup"
 msgstr ""
 
 msgid "Reading challenge"
@@ -5233,13 +5331,22 @@ msgstr ""
 msgid "Logging in"
 msgstr ""
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "Connectat"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr ""
 
@@ -5258,50 +5365,49 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-msgid "MySpaceIM - No Username Set"
+msgid "IM Friends"
 msgstr ""
 
-msgid "You appear to have no MySpace username."
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgid "Add contacts from server"
 msgstr ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connectat"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
-msgid "MySpaceIM Error"
+msgid "Incorrect username or password"
 msgstr ""
 
-msgid "Failed to add buddy"
+msgid "MySpaceIM Error"
 msgstr ""
 
-msgid "'addbuddy' command failed."
+msgid "Invalid input condition"
 msgstr ""
 
-msgid "persist command failed"
+msgid "Failed to add buddy"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
+msgid "'addbuddy' command failed."
 msgstr ""
 
-msgid "User lookup"
+msgid "persist command failed"
 msgstr ""
 
 msgid "Failed to remove buddy"
@@ -5313,33 +5419,15 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-msgid "Invalid input condition"
-msgstr ""
-
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
+msgid "Missing Cipher"
 msgstr ""
 
-msgid "IM Friends"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Add contacts from server"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
 msgstr ""
 
 msgid "Add friends from MySpace.com"
@@ -5382,9 +5470,6 @@ msgstr ""
 msgid "User"
 msgstr "Utilizaire"
 
-msgid "Profile"
-msgstr "Perfil"
-
 msgid "Headline"
 msgstr ""
 
@@ -5397,14 +5482,10 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr ""
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 msgid "MySpaceIM - Username Available"
@@ -5416,12 +5497,22 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 msgid "This username is unavailable."
 msgstr ""
 
 msgid "Please try another username:"
 msgstr ""
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr ""
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5613,9 +5704,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr ""
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5654,9 +5742,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Activat"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5754,9 +5842,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -5777,23 +5862,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -5816,24 +5894,32 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-msgid "Could not join chat room"
+msgid "Received unexpected response from "
 msgstr ""
 
-msgid "Invalid chat room name"
+#. username connecting too frequently
+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 ""
 
-msgid "Server closed the connection."
+#, c-format
+msgid "Error requesting "
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+msgid "Could not join chat room"
 msgstr ""
 
-msgid "Received invalid data on connection with server."
+msgid "Invalid chat room name"
 msgstr ""
 
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Connectat"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5879,7 +5965,7 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
 msgid "Direct IM established"
@@ -6048,23 +6134,18 @@ msgstr "Aparelh de fotografiar"
 msgid "Screen Sharing"
 msgstr "Nom d'utilisateur"
 
-#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#, c-format
 msgid "Not Available"
 msgstr "Pas disponible"
 
-#, c-format
 msgid "Occupied"
 msgstr ""
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -6078,15 +6159,11 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr ""
 
 msgid "Username sent"
@@ -6101,45 +6178,49 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
 
-msgid "Incorrect password."
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
 msgstr ""
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr ""
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6154,22 +6235,6 @@ msgstr ""
 msgid "_OK"
 msgstr "_Validar"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -6284,7 +6349,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
@@ -6306,6 +6371,12 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
+msgid "Profile"
+msgstr "Perfil"
+
 msgid "Your AIM connection may be lost."
 msgstr ""
 
@@ -6459,7 +6530,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6481,7 +6552,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6489,7 +6560,7 @@ msgid "(no name)"
 msgstr ""
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -6551,6 +6622,7 @@ msgstr "Se _connectar"
 msgid "Get AIM Info"
 msgstr ""
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr ""
 
@@ -6607,6 +6679,7 @@ msgstr "_Recercar"
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr ""
 
@@ -6636,6 +6709,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6653,7 +6729,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
@@ -6746,7 +6821,7 @@ msgstr "Autre"
 msgid "Visible"
 msgstr "Invisible"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -6833,17 +6908,50 @@ msgstr "Data"
 msgid "Could not change buddy information."
 msgstr "Entresenhas sus l'utilizaire"
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
 msgstr ""
 
+msgid "Note"
+msgstr "Nòta"
+
+#. callback
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Apondre lo contacte"
+msgid "Buddy Memo"
+msgstr "Tièra de contactes"
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "Modificar"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Modificar"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "_Servidor :"
 
-msgid "Input answer here"
+msgid "Your request was accepted."
 msgstr ""
 
+msgid "Your request was rejected."
+msgstr ""
+
+#, c-format
+msgid "%u requires verification"
+msgstr ""
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Autorizar"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Picatz lo mot de pas"
+
 msgid "Send"
 msgstr "Segondas"
 
@@ -6854,18 +6962,18 @@ msgstr "L'expression es pas valida"
 msgid "Authorization denied message:"
 msgstr ""
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr ""
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Autorizar"
 
-msgid "Input request here"
+msgid "Enter request here"
 msgstr ""
 
 msgid "Would you be my friend?"
@@ -6887,7 +6995,7 @@ msgid "Failed sending authorize"
 msgstr ""
 
 #, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr ""
 
 #, c-format
@@ -6928,6 +7036,9 @@ msgstr ""
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
 msgid "Not member"
 msgstr ""
 
@@ -6965,15 +7076,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr ""
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Entresenhas sus l'utilizaire"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -6983,7 +7097,7 @@ msgstr ""
 msgid "Failed:"
 msgstr "Error"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -6995,11 +7109,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
-msgid "Successfully changed Qun member"
-msgstr ""
+#, fuzzy
+msgid "Successfully changed Qun members"
+msgstr "Entresenhas sus l'utilizaire"
 
 #, fuzzy
 msgid "Successfully changed Qun information"
@@ -7008,35 +7123,35 @@ msgstr "Entresenhas sus l'utilizaire"
 msgid "You have successfully created a Qun"
 msgstr ""
 
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr ""
 
 msgid "Setup"
 msgstr "Configuracion"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr ""
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Suprimir un contacte"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Suprimir un contacte"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7148,6 +7263,12 @@ msgstr ""
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr ""
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr ""
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7155,7 +7276,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "A prepaus de %s"
 
 #, fuzzy
@@ -7176,6 +7297,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "A prepaus de %s"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Adreça personala"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7207,7 +7332,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Se connectar"
@@ -7219,6 +7343,9 @@ msgstr "Entresenhas sul servidor"
 msgid "Show server news"
 msgstr ""
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 msgid "Keep alive interval (seconds)"
 msgstr ""
 
@@ -7226,10 +7353,7 @@ msgstr ""
 msgid "Update interval (seconds)"
 msgstr "Entresenhas sus l'utilizaire"
 
-msgid "Can not decrypt server reply"
-msgstr ""
-
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr ""
 
 #, c-format
@@ -7252,19 +7376,16 @@ msgid "Activation required"
 msgstr "L'autentificacion a abocat"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
-msgstr ""
-
-msgid "Keep alive error"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Requesting captcha ..."
+msgid "Requesting captcha"
 msgstr ""
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
+msgid "Failed captcha verification"
 msgstr ""
 
 #, fuzzy
@@ -7275,51 +7396,33 @@ msgstr "Enregistrar l'imatge"
 msgid "Enter code"
 msgstr "Picatz lo mot de pas"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 msgid "Enter the text from the image"
 msgstr ""
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr ""
-
 msgid "Socket error"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr ""
-
-msgid "Connection lost"
-msgstr "Connexion perduda"
-
-msgid "Get server ..."
-msgstr ""
+#, fuzzy
+msgid "Getting server"
+msgstr "Connectat"
 
-msgid "Request token"
+msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
+msgid "Unable to resolve hostname"
 msgstr ""
 
 #, fuzzy
@@ -7327,16 +7430,13 @@ msgid "Invalid server or port"
 msgstr "L'expression es pas valida"
 
 #, fuzzy
-msgid "Connecting server ..."
+msgid "Connecting to server"
 msgstr "Connectat"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Error"
 
-msgid "Failed to send IM."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7346,6 +7446,10 @@ msgid ""
 msgstr "Servidor"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "De"
 
@@ -7355,32 +7459,29 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Rason desconeguda"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Comanda"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr ""
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Rason desconeguda"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Rason desconeguda"
 
 #, c-format
@@ -7394,9 +7495,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7450,17 +7548,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7483,6 +7570,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr "Transferiment de fichièr"
+
 msgid "Supports"
 msgstr ""
 
@@ -8155,9 +8245,6 @@ msgstr "Organizacion"
 msgid "Unit"
 msgstr "Unitat"
 
-msgid "Note"
-msgstr "Nòta"
-
 msgid "Join Chat"
 msgstr ""
 
@@ -8242,6 +8329,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr "Ajuston"
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8299,8 +8389,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "Connectat"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8309,26 +8400,23 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr ""
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+msgid "Unable to not load SILC key pair"
+msgstr ""
+
 msgid "Out of memory"
 msgstr "Pas pro de memòria"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr ""
 
 msgid "Error loading SILC key pair"
@@ -8605,7 +8693,7 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -8694,6 +8782,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -8734,34 +8825,33 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr ""
 
 msgid "John Noname"
 msgstr ""
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
+msgid "Unable to load SILC key pair: %s"
 msgstr ""
 
-msgid "Could not connect"
-msgstr ""
-
-msgid "Unknown server response."
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "Rason desconeguda"
 
-msgid "Could not resolve hostname"
+msgid "Unable to create listen socket"
 msgstr ""
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Entresenhas sul servidor"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8795,172 +8885,60 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr ""
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr ""
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr ""
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr ""
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr ""
-
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
-
-#, c-format
-msgid "No keywords."
-msgstr ""
-
-#, c-format
-msgid "User has no directory information."
-msgstr ""
-
-#, c-format
-msgid "Country not supported."
-msgstr ""
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr ""
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-msgid "Invalid Groupname"
+msgid "Yahoo ID..."
 msgstr ""
 
-msgid "Connection Closed"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Protocòl"
 
-msgid "Waiting for reply..."
+msgid "Pager server"
 msgstr ""
 
-msgid "TOC has come back from its pause. You may now send messages again."
+msgid "Pager port"
 msgstr ""
 
-msgid "Password Change Successful"
+msgid "File transfer server"
 msgstr ""
 
-msgid "_Group:"
-msgstr "_Grop :"
-
-msgid "Get Dir Info"
+msgid "File transfer port"
 msgstr ""
 
-msgid "Set Dir Info"
+msgid "Chat room locale"
 msgstr ""
 
-#, c-format
-msgid "Could not open %s for writing!"
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "File transfer failed; other side probably canceled."
+msgid "Chat room list URL"
 msgstr ""
 
-msgid "Could not connect for transfer."
+msgid "Yahoo Chat server"
 msgstr ""
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat port"
 msgstr ""
 
-msgid "Save As..."
-msgstr "Enregistrar coma..."
-
-#, 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] ""
-
-#, c-format
-msgid "%s requests you to send them a file"
+msgid "Yahoo JAPAN ID..."
 msgstr ""
 
 #. *< type
@@ -8973,11 +8951,11 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr ""
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Protocòl"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9000,6 +8978,27 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Picatz lo mot de pas"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9027,32 +9026,25 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr ""
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-msgid "Connection problem"
-msgstr ""
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
+msgstr "Connectat"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
 msgid "Not at Home"
@@ -9100,7 +9092,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -9115,73 +9107,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-msgid "Yahoo ID..."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr ""
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9189,6 +9123,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr ""
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9229,13 +9166,8 @@ msgstr ""
 msgid "Last Update"
 msgstr ""
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr ""
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9298,20 +9230,18 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
-msgid "Unable to fetch room list."
+msgid "Connection problem"
 msgstr ""
 
-msgid "User Rooms"
+msgid "Unable to fetch room list."
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
+msgid "User Rooms"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Connection problem with the YCHT server"
+msgstr "Connectat"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9429,13 +9359,7 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9443,16 +9367,13 @@ msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9539,9 +9460,6 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Mobile"
-msgstr ""
-
 msgid "Listening to music"
 msgstr ""
 
@@ -9583,16 +9501,6 @@ msgstr ""
 msgid "%x %X"
 msgstr ""
 
-#, c-format
-msgid "Error Reading %s"
-msgstr ""
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr "A calcular..."
 
@@ -9698,6 +9606,16 @@ msgstr "Connectat"
 msgid "Address already in use."
 msgstr ""
 
+#, c-format
+msgid "Error Reading %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 msgid "Internet Messenger"
 msgstr ""
 
@@ -9740,10 +9658,8 @@ msgstr ""
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr ""
+msgid "_Advanced"
+msgstr "_Avançat"
 
 msgid "Use GNOME Proxy Settings"
 msgstr ""
@@ -9778,9 +9694,6 @@ msgstr ""
 msgid "you can see the butterflies mating"
 msgstr ""
 
-msgid "Proxy Options"
-msgstr ""
-
 msgid "Proxy _type:"
 msgstr ""
 
@@ -9808,8 +9721,9 @@ msgstr "_Basic"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_Avançat"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Proxy"
 
 msgid "Enabled"
 msgstr "Activat"
@@ -9846,16 +9760,17 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr ""
 
-msgid "Room _List"
-msgstr ""
+#, fuzzy
+msgid "A_ccount"
+msgstr "_Compte :"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "_Compte :"
+msgid "Room _List"
+msgstr ""
 
 msgid "_Block"
 msgstr ""
@@ -9872,6 +9787,15 @@ msgstr ""
 msgid "I_M"
 msgstr ""
 
+msgid "_Audio Call"
+msgstr ""
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
 msgid "_Send File..."
 msgstr "_Enviar lo fichièr..."
 
@@ -9881,7 +9805,10 @@ msgstr ""
 msgid "View _Log"
 msgstr ""
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
 msgstr ""
 
 msgid "_Alias..."
@@ -10007,6 +9934,9 @@ msgstr ""
 msgid "/Tools/_Certificates"
 msgstr ""
 
+msgid "/Tools/Custom Smile_ys"
+msgstr ""
+
 msgid "/Tools/Plu_gins"
 msgstr ""
 
@@ -10016,9 +9946,6 @@ msgstr ""
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
-msgid "/Tools/Smile_y"
-msgstr ""
-
 msgid "/Tools/_File Transfers"
 msgstr ""
 
@@ -10132,7 +10059,7 @@ msgstr "Manualament"
 msgid "By status"
 msgstr ""
 
-msgid "By log size"
+msgid "By recent log activity"
 msgstr ""
 
 #, c-format
@@ -10149,6 +10076,9 @@ msgstr ""
 msgid "Re-enable"
 msgstr ""
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10228,6 +10158,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr ""
 
+msgid "_Group:"
+msgstr "_Grop :"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10261,6 +10194,111 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Color de fons"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Laossian"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Color de fons"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Color de fons"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Color de fons"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Ordenar"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "En linha"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Absent(a)"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Desconnectat"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Inactiu"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Messatge"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr ""
@@ -10278,12 +10316,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
 msgid "_Buddy:"
 msgstr ""
 
@@ -10312,8 +10344,9 @@ msgstr "Ignorar"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
-msgstr ""
+#, fuzzy
+msgid "Last Said"
+msgstr "Nom"
 
 msgid "Unable to save icon file to disk."
 msgstr ""
@@ -10358,6 +10391,18 @@ msgstr ""
 msgid "/Conversation/Clea_r Scrollback"
 msgstr ""
 
+msgid "/Conversation/M_edia"
+msgstr ""
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/_Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr ""
+
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
@@ -10430,6 +10475,15 @@ msgstr ""
 msgid "/Conversation/View Log"
 msgstr ""
 
+msgid "/Conversation/Media/Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr ""
+
 msgid "/Conversation/Send File..."
 msgstr ""
 
@@ -10611,6 +10665,9 @@ msgstr "Artista"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr ""
 
@@ -10736,6 +10793,10 @@ msgstr "Indi"
 msgid "Hungarian"
 msgstr "Ongrés"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
 msgid "Indonesian"
 msgstr "Indonesian"
 
@@ -10751,6 +10812,10 @@ msgstr "Georgian"
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Autre"
+
 msgid "Kannada"
 msgstr "Kannadà"
 
@@ -10772,6 +10837,10 @@ msgstr "Lituanian"
 msgid "Macedonian"
 msgstr "Macedonian"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "Macedonian"
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -10826,6 +10895,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "Suedés"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -10877,7 +10949,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 
 msgid "Current Developers"
@@ -11126,7 +11215,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11162,13 +11251,19 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 
 msgid "Typing notification font"
@@ -11180,15 +11275,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr ""
 
-msgid "_Copy Email Address"
-msgstr ""
-
-msgid "_Open Link in Browser"
-msgstr "_Dobrir lo ligam dins lo navegaire"
-
-msgid "_Copy Link Location"
-msgstr "_Copiar l'emplaçament del ligam"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11218,11 +11304,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Enregistrar l'imatge"
 
-#, c-format
 msgid "_Save Image..."
 msgstr ""
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11307,9 +11391,6 @@ msgstr ""
 msgid "Font Face"
 msgstr ""
 
-msgid "Background Color"
-msgstr "Color de fons"
-
 msgid "Foreground Color"
 msgstr ""
 
@@ -11420,6 +11501,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11437,6 +11519,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11467,10 +11550,26 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "A calcular..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
 
 #, c-format
@@ -11500,6 +11599,25 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "Messatge"
+
+msgid "Open All Messages"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+msgid "New Pounces"
+msgstr ""
+
+msgid "Dismiss"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -11545,10 +11663,17 @@ msgstr ""
 msgid "Select a file"
 msgstr "Seleccionar un fichièr"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Entresenhas"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "_Compte :"
+
 msgid "_Buddy name:"
 msgstr ""
 
@@ -11615,7 +11740,57 @@ msgstr ""
 msgid "Pounce Target"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Comença a picar"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "L'utilizaire es a picar..."
+
+#, c-format
+msgid "Signed on"
+msgstr ""
+
+#, c-format
+msgid "Returned from being idle"
+msgstr ""
+
+#, c-format
+msgid "Returned from being away"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "S'arrèsta de picar"
+
+#, c-format
+msgid "Signed off"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Enregistrar lo fichièr"
+
+#, c-format
+msgid "Went away"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Messatges enviats"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -11635,6 +11810,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr ""
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Tièra de contactes"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr ""
 
@@ -11644,8 +11825,9 @@ msgstr ""
 msgid "On unread messages"
 msgstr ""
 
-msgid "Conversation Window Hiding"
-msgstr ""
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Connectat"
 
 msgid "_Hide new IM conversations:"
 msgstr ""
@@ -11653,6 +11835,9 @@ msgstr ""
 msgid "When away"
 msgstr ""
 
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Onglets"
@@ -11711,9 +11896,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-msgid "Minimi_ze new conversation windows"
-msgstr ""
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -11743,13 +11925,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-msgid "ST_UN server:"
-msgstr ""
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -11770,6 +11950,10 @@ msgstr ""
 msgid "_End port:"
 msgstr ""
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr ""
 
@@ -11796,6 +11980,10 @@ msgstr ""
 msgid "No proxy"
 msgstr ""
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Utilizaire :"
 
@@ -11954,10 +12142,10 @@ msgstr ""
 msgid "Auto-away"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-msgid "_Minutes before becoming idle:"
+msgid "Change status when _idle"
 msgstr ""
 
 msgid "Change _status to:"
@@ -12107,26 +12295,17 @@ msgstr ""
 msgid "Status for %s"
 msgstr ""
 
-msgid "Custom Smiley"
-msgstr ""
-
-msgid "More Data needed"
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Please provide a shortcut to associate with the smiley."
+msgid "Custom Smiley"
 msgstr ""
 
 msgid "Duplicate Shortcut"
 msgstr ""
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-msgid "Please select an image for the smiley."
-msgstr ""
-
 msgid "Edit Smiley"
 msgstr ""
 
@@ -12134,20 +12313,29 @@ msgid "Add Smiley"
 msgstr ""
 
 #, fuzzy
-msgid "Smiley _Image"
-msgstr "Enregistrar l'imatge"
+msgid "_Image:"
+msgstr "_Imatge"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Ordenar"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Talha"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Ordenar"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Seleccionar una poliça"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -12225,8 +12413,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -12257,6 +12445,16 @@ msgstr ""
 "Impossible de cargar l'imatge '%s' : rason desconeguda, probable que siá "
 "corromput"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Dobrir lo ligam dins lo navegaire"
+
+msgid "_Copy Link Location"
+msgstr "_Copiar l'emplaçament del ligam"
+
+msgid "_Copy Email Address"
+msgstr ""
+
 msgid "Save File"
 msgstr "Enregistrar lo fichièr"
 
@@ -12351,6 +12549,68 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Nom d'utilisateur envoyé"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Picatz lo mot de pas"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Tièra de contactes"
+
+msgid "Gateway"
+msgstr ""
+
+#, fuzzy
+msgid "Directory"
+msgstr "Creator"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Descripcion"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "Navegador"
+
+msgid "Server does not exist"
+msgstr ""
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -12719,7 +12979,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -12825,12 +13085,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -12840,6 +13094,9 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+msgid "Typing Notification Color"
+msgstr ""
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -12869,35 +13126,22 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+msgid "Disable Typing Notification Text"
 msgstr ""
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "Tampar"
+
 msgid "Fonts"
 msgstr "Poliças"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -12980,7 +13224,7 @@ msgstr "Connectat"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13032,6 +13276,104 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+msgid "Just logged in"
+msgstr ""
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+msgid "Icon for Chat"
+msgstr ""
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorar"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Expeditor"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opcions"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorizar"
+
+msgid "Error dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Entresenhas"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Alèrta"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Estatut"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Modificar lo mot de pas"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "Se connectar"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Tièra de contactes"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Tièra de contactes"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13187,9 +13529,6 @@ msgstr ""
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr ""
-
 msgid "Windows Pidgin Options"
 msgstr ""
 
@@ -13197,7 +13536,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13237,20 +13576,34 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "Connection lost"
+#~ msgstr "Connexion perduda"
+
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Velocitat :"
+#~ msgid "Incorrect Password"
+#~ msgstr "Picatz lo mot de pas"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
+#~ msgid "Invite message"
+#~ msgstr "Messatges enviats"
 
 #, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Picatz lo mot de pas"
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Apondre lo contacte"
+
+#~ msgid "Save As..."
+#~ msgstr "Enregistrar coma..."
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Enregistrar l'imatge"
+
+#, fuzzy
+#~ msgid "Successed:"
+#~ msgstr "Velocitat :"
 
 #, fuzzy
 #~ msgid "QQ Budy"
@@ -13269,9 +13622,6 @@ msgstr ""
 #~ msgid "Display Statistics"
 #~ msgstr "Afficher los statistiques"
 
-#~ msgid "Screen name sent"
-#~ msgstr "Nom d'utilisateur envoyé"
-
 #~ msgid "_Merge"
 #~ msgstr "_Fusionner"
 
@@ -13286,9 +13636,6 @@ msgstr ""
 #~ "contact. L'alias sera affiché à la place du nom d'utilisateur chaque fois "
 #~ "que cela est possible.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Compte :"
-
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Alerter uniquement quand mon état est non disponible"
 
diff --git a/po/pa.po b/po/pa.po
index 39efb4b4ae..99ff2d018f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,17 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-22 09:57-0500\n"
-"PO-Revision-Date: 2009-02-26 22:23+0530\n"
-"Last-Translator: Amanpreet Singh Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi <punjabi-users@lists.sf.net>\n"
+"POT-Creation-Date: 2009-07-18 22:44-0700\n"
+"PO-Revision-Date: 2009-07-19 07:35+0530\n"
+"Last-Translator: A S Alam <aalam@users.sf.net>\n"
+"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 "\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -356,7 +356,8 @@ msgstr "ਪਾਬੰਦੀ ਹਟਾਓ"
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "ਵਿਅਕਤੀ ਦਾ ਯੂਜ਼ਰ ਨਾਂ ਜਾਂ ਏਲੀਆਸ ਦਿਓ ਜੀ, ਜਿਸ ਲਈ ਤੁਸੀਂ ਪਾਬੰਦੀ ਲਗਾਉਣੀ/ਹਟਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ।"
+msgstr ""
+"ਵਿਅਕਤੀ ਦਾ ਯੂਜ਼ਰ ਨਾਂ ਜਾਂ ਏਲੀਆਸ ਦਿਓ ਜੀ, ਜਿਸ ਲਈ ਤੁਸੀਂ ਪਾਬੰਦੀ ਲਗਾਉਣੀ/ਹਟਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ।"
 
 #. Not multiline
 #. Not masked?
@@ -545,7 +546,9 @@ msgstr "ਅਕਾਊਂਟ ਮੁੜ-ਯੋਗ"
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
-msgstr "ਅਕਾਊਂਟ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ ਹੈ ਅਤੇ ਤੁਸੀਂ ਇਹ ਗੱਲਬਾਤ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਤੁਸੀਂ ਅਕਾਊਂਟ ਮੁੜ-ਕੁਨੈਕਟ ਹੋਣ ਨਾਲ ਆਟੋਮੈਟਿਕ ਹੀ ਮੁੜ-ਕੁਨੈਕਟ ਹੋ ਜਾਉਗੇ।"
+msgstr ""
+"ਅਕਾਊਂਟ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ ਹੈ ਅਤੇ ਤੁਸੀਂ ਇਹ ਗੱਲਬਾਤ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਤੁਸੀਂ ਅਕਾਊਂਟ ਮੁੜ-ਕੁਨੈਕਟ ਹੋਣ "
+"ਨਾਲ ਆਟੋਮੈਟਿਕ ਹੀ ਮੁੜ-ਕੁਨੈਕਟ ਹੋ ਜਾਉਗੇ।"
 
 msgid "No such command."
 msgstr "ਕੋਈ ਕਮਾਂਡ ਨਹੀਂ ਹੈ।"
@@ -590,25 +593,13 @@ msgstr "ਤੁਸੀਂ ਇਹ ਗੱਲਬਾਤ ਛੱਡੀ।"
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "ਲਾਗ ਕਰਨਾ ਸ਼ੁਰੂ ਕੀਤਾ ਹੈ। ਇਨ੍ਹਾਂ ਗੱਲਾਂ ਲਈ ਅਗਲੇ ਸੁਨੇਹੇ ਲਾਗ ਕੀਤੇ ਜਾਣਗੇ।"
 
-msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
 msgstr "ਲਾਗ ਕਰਨਾ ਬੰਦ ਕੀਤਾ। ਇਨ੍ਹਾਂ ਗੱਲਾਂ ਲਈ ਅਗਲੇ ਸੁਨੇਹੇ ਲਾਗ ਨਹੀਂ ਕੀਤੇ ਜਾਣਗੇ।"
 
 msgid "Send To"
 msgstr "ਭੇਜੋ"
 
-msgid "Invite message"
-msgstr "ਸੱਦਾ ਸੁਨੇਹਾ"
-
-msgid "Invite"
-msgstr "ਸੱਦਾ"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"ਸੱਦਾ ਭੇਜਣ ਲਈ ਯੂਜ਼ਰ ਦਾ ਨਾਂ ਦਿਓ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਸੱਦਾ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ,\n"
-"ਚੋਣਵੇਂ ਰੂਪ ਵਿੱਚ ਸੱਦਾ ਸੁਨੇਹਾ ਵੀ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
-
 msgid "Conversation"
 msgstr "ਗੱਲਾਂਬਾਤਾਂ"
 
@@ -709,9 +700,11 @@ msgid ""
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
-"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਸੁਨੇਹਿਆਂ ਦੀਆਂ ਵੱਖ ਵੱਖ ਕਲਾਸਾਂ ਲਈ ਰੰਗ ਸੈੱਟ ਕਰੋ। <br>    &lt;"
-"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
-"background&gt;: ਕਾਲਾ, ਲਾਲ, ਹਰਾ, ਨੀਲਾ, ਚਿੱਟਾ, ਗਰੇ, ਗੂੜਾ-ਗਰੇ, ਮੈਗਨਿਟਾ, ਕਿਰਮਚੀ, ਡਿਫਾਲਟ<br><br>ਜਿਵੇਂ:<br>    msgcolor send cyan default"
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ "
+"ਸੁਨੇਹਿਆਂ ਦੀਆਂ ਵੱਖ ਵੱਖ ਕਲਾਸਾਂ ਲਈ ਰੰਗ ਸੈੱਟ ਕਰੋ। <br>    &lt;class&gt;: receive, send, "
+"highlight, action, timestamp<br>    &lt;foreground/background&gt;: ਕਾਲਾ, "
+"ਲਾਲ, ਹਰਾ, ਨੀਲਾ, ਚਿੱਟਾ, ਗਰੇ, ਗੂੜਾ-ਗਰੇ, ਮੈਗਨਿਟਾ, ਕਿਰਮਚੀ, ਡਿਫਾਲਟ<br><br>ਜਿਵੇਂ:<br>    "
+"msgcolor send cyan default"
 
 msgid "Unable to open file."
 msgstr "ਫਾਇਲ ਖੋਲਣ ਲਈ ਅਸਫਲ ਹੈ।"
@@ -733,6 +726,7 @@ msgid "Pause"
 msgstr "ਵਿਰਾਮ"
 
 # , c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
 msgstr[0] "ਫਾਇਲ ਟਰਾਂਸਫਰ -  %2$d ਵਿੱਚੋਂ %1$d%% ਫਾਇਲ"
@@ -803,6 +797,7 @@ msgid "Receiving"
 msgstr "ਮਿਲਿਆ"
 
 # , c-format
+#, c-format
 msgid "Conversation in %s on %s"
 msgstr "%2$s ਉੱਤੇ %1$s ਗੱਲਬਾਤ"
 
@@ -827,7 +822,8 @@ msgstr ""
 "ਤੁਰੰਤ ਸੁਨੇਹੇ (IM) ਕੇਵਲ ਤਾਂ ਹੀ ਲਾਗ ਕੀਤੇ ਜਾਣਗੇ, ਜੇ \"ਸਭ ਤੁਰੰਤ ਸੁਨੇਹੇ ਲਾਗ ਕਰੋ\" ਪਸੰਦ ਨੂੰ ਯੋਗ ਕੀਤਾ "
 "ਹੋਵੇਗਾ।"
 
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "ਗੱਲਾਂ ਦੀ ਲਾਗ ਤਾਂ ਹੀ ਰੱਖਿਆ ਜਾਵੇਗਾ, ਜੇ \"ਸਭ ਗੱਲਾਂ ਦਾ ਲਾਗ ਰੱਖੋ\" ਪਸੰਦ ਯੋਗ ਕੀਤੀ ਹੋਵੇਗੀ।"
 
 msgid "No logs were found"
@@ -854,6 +850,39 @@ msgstr "ਸਭ ਗੱਲਾਂ-ਬਾਤਾਂ"
 msgid "System Log"
 msgstr "ਸਿਸਟਮ ਲਾਗ"
 
+msgid "Calling ... "
+msgstr "ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ ... "
+
+msgid "Hangup"
+msgstr "ਹੈਂਡ ਅੱਪ"
+
+#. Number of actions
+msgid "Accept"
+msgstr "ਮਨਜ਼ੂਰ"
+
+msgid "Reject"
+msgstr "ਰੱਦ ਕਰੋ"
+
+msgid "Call in progress."
+msgstr "ਕਾਲ ਜਾਰੀ ਹੈ।"
+
+msgid "The call has been terminated."
+msgstr "ਕਾਲ ਖਤਮ ਕੀਤੀ ਗਈ ਹੈ।"
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਆਡੀਓ ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ।"
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਗ਼ੈਰ-ਸਹਾਇਕ ਮੀਡਿਆ ਸ਼ੈਸ਼ਨ ਟਾਈਪ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ/ਰਹੀ ਹੈ।"
+
+msgid "You have rejected the call."
+msgstr "ਤੁਸੀਂ ਕਾਲ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ।"
+
+msgid "call: Make an audio call."
+msgstr "ਕਾਲ: ਆਡੀਓ ਕਾਲ ਕਰੋ।"
+
 msgid "Emails"
 msgstr "ਈ-ਮੇਲ"
 
@@ -888,6 +917,9 @@ msgstr "ਜਾਰੀ ਰੱਖੋ"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "ਸੱਦਾ"
+
 msgid "(none)"
 msgstr "(ਕੋਈ ਨਹੀਂ)"
 
@@ -931,7 +963,8 @@ msgstr "ਪਲੱਗਇਨ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 msgid "The selected file is not a valid plugin."
 msgstr "ਚੁਣੀ ਫਾਇਲ ਇੱਕ ਠੀਕ ਪਲੱਗਇਨ ਨਹੀਂ ਹੈ।"
 
-msgid "Please open the debug window and try again to see the exact error message."
+msgid ""
+"Please open the debug window and try again to see the exact error message."
 msgstr "ਡੀਬੱਗ ਵਿੰਡੋ ਖੋਲ੍ਹੋ ਅਤੇ ਠੀਕ ਗਲਤੀ ਸੁਨੇਹਾ ਵੇਖਣ ਦੀ ਮੁੜ-ਟਰਾਈ ਕਰੋ।"
 
 msgid "Select plugin to install"
@@ -1448,7 +1481,8 @@ msgstr "ਨਵੀਂ ਗੱਲਬਾਤ ਵਿੱਚ ਤਾਜ਼ੀ ਗੱਲ�
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
-msgstr "ਜਦੋਂ ਇੱਕ ਨਵੀਂ ਗੱਲਬਾਤ ਖੁੱਲ੍ਹਦੀ ਹੈ ਤਾਂ ਇਹ ਪਲੱਗਇਨ ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਵਿੱਚ ਆਖਰੀ ਗੱਲਬਾਤ ਨੂੰ ਸ਼ਾਮਲ ਕਰਦੀ ਹੈ।"
+msgstr ""
+"ਜਦੋਂ ਇੱਕ ਨਵੀਂ ਗੱਲਬਾਤ ਖੁੱਲ੍ਹਦੀ ਹੈ ਤਾਂ ਇਹ ਪਲੱਗਇਨ ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਵਿੱਚ ਆਖਰੀ ਗੱਲਬਾਤ ਨੂੰ ਸ਼ਾਮਲ ਕਰਦੀ ਹੈ।"
 
 msgid "Online"
 msgstr "ਆਨਲਾਈਨ"
@@ -1493,6 +1527,29 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "ਆਖਰੀ-ਲਾਗ ਪਲੱਗਇਨ"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"TinyURL ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "ਕੇਵਲ ਤਾਂ ਹੀ TinyURL ਬਣਾਓ, ਜਦੋਂ ਇਸ ਦੀ ਲੰਬਾਈ ਵੱਧ ਹੋਵੇ"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (ਜਾਂ ਹੋਰ) ਐਡਰੈੱਸ ਪ੍ਰੀਫਿਕਸ"
+
+msgid "TinyURL"
+msgstr "ਟਿਨੀURL"
+
+msgid "TinyURL plugin"
+msgstr "ਟਿਨੀURL ਪਲੱਗਇਨ"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "ਜਦੋਂ ਸੁਨੇਹੇ ਵਿੱਚ URL ਮਿਲੇ ਤਾਂ ਸੌਖੀ ਤਰ੍ਹਾਂ ਕਾਪੀ ਕਰਨ ਵਾਸਤੇ TinyURL ਬਣਾਓ"
+
 msgid "accounts"
 msgstr "ਅਕਾਊਂਟ"
 
@@ -1593,13 +1650,6 @@ msgstr "ਕੀ %s ਲਈ ਸਰਟੀਫਿਕੇਟ ਮਨਜ਼ੂਰ ਹੈ?"
 msgid "SSL Certificate Verification"
 msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਜਾਂਚ"
 
-#. Number of actions
-msgid "Accept"
-msgstr "ਮਨਜ਼ੂਰ"
-
-msgid "Reject"
-msgstr "ਰੱਦ ਕਰੋ"
-
 msgid "_View Certificate..."
 msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)..."
 
@@ -1609,7 +1659,8 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)..."
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
-msgstr "ਸਰਟੀਫਿਕੇਟ \"%s\" ਨੂੰ ਖੁਦ-ਸਾਇਨ ਨਾਲ ਪੇਸ਼ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਹ ਆਟੋਮੈਟਿਕ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+msgstr ""
+"ਸਰਟੀਫਿਕੇਟ \"%s\" ਨੂੰ ਖੁਦ-ਸਾਇਨ ਨਾਲ ਪੇਸ਼ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਹ ਆਟੋਮੈਟਿਕ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
@@ -1630,10 +1681,12 @@ msgstr "ਗਲਤ ਸਰਟੀਫਿਕੇਟ ਚੇਨ"
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
-msgstr "ਤੁਹਾਡੇ ਕੋਲ root ਸਰਟੀਫਿਕੇਟ ਲਈ ਕੋਈ ਡਾਟਾਬੇਸ ਨਹੀਂ ਹੈ, ਇਸਕਰਕੇ ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੈਧ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
+msgstr ""
+"ਤੁਹਾਡੇ ਕੋਲ root ਸਰਟੀਫਿਕੇਟ ਲਈ ਕੋਈ ਡਾਟਾਬੇਸ ਨਹੀਂ ਹੈ, ਇਸਕਰਕੇ ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੈਧ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
 #. vrq will be completed by user_auth
-msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "ਇਹ root ਸਰਟੀਫਿਕੇਟ ਇੱਕ ਅਣਜਾਣ ਵਲੋਂ ਪਿਡਗਿਨ ਨੂੰ ਦਿੱਤਾ ਗਿਆ ਜਾਪਦਾ ਹੈ।"
 
 #, c-format
@@ -1695,6 +1748,7 @@ msgstr "+++ %s ਦਾਖਲ ਹੋਇਆ/ਹੋਈ"
 msgid "+++ %s signed off"
 msgstr "+++ %s ਬੰਦ ਕਰ ਗਿਆ/ਗਈ"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
 
@@ -1741,6 +1795,15 @@ msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ ਹੈ।"
 msgid "%s left the room (%s)."
 msgstr "%s ਨੇ ਰੂਮ (%s) ਛੱਡਿਆ ਹੈ।"
 
+msgid "Invite to chat"
+msgstr "ਗੱਲਬਾਤ ਲਈ ਸੱਦਾ ਦਿਓ"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "ਸੱਦਾ ਭੇਜਣ ਲਈ ਯੂਜ਼ਰ ਦਾ ਨਾਂ ਦਿਓ, ਚੋਣਵੇਂ ਰੂਪ ਵਿੱਚ ਸੱਦਾ ਸੁਨੇਹਾ ਵੀ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਲੈਣ ਲਈ ਫੇਲ੍ਹ: %s"
@@ -1785,6 +1848,7 @@ msgstr ""
 "ਰਿਜ਼ੋਲਵਰ ਪਰੋਸੈੱਸ ਤੋਂ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ:\n"
 "%s"
 
+#, c-format
 msgid "Resolver process exited without answering our request"
 msgstr "ਸਾਡੀ ਮੰਗ ਦਾ ਜਵਾਬ ਦਿੱਤੇ ਬਿਨਾਂ ਰਿਜ਼ਾਲਵਰ ਕਾਰਵਾਈ ਬੰਦ ਹੋ ਗਈ ਹੈ।"
 
@@ -1870,6 +1934,11 @@ msgstr "%s ਨੂੰ %s ਭੇਜਣ ਲਈ ਸੱਦਾ"
 msgid "Starting transfer of %s from %s"
 msgstr "%2$s ਤੋਂ %1$s ਦੀ ਟਰਾਂਸਫਰ ਸ਼ੁਰੂ ਹੋ ਗਈ ਹੈ"
 
+# , c-format
+#, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "ਫਾਇਲ <A HREF=\"file://%s\">%s</A> ਦੀ ਟਰਾਂਸਫਰ ਪੂਰੀ ਹੋਈ"
+
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "ਫਾਇਲ %s ਦਾ ਟਰਾਂਸਫਰ ਮੁਕੰਮਲ ਹੋਇਆ"
@@ -2065,6 +2134,9 @@ msgstr "<font color=\"red\"><b>ਫਾਇਲ ਪੜੀ ਨਹੀਂ ਜਾ ਸਕ
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+msgid "Error creating conference."
+msgstr "ਕਨਫਰੰਸ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "ਤੁਸੀਂ %s ਵਰਤੇ ਰਹੇ ਹੋ, ਪਰ ਇਹ ਪਲੱਗਇਨ ਲਈ %s ਲੋੜੀਦਾ ਹੈ।"
@@ -2080,7 +2152,8 @@ msgstr "ਪਲੱਗਇਨ ਮੈਜ਼ਿਕ %d ਨਹੀਂ ਮਿਲਦੀ (%
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI ਵਰਜਨ %d.%d.x ਮਿਲਦਾ ਨਹੀਂ (%d.%d.x ਦੀ ਲੋੜ)"
 
-msgid "Plugin does not implement all required functions (list_icon, login and close)"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
 msgstr "ਪਲੱਗਇਨ ਨੇ ਸਭ ਲੋੜੀਦੇ ਫੰਕਸ਼ਨ ਸਥਾਪਿਤ ਨਹੀਂ ਕੀਤੇ ਹਨ (list_icon, login ਅਤੇ close)"
 
 #, c-format
@@ -2100,6 +2173,7 @@ msgid "Unable to load your plugin."
 msgstr "ਤੁਹਾਡੀ ਪਲੱਗਇਨ ਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 # , c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s ਨੂੰ %s  ਚਾਹੀਦਾ ਸੀ, ਪਰ ਇਹ ਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
@@ -2374,7 +2448,8 @@ msgstr "ਤੁਹਾਡਾ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਟ�
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr "ਇਸ ਸਮੇਂ ਤੁਸੀਂ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ। ਸੁਨੇਹੇ ਉਦੋਂ ਤੱਕ ਨਹੀਂ ਮਿਲਣਗੇ, ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਲਾਗਇਨ ਨਹੀਂ ਕਰਦੇ ਹੋ।"
+msgstr ""
+"ਇਸ ਸਮੇਂ ਤੁਸੀਂ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ। ਸੁਨੇਹੇ ਉਦੋਂ ਤੱਕ ਨਹੀਂ ਮਿਲਣਗੇ, ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਲਾਗਇਨ ਨਹੀਂ ਕਰਦੇ ਹੋ।"
 
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "ਲੰਬਾਈ ਵੱਧ ਹੋਣ ਕਰਕੇ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
@@ -2456,7 +2531,7 @@ msgstr "ਲਾਗ ਦਰਸ਼ਕ ਵਿੱਚ ਹੋਰ IM ਕਲਾਇਟ ਲ�
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2464,7 +2539,8 @@ msgstr ""
 "ਜਦੋਂ ਲਾਗ ਵੇਖਣਾ ਹੋਵੇ ਤਾਂ ਇਹ ਪਲੱਗਇਨ ਹੋਰ IM ਕਲਾਇਟ ਤੋਂ ਲਾਗ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾਵੇਗਾ। ਇਸ ਸਮੇਂ, ਇਸ ਵਿੱਚ "
 "Adium, MSN ਮੈਸੰਜ਼ਰ, ਅਤੇ ਟਰਿੱਲਿਅਨ ਸ਼ਾਮਲ ਹਨ।\n"
 "\n"
-"ਚੇਤਾਵਨੀ: ਇਹ ਪਲੱਗਇਨ ਹਾਲੇ ਐਲਫ਼ਾ ਕੋਡ ਵਿੱਚ ਹੈ ਅਤੇ ਕਰੈਸ਼ ਹੋ ਸਕਦੀ ਹੈ। ਇਸ ਨੂੰ ਆਪਣੇ ਖਤਰੇ ਉੱਤੇ ਵਰਤੋਂ ਜੀ!"
+"ਚੇਤਾਵਨੀ: ਇਹ ਪਲੱਗਇਨ ਹਾਲੇ ਐਲਫ਼ਾ ਕੋਡ ਵਿੱਚ ਹੈ ਅਤੇ ਕਰੈਸ਼ ਹੋ ਸਕਦੀ ਹੈ। ਇਸ ਨੂੰ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਉੱਤੇ ਵਰਤੋਂ "
+"ਜੀ!"
 
 msgid "Mono Plugin Loader"
 msgstr "ਮੋਨੋ ਪਲੱਗਇਨ ਲੋਡਰ"
@@ -2500,8 +2576,7 @@ msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
-"ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਇੱਕ ਨਵੀਂ-ਲਾਈਨ ਜੋੜਦੀ ਹੈ, ਤਾਂ ਕਿ ਨਵੇਂ ਸੁਨੇਹੇ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਯੂਜ਼ਰ ਨਾਂ ਦੇ ਹੇਠ ਵੇਖਾਈ "
-"ਦੇਣ।"
+"ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਇੱਕ ਨਵੀਂ-ਲਾਈਨ ਜੋੜਦੀ ਹੈ, ਤਾਂ ਕਿ ਨਵੇਂ ਸੁਨੇਹੇ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਯੂਜ਼ਰ ਨਾਂ ਦੇ ਹੇਠ ਵੇਖਾਈ ਦੇਣ।"
 
 msgid "Offline Message Emulation"
 msgstr "ਆਫਲਾਈਨ ਸੁਨੇਹਾ ਸਮਰੂਪ"
@@ -2510,9 +2585,10 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "ਇੱਕ ਆਫਲਾਈਨ ਯੂਜ਼ਰ ਨੂੰ ਭੇਜੇ ਸੁਨੇਹੇ ਪਉਨਸ ਵਾਂਗ ਸੰਭਾਲੋ।"
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
-msgstr "ਬਾਕੀ ਸੁਨੇਹੇ ਪਉਨਸ ਵਾਂਗ ਸੰਭਾਲੋ। ਤੁਸੀਂ `ਬੱਡੀ ਪਉਨਸ' ਡਾਈਲਾਗ ਤੋਂ ਪਉਨਸ ਨੂੰ ਸੋਧ/ਹਟਾ ਸਕਦੇ ਹੋ।"
+msgstr ""
+"ਬਾਕੀ ਸੁਨੇਹੇ ਪਉਨਸ ਵਾਂਗ ਸੰਭਾਲੇ ਜਾਣਗੇ। ਤੁਸੀਂ `ਬੱਡੀ ਪਉਨਸ' ਡਾਈਲਾਗ ਤੋਂ ਪਉਨਸ ਨੂੰ ਸੋਧ/ਹਟਾ ਸਕਦੇ ਹੋ।"
 
 #, c-format
 msgid ""
@@ -2540,6 +2616,34 @@ msgstr "ਪਉਨਸ ਵਿੱਚ ਆਫਲਾਈਨ ਸੁਨੇਹੇ ਸੰ�
 msgid "Do not ask. Always save in pounce."
 msgstr "ਪੁੱਛੋ ਨਾ। ਹਮੇਸ਼ਾਂ ਪਉਨਸ ਵਿੱਚ ਸੰਭਾਲੋ।"
 
+msgid "One Time Password"
+msgstr "ਇੱਕ ਵਾਰ ਪਾਸਵਰਡ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "ਇੱਕ ਵਾਰ ਪਾਸਵਰਡ ਸਹਿਯੋਗ"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "ਮਜ਼ਬੂਰ ਕਰਦਾ ਹੈ ਕਿ ਪਾਸਵਰਡ ਕੇਵਲ ਇੱਕ ਹੀ ਵਾਰ ਵਰਤੇ ਜਾਣ।"
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"ਤੁਹਾਨੂੰ ਹਰੇਕ-ਅਕਾਊਂਟ ਉੱਤੇ ਮਜ਼ਬੂਰ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਵਾਰ ਸਫ਼ਲ ਕੁਨੈਕਸ਼ਨ ਵਰਤਣ ਦੌਰਾਨ "
+"ਪਾਸਵਰਡ ਨੂੰ ਸੰਭਾਲਣ ਲਈ ਹੈ।\n"
+"ਨੋਟ: ਅਕਾਊਂਟ ਪਾਸਵਰਡ ਇਸ ਦੇ ਕੰਮ ਕਰਨ ਲਈ ਸੰਭਾਲਣਾ ਨਹੀਂ ਚਾਹੀਦਾ ਹੈ।"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2731,16 +2835,17 @@ msgstr ""
 "www.activestate.com ਤੋਂ ActiveTCL ਇੰਸਟਾਲ ਕਰੋ।\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Windows ਟੂਲਕਿੱਟ ਲਈ ਐਪਸ ਬੋਨਜੋਉਰ ਨਹੀਂ ਲੱਭਿਆ ਸਵਾਲ-ਜਵਾਬ ਵੇਖੋ: ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ http://d."
+"ਐਪਲ ਦਾ \"Windows ਲਈ ਬੋਨਜੋਉਰ\" ਟੂਲਕਿੱਟ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ, ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ http://d."
 "pidgin.im/BonjourWindows ਵੇਖੋ।"
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "ਆ ਰਹੇ IM ਕੁਨੈਕਸ਼ਨ ਸੁਣਨ ਤੋਂ ਅਸਮੱਰਥ ਹੈ\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "ਆ ਰਹੇ IM ਕੁਨੈਕਸ਼ਨ ਸੁਣਨ ਤੋਂ ਅਸਮੱਰਥ ਹੈ"
 
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "ਇੱਕ ਲੋਕਲ mDNS ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।  ਕੀ ਇਹ ਚੱਲਦਾ ਹੈ?"
 
 msgid "First name"
@@ -2788,14 +2893,20 @@ msgstr "%s ਨੇ ਗੱਲਬਾਤ ਬੰਦ ਕਰ ਦਿੱਤੀ।"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਗੱਲਬਾਤ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"
 
-msgid "Cannot open socket"
-msgstr "ਸਾਕਟ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
+# , c-format
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ: %s"
 
-msgid "Could not bind socket to port"
-msgstr "ਸਾਕਟ ਪੋਰਟ ਨਾਲ ਜੋੜੀ ਨਹੀਂ ਜਾ ਸਕੀ"
+# , c-format
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "ਸਾਕਟ ਪੋਰਟ ਨਾਲ ਜੋੜੀ ਨਹੀਂ ਜਾ ਸਕੀ: %s"
 
-msgid "Could not listen on socket"
-msgstr "ਸਾਕਟ ਉੱਤੇ ਸੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+# , c-format
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "mDNSResponder ਨਾਲ ਸੰਚਾਰ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
@@ -2824,6 +2935,7 @@ msgid "Buddylist saved successfully!"
 msgstr "ਬੱਡੀ-ਲਿਸਟ ਠੀਕ ਤਰ੍ਹਾਂ ਸੰਭਾਲੀ ਗਈ!"
 
 # , c-format
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr "%s ਲਈ %s ਉੱਤੇ ਬੱਡੀ ਲਿਸਟ ਲਿਖਣ ਲਈ ਅਸਮਰੱਥ"
 
@@ -2842,14 +2954,14 @@ msgstr "ਬੱਡੀ-ਲਿਸਟ ਸੰਭਾਲੋ..."
 msgid "Load buddylist from file..."
 msgstr "ਫਾਇਲ ਤੋਂ ਬੱਡੀ ਲਿਸਟ ਲੋਡ ਕਰੋ..."
 
-msgid "Fill in the registration fields."
-msgstr "ਰਜਿਸਟਰੇਸ਼ਨ ਖੇਤਰ ਭਰੋ।"
+msgid "You must fill in all registration fields"
+msgstr "ਤੁਹਾਨੂੰ ਰਜਿਸਟਰੇਸ਼ਨ ਖੇਤਰ ਭਰਨੇ ਹੋਣਗੇ।"
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "ਪਾਸਵਰਡ ਮਿਲਦਾ ਨਹੀਂ ਹੈ।"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ। ਗਲਤੀ ਆਈ ਹੈ।\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਅਣਜਾਣੀ ਗਲਤੀ ਆਈ ਹੈ।"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "ਨਵਾਂ ਗਡੂ-ਗਡੂ ਅਕਾਊਂਟ ਰਜਿਸਟਰ ਕੀਤਾ ਗਿਆ"
@@ -2860,14 +2972,14 @@ msgstr "ਰਜਿਸਟਰੇਸ਼ਨ ਠੀਕ ਤਰ੍ਹਾਂ ਪੂਰੀ
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ"
 
-msgid "Password (retype)"
-msgstr "ਪਾਸਵਰਡ (ਮੁੜ-ਲਿਖੋ)"
+msgid "Password (again)"
+msgstr "ਪਾਸਵਰਡ (ਮੁੜ)"
 
-msgid "Enter current token"
-msgstr "ਮੌਜੂਦਾ ਟੋਕਨ ਦਿਓ"
+msgid "Enter captcha text"
+msgstr "ਕੈਪਟਚਾ ਟੈਕਸਟ ਦਿਓ"
 
-msgid "Current token"
-msgstr "ਮੌਜੂਦਾ ਟੋਕਨ"
+msgid "Captcha"
+msgstr "ਕੈਪਟਚਾ"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ਨਵਾਂ ਗਡੂ-ਗਡੂ ਅਕਾਊਟ ਰਜਿਸਟਰ ਕਰੋ"
@@ -2920,6 +3032,15 @@ msgstr "ਪਾਸਵਰਡ ਸਫਲਤਾਪੂਰਕ ਤਬਦੀਲ ਕੀਤ
 msgid "Current password"
 msgstr "ਮੌਜੂਦਾ ਪਾਸਵਰਡ"
 
+msgid "Password (retype)"
+msgstr "ਪਾਸਵਰਡ (ਮੁੜ-ਲਿਖੋ)"
+
+msgid "Enter current token"
+msgstr "ਮੌਜੂਦਾ ਟੋਕਨ ਦਿਓ"
+
+msgid "Current token"
+msgstr "ਮੌਜੂਦਾ ਟੋਕਨ"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "ਆਪਣਾ ਮੌਜੂਦਾ ਪਾਸਵਰਡ ਅਤੇ ਨਵਾਂ ਪਾਸਵਰਡ ਦਿਓ ਜੀ।"
 
@@ -2933,6 +3054,7 @@ msgstr "ਗੱਲਾਂ ਲਈ ਸੁਨੇਹੀ ਚੁਣੋ: %s"
 msgid "Add to chat..."
 msgstr "ਗੱਲਾਂ 'ਚ ਸ਼ਾਮਿਲ..."
 
+#. Global
 msgid "Available"
 msgstr "ਉਪਲੱਬਧ"
 
@@ -2966,8 +3088,8 @@ msgstr "ਕੋਈ ਮਿਲਦਾ ਯੂਜ਼ਰ ਨਹੀਂ ਮਿਲਿਆ"
 msgid "There are no users matching your search criteria."
 msgstr "ਤੁਹਾਡੀ ਖੋਜ ਸੀਮਾ ਨਾਲ ਮਿਲਦਾ ਕੋਈ ਯੂਜ਼ਰ ਨਹੀਂ ਲੱਭਿਆ।"
 
-msgid "Unable to read socket"
-msgstr "ਸਾਕਟ ਪੜ੍ਹਨ ਵਿੱਚ ਅਸਫਲ"
+msgid "Unable to read from socket"
+msgstr "ਸਾਕਟ ਤੋਂ ਤਾਜ਼ਾ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 msgid "Buddy list downloaded"
 msgstr "ਬੱਡੀ ਲਿਸਟ ਡਾਊਨਲੋਡ ਕੀਤੀ ਗਈ"
@@ -2981,8 +3103,14 @@ msgstr "ਬੱਡੀ ਲਿਸਟ ਅੱਪਲੋਡ ਕੀਤੀ ਗਈ"
 msgid "Your buddy list was stored on the server."
 msgstr "ਤੁਹਾਡੀ ਬੱਡੀ ਲਿਸਟ ਸਰਵਰ ਉੱਤੇ ਅੱਪਲੋਡ ਕੀਤੀ ਗਈ ਹੈ।"
 
-msgid "Connection failed."
-msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ।"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "ਜੁੜਿਆ"
+
+msgid "Connection failed"
+msgstr "ਸੰਬੰਧ ਅਸਫਲ"
 
 msgid "Add to chat"
 msgstr "ਗੱਲਾਂ 'ਚ ਸ਼ਾਮਿਲ"
@@ -2990,14 +3118,24 @@ msgstr "ਗੱਲਾਂ 'ਚ ਸ਼ਾਮਿਲ"
 msgid "Chat _name:"
 msgstr "ਗੱਲ ਨਾਂ(_n):"
 
+# , c-format
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "ਹੋਸਟ ਨਾਂ '%s' ਹੱਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
 msgid "Chat error"
 msgstr "ਗੱਲ ਗਲਤੀ"
 
 msgid "This chat name is already in use"
 msgstr "ਇਹ ਗੱਲ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ 'ਚ ਹੈ"
 
-msgid "Not connected to the server."
-msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਹੈ।"
+msgid "Not connected to the server"
+msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਹੈ"
 
 msgid "Find buddies..."
 msgstr "ਬੱਡੀ ਖੋਜ..."
@@ -3038,6 +3176,9 @@ msgstr "ਪੋਲੈਂਡ ਹਰਮਨਪਿਆਰਾ IM"
 msgid "Gadu-Gadu User"
 msgstr "ਗਡੂ-ਗਡੂ ਯੂਜ਼ਰ"
 
+msgid "GG server"
+msgstr "GG ਸਰਵਰ"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "ਅਣਜਾਣ ਕਮਾਂਡ: %s"
@@ -3052,8 +3193,8 @@ msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ ਹੈ"
 msgid "File Transfer Failed"
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਫੇਲ੍ਹ"
 
-msgid "Could not open a listening port."
-msgstr "ਇੱਕ ਸੁਣਨ ਪੋਰਟ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
+msgid "Unable to open a listening port."
+msgstr "ਇੱਕ ਸੁਣਨ ਪੋਰਟ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ।"
 
 msgid "Error displaying MOTD"
 msgstr "MOTD ਵੇਖਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
@@ -3068,8 +3209,16 @@ msgstr "ਇਹ ਕੁਨੈਕਸ਼ਨ ਨਾਲ ਕੋਈ MOTD ਸਬੰਧਿ
 msgid "MOTD for %s"
 msgstr "%s ਵਲੋਂ MOTD"
 
-msgid "Server has disconnected"
-msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "ਸਰਵਰ ਨਾਲ ਆਖਰੀ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ: %s"
 
 msgid "View MOTD"
 msgstr "MOTD ਵੇਖੋ"
@@ -3080,25 +3229,24 @@ msgstr "ਚੈਨਲ(_C):"
 msgid "_Password:"
 msgstr "ਪਾਸਵਰਡ(_P):"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC ਨਾਂਵਾਂ 'ਚ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "ਜੁੜ ਰਿਹਾ ਹੈ"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC ਨਾਂਵਾਂ ਅਤੇ ਸਰਵਰ ਲਈ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
 msgid "SSL support unavailable"
 msgstr "SSL ਸਹਿਯੋਗ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-msgid "Couldn't create socket"
-msgstr "ਸਾਕਟ ਬਣ ਨਹੀਂ ਸਕੀ ਹੈ"
+msgid "Unable to connect"
+msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-msgid "Couldn't connect to host"
-msgstr "ਹੋਸਟ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "%s ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-msgid "Read error"
-msgstr "ਪੜਨ ਗਲਤੀ"
+# , c-format
+#, c-format
+msgid "Server closed the connection"
+msgstr "ਸਰਵਰ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
 msgid "Users"
 msgstr "ਯੂਜ਼ਰ"
@@ -3275,11 +3423,21 @@ msgid ""
 "invalid characters."
 msgstr "ਤੁਹਾਡੇ ਚੁਣੇ ਅਕਾਊਂਟ ਨਾਂ ਨੂੰ ਸਰਵਰ ਨੇ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ। ਇਹ ਗਲਤ ਅੱਖਰਾਂ ਕਰਕੇ ਹੋ ਸਕਦਾ ਹੈ।"
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "\"%s\" ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ 'ਚ ਹੈ|"
+
+msgid "Nickname in use"
+msgstr "ਵਰਤੋਂ ਵਿੱਚ ਆਮ ਨਾਂ"
+
 msgid "Cannot change nick"
-msgstr "ਨਾਂ ਤਬਦੀਲ ਨਹੀਂ ਹੋ ਸਕਦਾ"
+msgstr "ਨਾਂ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
 msgid "Could not change nick"
-msgstr "ਨਾਂ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+msgstr "ਨਾਂ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
 #, c-format
 msgid "You have parted the channel%s%s"
@@ -3510,10 +3668,10 @@ msgstr "ਐਡ-ਹਾਕ ਕਮਾਂਡ ਫੇਲ੍ਹ ਹੋਈ"
 msgid "execute"
 msgstr "ਚਲਾਓ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "ਲਾਗਇਨ ਲਈ ਸਰਵਰ ਨੂੰ TLS/SSL ਲੋੜੀਦਾ ਹੈ। ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ।"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "ਸਰਵਰ ਨੂੰ TLS/SSL ਲੋੜੀਦਾ ਹੈ। ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਲੱਭਿਆ ਹੈ।"
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "ਤੁਹਾਨੂੰ ਇੰਕ੍ਰਿਪਸ਼ਨ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਲੱਭਿਆ।"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3530,17 +3688,45 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "ਪਲੇਨ-ਟੈਕਸਟ ਪਰਮਾਣਕਿਤਾ"
 
-msgid "Invalid response from server."
-msgstr "ਸਰਵਰ ਵਲੋਂ ਗਲਤ ਜਵਾਬ ਹੈ।"
+msgid "SASL authentication failed"
+msgstr "SASL ਪ੍ਰਮਾਣਿਕਤਾ ਅਸਫਲ"
+
+msgid "Invalid response from server"
+msgstr "ਸਰਵਰ ਵਲੋਂ ਗਲਤ ਜਵਾਬ ਹੈ"
 
 msgid "Server does not use any supported authentication method"
 msgstr "ਸਰਵਰ ਕਿਸੇ ਸਹਿਯੋਗੀ ਪਰਮਾਣਕਿਤਾ ਢੰਗ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "ਤੁਹਾਨੂੰ ਇੰਕ੍ਰਿਪਸ਼ਨ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਹ ਸਰਵਰ ਲਈ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
+
 msgid "Invalid challenge from server"
 msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਚੈਲੰਜ਼"
 
-msgid "SASL error"
-msgstr "SASL ਗਲਤੀ"
+# , c-format
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL ਗਲਤੀ: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "BOSH ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਨੇ ਤੁਹਾਡਾ ਸ਼ੈਸ਼ਨ ਖਤਮ ਕੀਤਾ।"
+
+msgid "No session ID given"
+msgstr "ਕੋਈ ਸ਼ੈਸ਼ਨ ID ਨਹੀਂ ਦਿੱਤਾ"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "BOSH ਪਰੋਟੋਕਾਲ ਦਾ ਗ਼ੈਰ-ਸਹਾਇਕ ਵਰਜਨ"
+
+msgid "Unable to establish a connection with the server"
+msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ"
+
+# , c-format
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "ਸਰਵਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "SSL ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ"
 
 msgid "Full Name"
 msgstr "ਪੂਰਾ ਨਾਂ"
@@ -3606,158 +3792,8 @@ msgstr "ਕਲਾਇਟ"
 msgid "Operating System"
 msgstr "ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ"
 
-msgid "Last Activity"
-msgstr "ਆਖਰੀ ਐਕਟੀਵਿਟੀ"
-
-msgid "Service Discovery Info"
-msgstr "ਸਰਵਿਸ ਡਾਇਰੈਕਟਰੀ ਜਾਣਕਾਰੀ"
-
-msgid "Service Discovery Items"
-msgstr "ਸਰਵਰ ਖੋਜ ਆਈਟਮਾਂ"
-
-msgid "Extended Stanza Addressing"
-msgstr "ਵਾਧੂ ਪ੍ਹੈਰਾ ਐਡਰੈੱਸਿੰਗ"
-
-msgid "Multi-User Chat"
-msgstr "ਮਲਟੀ-ਯੂਜ਼ਰ ਚੈਟ"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "ਮਲਟੀ-ਯੂਜ਼ਰ ਚੈਟ ਵਾਧੂ ਮੌਜੂਦਗੀ ਜਾਣਕਾਰੀ"
-
-msgid "In-Band Bytestreams"
-msgstr "ਇਨ-ਬੈਂਡ ਬਾਇਟ-ਸਟਰੀਮ"
-
-msgid "Ad-Hoc Commands"
-msgstr "ਐਡ-ਹਾਕ ਕਮਾਂਡ"
-
-msgid "PubSub Service"
-msgstr "PubSub ਸਰਵਿਸ"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreams"
-
-msgid "Out of Band Data"
-msgstr "ਆਉਟ ਆਫ਼ ਬੈਂਡ ਡਾਟਾ"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "ਇਨ-ਬੈਂਡ ਰਜਿਸਟਰੇਸ਼ਨ"
-
-msgid "User Location"
-msgstr "ਯੂਜ਼ਰ ਟਿਕਾਣਾ"
-
-msgid "User Avatar"
-msgstr "ਯੂਜ਼ਰ ਅਵਤਾਰ"
-
-msgid "Chat State Notifications"
-msgstr "ਚੈਟ ਹਾਲਤ ਨੋਟੀਫਿਕੇਸ਼ਨ"
-
-msgid "Software Version"
-msgstr "ਸਾਫਟਵੇਅਰ ਵਰਜਨ"
-
-msgid "Stream Initiation"
-msgstr "ਸਟਰੀਮ ਸ਼ੁਰੂਆਤ"
-
-msgid "File Transfer"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ"
-
-msgid "User Mood"
-msgstr "ਯੂਜ਼ਰ ਮੂਡ"
-
-msgid "User Activity"
-msgstr "ਯੂਜ਼ਰ ਸਰਗਰਮੀ"
-
-msgid "Entity Capabilities"
-msgstr "ਐਂਟਟੀ ਸਮੱਰਥਾ"
-
-msgid "Encrypted Session Negotiations"
-msgstr "ਇੰਕ੍ਰਿਪਟਡ ਸ਼ੈਸ਼ਨ ਸਾਂਝ"
-
-msgid "User Tune"
-msgstr "ਯੂਜ਼ਰ ਟਿਊਨ"
-
-msgid "Roster Item Exchange"
-msgstr "ਰੋਸਟਰ ਆਈਟਮ ਐਕਸ਼ਚੇਜ਼"
-
-msgid "Reachability Address"
-msgstr "ਪਹੁੰਚਯੋਗ ਐਡਰੈੱਸ"
-
-msgid "User Profile"
-msgstr "ਯੂਜ਼ਰ ਪ੍ਰੋਫਾਇਲ"
-
-msgid "Jingle"
-msgstr "ਜਿਙਗਲ"
-
-msgid "Jingle Audio"
-msgstr "ਜਿਙਗਲ ਆਡਿਓ"
-
-msgid "User Nickname"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ"
-
-msgid "Jingle ICE UDP"
-msgstr "ਜਿਙਗਲ ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "ਜਿਙਗਲ ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "ਜਿਙਗਲ ਰਾਅ UDP"
-
-msgid "Jingle Video"
-msgstr "ਜਿਙਗਲ ਵਿਡੀਓ"
-
-msgid "Jingle DTMF"
-msgstr "ਜਿਙਗਲ DTMF"
-
-msgid "Message Receipts"
-msgstr "ਸੁਨੇਹਾ ਮਿਲਿਆ"
-
-msgid "Public Key Publishing"
-msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਪਬਲਿਕੇਸ਼ਨ"
-
-msgid "User Chatting"
-msgstr "ਯੂਜ਼ਰ ਚੈਟਿੰਗ"
-
-msgid "User Browsing"
-msgstr "ਯੂਜ਼ਰ ਬਰਾਊਜ਼ਿੰਗ"
-
-msgid "User Gaming"
-msgstr "ਯੂਜ਼ਰ ਗੇਮ"
-
-msgid "User Viewing"
-msgstr "ਯੂਜ਼ਰ ਝਲਕ"
-
-msgid "Ping"
-msgstr "ਪਿੰਗ"
-
-msgid "Stanza Encryption"
-msgstr "ਪ੍ਹੈਰਾ ਇੰਕ੍ਰਿਪਸ਼ਨ"
-
-msgid "Entity Time"
-msgstr "ਐਂਟਟੀ ਟਾਈਮ"
-
-msgid "Delayed Delivery"
-msgstr "ਡਿਲਵਰੀ ਦੇਰੀ"
-
-msgid "Collaborative Data Objects"
-msgstr "ਸਾਂਝੇ ਡਾਟਾ ਆਬਜੈਕਟ"
-
-msgid "File Repository and Sharing"
-msgstr "ਫਾਇਲ ਰਿਪੋਜ਼ਟਰੀ ਅਤੇ ਸ਼ੇਅਰਿੰਗ"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "ਜਿਙਗਲ ਲਈ STUN ਸਰਵਿਸ ਖੋਜ"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "ਸਧਾਰਨ ਇੰਕ੍ਰਿਪਟਡ ਸ਼ੈਸ਼ਨ ਸਾਂਝ"
-
-msgid "Hop Check"
-msgstr "ਹੋਪ ਚੈਕ"
-
-msgid "Capabilities"
-msgstr "ਯੋਗਤਾ"
+msgid "Local Time"
+msgstr "ਲੋਕਲ ਟਾਈਮ"
 
 msgid "Priority"
 msgstr "ਤਰਜੀਹ"
@@ -3765,6 +3801,13 @@ msgstr "ਤਰਜੀਹ"
 msgid "Resource"
 msgstr "ਸਰੋਤ"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s ਪਹਿਲਾਂ"
+
+msgid "Logged Off"
+msgstr "ਲਾਗ ਆਫ਼ ਕੀਤਾ"
+
 msgid "Middle Name"
 msgstr "ਮੱਧ ਨਾਂ"
 
@@ -3931,28 +3974,22 @@ msgstr "ਕਿਊਰੀ ਲਈ ਇੱਕ ਕਾਨਫਰੰਸ ਸਰਵਰ ਚ�
 msgid "Find Rooms"
 msgstr "ਰੂਮ ਖੋਜ"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "ਤੁਹਾਨੂੰ ਇੰਕ੍ਰਿਪਸ਼ਨ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਹ ਸਰਵਰ ਲਈ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
+msgid "Affiliations:"
+msgstr "ਸਬੰਧ:"
 
-msgid "Write error"
-msgstr "ਲਿਖਣ ਵਿੱਚ ਗਲਤੀ"
+msgid "No users found"
+msgstr "ਯੂਜ਼ਰ ਨਹੀਂ ਲੱਭੇ"
 
-msgid "Ping timeout"
-msgstr "ਪਿੰਗ ਟਾਈਮ-ਆਉਟ"
+msgid "Roles:"
+msgstr "ਰੋਲ:"
 
-msgid "Read Error"
-msgstr "ਪੜ੍ਹਨ ਗਲਤੀ"
+msgid "Ping timed out"
+msgstr "ਪਿੰਗ ਟਾਈਮ-ਆਉਟ"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਫਲ"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
+msgstr "ਸਿੱਧਾ ਕੁਨਕੈਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੋਣ ਤੋਂ ਬਾਅਦ ਬਦਲਵਾਂ XMPP ਕੁਨੈਕਸ਼ਨ ਢੰਗ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
 
 msgid "Invalid XMPP ID"
 msgstr "ਗਲਤ XMPP ID"
@@ -3960,6 +3997,9 @@ msgstr "ਗਲਤ XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ਗਲਤ XMPP ID ਹੈ। ਡੋਮੇਨ ਸੈੱਟ ਕਰਨੀ ਲਾਜ਼ਮੀ ਹੈ।"
 
+msgid "Malformed BOSH URL"
+msgstr "ਨਿਕਾਰਾ BOSH URL"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s ਦੀ ਰਜਿਸਟਰੇਸ਼ਨ ਸਫਲ"
@@ -3984,11 +4024,8 @@ msgstr "ਅਣ-ਰਜਿਸਟਰੇਸ਼ਨ ਸਫਲ"
 msgid "Unregistration Failed"
 msgstr "ਅਣ-ਰਜਿਸਟਰੇਸ਼ਨ ਫੇਲ੍ਹ"
 
-msgid "Already Registered"
-msgstr "ਪਹਿਲਾਂ ਹੀ ਰਜਿਸਟਰ"
-
 msgid "State"
-msgstr "ਸਥਿਤੀ"
+msgstr "ਹਾਲਤ"
 
 msgid "Postal code"
 msgstr "ਡਾਕ-ਕੋਡ"
@@ -3999,10 +4036,14 @@ msgstr "ਫੋਨ"
 msgid "Date"
 msgstr "ਮਿਤੀ"
 
+msgid "Already Registered"
+msgstr "ਪਹਿਲਾਂ ਹੀ ਰਜਿਸਟਰ"
+
 msgid "Unregister"
 msgstr "ਅਣ-ਰਜਿਸਟਰ"
 
-msgid "Please fill out the information below to change your account registration."
+msgid ""
+"Please fill out the information below to change your account registration."
 msgstr "ਆਪਣੀ ਅਕਾਊਂਟ ਰਜਿਸਟਰੇਸ਼ਨ ਬਦਲਣ ਵਾਸਤੇ ਹੇਠਾਂ ਜਾਣਕਾਰੀ ਭਰੋ ਜੀ।"
 
 msgid "Please fill out the information below to register your new account."
@@ -4049,6 +4090,12 @@ msgstr "ਸਰਵਰ ਪਾਬੰਦੀ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹ�
 msgid "Not Authorized"
 msgstr "ਪਰਮਾਣਤ ਨਹੀਂ"
 
+msgid "Mood"
+msgstr "ਮੂਡ"
+
+msgid "Now Listening"
+msgstr "ਹੁਣ ਸੁਣ ਰਿਹਾ ਹੈ"
+
 msgid "Both"
 msgstr "ਦੋਨੋਂ"
 
@@ -4070,12 +4117,6 @@ msgstr "ਕੋਈ ਨਹੀਂ"
 msgid "Subscription"
 msgstr "ਮੈਂਬਰੀ"
 
-msgid "Mood"
-msgstr "ਮੂਡ"
-
-msgid "Now Listening"
-msgstr "ਹੁਣ ਸੁਣ ਰਿਹਾ ਹੈ"
-
 msgid "Mood Text"
 msgstr "ਮੂਡ ਟੈਕਸਟ"
 
@@ -4118,9 +4159,6 @@ msgstr "ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਤਬਦੀਲ ਹੋ ਗਿਆ �
 msgid "Error changing password"
 msgstr "ਪਾਸਵਰਡ ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-msgid "Password (again)"
-msgstr "ਪਾਸਵਰਡ (ਮੁੜ)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP ਪਾਸਵਰਡ ਬਦਲੋ"
 
@@ -4313,17 +4351,26 @@ msgstr "ਯੂਜ਼ਰ %s ਨੂੰ ਕਿੱਕ ਕਰਨ ਬਾਰੇ ਅਸ�
 msgid "Unable to ping user %s"
 msgstr "ਯੂਜ਼ਰ %s ਪਿੰਗ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
+# , c-format
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ %s ਬਾਰੇ ਕੁਝ ਵੀ ਪਤਾ ਨਹੀਂ ਹੈ।"
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ %s ਬਾਰੇ ਕੁਝ ਵੀ ਪਤਾ ਨਹੀਂ ਹੈ।"
 
+# , c-format
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ %s ਸ਼ਾਇਦ ਆਫ਼ਲਾਈਨ ਹੈ।"
+msgid "Unable to buzz, because %s might be offline."
+msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ %s ਸ਼ਾਇਦ ਆਫ਼ਲਾਈਨ ਹੈ।"
 
+# , c-format
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ %s ਇਸ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ %s ਇਸ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਜਾਂ ਬੱਜ਼ ਲੈਣੇ ਨਹੀਂ ਚਾਹੁੰਦਾ ਹੈ।"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s ਨੂੰ ਬੱਜ਼..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4334,9 +4381,36 @@ msgstr "ਬੱਜ਼"
 msgid "%s has buzzed you!"
 msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਬੱਜ਼ ਭੇਜਿਆ ਹੈ!"
 
+# , c-format
 #, c-format
-msgid "Buzzing %s..."
-msgstr "%s ਨੂੰ ਬੱਜ਼..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "%s ਨੂੰ ਮੀਡਿਆ ਸ਼ੁਰੂ ਕਰਨ ਵਾਸਤੇ ਅਸਮਰੱਥ: ਗਲਤ JID"
+
+# , c-format
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "%s ਲਈ ਮੀਡਿਆ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: ਯੂਜ਼ਰ ਆਨਲਾਈਨ ਨਹੀਂ ਹੈ"
+
+# , c-format
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "%s ਨੂੰ ਮੀਡਿਆ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ: ਯੂਜ਼ਰ ਮੌਜੂਦਗੀ ਲਈ ਮੈਂਬਰ ਨਹੀਂ"
+
+msgid "Media Initiation Failed"
+msgstr "ਮੀਡਿਆ ਸ਼ੁਰੂਆਤ ਫੇਲ੍ਹ ਹੈ"
+
+# , c-format, c-format
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "%s ਦੇ ਸਰੋਤ ਚੁਣੋ, ਜੋ ਕਿ ਤੁਸੀਂ ਮੀਡਿਆ ਸ਼ੈਸ਼ਨ ਨਾਲ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"
+
+msgid "Select a Resource"
+msgstr "ਇੱਕ ਸਰੋਤ ਚੁਣੋ"
+
+msgid "Initiate Media"
+msgstr "ਮੀਡਿਆ ਸ਼ੁਰੂ"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
@@ -4357,18 +4431,18 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [reason]:  Ban a user from the room."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: ਰੂਮ ਨਾਲ ਯੂਜ਼ਰ "
-"ਦਾ ਸਬੰਧ ਸੈੱਟ ਕਰੋ"
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: ਯੂਜ਼ਰਾਂ "
+"ਦਾ ਸਬੰਧ ਲਵੋ ਜਾਂ ਰੂਮ ਨਾਲ ਯੂਜ਼ਰ ਦਾ ਸਬੰਧ ਸੈੱਟ ਕਰੋ।"
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ਰੂਮ ਵਿੱਚ ਯੂਜ਼ਰ ਦਾ "
-"ਰੋਲ ਸੈੱਟ ਕਰੋ।"
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: ਯੂਜ਼ਰਾਂ ਦਾ "
+"ਰੋਲ ਲਵੋ ਜਾਂ ਯੂਜ਼ਰਾਂ ਦਾ ਰੂਮ ਨਾਲ ਰੋਲ ਸੈੱਟ ਕਰੋ।"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [room]:  ਯੂਜ਼ਰ ਨੂੰ ਰੂਮ 'ਚ ਸੱਦੋ।"
@@ -4379,8 +4453,10 @@ msgstr "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [reason]:  Kick a user from the room."
 
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tਇੱਕ ਯੂਜ਼ਰ/ਭਾਗ/ਸਰਵਰ ਪਿੰਗ ਕਰੋ।"
@@ -4426,6 +4502,9 @@ msgstr "ਸਰਵਰ ਨਾਲ ਜੋੜੋ"
 msgid "File transfer proxies"
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਪਰਾਕਸੀ"
 
+msgid "BOSH URL"
+msgstr "BOSH URL"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4464,6 +4543,14 @@ msgstr "XML ਪਾਰਸ ਗਲਤੀ"
 msgid "Unknown Error in presence"
 msgstr "ਮੌਜੂਦਗੀ ਵਿੱਚ ਅਣਜਾਣੀ ਗਲਤੀ"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "ਗੱਲ %s 'ਚ ਦਾਖਲ ਹੋਣ ਲਈ ਗਲਤੀ"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "ਗੱਲ %s 'ਚ ਗਲਤੀ"
+
 msgid "Create New Room"
 msgstr "ਨਵਾਂ ਰੂਮ ਬਣਾਓ"
 
@@ -4480,13 +4567,30 @@ msgstr "ਰੂਮ ਸੰਰਚਨਾ(_C)"
 msgid "_Accept Defaults"
 msgstr "ਮੂਲ ਮਨਜ਼ੂਰ ਕਰੋ(_A)"
 
+msgid "No reason"
+msgstr "ਕਾਰਨ ਨਹੀਂ"
+
+# , c-format
 #, c-format
-msgid "Error joining chat %s"
-msgstr "ਗੱਲ %s 'ਚ ਦਾਖਲ ਹੋਣ ਲਈ ਗਲਤੀ"
+msgid "You have been kicked: (%s)"
+msgstr "ਤੁਹਾਨੂੰ ਠੁੱਡਾ ਮਾਰਿਆ: (%s)"
 
+# , c-format
 #, c-format
-msgid "Error in chat %s"
-msgstr "ਗੱਲ %s 'ਚ ਗਲਤੀ"
+msgid "Kicked (%s)"
+msgstr "ਠੁੱਡਾ ਮਾਰਿਆ (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "ਇਨ-ਬੈਂਡ ਬਾਈਟ-ਸਟਰੀਮ ਟਰਾਂਸਫਰ ਉੱਤੇ ਗਲਤੀ ਆਈ ਹੈ।\n"
+
+msgid "Transfer was closed."
+msgstr "ਟਰਾਂਸਫਰ ਬੰਦ ਹੋ ਗਈ।"
+
+msgid "Failed to open the file"
+msgstr "ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+
+msgid "Failed to open in-band bytestream"
+msgstr "ਇਨ-ਬੈਂਡ ਬਾਈਟਸਿਸਟਮ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4508,12 +4612,10 @@ msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr "%s ਨੂੰ ਫਾਇਲ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਯੂਜ਼ਰ ਮੌਜੂਦਗੀ ਲਈ ਮੈਂਬਰ ਨਹੀਂ"
 
 # , c-format
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "ਚੁਣੋ ਕਿ ਕਿਹੜੇ %s ਦੇ ਸਰੋਤ ਤੁਸੀਂ ਇੱਕ ਫਾਇਲ ਤੋਂ ਤੁਸੀਂ ਭੇਜਣੇ ਚਾਹੁੰਦੇ ਹੋ"
 
-msgid "Select a Resource"
-msgstr "ਇੱਕ ਸਰੋਤ ਚੁਣੋ"
-
 msgid "Edit User Mood"
 msgstr "ਯੂਜ਼ਰ ਮੋਡ ਸੋਧ"
 
@@ -4577,167 +4679,221 @@ msgstr ""
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
-msgstr "%s ਲੋਕਲ ਲਿਸਟ ਉੱਤੇ ਹੈ, ਪਰ ਸਰਵਰ ਲਿਸਟ ਉੱਤੇ ਨਹੀਂ। ਕੀ ਤੁਸੀਂ ਇਹ ਬੱਡੀ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr ""
+"%s ਲੋਕਲ ਲਿਸਟ ਉੱਤੇ ਹੈ, ਪਰ ਸਰਵਰ ਲਿਸਟ ਉੱਤੇ ਨਹੀਂ। ਕੀ ਤੁਸੀਂ ਇਹ ਬੱਡੀ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "ਸੁਨੇਹਾ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਫ਼ਲ"
 
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "ਸੰਟੈਕਸ ਗਤੀ (ਇੱਕ ਕਲਾਇਟ ਬੱਗ ਹੈ)"
 
+#, c-format
 msgid "Invalid email address"
 msgstr "ਗਲਤ ਈਮੇਲ ਐਡਰੈੱਸ"
 
+#, c-format
 msgid "User does not exist"
 msgstr "ਯੂਜ਼ਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "ਫੂਲ ਕੁਆਲੀਫਾਇਡ ਡੋਮੇਨ ਨਾਂ (FQDN) ਗੁੰਮ ਹੈ"
 
+#, c-format
 msgid "Already logged in"
 msgstr "ਪਹਿਲਾਂ ਹੀ ਲਾਗਇਨ ਹੈ"
 
+#, c-format
 msgid "Invalid username"
 msgstr "ਗਲਤ ਯੂਜ਼ਰ ਨਾਂ"
 
+#, c-format
 msgid "Invalid friendly name"
 msgstr "ਗਲਤ ਦੋਸਤਾਨਾ ਨਾਂ"
 
+#, c-format
 msgid "List full"
 msgstr "ਲਿਸਟ ਭਰ ਗਈ"
 
+#, c-format
 msgid "Already there"
 msgstr "ਪਹਿਲਾਂ ਹੀ ਉਥੇ ਹੈ"
 
+#, c-format
 msgid "Not on list"
 msgstr "ਲਿਸਟ ਉੱਤੇ ਨਹੀਂ"
 
+#, c-format
 msgid "User is offline"
 msgstr "ਯੂਜ਼ਰ ਆਫਲਾਇਨ ਹੈ"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "ਪਹਿਲਾਂ ਹੀ ਮੋਡ 'ਚ ਹੈ"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "ਪਹਿਲਾਂ ਹੀ ਉਲਟ ਲਿਸਟ ਵਿੱਚ ਹੈ"
 
+#, c-format
 msgid "Too many groups"
 msgstr "ਕਈ ਗਰੁੱਪ ਹਨ"
 
+#, c-format
 msgid "Invalid group"
 msgstr "ਗਲਤ ਗਰੁੱਪ"
 
+#, c-format
 msgid "User not in group"
 msgstr "ਯੂਜ਼ਰ ਗਰੁੱਪ 'ਚ ਨਹੀਂ ਹੈ"
 
+#, c-format
 msgid "Group name too long"
 msgstr "ਗਰੁੱਪ ਨਾਂ ਬਹੁਤ ਵੱਡਾ ਹੈ"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "ਗਰੁੱਪ ਜ਼ੀਰੋ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "ਇੱਕ ਯੂਜ਼ਰ ਨੂੰ ਇੱਕ ਗਰੁੱਪ ਵਿੱਚ ਜੋੜਨ ਦੀ ਕੋਸ਼ਿਸ਼, ਜੋ ਕਿ ਮੌਜੂਦ ਹੀ ਨਹੀ ਹੈ।"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "ਸਵਿੱਚਬੋਰਡ ਫੇਲ੍ਹ ਹੋਇਆ"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "ਨੋਟੀਫਾਈ ਟਰਾਂਸਫਰ ਫੇਲ੍ਹ"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "ਲੋੜੀਦੇ ਖੇਤਰ ਗੁੰਮ ਹਨ"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "ਇੱਕ FND ਲਈ ਬਹੁਤੀਆਂ ਹਿੱਟਾਂ"
 
+#, c-format
 msgid "Not logged in"
 msgstr "ਲਾਗਇਨ ਨਹੀਂ ਹੈ"
 
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "ਸਰਵਿਸ ਆਰਜ਼ੀ ਰੂਪ 'ਚ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
+#, c-format
 msgid "Database server error"
 msgstr "ਡਾਟਾਬੇਸ ਸਰਵਰ ਗਲਤੀ"
 
+#, c-format
 msgid "Command disabled"
 msgstr "ਕਮਾਂਡ ਆਯੋਗ"
 
+#, c-format
 msgid "File operation error"
 msgstr "ਫਾਇਲ ਕਾਰਵਾਈ ਗਲਤੀ"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "ਮੈਮੋਰੀ ਜਾਰੀ ਗਲਤੀ"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "ਗਲਤ CHL ਮੁੱਲ ਸਰਵਰ ਨੂੰ ਭੇਜਿਆ"
 
+#, c-format
 msgid "Server busy"
 msgstr "ਸਰਵਰ ਰੁੱਝਿਆ ਹੈ"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "ਸਰਵਰ ਉਪਲੱਬਧ ਨਹੀਂ"
 
+#, c-format
 msgid "Peer notification server down"
 msgstr "ਪੀਰੀਅਰ ਨੋਟੀਫਿਕੇਸ਼ਨ ਸਰਵਰ ਬੰਦ ਹੈ"
 
+#, c-format
 msgid "Database connect error"
 msgstr "ਡਾਟਾਬੇਸ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "ਸਰਵਰ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ (ਡੁੱਬਦਾ ਜਹਾਜ਼)"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR ਪੈਰਾਮੀਟਰ ਜਾਂ ਤਾਂ ਅਣਜਾਣ ਹੈ ਜਾਂ ਮਨਜ਼ੂਰ ਨਹੀਂ ਹੈ।"
 
+#, c-format
 msgid "Unable to write"
 msgstr "ਲਿਖਣ ਲਈ ਅਸਫਲ"
 
+#, c-format
 msgid "Session overload"
 msgstr "ਸ਼ੈਸ਼ਨ ਓਵਰ-ਲੋਡ ਹੋ ਗਿਆ"
 
+#, c-format
 msgid "User is too active"
 msgstr "ਯੂਜ਼ਰ ਬਹੁਤ ਛੋਟਾ ਹੈ"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "ਕਈ ਸ਼ੈਸ਼ਨ ਹਨ"
 
+#, c-format
 msgid "Passport not verified"
 msgstr "ਪਾਸਪੋਰਟ ਜਾਂਚਿਆ ਨਹੀਂ ਹੈ"
 
+#, c-format
 msgid "Bad friend file"
 msgstr "ਗਲਤ ਮਿੱਤਰ ਫਾਇਲ"
 
+#, c-format
 msgid "Not expected"
 msgstr "ਲੋੜ ਨਹੀਂ ਸੀ"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "ਦੋਸਤਾਨਾ ਨਾਂ ਬਹੁਤ ਤੇਜ਼ੀ ਨਾਲ ਬਦਲਿਆ"
 
+#, c-format
 msgid "Server too busy"
 msgstr "ਸਰਵਰ ਰੁਝਿਆ"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਅਸਫਲ"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "ਜਦੋਂ ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਮਨਜ਼ੂਰ ਨਹੀਂ"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "ਨਵੇਂ ਯੂਜ਼ਰ ਮਨਜ਼ੂਰ ਨਹੀਂ ਹਨ"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "ਬੱਚਾ ਪਾਸਪੋਰਟ ਬਿਨਾਂ ਮਾਪਿਆਂ ਦੀ ਸਹਿਮਤੀ ਦੇ"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "ਪਾਸਪੋਰਟ ਅਕਾਊਂਟ ਹਾਲੇ ਜਾਂਚਿਆ ਨਹੀਂ ਗਿਆ"
 
 msgid "Passport account suspended"
 msgstr "ਪਾਸਪੋਰਟ ਅਕਾਊਂਟ ਸਸਪੈਂਡ ਕੀਤਾ"
 
+#, c-format
 msgid "Bad ticket"
 msgstr "ਗਲਤ ਟਿਕਟ"
 
@@ -4755,6 +4911,28 @@ msgstr "ਹੋਰ ਸੰਪਰਕ"
 msgid "Non-IM Contacts"
 msgstr "ਗ਼ੈਰ-IM ਸੰਪਰਕ"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s ਨੇ ਸੈਨਤ ਭੇਜੀ ਹੈ। <a href='msn-wink://%s'>ਇਹ ਚਲਾਉਣ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ।</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s ਨੇ ਸੈਨਤ ਭੇਜੀ, ਪਰ ਇਸ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s ਨੇ ਵੀਡਿਓ ਕਲਿੱਪ ਭੇਜੀ। <a href='audio://%s'>ਚਲਾਉਣ ਲਈ ਕਲਿੱਕ ਕਰੋ</a>"
+
+# , c-format
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s ਨੇ ਵੀਡਿਓ ਕਲਿੱਪ ਭੇਜੀ, ਪਰ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
+
+# , c-format
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਆਵਾਜ਼ ਗੱਲਬਾਤ ਲਈ ਸੱਦਿਆ, ਜੋ ਹਾਲੇ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+
 msgid "Nudge"
 msgstr "ਸੈਨਤ"
 
@@ -4798,7 +4976,7 @@ msgstr ""
 "ਫੋਨਾਂ ਉੱਤੇ ਭੇਜਣ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 msgid "Allow"
-msgstr "ਸਵੀਕਾਰ"
+msgstr "ਮਨਜ਼ੂਰ"
 
 msgid "Disallow"
 msgstr "ਪਾਬੰਦੀ"
@@ -4811,7 +4989,8 @@ msgid "No text is blocked for this account."
 msgstr "ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਟੈਕਸਟ ਬਲਾਕ ਨਹੀਂ ਹੈ।"
 
 #, c-format
-msgid "MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr "MSN ਸਰਵਰਾਂ ਉੱਤੇ ਹੇਠ ਦਿੱਤੇ ਨਿਯਮਤ ਸਮੀਕਰਨ ਪਾਬੰਦੀ ਲਗਾਏ ਗਏ ਹਨ: <br/>%s"
 
 msgid "This account does not have email enabled."
@@ -4904,8 +5083,29 @@ msgstr "ਗੱਲਬਾਤ ਚਾਲੂ(_C)"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL ਸਹਿਯੋਗ MSN ਲਈ ਲੋੜੀਦਾ ਹੈ। ਇੱਕ ਸਹਾਇਕ SSL ਲਾਇਬਰੇਰੀ ਇੰਸਟਾਲ ਕਰੋ ਜੀ।"
 
-msgid "Failed to connect to server."
-msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਦੌਰਨ ਗਲਤੀ"
+# , c-format
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"ਬੱਡੀ %s ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ-ਨਾਂ ਗਲਤ ਹੈ। ਯੂਜ਼ਰ-ਨਾਂ ਇੱਕ ਵੈਧ। ਈਮੇਲ ਐਡਰੈੱਸ "
+"ਚਾਹੀਦਾ ਹੈ।"
+
+msgid "Unable to Add"
+msgstr "ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+msgid "Authorization Request Message:"
+msgstr "ਪ੍ਰਮਾਣਿਤ ਬੇਨਤੀ ਸੁਨੇਹਾ:"
+
+msgid "Please authorize me!"
+msgstr "ਮੈਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰੋ ਜੀ!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "ਠੀਕ ਹੈ(_O)"
 
 msgid "Error retrieving profile"
 msgstr "ਪ੍ਰੋਫਾਇਲ ਪ੍ਰਾਪਤ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
@@ -5038,7 +5238,7 @@ msgid "Favorite Things"
 msgstr "ਪਸੰਦ ਚੀਜ਼ਾਂ"
 
 msgid "Last Updated"
-msgstr "ਆਖਰੀ ਨਵੀਨੀਕਰਨ"
+msgstr "ਆਖਰੀ ਅੱਪਡੇਟ"
 
 msgid "Homepage"
 msgstr "ਮੁੱਖ ਸਫਾ"
@@ -5093,63 +5293,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "ਵਿੰਡੋ ਲਾਇਵ ID ਪਰਮਾਣਕਿਤਾ: ਗਲਤ ਜਵਾਬ"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ਠੀਕ ਗਰੁੱਪ ਨਹੀਂ ਹੈ।"
-
-msgid "Unknown error."
-msgstr "ਅਣਜਾਣ ਗਲਤੀ"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s 'ਤੇ %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਸੈਨਲ (ਨੱਜ) ਮਾਰੀ ਹੈ!"
 
-#. char *adl = g_strndup(payload, len);
+# , c-format
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "ਅਣਜਾਣੀ ਗਲਤੀ (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "ਅਣਜਾਣੀ ਗਲਤੀ (%d): %s"
 
 msgid "Unable to add user"
 msgstr "ਯੂਜ਼ਰ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-msgid "The following users are missing from your addressbook"
-msgstr "ਤੁਹਾਡੀ ਐਡਰੈੱਸਬੁੱਕ ਵਿੱਚੋਂ ਹੇਠ ਦਿੱਤੇ ਯੂਜ਼ਰ ਗੁੰਮ ਹਨ"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) ਉੱਤੇ ਯੂਜ਼ਰ ਜੋੜਨ ਲਈ ਅਸਫ਼ਲ"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) ਉੱਤੇ ਯੂਜ਼ਰ ਬਲਾਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) ਉੱਤੇ ਯੂਜ਼ਰ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ਨੂੰ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਤੁਹਾਡੀ ਬੱਡੀ ਲਿਸਟ ਭਰ ਗਈ ਹੈ।"
-
+#. Unknown error!
 #, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ਲਈ ਗਲਤ ਪਾਸਪੋਰਟ ਅਕਾਊਂਟ ਹੈ"
+msgid "Unknown error (%d)"
+msgstr "ਅਣਜਾਣੀ ਗਲਤੀ (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "ਸਰਵਿਸ ਆਰਜ਼ੀ ਰੂਪ 'ਚ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
+msgid "The following users are missing from your addressbook"
+msgstr "ਤੁਹਾਡੀ ਐਡਰੈੱਸਬੁੱਕ ਵਿੱਚੋਂ ਹੇਠ ਦਿੱਤੇ ਯੂਜ਼ਰ ਗੁੰਮ ਹਨ"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "ਮੋਬਾਇਲ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ, ਕਿਉਂਕਿ ਇਹ ਬਹੁਤ ਲੰਮਾ ਸੀ।"
 
-msgid "Unable to rename group"
-msgstr "ਗਰੁੱਪ ਨਾਂ-ਤਬਦੀਲੀ ਲਈ ਅਸਫਲ"
-
-msgid "Unable to delete group"
-msgstr "ਗਰੁੱਪ ਹਟਾਉਣ ਲਈ ਅਸਫਲ"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5180,8 +5345,8 @@ msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
-"ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਸਿਸਟਮ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਇਹ ਅਕਸਰ ਤਾਂ ਹੁੰਦਾ ਹੈ, ਜਦੋਂ "
-"ਯੂਜ਼ਰ ਉੱਤੇ ਪਾਬੰਦੀ ਹੋਵੇ ਜਾਂ ਮੌਜੂਦ ਨਾ ਹੋਵੇ।"
+"ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਸਿਸਟਮ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਇਹ ਅਕਸਰ ਤਾਂ ਹੁੰਦਾ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ ਉੱਤੇ "
+"ਪਾਬੰਦੀ ਹੋਵੇ ਜਾਂ ਮੌਜੂਦ ਨਾ ਹੋਵੇ।"
 
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਸੁਨੇਹੇ ਬਹੁਤ ਤੇਜ਼ੀ ਨਾਲ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ।"
@@ -5192,14 +5357,11 @@ msgstr "ਇੱਕ ਅਣਜਾਣੀ ਇੰਕੋਡਿੰਗ ਗਲਤੀ ਆ�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "ਇੱਕ ਅਣਜਾਣੀ ਗਲਤੀ ਆਉਣ ਕਰਕੇ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-msgid "Unable to connect"
-msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-
 msgid "Writing error"
 msgstr "ਲਿਖਣ ਗਲਤੀ"
 
 msgid "Reading error"
-msgstr "ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ"
+msgstr "ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
 
 #, c-format
 msgid ""
@@ -5209,26 +5371,27 @@ msgstr ""
 "ਸਰਵਰ (%s) ਵਲੋਂ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr "ਸਾਡੇ ਪ੍ਰੋਟੋਕਾਲ ਲਈ ਸਰਵਰ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr "HTTP ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr "ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ ਥਾਂ ਤੋਂ ਲਾਗਇਨ ਹੋਏ"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN ਸਰਵਰ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ। ਉਡੀਕ ਕਰਨ ਉਪਰੰਤ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN ਸਰਵਰ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ।"
 
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਲਈ ਅਸਫਲ: %s"
 
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "ਤੁਹਾਡਾ MSN ਬੱਡੀ ਆਰਜ਼ੀ ਤੌਰ ਉੱਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"
 
 msgid "Handshaking"
@@ -5249,6 +5412,15 @@ msgstr "ਕੂਕੀਜ਼ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 msgid "Retrieving buddy list"
 msgstr "ਬੱਡੀ ਲਿਸਟ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
+# , c-format
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ਨੇ ਵੈੱਬ-ਕੈਮ ਵੇਖਣ ਲਈ ਮੰਗ ਕੀਤੀ ਹੈ, ਜੋ ਕਿ ਇਹ ਮੰਗ ਹਾਲੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ਨੇ ਇੱਕ ਵੈੱਬ-ਕੈਮ ਸੱਦਾ ਭੇਜਿਆ ਹੈ, ਜੋ ਕਿ ਹਾਲੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
+
 msgid "Away From Computer"
 msgstr "ਕੰਪਿਊਟਰ ਤੋਂ ਦੂਰ"
 
@@ -5280,20 +5452,13 @@ msgstr ""
 "ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਅਸੀਂ ਸਰਵਰ ਨਾਲ ਸ਼ੈਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ ਹਾਂ। ਇਹ ਇੱਕ ਸਮੱਸਿਆ "
 "ਜਾਪਦੀ ਹੈ, ਕੁਝ ਮਿੰਟ ਬਾਅਦ ਟਰਾਈ ਕਰੋ ਜੀ:"
 
-msgid "Message could not be sent because an error with the switchboard occurred:"
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
 msgstr "ਸਵਿੱਚਬੋਰਡ ਗਲਤੀ ਆਉਣ ਕਰਕੇ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "ਇੱਕ ਅਣਜਾਣੀ ਗਲਤੀ ਆਉਣ ਕਰਕੇ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ 'ਚ ਜੋੜਿਆ ਹੈ।"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ 'ਚੋਂ ਹਟਾ ਦਿੱਤਾ ਹੈ।"
-
 msgid "Delete Buddy from Address Book?"
 msgstr "ਕੀ ਐਡਰੈੱਸਬੁੱਕ ਵਿੱਚੋਂ ਬੱਡੀ ਹਟਾਉਣਾ ਹੈ?"
 
@@ -5323,6 +5488,54 @@ msgid "MSN Protocol Plugin"
 msgstr "MSN ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ਠੀਕ ਗਰੁੱਪ ਨਹੀਂ ਹੈ।"
+
+msgid "Unknown error."
+msgstr "ਅਣਜਾਣ ਗਲਤੀ"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s 'ਤੇ %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) ਉੱਤੇ ਯੂਜ਼ਰ ਜੋੜਨ ਲਈ ਅਸਫ਼ਲ"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) ਉੱਤੇ ਯੂਜ਼ਰ ਬਲਾਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) ਉੱਤੇ ਯੂਜ਼ਰ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ਨੂੰ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਤੁਹਾਡੀ ਬੱਡੀ ਲਿਸਟ ਭਰ ਗਈ ਹੈ।"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ਲਈ ਗਲਤ ਪਾਸਪੋਰਟ ਅਕਾਊਂਟ ਹੈ"
+
+msgid "Service Temporarily Unavailable."
+msgstr "ਸਰਵਿਸ ਆਰਜ਼ੀ ਰੂਪ 'ਚ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
+
+msgid "Unable to rename group"
+msgstr "ਗਰੁੱਪ ਨਾਂ-ਤਬਦੀਲੀ ਲਈ ਅਸਫਲ"
+
+msgid "Unable to delete group"
+msgstr "ਗਰੁੱਪ ਹਟਾਉਣ ਲਈ ਅਸਫਲ"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ 'ਚ ਜੋੜਿਆ ਹੈ।"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ 'ਚੋਂ ਹਟਾ ਦਿੱਤਾ ਹੈ।"
+
+#, c-format
 msgid "No such user: %s"
 msgstr "ਕੋਈ ਯੂਜ਼ਰ ਨਹੀਂ: %s"
 
@@ -5351,6 +5564,8 @@ msgid "Lost connection with server"
 msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "ਨਵੇਂ ਮੇਲ ਸੁਨੇਹੇ"
 
@@ -5389,25 +5604,23 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "ਸਰਵਰ ਤੋਂ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "ਜੁੜਿਆ"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "ਪਰੋਟੋਕਾਲ ਗਲਤੀ, ਕੋਡ %d: %s"
 
+# , c-format
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s ਤੁਹਾਡਾ ਪਾਸਵਰਡ %d ਅੱਖਰਾਂ ਦਾ ਹੈ, ਜੋ ਕਿ MySpaceIM ਲਈ %d ਦੀ ਲੰਬਾਈ ਤੋਂ ਵੱਧ ਗਿਆ ਹੈ। ਆਪਣਾ ਪਾਸਵਰਡ http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword ਉੱਤੇ ਛੋਟਾ ਕਰਕੇ ਮੁੜ-ਟਰਾਈ ਕਰੋ ਜੀ।"
+"%s ਤੁਹਾਡਾ ਪਾਸਵਰਡ %zu ਅੱਖਰਾਂ ਦਾ ਹੈ, ਜੋ ਕਿ %d ਦੀ ਲੰਬਾਈ ਤੋਂ ਵੱਧ ਗਿਆ ਹੈ। ਆਪਣਾ ਪਾਸਵਰਡ "
+"http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
+"changePassword ਉੱਤੇ ਛੋਟਾ ਕਰਕੇ ਮੁੜ-ਟਰਾਈ ਕਰੋ ਜੀ।"
+
+msgid "Incorrect username or password"
+msgstr "ਗਲਤ ਯੂਜ਼ਰ ਨਾਂ ਜਾਂ ਪਾਸਵਰਡ"
 
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM ਗਲਤੀ"
@@ -5415,16 +5628,6 @@ msgstr "MySpaceIM ਗਲਤੀ"
 msgid "Invalid input condition"
 msgstr "ਗਲਤ ਇੰਪੁੱਟ ਹਾਲਤ"
 
-msgid "Read buffer full (2)"
-msgstr "ਪੜ੍ਹਨ ਬਫ਼ਰ ਭਰਿਆ (2)"
-
-msgid "Unparseable message"
-msgstr "ਨਾ-ਪਾਰਸਯੋਗ ਸੁਨੇਹਾ"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "ਹੋਸਟ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "ਬੱਡੀ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
@@ -5508,6 +5711,14 @@ msgstr "ਕੁੱਲ ਦੋਸਤ"
 msgid "Client Version"
 msgstr "ਕਲਾਇਟ ਵਰਜਨ"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"ਯੂਜ਼ਰ ਨਾਂ ਸੈੱਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ। ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜਾਂ http://editprofile.myspace.com/"
+"index.cfm?fuseaction=profile.username ਨੂੰ ਆਪਣਾ ਯੂਜ਼ਰ ਨਾਂ ਸੈੱਟ ਕਰਨ ਲਈ ਵਰਤੋਂ।"
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - ਯੂਜ਼ਰ ਨਾਂ ਉਪਲੱਬਧ ਹੈ"
 
@@ -5724,9 +5935,6 @@ msgstr "ਆਪਣੇ ਆਪ ਨੂੰ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕਰ ਸ
 msgid "Master archive is misconfigured"
 msgstr "ਮਾਸਟਰ ਭੰਡਾਰ ਗਲਤ ਸੰਰਚਿਤ ਹੈ"
 
-msgid "Incorrect username or password"
-msgstr "ਗਲਤ ਯੂਜ਼ਰ ਨਾਂ ਜਾਂ ਪਾਸਵਰਡ"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "ਤੁਹਾਡੇ ਰਾਹੀਂ ਦਿੱਤੇ ਯੂਜ਼ਰ ਨਾਂ ਲਈ ਹੋਸਟ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ"
 
@@ -5765,9 +5973,10 @@ msgstr "ਯੂਜ਼ਰ ਆਫਲਾਇਨ ਹੈ ਜਾਂ ਤੁਸੀਂ ਪ�
 msgid "Unknown error: 0x%X"
 msgstr "ਅਣਜਾਣ ਗਲਤੀ: 0x%X"
 
+# , c-format
 #, c-format
-msgid "Login failed (%s)."
-msgstr "ਦਾਖਲਾ ਅਸਫਲ (%s)"
+msgid "Unable to login: %s"
+msgstr "ਲਾਗਇਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5869,9 +6078,6 @@ msgstr "GroupWise ਕਾਨਫਰੰਸ %d"
 msgid "Authenticating..."
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਜਾਰੀ..."
 
-msgid "Unable to connect to server."
-msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ।"
-
 msgid "Waiting for response..."
 msgstr "ਜਵਾਬ ਲਈ ਉਡੀਕ ਹੈ..."
 
@@ -5895,20 +6101,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "ਕੀ ਤੁਸੀਂ ਗੱਲਬਾਤ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "ਤੁਸੀਂ ਲਾਗ ਆਉਟ ਹੋ ਗਏ ਹੋ, ਕਿਉਕਿ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ ਵਰਕਸਟੇਸ਼ਨ ਉੱਤੇ ਲਾਗਇਨ ਹੋ ਗਏ ਹੋ।"
-
 #, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ਮੌਜੂਦ ਨਹੀਂ (ਆਫਲਾਇਨ) ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਰਾਹੀਂ ਭੇਜੇ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੇਗਾ।"
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ। ਜੁੜਨ ਵਾਲੇ ਸਰਵਰ ਦਾ ਐਡਰੈੱਸ ਦਿਓ ਜੀ।"
-
-msgid "Error. SSL support is not installed."
-msgstr "ਗਲਤੀ ਹੈ। SSL ਸਹਿਯੋਗ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr ""
+"ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਸਰਵਰ ਦਾ ਐਡਰੈੱਸ ਦਿਓ ਜੀ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕੁਨੈਕਟ ਕਰਨਾ ਚਾਹੁੰਦੇ "
+"ਹੋ।"
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ਇਹ ਕਾਨਫਰੰਸ ਬੰਦ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ। ਕੋਈ ਹੋਰ ਸੁਨੇਹਾ ਨਹੀਂ ਭੇਜਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
@@ -5932,24 +6135,32 @@ msgstr "ਸਰਵਰ ਐਡਰੈੱਸ"
 msgid "Server port"
 msgstr "ਸਰਵਰ ਪੋਰਟ"
 
+msgid "Received unexpected response from "
+msgstr "ਇਸ ਤੋਂ ਅਣਜਾਣ ਜਵਾਬ ਮਿਲਿਆ"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਬੜੀ ਛੇਤੀ ਨਾਲ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਿਹਾ ਹੈ। 10 ਮਿੰਟ ਲਈ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ "
+"ਤੁਸੀਂ ਕੋਸ਼ਿਸ ਜਾਰੀ ਰੱਖੀ ਤਾਂ ਤੁਹਾਨੂੰ ਹੋਰ ਵੀ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"
+
+# , c-format
+#, c-format
+msgid "Error requesting "
+msgstr "ਮੰਗ ਦੌਰਾਨ ਗਲਤੀ "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL ਤੁਹਾਡੇ ਸਕਰੀਨ ਨਾਂ ਨੂੰ ਇੱਥੇ ਪਰਮਾਣਿਤ ਕਰਨ ਨਹੀਂ ਦਿੰਦਾ ਹੈ।"
+
 msgid "Could not join chat room"
 msgstr "ਚੈਟ ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਨਹੀਂ ਹੋਇਆ ਜਾ ਸਕਿਆ"
 
 msgid "Invalid chat room name"
 msgstr "ਗਲਤ ਚੈਟ ਰੂਮ ਨਾਂ"
 
-msgid "Server closed the connection."
-msgstr "ਸਰਵਰ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਆਖਰੀ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ ਹੈ।"
 
 #. *< type
@@ -5997,8 +6208,8 @@ msgstr "ਰਿਮੋਟ ਯੂਜ਼ਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖ�
 msgid "Received invalid data on connection with remote user."
 msgstr "ਰਿਮੋਟ ਯੂਜ਼ਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ ਹੈ।"
 
-msgid "Could not establish a connection with the remote user."
-msgstr "ਰਿਮੋਟ ਯੂਜ਼ਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ ਹੈ।"
+msgid "Unable to establish a connection with the remote user."
+msgstr "ਰਿਮੋਟ ਯੂਜ਼ਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ"
 
 msgid "Direct IM established"
 msgstr "ਸਿੱਧਾ IM ਬਣਾਇਆ ਗਿਆ।"
@@ -6196,21 +6407,15 @@ msgstr "ਚੇਤਾਵਨੀ ਪੱਧਰ"
 msgid "Buddy Comment"
 msgstr "ਸੁਨੇਹੀ ਟਿੱਪਣੀ"
 
+# , c-format
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"ਪਰਮਾਣਕਿਤਾ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
 
+# , c-format
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਨਹੀਂ ਸਕਿਆ:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "BOS ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
 
 msgid "Username sent"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ ਭੇਜਿਆ"
@@ -6222,52 +6427,58 @@ msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣ ਗਿਆ ਹੈ, ਕੂਕੀ ਭੇਜ
 msgid "Finalizing connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਤਿਆਰ"
 
+# , c-format
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"ਲਾਗਇਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s ਵਾਂਗ ਲਾਗਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ-ਨਾਂ ਗਲਤ ਹੈ। "
-"ਯੂਜ਼ਰ ਨਾਂ ਇੱਕ ਵੈਧ ਈਮੇਲ ਐਡਰੈੱਸ ਚਾਹੀਦਾ ਹੈ, ਜਾਂ ਇੱਕ ਅੱਖਰ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਕੇਵਲ "
-"ਅੱਖਰ, ਨੰਬਰ, ਖਾਲੀ ਥਾਂ ਜਾਂ ਕੁਝ ਨੰਬਰ ਹੀ ਹੋ ਸਕਦੇ ਹਨ।"
+"%s ਵਾਂਗ ਲਾਗਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ-ਨਾਂ ਗਲਤ ਹੈ। ਯੂਜ਼ਰ ਨਾਂ ਇੱਕ ਵੈਧ ਈਮੇਲ ਐਡਰੈੱਸ "
+"ਚਾਹੀਦਾ ਹੈ, ਜਾਂ ਇੱਕ ਅੱਖਰ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਕੇਵਲ ਅੱਖਰ, ਨੰਬਰ, ਖਾਲੀ ਥਾਂ ਜਾਂ ਕੁਝ "
+"ਨੰਬਰ ਹੀ ਹੋ ਸਕਦੇ ਹਨ।"
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "ਗਲਤ ਯੂਜ਼ਰ-ਨਾਂ ਹੈ।"
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਛੇਤੀ ਹੀ ਬੰਦ ਹੋ ਸਕਦਾ ਹੈ। ਇਸਕਰਕੇ ਅੱਪਡੇਟ ਲਈ %s ਵੇਖੋ।"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "ਇੱਕ ਠੀਕ AIM ਲਾਗਇਨ ਹੈਂਸ਼ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫ਼ਲ।"
 
-msgid "Incorrect password."
-msgstr "ਗਲਤ ਪਾਸਵਰਡ ਹੈ।"
+msgid "Unable to get a valid login hash."
+msgstr "ਇੱਕ ਠੀਕ ਲਾਗਇਨ ਹੈਂਸ਼ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫ਼ਲ।"
+
+msgid "Received authorization"
+msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਪ੍ਰਾਪਤ ਹੋਈ"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr "ਤੁਹਾਡਾ ਅਕਾਊਂਟ ਇਸ ਸਮੇਂ ਮੁਅੱਤਲ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger ਸਰਵਿਸ ਆਰਜ਼ੀ ਤੌਰ ਉੱਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਬੜੀ ਛੇਤੀ ਨਾਲ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਿਹਾ ਹੈ। 10 ਮਿੰਟ ਲਈ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ "
-"ਤੁਸੀਂ ਕੋਸ਼ਿਸ ਜਾਰੀ ਰੱਖੀ ਤਾਂ ਤੁਹਾਨੂੰ ਹੋਰ ਵੀ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "ਤੁਹਾਡੇ ਰਾਹੀਂ ਵਰਤੇ ਜਾਣ ਵਾਲੇ ਕਲਾਇਟ ਦਾ ਵਰਜਨ ਬਹੁਤ ਪੁਰਾਣਾ ਹੈ। %s ਤੋਂ ਨਵਾਂ ਲਵੋ ਜੀ।"
 
-msgid "Could Not Connect"
-msgstr "ਜੁੜਿਆ ਨਹਾਂ ਜਾ ਸਕਦਾ ਹੈ।"
-
-msgid "Received authorization"
-msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਪ੍ਰਾਪਤ ਹੋਈ"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਬੜੀ ਛੇਤੀ ਨਾਲ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਿਹਾ ਹੈ। ਇੱਕ ਮਿੰਟ ਲਈ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ "
+"ਤੁਸੀਂ ਕੋਸ਼ਿਸ ਜਾਰੀ ਰੱਖੀ ਤਾਂ ਤੁਹਾਨੂੰ ਹੋਰ ਵੀ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr "ਦਿੱਤੀ SecurID ਕੁੰਜੀ ਗਲਤ ਹੈ।"
 
 msgid "Enter SecurID"
@@ -6276,26 +6487,6 @@ msgstr "SecurID ਦਿਓ"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "ਡਿਜ਼ੀਟਲ ਦਿੱਖ ਲਈ 6 ਡਿਜ਼ੀਟਲ ਅੰਕ ਦਿਓ"
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "ਠੀਕ ਹੈ(_O)"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਛੇਤੀ ਹੀ ਬੰਦ ਹੋ ਸਕਦਾ ਹੈ। ਇਸਕਰਕੇ ਅੱਪਡੇਟ ਲਈ %s ਵੇਖੋ।"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "ਇੱਕ ਠੀਕ AIM ਲਾਗਇਨ ਹੈਂਸ਼ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫ਼ਲ।"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਛੇਤੀ ਹੀ ਬੰਦ ਹੋ ਸਕਦਾ ਹੈ। ਅੱਪਡੇਟ ਲਈ %s ਵੇਖੋ।"
-
-msgid "Unable to get a valid login hash."
-msgstr "ਇੱਕ ਠੀਕ ਲਾਗਇਨ ਹੈਂਸ਼ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫ਼ਲ।"
-
 msgid "Password sent"
 msgstr "ਪਾਸਵਰਡ ਭੇਜਿਆ"
 
@@ -6305,12 +6496,6 @@ msgstr "ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਲਈ ਅਸਫ਼ਲ।"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "ਮੈਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰੋ ਜੀ ਤਾਂ ਕਿ ਮੈਂ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰ ਸਕਾਂ।"
 
-msgid "Authorization Request Message:"
-msgstr "ਪ੍ਰਮਾਣਿਤ ਬੇਨਤੀ ਸੁਨੇਹਾ:"
-
-msgid "Please authorize me!"
-msgstr "ਮੈਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰੋ ਜੀ!"
-
 msgid "No reason given."
 msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ।"
 
@@ -6396,20 +6581,25 @@ msgstr[0] "ਤੁਸੀਂ %hu ਸੁਨੇਹਾ %s ਵਲੋਂ ਗੁਆ ਲ�
 msgstr[1] "ਤੁਸੀਂ %hu ਸੁਨੇਹਿਆਂ %s ਵਲੋਂ ਨੂੰ ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਕਿ ਇਹ ਬਹੁਤ ਵੱਡੇ ਹਨ।"
 
 #, c-format
-msgid "You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "ਤੁਸੀਂ %hu ਸੁਨੇਹਾ %s ਵਲੋਂ ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਕਿ ਦਰ ਸੀਮਾ ਹੱਦ ਟੱਪ ਗਈ ਹੈ।"
 msgstr[1] "ਤੁਸੀਂ %hu ਸੁਨੇਹਿਆਂ %s ਵਲੋਂ ਨੂੰ ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਕਿ ਦਰ ਸੀਮਾ ਹੱਦ ਟੱਪ ਗਈ ਹੈ।"
 
 #, c-format
-msgid "You missed %hu message from %s because his/her warning level is too high."
-msgid_plural "You missed %hu messages from %s because his/her warning level is too high."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] "ਤੁਸੀਂ %hu ਸੁਨੇਹਾ %s ਵਲੋਂ ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਂਕਿ ਉਸ ਦਾ ਚੇਤਾਵਨੀ ਲੈਵਲ ਵੱਧ ਹੈ।"
 msgstr[1] "ਤੁਸੀਂ %hu ਸੁਨੇਹਿਆਂ %s ਵਲੋਂ ਨੂੰ ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਂਕਿ ਉਸ ਦਾ ਚੇਤਾਵਨੀ ਲੈਵਲ ਵੱਧ ਹੈ।"
 
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
-msgid_plural "You missed %hu messages from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
 msgstr[0] "ਤੁਸੀਂ %hu ਸੁਨੇਹਾ %s ਵਲੋਂ ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਂਕਿ ਤੁਹਾਡਾ ਚੇਤਾਵਨੀ ਲੈਵਲ ਵੱਧ ਹੈ।"
 msgstr[1] "ਤੁਸੀਂ %hu ਸੁਨੇਹਿਆਂ %s ਵਲੋਂ ਨੂੰ ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਂਕਿ ਤੁਹਾਡਾ ਚੇਤਾਵਨੀ ਲੈਵਲ ਵੱਧ ਹੈ"
 
@@ -6419,7 +6609,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "ਤੁਸੀਂ %hu ਸੁਨੇਹਾ %s ਵਲੋਂ ਨੂੰ ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਕੇ ਗੁਆ ਲਿਆ ਹੈ।"
 msgstr[1] "ਤੁਸੀਂ %hu ਸੁਨੇਹਿਆਂ %s ਵਲੋਂ ਨੂੰ ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਕੇ ਗੁਆ ਲਿਆ ਹੈ।"
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਫਲ ਹੈ: %s"
@@ -6441,6 +6631,9 @@ msgstr "ਆਨਲਾਇਨ ਹੈ"
 msgid "Member Since"
 msgstr "ਮੈਂਬਰ ਹੈ"
 
+msgid "Capabilities"
+msgstr "ਯੋਗਤਾ"
+
 msgid "Profile"
 msgstr "ਪ੍ਰੋਫਾਇਲ"
 
@@ -6514,7 +6707,8 @@ msgstr "ਅਕਾਊਂਟ ਪੁਸ਼ਟੀ ਮੰਗ"
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
-msgstr "ਗਲਤੀ 0x%04x: ਯੂਜ਼ਰ-ਨਾਂ ਫਾਰਮੈਟ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਕਿ ਦਿੱਤਾ ਯੂਜ਼ਰ ਨਾਂ ਅਸਲੀ ਨਾਲੋਂ ਵੱਖਰਾ ਹੈ।"
+msgstr ""
+"ਗਲਤੀ 0x%04x: ਯੂਜ਼ਰ-ਨਾਂ ਫਾਰਮੈਟ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਕਿ ਦਿੱਤਾ ਯੂਜ਼ਰ ਨਾਂ ਅਸਲੀ ਨਾਲੋਂ ਵੱਖਰਾ ਹੈ।"
 
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
@@ -6531,14 +6725,16 @@ msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"ਗਲਤੀ 0x%04x: ਈਮੇਲ ਐਡਰੈੱਸ ਬਦਲਣ ਲਈ ਅਸਫਲ ਹੈ, ਕਿਉਕਿ ਇਸ ਯੂਜ਼ਰ-ਨਾਂ ਲਈ ਪਹਿਲਾਂ ਹੀ ਇੱਕ "
-"ਬੇਨਤੀ ਬਕਾਇਆ ਪਈ ਹੈ।"
+"ਗਲਤੀ 0x%04x: ਈਮੇਲ ਐਡਰੈੱਸ ਬਦਲਣ ਲਈ ਅਸਫਲ ਹੈ, ਕਿਉਕਿ ਇਸ ਯੂਜ਼ਰ-ਨਾਂ ਲਈ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਬੇਨਤੀ "
+"ਬਕਾਇਆ ਪਈ ਹੈ।"
 
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
-msgstr "ਗਲਤੀ 0x%04x: ਈਮੇਲ ਐਡਰੈੱਸ ਬਦਲਣ ਲਈ ਅਸਫਲ ਹੈ, ਕਿਉਕਿ ਦਿੱਤੇ ਐਡਰੈੱਸ ਨਾਲ ਬਹੁਤ ਸਾਰੇ ਯੂਜ਼ਰ-ਨਾਂ ਸਬੰਧਤ ਹਨ।"
+msgstr ""
+"ਗਲਤੀ 0x%04x: ਈਮੇਲ ਐਡਰੈੱਸ ਬਦਲਣ ਲਈ ਅਸਫਲ ਹੈ, ਕਿਉਕਿ ਦਿੱਤੇ ਐਡਰੈੱਸ ਨਾਲ ਬਹੁਤ ਸਾਰੇ ਯੂਜ਼ਰ-ਨਾਂ ਸਬੰਧਤ "
+"ਹਨ।"
 
 #, c-format
 msgid ""
@@ -6560,7 +6756,8 @@ msgstr "%s ਦਾ ਈਮੇਲ ਐਡਰੈੱਸ %s ਹੈ"
 msgid "Account Info"
 msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ"
 
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "ਤੁਹਾਡਾ IM ਭੇਜਿਆ ਨਹੀਂ ਸੀ ਗਿਆ। ਤੁਹਾਨੂੰ IM ਚਿੱਤਰ ਭੇਜਣ ਲਈ ਸਿੱਧਾ ਜੁੜਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
 msgid "Unable to set AIM profile."
@@ -6583,11 +6780,9 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"ਪਰੋਫਾਇਲ ਦੀ ਵੱਧੋ-ਵੱਧ ਲੰਬਾਈ %d ਬਾਇਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ। ਤੁਹਾਡੇ ਲਈ ਇਸ ਨੂੰ ਛਾਂਗ (ਛੋਟਾ ਕਰ) ਦਿੱਤਾ "
-"ਹੈ।"
+"ਪਰੋਫਾਇਲ ਦੀ ਵੱਧੋ-ਵੱਧ ਲੰਬਾਈ %d ਬਾਇਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ। ਤੁਹਾਡੇ ਲਈ ਇਸ ਨੂੰ ਛਾਂਗ (ਛੋਟਾ ਕਰ) ਦਿੱਤਾ ਹੈ।"
 msgstr[1] ""
-"ਪਰੋਫਾਇਲ ਦੀ ਵੱਧੋ-ਵੱਧ ਲੰਬਾਈ %d ਬਾਇਟਾਂ ਤੋਂ ਵੱਧ ਗਈ ਹੈ।ਤੁਹਾਡੇ ਲਈ ਇਸ ਨੂੰ ਛਾਂਗ (ਛੋਟਾ ਕਰ) "
-"ਦਿੱਤਾ ਹੈ।"
+"ਪਰੋਫਾਇਲ ਦੀ ਵੱਧੋ-ਵੱਧ ਲੰਬਾਈ %d ਬਾਇਟਾਂ ਤੋਂ ਵੱਧ ਗਈ ਹੈ।ਤੁਹਾਡੇ ਲਈ ਇਸ ਨੂੰ ਛਾਂਗ (ਛੋਟਾ ਕਰ) ਦਿੱਤਾ ਹੈ।"
 
 msgid "Profile too long."
 msgstr "ਪਰੋਫਾਇਲ ਬਹੁਤ ਲੰਮਾ ਹੈ।"
@@ -6599,15 +6794,18 @@ msgid ""
 msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "ਸੁਨੇਹੇ ਦੀ ਵੱਧੋ-ਵੱਧ ਲੰਬਾਈ %d ਬਾਇਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ। ਤੁਹਾਡੇ ਲਈ ਇਸ ਨੂੰ ਛਾਂਗ (ਛੋਟਾ ਕਰ) ਦਿੱਤਾ ਹੈ।"
-msgstr[1] "ਸੁਨੇਹੇ ਦੀ ਵੱਧੋ-ਵੱਧ ਲੰਬਾਈ %d ਬਾਇਟਾਂ ਤੋਂ ਵੱਧ ਗਈ ਹੈ। ਗੇਮ ਨੇ ਤੁਹਾਡੇ ਲਈ ਇਸ ਨੂੰ ਛਾਂਗ (ਛੋਟਾ ਕਰ) ਦਿੱਤਾ ਹੈ।"
+msgstr[0] ""
+"ਸੁਨੇਹੇ ਦੀ ਵੱਧੋ-ਵੱਧ ਲੰਬਾਈ %d ਬਾਇਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ। ਤੁਹਾਡੇ ਲਈ ਇਸ ਨੂੰ ਛਾਂਗ (ਛੋਟਾ ਕਰ) ਦਿੱਤਾ ਹੈ।"
+msgstr[1] ""
+"ਸੁਨੇਹੇ ਦੀ ਵੱਧੋ-ਵੱਧ ਲੰਬਾਈ %d ਬਾਇਟਾਂ ਤੋਂ ਵੱਧ ਗਈ ਹੈ। ਗੇਮ ਨੇ ਤੁਹਾਡੇ ਲਈ ਇਸ ਨੂੰ ਛਾਂਗ (ਛੋਟਾ ਕਰ) ਦਿੱਤਾ ਹੈ।"
 
 msgid "Away message too long."
 msgstr "ਦੂਰ ਸੁਨੇਹਾ ਬਹੁਤ ਲੰਮਾ ਹੈ।"
 
+# , c-format
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6615,9 +6813,6 @@ msgstr ""
 "ਚਾਹੀਦਾ ਹੈ, ਜਾਂ ਇੱਕ ਅੱਖਰ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਕੇਵਲ ਅੱਖਰ, ਨੰਬਰ, ਖਾਲੀ ਥਾਂ ਜਾਂ ਕੁਝ "
 "ਨੰਬਰ ਹੀ ਹੋ ਸਕਦੇ ਹਨ।"
 
-msgid "Unable to Add"
-msgstr "ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "ਬੱਡੀ ਲਿਸਟ ਲੈਣ ਲਈ ਅਸਮਰੱਥ"
 
@@ -6631,9 +6826,10 @@ msgstr ""
 msgid "Orphans"
 msgstr "ਅਰਫਨ"
 
+# , c-format
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "ਬੱਡੀ %s ਨੂੰ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਪਹਿਲਾਂ ਹੀ ਬਹੁਤ ਜਿਆਦਾ ਬੱਡੀ ਤੁਹਾਡੀ ਲਿਸਟ "
@@ -6642,8 +6838,9 @@ msgstr ""
 msgid "(no name)"
 msgstr "(ਨਾਂ ਨਹੀਂ)"
 
+# , c-format
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਨੇ ਬੱਡੀ %s ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
 #, c-format
@@ -6672,7 +6869,8 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"ਯੂਜ਼ਰ %s ਨੇ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਦੀ ਬੇਨਤੀ ਹੇਠ ਦਿੱਤੇ ਕਾਰਨ ਕਰਕੇ ਠੁਕਰਾ ਦਿੱਤੀ ਹੈ:\n"
+"ਯੂਜ਼ਰ %s ਨੇ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਦੀ ਬੇਨਤੀ ਹੇਠ ਦਿੱਤੇ ਕਾਰਨ ਕਰਕੇ ਠੁਕਰਾ ਦਿੱਤੀ "
+"ਹੈ:\n"
 "%s"
 
 msgid "Authorization Denied"
@@ -6770,6 +6968,7 @@ msgstr "ਖੋਜ(_S)"
 msgid "Set User Info (web)..."
 msgstr "ਯੂਜ਼ਰ ਜਾਣਕਾਰੀ ਦਿਓ (ਵੈੱਬ)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "ਪਾਸਵਰਡ ਬਦਲੋ (ਵੈੱਬ)"
 
@@ -6799,6 +6998,9 @@ msgstr "ਈ-ਮੇਲ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ..."
 msgid "Search for Buddy by Information"
 msgstr "ਜਾਣਕਾਰੀ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ"
 
+msgid "Use clientLogin"
+msgstr "ਕਲਾਇਟਲਾਗਇਨ ਵਰਤੋਂ"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6986,6 +7188,34 @@ msgstr "ਅੱਪਡੇਟ"
 msgid "Could not change buddy information."
 msgstr "ਬੱਡੀ ਜਾਣਕਾਰੀ ਬਦਲੀ ਨਹੀਂ ਜਾ ਸਕੀ"
 
+msgid "Mobile"
+msgstr "ਮੋਬਾਇਲ"
+
+msgid "Note"
+msgstr "ਨੋਟ"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "ਬੱਡੀ ਮੀਮੋ"
+
+msgid "Change his/her memo as you like"
+msgstr "ਉਸ ਲਈ ਮੀਮੋ ਬਦਲੋ ਜਿਵੇਂ ਤੁਸੀਂ ਚਾਹੋ"
+
+msgid "_Modify"
+msgstr "ਸੋਧ(_M)"
+
+msgid "Memo Modify"
+msgstr "ਮੀਮੋ ਸੋਧ"
+
+msgid "Server says:"
+msgstr "ਸਰਵਰ ਨੇ ਕਿਹਾ:"
+
+msgid "Your request was accepted."
+msgstr "ਤੁਹਾਡੀ ਮੰਗ ਮੰਨੀ ਗਈ।"
+
+msgid "Your request was rejected."
+msgstr "ਤੁਹਾਡੀ ਮੰਗ ਰੱਦ ਕੀਤੀ ਗਈ।"
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u ਲਈ ਪਰਮਾਣਿਕਤਾ ਦੀ ਲੋੜ"
@@ -7294,6 +7524,12 @@ msgstr "<p><b>ਪਿਆਰੇ ਪੈਚ ਲੇਖਕ</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>ਰਸੀਦ</b>:<br>\n"
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>ਖਾਸ ਟੈਸਟਰ</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "ਅਤੇ ਹੋਰ ਬਹੁਤ, ਬੱਸ ਮੈਨੂੰ ਦੱਸ ਦਿਓ... ਧੰਨਵਾਦ ਸਹਿਤ!))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>ਅਤੇ ਸਾਰੇ ਮੁੰਡੇ ਪਿਛਲੇ ਕਮਰੇ ਵਿੱਚ ਹਨ...</i><br>\n"
 
@@ -7319,6 +7555,9 @@ msgstr "ਸਭ QQ ਕਉਨ ਅੱਪਡੇਟ ਕਰੋ"
 msgid "About OpenQ"
 msgstr "OpenQ ਬਾਰੇ"
 
+msgid "Modify Buddy Memo"
+msgstr "ਬੱਡੀ ਮੀਮੋ ਸੋਧ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7365,8 +7604,8 @@ msgstr "ਚਾਲੂ ਅੰਤਰਾਲ ਰੱਖੋ (ਸਕਿੰਟ)"
 msgid "Update interval (seconds)"
 msgstr "ਅੱਪਡੇਟ ਅੰਤਰਾਲ (ਸਕਿੰਟ)"
 
-msgid "Cannot decrypt server reply"
-msgstr "ਸਰਵਰ ਜਵਾਬ ਡਿਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
+msgid "Unable to decrypt server reply"
+msgstr "ਸਰਵਰ ਜਵਾਬ ਨੂੰ ਡਿਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
@@ -7390,9 +7629,6 @@ msgstr "ਐਕਟੀਵੇਸ਼ਨ ਲੋੜੀਦੀ"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਅਣਜਾਣ ਜਵਾਬ ਕੋਡ (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "ਸਰਵਰ ਜਵਾਬ ਡਿਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
-
 msgid "Requesting captcha"
 msgstr "ਕੈਪਟਚਾ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
@@ -7426,30 +7662,17 @@ msgstr ""
 "ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਅਣਜਾਣ ਜਵਾਬ ਕੋਡ (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
-
 msgid "Socket error"
 msgstr "ਸਾਕਟ ਗਲਤੀ"
 
-msgid "Unable to read from socket"
-msgstr "ਸਾਕਟ ਤੋਂ ਤਾਜ਼ਾ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-
-msgid "Write Error"
-msgstr "ਲਿਖਣ ਗਲਤੀ"
-
-msgid "Connection lost"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ"
-
 msgid "Getting server"
 msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ"
 
 msgid "Requesting token"
 msgstr "ਟੋਕਨ ਲਈ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-msgid "Couldn't resolve host"
-msgstr "ਹੋਸਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+msgid "Unable to resolve hostname"
+msgstr "ਹੋਸਟ-ਨਾਂ ਹੱਲ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 msgid "Invalid server or port"
 msgstr "ਗਲਤ ਸਰਵਰ ਜਾਂ ਪੋਰਟ"
@@ -7502,8 +7725,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ ਕਿਉਨ ਕਮਾਂਡ"
 
-msgid "Could not decrypt login reply"
-msgstr "ਲਾਗਇਨ ਜਵਾਬ ਡਿਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+msgid "Unable to decrypt login reply"
+msgstr "ਲਾਗਇਨ ਜਵਾਬ ਨੂੰ ਡਿਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 msgid "Unknown LOGIN CMD"
 msgstr "ਅਣਜਾਣ ਲਾਗਇਨ CMD"
@@ -7522,9 +7745,6 @@ msgstr "ਫਾਇਲ ਭੇਜੋ"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ਨੇ %s ਦੇ ਟਰਾਂਸਫਰ ਨੂੰ ਰੱਦ ਕੀਤਾ"
 
-msgid "Connection closed (writing)"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ (ਲਿਖਿਆ ਜਾ ਰਿਹਾ ਹੈ)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>ਗਰੁੱਪ ਟਾਇਟਲ:</b> %s<br>"
@@ -7571,23 +7791,13 @@ msgid "Starting Services"
 msgstr "ਸਰਵਿਸਾਂ ਸ਼ੁਰੂ ਕਰੋ"
 
 #, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
 msgstr "ਇੱਕ ਸੇਮ-ਟਾਈਮ ਐਡਮਿਨਸਟੇਟਰ ਨੇ %s ਸਰਵਰ ਉੱਤੇ ਅੱਗੇ ਦਿੱਤੇ ਐਲਾਨ ਕੀਤਾ ਹੈ"
 
 msgid "Sametime Administrator Announcement"
 msgstr "ਸੇਮ-ਟਾਈਮ ਐਡਮਿਨਸਟੇਟਰ ਐਲਾਨ"
 
-msgid "Connection reset"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਮੁੜ-ਸੈੱਟ ਕੀਤਾ ਗਿਆ"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "ਸਾਕਟ ਤੋਂ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "ਹੋਸਟ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਅਸਮਰੱਥ"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s ਵਲੋਂ ਐਲਾਨ"
@@ -7610,6 +7820,9 @@ msgstr "ਸਪੀਕਰ"
 msgid "Video Camera"
 msgstr "ਵੀਡਿਓ ਕੈਮਰਾ"
 
+msgid "File Transfer"
+msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ"
+
 msgid "Supports"
 msgstr "ਸਹਿਯੋਗ"
 
@@ -7668,7 +7881,8 @@ msgstr "ਕੋਈ ਸੇਮਟਾਈਮ ਕਮਿਊਨਟੀ ਸਰਵਰ ਦ�
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
-msgstr "ਮੀਨਵਾਇਲ ਅਕਾਊਂਟ %s ਲਈ ਕੋਈ ਹੋਸਟ ਜਾਂ IP ਐਡਰੈੱਸ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ। ਲਾਗਇਨ ਕਰਨ ਵਾਸਤੇ ਹੇਠਾਂ ਇੱਕ ਦਿਓ।"
+msgstr ""
+"ਮੀਨਵਾਇਲ ਅਕਾਊਂਟ %s ਲਈ ਕੋਈ ਹੋਸਟ ਜਾਂ IP ਐਡਰੈੱਸ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ। ਲਾਗਇਨ ਕਰਨ ਵਾਸਤੇ ਹੇਠਾਂ ਇੱਕ ਦਿਓ।"
 
 msgid "Meanwhile Connection Setup"
 msgstr "ਮੀਨਵਾਇਲ ਕੁਨੈਕਸ਼ਨ ਸੈੱਟਅੱਪ"
@@ -7786,7 +8000,8 @@ msgstr "ਗਰੁੱਪ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: ਗ
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
-msgstr "ਪਛਾਣਕਰਤਾ '%s' ਤੁਹਾਡੀ ਸੇਮ-ਟਾਈਮ ਕਮਿਊਨਟੀ ਵਿੱਚ ਕਿਸੇ ਨੋਟ ਐਡਰੈੱਸ ਬੁੱਕ ਗਰੁੱਪ ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ ਹੈ।"
+msgstr ""
+"ਪਛਾਣਕਰਤਾ '%s' ਤੁਹਾਡੀ ਸੇਮ-ਟਾਈਮ ਕਮਿਊਨਟੀ ਵਿੱਚ ਕਿਸੇ ਨੋਟ ਐਡਰੈੱਸ ਬੁੱਕ ਗਰੁੱਪ ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ ਹੈ।"
 
 msgid "Notes Address Book Group"
 msgstr "ਨੋਟ ਐਡਰੈੱਸ ਕਿਤਾਬ ਗਰੁੱਪ"
@@ -7830,7 +8045,8 @@ msgstr "ਇੱਕ ਯੂਜ਼ਰ ਲਈ ਖੋਜ"
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
-msgstr "ਆਪਣੀ ਸੇਮ-ਟਾਈਮ ਕਮਿਊਨਟੀ ਵਿੱਚ ਰਲਦੇ ਯੂਜ਼ਰ ਖੋਜਣ ਵਾਸਤੇ ਅੱਗੇ ਖੇਤਰ ਵਿੱਚ ਨਾਂ ਜਾਂ ਅਧੂਰਾ ID ਦਿਓ।"
+msgstr ""
+"ਆਪਣੀ ਸੇਮ-ਟਾਈਮ ਕਮਿਊਨਟੀ ਵਿੱਚ ਰਲਦੇ ਯੂਜ਼ਰ ਖੋਜਣ ਵਾਸਤੇ ਅੱਗੇ ਖੇਤਰ ਵਿੱਚ ਨਾਂ ਜਾਂ ਅਧੂਰਾ ID ਦਿਓ।"
 
 msgid "User Search"
 msgstr "ਯੂਜ਼ਰ ਖੋਜ"
@@ -7966,12 +8182,14 @@ msgstr "ਠੀਕ ਯੂਜ਼ਰ ਚੁਣੋ"
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
-msgstr "ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਯੂਜ਼ਰ ਇੱਕ ਪਬਲਿਕ ਕੁੰਜੀ ਨਾਲ ਮਿਲੇ ਹਨ। ਲਿਸਟ ਵਿੱਚ ਬੱਡੀ ਨੂੰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਠੀਕ ਯੂਜ਼ਰ ਚੁਣੋ।"
+msgstr ""
+"ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਯੂਜ਼ਰ ਇੱਕ ਪਬਲਿਕ ਕੁੰਜੀ ਨਾਲ ਮਿਲੇ ਹਨ। ਲਿਸਟ ਵਿੱਚ ਬੱਡੀ ਨੂੰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਠੀਕ ਯੂਜ਼ਰ ਚੁਣੋ।"
 
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
-msgstr "ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਯੂਜ਼ਰ ਇਸੇ ਨਾਂ ਨਾਲ ਹੀ ਲੱਭੇ ਹਨ। ਲਿਸਟ ਵਿੱਚ ਬੱਡੀ ਨੂੰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਠੀਕ ਯੂਜ਼ਰ ਚੁਣੋ।"
+msgstr ""
+"ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਯੂਜ਼ਰ ਇਸੇ ਨਾਂ ਨਾਲ ਹੀ ਲੱਭੇ ਹਨ। ਲਿਸਟ ਵਿੱਚ ਬੱਡੀ ਨੂੰ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਠੀਕ ਯੂਜ਼ਰ ਚੁਣੋ।"
 
 msgid "Detached"
 msgstr "ਅੱਡ"
@@ -8095,6 +8313,7 @@ msgstr "<br><b>ਚੈਨਲ HMAC:</b> %s"
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>ਚੈਨਲ ਵਿਸ਼ਾ:</b><br>%s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>ਚੈਨਲ ਮੋਡ:</b> "
 
@@ -8119,6 +8338,7 @@ msgstr "ਚੈਨਲ ਪ੍ਹੈਰਾ"
 msgid "Channel Public Keys List"
 msgstr "ਚੈਨਲ ਪਬਲਿਕ ਕੁੰਜੀ ਲਿਸਟ"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8193,7 +8413,8 @@ msgid "Set Secret Channel"
 msgstr "ਗੁਪਤ ਚੈਨਲ ਸੈੱਟ ਕਰੋ"
 
 #, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr "ਤੁਹਾਨੂੰ ਪ੍ਰਾਈਵੇਟ ਗਰੁੱਪ ਵਿੱਚ ਦਾਖਲ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ %s ਚੈਨਲ ਵਿੱਚ ਦਾਖਲ ਹੋਣਾ ਪਵੇਗਾ"
 
 msgid "Join Private Group"
@@ -8303,9 +8524,6 @@ msgstr "ਸੰਗਠਨ"
 msgid "Unit"
 msgstr "ਯੂਨਿਟ"
 
-msgid "Note"
-msgstr "ਨੋਟ"
-
 msgid "Join Chat"
 msgstr "ਚੈਟ ਜੁਆਇੰਨ"
 
@@ -8405,6 +8623,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ਨੈੱਟਵਰਕ ਅੰਕੜੇ"
 
+msgid "Ping"
+msgstr "ਪਿੰਗ"
+
 msgid "Ping failed"
 msgstr "ਪਿੰਗ ਅਸਫਲ"
 
@@ -8468,36 +8689,34 @@ msgstr "ਨਾ ਸਹਾਇਕ ਪਬਲਿਕ ਕੁੰਜੀ ਕਿਸਮ"
 msgid "Disconnected by server"
 msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
 
-msgid "Error during connecting to SILC Server"
-msgstr "SILC ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਸਮੱਸਿਆ ਹੈ"
+msgid "Error connecting to SILC Server"
+msgstr "SILC ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
 msgid "Key Exchange failed"
 msgstr "ਕੁੰਜੀ ਤਬਾਦਲਾ ਅਸਫਲ"
 
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "ਮੁੜ-ਜੁੜਨ ਸਮੇਂ ਸ਼ੈਸ਼ਨ ਅਸਫਲ ਹੈ। ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਮੁੜ-ਜੁੜੋ ਨੂੰ ਦਬਾਓ।"
 
-msgid "Connection failed"
-msgstr "ਸੰਬੰਧ ਅਸਫਲ"
-
 msgid "Performing key exchange"
 msgstr "ਕੁੰਜੀ ਤਬਾਦਲਾ ਜਾਰੀ"
 
-msgid "Unable to create connection"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ।"
-
-msgid "Could not load SILC key pair"
-msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+msgid "Unable to load SILC key pair"
+msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC ਸਰਵਰ ਨਾਲ ਜੁੜ ਰਿਹਾ ਹੈ"
 
+msgid "Unable to not load SILC key pair"
+msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
 msgid "Out of memory"
 msgstr "ਮੈਮੋਰੀ ਤੋਂ ਬਾਹਰ"
 
-msgid "Cannot initialize SILC protocol"
-msgstr "SILC ਪਰੋਟੋਕਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
+msgid "Unable to initialize SILC protocol"
+msgstr "SILC ਪਰੋਟੋਕਾਲ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 msgid "Error loading SILC key pair"
 msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
@@ -8509,6 +8728,7 @@ msgstr "%s ਡਾਊਨਲੋਡ: %s"
 msgid "Your Current Mood"
 msgstr "ਤੁਹਾਡਾ ਮੌਜੂਦਾ ਚਿੱਤ"
 
+#, c-format
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
@@ -8654,7 +8874,8 @@ msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+"query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  ਸਰਵਰ ਦਾ ਦਿਨ ਦਾ ਸੁਨੇਹਾ ਵੇਖੋ"
@@ -8784,8 +9005,8 @@ msgstr "ਡਿਜ਼ੀਟਲ ਦਸਤਖਤ ਅਤੇ ਸਭ ਸੁਨੇਹ�
 msgid "Creating SILC key pair..."
 msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ\n"
+msgid "Unable to create SILC key pair"
+msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -8878,60 +9099,68 @@ msgstr "ਵਾਇਟਬੋਰਡ"
 msgid "No server statistics available"
 msgstr "ਕੋਈ ਸਰਵਰ ਅੰਕੜੇ ਉਪਲੱਬਧ ਨਹੀਂ"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਸਮੱਸਿਆ ਹੈ"
+
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "ਅਸਫਲ: ਵਰਜਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਨਵੇਂ ਕਲਾਇਟ ਦੀ ਲੋੜ ਹੈ"
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਤੁਹਾਡੀ ਪਬਲਿਕ ਕੁੰਜੀ ਉੱਤੇ ਭਰੋਸਾ/ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਦਿੱਤੇ KE ਗਰੁੱਪ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਦਿੱਤੇ ਸੀਫ਼ਰ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਦਿੱਤੇ PKCS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਦਿੱਤੇ ਹੈਂਸ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "ਅਸਫਲ: ਰਿਮੋਟ ਦਿੱਤੇ HMAC ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "ਗਲਸ: ਗਲਤ ਦਸਤਖਤ"
 
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "ਅਸਫਲ: ਗਲਤ ਕੂਕੀ"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "ਅਸਫ਼ਲ: ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫ਼ਲ"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "SILC ਕਲਾਇਟ ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
+msgid "Unable to initialize SILC Client connection"
+msgstr "SILC ਕਲਾਇਟ ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 msgid "John Noname"
 msgstr "ਜਾਨ ਬਿਨ-ਨਾਂ"
 
+# , c-format
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
-
-msgid "Could not write"
-msgstr "ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-
-msgid "Could not connect"
-msgstr "ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+msgid "Unable to load SILC key pair: %s"
+msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
 
-msgid "Unknown server response."
-msgstr "ਅਣਜਾਣ ਸਰਵਰ ਜਵਾਬ ਹੈ।"
+msgid "Unable to create connection"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ।"
 
-msgid "Could not create listen socket"
-msgstr "ਸੁਣਨ ਸਾਕਟ ਬਣ ਨਹੀਂ ਸਕੀ ਹੈ"
+msgid "Unknown server response"
+msgstr "ਅਣਜਾਣ ਸਰਵਰ ਜਵਾਬ"
 
-msgid "Could not resolve hostname"
-msgstr "ਹੋਸਟ-ਨਾਂ ਹੱਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+msgid "Unable to create listen socket"
+msgstr "ਲਿਸਟ ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਫਲ"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP ਸਕਰੀਨ ਨਾਂ ਵਿੱਚ ਖਾਲੀ ਥਾਂ ਜਾਂ @ ਨਿਸ਼ਾਨ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ"
@@ -8972,161 +9201,60 @@ msgstr "ਪਰਮਾਣਿਤ ਯੂਜ਼ਰ"
 msgid "Auth Domain"
 msgstr "ਪਰਮਾਣਿਤ ਡੋਮੇਨ"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "ਦਾਖਲ: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "ਫਾਇਲ %s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "ਫਾਇਲ %s ਪੜਨ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "ਸੁਨੇਹਾ ਬਹੁਤ ਲੰਮਾ ਹੈ, ਆਖਰੀ %s ਬਾਈਟ ਹਟਾਏ ਗਏ ਹਨ।"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s ਇਸ ਸਮੇਂ ਲਾਗਇਨ ਨਹੀਂ ਹੈ।"
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s ਲਈ ਉਡੀਕ ਸਵੀਕਾਰ ਨਹੀਂ ਹੈ।"
-
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "ਇੱਕ ਸੁਨੇਹਾ ਗੁਆ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਤੁਸੀਂ ਸਰਵਰ ਗਤੀ ਸੀਮਾ ਤੋਂ ਵੱਧ ਗਏ ਹੋ।"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s ਵਿੱਚ ਗੱਲਬਾਤ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "ਤੁਸੀਂ %s ਨੂੰ ਸੁਨੇਹੇ ਬਹੁਤ ਤੇਜ਼ੀ ਨਾਲ ਭੇਜ ਰਹੇ ਹੋ।"
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "ਤੁਸੀਂ %s ਤੋਂ ਇੱਕ IM ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਕਿ ਇਹ ਵੱਡਾ ਸੀ"
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "ਤੁਸੀਂ %s ਤੋਂ ਇੱਕ IM ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਕਿ ਇਹ ਬਹੁਤ ਤੇਜ਼ੀ ਨਾਲ ਭੇਜਿਆ ਗਿਆ ਹੈ।"
-
-msgid "Failure."
-msgstr "ਅਸਫਲ ਹੈ।"
-
-msgid "Too many matches."
-msgstr "ਬਹੁਤ ਮੇਲ ਹਨ।"
-
-msgid "Need more qualifiers."
-msgstr "ਹੋਰ ਯੋਗਤਾ ਦੀ ਲੋੜ ਹੈ।"
-
-msgid "Dir service temporarily unavailable."
-msgstr "ਡਾਈ ਸਰਵਿਸ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
-
-msgid "Email lookup restricted."
-msgstr "ਈਮੇਲ ਖੋਜ ਪਾਬੰਦੀ ਹੈ।"
-
-msgid "Keyword ignored."
-msgstr "ਸ਼ਬਦ ਅਣਡਿੱਠਾ"
-
-msgid "No keywords."
-msgstr "ਕੋਈ ਸ਼ਬਦ ਨਹੀਂ ਹੈ।"
-
-msgid "User has no directory information."
-msgstr "ਯੂਜ਼ਰ ਦੀ ਕੋਈ ਡਾਇਰੈਕਟਰੀ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ।"
-
-msgid "Country not supported."
-msgstr "ਦੇਸ਼ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "ਅਣਜਾਣੀ ਅਸਫਲਤਾ: %s"
-
-msgid "Incorrect username or password."
-msgstr "ਗਲਤ ਯੂਜ਼ਰ-ਨਾਂ ਜਾਂ ਪਾਸਵਰਡ।"
-
-msgid "The service is temporarily unavailable."
-msgstr "ਸਰਵਿਸ ਆਰਜ਼ੀ ਤੌਰ ਉੱਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
-
-msgid "Your warning level is currently too high to log in."
-msgstr "ਤੁਹਾਡਾ ਚੇਤਾਵਨੀ ਲੈਵਲ ਇੰਨਾ ਜ਼ਿਆਦਾ ਹੈ ਕਿ ਲਾਗਇਨ ਨਹੀਂ ਹੋਇਆ ਜਾਂਦਾ ਹੈ।"
-
-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 ""
-"ਤੁਸੀਂ ਲਗਾਤਾਰ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਹੇ ਹੋ। ਦਸ ਮਿੰਟ ਦੀ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ "
-"ਕੀਤੀ ਤਾਂ ਹੋਰ ਵੀ ਵਧੇਰੇ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "ਇੱਕ ਅਣਜਾਣੀ ਦਾਖਲਾ ਗਲਤੀ ਆਈ ਹੈ: %s"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "ਅਣਜਾਣੀ ਗਲਤੀ, %d,ਆਈ ਹੈ।  ਜਾਣਕਾਰੀ: %s"
-
-msgid "Invalid Groupname"
-msgstr "ਗਲਤ ਗਰੁੱਪ-ਨਾਂ"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  ਯਾਹੂ ਨੈੱਟਵਰਕ ਉੱਤੇ ਇੱਕ ਚੈਟ ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
 
-msgid "Connection Closed"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਹੋਇਆ"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: ਯਾਹੂ ਨੈੱਟਵਰਕ ਉੱਤੇ ਰੂਮ ਲਿਸਟ ਵੇਖੋ"
 
-msgid "Waiting for reply..."
-msgstr "ਜਵਾਬ ਦੀ ਉਡੀਕ ਜਾਰੀ ਹੈ..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "ਡੂਡਲ: ਯੂਜ਼ਰ ਨੂੰ ਇੱਕ ਘੁੱਗੂ ਘਾਂਘੜੇ (ਡੂਡਲ) ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਮੰਗ"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC ਆਪਣੀ ਵਿਰਾਮ ਸਥਿਤੀ ਤੋਂ ਵਾਪਿਸ ਹੋਇਆ। ਹੁਣ ਤੁਸੀਂ ਸੁਨੇਹੇ ਭੇਜ ਸਕਦੇ ਹੋ।"
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
 
-msgid "Password Change Successful"
-msgstr "ਪਾਸਵਰਡ ਸਫਲਤਾਪੂਰਕ ਤਬਦੀਲ ਕੀਤਾ ਗਿਆ"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
 
-msgid "_Group:"
-msgstr "ਗਰੁੱਪ(_G):"
+msgid "Pager server"
+msgstr "ਪੇਜ਼ਰ ਸਰਵਰ"
 
-msgid "Get Dir Info"
-msgstr "ਡਾਇ ਜਾਣਕਾਰੀ ਲਵੋ"
+msgid "Pager port"
+msgstr "ਪੇਜ਼ਰ ਪੋਰਟ"
 
-msgid "Set Dir Info"
-msgstr "ਡਾਇ ਜਾਣਕਾਰੀ ਦਿਓ"
+msgid "File transfer server"
+msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਰਵਰ"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "%s ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ!"
+msgid "File transfer port"
+msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਪੋਰਟ"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "ਫਾਇਲ ਸੰਚਾਰ ਅਸਫਲ ਹੈ; ਦੂਜੇ ਪਾਸੇ ਤੋਂ ਰੱਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
+msgid "Chat room locale"
+msgstr "ਚੈਟ ਰੂਮ ਭਾਸ਼ਾ"
 
-msgid "Could not connect for transfer."
-msgstr "ਭੇਜਣ ਲਈ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
+msgid "Ignore conference and chatroom invitations"
+msgstr "ਕਨਫਰੰਸ ਅਤੇ ਚੈਟ-ਰੂਮ ਸੱਦੇ ਅਣਡਿੱਠੇ ਕਰੋ"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "ਫਾਇਲ ਸਿਰਲੇਖ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਇਹ ਫਾਇਲ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੇਗੀ।"
+msgid "Chat room list URL"
+msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਿਸਟ Url"
 
-msgid "Save As..."
-msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
+msgid "Yahoo Chat server"
+msgstr "ਯਾਹੂ ਚੈਟ ਸਰਵਰ"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s ਨੇ %s ਨੂੰ %d ਫਾਇਲ ਸਵੀਕਾਰ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ: %s (%.2f %s)%s%s"
-msgstr[1] "%s ਨੇ %s ਨੂੰ %d ਫਾਇਲਾਂ ਸਵੀਕਾਰ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo ਚੈਟ ਪੋਰਟ"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਫਾਇਲ ਭੇਜਣ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo ਜਾਪਾਨ ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9138,12 +9266,11 @@ msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਫਾਇਲ ਭੇਜਣ ਦੀ ਬੇ�
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! ਜਾਪਾਨ ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ਨੇ ਇੱਕ ਵੈੱਬ-ਕੈਮ ਸੱਦਾ ਭੇਜਿਆ ਹੈ, ਜੋ ਕਿ ਹਾਲੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
+msgid "Your SMS was not delivered"
+msgstr "ਤੁਹਾਡਾ SMS ਨਹੀਂ ਭੇਜਿਆ ਗਿਆ"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "ਤੁਹਾਡਾ Yahoo! ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ ਹੈ।"
@@ -9167,6 +9294,29 @@ msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਉਸ ਦੀ ਬੱਡੀ ਲਿਸਟ
 msgid "Add buddy rejected"
 msgstr "ਬੱਡੀ ਸ਼ਾਮਿਲ ਕਰਨਾ ਠੁਕਰਾਇਆ"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"ਅਕਾਊਂਟ ਲਾਕ ਹੋਇਆ: ਬਹੁਤ ਸਾਰੀਆਂ ਲਾਗਇਨ ਕੋਸ਼ਿਸ਼ ਕਰਕੇ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ "
+"ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"ਅਕਾਊਂਟ ਲਾਕ ਹੋਇਆ: ਅਣਜਾਣ ਕਾਰਨ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ ਜਾਂ ਪਾਸਵਰਡ ਮੌਜੂਦ ਨਹੀਂ"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9195,40 +9345,34 @@ msgstr "ਤੁਹਾਡਾ ਅਕਾਊਂਟ ਤਾਲਾਬੰਦ ਹੈ, Yaho
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "ਅਣਜਾਣੀ ਗਲਤੀ ਨੰਬਰ %d ਹੈ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
+msgstr ""
+"ਅਣਜਾਣੀ ਗਲਤੀ ਨੰਬਰ %d ਹੈ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
 
+# , c-format
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "ਸੁਨੇਹੀ %s ਨੂੰ ਗਰੁੱਪ %s ਵਿੱਚ ਸਰਵਰ ਲਿਸਟ ਉੱਤੇ ਅਕਾਊਂਟ %s ਲਈ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr ""
+"ਸੁਨੇਹੀ %s ਨੂੰ ਗਰੁੱਪ %s ਵਿੱਚ ਸਰਵਰ ਲਿਸਟ ਉੱਤੇ ਅਕਾਊਂਟ %s ਲਈ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "ਸਰਵਰ ਲਿਸਟ ਵਿੱਚ ਬੱਡੀ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ ਸੁਣਨਯੋਗ %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "ਸਰਵਰ ਤੋਂ ਅਚਾਨਕ HTTP ਜਵਾਬ ਮਿਲਿਆ ਹੈ।"
 
-msgid "Connection problem"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਸਮੱਸਿਆ"
-
+# , c-format
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"%s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਟੁੱਟ ਗਿਆ ਹੈ:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "%s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਟੁੱਟ ਗਿਆ ਹੈ: %s"
 
+# , c-format
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"%s ਨਾਲ ਕੁਨੈਕਸਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "%s ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s"
 
 msgid "Not at Home"
 msgstr "ਘਰੇ ਨਹੀਂ"
@@ -9275,8 +9419,8 @@ msgstr "ਮੌਜੂਦਗੀ ਸੈਟਿੰਗ"
 msgid "Start Doodling"
 msgstr "ਘੁੱਗੂ ਘਾਂਘੜੇ (ਡੂਡਲ) ਸਟਾਰਟ"
 
-msgid "Activate which ID?"
-msgstr "ਕਿਹੜਾ ID ਐਕਟੀਵੇਟ ਕਰਨਾ ਹੈ?"
+msgid "Select the ID you want to activate"
+msgstr "ID ਚੁਣੋ, ਜੋ ਤੁਸੀਂ ਸਰਗਰਮ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ"
 
 msgid "Join whom in chat?"
 msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਕਿਸ ਨਾਲ ਜੁਆਇੰਨ?"
@@ -9290,73 +9434,15 @@ msgstr "ਚੈਟ ਵਿੱਚ ਯੂਜ਼ਰ ਜੁਆਇੰਨ..."
 msgid "Open Inbox"
 msgstr "ਇਨ-ਬਾਕਸ ਖੋਲ੍ਹੋ"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  ਯਾਹੂ ਨੈੱਟਵਰਕ ਉੱਤੇ ਇੱਕ ਚੈਟ ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: ਯਾਹੂ ਨੈੱਟਵਰਕ ਉੱਤੇ ਰੂਮ ਲਿਸਟ ਵੇਖੋ"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "ਡੂਡਲ: ਯੂਜ਼ਰ ਨੂੰ ਇੱਕ ਘੁੱਗੂ ਘਾਂਘੜੇ (ਡੂਡਲ) ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਮੰਗ"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo ਜਾਪਾਨ"
-
-msgid "Pager server"
-msgstr "ਪੇਜ਼ਰ ਸਰਵਰ"
-
-msgid "Japan Pager server"
-msgstr "ਜਾਪਾਨ ਪੇਜ਼ਰ ਸਰਵਰ"
-
-msgid "Pager port"
-msgstr "ਪੇਜ਼ਰ ਪੋਰਟ"
-
-msgid "File transfer server"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਰਵਰ"
-
-msgid "Japan file transfer server"
-msgstr "ਜਾਪਾਨ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਰਵਰ"
-
-msgid "File transfer port"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਪੋਰਟ"
-
-msgid "Chat room locale"
-msgstr "ਚੈਟ ਰੂਮ ਭਾਸ਼ਾ"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "ਕਨਫਰੰਸ ਅਤੇ ਚੈਟ-ਰੂਮ ਸੱਦੇ ਅਣਡਿੱਠੇ ਕਰੋ"
-
-msgid "Chat room list URL"
-msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਿਸਟ Url"
-
-msgid "Yahoo Chat server"
-msgstr "ਯਾਹੂ ਚੈਟ ਸਰਵਰ"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo ਚੈਟ ਪੋਰਟ"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "ਘੁੱਗੂ ਘਾਂਘੜੇ (ਡੂਡਲ) ਮੰਗ ਭੇਜੋ।"
 
+msgid "Unable to connect."
+msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
+
 msgid "Unable to establish file descriptor."
 msgstr "ਫਾਇਲ ਵੇਰਵਾ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ।"
 
@@ -9364,6 +9450,9 @@ msgstr "ਫਾਇਲ ਵੇਰਵਾ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s ਤੁਹਾਨੂੰ %d ਫਾਇਲਾਂ ਦਾ ਗਰੁੱਪ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ ਹੈ।।\n"
 
+msgid "Write Error"
+msgstr "ਲਿਖਣ ਗਲਤੀ"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! ਜਾਪਾਨ ਪ੍ਰੋਫਾਇਲ"
 
@@ -9406,7 +9495,8 @@ msgstr "ਵਧੀਆ ਲਿੰਕ 3"
 msgid "Last Update"
 msgstr "ਆਖਰੀ ਅੱਪਡੇਟ"
 
-msgid "This profile is in a language or format that is not supported at this time."
+msgid ""
+"This profile is in a language or format that is not supported at this time."
 msgstr "ਇਹ ਪ੍ਰੋਫਾਇਲ ਉਸ ਭਾਸ਼ਾ ਜਾਂ ਫਾਰਮੈਟ ਵਿੱਚ ਹੈ, ਜੋ ਕਿ ਅਜੇ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
 msgid ""
@@ -9476,23 +9566,18 @@ msgstr "ਆਵਾਜ਼"
 msgid "Webcams"
 msgstr "ਵੈਬਕੈਮ"
 
+msgid "Connection problem"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਸਮੱਸਿਆ"
+
 msgid "Unable to fetch room list."
 msgstr "ਰੂਮ ਲਿਸਟ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
 msgid "User Rooms"
 msgstr "ਯੂਜਰ ਰੂਮ"
 
-msgid "Connection problem with the YCHT server."
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਸਮੱਸਿਆ ਹੈ।"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9541,9 +9626,11 @@ msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instance&gt;: Set the instance to be used on this class"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: ਗੱਲਬਾਤ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
+msgstr ""
+"sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: ਗੱਲਬਾਤ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
 
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;instance&gt;: &lt;message,<i>instance</i>,* ਨੂੰ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ&gt;"
 
 msgid ""
@@ -9613,33 +9700,24 @@ msgstr "ਰੀਲੇਮ"
 msgid "Exposure"
 msgstr "Exposure"
 
+# , c-format
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "HTTP ਪਰਾਕਸੀ ਤੋਂ ਜਵਾਬ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "HTTP ਪਰਾਕਸੀ ਤੋਂ ਜਵਾਬ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP ਪਰਾਕਸੀ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ %d"
 
+# , c-format
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "ਪਹੁੰਚ ਪਾਬੰਦੀ ਹੈ: HTTP ਪਰਾਕਸੀ ਸਰਵਰ ਨੇ ਪੋਰਟ %d ਟਨਲਿੰਗ ਓਹਲੇ ਰੱਖੀ ਹੈ।"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "%s ਹੱਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-msgid "Could not resolve host name"
-msgstr "ਹੋਸਟ ਨਾਂ ਹੱਲ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "%s ਦੇ ਧਿਆਨ ਦੀ ਮੰਗ ਕੀਤੀ ਗਈ ਹੈ..."
@@ -9726,9 +9804,6 @@ msgstr "ਤੰਗ ਨਾ ਕਰੋ"
 msgid "Extended away"
 msgstr "ਪਹੁੰਚ ਤੋਂ ਦੂਰ"
 
-msgid "Mobile"
-msgstr "ਮੋਬਾਇਲ"
-
 msgid "Listening to music"
 msgstr "ਸੰਗੀਤ ਸੁਣ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
 
@@ -9770,18 +9845,6 @@ msgstr "++ %s ਨਾ-ਵੇਹਲਾ ਹੋਇਆ"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"ਤੁਹਾਡੀ %s ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ। ਉਨ੍ਹਾਂ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ, ਅਤੇ ਪੁਰਾਣੀ ਫਾਇਲ ਦਾ "
-"ਨਾਂ %s~ ਬਦਲਿਆ ਗਿਆ ਹੈ।"
-
 msgid "Calculating..."
 msgstr "ਗਿਣਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
@@ -9865,25 +9928,43 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਹੋਰ ਸਾਫਟਵੇਅਰਾਂ ਵਲੋਂ ਰੋਕਿਆ।"
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "ਰਿਮੋਟ ਹੋਸਟ ਨੇ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕਰ ਦਿੱਤਾ ਹੈ।"
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "ਕੁਨੈਕਸ਼ਨ ਟਾਈਮ-ਆਉਟ ਹੋਇਆ।"
 
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ।"
 
 #. 10048
+#, c-format
 msgid "Address already in use."
 msgstr "ਐਡਰੈੱਸ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ।"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ"
+
+# , c-format
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"ਤੁਹਾਡੀ %s ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ। ਉਨ੍ਹਾਂ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ, ਅਤੇ ਪੁਰਾਣੀ ਫਾਇਲ ਦਾ "
+"ਨਾਂ %s~ ਬਦਲਿਆ ਗਿਆ ਹੈ।"
+
 msgid "Internet Messenger"
 msgstr "ਇੰਟਰਨੈਟ ਮੈਸੰਜ਼ਰ"
 
@@ -9926,10 +10007,8 @@ msgstr "ਨਵੀਂ ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ(_m)"
 msgid "Use this buddy _icon for this account:"
 msgstr "ਇਹ ਅਕਾਊਂਟ ਲਈ ਇਹ ਬੱਡੀ ਆਈਕਾਨ ਵਰਤੋਂ(_i):"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s ਚੋਣ"
+msgid "Ad_vanced"
+msgstr "ਤਕਨੀਕੀ(_v)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "ਗਨੋਮ ਪਰਾਕਸੀ ਸੈਟਿੰਗ ਵਰਤੋਂ"
@@ -9964,9 +10043,6 @@ msgstr "ਜੇਕਰ ਤੁਸੀਂ ਧਿਆਨ ਨਾਲ ਵੇਖੋ"
 msgid "you can see the butterflies mating"
 msgstr "ਤੁਸੀਂ ਤਿੱਤਲੀ ਮੇਲ ਵੇਖ ਸਕਦੇ ਹੋ"
 
-msgid "Proxy Options"
-msgstr "ਪਰਾਕਸੀ ਚੋਣ"
-
 msgid "Proxy _type:"
 msgstr "ਪਰਾਕਸੀ ਕਿਸਮ(_t):"
 
@@ -9994,8 +10070,8 @@ msgstr "ਬੇਸਿਕ(_B)"
 msgid "Create _this new account on the server"
 msgstr "ਸਰਵਰ ਉੱਤੇ ਇਹ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ(_t)"
 
-msgid "_Advanced"
-msgstr "ਤਕਨੀਕੀ(_A)"
+msgid "P_roxy"
+msgstr "ਪਰਾਕਸੀ(_r)"
 
 msgid "Enabled"
 msgstr "ਯੋਗ ਕੀਤਾ"
@@ -10017,16 +10093,17 @@ msgid ""
 msgstr ""
 "<span size='larger' weight='bold'>%s ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ!</span>\n"
 "\n"
-"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਵੀ IM ਅਕਾਊਂਟ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ। %s ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਵਾਸਤੇ ਹੇਠਾਂ <b>ਸ਼ਾਮਲ...</b> ਬਟਨ "
-"ਦੱਬੋ ਅਤੇ ਆਪਣਾ ਪਹਿਲਾਂ ਅਕਾਊਂਟ ਸੰਰਚਿਤ ਕਰੋ। ਜੇ ਤੁਸੀਂ %s ਨੂੰ ਕਈ IM ਅਕਾਊਂਟਾਂ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨਾ ਚਾਹੁੰਦੇ "
-"ਹੋ ਤਾਂ ਸਭ ਦੀ ਸੰਰਚਨਾ ਲਈ <b>ਸ਼ਾਮਲ...</b> ਨੂੰ ਫੇਰ ਦੱਬੋ।\n"
+"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਵੀ IM ਅਕਾਊਂਟ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ। %s ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਵਾਸਤੇ ਹੇਠਾਂ <b>ਸ਼ਾਮਲ...</b> "
+"ਬਟਨ ਦੱਬੋ ਅਤੇ ਆਪਣਾ ਪਹਿਲਾਂ ਅਕਾਊਂਟ ਸੰਰਚਿਤ ਕਰੋ। ਜੇ ਤੁਸੀਂ %s ਨੂੰ ਕਈ IM ਅਕਾਊਂਟਾਂ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨਾ "
+"ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸਭ ਦੀ ਸੰਰਚਨਾ ਲਈ <b>ਸ਼ਾਮਲ...</b> ਨੂੰ ਫੇਰ ਦੱਬੋ।\n"
 "\n"
-"ਤੁਸੀਂ ਇਹ ਵਿੰਡੋ ਉੱਤੇ ਬੇਲੀ (ਬੱਡੀ) ਲਿਸਟ ਵਿੰਡੋ ਵਿੱਚ <b>ਅਕਾਊਂਟ->ਅਕਾਊਂਟ ਪਰਬੰਧ</b> ਰਾਹੀਂ ਅਕਾਊਂਟ ਸ਼ਾਮਲ, ਸੋਧਣ ਜਾਂ "
-"ਹਟਾਉਣ ਵਾਸਤੇ ਆ ਸਕਦੇ ਹੋ।"
+"ਤੁਸੀਂ ਇਹ ਵਿੰਡੋ ਉੱਤੇ ਬੇਲੀ (ਬੱਡੀ) ਲਿਸਟ ਵਿੰਡੋ ਵਿੱਚ <b>ਅਕਾਊਂਟ->ਅਕਾਊਂਟ ਪਰਬੰਧ</b> ਰਾਹੀਂ ਅਕਾਊਂਟ "
+"ਸ਼ਾਮਲ, ਸੋਧਣ ਜਾਂ ਹਟਾਉਣ ਵਾਸਤੇ ਆ ਸਕਦੇ ਹੋ।"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "ਤੁਹਾਡੇ ਕੋਲ %d ਸੰਪਰਕ %s ਨਾਂ ਨਾਲ ਹਨ। ਕੀ ਤੁਸੀਂ ਮਿਲਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 msgstr[1] "ਤੁਹਾਡੇ ਕੋਲ ਇਸ ਸਮੇਂ %d ਸੰਪਰਕ %s ਨਾਂ ਨਾਲ ਹਨ। ਕੀ ਤੁਸੀਂ ਮਿਲਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
@@ -10042,16 +10119,16 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "ਲੋੜੀਦੇ ਖੇਤਰ ਅੱਪਡੇਟ ਕਰੋ ਜੀ।"
 
-msgid "Room _List"
-msgstr "ਰੂਮ ਲਿਸਟ(_L)"
+msgid "A_ccount"
+msgstr "ਅਕਾਊਂਟ(_c)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "ਉਸ ਗੱਲਬਾਤ ਬਾਰੇ ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ, ਜਿਸ ਵਿੱਚ ਤੁਸੀਂ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ।\n"
 
-msgid "_Account:"
-msgstr "ਅਕਾਊਂਟ(_A):"
+msgid "Room _List"
+msgstr "ਰੂਮ ਲਿਸਟ(_L)"
 
 msgid "_Block"
 msgstr "ਪਾਬੰਦੀ(_B)"
@@ -10068,6 +10145,15 @@ msgstr "ਜਾਣਕਾਰੀ ਲਵੋ(_I)"
 msgid "I_M"
 msgstr "I_M"
 
+msgid "_Audio Call"
+msgstr "ਆਡੀਓ ਕਾਲ(_A)"
+
+msgid "Audio/_Video Call"
+msgstr "ਆਡੀਓ/ਵੀਡਿਓ ਕਾਲ(_V)"
+
+msgid "_Video Call"
+msgstr "ਵੀਡਿਓ ਕਾਲ(_V)"
+
 msgid "_Send File..."
 msgstr "ਫਾਇਲ ਭੇਜੋ(_S)..."
 
@@ -10077,8 +10163,11 @@ msgstr "ਪਉਨਸ ਬੱਡੀ ਸ਼ਾਮਿਲ(_P)"
 msgid "View _Log"
 msgstr "ਲਾਗ ਵੇਖੋ(_L)"
 
-msgid "Hide when offline"
-msgstr "ਜਦੋਂ ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਓਹਲੇ"
+msgid "Hide When Offline"
+msgstr "ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਓਹਲੇ"
+
+msgid "Show When Offline"
+msgstr "ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਵੇਖੋ"
 
 msgid "_Alias..."
 msgstr "ਏਲੀਆਸ(_A)..."
@@ -10126,7 +10215,8 @@ msgstr "ਫੈਲਾਓ(_E)"
 msgid "/Tools/Mute Sounds"
 msgstr "/ਟੂਲ/ਆਵਾਜ਼ ਚੁੱਪ ਰੱਖੋ"
 
-msgid "You are not currently signed on with an account that can add that buddy."
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
 msgstr "ਤੁਸੀਂ ਇਸ ਸਮੇਂ ਇੱਕ ਅਕਾਊਂਟ ਨਾਲ ਲਾਗਇਨ ਨਹੀਂ ਹੋ, ਤਾਂ ਕਿ ਬੱਡੀ ਨੂੰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਜਾ ਸਕੇ।"
 
 #. I don't believe this can happen currently, I think
@@ -10201,6 +10291,9 @@ msgstr "/ਟੂਲ/ਬੱਡੀ ਪਉਨਸ(_P)"
 msgid "/Tools/_Certificates"
 msgstr "/ਟੂਲ/ਸਰਟੀਫਿਕੇਟ(_C)"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/ਟੂਲ/ਕਸਟਮ ਸਮਾਈਲੀ(_y)"
+
 msgid "/Tools/Plu_gins"
 msgstr "/ਟੂਲ/ਪਲੱਗਇਨ(_G)"
 
@@ -10210,9 +10303,6 @@ msgstr "/ਟੂਲ/ਮੇਰੀ ਪਸੰਦ(_e)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ਟੂਲ/ਪਰਾਈਵੇਸੀ(_i)"
 
-msgid "/Tools/Smile_y"
-msgstr "/ਟੂਲ/ਸਮਾਈਲੀ(_y)"
-
 msgid "/Tools/_File Transfers"
 msgstr "/ਟੂਲ/ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
 
@@ -10330,8 +10420,8 @@ msgstr "ਖੁਦ"
 msgid "By status"
 msgstr "ਅਕਾਰ"
 
-msgid "By log size"
-msgstr "ਲਾਗ ਅਕਾਰ"
+msgid "By recent log activity"
+msgstr "ਤਾਜ਼ਾ ਲਾਗ ਸਰਗਰਮੀ ਰਾਹੀਂ"
 
 #, c-format
 msgid "%s disconnected"
@@ -10347,12 +10437,16 @@ msgstr "ਮੁੜ-ਕੁਨੈਕਟ ਕਰੋ"
 msgid "Re-enable"
 msgstr "ਮੁੜ-ਚਾਲੂ"
 
+msgid "SSL FAQs"
+msgstr "SSL ਸਵਾਲ-ਜਵਾਬ"
+
 msgid "Welcome back!"
 msgstr "ਫੇਰ ਜੀ ਆਇਆਂ ਨੂੰ!"
 
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
-msgid_plural "%d accounts were disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
 msgstr[0] "%d ਅਕਾਊਂਟ ਆਯੋਗ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ ਤੁਸੀਂ ਹੋਰ ਟਿਕਾਣੇ ਤੋਂ ਸਾਇਨ ਹੋ ਗਏ ਹੋ:"
 msgstr[1] "%d ਅਕਾਊਂਟ ਆਯੋਗ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ ਤੁਸੀਂ ਹੋਰ ਟਿਕਾਣੇ ਤੋਂ ਸਾਇਨ ਹੋ ਗਏ ਹੋ:"
 
@@ -10379,9 +10473,9 @@ msgid ""
 msgstr ""
 "<span weight='bold' size='larger'>%s ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ!</span>\n"
 "\n"
-"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਅਕਾਊਂਟ ਯੋਗ ਨਹੀਂ ਹੈ। ਆਪਣੇ IM ਅਕਾਊਂਟ <b>ਅਕਾਊਂਟ->ਅਕਾਊਂਟ ਪਰਬੰਧ</b> ਰਾਹੀਂ <b>ਅਕਾਊਂਟ</b> "
-"ਤੋਂ ਯੋਗ ਕਰੋ। ਜਦੋਂ ਤੁਸੀਂ ਅਕਾਊਂਟ ਯੋਗ ਕੀਤੇ ਤਾਂ ਤੁਸੀਂ ਸਾਇਨ-ਆਨ ਕਰ ਸਕਦੇ ਹੋ, ਆਪਣਾ ਸਟੇਟਸ ਸੈੱਟ ਕਰ ਸਕਦੇ ਹੋ "
-"ਅਤੇ ਆਪਣੇ ਦੋਸਤਾਂ-ਮਿੱਤਰਾਂ ਨਾਲ ਗੱਲਾਂ ਮਾਰ ਸਕਦੇ ਹੋ।"
+"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਅਕਾਊਂਟ ਯੋਗ ਨਹੀਂ ਹੈ। ਆਪਣੇ IM ਅਕਾਊਂਟ <b>ਅਕਾਊਂਟ->ਅਕਾਊਂਟ ਪਰਬੰਧ</b> ਰਾਹੀਂ "
+"<b>ਅਕਾਊਂਟ</b> ਤੋਂ ਯੋਗ ਕਰੋ। ਜਦੋਂ ਤੁਸੀਂ ਅਕਾਊਂਟ ਯੋਗ ਕੀਤੇ ਤਾਂ ਤੁਸੀਂ ਸਾਇਨ-ਆਨ ਕਰ ਸਕਦੇ ਹੋ, ਆਪਣਾ ਸਟੇਟਸ "
+"ਸੈੱਟ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਆਪਣੇ ਦੋਸਤਾਂ-ਮਿੱਤਰਾਂ ਨਾਲ ਗੱਲਾਂ ਮਾਰ ਸਕਦੇ ਹੋ।"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10424,11 +10518,15 @@ msgstr "ਤੁਸੀਂ ਇਸ ਸਮੇਂ ਕਿਸੇ ਪ੍ਰੋਟੋਕ�
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
-msgstr "ਇੱਕ ਏਲੀਆਸ ਅਤੇ ਗੱਲਬਾਤ ਲਈ ਠੀਕ ਨਾਂ ਦਿਓ ਜੀ, ਜਿਸ ਲਈ ਤੁਸੀਂ ਬੱਡੀ ਲਿਸਟ ਸ਼ਾਮਿਲ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।\n"
+msgstr ""
+"ਇੱਕ ਏਲੀਆਸ ਅਤੇ ਗੱਲਬਾਤ ਲਈ ਠੀਕ ਨਾਂ ਦਿਓ ਜੀ, ਜਿਸ ਲਈ ਤੁਸੀਂ ਬੱਡੀ ਲਿਸਟ ਸ਼ਾਮਿਲ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।\n"
 
 msgid "A_lias:"
 msgstr "ਏਲੀਆਸ(_l):"
 
+msgid "_Group:"
+msgstr "ਗਰੁੱਪ(_G):"
+
 msgid "Auto_join when account becomes online."
 msgstr "ਜਦੋਂ ਅਕਾਊਂਟ ਆਨਲਾਈਨ ਹੋਵੇ ਤਾਂ ਆਟੋ-ਜੁਆਇੰਨ ਕਰੋ(_j)।"
 
@@ -10462,6 +10560,101 @@ msgstr "/ਟੂਲ"
 msgid "/Buddies/Sort Buddies"
 msgstr "/ਬੱਡੀ/ਬੱਡੀ ਕ੍ਰਮਬੱਧ"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
+msgid "The background color for the buddy list"
+msgstr "ਬੱਡੀ ਲਿਸਟ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
+msgid "Layout"
+msgstr "ਲੇਆਉਟ"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "ਬੱਡੀਲਿਸਟ ਲਈ ਆਈਕਾਨ, ਨਾਂ ਅਤੇ ਹਾਲਤ ਦਾ ਲੇਆਉਟ"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "ਫੈਲਾਉਣ ਸਮੇਂ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
+msgid "The background color of an expanded group"
+msgstr "ਫੈਲੇ ਗਰੁੱਪ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
+msgid "Expanded Text"
+msgstr "ਫੈਲਾਉਣ ਟੈਕਸਟ"
+
+msgid "The text information for when a group is expanded"
+msgstr "ਜਦੋਂ ਗਰੁੱਪ ਫੈਲਿਆ ਹੋਵੇ ਲਈ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
+msgid "Collapsed Background Color"
+msgstr "ਸਮੇਟਣ ਸਮੇਂ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
+msgid "The background color of a collapsed group"
+msgstr "ਸਮੇਟੇ ਗਰੁੱਪ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
+msgid "Collapsed Text"
+msgstr "ਸਮੇਟਣ ਟੈਕਸਟ"
+
+msgid "The text information for when a group is collapsed"
+msgstr "ਜਦੋਂ ਗਰੁੱਪ ਸਮੇਟਿਆ ਹੋਵੇ ਤਾਂ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "ਸੰਪਰਕ/ਗੱਲਬਾਤ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
+msgid "The background color of a contact or chat"
+msgstr "ਸੰਪਰਕ ਜਾਂ ਗੱਲਬਾਤ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
+msgid "Contact Text"
+msgstr "ਸੰਪਰਕ ਟੈਕਸਟ"
+
+msgid "The text information for when a contact is expanded"
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਫੈਲਿਆ ਹੋਵੇ ਤਾਂ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
+msgid "On-line Text"
+msgstr "ਆਨਲਾਈਨ ਟੈਕਸਟ"
+
+msgid "The text information for when a buddy is online"
+msgstr "ਜਦੋਂ ਬੱਡੀ ਆਨਲਾਈਨ ਹੋਵੇ ਤਾਂ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
+msgid "Away Text"
+msgstr "ਦੂਰ ਟੈਕਸਟ"
+
+msgid "The text information for when a buddy is away"
+msgstr "ਜਦੋਂ ਬੱਡੀ ਦੂਰ ਹੋਵੇ ਤਾਂ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
+msgid "Off-line Text"
+msgstr "ਆਫਲਾਈਨ ਟੈਕਸਟ"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "ਜਦੋਂ ਬੱਡੀ ਆਫਲਾਈਨ ਹੋਵੇ ਲਈ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
+msgid "Idle Text"
+msgstr "ਵੇਹਲਾ/ਵੇਹਲੀ ਟੈਕਸਟ"
+
+msgid "The text information for when a buddy is idle"
+msgstr "ਜਦੋਂ ਬੱਡੀ ਵੇਹਲਾ ਹੋਵੇ ਤਾਂ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
+msgid "Message Text"
+msgstr "ਸੁਨੇਹਾ ਟੈਕਸਟ"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "ਜਦੋਂ ਬੱਡੀ ਦੇ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ ਹੋਵੇ ਲਈ ਟੈਕਸਟ ਜਾਣਕਾਰੀ "
+
+msgid "Message (Nick Said) Text"
+msgstr "ਸੁਨੇਹਾ (ਨਾਂ ਕਿਹਾ) ਟੈਕਸਟ"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr "ਟੈਕਸਟ ਜਾਣਕਾਰੀ, ਜਦੋਂ ਕਿ ਗੱਲਬਾਤ ਵਿੱਚ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਹੋਣ, ਜਿੰਨ੍ਹਾਂ ਵਿੱਚ ਤੁਹਾਡਾ ਨਾਂ ਹੋਵੇ"
+
+msgid "The text information for a buddy's status"
+msgstr "ਬੱਡੀ ਦੀ ਹਾਲਤ ਬਾਰੇ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
+msgid "Type the host name for this certificate."
+msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਲਈ ਹੋਸਟ ਨਾਂ ਦਿਓ"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ਸਰਵਰ"
@@ -10472,18 +10665,13 @@ msgstr "ਅਣਜਾਣ ਕਮਾਂਡ ਹੈ।"
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "ਉਸ ਬੱਡੀ ਕੋਈ ਉਹ ਪ੍ਰੋਟੋਕਾਲ ਨਹੀਂ ਹੈ, ਜੋ ਕਿ ਇਸ ਗੱਲਬਾਤ ਦਾ"
 
-msgid "You are not currently signed on with an account that can invite that buddy."
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
 msgstr "ਤੁਸੀਂ ਇਸ ਸਮੇਂ ਇਸ ਅਕਾਊਂਟ ਨਾਲ ਲਾਗਇਨ ਨਹੀਂ ਹੋ, ਜਿਸ ਨਾਲ ਬੱਡੀ ਨੂੰ ਸੱਦਿਆ ਜਾ ਸਕੇ।"
 
 msgid "Invite Buddy Into Chat Room"
 msgstr "ਬੱਡੀ ਨੂੰ ਗੱਲਬਾਤ ਰੂਮ ਵਿੱਚ ਸੱਦੋ"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "ਸੱਦਾ ਭੇਜਣ ਲਈ ਯੂਜ਼ਰ ਦਾ ਨਾਂ ਦਿਓ, ਚੋਣਵੇਂ ਰੂਪ ਵਿੱਚ ਸੱਦਾ ਸੁਨੇਹਾ ਵੀ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
-
 msgid "_Buddy:"
 msgstr "ਬੱਡੀ(_B):"
 
@@ -10512,7 +10700,7 @@ msgstr "ਅਣਡਿੱਠਾ"
 msgid "Get Away Message"
 msgstr "ਦੂਰ ਸੁਨੇਹਾ ਲਵੋ"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "ਆਖਰੀ ਵਾਰ ਕਿਹਾ"
 
 msgid "Unable to save icon file to disk."
@@ -10558,6 +10746,18 @@ msgstr "/ਗੱਲਬਾਤ/ਇੰਝ ਸੰਭਾਲੋ(_S)..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/ਗੱਲਬਾਤ/ਸਕਰੋਲ-ਬੈਕ ਸਾਫ਼ ਕਰੋ(_r)"
 
+msgid "/Conversation/M_edia"
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ(_e)"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ ਕਾਲ(_A)"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਵੀਡਿਓ ਕਾਲ(_V)"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ\\/ਵੀਡਿਓ ਕਾਲ(_C)"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/ਗੱਲਬਾਤ/ਫਾਇਲ ਭੇਜੋ(_n)..."
 
@@ -10630,6 +10830,15 @@ msgstr "/ਗੱਲਬਾਤ"
 msgid "/Conversation/View Log"
 msgstr "/ਗੱਲਬਾਤ/ਲਾਗ ਵੇਖੋ"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ ਕਾਲ"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਵੀਡਿਓ ਕਾਲ"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ\\/ਵੀਡਿਓ ਕਾਲ"
+
 msgid "/Conversation/Send File..."
 msgstr "/ਗੱਲਬਾਤ/ਫਾਇਲ ਭੇਜੋ..."
 
@@ -10812,6 +11021,9 @@ msgstr "ਕਲਾਕਾਰ"
 msgid "Ka-Hing Cheung"
 msgstr "ਕਾ-ਹਿੰਗ ਚੀਉਂਗ"
 
+msgid "voice and video"
+msgstr "ਆਵਾਜ਼ ਅਤੇ ਵੀਡਿਓ"
+
 msgid "support"
 msgstr "ਸਹਿਯੋਗ"
 
@@ -10936,6 +11148,9 @@ msgstr "ਹਿੰਦੀ"
 msgid "Hungarian"
 msgstr "ਹੰਗਰੀਆਈ"
 
+msgid "Armenian"
+msgstr "ਅਰਮੀਨੀਆਈ"
+
 msgid "Indonesian"
 msgstr "ਇੰਡੋਨੇਸ਼ੀਆਈ"
 
@@ -10951,6 +11166,9 @@ msgstr "ਜਾਰਜੀਆਈ"
 msgid "Ubuntu Georgian Translators"
 msgstr "ਉਬਤੂੰ ਜਾਰਜੀਆਈ ਅਨੁਵਾਦਕ"
 
+msgid "Khmer"
+msgstr "ਖਮੀਰ"
+
 msgid "Kannada"
 msgstr "ਕੰਨੜ"
 
@@ -11029,6 +11247,9 @@ msgstr "ਸਿੰਹਾਲਾ"
 msgid "Swedish"
 msgstr "ਸਵੀਡਸ਼"
 
+msgid "Swahili"
+msgstr "ਸਵਾਹੀਲੀ"
+
 msgid "Tamil"
 msgstr "ਤਾਮਿਲ"
 
@@ -11086,13 +11307,15 @@ msgstr ""
 "ਇਸ ਦੇ ਯੋਗਦਾਨੀਆਂ ਕੋਲ ਕਾਪੀ-ਰਾਈਟ ਹੈ। ਯੋਗਦਾਨੀਆਂ ਦੀ ਲਿਸਟ ਵੇਖਣ ਵਾਸਤੇ 'COPYRIGHT' ਫਾਇਲ ਵੇਖੋ। "
 "ਇਸ ਪਰੋਗਰਾਮ ਬਾਰੇ ਤੁਹਾਨੂੰ ਅਸੀਂ ਕੋਈ ਵਾਰੰਟੀ ਨਹੀਂ ਦਿੰਦੇ ਹਾਂ।<BR><BR>"
 
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
-"<FONT SIZE=\"4\">ਸਵਾਲ-ਜਵਾਬ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
-"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+"<FONT SIZE=\"4\">ਸਵਾਲ-ਜਵਾਬ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/"
+"FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
@@ -11100,9 +11323,12 @@ msgstr ""
 "<FONT SIZE=\"4\">ਈਮੇਲ ਰਾਹੀਂ ਮੱਦਦ:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
 
-msgid "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC ਚੈਨਲ:</FONT>irc.freenode.net ਉੱਤੇ #pidgin<BR><BR>"
 
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
@@ -11170,8 +11396,12 @@ msgid ""
 msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] "ਤੁਸੀਂ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚੋਂ %s ਰੱਖਣ ਵਾਲਾ ਸੰਪਰਕ ਅਤੇ %d ਹੋਰ ਬੱਡੀ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-msgstr[1] "ਤੁਸੀਂ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚੋਂ %s ਰੱਖਣ ਵਾਲਾ ਸੰਪਰਕ ਅਤੇ %d ਹੋਰ ਬੱਡੀ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr[0] ""
+"ਤੁਸੀਂ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚੋਂ %s ਰੱਖਣ ਵਾਲਾ ਸੰਪਰਕ ਅਤੇ %d ਹੋਰ ਬੱਡੀ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ "
+"ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr[1] ""
+"ਤੁਸੀਂ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚੋਂ %s ਰੱਖਣ ਵਾਲਾ ਸੰਪਰਕ ਅਤੇ %d ਹੋਰ ਬੱਡੀ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ "
+"ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 msgid "Remove Contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਓ"
@@ -11206,7 +11436,8 @@ msgid "_Remove Group"
 msgstr "ਗਰੁੱਪ ਹਟਾਓ(_R)"
 
 #, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "ਤੁਸੀਂ %s ਨੂੰ ਆਪਣੀ ਸੁਨੇਹੀ ਲਿਸਟ ਵਿੱਚੋਂ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 msgid "Remove Buddy"
@@ -11327,7 +11558,7 @@ msgid "_Resume"
 msgstr "ਮੁੜ-ਪ੍ਰਾਪਤ(_R)"
 
 msgid "Paste as Plain _Text"
-msgstr "ਸਧਾਰਨ ਪਾਠ ਵਾਂਗ ਚੇਪੋ(_T)"
+msgstr "ਪਲੇਨ ਟੈਕਸਟ ਵਾਂਗ ਚੇਪੋ(_T)"
 
 msgid "_Reset formatting"
 msgstr "ਫਾਰਮੈਟਿੰਗ ਮੁੜ-ਸੈੱਟ ਕਰੋ(_R)"
@@ -11344,7 +11575,7 @@ msgstr "ਹਾਈਪਰਲਿੰਕ ਲਈ ਰੰਗ ਦਿਓ।"
 msgid "Hyperlink visited color"
 msgstr "ਖੋਲ੍ਹੋ ਹਾਈਪਰਲਿੰਕ ਰੰਗ"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "ਹਾਈਪਰਲਿੰਕ ਖੋਲ੍ਹਣ ਤੋਂ ਬਾਅਦ ਵਰਤਣ ਲਈ ਰੰਗ (ਜਾਂ ਐਕਟੀਵੇਟ ਹੋਣ ਤੋਂ ਬਾਅਦ)"
 
 msgid "Hyperlink prelight color"
@@ -11380,14 +11611,20 @@ msgstr "ਇੱਕ ਕਾਰਵਾਈ ਸੁਨੇਹੇ ਲਈ ਨਾਂ ਲਿ�
 msgid "Action Message Name Color for Whispered Message"
 msgstr "ਘੁਸਰ-ਮੁਸਰ ਸੁਨੇਹੇ ਲਈ ਐਕਟਿਵ ਸੁਨੇਹਾ ਨਾਂ ਰੰਗ"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "ਘੁਸਰ-ਮੁਸਰ ਕਾਰਵਾਈ ਸੁਨੇਹੇ ਲਈ ਨਾਂ ਲਿਖਣ ਲਈ ਰੰਗ ਹੈ।"
+
 msgid "Whisper Message Name Color"
 msgstr "ਘੁਸਰ-ਮੁਸਰ ਸੁਨੇਹਾ ਨਾਂ ਰੰਗ"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "ਘੁਸਰ-ਮੁਸਰ ਸੁਨੇਹੇ ਲਈ ਨਾਂ ਲਿਖਣ ਲਈ ਰੰਗ ਹੈ।"
+
 msgid "Typing notification color"
 msgstr "ਟਾਈਪ ਕਰਨ ਸੂਚਨਾ ਰੰਗ"
 
-msgid "The color to use for the typing notification font"
-msgstr "ਟਾਈਪ ਕਰਨ ਸੂਚਨਾ ਲਈ ਫੋਂਟ ਵਾਸਤੇ ਵਰਤਣ ਲਈ ਰੰਗ"
+msgid "The color to use for the typing notification"
+msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਲਿਖਣ ਲਈ ਫੋਂਟ ਵਾਸਤੇ ਵਰਤਣ ਲਈ ਰੰਗ"
 
 msgid "Typing notification font"
 msgstr "ਟਾਈਪ ਕਰਨ ਸੂਚਨਾ ਫੋਂਟ"
@@ -11398,15 +11635,6 @@ msgstr "ਟਾਈਪ ਕਰਨ ਦੀ ਸੂਚਨਾ ਲਈ ਵਰਤਣ ਵਾ
 msgid "Enable typing notification"
 msgstr "ਟਾਈਪ ਕਰਨ ਦੀ ਸੂਚਨਾ ਚਾਲੂ"
 
-msgid "_Copy Email Address"
-msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਨਕਲ(_C)"
-
-msgid "_Open Link in Browser"
-msgstr "ਝਲਾਕਾਰੇ ਵਿੱਚ ਖੋਲੋ(_O)"
-
-msgid "_Copy Link Location"
-msgstr "ਸੰਬੰਧ ਸਥਿਤੀ ਦੀ ਨਕਲ(_C)"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11537,9 +11765,6 @@ msgstr "ਫੋਂਟ ਸਾਈਜ਼ ਘਟਾਓ"
 msgid "Font Face"
 msgstr "ਫੋਂਟ ਫੇਸ"
 
-msgid "Background Color"
-msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
-
 msgid "Foreground Color"
 msgstr "ਫਾਰਗਰਾਊਂਡ ਰੰਗ"
 
@@ -11643,6 +11868,7 @@ msgstr "ਲਾਗ ਫੋਲਡਰ ਝਲਕ(_B)"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s। ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ `%s -h' ਵੇਖੋ।\n"
 
+# , c-format
 #, c-format
 msgid ""
 "%s %s\n"
@@ -11650,6 +11876,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11664,6 +11891,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11673,6 +11901,7 @@ msgstr ""
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 
+# , c-format
 #, c-format
 msgid ""
 "%s %s\n"
@@ -11680,6 +11909,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11689,10 +11919,11 @@ msgid ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"ਵਰਤੋਂ: %s [OPTION]...\n"
+"Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11734,14 +11965,26 @@ msgstr ""
 msgid "Pidgin"
 msgstr "ਪਿਡਗਿਨ"
 
+#, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ, ਕਿਉਂਕਿ ਇੱਕ ਹੋਰ libpurple ਕਲਾਇਟ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ।\n"
 
-msgid "Open All Messages"
-msgstr "ਸਭ ਸੁਨੇਹੇ ਖੋਲ੍ਹੋ"
+msgid "/_Media"
+msgstr "/ਮੀਡਿਆ(_M)"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">ਤੁਹਾਨੂੰ ਚਿੱਠੀ ਆਈ ਹੈ!</span>"
+msgid "/Media/_Hangup"
+msgstr "/ਮੀਡਿਆ/ਹੈਂਗਅੱਪ(_H)"
+
+msgid "Calling..."
+msgstr "ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਆਡੀਓ/ਵੀਡਿਓ ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ।"
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਵੀਡਿਓ ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ।"
 
 #, c-format
 msgid "%s has %d new message."
@@ -11766,9 +12009,28 @@ msgstr "URL ਖੋਲਣ ਲਈ ਅਸਫਲ ਹੈ"
 msgid "Error launching \"%s\": %s"
 msgstr "\"%s\" ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'ਦਸਤੀ' ਝਲਕਾਰਾ ਕਮਾਂਡ ਚੁਣੀ ਗਈ ਹੈ, ਪਰ ਕੋਈ ਕਮਾਂਡ ਨਹੀਂ ਦਿੱਤੀ ਗਈ ਹੈ।"
 
+msgid "No message"
+msgstr "ਸੁਨੇਹਾ ਨਹੀਂ"
+
+msgid "Open All Messages"
+msgstr "ਸਭ ਸੁਨੇਹੇ ਖੋਲ੍ਹੋ"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">ਤੁਹਾਨੂੰ ਚਿੱਠੀ ਆਈ ਹੈ!</span>"
+
+msgid "New Pounces"
+msgstr "ਨਵਾਂ ਪਉਨਸ"
+
+msgid "Dismiss"
+msgstr "ਅਣਡਿੱਠਾ"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">ਤੁਹਾਨੂੰ ਪਉਨਸ ਕੀਤਾ ਗਿਆ!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "ਹੇਠ ਦਿੱਤੀਆਂ ਪਲੱਗਇਨਾਂ ਨੂੰ ਅਣ-ਲੋਡ ਕੀਤਾ ਜਾਵੇਗਾ।"
 
@@ -11784,7 +12046,8 @@ msgstr "ਪਲੱਗਇਨ ਅਣਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸ�
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
-msgstr "ਪਲੱਗਇਨ ਨੂੰ ਅਨ-ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਪਰ ਇਸ ਨੂੰ ਅਗਲੀ ਵਾਰ ਚਾਲੂ ਹੋਣ ਸਮੇਂ ਬੰਦ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
+msgstr ""
+"ਪਲੱਗਇਨ ਨੂੰ ਅਨ-ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਪਰ ਇਸ ਨੂੰ ਅਗਲੀ ਵਾਰ ਚਾਲੂ ਹੋਣ ਸਮੇਂ ਬੰਦ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
 #, c-format
 msgid ""
@@ -11815,10 +12078,16 @@ msgstr "<b>ਪਲੱਗਇਨ ਵੇਰਵਾ</b>"
 msgid "Select a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
+msgid "Modify Buddy Pounce"
+msgstr "ਬੱਡੀ ਪਉਨਸ ਸੋਧ"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "ਕਿਸ ਉੱਤੇ ਝੱਪਟਣਾ ਹੈ"
 
+msgid "_Account:"
+msgstr "ਅਕਾਊਂਟ(_A):"
+
 msgid "_Buddy name:"
 msgstr "ਬੱਡੀ ਨਾਂ(_B):"
 
@@ -11885,8 +12154,69 @@ msgstr "ਆਵਰਤੀ(_R)"
 msgid "Pounce Target"
 msgstr "ਪਉਨਸ ਟਾਰਗੇਟ"
 
-msgid "Smiley theme failed to unpack."
-msgstr "ਸਮਾਇਲੀ ਥੀਮ ਅਣ-ਪੈਕ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+# , c-format
+#, c-format
+msgid "Started typing"
+msgstr "ਲਿਖਣਾ ਸ਼ੁਰੂ ਕੀਤਾ"
+
+# , c-format
+#, c-format
+msgid "Paused while typing"
+msgstr "ਲਿਖਣ ਦੌਰਾਨ ਵਿਰਾਮ"
+
+# , c-format
+#, c-format
+msgid "Signed on"
+msgstr "ਸਾਇਨ ਆਨ ਕੀਤਾ"
+
+# , c-format
+#, c-format
+msgid "Returned from being idle"
+msgstr "ਵੇਹਲੇ ਤੋਂ ਵਾਪਸ ਆਇਆ/ਆਈ"
+
+# , c-format
+#, c-format
+msgid "Returned from being away"
+msgstr "ਦੂਰੋਂ ਵਾਪਸ"
+
+# , c-format
+#, c-format
+msgid "Stopped typing"
+msgstr "ਲਿਖਦਾ/ਲਿਖਦੀ ਰੁਕੀ"
+
+# , c-format
+#, c-format
+msgid "Signed off"
+msgstr "ਸਾਇਨ ਆਫ਼"
+
+# , c-format
+#, c-format
+msgid "Became idle"
+msgstr "ਵੇਹਲੇ ਬਣੋ"
+
+# , c-format
+#, c-format
+msgid "Went away"
+msgstr "ਦੂਰ ਗਿਆ/ਗਈ"
+
+# , c-format
+#, c-format
+msgid "Sent a message"
+msgstr "ਸੁਨੇਹਾ ਭੇਜੋ"
+
+# , c-format
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "ਅਣਜਾਣ... ਇਸ ਬਾਰੇ ਰਿਪੋਰਟ ਕਰੋ ਜੀ!"
+
+msgid "Theme failed to unpack."
+msgstr "ਥੀਮ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+msgid "Theme failed to load."
+msgstr "ਥੀਮ ਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+msgid "Theme failed to copy."
+msgstr "ਥੀਮ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
 msgid "Install Theme"
 msgstr "ਥੀਮ ਇੰਸਟਾਲ ਕਰੋ"
@@ -11907,6 +12237,11 @@ msgstr "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "ਈਸਕੇਸ (Esc) ਸਵਿੱਚ ਨਾਲ ਗੱਲਾਬਾਤਾਂ ਬੰਦ ਕਰੋ(_o)"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "ਬੱਡੀ ਲਿਸਟ ਥੀਮ"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ"
 
@@ -11916,8 +12251,8 @@ msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖੋ(_S):"
 msgid "On unread messages"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ"
 
-msgid "Conversation Window Hiding"
-msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਓਹਲੇ"
+msgid "Conversation Window"
+msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ"
 
 msgid "_Hide new IM conversations:"
 msgstr "ਨਵੀਆਂ IM ਗੱਲਬਾਤਾਂ ਓਹਲੇ(_H):"
@@ -11925,6 +12260,9 @@ msgstr "ਨਵੀਆਂ IM ਗੱਲਬਾਤਾਂ ਓਹਲੇ(_H):"
 msgid "When away"
 msgstr "ਜਦੋਂ ਦੂਰ"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਘੱਟੋ-ਘੱਟ(_z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "ਟੈਬਾਂ"
@@ -11983,9 +12321,6 @@ msgstr "ਸਮੂਥਿੰਗ-ਸਕੋਰਿੰਗ ਵਰਤੋਂ"
 msgid "F_lash window when IMs are received"
 msgstr "IM ਪ੍ਰਾਪਤ ਹੋਣ ਉੱਤੇ ਵਿੰਡੋ ਝਲਕਾਓ(_l)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਘੱਟੋ-ਘੱਟ(_z)"
-
 msgid "Minimum input area height in lines:"
 msgstr "ਲਾਈਨਾਂ ਵਿੱਚ ਘੱਟੋ-ਘੱਟੋ ਇੰਪੁੱਟ ਏਰੀਆ ਹਾਈਲਾਈਟ:"
 
@@ -12017,14 +12352,13 @@ msgstr "ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਪਰੋਗਰਾਮ ਸਟਾਰ
 msgid "Cannot start browser configuration program."
 msgstr "ਬਰਾਊਜ਼ਰ ਸੰਰਚਨਾ ਪਰੋਗਾਰਮ ਸਟਾਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-msgid "ST_UN server:"
-msgstr "ST_UN ਸਰਵਰ:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">ਜਿਵੇਂ: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "ਆਟੋ-ਖੋਜਿਆ IP ਐਡਰੈੱਸ(_A)"
+# , c-format
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "ਆਟੋ-ਖੋਜਿਆ IP ਐਡਰੈੱਸ ਵਰਤੋਂ(_A): %s"
 
 msgid "Public _IP:"
 msgstr "ਪਬਲਿਕ _IP:"
@@ -12044,6 +12378,10 @@ msgstr "ਸ਼ੁਰੂ ਪੋਰਟ(_S):"
 msgid "_End port:"
 msgstr "ਅੰਤ ਪੋਰਟ(_E):"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "ਰੀਲੇਅ ਸਰਵਰ (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "ਪਰਾਕਸੀ ਸਰਵਰ &amp; ਬਰਾਊਜ਼ਰ"
 
@@ -12156,21 +12494,27 @@ msgstr "ਸਭ ਹਾਲਤ ਤਬਦੀਲੀਆਂ ਸਿਸਟਮ ਲਾਗ '
 msgid "Sound Selection"
 msgstr "ਆਵਾਜ਼ ਚੋਣ"
 
+#, c-format
 msgid "Quietest"
 msgstr "ਸਭ ਤੋਂ ਖਾਮੋਸ਼"
 
+#, c-format
 msgid "Quieter"
 msgstr "ਬਹੁਤ ਖਾਮੋਸ਼"
 
+#, c-format
 msgid "Quiet"
 msgstr "ਖਾਮੋਸ਼"
 
+#, c-format
 msgid "Loud"
 msgstr "ਉੱਚੀ"
 
+#, c-format
 msgid "Louder"
 msgstr "ਹੋਰ ਉੱਚੀ"
 
+#, c-format
 msgid "Loudest"
 msgstr "ਸਭ ਤੋਂ ਉੱਚੀ"
 
@@ -12228,12 +12572,12 @@ msgstr "ਜਦੋਂ ਦੂਰ ਅਤੇ ਵੇਹਲਾ ਹੋਵਾਂ"
 msgid "Auto-away"
 msgstr "ਸਵੈ-ਦੂਰ"
 
-msgid "Change status when _idle"
-msgstr "ਜਦੋਂ ਵੇਹਲਾ ਹੋਵਾਂ ਤਾਂ ਹਾਲਤ ਬਦਲੋ(_i)"
-
 msgid "_Minutes before becoming idle:"
 msgstr "ਵੇਹਲਾ ਬਣਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਮਿੰਟ(_M):"
 
+msgid "Change status when _idle"
+msgstr "ਜਦੋਂ ਵੇਹਲਾ ਹੋਵਾਂ ਤਾਂ ਹਾਲਤ ਬਦਲੋ(_i)"
+
 msgid "Change _status to:"
 msgstr "ਹਾਲਤ ਬਦਲੋ(_s):"
 
@@ -12381,45 +12725,43 @@ msgstr "ਸੰਭਾਲੋ ਅਤੇ ਵਰਤੋਂ(_v)"
 msgid "Status for %s"
 msgstr "%s ਲਈ ਹਾਲਤ"
 
+# , c-format
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr "'%s' ਲਈ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਕਸਟਮ ਸਮਾਈਲੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰੇ ਸ਼ਾਰਟਕੱਟ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
+
 msgid "Custom Smiley"
 msgstr "ਪਸੰਦੀਦਾ ਸਮਾਈਲੀ"
 
-msgid "More Data needed"
-msgstr "ਹੋਰ ਡਾਟਾ ਚਾਹੀਦਾ ਹੈ"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "ਸਮਾਈਲੀ ਨਾਲ ਸਬੰਧਿਤ ਸ਼ਾਰਟਕੱਟ ਦਿਓ ਜੀ।"
-
 msgid "Duplicate Shortcut"
 msgstr "ਡੁਪਲੀਕੇਟ ਸ਼ਾਰਟਕੱਟ"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr "ਚੁਣੇ ਸ਼ਾਰਟਕੱਟ ਲਈ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਕਸਟਮ ਸਮਾਈਲੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰੇ ਸ਼ਾਰਟਕੱਟ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
-
-msgid "Please select an image for the smiley."
-msgstr "ਸਮਾਈਲੀ ਲਈ ਚਿੱਤਰ ਚੁਣੋ ਜੀ।"
-
 msgid "Edit Smiley"
 msgstr "ਸਮਾਈਲੀ ਸੋਧ"
 
 msgid "Add Smiley"
 msgstr "ਸਮਾਈਲੀ ਸ਼ਾਮਲ"
 
-msgid "Smiley _Image"
-msgstr "ਸਮਾਈਲੀ ਚਿੱਤਰ(_I)"
+msgid "_Image:"
+msgstr "ਚਿੱਤਰ(_I):"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "ਸਮਾਈਲੀ ਸ਼ਾਰਟਕੱਟ(_h)"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "ਸ਼ਾਰਟਕੱਟ ਟੈਕਸਟ(_h):"
 
 msgid "Smiley"
 msgstr "ਸਮਾਈਲੀ"
 
+msgid "Shortcut Text"
+msgstr "ਸ਼ਾਰਟਕੱਟ ਟੈਕਸਟ"
+
 msgid "Custom Smiley Manager"
 msgstr "ਪਸੰਦੀਦਾ ਸਮਾਈਲੀ ਮੈਨੇਜਰ"
 
+msgid "Select Buddy Icon"
+msgstr "ਬੱਡੀ ਆਈਕਾਨ ਚੁਣੋ"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "ਇਸ ਅਕਾਊਂਟ ਲਈ ਆਪਣਾ ਬੱਡੀ-ਆਈਕਾਨ ਬਦਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
 
@@ -12490,7 +12832,8 @@ msgstr ""
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr "ਤੁਸੀਂ ਇਹ ਚਿੱਤਰ ਨੂੰ ਇਹ ਸੁਨੇਹੇ 'ਚ ਸ਼ਾਮਿਲ ਕਰਨ ਸਕਦੇ ਹੋ ਜਾਂ ਇਸ ਯੂਜ਼ਰ ਲਈ ਬੱਡੀ ਆਈਕਾਨ ਵਾਂਗ ਵਰਤ ਸਕਦੇ ਹੋ।"
+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
@@ -12501,8 +12844,8 @@ msgid "Cannot send launcher"
 msgstr "ਲਾਂਚਰ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "ਤੁਸੀਂ ਇੱਕ ਡੈਸਕਟਾਪ ਲਾਂਚਰ ਡਰੈਗ ਕੀਤਾ ਹੈ। ਸੰਭਵ ਤੌਰ ਉੱਤੇ ਤੁਸੀਂ ਲਾਂਚਰ ਦੀ ਬਜਾਏ ਉਹ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਜੋ "
 "ਕਿ ਇਹ ਲਾਂਚਰ ਰਾਹੀਂ ਪੁਆਇੰਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"
@@ -12532,12 +12875,35 @@ msgid "Failed to open file '%s': %s"
 msgstr "ਫਾਇਲ '%s' ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ: %s"
 
 #, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "ਚਿੱਤਰ '%s' ਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: ਕਾਰਨ ਜਾਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ, ਸੰਭਵ ਤੌਰ ਤੇ ਫਾਇਲ ਨਿਕਾਰਾ ਹੈ"
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"ਚਿੱਤਰ '%s' ਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: ਕਾਰਨ ਜਾਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ, ਸੰਭਵ ਤੌਰ ਤੇ ਫਾਇਲ ਨਿਕਾਰਾ ਹੈ"
+
+msgid "_Open Link"
+msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_O)"
+
+msgid "_Copy Link Location"
+msgstr "ਸੰਬੰਧ ਸਥਿਤੀ ਦੀ ਨਕਲ(_C)"
+
+msgid "_Copy Email Address"
+msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਨਕਲ(_C)"
+
+msgid "_Open File"
+msgstr "ਫਾਇਲ ਖੋਲ੍ਹੋ(_O)"
+
+msgid "Open _Containing Directory"
+msgstr "ਲਾਗ ਰੱਖਣ ਵਾਲੀ ਡਾਇਰੈਕਟਰੀ ਖੋਲ੍ਹੋ(_C)"
 
 msgid "Save File"
 msgstr "ਫਾਇਲ ਸੰਭਾਲੋ"
 
+msgid "_Play Sound"
+msgstr "ਸਾਊਂਡ ਚਲਾਓ(_P)"
+
+msgid "_Save File"
+msgstr "ਫਾਇਲ ਸੰਭਾਲੋ(_S)"
+
 msgid "Select color"
 msgstr "ਰੰਗ ਚੁਣੋ"
 
@@ -12625,6 +12991,64 @@ msgstr "ਸੰਪਰਕ ਉਪਲਬਧਤਾ ਅਨੁਮਾਨ ਪਲੱਗਇ
 msgid "Displays statistical information about your buddies' availability"
 msgstr "ਆਪਣੀ ਬੱਡੀ ਦੀ ਉਪਲੱਬਧਤਾ ਲਈ ਅੰਕੜੇ ਵੇਖੋ।"
 
+msgid "Server name request"
+msgstr "ਸਰਵਰ ਨਾਂ ਮੰਗ"
+
+msgid "Enter an XMPP Server"
+msgstr "XMPP ਸਰਵਰ ਦਿਓ"
+
+msgid "Select an XMPP server to query"
+msgstr "ਕਿਊਰੀ ਲਈ XMPP ਸਰਵਰ ਚੁਣੋ"
+
+msgid "Find Services"
+msgstr "ਸਰਵਿਸਾਂ ਲੱਭੋ"
+
+msgid "Add to Buddy List"
+msgstr "ਬੱਡੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਲ"
+
+msgid "Gateway"
+msgstr "ਗੇਟਵੇ"
+
+msgid "Directory"
+msgstr "ਡਾਇਰੈਕਟਰੀ"
+
+msgid "PubSub Collection"
+msgstr "PubSub ਭੰਡਾਰ"
+
+msgid "PubSub Leaf"
+msgstr "PubSub ਭਾਗ"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>ਵੇਰਵਾ:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "ਸਰਵਿਸ ਖੋਜ"
+
+msgid "_Browse"
+msgstr "ਬਰਾਊਜ਼ਰ(_B)"
+
+msgid "Server does not exist"
+msgstr "ਸਰਵਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
+
+msgid "Server does not support service discovery"
+msgstr "ਸਰਵਰ ਸਰਵਿਸ ਖੋਜ ਲਈ ਸਹਾਇਕ ਨਹੀਂ"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP ਸਰਵਿਸ ਖੋਜ"
+
+msgid "Allows browsing and registering services."
+msgstr "ਬਰਾਊਜ਼ਿੰਗ ਅਤੇ ਰਜਿਟਰ ਕਰਨ ਲਈ ਸਰਵਿਸਾਂ ਲਈ ਮਨਜ਼ੂਰ।"
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "ਇਹ ਪਲੱਗਇਨ ਪੁਰਾਤਨ ਟਰਾਂਸਪੋਰਟ ਜਾਂ XMPP ਸਰਵਿਸ ਰਜਿਸਟਰ ਕਰਨ ਲਈ ਫਾਇਦੇਮੰਦ ਹੈ।"
+
 msgid "Buddy is idle"
 msgstr "ਬੱਡੀ ਵੇਹਲਾ ਹੈ"
 
@@ -12667,14 +13091,16 @@ msgstr "ਸੰਪਰਕ ਤਰਜੀਹ"
 #. *< name
 #. *< version
 #. *< summary
-msgid "Allows for controlling the values associated with different buddy states."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
 msgstr "ਵੱਖਰੀ ਬੱਡੀ ਸਥਿਤੀ ਨਾਲ ਸਬੰਧਿਤ ਮੁੱਲਾਂ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਦਿਓ।"
 
 #. *< description
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
-msgstr "ਸੰਪਰਕ ਵਿੱਚ ਦਰਜੇ ਦੇ ਆਧਾਰ ਉੱਤੇ ਬੱਡੀ ਲਈ ਵੇਹਲਾ/ਦੂਰ/ਆਫਲਾਇਨ ਸਥਿਤੀ ਦਾ ਮੁੱਲ ਤਬਦੀਲ ਕਰਨਾ ਸਵੀਕਾਰ ਹੈ।"
+msgstr ""
+"ਸੰਪਰਕ ਵਿੱਚ ਦਰਜੇ ਦੇ ਆਧਾਰ ਉੱਤੇ ਬੱਡੀ ਲਈ ਵੇਹਲਾ/ਦੂਰ/ਆਫਲਾਇਨ ਸਥਿਤੀ ਦਾ ਮੁੱਲ ਤਬਦੀਲ ਕਰਨਾ ਸਵੀਕਾਰ ਹੈ।"
 
 msgid "Conversation Colors"
 msgstr "ਗੱਲਬਾਤ ਰੰਗ"
@@ -13000,7 +13426,7 @@ msgstr "ਸਾਂਝੀ ਕੰਪੋਜ਼ੀਸ਼ਨ ਵਾਸਤੇ ਸੰਗ
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "ਸੰਗੀਤ ਸੁਨੇਹਾ ਪਲੱਗਇਨ ਨਾਲ ਕਈ ਯੂਜ਼ਰ ਇੱਕੋ ਸਮੇਂ ਇੱਕ ਸੰਗੀਤ ਭਾਗ ਉੱਤੇ ਰੀਅਲ ਟਾਈਮ ਵਿੱਚ ਇੱਕ ਆਮ ਸਕੋਰ ਸੋਧਣ "
 "ਨਾਲ ਕੰਮ ਕਰ ਸਕਦੇ ਹਨ।"
@@ -13112,12 +13538,6 @@ msgstr ""
 "- ਇਹ ਸਭ ਆ ਰਹੇ ਟੈਕਸਟ ਨੂੰ ਉਲਟ ਸਕਦੀ ਹੈ\n"
 "- ਇਹ ਇੱਕ ਸੁਨੇਹਾ ਤੁਹਾਡੀ ਲਿਸਟ ਉੱਤੇ ਮੌਜੂਦ ਲੋਕਾਂ ਨੂੰ ਤੁਰੰਤ ਭੇਜ ਸਕਦੀ ਹੈ, ਜਦੋਂ ਵੀ ਉਹ ਲਾਗਇਨ ਕਰਨ।"
 
-msgid "Cursor Color"
-msgstr "ਕਰਸਰ ਰੰਗ"
-
-msgid "Secondary Cursor Color"
-msgstr "ਸੈਕੰਡਰੀ ਕਰਸਰ ਰੰਗ"
-
 msgid "Hyperlink Color"
 msgstr "ਹਾਈਪਰਲਿੰਕ ਰੰਗ"
 
@@ -13127,6 +13547,9 @@ msgstr "ਖੋਲ੍ਹੇ ਗਏ ਹਾਈਪਰਲਿੰਕ ਰੰਗ"
 msgid "Highlighted Message Name Color"
 msgstr "ਹਾਈਲਾਈਟ ਕੀਤਾ ਸੁਨੇਹਾ ਨਾਂ ਰੰਗ"
 
+msgid "Typing Notification Color"
+msgstr "ਲਿਖਣ ਨੋਟੀਫਿਕੇਸ਼ਨ ਰੰਗ"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ਹਰੀਜ਼ਟਲ ਵੱਖਰੇਵਾ"
 
@@ -13142,6 +13565,7 @@ msgstr "ਨੋਟੀਫਾਈ ਡਾਈਲਾਗ"
 msgid "Select Color"
 msgstr "ਰੰਗ ਚੁਣੋ"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "ਇੰਟਰਫੇਸ ਰੰਗ ਚੁਣੋ"
 
@@ -13155,35 +13579,21 @@ msgstr "GTK+ ਇੰਟਰਫੇਸ ਫੋਂਟ"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ਪਾਠ ਸ਼ਾਰਟਕੱਟ ਥੀਮ"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "ਇੰਟਰਫੇਸ ਰੰਗ"
+msgid "Disable Typing Notification Text"
+msgstr "ਲਿਖਣ ਨੋਟੀਫਿਕੇਸ਼ਨ ਟੈਕਸਟ ਆਯੋਗ"
 
-msgid "Widget Sizes"
-msgstr "ਵਿਦਗਿਟ ਆਕਾਰ"
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ ਥੀਮ ਕੰਟਰੋਲ ਸੈਟਿੰਗ"
+
+msgid "Colors"
+msgstr "ਰੰਗ"
 
 msgid "Fonts"
 msgstr "ਫੋਂਟ"
 
+msgid "Miscellaneous"
+msgstr "ਫੁਟਕਲ"
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc ਫਾਇਲ ਟੂਲ"
 
@@ -13266,10 +13676,9 @@ msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਭੇਜੋ ਬਟਨ ਹੈ।"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
-"ਗੱਲਬਾਤ ਵਿੰਡੋ ਦੇ ਲਿਖਣ ਖੇਤਰ ਵਿੱਚ ਭੇਜੋ ਬਟਨ ਸ਼ਾਮਲ ਕਰੋ। ਇਹ ਕੋਈ ਅਸਲ ਕੀਬੋਰਡ ਨਾ ਹੋਣ ਦੀ "
-"ਹਾਲਤ ਲਈ ਹੈ।"
+"ਗੱਲਬਾਤ ਵਿੰਡੋ ਦੇ ਲਿਖਣ ਖੇਤਰ ਵਿੱਚ ਭੇਜੋ ਬਟਨ ਸ਼ਾਮਲ ਕਰੋ। ਇਹ ਕੋਈ ਅਸਲ ਕੀਬੋਰਡ ਨਾ ਹੋਣ ਦੀ ਹਾਲਤ ਲਈ ਹੈ।"
 
 msgid "Duplicate Correction"
 msgstr "ਡੁਪਲੀਕੇਟ ਸੋਧ"
@@ -13320,6 +13729,95 @@ msgstr "ਪਾਠ ਤਬਦੀਲ"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "ਯੂਜ਼ਰ ਰਾਹੀਂ ਪ੍ਰਭਾਸ਼ਿਤ ਨਿਯਮਾਂ ਮੁਤਾਬਕ ਭੇਜੇ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਤਬਦੀਲ ਕਰੋ।"
 
+msgid "Just logged in"
+msgstr "ਹਾਲ ਲਾਗਇਨ ਹੀ ਕੀਤਾ ਹੈ"
+
+msgid "Just logged out"
+msgstr "ਹੁਣੇ ਲਾਗ ਆਉਟ ਕੀਤਾ"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"ਸੰਪਰਕ ਲਈ ਆਈਕਾਨ/\n"
+"ਅਣਜਾਣ ਵਿਅਕਤੀ ਲਈ ਆਈਕਾਨ"
+
+msgid "Icon for Chat"
+msgstr "ਗੱਲਬਾਤ ਲਈ ਆਈਕਾਨ"
+
+msgid "Ignored"
+msgstr "ਅਣਡਿੱਠਾ"
+
+msgid "Founder"
+msgstr "ਖੋਜੀ"
+
+msgid "Operator"
+msgstr "ਓਪਰੇਟਰ"
+
+msgid "Half Operator"
+msgstr "ਅੱਧਾ ਓਪਰੇਟਰ"
+
+msgid "Authorization dialog"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਡਾਈਲਾਗ"
+
+msgid "Error dialog"
+msgstr "ਗਲਤੀ ਡਾਈਲਾਗ"
+
+msgid "Information dialog"
+msgstr "ਜਾਣਕਾਰੀ ਡਾਈਲਾਗ"
+
+msgid "Mail dialog"
+msgstr "ਮੇਲ ਡਾਈਲਾਗ"
+
+msgid "Question dialog"
+msgstr "ਸਵਾਲ ਡਾਈਲਾਗ"
+
+msgid "Warning dialog"
+msgstr "ਚੇਤਾਵਨੀ ਡਾਈਲਾਗ"
+
+msgid "What kind of dialog is this?"
+msgstr "ਇਹ ਡਾਈਲਾਗ ਕਿਸ ਕਿਸਮ ਦਾ ਹੈ?"
+
+msgid "Status Icons"
+msgstr "ਹਾਲਤ ਆਈਕਾਨ"
+
+msgid "Chatroom Emblems"
+msgstr "ਗੱਲਬਾਤ-ਰੂਮ ਨਿਸ਼ਾਨ"
+
+msgid "Dialog Icons"
+msgstr "ਡਾਈਲਾਗ ਆਈਕਾਨ"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "ਪਿਡਗਿਨ ਆਈਕਾਨ ਥੀਮ ਐਡੀਟਰ"
+
+msgid "Contact"
+msgstr "ਸੰਪਰਕ"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "ਪਿਡਗਿਨ ਬੱਡੀਲਿਸਟ ਥੀਮ ਐਡੀਟਰ"
+
+msgid "Edit Buddylist Theme"
+msgstr "ਬੱਡੀ-ਲਿਸਟ ਥੀਮ ਸੋਧ"
+
+msgid "Edit Icon Theme"
+msgstr "ਆਈਕਾਨ ਥੀਮ ਸੋਧ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "ਪਲੱਗਇਨ ਥੀਮ ਐਡੀਟਰ"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "ਪਿਡਗਿਨ ਥੀਮ ਐਡੀਟਰ।"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13361,6 +13859,7 @@ msgstr "ਹਰੇਕ N ਮਿੰਟ ਬਾਅਦ iChat-ਸਟਾਇਲ ਮੁਤ
 msgid "Timestamp Format Options"
 msgstr "ਟਾਈਮ-ਸਟੈਂਪ ਫਾਰਮੈਟ ਚੋਣ"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "24-ਘੰਟੇ ਸਮਾਂ ਫਾਰਮੈਟ ਲਈ ਮਜ੍ਬੂਰ(_F)"
 
@@ -13483,8 +13982,9 @@ msgstr "ਵਿੰਡੋ ਪਿਡਗਿਨ ਚੋਣਾਂ"
 msgid "Options specific to Pidgin for Windows."
 msgstr "ਵਿੰਡੋ ਲਈ ਪਿਡਗਿਨ ਖਾਸ ਚੋਣਾਂ"
 
-msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "ਵਿੰਡੋ ਲਈ ਪਿਡਗਿਨ ਲਈ ਖਾਸ ਚੋਣ ਹੈ, ਜਿਵੇਂ ਕਿ ਬੱਡੀ ਲਿਸਟ ਡੌਕਿੰਗ।"
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "ਵਿੰਡੋਜ਼ ਲਈ ਪਿਡਗਿਨ ਲਈ ਖਾਸ ਚੋਣ ਦਿੰਦਾ ਹੈ, ਜਿਵੇਂ ਕਿ ਬੱਡੀ ਲਿਸਟ ਡੌਕਿੰਗ।"
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>ਲਾਗਆਉਟ।</font>"
@@ -13523,3 +14023,498 @@ msgstr "ਰਾਅ XMPP ਪ੍ਹੈਰਾ ਭੇਜੋ ਅਤੇ ਲਵੋ"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "ਇਹ ਪਲੱਗਇਨ XMPP ਸਰਵਰ ਜਾਂ ਕਲਾਇਟ ਡੀਬੱਗ ਲਈ ਫਾਇਦੇਮੰਦ ਹੈ।"
 
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "ਨਿਕਾਰਾ ਹੋਇਆ BOSH ਕੁਨੈਕਟ ਸਰਵਰ"
+
+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "ਪਰਾਕਸੀ"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "ਸਾਕਟ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "ਸਾਕਟ ਉੱਤੇ ਸੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "ਸਾਕਟ ਪੜ੍ਹਨ ਵਿੱਚ ਅਸਫਲ"
+
+#~ msgid "Connection failed."
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ।"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "ਸਾਕਟ ਬਣ ਨਹੀਂ ਸਕੀ ਹੈ"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "ਹੋਸਟ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Read error"
+#~ msgstr "ਪੜਨ ਗਲਤੀ"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ਸਰਵਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "ਲਿਖਣ ਵਿੱਚ ਗਲਤੀ"
+
+#~ msgid "Last Activity"
+#~ msgstr "ਆਖਰੀ ਐਕਟੀਵਿਟੀ"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "ਸਰਵਿਸ ਡਾਇਰੈਕਟਰੀ ਜਾਣਕਾਰੀ"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "ਸਰਵਰ ਖੋਜ ਆਈਟਮਾਂ"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "ਵਾਧੂ ਪ੍ਹੈਰਾ ਐਡਰੈੱਸਿੰਗ"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "ਮਲਟੀ-ਯੂਜ਼ਰ ਚੈਟ"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "ਮਲਟੀ-ਯੂਜ਼ਰ ਚੈਟ ਵਾਧੂ ਮੌਜੂਦਗੀ ਜਾਣਕਾਰੀ"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "ਇਨ-ਬੈਂਡ ਬਾਇਟ-ਸਟਰੀਮ"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "ਐਡ-ਹਾਕ ਕਮਾਂਡ"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub ਸਰਵਿਸ"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Bytestreams"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "ਆਉਟ ਆਫ਼ ਬੈਂਡ ਡਾਟਾ"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "ਇਨ-ਬੈਂਡ ਰਜਿਸਟਰੇਸ਼ਨ"
+
+#~ msgid "User Location"
+#~ msgstr "ਯੂਜ਼ਰ ਟਿਕਾਣਾ"
+
+#~ msgid "User Avatar"
+#~ msgstr "ਯੂਜ਼ਰ ਅਵਤਾਰ"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "ਚੈਟ ਹਾਲਤ ਨੋਟੀਫਿਕੇਸ਼ਨ"
+
+#~ msgid "Software Version"
+#~ msgstr "ਸਾਫਟਵੇਅਰ ਵਰਜਨ"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "ਸਟਰੀਮ ਸ਼ੁਰੂਆਤ"
+
+#~ msgid "User Mood"
+#~ msgstr "ਯੂਜ਼ਰ ਮੂਡ"
+
+#~ msgid "User Activity"
+#~ msgstr "ਯੂਜ਼ਰ ਸਰਗਰਮੀ"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "ਐਂਟਟੀ ਸਮੱਰਥਾ"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "ਇੰਕ੍ਰਿਪਟਡ ਸ਼ੈਸ਼ਨ ਸਾਂਝ"
+
+#~ msgid "User Tune"
+#~ msgstr "ਯੂਜ਼ਰ ਟਿਊਨ"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "ਰੋਸਟਰ ਆਈਟਮ ਐਕਸ਼ਚੇਜ਼"
+
+#~ msgid "Reachability Address"
+#~ msgstr "ਪਹੁੰਚਯੋਗ ਐਡਰੈੱਸ"
+
+#~ msgid "User Profile"
+#~ msgstr "ਯੂਜ਼ਰ ਪ੍ਰੋਫਾਇਲ"
+
+#~ msgid "Jingle"
+#~ msgstr "ਜਿਙਗਲ"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "ਜਿਙਗਲ ਆਡਿਓ"
+
+#~ msgid "User Nickname"
+#~ msgstr "ਯੂਜ਼ਰ ਨਾਂ"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ਜਿਙਗਲ ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ਜਿਙਗਲ ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "ਜਿਙਗਲ ਰਾਅ UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "ਜਿਙਗਲ ਵਿਡੀਓ"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "ਜਿਙਗਲ DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "ਸੁਨੇਹਾ ਮਿਲਿਆ"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਪਬਲਿਕੇਸ਼ਨ"
+
+#~ msgid "User Chatting"
+#~ msgstr "ਯੂਜ਼ਰ ਚੈਟਿੰਗ"
+
+#~ msgid "User Browsing"
+#~ msgstr "ਯੂਜ਼ਰ ਬਰਾਊਜ਼ਿੰਗ"
+
+#~ msgid "User Gaming"
+#~ msgstr "ਯੂਜ਼ਰ ਗੇਮ"
+
+#~ msgid "User Viewing"
+#~ msgstr "ਯੂਜ਼ਰ ਝਲਕ"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "ਪ੍ਹੈਰਾ ਇੰਕ੍ਰਿਪਸ਼ਨ"
+
+#~ msgid "Entity Time"
+#~ msgstr "ਐਂਟਟੀ ਟਾਈਮ"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "ਡਿਲਵਰੀ ਦੇਰੀ"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "ਸਾਂਝੇ ਡਾਟਾ ਆਬਜੈਕਟ"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "ਫਾਇਲ ਰਿਪੋਜ਼ਟਰੀ ਅਤੇ ਸ਼ੇਅਰਿੰਗ"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "ਜਿਙਗਲ ਲਈ STUN ਸਰਵਿਸ ਖੋਜ"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "ਸਧਾਰਨ ਇੰਕ੍ਰਿਪਟਡ ਸ਼ੈਸ਼ਨ ਸਾਂਝ"
+
+#~ msgid "Hop Check"
+#~ msgstr "ਹੋਪ ਚੈਕ"
+
+#~ msgid "Read Error"
+#~ msgstr "ਪੜ੍ਹਨ ਗਲਤੀ"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਦੌਰਨ ਗਲਤੀ"
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "ਪੜ੍ਹਨ ਬਫ਼ਰ ਭਰਿਆ (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "ਨਾ-ਪਾਰਸਯੋਗ ਸੁਨੇਹਾ"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "ਹੋਸਟ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "ਦਾਖਲਾ ਅਸਫਲ (%s)"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "ਤੁਸੀਂ ਲਾਗ ਆਉਟ ਹੋ ਗਏ ਹੋ, ਕਿਉਕਿ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ ਵਰਕਸਟੇਸ਼ਨ ਉੱਤੇ ਲਾਗਇਨ ਹੋ ਗਏ ਹੋ।"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "ਗਲਤੀ ਹੈ। SSL ਸਹਿਯੋਗ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Incorrect password."
+#~ msgstr "ਗਲਤ ਪਾਸਵਰਡ ਹੈ।"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਨਹੀਂ ਸਕਿਆ:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਛੇਤੀ ਹੀ ਬੰਦ ਹੋ ਸਕਦਾ ਹੈ। ਅੱਪਡੇਟ ਲਈ %s ਵੇਖੋ।"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "ਜੁੜਿਆ ਨਹਾਂ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#~ msgid "Invalid username."
+#~ msgstr "ਗਲਤ ਯੂਜ਼ਰ-ਨਾਂ ਹੈ।"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "ਸਰਵਰ ਜਵਾਬ ਡਿਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Connection lost"
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "ਹੋਸਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ (ਲਿਖਿਆ ਜਾ ਰਿਹਾ ਹੈ)"
+
+#~ msgid "Connection reset"
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਮੁੜ-ਸੈੱਟ ਕੀਤਾ ਗਿਆ"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "ਸਾਕਟ ਤੋਂ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "ਹੋਸਟ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਅਸਮਰੱਥ"
+
+#~ msgid "Could not write"
+#~ msgstr "ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Could not connect"
+#~ msgstr "ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "ਸੁਣਨ ਸਾਕਟ ਬਣ ਨਹੀਂ ਸਕੀ ਹੈ"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ਹੋਸਟ-ਨਾਂ ਹੱਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "ਗਲਤ ਪਾਸਵਰਡ"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s ਨਾਲ ਕੁਨੈਕਸਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo ਜਾਪਾਨ"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "ਜਾਪਾਨ ਪੇਜ਼ਰ ਸਰਵਰ"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "ਜਾਪਾਨ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਰਵਰ"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "ਹੋਸਟ ਨਾਂ ਹੱਲ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "ਲਾਗਇਨ ਲਈ ਸਰਵਰ ਨੂੰ TLS/SSL ਲੋੜੀਦਾ ਹੈ। ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਓਹਲੇ"
+
+#~ msgid "More Data needed"
+#~ msgstr "ਹੋਰ ਡਾਟਾ ਚਾਹੀਦਾ ਹੈ"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "ਸਮਾਈਲੀ ਨਾਲ ਸਬੰਧਿਤ ਸ਼ਾਰਟਕੱਟ ਦਿਓ ਜੀ।"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "ਸਮਾਈਲੀ ਲਈ ਚਿੱਤਰ ਚੁਣੋ ਜੀ।"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "ਕਿਹੜਾ ID ਐਕਟੀਵੇਟ ਕਰਨਾ ਹੈ?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "ਕਰਸਰ ਰੰਗ"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "ਸੈਕੰਡਰੀ ਕਰਸਰ ਰੰਗ"
+
+#~ msgid "Interface colors"
+#~ msgstr "ਇੰਟਰਫੇਸ ਰੰਗ"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "ਵਿਦਗਿਟ ਆਕਾਰ"
+
+#~ msgid "Invite message"
+#~ msgstr "ਸੱਦਾ ਸੁਨੇਹਾ"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "ਸੱਦਾ ਭੇਜਣ ਲਈ ਯੂਜ਼ਰ ਦਾ ਨਾਂ ਦਿਓ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਸੱਦਾ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ,\n"
+#~ "ਚੋਣਵੇਂ ਰੂਪ ਵਿੱਚ ਸੱਦਾ ਸੁਨੇਹਾ ਵੀ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ"
+
+#~ msgid "Signon: %s"
+#~ msgstr "ਦਾਖਲ: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "ਫਾਇਲ %s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "ਫਾਇਲ %s ਪੜਨ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "ਸੁਨੇਹਾ ਬਹੁਤ ਲੰਮਾ ਹੈ, ਆਖਰੀ %s ਬਾਈਟ ਹਟਾਏ ਗਏ ਹਨ।"
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s ਇਸ ਸਮੇਂ ਲਾਗਇਨ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s ਲਈ ਉਡੀਕ ਸਵੀਕਾਰ ਨਹੀਂ ਹੈ।"
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "ਇੱਕ ਸੁਨੇਹਾ ਗੁਆ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਤੁਸੀਂ ਸਰਵਰ ਗਤੀ ਸੀਮਾ ਤੋਂ ਵੱਧ ਗਏ ਹੋ।"
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%s ਵਿੱਚ ਗੱਲਬਾਤ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "ਤੁਸੀਂ %s ਨੂੰ ਸੁਨੇਹੇ ਬਹੁਤ ਤੇਜ਼ੀ ਨਾਲ ਭੇਜ ਰਹੇ ਹੋ।"
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "ਤੁਸੀਂ %s ਤੋਂ ਇੱਕ IM ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਕਿ ਇਹ ਵੱਡਾ ਸੀ"
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "ਤੁਸੀਂ %s ਤੋਂ ਇੱਕ IM ਗੁਆ ਲਿਆ ਹੈ, ਕਿਉਕਿ ਇਹ ਬਹੁਤ ਤੇਜ਼ੀ ਨਾਲ ਭੇਜਿਆ ਗਿਆ ਹੈ।"
+
+#~ msgid "Failure."
+#~ msgstr "ਅਸਫਲ ਹੈ।"
+
+#~ msgid "Too many matches."
+#~ msgstr "ਬਹੁਤ ਮੇਲ ਹਨ।"
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "ਹੋਰ ਯੋਗਤਾ ਦੀ ਲੋੜ ਹੈ।"
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "ਡਾਈ ਸਰਵਿਸ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "ਈਮੇਲ ਖੋਜ ਪਾਬੰਦੀ ਹੈ।"
+
+#~ msgid "Keyword ignored."
+#~ msgstr "ਸ਼ਬਦ ਅਣਡਿੱਠਾ"
+
+#~ msgid "No keywords."
+#~ msgstr "ਕੋਈ ਸ਼ਬਦ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "User has no directory information."
+#~ msgstr "ਯੂਜ਼ਰ ਦੀ ਕੋਈ ਡਾਇਰੈਕਟਰੀ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Country not supported."
+#~ msgstr "ਦੇਸ਼ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "ਅਣਜਾਣੀ ਅਸਫਲਤਾ: %s"
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "ਗਲਤ ਯੂਜ਼ਰ-ਨਾਂ ਜਾਂ ਪਾਸਵਰਡ।"
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "ਸਰਵਿਸ ਆਰਜ਼ੀ ਤੌਰ ਉੱਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "ਤੁਹਾਡਾ ਚੇਤਾਵਨੀ ਲੈਵਲ ਇੰਨਾ ਜ਼ਿਆਦਾ ਹੈ ਕਿ ਲਾਗਇਨ ਨਹੀਂ ਹੋਇਆ ਜਾਂਦਾ ਹੈ।"
+
+#~ 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 ""
+#~ "ਤੁਸੀਂ ਲਗਾਤਾਰ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਹੇ ਹੋ। ਦਸ ਮਿੰਟ ਦੀ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ "
+#~ "ਕੀਤੀ ਤਾਂ ਹੋਰ ਵੀ ਵਧੇਰੇ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "ਇੱਕ ਅਣਜਾਣੀ ਦਾਖਲਾ ਗਲਤੀ ਆਈ ਹੈ: %s"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "ਅਣਜਾਣੀ ਗਲਤੀ, %d,ਆਈ ਹੈ।  ਜਾਣਕਾਰੀ: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "ਗਲਤ ਗਰੁੱਪ-ਨਾਂ"
+
+#~ msgid "Connection Closed"
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਹੋਇਆ"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "ਜਵਾਬ ਦੀ ਉਡੀਕ ਜਾਰੀ ਹੈ..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC ਆਪਣੀ ਵਿਰਾਮ ਸਥਿਤੀ ਤੋਂ ਵਾਪਿਸ ਹੋਇਆ। ਹੁਣ ਤੁਸੀਂ ਸੁਨੇਹੇ ਭੇਜ ਸਕਦੇ ਹੋ।"
+
+#~ msgid "Password Change Successful"
+#~ msgstr "ਪਾਸਵਰਡ ਸਫਲਤਾਪੂਰਕ ਤਬਦੀਲ ਕੀਤਾ ਗਿਆ"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "ਡਾਇ ਜਾਣਕਾਰੀ ਲਵੋ"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "ਡਾਇ ਜਾਣਕਾਰੀ ਦਿਓ"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "%s ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "ਫਾਇਲ ਸੰਚਾਰ ਅਸਫਲ ਹੈ; ਦੂਜੇ ਪਾਸੇ ਤੋਂ ਰੱਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "ਭੇਜਣ ਲਈ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "ਫਾਇਲ ਸਿਰਲੇਖ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਇਹ ਫਾਇਲ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੇਗੀ।"
+
+#~ msgid "Save As..."
+#~ msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s ਨੇ %s ਨੂੰ %d ਫਾਇਲ ਸਵੀਕਾਰ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s ਨੇ %s ਨੂੰ %d ਫਾਇਲਾਂ ਸਵੀਕਾਰ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਫਾਇਲ ਭੇਜਣ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
+
+#~ msgid "%s Options"
+#~ msgstr "%s ਚੋਣ"
+
+#~ msgid "Proxy Options"
+#~ msgstr "ਪਰਾਕਸੀ ਚੋਣ"
+
+#~ msgid "By log size"
+#~ msgstr "ਲਾਗ ਅਕਾਰ"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "ਝਲਾਕਾਰੇ ਵਿੱਚ ਖੋਲੋ(_O)"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN ਸਰਵਰ:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "ਸਮਾਈਲੀ ਚਿੱਤਰ(_I)"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "ਸਮਾਈਲੀ ਸ਼ਾਰਟਕੱਟ(_h)"
diff --git a/po/pl.po b/po/pl.po
index b2706e6b43..3f38208225 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin polish translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 12:36-0500\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-12-29 17:50+0100\n"
 "Last-Translator: Piotr Makowski (Aviary.pl) <pmakowski@aviary.pl>\n"
 "Language-Team: Piotr Makowski (Aviary.pl) <pmakowski@aviary.pl>\n"
@@ -35,13 +35,13 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Napisz \"%s -h\" aby uzyskać więcej informacji.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -634,19 +634,6 @@ msgstr ""
 msgid "Send To"
 msgstr "_Wyślij do"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "Wstaw do rozmowy"
-
-msgid "Invite"
-msgstr "Zaproś"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr "Wpisz kogo chcesz zaprosić, dodatkowo można podać tekst zaproszenia."
-
 msgid "Conversation"
 msgstr "Rozmowa"
 
@@ -906,6 +893,41 @@ msgstr "Rozmowy"
 msgid "System Log"
 msgstr "Dziennik systemowy"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Obliczanie..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Akceptuj"
+
+msgid "Reject"
+msgstr "Odrzuć"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Opuszczono kanał%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "Emaile"
 
@@ -941,6 +963,9 @@ msgstr "Kontynuuj"
 msgid "IM"
 msgstr "Wiadomość"
 
+msgid "Invite"
+msgstr "Zaproś"
+
 msgid "(none)"
 msgstr "(brak)"
 
@@ -1151,7 +1176,6 @@ msgstr "%s zmieniła/zmienił stus na zajęty. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s wysłał do Ciebie wiadomość. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 "Przechwycono nieznane zdarzenie. Proszę zawiadomić autorów programu Pidgin!"
@@ -1206,7 +1230,6 @@ msgstr "_Czas (w minutach) do zmiany statusu:"
 msgid "Change status to"
 msgstr "Zmiana _statusu na:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Rozmowy"
 
@@ -1609,6 +1632,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr "Instaluj wtyczkę..."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "konta"
 
@@ -1714,13 +1759,6 @@ msgstr "Certyfikat dla %s"
 msgid "SSL Certificate Verification"
 msgstr "Weryfikacja Certyfikatu SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Akceptuj"
-
-msgid "Reject"
-msgstr "Odrzuć"
-
 #, fuzzy
 msgid "_View Certificate..."
 msgstr "/Narzędzia/_Certyfikaty"
@@ -1812,6 +1850,8 @@ msgstr "+++ %s zalogował się"
 msgid "+++ %s signed off"
 msgstr "+++ %s rozłączył się"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
@@ -1858,6 +1898,16 @@ msgstr "użytkownik %s wyszedł z pokoju."
 msgid "%s left the room (%s)."
 msgstr "użytkownik %s wyszedł z pokoju (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Zaproś do konferencji"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "Wpisz kogo chcesz zaprosić, dodatkowo można podać tekst zaproszenia."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Nie można utworzyć połączenia: %s"
@@ -2185,6 +2235,10 @@ msgstr "<font color=\"red\"><b>Nie można odczytać pliku: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATYCZNA-ODPOWIEDŹ>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Błąd podczas tworzenia połączenia"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Używasz %s, ale plugin wymaga %s."
@@ -2589,9 +2643,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Dodaje możliwość przeglądania dziennika rozmów z innych komunikatorów."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2647,8 +2702,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Zapisuje wiadomości wysłane do niedostępnego użytkownika jako powiadomienie."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Reszta wiadomości zostanie zapisana jako powiadomienie. Możesz edytować/"
@@ -2679,6 +2735,32 @@ msgstr "Zapisuj wiadomości offline jako zdarzenie"
 msgid "Do not ask. Always save in pounce."
 msgstr "Nie pytaj. Zawsze zapisuj jako zdarzenie."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Wprowadź hasło"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2870,12 +2952,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Nie można zainicjować połączenia"
 
 msgid ""
@@ -2884,7 +2966,6 @@ msgstr ""
 "Nie można nawiązać połączenia z lokalnym serwerem mDNS. Sprawdź czy jest on "
 "uruchomiony."
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Imię"
 
@@ -2917,6 +2998,11 @@ msgstr "Wtyczka protokołu Bonjour"
 msgid "Purple Person"
 msgstr "Nowa osoba"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Miejscowość"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2927,15 +3013,21 @@ msgstr "%s zamknęła/zamknął rozmowę."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nie można wysłać wiadomości, rozmowa nie może zostać rozpoczęta."
 
-msgid "Cannot open socket"
-msgstr "Nie można otworzyć gniazda"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Nie można utworzyć gniazda:\n"
+"%s"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Nie można nasłuchiwać na danym gnieździe"
 
-msgid "Could not listen on socket"
-msgstr "Nie można nasłuchiwać na danym gnieździe"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Nie można utworzyć gniazda:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -2985,13 +3077,16 @@ msgstr "Zapis listy znajomych..."
 msgid "Load buddylist from file..."
 msgstr "Wczytaj listę kontaktów z pliku..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Wypełnij pola wymagane do rejestracji."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Wprowadzone hasła nie są ze sobą zgodne."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Nie można zarejestrować nowego konta. Nastąpił błąd.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3003,14 +3098,15 @@ msgstr "Rejestracja zakończona pomyślnie!"
 msgid "Password"
 msgstr "Hasło"
 
-msgid "Password (retype)"
-msgstr "Powtórz hasło:"
+msgid "Password (again)"
+msgstr "Hasło (ponownie)"
 
-msgid "Enter current token"
-msgstr "Wprowadź tekst z obrazka"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Obrazek (token)"
+#, fuzzy
+msgid "Captcha"
+msgstr "Zapis obrazu"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Zarejestruj nowe konto Gadu-Gadu"
@@ -3063,6 +3159,15 @@ msgstr "Hasło zostało zmienione!"
 msgid "Current password"
 msgstr "Aktualne hasło"
 
+msgid "Password (retype)"
+msgstr "Powtórz hasło:"
+
+msgid "Enter current token"
+msgstr "Wprowadź tekst z obrazka"
+
+msgid "Current token"
+msgstr "Obrazek (token)"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Wpisz swoje bieżące hasło oraz nowe hasło dla numeru:"
 
@@ -3076,6 +3181,7 @@ msgstr "Wybierz konferencję dla: %s"
 msgid "Add to chat..."
 msgstr "Dodaj do konferencji..."
 
+#. Global
 msgid "Available"
 msgstr "Dostępny"
 
@@ -3109,7 +3215,8 @@ msgstr "Nie znaleziono żadnego użytkownika"
 msgid "There are no users matching your search criteria."
 msgstr "Nie ma użytkowników spełniających Twoje kryteria wyszukiwania."
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Nie można czytać z gniazda"
 
 msgid "Buddy list downloaded"
@@ -3124,8 +3231,14 @@ msgstr "Wysłano listę kontaktów"
 msgid "Your buddy list was stored on the server."
 msgstr "Twoja lista kontaktów została wysłana na serwer."
 
-msgid "Connection failed."
-msgstr "Błąd połączenia."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Połączono"
+
+msgid "Connection failed"
+msgstr "Błąd połączenia"
 
 msgid "Add to chat"
 msgstr "Dodaj do konferencji"
@@ -3133,13 +3246,23 @@ msgstr "Dodaj do konferencji"
 msgid "Chat _name:"
 msgstr "Nazwa ko_nferencji:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Nie można połączyć się z serwerem."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "łączenie"
+
 msgid "Chat error"
 msgstr "Błąd konferencji"
 
 msgid "This chat name is already in use"
 msgstr "Nazwa konferencji jest aktualnie używana"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Nie jesteś połączony z serwerem."
 
 msgid "Find buddies..."
@@ -3181,6 +3304,10 @@ msgstr "Popularny w Polsce komunikator"
 msgid "Gadu-Gadu User"
 msgstr "Użytkownik Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Ustaw dane użytkownika..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nieznane polecenie: %s"
@@ -3195,7 +3322,8 @@ msgstr "Brak ustawionego tematu"
 msgid "File Transfer Failed"
 msgstr "Przesyłanie plików zakończyło się niepowowdzeniem"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Nie można otworzyć portu do nasłuchu."
 
 msgid "Error displaying MOTD"
@@ -3211,8 +3339,18 @@ msgstr "Brak wiadomości dnia (MOTD) powiązanej z tym połączeniem."
 msgid "MOTD for %s"
 msgstr "Wiadomość dnia (MOTD) dla %s"
 
-msgid "Server has disconnected"
-msgstr "Serwer został rozłączony"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Utracono połączenie z serwerem:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Wyświetlanie wiadomości dnia (MOTD)"
@@ -3223,25 +3361,24 @@ msgstr "_Kanał:"
 msgid "_Password:"
 msgstr "_Hasło:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Pseudonimy IRC nie mogą zawierać pustych znaków"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "łączenie"
-
 msgid "SSL support unavailable"
 msgstr "Brak obsługi SSL"
 
-msgid "Couldn't create socket"
-msgstr "Nie można utworzyć gniazda"
+msgid "Unable to connect"
+msgstr "Nie można się połączyć"
 
-msgid "Couldn't connect to host"
-msgstr "Nie można połączyć się z serwerem"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Nie można połączyć się z %s"
 
-msgid "Read error"
-msgstr "Błąd oczytu"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Połączenie zostało zamknięte przez serwer."
 
 msgid "Users"
 msgstr "Użytkownicy"
@@ -3424,6 +3561,17 @@ msgstr ""
 "Wybrana przez Ciebie nazwa konta została odrzucona przez serwer. "
 "Prawdopodobnie dlatego, że zawierała niedozwolone znaki."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Nazwa konferencji jest aktualnie używana"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Identyfikator"
+
 msgid "Cannot change nick"
 msgstr "Nie można zmienić ksywki"
 
@@ -3669,13 +3817,14 @@ msgstr "Polecenie wyłączone"
 msgid "execute"
 msgstr "Nie oczekiwano"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Serwer wymaga TLS/SSL do zalogowania. Jednak Twój Pidgin nie posiada obsługi "
 "TLS/SSL."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Serwer wymaga TLS/SSL do zalogowania. Jednak Twój Pidgin nie posiada obsługi "
 "TLS/SSL."
@@ -3697,18 +3846,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Uwierzytelniania w czystym tekście"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autoryzacja nie powiodła się"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Nieprawidłowa odpowiedź z serwera."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Serwer nie używa żadnej z obsługiwanych metod uwierzytelniania"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Nieprawidłowe żądanie od serwera"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Błąd SASL"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Nie podano powodu."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Nieobsługiwana wersja"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Nie można nawiązać połączenia z serwerem:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Nie można nawiązać połączenia z serwerem:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Nie można zainicjować połączenia"
+
 msgid "Full Name"
 msgstr "Imię i nazwisko"
 
@@ -3775,186 +3960,9 @@ msgstr "Klient"
 msgid "Operating System"
 msgstr "System operacyjny"
 
-msgid "Last Activity"
-msgstr ""
-
 #, fuzzy
-msgid "Service Discovery Info"
-msgstr "Ustaw informację katalogu"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Rozszerzony adres"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Alias konferencji"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Użytkownik nie posiada informacji w katalogu."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Polecenie"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Błąd podczas rejestracji"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Położenie"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "Wyszukiwanie użytkownika"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Powiadamianie o stanie znajomych"
-
-msgid "Software Version"
-msgstr "Wersja oprogramowania"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Ułożenie"
-
-msgid "File Transfer"
-msgstr "Przesyłanie pliku ukończone"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Tryby użytkownika"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Ograniczenie użytkowników"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Funkcje klienta"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Użytkownik"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "Wiadomość z wymianą kluczy"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Adres email"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Profil"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Przyłącz się"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Nazwa użytkownika"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Wideo na żywo"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Odebrano wiadomość"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Plik z kluczem publicznym"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Opcje użytkownika"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Tryby użytkownika"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Nazwa użytkownika"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Ograniczenie użytkowników"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Szyfrowanie Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Funkcje klienta"
+msgid "Local Time"
+msgstr "Lokalna nazwa pliku:"
 
 msgid "Priority"
 msgstr "Priorytet"
@@ -3962,6 +3970,14 @@ msgstr "Priorytet"
 msgid "Resource"
 msgstr "Zasób"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Zalogowany"
+
 msgid "Middle Name"
 msgstr "Drugie imię"
 
@@ -4128,29 +4144,26 @@ msgstr "Wpisz adres serwera konferencyjnego, z którego chcesz pobrać listę"
 msgid "Find Rooms"
 msgstr "Szukanie pokoju"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
-msgid "Write error"
-msgstr "Błąd zapisu"
+#, fuzzy
+msgid "No users found"
+msgstr "Nie znaleziono żadnego użytkownika"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Zwykły tekst"
+msgid "Roles:"
+msgstr "Rola"
 
-msgid "Read Error"
-msgstr "Błąd oczytu"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Zwykły tekst"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Nie można nawiązać połączenia z serwerem:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Nie można utworzyć gniazda"
 
 msgid "Invalid XMPP ID"
 msgstr "Nieprawidłowy identyfikator XMPP"
@@ -4158,6 +4171,10 @@ msgstr "Nieprawidłowy identyfikator XMPP"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Nie udało się połączyć z serwerem."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Pomyślnie zarejestrowano nowy identyfikator %s@%s "
@@ -4184,9 +4201,6 @@ msgstr "Rejestracja zakończona pomyślnie"
 msgid "Unregistration Failed"
 msgstr "Błąd podczas rejestracji"
 
-msgid "Already Registered"
-msgstr "Już zarejestrowano"
-
 msgid "State"
 msgstr "Stan"
 
@@ -4199,6 +4213,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Już zarejestrowano"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Rejestruj"
@@ -4229,6 +4246,10 @@ msgid "Change Registration"
 msgstr "Zmiana rejestracji"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Nie udało się połączyć z serwerem."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Błąd podczas zmiany informacji o koncie"
 
@@ -4254,6 +4275,12 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Brak autoryzacji"
 
+msgid "Mood"
+msgstr "Nastrój"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Obustronna"
 
@@ -4275,12 +4302,6 @@ msgstr "Brak"
 msgid "Subscription"
 msgstr "Subskrypcja"
 
-msgid "Mood"
-msgstr "Nastrój"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "Grupa krwi"
@@ -4328,9 +4349,6 @@ msgstr "Hasło zostało zmienione."
 msgid "Error changing password"
 msgstr "Błąd przy zmianie hasła"
 
-msgid "Password (again)"
-msgstr "Hasło (ponownie)"
-
 msgid "Change XMPP Password"
 msgstr "Zmień hasło XMPP"
 
@@ -4524,20 +4542,30 @@ msgstr "Nie można wykopać użytkownika %s"
 msgid "Unable to ping user %s"
 msgstr "Nie można zbanować użytkownika %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
+"Nie można przesłać pliku do %s, użytkownik nie ma włączonej obsługi "
+"przesyłania plików"
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
+"Nie można przesłać pliku do %s, użytkownik nie ma włączonej obsługi "
+"przesyłania plików"
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 "Nie można przesłać pliku do %s, użytkownik nie ma włączonej obsługi "
 "przesyłania plików"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4547,9 +4575,34 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr "%s zalogował się."
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Nie można wysłać wiadomości do %s - niewłaściwy JID"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Nie można przesłać pliku do %s: użytkownik nie jest połączony z siecią"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Nie można przesłać pliku do %s: użytkownik nie jest połączony z siecią"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Błąd podczas rejestracji"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Wybierz zasób kontaktu %s na który chcesz wysłać plik"
+
+msgid "Select a Resource"
+msgstr "Wybór Zasobu"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Rozpocznij _konferencję"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguruje pokój konferencyjny."
@@ -4572,16 +4625,18 @@ msgstr ""
 "ban &lt;użytkownik&gt; [pokój]:  Blokuje dostęp określonego użytkownika do "
 "pokoju."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;użytkownik&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Ustawia przynależność użytkownika w danym pokoju."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;użytkownik&gt; &lt;moderator|participant|visitor|none&gt;: Zmienia "
 "rolę użytkownika w danym pokoju."
@@ -4652,6 +4707,9 @@ msgstr "Serwer"
 msgid "File transfer proxies"
 msgstr "Port do przesyłania plików"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4690,6 +4748,14 @@ msgstr "Błąd przetwarzania XML"
 msgid "Unknown Error in presence"
 msgstr "Nieznany błąd obecności"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Błąd przyłączania się do konferencji %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Błąd w konferencji %s"
+
 msgid "Create New Room"
 msgstr "Utworzenie nowego pokoju"
 
@@ -4706,13 +4772,32 @@ msgstr "_Konfiguruj pokój"
 msgid "_Accept Defaults"
 msgstr "_Akceptuj domyślne"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Błąd przyłączania się do konferencji %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nie podano powodu."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Błąd w konferencji %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Zostałeś wykopany przez %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Wykopany przez %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Wystąpił błąd podczas otwierania pliku."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Przesyłanie plików zakończyło się niepowowdzeniem"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Nie można odczytać pliku '%s': %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4739,9 +4824,6 @@ msgstr "Nie można przesłać pliku do %s: użytkownik nie jest połączony z si
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Wybierz zasób kontaktu %s na który chcesz wysłać plik"
 
-msgid "Select a Resource"
-msgstr "Wybór Zasobu"
-
 msgid "Edit User Mood"
 msgstr "Modyfikuj nastrój użytkownika"
 
@@ -4775,10 +4857,6 @@ msgstr "Działania"
 msgid "Select an action"
 msgstr "Wybór działania"
 
-#, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Nie można pobrać listy znajomych"
-
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
@@ -5045,6 +5123,10 @@ msgstr "Preferowany kontakt"
 msgid "Non-IM Contacts"
 msgstr "Usunięcie kontaktu"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5201,9 +5283,6 @@ msgstr "Rozpocznij _konferencję"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN wymaga obsługi SSL. Zainstaluj obsługiwaną bibliotekę SSL."
 
-msgid "Failed to connect to server."
-msgstr "Nie udało się połączyć z serwerem."
-
 msgid "Error retrieving profile"
 msgstr "Błąd podczas pobierania profilu"
 
@@ -5395,66 +5474,29 @@ msgstr "Uwierzytelnianie Windows Live ID: nie można połączyć"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Uwierzytelnianie Windows Live ID: nie można połączyć"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s nie jest poprawną nazwą grupy."
-
-msgid "Unknown error."
-msgstr "Nieznany błąd."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s wysłał do Ciebie wiadomość"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Nieznany błąd (%d)"
 
 msgid "Unable to add user"
 msgstr "Nie można dodać użytkownika"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Nieznany błąd (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Poniżej znajdują się wyniki wyszukiwania"
 
-#, fuzzy, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nie można zablokować użytkownika na %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nie można zablokować użytkownika na %s (%s)"
-
-#, fuzzy, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nie można zablokować użytkownika na %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nie został dodany ponieważ Twoja lista znajomych jest pełna."
-
-#, fuzzy, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nie jest poprawną nazwą grupy."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Usługa jest tymczasowo niedostępna."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Wiadomość nie została wysłana, ponieważ nie jesteś zalogowany."
 
-msgid "Unable to rename group"
-msgstr "Nie można zmienić nazwy grupy"
-
-msgid "Unable to delete group"
-msgstr "Nie można skasować grupy"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5506,9 +5548,6 @@ msgstr "Wiadomość nie została wysłana ponieważ nastąpił nieznany błąd:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Wiadomość nie została wysłana ponieważ nastąpił nieznany błąd:"
 
-msgid "Unable to connect"
-msgstr "Nie można się połączyć"
-
 msgid "Writing error"
 msgstr "Błąd zapisu"
 
@@ -5523,20 +5562,24 @@ msgstr ""
 "Błąd połączenia od %s serwer:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Nasz protokół nie jest obsługiwany przez serwer."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Błąd przetwarzania HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Zalogowano się z innego komputera."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Serwery MSN są tymczasowo niedostępne. Odczekaj trochę i spróbuj ponownie."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Serwery MSN są właśnie tymczasowo wyłączane."
 
 #, c-format
@@ -5567,6 +5610,14 @@ msgstr "Wysyłanie ciasteczka"
 msgid "Retrieving buddy list"
 msgstr "Pobieranie listy znajomych"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Nie ma mnie przy komputerze"
 
@@ -5608,14 +5659,6 @@ msgstr "Wiadomość nie została wysłana, ponieważ wystąpił błąd połącze
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Wiadomość nie została wysłana ponieważ nastąpił nieznany błąd:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s dodał Ciebie do swojej listy znajomych."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "użytkownik %s usunął Ciebie ze swojej listy znajomych."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Dodaj do książki adresowej"
@@ -5648,6 +5691,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Wtyczka protokołu MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nie jest poprawną nazwą grupy."
+
+msgid "Unknown error."
+msgstr "Nieznany błąd."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, fuzzy, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nie można zablokować użytkownika na %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nie można zablokować użytkownika na %s (%s)"
+
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nie można zablokować użytkownika na %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nie został dodany ponieważ Twoja lista znajomych jest pełna."
+
+#, fuzzy, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nie jest poprawną nazwą grupy."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Usługa jest tymczasowo niedostępna."
+
+msgid "Unable to rename group"
+msgstr "Nie można zmienić nazwy grupy"
+
+msgid "Unable to delete group"
+msgstr "Nie można skasować grupy"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s dodał Ciebie do swojej listy znajomych."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "użytkownik %s usunął Ciebie ze swojej listy znajomych."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5683,6 +5774,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nowe wiadomości pocztowe"
 
@@ -5719,24 +5812,21 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Nieprawidłowa odpowiedź z serwera."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Połączono"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Proces zwrócił kod błędu %d"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Niepoprawny identyfikator lub hasło"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -5745,18 +5835,6 @@ msgid "Invalid input condition"
 msgstr "Finalizowanie połączenia"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Kolejka jest pełna"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Nie udało się przetworzyć wiadomości."
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Nie można połączyć się z serwerem"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Nie można przyłączyć znajomego do konferencji"
 
@@ -5844,6 +5922,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Wersja klienta"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Usługa niedostępna"
@@ -6067,10 +6151,6 @@ msgstr "Nie można dodać siebie samego"
 msgid "Master archive is misconfigured"
 msgstr "Główne archiwum nie jest skonfigurowane"
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "Niepoprawny identyfikator lub hasło"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6116,9 +6196,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr "Nieznany błąd: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Logowanie zakończyło się niepowodzeniem (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Nie można zbanować użytkownika %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6224,9 +6304,6 @@ msgstr "Konferencja GrupWise %d"
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-msgid "Unable to connect to server."
-msgstr "Nie można połączyć się z serwerem."
-
 msgid "Waiting for response..."
 msgstr "Oczekiwanie na odpowiedź..."
 
@@ -6250,26 +6327,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Czy chcesz przyłączyć się do konwersacji?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Wylogowano, ponieważ zalogowano się na to samo konto z innego komputera."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s zdaje się być rozłączony i nie odebrał wiadomości którą właśnie wysłano."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Nie można połączyć się z serwerem. Podaj adres serwera z którym chcesz się "
 "połączyć."
 
-msgid "Error. SSL support is not installed."
-msgstr "Błąd. Obsługa SSL nie jest zainstalowana."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ta konferencja została zamknięta. Nie można wysyłać na nią wiadomości."
 
@@ -6293,6 +6364,28 @@ msgid "Server port"
 msgstr "Port serwera"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Nieprawidłowa odpowiedź z serwera HTTP."
+
+#. username connecting too frequently
+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 ""
+"Zbyt częste próby łączenia i rozłączania. Zaczekaj dziesięć minut i spróbuj "
+"ponownie. Jeśli próba zostanie podjęta teraz, czas oczekiwania jeszcze się "
+"wydłuży."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr ""
+"Błąd tłumaczenia nazwy %s na adres IP: \n"
+"%s"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Nie można połączyć"
 
@@ -6300,19 +6393,8 @@ msgstr "Nie można połączyć"
 msgid "Invalid chat room name"
 msgstr "Niepoprawna nazwa pokoju"
 
-msgid "Server closed the connection."
-msgstr "Połączenie zostało zamknięte przez serwer."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Utracono połączenie z serwerem:\n"
-"%s"
-
 #, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Nie udało się połączyć z serwerem."
 
 #. *< type
@@ -6364,7 +6446,7 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 
 #, fuzzy
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 "Nie można nawiązać połączenia z serwerem:\n"
 "%s"
@@ -6566,20 +6648,14 @@ msgid "Buddy Comment"
 msgstr "Komentarz dot. znajomego"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Nie udało się połączyć z serwerem BOS:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Nie udało się połączyć z serwerem BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nie można połączyć się z serwerem."
 
 #, fuzzy
 msgid "Username sent"
@@ -6594,50 +6670,60 @@ msgstr "Finalizowanie połączenia"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Połączenie może wkrótce zostać zerwane. Sugerowana jest zmiana protokołu na "
+"TOC zanim problem zostanie rozwiązany. Uaktualnienia będą dostępne na %s."
+
+msgid "Unable to get a valid AIM login hash."
 msgstr ""
+"Program Pidgin nie był w stanie otrzymać poprawnego klucza logowania do AIM."
+
+msgid "Unable to get a valid login hash."
+msgstr "Program Pidgin nie był w stanie otrzymać poprawnego klucza logowania."
 
-#. Unregistered screen name
+msgid "Received authorization"
+msgstr "Otrzymano autoryzację"
+
+#. Unregistered username
 #. uid is not exist
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Niewłaściwa ksywka"
-
-msgid "Incorrect password."
-msgstr "Niepoprawne hasło."
+msgid "Username does not exist"
+msgstr "Użytkownik nie istnieje"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Twoje konto jest w tej chwili zawieszone."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Usługa AOL Instant Messenger jest tymczasowo niedostępna."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Wersja klienta, której używasz, jest zbyt stara. Uaktualnij ją z %s."
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Zbyt częste próby łączenia i rozłączania. Zaczekaj dziesięć minut i spróbuj "
 "ponownie. Jeśli próba zostanie podjęta teraz, czas oczekiwania jeszcze się "
 "wydłuży."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Wersja klienta, której używasz, jest zbyt stara. Uaktualnij ją z %s."
-
-msgid "Could Not Connect"
-msgstr "Nie można się połączyć"
-
-msgid "Received authorization"
-msgstr "Otrzymano autoryzację"
-
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "Nowe formatowanie nie jest poprawne."
 
 msgid "Enter SecurID"
 msgstr ""
@@ -6651,25 +6737,6 @@ msgstr ""
 msgid "_OK"
 msgstr "_OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Połączenie może wkrótce zostać zerwane. Sugerowana jest zmiana protokołu na "
-"TOC zanim problem zostanie rozwiązany. Uaktualnienia będą dostępne na %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-"Program Pidgin nie był w stanie otrzymać poprawnego klucza logowania do AIM."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Połączenie może wkrótce zostać zerwane. Sugerowana jest zmiana protokołu na "
-"TOC zanim problem zostanie rozwiązany. Uaktualnienia będą dostępne na %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Program Pidgin nie był w stanie otrzymać poprawnego klucza logowania."
-
 msgid "Password sent"
 msgstr "Hasło wysłane"
 
@@ -6810,7 +6877,7 @@ msgstr[0] "Pominięto %hu wiadomość od %s z nieznanych powodów."
 msgstr[1] "Pominięto %hu wiadomości od %s z nieznanych powodów."
 msgstr[2] "Pominięto %hu wiadomości od %s z nieznanych powodów."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Nie można wysłać wiadomości: %s"
@@ -6832,6 +6899,9 @@ msgstr "Zalogowany od"
 msgid "Member Since"
 msgstr "Zapisany od"
 
+msgid "Capabilities"
+msgstr "Funkcje klienta"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7024,7 +7094,7 @@ msgstr "Zbyt długi komunikat nieobecności."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7045,9 +7115,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Osieroceni"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Nie udało się dodać kontaktu %s, ponieważ jest za dużo osób na liście. Usuń "
@@ -7057,7 +7127,7 @@ msgid "(no name)"
 msgstr "(bez nazwy)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Wykonanie polecenia zakończyło się niepowodzeniem z nieznanego powodu."
 
 #, fuzzy, c-format
@@ -7188,6 +7258,7 @@ msgstr "Zn_ajdź"
 msgid "Set User Info (web)..."
 msgstr "Ustaw dane użytkownika (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Zmiana hasła (URL)"
@@ -7220,6 +7291,10 @@ msgid "Search for Buddy by Information"
 msgstr "Wyszukaj znajomego na podstawie informacji"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "Użytkownik nie jest zalogowany"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7429,6 +7504,38 @@ msgstr "Ostatnia aktualizacja"
 msgid "Could not change buddy information."
 msgstr "Proszę podać informacje o znajomym."
 
+msgid "Mobile"
+msgstr "Dostępny pod telefonem komórkowym"
+
+msgid "Note"
+msgstr "Uwagi"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Ikona użytkownika"
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "Modyfikuj"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Modyfikuj"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Serwer zajęty"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%u requires verification"
 msgstr "Wymaga autoryzacji"
@@ -7780,6 +7887,13 @@ msgstr ""
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Tytuł grupy:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Tytuł grupy:</b> %s<br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7808,6 +7922,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "O programie %s"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Adres domowy"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7851,6 +7969,9 @@ msgstr "Port serwera"
 msgid "Show server news"
 msgstr "Adres serwera"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Niepoprawny błąd"
@@ -7860,7 +7981,7 @@ msgid "Update interval (seconds)"
 msgstr "Niepoprawny błąd"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Nie można pobrać informacji o serwerze"
 
 #, c-format
@@ -7887,10 +8008,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Nie można pobrać informacji o serwerze"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Żądanie uwagi od %s..."
 
@@ -7928,26 +8045,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Nie można się połączyć."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Błąd tokena"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Nie można czytać z gniazda"
-
-msgid "Write Error"
-msgstr "Błąd zapisu"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Połączenie zamknięte"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Ustaw dane użytkownika..."
 
@@ -7955,8 +8057,9 @@ msgstr "Ustaw dane użytkownika..."
 msgid "Requesting token"
 msgstr "Odmowa realizacji żądania"
 
-msgid "Couldn't resolve host"
-msgstr "Nie można przetłumaczyć nazwy hosta"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Nie można połączyć się z serwerem."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8007,7 +8110,7 @@ msgid "QQ Qun Command"
 msgstr "Polecenie"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Nie można pobrać informacji o serwerze"
 
 #, fuzzy
@@ -8030,9 +8133,6 @@ msgstr "Przesyłanie plików nie powiodło się"
 msgid "%d canceled the transfer of %s"
 msgstr "%d anulowała/anulował przesyłanie pliku %s"
 
-msgid "Connection closed (writing)"
-msgstr "Połączenie zamknięte (zapisywanie)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Tytuł grupy:</b> %s<br>"
@@ -8089,17 +8189,6 @@ msgstr "Administrator Sametime zostawił następujący komunikat na serwerze %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Ogłoszenie administratora Sametime"
 
-msgid "Connection reset"
-msgstr "Reset połączenia"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Błąd odczytu z gniazda: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Nie można połączyć się ze zdalnym komputerem"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Powiadomienie od %s"
@@ -8122,6 +8211,9 @@ msgstr "Głośniki"
 msgid "Video Camera"
 msgstr "Kamera video"
 
+msgid "File Transfer"
+msgstr "Przesyłanie pliku ukończone"
+
 #, fuzzy
 msgid "Supports"
 msgstr "wsparcie"
@@ -8834,9 +8926,6 @@ msgstr "Organizacja"
 msgid "Unit"
 msgstr "Jednostka"
 
-msgid "Note"
-msgstr "Uwagi"
-
 msgid "Join Chat"
 msgstr "Przyłącz do konferencji"
 
@@ -8938,6 +9027,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statystyki sieci"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Wykonanie polecenia ping nie powiodło się"
 
@@ -8998,7 +9090,8 @@ msgstr "Nieobsługiwany rodzaj klucza publicznego"
 msgid "Disconnected by server"
 msgstr "Rozłączenie przez serwer"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Błąd podczas nawiązywania połączenia z serwerem SILC"
 
 msgid "Key Exchange failed"
@@ -9010,27 +9103,26 @@ msgstr ""
 "Wznowienie odłączonej sesji zakończyło się niepowodzeniem. Należy połączyć "
 "się ponownie aby nawiązać nowe połączenie."
 
-msgid "Connection failed"
-msgstr "Błąd połączenia"
-
 msgid "Performing key exchange"
 msgstr "Wymiana kluczy"
 
-msgid "Unable to create connection"
-msgstr "Nie można utworzyć połączenia"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Nie można wczytać pary kluczy SILC: %s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Łączenie z serwerem SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Nie można wczytać pary kluczy SILC: %s"
+
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Nie można zainicjować protokołu SILC"
 
 #, fuzzy
@@ -9338,7 +9430,7 @@ msgid "Creating SILC key pair..."
 msgstr "Tworzenie pary kluczy SILC..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Tworzenie pary kluczy SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9434,6 +9526,9 @@ msgstr "Tablica do rysowania"
 msgid "No server statistics available"
 msgstr "Serwer nie posiada statystyk"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Błąd podczas nawiązywania połączenia z serwerem SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Błąd: Niezgodność wersji, należy zaktualizować oprogramowanie klienta"
@@ -9475,33 +9570,28 @@ msgstr "Błąd: Niewłaściwe ciasteczko (cookie)"
 msgid "Failure: Authentication failed"
 msgstr "Błąd: Uwierzytelnianie nie powiodło się"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Nie można zainicjować połączenia klienta SILC"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "Brak nazwy"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nie można wczytać pary kluczy SILC: %s"
 
-msgid "Could not write"
-msgstr "Nie można zapisywać"
-
-msgid "Could not connect"
-msgstr "Nie można połączyć"
+msgid "Unable to create connection"
+msgstr "Nie można utworzyć połączenia"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Nieznany powód."
 
-msgid "Could not create listen socket"
-msgstr "Nie można otworzyć gniazd do nasłuchiwania"
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Nie można odnaleźć adresu hosta"
+msgid "Unable to create listen socket"
+msgstr "Nie można utworzyć gniazda"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9545,179 +9635,65 @@ msgstr "Użytkownik do autoryzacji"
 msgid "Auth Domain"
 msgstr "Domena do autoryzacji"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Wyszukiwanie %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Połączenie z %s nie powiodło się"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Logowanie: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Nie można zapisać pliku %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Nie można odczytać pliku %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Wiadomość zbyt długa, odcięto ostatnie %s bajtów."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s nie jest w tej chwili zalogowany."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Ostrzeżenie %s jest niedozwolone."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Wiadomość została odrzucona, przekroczono ograniczenie prędkości serwera."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Konferencja w %s jest niedostępna."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Zbyt szybkie wysyłanie wiadomości do %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Pominięto wiadomość od %s ponieważ była zbyt duża."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Pominięto wiadomość od %s ponieważ była wysłana zbyt szybko."
-
-#, c-format
-msgid "Failure."
-msgstr "Awaria."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Zbyt wiele dopasowań."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Potrzeba więcej kwalifikatorów."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Usługa katalogu tymczasowo niedostępna."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Zastrzeżone wyszukiwanie email."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Zignorowano słowo kluczowe."
-
-#, c-format
-msgid "No keywords."
-msgstr "Brak słów kluczowych."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Użytkownik nie posiada informacji w katalogu."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Kraj nie jest obsługiwany."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Nieznana awaria: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Niepoprawny identyfikator lub hasło."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Usługa jest tymczasowo niedostępna."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;pokój&gt;:  Przyłącza do pokoju konferencyjnego w sieci Yahoo"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Twój poziom ostrzeżeń jest zbyt wysoki aby można się było zalogować."
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Wyświetla listę kanałów w tej sieci"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"Zbyt często się łączono i rozłączano. Zaczekaj dziesięć minut i spróbuj "
-"ponownie. W razie podejmowania dalszych prób, okres oczekiwania się wydłuży."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Wystąpił nieznany błąd logowania: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Wystąpił nieznany błąd, %d. Informacja: %s"
-
-msgid "Invalid Groupname"
-msgstr "Niewłaściwa nazwa grupy"
 
-msgid "Connection Closed"
-msgstr "Połączenie zamknięte"
-
-msgid "Waiting for reply..."
-msgstr "Oczekiwanie na odpowiedź..."
-
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC jest dostępny. Można ponownie wysłać wiadomości."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Identyfikator Yahoo!"
 
-msgid "Password Change Successful"
-msgstr "Pomyślnie zmieniono hasło"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Wtyczka protokołu Yahoo"
 
-msgid "_Group:"
-msgstr "_Grupa:"
+msgid "Pager server"
+msgstr "Serwer pagera"
 
-msgid "Get Dir Info"
-msgstr "Pobierz informację katalogu"
+msgid "Pager port"
+msgstr "Port pagera"
 
-msgid "Set Dir Info"
-msgstr "Ustaw informację katalogu"
+msgid "File transfer server"
+msgstr "Serwer do przesyłania plików"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Nie można otworzyć %s do zapisu!"
+msgid "File transfer port"
+msgstr "Port do przesyłania plików"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Przesyłanie pliku zakończyło się niepowodzeniem, prawdopodobnie druga strona "
-"anulowała transmisję."
+msgid "Chat room locale"
+msgstr "Ustawienia lokalne pokoju konferencyjnego"
 
-msgid "Could not connect for transfer."
-msgstr "Nie można nawiązać połączenia do przesyłania."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorowanie zaproszeń do pokojów konferencyjnych"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Nie udało się zapisać nagłówka pliku. Plik nie zostanie przesłany."
+msgid "Chat room list URL"
+msgstr "URL z listą pokoi konferencyjnych"
 
-msgid "Save As..."
-msgstr "Zapisz jako..."
+msgid "Yahoo Chat server"
+msgstr "Serwer konferencji Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s prosi %s o akceptację %d pliku: %s (%.2f %s)%s%s"
-msgstr[1] "%s prosi %s o akceptację %d plików: %s (%.2f %s)%s%s"
-msgstr[2] "%s prosi %s o akceptację %d plików: %s (%.2f %s)%s%s"
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Serwer konferencji Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s prosi o wysłanie pliku"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Identyfikator Yahoo!"
 
 #. *< type
 #. *< ui_requirement
@@ -9729,11 +9705,11 @@ msgstr "%s prosi o wysłanie pliku"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Wtyczka protokołu TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Wtyczka protokołu Yahoo"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9758,6 +9734,34 @@ msgstr "Użytkownik %s odrzucił prośbę o dodanie go do listy."
 msgid "Add buddy rejected"
 msgstr "Dodanie znajomego zostało odrzucone"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Nie udało się połączyć z serwerem."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Nieznany błąd numer %d. Zalogowanie przez stronę WWW Yahoo! może rozwiązać "
+"ten problem."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Nieznany błąd numer %d. Zalogowanie przez stronę WWW Yahoo! może rozwiązać "
+"ten problem."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Niepoprawny identyfikator lub hasło"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9792,37 +9796,32 @@ msgstr ""
 "Nieznany błąd numer %d. Zalogowanie przez stronę WWW Yahoo! może rozwiązać "
 "ten problem."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Nie można dodać znajomego %s do grupy %s na liście serwerowej związanej z "
 "kontem %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Nie można dołączyć znajomego do listy serwerowej"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Nieprawidłowa odpowiedź z serwera HTTP."
 
-msgid "Connection problem"
-msgstr "Błąd połączenia"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Utracono połączenie z serwerem:\n"
 "%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 "Nie można nawiązać połączenia z serwerem:\n"
 "%s"
@@ -9877,9 +9876,8 @@ msgstr "Ustawienia obecności"
 msgid "Start Doodling"
 msgstr "Rozpoczyna pisanie"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Aktywacja ID..."
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Kogo przyłączyć do konferencji?"
@@ -9895,76 +9893,15 @@ msgstr "Przyłącz do konferencji..."
 msgid "Open Inbox"
 msgstr "Otwórz skrzynkę Hotmail"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;pokój&gt;:  Przyłącza do pokoju konferencyjnego w sieci Yahoo"
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Wyświetla listę kanałów w tej sieci"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Identyfikator Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Wtyczka protokołu Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonia"
-
-msgid "Pager server"
-msgstr "Serwer pagera"
-
-msgid "Japan Pager server"
-msgstr "Japoński serwer pagera"
-
-msgid "Pager port"
-msgstr "Port pagera"
-
-msgid "File transfer server"
-msgstr "Serwer do przesyłania plików"
-
-msgid "Japan file transfer server"
-msgstr "Japoński serwer do przesyłania plików"
-
-msgid "File transfer port"
-msgstr "Port do przesyłania plików"
-
-msgid "Chat room locale"
-msgstr "Ustawienia lokalne pokoju konferencyjnego"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorowanie zaproszeń do pokojów konferencyjnych"
-
-msgid "Chat room list URL"
-msgstr "URL z listą pokoi konferencyjnych"
-
-msgid "Yahoo Chat server"
-msgstr "Serwer konferencji Yahoo"
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Serwer konferencji Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Nie można się połączyć."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nie można ustanowić deskryptora pliku."
 
@@ -9972,6 +9909,9 @@ msgstr "Nie można ustanowić deskryptora pliku."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s chce przesłać Tobie plik %s"
 
+msgid "Write Error"
+msgstr "Błąd zapisu"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonia"
 
@@ -10093,23 +10033,19 @@ msgstr "Rozmowy głosowe"
 msgid "Webcams"
 msgstr "Kamery internetowe"
 
+msgid "Connection problem"
+msgstr "Błąd połączenia"
+
 msgid "Unable to fetch room list."
 msgstr "Nie można pobrać listy pokoi."
 
 msgid "User Rooms"
 msgstr "Pokoje użytkowników"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Wystąpiły problemy przy połączeniu z serwerem YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Utracono połączenie z serwerem\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10237,16 +10173,8 @@ msgstr "Kraina"
 msgid "Exposure"
 msgstr "Ekspozycja"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Nie można utworzyć gniazda:\n"
-"%s"
-
 #, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nie można ustawić roli \"%s\" dla użytkownika: %s"
 
 #, c-format
@@ -10254,7 +10182,7 @@ msgid "HTTP proxy connection error %d"
 msgstr "Błąd połączenia z serwerem pośredniczącym (HTTP proxy) %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
@@ -10263,9 +10191,6 @@ msgstr ""
 "Błąd tłumaczenia nazwy %s na adres IP: \n"
 "%s"
 
-msgid "Could not resolve host name"
-msgstr "Nie można odnaleźć adresu hosta"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Żądanie uwagi od %s..."
@@ -10356,9 +10281,6 @@ msgstr "Nie przeszkadzać"
 msgid "Extended away"
 msgstr "Wrócę później"
 
-msgid "Mobile"
-msgstr "Dostępny pod telefonem komórkowym"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10400,18 +10322,6 @@ msgstr "+++ %s powrócił z ze stanu bezczynności"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Błąd odczytu %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Wystąpił błąd podczas odczytu Twojego %s.  Dane nie zostały wczytane, a "
-"stary plik został zmieniony na %s~."
-
 msgid "Calculating..."
 msgstr "Obliczanie..."
 
@@ -10526,6 +10436,18 @@ msgstr "Reset połączenia"
 msgid "Address already in use."
 msgstr "Nazwa konferencji jest aktualnie używana"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Błąd odczytu %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Wystąpił błąd podczas odczytu Twojego %s.  Dane nie zostały wczytane, a "
+"stary plik został zmieniony na %s~."
+
 msgid "Internet Messenger"
 msgstr "Komunikator Internetowy"
 
@@ -10568,10 +10490,8 @@ msgstr "Powiadamianie o nowej _poczcie"
 msgid "Use this buddy _icon for this account:"
 msgstr "Używanie poniższej ikony użytkownika dla tego konta:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Opcje %s"
+msgid "_Advanced"
+msgstr "_Zaawansowane"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Ustawienia pośrednika sieciowego z GNOME"
@@ -10606,9 +10526,6 @@ msgstr "Jeśli spojrzysz naprawdę blisko"
 msgid "you can see the butterflies mating"
 msgstr "ujrzysz łączące się w pary motyle"
 
-msgid "Proxy Options"
-msgstr "Opcje pośrednika sieciowego"
-
 msgid "Proxy _type:"
 msgstr "_Rodzaj pośrednika:"
 
@@ -10637,8 +10554,9 @@ msgstr "_Podstawowe"
 msgid "Create _this new account on the server"
 msgstr "Utwórz _nowe konto na serwerze"
 
-msgid "_Advanced"
-msgstr "_Zaawansowane"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Pośrednik (proxy)"
 
 msgid "Enabled"
 msgstr "Włączone"
@@ -10687,8 +10605,8 @@ msgid "Please update the necessary fields."
 msgstr "Proszę uaktualniać niezbędne pola."
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Lista pokoi"
+msgid "A_ccount"
+msgstr "Konto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10696,8 +10614,9 @@ msgid ""
 msgstr ""
 "Wprowadź informacje dotyczące konferencji do której chcesz się przyłączyć.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Lista pokoi"
 
 msgid "_Block"
 msgstr "_Zablokuj"
@@ -10714,6 +10633,17 @@ msgstr "_Informacje"
 msgid "I_M"
 msgstr "_Wiadomość"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "_Dodaj konferencję"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Konferencja wideo"
+
 msgid "_Send File..."
 msgstr "Wyślij _plik"
 
@@ -10723,9 +10653,14 @@ msgstr "Dodaj przechwytywanie zdarzeń"
 msgid "View _Log"
 msgstr "Wyświetl _dziennik rozmów"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Ukryj, gdy rozłączony"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Wyświetlaj, gdy rozłączony"
+
 msgid "_Alias..."
 msgstr "_Zmień nazwę..."
 
@@ -10853,6 +10788,10 @@ msgstr "/Narzędzia/Przechwytywanie _zdarzeń"
 msgid "/Tools/_Certificates"
 msgstr "/Narzędzia/_Certyfikaty"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Narzędzia/Prywatność"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Narzędzia/W_tyczki"
 
@@ -10862,10 +10801,6 @@ msgstr "/Narzędzia/_Ustawienia"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Narzędzia/P_rywatność"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Narzędzia/Prywatność"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Narzędzia/Przesyłanie _plików"
 
@@ -10988,8 +10923,8 @@ msgstr "Ręcznie"
 msgid "By status"
 msgstr "Według statusu"
 
-msgid "By log size"
-msgstr "Według rozmiaru dziennika"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -11006,6 +10941,9 @@ msgstr "Połącz"
 msgid "Re-enable"
 msgstr "Włącz ponownie"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -11098,6 +11036,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Grupa:"
+
 #, fuzzy
 msgid "Auto_join when account becomes online."
 msgstr "Automatycznie dołącz podczas połączenia konta."
@@ -11133,6 +11074,115 @@ msgstr "/Narzędzia"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Znajomi/Sortuj znajomych"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Kolor tła"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lew"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Kolor tła"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Rozwiń"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Wybór koloru tła"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Zwiń"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Wybór koloru tła"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Sortuj"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Dostępny"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Zaraz wracam"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Rozłączony"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Grupa krwi"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Wysłano wiadomość"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Zmiana informacji o użytkowniku dla %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Wpisz nazwę hosta dla tego certyfikatu."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Serwery SSL"
@@ -11152,12 +11202,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Zaproszenie użytkownika do pokoju konferencyjnego"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "Wpisz kogo chcesz zaprosić, dodatkowo można podać tekst zaproszenia."
-
 msgid "_Buddy:"
 msgstr "_Użytkownik:"
 
@@ -11187,7 +11231,8 @@ msgstr "Ignorowanie"
 msgid "Get Away Message"
 msgstr "Wysyłane wiadomości"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Ostatnio powiedziane"
 
 msgid "Unable to save icon file to disk."
@@ -11235,6 +11280,22 @@ msgstr "/Rozmowa/Z_apisz jako..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Rozmowa/Wyczyść okno"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Rozmowa/Więcej"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Rozmowa/Więcej"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Rozmowa/Więcej"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Rozmowa/Wyświetl _dziennik rozmów"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Rozmowa/_Wyślij plik..."
 
@@ -11307,6 +11368,18 @@ msgstr "/Rozmowa"
 msgid "/Conversation/View Log"
 msgstr "/Rozmowa/Wyświetl dziennik rozmów"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Rozmowa/_Więcej"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Rozmowa/Wyświetl dziennik rozmów"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Rozmowa/_Więcej"
+
 msgid "/Conversation/Send File..."
 msgstr "/Rozmowa/Wyślij plik..."
 
@@ -11493,6 +11566,9 @@ msgstr "Artyści"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "wsparcie"
 
@@ -11622,6 +11698,10 @@ msgstr "Hinduski"
 msgid "Hungarian"
 msgstr "Węgierski"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumuński"
+
 msgid "Indonesian"
 msgstr "Indonezyjski"
 
@@ -11638,6 +11718,10 @@ msgstr "Gruziński"
 msgid "Ubuntu Georgian Translators"
 msgstr "Aktualni tłumacze"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Inny"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11660,6 +11744,10 @@ msgstr "Litewski"
 msgid "Macedonian"
 msgstr "Macedoński"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "Macedoński"
+
 msgid "Bokmål Norwegian"
 msgstr "Norweski Bokmål"
 
@@ -11715,6 +11803,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "Szwedzki"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamilski"
 
@@ -11766,7 +11857,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -12032,7 +12140,7 @@ msgid "Hyperlink visited color"
 msgstr "Kolor odnośnika"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Kolor odnośników pod kursorem myszki."
 
 msgid "Hyperlink prelight color"
@@ -12070,15 +12178,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Likwidowanie powiadomienia"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Powiadamianie o nowej poczcie"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12091,15 +12206,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Powiadamianie o nowej poczcie"
 
-msgid "_Copy Email Address"
-msgstr "Skopiuj a_dres email"
-
-msgid "_Open Link in Browser"
-msgstr "_Otwórz odnośnik w przeglądarce"
-
-msgid "_Copy Link Location"
-msgstr "_Skopiuj adres odnośnika"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12141,11 +12247,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Zapis obrazu"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Zapisz _obraz..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Dodaj własną emotikonę..."
 
@@ -12232,9 +12336,6 @@ msgstr "Zmniejsz rozmiar czcionki"
 msgid "Font Face"
 msgstr "_Krój czcionki"
 
-msgid "Background Color"
-msgstr "Kolor tła"
-
 msgid "Foreground Color"
 msgstr "Kolor pisma"
 
@@ -12351,6 +12452,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12377,6 +12479,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12416,11 +12519,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Otwórz wszystkie wiadomości"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Masz wiadomość email!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Obliczanie..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12452,6 +12571,27 @@ msgid ""
 msgstr ""
 "Wybrano \"ręczne\" polecenie przeglądarki, lecz nie ustawiono polecenia."
 
+#, fuzzy
+msgid "No message"
+msgstr "Nieznany komunikat"
+
+msgid "Open All Messages"
+msgstr "Otwórz wszystkie wiadomości"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Masz wiadomość email!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Nowe przechwytywanie zdarzeń"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Masz wiadomość email!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Następujące wtyczki zostaną wyłączone."
 
@@ -12504,10 +12644,17 @@ msgstr "<b>Szczegółowe informacje o wtyczce</b>"
 msgid "Select a file"
 msgstr "Wybierz plik"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Modyfikacja zdarzenia"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Źródło zdarzeń"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "_Nazwa użytkownika:"
 
@@ -12574,7 +12721,61 @@ msgstr "_Powtarzanie"
 msgid "Pounce Target"
 msgstr "Źródło zdarzeń"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Rozpoczyna pisanie"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Wstrzymuje pisanie"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "loguje się"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s przestał być bezczynny (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "wraca"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Zakończył(a) pisanie"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "wylogowuje się"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "przechodzi w stan bezczynności"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Podczas nieobecności"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Wysłanie wiado_mości"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+"Przechwycono nieznane zdarzenie. Proszę zawiadomić autorów programu Pidgin!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Nie udało się rozpakować zestawu emotikon."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Nie udało się rozpakować zestawu emotikon."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Nie udało się rozpakować zestawu emotikon."
 
 msgid "Install Theme"
@@ -12596,6 +12797,12 @@ msgstr "Skróty klawiaturowe"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Zamykanie r_ozmów za pomocą klawisza Escape"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Lista znajomych"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ikona obszaru powiadamiania"
 
@@ -12605,8 +12812,9 @@ msgstr "Wyświetlaj ikonę obszaru powiadamiania:"
 msgid "On unread messages"
 msgstr "Gdy są nieprzeczytane wiadomości"
 
-msgid "Conversation Window Hiding"
-msgstr "Ukrywanie okien rozmów"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Okna rozmów"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Ukrywanie nowych rozmów:"
@@ -12614,6 +12822,10 @@ msgstr "_Ukrywanie nowych rozmów:"
 msgid "When away"
 msgstr "Podczas nieobecności"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Przeniesienia okna rozmów na _wierzch"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Karty"
@@ -12672,10 +12884,6 @@ msgstr "Płynne przewijanie"
 msgid "F_lash window when IMs are received"
 msgstr "_Migotanie okna po odebraniu wiadomości"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Przeniesienia okna rozmów na _wierzch"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimalna wysokość pola tekstowego w liniach:"
 
@@ -12709,13 +12917,11 @@ msgstr "Nie można uruchomić aplikacji konfigurującej proxy."
 msgid "Cannot start browser configuration program."
 msgstr "Nie można uruchomić aplikacji konfigurującej proxy."
 
-msgid "ST_UN server:"
-msgstr "Serwer _STUN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Przykład: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Automatyczne wykrywanie adresu IP"
 
 msgid "Public _IP:"
@@ -12736,6 +12942,10 @@ msgstr "Początkowy zakres portów:"
 msgid "_End port:"
 msgstr "Końcowy zakres portów:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Serwer pośredniczący i przeglądarka"
 
@@ -12764,6 +12974,10 @@ msgstr "Serwer pośredniczący"
 msgid "No proxy"
 msgstr "Bez pośrednika"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Użytkownik:"
 
@@ -12923,12 +13137,12 @@ msgstr "Podczas nieobecności z powodu bezczynności"
 msgid "Auto-away"
 msgstr "Automatyczny status \"Zaraz wracam\""
 
-msgid "Change status when _idle"
-msgstr "Zmiana Statusu po wykryciu bezczynności"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Czas (w minutach) do zmiany statusu:"
 
+msgid "Change status when _idle"
+msgstr "Zmiana Statusu po wykryciu bezczynności"
+
 msgid "Change _status to:"
 msgstr "Zmiana _statusu na:"
 
@@ -13079,47 +13293,48 @@ msgstr "Z_apisz i użyj"
 msgid "Status for %s"
 msgstr "Status dla %s"
 
-msgid "Custom Smiley"
-msgstr "Niestandardowa emotikona"
-
-msgid "More Data needed"
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Proszę wprowadzić dowiązanie do emotikony."
+msgid "Custom Smiley"
+msgstr "Niestandardowa emotikona"
 
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Poprawianie duplikatów"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-msgid "Please select an image for the smiley."
-msgstr "Proszę wybrać obraz emotikony."
-
 msgid "Edit Smiley"
 msgstr "Modyfikuj emotikonę"
 
 msgid "Add Smiley"
 msgstr "Dodaj emotikonę"
 
-msgid "Smiley _Image"
-msgstr "Obraz emotikony"
+#, fuzzy
+msgid "_Image:"
+msgstr "_Obrazek"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Skrót emotikony"
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Sortuj"
 
 msgid "Smiley"
 msgstr "Emotikona"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Sortuj"
+
 msgid "Custom Smiley Manager"
 msgstr "Menadżer niestandardowych emotikon"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Wybór znajomego"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Używanie poniższej ikony użytkownika dla tego konta:"
 
@@ -13205,9 +13420,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Nie można wysłać odnośnika z pulpitu"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Upuściłaś/Upuściłeś element pulpitu. Prawdopodobnie zamierzałaś/zamierzałeś "
 "przesłać obiekt na, który wskazuje ten element."
@@ -13243,6 +13459,16 @@ msgstr ""
 "Nie można odczytać obrazka '%s': przyczyna nieznana, prawdopodobnie "
 "uszkodzony plik"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Otwarcie odnośnika w:"
+
+msgid "_Copy Link Location"
+msgstr "_Skopiuj adres odnośnika"
+
+msgid "_Copy Email Address"
+msgstr "Skopiuj a_dres email"
+
 msgid "Save File"
 msgstr "Zapisz plik"
 
@@ -13335,6 +13561,77 @@ msgstr "Przewiduje prawdopodobieństwo odpowiedzi, przez znajomych."
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Adres serwera"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Podaj adres serwera konferencyjnego"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Wpisz adres serwera konferencyjnego, z którego chcesz pobrać listę"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Usługi sieciowe"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Wyślij listę znajomych"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "zaraz wraca"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Katalog z plikami"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Wybór dźwięków"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Opis"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Ustaw informację katalogu"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Przeglądarka:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Użytkownik nie istnieje"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Serwer nie używa żadnej z obsługiwanych metod uwierzytelniania"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Ustaw informację katalogu"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Ta wtyczka jest przydatna do debugowania klientów i serwerów XMPP."
+
 msgid "Buddy is idle"
 msgstr "Znajomy jest bezczynny"
 
@@ -13728,9 +14025,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Wtyczka do grupowego komponowania utworów muzycznych."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Wtyczka wiadomości muzycznych pozwala kilku osobom na pracowanie nad utworem "
 "muzycznym poprzez edycję nut w czasie rzeczywistym."
@@ -13846,12 +14144,6 @@ msgstr ""
 "- Wypisuje przychodzący tekst od tyłu\n"
 "- Wysyła wiadomość do osób na liście w momencie ich zalogowania"
 
-msgid "Cursor Color"
-msgstr "Kolor kursora"
-
-msgid "Secondary Cursor Color"
-msgstr "Kolor drugiego kursora"
-
 msgid "Hyperlink Color"
 msgstr "Kolor odnośnika"
 
@@ -13862,6 +14154,10 @@ msgstr "Kolor odnośnika"
 msgid "Highlighted Message Name Color"
 msgstr "Kolor nazwy wyróżnionej wiadomości"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Likwidowanie powiadomienia"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Poziome odstępy w GtkTreeView"
 
@@ -13891,35 +14187,24 @@ msgstr "Czcionka interfejsu GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Zestaw skrótów klawiszowych GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Kolory interfejsu"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Powiadamianie o nowej poczcie"
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Kontrola tematów GTK+ w Pidgin"
 
-msgid "Widget Sizes"
-msgstr "Rozmiar Widgetów"
+#, fuzzy
+msgid "Colors"
+msgstr "Zamknij"
 
 msgid "Fonts"
 msgstr "Czcionki"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Narzędzia plików gtkrc"
 
@@ -14010,7 +14295,7 @@ msgstr "Ukrywanie okien rozmów"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14063,6 +14348,113 @@ msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Zastępuje tekst w wychodzących wiadomościach zgodnie z określonymi regułami."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Nie zalogowany"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Nie zalogowany"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Dołącz do konferencji"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorowanie"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Głośniej"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autoryzacja przyznana"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Błąd "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informacje"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Okno dialogowe z żądaniem"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Poziom ostrzeżenia"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status dla %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Ustawienia lokalne pokoju konferencyjnego"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Zapisz ikonę"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Kontrola tematów GTK+ w Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informacje o kontakcie"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Lista znajomych"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lista znajomych"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Kontrola tematów GTK+ w Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Kontrola tematów GTK+ w Pidgin"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14224,17 +14616,15 @@ msgstr "O_kno listy znajomych zawsze na wierzchu"
 msgid "Only when docked"
 msgstr "Tylko gdy jest zadokowane"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_Migotanie okna po odebraniu wiadomości"
-
 msgid "Windows Pidgin Options"
 msgstr "Pidgwin - Opcje "
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcje specyficzne dla wersji dla Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Umożliwia kontrolę nad parametrami specyficznymi dla Windows jak np. "
 "dokowanie listy znajomych."
@@ -14277,6 +14667,494 @@ msgstr "Wysyłaj i odbieraj surowe stanzy XMPP"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ta wtyczka jest przydatna do debugowania klientów i serwerów XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Nie można otworzyć gniazda"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Nie można nasłuchiwać na danym gnieździe"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Nie można czytać z gniazda"
+
+#~ msgid "Connection failed."
+#~ msgstr "Błąd połączenia."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Serwer został rozłączony"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Nie można utworzyć gniazda"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Nie można połączyć się z serwerem"
+
+#~ msgid "Read error"
+#~ msgstr "Błąd oczytu"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można nawiązać połączenia z serwerem:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Błąd zapisu"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Ustaw informację katalogu"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Rozszerzony adres"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Alias konferencji"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Użytkownik nie posiada informacji w katalogu."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Polecenie"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Błąd podczas rejestracji"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Położenie"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "Wyszukiwanie użytkownika"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Powiadamianie o stanie znajomych"
+
+#~ msgid "Software Version"
+#~ msgstr "Wersja oprogramowania"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Ułożenie"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Tryby użytkownika"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Ograniczenie użytkowników"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Funkcje klienta"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Użytkownik"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Wiadomość z wymianą kluczy"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Adres email"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Profil"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Przyłącz się"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Nazwa użytkownika"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Wideo na żywo"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Odebrano wiadomość"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Plik z kluczem publicznym"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Opcje użytkownika"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Tryby użytkownika"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Nazwa użytkownika"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Ograniczenie użytkowników"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Szyfrowanie Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "Błąd oczytu"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Nie udało się połączyć z serwerem."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Kolejka jest pełna"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Nie udało się przetworzyć wiadomości."
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Nie można połączyć się z serwerem"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Logowanie zakończyło się niepowodzeniem (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Wylogowano, ponieważ zalogowano się na to samo konto z innego komputera."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Błąd. Obsługa SSL nie jest zainstalowana."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Niepoprawne hasło."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie udało się połączyć z serwerem BOS:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Połączenie może wkrótce zostać zerwane. Sugerowana jest zmiana protokołu "
+#~ "na TOC zanim problem zostanie rozwiązany. Uaktualnienia będą dostępne na %"
+#~ "s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Nie można się połączyć"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Niewłaściwa ksywka"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Nie można pobrać informacji o serwerze"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Połączenie zamknięte"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Nie można przetłumaczyć nazwy hosta"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Połączenie zamknięte (zapisywanie)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Reset połączenia"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Błąd odczytu z gniazda: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Nie można połączyć się ze zdalnym komputerem"
+
+#~ msgid "Could not write"
+#~ msgstr "Nie można zapisywać"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nie można połączyć"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Nie można otworzyć gniazd do nasłuchiwania"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Nie można odnaleźć adresu hosta"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Niepoprawne hasło"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można nawiązać połączenia z serwerem:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonia"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japoński serwer pagera"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japoński serwer do przesyłania plików"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Utracono połączenie z serwerem\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nie można odnaleźć adresu hosta"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Serwer wymaga TLS/SSL do zalogowania. Jednak Twój Pidgin nie posiada "
+#~ "obsługi TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Ukrywanie okien rozmów"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Proszę wprowadzić dowiązanie do emotikony."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Proszę wybrać obraz emotikony."
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktywacja ID..."
+
+#~ msgid "Cursor Color"
+#~ msgstr "Kolor kursora"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Kolor drugiego kursora"
+
+#~ msgid "Interface colors"
+#~ msgstr "Kolory interfejsu"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Rozmiar Widgetów"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "Wstaw do rozmowy"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Wpisz kogo chcesz zaprosić, dodatkowo można podać tekst zaproszenia."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Nie można pobrać listy znajomych"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Wyszukiwanie %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Połączenie z %s nie powiodło się"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Logowanie: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Nie można zapisać pliku %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Nie można odczytać pliku %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Wiadomość zbyt długa, odcięto ostatnie %s bajtów."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s nie jest w tej chwili zalogowany."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Ostrzeżenie %s jest niedozwolone."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "Wiadomość została odrzucona, przekroczono ograniczenie prędkości serwera."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Konferencja w %s jest niedostępna."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Zbyt szybkie wysyłanie wiadomości do %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Pominięto wiadomość od %s ponieważ była zbyt duża."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Pominięto wiadomość od %s ponieważ była wysłana zbyt szybko."
+
+#~ msgid "Failure."
+#~ msgstr "Awaria."
+
+#~ msgid "Too many matches."
+#~ msgstr "Zbyt wiele dopasowań."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Potrzeba więcej kwalifikatorów."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Usługa katalogu tymczasowo niedostępna."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Zastrzeżone wyszukiwanie email."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Zignorowano słowo kluczowe."
+
+#~ msgid "No keywords."
+#~ msgstr "Brak słów kluczowych."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Użytkownik nie posiada informacji w katalogu."
+
+#~ msgid "Country not supported."
+#~ msgstr "Kraj nie jest obsługiwany."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Nieznana awaria: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Niepoprawny identyfikator lub hasło."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Usługa jest tymczasowo niedostępna."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr ""
+#~ "Twój poziom ostrzeżeń jest zbyt wysoki aby można się było zalogować."
+
+#~ 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 ""
+#~ "Zbyt często się łączono i rozłączano. Zaczekaj dziesięć minut i spróbuj "
+#~ "ponownie. W razie podejmowania dalszych prób, okres oczekiwania się "
+#~ "wydłuży."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Wystąpił nieznany błąd logowania: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Wystąpił nieznany błąd, %d. Informacja: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Niewłaściwa nazwa grupy"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Połączenie zamknięte"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Oczekiwanie na odpowiedź..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC jest dostępny. Można ponownie wysłać wiadomości."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Pomyślnie zmieniono hasło"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Pobierz informację katalogu"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Ustaw informację katalogu"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Nie można otworzyć %s do zapisu!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Przesyłanie pliku zakończyło się niepowodzeniem, prawdopodobnie druga "
+#~ "strona anulowała transmisję."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Nie można nawiązać połączenia do przesyłania."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Nie udało się zapisać nagłówka pliku. Plik nie zostanie przesłany."
+
+#~ msgid "Save As..."
+#~ msgstr "Zapisz jako..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s prosi %s o akceptację %d pliku: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s prosi %s o akceptację %d plików: %s (%.2f %s)%s%s"
+#~ msgstr[2] "%s prosi %s o akceptację %d plików: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s prosi o wysłanie pliku"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Wtyczka protokołu TOC"
+
+#~ msgid "%s Options"
+#~ msgstr "Opcje %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Opcje pośrednika sieciowego"
+
+#~ msgid "By log size"
+#~ msgstr "Według rozmiaru dziennika"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Otwórz odnośnik w przeglądarce"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Serwer _STUN:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Obraz emotikony"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Skrót emotikony"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Migotanie okna po odebraniu wiadomości"
+
 #~ msgid ""
 #~ "You may be disconnected shortly.  You may want to use TOC until this is "
 #~ "fixed.  Check %s for updates."
diff --git a/po/ps.po b/po/ps.po
index 964bbac092..cbd1d466c3 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0beta6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-03-14 13:08+0500\n"
 "Last-Translator: Kashif Masood <masudmails@yahoo.com>\n"
 "Language-Team: Pashto\n"
@@ -33,7 +33,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -594,18 +594,6 @@ msgid "Send To"
 msgstr "و استوه"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "استولي پیغامونه"
-
-msgid "Invite"
-msgstr "بلل"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-
-#, fuzzy
 msgid "Conversation"
 msgstr "مرکې"
 
@@ -855,6 +843,41 @@ msgstr "مرکې"
 msgid "System Log"
 msgstr "د سیستم یاداشت لیک"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "شمېره و..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "قبلول"
+
+msgid "Reject"
+msgstr "ردول"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+msgid "You have rejected the call."
+msgstr ""
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "برېښنالیک"
 
@@ -889,6 +912,9 @@ msgstr "دوام ورکول"
 msgid "IM"
 msgstr "فوري زيری"
 
+msgid "Invite"
+msgstr "بلل"
+
 msgid "(none)"
 msgstr "(هیڅ نه)"
 
@@ -1109,7 +1135,6 @@ msgstr "‫%s ليرې لاړی. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr ""
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1158,7 +1183,6 @@ msgstr ""
 msgid "Change status to"
 msgstr "موقعيت بدلول"
 
-#. Conversations
 msgid "Conversations"
 msgstr "مرکې"
 
@@ -1477,7 +1501,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr ""
 
-#, c-format
 msgid "Online"
 msgstr "په ليکه"
 
@@ -1525,6 +1548,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "ارل"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "شمېرل"
 
@@ -1623,14 +1668,6 @@ msgstr ""
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "قبلول"
-
-msgid "Reject"
-msgstr "ردول"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1720,6 +1757,8 @@ msgstr "‫+++ %s راننوتلو"
 msgid "+++ %s signed off"
 msgstr "‫+++ %s ووتلو"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr ""
 
@@ -1766,6 +1805,16 @@ msgstr ""
 msgid "%s left the room (%s)."
 msgstr ""
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "مجلس ته بلل"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr ""
@@ -1887,7 +1936,6 @@ msgstr ""
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#, c-format
 msgid "File transfer complete"
 msgstr "دوسیه بدلونه پای"
 
@@ -1895,7 +1943,6 @@ msgstr "دوسیه بدلونه پای"
 msgid "You canceled the transfer of %s"
 msgstr ""
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "دوسیه بدلونه فسخ شو"
 
@@ -2076,11 +2123,14 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "دوسیه بدلونه شی خطا"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2464,7 +2514,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2513,7 +2563,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2541,6 +2591,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "پټ ټکی بدلول"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2728,18 +2804,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "رابطه نه و شوه"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "لومړی نوم"
 
@@ -2773,6 +2849,10 @@ msgstr "د بانجوړ نښلولي"
 msgid "Purple Person"
 msgstr "نوی کاس"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr ""
+
 msgid "Bonjour"
 msgstr "بانجوړ"
 
@@ -2783,14 +2863,17 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "د %s سره رابطه نه و شوه"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "د %s سره رابطه نه و شوه: %s"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "کاروونکی نه شه شامل"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -2838,13 +2921,13 @@ msgstr "ملګری فهرست ساتل..."
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr ""
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2856,15 +2939,16 @@ msgstr ""
 msgid "Password"
 msgstr "پټ ټکی"
 
-msgid "Password (retype)"
-msgstr "پټ ټکی (بیا ورکه)"
-
-msgid "Enter current token"
+msgid "Password (again)"
 msgstr ""
 
-msgid "Current token"
+msgid "Enter captcha text"
 msgstr ""
 
+#, fuzzy
+msgid "Captcha"
+msgstr "انځور و ساته"
+
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
 
@@ -2916,6 +3000,15 @@ msgstr ""
 msgid "Current password"
 msgstr "اوسنی پټ ټکی"
 
+msgid "Password (retype)"
+msgstr "پټ ټکی (بیا ورکه)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2929,13 +3022,13 @@ msgstr ""
 msgid "Add to chat..."
 msgstr "ګپ شپ ته جمع که..."
 
+#. Global
 msgid "Available"
 msgstr "دلته يم"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "ليرې"
 
@@ -2963,7 +3056,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -2978,8 +3071,14 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
-msgstr "رابطه ناکامه شوه."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "رابطه و شوه"
+
+msgid "Connection failed"
+msgstr "رابطه ناکامه شوه"
 
 msgid "Add to chat"
 msgstr "ګپ شپ ته جمع که"
@@ -2987,14 +3086,26 @@ msgstr "ګپ شپ ته جمع که"
 msgid "Chat _name:"
 msgstr "ګپ شپ نوم:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "د %s سره رابطه نه و شوه"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
 msgid "Chat error"
 msgstr "ګپ شپ خطا"
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr ""
+"د خادم سره رابطه قطع شوه:\n"
+"%s"
 
 msgid "Find buddies..."
 msgstr "ملګري پیداکول..."
@@ -3035,6 +3146,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+#, fuzzy
+msgid "GG server"
+msgstr "کاروونکی معلومات ورکه..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -3049,8 +3164,9 @@ msgstr "عنوان مقرر نه دی"
 msgid "File Transfer Failed"
 msgstr "دوسیه بدلونه ناکام شوه"
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "د دوسیه %s ویل نه و شول."
 
 msgid "Error displaying MOTD"
 msgstr ""
@@ -3065,8 +3181,18 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
 msgstr ""
+"د خادم سره رابطه قطع شوه:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "د نن پيغام لیدل"
@@ -3077,25 +3203,23 @@ msgstr "کانال:"
 msgid "_Password:"
 msgstr "پټ ټکی:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr ""
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
-msgstr ""
+msgid "Unable to connect"
+msgstr "رابطه نه و شوه"
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "د %s سره رابطه نه و شوه"
 
-msgid "Read error"
-msgstr ""
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "خادم رابطه قطع کړه."
 
 msgid "Users"
 msgstr "کاروونکي"
@@ -3272,6 +3396,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "کمکی نوم"
+
 msgid "Cannot change nick"
 msgstr ""
 
@@ -3471,10 +3606,10 @@ msgstr ""
 msgid "execute"
 msgstr "اوبسه"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3489,18 +3624,52 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "کره کول ناکام شو"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "د خادم سره رابطه کول ناکامه شوه."
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "خادم"
+
+msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
+msgid "No session ID given"
+msgstr ""
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"د خادم سره رابطه نه و شوه:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"د خادم سره رابطه نه و شوه:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "رابطه نه و شوه"
+
 msgid "Full Name"
 msgstr ""
 
@@ -3565,186 +3734,23 @@ msgstr ""
 msgid "Operating System"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "په ياداشت کتابچه ته معلومات ورکه"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "ګپ شپ بل نوم"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "د کاروونکی په ياداشت کتابچه کی معلومات نشته."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "اچټیمل"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "ثبت کولو شی خطا"
-
-#, fuzzy
-msgid "User Location"
-msgstr "ځای"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "کاروونکی نوم"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "د نوی برېشناليک خبرتيا"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "مرکه یاد ساتل"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "د خادم معلومات"
-
-msgid "File Transfer"
-msgstr "دوسیه بدلونه"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "د کاروونکی حالتونه"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "کاروونکی حد"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "کاروونکی نوم"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
 #, fuzzy
-msgid "Reachability Address"
-msgstr "برېښنالیک پته"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "د پېزندنې څېره"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "نښلول"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "کاروونکی نوم"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
+msgid "Local Time"
+msgstr "دلتنی دوسیه:"
 
-msgid "Jingle DTMF"
+msgid "Priority"
 msgstr ""
 
-#, fuzzy
-msgid "Message Receipts"
-msgstr "پیغام: %s"
+msgid "Resource"
+msgstr "څوري"
 
-msgid "Public Key Publishing"
+#, c-format
+msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "User Chatting"
-msgstr "کارکوونکی ټاکل"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "د کاروونکی حالتونه"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "کاروونکی نوم"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "کاروونکی حد"
-
-msgid "Ping"
-msgstr "پینګ"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
-msgid "Priority"
-msgstr ""
-
-msgid "Resource"
-msgstr "څوري"
+msgid "Logged Off"
+msgstr "ننوتی د"
 
 msgid "Middle Name"
 msgstr ""
@@ -3794,7 +3800,6 @@ msgstr "ګپ شپي"
 msgid "Extended Away"
 msgstr "اوژد ليرې"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
@@ -3914,28 +3919,24 @@ msgstr ""
 msgid "Find Rooms"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "بل نوم:"
 
-msgid "Write error"
+#, fuzzy
+msgid "No users found"
+msgstr "غږونه"
+
+msgid "Roles:"
 msgstr ""
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "رابطه ناکامه شوه"
 
-msgid "Read Error"
-msgstr ""
-
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"د خادم سره رابطه نه و شوه:\n"
-"%s"
-
-msgid "Unable to create socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -3945,6 +3946,10 @@ msgstr "باطل هویت"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "د خادم سره رابطه کول ناکامه شوه."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
@@ -3970,9 +3975,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr "رابطه ناکامه شوه"
 
-msgid "Already Registered"
-msgstr "له اوله ثبت شوی"
-
 msgid "State"
 msgstr ""
 
@@ -3985,6 +3987,9 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+msgid "Already Registered"
+msgstr "له اوله ثبت شوی"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "ثبت کول"
@@ -4016,6 +4021,10 @@ msgid "Change Registration"
 msgstr "ثبت کولو شی خطا"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "د خادم سره رابطه کول ناکامه شوه."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "د شمېرل معلومات بدلول شی خطا و شوه"
 
@@ -4034,9 +4043,18 @@ msgstr ""
 msgid "Re-initializing Stream"
 msgstr ""
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr ""
 
+msgid "Mood"
+msgstr "طبیعت"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr ""
 
@@ -4058,12 +4076,6 @@ msgstr "هیڅ نه"
 msgid "Subscription"
 msgstr ""
 
-msgid "Mood"
-msgstr "طبیعت"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "طبیعت"
@@ -4110,9 +4122,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "پټ ټکی بدلول"
@@ -4307,15 +4316,21 @@ msgid "Unable to ping user %s"
 msgstr "کاروونکی نه شه شامل"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4328,10 +4343,36 @@ msgstr "بڼیدل!!"
 msgid "%s has buzzed you!"
 msgstr "‫%s راننوتلو."
 
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "د دوسیه %s ویل نه و شول."
+
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: user is not online"
 msgstr ""
 
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "رابطه ناکامه شوه"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "کاروونکی خواښول"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "ګپ شپ پیل کول"
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4351,13 +4392,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4420,6 +4461,9 @@ msgstr "د رابطه خادم"
 msgid "File transfer proxies"
 msgstr "دوسیه بدلولو خادم"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4458,6 +4502,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4472,12 +4524,30 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
+#, fuzzy
+msgid "No reason"
+msgstr "کوریایی"
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
-#, c-format
-msgid "Error in chat %s"
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "‫%s وژللو (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "دوسیه بدلونه ناکام شوه"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "ګپ شپ نښلول ناکام شو"
+
+msgid "Failed to open in-band bytestream"
 msgstr ""
 
 #, c-format
@@ -4504,10 +4574,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "کاروونکی خواښول"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "د کاروونکی حالتونه"
 
@@ -4546,7 +4612,17 @@ msgstr "عمل"
 msgid "Select an action"
 msgstr "ليکبڼه خواښه"
 
-msgid "Unable to retrieve MSN Address Book"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr ""
+
+msgid "Buddy Add error"
+msgstr ""
+
+msgid "The username specified does not exist."
 msgstr ""
 
 #, c-format
@@ -4773,7 +4849,6 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4797,6 +4872,10 @@ msgstr "ترجیحي اړیکه"
 msgid "Non-IM Contacts"
 msgstr "اړیکه خوځول"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -4866,6 +4945,13 @@ msgstr ""
 msgid "Page"
 msgstr ""
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "کار"
+
 msgid "Has you"
 msgstr "ته رلو"
 
@@ -4907,6 +4993,14 @@ msgstr "حمل"
 msgid "Album"
 msgstr "اډیام"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "دنده عنوان"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "دنده عنوان"
+
 msgid "Set Friendly Name..."
 msgstr "دوستانه نوم مقررول..."
 
@@ -4940,9 +5034,6 @@ msgstr "ګپ شپ پیل کول"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr "د خادم سره رابطه کول ناکامه شوه."
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5093,8 +5184,9 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
-msgstr "د پېزندنې څېره ارل"
+#, fuzzy
+msgid "View web profile"
+msgstr "ملګری ليکه نه لرې دی"
 
 #. *< type
 #. *< ui_requirement
@@ -5131,63 +5223,26 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "کره کول ناکام شو"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr ""
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "نااشنا خطا رمز %d"
 
 msgid "Unable to add user"
 msgstr "کاروونکی نه شه شامل"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "نااشنا خطا رمز %d"
 
-msgid "Service Temporarily Unavailable."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr ""
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5220,9 +5275,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "رابطه نه و شوه"
-
 msgid "Writing error"
 msgstr ""
 
@@ -5237,19 +5289,21 @@ msgstr ""
 "د %s خادم څخه د ارتباط خطا:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "پاتی دی"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "تا د بل ځای نه را ننوتلی یی."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5278,6 +5332,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "کمپيوترنه ليرې"
 
@@ -5314,33 +5376,21 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "‫%s تا د خپل ماګری فهرست څخه خوځولی"
-
 msgid "Delete Buddy from Address Book?"
 msgstr ""
 
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr ""
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr ""
-
 msgid "The username specified is invalid."
 msgstr ""
 
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "د پېزندنې څېره ارل"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5355,18 +5405,62 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "د أېم پروتوکول نښلولی"
 
-#, fuzzy
-msgid "Missing Cipher"
-msgstr "شفر"
+#, c-format
+msgid "%s is not a valid group."
+msgstr ""
 
-msgid "The RC4 cipher could not be found"
+msgid "Unknown error."
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "‫%s تا د خپل ماګری فهرست څخه خوځولی"
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
+#, fuzzy
+msgid "User lookup"
+msgstr "کاروونکی کوټی"
+
 msgid "Reading challenge"
 msgstr ""
 
@@ -5377,13 +5471,25 @@ msgstr ""
 msgid "Logging in"
 msgstr "یاداشت لیک"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "بې نوم"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"د خادم سره رابطه قطع شوه:\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "پیغام و استوه"
@@ -5404,20 +5510,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "بې نوم"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "فوری زیری کړکی"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "رابطه و شوه"
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "د خادم سره رابطه کول ناکامه شوه."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5425,15 +5533,20 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr ""
+
+msgid "Incorrect username or password"
 msgstr ""
 
 msgid "MySpaceIM Error"
 msgstr ""
 
+msgid "Invalid input condition"
+msgstr ""
+
 #, fuzzy
 msgid "Failed to add buddy"
 msgstr "کاروونکی نه شه شامل"
@@ -5444,14 +5557,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "کاروونکی کوټی"
-
 msgid "Failed to remove buddy"
 msgstr ""
 
@@ -5461,39 +5566,17 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-msgid "Invalid input condition"
-msgstr ""
-
-msgid "Read buffer full (2)"
-msgstr ""
-
 #, fuzzy
-msgid "Unparseable message"
-msgstr "نه وېللي پېغامونه"
+msgid "Missing Cipher"
+msgstr "شفر"
 
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
+msgid "The RC4 cipher could not be found"
 msgstr ""
-"د بیوس خادم سره رابطه نه و شوه:\n"
-"%s"
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "فوری زیری کړکی"
-
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "د خادم سره رابطه کول ناکامه شوه."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5538,9 +5621,6 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-msgid "Profile"
-msgstr "د پېزندنې څېره"
-
 #, fuzzy
 msgid "Headline"
 msgstr "انکار"
@@ -5555,15 +5635,10 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "بې نوم"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 msgid "MySpaceIM - Username Available"
@@ -5575,6 +5650,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "په %s کی ګپ شپ نشی کولی."
@@ -5582,6 +5660,14 @@ msgstr "په %s کی ګپ شپ نشی کولی."
 msgid "Please try another username:"
 msgstr ""
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "بې نوم"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5776,9 +5862,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr ""
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5817,9 +5900,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "کاروونکی نه شه شامل"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5917,9 +6000,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -5940,23 +6020,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
-msgid "Error. SSL support is not installed."
-msgstr ""
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -5979,6 +6052,22 @@ msgstr "خادم پته"
 msgid "Server port"
 msgstr ""
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+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 ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "پاتی دی"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "ګپ شپ نښلول ناکام شو"
@@ -5987,20 +6076,12 @@ msgstr "ګپ شپ نښلول ناکام شو"
 msgid "Invalid chat room name"
 msgstr "باطل کوټه نوم"
 
-msgid "Server closed the connection."
-msgstr "خادم رابطه قطع کړه."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr ""
 "د خادم سره رابطه قطع شوه:\n"
 "%s"
 
-msgid "Received invalid data on connection with server."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6046,8 +6127,11 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
+"د خادم سره رابطه نه و شوه:\n"
+"%s"
 
 msgid "Direct IM established"
 msgstr ""
@@ -6214,23 +6298,18 @@ msgstr ""
 msgid "Screen Sharing"
 msgstr ""
 
-#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#, c-format
 msgid "Not Available"
 msgstr ""
 
-#, c-format
 msgid "Occupied"
 msgstr ""
 
-#, c-format
 msgid "Web Aware"
 msgstr "ویبپوه"
 
-#, c-format
 msgid "Invisible"
 msgstr "ناڅرګند"
 
@@ -6243,21 +6322,15 @@ msgstr ""
 msgid "Buddy Comment"
 msgstr ""
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "د کره کولو خادم سره رابطه نه و شوه\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"د بیوس خادم سره رابطه نه و شوه:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "د %s سره رابطه نه و شوه: %s"
 
 #, fuzzy
 msgid "Username sent"
@@ -6272,46 +6345,52 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "باطل نوم"
+msgid "Unable to get a valid AIM login hash."
+msgstr "د أېم د پېزندنې څېره مقرر نه شوه."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "د دوسیه %s ویل نه و شول."
 
-msgid "Incorrect password."
+msgid "Received authorization"
 msgstr ""
 
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "بې نوم"
+
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr ""
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6326,24 +6405,6 @@ msgstr ""
 msgid "_OK"
 msgstr "ټیک"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "د أېم د پېزندنې څېره مقرر نه شوه."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "د دوسیه %s ویل نه و شول."
-
 msgid "Password sent"
 msgstr ""
 
@@ -6458,7 +6519,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
@@ -6480,6 +6541,12 @@ msgstr "په ليکه د"
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
+msgid "Profile"
+msgstr "د پېزندنې څېره"
+
 msgid "Your AIM connection may be lost."
 msgstr "ښایی چه د تا د أېم رابطه به ورانه شي."
 
@@ -6633,7 +6700,7 @@ msgstr "د ليرېتوب پېغام ډېر اوژد دی."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6656,7 +6723,7 @@ msgstr "یتیمان"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6664,7 +6731,7 @@ msgid "(no name)"
 msgstr "(بي نوم)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -6726,6 +6793,7 @@ msgstr "رابطه"
 msgid "Get AIM Info"
 msgstr "د أېم معلومات اخله"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "د ملګری تبصره شی بدلون"
 
@@ -6783,6 +6851,7 @@ msgstr "لټون"
 msgid "Set User Info (web)..."
 msgstr "کاروونکی معلومات ورکه (ارل)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "پټ ټکی بدلول (ارل)"
@@ -6814,6 +6883,9 @@ msgstr "د برېشنالیک په توګه د ملګری لټون..."
 msgid "Search for Buddy by Information"
 msgstr "د معلومات په توګه د ماګری لټون"
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6831,7 +6903,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
@@ -6924,7 +6995,7 @@ msgstr "بل"
 msgid "Visible"
 msgstr "ناڅرګند"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7013,15 +7084,47 @@ msgstr ""
 msgid "Could not change buddy information."
 msgstr "په مهرباني سره د ملګری معلومات را که."
 
+msgid "Mobile"
+msgstr "ګرځنده"
+
+msgid "Note"
+msgstr "یادونه"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "ملګری تمثال"
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "بدلول"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "بدلول"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "خادم:"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
 #, c-format
-msgid "%d needs Q&A"
+msgid "%u requires verification"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "ملګری زيات که"
+msgid "Add buddy question"
+msgstr "ملګری فهرست ته شامل کړه؟"
 
-msgid "Input answer here"
+msgid "Enter answer here"
 msgstr ""
 
 msgid "Send"
@@ -7034,18 +7137,18 @@ msgstr "باطل نوم"
 msgid "Authorization denied message:"
 msgstr ""
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "د یاهو کره کول ناکام شول"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "ملګری فهرست ته شامل کړه؟"
 
-msgid "Input request here"
+msgid "Enter request here"
 msgstr ""
 
 msgid "Would you be my friend?"
@@ -7067,7 +7170,7 @@ msgid "Failed sending authorize"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "کاروونکی نه شه شامل"
 
 #, fuzzy, c-format
@@ -7109,6 +7212,9 @@ msgstr "په مهرباني سره د ملګری معلومات را که."
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
 #, fuzzy
 msgid "Not member"
 msgstr "ز غړی نه یم"
@@ -7150,15 +7256,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "په ګپ شپ نښلول"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "ز غړی یم"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7168,7 +7277,7 @@ msgstr "د کوکو کون عمل"
 msgid "Failed:"
 msgstr "ناکام شه"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7180,11 +7289,11 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "ز غړی یم"
 
 #, fuzzy
@@ -7195,35 +7304,35 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "زما معلومات کی بدلون"
 
 msgid "Setup"
 msgstr ""
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr ""
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "ملګری خوځول"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "ملګری خوځول"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7337,6 +7446,12 @@ msgstr ""
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr ""
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr ""
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7344,7 +7459,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "ګېم باره کې"
 
 #, fuzzy
@@ -7365,6 +7480,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "ګېم باره کې"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "کور پته"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7396,7 +7515,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "رابطه قطع شوه"
@@ -7409,6 +7527,9 @@ msgstr "د خادم معلومات"
 msgid "Show server news"
 msgstr "خادم پته"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 msgid "Keep alive interval (seconds)"
 msgstr ""
 
@@ -7417,12 +7538,9 @@ msgid "Update interval (seconds)"
 msgstr "کاروونکی معلومات"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "د رابطه خادم"
 
-msgid "Can not decrypt get server reply"
-msgstr ""
-
 #, c-format
 msgid "Failed requesting token, 0x%02X"
 msgstr ""
@@ -7443,20 +7561,19 @@ msgid "Activation required"
 msgstr "کره کول ناکام شو"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Keep alive error"
-msgstr ""
-
-msgid "Requesting captcha ..."
-msgstr ""
+#, fuzzy
+msgid "Requesting captcha"
+msgstr "پاتی دی"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "د یاهو کره کول ناکام شول"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7466,71 +7583,48 @@ msgstr "انځور و ساته"
 msgid "Enter code"
 msgstr "مخ"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 msgid "Enter the text from the image"
 msgstr ""
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "رابطه نه و شوه."
-
 msgid "Socket error"
 msgstr ""
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"د خادم سره رابطه قطع شوه:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr "لیک کولو خطا"
-
-msgid "Connection lost"
-msgstr "رابطه قطع شوه"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "کاروونکی معلومات ورکه..."
 
-msgid "Request token"
-msgstr ""
+#, fuzzy
+msgid "Requesting token"
+msgstr "پاتی دی"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "د %s سره رابطه نه و شوه"
 
 msgid "Invalid server or port"
 msgstr ""
 
 #, fuzzy
-msgid "Connecting server ..."
+msgid "Connecting to server"
 msgstr "د رابطه خادم"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "د کوکو هویت خطا"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "ګپ شپ نښلول ناکام شو"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7540,6 +7634,10 @@ msgid ""
 msgstr "خادم پته"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "‫%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "له"
 
@@ -7549,30 +7647,27 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unknow SERVER CMD"
+msgid "Unknown SERVER CMD"
 msgstr ""
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "د ملګری تبصره:"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "د رابطه خادم"
 
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr ""
 
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr ""
 
 #, c-format
@@ -7586,9 +7681,6 @@ msgstr "دوسیه استول"
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7642,17 +7734,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7675,6 +7756,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr "دوسیه بدلونه"
+
 msgid "Supports"
 msgstr "ملاتړلی"
 
@@ -8352,9 +8436,6 @@ msgstr "اداره"
 msgid "Unit"
 msgstr ""
 
-msgid "Note"
-msgstr "یادونه"
-
 msgid "Join Chat"
 msgstr "په ګپ شپ نښلول"
 
@@ -8440,6 +8521,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr "پینګ"
+
 msgid "Ping failed"
 msgstr "پینګ ناکام شو"
 
@@ -8497,8 +8581,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr "خادم رابطه قطع کړه."
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "د خادم سره رابطه کول ناکامه شوه"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8507,27 +8592,27 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "رابطه ناکامه شوه"
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
-msgstr ""
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "کاروونکی نه شه شامل"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "کاروونکی نه شه شامل"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "رابطه نه و شوه"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -8803,8 +8888,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "د أېم د پېزندنې څېره مقرر نه شوه."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -8892,6 +8978,9 @@ msgstr "سپینه تخته"
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -8932,35 +9021,36 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "رابطه نه و شوه"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "بې نوم"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr ""
-
-msgid "Could not connect"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "کاروونکی نه شه شامل"
 
-msgid "Unknown server response."
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "خادم پته"
 
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "د دوسیه %s ویل نه و شول."
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "د خادم معلومات"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8994,174 +9084,64 @@ msgstr "کاروونکی کره کول"
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "په دوسیه %s باندی لیک نه و شول."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "د دوسیه %s ویل نه و شول."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "په %s کی ګپ شپ نشی کولی."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr "ناکامي."
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr ""
-
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
-
-#, c-format
-msgid "No keywords."
-msgstr ""
-
-#, c-format
-msgid "User has no directory information."
-msgstr "د کاروونکی په ياداشت کتابچه کی معلومات نشته."
-
-#, c-format
-msgid "Country not supported."
-msgstr ""
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr ""
-
-#, c-format
-msgid "The service is temporarily unavailable."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
+"بې فکره خاکه جوړول: کاروونکی ته د بې فکره خاکه جوړولو غونډه پیل کولو عرض و که"
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr ""
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "د یاهو هویت"
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "نااشنا خطا %d و شوه. معلومات: %s"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "د بانجوړ نښلولي"
 
-msgid "Invalid Groupname"
+msgid "Pager server"
 msgstr ""
 
-msgid "Connection Closed"
+msgid "Pager port"
 msgstr ""
 
-msgid "Waiting for reply..."
-msgstr ""
+msgid "File transfer server"
+msgstr "دوسیه بدلولو خادم"
 
-msgid "TOC has come back from its pause. You may now send messages again."
+msgid "File transfer port"
 msgstr ""
 
-msgid "Password Change Successful"
+msgid "Chat room locale"
 msgstr ""
 
-msgid "_Group:"
-msgstr "ډاله:"
-
-msgid "Get Dir Info"
-msgstr "د ياداشت کتابچه څخه معلومات اخله"
-
-msgid "Set Dir Info"
-msgstr "په ياداشت کتابچه ته معلومات ورکه"
-
-#, c-format
-msgid "Could not open %s for writing!"
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
+msgid "Chat room list URL"
+msgstr "د ګپ شپو کوټی فهرست ارل"
 
-msgid "Could not connect for transfer."
-msgstr ""
+msgid "Yahoo Chat server"
+msgstr "د ياهو د ګپ شپ خادم"
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat port"
 msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "تمثال و ساته..."
-
-#, 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] ""
-
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr ""
+msgid "Yahoo JAPAN ID..."
+msgstr "د یاهو هویت"
 
 #. *< type
 #. *< ui_requirement
@@ -9173,11 +9153,11 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr ""
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "د أېم پروتوکول نښلولی"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9200,6 +9180,27 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "ماګری زیاتول رد کړي شول"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "اوسنی پټ ټکی"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9227,34 +9228,28 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "کاروونکی نه شه شامل"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-msgid "Connection problem"
-msgstr "ارتباط مساله"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 "د خادم سره رابطه قطع شوه:\n"
 "%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 "د خادم سره رابطه نه و شوه:\n"
 "%s"
@@ -9304,9 +9299,8 @@ msgstr "د موجودیت وضع"
 msgid "Start Doodling"
 msgstr "بې فکره خاکه جوړول"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "هویت فعال کول..."
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "چه سره ګپ شپ کول غواړی؟"
@@ -9321,75 +9315,15 @@ msgstr "کاروونکی سره ګپ شپ..."
 msgid "Open Inbox"
 msgstr "ګړندې بریښنالیک راتګوطاق خلاص کا"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-"بې فکره خاکه جوړول: کاروونکی ته د بې فکره خاکه جوړولو غونډه پیل کولو عرض و که"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "د یاهو هویت"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr "یاهو جاپان"
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr "دوسیه بدلولو خادم"
-
-msgid "Japan file transfer server"
-msgstr "جاپانی دوسیه بدلولو خادم"
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr "د ګپ شپو کوټی فهرست ارل"
-
-msgid "Yahoo Chat server"
-msgstr "د ياهو د ګپ شپ خادم"
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "د بې فکره خاکه جوړولو عرض و استول شو."
 
+msgid "Unable to connect."
+msgstr "رابطه نه و شوه."
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9397,6 +9331,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr "لیک کولو خطا"
+
 msgid "Yahoo! Japan Profile"
 msgstr "د جاپانی یاهو پېزندنې څېره"
 
@@ -9437,13 +9374,8 @@ msgstr ""
 msgid "Last Update"
 msgstr ""
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "د %s د کاروونکی معلومات نشته"
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9506,20 +9438,20 @@ msgstr "غږونه"
 msgid "Webcams"
 msgstr ""
 
+msgid "Connection problem"
+msgstr "ارتباط مساله"
+
 msgid "Unable to fetch room list."
 msgstr ""
 
 msgid "User Rooms"
 msgstr "کاروونکی کوټی"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
+"د خادم سره رابطه قطع شوه:\n"
 "%s"
-msgstr ""
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9637,13 +9569,7 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9651,16 +9577,13 @@ msgid "HTTP proxy connection error %d"
 msgstr "د هېټیټیپي وکیل ارتباط خطا %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9750,9 +9673,6 @@ msgstr ""
 msgid "Extended away"
 msgstr "اوژد ليرې"
 
-msgid "Mobile"
-msgstr "ګرځنده"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -9794,16 +9714,6 @@ msgstr "‫+++ %s اوس بې کارنه دی"
 msgid "%x %X"
 msgstr "‫%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "ویل شی خطا %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr "شمېره و..."
 
@@ -9909,6 +9819,16 @@ msgstr "رابطه ناکامه شوه."
 msgid "Address already in use."
 msgstr ""
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "ویل شی خطا %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 msgid "Internet Messenger"
 msgstr "د انترنت زری"
 
@@ -9957,10 +9877,8 @@ msgstr "د نوی برېشناليک خبرتيا"
 msgid "Use this buddy _icon for this account:"
 msgstr "د دی شمېرل لپاره دغه ملګری تمثال په کار که:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "د %s ټاکل"
+msgid "_Advanced"
+msgstr "مترقي"
 
 msgid "Use GNOME Proxy Settings"
 msgstr ""
@@ -9995,9 +9913,6 @@ msgstr ""
 msgid "you can see the butterflies mating"
 msgstr ""
 
-msgid "Proxy Options"
-msgstr "د وکیل ټاکل"
-
 msgid "Proxy _type:"
 msgstr "د وکیل نمونه:"
 
@@ -10026,8 +9941,9 @@ msgstr "اساسي"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "مترقي"
+#, fuzzy
+msgid "_Proxy"
+msgstr "وکیل"
 
 msgid "Enabled"
 msgstr ""
@@ -10065,16 +9981,17 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "د کوټه فهرست"
+msgid "A_ccount"
+msgstr "شمېرل:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "شمېرل:"
+#, fuzzy
+msgid "Room _List"
+msgstr "د کوټه فهرست"
 
 msgid "_Block"
 msgstr "مانع"
@@ -10092,6 +10009,16 @@ msgid "I_M"
 msgstr "فوري زيری"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "ګپ شپ زياتول"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "دوسیه و استوه..."
 
@@ -10103,7 +10030,11 @@ msgid "View _Log"
 msgstr "د یاداشت لیک لیدل"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "ملګری ليکه نه لرې دی"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "ملګری ليکه نه لرې دی"
 
 msgid "_Alias..."
@@ -10242,6 +10173,10 @@ msgstr "ملګری اونيسه"
 msgid "/Tools/_Certificates"
 msgstr "رجحانات"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "پرده"
+
 msgid "/Tools/Plu_gins"
 msgstr "نښلولي"
 
@@ -10251,10 +10186,6 @@ msgstr "رجحانات"
 msgid "/Tools/Pr_ivacy"
 msgstr "پرده"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "پرده"
-
 msgid "/Tools/_File Transfers"
 msgstr "دوسیه بدلونه..."
 
@@ -10370,8 +10301,8 @@ msgstr "زما په خواښه"
 msgid "By status"
 msgstr "په موقعيت"
 
-msgid "By log size"
-msgstr "د یاداشت لیک په لویوالی"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10389,6 +10320,9 @@ msgstr "رابطه"
 msgid "Re-enable"
 msgstr "بيا و شمېره"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10476,6 +10410,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "بل نوم:"
 
+msgid "_Group:"
+msgstr "ډاله:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10511,6 +10448,111 @@ msgstr "اسباب"
 msgid "/Buddies/Sort Buddies"
 msgstr "ملګری فهرست ترتيب"
 
+#. Buddy List
+msgid "Background Color"
+msgstr ""
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "اسد"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+msgid "Expanded Background Color"
+msgstr ""
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "ویړول"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+msgid "Collapsed Background Color"
+msgstr ""
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "طبیعت"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr ""
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "ملاتړلی"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "په ليکه"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "ليرې"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "ليکه نه لرې"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "طبیعت"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "پیغام"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "د %s کاروونکی معلومات بدلون"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -10530,12 +10572,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "ماګری ګپ شپ کوټه ته بلل"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
 msgid "_Buddy:"
 msgstr "ملګری:"
 
@@ -10564,8 +10600,9 @@ msgstr ""
 msgid "Get Away Message"
 msgstr "د ليرېتوب پیغام خیستل"
 
-msgid "Last said"
-msgstr ""
+#, fuzzy
+msgid "Last Said"
+msgstr "اخری نوم"
 
 msgid "Unable to save icon file to disk."
 msgstr ""
@@ -10611,6 +10648,22 @@ msgstr "و ساته لکه..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "نور"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "نور"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "نور"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "د یاداشت لیک لیدل"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "دوسیه استول..."
 
@@ -10685,6 +10738,18 @@ msgstr "مرکه"
 msgid "/Conversation/View Log"
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "نور"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "د یاداشت لیک لیدل"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "نور"
+
 msgid "/Conversation/Send File..."
 msgstr "دوسیه استول..."
 
@@ -10868,6 +10933,9 @@ msgstr "حمل"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr ""
 
@@ -10994,6 +11062,10 @@ msgstr "هندي"
 msgid "Hungarian"
 msgstr ""
 
+#, fuzzy
+msgid "Armenian"
+msgstr "روماني"
+
 msgid "Indonesian"
 msgstr ""
 
@@ -11009,6 +11081,10 @@ msgstr ""
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
+#, fuzzy
+msgid "Khmer"
+msgstr "بل"
+
 msgid "Kannada"
 msgstr ""
 
@@ -11031,6 +11107,9 @@ msgstr ""
 msgid "Macedonian"
 msgstr ""
 
+msgid "Mongolian"
+msgstr ""
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11086,6 +11165,9 @@ msgstr ""
 msgid "Swedish"
 msgstr ""
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "تاملي"
 
@@ -11137,7 +11219,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 
 msgid "Current Developers"
@@ -11387,7 +11486,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11425,15 +11524,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "د نوی برېشناليک خبرتيا"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "د نوی برېشناليک خبرتيا"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11446,15 +11552,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "د نوی برېشناليک خبرتيا"
 
-msgid "_Copy Email Address"
-msgstr ""
-
-msgid "_Open Link in Browser"
-msgstr ""
-
-msgid "_Copy Link Location"
-msgstr "تړنه ځای نقل کول"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11484,11 +11581,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "انځور و ساته"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "انځور ساتل..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11575,9 +11670,6 @@ msgstr ""
 msgid "Font Face"
 msgstr ""
 
-msgid "Background Color"
-msgstr ""
-
 msgid "Foreground Color"
 msgstr ""
 
@@ -11703,6 +11795,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11720,6 +11813,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11751,11 +11845,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "خنځیر"
 
-msgid "Open All Messages"
-msgstr "ټول پیغامونه ښکاره که"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "تا ته برېښناليک راغلی دي!"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "شمېره و..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, fuzzy, c-format
 msgid "%s has %d new message."
@@ -11784,6 +11894,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "پیغام"
+
+msgid "Open All Messages"
+msgstr "ټول پیغامونه ښکاره که"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "تا ته برېښناليک راغلی دي!"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "ملګری اونيسه"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "تا ته برېښناليک راغلی دي!"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -11833,10 +11964,17 @@ msgstr "نښلولي تفصيل"
 msgid "Select a file"
 msgstr ""
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "ملګری نيول شې بدلون"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "څوک نیسی"
 
+msgid "_Account:"
+msgstr "شمېرل:"
+
 msgid "_Buddy name:"
 msgstr "ملګری نوم"
 
@@ -11904,7 +12042,58 @@ msgstr "بيا بيا"
 msgid "Pounce Target"
 msgstr "د نیولو کس"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "بې فکره خاکه جوړول"
+
+#, c-format
+msgid "Paused while typing"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "را ننوځي"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "‫%s د ليرېتوب څخه ګرځيدلو (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "د ليرېتوب څخه ګرځيدل"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "‫%s راننوتلو."
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "ووځي"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "بې کار شي"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "چه کله لیرې وی"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "پیغام و استوه"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "پیغام ډېر غټ دی."
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -11925,6 +12114,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "د %s سره مرکه"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "ملګری فهرست"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "د سیستم مجمی تمثال"
 
@@ -11934,8 +12129,9 @@ msgstr "د سیستم مجمی تمثال ښکاره که:"
 msgid "On unread messages"
 msgstr "په نه وېللي پېغامونه باندې"
 
-msgid "Conversation Window Hiding"
-msgstr ""
+#, fuzzy
+msgid "Conversation Window"
+msgstr "مرکې"
 
 msgid "_Hide new IM conversations:"
 msgstr ""
@@ -11943,6 +12139,10 @@ msgstr ""
 msgid "When away"
 msgstr "چه کله لیرې وی"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "نوی مرکی:"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12002,10 +12202,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "نوی مرکی:"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12037,13 +12233,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-msgid "ST_UN server:"
-msgstr "د سټن خادم:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">مثال ‫: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -12064,6 +12258,10 @@ msgstr ""
 msgid "_End port:"
 msgstr ""
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "وکیل خادم"
@@ -12092,6 +12290,10 @@ msgstr "وکیل خادم"
 msgid "No proxy"
 msgstr "بې وکیل"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "کاروونکی"
 
@@ -12251,12 +12453,12 @@ msgstr "چه کله لیرې او بې کار دواړه وی"
 msgid "Auto-away"
 msgstr "پخپله ليرې تلل"
 
-msgid "Change status when _idle"
-msgstr "موقعیت بدلوه چه کله بې کار کېږی"
-
 msgid "_Minutes before becoming idle:"
 msgstr ""
 
+msgid "Change status when _idle"
+msgstr "موقعیت بدلوه چه کله بې کار کېږی"
+
 msgid "Change _status to:"
 msgstr ""
 
@@ -12405,27 +12607,18 @@ msgstr "و ساته او په کار که"
 msgid "Status for %s"
 msgstr "د %s موقعیت"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "انځور وراچول"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 msgid "Duplicate Shortcut"
 msgstr ""
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-msgid "Please select an image for the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "انځور وراچول"
@@ -12435,21 +12628,30 @@ msgid "Add Smiley"
 msgstr "موسکا!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "انځور و ساته"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "ملاتړلی"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "موسکا!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "ملاتړلی"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "ملګری خواښ که"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "د دی شمېرل لپاره دغه ملګری تمثال په کار که:"
 
@@ -12531,8 +12733,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -12561,6 +12763,16 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "تړنه خلاصول په:"
+
+msgid "_Copy Link Location"
+msgstr "تړنه ځای نقل کول"
+
+msgid "_Copy Email Address"
+msgstr ""
+
 msgid "Save File"
 msgstr "دوسیه ساتل"
 
@@ -12657,6 +12869,72 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "خادم پته"
+
+msgid "Enter an XMPP Server"
+msgstr ""
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+#, fuzzy
+msgid "Find Services"
+msgstr "په لیکه خدمتونه"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "ملګری فهرست"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "لیری لاړ شي"
+
+#, fuzzy
+msgid "Directory"
+msgstr "نیغ فوری زیری"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "تشریح"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "په ياداشت کتابچه ته معلومات ورکه"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "نور..."
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "خادم پته"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "په ياداشت کتابچه ته معلومات ورکه"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "ملګری بې کار دی"
 
@@ -13025,7 +13303,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13133,12 +13411,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13148,6 +13420,10 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "د نوی برېشناليک خبرتيا"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13177,35 +13453,23 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr ""
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "د نوی برېشناليک خبرتيا"
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "بندول"
+
 msgid "Fonts"
 msgstr "ليکبڼي"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13289,7 +13553,7 @@ msgstr "مرکې"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13341,6 +13605,109 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "ننوتی د"
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "په ګپ شپ نښلول"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "بی خونده"
+
+#, fuzzy
+msgid "Founder"
+msgstr "غږونه"
+
+#, fuzzy
+msgid "Operator"
+msgstr "اوپاره"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "اجازه ورکول"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "خطا"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "د کارکولو معلومات"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "اخطار"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "د %s موقعیت"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "د ګپ شپو کوټی فهرست ارل"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "تمثال و ساته"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "اړيکه معلومات"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "ملګری فهرست"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "ملګری فهرست"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "د ګېم کاروونکی"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13496,9 +13863,6 @@ msgstr ""
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr ""
-
 #, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "ننوتو ټاکل"
@@ -13507,7 +13871,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13547,6 +13911,221 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Connection failed."
+#~ msgstr "رابطه ناکامه شوه."
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "د خادم سره رابطه نه و شوه:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "په ياداشت کتابچه ته معلومات ورکه"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "ګپ شپ بل نوم"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "د کاروونکی په ياداشت کتابچه کی معلومات نشته."
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "اچټیمل"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "ثبت کولو شی خطا"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "ځای"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "کاروونکی نوم"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "د نوی برېشناليک خبرتيا"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "مرکه یاد ساتل"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "د خادم معلومات"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "د کاروونکی حالتونه"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "کاروونکی حد"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "کاروونکی نوم"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "برېښنالیک پته"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "د پېزندنې څېره"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "نښلول"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "کاروونکی نوم"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "پیغام: %s"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "کارکوونکی ټاکل"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "د کاروونکی حالتونه"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "کاروونکی نوم"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "کاروونکی حد"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "د خادم سره رابطه کول ناکامه شوه."
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "نه وېللي پېغامونه"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr ""
+#~ "د بیوس خادم سره رابطه نه و شوه:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "د بیوس خادم سره رابطه نه و شوه:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "باطل نوم"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "د رابطه خادم"
+
+#~ msgid "Connection lost"
+#~ msgstr "رابطه قطع شوه"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "اوسنی پټ ټکی"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "د خادم سره رابطه نه و شوه:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "یاهو جاپان"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "جاپانی دوسیه بدلولو خادم"
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "هویت فعال کول..."
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "استولي پیغامونه"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "ملګری زيات که"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "د خادم سره رابطه قطع شوه:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "ګپ شپ نښلول ناکام شو"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "په دوسیه %s باندی لیک نه و شول."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "په %s کی ګپ شپ نشی کولی."
+
+#~ msgid "Failure."
+#~ msgstr "ناکامي."
+
+#~ msgid "User has no directory information."
+#~ msgstr "د کاروونکی په ياداشت کتابچه کی معلومات نشته."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "نااشنا خطا %d و شوه. معلومات: %s"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "د ياداشت کتابچه څخه معلومات اخله"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "په ياداشت کتابچه ته معلومات ورکه"
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "تمثال و ساته..."
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "د %s د کاروونکی معلومات نشته"
+
+#~ msgid "%s Options"
+#~ msgstr "د %s ټاکل"
+
+#~ msgid "Proxy Options"
+#~ msgstr "د وکیل ټاکل"
+
+#~ msgid "By log size"
+#~ msgstr "د یاداشت لیک په لویوالی"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "د سټن خادم:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "انځور و ساته"
+
 #~ msgid "Primary Information"
 #~ msgstr "لومړنی معلومات"
 
@@ -13584,13 +14163,6 @@ msgstr ""
 #~ msgid "Remove from Qun"
 #~ msgstr "ډاله خوځول"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "‫%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "سیستم پیغام"
 
@@ -13599,10 +14171,6 @@ msgstr ""
 #~ msgstr "د خادم معلومات"
 
 #, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "اوسنی پټ ټکی"
-
-#, fuzzy
 #~ msgid "Failed to connect all servers"
 #~ msgstr "د خادم سره رابطه کول ناکامه شوه."
 
@@ -13738,17 +14306,9 @@ msgstr ""
 #~ msgstr "اوسنی پټ ټکی"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "د %s سره رابطه نه و شوه"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "پېغام:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "شمېرل:"
-
 #~ msgid ""
 #~ "%s was disconnected due to the following error:\n"
 #~ "%s"
@@ -13795,9 +14355,6 @@ msgstr ""
 #~ msgid "Status message"
 #~ msgstr "د موقعيت پيغام"
 
-#~ msgid "Pidgin User"
-#~ msgstr "د ګېم کاروونکی"
-
 #~ msgid "Jabber Account"
 #~ msgstr "د جابېر شمېرل"
 
diff --git a/po/pt.po b/po/pt.po
index 6508b3d50a..e54ea8127f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-03-14 17:23+0000\n"
 "Last-Translator: Duarte Henriques <duarte.henriques@gmail.com>\n"
 "Language-Team: \n"
@@ -31,7 +31,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -646,21 +646,6 @@ msgid "Send To"
 msgstr "_Enviar Para"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "Inserir na mensagem"
-
-msgid "Invite"
-msgstr "Convidar"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Por favor introduza o nome do utilizador que gostaria de convidar, e uma "
-"mensagem de convite opcional."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "Conversações"
 
@@ -928,6 +913,43 @@ msgid "System Log"
 msgstr "Registo do Sistema"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "Calculando..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "Conta"
+
+#, fuzzy
+msgid "Reject"
+msgstr "Redefinir"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Saiu do canal%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "Email"
 
@@ -964,6 +986,9 @@ msgstr "Ligar"
 msgid "IM"
 msgstr "MI"
 
+msgid "Invite"
+msgstr "Convidar"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(sem nome)"
@@ -1185,7 +1210,6 @@ msgstr "%s está ausente. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s enviou-lhe uma mensagem. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Acontecimento de notificação desconhecido. Por favor reporte isto!"
 
@@ -1242,7 +1266,6 @@ msgstr "_Minutos antes de mudar de estado:"
 msgid "Change status to"
 msgstr "Mudar _estado para:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Conversações"
 
@@ -1598,7 +1621,6 @@ msgstr ""
 "Quando uma nova conversa é aberta este plugin irá inserir a última conversa "
 "na conversa actual."
 
-#, c-format
 msgid "Online"
 msgstr "Ligado"
 
@@ -1647,6 +1669,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "contas"
 
@@ -1745,15 +1789,6 @@ msgstr "Aceitar convite para chat?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "Conta"
-
-#, fuzzy
-msgid "Reject"
-msgstr "Redefinir"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1844,6 +1879,8 @@ msgstr "+++ %s ligou-se"
 msgid "+++ %s signed off"
 msgstr "+++ %s desligou-se"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -1892,6 +1929,18 @@ msgstr "%s saiu da sala."
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Convidar para Conferência"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Por favor introduza o nome do utilizador que gostaria de convidar, e uma "
+"mensagem de convite opcional."
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "Impossível criar ligação"
@@ -2030,7 +2079,6 @@ msgstr "Iniciando a transferência de %s vindo de %s"
 msgid "Transfer of file %s complete"
 msgstr "Transferência do ficheiro %s completa"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Transferência de ficheiro completa"
 
@@ -2038,7 +2086,6 @@ msgstr "Transferência de ficheiro completa"
 msgid "You canceled the transfer of %s"
 msgstr "Cancelou a transferência de %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Transferência de ficheiro cancelada"
 
@@ -2225,11 +2272,14 @@ msgstr "<font color=\"red\"><b>Impossível ler ficheiro: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA-AUTOMATICA>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Erro ao criar a ligação"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2638,7 +2688,7 @@ msgstr "Inclui os registos de outros clientes de MI no leitor de registo."
 #, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2692,7 +2742,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2721,6 +2771,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Introduza a Senha"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2915,11 +2991,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Impossível ouvir ligações MI\n"
 
 msgid ""
@@ -2927,7 +3004,6 @@ msgid ""
 msgstr ""
 "Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Primeiro nome"
 
@@ -2962,6 +3038,11 @@ msgstr "Plugin do Protocolo Bonjour"
 msgid "Purple Person"
 msgstr "Nova Pessoa"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Localidade"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2972,16 +3053,17 @@ msgstr "%s fechou a conversa."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Impossível enviar mensagem, a conversa não pôde ser iniciada."
 
-msgid "Cannot open socket"
-msgstr "Impossível abrir socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Impossível criar socket"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Impossível associar a socket a um porto"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Impossível ouvir na socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Impossível criar socket"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3031,13 +3113,16 @@ msgstr "Guardar listadecontactos..."
 msgid "Load buddylist from file..."
 msgstr "Importar lista de contactos de um ficheiro..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Preencha os campos de registo."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Senhas não conferem."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Impossível registar nova conta. Ocorreu um erro\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3049,14 +3134,15 @@ msgstr "Registo efectuado com sucesso!"
 msgid "Password"
 msgstr "Senha"
 
-msgid "Password (retype)"
-msgstr "Senha (re-escreva)"
+msgid "Password (again)"
+msgstr "Senha (novamente)"
 
-msgid "Enter current token"
-msgstr "Introduza o token actual"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Token actual"
+#, fuzzy
+msgid "Captcha"
+msgstr "Guardar imagem"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registar Nova Conta Gadu-Gadu"
@@ -3110,6 +3196,15 @@ msgstr "Senha alterada com sucesso!"
 msgid "Current password"
 msgstr "Senha actual"
 
+msgid "Password (retype)"
+msgstr "Senha (re-escreva)"
+
+msgid "Enter current token"
+msgstr "Introduza o token actual"
+
+msgid "Current token"
+msgstr "Token actual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Por favor introduza a sua senha actual e a sua nova senha para UIN: "
 
@@ -3123,13 +3218,13 @@ msgstr "Escolher um chat para o contacto: %s"
 msgid "Add to chat..."
 msgstr "Adicionar ao chat..."
 
+#. Global
 msgid "Available"
 msgstr "Disponível"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Ausente"
 
@@ -3158,7 +3253,8 @@ msgstr "Não foi encontrado nenhum utilizador"
 msgid "There are no users matching your search criteria."
 msgstr "Não há utilizadores que correspondam aos critérios de procura."
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Impossível ler do socket"
 
 msgid "Buddy list downloaded"
@@ -3173,8 +3269,14 @@ msgstr "Lista de contactos carregada"
 msgid "Your buddy list was stored on the server."
 msgstr "A sua lista de contactos foi guardada no servidor."
 
-msgid "Connection failed."
-msgstr "Ligação falhou."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Ligado"
+
+msgid "Connection failed"
+msgstr "Ligação falhou"
 
 msgid "Add to chat"
 msgstr "Adicionar ao chat"
@@ -3182,13 +3284,23 @@ msgstr "Adicionar ao chat"
 msgid "Chat _name:"
 msgstr "_nome de chat:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Impossível ligar ao servidor."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Ligando"
+
 msgid "Chat error"
 msgstr "Erro de chat"
 
 msgid "This chat name is already in use"
 msgstr "Este nome de chat já está a ser utilizado"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Não está ligado ao servidor."
 
 msgid "Find buddies..."
@@ -3230,6 +3342,10 @@ msgstr "MI popular da polónia"
 msgid "Gadu-Gadu User"
 msgstr "Utilizador do Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Definir Informações de Utilizador..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
@@ -3245,7 +3361,7 @@ msgid "File Transfer Failed"
 msgstr "Transferência de Ficheiro Falhou"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "O Pidgin não conseguiu abrir um porto de leitura."
 
 msgid "Error displaying MOTD"
@@ -3261,8 +3377,16 @@ msgstr "Não há nenhum MOTD associado a esta ligação."
 msgid "MOTD for %s"
 msgstr "MOTD de %s"
 
-msgid "Server has disconnected"
-msgstr "O servidor desligou"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Não está ligado ao servidor."
 
 msgid "View MOTD"
 msgstr "Ver MOTD"
@@ -3273,25 +3397,24 @@ msgstr "_Canal:"
 msgid "_Password:"
 msgstr "_Senha:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Nomes de IRC não podem conter espaços em branco"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Ligando"
-
 msgid "SSL support unavailable"
 msgstr "Suporte SSL não está disponível"
 
-msgid "Couldn't create socket"
-msgstr "Impossível criar socket"
+msgid "Unable to connect"
+msgstr "Incapaz de ligar"
 
-msgid "Couldn't connect to host"
-msgstr "Não foi possível ligar ao host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Impossível ligar ao servidor"
 
-msgid "Read error"
-msgstr "Erro de leitura"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "%s fechou a conversa."
 
 msgid "Users"
 msgstr "Utilizadores"
@@ -3411,7 +3534,8 @@ msgstr "Mensagem desconhecida"
 
 #, fuzzy
 msgid "The IRC server received a message it did not understand."
-msgstr "O Pidgin enviou uma mensagem que não foi entendida pelo servidor de IRC."
+msgstr ""
+"O Pidgin enviou uma mensagem que não foi entendida pelo servidor de IRC."
 
 #, c-format
 msgid "Users on %s: %s"
@@ -3476,6 +3600,17 @@ msgstr ""
 "O nome de utilizador que escolheu foi rejeitado pelo servidor.  "
 "Provavelmente porque contém caracters inválidos."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Este nome de chat já está a ser utilizado"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Nome remoto"
+
 msgid "Cannot change nick"
 msgstr "Impossível mudar o nome"
 
@@ -3718,13 +3853,14 @@ msgstr "Comando desactivado"
 msgid "execute"
 msgstr "Inesperado"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "O servidor precisa de TLS/SSL para o login.  Suporte TLS/SSL não foi "
 "encontrado."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "O servidor precisa de TLS/SSL para o login.  Suporte TLS/SSL não foi "
 "encontrado."
@@ -3745,18 +3881,52 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticação por Texto Simples"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autenticação falhada"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "O servidor retornou uma resposta inválida."
 
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor não usa memhum método de autenticação suportado"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Pedido de acesso do servidor inválido"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Erro SASL"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Nenhum motivo foi dado."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Versão Não Suportada"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Impossível criar ligação"
+
 msgid "Full Name"
 msgstr "Nome completo"
 
@@ -3825,187 +3995,9 @@ msgstr "Cidade"
 msgid "Operating System"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Definir informações de directório"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Endereço (Complemento)"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Renomear Chat"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Utilizador não tem informação de directório."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Comando"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Erro ao registar"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Localização"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "Pesquisa de Utilizadores"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Notificação do Estado do Contacto"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Versão Não Suportada"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Orientação"
-
-msgid "File Transfer"
-msgstr "Transferência de Ficheiro"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Modos de Utilizador"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Limite de Utilizadores"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Recursos"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Nome do utilizador"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "MI com Troca de Chave"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Endereço de email"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Perfil MSN"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Nome de Utilizador"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Vídeo ao Vivo"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Mensagem recebida"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Babbleprint da Chave Pública"
-
 #, fuzzy
-msgid "User Chatting"
-msgstr "Opções de utilizador"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Modos de Utilizador"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Nome de Utilizador"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Limite de Utilizadores"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Criptografia do Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Recursos"
+msgid "Local Time"
+msgstr "Ficheiro Local:"
 
 msgid "Priority"
 msgstr "Prioridade"
@@ -4013,6 +4005,14 @@ msgstr "Prioridade"
 msgid "Resource"
 msgstr "Recurso"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Já Está Ligado"
+
 msgid "Middle Name"
 msgstr "Nome do meio"
 
@@ -4061,7 +4061,6 @@ msgstr "Disponível para chat"
 msgid "Extended Away"
 msgstr "Ausente (estendido)"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Não perturbar"
 
@@ -4186,28 +4185,26 @@ msgstr "Escolha um servidor de conferência"
 msgid "Find Rooms"
 msgstr "Encontrar Salas"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Nome:"
 
-msgid "Write error"
-msgstr "Erro ao enviar"
+#, fuzzy
+msgid "No users found"
+msgstr "Não foi encontrado nenhum utilizador"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Texto simples"
+msgid "Roles:"
+msgstr "Função"
 
-msgid "Read Error"
-msgstr "Erro de Leitura"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Texto simples"
 
-#, fuzzy, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
-
-msgid "Unable to create socket"
-msgstr "Impossível criar socket"
 
 #, fuzzy
 msgid "Invalid XMPP ID"
@@ -4216,6 +4213,10 @@ msgstr "Identificador Inválido"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Impossível ligar ao servidor."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registo de %s@%s efectuado com sucesso"
@@ -4242,9 +4243,6 @@ msgstr "Registo Efectuado com Sucesso"
 msgid "Unregistration Failed"
 msgstr "Erro ao Registar"
 
-msgid "Already Registered"
-msgstr "Já está Registado"
-
 msgid "State"
 msgstr "Estado"
 
@@ -4258,6 +4256,9 @@ msgstr "Telefone"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Já está Registado"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Registar"
@@ -4292,6 +4293,10 @@ msgid "Change Registration"
 msgstr "Erro ao registar"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Impossível ligar ao servidor."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Erro ao mudar informações da conta"
 
@@ -4311,9 +4316,18 @@ msgstr "Autenticando"
 msgid "Re-initializing Stream"
 msgstr "Reiniciando Stream"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
+msgid "Mood"
+msgstr "Disposição"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Ambos"
 
@@ -4335,12 +4349,6 @@ msgstr "Nenhuma"
 msgid "Subscription"
 msgstr "Subscrição"
 
-msgid "Mood"
-msgstr "Disposição"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "Disposição"
@@ -4387,9 +4395,6 @@ msgstr "A sua senha foi alterada."
 msgid "Error changing password"
 msgstr "Erro ao mudar senha"
 
-msgid "Password (again)"
-msgstr "Senha (novamente)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Alterar senha"
@@ -4584,18 +4589,24 @@ msgstr "Incapaz de expulsar utilizador %s"
 msgid "Unable to ping user %s"
 msgstr "Incapaz de banir utilizador %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Impossível tocar o som porque o ficheiro escolhido (%s) não existe."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Impossível tocar o som porque o ficheiro escolhido (%s) não existe."
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Impossível tocar o som porque o ficheiro escolhido (%s) não existe."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4606,9 +4617,41 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr "%s ligou-se."
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Impossível enviar mensagem para %s."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+"Incapaz de enviar ficheiro a %s, o utilizador não suporta transferências de "
+"ficheiros"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Incapaz de enviar ficheiro a %s, o utilizador não suporta transferências de "
+"ficheiros"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Erro ao Registar"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
 msgstr ""
+"Por favor introduza o nome ou nome local da pessoa cuja informação gostaria "
+"de ver."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "Seleccione um ficheiro"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Iniciar _Chat"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar uma sala de chat."
@@ -4629,16 +4672,18 @@ msgstr "topic [novo tópico]:  Ver ou modificar o tópico."
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;utilizador&gt; [sala]:  Banir um utilizador da sala."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;utilizador&gt; &lt;owner|admin|member|outcast|none&gt;: Define "
 "a afiliação de um utilizador à sala."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;utilizador&gt; &lt;moderator|participant|visitor|none&gt;: Define o "
 "papel de um utilizador na sala."
@@ -4709,6 +4754,9 @@ msgstr "Ligar ao servidor"
 msgid "File transfer proxies"
 msgstr "Porto de transferências de ficheiros"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4749,6 +4797,14 @@ msgstr "Erro de Leitura XML"
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presença"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Erro ao entrar no chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Erro no chat %s"
+
 msgid "Create New Room"
 msgstr "Criar Nova Sala"
 
@@ -4765,13 +4821,32 @@ msgstr "_Configurar Sala"
 msgid "_Accept Defaults"
 msgstr "_Aceitar Padrões"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Erro ao entrar no chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nenhum motivo foi dado."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Erro no chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Foi expulso por %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Kickado por %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Ocorreu um erro ao abrir o ficheiro."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Transferência de Ficheiro Falhou"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Impossível guardar imagem: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4805,10 +4880,6 @@ msgstr ""
 "de ver."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "Seleccione um ficheiro"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "Modos de Utilizador"
 
@@ -4847,9 +4918,19 @@ msgstr "Acção"
 msgid "Select an action"
 msgstr "Seleccione um ficheiro"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Impossível adicionar \"%s\"."
+
+msgid "Buddy Add error"
+msgstr ""
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Escolher Caderno de Moradas Notes"
+msgid "The username specified does not exist."
+msgstr "O nome de utilizador especificado é inválido."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5079,7 +5160,7 @@ msgstr "Passport de Criança sem autorização paternal"
 msgid "Passport account not yet verified"
 msgstr "Conta do Passport ainda não foi verificada"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Conta do Passport ainda não foi verificada"
 
@@ -5103,6 +5184,10 @@ msgstr "Contacto Preferido"
 msgid "Non-IM Contacts"
 msgstr "Remover Pessoa"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5174,6 +5259,13 @@ msgstr "Enviar uma mensagem para dispositivo móvel."
 msgid "Page"
 msgstr "Enviar"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Nível de Alerta"
+
 msgid "Has you"
 msgstr "Tem-no"
 
@@ -5215,6 +5307,14 @@ msgstr "Endereço"
 msgid "Album"
 msgstr "Adium"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "Título"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Título"
+
 msgid "Set Friendly Name..."
 msgstr "Definir Nome..."
 
@@ -5251,9 +5351,6 @@ msgstr ""
 "É necessário suporte SSL para o MSN. Por favor instale uma biblioteca de "
 "SSL. Veja http://Pidgin.sf.net/faq-ssl.php para mais informações."
 
-msgid "Failed to connect to server."
-msgstr "Impossível ligar ao servidor."
-
 msgid "Error retrieving profile"
 msgstr "Erro ao buscar o perfil"
 
@@ -5429,8 +5526,9 @@ msgstr ""
 "O Pidgin não encontrou informação no perfil do utilizador. O utilizador "
 "provavelmente não existe."
 
-msgid "Profile URL"
-msgstr "URL do perfil"
+#, fuzzy
+msgid "View web profile"
+msgstr "Não permitido enquanto desligado"
 
 #. *< type
 #. *< ui_requirement
@@ -5467,66 +5565,29 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticação normal falhou!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s não é um grupo válido."
-
-msgid "Unknown error."
-msgstr "Erro desconhecido."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s em %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s enviou-lhe agora um Nudge!"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Erro desconhecido"
 
 msgid "Unable to add user"
 msgstr "Incapaz de adicionar utilizador"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Erro desconhecido"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Os seguintes são os resultados da sua pesquisa"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Incapaz de adicionar utilizador em %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Incapaz de bloquear utilizador em %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Incapaz de permitir utilizador em %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s não pôde ser adicionado porque a sua lista de contactos está cheia."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s não é uma conta de passport válida."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Serviço Temporariamente Indisponível."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 "A mensagem não pôde ser enviada porque estamos a enviar rápido de mais:"
 
-msgid "Unable to rename group"
-msgstr "Incapaz de renomear grupo"
-
-msgid "Unable to delete group"
-msgstr "Incapaz de apagar grupo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5575,9 +5636,6 @@ msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 "A mensagem pode não ter sido enviada porque ocorreu um erro desconhecido:"
 
-msgid "Unable to connect"
-msgstr "Incapaz de ligar"
-
 msgid "Writing error"
 msgstr "Erro de escrita"
 
@@ -5592,13 +5650,16 @@ msgstr ""
 "Erro de ligação do servidor %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "O nosso protocolo não é suportado pelo servidor."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Erro ao processar HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Ligou-se de outro local."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5606,7 +5667,8 @@ msgstr ""
 "Os servidores MSN estão temporariamente indisponíveis. Por favor espere e "
 "tente novamente."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Os servidores MSN vão desligar-se temporariamente."
 
 #, c-format
@@ -5637,6 +5699,14 @@ msgstr "Enviando cookie"
 msgid "Retrieving buddy list"
 msgstr "Requisitando lista de contactos"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Ausente"
 
@@ -5678,14 +5748,6 @@ msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "A mensagem pode não ter sido enviada porque ocorreu um erro desconhecido:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s adicionou-o(a) à sua lista de contactos."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s removeu-o(a) da sua lista de contactos."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Adicionar ao Livro de Endereços"
@@ -5694,13 +5756,6 @@ msgstr "Adicionar ao Livro de Endereços"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Quer adicionar este contacto à sua lista de contactos?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Impossível adicionar \"%s\"."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "O nome de utilizador especificado é inválido."
@@ -5708,6 +5763,9 @@ msgstr "O nome de utilizador especificado é inválido."
 msgid "This Hotmail account may not be active."
 msgstr "Esta conta Hotmail pode não estar activa"
 
+msgid "Profile URL"
+msgstr "URL do perfil"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5722,19 +5780,63 @@ msgstr "Esta conta Hotmail pode não estar activa"
 msgid "MSN Protocol Plugin"
 msgstr "Plugin do Protocolo AIM/ICQ"
 
-#, fuzzy
-msgid "Missing Cipher"
-msgstr "Cifra"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s não é um grupo válido."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "Erro desconhecido."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s em %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Incapaz de adicionar utilizador em %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Incapaz de bloquear utilizador em %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Incapaz de permitir utilizador em %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s não pôde ser adicionado porque a sua lista de contactos está cheia."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s não é uma conta de passport válida."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Serviço Temporariamente Indisponível."
+
+msgid "Unable to rename group"
+msgstr "Incapaz de renomear grupo"
+
+msgid "Unable to delete group"
+msgstr "Incapaz de apagar grupo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s adicionou-o(a) à sua lista de contactos."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s removeu-o(a) da sua lista de contactos."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "Salas do Utilizador"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "Erro de leitura"
 
@@ -5746,13 +5848,23 @@ msgstr "Pedido de acesso do servidor inválido"
 msgid "Logging in"
 msgstr "Registo"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "Sem nome"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "Não está ligado ao servidor."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Enviar uma _mensagem"
@@ -5773,20 +5885,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "Sem nome"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "Janelas de M_I"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Ligado"
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "O servidor retornou uma resposta inválida."
 
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
@@ -5794,16 +5908,23 @@ msgstr "O processo retornou o código de erro %d"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Nome ou senha incorrectos."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "Terminando ligação"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Impossível entrar na conversa do contacto"
 
@@ -5815,14 +5936,6 @@ msgstr "Importar lista de contactos de um ficheiro..."
 msgid "persist command failed"
 msgstr "O quadro de comunicações falhou"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "Salas do Utilizador"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Impossível entrar na conversa do contacto"
@@ -5835,38 +5948,16 @@ msgid "blocklist command failed"
 msgstr "O quadro de comunicações falhou"
 
 #, fuzzy
-msgid "Invalid input condition"
-msgstr "Terminando ligação"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Fila cheia"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Impossível processar mensagem"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Não foi possível ligar ao host"
+msgid "Missing Cipher"
+msgstr "Cifra"
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "Janelas de M_I"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "O servidor retornou uma resposta inválida."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5915,10 +6006,6 @@ msgid "User"
 msgstr "Utilizadores"
 
 #, fuzzy
-msgid "Profile"
-msgstr "Perfil MSN"
-
-#, fuzzy
 msgid "Headline"
 msgstr "Nome real"
 
@@ -5933,15 +6020,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "Fechar conversa"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "Sem nome"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5955,6 +6037,9 @@ msgstr "%s enviou mensagem para o quadro. Gostaria de abrir o quadro?"
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "Este tema não tem smileys disponíveis."
@@ -5963,6 +6048,14 @@ msgstr "Este tema não tem smileys disponíveis."
 msgid "Please try another username:"
 msgstr "Por favor introduza a sua nova senha"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "Sem nome"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6159,10 +6252,6 @@ msgid "Master archive is misconfigured"
 msgstr "O arquivo principal está mal configurado"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Nome ou senha incorrectos."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Incapaz de reconhecer o anfitrião do nome de utilizador que inseriu"
 
@@ -6206,9 +6295,9 @@ msgstr "O utilizador está desligado ou bloqueou-o"
 msgid "Unknown error: 0x%X"
 msgstr "Erro desconhecido: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login falhou (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Incapaz de banir utilizador %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6312,9 +6401,6 @@ msgstr "Conferência GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-msgid "Unable to connect to server."
-msgstr "Impossível ligar ao servidor."
-
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
@@ -6338,9 +6424,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Gostaria de se juntar à conversa?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Foi desligado porque se ligou a partir de outra estação de trabalho."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6348,17 +6431,14 @@ msgstr ""
 "Parece que %s está desligado e não recebeu a mensagem que acabou de lhe "
 "enviar."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Impossível ligar ao servidor. Por favor introduza a morada do servidor a que "
 "se deseja ligar."
 
-msgid "Error. SSL support is not installed."
-msgstr "Erro. Suporte SSL não está instalado."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Esta conferência foi fechada. Não podem ser enviadas mais mensagens."
 
@@ -6382,6 +6462,25 @@ msgid "Server port"
 msgstr "Porto do servidor"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "O servidor retornou uma resposta inválida."
+
+#. username connecting too frequently
+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 ""
+"esteve a ligar e desligar com muita frequência. Espere dez minutos e tente "
+"novamente. Se continuar a tentar, vai ter que esperar ainda mais."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Erro ao criar a ligação"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Não foi possível ligar"
 
@@ -6390,17 +6489,7 @@ msgid "Invalid chat room name"
 msgstr "Nome de Sala Inválido"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "%s fechou a conversa."
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Não está ligado ao servidor."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Impossível criar ligação SSL ao servidor."
 
 #. *< type
@@ -6453,7 +6542,7 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 
 #, fuzzy
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 "Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
 
@@ -6626,23 +6715,18 @@ msgstr "Camâra"
 msgid "Screen Sharing"
 msgstr "Nome de utilizador"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Livre Para Conversa"
 
-#, c-format
 msgid "Not Available"
 msgstr "Não Disponível"
 
-#, c-format
 msgid "Occupied"
 msgstr "Ocupado"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Permitir que outros vejam o seu estado pela Web"
 
-#, c-format
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -6656,15 +6740,11 @@ msgid "Buddy Comment"
 msgstr "Comentário de Contacto"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Não foi possível ligar para transferência."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr "Impossível ligar ao servidor."
 
 #, fuzzy
@@ -6680,52 +6760,63 @@ msgstr "Terminando ligação"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Incapaz de ligar: Não foi possível ligar-se como %s porque o nome de "
 "utilizador é inválido.  Nomes de utilizador têem que começar com uma letra e "
 "conter apenas letras, números e espaços, ou conter apenas números."
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Pode ser desligado num curto período de tempo. Pode querer usar o TOC até "
+"que isso esteja corrigido. Verifique por actualizações em %s."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "Nome inválido"
+msgid "Unable to get a valid AIM login hash."
+msgstr "O Pidgin não foi capaz de obter um \"hash\" de ligação AIM válido."
 
-msgid "Incorrect password."
-msgstr "Senha incorrecta."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "O Pidgin não foi capaz de obter um hash de ligação válido."
+
+msgid "Received authorization"
+msgstr "Autorização recebida"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Utilizador não existe"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "A sua conta está suspensa neste momento."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O serviço AOL Instant Messenger está temporariamente indisponível."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"esteve a ligar e desligar com muita frequência. Espere dez minutos e tente "
-"novamente. Se continuar a tentar, vai ter que esperar ainda mais."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A versão do cliente que está a usar é velha demais. Por favor actualize em %s"
 
-msgid "Could Not Connect"
-msgstr "Não foi possível ligar"
-
-msgid "Received authorization"
-msgstr "Autorização recebida"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"esteve a ligar e desligar com muita frequência. Espere dez minutos e tente "
+"novamente. Se continuar a tentar, vai ter que esperar ainda mais."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "A chave SecurID inserida é inválida."
 
 msgid "Enter SecurID"
@@ -6741,28 +6832,6 @@ msgstr "Introduza o número de 6 dígitos do mostrador digital."
 msgid "_OK"
 msgstr "OK"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Pode ser desligado num curto período de tempo. Pode querer usar o TOC até "
-"que isso esteja corrigido. Verifique por actualizações em %s."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "O Pidgin não foi capaz de obter um \"hash\" de ligação AIM válido."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Pode ser desligado num curto período de tempo. Pode querer usar o TOC até "
-"que isso esteja corrigido. Verifique por actualizações em %s."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "O Pidgin não foi capaz de obter um hash de ligação válido."
-
 msgid "Password sent"
 msgstr "Senha enviada"
 
@@ -6898,7 +6967,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Perdeu %hu mensagem de %s por um motivo desconhecido."
 msgstr[1] "Perdeu %hu mensagens de %s por um motivo desconhecido."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossível enviar mensagem: %s"
@@ -6920,6 +6989,13 @@ msgstr "Desligado Desde"
 msgid "Member Since"
 msgstr "Membro Desde"
 
+msgid "Capabilities"
+msgstr "Recursos"
+
+#, fuzzy
+msgid "Profile"
+msgstr "Perfil MSN"
+
 msgid "Your AIM connection may be lost."
 msgstr "A sua ligação AIM pode ter sido perdida."
 
@@ -7071,8 +7147,8 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"O tamanho máximo de %d byte do seu perfil foi excedido. O Pidgin truncou-o por "
-"si."
+"O tamanho máximo de %d byte do seu perfil foi excedido. O Pidgin truncou-o "
+"por si."
 msgstr[1] ""
 "O tamanho máximo de %d bytes do seu perfil foi excedido. O Pidgin truncou-o "
 "por si."
@@ -7099,7 +7175,7 @@ msgstr "Mensagem de ausência muito extensa."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7127,9 +7203,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Órfãos"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Não foi possível adicionar o contacto %s porque tem muitos contactos na sua "
@@ -7139,7 +7215,7 @@ msgid "(no name)"
 msgstr "(sem nome)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "O seu comando falhou por um motivo desconhecido."
 
 #, fuzzy, c-format
@@ -7214,6 +7290,7 @@ msgstr "Ligar"
 msgid "Get AIM Info"
 msgstr "Ver info"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Editar Comentário de Contacto"
 
@@ -7277,6 +7354,7 @@ msgstr "Pesquisa"
 msgid "Set User Info (web)..."
 msgstr "Definir Info de Utilizador (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Mudar Senha (URL)"
@@ -7311,6 +7389,10 @@ msgstr "Procurar Contacto por Email..."
 msgid "Search for Buddy by Information"
 msgstr "Procurar Contacto por Informação"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "O utilizador está desligado"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7328,7 +7410,7 @@ msgstr "Pedindo a %s para se ligar a nós em %s:%hu para MI Directa."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Tentando ligar a %s em %s:%hu para MI Directa."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "Tentando redireccionar a ligação..."
 
@@ -7438,7 +7520,7 @@ msgstr "Opera"
 msgid "Visible"
 msgstr "Invisível"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7534,17 +7616,50 @@ msgstr "Última Actualização"
 msgid "Could not change buddy information."
 msgstr "Por favor introduza o contacto que terá a notificação."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "Móvel"
+
+msgid "Note"
+msgstr "Nota"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Ícone do contacto"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Adicionar Contacto"
+msgid "_Modify"
+msgstr "_Modificar"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "_Modificar"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Servidor ocupado"
+
+msgid "Your request was accepted."
+msgstr ""
 
-msgid "Input answer here"
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Mandatar autorização"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Adicionar contacto à sua lista?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Introduza um Directório de Utilizador"
+
 #, fuzzy
 msgid "Send"
 msgstr "_Enviar"
@@ -7557,19 +7672,20 @@ msgstr "Senha inválida"
 msgid "Authorization denied message:"
 msgstr "Mensagem de recusa de autorização:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Iniciando autenticação"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Adicionar contacto à sua lista?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "Introduza um Servidor de Conferência"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7592,7 +7708,7 @@ msgid "Failed sending authorize"
 msgstr "Por favor autorize-me!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Impossível entrar na conversa do contacto"
 
 #, fuzzy, c-format
@@ -7638,6 +7754,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Configurações de proxy inválidas"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Membro Desde"
 
@@ -7683,15 +7803,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "Entrar no Chat"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Número de Telefone"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7702,7 +7825,7 @@ msgstr "Opções de Som"
 msgid "Failed:"
 msgstr "Falhou"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7714,11 +7837,11 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Número de Telefone"
 
 #, fuzzy
@@ -7729,7 +7852,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Gostaria de defini-la como ícone de contacto para este utilizador?"
 
 #, fuzzy
@@ -7737,28 +7860,28 @@ msgid "Setup"
 msgstr "_Definir"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Impossível entrar na conversa do contacto"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Remover contacto"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Remover contacto"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7879,6 +8002,13 @@ msgstr "<b>Utilizador:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Título de Grupo:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Utilizador Externo</b><br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7886,7 +8016,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Sobre o Pidgin"
 
 #, fuzzy
@@ -7907,6 +8037,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Sobre o Pidgin"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Endereço de casa"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7938,7 +8072,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Ligando"
@@ -7951,6 +8084,9 @@ msgstr "Porto do servidor"
 msgid "Show server news"
 msgstr "Endereço do servidor"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Erro de leitura"
@@ -7960,11 +8096,7 @@ msgid "Update interval (seconds)"
 msgstr "Erro de leitura"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Incapaz de obter informação do servidor"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Incapaz de obter informação do servidor"
 
 #, c-format
@@ -7987,21 +8119,19 @@ msgid "Activation required"
 msgstr "Registar Obrigatório"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "Erro de leitura"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "Diálogo De Pedido"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Autenticação no Yahoo! Falhou"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -8011,7 +8141,7 @@ msgstr "Guardar imagem"
 msgid "Enter code"
 msgstr "Introduza a Senha"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -8019,67 +8149,43 @@ msgid "Enter the text from the image"
 msgstr "Por favor introduza o nome do grupo a ser criado."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Impossível ligar."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Erro de Token"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "Não está ligado ao servidor."
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "Impossível ler do socket"
-
-msgid "Write Error"
-msgstr "Erro de Escrita"
-
 #, fuzzy
-msgid "Connection lost"
-msgstr "Ligação fechada"
-
-#, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Definir Informações de Utilizador..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Requisição negada"
 
-msgid "Couldn't resolve host"
-msgstr "Impossível resolver o host"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Impossível ligar ao servidor."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Nome de utilizador ou senha inválidos"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Ligar ao servidor"
+msgid "Connecting to server"
+msgstr "Ligando ao Servidor SILC"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Erro de Leitura"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "Impossível entrar no chat"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8089,6 +8195,10 @@ msgid ""
 msgstr "Relay do servidor ICQ"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s em %s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "De"
 
@@ -8098,32 +8208,30 @@ msgid ""
 "%s"
 msgstr "Informação do servidor"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Razão desconhecida."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Comando"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Incapaz de obter informação do servidor"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Razão desconhecida."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Razão desconhecida."
 
 #, fuzzy, c-format
@@ -8138,9 +8246,6 @@ msgstr "Falha Ao Enviar Ficheiro"
 msgid "%d canceled the transfer of %s"
 msgstr "%s cancelou a transferência de %s"
 
-msgid "Connection closed (writing)"
-msgstr "Ligação fechada (escrevendo)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título de Grupo:</b> %s<br>"
@@ -8194,17 +8299,6 @@ msgstr "Um administrador Sametime publicou o seguinte anúncio no servidor %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Anúncio de Administrador do Sametime"
 
-msgid "Connection reset"
-msgstr "Ligação fechada"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Erro ao ler do socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Impossível ligar ao servidor"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anúncio de %s"
@@ -8227,6 +8321,9 @@ msgstr "Altifalantes"
 msgid "Video Camera"
 msgstr "Camâra de Vídeo"
 
+msgid "File Transfer"
+msgstr "Transferência de Ficheiro"
+
 #, fuzzy
 msgid "Supports"
 msgstr "suporte"
@@ -8956,9 +9053,6 @@ msgstr "Organização"
 msgid "Unit"
 msgstr "unidade"
 
-msgid "Note"
-msgstr "Nota"
-
 msgid "Join Chat"
 msgstr "Entrar no Chat"
 
@@ -9059,6 +9153,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Estatísticas da Rede"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping falhou"
 
@@ -9124,7 +9221,8 @@ msgstr "Tipo de chave pública não suportado"
 msgid "Disconnected by server"
 msgstr "Desligado pelo servidor"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Erro durante a ligação ao servidor SILC"
 
 msgid "Key Exchange failed"
@@ -9136,27 +9234,26 @@ msgstr ""
 "O resumo da sessão desligada falhou. Carregue em Re-ligar para criar uma "
 "nova ligação."
 
-msgid "Connection failed"
-msgstr "Ligação falhou"
-
 msgid "Performing key exchange"
 msgstr "Efectuando a troca de chaves"
 
-msgid "Unable to create connection"
-msgstr "Impossível criar ligação"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Não foi possível carregar par de chaves SILC: %s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Ligando ao Servidor SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Não foi possível carregar par de chaves SILC: %s"
+
 msgid "Out of memory"
 msgstr "Sem memória"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Não é possível inicializar protocolo SILC"
 
 #, fuzzy
@@ -9459,7 +9556,7 @@ msgid "Creating SILC key pair..."
 msgstr "Criando o par de chaves SILC..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Criando o par de chaves SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9554,6 +9651,9 @@ msgstr "Quadro"
 msgid "No server statistics available"
 msgstr "Não há estatísticas de servidor disponíveis"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Erro durante a ligação ao servidor SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Falha: Versão difere, actualize o seu cliente"
@@ -9594,38 +9694,37 @@ msgstr "Falha: Cookie inválido"
 msgid "Failure: Authentication failed"
 msgstr "Falha: Autenticação falhada"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Incapaz de iniciar ligaçao de cliente SILC"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "Sem nome"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Não foi possível carregar par de chaves SILC: %s"
 
-msgid "Could not write"
-msgstr "Não foi possível escrever"
-
-msgid "Could not connect"
-msgstr "Não foi possível ligar"
+msgid "Unable to create connection"
+msgstr "Impossível criar ligação"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Erro desconhecido do servidor."
 
-msgid "Could not create listen socket"
-msgstr "Impossível criar socket de escuta"
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Impossível resolver o host"
+msgid "Unable to create listen socket"
+msgstr "Impossível criar socket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Nomes de utilizador SIP não podem conter espaços ou símbolos @"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Porto do servidor"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9659,181 +9758,66 @@ msgstr "Utilizador Auth"
 msgid "Auth Domain"
 msgstr "Domínio Auth"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Procurando %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Ligação para %s falhou"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Ligando: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Impossível escrever ficheiro %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Impossível ler ficheiro %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Mensagem muito extensa, últimos %s bytes truncados."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s não está ligado no momento."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Alertar %s não é permitido."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Uma mensagem foi descartada, está a exceder o limite de velocidade do "
-"servidor."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat não disponível em %s."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Está a mandar mensagens muito rapidamente para %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Perdeu uma MI de %s porque era muito extensa."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Perdeu uma MI de %s porque foi enviada muito rapidamente."
-
-#, c-format
-msgid "Failure."
-msgstr "Falha."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Muitos resultados."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Necessários mais qualificadores."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Serviço de diretorio temporariamente indisponível."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Pesquisa por email restrita."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Palavra-chave ignorada."
-
-#, c-format
-msgid "No keywords."
-msgstr "Nenhuma palavra-chave."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Utilizador não tem informação de directório."
-
-#, c-format
-msgid "Country not supported."
-msgstr "País não suportado."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Falha desconhecida: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Nome ou senha incorrectos."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "O serviço está temporariamente indisponível."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "O seu nível de alerta é alto demais para que possa ligar-se."
-
-#, c-format
-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 ""
-"Esteve a ligar e desligar com muita frequência. Espere dez minutos e tente "
-"novamente. Se continuar a tentar, vai ter que esperar ainda mais."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Um erro desconhecido ocorreu ao ligar: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Um erro desconhecido, %d, ocorreu. Informações: %s"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;sala&gt;:  Entrar numa sala de chat da rede Yahoo."
 
-msgid "Invalid Groupname"
-msgstr "Nome de grupo inválido"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Listar salas na rede Yahoo"
 
-msgid "Connection Closed"
-msgstr "Ligação fechada"
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Pedir ao utilizador para começar uma sessão Doodle"
 
-msgid "Waiting for reply..."
-msgstr "Esperando resposta..."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ID do Yahoo!"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "O TOC voltou de sua pausa. Agora pode mandar mensagens novamente."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Plugin do protocolo Yahoo"
 
-msgid "Password Change Successful"
-msgstr "Mudança de senha efetuada com sucesso"
+#, fuzzy
+msgid "Pager server"
+msgstr "Servidor proxy"
 
-msgid "_Group:"
-msgstr "_Grupo:"
+msgid "Pager port"
+msgstr "Porto do pager"
 
-msgid "Get Dir Info"
-msgstr "Ver informações de directório"
+#, fuzzy
+msgid "File transfer server"
+msgstr "Servidor de transferências de ficheiros"
 
-msgid "Set Dir Info"
-msgstr "Definir informações de directório"
+msgid "File transfer port"
+msgstr "Porto de transferências de ficheiros"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Não foi possível abrir %s para escrita!"
+msgid "Chat room locale"
+msgstr "Língua da sala de chat"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Tranferência de ficheiro falhou; o outro lado provavelmente cancelou-a."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorar convites para conferências e salas de chat"
 
-msgid "Could not connect for transfer."
-msgstr "Não foi possível ligar para transferência."
+msgid "Chat room list URL"
+msgstr "URL da lista de salas de chat"
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat server"
 msgstr ""
-"Não foi possível escrever cabeçalho de ficheiro. O ficheiro não será "
-"transferido."
 
 #, fuzzy
-msgid "Save As..."
-msgstr "Guardar Ícone Como..."
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s pede a %s para aceitar %d ficheiro: %s (%.2f %s)%s%s"
-msgstr[1] "%s pede a %s para aceitar %d ficheiros: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japão"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s pede para lhe enviar um ficheiro"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID do Yahoo!"
 
 #. *< type
 #. *< ui_requirement
@@ -9845,11 +9829,11 @@ msgstr "%s pede para lhe enviar um ficheiro"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Plugin do protocolo TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Plugin do protocolo Yahoo"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9875,6 +9859,34 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Adicionar Contacto rejeitado"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Impossível criar ligação SSL ao servidor."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Erro desconhecido número %d. Ligar-se ao website da Yahoo! pode corrigir "
+"isto."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Erro desconhecido número %d. Ligar-se ao website da Yahoo! pode corrigir "
+"isto."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Nome ou senha incorrectos."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9908,12 +9920,13 @@ msgstr ""
 "Erro desconhecido número %d. Ligar-se ao website da Yahoo! pode corrigir "
 "isto."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossível adicionar contacto %s ao grupo %s à lista do servidor da conta %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Impossível adicionar contacto à lista do servidor"
 
 #, c-format
@@ -9921,23 +9934,17 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audível %s/%s/%s.swf ] %s"
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "O servidor retornou uma resposta inválida."
 
-msgid "Connection problem"
-msgstr "Problema na ligação"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Conversações com %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
+"Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
 
 msgid "Not at Home"
 msgstr "Fora de Casa"
@@ -9984,9 +9991,8 @@ msgstr "Definições de Presença"
 msgid "Start Doodling"
 msgstr "Começar a Doodlar"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Activar qual ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Juntar a quem no chat?"
@@ -10001,79 +10007,15 @@ msgstr "Juntar-se a um Utilizador num Chat..."
 msgid "Open Inbox"
 msgstr "Abrir Caixa de Entrada do Hotmail"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;sala&gt;:  Entrar numa sala de chat da rede Yahoo."
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Listar salas na rede Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Pedir ao utilizador para começar uma sessão Doodle"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ID do Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Plugin do protocolo Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japão"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Servidor proxy"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Host do Pager Japão"
-
-msgid "Pager port"
-msgstr "Porto do pager"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Servidor de transferências de ficheiros"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Servidor de transferências de ficheiros do Japão"
-
-msgid "File transfer port"
-msgstr "Porto de transferências de ficheiros"
-
-msgid "Chat room locale"
-msgstr "Língua da sala de chat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorar convites para conferências e salas de chat"
-
-msgid "Chat room list URL"
-msgstr "URL da lista de salas de chat"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japão"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Pedido de Doodle enviado."
 
+msgid "Unable to connect."
+msgstr "Impossível ligar."
+
 msgid "Unable to establish file descriptor."
 msgstr "Impossível estabelecer descritor de ficheiro."
 
@@ -10081,6 +10023,9 @@ msgstr "Impossível estabelecer descritor de ficheiro."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s quer enviar-lhe o ficheiro %s"
 
+msgid "Write Error"
+msgstr "Erro de Escrita"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil Yahoo! Japão"
 
@@ -10125,13 +10070,9 @@ msgstr "Elo Fixe 3"
 msgid "Last Update"
 msgstr "Última Actualização"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Informação do utilizador %s indisponível"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Lamentamos, este perfil parece estar numa língua ou formato que não é "
 "suportado de momento."
@@ -10204,21 +10145,19 @@ msgstr "Vozes"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Problema na ligação"
+
 msgid "Unable to fetch room list."
 msgstr "Incapaz de obter a lista de salas."
 
 msgid "User Rooms"
 msgstr "Salas do Utilizador"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problema na ligação com o servidor YCHT."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Não está ligado ao servidor."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10351,13 +10290,7 @@ msgid "Exposure"
 msgstr "Exposição"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Impossível criar socket"
-
-#, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Impossível definir papel \"%s\" para o utilizador: %s"
 
 #, fuzzy, c-format
@@ -10365,17 +10298,13 @@ msgid "HTTP proxy connection error %d"
 msgstr "Erro de ligação de proxy %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Acesso negado: servidor proxy proíbe túneis no porto %d."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Erro ao executar %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Impossível resolver o host"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10473,9 +10402,6 @@ msgstr "Não perturbar"
 msgid "Extended away"
 msgstr "Ausente (estendido)"
 
-msgid "Mobile"
-msgstr "Móvel"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10517,18 +10443,6 @@ msgstr "+++ %s tornou-se activo"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Erro Ao Ler %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Foi encontrado um erro ao ler %s.  A informação não foi carregada, e o "
-"ficheiro antigo foi movido para %s~."
-
 msgid "Calculating..."
 msgstr "Calculando..."
 
@@ -10636,6 +10550,18 @@ msgstr "Ligação fechada"
 msgid "Address already in use."
 msgstr "Este nome de chat já está a ser utilizado"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Erro Ao Ler %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Foi encontrado um erro ao ler %s.  A informação não foi carregada, e o "
+"ficheiro antigo foi movido para %s~."
+
 msgid "Internet Messenger"
 msgstr "Mensageiro Internet"
 
@@ -10683,10 +10609,8 @@ msgstr "Novas notificações de email"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Opções de %s"
+msgid "_Advanced"
+msgstr "_Avançado"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10722,9 +10646,6 @@ msgstr "Se olhar bem de perto"
 msgid "you can see the butterflies mating"
 msgstr "Pode ver as borboletas a acasalar"
 
-msgid "Proxy Options"
-msgstr "Opções de proxy"
-
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
@@ -10753,8 +10674,9 @@ msgstr "_Básico"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_Avançado"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Proxy"
 
 msgid "Enabled"
 msgstr "Activado"
@@ -10792,8 +10714,8 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Lista de Salas"
+msgid "A_ccount"
+msgstr "Conta:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10802,8 +10724,9 @@ msgstr ""
 "Por favor introduza a informação apropriada sobre o chat ao qual gostaria de "
 "se juntar.\n"
 
-msgid "_Account:"
-msgstr "_Conta:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Lista de Salas"
 
 msgid "_Block"
 msgstr "_Bloquear"
@@ -10822,6 +10745,17 @@ msgid "I_M"
 msgstr "_MI"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "_Adicionar Chat"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Chat Video"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "_Enviar Ficheiro"
 
@@ -10833,7 +10767,11 @@ msgid "View _Log"
 msgstr "Ver _Registo"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Não permitido enquanto desligado"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Não permitido enquanto desligado"
 
 msgid "_Alias..."
@@ -10973,6 +10911,10 @@ msgstr "/Ferramentas/_Notificações de Contactos"
 msgid "/Tools/_Certificates"
 msgstr "/Ferramentas/Pr_eferências"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Ferramentas/Privacidade"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/Plu_gins"
 
@@ -10982,10 +10924,6 @@ msgstr "/Ferramentas/Pr_eferências"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Ferramentas/Privacidade"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de _Ficheiros"
 
@@ -11110,8 +11048,8 @@ msgstr "Manualmente"
 msgid "By status"
 msgstr "Por estado"
 
-msgid "By log size"
-msgstr "Por tamanho do log"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -11129,6 +11067,9 @@ msgstr "Ligar"
 msgid "Re-enable"
 msgstr "Activar Conta"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s voltou"
@@ -11225,6 +11166,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Nome:"
 
+msgid "_Group:"
+msgstr "_Grupo:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11258,6 +11202,116 @@ msgstr "/Ferramentas"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contactos/Ordenar Contactos"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Cor de fundo"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "%s adicionou-o(a) à sua lista de contactos."
+
+#, fuzzy
+msgid "Layout"
+msgstr "Opções de ligação"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Cor de fundo"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expandir"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Seleccionar cor de fundo"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "Co_lapsar"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Seleccionar cor de fundo"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Porta"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Ligado"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Ausente"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Desligado"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Disposição"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Mensagem enviada"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Mudar informações do utilizador %s"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11277,14 +11331,6 @@ msgstr "Não está ligado a nenhuma conta que possa convidar esse contacto."
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar Contacto Para Sala de Chat"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Por favor introduza o nome do utilizador que gostaria de convidar, e uma "
-"mensagem de convite opcional."
-
 msgid "_Buddy:"
 msgstr "_Contacto:"
 
@@ -11313,7 +11359,8 @@ msgstr "Ignorar"
 msgid "Get Away Message"
 msgstr "Obter Mensagem de Ausência"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Dito por último"
 
 msgid "Unable to save icon file to disk."
@@ -11361,6 +11408,22 @@ msgstr "/Conversa/_Guardar como..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpa_r Scrollback"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Conversa/_Fechar"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversa/_Fechar"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversa/_Fechar"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversa/Ver _Registo..."
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Enviar _Ficheiro..."
 
@@ -11438,6 +11501,18 @@ msgstr "/_Conversa"
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver Registo"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversa/_Fechar"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversa/Ver Registo"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversa/_Fechar"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar Ficheiro..."
 
@@ -11629,6 +11704,9 @@ msgstr "Endereço"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "suporte"
 
@@ -11760,6 +11838,10 @@ msgid "Hungarian"
 msgstr "Húngaro"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Romeno"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Macedónio"
 
@@ -11777,6 +11859,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "Actuais Tradutores"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "Opera"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "Banido"
 
@@ -11799,6 +11885,10 @@ msgid "Macedonian"
 msgstr "Macedónio"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "Macedónio"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norueguês"
 
@@ -11857,6 +11947,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "Sueco"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11912,12 +12005,29 @@ msgstr ""
 "Gadu-Gadu todos ao mesmo tempo.  Está escrito usando GTK+.<BR><BR>Pode "
 "modificar e redistribuir o programa sob os termos da GPL (versão 2 ou "
 "posterior).  Uma cópia da GPL está contida no ficheiro 'COPYING' distribuído "
-"com o Pidgin.  Pidgin é copyrighted pelos seus contribuidores.  Veja o ficheiro "
-"'COPYRIGHT' para a lista completa de contribuidores.  Não oferecemos "
-"garantia para este programa.<BR><BR>"
+"com o Pidgin.  Pidgin é copyrighted pelos seus contribuidores.  Veja o "
+"ficheiro 'COPYRIGHT' para a lista completa de contribuidores.  Não "
+"oferecemos garantia para este programa.<BR><BR>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin no irc.freenode.net<BR><BR>"
 
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin no irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -12187,7 +12297,7 @@ msgid "Hyperlink visited color"
 msgstr "Cor do elo"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Cor para desenhar elos quando o rato está sobre eles."
 
 msgid "Hyperlink prelight color"
@@ -12225,15 +12335,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Remoção de notificação"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Novas notificações de email"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12246,15 +12363,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Novas notificações de email"
 
-msgid "_Copy Email Address"
-msgstr "_Copiar Endereço de Email"
-
-msgid "_Open Link in Browser"
-msgstr "_Abrir Elo no Navegador"
-
-msgid "_Copy Link Location"
-msgstr "_Copiar Endereço do Elo"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12296,11 +12404,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "Guardar imagem"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Guardar imagem..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Mostrar smileys personalizados"
 
@@ -12391,10 +12498,6 @@ msgid "Font Face"
 msgstr "Fonte"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Cor de fundo"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Cor da letra"
 
@@ -12525,6 +12628,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12553,6 +12657,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12612,11 +12717,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Paging"
 
-msgid "Open All Messages"
-msgstr "Abrir Todas as Mensagens"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Tem Correio!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Calculando..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12647,6 +12768,27 @@ msgstr ""
 "Foi escolhido o comando 'Manual' do navegador, mas nenhum comando foi "
 "definido."
 
+#, fuzzy
+msgid "No message"
+msgstr "Mensagem desconhecida"
+
+msgid "Open All Messages"
+msgstr "Abrir Todas as Mensagens"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Tem Correio!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Nova Notificação de Contacto"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Tem Correio!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Os pluins seguintes serão descarregados."
 
@@ -12699,10 +12841,17 @@ msgstr "<b>Detalhes do Plugin</b>"
 msgid "Select a file"
 msgstr "Seleccione um ficheiro"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Editar Notificação de Contacto"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Notificar em Quem"
 
+msgid "_Account:"
+msgstr "_Conta:"
+
 msgid "_Buddy name:"
 msgstr "_Nome do contacto:"
 
@@ -12770,7 +12919,60 @@ msgstr "_Recorrente"
 msgid "Pounce Target"
 msgstr "Alvo da Notificação"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Começar a digi_tar"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "O utilizador está digitando..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Se _Ligar"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s saiu do estado 'Inactivo' (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "_Retornar"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "_Parar de digitar"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Se _Desligar"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Se tornar _inactivo"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Quando ausente"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Enviar uma _mensagem"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Acontecimento de notificação desconhecido. Por favor reporte isto!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Tema de smileys falhou a instalar."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Tema de smileys falhou a instalar."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Tema de smileys falhou a instalar."
 
 msgid "Install Theme"
@@ -12793,6 +12995,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Conversações com %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Lista de contactos"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ícone de Notificação"
 
@@ -12805,7 +13013,7 @@ msgid "On unread messages"
 msgstr "Mensagens Por Ler"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "Janelas de Conversa MI"
 
 #, fuzzy
@@ -12815,6 +13023,10 @@ msgstr "_Esconder novas conversas IM"
 msgid "When away"
 msgstr "Quando ausente"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Mostr_ar janela de conversa"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12875,10 +13087,6 @@ msgstr "Usar smooth-scrolling"
 msgid "F_lash window when IMs are received"
 msgstr "_Piscar a janela quando forem recebidas mensagens"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Mostr_ar janela de conversa"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12915,13 +13123,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Incapaz de obter informação do utilizador"
 
-msgid "ST_UN server:"
-msgstr "Servidor ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Detectar IP _Automaticamente"
 
 msgid "Public _IP:"
@@ -12942,6 +13148,10 @@ msgstr "Porto _inicial:"
 msgid "_End port:"
 msgstr "Porto _final:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor proxy"
@@ -12971,6 +13181,10 @@ msgstr "Servidor proxy"
 msgid "No proxy"
 msgstr "Nenhum proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Utilizador:"
 
@@ -13135,13 +13349,13 @@ msgstr "Quando ausente e inactivo"
 msgid "Auto-away"
 msgstr "Ausência Automática"
 
-msgid "Change status when _idle"
-msgstr "Mudar de estado quando _inactivo"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de mudar de estado:"
 
+msgid "Change status when _idle"
+msgstr "Mudar de estado quando _inactivo"
+
 msgid "Change _status to:"
 msgstr "Mudar _estado para:"
 
@@ -13299,29 +13513,19 @@ msgstr "Guar_dar e Usar"
 msgid "Status for %s"
 msgstr "Estado para %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Inserir smiley"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Correcção Duplicada"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Usar um estado _diferente para algumas contas"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Inserir smiley"
@@ -13331,20 +13535,29 @@ msgid "Add Smiley"
 msgstr "Sorria!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "Guardar imagem"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Porta"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Sorria!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Porta"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Escolher Contacto"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13434,9 +13647,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Impossível enviar iniciador"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Arrastou um iniciador. Provavelmente queria enviar o que quer que este "
 "iniciador aponta em vez do próprio iniciador."
@@ -13473,6 +13687,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "_Abrir elo em:"
+
+msgid "_Copy Link Location"
+msgstr "_Copiar Endereço do Elo"
+
+msgid "_Copy Email Address"
+msgstr "_Copiar Endereço de Email"
+
+#, fuzzy
 msgid "Save File"
 msgstr "Guardar Ficheiro..."
 
@@ -13572,6 +13796,78 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Endereço do servidor"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Introduza um Servidor de Conferência"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Escolha um servidor de conferência"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Serviços Online"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Enviar lista de contactos"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Se _Ausentar"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Directoria do Registo"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Selecção de som"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descrição:</b> Assombrado"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Definir informações de directório"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Navegador:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Utilizador não existe"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "O servidor não usa memhum método de autenticação suportado"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Definir informações de directório"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "O contacto está inactivo"
 
@@ -13981,9 +14277,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plugin Music Messaging para composição colaborativa."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "O Plugin Music Messaging permite que vários utilizadores trabalhem "
 "simultaneamente numa peça de música editando uma partitura comum em tempo "
@@ -14102,12 +14399,6 @@ msgstr ""
 "- Manda uma mensagem para as pessoas na sua lista imediatamente quando elas "
 "se conectam"
 
-msgid "Cursor Color"
-msgstr "Cor Do Cursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Cor Secundária Do Cursor"
-
 msgid "Hyperlink Color"
 msgstr "Cor do Elo"
 
@@ -14119,6 +14410,10 @@ msgstr "Cor do Elo"
 msgid "Highlighted Message Name Color"
 msgstr "Destacar resultados"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Remoção de notificação"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separação Horizontal de GtkTreeView"
 
@@ -14148,35 +14443,24 @@ msgstr "Fonte Da Interface GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema GTK+ Text Shortcut"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Cores de interface"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Novas notificações de email"
 
-msgid "Widget Sizes"
-msgstr "Tamanhos de widgets"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Controle do Tema GTK+ do Pidgin"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Fechar"
 
 msgid "Fonts"
 msgstr "Fontes"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Controle por Ficheiros do Pidgin"
@@ -14269,7 +14553,7 @@ msgstr "Janelas de Conversa MI"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14325,6 +14609,113 @@ msgstr ""
 "Substitui texto nas mensagens enviadas de acordo com regras definidas pelo "
 "utilizador."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Desligado"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Desligado"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Entrar num Chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorar"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Mais Alto"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorização concedida"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Erro"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informações do trabalho"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Diálogo De Pedido"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Nível de Alerta"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Estado para %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Língua da sala de chat"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Guardar Ícone"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Controle do Tema GTK+ do Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informações da conta"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Lista de contactos"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lista de contactos"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Controle do Tema GTK+ do Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Controle do Tema GTK+ do Pidgin"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14492,10 +14883,6 @@ msgid "Only when docked"
 msgstr "Apenas quando na área de sistema"
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "_Piscar a janela quando forem recebidas mensagens"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "Opções de ligação"
 
@@ -14505,7 +14892,7 @@ msgstr "Opções específicas do Pidgin para Windows."
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Fornece opções específicas ao Windows Pidgin ,tais como docking da lista de "
 "contactos e flashing das conversas."
@@ -14549,6 +14936,526 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Impossível abrir socket"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Impossível ouvir na socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Impossível ler do socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Ligação falhou."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "O servidor desligou"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Impossível criar socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Não foi possível ligar ao host"
+
+#~ msgid "Read error"
+#~ msgstr "Erro de leitura"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
+
+#~ msgid "Write error"
+#~ msgstr "Erro ao enviar"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Definir informações de directório"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Endereço (Complemento)"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Renomear Chat"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Utilizador não tem informação de directório."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Comando"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Erro ao registar"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Localização"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "Pesquisa de Utilizadores"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notificação do Estado do Contacto"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Versão Não Suportada"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Orientação"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Modos de Utilizador"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Limite de Utilizadores"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Recursos"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Nome do utilizador"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "MI com Troca de Chave"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Endereço de email"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Perfil MSN"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Nome de Utilizador"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Vídeo ao Vivo"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Mensagem recebida"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Babbleprint da Chave Pública"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Opções de utilizador"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Modos de Utilizador"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Nome de Utilizador"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Limite de Utilizadores"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Criptografia do Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "Erro de Leitura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Impossível ligar ao servidor."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Fila cheia"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Impossível processar mensagem"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Não foi possível ligar ao host"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login falhou (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Impossível ligar ao servidor."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Foi desligado porque se ligou a partir de outra estação de trabalho."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Erro. Suporte SSL não está instalado."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Senha incorrecta."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Impossível ligar ao servidor."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Pode ser desligado num curto período de tempo. Pode querer usar o TOC até "
+#~ "que isso esteja corrigido. Verifique por actualizações em %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Não foi possível ligar"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Nome inválido"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Incapaz de obter informação do servidor"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Ligação fechada"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Impossível resolver o host"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Ligação fechada (escrevendo)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Ligação fechada"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Erro ao ler do socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Impossível ligar ao servidor"
+
+#~ msgid "Could not write"
+#~ msgstr "Não foi possível escrever"
+
+#~ msgid "Could not connect"
+#~ msgstr "Não foi possível ligar"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Impossível criar socket de escuta"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Impossível resolver o host"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Senha incorrecta."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japão"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Host do Pager Japão"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Servidor de transferências de ficheiros do Japão"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Não está ligado ao servidor."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Impossível resolver o host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "O servidor precisa de TLS/SSL para o login.  Suporte TLS/SSL não foi "
+#~ "encontrado."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Janelas de Conversa MI"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Usar um estado _diferente para algumas contas"
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Activar qual ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Cor Do Cursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Cor Secundária Do Cursor"
+
+#~ msgid "Interface colors"
+#~ msgstr "Cores de interface"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Tamanhos de widgets"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "Inserir na mensagem"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Por favor introduza o nome do utilizador que gostaria de convidar, e uma "
+#~ "mensagem de convite opcional."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Escolher Caderno de Moradas Notes"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Pode ser desligado num curto período de tempo. Pode querer usar o TOC até "
+#~ "que isso esteja corrigido. Verifique por actualizações em %s."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Adicionar Contacto"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Incapaz de obter informação do servidor"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "Erro de leitura"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "Não está ligado ao servidor."
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Ligar ao servidor"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "Impossível entrar no chat"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Procurando %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Ligação para %s falhou"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Ligando: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Impossível escrever ficheiro %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Impossível ler ficheiro %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Mensagem muito extensa, últimos %s bytes truncados."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s não está ligado no momento."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Alertar %s não é permitido."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "Uma mensagem foi descartada, está a exceder o limite de velocidade do "
+#~ "servidor."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Chat não disponível em %s."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Está a mandar mensagens muito rapidamente para %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Perdeu uma MI de %s porque era muito extensa."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Perdeu uma MI de %s porque foi enviada muito rapidamente."
+
+#~ msgid "Failure."
+#~ msgstr "Falha."
+
+#~ msgid "Too many matches."
+#~ msgstr "Muitos resultados."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Necessários mais qualificadores."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Serviço de diretorio temporariamente indisponível."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Pesquisa por email restrita."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Palavra-chave ignorada."
+
+#~ msgid "No keywords."
+#~ msgstr "Nenhuma palavra-chave."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Utilizador não tem informação de directório."
+
+#~ msgid "Country not supported."
+#~ msgstr "País não suportado."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Falha desconhecida: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Nome ou senha incorrectos."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "O serviço está temporariamente indisponível."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "O seu nível de alerta é alto demais para que possa ligar-se."
+
+#~ 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 ""
+#~ "Esteve a ligar e desligar com muita frequência. Espere dez minutos e "
+#~ "tente novamente. Se continuar a tentar, vai ter que esperar ainda mais."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Um erro desconhecido ocorreu ao ligar: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Um erro desconhecido, %d, ocorreu. Informações: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Nome de grupo inválido"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Ligação fechada"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Esperando resposta..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "O TOC voltou de sua pausa. Agora pode mandar mensagens novamente."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Mudança de senha efetuada com sucesso"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Ver informações de directório"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Definir informações de directório"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Não foi possível abrir %s para escrita!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Tranferência de ficheiro falhou; o outro lado provavelmente cancelou-a."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Não foi possível ligar para transferência."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr ""
+#~ "Não foi possível escrever cabeçalho de ficheiro. O ficheiro não será "
+#~ "transferido."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Guardar Ícone Como..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s pede a %s para aceitar %d ficheiro: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s pede a %s para aceitar %d ficheiros: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s pede para lhe enviar um ficheiro"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Plugin do protocolo TOC"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Informação do utilizador %s indisponível"
+
+#~ msgid "%s Options"
+#~ msgstr "Opções de %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Opções de proxy"
+
+#~ msgid "By log size"
+#~ msgstr "Por tamanho do log"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Abrir Elo no Navegador"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Servidor ST_UN:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Guardar imagem"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Piscar a janela quando forem recebidas mensagens"
+
 #, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "Já existe uma pasta com esse nome"
@@ -14614,13 +15521,6 @@ msgstr ""
 #~ msgstr "Tem a certeza que deseja apagar %s?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s em %s (%s)"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Registo do Sistema"
 
@@ -14822,10 +15722,6 @@ msgstr ""
 #~ msgstr "Utilizadores em %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "%s adicionou-o(a) à sua lista de contactos."
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "Erro ao executar operação de ficheiro"
 
@@ -14834,10 +15730,6 @@ msgstr ""
 #~ msgstr "Introduza o token actual"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Erro ao criar a ligação"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Impossível ligar ao AIM"
 
@@ -14954,17 +15846,9 @@ msgstr ""
 #~ msgstr "Token actual"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Impossível ligar ao servidor."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Mensagem:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Conta:"
-
 #~ msgid "Crazychat"
 #~ msgstr "Crazychat"
 
@@ -15012,9 +15896,9 @@ msgstr ""
 #~ "to blink for unread messages."
 #~ msgstr ""
 #~ "Mostra um ícone de notificação (no GNOME, KDE ou Windows, por exemplo) "
-#~ "para mostrar o estado actual do Pidgin, permitir acesso rápido para funções "
-#~ "comumente utilizadas, e para mostrar ou ocultar a lista de contactos. "
-#~ "Fornece também opções para piscar quando há mensagens por ler."
+#~ "para mostrar o estado actual do Pidgin, permitir acesso rápido para "
+#~ "funções comumente utilizadas, e para mostrar ou ocultar a lista de "
+#~ "contactos. Fornece também opções para piscar quando há mensagens por ler."
 
 #~ msgid "GtkTreeView Expander Size"
 #~ msgstr "Tamanho do Expansor de GtkTreeView"
@@ -15097,13 +15981,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Descrição:</b> Assombrado"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15448,8 +16325,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "Quando isto acontece, o TOC ignora quaisquer mesagens enviadas para ele, "
 #~ "e poderá te chutar caso envie uma mensagem. O Pidgin irá evitar que "
@@ -15468,13 +16345,13 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "O método de autenticação normal falhou. Isto significa que a sua senha "
-#~ "está incorrecta, ou o que esquema de autenticação da Yahoo! mudou. O Pidgin "
-#~ "vai tentar ligar-se usando a autenticação Web Messenger, o que resultará "
-#~ "em funcionalidade e características reduzidas."
+#~ "está incorrecta, ou o que esquema de autenticação da Yahoo! mudou. O "
+#~ "Pidgin vai tentar ligar-se usando a autenticação Web Messenger, o que "
+#~ "resultará em funcionalidade e características reduzidas."
 
 #~ msgid "Unable to read"
 #~ msgstr "Inpossível ler"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 045eb3dfc4..27c5c4f704 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-27 10:14-0800\n"
+"POT-Creation-Date: 2009-07-25 09:57-0400\n"
 "PO-Revision-Date: 2009-02-24 22:11-0300\n"
 "Last-Translator: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
 "Language-Team: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
@@ -52,9 +52,9 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s encontrou erros ao migrar suas configurações de %s para %s. Favor "
-"investigar e completar a migração manualmente. Pedimos também que você "
-"relate este erro em http://developer.pidgin.im"
+"%s encontrou erros ao migrar suas configurações de %s para %s. Por favor, "
+"investigue e complete a migração manualmente. Pedimos também que você relate "
+"este erro em http://developer.pidgin.im"
 
 msgid "Error"
 msgstr "Erro"
@@ -114,11 +114,11 @@ msgid "Are you sure you want to delete %s?"
 msgstr "Você tem certeza de que deseja remover %s?"
 
 msgid "Delete Account"
-msgstr "Remover conta"
+msgstr "Excluir conta"
 
 #. Delete button
 msgid "Delete"
-msgstr "Remover"
+msgstr "Excluir"
 
 msgid "Accounts"
 msgstr "Contas"
@@ -196,7 +196,7 @@ msgid "Username"
 msgstr "Nome do usuário"
 
 msgid "Alias (optional)"
-msgstr "Apelidar contato (opcional)"
+msgstr "Apelidar (opcional)"
 
 msgid "Add in group"
 msgstr "Adicionar no grupo"
@@ -208,7 +208,7 @@ msgid "Add Buddy"
 msgstr "Adicionar amigo"
 
 msgid "Please enter buddy information."
-msgstr "Favor digitar as informações do amigo."
+msgstr "Por favor digite as informações do amigo."
 
 msgid "Chats"
 msgstr "Bate-papos"
@@ -247,10 +247,10 @@ msgid "Enter the name of the group"
 msgstr "Digite o nome do grupo"
 
 msgid "Edit Chat"
-msgstr "Modificar bate-papo"
+msgstr "Editar bate-papo"
 
 msgid "Please Update the necessary fields."
-msgstr "Favor atualizar os campos necessários."
+msgstr "Por favor atualize os campos necessários."
 
 msgid "Edit"
 msgstr "Editar"
@@ -486,7 +486,7 @@ msgstr "Exportar certificado PEM X.509"
 
 #, c-format
 msgid "Certificate for %s"
-msgstr "Certificado de %s"
+msgstr "Certificado para %s"
 
 #, c-format
 msgid ""
@@ -505,7 +505,7 @@ msgstr "Certificado SSL do host"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr "Tem certeza de que deseja deletar o certificado de %s?"
+msgstr "Tem certeza de que deseja excluir o certificado de %s?"
 
 msgid "Confirm certificate delete"
 msgstr "Confirmação de remoção de certificado"
@@ -610,19 +610,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Enviar para"
 
-msgid "Invite message"
-msgstr "Mensagem de convite"
-
-msgid "Invite"
-msgstr "Convidar"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Por favor, digite o nome do usuário que você gostaria de\n"
-" convidar, junto com uma mensagem de convite opcional."
-
 msgid "Conversation"
 msgstr "Conversa"
 
@@ -881,8 +868,42 @@ msgstr "Todas as Conversas"
 msgid "System Log"
 msgstr "Histórico do sistema"
 
+msgid "Calling ... "
+msgstr "Ligando ... "
+
+msgid "Hangup"
+msgstr "Colocar no gancho"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Aceitar"
+
+msgid "Reject"
+msgstr "Rejeitar"
+
+msgid "Call in progress."
+msgstr "Ligação em progresso."
+
+msgid "The call has been terminated."
+msgstr "A ligação foi finalizada."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s quer iniciar uma sessão de aúdio com você."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+"%s está tentando iniciar um tipo de sessão de mídia sem suporte com você."
+
+msgid "You have rejected the call."
+msgstr "Você rejeitou a ligação."
+
+msgid "call: Make an audio call."
+msgstr "ligação: Fazer uma ligação de aúdio."
+
 msgid "Emails"
-msgstr "Emails"
+msgstr "E-mails"
 
 msgid "You have mail!"
 msgstr "Você tem email!"
@@ -915,6 +936,9 @@ msgstr "Continuar"
 msgid "IM"
 msgstr "MI"
 
+msgid "Invite"
+msgstr "Convidar"
+
 msgid "(none)"
 msgstr "(nome)"
 
@@ -1045,7 +1069,7 @@ msgid "Open an IM window"
 msgstr "Abrir uma janela de MI"
 
 msgid "Pop up a notification"
-msgstr "Exibir notificação popup"
+msgstr "Exibir pop-up de notificação"
 
 msgid "Send a message"
 msgstr "Enviar uma mensagem"
@@ -1057,7 +1081,7 @@ msgid "Play a sound"
 msgstr "Tocar um som"
 
 msgid "Pounce only when my status is not Available"
-msgstr "Executar apenas quando meu status não for Disponível"
+msgstr "Receber ação apenas quando meu status não for Disponível"
 
 msgid "Recurring"
 msgstr "Recorrente"
@@ -1118,9 +1142,8 @@ msgstr "%s se tornou ausente. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s te enviou uma mensagem. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
-msgstr "Evento de ação desconhecido. Por favor reporte isso!"
+msgstr "Evento de ação desconhecido. Por favor nos avise disso!"
 
 msgid "Based on keyboard use"
 msgstr "A partir do uso do teclado"
@@ -1262,7 +1285,7 @@ msgid "Sound Method"
 msgstr "Método para reproduzir o som"
 
 msgid "Method: "
-msgstr "Método:"
+msgstr "Método: "
 
 #, c-format
 msgid ""
@@ -1315,7 +1338,7 @@ msgid "Are you sure you want to delete \"%s\""
 msgstr "Você tem certeza de que deseja remover \"%s\""
 
 msgid "Delete Status"
-msgstr "Remover status"
+msgstr "Excluir status"
 
 msgid "Saved Statuses"
 msgstr "Status salvos"
@@ -1335,7 +1358,7 @@ msgstr "Tipo"
 #. not independent
 #. Attributes - each status can have a message.
 msgid "Message"
-msgstr "Mensagem:"
+msgstr "Mensagem"
 
 #. Use
 msgid "Use"
@@ -1348,7 +1371,7 @@ msgid "Please enter a non-empty title for the status."
 msgstr "Favor digitar um título não-vazio para o status."
 
 msgid "Duplicate title"
-msgstr "Título duplicado duplicada"
+msgstr "Título duplicado"
 
 msgid "Please enter a different title for the status."
 msgstr "Favor digitar um título diferente para o status."
@@ -1475,7 +1498,7 @@ msgstr ""
 "mensagens recentes para os mesmos tipos de conversa."
 
 msgid "GntHistory"
-msgstr "GntMensagens recentes"
+msgstr "GntHistórico"
 
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Mostra conversas gravadas recentemente em novas conversas."
@@ -1512,13 +1535,13 @@ msgid "Nested Subgroup"
 msgstr "Subgrupo aninhado"
 
 msgid "Nested Grouping (experimental)"
-msgstr "Aninhas Grupos (experimental)"
+msgstr "Aninhar Grupos (experimental)"
 
 msgid "Provides alternate buddylist grouping options."
 msgstr "Fornece opções alternativas de agrupamento da lista de amigos."
 
 msgid "Lastlog"
-msgstr "Última menção"
+msgstr "Último registro"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
@@ -1528,7 +1551,32 @@ msgid "GntLastlog"
 msgstr "GntLastLog"
 
 msgid "Lastlog plugin."
-msgstr "Plug-in de busca de mensagens"
+msgstr "Plug-in Lastlog"
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Obtendo TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Somente criar TinyURL para endereços deste tamanho ou maiores"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (ou outro) prefixo de endereço"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Plug-in do TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"Quando receber uma mensagem com endereço(s), usar o TinyURL para copiá-los "
+"mais fácil"
 
 msgid "accounts"
 msgstr "contas"
@@ -1573,7 +1621,7 @@ msgid "Change password for %s"
 msgstr "Mudar senha para %s"
 
 msgid "Please enter your current password and your new password."
-msgstr "Favor digitar sua senha atual e sua nova senha."
+msgstr "Por favor, digite sua senha atual e sua nova senha."
 
 #, c-format
 msgid "Change user information for %s"
@@ -1597,7 +1645,7 @@ msgstr "(NÃO COINCIDE)"
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr "%s enviou este certificado de uso único:"
+msgstr "%s apresentou o seguinte certificado para o uso apenas-esta-vez:"
 
 #, c-format
 msgid ""
@@ -1630,13 +1678,6 @@ msgstr "Aceitar certificado de %s?"
 msgid "SSL Certificate Verification"
 msgstr "Verificação do certificado SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Aceitar"
-
-msgid "Reject"
-msgstr "Rejeitar"
-
 msgid "_View Certificate..."
 msgstr "_Ver certificado..."
 
@@ -1650,6 +1691,7 @@ msgstr ""
 "O certificado enviado por \"%s\" é auto-assinado. Ele não pode ser "
 "verificado automaticamente."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "A cadeia de certificados enviada para %s não é válida."
@@ -1659,6 +1701,7 @@ msgstr "A cadeia de certificados enviada para %s não é válida."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Erro no certificado SSL"
 
@@ -1670,7 +1713,7 @@ msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
-"você não tem um banco de dados de certificados raiz, logo este certificado "
+"Você não tem um banco de dados de certificados raiz, logo este certificado "
 "não pode ser validado."
 
 #. vrq will be completed by user_auth
@@ -1739,6 +1782,7 @@ msgstr "+++ %s conectou"
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectou"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -1785,6 +1829,17 @@ msgstr "%s saiu da sala."
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
 
+msgid "Invite to chat"
+msgstr "Convidar para um bate-papo"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Favor digitar o nome do usuário que você gostaria de convidar, junto com uma "
+"mensagem de convite opcional."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Falha ao obter conexão: %s"
@@ -1853,7 +1908,7 @@ msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
-"Erro ao gravar em %s: \n"
+"Erro escrevendo em %s: \n"
 "%s.\n"
 
 #, c-format
@@ -1916,8 +1971,12 @@ msgid "Starting transfer of %s from %s"
 msgstr "Iniciar transferência de %s a partir de %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Transferência do arquivo <A HREF=\"file://%s\">%s</A> completa"
+
+#, c-format
 msgid "Transfer of file %s complete"
-msgstr "Transferência de %s completa"
+msgstr "Transferência do arquivo %s completa"
 
 msgid "File transfer complete"
 msgstr "Transferência de arquivo completa"
@@ -2132,6 +2191,9 @@ msgstr "<font color=\"red\"><b>Não foi possível ler o arquivo: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-RESPOSTA>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Erro ao criar a conferência"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Você está usando %s, mas este plug-in requer %s."
@@ -2158,7 +2220,7 @@ msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"O plug-in requerido %s não foi encontrado. Por favor instale esse plug-in e "
+"O plug-in necessário %s não foi encontrado. Por favor instale esse plug-in e "
 "tente novamente."
 
 msgid "Unable to load the plugin"
@@ -2166,7 +2228,7 @@ msgstr "Não foi possível carregar o plug-in."
 
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "O plug-in requerido %s não pôde ser carregado."
+msgstr "O plug-in necessário %s não pôde ser carregado."
 
 msgid "Unable to load your plugin."
 msgstr "Não foi possível carregar seu plug-in."
@@ -2222,7 +2284,7 @@ msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
-"Caminho para salvar os arquivos\n"
+"Caminho para salvar os arquivos em\n"
 "(Favor digitar o caminho completo)"
 
 msgid "Automatically reject from users not in buddy list"
@@ -2320,7 +2382,7 @@ msgid "Allows control by entering commands in a file."
 msgstr "Permite controlar ações inserindo comandos em um arquivo."
 
 msgid "Minutes"
-msgstr "minutos"
+msgstr "Minutos"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
@@ -2544,7 +2606,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2600,7 +2662,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "Salva mensagens enviadas para um usuário desconectado numa ação."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "O resto das mensagens será salvo como ações. Você pode alterar/remover as "
@@ -2634,6 +2696,34 @@ msgstr "Salvar mensagens offline como ações"
 msgid "Do not ask. Always save in pounce."
 msgstr "Não perguntar. Sempre salvar como ações."
 
+msgid "One Time Password"
+msgstr "Senha uma vez"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Suporte de senha uma vez"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Forçar que senhas são usadas somente uma vez."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Permite que você force, para uma conta, que as senhas não sejam salvas só "
+"sejam utilizadas em uma conexão feita com sucesso.\n"
+"Nota: A senha da conta não deve estar salva para isto funcionar."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2828,14 +2918,14 @@ msgstr ""
 "plug-ins TCL, instale o ActiveTCL de http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"O Kit de Ferramentas do Apple Bonjour para Windows não foi encontrado, veja "
-"o FAQ no: http://d.pidgin.im/BonjourWindows para mais informações."
+"O toolkit \"Bonjour for Windows\" não foi encontrado, vá em http://d.pidgin."
+"im/BonjourWindows para mais informações."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Não foi possível escutar por conexões de mensagens instantâneas\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Não foi possível escutar por conexões de mensagens instantâneas"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2844,7 +2934,7 @@ msgstr ""
 "rodando?"
 
 msgid "First name"
-msgstr "Nome"
+msgstr "Primeiro nome"
 
 msgid "Last name"
 msgstr "Sobrenome"
@@ -2888,14 +2978,17 @@ msgstr "%s fechou a conversa."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Não foi possível enviar mensagem: a conversa não pôde ser iniciada."
 
-msgid "Cannot open socket"
-msgstr "Não foi possível abrir socket"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Não foi possível criar socket: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Não foi possível vincular socket à porta"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Não foi possível vincular socket à porta: %s"
 
-msgid "Could not listen on socket"
-msgstr "Não foi possível escutar no socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Não foi possível escutar no socket: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Erro comunicando com o mDNSResponder local."
@@ -2923,7 +3016,7 @@ msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Sua lista de amigos está vazia, nada foi escrito no arquivo."
 
 msgid "Buddylist saved successfully!"
-msgstr "Lista de amigos salva com sucesso"
+msgstr "Lista de amigos salva com sucesso!"
 
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
@@ -2944,14 +3037,15 @@ msgstr "Salvar lista de amigos..."
 msgid "Load buddylist from file..."
 msgstr "Carregar lista de amigos do arquivo.."
 
-msgid "Fill in the registration fields."
-msgstr "Preencha os campos de registro."
+msgid "You must fill in all registration fields"
+msgstr "Você deve preencher todos os campos de registro"
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "As senhas não conferem."
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Não foi possível registrar uma nova conta. Ocorreu um erro.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+"Não foi possível registrar uma nova conta. Ocorreu um erro desconhecido."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nova conta do Gadu-Gadu registrada"
@@ -2962,14 +3056,14 @@ msgstr "O registro foi concluído com sucesso!"
 msgid "Password"
 msgstr "Senha"
 
-msgid "Password (retype)"
-msgstr "Senha (redigitar)"
+msgid "Password (again)"
+msgstr "Senha (novamente)"
 
-msgid "Enter current token"
-msgstr "Digite o token atual"
+msgid "Enter captcha text"
+msgstr "Digite o texto do captcha"
 
-msgid "Current token"
-msgstr "Token atual"
+msgid "Captcha"
+msgstr "Imagem do captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrar nova conta do Gadu-Gadu"
@@ -3002,7 +3096,7 @@ msgid "Find buddies"
 msgstr "Encontrar amigos"
 
 msgid "Please, enter your search criteria below"
-msgstr "Favor digitar seu critério de busca abaixo"
+msgstr "Por favor, digite seu critério de busca abaixo"
 
 msgid "Fill in the fields."
 msgstr "Preencha os campos."
@@ -3014,7 +3108,7 @@ msgid "Unable to change password. Error occurred.\n"
 msgstr "Não foi possível alterar a senha. Ocorreu um erro.\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Mudar senha da conta do Gadu-Gadu"
+msgstr "Mudar a senha da conta do Gadu-Gadu"
 
 msgid "Password was changed successfully!"
 msgstr "Senha alterada com sucesso!"
@@ -3022,6 +3116,15 @@ msgstr "Senha alterada com sucesso!"
 msgid "Current password"
 msgstr "Senha atual"
 
+msgid "Password (retype)"
+msgstr "Senha (redigitar)"
+
+msgid "Enter current token"
+msgstr "Digite o token atual"
+
+msgid "Current token"
+msgstr "Token atual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Favor digitar sua senha atual e sua nova senha do UIN: "
 
@@ -3035,6 +3138,7 @@ msgstr "Selecione o bate-papo para o amigo: %s"
 msgid "Add to chat..."
 msgstr "Adicionar ao bate-papo..."
 
+#. Global
 msgid "Available"
 msgstr "Disponível"
 
@@ -3068,7 +3172,7 @@ msgstr "Nenhum usuário compatível encontrado"
 msgid "There are no users matching your search criteria."
 msgstr "Não existem usuários que satisfaçam seu critério de busca"
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Não foi possível ler do socket"
 
 msgid "Buddy list downloaded"
@@ -3083,8 +3187,14 @@ msgstr "Lista de amigos enviada"
 msgid "Your buddy list was stored on the server."
 msgstr "Sua lista de amigos foi guardada no servidor."
 
-msgid "Connection failed."
-msgstr "Falha na conexão."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Conectado"
+
+msgid "Connection failed"
+msgstr "Falha na conexão"
 
 msgid "Add to chat"
 msgstr "Adicionar ao bate-papo"
@@ -3092,14 +3202,23 @@ msgstr "Adicionar ao bate-papo"
 msgid "Chat _name:"
 msgstr "_Nome do bate-papo:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Não foi possível resolver nome do computador '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Conectando"
+
 msgid "Chat error"
 msgstr "Erro no bate-papo"
 
 msgid "This chat name is already in use"
 msgstr "Este nome de bate-papo já está sendo utilizado"
 
-msgid "Not connected to the server."
-msgstr "Não conectado ao servidor."
+msgid "Not connected to the server"
+msgstr "Não conectado ao servidor"
 
 msgid "Find buddies..."
 msgstr "Encontrar amigos..."
@@ -3114,7 +3233,7 @@ msgid "Download buddylist from Server"
 msgstr "Transferir lista de amigos do servidor"
 
 msgid "Delete buddylist from Server"
-msgstr "Remover lista de amigos do servidor"
+msgstr "Excluir lista de amigos do servidor"
 
 msgid "Save buddylist to file..."
 msgstr "Salvar lista de amigos para um arquivo..."
@@ -3140,6 +3259,9 @@ msgstr "Cliente de mensagens instantâneas popular na Polônia"
 msgid "Gadu-Gadu User"
 msgstr "Usuário do Gadu-Gadu"
 
+msgid "GG server"
+msgstr "Servidor do GG"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
@@ -3154,7 +3276,7 @@ msgstr "Nenhum tópico foi definido"
 msgid "File Transfer Failed"
 msgstr "Transferência de arquivo falhou"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Não foi possível abrir uma porta para escuta."
 
 msgid "Error displaying MOTD"
@@ -3170,8 +3292,16 @@ msgstr "Não há mensagem do dia (MOTD) associada com esta conexão."
 msgid "MOTD for %s"
 msgstr "Mensagem do dia (MOTD) para %s"
 
-msgid "Server has disconnected"
-msgstr "O servidor desconectou"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "A conexão com o servidor foi perdida: %s"
 
 msgid "View MOTD"
 msgstr "Ver mensagem do dia (MOTD)"
@@ -3182,25 +3312,23 @@ msgstr "_Canal:"
 msgid "_Password:"
 msgstr "_Senha:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "Apelidos do IRC não podem conter espaços"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Conectando"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "Nome des servidor e Apelidos do IRC não podem conter espaços"
 
 msgid "SSL support unavailable"
 msgstr "Suporte a SSL indisponível"
 
-msgid "Couldn't create socket"
-msgstr "Não foi possível criar socket"
+msgid "Unable to connect"
+msgstr "Não foi possível conectar"
 
-msgid "Couldn't connect to host"
-msgstr "Não foi possível conectar ao host"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Não foi possível conectar: %s"
 
-msgid "Read error"
-msgstr "Erro de leitura"
+#, c-format
+msgid "Server closed the connection"
+msgstr "O servidor encerrou a conexão"
 
 msgid "Users"
 msgstr "Usuários"
@@ -3381,6 +3509,16 @@ msgstr ""
 "O nome de conta selecionado foi rejeitado pelo servidor. Provavelmente, ele "
 "contém caracteres inválidos."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Este apelido \"%s\" já está sendo utilizado"
+
+msgid "Nickname in use"
+msgstr "Apelido em uso"
+
 msgid "Cannot change nick"
 msgstr "Não foi possível mudar apelido"
 
@@ -3620,13 +3758,13 @@ msgstr "Comando ad-hoc falhou"
 msgid "execute"
 msgstr "execute"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"O servidor requer TLS/SSL para conexão. Nenhum suporte a TLS/SSL foi "
-"encontrado."
+"O servidor requer TLS/SSL para conexão mas nenhum suporte a TLS/SSL "
+"foiencontrado."
 
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "Você requer TLS/SSL, mas nenhum suporte a TLS/SSL foi encontrado. "
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Você requer criptografia, mas nenhum suporte a TLS/SSL foi encontrado."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
@@ -3643,17 +3781,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticação via texto puro"
 
-msgid "Invalid response from server."
+msgid "SASL authentication failed"
+msgstr "Autenticação SASL mal sucedida"
+
+msgid "Invalid response from server"
 msgstr "O servidor retornou uma resposta inválida."
 
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor não utiliza nenhum método de autenticação suportado"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Você requereu criptografia, mas este servidor não a suporta."
+
 msgid "Invalid challenge from server"
 msgstr "O servidor retornou uma identificação inválida"
 
-msgid "SASL error"
-msgstr "Erro de SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Erro de SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "O gerenciador de conexão BOSH terminou sua sessão."
+
+msgid "No session ID given"
+msgstr "Nenhum ID da sessão foi dado."
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Versão do protocolo BOSH não suportada"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Não foi possível estabelecer conexão com o servidor:"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Não foi possível estabelecer conexão com o servidor: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Não foi possível estabelecer uma conexão SSL"
 
 msgid "Full Name"
 msgstr "Nome completo"
@@ -3721,158 +3885,8 @@ msgstr "Cliente"
 msgid "Operating System"
 msgstr "Sistema operacional"
 
-msgid "Last Activity"
-msgstr "Última atividade"
-
-msgid "Service Discovery Info"
-msgstr "Informações da localização de serviços"
-
-msgid "Service Discovery Items"
-msgstr "Itens da localização de serviços"
-
-msgid "Extended Stanza Addressing"
-msgstr "Endereçamento de Stanza estendido"
-
-msgid "Multi-User Chat"
-msgstr "Bate-papo multiusuário"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Informações estendidas de presença em bate-papos multiusuário"
-
-msgid "In-Band Bytestreams"
-msgstr "Bytestreams In-Band"
-
-msgid "Ad-Hoc Commands"
-msgstr "Comandos ad-hoc"
-
-msgid "PubSub Service"
-msgstr "Serviço PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Bytestreams via SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Suporte a dados 'out of band'"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Registro 'In-Band'"
-
-msgid "User Location"
-msgstr "Localização do usuário"
-
-msgid "User Avatar"
-msgstr "Imagem de exibição do usuário"
-
-msgid "Chat State Notifications"
-msgstr "Notificações do status do bate-papo"
-
-msgid "Software Version"
-msgstr "Versão do software"
-
-msgid "Stream Initiation"
-msgstr "Inicialização de fluxoOrientação"
-
-msgid "File Transfer"
-msgstr "Transferência de arquivo"
-
-msgid "User Mood"
-msgstr "Humor do usuário"
-
-msgid "User Activity"
-msgstr "Atividade do usuário"
-
-msgid "Entity Capabilities"
-msgstr "Recursos do usuário"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negociação de sessão criptografada"
-
-msgid "User Tune"
-msgstr "Música do usuário"
-
-msgid "Roster Item Exchange"
-msgstr "Troca de itens da lista de amigos"
-
-msgid "Reachability Address"
-msgstr "Endereço de contato"
-
-msgid "User Profile"
-msgstr "Perfil do usuário"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Áudio do Jingle"
-
-msgid "User Nickname"
-msgstr "Apelido do usuário"
-
-msgid "Jingle ICE UDP"
-msgstr "ECI UDP do Jingle"
-
-msgid "Jingle ICE TCP"
-msgstr "ECI TCP do Jingle"
-
-msgid "Jingle Raw UDP"
-msgstr "UDP puro do Jingle"
-
-msgid "Jingle Video"
-msgstr "Vídeo do Jingle"
-
-msgid "Jingle DTMF"
-msgstr "Discagem a tom do Jingle"
-
-msgid "Message Receipts"
-msgstr "Recibos de mensagem"
-
-msgid "Public Key Publishing"
-msgstr "Publicação de chave pública"
-
-msgid "User Chatting"
-msgstr "Notificação de bate-papos"
-
-msgid "User Browsing"
-msgstr "Notificação de onde está navegando"
-
-msgid "User Gaming"
-msgstr "Notificação do que está jogando"
-
-msgid "User Viewing"
-msgstr "Notificação do que está assistindo"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Criptografia de Stanza"
-
-msgid "Entity Time"
-msgstr "Informações de horário"
-
-msgid "Delayed Delivery"
-msgstr "Entrega atrasada"
-
-msgid "Collaborative Data Objects"
-msgstr "Objetos de dados colaborativos"
-
-msgid "File Repository and Sharing"
-msgstr "Compartilhamento e repositório de arquivos"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Serviço de descoberta STUN para o Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociação de sessão criptografada simplificada"
-
-msgid "Hop Check"
-msgstr "Verificação de saltos"
-
-msgid "Capabilities"
-msgstr "Recursos"
+msgid "Local Time"
+msgstr "Hora local"
 
 msgid "Priority"
 msgstr "Prioridade"
@@ -3880,6 +3894,13 @@ msgstr "Prioridade"
 msgid "Resource"
 msgstr "Recurso"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s atrás"
+
+msgid "Logged Off"
+msgstr "Desconectado"
+
 msgid "Middle Name"
 msgstr "Nome do meio"
 
@@ -3906,7 +3927,7 @@ msgid "Cancel Presence Notification"
 msgstr "Cancelar notificação de presença"
 
 msgid "(Re-)Request authorization"
-msgstr "(Re-)requisitar autorização"
+msgstr "(Re-)Pedir autorização"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
@@ -4048,28 +4069,24 @@ msgstr "Selecione um servidor de conferência a ser consultado"
 msgid "Find Rooms"
 msgstr "Encontrar salas"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Você requereu criptografia, mas este servidor não a suporta."
+msgid "Affiliations:"
+msgstr "Afiliações:"
 
-msgid "Write error"
-msgstr "Erro ao enviar"
+msgid "No users found"
+msgstr "Nenhum usuário encontrado"
 
-msgid "Ping timeout"
-msgstr "Tempo limite de ping excedido"
+msgid "Roles:"
+msgstr "Funções:"
 
-msgid "Read Error"
-msgstr "Erro de leitura"
+msgid "Ping timed out"
+msgstr "Tempo limite de ping excedido"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Não foi possível estabelecer conexão com o servidor:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Não foi possível criar socket"
+"Não foi possível encontrar métodos de conexão do XMPP depois de não "
+"conseguir conectar diretamente."
 
 msgid "Invalid XMPP ID"
 msgstr "ID do XMPP inválido"
@@ -4077,6 +4094,9 @@ msgstr "ID do XMPP inválido"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID do XMPP inválido. O domínio precisa ser especificado."
 
+msgid "Malformed BOSH URL"
+msgstr "URL BOSH inválida."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s foi efetuado com sucesso"
@@ -4101,9 +4121,6 @@ msgstr "Desregistro efetuado com sucesso"
 msgid "Unregistration Failed"
 msgstr "Desregistro falhou"
 
-msgid "Already Registered"
-msgstr "Já está registrado"
-
 msgid "State"
 msgstr "Estado"
 
@@ -4116,6 +4133,9 @@ msgstr "Telefone"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Já está registrado"
+
 msgid "Unregister"
 msgstr "Desregistrar"
 
@@ -4169,6 +4189,12 @@ msgstr "O servidor não tem suporte a bloqueio"
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
+msgid "Mood"
+msgstr "Humor"
+
+msgid "Now Listening"
+msgstr "Ouvindo agora"
+
 msgid "Both"
 msgstr "Ambas"
 
@@ -4190,12 +4216,6 @@ msgstr "Nenhuma"
 msgid "Subscription"
 msgstr "Inscrição"
 
-msgid "Mood"
-msgstr "Humor"
-
-msgid "Now Listening"
-msgstr "Ouvindo agora"
-
 msgid "Mood Text"
 msgstr "Humor (texto)"
 
@@ -4238,9 +4258,6 @@ msgstr "Sua senha foi alterada."
 msgid "Error changing password"
 msgstr "Erro ao mudar a senha"
 
-msgid "Password (again)"
-msgstr "Senha (novamente)"
-
 msgid "Change XMPP Password"
 msgstr "Alterar senha do XMPP"
 
@@ -4289,13 +4306,13 @@ msgid "Not Allowed"
 msgstr "Não permitido"
 
 msgid "Payment Required"
-msgstr "Pagamento requerido"
+msgstr "Pagamento necessário"
 
 msgid "Recipient Unavailable"
 msgstr "Destinatário indisponível"
 
 msgid "Registration Required"
-msgstr "Registro requerido"
+msgstr "Registro necessário"
 
 msgid "Remote Server Not Found"
 msgstr "Servidor remoto não encontrado"
@@ -4310,7 +4327,7 @@ msgid "Service Unavailable"
 msgstr "Serviço indisponível"
 
 msgid "Subscription Required"
-msgstr "Inscrição requerida"
+msgstr "Inscrição necessária"
 
 msgid "Unexpected Request"
 msgstr "Requisição inesperada"
@@ -4427,27 +4444,33 @@ msgstr "Não foi possível definir cargo \"%s\" para o usuário: %s"
 
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "Não foi possível convidar usuário (%s)."
+msgstr "Não foi possível expulsar usuário (%s)."
 
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Não foi possível verificar presença de usuário %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
-"Não foi possível chamar a atenção de %s, pois nada é conhecido sobre ele(a)."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Não foi possível chamar a atenção, pois nada é conhecido sobre %s."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "Não foi possível chamar a atenção de %s, pois este(a) pode estar "
 "desconectado."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
-"Não foi possível chamar a atenção de %s, pois este não suporta tal recurso."
+"Não foi possível chamar a atenção de %s, pois este não suporta tal recurso "
+"ou não deseja receber chamados de atenção agora."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Chamando a atenção de %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4459,8 +4482,35 @@ msgid "%s has buzzed you!"
 msgstr "%s chamou sua atenção!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Chamando a atenção de %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Não foi possível iniciar mídia com %s: ID do Jabber inválido"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Não foi possível iniciar mídia com %s: o usuário não está conectado"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Não foi possível iniciar mídia com %s: você não está recebendo informações "
+"de presença deste usuário"
+
+msgid "Media Initiation Failed"
+msgstr "Não foi possível fazer a Inicialização de mídia"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Favor selecionar o recurso de %s para o qual você gostaria iniciar uma "
+"sessão de mídia."
+
+msgid "Select a Resource"
+msgstr "Selecione um recurso"
+
+msgid "Initiate Media"
+msgstr "Iniciar Mídia"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura uma sala de bate-papo."
@@ -4481,18 +4531,18 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;usuário&gt; [sala]: Bane o usuário da sala."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;usuário&gt; &lt;owner|admin|member|outcast|none&gt;: define a "
-"filiação do usuário com a sala."
+"affiliate &lt;owner|admin|member|outcast|none&gt;: [apelido1] "
+"[apelido2] ...: recebe ou define a filiação do usuário com a sala."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;usuário&gt; &lt;moderator|participant|visitor|none&gt;: Define o "
-"cargo do usuário na sala."
+"role &lt;moderator|participant|visitor|none&gt;: recebe ou define o cargo do "
+"usuário na sala."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuário&gt; [mensagem]:  Convida o usuário para a sala."
@@ -4555,6 +4605,9 @@ msgstr "Servidor de conexão"
 msgid "File transfer proxies"
 msgstr "Proxy de transferência de arquivo"
 
+msgid "BOSH URL"
+msgstr "URL BOSH"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4593,6 +4646,14 @@ msgstr "Erro ao processar XML"
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presença"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Erro ao entrar no bate-papo %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Erro no bate-papo %s"
+
 msgid "Create New Room"
 msgstr "Criar nova sala"
 
@@ -4609,13 +4670,28 @@ msgstr "_Configurar sala"
 msgid "_Accept Defaults"
 msgstr "_Aceitar padrões"
 
+msgid "No reason"
+msgstr "Sem razão"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Erro ao entrar no bate-papo %s"
+msgid "You have been kicked: (%s)"
+msgstr "Você foi expulso: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Erro no bate-papo %s"
+msgid "Kicked (%s)"
+msgstr "Expulso (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Um erro aconteceu na transferência do stream in-band\n"
+
+msgid "Transfer was closed."
+msgstr "A Transferência de arquivo foi fechada."
+
+msgid "Failed to open the file"
+msgstr "Falha ao abrir arquivo"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Falha ao abrir o fluxo de bytes in-band"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4647,9 +4723,6 @@ msgstr ""
 "Favor selecionar o recurso de %s para o qual você gostaria de mandar um "
 "arquivo"
 
-msgid "Select a Resource"
-msgstr "Selecione um recurso"
-
 msgid "Edit User Mood"
 msgstr "Editar humor do usuário"
 
@@ -4946,6 +5019,30 @@ msgstr "Outros Contatos"
 msgid "Non-IM Contacts"
 msgstr "Contatos que não são do mensageiro"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s enviou um wink. <a href='msn-wink://%s'>Clique aqui para reproduzí-lo</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s envou um wink, mas o wink não pôde ser salvo"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s envou um clipe de voz. <a href='audio://%s'>Clique aqui para reproduzí-"
+"lo</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s te enviou um clipe de voz, mas este não pôde ser salvo"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s te enviou um convite para bate-pao de voz, que é um recurso sem suporte."
+
 msgid "Nudge"
 msgstr "Chamar a atenção"
 
@@ -5100,8 +5197,28 @@ msgstr ""
 "O suporte ao SSL é necessário para o MSN. Por favor instale uma biblioteca "
 "SSL suportada."
 
-msgid "Failed to connect to server."
-msgstr "Não foi possível conectar ao servidor."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Não foi possível adicionar o amigo %s porque o nome de usuário é inválido. "
+"Nomes de usuário devem ser um endereço de e-mail válido."
+
+msgid "Unable to Add"
+msgstr "Não foi possível adicionar"
+
+msgid "Authorization Request Message:"
+msgstr "Mensagem para pedido de autorização:"
+
+msgid "Please authorize me!"
+msgstr "Por favor me autorize!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Erro ao obter perfil"
@@ -5292,63 +5409,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticação do Windows Live ID:Resposta inválida"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s não é um grupo válido."
-
-msgid "Unknown error."
-msgstr "Erro desconhecido."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s em %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s chamou sua atenção!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Erro desconhecido (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Erro desconhecido (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Não foi possível adicionar usuário"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Os seguintes usuários estão faltando no seu catálogo de endereços"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Não foi possível adicionar usuário em %s (%s)"
-
+#. Unknown error!
 #, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Não foi possível bloquear usuário em %s (%s)."
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Não foi possível permitir usuário em %s (%s)."
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s não pôde ser adicionado porque a sua lista de amigos está cheia."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s não é uma conta do Passport válida."
+msgid "Unknown error (%d)"
+msgstr "Erro desconhecido (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Serviço temporariamente indisponível."
+msgid "The following users are missing from your addressbook"
+msgstr "Os seguintes usuários estão faltando no seu catálogo de endereços"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "A mensagem móvel não pôde ser enviada porque era muito longa."
 
-msgid "Unable to rename group"
-msgstr "Não foi possível renomear grupo"
-
-msgid "Unable to delete group"
-msgstr "Não foi possível remover grupo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5396,9 +5477,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "A mensagem pode não ter sido enviada devido a um erro desconhecido:"
 
-msgid "Unable to connect"
-msgstr "Não foi possível conectar"
-
 msgid "Writing error"
 msgstr "Erro de escrita"
 
@@ -5413,13 +5491,13 @@ msgstr ""
 "Erro de conexão do servidor %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Nosso protocolo não é suportado pelo servidor."
+msgid "Our protocol is not supported by the server"
+msgstr "Nosso protocolo não possui suporte do servidor."
 
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr "Erro ao processar HTTP."
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr "Você conectou de outro local."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5427,7 +5505,7 @@ msgstr ""
 "Os servidores do MSN estão temporariamente indisponíveis. Favor esperar e "
 "tentar novamente."
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr "Os servidores MSN vão sair do ar temporariamente."
 
 #, c-format
@@ -5458,6 +5536,17 @@ msgstr "Enviando o cookie"
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s te enviou um convite para ver sua webcam, mas este recurso ainda não tem "
+"suporte."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s te enviou um convite para ver webcam, que é um recurso não suportado."
+
 msgid "Away From Computer"
 msgstr "Ausente"
 
@@ -5499,14 +5588,6 @@ msgstr "A mensagem não pôde ser enviada porque um erro ocorreu no switchboard:
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "A mensagem pode não ter sido enviada devido a um erro desconhecido:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s te adicionou à sua lista de contatos."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s te removeu da sua lista de contatos."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Excluir Usuário do Catálogo de Endereços"
 
@@ -5536,6 +5617,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Plug-in do protocolo MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s não é um grupo válido."
+
+msgid "Unknown error."
+msgstr "Erro desconhecido."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s em %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Não foi possível adicionar usuário em %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Não foi possível bloquear usuário em %s (%s)."
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Não foi possível permitir usuário em %s (%s)."
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s não pôde ser adicionado porque a sua lista de amigos está cheia."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s não é uma conta do Passport válida."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Serviço temporariamente indisponível."
+
+msgid "Unable to rename group"
+msgstr "Não foi possível renomear grupo"
+
+msgid "Unable to delete group"
+msgstr "Não foi possível remover grupo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s te adicionou à sua lista de contatos."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s te removeu da sua lista de contatos."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Usuário não existe: %s"
 
@@ -5565,6 +5694,8 @@ msgid "Lost connection with server"
 msgstr "Conexão com o servidor perdida"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Novas mensagens de email"
 
@@ -5603,26 +5734,22 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Adicionar contatos do servidor"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Conectado"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Erro de protocolo, código %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Sua senha é %d caracteres, maior que o tamanho máximo esperado de %d para "
-"o MySpaceIM. Por favor, encurte sua senha no http://profileedit.myspace.com/"
-"index.cfm?fuseaction=accountSettings.changePassword e tente novamente."
+"%s Sua senha é %zu caracteres, o que é maior que o tamanho máximo esperado "
+"de %d. Por favor, encurte sua senha no http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword e tente novamente."
+
+msgid "Incorrect username or password"
+msgstr "Nome de usuário ou senha incorreto(a)"
 
 msgid "MySpaceIM Error"
 msgstr "Erro do MySpace"
@@ -5630,16 +5757,6 @@ msgstr "Erro do MySpace"
 msgid "Invalid input condition"
 msgstr "Condição de entrada inválida"
 
-msgid "Read buffer full (2)"
-msgstr "Buffer de leitura cheio (2)"
-
-msgid "Unparseable message"
-msgstr "Mensagem impossível de ser processada"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Não foi possível conectar ao host: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Falha ao adicionar amigo"
 
@@ -5725,6 +5842,15 @@ msgstr "Total de amigos"
 msgid "Client Version"
 msgstr "Versão do cliente"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Um erro aconteceu enquanto tentava-se definir o nome de usuário. Por favor, "
+"tente novamente ou visite http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username para definir seu nome de usuário."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nome de Usuário Disponível"
 
@@ -5941,9 +6067,6 @@ msgstr "Não é possível adicionar a si próprio"
 msgid "Master archive is misconfigured"
 msgstr "O arquivo mestre está mal configurado"
 
-msgid "Incorrect username or password"
-msgstr "Nome de usuário ou senha incorreto(a)"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Não foi possível reconhecer o host do nome de usuário digitado"
 
@@ -5986,8 +6109,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Erro desconhecido: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "A conexão falhou (%s)."
+msgid "Unable to login: %s"
+msgstr "Não foi possível fazer o login: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6094,9 +6217,6 @@ msgstr "Conferência GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-msgid "Unable to connect to server."
-msgstr "Não foi possível conectar ao servidor."
-
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
@@ -6120,9 +6240,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Você deseja entrar na conversa?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Você foi desconectado porque conectou em outra estação de trabalho."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6131,15 +6248,12 @@ msgstr ""
 "enviar."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Não foi possível conectar ao servidor. Por favor digite o endereço do "
 "servidor em que você deseja conectar."
 
-msgid "Error. SSL support is not installed."
-msgstr "Erro. O suporte a SSL não está instalado."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Esta conferência foi fechada. Não é possível enviar mais mensagens."
 
@@ -6162,25 +6276,33 @@ msgstr "Endereço do servidor"
 msgid "Server port"
 msgstr "Porta do servidor"
 
+msgid "Received unexpected response from "
+msgstr "Recebido resposta inesperada de "
+
+#. username connecting too frequently
+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 ""
+"Você esteve conectando e desconectando com muita freqüência. Espere dez "
+"minutos e tente novamente. Se você continuar tentando, vai ter que esperar "
+"ainda mais."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Erro solicitando "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "A AOL não permite que seu nome de tela autentique aqui"
+
 msgid "Could not join chat room"
 msgstr "Não foi possível entrar na sala de bate-papo"
 
 msgid "Invalid chat room name"
 msgstr "Nome de sala de bate-papo inválido"
 
-msgid "Server closed the connection."
-msgstr "O servidor encerrou a conexão."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"A conexão com o servidor foi perdida: \n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Dados inválidos foram recebidos na conexão com o servidor."
+msgid "Received invalid data on connection with server"
+msgstr "Dados inválidos foram recebidos na conexão com o servidor"
 
 #. *< type
 #. *< ui_requirement
@@ -6227,7 +6349,7 @@ msgstr "Conexão com o usuário remoto perdida:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Dados inválidos foram recebidos na conexão com o usuário remoto."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Não foi possível estabelecer conexão com o usuário remoto."
 
 msgid "Direct IM established"
@@ -6428,20 +6550,12 @@ msgid "Buddy Comment"
 msgstr "Comentário do amigo"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Não foi possível conectar ao servidor de autenticação:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Não foi possível conectar ao servidor de autenticação: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Não foi possível conectar ao servidor BOS:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Não foi possível conectar ao servidor BOS: %s"
 
 msgid "Username sent"
 msgstr "Nome de usuário enviado"
@@ -6455,55 +6569,61 @@ msgstr "Finalizando a conexão"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Impossível efetuar login: Não foi possível conectar como %s porque o nome de "
-"usuário é inválido. Nomes de usuário têm que ser um endereço de email "
-"válido, ou têm que começar com uma letra e conter apenas letras, números e "
-"espaços, ou conter apenas números."
+"Não foi possível se conectar como %s porque o nome de usuário é inválido. "
+"Nomes de usuário devem ser um endereço de e-mail válido, ou começar com uma "
+"letra ou somente conter letras, números e espaços, ou conter somente números."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Nome de usuário inválido."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Você pode ser desconectado em brevo. Se isso acontecer, verifique "
+"atualizações em %s."
 
-msgid "Incorrect password."
-msgstr "Senha incorreta."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Não foi possível conseguir um hash de conexão AIM válido."
+
+msgid "Unable to get a valid login hash."
+msgstr "Não foi possível conseguir um hash de conexão válido."
+
+msgid "Received authorization"
+msgstr "Autorização recebida"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Nome de usuário inexistente"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr "Atualmente, sua conta está suspensa."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O serviço AOL Instant Messenger está temporariamente indisponível."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Você esteve conectando e desconectando com muita freqüência. Espere dez "
-"minutos e tente novamente. Se você continuar tentando, vai ter que esperar "
-"ainda mais."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A versão do cliente que você está usando é velha demais. Favor atualizar em %"
 "s"
 
-msgid "Could Not Connect"
-msgstr "Não foi possível conectar"
-
-msgid "Received authorization"
-msgstr "Autorização recebida"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Você esteve conectando e desconectando com muita freqüência. Espere um "
+"minuto e tente novamente. Se você continuar tentando, vai ter que esperar "
+"ainda mais."
 
-msgid "The SecurID key entered is invalid."
-msgstr "A chave SecurID digitada é inválida."
+msgid "The SecurID key entered is invalid"
+msgstr "A chave SecurID digitada é inválida"
 
 msgid "Enter SecurID"
 msgstr "Digite o SecurID"
@@ -6511,29 +6631,6 @@ msgstr "Digite o SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Digite o número de 6 dígitos do visor digital."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Você pode ser desconectado em brevo. Se isso acontecer, verifique "
-"atualizações em %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Não foi possível conseguir um hash de conexão AIM válido."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Você pode ser desconectado daqui a pouco. Verifique atualizações em %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Não foi possível conseguir um hash de conexão válido."
-
 msgid "Password sent"
 msgstr "Senha enviada"
 
@@ -6545,12 +6642,6 @@ msgstr ""
 "Por favor me autorize para que eu possa adicioná-lo(a) à minha lista de "
 "amigos."
 
-msgid "Authorization Request Message:"
-msgstr "Mensagem para pedido de autorização:"
-
-msgid "Please authorize me!"
-msgstr "Por favor me autorize!"
-
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
@@ -6674,7 +6765,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Você perdeu %hu mensagem de %s por um motivo desconhecido."
 msgstr[1] "Você perdeu %hu mensagens de %s por um motivo desconhecido."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Não foi possível enviar mensagem: %s"
@@ -6696,6 +6787,9 @@ msgstr "Conectado desde"
 msgid "Member Since"
 msgstr "Membro desde"
 
+msgid "Capabilities"
+msgstr "Recursos"
+
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6880,7 +6974,7 @@ msgstr "Mensagem de ausência muito extensa."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6888,9 +6982,6 @@ msgstr ""
 "Nomes de usuário têm que ser um email válido, começar com uma letra e conter "
 "apenas letras, números e espaços, ou conter apenas números."
 
-msgid "Unable to Add"
-msgstr "Não foi possível adicionar"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Não foi possível recuperar lista de amigos"
 
@@ -6907,7 +6998,7 @@ msgstr "Órfãos"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Não foi possível adicionar o amigo %s porque você tem muitos amigos na sua "
@@ -6917,7 +7008,7 @@ msgid "(no name)"
 msgstr "(sem nome)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Não foi possível adicionar o amigo %s por um motivo desconhecido."
 
 #, c-format
@@ -7050,6 +7141,7 @@ msgstr "_Pesquisar"
 msgid "Set User Info (web)..."
 msgstr "Definir Informações de usuário (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Mudar Senha (URL)"
 
@@ -7079,6 +7171,9 @@ msgstr "Procurar por amigos pelo endereço de Email..."
 msgid "Search for Buddy by Information"
 msgstr "Procurar por amigos por informações"
 
+msgid "Use clientLogin"
+msgstr "Usar clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7268,6 +7363,34 @@ msgstr "Atualizar"
 msgid "Could not change buddy information."
 msgstr "Não foi possível alterar informação do amigo."
 
+msgid "Mobile"
+msgstr "Móvel"
+
+msgid "Note"
+msgstr "Nota"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Lembrete do Amigo"
+
+msgid "Change his/her memo as you like"
+msgstr "Altere o lembrete dele/dela como você quiser"
+
+msgid "_Modify"
+msgstr "_Modificar"
+
+msgid "Memo Modify"
+msgstr "Modificar Lembrete"
+
+msgid "Server says:"
+msgstr "Servidor diz:"
+
+msgid "Your request was accepted."
+msgstr "Sua requisição foi aceita."
+
+msgid "Your request was rejected."
+msgstr "Sua requisição foi rejeitada."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u requer verificação"
@@ -7579,6 +7702,9 @@ msgstr "<p><b>Agradecimento</b>:<br>\n"
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>Testadores Escrupulosos</b>:<br>\n"
 
+msgid "and more, please let me know... thank you!))"
+msgstr "e mais, por favor me avise... obrigado!))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>E, todos os garotos nos bastidores...</i><br>\n"
 
@@ -7653,7 +7779,7 @@ msgstr "Intervalo de keep-alive (segundos)"
 msgid "Update interval (seconds)"
 msgstr "Intervalo de update (segundos)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Não foi possível decodificar a resposta do servidor"
 
 #, c-format
@@ -7678,9 +7804,6 @@ msgstr "Ativação necessária"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Código de resposta desconhecido ao tentar fazer login em (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Não foi possível decodificar a resposta do servidor"
-
 msgid "Requesting captcha"
 msgstr "Requisitando captcha"
 
@@ -7714,30 +7837,17 @@ msgstr ""
 "Código de resposta desconhecido ao fazer login em (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Não foi possível conectar."
-
 msgid "Socket error"
 msgstr "Erro de socket"
 
-msgid "Unable to read from socket"
-msgstr "Não foi possível ler do socket"
-
-msgid "Write Error"
-msgstr "Erro ao enviar"
-
-msgid "Connection lost"
-msgstr "Conexão perdida"
-
 msgid "Getting server"
 msgstr "Coletando servidor"
 
 msgid "Requesting token"
 msgstr "Token de requisição"
 
-msgid "Couldn't resolve host"
-msgstr "Não foi possível resolver ao host"
+msgid "Unable to resolve hostname"
+msgstr "Não foi possível solucionar o nome do computador"
 
 msgid "Invalid server or port"
 msgstr "Porta ou servidor inválido"
@@ -7790,7 +7900,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Comando QQ Qun"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Não foi possível decodificar a resposta do login"
 
 msgid "Unknown LOGIN CMD"
@@ -7810,9 +7920,6 @@ msgstr "Envio de arquivo"
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelou a transferência de %s"
 
-msgid "Connection closed (writing)"
-msgstr "Conexão fechada (escrevendo)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título do grupo:</b> %s<br>"
@@ -7867,17 +7974,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Anúncio do administrador do Sametime"
 
-msgid "Connection reset"
-msgstr "Conexão redefinida"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Erro ao ler do socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Não foi possível conectar ao servidor."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anúncio de %s"
@@ -7900,6 +7996,9 @@ msgstr "Caixas de som"
 msgid "Video Camera"
 msgstr "Câmera de vídeo"
 
+msgid "File Transfer"
+msgstr "Transferência de arquivo"
+
 msgid "Supports"
 msgstr "Suporta"
 
@@ -8620,9 +8719,6 @@ msgstr "Organização"
 msgid "Unit"
 msgstr "Unidade"
 
-msgid "Note"
-msgstr "Nota"
-
 msgid "Join Chat"
 msgstr "Entrar em um bate-papo"
 
@@ -8722,6 +8818,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Estatísticas da rede"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Falha no ping"
 
@@ -8785,7 +8884,7 @@ msgstr "Tipo de chave pública não suportada"
 msgid "Disconnected by server"
 msgstr "Desconectado pelo servidor"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Erro ao conectar no servidor SILC"
 
 msgid "Key Exchange failed"
@@ -8797,16 +8896,10 @@ msgstr ""
 "Falha ao tentar recuperar sessão desconectada, mas não saída. Pressione "
 "Reconectar para criar uma nova sessão."
 
-msgid "Connection failed"
-msgstr "Falha na conexão"
-
 msgid "Performing key exchange"
 msgstr "Fazendo troca de chaves"
 
-msgid "Unable to create connection"
-msgstr "Não foi possível criar conexão."
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Não foi possível carregar par de chaves SILC"
 
 #. Progress
@@ -8816,7 +8909,7 @@ msgstr "Conectando ao servidor SILC"
 msgid "Out of memory"
 msgstr "Sem memória"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Não foi possível iniciar protocolo SILC"
 
 msgid "Error loading SILC key pair"
@@ -9117,8 +9210,8 @@ msgstr "Assinar digitalmente e verificar todas as mensagens"
 msgid "Creating SILC key pair..."
 msgstr "Criando par de chaves do SILC..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Não foi possível criar par de chaves do SILC\n"
+msgid "Unable to create SILC key pair"
+msgstr "Não foi possível criar par de chaves do SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9213,6 +9306,9 @@ msgstr "Quadro de atividades"
 msgid "No server statistics available"
 msgstr "Estatísticas do servidor indisponíveis"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Erro ao conectar no servidor SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Falha: Versões incompatíveis, atualize seu cliente"
@@ -9253,30 +9349,24 @@ msgstr "Falha: Cookie inválido"
 msgid "Failure: Authentication failed"
 msgstr "Falha: Autenticação mal sucedida"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "Não foi possível iniciar conexão do cliente SILC"
 
 msgid "John Noname"
 msgstr "João sem nome"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Não foi possível carregar par de chaves SILC: %s"
 
-msgid "Could not write"
-msgstr "Não foi possível enviar"
-
-msgid "Could not connect"
-msgstr "Não foi possível conectar"
-
-msgid "Unknown server response."
-msgstr "Resposta do servidor desconhecida."
+msgid "Unable to create connection"
+msgstr "Não foi possível criar conexão."
 
-msgid "Could not create listen socket"
-msgstr "Não foi possível criar socket de escuta"
+msgid "Unknown server response"
+msgstr "Resposta do servidor desconhecida"
 
-msgid "Could not resolve hostname"
-msgstr "Não foi possível resolver host"
+msgid "Unable to create listen socket"
+msgstr "Não foi possível escutar socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Nomes de usuário do SIP não podem conter espaços ou arrobas"
@@ -9317,185 +9407,60 @@ msgstr "Usuário de autenticação"
 msgid "Auth Domain"
 msgstr "Domínio de autenticação"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Procurando por %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Conexão para %s falhou"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Conectando: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Não foi possível escrever arquivo %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Não foi possível ler arquivo %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Mensagem muito extensa, últimos %s bytes truncados."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s não está conectado no momento."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Alertar %s não é permitido."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Uma mensagem foi descartada, você está excedendo o limite de velocidade do "
-"servidor."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Bate-papo não disponível em %s."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Você está mandando mensagens muito rapidamente para %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-"Você perdeu uma mensagem instantânea de %s porque ela era muito extensa."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Você perdeu uma mensagem de mensagem instantânea de %s porque ela foi "
-"enviada muito rapidamente."
-
-#, c-format
-msgid "Failure."
-msgstr "Falha."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Excesso de resultados."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Necessários mais qualificadores."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Serviço de diretório temporariamente indisponível."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Pesquisa por email restrita."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Palavra-chave ignorada."
-
-#, c-format
-msgid "No keywords."
-msgstr "Nenhuma palavra-chave."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Usuário não tem informação de diretório."
-
-#, c-format
-msgid "Country not supported."
-msgstr "País não suportado."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Falha desconhecida: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Nome de usuário ou senha incorreto(a)."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "O serviço está temporariamente indisponível."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-"Seu nível de alerta é alto demais para que você possa se conectar no momento."
-
-#, c-format
-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 ""
-"Você esteve conectando e desconectando com muita freqüência. Espere dez "
-"minutos e tente novamente. Se você continuar tentando, vai ter que esperar "
-"ainda mais."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Um erro desconhecido ocorreu ao conectar: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Um erro desconhecido, %d, ocorreu. Informações: %s"
-
-msgid "Invalid Groupname"
-msgstr "Nome de grupo inválido"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;sala&gt;:  Entra numa sala de bate-papo na rede do Yahoo"
 
-msgid "Connection Closed"
-msgstr "Conexão fechada"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Lista as salas desta rede do Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Esperando resposta..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "O TOC voltou de sua pausa. Agora você pode mandar mensagens novamente."
+msgid "Yahoo ID..."
+msgstr "ID do Yahoo..."
 
-msgid "Password Change Successful"
-msgstr "Mudança de senha efetuada com sucesso"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Plug-in do protocolo Yahoo!"
 
-msgid "_Group:"
-msgstr "_Grupo:"
+msgid "Pager server"
+msgstr "Servidor do pager"
 
-msgid "Get Dir Info"
-msgstr "Ver informações de diretório"
+msgid "Pager port"
+msgstr "Porta do pager"
 
-msgid "Set Dir Info"
-msgstr "Definir informações de diretório"
+msgid "File transfer server"
+msgstr "Servidor de transferência de arquivo"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Não foi possível abrir %s para escrita!"
+msgid "File transfer port"
+msgstr "Porta da transferência de arquivo"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Transferência de arquivo falhou; o outro lado provavelmente cancelou-a."
+msgid "Chat room locale"
+msgstr "Locale da sala de bate-papo"
 
-msgid "Could not connect for transfer."
-msgstr "Não foi possível conectar para transferência."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorar convites para bate-papos e conferências"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-"Não foi possível escrever cabeçalho de arquivo. O arquivo não será "
-"transferido."
+msgid "Chat room list URL"
+msgstr "URL da lista de salas de bate-papo"
 
-msgid "Save As..."
-msgstr "Salvar como..."
+msgid "Yahoo Chat server"
+msgstr "Servidor de bate-papo do Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s pede a %s para aceitar %d arquivo: %s (%.2f %s)%s%s"
-msgstr[1] "%s pede a %s para aceitar %d arquivos: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Porta de bate-papo do Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s pede a você para enviar um arquivo a ele"
+msgid "Yahoo JAPAN ID..."
+msgstr "ID do Yahoo JAPAN..."
 
 #. *< type
 #. *< ui_requirement
@@ -9507,13 +9472,11 @@ msgstr "%s pede a você para enviar um arquivo a ele"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Plug-in do protocolo TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Plug-in do protocolo Yahoo! JAPAN"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s te enviou um convite para ver webcam, que é um recurso não suportado."
+msgid "Your SMS was not delivered"
+msgstr "Seu SMS não foi entregue"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Sua mensagem do Yahoo! não foi enviada."
@@ -9539,6 +9502,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Pedido para adicionar amigo negado"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Dados inválidos recebidos"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Conta travada: muitas tentativas de login fracassadas. Entrar na sua conta "
+"no site do Yahoo! pode corrigir isso."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Conta travada: razão desconhecida. Entrar na sua conta no site do Yahoo! "
+"pode corrigir isso."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Nome de usuário ou senha faltando"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9573,39 +9560,28 @@ msgstr ""
 "corrigir isso."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Não foi possível adicionar o amigo %s ao grupo %s à lista do servidor na "
 "conta %s."
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "Não foi possível adicionar amigo à lista do servidor"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audível %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "O servidor retornou uma resposta HTTP inválida."
-
-msgid "Connection problem"
-msgstr "Problema na conexão"
+msgid "Received unexpected HTTP response from server"
+msgstr "O servidor retornou uma resposta HTTP inesperada."
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"A conexão com %s foi perdida:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "A conexão com %s foi perdida: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Não foi possível estabelecer conexão com %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Não foi possível estabelecer conexão com o servidor %s: %s"
 
 msgid "Not at Home"
 msgstr "Fora de casa"
@@ -9652,8 +9628,8 @@ msgstr "Configurações de presença"
 msgid "Start Doodling"
 msgstr "Começar a desenhar"
 
-msgid "Activate which ID?"
-msgstr "Ativar qual ID?"
+msgid "Select the ID you want to activate"
+msgstr "Selecione o ID que você quer ativar"
 
 msgid "Join whom in chat?"
 msgstr "Juntar-se a quem no bate-papo?"
@@ -9667,73 +9643,15 @@ msgstr "Ingressar usuário no bate-papo..."
 msgid "Open Inbox"
 msgstr "Abrir caixa de entrada"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;sala&gt;:  Entra numa sala de bate-papo na rede do Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Lista as salas desta rede do Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar"
-
-msgid "Yahoo ID..."
-msgstr "ID do Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Plug-in do protocolo Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japão"
-
-msgid "Pager server"
-msgstr "Servidor do pager"
-
-msgid "Japan Pager server"
-msgstr "Servidor japonês do pager"
-
-msgid "Pager port"
-msgstr "Porta do pager"
-
-msgid "File transfer server"
-msgstr "Servidor de transferência de arquivo"
-
-msgid "Japan file transfer server"
-msgstr "Servidor japonês de transferência de arquivo"
-
-msgid "File transfer port"
-msgstr "Porta da transferência de arquivo"
-
-msgid "Chat room locale"
-msgstr "Locale da sala de bate-papo"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorar convites para bate-papos e conferências"
-
-msgid "Chat room list URL"
-msgstr "URL da lista de salas de bate-papo"
-
-msgid "Yahoo Chat server"
-msgstr "Servidor de bate-papo do Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Porta de bate-papo do Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Enviado pedido para desenhar."
 
+msgid "Unable to connect."
+msgstr "Não foi possível conectar."
+
 msgid "Unable to establish file descriptor."
 msgstr "Não foi possível estabelecer descritor de arquivo."
 
@@ -9741,6 +9659,9 @@ msgstr "Não foi possível estabelecer descritor de arquivo."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s está tentando lhe enviar um grupo de %d arquivos.\n"
 
+msgid "Write Error"
+msgstr "Erro ao enviar"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil do Yahoo! Japão"
 
@@ -9810,12 +9731,8 @@ msgid "The user's profile is empty."
 msgstr "O perfil do usuário está vazio."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s rejeitou seu convite para uma conferência na sala \"%s\" porque \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Convite rejeitado"
+msgid "%s has declined to join."
+msgstr "%s rejeitou o convite."
 
 msgid "Failed to join chat"
 msgstr "Falha ao entrar no bate-papo"
@@ -9858,22 +9775,17 @@ msgstr "Vozes"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Problema na conexão"
+
 msgid "Unable to fetch room list."
 msgstr "Não foi possível obter lista de salas."
 
 msgid "User Rooms"
 msgstr "Salas de usuário"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Problema na conexão ao servidor YCHT."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Perdida conexão com servidor\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Problema na conexão com o servidor YCHT."
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10005,33 +9917,22 @@ msgid "Exposure"
 msgstr "Exposição"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Não foi possível criar socket\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Não foi possível interpretar resposta do proxy HTTP: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Não foi possível interpretar resposta do proxy HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erro de conexão do proxy HTTP %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
-"Acesso negado: o servidor proxy HTTP não permite o tunelamento da porta %d."
+"Acesso negado: o servidor proxy HTTP não permite o tunelamento da porta %d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Erro ao resolver %s"
 
-msgid "Could not resolve host name"
-msgstr "Não foi possível resolver host"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Chamando a atenção de %s..."
@@ -10118,9 +10019,6 @@ msgstr "Não perturbe"
 msgid "Extended away"
 msgstr "Ausente (estendido)"
 
-msgid "Mobile"
-msgstr "Móvel"
-
 msgid "Listening to music"
 msgstr "Escutando música"
 
@@ -10162,18 +10060,6 @@ msgstr "+++ %s voltou da inatividade"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Erro ao ler %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Um erro foi encontrado ao processar sua %s. Eles(as) não foram carregados"
-"(as), e o antigo arquivo foi movido para %s~."
-
 msgid "Calculating..."
 msgstr "Calculando..."
 
@@ -10281,6 +10167,18 @@ msgstr "Conexão rejeitada."
 msgid "Address already in use."
 msgstr "O endereço já está em uso"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Erro ao ler %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Um erro foi encontrado ao ler sua %s. Eles(as) não foram carregados(as), e o "
+"antigo arquivo foi renomeado para %s~."
+
 msgid "Internet Messenger"
 msgstr "Mensageiro da Internet"
 
@@ -10323,10 +10221,8 @@ msgstr "Notificar ao receber novos e_mails"
 msgid "Use this buddy _icon for this account:"
 msgstr "Usar este _ícone de exibição para esta conta:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Opções de %s"
+msgid "Ad_vanced"
+msgstr "_Avançado"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configurações de proxy do GNOME"
@@ -10361,9 +10257,6 @@ msgstr "Se você olhar bem de perto"
 msgid "you can see the butterflies mating"
 msgstr "você pode ver as borboletas acasalando-se"
 
-msgid "Proxy Options"
-msgstr "Opções de proxy"
-
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
@@ -10391,8 +10284,8 @@ msgstr "_Básico"
 msgid "Create _this new account on the server"
 msgstr "Criar es_ta nova conta no servidor"
 
-msgid "_Advanced"
-msgstr "_Avançado"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Ativado"
@@ -10421,7 +10314,7 @@ msgstr ""
 "novamente para configurar quantas contas quiser.\n"
 "\n"
 "Você pode voltar a esta janela para adicionar, alterar ou remover contas a "
-"partir do menu <b>Contas->Gerenciar Gontas</b> na janela da Lista de Amigos"
+"partir do menu <b>Contas->Gerenciar Contas</b> na janela da Lista de Amigos"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -10442,8 +10335,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Favor atualizar os campos necessários."
 
-msgid "Room _List"
-msgstr "_Lista de salas"
+msgid "A_ccount"
+msgstr "_Conta:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10452,8 +10345,8 @@ msgstr ""
 "Por favor digite as informações apropriadas sobre o bate-papo em que você "
 "gostaria de entrar.\n"
 
-msgid "_Account:"
-msgstr "_Conta:"
+msgid "Room _List"
+msgstr "_Lista de salas"
 
 msgid "_Block"
 msgstr "_Bloquear"
@@ -10470,6 +10363,15 @@ msgstr "Ver _info"
 msgid "I_M"
 msgstr "_MI"
 
+msgid "_Audio Call"
+msgstr "Ch_amada de Áudio"
+
+msgid "Audio/_Video Call"
+msgstr "Chamada de Áudio/_Vídeo"
+
+msgid "_Video Call"
+msgstr "Chamada de _vídeo"
+
 msgid "_Send File..."
 msgstr "_Enviar arquivo..."
 
@@ -10479,9 +10381,12 @@ msgstr "Adicionar _ação de usuário..."
 msgid "View _Log"
 msgstr "Ver _histórico"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Esconder quando desconectado"
 
+msgid "Show When Offline"
+msgstr "Mostrar quando desconectado"
+
 msgid "_Alias..."
 msgstr "_Apelidar..."
 
@@ -10501,7 +10406,7 @@ msgid "Add C_hat..."
 msgstr "Adicionar _bate-papo..."
 
 msgid "_Delete Group"
-msgstr "_Remover grupo"
+msgstr "Exclui_r grupo"
 
 msgid "_Rename"
 msgstr "_Renomear"
@@ -10605,6 +10510,9 @@ msgstr "/Ferramentas/Ações de _usuário"
 msgid "/Tools/_Certificates"
 msgstr "/Ferramentas/_Certificados"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Ferramentas/Smile_ys personalizados"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/Plu_gins"
 
@@ -10614,9 +10522,6 @@ msgstr "/Ferramentas/Pr_eferências"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-msgid "/Tools/Smile_y"
-msgstr "/Ferramentas/Smile_y"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de arquivo"
 
@@ -10734,8 +10639,8 @@ msgstr "Manualmente"
 msgid "By status"
 msgstr "Por status"
 
-msgid "By log size"
-msgstr "Por tamanho do histórico"
+msgid "By recent log activity"
+msgstr "Pela atividade de registro recente"
 
 #, c-format
 msgid "%s disconnected"
@@ -10751,6 +10656,9 @@ msgstr "Reconectar"
 msgid "Re-enable"
 msgstr "Re-ativar"
 
+msgid "SSL FAQs"
+msgstr "FAQs do SSL"
+
 msgid "Welcome back!"
 msgstr "Bem vindo de volta!"
 
@@ -10842,6 +10750,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Ape_lido:"
 
+msgid "_Group:"
+msgstr "_Grupo:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Entrar automaticamente ao conectar."
 
@@ -10875,6 +10786,103 @@ msgstr "/Ferramentas"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Cor do fundo"
+
+msgid "The background color for the buddy list"
+msgstr "A cor de fundo para sua lista de amigos."
+
+msgid "Layout"
+msgstr "Layout"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "O layout de ícones, nome e status da lista"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Cor do fundo expandido"
+
+msgid "The background color of an expanded group"
+msgstr "A cor de fundo de um grupo expandido"
+
+msgid "Expanded Text"
+msgstr "Texto Expandido"
+
+msgid "The text information for when a group is expanded"
+msgstr "A informação de texto para quando um grupo estiver expandido"
+
+msgid "Collapsed Background Color"
+msgstr "Cor de fundo colapsado"
+
+msgid "The background color of a collapsed group"
+msgstr "A cor de fundo de um grupo colapsado"
+
+msgid "Collapsed Text"
+msgstr "Texto colapsado"
+
+msgid "The text information for when a group is collapsed"
+msgstr "A informação de texto para quando um grupo for colapsado"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Cor de fundo do Contato/Bate-papo"
+
+msgid "The background color of a contact or chat"
+msgstr "A cor de fundo de um contato ou bate-papo"
+
+msgid "Contact Text"
+msgstr "Texto de contato"
+
+msgid "The text information for when a contact is expanded"
+msgstr "A informação de texto para quando um contato está expandido"
+
+msgid "On-line Text"
+msgstr "Texto de online"
+
+msgid "The text information for when a buddy is online"
+msgstr "A informação de texto para quando um contato está conectado"
+
+msgid "Away Text"
+msgstr "Texto de ausante"
+
+msgid "The text information for when a buddy is away"
+msgstr "A informação de texto para quando um contato está ausente"
+
+msgid "Off-line Text"
+msgstr "Texto de off-line"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "A informação de texto para quando um contato está desconectado"
+
+msgid "Idle Text"
+msgstr "Texto de inativo"
+
+msgid "The text information for when a buddy is idle"
+msgstr "A informação de texto para quando um contato está inativo"
+
+msgid "Message Text"
+msgstr "Texto de mensagem"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "A informação de texto para quando um contato tem uma mensagem não lida"
+
+msgid "Message (Nick Said) Text"
+msgstr "Mensagem texto (Apelido diz)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"A informação de texto para quando um bate-papo tem uma mensagem não lida que "
+"mensiona seu apelido"
+
+msgid "The text information for a buddy's status"
+msgstr "Informação de texto para o status de um amigo"
+
+msgid "Type the host name for this certificate."
+msgstr "Digite o nome de host para este certificado."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidores SSL"
@@ -10892,14 +10900,6 @@ msgstr "Você não está conectado com uma conta que permita convidar este amigo
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar amigo para sala de bate-papo"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Favor digitar o nome do usuário que você gostaria de convidar, junto com uma "
-"mensagem de convite opcional."
-
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
@@ -10928,7 +10928,7 @@ msgstr "Ignorar"
 msgid "Get Away Message"
 msgstr "Obter mensagem de ausência"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Última mensagem"
 
 msgid "Unable to save icon file to disk."
@@ -10974,6 +10974,18 @@ msgstr "/Conversa/_Salvar como..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpa_r"
 
+msgid "/Conversation/M_edia"
+msgstr "/Conv_ersa/M_ídia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Conversa/Ch_amada de áudio"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Conversa/Chamada de _vídeo"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Conversa/_Chamada de áudio/vídeio"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar arquivo..."
 
@@ -11046,6 +11058,15 @@ msgstr "/Conversa"
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver histórico"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Conversa/Chamada de áudio"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Conversa/Chamada de vídeo"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Conversa/Chamada de aúdio/vídeo"
+
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar arquivo..."
 
@@ -11229,6 +11250,9 @@ msgstr "Artista"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "voz e vídeo"
+
 msgid "support"
 msgstr "suporte"
 
@@ -11353,6 +11377,9 @@ msgstr "Hindu"
 msgid "Hungarian"
 msgstr "Húngaro"
 
+msgid "Armenian"
+msgstr "Armênio"
+
 msgid "Indonesian"
 msgstr "Bahasa Indonésia"
 
@@ -11368,6 +11395,9 @@ msgstr "Geórgio"
 msgid "Ubuntu Georgian Translators"
 msgstr "Tradutores do Ubuntu do idioma Geórgio"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "Canarês"
 
@@ -11446,6 +11476,9 @@ msgstr "Sinhala"
 msgid "Swedish"
 msgstr "Sueco"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11782,10 +11815,9 @@ msgstr "Cor a ser usada para desenhar os hyperlinks."
 msgid "Hyperlink visited color"
 msgstr "Cor do hyperlink visitado"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
-"Cor a ser usada para desenhar os hyperlinks quando já tiverem sido visitados "
-"(ou estiverem ativos)."
+"Cor para desenhar hiperlinks depois que eles foram visitados (ou ativados)."
 
 msgid "Hyperlink prelight color"
 msgstr "Cor do hyperlink sob o cursor"
@@ -11822,14 +11854,20 @@ msgstr "Cor para desenhar o nome de uma mensagem de ação."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Cor do Nome da Mensagem de Ação para Mensagem de Sussurro"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Cor para desenhar o nome de uma mensagem de ação."
+
 msgid "Whisper Message Name Color"
 msgstr "Cor do Nome das Mensagens de Sussurro"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Cor para desenhar o nome de uma mensagem sussurada."
+
 msgid "Typing notification color"
 msgstr "Cor da notificação de digitação"
 
-msgid "The color to use for the typing notification font"
-msgstr "Cor para utilizar na fonte da notificação de digitação"
+msgid "The color to use for the typing notification"
+msgstr "Cor para utilizar na notificação de digitação"
 
 msgid "Typing notification font"
 msgstr "Fonte da notificação da digitação"
@@ -11840,15 +11878,6 @@ msgstr "Fonte para se utilizar na notificação de digitação"
 msgid "Enable typing notification"
 msgstr "Habilitar notificação de digitação"
 
-msgid "_Copy Email Address"
-msgstr "_Copiar endereço de email"
-
-msgid "_Open Link in Browser"
-msgstr "_Abrir link no navegador"
-
-msgid "_Copy Link Location"
-msgstr "_Copiar endereço do link"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11890,11 +11919,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Salvar imagem"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "Exibir emoticons personalizados"
 
@@ -11984,9 +12011,6 @@ msgstr "Diminuir tamanho da fonte"
 msgid "Font Face"
 msgstr "Tipo da fonte"
 
-msgid "Background Color"
-msgstr "Cor do fundo"
-
 msgid "Foreground Color"
 msgstr "Cor da fonte"
 
@@ -12103,6 +12127,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12117,6 +12142,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    use o diretório DIR para os arquivos de configuração\n"
 "  -d, --debug         imprima mensagens de depuração para a saída padrão\n"
+"  -f, --force-online  força estar online, independente do status da rede\n"
 "  -h, --help          exiba esta ajuda e saia\n"
 "  -m, --multiple      permitir uso simultâneo de mais de uma instância\n"
 "  -n, --nologin       não conecte automaticamente\n"
@@ -12133,6 +12159,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12146,6 +12173,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    use o diretório DIR para os arquivos de configuração\n"
 "  -d, --debug         imprima mensagens de depuração para a saída padrão\n"
+"  -f, --force-online  força estar online, independente do status da rede\n"
 "  -h, --help          exiba esta ajuda e saia\n"
 "  -m, --multiple      permitir uso simultâneo de mais de uma instância\n"
 "  -n, --nologin       não conecte automaticamente\n"
@@ -12192,11 +12220,22 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Saindo porque outro cliente libpurple já está sendo executado.\n"
 
-msgid "Open All Messages"
-msgstr "Abrir todas as mensagens"
+msgid "/_Media"
+msgstr "/_Mídia"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Você tem email!</span>"
+msgid "/Media/_Hangup"
+msgstr "/Mídia/Colocar no gancho"
+
+msgid "Calling..."
+msgstr "Chamando..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s quer começar uma sessão de aúdio/vídeo com você."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s quer iniciar uma sessão de vídeo com você."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12227,6 +12266,24 @@ msgstr ""
 "A opção de comando do navegador 'Manual' foi escolhida, mas nenhum comando "
 "foi definido."
 
+msgid "No message"
+msgstr "Sem mensagem"
+
+msgid "Open All Messages"
+msgstr "Abrir todas as mensagens"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Você tem email!</span>"
+
+msgid "New Pounces"
+msgstr "Nova ação de usuário"
+
+msgid "Dismiss"
+msgstr "Dispensar"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Você recebeu uma ação!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Os plug-ins a seguir serão descarregados."
 
@@ -12275,10 +12332,16 @@ msgstr "<b>Detalhes do plug-in</b>"
 msgid "Select a file"
 msgstr "Selecione um arquivo"
 
+msgid "Modify Buddy Pounce"
+msgstr "Modificar ação de usuário"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Quem terá a ação"
 
+msgid "_Account:"
+msgstr "_Conta:"
+
 msgid "_Buddy name:"
 msgstr "_Nome do amigo:"
 
@@ -12345,8 +12408,58 @@ msgstr "_Recorrente"
 msgid "Pounce Target"
 msgstr "Alvo da ação"
 
-msgid "Smiley theme failed to unpack."
-msgstr "O tema de emoticons não pôde ser descompactado."
+#, c-format
+msgid "Started typing"
+msgstr "Começou a digitar"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Pausado enquanto digitava"
+
+#, c-format
+msgid "Signed on"
+msgstr "Conectou"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Saiu da inatividade"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Voltou da ausência"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Parou de digitar"
+
+#, c-format
+msgid "Signed off"
+msgstr "Desconectou"
+
+#, c-format
+msgid "Became idle"
+msgstr "Tornar-se inativo"
+
+#, c-format
+msgid "Went away"
+msgstr "Ausentou-se"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Enviou uma mensagem"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Desconhecido.... Por favor nos avise disso!"
+
+msgid "Theme failed to unpack."
+msgstr "O tema não pôde ser descompactado."
+
+msgid "Theme failed to load."
+msgstr "O tema de emoticons não pôde ser carregado."
+
+msgid "Theme failed to copy."
+msgstr "O tema de emoticons não pôde ser copiado."
 
 msgid "Install Theme"
 msgstr "Instalar tema"
@@ -12367,6 +12480,11 @@ msgstr "Atalhos de Teclado"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Fechar C_onversas com a Tecla Esc"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Tema da Lista de amigos"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ícone da bandeja"
 
@@ -12376,8 +12494,8 @@ msgstr "Mo_strar ícone da bandeja"
 msgid "On unread messages"
 msgstr "Para as mensagens não lidas"
 
-msgid "Conversation Window Hiding"
-msgstr "Quando esconder as janelas de conversa"
+msgid "Conversation Window"
+msgstr "Janela de conversa"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Esconder novas conversas de MI:"
@@ -12385,6 +12503,9 @@ msgstr "_Esconder novas conversas de MI:"
 msgid "When away"
 msgstr "Quando ausente"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zar novas janelas de conversa"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Abas"
@@ -12443,9 +12564,6 @@ msgstr "Usar rolagem suave"
 msgid "F_lash window when IMs are received"
 msgstr "_Piscar a janela quando mensagens forem recebidas"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zar novas janelas de conversa"
-
 msgid "Minimum input area height in lines:"
 msgstr "Altura da área minima de entrada em linhas:"
 
@@ -12477,14 +12595,12 @@ msgstr "Não foi possível iniciar o programa de configuração do proxy."
 msgid "Cannot start browser configuration program."
 msgstr "Não foi possível iniciar o programa de configuração do navegador."
 
-msgid "ST_UN server:"
-msgstr "_Servidor ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "Detectar endereço IP _automaticamente"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Usar endereço de IP _automaticamente detectado: %s"
 
 msgid "Public _IP:"
 msgstr "_IP público:"
@@ -12504,6 +12620,10 @@ msgstr "Porta _inicial:"
 msgid "_End port:"
 msgstr "Porta _final:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Servidor de Relay (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor proxy &amp; navegador"
 
@@ -12694,12 +12814,12 @@ msgstr "Quando ausente e inativo"
 msgid "Auto-away"
 msgstr "Auto-ausente"
 
-msgid "Change status when _idle"
-msgstr "Mudar status após _inatividade"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de tornar inativo:"
 
+msgid "Change status when _idle"
+msgstr "Mudar status após _inatividade"
+
 msgid "Change _status to:"
 msgstr "Mudar status para:"
 
@@ -12851,47 +12971,44 @@ msgstr "Sal_var e usar"
 msgid "Status for %s"
 msgstr "Status de %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Um emoticon personalizado para o '%s' já existe. Por favor, use um atalho "
+"diferente."
+
 msgid "Custom Smiley"
 msgstr "Emoticon personalizado"
 
-msgid "More Data needed"
-msgstr "Mais dados necessários"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Por favor, defina um atalho para associar com o emoticon."
-
 msgid "Duplicate Shortcut"
 msgstr "Atalho duplicado"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Um emoticon personalizado para o atalho selecionado já existe. Por favor, "
-"forneça um atalho diferente."
-
-msgid "Please select an image for the smiley."
-msgstr "Por favor, favor selecione uma imagem para o emoticon."
-
 msgid "Edit Smiley"
 msgstr "Editar Emoticon"
 
 msgid "Add Smiley"
 msgstr "Adicionar Emoticon"
 
-msgid "Smiley _Image"
-msgstr "_Imagem do Emoticon"
+msgid "_Image:"
+msgstr "Ima_gem:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Atalhos de Emoticon"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "Texto de Atal_ho:"
 
 msgid "Smiley"
 msgstr "Emoticon"
 
+msgid "Shortcut Text"
+msgstr "Texto de Atalho"
+
 msgid "Custom Smiley Manager"
 msgstr "Gerenciador de emoticons personalizados"
 
+msgid "Select Buddy Icon"
+msgstr "Selecionar Ícone do amigo"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Clique para alterar seu ícone de exibição para esta conta."
 
@@ -12977,8 +13094,8 @@ msgid "Cannot send launcher"
 msgstr "Não é possível enviar atalhos"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Você arrastou um atalho da área de trabalho. Provavelmente você queria "
 "enviar o destino do atalho, e não o atalho em si."
@@ -13014,9 +13131,30 @@ msgstr ""
 "Falha ao carregar imagem '%s': motivo desconhecido, provavelmente o arquivo "
 "de imagem está corrompido"
 
+msgid "_Open Link"
+msgstr "_Abrir link"
+
+msgid "_Copy Link Location"
+msgstr "_Copiar endereço do link"
+
+msgid "_Copy Email Address"
+msgstr "_Copiar endereço de email"
+
+msgid "_Open File"
+msgstr "Abrir arquivo"
+
+msgid "Open _Containing Directory"
+msgstr "Abrir diretório contendo"
+
 msgid "Save File"
 msgstr "Salvar arquivo"
 
+msgid "_Play Sound"
+msgstr "Tocar Som"
+
+msgid "_Save File"
+msgstr "_Salvar arquivo"
+
 msgid "Select color"
 msgstr "Selecionar cor"
 
@@ -13105,6 +13243,66 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 "Mostrar informações estatísticas sobre a disponibilidade de seus amigos"
 
+msgid "Server name request"
+msgstr "Endereço do servidor"
+
+msgid "Enter an XMPP Server"
+msgstr "Entrar num servidor de XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Selecione um servidor de SMTP para consultar"
+
+msgid "Find Services"
+msgstr "Encontrar serviços"
+
+msgid "Add to Buddy List"
+msgstr "Adicionar à lista de amigos"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Directory"
+msgstr "Diretório"
+
+msgid "PubSub Collection"
+msgstr "Coleção PubSub"
+
+msgid "PubSub Leaf"
+msgstr "Folha PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descrição</b>"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Descoberta de Serviços"
+
+msgid "_Browse"
+msgstr "Navegar:"
+
+msgid "Server does not exist"
+msgstr "Servidor não existe"
+
+msgid "Server does not support service discovery"
+msgstr "O servidor não tem suporte à descoberta de serviços"
+
+msgid "XMPP Service Discovery"
+msgstr "Descoberta de serviços XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Permite navegação e serviços de registro."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Este plug-in é útil para registrar com transportes legados ou outros "
+"serviços XMPP."
+
 msgid "Buddy is idle"
 msgstr "O amigo estiver inativo"
 
@@ -13505,11 +13703,11 @@ msgstr "Plug-in de conversa musical para composição colaborativa."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
-"O plug-in de conversa musical permite que vários usuários trabalhem "
-"simultaneamente numa composição musical editando uma partitura comum em "
-"tempo real."
+"O Plug-in Music Messaging permite a um número de usuários trabalharem "
+"simultaneamente num trecho de música editando uma partitura comum em tempo "
+"real."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -13619,12 +13817,6 @@ msgstr ""
 "- Manda uma mensagem para as pessoas na sua lista imediatamente quando elas "
 "se conectam"
 
-msgid "Cursor Color"
-msgstr "Cor do cursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Cor do cursor secundário"
-
 msgid "Hyperlink Color"
 msgstr "Cor do hyperlink"
 
@@ -13634,6 +13826,9 @@ msgstr "Cor do hyperlink visitado"
 msgid "Highlighted Message Name Color"
 msgstr "Cor do Nome de Mensagens Realçadas"
 
+msgid "Typing Notification Color"
+msgstr "Cor da notificação de digitação"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separação horizontal do GtkTreeView"
 
@@ -13663,35 +13858,21 @@ msgstr "Fonte da interface do GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atalhos do GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "_Cores da interface"
+msgid "Disable Typing Notification Text"
+msgstr "Desabilitar notificação de digitação"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Preferências do controle do tema do GTK+"
 
-msgid "Widget Sizes"
-msgstr "Tamanho dos controles"
+msgid "Colors"
+msgstr "Cores"
 
 msgid "Fonts"
 msgstr "Fontes"
 
+msgid "Miscellaneous"
+msgstr "Miscelânias"
+
 msgid "Gtkrc File Tools"
 msgstr "Ferramentas do gtkrc"
 
@@ -13777,10 +13958,10 @@ msgstr "Botão de Enviar da Janela de Conversa."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
-"Adiciona um botão Enviar na área de entrada da janela de conversação. "
-"Idealpara quando nenhum teclado físico está presente."
+"Adiciona um botão Enviar na área de entrada da janela de conversação. Ideal "
+"para quando nenhum teclado físico está presente."
 
 msgid "Duplicate Correction"
 msgstr "Correção duplicada"
@@ -13835,6 +14016,95 @@ msgstr ""
 "Substitui texto nas mensagens enviadas de acordo com regras definidas pelo "
 "usuário."
 
+msgid "Just logged in"
+msgstr "Acabou de conectar-se"
+
+msgid "Just logged out"
+msgstr "Acabou de desconectar-se"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Ícone para Contato/\n"
+"Ícone para pessoa desconhecida"
+
+msgid "Icon for Chat"
+msgstr "Ícone para bate-papo"
+
+msgid "Ignored"
+msgstr "Ignorado"
+
+msgid "Founder"
+msgstr "Fundador"
+
+msgid "Operator"
+msgstr "Operador"
+
+msgid "Half Operator"
+msgstr "Operador parcial"
+
+msgid "Authorization dialog"
+msgstr "Diálogo de autorização"
+
+msgid "Error dialog"
+msgstr "Diálogo de erro"
+
+msgid "Information dialog"
+msgstr "Diálogo de informações"
+
+msgid "Mail dialog"
+msgstr "Diálogo de correio"
+
+msgid "Question dialog"
+msgstr "Diálogo de questão"
+
+msgid "Warning dialog"
+msgstr "Diálogo de alerta"
+
+msgid "What kind of dialog is this?"
+msgstr "Que tipo de diálogo é esse?"
+
+msgid "Status Icons"
+msgstr "Ícones de Status"
+
+msgid "Chatroom Emblems"
+msgstr "Emblema de sala de bate-papo"
+
+msgid "Dialog Icons"
+msgstr "Ícone de diálogo"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Editor de tema de Ícone do Pidgin"
+
+msgid "Contact"
+msgstr "Contato"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Editor de tema da Lista de amigos do Pidgin"
+
+msgid "Edit Buddylist Theme"
+msgstr "Editar tema da Lista de amigos"
+
+msgid "Edit Icon Theme"
+msgstr "Editar tema de ícones"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Editor de tema do Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Editor de tema do Pidgin."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14004,10 +14274,10 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Opções específicas do Pidgin para Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Fornece opções específicas do Pidgin para Windows, como ancoramento da lista "
-"de amigos."
+"Fornece opções específicas do Pidgin para Windows, como encaixamento da "
+"lista de amigos."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "\"<font color='#777777'>Desconectado.</font>"
@@ -14046,6 +14316,525 @@ msgstr "Envia e recebe comandos (stanzas) do XMPP puros."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "Servidor de conexão BOSH inválido"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Não foi possível não carregar par de chaves SILC"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s rejeitou seu convite para uma conferência na sala \"%s\" porque \"%s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Convite rejeitado"
+
+#~ msgid "_Proxy"
+#~ msgstr "_Proxy"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Não foi possível abrir socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Não foi possível escutar no socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Não foi possível ler do socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Falha na conexão."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "O servidor desconectou"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Não foi possível criar socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Não foi possível conectar ao host"
+
+#~ msgid "Read error"
+#~ msgstr "Erro de leitura"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível estabelecer conexão com o servidor:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Erro ao enviar"
+
+#~ msgid "Last Activity"
+#~ msgstr "Última atividade"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Informações da localização de serviços"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Itens da localização de serviços"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Endereçamento de Stanza estendido"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Bate-papo multiusuário"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Informações estendidas de presença em bate-papos multiusuário"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Bytestreams In-Band"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Comandos ad-hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Serviço PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Bytestreams via SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Suporte a dados 'out of band'"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Registro 'In-Band'"
+
+#~ msgid "User Location"
+#~ msgstr "Localização do usuário"
+
+#~ msgid "User Avatar"
+#~ msgstr "Imagem de exibição do usuário"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notificações do status do bate-papo"
+
+#~ msgid "Software Version"
+#~ msgstr "Versão do software"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Inicialização de fluxoOrientação"
+
+#~ msgid "User Mood"
+#~ msgstr "Humor do usuário"
+
+#~ msgid "User Activity"
+#~ msgstr "Atividade do usuário"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Recursos do usuário"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negociação de sessão criptografada"
+
+#~ msgid "User Tune"
+#~ msgstr "Música do usuário"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Troca de itens da lista de amigos"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Endereço de contato"
+
+#~ msgid "User Profile"
+#~ msgstr "Perfil do usuário"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Áudio do Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Apelido do usuário"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ECI UDP do Jingle"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ECI TCP do Jingle"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "UDP puro do Jingle"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Vídeo do Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Discagem a tom do Jingle"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Recibos de mensagem"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publicação de chave pública"
+
+#~ msgid "User Chatting"
+#~ msgstr "Notificação de bate-papos"
+
+#~ msgid "User Browsing"
+#~ msgstr "Notificação de onde está navegando"
+
+#~ msgid "User Gaming"
+#~ msgstr "Notificação do que está jogando"
+
+#~ msgid "User Viewing"
+#~ msgstr "Notificação do que está assistindo"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Criptografia de Stanza"
+
+#~ msgid "Entity Time"
+#~ msgstr "Informações de horário"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Entrega atrasada"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Objetos de dados colaborativos"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Compartilhamento e repositório de arquivos"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Serviço de descoberta STUN para o Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negociação de sessão criptografada simplificada"
+
+#~ msgid "Hop Check"
+#~ msgstr "Verificação de saltos"
+
+#~ msgid "Read Error"
+#~ msgstr "Erro de leitura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Não foi possível conectar ao servidor."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Buffer de leitura cheio (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Mensagem impossível de ser processada"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Não foi possível conectar ao host: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "A conexão falhou (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Você foi desconectado porque conectou em outra estação de trabalho."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Erro. O suporte a SSL não está instalado."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Senha incorreta."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível conectar ao servidor BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Você pode ser desconectado daqui a pouco. Verifique atualizações em %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Não foi possível conectar"
+
+#~ msgid "Invalid username."
+#~ msgstr "Nome de usuário inválido."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Não foi possível decodificar a resposta do servidor"
+
+#~ msgid "Connection lost"
+#~ msgstr "Conexão perdida"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Não foi possível resolver ao host"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Conexão fechada (escrevendo)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Conexão redefinida"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Erro ao ler do socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Não foi possível conectar ao servidor."
+
+#~ msgid "Could not write"
+#~ msgstr "Não foi possível enviar"
+
+#~ msgid "Could not connect"
+#~ msgstr "Não foi possível conectar"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Não foi possível criar socket de escuta"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Não foi possível resolver host"
+
+#~ msgid "Incorrect Password"
+#~ msgstr "Senha incorreta"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível estabelecer conexão com %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japão"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Servidor japonês do pager"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Servidor japonês de transferência de arquivo"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Perdida conexão com servidor\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Não foi possível resolver host"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Não foi possível conectar-se a %s: o servidor requer TLS/SSL, mas nenhum "
+#~ "suporte a TLS/SSL foi encontrado."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Quando esconder as janelas de conversa"
+
+#~ msgid "More Data needed"
+#~ msgstr "Mais dados necessários"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Por favor, defina um atalho para associar com o emoticon."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Por favor, favor selecione uma imagem para o emoticon."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Ativar qual ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Cor do cursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Cor do cursor secundário"
+
+#~ msgid "Interface colors"
+#~ msgstr "_Cores da interface"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Tamanho dos controles"
+
+#~ msgid "Invite message"
+#~ msgstr "Mensagem de convite"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Por favor, digite o nome do usuário que você gostaria de\n"
+#~ " convidar, junto com uma mensagem de convite opcional."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Procurando por %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Conexão para %s falhou"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Conectando: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Não foi possível escrever arquivo %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Não foi possível ler arquivo %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Mensagem muito extensa, últimos %s bytes truncados."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s não está conectado no momento."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Alertar %s não é permitido."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "Uma mensagem foi descartada, você está excedendo o limite de velocidade "
+#~ "do servidor."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Bate-papo não disponível em %s."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Você está mandando mensagens muito rapidamente para %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr ""
+#~ "Você perdeu uma mensagem instantânea de %s porque ela era muito extensa."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Você perdeu uma mensagem de mensagem instantânea de %s porque ela foi "
+#~ "enviada muito rapidamente."
+
+#~ msgid "Failure."
+#~ msgstr "Falha."
+
+#~ msgid "Too many matches."
+#~ msgstr "Excesso de resultados."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Necessários mais qualificadores."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Serviço de diretório temporariamente indisponível."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Pesquisa por email restrita."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Palavra-chave ignorada."
+
+#~ msgid "No keywords."
+#~ msgstr "Nenhuma palavra-chave."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Usuário não tem informação de diretório."
+
+#~ msgid "Country not supported."
+#~ msgstr "País não suportado."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Falha desconhecida: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Nome de usuário ou senha incorreto(a)."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "O serviço está temporariamente indisponível."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr ""
+#~ "Seu nível de alerta é alto demais para que você possa se conectar no "
+#~ "momento."
+
+#~ 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 ""
+#~ "Você esteve conectando e desconectando com muita freqüência. Espere dez "
+#~ "minutos e tente novamente. Se você continuar tentando, vai ter que "
+#~ "esperar ainda mais."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Um erro desconhecido ocorreu ao conectar: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Um erro desconhecido, %d, ocorreu. Informações: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Nome de grupo inválido"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Conexão fechada"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Esperando resposta..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "O TOC voltou de sua pausa. Agora você pode mandar mensagens novamente."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Mudança de senha efetuada com sucesso"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Ver informações de diretório"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Definir informações de diretório"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Não foi possível abrir %s para escrita!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Transferência de arquivo falhou; o outro lado provavelmente cancelou-a."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Não foi possível conectar para transferência."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr ""
+#~ "Não foi possível escrever cabeçalho de arquivo. O arquivo não será "
+#~ "transferido."
+
+#~ msgid "Save As..."
+#~ msgstr "Salvar como..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s pede a %s para aceitar %d arquivo: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s pede a %s para aceitar %d arquivos: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s pede a você para enviar um arquivo a ele"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Plug-in do protocolo TOC"
+
+#~ msgid "%s Options"
+#~ msgstr "Opções de %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Opções de proxy"
+
+#~ msgid "By log size"
+#~ msgstr "Por tamanho do histórico"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Abrir link no navegador"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "_Servidor ST_UN:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "_Imagem do Emoticon"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Atalhos de Emoticon"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Falha ao obter catálogo de endereços do MSN"
 
@@ -14305,9 +15094,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ msgstr ""
 #~ "Seu pedido de entrada no grupo %d foi aprovado pelo administrador %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Este grupo foi adicionado à sua lista de amigos."
-
 #~ msgid "I am applying to join"
 #~ msgstr "Estou solicitando entrada"
 
@@ -14341,9 +15127,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Não foi possível conectar, verifique o log de depuração."
 
-#~ msgid "Unable to login"
-#~ msgstr "Não foi possível fazer o login"
-
 #~ msgid "Failed room reply"
 #~ msgstr "Resposta da sala falhou"
 
@@ -14390,9 +15173,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(obtendo)</i>"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Erro ao solicitar token de conexão"
-
 #~ msgid "TCP Address"
 #~ msgstr "Endereço TCP"
 
@@ -14437,14 +15217,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ "Desculpe, senhas com mais de %d caracteres (a sua possui %d) não são "
 #~ "suportadas pelo MySpace."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Favor visitar http://e<ditprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username e escolher um nome de usuário e tentar "
-#~ "conectar novamente."
-
 #~ msgid "Screen name sent"
 #~ msgstr "Nome de usuário enviado"
 
@@ -14486,9 +15258,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ "apelido para o amigo. O apelido será exibido no lugar do nome do usuário "
 #~ "sempre que possível.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Conta:"
-
 #~ msgid "User has typed something and stopped"
 #~ msgstr "O usuário digitou algo e parou"
 
diff --git a/po/ro.po b/po/ro.po
index 7b6fb20ccb..41efb1beb2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,14 +1,15 @@
 # Pidgin Romanian translation
 # This file is distributed under the same license as the Pidgin package.
-# Copyright (C) 2002-2008, Mișu Moldovan <dumol@gnome.ro>
+# 2002-2009, Mișu Moldovan <dumol@gnome.ro>
+# 2009, Andrei Popescu <andreimpopescu@gmail.com>
 # Contributions: 2007, Alexandru Szasz <alexxed@gmail.com>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin-2.5.3\n"
+"Project-Id-Version: pidgin-2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 09:58-0500\n"
-"PO-Revision-Date: 2009-01-07 00:42+0200\n"
+"POT-Creation-Date: 2009-08-08 09:57-0400\n"
+"PO-Revision-Date: 2009-08-13 01:42+0300\n"
 "Last-Translator: Mișu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +33,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -610,19 +611,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Trimite către"
 
-msgid "Invite message"
-msgstr "Mesaj de invitare"
-
-msgid "Invite"
-msgstr "Invită"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Introduceți numele utilizatorului pe care doriți să-l invitați.\n"
-"Puteți adăuga un mesaj de invitare opțional."
-
 msgid "Conversation"
 msgstr "Discuție"
 
@@ -884,6 +872,39 @@ msgstr "Toate discuțiile"
 msgid "System Log"
 msgstr "Înregistrări de sistem"
 
+msgid "Calling ... "
+msgstr "Se apelează..."
+
+msgid "Hangup"
+msgstr "Închide"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Acceptare"
+
+msgid "Reject"
+msgstr "Respingere"
+
+msgid "Call in progress."
+msgstr "Apel în curs."
+
+msgid "The call has been terminated."
+msgstr "Apelul a fost încheiat."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s dorește să inițieze o sesiune audio."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s încearcă să inițieze o sesiune media nesuportată."
+
+msgid "You have rejected the call."
+msgstr "Ați refuzat apelul"
+
+msgid "call: Make an audio call."
+msgstr "apelează: inițiază un apel audio"
+
 msgid "Emails"
 msgstr "Mailuri"
 
@@ -919,6 +940,9 @@ msgstr "Continuă"
 msgid "IM"
 msgstr "Mesaj"
 
+msgid "Invite"
+msgstr "Invită"
+
 msgid "(none)"
 msgstr "(nimic)"
 
@@ -1167,7 +1191,6 @@ msgstr "Minute înaintea schimbării statusului:"
 msgid "Change status to"
 msgstr "Schimbă statusul în:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Discuții"
 
@@ -1346,7 +1369,7 @@ msgid "Use"
 msgstr "Activare"
 
 msgid "Invalid title"
-msgstr "Titlu invalid"
+msgstr "Titlu nevalid"
 
 msgid "Please enter a non-empty title for the status."
 msgstr "Introduceți un titlu de cel puțin un caracter pentru status."
@@ -1450,7 +1473,7 @@ msgid "Beep too!"
 msgstr "Fă și zgomot!"
 
 msgid "Set URGENT for the terminal window."
-msgstr "Schimbă starea fereastrei terminalului în URGENT"
+msgstr "Schimbă starea ferestrei terminalului în URGENT"
 
 msgid "GntGf"
 msgstr "GntGf"
@@ -1533,6 +1556,29 @@ msgstr "GntLastLog"
 msgid "Lastlog plugin."
 msgstr "Modul Lastlog."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Se creează un TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Creează TinyURL numai pentru URL-uri de această lungime sau mai mari"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Prefixul adresei TinyURL (sau altceva)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Modul TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "Când primiți un mesaj cu URL-uri, folosiți TinyURL pentru copiere mai ușoară"
+
 msgid "accounts"
 msgstr "conturi"
 
@@ -1633,41 +1679,40 @@ msgstr "Acceptați certificatul pentru %s?"
 msgid "SSL Certificate Verification"
 msgstr "Verificare certificat SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Acceptare"
-
-msgid "Reject"
-msgstr "Respingere"
-
 msgid "_View Certificate..."
 msgstr "_Vizualizare certificat..."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
-"Certificatul prezentat de „%s” este semnat în nume propriu. Nu poate fi "
-"verificat automat."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "Lanțul de certificare prezentat de %s nu este valid."
+"Certificatul prezentat de „%s” pretinde însă că e de la „%s”. Aceast ar "
+"putea însemna că nu vă conectați la serviciul la care credeți că vă "
+"conectați."
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Eroare în certificatul SSL"
 
 msgid "Invalid certificate chain"
-msgstr "Lanț de certificare invalid"
+msgstr "Lanț de certificare nevalid"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1676,6 +1721,21 @@ msgstr ""
 "Nu aveți o bază de date de certificate root, deci acest certificat nu poate "
 "fi validat."
 
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Certificatul prezentat de „%s” este semnat în nume propriu. Nu poate fi "
+"verificat automat."
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "Lanțul de certificare prezentat de %s nu este valid."
+
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1693,20 +1753,7 @@ msgstr ""
 "la autoritatea de certificare cu care pretinde că a fost creat."
 
 msgid "Invalid certificate authority signature"
-msgstr "Semnătura invalidă de la autoritatea de certificare"
-
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Certificatul prezentat de „%s” pretinde însă că e de la „%s”. Aceast ar "
-"putea însemna că nu vă conectați la serviciul la care credeți că vă "
-"conectați."
+msgstr "Semnătură nevalidă de la autoritatea de certificare"
 
 #. Make messages
 #, c-format
@@ -1743,6 +1790,8 @@ msgstr "+++ %s s-a autentificat"
 msgid "+++ %s signed off"
 msgstr "+++ %s s-a deconectat"
 
+#. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "Eroare necunoscută"
 
@@ -1789,6 +1838,17 @@ msgstr "%s a ieșit din chat."
 msgid "%s left the room (%s)."
 msgstr "%s a ieșit din chat (%s)."
 
+msgid "Invite to chat"
+msgstr "Invită într-un chat"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Introduceți numele utilizatorului pe care doriți să-l invitați. Puteți "
+"adăuga un mesaj de invitare opțional."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Conectare eșuată: %s"
@@ -1833,6 +1893,7 @@ msgstr ""
 "Eroare la citirea de la procesul „resolver”:\n"
 "%s"
 
+#, c-format
 msgid "Resolver process exited without answering our request"
 msgstr "Rezoluția de nume s-a terminat fără a se răspunde cererii"
 
@@ -1919,6 +1980,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Se inițiază transferul fișierului %s de la %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Transferul fișierului <A HREF=\"file://%s\">%s</A> s-a terminat"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transferul fișierului %s s-a terminat"
 
@@ -2141,6 +2206,9 @@ msgstr "<font color=\"red\"><b>Nu s-a putut citi fișierul: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Răspuns-Automat>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Eroare la inițierea conferinței"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Utilizați %s, dar acest modul necesită %s."
@@ -2460,8 +2528,8 @@ msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
-"Sunteți momentan deconectat(ă). Nu veți mai primi mesaje până la următoarea "
-"autentificare."
+"Contul vă este momentan deconectat. Nu veți mai primi mesaje până la "
+"următoarea autentificare."
 
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Mesajul nu a putut fi trimis pentru că a depășit mărimea maximă."
@@ -2543,14 +2611,13 @@ msgstr "Importă înregistrările altor clienți IM."
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "La consultarea înregistrărilor, acest modul va include înregistrările din "
-"alți clienți IM precum: Adium, Fire, Messenger Plus!, MSN Messenger și "
-"Trillian.\n"
+"alți clienți IM precum: Adium, MSN Messenger, aMSN și Trillian.\n"
 "\n"
 "Atenție! Acest modul este în stadiu alpha și e instabil."
 
@@ -2598,11 +2665,11 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "Salvează ca întâmpinare mesajele trimise unui utilizator deconectat."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Restul de mesaje vor fi salvate ca întâmpinare. Puteți apoi edita sau șterge "
-"întâmpinarea din fereastra de editare a întâmpinărilor."
+"întâmpinarea din fereastra „Întâmpinări contacte”."
 
 #, c-format
 msgid ""
@@ -2632,6 +2699,34 @@ msgstr "Salvează mesajele offline într-o întâmpinare"
 msgid "Do not ask. Always save in pounce."
 msgstr "Nu întreba. Salvează într-o întâmpinare întotdeauna."
 
+msgid "One Time Password"
+msgstr "Parolă de unică folosință"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Suport pentru parole de unică folosință"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Impune ca parolele să fie folosite o singură dată"
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Vă permite să impuneți pentru fiecare cont ca parolele ce nu sunt salvate "
+"să fie folosite pentru o singură conectare cu succes.\n"
+"Notă: Parola contului trebuie să nu fie salvată pentru a funcționa."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2824,21 +2919,19 @@ msgstr ""
 "instalați ActiveTCL de la http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Nu s-a găsit Apple Bonjour pentru Windows, pentru detalii consultați: http://"
 "d.pidgin.im/BonjourWindows ."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
-"Utilizarea interfaței de rețea pentru a detecta noi conexiuni IM a eșuat\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Nu se poate asculta pentru noi conexiuni IM"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Nu se poate deschide o conexiune cu serverul local mDNS. E pornit?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Prenume"
 
@@ -2870,6 +2963,10 @@ msgstr "Modul de protocol Bonjour"
 msgid "Purple Person"
 msgstr "Persoană Purple"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "Port local"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2880,26 +2977,31 @@ msgstr "%s a încheiat discuția."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nu s-a putut trimite mesajul, discuția nu a putut fi inițiată."
 
-msgid "Cannot open socket"
-msgstr "Nu s-a putut deschide un socket"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Nu s-a putut crea un socket: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Nu se poate face bind pentru socket pe port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Nu s-a putut lega socketul de port: %s"
 
-msgid "Could not listen on socket"
-msgstr "Nu se poate asculta pe socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Nu se poate asculta la socketul: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Eroare de comunicare locală cu mDNSResponder."
 
 msgid "Invalid proxy settings"
-msgstr "Opțiuni proxy invalide"
+msgstr "Opțiuni proxy greșite"
 
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"Numele serverului sau portul precizat pentru tipul proxy-ului sunt invalide."
+"Numele serverului sau portul precizat pentru tipul proxy-ului sunt greșite."
 
 msgid "Token Error"
 msgstr "Eroare verificare"
@@ -2935,14 +3037,14 @@ msgstr "Salvează lista de contacte..."
 msgid "Load buddylist from file..."
 msgstr "Încarcă lista de contacte din fișierul..."
 
-msgid "Fill in the registration fields."
-msgstr "Completați câmpurile de înregistrare."
+msgid "You must fill in all registration fields"
+msgstr "Trebuie să completați toate câmpurile de înregistrare."
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "Parolele nu se potrivesc."
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Noul cont nu poate fi înregistrat. A intervenit o eroare.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Noul cont nu poate fi înregistrat. A intervenit o eroare necunoscută."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Noul cont Gadu-Gadu a fost înregistrat"
@@ -2953,14 +3055,14 @@ msgstr "Înregistrare terminată cu succes!"
 msgid "Password"
 msgstr "Parolă"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Confirmare parolă"
 
-msgid "Enter current token"
-msgstr "Introduceți verificarea curentă"
+msgid "Enter captcha text"
+msgstr "Introduceți textul captcha"
 
-msgid "Current token"
-msgstr "Verificare curentă"
+msgid "Captcha"
+msgstr "Imagine captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Înregistrare cont nou Gadu-Gadu"
@@ -3013,6 +3115,15 @@ msgstr "Parola a fost schimbată cu succes!"
 msgid "Current password"
 msgstr "Parolă curentă"
 
+msgid "Password (retype)"
+msgstr "Confirmare parolă"
+
+msgid "Enter current token"
+msgstr "Introduceți verificarea curentă"
+
+msgid "Current token"
+msgstr "Verificare curentă"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduceți parola curentă și pe cea nouă pentru UIN-ul: "
 
@@ -3026,6 +3137,7 @@ msgstr "Selectați un chat pentru contactul: %s"
 msgid "Add to chat..."
 msgstr "Adăugare în chat..."
 
+#. Global
 msgid "Available"
 msgstr "Disponibil"
 
@@ -3059,7 +3171,7 @@ msgstr "Nu s-au găsit utilizatori care să corespundă"
 msgid "There are no users matching your search criteria."
 msgstr "Nu există utilizatori care să se potrivească termenilor căutării."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Nu se poate citi din socket"
 
 msgid "Buddy list downloaded"
@@ -3074,8 +3186,14 @@ msgstr "Listă de contacte stocată"
 msgid "Your buddy list was stored on the server."
 msgstr "Lista de contacte v-a fost stocată pe server."
 
-msgid "Connection failed."
-msgstr "Conexiunea a eșuat."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Conectat"
+
+msgid "Connection failed"
+msgstr "Conexiunea a eșuat"
 
 msgid "Add to chat"
 msgstr "Adaugă în chat"
@@ -3083,13 +3201,22 @@ msgstr "Adaugă în chat"
 msgid "Chat _name:"
 msgstr "_Nume chat:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Nu se poate rezolva numele calculatorului '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Autentificare"
+
 msgid "Chat error"
 msgstr "Eroare de chat"
 
 msgid "This chat name is already in use"
 msgstr "Există deja un chat cu acest nume"
 
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "Neconectat la server."
 
 msgid "Find buddies..."
@@ -3131,6 +3258,9 @@ msgstr "Protocol popular în Polonia"
 msgid "Gadu-Gadu User"
 msgstr "Utilizator Gadu-Gadu"
 
+msgid "GG server"
+msgstr "Server GG"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comandă necunoscută: %s"
@@ -3145,8 +3275,8 @@ msgstr "Nu există topic"
 msgid "File Transfer Failed"
 msgstr "Transferul fișierului a eșuat"
 
-msgid "Could not open a listening port."
-msgstr "Nu s-a putut deschide un port pentru a asculta."
+msgid "Unable to open a listening port."
+msgstr "Nu s-a putut deschide un port pentru ascultare."
 
 msgid "Error displaying MOTD"
 msgstr "Eroare la afișarea MOTD"
@@ -3161,8 +3291,17 @@ msgstr "Nu există un MOTD asociat cu această conexiune."
 msgid "MOTD for %s"
 msgstr "MOTD pentru %s"
 
-msgid "Server has disconnected"
-msgstr "Serverul s-a deconectat"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"S-a pierdut conexiunea cu serverul: %s"
 
 msgid "View MOTD"
 msgstr "Afișare MOTD"
@@ -3173,25 +3312,23 @@ msgstr "C_hat:"
 msgid "_Password:"
 msgstr "_Parolă:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "Pseudonimele IRC nu pot conține spații"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Autentificare"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "Pseudonimele și serverele IRC nu pot conține spații"
 
 msgid "SSL support unavailable"
 msgstr "Suportul SSL nu este disponibil"
 
-msgid "Couldn't create socket"
-msgstr "Nu s-a putut crea un socket"
+msgid "Unable to connect"
+msgstr "Conectare eșuată"
 
-msgid "Couldn't connect to host"
-msgstr "Conectarea la server a eșuat"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Conectarea a eșuat: %s"
 
-msgid "Read error"
-msgstr "Eroare la citire"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Serverul a închis conexiunea."
 
 msgid "Users"
 msgstr "Utilizatori"
@@ -3356,21 +3493,31 @@ msgid "mode (%s %s) by %s"
 msgstr "mod (%s %s) de către %s"
 
 msgid "Invalid nickname"
-msgstr "Pseudonim invalid"
+msgstr "Pseudonim greșit"
 
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 "Pseudonimul ales a fost respins de către server. Probabil conține caractere "
-"invalide."
+"nevalide."
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 "Numele de cont ales a fost respins de către server. Probabil conține "
-"caractere invalide."
+"caractere nevalide."
+
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Pseudonimul „%s” este deja utilizat."
+
+msgid "Nickname in use"
+msgstr "Pseudonim utilizat deja"
 
 msgid "Cannot change nick"
 msgstr "Nu se reușește schimbarea pseudonimului"
@@ -3383,7 +3530,7 @@ msgid "You have parted the channel%s%s"
 msgstr "Ați părăsit chat-ul%s%s"
 
 msgid "Error: invalid PONG from server"
-msgstr "Eroare: PONG invalid de la server"
+msgstr "Eroare: PONG nevalid de la server"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
@@ -3614,12 +3761,12 @@ msgstr "Comandă Ad-Hoc eșuată"
 msgid "execute"
 msgstr "execută"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel de "
+"Serverul necesită TLS/SSL, dar nu s-a găsit nici un fel de "
 "suport TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Ați cerut criptare, dar nu s-a găsit nici un fel de suport TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3636,17 +3783,45 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autentificare în clar (plaintext)"
 
-msgid "Invalid response from server."
-msgstr "Răspuns invalid de la server."
+msgid "SASL authentication failed"
+msgstr "Autentificare SASL eșuată"
+
+msgid "Invalid response from server"
+msgstr "Răspuns nevalid de la server."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Serverul nu utilizează o metodă cunoscută de autentificare"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Ați cerut criptare, dar serverul nu suportă criptare"
+
 msgid "Invalid challenge from server"
-msgstr "Cerere invalidă de la server"
+msgstr "Cerere nevalidă de la server"
 
-msgid "SASL error"
-msgstr "Eroare SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Eroare SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "Managerul de conexiune BOSH a încheiat sesiunea."
+
+msgid "No session ID given"
+msgstr "Nu s-a primit un identificator de sesiune"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Versiune nesuportată de protocol BOSH"
+
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Nu s-a putut face o conexiune cu serverul"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Nu s-a putut face o conexiune cu serverul: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Nu se poate inițializa conexiunea SSL"
 
 msgid "Full Name"
 msgstr "Nume complet"
@@ -3663,6 +3838,11 @@ msgstr "Pagină Internet"
 msgid "Street Address"
 msgstr "Adresă locală"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Adresă completă"
 
@@ -3714,170 +3894,8 @@ msgstr "Client"
 msgid "Operating System"
 msgstr "Sistem de operare"
 
-msgid "Last Activity"
-msgstr "Ultima activitate"
-
-msgid "Service Discovery Info"
-msgstr "Detalii servicii descoperite"
-
-msgid "Service Discovery Items"
-msgstr "Servicii descoperite"
-
-msgid "Extended Stanza Addressing"
-msgstr "Adresare „stanza” extinsă"
-
-msgid "Multi-User Chat"
-msgstr "Chat cu mai mulți utilizatori"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-"Detalii suplimentare despre prezența într-un chat cu mai mulți utilizatori."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Comenzi ad-hoc"
-
-msgid "PubSub Service"
-msgstr "Serviciu PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Fluxuri de date SOCKS5"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Eroare la înregistrare"
-
-msgid "User Location"
-msgstr "Loc utilizator"
-
-msgid "User Avatar"
-msgstr "Avatar utilizator"
-
-msgid "Chat State Notifications"
-msgstr "Notificări de stări pentru chat"
-
-msgid "Software Version"
-msgstr "Versiune de software"
-
-msgid "Stream Initiation"
-msgstr "Inițializare flux de date"
-
-msgid "File Transfer"
-msgstr "Transfer de fișiere"
-
-msgid "User Mood"
-msgstr "Dispoziția utilizatorului"
-
-msgid "User Activity"
-msgstr "Acitivatea utilizatorului"
-
-msgid "Entity Capabilities"
-msgstr "Facilitățile entității"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negocieri sesiuni criptate"
-
-msgid "User Tune"
-msgstr "Piesă utilizator"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM cu schimb de chei"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Adresă de mail"
-
-msgid "User Profile"
-msgstr "Profil utilizator"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Intră"
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Pseudonim utilizator"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Video în direct"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "Confirmări mesaje"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Amprentă silabică cheie publică"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Opțiuni personale"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Moduri utilizator"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Nume utilizator"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Limită utilizatori"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Criptare Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr "Livrare întârziată"
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr "Repozitorii de fișiere și partajare"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociere sesiune de criptare simplificată"
-
-msgid "Hop Check"
-msgstr "Verificare hopuri"
-
-msgid "Capabilities"
-msgstr "Facilități"
+msgid "Local Time"
+msgstr "Ora locală"
 
 msgid "Priority"
 msgstr "Prioritate"
@@ -3885,6 +3903,13 @@ msgstr "Prioritate"
 msgid "Resource"
 msgstr "Resursă"
 
+#, c-format
+msgid "%s ago"
+msgstr "acum %s"
+
+msgid "Logged Off"
+msgstr "Deconectat"
+
 msgid "Middle Name"
 msgstr "Inițială"
 
@@ -3906,14 +3931,12 @@ msgstr "Arată-mă din nou pentru"
 msgid "Temporarily Hide From"
 msgstr "Ascunde-mă temporar de"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Anulează notificarea prezenței"
 
 msgid "(Re-)Request authorization"
 msgstr "Solicit (din nou) autorizare"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -3979,7 +4002,7 @@ msgid "Search"
 msgstr "Caută"
 
 msgid "Invalid Directory"
-msgstr "Director invalid"
+msgstr "Director nevalid"
 
 msgid "Enter a User Directory"
 msgstr "Introduceți un director cu utilizatori"
@@ -4004,21 +4027,21 @@ msgid "%s is not a valid room name"
 msgstr "%s nu este un nume valid de chat"
 
 msgid "Invalid Room Name"
-msgstr "Nume invalid de chat"
+msgstr "Nume incorect de chat"
 
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s nu este un nume valid de server"
 
 msgid "Invalid Server Name"
-msgstr "Nume invalid de contact"
+msgstr "Nume incorect de contact"
 
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s nu este un nume valid de chat"
 
 msgid "Invalid Room Handle"
-msgstr "Titlu invalid de chat"
+msgstr "Titlu incorect de chat"
 
 msgid "Configuration error"
 msgstr "Eroare de configurare"
@@ -4042,7 +4065,7 @@ msgid "Error retrieving room list"
 msgstr "Eroare la obținerea listei camerelor de chat"
 
 msgid "Invalid Server"
-msgstr "Server invalid"
+msgstr "Server nevalid"
 
 msgid "Enter a Conference Server"
 msgstr "Conectare la un server de conferințe"
@@ -4053,34 +4076,32 @@ msgstr "Selectați un server de conferințe pentru interogare"
 msgid "Find Rooms"
 msgstr "Caută camere de chat"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Ați cerut criptare, dar serverul nu suportă criptare"
+msgid "Affiliations:"
+msgstr "Afilieri:"
 
-msgid "Write error"
-msgstr "Eroare la scriere"
+msgid "No users found"
+msgstr "Nu s-au găsit utilizatori"
 
-msgid "Ping timeout"
-msgstr "Expirare ping"
+msgid "Roles:"
+msgstr "Roluri:"
 
-msgid "Read Error"
-msgstr "Eroare la citire"
+msgid "Ping timed out"
+msgstr "Ping expirat"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Nu s-a putut face o conexiune cu serverul:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Nu se poate crea un socket"
+"Nu s-au găsit metode XMPP alternative de conectare după eșuarea conexiunii directe."
 
 msgid "Invalid XMPP ID"
-msgstr "ID XMPP invalid"
+msgstr "ID XMPP nevalid"
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "ID XMPP invalid. Trebuie precizat domeniul."
+msgstr "ID XMPP nevalid. Trebuie precizat domeniul."
+
+msgid "Malformed BOSH URL"
+msgstr "URL BOSH nevalid"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4106,9 +4127,6 @@ msgstr "Ștergere reușită a înregistrării"
 msgid "Unregistration Failed"
 msgstr "Ștergere eșuată a înregistrării"
 
-msgid "Already Registered"
-msgstr "Este deja înregistrat"
-
 msgid "State"
 msgstr "Stat"
 
@@ -4121,6 +4139,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Dată"
 
+msgid "Already Registered"
+msgstr "Este deja înregistrat"
+
 msgid "Unregister"
 msgstr "Ștergere înregistrare"
 
@@ -4173,6 +4194,12 @@ msgstr "Serverul nu permite blocarea"
 msgid "Not Authorized"
 msgstr "Neautorizat"
 
+msgid "Mood"
+msgstr "Dispoziție"
+
+msgid "Now Listening"
+msgstr "Acum în audiție"
+
 msgid "Both"
 msgstr "Ambele"
 
@@ -4194,12 +4221,6 @@ msgstr "Fără"
 msgid "Subscription"
 msgstr "Subscriere"
 
-msgid "Mood"
-msgstr "Dispoziție"
-
-msgid "Now Listening"
-msgstr "Acum în audiție"
-
 msgid "Mood Text"
 msgstr "Text dispoziție"
 
@@ -4242,9 +4263,6 @@ msgstr "Parola v-a fost schimbată."
 msgid "Error changing password"
 msgstr "Eroare la schimbarea parolei"
 
-msgid "Password (again)"
-msgstr "Confirmare parolă"
-
 msgid "Change XMPP Password"
 msgstr "Schimbare parolă XMPP"
 
@@ -4263,7 +4281,7 @@ msgid "Search for Users..."
 msgstr "Căutare utilizatori..."
 
 msgid "Bad Request"
-msgstr "Cerere invalidă"
+msgstr "Cerere nevalidă"
 
 msgid "Conflict"
 msgstr "Conflict"
@@ -4284,7 +4302,7 @@ msgid "Item Not Found"
 msgstr "Elementul nu a fost găsit"
 
 msgid "Malformed XMPP ID"
-msgstr "ID XMPP invalid"
+msgstr "ID XMPP nevalid"
 
 msgid "Not Acceptable"
 msgstr "Inacceptabil"
@@ -4326,10 +4344,10 @@ msgid "Incorrect encoding in authorization"
 msgstr "Codare incorectă la autorizare"
 
 msgid "Invalid authzid"
-msgstr "„Authzid” invalid"
+msgstr "„Authzid” nevalid"
 
 msgid "Invalid Authorization Mechanism"
-msgstr "Mecanism invalid de autorizare"
+msgstr "Mecanism nevalid de autorizare"
 
 msgid "Authorization mechanism too weak"
 msgstr "Mecanism de autorizare insuficient de sigur"
@@ -4353,25 +4371,25 @@ msgid "Connection Timeout"
 msgstr "Conexiunea a expirat"
 
 msgid "Host Gone"
-msgstr "Gazda a dispărut"
+msgstr "Serverul nu mai e prezent"
 
 msgid "Host Unknown"
-msgstr "Gazdă necunoscută"
+msgstr "Server necunoscut"
 
 msgid "Improper Addressing"
 msgstr "Adresare neadecvată"
 
 msgid "Invalid ID"
-msgstr "Identitate invalidă"
+msgstr "Identitate nevalidă"
 
 msgid "Invalid Namespace"
-msgstr "„Namespace” invalid"
+msgstr "„Namespace” nevalid"
 
 msgid "Invalid XML"
-msgstr "XML invalid"
+msgstr "XML nevalid"
 
 msgid "Non-matching Hosts"
-msgstr "Gazdele nu se potrivesc"
+msgstr "Numele de server nu se potrivesc"
 
 msgid "Policy Violation"
 msgstr "Normele au fost încălcate"
@@ -4386,7 +4404,7 @@ msgid "Restricted XML"
 msgstr "XML restrictiv"
 
 msgid "See Other Host"
-msgstr "Verificați cealaltă gazdă"
+msgstr "Verificați celălalt nume de server"
 
 msgid "System Shutdown"
 msgstr "Închidere sistem"
@@ -4438,20 +4456,26 @@ msgid "Unable to ping user %s"
 msgstr "Nu se poate da „ping” către utilizatorul %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
-"Nu se poate da „buzz” pentru că nu se știe nimic despre utilizatorul %s."
+"Nu se poate da „buzz” pentru că nu se știe nimic despre %s."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "Nu se poate da „buzz” pentru că utilizatorul %s ar putea fi deconectat."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 "Nu se poate da „buzz” pentru că aplicația utilizatorului „%s” nu suportă "
-"acest lucru."
+"acest lucru sau nu dorește să primească „buzz” acum."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "„Buzz” la %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4463,8 +4487,32 @@ msgid "%s has buzzed you!"
 msgstr "%s v-a dat „buzz”!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "„Buzz” la %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Nu se poate iniția media cu %s, JID nevalid"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Nu se poate iniția media cu %s, contactul nu este conectat"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Nu se poate iniția media cu %s, nu e subscris pentru prezență"
+
+msgid "Media Initiation Failed"
+msgstr "Inițializare media eșuată"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Precizați cu ce resursă a contactului %s ați dori să porniți o sesiune media."
+
+msgid "Select a Resource"
+msgstr "Selectați o resursă"
+
+msgid "Initiate Media"
+msgstr "Inițiază media"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurați o cameră de chat."
@@ -4486,18 +4534,18 @@ msgstr ""
 "ban &lt;nume utilizator&gt; [chat]:  Blocați accesul unui utilizator în chat."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;nume ales&gt; &lt;deținător|administrator|membru|renegat|"
-"niciuna&gt;:  Setați afilierea unui utilizator față de camera de chat."
+"affiliate &lt;deținător|administrator|membru|renegat|nimic&gt; [pseudonim1] [pseudonim2] ...:"
+" Aflați utilizatorii cu o afiliere sau setați afilierea utilizatorilor față de camera de chat."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;nume ales&gt; &lt;moderator|participant|vizitator|niciunul&gt;:  "
-"Setați rolul unui utilizator în camera de chat."
+"role &lt;moderator|participant|vizitator|nimic&gt; [pseudonim1] [pseudonim2] ...: "
+"Aflați utilizatorii cu un rol sau setați rolul utilizatorilor în camera de chat."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;nume ales&gt; [chat]:  Invitați un utilizator într-un chat."
@@ -4558,6 +4606,9 @@ msgstr "Server de conectare"
 msgid "File transfer proxies"
 msgstr "Servere proxy pentru transfer de fișiere"
 
+msgid "BOSH URL"
+msgstr "URL BOSH"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4596,6 +4647,14 @@ msgstr "Eroare la analiza XML"
 msgid "Unknown Error in presence"
 msgstr "Eroare necunoscută în starea de prezență"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Eroare la intrarea în camera de chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Eroare în camera de chat %s"
+
 msgid "Create New Room"
 msgstr "Creează o nouă cameră de chat"
 
@@ -4612,13 +4671,28 @@ msgstr "_Configurare cameră de chat"
 msgid "_Accept Defaults"
 msgstr "_Opțiuni implicite"
 
+msgid "No reason"
+msgstr "Fără motiv."
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Eroare la intrarea în camera de chat %s"
+msgid "You have been kicked: (%s)"
+msgstr "Ați fost dat afară: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Eroare în camera de chat %s"
+msgid "Kicked (%s)"
+msgstr "Dat afară (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "A apărut o eroare la transferul de octeți în-bandă\n"
+
+msgid "Transfer was closed."
+msgstr "Transferul a fost închis"
+
+msgid "Failed to open the file"
+msgstr "Nu s-a putut deschide fișierul"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Nu s-a putut deschide fluxul de octeți în-bandă"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4630,7 +4704,7 @@ msgstr "Trimiterea fișierului a eșuat"
 
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "Nu se poate trimite fișierul către %s, JID invalid"
+msgstr "Nu se poate trimite fișierul către %s, JID nevalid"
 
 #, c-format
 msgid "Unable to send file to %s, user is not online"
@@ -4645,9 +4719,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 "Precizați cărei resurse a contactului %s doriți să-i trimiteți fișierul"
 
-msgid "Select a Resource"
-msgstr "Selectați o resursă"
-
 msgid "Edit User Mood"
 msgstr "Editare dispoziție utilizator"
 
@@ -4682,9 +4753,6 @@ msgstr "Acțiune"
 msgid "Select an action"
 msgstr "Selectați o acțiune"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Nu s-a putut descărca cartea de adrese MSN"
-
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
@@ -4718,165 +4786,218 @@ msgstr ""
 "%s este în lista contactelor, dar nu și în lista de pe server. Doriți să "
 "adăugați acest contact?"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "Nu se poate prelucra mesajul"
 
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Eroare de sintaxă (probabil o eroare de client)"
 
+#, c-format
 msgid "Invalid email address"
-msgstr "Adresă de mail invalidă"
+msgstr "Adresă de mail nevalidă"
 
+#, c-format
 msgid "User does not exist"
 msgstr "Utilizator inexistent"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Lipsește numele complet al domeniului"
 
+#, c-format
 msgid "Already logged in"
 msgstr "Deja autentificat"
 
+#, c-format
 msgid "Invalid username"
-msgstr "Nume invalid de utilizator"
+msgstr "Nume nevalid de utilizator"
 
+#, c-format
 msgid "Invalid friendly name"
-msgstr "Pseudonimul propriu este invalid"
+msgstr "Pseudonimul propriu este nevalid"
 
+#, c-format
 msgid "List full"
 msgstr "Listă plină"
 
+#, c-format
 msgid "Already there"
 msgstr "Există deja"
 
+#, c-format
 msgid "Not on list"
 msgstr "Nu este în listă"
 
+#, c-format
 msgid "User is offline"
 msgstr "Utilizatorul este deconectat"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "Sunteți deja în respectiva stare"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "Există deja în cealaltă listă"
 
+#, c-format
 msgid "Too many groups"
 msgstr "Prea multe grupuri"
 
+#, c-format
 msgid "Invalid group"
-msgstr "Grup invalid"
+msgstr "Grup nevalid"
 
+#, c-format
 msgid "User not in group"
 msgstr "Utilizatorul nu este în grup"
 
+#, c-format
 msgid "Group name too long"
 msgstr "Nume de grup prea lung"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Nu se poate șterge grupul zero"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "S-a încercat adăugarea unui contact într-un grup inexistent"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "Comutare eșuată"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Notificarea transferului a eșuat"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "Lipsesc unele câmpuri cerute"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Prea multe solicitări către FND"
 
+#, c-format
 msgid "Not logged in"
 msgstr "Neautentificat"
 
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Serviciu temporar indisponibil"
 
+#, c-format
 msgid "Database server error"
 msgstr "Eroare a serverului bazei de date"
 
+#, c-format
 msgid "Command disabled"
 msgstr "Comandă dezactivată"
 
+#, c-format
 msgid "File operation error"
 msgstr "Eroare la manipularea fișierului"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "Eroare la alocarea memoriei"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "O valoare CHL greșită a fost trimisă către server"
 
+#, c-format
 msgid "Server busy"
 msgstr "Server ocupat"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "Server indisponibil"
 
+#, c-format
 msgid "Peer notification server down"
 msgstr "Serverul de notificare a contactelor este indisponibil"
 
+#, c-format
 msgid "Database connect error"
 msgstr "Eroare la conectarea la baza de date"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Serverul va fi în curând indisponibil"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "Eroare la stabilirea conexiunii"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parametrii CVR sunt necunoscuți sau nu sunt permiși"
 
+#, c-format
 msgid "Unable to write"
 msgstr "Nu se poate scrie"
 
+#, c-format
 msgid "Session overload"
 msgstr "Sesiune supraîncărcată"
 
+#, c-format
 msgid "User is too active"
 msgstr "Utilizatorul este prea activ"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "Prea multe sesiuni"
 
+#, c-format
 msgid "Passport not verified"
 msgstr "Cont „Passport” neverificat"
 
+#, c-format
 msgid "Bad friend file"
-msgstr "Fișier invalid"
+msgstr "Fișier „friend” nevalid"
 
+#, c-format
 msgid "Not expected"
 msgstr "Neașteptat"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Pseudonimul a fost schimbat prea rapid"
 
+#, c-format
 msgid "Server too busy"
 msgstr "Server prea încărcat"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "Autentificare eșuată"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Permis doar la autentificare"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "Nu acceptă utilizatori noi"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Cont „Kids Passport” fără aprobare de la părinți"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Cont „Passport” neverificat încă"
 
 msgid "Passport account suspended"
 msgstr "Cont „Passport” suspendat"
 
+#, c-format
 msgid "Bad ticket"
 msgstr "Bilet (ticket) greșit"
 
@@ -4894,6 +5015,27 @@ msgstr "Alte contacte"
 msgid "Non-IM Contacts"
 msgstr "Contacte de alt tip"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s a trimis un wink. <a href='msn-wink://%s'>Apăsați aici pentru a-l reda</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s a trimis un wink, dar nu a putut fi salvat"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s a trimis un clip audio. <a href='audio://%s'>Apăsați aici pentru a-l reda</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s a trimis un clip audio, dar acesta nu a putut fi salvat"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s v-a trimis o invitație de chat audio, pentru care nu există încă suport."
+
 msgid "Nudge"
 msgstr "Buzz"
 
@@ -5046,8 +5188,28 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Pentru MSN aveți nevoie de suport SSL. Instalați bibliotecile SSL necesare. "
 
-msgid "Failed to connect to server."
-msgstr "Conectarea la server a eșuat."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Nu se poate adăuga contactul %s deoarece numele de utilizator este nevalid. "
+"Un nume valid trebuie să fie o adresă de mail."
+
+msgid "Unable to Add"
+msgstr "Adăugare eșuată"
+
+msgid "Authorization Request Message:"
+msgstr "Mesaj cerere de autorizare:"
+
+msgid "Please authorize me!"
+msgstr "Am nevoie de autorizare..."
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Eroare la descărcarea profilului"
@@ -5235,66 +5397,30 @@ msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Autentificare Windows Live ID: Conectare eșuată"
 
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Autentificare Windows Live ID: Răspuns invalid"
-
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s nu este un nume valid de grup."
-
-msgid "Unknown error."
-msgstr "Eroare necunoscută."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s în %s (%s)"
+msgstr "Autentificare Windows Live ID: Răspuns nevalid"
 
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vă sâcâie cu un „nudge”!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Eroare necunoscută (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Eroare necunoscută (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Nu se poate adăuga utilizatorul"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Următorii utilizatori vă lipsesc din cartea de adrese"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nu se poate adăuga utilizatorul în %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nu se poate bloca utilizatorul în %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nu se poate permite utilizatorul în %s (%s)"
-
+#. Unknown error!
 #, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nu a putut fi adăugat pentru că lista de contacte vă e plină."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nu este un nume de cont „passport” valid."
+msgid "Unknown error (%d)"
+msgstr "Eroare necunoscută (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Serviciu temporar indisponibil."
+msgid "The following users are missing from your addressbook"
+msgstr "Următorii utilizatori vă lipsesc din cartea de adrese"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mesajul mobil nu a fost trimis pentru era prea lung."
 
-msgid "Unable to rename group"
-msgstr "Grupul nu poate fi redenumit"
-
-msgid "Unable to delete group"
-msgstr "Grupul nu poate fi șters"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5311,18 +5437,20 @@ msgid_plural ""
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"Serverul MSN va fi închis pentru întreținere într-un minut. Veți fi automat "
-"deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile începute.\n"
+"Serverul MSN va fi închis pentru întreținere într-un minut. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
+"începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
 msgstr[1] ""
-"Serverul MSN va fi închis pentru întreținere în %d minute. Veți fi automat "
-"deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile începute.\n"
+"Serverul MSN va fi închis pentru întreținere în %d minute. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
+"începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
 msgstr[2] ""
-"Serverul MSN va fi închis pentru întreținere în %d de minute. Veți fi "
-"automat deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile "
+"Serverul MSN va fi închis pentru întreținere în %d de minute. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
 "începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
@@ -5344,9 +5472,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Mesajul nu a fost trimis pentru că apărut o eroare necunoscută."
 
-msgid "Unable to connect"
-msgstr "Conectare eșuată"
-
 msgid "Writing error"
 msgstr "Eroare la scriere"
 
@@ -5361,19 +5486,19 @@ msgstr ""
 "Eroare de conectare de la serverul %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr "Protocolul utilizat nu este suportat de către server."
 
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr "Eroare la prelucrarea datelor HTTP."
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr "V-ați autentificat din altă parte."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Serverele MSN sunt temporar indisponibile. Reîncercați mai târziu."
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr "Serverele MSN vor fi oprite momentan."
 
 #, c-format
@@ -5403,6 +5528,16 @@ msgstr "Trimitere cookie"
 msgid "Retrieving buddy list"
 msgstr "Se descarcă lista de contacte"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s v-a cerut o permisiune de acces la webcam, dar această cerere nu "
+"este încă suportată"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s v-a trimis o invitație de acces la webcam, invitație ce nu este "
+"încă suportată"
+
 msgid "Away From Computer"
 msgstr "Absent din fața calculatorului"
 
@@ -5444,14 +5579,6 @@ msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "E posibil ca mesajul să nu fi fost trimis din cauza unei erori necunoscute:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s v-a adăugat în lista sa de contacte."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s v-a șters din lista sa de contacte."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Ștergeți contactul din cartea de adrese?"
 
@@ -5459,7 +5586,7 @@ msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Doriți să ștergeți acest contact din lista de contacte?"
 
 msgid "The username specified is invalid."
-msgstr "Numele de utilizator specificat este invalid."
+msgstr "Numele de utilizator specificat este nevalid."
 
 msgid "This Hotmail account may not be active."
 msgstr "Acest cont Hotmail s-ar putea să nu mai fie activ."
@@ -5481,6 +5608,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Modul de protocol MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nu este un nume valid de grup."
+
+msgid "Unknown error."
+msgstr "Eroare necunoscută."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s în %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nu se poate adăuga utilizatorul în %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nu se poate bloca utilizatorul în %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nu se poate permite utilizatorul în %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nu a putut fi adăugat pentru că lista de contacte vă e plină."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nu este un nume de cont „passport” valid."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Serviciu temporar indisponibil."
+
+msgid "Unable to rename group"
+msgstr "Grupul nu poate fi redenumit"
+
+msgid "Unable to delete group"
+msgstr "Grupul nu poate fi șters"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s v-a adăugat în lista sa de contacte."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s v-a șters din lista sa de contacte."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Nu există utilizatorul %s"
 
@@ -5510,6 +5685,8 @@ msgid "Lost connection with server"
 msgstr "S-a pierdut conexiunea cu serverul"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Mailuri noi"
 
@@ -5528,7 +5705,6 @@ msgstr "Noi comentarii la poze"
 msgid "MySpace"
 msgstr "MySpace"
 
-#, fuzzy
 msgid "IM Friends"
 msgstr "Prieteni IM"
 
@@ -5540,18 +5716,17 @@ msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
+"Un contact a fost adăugat ori actualizat de pe server (incluzând contacte "
+"deja prezente în lista de pe server)"
 msgstr[1] ""
+"%d contacte au fost adăugat ori actualizat de pe server (incluzând contacte "
+"deja prezente în lista de pe server)"
 msgstr[2] ""
+"%d de contacte au fost adăugat ori actualizat de pe server (incluzând "
+"contacte deja prezente în lista de pe server)"
 
-#, fuzzy
 msgid "Add contacts from server"
-msgstr "Răspuns invalid de la server."
-
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Conectat"
+msgstr "Adăugare contacte de pe server."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5559,31 +5734,23 @@ msgstr "Eroare de protocol, codul %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Aveți o parolă de %d caractere, mai mare decât lungimea maximă de %d în "
-"MySpaceIM. E necesar să introduceți o parolă mai scurtă la http://"
+"%s Aveți o parolă de %zu caractere, mai mare decât lungimea maximă de %d. "
+"Puteți introduce o parolă mai scurtă la http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
-"și să încercați din onu."
+"și să încercați din nou."
+
+msgid "Incorrect username or password"
+msgstr "Nume de utilizator sau parolă incorecte."
 
 msgid "MySpaceIM Error"
 msgstr "Eroare MySpaceIM"
 
 msgid "Invalid input condition"
-msgstr "Condiție de intrare invalidă"
-
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr "Nu se poate prelucra mesajul"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Conectarea la server a eșuat"
+msgstr "Condiție de intrare nevalidă"
 
 msgid "Failed to add buddy"
 msgstr "Adăugarea contactului a eșuat"
@@ -5617,39 +5784,35 @@ msgstr ""
 "MySpaceIM nu va încărcat."
 
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "Adăugați contacte de pe MySpace.com"
 
-#, fuzzy
 msgid "Importing friends failed"
-msgstr "activarea modulului a eșuat"
+msgstr "Importarea contactelor a eșuat"
 
 #. TODO: find out how
-#, fuzzy
 msgid "Find people..."
-msgstr "Căutare contacte..."
+msgstr "Căutare persoane..."
 
-#, fuzzy
 msgid "Change IM name..."
-msgstr "Schimbare parolă..."
+msgstr "Schimbare nume IM..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "Gestionare URL myim"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "Nu s-a găsit un cont MySpaceIM pentru a deschide acest URL myim."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "Activați contul MySpaceIM potrivit și încercați din nou."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Arată numele afișat în textul statusului"
 
 msgid "Show headline in status text"
-msgstr ""
+msgstr "Arată titlul în textul statusului"
 
-#, fuzzy
 msgid "Send emoticons"
-msgstr ""
+msgstr "Trimite iconițe simbolice"
 
 msgid "Screen resolution (dots per inch)"
 msgstr "Rezoluție ecran (dpi)"
@@ -5663,47 +5826,49 @@ msgstr "Utilizator"
 msgid "Headline"
 msgstr "Titlu"
 
-#, fuzzy
 msgid "Song"
-msgstr "Sunete"
+msgstr "Melodie"
 
 msgid "Total Friends"
-msgstr ""
+msgstr "Prieteni la cataramă"
 
-#, fuzzy
 msgid "Client Version"
-msgstr "Încheie discuția"
+msgstr "Versiune client"
+
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"A apărut o eroare la inițializarea numelui de utilizator. Încercați din nou "
+"sau vizitați "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"pentru a alege un nume de utilizator."
 
-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "Serviciu indisponibil"
+msgstr "MySpaceIM - nume disponibil"
 
-#, fuzzy
 msgid "This username is available. Would you like to set it?"
-msgstr ""
-"%s a trimis un mesaj pentru „whiteboard”. Doriți să deschid un „whiteboard”?"
+msgstr "Acest nume de utilizator este disponibil. Doriți să-l folosiți?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "DUPĂ INIȚIALIZARE ACESTA NU POATE FI SCHIMBAT!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
+msgstr "MySpaceIM - Alegeți un nume de utilizator"
 
-#, fuzzy
 msgid "This username is unavailable."
-msgstr "Această temă nu are iconițe disponibile."
+msgstr "Acest nume de utilizator nu este disponibil."
 
-#, fuzzy
 msgid "Please try another username:"
-msgstr "Introduceți noul nume pentru %s"
+msgstr "Încercați alt nume de utilizator:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "Fără nume"
+msgstr "Nu s-a inițializat un nume de utilizator"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "Introduceți un nume de utilizator pentru a verifica disponibilitatea:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -5712,106 +5877,103 @@ msgstr ""
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
+msgstr "Trăsnește"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a trăsnit!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "%s este trăsnit..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr ""
+msgstr "Pocnește"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a pocnit"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "%s este pocnit..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
-msgstr "Topic"
+msgstr "Arde"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has torched you!"
-msgstr "Utilizatorul v-a blocat"
+msgstr "%s v-a ars!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "%s este ars..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "Țucă"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a țucat."
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "%s este țucat"
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
+msgstr "Îmbrățișează"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a îmbrățișat."
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "%s este îmbrățișat..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "Adormit"
+msgstr "Plesnește"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a plesnit!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "%s este plesnit..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "Dus"
+msgstr "Pișcă de fund"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s a intrat în absență."
+msgstr "%s v-a pișcat de fund."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Goosing %s..."
-msgstr "Caut %s"
+msgstr "%s este pișcat de fund..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
 msgid "High-five"
-msgstr ""
+msgstr "Bate palma"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a bătut palma!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "Ați bătut palma cu %s..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
@@ -5899,9 +6061,6 @@ msgstr "Nu vă puteți adăuga propria identitate"
 msgid "Master archive is misconfigured"
 msgstr "Arhiva principală este configurată greșit"
 
-msgid "Incorrect username or password"
-msgstr "Nume de utilizator sau parolă incorecte."
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nu s-a putut recunoaște serverul din numele de utilizator introdus"
 
@@ -5938,15 +6097,15 @@ msgstr ""
 "autentificați în același timp"
 
 msgid "The user is either offline or you are blocked"
-msgstr "Utilizatorul este deconectat sau sunteți blocat(ă)"
+msgstr "Utilizatorul este deconectat sau v-a blocat"
 
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Eroare necunoscută: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Autentificare eșuată (%s)."
+msgid "Unable to login: %s"
+msgstr "Autentificare eșuată: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6051,9 +6210,6 @@ msgstr "Conferință GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-msgid "Unable to connect to server."
-msgstr "Conectarea la server a eșuat."
-
 msgid "Waiting for response..."
 msgstr "Se așteaptă un răspuns..."
 
@@ -6077,25 +6233,18 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Doriți să vă alăturați discuției?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Ați fost deconectat(ă) pentru că v-ați autentificat de pe o altă stație."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s pare să fie deconectat și nu a primit mesajul ce i l-ați trimis."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Conectarea la server a eșuat. Introduceți adresa serverului la care doriți "
 "să vă conectați."
 
-msgid "Error. SSL support is not installed."
-msgstr "Eroare: suportul SSL nu este instalat."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Această conferință a fost închisă. Nu mai pot fi trimise mesaje."
 
@@ -6118,25 +6267,32 @@ msgstr "Adresă server"
 msgid "Server port"
 msgstr "Port server"
 
+msgid "Received unexpected response from "
+msgstr "S-a primit un răspuns neașteptat de la "
+
+#. username connecting too frequently
+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 ""
+"V-ați conectat și deconectat prea des. Așteptați zece minute și încercați "
+"din nou. Dacă continuați să încercați, va trebui să așteptați mai mult."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Eroare la cererea "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL nu permite autentificarea acestui cont aici"
+
 msgid "Could not join chat room"
 msgstr "Nu s-a putut intra în camera de chat"
 
 msgid "Invalid chat room name"
-msgstr "Nume invalid de cameră de chat"
+msgstr "Nume nevalid de cameră de chat"
 
-msgid "Server closed the connection."
-msgstr "Serverul a închis conexiunea."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"S-a pierdut conexiunea cu serverul:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "S-au primit date invalide de la server."
+msgid "Received invalid data on connection with server"
+msgstr "S-au primit date nevalide la conectarea la server."
 
 #. *< type
 #. *< ui_requirement
@@ -6181,9 +6337,9 @@ msgid "Lost connection with the remote user:<br>%s"
 msgstr "S-a pierdut conexiunea cu utilizatorul la distanță:<br>%s"
 
 msgid "Received invalid data on connection with remote user."
-msgstr "S-au primit date invalide la conectarea la utilizatorul la distanță."
+msgstr "S-au primit date nevalide la conectarea la utilizatorul la distanță."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Nu s-a putut deschide o conexiune cu utilizatorul la distanță."
 
 msgid "Direct IM established"
@@ -6203,10 +6359,10 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Fișierul %s are %s, care depășește mărimea maximă de %s."
 
 msgid "Invalid error"
-msgstr "Eroare invalidă"
+msgstr "Eroare nevalidă"
 
 msgid "Invalid SNAC"
-msgstr "SNAC invalid"
+msgstr "SNAC nevalid"
 
 msgid "Rate to host"
 msgstr "Limitare către server"
@@ -6242,7 +6398,7 @@ msgid "Request denied"
 msgstr "Cerere respinsă"
 
 msgid "Busted SNAC payload"
-msgstr "Încărcătură SNAC invalidă"
+msgstr "Încărcătură SNAC nevalidă"
 
 msgid "Insufficient rights"
 msgstr "Drepturi insuficiente"
@@ -6385,20 +6541,12 @@ msgid "Buddy Comment"
 msgstr "Comentariu contact"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Conectarea pentru serverul de autentificare a eșuat:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Conectarea la serverul de autentificare a eșuat: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Conectarea la serverul BOS a eșuat:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Conectarea la serverul BOS a eșuat: %s"
 
 msgid "Username sent"
 msgstr "S-a trimit numele de utilizator"
@@ -6412,52 +6560,59 @@ msgstr "Finalizare conexiune"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Eroare la autentificare: autentificarea pentru %s a eșuat deoarece numele de "
-"utilizator este invalid. Un nume valid trebuie să fie o adresă de mail "
-"validă sau să înceapă cu o literă și să conțină doar litere, numere și "
-"spații sau să conțină doar numere."
+"Autentificarea contului %s a eșuat deoarece numele de utilizator este "
+"greșit. Un nume valid trebuie să fie o adresă de mail corectă ori să "
+"înceapă cu o literă și să conțină doar litere, numere și spații sau să "
+"conțină doar numere."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Nume invalid de utilizator"
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"S-ar putea să intervină în scurt timp deconectarea de la server. Dacă se "
+"întâmplă, vizitați %s pentru actualizări."
 
-msgid "Incorrect password."
-msgstr "Parolă incorectă."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nu s-a putut obține un hash valid pentru autentificarea AIM."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nu s-a putut obține un hash valid pentru autentificare."
+
+msgid "Received authorization"
+msgstr "Autorizarea a fost primită"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Utilizator inexistent"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Contul dumneavoastră este momentan suspendat."
+msgid "Your account is currently suspended"
+msgstr "Contul vă este momentan suspendat"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Serviciul de mesagerie instant AOL este temporar indisponibil."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"V-ați conectat și deconectat prea des. Așteptați zece minute și încercați "
-"din nou. Dacă continuați să încercați, va trebui să așteptați mai mult."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versiunea clientului folosit este prea veche. Actualizați-l la %s"
 
-msgid "Could Not Connect"
-msgstr "Conectare eșuată"
-
-msgid "Received authorization"
-msgstr "Autorizarea a fost primită"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"V-ați conectat și deconectat prea des. Așteptați un minut și încercați "
+"din nou. Dacă continuați să încercați, va trebui să așteptați mai mult."
 
-msgid "The SecurID key entered is invalid."
-msgstr "Cheia SecurID introdusă este invalidă."
+msgid "The SecurID key entered is invalid"
+msgstr "Cheia SecurID introdusă este nevalidă."
 
 msgid "Enter SecurID"
 msgstr "Introducere SecurID"
@@ -6465,29 +6620,6 @@ msgstr "Introducere SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduceți numărul de șase cifre afișat digital."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "S-ar putea să intervină în scurt timp deconectarea de la server. "
-"Dacă se întâmplă, vizitați %s pentru actualizări."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Nu s-a putut obține un hash valid pentru autentificarea AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"S-ar putea să fiți în scurt timp deconectat(ă). Vizitați %s pentru "
-"actualizări."
-
-msgid "Unable to get a valid login hash."
-msgstr "Nu s-a putut obține un hash valid pentru autentificare."
-
 msgid "Password sent"
 msgstr "Parola a fost trimisă"
 
@@ -6499,12 +6631,6 @@ msgstr ""
 "Am nevoie de autorizarea ta pentru a te putea adăuga apoi în lista mea de "
 "contacte."
 
-msgid "Authorization Request Message:"
-msgstr "Mesaj cerere de autorizare:"
-
-msgid "Please authorize me!"
-msgstr "Am nevoie de autorizare..."
-
 msgid "No reason given."
 msgstr "Fără motiv."
 
@@ -6582,9 +6708,9 @@ msgstr "_Refuz"
 #, 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] "Ați pierdut %hu mesaj de la %s deoarece era invalid."
-msgstr[1] "Ați pierdut %hu mesaje de la %s deoarece erau invalide."
-msgstr[2] "Ați pierdut %hu de mesaje de la %s deoarece erau invalide."
+msgstr[0] "Ați pierdut %hu mesaj de la %s deoarece era nevalid."
+msgstr[1] "Ați pierdut %hu mesaje de la %s deoarece erau nevalide."
+msgstr[2] "Ați pierdut %hu de mesaje de la %s deoarece erau nevalide."
 
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
@@ -6639,7 +6765,7 @@ msgstr[0] "Ați pierdut %hu mesaj de la %s din motive necunoscute."
 msgstr[1] "Ați pierdut %hu mesaje de la %s din motive necunoscute."
 msgstr[2] "Ați pierdut %hu de mesaje de la %s din motive necunoscute."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Mesajul nu poate fi trimis: %s"
@@ -6661,6 +6787,9 @@ msgstr "Conectat din"
 msgid "Member Since"
 msgstr "Membru din"
 
+msgid "Capabilities"
+msgstr "Facilități"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -6673,7 +6802,7 @@ msgid ""
 "characters.]"
 msgstr ""
 "[Nu se poate afișa mesajul acestui utilizator deoarece conține caractere "
-"invalide]"
+"nevalide]"
 
 msgid ""
 "The last action you attempted could not be performed because you are over "
@@ -6684,7 +6813,7 @@ msgstr ""
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Ați fost deconectat(ă) din camera de chat %s."
+msgstr "Contul v-a fost deconectat din camera de chat %s."
 
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
@@ -6745,7 +6874,7 @@ msgstr ""
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate formata numele de utilizator pentru că este "
-"invalid."
+"nevalid."
 
 #, c-format
 msgid ""
@@ -6777,7 +6906,7 @@ msgid ""
 "invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
-"este invalidă."
+"este nevalidă."
 
 #, c-format
 msgid "Error 0x%04x: Unknown error."
@@ -6808,8 +6937,8 @@ msgid ""
 "fully connected."
 msgstr ""
 "Se pare că ați cerut să setați profilul înainte de a vă autentifica. "
-"Profilul vă va rămâne la fel. Încercați să-l setați din nou când veți fi "
-"conectat(ă) 100%."
+"Profilul vă va rămâne la fel. Încercați să-l setați din nou după o "
+"conectare pe deplin reușită."
 
 #, c-format
 msgid ""
@@ -6840,30 +6969,27 @@ msgid_plural ""
 "truncated for you."
 msgstr[0] ""
 "Mesajul în absență depășește lungimea maximă de un octet. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."
 msgstr[1] ""
 "Mesajul în absență depășește lungimea maximă de %d octeți. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."
 msgstr[2] ""
 "Mesajul în absență depășește lungimea maximă de %d de octeți. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."
 
 msgid "Away message too long."
 msgstr "Mesaj în absență prea lung."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Nu se poate adăuga contactul %s deoarece numele de utilizator este invalid. "
+"Nu se poate adăuga contactul %s deoarece numele de utilizator este nevalid. "
 "Un nume valid trebuie să fie o adresă de mail validă sau să înceapă cu o "
 "literă și să conțină doar litere, numere și spații sau doar numere."
 
-msgid "Unable to Add"
-msgstr "Adăugare eșuată"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Descărcarea listei de contacte a eșuat"
 
@@ -6879,7 +7005,7 @@ msgstr "Orfani"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Nu s-a putut adăuga contactul %s deoarece aveți prea multe contacte în lista "
@@ -6889,7 +7015,7 @@ msgid "(no name)"
 msgstr "(fără nume)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Din motive necunoscute nu s-a putut adăuga contactul %s."
 
 #, c-format
@@ -6961,6 +7087,7 @@ msgstr "C_onectare"
 msgid "Get AIM Info"
 msgstr "Detalii AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Editare comentariu"
 
@@ -6983,7 +7110,7 @@ msgid "ICQ Privacy Options"
 msgstr "Opțiuni de securitate ICQ"
 
 msgid "The new formatting is invalid."
-msgstr "Formatul nou este invalid."
+msgstr "Formatul nou este nevalid."
 
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
@@ -7021,6 +7148,7 @@ msgstr "C_aută"
 msgid "Set User Info (web)..."
 msgstr "Introducere detalii (online)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Schimbare parolă (online)"
 
@@ -7050,6 +7178,9 @@ msgstr "Căutare contact după adresa de mail..."
 msgid "Search for Buddy by Information"
 msgstr "Căutare contact după detalii"
 
+msgid "Use clientLogin"
+msgstr "Utilizați clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7239,74 +7370,91 @@ msgstr "Actualizare"
 msgid "Could not change buddy information."
 msgstr "Nu s-ar putut schimbat datele contactului."
 
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Note"
+msgstr "Notă"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Notiță pentru contact"
+
+msgid "Change his/her memo as you like"
+msgstr "Modificați notița sa după cum doriți"
+
+msgid "_Modify"
+msgstr "_Modificare"
+
+msgid "Memo Modify"
+msgstr "Modificare notiță"
+
+msgid "Server says:"
+msgstr "Serverul spune:"
+
+msgid "Your request was accepted."
+msgstr "Cererea v-a fost aprobată."
+
+msgid "Your request was rejected."
+msgstr "Cererea v-a fost respinsă."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u solicită autorizare"
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "Doriți adăugarea utilizatorului în lista de contacte?"
+msgstr "Întrebare la adăugarea contactului"
 
-#, fuzzy
 msgid "Enter answer here"
-msgstr "Introduceți aici cererea"
+msgstr "Introduceți răspunsul aici"
 
 msgid "Send"
 msgstr "Trimite"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Nume invalid de utilizator"
+msgstr "Răspuns nevalid."
 
 msgid "Authorization denied message:"
 msgstr "Mesaj de autorizare refuzată:"
 
-#, fuzzy
 msgid "Sorry, you're not my style."
 msgstr "Scuze, nu ești genul meu..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u needs authorization"
-msgstr "Utilizatorul %d are nevoie de autorizare"
+msgstr "Utilizatorul %u necesită autorizare"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "Doriți adăugarea utilizatorului în lista de contacte?"
+msgstr "Autorizare pentru adăugarea unui contact"
 
-#, fuzzy
 msgid "Enter request here"
 msgstr "Introduceți aici cererea"
 
 msgid "Would you be my friend?"
 msgstr "Vrei să fim prieteni?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Contact"
+msgstr "Contact QQ"
 
-#, fuzzy
 msgid "Add buddy"
 msgstr "Adaugă contact"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "Avatar QQ invalid"
+msgstr "Număr QQ nevalid"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "Am nevoie de autorizare..."
+msgstr "Trimiterea autorizației a eșuat"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "Ștergerea contactului a eșuat"
+msgstr "Ștergerea contactului %u a eșuat"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s v-a șters din lista sa de contacte."
+msgstr "Contactul %d a încercat să vă șteargă din listă, dar a eșuat"
 
-#, fuzzy
 msgid "No reason given"
-msgstr "Fără motiv."
+msgstr "Fără motiv"
 
 #. only need to get value
 #, c-format
@@ -7316,9 +7464,9 @@ msgstr "Ați fost adăugat de %s"
 msgid "Would you like to add him?"
 msgstr "Doriți să îl adăugați?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Respingere"
+msgstr "Respins de %s"
 
 #, c-format
 msgid "Message: %s"
@@ -7333,141 +7481,122 @@ msgstr "ID grup:"
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Introduceți noul nume pentru %s"
+msgstr "Introduceți numărul Qun"
 
-#, fuzzy
 msgid "You can only search for permanent Qun\n"
-msgstr "Puteți căuta doar grupuri QQ permanente\n"
+msgstr "Puteți căuta doar după un Qun permanent\n"
 
-#, fuzzy
 msgid "(Invalid UTF-8 string)"
-msgstr "Opțiuni proxy invalide"
+msgstr "(șir UTF-8 nevalid)"
 
-#, fuzzy
 msgid "Not member"
 msgstr "Nu sunt un membru"
 
 msgid "Member"
 msgstr "Membru"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "Dialog cerere"
+msgstr "Se cere"
 
-#, fuzzy
 msgid "Admin"
-msgstr "Adium"
+msgstr "Admin"
 
-#, fuzzy
 msgid "Notice"
-msgstr "Notă"
+msgstr "Notificare"
 
-#, fuzzy
 msgid "Detail"
-msgstr "Implicită"
+msgstr "Detaliu"
 
 msgid "Creator"
 msgstr "Inițiator"
 
-#, fuzzy
 msgid "About me"
-msgstr "Despre %s"
+msgstr "Despre mine"
 
-#, fuzzy
 msgid "Category"
-msgstr "Eroare de chat"
+msgstr "Categorie"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr "Acest grup nu permite înscrierea altor contacte"
+msgstr "Acest Qun nu permite intrarea altora"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "Intră într-un chat"
+msgstr "Intră în Qun QQ"
 
 msgid "Input request here"
 msgstr "Introduceți aici cererea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Ați modificat cu succes membrul Qun"
+msgstr "Ați intrat cu succes în Qun %s (%u)"
 
-#, fuzzy
 msgid "Successfully joined Qun"
-msgstr "Ați modificat cu succes membrul Qun"
+msgstr "Ați intrat cu succes în Qun"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "Qun %u refuzat la intrare"
 
 msgid "QQ Qun Operation"
 msgstr "Operație QQ Qun"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Eșuat"
+msgstr "Eșuat:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
+msgstr "Răspuns necunoscut la intrarea în Qun"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "QQ Qun"
+msgstr "Ieșire din Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-"Notați că, dacă dumneavoastră sunteți inițiatorul, \n"
+"Notați că, dacă sunteți inițiatorul, \n"
 "această acțiune va elimina acest Qun."
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "Scuze, nu ești genul meu..."
+msgstr "Scuze, nu ești genul nostru..."
 
-#, fuzzy
 msgid "Successfully changed Qun members"
-msgstr "Ați modificat cu succes membrul Qun"
+msgstr "Ați modificat cu succes membrii Qun"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
 msgstr "Ați modificat cu succes detaliile Qun"
 
 msgid "You have successfully created a Qun"
 msgstr "Ați creat cu succes un Qun"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "Doriți să setați detaliile Qun acum?"
+msgstr "Doriți să modificați informațiile detaliate acum?"
 
 msgid "Setup"
 msgstr "Opțiuni"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "Utilizatorul %d a cerut înscrierea în grupul %d"
+msgstr "%u a cerut să intre în Qun %u pentru %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "Utilizatorul %d a cerut înscrierea în grupul %d"
+msgstr "Utilizatorul %u a cerut intrarea în grupul %u"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Intrarea în chat alături de acest contact a eșuat"
+msgstr "Intrarea în Qun %u, operat de admin %u a eșuat"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>Intrarea în Qun %u este aprobată de admin %u pentru %s</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "Ștergere contact"
+msgstr "<b>Contactul %u a fost șters.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "Ștergere contact"
+msgstr "<b>Contactul nou %u a intrat.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7482,30 +7611,26 @@ msgstr " VIP"
 msgid " TCP"
 msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "Mobil"
+msgstr " DePeMobil"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "Mobil"
+msgstr " BindMobile"
 
-#, fuzzy
 msgid " Video"
-msgstr "Video în direct"
+msgstr " Video"
 
-#, fuzzy
 msgid " Zone"
-msgstr "Fără"
+msgstr " Zone"
 
 msgid "Flag"
-msgstr ""
+msgstr "Fanion"
 
 msgid "Ver"
 msgstr "Ver"
 
 msgid "Invalid name"
-msgstr "Nume invalid"
+msgstr "Nume nevalid"
 
 msgid "Select icon..."
 msgstr "Alegeți o iconiță..."
@@ -7581,33 +7706,39 @@ msgstr "<b>Contribuții de tip patch:</b> %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Mulțumiri</b>:<br>\n"
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Testeri neobosiți</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "și alții, vă rugăm să ne spuneți... vă mulțumim!))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Și pentru toți băieții din ultimele rânduri...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr "<i>Vă invităm să ni vă alăturați!</i> :)"
+msgstr "<i>Vă invităm să vă alăturați nouă!</i> :)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "About OpenQ %s"
-msgstr "Despre %s"
+msgstr "Despre OpenQ %s"
 
-#, fuzzy
 msgid "Change Icon"
-msgstr "Salvare avatar"
+msgstr "Schimbare iconiță"
 
 msgid "Change Password"
 msgstr "Schimbare parolă"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Informații de autentificare"
+msgstr "Informații despre cont"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "Actualizează toate Qun QQ"
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "Despre %s"
+msgstr "Despre OpenQ"
+
+msgid "Modify Buddy Memo"
+msgstr "Editare notiță contact"
 
 #. *< type
 #. *< ui_requirement
@@ -7619,17 +7750,14 @@ msgstr "Despre %s"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "Modul pentru protocolul QQ"
 
-#, fuzzy
 msgid "Auto"
-msgstr "Autor"
+msgstr "Auto"
 
-#, fuzzy
 msgid "Select Server"
-msgstr "Selectați utilizatorul"
+msgstr "Selectați serverul"
 
 msgid "QQ2005"
 msgstr "QQ2005"
@@ -7640,181 +7768,153 @@ msgstr "QQ2007"
 msgid "QQ2008"
 msgstr "QQ2008"
 
-#, fuzzy
 msgid "Connect by TCP"
 msgstr "Conectare folosind TCP"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "Port server"
+msgstr "Afișare notificări server"
 
-#, fuzzy
 msgid "Show server news"
-msgstr "Adresă server"
+msgstr "Afișare știri server"
+
+msgid "Show chat room when msg comes"
+msgstr "Arată camera de chat când vine msg"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "Eroare „keep alive”"
+msgstr "Interval „keep alive” (secunde)"
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "Eroare „keep alive”"
+msgstr "Interval de actualizare (secunde)"
 
-#, fuzzy
-msgid "Cannot decrypt server reply"
-msgstr "Nu s-au putut obține detalii despre server"
+msgid "Unable to decrypt server reply"
+msgstr "Nu s-a putut decripta răspunsul serverului"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "Eșuarea la cererea jetonului, 0x%02X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "Titlu invalid"
+msgstr "Lungime nevalidă de jeton, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX nu este suportat în prezent"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "E nevoie de înregistrare"
+msgstr "Necesită activare"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
+msgstr "Cod necunoscut de răspuns la autentificare (0x%02X)"
 
-#, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Nu s-au putut obține detalii despre server"
-
-#, fuzzy
 msgid "Requesting captcha"
-msgstr "Se cere atenție din partea contactului %s..."
+msgstr "Se cere imaginea captcha"
 
-#, fuzzy
 msgid "Checking captcha"
-msgstr "Se cere atenție din partea contactului %s..."
+msgstr "Se verifică imaginea captcha"
 
-#, fuzzy
 msgid "Failed captcha verification"
-msgstr "Autentificarea Yahoo! a eșuat"
+msgstr "Verificarea imaginii captcha a eșuat"
 
-#, fuzzy
 msgid "Captcha Image"
-msgstr "Salvează imaginea"
+msgstr "Imagine captcha"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "Introduceți parola"
+msgstr "Introduceți codul"
 
-#, fuzzy
 msgid "QQ Captcha Verification"
-msgstr "Verificare certificat SSL"
+msgstr "Verificare captcha QQ"
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "Introduceți numele grupului"
+msgstr "Introduceți textul din imagine"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "Răspuns necunoscut la verificarea parolei (0x%02X)"
 
 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Nu se poate deschide o conexiune."
+"Cod necunoscut de răspuns la autentificare (0x%02X):\n"
+"%s"
 
 msgid "Socket error"
 msgstr "Eroare de socket"
 
-msgid "Unable to read from socket"
-msgstr "Nu se poate citi din socket"
-
-msgid "Write Error"
-msgstr "Eroare la scriere"
-
-msgid "Connection lost"
-msgstr "Conexiune pierdută"
-
-#, fuzzy
 msgid "Getting server"
-msgstr "Introducere detalii..."
+msgstr "Se află serverul"
 
-#, fuzzy
 msgid "Requesting token"
-msgstr "Cerere respinsă"
+msgstr "Se cere jeton"
 
-msgid "Couldn't resolve host"
-msgstr "Nu s-a putut rezolva numele calculatorului"
+msgid "Unable to resolve hostname"
+msgstr "Nu se poate rezolva numele serverului"
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "Eroare invalidă"
+msgstr "Server sau port nevalid"
 
-#, fuzzy
 msgid "Connecting to server"
-msgstr "Conectare în progres la serverul SILC"
+msgstr "Conectare la server"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "Eroare QQid"
+msgstr "Eroare QQ"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Schimb de server ICQ"
+msgstr ""
+"Știri server:\n"
+"%s\n"
+"%s\n"
+"%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%s"
-msgstr "%s (%s)"
+msgstr "%s:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "From %s:"
-msgstr "Expeditor"
+msgstr "Expeditor %s:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Instrucțiuni server: %s"
+msgstr ""
+"Notificare server Expeditor %s: \n"
+"%s"
 
-#, fuzzy
 msgid "Unknown SERVER CMD"
-msgstr "Motiv necunoscut"
+msgstr "SERVER CMD necunoscut"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
+"Răspuns de eroare %s(0x%02X)\n"
+"Camera %u, răspuns 0x%02X"
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "Comandă"
+msgstr "Comandă QQ Qun"
 
-#, fuzzy
-msgid "Could not decrypt login reply"
-msgstr "Nu s-au putut obține detalii despre server"
+msgid "Unable to decrypt login reply"
+msgstr "Nu s-a putut decripta răspunsul de autentificare"
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
-msgstr "Motiv necunoscut"
+msgstr "LOGIN CMD necunoscut"
 
-#, fuzzy
 msgid "Unknown CLIENT CMD"
-msgstr "Motiv necunoscut"
+msgstr "CLIENT CMD necunoscut"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -7827,9 +7927,6 @@ msgstr "Trimitere fișier"
 msgid "%d canceled the transfer of %s"
 msgstr "%d a anulat transferul fișierului %s"
 
-msgid "Connection closed (writing)"
-msgstr "Conexiune terminată (la scriere)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titlu Grup:</b> %s<br>"
@@ -7883,17 +7980,6 @@ msgstr "Un administrator Sametime a făcut următorul anunț pe serverul %s:"
 msgid "Sametime Administrator Announcement"
 msgstr "Anunț din partea administratorului Sametime"
 
-msgid "Connection reset"
-msgstr "Conexiune resetată"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Eroare la citirea din socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Conectarea la server a eșuat"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anunț de la %s"
@@ -7916,6 +8002,9 @@ msgstr "Difuzoare"
 msgid "Video Camera"
 msgstr "Cameră video"
 
+msgid "File Transfer"
+msgstr "Transfer de fișiere"
+
 msgid "Supports"
 msgstr "Suportă:"
 
@@ -8420,6 +8509,7 @@ msgstr "<br><b>Chat HMAC:</b> %s"
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Topic chat:</b><br>%s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Moduri chat:</b> "
 
@@ -8444,6 +8534,7 @@ msgstr "Frază secretă pentru chat"
 msgid "Channel Public Keys List"
 msgstr "Listă chei publice chat"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8633,9 +8724,6 @@ msgstr "Organizație"
 msgid "Unit"
 msgstr "Unitate"
 
-msgid "Note"
-msgstr "Notă"
-
 msgid "Join Chat"
 msgstr "Intră într-un chat"
 
@@ -8735,6 +8823,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistici rețea"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping eșuat"
 
@@ -8799,8 +8890,8 @@ msgstr "Tip nesuportat de cheie publică"
 msgid "Disconnected by server"
 msgstr "Deconectat de server"
 
-msgid "Error during connecting to SILC Server"
-msgstr "Eroare la conectarea la serverul SILC"
+msgid "Error connecting to SILC Server"
+msgstr "Eroare de conectare la serverul SILC"
 
 msgid "Key Exchange failed"
 msgstr "Schimbul de chei a eșuat"
@@ -8811,16 +8902,10 @@ msgstr ""
 "Reluarea sesiunii detașate a eșuat. Încercați „Reconectare” pentru a crea o "
 "nouă conexiune."
 
-msgid "Connection failed"
-msgstr "Conexiunea a eșuat"
-
 msgid "Performing key exchange"
 msgstr "Se efectuează schimbul de chei"
 
-msgid "Unable to create connection"
-msgstr "Nu se poate crea o nouă conexiune"
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Nu s-a putut încărca perechea de chei SILC"
 
 #. Progress
@@ -8830,7 +8915,7 @@ msgstr "Conectare în progres la serverul SILC"
 msgid "Out of memory"
 msgstr "Nu mai există memorie disponibilă"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Nu s-a putut inițializa protocolul SILC"
 
 msgid "Error loading SILC key pair"
@@ -8843,6 +8928,7 @@ msgstr "Descărcare %s: %s"
 msgid "Your Current Mood"
 msgstr "Propria dispoziție"
 
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
@@ -9130,8 +9216,8 @@ msgstr "Semnează digital și verifică toate mesajele"
 msgid "Creating SILC key pair..."
 msgstr "Creez perechea de chei SILC..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Nu s-a putut crea perechea de chei SILC\n"
+msgid "Unable to create SILC key pair"
+msgstr "Nu s-a putut crea perechea de chei SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9227,63 +9313,70 @@ msgstr "„Whiteboard”"
 msgid "No server statistics available"
 msgstr "Nici o statistică nu e disponibilă pentru server"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Eroare la conectarea la serverul SILC"
+
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 "Eroare: Nepotrivire de versiune, încercați o versiune mai nouă de client"
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Eroare: Partenerul nu vă suportă tipul de cheie publică sau nu are încredere "
 "în ea."
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Eroare: Partenerul nu suportă grupul KE propus"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Eroare: Partenerul nu suportă cifrul propus"
 
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Eroare: Partenerul nu suport PKCS-ul propus"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Eroare: Partenerul nu suportă funcția hash propusă"
 
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Eroare: Partenerul nu suporta HMAC-ul propus"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Eroare: Semnătură incorectă"
 
+#, c-format
 msgid "Failure: Invalid cookie"
-msgstr "Eroare: Cookie invalid"
+msgstr "Eroare: Cookie nevalid"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Eroare: Autentificare eșuată"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "Nu s-a putut inițializa conexiunea ca client SILC"
+msgid "Unable to initialize SILC Client connection"
+msgstr "Nu s-a putut inițializa conexiunea client SILC"
 
 msgid "John Noname"
 msgstr "Ion Fărănume"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nu s-a putut încărca perechea de chei SILC: %s"
 
-msgid "Could not write"
-msgstr "Nu s-a putut scrie"
-
-msgid "Could not connect"
-msgstr "Conectare eșuată"
+msgid "Unable to create connection"
+msgstr "Nu se poate crea o nouă conexiune"
 
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Răspuns necunoscut de la server."
 
-msgid "Could not create listen socket"
-msgstr "Nu s-a putut crea un socket de ascultare"
-
-msgid "Could not resolve hostname"
-msgstr "Nu s-a putut rezolva numele calculatorului"
+msgid "Unable to create listen socket"
+msgstr "Nu se poate crea un socket de ascultare"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Numele de utilizatori SIP nu pot conține spații sau simbolul @"
@@ -9324,166 +9417,60 @@ msgstr "Autentificare utilizator"
 msgid "Auth Domain"
 msgstr "Autentificare domeniu"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Caut %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Conectarea la %s a eșuat"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Autentificare: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Nu se poate scrie fișierul %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Nu se poate citi fișierul %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Mesaj prea lung, ultimii %s octeți au fost trunchiați."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s nu este autentificat momentan."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Atenționarea lui %s nu este permisă."
-
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Un mesaj s-a pierdut, ați depășit limita de viteză fixată de server."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat-ul în %s nu este disponibil."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Trimiteți mesajele prea rapid pentru %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Ați pierdut un mesaj de la %s pentru că era prea mare."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Ați pierdut un mesaj de la %s pentru că a fost trimis prea repede."
-
-msgid "Failure."
-msgstr "Eșec."
-
-msgid "Too many matches."
-msgstr "Prea multe potriviri."
-
-msgid "Need more qualifiers."
-msgstr "E nevoie de mai multe atribute."
-
-msgid "Dir service temporarily unavailable."
-msgstr "Serviciul „Dir” este temporar indisponibil."
-
-msgid "Email lookup restricted."
-msgstr "Căutarea după adresa de mail este restricționată."
-
-msgid "Keyword ignored."
-msgstr "Cuvântul-cheie a fost ignorat."
-
-msgid "No keywords."
-msgstr "Fără cuvinte-cheie."
-
-msgid "User has no directory information."
-msgstr "Nu există informații detaliate în director."
-
-msgid "Country not supported."
-msgstr "Nu există suport de țară."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Eșec necunoscut: %s."
-
-msgid "Incorrect username or password."
-msgstr "Nume de utilizator sau parolă incorecte."
-
-msgid "The service is temporarily unavailable."
-msgstr "Serviciul este temporar indisponibil."
-
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-"Nivelul propriu de avertizare este prea ridicat pentru a vă putea "
-"autentifica."
-
-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 ""
-"V-ați conectat și deconectat de prea multe ori. Așteptați zece minute și "
-"încercați din nou. Dacă veți continua să încercați, va trebui să așteptați "
-"chiar mai mult."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Eroare necunoscută la autentificare: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Eroare necunoscută: %d. Detalii: %s"
-
-msgid "Invalid Groupname"
-msgstr "Grup invalid"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;room&gt;:  Intrați într-un chat din rețeaua Yahoo!"
 
-msgid "Connection Closed"
-msgstr "Conectare terminată"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Listează chat-urile din rețeaua Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Aștept răspunsul..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle:  Cereți unui utilizator să iniție o sesiune de mâzgălituri"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC a revenit din așteptare. Puteți trimite mesaje din nou."
+msgid "Yahoo ID..."
+msgstr "Identitate Yahoo..."
 
-msgid "Password Change Successful"
-msgstr "Parola a fost schimbată cu succes"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Modul de protocol Yahoo!"
 
-msgid "_Group:"
-msgstr "_Grup:"
+msgid "Pager server"
+msgstr "Server pager"
 
-msgid "Get Dir Info"
-msgstr "Descărcare detalii „Dir”"
+msgid "Pager port"
+msgstr "Port pager"
 
-msgid "Set Dir Info"
-msgstr "Introducere detalii „Dir”"
+msgid "File transfer server"
+msgstr "Server transfer de fișiere"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Nu s-a putut deschide %s pentru scriere!"
+msgid "File transfer port"
+msgstr "Port transfer de fișiere"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Transferul fișierului a eșuat, celălalt utilizator probabil l-a anulat."
+msgid "Chat room locale"
+msgstr "Opțiuni locale chat"
 
-msgid "Could not connect for transfer."
-msgstr "Conectarea pentru transfer a eșuat."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignoră invitațiile la conferințe și chat"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Nu s-a putut scrie antetul fișierului. Fișierul nu va fi transferat."
+msgid "Chat room list URL"
+msgstr "Adresă listă camere de chat"
 
-msgid "Save As..."
-msgstr "Salvare ca..."
+msgid "Yahoo Chat server"
+msgstr "Server Yahoo Chat"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s cere lui %s să accepte %d fișier: %s (%.2f %s)%s%s"
-msgstr[1] "%s cere lui %s să accepte %d fișiere: %s (%.2f %s)%s%s"
-msgstr[2] "%s cere lui %s să accepte %d de fișiere: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Port Yahoo Chat"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s vă cere să-i trimiteți un fișier"
+msgid "Yahoo JAPAN ID..."
+msgstr "Identitate Yahoo Japonia..."
 
 #. *< type
 #. *< ui_requirement
@@ -9495,17 +9482,14 @@ msgstr "%s vă cere să-i trimiteți un fișier"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Modul de protocol TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Modul de protocol Yahoo! Japonia"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s v-a trimis o invitație de a-i vedea webcam-ul, invitație ce nu este încă "
-"suportată"
+msgid "Your SMS was not delivered"
+msgstr "Mesajul SMS nu v-a fost trimis"
 
 msgid "Your Yahoo! message did not get sent."
-msgstr "Mesajul dumneavoastră Yahoo! nu a fost trimis."
+msgstr "Mesajul Yahoo! nu v-a fost trimis."
 
 #, c-format
 msgid "Yahoo! system message for %s:"
@@ -9528,6 +9512,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Adăugarea contactului a fost refuzată"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "S-au primit date nevalide"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Cont blocat: prea multe tentative eșuate de autentificare. Autentificarea "
+"în paginile web Yahoo! ar putea rezolva această problemă."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Cont blocat: motiv necunoscut. Autentificarea în paginile web Yahoo! ar "
+"putea rezolva această problemă."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Nume de utilizator sau parolă lipsă."
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9550,51 +9558,40 @@ msgstr ""
 "Alegeți „Da” pentru a-l șterge din listă și a-l ignora de acum înainte."
 
 msgid "Ignore buddy?"
-msgstr "Ignor contactul?"
+msgstr "Ignorați contactul?"
 
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Contul vă este blocat, autentificați-vă la www.yahoo.com !"
+msgstr "Contul vă este blocat, autentificați-vă în paginile web Yahoo!"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
-"rezolva această problemă."
+msgstr "Eroare necunoscută cu numărul %d. Autentificarea în paginile web "
+"Yahoo! ar putea rezolva această problemă."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Contactul %s nu a putut fi adăugat în grupul %s în lista de pe server pentru "
-"contul %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "Contactul %s nu a putut fi adăugat în grupul %s în lista de pe server "
+"pentru contul %s."
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "Contactul nu a putut fi adăugat în lista de pe server"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audibil %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "S-a primit un răspuns HTTP neașteptat de la server."
 
-msgid "Connection problem"
-msgstr "Probleme la conectare"
-
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
-"S-a pierdut conexiunea cu %s:\n"
-"%s"
+"S-a pierdut conexiunea cu %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Nu s-a putut face o conexiune cu %s:\n"
-"%s"
+"Nu s-a putut face o conexiune cu %s: %s"
 
 msgid "Not at Home"
 msgstr "Nu-s acasă"
@@ -9641,8 +9638,8 @@ msgstr "Opțiuni de prezență"
 msgid "Start Doodling"
 msgstr "Mâzgălituri"
 
-msgid "Activate which ID?"
-msgstr "Ce identitate doriți să activați?"
+msgid "Select the ID you want to activate"
+msgstr "Alegeți ID-ul ce doriți să-l activați"
 
 msgid "Join whom in chat?"
 msgstr "Cui doriți să vă alăturați în chat?"
@@ -9656,73 +9653,15 @@ msgstr "Chat cu un utilizator..."
 msgid "Open Inbox"
 msgstr "Deschidere mail"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;room&gt;:  Intrați într-un chat din rețeaua Yahoo!"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Listează chat-urile din rețeaua Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle:  Cereți unui utilizator să iniție o sesiune de mâzgălituri"
-
-msgid "Yahoo ID..."
-msgstr "Identitate Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Modul de protocol Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonia"
-
-msgid "Pager server"
-msgstr "Server pager"
-
-msgid "Japan Pager server"
-msgstr "Server pager Japonia"
-
-msgid "Pager port"
-msgstr "Port pager"
-
-msgid "File transfer server"
-msgstr "Server transfer de fișiere"
-
-msgid "Japan file transfer server"
-msgstr "Server transfer de fișiere Japonia"
-
-msgid "File transfer port"
-msgstr "Port transfer de fișiere"
-
-msgid "Chat room locale"
-msgstr "Opțiuni locale chat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignoră invitațiile la conferințe și chat"
-
-msgid "Chat room list URL"
-msgstr "Adresă listă camere de chat"
-
-msgid "Yahoo Chat server"
-msgstr "Server Yahoo Chat"
-
-msgid "Yahoo Chat port"
-msgstr "Port Yahoo Chat"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "S-a trimis o cerere de mâzgăleală."
 
+msgid "Unable to connect."
+msgstr "Nu se poate deschide o conexiune."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nu se poate evalua descriptorul fișierului."
 
@@ -9730,6 +9669,9 @@ msgstr "Nu se poate evalua descriptorul fișierului."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s se oferă să vă trimită un grup de %d fișiere.\n"
 
+msgid "Write Error"
+msgstr "Eroare la scriere"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonia"
 
@@ -9800,13 +9742,8 @@ msgid "The user's profile is empty."
 msgstr "Profilul utilizatorului este gol."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s a declinat invitația la conferința din camera de chat „%s” din următorul "
-"motiv: „%s”."
-
-msgid "Invitation Rejected"
-msgstr "Invitație respinsă"
+msgid "%s has declined to join."
+msgstr "%s a refuzat să intre."
 
 msgid "Failed to join chat"
 msgstr "Intrarea în chat a eșuat"
@@ -9849,22 +9786,17 @@ msgstr "Audio"
 msgid "Webcams"
 msgstr "Video"
 
+msgid "Connection problem"
+msgstr "Probleme la conectare"
+
 msgid "Unable to fetch room list."
 msgstr "Nu se poate obține lista camerelor de chat."
 
 msgid "User Rooms"
 msgstr "Camere de chat utilizatori"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Probleme de conectare la serverul YCHT."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"S-a pierdut conexiunea cu serverul\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Probleme de conexiune cu serverul YCHT."
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9996,32 +9928,21 @@ msgid "Exposure"
 msgstr "Expunere"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Nu s-a putut crea un socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Eroare la conectarea la serverul proxy HTTP: %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Acces interzis: serverul proxy nu permite tunelarea portului %d."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "Acces interzis: serverul proxy HTTP interzice tunelarea portului %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Eroare la rezolvarea %s"
 
-msgid "Could not resolve host name"
-msgstr "Nu s-a putut rezolva numele serverului"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Se cere atenție din partea contactului %s..."
@@ -10094,7 +10015,7 @@ msgid "SSL Handshake Failed"
 msgstr "Conexiunea SSL a eșuat"
 
 msgid "SSL peer presented an invalid certificate"
-msgstr "Partenerul SSL a prezentat un certificat invalid"
+msgstr "Partenerul SSL a prezentat un certificat nevalid"
 
 msgid "Unknown SSL error"
 msgstr "Eroare SSL necunoscută"
@@ -10108,9 +10029,6 @@ msgstr "Nu deranjați"
 msgid "Extended away"
 msgstr "Absență prelungită"
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Listening to music"
 msgstr "Audiție muzicală"
 
@@ -10152,18 +10070,6 @@ msgstr "+++ %s a revenit din inactivitate"
 msgid "%x %X"
 msgstr "%x la %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Eroare la citirea %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"A apărut o eroare la citirea fișierului %s. Încărcarea datelor a eșuat și "
-"vechiul fișier a fost redenumit „%s~”."
-
 msgid "Calculating..."
 msgstr "Se calculează..."
 
@@ -10254,25 +10160,42 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Conexiunea a fost întreruptă de un alt program pornit."
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "Conexiunea a fost închisă la distanță."
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "Conexiunea a expirat."
 
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "Conexiune resetată."
 
 #. 10048
+#, c-format
 msgid "Address already in use."
 msgstr "Adresa este deja utilizată."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Eroare la citirea %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"A apărut o eroare la citirea %s. Fișierul nu a fost încărcat și "
+"vechiul fișier a fost redenumit în „%s~”."
+
 msgid "Internet Messenger"
 msgstr "Mesagerie instant"
 
@@ -10315,10 +10238,8 @@ msgstr "Notificare la _mail nou"
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizează această _iconiță pentru acest cont:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Opțiuni %s"
+msgid "Ad_vanced"
+msgstr "_Avansat"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Utilizează opțiunile GNOME"
@@ -10353,9 +10274,6 @@ msgstr "Dacă vă uitați cu atenție"
 msgid "you can see the butterflies mating"
 msgstr "veți puteți vedea cum se scurg secundele..."
 
-msgid "Proxy Options"
-msgstr "Opțiuni proxy"
-
 msgid "Proxy _type:"
 msgstr "_Tip proxy:"
 
@@ -10383,8 +10301,8 @@ msgstr "S_tandard"
 msgid "Create _this new account on the server"
 msgstr "Creează acest _nou cont pe server"
 
-msgid "_Advanced"
-msgstr "_Avansat"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Activare"
@@ -10435,16 +10353,17 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Trebuie să actualizați câmpurile cerute."
 
-msgid "Room _List"
-msgstr "_Listă de camere"
+msgid "A_ccount"
+msgstr "_Cont"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Introduceți detaliile chat-ului în care doriți să intrați.\n"
+msgstr ""
+"Introduceți informațiile despre chat-ul în care doriți să participați.\n"
 
-msgid "_Account:"
-msgstr "C_ont:"
+msgid "Room _List"
+msgstr "_Listă de camere"
 
 msgid "_Block"
 msgstr "_Blochează"
@@ -10461,6 +10380,15 @@ msgstr "_Detalii"
 msgid "I_M"
 msgstr "_Mesaj"
 
+msgid "_Audio Call"
+msgstr "_Apel audio"
+
+msgid "Audio/_Video Call"
+msgstr "Apel audio/_video"
+
+msgid "_Video Call"
+msgstr "Apel _video"
+
 msgid "_Send File..."
 msgstr "_Trimitere fișier..."
 
@@ -10470,14 +10398,17 @@ msgstr "Adăugare întâm_pinare..."
 msgid "View _Log"
 msgstr "Arată în_registrările"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Ascunde la deconectare"
 
+msgid "Show When Offline"
+msgstr "Arată la deconectare"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
 msgid "_Remove"
-msgstr "Șter_ge"
+msgstr "Șt_erge"
 
 msgid "Set Custom Icon"
 msgstr "Iconiță personalizată..."
@@ -10492,7 +10423,7 @@ msgid "Add C_hat..."
 msgstr "Adaugă un c_hat..."
 
 msgid "_Delete Group"
-msgstr "Șter_gere grup"
+msgstr "Șt_ergere grup"
 
 msgid "_Rename"
 msgstr "_Redenumire"
@@ -10522,7 +10453,7 @@ msgstr "/Unelte/Fără sunete"
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
-"Nu sunteți autentificat(ă) cu nici un protocol prin care care să puteți "
+"Nu v-ați autentificat cu nici un protocol prin care care să puteți "
 "adăuga acel contact."
 
 #. I don't believe this can happen currently, I think
@@ -10597,6 +10528,9 @@ msgstr "/Unelte/Î_ntâmpinări contacte"
 msgid "/Tools/_Certificates"
 msgstr "/Unelte/_Certificate"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Unelte/_Iconițe simbolice"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Unelte/_Module"
 
@@ -10606,9 +10540,6 @@ msgstr "/Unelte/_Preferințe"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Unelte/S_ecuritate"
 
-msgid "/Tools/Smile_y"
-msgstr "/Unelte/_Iconițe simbolice"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Unelte/_Transfer de fișiere"
 
@@ -10727,8 +10658,8 @@ msgstr "Manual"
 msgid "By status"
 msgstr "După status"
 
-msgid "By log size"
-msgstr "După mărimea înregistrărilor"
+msgid "By recent log activity"
+msgstr "După înregistrările recente"
 
 #, c-format
 msgid "%s disconnected"
@@ -10744,6 +10675,9 @@ msgstr "Reconectare"
 msgid "Re-enable"
 msgstr "Reactivare"
 
+msgid "SSL FAQs"
+msgstr "Întrebări frecvente SSL"
+
 msgid "Welcome back!"
 msgstr "Bine ați revenit!"
 
@@ -10823,8 +10757,7 @@ msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
-"Nu sunteți autentificat(ă) cu vreun protocol prin care să puteți iniția un "
-"chat."
+"Nu v-ați autentificat cu vreun protocol prin care să puteți iniția un chat."
 
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
@@ -10836,6 +10769,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Grup:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Intră a_utomat când contul e online."
 
@@ -10869,6 +10805,102 @@ msgstr "/Unelte"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacte/Sortează contactele"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Culoare fundal"
+
+msgid "The background color for the buddy list"
+msgstr "Culoarea de fundal pentru lista de contacte"
+
+msgid "Layout"
+msgstr "Dispunere"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Dispunerea iconițelor, numelui și a statusului în lista de contacte"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Culoare fundal la desfacere"
+
+msgid "The background color of an expanded group"
+msgstr "Culoarea de fundal a unui grup desfăcut"
+
+msgid "Expanded Text"
+msgstr "Text text la desfacere"
+
+msgid "The text information for when a group is expanded"
+msgstr "Informația text pentru un grup desfăcut"
+
+msgid "Collapsed Background Color"
+msgstr "Culoare fundal la strângere"
+
+msgid "The background color of a collapsed group"
+msgstr "Culoarea de fundal a unui grup strâns"
+
+msgid "Collapsed Text"
+msgstr "Text la strângere"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Informația text pentru un grup strâns"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Culoare fundal contact/chat"
+
+msgid "The background color of a contact or chat"
+msgstr "Culoarea de fundal a unui contact sau chat"
+
+msgid "Contact Text"
+msgstr "Text contact"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Informația text pentru un contact strâns"
+
+msgid "On-line Text"
+msgstr "Text on-line"
+
+msgid "The text information for when a buddy is online"
+msgstr "Informația text pentru un contact conectat"
+
+msgid "Away Text"
+msgstr "Text absent"
+
+msgid "The text information for when a buddy is away"
+msgstr "Informația text pentru un contact absent"
+
+msgid "Off-line Text"
+msgstr "Text deconectat"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Informația text pentru un contact deconectat"
+
+msgid "Idle Text"
+msgstr "Text inactiv"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Informația text pentru un contact inactiv"
+
+msgid "Message Text"
+msgstr "Text mesaj"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Informația text pentru un contact cu un mesaj necitit"
+
+msgid "Message (Nick Said) Text"
+msgstr "Textul mesajului (utilizatorul a spus)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr "Informația text pentru un chat cu un mesaj necitit care vă "
+"menționează numele"
+
+msgid "The text information for a buddy's status"
+msgstr "Informația text pentru starea unui contact"
+
+msgid "Type the host name for this certificate."
+msgstr "Introduceți numele calculatorului pentru acest certificat."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servere SSL"
@@ -10882,20 +10914,12 @@ msgstr "Contactul nu este în același protocol cu acest chat."
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
-"Nu sunteți autentificat(ă) cu nici un protocol prin care care să puteți "
+"Nu v-ați autentificat cu nici un protocol prin care care să puteți "
 "invita acel contact."
 
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invită contactul în camera de chat"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Introduceți numele utilizatorului pe care doriți să-l invitați. Puteți "
-"adăuga un mesaj de invitare opțional."
-
 msgid "_Buddy:"
 msgstr "_Contact:"
 
@@ -10924,7 +10948,7 @@ msgstr "Ignoră"
 msgid "Get Away Message"
 msgstr "Obține mesajul în absență"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Ultima replică"
 
 msgid "Unable to save icon file to disk."
@@ -10970,6 +10994,18 @@ msgstr "/Discuție/_Salvează ca..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Discuție/G_olește fereastra"
 
+msgid "/Conversation/M_edia"
+msgstr "/Discuție/Me_dia"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Discuție/Media/Apel _audio"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Discuție/Media/Apel _video"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Discuție/Media/Ap_el audio\\/video"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Discuție/_Trimite un fișier..."
 
@@ -10977,7 +11013,7 @@ msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Discuție/Adaugă î_ntâmpinare..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Discuție/D_etalii"
+msgstr "/Discuție/Detali_i"
 
 msgid "/Conversation/In_vite..."
 msgstr "/Discuție/_Invită..."
@@ -10998,13 +11034,13 @@ msgid "/Conversation/_Add..."
 msgstr "/Discuție/A_daugă..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/Discuție/Șter_ge..."
+msgstr "/Discuție/Șt_erge..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Discuție/Inserează o a_dresă..."
+msgstr "/Discuție/Inserea_ză o adresă..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Discuție/Inserea_ză o imagine..."
+msgstr "/Discuție/Inserează o ima_gine..."
 
 msgid "/Conversation/_Close"
 msgstr "/Discuție/În_chide"
@@ -11042,6 +11078,15 @@ msgstr "/Discuție"
 msgid "/Conversation/View Log"
 msgstr "/Discuție/Arată înregistrările"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Discuție/Media/Apel audio"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Discuție/Media/Apel video"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Discuție/Media/Apel audio\\/video"
+
 msgid "/Conversation/Send File..."
 msgstr "/Discuție/Trimite un fișier..."
 
@@ -11225,6 +11270,9 @@ msgstr "artist"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "voce și video"
+
 msgid "support"
 msgstr "suport"
 
@@ -11349,6 +11397,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Maghiară"
 
+msgid "Armenian"
+msgstr "Armeană"
+
 msgid "Indonesian"
 msgstr "Indoneziană"
 
@@ -11364,6 +11415,9 @@ msgstr "Georgiană"
 msgid "Ubuntu Georgian Translators"
 msgstr "Traducătorii Ubuntu din Georgia"
 
+msgid "Khmer"
+msgstr "Khmeră"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11385,6 +11439,9 @@ msgstr "Lituaniană"
 msgid "Macedonian"
 msgstr "Macedoneană"
 
+msgid "Mongolian"
+msgstr "Mongoleză"
+
 msgid "Bokmål Norwegian"
 msgstr "Norvegiană Bokmål"
 
@@ -11439,6 +11496,9 @@ msgstr "Sinhala"
 msgid "Swedish"
 msgstr "Suedeză"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11498,8 +11558,30 @@ msgstr ""
 "„COPYRIGHT” pentru o listă completă a celor ce au contribuit. Nu se oferă "
 "nici un fel de garanție pentru acest program.<BR><BR>"
 
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+"<FONT SIZE=\"4\">Ajutor prin mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">Canal IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Programatori activi"
@@ -11581,7 +11663,7 @@ msgid "Remove Contact"
 msgstr "Ștergere contact"
 
 msgid "_Remove Contact"
-msgstr "Șter_gere contact"
+msgstr "Șt_ergere contact"
 
 #, c-format
 msgid ""
@@ -11609,7 +11691,7 @@ msgid "Remove Group"
 msgstr "Ștergere grup"
 
 msgid "_Remove Group"
-msgstr "Șter_gere grup"
+msgstr "Șt_ergere grup"
 
 #, c-format
 msgid ""
@@ -11622,7 +11704,7 @@ msgid "Remove Buddy"
 msgstr "Ștergere contact"
 
 msgid "_Remove Buddy"
-msgstr "Șter_ge contactul"
+msgstr "Șt_erge contactul"
 
 #, c-format
 msgid ""
@@ -11636,7 +11718,7 @@ msgid "Remove Chat"
 msgstr "Ștergere chat"
 
 msgid "_Remove Chat"
-msgstr "Șter_gere chat"
+msgstr "Șt_ergere chat"
 
 msgid "Right-click for more unread messages...\n"
 msgstr "Click dreapta pentru mai multe mesaje necitite...\n"
@@ -11723,19 +11805,11 @@ msgid "Close this window when all transfers _finish"
 msgstr "Închide fereastra la _terminarea tuturor transferurilor"
 
 msgid "C_lear finished transfers"
-msgstr "Șter_ge transferurile terminate"
+msgstr "Șt_erge transferurile terminate"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "_Detaliile transferului de fișiere"
-
-#. Pause button
-msgid "_Pause"
-msgstr "_Pauză"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Reluare"
+msgstr "Detaliile trans_ferului de fișiere"
 
 msgid "Paste as Plain _Text"
 msgstr "Lipește ca text _simplu"
@@ -11755,8 +11829,8 @@ msgstr "Culoare pentru afișarea adreselor."
 msgid "Hyperlink visited color"
 msgstr "Culoare adresă web"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
-msgstr "Culoare pentru afișarea adreselor web vizitate ori activate."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr "Culoare pentru afișarea adreselor web vizitate (ori activate)."
 
 msgid "Hyperlink prelight color"
 msgstr "Culoare evidențiere adresă"
@@ -11791,14 +11865,20 @@ msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Culoare pentru mesajele comenzi în mod discret"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Culoare de utilizat pentru numele mesajelor discrete de acțiune."
+
 msgid "Whisper Message Name Color"
 msgstr "Culoare pentru mesajele discrete"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Culoare de utilizat pentru numele mesajelor discrete."
+
 msgid "Typing notification color"
 msgstr "Culoarea mesajelor de notificare"
 
-msgid "The color to use for the typing notification font"
-msgstr "Culoare de utilizat pentru mesajele de notificare"
+msgid "The color to use for the typing notification"
+msgstr "Culoare de utilizat pentru notificarea tastării"
 
 msgid "Typing notification font"
 msgstr "Fontul mesajelor de notificare"
@@ -11809,15 +11889,6 @@ msgstr "Font de utilizat pentru mesajele de notificare"
 msgid "Enable typing notification"
 msgstr "Activează mesajele de notificare"
 
-msgid "_Copy Email Address"
-msgstr "C_opiază adresa de mail"
-
-msgid "_Open Link in Browser"
-msgstr "_Deschide adresa în navigator"
-
-msgid "_Copy Link Location"
-msgstr "_Copiază adresa"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11951,9 +12022,6 @@ msgstr "Micșorează fontul"
 msgid "Font Face"
 msgstr "Nume font"
 
-msgid "Background Color"
-msgstr "Culoare fundal"
-
 msgid "Foreground Color"
 msgstr "Culoare text"
 
@@ -12070,6 +12138,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12084,6 +12153,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    utilizează calea DIR pentru fișierele de configurare\n"
 "  -d, --debug         arată mesaje de depanare în ieșirea standard (stdout)\n"
+"  -f, --force-online  forțează conectarea în orice condiții\n"
 "  -h, --help          arată acest mesaj de ajutor\n"
 "  -m, --multiple      permite instanțe multiple\n"
 "  -n, --nologin       fără autentificare automată\n"
@@ -12100,6 +12170,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12113,6 +12184,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    utilizează calea DIR pentru fișierele de configurare\n"
 "  -d, --debug         arată mesaje de depanare în ieșirea standard (stdout)\n"
+"  -f, --force-online  forțează conectarea în orice condiții\n"
 "  -h, --help          arată acest mesaj de ajutor\n"
 "  -m, --multiple      permite instanțe multiple\n"
 "  -n, --nologin       fără autentificare automată\n"
@@ -12155,11 +12227,29 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Deschide toate mesajele"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "Se iese pentru că un alt client libpurple este deja pornit.\n"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Aveți mail nou!</span>"
+msgid "/_Media"
+msgstr "/_Media"
+
+msgid "/Media/_Hangup"
+msgstr "/Media/Înc_hide"
+
+msgid "Calling..."
+msgstr "Se apelează..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s dorește să inițieze o sesiune audio/video."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s dorește să inițieze o sesiune video."
+
+msgid "_Pause"
+msgstr "_Pauză"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12177,7 +12267,7 @@ msgstr[2] "<b>%d de mailuri noi.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Navigatorul „%s” este invalid."
+msgstr "Navigatorul „%s” este nevalid."
 
 msgid "Unable to open URL"
 msgstr "Nu se poate deschide acest URL"
@@ -12192,6 +12282,24 @@ msgstr ""
 "Ați ales să precizați o comandă pentru deschiderea unui navigator, dar nu "
 "ați introdus-o în preferințe."
 
+msgid "No message"
+msgstr "Nici un mesaj"
+
+msgid "Open All Messages"
+msgstr "Deschide toate mesajele"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Aveți mail nou!</span>"
+
+msgid "New Pounces"
+msgstr "Întâmpinare nouă"
+
+msgid "Dismiss"
+msgstr "Închide"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Întâmpinare</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Următoarele module vor fi dezactivate."
 
@@ -12240,10 +12348,16 @@ msgstr "<b>Detalii modul</b>"
 msgid "Select a file"
 msgstr "Selectați un fișier"
 
+msgid "Modify Buddy Pounce"
+msgstr "Editare întâmpinare"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Întâmpinare pentru"
 
+msgid "_Account:"
+msgstr "C_ont:"
+
 msgid "_Buddy name:"
 msgstr "Nu_me contact:"
 
@@ -12310,8 +12424,58 @@ msgstr "Re_curentă"
 msgid "Pounce Target"
 msgstr "Țintă întâmpinare"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Tema de iconițe simbolice nu a putut fi dezarhivată."
+#, c-format
+msgid "Started typing"
+msgstr "A început să tasteze"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "S-a oprit momentan din tastare"
+
+#, c-format
+msgid "Signed on"
+msgstr "S-a autentificat"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "S-a întors din inactivitate"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "S-a întors din absență"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "S-a oprit din scris"
+
+#, c-format
+msgid "Signed off"
+msgstr "S-a deconectat"
+
+#, c-format
+msgid "Became idle"
+msgstr "A intrat în inactivitate"
+
+#, c-format
+msgid "Went away"
+msgstr "A devenit absent"
+
+#, c-format
+msgid "Sent a message"
+msgstr "A trimis un mesaj"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Eveniment necunoscut... Vă rugăm să raportați acest lucru!"
+
+msgid "Theme failed to unpack."
+msgstr "Tema nu a putut fi despachetată."
+
+msgid "Theme failed to load."
+msgstr "Tema nu a putut fi încărcată."
+
+msgid "Theme failed to copy."
+msgstr "Tema nu a putut fi copiată."
 
 msgid "Install Theme"
 msgstr "Instalare temă"
@@ -12333,6 +12497,11 @@ msgstr "Combinații de taste"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Închide _fereastra de discuții cu tasta Esc"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Tema listei de contacte"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Iconiță în zona de notificare"
 
@@ -12342,8 +12511,8 @@ msgstr "Arată iconița din _zona de notificare:"
 msgid "On unread messages"
 msgstr "Pentru mesajele necitite"
 
-msgid "Conversation Window Hiding"
-msgstr "Ascundere ferestre de discuții"
+msgid "Conversation Window"
+msgstr "Fereastra de discuții"
 
 msgid "_Hide new IM conversations:"
 msgstr "Ascunde discuțiile _noi:"
@@ -12351,6 +12520,9 @@ msgstr "Ascunde discuțiile _noi:"
 msgid "When away"
 msgstr "În absență"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zează noile ferestre de discuții"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Taburi"
@@ -12409,9 +12581,6 @@ msgstr "Derulare cu efect"
 msgid "F_lash window when IMs are received"
 msgstr "_Evidențiază fereastra la primirea de mesaje"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zează noile ferestre de discuții"
-
 msgid "Minimum input area height in lines:"
 msgstr "Înălțime minimă pentru zona de introducere de text:"
 
@@ -12443,14 +12612,12 @@ msgstr "Nu s-a putut porni programul de configurare a unui proxy."
 msgid "Cannot start browser configuration program."
 msgstr "Nu s-a putut porni programul de configurare a unui navigator."
 
-msgid "ST_UN server:"
-msgstr "Server ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplu: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Autodetectare adresă IP"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Utilizează adresa IP _autodetectată: %s"
 
 msgid "Public _IP:"
 msgstr "_IP public:"
@@ -12470,6 +12637,10 @@ msgstr "_De la:"
 msgid "_End port:"
 msgstr "_Până la:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Server releu (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Server proxy &amp; navigator"
 
@@ -12498,6 +12669,10 @@ msgstr "Server proxy"
 msgid "No proxy"
 msgstr "Fără proxy"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr "Cereri DNS prin proxy-urile SOCKS4"
+
 msgid "_User:"
 msgstr "Utili_zator:"
 
@@ -12578,21 +12753,27 @@ msgstr "Înregistrează toate schimbările de _status în înregistrările de si
 msgid "Sound Selection"
 msgstr "Selectați un sunet"
 
+#, c-format
 msgid "Quietest"
 msgstr "Foarte încet"
 
+#, c-format
 msgid "Quieter"
 msgstr "Mai încet"
 
+#, c-format
 msgid "Quiet"
 msgstr "Încet"
 
+#, c-format
 msgid "Loud"
 msgstr "Tare"
 
+#, c-format
 msgid "Louder"
 msgstr "Mai tare"
 
+#, c-format
 msgid "Loudest"
 msgstr "Foarte tare"
 
@@ -12650,12 +12831,12 @@ msgstr "În absență și inactivitate"
 msgid "Auto-away"
 msgstr "Absențe automate"
 
-msgid "Change status when _idle"
-msgstr "Schimbă statusul în _inactivitate"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minute înaintea intrării în inactivitate:"
 
+msgid "Change status when _idle"
+msgstr "Schimbă statusul în _inactivitate"
+
 msgid "Change _status to:"
 msgstr "Schimbă _statusul în:"
 
@@ -12803,47 +12984,43 @@ msgstr "Sal_vează și utilizează"
 msgid "Status for %s"
 msgstr "Status pentru %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Există deja o iconiță simbolică pentru '%s'. Alegeți altă combinație de semne."
+
 msgid "Custom Smiley"
 msgstr "Iconiță simbolică personalizată"
 
-msgid "More Data needed"
-msgstr "E nevoie de mai multe date"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Alegeți o combinație de semne de asociat acestei iconițe."
-
 msgid "Duplicate Shortcut"
 msgstr "Combinație duplicată de semne"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"O iconiță simbolică personalizată există deja pentru combinația de semne "
-"selectată. Alegeți o altă combinație de semne."
-
-msgid "Please select an image for the smiley."
-msgstr "Selectați o imagine pentru această iconiță."
-
 msgid "Edit Smiley"
 msgstr "Editare iconiță simbolică"
 
 msgid "Add Smiley"
 msgstr "Adăugare iconiță simbolică"
 
-msgid "Smiley _Image"
-msgstr "_Imagine iconiță simbolică"
+msgid "_Image:"
+msgstr "_Imagine:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Combinație de _taste asociată"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "_Textul combinației de semne"
 
 msgid "Smiley"
 msgstr "Iconiță simbolice"
 
+msgid "Shortcut Text"
+msgstr "Textul combinației de semne"
+
 msgid "Custom Smiley Manager"
 msgstr "Administrator de iconițe personalizate"
 
+msgid "Select Buddy Icon"
+msgstr "Selectare iconiță contact"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Clic aici pentru a vă schimba avatarul pentru acest cont."
 
@@ -12929,11 +13106,11 @@ msgid "Cannot send launcher"
 msgstr "Lansatorul nu a putut fi trimis"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Ați tras și plasat un lansator pentru desktop. Probabil doriți sa trimiteți "
-"nu lansatorul în sine, ci fișierul la care face referire."
+"fișierul la care face referire, nu lansatorul în sine."
 
 #, c-format
 msgid ""
@@ -12966,9 +13143,30 @@ msgstr ""
 "Dintr-un motiv necunoscut nu s-a putut încărca imaginea „%s”, probabil este "
 "un fișier imagine corupt"
 
+msgid "_Open Link"
+msgstr "_Deschide linkul:"
+
+msgid "_Copy Link Location"
+msgstr "_Copiază adresa"
+
+msgid "_Copy Email Address"
+msgstr "_Copiază adresa de mail"
+
+msgid "_Open File"
+msgstr "_Deschide fișierul..."
+
+msgid "Open _Containing Directory"
+msgstr "Deschide directorul ce _conține"
+
 msgid "Save File"
 msgstr "Salvare fișier"
 
+msgid "_Play Sound"
+msgstr "_Redare sunet"
+
+msgid "_Save File"
+msgstr "_Salvare fișier"
+
 msgid "Select color"
 msgstr "Selectare culoare"
 
@@ -13056,6 +13254,65 @@ msgstr "Modul pentru disponibilitatea contactelor"
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Arată statistici despre disponibilitatea contactelor"
 
+msgid "Server name request"
+msgstr "Cerere nume server"
+
+msgid "Enter an XMPP Server"
+msgstr "Introduceți un server XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Selectați un server XMPP pentru interogare"
+
+msgid "Find Services"
+msgstr "Căutare de servicii"
+
+msgid "Add to Buddy List"
+msgstr "Adaugă la lista de contacte"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Directory"
+msgstr "Director"
+
+msgid "PubSub Collection"
+msgstr "Colecție PubSub"
+
+msgid "PubSub Leaf"
+msgstr "Frunză PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descriere:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Descoperire de servicii"
+
+msgid "_Browse"
+msgstr "_Navigare:"
+
+msgid "Server does not exist"
+msgstr "Server inexistent"
+
+msgid "Server does not support service discovery"
+msgstr "Serverul nu permite descoperirea serviciilor"
+
+msgid "XMPP Service Discovery"
+msgstr "Descoperire de servicii XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Permite navigarea și înregistrarea serviciilor"
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Acest modul este util pentru înregistrarea cu transporturi învechite sau alte servicii XMPP."
+
 msgid "Buddy is idle"
 msgstr "Contactul este inactiv"
 
@@ -13448,20 +13705,20 @@ msgstr "Mesaje muzicale pentru compoziții în colaborare."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
-"Modulul de mesaje muzicale permite utilizatorilor să lucreze simultan la o "
+"Modulul de mesaje muzicale permite mai multor utilizatori să lucreze simultan la o "
 "piesă muzicală editând o partitură comună în timp real."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
-msgstr "Notifică în:"
+msgstr "Notifică pentru"
 
 msgid "\t_Only when someone says your username"
-msgstr "\tDoar când cineva _vă spune numele de utilizator într-un chat"
+msgstr "\tD_oar când cineva vă spune numele de utilizator"
 
 msgid "_Focused windows"
-msgstr "F_erestrele în prim plan"
+msgstr "_Ferestrele în prim plan"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
@@ -13560,12 +13817,6 @@ msgstr ""
 "- Inversează textul mesajelor primite\n"
 "- Trimite un mesaj contactelor din listă atunci când se autentifică."
 
-msgid "Cursor Color"
-msgstr "Culoare cursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Culoare cursor secundar"
-
 msgid "Hyperlink Color"
 msgstr "Culoare adresă web"
 
@@ -13575,6 +13826,9 @@ msgstr "Culoare adresă web vizitată"
 msgid "Highlighted Message Name Color"
 msgstr "Numele culorii pentru evidențierea mesajelor"
 
+msgid "Typing Notification Color"
+msgstr "Culoarea mesajelor de notificare la tastare"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separare orizontală GtkTreeView"
 
@@ -13590,6 +13844,7 @@ msgstr "Dialog notificare"
 msgid "Select Color"
 msgstr "Alegeți o culoare"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "Alegeți fontul interfeței"
 
@@ -13603,35 +13858,21 @@ msgstr "Font interfață GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Temă combinații de taste GTK+ Text"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Culori interfață"
+msgid "Disable Typing Notification Text"
+msgstr "Dezactivează textul notificării la tastare"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Opțiuni de control a temei GTK+"
 
-msgid "Widget Sizes"
-msgstr "Mărimi widget-uri"
+msgid "Colors"
+msgstr "Culori"
 
 msgid "Fonts"
 msgstr "Fonturi"
 
+msgid "Miscellaneous"
+msgstr "Diverse"
+
 msgid "Gtkrc File Tools"
 msgstr "Unelte fișiere Gtkrc"
 
@@ -13717,8 +13958,8 @@ msgstr "Buton de trimitere în fereastra de discuții"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
-msgstr "Adaugă un buton de trimitere a mesajului în fereastra de discuții."
+"for use when no physical keyboard is present."
+msgstr "Adaugă un buton de trimitere a mesajului în fereastra de discuții. A se folosi când nu există o tastatură fizică."
 
 msgid "Duplicate Correction"
 msgstr "Corecție duplicată"
@@ -13769,6 +14010,98 @@ msgstr "Corecturi text"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Schimbă mesajele trimise după reguli predefinite de utilizator."
 
+msgid "Just logged in"
+msgstr "Tocmai s-a autentificat"
+
+msgid "Just logged out"
+msgstr "Tocmai s-a deconectat"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Iconiță pentru contact/\n"
+"Iconiță pentru persoane necunoscute"
+
+msgid "Icon for Chat"
+msgstr "Iconiță pentru chat"
+
+msgid "Ignored"
+msgstr "Ignorat"
+
+msgid "Founder"
+msgstr "Fondator"
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "Operator"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr "Sub-operator"
+
+msgid "Authorization dialog"
+msgstr "Dialog de autorizare"
+
+msgid "Error dialog"
+msgstr "Dialog de eroare"
+
+msgid "Information dialog"
+msgstr "Dialog de informare"
+
+msgid "Mail dialog"
+msgstr "Dialog de mail"
+
+msgid "Question dialog"
+msgstr "Dialog de interogare"
+
+msgid "Warning dialog"
+msgstr "Dialog de avertizare"
+
+msgid "What kind of dialog is this?"
+msgstr "Ce fel de dialog este acesta?"
+
+msgid "Status Icons"
+msgstr "Iconițe de status"
+
+msgid "Chatroom Emblems"
+msgstr "Embleme de camere de chat"
+
+msgid "Dialog Icons"
+msgstr "Iconițe de dialog"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Editor de teme de iconițe Pidgin"
+
+msgid "Contact"
+msgstr "Contact"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Editor de teme pentru lista de contacte Pidgin"
+
+msgid "Edit Buddylist Theme"
+msgstr "Editare temă listă de contacte"
+
+msgid "Edit Icon Theme"
+msgstr "Editare temă de iconițe"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Editor de teme Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Editor de teme Pidgin."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13810,6 +14143,7 @@ msgstr "Adaugă marcaje de timp în stil iChat la fiecare N minute."
 msgid "Timestamp Format Options"
 msgstr "Opțiuni de formatare a marcajelor de timp"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Marcaje de timp tip „24 de ore”"
 
@@ -13929,9 +14263,6 @@ msgstr "_Păstrează fereastra listei de contacte deasupra:"
 msgid "Only when docked"
 msgstr "Doar când e atașată"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_Evidențiază fereastra la primirea de mesaje noi"
-
 msgid "Windows Pidgin Options"
 msgstr "Opțiuni Pidgin în Windows"
 
@@ -13939,10 +14270,10 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Opțiuni Pidgin specifice Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Permite alegerea unor opțiuni Pidgin pentru Windows, precum atașarea listei "
-"de contacte."
+"Permite alegerea unor opțiuni specifice Pidgin pentru Windows, precum "
+"atașarea listei de contacte."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Deconectat.</font>"
@@ -13982,362 +14313,3 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor și clienților XMPP."
 
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "S-ar putea să fiți rapid deconectat(ă). Poate doriți să încercați TOC "
-#~ "până ce se rezolvă această problemă. Vizitați %s pentru actualizări."
-
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de o secundă)"
-#~ msgstr[1] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de %d secunde)"
-#~ msgstr[2] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de %d de secunde)"
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Adaugă contact"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Nu s-au putut obține detalii despre server"
-
-#~ msgid "Keep alive error"
-#~ msgstr "Eroare „keep alive”"
-
-#, fuzzy
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "S-a pierdut conexiunea cu serverul:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "Server de conectare"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "Nu s-a putut trimite mesajul."
-
-#, fuzzy
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Ați fost adăugat cu identitatea %d în grupul „%d”"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Detaliile utilizatorului %s nu sunt disponibile"
-
-#~ msgid "A group with the name already exists."
-#~ msgstr "Există deja un grup cu acest nume."
-
-#~ msgid "Primary Information"
-#~ msgstr "Informații de bază"
-
-#~ msgid "Blood Type"
-#~ msgstr "Grupă sanguină"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "Actualizare detalii proprii"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Viteză:"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "Alegerea unui avatar personalizat nu este suportată deocamdată. Alegeți o "
-#~ "imagine de la %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Avatar QQ invalid"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Ați respins cererea făcută de %d"
-
-#~ msgid "Reject request"
-#~ msgstr "Respinge cererea"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "Adaugă contactul cu cereri eșuate de autorizare"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Nu s-a putut încărca lista de contacte"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "Număr QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "Descriere grup"
-
-#~ msgid "Auth"
-#~ msgstr "Autorizare"
-
-#~ msgid "Approve"
-#~ msgstr "Aprobă"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "Cererea de a vă alătura grupului %d v-a fost respinsă de adminul %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "[%d] a părăsit grupul „%d”"
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "Ați fost adăugat cu identitatea %d în grupul „%d”"
-
-#~ msgid "I am a member"
-#~ msgstr "Sunt un membru"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Cerere invalidă"
-
-#~ msgid "I am the admin"
-#~ msgstr "Sunt admin"
-
-#~ msgid "Unknown status"
-#~ msgstr "Status necunoscut"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Ștergere grup"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "Ați introdus un ID de grup prea mic sau prea mare"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Sigur doriți să părăsiți acest Qun?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Doriți să aprobați cererea?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Telefon"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Detalii chat"
-
-#~ msgid "System Message"
-#~ msgstr "Mesaj de sistem"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>IP-ul ultimei autentificări</b>: %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Ultima autentificare</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Introducere detalii proprii"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Ieșire din acest QQ Qun"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Blochează acest contact"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Eroare la schimbarea parolei"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Conectarea la server a eșuat."
-
-#, fuzzy
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr ""
-#~ "Eroare de conectare de la serverul %s:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Doriți să aprobați cererea?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Doriți să adăugați acest contact?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s v-a adăugat în lista sa de contacte cu identitatea %s"
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Contact"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s dorește să vă adauge în listă cu identitatea %s"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s nu este în lista dumneavoastră de contacte"
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Doriți să îl adăugați?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Port server"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Deconectat la distanță"
-
-#~ msgid "developer"
-#~ msgstr "programator"
-
-#~ msgid "XMPP developer"
-#~ msgstr "programator XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "Designeri"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Versiunea utilizată este %s versiunea %s. Ultima versiune este %s. O "
-#~ "puteți obține de la <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Noutăți:</b><br>%s"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "EOF la citirea de la procesul „resolver”"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Detaliile v-au fost actualizate"
-
-#~ msgid "Input your reason:"
-#~ msgstr "Precizați motivul:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "Ați șters cu succes utilizatorul"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "V-ați șters cu succes din lista contactului"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "Ați adăugat contactul %d în lista de contacte"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "QQid invalid"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Introduceți ID-ul grupului extern"
-
-#~ msgid "Reason: %s"
-#~ msgstr "Motiv: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr "Cererea de a vă alătura grupului %d v-a fost aprobată de adminul %d"
-
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Acest grup a fost adăugat la lista dumneavoastră de contacte"
-
-#~ msgid "I am applying to join"
-#~ msgstr "Solicit înscrierea"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "Ați părăsit cu succes grupul"
-
-#~ msgid "QQ Group Auth"
-#~ msgstr "Autorizare grup QQ"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "Operațiunea de autorizare a fost acceptată de serverul QQ"
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Precizați motivul:"
-
-#, fuzzy
-#~ msgid " Space"
-#~ msgstr "Salvează"
-
-#, fuzzy
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>IP server</b>: %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Arată informațiile de autentificare"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "Autentificare eșuată. Verificați înregistrările de depanare"
-
-#~ msgid "Unable to login"
-#~ msgstr "Autentificare eșuată."
-
-#, fuzzy
-#~ msgid "Failed room reply"
-#~ msgstr "Autentificare eșuată, nici un răspuns"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "%s v-a respins cererea"
-
-#~ msgid "User %s approved your request"
-#~ msgstr "%s v-a aprobat cererea"
-
-#~ msgid "Notice from: %s"
-#~ msgstr "Anunț de la: %s"
-
-#~ msgid "Error setting socket options"
-#~ msgstr "Eroare la introducerea opțiunilor socket-ului"
-
-#~ msgid ""
-#~ "Windows Live ID authentication: cannot find authenticate token in server "
-#~ "response"
-#~ msgstr ""
-#~ "Autentificare Windows Live ID: nu s-a găsit un „token” de autentificare "
-#~ "în răspunsul de la server"
-
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Autentificarea Windows Live ID a eșuat!"
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "Prea periculos (expeditorul)"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "Prea periculos (destinatarul)"
-
-#~ msgid "Available Message"
-#~ msgstr "Mesaj ce arată disponibilitatea"
-
-#~ msgid "Away Message"
-#~ msgstr "Mesaj în absență"
-
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr "<i>(se descarcă)</i>"
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "Cod [0x%02X]: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "Eroare de operare asupra grupului"
-
-#~ msgid "Error requesting login token"
-#~ msgstr "Eroare la cererea unui „token” de autentificare"
-
-#~ msgid "TCP Address"
-#~ msgstr "Adresă TCP"
-
-#~ msgid "UDP Address"
-#~ msgstr "Adresă UDP"
diff --git a/po/ru.po b/po/ru.po
index f5a8c53b2d..bd0674ccfc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,14 +3,14 @@
 # Sergey Volozhanin <svo@asplinux.ru>, 2001.
 # Alexandre Prokoudine <avp@altlinux.ru>, 2003, 2004.
 # Dmitry Beloglazov <dmaa@users.sf.net>, 2004-2008.
-# Антон Самохвалов <samant.ua@mail.ru>, 2008.
+# Антон Самохвалов <samant.ua@mail.ru>, 2008-2009.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-01 19:00-0500\n"
+"POT-Creation-Date: 2009-08-02 15:45-0700\n"
 "PO-Revision-Date: 2008-05-14 15:00+0400\n"
 "Last-Translator: Антон Самохвалов <samant.ua@mail.ru>\n"
 "Language-Team: \n"
@@ -29,7 +29,7 @@ msgstr "Зяблик"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Наберите `%s -h' для получения дополнительной информации.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -44,7 +44,7 @@ msgstr ""
 "Использование: %s [КЛЮЧ]...\n"
 "\n"
 "  -c, --config=КАТ    использовать каталог КАТ для файлов конфигурации\n"
-"  -d, --debug         выводить отладочную информацию в stderr\n"
+"  -d, --debug         вывести отладочную информацию в stderr\n"
 "  -h, --help          показать эту справку и выйти\n"
 "  -n, --nologin       не входить автоматически\n"
 "  -v, --version       показать текущую версию и выйти\n"
@@ -99,7 +99,6 @@ msgid "Alias:"
 msgstr "Псевдоним:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
 msgstr "Создать эту учётную запись на сервере"
 
@@ -412,9 +411,8 @@ msgstr "Присоединиться к чату..."
 msgid "View Log..."
 msgstr "Просмотреть журнал..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "Просмотреть все заметки журнала"
+msgstr "Просмотреть все журналы"
 
 msgid "Show"
 msgstr "Показывать"
@@ -469,9 +467,8 @@ msgstr "Ошибка внесения сертификата"
 msgid "X.509 certificate import failed"
 msgstr "Внесение сертификата X.509 провалилось"
 
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "Выбрать \"PEM\"-сертификат"
+msgstr "Выбрать PEM-сертификат"
 
 #, c-format
 msgid ""
@@ -580,7 +577,6 @@ msgstr "Эта команда работает только в мгновенн�
 msgid "That command doesn't work on this protocol."
 msgstr "Эта команда не работает с этим протоколом."
 
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
 msgstr "Сообщение не было отправлено, потому что вы не подписались."
 
@@ -616,21 +612,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Адресат"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "Пригласительное сообщение"
-
-msgid "Invite"
-msgstr "Пригласить"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Введите имя пользователя, которого вы хотите пригласить,\n"
-"а также, по желанию, пригласительное сообщение."
-
 msgid "Conversation"
 msgstr "Беседа"
 
@@ -643,7 +624,6 @@ msgstr "Показывать время сообщений"
 msgid "Add Buddy Pounce..."
 msgstr "Добавить правило для собеседника..."
 
-#, fuzzy
 msgid "Invite..."
 msgstr "Пригласить..."
 
@@ -656,7 +636,7 @@ msgstr "Воспроизводить звуки"
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
 msgstr[0] "Список %d пользователя:\n"
@@ -766,7 +746,7 @@ msgstr "Фильтр:"
 msgid "Pause"
 msgstr "Пауза"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
 msgstr[0] "Передача файлов - %d%% из %d файла"
@@ -886,13 +866,45 @@ msgstr "Беседы в %s"
 msgid "Conversations with %s"
 msgstr "Беседы с %s"
 
-#, fuzzy
 msgid "All Conversations"
 msgstr "Все беседы"
 
 msgid "System Log"
 msgstr "Системный журнал"
 
+msgid "Calling ... "
+msgstr "Идёт вызов ... "
+
+msgid "Hangup"
+msgstr "Приостановить разговор"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Принять"
+
+msgid "Reject"
+msgstr "Отвергнуть"
+
+msgid "Call in progress."
+msgstr "Идёт разговор."
+
+msgid "The call has been terminated."
+msgstr "Звонок был прерван."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s хочет начать звуковой сеанс с вами."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s пытается начать с вами медиа сеанс неподдерживаемого типа."
+
+msgid "You have rejected the call."
+msgstr "Вы отклонили звонок."
+
+msgid "call: Make an audio call."
+msgstr "звонок: Совершите звуковой звонок."
+
 msgid "Emails"
 msgstr "Адреса e-mail"
 
@@ -928,6 +940,9 @@ msgstr "Продолжить"
 msgid "IM"
 msgstr "Мгновенное сообщение"
 
+msgid "Invite"
+msgstr "Пригласить"
+
 msgid "(none)"
 msgstr "(нет)"
 
@@ -1081,9 +1096,10 @@ msgstr "Не удаётся создать правило"
 msgid "You do not have any accounts."
 msgstr "У вас нет ни одной учётной записи."
 
-#, fuzzy
 msgid "You must create an account first before you can create a pounce."
-msgstr "Вы должны сперва создать учётную запись, а уж потом создавать правило."
+msgstr ""
+"Вы должны сперва создать учётную запись, а потом уже сможете создавать "
+"правило."
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
@@ -1132,7 +1148,6 @@ msgstr "%s отошёл (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s отправил вам сообщение (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Неизвестное событие слежения. Сообщите об этом!"
 
@@ -1542,6 +1557,31 @@ msgstr "Последняя отметка Gnt"
 msgid "Lastlog plugin."
 msgstr "Вставка для последней отметки."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Получение TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Только создайте TinyURL для адресов такой длины или большей"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Приставка адреса TinyURL (или другого)"
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Модуль TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+"При получении сообщения с адресами URL, TinyURL для облегчённого копирования"
+
 msgid "accounts"
 msgstr "учётные записи"
 
@@ -1621,7 +1661,7 @@ msgstr ""
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr "Разовая проверка сертификата"
+msgstr "Проверка одноразового сертификата"
 
 #. Scheme name
 #. Pool name
@@ -1642,41 +1682,39 @@ msgstr "Принять сертификат для %s?"
 msgid "SSL Certificate Verification"
 msgstr "Проверка SSL-сертификата"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Принять"
-
-msgid "Reject"
-msgstr "Отвергнуть"
-
 msgid "_View Certificate..."
 msgstr "_Просмотреть сертификат..."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
-"Сертификат, представленный \"%s\", является самоподписанным. Он не может "
-"быть автоматически проверен."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "Цепочка сертификатов, представленная для %s, некорректна."
+"Этот сертификат представлен \"%s\", а должен быть от \"%s\".Это может "
+"означать, что вы полключены не туда куда вы думаете."
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Ошибка SSL-сертификата"
 
 msgid "Invalid certificate chain"
 msgstr "Неверная цепочка сертификатов"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1685,6 +1723,21 @@ msgstr ""
 "У вас нет базы данных корневых сертификатов, так что этот сертификат не "
 "может быть проверен на целостность."
 
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Сертификат, представленный \"%s\", является самоподписанным. Он не может "
+"быть автоматически проверен."
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "Цепочка сертификатов, представленная для %s, некорректна."
+
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1704,18 +1757,6 @@ msgstr ""
 msgid "Invalid certificate authority signature"
 msgstr "Неверная авторская подпись сертификата"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Этот сертификат представлен \"%s\", а должен быть от \"%s\".Это может "
-"означать, что вы полключены не туда куда вы думаете."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1751,6 +1792,8 @@ msgstr "+++ %s вошёл"
 msgid "+++ %s signed off"
 msgstr "+++ %s вышел"
 
+#. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -1797,6 +1840,17 @@ msgstr "%s вышел из комнаты."
 msgid "%s left the room (%s)."
 msgstr "%s вышел из комнаты (%s)."
 
+msgid "Invite to chat"
+msgstr "Пригласить к переписке"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Введите имя пользователя, которого вы хотите пригласить, вместе с "
+"необязательным текстом приглашения."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Не удалось получить соединение: %s"
@@ -1928,6 +1982,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Запуск передачи %s от %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Передача файла <A HREF=\"file://%s\">%s</A> завершена"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Передача файла %s завершена"
 
@@ -2142,6 +2200,9 @@ msgstr "<font color=\"red\"><b>Не удалось прочитать файл:
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Ошибка создания конференции"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Вы используете %s, а этот модуль требует %s."
@@ -2157,11 +2218,11 @@ msgstr "Магическое несоответствие модуля %d (ну�
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Несоответствие версии ABI %d.%d.x (необходима %d.%d.x)"
 
-#, fuzzy
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
 msgstr ""
-"Модуль не реализует всех требуемых функций (список _иконок, вход и закрытие)"
+"Модуль не осуществляет всех требуемых функций (список_значков, вход и "
+"закрытие)"
 
 #, c-format
 msgid ""
@@ -2181,7 +2242,7 @@ msgstr "Не удалось загрузить требуемый модуль %
 msgid "Unable to load your plugin."
 msgstr "Не удаётся загрузить ваш модуль."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s требует %s, но его не удалось выгрузить."
 
@@ -2244,9 +2305,8 @@ msgstr ""
 "файлов\n"
 "(только при отсутствии беседы с отправителем)"
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "Выберите каталог пользователей для поиска"
+msgstr "Создайте для каждого пользователя новую папку"
 
 msgid "Notes"
 msgstr "Заметки"
@@ -2550,16 +2610,17 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"При просмотре журналов этот модуль вставит журналы других IM клиентов. На "
-"текущий момент это включает Адиум, MSN Messenger и Триллиан.\n"
+"При просмотре журналов этот модуль внедрит журналы из других клиентов "
+"мгновенных сообщений. На текущий момент это включает Адиум, MSN Messenger, "
+"aMSN и Триллиан.\n"
 "\n"
 "ПРЕДУПРЕЖДЕНИЕ: Этот модуль пока на стадии разработки и может часто "
-"вылетать.  Используйте его на свой собственных страх и риск!"
+"вылетать.  Используйте его на свой собственный страх и риск!"
 
 msgid "Mono Plugin Loader"
 msgstr "Загрузчик модулей Mono"
@@ -2606,11 +2667,11 @@ msgstr ""
 "Сохранить сообщения, отправленные пользователю \"не в сети\", как правило."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Остальные сообщения будут сохранены как правила. Вы можете их изменять или "
-"удалять в окне `Правила для собеседников'"
+"Остальные сообщения будут сохранены как правила. Вы можете их изменить или "
+"удалить в диалоговом окне `Правила для собеседников'"
 
 #, c-format
 msgid ""
@@ -2639,6 +2700,34 @@ msgstr "Сохранить сообщения \"не в сети\" в прави
 msgid "Do not ask. Always save in pounce."
 msgstr "Не спрашивать. Всегда сохранять в правило."
 
+msgid "One Time Password"
+msgstr "Одноразовый пароль"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Одноразовая поддержка паспорта"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Заставить использовать пароли только один раз."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Позволяет вам поставить за основу для учётных записей, чьи пароли не были "
+"сохранены, использоваться только в одном успешном подключении.\n"
+"Примечание: Пароль учётной записи не должен быть сохранён для этого."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2832,14 +2921,14 @@ msgstr ""
 "TCL, установите ActiveTCL из http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Набор инструментов Apple Bonjour для Windows не был найден, смотрите ЧаВо на:"
+"Не могу найти набор инструментов Apple \"Bonjour для Windows\", смотрите "
 "http://d.pidgin.im/BonjourWindows для дополнительной информации."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Не удаётся прослушивать входящие соединения\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Не удаётся прослушивать входящие соединения мгновенных сообщений"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2878,9 +2967,8 @@ msgid "Purple Person"
 msgstr "Персона Purple"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Населённый пункт"
+msgstr "Локальный порт"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2892,18 +2980,20 @@ msgstr "%s закрыл беседу."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не удаётся отправить сообщение, не удалось начать беседу."
 
-msgid "Cannot open socket"
-msgstr "Не удаётся открыть сокет"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Не удаётся создать сокет: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Не удалось связать сокет с портом"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Не удалось связать сокет с портом: %s"
 
-msgid "Could not listen on socket"
-msgstr "Не удалось осуществить прослушивание сокета"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Не удаётся прослушивать сокет: %s"
 
-#, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "Ошибка связи с местным mDNSResponder."
+msgstr "Ошибка связи с местным mDNSResponder'ом."
 
 msgid "Invalid proxy settings"
 msgstr "Неверные настройки прокси"
@@ -2928,9 +3018,9 @@ msgstr "Список собеседников пуст, в файл ничего
 msgid "Buddylist saved successfully!"
 msgstr "Список собеседников сохранён успешно!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "Не удалось записать список собеседников для %s в %s"
+msgstr "Не могу записать список собеседников для %s в %s"
 
 msgid "Couldn't load buddylist"
 msgstr "Не удалось загрузить список собеседников"
@@ -2947,14 +3037,16 @@ msgstr "Сохранить список собеседников..."
 msgid "Load buddylist from file..."
 msgstr "Загрузить список собеседников из файла..."
 
-msgid "Fill in the registration fields."
-msgstr "Заполните поля регистрационной формы."
+msgid "You must fill in all registration fields"
+msgstr "Вы должны заполнить все регистрационные поля"
 
-msgid "Passwords do not match."
-msgstr "Пароли не совпадают."
+msgid "Passwords do not match"
+msgstr "Пароли не совпадают"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Не удаётся зарегистрировать новую учётную запись. Произошла ошибка.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+"Не удаётся зарегистрировать новую учётную запись.  Произошла неизвестная "
+"ошибка."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Новая учётная запись Gadu-Gadu зарегистрирована"
@@ -2965,14 +3057,14 @@ msgstr "Регистрация завершена успешно!"
 msgid "Password"
 msgstr "Пароль"
 
-msgid "Password (retype)"
-msgstr "Пароль (наберите ещё раз)"
+msgid "Password (again)"
+msgstr "Пароль (ещё раз)"
 
-msgid "Enter current token"
-msgstr "Введите текущий маркер"
+msgid "Enter captcha text"
+msgstr "Введите анти-бот текст"
 
-msgid "Current token"
-msgstr "Текущий маркер"
+msgid "Captcha"
+msgstr "Анти-бот"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Зарегистрировать новую учётную запись Gadu-Gadu"
@@ -3025,6 +3117,15 @@ msgstr "Пароль был успешно изменён!"
 msgid "Current password"
 msgstr "Текущий пароль"
 
+msgid "Password (retype)"
+msgstr "Пароль (наберите ещё раз)"
+
+msgid "Enter current token"
+msgstr "Введите текущий маркер"
+
+msgid "Current token"
+msgstr "Текущий маркер"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Введите текущий и новый пароли для UIN: "
 
@@ -3038,6 +3139,7 @@ msgstr "Выберите чат для собеседника: %s"
 msgid "Add to chat..."
 msgstr "Добавить к чату..."
 
+#. Global
 msgid "Available"
 msgstr "Доступен"
 
@@ -3071,8 +3173,8 @@ msgstr "Пользователи не найдены"
 msgid "There are no users matching your search criteria."
 msgstr "Нет пользователей, соответствующих критериям поиска."
 
-msgid "Unable to read socket"
-msgstr "Не удаётся прочитать сокет"
+msgid "Unable to read from socket"
+msgstr "Не удаётся прочитать из сокета"
 
 msgid "Buddy list downloaded"
 msgstr "Список собеседников загружен"
@@ -3086,8 +3188,14 @@ msgstr "Список собеседников сохранён"
 msgid "Your buddy list was stored on the server."
 msgstr "Список собеседников был сохранён на сервере."
 
-msgid "Connection failed."
-msgstr "Не удалось установить соединение."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Соединение установлено"
+
+msgid "Connection failed"
+msgstr "Не удалось установить соединение"
 
 msgid "Add to chat"
 msgstr "Добавить к чату"
@@ -3095,14 +3203,23 @@ msgstr "Добавить к чату"
 msgid "Chat _name:"
 msgstr "_Имя чата:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Не удаётся утвердить имя хоста '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Соединение"
+
 msgid "Chat error"
 msgstr "Ошибка чата"
 
 msgid "This chat name is already in use"
 msgstr "Это имя чата уже используется"
 
-msgid "Not connected to the server."
-msgstr "Нет соединения с сервером."
+msgid "Not connected to the server"
+msgstr "Не подсоединён к серверу"
 
 msgid "Find buddies..."
 msgstr "Найти собеседников..."
@@ -3143,6 +3260,9 @@ msgstr "Популярный польский IM"
 msgid "Gadu-Gadu User"
 msgstr "Пользователь Gadu-Gadu"
 
+msgid "GG server"
+msgstr "GG сервер"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Неизвестная команда: %s"
@@ -3157,8 +3277,8 @@ msgstr "Тема не установлена"
 msgid "File Transfer Failed"
 msgstr "Не удалось произвести передачу файлов"
 
-msgid "Could not open a listening port."
-msgstr "Не удалось открыть порт для прослушивания."
+msgid "Unable to open a listening port."
+msgstr "Не удалось открыть прослушиваемый порт."
 
 msgid "Error displaying MOTD"
 msgstr "Ошибка отображения MOTD"
@@ -3173,8 +3293,16 @@ msgstr "Нет MOTD, соотнесённого с этим соединение
 msgid "MOTD for %s"
 msgstr "MOTD для %s"
 
-msgid "Server has disconnected"
-msgstr "Сервер разорвал соединение"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Потеряно соединение с сервером: %s"
 
 msgid "View MOTD"
 msgstr "Просмотреть MOTD"
@@ -3185,25 +3313,24 @@ msgstr "_Канал:"
 msgid "_Password:"
 msgstr "_Пароль:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Псевдонимы IRC не могут содержать пробелы"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Соединение"
-
 msgid "SSL support unavailable"
 msgstr "Поддержка SSL недоступна"
 
-msgid "Couldn't create socket"
-msgstr "Не удалось создать сокет"
+msgid "Unable to connect"
+msgstr "Не удаётся установить соединение"
 
-msgid "Couldn't connect to host"
-msgstr "Не удалось соединиться с узлом"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Не удаётся соединиться с: %s"
 
-msgid "Read error"
-msgstr "Ошибка чтения"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Сервер закрыл соединение"
 
 msgid "Users"
 msgstr "Пользователи"
@@ -3257,13 +3384,12 @@ msgstr "Неверный режим"
 msgid "Ban on %s by %s, set %s ago"
 msgstr "Запрет для %s от %s, установлен %s назад"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Ban on %s"
-msgstr "Запрет для %s"
+msgstr "Запрет на %s"
 
-#, fuzzy
 msgid "End of ban list"
-msgstr "Конец списке запретов"
+msgstr "Конец списка запретов"
 
 #, c-format
 msgid "You are banned from %s."
@@ -3385,6 +3511,16 @@ msgstr ""
 "Выбранное вами имя учётной записи было отвергнуто сервером. Вероятно, оно "
 "содержит недопустимые символы."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Псевдоним \"%s\" уже используется."
+
+msgid "Nickname in use"
+msgstr "Псевдоним используется"
+
 msgid "Cannot change nick"
 msgstr "Не удаётся изменить псевдоним"
 
@@ -3514,9 +3650,8 @@ msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой �
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Послать команду для nickserv"
 
-#, fuzzy
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "отметьте &lt;target&lt;:  Отправить заметку пользователю или каналу."
+msgstr "заметка &lt;target&lt;:  Отправить заметку пользователю или каналу."
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3627,12 +3762,11 @@ msgstr "Команда Ad-Hoc не удалась"
 msgid "execute"
 msgstr "выполнить"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Сервер требует TLS/SSL для входа. Поддержка TLS/SSL не найдена."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Сервер требует TLS/SSL, но поддержка TLS/SSL не была найдена."
 
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "Вы потребовали шифрование, но поддержка TLS/SSL не найдена."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Вы требуете шифрования, но поддержка TLS/SSL не найдена."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
@@ -3649,17 +3783,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Аутентификация простым текстом"
 
-msgid "Invalid response from server."
-msgstr "Неверный отклик от сервера."
+msgid "SASL authentication failed"
+msgstr "Аутентификация SASL провалилась"
+
+msgid "Invalid response from server"
+msgstr "Неверный отклик от сервера"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Сервер не использует ни одного поддерживаемого метода аутентификации"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Вы запросили шифрование, но оно недоступно на сервере."
+
 msgid "Invalid challenge from server"
 msgstr "Неверный запрос с сервера"
 
-msgid "SASL error"
-msgstr "Ошибка SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Ошибка SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "Управление соединениями BOSH прервало ваш сеанс."
+
+msgid "No session ID given"
+msgstr "Не предоставлен ID сеанса"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Неподдерживаемая версия протокола BOSH"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Не удалось установить соединение с сервером"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Не удалось установить соединение с сервером: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Не удаётся установить SSL соединение"
 
 msgid "Full Name"
 msgstr "Полное имя"
@@ -3676,6 +3836,11 @@ msgstr "URL"
 msgid "Street Address"
 msgstr "Адрес"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Дополнительный адрес"
 
@@ -3726,164 +3891,8 @@ msgstr "Клиент"
 msgid "Operating System"
 msgstr "Операционная система"
 
-msgid "Last Activity"
-msgstr "Последняя активность"
-
-msgid "Service Discovery Info"
-msgstr "Информация о службе Разъяснения"
-
-msgid "Service Discovery Items"
-msgstr "Элементы службы Разъяснения"
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Расширенная строфная адресация"
-
-msgid "Multi-User Chat"
-msgstr "Многопользовательский чат"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Информация о расширенном присутствии многопользовательского чата."
-
-msgid "In-Band Bytestreams"
-msgstr "Внутриполосные потоки информации"
-
-msgid "Ad-Hoc Commands"
-msgstr "Команды Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Служба PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Потоки информации SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Вне полосы данных"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Внутриполосная регистрация"
-
-msgid "User Location"
-msgstr "Местоположение пользователя"
-
-msgid "User Avatar"
-msgstr "Аватара пользователя"
-
-msgid "Chat State Notifications"
-msgstr "Уведомления о состоянии чата"
-
-msgid "Software Version"
-msgstr "Версия программного обеспечения"
-
-msgid "Stream Initiation"
-msgstr "Создание потока"
-
-msgid "File Transfer"
-msgstr "Передача файлов"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Настроение пользователя"
-
-msgid "User Activity"
-msgstr "Активность пользователя"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Возможности существования"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Зашифрованный сеанс переговоров"
-
-msgid "User Tune"
-msgstr "Настройка пользователя"
-
-msgid "Roster Item Exchange"
-msgstr "Реестр элементов обмена"
-
-msgid "Reachability Address"
-msgstr "Доступность адреса"
-
-msgid "User Profile"
-msgstr "Профиль пользователя"
-
-msgid "Jingle"
-msgstr "Звон"
-
-msgid "Jingle Audio"
-msgstr "Звенящий звук"
-
-msgid "User Nickname"
-msgstr "Псевдоним пользователя"
-
-msgid "Jingle ICE UDP"
-msgstr "Звон ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Звон ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Звон Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Звенящее видео"
-
-msgid "Jingle DTMF"
-msgstr "Звон DTMF"
-
-msgid "Message Receipts"
-msgstr "Получение сообщений"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Файл публичного ключа"
-
-msgid "User Chatting"
-msgstr "Переписка пользователя"
-
-msgid "User Browsing"
-msgstr "Проводник пользователя"
-
-msgid "User Gaming"
-msgstr "Игра пользователя"
-
-msgid "User Viewing"
-msgstr "Просмотр пользователя"
-
-msgid "Ping"
-msgstr "Прозвон"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Строфное шифрование"
-
-msgid "Entity Time"
-msgstr "Время существования"
-
-msgid "Delayed Delivery"
-msgstr "Задержанная доставка"
-
-msgid "Collaborative Data Objects"
-msgstr "Совместные объекты данных"
-
-msgid "File Repository and Sharing"
-msgstr "Хранилище файлов и совместное пользование"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Служба Разъяснения STUN для Звона"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Упрощённо зашифрованный сеанс переговоров"
-
-msgid "Hop Check"
-msgstr "Проверка прыжков"
-
-msgid "Capabilities"
-msgstr "Возможности"
+msgid "Local Time"
+msgstr "Местное время"
 
 msgid "Priority"
 msgstr "Приоритет"
@@ -3891,6 +3900,13 @@ msgstr "Приоритет"
 msgid "Resource"
 msgstr "Ресурс"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+msgid "Logged Off"
+msgstr "Вышел из сети"
+
 msgid "Middle Name"
 msgstr "Отчество"
 
@@ -3912,14 +3928,12 @@ msgstr "Показаться для"
 msgid "Temporarily Hide From"
 msgstr "Временно скрыться от"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Отменить уведомление о присутствии"
 
 msgid "(Re-)Request authorization"
 msgstr "(Повторно) Запросить авторизацию"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4059,28 +4073,23 @@ msgstr "Выберите сервер конференций для опроса
 msgid "Find Rooms"
 msgstr "Искать комнаты"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Вы запросили шифрование, но оно недоступно на сервере."
+msgid "Affiliations:"
+msgstr "Членства:"
 
-msgid "Write error"
-msgstr "Ошибка записи"
+msgid "No users found"
+msgstr "Пользователей не найдено"
 
-msgid "Ping timeout"
-msgstr "Время ожидания при прозвоне истекло"
+msgid "Roles:"
+msgstr "Роли:"
 
-msgid "Read Error"
-msgstr "Ошибка чтения"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Время ожидания при прозвоне истекло"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Не удалось установить соединение с сервером:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Не удаётся создать сокет"
 
 msgid "Invalid XMPP ID"
 msgstr "Неверный XMPP ID"
@@ -4088,6 +4097,10 @@ msgstr "Неверный XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Неверный XMPP ID. Должен быть задан домен."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Не удалось соединиться с сервером."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Регистрация %s@%s завершена успешно"
@@ -4112,9 +4125,6 @@ msgstr "Отмена регистрации завершена успешно"
 msgid "Unregistration Failed"
 msgstr "Не удалось выполнить отмену регистрации"
 
-msgid "Already Registered"
-msgstr "Уже зарегистрировано"
-
 msgid "State"
 msgstr "Область"
 
@@ -4127,6 +4137,9 @@ msgstr "Телефон"
 msgid "Date"
 msgstr "Дата"
 
+msgid "Already Registered"
+msgstr "Уже зарегистрировано"
+
 msgid "Unregister"
 msgstr "Отменить регистрацию"
 
@@ -4179,6 +4192,12 @@ msgstr "Сервер не поддерживает блокировку"
 msgid "Not Authorized"
 msgstr "Не авторизован"
 
+msgid "Mood"
+msgstr "Настроение"
+
+msgid "Now Listening"
+msgstr "Сейчас слушается"
+
 msgid "Both"
 msgstr "Обе"
 
@@ -4200,12 +4219,6 @@ msgstr "Нет"
 msgid "Subscription"
 msgstr "Подписка"
 
-msgid "Mood"
-msgstr "Настроение"
-
-msgid "Now Listening"
-msgstr "Сейчас слушается"
-
 msgid "Mood Text"
 msgstr "Текст настроения"
 
@@ -4248,9 +4261,6 @@ msgstr "Пароль был изменён."
 msgid "Error changing password"
 msgstr "Ошибка изменения пароля"
 
-msgid "Password (again)"
-msgstr "Пароль (ещё раз)"
-
 msgid "Change XMPP Password"
 msgstr "Изменить пароль XMPP"
 
@@ -4443,18 +4453,24 @@ msgstr "Не удаётся удалить пользователя %s"
 msgid "Unable to ping user %s"
 msgstr "Не могу прозвонить пользователя %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Не могу сплетничать, потому что ничего неизвестно о пользователе %s."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Не могу сплетничать, потому что пользователь %s, похоже, не в сети."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Не могу сплетничать, потому что пользователь %s не поддерживает это."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Треплю про %s..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4464,9 +4480,35 @@ msgstr "Сплетни"
 msgid "%s has buzzed you!"
 msgstr "%s натрепал про вас!"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Треплю про %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Не удаётся отправить файл для %s, неверный JID"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Не удаётся отправить файл для %s, пользователь не в сети"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Не удаётся отправить файл для %s, нет подписки на присутствие пользователя"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Не удалось выполнить регистрацию"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Выберите ресурс %s, которому вы хотели бы отправить файл"
+
+msgid "Select a Resource"
+msgstr "Выбрать ресурс"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Создать _чат"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Настроить комнату."
@@ -4486,16 +4528,18 @@ msgstr "topic [новая тема]:  Просмотреть или измени
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;пользователь&gt; [причина]:  Выгнать пользователя из комнаты."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "принять &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Установите "
 "пользовательское членство в комнате."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "роль &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Установите "
 "рольпользователя в комнате."
@@ -4561,6 +4605,9 @@ msgstr "Соединяться с сервером"
 msgid "File transfer proxies"
 msgstr "Прокси передачи файлов"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4599,6 +4646,14 @@ msgstr "Ошибка разбора XML"
 msgid "Unknown Error in presence"
 msgstr "Имеет место неизвестная ошибка"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Ошибка присоединения к чату %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Ошибка в чате %s"
+
 msgid "Create New Room"
 msgstr "Создать новую комнату"
 
@@ -4615,13 +4670,32 @@ msgstr "_Настроить комнату"
 msgid "_Accept Defaults"
 msgstr "_Принять установки по умолчанию"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Ошибка присоединения к чату %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Причина не указана"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Ошибка в чате %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Вы были удалены оператором %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Удалён оператором %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Произошла ошибка при открытии файла."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Не удалось произвести передачу файлов"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Не удалось открыть файл '%s': %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4648,9 +4722,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Выберите ресурс %s, которому вы хотели бы отправить файл"
 
-msgid "Select a Resource"
-msgstr "Выбрать ресурс"
-
 msgid "Edit User Mood"
 msgstr "Изменить настроение пользователя"
 
@@ -4952,6 +5023,26 @@ msgstr "Другие контакты"
 msgid "Non-IM Contacts"
 msgstr "Не IM-контакты"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s послал вам приглашение к веб-камере, которое ещё не поддерживается."
+
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s послал вам приглашение к веб-камере, которое ещё не поддерживается."
+
 msgid "Nudge"
 msgstr "Подтолкнуть"
 
@@ -5108,8 +5199,30 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL."
 
-msgid "Failed to connect to server."
-msgstr "Не удалось соединиться с сервером."
+#, fuzzy, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Не могу добавить приятеля %s, потому что имя пользователя неверное.  Имена "
+"пользователей должны быть правильными адресами эл.почты или начинаться с "
+"буквы и содержать только буквы, цифры и пробелы, или содержать только цифры."
+
+#, fuzzy
+msgid "Unable to Add"
+msgstr "Не могу Добавить"
+
+msgid "Authorization Request Message:"
+msgstr "Сообщение запроса авторизации:"
+
+msgid "Please authorize me!"
+msgstr "Пожалуйста, авторизируйте меня!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Ошибка загрузки профиля"
@@ -5302,66 +5415,30 @@ msgstr "Аутентификация Windows Live ID: не могу соедин
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Аутентификация Windows Live ID: неверный ответ"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s не является допустимой группой."
-
-msgid "Unknown error."
-msgstr "Неизвестная ошибка."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s на %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s просто подтолкнул вас!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Неизвестная ошибка (%d)"
 
 msgid "Unable to add user"
 msgstr "Не удаётся добавить пользователя"
 
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Неизвестная ошибка (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Следующие пользователи отсутствуют в вашей адресной книге"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Не удаётся добавить пользователя на %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Не удаётся заблокировать пользователя на %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Не удаётся допустить пользователя на %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s не может быть добавлен, так как список собеседников полон."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s не является допустимой паспортной учётной записью."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Служба временно недоступна."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Мобильное сообщение не отправилось, так как оно слишком длинное."
 
-msgid "Unable to rename group"
-msgstr "Не удаётся переименовать группу"
-
-msgid "Unable to delete group"
-msgstr "Не удаётся удалить группу"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5418,9 +5495,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Сообщение не было отправлено, потому что произошла неизвестная ошибка."
 
-msgid "Unable to connect"
-msgstr "Не удаётся установить соединение"
-
 msgid "Writing error"
 msgstr "Ошибка записи"
 
@@ -5435,19 +5509,23 @@ msgstr ""
 "Ошибка соединения от сервера %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Наш протокол не поддерживается сервером."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Ошибка разбора HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Вы подключены из другого места."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Серверы MSN временно недоступны. Повторите попытку позже."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Серверы MSN временно выключаются."
 
 #, c-format
@@ -5477,6 +5555,14 @@ msgstr "Отправка данных"
 msgid "Retrieving buddy list"
 msgstr "Загрузка списка собеседников"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s послал вам приглашение к веб-камере, которое ещё не поддерживается."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s послал вам приглашение к веб-камере, которое ещё не поддерживается."
+
 msgid "Away From Computer"
 msgstr "Отошёл от компьютера"
 
@@ -5523,14 +5609,6 @@ msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Сообщение могло быть не отправлено, так как произошла неизвестная ошибка:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s добавил вас в свой список собеседников."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s удалил вас из своего списка собеседников."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Удалить приятеля из адресной книги?"
@@ -5562,6 +5640,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Модуль протокола MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s не является допустимой группой."
+
+msgid "Unknown error."
+msgstr "Неизвестная ошибка."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s на %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Не удаётся добавить пользователя на %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Не удаётся заблокировать пользователя на %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Не удаётся допустить пользователя на %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s не может быть добавлен, так как список собеседников полон."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s не является допустимой паспортной учётной записью."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Служба временно недоступна."
+
+msgid "Unable to rename group"
+msgstr "Не удаётся переименовать группу"
+
+msgid "Unable to delete group"
+msgstr "Не удаётся удалить группу"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s добавил вас в свой список собеседников."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s удалил вас из своего списка собеседников."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Нет такого пользователя: %s"
 
@@ -5591,6 +5717,8 @@ msgid "Lost connection with server"
 msgstr "Потеряно соединение с сервером"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Новые сообщения почты"
 
@@ -5632,44 +5760,29 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Добавить контакты с сервера"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Соединение установлено"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Ошибка протокола, код %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Ваш пароль - %d символов, больше, чем ожидаемая максимальная длина %d для "
 "MySpaceIM. Пожалуйста, укоротите ваш пароль на http://profileedit.myspace."
 "com/index.cfm?fuseaction=accountSettings.changePassword и попробуйте снова."
 
+msgid "Incorrect username or password"
+msgstr "Неправильное имя пользователя или пароль"
+
 msgid "MySpaceIM Error"
 msgstr "Ошибка MySpaceIM"
 
 msgid "Invalid input condition"
 msgstr "Неверное состояние ввода"
 
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Буфер чтения полон (2)"
-
-msgid "Unparseable message"
-msgstr "Неразбираемое сообщение"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Не удалось соединиться с узлом: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Не удалось добавить собеседника"
 
@@ -5758,6 +5871,12 @@ msgstr "Всего друзей"
 msgid "Client Version"
 msgstr "Версия клиента"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Имя пользователя доступно"
 
@@ -5974,9 +6093,6 @@ msgstr "Нельзя добавить себя самого"
 msgid "Master archive is misconfigured"
 msgstr "Главный архив не настроен"
 
-msgid "Incorrect username or password"
-msgstr "Неправильное имя пользователя или пароль"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Не удалось узнать узел введённого имени пользователя"
 
@@ -6019,9 +6135,9 @@ msgstr "Пользователь не в сети или заблокирова�
 msgid "Unknown error: 0x%X"
 msgstr "Неизвестная ошибка: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Не удалось войти в сеть (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Не могу прозвонить пользователя %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6127,9 +6243,6 @@ msgstr "Конференция GroupWise %d"
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-msgid "Unable to connect to server."
-msgstr "Не удаётся соединиться с сервером."
-
 msgid "Waiting for response..."
 msgstr "Ожидание отклика..."
 
@@ -6153,9 +6266,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Хотите присоединиться к беседе?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Вы были отключены, так как вошли с другой машины."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6163,16 +6273,14 @@ msgstr ""
 "Вероятно, %s не в сети и не получил сообщение, которое вы только что "
 "отправили."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Не удаётся соединиться с сервером. Введите адрес сервера, с которым вы "
 "хотите соединиться."
 
-msgid "Error. SSL support is not installed."
-msgstr "Ошибка. Поддержка SSL не установлена."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Эта конференция была закрыта. Больше не может быть отправлено ни одного "
@@ -6197,24 +6305,33 @@ msgstr "Адрес сервера"
 msgid "Server port"
 msgstr "Порт сервера"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Получен непредвиденный HTTP-отклик от сервера."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
+"попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Ошибка запроса маркера входа"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Не удалось присоединиться к чату"
 
 msgid "Invalid chat room name"
 msgstr "Неверное имя чата"
 
-msgid "Server closed the connection."
-msgstr "Сервер разорвал соединение."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Соединение с сервером потеряно:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "При соединении с сервером получены недопустимые данные."
 
 #. *< type
@@ -6262,7 +6379,8 @@ msgstr "Соединение с удалённым пользователем п
 msgid "Received invalid data on connection with remote user."
 msgstr "При соединении с удалённым пользователем получены недопустимые данные."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Не удалось установить соединение с удалённым пользователем."
 
 msgid "Direct IM established"
@@ -6462,21 +6580,15 @@ msgstr "Уровень предупреждения"
 msgid "Buddy Comment"
 msgstr "Комментарий собеседника"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Не удалось установить соединение с сервером аутентификации:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Не удалось установить соединение с BOS-сервером:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Не удаётся соединиться с сервером."
 
 msgid "Username sent"
 msgstr "Имя пользователя отправлено"
@@ -6488,52 +6600,63 @@ msgstr "Соединение установлено, данные отправл
 msgid "Finalizing connection"
 msgstr "Завершение установления соединения"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Не могу войти: Не могу войти как %s, потому что имя пользователя неверное.  "
 "Именем пользователя должен быть правильный адрес эл.почты или начинаться с "
 "буквы и содержать только буквы, цифры и пробелы, или содержать только цифры."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Неверное имя пользователя."
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Вы можете быть отсоединены ненадолго.  Если так случится, проверьте %s на "
+"счёт обновлений."
 
-msgid "Incorrect password."
-msgstr "Неправильный пароль."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Не удаётся получить допустимый хэш входа AIM."
+
+msgid "Unable to get a valid login hash."
+msgstr "Не удаётся получить допустимый хэш входа."
+
+msgid "Received authorization"
+msgstr "Получена авторизация"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Пользователь не существует"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Ваша учётная запись сейчас заблокирована."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Служба AOL Instant Messenger временно недоступна."
 
-#. screen name connecting too frequently
+#. client too old
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Версия клиента, которой вы пользуетесь, слишком стара. Обновите до %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
 "попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Версия клиента, которой вы пользуетесь, слишком стара. Обновите до %s"
-
-msgid "Could Not Connect"
-msgstr "Не удалось установить соединение"
-
-msgid "Received authorization"
-msgstr "Получена авторизация"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Введённый ключ SecurID неверный."
 
 msgid "Enter SecurID"
@@ -6542,29 +6665,6 @@ msgstr "Введите SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Введите шестизначное число с цифрового экранчика."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Вы можете быть отсоединены ненадолго.  Если так случится, проверьте %s на "
-"счёт обновлений."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Не удаётся получить допустимый хэш входа AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Соединение с вами вскоре может быть разорвано. Смотрите обновления на %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Не удаётся получить допустимый хэш входа."
-
 msgid "Password sent"
 msgstr "Пароль отправлен"
 
@@ -6576,12 +6676,6 @@ msgstr ""
 "Пожалуйста, авторизируйте меня, чтобы я мог добавить вас в свой список "
 "приятелей."
 
-msgid "Authorization Request Message:"
-msgstr "Сообщение запроса авторизации:"
-
-msgid "Please authorize me!"
-msgstr "Пожалуйста, авторизируйте меня!"
-
 msgid "No reason given."
 msgstr "Причина не указана."
 
@@ -6721,7 +6815,7 @@ msgstr[0] "Вы не получили %hu сообщение от %s по неи
 msgstr[1] "Вы не получили %hu сообщения от %s по неизвестной причине."
 msgstr[2] "Вы не получили %hu сообщений от %s по неизвестной причине."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Не удаётся отправить сообщение: %s"
@@ -6743,6 +6837,9 @@ msgstr "В сети с"
 msgid "Member Since"
 msgstr "Член с"
 
+msgid "Capabilities"
+msgstr "Возможности"
+
 msgid "Profile"
 msgstr "Профиль"
 
@@ -6930,9 +7027,9 @@ msgstr[2] ""
 msgid "Away message too long."
 msgstr "Сообщение об отсутствии слишком велико."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6941,10 +7038,6 @@ msgstr ""
 "буквы и содержать только буквы, цифры и пробелы, или содержать только цифры."
 
 #, fuzzy
-msgid "Unable to Add"
-msgstr "Не могу Добавить"
-
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
 msgstr "Не могу Загрузить список приятелей"
 
@@ -6959,9 +7052,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Сироты"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Не удалось добавить собеседника %s, так как в списке собеседников слишком "
@@ -6970,8 +7063,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(нет имени)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Не удалось добавить собеседника %s по неизвестной причине."
 
 #, fuzzy, c-format
@@ -7103,6 +7196,7 @@ msgstr "_Искать"
 msgid "Set User Info (web)..."
 msgstr "Установить пользовательскую информацию (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Изменить пароль (web)"
 
@@ -7132,6 +7226,10 @@ msgstr "Искать собеседника по адресу email..."
 msgid "Search for Buddy by Information"
 msgstr "Искать собеседника по информации"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Пользователь не в сети"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7715,6 +7813,9 @@ msgstr "<p><b>Подтверждение</b>:<br>\n"
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>Исходный автор</b>:<br>\n"
 
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>И все мальчики в задней комнате...</i><br>\n"
 
@@ -7801,7 +7902,7 @@ msgid "Update interval (seconds)"
 msgstr "Обновить интервал (секунды)"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Не удаётся расшифровать ответ сервера"
 
 #, c-format
@@ -7828,10 +7929,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Неизвестный код ответа при входе (0x%02X)"
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Не могу расшифровать ответ сервера"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Запрос захвата"
 
@@ -7870,22 +7967,9 @@ msgstr ""
 "Неизвестный код ответа при входе (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Не удаётся установить соединение."
-
 msgid "Socket error"
 msgstr "Ошибка сокета"
 
-msgid "Unable to read from socket"
-msgstr "Не удаётся прочитать из сокета"
-
-msgid "Write Error"
-msgstr "Ошибка записи"
-
-msgid "Connection lost"
-msgstr "Соединение потеряно"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Получение сервера"
@@ -7894,8 +7978,9 @@ msgstr "Получение сервера"
 msgid "Requesting token"
 msgstr "Принят запрос"
 
-msgid "Couldn't resolve host"
-msgstr "Не удалось разрешить имя узла"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Не удаётся соединиться с сервером."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -7954,7 +8039,7 @@ msgid "QQ Qun Command"
 msgstr "Команда QQ Qun"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Не могу расшифровать ответ входа"
 
 #, fuzzy
@@ -7976,9 +8061,6 @@ msgstr "Отправка файла"
 msgid "%d canceled the transfer of %s"
 msgstr "%d отменил передачу %s"
 
-msgid "Connection closed (writing)"
-msgstr "Соединение разорвано (запись)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Название группы:</b> %s<br>"
@@ -8032,17 +8114,6 @@ msgstr "Текущий администратор огласил следующ�
 msgid "Sametime Administrator Announcement"
 msgstr "Объявление текущего администратора"
 
-msgid "Connection reset"
-msgstr "Сброс соединения"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Ошибка при чтении из сокета: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Не удаётся соединиться с узлом"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Объявление от %s"
@@ -8065,6 +8136,9 @@ msgstr "Колонки"
 msgid "Video Camera"
 msgstr "Видеокамера"
 
+msgid "File Transfer"
+msgstr "Передача файлов"
+
 msgid "Supports"
 msgstr "Поддерживается"
 
@@ -8884,6 +8958,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Статистика сети"
 
+msgid "Ping"
+msgstr "Прозвон"
+
 msgid "Ping failed"
 msgstr "Прозвон неудался"
 
@@ -8947,7 +9024,8 @@ msgstr "Неподдерживаемый тип публичного ключа"
 msgid "Disconnected by server"
 msgstr "Соединение разорвано сервером"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Ошибка во время соединения с сервером SILC"
 
 msgid "Key Exchange failed"
@@ -8959,16 +9037,11 @@ msgstr ""
 "Не удалось возобновить прерванную сессию. Нажмите \"Переустановить соединение"
 "\" для создания нового соединения."
 
-msgid "Connection failed"
-msgstr "Не удалось установить соединение"
-
 msgid "Performing key exchange"
 msgstr "Выполнение обмена ключами"
 
-msgid "Unable to create connection"
-msgstr "Не удаётся создать соединение"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Не удалось загрузить пару ключей SILC"
 
 #. Progress
@@ -8978,7 +9051,8 @@ msgstr "Соединение с сервером SILC"
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Не удаётся инициализировать протокол SILC"
 
 msgid "Error loading SILC key pair"
@@ -9283,7 +9357,8 @@ msgstr "Делать цифровую подпись и проверку все�
 msgid "Creating SILC key pair..."
 msgstr "Создание пары ключей SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Не удаётся создать пару ключей SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9378,6 +9453,9 @@ msgstr "Белая доска"
 msgid "No server statistics available"
 msgstr "Нет доступной статистики сервера"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Ошибка во время соединения с сервером SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Ошибка: Несоответствие версии, обновите свой клиент"
@@ -9418,30 +9496,27 @@ msgstr "Ошибка: Неверные данные"
 msgid "Failure: Authentication failed"
 msgstr "Ошибка: Аутентификация завершилась неудачно"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Не удаётся инициализировать соединение клиента SILC"
 
 msgid "John Noname"
 msgstr "Иван Безымянный"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Не удалось загрузить пару ключей SILC: %s"
 
-msgid "Could not write"
-msgstr "Не удалось записать"
-
-msgid "Could not connect"
-msgstr "Не удалось установить соединение"
+msgid "Unable to create connection"
+msgstr "Не удаётся создать соединение"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Неизвестный отклик от сервера."
 
-msgid "Could not create listen socket"
-msgstr "Не удалось создать сокет для прослушивания"
-
-msgid "Could not resolve hostname"
-msgstr "Не удалось разрешить имя узла"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Не удаётся создать сокет"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Имена пользователей SIP не могут содержать пробелы или символы @"
@@ -9483,178 +9558,63 @@ msgstr "Пользователь авторизации"
 msgid "Auth Domain"
 msgstr "Домен авторизации"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Поиск %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Не удалось установить соединение с %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Подключение: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Не удаётся записать файл %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Не удаётся прочитать файл %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Сообщение слишком велико, последние %s байт обрезаны."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s сейчас не в сети."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Предупреждение %s не разрешено."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Сообщение было отброшено, вы превышаете предел скорости сервера."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Чат в %s недоступен."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Вы отправляете сообщения к %s слишком часто."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Вы не получили сообщение от %s, так как оно было слишком велико."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Вы не получили сообщение от %s, так как оно отправлялось слишком часто."
-
-#, c-format
-msgid "Failure."
-msgstr "Ошибка."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Слишком много совпадений."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Необходима большая точность."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Служба каталогов временно недоступна."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Поиск email запрещён."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Ключевое слово проигнорировано."
-
-#, c-format
-msgid "No keywords."
-msgstr "Нет ключевых слов."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Пользователь не имеет информации каталога."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Страна не поддерживается."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Неизвестная ошибка: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Неправильное имя пользователя или пароль."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Служба временно недоступна."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Ваш уровень предупреждения сейчас слишком велик для входа."
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
-"попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Произошла неизвестная ошибка подключения: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Произошла неизвестная ошибка %d. Информация: %s"
-
-msgid "Invalid Groupname"
-msgstr "Неверное имя группы"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;комната&gt;:  Присоединиться к чату в сети Yahoo"
 
-msgid "Connection Closed"
-msgstr "Соединение разорвано"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Вывести список комнат в сети Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Ожидание ответа..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "безделье: Запросите пользователя, чтобы начать сеанс безделья"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC вышел из своей паузы. Вы снова можете отправлять сообщения."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-msgid "Password Change Successful"
-msgstr "Пароль изменён успешно"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Модуль протокола Yahoo"
 
-msgid "_Group:"
-msgstr "_Группа:"
+msgid "Pager server"
+msgstr "Сервер пейджера"
 
-msgid "Get Dir Info"
-msgstr "Получить информацию каталога"
+msgid "Pager port"
+msgstr "Порт пейджера"
 
-msgid "Set Dir Info"
-msgstr "Установить информацию каталога"
+msgid "File transfer server"
+msgstr "Сервер передачи файлов"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Не удалось открыть %s для записи!"
+msgid "File transfer port"
+msgstr "Порт передачи файлов"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Не удалось произвести передачу файлов; вероятно, отменили на той стороне."
+msgid "Chat room locale"
+msgstr "Языковой формат чата"
 
-msgid "Could not connect for transfer."
-msgstr "Не удалось установить соединение для передачи."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Игнорировать приглашения в конференции и чаты"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Не удалось записать заголовок файла. Файл не будет передан."
+msgid "Chat room list URL"
+msgstr "URL списка чатов"
 
-msgid "Save As..."
-msgstr "Сохранить как..."
+msgid "Yahoo Chat server"
+msgstr "Сервер чата Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s запросов %s на принятие %d файла: %s (%.2f %s)%s%s"
-msgstr[1] "%s запросов %s на принятие %d файлов: %s (%.2f %s)%s%s"
-msgstr[2] "%s запросов %s на принятие %d файла: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Порт чата Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s запрашивает передачу файла ему"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9666,12 +9626,12 @@ msgstr "%s запрашивает передачу файла ему"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Модуль протокола TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Модуль протокола Yahoo"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s послал вам приглашение к веб-камере, которое ещё не поддерживается."
+msgid "Your SMS was not delivered"
+msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ваше сообщение Yahoo! не отправлено."
@@ -9694,6 +9654,32 @@ msgstr "%s (повторно) не разрешил добавить его в �
 msgid "Add buddy rejected"
 msgstr "В добавлении собеседника отказано"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "При соединении с сервером получены недопустимые данные."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Неизвестная ошибка номер %d. Вход с web-сайта Yahoo! может исправить это."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Неизвестная ошибка номер %d. Вход с web-сайта Yahoo! может исправить это."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Неправильное имя пользователя или пароль"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9726,39 +9712,34 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Неизвестная ошибка номер %d. Вход с web-сайта Yahoo! может исправить это."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Не удалось добавить собеседника %s в группу %s в список на сервере учётной "
 "записи %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Не удалось добавить собеседника в список на сервере"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Слышимый %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Получен непредвиденный HTTP-отклик от сервера."
 
-msgid "Connection problem"
-msgstr "Проблема с соединением"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Соединение с %s потеряно:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Не удалось установить соединение с %s:\n"
+"Не удалось установить соединение с сервером:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9806,8 +9787,8 @@ msgstr "Настройки присутствия"
 msgid "Start Doodling"
 msgstr "Начать бездельничать"
 
-msgid "Activate which ID?"
-msgstr "Какой ID активировать?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "К кому присоединиться в чате?"
@@ -9821,74 +9802,15 @@ msgstr "Присоединиться к пользователю в чате..."
 msgid "Open Inbox"
 msgstr "Открыть входящие"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;комната&gt;:  Присоединиться к чату в сети Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Вывести список комнат в сети Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "безделье: Запросите пользователя, чтобы начать сеанс безделья"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Модуль протокола Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Сервер пейджера"
-
-msgid "Japan Pager server"
-msgstr "Сервер пейджера Japan"
-
-msgid "Pager port"
-msgstr "Порт пейджера"
-
-msgid "File transfer server"
-msgstr "Сервер передачи файлов"
-
-msgid "Japan file transfer server"
-msgstr "Сервер передачи файлов Japan"
-
-msgid "File transfer port"
-msgstr "Порт передачи файлов"
-
-msgid "Chat room locale"
-msgstr "Языковой формат чата"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Игнорировать приглашения в конференции и чаты"
-
-msgid "Chat room list URL"
-msgstr "URL списка чатов"
-
-msgid "Yahoo Chat server"
-msgstr "Сервер чата Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Порт чата Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Послан запрос безделья."
 
+msgid "Unable to connect."
+msgstr "Не удаётся установить соединение."
+
 msgid "Unable to establish file descriptor."
 msgstr "Не удаётся установить дескриптор файла."
 
@@ -9896,6 +9818,9 @@ msgstr "Не удаётся установить дескриптор файла
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s пытается отправить вам группу из %d файлов.\n"
 
+msgid "Write Error"
+msgstr "Ошибка записи"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Профиль Yahoo! Japan"
 
@@ -9966,14 +9891,9 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "Профиль пользователя пуст."
 
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s отклонил ваше приглашение к конференции в комнату \"%s\" потому что \"%s"
-"\"."
-
-msgid "Invitation Rejected"
-msgstr "Приглашение отвергнуто"
+#, fuzzy, c-format
+msgid "%s has declined to join."
+msgstr "%s в сети."
 
 msgid "Failed to join chat"
 msgstr "Не удалось присоединиться к чату"
@@ -10016,23 +9936,19 @@ msgstr "Голоса"
 msgid "Webcams"
 msgstr "Веб-камеры"
 
+msgid "Connection problem"
+msgstr "Проблема с соединением"
+
 msgid "Unable to fetch room list."
 msgstr "Не удаётся загрузить список комнат."
 
 msgid "User Rooms"
 msgstr "Комнаты пользователя"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Проблема с соединением с сервером YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Соединение с сервером потеряно\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10164,33 +10080,22 @@ msgstr "Сфера"
 msgid "Exposure"
 msgstr "Выдержка"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Не удаётся создать сокет:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Не в состоянии разобрать ответ от HTTP прокси: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Ошибка соединения с HTTP-прокси %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Доступ запрещён: прокси-сервер HTTP запрещает туннелирование порта %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Ошибка разрешения имени %s"
 
-msgid "Could not resolve host name"
-msgstr "Не удалось разрешить имя узла"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Прошу внимания %s..."
@@ -10320,18 +10225,6 @@ msgstr "+++ %s перестал бездействовать"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Ошибка чтения %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Произошла ошибка при чтении %s. Файл не был загружен, а старый файл был "
-"переименован в %s~."
-
 msgid "Calculating..."
 msgstr "Подсчёт..."
 
@@ -10445,6 +10338,18 @@ msgstr "Соединение отвергнуто."
 msgid "Address already in use."
 msgstr "Адрес уже используется"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Ошибка чтения %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Произошла ошибка при чтении %s. Файл не был загружен, а старый файл был "
+"переименован в %s~."
+
 msgid "Internet Messenger"
 msgstr "Клиент обмена мгновенными сообщениями"
 
@@ -10487,10 +10392,9 @@ msgstr "Уведомления о новой по_чте"
 msgid "Use this buddy _icon for this account:"
 msgstr "Использовать этот _значок собеседника для этой учётной записи:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Параметры %s"
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "_Дополнительно"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Использовать настройки прокси GNOME"
@@ -10525,9 +10429,6 @@ msgstr "Если приглядитесь"
 msgid "you can see the butterflies mating"
 msgstr "вы можете увидеть спаривающихся бабочек"
 
-msgid "Proxy Options"
-msgstr "Параметры прокси"
-
 msgid "Proxy _type:"
 msgstr "Т_ип прокси:"
 
@@ -10556,8 +10457,9 @@ msgstr "_Основные"
 msgid "Create _this new account on the server"
 msgstr "Создать _эту новую учётную запись на сервере"
 
-msgid "_Advanced"
-msgstr "_Дополнительно"
+#, fuzzy
+msgid "P_roxy"
+msgstr "Прокси"
 
 msgid "Enabled"
 msgstr "Включено"
@@ -10608,8 +10510,9 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Обновите нужные поля."
 
-msgid "Room _List"
-msgstr "_Список комнат"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Учётная запись"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10618,8 +10521,8 @@ msgstr ""
 "Введите соответствующую информацию о чате, к которому вы хотели бы "
 "присоединиться.\n"
 
-msgid "_Account:"
-msgstr "У_чётная запись:"
+msgid "Room _List"
+msgstr "_Список комнат"
 
 msgid "_Block"
 msgstr "_Блокировать"
@@ -10636,6 +10539,17 @@ msgstr "_Информация"
 msgid "I_M"
 msgstr "Мгновенное сооб_щение"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "_Добавить чат"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Видеочат"
+
 msgid "_Send File..."
 msgstr "_Отправить файл..."
 
@@ -10645,9 +10559,14 @@ msgstr "Добавить п_равило..."
 msgid "View _Log"
 msgstr "Просмотреть _журнал"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Скрывать, когда не в сети"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Показывать, когда не в сети"
+
 msgid "_Alias..."
 msgstr "_Псевдоним..."
 
@@ -10774,6 +10693,10 @@ msgstr "/Инструменты/_Слежение за собеседникам�
 msgid "/Tools/_Certificates"
 msgstr "/Инструменты/С_ертификаты"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Инструменты/Ро_жицы"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Инструменты/_Модули"
 
@@ -10783,10 +10706,6 @@ msgstr "/Инструменты/_Настройки"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Инструменты/К_онфиденциальность"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Инструменты/Ро_жицы"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Инструменты/Передача _файлов"
 
@@ -10905,8 +10824,8 @@ msgstr "Вручную"
 msgid "By status"
 msgstr "По статусу"
 
-msgid "By log size"
-msgstr "По размеру журнала"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10922,6 +10841,9 @@ msgstr "Переустановить соединение"
 msgid "Re-enable"
 msgstr "Включить повторно"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Добро пожаловать назад!"
 
@@ -11012,6 +10934,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "_Псевдоним:"
 
+msgid "_Group:"
+msgstr "_Группа:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Автоматически _подключиться, когда учётная запись станет в сети."
 
@@ -11045,6 +10970,116 @@ msgstr "/Инструменты"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Собеседники/Сортировать собеседников"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Цвет фона"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Эта группа была добавлена в список собеседников"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Лаосский"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Цвет фона"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Р_азвернуть"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Выбрать цвет фона"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Свернуть"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Выбрать цвет фона"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Ярлык"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "В сети"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Отошёл"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Не в сети"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Текст настроения"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Сообщение отправлено"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Изменить пользовательскую информацию для %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Укажите имя компьютера, для которого этот сертификат."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-серверы"
@@ -11063,14 +11098,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Пригласить собеседника в чат"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Введите имя пользователя, которого вы хотите пригласить, вместе с "
-"необязательным текстом приглашения."
-
 msgid "_Buddy:"
 msgstr "_Собеседник:"
 
@@ -11099,7 +11126,8 @@ msgstr "Игнорировать"
 msgid "Get Away Message"
 msgstr "Получить сообщение об отсутствии"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Последнее сказанное"
 
 msgid "Unable to save icon file to disk."
@@ -11145,6 +11173,22 @@ msgstr "/Беседа/Со_хранить как..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Беседа/О_чистить"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Беседа/_Ещё"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Беседа/_Ещё"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Беседа/_Ещё"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Беседа/Просмотреть _журнал"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Беседа/Отправить _файл..."
 
@@ -11217,6 +11261,18 @@ msgstr "/Беседа"
 msgid "/Conversation/View Log"
 msgstr "/Беседа/Просмотреть журнал"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Беседа/Ещё"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Беседа/Просмотреть журнал"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Беседа/Ещё"
+
 msgid "/Conversation/Send File..."
 msgstr "/Беседа/Отправить файл..."
 
@@ -11401,6 +11457,9 @@ msgstr "исполнитель"
 msgid "Ka-Hing Cheung"
 msgstr "Ка-Хин Чон"
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "поддержка"
 
@@ -11527,6 +11586,10 @@ msgstr "Хинди"
 msgid "Hungarian"
 msgstr "Венгерский"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Румынский"
+
 msgid "Indonesian"
 msgstr "Индонезийский"
 
@@ -11542,6 +11605,10 @@ msgstr "Грузинский"
 msgid "Ubuntu Georgian Translators"
 msgstr "Переводчики Ubuntu на грузинский"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Другое"
+
 msgid "Kannada"
 msgstr "Каннада"
 
@@ -11621,6 +11688,9 @@ msgstr "Сингальский"
 msgid "Swedish"
 msgstr "Шведский"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Тамильский"
 
@@ -11939,14 +12009,6 @@ msgstr "О_чищать завершённые передачи"
 msgid "File transfer _details"
 msgstr "_Подробности о передаче файлов"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Пауза"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Возобновить"
-
 msgid "Paste as Plain _Text"
 msgstr "Вставить как простой _текст"
 
@@ -11967,7 +12029,7 @@ msgid "Hyperlink visited color"
 msgstr "Цвет посещённой гиперссылки"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Цвет для отображения гиперссылок после их посещения (или активации)."
 
 msgid "Hyperlink prelight color"
@@ -12008,14 +12070,23 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr "Цвет имени сообщения действия для прошепченного сообщения"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Цвет для отображения имени сообщения действия."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "Цвет имени прошепченного сообщения"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Цвет для отображения имени сообщения действия."
+
+#, fuzzy
 msgid "Typing notification color"
 msgstr "Цвет набора уведомления"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Цвет, использующийся для шрифта набора уведомления"
 
 msgid "Typing notification font"
@@ -12027,15 +12098,6 @@ msgstr "Шрифт, использующийся для набора уведо�
 msgid "Enable typing notification"
 msgstr "Включить набор уведомления"
 
-msgid "_Copy Email Address"
-msgstr "_Скопировать адрес email"
-
-msgid "_Open Link in Browser"
-msgstr "_Открыть ссылку в браузере"
-
-msgid "_Copy Link Location"
-msgstr "_Скопировать ссылку"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12077,11 +12139,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Сохранить изображение"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Сохранить изображение..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Добавить свою рожицу..."
 
@@ -12171,9 +12231,6 @@ msgstr "Уменьшить размер шрифта"
 msgid "Font Face"
 msgstr "Облик шрифта"
 
-msgid "Background Color"
-msgstr "Цвет фона"
-
 msgid "Foreground Color"
 msgstr "Цвет текста"
 
@@ -12289,6 +12346,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12320,6 +12378,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12372,17 +12431,29 @@ msgstr ""
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 msgid "Pidgin"
-msgstr "Пиджин"
+msgstr "Pidgin"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Выхожу, потому что уже запущен другой клиент libpurple.\n"
 
-msgid "Open All Messages"
-msgstr "Открыть все сообщения"
+msgid "/_Media"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Вам пришла почта!</span>"
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Подсчёт..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12413,6 +12484,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Был выбран браузер \"Другой\", но команда не была задана."
 
+#, fuzzy
+msgid "No message"
+msgstr "Неизвестное сообщение"
+
+msgid "Open All Messages"
+msgstr "Открыть все сообщения"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Вам пришла почта!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Новое правило для собеседника"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Вам пришла почта!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Следующие модули будут выгружены."
 
@@ -12461,10 +12553,17 @@ msgstr "<b>Подробности о модуле</b>"
 msgid "Select a file"
 msgstr "Выбрать файл"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Изменить правило для собеседника"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "За кем следить"
 
+msgid "_Account:"
+msgstr "У_чётная запись:"
+
 msgid "_Buddy name:"
 msgstr "_Имя собеседника:"
 
@@ -12531,7 +12630,60 @@ msgstr "_Повторение"
 msgid "Pounce Target"
 msgstr "Объект слежения"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Начинает набор сообщения"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Приостанавливает набор сообщения"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Входит"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s перестал бездействовать (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Возвращается"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Прекратил набор сообщения"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Выходит"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Начинает бездействовать"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Во время отсутствия"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Отправить сообщение"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Неизвестное событие слежения. Сообщите об этом!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Не удалось распаковать тему смайликов."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Не удалось распаковать тему смайликов."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Не удалось распаковать тему смайликов."
 
 msgid "Install Theme"
@@ -12553,6 +12705,12 @@ msgstr "Горячие клавиши"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "З_акрывать беседы клавишей Escape"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Список собеседников"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Значок системного лотка"
 
@@ -12562,8 +12720,9 @@ msgstr "_Показывать значок системного лотка:"
 msgid "On unread messages"
 msgstr "При наличии непрочитанных сообщений"
 
-msgid "Conversation Window Hiding"
-msgstr "Скрытие окон бесед"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Окна бесед"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Скрывать новые беседы:"
@@ -12571,6 +12730,9 @@ msgstr "_Скрывать новые беседы:"
 msgid "When away"
 msgstr "Во время отсутствия"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_Сворачивать новые окна бесед"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Вкладки"
@@ -12629,9 +12791,6 @@ msgstr "Использовать плавную прокрутку"
 msgid "F_lash window when IMs are received"
 msgstr "_Мерцать окном при получении мгновенных сообщений"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_Сворачивать новые окна бесед"
-
 msgid "Minimum input area height in lines:"
 msgstr "Минимальная высота области ввода (в строках):"
 
@@ -12664,13 +12823,11 @@ msgstr "Не могу запустить программу настройки �
 msgid "Cannot start browser configuration program."
 msgstr "Не могу запустить программу настройки веб-проводника"
 
-msgid "ST_UN server:"
-msgstr "ST_UN-сервер:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Определять IP-адрес _автоматически"
 
 msgid "Public _IP:"
@@ -12691,6 +12848,10 @@ msgstr "_Начальный порт:"
 msgid "_End port:"
 msgstr "_Конечный порт:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Прокси-сервер &amp; браузер"
 
@@ -12886,12 +13047,12 @@ msgstr "Во время отсутствия и бездействия"
 msgid "Auto-away"
 msgstr "Авто-\"Отошёл\""
 
-msgid "Change status when _idle"
-msgstr "Менять статус при _бездействии"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Минут до начала бездействия:"
 
+msgid "Change status when _idle"
+msgstr "Менять статус при _бездействии"
+
 msgid "Change _status to:"
 msgstr "Менять _статус на:"
 
@@ -13040,31 +13201,21 @@ msgstr "Сохранить _и применить"
 msgid "Status for %s"
 msgstr "Статус для %s"
 
+#, fuzzy, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Своя рожица для текущего ярлычка уже существует. Пожалуйста, укажите другой "
+"ярлычок."
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Своя рожица"
 
-msgid "More Data needed"
-msgstr "Требуется больше данных"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Пожалуйста, создайте ярлычок для сопоставления с рожицей."
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Сделать копию ярлычка"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Своя рожица для текущего ярлычка уже существует. Пожалуйста, укажите другой "
-"ярлычок."
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Пожалуйста, выберите картинку для рожицы."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Изменить рожицу"
@@ -13074,23 +13225,31 @@ msgid "Add Smiley"
 msgstr "Добавить рожицу"
 
 #, fuzzy
-msgid "Smiley _Image"
-msgstr "_Изображение рожицы"
+msgid "_Image:"
+msgstr "_Изображение"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
-msgstr "_Ярлычок рожицы"
+msgid "S_hortcut text:"
+msgstr "Ярлык"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Рожица"
 
 #, fuzzy
+msgid "Shortcut Text"
+msgstr "Ярлык"
+
+#, fuzzy
 msgid "Custom Smiley Manager"
 msgstr "Управление своими рожицами"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Выбрать собеседника"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Щёлкните, чтобы изменить свою иконку для этой учётной записи."
 
@@ -13177,9 +13336,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Нельзя отправить ярлык"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Вы перетянули кнопку запуска рабочего стола. Скорее всего вы хотели "
 "отправить то, на что эта кнопка ссылается, а не саму её."
@@ -13216,9 +13376,35 @@ msgstr ""
 "Не удалось загрузить картинку '%s': причина не ясна, возможна порча файла "
 "картинки"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Открывать ссылку в:"
+
+msgid "_Copy Link Location"
+msgstr "_Скопировать ссылку"
+
+msgid "_Copy Email Address"
+msgstr "_Скопировать адрес email"
+
+#, fuzzy
+msgid "_Open File"
+msgstr "Открыть файл..."
+
+#, fuzzy
+msgid "Open _Containing Directory"
+msgstr "Каталог журнала"
+
 msgid "Save File"
 msgstr "Сохранить файл"
 
+#, fuzzy
+msgid "_Play Sound"
+msgstr "Воспроизвести звук"
+
+#, fuzzy
+msgid "_Save File"
+msgstr "Сохранить файл"
+
 msgid "Select color"
 msgstr "Выбрать цвет"
 
@@ -13244,6 +13430,9 @@ msgstr "_Добавить..."
 msgid "_Open Mail"
 msgstr "Открыть _почту"
 
+msgid "_Pause"
+msgstr "_Пауза"
+
 #, fuzzy
 msgid "_Edit"
 msgstr "Р_едактировать"
@@ -13310,6 +13499,78 @@ msgstr "Модуль прогнозирования доступности ко�
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Отображает статистическую информацию о доступности ваших приятелей"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Адрес сервера"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Войти на сервер конференций"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Выберите сервер конференций для опроса"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Сетевые службы"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Отправить список собеседников"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Отходит"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Каталог журнала"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Выбор звука"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Служба PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Описание"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Информация о службе Разъяснения"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Браузер:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Пользователь не существует"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Сервер не поддерживает блокировку"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Информация о службе Разъяснения"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Этот модуль полезен для отладки XMPP серверов или клиентов."
+
 msgid "Buddy is idle"
 msgstr "Собеседник бездействует"
 
@@ -13702,9 +13963,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Модуль музыкальной переписки для совместного сочинения"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Модуль музыкальной переписки позволяет нескольким пользователям совместно "
 "работать над кусочком мелодии путём редактирования общих результатов в "
@@ -13822,12 +14084,6 @@ msgstr ""
 "- Отправляет сообщение пользователям из вашего списка сразу после их "
 "подключения"
 
-msgid "Cursor Color"
-msgstr "Цвет курсора"
-
-msgid "Secondary Cursor Color"
-msgstr "Вторичный цвет курсора"
-
 msgid "Hyperlink Color"
 msgstr "Цвет гиперссылки"
 
@@ -13839,6 +14095,10 @@ msgstr "Цвет посещённой гиперссылки"
 msgid "Highlighted Message Name Color"
 msgstr "Цвет имени подсвеченного сообщения"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Цвет набора уведомления"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Горизонтальное разделение GtkTreeView"
 
@@ -13868,35 +14128,24 @@ msgstr "Шрифт интерфейса GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Тема ярлыка текста GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Цвета интерфейса"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Включить набор уведомления"
 
-msgid "Widget Sizes"
-msgstr "Размер виджетов"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Управление темой GTK+ для Pidgin"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Закрыть"
 
 msgid "Fonts"
 msgstr "Шрифты"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Инструменты файла Gtkrc"
 
@@ -13984,9 +14233,10 @@ msgid "Conversation Window Send Button."
 msgstr "Кнопка отправки окна беседы."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Добавляет кнопку отправки к области ввода окна беседы. Предназначается для "
 "случая, когда физическая клавиатура отсутствует."
@@ -14042,6 +14292,116 @@ msgstr ""
 "Замещает текст в исходящих сообщениях в соответствии с правилами, "
 "определёнными пользователем."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Не в сети"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Не в сети"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Присоединиться к чату"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Игнорировать"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Громко"
+
+#. A user in a chat room who has special privileges.
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Авторизация дана"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Ошибка "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Информация"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Диалог запроса"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Уровень предупреждения"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Статус для %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Языковой формат чата"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Изменить иконку"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Управление темой GTK+ для Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Контактная информация"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Список собеседников"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Список собеседников"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Управление темой GTK+ для Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Управление темой GTK+ для Pidgin"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14209,8 +14569,9 @@ msgstr "Параметры Pidgin для Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Параметры, специфичные для Pidgin для Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Параметры, специфичные для Pidgin для Windows, такие как закрепление списка "
 "собеседников."
@@ -14252,6 +14613,537 @@ msgstr "Отправлять и получать прямые XMPP строфы.
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Этот модуль полезен для отладки XMPP серверов или клиентов."
 
+#, fuzzy
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "Не удалось соединиться с сервером."
+
+#, fuzzy
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Не удалось загрузить пару ключей SILC"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s отклонил ваше приглашение к конференции в комнату \"%s\" потому что \"%"
+#~ "s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Приглашение отвергнуто"
+
+#~ msgid "_Resume"
+#~ msgstr "_Возобновить"
+
+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "Прокси"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Не удаётся открыть сокет"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Не удалось осуществить прослушивание сокета"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Не удаётся прочитать сокет"
+
+#~ msgid "Connection failed."
+#~ msgstr "Не удалось установить соединение."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Сервер разорвал соединение"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Не удалось создать сокет"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Не удалось соединиться с узлом"
+
+#~ msgid "Read error"
+#~ msgstr "Ошибка чтения"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удалось установить соединение с сервером:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Ошибка записи"
+
+#~ msgid "Last Activity"
+#~ msgstr "Последняя активность"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Информация о службе Разъяснения"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Элементы службы Разъяснения"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Расширенная строфная адресация"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Многопользовательский чат"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Информация о расширенном присутствии многопользовательского чата."
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Внутриполосные потоки информации"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Команды Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Служба PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Потоки информации SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Вне полосы данных"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Внутриполосная регистрация"
+
+#~ msgid "User Location"
+#~ msgstr "Местоположение пользователя"
+
+#~ msgid "User Avatar"
+#~ msgstr "Аватара пользователя"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Уведомления о состоянии чата"
+
+#~ msgid "Software Version"
+#~ msgstr "Версия программного обеспечения"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Создание потока"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Настроение пользователя"
+
+#~ msgid "User Activity"
+#~ msgstr "Активность пользователя"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Возможности существования"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Зашифрованный сеанс переговоров"
+
+#~ msgid "User Tune"
+#~ msgstr "Настройка пользователя"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Реестр элементов обмена"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Доступность адреса"
+
+#~ msgid "User Profile"
+#~ msgstr "Профиль пользователя"
+
+#~ msgid "Jingle"
+#~ msgstr "Звон"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Звенящий звук"
+
+#~ msgid "User Nickname"
+#~ msgstr "Псевдоним пользователя"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Звон ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Звон ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Звон Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Звенящее видео"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Звон DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Получение сообщений"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Файл публичного ключа"
+
+#~ msgid "User Chatting"
+#~ msgstr "Переписка пользователя"
+
+#~ msgid "User Browsing"
+#~ msgstr "Проводник пользователя"
+
+#~ msgid "User Gaming"
+#~ msgstr "Игра пользователя"
+
+#~ msgid "User Viewing"
+#~ msgstr "Просмотр пользователя"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Строфное шифрование"
+
+#~ msgid "Entity Time"
+#~ msgstr "Время существования"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Задержанная доставка"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Совместные объекты данных"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Хранилище файлов и совместное пользование"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Служба Разъяснения STUN для Звона"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Упрощённо зашифрованный сеанс переговоров"
+
+#~ msgid "Hop Check"
+#~ msgstr "Проверка прыжков"
+
+#~ msgid "Read Error"
+#~ msgstr "Ошибка чтения"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Не удалось соединиться с сервером."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Буфер чтения полон (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Неразбираемое сообщение"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Не удалось соединиться с узлом: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Не удалось войти в сеть (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Вы были отключены, так как вошли с другой машины."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Ошибка. Поддержка SSL не установлена."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Неправильный пароль."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удалось установить соединение с BOS-сервером:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Соединение с вами вскоре может быть разорвано. Смотрите обновления на %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Не удалось установить соединение"
+
+#~ msgid "Invalid username."
+#~ msgstr "Неверное имя пользователя."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Не могу расшифровать ответ сервера"
+
+#~ msgid "Connection lost"
+#~ msgstr "Соединение потеряно"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Не удалось разрешить имя узла"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Соединение разорвано (запись)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Сброс соединения"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Ошибка при чтении из сокета: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Не удаётся соединиться с узлом"
+
+#~ msgid "Could not write"
+#~ msgstr "Не удалось записать"
+
+#~ msgid "Could not connect"
+#~ msgstr "Не удалось установить соединение"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Не удалось создать сокет для прослушивания"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Не удалось разрешить имя узла"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Неправильный пароль"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удалось установить соединение с %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Сервер пейджера Japan"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Сервер передачи файлов Japan"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Соединение с сервером потеряно\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Не удалось разрешить имя узла"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Сервер требует TLS/SSL для входа. Поддержка TLS/SSL не найдена."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Скрытие окон бесед"
+
+#~ msgid "More Data needed"
+#~ msgstr "Требуется больше данных"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Пожалуйста, создайте ярлычок для сопоставления с рожицей."
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Пожалуйста, выберите картинку для рожицы."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Какой ID активировать?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Цвет курсора"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Вторичный цвет курсора"
+
+#~ msgid "Interface colors"
+#~ msgstr "Цвета интерфейса"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Размер виджетов"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "Пригласительное сообщение"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Введите имя пользователя, которого вы хотите пригласить,\n"
+#~ "а также, по желанию, пригласительное сообщение."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Поиск %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Не удалось установить соединение с %s"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Подключение: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Не удаётся записать файл %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Не удаётся прочитать файл %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Сообщение слишком велико, последние %s байт обрезаны."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s сейчас не в сети."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Предупреждение %s не разрешено."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Сообщение было отброшено, вы превышаете предел скорости сервера."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Чат в %s недоступен."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Вы отправляете сообщения к %s слишком часто."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Вы не получили сообщение от %s, так как оно было слишком велико."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Вы не получили сообщение от %s, так как оно отправлялось слишком часто."
+
+#~ msgid "Failure."
+#~ msgstr "Ошибка."
+
+#~ msgid "Too many matches."
+#~ msgstr "Слишком много совпадений."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Необходима большая точность."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Служба каталогов временно недоступна."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Поиск email запрещён."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Ключевое слово проигнорировано."
+
+#~ msgid "No keywords."
+#~ msgstr "Нет ключевых слов."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Пользователь не имеет информации каталога."
+
+#~ msgid "Country not supported."
+#~ msgstr "Страна не поддерживается."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Неизвестная ошибка: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Неправильное имя пользователя или пароль."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Служба временно недоступна."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Ваш уровень предупреждения сейчас слишком велик для входа."
+
+#~ msgid ""
+#~ "You have been connecting and disconnecting too frequently.  Wait ten "
+#~ "minutes and try again.  If you continue to try, you will need to wait "
+#~ "even longer."
+#~ msgstr ""
+#~ "Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
+#~ "попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё "
+#~ "дольше."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Произошла неизвестная ошибка подключения: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Произошла неизвестная ошибка %d. Информация: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Неверное имя группы"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Соединение разорвано"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Ожидание ответа..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC вышел из своей паузы. Вы снова можете отправлять сообщения."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Пароль изменён успешно"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Получить информацию каталога"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Установить информацию каталога"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Не удалось открыть %s для записи!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Не удалось произвести передачу файлов; вероятно, отменили на той стороне."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Не удалось установить соединение для передачи."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Не удалось записать заголовок файла. Файл не будет передан."
+
+#~ msgid "Save As..."
+#~ msgstr "Сохранить как..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s запросов %s на принятие %d файла: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s запросов %s на принятие %d файлов: %s (%.2f %s)%s%s"
+#~ msgstr[2] "%s запросов %s на принятие %d файла: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s запрашивает передачу файла ему"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Модуль протокола TOC"
+
+#~ msgid "%s Options"
+#~ msgstr "Параметры %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Параметры прокси"
+
+#~ msgid "By log size"
+#~ msgstr "По размеру журнала"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Открыть ссылку в браузере"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN-сервер:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "_Изображение рожицы"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "_Ярлычок рожицы"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Не удаётся загрузить адресную книгу MSN"
 
@@ -14459,18 +15351,12 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "Reason: %s"
 #~ msgstr "Причина: %s"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Эта группа была добавлена в список собеседников"
-
 #~ msgid "Code [0x%02X]: %s"
 #~ msgstr "Код [0x%02X]: %s"
 
 #~ msgid "Enter your reason:"
 #~ msgstr "Введите причину:"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Ошибка запроса маркера входа"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP-адрес"
 
diff --git a/po/si.po b/po/si.po
index 107d829db9..b16a6605f5 100644
--- a/po/si.po
+++ b/po/si.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: si\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-05-17 11:08+0530\n"
 "Last-Translator: Yajith Ajantha Dayarathna <yajith@gmail.com>\n"
 "Language-Team: Sinhala <sinhala@linux.lk>\n"
@@ -33,7 +33,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -579,18 +579,6 @@ msgstr ""
 msgid "Send To"
 msgstr "වෙතට යවන්න"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "අන්තර්ජාල පණිවිඩකරු"
-
-msgid "Invite"
-msgstr "ඇරයුම"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-
 msgid "Conversation"
 msgstr ""
 
@@ -833,6 +821,41 @@ msgstr "සංවාද"
 msgid "System Log"
 msgstr "පද්ධති සටහන"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "ගණනය කරමින්..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "අනුමත කරන්න"
+
+msgid "Reject"
+msgstr "අනුමත නොකරන්න"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "ඔබ මෙම පිළිසඳරෙන් ඉවත් වී ඇත."
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "විද්‍යත් තැපෑල්"
 
@@ -867,6 +890,9 @@ msgstr "දිගටම කරගෙන යන්න"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "ඇරයුම"
+
 msgid "(none)"
 msgstr "(කිසිවක් නැත)"
 
@@ -1069,7 +1095,6 @@ msgstr "%s ඉවතට ගොස් ඇත. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ඔබට පණිවිඩයක් එවන ලදි. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1115,7 +1140,6 @@ msgstr ""
 msgid "Change status to"
 msgstr ""
 
-#. Conversations
 msgid "Conversations"
 msgstr "සංවාද"
 
@@ -1427,7 +1451,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr ""
 
-#, c-format
 msgid "Online"
 msgstr ""
 
@@ -1475,6 +1498,28 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr ""
 
@@ -1573,13 +1618,6 @@ msgstr ""
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "අනුමත කරන්න"
-
-msgid "Reject"
-msgstr "අනුමත නොකරන්න"
-
 msgid "_View Certificate..."
 msgstr "සහතික දසුන... (_V)"
 
@@ -1666,6 +1704,8 @@ msgstr ""
 msgid "+++ %s signed off"
 msgstr ""
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "නොදන්නා දෝෂයක්"
 
@@ -1712,6 +1752,16 @@ msgstr ""
 msgid "%s left the room (%s)."
 msgstr ""
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "ඇරයුම"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr ""
@@ -1833,7 +1883,6 @@ msgstr ""
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#, c-format
 msgid "File transfer complete"
 msgstr ""
 
@@ -1841,7 +1890,6 @@ msgstr ""
 msgid "You canceled the transfer of %s"
 msgstr ""
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr ""
 
@@ -2022,11 +2070,13 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+msgid "Error creating conference."
+msgstr ""
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2407,7 +2457,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2455,7 +2505,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2483,6 +2533,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "රහස්පදය ඇතුළත් කරන්න"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2670,18 +2746,17 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "මුල් නම"
 
@@ -2713,6 +2788,10 @@ msgstr ""
 msgid "Purple Person"
 msgstr ""
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr ""
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2723,14 +2802,17 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2777,13 +2859,14 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "රහස්පද ගැල පෙන්නේ නැත."
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2795,14 +2878,15 @@ msgstr ""
 msgid "Password"
 msgstr "රහස්පදය"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr ""
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "පිළිඹිබුව සුරකින්න"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -2855,6 +2939,15 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2868,13 +2961,13 @@ msgstr ""
 msgid "Add to chat..."
 msgstr "පිළිසඳරට එක් කරන්න..."
 
+#. Global
 msgid "Available"
 msgstr "භාවිතයට ඇති"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "පිටතට ගොස්"
 
@@ -2902,7 +2995,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -2917,7 +3010,13 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr ""
+
+msgid "Connection failed"
 msgstr ""
 
 msgid "Add to chat"
@@ -2926,14 +3025,24 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
 msgid "Chat error"
 msgstr ""
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
-msgstr ""
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 msgid "Find buddies..."
 msgstr ""
@@ -2974,6 +3083,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+#, fuzzy
+msgid "GG server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -2988,8 +3101,9 @@ msgstr ""
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 msgid "Error displaying MOTD"
 msgstr ""
@@ -3004,8 +3118,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
-msgstr ""
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 msgid "View MOTD"
 msgstr ""
@@ -3016,24 +3138,22 @@ msgstr "නාලිකාව (_C):"
 msgid "_Password:"
 msgstr "රහස්පදය: (_P)"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr ""
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-msgid "Read error"
+#, c-format
+msgid "Server closed the connection"
 msgstr ""
 
 msgid "Users"
@@ -3211,6 +3331,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "අනුර්ත නම"
+
 msgid "Cannot change nick"
 msgstr ""
 
@@ -3409,10 +3540,10 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3427,16 +3558,44 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "සත්‍යාපනය අසමත් විය"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, c-format
+msgid "SASL error: %s"
+msgstr ""
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr ""
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+msgid "Unable to establish a connection with the server"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
+
+msgid "Unable to establish SSL connection"
 msgstr ""
 
 msgid "Full Name"
@@ -3503,157 +3662,7 @@ msgstr "සේවාලාභියා"
 msgid "Operating System"
 msgstr "මෙහෙයුම් පද්ධතිය"
 
-msgid "Last Activity"
-msgstr "අවසන් ක්‍රියාව"
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr ""
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr ""
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr ""
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
+msgid "Local Time"
 msgstr ""
 
 msgid "Priority"
@@ -3662,6 +3671,14 @@ msgstr "ප්‍රමුකත්වය"
 msgid "Resource"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "පිට වීම"
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3708,7 +3725,6 @@ msgstr ""
 msgid "Extended Away"
 msgstr ""
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
@@ -3828,33 +3844,34 @@ msgstr ""
 msgid "Find Rooms"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "අපරනාම:"
 
-msgid "Write error"
+msgid "No users found"
 msgstr ""
 
-msgid "Ping timeout"
-msgstr ""
+#, fuzzy
+msgid "Roles:"
+msgstr "කාර්‍යය"
 
-msgid "Read Error"
+msgid "Ping timed out"
 msgstr ""
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
-
 msgid "Invalid XMPP ID"
 msgstr ""
 
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+msgid "Malformed BOSH URL"
+msgstr ""
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
@@ -3879,9 +3896,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr ""
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr "පවත්නා තත්වය"
 
@@ -3894,6 +3908,9 @@ msgstr "දුරකථනය"
 msgid "Date"
 msgstr "දිනය"
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -3921,6 +3938,9 @@ msgstr ""
 msgid "Change Registration"
 msgstr ""
 
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -3939,9 +3959,18 @@ msgstr ""
 msgid "Re-initializing Stream"
 msgstr ""
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr ""
 
+msgid "Mood"
+msgstr ""
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr ""
 
@@ -3963,12 +3992,6 @@ msgstr "කිසිවක් නැත"
 msgid "Subscription"
 msgstr ""
 
-msgid "Mood"
-msgstr ""
-
-msgid "Now Listening"
-msgstr ""
-
 msgid "Mood Text"
 msgstr ""
 
@@ -4011,9 +4034,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 msgid "Change XMPP Password"
 msgstr ""
 
@@ -4207,15 +4227,21 @@ msgid "Unable to ping user %s"
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid "Buzzing %s..."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
@@ -4228,7 +4254,31 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "සත්‍යාපනය අසමත් විය"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+msgid "Select a Resource"
+msgstr ""
+
+msgid "Initiate Media"
 msgstr ""
 
 msgid "config:  Configure a chat room."
@@ -4250,13 +4300,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4316,6 +4366,9 @@ msgstr ""
 msgid "File transfer proxies"
 msgstr ""
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4354,6 +4407,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4368,12 +4429,30 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
-#, c-format
-msgid "Error joining chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "නොදන්නා හේතුවක්"
+
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s අභාවිත විය (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "ගොනුව විවෘත කිරීමේදී දෝශයක් ඇතිවිය."
+
+msgid "Transfer was closed."
 msgstr ""
 
-#, c-format
-msgid "Error in chat %s"
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "'%s' ගොනුව විවෘත කිරීම අපහසුවිය: %s"
+
+msgid "Failed to open in-band bytestream"
 msgstr ""
 
 #, c-format
@@ -4399,9 +4478,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Select a Resource"
-msgstr ""
-
 msgid "Edit User Mood"
 msgstr ""
 
@@ -4434,7 +4510,17 @@ msgstr "ක්‍රියා"
 msgid "Select an action"
 msgstr ""
 
-msgid "Unable to retrieve MSN Address Book"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr ""
+
+msgid "Buddy Add error"
+msgstr ""
+
+msgid "The username specified does not exist."
 msgstr ""
 
 #, c-format
@@ -4661,7 +4747,6 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4685,6 +4770,10 @@ msgstr "සබඳතාවය ඉවත්කරන්න"
 msgid "Non-IM Contacts"
 msgstr "සබඳතාවය ඉවත්කරන්න"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -4753,6 +4842,13 @@ msgstr ""
 msgid "Page"
 msgstr "පිටුව"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "වැඩ"
+
 msgid "Has you"
 msgstr ""
 
@@ -4791,6 +4887,13 @@ msgstr "ශිල්පියා"
 msgid "Album"
 msgstr ""
 
+#, fuzzy
+msgid "Game Title"
+msgstr "සිරස්තලය"
+
+msgid "Office Title"
+msgstr ""
+
 msgid "Set Friendly Name..."
 msgstr ""
 
@@ -4824,9 +4927,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -4979,7 +5079,7 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
+msgid "View web profile"
 msgstr ""
 
 #. *< type
@@ -5013,63 +5113,26 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr ""
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
+msgstr "නොදන්නා දෝෂයක්"
 
 msgid "Unable to add user"
 msgstr ""
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
 #, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
+msgid "Unknown error (%d)"
 msgstr ""
 
-msgid "Service Temporarily Unavailable."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr ""
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5102,9 +5165,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr ""
 
@@ -5117,19 +5177,20 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "%s ධාවනය කිරීමේ දෝශයක්."
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5158,6 +5219,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5194,14 +5263,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "ලිපින පොතට ඇතුලත් කරන්න"
@@ -5209,19 +5270,15 @@ msgstr "ලිපින පොතට ඇතුලත් කරන්න"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr ""
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr ""
-
 msgid "The username specified is invalid."
 msgstr ""
 
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5235,15 +5292,59 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+msgid "Unknown error."
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+msgid "User lookup"
 msgstr ""
 
 msgid "Reading challenge"
@@ -5255,13 +5356,22 @@ msgstr ""
 msgid "Logging in"
 msgstr ""
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr ""
 
@@ -5280,19 +5390,20 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-msgid "MySpaceIM - No Username Set"
-msgstr ""
-
-msgid "You appear to have no MySpace username."
+msgid "IM Friends"
 msgstr ""
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
+msgid "Add contacts from server"
 msgstr ""
 
 #, c-format
@@ -5301,15 +5412,21 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "සාවද්‍ය රහස්පදයකී."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
+msgid "Invalid input condition"
+msgstr ""
+
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5319,13 +5436,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-msgid "User lookup"
-msgstr ""
-
 msgid "Failed to remove buddy"
 msgstr ""
 
@@ -5335,33 +5445,15 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-msgid "Invalid input condition"
-msgstr ""
-
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
+msgid "Missing Cipher"
 msgstr ""
 
-msgid "IM Friends"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Add contacts from server"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
 msgstr ""
 
 msgid "Add friends from MySpace.com"
@@ -5404,9 +5496,6 @@ msgstr ""
 msgid "User"
 msgstr "පරිශිලක"
 
-msgid "Profile"
-msgstr ""
-
 msgid "Headline"
 msgstr ""
 
@@ -5419,14 +5508,10 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr ""
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 msgid "MySpaceIM - Username Available"
@@ -5438,12 +5523,22 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 msgid "This username is unavailable."
 msgstr ""
 
 msgid "Please try another username:"
 msgstr ""
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr ""
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5635,10 +5730,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "සාවද්‍ය රහස්පදයකී."
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5677,9 +5768,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "පිවිසුම සක්‍රීය කරන්න"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5777,9 +5868,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -5800,23 +5888,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -5839,24 +5920,32 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-msgid "Could not join chat room"
+msgid "Received unexpected response from "
 msgstr ""
 
-msgid "Invalid chat room name"
+#. username connecting too frequently
+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 ""
 
-msgid "Server closed the connection."
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "%s ධාවනය කිරීමේ දෝශයක්."
+
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
+msgid "Could not join chat room"
 msgstr ""
 
-msgid "Received invalid data on connection with server."
+msgid "Invalid chat room name"
 msgstr ""
 
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5902,7 +5991,7 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
 msgid "Direct IM established"
@@ -6070,23 +6159,18 @@ msgstr "කැමරාව"
 msgid "Screen Sharing"
 msgstr ""
 
-#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#, c-format
 msgid "Not Available"
 msgstr ""
 
-#, c-format
 msgid "Occupied"
 msgstr "දරාසිටී"
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr ""
 
@@ -6100,16 +6184,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 #, fuzzy
 msgid "Username sent"
@@ -6124,45 +6204,50 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
 
-msgid "Incorrect password."
-msgstr "සාවද්‍ය රහස්පදයකී."
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "පරිශීලක නම"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr ""
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6177,22 +6262,6 @@ msgstr ""
 msgid "_OK"
 msgstr "හරි (_O)"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -6307,7 +6376,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
@@ -6329,6 +6398,12 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
 msgid "Your AIM connection may be lost."
 msgstr ""
 
@@ -6482,7 +6557,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6505,7 +6580,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6513,7 +6588,7 @@ msgid "(no name)"
 msgstr ""
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -6575,6 +6650,7 @@ msgstr "සම්බන්ධ (_o)"
 msgid "Get AIM Info"
 msgstr ""
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr ""
 
@@ -6632,6 +6708,7 @@ msgstr "සොයන්න (_S)"
 msgid "Set User Info (web)..."
 msgstr "පරිශීලක තොරතුරු ලබා ගන්න"
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "රහස්පදය වෙනස් කරන්න"
@@ -6662,6 +6739,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6679,7 +6759,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
@@ -6772,7 +6851,7 @@ msgstr "වෙනත්"
 msgid "Visible"
 msgstr "අක්‍රීය (_D)"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -6860,17 +6939,50 @@ msgstr "දිනය"
 msgid "Could not change buddy information."
 msgstr "මිතුරාගේ තොරතුරු ඇතුළත් කරන්න."
 
-#, c-format
-msgid "%d needs Q&A"
-msgstr ""
+msgid "Mobile"
+msgstr "ජංගම"
+
+msgid "Note"
+msgstr "සටහන"
 
+#. callback
 #, fuzzy
-msgid "Add buddy Q&A"
+msgid "Buddy Memo"
 msgstr "මිතුරකු එක් කරන්න"
 
-msgid "Input answer here"
+msgid "Change his/her memo as you like"
 msgstr ""
 
+#, fuzzy
+msgid "_Modify"
+msgstr "සකසන්න"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "සකසන්න"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "සේවාදායකය (_S):"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, c-format
+msgid "%u requires verification"
+msgstr ""
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "මබගේ ලැයිස්තුවට මිතුරා එක් කළ යුතුද?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "රහස්පදය ඇතුළත් කරන්න"
+
 msgid "Send"
 msgstr "යවන්න"
 
@@ -6880,18 +6992,18 @@ msgstr ""
 msgid "Authorization denied message:"
 msgstr ""
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr ""
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "මබගේ ලැයිස්තුවට මිතුරා එක් කළ යුතුද?"
 
-msgid "Input request here"
+msgid "Enter request here"
 msgstr ""
 
 msgid "Would you be my friend?"
@@ -6912,7 +7024,7 @@ msgid "Failed sending authorize"
 msgstr ""
 
 #, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr ""
 
 #, c-format
@@ -6954,6 +7066,9 @@ msgstr "මිතුරාගේ තොරතුරු ඇතුළත් කර
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
 msgid "Not member"
 msgstr ""
 
@@ -6992,15 +7107,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr ""
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "පිවිසුම් තොරතුරු"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7010,7 +7128,7 @@ msgstr ""
 msgid "Failed:"
 msgstr "අසමත් විය"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7022,11 +7140,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
-msgid "Successfully changed Qun member"
-msgstr ""
+#, fuzzy
+msgid "Successfully changed Qun members"
+msgstr "පිවිසුම් තොරතුරු"
 
 #, fuzzy
 msgid "Successfully changed Qun information"
@@ -7035,35 +7154,35 @@ msgstr "පිවිසුම් තොරතුරු"
 msgid "You have successfully created a Qun"
 msgstr ""
 
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr ""
 
 msgid "Setup"
 msgstr ""
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr ""
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "මිතුරා ඉවත්කරන්න"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "මිතුරා ඉවත්කරන්න"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7177,6 +7296,12 @@ msgstr ""
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr ""
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr ""
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7184,7 +7309,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "%s සම්බන්ධව"
 
 #, fuzzy
@@ -7205,6 +7330,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "%s සම්බන්ධව"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "ලිපිනය"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7236,7 +7365,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "සම්බන්ධ (_o)"
@@ -7248,6 +7376,9 @@ msgstr "සේවාදායකයේ තොරතුරු"
 msgid "Show server news"
 msgstr ""
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 msgid "Keep alive interval (seconds)"
 msgstr ""
 
@@ -7255,11 +7386,9 @@ msgstr ""
 msgid "Update interval (seconds)"
 msgstr "පරිශීලක තොරතුරු"
 
-msgid "Can not decrypt server reply"
-msgstr ""
-
-msgid "Can not decrypt get server reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt server reply"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
@@ -7281,19 +7410,17 @@ msgid "Activation required"
 msgstr "සත්‍යාපනය අසමත් විය"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
-msgstr ""
-
-msgid "Keep alive error"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Requesting captcha ..."
-msgstr ""
+#, fuzzy
+msgid "Requesting captcha"
+msgstr "ඉතිරිය"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
+msgid "Failed captcha verification"
 msgstr ""
 
 #, fuzzy
@@ -7304,67 +7431,48 @@ msgstr "පිළිඹිබුව සුරකින්න"
 msgid "Enter code"
 msgstr "රහස්පදය ඇතුළත් කරන්න"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 msgid "Enter the text from the image"
 msgstr ""
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr ""
-
 msgid "Socket error"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr ""
-
-msgid "Connection lost"
-msgstr ""
-
-msgid "Get server ..."
-msgstr ""
+#, fuzzy
+msgid "Getting server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
-msgid "Request token"
-msgstr ""
+#, fuzzy
+msgid "Requesting token"
+msgstr "ඉතිරිය"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 msgid "Invalid server or port"
 msgstr ""
 
 #, fuzzy
-msgid "Connecting server ..."
+msgid "Connecting to server"
 msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "දෝෂය"
 
-msgid "Failed to send IM."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7374,6 +7482,10 @@ msgid ""
 msgstr "සේවා දායකය"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "වෙතින්"
 
@@ -7383,32 +7495,30 @@ msgid ""
 "%s"
 msgstr "%s සඳහා සහතිකය"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "නොදන්නා හේතුවක්"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "විධානය"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "නොදන්නා හේතුවක්"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "නොදන්නා හේතුවක්"
 
 #, c-format
@@ -7422,9 +7532,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7478,17 +7585,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7511,6 +7607,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr ""
+
 msgid "Supports"
 msgstr ""
 
@@ -8182,9 +8281,6 @@ msgstr ""
 msgid "Unit"
 msgstr "ඒකකය"
 
-msgid "Note"
-msgstr "සටහන"
-
 msgid "Join Chat"
 msgstr ""
 
@@ -8269,6 +8365,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8326,8 +8425,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8336,26 +8436,25 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "SILC යතුරු කූට්ටම නැංවීමට නොහැක"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC යතුරු කූට්ටම නැංවීමට නොහැක"
+
 msgid "Out of memory"
 msgstr "මතකය ප්‍රමාණවත් නොමැත"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr ""
 
 msgid "Error loading SILC key pair"
@@ -8632,7 +8731,8 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr "SILC යතුරු කූට්ටමක් සම්පාදනය වෙමින් පවතී..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "SILC යතුරු කූට්ටම සම්පාදනය කිරීමට නොහැකි විය\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -8721,6 +8821,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -8761,34 +8864,34 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr ""
 
 msgid "John Noname"
 msgstr ""
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr ""
-
-msgid "Could not connect"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "SILC යතුරු කූට්ටම නැංවීමට නොහැක"
 
-msgid "Unknown server response."
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "නොදන්නා හේතුවක්"
 
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "සේවාදායකයේ තොරතුරු"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8822,173 +8925,63 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr ""
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr ""
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr ""
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr ""
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr ""
-
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
-
-#, c-format
-msgid "No keywords."
-msgstr ""
-
-#, c-format
-msgid "User has no directory information."
-msgstr ""
-
-#, c-format
-msgid "Country not supported."
-msgstr ""
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "සාවද්‍ය රහස්පදයකී."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-msgid "Invalid Groupname"
-msgstr ""
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "තෝරන්න..."
 
-msgid "Connection Closed"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "නියමාවලිය"
 
-msgid "Waiting for reply..."
+msgid "Pager server"
 msgstr ""
 
-msgid "TOC has come back from its pause. You may now send messages again."
+msgid "Pager port"
 msgstr ""
 
-msgid "Password Change Successful"
+msgid "File transfer server"
 msgstr ""
 
-msgid "_Group:"
-msgstr "සමූහය (_G):"
-
-msgid "Get Dir Info"
+msgid "File transfer port"
 msgstr ""
 
-msgid "Set Dir Info"
+msgid "Chat room locale"
 msgstr ""
 
-#, c-format
-msgid "Could not open %s for writing!"
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "File transfer failed; other side probably canceled."
+msgid "Chat room list URL"
 msgstr ""
 
-msgid "Could not connect for transfer."
+msgid "Yahoo Chat server"
 msgstr ""
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat port"
 msgstr ""
 
-msgid "Save As..."
-msgstr "සුරකින අයුර..."
-
-#, 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] ""
-
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr ""
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "තෝරන්න..."
 
 #. *< type
 #. *< ui_requirement
@@ -9000,11 +8993,11 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr ""
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "නියමාවලිය"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9027,6 +9020,27 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "සාවද්‍ය රහස්පදයකී."
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9054,32 +9068,26 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "මබගේ ලැයිස්තුවට මිතුරා එක් කළ යුතුද?"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-msgid "Connection problem"
-msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
 msgid "Not at Home"
@@ -9127,7 +9135,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -9142,74 +9150,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "තෝරන්න..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr ""
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9217,6 +9166,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr ""
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9257,13 +9209,8 @@ msgstr ""
 msgid "Last Update"
 msgstr ""
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr ""
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9326,20 +9273,18 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
-msgid "Unable to fetch room list."
+msgid "Connection problem"
 msgstr ""
 
-msgid "User Rooms"
+msgid "Unable to fetch room list."
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
+msgid "User Rooms"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Connection problem with the YCHT server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9457,13 +9402,7 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9471,16 +9410,13 @@ msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9567,9 +9503,6 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Mobile"
-msgstr "ජංගම"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -9611,16 +9544,6 @@ msgstr ""
 msgid "%x %X"
 msgstr ""
 
-#, c-format
-msgid "Error Reading %s"
-msgstr ""
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr "ගණනය කරමින්..."
 
@@ -9726,6 +9649,16 @@ msgstr ""
 msgid "Address already in use."
 msgstr ""
 
+#, c-format
+msgid "Error Reading %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 msgid "Internet Messenger"
 msgstr "අන්තර්ජාල පණිවිඩකරු"
 
@@ -9768,10 +9701,8 @@ msgstr ""
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr ""
+msgid "_Advanced"
+msgstr "සංකීර්ණ (_A)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr ""
@@ -9806,9 +9737,6 @@ msgstr ""
 msgid "you can see the butterflies mating"
 msgstr ""
 
-msgid "Proxy Options"
-msgstr ""
-
 msgid "Proxy _type:"
 msgstr ""
 
@@ -9836,8 +9764,8 @@ msgstr "මූලික (_B)"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "සංකීර්ණ (_A)"
+msgid "_Proxy"
+msgstr ""
 
 msgid "Enabled"
 msgstr "සක්‍රීය කළා"
@@ -9875,16 +9803,17 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "කාමර ලැයිස්තුව"
+msgid "A_ccount"
+msgstr "ගිණුම"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "ගිණුම (_A):"
+#, fuzzy
+msgid "Room _List"
+msgstr "කාමර ලැයිස්තුව"
 
 msgid "_Block"
 msgstr ""
@@ -9901,6 +9830,15 @@ msgstr ""
 msgid "I_M"
 msgstr ""
 
+msgid "_Audio Call"
+msgstr ""
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
 msgid "_Send File..."
 msgstr ""
 
@@ -9910,9 +9848,13 @@ msgstr ""
 msgid "View _Log"
 msgstr ""
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr ""
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "නොබැඳි මිතුරන් දර්ශනය"
+
 msgid "_Alias..."
 msgstr ""
 
@@ -10037,6 +9979,9 @@ msgstr ""
 msgid "/Tools/_Certificates"
 msgstr ""
 
+msgid "/Tools/Custom Smile_ys"
+msgstr ""
+
 msgid "/Tools/Plu_gins"
 msgstr ""
 
@@ -10046,9 +9991,6 @@ msgstr ""
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
-msgid "/Tools/Smile_y"
-msgstr ""
-
 msgid "/Tools/_File Transfers"
 msgstr ""
 
@@ -10163,7 +10105,7 @@ msgstr ""
 msgid "By status"
 msgstr ""
 
-msgid "By log size"
+msgid "By recent log activity"
 msgstr ""
 
 #, c-format
@@ -10180,6 +10122,9 @@ msgstr ""
 msgid "Re-enable"
 msgstr ""
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10262,6 +10207,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr ""
 
+msgid "_Group:"
+msgstr "සමූහය (_G):"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10295,6 +10243,111 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+msgid "Background Color"
+msgstr "පසුබිම් වර්‍ණය"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "ඉවත් වීම"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "පසුබිම් වර්‍ණය"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "පසුබිම් වර්‍ණය"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "පසුබිම් වර්‍ණය"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "වර්‍ග කිරීම"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "නොබැඳි මිතුරන්"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "පිටතට ගොස්"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "නොබැඳි"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "අභාවිත"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "පණිවිඩ"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr ""
@@ -10312,12 +10365,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
 msgid "_Buddy:"
 msgstr ""
 
@@ -10346,8 +10393,9 @@ msgstr "දාවක මට්ටම"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
-msgstr ""
+#, fuzzy
+msgid "Last Said"
+msgstr "අවසන් නම"
 
 msgid "Unable to save icon file to disk."
 msgstr ""
@@ -10392,6 +10440,19 @@ msgstr ""
 msgid "/Conversation/Clea_r Scrollback"
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "සංවාද"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/_Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr ""
+
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
@@ -10464,6 +10525,15 @@ msgstr ""
 msgid "/Conversation/View Log"
 msgstr ""
 
+msgid "/Conversation/Media/Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr ""
+
 msgid "/Conversation/Send File..."
 msgstr ""
 
@@ -10645,6 +10715,9 @@ msgstr "ශිල්පියා"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "සහාය"
 
@@ -10770,6 +10843,10 @@ msgstr "හින්දි"
 msgid "Hungarian"
 msgstr "හංගේරියානු"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "රෝමානු"
+
 msgid "Indonesian"
 msgstr "ඉන්දුනීසියානු"
 
@@ -10785,6 +10862,10 @@ msgstr "ජොර්ජියානු"
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
+#, fuzzy
+msgid "Khmer"
+msgstr "වෙනත්"
+
 msgid "Kannada"
 msgstr "කන්නාඩ"
 
@@ -10806,6 +10887,10 @@ msgstr "ලිතුවේනියානු"
 msgid "Macedonian"
 msgstr "මැසඩෝනියානු"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "මැසඩෝනියානු"
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -10860,6 +10945,9 @@ msgstr "සිංහල"
 msgid "Swedish"
 msgstr "ස්වීඩන"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "දෙමළ"
 
@@ -10911,7 +10999,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin irc.freenode.net මත<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin irc.freenode.net මත<BR><BR>"
 
 msgid "Current Developers"
@@ -11173,7 +11278,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11209,16 +11314,23 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
-msgid "Typing notification color"
+msgid "Color to draw the name of a whispered message."
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "Typing notification color"
 msgstr ""
 
 #, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "නව තැපැල් දැන්වීම"
+
+#, fuzzy
 msgid "Typing notification font"
 msgstr "නව තැපැල් දැන්වීම"
 
@@ -11229,16 +11341,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "නව තැපැල් දැන්වීම"
 
-#, fuzzy
-msgid "_Copy Email Address"
-msgstr "විද්‍යුත් තැපැල් ලිපිනය"
-
-msgid "_Open Link in Browser"
-msgstr ""
-
-msgid "_Copy Link Location"
-msgstr ""
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11268,11 +11370,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "පිළිඹිබුව සුරකින්න"
 
-#, c-format
 msgid "_Save Image..."
 msgstr ""
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11357,9 +11457,6 @@ msgstr ""
 msgid "Font Face"
 msgstr ""
 
-msgid "Background Color"
-msgstr "පසුබිම් වර්‍ණය"
-
 msgid "Foreground Color"
 msgstr ""
 
@@ -11472,6 +11569,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11489,6 +11587,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11519,10 +11618,26 @@ msgstr ""
 msgid "Pidgin"
 msgstr ""
 
-msgid "Open All Messages"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "ගණනය කරමින්..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
 
 #, c-format
@@ -11552,6 +11667,26 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "පණිවිඩ"
+
+msgid "Open All Messages"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "මිතුරකු අල්ලාගන්න"
+
+msgid "Dismiss"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -11598,10 +11733,17 @@ msgstr ""
 msgid "Select a file"
 msgstr "ගොනුවක් තෝරන්න"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "මිතුරකු අල්ලාගන්න"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "ගිණුම (_A):"
+
 msgid "_Buddy name:"
 msgstr ""
 
@@ -11668,7 +11810,57 @@ msgstr ""
 msgid "Pounce Target"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "ලිවීම අරඹමින්"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "ලිවීම සඳහා විරාමයක්"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "ඇතුළත් වීම"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s අභාවිතවව සිට යළි ක්‍රියාත්මකයි (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "නැවත පැමිණියා"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "ලිවීම අවසන්"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "පිට වීම"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "අභාවිත වී"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "ඉවත්ව ඇත"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "පණිවිඩයක් යවන ලදි"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -11688,6 +11880,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr ""
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "මිතුරු ලැයිස්තුව"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr ""
 
@@ -11697,8 +11895,9 @@ msgstr ""
 msgid "On unread messages"
 msgstr "නොකියවන ලද පණිවුඩ සඳහා"
 
-msgid "Conversation Window Hiding"
-msgstr "දෙබස් කවුඵව සැඟවීම"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "ක්ෂණික පණිවුඩ සංවාද කවුළු"
 
 msgid "_Hide new IM conversations:"
 msgstr ""
@@ -11706,6 +11905,9 @@ msgstr ""
 msgid "When away"
 msgstr ""
 
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -11764,9 +11966,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-msgid "Minimi_ze new conversation windows"
-msgstr ""
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -11796,13 +11995,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-msgid "ST_UN server:"
-msgstr ""
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -11823,6 +12020,10 @@ msgstr ""
 msgid "_End port:"
 msgstr ""
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr ""
 
@@ -11849,6 +12050,10 @@ msgstr ""
 msgid "No proxy"
 msgstr ""
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "පරිශීලක (_U):"
 
@@ -12009,10 +12214,10 @@ msgstr ""
 msgid "Auto-away"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-msgid "_Minutes before becoming idle:"
+msgid "Change status when _idle"
 msgstr ""
 
 msgid "Change _status to:"
@@ -12163,26 +12368,17 @@ msgstr ""
 msgid "Status for %s"
 msgstr ""
 
-msgid "Custom Smiley"
-msgstr ""
-
-msgid "More Data needed"
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Please provide a shortcut to associate with the smiley."
+msgid "Custom Smiley"
 msgstr ""
 
 msgid "Duplicate Shortcut"
 msgstr ""
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-msgid "Please select an image for the smiley."
-msgstr ""
-
 msgid "Edit Smiley"
 msgstr ""
 
@@ -12190,20 +12386,29 @@ msgid "Add Smiley"
 msgstr ""
 
 #, fuzzy
-msgid "Smiley _Image"
-msgstr "පිළිඹිබුව සුරකින්න"
+msgid "_Image:"
+msgstr "පිළිඹිබුව (_I)"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "වර්‍ග කිරීම"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "ප්‍රමාණය"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "වර්‍ග කිරීම"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "මිතුරෙකු තෝරන්න"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -12281,8 +12486,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -12311,6 +12516,16 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "'%s'පිළිඹිබුව පූරණය දෝෂසහිතයි: හේතුව නොදන්නා අතර සමහරවිට දූෂිත පිළිඹිබු ගොනුවක් විය හැක"
 
+msgid "_Open Link"
+msgstr ""
+
+msgid "_Copy Link Location"
+msgstr ""
+
+#, fuzzy
+msgid "_Copy Email Address"
+msgstr "විද්‍යුත් තැපැල් ලිපිනය"
+
 msgid "Save File"
 msgstr ""
 
@@ -12405,6 +12620,69 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+msgid "Server name request"
+msgstr ""
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "රහස්පදය ඇතුළත් කරන්න"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "මිතුරු ලැයිස්තුව"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "ඉවත්ව ඇත"
+
+#, fuzzy
+msgid "Directory"
+msgstr "අතීත"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "විස්තරය"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "ගවේශකය"
+
+msgid "Server does not exist"
+msgstr ""
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "මෙම ඈඳුතුව XMPP සේවා දායකයන්හි නිරවද්‍යකරනයන් කිරීමට ප්‍රයෝජනවත් වේ."
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -12780,7 +13058,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -12887,12 +13165,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -12902,6 +13174,10 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "නව තැපැල් දැන්වීම"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -12931,35 +13207,23 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr ""
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "නව තැපැල් දැන්වීම"
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "වසන්න"
+
 msgid "Fonts"
 msgstr "අකුරු"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13042,7 +13306,7 @@ msgstr ""
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13094,6 +13358,107 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "දැනටම පිවිසි ඇත"
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "පිළිසඳරට එක් වන්න"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "දාවක මට්ටම"
+
+#, fuzzy
+msgid "Founder"
+msgstr "යවන්නා"
+
+#, fuzzy
+msgid "Operator"
+msgstr "ඔපෙරා"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "අනුමත මිතුරකුද?"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "මිතුරා එක් කිරීම දෝෂ සහිතයි"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "තොරතුරු"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "අවවාදය"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "තත්වය"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "රහස්පදය වෙනස් කරන්න"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "සබඳතාවයට වෙනත් නමක්"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "මිතුරු ලැයිස්තුව"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "මිතුරු ලැයිස්තුව"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13252,17 +13617,15 @@ msgstr "මිතුරු ලැයිස්තුව_ සියල්ලටම
 msgid "Only when docked"
 msgstr "යාකර ඇති විටදී පමණක්"
 
-msgid "_Flash window when chat messages are received"
-msgstr "සංවාද_ පණිවුඩ ලැබීමේදී _කවුළුව දීප්තිමත් කරන්න"
-
 msgid "Windows Pidgin Options"
 msgstr "වින්ඩෝස් Pidgin වෛකල්පිත"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "වින්ඩෝස් මත Pidgin සඳහා වූ වෛකල්පිතයන් ලබාදෙයි."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "වින්ඩෝස් මත Pidgin වලට අදාල, මිතුරු ලැයිස්තුව යාකිරීම වැනි, වෛකල්පිතයන් ලබා දෙයි."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13302,6 +13665,44 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "මෙම ඈඳුතුව XMPP සේවා දායකයන්හි නිරවද්‍යකරනයන් කිරීමට ප්‍රයෝජනවත් වේ."
 
+#~ msgid "Last Activity"
+#~ msgstr "අවසන් ක්‍රියාව"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "Incorrect password."
+#~ msgstr "සාවද්‍ය රහස්පදයකී."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "සාවද්‍ය රහස්පදයකී."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "දෙබස් කවුඵව සැඟවීම"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "අන්තර්ජාල පණිවිඩකරු"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "මිතුරකු එක් කරන්න"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "සාවද්‍ය රහස්පදයකී."
+
+#~ msgid "Save As..."
+#~ msgstr "සුරකින අයුර..."
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "පිළිඹිබුව සුරකින්න"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "සංවාද_ පණිවුඩ ලැබීමේදී _කවුළුව දීප්තිමත් කරන්න"
+
 #, fuzzy
 #~ msgid "Successed:"
 #~ msgstr "වේගය:"
@@ -13311,13 +13712,6 @@ msgstr "මෙම ඈඳුතුව XMPP සේවා දායකයන්හ�
 #~ msgstr "සමූහය ඉවත් කරන්න"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
-#, fuzzy
 #~ msgid "Error password: %s"
 #~ msgstr "රහස්පදය ඇතුළත් කරන්න"
 
diff --git a/po/sk.po b/po/sk.po
index 7d3cbb83f0..338e665c5f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.5.5\n"
+"Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-22 16:18-0500\n"
-"PO-Revision-Date: 2009-02-22 21:22+0100\n"
+"POT-Creation-Date: 2009-07-28 19:29-0700\n"
+"PO-Revision-Date: 2009-07-21 19:44+0100\n"
 "Last-Translator: loptosko <loptosko@gmail.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -164,7 +164,7 @@ msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-"Pripojený: %d\n"
+"Prihlásený: %d\n"
 "Celkom: %d"
 
 #, c-format
@@ -192,7 +192,7 @@ msgid "You must select an account."
 msgstr "Musíte vybrať účet."
 
 msgid "The selected account is not online."
-msgstr "Vybraný účet nie je pripojený."
+msgstr "Vybraný účet nie je prihlásený."
 
 msgid "Error adding buddy"
 msgstr "Chyba počas pridávania priateľa"
@@ -429,7 +429,7 @@ msgid "Sort"
 msgstr "Zoradiť"
 
 msgid "By Status"
-msgstr "Podľa stavu"
+msgstr "Podľa statusu"
 
 msgid "Alphabetically"
 msgstr "Podľa abecedy"
@@ -557,7 +557,7 @@ msgid ""
 "automatically rejoined in the chat when the account reconnects."
 msgstr ""
 "Účet bol odpojený a už sa nenachádzate v chate. Keď sa účet znovu pripojí, "
-"budete automaticky pripojený k tomuto chatu."
+"budete automaticky prihlásený k tomuto chatu."
 
 msgid "No such command."
 msgstr "Tento príkaz neexistuje."
@@ -613,19 +613,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Odoslať do"
 
-msgid "Invite message"
-msgstr "Správa pozvánky"
-
-msgid "Invite"
-msgstr "Pozvať"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Zadajte, prosím, meno používateľa, ktorého chcete pozvať,\n"
-"spolu s nepovinným textom pozvánky."
-
 msgid "Conversation"
 msgstr "Rozhovor"
 
@@ -716,13 +703,13 @@ msgid "accounts: Show the accounts window."
 msgstr "accounts: Zobraziť okno s účtami."
 
 msgid "debugwin: Show the debug window."
-msgstr "debugwin: Zobraziť ladiace okno"
+msgstr "debugwin: Zobraziť ladiace okno."
 
 msgid "prefs: Show the preference window."
-msgstr "prefs: Zobraziť okno vlastností"
+msgstr "prefs: Zobraziť okno vlastností."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: Zobraziť okno stavov."
+msgstr "statuses: Zobraziť okno uložených statusov."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -784,7 +771,7 @@ msgstr "Zostáva"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 msgid "Status"
-msgstr "Stav"
+msgstr "Status"
 
 msgid "Close this window when all transfers finish"
 msgstr "Zatvoriť toto okno po dokončení všetkých prenosov"
@@ -882,6 +869,39 @@ msgstr "Všetky rozhovory"
 msgid "System Log"
 msgstr "Systémový záznam"
 
+msgid "Calling ... "
+msgstr "Volá sa... "
+
+msgid "Hangup"
+msgstr "Zložiť"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Prijať"
+
+msgid "Reject"
+msgstr "Odmietnuť"
+
+msgid "Call in progress."
+msgstr "Prebieha hovor."
+
+msgid "The call has been terminated."
+msgstr "Hovor bol prerušený."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s chce s vami začať zvukové sedenie."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s skúša s vami začať nepodporované multimediálne sedenie."
+
+msgid "You have rejected the call."
+msgstr "Zrušili ste hovor."
+
+msgid "call: Make an audio call."
+msgstr "call: Hlasový hovor."
+
 msgid "Emails"
 msgstr "E-maily"
 
@@ -917,6 +937,9 @@ msgstr "Pokračovať"
 msgid "IM"
 msgstr "Napísať správu"
 
+msgid "Invite"
+msgstr "Pozvať"
+
 msgid "(none)"
 msgstr "(žiadne)"
 
@@ -1120,7 +1143,6 @@ msgstr "používateľ %s sa stal neprítomným (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "používateľ %s vám poslal správu. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznáma udalosť sledovania. Oznámte to, prosím!"
 
@@ -1137,7 +1159,7 @@ msgid "Show Idle Time"
 msgstr "Zobraziť čas nečinnosti"
 
 msgid "Show Offline Buddies"
-msgstr "Zobraziť odpojených priateľov"
+msgstr "Zobraziť odhlásených priateľov"
 
 msgid "Notify buddies when you are typing"
 msgstr "Zobrazovať priateľom, kedy im píšete"
@@ -1152,19 +1174,19 @@ msgid "Log chats"
 msgstr "Ukladať rozhovory"
 
 msgid "Log status change events"
-msgstr "Ukladať zmenu stavu"
+msgstr "Ukladať zmenu statusu"
 
 msgid "Report Idle time"
 msgstr "Oznamovať čas nečinnosti:"
 
 msgid "Change status when idle"
-msgstr "Zmeniť stav pri nečinnosti"
+msgstr "Zmeniť status pri nečinnosti"
 
 msgid "Minutes before changing status"
-msgstr "Počet minút pred zmenou stavu:"
+msgstr "Počet minút pred zmenou statusu:"
 
 msgid "Change status to"
-msgstr "Zmeniť stav na:"
+msgstr "Zmeniť status na:"
 
 msgid "Conversations"
 msgstr "Rozhovory"
@@ -1234,7 +1256,7 @@ msgid "GStreamer Failure"
 msgstr "Zlyhanie rozhrania GStreamer"
 
 msgid "GStreamer failed to initialize."
-msgstr "Nepodarilo sa inicializovať rozhranie GStreamer"
+msgstr "Nepodarilo sa zapnúť rozhranie GStreamer."
 
 msgid "(default)"
 msgstr "(predvolené)"
@@ -1317,10 +1339,10 @@ msgid "Are you sure you want to delete \"%s\""
 msgstr "Naozaj chcete odstrániť „%s“"
 
 msgid "Delete Status"
-msgstr "Odstrániť stav"
+msgstr "Odstrániť status"
 
 msgid "Saved Statuses"
-msgstr "Uložené stavy"
+msgstr "Uložené statusy"
 
 msgid "Title"
 msgstr "Nadpis"
@@ -1347,28 +1369,28 @@ msgid "Invalid title"
 msgstr "Chybný titulok"
 
 msgid "Please enter a non-empty title for the status."
-msgstr "Pre stav, prosím, nezadávajte prázdny titulok."
+msgstr "Pre status, prosím, nezadávajte prázdny titulok."
 
 msgid "Duplicate title"
 msgstr "Duplicitný titulok"
 
 msgid "Please enter a different title for the status."
-msgstr "Zadajte, prosím, iný titulok pre tento stav."
+msgstr "Zadajte, prosím, iný titulok pre tento status."
 
 msgid "Substatus"
-msgstr "Podstav"
+msgstr "Podstatus"
 
 msgid "Status:"
-msgstr "Stav:"
+msgstr "Status:"
 
 msgid "Message:"
 msgstr "Správa:"
 
 msgid "Edit Status"
-msgstr "Upraviť stav"
+msgstr "Upraviť status"
 
 msgid "Use different status for following accounts"
-msgstr "Pre nasledujúce účty používať iný stav"
+msgstr "Pre nasledujúce účty používať iný status"
 
 #. Save & Use
 msgid "Save & Use"
@@ -1381,7 +1403,7 @@ msgid "Sounds"
 msgstr "Zvuky"
 
 msgid "Statuses"
-msgstr "Stavy"
+msgstr "Statusy"
 
 msgid "Error loading the plugin."
 msgstr "Počas načítavania modulu sa vyskytli chyby."
@@ -1486,19 +1508,19 @@ msgstr ""
 "rozhovoru."
 
 msgid "Online"
-msgstr "Pripojený"
+msgstr "Prihlásený"
 
 msgid "Offline"
-msgstr "Odpojený"
+msgstr "Odhlásený"
 
 msgid "Online Buddies"
-msgstr "Pripojených priateľov"
+msgstr "Prihlásení priatelia"
 
 msgid "Offline Buddies"
-msgstr "Odpojení priatelia"
+msgstr "Neprihlásení priatelia"
 
 msgid "Online/Offline"
-msgstr "Pripojený/odpojený"
+msgstr "Prihlásený/odhlásený"
 
 msgid "Meebo"
 msgstr "Meebo"
@@ -1528,6 +1550,29 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Modul Lastlog."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Získava sa TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Vytvárať TinyURL pre adresy tejto dĺžky alebo dlhšie"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (alebo iná) predpona adresy"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Modul TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "Pri doručovaní správ s adresami, TinyURL pre ľahšie kopírovanie"
+
 msgid "accounts"
 msgstr "účty"
 
@@ -1628,13 +1673,6 @@ msgstr "Prijať certifikát pre %s?"
 msgid "SSL Certificate Verification"
 msgstr "Overenie SSL certifikátu"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Prijať"
-
-msgid "Reject"
-msgstr "Odmietnuť"
-
 msgid "_View Certificate..."
 msgstr "_Prezrieť certifikát..."
 
@@ -1648,6 +1686,7 @@ msgstr ""
 "Certifikát od používateľa „%s“ je podpísaný samým sebou. Nie je možné ho "
 "automaticky overiť."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Reťaz certifikátu od používateľa %s nie je správna."
@@ -1657,6 +1696,7 @@ msgstr "Reťaz certifikátu od používateľa %s nie je správna."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Chyba SSL Certifikátu"
 
@@ -1698,7 +1738,7 @@ msgid ""
 "could mean that you are not connecting to the service you believe you are."
 msgstr ""
 "Certifikát od používateľa „%s“ tvrdí, že pochádza od používateľa „%s“. To "
-"môže znamenať, že sa nepripájate na tú službu, na ktorú sa chcete pripojiť. "
+"môže znamenať, že sa nepripájate na tú službu, na ktorú sa chcete pripojiť."
 
 #. Make messages
 #, c-format
@@ -1735,6 +1775,7 @@ msgstr "+++ používateľ %s sa prihlásil"
 msgid "+++ %s signed off"
 msgstr "+++ používateľ %s sa odhlásil"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
@@ -1781,6 +1822,17 @@ msgstr "používateľ %s opustil miestnosť."
 msgid "%s left the room (%s)."
 msgstr "používateľ %s opustil miestnosť (%s)."
 
+msgid "Invite to chat"
+msgstr "Pozvať na chat"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Zadajte, prosím, meno používateľa, ktorého chcete pozvať, spolu s nepovinnou "
+"pozývacou správou."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Nepodarilo sa nadviazať spojenie: %s"
@@ -1912,6 +1964,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Začína sa prenos %s od používateľa %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Prenos súboru <A HREF=\"file://%s\">%s</A> bol dokončený"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Prenos súboru %s bol dokončený"
 
@@ -2116,6 +2172,9 @@ msgstr "<font color=\"red\"><b>Nepodarilo sa čítať súbor: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATICKÁ ODPOVEĎ>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Chyba pri vytváraní konferencie."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Používate %s, ale tento modul vyžaduje %s."
@@ -2414,7 +2473,7 @@ msgid "(UTC)"
 msgstr "(UTC)"
 
 msgid "User is offline."
-msgstr "Používateľ je odpojený."
+msgstr "Používateľ nie je prihlásený."
 
 msgid "Auto-response sent:"
 msgstr "Odoslaná automatická odpoveď:"
@@ -2515,16 +2574,16 @@ msgstr "V prehliadači záznamov prehliadať aj záznamy ostatných IM klientov.
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Tento modul pri prehliadaní záznamov pridáva záznamy z ostatných IM "
-"klientov. Momentálne sa to týka klientov Adium, Fire, Messenger Plus!, MSN "
-"Messenger a Trillian.\n"
+"klientov. Momentálne sa to týka klientov Adium, MSN Messenger, aMSN a "
+"Trillian.\n"
 "\n"
-"UPOZORNENIE: Tento modul je stále testovací a môže občas padnúť.  Používajte "
+"UPOZORNENIE: Tento modul je stále testovací a môže často padať.  Používajte "
 "ho na vlastné riziko!"
 
 msgid "Mono Plugin Loader"
@@ -2568,21 +2627,21 @@ msgid "Offline Message Emulation"
 msgstr "Emulácia offline správ"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr "Pridáva správy pre odhlásených používateľov ako sledovanie."
+msgstr "Pridáva správy pre neprihlásených používateľov ako sledovanie."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Zostatok správ bude uložený ako sledovanie. Sledovanie môžete pridať/"
-"odstrániť v dialógu „Sledovanie priateľov“."
+"Zvyšok správ bude uložený ako sledovanie. Sledovanie môžete pridať/odstrániť "
+"v dialógu „Sledovanie priateľov“."
 
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
-"Používateľ „%s“ je momentálne odhlásený. Chcete uložiť zvyšok správ do "
+"Používateľ „%s“ momentálne nie je prihlásený. Chcete uložiť zvyšok správ do "
 "sledovania, a automaticky ich odoslať hneď, keď sa „%s“ prihlási?"
 
 msgid "Offline Message"
@@ -2603,6 +2662,34 @@ msgstr "Uložiť offline správy do sledovania"
 msgid "Do not ask. Always save in pounce."
 msgstr "Nepýtať sa. Vždy uložiť do sledovania."
 
+msgid "One Time Password"
+msgstr "Heslo na jedno použitie"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Podpora hesla na jedno použitie"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Zaručiť že heslá sa použijú iba raz."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Umožňuje zaručiť aby sa heslá ktoré nie sú uložené použili iba na jedno "
+"úspešné pripojenie.\n"
+"Poznámka: Funguje iba ak heslo nie je uložené."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2769,7 +2856,7 @@ msgstr "Priateľ sa prihlási/odhlási"
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "Upozornenie na stav priateľa"
+msgstr "Upozornenie na status priateľa"
 
 #. *< name
 #. *< version
@@ -2796,14 +2883,14 @@ msgstr ""
 "ActiveTCL z http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Toolkit Apple Bonjour For Windows nebol nájdený, pozrite časté otázky na "
-"stránke: http://d.pidgin.im/BonjourWindows"
+"Toolkit Apple Bonjour For Windows nebol nájdený, pozrite http://d.pidgin.im/"
+"BonjourWindows pre viac informácii."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Nepodarilo sa spustiť čakanie na prichádzajúce spojenia\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Nepodarilo sa čakať na prichádzajúce IM spojenia"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2854,14 +2941,17 @@ msgstr "Používateľ %s uzavrel rozhovor."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nepodarilo sa odoslať správu, rozhovor sa nezačal."
 
-msgid "Cannot open socket"
-msgstr "Nepodarilo sa otvoriť socket"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nepodarilo sa vytvoriť socket: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Nepodarilo sa zviazať socket na port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Nepodarilo sa zviazať socket na port: %s"
 
-msgid "Could not listen on socket"
-msgstr "Nepodarilo sa spustiť čakanie na sockete"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Nepodarilo sa čakať na sockete: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Chyba počas komunikácie s lokálnym mDNSResponder."
@@ -2908,14 +2998,14 @@ msgstr "Uložiť zoznam priateľov..."
 msgid "Load buddylist from file..."
 msgstr "Otvoriť zoznam priateľov zo súboru..."
 
-msgid "Fill in the registration fields."
-msgstr "Vyplňte políčka registrácie."
+msgid "You must fill in all registration fields"
+msgstr "Musíte vyplniť všetky políčka registrácie"
 
-msgid "Passwords do not match."
-msgstr "Heslá sa nezhodujú."
+msgid "Passwords do not match"
+msgstr "Heslá sa nezhodujú"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Nepodarilo sa vytvoriť nový účet. Vyskytla sa chyba.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Nepodarilo sa vytvoriť nový účet. Vyskytla sa neznáma chyba."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nový Gadu-Gadu účet bol zaregistrovaný"
@@ -2926,14 +3016,14 @@ msgstr "Registrácia bola úspešne dokončená!"
 msgid "Password"
 msgstr "Heslo"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Heslo (znovu)"
 
-msgid "Enter current token"
-msgstr "Vstúpiť do aktuálneho tokenu"
+msgid "Enter captcha text"
+msgstr "Zadajte text z obrázku captcha"
 
-msgid "Current token"
-msgstr "Aktuálny token"
+msgid "Captcha"
+msgstr "Obrázok captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Zaregistrovať nový Gadu-Gadu účet"
@@ -2960,7 +3050,7 @@ msgid "Female"
 msgstr "Žena"
 
 msgid "Only online"
-msgstr "Len pripojený"
+msgstr "Len prihlásení"
 
 msgid "Find buddies"
 msgstr "Nájsť priateľov"
@@ -2986,6 +3076,15 @@ msgstr "Heslo bolo úspešne zmenené!"
 msgid "Current password"
 msgstr "Súčasné heslo"
 
+msgid "Password (retype)"
+msgstr "Heslo (znovu)"
+
+msgid "Enter current token"
+msgstr "Vstúpiť do aktuálneho tokenu"
+
+msgid "Current token"
+msgstr "Aktuálny token"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Zadajte, prosím, svoje súčasné heslo a vaše nové heslo pre UIN: "
 
@@ -2999,8 +3098,9 @@ msgstr "Vyberte chat pre priateľa: %s"
 msgid "Add to chat..."
 msgstr "Pridať na chat..."
 
+#. Global
 msgid "Available"
-msgstr "Pripojený"
+msgstr "Prihlásený"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3032,8 +3132,8 @@ msgstr "Neboli nájdení žiadni zodpovedajúci používatelia"
 msgid "There are no users matching your search criteria."
 msgstr "Používatelia, ktorí vyhovujú vaším kritériám vyhľadávania neexistujú."
 
-msgid "Unable to read socket"
-msgstr "Nebolo možné čítať soket"
+msgid "Unable to read from socket"
+msgstr "Nedá sa čítať zo soketu"
 
 msgid "Buddy list downloaded"
 msgstr "Zoznam priateľov bol stiahnutý"
@@ -3047,8 +3147,14 @@ msgstr "Zoznam priateľov bol nahraný"
 msgid "Your buddy list was stored on the server."
 msgstr "Váš zoznam priateľov bol uložený na serveri."
 
-msgid "Connection failed."
-msgstr "Pripojenie zlyhalo."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Prihlásený"
+
+msgid "Connection failed"
+msgstr "Pripojenie zlyhalo"
 
 msgid "Add to chat"
 msgstr "Pridať na chat"
@@ -3056,14 +3162,23 @@ msgstr "Pridať na chat"
 msgid "Chat _name:"
 msgstr "Me_no na chate:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Nepodarilo sa preložiť meno hostiteľa '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Pripája sa"
+
 msgid "Chat error"
 msgstr "Chyba chatu"
 
 msgid "This chat name is already in use"
 msgstr "Toto meno už používa niekto iný"
 
-msgid "Not connected to the server."
-msgstr "Nepripojený na server."
+msgid "Not connected to the server"
+msgstr "Neprihásený na server"
 
 msgid "Find buddies..."
 msgstr "Hľadať priateľov..."
@@ -3104,6 +3219,9 @@ msgstr "IM obľúbený v Poľsku"
 msgid "Gadu-Gadu User"
 msgstr "Používateľ Gadu-Gadu"
 
+msgid "GG server"
+msgstr "GG server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznámy príkaz: %s"
@@ -3118,7 +3236,7 @@ msgstr "Nie je nastavená žiadna téma"
 msgid "File Transfer Failed"
 msgstr "Prenos súboru zlyhal"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Nebolo možné otvoriť port na počúvanie."
 
 msgid "Error displaying MOTD"
@@ -3134,8 +3252,16 @@ msgstr "S týmto pripojením nie je asociovaná žiadna správa dňa."
 msgid "MOTD for %s"
 msgstr "Správa dňa pre %s"
 
-msgid "Server has disconnected"
-msgstr "Server bol odpojený"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Pripojenie na server bolo stratené: %s"
 
 msgid "View MOTD"
 msgstr "Zobraziť správu dňa"
@@ -3146,25 +3272,23 @@ msgstr "_Kanál:"
 msgid "_Password:"
 msgstr "_Heslo:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "Prezývky na IRC nesmú obsahovať medzery"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Pripája sa"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "Prezývky a IRC servery nesmú obsahovať medzery"
 
 msgid "SSL support unavailable"
 msgstr "Podpora SSL je nedostupná"
 
-msgid "Couldn't create socket"
-msgstr "Nepodarilo sa vytvoriť socket"
+msgid "Unable to connect"
+msgstr "Nepodarilo sa pripojiť"
 
-msgid "Couldn't connect to host"
-msgstr "Nepodarilo sa pripojiť ku hostiteľovi"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Nepodarilo sa pripojiť: %s"
 
-msgid "Read error"
-msgstr "Chyba čítania"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Server zrušil pripojenie"
 
 msgid "Users"
 msgstr "Používatelia"
@@ -3252,7 +3376,7 @@ msgid "Idle for"
 msgstr "Nečinný"
 
 msgid "Online since"
-msgstr "Pripojený od"
+msgstr "Prihlásený od"
 
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Opisné prídavné meno:</b>"
@@ -3343,6 +3467,16 @@ msgid ""
 msgstr ""
 "Server neuznal vami vybraný názov účtu. Zrejme obsahuje nedovolené znaky."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Prezývka \"%s\" je už obsadená."
+
+msgid "Nickname in use"
+msgstr "Prezývka je obsadená"
+
 msgid "Cannot change nick"
 msgstr "Nepodarilo sa zmeniť prezývku"
 
@@ -3579,17 +3713,15 @@ msgid "Unknown Error"
 msgstr "Neznáma chyba"
 
 msgid "Ad-Hoc Command Failed"
-msgstr "príkaz Ad-Hoc zlyhal"
+msgstr "Príkaz Ad-Hoc zlyhal"
 
 msgid "execute"
 msgstr "vykonať"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"Server vyžaduje na prihlásenie TLS/SSL, ale podpora pre TLS/SSL nebola "
-"nájdená."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Server vyžaduje TLS/SSL, ale podpora pre TLS/SSL nebola nájdená."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Požadujete šifrovanie, ale podpora pre TLS/SSL nebola nájdená."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3606,17 +3738,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Čisto textová autentifikácia"
 
-msgid "Invalid response from server."
-msgstr "Chybná odpoveď zo servera."
+msgid "SASL authentication failed"
+msgstr "SASL autentifikácia zlyhala"
+
+msgid "Invalid response from server"
+msgstr "Chybná odpoveď zo servera"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server nepoužíva žiadny z podporovaných spôsobov autentifikácie"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Požadovali ste šifrovanie, ale na tomto serveri nie je dostupné."
+
 msgid "Invalid challenge from server"
 msgstr "Chybná výzva zo servera"
 
-msgid "SASL error"
-msgstr "Chyba SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Chyba SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "Manažér pripojení BOSH prerušil vaše sedenie."
+
+msgid "No session ID given"
+msgstr "Nebolo dané ID sedenia"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Verzia BOSH protokolu nepodporovaná"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Nepodarilo sa založiť spojenie so serverom"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Nepodarilo sa založiť spojenie so serverom: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "SSL pripojenie sa nepodarilo založiť"
 
 msgid "Full Name"
 msgstr "Celé meno"
@@ -3684,158 +3842,8 @@ msgstr "Klient"
 msgid "Operating System"
 msgstr "Operačný systém"
 
-msgid "Last Activity"
-msgstr "Posledná aktivita"
-
-msgid "Service Discovery Info"
-msgstr "Prieskum služieb"
-
-msgid "Service Discovery Items"
-msgstr "Položky prieskumu služieb"
-
-msgid "Extended Stanza Addressing"
-msgstr "Rozšírené adresovanie slôh"
-
-msgid "Multi-User Chat"
-msgstr "Skupinový chat"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Rozšírené informácie o prítomnosti v skupinovom chate"
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band bitové toky"
-
-msgid "Ad-Hoc Commands"
-msgstr "Príkaz Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "PubSub služba"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 bitové toky"
-
-msgid "Out of Band Data"
-msgstr "Mimo skupinových dát"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "In-Band Registrácia"
-
-msgid "User Location"
-msgstr "Lokalita"
-
-msgid "User Avatar"
-msgstr "Avatar používateľa"
-
-msgid "Chat State Notifications"
-msgstr "Upozornenie na stav v chate"
-
-msgid "Software Version"
-msgstr "Verzia softvéru"
-
-msgid "Stream Initiation"
-msgstr "Iniciácia toku"
-
-msgid "File Transfer"
-msgstr "Prenos súborov"
-
-msgid "User Mood"
-msgstr "Nálada používateľa"
-
-msgid "User Activity"
-msgstr "Aktivita používateľa"
-
-msgid "Entity Capabilities"
-msgstr "Schopnosti"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Požadovanie šifrovaného spojenia"
-
-msgid "User Tune"
-msgstr "Používateľ Tune"
-
-msgid "Roster Item Exchange"
-msgstr "Výmena kontaktov"
-
-msgid "Reachability Address"
-msgstr "Dostupná adresa"
-
-msgid "User Profile"
-msgstr "Profil používateľa"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Zvuk Jingle"
-
-msgid "User Nickname"
-msgstr "Prezývka používateľa"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Príjem správ"
-
-msgid "Public Key Publishing"
-msgstr "Zverejnenie verejného kľúča"
-
-msgid "User Chatting"
-msgstr "Používateľ chatuje"
-
-msgid "User Browsing"
-msgstr "Používateľ surfuje"
-
-msgid "User Gaming"
-msgstr "Používateľ hrá"
-
-msgid "User Viewing"
-msgstr "Používateľ prezerá"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Šifrovanie slôh"
-
-msgid "Entity Time"
-msgstr "Čas entity"
-
-msgid "Delayed Delivery"
-msgstr "Odložené doručenie"
-
-msgid "Collaborative Data Objects"
-msgstr "Spolupracujúce dátové objekty"
-
-msgid "File Repository and Sharing"
-msgstr "Ukladanie a zdieľanie súborov"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Objavenie STUN služieb pre Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Požadovanie zjednodušeného šifrovaného spojenia"
-
-msgid "Hop Check"
-msgstr "Kontrola skoku"
-
-msgid "Capabilities"
-msgstr "Schopnosti"
+msgid "Local Time"
+msgstr "Miestny čas"
 
 msgid "Priority"
 msgstr "Priorita"
@@ -3843,6 +3851,13 @@ msgstr "Priorita"
 msgid "Resource"
 msgstr "Zdroj"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s dozadu"
+
+msgid "Logged Off"
+msgstr "Odhlásený"
+
 msgid "Middle Name"
 msgstr "Prostredné meno"
 
@@ -4010,28 +4025,23 @@ msgstr "Vyberte konferenčný server, ktorý kontaktovať"
 msgid "Find Rooms"
 msgstr "Hľadať miestnosti"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Požadovali ste šifrovanie, ale na tomto serveri nie je dostupné."
+msgid "Affiliations:"
+msgstr "Hodnosti:"
 
-msgid "Write error"
-msgstr "Chyba zápisu"
+msgid "No users found"
+msgstr "Nenájdení žiadni používatelia"
 
-msgid "Ping timeout"
-msgstr "Interval ping"
+msgid "Roles:"
+msgstr "Úlohy:"
 
-msgid "Read Error"
-msgstr "Chyba čítania"
+msgid "Ping timed out"
+msgstr "Ping vypršal"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Nepodarilo sa založiť spojenie so serverom:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Nepodarilo sa vytvoriť socket"
+"Neboli nájdené iné metódy XMPP spojenia po tom čo zlyhalo priame spojenie."
 
 msgid "Invalid XMPP ID"
 msgstr "Chybné XMPP ID"
@@ -4039,6 +4049,9 @@ msgstr "Chybné XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID je chybné. Musíte zadať doménu."
 
+msgid "Malformed BOSH URL"
+msgstr "Chybná BOSH adresa"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrácia %s@%s bola úspešná"
@@ -4063,9 +4076,6 @@ msgstr "Zrušenie registrácie úspešné"
 msgid "Unregistration Failed"
 msgstr "Zrušenie registrácie zlyhalo"
 
-msgid "Already Registered"
-msgstr "Už zaregistrovaný"
-
 msgid "State"
 msgstr "Štát"
 
@@ -4078,6 +4088,9 @@ msgstr "Telefón"
 msgid "Date"
 msgstr "Dátum"
 
+msgid "Already Registered"
+msgstr "Už zaregistrovaný"
+
 msgid "Unregister"
 msgstr "Zrušiť registráciu"
 
@@ -4132,6 +4145,12 @@ msgstr "Server nepodporuje blokovanie"
 msgid "Not Authorized"
 msgstr "Neautorizovaný"
 
+msgid "Mood"
+msgstr "Nálada"
+
+msgid "Now Listening"
+msgstr "Práve počúva"
+
 msgid "Both"
 msgstr "Obe"
 
@@ -4153,12 +4172,6 @@ msgstr "Žiadne"
 msgid "Subscription"
 msgstr "Prihlásenie"
 
-msgid "Mood"
-msgstr "Nálada"
-
-msgid "Now Listening"
-msgstr "Práve počúva"
-
 msgid "Mood Text"
 msgstr "Popis nálady"
 
@@ -4201,9 +4214,6 @@ msgstr "Vaše heslo bolo zmenené."
 msgid "Error changing password"
 msgstr "Chyba pri zmene hesla"
 
-msgid "Password (again)"
-msgstr "Heslo (znovu)"
-
 msgid "Change XMPP Password"
 msgstr "Zmeniť XMPP heslo"
 
@@ -4374,7 +4384,7 @@ msgstr "Nedá sa udeliť zákaz pre používateľa %s"
 
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Neznámy vzťah: „%s“"
+msgstr "Neznáma hodnosť: „%s“"
 
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
@@ -4397,16 +4407,25 @@ msgid "Unable to ping user %s"
 msgstr "Nepodarilo sa poslať ping používateľovi %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "Nepodarilo sa poslať bzzz, pretože o používateľovi %s nič nevieme."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Nepodarilo sa poslať bzzz, pretože o používateľovi %s sa nič nevie."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "Nepodarilo sa poslať bzzz, pretože používateľ %s môže byť odpojený."
+msgid "Unable to buzz, because %s might be offline."
+msgstr ""
+"Nepodarilo sa poslať bzzz, pretože používateľ %s asi nie je prihlásený."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Nepodarilo sa poslať bzzz, pretože používateľ %s to nepodporuje."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"Nepodarilo sa poslať bzzz, pretože používateľ %s to nepodporuje alebo si to "
+"momentálne neželá."
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Posielam bzzz používateľovi %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4418,8 +4437,34 @@ msgid "%s has buzzed you!"
 msgstr "Používateľ %s vám poslal bzzz!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Posielam bzzz používateľovi %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Nepodarilo sa spustenie média s používateľom %s: chybné JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Nepodarilo sa spustenie média s používateľom %s: je neprihlásený"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Nepodarilo sa spustenie média s používateľom %s: nezaznamenaný medzi "
+"prítomnými"
+
+msgid "Media Initiation Failed"
+msgstr "Zakladanie média zlyhalo"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Vyberte, prosím, zdroj používateľa %s ku ktorému začať mediálne sedenie."
+
+msgid "Select a Resource"
+msgstr "Vyberte zdroj"
+
+msgid "Initiate Media"
+msgstr "Začať médium"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavenie miestnosti chatu."
@@ -4440,18 +4485,19 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;používateľ&gt; [dôvod]:  Vykázať používateľa z miestnosti."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;používateľ&gt; &lt;owner|admin|member|outcast|none&gt;: "
-"Nastaví používateľové pričlenenie v miestnosti."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [prezývka1] "
+"[prezývka2] ...: V tejto miestnosti ukáže používateľov s danou hodosťou "
+"alebo udelí používateľovi hodnosť."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;používateľ&gt; &lt;moderator|participant|visitor|none&gt;: Nastaví "
-"postavenie používateľa v miestnosti."
+"role &lt;moderator|participant|visitor|none&gt; [prezývka1] [prezývka2] ...: "
+"Nastaví úlohu používateľa v miestnosti."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [správa]: Pozve používateľa do miestnosti."
@@ -4512,6 +4558,9 @@ msgstr "Server pripojenia"
 msgid "File transfer proxies"
 msgstr "Proxy prenosu súborov"
 
+msgid "BOSH URL"
+msgstr "Adresa BOSH"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4550,6 +4599,14 @@ msgstr "Chyba pri spracovaní XML"
 msgid "Unknown Error in presence"
 msgstr "Prítomná neznáma chyba"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Chyba pripojenia na chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Chyba v chate %s"
+
 msgid "Create New Room"
 msgstr "Vytvoriť novú miestnosť"
 
@@ -4566,13 +4623,28 @@ msgstr "Konfigurovať miestnosť"
 msgid "_Accept Defaults"
 msgstr "_Prijať štandardné"
 
+msgid "No reason"
+msgstr "Žiadny dôvod"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Chyba pripojenia na chat %s"
+msgid "You have been kicked: (%s)"
+msgstr "Boli ste vykopnutý: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Chyba v chate %s"
+msgid "Kicked (%s)"
+msgstr "Vykopnutý (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Na in-band bytestream prenose sa vyskytla chyba\n"
+
+msgid "Transfer was closed."
+msgstr "Zrušil sa prenos."
+
+msgid "Failed to open the file"
+msgstr "Otvoriť súbor sa nepodarilo."
+
+msgid "Failed to open in-band bytestream"
+msgstr "Otvoriť in-band bajtový tok sa nepodarilo"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4587,7 +4659,7 @@ msgstr "Nepodarilo sa odoslať súbor používateľovi %s, chybné JID"
 
 #, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "Používateľovi %s nie je možné odoslať súbor, práve je odpojený"
+msgstr "Používateľovi %s nie je možné odoslať súbor, je neprihlásený"
 
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
@@ -4599,9 +4671,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Vyberte, prosím, zdroj používateľa %s, na ktorý chcete odoslať súbor"
 
-msgid "Select a Resource"
-msgstr "Vyberte zdroj"
-
 msgid "Edit User Mood"
 msgstr "Zmeniť náladu používateľa"
 
@@ -4651,7 +4720,7 @@ msgstr "Dané používateľské meno neexistuje."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Problém synchronizácie zoznamu kamarátov v %s (%s)"
+msgstr "Problém synchronizácie zoznamu priateľov v %s (%s)"
 
 #, c-format
 msgid ""
@@ -4659,7 +4728,7 @@ msgid ""
 "Do you want this buddy to be added?"
 msgstr ""
 "%s v miestnom zozname je v skupine „%s“, ale nie je v zozname servera. "
-"Chcete tohto kamaráta pridať?"
+"Chcete tohto priateľa pridať?"
 
 #, c-format
 msgid ""
@@ -4667,7 +4736,7 @@ msgid ""
 "to be added?"
 msgstr ""
 "%s je v miestnom zozname, ale nie je v zozname servera. Chcete tohto "
-"kamaráta pridať?"
+"priateľa pridať?"
 
 #, c-format
 msgid "Unable to parse message"
@@ -4695,7 +4764,7 @@ msgstr "Už je prihlásený"
 
 #, c-format
 msgid "Invalid username"
-msgstr "Chybné používateľské meno."
+msgstr "Chybné používateľské meno"
 
 #, c-format
 msgid "Invalid friendly name"
@@ -4715,7 +4784,7 @@ msgstr "Nie je v zozname"
 
 #, c-format
 msgid "User is offline"
-msgstr "Používateľ je odpojený"
+msgstr "Používateľ nie je prihlásený"
 
 #, c-format
 msgid "Already in the mode"
@@ -4863,7 +4932,7 @@ msgstr "Autentifikácia zlyhala"
 
 #, c-format
 msgid "Not allowed when offline"
-msgstr "Nepovolené v odpojenom stave"
+msgstr "Nepovolené ak odhlásený"
 
 #, c-format
 msgid "Not accepting new users"
@@ -4898,6 +4967,27 @@ msgstr "Ostatné kontakty"
 msgid "Non-IM Contacts"
 msgstr "Kontakty bez rozhovoru"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "Používateľ %s poslal wink. <a href='msn-wink://%s'>Prehrať ho</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "Používateľ %s poslal wink, ale nedal sa uložiť"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "Používateľ %s poslal hlasový klip. <a href='audio://%s'>Prehrať ho</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "Používateľ %s poslal hlasový klip, ale nedal sa uložiť"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s vám poslal pozvánku na hlasový hovor, ktorý zatiaľ nie je podporovaný."
+
 msgid "Nudge"
 msgstr "Štuchanec"
 
@@ -5050,8 +5140,28 @@ msgstr ""
 "Pre MSN je potrebná podpora SSL. Nainštalujte, prosím, podporovanú SSL "
 "knižnicu."
 
-msgid "Failed to connect to server."
-msgstr "Nepodarilo sa spojiť so serverom."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Nepodarilo sa pridať priateľa %s, pretože používateľské meno je chybné.  "
+"Používateľské mená musia byť správna e-mailová adresa."
+
+msgid "Unable to Add"
+msgstr "Nepodarilo sa pridať"
+
+msgid "Authorization Request Message:"
+msgstr "Žiadosť o autorizáciu:"
+
+msgid "Please authorize me!"
+msgstr "Autorizujte ma, prosím!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Chyba pri získavaní profilu"
@@ -5241,63 +5351,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autentifikácia Windows Live ID:Chybná odpoveď"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s nie je správna skupina."
-
-msgid "Unknown error."
-msgstr "Neznáma chyba."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vám práve poslal „šťuchanec“!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Neznáma chyba (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Neznáma chyba (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Nebolo možné pridať používateľa"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Nasledujúci používatelia chýbajú vo vašom adresári"
-
+#. Unknown error!
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nebolo možné pridať používateľa %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nebolo možné blokovať používateľa %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nebolo možné povoliť používateľa %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s sa nepridal, pretože váš zoznam priateľov je plný."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nie je platný účet pasu."
+msgid "Unknown error (%d)"
+msgstr "Neznáma chyba (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Služba je dočasne nedostupná."
+msgid "The following users are missing from your addressbook"
+msgstr "Nasledujúci používatelia chýbajú vo vašom adresári"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilná správa nebola odoslaná, pretože bola príliš dlhá."
 
-msgid "Unable to rename group"
-msgstr "Nepodarilo sa premenovať skupinu"
-
-msgid "Unable to delete group"
-msgstr "Nepodarilo sa odstrániť skupinu"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5346,9 +5420,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Správu sa nepodarilo odoslať, pretože sa vyskytla neznáma chyba."
 
-msgid "Unable to connect"
-msgstr "Nepodarilo sa pripojiť"
-
 msgid "Writing error"
 msgstr "Chyba pri zápise"
 
@@ -5363,21 +5434,21 @@ msgstr ""
 "Chyba pripojenia %s servera:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr "Server nepodporuje náš protokol."
 
-msgid "Error parsing HTTP."
-msgstr "Chyba pri spracovávaní HTTP."
+msgid "Error parsing HTTP"
+msgstr "Chyba pri spracovávaní HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Prihlásili ste sa z iného miesta."
+msgid "You have signed on from another location"
+msgstr "Prihlásili ste sa z iného miesta"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN servery sú dočasne nedostupné. Počkajte, prosím, a skúste to znovu."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "MSN servery sa dočasne vypínajú."
+msgid "The MSN servers are going down temporarily"
+msgstr "MSN servery sa dočasne vypínajú"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5406,6 +5477,14 @@ msgstr "Odosielajú sa cookies"
 msgid "Retrieving buddy list"
 msgstr "Prijíma sa zoznam priateľov"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s žiada o sledovanie vašej webkamery, zatiaľ to nie je podporované."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s vám poslal pozvánku na webkameru, ktorá zatiaľ nie je podporovaná."
+
 msgid "Away From Computer"
 msgstr "Preč od počítača"
 
@@ -5422,7 +5501,7 @@ msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Správu sa nepodarilo odoslať, pretože ste neviditeľný:"
 
 msgid "Message could not be sent because the user is offline:"
-msgstr "Správu sa nepodarilo odoslať, pretože používateľ je odpojený:"
+msgstr "Správu sa nepodarilo odoslať, pretože používateľ nie je prihlásený:"
 
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Správu sa nepodarilo odoslať, pretože sa vyskytla chyba spojenia:"
@@ -5444,14 +5523,6 @@ msgstr "Správu sa nepodarilo odoslať, pretože sa vyskytla chyba s prepínačo
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Správu sa nepodarilo odoslať, pretože sa vyskytla neznáma chyba:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Používateľ %s si vás pridal do svojho zoznamu priateľov."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "Používateľ %s vás odstránil zo svojho zoznamu priateľov."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Odstrániť priateľa z adresára?"
 
@@ -5481,6 +5552,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Modul protokolu HTTP"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nie je správna skupina."
+
+msgid "Unknown error."
+msgstr "Neznáma chyba."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nebolo možné pridať používateľa %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nebolo možné blokovať používateľa %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nebolo možné povoliť používateľa %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s sa nepridal, pretože váš zoznam priateľov je plný."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nie je platný účet pasu."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Služba je dočasne nedostupná."
+
+msgid "Unable to rename group"
+msgstr "Nepodarilo sa premenovať skupinu"
+
+msgid "Unable to delete group"
+msgstr "Nepodarilo sa odstrániť skupinu"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Používateľ %s si vás pridal do svojho zoznamu priateľov."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Používateľ %s vás odstránil zo svojho zoznamu priateľov."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Neexistujúci používateľ: %s"
 
@@ -5509,6 +5628,8 @@ msgid "Lost connection with server"
 msgstr "Pripojenie zo serverom je stratené"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nové poštové správy"
 
@@ -5550,26 +5671,22 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Pridať kontakty zo serveru"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Pripojený"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Chyba protokolu, kód %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Vaše heslo má %d znakov, viac než je maximálna dĺžka %d na MySpaceIM. "
-"Skráťte, prosím, vaše heslo na adrese http://profileedit.myspace.com/index."
-"cfm?fuseaction=accountSettings.changePassword a skúste znovu."
+"%s Vaše heslo má %zu znakov, viac než je maximálna dĺžka %d. Skráťte, "
+"prosím, vaše heslo na adrese http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings.changePassword a skúste znovu."
+
+msgid "Incorrect username or password"
+msgstr "Nesprávne používateľské meno alebo heslo"
 
 msgid "MySpaceIM Error"
 msgstr "Chyba MySpaceIM"
@@ -5577,16 +5694,6 @@ msgstr "Chyba MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Chybná podmienka vstupu"
 
-msgid "Read buffer full (2)"
-msgstr "Zásobník čítania plný (2)"
-
-msgid "Unparseable message"
-msgstr "Nespracovateľná správa"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Nebolo možné sa pripojiť ku hostiteľovi: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Nebolo možné pridať priateľa"
 
@@ -5672,6 +5779,15 @@ msgstr "Spolu priateľov"
 msgid "Client Version"
 msgstr "Verzia klienta"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Počas pokusu o nastavenie používateľského mena sa vyskytla chyba. Prosím, "
+"skúste to znova alebo navštívte adresu http://editprofile.myspace.com/index."
+"cfm?fuseaction=profile.username a nastavte si ho tam."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Používateľské meno je dostupné"
 
@@ -5888,9 +6004,6 @@ msgstr "Nemôžete pridať samého seba"
 msgid "Master archive is misconfigured"
 msgstr "Hlavný archív je nesprávne nastavený"
 
-msgid "Incorrect username or password"
-msgstr "Nesprávne používateľské meno alebo heslo"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nepodarilo sa zistiť hostiteľa daného používateľského mena"
 
@@ -5925,15 +6038,15 @@ msgstr ""
 "Táto demoverzia nedovoľuje prihlásenie viac ako desiatich používateľov naraz"
 
 msgid "The user is either offline or you are blocked"
-msgstr "Používateľ je buď odpojený, alebo ste zablokovaný"
+msgstr "Buď používateľ nie je prihlásený, alebo ste zablokovaný"
 
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Neznáma chyba: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Prihlásenie zlyhalo (%s)."
+msgid "Unable to login: %s"
+msgstr "Nebolo možné sa prihlásiť: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6038,9 +6151,6 @@ msgstr "GroupWise konferencia %d"
 msgid "Authenticating..."
 msgstr "Overuje sa..."
 
-msgid "Unable to connect to server."
-msgstr "Nepodarilo sa pripojiť na server."
-
 msgid "Waiting for response..."
 msgstr "Čaká sa na odpoveď..."
 
@@ -6064,25 +6174,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Chcete sa pripojiť do tohoto rozhovoru?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Boli ste odhlásený, pretože ste sa prihlásili na inej pracovnej stanici."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
-"%s je podľa všetkého odpojený a neprijal správu, ktorú ste práve odoslali."
+"Používateľ %s podľa všetkého nie je prihlásený a neprijal správu, ktorú ste "
+"práve odoslali."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
-"Nedá sa pripojiť na server. Zadajte, prosím, adresu servera, na ktorý sa "
-"chcete pripojiť."
-
-msgid "Error. SSL support is not installed."
-msgstr "Chyba. SSL podpora nie je nainštalovaná."
+"Nepodarilo sa pripojiť na server. Zadajte, prosím, adresu servera, na ktorý "
+"sa chcete pripojiť."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
@@ -6107,25 +6211,32 @@ msgstr "Adresa servera"
 msgid "Server port"
 msgstr "Port servera"
 
+msgid "Received unexpected response from "
+msgstr "Bola prijatá neočakávaná odpoveď z "
+
+#. username connecting too frequently
+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 ""
+"Pripájali a odpájali ste sa príliš často. Počkajte desať minút a skúste "
+"znova. Ak budete i naďalej skúšať, budete musieť čakať este dlhšie."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Chyba pri požadovaní "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL neumožňuje vášmu používateľskému menu sa tu autentifikovať"
+
 msgid "Could not join chat room"
 msgstr "Nepodarilo sa pripojiť do miestnosti"
 
 msgid "Invalid chat room name"
 msgstr "Chybný názov miestnosti"
 
-msgid "Server closed the connection."
-msgstr "Server zrušil pripojenie."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Pripojenie k servera bolo prerušené:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Prijaté neplatné dáta počas spojenia so serverom."
+msgid "Received invalid data on connection with server"
+msgstr "Počas spojenia so serverom boli prijaté neplatné dáta"
 
 #. *< type
 #. *< ui_requirement
@@ -6172,7 +6283,7 @@ msgstr "Pripojenie so vzdialeným používateľom je prerušené:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Prijaté neplatné dáta pri spojení so vzdialeným používateľom."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Nepodarilo sa založiť pripojenie so vzdialeným používateľom."
 
 msgid "Direct IM established"
@@ -6372,20 +6483,12 @@ msgid "Buddy Comment"
 msgstr "Komentár priateľa"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Nepodarilo sa pripojiť na autentifikačný server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Nepodarilo sa pripojiť na autentifikačný server: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Nepodarilo sa pripojiť na BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nepodarilo sa pripojiť na BOS server: %s"
 
 msgid "Username sent"
 msgstr "Používateľské meno odoslané"
@@ -6399,54 +6502,60 @@ msgstr "Dokončuje sa pripojenie"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Nepodarilo sa prihlásiť: Nepodarilo sa prihlásiť ako %s, pretože "
-"používateľské meno je chybné.  Používateľské mená musia byť správna e-"
-"mailová adresa, alebo musí byť prvý znak písmeno a musí obsahovať len "
-"písmená, číslice a medzery, alebo len číslice."
+"Nepodarilo sa prihlásiť ako %s, pretože používateľské meno je chybné.  "
+"Používateľské mená musia byť správna e-mailová adresa, alebo musí byť prvý "
+"znak písmeno a musí obsahovať len písmená, číslice a medzery, alebo len "
+"číslice."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Nesprávne používateľské meno."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Onedlho môže dôjsť k odpojeniu. Ak sa tak stane, hľadajte aktualizácie na %s."
 
-msgid "Incorrect password."
-msgstr "Nesprávne heslo."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nebolo možné získať platný AIM prihlasovací hash."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nebolo možné získať platný prihlasovací hash."
+
+msgid "Received authorization"
+msgstr "Prijatá autorizácia"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Používateľské meno neexistuje"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr "Váš účet je momentálne pozastavený"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Služba AOL je dočasne nedostupná."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Pripájali a odpájali ste sa príliš často. Počkajte desať minút a skúste "
-"znova. Ak budete i naďalej skúšať, budete musieť čakať este dlhšie."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Verzia klienta, ktorého používate, je príliš stará. Prosím, aktualizujte ho "
 "na %s"
 
-msgid "Could Not Connect"
-msgstr "Nepodarilo sa pripojiť"
-
-msgid "Received authorization"
-msgstr "Prijatá autorizácia"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Pripájali a odpájali ste sa príliš často. Počkajte minútu a skúste to znova. "
+"Ak budete pokračovať, budete musieť čakať este dlhšie."
 
-msgid "The SecurID key entered is invalid."
-msgstr "Zadaný kľúč SecurID je neplatný."
+msgid "The SecurID key entered is invalid"
+msgstr "Zadaný kľúč SecurID je neplatný"
 
 msgid "Enter SecurID"
 msgstr "Zadajte SecurID"
@@ -6454,27 +6563,6 @@ msgstr "Zadajte SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Zadajte 6-ciferné číslo z digitálneho displeja."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Onedlho môže dôjsť k odpojeniu. Ak sa tak stane, hľadajte aktualizácie na %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Nebolo možné získať platný AIM prihlasovací hash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Zakrátko môžete byť odpojený. Skontrolujte aktualizácie na %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Nebolo možné získať platný prihlasovací hash."
-
 msgid "Password sent"
 msgstr "Heslo odoslané"
 
@@ -6486,12 +6574,6 @@ msgstr ""
 "Prosím, autorizujte ma, aby som si vás mohol pridať do svojho zoznamu "
 "priateľov."
 
-msgid "Authorization Request Message:"
-msgstr "Žiadosť o autorizáciu:"
-
-msgid "Please authorize me!"
-msgstr "Autorizujte ma, prosím!"
-
 msgid "No reason given."
 msgstr "Nebol uvedený dôvod."
 
@@ -6618,7 +6700,7 @@ msgstr[0] "Z neznámeho dôvodu ste prišli o %hu správ od používateľa %s."
 msgstr[1] "Z neznámeho dôvodu ste prišli o %hu správu od používateľa %s."
 msgstr[2] "Z neznámeho dôvodu ste prišli o %hu správy od používateľa %s."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Nemôžem odoslať správu: %s"
@@ -6635,11 +6717,14 @@ msgid "User information not available: %s"
 msgstr "Informácie o používateľovi sú nedostupné: %s"
 
 msgid "Online Since"
-msgstr "Pripojený od"
+msgstr "Prihlásený od"
 
 msgid "Member Since"
 msgstr "Člen od"
 
+msgid "Capabilities"
+msgstr "Schopnosti"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -6775,7 +6860,7 @@ msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Váš obrázok nebol odoslaný. Na odosielanie obrázkov v správach musíte byť "
-"priamo pripojený."
+"priamo prihlásený."
 
 msgid "Unable to set AIM profile."
 msgstr "Nepodarilo sa odoslať AIM profil."
@@ -6787,7 +6872,7 @@ msgid ""
 msgstr ""
 "Pravdepodobne ste vyžiadali nastevenie vášho profilu pred dokončením "
 "procedúry prihlásenia. Váš profil zostáva nenastavený, skúste ho nastaviť "
-"znovu, keď budete plne pripojený."
+"znovu, keď budete plne prihlásený."
 
 #, c-format
 msgid ""
@@ -6831,7 +6916,7 @@ msgstr "Správa neprítomnosti je príliš dlhá."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6840,9 +6925,6 @@ msgstr ""
 "znak písmeno a musí obsahovať len písmená, číslice a medzery, alebo len "
 "číslice."
 
-msgid "Unable to Add"
-msgstr "Nepodarilo sa pridať"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Nepodarilo sa získať zoznam priateľov"
 
@@ -6858,7 +6940,7 @@ msgstr "Siroty"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Nepodarilo sa pridať priateľa %s, pretože vo vašom zozname máte príliš veľa "
@@ -6868,7 +6950,7 @@ msgid "(no name)"
 msgstr "(bez názvu)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Nebolo možné pridať priateľa %s z neznámeho dôvodu."
 
 #, c-format
@@ -6943,7 +7025,7 @@ msgid "Edit Buddy Comment"
 msgstr "Upraviť komentár priateľa"
 
 msgid "Get Status Msg"
-msgstr "Získať správu o stave"
+msgstr "Získať správu o statuse"
 
 msgid "Direct IM"
 msgstr "Priama rýchla správa"
@@ -6999,6 +7081,7 @@ msgstr "_Hľadať"
 msgid "Set User Info (web)..."
 msgstr "Nastaviť podrobnosti používateľa (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Zmeniť heslo (web)"
 
@@ -7028,6 +7111,9 @@ msgstr "Hľadať priateľa podľa e-mailovej adresy..."
 msgid "Search for Buddy by Information"
 msgstr "Hľadať priateľa podľa podrobností"
 
+msgid "Use clientLogin"
+msgstr "Použiť clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7142,7 +7228,7 @@ msgid "Visible"
 msgstr "Viditeľný"
 
 msgid "Friend Only"
-msgstr "Len kamarát"
+msgstr "Len priateľ"
 
 msgid "Private"
 msgstr "Súkromné"
@@ -7216,6 +7302,34 @@ msgstr "Obnoviť"
 msgid "Could not change buddy information."
 msgstr "Nebolo možné zmeniť informácie o priateľovi."
 
+msgid "Mobile"
+msgstr "Mobilný"
+
+msgid "Note"
+msgstr "Poznámka"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Popisok priateľa"
+
+msgid "Change his/her memo as you like"
+msgstr "Upravte jeho/jej popisok ako si želáte"
+
+msgid "_Modify"
+msgstr "_Upraviť"
+
+msgid "Memo Modify"
+msgstr "Upraviť popisok"
+
+msgid "Server says:"
+msgstr "Server vraví:"
+
+msgid "Your request was accepted."
+msgstr "Vaša požiadavka bola prijatá."
+
+msgid "Your request was rejected."
+msgstr "Vaša požiadavka bola zamietnutá."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u vyžaduje overenie"
@@ -7459,7 +7573,7 @@ msgstr "<b>Čas pripojenia</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
 #, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Pripojených priateľov</b>: %d<br>\n"
+msgstr "<b>Prihlásených priateľov</b>: %d<br>\n"
 
 #, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
@@ -7524,6 +7638,12 @@ msgstr "<p><b>Písači krásnych patchov</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Uznanie</b>:<br>\n"
 
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Opatrní testeri</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "a ďalší, prosím dajte mi vedieť... ďakujem!))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>A všetci chalani zo zákulisia...</i><br>\n"
 
@@ -7549,6 +7669,9 @@ msgstr "Obnoviť všetky QQ Quny"
 msgid "About OpenQ"
 msgstr "O OpenQ"
 
+msgid "Modify Buddy Memo"
+msgstr "Upraviť popisok priateľa"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7595,7 +7718,7 @@ msgstr "Interval udržiavania spojenia (sekúnd)"
 msgid "Update interval (seconds)"
 msgstr "Interval obnovovania (sekúnd)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Nedá sa dešifrovať odpoveď serveru"
 
 #, c-format
@@ -7620,9 +7743,6 @@ msgstr "Je vyžadovaná aktivácia"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Neznámy kód odpovede pri prihlasovaní (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Nedá sa dešifrovať odpoveď serveru"
-
 msgid "Requesting captcha"
 msgstr "Získava sa captcha"
 
@@ -7656,30 +7776,17 @@ msgstr ""
 "Neznámy kód odpovede pri prihlasovaní (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Nepodarilo sa pripojiť."
-
 msgid "Socket error"
 msgstr "Chyba socketu"
 
-msgid "Unable to read from socket"
-msgstr "Nedá sa čítať zo soketu"
-
-msgid "Write Error"
-msgstr "Chyba zápisu"
-
-msgid "Connection lost"
-msgstr "Pripojenie bolo prerušené"
-
 msgid "Getting server"
 msgstr "Získava sa server"
 
 msgid "Requesting token"
 msgstr "Vyžiadava sa token"
 
-msgid "Couldn't resolve host"
-msgstr "Nebolo možné preložiť názov hostiteľa"
+msgid "Unable to resolve hostname"
+msgstr "Nepodarilo sa preložiť meno hostiteľa"
 
 msgid "Invalid server or port"
 msgstr "Chybný server alebo port"
@@ -7732,7 +7839,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun príkaz"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Nedá sa dešifrovať odpoveď prihlásenia"
 
 msgid "Unknown LOGIN CMD"
@@ -7752,9 +7859,6 @@ msgstr "Súbor odoslaný"
 msgid "%d canceled the transfer of %s"
 msgstr "používateľ %d prerušil prenos %s"
 
-msgid "Connection closed (writing)"
-msgstr "Pripojenie uzavreté (zapisuje sa)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Názov skupiny:</b> %s<br>"
@@ -7808,17 +7912,6 @@ msgstr "Administrátor Sametime vystavil na serveri %s nasledujúce oznámenie"
 msgid "Sametime Administrator Announcement"
 msgstr "Oznámenie administrátora Sametime"
 
-msgid "Connection reset"
-msgstr "Obnovenie spojenia"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Chyba čítania zo soketu: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Nepodarilo sa pripojiť ku hostiteľovi"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznámenie od %s"
@@ -7841,6 +7934,9 @@ msgstr "Reproduktory"
 msgid "Video Camera"
 msgstr "Kamera"
 
+msgid "File Transfer"
+msgstr "Prenos súborov"
+
 msgid "Supports"
 msgstr "Podporuje"
 
@@ -7938,7 +8034,7 @@ msgid ""
 msgstr ""
 "Identifikátor „%s“ môže odkazovať na ktoréhokoľvek z nasledujúcich "
 "používateľov. Vyberte, prosím, správneho používateľa zo zoznamu nižšie a "
-"pridajte ho do svojho zoznamu kamarátov."
+"pridajte ho do svojho zoznamu priateľov."
 
 msgid "Select User"
 msgstr "Vyberte používateľa"
@@ -7963,13 +8059,13 @@ msgstr ""
 "%s\n"
 
 msgid "Remotely Stored Buddy List"
-msgstr "Vzdialene uložený zoznam kamarátov"
+msgstr "Vzdialene uložený zoznam priateľov"
 
 msgid "Buddy List Storage Mode"
 msgstr "Umiestnenie zoznamu priateľov"
 
 msgid "Local Buddy List Only"
-msgstr "Iba miestny zoznam kamarátov"
+msgstr "Iba miestny zoznam priateľov"
 
 msgid "Merge List from Server"
 msgstr "Spojiť so zoznamom zo servera"
@@ -8012,7 +8108,7 @@ msgid ""
 msgstr ""
 "Identifikátor „%s“ môže odkazovať na ktoréhokoľvek z nasledujúcich skupín "
 "Notes zoznamu adries. Vyberte, prosím, správneho používateľa zo zoznamu "
-"nižšie a pridajte ho do svojho zoznamu kamarátov."
+"nižšie a pridajte ho do svojho zoznamu priateľov."
 
 msgid "Select Notes Address Book"
 msgstr "Vyberte Notes zoznam adries"
@@ -8560,9 +8656,6 @@ msgstr "Organizácia"
 msgid "Unit"
 msgstr "Jednotka"
 
-msgid "Note"
-msgstr "Poznámka"
-
 msgid "Join Chat"
 msgstr "Pripojiť sa k rozhovoru"
 
@@ -8578,7 +8671,7 @@ msgid "Real Name"
 msgstr "Skutočné meno"
 
 msgid "Status Text"
-msgstr "Text stavu"
+msgstr "Text statusu"
 
 msgid "Public Key Fingerprint"
 msgstr "Digitálny odtlačok verejného kľúča"
@@ -8662,6 +8755,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Sieťové štatistiky"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping zlyhal"
 
@@ -8725,7 +8821,7 @@ msgstr "Nepodporovaný typ verejného kľúča"
 msgid "Disconnected by server"
 msgstr "Odpojený serverom"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Chyba počas pripájania sa na SILC server"
 
 msgid "Key Exchange failed"
@@ -8737,16 +8833,10 @@ msgstr ""
 "Obnovenie prerušenej relácie zlyhalo. Kliknutím na „Znovu pripojiť“ "
 "vytvoríte nové pripojenie."
 
-msgid "Connection failed"
-msgstr "Pripojenie zlyhalo"
-
 msgid "Performing key exchange"
 msgstr "Vykonáva sa výmena kľúčov"
 
-msgid "Unable to create connection"
-msgstr "Nedá sa vytvoriť spojenie"
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Nedá sa načítať pár kľúčov SILC"
 
 #. Progress
@@ -8756,8 +8846,8 @@ msgstr "Pripája sa na SILC server"
 msgid "Out of memory"
 msgstr "Nedostatok pamäte"
 
-msgid "Cannot initialize SILC protocol"
-msgstr "Nepodarilo sa inicializovať protokol SILC"
+msgid "Unable to initialize SILC protocol"
+msgstr "Nepodarilo sa zapnúť protokol SILC"
 
 msgid "Error loading SILC key pair"
 msgstr "Chyba pri načítaní SILC páru kľúčov"
@@ -8793,7 +8883,7 @@ msgid "Video conferencing"
 msgstr "Video konferencia"
 
 msgid "Your Current Status"
-msgstr "Váš aktuálny stav"
+msgstr "Váš aktuálny status"
 
 msgid "Online Services"
 msgstr "Online služby"
@@ -8819,7 +8909,7 @@ msgid ""
 "about yourself."
 msgstr ""
 "Ak chcete, môžete ostatným používateľom umožniť, aby videli, či ste "
-"pripojení, a poznalii vaše osobné informácie. Vyplňte, prosím, len tie "
+"prihlásený, a poznalii vaše osobné informácie. Vyplňte, prosím, len tie "
 "informácie, ktoré chcete, aby ich ostatní používatelia o vás videli."
 
 msgid "Message of the Day"
@@ -8856,7 +8946,7 @@ msgid "Generate Key Pair"
 msgstr "Generovať pár kľúčov"
 
 msgid "Online Status"
-msgstr "Online stav"
+msgstr "Online status"
 
 msgid "View Message of the Day"
 msgstr "Zobraziť správu dňa"
@@ -9051,8 +9141,8 @@ msgstr "Digitálne podpísať a skontrolovať všetky správy"
 msgid "Creating SILC key pair..."
 msgstr "Vytvára sa pár kľúčov pre SILC..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Nebolo možné vytvoriť pár SILC kľúčov\n"
+msgid "Unable to create SILC key pair"
+msgstr "Nebolo možné vytvoriť pár SILC kľúčov"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9146,6 +9236,9 @@ msgstr "Tabuľa"
 msgid "No server statistics available"
 msgstr "Nie sú dostupné žiadne štatistiky"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Chyba počas pripájania sa na SILC server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Zlyhanie: Nezhoda verzií, aktualizujte vášho klienta"
@@ -9187,30 +9280,24 @@ msgstr "Chyba: Neplatný koláčik (cookie)"
 msgid "Failure: Authentication failed"
 msgstr "Chyba: Zlyhala autentifikácia"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "Nedá sa inicializovať spojenie s SILC klientom"
 
 msgid "John Noname"
 msgstr "Jožo Bezmena"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Nedá sa načínať pár kľúčov SILC: %s"
-
-msgid "Could not write"
-msgstr "Nepodarilo sa zapisovať"
-
-msgid "Could not connect"
-msgstr "Nepodarilo sa pripojiť"
+msgid "Unable to load SILC key pair: %s"
+msgstr "Nedá sa načítať dvojica kľúčov SILC: %s"
 
-msgid "Unknown server response."
-msgstr "Neznáma odpoveď serveru."
+msgid "Unable to create connection"
+msgstr "Nedá sa vytvoriť spojenie"
 
-msgid "Could not create listen socket"
-msgstr "Nepodarilo sa vytvoriť socket pre príjem"
+msgid "Unknown server response"
+msgstr "Neznáma odpoveď serveru"
 
-msgid "Could not resolve hostname"
-msgstr "Nebolo možné previesť názov hostiteľa na IP"
+msgid "Unable to create listen socket"
+msgstr "Nepodarilo sa vytvoriť socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Používateľské mená SIP nemôžu obsahovať čisté znaky alebo znaky @"
@@ -9234,7 +9321,7 @@ msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Modul pre protokol SIP/SIMPLE"
 
 msgid "Publish status (note: everyone may watch you)"
-msgstr "Zverejniť stav (poznámka: ktokoľvek vás môže sledovať)"
+msgstr "Zverejniť status (poznámka: ktokoľvek vás môže sledovať)"
 
 msgid "Use UDP"
 msgstr "Používať UDP"
@@ -9251,185 +9338,61 @@ msgstr "Autentifikačný používateľ"
 msgid "Auth Domain"
 msgstr "Autentifikačná doména"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Vyhľadáva sa %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Spojenie s %s zlyhalo"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Odhlásenie: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Nepodarilo sa zapísať do súboru %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Nepodarilo sa čítať zo súboru %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Správa je príliš dlhá, z konca bolo odstránených %s bajtov."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s nie je práve prihlásený."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Varovanie na %s nie je dovolené."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Správa bola zrušená, prekračujete rýchlostný limit servera"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat v %s nie je dostupný."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Používateľovi %s posielate správy príliš rýchlo."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Prišli ste o správu od používateľa %s, pretože bola príliš veľká."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Prišli ste o správu od používateľa %s, pretože bola odoslaná príliš rýchlo."
-
-#, c-format
-msgid "Failure."
-msgstr "Zlyhanie."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Príliš veľa výskytov."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Vyžaduje viac parametrov."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Služba dir je dočasne nedostupná"
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Vyhľadávanie e-mailu obmedzené."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Kľúčové slovo bolo ignorované."
-
-#, c-format
-msgid "No keywords."
-msgstr "Žiadne kľúče."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Používateľ nemá žiadne podrobnosti v adresári."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Krajina nie je podporovaná."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Neznáme zlyhanie: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Nesprávne používateľské meno alebo heslo."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Služba je dočasne nedostupná."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-"Vaša úroveň upozornenia je momentálne príliš vysoká na to, aby ste sa mohli "
-"prihlásiť."
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
-"Odhlasovali a prihlasovali ste sa príliš často.  Počkajte 10 minút a skúste "
-"to znovu.  Ak sa budete ďalej pokúšať, budete musieť čakať ešte dlhšie."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Pri prihlasovaní sa vyskytla neznáma chyba: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Vyskytla sa neznáma chyba %d.  Informácie: %s"
-
-msgid "Invalid Groupname"
-msgstr "Chybný názov skupiny"
+"join &lt;miestnosť&gt;:  Vstúpiť do chatovacej miestnosti na sieti Yahoo"
 
-msgid "Connection Closed"
-msgstr "Spojenie ukončené"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Vypísať zoznam miestností na sieti Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Čaká sa na odpoveď..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "Čmáranie: Požiadať používateľa o reláciu Čmáranie"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC sa vrátil z prestávky. Môžete znovu posielať správy."
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
 
-msgid "Password Change Successful"
-msgstr "Heslo bolo úspešne zmenené"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Modul protokolu Yahoo!"
 
-msgid "_Group:"
-msgstr "_Skupina:"
+msgid "Pager server"
+msgstr "Server záznamníku"
 
-msgid "Get Dir Info"
-msgstr "Získať informácie o priečinku"
+msgid "Pager port"
+msgstr "Port záznamníku"
 
-msgid "Set Dir Info"
-msgstr "Nastaviť informácie o priečinku"
+msgid "File transfer server"
+msgstr "Server prenosu súborov"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Nepodarilo sa otvoriť %s pre zápis!"
+msgid "File transfer port"
+msgstr "Port prenosu súborov"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Prenos súboru zlyhal; druhá strana ho asi zrušila."
+msgid "Chat room locale"
+msgstr "Jazyk chatovacej miestnosti"
 
-msgid "Could not connect for transfer."
-msgstr "Nepodarilo sa spojiť na prenos."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorovať pozvánky na konferencie a chatovacie miestnosti"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Nebolo možné zapísať hlavičku súboru. Súbor sa nebude posielať"
+msgid "Chat room list URL"
+msgstr "URL zoznamu miestností chatu"
 
-msgid "Save As..."
-msgstr "Uložiť ako..."
+msgid "Yahoo Chat server"
+msgstr "Server Yahoo chatu"
 
-#, 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] ""
-"Používateľ %s vyžaduje od používateľa %s potvrdenie %d súborov: %s (%.2f %s)%"
-"s%s"
-msgstr[1] ""
-"Používateľ %s vyžaduje od používateľa %s potvrdenie %d súboru: %s (%.2f %s)%s"
-"%s"
-msgstr[2] ""
-"Používateľ %s vyžaduje od používateľa %s potvrdenie %d súborov: %s (%.2f %s)%"
-"s%s"
+msgid "Yahoo Chat port"
+msgstr "Port Yahoo chatu"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s od vás požaduje súbor"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9441,12 +9404,11 @@ msgstr "%s od vás požaduje súbor"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Modul protokolu TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Modul protokolu Yahoo! JAPAN"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s vám poslal pozvánku na webkameru, ktorá zatiaľ nie je podporovaná."
+msgid "Your SMS was not delivered"
+msgstr "Vaša SMS nebola doručená"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaša Yahoo! správa nebola odoslaná."
@@ -9470,7 +9432,31 @@ msgstr ""
 "zoznamu."
 
 msgid "Add buddy rejected"
-msgstr "Pridanie kamaráta bolo odmietnuté"
+msgstr "Pridanie priateľa bolo odmietnuté"
+
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Prijaté neplatné dáta"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Účet zamknutý: Veľa neúspešných pokusov o prihlásenie. Prihlásenie sa na "
+"stránku Yahoo! môže odblokovať účet."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Účet sa uzamkol: Neznámy dôvod. Prihlásenie sa na stránku Yahoo! môže "
+"odblokovať účet."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Chýba používateľské meno alebo heslo"
 
 #, c-format
 msgid ""
@@ -9506,39 +9492,28 @@ msgstr ""
 "Neznáme číslo chyby %d. Prihlásenie sa na stránke Yahoo! to môže napraviť."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Nepodarilo sa pridať kamaráta %s do skupiny %s do zoznamu na serveri na účte "
+"Nepodarilo sa pridať priateľa %s do skupiny %s do zoznamu na serveri na účte "
 "%s."
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "Nepodarilo sa pridať priateľa do zoznamu na serveri"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Prehrateľné %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Zo servera bola prijatá neočakávaná HTTP odpoveď."
-
-msgid "Connection problem"
-msgstr "Problém s pripojením"
+msgid "Received unexpected HTTP response from server"
+msgstr "Zo servera bola prijatá neočakávaná HTTP odpoveď"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Prerušené pripojenie ku %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Prerušené pripojenie ku %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Nebolo možné nadviazať spojenie s %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Nepodarilo sa založiť spojenie so %s: %s"
 
 msgid "Not at Home"
 msgstr "Nie som doma"
@@ -9559,19 +9534,19 @@ msgid "Not on server list"
 msgstr "Nie je na zozname serverov"
 
 msgid "Appear Online"
-msgstr "Javí sa pripojený"
+msgstr "Vyzerať prihlásený"
 
 msgid "Appear Permanently Offline"
-msgstr "Javí sa trvale odpojený"
+msgstr "Vyzerať trvale odhlásený"
 
 msgid "Presence"
 msgstr "Prítomnosť"
 
 msgid "Appear Offline"
-msgstr "Vyzerať odpojený"
+msgstr "Vyzerať odhlásený"
 
 msgid "Don't Appear Permanently Offline"
-msgstr "Nevyzerať sa trvale odpojený"
+msgstr "Nevyzerať trvale odhlásený"
 
 msgid "Join in Chat"
 msgstr "Pripojiť sa k rozhovoru"
@@ -9585,8 +9560,8 @@ msgstr "Nastavenie prítomnosti"
 msgid "Start Doodling"
 msgstr "Začať Čmárať"
 
-msgid "Activate which ID?"
-msgstr "Aktivovať s ID?"
+msgid "Select the ID you want to activate"
+msgstr "Vyberte ID ktoré chcete aktivovať"
 
 msgid "Join whom in chat?"
 msgstr "S kým sa spojiť v chate?"
@@ -9600,74 +9575,15 @@ msgstr "Spojiť sa s používateľom v chate..."
 msgid "Open Inbox"
 msgstr "Otvoriť schránku Doručené"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join &lt;miestnosť&gt;:  Vstúpiť do chatovacej miestnosti na sieti Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Vypísať zoznam miestností na sieti Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "Čmáranie: Požiadať používateľa o reláciu Čmáranie"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Modul protokolu Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonsko"
-
-msgid "Pager server"
-msgstr "Server záznamníku"
-
-msgid "Japan Pager server"
-msgstr "Japonský server záznamníku"
-
-msgid "Pager port"
-msgstr "Port záznamníku"
-
-msgid "File transfer server"
-msgstr "Server prenosu súborov"
-
-msgid "Japan file transfer server"
-msgstr "Japonský server prenosu súborov"
-
-msgid "File transfer port"
-msgstr "Port prenosu súborov"
-
-msgid "Chat room locale"
-msgstr "Jazyk chatovacej miestnosti"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorovať pozvánky na konferencie a chatovacie miestnosti"
-
-msgid "Chat room list URL"
-msgstr "URL zoznamu miestností chatu"
-
-msgid "Yahoo Chat server"
-msgstr "Server Yahoo chatu"
-
-msgid "Yahoo Chat port"
-msgstr "Port Yahoo chatu"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Odoslať žiadosť na začatie Čmárania."
 
+msgid "Unable to connect."
+msgstr "Nepodarilo sa pripojiť."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nepodarilo sa založiť popisovač súboru."
 
@@ -9675,6 +9591,9 @@ msgstr "Nepodarilo sa založiť popisovač súboru."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Používateľ %s vám posiela skupinu %d súborov.\n"
 
+msgid "Write Error"
+msgstr "Chyba zápisu"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonsko"
 
@@ -9746,12 +9665,8 @@ msgid "The user's profile is empty."
 msgstr "Profil používateľa je prázdny."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s odmietol vaše pozvanie na konferenciu do miestnosti „%s“, pretože „%s“."
-
-msgid "Invitation Rejected"
-msgstr "Pozvanie zamietnuté"
+msgid "%s has declined to join."
+msgstr "Používateľ %s sa odmietol pridať."
 
 msgid "Failed to join chat"
 msgstr "Nepodarilo sa pripojiť na chat"
@@ -9794,22 +9709,17 @@ msgstr "Hlasy"
 msgid "Webcams"
 msgstr "Webkamery"
 
+msgid "Connection problem"
+msgstr "Problém s pripojením"
+
 msgid "Unable to fetch room list."
 msgstr "Nepodarilo sa získať zoznam miestností."
 
 msgid "User Rooms"
 msgstr "Používateľské miestnosti"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Problém počas pripojenia s YCHT serverom."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Pripojenie zo serverom je prerušené\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Problém počas pripojenia s YCHT serverom"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9941,32 +9851,21 @@ msgid "Exposure"
 msgstr "Expozícia"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Nepodarilo sa vytvoriť socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Nepodarilo sa spracovať odpoveď od HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Nepodarilo sa spracovať odpoveď od HTTP proxy: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Chyba pripojenia HTTP proxy %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Prístup zamietnutý: HTTP proxy server neumožňuje tunelovanie portu %d."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "Prístup zamietnutý: HTTP proxy server neumožňuje tunelovanie portu %d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Chyba pri prevode %s"
 
-msgid "Could not resolve host name"
-msgstr "Nepodarilo sa previesť názov hostiteľa"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Poprosili ste o pozornosť používateľa %s..."
@@ -9997,7 +9896,7 @@ msgid "I'm not here right now"
 msgstr "Momentálne nie som prítomný"
 
 msgid "saved statuses"
-msgstr "uložené stavy"
+msgstr "uložené statusy"
 
 #, c-format
 msgid "%s is now known as %s.\n"
@@ -10053,15 +9952,12 @@ msgstr "Nerušiť"
 msgid "Extended away"
 msgstr "Dlhšie neprítomný"
 
-msgid "Mobile"
-msgstr "Mobilný"
-
 msgid "Listening to music"
 msgstr "Počúva hudbu"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "Používateľ %s (%s) zmenil stav z %s na %s"
+msgstr "Používateľ %s (%s) zmenil status z %s na %s"
 
 #, c-format
 msgid "%s (%s) is now %s"
@@ -10097,18 +9993,6 @@ msgstr "+++ Používateľ %s prestal byť nečinný"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Chyba počas čítania %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Počas načítavania vášho %s sa vyskytla chyba. Zoznam nebol načítaný a starý "
-"súbor bol premenovaný na %s~."
-
 msgid "Calculating..."
 msgstr "Počíta sa..."
 
@@ -10222,6 +10106,18 @@ msgstr "Pripojenie odmietnuté."
 msgid "Address already in use."
 msgstr "Adresu už používa niekto iný"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Chyba počas čítania %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Počas načítavania vášho %s sa vyskytla chyba. Súbor nebol načítaný a starý "
+"súbor bol premenovaný na %s~."
+
 msgid "Internet Messenger"
 msgstr "Internetový komunikátor"
 
@@ -10265,10 +10161,8 @@ msgstr "Upozornenia na nové správy"
 msgid "Use this buddy _icon for this account:"
 msgstr "Používať túto ikonu priateľa pre účet:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Možnosti %s"
+msgid "Ad_vanced"
+msgstr "_Pokročilé"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Použiť nastavenie proxy prostredia Gnome"
@@ -10303,9 +10197,6 @@ msgstr "Ak sa pozriete úplne zblízka"
 msgid "you can see the butterflies mating"
 msgstr "uvidíte ako sa motýle pária"
 
-msgid "Proxy Options"
-msgstr "Možnosti proxy"
-
 msgid "Proxy _type:"
 msgstr "_Typ proxy:"
 
@@ -10333,8 +10224,8 @@ msgstr "_Základné"
 msgid "Create _this new account on the server"
 msgstr "Vytvoriť _takýto účet na serveri"
 
-msgid "_Advanced"
-msgstr "_Pokročilé"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Povolený"
@@ -10386,8 +10277,8 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Prosím, aktualizujte potrebné políčka."
 
-msgid "Room _List"
-msgstr "_Zoznam miestností"
+msgid "A_ccount"
+msgstr "Úče_t"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10396,8 +10287,8 @@ msgstr ""
 "Prosím, zadajte zodpovedajúce informácie o chate, ku ktorému sa chcete "
 "pripojiť.\n"
 
-msgid "_Account:"
-msgstr "_Účet:"
+msgid "Room _List"
+msgstr "_Zoznam miestností"
 
 msgid "_Block"
 msgstr "_Blokovať"
@@ -10414,6 +10305,15 @@ msgstr "Zobraziť podrobnosti"
 msgid "I_M"
 msgstr "I_M"
 
+msgid "_Audio Call"
+msgstr "_Hlasový hovor"
+
+msgid "Audio/_Video Call"
+msgstr "fHlasový/_Videohovor"
+
+msgid "_Video Call"
+msgstr "_Videohovor"
+
 msgid "_Send File..."
 msgstr "Poslať _súbor..."
 
@@ -10423,8 +10323,11 @@ msgstr "Pridať sledovanie _priateľa..."
 msgid "View _Log"
 msgstr "Zobraziť _záznam"
 
-msgid "Hide when offline"
-msgstr "Skryť v odpojenom stave"
+msgid "Hide When Offline"
+msgstr "Skryť ak neprihlásený"
+
+msgid "Show When Offline"
+msgstr "Zobraziť ak neprihlásený"
 
 msgid "_Alias..."
 msgstr "_Prezývka..."
@@ -10504,7 +10407,7 @@ msgid "/Buddies/Sh_ow"
 msgstr "/Priatelia/Z_obraziť"
 
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Priatelia/Zobraziť/_Odpojených priateľov"
+msgstr "/Priatelia/Zobraziť/_Odhlásených priateľov"
 
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Priatelia/Zobraziť/_Prázdne skupiny"
@@ -10550,6 +10453,9 @@ msgstr "/Nástroje/_Sledovanie priateľov"
 msgid "/Tools/_Certificates"
 msgstr "/Nástroje/_Certifikáty"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Nástroje/_Vlastní smajlíci"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Nástroje/_Moduly"
 
@@ -10559,9 +10465,6 @@ msgstr "/Nástroje/_Nastavenia"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Nástroje/_Súkromie"
 
-msgid "/Tools/Smile_y"
-msgstr "/Nástroje/_Smajlík"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Nástroje/_Prenosy súborov"
 
@@ -10678,10 +10581,10 @@ msgid "Manually"
 msgstr "Ručne"
 
 msgid "By status"
-msgstr "Podľa stavu"
+msgstr "Podľa statusu"
 
-msgid "By log size"
-msgstr "Podľa veľkosti záznamu"
+msgid "By recent log activity"
+msgstr "Podľa aktivity záznamu"
 
 #, c-format
 msgid "%s disconnected"
@@ -10697,6 +10600,9 @@ msgstr "Pripojiť"
 msgid "Re-enable"
 msgstr "Povoliť účet"
 
+msgid "SSL FAQs"
+msgstr "SSL časté otázky"
+
 msgid "Welcome back!"
 msgstr "Vitajte späť!"
 
@@ -10733,14 +10639,14 @@ msgstr ""
 "\n"
 "Zatiaľ nemáte zapnuté žiadne IM účty. Zapnete ich v okne <b>Účty</b> ktoré "
 "nájdete v ponuke <b>Účty->Spravovať účty</b>. Keď aktivujete váš účet, "
-"budete sa môcť prihlásiť, zmeniť svoj stav a písať si so svojimi priateľmi."
+"budete sa môcť prihlásiť, zmeniť svoj status a písať si so svojimi priateľmi."
 
 # SPRAVNE
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Priatelia/Zobraziť/Odpojených priateľov"
+msgstr "/Priatelia/Zobraziť/Odhlásených priateľov"
 
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Priatelia/Zobraziť/Prázdne skupiny"
@@ -10764,7 +10670,7 @@ msgid "(Optional) A_lias:"
 msgstr "(Voliteľné) _Prezývka:"
 
 msgid "Add buddy to _group:"
-msgstr "Pridať priateľa do sk_upiny?"
+msgstr "Pridať priateľa do sk_upiny:"
 
 msgid "This protocol does not support chat rooms."
 msgstr "Tento protokol nepodporuje miestnosti chatu."
@@ -10772,7 +10678,7 @@ msgstr "Tento protokol nepodporuje miestnosti chatu."
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "Momentálne nie ste pripojený na protokole, ktorý by podporoval chat."
+msgstr "Momentálne nie ste prihlásený na protokole, ktorý by podporoval chat."
 
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
@@ -10784,6 +10690,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "P_rezývka:"
 
+msgid "_Group:"
+msgstr "_Skupina:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Znovu_pripojiť keď sa prihlásite."
 
@@ -10817,6 +10726,102 @@ msgstr "/Nástroje"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Priatelia/Zoradiť priateľov"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Farba pozadia"
+
+msgid "The background color for the buddy list"
+msgstr "Farba pozadia pre zoznam priateľov"
+
+msgid "Layout"
+msgstr "Rozloženie"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Rozloženie ikon, názvu a statusu zoznamu priateľov"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Farba pozadia rozbalenia"
+
+msgid "The background color of an expanded group"
+msgstr "Farba pozadia rozbalenej skupiny"
+
+msgid "Expanded Text"
+msgstr "Rozbalený text"
+
+msgid "The text information for when a group is expanded"
+msgstr "Textová informácia ak je skupina rozbalená"
+
+msgid "Collapsed Background Color"
+msgstr "Farba pozadia nerozbalenia"
+
+msgid "The background color of a collapsed group"
+msgstr "Farba pozadia nerozbalenej skupiny"
+
+msgid "Collapsed Text"
+msgstr "Nerozbalený text"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Textová informácia ak je skupina nerozbalená"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Farba pozadia kontaktu a chatu"
+
+msgid "The background color of a contact or chat"
+msgstr "Farba pozadia kontaktu alebo chatu"
+
+msgid "Contact Text"
+msgstr "Text kontaktu"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Textová informácia ak je kontakt rozbalený"
+
+msgid "On-line Text"
+msgstr "Text pripojenia"
+
+msgid "The text information for when a buddy is online"
+msgstr "Textová informácia ak je priateľ prihlásený"
+
+msgid "Away Text"
+msgstr "Text neprítomnosti"
+
+msgid "The text information for when a buddy is away"
+msgstr "Textová informácia ak je priateľ neprítomný"
+
+msgid "Off-line Text"
+msgstr "Text odpojenia"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Textová informácia ak je priateľ odpojený"
+
+msgid "Idle Text"
+msgstr "Text nečinnosti"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Textová informácia ak je priateľ nečinný"
+
+msgid "Message Text"
+msgstr "Text správy"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Textová informácia ak má priateľ neprečítanú správu"
+
+msgid "Message (Nick Said) Text"
+msgstr "Text správy (s nickom)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"Textová informácia ak chat obsahuje neprečítanú správu s vašou prezývkou"
+
+msgid "The text information for a buddy's status"
+msgstr "Textová informácia pre status priateľa"
+
+msgid "Type the host name for this certificate."
+msgstr "Zadajte názov hostiteľa, ktorému je určený tento certifikát."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL servery"
@@ -10835,14 +10840,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Pozvať priateľa do miestnosti chatu"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Zadajte, prosím, meno používateľa, ktorého chcete pozvať, spolu s nepovinnou "
-"pozývacou správou."
-
 msgid "_Buddy:"
 msgstr "_Priateľ:"
 
@@ -10871,7 +10868,7 @@ msgstr "Ignorovať"
 msgid "Get Away Message"
 msgstr "Získať správu o neprítomnosti"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Naposledy povedal"
 
 msgid "Unable to save icon file to disk."
@@ -10917,6 +10914,18 @@ msgstr "/Rozhovor/_Uložiť ako..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Rozhovor/Vymazať"
 
+msgid "/Conversation/M_edia"
+msgstr "/Rozhovor/Mé_diá"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Rozhovor/Médiá/_Hlasový hovor"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Rozhovor/Médiá/_Videohovor"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Rozhovor/Médiá/Hlasový\\/_Videohovor"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Rozhovor/Odos_lať súbor..."
 
@@ -10989,6 +10998,15 @@ msgstr "/Rozhovor"
 msgid "/Conversation/View Log"
 msgstr "/Rozhovor/Zobraziť _záznam"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Rozhovor/Médiá/Hlasový hovor"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Rozhovor/Médiá/Videohovor"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Rozhovor/Médiá/Hlasový\\/Videohovor"
+
 msgid "/Conversation/Send File..."
 msgstr "/Rozhovor/Odos_lať súbor..."
 
@@ -11172,6 +11190,9 @@ msgstr "umelec"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr "hlas a video"
+
 msgid "support"
 msgstr "podpora"
 
@@ -11296,6 +11317,9 @@ msgstr "hindčina"
 msgid "Hungarian"
 msgstr "maďarčina"
 
+msgid "Armenian"
+msgstr "arménčina"
+
 msgid "Indonesian"
 msgstr "indonézština"
 
@@ -11311,6 +11335,9 @@ msgstr "gruzínčina"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu gruzínski prekladatelia"
 
+msgid "Khmer"
+msgstr "kmérčina"
+
 msgid "Kannada"
 msgstr "kannadčina"
 
@@ -11389,6 +11416,9 @@ msgstr "sinhalčina"
 msgid "Swedish"
 msgstr "švédčina"
 
+msgid "Swahili"
+msgstr "svahilčina"
+
 msgid "Tamil"
 msgstr "tamilčina"
 
@@ -11612,7 +11642,7 @@ msgstr ""
 "Ďalšie neprečítané správy zobrazíte kliknutím pravým tlačidlom myši...\n"
 
 msgid "_Change Status"
-msgstr "_Zmeniť stav"
+msgstr "_Zmeniť status"
 
 msgid "Show Buddy _List"
 msgstr "Zobraziť z_oznam priateľov"
@@ -11699,14 +11729,6 @@ msgstr "_Vymazať dokončené prenosy"
 msgid "File transfer _details"
 msgstr "_Detaily o prenose súboru"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Pozastaviť"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Pokračovať"
-
 msgid "Paste as Plain _Text"
 msgstr "_Vložiť ako čistý text"
 
@@ -11725,8 +11747,8 @@ msgstr "Farba na vykreslenie odkazov."
 msgid "Hyperlink visited color"
 msgstr "Farba navštíveného odkazu"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
-msgstr "Farba na vykreslenie odkazu ktorý bol navštívený alebo aktivovaný."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr "Farba na vykreslenie odkazu ktorý bol navštívený (alebo aktivovaný)."
 
 msgid "Hyperlink prelight color"
 msgstr "Farba podsvieteného odkazu"
@@ -11761,13 +11783,19 @@ msgstr "Farba ktorou zobraziť názov správy akcie."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Farba názvu správy akcie pre šepkanú správu"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Farba ktorou zobraziť názov zašepkanej správy akcie."
+
 msgid "Whisper Message Name Color"
 msgstr "Farba názvu šepkanej správy"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Farba ktorou zobraziť názov zašepkanej správy."
+
 msgid "Typing notification color"
-msgstr "Odstránenie upozornenia"
+msgstr "Farba upozornenia na písanie"
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr "Farba, ktorú použiť pre upozornenie na písanie"
 
 msgid "Typing notification font"
@@ -11779,15 +11807,6 @@ msgstr "Písmo, ktoré použiť pre upozornenie na písanie"
 msgid "Enable typing notification"
 msgstr "Zapnúť upozornenie na písanie"
 
-msgid "_Copy Email Address"
-msgstr "_Kopírovať e-mailovu adresu"
-
-msgid "_Open Link in Browser"
-msgstr "_Otvoriť odkaz v prehliadači"
-
-msgid "_Copy Link Location"
-msgstr "_Kopírovať adresu odkazu"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11829,11 +11848,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Uložiť obrázok"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Uložiť obrázok..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Pridať vlastného smajlíka..."
 
@@ -11921,9 +11938,6 @@ msgstr "Zmenšiť veľkosť písma"
 msgid "Font Face"
 msgstr "Rez písma"
 
-msgid "Background Color"
-msgstr "Farba pozadia"
-
 msgid "Foreground Color"
 msgstr "Farba popredia"
 
@@ -12037,6 +12051,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12051,8 +12066,9 @@ msgstr ""
 "\n"
 "  -c, --config=ADR    pre konfiguračné súbory použije ADR\n"
 "  -d, --debug         vkladá ladiace informácie do stdout\n"
+"  -f, --force-online  vynútiť prihlásenie bez ohľadu na stav siete\n"
 "  -h, --help          zobrazí túto pomoc a skončí\n"
-"  -m, --multiple      umožní viac ako jeden spustený program\n"
+"  -m, --multiple      nevynútiť jeden bežiaci program\n"
 "  -n, --nologin       neprihlasovať automaticky\n"
 "  -l, --login[=MENO]  povoliť vybrané účty (voliteľný argument MENO\n"
 "                      určuje účty, oddeľované čiarkami.\n"
@@ -12067,6 +12083,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12080,6 +12097,7 @@ msgstr ""
 "\n"
 "  -c, --config=ADR    pre konfiguračné súbory použije ADR\n"
 "  -d, --debug         vkladá ladiace informácie do stdout\n"
+"  -f, --force-online  vynútiť prihlásenie bez ohľadu na stav siete\n"
 "  -h, --help          zobrazí túto pomoc a skončí\n"
 "  -m, --multiple      umožní viac ako jeden spustený program\n"
 "  -n, --nologin       neprihlasovať automaticky\n"
@@ -12125,11 +12143,22 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Je spustený iný klient libpurple, ukončuje sa.\n"
 
-msgid "Open All Messages"
-msgstr "Otvoriť všetky správy"
+msgid "/_Media"
+msgstr "/_Médiá"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>"
+msgid "/Media/_Hangup"
+msgstr "/Médiá/_Zložiť"
+
+msgid "Calling..."
+msgstr "Volá sa..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s si želá s vami založiť video/zvukové sedenie."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s si želá s vami založiť video sedenie."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12160,6 +12189,24 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Vybrali ste možnosť „Ručne“, ale nenastavili ste príkaz prehliadača."
 
+msgid "No message"
+msgstr "Žiadna správa"
+
+msgid "Open All Messages"
+msgstr "Otvoriť všetky správy"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>"
+
+msgid "New Pounces"
+msgstr "Nové sledovania"
+
+msgid "Dismiss"
+msgstr "Odvolať"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Vysledovali ste!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Nasledujúce moduly budú zastavené."
 
@@ -12206,10 +12253,16 @@ msgstr "<b>Podrobnosti o module</b>"
 msgid "Select a file"
 msgstr "Vyberte súbor"
 
+msgid "Modify Buddy Pounce"
+msgstr "Upraviť sledovanie priateľa"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Koho sledovať"
 
+msgid "_Account:"
+msgstr "_Účet:"
+
 msgid "_Buddy name:"
 msgstr "_Meno priateľa:"
 
@@ -12276,8 +12329,58 @@ msgstr "_Opakujúce sa"
 msgid "Pounce Target"
 msgstr "Cieľ sledovania"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Nepodarilo sa rozbaliť tému smajlíkov."
+#, c-format
+msgid "Started typing"
+msgstr "Začal písať"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Preruší písanie"
+
+#, c-format
+msgid "Signed on"
+msgstr "Prihlásil sa"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Prestane byť nečinný"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Prestane byť neprítomný"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Prestal písať"
+
+#, c-format
+msgid "Signed off"
+msgstr "Odhlásil sa"
+
+#, c-format
+msgid "Became idle"
+msgstr "Stane sa nečinný"
+
+#, c-format
+msgid "Went away"
+msgstr "Stane sa neprítomný"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Odoslal správu"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Neznáme... Oznámte to, prosím!"
+
+msgid "Theme failed to unpack."
+msgstr "Nepodarilo sa rozbaliť tému."
+
+msgid "Theme failed to load."
+msgstr "Nepodarilo sa načítať tému."
+
+msgid "Theme failed to copy."
+msgstr "Nepodarilo sa skopírovať tému."
 
 msgid "Install Theme"
 msgstr "Inštalovať tému"
@@ -12299,6 +12402,11 @@ msgstr "Klávesové skratky"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Z_avrieť rozhovory klávesom Esc"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Téma zoznamu priateľov"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ikona v oznamovacej oblasti"
 
@@ -12308,8 +12416,8 @@ msgstr "_Zobraziť ikonu v oznamovacej oblasti:"
 msgid "On unread messages"
 msgstr "Pri neprečítaných správach"
 
-msgid "Conversation Window Hiding"
-msgstr "Skrývanie okna rozhovoru"
+msgid "Conversation Window"
+msgstr "Okno rozhovoru"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Skrývať nové rozhovory:"
@@ -12317,6 +12425,9 @@ msgstr "_Skrývať nové rozhovory:"
 msgid "When away"
 msgstr "Pri neprítomnosti"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimali_zovať nové rozhovory"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Karty"
@@ -12375,9 +12486,6 @@ msgstr "Používať hladké posúvanie"
 msgid "F_lash window when IMs are received"
 msgstr "Blikanie okna po prijatí správy"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimali_zovať nové rozhovory"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimálna výška textového poľa v riadkoch:"
 
@@ -12409,14 +12517,12 @@ msgstr "Nebolo možné spustiť program na nastavenie proxy."
 msgid "Cannot start browser configuration program."
 msgstr "Nebolo možné spustiť program na nastavenie prehliadača."
 
-msgid "ST_UN server:"
-msgstr "ST_UN server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Príklad: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Automaticky zistiť IP adresu"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Použiť _automaticky zistenú IP adresu: %s"
 
 msgid "Public _IP:"
 msgstr "Verejná _IP adresa:"
@@ -12436,6 +12542,10 @@ msgstr "_Počiatočný port:"
 msgid "_End port:"
 msgstr "_Koncový port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Relay Server (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy server a prehliadač"
 
@@ -12543,7 +12653,7 @@ msgid "Log all c_hats"
 msgstr "Zaznamenávať všetky c_haty"
 
 msgid "Log all _status changes to system log"
-msgstr "Zaznamenávať do systémového záznamu všetky zmeny _stavu"
+msgstr "Zaznamenávať do systémového záznamu všetky zmeny _statusu"
 
 msgid "Sound Selection"
 msgstr "Výber zvuku"
@@ -12626,24 +12736,24 @@ msgstr "Pri neprítomnosti a nečinnosti"
 msgid "Auto-away"
 msgstr "Automatická neprítomnosť"
 
-msgid "Change status when _idle"
-msgstr "Zmeniť stav pri _nečinnosti"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Počet minút pred nečinnosťou:"
 
+msgid "Change status when _idle"
+msgstr "Zmeniť status pri _nečinnosti"
+
 msgid "Change _status to:"
-msgstr "Zmeniť _stav na:"
+msgstr "Zmeniť _status na:"
 
 #. Signon status stuff
 msgid "Status at Startup"
-msgstr "Stav pri spustení"
+msgstr "Status pri spustení"
 
 msgid "Use status from last _exit at startup"
-msgstr "Po spustení použiť stav ako pred odhlásením"
+msgstr "Po spustení použiť status ako pred odhlásením"
 
 msgid "Status to a_pply at startup:"
-msgstr "Po spustení použiť stav:"
+msgstr "Po spustení použiť status:"
 
 msgid "Interface"
 msgstr "Rozhranie"
@@ -12655,7 +12765,7 @@ msgid "Browser"
 msgstr "Prehliadač"
 
 msgid "Status / Idle"
-msgstr "Stav / nečinný"
+msgstr "Status / nečinný"
 
 msgid "Allow all users to contact me"
 msgstr "Povoliť všetkým používateľom kontaktovať ma"
@@ -12750,7 +12860,7 @@ msgid "_Add Chat"
 msgstr "Pridať chat"
 
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Naozaj chcete odstrániť tieto uložené stavy?"
+msgstr "Naozaj chcete odstrániť tieto uložené statusy?"
 
 #. Use button
 msgid "_Use"
@@ -12766,11 +12876,11 @@ msgid "_Title:"
 msgstr "_Titulok:"
 
 msgid "_Status:"
-msgstr "_Stav:"
+msgstr "_Status:"
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr "Pre niektoré účty používať odlišný stav"
+msgstr "Pre niektoré účty používať odlišný status"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
@@ -12778,48 +12888,44 @@ msgstr "Ul_ožiť a Použiť"
 
 #, c-format
 msgid "Status for %s"
-msgstr "Stav pre %s"
+msgstr "Status pre %s"
+
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr "Vlastný smajlík pre '%s' už existuje. Prosím vyberte inú skratku."
 
 msgid "Custom Smiley"
 msgstr "Vlastný smajlík"
 
-msgid "More Data needed"
-msgstr "Je treba viac dát"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Zadajte, prosím, skratku pre tohoto smajlíka."
-
 msgid "Duplicate Shortcut"
 msgstr "Duplicitná skratka"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Vlastný smajlík pre vybranú skratku už existuje. Prosím vyberte inú skratku."
-
-msgid "Please select an image for the smiley."
-msgstr "Prosím, vyberte obrázok pre smajlíka."
-
 msgid "Edit Smiley"
 msgstr "Upraviť smajlíka"
 
 msgid "Add Smiley"
 msgstr "Pridať smajlíka"
 
-msgid "Smiley _Image"
-msgstr "_Obrázok smajlíka"
+msgid "_Image:"
+msgstr "O_brázok:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "S_kratka smajlíka"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "Text o_dkazu:"
 
 msgid "Smiley"
 msgstr "Smajlík"
 
+msgid "Shortcut Text"
+msgstr "Text odkazu"
+
 msgid "Custom Smiley Manager"
 msgstr "Správca vlastných smajlíkov"
 
+msgid "Select Buddy Icon"
+msgstr "Vybrať ikonu priateľa"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Kliknutím zmeníte vašu ikonu pre tento účet."
 
@@ -12830,13 +12936,13 @@ msgid "Waiting for network connection"
 msgstr "Čaká sa na sieťové pripojenie"
 
 msgid "New status..."
-msgstr "Nový stav..."
+msgstr "Nový status..."
 
 msgid "Saved statuses..."
-msgstr "Uložené stavy..."
+msgstr "Uložené statusy..."
 
 msgid "Status Selector"
-msgstr "Prepínač stavu"
+msgstr "Prepínač statusu"
 
 msgid "Google Talk"
 msgstr "Google Talk"
@@ -12905,11 +13011,11 @@ msgid "Cannot send launcher"
 msgstr "Nepodarilo sa odoslať spúšťač"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
-"Vložili ste spúšťač. Pravdepodobne ste chceli odoslať súbor, na ktorý tento "
-"spúšťač odkazuje, namiesto samotného spúšťača."
+"Vložili ste spúšťač. Pravdepodobne ste chceli namiesto samotného spúšťača "
+"odoslať súbor, na ktorý tento spúšťač odkazuje."
 
 #, c-format
 msgid ""
@@ -12942,9 +13048,30 @@ msgstr ""
 "Nepodarilo sa načítať obrázok „%s“: dôvod je neznámy, pravdepodobne je "
 "poškodený súbor"
 
+msgid "_Open Link"
+msgstr "_Otvoriť odkaz"
+
+msgid "_Copy Link Location"
+msgstr "_Kopírovať adresu odkazu"
+
+msgid "_Copy Email Address"
+msgstr "_Kopírovať e-mailovu adresu"
+
+msgid "_Open File"
+msgstr "_Otvoriť súbor"
+
+msgid "Open _Containing Directory"
+msgstr "O_tvoriť priečinok so súborom"
+
 msgid "Save File"
 msgstr "Uložiť súbor"
 
+msgid "_Play Sound"
+msgstr "_Prehrať zvuk"
+
+msgid "_Save File"
+msgstr "_Uložiť súbor"
+
 msgid "Select color"
 msgstr "Vyberte farbu"
 
@@ -12969,6 +13096,9 @@ msgstr "_Pridať..."
 msgid "_Open Mail"
 msgstr "_Otvoriť poštu"
 
+msgid "_Pause"
+msgstr "_Pozastaviť"
+
 msgid "_Edit"
 msgstr "_Upraviť"
 
@@ -13032,6 +13162,66 @@ msgstr "Modul predpovedania dostupnosti kontaktu."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Zobrazuje štatistické informácie o prítomnosti vašich priateľov"
 
+msgid "Server name request"
+msgstr "Požiadavka na meno serveru"
+
+msgid "Enter an XMPP Server"
+msgstr "Zadajte XMPP server"
+
+msgid "Select an XMPP server to query"
+msgstr "Vyberte XMPP server, ktorý kontaktovať"
+
+msgid "Find Services"
+msgstr "Nájsť služby"
+
+msgid "Add to Buddy List"
+msgstr "Pridať do zoznamu priateľov"
+
+msgid "Gateway"
+msgstr "Brána"
+
+msgid "Directory"
+msgstr "Priečinok"
+
+msgid "PubSub Collection"
+msgstr "PubSub kolekcia"
+
+msgid "PubSub Leaf"
+msgstr "PubSub list"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Popis:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Prieskum služieb"
+
+msgid "_Browse"
+msgstr "_Prehliadať"
+
+msgid "Server does not exist"
+msgstr "Server neexistuje"
+
+msgid "Server does not support service discovery"
+msgstr "Server nepodporuje prieskum služieb"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP prieskum služieb"
+
+msgid "Allows browsing and registering services."
+msgstr "Umožňuje prehliadanie a registráciu služieb."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Tento modul je užitočný na registráciu do starších transportov alebo iných "
+"XMPP služieb."
+
 msgid "Buddy is idle"
 msgstr "Priateľ je nečinný"
 
@@ -13078,15 +13268,15 @@ msgstr "Priorita kontaktu"
 #. *< summary
 msgid ""
 "Allows for controlling the values associated with different buddy states."
-msgstr "Umožnuje kontrolu hodnôt spojených s rôznymi stavmi kamarátov."
+msgstr "Umožnuje kontrolu hodnôt spojených s rôznymi statusmi priateľov."
 
 #. *< description
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Povoľuje zmeny stavov, nečinný/preč/odpojený, podľa dôležitosti kamarátov v "
-"zozname."
+"Povoľuje zmeny statusov, nečinný/neprítomný/neprihlásený, podľa dôležitosti "
+"priateľov v zozname."
 
 msgid "Conversation Colors"
 msgstr "Farby rozhovoru"
@@ -13423,7 +13613,7 @@ msgstr "Modul Music Messaging na spoluprácu pri komponovaní."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Modul Music Messaging umožňuje viacerým používateľom súčastne pracovať na "
 "hudobnom diele tak, že upravujú spoločnú partitúru v reálnom čase."
@@ -13535,12 +13725,6 @@ msgstr ""
 "- Prevracia každý prichádzajúci text\n"
 "- Posiela správu ľuďom z vášho zoznamu, akonáhle sa prihlasia"
 
-msgid "Cursor Color"
-msgstr "Farba kurzoru"
-
-msgid "Secondary Cursor Color"
-msgstr "Druhotná farba kurzoru"
-
 msgid "Hyperlink Color"
 msgstr "Farba odkazu"
 
@@ -13550,6 +13734,9 @@ msgstr "Farba navštíveného odkazu"
 msgid "Highlighted Message Name Color"
 msgstr "Farba zvýraznenia mena v správe"
 
+msgid "Typing Notification Color"
+msgstr "Farba upozornenia na písanie"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Vodorovná medzera v GtkTreeView"
 
@@ -13579,35 +13766,21 @@ msgstr "Písmo rozhrania GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Textová téma odkazov GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Farby rozhrania"
+msgid "Disable Typing Notification Text"
+msgstr "Vypnúť text upozornenia na písanie"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Nastavenia témy GTK+ programu Pidgin"
 
-msgid "Widget Sizes"
-msgstr "Veľkosť ovládacích prvkov"
+msgid "Colors"
+msgstr "Farby"
 
 msgid "Fonts"
 msgstr "Písma"
 
+msgid "Miscellaneous"
+msgstr "Rôzne"
+
 msgid "Gtkrc File Tools"
 msgstr "Nástroje súboru Gtkrc"
 
@@ -13693,10 +13866,10 @@ msgstr "Tlačidlo odoslať v okne rozhovoru."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
-"Pridá tlačidlo odoslať do textového poľa v okne rozhovoru. Užitočné ak "
-"súčasťou počítača nie je klávesnica."
+"V okne rozhovoru pridá do textového poľa tlačidlo odoslať. Určené pre "
+"použitie na počítačoch bez klávesnice."
 
 msgid "Duplicate Correction"
 msgstr "Duplicitná oprava"
@@ -13750,6 +13923,98 @@ msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Nahradzuje text v odosielaných správach podľa používateľom určených pravidiel"
 
+msgid "Just logged in"
+msgstr "Práve prihlásený"
+
+msgid "Just logged out"
+msgstr "Práve odhlásený"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Ikona pre kontakt/\n"
+"Ikona pre neznámu osobu"
+
+msgid "Icon for Chat"
+msgstr "Ikona pre chat"
+
+msgid "Ignored"
+msgstr "Ignorované"
+
+msgid "Founder"
+msgstr "Zakladateľ"
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "Operátor"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr "Polooperátor"
+
+msgid "Authorization dialog"
+msgstr "Dialóg autorizácie"
+
+msgid "Error dialog"
+msgstr "Chybový dialóg"
+
+msgid "Information dialog"
+msgstr "Informačný dialóg"
+
+msgid "Mail dialog"
+msgstr "Dialóg pošty"
+
+msgid "Question dialog"
+msgstr "Dialóg otázky"
+
+msgid "Warning dialog"
+msgstr "Dialóg upozornenia"
+
+msgid "What kind of dialog is this?"
+msgstr "Toto je aký druh dialógu?"
+
+msgid "Status Icons"
+msgstr "Ikony statusu"
+
+msgid "Chatroom Emblems"
+msgstr "Emblémy chatovacej miestnosti"
+
+msgid "Dialog Icons"
+msgstr "Ikony dialógu"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Editor témy ikon programu Pidgin"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Editor témy zoznamu priateľov programu Pidgin"
+
+msgid "Edit Buddylist Theme"
+msgstr "Upraviť tému zoznamu priateľov"
+
+msgid "Edit Icon Theme"
+msgstr "Upraviť tému ikon"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Editor témy programu Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Editor témy programu Pidgin."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13918,7 +14183,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Špecifické možnosti programu Pidgin pre Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Poskytuje možnosti špecifické pre Pidgin pre Windows, napríklad ukotvovanie "
 "zoznamu priateľov."
@@ -13939,7 +14204,7 @@ msgid "Account: "
 msgstr "Účet: "
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr "<font color='#777777'>Nepripojený ku XMPP</font>"
+msgstr "<font color='#777777'>Neprihlásený ku XMPP</font>"
 
 msgid "Insert an <iq/> stanza."
 msgstr "Vložiť <iq/> slohu."
@@ -13960,6 +14225,522 @@ msgstr "Odosielanie a prijímanie nespracovaných XMPP slôh."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 
+#~ msgid "_Resume"
+#~ msgstr "_Pokračovať"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Nepodarilo sa otvoriť socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Nepodarilo sa spustiť čakanie na sockete"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Nebolo možné čítať soket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Pripojenie zlyhalo."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server bol odpojený"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Nepodarilo sa vytvoriť socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Nepodarilo sa pripojiť ku hostiteľovi"
+
+#~ msgid "Read error"
+#~ msgstr "Chyba čítania"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nepodarilo sa založiť spojenie so serverom:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Chyba zápisu"
+
+#~ msgid "Last Activity"
+#~ msgstr "Posledná aktivita"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Položky prieskumu služieb"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Rozšírené adresovanie slôh"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Skupinový chat"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Rozšírené informácie o prítomnosti v skupinovom chate"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band bitové toky"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Príkaz Ad-Hoc"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 bitové toky"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Mimo skupinových dát"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "In-Band Registrácia"
+
+#~ msgid "User Location"
+#~ msgstr "Lokalita"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar používateľa"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Upozornenie na status v chate"
+
+#~ msgid "Software Version"
+#~ msgstr "Verzia softvéru"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Iniciácia toku"
+
+#~ msgid "User Mood"
+#~ msgstr "Nálada používateľa"
+
+#~ msgid "User Activity"
+#~ msgstr "Aktivita používateľa"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Schopnosti"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Požadovanie šifrovaného spojenia"
+
+#~ msgid "User Tune"
+#~ msgstr "Používateľ Tune"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Výmena kontaktov"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Dostupná adresa"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil používateľa"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Zvuk Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Prezývka používateľa"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Príjem správ"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Zverejnenie verejného kľúča"
+
+#~ msgid "User Chatting"
+#~ msgstr "Používateľ chatuje"
+
+#~ msgid "User Browsing"
+#~ msgstr "Používateľ surfuje"
+
+#~ msgid "User Gaming"
+#~ msgstr "Používateľ hrá"
+
+#~ msgid "User Viewing"
+#~ msgstr "Používateľ prezerá"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Šifrovanie slôh"
+
+#~ msgid "Entity Time"
+#~ msgstr "Čas entity"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Odložené doručenie"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Spolupracujúce dátové objekty"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Ukladanie a zdieľanie súborov"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Objavenie STUN služieb pre Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Požadovanie zjednodušeného šifrovaného spojenia"
+
+#~ msgid "Hop Check"
+#~ msgstr "Kontrola skoku"
+
+#~ msgid "Read Error"
+#~ msgstr "Chyba čítania"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Nepodarilo sa spojiť so serverom."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Zásobník čítania plný (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Nespracovateľná správa"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Nebolo možné sa pripojiť ku hostiteľovi: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Prihlásenie zlyhalo (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Nepodarilo sa pripojiť na server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Boli ste odhlásený, pretože ste sa prihlásili na inej pracovnej stanici."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Chyba. SSL podpora nie je nainštalovaná."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nepodarilo sa pripojiť na BOS server:\n"
+#~ "%s"
+
+#~ msgid "Invalid username."
+#~ msgstr "Nesprávne používateľské meno."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Nesprávne heslo."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Nepodarilo sa pripojiť"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Zakrátko môžete byť odpojený. Skontrolujte aktualizácie na %s."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Nedá sa dešifrovať odpoveď serveru"
+
+#~ msgid "Connection lost"
+#~ msgstr "Pripojenie bolo prerušené"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Nebolo možné preložiť názov hostiteľa"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Pripojenie uzavreté (zapisuje sa)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Obnovenie spojenia"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Chyba čítania zo soketu: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Nepodarilo sa pripojiť ku hostiteľovi"
+
+#~ msgid "Could not write"
+#~ msgstr "Nepodarilo sa zapisovať"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nepodarilo sa pripojiť"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Nepodarilo sa vytvoriť socket pre príjem"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Nebolo možné previesť názov hostiteľa na IP"
+
+#~ msgid "Incorrect Password"
+#~ msgstr "Nesprávne heslo"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nebolo možné nadviazať spojenie s %s:\n"
+#~ "%s"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktivovať s ID?"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonsko"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japonský server záznamníku"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japonský server prenosu súborov"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s odmietol vaše pozvanie na konferenciu do miestnosti „%s“, pretože „%s“."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Pozvanie zamietnuté"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Pripojenie zo serverom je prerušené\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nepodarilo sa previesť názov hostiteľa"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Nebolo možné sa pripojiť na %s: Server vyžaduje TLS/SSL, ale podpora pre "
+#~ "TLS/SSL nebola nájdená."
+
+#~ msgid "_Proxy"
+#~ msgstr "_Proxy"
+
+#~ msgid "/Conversation/Media/fHlasový/Videohovor"
+#~ msgstr "/Rozhovor/Viac"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skrývanie okna rozhovoru"
+
+#~ msgid "More Data needed"
+#~ msgstr "Je treba viac dát"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Zadajte, prosím, skratku pre tohoto smajlíka."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Prosím, vyberte obrázok pre smajlíka."
+
+#~ msgid "Cursor Color"
+#~ msgstr "Farba kurzoru"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Druhotná farba kurzoru"
+
+#~ msgid "Interface colors"
+#~ msgstr "Farby rozhrania"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Veľkosť ovládacích prvkov"
+
+#~ msgid "Invite message"
+#~ msgstr "Správa pozvánky"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Zadajte, prosím, meno používateľa, ktorého chcete pozvať,\n"
+#~ "spolu s nepovinným textom pozvánky."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Vyhľadáva sa %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Spojenie s %s zlyhalo"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Odhlásenie: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Nepodarilo sa zapísať do súboru %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Nepodarilo sa čítať zo súboru %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Správa je príliš dlhá, z konca bolo odstránených %s bajtov."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s nie je práve prihlásený."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Varovanie na %s nie je dovolené."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Správa bola zrušená, prekračujete rýchlostný limit servera"
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Chat v %s nie je dostupný."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Používateľovi %s posielate správy príliš rýchlo."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Prišli ste o správu od používateľa %s, pretože bola príliš veľká."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Prišli ste o správu od používateľa %s, pretože bola odoslaná príliš "
+#~ "rýchlo."
+
+#~ msgid "Failure."
+#~ msgstr "Zlyhanie."
+
+#~ msgid "Too many matches."
+#~ msgstr "Príliš veľa výskytov."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Vyžaduje viac parametrov."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Služba dir je dočasne nedostupná"
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Vyhľadávanie e-mailu obmedzené."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Kľúčové slovo bolo ignorované."
+
+#~ msgid "No keywords."
+#~ msgstr "Žiadne kľúče."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Používateľ nemá žiadne podrobnosti v adresári."
+
+#~ msgid "Country not supported."
+#~ msgstr "Krajina nie je podporovaná."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Neznáme zlyhanie: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Nesprávne používateľské meno alebo heslo."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Služba je dočasne nedostupná."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr ""
+#~ "Vaša úroveň upozornenia je momentálne príliš vysoká na to, aby ste sa "
+#~ "mohli prihlásiť."
+
+#~ 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 ""
+#~ "Odhlasovali a prihlasovali ste sa príliš často.  Počkajte 10 minút a "
+#~ "skúste to znovu.  Ak sa budete ďalej pokúšať, budete musieť čakať ešte "
+#~ "dlhšie."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Pri prihlasovaní sa vyskytla neznáma chyba: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Vyskytla sa neznáma chyba %d.  Informácie: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Chybný názov skupiny"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Spojenie ukončené"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Čaká sa na odpoveď..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC sa vrátil z prestávky. Môžete znovu posielať správy."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Heslo bolo úspešne zmenené"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Získať informácie o priečinku"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Nastaviť informácie o priečinku"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Nepodarilo sa otvoriť %s pre zápis!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Prenos súboru zlyhal; druhá strana ho asi zrušila."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Nepodarilo sa spojiť na prenos."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Nebolo možné zapísať hlavičku súboru. Súbor sa nebude posielať"
+
+#~ msgid "Save As..."
+#~ msgstr "Uložiť ako..."
+
+#~ 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] ""
+#~ "Používateľ %s vyžaduje od používateľa %s potvrdenie %d súborov: %s (%.2f %"
+#~ "s)%s%s"
+#~ msgstr[1] ""
+#~ "Používateľ %s vyžaduje od používateľa %s potvrdenie %d súboru: %s (%.2f %"
+#~ "s)%s%s"
+#~ msgstr[2] ""
+#~ "Používateľ %s vyžaduje od používateľa %s potvrdenie %d súborov: %s (%.2f %"
+#~ "s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s od vás požaduje súbor"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Modul protokolu TOC"
+
+#~ msgid "%s Options"
+#~ msgstr "Možnosti %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Možnosti proxy"
+
+#~ msgid "By log size"
+#~ msgstr "Podľa veľkosti záznamu"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Otvoriť odkaz v prehliadači"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN server:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "_Obrázok smajlíka"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "S_kratka smajlíka"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Nebolo možné prevziať zoznam adries MSN"
 
@@ -14080,7 +14861,7 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgstr "Odmietnuť požiadavku"
 
 #~ msgid "Add buddy with auth request failed"
-#~ msgstr "Pridanie kamaráta s požiadavkou na autentifikáciu zlyhalo"
+#~ msgstr "Pridanie priateľa s požiadavkou na autentifikáciu zlyhalo"
 
 #~ msgid "Add into %d's buddy list"
 #~ msgstr "Pridať do zoznamu priateľov používateľa %d"
@@ -14113,7 +14894,7 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgstr "Som admin"
 
 #~ msgid "Unknown status"
-#~ msgstr "Neznámy stav"
+#~ msgstr "Neznámy status"
 
 #~ msgid "Remove from Qun"
 #~ msgstr "Odstrániť z Qun"
@@ -14268,7 +15049,7 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgstr "Boli ste úspešne odstránený z priateľovho zoznamu kontaktov"
 
 #~ msgid "You have added %d to buddy list"
-#~ msgstr "Pridali ste používateľa %d do zoznamu kamarátov"
+#~ msgstr "Pridali ste používateľa %d do zoznamu priateľov"
 
 #~ msgid "Invalid QQid"
 #~ msgstr "Nesprávne QQid"
@@ -14280,9 +15061,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgstr ""
 #~ "Vaša požiadavka pre vstup do skupiny %d bola vyhovená administrátorom %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Skupina bola pridaná do vášho zoznamu priateľov"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Uchádzam sa o členstvo"
 
@@ -14310,15 +15088,9 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "You have successfully modified Qun information"
 #~ msgstr "Úspešne ste zmenili Qun informácie"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Chyba pri požadovaní prihlasovacieho tokenu"
-
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Nepodarilo sa prihlásiť. Pozrite ladiaci záznam."
 
-#~ msgid "Unable to login"
-#~ msgstr "Nebolo možné sa prihlásiť"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP adresa"
 
@@ -14405,9 +15177,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ "zobrazovať v zozname priateľov namiesto mena používateľa vždy, keď to "
 #~ "bude možné.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "Úče_t:"
-
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Sledovať, len ak som nedostupný"
 
@@ -14418,16 +15187,8 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ "Prepáčte, ale heslá ktoré sú dlhšie ako %d znakov (vaše má %d znakov) nie "
 #~ "sú podporované na MySpace."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Prosím, choďte na http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username a vyberte si používateľské meno a skúste sa "
-#~ "prihlásiť znovu."
-
 #~ msgid "Use recent buddies group"
-#~ msgstr "Použiť naposledy použitú skupinu kamarátov"
+#~ msgstr "Použiť naposledy použitú skupinu priateľov"
 
 #~ msgid "Show how long you have been idle"
 #~ msgstr "Zobrazí ako dlho ste boli nečinní"
@@ -14439,7 +15200,7 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgstr "Aktuálne médium"
 
 #~ msgid "%s changed status from %s to %s"
-#~ msgstr "Používateľ %s zmenil stav z %s na %s"
+#~ msgstr "Používateľ %s zmenil status z %s na %s"
 
 #~ msgid "%s is now %s"
 #~ msgstr "Používateľ %s je teraz %s"
@@ -14471,9 +15232,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "Unable to connect to contact server"
 #~ msgstr "Nepodarilo sa pripojiť na server kontaktov."
 
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Nepodarilo sa pripojiť na OIM server."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Nepodarilo sa vytvoriť SSL pripojenie na server."
 
@@ -14492,7 +15250,7 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ "znovu nepovolíte tento účet."
 
 #~ msgid "Sort by status"
-#~ msgstr "Zoradiť podľa stavu"
+#~ msgstr "Zoradiť podľa statusu"
 
 #~ msgid "Sort alphabetically"
 #~ msgstr "Zoradiť podľa abecedy"
@@ -14603,8 +15361,5 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "/Buddies/Show/Show Idle Times"
 #~ msgstr "/Priatelia/Zobraziť/Časy nečinnosti"
 
-#~ msgid "/Conversation/_Hide"
-#~ msgstr "/Rozhovor/_Skryť"
-
 #~ msgid "Norwegian"
 #~ msgstr "nórčina"
diff --git a/po/sl.po b/po/sl.po
index 87f7ecc774..af24a0a2eb 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,11 +6,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.5.5\n"
+"Project-Id-Version: Pidgin 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-22 11:03-0500\n"
-"PO-Revision-Date: 2009-02-22 10:26+0100\n"
-"Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
+"POT-Creation-Date: 2009-08-03 10:04-0700\n"
+"PO-Revision-Date: 2009-07-30 12:54+0100\n"
+"Last-Translator: Martin Srebotnjak  <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -613,19 +613,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Pošlji k"
 
-msgid "Invite message"
-msgstr "Sporočilo povabila"
-
-msgid "Invite"
-msgstr "Povabi"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Vnesite ime uporabnika, ki ga želite povabiti,\n"
-"dodate lahko tudi sporočilo - povabilo."
-
 msgid "Conversation"
 msgstr "Pogovor"
 
@@ -889,6 +876,39 @@ msgstr "Vsi pogovori"
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
+msgid "Calling ... "
+msgstr "Klicanje ..."
+
+msgid "Hangup"
+msgstr "Odloži"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Sprejmi"
+
+msgid "Reject"
+msgstr "Zavrni"
+
+msgid "Call in progress."
+msgstr "Klic je v teku."
+
+msgid "The call has been terminated."
+msgstr "Klic je bil končan."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s želi z vami začeti zvočno sejo."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s poskuša z vami začeti sejo v nepodprtem mediju."
+
+msgid "You have rejected the call."
+msgstr "Zavrnili ste klic."
+
+msgid "call: Make an audio call."
+msgstr "call: Opravite zvočni klic."
+
 msgid "Emails"
 msgstr "E-naslovi"
 
@@ -925,6 +945,9 @@ msgstr "Nadaljuj"
 msgid "IM"
 msgstr "Sporoči"
 
+msgid "Invite"
+msgstr "Povabi"
+
 msgid "(none)"
 msgstr "(brez)"
 
@@ -1128,7 +1151,6 @@ msgstr "%s je postal odsoten. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "Uporabnik %s vam je poslal sporočilo. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poročajte o tem!"
 
@@ -1537,6 +1559,29 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Vtičnik Lastlog."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Pridobivanje TinyURL ..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Ustvari TinyURL le za naslove URL te dolžina ali daljše"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Predpona naslova TinyURL (ali drugega)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Vtičnik TinyURL"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "Ob prejemu sporočil z URL-ji uporabi TinyURL za enostavnejše kopiranje"
+
 msgid "accounts"
 msgstr "Računi"
 
@@ -1637,41 +1682,39 @@ msgstr "Želite sprejeti digitalno potrdilo za %s?"
 msgid "SSL Certificate Verification"
 msgstr "Preverjanje verodostojnosti digitalnega potrdila SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Sprejmi"
-
-msgid "Reject"
-msgstr "Zavrni"
-
 msgid "_View Certificate..."
 msgstr "_Pokaži digitalno potrdilo ..."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
-"Predstavljeno digitalno potrdilo \"%s\" je samo-podpisano. Samodejno ga ni "
-"mogoče preveriti."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "Ponujena veriga digitalnih potrdil za %s ni veljavna."
+"Predstavljeno digitalno potrdilo \"%s\" priča, da dejansko pripada \"%s\".  "
+"To pomeni, da se ne povezujete s storitvijo, kot ste mislili."
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Napaka digitalnega potrdila SSL"
 
 msgid "Invalid certificate chain"
 msgstr "Neveljavna veriga digitalnih potrdil"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1680,6 +1723,21 @@ msgstr ""
 "Nimate zbirke podatkov korenskih digitalnih potrdil, zato tega digitalnega "
 "potrdila ni mogoče preveriti."
 
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Predstavljeno digitalno potrdilo \"%s\" je samo-podpisano. Samodejno ga ni "
+"mogoče preveriti."
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "Ponujena veriga digitalnih potrdil za %s ni veljavna."
+
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1699,18 +1757,6 @@ msgstr ""
 msgid "Invalid certificate authority signature"
 msgstr "Neveljaven podpis izdajatelja digitalnega potrdila"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Predstavljeno digitalno potrdilo \"%s\" priča, da dejansko pripada \"%s\".  "
-"To pomeni, da se ne povezujete s storitvijo, kot ste mislili."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1746,6 +1792,8 @@ msgstr "+++ %s se je prijavil(a)"
 msgid "+++ %s signed off"
 msgstr "+++ %s se je odjavil(a)"
 
+#. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -1792,6 +1840,17 @@ msgstr "%s nas je zapustil."
 msgid "%s left the room (%s)."
 msgstr "%s nas je zapustil (%s)."
 
+msgid "Invite to chat"
+msgstr "Povabi na klepet"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Prosim vnesite ime uporabnika, ki ga želite povabiti, dodate pa lahko še "
+"povabilo."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Povezave ni mogoče vzpostaviti: %s"
@@ -1923,6 +1982,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Začetek prenosa %s od %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Prenos datoteke <A HREF=\"file://%s\">%s</A> je dokončan"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Prenos datoteke %s je dokončan."
 
@@ -2134,6 +2197,9 @@ msgstr "<font color=\"red\"><b>Ni mogoče brati datoteke: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Napaka pri ustvarjanju konference."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Uporabljate %s, a ta vtičnik zahteva %s."
@@ -2558,13 +2624,14 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "Pri ogledovanju dnevnikov bo ta vtičnik vključil dnevnike drugih odjemalcev "
-"neposrednih sporočil. To trenutno obsega Adium, MSN Messenger in Trillian.\n"
+"neposrednih sporočil. To trenutno obsega Adium, MSN Messenger, aMSN in "
+"Trillian.\n"
 "\n"
 "OPOZORILO: Ta vtičnik je še vedno v fazi alfa in se lahko pogosto sesuje. "
 "Uporaba na lastno odgovornost!"
@@ -2613,10 +2680,10 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "Shrani sporočila, poslana neprijavljenemu uporabniku, kot opozorilo."
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Preostanek sporočila bo shranjen kot opozorilo. Opozorilo lahko uredite/"
+"Preostanek sporočil bo shranjen kot opozorila. Opozorilo lahko uredite/"
 "izbrišete s pogovornim oknom `Opozorilo prijatelja'."
 
 #, c-format
@@ -2646,6 +2713,34 @@ msgstr "Shrani brezpovezavna sporočila v opozorilo"
 msgid "Do not ask. Always save in pounce."
 msgstr "Ne sprašuj. Vedno shrani v opozorilo."
 
+msgid "One Time Password"
+msgstr "Enkratno geslo"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Podpora za enkratno geslo"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Vsilite, da se gesla uporabijo le enkrat."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Omogoča, da vsilite (posebej za vsak račun), da so neshranjena gesla "
+"uporabljena le za posamezno uspešno povezavo.\n"
+"Opomba: Geslo računa ni potrebno shraniti, da bi to delovalo."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2837,15 +2932,15 @@ msgstr ""
 "namestite ActiveTCL z naslova http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Paketa orodij Apple Bonjour za Windows ni mogoče najti, oglejte si pogosto "
-"zastavljena vprašanja na naslovu: http://d.pidgin.im/BonjourWindows za več "
-"podrobnosti."
+"Paketa orodij podjetja Apple \"Bonjour for Windows\" ni mogoče najti, "
+"oglejte si zapis na naslovu http://d.pidgin.im/BonjourWindows - kjer najdete "
+"več podrobnosti."
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Dohodnim povezavam IM ni mogoče prisluhniti\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Dohodnim povezavam IM ni mogoče prisluhniti"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2885,9 +2980,8 @@ msgid "Purple Person"
 msgstr "Vijolična oseba"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Okraj"
+msgstr "Krajevna vrata"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2899,14 +2993,17 @@ msgstr "%s je zaprl pomenek."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Sporočila ni mogoče poslati, pogovora ni mogoče začeti."
 
-msgid "Cannot open socket"
-msgstr "Vtičnice ni mogoče odpreti"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Vtičnice ni mogoče ustvariti: %s"
 
-msgid "Could not bind socket to port"
-msgstr "Povezava vtičnice z vrati ni uspela"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Vtičnice z vrati ni mogoče povezati: %s"
 
-msgid "Could not listen on socket"
-msgstr "Poslušanje vtičnice ni možno"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Na vtičnici ni mogoče prisluhniti: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Napaka pri komunikaciji s krajevnim mDNSReponderjem."
@@ -2955,14 +3052,15 @@ msgstr "Shrani seznam prijateljev ..."
 msgid "Load buddylist from file..."
 msgstr "Uvozi seznam prijateljev iz datoteke ..."
 
-msgid "Fill in the registration fields."
-msgstr "Izpolnite polja za registracijo."
+msgid "You must fill in all registration fields"
+msgstr "Izpolniti morate vsa polja za registracijo"
 
-msgid "Passwords do not match."
-msgstr "Gesli se ne ujemata."
+msgid "Passwords do not match"
+msgstr "Gesli se ne ujemata"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Novega računa ni bilo mogoče registrirati. Prišlo je do napake.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+"Novega računa ni bilo mogoče registrirati. Prišlo je do neznane napake."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nov račun Gadu-Gadu je registriran"
@@ -2973,14 +3071,14 @@ msgstr "Registracija je uspela!"
 msgid "Password"
 msgstr "Geslo"
 
-msgid "Password (retype)"
-msgstr "Geslo (ponovno vtipkajte)"
+msgid "Password (again)"
+msgstr "Novo geslo (ponovno)"
 
-msgid "Enter current token"
-msgstr "Vnesite trenutni žeton"
+msgid "Enter captcha text"
+msgstr "Vnesite besedilo za sliko z besedilom"
 
-msgid "Current token"
-msgstr "Trenutni žeton"
+msgid "Captcha"
+msgstr "Slika z napisom"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrirajte nov račun za Gadu-Gadu"
@@ -3033,6 +3131,15 @@ msgstr "Geslo je bilo uspešno spremenjeno!"
 msgid "Current password"
 msgstr "Trenutno geslo"
 
+msgid "Password (retype)"
+msgstr "Geslo (ponovno vtipkajte)"
+
+msgid "Enter current token"
+msgstr "Vnesite trenutni žeton"
+
+msgid "Current token"
+msgstr "Trenutni žeton"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Vnesite svoje obstoječe in novo geslo za UIN:"
 
@@ -3046,6 +3153,7 @@ msgstr "Izberite klepet za prijatelja: %s"
 msgid "Add to chat..."
 msgstr "Dodaj k pomenku ..."
 
+#. Global
 msgid "Available"
 msgstr "Na voljo"
 
@@ -3079,8 +3187,8 @@ msgstr "Ni najdenih uporabnikov"
 msgid "There are no users matching your search criteria."
 msgstr "Noben uporabnik ne ustreza iskalnim pogojem."
 
-msgid "Unable to read socket"
-msgstr "Ne morem brati vtičnice"
+msgid "Unable to read from socket"
+msgstr "Ni mogoče brati iz vtičnice"
 
 msgid "Buddy list downloaded"
 msgstr "Seznam prijateljev prenesen"
@@ -3094,8 +3202,14 @@ msgstr "Seznam prijateljev prenesen"
 msgid "Your buddy list was stored on the server."
 msgstr "Seznam prijateljev je bil shranjen na strežniku."
 
-msgid "Connection failed."
-msgstr "Povezava ni uspela."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Povezano"
+
+msgid "Connection failed"
+msgstr "Povezava ni uspela"
 
 msgid "Add to chat"
 msgstr "Dodaj k pomenku"
@@ -3103,14 +3217,23 @@ msgstr "Dodaj k pomenku"
 msgid "Chat _name:"
 msgstr "_Ime za klepet:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Imena strežnika '%s' ni mogoče razločiti: %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Povezovanje"
+
 msgid "Chat error"
 msgstr "Napaka pri pomenku"
 
 msgid "This chat name is already in use"
 msgstr "Ime za pomenek že obstaja"
 
-msgid "Not connected to the server."
-msgstr "S strežnikom niste povezani."
+msgid "Not connected to the server"
+msgstr "S strežnikom niste povezani"
 
 msgid "Find buddies..."
 msgstr "Poišči prijatelje ..."
@@ -3151,6 +3274,9 @@ msgstr "Olepšaj priljubljen program za neposredno sporočanje"
 msgid "Gadu-Gadu User"
 msgstr "Uporabnik Gadu-Gadu"
 
+msgid "GG server"
+msgstr "Strežnik GG"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznan ukaz: %s"
@@ -3165,7 +3291,7 @@ msgstr "Ni teme"
 msgid "File Transfer Failed"
 msgstr "Prenos datoteke ni uspel"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Vrat za poslušanje ni mogoče odpreti."
 
 msgid "Error displaying MOTD"
@@ -3181,8 +3307,16 @@ msgstr "Noben MOTD ni povezan s to povezavo."
 msgid "MOTD for %s"
 msgstr "MOTD za %s"
 
-msgid "Server has disconnected"
-msgstr "Strežnik ni več povezan"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Izgubljena povezava s strežnikom: %s"
 
 msgid "View MOTD"
 msgstr "Ogled MOTD"
@@ -3193,25 +3327,23 @@ msgstr "_Kanal:"
 msgid "_Password:"
 msgstr "_Geslo:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC vzdevki ne smejo vsebovati presledka"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Povezovanje"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC vzdevek in strežnik ne smejo vsebovati presledka"
 
 msgid "SSL support unavailable"
 msgstr "Podpora SSL ni na voljo"
 
-msgid "Couldn't create socket"
-msgstr "Vtičnice ni bilo mogoče ustvariti"
+msgid "Unable to connect"
+msgstr "Ni se mogoče povezati"
 
-msgid "Couldn't connect to host"
-msgstr "Povezava do gostitelja ni uspela"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Ni se mogoče povezati: %s"
 
-msgid "Read error"
-msgstr "Napaka pri branju"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Strežnik je zaprl povezavo"
 
 msgid "Users"
 msgstr "Uporabniki"
@@ -3392,6 +3524,16 @@ msgstr ""
 "Vaše izbrano ime računa je strežnik zavrnil. Najverjetneje vsebuje "
 "neveljavne znake."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Vzdevek \"%s\" že obstaja."
+
+msgid "Nickname in use"
+msgstr "Vzdevek je zaseden"
+
 msgid "Cannot change nick"
 msgstr "Vzdevka ne morem spremeniti"
 
@@ -3630,11 +3772,12 @@ msgstr "Improvizirani ukaz ni uspel"
 msgid "execute"
 msgstr "izvedi"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"Strežnik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogoče najti."
+"Strežnik zahteva TLS/SSL za prijavo, vendar odpore za TLS/SSL ni mogoče "
+"najti."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Vi zahtevate šifriranje, podpore za TLS/SSL pa ni mogoče najti."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3652,17 +3795,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Overovitev z navadnim besedilom"
 
-msgid "Invalid response from server."
-msgstr "Neveljaven odgovor strežnika."
+msgid "SASL authentication failed"
+msgstr "Overovitev SASL ni uspela"
+
+msgid "Invalid response from server"
+msgstr "Neveljaven odgovor strežnika"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Strežnik ne uporablja nobene podprte metode overovitve"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Zahtevate šifriranje, vendar to na tem strežniku ni na voljo."
+
 msgid "Invalid challenge from server"
 msgstr "Neveljaven poziv strežnika"
 
-msgid "SASL error"
-msgstr "Napaka SASL"
+#, c-format
+msgid "SASL error: %s"
+msgstr "Napaka SASL: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "Upravitelj povezave BOSH je zaključil vašo sejo."
+
+msgid "No session ID given"
+msgstr "ID seje ni podan"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Nepodprta različica protokola BOSH"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Povezave s strežnikom ni mogoče vzpostaviti"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Povezave s strežnikom ni mogoče vzpostaviti: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Povezave SSL ni mogoče vzpostaviti"
 
 msgid "Full Name"
 msgstr "Polno ime"
@@ -3679,6 +3848,11 @@ msgstr "URL"
 msgid "Street Address"
 msgstr "Naslov"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Naslov (dodatno)"
 
@@ -3728,158 +3902,8 @@ msgstr "Odjemalec"
 msgid "Operating System"
 msgstr "Operacijski sistem"
 
-msgid "Last Activity"
-msgstr "Zadnja dejavnost"
-
-msgid "Service Discovery Info"
-msgstr "Podatki iskanja storitev"
-
-msgid "Service Discovery Items"
-msgstr "Elementi razpoznave storitev"
-
-msgid "Extended Stanza Addressing"
-msgstr "Razširjeno naslavljanje kitic"
-
-msgid "Multi-User Chat"
-msgstr "Večuporabniški pomenek"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Podatki o prisotnosti pri večuporabniškem pomenku"
-
-msgid "In-Band Bytestreams"
-msgstr "Bitni tokovi v pasu"
-
-msgid "Ad-Hoc Commands"
-msgstr "Improvizirani ukazi"
-
-msgid "PubSub Service"
-msgstr "Storitev PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Bajtni tokovi SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Zmanjkalo je pasovnih podatkov"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Prijava v pasu"
-
-msgid "User Location"
-msgstr "Lokacija uporabnika"
-
-msgid "User Avatar"
-msgstr "Avatar uporabnika"
-
-msgid "Chat State Notifications"
-msgstr "Obvestila o stanjih klepeta"
-
-msgid "Software Version"
-msgstr "Programska različica"
-
-msgid "Stream Initiation"
-msgstr "Vzpostavitev toka"
-
-msgid "File Transfer"
-msgstr "Prenos datotek"
-
-msgid "User Mood"
-msgstr "Uporabnikovo počutje"
-
-msgid "User Activity"
-msgstr "Uporabnikova dejavnost"
-
-msgid "Entity Capabilities"
-msgstr "Zmožnosti entitete"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Pogajanja šifrirane seje"
-
-msgid "User Tune"
-msgstr "Uporabnikova skladba"
-
-msgid "Roster Item Exchange"
-msgstr "Izmenjava elementov seznama"
-
-msgid "Reachability Address"
-msgstr "Naslov dosegljivosti"
-
-msgid "User Profile"
-msgstr "Profil uporabnika"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle - zvok"
-
-msgid "User Nickname"
-msgstr "Vzdevek uporabnika"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle - ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle - ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle - surovi UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle - video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle - DTMF"
-
-msgid "Message Receipts"
-msgstr "Dokazila o prejemu sporočila"
-
-msgid "Public Key Publishing"
-msgstr "Objava javnega ključa"
-
-msgid "User Chatting"
-msgstr "Uporabnik klepeta"
-
-msgid "User Browsing"
-msgstr "Uporabnik brska"
-
-msgid "User Gaming"
-msgstr "Uporabnik igra"
-
-msgid "User Viewing"
-msgstr "Uporabnik gleda"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Šifriranje kitic"
-
-msgid "Entity Time"
-msgstr "Čas entitete"
-
-msgid "Delayed Delivery"
-msgstr "Zakasnjena dostava"
-
-msgid "Collaborative Data Objects"
-msgstr "Podatkovni predmeti sodelovanja"
-
-msgid "File Repository and Sharing"
-msgstr "Hramba datotek in skupna raba"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Razpoznava storitev STUN za Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Poenostavljeno pogajanje šifrirane seje"
-
-msgid "Hop Check"
-msgstr "Preveri hop"
-
-msgid "Capabilities"
-msgstr "Zmožnosti"
+msgid "Local Time"
+msgstr "Krajevni čas"
 
 msgid "Priority"
 msgstr "Prednost stika"
@@ -3887,6 +3911,13 @@ msgstr "Prednost stika"
 msgid "Resource"
 msgstr "Vir"
 
+#, c-format
+msgid "%s ago"
+msgstr "pred %s"
+
+msgid "Logged Off"
+msgstr "Se je odjavil"
+
 msgid "Middle Name"
 msgstr "Drugo ime"
 
@@ -3908,14 +3939,12 @@ msgstr "Ne skrij pred"
 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Prekliči obvestilo o prisotnosti"
 
 msgid "(Re-)Request authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4053,28 +4082,24 @@ msgstr "Izberite konferenčni strežnik za pogovor"
 msgid "Find Rooms"
 msgstr "Najdi sobe"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Zahtevate šifriranje, vendar to na tem strežniku ni na voljo."
+msgid "Affiliations:"
+msgstr "Navezave:"
 
-msgid "Write error"
-msgstr "Napaka pri pisanju"
+msgid "No users found"
+msgstr "Ni najdenih uporabnikov"
 
-msgid "Ping timeout"
-msgstr "Časovna prekoračitev pinga"
+msgid "Roles:"
+msgstr "Vloge:"
 
-msgid "Read Error"
-msgstr "Napaka pri branju"
+msgid "Ping timed out"
+msgstr "Časovna prekoračitev pinga"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Povezave s strežnikom ni mogoče vzpostaviti:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Ni mogoče ustvariti vtičnice"
+"Po neuspehu neposredne povezave ni bilo mogoče najti drugih povezovalnih "
+"metod XMPP."
 
 msgid "Invalid XMPP ID"
 msgstr "Neveljaven ID za XMPP"
@@ -4082,6 +4107,9 @@ msgstr "Neveljaven ID za XMPP"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Neveljaven ID za XMPP. Domena mora biti določena."
 
+msgid "Malformed BOSH URL"
+msgstr "Nepravilno oblikovan URL BOSH"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspela!"
@@ -4106,9 +4134,6 @@ msgstr "Odregistracija uspela!"
 msgid "Unregistration Failed"
 msgstr "Napaka pri odregistraciji"
 
-msgid "Already Registered"
-msgstr "Že registriran"
-
 msgid "State"
 msgstr "Zvezna država"
 
@@ -4121,6 +4146,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Že registriran"
+
 msgid "Unregister"
 msgstr "Odregistriraj se"
 
@@ -4173,6 +4201,12 @@ msgstr "Strežnik ne podpira blokiranja"
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
+msgid "Mood"
+msgstr "Razpoloženje"
+
+msgid "Now Listening"
+msgstr "Zdaj posluša"
+
 msgid "Both"
 msgstr "Oboje"
 
@@ -4194,12 +4228,6 @@ msgstr "brez"
 msgid "Subscription"
 msgstr "Naročilo"
 
-msgid "Mood"
-msgstr "Razpoloženje"
-
-msgid "Now Listening"
-msgstr "Zdaj posluša"
-
 msgid "Mood Text"
 msgstr "Besedilo razpoloženja"
 
@@ -4242,9 +4270,6 @@ msgstr "Vaše geslo je bilo spremenjeno."
 msgid "Error changing password"
 msgstr "Napaka pri spreminjanju gesla"
 
-msgid "Password (again)"
-msgstr "Novo geslo (ponovno)"
-
 msgid "Change XMPP Password"
 msgstr "Spremeni geslo XMPP"
 
@@ -4439,16 +4464,24 @@ msgid "Unable to ping user %s"
 msgstr "Uporabnika %s ni mogoče pingniti"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "Ni mogoče stresti, saj o uporabniku %s ni ničesar znanega."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Ni mogoče stresti, saj o osebi %s ni ničesar znanega."
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Ni mogoče stresti, saj je oseba %s morda nepovezana."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "Ni mogoče stresti, saj je uporabnik %s morda nepovezan."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"Osebe %s ni mogoče stresti, ker tega dejanja ne podpira ali zdaj ne želi "
+"prejemati tresenja."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Uporabnika %s ni mogoče stresti, ker tega dejanja ne podpira."
+msgid "Buzzing %s..."
+msgstr "Stresanje uporabnika %s ..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4460,8 +4493,32 @@ msgid "%s has buzzed you!"
 msgstr "Uporabnik %s vas je stresel."
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Stresanje uporabnika %s ..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Medija z %s ni mogoče iniciirati: neveljaven JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Medija z %s ni mogoče iniciirati: uporabnik ni povezan"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Medija %s ni mogoče iniciirati: niste naročeni na stanja prisotnosti osebe"
+
+msgid "Media Initiation Failed"
+msgstr "Iniciacija medija ni uspela"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Izberite vir %s, s katerim bi radi začeli medijsko sejo."
+
+msgid "Select a Resource"
+msgstr "Izberite vir"
+
+msgid "Initiate Media"
+msgstr "Iniciiraj medij"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
@@ -4482,21 +4539,21 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;uporabnik&gt; [razlog]:  Prepovej uporabnika v sobi."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;uporabnik&gt; &lt;lastnik|skrbnik|član|izločenec|nihče&gt;: "
-"Nastavitev uporabnikovega statusa v sobi."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [vzdevek1] [vzdevek2] ...: "
+"Pridobi navezavo uporabnikov ali nastavi navezavo uporabnikov na sobo."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;uporabnik&gt; &lt;moderator|participant|visitor|none&gt;: "
-"Nastavitev uporabnikove vloge v sobi."
+"role &lt;moderator|participant|visitor|none&gt; [vzdevek1] [vzdevek2] ...: "
+"Pridobi uporabnike z vlogo ali nastavi vlogo uporabnikov v sobi."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;uporabnik&gt; [soba]:  Povabite uporabnika v sobo."
+msgstr "invite &lt;uporabnik&gt; [sporočilo]:  Povabite uporabnika v sobo."
 
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr "join: &lt;soba&gt; [geslo]:  Pridruži se pomenku na tem strežniku."
@@ -4554,6 +4611,9 @@ msgstr "Poveži se na strežnik"
 msgid "File transfer proxies"
 msgstr "Posredovalni strežniki za prenos datotek"
 
+msgid "BOSH URL"
+msgstr "URL BOSH"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4592,6 +4652,14 @@ msgstr "Napaka pri razčlenjevanu XML"
 msgid "Unknown Error in presence"
 msgstr "Prišlo je do neznane napake"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Napaka pri pridruževanju pomenku %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Napaka v pomenku %s"
+
 msgid "Create New Room"
 msgstr "Ustvari novo sobo"
 
@@ -4608,13 +4676,28 @@ msgstr "_Nastavi sobo"
 msgid "_Accept Defaults"
 msgstr "_Sprejmi privzeto"
 
+msgid "No reason"
+msgstr "Ni razloga"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Napaka pri pridruževanju pomenku %s"
+msgid "You have been kicked: (%s)"
+msgstr "Brcnjeni ste bili: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Napaka v pomenku %s"
+msgid "Kicked (%s)"
+msgstr "Brcnjeni (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Pri prenosu v znotraj pasovnem zlogovnem pretoku je prišlo do napake\n"
+
+msgid "Transfer was closed."
+msgstr "Prenos je bil zaprt."
+
+msgid "Failed to open the file"
+msgstr "Datoteke ni mogoče odpreti"
+
+msgid "Failed to open in-band bytestream"
+msgstr "Znotraj pasovnega zlogovnega pretoka ni uspelo odpreti"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4642,9 +4725,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Izberite, kateremu viru %s bi radi poslali datoteko"
 
-msgid "Select a Resource"
-msgstr "Izberite vir"
-
 msgid "Edit User Mood"
 msgstr "Uredi razpoloženje uporabnika"
 
@@ -4941,6 +5021,30 @@ msgstr "Drugi stiki"
 msgid "Non-IM Contacts"
 msgstr "Stiki, s katerimi ne klepetate"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s vam je poslal mežik. <a href='msn-wink://%s'>Kliknite tukaj za "
+"predvajanje</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s vam je poslal mežik, ki pa ga ni mogoče shraniti."
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s vam je poslal zvočni posnetek. <a href='audio://%s'>Kliknite tukaj za "
+"predvajanje</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s vam je poslal glasovni posnetek, ki pa ga ni mogoče shraniti."
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s vam je poslal glasovno povabilo h klepetu, kar še ni podprto."
+
 msgid "Nudge"
 msgstr "Pomežikni"
 
@@ -5092,8 +5196,28 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Za MSN potrebujete podporo SSL, zato morate namestiti podprto knjižnico SSL."
 
-msgid "Failed to connect to server."
-msgstr "Povezava na strežnik neuspešna."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Ni mogoče dodati prijatelja %s, ker uporabniško ime ni veljavno. Imena so "
+"lahko le veljavni e-poštni naslovi."
+
+msgid "Unable to Add"
+msgstr "Nemogoče dodati"
+
+msgid "Authorization Request Message:"
+msgstr "Sporočilo o zahtevi po pooblastilu:"
+
+msgid "Please authorize me!"
+msgstr "Prosim za pooblastilo!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "V _redu"
 
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
@@ -5290,63 +5414,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Overjanje Windows Live ID: Neveljaven odziv"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ni veljavna skupina."
-
-msgid "Unknown error."
-msgstr "Neznana napaka."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "Uporabnik %s vam je ravnokar pomežiknil!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Neznana napaka (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Neznana napaka (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Ni mogoče dodati uporabnika"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Naslednji uporabniki manjkajo v vašem adresarju"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Uporabnika ni mogoče dodati na %s (%s)."
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Ni mogoče blokirati uporabnika %s (%s)"
-
+#. Unknown error!
 #, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Uporabniku ni mogoče dovoliti na %s (%s)."
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ni mogoče dodati, saj je vaš seznam prijateljev poln."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ni veljaven račun potnega lista."
+msgid "Unknown error (%d)"
+msgstr "Neznana napaka (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Storitev je trenutno nedosegljiva."
+msgid "The following users are missing from your addressbook"
+msgstr "Naslednji uporabniki manjkajo v vašem adresarju"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilnega sporočila ni mogoče poslati, ker je predolgo."
 
-msgid "Unable to rename group"
-msgstr "Skupine ni mogoče preimenovati"
-
-msgid "Unable to delete group"
-msgstr "Skupine ni mogoče izbrisati"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5399,9 +5487,6 @@ msgstr "Sporočila ni bilo poslano, ker je prišlo do neznane napake kodiranja."
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Sporočila ni bilo poslano, ker je prišlo do neznane napake."
 
-msgid "Unable to connect"
-msgstr "Ni se mogoče povezati"
-
 msgid "Writing error"
 msgstr "Napaka pri pisanju"
 
@@ -5416,21 +5501,21 @@ msgstr ""
 "Napaka povezave s strežnika %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Strežnik ne podpira tega protokola."
+msgid "Our protocol is not supported by the server"
+msgstr "Strežnik ne podpira našega protokola"
 
-msgid "Error parsing HTTP."
-msgstr "Napaka pri parsanju HTTP."
+msgid "Error parsing HTTP"
+msgstr "Napaka pri razčlenjevanju HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Prijavili ste se z druge lokacije."
+msgid "You have signed on from another location"
+msgstr "Prijavili ste se z drugega mesta"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Strežniki MSN so trenutno nedostopni. Prosimo počakajte in poskusite znova."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "Strežniki MSN se bodo začasno zaustavili."
+msgid "The MSN servers are going down temporarily"
+msgstr "Strežniki MSN se bodo začasno zaustavili"
 
 #  Data is assumed to be the destination sn
 #, c-format
@@ -5461,6 +5546,14 @@ msgstr "Pošljanje piškotka"
 msgid "Retrieving buddy list"
 msgstr "Prejemanje seznama prijateljev"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s želi gledati vašo spletno kamero, kar še ni podprto."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s vam je poslal povabilo s spletno kamero, kar še ni podprto."
+
 msgid "Away From Computer"
 msgstr "Stran od računalnika"
 
@@ -5501,14 +5594,6 @@ msgstr "Sporočila ni bilo poslano, ker je prišlo do napake v stikalni plošči
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Sporočila morda ni bilo poslano, ker je prišlo do neznane napake:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s vas je dodal(a) na svoj seznam prijateljev."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s vas je odstranil(a) s svojega seznama prijateljev."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Želite izbrisati prijatelja iz adresarja?"
 
@@ -5538,6 +5623,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Vtičnik za protokol MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ni veljavna skupina."
+
+msgid "Unknown error."
+msgstr "Neznana napaka."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Uporabnika ni mogoče dodati na %s (%s)."
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Ni mogoče blokirati uporabnika %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Uporabniku ni mogoče dovoliti na %s (%s)."
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ni mogoče dodati, saj je vaš seznam prijateljev poln."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ni veljaven račun potnega lista."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Storitev je trenutno nedosegljiva."
+
+msgid "Unable to rename group"
+msgstr "Skupine ni mogoče preimenovati"
+
+msgid "Unable to delete group"
+msgstr "Skupine ni mogoče izbrisati"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s vas je dodal(a) na svoj seznam prijateljev."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s vas je odstranil(a) s svojega seznama prijateljev."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Uporabnik ne obstaja: %s"
 
@@ -5566,6 +5699,8 @@ msgid "Lost connection with server"
 msgstr "Izgubljena povezava s strežnikom"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nova prejeta sporočila"
 
@@ -5610,43 +5745,29 @@ msgstr[3] ""
 msgid "Add contacts from server"
 msgstr "Dodaj stike s strežnika"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Povezano"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Napaka protokola, koda %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Vaše geslo ima %d znakov, več kot je dovoljenih %d znakov za MySpaceIM. "
-"Skrajšajte svoje geslo na naslovu http://profileedit.myspace.com/index.cfm?"
+"%s Vaše geslo ima %zu znakov, več kot je dovoljenih %d znakov. Skrajšajte "
+"svoje geslo na naslovu http://profileedit.myspace.com/index.cfm?"
 "fuseaction=accountSettings.changePassword in poskusite znova."
 
+msgid "Incorrect username or password"
+msgstr "Neveljavno uporabniško ime ali geslo"
+
 msgid "MySpaceIM Error"
 msgstr "Napaka MySpaceIM"
 
 msgid "Invalid input condition"
 msgstr "Neveljaven vnosni pogoj"
 
-msgid "Read buffer full (2)"
-msgstr "Bralni predpomnilnik je poln (2)"
-
-msgid "Unparseable message"
-msgstr "Sporočila ni mogoče razčleniti"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Povezava z gostiteljem ni uspela: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Prijatelja ni bilo mogoče dodati"
 
@@ -5731,6 +5852,15 @@ msgstr "Skupno prijateljev"
 msgid "Client Version"
 msgstr "Različica odjemalca"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Pri nastavljanju uporabniškega imena je prišlo do napake. Poskusite znova "
+"ali obiščite http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username in nastavite svoje uporabniško ime."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Uporabniško ime je na voljo"
 
@@ -5947,9 +6077,6 @@ msgstr "Vas ni mogoče dodati"
 msgid "Master archive is misconfigured"
 msgstr "Glavni arhiv je narobe nastavljen"
 
-msgid "Incorrect username or password"
-msgstr "Neveljavno uporabniško ime ali geslo"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Gostitelja uporabniškega imena, ki ste ga vnesli, ni mogoče prepoznati"
 
@@ -5991,8 +6118,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Neznana napaka: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Prijava spodletela (%s)."
+msgid "Unable to login: %s"
+msgstr "Prijava ni uspela: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6095,9 +6222,6 @@ msgstr "Konferenca GroupWise %d"
 msgid "Authenticating..."
 msgstr "Overovljanje ..."
 
-msgid "Unable to connect to server."
-msgstr "Ni se bilo mogoče povezati na strežnik."
-
 msgid "Waiting for response..."
 msgstr "Čakanje odgovora ..."
 
@@ -6121,24 +6245,18 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Se želite pridružiti pomenku?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ni na zvezi in ni sprejel sporočila, ki ste ga pravkar poslali."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Ni se mogoče povezati na strežnik. Vnesite naslov strežnika, na katerega se "
 "želite povezati."
 
-msgid "Error. SSL support is not installed."
-msgstr "Napaka. Podpora SSL ni nameščena."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ta konferenca je bila zaprta. Spročil se ne da pošiljati več.več."
 
@@ -6161,25 +6279,34 @@ msgstr "Naslov strežnika"
 msgid "Server port"
 msgstr "Vrata strežnika"
 
+msgid "Received unexpected response from "
+msgstr "Prejet neveljaven odgovor - "
+
+#. username connecting too frequently
+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 ""
+"Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in "
+"poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Napaka pri zahtevanju - "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+"AOL ne dovoljuje, da bi se vaše pojavno ime overjalo prek tega spletnega "
+"mesta"
+
 msgid "Could not join chat room"
 msgstr "Pogovorni sobi se ni mogoče pridružiti"
 
 msgid "Invalid chat room name"
 msgstr "Neveljavno ime sobe"
 
-msgid "Server closed the connection."
-msgstr "Strežnik je zaprl povezavo."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Izgubljena povezava s strežnikom:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Na povezavi s strežnikom prejeti neveljavni podatki."
+msgid "Received invalid data on connection with server"
+msgstr "Na povezavi s strežnikom prejeti neveljavni podatki"
 
 #. *< type
 #. *< ui_requirement
@@ -6226,7 +6353,7 @@ msgstr "Izgubljena povezava z oddaljenim uporabnikom:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Pri povezavi z oddaljenim uporabnikom prejeti neveljavni podatki."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Povezave z oddaljenim uporabnikom ni mogoče vzpostaviti."
 
 msgid "Direct IM established"
@@ -6428,20 +6555,12 @@ msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Povezava z overovitvenim strežnikom ni uspela:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Povezava z overovitvenim strežnikom ni uspela: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Povezava na strežnik BOS ni uspela:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Povezava s strežnikom BOS ni uspela: %s"
 
 msgid "Username sent"
 msgstr "Uporabniško ime poslano"
@@ -6455,54 +6574,61 @@ msgstr "Dokončujem povezavo"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Prijava ni mogoča: ni se mogoče prijaviti kot %s, ker je uporabniško ime "
 "neveljavno. Imena morajo biti veljaven e-poštni naslov ali se morajo začeti "
 "s črko in lahko vsebujejo le črke, številke in presledke ali pa so "
 "sestavljena zgolj iz števil."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Neveljavno uporabniško ime."
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Morda bo povezava v kratkem prekinjena. V tem primeru preverite %s za "
+"posodobitve."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Veljavnega prijavnega izvlečka za AIM ni mogoče pridobiti."
+
+msgid "Unable to get a valid login hash."
+msgstr "Veljavnega prijavnega izvlečka ni mogoče pridobiti."
+
+msgid "Received authorization"
+msgstr "Ponovno zahtevaj pooblastitev"
 
-msgid "Incorrect password."
-msgstr "Neveljavno geslo."
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Uporabniško ime ne obstaja"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Vaš račun je trenutno zamrznjen."
+msgid "Your account is currently suspended"
+msgstr "Vaš račun je trenutno zamrznjen"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Storitev AOL neposrednih sporočil je trenuno nedosegljiva."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in "
-"poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Različica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga "
 "pri %s"
 
-msgid "Could Not Connect"
-msgstr "Povezava ni uspela"
-
-msgid "Received authorization"
-msgstr "Ponovno zahtevaj pooblastitev"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Povezava ste prevečkrat vzpostavili in prekinili. Počakajte minutko in "
+"poskusite znova. Če ne počakate sedaj, boste čakali še dlje."
 
-msgid "The SecurID key entered is invalid."
-msgstr "Vnešeni ključ SecurID ni veljaven."
+msgid "The SecurID key entered is invalid"
+msgstr "Vnešeni ključ SecurID ni veljaven"
 
 msgid "Enter SecurID"
 msgstr "Vnesite SecurID"
@@ -6510,28 +6636,6 @@ msgstr "Vnesite SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Vnesite število s 6 ciframi iz digitalnega prikazovalnika."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "V _redu"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Morda bo povezava v kratkem prekinjena. V tem primeru preverite %s za "
-"posodobitve."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Veljavnega prijavnega izvlečka za AIM ni mogoče pridobiti."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
-
-msgid "Unable to get a valid login hash."
-msgstr "Veljavnega prijavnega izvlečka ni mogoče pridobiti."
-
 msgid "Password sent"
 msgstr "Geslo poslano"
 
@@ -6541,12 +6645,6 @@ msgstr "Povezave ni mogoče inicializirati"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Prosim za pooblastilo, da vas smem dodati na svoj seznam prijateljev."
 
-msgid "Authorization Request Message:"
-msgstr "Sporočilo o zahtevi po pooblastilu:"
-
-msgid "Please authorize me!"
-msgstr "Prosim za pooblastilo!"
-
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
@@ -6686,7 +6784,7 @@ msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
 #  Data is assumed to be the destination sn
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ni moč poslati sporočila: %s"
@@ -6708,6 +6806,9 @@ msgstr "Na zvezi od"
 msgid "Member Since"
 msgstr "Član od"
 
+msgid "Capabilities"
+msgstr "Zmožnosti"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -6904,16 +7005,14 @@ msgstr "Spo_ročilo o odsotnosti:"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
 "Ni mogoče dodati prijatelja %s, ker uporabniško ime ni veljavno. Imena so "
-"lahko veljavni e-poštni naslovi, se morajo začeti s črko, vsebujejo lahko le "
-"črke, številke in presledke, lahko pa so tudi sestavljena iz samih števil."
-
-msgid "Unable to Add"
-msgstr "Nemogoče dodati"
+"lahko veljavni e-poštni naslovi ali pa se morajo začeti s črko, vsebujejo "
+"lahko le črke, številke in presledke, lahko pa so tudi sestavljena iz samih "
+"števil."
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogoče pridobiti"
@@ -6931,17 +7030,17 @@ msgstr "Sirote"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Prijatelja %s ni bilo mogoče dodati, ker imate na seznamu preveč "
-"prijateljev. Prosim odstranite enega in poskusite ponovno."
+"prijateljev. Prosimo, odstranite enega in poskusite ponovno."
 
 msgid "(no name)"
 msgstr "(brez imena)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Iz neznanega razloga prijatelja %s ni mogoče dodati."
 
 #, c-format
@@ -7073,6 +7172,7 @@ msgstr "_Najdi"
 msgid "Set User Info (web)..."
 msgstr "Nastavi informacije o uporabniku (splet) ..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Spremeni geslo (splet)"
 
@@ -7102,6 +7202,9 @@ msgstr "Išči prijatelja po e-naslovu ..."
 msgid "Search for Buddy by Information"
 msgstr "Išči prijatelja po informaciji"
 
+msgid "Use clientLogin"
+msgstr "Uporabi prijavo clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7291,6 +7394,34 @@ msgstr "Posodobi"
 msgid "Could not change buddy information."
 msgstr "Podatkov o prijatelju ni mogoče spremeniti."
 
+msgid "Mobile"
+msgstr "Mobilec"
+
+msgid "Note"
+msgstr "Opomba"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Zapisek prijatelja"
+
+msgid "Change his/her memo as you like"
+msgstr "Spremenite njegov/njen zapisek, kakor vam je drago"
+
+msgid "_Modify"
+msgstr "_Spremeni"
+
+msgid "Memo Modify"
+msgstr "Spremeni zapisek"
+
+msgid "Server says:"
+msgstr "Strežnik pravi:"
+
+msgid "Your request was accepted."
+msgstr "Vaša zahteva je bila sprejeta."
+
+msgid "Your request was rejected."
+msgstr "Vaša zahteva je bila zavrnjena."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u zahteva preverjanje"
@@ -7597,7 +7728,13 @@ msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
 msgstr "<p><b>Nori razvijalci obližev</b>:<br>\n"
 
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Zahvala</b>:<br>\n"
+msgstr "<b>Zahvale</b>:<br>\n"
+
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Tankovestni preizkuševalci</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr "in drugi, prosim, javite se ... hvala!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>In vsi fantje iz ozadja ...</i><br>\n"
@@ -7624,6 +7761,9 @@ msgstr "Posodobi vse QQ Qune"
 msgid "About OpenQ"
 msgstr "O OpenQ"
 
+msgid "Modify Buddy Memo"
+msgstr "Spremeni zapisek prijatelja"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7670,7 +7810,7 @@ msgstr "Interval ohranjanja povezave (s)"
 msgid "Update interval (seconds)"
 msgstr "Interval posodabljanja (s)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Odgovora strežnika ni mogoče dešifrirati"
 
 #, c-format
@@ -7695,9 +7835,6 @@ msgstr "Zahtevana aktivacija"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Neznana koda odgovora pri prijavljanju v (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Odgovora strežnika ni mogoče dešifrirati"
-
 msgid "Requesting captcha"
 msgstr "Zahtevanje slike z napisom ..."
 
@@ -7731,30 +7868,17 @@ msgstr ""
 "Neznana koda odgovora pri prijavljanju (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Ni se bilo mogoče povezati."
-
 msgid "Socket error"
 msgstr "Napaka vtičnice"
 
-msgid "Unable to read from socket"
-msgstr "Ni mogoče brati iz vtičnice"
-
-msgid "Write Error"
-msgstr "Napaka pri pisanju"
-
-msgid "Connection lost"
-msgstr "Povezava izgubljena"
-
 msgid "Getting server"
 msgstr "Pridobivanje strežnika"
 
 msgid "Requesting token"
 msgstr "Zahtevanje žetona"
 
-msgid "Couldn't resolve host"
-msgstr "Gostitelja ni mogoče razbrati"
+msgid "Unable to resolve hostname"
+msgstr "Imena strežnika ni mogoče razločiti"
 
 msgid "Invalid server or port"
 msgstr "Neveljaven strežnik ali vrata"
@@ -7807,7 +7931,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Ukaz QQ Qun"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Odgovora na prijavo ni mogoče dešifrirati"
 
 msgid "Unknown LOGIN CMD"
@@ -7827,9 +7951,6 @@ msgstr "Datoteka poslana"
 msgid "%d canceled the transfer of %s"
 msgstr "Uporabnik %d je prekinil prenos %s"
 
-msgid "Connection closed (writing)"
-msgstr "Povezava zaprta (pisanje)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ime skupine:</b> %s<br>"
@@ -7884,17 +8005,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Upravljalsko obvestilo Sametime"
 
-msgid "Connection reset"
-msgstr "Povezava ponovno nastavljena"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Napaka pri branju iz vtičnice: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Ni se bilo mogoče povezati na strežnik."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznanilo od %s"
@@ -7918,6 +8028,9 @@ msgstr "Zvočniki"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Prenos datotek"
+
 msgid "Supports"
 msgstr "podpira"
 
@@ -8628,9 +8741,6 @@ msgstr "Organizacija"
 msgid "Unit"
 msgstr "Enota"
 
-msgid "Note"
-msgstr "Opomba"
-
 msgid "Join Chat"
 msgstr "Pridruži se klepetu"
 
@@ -8730,6 +8840,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistika omrežja"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping ni uspel"
 
@@ -8793,7 +8906,7 @@ msgstr "Nepodprt tip javnega ključa"
 msgid "Disconnected by server"
 msgstr "Strežnik je prekinil povezavo"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Napaka pri povezovanju s strežnikom SILC"
 
 msgid "Key Exchange failed"
@@ -8805,16 +8918,10 @@ msgstr ""
 "Nadaljevanje odpete seje ni uspelo. Pritisnite Ponovna povezava za tvorbo "
 "nove povezave."
 
-msgid "Connection failed"
-msgstr "Povezava ni uspela"
-
 msgid "Performing key exchange"
 msgstr "Izvajanje izmenjave ključev"
 
-msgid "Unable to create connection"
-msgstr "Ni bilo mogoče ustvariti povezave"
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Para ključev SILC ni mogoče naložiti"
 
 #. Progress
@@ -8824,7 +8931,7 @@ msgstr "Povezovanjes strežnikom SILC"
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Protokola SILC ni mogoče inicializirati"
 
 msgid "Error loading SILC key pair"
@@ -9121,8 +9228,8 @@ msgstr "Digitalno podpiši in preveri vsa sporočila"
 msgid "Creating SILC key pair..."
 msgstr "Ustvarjanje para ključev SILC ..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Ustvarjanje para ključev SILC ni mogoče\n"
+msgid "Unable to create SILC key pair"
+msgstr "Para ključev SILC ni mogoče ustvariti"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9215,6 +9322,9 @@ msgstr "Tabla"
 msgid "No server statistics available"
 msgstr "Statistika strežnika ni na voljo."
 
+msgid "Error during connecting to SILC Server"
+msgstr "Napaka pri povezovanju s strežnikom SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Napaka: Neustrezna različica, nadgradite svojega odjemalca"
@@ -9255,30 +9365,24 @@ msgstr "Napaka: Napačen piškot"
 msgid "Failure: Authentication failed"
 msgstr "Napaka: Overovitev ni uspela"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "Ni moč začeti povezave odjemalca SILC"
+msgid "Unable to initialize SILC Client connection"
+msgstr "Povezave odjemalca SILC ni mogoče inicializirati"
 
 msgid "John Noname"
 msgstr "Janez Neimenovani"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Ni mogoče naložiti para ključev SILC: %s"
-
-msgid "Could not write"
-msgstr "Ni mogoče pisati"
+msgid "Unable to load SILC key pair: %s"
+msgstr "Para ključev SILC ni mogoče naložiti: %s"
 
-msgid "Could not connect"
-msgstr "Povezava ni uspela"
-
-msgid "Unknown server response."
-msgstr "Neznan odgovor strežnika."
+msgid "Unable to create connection"
+msgstr "Ni bilo mogoče ustvariti povezave"
 
-msgid "Could not create listen socket"
-msgstr "Vtičnice ni bilo mogoče ustvariti"
+msgid "Unknown server response"
+msgstr "Neznan odgovor strežnika"
 
-msgid "Could not resolve hostname"
-msgstr "Imena strežnika ni mogoče razločiti"
+msgid "Unable to create listen socket"
+msgstr "Ni mogoče ustvariti vtičnice za poslušanje"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Uporabniška imena SIP ne smejo vsebovati presledka ali simbola @"
@@ -9319,179 +9423,60 @@ msgstr "Avtoriziraj uporabnika"
 msgid "Auth Domain"
 msgstr "Avtoriziraj domeno"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Poizvedujem za %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Povezovanje na %s ni uspelo"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Prijavljanje: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Datoteke %s ni bilo mogoče zapisati."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Datoteke %s ni bilo mogoče prebrati."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Sporočilo je predolgo, zato je bilo skrajšano za %s znakov."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s trenutno ni prijavljen."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Opozarjanje %s ni dovoljeno."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Sporočilo je bilo izpuščeno, ker presegate omejitev hitrosti strežnika."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Pomenek v %s ni dostopen."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Prehitro pošiljate sporočila %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Ker je bilo preveliko, ste zgrešili sporočilo, ki vam ga je poslal %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Zgrešili ste sporočilo od %s, ker je bilo poslano prehitro."
-
-#, c-format
-msgid "Failure."
-msgstr "Neuspeh."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Preveč zadetkov."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Potrebujem več selekcije."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Imeniška storitev je trenutno nedosegljiva."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Poizvedba po e-poštnem naslovu je omejena."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Ključna beseda zanemarjena."
-
-#, c-format
-msgid "No keywords."
-msgstr "Brez ključnih besed."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Uporabnik nima imeniških informacij."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Država ni podprta."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Neznan vzrok neuspeha: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Neveljavno uporabniško ime ali geslo."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Storitev je trenutno nedostopna."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Vaša raven opozoril je trenutno previsoka, da bi se lahko prijavili."
-
-#, c-format
-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 ""
-"Prijavljali in odjavljali ste se prepogosto.  Počakajte deset minut in "
-"poskusite ponovno.  Če tega ne boste upoštevali, bo trajalo še dlje."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Pri prijavljanju je prišlo do neznane napake: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Prišlo je do neznane napake %d. Info: %s"
-
-msgid "Invalid Groupname"
-msgstr "Neveljavno ime skupine"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;soba&gt;:  Pridružite se klepetalnici v omrežju Yahoo."
 
-msgid "Connection Closed"
-msgstr "Povezava zaprta"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Seznam sob na omrežju Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Čakanje odgovora ..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Od uporabnika zahtevajte, da začne sejo Doodle"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC je nazaj z odmora. Sedaj lahko spet pošiljate sporočila."
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID ..."
 
-msgid "Password Change Successful"
-msgstr "Sprememba gesla uspešna"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Vtičnik za protokol Yahoo!"
 
-msgid "_Group:"
-msgstr "_Skupina:"
+msgid "Pager server"
+msgstr "Strežnik pozivnika"
 
-msgid "Get Dir Info"
-msgstr "Prikaži imeniške podatke"
+msgid "Pager port"
+msgstr "Vrata za pozivnik"
 
-msgid "Set Dir Info"
-msgstr "Nastavi imeniške podatke"
+msgid "File transfer server"
+msgstr "Strežnik prenosa datotek"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Ne morem odpreti %s za pisanje!"
+msgid "File transfer port"
+msgstr "Vrata za prenos datotek"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
+msgid "Chat room locale"
+msgstr "Razpored tipk sobe pomenkov"
 
-msgid "Could not connect for transfer."
-msgstr "Ni se bilo mogoče povezati za prenos."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Prezri povabila na konference in v klepetalnice"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Ni bilo mogoče zapisati glave datoteke. Datoteka ne bo prenešena."
+msgid "Chat room list URL"
+msgstr "URL seznama sob pomenkov"
 
-msgid "Save As..."
-msgstr "Shrani kot ..."
+msgid "Yahoo Chat server"
+msgstr "Strežnik klepeta Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s zahteva od %s, da sprejme %d datotek: %s (%.2f %s)%s%s"
-msgstr[1] "%s zahteva od %s, da sprejme %d datoteko: %s (%.2f %s)%s%s"
-msgstr[2] "%s zahteva od %s, da sprejme %d datoteki: %s (%.2f %s)%s%s"
-msgstr[3] "%s zahteva od %s, da sprejme %d datoteke: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Vrata klepeta Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s zahteva, da jim pošljete datoteko"
+msgid "Yahoo JAPAN ID..."
+msgstr "ID za Yahoo JAPAN ..."
 
 #. *< type
 #. *< ui_requirement
@@ -9503,12 +9488,11 @@ msgstr "%s zahteva, da jim pošljete datoteko"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Vtičnik za protokol TOC"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Vtičnik za protokol Yahoo! JAPAN"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s vam je poslal povabilo s spletno kamero, kar še ni podprto."
+msgid "Your SMS was not delivered"
+msgstr "Vaš SMS ni bil dostavljen"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaše sporočilo za Yahoo! ni bilo poslano."
@@ -9533,6 +9517,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Dodajanje prijatelja zavrnjeno"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Prejeti neveljavni podatki"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Račun zaklenjen: Preveč neuspelih poskusov prijave.  Prijavljanje v spletno "
+"stran Yahoo! lahko to odpravi."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Račun zaklenjen: Razlog ni znan.  Prijavljanje v spletno stran Yahoo! lahko "
+"to odpravi."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Manjka uporabniško ime ali geslo"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9566,39 +9574,28 @@ msgstr ""
 "odpravi."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Ni mogoče dodati prijatelja %s v skupino %s na seznamu strežnikov za račun %"
+"Prijatelja %s ni mogoče dodati v skupino %s na seznamu strežnikov za račun %"
 "s."
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Slišni %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Prejet neveljaven odgovor HTTP strežnika."
-
-msgid "Connection problem"
-msgstr "Težava s povezavo"
+msgid "Received unexpected HTTP response from server"
+msgstr "Prejet neveljaven odgovor HTTP s strežnika"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Izgubljena povezava s strežnikom %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Izgubljena povezava s strežnikom %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Povezave s strežnikom %s ni mogoče vzpostaviti:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Povezave s strežnikom %s ni mogoče vzpostaviti: %s"
 
 msgid "Not at Home"
 msgstr "Nisem doma"
@@ -9645,8 +9642,8 @@ msgstr "Nastavitve prisotnosti"
 msgid "Start Doodling"
 msgstr "Začni Doodlati"
 
-msgid "Activate which ID?"
-msgstr "Kateri ID naj bo aktiviran?"
+msgid "Select the ID you want to activate"
+msgstr "Izberite ID, ki ga želite aktivirati"
 
 msgid "Join whom in chat?"
 msgstr "Komu se želite pridružiti v pomenku?"
@@ -9660,73 +9657,15 @@ msgstr "Pridruži se uporabniku v pomenku ..."
 msgid "Open Inbox"
 msgstr "Odpri prejeto pošto"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;soba&gt;:  Pridružite se klepetalnici v omrežju Yahoo."
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Seznam sob na omrežju Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Od uporabnika zahtevajte, da začne sejo Doodle"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-ID ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Vtičnik za protokol Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonska"
-
-msgid "Pager server"
-msgstr "Strežnik pozivnika"
-
-msgid "Japan Pager server"
-msgstr "Japonski strežnik pozivnika"
-
-msgid "Pager port"
-msgstr "Vrata za pozivnik"
-
-msgid "File transfer server"
-msgstr "Strežnik prenosa datotek"
-
-msgid "Japan file transfer server"
-msgstr "Japonski strežnik prenosa datotek"
-
-msgid "File transfer port"
-msgstr "Vrata za prenos datotek"
-
-msgid "Chat room locale"
-msgstr "Razpored tipk sobe pomenkov"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Prezri povabila na konference in v klepetalnice"
-
-msgid "Chat room list URL"
-msgstr "URL seznama sob pomenkov"
-
-msgid "Yahoo Chat server"
-msgstr "Strežnik klepeta Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Vrata klepeta Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Pošlji zahtevo Doodle."
 
+msgid "Unable to connect."
+msgstr "Ni se bilo mogoče povezati."
+
 msgid "Unable to establish file descriptor."
 msgstr "Opisa datoteke ni bilo mogoče vzpostaviti."
 
@@ -9734,6 +9673,9 @@ msgstr "Opisa datoteke ni bilo mogoče vzpostaviti."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s vam skuša poslati skupino %d datotek.\n"
 
+msgid "Write Error"
+msgstr "Napaka pri pisanju"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo!-Japonska"
 
@@ -9801,11 +9743,8 @@ msgid "The user's profile is empty."
 msgstr "Uporabnikov profil je prazen."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s je zavrnil vaše povabilo za pogovor v sobi \"%s\", ker \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Povabilo zavrnjeno"
+msgid "%s has declined to join."
+msgstr "%s se ne želi pridružiti."
 
 msgid "Failed to join chat"
 msgstr "Pomenku se ni mogoče pridružiti"
@@ -9848,22 +9787,17 @@ msgstr "Glasovi"
 msgid "Webcams"
 msgstr "Spletne kamere"
 
+msgid "Connection problem"
+msgstr "Težava s povezavo"
+
 msgid "Unable to fetch room list."
 msgstr "Ni mogoče prenesti seznama sob."
 
 msgid "User Rooms"
 msgstr "Sobe uporabnikov"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Težava s povezavo s strežnikom YCHT."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Izgubljena povezava s strežnikom\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Težava s povezavo s strežnikom YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9998,36 +9932,25 @@ msgstr "Področje"
 msgid "Exposure"
 msgstr "Izpostavljanje"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Ni mogoče ustvariti vtičnice:\n"
-"%s"
-
 #  Data is assumed to be the destination sn
 #, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Ni moč razčleniti odziva posredovalnega strežnika HTTP: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Ni moč razčleniti odziva posredovalnega strežnika HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Napaka pri povezavi na posredovalni strežnik HTTP %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Dostop zavrnjen: posredovalni strežnik HTTP ne dovoljuje preusmerjanja vrat %"
-"d."
+"d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Napaka pri razločanju %s"
 
-msgid "Could not resolve host name"
-msgstr "Imena strežnika ni možno razločiti"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Zahtevanje pozornosti uporabnika %s ..."
@@ -10114,9 +10037,6 @@ msgstr "Ne moti"
 msgid "Extended away"
 msgstr "Obsežneje odsoten"
 
-msgid "Mobile"
-msgstr "Mobilec"
-
 msgid "Listening to music"
 msgstr "Posluša glasbo"
 
@@ -10158,18 +10078,6 @@ msgstr "+++ %s je postal dejaven"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Napaka pri branju %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Pri branju vašega %s je prišlo do napake, zato ni bil naložen. Stara "
-"datoteka se je preimenovala v %s~."
-
 msgid "Calculating..."
 msgstr "Preračunavanje ..."
 
@@ -10289,6 +10197,18 @@ msgstr "Povezava zavrnjena."
 msgid "Address already in use."
 msgstr "Naslov je že uporabljen."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Napaka pri branju %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Pri branju vašega %s je prišlo do napake. Datoteka ni bial naložena, stara "
+"datoteka pa je bila preimenovana v %s~."
+
 msgid "Internet Messenger"
 msgstr "Spletni sel"
 
@@ -10331,10 +10251,8 @@ msgstr "_Obveščanje o prispeli pošti"
 msgid "Use this buddy _icon for this account:"
 msgstr "Za ta račun uporabi to _ikono prijatelja:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Možnosti"
+msgid "Ad_vanced"
+msgstr "Nap_redno"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Uporabi nastavitve posredovalnih strežnikov GNOME"
@@ -10369,9 +10287,6 @@ msgstr "Če pogledate zelo pozorno,"
 msgid "you can see the butterflies mating"
 msgstr "lahko opazite metulje, ki se parijo"
 
-msgid "Proxy Options"
-msgstr "Možnosti posredovalnega strežnika"
-
 msgid "Proxy _type:"
 msgstr "Vrsta posredovalnega s_trežnika:"
 
@@ -10399,8 +10314,8 @@ msgstr "_Osnovno"
 msgid "Create _this new account on the server"
 msgstr "_Ustvari ta nov račun na strežniku"
 
-msgid "_Advanced"
-msgstr "N_apredno"
+msgid "P_roxy"
+msgstr "Posre_dovalni strežnik"
 
 msgid "Enabled"
 msgstr "Omogočen"
@@ -10451,16 +10366,16 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Prosimo, posodobite potrebna polja."
 
-msgid "Room _List"
-msgstr "Se_znam sob"
+msgid "A_ccount"
+msgstr "Ra_čun"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Vnesite ustrezne informacije o pomenku, ki se mu želite pridružiti.\n"
 
-msgid "_Account:"
-msgstr "_Račun:"
+msgid "Room _List"
+msgstr "Se_znam sob"
 
 msgid "_Block"
 msgstr "_Zavrni"
@@ -10477,6 +10392,15 @@ msgstr "_Informacije"
 msgid "I_M"
 msgstr "_Sporoči"
 
+msgid "_Audio Call"
+msgstr "_Zvočni klic"
+
+msgid "Audio/_Video Call"
+msgstr "Zvočni/_video klic"
+
+msgid "_Video Call"
+msgstr "_Video klic"
+
 msgid "_Send File..."
 msgstr "_Pošlji datoteko ..."
 
@@ -10486,9 +10410,12 @@ msgstr "Dodaj &opozorilo prijatelju ..."
 msgid "View _Log"
 msgstr "Pokaži _dnevnik"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "Skrij, če nepovezan"
 
+msgid "Show When Offline"
+msgstr "Pokaži, če nepovezan"
+
 msgid "_Alias..."
 msgstr "Psevdo_nim ..."
 
@@ -10612,6 +10539,9 @@ msgstr "/Orodja/_Opozorila prijateljev"
 msgid "/Tools/_Certificates"
 msgstr "/Orodja/_Digitalna potrdila"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Orodja/Smejč_ki po meri"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Orodja/Vtični_ki"
 
@@ -10621,9 +10551,6 @@ msgstr "/Orodja/_Nastavitve"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-msgid "/Tools/Smile_y"
-msgstr "/Orodja/Smej_ček"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
@@ -10743,8 +10670,8 @@ msgstr "ročno"
 msgid "By status"
 msgstr "po stanju"
 
-msgid "By log size"
-msgstr "po obsegu dnevnika"
+msgid "By recent log activity"
+msgstr "po zadnji dejavnosti"
 
 #, c-format
 msgid "%s disconnected"
@@ -10760,6 +10687,9 @@ msgstr "Ponovno poveži"
 msgid "Re-enable"
 msgstr "Ponovno omogoči"
 
+msgid "SSL FAQs"
+msgstr "Pogosta vprašanja o SSL"
+
 msgid "Welcome back!"
 msgstr "Dobrodošli nazaj!"
 
@@ -10852,6 +10782,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Psev_donim:"
 
+msgid "_Group:"
+msgstr "_Skupina:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Samo_dejno se pridruži, ko račun postane povezan."
 
@@ -10885,6 +10818,103 @@ msgstr "/Orodja"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Barva ozadja"
+
+msgid "The background color for the buddy list"
+msgstr "Barva ozadja seznama prijateljev"
+
+msgid "Layout"
+msgstr "Postavitev"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Postavitev ikon, imen in stanj na seznamu prijateljev"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Barva razširjenega ozadja"
+
+msgid "The background color of an expanded group"
+msgstr "Barva ozadja razpostrte skupine"
+
+msgid "Expanded Text"
+msgstr "Razširjeno besedilo"
+
+msgid "The text information for when a group is expanded"
+msgstr "Besedilna informacija, ko je skupina razpostrta"
+
+msgid "Collapsed Background Color"
+msgstr "Barva strnjenega ozadja"
+
+msgid "The background color of a collapsed group"
+msgstr "Barva ozadja strnjene skupine"
+
+msgid "Collapsed Text"
+msgstr "Strnjeno besedilo"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Besedilna informacija, ko je skupina strnjena"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Barva ozadja stika/klepeta"
+
+msgid "The background color of a contact or chat"
+msgstr "Barva ozadja stika ali klepeta"
+
+msgid "Contact Text"
+msgstr "Besedilo za stik"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Besedilna informacija, ko je stik razpostrt"
+
+msgid "On-line Text"
+msgstr "Besedilo ob prisotnosti"
+
+msgid "The text information for when a buddy is online"
+msgstr "Besedilna informacija, ko je prijatelj povezan"
+
+msgid "Away Text"
+msgstr "Besedilo ob odsotnosti"
+
+msgid "The text information for when a buddy is away"
+msgstr "Besedilna informacija, ko je prijatelj nepovezan"
+
+msgid "Off-line Text"
+msgstr "Besedilo ob nepovezanosti"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Besedilna informacija, ko je prijatelj nepovezan"
+
+msgid "Idle Text"
+msgstr "Besedilo ob nedejavnosti"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Besedilna informacija, ko je prijatelj nedejaven"
+
+msgid "Message Text"
+msgstr "Besedilo sporočila"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Besedilna informacija, ko ima prijatelj neprebrano sporočilo"
+
+msgid "Message (Nick Said) Text"
+msgstr "Besedilo sporočila (je rekel vzdevek)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"Besedilna informacija, ko je v pomenku neprebrano sporočilo, ki omenja vaš "
+"vzdevek"
+
+msgid "The text information for a buddy's status"
+msgstr "Besedilni podatki o stanju uporabika"
+
+msgid "Type the host name for this certificate."
+msgstr "Vnesite ime gostitelja za to digitalno potrdilo."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Strežniki SSL"
@@ -10903,14 +10933,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Povabi prijatelja v pogovorno sobo"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Prosim vnesite ime uporabnika, ki ga želite povabiti, dodate pa lahko še "
-"povabilo."
-
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
@@ -10939,7 +10961,7 @@ msgstr "Prezri"
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Nazadnje rečeno"
 
 msgid "Unable to save icon file to disk."
@@ -10985,6 +11007,18 @@ msgstr "/Pogovor/_Shrani kot ..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Pogovor/Po_čisti pogovor"
 
+msgid "/Conversation/M_edia"
+msgstr "/Pogovor/M_ediji"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Pogovor/Mediji/_Zvočni klic"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Pogovor/Mediji/_Video klic"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Pogovor/Mediji/Zvočni\\/Video _klic"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Pošlji datoteko ..."
 
@@ -11057,6 +11091,15 @@ msgstr "/Pogovor"
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Pokaži dnevnik"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Pogovor/Mediji/Zvočni klic"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Pogovor/Mediji/Video klic"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Pogovor/Mediji/Zvočni\\/Video klic"
+
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
@@ -11241,6 +11284,9 @@ msgstr "oblikovalec"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Čung"
 
+msgid "voice and video"
+msgstr "glas in video"
+
 msgid "support"
 msgstr "podpora"
 
@@ -11365,6 +11411,9 @@ msgstr "hindujsko"
 msgid "Hungarian"
 msgstr "madžarsko"
 
+msgid "Armenian"
+msgstr "armensko"
+
 msgid "Indonesian"
 msgstr "indonezijsko"
 
@@ -11380,6 +11429,9 @@ msgstr "gruzijsko"
 msgid "Ubuntu Georgian Translators"
 msgstr "gruzijski prevajalci za Ubuntu"
 
+msgid "Khmer"
+msgstr "kmersko"
+
 msgid "Kannada"
 msgstr "kannadsko"
 
@@ -11458,6 +11510,9 @@ msgstr "sinhalsko"
 msgid "Swedish"
 msgstr "švedsko"
 
+msgid "Swahili"
+msgstr "svahili"
+
 msgid "Tamil"
 msgstr "tamilsko"
 
@@ -11768,14 +11823,6 @@ msgstr "_Počisti dokončane prenose"
 msgid "File transfer _details"
 msgstr "Po_drobnosti o prenosu"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Premor"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Nadaljuj"
-
 msgid "Paste as Plain _Text"
 msgstr "Prilepi kot navadno be_sedilo"
 
@@ -11794,8 +11841,8 @@ msgstr "Barva za risanje povezav."
 msgid "Hyperlink visited color"
 msgstr "Barva obiskane povezave"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
-msgstr "Barva za izpis hiperpovezav, ki ste jih že obiskali (ali aktivirali)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr "Barva za izpis hiperpovezav, ko ste jih že obiskali (ali aktivirali)."
 
 msgid "Hyperlink prelight color"
 msgstr "Barva presvetljene povezave"
@@ -11831,13 +11878,19 @@ msgstr "Barva izrisa imena na sporočilo dejanja."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Ime barve sporočila dejanja za šepetano sporočilo"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Barva izrisa imena za šepetano sporočilo dejanja."
+
 msgid "Whisper Message Name Color"
 msgstr "Barva imena šepetanega sporočila"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Barva izrisa imena za šepetano sporočilo."
+
 msgid "Typing notification color"
 msgstr "Barva obvestila o tipkanju"
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr "Barva pisave za obvestilo o tipkanju"
 
 msgid "Typing notification font"
@@ -11849,15 +11902,6 @@ msgstr "Pisava za obvestilo o tipkanju"
 msgid "Enable typing notification"
 msgstr "Omogoči obveščanje o tipkanju"
 
-msgid "_Copy Email Address"
-msgstr "_Kopiraj naslov e-pošte"
-
-msgid "_Open Link in Browser"
-msgstr "_Odpri povezavo v brskalniku"
-
-msgid "_Copy Link Location"
-msgstr "_Kopiraj lokacijo povezave"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11899,11 +11943,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Dodaj smejčka po meri ..."
 
@@ -11991,9 +12033,6 @@ msgstr "Pomanjšaj pisavo"
 msgid "Font Face"
 msgstr "Vrsta pisave"
 
-msgid "Background Color"
-msgstr "Barva ozadja"
-
 msgid "Foreground Color"
 msgstr "Barva ospredja"
 
@@ -12110,6 +12149,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12124,6 +12164,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    uporabi DIR za nastavitvene datoteke\n"
 "  -d, --debug         izpiši sporočila za razhroščevanje na stdout\n"
+"  -f, --force-online  vsili povezanost ne glede na stanje omrežja\n"
 "  -h, --help          izpiši to pomoč in končaj program\n"
 "  -m, --multiple      ne dovoljuj le enega zagnanega programa\n"
 "  -n, --nologin       brez samodejne prijave\n"
@@ -12140,6 +12181,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12153,6 +12195,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    uporabi DIR za nastavitvene datoteke\n"
 "  -d, --debug         izpiši sporočila za razhroščevanje na stdout\n"
+"  -f, --force-online  vsili povezanost ne glede na stanje omrežja\n"
 "  -h, --help          izpiši to pomoč in končaj program\n"
 "  -m, --multiple      ne dovoljuj le enega zagnanega programa\n"
 "  -n, --nologin       brez samodejne prijave\n"
@@ -12197,11 +12240,22 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Program se bo zaprl, ker je že zagnan drug odjemalec libpurple.\n"
 
-msgid "Open All Messages"
-msgstr "Odpri vsa sporočila"
+msgid "/_Media"
+msgstr "/_Mediji"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Dobili ste pošto!</span>"
+msgid "/Media/_Hangup"
+msgstr "/Mediji/_Odloži"
+
+msgid "Calling..."
+msgstr "Klicanje ..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s želi z vami začeti zvočno/video sejo."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s želi z vami začeti video sejo."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12236,6 +12290,25 @@ msgstr ""
 "Vašega brskalnika ni bilo mogoče zagnati, ker ste v nastavitvah izbrali "
 "poljuben brskalnik, a niste nastavili ukaza."
 
+msgid "No message"
+msgstr "Ni sporočil"
+
+msgid "Open All Messages"
+msgstr "Odpri vsa sporočila"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Dobili ste pošto!</span>"
+
+msgid "New Pounces"
+msgstr "Nova opozorila prijatelja"
+
+msgid "Dismiss"
+msgstr "Opusti"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Dobili ste opozorilo prijatelja!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Odloženi bodo naslednji vtičniki."
 
@@ -12284,10 +12357,16 @@ msgstr "<b>Podrobnosti o vtičniku</b>"
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
+msgid "Modify Buddy Pounce"
+msgstr "Spremeni opozorilo prijatelja"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Opozori koga"
 
+msgid "_Account:"
+msgstr "_Račun:"
+
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
@@ -12354,8 +12433,58 @@ msgstr "Ponavl_jajoč"
 msgid "Pounce Target"
 msgstr "Tarča opozorila"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Teme smejčkov ni mogoče razpakirati."
+#, c-format
+msgid "Started typing"
+msgstr "Začel je tipkati"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Postal je med tipkanjem"
+
+#, c-format
+msgid "Signed on"
+msgstr "Prijavil se je"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Postal je spet dejaven"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Vrnil se je iz odsotnosti"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Prenehal je tipkati"
+
+#, c-format
+msgid "Signed off"
+msgstr "Odjavil se je"
+
+#, c-format
+msgid "Became idle"
+msgstr "Postal je nedejaven"
+
+#, c-format
+msgid "Went away"
+msgstr "Odšel je"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Poslal je sporočilo"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Neznano ... Poročajte o tem!"
+
+msgid "Theme failed to unpack."
+msgstr "Teme ni mogoče razpakirati."
+
+msgid "Theme failed to load."
+msgstr "Tema se ni naložila."
+
+msgid "Theme failed to copy."
+msgstr "Teme ni mogoče kopirati."
 
 msgid "Install Theme"
 msgstr "Namesti temo"
@@ -12376,6 +12505,11 @@ msgstr "Tipke za bližnjice"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Zapri pomenke s tipko Esc"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Tema seznama prijateljev"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ikona na pladnju"
 
@@ -12385,8 +12519,8 @@ msgstr "_Pokaži sistemsko ikono na pladnju:"
 msgid "On unread messages"
 msgstr "ob neprebranih sporočilih"
 
-msgid "Conversation Window Hiding"
-msgstr "Skrivanje okna pogovora"
+msgid "Conversation Window"
+msgstr "Okno pogovora"
 
 msgid "_Hide new IM conversations:"
 msgstr "Skrij nove po_govore IM:"
@@ -12394,6 +12528,9 @@ msgstr "Skrij nove po_govore IM:"
 msgid "When away"
 msgstr "ob odsotnosti"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Poman_jšaj pogovorna okna"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Zavihki"
@@ -12452,9 +12589,6 @@ msgstr "Uporabi animirano drsenje"
 msgid "F_lash window when IMs are received"
 msgstr "Utripaj z _oknom, ko prispe novo sporočilo"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Poman_jšaj pogovorna okna"
-
 msgid "Minimum input area height in lines:"
 msgstr "Najmanjša višina vnosne površine v vrsticah:"
 
@@ -12486,14 +12620,12 @@ msgstr "Konfiguracijskega programa za posredovalni strežnik ni mogoče zagnati.
 msgid "Cannot start browser configuration program."
 msgstr "Konfiguracijskega programa brskalnika ni mogoče zagnati."
 
-msgid "ST_UN server:"
-msgstr "Strežnik ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Primer: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "_Samozaznaj naslov IP"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Uporabi _samozaznani naslov IP: %s"
 
 msgid "Public _IP:"
 msgstr "Javni _IP:"
@@ -12513,6 +12645,10 @@ msgstr "_Začetna vrata:"
 msgid "_End port:"
 msgstr "_Končna vrata:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Relejski strežnik (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Posredovalni strežnik in brskalnik"
 
@@ -12704,12 +12840,12 @@ msgstr "ob odsotnosti in nedejavnosti"
 msgid "Auto-away"
 msgstr "Samodejna odsotnost"
 
-msgid "Change status when _idle"
-msgstr "Spremeni stanje ob _nedejavnosti"
-
 msgid "_Minutes before becoming idle:"
 msgstr "Število _minut pred nedejavnostjo:"
 
+msgid "Change status when _idle"
+msgstr "Spremeni stanje ob _nedejavnosti"
+
 msgid "Change _status to:"
 msgstr "Spremeni _stanje v:"
 
@@ -12858,47 +12994,42 @@ msgstr "Shra_ni in uporabi"
 msgid "Status for %s"
 msgstr "Stanje za %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr "Smejček po meri za '%s' že obstaja. Navedite druge tipke za bližnjico."
+
 msgid "Custom Smiley"
 msgstr "Smejček po meri"
 
-msgid "More Data needed"
-msgstr "Potrebnih je več podatkov"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Podajte tipke za bližnjico, ki bodo povezane s smejčkom."
-
 msgid "Duplicate Shortcut"
 msgstr "Podvojena tipka za bližnjico"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Smejček po meri za izbrano kombinacijo tipk že obstaja. Navedite druge tipke "
-"za bližnjico."
-
-msgid "Please select an image for the smiley."
-msgstr "Izberite sliko smejčka."
-
 msgid "Edit Smiley"
 msgstr "Uredi smejčka"
 
 msgid "Add Smiley"
 msgstr "Dodaj smejčka"
 
-msgid "Smiley _Image"
-msgstr "Sli_ka smejčka"
+msgid "_Image:"
+msgstr "Sl_ika:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "_Tipke za bližnjice smejčka"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "_Besedilo za bližnjico:"
 
 msgid "Smiley"
 msgstr "Smejček"
 
+msgid "Shortcut Text"
+msgstr "Besedilo za bližnjico"
+
 msgid "Custom Smiley Manager"
 msgstr "Upravitelj smejčkov po meri"
 
+msgid "Select Buddy Icon"
+msgstr "Izberite ikono prijatelja"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Kliknite, če želite za ta račun spremeniti ikono prijatelja."
 
@@ -12982,8 +13113,8 @@ msgid "Cannot send launcher"
 msgstr "Ni mogoče poslati zaganjalnika"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Povlekli ste namizni zaganjalnik. Najverjetneje ste želeli namesto samega "
 "zaganjalnika poslati tisto, na kar ta zaganjalnik kaže."
@@ -13019,9 +13150,30 @@ msgid ""
 msgstr ""
 "Sliko '%s' ni mogoče naložiti: razlog ni znan, najbrž je datoteka okvarjena"
 
+msgid "_Open Link"
+msgstr "_Odpri povezavo"
+
+msgid "_Copy Link Location"
+msgstr "_Kopiraj lokacijo povezave"
+
+msgid "_Copy Email Address"
+msgstr "_Kopiraj naslov e-pošte"
+
+msgid "_Open File"
+msgstr "_Odpri datoteko"
+
+msgid "Open _Containing Directory"
+msgstr "Odpri v_sebujočo mapo"
+
 msgid "Save File"
 msgstr "Shrani datoteko"
 
+msgid "_Play Sound"
+msgstr "_Predvajaj zvok"
+
+msgid "_Save File"
+msgstr "_Shrani datoteko"
+
 msgid "Select color"
 msgstr "Izberite barvo"
 
@@ -13046,6 +13198,9 @@ msgstr "_Dodaj ..."
 msgid "_Open Mail"
 msgstr "_Odpri pošto"
 
+msgid "_Pause"
+msgstr "_Premor"
+
 msgid "_Edit"
 msgstr "_Uredi"
 
@@ -13109,6 +13264,66 @@ msgstr "Vtičnik za napovedovanje dosegljivosti stika."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Prikaže statistične podatke o dostopnosti vašega prijatelja"
 
+msgid "Server name request"
+msgstr "Zahteva po imenu strežnika"
+
+msgid "Enter an XMPP Server"
+msgstr "Vnesite strežnik XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Izberite strežnik XMPP za poizvedbo"
+
+msgid "Find Services"
+msgstr "Najdi storitve"
+
+msgid "Add to Buddy List"
+msgstr "Dodaj na seznam prijateljev"
+
+msgid "Gateway"
+msgstr "Prehod"
+
+msgid "Directory"
+msgstr "Imenik"
+
+msgid "PubSub Collection"
+msgstr "Zbirka PubSub"
+
+msgid "PubSub Leaf"
+msgstr "List PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Opis:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Odkrivanje storitev"
+
+msgid "_Browse"
+msgstr "Pre_brskaj"
+
+msgid "Server does not exist"
+msgstr "Strežnik ne obstaja"
+
+msgid "Server does not support service discovery"
+msgstr "Strežnik ne podpira odkrivanja storitev"
+
+msgid "XMPP Service Discovery"
+msgstr "Odkrivanje storitev XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Dovoljuje brskanje in registracijo storitev."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Ta vtičnik je uporaben za registriranje z opuščenimi prenosi ali drugimi "
+"storitvami XMPP."
+
 msgid "Buddy is idle"
 msgstr "Prijatelj je nedejaven"
 
@@ -13498,9 +13713,9 @@ msgstr "Vtičnik za glasbeno sporočanje - za skupinsko skladanje."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
-"Vtičnik za glasbeno sporočanje omogoča več uporabnikom hkratno sodelovanju "
+"Vtičnik za glasbeno sporočanje omogoča več uporabnikom hkratno sodelovanje "
 "pri glasbenem ustvarjanju kompozicije v resničnem času."
 
 #. ---------- "Notify For" ----------
@@ -13618,12 +13833,6 @@ msgstr ""
 "- prikaže vsa prispela sporočila, črkovana nazaj;\n"
 "- pošlje sporočilo prijateljem na vašem seznamu, takoj ko se prijavijo;"
 
-msgid "Cursor Color"
-msgstr "Barva kazalke"
-
-msgid "Secondary Cursor Color"
-msgstr "Drugotna barva kazalke"
-
 msgid "Hyperlink Color"
 msgstr "Barva povezave"
 
@@ -13633,6 +13842,9 @@ msgstr "Barva obiskane povezave"
 msgid "Highlighted Message Name Color"
 msgstr "Ime barve poudarjenih sporočil"
 
+msgid "Typing Notification Color"
+msgstr "Barva obvestila o tipkanju"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Vodoravno ločilo GtkTreeView"
 
@@ -13662,35 +13874,21 @@ msgstr "Pisava vmesnika GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema bližnjic besedila GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Barve vmesnika"
+msgid "Disable Typing Notification Text"
+msgstr "Onemogoči obveščanje o tipkanju"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "Nadzorne nastavitve teme GTK+"
 
-msgid "Widget Sizes"
-msgstr "Velikosti gradnikov"
+msgid "Colors"
+msgstr "Barve"
 
 msgid "Fonts"
 msgstr "Pisave"
 
+msgid "Miscellaneous"
+msgstr "Razno"
+
 msgid "Gtkrc File Tools"
 msgstr "Datotečna orodja Gtkrc"
 
@@ -13776,10 +13974,10 @@ msgstr "Gumb Pošlji okna pogovora"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Doda gumb Pošlji v vnosno območje pogovornega okna. Namenjeno za primere, ko "
-"fizična tipkovnica ni prisotna."
+"tipkovnica ni fizično prisotna."
 
 msgid "Duplicate Correction"
 msgstr "Popravek dvojnikov"
@@ -13832,6 +14030,98 @@ msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Zamenja besedilo v odhodnih sporočilih po uporabniško določenih pravilih."
 
+msgid "Just logged in"
+msgstr "Ravnokar prijavljen"
+
+msgid "Just logged out"
+msgstr "Ravnokar odjavljen"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Ikona stika/\n"
+"Ikona neznane osebe"
+
+msgid "Icon for Chat"
+msgstr "Ikona pomenka"
+
+msgid "Ignored"
+msgstr "Prezrt"
+
+msgid "Founder"
+msgstr "Ustanovitelj"
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "Operater"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr "Pol-operater"
+
+msgid "Authorization dialog"
+msgstr "Pogovorno okno overjanja"
+
+msgid "Error dialog"
+msgstr "Pogovorno okno napake"
+
+msgid "Information dialog"
+msgstr "Informativno pogovorno okno"
+
+msgid "Mail dialog"
+msgstr "Poštno pogovorno okno"
+
+msgid "Question dialog"
+msgstr "Vprašalno pogovorno okno"
+
+msgid "Warning dialog"
+msgstr "Opozorilno pogovorno okno"
+
+msgid "What kind of dialog is this?"
+msgstr "Kakšne vrste pogovorno okno je to?"
+
+msgid "Status Icons"
+msgstr "Ikone stanja"
+
+msgid "Chatroom Emblems"
+msgstr "Emblemi sobe pomenkov"
+
+msgid "Dialog Icons"
+msgstr "Ikone pogovora"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Urejevalnik tem ikon Pidgin"
+
+msgid "Contact"
+msgstr "Stik"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Urejevalnik tem seznama prijateljev Pidgin"
+
+msgid "Edit Buddylist Theme"
+msgstr "Uredi temo seznama prijateljev"
+
+msgid "Edit Icon Theme"
+msgstr "Uredi temo ikon"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Urejevalnik tem Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Urejevalnik tem Pidgin."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14000,9 +14290,9 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Nastavitve, specifične za %s v okolju Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Ponuja nastavitve, specifične za %s v okolju Windows, kot je sidranje "
+"Ponuja nastavitve, specifične za Pidgin v okolju Windows, kot je sidranje "
 "seznama prijateljev."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14043,6 +14333,518 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
 
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "Nepravilno oblikovan povezovalni strežnik BOSH"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Para ključev SILC ni mogoče naložiti"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s je zavrnil vaše povabilo za pogovor v sobi \"%s\", ker \"%s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Povabilo zavrnjeno"
+
+#~ msgid "_Resume"
+#~ msgstr "_Nadaljuj"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Vtičnice ni mogoče odpreti"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Poslušanje vtičnice ni možno"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Ne morem brati vtičnice"
+
+#~ msgid "Connection failed."
+#~ msgstr "Povezava ni uspela."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Strežnik ni več povezan"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Vtičnice ni bilo mogoče ustvariti"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Povezava do gostitelja ni uspela"
+
+#~ msgid "Read error"
+#~ msgstr "Napaka pri branju"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Povezave s strežnikom ni mogoče vzpostaviti:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Napaka pri pisanju"
+
+#~ msgid "Read Error"
+#~ msgstr "Napaka pri branju"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Povezava na strežnik neuspešna."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Bralni predpomnilnik je poln (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Sporočila ni mogoče razčleniti"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Povezava z gostiteljem ni uspela: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Prijava spodletela (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Ni se bilo mogoče povezati na strežnik."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Napaka. Podpora SSL ni nameščena."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Neveljavno geslo."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Povezava na strežnik BOS ni uspela:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Povezava ni uspela"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Odgovora strežnika ni mogoče dešifrirati"
+
+#~ msgid "Invalid username."
+#~ msgstr "Neveljavno uporabniško ime."
+
+#~ msgid "Connection lost"
+#~ msgstr "Povezava izgubljena"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Gostitelja ni mogoče razbrati"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Povezava zaprta (pisanje)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Povezava ponovno nastavljena"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Napaka pri branju iz vtičnice: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Ni se bilo mogoče povezati na strežnik."
+
+#~ msgid "Could not write"
+#~ msgstr "Ni mogoče pisati"
+
+#~ msgid "Could not connect"
+#~ msgstr "Povezava ni uspela"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Vtičnice ni bilo mogoče ustvariti"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Imena strežnika ni mogoče razločiti"
+
+#~ msgid "Incorrect Password"
+#~ msgstr "Nepravilno geslo"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Povezave s strežnikom %s ni mogoče vzpostaviti:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonska"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japonski strežnik pozivnika"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japonski strežnik prenosa datotek"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Izgubljena povezava s strežnikom\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Imena strežnika ni možno razločiti"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Povezava z %s ni uspela: strežnik zahteva TLS/SSL za prijavo, vendar "
+#~ "podpore za TLS/SSL ni mogoče najti."
+
+#~ msgid "_Proxy"
+#~ msgstr "_Posredovalni strežnik"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skrivanje okna pogovora"
+
+#~ msgid "Last Activity"
+#~ msgstr "Zadnja dejavnost"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Elementi razpoznave storitev"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Razširjeno naslavljanje kitic"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Večuporabniški pomenek"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Podatki o prisotnosti pri večuporabniškem pomenku"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Bitni tokovi v pasu"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Improvizirani ukazi"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Bajtni tokovi SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Zmanjkalo je pasovnih podatkov"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Prijava v pasu"
+
+#~ msgid "User Location"
+#~ msgstr "Lokacija uporabnika"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar uporabnika"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Obvestila o stanjih klepeta"
+
+#~ msgid "Software Version"
+#~ msgstr "Programska različica"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Vzpostavitev toka"
+
+#~ msgid "User Mood"
+#~ msgstr "Uporabnikovo počutje"
+
+#~ msgid "User Activity"
+#~ msgstr "Uporabnikova dejavnost"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Zmožnosti entitete"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Pogajanja šifrirane seje"
+
+#~ msgid "User Tune"
+#~ msgstr "Uporabnikova skladba"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Izmenjava elementov seznama"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Naslov dosegljivosti"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil uporabnika"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle - zvok"
+
+#~ msgid "User Nickname"
+#~ msgstr "Vzdevek uporabnika"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle - ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle - ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle - surovi UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle - video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle - DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Dokazila o prejemu sporočila"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Objava javnega ključa"
+
+#~ msgid "User Chatting"
+#~ msgstr "Uporabnik klepeta"
+
+#~ msgid "User Browsing"
+#~ msgstr "Uporabnik brska"
+
+#~ msgid "User Gaming"
+#~ msgstr "Uporabnik igra"
+
+#~ msgid "User Viewing"
+#~ msgstr "Uporabnik gleda"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Šifriranje kitic"
+
+#~ msgid "Entity Time"
+#~ msgstr "Čas entitete"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Zakasnjena dostava"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Podatkovni predmeti sodelovanja"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Hramba datotek in skupna raba"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Razpoznava storitev STUN za Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Poenostavljeno pogajanje šifrirane seje"
+
+#~ msgid "Hop Check"
+#~ msgstr "Preveri hop"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Kateri ID naj bo aktiviran?"
+
+#~ msgid "More Data needed"
+#~ msgstr "Potrebnih je več podatkov"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Podajte tipke za bližnjico, ki bodo povezane s smejčkom."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Izberite sliko smejčka."
+
+#~ msgid "Cursor Color"
+#~ msgstr "Barva kazalke"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Drugotna barva kazalke"
+
+#~ msgid "Interface colors"
+#~ msgstr "Barve vmesnika"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Velikosti gradnikov"
+
+#~ msgid "Invite message"
+#~ msgstr "Sporočilo povabila"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Vnesite ime uporabnika, ki ga želite povabiti,\n"
+#~ "dodate lahko tudi sporočilo - povabilo."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Poizvedujem za %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Povezovanje na %s ni uspelo"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Prijavljanje: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Datoteke %s ni bilo mogoče zapisati."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Datoteke %s ni bilo mogoče prebrati."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Sporočilo je predolgo, zato je bilo skrajšano za %s znakov."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s trenutno ni prijavljen."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Opozarjanje %s ni dovoljeno."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "Sporočilo je bilo izpuščeno, ker presegate omejitev hitrosti strežnika."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Pomenek v %s ni dostopen."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Prehitro pošiljate sporočila %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr ""
+#~ "Ker je bilo preveliko, ste zgrešili sporočilo, ki vam ga je poslal %s."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Zgrešili ste sporočilo od %s, ker je bilo poslano prehitro."
+
+#~ msgid "Failure."
+#~ msgstr "Neuspeh."
+
+#~ msgid "Too many matches."
+#~ msgstr "Preveč zadetkov."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Potrebujem več selekcije."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Imeniška storitev je trenutno nedosegljiva."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Poizvedba po e-poštnem naslovu je omejena."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Ključna beseda zanemarjena."
+
+#~ msgid "No keywords."
+#~ msgstr "Brez ključnih besed."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Uporabnik nima imeniških informacij."
+
+#~ msgid "Country not supported."
+#~ msgstr "Država ni podprta."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Neznan vzrok neuspeha: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Neveljavno uporabniško ime ali geslo."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Storitev je trenutno nedostopna."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr ""
+#~ "Vaša raven opozoril je trenutno previsoka, da bi se lahko prijavili."
+
+#~ 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 ""
+#~ "Prijavljali in odjavljali ste se prepogosto.  Počakajte deset minut in "
+#~ "poskusite ponovno.  Če tega ne boste upoštevali, bo trajalo še dlje."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Pri prijavljanju je prišlo do neznane napake: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Prišlo je do neznane napake %d. Info: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Neveljavno ime skupine"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Povezava zaprta"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Čakanje odgovora ..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC je nazaj z odmora. Sedaj lahko spet pošiljate sporočila."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Sprememba gesla uspešna"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Prikaži imeniške podatke"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Nastavi imeniške podatke"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Ne morem odpreti %s za pisanje!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Ni se bilo mogoče povezati za prenos."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Ni bilo mogoče zapisati glave datoteke. Datoteka ne bo prenešena."
+
+#~ msgid "Save As..."
+#~ msgstr "Shrani kot ..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s zahteva od %s, da sprejme %d datotek: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s zahteva od %s, da sprejme %d datoteko: %s (%.2f %s)%s%s"
+#~ msgstr[2] "%s zahteva od %s, da sprejme %d datoteki: %s (%.2f %s)%s%s"
+#~ msgstr[3] "%s zahteva od %s, da sprejme %d datoteke: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s zahteva, da jim pošljete datoteko"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Vtičnik za protokol TOC"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Možnosti"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Možnosti posredovalnega strežnika"
+
+#~ msgid "By log size"
+#~ msgstr "po obsegu dnevnika"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Odpri povezavo v brskalniku"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Strežnik ST_UN:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Sli_ka smejčka"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "_Tipke za bližnjice smejčka"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Adresarja MSN ni mogoče pridobiti."
 
@@ -14323,9 +15125,6 @@ msgstr ""
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "Vašo zahtevo za pridružitev skupini %d je odobril administrator %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Skupina je bila dodana na vaš seznam prijateljev."
-
 #~ msgid "I am applying to join"
 #~ msgstr "Prijavljam se za članstvo"
 
@@ -14359,9 +15158,6 @@ msgstr ""
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Prijava ni uspela. Preverite zapisnik razhroščevanja."
 
-#~ msgid "Unable to login"
-#~ msgstr "Prijava ni uspela"
-
 #~ msgid "Failed room reply"
 #~ msgstr "Spodleteli odgovor sobe"
 
@@ -14396,9 +15192,6 @@ msgstr ""
 #~ msgid "Group Operation Error"
 #~ msgstr "Napaka skupinske operacije"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Napaka pri zahtevanju prijavnega žetona"
-
 #~ msgid "TCP Address"
 #~ msgstr "Naslov TCP"
 
@@ -14483,9 +15276,6 @@ msgstr ""
 #~ "prijateljev. Vnesete lahko tudi psevdonim ali vzdevek prijatelja. Kjer bo "
 #~ "izvedljivo, bo namesto pojavnega imena prikazan vzdevek.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "Ra_čun:"
-
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Opozori le tedaj, ko moje stanje ni na voljo"
 
@@ -14504,22 +15294,12 @@ msgstr ""
 #~ msgid "Current media"
 #~ msgstr "Trenutni medij"
 
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Povezava s strežnikom OIM ni uspela."
-
 #~ msgid ""
 #~ "Sorry, passwords over %d characters in length (yours is %d) are not "
 #~ "supported by MySpace."
 #~ msgstr ""
 #~ "Žal MySpace ne podpira gesel, daljših od %d znakov (vaše jih ima %d)."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Obiščite http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username in izberite uporabniško ime ter se znova poskusite prijaviti."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Ni se bilo mogoče povezati na strežnik preko SSL."
 
diff --git a/po/sq.po b/po/sq.po
index 6cd09cc4af..73a6509faf 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-18 01:17-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-11-14 13:56+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <besnik@programeshqip.org>\n"
@@ -30,13 +30,13 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Për më tepër të dhëna provoni `%s -h'.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -618,20 +618,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Dërgoje Te"
 
-msgid "Invite message"
-msgstr "Mesazh ftese"
-
-#  Invite
-msgid "Invite"
-msgstr "Fto"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Ju lutem jepni emrin e përdoruesit që doni të ftoni,\n"
-"bashkë me një mesazh ftese në daçi."
-
 #  Conversations
 msgid "Conversation"
 msgstr "Bashkëbisedim"
@@ -896,6 +882,43 @@ msgstr "Tërë Bashkëbisedimet"
 msgid "System Log"
 msgstr "Regjistrim Sistemi"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Po llogaritet..."
+
+msgid "Hangup"
+msgstr ""
+
+#  *
+#  * A wrapper for Pidgin_request_action() that uses Accept and Cancel buttons.
+#. Number of actions
+msgid "Accept"
+msgstr "Prano"
+
+msgid "Reject"
+msgstr "Hidh tej"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Keni ikur prej kanalit%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "Email-e"
 
@@ -933,6 +956,10 @@ msgstr "Vazhdo"
 msgid "IM"
 msgstr "MA"
 
+#  Invite
+msgid "Invite"
+msgstr "Fto"
+
 msgid "(none)"
 msgstr "(asnjë)"
 
@@ -1143,7 +1170,6 @@ msgstr "%s është larguar. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ju ka dërguar një mesazh. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Akt i panjohur cytjeje. Ju lutem njoftojeni këtë!"
 
@@ -1190,7 +1216,6 @@ msgid "Change status to"
 msgstr "Ndryshoji gjendjen si"
 
 #  Conversations
-#. Conversations
 msgid "Conversations"
 msgstr "bashkëbisedime"
 
@@ -1516,7 +1541,6 @@ msgstr ""
 "Kur hapet një bashkëbisedim i ri kjo shtojcë do të fusë bashkëbisedimin e "
 "fundit te bashkëbisedimi i çastit."
 
-#, c-format
 msgid "Online"
 msgstr "I lidhur"
 
@@ -1564,6 +1588,28 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Shtojcë për \"lastlog\"."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL Melodie"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "llogari"
 
@@ -1666,15 +1712,6 @@ msgstr "Të pranohet dëshmia për %s?"
 msgid "SSL Certificate Verification"
 msgstr "Verifikim Dëshmie SSL"
 
-#  *
-#  * A wrapper for Pidgin_request_action() that uses Accept and Cancel buttons.
-#. Number of actions
-msgid "Accept"
-msgstr "Prano"
-
-msgid "Reject"
-msgstr "Hidh tej"
-
 msgid "_View Certificate..."
 msgstr "_Shihni Dëshmi..."
 
@@ -1778,6 +1815,8 @@ msgstr "+++ %s nënshkroi"
 msgid "+++ %s signed off"
 msgstr "+++ %s çnënshkroi"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Gabim i panjohur"
 
@@ -1825,6 +1864,18 @@ msgstr "%s doli prej dhomës."
 msgid "%s left the room (%s)."
 msgstr "%s doli prej dhomës (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Fto në Konferencë"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Ju lutem jepni emrin e përdoruesit që doni të ftoni, bashkë me një mesazh "
+"ftese në daçi."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Pasja e lidhjes dështoi: %s"
@@ -1963,7 +2014,6 @@ msgstr "Po niset shpërngulja e %s prej %s"
 msgid "Transfer of file %s complete"
 msgstr "Shpërngulje e kartelës %s e plotësuar"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Shpërngulje kartelash e plotësuar"
 
@@ -1971,7 +2021,6 @@ msgstr "Shpërngulje kartelash e plotësuar"
 msgid "You canceled the transfer of %s"
 msgstr "Anuluat shpërnguljen e %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Shpërngulje kartelash e anuluar"
 
@@ -2182,11 +2231,14 @@ msgstr "<font color=\"red\"><b>Nuk mund të lexojë kartelë: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <VETË-PËRGJIGJU>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Gabim në krijimin e lidhjes"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Po përdorni %s, por kjo shtojcë lyp %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Kjo shtojcë nuk ka ID të përcaktuar."
 
@@ -2634,9 +2686,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Përfshin te parës regjistrimesh regjistrim prej tjetër klienti MA-sh."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2691,8 +2744,9 @@ msgstr "Simulim Mesazhi për Offline"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Ruaji si cytje mesazhet e dërguar te një përdorues jo në linjë."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Ç'mbetet nga mesazhi do të ruhet si cytje. Mund ta përpunoni/fshini cytjen "
@@ -2726,6 +2780,33 @@ msgstr "Ruaji mesazhet offline si cytje"
 msgid "Do not ask. Always save in pounce."
 msgstr "Mos pyet. Ruaji përherë si cytje."
 
+#  if (js->protocol_options & CHANGE_PASSWORD) {
+#, fuzzy
+msgid "One Time Password"
+msgstr "Jepni Fjalëkalimin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -2995,14 +3076,16 @@ msgstr ""
 "Nuk u gjet dot instalim i Active TCL. Nëse dëshironi të përdorni shtojca "
 "TCL, instaloni ActiveTCL prej http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Nuk u gjet grupi i mjeteve Apple Bonjour For Windows, për më tepër të dhëna "
 "shihni FAQ te: http://d.pidgin.im/BonjourWindows."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "I pazoti të presë për lidhje MA ardhëse\n"
 
 msgid ""
@@ -3010,7 +3093,6 @@ msgid ""
 msgstr ""
 "I pazoti të vendosë lidhje me shërbyesin mDNS vendor.  A është duke xhiruar?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Emër"
 
@@ -3053,6 +3135,11 @@ msgstr "Shtojcë Protokolli Bonjour"
 msgid "Purple Person"
 msgstr "Person i Purpurt"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Lokalitet"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3063,14 +3150,21 @@ msgstr "%s mbylli bashkëbisedimin"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "I pazoti të dërgojë mesazh, nuk u nis dot bashkëbisedimi."
 
-msgid "Cannot open socket"
-msgstr "S'hap dot \"socket\""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"I pazoti të krijojë \"socket\":\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Nuk lidhi dot \"socket\"-in te porta"
 
-msgid "Could not listen on socket"
-msgstr "Nuk u dëgjua dot te \"socket\"-i"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"I pazoti të krijojë \"socket\":\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Gabim gjatë komunikimit me mDNSResponder vendor."
@@ -3119,13 +3213,16 @@ msgstr "Ruaj listë shokësh..."
 msgid "Load buddylist from file..."
 msgstr "Ngarko listë shokësh prej kartele..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Plotësoni fushat e regjistrimin."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Fjalëkalimet nuk përputhen."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "I pazoti të regjistrojë llogari të re. ndodhi një gabim.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3137,14 +3234,15 @@ msgstr "Regjistrimi u plotësua me sukses!"
 msgid "Password"
 msgstr "Fjalëkalim"
 
-msgid "Password (retype)"
-msgstr "Fjalëkalim (rishtypeni)"
+msgid "Password (again)"
+msgstr "Fjalëkalim (sërish)"
 
-msgid "Enter current token"
-msgstr "Jepni \"token\"-in e çastit"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "\"Token\" i çastit"
+#, fuzzy
+msgid "Captcha"
+msgstr "Pamje Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Regjistro Llogari të Re Gadu-Gadu"
@@ -3199,6 +3297,15 @@ msgstr "Fjalëkalimi u ndryshua me sukses!"
 msgid "Current password"
 msgstr "Fjalëkalim i çastit."
 
+msgid "Password (retype)"
+msgstr "Fjalëkalim (rishtypeni)"
+
+msgid "Enter current token"
+msgstr "Jepni \"token\"-in e çastit"
+
+msgid "Current token"
+msgstr "\"Token\" i çastit"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Ju lutem jepni fjalëkalimin tuaj të çastit dhe fjalëkalimin tuaj të ri për "
@@ -3214,13 +3321,13 @@ msgstr "Përzgjidhni fjalosje për shokun: %s"
 msgid "Add to chat..."
 msgstr "Shto te fjalosje..."
 
+#. Global
 msgid "Available"
 msgstr "I mundshëm"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Larguar"
 
@@ -3249,8 +3356,8 @@ msgstr "S'u gjetën përputhje me ndonjë përdorues"
 msgid "There are no users matching your search criteria."
 msgstr "Kriteri juaj i kërkimit nuk ka përputhje për asnjë përdorues. "
 
-msgid "Unable to read socket"
-msgstr "I pazoti të lexojë \"socket\"-in"
+msgid "Unable to read from socket"
+msgstr "I pazoti të lexojë prej \"socket\"-i"
 
 msgid "Buddy list downloaded"
 msgstr "Listë shokësh e shkarkuar"
@@ -3264,7 +3371,13 @@ msgstr "Listë shokësh e ngarkuar"
 msgid "Your buddy list was stored on the server."
 msgstr "Lista juaj e shokëve është ruajtur në shërbyes."
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "I lidhur"
+
+msgid "Connection failed"
 msgstr "Lidhja dështoi"
 
 msgid "Add to chat"
@@ -3273,13 +3386,24 @@ msgstr "Shto te fjalosje"
 msgid "Chat _name:"
 msgstr "_Emër fjalosjeje:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "I pazoti të lidhet me shërbyesin."
+
+#  connect to the server
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Po bëhet lidhja"
+
 msgid "Chat error"
 msgstr "Gabim fjalosjeje"
 
 msgid "This chat name is already in use"
 msgstr "Ky emër fjalosjeje është tashmë në përdorim"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "I palidhur te shërbyesi."
 
 msgid "Find buddies..."
@@ -3332,6 +3456,10 @@ msgstr "MA popullor polak"
 msgid "Gadu-Gadu User"
 msgstr "Përdorues Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Kap shërbyesin ..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Urdhër i panjohur: %s"
@@ -3346,7 +3474,8 @@ msgstr "Nuk është caktuar temë"
 msgid "File Transfer Failed"
 msgstr "Shpërngulja e Kartelave Dështoi"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "S'u hap dot një portë dëgjuese."
 
 msgid "Error displaying MOTD"
@@ -3362,8 +3491,18 @@ msgstr "Nuk ka MOTD shoqëruar kësaj lidhjeje."
 msgid "MOTD for %s"
 msgstr "MOTD për %s"
 
-msgid "Server has disconnected"
-msgstr "Shërbyesi është shkëputur"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Humbi lidhja me shërbyesin:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Shihni MOTD"
@@ -3374,26 +3513,24 @@ msgstr "_Kanal:"
 msgid "_Password:"
 msgstr "_Fjalëkalim:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Nofka IRC nuk duhet të përmbajnë hapësira"
 
-#  connect to the server
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Po bëhet lidhja"
-
 msgid "SSL support unavailable"
 msgstr "Suport SSL jo i mundshëm"
 
-msgid "Couldn't create socket"
-msgstr "S'munda të krijojë \"socket\""
+msgid "Unable to connect"
+msgstr "I pazoti të lidhet"
 
-msgid "Couldn't connect to host"
-msgstr "S'munda të lidhem te strehë"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "I pazoti të lidhet te %s."
 
-msgid "Read error"
-msgstr "Gabim leximi"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Shërbyesi e mbylli lidhjen."
 
 msgid "Users"
 msgstr "Përdoruesa"
@@ -3592,6 +3729,17 @@ msgstr ""
 "Emri i llogarisë përzgjedhur prej jush u hodh tej nga shërbyesi. Ka të "
 "ngjarë përmban shenja të pavlefshme."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Ky emër fjalosjeje është tashmë në përdorim"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Nofkë"
+
 msgid "Cannot change nick"
 msgstr "S'ndryshon dot nofkë"
 
@@ -3830,10 +3978,12 @@ msgstr "Urdhri Ad-Hoc Dështoi"
 msgid "execute"
 msgstr "përmbush"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Shërbyesi lyp TLS/SSL për hyrje. Nuk u gjet suport për TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Shërbyesi lyp kodim, por nuk u gjet mbulim për TLS/SSL-në."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3852,18 +4002,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Mirëfilltësim me bazë Tekst të Thjeshtë"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Dështoi mirëflltësimi"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Përgjigje e pavlefshme prej shërbyesit."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Shërbyesi nuk përdor ndonjë metodë mirëfilltësimi që mbulohet"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Kërkoni kodim, por ky nuk është i mundshëm në këtë shërbyes."
+
 msgid "Invalid challenge from server"
 msgstr "Sfidë e pavlefshme prej shërbyesit."
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Gabim SASL"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Nuk u dha arsye"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Version i Pambuluar"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Nuk u vendos dot lidhje me shërbyesin:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Nuk u vendos dot lidhje me shërbyesin:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "I pazoti të gatisë lidhjen"
+
 msgid "Full Name"
 msgstr "Emër i Plotë"
 
@@ -3932,165 +4118,9 @@ msgstr "Klient"
 msgid "Operating System"
 msgstr "Sistem Operativ"
 
-msgid "Last Activity"
-msgstr "Veprimtaria e Fundit"
-
-msgid "Service Discovery Info"
-msgstr "Të dhëna Zbulimi Shërbimesh"
-
-msgid "Service Discovery Items"
-msgstr "Objekte Zbulimi Shërbimesh"
-
-msgid "Extended Stanza Addressing"
-msgstr "Adresim i Zgjeruar Stanza"
-
-msgid "Multi-User Chat"
-msgstr "Fjalosje me Shumë Përdorues"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Të dhëna Pranie të Zgjeruar në Fjalosje me Shumë Përdorues"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Urdhra Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Shërbim PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreams"
-
-msgid "Out of Band Data"
-msgstr "Pa të Dhëna Bande"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Vendndodhje Përdoruesi"
-
-msgid "User Avatar"
-msgstr "Avatar Përdoruesi"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-msgid "Chat State Notifications"
-msgstr "Njoftime Gjendjeje Fjalosjeje"
-
-msgid "Software Version"
-msgstr "Version Software-i"
-
-msgid "Stream Initiation"
-msgstr "Fillim Rrjedhe"
-
-msgid "File Transfer"
-msgstr "Shpërngulje Kartele"
-
-msgid "User Mood"
-msgstr "Humor Përdoruesi"
-
-msgid "User Activity"
-msgstr "Veprimtari Përdoruesi"
-
-msgid "Entity Capabilities"
-msgstr "Aftësi Njësie"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negociata Sesioni të Koduar"
-
-msgid "User Tune"
-msgstr "Melodi Përdoruesi"
-
-msgid "Roster Item Exchange"
-msgstr "Shkëmbim Objekti Roster"
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Profil Përdoruesi"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Audio Jingle"
-
-msgid "User Nickname"
-msgstr "Nofkë Përdoruesi"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Video Jingle"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Fatura Mesazhesh"
-
-msgid "Public Key Publishing"
-msgstr "Botim Kyçi Publik"
-
-msgid "User Chatting"
-msgstr "Fjalosje Përdoruesi"
-
-msgid "User Browsing"
-msgstr "Shfletim Përdoruesi"
-
-msgid "User Gaming"
-msgstr "Lojë Përdoruesi"
-
-msgid "User Viewing"
-msgstr "Parje Përdoruesi"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Kodim Stanza"
-
-msgid "Entity Time"
-msgstr "Kohë Njësie"
-
-msgid "Delayed Delivery"
-msgstr "Dërgim i Vonuar"
-
-msgid "Collaborative Data Objects"
-msgstr "Objekte Të Dhënash Bashkëpunimi"
-
-msgid "File Repository and Sharing"
-msgstr "Depo Kartelash dhe Ndarje"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN Service Discovery për Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociata Sesioni të Koduar të Thjeshtëzuar"
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Aftësi"
+#, fuzzy
+msgid "Local Time"
+msgstr "Kartelë Vendore:"
 
 msgid "Priority"
 msgstr "Përparësi"
@@ -4098,6 +4128,14 @@ msgstr "Përparësi"
 msgid "Resource"
 msgstr "Burime"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "I futur"
+
 msgid "Middle Name"
 msgstr "Emër i Mesit"
 
@@ -4148,7 +4186,6 @@ msgstr "Muhabetçi"
 msgid "Extended Away"
 msgstr "Larguar e Zgjeruar"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Mos Bezdis"
 
@@ -4273,28 +4310,26 @@ msgstr "Përzgjidhni një shërbyes konferencash për kërkesë"
 msgid "Find Rooms"
 msgstr "Gjej Dhoma"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Kërkoni kodim, por ky nuk është i mundshëm në këtë shërbyes."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
-msgid "Write error"
-msgstr "Gabim shkrimi"
+#, fuzzy
+msgid "No users found"
+msgstr "S'u gjetën përputhje me ndonjë përdorues"
 
-msgid "Ping timeout"
-msgstr "Skadim kohe për ping-un"
+#, fuzzy
+msgid "Roles:"
+msgstr "Rol"
 
-msgid "Read Error"
-msgstr "Gabim Leximi"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Skadim kohe për ping-un"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Nuk u vendos dot lidhje me shërbyesin:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "I pazoti të krijojë \"socket\""
 
 msgid "Invalid XMPP ID"
 msgstr "ID XMPP i pavlefshëm"
@@ -4302,6 +4337,10 @@ msgstr "ID XMPP i pavlefshëm"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP i pavlefshëm. Duhet caktuar përkatësia."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Dështoi në lidhjen me shërbyesin."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Regjistrim i %s@%s i suksesshëm"
@@ -4326,9 +4365,6 @@ msgstr "Çregjistrim i Suksesshëm"
 msgid "Unregistration Failed"
 msgstr "Çregjistrimi Dështoi"
 
-msgid "Already Registered"
-msgstr "Tashmë i Regjistruar"
-
 #  State
 msgid "State"
 msgstr "Shtet"
@@ -4342,6 +4378,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Datë"
 
+msgid "Already Registered"
+msgstr "Tashmë i Regjistruar"
+
 #  Register button
 msgid "Unregister"
 msgstr "Çregjistrohuni"
@@ -4375,6 +4414,10 @@ msgstr "Regjistro Llogari të Re te %s"
 msgid "Change Registration"
 msgstr "Ndrysho Regjistrimin"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Dështoi në lidhjen me shërbyesin."
+
 msgid "Error unregistering account"
 msgstr "Gabim në çregjistrimin e llogarisë"
 
@@ -4393,9 +4436,18 @@ msgstr "Po kryhet mirëfilltësimi"
 msgid "Re-initializing Stream"
 msgstr "Po rigatitet Rrjedha"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "I pa Autorizuar"
 
+msgid "Mood"
+msgstr "Humor"
+
+msgid "Now Listening"
+msgstr "Në Dëgjim"
+
 msgid "Both"
 msgstr "Të dyja"
 
@@ -4417,12 +4469,6 @@ msgstr "Asnjë"
 msgid "Subscription"
 msgstr "Regjistrim"
 
-msgid "Mood"
-msgstr "Humor"
-
-msgid "Now Listening"
-msgstr "Në Dëgjim"
-
 msgid "Mood Text"
 msgstr "Tekst Humori"
 
@@ -4465,9 +4511,6 @@ msgstr "Fjalëkalimi juaj është ndryshuar."
 msgid "Error changing password"
 msgstr "Gabim në ndryshim fjalëkalimi "
 
-msgid "Password (again)"
-msgstr "Fjalëkalim (sërish)"
-
 #  if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change XMPP Password"
 msgstr "Ndrysho Fjalëkalimin për XMPP"
@@ -4662,20 +4705,26 @@ msgstr "I pazoti të përzërë përdoruesin %s"
 msgid "Unable to ping user %s"
 msgstr "I pazoti të dërgojë ping për përdoruesin %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Nuk i dërgohet dot bzzzz, ngaqë nuk njihet gjë rreth përdoruesit %s."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "Nuk i dërgohet dot bzzzz, ngaqë përdoruesi %s mund të jetë i shkëputur."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 "I pazoti të dërgojë bzzz, ngaqë përdoruesi %s nuk mbulon veprim të tillë."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Po dërgohet bzzz për %s..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4685,9 +4734,36 @@ msgstr "Buzz"
 msgid "%s has buzzed you!"
 msgstr "%s ju ka dërguar bzzz!"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Po dërgohet bzzz për %s..."
+#  TODO: Improve this! message to who or for what conference?
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "I pazoti të dërgojë mesazh te %s, JID i pavlefshëm"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "I pazoti të dërgojë kartelë te %s, përdoruesi nuk është i lidhur"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "I pazoti të dërgojë kartelë te %s, pa pajtim te prani përdoruesi"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Dështoi Regjistrimi"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Ju lutem përzgjidhni burimin e %s te i cili dëshironi të dërgoni një kartelë"
+
+msgid "Select a Resource"
+msgstr "Përzgjidhni Burim"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Nis _Fjalosje"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Formëso një dhomë fjalosjeje."
@@ -4707,16 +4783,18 @@ msgstr "topic [temë e re]:  Shihni ose ndryshoni temën."
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;përdorues&gt; [arsye]:  Ndaloji një përdoruesi dhomën."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "degëzon &lt;përdorues&gt; &lt;zotërues|admin|anëtar|outcast|asnjë&gt;: "
 "Vendos lidhjen e përdoruesit me dhomën."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "rol &lt;përdorues&gt; &lt;moderator|pjesëmarrës|vizitor|asnjë&gt;: Cakto rol "
 "përdoruesi në dhomë."
@@ -4793,6 +4871,9 @@ msgstr "Lidhu me shërbyes"
 msgid "File transfer proxies"
 msgstr "Ndërmjetësa shpërnguljesh kartelash"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4831,6 +4912,14 @@ msgstr "Gabim përtypjeje XML"
 msgid "Unknown Error in presence"
 msgstr "Gabim i Panjohur te prania"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Gabim në hyrjen te fjalosje %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Gabim në fjalosje %s"
+
 msgid "Create New Room"
 msgstr "Krijo Dhomë të Re"
 
@@ -4847,13 +4936,32 @@ msgstr "_Formësoni Dhomën"
 msgid "_Accept Defaults"
 msgstr "_Prano Parazgjedhjet"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Gabim në hyrjen te fjalosje %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nuk u dha arsye"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Gabim në fjalosje %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Jeni përzënë prej %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Përzënë prej %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Ndodhi një gabim gjatë hapjes së kartelës."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Shpërngulja e Kartelave Dështoi"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Dështoi hapja e kartelës '%s': %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4882,9 +4990,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 "Ju lutem përzgjidhni burimin e %s te i cili dëshironi të dërgoni një kartelë"
 
-msgid "Select a Resource"
-msgstr "Përzgjidhni Burim"
-
 msgid "Edit User Mood"
 msgstr "Përpunoni Humor Përdoruesi"
 
@@ -4919,9 +5024,6 @@ msgstr "Veprime"
 msgid "Select an action"
 msgstr "Përzgjidhni veprim"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "I pazoti të marrë Libër Vendndodhjesh MSN"
-
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
@@ -5164,7 +5266,6 @@ msgstr "Pasaportë të Vegjlish pa miratim prindi"
 msgid "Passport account not yet verified"
 msgstr "Llogari pasaporte ende e paverifikuar"
 
-#, c-format
 msgid "Passport account suspended"
 msgstr "U pezullua llogari letërnjoftimi"
 
@@ -5186,6 +5287,10 @@ msgstr "Kontakte të Tjera"
 msgid "Non-IM Contacts"
 msgstr "Kontakte Jo-IM"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ju dërgoi një ftesë për kamera web, çka nuk mbulohet ende."
+
 msgid "Nudge"
 msgstr ""
 
@@ -5341,9 +5446,6 @@ msgstr "Nis _Fjalosje"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "Lypset mbulim SSL për MSN. Ju lutem instaloni një librari suporti SSL."
 
-msgid "Failed to connect to server."
-msgstr "Dështoi në lidhjen me shërbyesin."
-
 msgid "Error retrieving profile"
 msgstr "Gabim në marrje profili"
 
@@ -5556,64 +5658,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Mirëfilltësim ID-je Windows Live:Përgjigje e pavlefshme"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s nuk është një grup i vlefshëm."
-
-msgid "Unknown error."
-msgstr "Gabim i panjohur."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s në %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s sapo ju dërgoi një Bërryl!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Gabim i panjohur (%d)"
 
 msgid "Unable to add user"
 msgstr "I pazoti të shtojë përdorues"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Mungojnë përdoruesit vijues te libri juaj i vendndodhjeve"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "I pazoti të shtojë përdorues te %s (%s)"
-
 #, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "I pazoti të bllokojë përdorues te %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "I pazoti të lejojë përdorues te %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nuk mund të shtohej sepse lista juaj e shokëve është plot."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nuk është pasaportë e vlefshme llogarie"
+msgid "Unknown error (%d)"
+msgstr "Gabim i panjohur (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Shërbim Përkohësisht i Pakapshëm"
+msgid "The following users are missing from your addressbook"
+msgstr "Mungojnë përdoruesit vijues te libri juaj i vendndodhjeve"
 
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mesazhi për celular nuk u dërgua dot, ngaqë qe shumë i gjatë."
 
-msgid "Unable to rename group"
-msgstr "I pazoti të riemërtojë grup"
-
-msgid "Unable to delete group"
-msgstr "I pazoti të fshijë grup"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5658,9 +5723,6 @@ msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim i panjohur kodimi."
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim i panjohur."
 
-msgid "Unable to connect"
-msgstr "I pazoti të lidhet"
-
 msgid "Writing error"
 msgstr "Gabim shkrimi"
 
@@ -5675,20 +5737,24 @@ msgstr ""
 "Gabim lidhjeje nga shërbyesi %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Protokolli ynë nuk mbulohet nga shërbyesi."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Gabim në përtypjen e HTTP-së."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Keni nënshkruar prej një tjetër vendi."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Shërbyesat MSN janë përkohësisht jashtë pune. Ju lutem prisni dhe riprovoni."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Shërbyesat MSN po ndalen përkohësisht."
 
 #  TODO: Improve this! message to who or for what conference?
@@ -5720,6 +5786,14 @@ msgstr "Po dërgohet \"cookie\""
 msgid "Retrieving buddy list"
 msgstr "Po merret listë shokësh"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ju dërgoi një ftesë për kamera web, çka nuk mbulohet ende."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ju dërgoi një ftesë për kamera web, çka nuk mbulohet ende."
+
 msgid "Away From Computer"
 msgstr "Larg Prej Kompjuterit"
 
@@ -5759,14 +5833,6 @@ msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim me \"switchboard\"-in
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim i panjohur:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ju ka shtuar te lista e tij (saj) e shokëve."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ju ka hequr prej listës së tij (saj) të shokëve."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Ta Fshijë Shokun prej Libri Vendndodhjesh?"
 
@@ -5807,6 +5873,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Shtojcë Protokolli MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nuk është një grup i vlefshëm."
+
+msgid "Unknown error."
+msgstr "Gabim i panjohur."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s në %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "I pazoti të shtojë përdorues te %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "I pazoti të bllokojë përdorues te %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "I pazoti të lejojë përdorues te %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nuk mund të shtohej sepse lista juaj e shokëve është plot."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nuk është pasaportë e vlefshme llogarie"
+
+msgid "Service Temporarily Unavailable."
+msgstr "Shërbim Përkohësisht i Pakapshëm"
+
+msgid "Unable to rename group"
+msgstr "I pazoti të riemërtojë grup"
+
+msgid "Unable to delete group"
+msgstr "I pazoti të fshijë grup"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ju ka shtuar te lista e tij (saj) e shokëve."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ju ka hequr prej listës së tij (saj) të shokëve."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "S'ka përdorues të tillë: %s"
 
@@ -5840,6 +5954,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Mesazhe poste të rinj"
 
@@ -5878,44 +5994,30 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Shto kontakte prej shërbyesit"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "I lidhur"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Gabim protokolli, kod %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Fjalëkalimi juaj është %d shenja i gjatë, më tepër se gjatësia maksimum e "
 "pritshme prej %d për MySpaceIM. Ju lutem shkurtojeni fjalëkalimin tuaj te "
 "http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
 "changePassword dhe riprovoni."
 
+msgid "Incorrect username or password"
+msgstr "Emër përdoruesi ose fjalëkalim i pavlefshëm"
+
 msgid "MySpaceIM Error"
 msgstr "Gabim MySpaceIM"
 
 msgid "Invalid input condition"
 msgstr "Kusht i pavlefshëm futjeje"
 
-msgid "Read buffer full (2)"
-msgstr "Shtytëz leximi plot (2)"
-
-msgid "Unparseable message"
-msgstr "Mesazh i papërtypshëm"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "S'u lidha dot te strehë: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Shtimi i shokut dështoi"
 
@@ -6000,6 +6102,12 @@ msgstr "Miq Gjithsej"
 msgid "Client Version"
 msgstr "Version Klienti"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Emër përdoruesi i Passhëm"
 
@@ -6216,9 +6324,6 @@ msgstr "S'shton dot veten tuaj"
 msgid "Master archive is misconfigured"
 msgstr "Arkiva kryesore është e keqformësuar"
 
-msgid "Incorrect username or password"
-msgstr "Emër përdoruesi ose fjalëkalim i pavlefshëm"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nuk u njoh dot streha e emrit të përdoruesit që dhatë"
 
@@ -6260,9 +6365,9 @@ msgstr "ose përdoruesi është i palidhur ose ju jeni të bllokuar"
 msgid "Unknown error: 0x%X"
 msgstr "Gabim i panjohur: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Hyrja dështoi (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "I pazoti të dërgojë ping për përdoruesin %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6373,9 +6478,6 @@ msgstr "Konferencë GroupWise %d"
 msgid "Authenticating..."
 msgstr "Po kryhet mirëfilltësimi..."
 
-msgid "Unable to connect to server."
-msgstr "I pazoti të lidhet me shërbyesin."
-
 msgid "Waiting for response..."
 msgstr "Në pritje të përgjigjes..."
 
@@ -6399,9 +6501,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Do të donit të merrni pjesë në diskutim?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Jeni nxjerrë jashtë ngaqë jeni futur prej një tjetër kompjuteri."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6411,17 +6510,14 @@ msgstr ""
 #  TODO: Would be nice to prompt if not set!
 #  *  Pidgin_request_fields(gc, _("Server Address"),...);
 #  ...but for now just error out with a nice message.
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "I pazoti të lidhet me shërbyesin. Ju lutem jepni vendndodhjen e shërbyesit "
 "që doni të kontaktohet."
 
-msgid "Error. SSL support is not installed."
-msgstr "Gabim. Nuk është instaluar suport për SSL."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Kjo konferencë është mbyllur. S'mund të dërgohen më mesazhe."
 
@@ -6455,24 +6551,33 @@ msgstr "Vendndodhje shërbyesi"
 msgid "Server port"
 msgstr "Portë Shërbyesi"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "U mor prej shërbyesit përgjigje HTTP e papritur."
+
+#. username connecting too frequently
+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 ""
+"Jeni lidhur e shkëputur shumë shpesh. Prisni dhjetë minuta dhe riprovoni. "
+"nëse vazhdoni të provoni, do t'ju duhet të prisni edhe më."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Gabim në shquajtjen e %s"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Nuk u bë dot futja në dhomën e fjalosjes"
 
 msgid "Invalid chat room name"
 msgstr "U dha emër i pavlefshëm dhome fjalosjeje."
 
-msgid "Server closed the connection."
-msgstr "Shërbyesi e mbylli lidhjen."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Humbi lidhja me shërbyesin:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "U morën të dhëna të pavlefshme rreth lidhjes me shërbyesin."
 
 #  *< api_version
@@ -6540,7 +6645,8 @@ msgstr "Humbi lidhja me përdoruesin e largët:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "U morën të dhëna të pavlefshme rreth lidhjes me përdoruesin e largët."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Nuk u vendos dot lidhje me përdoruesin e largët."
 
 msgid "Direct IM established"
@@ -6718,23 +6824,18 @@ msgstr "Kamera"
 msgid "Screen Sharing"
 msgstr "Ekrani i Përbashkët"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "I lirë Për Fjalosje"
 
-#, c-format
 msgid "Not Available"
 msgstr "Jo i mundshëm"
 
-#, c-format
 msgid "Occupied"
 msgstr "I zënë"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Me Web-in  Parasysh"
 
-#, c-format
 msgid "Invisible"
 msgstr "I padukshëm"
 
@@ -6747,21 +6848,15 @@ msgstr "Shkallë Sinjalizimi"
 msgid "Buddy Comment"
 msgstr "Koment Shoku"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Nuk u bë dot lidhja me shërbyesin e mirëfilltësimeve:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Nuk u bë dot lidhja me shërbyesin BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "I pazoti të lidhet me shërbyesin."
 
 msgid "Username sent"
 msgstr "U dërgua emri i përdoruesit"
@@ -6773,27 +6868,40 @@ msgstr "Lidhje e vendosur, \"cookie\" u dërgua"
 msgid "Finalizing connection"
 msgstr "Po finalizohet lidhja"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "I pazoti të futet: Nuk hyri dot si %s sepse emri i përdoruesit është i "
 "pavlefshëm.  Emrat e përdoruesve duhet të jenë venndodhje email të vlefshme, "
 "ose duhet të fillojnë me një gërmë dhe të përmbajnë vetëm gërma, numra dhe "
 "hapësira, ose të përmbajnë vetëm numra."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Emër përdoruesi i pavlefshëm."
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Edhe pak edhe mundet t'ju shkëpusin.  Shihni %s për përditësime."
 
-msgid "Incorrect password."
-msgstr "Fjalëkalim i pasaktë."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nuk u mor dot hash i vlefshëm hyrjeje në AIM."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nuk u mor dot hash i vlefshëm hyrjeje"
+
+msgid "Received authorization"
+msgstr "Mirëfilltësim i marrë"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Përdoruesi nuk ekziston"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Llogaria juaj për çastin është e pezulluar."
 
 #  service temporarily unavailable
@@ -6801,28 +6909,23 @@ msgstr "Llogaria juaj për çastin është e pezulluar."
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Shërbimi AOL Instant Messenger është përkohësisht i pamundur."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Jeni lidhur e shkëputur shumë shpesh. Prisni dhjetë minuta dhe riprovoni. "
-"nëse vazhdoni të provoni, do t'ju duhet të prisni edhe më."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Versioni i klientit që po përdorni është shumë i vjetër. Ju lutem "
 "përditësojeni prej %s"
 
-msgid "Could Not Connect"
-msgstr "Nuk u Lidh Dot"
-
-msgid "Received authorization"
-msgstr "Mirëfilltësim i marrë"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Jeni lidhur e shkëputur shumë shpesh. Prisni dhjetë minuta dhe riprovoni. "
+"nëse vazhdoni të provoni, do t'ju duhet të prisni edhe më."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Kyçi SecurID i dhënë është i pavlefshëm."
 
 msgid "Enter SecurID"
@@ -6837,24 +6940,6 @@ msgstr "Jepni numri gjashtëshifror prej paraqitjes shifrore."
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Edhe pak edhe mundet t'ju shkëpusin.  Mund të doni të përdorni TOC derisa të "
-"ndreqet kjo.  Shihni %s për përditësime."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Nuk u mor dot hash i vlefshëm hyrjeje në AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Edhe pak edhe mundet t'ju shkëpusin.  Shihni %s për përditësime."
-
-msgid "Unable to get a valid login hash."
-msgstr "Nuk u mor dot hash i vlefshëm hyrjeje"
-
 msgid "Password sent"
 msgstr "Fjalëkalim u dërguar"
 
@@ -6996,7 +7081,7 @@ msgstr[0] "Humbët %hu mesazh prej %s për një arsye të panjohur."
 msgstr[1] "Humbët %hu mesazhe prej %s për një arsye të panjohur."
 
 #  TODO: Improve this! message to who or for what conference?
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "I pazoti të dërgojë mesazh: %s"
@@ -7019,6 +7104,9 @@ msgstr "I lidhur që Prej"
 msgid "Member Since"
 msgstr "Anëtar që Prej"
 
+msgid "Capabilities"
+msgstr "Aftësi"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7203,9 +7291,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Mesazh largimi shumë i gjatë."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7233,9 +7321,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Jetimë"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "S'mundi të shtojë shokun %s sepse keni shumë shokë në listë shokësh tuajën.  "
@@ -7244,8 +7332,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(pa emër)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Për një arsye të panjohur, nuk u shtua dot shoku %s."
 
 #, c-format
@@ -7317,6 +7405,7 @@ msgstr "_Lidhu"
 msgid "Get AIM Info"
 msgstr "Merr Të dhëna AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Përpuno Koment Shoku"
 
@@ -7377,6 +7466,7 @@ msgstr "_Kërko"
 msgid "Set User Info (web)..."
 msgstr "Caktoni Të dhëna Përdoruesi (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Ndryshoni Fjalëklimin për (web)"
 
@@ -7406,6 +7496,10 @@ msgstr "Kërkoni një Shok përmes Vendndodhjes Email..."
 msgid "Search for Buddy by Information"
 msgstr "Kërko për Shokë sipas Të dhënash"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Përdoruesi nuk ka hyrë"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7426,7 +7520,6 @@ msgstr "Po i kërkohet %s të lidhet me ne te %s:%hu për MA të Drejtpërdrejt�
 msgid "Attempting to connect to %s:%hu."
 msgstr "Përpjekje për t'u lidhur te %s:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Po bëhet përpjekje për lidhje përmes një shërbyesi ndërmjetës."
 
@@ -7604,6 +7697,38 @@ msgstr "Përditëso"
 msgid "Could not change buddy information."
 msgstr "Dështoi në ndryshimin e të dhënave rreth shokut."
 
+msgid "Mobile"
+msgstr "Telefon Celular"
+
+msgid "Note"
+msgstr "Shënim"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Ikonë Shoku"
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "Ndrysho"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Ndrysho"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Shërbyes i zënë"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%u requires verification"
 msgstr "Kërko autorizim"
@@ -7923,6 +8048,13 @@ msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Mirënjohje</b>:<br>\n"
 
 #, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Autori Origjinal</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
+#, fuzzy
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Dhe, tërë djemtë te dhoma prapa...</i><br>\n"
 
@@ -7949,6 +8081,10 @@ msgstr "Përditëso tërë QQ Quns"
 msgid "About OpenQ"
 msgstr "Rreth OpenQ"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Ndryshoni Vendndodhjen"
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -7997,6 +8133,9 @@ msgstr "Shfaq njoftim shërbyesi"
 msgid "Show server news"
 msgstr "Shfaq lajme shërbyesi"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Interval(e) mbajtjeje gjallë"
@@ -8006,7 +8145,7 @@ msgid "Update interval (seconds)"
 msgstr "Interval(e) përditësimi"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "S'zbërthen dot përgjigje për \"kap shërbyesin\""
 
 #, c-format
@@ -8033,10 +8172,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Kod i panjohur përgjigje ndërsa hyhej (0x%02X)"
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "S'zbërthen dot përgjigje për \"kap shërbyesin\""
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Po kërkohet captcha ..."
 
@@ -8075,23 +8210,9 @@ msgstr ""
 "Kod i panjohur përgjigjeje ndërsa hyhej (0x%02X):\n"
 "%s"
 
-#  we didn't successfully connect. tdt->toc_fd is valid here
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "I pazoti të lidhet."
-
 msgid "Socket error"
 msgstr "Gabim \"socket\"-i"
 
-msgid "Unable to read from socket"
-msgstr "I pazoti të lexojë prej \"socket\"-i"
-
-msgid "Write Error"
-msgstr "Gabim Shkrimi"
-
-msgid "Connection lost"
-msgstr "Lidhje e humbur"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Kap shërbyesin ..."
@@ -8100,8 +8221,9 @@ msgstr "Kap shërbyesin ..."
 msgid "Requesting token"
 msgstr "\"Token\" kërkese"
 
-msgid "Couldn't resolve host"
-msgstr "S'u shquajt dot streha"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "I pazoti të lidhet me shërbyesin."
 
 msgid "Invalid server or port"
 msgstr "Portë ose shërbyes i pavlefshëm"
@@ -8157,7 +8279,7 @@ msgid "QQ Qun Command"
 msgstr "Urdhër QQ Qun"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Nuk zbërthen dot përgjigje hyrjeje"
 
 msgid "Unknown LOGIN CMD"
@@ -8177,9 +8299,6 @@ msgstr "Dërgim Kartele"
 msgid "%d canceled the transfer of %s"
 msgstr "%d anuloi shpërnguljen e %s"
 
-msgid "Connection closed (writing)"
-msgstr "Lidhja u ndërpre (shkrim)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titull Grup:</b> %s<br>"
@@ -8234,17 +8353,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Njoftime Administratori Sametime"
 
-msgid "Connection reset"
-msgstr "Rivendosje lidhjeje"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Gabim gjatë leximit prej \"socket\"-i: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "S'bëhet dot lidhja me strehën"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Njoftim prej %s"
@@ -8268,6 +8376,9 @@ msgstr "Altoparlantë"
 msgid "Video Camera"
 msgstr "Video Kamera"
 
+msgid "File Transfer"
+msgstr "Shpërngulje Kartele"
+
 msgid "Supports"
 msgstr "Mbulon"
 
@@ -8993,9 +9104,6 @@ msgstr "Organizëm"
 msgid "Unit"
 msgstr "Njësi"
 
-msgid "Note"
-msgstr "Shënim"
-
 msgid "Join Chat"
 msgstr "Futu në Fjalosje"
 
@@ -9095,6 +9203,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistika Rrjeti"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Pingu dështoi"
 
@@ -9158,7 +9269,8 @@ msgstr "Tip kyçi publik i pambuluar"
 msgid "Disconnected by server"
 msgstr "Shkëputur prej shërbyesit"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Gabim gjatë lidhjes te Shërbyes SILC"
 
 msgid "Key Exchange failed"
@@ -9170,16 +9282,11 @@ msgstr ""
 "Dështoi rimarrja e sesionit të shkëputur. Shtypni Rilidhu për të krijuar një "
 "lidhje të re."
 
-msgid "Connection failed"
-msgstr "Lidhja dështoi"
-
 msgid "Performing key exchange"
 msgstr "Po kryhet shkëmbim kyçesh"
 
-msgid "Unable to create connection"
-msgstr "I pazoti të krijojë lidhje"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "S'u ngarkua dot çift kyçesh SILC"
 
 #  Progress
@@ -9187,10 +9294,15 @@ msgstr "S'u ngarkua dot çift kyçesh SILC"
 msgid "Connecting to SILC Server"
 msgstr "Po bëhet lidhja me Shërbyesin SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "S'u ngarkua dot çift kyçesh SILC"
+
 msgid "Out of memory"
 msgstr "Kujtesë e pamjaftueshme"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "S'gatitet dot protokolli SILC"
 
 msgid "Error loading SILC key pair"
@@ -9496,7 +9608,8 @@ msgstr "Nënshkruaj dhe verifiko në mënyrë shifrore tërë mesazhet"
 msgid "Creating SILC key pair..."
 msgstr "Po krijohet çift kyçesh SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "S'krijohet dot çift  kyçesh SILC\n"
 
 #  Hint for translators: Please check the tabulator width here and in
@@ -9593,6 +9706,9 @@ msgstr "Tabela"
 msgid "No server statistics available"
 msgstr "Pa statistika shërbyesi të gatshme"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Gabim gjatë lidhjes te Shërbyes SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Dështim: Mospërputhje versioni, përditësoni klientin tuaj"
@@ -9633,34 +9749,35 @@ msgstr "Dështim: \"Cookie\" e pavlefshme"
 msgid "Failure: Authentication failed"
 msgstr "Dështim: Mirëfilltësimi dështoi"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "S'gatis dot lidhje SILC Client"
 
 msgid "John Noname"
 msgstr "Gjoni i Paemërt"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "S'u ngarkua dot çift kyçesh SILC: %s"
 
-msgid "Could not write"
-msgstr "S'shkruhej dot"
-
-msgid "Could not connect"
-msgstr "S'u bë dot lidhja"
+msgid "Unable to create connection"
+msgstr "I pazoti të krijojë lidhje"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Përgjigje e panjohur shërbyesi"
 
-msgid "Could not create listen socket"
-msgstr "S'mundi të krijojë \"listen socket\""
-
-msgid "Could not resolve hostname"
-msgstr "S'u shqua dot emërstreha"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "I pazoti të krijojë \"socket\""
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Emra përdoruesish SIP mund të mos përmbajnë hapësira ose simbole @"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Shfaq njoftim shërbyesi"
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -9714,176 +9831,73 @@ msgstr "Mirëfilltësim Përdoruesi"
 msgid "Auth Domain"
 msgstr "Mirëfilltësim Përkatësie"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Po shihet për %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Lidhu me %s dështoi"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Nënshkrim: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "I pazoti të shkruajë kartelën %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "I pazoti të lexojë kartelën %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Mesazh shumë i gjatë, shkurtuar me %s bajtet e fundit."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s jo i futur për çastin."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Sinjalizim i %s i palejueshëm."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Ju është lënë një mesazh, po tejkaloni kufi shpejtësie shërbyesi."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Fjalosja në %s nuk është e mundshme."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Po i dërgoni mesazhet te %s shumë shpejt."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Humbët një MA prej %s, ngaqë qe shumë i madh."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Humbët një MA prej %s, ngaqë u dërgua shumë shpejt."
-
-#, c-format
-msgid "Failure."
-msgstr "Dështim."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Shumë përputhje."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Lipsen më tepër cilësues."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Shërbim drejtorish përkohësisht i pamundur."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Kufizim kërkimi email-i."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Fjalëkyç i shpërfillur."
-
-#, c-format
-msgid "No keywords."
-msgstr "Pa fjalëkyça."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Përdoruesi nuk ka të dhëna drejtorie."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Vend i pambuluar."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Dështim i panjohur: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Emër përdoruesi ose fjalëkalim i pavlefshëm."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Shërbimi është përkohësisht i pamundshëm."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Niveli juaj i sinjalizimeve për çastin është tepër i lartë për hyrje."
-
-#, c-format
-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 ""
-"Jeni lidhur e shkëputur si shumë shpesh.  Prisni dhjetë minuta dhe "
-"riprovoni.  Nëse vazhdoni të provoni, do t'ju duhet të prisni akoma më gjatë."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Ndodhi një gabim i panjohur nënshkrimi: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Ndodhi një gabim i panjohur, %d.  Të dhëna: %s"
-
-msgid "Invalid Groupname"
-msgstr "Emër i pavlefshëm grupi"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;dhomë&gt; Bashkoju një dhome fjalosjeje në rrjetin Yahoo"
 
-msgid "Connection Closed"
-msgstr "Lidhja u Mbyll"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Radhit dhoma te rrjeti Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Po pritet për përgjigje..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Kërkoji përdoruesit të nisë një sesion Doodle"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"TOC e mori veten pas pushimit. Tani mundeni të dërgoni mesazhet tuaj sërish."
+msgid "Yahoo ID..."
+msgstr "ID Yahoo..."
 
-msgid "Password Change Successful"
-msgstr "Ndryshim i Sukseshëm Fjalëkalimi"
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Shtojcë Protokolli Yahoo"
 
-msgid "_Group:"
-msgstr "_Grup:"
+msgid "Pager server"
+msgstr "Shërbyes Faquesi"
 
-msgid "Get Dir Info"
-msgstr "Merr Të dhëna Drejt."
+msgid "Pager port"
+msgstr "Portë faquesi"
 
-msgid "Set Dir Info"
-msgstr "Caktoni Të dhëna Drejt."
+msgid "File transfer server"
+msgstr "Shërbyes shpërnguljesh kartelash"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "S'hapa dot %s për shkrim!"
+msgid "File transfer port"
+msgstr "Portë shpërnguljesh kartelash"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Shpërngulja e kartelës dështoi; mbase ana tjetër e anuloi."
+msgid "Chat room locale"
+msgstr "Vendore dhome fjalosjeje"
 
-msgid "Could not connect for transfer."
-msgstr "S'u lidha dot për shpërngulje."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Shpërfill ftesa konferencash dhe dhomash fjalosjeje"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "S'munda të shkruaj titull kartele.  Kartela nuk do të shpërngulet."
+msgid "Chat room list URL"
+msgstr "Url liste dhome fjalosjeje"
 
-msgid "Save As..."
-msgstr "Ruaje Si..."
+msgid "Yahoo Chat server"
+msgstr "Shërbyes fjalosjeje Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s ju kërkon %s të pranoni %d kartelë: %s (%.2f %s)%s%s"
-msgstr[1] "%s ju kërkon %s të pranoni %d kartela: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Portë fjalosjeje Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s ju kërkon t'i dërgoni kartelë"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID Yahoo..."
 
 #  *< api_version
 #  *< type
@@ -9906,12 +9920,12 @@ msgstr "%s ju kërkon t'i dërgoni kartelë"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Shtojcë Protokolli TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Shtojcë Protokolli Yahoo"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ju dërgoi një ftesë për kamera web, çka nuk mbulohet ende."
+msgid "Your SMS was not delivered"
+msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Mesazhi juaj Yahoo! nuk u dërgua."
@@ -9937,6 +9951,34 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Shto shok të hedhur tej"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "U morën të dhëna të pavlefshme rreth lidhjes me shërbyesin."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Numrë gabimi të panjohur %d. Hyrja te \"site\"-i web Yahoo! mund ta ndreqë "
+"këtë."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Numrë gabimi të panjohur %d. Hyrja te \"site\"-i web Yahoo! mund ta ndreqë "
+"këtë."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Emër përdoruesi ose fjalëkalim i pavlefshëm"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9970,37 +10012,32 @@ msgstr ""
 "Numrë gabimi të panjohur %d. Hyrja te \"site\"-i web Yahoo! mund ta ndreqë "
 "këtë."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "S'shtoi dot shokun %s te grupi %s te listë shërbyesi në llogarinë %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "S'shtoi dot shok te listë shërbyesi"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[%s/%s/%s.swf  e dëgjueshme] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "U mor prej shërbyesit përgjigje HTTP e papritur."
 
-msgid "Connection problem"
-msgstr "Problem lidhjeje"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "U humb lidhja me %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Nuk u arrit të vendosej lidhja me %s:\n"
+"Nuk u vendos dot lidhje me shërbyesin:\n"
 "%s"
 
 msgid "Not at Home"
@@ -10048,8 +10085,8 @@ msgstr "Rregullime Pranie"
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "Veprues cila ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "T'i bashkohem kujt në fjalosje?"
@@ -10063,84 +10100,16 @@ msgstr "Bashkoju Përdoruesi në Fjalosje..."
 msgid "Open Inbox"
 msgstr "Hap Të Marrë"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;dhomë&gt; Bashkoju një dhome fjalosjeje në rrjetin Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Radhit dhoma te rrjeti Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Kërkoji përdoruesit të nisë një sesion Doodle"
-
-msgid "Yahoo ID..."
-msgstr "ID Yahoo..."
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Shtojcë Protokolli Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japoni"
-
-msgid "Pager server"
-msgstr "Shërbyes Faquesi"
-
-msgid "Japan Pager server"
-msgstr "Shërbyes Japonez Faquesi"
-
-msgid "Pager port"
-msgstr "Portë faquesi"
-
-msgid "File transfer server"
-msgstr "Shërbyes shpërnguljesh kartelash"
-
-msgid "Japan file transfer server"
-msgstr "Shërbyes Japonez shpërnguljesh kartelash"
-
-msgid "File transfer port"
-msgstr "Portë shpërnguljesh kartelash"
-
-msgid "Chat room locale"
-msgstr "Vendore dhome fjalosjeje"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Shpërfill ftesa konferencash dhe dhomash fjalosjeje"
-
-msgid "Chat room list URL"
-msgstr "Url liste dhome fjalosjeje"
-
-msgid "Yahoo Chat server"
-msgstr "Shërbyes fjalosjeje Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Portë fjalosjeje Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Dërgoi kërkesë Doodle."
 
+#  we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "I pazoti të lidhet."
+
 msgid "Unable to establish file descriptor."
 msgstr "I pazoti të vendosë përshkrues kartele."
 
@@ -10148,6 +10117,9 @@ msgstr "I pazoti të vendosë përshkrues kartele."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s po përpiqet t'ju dërgojë një grup prej %d kartelash.\n"
 
+msgid "Write Error"
+msgstr "Gabim Shkrimi"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! për Japoninë"
 
@@ -10267,23 +10239,19 @@ msgstr "Zëra"
 msgid "Webcams"
 msgstr "Kamera web"
 
+msgid "Connection problem"
+msgstr "Problem lidhjeje"
+
 msgid "Unable to fetch room list."
 msgstr "I pazoti të bjerë listë dhomash."
 
 msgid "User Rooms"
 msgstr "Dhoma Përdoruesi"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problem lidhjeje me shërbyesin YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Humbi lidhja me shërbyesin\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10424,16 +10392,8 @@ msgstr "Emër i vërtetë"
 msgid "Exposure"
 msgstr "Ekspozim"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"I pazoti të krijojë \"socket\":\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nuk u përtyp dot përgjigjja prej ndërmjetësit HTTP: %s\n"
 
 #, c-format
@@ -10442,8 +10402,8 @@ msgstr "Gabim lidhjeje i shërbyesit HTTP %d"
 
 #  XXX: why in the hell are we calling Pidgin_connection_error() here?
 #  Forbidden
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Hyrje e mohuar: shërbyesi ndërmjetës HTTP ndalon tunelizim të portës %d."
 
@@ -10451,9 +10411,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Gabim në shquajtjen e %s"
 
-msgid "Could not resolve host name"
-msgstr "Nuk shquajti dot emër strehe"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Po tërhiqet vëmendja e %s..."
@@ -10545,9 +10502,6 @@ msgstr "Mos më bezdis"
 msgid "Extended away"
 msgstr "Largim i zgjeruar"
 
-msgid "Mobile"
-msgstr "Telefon Celular"
-
 msgid "Listening to music"
 msgstr "Dëgjim muzike"
 
@@ -10589,18 +10543,6 @@ msgstr "+++ %s u gjallërua"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Gabim në Leximin e %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"U has një gabim gjatë leximit të %s suaj.  Nuk u ngarkuan, dhe kartela e "
-"vjetër është riemërtuar %s~."
-
 msgid "Calculating..."
 msgstr "Po llogaritet..."
 
@@ -10708,6 +10650,18 @@ msgstr "Ndërlidhje e papranuar."
 msgid "Address already in use."
 msgstr "Vendndodhje tashmë në përdorim."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Gabim në Leximin e %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"U has një gabim gjatë leximit të %s suaj.  Nuk u ngarkuan, dhe kartela e "
+"vjetër është riemërtuar %s~."
+
 msgid "Internet Messenger"
 msgstr "Lajmësjellës Internet"
 
@@ -10750,11 +10704,8 @@ msgstr "Njoftime _poste të re"
 msgid "Use this buddy _icon for this account:"
 msgstr "Përdor këtë _ikonë shoku për këtë llogari:"
 
-#  Build the protocol options frame.
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Mundësi %s"
+msgid "_Advanced"
+msgstr "_Të mëtejshme"
 
 #  Use Global Proxy Settings
 msgid "Use GNOME Proxy Settings"
@@ -10792,9 +10743,6 @@ msgstr "If you look real closely"
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-msgid "Proxy Options"
-msgstr "Mundësi \"Proxy\""
-
 msgid "Proxy _type:"
 msgstr "_Tip \"proxy\":"
 
@@ -10822,8 +10770,9 @@ msgstr "_Bazë"
 msgid "Create _this new account on the server"
 msgstr "Krijo te shërbyesi _këtë llogari të re"
 
-msgid "_Advanced"
-msgstr "_Të mëtejshme"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Ndërmjetës"
 
 msgid "Enabled"
 msgstr "Aktivizuar"
@@ -10873,8 +10822,9 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Ju lutem, përditësoni fushat e nevojshme."
 
-msgid "Room _List"
-msgstr "_Listë Dhomash"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Llogari"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10882,8 +10832,8 @@ msgid ""
 msgstr ""
 "Ju lutem jepni të dhënat e duhura rreth fjalosjes ku doni të merrni pjesë.\n"
 
-msgid "_Account:"
-msgstr "_Llogari:"
+msgid "Room _List"
+msgstr "_Listë Dhomash"
 
 #  Block button
 msgid "_Block"
@@ -10902,6 +10852,17 @@ msgstr "Merr  _Të dhëna"
 msgid "I_M"
 msgstr "I_M"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "_Shto Fjalosje"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Fjalosje Video"
+
 msgid "_Send File..."
 msgstr "_Dërgo Kartelë..."
 
@@ -10911,9 +10872,14 @@ msgstr "Shto _Cytje Shoku..."
 msgid "View _Log"
 msgstr "Shih _Regjistrim"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Fshihe kur është i palidhur"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Shfaqe kur është i palidhur"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11041,6 +11007,10 @@ msgstr "/Mjete/_Cytje Shokësh"
 msgid "/Tools/_Certificates"
 msgstr "/Mjete/_Dëshmi"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Mjete/_Emotikone"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Mjete/Shtojca"
 
@@ -11050,9 +11020,6 @@ msgstr "/Mjete/Par_apëlqime"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Mjete/Vetës_i"
 
-msgid "/Tools/Smile_y"
-msgstr "/Mjete/_Emotikone"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Mjete/Shpërngulje _Kartelash"
 
@@ -11170,8 +11137,8 @@ msgstr "Dorazi"
 msgid "By status"
 msgstr "Sipas gjendjeje"
 
-msgid "By log size"
-msgstr "Sipas madhësie regjistrimi"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -11187,6 +11154,9 @@ msgstr "Rilidhu"
 msgid "Re-enable"
 msgstr "Riaktivizoje"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Mirësevini sërish!"
 
@@ -11276,6 +11246,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "_Alias:"
 
+msgid "_Group:"
+msgstr "_Grup:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Vetë_futu kur llogaria kalon në linjë."
 
@@ -11310,6 +11283,115 @@ msgstr "/Mjete"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Shokë/Radhit Shokë"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Ngjyrë Sfondi"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Ngjyrë Sfondi"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Zgjero"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Përzgjidhni Ngjyrë Sfondi"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Tkurr"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Përzgjidhni Ngjyrë Sfondi"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Shkurtore"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "I lidhur"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Larguar"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Jo i lidhur"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Tekst Humori"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Mesazh i dërguar"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Ndrysho të dhëna përdoruesi për %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Shtypni emrin e strehës për të cilën është dëshmia."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Shërbyesa SSL"
@@ -11329,14 +11411,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Fto Shok Në një Dhomë Fjalosjeje"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Ju lutem jepni emrin e përdoruesit që doni të ftoni, bashkë me një mesazh "
-"ftese në daçi."
-
 msgid "_Buddy:"
 msgstr "_Shok:"
 
@@ -11365,7 +11439,8 @@ msgstr "Shpërfill"
 msgid "Get Away Message"
 msgstr "Mesazh Largimi"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Thënë së fundmi"
 
 msgid "Unable to save icon file to disk."
@@ -11412,6 +11487,22 @@ msgstr "/Bashkëbisedim/_Ruaj Si..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Bashkëbisedim/_Më"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Bashkëbisedim/_Më"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Bashkëbisedim/_Më"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Bashkëbisedim/Parje _Regjistrimi"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Bashkëbisedim/Dë_rgo Kartelë..."
 
@@ -11487,6 +11578,18 @@ msgstr "/Bashkëbisedim"
 msgid "/Conversation/View Log"
 msgstr "/Bashkëbisedim/Shihni Regjistrim"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Bashkëbisedim/Më"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Bashkëbisedim/Shihni Regjistrim"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Bashkëbisedim/Më"
+
 msgid "/Conversation/Send File..."
 msgstr "/Bashkëbisedim/Dërgo Kartelë..."
 
@@ -11671,6 +11774,9 @@ msgstr "artist"
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "suport"
 
@@ -11797,6 +11903,10 @@ msgstr "Indiane"
 msgid "Hungarian"
 msgstr "Hungareze"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumune"
+
 msgid "Indonesian"
 msgstr "Indoneziane"
 
@@ -11812,6 +11922,10 @@ msgstr "Gjeorgjiane"
 msgid "Ubuntu Georgian Translators"
 msgstr "Përkthyesa Gjeorgjianë të Ubuntu-së"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Tjetër"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11833,6 +11947,10 @@ msgstr "Lituaneze"
 msgid "Macedonian"
 msgstr "Maqedone"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "Maqedone"
+
 msgid "Bokmål Norwegian"
 msgstr "Norvegjeze Bokmal"
 
@@ -11887,6 +12005,9 @@ msgstr "Sinhala"
 msgid "Swedish"
 msgstr "Suedeze"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamileze"
 
@@ -11948,7 +12069,24 @@ msgstr ""
 "garanci për këtë program.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin te irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin te irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -12204,7 +12342,8 @@ msgstr "Ngjyrë për vizatim tejlidhjesh.."
 msgid "Hyperlink visited color"
 msgstr "Ngjyrë tejlidhjesh të vizituara"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Ngjyrë për vizatim tejlidhjesh pasi të jenë vizituar (ose aktivizuar)."
 
 msgid "Hyperlink prelight color"
@@ -12240,14 +12379,23 @@ msgstr "Ngjyrë vizatimi për emrin e mesazhit të një veprimi."
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Ngjyrë vizatimi për emrin e mesazhit të një veprimi."
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Ngjyrë vizatimi për emrin e mesazhit të një veprimi."
+
 #  ---------- "Notification Removals" ----------
 msgid "Typing notification color"
 msgstr "Ngjyrë njoftimesh shtypjeje"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Ngjyra e përdorur për gërma njoftimesh shtypjesh"
 
 msgid "Typing notification font"
@@ -12259,15 +12407,6 @@ msgstr "Gërmat e përdorura për njoftime shtypjesh"
 msgid "Enable typing notification"
 msgstr "Aktivizo njoftime shtypjesh"
 
-msgid "_Copy Email Address"
-msgstr "_Kopjo Vendndodhje Email"
-
-msgid "_Open Link in Browser"
-msgstr "_Hap Lidhje në Shfletues"
-
-msgid "_Copy Link Location"
-msgstr "_Kopjo Vendndodhje Lidhjeje"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12309,11 +12448,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Ruaj Pamje"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Ruaj Pamje..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Shto Emotikon Vetjak..."
 
@@ -12404,9 +12541,6 @@ msgstr "Zvogëloje Madhësinë e Gërmave"
 msgid "Font Face"
 msgstr "Emër Gërmash"
 
-msgid "Background Color"
-msgstr "Ngjyrë Sfondi"
-
 msgid "Foreground Color"
 msgstr "Ngjyrë e Përparme"
 
@@ -12520,13 +12654,14 @@ msgstr "_Shfletoni dosje regjistrash"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Për më tepër të dhëna provoni `%s -h'.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12552,13 +12687,14 @@ msgstr ""
 "  --display=DISPLAY Ekran X për përdorim\n"
 "  -v, --version       shfaq versionin e çastit dhe dil\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12614,11 +12750,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Hap Tërë Mesazhet"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Ka postë për ju!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Po llogaritet..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12647,6 +12799,28 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Është zgjedhur urdhër shfletuesi 'Dorazi', por nuk është caktuar cili."
 
+#, fuzzy
+msgid "No message"
+msgstr "Mesazh i panjohur "
+
+msgid "Open All Messages"
+msgstr "Hap Tërë Mesazhet"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Ka postë për ju!</span>"
+
+#  "New Buddy Pounce"
+#, fuzzy
+msgid "New Pounces"
+msgstr "Cytje e Re Shoku"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Ka postë për ju!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Shtojcat vijuese do të çngarkohen."
 
@@ -12694,11 +12868,18 @@ msgstr "<b>Hollësi Shtojce</b>"
 msgid "Select a file"
 msgstr "Përzgjidhni një kartelë"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Përpunoni Cytje Shoku"
+
 #  Create the "Pounce Who" frame.
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "_Llogari:"
+
 msgid "_Buddy name:"
 msgstr "Emër _shoku:"
 
@@ -12766,7 +12947,60 @@ msgstr "E _ripërsëritshme"
 msgid "Pounce Target"
 msgstr "Objekt Cytjeje"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Zë e shtyp"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Pushon ndërkohë që po shtypte"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Nënshkruan"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s është kthyer prej plogështie (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Kthehet prej largimi"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Reshti Së Shtypuri"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Çnënshkruan"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Plogështohet"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Gjatë largimesh"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Dërgo mesazh"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Akt i panjohur cytjeje. Ju lutem njoftojeni këtë!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Dështoi çpaketimi i temës së emotikoneve,."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Dështoi çpaketimi i temës së emotikoneve,."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Dështoi çpaketimi i temës së emotikoneve,."
 
 msgid "Install Theme"
@@ -12789,6 +13023,12 @@ msgstr "Shkurtore Tastiere"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Mbylli bashkëbisedimet me tastin Escape"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Listë Shokësh"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ikonë Shtylle Sistemi"
 
@@ -12799,8 +13039,9 @@ msgid "On unread messages"
 msgstr "Për mesazhe të palexuar"
 
 #  IM Convo trans options
-msgid "Conversation Window Hiding"
-msgstr "Fshehje Dritareje Bashkëbisedimi"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Dritare Bashkëbisedimi MA"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Fshih bashkëbisedime të rinj MA:"
@@ -12808,6 +13049,10 @@ msgstr "_Fshih bashkëbisedime të rinj MA:"
 msgid "When away"
 msgstr "Gjatë largimesh"
 
+#  IM Convo trans options
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zo dritare bashkëbisedimesh të rinj"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Skeda"
@@ -12866,10 +13111,6 @@ msgstr "Përdor rrëshqitje të butë"
 msgid "F_lash window when IMs are received"
 msgstr "_Xixëllo dritaren kur merren mesazhe të rinj MA"
 
-#  IM Convo trans options
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zo dritare bashkëbisedimesh të rinj"
-
 msgid "Minimum input area height in lines:"
 msgstr "Lartësia minimum e fushës së futjeve, në rreshta:"
 
@@ -12902,13 +13143,11 @@ msgstr "S'niset dot programi i formësimit të ndërmjetësave."
 msgid "Cannot start browser configuration program."
 msgstr "S'niset dot programi i formësimit të shfletuesit."
 
-msgid "ST_UN server:"
-msgstr "Shërbyes ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Shembull: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Vetëzbulo vendndodhje IP"
 
 msgid "Public _IP:"
@@ -12929,6 +13168,10 @@ msgstr "Portë e _fillimit:"
 msgid "_End port:"
 msgstr "Portë e f_undit:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Shërbyes Ndërmjetës &amp; Shfletues"
 
@@ -12957,6 +13200,10 @@ msgstr "Shërbyes \"Proxy\""
 msgid "No proxy"
 msgstr "Pa \"proxy\""
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Përdorues:"
 
@@ -13115,12 +13362,12 @@ msgstr "Vetëm në rast largimi dhe plogështie"
 msgid "Auto-away"
 msgstr "I vetëlarguar"
 
-msgid "Change status when _idle"
-msgstr "Ndrysho gjendjen po qe i _plogësht"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuta para se të bëhet i plogësht:"
 
+msgid "Change status when _idle"
+msgstr "Ndrysho gjendjen po qe i _plogësht"
+
 msgid "Change _status to:"
 msgstr "Ndrysho _gjendje si:"
 
@@ -13271,27 +13518,18 @@ msgstr "Rua_j & Përdor"
 msgid "Status for %s"
 msgstr "Gjendje për %s"
 
-msgid "Custom Smiley"
-msgstr "Emotikon Vetjak"
-
-msgid "More Data needed"
-msgstr "Lypsen më tepër Të dhëna"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Ju lutem jepni një shkurtore për t'ia shoqëruar këtij emotikoni."
-
-msgid "Duplicate Shortcut"
-msgstr "Dyfishoni Shkurtore"
-
+#, fuzzy, c-format
 msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 "Ka tashmë një emotikon vetjak për shkurtoren e përzgjedhur. Ju lutem tregoni "
 "një shkurtore tjetër."
 
-msgid "Please select an image for the smiley."
-msgstr "Ju lutem përzgjidhni një pamje për emotikonin."
+msgid "Custom Smiley"
+msgstr "Emotikon Vetjak"
+
+msgid "Duplicate Shortcut"
+msgstr "Dyfishoni Shkurtore"
 
 #  show everything
 msgid "Edit Smiley"
@@ -13301,20 +13539,30 @@ msgstr "Përpunoni Emotikon"
 msgid "Add Smiley"
 msgstr "Shtoni Emotikon"
 
-msgid "Smiley _Image"
-msgstr "_Pamje Emotikoni"
+#, fuzzy
+msgid "_Image:"
+msgstr "_Pamje"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "_Shkurtore Emotikoni"
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Shkurtore"
 
 #  show everything
 msgid "Smiley"
 msgstr "Emotikon"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Shkurtore"
+
 msgid "Custom Smiley Manager"
 msgstr "Përgjegjës Emotikonesh Vetjake"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Përzgjidhni Shok"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klikoni për të ndryshuar ikonën tuaj të shokut për këtë llogari."
 
@@ -13399,9 +13647,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "S'dërgon dot nisës"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Tërhoqët një nisës desktopi. Ka shumë të ngjarë që donit të dërgonit atë me "
 "çka lidhet ky nisës, çfarëdo qoftë ajo, dhe jo vetë nisësin. "
@@ -13439,6 +13688,16 @@ msgstr ""
 "Dështoi ngarkimi i pamjes '%s': arsye e panjohur, ndoshta kartelë e dëmtuar "
 "pamjeje"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Hap lidhje në:"
+
+msgid "_Copy Link Location"
+msgstr "_Kopjo Vendndodhje Lidhjeje"
+
+msgid "_Copy Email Address"
+msgstr "_Kopjo Vendndodhje Email"
+
 msgid "Save File"
 msgstr "Ruaje Kartelën"
 
@@ -13532,6 +13791,79 @@ msgstr "Shtojcë Parashikimi Mundësie Lidhjeje."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Shfaq të dhëna statistikore rreth qenies në linjë për shokët tuaj"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Vendndodhje shërbyesi"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Jepni një Shërbyes Konferencash"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Përzgjidhni një shërbyes konferencash për kërkesë"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Shërbime Online"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Dërgo Listë Shokësh"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Largohet"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Drejtori Regjistrimesh"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Përzgjedhje Tingulli"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Shërbim PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Përshkrim"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Të dhëna Zbulimi Shërbimesh"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Shfletues:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Përdoruesi nuk ekziston"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Shërbyesi nuk përdor ndonjë metodë mirëfilltësimi që mbulohet"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Të dhëna Zbulimi Shërbimesh"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Kjo shtojcë është e dobishme për diagnostikim shërbyesish apo klientësh XMPP."
+
 msgid "Buddy is idle"
 msgstr "Shoku është i plogësht"
 
@@ -13988,9 +14320,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Shtojcë Shkëmbimi Mesazhesh Muzike për kompozim në bashkëpunim."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Shtojca për Shkëmbim Mesazhesh Muzike u lejon një numri përdoruesish të "
 "punojnë njëkohësisht mbi një pjesë muzikore duke përpunuar partiturën e "
@@ -14127,12 +14460,6 @@ msgstr ""
 "- Kthen tërë tekstet ardhës\n"
 "- U dërgon personave në listën tuaj një mesazh sapo futen"
 
-msgid "Cursor Color"
-msgstr "Ngjyrë Kursori"
-
-msgid "Secondary Cursor Color"
-msgstr "Ngjyrë e Dytë Kursori"
-
 msgid "Hyperlink Color"
 msgstr "Ngjyrë Tejlidhjeje"
 
@@ -14142,6 +14469,11 @@ msgstr "Ngjyrë Tejlidhjesh të Vizituara"
 msgid "Highlighted Message Name Color"
 msgstr "Emër Ngjyre për Theksim Mesazhi"
 
+#  ---------- "Notification Removals" ----------
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Ngjyrë njoftimesh shtypjeje"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Ndarje Horizontale GtkTreeView"
 
@@ -14173,35 +14505,31 @@ msgstr "Gërma Ndërfaqeje GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Temë Shkurtoresh GTK+ Tekst"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Ngjyra ndërfaqeje"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Aktivizo njoftime shtypjesh"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Kontroll Teme Pidgin GTK+"
 
-msgid "Widget Sizes"
-msgstr "Madhësi Widget-i"
+#, fuzzy
+msgid "Colors"
+msgstr "Mbyll"
 
 msgid "Fonts"
 msgstr "Gërma"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -14314,9 +14642,10 @@ msgid "Conversation Window Send Button."
 msgstr "Buton Dërgimi Dritareje Bashkëbisedimi."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Shton një buton Dërgo te zona e futjeve në dritaren e bashkëbisedimeve. E "
 "paramenduar për rastet kur nuk ka tastierë materiale."
@@ -14374,6 +14703,133 @@ msgstr ""
 "Zëvendëson tekst në mesazhe që dërgohen, bazuar në rregulla të përcaktuar "
 "nga përdoruesi."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Jo i futur."
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Jo i futur."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Bashkoju një Fjalosjeje"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Shpërfill"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Më fort"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorizim i Dhënë"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Gabim"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Të dhëna"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Dialog Kërkese"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Shkallë Sinjalizimi"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Gjendje për %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Vendore dhome fjalosjeje"
+
+msgid "Dialog Icons"
+msgstr ""
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Kontroll Teme Pidgin GTK+"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Të dhëna Kontakti"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Listë Shokësh"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Listë Shokësh"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Kontroll Teme Pidgin GTK+"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Kontroll Teme Pidgin GTK+"
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -14563,17 +15019,15 @@ msgstr "_Mbaj dritare Liste Shokësh sipër:"
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr "_Xixëllo dritare kur merren mesazhe fjalosjeje"
-
 msgid "Windows Pidgin Options"
 msgstr "Mundësi për Pidgin-in nën Windows."
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Mundësi vetëm për Pidgin-in nën Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Furnizon mundësi karakteristike për Pidgin-in nën Windows, si bie fjala "
 "listë të lëvizshme shokësh."
@@ -14616,6 +15070,521 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Kjo shtojcë është e dobishme për diagnostikim shërbyesish apo klientësh XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "S'hap dot \"socket\""
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Nuk u dëgjua dot te \"socket\"-i"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "I pazoti të lexojë \"socket\"-in"
+
+#~ msgid "Connection failed."
+#~ msgstr "Lidhja dështoi"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Shërbyesi është shkëputur"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "S'munda të krijojë \"socket\""
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "S'munda të lidhem te strehë"
+
+#~ msgid "Read error"
+#~ msgstr "Gabim leximi"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nuk u vendos dot lidhje me shërbyesin:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Gabim shkrimi"
+
+#~ msgid "Last Activity"
+#~ msgstr "Veprimtaria e Fundit"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Të dhëna Zbulimi Shërbimesh"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Objekte Zbulimi Shërbimesh"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Adresim i Zgjeruar Stanza"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Fjalosje me Shumë Përdorues"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Të dhëna Pranie të Zgjeruar në Fjalosje me Shumë Përdorues"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Urdhra Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Shërbim PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Bytestreams"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Pa të Dhëna Bande"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Vendndodhje Përdoruesi"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar Përdoruesi"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#~ msgid "Chat State Notifications"
+#~ msgstr "Njoftime Gjendjeje Fjalosjeje"
+
+#~ msgid "Software Version"
+#~ msgstr "Version Software-i"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Fillim Rrjedhe"
+
+#~ msgid "User Mood"
+#~ msgstr "Humor Përdoruesi"
+
+#~ msgid "User Activity"
+#~ msgstr "Veprimtari Përdoruesi"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Aftësi Njësie"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negociata Sesioni të Koduar"
+
+#~ msgid "User Tune"
+#~ msgstr "Melodi Përdoruesi"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Shkëmbim Objekti Roster"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil Përdoruesi"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Audio Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Nofkë Përdoruesi"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Video Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Fatura Mesazhesh"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Botim Kyçi Publik"
+
+#~ msgid "User Chatting"
+#~ msgstr "Fjalosje Përdoruesi"
+
+#~ msgid "User Browsing"
+#~ msgstr "Shfletim Përdoruesi"
+
+#~ msgid "User Gaming"
+#~ msgstr "Lojë Përdoruesi"
+
+#~ msgid "User Viewing"
+#~ msgstr "Parje Përdoruesi"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Kodim Stanza"
+
+#~ msgid "Entity Time"
+#~ msgstr "Kohë Njësie"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Dërgim i Vonuar"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Objekte Të Dhënash Bashkëpunimi"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Depo Kartelash dhe Ndarje"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN Service Discovery për Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negociata Sesioni të Koduar të Thjeshtëzuar"
+
+#~ msgid "Read Error"
+#~ msgstr "Gabim Leximi"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Dështoi në lidhjen me shërbyesin."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Shtytëz leximi plot (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Mesazh i papërtypshëm"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "S'u lidha dot te strehë: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Hyrja dështoi (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Jeni nxjerrë jashtë ngaqë jeni futur prej një tjetër kompjuteri."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Gabim. Nuk është instaluar suport për SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Fjalëkalim i pasaktë."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nuk u bë dot lidhja me shërbyesin BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Edhe pak edhe mundet t'ju shkëpusin.  Shihni %s për përditësime."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Nuk u Lidh Dot"
+
+#~ msgid "Invalid username."
+#~ msgstr "Emër përdoruesi i pavlefshëm."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "S'zbërthen dot përgjigje për \"kap shërbyesin\""
+
+#~ msgid "Connection lost"
+#~ msgstr "Lidhje e humbur"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "S'u shquajt dot streha"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Lidhja u ndërpre (shkrim)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Rivendosje lidhjeje"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Gabim gjatë leximit prej \"socket\"-i: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "S'bëhet dot lidhja me strehën"
+
+#~ msgid "Could not write"
+#~ msgstr "S'shkruhej dot"
+
+#~ msgid "Could not connect"
+#~ msgstr "S'u bë dot lidhja"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "S'mundi të krijojë \"listen socket\""
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "S'u shqua dot emërstreha"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Fjalëkalim i pasaktë."
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nuk u arrit të vendosej lidhja me %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japoni"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Shërbyes Japonez Faquesi"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Shërbyes Japonez shpërnguljesh kartelash"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Humbi lidhja me shërbyesin\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nuk shquajti dot emër strehe"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Shërbyesi lyp TLS/SSL për hyrje. Nuk u gjet suport për TLS/SSL."
+
+#  IM Convo trans options
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Fshehje Dritareje Bashkëbisedimi"
+
+#~ msgid "More Data needed"
+#~ msgstr "Lypsen më tepër Të dhëna"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Ju lutem jepni një shkurtore për t'ia shoqëruar këtij emotikoni."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Ju lutem përzgjidhni një pamje për emotikonin."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Veprues cila ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Ngjyrë Kursori"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Ngjyrë e Dytë Kursori"
+
+#~ msgid "Interface colors"
+#~ msgstr "Ngjyra ndërfaqeje"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Madhësi Widget-i"
+
+#~ msgid "Invite message"
+#~ msgstr "Mesazh ftese"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Ju lutem jepni emrin e përdoruesit që doni të ftoni,\n"
+#~ "bashkë me një mesazh ftese në daçi."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "I pazoti të marrë Libër Vendndodhjesh MSN"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Edhe pak edhe mundet t'ju shkëpusin.  Mund të doni të përdorni TOC derisa "
+#~ "të ndreqet kjo.  Shihni %s për përditësime."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Po shihet për %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Lidhu me %s dështoi"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Nënshkrim: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "I pazoti të shkruajë kartelën %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "I pazoti të lexojë kartelën %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Mesazh shumë i gjatë, shkurtuar me %s bajtet e fundit."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s jo i futur për çastin."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Sinjalizim i %s i palejueshëm."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Ju është lënë një mesazh, po tejkaloni kufi shpejtësie shërbyesi."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Fjalosja në %s nuk është e mundshme."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Po i dërgoni mesazhet te %s shumë shpejt."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Humbët një MA prej %s, ngaqë qe shumë i madh."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Humbët një MA prej %s, ngaqë u dërgua shumë shpejt."
+
+#~ msgid "Failure."
+#~ msgstr "Dështim."
+
+#~ msgid "Too many matches."
+#~ msgstr "Shumë përputhje."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Lipsen më tepër cilësues."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Shërbim drejtorish përkohësisht i pamundur."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Kufizim kërkimi email-i."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Fjalëkyç i shpërfillur."
+
+#~ msgid "No keywords."
+#~ msgstr "Pa fjalëkyça."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Përdoruesi nuk ka të dhëna drejtorie."
+
+#~ msgid "Country not supported."
+#~ msgstr "Vend i pambuluar."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Dështim i panjohur: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Emër përdoruesi ose fjalëkalim i pavlefshëm."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Shërbimi është përkohësisht i pamundshëm."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr ""
+#~ "Niveli juaj i sinjalizimeve për çastin është tepër i lartë për hyrje."
+
+#~ 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 ""
+#~ "Jeni lidhur e shkëputur si shumë shpesh.  Prisni dhjetë minuta dhe "
+#~ "riprovoni.  Nëse vazhdoni të provoni, do t'ju duhet të prisni akoma më "
+#~ "gjatë."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Ndodhi një gabim i panjohur nënshkrimi: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Ndodhi një gabim i panjohur, %d.  Të dhëna: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Emër i pavlefshëm grupi"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Lidhja u Mbyll"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Po pritet për përgjigje..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "TOC e mori veten pas pushimit. Tani mundeni të dërgoni mesazhet tuaj "
+#~ "sërish."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Ndryshim i Sukseshëm Fjalëkalimi"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Merr Të dhëna Drejt."
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Caktoni Të dhëna Drejt."
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "S'hapa dot %s për shkrim!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Shpërngulja e kartelës dështoi; mbase ana tjetër e anuloi."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "S'u lidha dot për shpërngulje."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "S'munda të shkruaj titull kartele.  Kartela nuk do të shpërngulet."
+
+#~ msgid "Save As..."
+#~ msgstr "Ruaje Si..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s ju kërkon %s të pranoni %d kartelë: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s ju kërkon %s të pranoni %d kartela: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s ju kërkon t'i dërgoni kartelë"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Shtojcë Protokolli TOC"
+
+#  Build the protocol options frame.
+#~ msgid "%s Options"
+#~ msgstr "Mundësi %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Mundësi \"Proxy\""
+
+#~ msgid "By log size"
+#~ msgstr "Sipas madhësie regjistrimi"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Hap Lidhje në Shfletues"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Shërbyes ST_UN:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "_Pamje Emotikoni"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "_Shkurtore Emotikoni"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Xixëllo dritare kur merren mesazhe fjalosjeje"
+
 #~ msgid "Connection to server lost (no data received within %d second)"
 #~ msgid_plural ""
 #~ "Connection to server lost (no data received within %d seconds)"
diff --git a/po/sr.po b/po/sr.po
index eb18f05d1a..b9c2372442 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-22 16:17-0500\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-09-09 11:54+0100\n"
 "Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
@@ -603,19 +603,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Пошаљи за"
 
-msgid "Invite message"
-msgstr "Позивна порука"
-
-msgid "Invite"
-msgstr "Позови"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Унесите име корисника кога желите да позовете,\n"
-"а по жељи пошаљите и поруку уз позивницу."
-
 msgid "Conversation"
 msgstr "Разговор"
 
@@ -867,6 +854,41 @@ msgstr "Сви разговори"
 msgid "System Log"
 msgstr "Системски дневник"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Рачунам..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Прихвати"
+
+msgid "Reject"
+msgstr "Одбаци"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Напустили сте причаоницу%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "Е-поште"
 
@@ -903,6 +925,9 @@ msgstr "Настави"
 msgid "IM"
 msgstr "Порука"
 
+msgid "Invite"
+msgstr "Позови"
+
 msgid "(none)"
 msgstr "(без имена)"
 
@@ -1104,7 +1129,6 @@ msgstr "%s је одишао(ла) на одсуство. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s жели да Вам пошаље поруку. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Непозната заседа. Молимо Вас да ово пријавите!"
 
@@ -1510,6 +1534,28 @@ msgstr "ГнтПоследњеБелешке"
 msgid "Lastlog plugin."
 msgstr "Додатак за дневник."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "УРЛ мелодије"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "налози"
 
@@ -1610,13 +1656,6 @@ msgstr "Прихвати сертификат за %s?"
 msgid "SSL Certificate Verification"
 msgstr "Провера SSL сертификата"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Прихвати"
-
-msgid "Reject"
-msgstr "Одбаци"
-
 msgid "_View Certificate..."
 msgstr "_Прегледај сертификате..."
 
@@ -1716,6 +1755,8 @@ msgstr "+++ %s се пријавио(ла)"
 msgid "+++ %s signed off"
 msgstr "+++ %s се одјавио(ла)"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
@@ -1762,6 +1803,18 @@ msgstr "%s је напустио(ла) причаоницу."
 msgid "%s left the room (%s)."
 msgstr "%s је напустио(ла) причаоницу (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Позови на конференцију"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Унесите име корисника кога желите да позовете, а по жељи додајте и поруку у "
+"позивницу."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Не могу да добијем везу: %s"
@@ -2096,6 +2149,10 @@ msgstr "<font color=\"red\"><b>Не могу да читам датотеку: %
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <САМО-ОДГОВОР>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Грешка при успостављању везе"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Користите %s, али овај додатак захтева %s."
@@ -2491,9 +2548,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Прикажи и белешке о осталим програмима при прегледу дневника."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2548,8 +2606,9 @@ msgstr "Емулатор порука ван мреже"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Сачувај поруке послате кориснику ван мреже као заседу."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Остатак поруке ће бити сачуван као заседа. Можете уредити/уклонити заседу из "
@@ -2581,6 +2640,32 @@ msgstr "Сачувај поруке ван мреже у заседу"
 msgid "Do not ask. Always save in pounce."
 msgstr "Не питај ме. Увек сачувај у заседу."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Унесите лозинку"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2774,11 +2859,12 @@ msgstr ""
 "инсталирајте ActiveTCL са http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Не могу да пратим долазећа повезивања на брзе поруке\n"
 
 msgid ""
@@ -2831,14 +2917,21 @@ msgstr "%s је затворио разговор."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не могу да пошаљем поруку. Разговор не може да отпочне."
 
-msgid "Cannot open socket"
-msgstr "Не могу да отворим утичницу"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Не могу да направим утичницу:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Не могу да вежем утичницу на порт"
 
-msgid "Could not listen on socket"
-msgstr "Не могу да слушам утичницу"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Не могу да направим утичницу:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Грешка при споразумевању са локалним mDNSResponder-ом."
@@ -2887,13 +2980,16 @@ msgstr "Сачувај списак другара..."
 msgid "Load buddylist from file..."
 msgstr "Учитај списак другара из датотеке..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Попуни поља за регистрацију."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Лозинке нису исте."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Не могу да региструјем нови налог. Десила се грешка.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2905,14 +3001,14 @@ msgstr "Регистрација завршена успешно!"
 msgid "Password"
 msgstr "Лозинка"
 
-msgid "Password (retype)"
-msgstr "Лозинка (поново откуцајте)"
+msgid "Password (again)"
+msgstr "Лозинка (поновите)"
 
-msgid "Enter current token"
-msgstr "Унесите тренутни токен"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Тренутни токен"
+msgid "Captcha"
+msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Региструј нови Гаду-Гаду налог"
@@ -2965,6 +3061,15 @@ msgstr "Лозинка је успешно измењена!"
 msgid "Current password"
 msgstr "Тренутна лозинка"
 
+msgid "Password (retype)"
+msgstr "Лозинка (поново откуцајте)"
+
+msgid "Enter current token"
+msgstr "Унесите тренутни токен"
+
+msgid "Current token"
+msgstr "Тренутни токен"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Молим вас унесите текућу лозинку и нову лозинку: "
 
@@ -2978,6 +3083,7 @@ msgstr "Изаберите ћаскање за другара: %s"
 msgid "Add to chat..."
 msgstr "Додај у ћаскање..."
 
+#. Global
 msgid "Available"
 msgstr "Доступан"
 
@@ -3011,7 +3117,7 @@ msgstr "Нема нађених корисника"
 msgid "There are no users matching your search criteria."
 msgstr "Нема нађених корисника по вашем критеријуму претраге."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Не могу да читам утичницу"
 
 msgid "Buddy list downloaded"
@@ -3026,8 +3132,14 @@ msgstr "Листа другова послата"
 msgid "Your buddy list was stored on the server."
 msgstr "Ваша листа другова је послана на сервер."
 
-msgid "Connection failed."
-msgstr "Повезивање пропало."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Повезан"
+
+msgid "Connection failed"
+msgstr "Веза неуспешна"
 
 msgid "Add to chat"
 msgstr "Додај у ћаскање"
@@ -3035,13 +3147,23 @@ msgstr "Додај у ћаскање"
 msgid "Chat _name:"
 msgstr "_Име ћаскања:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Не могу да се повежем на сервер."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Успостављање везе"
+
 msgid "Chat error"
 msgstr "Грешка у ћаскању"
 
 msgid "This chat name is already in use"
 msgstr "Ово име ћаскања је већ заузето"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Нисте у вези са сервером."
 
 msgid "Find buddies..."
@@ -3083,6 +3205,10 @@ msgstr "Популарни пољски ИМ"
 msgid "Gadu-Gadu User"
 msgstr "Гаду-Гаду корисник"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Добављам сервер"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Непозната наредба: %s"
@@ -3097,7 +3223,8 @@ msgstr "Тема није постављена"
 msgid "File Transfer Failed"
 msgstr "Пропао пренос датотеке"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Не могу да отворим порт за слушање."
 
 msgid "Error displaying MOTD"
@@ -3113,8 +3240,18 @@ msgstr "Нема поруке дана за ову везу."
 msgid "MOTD for %s"
 msgstr "Порука дана за %s"
 
-msgid "Server has disconnected"
-msgstr "Сервер се искључио"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Веза са сервером је прекинута:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Погледајте поруку дана"
@@ -3125,25 +3262,24 @@ msgstr "_Канал:"
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC надимци не могу садржати белине"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Успостављање везе"
-
 msgid "SSL support unavailable"
 msgstr "SSL подршка је недоступна"
 
-msgid "Couldn't create socket"
-msgstr "Не могу да начиним утичницу"
+msgid "Unable to connect"
+msgstr "Немогуће повезивање"
 
-msgid "Couldn't connect to host"
-msgstr "Не могу да се повежем са домаћином"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Не могу да се повежем на %s"
 
-msgid "Read error"
-msgstr "Грешка при читању"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Сервер је прекинуо везу"
 
 msgid "Users"
 msgstr "Корисници"
@@ -3325,6 +3461,17 @@ msgstr ""
 "Изабрали сте име налога које је сервер одбио. Вероватно садржи недозвољене "
 "знаке."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Ово име ћаскања је већ заузето"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Надимак"
+
 msgid "Cannot change nick"
 msgstr "Не могу да променим надимак"
 
@@ -3561,10 +3708,12 @@ msgstr ""
 msgid "execute"
 msgstr "изврши"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Сервер захтева TLS/SSL за пријаву. Није нађена подршка за TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Захтевате шифровану везу, али није нађена подршка за TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3582,18 +3731,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Идентификација обичним текстом"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Неуспешна идентификација"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Неисправан одговор сервера."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Сервер не користи ниједан од подржаних начина идентификовања"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Захтевате шифровање, али оно није доступно на овом серверу."
+
 msgid "Invalid challenge from server"
 msgstr "Неисправан изазов сервера"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "САСЛ грешка"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Није наведен разлог"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Неподржано издање"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Не могу да успоставим везу са сервером:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Не могу да успоставим везу са сервером:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Не могу да успоставим везу."
+
 msgid "Full Name"
 msgstr "Пуно име"
 
@@ -3661,158 +3846,9 @@ msgstr "Програм"
 msgid "Operating System"
 msgstr "Оперативни систем"
 
-msgid "Last Activity"
-msgstr "Последња активност"
-
-msgid "Service Discovery Info"
-msgstr "Подаци откривања сервиса"
-
-msgid "Service Discovery Items"
-msgstr "Ставке откривања сервиса"
-
-msgid "Extended Stanza Addressing"
-msgstr "Проширено адресирање одељка"
-
-msgid "Multi-User Chat"
-msgstr "Вишекорисничко ћаскање"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Подаци о проширеном ћаскању са више корисника"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr "PubSub сервис"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 протоци"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "ХХТМЛ — брзе поруке"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Корисникова локација"
-
-msgid "User Avatar"
-msgstr "Корисникова сличица"
-
-msgid "Chat State Notifications"
-msgstr "Обавештења о стању ћаскања"
-
-msgid "Software Version"
-msgstr "Верзија програма"
-
-msgid "Stream Initiation"
-msgstr "Покретање протока"
-
-msgid "File Transfer"
-msgstr "Преноси датотека"
-
-msgid "User Mood"
-msgstr "Расположење корисника"
-
-msgid "User Activity"
-msgstr "Активност корисника"
-
-msgid "Entity Capabilities"
-msgstr "Способности"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Преговори о шифрованој сесији"
-
-msgid "User Tune"
-msgstr "Корисникова мелодија"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr "Адреса за контакт"
-
-msgid "User Profile"
-msgstr "Корисников профил"
-
-msgid "Jingle"
-msgstr "Џингл"
-
-msgid "Jingle Audio"
-msgstr "Џингл звук"
-
-msgid "User Nickname"
-msgstr "Надимак"
-
-msgid "Jingle ICE UDP"
-msgstr "Џингл ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Џингл ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Изворни џингл UDP"
-
-msgid "Jingle Video"
-msgstr "Џингл видео"
-
-msgid "Jingle DTMF"
-msgstr "Џингл DTMF"
-
-msgid "Message Receipts"
-msgstr "Пријем порука"
-
-msgid "Public Key Publishing"
-msgstr "Издавање јавног кључа"
-
-msgid "User Chatting"
-msgstr "Корисник ћаска"
-
-msgid "User Browsing"
-msgstr "Корисник разгледа"
-
-msgid "User Gaming"
-msgstr "Корисник се игра"
-
-msgid "User Viewing"
-msgstr "Корисник гледа"
-
-msgid "Ping"
-msgstr "Пинг"
-
-msgid "Stanza Encryption"
-msgstr "Шифровање одељка"
-
-msgid "Entity Time"
-msgstr "Време важности"
-
-msgid "Delayed Delivery"
-msgstr "Одложена достава"
-
-msgid "Collaborative Data Objects"
-msgstr "Сараднички подаци објеката"
-
-msgid "File Repository and Sharing"
-msgstr "Складиштење и дељење датотека"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Поједностављени преговори и шифрованој сесији"
-
-msgid "Hop Check"
-msgstr "Провера скока"
-
-msgid "Capabilities"
-msgstr "Могућности"
+#, fuzzy
+msgid "Local Time"
+msgstr "Локална датотека:"
 
 msgid "Priority"
 msgstr "Приоритет"
@@ -3820,6 +3856,14 @@ msgstr "Приоритет"
 msgid "Resource"
 msgstr "Ресурс"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Пријављен"
+
 # Овде је некада стајало 'име оца'. Код нас је средње име углавном име
 # оца, али то дефинитивно не мора да буде случај на другим местима. Нпр
 # у Холандији је врло уобичајено да људи имају по 4-5 имена; увек се зна
@@ -3992,28 +4036,28 @@ msgstr "Изаберите сервер за конференције који �
 msgid "Find Rooms"
 msgstr "Пронађи собе"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Захтевате шифровање, али оно није доступно на овом серверу."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Надимак:"
 
-msgid "Write error"
-msgstr "Грешка при писању"
+#, fuzzy
+msgid "No users found"
+msgstr "Нема нађених корисника"
 
-msgid "Ping timeout"
-msgstr ""
+# „радно место‟ у организацији?
+# Улога је званични термин и у УМЛ-у, прим. прев.
+#, fuzzy
+msgid "Roles:"
+msgstr "Улога"
 
-msgid "Read Error"
-msgstr "Грешка при читању"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Време везе не истекло"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Не могу да успоставим везу са сервером:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Не могу начинити утичницу"
 
 msgid "Invalid XMPP ID"
 msgstr "Неисправна Џабер адреса"
@@ -4021,6 +4065,10 @@ msgstr "Неисправна Џабер адреса"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Неисправна Џабер адреса. Морате унети домен."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Не могу да се повежем на сервер."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Регистрација %s@%s успешна"
@@ -4045,9 +4093,6 @@ msgstr "Одјава регистрације успела"
 msgid "Unregistration Failed"
 msgstr "Одјава регистрације неуспела"
 
-msgid "Already Registered"
-msgstr "Већ је регистрован"
-
 msgid "State"
 msgstr "Област"
 
@@ -4060,6 +4105,9 @@ msgstr "Телефон"
 msgid "Date"
 msgstr "Датум"
 
+msgid "Already Registered"
+msgstr "Већ је регистрован"
+
 msgid "Unregister"
 msgstr "Одјави регистрацију"
 
@@ -4087,6 +4135,10 @@ msgstr "Региструј нови налог на %s"
 msgid "Change Registration"
 msgstr "Измени регистрацију"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Не могу да се повежем на сервер."
+
 msgid "Error unregistering account"
 msgstr "Грешка при одјави регистрације"
 
@@ -4111,6 +4163,12 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Неовлашћен"
 
+msgid "Mood"
+msgstr "Расположење"
+
+msgid "Now Listening"
+msgstr "Сада слуша"
+
 msgid "Both"
 msgstr "Оба"
 
@@ -4132,12 +4190,6 @@ msgstr "Ништа"
 msgid "Subscription"
 msgstr "Претплата"
 
-msgid "Mood"
-msgstr "Расположење"
-
-msgid "Now Listening"
-msgstr "Сада слуша"
-
 msgid "Mood Text"
 msgstr "Текст о расположењу"
 
@@ -4180,9 +4232,6 @@ msgstr "Ваша лозинка је измењена."
 msgid "Error changing password"
 msgstr "Грешка при измени лозинке"
 
-msgid "Password (again)"
-msgstr "Лозинка (поновите)"
-
 msgid "Change XMPP Password"
 msgstr "Промени Џабер лозинку"
 
@@ -4376,18 +4425,24 @@ msgstr "Не могу да одстраним корисника %s"
 msgid "Unable to ping user %s"
 msgstr "Не могу да пингујем корисника %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Не могу да трубим јер није познато ништа о кориснику %s."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Не могу да трубим јер је корисник %s можда ван мреже."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Не могу да трубим јер корисник %s то не подржава."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Трубим %sу..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4397,9 +4452,34 @@ msgstr "Труби"
 msgid "%s has buzzed you!"
 msgstr "%s вам труби!"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Трубим %sу..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Не могу да пошаљем датотеку за %s, погрешан ЈИБ."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Слање датотеке кориснику %s није успело јер је ван мреже"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Слање датотеке кориснику %s није успело јер није пријављен"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Грешка при регистрацији"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Изаберите извор од %s коме желите да пошаљете датотеку"
+
+msgid "Select a Resource"
+msgstr "Изаберите извор"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Покрени _ћаскање"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Подеси причаоницу."
@@ -4419,16 +4499,18 @@ msgstr "topic [нова тема]:  Прегледај или промени т�
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;корисник&gt; [разлог]:  Брани приступ кориснику у причаоници."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;корисник&gt; &lt;owner|admin|member|outcast|none&gt;: Поставља "
 "повезаност корисника са причаоницом."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "правило &lt;корисник&gt; &lt;owner|admin|member|outcast|none&gt;: Поставља "
 "корисничко правило у причаоници."
@@ -4492,6 +4574,9 @@ msgstr "Повезивање са сервером"
 msgid "File transfer proxies"
 msgstr "Посредници за пренос датотека"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4530,6 +4615,14 @@ msgstr "Грешка при XML обради"
 msgid "Unknown Error in presence"
 msgstr "Непозната грешка у присуству"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Грешка при укључењу у ћаскање: %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Грешка при ћаскању: %s"
+
 msgid "Create New Room"
 msgstr "Направи нову собу"
 
@@ -4546,13 +4639,32 @@ msgstr "П_оставке за собу"
 msgid "_Accept Defaults"
 msgstr "П_рихвати подразумевано"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Грешка при укључењу у ћаскање: %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Није наведен разлог"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Грешка при ћаскању: %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Избацио Вас је %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Избачени од стране %s: (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Дошло је до грешке при отварању датотеке."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Пропао пренос датотеке"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Не могу да отворим датотеку „%s“: %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4578,9 +4690,6 @@ msgstr "Слање датотеке кориснику %s није успело
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Изаберите извор од %s коме желите да пошаљете датотеку"
 
-msgid "Select a Resource"
-msgstr "Изаберите извор"
-
 msgid "Edit User Mood"
 msgstr "Уреди корисничко расположење"
 
@@ -4878,6 +4987,12 @@ msgstr "Остали контакти"
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s Вам је послао(ла) позив за разговор преко камере, који још увек није "
+"подржан."
+
 msgid "Nudge"
 msgstr "Потапшај"
 
@@ -5031,9 +5146,6 @@ msgstr ""
 "За повезивање са МСН потребна је подршка за SSL. Инсталирајте подржану SSL "
 "библиотеку."
 
-msgid "Failed to connect to server."
-msgstr "Не могу да се повежем на сервер."
-
 msgid "Error retrieving profile"
 msgstr "Грешка при читању са сервера"
 
@@ -5223,63 +5335,26 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s није дозвољена група."
-
-msgid "Unknown error."
-msgstr "Непозната грешка."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s на %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s вас гурка!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Непозната грешка (%d)"
 
 msgid "Unable to add user"
 msgstr "Не могу да забраним корисника"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Следећи корисници недостају у вашем адресару"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Не могу да додам корисника на %s (%s)"
-
 #, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Не могу да одстраним корисника на %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Не могу да дозволим корисника на %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s се не може додати пошто вам је списак другара попуњен."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s није исправан налог пасоша."
+msgid "Unknown error (%d)"
+msgstr "Непозната грешка (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Услуге тренутно нису доступне."
+msgid "The following users are missing from your addressbook"
+msgstr "Следећи корисници недостају у вашем адресару"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Порука за мобилни није послата јер је предугачка."
 
-msgid "Unable to rename group"
-msgstr "Не могу да преименујем групу"
-
-msgid "Unable to delete group"
-msgstr "Не могу да уклоним групу"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5332,9 +5407,6 @@ msgstr "Порука није послата зато што је дошло д�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Порука није послата зато што је дошло до непознате грешке:"
 
-msgid "Unable to connect"
-msgstr "Немогуће повезивање"
-
 msgid "Writing error"
 msgstr "Грешка при писању"
 
@@ -5349,20 +5421,24 @@ msgstr ""
 "Грешка при повезивању са сервера %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Наш протокол није подржан на серверу."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Грешка при обради HTTP-а."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Пријавили сте се са неког другог места."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "МСН сервери су привремено недоступни. Сачекајте мало па покушајте поново."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Веза Вам је прекинута. Привремено се гасе МСН сервери."
 
 #, c-format
@@ -5393,6 +5469,18 @@ msgstr "Шаљем колачић"
 msgid "Retrieving buddy list"
 msgstr "Преузимам списак другара"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s Вам је послао(ла) позив за разговор преко камере, који још увек није "
+"подржан."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s Вам је послао(ла) позив за разговор преко камере, који још увек није "
+"подржан."
+
 msgid "Away From Computer"
 msgstr "Одсутан од рачунара"
 
@@ -5431,14 +5519,6 @@ msgstr "Порука се не може послати због грешке с�
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Порука можда није послата зато што је дошло до непознате грешке:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s вас је додао у свој списак другара."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s вас је уклонио са његове или њене листе другара."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Да обришем другара из адресара?"
 
@@ -5468,6 +5548,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Додатак за МСН протокол"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s није дозвољена група."
+
+msgid "Unknown error."
+msgstr "Непозната грешка."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s на %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Не могу да додам корисника на %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Не могу да одстраним корисника на %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Не могу да дозволим корисника на %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s се не може додати пошто вам је списак другара попуњен."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s није исправан налог пасоша."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Услуге тренутно нису доступне."
+
+msgid "Unable to rename group"
+msgstr "Не могу да преименујем групу"
+
+msgid "Unable to delete group"
+msgstr "Не могу да уклоним групу"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s вас је додао у свој списак другара."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s вас је уклонио са његове или њене листе другара."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Корисник %s не постоји"
 
@@ -5497,6 +5625,8 @@ msgid "Lost connection with server"
 msgstr "Веза са сервером је прекинута"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Нова е-пошта"
 
@@ -5541,41 +5671,26 @@ msgstr[3] ""
 msgid "Add contacts from server"
 msgstr "Додај контакт са сервера"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Повезан"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Грешка у протоколу, код %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr "Неисправно корисничко име или лозинка"
+
 msgid "MySpaceIM Error"
 msgstr "Грешка у Мом свемиру"
 
 msgid "Invalid input condition"
 msgstr "Погрешан улазни услов"
 
-msgid "Read buffer full (2)"
-msgstr "Бафер за читање је пун (2)"
-
-# Mozda "razume poruku"
-msgid "Unparseable message"
-msgstr "Порука се не може проследити"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Не могу да се повежем са домаћином: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Неуспешно додавање другара разговору"
 
@@ -5659,6 +5774,15 @@ msgstr "Укупно другова"
 msgid "Client Version"
 msgstr "Верзија програма"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Идите на http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username и одаберите корисничко име како би покушали поново."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Корисничко име је доступно"
 
@@ -5875,9 +5999,6 @@ msgstr "Не можете додати сами себе"
 msgid "Master archive is misconfigured"
 msgstr "Главна архива није добро подешена"
 
-msgid "Incorrect username or password"
-msgstr "Неисправно корисничко име или лозинка"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Не могу да препознам домаћина за унесено корисничко име"
 
@@ -5918,9 +6039,9 @@ msgstr "Корисник или није на вези или имате заб�
 msgid "Unknown error: 0x%X"
 msgstr "Непозната грешка: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Пријава није успела (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Не могу да пингујем корисника %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6024,9 +6145,6 @@ msgstr "GroupWise конференција %d"
 msgid "Authenticating..."
 msgstr "Идентификација"
 
-msgid "Unable to connect to server."
-msgstr "Не могу да се повежем на сервер."
-
 msgid "Waiting for response..."
 msgstr "Чекам на одговор..."
 
@@ -6050,26 +6168,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Да ли желите да се прикључите разговору?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Веза је прекинута зато што сте се пријавили под овим именом са неког другог "
-"места."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "Изгледа да %s није присутан и да није примио послату поруку."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Не могу да се повежем на сеервер. Унесите адресу сервера на ког желите да се "
 "повежем."
 
-msgid "Error. SSL support is not installed."
-msgstr "SSL подршка је неопходна. Инсталирајте је."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ова конференција је затворена. Поруке се више не могу слати."
 
@@ -6092,24 +6203,33 @@ msgstr "Адреса сервера"
 msgid "Server port"
 msgstr "Порт сервера"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Добијен је неочекиван одговор HTTP сервера."
+
+#. username connecting too frequently
+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 ""
+"Успостављали сте и прекидали везу сувише често. Сачекајте десет минута па "
+"покушајте поново. Ако наставите да покушавате, мораћете да сачекате још дуже."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Грешка у захтеву токена за пријаву"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Не могу да се повежем на причаоницу"
 
 msgid "Invalid chat room name"
 msgstr "Неисправно име причаонице"
 
-msgid "Server closed the connection."
-msgstr "Сервер је прекинуо везу"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Веза са сервером је прекинута:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Добијени су погрешни подаци од сервера."
 
 #. *< type
@@ -6157,7 +6277,8 @@ msgstr "Прекинута је веза са удаљеним корисник�
 msgid "Received invalid data on connection with remote user."
 msgstr "Примљени погрешни подаци од удаљеног корисника."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Не могу да успоставим везу са удаљеним корисником."
 
 msgid "Direct IM established"
@@ -6356,21 +6477,15 @@ msgstr "_Нивои упозорења"
 msgid "Buddy Comment"
 msgstr "Примедба за другара:"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Не могу се повежем на сервер за потврду:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Не могу да се повежем на БОС сервер:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Не могу да се повежем на сервер."
 
 msgid "Username sent"
 msgstr "Корисничко име је послато"
@@ -6382,52 +6497,61 @@ msgstr "Веза је успостављена, колачић је послат
 msgid "Finalizing connection"
 msgstr "Довршава повезивање"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Пријава није успела: Не могу да се пријавим као %s јер је то неисправно "
 "корисничко име. Корисничка имена морају бити исправне адресе е-поште, почети "
 "словом и садржати само слова, бројеве и размаке, или садржати само бројеве."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Неисправно корисничко име."
+# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Веза се ускоро може прекинути.  Погледајте %s за допуне."
 
-msgid "Incorrect password."
-msgstr "Неисправна лозинка."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Неуспело добављање исправног хеша за пријаву на АИМ."
+
+msgid "Unable to get a valid login hash."
+msgstr "Не могу да прими исправан хеш за пријаву."
+
+msgid "Received authorization"
+msgstr "Примио овлашћење"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Корисник не постоји."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Ваш налог је тренутно недоступан."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Услуга АОЛ брзих порука је привремено недоступна."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Програм који користите је застарео. Освежите га са %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Успостављали сте и прекидали везу сувише често. Сачекајте десет минута па "
 "покушајте поново. Ако наставите да покушавате, мораћете да сачекате још дуже."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Програм који користите је застарео. Освежите га са %s"
-
-msgid "Could Not Connect"
-msgstr "Не могу да се повежем"
-
-msgid "Received authorization"
-msgstr "Примио овлашћење"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Унети SecurID кључ је неисправан."
 
 msgid "Enter SecurID"
@@ -6442,22 +6566,6 @@ msgstr "Унесите шестоцифрени број са дигитално
 msgid "_OK"
 msgstr "_У реду"
 
-# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Веза се ускоро може прекинути.  Погледајте %s за допуне."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Неуспело добављање исправног хеша за пријаву на АИМ."
-
-# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Веза се ускоро може прекинути. Погледајте %s за допуне."
-
-msgid "Unable to get a valid login hash."
-msgstr "Не могу да прими исправан хеш за пријаву."
-
 msgid "Password sent"
 msgstr "Лозинка послата"
 
@@ -6599,7 +6707,7 @@ msgstr[1] "Пропустили сте %hu поруке од %s из непоз�
 msgstr[2] "Пропустили сте %hu порука од %s из непознатих разлога."
 msgstr[3] "Пропустили сте %hu поруку од %s из непознатих разлога."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Не могу да пошаљем поруку: %s"
@@ -6621,6 +6729,9 @@ msgstr "На вези од"
 msgid "Member Since"
 msgstr "Члан од"
 
+msgid "Capabilities"
+msgstr "Могућности"
+
 msgid "Profile"
 msgstr "Профил"
 
@@ -6815,9 +6926,9 @@ msgstr[3] ""
 msgid "Away message too long."
 msgstr "Порука за одсуство је предугачка."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6841,9 +6952,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Сирочићи"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Не могу да додам другара %s зато што имате превише другара у списку. "
@@ -6852,8 +6963,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(без имена)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Не могу да додам другара %s из непознатих разлога."
 
 # Is it "them"? Or "him/her"?
@@ -6983,6 +7094,7 @@ msgstr "_Тражи"
 msgid "Set User Info (web)..."
 msgstr "Постави податке (преко веба)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Промени лозинку (преко веба)"
 
@@ -7012,6 +7124,10 @@ msgstr "Пронађи другара према адреси е-поште..."
 msgid "Search for Buddy by Information"
 msgstr "Пронађи другара према подацима"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Корисник није пријављен"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7204,6 +7320,38 @@ msgstr "Ажурирај"
 msgid "Could not change buddy information."
 msgstr "Не могу да променим податке о другару."
 
+msgid "Mobile"
+msgstr "Мобилни телефон"
+
+msgid "Note"
+msgstr "Белешка"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Сличица другара"
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "Измени"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Измени"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Сервер је заузет"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u захтева проверу"
@@ -7512,6 +7660,13 @@ msgstr "<p><b>Аутори закрпа</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr ""
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Оригинални аутор</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>И остали људи у позадини...</i><br>\n"
 
@@ -7537,6 +7692,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "О OpenQ"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Измени адресу"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7583,7 +7742,8 @@ msgstr "Интервал одржавања везе (у секундама)"
 msgid "Update interval (seconds)"
 msgstr "Интервал ажурирања (у секундама)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Не могу да дешифрујем одговор са сервера"
 
 #, c-format
@@ -7608,9 +7768,6 @@ msgstr "Потребна је активација"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Непознат одговор при пријави (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Не могу да дешифрујем одговор са сервера"
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -7644,30 +7801,18 @@ msgstr ""
 "Непознат одговор при пројави (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Не могу да се повежем."
-
 msgid "Socket error"
 msgstr "Грешка у утичници"
 
-msgid "Unable to read from socket"
-msgstr "Не могу да читам утичницу"
-
-msgid "Write Error"
-msgstr "Грешка при писању"
-
-msgid "Connection lost"
-msgstr "Веза прекинута"
-
 msgid "Getting server"
 msgstr "Добављам сервер"
 
 msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
-msgstr "Не могу да добијем домаћина"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Не могу да се повежем на сервер."
 
 msgid "Invalid server or port"
 msgstr "Неисправан сервер или порт"
@@ -7718,7 +7863,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun наредба"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Не могу да дешифрујем одговор приликом пријаве"
 
 msgid "Unknown LOGIN CMD"
@@ -7738,9 +7884,6 @@ msgstr "Датотека послата"
 msgid "%d canceled the transfer of %s"
 msgstr "%d је прекинуо пренос датотеке %s"
 
-msgid "Connection closed (writing)"
-msgstr "Веза прекинута (пишем)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Назив групе:</b> %s<br>"
@@ -7794,17 +7937,6 @@ msgstr "Sametime администратор је дао следећу изја�
 msgid "Sametime Administrator Announcement"
 msgstr "Изјава Sametime администратора"
 
-msgid "Connection reset"
-msgstr "Понављање везе"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Грешка при читању из утичнице: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Не могу да се повежем на домаћина"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Најава од %s"
@@ -7827,6 +7959,9 @@ msgstr "Звучници"
 msgid "Video Camera"
 msgstr "Видео камера"
 
+msgid "File Transfer"
+msgstr "Преноси датотека"
+
 msgid "Supports"
 msgstr "Подршка"
 
@@ -8543,9 +8678,6 @@ msgstr "Организација"
 msgid "Unit"
 msgstr "Јединица"
 
-msgid "Note"
-msgstr "Белешка"
-
 msgid "Join Chat"
 msgstr "Прикључи се ћаскању"
 
@@ -8645,6 +8777,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Мрежне статистике"
 
+msgid "Ping"
+msgstr "Пинг"
+
 msgid "Ping failed"
 msgstr "Пинг није успео"
 
@@ -8710,7 +8845,8 @@ msgstr "Неподржана врста јавног кључа"
 msgid "Disconnected by server"
 msgstr "Сервер Вас је искључио"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Грешка при повезивању на SILC сервер"
 
 msgid "Key Exchange failed"
@@ -8722,26 +8858,26 @@ msgstr ""
 "Настављам прекинуту сесију. Притисните Поновно повезивање да направите нову "
 "везу."
 
-msgid "Connection failed"
-msgstr "Веза неуспешна"
-
 msgid "Performing key exchange"
 msgstr "Размена кључева је у току"
 
-msgid "Unable to create connection"
-msgstr "Не могу да успоставим нову везу."
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Не могу да учитам SILC пар кључева"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Повезивање са SILC сервером"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Не могу да учитам SILC пар кључева"
+
 msgid "Out of memory"
 msgstr "Нема довољно меморије"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Не могу да покренем SILC протокол"
 
 msgid "Error loading SILC key pair"
@@ -9033,7 +9169,8 @@ msgstr "Дигитално потпиши и провери све поруке"
 msgid "Creating SILC key pair..."
 msgstr "Израда SILC пара кључева је у току..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Не могу да направим SILC пар кључева\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9129,6 +9266,9 @@ msgstr "Табла"
 msgid "No server statistics available"
 msgstr "Нема доступних статистика"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Грешка при повезивању на SILC сервер"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Грешка: издања се не слажу, обновите вашег програма"
@@ -9169,30 +9309,27 @@ msgstr "Грешка: колачић је неисправан."
 msgid "Failure: Authentication failed"
 msgstr "Неуспешна идентификација"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Не може се покренути SILC програмска веза"
 
 msgid "John Noname"
 msgstr "Безимени балон"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Не могу да учитам SILC пар кључева: %s"
 
-msgid "Could not write"
-msgstr "Не могу да упишем"
-
-msgid "Could not connect"
-msgstr "Не могу да се повежем"
+msgid "Unable to create connection"
+msgstr "Не могу да успоставим нову везу."
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Непознат одговор сервера."
 
-msgid "Could not create listen socket"
-msgstr " е могу да начиним утичницу за слушање"
-
-msgid "Could not resolve hostname"
-msgstr "Не могу да добијем име домаћина"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Не могу начинити утичницу"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "СИП корисничка имена несмеју садржати размак или @ симболе"
@@ -9233,178 +9370,62 @@ msgstr "Овласти корисника"
 msgid "Auth Domain"
 msgstr "Овласти домен"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Тражим %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Неуспешно повезивање на %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Пријава: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Не могу да пишем у датотеку %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Не могу да прочитам датотеку %s."
-
-# greska: plural
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Порука је предугачка, последњих %s бајтова је занемарено."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s није тренутно пријављен."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Није дозвољено упозорити %s."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Порука је одбачена, прекорачујете ограничења брзине сервера."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Није могуће ћаскање у %s."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Шаљете поруке пребрзо за %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Пропустили сте поруку од %s зато што је превелика."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Пропустили сте поруку од %s зато је послата превише брзо."
-
-#, c-format
-msgid "Failure."
-msgstr "Неуспех."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Превише поклапања."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Потребно више обележја."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Услуге именика тренутно нису доступне."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Ограничена претрага према адреси е-поште."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Кључне речи занемарене."
-
-#, c-format
-msgid "No keywords."
-msgstr "Нема кључних речи."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Корисник није уписан у именик."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Држава није подржана."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Непознат неуспех: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Није исправно корисничко име или лозинка."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Услуга је привремено недоступна."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Имате превише упозорења да бисте се могли пријавити."
-
-#, c-format
-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 ""
-"Успостављате и прекидате везу сувише често. Сачекајте десет минута и "
-"покушајте поново. Ако наставите са покушајима, мораћете сачекати чак и дуже."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Дошло је до непознате грешке при пријави: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Догодила се непозната грешка %d. Подаци: %s"
-
-msgid "Invalid Groupname"
-msgstr "Неисправан назив групе"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;соба&gt;:  Прикључи се причаоници на Јаху мрежи"
 
-msgid "Connection Closed"
-msgstr "Веза прекинута"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Исписује собе на Јаху мрежи"
 
-msgid "Waiting for reply..."
-msgstr "Чекам за одговор..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "цртање: захтевај од корисника да почне сесију цртања"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "ТОЦ је прекинуо застој. Сада поново можете слати поруке."
+msgid "Yahoo ID..."
+msgstr "Јаху ИБ..."
 
-msgid "Password Change Successful"
-msgstr "Лозинка успешно измењена"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Додатак за Јаху протокол"
 
-msgid "_Group:"
-msgstr "_Група:"
+msgid "Pager server"
+msgstr "Пејџер сервер"
 
-msgid "Get Dir Info"
-msgstr "Прибави податке из именика"
+msgid "Pager port"
+msgstr "Порт за пејџер"
 
-msgid "Set Dir Info"
-msgstr "Постави податке у именик"
+msgid "File transfer server"
+msgstr "Сервер за пренос датотека"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Не могу да отворим %s за упис!"
+msgid "File transfer port"
+msgstr "Порт за пренос датотека"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Неуспешан пренос датотеке; друга страна је вероватно отказала."
+msgid "Chat room locale"
+msgstr "Локализација причаонице"
 
-msgid "Could not connect for transfer."
-msgstr "Не могу да успоставим везу за пренос."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Занемари позиве причаонице и конференције"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Не могу да упишем заглавље датотеке. Датотека се неће пренети."
+msgid "Chat room list URL"
+msgstr "УРЛ за списак причаоница"
 
-msgid "Save As..."
-msgstr "Сачувај као..."
+msgid "Yahoo Chat server"
+msgstr "Јаху причаоница"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s захтева од %s да прими %d датотеку: %s (%.2f %s)%s%s"
-msgstr[1] "%s захтева од %s да прими %d датотеке: %s (%.2f %s)%s%s"
-msgstr[2] "%s захтева од %s да прими %d датотека: %s (%.2f %s)%s%s"
-msgstr[3] "%s захтева од %s да прими %d датотеку: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Јаху порт за разговор"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s захтева од Вас да пошаљете датотеку"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Јаху ИБ..."
 
 #. *< type
 #. *< ui_requirement
@@ -9416,14 +9437,12 @@ msgstr "%s захтева од Вас да пошаљете датотеку"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Додатак за ТОЦ протокол"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Додатак за Јаху протокол"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
-"%s Вам је послао(ла) позив за разговор преко камере, који још увек није "
-"подржан."
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ваша Јаху! порука није послата."
@@ -9448,6 +9467,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Одбијено додавање другара"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Добијени су погрешни подаци од сервера."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "Непознат број грешке: %d. Пријава на Јаху можда може да то отклони."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "Непознат број грешке: %d. Пријава на Јаху можда може да то отклони."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Неисправно корисничко име или лозинка"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9478,37 +9521,32 @@ msgstr "Ваш налог је закључан, пријавите се на Ј
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Непознат број грешке: %d. Пријава на Јаху можда може да то отклони."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Не могу да додам другара %s у групу %s у списак сервера за налог %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Не могу да додам другара у списак сервера"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Разговетан %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Добијен је неочекиван одговор HTTP сервера."
 
-msgid "Connection problem"
-msgstr "Грешка при повезивању"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Прекинута је веза са %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Не могу да успоставим везу са %s:\n"
+"Не могу да успоставим везу са сервером:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9556,8 +9594,8 @@ msgstr "Поставке присуства"
 msgid "Start Doodling"
 msgstr "Почни цртати"
 
-msgid "Activate which ID?"
-msgstr "Који ИД да активирам?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Прикључи ћаскању са ким?"
@@ -9571,73 +9609,15 @@ msgstr "Прикључи корисника ћаскању..."
 msgid "Open Inbox"
 msgstr "Отвори сандуче"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;соба&gt;:  Прикључи се причаоници на Јаху мрежи"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Исписује собе на Јаху мрежи"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "цртање: захтевај од корисника да почне сесију цртања"
-
-msgid "Yahoo ID..."
-msgstr "Јаху ИБ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Додатак за Јаху протокол"
-
-msgid "Yahoo Japan"
-msgstr "Јаху Јапан"
-
-msgid "Pager server"
-msgstr "Пејџер сервер"
-
-msgid "Japan Pager server"
-msgstr "Јапанов пејџер сервер"
-
-msgid "Pager port"
-msgstr "Порт за пејџер"
-
-msgid "File transfer server"
-msgstr "Сервер за пренос датотека"
-
-msgid "Japan file transfer server"
-msgstr "Јапанов сервер за пренос датотека"
-
-msgid "File transfer port"
-msgstr "Порт за пренос датотека"
-
-msgid "Chat room locale"
-msgstr "Локализација причаонице"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Занемари позиве причаонице и конференције"
-
-msgid "Chat room list URL"
-msgstr "УРЛ за списак причаоница"
-
-msgid "Yahoo Chat server"
-msgstr "Јаху причаоница"
-
-msgid "Yahoo Chat port"
-msgstr "Јаху порт за разговор"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Пошаљи захтев за жврљање"
 
+msgid "Unable to connect."
+msgstr "Не могу да се повежем."
+
 # Ovo je FD kao broj koji je ekvivalentan "file handle"-u, odnosno, to je jedinstvena oznaka otvorenog fajla za pristup; sta znaci "establish" u ovom kontekstu mi nije jasno
 msgid "Unable to establish file descriptor."
 msgstr "Не могу да успоставим описник датотеке."
@@ -9646,6 +9626,9 @@ msgstr "Не могу да успоставим описник датотеке.
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s покушава да вам пошаље групу од %d датотека.\n"
 
+msgid "Write Error"
+msgstr "Грешка при писању"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Профил за Јаху Јапан"
 
@@ -9760,23 +9743,19 @@ msgstr "Глас"
 msgid "Webcams"
 msgstr "Камере"
 
+msgid "Connection problem"
+msgstr "Грешка при повезивању"
+
 msgid "Unable to fetch room list."
 msgstr "Не могу да добавим списак соба."
 
 msgid "User Rooms"
 msgstr "Корисничке собе"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Проблем при повезивању на YCHT сервер."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Веза са сервером је прекинута\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9904,33 +9883,22 @@ msgstr "Подручје"
 msgid "Exposure"
 msgstr "Излагање"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Не могу да направим утичницу:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Не могу да обрадим одговор са ХТТП мрежног посредника: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Грешка при повезивању посредника %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Приступ одбијен: посредник одбија тунел на порту %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Грешка при добијању %s"
 
-msgid "Could not resolve host name"
-msgstr "Не могу да добијем име домаћина"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Тражим %sovu пажњу..."
@@ -10017,9 +9985,6 @@ msgstr "Не узнемиравај"
 msgid "Extended away"
 msgstr "Продужено одсутан"
 
-msgid "Mobile"
-msgstr "Мобилни телефон"
-
 msgid "Listening to music"
 msgstr "Слушам музику"
 
@@ -10061,18 +10026,6 @@ msgstr "+++ %s се пробудио(ла)"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Грешка при читању %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Дошло је до грешке при обради вашег %s.  Није учитано, а старом фајлу је име "
-"промењено у %s~."
-
 msgid "Calculating..."
 msgstr "Рачунам..."
 
@@ -10193,6 +10146,18 @@ msgstr "Веза је одбијена."
 msgid "Address already in use."
 msgstr "Адреса је већ у употеби."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Грешка при читању %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Дошло је до грешке при обради вашег %s.  Није учитано, а старом фајлу је име "
+"промењено у %s~."
+
 msgid "Internet Messenger"
 msgstr "Интернет писмоноша"
 
@@ -10235,10 +10200,8 @@ msgstr "Обавештења о новопристиглој _е-пошти"
 msgid "Use this buddy _icon for this account:"
 msgstr "Користи ову _иконицу другара за налог:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s опције"
+msgid "_Advanced"
+msgstr "Н_апредно"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Користи Гномова подешавања мрежног посредника"
@@ -10273,9 +10236,6 @@ msgstr "Уколико погледате изблиза"
 msgid "you can see the butterflies mating"
 msgstr "можете видети како се лептири паре"
 
-msgid "Proxy Options"
-msgstr "Поставке проксија"
-
 msgid "Proxy _type:"
 msgstr "_Врста проксија:"
 
@@ -10303,8 +10263,9 @@ msgstr "_Основно"
 msgid "Create _this new account on the server"
 msgstr "_Направи овај налог на серверу"
 
-msgid "_Advanced"
-msgstr "Н_апредно"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Прокси"
 
 msgid "Enabled"
 msgstr "Омогућено"
@@ -10354,16 +10315,17 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Ажурирајте неопходна поља."
 
-msgid "Room _List"
-msgstr "_Списак соба"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Налог"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Унесите податке о ћаскању којем желите да се прикључите.\n"
 
-msgid "_Account:"
-msgstr "_Налог:"
+msgid "Room _List"
+msgstr "_Списак соба"
 
 msgid "_Block"
 msgstr "_Забрани"
@@ -10380,6 +10342,17 @@ msgstr "П_реузми податке"
 msgid "I_M"
 msgstr "_Порука"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "Додај _ћаскање"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Видео ћаскање"
+
 msgid "_Send File..."
 msgstr "По_шаљи датотеку..."
 
@@ -10389,9 +10362,14 @@ msgstr "Д_одај заседу другару..."
 msgid "View _Log"
 msgstr "Преглед дневни_ка"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Сакриј када нисам на мрежи"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Прикажи и ван мреже"
+
 msgid "_Alias..."
 msgstr "Н_адени име..."
 
@@ -10515,6 +10493,10 @@ msgstr "/Алати/_Заседа другару"
 msgid "/Tools/_Certificates"
 msgstr "/Алати/Серти_фикати"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Алати/_Смешци"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Алати/_Додаци"
 
@@ -10524,9 +10506,6 @@ msgstr "/Алати/_Поставке"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Алати/П_риватност"
 
-msgid "/Tools/Smile_y"
-msgstr "/Алати/_Смешци"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Алати/П_реноси датотека..."
 
@@ -10646,8 +10625,8 @@ msgstr "Ручно"
 msgid "By status"
 msgstr "По стању"
 
-msgid "By log size"
-msgstr "По величини дневника"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10663,6 +10642,9 @@ msgstr "Поново се повежи"
 msgid "Re-enable"
 msgstr "Поново омогући"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Добродошли назад!"
 
@@ -10751,6 +10733,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "_Надимак:"
 
+msgid "_Group:"
+msgstr "_Група:"
+
 msgid "Auto_join when account becomes online."
 msgstr "_Сам се прикључи када налог буде доступан."
 
@@ -10784,6 +10769,116 @@ msgstr "/Алати"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Другари/Поређај другаре"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Боја позадине"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Ова група је додата у вашу листу другара"
+
+#, fuzzy
+msgid "Layout"
+msgstr "лао"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Боја позадине"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Разгранај"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Изаберите боју позадине"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Скупи"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Изаберите боју позадине"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Стање"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "На вези"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Одсутан"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Неповезан"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Текст о расположењу"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Порука послата"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Измени податке о кориснику за %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Одреди име домаћина за које важи овај сертификат."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL сервери"
@@ -10801,14 +10896,6 @@ msgstr "Тренутно нисте пријављени на налог кој�
 msgid "Invite Buddy Into Chat Room"
 msgstr "Позови другара у причаоницу"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Унесите име корисника кога желите да позовете, а по жељи додајте и поруку у "
-"позивницу."
-
 msgid "_Buddy:"
 msgstr "_Другар:"
 
@@ -10837,7 +10924,8 @@ msgstr "Игнориши"
 msgid "Get Away Message"
 msgstr "Прибави поруку за одсуство"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Последње речи"
 
 msgid "Unable to save icon file to disk."
@@ -10883,6 +10971,22 @@ msgstr "/Разговор/_Сачувај као..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Разговор/О_чисти прозор разговора"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Разговор/Дода_тно"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Разговор/Дода_тно"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Разговор/Дода_тно"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Разговор/Погледај _дневник"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Разговор/По_шаљи датотеку..."
 
@@ -10955,6 +11059,18 @@ msgstr "/Разговор"
 msgid "/Conversation/View Log"
 msgstr "/Разговор/Прикажи дневник"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Разговор/Више"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Разговор/Прикажи дневник"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Разговор/Више"
+
 msgid "/Conversation/Send File..."
 msgstr "/Разговор/Пошаљи датотеку..."
 
@@ -11139,6 +11255,9 @@ msgstr ""
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "подршка"
 
@@ -11263,6 +11382,10 @@ msgstr "хинду"
 msgid "Hungarian"
 msgstr "мађарски"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "румунски"
+
 msgid "Indonesian"
 msgstr "индонезијски"
 
@@ -11278,6 +11401,10 @@ msgstr "грузијски"
 msgid "Ubuntu Georgian Translators"
 msgstr "грузијски Убунту преводиоци"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Остало"
+
 msgid "Kannada"
 msgstr "канадски"
 
@@ -11356,6 +11483,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "шведски"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "тамилски"
 
@@ -11694,7 +11824,8 @@ msgstr "Боја за исцртавање над-веза."
 msgid "Hyperlink visited color"
 msgstr "Боја посећене над-везе"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Боја за исцртавање над-веза након њихове посете."
 
 msgid "Hyperlink prelight color"
@@ -11730,14 +11861,23 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Боја за испис имена поруке коју шаљете."
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Боја за испис имена поруке коју шаљете."
+
 msgid "Typing notification color"
 msgstr "Боја обавештења о куцању"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Омогући обавештење о куцању"
 
 msgid "Typing notification font"
 msgstr "Фонт обавештења о куцању"
@@ -11748,15 +11888,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Омогући обавештење о куцању"
 
-msgid "_Copy Email Address"
-msgstr "_Копирај адресу е-поште"
-
-msgid "_Open Link in Browser"
-msgstr "_Отвори везу у прегледнику"
-
-msgid "_Copy Link Location"
-msgstr "_Копирај адресу везе"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11798,11 +11929,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Сачувај слику"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Сачувај слику..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Додај произвољне смешке..."
 
@@ -11889,9 +12018,6 @@ msgstr "Умањи слова"
 msgid "Font Face"
 msgstr "Изглед фонта"
 
-msgid "Background Color"
-msgstr "Боја позадине"
-
 msgid "Foreground Color"
 msgstr "Боја текста"
 
@@ -11999,13 +12125,14 @@ msgstr "_Разгледај фасциклу са дневицима"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Покушајте „%s -h“ за више података.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12029,13 +12156,14 @@ msgstr ""
 "  --display=ЕКРАН     приказује се на задати X-ов екран\n"
 "  -v, --version       исписује тренутно издање и излази из програма\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12094,11 +12222,23 @@ msgstr "Пиџин"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Излазим јер је већ покренут још један libpurple клијент.\n"
 
-msgid "Open All Messages"
-msgstr "Отвори све поруке"
+msgid "/_Media"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Имате е-пошту!</span>"
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Рачунам..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12131,6 +12271,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Изабрана је „ручна“ наредба за веб читач, а наредба није постављена."
 
+#, fuzzy
+msgid "No message"
+msgstr "Непозната грешка"
+
+msgid "Open All Messages"
+msgstr "Отвори све поруке"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Имате е-пошту!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Нова заседа другару"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Имате е-пошту!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Следећи додаци ће бити искључени."
 
@@ -12179,10 +12340,17 @@ msgstr "<b>Детаљи о додатку</b>"
 msgid "Select a file"
 msgstr "Изаберите датотеку"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Уреди заседу другару"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Заседа на кога"
 
+msgid "_Account:"
+msgstr "_Налог:"
+
 msgid "_Buddy name:"
 msgstr "_Име другара:"
 
@@ -12249,7 +12417,60 @@ msgstr "По_нављање"
 msgid "Pounce Target"
 msgstr "Заседа на"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Почиње да куца"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Прави одмор при куцању"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Пријави се"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s се активирао(ла) (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Врати се са одсуства"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Престао да куца"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Одјави се"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Постаде неактиван"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "При одсуству"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Пошаљи поруку"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Непозната заседа. Молимо Вас да ово пријавите!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Скуп смешка не може да се распакује."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Скуп смешка не може да се распакује."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Скуп смешка не може да се распакује."
 
 msgid "Install Theme"
@@ -12271,6 +12492,12 @@ msgstr "Пречице на тастатури"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Затвори разговоре тастером Escape"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Списак другара"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Иконица на панелу"
 
@@ -12280,8 +12507,9 @@ msgstr "Прика_жи иконица на панелу:"
 msgid "On unread messages"
 msgstr "На непрочитане поруке"
 
-msgid "Conversation Window Hiding"
-msgstr "Скривање прозора за разговор"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Прозор разговора"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Сакриј нове разговоре:"
@@ -12289,6 +12517,9 @@ msgstr "_Сакриј нове разговоре:"
 msgid "When away"
 msgstr "При одсуству"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Ума_њи ноци прозор разговора"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Кратице"
@@ -12347,9 +12578,6 @@ msgstr "Користи глатко клизање"
 msgid "F_lash window when IMs are received"
 msgstr "_Засијај прозор када пристигне нова порука"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Ума_њи ноци прозор разговора"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12381,13 +12609,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Не могу да покренем програм за подешавање веб прегледника."
 
-msgid "ST_UN server:"
-msgstr "С_ТУН Сервер:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Сам о_дреди ИП адресу"
 
 msgid "Public _IP:"
@@ -12408,6 +12634,10 @@ msgstr "По_четни порт:"
 msgid "_End port:"
 msgstr "По_следњи порт:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Посреднички сервер &amp; Веб прегледник"
 
@@ -12596,12 +12826,12 @@ msgstr "Када сте одсутни или неактивни"
 msgid "Auto-away"
 msgstr "Аутоматско одуство"
 
-msgid "Change status when _idle"
-msgstr "Промени стање када сте не_активни"
-
 msgid "_Minutes before becoming idle:"
 msgstr "Постани неактиван након (минута):"
 
+msgid "Change status when _idle"
+msgstr "Промени стање када сте не_активни"
+
 msgid "Change _status to:"
 msgstr "Промени _стање у:"
 
@@ -12749,45 +12979,45 @@ msgstr "Са_чувај и примени"
 msgid "Status for %s"
 msgstr "Стање за %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 msgid "Custom Smiley"
 msgstr "Произвољни смешци"
 
-msgid "More Data needed"
-msgstr "Потребно је више података"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 msgid "Duplicate Shortcut"
 msgstr "Удвостручи пречицу"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-msgid "Please select an image for the smiley."
-msgstr "Изаберите слику за смешак."
-
 msgid "Edit Smiley"
 msgstr "Уреди смешак"
 
 msgid "Add Smiley"
 msgstr "Додај смешак"
 
-msgid "Smiley _Image"
-msgstr "_Иконица за смешак"
+#, fuzzy
+msgid "_Image:"
+msgstr "С_лику"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Пре_чица за смешак"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr ""
 
 msgid "Smiley"
 msgstr "Смешак"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Стање"
+
 msgid "Custom Smiley Manager"
 msgstr "Уређивање произвољних смешака"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Изабери другара"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Кликните за измену ваше иконице за овај налог."
 
@@ -12872,9 +13102,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Не могу да пошаљем извршивач"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Довукли сте покретач. Вероватно желите да пошаљете оно на шта он показује "
 "него покретача самог."
@@ -12910,6 +13141,16 @@ msgstr ""
 "Неуспело учитавање слике „%s“ из непознатог разлога, вероватно је оштећена "
 "датотека"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Отвори везу у:"
+
+msgid "_Copy Link Location"
+msgstr "_Копирај адресу везе"
+
+msgid "_Copy Email Address"
+msgstr "_Копирај адресу е-поште"
+
 msgid "Save File"
 msgstr "Сачувај датотеку"
 
@@ -13000,6 +13241,79 @@ msgstr "Додатак за предвиђање доступности конт
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Адреса сервера"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Сервер за разговоре"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Изаберите сервер за конференције који се упитује"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Мрежне услуге"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Пошаљи списак другара"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Постаде одсутан"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Директоријум за дневник"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Избор звука"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub сервис"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Опис"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Подаци откривања сервиса"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Веб прегледник:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Корисник не постоји."
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Сервер не користи ниједан од подржаних начина идентификовања"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Подаци откривања сервиса"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Овај додатак је користан за уклањање грешака Џабер сервера или програма"
+
 msgid "Buddy is idle"
 msgstr "Другар је неактиван"
 
@@ -13386,9 +13700,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Додатак музичких порука за сараднички састав."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Додатак за поруке музичким порукама дозвољава корисницима да истовремено "
 "раде на делу музике мењајући прост резултат у реалном времену."
@@ -13500,12 +13815,6 @@ msgstr ""
 "— Изврће сав приспели текст\n"
 "— Шаље поруку људима из вашег списка чим се они пријаве"
 
-msgid "Cursor Color"
-msgstr "Боја курсора"
-
-msgid "Secondary Cursor Color"
-msgstr "Секундарна боја курсора"
-
 msgid "Hyperlink Color"
 msgstr "Боја над-везе"
 
@@ -13515,6 +13824,10 @@ msgstr "Боја посећене над-везе"
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Боја обавештења о куцању"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView хоризонтални раздвојник"
 
@@ -13544,35 +13857,24 @@ msgstr "Фонт Гтк+ сучеља"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Пречице за текст"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Боја сучеља"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Омогући обавештење о куцању"
 
-msgid "Widget Sizes"
-msgstr "Величина елемента"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Контрола Пиџинове ГТК+ теме"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Затвори"
 
 msgid "Fonts"
 msgstr "Фонтови"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Алати gtkrc датотеке"
 
@@ -13657,7 +13959,7 @@ msgstr "Дугме за слање у прозору разговора."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13709,6 +14011,113 @@ msgstr "Замена текста"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Замењује текст у одлазећим порукама према корисничким правилима."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Непријављен"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Непријављен"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Прикључи се ћаскању"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Игнориши"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Гласније"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Опера"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Овлашћење је дато"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Грешка"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Подаци"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Прозор захтева"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "_Нивои упозорења"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Стање за %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Локализација причаонице"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Сачувај иконицу"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Контрола Пиџинове ГТК+ теме"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Контакт подаци"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Списак другара"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Списак другара"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Контрола Пиџинове ГТК+ теме"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Контрола Пиџинове ГТК+ теме"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13877,8 +14286,9 @@ msgstr "Пиџинове Виндоус опције"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Поставке својствене Пиџину за Виндоус."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Пружа опције специфичне Пиџину за Виндоус, као што је спуштање листе другара."
 
@@ -13920,6 +14330,482 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Овај додатак је користан за уклањање грешака Џабер сервера или програма"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Не могу да отворим утичницу"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Не могу да слушам утичницу"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Не могу да читам утичницу"
+
+#~ msgid "Connection failed."
+#~ msgstr "Повезивање пропало."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Сервер се искључио"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Не могу да начиним утичницу"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Не могу да се повежем са домаћином"
+
+#~ msgid "Read error"
+#~ msgstr "Грешка при читању"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не могу да успоставим везу са сервером:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Грешка при писању"
+
+#~ msgid "Last Activity"
+#~ msgstr "Последња активност"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Подаци откривања сервиса"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Ставке откривања сервиса"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Проширено адресирање одељка"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Вишекорисничко ћаскање"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Подаци о проширеном ћаскању са више корисника"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub сервис"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 протоци"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "ХХТМЛ — брзе поруке"
+
+#~ msgid "User Location"
+#~ msgstr "Корисникова локација"
+
+#~ msgid "User Avatar"
+#~ msgstr "Корисникова сличица"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Обавештења о стању ћаскања"
+
+#~ msgid "Software Version"
+#~ msgstr "Верзија програма"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Покретање протока"
+
+#~ msgid "User Mood"
+#~ msgstr "Расположење корисника"
+
+#~ msgid "User Activity"
+#~ msgstr "Активност корисника"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Способности"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Преговори о шифрованој сесији"
+
+#~ msgid "User Tune"
+#~ msgstr "Корисникова мелодија"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Адреса за контакт"
+
+#~ msgid "User Profile"
+#~ msgstr "Корисников профил"
+
+#~ msgid "Jingle"
+#~ msgstr "Џингл"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Џингл звук"
+
+#~ msgid "User Nickname"
+#~ msgstr "Надимак"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Џингл ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Џингл ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Изворни џингл UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Џингл видео"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Џингл DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Пријем порука"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Издавање јавног кључа"
+
+#~ msgid "User Chatting"
+#~ msgstr "Корисник ћаска"
+
+#~ msgid "User Browsing"
+#~ msgstr "Корисник разгледа"
+
+#~ msgid "User Gaming"
+#~ msgstr "Корисник се игра"
+
+#~ msgid "User Viewing"
+#~ msgstr "Корисник гледа"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Шифровање одељка"
+
+#~ msgid "Entity Time"
+#~ msgstr "Време важности"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Одложена достава"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Сараднички подаци објеката"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Складиштење и дељење датотека"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Поједностављени преговори и шифрованој сесији"
+
+#~ msgid "Hop Check"
+#~ msgstr "Провера скока"
+
+#~ msgid "Read Error"
+#~ msgstr "Грешка при читању"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Не могу да се повежем на сервер."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Бафер за читање је пун (2)"
+
+# Mozda "razume poruku"
+#~ msgid "Unparseable message"
+#~ msgstr "Порука се не може проследити"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Не могу да се повежем са домаћином: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Пријава није успела (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Веза је прекинута зато што сте се пријавили под овим именом са неког "
+#~ "другог места."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "SSL подршка је неопходна. Инсталирајте је."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Неисправна лозинка."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не могу да се повежем на БОС сервер:\n"
+#~ "%s"
+
+# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Веза се ускоро може прекинути. Погледајте %s за допуне."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Не могу да се повежем"
+
+#~ msgid "Invalid username."
+#~ msgstr "Неисправно корисничко име."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Не могу да дешифрујем одговор са сервера"
+
+#~ msgid "Connection lost"
+#~ msgstr "Веза прекинута"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Не могу да добијем домаћина"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Веза прекинута (пишем)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Понављање везе"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Грешка при читању из утичнице: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Не могу да се повежем на домаћина"
+
+#~ msgid "Could not write"
+#~ msgstr "Не могу да упишем"
+
+#~ msgid "Could not connect"
+#~ msgstr "Не могу да се повежем"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr " е могу да начиним утичницу за слушање"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Не могу да добијем име домаћина"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Неисправна лозинка"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не могу да успоставим везу са %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Јаху Јапан"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Јапанов пејџер сервер"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Јапанов сервер за пренос датотека"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Веза са сервером је прекинута\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Не могу да добијем име домаћина"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Сервер захтева TLS/SSL за пријаву. Није нађена подршка за TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Скривање прозора за разговор"
+
+#~ msgid "More Data needed"
+#~ msgstr "Потребно је више података"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Изаберите слику за смешак."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Који ИД да активирам?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Боја курсора"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Секундарна боја курсора"
+
+#~ msgid "Interface colors"
+#~ msgstr "Боја сучеља"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Величина елемента"
+
+#~ msgid "Invite message"
+#~ msgstr "Позивна порука"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Унесите име корисника кога желите да позовете,\n"
+#~ "а по жељи пошаљите и поруку уз позивницу."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Тражим %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Неуспешно повезивање на %s"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Пријава: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Не могу да пишем у датотеку %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Не могу да прочитам датотеку %s."
+
+# greska: plural
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Порука је предугачка, последњих %s бајтова је занемарено."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s није тренутно пријављен."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Није дозвољено упозорити %s."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Порука је одбачена, прекорачујете ограничења брзине сервера."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Није могуће ћаскање у %s."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Шаљете поруке пребрзо за %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Пропустили сте поруку од %s зато што је превелика."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Пропустили сте поруку од %s зато је послата превише брзо."
+
+#~ msgid "Failure."
+#~ msgstr "Неуспех."
+
+#~ msgid "Too many matches."
+#~ msgstr "Превише поклапања."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Потребно више обележја."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Услуге именика тренутно нису доступне."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Ограничена претрага према адреси е-поште."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Кључне речи занемарене."
+
+#~ msgid "No keywords."
+#~ msgstr "Нема кључних речи."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Корисник није уписан у именик."
+
+#~ msgid "Country not supported."
+#~ msgstr "Држава није подржана."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Непознат неуспех: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Није исправно корисничко име или лозинка."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Услуга је привремено недоступна."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Имате превише упозорења да бисте се могли пријавити."
+
+#~ 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 ""
+#~ "Успостављате и прекидате везу сувише често. Сачекајте десет минута и "
+#~ "покушајте поново. Ако наставите са покушајима, мораћете сачекати чак и "
+#~ "дуже."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Дошло је до непознате грешке при пријави: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Догодила се непозната грешка %d. Подаци: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Неисправан назив групе"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Веза прекинута"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Чекам за одговор..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "ТОЦ је прекинуо застој. Сада поново можете слати поруке."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Лозинка успешно измењена"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Прибави податке из именика"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Постави податке у именик"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Не могу да отворим %s за упис!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Неуспешан пренос датотеке; друга страна је вероватно отказала."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Не могу да успоставим везу за пренос."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Не могу да упишем заглавље датотеке. Датотека се неће пренети."
+
+#~ msgid "Save As..."
+#~ msgstr "Сачувај као..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s захтева од %s да прими %d датотеку: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s захтева од %s да прими %d датотеке: %s (%.2f %s)%s%s"
+#~ msgstr[2] "%s захтева од %s да прими %d датотека: %s (%.2f %s)%s%s"
+#~ msgstr[3] "%s захтева од %s да прими %d датотеку: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s захтева од Вас да пошаљете датотеку"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Додатак за ТОЦ протокол"
+
+#~ msgid "%s Options"
+#~ msgstr "%s опције"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Поставке проксија"
+
+#~ msgid "By log size"
+#~ msgstr "По величини дневника"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Отвори везу у прегледнику"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "С_ТУН Сервер:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "_Иконица за смешак"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Пре_чица за смешак"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Не могу да прибавим MSN адресар"
 
@@ -14106,13 +14992,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Лозинке преко %d карактера (ваша је %d) нису подржане у Мом свемиру."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Идите на http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username и одаберите корисничко име како би покушали поново."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Не могу да се повежем на SSL сервер."
 
@@ -14170,9 +15049,6 @@ msgstr ""
 #~ msgid "Please enter external group ID"
 #~ msgstr "Унесите идентификацију спољне групе"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Ова група је додата у вашу листу другара"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Молим да се придружим"
 
@@ -14200,9 +15076,6 @@ msgstr ""
 #~ msgid "You have successfully modified Qun information"
 #~ msgstr "Успешно сте изменили Qun податке"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Грешка у захтеву токена за пријаву"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Не могу да се повежем, провери дневник грешака"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index e28c401174..bd9441864b 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-22 16:17-0500\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-09-09 11:54+0100\n"
 "Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
@@ -603,19 +603,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Pošalji za"
 
-msgid "Invite message"
-msgstr "Pozivna poruka"
-
-msgid "Invite"
-msgstr "Pozovi"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Unesite ime korisnika koga želite da pozovete,\n"
-"a po želji pošaljite i poruku uz pozivnicu."
-
 msgid "Conversation"
 msgstr "Razgovor"
 
@@ -869,6 +856,41 @@ msgstr "Svi razgovori"
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Računam..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Prihvati"
+
+msgid "Reject"
+msgstr "Odbaci"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Napustili ste pričaonicu%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "E-pošte"
 
@@ -905,6 +927,9 @@ msgstr "Nastavi"
 msgid "IM"
 msgstr "Poruka"
 
+msgid "Invite"
+msgstr "Pozovi"
+
 msgid "(none)"
 msgstr "(bez imena)"
 
@@ -1106,7 +1131,6 @@ msgstr "%s je odišao(la) na odsustvo. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s želi da Vam pošalje poruku. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Nepoznata zaseda. Molimo Vas da ovo prijavite!"
 
@@ -1512,6 +1536,28 @@ msgstr "GntPoslednjeBeleške"
 msgid "Lastlog plugin."
 msgstr "Dodatak za dnevnik."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL melodije"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "nalozi"
 
@@ -1612,13 +1658,6 @@ msgstr "Prihvati sertifikat za %s?"
 msgid "SSL Certificate Verification"
 msgstr "Provera SSL sertifikata"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Prihvati"
-
-msgid "Reject"
-msgstr "Odbaci"
-
 msgid "_View Certificate..."
 msgstr "_Pregledaj sertifikate..."
 
@@ -1719,6 +1758,8 @@ msgstr "+++ %s se prijavio(la)"
 msgid "+++ %s signed off"
 msgstr "+++ %s se odjavio(la)"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
@@ -1765,6 +1806,18 @@ msgstr "%s je napustio(la) pričaonicu."
 msgid "%s left the room (%s)."
 msgstr "%s je napustio(la) pričaonicu (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Pozovi na konferenciju"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Unesite ime korisnika koga želite da pozovete, a po želji dodajte i poruku u "
+"pozivnicu."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Ne mogu da dobijem vezu: %s"
@@ -2100,6 +2153,10 @@ msgstr "<font color=\"red\"><b>Ne mogu da čitam datoteku: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <SAMO-ODGOVOR>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Greška pri uspostavljanju veze"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Koristite %s, ali ovaj dodatak zahteva %s."
@@ -2496,9 +2553,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Prikaži i beleške o ostalim programima pri pregledu dnevnika."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2553,8 +2611,9 @@ msgstr "Emulator poruka van mreže"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Sačuvaj poruke poslate korisniku van mreže kao zasedu."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Ostatak poruke će biti sačuvan kao zaseda. Možete urediti/ukloniti zasedu iz "
@@ -2586,6 +2645,32 @@ msgstr "Sačuvaj poruke van mreže u zasedu"
 msgid "Do not ask. Always save in pounce."
 msgstr "Ne pitaj me. Uvek sačuvaj u zasedu."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Unesite lozinku"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2779,11 +2864,12 @@ msgstr ""
 "instalirajte ActiveTCL sa http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Ne mogu da pratim dolazeća povezivanja na brze poruke\n"
 
 msgid ""
@@ -2836,14 +2922,21 @@ msgstr "%s je zatvorio razgovor."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Ne mogu da pošaljem poruku. Razgovor ne može da otpočne."
 
-msgid "Cannot open socket"
-msgstr "Ne mogu da otvorim utičnicu"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Ne mogu da napravim utičnicu:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Ne mogu da vežem utičnicu na port"
 
-msgid "Could not listen on socket"
-msgstr "Ne mogu da slušam utičnicu"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Ne mogu da napravim utičnicu:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Greška pri sporazumevanju sa lokalnim mDNSResponder-om."
@@ -2892,13 +2985,16 @@ msgstr "Sačuvaj spisak drugara..."
 msgid "Load buddylist from file..."
 msgstr "Učitaj spisak drugara iz datoteke..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Popuni polja za registraciju."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Lozinke nisu iste."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Ne mogu da registrujem novi nalog. Desila se greška.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2910,14 +3006,14 @@ msgstr "Registracija završena uspešno!"
 msgid "Password"
 msgstr "Lozinka"
 
-msgid "Password (retype)"
-msgstr "Lozinka (ponovo otkucajte)"
+msgid "Password (again)"
+msgstr "Lozinka (ponovite)"
 
-msgid "Enter current token"
-msgstr "Unesite trenutni token"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Trenutni token"
+msgid "Captcha"
+msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registruj novi Gadu-Gadu nalog"
@@ -2970,6 +3066,15 @@ msgstr "Lozinka je uspešno izmenjena!"
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
+msgid "Password (retype)"
+msgstr "Lozinka (ponovo otkucajte)"
+
+msgid "Enter current token"
+msgstr "Unesite trenutni token"
+
+msgid "Current token"
+msgstr "Trenutni token"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Molim vas unesite tekuću lozinku i novu lozinku: "
 
@@ -2983,6 +3088,7 @@ msgstr "Izaberite ćaskanje za drugara: %s"
 msgid "Add to chat..."
 msgstr "Dodaj u ćaskanje..."
 
+#. Global
 msgid "Available"
 msgstr "Dostupan"
 
@@ -3016,7 +3122,7 @@ msgstr "Nema nađenih korisnika"
 msgid "There are no users matching your search criteria."
 msgstr "Nema nađenih korisnika po vašem kriterijumu pretrage."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Ne mogu da čitam utičnicu"
 
 msgid "Buddy list downloaded"
@@ -3031,8 +3137,14 @@ msgstr "Lista drugova poslata"
 msgid "Your buddy list was stored on the server."
 msgstr "Vaša lista drugova je poslana na server."
 
-msgid "Connection failed."
-msgstr "Povezivanje propalo."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Povezan"
+
+msgid "Connection failed"
+msgstr "Veza neuspešna"
 
 msgid "Add to chat"
 msgstr "Dodaj u ćaskanje"
@@ -3040,13 +3152,23 @@ msgstr "Dodaj u ćaskanje"
 msgid "Chat _name:"
 msgstr "_Ime ćaskanja:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Ne mogu da se povežem na server."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Uspostavljanje veze"
+
 msgid "Chat error"
 msgstr "Greška u ćaskanju"
 
 msgid "This chat name is already in use"
 msgstr "Ovo ime ćaskanja je već zauzeto"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Niste u vezi sa serverom."
 
 msgid "Find buddies..."
@@ -3088,6 +3210,10 @@ msgstr "Popularni poljski IM"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu korisnik"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Dobavljam server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nepoznata naredba: %s"
@@ -3102,7 +3228,8 @@ msgstr "Tema nije postavljena"
 msgid "File Transfer Failed"
 msgstr "Propao prenos datoteke"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Ne mogu da otvorim port za slušanje."
 
 msgid "Error displaying MOTD"
@@ -3118,8 +3245,18 @@ msgstr "Nema poruke dana za ovu vezu."
 msgid "MOTD for %s"
 msgstr "Poruka dana za %s"
 
-msgid "Server has disconnected"
-msgstr "Server se isključio"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Veza sa serverom je prekinuta:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Pogledajte poruku dana"
@@ -3130,25 +3267,24 @@ msgstr "_Kanal:"
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nadimci ne mogu sadržati beline"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Uspostavljanje veze"
-
 msgid "SSL support unavailable"
 msgstr "SSL podrška je nedostupna"
 
-msgid "Couldn't create socket"
-msgstr "Ne mogu da načinim utičnicu"
+msgid "Unable to connect"
+msgstr "Nemoguće povezivanje"
 
-msgid "Couldn't connect to host"
-msgstr "Ne mogu da se povežem sa domaćinom"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Ne mogu da se povežem na %s"
 
-msgid "Read error"
-msgstr "Greška pri čitanju"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server je prekinuo vezu"
 
 msgid "Users"
 msgstr "Korisnici"
@@ -3330,6 +3466,17 @@ msgstr ""
 "Izabrali ste ime naloga koje je server odbio. Verovatno sadrži nedozvoljene "
 "znake."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Ovo ime ćaskanja je već zauzeto"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Nadimak"
+
 msgid "Cannot change nick"
 msgstr "Ne mogu da promenim nadimak"
 
@@ -3566,10 +3713,12 @@ msgstr ""
 msgid "execute"
 msgstr "izvrši"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server zahteva TLS/SSL za prijavu. Nije nađena podrška za TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Zahtevate šifrovanu vezu, ali nije nađena podrška za TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3588,18 +3737,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Identifikacija običnim tekstom"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Neuspešna identifikacija"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Neispravan odgovor servera."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Server ne koristi nijedan od podržanih načina identifikovanja"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Zahtevate šifrovanje, ali ono nije dostupno na ovom serveru."
+
 msgid "Invalid challenge from server"
 msgstr "Neispravan izazov servera"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL greška"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Nije naveden razlog"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Nepodržano izdanje"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Ne mogu da uspostavim vezu sa serverom:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Ne mogu da uspostavim vezu sa serverom:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Ne mogu da uspostavim vezu."
+
 msgid "Full Name"
 msgstr "Puno ime"
 
@@ -3667,158 +3852,9 @@ msgstr "Program"
 msgid "Operating System"
 msgstr "Operativni sistem"
 
-msgid "Last Activity"
-msgstr "Poslednja aktivnost"
-
-msgid "Service Discovery Info"
-msgstr "Podaci otkrivanja servisa"
-
-msgid "Service Discovery Items"
-msgstr "Stavke otkrivanja servisa"
-
-msgid "Extended Stanza Addressing"
-msgstr "Prošireno adresiranje odeljka"
-
-msgid "Multi-User Chat"
-msgstr "Višekorisničko ćaskanje"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Podaci o proširenom ćaskanju sa više korisnika"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr "PubSub servis"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 protoci"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "HHTML — brze poruke"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Korisnikova lokacija"
-
-msgid "User Avatar"
-msgstr "Korisnikova sličica"
-
-msgid "Chat State Notifications"
-msgstr "Obaveštenja o stanju ćaskanja"
-
-msgid "Software Version"
-msgstr "Verzija programa"
-
-msgid "Stream Initiation"
-msgstr "Pokretanje protoka"
-
-msgid "File Transfer"
-msgstr "Prenosi datoteka"
-
-msgid "User Mood"
-msgstr "Raspoloženje korisnika"
-
-msgid "User Activity"
-msgstr "Aktivnost korisnika"
-
-msgid "Entity Capabilities"
-msgstr "Sposobnosti"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Pregovori o šifrovanoj sesiji"
-
-msgid "User Tune"
-msgstr "Korisnikova melodija"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr "Adresa za kontakt"
-
-msgid "User Profile"
-msgstr "Korisnikov profil"
-
-msgid "Jingle"
-msgstr "Džingl"
-
-msgid "Jingle Audio"
-msgstr "Džingl zvuk"
-
-msgid "User Nickname"
-msgstr "Nadimak"
-
-msgid "Jingle ICE UDP"
-msgstr "Džingl ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Džingl ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Izvorni džingl UDP"
-
-msgid "Jingle Video"
-msgstr "Džingl video"
-
-msgid "Jingle DTMF"
-msgstr "Džingl DTMF"
-
-msgid "Message Receipts"
-msgstr "Prijem poruka"
-
-msgid "Public Key Publishing"
-msgstr "Izdavanje javnog ključa"
-
-msgid "User Chatting"
-msgstr "Korisnik ćaska"
-
-msgid "User Browsing"
-msgstr "Korisnik razgleda"
-
-msgid "User Gaming"
-msgstr "Korisnik se igra"
-
-msgid "User Viewing"
-msgstr "Korisnik gleda"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Šifrovanje odeljka"
-
-msgid "Entity Time"
-msgstr "Vreme važnosti"
-
-msgid "Delayed Delivery"
-msgstr "Odložena dostava"
-
-msgid "Collaborative Data Objects"
-msgstr "Saradnički podaci objekata"
-
-msgid "File Repository and Sharing"
-msgstr "Skladištenje i deljenje datoteka"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Pojednostavljeni pregovori i šifrovanoj sesiji"
-
-msgid "Hop Check"
-msgstr "Provera skoka"
-
-msgid "Capabilities"
-msgstr "Mogućnosti"
+#, fuzzy
+msgid "Local Time"
+msgstr "Lokalna datoteka:"
 
 msgid "Priority"
 msgstr "Prioritet"
@@ -3826,6 +3862,14 @@ msgstr "Prioritet"
 msgid "Resource"
 msgstr "Resurs"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Prijavljen"
+
 # Ovde je nekada stajalo 'ime oca'. Kod nas je srednje ime uglavnom ime
 # oca, ali to definitivno ne mora da bude slučaj na drugim mestima. Npr
 # u Holandiji je vrlo uobičajeno da ljudi imaju po 4-5 imena; uvek se zna
@@ -3998,28 +4042,28 @@ msgstr "Izaberite server za konferencije koji se upituje"
 msgid "Find Rooms"
 msgstr "Pronađi sobe"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Zahtevate šifrovanje, ali ono nije dostupno na ovom serveru."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Nadimak:"
 
-msgid "Write error"
-msgstr "Greška pri pisanju"
+#, fuzzy
+msgid "No users found"
+msgstr "Nema nađenih korisnika"
 
-msgid "Ping timeout"
-msgstr ""
+# „radno mesto‟ u organizaciji?
+# Uloga je zvanični termin i u UML-u, prim. prev.
+#, fuzzy
+msgid "Roles:"
+msgstr "Uloga"
 
-msgid "Read Error"
-msgstr "Greška pri čitanju"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Vreme veze ne isteklo"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Ne mogu da uspostavim vezu sa serverom:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Ne mogu načiniti utičnicu"
 
 msgid "Invalid XMPP ID"
 msgstr "Neispravna Džaber adresa"
@@ -4027,6 +4071,10 @@ msgstr "Neispravna Džaber adresa"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Neispravna Džaber adresa. Morate uneti domen."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Ne mogu da se povežem na server."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspešna"
@@ -4051,9 +4099,6 @@ msgstr "Odjava registracije uspela"
 msgid "Unregistration Failed"
 msgstr "Odjava registracije neuspela"
 
-msgid "Already Registered"
-msgstr "Već je registrovan"
-
 msgid "State"
 msgstr "Oblast"
 
@@ -4066,6 +4111,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Već je registrovan"
+
 msgid "Unregister"
 msgstr "Odjavi registraciju"
 
@@ -4093,6 +4141,10 @@ msgstr "Registruj novi nalog na %s"
 msgid "Change Registration"
 msgstr "Izmeni registraciju"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Ne mogu da se povežem na server."
+
 msgid "Error unregistering account"
 msgstr "Greška pri odjavi registracije"
 
@@ -4117,6 +4169,12 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Neovlašćen"
 
+msgid "Mood"
+msgstr "Raspoloženje"
+
+msgid "Now Listening"
+msgstr "Sada sluša"
+
 msgid "Both"
 msgstr "Oba"
 
@@ -4138,12 +4196,6 @@ msgstr "Ništa"
 msgid "Subscription"
 msgstr "Pretplata"
 
-msgid "Mood"
-msgstr "Raspoloženje"
-
-msgid "Now Listening"
-msgstr "Sada sluša"
-
 msgid "Mood Text"
 msgstr "Tekst o raspoloženju"
 
@@ -4186,9 +4238,6 @@ msgstr "Vaša lozinka je izmenjena."
 msgid "Error changing password"
 msgstr "Greška pri izmeni lozinke"
 
-msgid "Password (again)"
-msgstr "Lozinka (ponovite)"
-
 msgid "Change XMPP Password"
 msgstr "Promeni Džaber lozinku"
 
@@ -4382,18 +4431,24 @@ msgstr "Ne mogu da odstranim korisnika %s"
 msgid "Unable to ping user %s"
 msgstr "Ne mogu da pingujem korisnika %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Ne mogu da trubim jer nije poznato ništa o korisniku %s."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Ne mogu da trubim jer je korisnik %s možda van mreže."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Ne mogu da trubim jer korisnik %s to ne podržava."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Trubim %su..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4403,9 +4458,34 @@ msgstr "Trubi"
 msgid "%s has buzzed you!"
 msgstr "%s vam trubi!"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Trubim %su..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Ne mogu da pošaljem datoteku za %s, pogrešan JIB."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Slanje datoteke korisniku %s nije uspelo jer je van mreže"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "Slanje datoteke korisniku %s nije uspelo jer nije prijavljen"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Greška pri registraciji"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Izaberite izvor od %s kome želite da pošaljete datoteku"
+
+msgid "Select a Resource"
+msgstr "Izaberite izvor"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Pokreni _ćaskanje"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Podesi pričaonicu."
@@ -4425,16 +4505,18 @@ msgstr "topic [nova tema]:  Pregledaj ili promeni temu."
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;korisnik&gt; [razlog]:  Brani pristup korisniku u pričaonici."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;korisnik&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Postavlja povezanost korisnika sa pričaonicom."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "pravilo &lt;korisnik&gt; &lt;owner|admin|member|outcast|none&gt;: Postavlja "
 "korisničko pravilo u pričaonici."
@@ -4499,6 +4581,9 @@ msgstr "Povezivanje sa serverom"
 msgid "File transfer proxies"
 msgstr "Posrednici za prenos datoteka"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4537,6 +4622,14 @@ msgstr "Greška pri XML obradi"
 msgid "Unknown Error in presence"
 msgstr "Nepoznata greška u prisustvu"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Greška pri uključenju u ćaskanje: %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Greška pri ćaskanju: %s"
+
 msgid "Create New Room"
 msgstr "Napravi novu sobu"
 
@@ -4553,13 +4646,32 @@ msgstr "P_ostavke za sobu"
 msgid "_Accept Defaults"
 msgstr "P_rihvati podrazumevano"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Greška pri uključenju u ćaskanje: %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nije naveden razlog"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Greška pri ćaskanju: %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Izbacio Vas je %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Izbačeni od strane %s: (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Došlo je do greške pri otvaranju datoteke."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Propao prenos datoteke"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Ne mogu da otvorim datoteku „%s“: %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4586,9 +4698,6 @@ msgstr "Slanje datoteke korisniku %s nije uspelo jer nije prijavljen"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Izaberite izvor od %s kome želite da pošaljete datoteku"
 
-msgid "Select a Resource"
-msgstr "Izaberite izvor"
-
 msgid "Edit User Mood"
 msgstr "Uredi korisničko raspoloženje"
 
@@ -4886,6 +4995,12 @@ msgstr "Ostali kontakti"
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s Vam je poslao(la) poziv za razgovor preko kamere, koji još uvek nije "
+"podržan."
+
 msgid "Nudge"
 msgstr "Potapšaj"
 
@@ -5039,9 +5154,6 @@ msgstr ""
 "Za povezivanje sa MSN potrebna je podrška za SSL. Instalirajte podržanu SSL "
 "biblioteku."
 
-msgid "Failed to connect to server."
-msgstr "Ne mogu da se povežem na server."
-
 msgid "Error retrieving profile"
 msgstr "Greška pri čitanju sa servera"
 
@@ -5231,63 +5343,26 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s nije dozvoljena grupa."
-
-msgid "Unknown error."
-msgstr "Nepoznata greška."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vas gurka!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Nepoznata greška (%d)"
 
 msgid "Unable to add user"
 msgstr "Ne mogu da zabranim korisnika"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Sledeći korisnici nedostaju u vašem adresaru"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Ne mogu da dodam korisnika na %s (%s)"
-
 #, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Ne mogu da odstranim korisnika na %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Ne mogu da dozvolim korisnika na %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s se ne može dodati pošto vam je spisak drugara popunjen."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nije ispravan nalog pasoša."
+msgid "Unknown error (%d)"
+msgstr "Nepoznata greška (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Usluge trenutno nisu dostupne."
+msgid "The following users are missing from your addressbook"
+msgstr "Sledeći korisnici nedostaju u vašem adresaru"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Poruka za mobilni nije poslata jer je predugačka."
 
-msgid "Unable to rename group"
-msgstr "Ne mogu da preimenujem grupu"
-
-msgid "Unable to delete group"
-msgstr "Ne mogu da uklonim grupu"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5340,9 +5415,6 @@ msgstr "Poruka nije poslata zato što je došlo do nepoznate greške u kodiranju
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Poruka nije poslata zato što je došlo do nepoznate greške:"
 
-msgid "Unable to connect"
-msgstr "Nemoguće povezivanje"
-
 msgid "Writing error"
 msgstr "Greška pri pisanju"
 
@@ -5357,20 +5429,24 @@ msgstr ""
 "Greška pri povezivanju sa servera %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Naš protokol nije podržan na serveru."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Greška pri obradi HTTP-a."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Prijavili ste se sa nekog drugog mesta."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN serveri su privremeno nedostupni. Sačekajte malo pa pokušajte ponovo."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Veza Vam je prekinuta. Privremeno se gase MSN serveri."
 
 #, c-format
@@ -5401,6 +5477,18 @@ msgstr "Šaljem kolačić"
 msgid "Retrieving buddy list"
 msgstr "Preuzimam spisak drugara"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s Vam je poslao(la) poziv za razgovor preko kamere, koji još uvek nije "
+"podržan."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s Vam je poslao(la) poziv za razgovor preko kamere, koji još uvek nije "
+"podržan."
+
 msgid "Away From Computer"
 msgstr "Odsutan od računara"
 
@@ -5439,14 +5527,6 @@ msgstr "Poruka se ne može poslati zbog greške sa prebacivačem:"
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Poruka možda nije poslata zato što je došlo do nepoznate greške:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s vas je dodao u svoj spisak drugara."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s vas je uklonio sa njegove ili njene liste drugara."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Da obrišem drugara iz adresara?"
 
@@ -5476,6 +5556,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Dodatak za MSN protokol"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nije dozvoljena grupa."
+
+msgid "Unknown error."
+msgstr "Nepoznata greška."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Ne mogu da dodam korisnika na %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Ne mogu da odstranim korisnika na %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Ne mogu da dozvolim korisnika na %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s se ne može dodati pošto vam je spisak drugara popunjen."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nije ispravan nalog pasoša."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Usluge trenutno nisu dostupne."
+
+msgid "Unable to rename group"
+msgstr "Ne mogu da preimenujem grupu"
+
+msgid "Unable to delete group"
+msgstr "Ne mogu da uklonim grupu"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s vas je dodao u svoj spisak drugara."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s vas je uklonio sa njegove ili njene liste drugara."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Korisnik %s ne postoji"
 
@@ -5505,6 +5633,8 @@ msgid "Lost connection with server"
 msgstr "Veza sa serverom je prekinuta"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nova e-pošta"
 
@@ -5549,41 +5679,26 @@ msgstr[3] ""
 msgid "Add contacts from server"
 msgstr "Dodaj kontakt sa servera"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Povezan"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Greška u protokolu, kod %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr "Neispravno korisničko ime ili lozinka"
+
 msgid "MySpaceIM Error"
 msgstr "Greška u Mom svemiru"
 
 msgid "Invalid input condition"
 msgstr "Pogrešan ulazni uslov"
 
-msgid "Read buffer full (2)"
-msgstr "Bafer za čitanje je pun (2)"
-
-# Mozda "razume poruku"
-msgid "Unparseable message"
-msgstr "Poruka se ne može proslediti"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Ne mogu da se povežem sa domaćinom: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Neuspešno dodavanje drugara razgovoru"
 
@@ -5667,6 +5782,15 @@ msgstr "Ukupno drugova"
 msgid "Client Version"
 msgstr "Verzija programa"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Idite na http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username i odaberite korisničko ime kako bi pokušali ponovo."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Korisničko ime je dostupno"
 
@@ -5883,9 +6007,6 @@ msgstr "Ne možete dodati sami sebe"
 msgid "Master archive is misconfigured"
 msgstr "Glavna arhiva nije dobro podešena"
 
-msgid "Incorrect username or password"
-msgstr "Neispravno korisničko ime ili lozinka"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Ne mogu da prepoznam domaćina za uneseno korisničko ime"
 
@@ -5926,9 +6047,9 @@ msgstr "Korisnik ili nije na vezi ili imate zabranu"
 msgid "Unknown error: 0x%X"
 msgstr "Nepoznata greška: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Prijava nije uspela (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Ne mogu da pingujem korisnika %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6033,9 +6154,6 @@ msgstr "GroupWise konferencija %d"
 msgid "Authenticating..."
 msgstr "Identifikacija"
 
-msgid "Unable to connect to server."
-msgstr "Ne mogu da se povežem na server."
-
 msgid "Waiting for response..."
 msgstr "Čekam na odgovor..."
 
@@ -6059,26 +6177,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Da li želite da se priključite razgovoru?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Veza je prekinuta zato što ste se prijavili pod ovim imenom sa nekog drugog "
-"mesta."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "Izgleda da %s nije prisutan i da nije primio poslatu poruku."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Ne mogu da se povežem na seerver. Unesite adresu servera na kog želite da se "
 "povežem."
 
-msgid "Error. SSL support is not installed."
-msgstr "SSL podrška je neophodna. Instalirajte je."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ova konferencija je zatvorena. Poruke se više ne mogu slati."
 
@@ -6101,24 +6212,33 @@ msgstr "Adresa servera"
 msgid "Server port"
 msgstr "Port servera"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Dobijen je neočekivan odgovor HTTP servera."
+
+#. username connecting too frequently
+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 ""
+"Uspostavljali ste i prekidali vezu suviše često. Sačekajte deset minuta pa "
+"pokušajte ponovo. Ako nastavite da pokušavate, moraćete da sačekate još duže."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Greška u zahtevu tokena za prijavu"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Ne mogu da se povežem na pričaonicu"
 
 msgid "Invalid chat room name"
 msgstr "Neispravno ime pričaonice"
 
-msgid "Server closed the connection."
-msgstr "Server je prekinuo vezu"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Veza sa serverom je prekinuta:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Dobijeni su pogrešni podaci od servera."
 
 #. *< type
@@ -6166,7 +6286,8 @@ msgstr "Prekinuta je veza sa udaljenim korisnikom:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Primljeni pogrešni podaci od udaljenog korisnika."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Ne mogu da uspostavim vezu sa udaljenim korisnikom."
 
 msgid "Direct IM established"
@@ -6365,21 +6486,15 @@ msgstr "_Nivoi upozorenja"
 msgid "Buddy Comment"
 msgstr "Primedba za drugara:"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Ne mogu se povežem na server za potvrdu:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Ne mogu da se povežem na BOS server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Ne mogu da se povežem na server."
 
 msgid "Username sent"
 msgstr "Korisničko ime je poslato"
@@ -6391,52 +6506,61 @@ msgstr "Veza je uspostavljena, kolačić je poslat"
 msgid "Finalizing connection"
 msgstr "Dovršava povezivanje"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Prijava nije uspela: Ne mogu da se prijavim kao %s jer je to neispravno "
 "korisničko ime. Korisnička imena moraju biti ispravne adrese e-pošte, početi "
 "slovom i sadržati samo slova, brojeve i razmake, ili sadržati samo brojeve."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Neispravno korisničko ime."
+# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Veza se uskoro može prekinuti.  Pogledajte %s za dopune."
 
-msgid "Incorrect password."
-msgstr "Neispravna lozinka."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Neuspelo dobavljanje ispravnog heša za prijavu na AIM."
+
+msgid "Unable to get a valid login hash."
+msgstr "Ne mogu da primi ispravan heš za prijavu."
+
+msgid "Received authorization"
+msgstr "Primio ovlašćenje"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Korisnik ne postoji."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Vaš nalog je trenutno nedostupan."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Usluga AOL brzih poruka je privremeno nedostupna."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Program koji koristite je zastareo. Osvežite ga sa %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Uspostavljali ste i prekidali vezu suviše često. Sačekajte deset minuta pa "
 "pokušajte ponovo. Ako nastavite da pokušavate, moraćete da sačekate još duže."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Program koji koristite je zastareo. Osvežite ga sa %s"
-
-msgid "Could Not Connect"
-msgstr "Ne mogu da se povežem"
-
-msgid "Received authorization"
-msgstr "Primio ovlašćenje"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Uneti SecurID ključ je neispravan."
 
 msgid "Enter SecurID"
@@ -6451,22 +6575,6 @@ msgstr "Unesite šestocifreni broj sa digitalnog ekrana."
 msgid "_OK"
 msgstr "_U redu"
 
-# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Veza se uskoro može prekinuti.  Pogledajte %s za dopune."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Neuspelo dobavljanje ispravnog heša za prijavu na AIM."
-
-# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Veza se uskoro može prekinuti. Pogledajte %s za dopune."
-
-msgid "Unable to get a valid login hash."
-msgstr "Ne mogu da primi ispravan heš za prijavu."
-
 msgid "Password sent"
 msgstr "Lozinka poslata"
 
@@ -6612,7 +6720,7 @@ msgstr[1] "Propustili ste %hu poruke od %s iz nepoznatih razloga."
 msgstr[2] "Propustili ste %hu poruka od %s iz nepoznatih razloga."
 msgstr[3] "Propustili ste %hu poruku od %s iz nepoznatih razloga."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ne mogu da pošaljem poruku: %s"
@@ -6634,6 +6742,9 @@ msgstr "Na vezi od"
 msgid "Member Since"
 msgstr "Član od"
 
+msgid "Capabilities"
+msgstr "Mogućnosti"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -6828,9 +6939,9 @@ msgstr[3] ""
 msgid "Away message too long."
 msgstr "Poruka za odsustvo je predugačka."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6854,9 +6965,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Siročići"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Ne mogu da dodam drugara %s zato što imate previše drugara u spisku. "
@@ -6865,8 +6976,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(bez imena)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Ne mogu da dodam drugara %s iz nepoznatih razloga."
 
 # Is it "them"? Or "him/her"?
@@ -6996,6 +7107,7 @@ msgstr "_Traži"
 msgid "Set User Info (web)..."
 msgstr "Postavi podatke (preko veba)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Promeni lozinku (preko veba)"
 
@@ -7025,6 +7137,10 @@ msgstr "Pronađi drugara prema adresi e-pošte..."
 msgid "Search for Buddy by Information"
 msgstr "Pronađi drugara prema podacima"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Korisnik nije prijavljen"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7217,6 +7333,38 @@ msgstr "Ažuriraj"
 msgid "Could not change buddy information."
 msgstr "Ne mogu da promenim podatke o drugaru."
 
+msgid "Mobile"
+msgstr "Mobilni telefon"
+
+msgid "Note"
+msgstr "Beleška"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Sličica drugara"
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "Izmeni"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Izmeni"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Server je zauzet"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u zahteva proveru"
@@ -7525,6 +7673,13 @@ msgstr "<p><b>Autori zakrpa</b>:<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr ""
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<p><b>Originalni autor</b>:<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>I ostali ljudi u pozadini...</i><br>\n"
 
@@ -7550,6 +7705,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "O OpenQ"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Izmeni adresu"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7596,7 +7755,8 @@ msgstr "Interval održavanja veze (u sekundama)"
 msgid "Update interval (seconds)"
 msgstr "Interval ažuriranja (u sekundama)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Ne mogu da dešifrujem odgovor sa servera"
 
 #, c-format
@@ -7621,9 +7781,6 @@ msgstr "Potrebna je aktivacija"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Nepoznat odgovor pri prijavi (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Ne mogu da dešifrujem odgovor sa servera"
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -7657,30 +7814,18 @@ msgstr ""
 "Nepoznat odgovor pri projavi (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Ne mogu da se povežem."
-
 msgid "Socket error"
 msgstr "Greška u utičnici"
 
-msgid "Unable to read from socket"
-msgstr "Ne mogu da čitam utičnicu"
-
-msgid "Write Error"
-msgstr "Greška pri pisanju"
-
-msgid "Connection lost"
-msgstr "Veza prekinuta"
-
 msgid "Getting server"
 msgstr "Dobavljam server"
 
 msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
-msgstr "Ne mogu da dobijem domaćina"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Ne mogu da se povežem na server."
 
 msgid "Invalid server or port"
 msgstr "Neispravan server ili port"
@@ -7731,7 +7876,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun naredba"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Ne mogu da dešifrujem odgovor prilikom prijave"
 
 msgid "Unknown LOGIN CMD"
@@ -7751,9 +7897,6 @@ msgstr "Datoteka poslata"
 msgid "%d canceled the transfer of %s"
 msgstr "%d je prekinuo prenos datoteke %s"
 
-msgid "Connection closed (writing)"
-msgstr "Veza prekinuta (pišem)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Naziv grupe:</b> %s<br>"
@@ -7807,17 +7950,6 @@ msgstr "Sametime administrator je dao sledeću izjavu na serveru %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Izjava Sametime administratora"
 
-msgid "Connection reset"
-msgstr "Ponavljanje veze"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Greška pri čitanju iz utičnice: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Ne mogu da se povežem na domaćina"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Najava od %s"
@@ -7840,6 +7972,9 @@ msgstr "Zvučnici"
 msgid "Video Camera"
 msgstr "Video kamera"
 
+msgid "File Transfer"
+msgstr "Prenosi datoteka"
+
 msgid "Supports"
 msgstr "Podrška"
 
@@ -8557,9 +8692,6 @@ msgstr "Organizacija"
 msgid "Unit"
 msgstr "Jedinica"
 
-msgid "Note"
-msgstr "Beleška"
-
 msgid "Join Chat"
 msgstr "Priključi se ćaskanju"
 
@@ -8659,6 +8791,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Mrežne statistike"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping nije uspeo"
 
@@ -8724,7 +8859,8 @@ msgstr "Nepodržana vrsta javnog ključa"
 msgid "Disconnected by server"
 msgstr "Server Vas je isključio"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Greška pri povezivanju na SILC server"
 
 msgid "Key Exchange failed"
@@ -8736,26 +8872,26 @@ msgstr ""
 "Nastavljam prekinutu sesiju. Pritisnite Ponovno povezivanje da napravite "
 "novu vezu."
 
-msgid "Connection failed"
-msgstr "Veza neuspešna"
-
 msgid "Performing key exchange"
 msgstr "Razmena ključeva je u toku"
 
-msgid "Unable to create connection"
-msgstr "Ne mogu da uspostavim novu vezu."
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Ne mogu da učitam SILC par ključeva"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Povezivanje sa SILC serverom"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Ne mogu da učitam SILC par ključeva"
+
 msgid "Out of memory"
 msgstr "Nema dovoljno memorije"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Ne mogu da pokrenem SILC protokol"
 
 msgid "Error loading SILC key pair"
@@ -9048,7 +9184,8 @@ msgstr "Digitalno potpiši i proveri sve poruke"
 msgid "Creating SILC key pair..."
 msgstr "Izrada SILC para ključeva je u toku..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Ne mogu da napravim SILC par ključeva\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9144,6 +9281,9 @@ msgstr "Tabla"
 msgid "No server statistics available"
 msgstr "Nema dostupnih statistika"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Greška pri povezivanju na SILC server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Greška: izdanja se ne slažu, obnovite vašeg programa"
@@ -9184,30 +9324,27 @@ msgstr "Greška: kolačić je neispravan."
 msgid "Failure: Authentication failed"
 msgstr "Neuspešna identifikacija"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Ne može se pokrenuti SILC programska veza"
 
 msgid "John Noname"
 msgstr "Bezimeni balon"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Ne mogu da učitam SILC par ključeva: %s"
 
-msgid "Could not write"
-msgstr "Ne mogu da upišem"
-
-msgid "Could not connect"
-msgstr "Ne mogu da se povežem"
+msgid "Unable to create connection"
+msgstr "Ne mogu da uspostavim novu vezu."
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Nepoznat odgovor servera."
 
-msgid "Could not create listen socket"
-msgstr " e mogu da načinim utičnicu za slušanje"
-
-msgid "Could not resolve hostname"
-msgstr "Ne mogu da dobijem ime domaćina"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Ne mogu načiniti utičnicu"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP korisnička imena nesmeju sadržati razmak ili @ simbole"
@@ -9248,178 +9385,62 @@ msgstr "Ovlasti korisnika"
 msgid "Auth Domain"
 msgstr "Ovlasti domen"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Tražim %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Neuspešno povezivanje na %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Prijava: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Ne mogu da pišem u datoteku %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Ne mogu da pročitam datoteku %s."
-
-# greska: plural
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Poruka je predugačka, poslednjih %s bajtova je zanemareno."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s nije trenutno prijavljen."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Nije dozvoljeno upozoriti %s."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Poruka je odbačena, prekoračujete ograničenja brzine servera."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Nije moguće ćaskanje u %s."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Šaljete poruke prebrzo za %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Propustili ste poruku od %s zato što je prevelika."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Propustili ste poruku od %s zato je poslata previše brzo."
-
-#, c-format
-msgid "Failure."
-msgstr "Neuspeh."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Previše poklapanja."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Potrebno više obeležja."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Usluge imenika trenutno nisu dostupne."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Ograničena pretraga prema adresi e-pošte."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Ključne reči zanemarene."
-
-#, c-format
-msgid "No keywords."
-msgstr "Nema ključnih reči."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Korisnik nije upisan u imenik."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Država nije podržana."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Nepoznat neuspeh: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Nije ispravno korisničko ime ili lozinka."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Usluga je privremeno nedostupna."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Imate previše upozorenja da biste se mogli prijaviti."
-
-#, c-format
-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 ""
-"Uspostavljate i prekidate vezu suviše često. Sačekajte deset minuta i "
-"pokušajte ponovo. Ako nastavite sa pokušajima, moraćete sačekati čak i duže."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Došlo je do nepoznate greške pri prijavi: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Dogodila se nepoznata greška %d. Podaci: %s"
-
-msgid "Invalid Groupname"
-msgstr "Neispravan naziv grupe"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;soba&gt;:  Priključi se pričaonici na Jahu mreži"
 
-msgid "Connection Closed"
-msgstr "Veza prekinuta"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Ispisuje sobe na Jahu mreži"
 
-msgid "Waiting for reply..."
-msgstr "Čekam za odgovor..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "crtanje: zahtevaj od korisnika da počne sesiju crtanja"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC je prekinuo zastoj. Sada ponovo možete slati poruke."
+msgid "Yahoo ID..."
+msgstr "Jahu IB..."
 
-msgid "Password Change Successful"
-msgstr "Lozinka uspešno izmenjena"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Dodatak za Jahu protokol"
 
-msgid "_Group:"
-msgstr "_Grupa:"
+msgid "Pager server"
+msgstr "Pejdžer server"
 
-msgid "Get Dir Info"
-msgstr "Pribavi podatke iz imenika"
+msgid "Pager port"
+msgstr "Port za pejdžer"
 
-msgid "Set Dir Info"
-msgstr "Postavi podatke u imenik"
+msgid "File transfer server"
+msgstr "Server za prenos datoteka"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Ne mogu da otvorim %s za upis!"
+msgid "File transfer port"
+msgstr "Port za prenos datoteka"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Neuspešan prenos datoteke; druga strana je verovatno otkazala."
+msgid "Chat room locale"
+msgstr "Lokalizacija pričaonice"
 
-msgid "Could not connect for transfer."
-msgstr "Ne mogu da uspostavim vezu za prenos."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Zanemari pozive pričaonice i konferencije"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Ne mogu da upišem zaglavlje datoteke. Datoteka se neće preneti."
+msgid "Chat room list URL"
+msgstr "URL za spisak pričaonica"
 
-msgid "Save As..."
-msgstr "Sačuvaj kao..."
+msgid "Yahoo Chat server"
+msgstr "Jahu pričaonica"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s zahteva od %s da primi %d datoteku: %s (%.2f %s)%s%s"
-msgstr[1] "%s zahteva od %s da primi %d datoteke: %s (%.2f %s)%s%s"
-msgstr[2] "%s zahteva od %s da primi %d datoteka: %s (%.2f %s)%s%s"
-msgstr[3] "%s zahteva od %s da primi %d datoteku: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Jahu port za razgovor"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s zahteva od Vas da pošaljete datoteku"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Jahu IB..."
 
 #. *< type
 #. *< ui_requirement
@@ -9431,14 +9452,12 @@ msgstr "%s zahteva od Vas da pošaljete datoteku"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Dodatak za TOC protokol"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Dodatak za Jahu protokol"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
-"%s Vam je poslao(la) poziv za razgovor preko kamere, koji još uvek nije "
-"podržan."
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaša Jahu! poruka nije poslata."
@@ -9463,6 +9482,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Odbijeno dodavanje drugara"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Dobijeni su pogrešni podaci od servera."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "Nepoznat broj greške: %d. Prijava na Jahu možda može da to otkloni."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "Nepoznat broj greške: %d. Prijava na Jahu možda može da to otkloni."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Neispravno korisničko ime ili lozinka"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9493,37 +9536,32 @@ msgstr "Vaš nalog je zaključan, prijavite se na Jahu! veb stranicu."
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Nepoznat broj greške: %d. Prijava na Jahu možda može da to otkloni."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Ne mogu da dodam drugara %s u grupu %s u spisak servera za nalog %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Ne mogu da dodam drugara u spisak servera"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Razgovetan %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Dobijen je neočekivan odgovor HTTP servera."
 
-msgid "Connection problem"
-msgstr "Greška pri povezivanju"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Prekinuta je veza sa %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Ne mogu da uspostavim vezu sa %s:\n"
+"Ne mogu da uspostavim vezu sa serverom:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9571,8 +9609,8 @@ msgstr "Postavke prisustva"
 msgid "Start Doodling"
 msgstr "Počni crtati"
 
-msgid "Activate which ID?"
-msgstr "Koji ID da aktiviram?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Priključi ćaskanju sa kim?"
@@ -9586,73 +9624,15 @@ msgstr "Priključi korisnika ćaskanju..."
 msgid "Open Inbox"
 msgstr "Otvori sanduče"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;soba&gt;:  Priključi se pričaonici na Jahu mreži"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Ispisuje sobe na Jahu mreži"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "crtanje: zahtevaj od korisnika da počne sesiju crtanja"
-
-msgid "Yahoo ID..."
-msgstr "Jahu IB..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Dodatak za Jahu protokol"
-
-msgid "Yahoo Japan"
-msgstr "Jahu Japan"
-
-msgid "Pager server"
-msgstr "Pejdžer server"
-
-msgid "Japan Pager server"
-msgstr "Japanov pejdžer server"
-
-msgid "Pager port"
-msgstr "Port za pejdžer"
-
-msgid "File transfer server"
-msgstr "Server za prenos datoteka"
-
-msgid "Japan file transfer server"
-msgstr "Japanov server za prenos datoteka"
-
-msgid "File transfer port"
-msgstr "Port za prenos datoteka"
-
-msgid "Chat room locale"
-msgstr "Lokalizacija pričaonice"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Zanemari pozive pričaonice i konferencije"
-
-msgid "Chat room list URL"
-msgstr "URL za spisak pričaonica"
-
-msgid "Yahoo Chat server"
-msgstr "Jahu pričaonica"
-
-msgid "Yahoo Chat port"
-msgstr "Jahu port za razgovor"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Pošalji zahtev za žvrljanje"
 
+msgid "Unable to connect."
+msgstr "Ne mogu da se povežem."
+
 # Ovo je FD kao broj koji je ekvivalentan "file handle"-u, odnosno, to je jedinstvena oznaka otvorenog fajla za pristup; sta znaci "establish" u ovom kontekstu mi nije jasno
 msgid "Unable to establish file descriptor."
 msgstr "Ne mogu da uspostavim opisnik datoteke."
@@ -9661,6 +9641,9 @@ msgstr "Ne mogu da uspostavim opisnik datoteke."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s pokušava da vam pošalje grupu od %d datoteka.\n"
 
+msgid "Write Error"
+msgstr "Greška pri pisanju"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil za Jahu Japan"
 
@@ -9775,23 +9758,19 @@ msgstr "Glas"
 msgid "Webcams"
 msgstr "Kamere"
 
+msgid "Connection problem"
+msgstr "Greška pri povezivanju"
+
 msgid "Unable to fetch room list."
 msgstr "Ne mogu da dobavim spisak soba."
 
 msgid "User Rooms"
 msgstr "Korisničke sobe"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problem pri povezivanju na YCHT server."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Veza sa serverom je prekinuta\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9920,33 +9899,22 @@ msgstr "Područje"
 msgid "Exposure"
 msgstr "Izlaganje"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Ne mogu da napravim utičnicu:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Ne mogu da obradim odgovor sa HTTP mrežnog posrednika: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Greška pri povezivanju posrednika %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Pristup odbijen: posrednik odbija tunel na portu %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Greška pri dobijanju %s"
 
-msgid "Could not resolve host name"
-msgstr "Ne mogu da dobijem ime domaćina"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Tražim %sovu pažnju..."
@@ -10033,9 +10001,6 @@ msgstr "Ne uznemiravaj"
 msgid "Extended away"
 msgstr "Produženo odsutan"
 
-msgid "Mobile"
-msgstr "Mobilni telefon"
-
 msgid "Listening to music"
 msgstr "Slušam muziku"
 
@@ -10077,18 +10042,6 @@ msgstr "+++ %s se probudio(la)"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Greška pri čitanju %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Došlo je do greške pri obradi vašeg %s.  Nije učitano, a starom fajlu je ime "
-"promenjeno u %s~."
-
 msgid "Calculating..."
 msgstr "Računam..."
 
@@ -10209,6 +10162,18 @@ msgstr "Veza je odbijena."
 msgid "Address already in use."
 msgstr "Adresa je već u upotebi."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Greška pri čitanju %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Došlo je do greške pri obradi vašeg %s.  Nije učitano, a starom fajlu je ime "
+"promenjeno u %s~."
+
 msgid "Internet Messenger"
 msgstr "Internet pismonoša"
 
@@ -10251,10 +10216,8 @@ msgstr "Obaveštenja o novopristigloj _e-pošti"
 msgid "Use this buddy _icon for this account:"
 msgstr "Koristi ovu _ikonicu drugara za nalog:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s opcije"
+msgid "_Advanced"
+msgstr "N_apredno"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Koristi Gnomova podešavanja mrežnog posrednika"
@@ -10289,9 +10252,6 @@ msgstr "Ukoliko pogledate izbliza"
 msgid "you can see the butterflies mating"
 msgstr "možete videti kako se leptiri pare"
 
-msgid "Proxy Options"
-msgstr "Postavke proksija"
-
 msgid "Proxy _type:"
 msgstr "_Vrsta proksija:"
 
@@ -10319,8 +10279,9 @@ msgstr "_Osnovno"
 msgid "Create _this new account on the server"
 msgstr "_Napravi ovaj nalog na serveru"
 
-msgid "_Advanced"
-msgstr "N_apredno"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Proksi"
 
 msgid "Enabled"
 msgstr "Omogućeno"
@@ -10370,16 +10331,17 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Ažurirajte neophodna polja."
 
-msgid "Room _List"
-msgstr "_Spisak soba"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Nalog"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Unesite podatke o ćaskanju kojem želite da se priključite.\n"
 
-msgid "_Account:"
-msgstr "_Nalog:"
+msgid "Room _List"
+msgstr "_Spisak soba"
 
 msgid "_Block"
 msgstr "_Zabrani"
@@ -10396,6 +10358,17 @@ msgstr "P_reuzmi podatke"
 msgid "I_M"
 msgstr "_Poruka"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "Dodaj _ćaskanje"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Video ćaskanje"
+
 msgid "_Send File..."
 msgstr "Po_šalji datoteku..."
 
@@ -10405,9 +10378,14 @@ msgstr "D_odaj zasedu drugaru..."
 msgid "View _Log"
 msgstr "Pregled dnevni_ka"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Sakrij kada nisam na mreži"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Prikaži i van mreže"
+
 msgid "_Alias..."
 msgstr "N_adeni ime..."
 
@@ -10531,6 +10509,10 @@ msgstr "/Alati/_Zaseda drugaru"
 msgid "/Tools/_Certificates"
 msgstr "/Alati/Serti_fikati"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Alati/_Smešci"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Alati/_Dodaci"
 
@@ -10540,9 +10522,6 @@ msgstr "/Alati/_Postavke"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Alati/P_rivatnost"
 
-msgid "/Tools/Smile_y"
-msgstr "/Alati/_Smešci"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Alati/P_renosi datoteka..."
 
@@ -10662,8 +10641,8 @@ msgstr "Ručno"
 msgid "By status"
 msgstr "Po stanju"
 
-msgid "By log size"
-msgstr "Po veličini dnevnika"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10679,6 +10658,9 @@ msgstr "Ponovo se poveži"
 msgid "Re-enable"
 msgstr "Ponovo omogući"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Dobrodošli nazad!"
 
@@ -10767,6 +10749,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "_Nadimak:"
 
+msgid "_Group:"
+msgstr "_Grupa:"
+
 msgid "Auto_join when account becomes online."
 msgstr "_Sam se priključi kada nalog bude dostupan."
 
@@ -10800,6 +10785,116 @@ msgstr "/Alati"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Drugari/Poređaj drugare"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Boja pozadine"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Ova grupa je dodata u vašu listu drugara"
+
+#, fuzzy
+msgid "Layout"
+msgstr "lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Boja pozadine"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Razgranaj"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Izaberite boju pozadine"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Skupi"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Izaberite boju pozadine"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Stanje"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Na vezi"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Odsutan"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Nepovezan"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Tekst o raspoloženju"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Poruka poslata"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Izmeni podatke o korisniku za %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Odredi ime domaćina za koje važi ovaj sertifikat."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL serveri"
@@ -10817,14 +10912,6 @@ msgstr "Trenutno niste prijavljeni na nalog koji omogućava poziv tog drugara."
 msgid "Invite Buddy Into Chat Room"
 msgstr "Pozovi drugara u pričaonicu"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Unesite ime korisnika koga želite da pozovete, a po želji dodajte i poruku u "
-"pozivnicu."
-
 msgid "_Buddy:"
 msgstr "_Drugar:"
 
@@ -10853,7 +10940,8 @@ msgstr "Ignoriši"
 msgid "Get Away Message"
 msgstr "Pribavi poruku za odsustvo"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Poslednje reči"
 
 msgid "Unable to save icon file to disk."
@@ -10899,6 +10987,22 @@ msgstr "/Razgovor/_Sačuvaj kao..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Razgovor/O_čisti prozor razgovora"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Razgovor/Doda_tno"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Razgovor/Doda_tno"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Razgovor/Doda_tno"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Razgovor/Pogledaj _dnevnik"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Razgovor/Po_šalji datoteku..."
 
@@ -10971,6 +11075,18 @@ msgstr "/Razgovor"
 msgid "/Conversation/View Log"
 msgstr "/Razgovor/Prikaži dnevnik"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Razgovor/Više"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Razgovor/Prikaži dnevnik"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Razgovor/Više"
+
 msgid "/Conversation/Send File..."
 msgstr "/Razgovor/Pošalji datoteku..."
 
@@ -11155,6 +11271,9 @@ msgstr ""
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "podrška"
 
@@ -11279,6 +11398,10 @@ msgstr "hindu"
 msgid "Hungarian"
 msgstr "mađarski"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "rumunski"
+
 msgid "Indonesian"
 msgstr "indonezijski"
 
@@ -11294,6 +11417,10 @@ msgstr "gruzijski"
 msgid "Ubuntu Georgian Translators"
 msgstr "gruzijski Ubuntu prevodioci"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Ostalo"
+
 msgid "Kannada"
 msgstr "kanadski"
 
@@ -11372,6 +11499,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "švedski"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "tamilski"
 
@@ -11710,7 +11840,8 @@ msgstr "Boja za iscrtavanje nad-veza."
 msgid "Hyperlink visited color"
 msgstr "Boja posećene nad-veze"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Boja za iscrtavanje nad-veza nakon njihove posete."
 
 msgid "Hyperlink prelight color"
@@ -11746,14 +11877,23 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Boja za ispis imena poruke koju šaljete."
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Boja za ispis imena poruke koju šaljete."
+
 msgid "Typing notification color"
 msgstr "Boja obaveštenja o kucanju"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Omogući obaveštenje o kucanju"
 
 msgid "Typing notification font"
 msgstr "Font obaveštenja o kucanju"
@@ -11764,15 +11904,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Omogući obaveštenje o kucanju"
 
-msgid "_Copy Email Address"
-msgstr "_Kopiraj adresu e-pošte"
-
-msgid "_Open Link in Browser"
-msgstr "_Otvori vezu u pregledniku"
-
-msgid "_Copy Link Location"
-msgstr "_Kopiraj adresu veze"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11814,11 +11945,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Sačuvaj sliku"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Sačuvaj sliku..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Dodaj proizvoljne smeške..."
 
@@ -11905,9 +12034,6 @@ msgstr "Umanji slova"
 msgid "Font Face"
 msgstr "Izgled fonta"
 
-msgid "Background Color"
-msgstr "Boja pozadine"
-
 msgid "Foreground Color"
 msgstr "Boja teksta"
 
@@ -12015,13 +12141,14 @@ msgstr "_Razgledaj fasciklu sa dnevicima"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Pokušajte „%s -h“ za više podataka.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12045,13 +12172,14 @@ msgstr ""
 "  --display=EKRAN     prikazuje se na zadati X-ov ekran\n"
 "  -v, --version       ispisuje trenutno izdanje i izlazi iz programa\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12110,11 +12238,23 @@ msgstr "Pidžin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Izlazim jer je već pokrenut još jedan libpurple klijent.\n"
 
-msgid "Open All Messages"
-msgstr "Otvori sve poruke"
+msgid "/_Media"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Imate e-poštu!</span>"
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Računam..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12147,6 +12287,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Izabrana je „ručna“ naredba za veb čitač, a naredba nije postavljena."
 
+#, fuzzy
+msgid "No message"
+msgstr "Nepoznata greška"
+
+msgid "Open All Messages"
+msgstr "Otvori sve poruke"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Imate e-poštu!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Nova zaseda drugaru"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Imate e-poštu!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Sledeći dodaci će biti isključeni."
 
@@ -12195,10 +12356,17 @@ msgstr "<b>Detalji o dodatku</b>"
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Uredi zasedu drugaru"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Zaseda na koga"
 
+msgid "_Account:"
+msgstr "_Nalog:"
+
 msgid "_Buddy name:"
 msgstr "_Ime drugara:"
 
@@ -12265,7 +12433,60 @@ msgstr "Po_navljanje"
 msgid "Pounce Target"
 msgstr "Zaseda na"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Počinje da kuca"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Pravi odmor pri kucanju"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Prijavi se"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s se aktivirao(la) (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Vrati se sa odsustva"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Prestao da kuca"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Odjavi se"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Postade neaktivan"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Pri odsustvu"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Pošalji poruku"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Nepoznata zaseda. Molimo Vas da ovo prijavite!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Skup smeška ne može da se raspakuje."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Skup smeška ne može da se raspakuje."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Skup smeška ne može da se raspakuje."
 
 msgid "Install Theme"
@@ -12287,6 +12508,12 @@ msgstr "Prečice na tastaturi"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Zatvori razgovore tasterom Escape"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Spisak drugara"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Ikonica na panelu"
 
@@ -12296,8 +12523,9 @@ msgstr "Prika_ži ikonica na panelu:"
 msgid "On unread messages"
 msgstr "Na nepročitane poruke"
 
-msgid "Conversation Window Hiding"
-msgstr "Skrivanje prozora za razgovor"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Prozor razgovora"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Sakrij nove razgovore:"
@@ -12305,6 +12533,9 @@ msgstr "_Sakrij nove razgovore:"
 msgid "When away"
 msgstr "Pri odsustvu"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Uma_nji noci prozor razgovora"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Kratice"
@@ -12363,9 +12594,6 @@ msgstr "Koristi glatko klizanje"
 msgid "F_lash window when IMs are received"
 msgstr "_Zasijaj prozor kada pristigne nova poruka"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Uma_nji noci prozor razgovora"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12397,13 +12625,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Ne mogu da pokrenem program za podešavanje veb preglednika."
 
-msgid "ST_UN server:"
-msgstr "S_TUN Server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Primer: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Sam o_dredi IP adresu"
 
 msgid "Public _IP:"
@@ -12424,6 +12650,10 @@ msgstr "Po_četni port:"
 msgid "_End port:"
 msgstr "Po_slednji port:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Posrednički server &amp; Veb preglednik"
 
@@ -12612,12 +12842,12 @@ msgstr "Kada ste odsutni ili neaktivni"
 msgid "Auto-away"
 msgstr "Automatsko odustvo"
 
-msgid "Change status when _idle"
-msgstr "Promeni stanje kada ste ne_aktivni"
-
 msgid "_Minutes before becoming idle:"
 msgstr "Postani neaktivan nakon (minuta):"
 
+msgid "Change status when _idle"
+msgstr "Promeni stanje kada ste ne_aktivni"
+
 msgid "Change _status to:"
 msgstr "Promeni _stanje u:"
 
@@ -12765,45 +12995,45 @@ msgstr "Sa_čuvaj i primeni"
 msgid "Status for %s"
 msgstr "Stanje za %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 msgid "Custom Smiley"
 msgstr "Proizvoljni smešci"
 
-msgid "More Data needed"
-msgstr "Potrebno je više podataka"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 msgid "Duplicate Shortcut"
 msgstr "Udvostruči prečicu"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-msgid "Please select an image for the smiley."
-msgstr "Izaberite sliku za smešak."
-
 msgid "Edit Smiley"
 msgstr "Uredi smešak"
 
 msgid "Add Smiley"
 msgstr "Dodaj smešak"
 
-msgid "Smiley _Image"
-msgstr "_Ikonica za smešak"
+#, fuzzy
+msgid "_Image:"
+msgstr "S_liku"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Pre_čica za smešak"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr ""
 
 msgid "Smiley"
 msgstr "Smešak"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Stanje"
+
 msgid "Custom Smiley Manager"
 msgstr "Uređivanje proizvoljnih smešaka"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Izaberi drugara"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Kliknite za izmenu vaše ikonice za ovaj nalog."
 
@@ -12888,9 +13118,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Ne mogu da pošaljem izvršivač"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Dovukli ste pokretač. Verovatno želite da pošaljete ono na šta on pokazuje "
 "nego pokretača samog."
@@ -12926,6 +13157,16 @@ msgstr ""
 "Neuspelo učitavanje slike „%s“ iz nepoznatog razloga, verovatno je oštećena "
 "datoteka"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Otvori vezu u:"
+
+msgid "_Copy Link Location"
+msgstr "_Kopiraj adresu veze"
+
+msgid "_Copy Email Address"
+msgstr "_Kopiraj adresu e-pošte"
+
 msgid "Save File"
 msgstr "Sačuvaj datoteku"
 
@@ -13016,6 +13257,79 @@ msgstr "Dodatak za predviđanje dostupnosti kontakta."
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Adresa servera"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Server za razgovore"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Izaberite server za konferencije koji se upituje"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Mrežne usluge"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Pošalji spisak drugara"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Postade odsutan"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Direktorijum za dnevnik"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Izbor zvuka"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub servis"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Opis"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Podaci otkrivanja servisa"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Veb preglednik:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Korisnik ne postoji."
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server ne koristi nijedan od podržanih načina identifikovanja"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Podaci otkrivanja servisa"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Ovaj dodatak je koristan za uklanjanje grešaka Džaber servera ili programa"
+
 msgid "Buddy is idle"
 msgstr "Drugar je neaktivan"
 
@@ -13402,9 +13716,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Dodatak muzičkih poruka za saradnički sastav."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Dodatak za poruke muzičkim porukama dozvoljava korisnicima da istovremeno "
 "rade na delu muzike menjajući prost rezultat u realnom vremenu."
@@ -13516,12 +13831,6 @@ msgstr ""
 "— Izvrće sav prispeli tekst\n"
 "— Šalje poruku ljudima iz vašeg spiska čim se oni prijave"
 
-msgid "Cursor Color"
-msgstr "Boja kursora"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekundarna boja kursora"
-
 msgid "Hyperlink Color"
 msgstr "Boja nad-veze"
 
@@ -13531,6 +13840,10 @@ msgstr "Boja posećene nad-veze"
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Boja obaveštenja o kucanju"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horizontalni razdvojnik"
 
@@ -13560,35 +13873,24 @@ msgstr "Font Gtk+ sučelja"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Prečice za tekst"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Boja sučelja"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Omogući obaveštenje o kucanju"
 
-msgid "Widget Sizes"
-msgstr "Veličina elementa"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Kontrola Pidžinove GTK+ teme"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Zatvori"
 
 msgid "Fonts"
 msgstr "Fontovi"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Alati gtkrc datoteke"
 
@@ -13674,7 +13976,7 @@ msgstr "Dugme za slanje u prozoru razgovora."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13726,6 +14028,113 @@ msgstr "Zamena teksta"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Zamenjuje tekst u odlazećim porukama prema korisničkim pravilima."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Neprijavljen"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Neprijavljen"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Priključi se ćaskanju"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignoriši"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Glasnije"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Ovlašćenje je dato"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Greška"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Podaci"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Prozor zahteva"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "_Nivoi upozorenja"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Stanje za %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Lokalizacija pričaonice"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Sačuvaj ikonicu"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Kontrola Pidžinove GTK+ teme"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakt podaci"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Spisak drugara"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Spisak drugara"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Kontrola Pidžinove GTK+ teme"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Kontrola Pidžinove GTK+ teme"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13894,8 +14303,9 @@ msgstr "Pidžinove Vindous opcije"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Postavke svojstvene Pidžinu za Vindous."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Pruža opcije specifične Pidžinu za Vindous, kao što je spuštanje liste "
 "drugara."
@@ -13938,6 +14348,482 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Ovaj dodatak je koristan za uklanjanje grešaka Džaber servera ili programa"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Ne mogu da otvorim utičnicu"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Ne mogu da slušam utičnicu"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Ne mogu da čitam utičnicu"
+
+#~ msgid "Connection failed."
+#~ msgstr "Povezivanje propalo."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server se isključio"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Ne mogu da načinim utičnicu"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Ne mogu da se povežem sa domaćinom"
+
+#~ msgid "Read error"
+#~ msgstr "Greška pri čitanju"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu da uspostavim vezu sa serverom:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Greška pri pisanju"
+
+#~ msgid "Last Activity"
+#~ msgstr "Poslednja aktivnost"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Podaci otkrivanja servisa"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Stavke otkrivanja servisa"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Prošireno adresiranje odeljka"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Višekorisničko ćaskanje"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Podaci o proširenom ćaskanju sa više korisnika"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub servis"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 protoci"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "HHTML — brze poruke"
+
+#~ msgid "User Location"
+#~ msgstr "Korisnikova lokacija"
+
+#~ msgid "User Avatar"
+#~ msgstr "Korisnikova sličica"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Obaveštenja o stanju ćaskanja"
+
+#~ msgid "Software Version"
+#~ msgstr "Verzija programa"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Pokretanje protoka"
+
+#~ msgid "User Mood"
+#~ msgstr "Raspoloženje korisnika"
+
+#~ msgid "User Activity"
+#~ msgstr "Aktivnost korisnika"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Sposobnosti"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Pregovori o šifrovanoj sesiji"
+
+#~ msgid "User Tune"
+#~ msgstr "Korisnikova melodija"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Adresa za kontakt"
+
+#~ msgid "User Profile"
+#~ msgstr "Korisnikov profil"
+
+#~ msgid "Jingle"
+#~ msgstr "Džingl"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Džingl zvuk"
+
+#~ msgid "User Nickname"
+#~ msgstr "Nadimak"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Džingl ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Džingl ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Izvorni džingl UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Džingl video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Džingl DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Prijem poruka"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Izdavanje javnog ključa"
+
+#~ msgid "User Chatting"
+#~ msgstr "Korisnik ćaska"
+
+#~ msgid "User Browsing"
+#~ msgstr "Korisnik razgleda"
+
+#~ msgid "User Gaming"
+#~ msgstr "Korisnik se igra"
+
+#~ msgid "User Viewing"
+#~ msgstr "Korisnik gleda"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Šifrovanje odeljka"
+
+#~ msgid "Entity Time"
+#~ msgstr "Vreme važnosti"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Odložena dostava"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Saradnički podaci objekata"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Skladištenje i deljenje datoteka"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Pojednostavljeni pregovori i šifrovanoj sesiji"
+
+#~ msgid "Hop Check"
+#~ msgstr "Provera skoka"
+
+#~ msgid "Read Error"
+#~ msgstr "Greška pri čitanju"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Ne mogu da se povežem na server."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Bafer za čitanje je pun (2)"
+
+# Mozda "razume poruku"
+#~ msgid "Unparseable message"
+#~ msgstr "Poruka se ne može proslediti"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Ne mogu da se povežem sa domaćinom: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Prijava nije uspela (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Veza je prekinuta zato što ste se prijavili pod ovim imenom sa nekog "
+#~ "drugog mesta."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "SSL podrška je neophodna. Instalirajte je."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Neispravna lozinka."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu da se povežem na BOS server:\n"
+#~ "%s"
+
+# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Veza se uskoro može prekinuti. Pogledajte %s za dopune."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Ne mogu da se povežem"
+
+#~ msgid "Invalid username."
+#~ msgstr "Neispravno korisničko ime."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Ne mogu da dešifrujem odgovor sa servera"
+
+#~ msgid "Connection lost"
+#~ msgstr "Veza prekinuta"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Ne mogu da dobijem domaćina"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Veza prekinuta (pišem)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Ponavljanje veze"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Greška pri čitanju iz utičnice: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Ne mogu da se povežem na domaćina"
+
+#~ msgid "Could not write"
+#~ msgstr "Ne mogu da upišem"
+
+#~ msgid "Could not connect"
+#~ msgstr "Ne mogu da se povežem"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr " e mogu da načinim utičnicu za slušanje"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Ne mogu da dobijem ime domaćina"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Neispravna lozinka"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu da uspostavim vezu sa %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Jahu Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japanov pejdžer server"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japanov server za prenos datoteka"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Veza sa serverom je prekinuta\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Ne mogu da dobijem ime domaćina"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server zahteva TLS/SSL za prijavu. Nije nađena podrška za TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skrivanje prozora za razgovor"
+
+#~ msgid "More Data needed"
+#~ msgstr "Potrebno je više podataka"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Izaberite sliku za smešak."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Koji ID da aktiviram?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Boja kursora"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Sekundarna boja kursora"
+
+#~ msgid "Interface colors"
+#~ msgstr "Boja sučelja"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Veličina elementa"
+
+#~ msgid "Invite message"
+#~ msgstr "Pozivna poruka"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Unesite ime korisnika koga želite da pozovete,\n"
+#~ "a po želji pošaljite i poruku uz pozivnicu."
+
+#~ msgid "Looking up %s"
+#~ msgstr "Tražim %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Neuspešno povezivanje na %s"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Prijava: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Ne mogu da pišem u datoteku %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Ne mogu da pročitam datoteku %s."
+
+# greska: plural
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Poruka je predugačka, poslednjih %s bajtova je zanemareno."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s nije trenutno prijavljen."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Nije dozvoljeno upozoriti %s."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Poruka je odbačena, prekoračujete ograničenja brzine servera."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Nije moguće ćaskanje u %s."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Šaljete poruke prebrzo za %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Propustili ste poruku od %s zato što je prevelika."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Propustili ste poruku od %s zato je poslata previše brzo."
+
+#~ msgid "Failure."
+#~ msgstr "Neuspeh."
+
+#~ msgid "Too many matches."
+#~ msgstr "Previše poklapanja."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Potrebno više obeležja."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Usluge imenika trenutno nisu dostupne."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Ograničena pretraga prema adresi e-pošte."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Ključne reči zanemarene."
+
+#~ msgid "No keywords."
+#~ msgstr "Nema ključnih reči."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Korisnik nije upisan u imenik."
+
+#~ msgid "Country not supported."
+#~ msgstr "Država nije podržana."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Nepoznat neuspeh: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Nije ispravno korisničko ime ili lozinka."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Usluga je privremeno nedostupna."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Imate previše upozorenja da biste se mogli prijaviti."
+
+#~ 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 ""
+#~ "Uspostavljate i prekidate vezu suviše često. Sačekajte deset minuta i "
+#~ "pokušajte ponovo. Ako nastavite sa pokušajima, moraćete sačekati čak i "
+#~ "duže."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Došlo je do nepoznate greške pri prijavi: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Dogodila se nepoznata greška %d. Podaci: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Neispravan naziv grupe"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Veza prekinuta"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Čekam za odgovor..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC je prekinuo zastoj. Sada ponovo možete slati poruke."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Lozinka uspešno izmenjena"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Pribavi podatke iz imenika"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Postavi podatke u imenik"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Ne mogu da otvorim %s za upis!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Neuspešan prenos datoteke; druga strana je verovatno otkazala."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Ne mogu da uspostavim vezu za prenos."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Ne mogu da upišem zaglavlje datoteke. Datoteka se neće preneti."
+
+#~ msgid "Save As..."
+#~ msgstr "Sačuvaj kao..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s zahteva od %s da primi %d datoteku: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s zahteva od %s da primi %d datoteke: %s (%.2f %s)%s%s"
+#~ msgstr[2] "%s zahteva od %s da primi %d datoteka: %s (%.2f %s)%s%s"
+#~ msgstr[3] "%s zahteva od %s da primi %d datoteku: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s zahteva od Vas da pošaljete datoteku"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Dodatak za TOC protokol"
+
+#~ msgid "%s Options"
+#~ msgstr "%s opcije"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Postavke proksija"
+
+#~ msgid "By log size"
+#~ msgstr "Po veličini dnevnika"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Otvori vezu u pregledniku"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "S_TUN Server:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "_Ikonica za smešak"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Pre_čica za smešak"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Ne mogu da pribavim MSN adresar"
 
@@ -14124,13 +15010,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Lozinke preko %d karaktera (vaša je %d) nisu podržane u Mom svemiru."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Idite na http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username i odaberite korisničko ime kako bi pokušali ponovo."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Ne mogu da se povežem na SSL server."
 
@@ -14188,9 +15067,6 @@ msgstr ""
 #~ msgid "Please enter external group ID"
 #~ msgstr "Unesite identifikaciju spoljne grupe"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Ova grupa je dodata u vašu listu drugara"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Molim da se pridružim"
 
@@ -14218,9 +15094,6 @@ msgstr ""
 #~ msgid "You have successfully modified Qun information"
 #~ msgstr "Uspešno ste izmenili Qun podatke"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Greška u zahtevu tokena za prijavu"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Ne mogu da se povežem, proveri dnevnik grešaka"
 
diff --git a/po/sv.po b/po/sv.po
index e4a052e2a5..8a17dd5d89 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-25 23:20+0100\n"
-"PO-Revision-Date: 2009-02-25 23:14+0100\n"
+"POT-Creation-Date: 2009-07-15 18:36+0200\n"
+"PO-Revision-Date: 2009-07-15 18:36+0100\n"
 "Last-Translator: Peter Hjalmarsson <xake@rymdraket.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -606,19 +606,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Skicka till"
 
-msgid "Invite message"
-msgstr "Inbjudningsmeddelande"
-
-msgid "Invite"
-msgstr "Bjud in"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Ange namnet på den användare du vill bjuda in,\n"
-"samt ett inbjudningsmeddelande om du vill"
-
 msgid "Conversation"
 msgstr "Konversation"
 
@@ -876,6 +863,39 @@ msgstr "Alla konversationer"
 msgid "System Log"
 msgstr "Systemlogg"
 
+msgid "Calling ... "
+msgstr "Ringer..."
+
+msgid "Hangup"
+msgstr "La på"
+
+#. Number of actions
+msgid "Accept"
+msgstr "Acceptera"
+
+msgid "Reject"
+msgstr "Avslå"
+
+msgid "Call in progress."
+msgstr "Samtal pågår."
+
+msgid "The call has been terminated."
+msgstr "Samtalet avslutat."
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s önskar påbörja en ljudsession med dig."
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s försöker påbörja en ej stödd mediasession med dig."
+
+msgid "You have rejected the call."
+msgstr "Du har nekat samtalet."
+
+msgid "call: Make an audio call."
+msgstr "call: Påbörja ett ljudsamtal"
+
 msgid "Emails"
 msgstr "Mejl"
 
@@ -910,6 +930,9 @@ msgstr "Fortsätt"
 msgid "IM"
 msgstr "Meddelande"
 
+msgid "Invite"
+msgstr "Bjud in"
+
 msgid "(none)"
 msgstr "(inget)"
 
@@ -1113,7 +1136,6 @@ msgstr "%s har gått iväg. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s har sänt dig ett meddelande. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Okänd attackhändelse. Var snäll och rapportera detta!"
 
@@ -1523,6 +1545,29 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Lastlogmodul"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Hämtar TinyURL..."
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "Skapa enbart TinyURL om url:en är av denna längd eller större"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (eller annan) adressprefix"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL modul"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "När du får en/flera URL/URLer, TinyURL för att lättare hantering"
+
 msgid "accounts"
 msgstr "konton"
 
@@ -1625,13 +1670,6 @@ msgstr "Acceptera certifikat för %s?"
 msgid "SSL Certificate Verification"
 msgstr "SSL Certifikatsverifikation"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Acceptera"
-
-msgid "Reject"
-msgstr "Avslå"
-
 msgid "_View Certificate..."
 msgstr "_Visa Certifikat..."
 
@@ -1732,6 +1770,7 @@ msgstr "+++ %s har loggat in"
 msgid "+++ %s signed off"
 msgstr "+++ %s har kopplat ifrån"
 
+#. Unknown error
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -1778,6 +1817,17 @@ msgstr "%s lämnade rummet."
 msgid "%s left the room (%s)."
 msgstr "%s lämnade rummet (%s)."
 
+msgid "Invite to chat"
+msgstr "Bjud in till chatt"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Ange namnet på den användare du vill bjuda in, samt ett "
+"inbjudningsmeddelande om du vill"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kan inte skapa anslutning: %s"
@@ -1911,6 +1961,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "Inleder filöverföring av %s från %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Överföringen av filen <A HREF=\"file://%s\">%s</A> är färdig"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Överföringen av filen %s är färdig"
 
@@ -2107,6 +2161,9 @@ msgstr "<font color=\"red\"><b>Kunde inte läsa fil: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 
+msgid "Error creating conference."
+msgstr "Fel vid skapandet av konferens."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Du använder %s men denna modul behöver %s."
@@ -2509,13 +2566,13 @@ msgstr "Inkludera andra IM-klienters loggfiler i loggfilsvisaren."
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Vid visning av loggfiler inkluderar denna modul loggar från andra IM-"
-"klienter. För närvarande inkluderar detta Adium, MSN Messenger, och "
+"Vid visning av loggfiler kommer denna modul inkludera loggar från andra IM-"
+"klienter. För närvarande inkluderar detta Adium, MSN Messenger, aMSN, och "
 "Trillian.\n"
 "\n"
 "VARNING: Denna modul är fortfarande alpha-kod och kan krasha ofta. Använd på "
@@ -2566,7 +2623,7 @@ msgstr ""
 "Spara meddelandet skickat till en frånkopplad användare som en notifiering"
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Resten av meddelanden kommer sparas som notifieringar. Du kan ändra/ta bort "
@@ -2599,6 +2656,34 @@ msgstr "Spara frånkopplade meddelanden som notifieringar"
 msgid "Do not ask. Always save in pounce."
 msgstr "Fråga inte. Spara alltid som notifiering."
 
+msgid "One Time Password"
+msgstr "Engångslösenord"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "Support för Engångslösenord"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "Tvinga att lösenordet enbart används en gång."
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+"Tillåter dig att välja per konto om lösenorden som inte sparas bara ska "
+"användas till en lyckad anslutning.\n"
+"Notering: Kontolösenordet får inte sparas om dettta ska fungera."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2794,14 +2879,14 @@ msgstr ""
 "modulen måste du installera ActiveTCL från http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"Apples Bonjour För Windows hittades inte, läs FAQen: http://d.pidgin.im/"
+"Kunde inte hitta Apples \"Bonjour För Windows\", läs på http://d.pidgin.im/"
 "BonjourWindows för mer information"
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Kan inte lyssna efter inkommande IM anslutningar\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "Kan inte lyssna efter inkommande IM anslutningar"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2852,14 +2937,17 @@ msgstr "%s har stängt konversationen."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kan inte skicka meddelandet, konversationen kunde inte startas."
 
-msgid "Cannot open socket"
-msgstr "Kan inte öppna uttag"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Kan inte skapa uttag %s"
 
-msgid "Could not bind socket to port"
-msgstr "Kunde inte binda uttag till port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Kunde inte binda uttag till port: %s"
 
-msgid "Could not listen on socket"
-msgstr "Kunde inte lyssna på uttag"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Kan intelyssna på uttag: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Fel vid kommunikation med den lokala mDNSRespondern."
@@ -2911,14 +2999,14 @@ msgstr "Spara kompislista..."
 msgid "Load buddylist from file..."
 msgstr "Läs in kompislista från fil..."
 
-msgid "Fill in the registration fields."
-msgstr "Fyll i registreringsfälten."
+msgid "You must fill in all registration fields"
+msgstr "Du måste fylla i alla registreringsfälten"
 
-msgid "Passwords do not match."
-msgstr "Lösenorden stämmer inte överens."
+msgid "Passwords do not match"
+msgstr "Lösenorden stämmer inte överens"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Kunde inte registrera nytt konto. Ett fel uppstod.\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "Kunde inte registrera nytt konto. Ett okänt fel uppstod."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nytt Gadu-gadu-konto registrerat"
@@ -2929,14 +3017,14 @@ msgstr "Registreringen lyckades!"
 msgid "Password"
 msgstr "Lösenord"
 
-msgid "Password (retype)"
-msgstr "Lösenord (upprepa)"
+msgid "Password (again)"
+msgstr "Lösenord (igen)"
 
-msgid "Enter current token"
-msgstr "Ange nuvarande markör"
+msgid "Enter captcha text"
+msgstr "Ange captcha-text"
 
-msgid "Current token"
-msgstr "Nuvarande markör"
+msgid "Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrera nytt Gadu-Gadu-konto"
@@ -2989,6 +3077,15 @@ msgstr "Lösenordet ändrat utan problem!"
 msgid "Current password"
 msgstr "Nuvarande lösenord"
 
+msgid "Password (retype)"
+msgstr "Lösenord (upprepa)"
+
+msgid "Enter current token"
+msgstr "Ange nuvarande markör"
+
+msgid "Current token"
+msgstr "Nuvarande markör"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Var god ange ditt nuvarande lösenord och nya lösenord för UIN: "
 
@@ -3002,6 +3099,7 @@ msgstr "Välj en chatt för kompisen: %s"
 msgid "Add to chat..."
 msgstr "Lägg till i chatt..."
 
+#. Global
 msgid "Available"
 msgstr "Tillgänglig"
 
@@ -3035,7 +3133,7 @@ msgstr "Inga matchande användare funna"
 msgid "There are no users matching your search criteria."
 msgstr "Det finns inga användare som matchar dina sökkriterier."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Kan inte läsa från uttag"
 
 msgid "Buddy list downloaded"
@@ -3050,7 +3148,13 @@ msgstr "Kompislistan är uppladdad"
 msgid "Your buddy list was stored on the server."
 msgstr "Din kompislista blev lagrad på servern."
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Ansluten"
+
+msgid "Connection failed"
 msgstr "Anslutning misslyckad"
 
 msgid "Add to chat"
@@ -3059,14 +3163,23 @@ msgstr "Lägg till i chatt"
 msgid "Chat _name:"
 msgstr "Chatt_namn:"
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Kan inte slå upp värdnamn '%s': %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Ansluter"
+
 msgid "Chat error"
 msgstr "Chattfel"
 
 msgid "This chat name is already in use"
 msgstr "Det chattnamnet används redan"
 
-msgid "Not connected to the server."
-msgstr "Inte ansluten till servern."
+msgid "Not connected to the server"
+msgstr "Inte ansluten till servern"
 
 msgid "Find buddies..."
 msgstr "Hitta kompisar..."
@@ -3107,6 +3220,9 @@ msgstr "Populär polsk IM"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-användare"
 
+msgid "GG server"
+msgstr "GG server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Okänt kommando: %s"
@@ -3121,8 +3237,8 @@ msgstr "Inget ämne är inställt"
 msgid "File Transfer Failed"
 msgstr "Filöverföringen misslyckades"
 
-msgid "Could not open a listening port."
-msgstr "Kunde inte öppna en lyssnande port."
+msgid "Unable to open a listening port."
+msgstr "Kunde inte öppna en lyssnningsport."
 
 msgid "Error displaying MOTD"
 msgstr "Fel vid visning av MOTD"
@@ -3137,8 +3253,16 @@ msgstr "Det finns ingen MOTD associerad med denna anslutning."
 msgid "MOTD for %s"
 msgstr "MOTD för %s"
 
-msgid "Server has disconnected"
-msgstr "Servern har kopplat ifrån"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "Tappade anslutningen med servern: %s"
 
 msgid "View MOTD"
 msgstr "Visa MOTD"
@@ -3149,25 +3273,23 @@ msgstr "_Kanal:"
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC-nickar får inte innehålla blanksteg"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Ansluter"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC-nsmeknamn och server får inte innehålla blanksteg"
 
 msgid "SSL support unavailable"
 msgstr "SSL-stöd ej tillgängligt"
 
-msgid "Couldn't create socket"
-msgstr "Kunde inte skapa socket"
+msgid "Unable to connect"
+msgstr "Kan inte ansluta"
 
-msgid "Couldn't connect to host"
-msgstr "Kunde inte ansluta till värden"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "Kan inte ansluta: %s"
 
-msgid "Read error"
-msgstr "Läsfel"
+#, c-format
+msgid "Server closed the connection"
+msgstr "Servern stängde anslutningen"
 
 msgid "Users"
 msgstr "Användare"
@@ -3348,6 +3470,16 @@ msgstr ""
 "Ditt valda kontonamn vägrades av servern. Det innehåller antagligen "
 "otillåtna tecken."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Smeknamnet \"%s\" används redan."
+
+msgid "Nickname in use"
+msgstr "Smeknamnet används"
+
 msgid "Cannot change nick"
 msgstr "Kan inte ändra nick"
 
@@ -3591,10 +3723,10 @@ msgstr "'Ad-Hoc'-kommandot misslyckades"
 msgid "execute"
 msgstr "utför"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Servern kräver TLS/SSL vid inloggning. Hittade inget stöd för TLS/SSL."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Servern kräver TLS/SSL, men inget stöd för TLS/SSL kunde hittades."
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Du kräver kryptering, men inget stöd för TLS/SSL hittades."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3611,17 +3743,43 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Klartextautentisering"
 
-msgid "Invalid response from server."
-msgstr "Ogiltigt svar från servern."
+msgid "SASL authentication failed"
+msgstr "SASL Autentisering misslyckades"
+
+msgid "Invalid response from server"
+msgstr "Ogiltigt svar från server"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Servern använder inga autentiseringsmetoder som stöds"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Du kräver cryptering, men server stödjer det inte."
+
 msgid "Invalid challenge from server"
 msgstr "Ogiltigt utmaning från servern"
 
-msgid "SASL error"
-msgstr "SASL fel"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL fel: %s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "BOSH anslutningshanterare avslutade din session."
+
+msgid "No session ID given"
+msgstr "Inget sessions ID angavs"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Ej stödd version av BOSH-protokollet"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Kunde inte skapa en anslutning med servern"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Kunde inte skapa en anslutning med servern: %s"
+
+msgid "Unable to establish SSL connection"
+msgstr "Kan inte skapa SSL-anslutning"
 
 msgid "Full Name"
 msgstr "Fullständigt namn"
@@ -3692,168 +3850,8 @@ msgstr "Klient"
 msgid "Operating System"
 msgstr "Operativsystem"
 
-msgid "Last Activity"
-msgstr "Senaste aktivitet"
-
-msgid "Service Discovery Info"
-msgstr "Tjänsteupptäckningsinfo"
-
-msgid "Service Discovery Items"
-msgstr "Tjänstupptäckningsföremål"
-
-msgid "Extended Stanza Addressing"
-msgstr "Utökad Strofadressering"
-
-msgid "Multi-User Chat"
-msgstr "Månganvändarchatt"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band Byteströmmar"
-
-msgid "Ad-Hoc Commands"
-msgstr "'Ad-Hoc' Kommandon"
-
-# Vad är PubSub? Hittar bara antydningar till en sökmotor med speciella möjligheter för uppföljning. Är det den som avses?
-msgid "PubSub Service"
-msgstr "PubSub Service"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Byteströmmar"
-
-# Vad för?
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-# Vad menas med In-Band, när används och vad blir då lämplig översättning? Denna har antagligen något med "Out-of-Band att göra men hur hänger de ihop?
-msgid "In-Band Registration"
-msgstr "In-Bandsregistrering"
-
-msgid "User Location"
-msgstr "Placering"
-
-msgid "User Avatar"
-msgstr "Användar-avatar"
-
-msgid "Chat State Notifications"
-msgstr "Chatt-status notifieringar"
-
-msgid "Software Version"
-msgstr "Mjukvaruversion"
-
-msgid "Stream Initiation"
-msgstr "Ströminitiering"
-
-msgid "File Transfer"
-msgstr "Filöverföringar"
-
-msgid "User Mood"
-msgstr "Användarhumör"
-
-msgid "User Activity"
-msgstr "Användaraktivitet"
-
-# Låter mysko, vet inte i vilket sammanhang.
-msgid "Entity Capabilities"
-msgstr "Existensmöjligheter"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Förhandlingar om krypterade sessioner"
-
-msgid "User Tune"
-msgstr "Användarlåt"
-
-msgid "Roster Item Exchange"
-msgstr "Listinnehållsutbyte"
-
-# Vet inte om detta är bästa, men...
-msgid "Reachability Address"
-msgstr "Nåbar adress"
-
-msgid "User Profile"
-msgstr "Användarprofil"
-
-msgid "Jingle"
-msgstr "Ramsa"
-
-# Vad är dessa?
-msgid "Jingle Audio"
-msgstr "Sångsnutt"
-
-msgid "User Nickname"
-msgstr "Användarsmeknamn"
-
-# Vad är dessa?
-msgid "Jingle ICE UDP"
-msgstr "Ramsa ICE UDP"
-
-# Vad är dessa?
-msgid "Jingle ICE TCP"
-msgstr "Ramsa ICE TCP"
-
-# Vad är dessa?
-msgid "Jingle Raw UDP"
-msgstr "Ramsa Rå UDP"
-
-msgid "Jingle Video"
-msgstr "Ramsa Video"
-
-# Vad är dessa?
-msgid "Jingle DTMF"
-msgstr "Ramsa DTMF"
-
-msgid "Message Receipts"
-msgstr "Meddelandekvitton"
-
-msgid "Public Key Publishing"
-msgstr "Publik nyckelpublisering"
-
-msgid "User Chatting"
-msgstr "Användarchattning"
-
-msgid "User Browsing"
-msgstr "Användarbläddring"
-
-msgid "User Gaming"
-msgstr "Användarspelning"
-
-msgid "User Viewing"
-msgstr "Användarvisning"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Strofkryptering"
-
-msgid "Entity Time"
-msgstr "Enhet Tid"
-
-msgid "Delayed Delivery"
-msgstr "Försenad försändelse"
-
-msgid "Collaborative Data Objects"
-msgstr "Kollebrationsdata objekt"
-
-msgid "File Repository and Sharing"
-msgstr "Filförvaringsplats och Delning"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN Serviceupptäckning för Ramsor"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Simpel crypterad session förhandling"
-
-msgid "Hop Check"
-msgstr "Hoppkontroll"
-
-msgid "Capabilities"
-msgstr "Stödjer"
+msgid "Local Time"
+msgstr "Lokal tid"
 
 msgid "Priority"
 msgstr "Prioritet"
@@ -3866,6 +3864,13 @@ msgstr "Prioritet"
 msgid "Resource"
 msgstr "Resurs"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s sedan"
+
+msgid "Logged Off"
+msgstr "Frånkopplad"
+
 msgid "Middle Name"
 msgstr "Andranamn"
 
@@ -4033,28 +4038,24 @@ msgstr "Välj en konferensserver att fråga"
 msgid "Find Rooms"
 msgstr "Sök rum"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Du kräver cryptering, men server stödjer det inte."
+msgid "Affiliations:"
+msgstr "Anknytningar:"
 
-msgid "Write error"
-msgstr "Skrivfel"
+msgid "No users found"
+msgstr "Inga användare funna"
 
-msgid "Ping timeout"
-msgstr "Ping överskred en tidsgräns"
+msgid "Roles:"
+msgstr "Roller:"
 
-msgid "Read Error"
-msgstr "Läsfel"
+msgid "Ping timed out"
+msgstr "Ping överskred sin tidsgräns"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Kunde inte skapa en anslutning med servern:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Kan inte skapa socket"
+"Kunde inte hitta en alternativ XMPP-anslutningsmetod efter direktanslutning "
+"misslyckades."
 
 msgid "Invalid XMPP ID"
 msgstr "Ogiltigt XMPP ID"
@@ -4062,6 +4063,9 @@ msgstr "Ogiltigt XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ogiltigt XMPP IP. Domän måste anges."
 
+msgid "Malformed BOSH URL"
+msgstr "Felutformad BOSH-URAL"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrering av %s@%s lyckades"
@@ -4086,9 +4090,6 @@ msgstr "Avregistreringen lyckades"
 msgid "Unregistration Failed"
 msgstr "Avregistreringen misslyckades"
 
-msgid "Already Registered"
-msgstr "Redan registrerad"
-
 msgid "State"
 msgstr "Delstat"
 
@@ -4101,6 +4102,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Redan registrerad"
+
 msgid "Unregister"
 msgstr "Avregistrera"
 
@@ -4128,6 +4132,9 @@ msgstr "Registrera nytt konto vid %s"
 msgid "Change Registration"
 msgstr "Ändra registrering"
 
+msgid "Malformed BOSH Connect Server"
+msgstr "Felutformad BOSH anslutningsserver"
+
 msgid "Error unregistering account"
 msgstr "Fel vid avregistrering av konto"
 
@@ -4152,6 +4159,12 @@ msgstr "Servern stödjer inte blockering"
 msgid "Not Authorized"
 msgstr "Inte auktoriserad"
 
+msgid "Mood"
+msgstr "Humör"
+
+msgid "Now Listening"
+msgstr "Lyssnar just nu"
+
 msgid "Both"
 msgstr "Båda"
 
@@ -4173,12 +4186,6 @@ msgstr "Ingen"
 msgid "Subscription"
 msgstr "Prenumeration"
 
-msgid "Mood"
-msgstr "Humör"
-
-msgid "Now Listening"
-msgstr "Lyssnar just nu"
-
 msgid "Mood Text"
 msgstr "Humörstext"
 
@@ -4221,9 +4228,6 @@ msgstr "Ditt lösenord har ändrats."
 msgid "Error changing password"
 msgstr "Fel vid byte av lösenord"
 
-msgid "Password (again)"
-msgstr "Lösenord (igen)"
-
 msgid "Change XMPP Password"
 msgstr "Byt XMPP lösenord"
 
@@ -4417,16 +4421,24 @@ msgid "Unable to ping user %s"
 msgstr "Kan inte pinga användaren %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "Kunde inte surra eftersom det inte finns något känt om användaren %s."
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Kunde inte surra eftersom det inte finns något känt om %s."
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "Kunde inte surra eftersom användaren %s kanske är frånkopplad."
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Kunde inte surra eftersom %s kanske är frånkopplad."
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"Kan inte surra eftersom %s stödjer inte det eller önskar ta emot surr just "
+"nu."
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Kan inte surra, användaren %s stödjer inte det."
+msgid "Buzzing %s..."
+msgstr "Surrar %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4438,8 +4450,34 @@ msgid "%s has buzzed you!"
 msgstr "%s har surrat dig!"
 
 #, c-format
-msgid "Buzzing %s..."
-msgstr "Surrar %s..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Kan inte påbörja media med %s: ogiltig JID"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Kan inte påbörja media med %s: användaren är inte ansluten"
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Kan inte påbörja media med %s: prenumererar inte på användartillgänglighet"
+
+msgid "Media Initiation Failed"
+msgstr "Initiering av media misslyckades"
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Var god välj vilken tillflykt för %s med vilken du vill påbörja en "
+"mediasession."
+
+msgid "Select a Resource"
+msgstr "Välj en tillflykt"
+
+msgid "Initiate Media"
+msgstr "Påbörja Media"
 
 msgid "config:  Configure a chat room."
 msgstr "config: Konfigurera ett chattrum."
@@ -4460,18 +4498,18 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;användare&gt; [anledning]:  Bannlys en användare från rummet."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;användare&gt; &lt;ägare|admin|medlem|utstött|ingen&gt;: Ange "
-"en användares koppling till rummet."
+"affiliate &lt;ägare|admin|medlem|utstött|ingen&gt;: [nick1] [nick2] ...: "
+"Hämta eller ange användarnas anknytning till rummet."
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;användare&gt; &lt;moderator|deltagare|besökare|inget&gt;: Ange en "
-"användares roll i rummet."
+"role &lt;moderator|deltagare|besökare|inget&gt;: [nick1] [nick2] ...: Hämta "
+"eller ange användarnas roll i rummet."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
@@ -4535,6 +4573,9 @@ msgstr "Anslutningsserver"
 msgid "File transfer proxies"
 msgstr "Filetransports proxies"
 
+msgid "BOSH URL"
+msgstr "BOSH URL"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4573,6 +4614,14 @@ msgstr "XML-tolkningsfel"
 msgid "Unknown Error in presence"
 msgstr "Okänt fel i närvaro"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Fel vid anslutning till chatt %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Fel i chatt %s"
+
 msgid "Create New Room"
 msgstr "Skapa nytt rum"
 
@@ -4589,13 +4638,28 @@ msgstr "_Konfigurera rum"
 msgid "_Accept Defaults"
 msgstr "_Acceptera förval"
 
+msgid "No reason"
+msgstr "Ingen anledning"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Fel vid anslutning till chatt %s"
+msgid "You have been kicked: (%s)"
+msgstr "Du har sparkats ut: (%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Fel i chatt %s"
+msgid "Kicked (%s)"
+msgstr "Utsparkad (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr "Överföringen stängdes inte."
+
+msgid "Failed to open the file"
+msgstr "Kunde inte öppna filen"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4621,9 +4685,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Var god välj vilken tillflykt för %s du vill sända filen till"
 
-msgid "Select a Resource"
-msgstr "Välj en tillflykt"
-
 msgid "Edit User Mood"
 msgstr "Redigera användarhumör"
 
@@ -4666,7 +4727,7 @@ msgid "Unable to add \"%s\"."
 msgstr "Kunde inte lägga till \"%s\"."
 
 msgid "Buddy Add error"
-msgstr ""
+msgstr "Fel vid tillläggning av kompis"
 
 msgid "The username specified does not exist."
 msgstr "Den angivna användarnamnet finns inte."
@@ -4923,6 +4984,30 @@ msgstr "Andra kontakter"
 msgid "Non-IM Contacts"
 msgstr "Icke-IM kontakter"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s skickade en vink. <a href='msn-wink://%s'>Klicka här för att spela upp "
+"den</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s skickade en vink, men den kunde inte sparas"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s skickade ett röstmeddelande. <a href='audio://%s'>Klicka här för att "
+"spela upp det</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s skickade ett röstmeddelande, men det kunde inte sparas"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s har skickat dig en inbjudan till en röstchatt vilken inte stöds än."
+
 msgid "Nudge"
 msgstr "Vibba"
 
@@ -5075,8 +5160,28 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "SSL-stöd krävs för att använda MSN. Installera ett SSL-bibliotek som stöds."
 
-msgid "Failed to connect to server."
-msgstr "Kunde inte ansluta till servern."
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Kunde inte lägga till kompisen %s eftersom användarnamnet är ogiltigt. "
+"Användarnamnet måste vara en giltig epost-adress."
+
+msgid "Unable to Add"
+msgstr "Kunde inte lägga till"
+
+msgid "Authorization Request Message:"
+msgstr "Meddelande om auktoriseringsbegäran:"
+
+msgid "Please authorize me!"
+msgstr "Snälla auktorisera mig!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
 
 msgid "Error retrieving profile"
 msgstr "Fel vid hämtning av profil"
@@ -5267,63 +5372,27 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID autentisering: Ogiltigt svar"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s är inte en giltig grupp."
-
-msgid "Unknown error."
-msgstr "Okänt fel."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s på %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s skickade just en vibb!"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Okänt fel (%d)"
+msgid "Unknown error (%d): %s"
+msgstr "Okänt fel (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Kan inte lägga till användaren"
 
-msgid "The following users are missing from your addressbook"
-msgstr "De följande användarna saknas i din adressbok"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kan inte lägga till användare på %s (%s)"
-
+#. Unknown error!
 #, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Kan inte blockera användaren på %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Kan inte tillåta användaren på %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s kunde inte läggas till eftersom din kompislista är full."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s är inte ett giltigt passport-konto."
+msgid "Unknown error (%d)"
+msgstr "Okänt fel (%d)"
 
-msgid "Service Temporarily Unavailable."
-msgstr "Tjänst tillfälligt onåbar."
+msgid "The following users are missing from your addressbook"
+msgstr "De följande användarna saknas i din adressbok"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilmeddelandet sändes inte då det var för långt."
 
-msgid "Unable to rename group"
-msgstr "Kan inte byta namn på grupp"
-
-msgid "Unable to delete group"
-msgstr "Kan inte ta bort grupp"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5371,9 +5440,6 @@ msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 "Meddelandet kunde kanske inte skickas på grund av att ett okänt fel uppstod."
 
-msgid "Unable to connect"
-msgstr "Kan inte ansluta"
-
 msgid "Writing error"
 msgstr "Skrivfel"
 
@@ -5388,20 +5454,20 @@ msgstr ""
 "Anslutningsfel från %s servern:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "Vårt protokoll stöds inte av servern."
+msgid "Our protocol is not supported by the server"
+msgstr "Vårt protokoll stöds inte av servern"
 
-msgid "Error parsing HTTP."
-msgstr "Fel vid avkodning av HTTP."
+msgid "Error parsing HTTP"
+msgstr "Fel vid avkodning av HTTP"
 
-msgid "You have signed on from another location."
-msgstr "Du har loggat in från en annan plats."
+msgid "You have signed on from another location"
+msgstr "Du har loggat in från en annan plats"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN-sernvern är temporärt otillgänglig. Var god försök igen senare."
 
-msgid "The MSN servers are going down temporarily."
-msgstr "MSN-servern går ner temporärt."
+msgid "The MSN servers are going down temporarily"
+msgstr "MSN-servern går ner temporärt"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5430,6 +5496,16 @@ msgstr "Skickar kaka"
 msgid "Retrieving buddy list"
 msgstr "Tar emot kompislista"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s har frågar efter att få se fin webbkamera, men denna förfrågan stöds inte "
+"än."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s har skickat dig en webbkamerainbjudan, vilket ännu inte stöds."
+
 msgid "Away From Computer"
 msgstr "Inte vid datorn"
 
@@ -5470,14 +5546,6 @@ msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Meddelandet kunde kanske inte skickas på grund av att ett okänt fel uppstod:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s har lagt till dig till sin kompislista."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s har tagit bort dig från sin kontaktlista."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Ta bort kompisen från adressboken?"
 
@@ -5507,6 +5575,54 @@ msgid "MSN Protocol Plugin"
 msgstr "Insticksmodul för MSN-protokollet"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s är inte en giltig grupp."
+
+msgid "Unknown error."
+msgstr "Okänt fel."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s på %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kan inte lägga till användare på %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Kan inte blockera användaren på %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Kan inte tillåta användaren på %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s kunde inte läggas till eftersom din kompislista är full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s är inte ett giltigt passport-konto."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Tjänst tillfälligt onåbar."
+
+msgid "Unable to rename group"
+msgstr "Kan inte byta namn på grupp"
+
+msgid "Unable to delete group"
+msgstr "Kan inte ta bort grupp"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s har lagt till dig till sin kompislista."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s har tagit bort dig från sin kontaktlista."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Ingen sådan användare: %s"
 
@@ -5535,6 +5651,8 @@ msgid "Lost connection with server"
 msgstr "Tappade anslutningen till servern"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nya e-postmeddelanden"
 
@@ -5573,44 +5691,30 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Lägg till kontakter från server"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Ansluten"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfel, gav felkod %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Ditt lösenord är %d tecken, längre än den förväntade max-gränsen på %d "
-"för MySpaceIM. Var vänlig förkorta ditt lösenord på följande adress http://"
+"%s Ditt lösenord är %zu tecken vilket är längre än den förväntade max-"
+"gränsen på %d. Var vänlig förkorta ditt lösenord på följande adress http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
 "och försök sedan igen."
 
+msgid "Incorrect username or password"
+msgstr "Felaktigt användarnamn eller lösenord"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-fel"
 
 msgid "Invalid input condition"
 msgstr "Ogiltigt inmatningsvillkor"
 
-msgid "Read buffer full (2)"
-msgstr "Läsbuffert full (2)"
-
-msgid "Unparseable message"
-msgstr "Otolkbart meddelande"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Kunde inte ansluta till värd: %s (%d)"
-
 # Vad säger att det är till just en chatt kompisen ska läggas till?
 msgid "Failed to add buddy"
 msgstr "Kunde inte lägga till kompis"
@@ -5698,6 +5802,15 @@ msgstr "Totala vänner"
 msgid "Client Version"
 msgstr "Klientversion"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Ett fel uppstod vid försök att ange ditt användarnamn. Försök igen, eller gå "
+"till http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"för att ange ditt användarnamn."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Användarnamnet är tillgänglig"
 
@@ -5851,15 +5964,15 @@ msgstr "Lurar %s..."
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr ""
+msgstr "Pruttljud"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s har surrat dig!"
+msgstr "%s har gjort pruttljud mot dig!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "Gör pruttljud mot %s..."
 
 msgid "Required parameters not passed in"
 msgstr "Nödvändiga parametrar skickades inte"
@@ -5915,9 +6028,6 @@ msgstr "Kan inte lägga till dig själv"
 msgid "Master archive is misconfigured"
 msgstr "Huvudarkiv är felkonfigurerat"
 
-msgid "Incorrect username or password"
-msgstr "Felaktigt användarnamn eller lösenord"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Kan inte känna igen värden för användarnamnet du angav"
 
@@ -5961,8 +6071,8 @@ msgid "Unknown error: 0x%X"
 msgstr "Okänt fel: 0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "Inloggningen misslyckades (%s)."
+msgid "Unable to login: %s"
+msgstr "Kunde inte logga in: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6066,9 +6176,6 @@ msgstr "GroupWise konferens %d"
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-msgid "Unable to connect to server."
-msgstr "Kan inte ansluta till servern."
-
 msgid "Waiting for response..."
 msgstr "Väntar på svar..."
 
@@ -6092,24 +6199,18 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Vill du går med i konversationen?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Du har blivit utloggad eftersom du loggat in från en annan dator."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s verkar vara frånkopplad och fick inte meddelandet du just skickade."
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
-"Kunde inte ansluta till servern. Var god ange serveradressen som du vill "
+"Kunde inte ansluta till servern. Var god ange adressen till servern du vill "
 "ansluta till."
 
-msgid "Error. SSL support is not installed."
-msgstr "Fel. SSL-stöd är inte installerat."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Denna konferens har stängts. Inga fler meddelande kan bli skickade."
 
@@ -6132,25 +6233,32 @@ msgstr "Serveradress"
 msgid "Server port"
 msgstr "Serverport"
 
+msgid "Received unexpected response from "
+msgstr "Mottog oväntat svar från"
+
+#. username connecting too frequently
+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 ""
+"Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och "
+"prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
+
+#, c-format
+msgid "Error requesting "
+msgstr "Fel vid efterfrågan av"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL tillåter inte ditt skärmnamn att autentisera här"
+
 msgid "Could not join chat room"
 msgstr "Kunde inte ansluta till chatrummet"
 
 msgid "Invalid chat room name"
 msgstr "Ogiltigt namn på chatrum"
 
-msgid "Server closed the connection."
-msgstr "Servern stängde konversationen."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Tappade anslutningen med servern:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "Tog emot felaktig data vid anslutning till server."
+msgid "Received invalid data on connection with server"
+msgstr "Tog emot felaktig data vid anslutning till server"
 
 #. *< type
 #. *< ui_requirement
@@ -6198,7 +6306,7 @@ msgstr "Tappade anslutningen till motparten: <br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Tog emot felaktig data över anslutningen till motparten."
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "Kunde inte skapa en anslutning till motparten."
 
 msgid "Direct IM established"
@@ -6400,20 +6508,12 @@ msgstr "Kompiskommentar"
 
 # Osäker!!!
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"Kunde inte ansluta till autentiseringsserver:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "Kunde inte ansluta till autentiseringsserver: %s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Kunde inte ansluta till BOS-server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "Kan inte ansluta till BOS server: %s"
 
 msgid "Username sent"
 msgstr "Användarnamnet är skickat"
@@ -6427,52 +6527,59 @@ msgstr "Avsluta anslutning"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Kan inte logga in: Kunde inte ansluta som %s eftersom användarnamnet är "
-"ogiltigt.  Användarnamnet måste vara en giltig mejladress eller starta med "
-"en bokstav och får endast innehålla bokstäver, nummer och mellanslag, eller "
-"enbart innehålla nummer."
+"Kan inte logga in som %s eftersom användarnamnet är ogiltigt.  "
+"Användarnamnet måste vara en giltig epost-adress eller starta med en bokstav "
+"och får endast innehålla bokstäver, nummer och mellanslag, eller enbart "
+"innehålla nummer."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Ogiltigt användarnamn"
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Du kanske snart blir frånkopplad.  I så fall kan du kolla på %s efter "
+"uppdateringar."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kunde inte hämta en giltig AIM-inloggnings-hash."
+
+msgid "Unable to get a valid login hash."
+msgstr "Kunde inte hämta en giltig login-hash."
 
-msgid "Incorrect password."
-msgstr "Felaktigt lösenord."
+msgid "Received authorization"
+msgstr "Mottog auktorisering"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "Användarnamn finns inte"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "Ditt konto är avstängt för tillfället."
+msgid "Your account is currently suspended"
+msgstr "Ditt konto är avstängt för tillfället"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Tjänsten är tillfälligt onåbar."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och "
-"prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versionen av klienten du använder är för gammal. Uppgradera på %s"
 
-msgid "Could Not Connect"
-msgstr "Kunde inte ansluta"
-
-msgid "Received authorization"
-msgstr "Mottog auktorisering"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Du har anslutit och kopplat ifrån för ofta. Vänta tio minuter och prova "
+"igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
 
-msgid "The SecurID key entered is invalid."
-msgstr "SecurID-nyckeln som är angiven är ogiltig."
+msgid "The SecurID key entered is invalid"
+msgstr "SecurID-nyckeln som angavs är ogiltig"
 
 msgid "Enter SecurID"
 msgstr "Ange SecurID"
@@ -6480,28 +6587,6 @@ msgstr "Ange SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Slå in de 6 siffrorna från den digitala skärmen."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Du kanske snart blir frånkopplad.  I så fall kan du kolla på %s efter "
-"uppdateringar."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Kunde inte hämta en giltig AIM-inloggnings-hash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Du kanske snart blir frånkopplad. Kolla på %s efter uppdateringar."
-
-msgid "Unable to get a valid login hash."
-msgstr "Kunde inte hämta en giltig login-hash."
-
 msgid "Password sent"
 msgstr "Lösenord skickat"
 
@@ -6511,12 +6596,6 @@ msgstr "Kan inte skapa anslutning"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Snälla godkänn mig så jag kan lägga till dig till min kompislista."
 
-msgid "Authorization Request Message:"
-msgstr "Meddelande om auktoriseringsbegäran:"
-
-msgid "Please authorize me!"
-msgstr "Snälla auktorisera mig!"
-
 msgid "No reason given."
 msgstr "Ingen motivering angiven."
 
@@ -6640,7 +6719,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du missade %hu meddelande från %s av okända orsaker."
 msgstr[1] "Du missade %hu meddelanden från %s av okända orsaker."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan inte skicka meddelande: %s"
@@ -6662,6 +6741,9 @@ msgstr "Ansluten sedan"
 msgid "Member Since"
 msgstr "Medlem sedan"
 
+msgid "Capabilities"
+msgstr "Stödjer"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -6846,18 +6928,15 @@ msgstr "Frånvaromeddelandet är för långt."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Kunde inte lägga till kompisen %s eftersom användarnamnet är ogiltigt. "
-"Användarnamnet måste antingen vara en giltig mejladress, börja med en "
+"Kunde inte lägga till kompisen %s eftersom användarnamnet är ogiltigt.  "
+"Användarnamnet måste antingen vara en giltig epost-adress, börja med en "
 "bokstav och endast innehålla bokstäver, siffror och mellanslag eller bara "
 "innehålla siffror."
 
-msgid "Unable to Add"
-msgstr "Kunde inte lägga till"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Kunde inte hämta kompislista"
 
@@ -6874,7 +6953,7 @@ msgstr "Föräldralösa"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Kunde inte lägga till kompisen %s eftersom du har för många kompisar i din "
@@ -6884,7 +6963,7 @@ msgid "(no name)"
 msgstr "(inget namn)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Kunde inte lägga till kompisen %s av okänd anledning."
 
 #, c-format
@@ -7018,6 +7097,7 @@ msgstr "_Sök"
 msgid "Set User Info (web)..."
 msgstr "Ändra användarinformation (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Byt lösenord (web)"
 
@@ -7047,6 +7127,9 @@ msgstr "Sök efter kompis på e-postadress..."
 msgid "Search for Buddy by Information"
 msgstr "Sök efter kompis via information"
 
+msgid "Use clientLogin"
+msgstr "Använd klientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7236,6 +7319,34 @@ msgstr "Uppdatera"
 msgid "Could not change buddy information."
 msgstr "Kunde inte ändra kompisinformationen."
 
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Note"
+msgstr "Notering"
+
+#. callback
+msgid "Buddy Memo"
+msgstr "Kompismemo"
+
+msgid "Change his/her memo as you like"
+msgstr "Ändra hans/hennes memo som du vill"
+
+msgid "_Modify"
+msgstr "_Ändra"
+
+msgid "Memo Modify"
+msgstr "Ändra Memo"
+
+msgid "Server says:"
+msgstr "Servern säger:"
+
+msgid "Your request was accepted."
+msgstr "Din förfrågan accepterades."
+
+msgid "Your request was rejected."
+msgstr "Din förfrågan avvisades."
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u kräver verifikation"
@@ -7548,6 +7659,9 @@ msgstr "<p><b>Bekräftningar</b>:<br>\n"
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>Nogräknade testare</b>:<br>\n"
 
+msgid "and more, please let me know... thank you!))"
+msgstr "och fler, snälla berätta för mig... Tack!))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Och alla pojkarna i bakrummet...</i><br>\n"
 
@@ -7622,7 +7736,7 @@ msgstr "Livhållningsintervall (seconds)"
 msgid "Update interval (seconds)"
 msgstr "Uppdateringsintervall (seconds)"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Kan inte dekryptera serversvaret"
 
 #, c-format
@@ -7647,9 +7761,6 @@ msgstr "Registrering krävs"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Okänd svarskod vid inloggning (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Kan inte avkryptera inloggningssvaret"
-
 msgid "Requesting captcha"
 msgstr "Efterfrågar captcha"
 
@@ -7683,30 +7794,17 @@ msgstr ""
 "Okänd svarskod vid inloggning (0x%02X):\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Kan inte ansluta."
-
 msgid "Socket error"
 msgstr "Uttag-fel"
 
-msgid "Unable to read from socket"
-msgstr "Kan inte läsa från uttag"
-
-msgid "Write Error"
-msgstr "Skrivfel"
-
-msgid "Connection lost"
-msgstr "Anslutningen tappades"
-
 msgid "Getting server"
 msgstr "Hämtar server"
 
 msgid "Requesting token"
 msgstr "Efterfrågar polett"
 
-msgid "Couldn't resolve host"
-msgstr "Kunde ej slå upp värden"
+msgid "Unable to resolve hostname"
+msgstr "Kunde ej slå upp värdnamnet"
 
 msgid "Invalid server or port"
 msgstr "Ogiltig server eller port"
@@ -7759,8 +7857,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun Kommand"
 
-msgid "Could not decrypt login reply"
-msgstr "Kan inte avkryptera inloggningssvaret"
+msgid "Unable to decrypt login reply"
+msgstr "Kunde inte avkryptera inloggningssvaret"
 
 msgid "Unknown LOGIN CMD"
 msgstr "Okänd LOGIN CMD"
@@ -7779,9 +7877,6 @@ msgstr "Filsändning"
 msgid "%d canceled the transfer of %s"
 msgstr "%d avbröt överföringen av %s"
 
-msgid "Connection closed (writing)"
-msgstr "Anslutningen stängd (skrivande)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupptitel:</b> %s<br>"
@@ -7836,17 +7931,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametimeadministratörannonsering"
 
-msgid "Connection reset"
-msgstr "Anslutningen nollställd"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Fel vid läsning av från uttag %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Kan inte ansluta till värd"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Utskick från %s"
@@ -7869,6 +7953,9 @@ msgstr "Högtalare"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Filöverföringar"
+
 msgid "Supports"
 msgstr "Stödjer"
 
@@ -8587,9 +8674,6 @@ msgstr "Organisation"
 msgid "Unit"
 msgstr "Enhet"
 
-msgid "Note"
-msgstr "Notering"
-
 msgid "Join Chat"
 msgstr "Anslut till chatt"
 
@@ -8689,6 +8773,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Nätverksstatistik"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping misslyckades"
 
@@ -8752,7 +8839,7 @@ msgstr "Ej stödd publik nyckeltyp"
 msgid "Disconnected by server"
 msgstr "Frånkopplad av server"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Fel vid anslutning till SILC-server"
 
 msgid "Key Exchange failed"
@@ -8764,27 +8851,24 @@ msgstr ""
 "Misslyckades med att återuppta frånskild session. Tryck \"Återanslut\" för "
 "att skapa en ny uppkoppling."
 
-msgid "Connection failed"
-msgstr "Anslutning misslyckad"
-
 msgid "Performing key exchange"
 msgstr "Utför nyckelutbyte"
 
-msgid "Unable to create connection"
-msgstr "Kan inte skapa anslutning"
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Kunde inte ladda SILC nyckelpar"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Ansluter till SILC-server"
 
+msgid "Unable to not load SILC key pair"
+msgstr "Kunde inte ladda SILC nyckelpar"
+
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-msgid "Cannot initialize SILC protocol"
-msgstr "Kan inte inleda SILC-klientanslutning"
+msgid "Unable to initialize SILC protocol"
+msgstr "Kan inte initiera SILC-protokollet"
 
 msgid "Error loading SILC key pair"
 msgstr "Fel vid inläsning av SILC-nyckelpar"
@@ -9080,8 +9164,8 @@ msgstr "Signera och verifiera alla meddelanden digitalt"
 msgid "Creating SILC key pair..."
 msgstr "Skapa SILC-nyckelpar..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "Kunde inte skapa SILC-nyckelpar\n"
+msgid "Unable to create SILC key pair"
+msgstr "Kunde inte skapa SILC-nyckelpar"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9176,6 +9260,9 @@ msgstr "Whiteboard"
 msgid "No server statistics available"
 msgstr "Ingen serverstatistik tillgänglig"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Fel vid anslutning till SILC-server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Misslyckande: Versionerna matchar inte, upgradera din klient"
@@ -9217,30 +9304,24 @@ msgstr "Misslyckande: Felaktig cookie"
 msgid "Failure: Authentication failed"
 msgstr "Misslyckande: Autentisering misslyckades"
 
-msgid "Cannot initialize SILC Client connection"
-msgstr "Kan inte inleda SILC-klientanslutning"
+msgid "Unable to initialize SILC Client connection"
+msgstr "Kan inte initiera SILC-klientanslutning"
 
 msgid "John Noname"
 msgstr "John Namnlös"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Kunde inte ladda SILC nyckelpar: %s"
 
-msgid "Could not write"
-msgstr "Kunde inte skriva"
-
-msgid "Could not connect"
-msgstr "Kunde inte ansluta"
-
-msgid "Unknown server response."
-msgstr "Okänt serversvar."
+msgid "Unable to create connection"
+msgstr "Kan inte skapa anslutning"
 
-msgid "Could not create listen socket"
-msgstr "Kunde inte skapa lyssnarsocket"
+msgid "Unknown server response"
+msgstr "Okänt serversvar"
 
-msgid "Could not resolve hostname"
-msgstr "Kunde ej slå upp värden"
+msgid "Unable to create listen socket"
+msgstr "Kunde inte skapa lyssningsuttag"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-användarnamnet får inte innehålla mellanslag eller symbolen @"
@@ -9281,177 +9362,60 @@ msgstr "Autentisera användare"
 msgid "Auth Domain"
 msgstr "Autentiserad domän"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Slå upp %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Anslutning till %s misslyckades"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Inloggning: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Kan inte skriva filen %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Kan inte läsa filen %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Meddelandet är för långt, de sista %s byten klipptes bort."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s är inte inloggad för tillfället."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Varning för %s är inte tillåten."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Ett meddelande har kastats, du överskrider serverns hastighetsgräns."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chatt i %s är inte tillgänglig."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Du skickar meddelanden för snabbt till %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Du missade ett snabbmeddelande från %s eftersom det var för stort."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Du missade ett snabbmeddelande från %s eftersom det skickades för snabbt."
-
-#, c-format
-msgid "Failure."
-msgstr "Misslyckande."
-
-#, c-format
-msgid "Too many matches."
-msgstr "För många träffar."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Behöver fler kvalificerare."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Katalogtjänsten är tillfälligt onåbar."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "E-postuppslagning är begränsad."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Nyckelordet ignorerades."
-
-#, c-format
-msgid "No keywords."
-msgstr "Inga nyckelord."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Användaren har ingen kataloginformation."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Landet stöds inte."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Okänt misslyckande: %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Felaktigt användarnamn eller lösenord"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Tjänsten är tillfälligt onåbar."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Din varningsnivå är för tillfället för hög för att logga in."
-
-#, c-format
-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 ""
-"Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och "
-"prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Ett okänt inloggningsfel har inträffat: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Ett okänt fel, %d, har inträffat. Information: %s"
-
-msgid "Invalid Groupname"
-msgstr "Ogiltigt gruppnamn"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;rum&gt;:  Anslut till ett chatt-rum på Yahoo-nätverket"
 
-msgid "Connection Closed"
-msgstr "Anslutningen stängd"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Listar rummen på Yahoo's nätverk"
 
-msgid "Waiting for reply..."
-msgstr "Väntar på svar..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Fråga användaren angående att starta en kladd-session"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"TOC har kommit tillbaka från dess paus. Du kan nu skicka meddelanden igen."
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID..."
 
-msgid "Password Change Successful"
-msgstr "Lösenordsändring lyckades"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Insticksmodul för Yahoo-protokoll"
 
-msgid "_Group:"
-msgstr "_Grupp:"
+msgid "Pager server"
+msgstr "Sökarserver"
 
-msgid "Get Dir Info"
-msgstr "Hämta kataloginformation"
+msgid "Pager port"
+msgstr "Sökarport"
 
-msgid "Set Dir Info"
-msgstr "Ställ in kataloginformation"
+msgid "File transfer server"
+msgstr "Filöverföringsserver"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Kunde inte öppna %s för läsning!"
+msgid "File transfer port"
+msgstr "Port för filöverföring"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Filöverföringen misslyckades, antagligen eftersom andra sidan avbröt."
+msgid "Chat room locale"
+msgstr "Chatrummets språk"
 
-msgid "Could not connect for transfer."
-msgstr "Kunde inte ansluta för överföring."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorera inbjudningar till konferenser och chatrum"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Kunde inte skriva filhuvud, filen kommer inte att skickas."
+msgid "Chat room list URL"
+msgstr "URL för chattrumlista"
 
-msgid "Save As..."
-msgstr "Spara som..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo Chat-server"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s ber %s att acceptera %d fil: %s (%.2f %s)%s%s"
-msgstr[1] "%s ber %s att acceptera %d filer: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Chatt port"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s ber att du ska skicka denne en fil"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9463,12 +9427,11 @@ msgstr "%s ber att du ska skicka denne en fil"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Insticksmodul för TOC-protokoll"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Insticksmodul för Yahoo JAPAN protokoll"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s har skickat dig en webbkamerainbjudan, vilket ännu inte stöds."
+msgid "Your SMS was not delivered"
+msgstr "Ditt SMS levererades inte"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ditt Yahoo!-meddelande skickades inte."
@@ -9494,6 +9457,29 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Lägg till kompisavvisning"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "Tog emot felaktig data"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Kontot låst: För många inloggningsförsök.  Logga in på Yahoo!s hemsida kan "
+"fixa detta."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Kontot låst: Okänd anledning.  Logga in på Yahoo!s hemsida kan fixa detta."
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "Användarnamn eller lösenord saknas"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9526,37 +9512,26 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Okänt felnummer %d. Logga in på Yahoo!s hemsida kan fixa detta."
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "Kan inte lägga till kompis %s i grupp %s på serverlistan för konto %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "Kan inte lägga till kompis %s i grupp %s på serverlistan för konto %s "
 
-msgid "Could not add buddy to server list"
-msgstr "Kunde inte lägga till kompis i listan på servern"
+msgid "Unable to add buddy to server list"
+msgstr "Kunde inte lägga till kompis i serverlistan"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hörbar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr "Mottog oväntat HTTP-svar från servern."
-
-msgid "Connection problem"
-msgstr "Problem med anslutning"
+msgid "Received unexpected HTTP response from server"
+msgstr "Mottog oväntat HTTP-svar från servern"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"Tappade anslutningen med %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "Tappade anslutningen med %s: %s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Kunde inte skapa en anslutning med %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Kunde inte skapa en anslutning med %s: %s"
 
 msgid "Not at Home"
 msgstr "Inte hemma"
@@ -9603,8 +9578,8 @@ msgstr "Närvaroinställningar"
 msgid "Start Doodling"
 msgstr "Starta kladda"
 
-msgid "Activate which ID?"
-msgstr "Vilket ID ska aktiveras?"
+msgid "Select the ID you want to activate"
+msgstr "Välj det ID du vill aktivera"
 
 msgid "Join whom in chat?"
 msgstr "Gå med vem in i chatten?"
@@ -9618,73 +9593,15 @@ msgstr "Gå med användare i chatt..."
 msgid "Open Inbox"
 msgstr "Öppna Inkorg"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;rum&gt;:  Anslut till ett chatt-rum på Yahoo-nätverket"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Listar rummen på Yahoo's nätverk"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Fråga användaren angående att starta en kladd-session"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Insticksmodul för Yahoo-protokoll"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Sökarserver"
-
-msgid "Japan Pager server"
-msgstr "Japan Sökarserver"
-
-msgid "Pager port"
-msgstr "Sökarport"
-
-msgid "File transfer server"
-msgstr "Filöverföringsserver"
-
-msgid "Japan file transfer server"
-msgstr "Japan filöverföringsserver"
-
-msgid "File transfer port"
-msgstr "Port för filöverföring"
-
-msgid "Chat room locale"
-msgstr "Chatrummets språk"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorera inbjudningar till konferenser och chatrum"
-
-msgid "Chat room list URL"
-msgstr "URL för chattrumlista"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Chat-server"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chatt port"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Skickade Doodle-förfrågan."
 
+msgid "Unable to connect."
+msgstr "Kan inte ansluta."
+
 msgid "Unable to establish file descriptor."
 msgstr "Kan inte inte etablera filbeskrivning."
 
@@ -9692,6 +9609,9 @@ msgstr "Kan inte inte etablera filbeskrivning."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s försöker skicka en grupp av %d filer till dig.\n"
 
+msgid "Write Error"
+msgstr "Skrivfel"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profil"
 
@@ -9803,22 +9723,17 @@ msgstr "Röster"
 msgid "Webcams"
 msgstr "Webbkamera"
 
+msgid "Connection problem"
+msgstr "Problem med anslutning"
+
 msgid "Unable to fetch room list."
 msgstr "Kan inte hämta rumlista."
 
 msgid "User Rooms"
 msgstr "Användarrum"
 
-msgid "Connection problem with the YCHT server."
-msgstr "Problem med anslutning till YCHT-server."
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Tappade anslutningen till servern\n"
-"%s"
+msgid "Connection problem with the YCHT server"
+msgstr "Anslutningsproblem till YCHT-server"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9949,32 +9864,21 @@ msgid "Exposure"
 msgstr "Exponering"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Kan inte skapa uttag:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Kan inte tolka svaret från HTTP-proxyn: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Kan inte tolka svaret från HTTP-proxyn: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxyanslutningsfel %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Åtkomst nekad: HTTP-proxyservern tillåter inte tunnel på port %d."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "Åtkomst nekad: HTTP-proxyservern tillåter inte tunnel på port %d"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fel vid uppslagning av %s"
 
-msgid "Could not resolve host name"
-msgstr "Kunde inte slå upp värdnamnet"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Efterfrågar %s's uppmärksamhet..."
@@ -10061,9 +9965,6 @@ msgstr "Stör inte"
 msgid "Extended away"
 msgstr "Utökad frånvaro"
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Listening to music"
 msgstr "Lyssnar på musik"
 
@@ -10105,18 +10006,6 @@ msgstr "+++ %s har blivit aktiv"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Fel vid läsning av %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Ett fel upptäcktes vid inläsandet av din %s. De har inte laddats och den "
-"gamla har blivit flyttad till %s~."
-
 msgid "Calculating..."
 msgstr "Beräknar..."
 
@@ -10225,6 +10114,18 @@ msgstr "Anslutningen nekades."
 msgid "Address already in use."
 msgstr "Adressen används redan"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Fel vid läsning av %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Ett fel upptäcktes vid inläsandet av din %s. Filen har inte laddats och den "
+"gamla har blivit flyttad till %s~."
+
 msgid "Internet Messenger"
 msgstr "Meddelandeklient"
 
@@ -10267,10 +10168,8 @@ msgstr "Rapportera ny e-_post"
 msgid "Use this buddy _icon for this account:"
 msgstr "Använd denna kompis_ikon för detta konto:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s-alternativ"
+msgid "Ad_vanced"
+msgstr "A_vancerat"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Använd GNOME proxyinställningar"
@@ -10305,9 +10204,6 @@ msgstr "Om du tittar riktigt nära"
 msgid "you can see the butterflies mating"
 msgstr "kan du se fjärilarna para sig"
 
-msgid "Proxy Options"
-msgstr "Proxyalternativ"
-
 msgid "Proxy _type:"
 msgstr "Proxy_typ:"
 
@@ -10335,8 +10231,8 @@ msgstr "_Basic"
 msgid "Create _this new account on the server"
 msgstr "Skapa detta _nya kontot på servern"
 
-msgid "_Advanced"
-msgstr "_Avancerat"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Aktiverad"
@@ -10386,16 +10282,16 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Var vänlig uppdatera de nödvändiga fälten."
 
-msgid "Room _List"
-msgstr "Rums_lista"
+msgid "A_ccount"
+msgstr "_Konto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Var god ange information om chatten du vill ansluta till.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Rums_lista"
 
 msgid "_Block"
 msgstr "_Blockera"
@@ -10412,6 +10308,15 @@ msgstr "Hämta _info"
 msgid "I_M"
 msgstr "_Meddelande"
 
+msgid "_Audio Call"
+msgstr "_Ljudsamtal"
+
+msgid "Audio/_Video Call"
+msgstr "Ljud/_Videosamtal"
+
+msgid "_Video Call"
+msgstr "_Videosamtal"
+
 msgid "_Send File..."
 msgstr "_Skicka fil..."
 
@@ -10421,8 +10326,11 @@ msgstr "Lägg till kom_pisnotifiering..."
 msgid "View _Log"
 msgstr "Visa _logg"
 
-msgid "Hide when offline"
-msgstr "Dölj om frånkopplade"
+msgid "Hide When Offline"
+msgstr "Dölj när frånkopplad"
+
+msgid "Show When Offline"
+msgstr "Visa när frånkopplade"
 
 msgid "_Alias..."
 msgstr "_Alias..."
@@ -10548,6 +10456,9 @@ msgstr "/Verktyg/Kom_pisnotifieringar"
 msgid "/Tools/_Certificates"
 msgstr "/Verktyg/_Certifikat"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Verktyg/Egna Smile_ys"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Verktyg/Insticksmodu_ler"
 
@@ -10557,9 +10468,6 @@ msgstr "/Verktyg/_Inställningar"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktyg/_Spärrlista"
 
-msgid "/Tools/Smile_y"
-msgstr "/Verktyg/Smile_y"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Verktyg/_Filöverföringar"
 
@@ -10677,8 +10585,8 @@ msgstr "Manuellt"
 msgid "By status"
 msgstr "Efter status"
 
-msgid "By log size"
-msgstr "Efter loggstorlek"
+msgid "By recent log activity"
+msgstr "Efter nylig aktivitet i loggen"
 
 #, c-format
 msgid "%s disconnected"
@@ -10694,6 +10602,9 @@ msgstr "Återanslut"
 msgid "Re-enable"
 msgstr "Återaktivera konto"
 
+msgid "SSL FAQs"
+msgstr "SSL FAQs"
+
 msgid "Welcome back!"
 msgstr "Välkommen tillbaka"
 
@@ -10783,6 +10694,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "A_lias:"
 
+msgid "_Group:"
+msgstr "_Grupp:"
+
 msgid "Auto_join when account becomes online."
 msgstr "_Gå med automatiskt då kontot är anslutet."
 
@@ -10816,6 +10730,103 @@ msgstr "/Verktyg"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kompisar/Sortera kompisar"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Bakgrundsfärg"
+
+msgid "The background color for the buddy list"
+msgstr "Bakgrundsfärgen för kompislistan"
+
+msgid "Layout"
+msgstr "Utseende"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "Utseendet på ikoner, namn och status i kompislistan"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "Expanderad bakgrundsfärg"
+
+msgid "The background color of an expanded group"
+msgstr "Bakgrundsfärgen på en expanderad grupp"
+
+msgid "Expanded Text"
+msgstr "Expanderad text"
+
+msgid "The text information for when a group is expanded"
+msgstr "Textinformationen för när en grupp är expanderad"
+
+msgid "Collapsed Background Color"
+msgstr "Ihopfälld bakgrundsfärg"
+
+msgid "The background color of a collapsed group"
+msgstr "Bakgrundfärgen för en ihopfälld grupp"
+
+msgid "Collapsed Text"
+msgstr "Ihopfälld text"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Textinformationen för när en grupp är ihopfälld"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "Kontakt/Chatt-bakgrundsfärg"
+
+msgid "The background color of a contact or chat"
+msgstr "Bakgrundsfärgen för en kontakt eller chatt"
+
+msgid "Contact Text"
+msgstr "Kontakttext"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Textinformationen för när en kontakt är expanderad"
+
+msgid "On-line Text"
+msgstr "Ansluten-text"
+
+msgid "The text information for when a buddy is online"
+msgstr "Textinformationen för när en kompis är ansluten"
+
+msgid "Away Text"
+msgstr "Frånvarotext"
+
+msgid "The text information for when a buddy is away"
+msgstr "Textinformationen för när en kompis är borta"
+
+msgid "Off-line Text"
+msgstr "Frånkopplad-text"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "Textinformationen för när en kompis är frånkopplad"
+
+msgid "Idle Text"
+msgstr "Vilotext"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Textinformationen för när en kompis är vilande"
+
+msgid "Message Text"
+msgstr "Meddelandetext"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Textinformationen för när en kompis har ett oläst meddelande"
+
+msgid "Message (Nick Said) Text"
+msgstr "Meddelande (Smeknamn nämnt) Text"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+"Textinformationen för när en chatt har ett oläst meddelande som nämner ditt "
+"namn"
+
+msgid "The text information for a buddy's status"
+msgstr "Textinformationen för en kompis status"
+
+msgid "Type the host name for this certificate."
+msgstr "Ange värdnamnet för detta certifikatet."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-Server"
@@ -10835,14 +10846,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Bjud in kompis till chattrum"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Ange namnet på den användare du vill bjuda in, samt ett "
-"inbjudningsmeddelande om du vill"
-
 msgid "_Buddy:"
 msgstr "_Kompis:"
 
@@ -10871,7 +10874,7 @@ msgstr "Ignorera"
 msgid "Get Away Message"
 msgstr "Hämta frånvaromeddelande"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "Senast sagt"
 
 msgid "Unable to save icon file to disk."
@@ -10917,6 +10920,18 @@ msgstr "/Konversation/_Spara som..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Konversation/_Rensa tillbakablick"
 
+msgid "/Conversation/M_edia"
+msgstr "/Konversation/M_er"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Konversation/Media/_Ljudsamtal"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Konversation/Media/_Videosamtal"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Konversation/Media/Ljud\\/Video_samtal"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konversation/S_kicka fil..."
 
@@ -10991,6 +11006,15 @@ msgstr "/Konversation"
 msgid "/Conversation/View Log"
 msgstr "/Konversation/Visa logg"
 
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Konversation/Media/Ljudsamtal"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/Konversation/Media/Videosamtal"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Konversation/Media/Ljud\\/Videosamtal"
+
 msgid "/Conversation/Send File..."
 msgstr "/Konversation/Skicka fil..."
 
@@ -11171,7 +11195,10 @@ msgstr "artist"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"
+
+msgid "voice and video"
+msgstr "röst och video"
 
 msgid "support"
 msgstr "support"
@@ -11303,6 +11330,9 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Ungerska"
 
+msgid "Armenian"
+msgstr "Armeniska"
+
 msgid "Indonesian"
 msgstr "Indonesiska"
 
@@ -11318,6 +11348,9 @@ msgstr "Georgiska"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu Georgiska översättare"
 
+msgid "Khmer"
+msgstr "Khmer"
+
 msgid "Kannada"
 msgstr "Kannada"
 
@@ -11396,6 +11429,9 @@ msgstr "Singalesiska"
 msgid "Swedish"
 msgstr "Svenska"
 
+msgid "Swahili"
+msgstr "Swahili"
+
 msgid "Tamil"
 msgstr "Tamilska"
 
@@ -11727,8 +11763,8 @@ msgstr "Färg som länkar ska ha."
 msgid "Hyperlink visited color"
 msgstr "Färg på besökta hyperlänkar"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
-msgstr "Färgen länkar ska skrivas i när de har besökts (eller aktiverats)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr "Färgen för länkar när de har besökts (eller aktiverats)."
 
 # "utpekade" var det bästa ord jag kunde komma på.
 msgid "Hyperlink prelight color"
@@ -11766,14 +11802,20 @@ msgstr "Färgen att skriva namnet i ett actionmeddelande."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Actionmeddelandens namnfärg"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "Färgen för namnet i ett viskat aktionsmeddelande."
+
 msgid "Whisper Message Name Color"
 msgstr "Viskade meddelandens namnfärg"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "Färgen för namnet i ett viskat meddelande."
+
 msgid "Typing notification color"
 msgstr "Färg på notifiering"
 
-msgid "The color to use for the typing notification font"
-msgstr "Färgen används för skriftnotifiering"
+msgid "The color to use for the typing notification"
+msgstr "Färgen för skriftnotifiering"
 
 msgid "Typing notification font"
 msgstr "Typsnitt för skriftnotifiering"
@@ -11784,15 +11826,6 @@ msgstr "Typsnittet använt för skrivnotifieringen"
 msgid "Enable typing notification"
 msgstr "Aktivera skriftnotifiering"
 
-msgid "_Copy Email Address"
-msgstr "_Kopiera e-postadress"
-
-msgid "_Open Link in Browser"
-msgstr "_Öppna länk i webbläsare"
-
-msgid "_Copy Link Location"
-msgstr "_Kopiera länk"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11834,11 +11867,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Spara bild"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Spara bild..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "Lägg till egen smiley..."
 
@@ -11899,7 +11930,7 @@ msgid "This theme has no available smileys."
 msgstr "Detta tema har inga tillgängliga smileys."
 
 msgid "_Font"
-msgstr "_Typsnitt"
+msgstr "_Formatering"
 
 msgid "Group Items"
 msgstr "Gruppera föremål"
@@ -11928,9 +11959,6 @@ msgstr "Minska Typsnittsstorlek"
 msgid "Font Face"
 msgstr "Typsnitt"
 
-msgid "Background Color"
-msgstr "Bakgrundsfärg"
-
 msgid "Foreground Color"
 msgstr "Förgrundsfärg"
 
@@ -11969,7 +11997,7 @@ msgstr "<span size='smaller'>_Mindre</span>"
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
 msgid "_Font face"
-msgstr "_Typsnittsansikte"
+msgstr "_Typsnitt"
 
 msgid "Foreground _color"
 msgstr "_Förgrundsfärg"
@@ -12048,6 +12076,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12062,6 +12091,7 @@ msgstr ""
 "\n"
 "  -c, --config=KATALOG   använd KATALOG för konfigurationsfiler\n"
 "  -d, --debug         skriv felsökningsinformation till standardut\n"
+"  -f, --force-online  tvinga att ansluta, oavsätt nätverksstatus\n"
 "  -h, --help          visa denna hjälp och avsluta\n"
 "  -m, --multiple      begränsar inte till en enda process\n"
 "  -n, --nologin       logga inte in automatiskt\n"
@@ -12078,6 +12108,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12091,6 +12122,7 @@ msgstr ""
 "\n"
 "  -c, --config=KATALOG   använd KATALOG för konfigurationsfiler\n"
 "  -d, --debug         skriv felsökningsinformation till standardut\n"
+"  -f, --force-online  tvinga att ansluta, oavsätt nätverksstatus\n"
 "  -h, --help          visa denna hjälp och avsluta\n"
 "  -m, --multiple      begränsar inte till en enda process\n"
 "  -n, --nologin       logga inte in automatiskt\n"
@@ -12136,11 +12168,22 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Avslutar på grund av att en annan libpurple-klient redan körs.\n"
 
-msgid "Open All Messages"
-msgstr "Öppna alla meddelanden"
+msgid "/_Media"
+msgstr "/_Media"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-post!!</span>"
+msgid "/Media/_Hangup"
+msgstr "/Media/_Lägg på"
+
+msgid "Calling..."
+msgstr "Ringer..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s önskar påbörja en ljud/videosession med dig."
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s önskar påbörja en videosession med dig."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12169,6 +12212,24 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Manuellt webbläsarkommando har valts, men inget kommando angivits."
 
+msgid "No message"
+msgstr "Inget meddelande"
+
+msgid "Open All Messages"
+msgstr "Öppna alla meddelanden"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-post!!</span>"
+
+msgid "New Pounces"
+msgstr "Ny kompisnotifieringar"
+
+msgid "Dismiss"
+msgstr "Avfärda"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har notifierat!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "De följande modulerna kommer avladdas."
 
@@ -12217,10 +12278,16 @@ msgstr "<b>Detaljer för modul</b>"
 msgid "Select a file"
 msgstr "Välj en fil"
 
+msgid "Modify Buddy Pounce"
+msgstr "Ändra kompisnotifiering"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Notifiera vem"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "K_ompisnamn:"
 
@@ -12287,8 +12354,58 @@ msgstr "Åte_rkommande"
 msgid "Pounce Target"
 msgstr "Notifiera mål"
 
-msgid "Smiley theme failed to unpack."
-msgstr "Smiley temat kunde inte packas upp."
+#, c-format
+msgid "Started typing"
+msgstr "Började skriva"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "Pausade i skrivandet"
+
+#, c-format
+msgid "Signed on"
+msgstr "Anslöt"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "Återvände från vilande"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "Återvände från frånvaro"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "Slutade skriva"
+
+#, c-format
+msgid "Signed off"
+msgstr "Kopplade ifrån"
+
+#, c-format
+msgid "Became idle"
+msgstr "Blev inaktiv"
+
+#, c-format
+msgid "Went away"
+msgstr "Försvann"
+
+#, c-format
+msgid "Sent a message"
+msgstr "Skicka ett meddelande"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Okänd... Var snäll och rapportera detta!"
+
+msgid "Theme failed to unpack."
+msgstr "Temat kunde inte packas upp."
+
+msgid "Theme failed to load."
+msgstr "Temat kunde inte läsas in."
+
+msgid "Theme failed to copy."
+msgstr "Temat kunde inte kopieras."
 
 msgid "Install Theme"
 msgstr "Installera tema"
@@ -12309,6 +12426,11 @@ msgstr "Tangentbordsgenvägar"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Stäng konversationsfönster med Escape-knappen"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "Tema för Kompislista"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Systempanelikon"
 
@@ -12318,8 +12440,8 @@ msgstr "Vi_sa systempanelsikon:"
 msgid "On unread messages"
 msgstr "Vid olästa meddelanden"
 
-msgid "Conversation Window Hiding"
-msgstr "Dölj konversationsfönster"
+msgid "Conversation Window"
+msgstr "Konversationsfönster"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Dölj nya IM-konversationer:"
@@ -12327,6 +12449,9 @@ msgstr "_Dölj nya IM-konversationer:"
 msgid "When away"
 msgstr "Vid frånvaro"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_Minimera nya konversationsfönstret"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Flikar"
@@ -12385,9 +12510,6 @@ msgstr "Använd mjuk rullning"
 msgid "F_lash window when IMs are received"
 msgstr "B_linka med fönstret när meddelanden tagits emot"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_Minimera nya konversationsfönstret"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minsta höjd i rader på inmatningsfältet:"
 
@@ -12419,14 +12541,12 @@ msgstr "Kan inte starta konfigurationsprogrammet för proxy."
 msgid "Cannot start browser configuration program."
 msgstr "Kan inte starta konfigurationsprogrammet för webbläsaren"
 
-msgid "ST_UN server:"
-msgstr "ST_UN-server:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exempel: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "Känn av IP-adress _automatiskt"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Använda _automatiskt avkänd IP-adress: %s"
 
 msgid "Public _IP:"
 msgstr "Publik _IP-adress:"
@@ -12446,6 +12566,10 @@ msgstr "_Startport:"
 msgid "_End port:"
 msgstr "_Slutport:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "Återsändningsserver (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxyserver &amp; Webbläsare"
 
@@ -12636,12 +12760,12 @@ msgstr "Vid både frånvaro och inaktivitet"
 msgid "Auto-away"
 msgstr "Automatisk frånvaro"
 
-msgid "Change status when _idle"
-msgstr "Ändra status vid _inaktivitet"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuter innan du räknas som inaktiv:"
 
+msgid "Change status when _idle"
+msgstr "Ändra status vid _inaktivitet"
+
 msgid "Change _status to:"
 msgstr "Ändra _status till:"
 
@@ -12790,47 +12914,44 @@ msgstr "Spara & An_vänd"
 msgid "Status for %s"
 msgstr "Status för %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"En egen smiley för '%s' existerar redan. Var vänlig ange en annorlunda "
+"genväg."
+
 msgid "Custom Smiley"
 msgstr "Egen Smiley"
 
-msgid "More Data needed"
-msgstr "Mer Data behövs"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Var god ange en genväg att assocciera med den valda smileyn."
-
 msgid "Duplicate Shortcut"
 msgstr "Genvägen är upptagen"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"En egen smiley för den valda genvägen existerar redan. Var vänlig ange en "
-"annorlunda genväg."
-
-msgid "Please select an image for the smiley."
-msgstr "Ange en bild för smileyn."
-
 msgid "Edit Smiley"
 msgstr "Redigera Smiley"
 
 msgid "Add Smiley"
 msgstr "Lägg till Smiley"
 
-msgid "Smiley _Image"
-msgstr "Smiley-_bild"
+msgid "_Image:"
+msgstr "B_ild:"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Smiley-_genväg"
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "_Genvägstext:"
 
 msgid "Smiley"
 msgstr "Smiley"
 
+msgid "Shortcut Text"
+msgstr "Genvägstext"
+
 msgid "Custom Smiley Manager"
 msgstr "Hanterare för egna Smileys"
 
+msgid "Select Buddy Icon"
+msgstr "Välj kompisikon"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klicka här för att ändra kompisikon för detta konto."
 
@@ -12915,8 +13036,8 @@ msgid "Cannot send launcher"
 msgstr "Kan inte skicka startare"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Du drog en skrivbordsstartare. Antagligen ville du skicka vad som startaren "
 "pekar på istället för startaren själv."
@@ -12951,9 +13072,30 @@ msgid ""
 msgstr ""
 "Kunde inte öppna bilden '%s' av okänd anledning. Troligtvis är filen trasig."
 
+msgid "_Open Link"
+msgstr "_Öppna länk"
+
+msgid "_Copy Link Location"
+msgstr "_Kopiera länk"
+
+msgid "_Copy Email Address"
+msgstr "_Kopiera e-postadress"
+
+msgid "_Open File"
+msgstr "_Öppna fil"
+
+msgid "Open _Containing Directory"
+msgstr "Öppna _inehållande katalog"
+
 msgid "Save File"
 msgstr "Spara fil"
 
+msgid "_Play Sound"
+msgstr "S_pela upp ljud"
+
+msgid "_Save File"
+msgstr "_Spara fil"
+
 msgid "Select color"
 msgstr "Välj färg"
 
@@ -13041,6 +13183,67 @@ msgstr "Modul för förutspå kontaktens tillgänglighet"
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Visar statistik om dina kompisars tillgänglighet"
 
+msgid "Server name request"
+msgstr "Servernamnsförfrågan"
+
+msgid "Enter an XMPP Server"
+msgstr "Ange en XMPP-server"
+
+msgid "Select an XMPP server to query"
+msgstr "Välj en XMPP-server att fråga"
+
+msgid "Find Services"
+msgstr "Hitta tjänst"
+
+msgid "Add to Buddy List"
+msgstr "Lägg till på kompislistan"
+
+msgid "Gateway"
+msgstr "Inkörsport"
+
+msgid "Directory"
+msgstr "Katalog"
+
+msgid "PubSub Collection"
+msgstr "PubSub-samling"
+
+# Vad är PubSub? Hittar bara antydningar till en sökmotor med speciella möjligheter för uppföljning. Är det den som avses?
+msgid "PubSub Leaf"
+msgstr "PubSub-löv"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Beskrivning:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Tjänsteupptäckning"
+
+msgid "_Browse"
+msgstr "_Bläddra"
+
+msgid "Server does not exist"
+msgstr "Servern finns inte"
+
+msgid "Server does not support service discovery"
+msgstr "Servern stödjer inte tjänsteupptäckning"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP Tjänsteupptäckning"
+
+msgid "Allows browsing and registering services."
+msgstr "Tillåter att bläddra och registrera service."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Denna modul är användbar för registrering till äldre transportörer eller "
+"andra XMPP-tjänster."
+
 msgid "Buddy is idle"
 msgstr "Kompisen är inaktiv"
 
@@ -13433,7 +13636,7 @@ msgstr "Music Messaging-modul för gemensam komponering."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Music Messaging-modulen tillåter ett antal användare att samtidigt arbeta på "
 "ett stycke musik genom att editera ett gemensamt notblad i realtid."
@@ -13547,12 +13750,6 @@ msgstr ""
 "- Den sänder ett meddelande till personerna på din kompislista direkt när du "
 "loggar in"
 
-msgid "Cursor Color"
-msgstr "Färg på markören"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekundär färg på markören"
-
 msgid "Hyperlink Color"
 msgstr "Färg på länkar"
 
@@ -13562,6 +13759,9 @@ msgstr "Färg för besökta hyperlänkar"
 msgid "Highlighted Message Name Color"
 msgstr "Färg på namn i markerade färger"
 
+msgid "Typing Notification Color"
+msgstr "Färg på skrivnotifiering"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horisontal separation"
 
@@ -13591,36 +13791,21 @@ msgstr "GTK+ Gränssnittstypsnitt"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Textgenvägstema"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Gränssnittsfärger"
+msgid "Disable Typing Notification Text"
+msgstr "Avaktivera skriftnotifieringstext"
 
-# Osäker: Finns smidigare lösning?
-msgid "Widget Sizes"
-msgstr "Storlek på grafiska element"
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ temakontroll"
+
+msgid "Colors"
+msgstr "Färger"
 
 msgid "Fonts"
 msgstr "Typsnitt"
 
+msgid "Miscellaneous"
+msgstr "Diverse"
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc filverktyg"
 
@@ -13707,8 +13892,10 @@ msgstr "Skicka-knapp i konversationsfönster"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
-msgstr "Lägger till en \"Skicka\" knapp till konversationsfönstret. "
+"for use when no physical keyboard is present."
+msgstr ""
+"Lägger till en Skicka knapp till konversationsfönstret. För att användas när "
+"inget fysiskt tangentbord finns."
 
 msgid "Duplicate Correction"
 msgstr "Dublettkorrigering"
@@ -13760,6 +13947,95 @@ msgstr "Textersättning"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Ersätter text i utgående meddelanden enligt dina egna regler."
 
+msgid "Just logged in"
+msgstr "Precis inloggad"
+
+msgid "Just logged out"
+msgstr "Precis utloggad"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"Ikon för kontakt\n"
+"Ikon för okänd person"
+
+msgid "Icon for Chat"
+msgstr "Ikon för chatt"
+
+msgid "Ignored"
+msgstr "Ignorerad"
+
+msgid "Founder"
+msgstr "Grundare"
+
+msgid "Operator"
+msgstr "Operatör"
+
+msgid "Half Operator"
+msgstr "Halvoperatör"
+
+msgid "Authorization dialog"
+msgstr "Auktoriseringsdialog"
+
+msgid "Error dialog"
+msgstr "Feldialog"
+
+msgid "Information dialog"
+msgstr "Informationsdialog"
+
+msgid "Mail dialog"
+msgstr "Postdialog"
+
+msgid "Question dialog"
+msgstr "Förfrågningsdialog"
+
+msgid "Warning dialog"
+msgstr "Varningsdialog"
+
+msgid "What kind of dialog is this?"
+msgstr "Vilken sorts dialog är detta?"
+
+msgid "Status Icons"
+msgstr "Statusikoner"
+
+msgid "Chatroom Emblems"
+msgstr "Chatrumsemblem"
+
+msgid "Dialog Icons"
+msgstr "Dialogikon"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin ikontema-redigerare"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin Redigerare för Kompislistans tema"
+
+msgid "Edit Buddylist Theme"
+msgstr "Redigera Kompislistans tema"
+
+msgid "Edit Icon Theme"
+msgstr "Redigera ikontema"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin Temaredigerare"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin Temaredigerare."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13928,9 +14204,9 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Inställningar specifika för Pidgin i Windows."
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Tillhandahåller insällningar specifika för Pidgion i Windows såsom dockning "
+"Tillhandahåller inställningar specifika för Pidgin i Windows såsom dockning "
 "av kompislistan."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13970,6 +14246,494 @@ msgstr "Skicka och ta emot råa XMPP strofer."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Kan inte öppna uttag"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Kunde inte lyssna på uttag"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Kan inte läsa från uttag"
+
+#~ msgid "Connection failed."
+#~ msgstr "Anslutning misslyckad"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Servern har kopplat ifrån"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Kunde inte skapa socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Kunde inte ansluta till värden"
+
+#~ msgid "Read error"
+#~ msgstr "Läsfel"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunde inte skapa en anslutning med servern:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Skrivfel"
+
+#~ msgid "Last Activity"
+#~ msgstr "Senaste aktivitet"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Tjänstupptäckningsföremål"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Utökad Strofadressering"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Månganvändarchatt"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band Byteströmmar"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "'Ad-Hoc' Kommandon"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Byteströmmar"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+# Vad menas med In-Band, när används och vad blir då lämplig översättning? Denna har antagligen något med "Out-of-Band att göra men hur hänger de ihop?
+#~ msgid "In-Band Registration"
+#~ msgstr "In-Bandsregistrering"
+
+#~ msgid "User Location"
+#~ msgstr "Placering"
+
+#~ msgid "User Avatar"
+#~ msgstr "Användar-avatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Chatt-status notifieringar"
+
+#~ msgid "Software Version"
+#~ msgstr "Mjukvaruversion"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Ströminitiering"
+
+#~ msgid "User Mood"
+#~ msgstr "Användarhumör"
+
+#~ msgid "User Activity"
+#~ msgstr "Användaraktivitet"
+
+# Låter mysko, vet inte i vilket sammanhang.
+#~ msgid "Entity Capabilities"
+#~ msgstr "Existensmöjligheter"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Förhandlingar om krypterade sessioner"
+
+#~ msgid "User Tune"
+#~ msgstr "Användarlåt"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Listinnehållsutbyte"
+
+# Vet inte om detta är bästa, men...
+#~ msgid "Reachability Address"
+#~ msgstr "Nåbar adress"
+
+#~ msgid "User Profile"
+#~ msgstr "Användarprofil"
+
+#~ msgid "Jingle"
+#~ msgstr "Ramsa"
+
+# Vad är dessa?
+#~ msgid "Jingle Audio"
+#~ msgstr "Sångsnutt"
+
+#~ msgid "User Nickname"
+#~ msgstr "Användarsmeknamn"
+
+# Vad är dessa?
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Ramsa ICE UDP"
+
+# Vad är dessa?
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Ramsa ICE TCP"
+
+# Vad är dessa?
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Ramsa Rå UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Ramsa Video"
+
+# Vad är dessa?
+#~ msgid "Jingle DTMF"
+#~ msgstr "Ramsa DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Meddelandekvitton"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publik nyckelpublisering"
+
+#~ msgid "User Chatting"
+#~ msgstr "Användarchattning"
+
+#~ msgid "User Browsing"
+#~ msgstr "Användarbläddring"
+
+#~ msgid "User Gaming"
+#~ msgstr "Användarspelning"
+
+#~ msgid "User Viewing"
+#~ msgstr "Användarvisning"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Strofkryptering"
+
+#~ msgid "Entity Time"
+#~ msgstr "Enhet Tid"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Försenad försändelse"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Kollebrationsdata objekt"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Filförvaringsplats och Delning"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN Serviceupptäckning för Ramsor"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Simpel crypterad session förhandling"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hoppkontroll"
+
+#~ msgid "Read Error"
+#~ msgstr "Läsfel"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Kunde inte ansluta till servern."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Läsbuffert full (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Otolkbart meddelande"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Kunde inte ansluta till värd: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Inloggningen misslyckades (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Du har blivit utloggad eftersom du loggat in från en annan dator."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Fel. SSL-stöd är inte installerat."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunde inte ansluta till BOS-server:\n"
+#~ "%s"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ogiltigt användarnamn"
+
+#~ msgid "Incorrect password."
+#~ msgstr "Felaktigt lösenord."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Kunde inte ansluta"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Du kanske snart blir frånkopplad. Kolla på %s efter uppdateringar."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Kan inte avkryptera inloggningssvaret"
+
+#~ msgid "Connection lost"
+#~ msgstr "Anslutningen tappades"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Kunde ej slå upp värden"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Anslutningen stängd (skrivande)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Anslutningen nollställd"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Fel vid läsning av från uttag %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Kan inte ansluta till värd"
+
+#~ msgid "Could not write"
+#~ msgstr "Kunde inte skriva"
+
+#~ msgid "Could not connect"
+#~ msgstr "Kunde inte ansluta"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kunde inte skapa lyssnarsocket"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunde inte skapa en anslutning med %s:\n"
+#~ "%s"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Vilket ID ska aktiveras?"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan Sökarserver"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan filöverföringsserver"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tappade anslutningen till servern\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Kunde inte slå upp värdnamnet"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Servern kräver TLS/SSL vid inloggning. Hittade inget stöd för TLS/SSL."
+
+#~ msgid "_Proxy"
+#~ msgstr "_Proxy"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Dölj konversationsfönster"
+
+#~ msgid "More Data needed"
+#~ msgstr "Mer Data behövs"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Var god ange en genväg att assocciera med den valda smileyn."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Ange en bild för smileyn."
+
+#~ msgid "Cursor Color"
+#~ msgstr "Färg på markören"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Sekundär färg på markören"
+
+#~ msgid "Interface colors"
+#~ msgstr "Gränssnittsfärger"
+
+# Osäker: Finns smidigare lösning?
+#~ msgid "Widget Sizes"
+#~ msgstr "Storlek på grafiska element"
+
+#~ msgid "Invite message"
+#~ msgstr "Inbjudningsmeddelande"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Ange namnet på den användare du vill bjuda in,\n"
+#~ "samt ett inbjudningsmeddelande om du vill"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Slå upp %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Anslutning till %s misslyckades"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Inloggning: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Kan inte skriva filen %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Kan inte läsa filen %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Meddelandet är för långt, de sista %s byten klipptes bort."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s är inte inloggad för tillfället."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Varning för %s är inte tillåten."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "Ett meddelande har kastats, du överskrider serverns hastighetsgräns."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Chatt i %s är inte tillgänglig."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Du skickar meddelanden för snabbt till %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Du missade ett snabbmeddelande från %s eftersom det var för stort."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Du missade ett snabbmeddelande från %s eftersom det skickades för snabbt."
+
+#~ msgid "Failure."
+#~ msgstr "Misslyckande."
+
+#~ msgid "Too many matches."
+#~ msgstr "För många träffar."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Behöver fler kvalificerare."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Katalogtjänsten är tillfälligt onåbar."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "E-postuppslagning är begränsad."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Nyckelordet ignorerades."
+
+#~ msgid "No keywords."
+#~ msgstr "Inga nyckelord."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Användaren har ingen kataloginformation."
+
+#~ msgid "Country not supported."
+#~ msgstr "Landet stöds inte."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Okänt misslyckande: %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Felaktigt användarnamn eller lösenord"
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Tjänsten är tillfälligt onåbar."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Din varningsnivå är för tillfället för hög för att logga in."
+
+#~ 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 ""
+#~ "Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och "
+#~ "prova igen. Om du fortsätter att försöka kommer du att få vänta ännu "
+#~ "längre."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Ett okänt inloggningsfel har inträffat: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Ett okänt fel, %d, har inträffat. Information: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Ogiltigt gruppnamn"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Anslutningen stängd"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Väntar på svar..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "TOC har kommit tillbaka från dess paus. Du kan nu skicka meddelanden igen."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Lösenordsändring lyckades"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Hämta kataloginformation"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Ställ in kataloginformation"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Kunde inte öppna %s för läsning!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Filöverföringen misslyckades, antagligen eftersom andra sidan avbröt."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Kunde inte ansluta för överföring."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Kunde inte skriva filhuvud, filen kommer inte att skickas."
+
+#~ msgid "Save As..."
+#~ msgstr "Spara som..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s ber %s att acceptera %d fil: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s ber %s att acceptera %d filer: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s ber att du ska skicka denne en fil"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Insticksmodul för TOC-protokoll"
+
+#~ msgid "%s Options"
+#~ msgstr "%s-alternativ"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxyalternativ"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN-server:"
+
+#~ msgid "By log size"
+#~ msgstr "Efter loggstorlek"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Öppna länk i webbläsare"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Smiley-_bild"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Smiley-_genväg"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Kunde inte hämta MSN-adressbok"
 
@@ -14236,9 +15000,6 @@ msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "Din förfrågan att få gå med i %d godkändes av moderator %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Denna gruppen har lagst till i din kompislista."
-
 #~ msgid "I am applying to join"
 #~ msgstr "Jag söker för att gå med"
 
@@ -14272,9 +15033,6 @@ msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Kan inte logga in. Kolla felsökningsloggen."
 
-#~ msgid "Unable to login"
-#~ msgstr "Kunde inte logga in."
-
 #~ msgid "Failed room reply"
 #~ msgstr "Misslyckades med rumssvar"
 
@@ -14321,9 +15079,6 @@ msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter
 #~ msgid "Group Operation Error"
 #~ msgstr "Gruppoperationsfel"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Problem att efterfråga inloggningsmarkör"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP-adress"
 
diff --git a/po/sw.po b/po/sw.po
new file mode 100644
index 0000000000..fb9bc15ef2
--- /dev/null
+++ b/po/sw.po
@@ -0,0 +1,14149 @@
+# Copyright (C) 2009
+# This file is distributed under the same license as the Pidgin package.
+# , 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
+"PO-Revision-Date: 2009-04-16 22:24+0300\n"
+"Last-Translator: \n"
+"Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 0.2\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#, fuzzy
+msgid "Finch"
+msgstr "Maliza"
+
+#, fuzzy, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "\n"
+
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stderr\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+
+msgid "Error"
+msgstr "Hitikafu "
+
+msgid "Account was not added"
+msgstr ""
+
+msgid "Username of an account must be non-empty."
+msgstr "Jina la mtumiaji haliwezi kuwa wazi "
+
+#, fuzzy
+msgid "New mail notifications"
+msgstr "Arifisho la Jumla"
+
+#, fuzzy
+msgid "Remember password"
+msgstr "Ingiza tena nywila:"
+
+msgid "There are no protocol plugins installed."
+msgstr ""
+
+msgid "(You probably forgot to 'make install'.)"
+msgstr ""
+
+msgid "Modify Account"
+msgstr ""
+
+msgid "New Account"
+msgstr ""
+
+#, fuzzy
+msgid "Protocol:"
+msgstr "Itifaki"
+
+#, fuzzy
+msgid "Username:"
+msgstr "Jina la mtumiaji"
+
+msgid "Password:"
+msgstr "Nywila:"
+
+msgid "Alias:"
+msgstr ""
+
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr ""
+
+#. Cancel button
+#. Cancel
+msgid "Cancel"
+msgstr "Ghairi"
+
+#. Save button
+#. Save
+msgid "Save"
+msgstr "Hifadhi"
+
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Una uhakika unataka kufuta ithibati yako?"
+
+#, fuzzy
+msgid "Delete Account"
+msgstr "Futa mwenyeji"
+
+#. Delete button
+#, fuzzy
+msgid "Delete"
+msgstr "&Futa"
+
+msgid "Accounts"
+msgstr ""
+
+msgid "You can enable/disable accounts from the following list."
+msgstr ""
+
+#. Add button
+msgid "Add"
+msgstr "Ongeza"
+
+#. Modify button
+#, fuzzy
+msgid "Modify"
+msgstr "R&ekebisha"
+
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr ""
+
+msgid "Add buddy to your list?"
+msgstr ""
+
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr ""
+
+msgid "Authorize buddy?"
+msgstr ""
+
+#, fuzzy
+msgid "Authorize"
+msgstr "Mamlaka"
+
+msgid "Deny"
+msgstr "Kataa"
+
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+
+#, c-format
+msgid "Account: %s (%s)"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Default"
+msgstr "chaguo-msingi"
+
+msgid "You must provide a username for the buddy."
+msgstr ""
+
+msgid "You must provide a group."
+msgstr ""
+
+msgid "You must select an account."
+msgstr ""
+
+msgid "The selected account is not online."
+msgstr ""
+
+msgid "Error adding buddy"
+msgstr ""
+
+msgid "Username"
+msgstr "Jina la mtumiaji"
+
+#, fuzzy
+msgid "Alias (optional)"
+msgstr "&Barua pepe (Uchaguzi):"
+
+msgid "Add in group"
+msgstr ""
+
+msgid "Account"
+msgstr ""
+
+msgid "Add Buddy"
+msgstr ""
+
+msgid "Please enter buddy information."
+msgstr ""
+
+#, fuzzy
+msgid "Chats"
+msgstr "Chad"
+
+#. Extract their Name and put it in
+msgid "Name"
+msgstr "Jina"
+
+msgid "Alias"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "Auto-join"
+msgstr ""
+
+msgid "Add Chat"
+msgstr ""
+
+msgid "You can edit more information from the context menu later."
+msgstr ""
+
+#, fuzzy
+msgid "Error adding group"
+msgstr "Hitilafu katika Kutuma Taarifa"
+
+msgid "You must give a name for the group to add."
+msgstr ""
+
+msgid "Add Group"
+msgstr ""
+
+msgid "Enter the name of the group"
+msgstr ""
+
+msgid "Edit Chat"
+msgstr ""
+
+msgid "Please Update the necessary fields."
+msgstr ""
+
+#, fuzzy
+msgid "Edit"
+msgstr "&Hariri"
+
+#, fuzzy
+msgid "Edit Settings"
+msgstr "Vipimo"
+
+#, fuzzy
+msgid "Information"
+msgstr "Taarifa Zaidi"
+
+msgid "Retrieving..."
+msgstr ""
+
+msgid "Get Info"
+msgstr ""
+
+msgid "Add Buddy Pounce"
+msgstr ""
+
+#, fuzzy
+msgid "Send File"
+msgstr "Tuma Kwa:"
+
+msgid "Blocked"
+msgstr "Imezuiliwa"
+
+msgid "Show when offline"
+msgstr ""
+
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr ""
+
+#, fuzzy
+msgid "Rename"
+msgstr "&Badili jina"
+
+msgid "Set Alias"
+msgstr ""
+
+msgid "Enter empty string to reset the name."
+msgstr ""
+
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Una uhakika unataka kuondoa nywila zote?"
+
+#. XXX: anything to do with the returned ui-handle?
+#, fuzzy
+msgid "Confirm Remove"
+msgstr "Thibitisha kufunga"
+
+msgid "Remove"
+msgstr "Ondoa"
+
+#. Buddy List
+msgid "Buddy List"
+msgstr ""
+
+msgid "Place tagged"
+msgstr ""
+
+msgid "Toggle Tag"
+msgstr ""
+
+msgid "View Log"
+msgstr ""
+
+#. General
+msgid "Nickname"
+msgstr ""
+
+#. Never know what those translations might end up like...
+#. Idle stuff
+msgid "Idle"
+msgstr ""
+
+msgid "On Mobile"
+msgstr ""
+
+msgid "New..."
+msgstr ""
+
+msgid "Saved..."
+msgstr ""
+
+msgid "Plugins"
+msgstr "Programu tumizi"
+
+msgid "Block/Unblock"
+msgstr ""
+
+msgid "Block"
+msgstr "Zuia"
+
+msgid "Unblock"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+
+#. Not multiline
+#. Not masked?
+#. No hints?
+msgid "OK"
+msgstr "Sawa"
+
+msgid "New Instant Message"
+msgstr ""
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+
+#, fuzzy
+msgid "Channel"
+msgstr "Ghairi"
+
+msgid "Join a Chat"
+msgstr ""
+
+msgid "Please enter the name of the chat you want to join."
+msgstr ""
+
+msgid "Join"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+
+#. Create the "Options" frame.
+msgid "Options"
+msgstr "Machaguo"
+
+msgid "Send IM..."
+msgstr ""
+
+msgid "Block/Unblock..."
+msgstr ""
+
+msgid "Join Chat..."
+msgstr ""
+
+msgid "View Log..."
+msgstr ""
+
+msgid "View All Logs"
+msgstr ""
+
+#, fuzzy
+msgid "Show"
+msgstr "Onyesha:"
+
+msgid "Empty groups"
+msgstr ""
+
+#, fuzzy
+msgid "Offline buddies"
+msgstr "Namna ya Nje ya mkondo"
+
+#, fuzzy
+msgid "Sort"
+msgstr "&Panga"
+
+#, fuzzy
+msgid "By Status"
+msgstr "Hali"
+
+msgid "Alphabetically"
+msgstr ""
+
+msgid "By Log Size"
+msgstr ""
+
+msgid "Buddy"
+msgstr ""
+
+#, fuzzy
+msgid "Chat"
+msgstr "Chad"
+
+#, fuzzy
+msgid "Grouping"
+msgstr "Hakuna Mpangilio"
+
+#, fuzzy
+msgid "Certificate Import"
+msgstr "Hati ina"
+
+msgid "Specify a hostname"
+msgstr ""
+
+msgid "Type the host name this certificate is for."
+msgstr ""
+
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+
+msgid "Certificate Import Error"
+msgstr ""
+
+msgid "X.509 certificate import failed"
+msgstr ""
+
+#, fuzzy
+msgid "Select a PEM certificate"
+msgstr "Teua Ithibati"
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+
+#, fuzzy
+msgid "Certificate Export Error"
+msgstr "Ithibati Ipo"
+
+msgid "X.509 certificate export failed"
+msgstr ""
+
+#, fuzzy
+msgid "PEM X.509 Certificate Export"
+msgstr "X.509 Ithibati (PEM)"
+
+#, fuzzy, c-format
+msgid "Certificate for %s"
+msgstr "Hati ina"
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "SSL Host Certificate"
+msgstr "Ithibati SSL ya Mteja"
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr ""
+
+msgid "Confirm certificate delete"
+msgstr ""
+
+msgid "Certificate Manager"
+msgstr "Meneja Ithibati"
+
+#. Creating the user splits
+msgid "Hostname"
+msgstr ""
+
+#, fuzzy
+msgid "Info"
+msgstr "Taarifa:"
+
+#. Close button
+msgid "Close"
+msgstr "Funga"
+
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%S (%S)"
+
+#, c-format
+msgid "%s disconnected."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+
+msgid "Re-enable Account"
+msgstr ""
+
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+
+msgid "No such command."
+msgstr ""
+
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+
+msgid "Your command failed for an unknown reason."
+msgstr ""
+
+msgid "That command only works in chats, not IMs."
+msgstr ""
+
+msgid "That command only works in IMs, not chats."
+msgstr ""
+
+msgid "That command doesn't work on this protocol."
+msgstr ""
+
+msgid "Message was not sent, because you are not signed on."
+msgstr ""
+
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr ""
+
+#, c-format
+msgid "%s [%s]"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+
+msgid "You have left this chat."
+msgstr ""
+
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+
+#, fuzzy
+msgid "Send To"
+msgstr "Tuma kwa:"
+
+#, fuzzy
+msgid "Conversation"
+msgstr "Unganisho"
+
+msgid "Clear Scrollback"
+msgstr ""
+
+#, fuzzy
+msgid "Show Timestamps"
+msgstr "Onyesha Ufafanuzi"
+
+msgid "Add Buddy Pounce..."
+msgstr ""
+
+msgid "Invite..."
+msgstr ""
+
+msgid "Enable Logging"
+msgstr ""
+
+msgid "Enable Sounds"
+msgstr ""
+
+msgid "<AUTO-REPLY> "
+msgstr ""
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Supported debug options are:  version"
+msgstr ""
+
+msgid "No such command (in this context)."
+msgstr ""
+
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+
+msgid "clear: Clears the conversation scrollback."
+msgstr ""
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr ""
+
+msgid "users:  Show the list of users in the chat."
+msgstr ""
+
+msgid "plugins: Show the plugins window."
+msgstr ""
+
+msgid "buddylist: Show the buddylist."
+msgstr ""
+
+msgid "accounts: Show the accounts window."
+msgstr ""
+
+msgid "debugwin: Show the debug window."
+msgstr ""
+
+msgid "prefs: Show the preference window."
+msgstr ""
+
+msgid "statuses: Show the savedstatuses window."
+msgstr ""
+
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to open file."
+msgstr "Nimeshindwa Kusasisha"
+
+#, fuzzy
+msgid "Debug Window"
+msgstr "Dirisha Jipya"
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+#, fuzzy
+msgid "Clear"
+msgstr "&Safisha"
+
+#, fuzzy
+msgid "Filter:"
+msgstr "Ch&uja:"
+
+msgid "Pause"
+msgstr "Simamisha"
+
+#, c-format
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Create the window.
+msgid "File Transfers"
+msgstr ""
+
+#, fuzzy
+msgid "Progress"
+msgstr "Hatua:"
+
+#, fuzzy
+msgid "Filename"
+msgstr "Jina la faili:"
+
+msgid "Size"
+msgstr "Saizi"
+
+#, fuzzy
+msgid "Speed"
+msgstr "Kilishi mkono"
+
+#, fuzzy
+msgid "Remaining"
+msgstr "#1 imebakia"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+msgid "Status"
+msgstr "Hali"
+
+msgid "Close this window when all transfers finish"
+msgstr ""
+
+msgid "Clear finished transfers"
+msgstr ""
+
+#, fuzzy
+msgid "Stop"
+msgstr "&Simama"
+
+msgid "Waiting for transfer to begin"
+msgstr ""
+
+msgid "Canceled"
+msgstr "Imeghairishwa"
+
+msgid "Failed"
+msgstr "Imeshindwa"
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+msgid "Sent"
+msgstr ""
+
+msgid "Received"
+msgstr ""
+
+msgid "Finished"
+msgstr "Imemaliza"
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr ""
+
+#, fuzzy
+msgid "Sending"
+msgstr "kuumbia"
+
+#, fuzzy
+msgid "Receiving"
+msgstr "teremua"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr ""
+
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr ""
+
+#, fuzzy
+msgid "%B %Y"
+msgstr "%S %S"
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+#, fuzzy
+msgid "No logs were found"
+msgstr "Hakuna masasisho yaliyopatikana."
+
+msgid "Total log size:"
+msgstr ""
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr ""
+
+#, c-format
+msgid "Conversations in %s"
+msgstr ""
+
+#, c-format
+msgid "Conversations with %s"
+msgstr ""
+
+msgid "All Conversations"
+msgstr ""
+
+msgid "System Log"
+msgstr ""
+
+msgid "Calling ... "
+msgstr ""
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr ""
+
+#, fuzzy
+msgid "Reject"
+msgstr "Seti upya"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+msgid "You have rejected the call."
+msgstr ""
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
+msgid "Emails"
+msgstr "Barua pepe"
+
+msgid "You have mail!"
+msgstr ""
+
+#, fuzzy
+msgid "Sender"
+msgstr "Seva"
+
+msgid "Subject"
+msgstr "Mhusika"
+
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+msgid "New Mail"
+msgstr "Tabo mpya"
+
+#, c-format
+msgid "Info for %s"
+msgstr ""
+
+#, fuzzy
+msgid "Buddy Information"
+msgstr "Fic&ha Taarifa"
+
+msgid "Continue"
+msgstr "Endelea"
+
+msgid "IM"
+msgstr ""
+
+msgid "Invite"
+msgstr ""
+
+msgid "(none)"
+msgstr ""
+
+msgid "URI"
+msgstr "URI"
+
+msgid "ERROR"
+msgstr "HITILAFU"
+
+msgid "loading plugin failed"
+msgstr ""
+
+msgid "unloading plugin failed"
+msgstr ""
+
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+
+msgid "Plugin need to be loaded before you can configure it."
+msgstr ""
+
+msgid "No configuration options for this plugin."
+msgstr ""
+
+msgid "Error loading plugin"
+msgstr ""
+
+msgid "The selected file is not a valid plugin."
+msgstr ""
+
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+
+#, fuzzy
+msgid "Select plugin to install"
+msgstr "Chagua mandhari kusakinisha"
+
+msgid "You can (un)load plugins from the following list."
+msgstr ""
+
+#, fuzzy
+msgid "Install Plugin..."
+msgstr "Usakinishaji Programu-jalizi"
+
+msgid "Configure Plugin"
+msgstr ""
+
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+msgid "Preferences"
+msgstr "Mapendekezo"
+
+msgid "Please enter a buddy to pounce."
+msgstr ""
+
+msgid "New Buddy Pounce"
+msgstr ""
+
+msgid "Edit Buddy Pounce"
+msgstr ""
+
+msgid "Pounce Who"
+msgstr ""
+
+#. Account:
+msgid "Account:"
+msgstr ""
+
+msgid "Buddy name:"
+msgstr ""
+
+#. Create the "Pounce When Buddy..." frame.
+msgid "Pounce When Buddy..."
+msgstr ""
+
+msgid "Signs on"
+msgstr ""
+
+msgid "Signs off"
+msgstr ""
+
+msgid "Goes away"
+msgstr ""
+
+msgid "Returns from away"
+msgstr ""
+
+msgid "Becomes idle"
+msgstr ""
+
+msgid "Is no longer idle"
+msgstr ""
+
+msgid "Starts typing"
+msgstr ""
+
+msgid "Pauses while typing"
+msgstr ""
+
+msgid "Stops typing"
+msgstr ""
+
+msgid "Sends a message"
+msgstr ""
+
+#. Create the "Action" frame.
+#, fuzzy
+msgid "Action"
+msgstr "&Tendo"
+
+#, fuzzy
+msgid "Open an IM window"
+msgstr "Fungua dirisha jipya"
+
+msgid "Pop up a notification"
+msgstr ""
+
+msgid "Send a message"
+msgstr ""
+
+msgid "Execute a command"
+msgstr ""
+
+msgid "Play a sound"
+msgstr ""
+
+msgid "Pounce only when my status is not Available"
+msgstr ""
+
+msgid "Recurring"
+msgstr ""
+
+msgid "Cannot create pounce"
+msgstr ""
+
+msgid "You do not have any accounts."
+msgstr ""
+
+msgid "You must create an account first before you can create a pounce."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Je una uhakika uantaka kufuta ithibati hizi?"
+
+msgid "Buddy Pounces"
+msgstr ""
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr ""
+
+msgid "Unknown pounce event. Please report this!"
+msgstr ""
+
+msgid "Based on keyboard use"
+msgstr ""
+
+msgid "From last sent message"
+msgstr ""
+
+#, fuzzy
+msgid "Never"
+msgstr "Seva"
+
+msgid "Show Idle Time"
+msgstr ""
+
+msgid "Show Offline Buddies"
+msgstr ""
+
+msgid "Notify buddies when you are typing"
+msgstr ""
+
+msgid "Log format"
+msgstr ""
+
+#, fuzzy
+msgid "Log IMs"
+msgstr "I&ngia"
+
+msgid "Log chats"
+msgstr ""
+
+msgid "Log status change events"
+msgstr ""
+
+msgid "Report Idle time"
+msgstr ""
+
+#, fuzzy
+msgid "Change status when idle"
+msgstr "&Badili matini ya ufito hali"
+
+msgid "Minutes before changing status"
+msgstr ""
+
+#, fuzzy
+msgid "Change status to"
+msgstr "&Badili matini ya ufito hali"
+
+#, fuzzy
+msgid "Conversations"
+msgstr "Unganisho"
+
+#, fuzzy
+msgid "Logging"
+msgstr "Inapakia"
+
+msgid "You must fill all the required fields."
+msgstr ""
+
+msgid "The required fields are underlined."
+msgstr ""
+
+msgid "Not implemented yet."
+msgstr ""
+
+#, fuzzy
+msgid "Save File..."
+msgstr "&Hifadhi faili"
+
+#, fuzzy
+msgid "Open File..."
+msgstr "Fungua Faili"
+
+msgid "Choose Location..."
+msgstr ""
+
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr ""
+
+msgid "Get"
+msgstr ""
+
+#. Create the window.
+msgid "Room List"
+msgstr ""
+
+msgid "Buddy logs in"
+msgstr ""
+
+msgid "Buddy logs out"
+msgstr ""
+
+msgid "Message received"
+msgstr ""
+
+msgid "Message received begins conversation"
+msgstr ""
+
+#, fuzzy
+msgid "Message sent"
+msgstr "Ujumbe haujaenda."
+
+msgid "Person enters chat"
+msgstr ""
+
+msgid "Person leaves chat"
+msgstr ""
+
+msgid "You talk in chat"
+msgstr ""
+
+msgid "Others talk in chat"
+msgstr ""
+
+msgid "Someone says your username in chat"
+msgstr ""
+
+msgid "GStreamer Failure"
+msgstr ""
+
+msgid "GStreamer failed to initialize."
+msgstr ""
+
+#, fuzzy
+msgid "(default)"
+msgstr "chaguo-msingi"
+
+msgid "Select Sound File ..."
+msgstr ""
+
+#, fuzzy
+msgid "Sound Preferences"
+msgstr "&Mapendekezo ya Tovuti"
+
+#, fuzzy
+msgid "Profiles"
+msgstr "Mafaili_%S"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Console Beep"
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "No Sound"
+msgstr ""
+
+msgid "Sound Method"
+msgstr ""
+
+msgid "Method: "
+msgstr ""
+
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+
+#. Sound options
+msgid "Sound Options"
+msgstr ""
+
+msgid "Sounds when conversation has focus"
+msgstr ""
+
+#, fuzzy
+msgid "Always"
+msgstr "Uliza daima"
+
+msgid "Only when available"
+msgstr ""
+
+msgid "Only when not available"
+msgstr ""
+
+msgid "Volume(0-100):"
+msgstr ""
+
+#. Sound events
+msgid "Sound Events"
+msgstr ""
+
+msgid "Event"
+msgstr ""
+
+#, fuzzy
+msgid "File"
+msgstr "Faili:"
+
+#, fuzzy
+msgid "Test"
+msgstr "Matini"
+
+msgid "Reset"
+msgstr "Seti upya"
+
+#, fuzzy
+msgid "Choose..."
+msgstr "Chagua…"
+
+#, fuzzy, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "Una uhakika unataka kufuta ithibati yako?"
+
+#, fuzzy
+msgid "Delete Status"
+msgstr "Futa mwenyeji"
+
+msgid "Saved Statuses"
+msgstr ""
+
+msgid "Title"
+msgstr "Jina"
+
+msgid "Type"
+msgstr "Aina"
+
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. saveable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+msgid "Message"
+msgstr "Ujumbe"
+
+#. Use
+msgid "Use"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid title"
+msgstr "Kizuizi batili"
+
+msgid "Please enter a non-empty title for the status."
+msgstr ""
+
+#, fuzzy
+msgid "Duplicate title"
+msgstr "sifa rudufu"
+
+msgid "Please enter a different title for the status."
+msgstr ""
+
+#, fuzzy
+msgid "Substatus"
+msgstr "Hali"
+
+msgid "Status:"
+msgstr "Hali:"
+
+#, fuzzy
+msgid "Message:"
+msgstr "Ujumbe"
+
+#, fuzzy
+msgid "Edit Status"
+msgstr "Marekani"
+
+msgid "Use different status for following accounts"
+msgstr ""
+
+#. Save & Use
+#, fuzzy
+msgid "Save & Use"
+msgstr "Hifadhi Kama"
+
+msgid "Certificates"
+msgstr "Hati"
+
+msgid "Sounds"
+msgstr ""
+
+#, fuzzy
+msgid "Statuses"
+msgstr "Hali"
+
+msgid "Error loading the plugin."
+msgstr ""
+
+msgid "Couldn't find X display"
+msgstr ""
+
+msgid "Couldn't find window"
+msgstr ""
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+
+msgid "GntClipboard"
+msgstr ""
+
+msgid "Clipboard plugin"
+msgstr ""
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+
+#, c-format
+msgid "%s just signed on"
+msgstr ""
+
+#, c-format
+msgid "%s just signed off"
+msgstr ""
+
+#, c-format
+msgid "%s sent you a message"
+msgstr ""
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr ""
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr ""
+
+msgid "Buddy signs on/off"
+msgstr ""
+
+msgid "You receive an IM"
+msgstr ""
+
+msgid "Someone speaks in a chat"
+msgstr ""
+
+msgid "Someone says your name in a chat"
+msgstr ""
+
+msgid "Notify with a toaster when"
+msgstr ""
+
+msgid "Beep too!"
+msgstr ""
+
+msgid "Set URGENT for the terminal window."
+msgstr ""
+
+msgid "GntGf"
+msgstr ""
+
+msgid "Toaster plugin"
+msgstr ""
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr ""
+
+msgid "History Plugin Requires Logging"
+msgstr ""
+
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+
+#, fuzzy
+msgid "GntHistory"
+msgstr "Historia"
+
+msgid "Shows recently logged conversations in new conversations."
+msgstr ""
+
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+
+#, fuzzy
+msgid "Online"
+msgstr "Nenda mkondoni"
+
+msgid "Offline"
+msgstr ""
+
+msgid "Online Buddies"
+msgstr ""
+
+#, fuzzy
+msgid "Offline Buddies"
+msgstr "Namna ya Nje ya mkondo"
+
+msgid "Online/Offline"
+msgstr ""
+
+msgid "Meebo"
+msgstr ""
+
+msgid "No Grouping"
+msgstr "Hakuna Mpangilio"
+
+msgid "Nested Subgroup"
+msgstr ""
+
+msgid "Nested Grouping (experimental)"
+msgstr ""
+
+msgid "Provides alternate buddylist grouping options."
+msgstr ""
+
+msgid "Lastlog"
+msgstr ""
+
+#. Translator Note: The "backlog" is the conversation buffer/history.
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr ""
+
+msgid "GntLastlog"
+msgstr ""
+
+msgid "Lastlog plugin."
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+msgid "TinyURL"
+msgstr ""
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
+msgid "accounts"
+msgstr ""
+
+msgid "Password is required to sign on."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Ingiza nywila kwa ajili ya %1$S kwenye %2$S"
+
+#, fuzzy
+msgid "Enter Password"
+msgstr "Ingiza nywila mpya:"
+
+#, fuzzy
+msgid "Save password"
+msgstr "Nywila Zilizohifadhiwa"
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr ""
+
+#, fuzzy
+msgid "Connection Error"
+msgstr "Hitilafu ya Sanidi"
+
+msgid "New passwords do not match."
+msgstr ""
+
+msgid "Fill out all fields completely."
+msgstr ""
+
+msgid "Original password"
+msgstr ""
+
+#, fuzzy
+msgid "New password"
+msgstr "Nyilwa mpya:"
+
+#, fuzzy
+msgid "New password (again)"
+msgstr "Nywila mpya (tena):"
+
+#, c-format
+msgid "Change password for %s"
+msgstr ""
+
+msgid "Please enter your current password and your new password."
+msgstr ""
+
+#, c-format
+msgid "Change user information for %s"
+msgstr ""
+
+msgid "Set User Info"
+msgstr ""
+
+msgid "Unknown"
+msgstr "Isiyojulikana"
+
+msgid "Buddies"
+msgstr ""
+
+msgid "buddy list"
+msgstr ""
+
+msgid "(DOES NOT MATCH)"
+msgstr ""
+
+#. Make messages
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr ""
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+msgid "Single-use Certificate Verification"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+#, fuzzy
+msgid "Certificate Authorities"
+msgstr "Hatifisha Sera"
+
+#. Scheme name
+#. Pool name
+msgid "SSL Peers Cache"
+msgstr ""
+
+#. Make messages
+#, fuzzy, c-format
+msgid "Accept certificate for %s?"
+msgstr "Rekebisha cheli au ithibati ya uaminifu"
+
+#. TODO: Find what the handle ought to be
+#, fuzzy
+msgid "SSL Certificate Verification"
+msgstr "Kagua Uhalisia wa Hati"
+
+#, fuzzy
+msgid "_View Certificate..."
+msgstr "Angalia Hati"
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr ""
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#, fuzzy
+msgid "SSL Certificate Error"
+msgstr "Mamlaka ya Ithibati SSL"
+
+#, fuzzy
+msgid "Invalid certificate chain"
+msgstr "Hati Thibati"
+
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+
+#. vrq will be completed by user_auth
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+
+msgid "Invalid certificate authority signature"
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+
+#. Make messages
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#, fuzzy
+msgid "Certificate Information"
+msgstr "Kagua Uhalisia wa Hati"
+
+#, fuzzy
+msgid "Registration Error"
+msgstr "Hitilafu ya Sanidi"
+
+#, fuzzy
+msgid "Unregistration Error"
+msgstr "Hitilafu ya Sanidi"
+
+#, c-format
+msgid "+++ %s signed on"
+msgstr ""
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr ""
+
+#. Unknown error
+#. Unknown error!
+msgid "Unknown error"
+msgstr "Hitilafu isiyojulikana"
+
+msgid "Unable to send message: The message is too large."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s."
+msgstr ""
+
+msgid "The message is too large."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to send message."
+msgstr "Haiwezi kuongeza moduli"
+
+msgid "Send Message"
+msgstr ""
+
+msgid "_Send Message"
+msgstr ""
+
+#, c-format
+msgid "%s entered the room."
+msgstr ""
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr ""
+
+#, c-format
+msgid "You are now known as %s"
+msgstr ""
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr ""
+
+#, c-format
+msgid "%s left the room."
+msgstr ""
+
+#, c-format
+msgid "%s left the room (%s)."
+msgstr ""
+
+msgid "Invite to chat"
+msgstr ""
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr ""
+
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr ""
+
+#, fuzzy
+msgid "No name"
+msgstr "Jina la DNS"
+
+msgid "Unable to create new resolver process\n"
+msgstr ""
+
+msgid "Unable to send request to resolver process\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr ""
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr ""
+
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Hitilafu isiyojulikana"
+
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr "Hitilafu katika kufikia %S"
+
+#, fuzzy
+msgid "Directory is not writable."
+msgstr "Faili %S haliandikiki."
+
+msgid "Cannot send a file of 0 bytes."
+msgstr ""
+
+msgid "Cannot send a directory."
+msgstr ""
+
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr ""
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr ""
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr ""
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr ""
+
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr ""
+
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr ""
+
+msgid "File transfer complete"
+msgstr ""
+
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr ""
+
+msgid "File transfer cancelled"
+msgstr ""
+
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr ""
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr ""
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr ""
+
+msgid "Run the command in a terminal"
+msgstr ""
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr ""
+
+msgid "The handler for \"aim\" URLs"
+msgstr ""
+
+msgid "The handler for \"gg\" URLs"
+msgstr ""
+
+msgid "The handler for \"icq\" URLs"
+msgstr ""
+
+msgid "The handler for \"irc\" URLs"
+msgstr ""
+
+msgid "The handler for \"msnim\" URLs"
+msgstr ""
+
+msgid "The handler for \"sip\" URLs"
+msgstr ""
+
+msgid "The handler for \"xmpp\" URLs"
+msgstr ""
+
+msgid "The handler for \"ymsgr\" URLs"
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr ""
+
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr ""
+
+msgid "HTML"
+msgstr ""
+
+msgid "Plain text"
+msgstr ""
+
+msgid "Old flat format"
+msgstr ""
+
+msgid "Logging of this conversation failed."
+msgstr ""
+
+msgid "XML"
+msgstr "XML"
+
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr ""
+
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr ""
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr ""
+
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Hitilafu kwenye utengenezaji wa saraka:"
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr ""
+
+msgid "This plugin has not defined an ID."
+msgstr ""
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr ""
+
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr ""
+
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+
+msgid "Unable to load the plugin"
+msgstr ""
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr ""
+
+msgid "Unable to load your plugin."
+msgstr ""
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr ""
+
+msgid "Autoaccept"
+msgstr ""
+
+msgid "Auto-accept file transfer requests from selected users."
+msgstr ""
+
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr ""
+
+msgid "Autoaccept complete"
+msgstr ""
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr ""
+
+msgid "Set Autoaccept Setting"
+msgstr ""
+
+#, fuzzy
+msgid "_Save"
+msgstr "Hifadhi"
+
+#, fuzzy
+msgid "_Cancel"
+msgstr "Ghairi"
+
+msgid "Ask"
+msgstr ""
+
+msgid "Auto Accept"
+msgstr ""
+
+#, fuzzy
+msgid "Auto Reject"
+msgstr "Gungu&a Kiotomati"
+
+msgid "Autoaccept File Transfers..."
+msgstr ""
+
+#. XXX: Is there a better way than this? There really should be.
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+
+msgid "Automatically reject from users not in buddy list"
+msgstr ""
+
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+
+msgid "Create a new directory for each user"
+msgstr ""
+
+#, fuzzy
+msgid "Notes"
+msgstr "Hakuna vitu"
+
+msgid "Enter your notes below..."
+msgstr ""
+
+msgid "Edit Notes..."
+msgstr ""
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Notes"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Store notes on particular buddies."
+msgstr ""
+
+#. *< summary
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Cipher Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests the ciphers that ship with libpurple."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "DBus Example"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "DBus Plugin Example"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "File Control"
+msgstr "Fi&cha Visisimamizi"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Allows control by entering commands in a file."
+msgstr ""
+
+msgid "Minutes"
+msgstr ""
+
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+msgid "I'dle Mak'er"
+msgstr ""
+
+msgid "Set Account Idle Time"
+msgstr ""
+
+msgid "_Set"
+msgstr ""
+
+msgid "None of your accounts are idle."
+msgstr ""
+
+msgid "Unset Account Idle Time"
+msgstr ""
+
+msgid "_Unset"
+msgstr ""
+
+msgid "Set Idle Time for All Accounts"
+msgstr ""
+
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr ""
+
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Client"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a client."
+msgstr ""
+
+#. *  description
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Server"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a server."
+msgstr ""
+
+#. *  description
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+
+msgid "Join/Part Hiding Configuration"
+msgstr ""
+
+#, fuzzy
+msgid "Minimum Room Size"
+msgstr "Upe&ochini wa fonti size:"
+
+msgid "User Inactivity Timeout (in minutes)"
+msgstr ""
+
+msgid "Apply hiding rules to buddies"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Join/Part Hiding"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Hides extraneous join/part messages."
+msgstr ""
+
+#. *  description
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+
+#. This is used in the place of a timezone abbreviation if the
+#. * offset is way off.  The user should never really see it, but
+#. * it's here just in case.  The parens are to make it clear it's
+#. * not a real timezone.
+msgid "(UTC)"
+msgstr ""
+
+msgid "User is offline."
+msgstr ""
+
+msgid "Auto-response sent:"
+msgstr ""
+
+#, c-format
+msgid "%s has signed off."
+msgstr ""
+
+msgid "One or more messages may have been undeliverable."
+msgstr ""
+
+msgid "You were disconnected from the server."
+msgstr ""
+
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr ""
+
+#, fuzzy
+msgid "Message could not be sent."
+msgstr "Ujumbe haujaenda."
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Adium"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#, fuzzy
+msgid "Fire"
+msgstr "Faili:"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Messenger Plus!"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "QIP"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "MSN Messenger"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#, fuzzy
+msgid "Trillian"
+msgstr "Kifriul"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "aMSN"
+msgstr ""
+
+#. Add general preferences.
+msgid "General Log Reading Configuration"
+msgstr ""
+
+msgid "Fast size calculations"
+msgstr ""
+
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+msgid "Log Directory"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "Log Reader"
+msgstr "Kichwa cha kushoto"
+
+#. *< name
+#. *< version
+#. * summary
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr ""
+
+#. * description
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+
+msgid "Mono Plugin Loader"
+msgstr ""
+
+msgid "Loads .NET plugins with Mono."
+msgstr ""
+
+msgid "Add new line in IMs"
+msgstr ""
+
+msgid "Add new line in Chats"
+msgstr ""
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "New Line"
+msgstr "Dirisha jipya"
+
+#. *< name
+#. *< version
+msgid "Prepends a newline to displayed message."
+msgstr ""
+
+#. *< summary
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the username in the conversation window."
+msgstr ""
+
+msgid "Offline Message Emulation"
+msgstr ""
+
+msgid "Save messages sent to an offline user as pounce."
+msgstr ""
+
+msgid ""
+"The rest of the messages will be saved as pounces. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+
+#, c-format
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+
+#, fuzzy
+msgid "Offline Message"
+msgstr "Hifadhi ya nje ya Mkondo"
+
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr ""
+
+msgid "Yes"
+msgstr "Ndiyo"
+
+msgid "No"
+msgstr "Hapana"
+
+msgid "Save offline messages in pounce"
+msgstr ""
+
+msgid "Do not ask. Always save in pounce."
+msgstr ""
+
+#, fuzzy
+msgid "One Time Password"
+msgstr "Ingiza Nywila Kuu"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Perl Plugin Loader"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+msgid "Provides support for loading perl plugins."
+msgstr ""
+
+msgid "Psychic Mode"
+msgstr ""
+
+msgid "Psychic mode for incoming conversation"
+msgstr ""
+
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+
+msgid "You feel a disturbance in the force..."
+msgstr ""
+
+msgid "Only enable for users on the buddy list"
+msgstr ""
+
+msgid "Disable when away"
+msgstr ""
+
+msgid "Display notification message in conversations"
+msgstr ""
+
+msgid "Raise psychic conversations"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all signals are working properly."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Simple Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests to see that most things are working."
+msgstr ""
+
+#. Scheme name
+#, fuzzy
+msgid "X.509 Certificates"
+msgstr "X.509 Ithibati (PEM)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "NSS"
+msgstr "RSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through Mozilla NSS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+
+#, c-format
+msgid "%s is no longer away."
+msgstr ""
+
+#, c-format
+msgid "%s has gone away."
+msgstr ""
+
+#, c-format
+msgid "%s has become idle."
+msgstr ""
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr ""
+
+#, c-format
+msgid "%s has signed on."
+msgstr ""
+
+msgid "Notify When"
+msgstr ""
+
+msgid "Buddy Goes _Away"
+msgstr ""
+
+msgid "Buddy Goes _Idle"
+msgstr ""
+
+msgid "Buddy _Signs On/Off"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy State Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+
+msgid "Tcl Plugin Loader"
+msgstr ""
+
+msgid "Provides support for loading Tcl plugins"
+msgstr ""
+
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+
+msgid ""
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "Haikuweza kuunganishwa"
+
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+
+#, fuzzy
+msgid "First name"
+msgstr "Ukurasa wa kwanza"
+
+#, fuzzy
+msgid "Last name"
+msgstr "Ukurasa wa mwisho"
+
+msgid "Email"
+msgstr "Barua pepe"
+
+msgid "AIM Account"
+msgstr ""
+
+msgid "XMPP Account"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Bonjour Protocol Plugin"
+msgstr ""
+
+msgid "Purple Person"
+msgstr ""
+
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr ""
+
+msgid "Bonjour"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s has closed the conversation."
+msgstr "Mwenzi SSL imefunga uunganisho huu"
+
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Haikuweza kuunganishwa"
+
+msgid "Error communicating with local mDNSResponder."
+msgstr ""
+
+msgid "Invalid proxy settings"
+msgstr ""
+
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+
+#, fuzzy
+msgid "Token Error"
+msgstr "Hitilafu ya Faili"
+
+msgid "Unable to fetch the token.\n"
+msgstr ""
+
+msgid "Save Buddylist..."
+msgstr ""
+
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr ""
+
+msgid "Buddylist saved successfully!"
+msgstr ""
+
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr ""
+
+msgid "Couldn't load buddylist"
+msgstr ""
+
+msgid "Load Buddylist..."
+msgstr ""
+
+msgid "Buddylist loaded successfully!"
+msgstr ""
+
+msgid "Save buddylist..."
+msgstr ""
+
+msgid "Load buddylist from file..."
+msgstr ""
+
+msgid "You must fill in all registration fields"
+msgstr ""
+
+#, fuzzy
+msgid "Passwords do not match"
+msgstr "Nywila"
+
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+
+msgid "New Gadu-Gadu Account Registered"
+msgstr ""
+
+#, fuzzy
+msgid "Registration completed successfully!"
+msgstr "Sakinisho limemaliza kikamilifu"
+
+msgid "Password"
+msgstr "Nywila"
+
+#, fuzzy
+msgid "Password (again)"
+msgstr "Nywila mpya (tena):"
+
+msgid "Enter captcha text"
+msgstr ""
+
+#, fuzzy
+msgid "Captcha"
+msgstr "Naki&li Picha"
+
+msgid "Register New Gadu-Gadu Account"
+msgstr ""
+
+msgid "Please, fill in the following fields"
+msgstr ""
+
+msgid "City"
+msgstr ""
+
+msgid "Year of birth"
+msgstr ""
+
+#, fuzzy
+msgid "Gender"
+msgstr "Katikati"
+
+msgid "Male or female"
+msgstr ""
+
+#, fuzzy
+msgid "Male"
+msgstr "Mali"
+
+msgid "Female"
+msgstr ""
+
+#, fuzzy
+msgid "Only online"
+msgstr "Baki Mkondoni"
+
+#, fuzzy
+msgid "Find buddies"
+msgstr "Ta&futa Masasisho"
+
+msgid "Please, enter your search criteria below"
+msgstr ""
+
+msgid "Fill in the fields."
+msgstr ""
+
+msgid "Your current password is different from the one that you specified."
+msgstr ""
+
+msgid "Unable to change password. Error occurred.\n"
+msgstr ""
+
+msgid "Change password for the Gadu-Gadu account"
+msgstr ""
+
+msgid "Password was changed successfully!"
+msgstr ""
+
+#, fuzzy
+msgid "Current password"
+msgstr "Nywila ya sasa hivi:"
+
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
+msgid "Please, enter your current password and your new password for UIN: "
+msgstr ""
+
+#, fuzzy
+msgid "Change Gadu-Gadu Password"
+msgstr "Badilisha Nywila Kuu"
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr ""
+
+msgid "Add to chat..."
+msgstr ""
+
+#. Global
+#, fuzzy
+msgid "Available"
+msgstr "Haipatikani"
+
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+msgid "Away"
+msgstr ""
+
+#, fuzzy
+msgid "UIN"
+msgstr "UID"
+
+#, fuzzy
+msgid "First Name"
+msgstr "Ukurasa wa kwanza"
+
+msgid "Birth Year"
+msgstr ""
+
+msgid "Unable to display the search results."
+msgstr ""
+
+msgid "Gadu-Gadu Public Directory"
+msgstr ""
+
+msgid "Search results"
+msgstr "Tafuta matokeo"
+
+#, fuzzy
+msgid "No matching users found"
+msgstr "Hamna uwiyano sawa na CRL uliopatikana."
+
+msgid "There are no users matching your search criteria."
+msgstr ""
+
+msgid "Unable to read from socket"
+msgstr ""
+
+msgid "Buddy list downloaded"
+msgstr ""
+
+msgid "Your buddy list was downloaded from the server."
+msgstr ""
+
+msgid "Buddy list uploaded"
+msgstr ""
+
+msgid "Your buddy list was stored on the server."
+msgstr ""
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#, fuzzy
+msgid "Connected"
+msgstr "Unganisho"
+
+#, fuzzy
+msgid "Connection failed"
+msgstr "Unganisho Limeshindikana"
+
+msgid "Add to chat"
+msgstr ""
+
+msgid "Chat _name:"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Imeshindwa kuipata seva wakala"
+
+#. 1. connect to server
+#. connect to the server
+#, fuzzy
+msgid "Connecting"
+msgstr "Inaunganisha…"
+
+#, fuzzy
+msgid "Chat error"
+msgstr "Kichamorro"
+
+msgid "This chat name is already in use"
+msgstr ""
+
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "Imeshindwa kuipata seva wakala"
+
+msgid "Find buddies..."
+msgstr ""
+
+#, fuzzy
+msgid "Change password..."
+msgstr "Badil &Nywila"
+
+msgid "Upload buddylist to Server"
+msgstr ""
+
+msgid "Download buddylist from Server"
+msgstr ""
+
+msgid "Delete buddylist from Server"
+msgstr ""
+
+msgid "Save buddylist to file..."
+msgstr ""
+
+#. magic
+#. major_version
+#. minor_version
+#. plugin type
+#. ui_requirement
+#. flags
+#. dependencies
+#. priority
+#. id
+#. name
+#. version
+msgid "Gadu-Gadu Protocol Plugin"
+msgstr ""
+
+#. summary
+msgid "Polish popular IM"
+msgstr ""
+
+msgid "Gadu-Gadu User"
+msgstr ""
+
+#, fuzzy
+msgid "GG server"
+msgstr "Anza"
+
+#, c-format
+msgid "Unknown command: %s"
+msgstr ""
+
+#, c-format
+msgid "current topic is: %s"
+msgstr ""
+
+#, fuzzy
+msgid "No topic is set"
+msgstr "Hakuna sifa zilizowekwa."
+
+msgid "File Transfer Failed"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "Nimeshindwa Kusasisha"
+
+msgid "Error displaying MOTD"
+msgstr ""
+
+#, fuzzy
+msgid "No MOTD available"
+msgstr "Haipatikani"
+
+msgid "There is no MOTD associated with this connection."
+msgstr ""
+
+#, c-format
+msgid "MOTD for %s"
+msgstr ""
+
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
+
+msgid "View MOTD"
+msgstr ""
+
+msgid "_Channel:"
+msgstr ""
+
+#, fuzzy
+msgid "_Password:"
+msgstr "Nywila:"
+
+msgid "IRC nick and server may not contain whitespace"
+msgstr ""
+
+msgid "SSL support unavailable"
+msgstr ""
+
+msgid "Unable to connect"
+msgstr "Haikuweza kuunganishwa"
+
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Mwenzi SSL imefunga uunganisho huu"
+
+msgid "Users"
+msgstr ""
+
+msgid "Topic"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "IRC Protocol Plugin"
+msgstr ""
+
+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr ""
+
+#. host to connect to
+msgid "Server"
+msgstr "Seva"
+
+#. port to connect to
+#, fuzzy
+msgid "Port"
+msgstr "Lango:"
+
+#, fuzzy
+msgid "Encodings"
+msgstr "Kisimba:"
+
+msgid "Auto-detect incoming UTF-8"
+msgstr ""
+
+#, fuzzy
+msgid "Real name"
+msgstr "class name"
+
+#.
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#.
+#, fuzzy
+msgid "Use SSL"
+msgstr "Tumia %S"
+
+msgid "Bad mode"
+msgstr ""
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr ""
+
+#, c-format
+msgid "Ban on %s"
+msgstr ""
+
+msgid "End of ban list"
+msgstr ""
+
+#, c-format
+msgid "You are banned from %s."
+msgstr ""
+
+msgid "Banned"
+msgstr ""
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr ""
+
+msgid " <i>(ircop)</i>"
+msgstr ""
+
+msgid " <i>(identified)</i>"
+msgstr ""
+
+#, fuzzy
+msgid "Nick"
+msgstr "Bofya"
+
+msgid "Currently on"
+msgstr ""
+
+msgid "Idle for"
+msgstr ""
+
+msgid "Online since"
+msgstr ""
+
+msgid "<b>Defining adjective:</b>"
+msgstr ""
+
+msgid "Glorious"
+msgstr ""
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr ""
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr ""
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr ""
+
+#, fuzzy
+msgid "Unknown message"
+msgstr "Ukubwa usiojulikana"
+
+msgid "The IRC server received a message it did not understand."
+msgstr ""
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr ""
+
+msgid "Time Response"
+msgstr ""
+
+msgid "The IRC server's local time is:"
+msgstr ""
+
+msgid "No such channel"
+msgstr ""
+
+#. does this happen?
+msgid "no such channel"
+msgstr ""
+
+msgid "User is not logged in"
+msgstr ""
+
+msgid "No such nick or channel"
+msgstr ""
+
+#, fuzzy
+msgid "Could not send"
+msgstr "\"Haikuweza kupakia: \""
+
+#, c-format
+msgid "Joining %s requires an invitation."
+msgstr ""
+
+msgid "Invitation only"
+msgstr ""
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr ""
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Jina la profaili ni batili"
+
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+msgid "Nickname in use"
+msgstr ""
+
+msgid "Cannot change nick"
+msgstr ""
+
+msgid "Could not change nick"
+msgstr ""
+
+#, c-format
+msgid "You have parted the channel%s%s"
+msgstr ""
+
+msgid "Error: invalid PONG from server"
+msgstr ""
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr ""
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr ""
+
+msgid "Cannot join channel"
+msgstr ""
+
+msgid "Nick or channel is temporarily unavailable."
+msgstr ""
+
+#, c-format
+msgid "Wallops from %s"
+msgstr ""
+
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+
+msgid "chanserv: Send a command to chanserv"
+msgstr ""
+
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+
+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 ""
+
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+msgid "memoserv: Send a command to memoserv"
+msgstr ""
+
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+msgid "names [channel]:  List the users currently in a channel."
+msgstr ""
+
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr ""
+
+msgid "nickserv: Send a command to nickserv"
+msgstr ""
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+
+msgid "operserv: Send a command to operserv"
+msgstr ""
+
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+
+msgid "quote [...]:  Send a raw command to the server."
+msgstr ""
+
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+
+msgid "time: Displays the current local time at the IRC server."
+msgstr ""
+
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr ""
+
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr ""
+
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr ""
+
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr ""
+
+msgid "PONG"
+msgstr ""
+
+msgid "CTCP PING reply"
+msgstr ""
+
+msgid "Disconnected."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr "Hitilafu isiyojulikana"
+
+msgid "Ad-Hoc Command Failed"
+msgstr ""
+
+msgid "execute"
+msgstr ""
+
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+
+#, fuzzy
+msgid "Plaintext Authentication"
+msgstr "Ishara ya Uthibitisho Inayoulindwa"
+
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Uthibitisho unatakiwa"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
+
+msgid "Server does not use any supported authentication method"
+msgstr ""
+
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SSL Seva"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr ""
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Kivunge kisichokubaliwa"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy
+msgid "Full Name"
+msgstr "Jina la faili:"
+
+msgid "Family Name"
+msgstr ""
+
+msgid "Given Name"
+msgstr ""
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Street Address"
+msgstr ""
+
+msgid "Extended Address"
+msgstr ""
+
+#, fuzzy
+msgid "Locality"
+msgstr "Mahali"
+
+#, fuzzy
+msgid "Region"
+msgstr "Reunion"
+
+msgid "Postal Code"
+msgstr ""
+
+#, fuzzy
+msgid "Country"
+msgstr "Hesabu"
+
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
+msgid "Telephone"
+msgstr ""
+
+#, fuzzy
+msgid "Organization Name"
+msgstr "Jumuiya(J)"
+
+#, fuzzy
+msgid "Organization Unit"
+msgstr "Jumuiya(J)"
+
+msgid "Role"
+msgstr ""
+
+msgid "Birthday"
+msgstr ""
+
+msgid "Description"
+msgstr "Maelezo"
+
+msgid "Edit XMPP vCard"
+msgstr ""
+
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+
+msgid "Client"
+msgstr "Mteja"
+
+msgid "Operating System"
+msgstr ""
+
+#, fuzzy
+msgid "Local Time"
+msgstr "faili la kikweti"
+
+msgid "Priority"
+msgstr ""
+
+#, fuzzy
+msgid "Resource"
+msgstr "#1 rasilimali"
+
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Ingia"
+
+#, fuzzy
+msgid "Middle Name"
+msgstr "Jina la Moduli:"
+
+msgid "Address"
+msgstr "Anuani"
+
+msgid "P.O. Box"
+msgstr ""
+
+msgid "Photo"
+msgstr ""
+
+#, fuzzy
+msgid "Logo"
+msgstr "Togo"
+
+msgid "Un-hide From"
+msgstr ""
+
+msgid "Temporarily Hide From"
+msgstr ""
+
+#. && NOT ME
+msgid "Cancel Presence Notification"
+msgstr ""
+
+msgid "(Re-)Request authorization"
+msgstr ""
+
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#, fuzzy
+msgid "Unsubscribe"
+msgstr "Jiunge"
+
+#, fuzzy
+msgid "Log In"
+msgstr "I&ngia"
+
+#, fuzzy
+msgid "Log Out"
+msgstr "O&ndoka"
+
+msgid "Chatty"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+#, fuzzy
+msgid "JID"
+msgstr "UID"
+
+#, fuzzy
+msgid "Last Name"
+msgstr "Ukurasa wa mwisho"
+
+#, fuzzy
+msgid "The following are the results of your search"
+msgstr "Kuki zifuatazo zinalingana na unazotafuta:"
+
+#. current comment from Jabber User Directory users.jabber.org
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+
+msgid "Directory Query Failed"
+msgstr ""
+
+msgid "Could not query the directory server."
+msgstr ""
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#, c-format
+msgid "Server Instructions: %s"
+msgstr ""
+
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+
+msgid "Email Address"
+msgstr "Anwani ya Barua pepe"
+
+msgid "Search for XMPP users"
+msgstr ""
+
+#. "Search"
+msgid "Search"
+msgstr "Tafuta"
+
+msgid "Invalid Directory"
+msgstr ""
+
+msgid "Enter a User Directory"
+msgstr ""
+
+msgid "Select a user directory to search"
+msgstr ""
+
+#, fuzzy
+msgid "Search Directory"
+msgstr "Tafuta historia"
+
+msgid "_Room:"
+msgstr ""
+
+#, fuzzy
+msgid "_Server:"
+msgstr "Seva"
+
+msgid "_Handle:"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid room name"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid Room Name"
+msgstr "Jina batili la moduli."
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Jina batili la moduli."
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr ""
+
+msgid "Invalid Room Handle"
+msgstr ""
+
+#, fuzzy
+msgid "Configuration error"
+msgstr "Hitilafu ya Sanidi"
+
+#, fuzzy
+msgid "Unable to configure"
+msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy
+msgid "Room Configuration Error"
+msgstr "Hitilafu ya Sanidi"
+
+msgid "This room is not capable of being configured"
+msgstr ""
+
+#, fuzzy
+msgid "Registration error"
+msgstr "Hitilafu ya Sanidi"
+
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr ""
+
+msgid "Error retrieving room list"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid Server"
+msgstr "Anuani batili"
+
+msgid "Enter a Conference Server"
+msgstr ""
+
+msgid "Select a conference server to query"
+msgstr ""
+
+msgid "Find Rooms"
+msgstr ""
+
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Machaguo"
+
+#, fuzzy
+msgid "No users found"
+msgstr "Hamna uwiyano sawa na CRL uliopatikana."
+
+msgid "Roles:"
+msgstr ""
+
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Muunganiko umepita muda"
+
+msgid ""
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
+msgstr ""
+
+#, fuzzy
+msgid "Invalid XMPP ID"
+msgstr "Kizuizi batili"
+
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr ""
+
+msgid "Malformed BOSH URL"
+msgstr ""
+
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr ""
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr ""
+
+msgid "Registration Successful"
+msgstr ""
+
+#, fuzzy
+msgid "Registration Failed"
+msgstr "Usajili wa Chrome Umeshindikana"
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr ""
+
+msgid "Unregistration Successful"
+msgstr ""
+
+#, fuzzy
+msgid "Unregistration Failed"
+msgstr "Usajili wa Chrome Umeshindikana"
+
+msgid "State"
+msgstr "Hali"
+
+msgid "Postal code"
+msgstr ""
+
+#, fuzzy
+msgid "Phone"
+msgstr "Bila"
+
+#, fuzzy
+msgid "Date"
+msgstr "Tarehe:"
+
+#, fuzzy
+msgid "Already Registered"
+msgstr "Ipo"
+
+msgid "Unregister"
+msgstr ""
+
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+
+msgid "Please fill out the information below to register your new account."
+msgstr ""
+
+msgid "Register New XMPP Account"
+msgstr ""
+
+#, fuzzy
+msgid "Register"
+msgstr "Mwandishi wa habari"
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr ""
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr ""
+
+#, fuzzy
+msgid "Change Registration"
+msgstr "Usajili wa Chrome Umeshindikana"
+
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
+#, fuzzy
+msgid "Error unregistering account"
+msgstr "Hitilafu katika kusajili DLL"
+
+msgid "Account successfully unregistered"
+msgstr ""
+
+msgid "Initializing Stream"
+msgstr ""
+
+msgid "Initializing SSL/TLS"
+msgstr ""
+
+msgid "Authenticating"
+msgstr ""
+
+msgid "Re-initializing Stream"
+msgstr ""
+
+msgid "Server doesn't support blocking"
+msgstr ""
+
+msgid "Not Authorized"
+msgstr ""
+
+msgid "Mood"
+msgstr ""
+
+msgid "Now Listening"
+msgstr ""
+
+msgid "Both"
+msgstr ""
+
+msgid "From (To pending)"
+msgstr ""
+
+#, fuzzy
+msgid "From"
+msgstr "kutoka"
+
+#, fuzzy
+msgid "To"
+msgstr "Kwa:"
+
+msgid "None (To pending)"
+msgstr ""
+
+msgid "None"
+msgstr "Bila"
+
+#, fuzzy
+msgid "Subscription"
+msgstr "Maelezo"
+
+msgid "Mood Text"
+msgstr ""
+
+msgid "Allow Buzz"
+msgstr ""
+
+msgid "Tune Artist"
+msgstr ""
+
+#, fuzzy
+msgid "Tune Title"
+msgstr "Mada Fupi"
+
+msgid "Tune Album"
+msgstr ""
+
+msgid "Tune Genre"
+msgstr ""
+
+msgid "Tune Comment"
+msgstr ""
+
+msgid "Tune Track"
+msgstr ""
+
+msgid "Tune Time"
+msgstr ""
+
+msgid "Tune Year"
+msgstr ""
+
+msgid "Tune URL"
+msgstr ""
+
+#, fuzzy
+msgid "Password Changed"
+msgstr "Badilisho la Nywila limeshindikana"
+
+#, fuzzy
+msgid "Your password has been changed."
+msgstr "Nywila yako imesetiwa upya."
+
+msgid "Error changing password"
+msgstr ""
+
+#, fuzzy
+msgid "Change XMPP Password"
+msgstr "Badil &Nywila"
+
+msgid "Please enter your new password"
+msgstr ""
+
+msgid "Set User Info..."
+msgstr ""
+
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#, fuzzy
+msgid "Change Password..."
+msgstr "Badil &Nywila"
+
+#. }
+msgid "Search for Users..."
+msgstr ""
+
+msgid "Bad Request"
+msgstr ""
+
+#, fuzzy
+msgid "Conflict"
+msgstr "Thibitisha"
+
+msgid "Feature Not Implemented"
+msgstr ""
+
+msgid "Forbidden"
+msgstr ""
+
+#, fuzzy
+msgid "Gone"
+msgstr "Bila"
+
+#, fuzzy
+msgid "Internal Server Error"
+msgstr "Hitilafu ya ndani ya seva (500)"
+
+#, fuzzy
+msgid "Item Not Found"
+msgstr "Faili halipatikani"
+
+msgid "Malformed XMPP ID"
+msgstr ""
+
+#, fuzzy
+msgid "Not Acceptable"
+msgstr "Haipatikani"
+
+msgid "Not Allowed"
+msgstr ""
+
+#, fuzzy
+msgid "Payment Required"
+msgstr "Nywila inatakiwa"
+
+msgid "Recipient Unavailable"
+msgstr ""
+
+#, fuzzy
+msgid "Registration Required"
+msgstr "Uthibitisho unatakiwa"
+
+#, fuzzy
+msgid "Remote Server Not Found"
+msgstr "Wakala kompyuta tumishi hapatikani"
+
+msgid "Remote Server Timeout"
+msgstr ""
+
+msgid "Server Overloaded"
+msgstr ""
+
+msgid "Service Unavailable"
+msgstr ""
+
+#, fuzzy
+msgid "Subscription Required"
+msgstr "Uthibitisho unatakiwa"
+
+msgid "Unexpected Request"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization Aborted"
+msgstr "Sainisho limetibuliwa"
+
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid authzid"
+msgstr "Njia batili"
+
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+msgid "Authorization mechanism too weak"
+msgstr ""
+
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+#, fuzzy
+msgid "Authentication Failure"
+msgstr "Uthibitisho unatakiwa"
+
+#, fuzzy
+msgid "Bad Format"
+msgstr "Fomati"
+
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+msgid "Resource Conflict"
+msgstr ""
+
+#, fuzzy
+msgid "Connection Timeout"
+msgstr "Muunganiko umepita muda"
+
+msgid "Host Gone"
+msgstr ""
+
+msgid "Host Unknown"
+msgstr ""
+
+msgid "Improper Addressing"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid ID"
+msgstr "Kizuizi batili"
+
+msgid "Invalid Namespace"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid XML"
+msgstr "Kizuizi batili"
+
+msgid "Non-matching Hosts"
+msgstr ""
+
+msgid "Policy Violation"
+msgstr ""
+
+#, fuzzy
+msgid "Remote Connection Failed"
+msgstr "Muunganiko salama umeshindikana"
+
+msgid "Resource Constraint"
+msgstr ""
+
+msgid "Restricted XML"
+msgstr ""
+
+msgid "See Other Host"
+msgstr ""
+
+msgid "System Shutdown"
+msgstr ""
+
+#, fuzzy
+msgid "Undefined Condition"
+msgstr "kitu ambacho hakijafafanuliwa"
+
+#, fuzzy
+msgid "Unsupported Encoding"
+msgstr "Kivunge kisichokubaliwa"
+
+#, fuzzy
+msgid "Unsupported Stanza Type"
+msgstr "Kivunge kisichokubaliwa"
+
+#, fuzzy
+msgid "Unsupported Version"
+msgstr "Kivunge kisichokubaliwa"
+
+msgid "XML Not Well Formed"
+msgstr ""
+
+msgid "Stream Error"
+msgstr ""
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+msgid "Buzz"
+msgstr ""
+
+#, c-format
+msgid "%s has buzzed you!"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+msgid "Media Initiation Failed"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+msgid "Select a Resource"
+msgstr ""
+
+msgid "Initiate Media"
+msgstr ""
+
+msgid "config:  Configure a chat room."
+msgstr ""
+
+msgid "configure:  Configure a chat room."
+msgstr ""
+
+msgid "part [room]:  Leave the room."
+msgstr ""
+
+msgid "register:  Register with a chat room."
+msgstr ""
+
+msgid "topic [new topic]:  View or change the topic."
+msgstr ""
+
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr ""
+
+msgid ""
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
+msgstr ""
+
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
+msgstr ""
+
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr ""
+
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr ""
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr ""
+
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+
+msgid "buzz: Buzz a user to get their attention"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr ""
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#, fuzzy
+msgid "Domain"
+msgstr "Kikoa:"
+
+msgid "Require SSL/TLS"
+msgstr ""
+
+msgid "Force old (port 5223) SSL"
+msgstr ""
+
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+#, fuzzy
+msgid "Connect port"
+msgstr "Unganisho"
+
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
+#. Account options
+msgid "Connect server"
+msgstr ""
+
+msgid "File transfer proxies"
+msgstr ""
+
+msgid "BOSH URL"
+msgstr ""
+
+#. this should probably be part of global smiley theme settings later on,
+#. shared with MSN
+msgid "Show Custom Smileys"
+msgstr ""
+
+#, c-format
+msgid "%s has left the conversation."
+msgstr ""
+
+#, c-format
+msgid "Message from %s"
+msgstr ""
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr ""
+
+#, c-format
+msgid "The topic is: %s"
+msgstr ""
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr ""
+
+msgid "XMPP Message Error"
+msgstr ""
+
+#, c-format
+msgid "(Code %s)"
+msgstr ""
+
+msgid "XML Parse error"
+msgstr ""
+
+msgid "Unknown Error in presence"
+msgstr ""
+
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
+msgid "Create New Room"
+msgstr ""
+
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+
+msgid "_Configure Room"
+msgstr ""
+
+#, fuzzy
+msgid "_Accept Defaults"
+msgstr "Misingi ya mfumo"
+
+#, fuzzy
+msgid "No reason"
+msgstr "Hitilafu isiyojulikana"
+
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "(%S)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr ""
+
+msgid "Failed to open the file"
+msgstr ""
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr ""
+
+msgid "File Send Failed"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr ""
+
+msgid "Edit User Mood"
+msgstr ""
+
+msgid "Please select your mood from the list."
+msgstr ""
+
+#, fuzzy
+msgid "Set"
+msgstr "Sep"
+
+msgid "Set Mood..."
+msgstr ""
+
+msgid "Set User Nickname"
+msgstr ""
+
+msgid "Please specify a new nickname for you."
+msgstr ""
+
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+msgid "Set Nickname..."
+msgstr ""
+
+#, fuzzy
+msgid "Actions"
+msgstr "Machaguo"
+
+msgid "Select an action"
+msgstr ""
+
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Haiwezi kuongeza moduli"
+
+msgid "Buddy Add error"
+msgstr ""
+
+msgid "The username specified does not exist."
+msgstr ""
+
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable to parse message"
+msgstr "Haiwezi kuongeza moduli"
+
+#, c-format
+msgid "Syntax Error (probably a client bug)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Invalid email address"
+msgstr "Anuani batili"
+
+#, fuzzy, c-format
+msgid "User does not exist"
+msgstr "Faili %S halipo"
+
+#, c-format
+msgid "Fully qualified domain name missing"
+msgstr ""
+
+#, c-format
+msgid "Already logged in"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Invalid username"
+msgstr "Jina batili la moduli."
+
+#, fuzzy, c-format
+msgid "Invalid friendly name"
+msgstr "Jina la profaili ni batili"
+
+#, c-format
+msgid "List full"
+msgstr ""
+
+#, c-format
+msgid "Already there"
+msgstr ""
+
+#, c-format
+msgid "Not on list"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "User is offline"
+msgstr "Fanya &kazi nje ya mkondo"
+
+#, c-format
+msgid "Already in the mode"
+msgstr ""
+
+#, c-format
+msgid "Already in opposite list"
+msgstr ""
+
+#, c-format
+msgid "Too many groups"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Invalid group"
+msgstr "Ingizo batili"
+
+#, c-format
+msgid "User not in group"
+msgstr ""
+
+#, c-format
+msgid "Group name too long"
+msgstr ""
+
+#, c-format
+msgid "Cannot remove group zero"
+msgstr ""
+
+#, c-format
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr ""
+
+#, c-format
+msgid "Switchboard failed"
+msgstr ""
+
+#, c-format
+msgid "Notify transfer failed"
+msgstr ""
+
+#, c-format
+msgid "Required fields missing"
+msgstr ""
+
+#, c-format
+msgid "Too many hits to a FND"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Not logged in"
+msgstr "Hajaingia"
+
+#, c-format
+msgid "Service temporarily unavailable"
+msgstr ""
+
+#, c-format
+msgid "Database server error"
+msgstr ""
+
+#, c-format
+msgid "Command disabled"
+msgstr ""
+
+#, c-format
+msgid "File operation error"
+msgstr ""
+
+#, c-format
+msgid "Memory allocation error"
+msgstr ""
+
+#, c-format
+msgid "Wrong CHL value sent to server"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Server busy"
+msgstr "Seva"
+
+#, c-format
+msgid "Server unavailable"
+msgstr ""
+
+#, c-format
+msgid "Peer notification server down"
+msgstr ""
+
+#, c-format
+msgid "Database connect error"
+msgstr ""
+
+#, c-format
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error creating connection"
+msgstr "Hitilafu kwenye utengenezaji wa saraka:"
+
+#, c-format
+msgid "CVR parameters are either unknown or not allowed"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable to write"
+msgstr "Nimeshindwa Kusasisha"
+
+#, c-format
+msgid "Session overload"
+msgstr ""
+
+#, c-format
+msgid "User is too active"
+msgstr ""
+
+#, c-format
+msgid "Too many sessions"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Passport not verified"
+msgstr "(Mwandishi hajathibitishwa)"
+
+#, c-format
+msgid "Bad friend file"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Not expected"
+msgstr "Hakuna iliyochaguliwa"
+
+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Server too busy"
+msgstr "Seva haipatikani"
+
+#, fuzzy, c-format
+msgid "Authentication failed"
+msgstr "Uthibitisho unatakiwa"
+
+#, c-format
+msgid "Not allowed when offline"
+msgstr ""
+
+#, c-format
+msgid "Not accepting new users"
+msgstr ""
+
+#, c-format
+msgid "Kids Passport without parental consent"
+msgstr ""
+
+#, c-format
+msgid "Passport account not yet verified"
+msgstr ""
+
+msgid "Passport account suspended"
+msgstr ""
+
+#, c-format
+msgid "Bad ticket"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unknown Error Code %d"
+msgstr "Hitilafu isiyojulikana"
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr ""
+
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Lugha nyinginezo"
+
+msgid "Non-IM Contacts"
+msgstr ""
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
+msgid "Nudge"
+msgstr ""
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr ""
+
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
+
+#, fuzzy
+msgid "Email Address..."
+msgstr "Anwani ya Barua pepe"
+
+msgid "Your new MSN friendly name is too long."
+msgstr ""
+
+msgid "Set your friendly name."
+msgstr ""
+
+msgid "This is the name that other MSN buddies will see you as."
+msgstr ""
+
+msgid "Set your home phone number."
+msgstr ""
+
+msgid "Set your work phone number."
+msgstr ""
+
+msgid "Set your mobile phone number."
+msgstr ""
+
+msgid "Allow MSN Mobile pages?"
+msgstr ""
+
+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 ""
+
+msgid "Allow"
+msgstr "Ruhusu"
+
+#, fuzzy
+msgid "Disallow"
+msgstr "Lemaza"
+
+#, c-format
+msgid "Blocked Text for %s"
+msgstr ""
+
+msgid "No text is blocked for this account."
+msgstr ""
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+
+msgid "This account does not have email enabled."
+msgstr ""
+
+msgid "Send a mobile message."
+msgstr ""
+
+#, fuzzy
+msgid "Page"
+msgstr "Ukurasa wa #"
+
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Tahadhari:"
+
+msgid "Has you"
+msgstr ""
+
+msgid "Home Phone Number"
+msgstr ""
+
+msgid "Work Phone Number"
+msgstr ""
+
+msgid "Mobile Phone Number"
+msgstr ""
+
+msgid "Be Right Back"
+msgstr ""
+
+msgid "Busy"
+msgstr ""
+
+msgid "On the Phone"
+msgstr ""
+
+msgid "Out to Lunch"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+msgid "Artist"
+msgstr ""
+
+msgid "Album"
+msgstr ""
+
+#, fuzzy
+msgid "Game Title"
+msgstr "Mada Fupi"
+
+msgid "Office Title"
+msgstr ""
+
+msgid "Set Friendly Name..."
+msgstr ""
+
+msgid "Set Home Phone Number..."
+msgstr ""
+
+msgid "Set Work Phone Number..."
+msgstr ""
+
+msgid "Set Mobile Phone Number..."
+msgstr ""
+
+msgid "Enable/Disable Mobile Devices..."
+msgstr ""
+
+msgid "Allow/Disallow Mobile Pages..."
+msgstr ""
+
+msgid "View Blocked Text..."
+msgstr ""
+
+msgid "Open Hotmail Inbox"
+msgstr ""
+
+msgid "Send to Mobile"
+msgstr ""
+
+msgid "Initiate _Chat"
+msgstr ""
+
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+
+msgid "Error retrieving profile"
+msgstr ""
+
+msgid "General"
+msgstr "Ujumla"
+
+msgid "Age"
+msgstr ""
+
+#, fuzzy
+msgid "Occupation"
+msgstr "Mahali"
+
+msgid "Location"
+msgstr "Mahali"
+
+msgid "Hobbies and Interests"
+msgstr ""
+
+msgid "A Little About Me"
+msgstr ""
+
+msgid "Social"
+msgstr ""
+
+msgid "Marital Status"
+msgstr ""
+
+msgid "Interests"
+msgstr ""
+
+#, fuzzy
+msgid "Pets"
+msgstr "Bonyeza"
+
+msgid "Hometown"
+msgstr ""
+
+msgid "Places Lived"
+msgstr ""
+
+msgid "Fashion"
+msgstr ""
+
+msgid "Humor"
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Favorite Quote"
+msgstr ""
+
+msgid "Contact Info"
+msgstr ""
+
+#, fuzzy
+msgid "Personal"
+msgstr "Kipersia"
+
+msgid "Significant Other"
+msgstr ""
+
+msgid "Home Phone"
+msgstr ""
+
+msgid "Home Phone 2"
+msgstr ""
+
+#, fuzzy
+msgid "Home Address"
+msgstr "Anwani-IP"
+
+msgid "Personal Mobile"
+msgstr ""
+
+msgid "Home Fax"
+msgstr ""
+
+msgid "Personal Email"
+msgstr ""
+
+msgid "Personal IM"
+msgstr ""
+
+#, fuzzy
+msgid "Anniversary"
+msgstr "Universal"
+
+#. Business
+msgid "Work"
+msgstr ""
+
+#, fuzzy
+msgid "Job Title"
+msgstr "Cheo cha &kazi:"
+
+msgid "Company"
+msgstr ""
+
+msgid "Department"
+msgstr ""
+
+msgid "Profession"
+msgstr ""
+
+msgid "Work Phone"
+msgstr ""
+
+msgid "Work Phone 2"
+msgstr ""
+
+#, fuzzy
+msgid "Work Address"
+msgstr "Anwani-IP"
+
+msgid "Work Mobile"
+msgstr ""
+
+msgid "Work Pager"
+msgstr ""
+
+msgid "Work Fax"
+msgstr ""
+
+msgid "Work Email"
+msgstr ""
+
+msgid "Work IM"
+msgstr ""
+
+#, fuzzy
+msgid "Start Date"
+msgstr "Anzisha Upya Baadae"
+
+#, fuzzy
+msgid "Favorite Things"
+msgstr "Vibwedo"
+
+#, fuzzy
+msgid "Last Updated"
+msgstr "Sasisho la mara ya mwisho"
+
+#, fuzzy
+msgid "Homepage"
+msgstr "Ukurasa wa &Nyumbani:"
+
+msgid "The user has not created a public profile."
+msgstr ""
+
+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 ""
+
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+
+msgid "View web profile"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *< summary
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr ""
+
+msgid "Use HTTP Method"
+msgstr ""
+
+msgid "HTTP Method Server"
+msgstr ""
+
+msgid "Show custom smileys"
+msgstr ""
+
+msgid "nudge: nudge a user to get their attention"
+msgstr ""
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr ""
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr ""
+
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
+msgstr "Hitilafu isiyojulikana"
+
+#, fuzzy
+msgid "Unable to add user"
+msgstr "Haiwezi kuongeza moduli"
+
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Hitilafu isiyojulikana"
+
+msgid "The following users are missing from your addressbook"
+msgstr ""
+
+msgid "Mobile message was not sent because it was too long."
+msgstr ""
+
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr ""
+
+msgid "Writing error"
+msgstr ""
+
+msgid "Reading error"
+msgstr ""
+
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
+"%s"
+msgstr ""
+
+msgid "Our protocol is not supported by the server"
+msgstr ""
+
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "Hitilafu katika kuhifadhi %S"
+
+msgid "You have signed on from another location"
+msgstr ""
+
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr ""
+
+msgid "The MSN servers are going down temporarily"
+msgstr ""
+
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr ""
+
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+
+msgid "Handshaking"
+msgstr ""
+
+msgid "Transferring"
+msgstr ""
+
+msgid "Starting authentication"
+msgstr ""
+
+#, fuzzy
+msgid "Getting cookie"
+msgstr "Anza"
+
+#, fuzzy
+msgid "Sending cookie"
+msgstr "Tuma Habari…"
+
+msgid "Retrieving buddy list"
+msgstr ""
+
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+msgid "Away From Computer"
+msgstr ""
+
+msgid "On The Phone"
+msgstr ""
+
+msgid "Out To Lunch"
+msgstr ""
+
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr ""
+
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr ""
+
+msgid "Message could not be sent because the user is offline:"
+msgstr ""
+
+msgid "Message could not be sent because a connection error occurred:"
+msgstr ""
+
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr ""
+
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr ""
+
+msgid "Delete Buddy from Address Book?"
+msgstr ""
+
+msgid "Do you want to delete this buddy from your address book as well?"
+msgstr ""
+
+#, fuzzy
+msgid "The username specified is invalid."
+msgstr "Nambari mstari iliyoingizwa ni batili."
+
+msgid "This Hotmail account may not be active."
+msgstr ""
+
+#, fuzzy
+msgid "Profile URL"
+msgstr "Profile Linatumika"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "MSN Protocol Plugin"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, fuzzy
+msgid "Unknown error."
+msgstr "Hitilafu isiyojulikana"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to rename group"
+msgstr "Haiwezi kufuta moduli"
+
+#, fuzzy
+msgid "Unable to delete group"
+msgstr "Haiwezi kufuta moduli"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+msgid "User lookup"
+msgstr ""
+
+msgid "Reading challenge"
+msgstr ""
+
+#, fuzzy
+msgid "Unexpected challenge length from server"
+msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
+
+#, fuzzy
+msgid "Logging in"
+msgstr "Ingia"
+
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+msgid "Lost connection with server"
+msgstr ""
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
+msgid "New mail messages"
+msgstr ""
+
+msgid "New blog comments"
+msgstr ""
+
+msgid "New profile comments"
+msgstr ""
+
+msgid "New friend requests!"
+msgstr ""
+
+msgid "New picture comments"
+msgstr ""
+
+#, fuzzy
+msgid "MySpace"
+msgstr "Nafasi"
+
+msgid "IM Friends"
+msgstr ""
+
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Add contacts from server"
+msgstr ""
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr ""
+
+msgid "Incorrect username or password"
+msgstr ""
+
+msgid "MySpaceIM Error"
+msgstr ""
+
+msgid "Invalid input condition"
+msgstr ""
+
+msgid "Failed to add buddy"
+msgstr ""
+
+msgid "'addbuddy' command failed."
+msgstr ""
+
+msgid "persist command failed"
+msgstr ""
+
+msgid "Failed to remove buddy"
+msgstr ""
+
+msgid "'delbuddy' command failed"
+msgstr ""
+
+msgid "blocklist command failed"
+msgstr ""
+
+#, fuzzy
+msgid "Missing Cipher"
+msgstr "Faili linalokosekana"
+
+msgid "The RC4 cipher could not be found"
+msgstr ""
+
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+
+msgid "Add friends from MySpace.com"
+msgstr ""
+
+msgid "Importing friends failed"
+msgstr ""
+
+#. TODO: find out how
+msgid "Find people..."
+msgstr ""
+
+msgid "Change IM name..."
+msgstr ""
+
+msgid "myim URL handler"
+msgstr ""
+
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+msgid "Show display name in status text"
+msgstr ""
+
+msgid "Show headline in status text"
+msgstr ""
+
+msgid "Send emoticons"
+msgstr ""
+
+msgid "Screen resolution (dots per inch)"
+msgstr ""
+
+msgid "Base font size (points)"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Headline"
+msgstr ""
+
+#, fuzzy
+msgid "Song"
+msgstr "Kitonga"
+
+msgid "Total Friends"
+msgstr ""
+
+#, fuzzy
+msgid "Client Version"
+msgstr "Toleo Jipya"
+
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
+msgid "MySpaceIM - Username Available"
+msgstr ""
+
+msgid "This username is available. Would you like to set it?"
+msgstr ""
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr ""
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
+msgid "This username is unavailable."
+msgstr ""
+
+msgid "Please try another username:"
+msgstr ""
+
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr ""
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
+#. TODO: icons for each zap
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+msgid "Zap"
+msgstr ""
+
+#, c-format
+msgid "%s has zapped you!"
+msgstr ""
+
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#. Whack means "to hit or strike someone with a sharp blow"
+#, fuzzy
+msgid "Whack"
+msgstr "Nyuma"
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr ""
+
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#, fuzzy
+msgid "Torch"
+msgstr "Machi"
+
+#, c-format
+msgid "%s has torched you!"
+msgstr ""
+
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr ""
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr ""
+
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#. A hug is a display of affection; wrapping your arms around someone
+#, fuzzy
+msgid "Hug"
+msgstr "Ago"
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr ""
+
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr ""
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr ""
+
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#. Goose means "to pinch someone on their butt"
+#, fuzzy
+msgid "Goose"
+msgstr "Google"
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr ""
+
+#, c-format
+msgid "Goosing %s..."
+msgstr ""
+
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+msgid "High-five"
+msgstr ""
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr ""
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr ""
+
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+msgid "Punk"
+msgstr ""
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr ""
+
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+msgid "Raspberry"
+msgstr ""
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr ""
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
+msgid "Required parameters not passed in"
+msgstr ""
+
+msgid "Unable to write to network"
+msgstr ""
+
+msgid "Unable to read from network"
+msgstr ""
+
+msgid "Error communicating with server"
+msgstr ""
+
+#, fuzzy
+msgid "Conference not found"
+msgstr "Mstari haujapatikana"
+
+#, fuzzy
+msgid "Conference does not exist"
+msgstr "Faili lililohitajiwa halipo"
+
+#, fuzzy
+msgid "A folder with that name already exists"
+msgstr "Ufunguo wenye lakabu kama hii tayari upo."
+
+#, fuzzy
+msgid "Not supported"
+msgstr "Haujaanza"
+
+#, fuzzy
+msgid "Password has expired"
+msgstr "Nywila inatakiwa"
+
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Nywila ya sasa hivi:"
+
+#, fuzzy
+msgid "User not found"
+msgstr "Seva haipatikani"
+
+msgid "Account has been disabled"
+msgstr ""
+
+msgid "The server could not access the directory"
+msgstr ""
+
+msgid "Your system administrator has disabled this operation"
+msgstr ""
+
+msgid "The server is unavailable; try again later"
+msgstr ""
+
+msgid "Cannot add a contact to the same folder twice"
+msgstr ""
+
+msgid "Cannot add yourself"
+msgstr ""
+
+msgid "Master archive is misconfigured"
+msgstr ""
+
+msgid "Could not recognize the host of the username you entered"
+msgstr ""
+
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+
+msgid "You cannot add the same person twice to a conversation"
+msgstr ""
+
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr ""
+
+msgid "You have entered an incorrect username"
+msgstr ""
+
+msgid "An error occurred while updating the directory"
+msgstr ""
+
+msgid "Incompatible protocol version"
+msgstr ""
+
+msgid "The user has blocked you"
+msgstr ""
+
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+
+msgid "The user is either offline or you are blocked"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unknown error: 0x%X"
+msgstr "Hitilafu isiyojulikana"
+
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Haikuweza kuunganishwa"
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr ""
+
+#. TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr ""
+
+msgid "Error communicating with server. Closing connection."
+msgstr ""
+
+msgid "Telephone Number"
+msgstr ""
+
+msgid "Personal Title"
+msgstr ""
+
+msgid "Mailstop"
+msgstr ""
+
+msgid "User ID"
+msgstr ""
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. purple_notify_user_info_add_pair(user_info, tag, value);
+#. }
+#.
+#, fuzzy
+msgid "Full name"
+msgstr "Jina la faili:"
+
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr ""
+
+msgid "Authenticating..."
+msgstr ""
+
+msgid "Waiting for response..."
+msgstr ""
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr ""
+
+msgid "Invitation to Conversation"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+
+#, fuzzy
+msgid "Would you like to join the conversation?"
+msgstr "Ungependa kuhifadhi faili hili?"
+
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+
+msgid ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr ""
+
+msgid "This conference has been closed. No more messages can be sent."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr ""
+
+msgid "Server address"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
+
+#. username connecting too frequently
+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 ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Hitilafu katika kuhifadhi %S"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+msgid "Could not join chat room"
+msgstr ""
+
+msgid "Invalid chat room name"
+msgstr ""
+
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr ""
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr ""
+
+#, fuzzy
+msgid "Encoding"
+msgstr "Kisimba:"
+
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "Mwenzi SSL imefunga uunganisho huu"
+
+msgid "The remote user has declined your request."
+msgstr ""
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
+
+msgid "Received invalid data on connection with remote user."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
+
+msgid "Direct IM established"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+
+#, fuzzy
+msgid "Invalid error"
+msgstr "Kizuizi batili"
+
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Kizuizi batili"
+
+msgid "Rate to host"
+msgstr ""
+
+msgid "Rate to client"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr ""
+
+msgid "Service not defined"
+msgstr ""
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+msgid "Not supported by host"
+msgstr ""
+
+msgid "Not supported by client"
+msgstr ""
+
+msgid "Refused by client"
+msgstr ""
+
+msgid "Reply too big"
+msgstr ""
+
+msgid "Responses lost"
+msgstr ""
+
+#, fuzzy
+msgid "Request denied"
+msgstr "Ufikio umekataliwa"
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr ""
+
+msgid "In local permit/deny"
+msgstr ""
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr ""
+
+#, fuzzy
+msgid "No match"
+msgstr "%S oanisho"
+
+msgid "List overflow"
+msgstr ""
+
+msgid "Request ambiguous"
+msgstr ""
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+
+#, c-format
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+#, fuzzy
+msgid "Get File"
+msgstr "Mafaili ya Matini"
+
+#, fuzzy
+msgid "Games"
+msgstr "Jina"
+
+#, fuzzy
+msgid "Add-Ins"
+msgstr "Nyongeza"
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+#, fuzzy
+msgid "Security Enabled"
+msgstr "Levo ya Usalama"
+
+#, fuzzy
+msgid "Video Chat"
+msgstr "Podikasti Video"
+
+msgid "iChat AV"
+msgstr ""
+
+#, fuzzy
+msgid "Live Video"
+msgstr "Hifadhi video"
+
+#, fuzzy
+msgid "Camera"
+msgstr "Cameroon"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "Free For Chat"
+msgstr ""
+
+msgid "Not Available"
+msgstr "Haipatikani"
+
+msgid "Occupied"
+msgstr ""
+
+msgid "Web Aware"
+msgstr ""
+
+msgid "Invisible"
+msgstr ""
+
+msgid "IP Address"
+msgstr "Anwani-IP"
+
+#, fuzzy
+msgid "Warning Level"
+msgstr "Jumbe za tahadhari"
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr "Imeshindwa kuipata seva wakala"
+
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Imeshindwa kuipata seva wakala"
+
+#, fuzzy
+msgid "Username sent"
+msgstr "Jina la mtumiaji"
+
+msgid "Connection established, cookie sent"
+msgstr ""
+
+#. TODO: Don't call this with ssi
+msgid "Finalizing connection"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Faili %S halipo"
+
+#. Suspended account
+msgid "Your account is currently suspended"
+msgstr ""
+
+#. service temporarily unavailable
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr ""
+
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr ""
+
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "Nambari mstari iliyoingizwa ni batili."
+
+msgid "Enter SecurID"
+msgstr ""
+
+msgid "Enter the 6 digit number from the digital display."
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#, fuzzy
+msgid "_OK"
+msgstr "Sawa"
+
+#, fuzzy
+msgid "Password sent"
+msgstr "Nywila"
+
+msgid "Unable to initialize connection"
+msgstr ""
+
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "Authorization Request Message:"
+msgstr ""
+
+msgid "Please authorize me!"
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+
+msgid "ICQ authorization denied."
+msgstr ""
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr ""
+
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr ""
+
+#, fuzzy
+msgid "_Add"
+msgstr "Ongeza"
+
+msgid "_Decline"
+msgstr ""
+
+#, 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] ""
+
+#, 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] ""
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#, 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] ""
+
+#. Data is assumed to be the destination bn
+#, c-format
+msgid "Unable to send message: %s"
+msgstr ""
+
+#, fuzzy
+msgid "Unknown reason."
+msgstr "Hitilafu isiyojulikana"
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Your AIM connection may be lost."
+msgstr ""
+
+#. The conversion failed!
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+
+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 ""
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr ""
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+#, fuzzy
+msgid "Additional Information"
+msgstr "Inachunguza taarifa"
+
+msgid "Zip Code"
+msgstr ""
+
+#, fuzzy
+msgid "Work Information"
+msgstr "Taarifa Zaidi"
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "Nafasi:"
+
+msgid "Web Page"
+msgstr ""
+
+msgid "Pop-Up Message"
+msgstr ""
+
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "No results found for email address %s"
+msgstr ""
+
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr ""
+
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many usernames associated with it."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+msgid "Error Changing Account Info"
+msgstr ""
+
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+msgid "Account Info"
+msgstr ""
+
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+
+msgid "Unable to set AIM profile."
+msgstr ""
+
+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 ""
+
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Profile too long."
+msgstr ""
+
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Away message too long."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to Add"
+msgstr "Nimeshindwa Kusasisha"
+
+msgid "Unable to Retrieve Buddy List"
+msgstr ""
+
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few minutes."
+msgstr ""
+
+msgid "Orphans"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+
+#, fuzzy
+msgid "(no name)"
+msgstr "(hakuna lakabu)"
+
+#, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr ""
+
+#, c-format
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+
+msgid "Authorization Given"
+msgstr ""
+
+#. Granted
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+
+msgid "Authorization Granted"
+msgstr ""
+
+#. Denied
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization Denied"
+msgstr "Uthibitisho unatakiwa"
+
+msgid "_Exchange:"
+msgstr ""
+
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+
+msgid "iTunes Music Store Link"
+msgstr ""
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr ""
+
+msgid "Buddy Comment:"
+msgstr ""
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#, fuzzy
+msgid "C_onnect"
+msgstr "Yaliyomo"
+
+msgid "Get AIM Info"
+msgstr ""
+
+#. We only do this if the user is in our buddy list
+msgid "Edit Buddy Comment"
+msgstr ""
+
+msgid "Get Status Msg"
+msgstr ""
+
+#, fuzzy
+msgid "Direct IM"
+msgstr "Mwelekeo"
+
+msgid "Re-request Authorization"
+msgstr ""
+
+msgid "Require authorization"
+msgstr ""
+
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr ""
+
+msgid "ICQ Privacy Options"
+msgstr ""
+
+msgid "The new formatting is invalid."
+msgstr ""
+
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr ""
+
+msgid "Change Address To:"
+msgstr ""
+
+msgid "<i>you are not waiting for authorization</i>"
+msgstr ""
+
+msgid "You are awaiting authorization from the following buddies"
+msgstr ""
+
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+
+msgid "Find Buddy by Email"
+msgstr ""
+
+msgid "Search for a buddy by email address"
+msgstr ""
+
+msgid "Type the email address of the buddy you are searching for."
+msgstr ""
+
+#, fuzzy
+msgid "_Search"
+msgstr "Tafuta"
+
+msgid "Set User Info (web)..."
+msgstr ""
+
+#. This only happens when connecting with the old-style BUCP login
+#, fuzzy
+msgid "Change Password (web)"
+msgstr "Badil &Nywila"
+
+msgid "Configure IM Forwarding (web)"
+msgstr ""
+
+#. ICQ actions
+msgid "Set Privacy Options..."
+msgstr ""
+
+#. AIM actions
+#, fuzzy
+msgid "Confirm Account"
+msgstr "Thibitisha kufunga"
+
+msgid "Display Currently Registered Email Address"
+msgstr ""
+
+msgid "Change Currently Registered Email Address..."
+msgstr ""
+
+msgid "Show Buddies Awaiting Authorization"
+msgstr ""
+
+msgid "Search for Buddy by Email Address..."
+msgstr ""
+
+msgid "Search for Buddy by Information"
+msgstr ""
+
+msgid "Use clientLogin"
+msgstr ""
+
+msgid ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
+msgstr ""
+
+msgid "Allow multiple simultaneous logins"
+msgstr ""
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr ""
+
+msgid "Attempting to connect via proxy server."
+msgstr ""
+
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr ""
+
+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 ""
+
+msgid "Aquarius"
+msgstr ""
+
+msgid "Pisces"
+msgstr ""
+
+msgid "Aries"
+msgstr ""
+
+#, fuzzy
+msgid "Taurus"
+msgstr "Kinauru"
+
+msgid "Gemini"
+msgstr ""
+
+#, fuzzy
+msgid "Cancer"
+msgstr "Ghairi"
+
+#, fuzzy
+msgid "Leo"
+msgstr "Lao"
+
+msgid "Virgo"
+msgstr ""
+
+#, fuzzy
+msgid "Libra"
+msgstr "Libya"
+
+msgid "Scorpio"
+msgstr ""
+
+msgid "Sagittarius"
+msgstr ""
+
+msgid "Capricorn"
+msgstr ""
+
+#, fuzzy
+msgid "Rat"
+msgstr "Jmosi"
+
+msgid "Ox"
+msgstr ""
+
+#, fuzzy
+msgid "Tiger"
+msgstr "Niger"
+
+#, fuzzy
+msgid "Rabbit"
+msgstr "Mibbit"
+
+msgid "Dragon"
+msgstr ""
+
+#, fuzzy
+msgid "Snake"
+msgstr "Hifadhi"
+
+#, fuzzy
+msgid "Horse"
+msgstr "Nyumbani"
+
+msgid "Goat"
+msgstr ""
+
+#, fuzzy
+msgid "Monkey"
+msgstr "Jumatatu"
+
+#, fuzzy
+msgid "Rooster"
+msgstr "Mwandishi wa habari"
+
+msgid "Dog"
+msgstr ""
+
+msgid "Pig"
+msgstr ""
+
+#, fuzzy
+msgid "Other"
+msgstr "Wengine"
+
+#, fuzzy
+msgid "Visible"
+msgstr "Lemaza"
+
+msgid "Friend Only"
+msgstr ""
+
+#, fuzzy
+msgid "Private"
+msgstr "Faragha"
+
+msgid "QQ Number"
+msgstr ""
+
+msgid "Country/Region"
+msgstr ""
+
+msgid "Province/State"
+msgstr ""
+
+#, fuzzy
+msgid "Zipcode"
+msgstr "Folda la Zipu"
+
+msgid "Phone Number"
+msgstr ""
+
+msgid "Authorize adding"
+msgstr ""
+
+msgid "Cellphone Number"
+msgstr ""
+
+msgid "Personal Introduction"
+msgstr ""
+
+msgid "City/Area"
+msgstr ""
+
+msgid "Publish Mobile"
+msgstr ""
+
+msgid "Publish Contact"
+msgstr ""
+
+#, fuzzy
+msgid "College"
+msgstr "Kunja"
+
+msgid "Horoscope"
+msgstr ""
+
+msgid "Zodiac"
+msgstr ""
+
+#, fuzzy
+msgid "Blood"
+msgstr "Zuia"
+
+#, fuzzy
+msgid "True"
+msgstr "Jnne"
+
+#, fuzzy
+msgid "False"
+msgstr "si kweli"
+
+msgid "Modify Contact"
+msgstr ""
+
+#, fuzzy
+msgid "Modify Address"
+msgstr "Anwani ya Barua pepe"
+
+msgid "Modify Extended Information"
+msgstr ""
+
+#, fuzzy
+msgid "Modify Information"
+msgstr "Taarifa Zaidi"
+
+msgid "Update"
+msgstr "Sasisha"
+
+msgid "Could not change buddy information."
+msgstr ""
+
+#, fuzzy
+msgid "Mobile"
+msgstr "Moduli"
+
+#, fuzzy
+msgid "Note"
+msgstr "Bila"
+
+#. callback
+msgid "Buddy Memo"
+msgstr ""
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "R&ekebisha"
+
+msgid "Memo Modify"
+msgstr ""
+
+msgid "Server says:"
+msgstr ""
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, c-format
+msgid "%u requires verification"
+msgstr ""
+
+msgid "Add buddy question"
+msgstr ""
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Ingiza neno tafuti:"
+
+#, fuzzy
+msgid "Send"
+msgstr "Kivenda"
+
+#, fuzzy
+msgid "Invalid answer."
+msgstr "Agumenti batili"
+
+msgid "Authorization denied message:"
+msgstr ""
+
+msgid "Sorry, you're not my style."
+msgstr ""
+
+#, c-format
+msgid "%u needs authorization"
+msgstr ""
+
+msgid "Add buddy authorize"
+msgstr ""
+
+msgid "Enter request here"
+msgstr ""
+
+msgid "Would you be my friend?"
+msgstr ""
+
+msgid "QQ Buddy"
+msgstr ""
+
+msgid "Add buddy"
+msgstr ""
+
+msgid "Invalid QQ Number"
+msgstr ""
+
+msgid "Failed sending authorize"
+msgstr ""
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr ""
+
+#, c-format
+msgid "Failed removing me from %d's buddy list"
+msgstr ""
+
+msgid "No reason given"
+msgstr ""
+
+#. only need to get value
+#, c-format
+msgid "You have been added by %s"
+msgstr ""
+
+#, fuzzy
+msgid "Would you like to add him?"
+msgstr "Ungependa kuhifadhi faili hili?"
+
+#, c-format
+msgid "Rejected by %s"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Message: %s"
+msgstr "Ujumbe"
+
+msgid "ID: "
+msgstr ""
+
+#, fuzzy
+msgid "Group ID"
+msgstr "Kusanya kwa:"
+
+msgid "QQ Qun"
+msgstr ""
+
+msgid "Please enter Qun number"
+msgstr ""
+
+msgid "You can only search for permanent Qun\n"
+msgstr ""
+
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
+#, fuzzy
+msgid "Not member"
+msgstr "Novemba"
+
+#, fuzzy
+msgid "Member"
+msgstr "Novemba"
+
+msgid "Requesting"
+msgstr ""
+
+msgid "Admin"
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+#, fuzzy
+msgid "Detail"
+msgstr "Ufafanuzi"
+
+msgid "Creator"
+msgstr ""
+
+#, fuzzy
+msgid "About me"
+msgstr "Kuhusu %S"
+
+msgid "Category"
+msgstr ""
+
+msgid "The Qun does not allow others to join"
+msgstr ""
+
+msgid "Join QQ Qun"
+msgstr ""
+
+msgid "Input request here"
+msgstr ""
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr ""
+
+#, fuzzy
+msgid "Successfully joined Qun"
+msgstr "Imesakinishwa kimafanikio %S."
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr ""
+
+msgid "QQ Qun Operation"
+msgstr ""
+
+#, fuzzy
+msgid "Failed:"
+msgstr "Imeshindwa"
+
+msgid "Join Qun, Unknown Reply"
+msgstr ""
+
+#, fuzzy
+msgid "Quit Qun"
+msgstr "Funga %s"
+
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+
+msgid "Sorry, you are not our style"
+msgstr ""
+
+msgid "Successfully changed Qun members"
+msgstr ""
+
+msgid "Successfully changed Qun information"
+msgstr ""
+
+msgid "You have successfully created a Qun"
+msgstr ""
+
+msgid "Would you like to set up detailed information now?"
+msgstr ""
+
+#, fuzzy
+msgid "Setup"
+msgstr "Sep"
+
+#, c-format
+msgid "%u requested to join Qun %u for %s"
+msgstr ""
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr ""
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr ""
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr ""
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr ""
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unknown-%d"
+msgstr "Isiyojulikana: %S"
+
+#, fuzzy
+msgid "Level"
+msgstr "Lebo"
+
+msgid " VIP"
+msgstr ""
+
+msgid " TCP"
+msgstr ""
+
+msgid " FromMobile"
+msgstr ""
+
+msgid " BindMobile"
+msgstr ""
+
+#, fuzzy
+msgid " Video"
+msgstr "Hifadhi video"
+
+#, fuzzy
+msgid " Zone"
+msgstr "Bila"
+
+#, fuzzy
+msgid "Flag"
+msgstr "Kifulah"
+
+msgid "Ver"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid name"
+msgstr "Njia batili"
+
+msgid "Select icon..."
+msgstr ""
+
+#, c-format
+msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Total Online Buddies</b>: %d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Server</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Client Tag</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>My Internet IP</b>: %s:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Sent</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Resend</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Lost</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Received</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Received Duplicate</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>IP</b>: %s<br>\n"
+msgstr ""
+
+#, fuzzy
+msgid "Login Information"
+msgstr "Taarifa Zaidi"
+
+msgid "<p><b>Original Author</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Code Contributors</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Acknowledgement</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr ""
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
+msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
+msgstr ""
+
+msgid "<i>Feel free to join us!</i> :)"
+msgstr ""
+
+#, c-format
+msgid "About OpenQ %s"
+msgstr ""
+
+msgid "Change Icon"
+msgstr ""
+
+#, fuzzy
+msgid "Change Password"
+msgstr "Badil &Nywila"
+
+#, fuzzy
+msgid "Account Information"
+msgstr "Inachunguza taarifa"
+
+msgid "Update all QQ Quns"
+msgstr ""
+
+msgid "About OpenQ"
+msgstr ""
+
+msgid "Modify Buddy Memo"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "QQ Protocol Plugin"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+#, fuzzy
+msgid "Select Server"
+msgstr "SSL Seva"
+
+msgid "QQ2005"
+msgstr ""
+
+msgid "QQ2007"
+msgstr ""
+
+msgid "QQ2008"
+msgstr ""
+
+msgid "Connect by TCP"
+msgstr ""
+
+msgid "Show server notice"
+msgstr ""
+
+msgid "Show server news"
+msgstr ""
+
+msgid "Show chat room when msg comes"
+msgstr ""
+
+msgid "Keep alive interval (seconds)"
+msgstr ""
+
+msgid "Update interval (seconds)"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to decrypt server reply"
+msgstr "Imeshindwa kuipata seva wakala"
+
+#, c-format
+msgid "Failed requesting token, 0x%02X"
+msgstr ""
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr ""
+
+#. extend redirect used in QQ2006
+msgid "Redirect_EX is not currently supported"
+msgstr ""
+
+#. need activation
+#. need activation
+#. need activation
+#, fuzzy
+msgid "Activation required"
+msgstr "Uthibitisho unatakiwa"
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr ""
+
+msgid "Requesting captcha"
+msgstr ""
+
+msgid "Checking captcha"
+msgstr ""
+
+msgid "Failed captcha verification"
+msgstr ""
+
+#, fuzzy
+msgid "Captcha Image"
+msgstr "Naki&li Picha"
+
+msgid "Enter code"
+msgstr ""
+
+msgid "QQ Captcha Verification"
+msgstr ""
+
+msgid "Enter the text from the image"
+msgstr ""
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Socket error"
+msgstr "Hitilafu ya hati"
+
+#, fuzzy
+msgid "Getting server"
+msgstr "Anza"
+
+msgid "Requesting token"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Imeshindwa kuipata seva wakala"
+
+msgid "Invalid server or port"
+msgstr ""
+
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Naunganisha na %1$S…"
+
+#, fuzzy
+msgid "QQ Error"
+msgstr "Hitikafu "
+
+#, c-format
+msgid ""
+"Server News:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "%s:%s"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "Kutoka %S"
+
+#, c-format
+msgid ""
+"Server notice From %s: \n"
+"%s"
+msgstr ""
+
+msgid "Unknown SERVER CMD"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
+msgstr ""
+
+msgid "QQ Qun Command"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Haiwezi kufuta moduli"
+
+msgid "Unknown LOGIN CMD"
+msgstr ""
+
+msgid "Unknown CLIENT CMD"
+msgstr ""
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr ""
+
+msgid "File Send"
+msgstr ""
+
+#, c-format
+msgid "%d canceled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr ""
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr ""
+
+#, c-format
+msgid "Info for Group %s"
+msgstr ""
+
+msgid "Notes Address Book Information"
+msgstr ""
+
+msgid "Invite Group to Conference..."
+msgstr ""
+
+msgid "Get Notes Address Book Info"
+msgstr ""
+
+msgid "Sending Handshake"
+msgstr ""
+
+msgid "Waiting for Handshake Acknowledgement"
+msgstr ""
+
+msgid "Handshake Acknowledged, Sending Login"
+msgstr ""
+
+msgid "Waiting for Login Acknowledgement"
+msgstr ""
+
+msgid "Login Redirected"
+msgstr ""
+
+msgid "Forcing Login"
+msgstr ""
+
+msgid "Login Acknowledged"
+msgstr ""
+
+msgid "Starting Services"
+msgstr ""
+
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+
+msgid "Sametime Administrator Announcement"
+msgstr ""
+
+#, c-format
+msgid "Announcement from %s"
+msgstr ""
+
+msgid "Conference Closed"
+msgstr ""
+
+msgid "Unable to send message: "
+msgstr ""
+
+msgid "Place Closed"
+msgstr ""
+
+msgid "Microphone"
+msgstr ""
+
+#, fuzzy
+msgid "Speakers"
+msgstr "Seva"
+
+#, fuzzy
+msgid "Video Camera"
+msgstr "Kicheza Video"
+
+msgid "File Transfer"
+msgstr ""
+
+msgid "Supports"
+msgstr ""
+
+msgid "External User"
+msgstr ""
+
+msgid "Create conference with user"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+
+msgid "New Conference"
+msgstr ""
+
+#, fuzzy
+msgid "Create"
+msgstr "Kicree"
+
+#, fuzzy
+msgid "Available Conferences"
+msgstr "Profaili Zipatikanazo"
+
+msgid "Create New Conference..."
+msgstr ""
+
+msgid "Invite user to a conference"
+msgstr ""
+
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+
+msgid "Invite to Conference"
+msgstr ""
+
+msgid "Invite to Conference..."
+msgstr ""
+
+msgid "Send TEST Announcement"
+msgstr ""
+
+msgid "Topic:"
+msgstr ""
+
+msgid "No Sametime Community Server specified"
+msgstr ""
+
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+
+msgid "Meanwhile Connection Setup"
+msgstr ""
+
+msgid "No Sametime Community Server Specified"
+msgstr ""
+
+#, fuzzy
+msgid "Connect"
+msgstr "Yaliyomo"
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr ""
+
+msgid "Last Known Client"
+msgstr ""
+
+#, fuzzy
+msgid "User Name"
+msgstr "Jina la Mtumiaji:"
+
+msgid "Sametime ID"
+msgstr ""
+
+msgid "An ambiguous user ID was entered"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+
+#, fuzzy
+msgid "Select User"
+msgstr "Chagua &Yote"
+
+msgid "Unable to add user: user not found"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+
+msgid "Remotely Stored Buddy List"
+msgstr ""
+
+msgid "Buddy List Storage Mode"
+msgstr ""
+
+msgid "Local Buddy List Only"
+msgstr ""
+
+msgid "Merge List from Server"
+msgstr ""
+
+msgid "Merge and Save List to Server"
+msgstr ""
+
+msgid "Synchronize List with Server"
+msgstr ""
+
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr ""
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr ""
+
+msgid "Unable to add group: group exists"
+msgstr ""
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to add group"
+msgstr "Haiwezi kuongeza moduli"
+
+msgid "Possible Matches"
+msgstr ""
+
+msgid "Notes Address Book group results"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+
+msgid "Select Notes Address Book"
+msgstr ""
+
+msgid "Unable to add group: group not found"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+
+msgid "Notes Address Book Group"
+msgstr ""
+
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Search results for '%s'"
+msgstr "Majibu ya kutafutwa kwa"
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+
+#, fuzzy
+msgid "Search Results"
+msgstr "Tafuta matokeo"
+
+#, fuzzy
+msgid "No matches"
+msgstr "%S maoanisho"
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+
+#, fuzzy
+msgid "No Matches"
+msgstr "%S maoanisho"
+
+msgid "Search for a user"
+msgstr ""
+
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+
+#, fuzzy
+msgid "User Search"
+msgstr "Tafuti Mpya"
+
+msgid "Import Sametime List..."
+msgstr ""
+
+msgid "Export Sametime List..."
+msgstr ""
+
+msgid "Add Notes Address Book Group..."
+msgstr ""
+
+msgid "User Search..."
+msgstr ""
+
+msgid "Force login (ignore server redirects)"
+msgstr ""
+
+#. pretend to be Sametime Connect
+msgid "Hide client identity"
+msgstr ""
+
+#, c-format
+msgid "User %s is not present in the network"
+msgstr ""
+
+msgid "Key Agreement"
+msgstr "Makubaliano Muhimu"
+
+msgid "Cannot perform the key agreement"
+msgstr ""
+
+msgid "Error occurred during key agreement"
+msgstr ""
+
+#, fuzzy
+msgid "Key Agreement failed"
+msgstr "Makubaliano Muhimu"
+
+msgid "Timeout during key agreement"
+msgstr ""
+
+msgid "Key agreement was aborted"
+msgstr ""
+
+msgid "Key agreement is already started"
+msgstr ""
+
+msgid "Key agreement cannot be started with yourself"
+msgstr ""
+
+msgid "The remote user is not present in the network any more"
+msgstr ""
+
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+#, fuzzy
+msgid "Key Agreement Request"
+msgstr "Makubaliano Muhimu"
+
+msgid "IM With Password"
+msgstr ""
+
+msgid "Cannot set IM key"
+msgstr ""
+
+#, fuzzy
+msgid "Set IM Password"
+msgstr "Onyesha Nywila"
+
+#, fuzzy
+msgid "Get Public Key"
+msgstr "Ufunguo Huria wa Muhusika"
+
+msgid "Cannot fetch the public key"
+msgstr ""
+
+#, fuzzy
+msgid "Show Public Key"
+msgstr "Ufunguo Huria wa Muhusika"
+
+msgid "Could not load public key"
+msgstr ""
+
+#, fuzzy
+msgid "User Information"
+msgstr "Taarifa Zaidi"
+
+msgid "Cannot get user information"
+msgstr ""
+
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr ""
+
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+
+#. Open file selector to select the public key.
+msgid "Open..."
+msgstr ""
+
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr ""
+
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+
+#, fuzzy
+msgid "_Import..."
+msgstr "&Leta…"
+
+msgid "Select correct user"
+msgstr ""
+
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+
+#, fuzzy
+msgid "Detached"
+msgstr "Haijakechiwa"
+
+msgid "Indisposed"
+msgstr ""
+
+msgid "Wake Me Up"
+msgstr ""
+
+msgid "Hyper Active"
+msgstr ""
+
+msgid "Robot"
+msgstr ""
+
+msgid "Happy"
+msgstr ""
+
+#, fuzzy
+msgid "Sad"
+msgstr "Jm"
+
+msgid "Angry"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+#, fuzzy
+msgid "Ashamed"
+msgstr "Kiassame"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "In Love"
+msgstr ""
+
+msgid "Sleepy"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Anxious"
+msgstr ""
+
+#, fuzzy
+msgid "User Modes"
+msgstr "Jina la Mtumiaji:"
+
+msgid "Preferred Contact"
+msgstr ""
+
+msgid "Preferred Language"
+msgstr ""
+
+#, fuzzy
+msgid "Device"
+msgstr "Huduma"
+
+msgid "Timezone"
+msgstr ""
+
+#, fuzzy
+msgid "Geolocation"
+msgstr "Mahali"
+
+msgid "Reset IM Key"
+msgstr ""
+
+msgid "IM with Key Exchange"
+msgstr ""
+
+msgid "IM with Password"
+msgstr ""
+
+msgid "Get Public Key..."
+msgstr ""
+
+msgid "Kill User"
+msgstr ""
+
+msgid "Draw On Whiteboard"
+msgstr ""
+
+msgid "_Passphrase:"
+msgstr ""
+
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr ""
+
+#, fuzzy
+msgid "Channel Information"
+msgstr "Inachunguza taarifa"
+
+msgid "Cannot get channel information"
+msgstr ""
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr ""
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Modes:</b> "
+msgstr ""
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr ""
+
+msgid "Add Channel Public Key"
+msgstr ""
+
+#. Add new public key
+msgid "Open Public Key..."
+msgstr ""
+
+msgid "Channel Passphrase"
+msgstr ""
+
+msgid "Channel Public Keys List"
+msgstr ""
+
+#, c-format
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+
+msgid "Channel Authentication"
+msgstr ""
+
+msgid "Add / Remove"
+msgstr ""
+
+#, fuzzy
+msgid "Group Name"
+msgstr "Kusanya kwa:"
+
+#, fuzzy
+msgid "Passphrase"
+msgstr "Nywila"
+
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr ""
+
+msgid "Add Channel Private Group"
+msgstr ""
+
+#, fuzzy
+msgid "User Limit"
+msgstr "Jina la Mtumiaji:"
+
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+
+msgid "Invite List"
+msgstr ""
+
+msgid "Ban List"
+msgstr ""
+
+msgid "Add Private Group"
+msgstr ""
+
+#, fuzzy
+msgid "Reset Permanent"
+msgstr "Kudumu"
+
+#, fuzzy
+msgid "Set Permanent"
+msgstr "Kudumu"
+
+msgid "Set User Limit"
+msgstr ""
+
+msgid "Reset Topic Restriction"
+msgstr ""
+
+msgid "Set Topic Restriction"
+msgstr ""
+
+msgid "Reset Private Channel"
+msgstr ""
+
+msgid "Set Private Channel"
+msgstr ""
+
+msgid "Reset Secret Channel"
+msgstr ""
+
+msgid "Set Secret Channel"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+
+msgid "Join Private Group"
+msgstr ""
+
+msgid "Cannot join private group"
+msgstr ""
+
+msgid "Call Command"
+msgstr ""
+
+msgid "Cannot call command"
+msgstr ""
+
+msgid "Unknown command"
+msgstr ""
+
+msgid "Secure File Transfer"
+msgstr ""
+
+msgid "Error during file transfer"
+msgstr ""
+
+msgid "Remote disconnected"
+msgstr ""
+
+msgid "Permission denied"
+msgstr ""
+
+#, fuzzy
+msgid "Key agreement failed"
+msgstr "Makubaliano Muhimu"
+
+msgid "Connection timed out"
+msgstr "Muunganiko umepita muda"
+
+#, fuzzy
+msgid "Creating connection failed"
+msgstr "Muunganiko salama umeshindikana"
+
+msgid "File transfer session does not exist"
+msgstr ""
+
+msgid "No file transfer session active"
+msgstr ""
+
+msgid "File transfer already started"
+msgstr ""
+
+msgid "Could not perform key agreement for file transfer"
+msgstr ""
+
+msgid "Could not start the file transfer"
+msgstr ""
+
+msgid "Cannot send file"
+msgstr ""
+
+msgid "Error occurred"
+msgstr ""
+
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr ""
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr ""
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr ""
+
+msgid "Server signoff"
+msgstr ""
+
+#, fuzzy
+msgid "Personal Information"
+msgstr "Taarifa Zaidi"
+
+msgid "Birth Day"
+msgstr ""
+
+msgid "Job Role"
+msgstr ""
+
+#, fuzzy
+msgid "Organization"
+msgstr "Shirika:"
+
+#, fuzzy
+msgid "Unit"
+msgstr "Kizio:"
+
+msgid "Join Chat"
+msgstr ""
+
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr ""
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr ""
+
+msgid "Real Name"
+msgstr ""
+
+#, fuzzy
+msgid "Status Text"
+msgstr "M&wambaa Hali"
+
+msgid "Public Key Fingerprint"
+msgstr ""
+
+msgid "Public Key Babbleprint"
+msgstr ""
+
+msgid "_More..."
+msgstr ""
+
+msgid "Detach From Server"
+msgstr ""
+
+msgid "Cannot detach"
+msgstr ""
+
+msgid "Cannot set topic"
+msgstr ""
+
+msgid "Failed to change nickname"
+msgstr ""
+
+msgid "Roomlist"
+msgstr ""
+
+msgid "Cannot get room list"
+msgstr ""
+
+#, fuzzy
+msgid "Network is empty"
+msgstr "Muda wa mtandao umeisha"
+
+msgid "No public key was received"
+msgstr ""
+
+#, fuzzy
+msgid "Server Information"
+msgstr "Taarifa Zaidi"
+
+msgid "Cannot get server information"
+msgstr ""
+
+msgid "Server Statistics"
+msgstr ""
+
+msgid "Cannot get server statistics"
+msgstr ""
+
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+
+msgid "Network Statistics"
+msgstr ""
+
+#, fuzzy
+msgid "Ping"
+msgstr "Chapisha"
+
+#, fuzzy
+msgid "Ping failed"
+msgstr "Imeshindwa kunakili"
+
+msgid "Ping reply received from server"
+msgstr ""
+
+msgid "Could not kill user"
+msgstr ""
+
+msgid "WATCH"
+msgstr ""
+
+msgid "Cannot watch user"
+msgstr ""
+
+#, fuzzy
+msgid "Resuming session"
+msgstr "Rejesha Awamu"
+
+msgid "Authenticating connection"
+msgstr ""
+
+msgid "Verifying server public key"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase required"
+msgstr "Nywila inatakiwa"
+
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+
+#, fuzzy
+msgid "Verify Public Key"
+msgstr "Ufunguo Huria wa Muhusika"
+
+msgid "_View..."
+msgstr ""
+
+#, fuzzy
+msgid "Unsupported public key type"
+msgstr "Aina ya faili isiyo stahimiliwa."
+
+msgid "Disconnected by server"
+msgstr ""
+
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "Inaunganisha kwenye seva ya sasisho…"
+
+msgid "Key Exchange failed"
+msgstr ""
+
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+
+msgid "Performing key exchange"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "Haiwezi kuongeza moduli"
+
+#. Progress
+#, fuzzy
+msgid "Connecting to SILC Server"
+msgstr "Inaunganisha kwenye seva ya sasisho…"
+
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Haiwezi kufuta moduli"
+
+msgid "Out of memory"
+msgstr "Nje ya kumbukumbu"
+
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "Haikuweza kuunganishwa"
+
+msgid "Error loading SILC key pair"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Download %s: %s"
+msgstr "Inapakua: %S"
+
+msgid "Your Current Mood"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Normal"
+msgstr "&Kawaida"
+
+msgid "In love"
+msgstr ""
+
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+
+msgid "SMS"
+msgstr ""
+
+msgid "MMS"
+msgstr ""
+
+msgid "Video conferencing"
+msgstr ""
+
+msgid "Your Current Status"
+msgstr ""
+
+#, fuzzy
+msgid "Online Services"
+msgstr "Huduma za tovuti"
+
+msgid "Let others see what services you are using"
+msgstr ""
+
+msgid "Let others see what computer you are using"
+msgstr ""
+
+msgid "Your VCard File"
+msgstr ""
+
+msgid "Timezone (UTC)"
+msgstr ""
+
+msgid "User Online Status Attributes"
+msgstr ""
+
+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 ""
+
+msgid "Message of the Day"
+msgstr ""
+
+msgid "No Message of the Day available"
+msgstr ""
+
+msgid "There is no Message of the Day associated with this connection"
+msgstr ""
+
+msgid "Create New SILC Key Pair"
+msgstr ""
+
+msgid "Passphrases do not match"
+msgstr ""
+
+msgid "Key Pair Generation failed"
+msgstr ""
+
+msgid "Key length"
+msgstr ""
+
+msgid "Public key file"
+msgstr ""
+
+msgid "Private key file"
+msgstr ""
+
+msgid "Passphrase (retype)"
+msgstr ""
+
+msgid "Generate Key Pair"
+msgstr ""
+
+#, fuzzy
+msgid "Online Status"
+msgstr "Marekani"
+
+msgid "View Message of the Day"
+msgstr ""
+
+msgid "Create SILC Key Pair..."
+msgstr ""
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr ""
+
+msgid "Topic too long"
+msgstr ""
+
+msgid "You must specify a nick"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "channel %s not found"
+msgstr "Mstari haujapatikana"
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr ""
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr ""
+
+msgid "part [channel]:  Leave the chat"
+msgstr ""
+
+msgid "leave [channel]:  Leave the chat"
+msgstr ""
+
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr ""
+
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+
+msgid "list:  List channels on this network"
+msgstr ""
+
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+
+msgid "motd:  View the server's Message Of The Day"
+msgstr ""
+
+msgid "detach:  Detach this session"
+msgstr ""
+
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr ""
+
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr ""
+
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr ""
+
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr ""
+
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+
+msgid "info [server]:  View server administrative details"
+msgstr ""
+
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+
+msgid "stats:  View server and network statistics"
+msgstr ""
+
+msgid "ping:  Send PING to the connected server"
+msgstr ""
+
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr ""
+
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr ""
+
+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr ""
+
+msgid "Network"
+msgstr "Mtandao"
+
+msgid "Public Key file"
+msgstr ""
+
+msgid "Private Key file"
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid "HMAC"
+msgstr ""
+
+msgid "Use Perfect Forward Secrecy"
+msgstr ""
+
+#, fuzzy
+msgid "Public key authentication"
+msgstr "Ishara ya Uthibitisho Inayoulindwa"
+
+msgid "Block IMs without Key Exchange"
+msgstr ""
+
+msgid "Block messages to whiteboard"
+msgstr ""
+
+msgid "Automatically open whiteboard"
+msgstr ""
+
+msgid "Digitally sign and verify all messages"
+msgstr ""
+
+msgid "Creating SILC key pair..."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "Haikuweza kuunganishwa"
+
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "User Name: \t%s\n"
+msgstr "Jina la Mtumiaji:"
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Organization: \t%s\n"
+msgstr "Jumuiya: \"%S\""
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Version: \t%s\n"
+msgstr "Toleo la 1"
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Public Key Information"
+msgstr "Fic&ha Taarifa"
+
+#, fuzzy
+msgid "Paging"
+msgstr "Inahifadhi"
+
+msgid "Video Conferencing"
+msgstr ""
+
+#, fuzzy
+msgid "Computer"
+msgstr "Imemaliza"
+
+msgid "PDA"
+msgstr ""
+
+msgid "Terminal"
+msgstr ""
+
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+
+msgid "Whiteboard"
+msgstr ""
+
+msgid "No server statistics available"
+msgstr ""
+
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
+#, c-format
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed KE group"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed hash function"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr ""
+
+#, c-format
+msgid "Failure: Incorrect signature"
+msgstr ""
+
+#, c-format
+msgid "Failure: Invalid cookie"
+msgstr ""
+
+#, c-format
+msgid "Failure: Authentication failed"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "Haikuweza kuunganishwa"
+
+msgid "John Noname"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "Haiwezi kuongeza moduli"
+
+#, fuzzy
+msgid "Unable to create connection"
+msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy
+msgid "Unknown server response"
+msgstr "Hitilafu isiyojulikana"
+
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Haikuweza kuunganishwa"
+
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr ""
+
+msgid "SIP connect server not specified"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr ""
+
+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr ""
+
+msgid "Publish status (note: everyone may watch you)"
+msgstr ""
+
+msgid "Use UDP"
+msgstr ""
+
+msgid "Use proxy"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Auth User"
+msgstr ""
+
+msgid "Auth Domain"
+msgstr ""
+
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+msgid "Yahoo ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! Barua"
+
+msgid "Pager server"
+msgstr ""
+
+#, fuzzy
+msgid "Pager port"
+msgstr "Page Down"
+
+msgid "File transfer server"
+msgstr ""
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! Barua"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr ""
+
+msgid "Your SMS was not delivered"
+msgstr ""
+
+msgid "Your Yahoo! message did not get sent."
+msgstr ""
+
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+
+msgid "Add buddy rejected"
+msgstr ""
+
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr ""
+
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+
+msgid "Failed Yahoo! Authentication"
+msgstr ""
+
+#, 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 ""
+
+msgid "Ignore buddy?"
+msgstr ""
+
+msgid "Your account is locked, please log in to the Yahoo! website."
+msgstr ""
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "Haiwezi kuongeza moduli"
+
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr ""
+
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
+msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
+
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
+msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
+
+msgid "Not at Home"
+msgstr ""
+
+msgid "Not at Desk"
+msgstr ""
+
+msgid "Not in Office"
+msgstr ""
+
+#, fuzzy
+msgid "On Vacation"
+msgstr "Fungua &Mahali…"
+
+msgid "Stepped Out"
+msgstr ""
+
+msgid "Not on server list"
+msgstr ""
+
+#, fuzzy
+msgid "Appear Online"
+msgstr "Baki Mkondoni"
+
+msgid "Appear Permanently Offline"
+msgstr ""
+
+#, fuzzy
+msgid "Presence"
+msgstr "Mapendekezo"
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Permanently Offline"
+msgstr ""
+
+msgid "Join in Chat"
+msgstr ""
+
+msgid "Initiate Conference"
+msgstr ""
+
+msgid "Presence Settings"
+msgstr ""
+
+msgid "Start Doodling"
+msgstr ""
+
+msgid "Select the ID you want to activate"
+msgstr ""
+
+msgid "Join whom in chat?"
+msgstr ""
+
+msgid "Activate ID..."
+msgstr ""
+
+msgid "Join User in Chat..."
+msgstr ""
+
+#, fuzzy
+msgid "Open Inbox"
+msgstr "Fungua katika:"
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+msgid "Sent Doodle request."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to connect."
+msgstr "Haikuweza kuunganishwa"
+
+msgid "Unable to establish file descriptor."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr ""
+
+#, fuzzy
+msgid "Write Error"
+msgstr "Hitilafu ya Printa"
+
+msgid "Yahoo! Japan Profile"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo! Profile"
+msgstr "Yahoo! Barua"
+
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo! ID"
+msgstr "Yahoo! Barua"
+
+msgid "Hobbies"
+msgstr ""
+
+msgid "Latest News"
+msgstr ""
+
+#, fuzzy
+msgid "Home Page"
+msgstr "Ukurasa wa &Nyumbani:"
+
+msgid "Cool Link 1"
+msgstr ""
+
+msgid "Cool Link 2"
+msgstr ""
+
+msgid "Cool Link 3"
+msgstr ""
+
+msgid "Last Update"
+msgstr "Sasisho la mara ya mwisho"
+
+msgid ""
+"This profile is in a language or format that is not supported at this time."
+msgstr ""
+
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+
+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 ""
+
+msgid "The user's profile is empty."
+msgstr ""
+
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+
+msgid "Invitation Rejected"
+msgstr ""
+
+#, fuzzy
+msgid "Failed to join chat"
+msgstr "Imeshindwa kuunganisha"
+
+#. -6
+#, fuzzy
+msgid "Unknown room"
+msgstr "Hitilafu isiyojulikana"
+
+#. -15
+msgid "Maybe the room is full"
+msgstr ""
+
+#. -35
+msgid "Not available"
+msgstr "Haipatikani"
+
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+
+#, c-format
+msgid "You are now chatting in %s."
+msgstr ""
+
+msgid "Failed to join buddy in chat"
+msgstr ""
+
+msgid "Maybe they're not in a chat?"
+msgstr ""
+
+msgid "Fetching the room list failed."
+msgstr ""
+
+msgid "Voices"
+msgstr ""
+
+msgid "Webcams"
+msgstr ""
+
+#, fuzzy
+msgid "Connection problem"
+msgstr "Unganisho Limeshindikana"
+
+msgid "Unable to fetch room list."
+msgstr ""
+
+msgid "User Rooms"
+msgstr ""
+
+#, fuzzy
+msgid "Connection problem with the YCHT server"
+msgstr "Unganisho Limeshindikana"
+
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr ""
+
+msgid "Hidden or not logged-in"
+msgstr ""
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr ""
+
+msgid "Anyone"
+msgstr ""
+
+msgid "_Class:"
+msgstr ""
+
+#, fuzzy
+msgid "_Instance:"
+msgstr "Imesakinishwa"
+
+msgid "_Recipient:"
+msgstr ""
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr ""
+
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr ""
+
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr ""
+
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+
+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 ""
+
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr ""
+
+#, fuzzy
+msgid "Resubscribe"
+msgstr "Jiunge"
+
+msgid "Retrieve subscriptions from server"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Zephyr Protocol Plugin"
+msgstr ""
+
+msgid "Use tzc"
+msgstr ""
+
+msgid "tzc command"
+msgstr ""
+
+msgid "Export to .anyone"
+msgstr ""
+
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+msgid "Import from .anyone"
+msgstr ""
+
+msgid "Import from .zephyr.subs"
+msgstr ""
+
+#, fuzzy
+msgid "Realm"
+msgstr "Tayari"
+
+msgid "Exposure"
+msgstr ""
+
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr ""
+
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr ""
+
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error resolving %s"
+msgstr "Hitilafu katika kuhifadhi %S"
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+#, fuzzy
+msgid "_Yes"
+msgstr "Ndiyo"
+
+#, fuzzy
+msgid "_No"
+msgstr "Hapana"
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+msgid "_Accept"
+msgstr ""
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+msgid "I'm not here right now"
+msgstr ""
+
+msgid "saved statuses"
+msgstr ""
+
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr ""
+
+msgid "Accept chat invitation?"
+msgstr ""
+
+#. Shortcut
+msgid "Shortcut"
+msgstr ""
+
+msgid "The text-shortcut for the smiley"
+msgstr ""
+
+#. Stored Image
+#, fuzzy
+msgid "Stored Image"
+msgstr "Hifadhi Taswira"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr ""
+
+#, fuzzy
+msgid "SSL Connection Failed"
+msgstr "Unganisho Limeshindikana"
+
+msgid "SSL Handshake Failed"
+msgstr ""
+
+msgid "SSL peer presented an invalid certificate"
+msgstr ""
+
+#, fuzzy
+msgid "Unknown SSL error"
+msgstr "Hitilafu isiyojulikana"
+
+#, fuzzy
+msgid "Unset"
+msgstr "Haitumiki"
+
+msgid "Do not disturb"
+msgstr ""
+
+msgid "Extended away"
+msgstr ""
+
+msgid "Listening to music"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr ""
+
+#, c-format
+msgid "%s became idle"
+msgstr ""
+
+#, c-format
+msgid "%s became unidle"
+msgstr ""
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr ""
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr ""
+
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
+#, fuzzy, c-format
+msgid "%x %X"
+msgstr "%S %S"
+
+msgid "Calculating..."
+msgstr ""
+
+#, fuzzy
+msgid "Unknown."
+msgstr "Isiyojulikana"
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable to connect to %s"
+msgstr "Haikuweza kuunganishwa"
+
+#, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "Haikuweza kuunganishwa"
+
+#, c-format
+msgid " - %s"
+msgstr ""
+
+#, fuzzy, c-format
+msgid " (%s)"
+msgstr "(%S)"
+
+#. 10053
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr ""
+
+#. 10054
+#, fuzzy, c-format
+msgid "Remote host closed connection."
+msgstr "Mwenzi SSL imefunga uunganisho huu"
+
+#. 10060
+#, fuzzy, c-format
+msgid "Connection timed out."
+msgstr "Muunganiko umepita muda"
+
+#. 10061
+#, fuzzy, c-format
+msgid "Connection refused."
+msgstr "Muunganisho ulikataliwa"
+
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr "Hitilafu wakati natengeneza %S"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
+#, fuzzy
+msgid "Internet Messenger"
+msgstr "Internet Explorer"
+
+msgid "Pidgin Internet Messenger"
+msgstr ""
+
+msgid "Send instant messages over multiple protocols"
+msgstr ""
+
+#, fuzzy
+msgid "Orientation"
+msgstr "Mkao:"
+
+msgid "The orientation of the tray."
+msgstr ""
+
+#. Build the login options frame.
+msgid "Login Options"
+msgstr ""
+
+#, fuzzy
+msgid "Pro_tocol:"
+msgstr "Itifaki"
+
+#, fuzzy
+msgid "_Username:"
+msgstr "Jina la mtumiaji"
+
+#, fuzzy
+msgid "Remember pass_word"
+msgstr "Ingiza tena nywila:"
+
+#. Build the user options frame.
+#, fuzzy
+msgid "User Options"
+msgstr "Machaguo ya Mtandao"
+
+msgid "_Local alias:"
+msgstr ""
+
+#, fuzzy
+msgid "New _mail notifications"
+msgstr "Arifisho la Jumla"
+
+#. Buddy icon
+msgid "Use this buddy _icon for this account:"
+msgstr ""
+
+#, fuzzy
+msgid "_Advanced"
+msgstr "Pevu"
+
+#, fuzzy
+msgid "Use GNOME Proxy Settings"
+msgstr "&Tumia vipimo vya wakala vya mfumo"
+
+#, fuzzy
+msgid "Use Global Proxy Settings"
+msgstr "&Tumia vipimo vya wakala vya mfumo"
+
+#, fuzzy
+msgid "No Proxy"
+msgstr "Hakuna waka&la"
+
+msgid "HTTP"
+msgstr ""
+
+#, fuzzy
+msgid "SOCKS 4"
+msgstr "SOC&KS v4"
+
+#, fuzzy
+msgid "SOCKS 5"
+msgstr "SOCKS &v5"
+
+msgid "Use Environmental Settings"
+msgstr ""
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+msgid "If you look real closely"
+msgstr ""
+
+#. This is an easter egg. See the comment on the previous line in the source.
+msgid "you can see the butterflies mating"
+msgstr ""
+
+msgid "Proxy _type:"
+msgstr ""
+
+#, fuzzy
+msgid "_Host:"
+msgstr "Mwenyeji:"
+
+#, fuzzy
+msgid "_Port:"
+msgstr "Lango:"
+
+#, fuzzy
+msgid "Pa_ssword:"
+msgstr "Nywila:"
+
+msgid "Unable to save new account"
+msgstr ""
+
+msgid "An account already exists with the specified criteria."
+msgstr ""
+
+msgid "Add Account"
+msgstr ""
+
+msgid "_Basic"
+msgstr ""
+
+msgid "Create _this new account on the server"
+msgstr ""
+
+msgid "_Proxy"
+msgstr ""
+
+msgid "Enabled"
+msgstr "Imeamshwa"
+
+#, fuzzy
+msgid "Protocol"
+msgstr "Itifaki"
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add...</b> button below and configure your first account. If you want %s "
+"to connect to multiple IM accounts, press <b>Add...</b> again to configure "
+"them all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
+msgstr ""
+
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+msgid "Please update the necessary fields."
+msgstr ""
+
+#, fuzzy
+msgid "A_ccount"
+msgstr "hesabu ya matembeleo"
+
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+
+msgid "Room _List"
+msgstr ""
+
+#, fuzzy
+msgid "_Block"
+msgstr "Zuia"
+
+msgid "Un_block"
+msgstr ""
+
+#, fuzzy
+msgid "Move to"
+msgstr "Sogeza kwenda:"
+
+msgid "Get _Info"
+msgstr ""
+
+msgid "I_M"
+msgstr ""
+
+msgid "_Audio Call"
+msgstr ""
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
+msgid "_Send File..."
+msgstr ""
+
+msgid "Add Buddy _Pounce..."
+msgstr ""
+
+msgid "View _Log"
+msgstr ""
+
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
+msgstr ""
+
+msgid "_Alias..."
+msgstr ""
+
+#, fuzzy
+msgid "_Remove"
+msgstr "Ondoa"
+
+msgid "Set Custom Icon"
+msgstr ""
+
+msgid "Remove Custom Icon"
+msgstr ""
+
+msgid "Add _Buddy..."
+msgstr ""
+
+msgid "Add C_hat..."
+msgstr ""
+
+#, fuzzy
+msgid "_Delete Group"
+msgstr "Futa mwenyeji"
+
+#, fuzzy
+msgid "_Rename"
+msgstr "&Badili jina"
+
+#. join button
+msgid "_Join"
+msgstr ""
+
+msgid "Auto-Join"
+msgstr ""
+
+#, fuzzy
+msgid "Persistent"
+msgstr "Kipersia"
+
+msgid "_Edit Settings..."
+msgstr ""
+
+#, fuzzy
+msgid "_Collapse"
+msgstr "Kunja"
+
+#, fuzzy
+msgid "_Expand"
+msgstr "Tanua"
+
+msgid "/Tools/Mute Sounds"
+msgstr ""
+
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+#, fuzzy
+msgid "Unknown node type"
+msgstr "Utambulisho usiojulikana"
+
+#. Buddies menu
+msgid "/_Buddies"
+msgstr ""
+
+msgid "/Buddies/New Instant _Message..."
+msgstr ""
+
+msgid "/Buddies/Join a _Chat..."
+msgstr ""
+
+msgid "/Buddies/Get User _Info..."
+msgstr ""
+
+msgid "/Buddies/View User _Log..."
+msgstr ""
+
+msgid "/Buddies/Sh_ow"
+msgstr ""
+
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr ""
+
+msgid "/Buddies/Show/_Empty Groups"
+msgstr ""
+
+msgid "/Buddies/Show/Buddy _Details"
+msgstr ""
+
+msgid "/Buddies/Show/Idle _Times"
+msgstr ""
+
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr ""
+
+msgid "/Buddies/_Sort Buddies"
+msgstr ""
+
+msgid "/Buddies/_Add Buddy..."
+msgstr ""
+
+msgid "/Buddies/Add C_hat..."
+msgstr ""
+
+msgid "/Buddies/Add _Group..."
+msgstr ""
+
+msgid "/Buddies/_Quit"
+msgstr ""
+
+#. Accounts menu
+msgid "/_Accounts"
+msgstr ""
+
+msgid "/Accounts/Manage Accounts"
+msgstr ""
+
+#. Tools
+#, fuzzy
+msgid "/_Tools"
+msgstr "&Zana"
+
+msgid "/Tools/Buddy _Pounces"
+msgstr ""
+
+#, fuzzy
+msgid "/Tools/_Certificates"
+msgstr "Ithibati Zako"
+
+msgid "/Tools/Custom Smile_ys"
+msgstr ""
+
+msgid "/Tools/Plu_gins"
+msgstr ""
+
+msgid "/Tools/Pr_eferences"
+msgstr ""
+
+msgid "/Tools/Pr_ivacy"
+msgstr ""
+
+msgid "/Tools/_File Transfers"
+msgstr ""
+
+msgid "/Tools/R_oom List"
+msgstr ""
+
+msgid "/Tools/System _Log"
+msgstr ""
+
+msgid "/Tools/Mute _Sounds"
+msgstr ""
+
+#. Help
+#, fuzzy
+msgid "/_Help"
+msgstr "Msaada"
+
+msgid "/Help/Online _Help"
+msgstr ""
+
+msgid "/Help/_Debug Window"
+msgstr ""
+
+msgid "/Help/_About"
+msgstr ""
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+
+#, fuzzy
+msgid "(no topic set)"
+msgstr "(haijawekwa)"
+
+msgid "Buddy Alias"
+msgstr ""
+
+msgid "Logged In"
+msgstr "Ingia"
+
+msgid "Last Seen"
+msgstr ""
+
+msgid "Spooky"
+msgstr ""
+
+msgid "Awesome"
+msgstr ""
+
+msgid "Rockin'"
+msgstr ""
+
+msgid "Total Buddies"
+msgstr ""
+
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr ""
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr ""
+
+#, c-format
+msgid "Idle %dm"
+msgstr ""
+
+msgid "/Buddies/New Instant Message..."
+msgstr ""
+
+msgid "/Buddies/Join a Chat..."
+msgstr ""
+
+msgid "/Buddies/Get User Info..."
+msgstr ""
+
+msgid "/Buddies/Add Buddy..."
+msgstr ""
+
+msgid "/Buddies/Add Chat..."
+msgstr ""
+
+msgid "/Buddies/Add Group..."
+msgstr ""
+
+msgid "/Tools/Privacy"
+msgstr ""
+
+msgid "/Tools/Room List"
+msgstr ""
+
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+msgid "Manually"
+msgstr "Januari"
+
+msgid "By status"
+msgstr ""
+
+msgid "By recent log activity"
+msgstr ""
+
+#, c-format
+msgid "%s disconnected"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s disabled"
+msgstr "Imelemazwa"
+
+msgid "Reconnect"
+msgstr ""
+
+msgid "Re-enable"
+msgstr ""
+
+#, fuzzy
+msgid "SSL FAQs"
+msgstr "SSL CA"
+
+#, fuzzy
+msgid "Welcome back!"
+msgstr "Karibu Wanadamu!"
+
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "<b>Username:</b>"
+msgstr ""
+
+msgid "<b>Password:</b>"
+msgstr ""
+
+msgid "_Login"
+msgstr ""
+
+msgid "/Accounts"
+msgstr ""
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
+msgstr ""
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+msgid "/Buddies/Show/Offline Buddies"
+msgstr ""
+
+msgid "/Buddies/Show/Empty Groups"
+msgstr ""
+
+msgid "/Buddies/Show/Buddy Details"
+msgstr ""
+
+msgid "/Buddies/Show/Idle Times"
+msgstr ""
+
+msgid "/Buddies/Show/Protocol Icons"
+msgstr ""
+
+msgid "Add a buddy.\n"
+msgstr ""
+
+msgid "Buddy's _username:"
+msgstr ""
+
+msgid "(Optional) A_lias:"
+msgstr ""
+
+msgid "Add buddy to _group:"
+msgstr ""
+
+msgid "This protocol does not support chat rooms."
+msgstr ""
+
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+
+msgid "A_lias:"
+msgstr ""
+
+msgid "_Group:"
+msgstr ""
+
+msgid "Auto_join when account becomes online."
+msgstr ""
+
+msgid "_Remain in chat after window is closed."
+msgstr ""
+
+msgid "Please enter the name of the group to be added."
+msgstr ""
+
+msgid "Enable Account"
+msgstr ""
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr ""
+
+msgid "<PurpleMain>/Accounts/"
+msgstr ""
+
+#, fuzzy
+msgid "_Edit Account"
+msgstr "hesabu ya matembeleo"
+
+#, fuzzy
+msgid "No actions available"
+msgstr "Haipatikani"
+
+#, fuzzy
+msgid "_Disable"
+msgstr "Lemaza"
+
+#, fuzzy
+msgid "/Tools"
+msgstr "&Zana"
+
+msgid "/Buddies/Sort Buddies"
+msgstr ""
+
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Chapisha rangi za usuli"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Chapisha rangi za usuli"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Tanua"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Chapisha rangi za usuli"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "Kunja"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Chapisha rangi za usuli"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "M&wambaa Hali"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Nenda mkondoni"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "M&wambaa Hali"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Namna ya Nje ya mkondo"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+msgid "Idle Text"
+msgstr ""
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Ujumbe haujaenda."
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
+#. Widget creation function
+#, fuzzy
+msgid "SSL Servers"
+msgstr "SSL Seva"
+
+msgid "Unknown command."
+msgstr ""
+
+msgid "That buddy is not on the same protocol as this chat."
+msgstr ""
+
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+
+msgid "Invite Buddy Into Chat Room"
+msgstr ""
+
+msgid "_Buddy:"
+msgstr ""
+
+#, fuzzy
+msgid "_Message:"
+msgstr "Ujumbe"
+
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr ""
+
+msgid "Save Conversation"
+msgstr ""
+
+msgid "Find"
+msgstr "Tafuta"
+
+msgid "_Search for:"
+msgstr ""
+
+msgid "Un-Ignore"
+msgstr ""
+
+msgid "Ignore"
+msgstr ""
+
+msgid "Get Away Message"
+msgstr ""
+
+#, fuzzy
+msgid "Last Said"
+msgstr "Ukurasa wa mwisho"
+
+msgid "Unable to save icon file to disk."
+msgstr ""
+
+#, fuzzy
+msgid "Save Icon"
+msgstr "Hifadhi Taswira"
+
+#, fuzzy
+msgid "Animate"
+msgstr "Fanya hai"
+
+msgid "Hide Icon"
+msgstr ""
+
+msgid "Save Icon As..."
+msgstr ""
+
+msgid "Set Custom Icon..."
+msgstr ""
+
+msgid "Change Size"
+msgstr ""
+
+msgid "Show All"
+msgstr "Onyesha Zote"
+
+#. Conversation menu
+msgid "/_Conversation"
+msgstr ""
+
+msgid "/Conversation/New Instant _Message..."
+msgstr ""
+
+msgid "/Conversation/_Find..."
+msgstr ""
+
+msgid "/Conversation/View _Log"
+msgstr ""
+
+msgid "/Conversation/_Save As..."
+msgstr ""
+
+msgid "/Conversation/Clea_r Scrollback"
+msgstr ""
+
+msgid "/Conversation/M_edia"
+msgstr ""
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/_Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr ""
+
+msgid "/Conversation/Se_nd File..."
+msgstr ""
+
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr ""
+
+msgid "/Conversation/_Get Info"
+msgstr ""
+
+msgid "/Conversation/In_vite..."
+msgstr ""
+
+msgid "/Conversation/M_ore"
+msgstr ""
+
+msgid "/Conversation/Al_ias..."
+msgstr ""
+
+msgid "/Conversation/_Block..."
+msgstr ""
+
+msgid "/Conversation/_Unblock..."
+msgstr ""
+
+msgid "/Conversation/_Add..."
+msgstr ""
+
+msgid "/Conversation/_Remove..."
+msgstr ""
+
+msgid "/Conversation/Insert Lin_k..."
+msgstr ""
+
+msgid "/Conversation/Insert Imag_e..."
+msgstr ""
+
+msgid "/Conversation/_Close"
+msgstr ""
+
+#. Options
+#, fuzzy
+msgid "/_Options"
+msgstr "Machaguo"
+
+msgid "/Options/Enable _Logging"
+msgstr ""
+
+msgid "/Options/Enable _Sounds"
+msgstr ""
+
+msgid "/Options/Show Formatting _Toolbars"
+msgstr ""
+
+msgid "/Options/Show Ti_mestamps"
+msgstr ""
+
+msgid "/Conversation/More"
+msgstr ""
+
+#, fuzzy
+msgid "/Options"
+msgstr "Machaguo"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#, fuzzy
+msgid "/Conversation"
+msgstr "Unganisho"
+
+msgid "/Conversation/View Log"
+msgstr ""
+
+msgid "/Conversation/Media/Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr ""
+
+msgid "/Conversation/Send File..."
+msgstr ""
+
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr ""
+
+msgid "/Conversation/Get Info"
+msgstr ""
+
+msgid "/Conversation/Invite..."
+msgstr ""
+
+msgid "/Conversation/Alias..."
+msgstr ""
+
+msgid "/Conversation/Block..."
+msgstr ""
+
+msgid "/Conversation/Unblock..."
+msgstr ""
+
+msgid "/Conversation/Add..."
+msgstr ""
+
+msgid "/Conversation/Remove..."
+msgstr ""
+
+msgid "/Conversation/Insert Link..."
+msgstr ""
+
+msgid "/Conversation/Insert Image..."
+msgstr ""
+
+msgid "/Options/Enable Logging"
+msgstr ""
+
+msgid "/Options/Enable Sounds"
+msgstr ""
+
+msgid "/Options/Show Formatting Toolbars"
+msgstr ""
+
+msgid "/Options/Show Timestamps"
+msgstr ""
+
+msgid "User is typing..."
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+
+#. Build the Send To menu
+#, fuzzy
+msgid "S_end To"
+msgstr "Tuma kwa:"
+
+msgid "_Send"
+msgstr ""
+
+#. Setup the label telling how many people are in the room.
+msgid "0 people in room"
+msgstr ""
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Typing"
+msgstr ""
+
+msgid "Stopped Typing"
+msgstr ""
+
+msgid "Nick Said"
+msgstr ""
+
+#, fuzzy
+msgid "Unread Messages"
+msgstr "Jumbe za tahadhari"
+
+msgid "New Event"
+msgstr ""
+
+msgid "clear: Clears all conversation scrollbacks."
+msgstr ""
+
+msgid "Confirm close"
+msgstr "Thibitisha kufunga"
+
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr ""
+
+#, fuzzy
+msgid "Close other tabs"
+msgstr "Funga Tab&o Nyingine"
+
+#, fuzzy
+msgid "Close all tabs"
+msgstr "Funga tabo"
+
+msgid "Detach this tab"
+msgstr ""
+
+#, fuzzy
+msgid "Close this tab"
+msgstr "Funga ujumbe huu"
+
+msgid "Close conversation"
+msgstr ""
+
+msgid "Last created window"
+msgstr ""
+
+msgid "Separate IM and Chat windows"
+msgstr ""
+
+msgid "New window"
+msgstr "Dirisha jipya"
+
+msgid "By group"
+msgstr ""
+
+msgid "By account"
+msgstr ""
+
+msgid "Save Debug Log"
+msgstr ""
+
+msgid "Invert"
+msgstr ""
+
+#, fuzzy
+msgid "Highlight matches"
+msgstr "&Angaza yote"
+
+msgid "_Icon Only"
+msgstr ""
+
+#, fuzzy
+msgid "_Text Only"
+msgstr "Kuza Saizi ya Maandishi &Tu"
+
+msgid "_Both Icon & Text"
+msgstr ""
+
+#, fuzzy
+msgid "Filter"
+msgstr "Ch&uja:"
+
+msgid "Right click for more options."
+msgstr ""
+
+msgid "Level "
+msgstr ""
+
+msgid "Select the debug filter level."
+msgstr ""
+
+#, fuzzy
+msgid "All"
+msgstr "&Yote"
+
+msgid "Misc"
+msgstr ""
+
+#, fuzzy
+msgid "Warning"
+msgstr "Tahadhari:"
+
+#, fuzzy
+msgid "Error "
+msgstr "Hitikafu "
+
+#, fuzzy
+msgid "Fatal Error"
+msgstr "Hitilafu katika kusakinisha"
+
+msgid "bug master"
+msgstr ""
+
+msgid "artist"
+msgstr ""
+
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr ""
+
+msgid "voice and video"
+msgstr ""
+
+msgid "support"
+msgstr ""
+
+msgid "webmaster"
+msgstr ""
+
+msgid "Senior Contributor/QA"
+msgstr ""
+
+msgid "win32 port"
+msgstr ""
+
+msgid "maintainer"
+msgstr ""
+
+msgid "libfaim maintainer"
+msgstr ""
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+msgid "hacker and designated driver [lazy bum]"
+msgstr ""
+
+msgid "support/QA"
+msgstr ""
+
+msgid "XMPP"
+msgstr ""
+
+msgid "original author"
+msgstr ""
+
+msgid "lead developer"
+msgstr ""
+
+msgid "Afrikaans"
+msgstr "Kiafriakansi"
+
+msgid "Arabic"
+msgstr "Kiarabu"
+
+#, fuzzy
+msgid "Belarusian Latin"
+msgstr "Kibelarusi"
+
+msgid "Bulgarian"
+msgstr "Kibulgaria"
+
+msgid "Bengali"
+msgstr "Kibengalia"
+
+msgid "Bosnian"
+msgstr "Kibosnia"
+
+msgid "Catalan"
+msgstr "Kicatala"
+
+msgid "Valencian-Catalan"
+msgstr ""
+
+msgid "Czech"
+msgstr "Kiczech"
+
+msgid "Danish"
+msgstr "Kidanishi"
+
+msgid "German"
+msgstr "Kijerumani"
+
+msgid "Dzongkha"
+msgstr "Kidzongkha"
+
+msgid "Greek"
+msgstr "Kigiriki"
+
+msgid "Australian English"
+msgstr ""
+
+msgid "Canadian English"
+msgstr ""
+
+msgid "British English"
+msgstr ""
+
+msgid "Esperanto"
+msgstr "Kiesperanto"
+
+msgid "Spanish"
+msgstr "Kihispania"
+
+msgid "Estonian"
+msgstr "Kiestonia"
+
+msgid "Euskera(Basque)"
+msgstr ""
+
+msgid "Persian"
+msgstr "Kipersia"
+
+msgid "Finnish"
+msgstr "Kifinishi"
+
+msgid "French"
+msgstr "Kifaransa"
+
+msgid "Irish"
+msgstr "Kiirishi"
+
+msgid "Galician"
+msgstr "Kigalacy"
+
+msgid "Gujarati"
+msgstr "Kigujarati"
+
+msgid "Gujarati Language Team"
+msgstr ""
+
+msgid "Hebrew"
+msgstr "Kiebrania"
+
+msgid "Hindi"
+msgstr "Kihindi"
+
+msgid "Hungarian"
+msgstr "Kihungaria"
+
+#, fuzzy
+msgid "Armenian"
+msgstr "Kiromania"
+
+msgid "Indonesian"
+msgstr "Kindonesia"
+
+msgid "Italian"
+msgstr "Kiitalia"
+
+msgid "Japanese"
+msgstr "Kijapani"
+
+msgid "Georgian"
+msgstr "Kigeorgia"
+
+msgid "Ubuntu Georgian Translators"
+msgstr ""
+
+msgid "Khmer"
+msgstr "Kihemeri"
+
+msgid "Kannada"
+msgstr "Kikanada"
+
+msgid "Kannada Translation team"
+msgstr ""
+
+msgid "Korean"
+msgstr "Kikorea"
+
+msgid "Kurdish"
+msgstr "Kikurdi"
+
+msgid "Lao"
+msgstr "Lao"
+
+msgid "Lithuanian"
+msgstr "Kilithuania"
+
+msgid "Macedonian"
+msgstr "Kimacedonia"
+
+msgid "Mongolian"
+msgstr "Kimongolia"
+
+msgid "Bokmål Norwegian"
+msgstr ""
+
+msgid "Nepali"
+msgstr "Kinepali"
+
+msgid "Dutch, Flemish"
+msgstr ""
+
+msgid "Norwegian Nynorsk"
+msgstr "Kinynorsk cha Norway"
+
+msgid "Occitan"
+msgstr "Kioccita"
+
+msgid "Punjabi"
+msgstr "Kipunjabi"
+
+msgid "Polish"
+msgstr "Kipolishi"
+
+msgid "Portuguese"
+msgstr "Kireno"
+
+msgid "Portuguese-Brazil"
+msgstr ""
+
+msgid "Pashto"
+msgstr "Kipashto"
+
+msgid "Romanian"
+msgstr "Kiromania"
+
+msgid "Russian"
+msgstr "Kirusi"
+
+msgid "Slovak"
+msgstr "Kislovaki"
+
+msgid "Slovenian"
+msgstr "Kislovenia"
+
+msgid "Albanian"
+msgstr "Kialbania"
+
+msgid "Serbian"
+msgstr "Kiserbia"
+
+msgid "Sinhala"
+msgstr "Kisinihala"
+
+msgid "Swedish"
+msgstr "Kiswidi"
+
+msgid "Swahili"
+msgstr ""
+
+msgid "Tamil"
+msgstr "Kitamilia"
+
+msgid "Telugu"
+msgstr "Kitelugu"
+
+msgid "Thai"
+msgstr "Kitai"
+
+msgid "Turkish"
+msgstr "Kituruki"
+
+msgid "Urdu"
+msgstr "Kiurdu"
+
+msgid "Vietnamese"
+msgstr "Kivietnamu"
+
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr ""
+
+msgid "Simplified Chinese"
+msgstr "Kichina Rahisi"
+
+msgid "Hong Kong Chinese"
+msgstr ""
+
+msgid "Traditional Chinese"
+msgstr "Kichina Asili"
+
+msgid "Amharic"
+msgstr "Kiamharic"
+
+#, fuzzy, c-format
+msgid "About %s"
+msgstr "Kuhusu %S"
+
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr ""
+
+msgid "Current Developers"
+msgstr ""
+
+msgid "Crazy Patch Writers"
+msgstr ""
+
+msgid "Retired Developers"
+msgstr ""
+
+msgid "Retired Crazy Patch Writers"
+msgstr ""
+
+msgid "Current Translators"
+msgstr ""
+
+#, fuzzy
+msgid "Past Translators"
+msgstr "Watafsiri:"
+
+#, fuzzy
+msgid "Debugging Information"
+msgstr "Inachunguza taarifa"
+
+#, fuzzy
+msgid "_Name"
+msgstr "Jina"
+
+msgid "_Account"
+msgstr ""
+
+msgid "Get User Info"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+
+msgid "View User Log"
+msgstr ""
+
+msgid "Alias Contact"
+msgstr ""
+
+msgid "Enter an alias for this contact."
+msgstr ""
+
+#, c-format
+msgid "Enter an alias for %s."
+msgstr ""
+
+msgid "Alias Buddy"
+msgstr ""
+
+msgid "Alias Chat"
+msgstr ""
+
+msgid "Enter an alias for this chat."
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+msgid "Remove Contact"
+msgstr "Ondoa Kuki"
+
+#, fuzzy
+msgid "_Remove Contact"
+msgstr "Ondoa Kuki"
+
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+
+msgid "Merge Groups"
+msgstr ""
+
+msgid "_Merge Groups"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+
+#, fuzzy
+msgid "Remove Group"
+msgstr "Ondoa Kuki"
+
+msgid "_Remove Group"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "Unakaribia kufunga tabo ya %S. Unauhakika unataka kuendelea?"
+
+msgid "Remove Buddy"
+msgstr ""
+
+msgid "_Remove Buddy"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr "Unakaribia kufunga tabo ya %S. Unauhakika unataka kuendelea?"
+
+#, fuzzy
+msgid "Remove Chat"
+msgstr "Ondoa &All"
+
+msgid "_Remove Chat"
+msgstr ""
+
+msgid "Right-click for more unread messages...\n"
+msgstr ""
+
+msgid "_Change Status"
+msgstr ""
+
+msgid "Show Buddy _List"
+msgstr ""
+
+msgid "_Unread Messages"
+msgstr ""
+
+msgid "New _Message..."
+msgstr ""
+
+msgid "_Accounts"
+msgstr ""
+
+#, fuzzy
+msgid "Plu_gins"
+msgstr "Programu tumizi"
+
+#, fuzzy
+msgid "Pr_eferences"
+msgstr "Mapendekezo"
+
+msgid "Mute _Sounds"
+msgstr ""
+
+msgid "_Blink on New Message"
+msgstr ""
+
+#, fuzzy
+msgid "_Quit"
+msgstr "&Funga"
+
+#, fuzzy
+msgid "Not started"
+msgstr "Haujaanza"
+
+msgid "<b>Receiving As:</b>"
+msgstr ""
+
+msgid "<b>Receiving From:</b>"
+msgstr ""
+
+msgid "<b>Sending To:</b>"
+msgstr ""
+
+msgid "<b>Sending As:</b>"
+msgstr ""
+
+msgid "There is no application configured to open this type of file."
+msgstr ""
+
+msgid "An error occurred while opening the file."
+msgstr ""
+
+#, c-format
+msgid "Error launching %s: %s"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error running %s"
+msgstr "Hitilafu katika kufungua %S"
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr ""
+
+#, fuzzy
+msgid "Filename:"
+msgstr "Jina la faili:"
+
+#, fuzzy
+msgid "Local File:"
+msgstr "faili la kikweti"
+
+msgid "Speed:"
+msgstr ""
+
+msgid "Time Elapsed:"
+msgstr "Muda Uliotumika:"
+
+#, fuzzy
+msgid "Time Remaining:"
+msgstr "#1 imebakia"
+
+msgid "Close this window when all transfers _finish"
+msgstr ""
+
+msgid "C_lear finished transfers"
+msgstr ""
+
+#. "Download Details" arrow
+msgid "File transfer _details"
+msgstr ""
+
+#. Pause button
+#, fuzzy
+msgid "_Pause"
+msgstr "Simamisha"
+
+#. Resume button
+#, fuzzy
+msgid "_Resume"
+msgstr "Endelea"
+
+msgid "Paste as Plain _Text"
+msgstr ""
+
+msgid "_Reset formatting"
+msgstr ""
+
+msgid "Disable _smileys in selected text"
+msgstr ""
+
+msgid "Hyperlink color"
+msgstr ""
+
+msgid "Color to draw hyperlinks."
+msgstr ""
+
+msgid "Hyperlink visited color"
+msgstr ""
+
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr ""
+
+msgid "Hyperlink prelight color"
+msgstr ""
+
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr ""
+
+msgid "Sent Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you sent."
+msgstr ""
+
+msgid "Received Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received."
+msgstr ""
+
+msgid "\"Attention\" Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received containing your name."
+msgstr ""
+
+msgid "Action Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of an action message."
+msgstr ""
+
+msgid "Action Message Name Color for Whispered Message"
+msgstr ""
+
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
+msgid "Whisper Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
+msgid "Typing notification color"
+msgstr ""
+
+msgid "The color to use for the typing notification"
+msgstr ""
+
+msgid "Typing notification font"
+msgstr ""
+
+msgid "The font to use for the typing notification"
+msgstr ""
+
+msgid "Enable typing notification"
+msgstr ""
+
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr "Hitilafu katika kuhifadhi %S"
+
+msgid "Save Image"
+msgstr "Hifadhi Taswira"
+
+#, fuzzy
+msgid "_Save Image..."
+msgstr "Hifadhi Taswira"
+
+msgid "_Add Custom Smiley..."
+msgstr ""
+
+#, fuzzy
+msgid "Select Font"
+msgstr "&Uchanguzi"
+
+msgid "Select Text Color"
+msgstr ""
+
+#, fuzzy
+msgid "Select Background Color"
+msgstr "Chapisha rangi za usuli"
+
+#, fuzzy
+msgid "_URL"
+msgstr "URL"
+
+#, fuzzy
+msgid "_Description"
+msgstr "Maelezo"
+
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+
+msgid "Please enter the URL of the link that you want to insert."
+msgstr ""
+
+msgid "Insert Link"
+msgstr ""
+
+msgid "_Insert"
+msgstr ""
+
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr ""
+
+msgid "Insert Image"
+msgstr ""
+
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+
+msgid "Smile!"
+msgstr ""
+
+msgid "_Manage custom smileys"
+msgstr ""
+
+msgid "This theme has no available smileys."
+msgstr ""
+
+#, fuzzy
+msgid "_Font"
+msgstr "Fonti"
+
+msgid "Group Items"
+msgstr ""
+
+msgid "Ungroup Items"
+msgstr ""
+
+msgid "Bold"
+msgstr ""
+
+#, fuzzy
+msgid "Italic"
+msgstr "Kiitalia"
+
+#, fuzzy
+msgid "Underline"
+msgstr "Interlingue"
+
+msgid "Strikethrough"
+msgstr ""
+
+msgid "Increase Font Size"
+msgstr ""
+
+msgid "Decrease Font Size"
+msgstr ""
+
+msgid "Font Face"
+msgstr ""
+
+msgid "Foreground Color"
+msgstr ""
+
+msgid "Reset Formatting"
+msgstr ""
+
+msgid "Insert IM Image"
+msgstr ""
+
+msgid "Insert Smiley"
+msgstr ""
+
+msgid "<b>_Bold</b>"
+msgstr ""
+
+msgid "<i>_Italic</i>"
+msgstr ""
+
+msgid "<u>_Underline</u>"
+msgstr ""
+
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr ""
+
+msgid "<span size='larger'>_Larger</span>"
+msgstr ""
+
+#, fuzzy
+msgid "_Normal"
+msgstr "&Kawaida"
+
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr ""
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+msgid "_Font face"
+msgstr ""
+
+msgid "Foreground _color"
+msgstr ""
+
+msgid "Bac_kground color"
+msgstr ""
+
+#, fuzzy
+msgid "_Image"
+msgstr "Taswira"
+
+msgid "_Link"
+msgstr ""
+
+msgid "_Horizontal rule"
+msgstr ""
+
+msgid "_Smile!"
+msgstr ""
+
+#, fuzzy
+msgid "Log Deletion Failed"
+msgstr "Unganisho Limeshindikana"
+
+msgid "Check permissions and try again."
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr ""
+
+#, fuzzy
+msgid "Delete Log?"
+msgstr "Futa mwenyeji"
+
+#, fuzzy
+msgid "Delete Log..."
+msgstr "Futa mwenyeji"
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr ""
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr ""
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+msgid "_Browse logs folder"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "\n"
+
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  --display=DISPLAY   X display to use\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%swiki/GetABacktrace\n"
+msgstr ""
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#, fuzzy
+msgid "Pidgin"
+msgstr "Programu-unganishi"
+
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+#, fuzzy
+msgid "/_Media"
+msgstr "Media"
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+msgid "Calling..."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Nimeshindwa Kusasisha"
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr ""
+
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+
+#, fuzzy
+msgid "No message"
+msgstr "Ujumbe"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "Fungua kwenye Tabo zote"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+msgid "New Pounces"
+msgstr ""
+
+msgid "Dismiss"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
+#, fuzzy
+msgid "The following plugins will be unloaded."
+msgstr "Programu-jalizi zifuatazo zinapatikana:"
+
+msgid "Multiple plugins will be unloaded."
+msgstr ""
+
+#, fuzzy
+msgid "Unload Plugins"
+msgstr "Kuhusu Program-jalizi"
+
+msgid "Could not unload plugin"
+msgstr ""
+
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+
+#, c-format
+msgid ""
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+
+msgid "Author"
+msgstr ""
+
+msgid "<b>Written by:</b>"
+msgstr ""
+
+msgid "<b>Web site:</b>"
+msgstr ""
+
+msgid "<b>Filename:</b>"
+msgstr ""
+
+msgid "Configure Pl_ugin"
+msgstr ""
+
+msgid "<b>Plugin Details</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Select a file"
+msgstr "Chagua Profaili"
+
+msgid "Modify Buddy Pounce"
+msgstr ""
+
+#. Create the "Pounce on Whom" frame.
+msgid "Pounce on Whom"
+msgstr ""
+
+msgid "_Account:"
+msgstr ""
+
+msgid "_Buddy name:"
+msgstr ""
+
+msgid "Si_gns on"
+msgstr ""
+
+msgid "Signs o_ff"
+msgstr ""
+
+msgid "Goes a_way"
+msgstr ""
+
+msgid "Ret_urns from away"
+msgstr ""
+
+msgid "Becomes _idle"
+msgstr ""
+
+msgid "Is no longer i_dle"
+msgstr ""
+
+msgid "Starts _typing"
+msgstr ""
+
+msgid "P_auses while typing"
+msgstr ""
+
+msgid "Stops t_yping"
+msgstr ""
+
+msgid "Sends a _message"
+msgstr ""
+
+#, fuzzy
+msgid "Ope_n an IM window"
+msgstr "Fungua dirisha jipya"
+
+msgid "_Pop up a notification"
+msgstr ""
+
+msgid "Send a _message"
+msgstr ""
+
+msgid "E_xecute a command"
+msgstr ""
+
+msgid "P_lay a sound"
+msgstr ""
+
+#, fuzzy
+msgid "Brows_e..."
+msgstr "Vinjari…"
+
+#, fuzzy
+msgid "Br_owse..."
+msgstr "Vinjari…"
+
+#, fuzzy
+msgid "Pre_view"
+msgstr "Hakiki"
+
+msgid "P_ounce only when my status is not Available"
+msgstr ""
+
+msgid "_Recurring"
+msgstr ""
+
+msgid "Pounce Target"
+msgstr ""
+
+#, c-format
+msgid "Started typing"
+msgstr ""
+
+#, c-format
+msgid "Paused while typing"
+msgstr ""
+
+#, c-format
+msgid "Signed on"
+msgstr ""
+
+#, c-format
+msgid "Returned from being idle"
+msgstr ""
+
+#, c-format
+msgid "Returned from being away"
+msgstr ""
+
+#, c-format
+msgid "Stopped typing"
+msgstr ""
+
+#, c-format
+msgid "Signed off"
+msgstr ""
+
+#, c-format
+msgid "Became idle"
+msgstr ""
+
+#, c-format
+msgid "Went away"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Weka Ukurasa Nyumbani"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Imeshindwa Kuingia"
+
+msgid "Theme failed to copy."
+msgstr ""
+
+#, fuzzy
+msgid "Install Theme"
+msgstr "Sakinisha Mandhari"
+
+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 ""
+
+msgid "Icon"
+msgstr "Ikoni"
+
+#, fuzzy
+msgid "Keyboard Shortcuts"
+msgstr "Uwekaji wa Mikato"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr ""
+
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr ""
+
+#. System Tray
+msgid "System Tray Icon"
+msgstr ""
+
+msgid "_Show system tray icon:"
+msgstr ""
+
+msgid "On unread messages"
+msgstr ""
+
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Unganisho"
+
+msgid "_Hide new IM conversations:"
+msgstr ""
+
+msgid "When away"
+msgstr ""
+
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
+#. All the tab options!
+msgid "Tabs"
+msgstr "Tabo"
+
+msgid "Show IMs and chats in _tabbed windows"
+msgstr ""
+
+msgid "Show close b_utton on tabs"
+msgstr ""
+
+msgid "_Placement:"
+msgstr ""
+
+#, fuzzy
+msgid "Top"
+msgstr "Kwa:"
+
+#, fuzzy
+msgid "Bottom"
+msgstr "&Chini:"
+
+msgid "Left"
+msgstr "Kushoto"
+
+msgid "Right"
+msgstr "Kulia"
+
+msgid "Left Vertical"
+msgstr ""
+
+msgid "Right Vertical"
+msgstr ""
+
+msgid "N_ew conversations:"
+msgstr ""
+
+msgid "Show _formatting on incoming messages"
+msgstr ""
+
+msgid "Close IMs immediately when the tab is closed"
+msgstr ""
+
+msgid "Show _detailed information"
+msgstr ""
+
+msgid "Enable buddy ic_on animation"
+msgstr ""
+
+msgid "_Notify buddies that you are typing to them"
+msgstr ""
+
+msgid "Highlight _misspelled words"
+msgstr ""
+
+#, fuzzy
+msgid "Use smooth-scrolling"
+msgstr "Tu&mia ubiringizaji taratibu"
+
+msgid "F_lash window when IMs are received"
+msgstr ""
+
+msgid "Minimum input area height in lines:"
+msgstr ""
+
+#, fuzzy
+msgid "Font"
+msgstr "Fonti"
+
+msgid "Use document font from _theme"
+msgstr ""
+
+msgid "Use font from _theme"
+msgstr ""
+
+msgid "Conversation _font:"
+msgstr ""
+
+msgid "Default Formatting"
+msgstr ""
+
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+
+msgid "Cannot start proxy configuration program."
+msgstr ""
+
+msgid "Cannot start browser configuration program."
+msgstr ""
+
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr ""
+
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr ""
+
+msgid "Public _IP:"
+msgstr ""
+
+#, fuzzy
+msgid "Ports"
+msgstr "Lango:"
+
+msgid "_Enable automatic router port forwarding"
+msgstr ""
+
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+msgid "_Start port:"
+msgstr ""
+
+#, fuzzy
+msgid "_End port:"
+msgstr "Tuma Kwa:"
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
+msgid "Proxy Server &amp; Browser"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+
+msgid "Configure _Proxy"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr ""
+
+msgid "Proxy Server"
+msgstr ""
+
+#, fuzzy
+msgid "No proxy"
+msgstr "Hakuna waka&la"
+
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
+msgid "_User:"
+msgstr ""
+
+msgid "Seamonkey"
+msgstr ""
+
+msgid "Opera"
+msgstr "Opera"
+
+#, fuzzy
+msgid "Netscape"
+msgstr "Netscape 4"
+
+msgid "Mozilla"
+msgstr "Mozilla"
+
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#, fuzzy
+msgid "Desktop Default"
+msgstr "Rejesha Misingi"
+
+#, fuzzy
+msgid "GNOME Default"
+msgstr "WPS Msingi"
+
+msgid "Galeon"
+msgstr "Galeon"
+
+msgid "Firefox"
+msgstr "Firefox"
+
+msgid "Firebird"
+msgstr ""
+
+msgid "Epiphany"
+msgstr "Epiphany"
+
+msgid "Manual"
+msgstr ""
+
+msgid "Browser Selection"
+msgstr ""
+
+#, fuzzy
+msgid "_Browser:"
+msgstr "Vinjari…"
+
+msgid "_Open link in:"
+msgstr ""
+
+#, fuzzy
+msgid "Browser default"
+msgstr "Tumia Msingi"
+
+msgid "Existing window"
+msgstr ""
+
+msgid "New tab"
+msgstr "Tabo mpya"
+
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+
+msgid "Log _format:"
+msgstr ""
+
+msgid "Log all _instant messages"
+msgstr ""
+
+msgid "Log all c_hats"
+msgstr ""
+
+msgid "Log all _status changes to system log"
+msgstr ""
+
+#, fuzzy
+msgid "Sound Selection"
+msgstr "&Uchanguzi"
+
+#, c-format
+msgid "Quietest"
+msgstr ""
+
+#, c-format
+msgid "Quieter"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Quiet"
+msgstr "&Funga"
+
+#, fuzzy, c-format
+msgid "Loud"
+msgstr "&Pakia upya"
+
+#, fuzzy, c-format
+msgid "Louder"
+msgstr "folda"
+
+#, c-format
+msgid "Loudest"
+msgstr ""
+
+msgid "_Method:"
+msgstr ""
+
+msgid "Console beep"
+msgstr ""
+
+msgid "No sounds"
+msgstr ""
+
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+
+msgid "M_ute sounds"
+msgstr ""
+
+msgid "Sounds when conversation has _focus"
+msgstr ""
+
+msgid "_Enable sounds:"
+msgstr ""
+
+#, fuzzy
+msgid "V_olume:"
+msgstr "Safu-wima:"
+
+#, fuzzy
+msgid "Play"
+msgstr "Che&za"
+
+#, fuzzy
+msgid "_Browse..."
+msgstr "Vinjari…"
+
+#, fuzzy
+msgid "_Reset"
+msgstr "Seti upya"
+
+msgid "_Report idle time:"
+msgstr ""
+
+msgid "Based on keyboard or mouse use"
+msgstr ""
+
+msgid "_Auto-reply:"
+msgstr ""
+
+msgid "When both away and idle"
+msgstr ""
+
+#. Auto-away stuff
+msgid "Auto-away"
+msgstr ""
+
+msgid "_Minutes before becoming idle:"
+msgstr ""
+
+msgid "Change status when _idle"
+msgstr ""
+
+#, fuzzy
+msgid "Change _status to:"
+msgstr "&Badili matini ya ufito hali"
+
+#. Signon status stuff
+msgid "Status at Startup"
+msgstr ""
+
+msgid "Use status from last _exit at startup"
+msgstr ""
+
+msgid "Status to a_pply at startup:"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Themes"
+msgstr "Pata Mandhari"
+
+#, fuzzy
+msgid "Browser"
+msgstr "Vinjari…"
+
+msgid "Status / Idle"
+msgstr ""
+
+msgid "Allow all users to contact me"
+msgstr ""
+
+msgid "Allow only the users on my buddy list"
+msgstr ""
+
+msgid "Allow only the users below"
+msgstr ""
+
+msgid "Block all users"
+msgstr ""
+
+msgid "Block only the users below"
+msgstr ""
+
+msgid "Privacy"
+msgstr "Faragha"
+
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+msgid "Set privacy for:"
+msgstr ""
+
+#. Remove All button
+#, fuzzy
+msgid "Remove Al_l"
+msgstr "Ondoa &All"
+
+msgid "Permit User"
+msgstr ""
+
+msgid "Type a user you permit to contact you."
+msgstr ""
+
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr ""
+
+msgid "_Permit"
+msgstr ""
+
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "Una uhakika unataka kuOnyesha nywila zako?"
+
+#, fuzzy
+msgid "Block User"
+msgstr "Imezuiliwa"
+
+msgid "Type a user to block."
+msgstr ""
+
+msgid "Please enter the name of the user you wish to block."
+msgstr ""
+
+#, c-format
+msgid "Block %s?"
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr ""
+
+msgid "Apply"
+msgstr ""
+
+#, fuzzy
+msgid "That file already exists"
+msgstr "Ithibati tayari ipo."
+
+#, fuzzy
+msgid "Would you like to overwrite it?"
+msgstr "Ungependa kuhifadhi faili hili?"
+
+msgid "Overwrite"
+msgstr ""
+
+#, fuzzy
+msgid "Choose New Name"
+msgstr "Jina la Kuki"
+
+#, fuzzy
+msgid "Select Folder..."
+msgstr "Fold&a Lililochaguliwa"
+
+#. list button
+msgid "_Get List"
+msgstr ""
+
+#. add button
+msgid "_Add Chat"
+msgstr ""
+
+#, fuzzy
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "Je una uhakika uantaka kufuta ithibati hizi?"
+
+#. Use button
+msgid "_Use"
+msgstr ""
+
+msgid "Title already in use.  You must choose a unique title."
+msgstr ""
+
+msgid "Different"
+msgstr ""
+
+#, fuzzy
+msgid "_Title:"
+msgstr "Jina:"
+
+#, fuzzy
+msgid "_Status:"
+msgstr "Hali:"
+
+#. Different status message expander
+msgid "Use a _different status for some accounts"
+msgstr ""
+
+#. Save & Use button
+msgid "Sa_ve & Use"
+msgstr ""
+
+#, c-format
+msgid "Status for %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
+#, fuzzy
+msgid "Custom Smiley"
+msgstr "Kipimo cha kaida..."
+
+#, fuzzy
+msgid "Duplicate Shortcut"
+msgstr "sifa rudufu"
+
+msgid "Edit Smiley"
+msgstr ""
+
+msgid "Add Smiley"
+msgstr ""
+
+#, fuzzy
+msgid "_Image:"
+msgstr "Taswira"
+
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr ""
+
+msgid "Smiley"
+msgstr ""
+
+msgid "Shortcut Text"
+msgstr ""
+
+msgid "Custom Smiley Manager"
+msgstr ""
+
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "&Uchanguzi"
+
+msgid "Click to change your buddyicon for this account."
+msgstr ""
+
+msgid "Click to change your buddyicon for all accounts."
+msgstr ""
+
+msgid "Waiting for network connection"
+msgstr ""
+
+msgid "New status..."
+msgstr ""
+
+msgid "Saved statuses..."
+msgstr ""
+
+msgid "Status Selector"
+msgstr ""
+
+msgid "Google Talk"
+msgstr ""
+
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed to load image"
+msgstr "Imeshindwa Kuingia"
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+
+msgid "You have dragged an image"
+msgstr ""
+
+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 ""
+
+msgid "Set as buddy icon"
+msgstr ""
+
+msgid "Send image file"
+msgstr ""
+
+#, fuzzy
+msgid "Insert in message"
+msgstr "Funga ujumbe huu"
+
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr ""
+
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+
+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
+msgid "Cannot send launcher"
+msgstr ""
+
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
+msgstr ""
+
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+
+#, fuzzy
+msgid "Icon Error"
+msgstr "Hitilafu isiyojulikana"
+
+msgid "Could not set icon"
+msgstr ""
+
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+#, fuzzy
+msgid "_Open Link"
+msgstr "Fungua katika:"
+
+#, fuzzy
+msgid "_Copy Link Location"
+msgstr "&Nakili Mahali pa Kiungo"
+
+#, fuzzy
+msgid "_Copy Email Address"
+msgstr "Nakili Anwani ya Barua-p&epe"
+
+#, fuzzy
+msgid "Save File"
+msgstr "&Hifadhi faili"
+
+#, fuzzy
+msgid "Select color"
+msgstr "Chagua &Yote"
+
+msgid "_Alias"
+msgstr ""
+
+#, fuzzy
+msgid "Close _tabs"
+msgstr "Funga tabo"
+
+msgid "_Get Info"
+msgstr ""
+
+msgid "_Invite"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify..."
+msgstr "R&ekebisha"
+
+msgid "_Add..."
+msgstr ""
+
+#, fuzzy
+msgid "_Open Mail"
+msgstr "Fungua tabo"
+
+#, fuzzy
+msgid "_Edit"
+msgstr "&Hariri"
+
+msgid "Pidgin Tooltip"
+msgstr ""
+
+msgid "Pidgin smileys"
+msgstr ""
+
+msgid "Penguin Pimps"
+msgstr ""
+
+msgid "Selecting this disables graphical emoticons."
+msgstr ""
+
+#, fuzzy
+msgid "none"
+msgstr "Bila"
+
+#, fuzzy
+msgid "Small"
+msgstr "Kisomali"
+
+msgid "Smaller versions of the default smilies"
+msgstr ""
+
+msgid "Response Probability:"
+msgstr ""
+
+msgid "Statistics Configuration"
+msgstr ""
+
+#. msg_difference spinner
+msgid "Maximum response timeout:"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
+#. last_seen spinner
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#. threshold spinner
+msgid "Threshold:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Availability Prediction"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Contact Availability Prediction plugin."
+msgstr ""
+
+#. *  summary
+msgid "Displays statistical information about your buddies' availability"
+msgstr ""
+
+#, fuzzy
+msgid "Server name request"
+msgstr "Seva"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Ingiza neno tafuti:"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Huduma za tovuti"
+
+msgid "Add to Buddy List"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+#, fuzzy
+msgid "Directory"
+msgstr "Tafuta historia"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "&Uchanguzi"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Maelezo"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Tafuta historia"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "Vinjari…"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Faili %S halipo"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+msgid "Buddy is idle"
+msgstr ""
+
+msgid "Buddy is away"
+msgstr ""
+
+msgid "Buddy is \"extended\" away"
+msgstr ""
+
+#. Not used yet.
+msgid "Buddy is mobile"
+msgstr ""
+
+msgid "Buddy is offline"
+msgstr ""
+
+msgid "Point values to use when..."
+msgstr ""
+
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+
+msgid "Use last buddy when scores are equal"
+msgstr ""
+
+msgid "Point values to use for account..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Priority"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
+msgid "Conversation Colors"
+msgstr ""
+
+msgid "Customize colors in the conversation window"
+msgstr ""
+
+#, fuzzy
+msgid "Error Messages"
+msgstr "Ufafanuzi wa Hitilafu"
+
+msgid "Highlighted Messages"
+msgstr ""
+
+#, fuzzy
+msgid "System Messages"
+msgstr "Misingi ya mfumo"
+
+#, fuzzy
+msgid "Sent Messages"
+msgstr "Jumbe za tahadhari"
+
+msgid "Received Messages"
+msgstr ""
+
+#, c-format
+msgid "Select Color for %s"
+msgstr ""
+
+msgid "Ignore incoming format"
+msgstr ""
+
+msgid "Apply in Chats"
+msgstr ""
+
+msgid "Apply in IMs"
+msgstr ""
+
+msgid "By conversation count"
+msgstr ""
+
+msgid "Conversation Placement"
+msgstr ""
+
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+
+msgid "Number of conversations per window"
+msgstr ""
+
+msgid "Separate IM and Chat windows when placing by number"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "ExtPlacement"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Extra conversation placement options."
+msgstr ""
+
+#. *< summary
+#. *  description
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+
+#. Configuration frame
+msgid "Mouse Gestures Configuration"
+msgstr ""
+
+msgid "Middle mouse button"
+msgstr ""
+
+msgid "Right mouse button"
+msgstr ""
+
+#. "Visual gesture display" checkbox
+msgid "_Visual gesture display"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Mouse Gestures"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Provides support for mouse gestures"
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
+msgstr ""
+
+msgid "Instant Messaging"
+msgstr ""
+
+#. Add the label.
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+
+#, fuzzy
+msgid "Group:"
+msgstr "Kusanya kwa:"
+
+#. "New Person" button
+#, fuzzy
+msgid "New Person"
+msgstr "Toleo Jipya"
+
+#. "Select Buddy" button
+msgid "Select Buddy"
+msgstr ""
+
+#. Add the label.
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+
+#. Add the expander
+#, fuzzy
+msgid "User _details"
+msgstr "Onyesha &ufafanuzi"
+
+#. "Associate Buddy" button
+msgid "_Associate Buddy"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to send email"
+msgstr "Haiwezi kufuta moduli"
+
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
+msgid "An email address was not found for this buddy."
+msgstr ""
+
+msgid "Add to Address Book"
+msgstr ""
+
+msgid "Send Email"
+msgstr ""
+
+#. Configuration frame
+msgid "Evolution Integration Configuration"
+msgstr ""
+
+#. Label
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Evolution Integration"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides integration with Evolution."
+msgstr ""
+
+msgid "Please enter the person's information below."
+msgstr ""
+
+msgid "Please enter the buddy's username and account type below."
+msgstr ""
+
+msgid "Account type:"
+msgstr ""
+
+#. Optional Information section
+#, fuzzy
+msgid "Optional information:"
+msgstr "Taarifa zaidi"
+
+#, fuzzy
+msgid "First name:"
+msgstr "Ukurasa wa kwanza"
+
+#, fuzzy
+msgid "Last name:"
+msgstr "Ukurasa wa mwisho"
+
+#, fuzzy
+msgid "Email:"
+msgstr "Barua pepe"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GTK Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+
+msgid "History"
+msgstr "Historia"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Iconify on Away"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr ""
+
+msgid "Mail Checker"
+msgstr ""
+
+msgid "Checks for new local mail."
+msgstr ""
+
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+
+msgid "Markerline"
+msgstr ""
+
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr ""
+
+msgid "Jump to markerline"
+msgstr ""
+
+msgid "Draw Markerline in "
+msgstr ""
+
+#, fuzzy
+msgid "_IM windows"
+msgstr "Dirisha jipya"
+
+msgid "C_hat windows"
+msgstr ""
+
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+
+msgid "Music messaging session confirmed."
+msgstr ""
+
+msgid "Music Messaging"
+msgstr ""
+
+msgid "There was a conflict in running the command:"
+msgstr ""
+
+#, fuzzy
+msgid "Error Running Editor"
+msgstr "Hitilafu katika Kutuma Taarifa"
+
+msgid "The following error has occurred:"
+msgstr ""
+
+#. Configuration frame
+msgid "Music Messaging Configuration"
+msgstr ""
+
+msgid "Score Editor Path"
+msgstr ""
+
+msgid "_Apply"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr ""
+
+#. *  summary
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editing a common score in real-time."
+msgstr ""
+
+#. ---------- "Notify For" ----------
+msgid "Notify For"
+msgstr ""
+
+msgid "\t_Only when someone says your username"
+msgstr ""
+
+msgid "_Focused windows"
+msgstr ""
+
+#. ---------- "Notification Methods" ----------
+msgid "Notification Methods"
+msgstr ""
+
+msgid "Prepend _string into window title:"
+msgstr ""
+
+#. Count method button
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#. Count xprop method button
+msgid "Insert count of new message into _X property"
+msgstr ""
+
+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr ""
+
+#, fuzzy
+msgid "_Flash window"
+msgstr "Dirisha sawa"
+
+#. Raise window method button
+msgid "R_aise conversation window"
+msgstr ""
+
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr ""
+
+#. ---------- "Notification Removals" ----------
+msgid "Notification Removal"
+msgstr ""
+
+#. Remove on focus button
+msgid "Remove when conversation window _gains focus"
+msgstr ""
+
+#. Remove on click button
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#. Remove on type button
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#. Remove on message send button
+msgid "Remove when a _message gets sent"
+msgstr ""
+
+#. Remove on conversation switch button
+msgid "Remove on switch to conversation ta_b"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "Message Notification"
+msgstr "Arifisho la Jumla"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Pidgin Demonstration Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "An example plugin that does stuff - see the description."
+msgstr ""
+
+#. *  description
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+
+msgid "Hyperlink Color"
+msgstr ""
+
+msgid "Visited Hyperlink Color"
+msgstr ""
+
+msgid "Highlighted Message Name Color"
+msgstr ""
+
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Arifisho la Jumla"
+
+msgid "GtkTreeView Horizontal Separation"
+msgstr ""
+
+msgid "Conversation Entry"
+msgstr ""
+
+msgid "Request Dialog"
+msgstr ""
+
+msgid "Notify Dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Select Color"
+msgstr "Chagua &Yote"
+
+#, c-format
+msgid "Select Interface Font"
+msgstr ""
+
+#, c-format
+msgid "Select Font for %s"
+msgstr ""
+
+msgid "GTK+ Interface Font"
+msgstr ""
+
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Arifisho la Jumla"
+
+msgid "GTK+ Theme Control Settings"
+msgstr ""
+
+#, fuzzy
+msgid "Colors"
+msgstr "Funga"
+
+msgid "Fonts"
+msgstr "Fonti"
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "Gtkrc File Tools"
+msgstr ""
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr ""
+
+msgid "Re-read gtkrc files"
+msgstr ""
+
+msgid "Pidgin GTK+ Theme Control"
+msgstr ""
+
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+
+#, c-format
+msgid "You can upgrade to %s %s today."
+msgstr ""
+
+msgid "New Version Available"
+msgstr "Toleo Jipya Linapatikana"
+
+msgid "Later"
+msgstr "Baadae"
+
+#, fuzzy
+msgid "Download Now"
+msgstr "Hitilafu ya upakuzi"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "Release Notification"
+msgstr "Arifisho la Jumla"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Checks periodically for new releases."
+msgstr ""
+
+#. *  description
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "Send Button"
+msgstr "Tuma kwa:"
+
+#. *< name
+#. *< version
+msgid "Conversation Window Send Button."
+msgstr ""
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for use when no physical keyboard is present."
+msgstr ""
+
+msgid "Duplicate Correction"
+msgstr ""
+
+msgid "The specified word already exists in the correction list."
+msgstr ""
+
+msgid "Text Replacements"
+msgstr ""
+
+#, fuzzy
+msgid "You type"
+msgstr "Aina ya uunganishi"
+
+msgid "You send"
+msgstr ""
+
+msgid "Whole words only"
+msgstr ""
+
+#, fuzzy
+msgid "Case sensitive"
+msgstr "(Nyepesi huhisi herufi kubwa au ndogo)"
+
+msgid "Add a new text replacement"
+msgstr ""
+
+msgid "You _type:"
+msgstr ""
+
+msgid "You _send:"
+msgstr ""
+
+#. Created here so it can be passed to whole_words_button_toggled.
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+
+msgid "Only replace _whole words"
+msgstr ""
+
+msgid "General Text Replacement Options"
+msgstr ""
+
+msgid "Enable replacement of last word on send"
+msgstr ""
+
+msgid "Text replacement"
+msgstr ""
+
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+
+#, fuzzy
+msgid "Just logged in"
+msgstr "Hajaingia"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Hajaingia"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Hitilafu isiyojulikana"
+
+msgid "Ignored"
+msgstr ""
+
+#, fuzzy
+msgid "Founder"
+msgstr "folda"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Uthibitisho unatakiwa"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Hitikafu "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Taarifa Zaidi"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Jumbe za tahadhari"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Hali"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+msgid "Dialog Icons"
+msgstr ""
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "Yaliyomo"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr ""
+
+msgid "Edit Buddylist Theme"
+msgstr ""
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Ticker"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "A horizontal scrolling version of the buddy list."
+msgstr ""
+
+msgid "Display Timestamps Every"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "Timestamp"
+msgstr "Uchapaji wa Muda"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Display iChat-style timestamps"
+msgstr ""
+
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr ""
+
+msgid "Timestamp Format Options"
+msgstr ""
+
+#, c-format
+msgid "_Force 24-hour time format"
+msgstr ""
+
+msgid "Show dates in..."
+msgstr ""
+
+msgid "Co_nversations:"
+msgstr ""
+
+msgid "For delayed messages"
+msgstr ""
+
+msgid "For delayed messages and in chats"
+msgstr ""
+
+msgid "_Message Logs:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Timestamp Formats"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Customizes the message timestamp formats."
+msgstr ""
+
+#. *  description
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+
+msgid "Opacity:"
+msgstr ""
+
+#. IM Convo trans options
+msgid "IM Conversation Windows"
+msgstr ""
+
+msgid "_IM window transparency"
+msgstr ""
+
+msgid "_Show slider bar in IM window"
+msgstr ""
+
+msgid "Remove IM window transparency on focus"
+msgstr ""
+
+#, fuzzy
+msgid "Always on top"
+msgstr "&Juu Daima"
+
+#. Buddy List trans options
+msgid "Buddy List Window"
+msgstr ""
+
+msgid "_Buddy List window transparency"
+msgstr ""
+
+msgid "Remove Buddy List window transparency on focus"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Transparency"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr ""
+
+#. *  description
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+
+msgid "GTK+ Runtime Version"
+msgstr ""
+
+#. Autostart
+msgid "Startup"
+msgstr "Kila unapoanzisha"
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr ""
+
+msgid "_Dockable Buddy List"
+msgstr ""
+
+#. Blist On Top
+msgid "_Keep Buddy List window on top:"
+msgstr ""
+
+#. XXX: Did this ever work?
+msgid "Only when docked"
+msgstr ""
+
+msgid "Windows Pidgin Options"
+msgstr ""
+
+msgid "Options specific to Pidgin for Windows."
+msgstr ""
+
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr ""
+
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "XMPP Console"
+msgstr "Kiweko cha Hitilafu"
+
+msgid "Account: "
+msgstr ""
+
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr ""
+
+msgid "Insert an <iq/> stanza."
+msgstr ""
+
+msgid "Insert a <presence/> stanza."
+msgstr ""
+
+msgid "Insert a <message/> stanza."
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Haiwezi kufungua %S"
+
+#, fuzzy
+#~ msgid "Unable to read socket"
+#~ msgstr "Haiwezi kuongeza moduli"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Unganisho Limeshindikana"
+
+#, fuzzy
+#~ msgid "Write error"
+#~ msgstr "Hitilafu ya Printa"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Mapali pa &Tawanyiko:"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Jina la Mtumiaji:"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Notisi za Mtumiaji"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Jina la mtumiaji"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Kuvinjari kwa kareti"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Jina la Mtumiaji:"
+
+#, fuzzy
+#~ msgid "Hop Check"
+#~ msgstr "Usikague"
+
+#, fuzzy
+#~ msgid "Read Error"
+#~ msgstr "Hitilafu ya Faili"
+
+#, fuzzy
+#~ msgid "Incorrect password."
+#~ msgstr "Nywila ya sasa hivi:"
+
+#, fuzzy
+#~ msgid "Could Not Connect"
+#~ msgstr "Imeshindwa kuunganisha"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Jina batili la moduli."
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Unganisho"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Muunganisho ulikataliwa"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Hitilafu ya upakiaji lahamtindo: %S"
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy
+#~ msgid "Could not connect"
+#~ msgstr "\"Haikuweza kupakia: \""
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Nywila ya sasa hivi:"
diff --git a/po/ta.po b/po/ta.po
index 70e3bb9ce7..d01257cd12 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-11-28 22:37+0530\n"
 "Last-Translator: drtvasudevan <agnihot3@gmail.com>\n"
 "Language-Team: tamil <Ubuntu-l10n-tam@lists.ubuntu.com>\n"
@@ -38,7 +38,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -648,21 +648,6 @@ msgid "Send To"
 msgstr "இதற்கு _அனுப்பு"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "தகவலில் சேர்க"
-
-msgid "Invite"
-msgstr "அழைப்பு"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"நீங்கள் அழைக்க விரும்பும் நண்பரின் பெயர் மற்றும், விருப்பப்பட்ட அழைப்பு தகவலையும் தயவுசெய்து "
-"கொடுக்கவும்."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "உரையாடல்கள்"
 
@@ -931,6 +916,43 @@ msgid "System Log"
 msgstr "கணினி பதிவு"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "கணக்கிடல்..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "_ஏற்றுக் கொள்க"
+
+#, fuzzy
+msgid "Reject"
+msgstr "மீண்டும் அமை"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "நீங்கள் வாய்க்கால்%s%s லிருந்து பிரிந்துள்ளீர்கள்"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "மின் அஞ்சல்"
 
@@ -967,6 +989,9 @@ msgstr "இணை"
 msgid "IM"
 msgstr "ஐஎம்"
 
+msgid "Invite"
+msgstr "அழைப்பு"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(பெயரற்றது)"
@@ -1188,7 +1213,6 @@ msgstr "%s வெளியே சென்றுள்ளார் (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s உமக்கு செய்தி அனுப்பியுள்ளார். (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "தெரியாத நிமித்தச் செயலாக்கல் நிகழ்வு. இதை அறிவியுங்கள்!"
 
@@ -1245,7 +1269,6 @@ msgstr "நிலையை _மாற்றுவதற்கு முன் �
 msgid "Change status to"
 msgstr "_ந நிலையை இதற்கு மாற்று:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "உரையாடல்கள்"
 
@@ -1602,7 +1625,6 @@ msgstr ""
 "புதிய உரையாடல் திறக்கப் படும் போது இந்த சொருகுப்பொருள் கடைசியாக நடந்த உரையாடலை "
 "சொருகும்."
 
-#, c-format
 msgid "Online"
 msgstr "இணைப்புடன்"
 
@@ -1651,6 +1673,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "யுஆர்எல் "
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "கணக்குகள்"
 
@@ -1749,15 +1793,6 @@ msgstr "உரையாடல் அழைப்பை ஏற்கவா?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "_ஏற்றுக் கொள்க"
-
-#, fuzzy
-msgid "Reject"
-msgstr "மீண்டும் அமை"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1848,6 +1883,8 @@ msgstr "+++ %s நுழைந்துள்ளார்"
 msgid "+++ %s signed off"
 msgstr "+++ %s வெளியேறிவிட்டார்"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "தெரியாத பிழை"
 
@@ -1896,6 +1933,18 @@ msgstr "%s அறையை விட்டு வெளியேறினார�
 msgid "%s left the room (%s)."
 msgstr "%s அறையை விட்டு வெளியேறினார் (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "கலந்துரையாடலுக்கு அழை"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"நீங்கள் அழைக்க விரும்பும் நண்பரின் பெயர் மற்றும், விருப்பப்பட்ட அழைப்பு தகவலையும் தயவுசெய்து "
+"கொடுக்கவும்."
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "இணைப்பை உருவாக்க முடியவில்லை"
@@ -2033,7 +2082,6 @@ msgstr "%s லிருந்து %s க்கு பரிமாற்றம�
 msgid "Transfer of file %s complete"
 msgstr "%s கோப்பு பரிமாற்றம் முடிந்தது"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "கோப்பு பரிமாற்றம் முடிந்தது"
 
@@ -2041,7 +2089,6 @@ msgstr "கோப்பு பரிமாற்றம் முடிந்த�
 msgid "You canceled the transfer of %s"
 msgstr "இந்த பரிமாற்றத்தை நீங்கள் நீக்கிவிட்டீர்கள் %s "
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "கோப்பு பரிமாற்றம் நீக்கப்பட்டது"
 
@@ -2227,11 +2274,14 @@ msgstr "<font color=\"red\"><b>கோப்பை படிக்க முட�
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "இணைப்பை உருவாக்குவதில் பிழை"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2643,7 +2693,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2694,7 +2744,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2723,6 +2773,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "கடவுச்சொல்லை உள்ளிடவும்"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2916,18 +2992,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "உள்வரும் ஐஎம் இணைப்புகளை கவனிக்க இயலவில்லை\n"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "முதற் பெயர்"
 
@@ -2962,6 +3038,11 @@ msgstr "போன்ஜு நெறிமுறை சொருகுபொர�
 msgid "Purple Person"
 msgstr "புதிய நபர்"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "எல்லை"
+
 msgid "Bonjour"
 msgstr "போன்ஜு"
 
@@ -2972,16 +3053,17 @@ msgstr "%s உரையாடலை முடித்துவிட்டா�
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "செய்திகளை அனுப்ப முடியவில்லை. உரையாடலை துவக்க முடியாது."
 
-msgid "Cannot open socket"
-msgstr "கொள் குழியை (சாக்கெட்டை) திறக்க முடியவில்லை "
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "கொள் குழியை (சாக்கெட்டை) சொருகுவாய்க்கு பிணைக்க முடியவில்லை!"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "கொள் குழி (சாக்கெட்) இல் கேட்க இயலவில்லை"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3031,13 +3113,16 @@ msgstr "நண்பர் பட்டியலை சேமி..."
 msgid "Load buddylist from file..."
 msgstr "நண்பர் பட்டியலை கோப்பிலிருந்து ஏற்றவும்..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "பதிவுப் புலங்களை நிரப்புக."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "கடவுச்சொற்கள் பொருந்தவில்லை."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "புதிய கணக்கை பதிய இயலவில்லை. பிழை ஏற்பட்டது.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3049,14 +3134,15 @@ msgstr "பதிவு வெற்றிகரமாக முடிந்த�
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "கடவுச்சொல் (மீண்டும்)"
 
-msgid "Enter current token"
-msgstr "தற்போதைய டோக்கனை உள்ளிவும்"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "தற்போதைய டோக்கன்"
+#, fuzzy
+msgid "Captcha"
+msgstr "படத்தை சேமி"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "புதிய காடு-காடு கணக்கு பதிவு"
@@ -3110,6 +3196,15 @@ msgstr "கடவுச்சொல் வெற்றிகரமாக மா�
 msgid "Current password"
 msgstr "தற்போதைய கடவுச்சொல்"
 
+msgid "Password (retype)"
+msgstr "கடவுச்சொல் (மீண்டும்)"
+
+msgid "Enter current token"
+msgstr "தற்போதைய டோக்கனை உள்ளிவும்"
+
+msgid "Current token"
+msgstr "தற்போதைய டோக்கன்"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "தயவுசெய்து யுஎன்ஐ (UIN) க்கான தங்களது தற்போதைய மற்றும் புதிய கடவுச்சொல்லை கொடுக்கவும்: "
@@ -3124,13 +3219,13 @@ msgstr "நண்பருக்காக ஒரு அரட்டையை த
 msgid "Add to chat..."
 msgstr "அரட்டையுடன் சேர்..."
 
+#. Global
 msgid "Available"
 msgstr "அரட்டைக்குத் தயாராக இருக்கிறேன்"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "வெளியே"
 
@@ -3158,7 +3253,8 @@ msgstr "ஒத்துப் போகும் பயனர் யாரைய
 msgid "There are no users matching your search criteria."
 msgstr "உங்கள் தேடல் அளபுருகளுக்கு ஒத்துப் போகும் பயனர் யாரும் இல்லை."
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "கொள் குழியை (சாக்கெட்டை) வாசிக்க இயலவில்லை"
 
 msgid "Buddy list downloaded"
@@ -3173,8 +3269,14 @@ msgstr "நண்பர் பட்டியல் மேலேற்றப்
 msgid "Your buddy list was stored on the server."
 msgstr "நண்பர் பட்டியல் சேவையகத்தில் சேமிக்கப் பட்டது."
 
-msgid "Connection failed."
-msgstr "இணைப்பு தவறியது."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "இணைக்கப்பட்டது"
+
+msgid "Connection failed"
+msgstr "இணைப்பு தோல்வியுற்றது."
 
 msgid "Add to chat"
 msgstr "அரட்டையில் சேர்க்க"
@@ -3182,13 +3284,23 @@ msgstr "அரட்டையில் சேர்க்க"
 msgid "Chat _name:"
 msgstr "_ப அரட்டை பெயர்:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "இணைத்தல்"
+
 msgid "Chat error"
 msgstr "அரட்டை பிழை"
 
 msgid "This chat name is already in use"
 msgstr "இந்த அரட்டை பெயர் ஏற்கனவே உபயோகத்தில் உள்ளது."
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
 
 msgid "Find buddies..."
@@ -3230,6 +3342,10 @@ msgstr "பிரபலமான போலிஷ் ஐஎம்"
 msgid "Gadu-Gadu User"
 msgstr "காடு-காடு பயனாளர்"
 
+#, fuzzy
+msgid "GG server"
+msgstr "பயனாளர் தகவலை அமை..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "தெரியாத கட்டளை: %s"
@@ -3245,7 +3361,7 @@ msgid "File Transfer Failed"
 msgstr "கோப்பு பரிமாற்றம் தவறியது"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "கெய்மால் கவனிக்கக்கூடிய தளத்தை திறக்க முடியவில்லை."
 
 msgid "Error displaying MOTD"
@@ -3261,8 +3377,16 @@ msgstr "இந்த இணைப்புடன் எம்ஓடிடி (MO
 msgid "MOTD for %s"
 msgstr "%s க்கான எம்ஓடிடி (MOTD)"
 
-msgid "Server has disconnected"
-msgstr "சேவையக இணைப்பு துண்டிக்கப்பட்டது"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
 
 msgid "View MOTD"
 msgstr "எம்ஓடிடி (MOTD) ஐ காண"
@@ -3273,25 +3397,24 @@ msgstr "_வாய்க்கால்:"
 msgid "_Password:"
 msgstr "_கடவுச்சொல்:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "ஐஆர்சி புனைப்பெயரில் வெற்றிடமிருக்கக் கூடாது"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "இணைத்தல்"
-
 msgid "SSL support unavailable"
 msgstr "எஸ்எஸ்எல் ஆதரவு கிடைக்கவில்லை"
 
-msgid "Couldn't create socket"
-msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்க முடியவில்லை"
+msgid "Unable to connect"
+msgstr "இணைக்க முடியவில்லை"
 
-msgid "Couldn't connect to host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
 msgstr "புரவலருடன் இணைக்க முடியவில்லை"
 
-msgid "Read error"
-msgstr "வாசிப்பதில் பிழை"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "%s உரையாடலை முடித்துவிட்டார்."
 
 msgid "Users"
 msgstr "பயனாளர்கள்"
@@ -3476,6 +3599,17 @@ msgstr ""
 "சேவையகத்தால் மறுக்கப்பட்ட கணக்கு பெயரை நீங்கள் தேர்வு செய்துள்ளீர்கள். அது அநேகமாக செல்லாத "
 "எழுத்துக்களை கொண்டிருக்கிறது."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "இந்த அரட்டை பெயர் ஏற்கனவே உபயோகத்தில் உள்ளது."
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "புனைப்பெயர்"
+
 msgid "Cannot change nick"
 msgstr "செல்லப்பெயரை மாற்ற முடியாது"
 
@@ -3715,12 +3849,13 @@ msgstr "கட்டளை இயலாமையாக்கப்பட்ட�
 msgid "execute"
 msgstr "எதிர்பாராத"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "உள்ளே நுழைய சேவையகத்துக்கு டிஎல்எஸ்/எஸ்எஸ்எல் தேவை. டிஎல்எஸ்/எஸ்எஸ்எல் ஆதரவு ஏதுமில்லை."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "உள்ளே நுழைய சேவையகத்துக்கு டிஎல்எஸ்/எஸ்எஸ்எல் தேவை. டிஎல்எஸ்/எஸ்எஸ்எல் ஆதரவு ஏதுமில்லை."
 
@@ -3739,18 +3874,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "சாதாரண வாக்கிய உறுதியாக்கல்"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "அனுமதியாக்கல் தவறியது"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "சேவையகத்திலிருந்து செல்லாத பதில்."
 
 msgid "Server does not use any supported authentication method"
 msgstr "சேவையகம் எந்த ஆதரவுள்ள உறுதிபடுத்தல் முறையையும் பயன்படுத்தவில்லை."
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "சேவையகத்திலிருந்து செல்லாத கூவல்"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "எஸ்ஏஎஸ்எல் (SASL) பிழை"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "காரணம் கொடுக்கப்படவில்லை."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "ஆதரிக்கப்படாத பதிப்பு"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "இணைப்பை உருவாக்க முடியவில்லை"
+
 msgid "Full Name"
 msgstr "முழுப்பெயர்"
 
@@ -3817,187 +3984,9 @@ msgstr "நகரம்"
 msgid "Operating System"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "அடைவு தகவல்களை அமை"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "நீட்டித்த முகவரி"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "அரட்டை புனைப்பெயர்"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "பயனருக்கு அடைவு தகவல் இல்லை ."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "கட்டளை"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "ஹெச்டிஎம்எல் (HTML) "
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "பதிவுப் பிழை"
-
-#, fuzzy
-msgid "User Location"
-msgstr "இடம்"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "பயனர் தேடல்"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "நண்பர் நிலை அறிவிப்பு"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "ஆதரிக்கப்படாத பதிப்பு"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "திசை அமைப்பு"
-
-msgid "File Transfer"
-msgstr "கோப்பு பரிமாற்றம்"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "பயன்பாட்டாளர் வகைகள்"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "பயனர் வரையளவு"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "செயல்திறன்"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "பயனாளர் பெயர்"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "ஐஎம் சாவி பரிமாற்றத்துடன்"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "மின்னஞ்சல்"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "எம்எஸ்என் குறுந்தொகுப்பு"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "பிங்"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "பயனர் பெயர்"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
 #, fuzzy
-msgid "Jingle Video"
-msgstr "நிகழ் ஒளித்தோற்றம்"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "தகவல் பெறப்பட்டது"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "பொது சொல்லாக்க விசை"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "பயனாளர் விருப்பங்கள்"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "பயன்பாட்டாளர் வகைகள்"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "பயனர் பெயர்"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "பயனர் வரையளவு"
-
-msgid "Ping"
-msgstr "பிங்"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ட்ரில்லியன் ரகசியமாக்கல்"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "செயல்திறன்"
+msgid "Local Time"
+msgstr "இங்கேயுள்ள கோப்பு:"
 
 msgid "Priority"
 msgstr "முன்னுரிமை"
@@ -4005,6 +3994,14 @@ msgstr "முன்னுரிமை"
 msgid "Resource"
 msgstr "வளம்"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "ஏற்கனவே நுழையப்பட்டிருக்கிறது"
+
 msgid "Middle Name"
 msgstr "நடுப் பெயர்"
 
@@ -4053,7 +4050,6 @@ msgstr "வாயாடி"
 msgid "Extended Away"
 msgstr "வெளியே சென்றது நீட்டிக்கப்பட்டது"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "தொந்தரவு செய்ய வேண்டாம்"
 
@@ -4176,27 +4172,26 @@ msgstr "விசாரிப்பதற்காக ஒரு கலந்த�
 msgid "Find Rooms"
 msgstr "அறைகளை கண்டுபிடி"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "புனைப்பெயர்:"
 
-msgid "Write error"
-msgstr "எழுதுவதில் பிழை"
+#, fuzzy
+msgid "No users found"
+msgstr "ஒத்துப் போகும் பயனர் யாரையும்  கண்டுபிடிக்கமுடியவில்லை"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "வெற்று உரை முறை"
+msgid "Roles:"
+msgstr "பங்கு"
 
-msgid "Read Error"
-msgstr "வாசிப்பதில் பிழை"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "வெற்று உரை முறை"
 
-#, fuzzy, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
-
-msgid "Unable to create socket"
-msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
+msgstr ""
 
 #, fuzzy
 msgid "Invalid XMPP ID"
@@ -4205,6 +4200,10 @@ msgstr "செல்லாத அடையாளம்"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "சேவையகத்துடன் இணைக்க தவறியது."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s பதிவாக்கம் வெற்றி"
@@ -4231,9 +4230,6 @@ msgstr "வெற்றிகரமான பதிவாக்கம்"
 msgid "Unregistration Failed"
 msgstr "பதிவாக்கம் தவறியது"
 
-msgid "Already Registered"
-msgstr "ஏற்கனவே பதியப்பட்டது"
-
 msgid "State"
 msgstr "மாநிலம்"
 
@@ -4246,6 +4242,9 @@ msgstr "தொலைபேசி"
 msgid "Date"
 msgstr "நாள்"
 
+msgid "Already Registered"
+msgstr "ஏற்கனவே பதியப்பட்டது"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "பதிவு"
@@ -4278,6 +4277,10 @@ msgid "Change Registration"
 msgstr "பதிவுப் பிழை"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "சேவையகத்துடன் இணைக்க தவறியது."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "கணக்குத் தகவல் மாற்றுவதில் பிழை"
 
@@ -4297,9 +4300,18 @@ msgstr "உறுதிப்படுத்துகிறது"
 msgid "Re-initializing Stream"
 msgstr "வாய்க்காலை மீண்டும் தொடங்குகிறது"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "அனுமதியில்லை"
 
+msgid "Mood"
+msgstr "மன நிலை"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "இரண்டும்"
 
@@ -4321,12 +4333,6 @@ msgstr "ஒன்றுமில்லை"
 msgid "Subscription"
 msgstr "சந்தா"
 
-msgid "Mood"
-msgstr "மன நிலை"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "மன நிலை"
@@ -4373,9 +4379,6 @@ msgstr "உங்களது கடவுச்சொல் மாற்றப�
 msgid "Error changing password"
 msgstr "கடவுச்சொல்லை மாற்றுவதில் பிழை."
 
-msgid "Password (again)"
-msgstr "கடவுச்சொல் (மீண்டும்)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "கடவுச்சொல்லை மாற்று"
@@ -4570,18 +4573,24 @@ msgstr "பயனாளர் %s ஐ உதைக்க இயலவில்ல
 msgid "Unable to ping user %s"
 msgstr "பயனாளர் %s ஐ தடுக்க இயலவில்லை"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "ஒலிக்க இயலவில்லை ஏனென்றால் தேர்ந்தெடுத்த கோப்பு (%s) இல்லை."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "ஒலிக்க இயலவில்லை ஏனென்றால் தேர்ந்தெடுத்த கோப்பு (%s) இல்லை."
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "ஒலிக்க இயலவில்லை ஏனென்றால் தேர்ந்தெடுத்த கோப்பு (%s) இல்லை."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4592,9 +4601,35 @@ msgstr "குறுகுறுப்பு!!"
 msgid "%s has buzzed you!"
 msgstr "%s உள்ளே நுழைந்துள்ளார்."
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "இதற்கு தகவல் அனுப்ப இயலவில்லை %s "
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "%s ற்கு கோப்பை அனுப்ப இயலவில்லை, பயனாளர் கோப்பு பரிமாற்றத்தை ஆதரிக்கவில்லை"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "%s ற்கு கோப்பை அனுப்ப இயலவில்லை, பயனாளர் கோப்பு பரிமாற்றத்தை ஆதரிக்கவில்லை"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "பதிவாக்கம் தவறியது"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "நீங்கள் காண விரும்பும் நபரின் திரைப்பெயர் அல்லது புனைப்பெயரை தயவுசெய்து உள்ளிடவும்."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "கோப்பை தேர்வு செய்க"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "அரட்டையை தொடங்கு"
 
 msgid "config:  Configure a chat room."
 msgstr "config: அரட்டை அறையை வரையறு."
@@ -4615,16 +4650,18 @@ msgstr "தலைப்பு [புதிய தலைப்பு]: தலை
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "தடுக்கவும் &lt;பயனாளர்&gt; [அறை]: பயனாளரை அறையிலிருந்து தடுக்கவும்."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "நிறுவனம் &lt;பயனாளர்&gt; &lt;சொந்தக்காரர்|ஆளுநர்|உறுப்பினர்|வெளியேற்றப் பட்டவர்|"
 "ஒன்றுமில்லை&gt;: பயனாளருக்கு அறையுடன் சார்புரிமை அமைக்கிறது."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "பாத்திரம் &lt;பயனர்&gt;&lt;நடுவர்|பங்கெடுப்பவர்|விருந்தாளி|யாரும்_இல்லை&gt;: அறையில் "
 "பயனர் பாத்திரத்தை அமைக்கவும்."
@@ -4693,6 +4730,9 @@ msgstr "சேவையகத்தை இணை"
 msgid "File transfer proxies"
 msgstr "கோப்பு அனுப்பும் தளம்"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4733,6 +4773,14 @@ msgstr "எக்ஸ்எம்எல் பகுப்பதில் பி�
 msgid "Unknown Error in presence"
 msgstr "இருப்பில் தெரியாத பிழை"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "அரட்டை %s ல் சேர்வதில் பிழை"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "அரட்டை %s ல் பிழை"
+
 msgid "Create New Room"
 msgstr "புதிய அறையை உருவாக்கு"
 
@@ -4749,13 +4797,32 @@ msgstr "_ற அறையை வரையறு"
 msgid "_Accept Defaults"
 msgstr "_ம முன்னிருப்பை ஏற்றுக்கொள்"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "அரட்டை %s ல் சேர்வதில் பிழை"
+#, fuzzy
+msgid "No reason"
+msgstr "காரணம் கொடுக்கப்படவில்லை."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "அரட்டை %s ல் பிழை"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "நீங்கள் %s ஆல் உதைக்கப்பட்டீர்கள்: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s ஆல் உதைக்கப்பட்டது (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "கோப்பை திறக்கும்பொழுது பிழை ஏற்பட்டது."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "கோப்பு பரிமாற்றம் தவறியது"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "படத்தை சேமிக்க தவறியது: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4781,10 +4848,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "நீங்கள் காண விரும்பும் நபரின் திரைப்பெயர் அல்லது புனைப்பெயரை தயவுசெய்து உள்ளிடவும்."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "கோப்பை தேர்வு செய்க"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "பயன்பாட்டாளர் வகைகள்"
 
@@ -4823,9 +4886,19 @@ msgstr "செயல்"
 msgid "Select an action"
 msgstr "கோப்பை தேர்வு செய்க"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\" ஐ சேர்க்க முடியவில்லை."
+
+msgid "Buddy Add error"
+msgstr ""
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "குறிப்புகள் முகவரி புத்தகத்தை தேர்வு செய்"
+msgid "The username specified does not exist."
+msgstr "குறிப்பிட்ட திரைப்பெயர் செல்லாதது."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5054,7 +5127,7 @@ msgstr "பெற்றோர் இசைவற்ற குழந்தைய�
 msgid "Passport account not yet verified"
 msgstr "பாஸ்போர்ட் கணக்கு இன்னும் சரிபார்க்கப்படவில்லை"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "பாஸ்போர்ட் கணக்கு இன்னும் சரிபார்க்கப்படவில்லை"
 
@@ -5078,6 +5151,10 @@ msgstr "விருப்பப்பட்ட தொடர்பு"
 msgid "Non-IM Contacts"
 msgstr "தொடர்பை நீக்குக..."
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5149,6 +5226,13 @@ msgstr "மொபைல் தகவலை அனுப்பு."
 msgid "Page"
 msgstr "அழை"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "அலுவலக ஐஎம்"
+
 msgid "Has you"
 msgstr "Has you"
 
@@ -5189,6 +5273,14 @@ msgstr "முகவரி"
 msgid "Album"
 msgstr ""
 
+#, fuzzy
+msgid "Game Title"
+msgstr "தலைப்பு"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "தலைப்பு"
+
 msgid "Set Friendly Name..."
 msgstr "நட்பான பெயரை அமைக்கவும்..."
 
@@ -5225,9 +5317,6 @@ msgstr ""
 "எம்எஸ்என் க்கு எஸ்எஸ்எல் ஆதரவு தேவைப்படுகிறது. எஸ்எஸ்எல் ஆதரவுள்ள நூலகத்தை தயவுசெய்து "
 "நிறுவவும். மேலும் தகவலுக்கு http://Pidgin.sf.net/faq-ssl.php யை காணவும்."
 
-msgid "Failed to connect to server."
-msgstr "சேவையகத்துடன் இணைக்க தவறியது."
-
 msgid "Error retrieving profile"
 msgstr "குறுந்தொகுப்பை பெறுவதில் பிழை"
 
@@ -5386,8 +5475,9 @@ msgid ""
 msgstr ""
 "கெய்மால் பயனாளரின் குறுந்தொகுப்பை கண்டுபிடிக்க முடியவில்லை. அநேகமாக பயனாளர் இல்லை."
 
-msgid "Profile URL"
-msgstr "குறுந்தொகுப்பு யுஆர்எல் "
+#, fuzzy
+msgid "View web profile"
+msgstr "இணைப்பற்றபொழுது அனுமதிக்கப்படாது"
 
 #. *< type
 #. *< ui_requirement
@@ -5424,65 +5514,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "சாதாரண அனுமதி தவறியது!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s என்பது செல்லாத குழு."
-
-msgid "Unknown error."
-msgstr "தெரியாத பிழை."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s - இதன் மீது %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s உங்களுக்கு ஒரு சீண்டல் அனுப்பியுள்ளார்!"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "தெரியாத பிழை"
 
 msgid "Unable to add user"
 msgstr "பயனரை சேர்க்க முடியவில்லை"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "தெரியாத பிழை"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "உங்களது தேடல் முடிவுகள் கீழே"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s மீது பயனாளரை சேர்க்க இயலவில்லை (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s  மீது பயனாளரை தடுக்க இயலவில்லை (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s  மீது பயனாளரை அனுமதிக்க இயலவில்லை (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s சேர்க்க முடியாது ஏனென்றால் உங்களது நண்பர் பட்டியல் நிரம்பியுள்ளது."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s என்பது செல்லாத பாஸ்போர்ட் கணக்கு."
-
-msgid "Service Temporarily Unavailable."
-msgstr "தற்காலிகமாக சேவை இல்லை."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "செய்தியை அனுப்ப இயலவில்லை. ஏனெனில் நாம் மிக விரைவாக அனுப்புகிறோம்."
 
-msgid "Unable to rename group"
-msgstr "குழுப்பெயரை மாற்ற இயலவில்லை."
-
-msgid "Unable to delete group"
-msgstr "குழவை நீக்க இயலவில்லை"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5526,9 +5579,6 @@ msgstr "தெரியாத பிழை நேர்ந்ததால் த
 msgid "Message was not sent because an unknown error occurred."
 msgstr "தெரியாத பிழை நேர்ந்ததால் தகவல் அனுப்பப்படாமல் இருக்கலாம்:"
 
-msgid "Unable to connect"
-msgstr "இணைக்க முடியவில்லை"
-
 msgid "Writing error"
 msgstr "எழுதுதல் பிழை"
 
@@ -5543,13 +5593,16 @@ msgstr ""
 "%s சேவையகத்தில் இருந்து இணைப்பு பிழை:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "எங்களது நெறிமுறையை சேவையகம் ஆதரிக்கவில்லை."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "ஹெச்டிடிபி யை பகுப்பதில் பிழை."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "நீங்கள் மற்றொரு இடத்திலிருந்து நுழைந்திருக்கிறீர்கள்."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5557,7 +5610,8 @@ msgstr ""
 "எம்எஸ்என் சேவையகம் தற்காலிகமாக கிடைக்கவில்லை. தயவுசெய்து காத்திருந்து மீண்டும் "
 "முயற்சிக்கவும்."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "எம்எஸ்என் சேவையகம் தற்காலிகமாக செயலிழக்கிறது."
 
 #, c-format
@@ -5588,6 +5642,14 @@ msgstr "குக்கீயை அனுப்புகிறது"
 msgid "Retrieving buddy list"
 msgstr "நண்பர் பட்டியலை மீட்டுகிறது"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "கணினியை விட்டு தொலைவில்"
 
@@ -5624,14 +5686,6 @@ msgstr "சுவிட்சுபோர்டில் பிழை உள்�
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "தெரியாத பிழை நேர்ந்ததால் தகவல் அனுப்பப்படாமல் இருக்கலாம்:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s அவரது நண்பர் பட்டியலில் உங்களை சேர்த்துள்ளார்."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s அவரது நண்பர் பட்டியலில் இருந்து உங்களை நீக்கியுள்ளார்."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "முகவரி புத்தகத்தில் சேர்க்கவும்"
@@ -5640,13 +5694,6 @@ msgstr "முகவரி புத்தகத்தில் சேர்க�
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "இந்த நண்பரை உங்கள் நண்பர் பட்டியலில் சேர்க்கவா?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "\"%s\" ஐ சேர்க்க முடியவில்லை."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "குறிப்பிட்ட திரைப்பெயர் செல்லாதது."
@@ -5654,6 +5701,9 @@ msgstr "குறிப்பிட்ட திரைப்பெயர் ச�
 msgid "This Hotmail account may not be active."
 msgstr "இந்த ஹாட்மெய்ல் கணக்கு இயக்கத்தில் இல்லை."
 
+msgid "Profile URL"
+msgstr "குறுந்தொகுப்பு யுஆர்எல் "
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5668,19 +5718,63 @@ msgstr "இந்த ஹாட்மெய்ல் கணக்கு இயக
 msgid "MSN Protocol Plugin"
 msgstr "ஏஐஎம்/ஐசிக்யூ நெறிமுறை சொருகுபொருள்"
 
-#, fuzzy
-msgid "Missing Cipher"
-msgstr "மறையீடு"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s என்பது செல்லாத குழு."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "தெரியாத பிழை."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s - இதன் மீது %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s மீது பயனாளரை சேர்க்க இயலவில்லை (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s  மீது பயனாளரை தடுக்க இயலவில்லை (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s  மீது பயனாளரை அனுமதிக்க இயலவில்லை (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s சேர்க்க முடியாது ஏனென்றால் உங்களது நண்பர் பட்டியல் நிரம்பியுள்ளது."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s என்பது செல்லாத பாஸ்போர்ட் கணக்கு."
+
+msgid "Service Temporarily Unavailable."
+msgstr "தற்காலிகமாக சேவை இல்லை."
+
+msgid "Unable to rename group"
+msgstr "குழுப்பெயரை மாற்ற இயலவில்லை."
+
+msgid "Unable to delete group"
+msgstr "குழவை நீக்க இயலவில்லை"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s அவரது நண்பர் பட்டியலில் உங்களை சேர்த்துள்ளார்."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s அவரது நண்பர் பட்டியலில் இருந்து உங்களை நீக்கியுள்ளார்."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "பயனாளர் அறைகள்"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "வாசித்தல் பிழை"
 
@@ -5692,13 +5786,23 @@ msgstr "சேவையகத்திலிருந்து செல்ல�
 msgid "Logging in"
 msgstr "பதிவுறுதல்"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "பெயரற்ற"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "_தகவல் அனுப்பு"
@@ -5719,20 +5823,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "பெயரற்ற"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_ஐஎம் சாளரங்கள்"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "இணைக்கப்பட்டது"
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "சேவையகத்திலிருந்து செல்லாத பதில்."
 
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
@@ -5740,16 +5846,23 @@ msgstr "இயக்கம் பிழை எண் %d யை கொடுத�
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "தவறான செல்லப்பெயர் (அ) தவறான கடவுச்சொல்."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "இணைப்பை உறுதிப்படுத்துகிறது"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "தோழரை அரட்டையில் சேர்க்க தவறியது"
 
@@ -5761,14 +5874,6 @@ msgstr "நண்பர் பட்டியலை கோப்பிலிர�
 msgid "persist command failed"
 msgstr "விசைப் பலகை தவறியது"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "பயனாளர் அறைகள்"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "தோழரை அரட்டையில் சேர்க்க தவறியது"
@@ -5781,38 +5886,16 @@ msgid "blocklist command failed"
 msgstr "விசைப் பலகை தவறியது"
 
 #, fuzzy
-msgid "Invalid input condition"
-msgstr "இணைப்பை உறுதிப்படுத்துகிறது"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "கியூ வரிசை நிறைந்தது"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "தகவலை அலகிட இயலவில்லை"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "புரவலருடன் இணைக்க முடியவில்லை"
+msgid "Missing Cipher"
+msgstr "மறையீடு"
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "_ஐஎம் சாளரங்கள்"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "சேவையகத்திலிருந்து செல்லாத பதில்."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5861,10 +5944,6 @@ msgid "User"
 msgstr "பயனாளர்கள்"
 
 #, fuzzy
-msgid "Profile"
-msgstr "எம்எஸ்என் குறுந்தொகுப்பு"
-
-#, fuzzy
 msgid "Headline"
 msgstr "_க குறும்பெயர்:"
 
@@ -5879,15 +5958,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "உரையாடலை மூடு"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "பெயரற்ற"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5901,6 +5975,9 @@ msgstr "%s செய்திகள் வெண்பலகைக்கு அ�
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "இதில் குறுநகையிக்கள் இல்லை."
@@ -5909,6 +5986,14 @@ msgstr "இதில் குறுநகையிக்கள் இல்ல�
 msgid "Please try another username:"
 msgstr "உங்களது புதிய கடவுச்சொல்லை கொடுக்கவும்"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "பெயரற்ற"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6105,10 +6190,6 @@ msgid "Master archive is misconfigured"
 msgstr "முதன்மைப் பெட்டகம் தவறாக வரையறுக்கப்பட்டுள்ளது"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "தவறான செல்லப்பெயர் (அ) தவறான கடவுச்சொல்."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "நீங்கள் உள்ளிட்ட பயனர் பெயருக்கான புரவலனை அடையாளம் காண முடியவில்லை."
 
@@ -6151,9 +6232,9 @@ msgstr "பயனர் வலையிலிருந்து விலகி
 msgid "Unknown error: 0x%X"
 msgstr "தெரியாத பிழை: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "உள்நுழைய இயலவில்லை (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "பயனாளர் %s ஐ தடுக்க இயலவில்லை"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6255,9 +6336,6 @@ msgstr "க்ரூப்வைஸ் கலந்துரையாடல் %
 msgid "Authenticating..."
 msgstr "உறுதிப்படுத்துகிறது..."
 
-msgid "Unable to connect to server."
-msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
-
 msgid "Waiting for response..."
 msgstr "பதிலுக்காக காத்திருத்தல்..."
 
@@ -6281,9 +6359,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "உரையாடலில் கலந்து கொள்ள விரும்புகிறீர்களா?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "நீங்கள் வேறு பணியிடத்துள் நுழைந்ததால் வெளியேற்றப் பட்டீர்கள்"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6291,17 +6366,14 @@ msgstr ""
 "%s வலைப்பின்னலில் இருந்து விலகி இருப்பது போல் உள்ளது. நீங்கள் அனுப்பிய செய்திகளை அவர் "
 "பெறவில்லை."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "சேவையகத்துடன் இணைக்க முடியவில்லை.தயை செய்து நீங்கள் இணைக்க விரும்பும் சேவையகத்தின் "
 "முகவரியை உள்ளிடவும்."
 
-msgid "Error. SSL support is not installed."
-msgstr "பிழை எஸ்எஸ்எல் ஆதரவு நிறுவப்படவில்லை."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "இந்த உரையாடல் முடிக்கப்பட்டது. மேலும் தகவல் அனுப்ப இயலாது."
 
@@ -6325,6 +6397,25 @@ msgid "Server port"
 msgstr "சேவையகம் தளம்"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "சேவையகத்திலிருந்து செல்லாத பதில்."
+
+#. username connecting too frequently
+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 ""
+"நீங்கள் அடிக்கடி இணைப்பை பெற்று மற்றும் துண்டித்துள்ளீர்கள். பத்து நிமிடங்கள் பொறுத்து மீண்டும் "
+"தொடங்கவும். தொடர்ந்து முயன்றால் மேலும் அதிக நேரம் காக்க வேண்டியிருக்கும்."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "இணைப்பை உருவாக்குவதில் பிழை"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "இணைக்க முடியவில்லை"
 
@@ -6333,17 +6424,7 @@ msgid "Invalid chat room name"
 msgstr "செல்லாத அறைப்பெயர்"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "%s உரையாடலை முடித்துவிட்டார்."
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "சேவையகத்துடன் எஸ்எஸ்எல். இணைப்பை உருவாக்க இயலவில்லை."
 
 #. *< type
@@ -6396,7 +6477,7 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 
 #, fuzzy
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
 
 #, fuzzy
@@ -6568,23 +6649,18 @@ msgstr "காமிரா"
 msgid "Screen Sharing"
 msgstr "திரைப்பெயர்"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "அரட்டைக்குத் தயார்"
 
-#, c-format
 msgid "Not Available"
 msgstr "கிடைக்கவில்லை"
 
-#, c-format
 msgid "Occupied"
 msgstr "வேலையாக உள்ளார்"
 
-#, c-format
 msgid "Web Aware"
 msgstr "வலை உணர்வுள்ள"
 
-#, c-format
 msgid "Invisible"
 msgstr "காணமுடியாத"
 
@@ -6598,16 +6674,12 @@ msgid "Buddy Comment"
 msgstr "நண்பர் விமரிசனம்"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "அனுப்புவதற்கு இணைக்க முடியவில்லை."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "சேவையகத்துடன் இணைக்க தவறியது."
+msgid "Unable to connect to BOS server: %s"
+msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
 
 #, fuzzy
 msgid "Username sent"
@@ -6622,53 +6694,64 @@ msgstr "இணைப்பை உறுதிப்படுத்துகி�
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "உள் நுழைய முடியவில்லை.%s ஆக கையெழுத்திட முடியவில்லை. அந்த திரைப் பெயர் செல்லுபடி "
 "ஆகாதது. திரைப் பெயர்கள் ஒரு எழுத்தில்தான் ஆரம்பிக்க வேண்டும்.பின் வெறும் எண்களோ அல்லது "
 "எழுத்துக்கள், எண்கள் வெற்று இடங்களோ இருக்கலாம்."
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"நீங்கள் இப்போது இணப்பிலிருந்து நீக்கப் படலாம். இது சரியாகும் வரை டிஓசி யை பயன் படுத்த "
+"நினைக்கலாம். மேம்படுத்துவதற்கு %s ஐ பார்க்கவும்."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "செல்லுபடியாகாத செல்லப் பெயர்"
+msgid "Unable to get a valid AIM login hash."
+msgstr "செல்லுபடியாகும் ஏஐஎம் நுழைவு hash ஐ பெற கெய்மால் இயலவில்லை."
 
-msgid "Incorrect password."
-msgstr "கடவுச்சொல் தவறு."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "செல்லுபடியாகும் நுழைவு hash ஐ பெற கெய்மால் இயலவில்லை."
+
+msgid "Received authorization"
+msgstr "அதிகாரம் வழங்கப் பட்டது"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "பயனாளர் இல்லை"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "உங்கள் கணக்கு இப்போது தற்காலிகமாக நிறுத்தி வைக்கப் பட்டது."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "ஏஓஎல் விரைவு தூதன் சேவை தற்காலிகமாக இல்லை."
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"நீங்கள் அடிக்கடி இணைப்பை பெற்று மற்றும் துண்டித்துள்ளீர்கள். பத்து நிமிடங்கள் பொறுத்து மீண்டும் "
-"தொடங்கவும். தொடர்ந்து முயன்றால் மேலும் அதிக நேரம் காக்க வேண்டியிருக்கும்."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "நீங்கள் பயன் படுத்தும் சேவைப் பயனாளி நிரலின் வடிவ நிலை மிகப்பழையது. இவ்விடத்தில் மேம் "
 "படுத்தவும்.%s"
 
-msgid "Could Not Connect"
-msgstr "இணைக்க முடியவில்லை"
-
-msgid "Received authorization"
-msgstr "அதிகாரம் வழங்கப் பட்டது"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"நீங்கள் அடிக்கடி இணைப்பை பெற்று மற்றும் துண்டித்துள்ளீர்கள். பத்து நிமிடங்கள் பொறுத்து மீண்டும் "
+"தொடங்கவும். தொடர்ந்து முயன்றால் மேலும் அதிக நேரம் காக்க வேண்டியிருக்கும்."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "உள்ளிடப் பட்ட SecurID விசை செல்லுபடி ஆகாது."
 
 msgid "Enter SecurID"
@@ -6684,28 +6767,6 @@ msgstr "காண்பிக்கப்படும் ஆறு இலக்�
 msgid "_OK"
 msgstr "சரி"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"நீங்கள் இப்போது இணப்பிலிருந்து நீக்கப் படலாம். இது சரியாகும் வரை டிஓசி யை பயன் படுத்த "
-"நினைக்கலாம். மேம்படுத்துவதற்கு %s ஐ பார்க்கவும்."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "செல்லுபடியாகும் ஏஐஎம் நுழைவு hash ஐ பெற கெய்மால் இயலவில்லை."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"நீங்கள் இப்போது இணப்பிலிருந்து நீக்கப் படலாம். இது சரியாகும் வரை டிஓசி யை பயன் படுத்த "
-"நினைக்கலாம். மேம்படுத்துவதற்கு %s ஐ பார்க்கவும்."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "செல்லுபடியாகும் நுழைவு hash ஐ பெற கெய்மால் இயலவில்லை."
-
 msgid "Password sent"
 msgstr "கடவுச்சொல் அனுப்பப்பட்டது"
 
@@ -6835,7 +6896,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "தெரியாத காரணங்களால் நீங்கள் %hu செய்தியை  %s லிருந்து இழந்தீர்கள்"
 msgstr[1] "தெரியாத காரணங்களால் நீங்கள் %hu செய்திகளை %s லிருந்து இழந்தீர்கள்"
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "செய்திகளை அனுப்ப முடியவில்லை: %s"
@@ -6857,6 +6918,13 @@ msgstr "இன்னும் இணைப்புடன்"
 msgid "Member Since"
 msgstr "இதிலிருந்து அங்கத்தினர்."
 
+msgid "Capabilities"
+msgstr "செயல்திறன்"
+
+#, fuzzy
+msgid "Profile"
+msgstr "எம்எஸ்என் குறுந்தொகுப்பு"
+
 msgid "Your AIM connection may be lost."
 msgstr "உங்கள் ஏஐஎம் இணைப்பு அறுபட்டது போல உள்ளது."
 
@@ -7035,7 +7103,7 @@ msgstr "வெளிச்செல் தகவல் மிக நீளமா
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7062,9 +7130,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "அனாதைவரிகள்"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "உங்கள் நண்பர் பட்டியலில் மிகப் பலர் இருப்பதால் நண்பர் %s ஐ  பட்டியலில் சேர்க்க முடியவில்லை. "
@@ -7074,7 +7142,7 @@ msgid "(no name)"
 msgstr "(பெயரற்றது)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "உங்களது கட்டளை தெரியாத காரணத்தினால் தவறியது."
 
 #, fuzzy, c-format
@@ -7145,6 +7213,7 @@ msgstr "இணை"
 msgid "Get AIM Info"
 msgstr "தகவல் பெறுக"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "நண்பர் குறிப்பை திருத்து"
 
@@ -7207,6 +7276,7 @@ msgstr "தேடுக"
 msgid "Set User Info (web)..."
 msgstr "பயனாளர் தகவலை அமை (யுஆர்எல் )..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "கடவுச்சொல்லை மாற்று (யுஆர்எல் )"
@@ -7241,6 +7311,10 @@ msgstr "தோழரை மின்னஞ்சல் மூலம் தேட
 msgid "Search for Buddy by Information"
 msgstr "தோழரை தகவல் மூலம் தேடுக"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "பயனாளர் நுழைந்திருக்கவில்லை"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7258,7 +7332,7 @@ msgstr "நேரடி ஐஎம் க்காக  %s ஐ %s:%hu இல் �
 msgid "Attempting to connect to %s:%hu."
 msgstr "நேரடி ஐஎம் க்காக  %s உடன் %s:%hu ல் இணைக்க முயல்கிறது."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "இணைப்பை உருவாக்க அனுப்புனரை தூண்டுகிறோம்."
 
@@ -7368,7 +7442,7 @@ msgstr "ஒபேரா"
 msgid "Visible"
 msgstr "காணமுடியாத"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7464,17 +7538,50 @@ msgstr "கடைசியாக புதுப்பித்தது"
 msgid "Could not change buddy information."
 msgstr "நிமித்தச் செயலாக்க தோழரை தயவுசெய்து உள்ளீடு செய்க"
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "அலை பேசி"
+
+msgid "Note"
+msgstr "குறிப்பு"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "நண்பர் குறும்படம்"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "நண்பரை சேர்"
+msgid "_Modify"
+msgstr "_மாற்று"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "_மாற்று"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "சேவையகம் மும்முரமாக இருக்கிறது"
+
+msgid "Your request was accepted."
+msgstr ""
 
-msgid "Input answer here"
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "உரிமையாக்கல் தேவை"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "தோழரை உங்களது பட்டியலில் சேர்க்கவா?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "பயனாளர் அடைவை கொடுக்கவும்"
+
 #, fuzzy
 msgid "Send"
 msgstr "_அனுப்பு"
@@ -7487,19 +7594,20 @@ msgstr "செல்லாத கடவுச்சொல்"
 msgid "Authorization denied message:"
 msgstr "அனுமதி மறுத்தல் தகவல்:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "அனுமதித்தல் ஆரம்பம்"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "தோழரை உங்களது பட்டியலில் சேர்க்கவா?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "கலந்துரையாடல் சேவையகத்தை கொடுக்கவும்"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7522,7 +7630,7 @@ msgid "Failed sending authorize"
 msgstr "தயவு செய்து எனக்கு அனுமதி தாருங்கள்!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "தோழரை அரட்டையில் சேர்க்க தவறியது"
 
 #, fuzzy, c-format
@@ -7568,6 +7676,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "செல்லாத பதிலாள் அமைப்புகள்"
+
+#, fuzzy
 msgid "Not member"
 msgstr "இதிலிருந்து அங்கத்தினர்."
 
@@ -7611,15 +7723,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "அரட்டையில் சேர்க"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "தொலைபேசி எண்"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7630,7 +7745,7 @@ msgstr "ஒலி விருப்பங்கள்"
 msgid "Failed:"
 msgstr "தோல்வியுற்றது"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7642,11 +7757,11 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "தொலைபேசி எண்"
 
 #, fuzzy
@@ -7657,7 +7772,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "நீங்கள் இதை இந்த பயனாளருக்கு நண்பர் குறும்படமாக அமைக்க விரும்புகிறீர்களா?"
 
 #, fuzzy
@@ -7665,28 +7780,28 @@ msgid "Setup"
 msgstr "_அமை"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "தோழரை அரட்டையில் சேர்க்க தவறியது"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "தோழரை நீக்குக"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "தோழரை நீக்குக"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7807,6 +7922,13 @@ msgstr "<b>பயனாளர்:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>குழுத் தலைப்பு</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>வெளிப் பயனாளர்</b><br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7814,7 +7936,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "கெய்ம் பற்றி"
 
 #, fuzzy
@@ -7835,6 +7957,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "கெய்ம் பற்றி"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "வீட்டு முகவரி"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7866,7 +7992,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "இணைத்தல்"
@@ -7879,6 +8004,9 @@ msgstr "சேவையகம் தளம்"
 msgid "Show server news"
 msgstr "சேவையகம் முகவரி"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "வாசித்தல் பிழை"
@@ -7888,11 +8016,7 @@ msgid "Update interval (seconds)"
 msgstr "வாசித்தல் பிழை"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "சேவையக தகவலை பெற இயலவில்லை"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "சேவையக தகவலை பெற இயலவில்லை"
 
 #, c-format
@@ -7915,21 +8039,19 @@ msgid "Activation required"
 msgstr "பதிவு தேவைப்படுகிறது"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "வாசித்தல் பிழை"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "உரையாடலை வேண்டுக"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "யாகூ! அனுமதி தவறியது"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7939,7 +8061,7 @@ msgstr "படத்தை சேமி"
 msgid "Enter code"
 msgstr "கடவுச்சொல்லை உள்ளிடவும்"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7947,67 +8069,43 @@ msgid "Enter the text from the image"
 msgstr "சேர்க்க வேண்டிய குழுவின் பெயரை உள்ளீடு செய்க."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "இணைக்க இயலவில்லை."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "டோக்கன் பிழை"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "கொள் குழியை (சாக்கெட்டை) வாசிக்க இயலவில்லை"
-
-msgid "Write Error"
-msgstr "எழுதுவதில் பிழை"
-
 #, fuzzy
-msgid "Connection lost"
-msgstr "தொடர்பு முடிக்கப்பட்டது"
-
-#, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "பயனாளர் தகவலை அமை..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "கோரிக்கை நிராகரிக்கப்பட்டது"
 
-msgid "Couldn't resolve host"
-msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "செல்லாத பயனாளர் பெயர் அல்லது கடவுச்சொல்"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "சேவையகத்தை இணை"
+msgid "Connecting to server"
+msgstr "எஸ்ஐஎல்சி சேவயகத்துடன் இணைக்கிறது"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "வாசிப்பதில் பிழை"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "அரட்டையில் சேர தவறியது"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8017,6 +8115,10 @@ msgid ""
 msgstr "ஐசிக்யூ சேவையக ஒளிபரப்பு"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s - இதன் மீது %s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "அனுப்புநர்"
 
@@ -8026,32 +8128,30 @@ msgid ""
 "%s"
 msgstr "சேவையக கட்டளைகள்: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "தெரியாத காரணம்."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "கட்டளை"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "சேவையக தகவலை பெற இயலவில்லை"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "தெரியாத காரணம்."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "தெரியாத காரணம்."
 
 #, fuzzy, c-format
@@ -8066,9 +8166,6 @@ msgstr "கோப்பு அனுப்புதல் தவறியது"
 msgid "%d canceled the transfer of %s"
 msgstr "%s %s பரிமாற்றத்தை நீக்கினார்"
 
-msgid "Connection closed (writing)"
-msgstr "இணைப்பு துண்டிக்கப்பட்டது,(எழுதப்படுகிறது)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>குழுத் தலைப்பு</b> %s<br>"
@@ -8122,17 +8219,6 @@ msgstr "சேவையகம் %s இல்  சேம்டைம் நி�
 msgid "Sametime Administrator Announcement"
 msgstr "சேம்டைம்  கணிணி நிர்வாகி அறிவிப்பு"
 
-msgid "Connection reset"
-msgstr "இணைப்பு மீண்டும் அமைக்கப் பட்டது"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "கொள் குழி (சாக்கெட்) இலிருந்து வாசிப்பதில் பிழை : %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "புரவலருடன் இணைக்க முடியவில்லை"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s இலிருந்து அறிவிப்பு"
@@ -8155,6 +8241,9 @@ msgstr "ஒலி பெருக்கிகள்"
 msgid "Video Camera"
 msgstr "விடியோ கேமரா"
 
+msgid "File Transfer"
+msgstr "கோப்பு பரிமாற்றம்"
+
 #, fuzzy
 msgid "Supports"
 msgstr "ஆதரவு"
@@ -8872,9 +8961,6 @@ msgstr "நிறுவனம்"
 msgid "Unit"
 msgstr "பிரிவு"
 
-msgid "Note"
-msgstr "குறிப்பு"
-
 msgid "Join Chat"
 msgstr "அரட்டையில் சேர்க"
 
@@ -8975,6 +9061,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "வலையமைப்பு நிலைமை"
 
+msgid "Ping"
+msgstr "பிங்"
+
 msgid "Ping failed"
 msgstr "பிங் தவறியது"
 
@@ -9039,7 +9128,8 @@ msgstr "ஆதரவில்லா பொதுவிசை வகை"
 msgid "Disconnected by server"
 msgstr "சேவையகம் இணைப்பை துண்டித்து விட்டது"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "எஸ்ஐஎல்சி சேவையகத்துடன் இணைக்கும்பொழுது பிழை"
 
 msgid "Key Exchange failed"
@@ -9051,27 +9141,26 @@ msgstr ""
 "துண்டிக்கப் பட்ட அமர்வை மீட்க இயலவில்லை. மறுபடி புதிய இணைப்பை பெற மீண்டும் இணை "
 "(Reconnect) ஐ அழுத்தவும்."
 
-msgid "Connection failed"
-msgstr "இணைப்பு தோல்வியுற்றது."
-
 msgid "Performing key exchange"
 msgstr "சாவி பரிமாறப்படுகிறது"
 
-msgid "Unable to create connection"
-msgstr "இணைப்பை உருவாக்க முடியவில்லை"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "இந்த விசை ஜோடியை ஏற்ற முடியவில்லை: %s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "எஸ்ஐஎல்சி சேவயகத்துடன் இணைக்கிறது"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "இந்த விசை ஜோடியை ஏற்ற முடியவில்லை: %s"
+
 msgid "Out of memory"
 msgstr "நினைவகம் போதாது"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "எஸ்ஐஎல்சி செம்மை நடப்பு வழக்கை ( protocol) ஆரம்பிக்க முடியவில்லை"
 
 #, fuzzy
@@ -9374,7 +9463,7 @@ msgid "Creating SILC key pair..."
 msgstr "எஸ்ஐஎல்சி விசை ஜோடியை உருவாக்குகிறது...."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "எஸ்ஐஎல்சி விசை ஜோடியை உருவாக்குகிறது...."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9468,6 +9557,9 @@ msgstr "வெண்பலகை"
 msgid "No server statistics available"
 msgstr "சேவையக நிலைமை கிடைக்கவில்லை"
 
+msgid "Error during connecting to SILC Server"
+msgstr "எஸ்ஐஎல்சி சேவையகத்துடன் இணைக்கும்பொழுது பிழை"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "தோல்வி: பதிப்பு ஒத்துப் போகவில்லை. உங்கள் வாடிக்கையாளரை மேம் படுத்தவும்"
@@ -9508,38 +9600,37 @@ msgstr "தோல்வி: செல்லுபடியாகாத குக
 msgid "Failure: Authentication failed"
 msgstr "தோல்வி: உண்மை நேர்படுத்தல் தோல்வியுற்றது"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "எஸ்ஐஎல்சி வாடிக்கையாளர் இணைப்பை துவக்க முடியவில்லை."
 
 #, fuzzy
 msgid "John Noname"
 msgstr "பெயரற்ற"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "இந்த விசை ஜோடியை ஏற்ற முடியவில்லை: %s"
 
-msgid "Could not write"
-msgstr "எழுத முடியவில்லை"
-
-msgid "Could not connect"
-msgstr "இணைக்க முடியவில்லை"
+msgid "Unable to create connection"
+msgstr "இணைப்பை உருவாக்க முடியவில்லை"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "தெரியாத சேவையகப் பிழை."
 
-msgid "Could not create listen socket"
-msgstr "கேட்கும் கொள்குழி (சாக்கெட்) ஐ உருவாக்க முடியவில்லை!"
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
+msgid "Unable to create listen socket"
+msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "சிப் பயனர் பெயரில் வெள்ளை இடங்களோ @ குறியோ இருக்கக் கூடாது"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "சேவையகம் தளம்"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9573,177 +9664,66 @@ msgstr "ஆத் பயனர்"
 msgid "Auth Domain"
 msgstr "ஆத் களப்பெயர்"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "மேலே பார்க்கிறது %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s க்கு இணைக்க இயலவில்லை"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "சேரவும்: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "%s கோப்புக்கு எழுத முடியவில்லை."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "%s கோப்பை படிக்க முடியவில்லை."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "தகவல் மிக நீளம், கடைசி %s பைட்டுகள் வெட்டப்பட்டன."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s உள் நுழைந்திருக்கவில்லை."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s ஐ எச்சரிக்க அனுமதி இல்லை."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "நீங்கள் சேவையக வேக வரையரையை மீறுவதால் செய்தி ஒன்று விடுபட்டது "
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s இல் அரட்டை கிடக்கவில்லை."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "நீங்கள் %s க்கு மிக அதிக வேகமாக செய்திகளை அனுப்புகிறீர்கள்."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "%s இடமிருந்து ஐஎம் ஐ நீங்கள் இழந்தீர்கள் ஏனென்றால் அது மிக நீளமானது."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "%s இடமிருந்து ஐஎம் ஐ நீங்கள் இழந்தீர்கள் ஏனென்றால் அது மிக வேகமாக அனுப்பப்பட்டது."
-
-#, c-format
-msgid "Failure."
-msgstr "தோல்வி.."
-
-#, c-format
-msgid "Too many matches."
-msgstr "மிக அதிகமான பொருத்தங்கள்."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "மேலும் பல தகுதியாக்கங்கள் தேவை."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "அடைவு சேவை தற்காலிகமாக கிடைக்கவில்லை."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "மின்னஞ்சலை பார்ப்பது தடைசெய்யப்பட்டது."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "முக்கியச்சொல் உதாசீனப் படுத்தப் பட்டது."
-
-#, c-format
-msgid "No keywords."
-msgstr "திறவுவார்த்தைகள் இல்லை."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "பயனருக்கு அடைவு தகவல் இல்லை ."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "கூறும் &lt;அறை&gt;:யாகூ வலையில் ஒரு அரட்டை அறையில் சேருங்கள்"
 
-#, c-format
-msgid "Country not supported."
-msgstr "நாடு ஆதரிக்கப்படவில்லை."
+msgid "list: List rooms on the Yahoo network"
+msgstr "பட்டியல்:  யாகூ வலைப்பின்னலில் உள்ள அறைகளின் பட்டியல்"
 
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "தெரியாத தோல்வி: %s."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "கிறுக்கல்: பயனாளரை கிறுக்கல் நிகழ்ச்சியை ஆரம்பிக்க கோருங்கள்"
 
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "தவறான செல்லப்பெயர் (அ) தவறான கடவுச்சொல்."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "யாகூ! முகவரி"
 
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "சேவை தற்காலிகமாக கிடைக்கவில்லை."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "யாகூ நெறிமுறை சொருகுபொருள்"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "உள் நுழைய உங்கள் எச்சரிக்கை மட்டம் இப்போது மிக அதிகமாக உள்ளது."
+#, fuzzy
+msgid "Pager server"
+msgstr "பதிலாள் சேவையகம்"
 
-#, c-format
-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 ""
-"நீங்கள் அடிக்கடி இணைப்பை பெற்று துண்டித்துள்ளீர்கள். பத்து நிமிடங்கள் பொறுத்து மீண்டும் "
-"தொடங்கவும். தொடர்ந்து முயன்றால் மேலும் அதிக நேரம் காக்க வேண்டியிருக்கும்."
+msgid "Pager port"
+msgstr "அழைப்பி தளம்"
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "தெரியாத நுழைவு பிழை ஏற்பட்டுள்ளது: %s."
+#, fuzzy
+msgid "File transfer server"
+msgstr "கோப்பு அனுப்பும் புரவலன்"
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "தெரியாத பிழை %d, ஏற்பட்டுள்ளது. தகவல்: %s"
+msgid "File transfer port"
+msgstr "கோப்பு அனுப்பும் தளம்"
 
-msgid "Invalid Groupname"
-msgstr "செல்லாத குழுப்பெயர்"
+msgid "Chat room locale"
+msgstr "அரட்டை அறை மொழி அமைப்புகள்"
 
-msgid "Connection Closed"
-msgstr "தொடர்பு முடிக்கப்பட்டது"
+msgid "Ignore conference and chatroom invitations"
+msgstr "கூட்டங்கள் மற்றும் அரட்டை அறை அழைப்புகளை உதாசீனப்படுத்தவும்"
 
-msgid "Waiting for reply..."
-msgstr "பதிலுக்காக காத்திருத்தல்..."
+msgid "Chat room list URL"
+msgstr "அரட்டைஅறை பட்டியல் யுஆர்எல் "
 
-msgid "TOC has come back from its pause. You may now send messages again."
+msgid "Yahoo Chat server"
 msgstr ""
-"டிஓசி அதனுடைய பொறுத்தல் நிலையிலிருந்து மீண்டுள்ளது. நீங்கள் மீண்டும் தகவல்களை அனுப்பலாம்."
-
-msgid "Password Change Successful"
-msgstr "கடவுச்சொல் வெற்றிகரமாக மாற்றப்பட்டது"
-
-msgid "_Group:"
-msgstr "_க குழு:"
-
-msgid "Get Dir Info"
-msgstr "அடைவு தகவல்களை பெறு"
-
-msgid "Set Dir Info"
-msgstr "அடைவு தகவல்களை அமை"
-
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "%s யை எழுதுவதற்காக திறக்கமுடியவில்லை!"
-
-msgid "File transfer failed; other side probably canceled."
-msgstr "கோப்பு அனுப்புதலில் பிழை; ஒருவேளை மறுபக்கத்தில் தவிர்த்திருக்கலாம்."
-
-msgid "Could not connect for transfer."
-msgstr "அனுப்புவதற்கு இணைக்க முடியவில்லை."
-
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "கோப்பின் தலைப்பை எழுத இயலவில்லை. கோப்பு அனுப்பப்படமாட்டாது."
 
 #, fuzzy
-msgid "Save As..."
-msgstr "குறும்படத்தை இப்படிச்சேமி..."
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s  %s ஐ %d கோப்பை பெற்றுக் கொள்ள வேண்டுகிறார்: %s (%.2f %s)%s%s"
-msgstr[1] "%s  %s ஐ %d கோப்புகளை பெற்றுக் கொள்ள வேண்டுகிறார்: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "யாகூ ஜப்பான்"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s, உங்களை அவருக்கு கோப்பை அனுப்பக்கோருகிறார்"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "யாகூ! முகவரி"
 
 #. *< type
 #. *< ui_requirement
@@ -9755,11 +9735,11 @@ msgstr "%s, உங்களை அவருக்கு கோப்பை அ�
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "டிஓசி வரைமுறை சொருகுபொருள்"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "யாகூ நெறிமுறை சொருகுபொருள்"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9785,6 +9765,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "நண்பர் இணைப்பு மறுக்கப்பட்டது"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "சேவையகத்துடன் எஸ்எஸ்எல். இணைப்பை உருவாக்க இயலவில்லை."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "தெரியாத பிழை எண் %d. யாகூ! வலைத்தளத்தில் நுழைவதன் மூலம் இதை சரி செய்யலாம்."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "தெரியாத பிழை எண் %d. யாகூ! வலைத்தளத்தில் நுழைவதன் மூலம் இதை சரி செய்யலாம்."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "தவறான செல்லப்பெயர் (அ) தவறான கடவுச்சொல்."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9815,11 +9819,12 @@ msgstr "உங்களது கணக்கு பூட்டப்பட்�
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "தெரியாத பிழை எண் %d. யாகூ! வலைத்தளத்தில் நுழைவதன் மூலம் இதை சரி செய்யலாம்."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "%s தோழரை %s குழுவின் %s கணக்கில் உள்ள சேவையகம் பட்டியலில் சேர்க்க இயலவில்லை."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "சேவையகம் பட்டியலில் தோழரை சேர்க்க இயலவில்லை"
 
 #, c-format
@@ -9827,23 +9832,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "சேவையகத்திலிருந்து செல்லாத பதில்."
 
-msgid "Connection problem"
-msgstr "தொடர்பில் கோளாறு"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "%s உடன் உரையாடல்கள்"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
 
 msgid "Not at Home"
 msgstr "வீட்டில் இல்லை"
@@ -9890,9 +9888,8 @@ msgstr "இருப்பு அமைப்புகள்"
 msgid "Start Doodling"
 msgstr "கிறுக்கலை ஆரம்பிக்க"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "எந்த முகப்பை செயல்படுத்த?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "எந்த அரட்டையில் இருப்பவருடன் சேர ?"
@@ -9907,79 +9904,15 @@ msgstr "பயனாளருடன் அரட்டையில் சேர.
 msgid "Open Inbox"
 msgstr "ஹாட்மெய்ல் உள்பெட்டியை திற"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "கூறும் &lt;அறை&gt;:யாகூ வலையில் ஒரு அரட்டை அறையில் சேருங்கள்"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "பட்டியல்:  யாகூ வலைப்பின்னலில் உள்ள அறைகளின் பட்டியல்"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "கிறுக்கல்: பயனாளரை கிறுக்கல் நிகழ்ச்சியை ஆரம்பிக்க கோருங்கள்"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "யாகூ! முகவரி"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "யாகூ நெறிமுறை சொருகுபொருள்"
-
-msgid "Yahoo Japan"
-msgstr "யாகூ ஜப்பான்"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "பதிலாள் சேவையகம்"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "ஜப்பான் அழைப்பி புரவலன்"
-
-msgid "Pager port"
-msgstr "அழைப்பி தளம்"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "கோப்பு அனுப்பும் புரவலன்"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "ஜப்பான் கோப்பு அனுப்பும் புரவலன்"
-
-msgid "File transfer port"
-msgstr "கோப்பு அனுப்பும் தளம்"
-
-msgid "Chat room locale"
-msgstr "அரட்டை அறை மொழி அமைப்புகள்"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "கூட்டங்கள் மற்றும் அரட்டை அறை அழைப்புகளை உதாசீனப்படுத்தவும்"
-
-msgid "Chat room list URL"
-msgstr "அரட்டைஅறை பட்டியல் யுஆர்எல் "
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "யாகூ ஜப்பான்"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "கிறுக்கலுக்கு கோரிக்கை அனுப்பப்பட்டது."
 
+msgid "Unable to connect."
+msgstr "இணைக்க இயலவில்லை."
+
 msgid "Unable to establish file descriptor."
 msgstr "கோப்பு விவரிப்பை நிர்ணயிக்க முடியவில்லை."
 
@@ -9987,6 +9920,9 @@ msgstr "கோப்பு விவரிப்பை நிர்ணயிக�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s கோப்பு %s யை அனுப்ப இசைகிறார்"
 
+msgid "Write Error"
+msgstr "எழுதுவதில் பிழை"
+
 msgid "Yahoo! Japan Profile"
 msgstr "யாகூ! ஜப்பான் சுயகுறிப்பு"
 
@@ -10032,13 +9968,9 @@ msgstr "அருமையான தொடர்பு 3"
 msgid "Last Update"
 msgstr "கடைசியாக புதுப்பித்தது"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s க்கான பயனாளர் குறிப்பு இல்லை"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "மன்னிக்கவும், இந்த விவரக்குறிப்பு ஆதரவற்ற மொழியிலோ  அல்லது ஒழுங்குவகையிலோ உள்ளது."
 
@@ -10108,21 +10040,19 @@ msgstr "குரல்கள்"
 msgid "Webcams"
 msgstr "வலை புகைப்படகருவிகள்"
 
+msgid "Connection problem"
+msgstr "தொடர்பில் கோளாறு"
+
 msgid "Unable to fetch room list."
 msgstr "அறை பட்டியலை பெற இயலவில்லை."
 
 msgid "User Rooms"
 msgstr "பயனாளர் அறைகள்"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "ஒய்சிஹெச்டி(YCHT) சேவகனில் இணைப்பு பிரச்னை"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10250,13 +10180,7 @@ msgid "Exposure"
 msgstr "வெளிக்காட்டல்"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
-
-#, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "\"%s\"வேடத்துக்கு பயனர்: %s ஐ பொருத்த முடியவில்லை."
 
 #, fuzzy, c-format
@@ -10264,17 +10188,13 @@ msgid "HTTP proxy connection error %d"
 msgstr "பதிலாள் இணைப்பு பிழை %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "ஏற்பு மறுக்கப்பட்டது: பதிலாள் சேவையகம் தளம் %d யில் கடத்துவதற்கு மறுக்கிறது"
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "இயக்கும்போது பிழை %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10371,9 +10291,6 @@ msgstr "தொந்தரவு செய்ய வேண்டாம்"
 msgid "Extended away"
 msgstr "வெளியே சென்றது நீட்டிக்கப்பட்டது"
 
-msgid "Mobile"
-msgstr "அலை பேசி"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10415,18 +10332,6 @@ msgstr "+++ %s செயலுக்கு வந்தது"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s ஐ வாசிப்பதில் பிழை"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"உங்களது %s ஐ படிக்கும்பொழுது பிழை ஏற்பட்டது. அவை ஏற்றப்படவில்லை, மற்றும் பழைய கோப்பு %"
-"s~ என மறுபெயரிடப்பட்டது."
-
 msgid "Calculating..."
 msgstr "கணக்கிடல்..."
 
@@ -10534,6 +10439,18 @@ msgstr "இணைப்பு மீண்டும் அமைக்கப்
 msgid "Address already in use."
 msgstr "இந்த அரட்டை பெயர் ஏற்கனவே உபயோகத்தில் உள்ளது."
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s ஐ வாசிப்பதில் பிழை"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"உங்களது %s ஐ படிக்கும்பொழுது பிழை ஏற்பட்டது. அவை ஏற்றப்படவில்லை, மற்றும் பழைய கோப்பு %"
+"s~ என மறுபெயரிடப்பட்டது."
+
 msgid "Internet Messenger"
 msgstr "இணையதள தூதுவர்"
 
@@ -10581,10 +10498,8 @@ msgstr "புதிய அஞ்சல் அறவிப்புகள்"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s விருப்பங்கள்"
+msgid "_Advanced"
+msgstr "_க கூடுதல் "
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10620,9 +10535,6 @@ msgstr "நீங்கள் மெய்யாக கூர்ந்து க
 msgid "you can see the butterflies mating"
 msgstr "பட்டுப்பூச்சிகள் உறவாடுவதை உங்களால் பார்க்க இயலும்"
 
-msgid "Proxy Options"
-msgstr "பதிலாள் விருப்பங்கள்"
-
 msgid "Proxy _type:"
 msgstr "பதிலாள் _வகை:"
 
@@ -10651,8 +10563,9 @@ msgstr "_அடிப்படை"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_க கூடுதல் "
+#, fuzzy
+msgid "_Proxy"
+msgstr "பதில் மாற்று"
 
 msgid "Enabled"
 msgstr "செயலாக்கப்பட்டது"
@@ -10690,8 +10603,8 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "அறை பட்டியல்"
+msgid "A_ccount"
+msgstr "கணக்கு:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10699,8 +10612,9 @@ msgid ""
 msgstr ""
 "நீங்கள் இணைய விரும்பும் அரட்டை பற்றிய சரியான குறிப்புகளை தயவுசெய்து கொடுக்கவும்.\n"
 
-msgid "_Account:"
-msgstr "_கணக்கு:"
+#, fuzzy
+msgid "Room _List"
+msgstr "அறை பட்டியல்"
 
 msgid "_Block"
 msgstr "_தடுக்கவும்"
@@ -10719,6 +10633,17 @@ msgid "I_M"
 msgstr "I_M"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "_அரட்டையை சேர்க்கவும்"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "வீடியோ அரட்டை"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "கோப்பை _அனுப்பு"
 
@@ -10730,7 +10655,11 @@ msgid "View _Log"
 msgstr "_பதிவை காண்"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "இணைப்பற்றபொழுது அனுமதிக்கப்படாது"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "இணைப்பற்றபொழுது அனுமதிக்கப்படாது"
 
 msgid "_Alias..."
@@ -10870,6 +10799,10 @@ msgstr "/கருவிகள்/நண்பர் _நிமித்தச�
 msgid "/Tools/_Certificates"
 msgstr "/கருவிகள்/_ம முன்னுரிமைகள்"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/கருவிகள்/தனிமை"
+
 msgid "/Tools/Plu_gins"
 msgstr "/கருவிகள்/_ச சொருகுபொருள்கள்"
 
@@ -10879,10 +10812,6 @@ msgstr "/கருவிகள்/_ம முன்னுரிமைகள்"
 msgid "/Tools/Pr_ivacy"
 msgstr "/கருவிகள்/_தனிமை"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/கருவிகள்/தனிமை"
-
 msgid "/Tools/_File Transfers"
 msgstr "/கருவிகள்/_க கோப்பு பரிமாற்றங்கள்"
 
@@ -11007,8 +10936,8 @@ msgstr "கைமுறையாக"
 msgid "By status"
 msgstr "நிலையை கொண்டு"
 
-msgid "By log size"
-msgstr "பதிவுகள் அளவைக்கொண்டு"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -11026,6 +10955,9 @@ msgstr "இணை"
 msgid "Re-enable"
 msgstr "கணக்கை செயலாக்கு"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -11119,6 +11051,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "புனைப்பெயர்:"
 
+msgid "_Group:"
+msgstr "_க குழு:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11152,6 +11087,116 @@ msgstr "/கருவிகள்"
 msgid "/Buddies/Sort Buddies"
 msgstr "/நண்பர்கள்/நண்பர்களை வரிசைப்படுத்து"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "பிண்ணனி நிறம்"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "%s அவரது நண்பர் பட்டியலில் உங்களை சேர்த்துள்ளார்."
+
+#, fuzzy
+msgid "Layout"
+msgstr "நுழையும் விருப்பங்கள்"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "பிண்ணனி நிறம்"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_வ விரிவு"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "பின்னணி நிறத்தை தேர்வுசெய்"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_ச சுருக்கு"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "பின்னணி நிறத்தை தேர்வுசெய்"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "தளம்"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "இணைப்புடன்"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "வெளியே"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "இணைப்பு விலகி"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "மன நிலை"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "தகவல் அனுப்பப்பட்டது"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "இதற்கான பயனாளர் தகவல்களை மாற்று %s "
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11171,14 +11216,6 @@ msgstr "நீங்கள் அந்த தோழரை அழைப்பத
 msgid "Invite Buddy Into Chat Room"
 msgstr "தோழரை அரட்டை அறைக்கு அழை"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"நீங்கள் அழைக்க விரும்பும் நண்பரின் பெயர் மற்றும், விருப்பப்பட்ட அழைப்பு தகவலையும் தயவுசெய்து "
-"கொடுக்கவும்."
-
 msgid "_Buddy:"
 msgstr "_நண்பர்:"
 
@@ -11207,7 +11244,8 @@ msgstr "தவிர்"
 msgid "Get Away Message"
 msgstr "வெளியேற்றத் தகவல்"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "கடைசியாக சொன்னது"
 
 msgid "Unable to save icon file to disk."
@@ -11255,6 +11293,22 @@ msgstr "/உரையாடல்/_இப்படிச்சேமி..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/உரையாடல்/_ட பின் உருட்டலை துடை"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/உரையாடல்/_ம மூடு"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/உரையாடல்/_ம மூடு"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/உரையாடல்/_ம மூடு"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/உரையாடல்/_பதிவை காண்"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/உரையாடல்/கோப்பை _அனுப்பு..."
 
@@ -11332,6 +11386,18 @@ msgstr "/_உரையாடல்"
 msgid "/Conversation/View Log"
 msgstr "/உரையாடல்/பதிவை காண்"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/உரையாடல்/_ம மூடு"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/உரையாடல்/பதிவை காண்"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/உரையாடல்/_ம மூடு"
+
 msgid "/Conversation/Send File..."
 msgstr "/உரையாடல்/கோப்பை அனுப்பு..."
 
@@ -11521,6 +11587,9 @@ msgstr "முகவரி"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "ஆதரவு"
 
@@ -11652,6 +11721,10 @@ msgid "Hungarian"
 msgstr "ஹங்கேரியன்"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "ரோமானியன்"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "மெர்ஸிடோனியன்"
 
@@ -11669,6 +11742,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "தற்போதைய மொழிபெயர்ப்பாளர்கள்"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "ஒபேரா"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "தடுக்கப்பட்டது"
 
@@ -11691,6 +11768,10 @@ msgid "Macedonian"
 msgstr "மெர்ஸிடோனியன்"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "மெர்ஸிடோனியன்"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "நார்வேஜியன்"
 
@@ -11749,6 +11830,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "ஸ்வேதிஷ்"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "தமிழ்"
 
@@ -11807,8 +11891,25 @@ msgstr ""
 "இல் அதன் பங்களிப்பவர்களுக்கு காப்புரிமை உள்ளது. 'COPYRIGHT' கோப்பில் அவர்கள் பட்டியலை "
 "பார்க்கலாம். இந்த நிரலுக்கு எந்தவித உத்திரவாதமும் கிடையாது.<BR><BR>"
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -12073,7 +12174,7 @@ msgid "Hyperlink visited color"
 msgstr "மீத்தொடர்பு நிறம்"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "சுட்டி மீத்தொடர்பின் மீது இருக்கும்பொழுது மீத்தொடர்பை வரைவதற்கான நிறம்"
 
 msgid "Hyperlink prelight color"
@@ -12111,15 +12212,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "அறிவிப்பு நீக்கல்"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "புதிய அஞ்சல் அறவிப்புகள்"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12132,15 +12240,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "புதிய அஞ்சல் அறவிப்புகள்"
 
-msgid "_Copy Email Address"
-msgstr "மின்னஞ்சல் முகவரியை _நகலெடு"
-
-msgid "_Open Link in Browser"
-msgstr "தொடர்பை உலாவலில் _த திற"
-
-msgid "_Copy Link Location"
-msgstr "தொடர்பு பகுதியை _நகல் செய்"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12182,11 +12281,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "படத்தை சேமி"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "படத்தை _ச சேமி..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "தனிப்பயன் குறு நகையிகளை காட்டுக"
 
@@ -12277,10 +12375,6 @@ msgid "Font Face"
 msgstr "எழுத்துரு முகம்"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "பிண்ணனி நிறம்"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "முன்னணி எழுத்துரு நிறம்"
 
@@ -12411,6 +12505,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12439,6 +12534,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12498,11 +12594,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "அழைப்பு"
 
-msgid "Open All Messages"
-msgstr "அனைத்தும் செய்திகளையும் திறக்க"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\"> உங்களுக்கு அஞ்சல் வந்துள்ளது!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "கணக்கிடல்..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12532,6 +12644,27 @@ msgid ""
 msgstr ""
 "'கைமுறை'  உலாவி கட்டளை  தேர்வு செய்யப்பட்டுள்ளது, ஆனால் எந்த கட்டளையும் அமைக்கப்படவில்லை."
 
+#, fuzzy
+msgid "No message"
+msgstr "தெரியாத தகவல்"
+
+msgid "Open All Messages"
+msgstr "அனைத்தும் செய்திகளையும் திறக்க"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\"> உங்களுக்கு அஞ்சல் வந்துள்ளது!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "புதிய நண்பர் நிமித்தச் செயலாக்குதல்"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\"> உங்களுக்கு அஞ்சல் வந்துள்ளது!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "பின்வரும் சொருகிகள் கீழ் இறக்கப் படும்."
 
@@ -12584,10 +12717,17 @@ msgstr "<b>சொருகுபொருள் விவரம்</b>"
 msgid "Select a file"
 msgstr "கோப்பை தேர்வு செய்க"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "நண்பர் நிமித்தச் செயலை தொகு"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "யார் மீது நிமித்தச் செயலாக்க வேண்டும்"
 
+msgid "_Account:"
+msgstr "_கணக்கு:"
+
 msgid "_Buddy name:"
 msgstr "_நண்பர் பெயர்:"
 
@@ -12655,7 +12795,60 @@ msgstr "_மீண்டும் மீண்டும் நிகழும்
 msgid "Pounce Target"
 msgstr "நிமித்தச் செயலாக்குதலின் இலக்கு"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "_தட்டச்சிட ஆரம்பிக்கிறார்"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "நண்பர் தட்டச்சுசெய்கிறார்..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "_நுழைகிறார்"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s ஓய்வாக நிலையிலிருந்து திரும்பி இருக்கிறார் (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "வெளியிலிருந்து _த திரும்புகிறார்"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "தட்டச்சிடல் நிறுத்தப்பட்டது"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "_வ வெளியேற்றம்"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "_ஓய்வாக இருக்கிறார்"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "வெளிச்செல்லும் பொழுது"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "_தகவல் அனுப்பு"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "தெரியாத நிமித்தச் செயலாக்கல் நிகழ்வு. இதை அறிவியுங்கள்!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "முகபாவனை உறைபொருளை கட்டுப்பிரிக்க தவறியது."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "முகபாவனை உறைபொருளை கட்டுப்பிரிக்க தவறியது."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "முகபாவனை உறைபொருளை கட்டுப்பிரிக்க தவறியது."
 
 msgid "Install Theme"
@@ -12678,6 +12871,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "%s உடன் உரையாடல்கள்"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "நண்பர் பட்டியல்"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "கணினி தட்டின் குறும்படம்"
 
@@ -12690,7 +12889,7 @@ msgid "On unread messages"
 msgstr "படிக்காத செய்திகள்"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "ஐஎம் உரையாடல் சாளரங்கள்"
 
 #, fuzzy
@@ -12700,6 +12899,10 @@ msgstr "புதிய ஐஎம் உரையாடல்களை _மற�
 msgid "When away"
 msgstr "வெளிச்செல்லும் பொழுது"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "உரையாடல் சாளரத்தை _உயர்த்து"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12760,10 +12963,6 @@ msgstr "மென்மையான உருட்டுதலை செயல�
 msgid "F_lash window when IMs are received"
 msgstr "_ஒ தகவல்கள் பெறப்படும்பொழுது சாளரத்தை ஒளிரச்செய்"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "உரையாடல் சாளரத்தை _உயர்த்து"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12800,13 +12999,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "பயனரின் தகவலை பெற இயலவில்லை"
 
-msgid "ST_UN server:"
-msgstr "ஸ்_டன்  சேவயகம்:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "ஐபி முகவரி _தானியங்கி தேடல்"
 
 msgid "Public _IP:"
@@ -12827,6 +13024,10 @@ msgstr "_ஆரம்ப தளம்:"
 msgid "_End port:"
 msgstr "_ம முடிவு தளம்:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "பதிலாள் சேவையகம்"
@@ -12856,6 +13057,10 @@ msgstr "பதிலாள் சேவையகம்"
 msgid "No proxy"
 msgstr "பதிலாள் இல்லை"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_பயனாளர்:"
 
@@ -13020,13 +13225,13 @@ msgstr "இருவரும் வெளியே மற்றும் ஓய
 msgid "Auto-away"
 msgstr "தானியங்கி-வெளிச் செலவு"
 
-msgid "Change status when _idle"
-msgstr "_ஓய்வாக இருக்கும்பொழுது நிலையை மாற்று"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "நிலையை _மாற்றுவதற்கு முன் நிமிடங்கள்:"
 
+msgid "Change status when _idle"
+msgstr "_ஓய்வாக இருக்கும்பொழுது நிலையை மாற்று"
+
 msgid "Change _status to:"
 msgstr "_ந நிலையை இதற்கு மாற்று:"
 
@@ -13179,29 +13384,19 @@ msgstr "_ச சேமித்து உபயோகிக்கவும்"
 msgid "Status for %s"
 msgstr "%s ற்கான நிலை"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "குறு நகையி (முகபாவனையை) நுழை"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "இரட்டையான நகல் சரிசெய்தல்"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "_வ சில கணக்குகளுக்கு வேறுபாடான நிலைகளை பயன்படுத்து"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "குறு நகையி (முகபாவனையை) நுழை"
@@ -13211,20 +13406,29 @@ msgid "Add Smiley"
 msgstr "சிரி!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "படத்தை சேமி"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "தளம்"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "சிரி!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "தளம்"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "நண்பரை தேர்வுசெய்க"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13312,9 +13516,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "வெளியீட்டாளரை அனுப்ப முடியவில்லை"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "நீங்கள் ஒரு மேல் மேசை துவக்கியை இழுத்தீர்கள். அனேகமாக இந்த துவக்கி எதை துவக்குகிறதோ அதை "
 "அனுப்ப விரும்புகிறீர்கள். துவக்கியை அல்ல."
@@ -13350,6 +13555,16 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_த தொடர்பை இதில் திற:"
+
+msgid "_Copy Link Location"
+msgstr "தொடர்பு பகுதியை _நகல் செய்"
+
+msgid "_Copy Email Address"
+msgstr "மின்னஞ்சல் முகவரியை _நகலெடு"
+
 msgid "Save File"
 msgstr "கோப்பை சேமிக்கவும்"
 
@@ -13448,6 +13663,78 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "சேவையகம் முகவரி"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "கலந்துரையாடல் சேவையகத்தை கொடுக்கவும்"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "விசாரிப்பதற்காக ஒரு கலந்துரையாடல் சேவையகத்தை தேர்வு செய்க"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "இணைப்புடன் சேவைகள்"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "நண்பர் பட்டியலை அனுப்பு"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "வெளியே _ச செல்கிறார்"
+
+#, fuzzy
+msgid "Directory"
+msgstr "அடைவை தேடு"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "ஒலித் தேர்வு"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>விரிவாக:</b> சொல்லமுடியாத"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "அடைவு தகவல்களை அமை"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_உலாவி:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "பயனாளர் இல்லை"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "சேவையகம் எந்த ஆதரவுள்ள உறுதிபடுத்தல் முறையையும் பயன்படுத்தவில்லை."
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "அடைவு தகவல்களை அமை"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "நண்பர் ஓய்வாக இருக்கிறார்"
 
@@ -13847,9 +14134,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "கூட்டு இசையமைப்பிற்கு இசை செய்தி செருகி"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "இசை செய்தி செருகி பல பயனர்கள் ஒரே நேரத்தில் ஒரு இசைக்குறியை திருத்துவதால் ஒரு இசை "
 "துணுக்கினை உருவாக்க அனுமதிக்கிறது."
@@ -13966,12 +14254,6 @@ msgstr ""
 "- அனைத்து உள்வரும் எழுத்துக்களை திசைமாற்றி அமைக்கிறது\n"
 "- உங்கள் அட்டவணையில் உள்ள மக்கள் உள்ளே நுழைந்தவுடன் அவர்களுக்கு தகவலை அனுப்புகிறது"
 
-msgid "Cursor Color"
-msgstr "நிலைக் காட்டியின் நிறம்"
-
-msgid "Secondary Cursor Color"
-msgstr "இரண்டாம்நிலை நிலைக் காட்டியின் நிறம்"
-
 msgid "Hyperlink Color"
 msgstr "மீதொடர்பின் நிறம்"
 
@@ -13983,6 +14265,10 @@ msgstr "மீதொடர்பின் நிறம்"
 msgid "Highlighted Message Name Color"
 msgstr "பொருத்தங்களை சிறப்பு சுட்டுக"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "அறிவிப்பு நீக்கல்"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "ஜிடிகே கிளை காட்சி படுக்கைவாட்டு பிரிப்பு"
 
@@ -14012,35 +14298,24 @@ msgstr "ஜிடிகே+ இடைமுக எழுத்துரு"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "ஜிடிகே+ உரை குறுக்குவழி உறைபொருள்"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "இடைமுகம் நிறங்கள்"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "புதிய அஞ்சல் அறவிப்புகள்"
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "கெய்ம் ஜிடிகே+ உறைபொருள் கட்டுப்பாடு"
 
-msgid "Widget Sizes"
-msgstr "சிறு சாளர அளவுகள்"
+#, fuzzy
+msgid "Colors"
+msgstr "மூடுக"
 
 msgid "Fonts"
 msgstr "எழுத்துருக்கள்"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "கெய்ம் கோப்பு கட்டுப்பாடு"
@@ -14135,7 +14410,7 @@ msgstr "ஐஎம் உரையாடல் சாளரங்கள்"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14187,6 +14462,113 @@ msgstr "வார்த்தை மாற்றல்கள்"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "பயனாளர் விதித்த முறைப்படி வெளிச்செல்லும் தகவல்களில் வார்த்தையை மாற்றுகிறது."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "நுழைந்திருக்கவில்லை"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "நுழைந்திருக்கவில்லை"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "ஒரு அரட்டையில் இணை"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "தவிர்"
+
+#, fuzzy
+msgid "Founder"
+msgstr "மிக சத்தமான"
+
+#, fuzzy
+msgid "Operator"
+msgstr "ஒபேரா"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "அனுமதிக்கப்பட்ட பெயர்"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "பிழை"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "வேலை பற்றிய தகவல்"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "உரையாடலை வேண்டுக"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "எச்சரிக்கை நிலை"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ற்கான நிலை"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "அரட்டை அறை மொழி அமைப்புகள்"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "குறும்படத்தை சேமி"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "கெய்ம் ஜிடிகே+ உறைபொருள் கட்டுப்பாடு"
+
+#, fuzzy
+msgid "Contact"
+msgstr "கணக்குத் தகவல்"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "நண்பர் பட்டியல்"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "நண்பர் பட்டியல்"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "கெய்ம் ஜிடிகே+ உறைபொருள் கட்டுப்பாடு"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "கெய்ம் ஜிடிகே+ உறைபொருள் கட்டுப்பாடு"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14352,10 +14734,6 @@ msgid "Only when docked"
 msgstr "நிலை நிறுத்திய பொழுது மட்டும்"
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "_ஒ தகவல்கள் பெறப்படும்பொழுது சாளரத்தை ஒளிரச்செய்"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "நுழையும் விருப்பங்கள்"
 
@@ -14365,7 +14743,7 @@ msgstr "விண்டோஸ் கெய்மிற்காக மட்ட�
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "விண்டோஸ் கெய்மிற்கான விருப்பங்களை கொடுக்கிறது, அதாவது நண்பர் பட்டியல் இணைப்பு மற்றும் "
 "உரையாடல் ஒளிர்தல்."
@@ -14409,6 +14787,520 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cannot open socket"
+#~ msgstr "கொள் குழியை (சாக்கெட்டை) திறக்க முடியவில்லை "
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "கொள் குழி (சாக்கெட்) இல் கேட்க இயலவில்லை"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "கொள் குழியை (சாக்கெட்டை) வாசிக்க இயலவில்லை"
+
+#~ msgid "Connection failed."
+#~ msgstr "இணைப்பு தவறியது."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "சேவையக இணைப்பு துண்டிக்கப்பட்டது"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்க முடியவில்லை"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "புரவலருடன் இணைக்க முடியவில்லை"
+
+#~ msgid "Read error"
+#~ msgstr "வாசிப்பதில் பிழை"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
+
+#~ msgid "Write error"
+#~ msgstr "எழுதுவதில் பிழை"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "அடைவு தகவல்களை அமை"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "நீட்டித்த முகவரி"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "அரட்டை புனைப்பெயர்"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "பயனருக்கு அடைவு தகவல் இல்லை ."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "கட்டளை"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "ஹெச்டிஎம்எல் (HTML) "
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "பதிவுப் பிழை"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "இடம்"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "பயனர் தேடல்"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "நண்பர் நிலை அறிவிப்பு"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "ஆதரிக்கப்படாத பதிப்பு"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "திசை அமைப்பு"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "பயன்பாட்டாளர் வகைகள்"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "பயனர் வரையளவு"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "செயல்திறன்"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "பயனாளர் பெயர்"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "ஐஎம் சாவி பரிமாற்றத்துடன்"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "மின்னஞ்சல்"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "எம்எஸ்என் குறுந்தொகுப்பு"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "பிங்"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "பயனர் பெயர்"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "நிகழ் ஒளித்தோற்றம்"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "தகவல் பெறப்பட்டது"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "பொது சொல்லாக்க விசை"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "பயனாளர் விருப்பங்கள்"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "பயன்பாட்டாளர் வகைகள்"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "பயனர் பெயர்"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "பயனர் வரையளவு"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ட்ரில்லியன் ரகசியமாக்கல்"
+
+#~ msgid "Read Error"
+#~ msgstr "வாசிப்பதில் பிழை"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "சேவையகத்துடன் இணைக்க தவறியது."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "கியூ வரிசை நிறைந்தது"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "தகவலை அலகிட இயலவில்லை"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "புரவலருடன் இணைக்க முடியவில்லை"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "உள்நுழைய இயலவில்லை (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "நீங்கள் வேறு பணியிடத்துள் நுழைந்ததால் வெளியேற்றப் பட்டீர்கள்"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "பிழை எஸ்எஸ்எல் ஆதரவு நிறுவப்படவில்லை."
+
+#~ msgid "Incorrect password."
+#~ msgstr "கடவுச்சொல் தவறு."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "சேவையகத்துடன் இணைக்க தவறியது."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "நீங்கள் இப்போது இணப்பிலிருந்து நீக்கப் படலாம். இது சரியாகும் வரை டிஓசி யை பயன் படுத்த "
+#~ "நினைக்கலாம். மேம்படுத்துவதற்கு %s ஐ பார்க்கவும்."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "இணைக்க முடியவில்லை"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "செல்லுபடியாகாத செல்லப் பெயர்"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "சேவையக தகவலை பெற இயலவில்லை"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "தொடர்பு முடிக்கப்பட்டது"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "இணைப்பு துண்டிக்கப்பட்டது,(எழுதப்படுகிறது)"
+
+#~ msgid "Connection reset"
+#~ msgstr "இணைப்பு மீண்டும் அமைக்கப் பட்டது"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "கொள் குழி (சாக்கெட்) இலிருந்து வாசிப்பதில் பிழை : %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "புரவலருடன் இணைக்க முடியவில்லை"
+
+#~ msgid "Could not write"
+#~ msgstr "எழுத முடியவில்லை"
+
+#~ msgid "Could not connect"
+#~ msgstr "இணைக்க முடியவில்லை"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "கேட்கும் கொள்குழி (சாக்கெட்) ஐ உருவாக்க முடியவில்லை!"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "கடவுச்சொல் தவறு."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "யாகூ ஜப்பான்"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "ஜப்பான் அழைப்பி புரவலன்"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "ஜப்பான் கோப்பு அனுப்பும் புரவலன்"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "உள்ளே நுழைய சேவையகத்துக்கு டிஎல்எஸ்/எஸ்எஸ்எல் தேவை. டிஎல்எஸ்/எஸ்எஸ்எல் ஆதரவு ஏதுமில்லை."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "ஐஎம் உரையாடல் சாளரங்கள்"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "_வ சில கணக்குகளுக்கு வேறுபாடான நிலைகளை பயன்படுத்து"
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "எந்த முகப்பை செயல்படுத்த?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "நிலைக் காட்டியின் நிறம்"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "இரண்டாம்நிலை நிலைக் காட்டியின் நிறம்"
+
+#~ msgid "Interface colors"
+#~ msgstr "இடைமுகம் நிறங்கள்"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "சிறு சாளர அளவுகள்"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "தகவலில் சேர்க"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "நீங்கள் அழைக்க விரும்பும் நண்பரின் பெயர் மற்றும், விருப்பப்பட்ட அழைப்பு தகவலையும் "
+#~ "தயவுசெய்து கொடுக்கவும்."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "குறிப்புகள் முகவரி புத்தகத்தை தேர்வு செய்"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "நீங்கள் இப்போது இணப்பிலிருந்து நீக்கப் படலாம். இது சரியாகும் வரை டிஓசி யை பயன் படுத்த "
+#~ "நினைக்கலாம். மேம்படுத்துவதற்கு %s ஐ பார்க்கவும்."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "நண்பரை சேர்"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "சேவையக தகவலை பெற இயலவில்லை"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "வாசித்தல் பிழை"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "சேவையகத்தை இணை"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "அரட்டையில் சேர தவறியது"
+
+#~ msgid "Looking up %s"
+#~ msgstr "மேலே பார்க்கிறது %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s க்கு இணைக்க இயலவில்லை"
+
+#~ msgid "Signon: %s"
+#~ msgstr "சேரவும்: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "%s கோப்புக்கு எழுத முடியவில்லை."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "%s கோப்பை படிக்க முடியவில்லை."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "தகவல் மிக நீளம், கடைசி %s பைட்டுகள் வெட்டப்பட்டன."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s உள் நுழைந்திருக்கவில்லை."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s ஐ எச்சரிக்க அனுமதி இல்லை."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "நீங்கள் சேவையக வேக வரையரையை மீறுவதால் செய்தி ஒன்று விடுபட்டது "
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%s இல் அரட்டை கிடக்கவில்லை."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "நீங்கள் %s க்கு மிக அதிக வேகமாக செய்திகளை அனுப்புகிறீர்கள்."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "%s இடமிருந்து ஐஎம் ஐ நீங்கள் இழந்தீர்கள் ஏனென்றால் அது மிக நீளமானது."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "%s இடமிருந்து ஐஎம் ஐ நீங்கள் இழந்தீர்கள் ஏனென்றால் அது மிக வேகமாக அனுப்பப்பட்டது."
+
+#~ msgid "Failure."
+#~ msgstr "தோல்வி.."
+
+#~ msgid "Too many matches."
+#~ msgstr "மிக அதிகமான பொருத்தங்கள்."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "மேலும் பல தகுதியாக்கங்கள் தேவை."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "அடைவு சேவை தற்காலிகமாக கிடைக்கவில்லை."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "மின்னஞ்சலை பார்ப்பது தடைசெய்யப்பட்டது."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "முக்கியச்சொல் உதாசீனப் படுத்தப் பட்டது."
+
+#~ msgid "No keywords."
+#~ msgstr "திறவுவார்த்தைகள் இல்லை."
+
+#~ msgid "User has no directory information."
+#~ msgstr "பயனருக்கு அடைவு தகவல் இல்லை ."
+
+#~ msgid "Country not supported."
+#~ msgstr "நாடு ஆதரிக்கப்படவில்லை."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "தெரியாத தோல்வி: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "தவறான செல்லப்பெயர் (அ) தவறான கடவுச்சொல்."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "சேவை தற்காலிகமாக கிடைக்கவில்லை."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "உள் நுழைய உங்கள் எச்சரிக்கை மட்டம் இப்போது மிக அதிகமாக உள்ளது."
+
+#~ 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 ""
+#~ "நீங்கள் அடிக்கடி இணைப்பை பெற்று துண்டித்துள்ளீர்கள். பத்து நிமிடங்கள் பொறுத்து மீண்டும் "
+#~ "தொடங்கவும். தொடர்ந்து முயன்றால் மேலும் அதிக நேரம் காக்க வேண்டியிருக்கும்."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "தெரியாத நுழைவு பிழை ஏற்பட்டுள்ளது: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "தெரியாத பிழை %d, ஏற்பட்டுள்ளது. தகவல்: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "செல்லாத குழுப்பெயர்"
+
+#~ msgid "Connection Closed"
+#~ msgstr "தொடர்பு முடிக்கப்பட்டது"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "பதிலுக்காக காத்திருத்தல்..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "டிஓசி அதனுடைய பொறுத்தல் நிலையிலிருந்து மீண்டுள்ளது. நீங்கள் மீண்டும் தகவல்களை அனுப்பலாம்."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "கடவுச்சொல் வெற்றிகரமாக மாற்றப்பட்டது"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "அடைவு தகவல்களை பெறு"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "அடைவு தகவல்களை அமை"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "%s யை எழுதுவதற்காக திறக்கமுடியவில்லை!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "கோப்பு அனுப்புதலில் பிழை; ஒருவேளை மறுபக்கத்தில் தவிர்த்திருக்கலாம்."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "அனுப்புவதற்கு இணைக்க முடியவில்லை."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "கோப்பின் தலைப்பை எழுத இயலவில்லை. கோப்பு அனுப்பப்படமாட்டாது."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "குறும்படத்தை இப்படிச்சேமி..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s  %s ஐ %d கோப்பை பெற்றுக் கொள்ள வேண்டுகிறார்: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s  %s ஐ %d கோப்புகளை பெற்றுக் கொள்ள வேண்டுகிறார்: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s, உங்களை அவருக்கு கோப்பை அனுப்பக்கோருகிறார்"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "டிஓசி வரைமுறை சொருகுபொருள்"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%s க்கான பயனாளர் குறிப்பு இல்லை"
+
+#~ msgid "%s Options"
+#~ msgstr "%s விருப்பங்கள்"
+
+#~ msgid "Proxy Options"
+#~ msgstr "பதிலாள் விருப்பங்கள்"
+
+#~ msgid "By log size"
+#~ msgstr "பதிவுகள் அளவைக்கொண்டு"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "தொடர்பை உலாவலில் _த திற"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ஸ்_டன்  சேவயகம்:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "படத்தை சேமி"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_ஒ தகவல்கள் பெறப்படும்பொழுது சாளரத்தை ஒளிரச்செய்"
+
 #, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "அதே பெயரில் கோப்பு ஏற்கனவே உள்ளது"
@@ -14474,13 +15366,6 @@ msgstr ""
 #~ msgstr "உறுதியாக %s யை அழிக்கலாமா?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s - இதன் மீது %s (%s)"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "கணினி பதிவு"
 
@@ -14681,10 +15566,6 @@ msgstr ""
 #~ msgstr "%s ல் உள்ள பயனாளர்கள்: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "%s அவரது நண்பர் பட்டியலில் உங்களை சேர்த்துள்ளார்."
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "கோப்பு இயக்கம் பிழை"
 
@@ -14693,10 +15574,6 @@ msgstr ""
 #~ msgstr "தற்போதைய டோக்கனை உள்ளிவும்"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "இணைப்பை உருவாக்குவதில் பிழை"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "எய்ம் உள் நுழைய முடியவில்லை"
 
@@ -14810,17 +15687,9 @@ msgstr ""
 #~ msgstr "தற்போதைய டோக்கன்"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_தகவல்:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "கணக்கு:"
-
 #~ msgid "DBus"
 #~ msgstr "டிபஸ் (DBus)"
 
@@ -14929,13 +15798,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>விரிவாக:</b> சொல்லமுடியாத"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15276,8 +16138,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "இம்மாதிரி நிகழும்பொழுது, டிஓசி எந்த செய்தியையும் தவிர்த்துவிடும், மற்றும் நீங்கள் தகவல் "
 #~ "அனுப்பினால் உங்களை உதைத்து தள்ளிவிடும். கெய்ம், எது சென்றாலும் தடுக்கவும்த்துவிடும். "
@@ -15295,8 +16157,8 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "சாதாரண அனுமதிக்கும் முறை செயலிலந்தது. உங்களது கடவுச்சொல்லோ அல்லது யாகூ! வின் "
 #~ "அனுமதிக்கும் முறையோ மாறியிருக்கவேண்டும். இப்பொழுது கெய்ம் வலை செய்தியாளர் உண்மை "
diff --git a/po/te.po b/po/te.po
index f43489a40a..818c9fd84a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin Telugu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-11-14 14:05+0530\n"
 "Last-Translator: RKVS Raman <raman@cdacbangalore.in>\n"
 "Language-Team: GIST CDAC Pune / BharateeyaOO.o <info.gist@cdac.in / "
@@ -26,13 +26,13 @@ msgstr "ఫ్రెంచ్ "
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "మరింత సమాచారం కోసం %s. ను `%s -h'అడుగుతున్నారు.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -633,20 +633,6 @@ msgstr "లాగింగ్ నిలిచిపోయింది. ఈ స�
 msgid "Send To"
 msgstr "_వీరికి పంపండి"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "సందేశంలో పొందుపరచు"
-
-msgid "Invite"
-msgstr "ఆహ్వానించు "
-
-# Put our happy label in it.
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr "మీరు ఆహ్వానించదల్చుకున్న మిత్రుని పేరును ఆప్షనల్ ఆహ్వాన సందేశంతో పాటుగా ఎంటర్ చేయండి."
-
 # Conversations
 # Conversation menu
 #, fuzzy
@@ -921,6 +907,44 @@ msgstr "సంభాషణలు "
 msgid "System Log"
 msgstr "సిస్టం లాగ్"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "లెక్కిస్తూ..."
+
+msgid "Hangup"
+msgstr ""
+
+# *
+# * A wrapper for Pidgin_request_action() that uses Accept and Cancel buttons.
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "_అంగీకరించు "
+
+msgid "Reject"
+msgstr "నిరాకరించు"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "మీరు చానల్‌ %s%s లో భాగమయ్యారు"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "ఇ-మెయిళ్లు "
 
@@ -956,6 +980,9 @@ msgstr "కొనసాగించు"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "ఆహ్వానించు "
+
 msgid "(none)"
 msgstr "(ఏమీ లేదు)"
 
@@ -1170,7 +1197,6 @@ msgstr "%s వెళ్లిపోయారు. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s మీకు ఓ సందేశం పంపారు.(%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "తెలియని వారెవరో దూసుకొచ్చారు. దయచేసి రిపోర్టు చేయండి!"
 
@@ -1223,7 +1249,6 @@ msgid "Change status to"
 msgstr " _స్థాయిని కు మార్చు:"
 
 # Conversations
-#. Conversations
 msgid "Conversations"
 msgstr "సంభాషణలు "
 
@@ -1577,7 +1602,6 @@ msgstr "కొత్త సంభాషణ ప్రారంభించిన�
 # 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)
-#, c-format
 msgid "Online"
 msgstr "ఆన్‌లైన్ "
 
@@ -1626,6 +1650,28 @@ msgstr "Gntచివరిలాగ్"
 msgid "Lastlog plugin."
 msgstr "చివరిలాగ్ ప్లగ్ ఇన్"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 # And now for the buttons
 msgid "accounts"
 msgstr "అకౌంట్లు"
@@ -1730,16 +1776,6 @@ msgstr ""
 msgid "SSL Certificate Verification"
 msgstr ""
 
-# *
-# * A wrapper for Pidgin_request_action() that uses Accept and Cancel buttons.
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "_అంగీకరించు "
-
-msgid "Reject"
-msgstr "నిరాకరించు"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1833,6 +1869,8 @@ msgstr "+++ %s సైన్డ్ ఆఫ్ "
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "అజ్ఞాత పొరపాటు"
 
@@ -1880,6 +1918,17 @@ msgstr "%s రూమ్ వదలి వెళ్లారు.  "
 msgid "%s left the room (%s)."
 msgstr "%s రూమ్ వదలి వెళ్ళారు (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "కన్ఫరెన్స్ కు స్వాగతం"
+
+# Put our happy label in it.
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "మీరు ఆహ్వానించదల్చుకున్న మిత్రుని పేరును ఆప్షనల్ ఆహ్వాన సందేశంతో పాటుగా ఎంటర్ చేయండి."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "కనెక్షన్ పొందడంలో వైఫల్యం: %s"
@@ -2018,7 +2067,6 @@ msgstr "%s నుండి %s ను ట్రాన్స్ఫర్ చేయ
 msgid "Transfer of file %s complete"
 msgstr "%s ఫైలు బదిలీ పూర్తయినది "
 
-#, c-format
 msgid "File transfer complete"
 msgstr "ఫైలు బదిలీ  పూర్తయినది"
 
@@ -2026,7 +2074,6 @@ msgstr "ఫైలు బదిలీ  పూర్తయినది"
 msgid "You canceled the transfer of %s"
 msgstr "%s ఫైలు బదిలీని మీరు రద్దుచేశారు"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "ఫైలు బదిలీ రద్దయినది"
 
@@ -2211,11 +2258,14 @@ msgstr "<font color=\"red\"><b>ఫైలును రీడ్ చేయడం �
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <ఆటో రిప్లై>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "కనెక్షన్ ఏర్పాటులో పొరపాటు"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s ని మీరు ఉపయోగిస్తున్నారు, కానీ ఈ ప్లగ్ ఇన్ కు %s అవసరం."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "ఈ ప్లగ్ ఇన్ ను IDలో నిర్వచించలేదు."
 
@@ -2655,9 +2705,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "లాగ్ వ్యూవర్ లో ఇతర IM క్లయింట్ల లాగ్ లు కూడా ఉన్నాయి."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2712,8 +2763,9 @@ msgstr "ఆఫ్ లైన్ సందేశం వలె పనిచేయ�
 msgid "Save messages sent to an offline user as pounce."
 msgstr "ఆఫ్ లైన్ వినియోగదారుకు పంపిన సందేశాలను చొచ్చుకొని వచ్చినవిగా సేవ్ చేయండి."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "మిగతా సందేశాలను చొచ్చుకొని వచ్చినవిగా సేవ్ చేయడం జరుగుతుంది. `Buddy Pounce' డైలాగ్ నుంచి మీరు పౌన్స్ "
@@ -2747,6 +2799,32 @@ msgstr "ఆఫ్ లైన్ సందేశాలను పౌన్స్ �
 msgid "Do not ask. Always save in pounce."
 msgstr "మళ్ళీ అడగకండి. ఎప్పుడూ పౌన్స్ లోనే సేవ్ చేయండి."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "పాస్ వర్డ్ ను ఎంటర్ చేయండి"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 # *< type
 # *< ui_requirement
 # *< flags
@@ -3032,18 +3110,18 @@ msgstr ""
 "www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "ఇన్ కమింగ్ IM కనెక్షన్లకు \n"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "లోకల్ mDNS సర్వర్ తో కనెక్షన్ కుదరటంలేదు. ఆ సర్వర్ అమలులో ఉందా?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "పేరులోని మొదటి భాగం"
 
@@ -3078,6 +3156,11 @@ msgstr "Bonjour ప్రొటోకాల్ ప్లగ్ ఇన్"
 msgid "Purple Person"
 msgstr "Purple పర్సన్"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "ప్రదేశం "
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -3088,14 +3171,17 @@ msgstr "%s తన సంభాషణను ముగించారు."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "సందేశాన్ని పంపలేకపోయాం, సంభాషణను ప్రారంభించలేరు."
 
-msgid "Cannot open socket"
-msgstr "సాకెట్ ను తెరవజాలదు"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "సాకెట్‌ను సృష్టించలేదు"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "పోర్టుకు సాకెట్ ను కలపలేకపోతున్నాం"
 
-msgid "Could not listen on socket"
-msgstr "సాకెట్ పై వినలేకపోతున్నాం"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "సాకెట్‌ను సృష్టించలేదు"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3144,13 +3230,16 @@ msgstr "మిత్రుల జాబితాను సేవ్ చేయం
 msgid "Load buddylist from file..."
 msgstr "ఫైలునుడి మిత్రుల జాబితాను లోడ్ చేయండి..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "నమోదు పత్రంలోని అన్ని ఖాళీలను నింపండి."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "పాస్‌వర్డ్స్ సరిపోలడంలేదు."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "కొత్త అకౌంటును నమోదు చేయలేకపోతున్నాం. లోపం జరిగింది.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3162,14 +3251,15 @@ msgstr "నమోదుచేయడం విజయవంతంగా పూర�
 msgid "Password"
 msgstr "పాస్‌వర్డ్"
 
-msgid "Password (retype)"
-msgstr "పాస్ వర్డ్ ను (మళ్ళీటైప్ చేయండి)"
+msgid "Password (again)"
+msgstr "పాస్‌వర్డ్ (మరోసారి)"
 
-msgid "Enter current token"
-msgstr "ప్రస్తుత టోకెన్ ను ఎంటర్ చేయండి"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "ప్రస్తుత టోకెన్"
+#, fuzzy
+msgid "Captcha"
+msgstr "సచిత్రమును సేవ్ చేయుము."
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "కొత్త Gadu-Gadu అకౌంటును నమోదు చేయండి"
@@ -3222,6 +3312,15 @@ msgstr "పాస్ వర్డ్ ను విజయవంతంగా మ�
 msgid "Current password"
 msgstr "ప్రస్తుత పాస్ వర్డ్"
 
+msgid "Password (retype)"
+msgstr "పాస్ వర్డ్ ను (మళ్ళీటైప్ చేయండి)"
+
+msgid "Enter current token"
+msgstr "ప్రస్తుత టోకెన్ ను ఎంటర్ చేయండి"
+
+msgid "Current token"
+msgstr "ప్రస్తుత టోకెన్"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "UIN:  కోసం దయచేసి మీ ప్రస్తుత పాస్‌వర్డ్‌ను, అలాగే మీ కొత్త పాస్‌వర్డ్‌ను ఎంటర్ చేయండి"
 
@@ -3236,13 +3335,13 @@ msgid "Add to chat..."
 msgstr "సంభాషణకు చేర్చండి..."
 
 # hacks
+#. Global
 msgid "Available"
 msgstr "లభించును"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "దూరంగా "
 
@@ -3270,8 +3369,8 @@ msgstr "సరిపోలే వినియోగదారు కనిపి�
 msgid "There are no users matching your search criteria."
 msgstr "మీ అన్వేషణా ప్రాధాన్యతలకు సరిపోలే వినియోగదారులు లేరు."
 
-msgid "Unable to read socket"
-msgstr "సాకెట్‌ను చదవడం సాధ్యంకాదు"
+msgid "Unable to read from socket"
+msgstr "సాకెట్‌ నుంచి రీడ్ చేయడం   సాధ్యం కావడం లేదు "
 
 msgid "Buddy list downloaded"
 msgstr "మిత్రుల జాబితా డౌన్ లోడ్ అయింది"
@@ -3285,8 +3384,14 @@ msgstr "మిత్రుల జాబితా అప్ లోడ్ అయ�
 msgid "Your buddy list was stored on the server."
 msgstr "సర్వర్ లో మీ మిత్రుల జాబితాను నిక్షిప్తపరచింది."
 
-msgid "Connection failed."
-msgstr "కనెక్ట్ అవడంలో వైఫల్యం."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "కనెక్ట్ అయింది "
+
+msgid "Connection failed"
+msgstr "కనెక్షన్ వైఫల్యం "
 
 msgid "Add to chat"
 msgstr "సంభాషణకు చేర్చండి"
@@ -3294,13 +3399,24 @@ msgstr "సంభాషణకు చేర్చండి"
 msgid "Chat _name:"
 msgstr "సంభాషణ_పేరు:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
+
+# connect to the server
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "కనెక్ట్ చేస్తున్నది"
+
 msgid "Chat error"
 msgstr "సంభాషణలో పొరపాటు"
 
 msgid "This chat name is already in use"
 msgstr "ఈ సంభాషణ పేరు ఇప్పటికే ఉపయోగంలో ఉంది"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "సర్వర్ కు కనెక్టు కాలేదు."
 
 msgid "Find buddies..."
@@ -3354,6 +3470,10 @@ msgstr "ప్రఖ్యాత IMకు మెరుగులు దిద్�
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu వినియోగదారు"
 
+#, fuzzy
+msgid "GG server"
+msgstr "వినియోగదారు సమాచారాన్ని సెట్ చేయండి ..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "అజ్ఞాత కమాండ్: %s"
@@ -3368,7 +3488,8 @@ msgstr "ఏ విషయాన్నీ సెట్ చేయలేదు"
 msgid "File Transfer Failed"
 msgstr "ఫైలు బదిలీలో వైఫల్యం"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "లిజెనింగ్ పోర్టును ప్రారంభించలేదు."
 
 msgid "Error displaying MOTD"
@@ -3384,8 +3505,18 @@ msgstr "ఈ కనెక్షన్‌తో MOTD అనుసంధానమ�
 msgid "MOTD for %s"
 msgstr "%s కోసం MOTD "
 
-msgid "Server has disconnected"
-msgstr "సర్వర్ డిస్‌కనెక్ట్ అయింది"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"సర్వర్ తో కనెక్షన్ పోయింది:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTDని చూడండి"
@@ -3400,26 +3531,24 @@ msgstr "_చానల్:"
 msgid "_Password:"
 msgstr "_పాస్‌వర్డ్:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC నిక్స్ లో ఖాళీలేదు"
 
-# connect to the server
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "కనెక్ట్ చేస్తున్నది"
-
 msgid "SSL support unavailable"
 msgstr "SSL సహకారం లభించడంలేదు"
 
-msgid "Couldn't create socket"
-msgstr "సాకెట్‌ను సృష్టించలేదు"
+msgid "Unable to connect"
+msgstr "కనెక్ట్ చేయడంలో అశక్తత "
 
-msgid "Couldn't connect to host"
-msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "కనెక్ట్ చేయడంలో అశక్తత "
 
-msgid "Read error"
-msgstr "రీడ్ చేయడంలో పొరపాటు"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "సర్వర్ కనెక్షన్ ను ముగించింది."
 
 msgid "Users"
 msgstr "వినియోగదారులు "
@@ -3612,6 +3741,17 @@ msgid ""
 msgstr ""
 "మీరు ఎంపిక చేసినఅకౌంటు నేమ్ ను సర్వర్ నిరాకరించింది. బహుశా అందులో చెల్లని అక్షరాలుండవచ్చును. "
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "ఈ సంభాషణ పేరు ఇప్పటికే ఉపయోగంలో ఉంది"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "ముద్దుపేరు "
+
 msgid "Cannot change nick"
 msgstr "నిక్ ను మార్చజాలదు"
 
@@ -3848,11 +3988,12 @@ msgstr "కమాండ్ పని చేయడం లేదు"
 msgid "execute"
 msgstr "ఆశించినది కాదు "
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "లాగిన్ చేయాలంటే సర్వర్ కు TLS/SSL అవసరం. TLS/SSL సహకారం లభించలేదు. "
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "లాగిన్ చేయాలంటే సర్వర్ కు TLS/SSL అవసరం. TLS/SSL సహకారం లభించలేదు. "
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3868,18 +4009,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "సాధారణ టెక్స్ట్ ప్రమాణీకరణ"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "ప్రమాణీకరణ వైఫల్యం "
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "సర్వర్‌నుంచి చెల్లని ప్రతి స్పందన."
 
 msgid "Server does not use any supported authentication method"
 msgstr " సపోర్టు కలిగిన  ప్రమాణీకరణ  పద్ధతిని సర్వర్ వాడటం లేదు."
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "సర్వర్‌నుంచి చెల్లని సవాలు "
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL పొరపాటు"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "కారణం ఇవ్వలేదు. "
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "సపోర్టులేని వెర్షన్ "
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "కనెక్షన్ ను ప్రారంభించలేకపోతున్నాం"
+
 msgid "Full Name"
 msgstr "పూర్తి పేరు "
 
@@ -3945,194 +4122,9 @@ msgstr "క్లైంటు"
 msgid "Operating System"
 msgstr "ఆపరేటింగ్ సిస్టం"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "డైరెక్టరీ సమాచారాన్ని సెట్ చేయండి. "
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "సంపూర్ణ అడ్రస్ "
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "చాట్ మారుపేరు"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "వినియోగాదారునికి డైరెక్టరీ సమాచారం లేదు. "
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "కమాండ్ "
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "నమోదులో పొరపాటు"
-
-#, fuzzy
-msgid "User Location"
-msgstr "ప్రదేశం"
-
 #, fuzzy
-msgid "User Avatar"
-msgstr "వినియోగదారు అన్వేషణ"
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "మిత్రుడి State Notification"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "సపోర్టులేని వెర్షన్ "
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "దిశ"
-
-msgid "File Transfer"
-msgstr "ఫైల్‌ బదిలీ"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "వినియోగదారుని మోడ్స్ "
-
-#, fuzzy
-msgid "User Activity"
-msgstr "వినియోగదారుని హద్దు "
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "యోగ్యతలు "
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "వినియోగదారు పేరు "
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "కీ ఎక్స్‌చెంజ్‌తో IM "
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ఇ-మెయిల్ అడ్రస్ "
-
-#, fuzzy
-msgid "User Profile"
-msgstr "ప్రొఫైల్ "
-
-#, fuzzy
-msgid "Jingle"
-msgstr "పింగ్ "
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "వినియోగదారు పేరు "
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "ప్రత్యక్ష వీడియో "
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "సందేశం అందినది"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "పబ్లిక్ కీ బాబిల్ ప్రింట్ "
-
-# Build the user options frame.
-#, fuzzy
-msgid "User Chatting"
-msgstr "వినియోగదారుని ఆప్షన్స్."
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "వినియోగదారుని మోడ్స్ "
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "వినియోగదారు పేరు "
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "వినియోగదారుని హద్దు "
-
-msgid "Ping"
-msgstr "పింగ్ "
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian Encryption"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "యోగ్యతలు "
+msgid "Local Time"
+msgstr "స్థానిక ఫైల్:"
 
 msgid "Priority"
 msgstr "ప్రాధాన్యత"
@@ -4140,6 +4132,14 @@ msgstr "ప్రాధాన్యత"
 msgid "Resource"
 msgstr "వనరు "
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "లాగ్ ఇన్ చేయబడింది"
+
 msgid "Middle Name"
 msgstr "పేరులోని మధ్యభాగం"
 
@@ -4192,7 +4192,6 @@ msgstr "సంభాషణ "
 msgid "Extended Away"
 msgstr "దూరమైపోయినది"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "అంతరాయము కలిగించవద్దు"
 
@@ -4316,29 +4315,26 @@ msgstr "ప్రశ్నించడానికి కాన్ఫరెన�
 msgid "Find Rooms"
 msgstr "రూమ్ లను కనుగొనండి"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "మారు పేరు:"
 
-msgid "Write error"
-msgstr "రైట్ చేయడంలో పొరపాటు"
+#, fuzzy
+msgid "No users found"
+msgstr "సరిపోలే వినియోగదారు కనిపించలేదు"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "ప్లెయిన్ టెక్స్ట్ "
+msgid "Roles:"
+msgstr "చేస్తున్న పని "
 
-msgid "Read Error"
-msgstr "రీడ్ చేయడంలో పొరపాటు"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "ప్లెయిన్ టెక్స్ట్ "
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "సాకెట్‌ను సృష్టించలేదు"
 
 #, fuzzy
 msgid "Invalid XMPP ID"
@@ -4347,6 +4343,10 @@ msgstr "చెల్లుబాటుకాని ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "సర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s నమోదు విజయవంతమైనది"
@@ -4375,9 +4375,6 @@ msgstr " నమోదు విజయవంతమైనది"
 msgid "Unregistration Failed"
 msgstr " నమోదు విఫలమైనది"
 
-msgid "Already Registered"
-msgstr "ఇప్పటికే నమోదైనది"
-
 msgid "State"
 msgstr "స్థితి "
 
@@ -4391,6 +4388,9 @@ msgstr "ఫోన్ "
 msgid "Date"
 msgstr "తేదీ "
 
+msgid "Already Registered"
+msgstr "ఇప్పటికే నమోదైనది"
+
 # Register button
 #, fuzzy
 msgid "Unregister"
@@ -4425,6 +4425,10 @@ msgid "Change Registration"
 msgstr ""
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "సర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "అకౌంటు సమాచారాన్ని మార్చడంలో పొరపాటు. "
 
@@ -4445,9 +4449,18 @@ msgstr "ప్రమాణీకరణ "
 msgid "Re-initializing Stream"
 msgstr "స్ట్రీమ్ ను పునఃప్రారంభస్తున్నది"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "ప్రమాణీకరణ జరగలేదు "
 
+msgid "Mood"
+msgstr "స్వభావం "
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "రెండూ "
 
@@ -4469,12 +4482,6 @@ msgstr "ఎవరూ లేరు"
 msgid "Subscription"
 msgstr "చందా "
 
-msgid "Mood"
-msgstr "స్వభావం "
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "రక్తం గ్రూపు"
@@ -4522,9 +4529,6 @@ msgstr "మీ పాస్‌వర్డ్ మారినది. "
 msgid "Error changing password"
 msgstr "పాసవర్డ్‌ను మార్చుతున్నప్పుడు పొరపాటు "
 
-msgid "Password (again)"
-msgstr "పాస్‌వర్డ్ (మరోసారి)"
-
 # if (js->protocol_options & CHANGE_PASSWORD) {
 #, fuzzy
 msgid "Change XMPP Password"
@@ -4737,18 +4741,25 @@ msgstr "వినియోగదారు %s ను కిక్ చేయలే
 msgid "Unable to ping user %s"
 msgstr "వినియోగదారు %s ను నిషేధించలేదు"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "ఎంపికచేసిన ఫైల్ (%s) అస్తిత్వంలో లేదు. అందుచేత శబ్దమును పలికించలేదు. "
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "ఎంపికచేసిన ఫైల్ (%s) అస్తిత్వంలో లేదు. అందుచేత శబ్దమును పలికించలేదు. "
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "ఎంపికచేసిన ఫైల్ (%s) అస్తిత్వంలో లేదు. అందుచేత శబ్దమును పలికించలేదు. "
 
+# msgstr "%s మీకు [%s] ను చేర్చారు"
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4759,10 +4770,36 @@ msgstr "బజ్!!"
 msgid "%s has buzzed you!"
 msgstr ""
 
-# msgstr "%s మీకు [%s] ను చేర్చారు"
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "%s కు సందేశం పంపడంలో వైఫల్యం."
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr " %sకు ఫైలును పంపడంలో అశక్తత, ఫైలు బదిలీకి వినియోగదారు సహకారం లభించడంలేదు"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr " %sకు ఫైలును పంపడంలో అశక్తత, ఫైలు బదిలీకి వినియోగదారు సహకారం లభించడంలేదు"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr " నమోదు విఫలమైనది"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
 msgstr ""
+"మీరు చూడదల్చుకున్న వ్యక్తి వివరాలకోసం దయచేసి ఆ వ్యక్తి స్క్రీన్ పేరును లేదా మారుపేరును ఎంటర్ చేయండి."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "ఫైలును సెలక్ట్ చేయుము."
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "_సంభాషణను ప్రారంభించండి"
 
 msgid "config:  Configure a chat room."
 msgstr "కన్ఫిగరేషన్:  సంభాషణ రూమ్ ను కన్ఫిగర్ చేయండి."
@@ -4783,16 +4820,18 @@ msgstr "విషయం [కొత్త విషయం]: విషయాన్
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:   వినియోగదారును రూమ్ నుంచి  నిషేధించండి."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: రూమ్ తో "
 "వినియోగదారు అనుసంధానాన్ని సెట్ చేయండి."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: వినియోగదారు పాత్రను "
 "రూమ్ తో సెట్ చేయండి."
@@ -4870,6 +4909,9 @@ msgstr "సర్వర్‌ను కనెక్ట్ చేయండి"
 msgid "File transfer proxies"
 msgstr "ఫైల్ ట్రాన్స్‌ఫర్ పోర్ట్"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4910,6 +4952,14 @@ msgstr "XML పదవివరణలో పొరపాటు"
 msgid "Unknown Error in presence"
 msgstr "అస్తిత్వంలో అజ్ఞాత పొరపాటు"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "సంభాషణ %sలో పాల్గొనడంలో పొరపాటు"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "సంభాషణ %sలో పొరపాటు "
+
 msgid "Create New Room"
 msgstr "కొత్త రూమ్ ను  సృష్టించండి"
 
@@ -4924,13 +4974,32 @@ msgstr "_కన్ఫిగర్ రూమ్"
 msgid "_Accept Defaults"
 msgstr "_పొరపాట్లను ఆమోదించు "
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "సంభాషణ %sలో పాల్గొనడంలో పొరపాటు"
+#, fuzzy
+msgid "No reason"
+msgstr "కారణం ఇవ్వలేదు. "
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "సంభాషణ %sలో పొరపాటు "
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr " %s: (%s)  ద్వారా మీరు కిక్ చేయబడ్డారు"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s) ద్వారా కిక్ చేయబడ్డారు"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "ఫైలు ఓపెన్ చేయుచున్నప్పుడు పొరపాటు సంభవించింది. "
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "ఫైలు బదిలీలో వైఫల్యం"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "ఫైలు '%s': %s ను తెరవడంలో వైఫల్యం"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4957,10 +5026,6 @@ msgstr ""
 "మీరు చూడదల్చుకున్న వ్యక్తి వివరాలకోసం దయచేసి ఆ వ్యక్తి స్క్రీన్ పేరును లేదా మారుపేరును ఎంటర్ చేయండి."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "ఫైలును సెలక్ట్ చేయుము."
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "వినియోగదారుని మోడ్స్ "
 
@@ -4998,9 +5063,19 @@ msgstr "చర్య"
 msgid "Select an action"
 msgstr "ఫైలును సెలక్ట్ చేయుము."
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\" ఫైల్స్‌ను చేర్చడంలో అసమర్థత."
+
+msgid "Buddy Add error"
+msgstr ""
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "నోట్స్ అడ్రస్ బుక్ ను ఎంపిక చేయండి"
+msgid "The username specified does not exist."
+msgstr "సూచించిన స్క్రీన్‌పేరుకు విలువలేదు."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5228,7 +5303,7 @@ msgstr "తల్లిదండ్రుల ఆమోదం లేకుండ�
 msgid "Passport account not yet verified"
 msgstr "పాస్‌పోర్టు అకౌంట్‌ను ఇంకా పరిశీలించలేదు "
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "పాస్‌పోర్టు అకౌంట్‌ను ఇంకా పరిశీలించలేదు "
 
@@ -5266,6 +5341,10 @@ msgstr "మనోభీష్ట సంబంధం "
 msgid "Non-IM Contacts"
 msgstr "సంబంధాన్ని తొలగించండి "
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5339,6 +5418,13 @@ msgstr "ఒక మొబైల్ సందేశాన్ని పంపండ
 msgid "Page"
 msgstr "పేజీ "
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "పనిచేసే చోటు"
+
 msgid "Has you"
 msgstr "మీరు "
 
@@ -5385,6 +5471,14 @@ msgstr "ఆర్టిస్టులు"
 msgid "Album"
 msgstr "Adium"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "శీర్షిక "
+
+#, fuzzy
+msgid "Office Title"
+msgstr "శీర్షిక "
+
 msgid "Set Friendly Name..."
 msgstr "ఇష్టపడే పేరు "
 
@@ -5421,9 +5515,6 @@ msgstr "_సంభాషణను ప్రారంభించండి"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSNకోసం SSL సహకారం అవసరం. దయచేసి సహకరించే SSL లైబ్రరీని ఏర్పాటు చేయండి."
 
-msgid "Failed to connect to server."
-msgstr "సర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
-
 msgid "Error retrieving profile"
 msgstr "ప్రొఫైల్‌ను బయటకు తీసుకురావడంలో పొరపాటు"
 
@@ -5576,8 +5667,8 @@ msgid ""
 "does not exist."
 msgstr "వినియోగదారు ప్రొఫైల్‌లో  ఎలాంటి సమాచారమూ లేదు. వినియోగాదారు అస్తిత్వంలో లేకపోవచ్చు. "
 
-msgid "Profile URL"
-msgstr "URL ప్రొఫైల్"
+msgid "View web profile"
+msgstr ""
 
 # *< type
 # *< ui_requirement
@@ -5623,72 +5714,35 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "సామాన్య ప్రమాణీకరణ వైఫల్యం!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s చెల్లుబాటయ్యే గ్రూప్ కాదు. "
+msgid "%s just sent you a Nudge!"
+msgstr "%s ఇప్పుడే మీకొక పలకరింపును పంపారు!"
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-msgid "Unknown error."
-msgstr "అజ్ఞాత పొరపాటు."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr " %s (%s) మీద %s "
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
+msgstr "తెలియని పొరపాటు: 0x%X"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s ఇప్పుడే మీకొక పలకరింపును పంపారు!"
+# msgstr "అజ్ఞాత పొరపాటు"
+msgid "Unable to add user"
+msgstr "వినియోగదారును చేర్చలేని స్థితి "
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-#. char *adl = g_strndup(payload, len);
 #, c-format
 msgid "Unknown error (%d)"
 msgstr ""
 
-# msgstr "అజ్ఞాత పొరపాటు"
-msgid "Unable to add user"
-msgstr "వినియోగదారును చేర్చలేని స్థితి "
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "మీ అన్వేషణా ఫలితాలు ఇలా ఉన్నాయి"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr " %s (%s) మీద వినియోగదారును చేర్చడంలో అశక్తత"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) మీద వినియోగదారును నిలువరించడంలో అశక్తత "
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s(%s) పై వినియోగదారును అనుమతించడంలో అశక్తత "
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ను చేర్చడం కుదరలేదు, ఎందుకంటే మీ మిత్రుల జాబితా నిండినది."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s చెల్లుబాటయ్యే పాస్‌పోర్ట్ అకౌంట్ కాదు."
-
-msgid "Service Temporarily Unavailable."
-msgstr "సర్వీస్ తాత్కాలికంగా అందుబాటులో లేదు. "
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "మేము అత్యంత వేగంగా పంపిస్తున్నాం కనుక సందేశాన్ని పంపలేకపోయాం:"
 
-msgid "Unable to rename group"
-msgstr "గ్రూపునకు కొత్తపేరునివ్వడంలో అశక్తత"
-
-msgid "Unable to delete group"
-msgstr "గ్రూపును తొలగించడంలో అశక్తత"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5732,9 +5786,6 @@ msgstr "అజ్ఞాత పొరపాటు సంభవించింద�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "అజ్ఞాత పొరపాటు సంభవించింది, అందుచేత సందేశం వెళ్లియుండకపోవచ్చు. "
 
-msgid "Unable to connect"
-msgstr "కనెక్ట్ చేయడంలో అశక్తత "
-
 msgid "Writing error"
 msgstr "రైట్ చేయడంలో పొరపాటు"
 
@@ -5752,21 +5803,25 @@ msgstr ""
 "%s సర్వర్:\n"
 "%s నుంచి కనెక్షన్ లో పొరపాటు "
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "మన ప్రొటోకాల్‌ను సర్వర్ సపోర్ట్ చేయడంలేదు."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP పదవిశ్లేషణ లో పొరపాటు."
 
 # MSG_SERVER_GHOST
 # Looks like someone logged in as us! =-O
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN సర్వర్లు తాత్కాలికంగా అందుబాటులో లేవు. దయచేసి కొంతసేపు ఆగి మళ్ళీ ప్రయత్నించండి. "
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN సర్వర్లు తాత్కాలికంగా కొంచెంసేపు ఆగిపోనున్నాయి. "
 
 #, c-format
@@ -5795,6 +5850,14 @@ msgstr "కుకీని పంపుతోంది"
 msgid "Retrieving buddy list"
 msgstr "మిత్రుల జాబితాను వెలికి తీస్తోంది "
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "కంప్యూటర్‌నుంచి దూరంగా "
 
@@ -5831,14 +5894,6 @@ msgstr "స్విచ్‌బోర్డ్‌లో పొరపాటు �
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "అజ్ఞాత పొరపాటు సంభవించింది, అందుచేత సందేశం వెళ్లియుండకపోవచ్చు. "
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s మిమ్మల్ని తన మిత్రుల జాబితాలో చేర్చారు."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s మిమ్మల్ని తన మిత్రుల జాబితా నుంచి తొలగించారు."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "అడ్రస్ బుక్‌కు చేర్చండి."
@@ -5847,13 +5902,6 @@ msgstr "అడ్రస్ బుక్‌కు చేర్చండి."
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "ఈ మిత్రుని మీ మిత్రుల లిస్టులో చేర్చదల్చుకున్నారా?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "\"%s\" ఫైల్స్‌ను చేర్చడంలో అసమర్థత."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "సూచించిన స్క్రీన్‌పేరుకు విలువలేదు."
@@ -5861,6 +5909,9 @@ msgstr "సూచించిన స్క్రీన్‌పేరుకు �
 msgid "This Hotmail account may not be active."
 msgstr "ఈ హాట్ మెయిల్ అకౌంటు సచేతనంగా లేకపోవచ్చు."
 
+msgid "Profile URL"
+msgstr "URL ప్రొఫైల్"
+
 # *< type
 # *< ui_requirement
 # *< flags
@@ -5884,19 +5935,66 @@ msgstr "ఈ హాట్ మెయిల్ అకౌంటు సచేతన�
 msgid "MSN Protocol Plugin"
 msgstr "MSN ప్రొటోకాల్ ప్లగ్‌ఇన్ "
 
-#, fuzzy
-msgid "Missing Cipher"
-msgstr "Cipher"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s చెల్లుబాటయ్యే గ్రూప్ కాదు. "
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+msgid "Unknown error."
+msgstr "అజ్ఞాత పొరపాటు."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr " %s (%s) మీద %s "
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr " %s (%s) మీద వినియోగదారును చేర్చడంలో అశక్తత"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) మీద వినియోగదారును నిలువరించడంలో అశక్తత "
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s(%s) పై వినియోగదారును అనుమతించడంలో అశక్తత "
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ను చేర్చడం కుదరలేదు, ఎందుకంటే మీ మిత్రుల జాబితా నిండినది."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s చెల్లుబాటయ్యే పాస్‌పోర్ట్ అకౌంట్ కాదు."
+
+msgid "Service Temporarily Unavailable."
+msgstr "సర్వీస్ తాత్కాలికంగా అందుబాటులో లేదు. "
+
+msgid "Unable to rename group"
+msgstr "గ్రూపునకు కొత్తపేరునివ్వడంలో అశక్తత"
+
+msgid "Unable to delete group"
+msgstr "గ్రూపును తొలగించడంలో అశక్తత"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s మిమ్మల్ని తన మిత్రుల జాబితాలో చేర్చారు."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s మిమ్మల్ని తన మిత్రుల జాబితా నుంచి తొలగించారు."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "వినియోగదారుని గదులు "
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "రీడ్ చేయడంలో పొరపాటు"
 
@@ -5908,13 +6006,25 @@ msgstr "సర్వర్‌నుంచి చెల్లని సవాల�
 msgid "Logging in"
 msgstr "లాగింగ్ "
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "పేరు లేదు"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"సర్వర్ నుంచి కనెక్షన్ తెగిపోయింది \n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "సందేశాన్ని పంపండి"
@@ -5934,21 +6044,24 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
+# msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు"
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "పేరు లేదు"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_IM విండోస్ "
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "కనెక్ట్ అయింది "
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "సర్వర్‌నుంచి చెల్లని ప్రతి స్పందన."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5956,15 +6069,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "తప్పుడు స్క్రీన్ పేరు లేక పాస్‌వర్డ్ "
+
 msgid "MySpaceIM Error"
 msgstr ""
 
+# XXX - Don't call this with ssi
+#, fuzzy
+msgid "Invalid input condition"
+msgstr "కనెక్షన్‌ను ఫైనలైజేషన్ జరుగుతున్నది"
+
 # msgstr "లోపం కోడ్ %d ను ప్రక్రియ తిప్పి పంపింది "
 msgid "Failed to add buddy"
 msgstr ""
@@ -5975,14 +6096,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "వినియోగదారుని గదులు "
-
 msgid "Failed to remove buddy"
 msgstr ""
 
@@ -5992,41 +6105,17 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-# XXX - Don't call this with ssi
 #, fuzzy
-msgid "Invalid input condition"
-msgstr "కనెక్షన్‌ను ఫైనలైజేషన్ జరుగుతున్నది"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "పూర్తి క్యూ."
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "సందేశాన్ని పద విశ్లేషణ చేయడంలో అశక్తత"
+msgid "Missing Cipher"
+msgstr "Cipher"
 
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-# msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు"
-#, fuzzy
-msgid "IM Friends"
-msgstr "_IM విండోస్ "
-
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "సర్వర్‌నుంచి చెల్లని ప్రతి స్పందన."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -6073,9 +6162,6 @@ msgstr "పెద్ద ఫాంట్ సైజ్ "
 msgid "User"
 msgstr "వినియోగదారు"
 
-msgid "Profile"
-msgstr "ప్రొఫైల్ "
-
 #, fuzzy
 msgid "Headline"
 msgstr "_హ్యాండిల్:"
@@ -6092,15 +6178,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "సంభాషణను క్లోజ్ చేయుము "
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "పేరు లేదు"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -6114,6 +6195,9 @@ msgstr "వైట్ బోర్డ్ కు %s సందేశాన్ని
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "ఈ కథకు smileys లభించుటలేదు."
@@ -6122,6 +6206,14 @@ msgstr "ఈ కథకు smileys లభించుటలేదు."
 msgid "Please try another username:"
 msgstr "%s కోసం ఒక కొత్త పేరును దయచేసి నమోదుచేయండి"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "పేరు లేదు"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6314,10 +6406,6 @@ msgid "Master archive is misconfigured"
 msgstr "మాస్టర్ ఆర్కైవ్ మిస్‌కన్ఫిగర్ అయినది. "
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "తప్పుడు స్క్రీన్ పేరు లేక పాస్‌వర్డ్ "
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "మీరు ఎంటర్‌చేసిన హోస్ట్ స్క్రీన్ పేరును (host) గుర్తించడం సాధ్యపడలేదు"
 
@@ -6360,9 +6448,9 @@ msgstr "వినియోగదారుడు ఆఫ్‌లైనులో�
 msgid "Unknown error: 0x%X"
 msgstr "తెలియని పొరపాటు: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "లాగిన్ విఫలమైనది (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "వినియోగదారు %s ను నిషేధించలేదు"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6471,9 +6559,6 @@ msgstr "గ్రూప్‌వైజ్ సమావేశం %d"
 msgid "Authenticating..."
 msgstr "ప్రమాణీకరణ జరుగుతోంది ... "
 
-msgid "Unable to connect to server."
-msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
-
 msgid "Waiting for response..."
 msgstr "జవాబు కోసం ప్రతీక్ష ... "
 
@@ -6499,9 +6584,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "మీరు సంభాషణలో పాల్గొనదల్చుకున్నారా?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "మీరు మరో వర్క్‌స్టేషన్‌లో లాగ్ చేసినారు గాన మిమ్మల్ని లగ్‌ ఔట్ చేయడమైనది."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6510,16 +6592,13 @@ msgstr "%s ఆఫ్‌లైన్‌లో ఉన్నట్లున్న�
 # TODO: Would be nice to prompt if not set!
 # *  Pidgin_request_fields(gc, _("Server Address"),...);
 # ...but for now just error out with a nice message.
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "సర్వర్‌కు కనెక్ట్ చేయడం సాధ్యం కాదు. మీరు కనెక్ట్ చేయదల్చుకున్న సెర్వర్ అడ్రసును ఎంటర్ చేయండి. "
 
-msgid "Error. SSL support is not installed."
-msgstr "పొరపాటు. SSL సపోర్ట్ ఇన్‌స్టాల్ కాలేదు. "
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ఈ సమావేశం ముగిసింది. ఇంకా సందేశాలు పంపడం సాధ్యం కాదు."
 
@@ -6553,6 +6632,25 @@ msgid "Server port"
 msgstr "సెర్వర్ పోర్ట్ "
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "సర్వర్ నుంచి ఊహించని HTTP ప్రతిస్పందన అందింది."
+
+#. username connecting too frequently
+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 ""
+"మీరు తరచుగా కనెక్ట్ చేస్తున్నారు, డిస్‌కనెక్ట్ చేస్తున్నారు. పది నిమిషాలు ఆగి మరల ప్రయత్నించండి. మీరు "
+"ప్రయత్నాన్ని కొనసాగిస్తే, మీరు ఇంకా ఎక్కువ కాలం ఆగవలసియుంటుంది."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "కనెక్షన్ ఏర్పాటులో పొరపాటు"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "కనెక్ట్ చేయడం సాధ్యంమగుట లేదు. "
 
@@ -6560,18 +6658,8 @@ msgstr "కనెక్ట్ చేయడం సాధ్యంమగుట ల
 msgid "Invalid chat room name"
 msgstr "చెల్లని రూమ్ పేరు"
 
-msgid "Server closed the connection."
-msgstr "సర్వర్ కనెక్షన్ ను ముగించింది."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"సర్వర్ తో కనెక్షన్ పోయింది:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "సర్వర్ తో కనెక్షన్ పై చెల్లని డాటా అందింది."
 
 # *< type
@@ -6636,7 +6724,8 @@ msgstr "దూరంలోనున్న వినియోగదారు: <br
 msgid "Received invalid data on connection with remote user."
 msgstr "దూరంలోనున్న వినియోగదారుతో కనెక్షన్ లో ఉన్నప్పుడు చెల్లని డాటా అందింది."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "దూరంలోనున్న వినియోగదారుతో కనెక్షన్ ఏర్పడలేదు."
 
 msgid "Direct IM established"
@@ -6813,25 +6902,20 @@ msgstr "కెమేరా "
 msgid "Screen Sharing"
 msgstr "స్క్రీన్ పేరు "
 
-#, c-format
 msgid "Free For Chat"
 msgstr "సంభాషించడానికి సమయం ఉంది"
 
-#, c-format
 msgid "Not Available"
 msgstr "లభించదు"
 
-#, c-format
 msgid "Occupied"
 msgstr "స్వాధీనం చేసుకొన్న"
 
-#, c-format
 msgid "Web Aware"
 msgstr "వెబ్ అవగతం "
 
 # * Without this selecting Invisible as own status doesn't
 # * work. It's not used and not needed to show status of buddies.
-#, c-format
 msgid "Invisible"
 msgstr "అదృశ్య "
 
@@ -6844,21 +6928,15 @@ msgstr "వార్నింగ్ లెవల్"
 msgid "Buddy Comment"
 msgstr "మిత్రుని వ్యాఖ్య "
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "ప్రామాణిక సర్వర్ :\n"
 " కు కనెక్ట్ చేయలేకపోయింది %s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS సర్వర్ :\n"
-" కు కనెక్ట్ చేయలేకపోయింది %s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
 
 #, fuzzy
 msgid "Username sent"
@@ -6874,24 +6952,36 @@ msgstr "కనెక్షన్‌ను ఫైనలైజేషన్ జర�
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "లాగిన్ చేయుట సాధ్యపడదు: మీరు %s సంతకం చేయలేరు. ఎందుకంటే స్క్రీన్‌పేరు పనికిరాదు. స్క్రీన్‌పేరు "
 "అక్షరంతోనే ప్రారంభించాలి. పేరులో అక్షరాలు, అంకెలు, స్పేసులు లేదా కేవలం అంకెలుమాత్రం ఉండవచ్చును. "
 
-#. Unregistered screen name
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "మీరు త్వరలో డిస్కనెక్ట్ కాబోతున్నారు.  అప్ డేట్లకోసం %s చూడండి."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "చెల్లుబాటయ్యే AIM లాగ్ ఇన్  హాష్‌ను పొందడంలో వైఫల్యం. "
+
+msgid "Unable to get a valid login hash."
+msgstr "చెల్లుబాటయ్యే లాగ్ ఇన్  హాష్‌ను పొందడంలో వైఫల్యం. "
+
+msgid "Received authorization"
+msgstr "ప్రమాణీకరణ లభించింది"
+
+#. Unregistered username
 #. uid is not exist
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "చెల్లుబాటు కాని పేరు. "
-
-msgid "Incorrect password."
-msgstr "తప్పు పాస్‌వర్డ్."
+msgid "Username does not exist"
+msgstr "వినియోగదారు అస్తిత్వంలో లేరు"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "ప్రస్తుతానికి మీ అకౌంట్ సస్పెండ్ చేయబడింది. "
 
 # service temporarily unavailable
@@ -6899,26 +6989,21 @@ msgstr "ప్రస్తుతానికి మీ అకౌంట్ సస
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL సత్వర మెసెంజర్ సర్వీస్ తాత్కాలికంగా అలభ్యం. "
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "మీకు వాడుతున్న ఖాతాదారుని వెర్షన్ చాలా పాతది. దయచేసి  %s వద్ద అప్‌గ్రేడ్ చేయండి."
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "మీరు తరచుగా కనెక్ట్ చేస్తున్నారు, డిస్‌కనెక్ట్ చేస్తున్నారు. పది నిమిషాలు ఆగి మరల ప్రయత్నించండి. మీరు "
 "ప్రయత్నాన్ని కొనసాగిస్తే, మీరు ఇంకా ఎక్కువ కాలం ఆగవలసియుంటుంది."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "మీకు వాడుతున్న ఖాతాదారుని వెర్షన్ చాలా పాతది. దయచేసి  %s వద్ద అప్‌గ్రేడ్ చేయండి."
-
-msgid "Could Not Connect"
-msgstr "కనెక్ట్ చేయుట సాధ్యం కాదు"
-
-msgid "Received authorization"
-msgstr "ప్రమాణీకరణ లభించింది"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "ఎంటర్ చేసిన SecurID పనికిరాదు."
 
 msgid "Enter SecurID"
@@ -6933,24 +7018,6 @@ msgstr "డిజిటల్ ప్రదర్శననుండి 6 అం�
 msgid "_OK"
 msgstr "_సరే"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"త్వరలో మీరు డిస్‌కనెక్ట్ చేయబడవచ్చు. ఇది ఫిక్స్ అయేంతవరకు మీరు TOC ని వాడాలని అనుకోవచ్చు. అప్‌డేట్స్ కోసం "
-"%s చెక్ చేయండి. "
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "చెల్లుబాటయ్యే AIM లాగ్ ఇన్  హాష్‌ను పొందడంలో వైఫల్యం. "
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "మీరు త్వరలో డిస్కనెక్ట్ కాబోతున్నారు.  అప్ డేట్లకోసం %s చూడండి."
-
-msgid "Unable to get a valid login hash."
-msgstr "చెల్లుబాటయ్యే లాగ్ ఇన్  హాష్‌ను పొందడంలో వైఫల్యం. "
-
 msgid "Password sent"
 msgstr "పాస్‌వర్డ్ పంపబడింది"
 
@@ -7085,7 +7152,7 @@ msgstr[1] ""
 # msgstr[0] "అజ్ఞాత కారణములచేత మీరు %hu సందేశాలను %s నుండి  కోల్పోయినారు. "
 # msgstr[1] "आपको अज्ञात कारनों से साइन-ऑफ करा गया है।"
 # Data is assumed to be the destination sn
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "సందేశం పంపడం సాధ్యంకాదు: %s"
@@ -7110,6 +7177,12 @@ msgstr "నుండి ఆన్‌లైన్. "
 msgid "Member Since"
 msgstr "నుండి సభ్యుడు."
 
+msgid "Capabilities"
+msgstr "యోగ్యతలు "
+
+msgid "Profile"
+msgstr "ప్రొఫైల్ "
+
 msgid "Your AIM connection may be lost."
 msgstr "మీరు AIM కనెక్షన్ కోల్పోవచ్చు."
 
@@ -7280,7 +7353,7 @@ msgstr "దూరంగా ఉన్న సందేశం చాలా పొ�
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7307,9 +7380,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "అనాథలు "
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "మీ మిత్రుల లిస్టులో ఇప్పటికే చాలామంది ఉన్నందువల్ల ఈ మిత్రుని %s చేర్చడం సాధ్యంకాదు. ఒక పేరును తొలగించి "
@@ -7318,9 +7391,9 @@ msgstr ""
 msgid "(no name)"
 msgstr "(పేరు లేదు)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "అజ్ఞాత కారణంవల్ల మీ కమాండ్ విఫలమైనది."
 
 # msgstr "అజ్ఞాత కారణంవల్ల మీ కమాండ్ విఫలమైనది."
 #, fuzzy, c-format
@@ -7389,6 +7462,7 @@ msgstr "C_onnect"
 msgid "Get AIM Info"
 msgstr "AIM సమాచారాన్ని పొందండి"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "మిత్రుని వ్యాఖ్యను ఎడిట్ చేయండి. "
 
@@ -7451,6 +7525,7 @@ msgstr "అన్వేషణ "
 msgid "Set User Info (web)..."
 msgstr "వినియోగదారుని సమాచారం (URL) ..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "పాస్‌వర్డ్‌ను మార్చండి (URL)"
@@ -7484,6 +7559,10 @@ msgid "Search for Buddy by Information"
 msgstr "సమాచారం ద్వారా మిత్రాన్వేషణ "
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "వినియోగదారు లాగ్‌ఇన్ చేయలేదు"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7503,7 +7582,6 @@ msgstr "%s ను %s వద్ద కనెక్ట్ చేయడానిక
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s:%hu కు కనెక్ట్ చేసేందుకు ప్రయత్నిస్తోంది."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "ప్రాక్సీ సర్వర్ ద్వారా కనెక్ట్ అవడానికి ప్రయత్నిస్తోంది."
 
@@ -7604,7 +7682,7 @@ msgstr "ఇతరములు"
 msgid "Visible"
 msgstr "అదృశ్య "
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7698,16 +7776,49 @@ msgstr "చివరి అప్‌డేట్ "
 msgid "Could not change buddy information."
 msgstr "మిత్రుని వివరాలను దయచేసి నమోదుచేయండి."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "మొబైల్"
+
+msgid "Note"
+msgstr "నోట్ "
+
+# Label
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "మిత్రుని ఐకన్ "
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "మిత్రుని చేర్చుము "
+msgid "_Modify"
+msgstr "సవరించు"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Memo Modify"
+msgstr "సవరించు"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "సర్వర్‌ ఖాళీగా లేదు"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "సాధికారిత అవసరం "
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "మీ జాబితాలో మిత్రుని చేర్చమంటారా?"
+
+#, fuzzy
+msgid "Enter answer here"
 msgstr "ఇక్కడ ఇన్ పుట్ కోసం అభ్యర్థించు"
 
 msgid "Send"
@@ -7721,18 +7832,19 @@ msgid "Authorization denied message:"
 msgstr "సందేశాన్ని  నిరాకరించిన ఆథరైజేషన్:"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "క్షమించండి, మీరు నా తరహా కాదు..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "ప్రమాణీకరణకు వినియోగదారుకు %d అవసరం"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "మీ జాబితాలో మిత్రుని చేర్చమంటారా?"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "ఇక్కడ ఇన్ పుట్ కోసం అభ్యర్థించు"
 
 msgid "Would you be my friend?"
@@ -7756,7 +7868,7 @@ msgid "Failed sending authorize"
 msgstr "దయచేసి నన్ను ఆథరైజ్ చేయండి!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "సంభాషణలో మిత్రుని చేర్చడానికి వైఫల్యం. "
 
 #, fuzzy, c-format
@@ -7801,6 +7913,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr "మీరు శాశ్వత QQ గ్రూపుల కోసం మాత్రమే అన్వేషించగలరు\n"
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "చెల్లని ప్రాక్సీ సెట్టింగులు "
+
+#, fuzzy
 msgid "Not member"
 msgstr "నేను సభ్యుణ్నికాను"
 
@@ -7843,16 +7959,19 @@ msgstr "ఇతరులు చేరడానికి ఈ గ్రూపు �
 msgid "Join QQ Qun"
 msgstr "సంభాషణలో పాల్గొనండి."
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "ఇక్కడ ఇన్ పుట్ కోసం అభ్యర్థించు"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "మీరు  విజయవంతంగా Qunను సృష్టించగలిగారు"
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "మీరు  విజయవంతంగా Qunను సృష్టించగలిగారు"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7862,7 +7981,7 @@ msgstr "QQ Qun చర్య"
 msgid "Failed:"
 msgstr "విఫలమైనది "
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7875,11 +7994,11 @@ msgid ""
 msgstr "గమనిక, మీరు దీన్ని సృష్టించిన వ్యక్తి అయితే ఈ చర్య ఈ Qun ని ముందుగానే తొలగిస్తుంది."
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "క్షమించండి, మీరు నా తరహా కాదు..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "ఫోన్ నంబరు"
 
 #, fuzzy
@@ -7890,35 +8009,35 @@ msgid "You have successfully created a Qun"
 msgstr "మీరు  విజయవంతంగా Qunను సృష్టించగలిగారు"
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "మీరు Qun వివరాలను ఇప్పుడు సెట్ చేయదలచుకున్నారా?"
 
 msgid "Setup"
 msgstr "సెట్ అప్"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "గ్రూపు%d లో చేరడానికి వినియోగదారు %d దరఖాస్తు చేశారు"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "గ్రూపు%d లో చేరడానికి వినియోగదారు %d దరఖాస్తు చేశారు"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "సంభాషణలో మిత్రుని చేర్చడానికి వైఫల్యం. "
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "మిత్రుని తొలగించండి."
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "మిత్రుని తొలగించండి."
 
 #, c-format
 msgid "Unknown-%d"
@@ -8035,6 +8154,13 @@ msgstr "<b>చివరిసారిగా రీ ఫ్రెష్ చేస
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>ప్రస్తుత ఆన్ లైన్</b>: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>చివరిసారిగా రీ ఫ్రెష్ చేసినప్పుడు</b>: %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -8042,7 +8168,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "సుమారు %s"
 
 #, fuzzy
@@ -8064,6 +8190,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "సుమారు %s"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "ఇంటి అడ్రస్ "
+
 # *< type
 # *< ui_requirement
 # *< flags
@@ -8104,7 +8234,6 @@ msgid "QQ2008"
 msgstr ""
 
 # connect to the server
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "కనెక్ట్ చేస్తున్నది"
@@ -8117,6 +8246,9 @@ msgstr "సెర్వర్ పోర్ట్ "
 msgid "Show server news"
 msgstr "సెర్వర్ అడ్రసు "
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "రీడ్ చేయడంలో పొరపాటు"
@@ -8126,11 +8258,7 @@ msgid "Update interval (seconds)"
 msgstr "రీడ్ చేయడంలో పొరపాటు"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
 
 #, c-format
@@ -8153,21 +8281,19 @@ msgid "Activation required"
 msgstr "నమోదు అవసరం"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "రీడ్ చేయడంలో పొరపాటు"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "అభ్యర్థనా డైలాగ్"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "యూహూ! ప్రమాణీకరణ వైఫల్యం."
 
 #, fuzzy
 msgid "Captcha Image"
@@ -8177,7 +8303,7 @@ msgstr "సచిత్రమును సేవ్ చేయుము."
 msgid "Enter code"
 msgstr "పాస్ వర్డ్ ను ఎంటర్ చేయండి"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -8185,68 +8311,43 @@ msgid "Enter the text from the image"
 msgstr "గ్రూపు పేరును నమోదుచేయండి"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-# we didn't successfully connect. tdt->toc_fd is valid here
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "కనెక్ట్ చేయడంలో అసమర్థత. "
-
 msgid "Socket error"
 msgstr "సాకెట్ లో లోపం"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"సర్వర్ తో కనెక్షన్ పోయింది:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "సాకెట్‌ నుంచి రీడ్ చేయడం   సాధ్యం కావడం లేదు "
-
-msgid "Write Error"
-msgstr "రైట్ చేయడంలో పొరపాటు"
-
-# msgstr "%sను ట్రాన్స్‌ఫర్ చేయడాన్ని %s రద్దు చేశారు."
-msgid "Connection lost"
-msgstr "కనెక్షన్ పోయింది"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "వినియోగదారు సమాచారాన్ని సెట్ చేయండి ..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "అభ్యర్థన నిరాకరించబడింది."
 
-msgid "Couldn't resolve host"
-msgstr "హోస్ట్ ను నిశ్చయించలేకపోయాం"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "విలువలేని పొరపాటు "
 
-# Account options
+# Progress
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "సర్వర్‌ను కనెక్ట్ చేయండి"
+msgid "Connecting to server"
+msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేయుచున్నది. "
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "QQidలో లోపం"
 
-msgid "Failed to send IM."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8256,6 +8357,10 @@ msgid ""
 msgstr "ICQ సర్వర్ రిలే "
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "నుంచి "
 
@@ -8265,38 +8370,39 @@ msgid ""
 "%s"
 msgstr "సర్వర్ నిర్దేశాలు: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "కారణం తెలియదు. "
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "కమాండ్ "
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "కారణం తెలియదు. "
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "కారణం తెలియదు. "
 
 #, c-format
@@ -8310,9 +8416,6 @@ msgstr "ఫైలును పంపడంజరిగింది"
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr "కనెక్షన్ ముగిసింది (రైటింగ్)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>గ్రూపు శీర్షిక:</b> %s<br>"
@@ -8366,17 +8469,6 @@ msgstr "అదే సమయపు అడ్మిని స్ట్రేటర
 msgid "Sametime Administrator Announcement"
 msgstr "అదే సమయపు అడ్మిని స్ట్రేటర్ ప్రకటన "
 
-msgid "Connection reset"
-msgstr "కనెక్షన్ రీ సెట్ అయింది"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "సాకెట్ : %s నుంచి రీడింగ్ లో లోపం"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "హోస్ట్ కు కనెక్ట్‌ చేయలేని స్థితి "
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%sనుంచి ప్రకటన"
@@ -8400,6 +8492,9 @@ msgstr "స్పీకర్లు"
 msgid "Video Camera"
 msgstr "వీడియో కెమెరా"
 
+msgid "File Transfer"
+msgstr "ఫైల్‌ బదిలీ"
+
 msgid "Supports"
 msgstr "సపోర్టులు"
 
@@ -9129,9 +9224,6 @@ msgstr "సంస్థ "
 msgid "Unit"
 msgstr "యూనిట్ "
 
-msgid "Note"
-msgstr "నోట్ "
-
 msgid "Join Chat"
 msgstr "సంభాషణలో పాల్గొనండి."
 
@@ -9233,6 +9325,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "నెట్‌వర్క్ స్టాటిస్టిక్స్ "
 
+msgid "Ping"
+msgstr "పింగ్ "
+
 msgid "Ping failed"
 msgstr "పింగ్ వైఫల్యం "
 
@@ -9294,7 +9389,8 @@ msgstr "సపోర్టు పొందని పబ్లిక్ కీ �
 msgid "Disconnected by server"
 msgstr "సెర్వర్‌నుండి వేరైనది."
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేస్తుండగా పొరపాటు. "
 
 msgid "Key Exchange failed"
@@ -9305,17 +9401,11 @@ msgid ""
 msgstr ""
 "వేరుపడిన సెషన్‌ను పునఃప్రారంభించడంలో వైఫల్యం. కొత్త కనెక్షన్‌ను సృష్టించడానికి Reconnectను నొక్కండి."
 
-msgid "Connection failed"
-msgstr "కనెక్షన్ వైఫల్యం "
-
 msgid "Performing key exchange"
 msgstr "కీ ఎక్స్‌చేంజీని నెరవేర్చుతున్నది."
 
-msgid "Unable to create connection"
-msgstr " కనెక్షన్ ఏర్పరచలేని స్థితి "
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలేదు"
 
 # Progress
@@ -9323,10 +9413,15 @@ msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలే�
 msgid "Connecting to SILC Server"
 msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేయుచున్నది. "
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలేదు"
+
 msgid "Out of memory"
 msgstr "మెమొరీ లేదు. "
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC ప్రోటోకాల్ ను ప్రారంభించజాలదు"
 
 #, fuzzy
@@ -9632,7 +9727,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILC కీ జంటను సృష్టించండి ..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "SILC కీ జంటను సృష్టించండి ..."
 
 # Hint for translators: Please check the tabulator width here and in
@@ -9729,6 +9824,9 @@ msgstr "వైట్ బోర్డ్"
 msgid "No server statistics available"
 msgstr "సెర్వర్ స్టాటిస్టిక్స్ లభ్యమగుటలేదు."
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేస్తుండగా పొరపాటు. "
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "వైఫల్యం: వెర్షన్ మిస్‌మాచ్, మీ ఖాతాదారుని అప్‌గ్రేడ్ చేయండి."
@@ -9769,39 +9867,39 @@ msgstr "వైఫల్యం: పనికిరాని కుకీ "
 msgid "Failure: Authentication failed"
 msgstr "వైఫల్యం: ప్రమాణీకరణ వైఫల్యం "
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC ఖాతాదారుల కనెక్షన్ ప్రారంభించడం సాధ్యం కాదు."
 
 msgid "John Noname"
 msgstr "జాన్ నోనేమ్"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలేదు"
 
-msgid "Could not write"
-msgstr "రాయలేక పోతున్నాం"
-
-msgid "Could not connect"
-msgstr "కనెక్ట్ చేయడం సాధ్యంమగుట లేదు. "
+msgid "Unable to create connection"
+msgstr " కనెక్షన్ ఏర్పరచలేని స్థితి "
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "అజ్ఞాత తప్పు."
 
-msgid "Could not create listen socket"
-msgstr "వినదగిన సాకెట్ ను సృష్టించలేకపోతున్నాం"
-
-msgid "Could not resolve hostname"
-msgstr "హోస్ట్ పేరును నిశ్చయించలేకపోతున్నాం"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "సాకెట్‌ను సృష్టించలేదు"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP స్క్రీన్ పేరులో ఖాళీలు లేదా @ గుర్తు ఉండకూడదు"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "సెర్వర్ పోర్ట్ "
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9835,175 +9933,73 @@ msgstr "ప్రమాణీకరణ పొందిన వినియోగ�
 msgid "Auth Domain"
 msgstr "ప్రమాణీకరణ పొందిన డొమైన్"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s కోసం చూస్తున్నది "
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s కు కనెక్షన్ వైఫల్యం"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "సైన్-ఆన్: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "%s ఫైలును రైట్ చేయలేకపోతోంది."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "%s ఫైలును రీడ్ చేయలేకపోతోంది."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "సందేశం చాలా పొడవుగా ఉంది, చివరి %s బైట్స్ కుదించబడ్డాయి. "
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s ప్రస్తుతం లాగ్ ఇన్ కాలేదు."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s చేసిన హెచ్చరికకు అనుమతిలేదు."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "ఒక సందేశాన్ని వదిలివేయడమైనది. మీ సర్వర్ వేగపరిమితిని దాటింది."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s లో సంభాషణ లభ్యం కాలేదు. "
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "మీరు %s కి సందేశములను వేగంగా పంపిస్తున్నారు."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "మీరు  ఒక  IMను %s నుంచి మిస్ అయినారు, ఎందుకంటే అది చాలా పెద్దది. "
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "మీరు  ఒక  IMను %s నుంచి మిస్ అయినారు, ఎందుకంటే అది అతివేగంతో పంపబడింది."
-
-#, c-format
-msgid "Failure."
-msgstr "వైఫల్యం."
-
-#, c-format
-msgid "Too many matches."
-msgstr "సరిపోలేవి అనేకం ఉన్నాయి."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "మరిన్ని క్వాలిఫైయర్స్ కావాలి."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "డైరెక్టరీ సేవ తాత్కాలికంగా అందుబాటులో లేదు."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "ఇ-మెయిల్‌ను చూడటంపై ఆంక్షలు."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "కీవర్డ్ విస్మరించబడింది."
-
-#, c-format
-msgid "No keywords."
-msgstr "కీవర్డ్స్ లేవు. "
-
-#, c-format
-msgid "User has no directory information."
-msgstr "వినియోగాదారునికి డైరెక్టరీ సమాచారం లేదు. "
-
-#, c-format
-msgid "Country not supported."
-msgstr "దేశానికి సపోర్టు లేదు. "
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "తెలియని వైఫల్యం: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "స్క్రీన్ పేరు లేదా  పాస్‌వర్డ్ తప్పు. "
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "సర్వీస్ తాత్కాలికంగా అందుబాటులే లేదు. "
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "లాగిన్ చేయడానికి మీ వార్నింగ్ లెవల్ చాలా ఎక్కువగా ఉంది. "
-
-#, c-format
-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 ""
-"మీరు చాలా తరచుగా కనెక్ట్ చేస్తున్నారు, డిస్‌కనెక్ట్ చేస్తున్నారు. పది నిమిషాలు వేచి చూసి మరల ప్రయత్నించండి. "
-"మీరు ఇలాగే ప్రయత్నిస్తుంటే ఇంకా ఎక్కువ సమయం నిరీక్షించాల్సివస్తుంది. "
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "అజ్ఞాత సైనాన్ పొరపాటు సంభవించింది: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "అజ్ఞాత పొరపాటు, %d , సంభవించింది. సమాచారం: %s"
-
-msgid "Invalid Groupname"
-msgstr "చెల్లుబాటుకాని గ్రూప్ పేరు"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;గది&gt;:  యాహు నెట్‌వర్క్‌లో సంభాషణ గదిలో చేరుదాం."
 
-msgid "Connection Closed"
-msgstr "కనెక్షన్ ముగిసింది"
+msgid "list: List rooms on the Yahoo network"
+msgstr "జాబితా: యాహూ నెట్ వర్క్ లోనున్న రూమ్ ల జాబితా"
 
-msgid "Waiting for reply..."
-msgstr "సమాధానం కోసం ప్రతీక్ష ... "
+msgid "doodle: Request user to start a Doodle session"
+msgstr "డూడుల్: డూడుల్  సెషన్ ప్రారంభించవలసిందిగా వినియోగదారును అభ్యర్థించు"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "ఆగిన TOC మరల వెనక్కు వచ్చినది. మీరు మళ్ళీ సందేశాలను పంపవచ్చును."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "యాహూ! ID"
 
-msgid "Password Change Successful"
-msgstr "విజయవంతంగా పాస్‌వర్డ్‌ మార్పు"
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+# *  description
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
 
-msgid "_Group:"
-msgstr "_గ్రూప్:"
+msgid "Pager server"
+msgstr "పేజర్ సర్వర్"
 
-msgid "Get Dir Info"
-msgstr "డైరెక్టరీ సమాచారాన్ని పొందండి"
+msgid "Pager port"
+msgstr "పేజర్ పోర్ట్ "
 
-msgid "Set Dir Info"
-msgstr "డైరెక్టరీ సమాచారాన్ని సెట్ చేయండి. "
+msgid "File transfer server"
+msgstr "ఫైల్ బదిలీ సర్వర్"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "వ్రాయడానికి %s ను ఓపెన్ చేయలేదు"
+msgid "File transfer port"
+msgstr "ఫైల్ ట్రాన్స్‌ఫర్ పోర్ట్"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "ఫైల్ ట్రాన్స్‌ఫర్ వైఫల్యం; బహుశా రెండవవైపు రద్దయి ఉంటుంది. "
+msgid "Chat room locale"
+msgstr "చాట్ రూమ్ ప్రదేశం "
 
-msgid "Could not connect for transfer."
-msgstr "ట్రాన్స్‌ఫర్ కోసం కనెక్ట్ చేయడం సాధ్యం కాలేదు. "
+msgid "Ignore conference and chatroom invitations"
+msgstr "చాట్ రూమ్ మరియు గోష్టులను పట్టించుకోవద్దు"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "ఫైల్ శీర్షికను వ్రాయడం సాధ్యం కాలేదు. ఫైల్‌ ట్రాన్స్‌ఫర్ చేయబడదు."
+msgid "Chat room list URL"
+msgstr "చాట్ రూమ్ జాబితా Url"
 
-msgid "Save As..."
-msgstr "ఇలా సేవ్ చేయండి..."
+msgid "Yahoo Chat server"
+msgstr "యాహూ చాట్ సర్వర్"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s అభ్యర్థనలు %s ఆమోదించుటకు %d files: %s (%.2f %s)%s%s"
-msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "యాహూ చాట్ పోర్ట్"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "ఫైల్ పంపవలసిందిగా %s మిమ్మల్ని అభ్యర్థిస్తున్నారు."
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "యాహూ! ID"
 
 # *< type
 # *< ui_requirement
@@ -10025,11 +10021,11 @@ msgstr "ఫైల్ పంపవలసిందిగా %s మిమ్మల�
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC ప్రొటోకాల్ ప్లగ్ ఇన్"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -10052,6 +10048,30 @@ msgstr "తమను మీ లిస్టులో చేర్చడాని
 msgid "Add buddy rejected"
 msgstr "మిత్రుణ్ని చేర్చుకోవడానికి నిరాకరణ"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "సర్వర్ తో కనెక్షన్ పై చెల్లని డాటా అందింది."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "అజ్ఞాత పొరపాటు సంఖ్య %d. యాహూ! లోకి లాగ్-ఇన్ అవుతోంది. దీనిని వెబ్‌సైట్ సరిచేయవచ్చు."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "అజ్ఞాత పొరపాటు సంఖ్య %d. యాహూ! లోకి లాగ్-ఇన్ అవుతోంది. దీనిని వెబ్‌సైట్ సరిచేయవచ్చు."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "తప్పుడు స్క్రీన్ పేరు లేక పాస్‌వర్డ్ "
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10082,37 +10102,33 @@ msgstr "మీ అకౌంట్ లాక్ అయినది. దయచే�
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "అజ్ఞాత పొరపాటు సంఖ్య %d. యాహూ! లోకి లాగ్-ఇన్ అవుతోంది. దీనిని వెబ్‌సైట్ సరిచేయవచ్చు."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "%s అకౌంట్ లోని సర్వర్ జాబితాకు %s మిత్రుణ్ని %s గ్రూపునకు చేర్చలేకపోయింది."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "సర్వర్ జాబితాకు మిత్రుణ్ని చేర్చడం సాధ్యంకాలేదు. "
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ వినదగిన %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "సర్వర్ నుంచి ఊహించని HTTP ప్రతిస్పందన అందింది."
 
-msgid "Connection problem"
-msgstr "కనెక్షన్ సమస్య"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
-
-# msgstr ""
-# "సర్వర్ తో కనెక్షన్ పోయింది:\n"
-# "%s"
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
+"సర్వర్ తో కనెక్షన్ పోయింది:\n"
 "%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
+"సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
+"%s"
 
 # msgstr ""
 # "సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
@@ -10162,9 +10178,8 @@ msgstr "ఉన్నారో లేదో తెలిపే సెట్టి
 msgid "Start Doodling"
 msgstr "డూడ్లింగ్ ప్రారంభించు"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "ఏ IDని యాక్టివ్ చేయాలి?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 #, fuzzy
 msgid "Join whom in chat?"
@@ -10180,84 +10195,16 @@ msgstr "వినియోగదారుతో చాట్ లో చేరం
 msgid "Open Inbox"
 msgstr "హాట్ మెయిల్ ఇన్ బాక్స్ ను తెరవండి."
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;గది&gt;:  యాహు నెట్‌వర్క్‌లో సంభాషణ గదిలో చేరుదాం."
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "జాబితా: యాహూ నెట్ వర్క్ లోనున్న రూమ్ ల జాబితా"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "డూడుల్: డూడుల్  సెషన్ ప్రారంభించవలసిందిగా వినియోగదారును అభ్యర్థించు"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "యాహూ! ID"
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
-# *  summary
-# *  description
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
-
-msgid "Yahoo Japan"
-msgstr "యూహూ జపాన్ "
-
-msgid "Pager server"
-msgstr "పేజర్ సర్వర్"
-
-msgid "Japan Pager server"
-msgstr "జపాన్ పేజర్ సర్వర్"
-
-msgid "Pager port"
-msgstr "పేజర్ పోర్ట్ "
-
-msgid "File transfer server"
-msgstr "ఫైల్ బదిలీ సర్వర్"
-
-msgid "Japan file transfer server"
-msgstr "జపాన్ ఫైల్ బదిలీ సర్వర్"
-
-msgid "File transfer port"
-msgstr "ఫైల్ ట్రాన్స్‌ఫర్ పోర్ట్"
-
-msgid "Chat room locale"
-msgstr "చాట్ రూమ్ ప్రదేశం "
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "చాట్ రూమ్ మరియు గోష్టులను పట్టించుకోవద్దు"
-
-msgid "Chat room list URL"
-msgstr "చాట్ రూమ్ జాబితా Url"
-
-msgid "Yahoo Chat server"
-msgstr "యాహూ చాట్ సర్వర్"
-
-msgid "Yahoo Chat port"
-msgstr "యాహూ చాట్ పోర్ట్"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "డూడుల్ కోసం అభ్యర్థనను పంపించు."
 
+# we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "కనెక్ట్ చేయడంలో అసమర్థత. "
+
 msgid "Unable to establish file descriptor."
 msgstr "ఫైల్ డెస్క్రిప్టర్‌ను స్థాపించడంలో అసమర్థత."
 
@@ -10265,6 +10212,9 @@ msgstr "ఫైల్ డెస్క్రిప్టర్‌ను స్థ�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr " %s కు %s  ఫైల్ పంపదలుచుకున్నారు "
 
+msgid "Write Error"
+msgstr "రైట్ చేయడంలో పొరపాటు"
+
 msgid "Yahoo! Japan Profile"
 msgstr "యూహూ జపాన్ ప్రొఫైల్ "
 
@@ -10305,13 +10255,9 @@ msgstr "కూల్ లింక్ 3"
 msgid "Last Update"
 msgstr "చివరి అప్‌డేట్ "
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr " %s కు సంబంధించిన వినియోగదారుని సమాచారం అలభ్యం. "
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr "క్షమించండి, ఈ ప్రొఫైల్‌లో వాడిన భాషకు లేదా ఫార్మాట్ కు ఈ సమయంలో సపోర్టు లభించడం లేదు. "
 
 msgid ""
@@ -10384,23 +10330,19 @@ msgstr "ధ్వనులు "
 msgid "Webcams"
 msgstr "వెబ్ కెమేరాలు "
 
+msgid "Connection problem"
+msgstr "కనెక్షన్ సమస్య"
+
 msgid "Unable to fetch room list."
 msgstr "గది లిస్టును తీసుకురావడంలో వైఫల్యం. "
 
 msgid "User Rooms"
 msgstr "వినియోగదారుని గదులు "
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT సెర్వర్‌తో కనెక్షన్ సమస్య."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"సర్వర్ నుంచి కనెక్షన్ తెగిపోయింది \n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10533,15 +10475,9 @@ msgstr "అభిరుచి గల విషయం"
 msgid "Exposure"
 msgstr "చూపించుము."
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
 # msgstr "సాకెట్‌ను సృష్టించలేదు. "
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr " నుంచి స్పందనను విశ్లేషించలేక పోయింది HTTP ప్రాక్సి: %s\n"
 
 #, c-format
@@ -10550,17 +10486,14 @@ msgstr "ప్రాక్సీ కనెక్షన్ పొరపాటు
 
 # XXX: why in the hell are we calling Pidgin_connection_error() here?
 # Forbidden
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "ప్రవేశం నిషేధం: ప్రాక్సీ సెర్వర్ port %d tunnelling వదిలేస్తోంది."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "%s నిశ్చయించడంలో పొరపాటు"
 
-msgid "Could not resolve host name"
-msgstr "హోస్ట్ పేరును నిశ్చయించలేకపోతున్నాం"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10671,9 +10604,6 @@ msgstr "అంతరాయము కలిగించవద్దు"
 msgid "Extended away"
 msgstr "దూరమైపోయినది"
 
-msgid "Mobile"
-msgstr "మొబైల్"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10717,17 +10647,6 @@ msgstr "%s సోమరితనం లేనివారైనారు."
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s చదవడంలో పొరపాటు"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"%sను చదువుతున్నప్పుడు పొరపాటు జరిగింది. అవి లోడ్ కాలేదు, మరియు  పాత ఫైలు పేరు %s~గా మార్చబడింది."
-
 msgid "Calculating..."
 msgstr "లెక్కిస్తూ..."
 
@@ -10839,6 +10758,17 @@ msgstr "కనెక్షన్ రీ సెట్ అయింది"
 msgid "Address already in use."
 msgstr "ఈ సంభాషణ పేరు ఇప్పటికే ఉపయోగంలో ఉంది"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s చదవడంలో పొరపాటు"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"%sను చదువుతున్నప్పుడు పొరపాటు జరిగింది. అవి లోడ్ కాలేదు, మరియు  పాత ఫైలు పేరు %s~గా మార్చబడింది."
+
 # msgstr "సర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
 msgid "Internet Messenger"
 msgstr "ఇంటర్నెట్ మెసెంజర్"
@@ -10889,11 +10819,8 @@ msgstr "కొత్త మెయిల్ నోటిఫికేషన్ల�
 msgid "Use this buddy _icon for this account:"
 msgstr "ఈ అకౌంటు కోసం ఈ మిత్రుని ఐకన్ ను ఉపయోగించండి:"
 
-# Build the protocol options frame.
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s ఆప్షన్స్"
+msgid "_Advanced"
+msgstr "_Advanced"
 
 # Use Global Proxy Settings
 msgid "Use GNOME Proxy Settings"
@@ -10935,9 +10862,6 @@ msgstr "మీరు పరిశీలనగా చూస్తే "
 msgid "you can see the butterflies mating"
 msgstr "మీరు సీతకోకచిలుకల కలయికను చూశారు."
 
-msgid "Proxy Options"
-msgstr "ప్రాక్సీ ఆప్షన్లు "
-
 msgid "Proxy _type:"
 msgstr "ప్రాక్సీ _టైప్:"
 
@@ -10967,8 +10891,9 @@ msgstr "_ప్రాథమిక"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_Advanced"
+#, fuzzy
+msgid "_Proxy"
+msgstr "ప్రాక్సీ"
 
 msgid "Enabled"
 msgstr "ఎనేబుల్"
@@ -11010,18 +10935,20 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "అవసరమైన ఫీల్డ్ లను దయచేసి అప్ డేట్ చేయండి."
 
+# And now for the buttons
+# Set up stuff for the account box
 #, fuzzy
-msgid "Room _List"
-msgstr "రూమ్ జాబితా"
+msgid "A_ccount"
+msgstr "అకౌంటు:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "మీరు జాయిన్ కాదల్చుకున్న సంభాషణగురించి సరైన సమాచారం ఎంటర్ చేయండి.\n"
 
-# And now for the buttons
-msgid "_Account:"
-msgstr "_ఖాతా:"
+#, fuzzy
+msgid "Room _List"
+msgstr "రూమ్ జాబితా"
 
 msgid "_Block"
 msgstr "నిలువరించుము "
@@ -11039,6 +10966,17 @@ msgid "I_M"
 msgstr "I_M"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "_సంభాషణ చేర్చు"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "వీడియో సంభాషణ"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "_ఫైలును పంపుము. "
 
@@ -11049,9 +10987,13 @@ msgstr "Buddy _Pounceను చేర్చండి."
 msgid "View _Log"
 msgstr "View _Log"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr ""
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "ఆఫ్ లైన్ లో ఉన్న మిత్రులను చూపించు"
+
 msgid "_Alias..."
 msgstr "_మారుపేరు ..."
 
@@ -11193,6 +11135,10 @@ msgstr "/ఉపకరణాలు/మిత్రుడు _హఠాత్త�
 msgid "/Tools/_Certificates"
 msgstr "/ఉపకరణాలు/ప్రెఫరెన్సెస్ "
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/ఉపకరణాలు/రహస్యము"
+
 msgid "/Tools/Plu_gins"
 msgstr "/టూల్స్/ప్లగ్_ఇన్ లు"
 
@@ -11202,10 +11148,6 @@ msgstr "/ఉపకరణాలు/ప్రెఫరెన్సెస్ "
 msgid "/Tools/Pr_ivacy"
 msgstr "/ఉపకరణాలు/రహస్యము"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/ఉపకరణాలు/రహస్యము"
-
 msgid "/Tools/_File Transfers"
 msgstr "/ఉపకరణాలు/_ఫైల్ ట్రాన్స్‌ఫర్లు "
 
@@ -11329,8 +11271,8 @@ msgstr "మాన్యువల్లీ"
 msgid "By status"
 msgstr "వస్తుస్థితి (స్టాటస్) చేత "
 
-msgid "By log size"
-msgstr "లాగ్ సైజ్ వలన "
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -11348,6 +11290,9 @@ msgstr ""
 msgid "Re-enable"
 msgstr "తిరిగి సాధ్యపడే అకౌంటు"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -11452,6 +11397,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "మారు పేరు:"
 
+msgid "_Group:"
+msgstr "_గ్రూప్:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11486,6 +11434,127 @@ msgstr "/ఉపకరణాలు "
 msgid "/Buddies/Sort Buddies"
 msgstr "/మిత్రులు/మిత్రులను వర్గీకరించు"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "నేపధ్య ఫాంట్ కలర్ "
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "మీ మిత్రుల జాబితాకు ఈ గ్రూపును చేర్చడం జరిగింది"
+
+#, fuzzy
+msgid "Layout"
+msgstr "సింహం"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "నేపధ్య ఫాంట్ కలర్ "
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expand"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "నేపధ్యపు రంగును సెలక్ట్ చేయుము."
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_కూలిపోవుట"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "నేపధ్యపు రంగును సెలక్ట్ చేయుము."
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+# Creating the options for the protocol
+#, fuzzy
+msgid "Contact Text"
+msgstr "పోర్ట్ "
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+# 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)
+#, fuzzy
+msgid "On-line Text"
+msgstr "ఆన్‌లైన్ "
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "దూరంగా "
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "ఆఫ్‌లైన్ "
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "రక్తం గ్రూపు"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "సందేశం పంపబడినది"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s కోసం వినియోగదారు సమాచారాన్ని  మార్చండి. "
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11508,13 +11577,6 @@ msgstr "ఆ మిత్రుని ఆహ్వానించగలిగే
 msgid "Invite Buddy Into Chat Room"
 msgstr "చాట్ గదిలోనికి మీ మిత్రుని ఆహ్వానించండి."
 
-# Put our happy label in it.
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "మీరు ఆహ్వానించదల్చుకున్న మిత్రుని పేరును ఆప్షనల్ ఆహ్వాన సందేశంతో పాటుగా ఎంటర్ చేయండి."
-
 msgid "_Buddy:"
 msgstr "_మిత్రుడు:"
 
@@ -11545,7 +11607,8 @@ msgstr "ఉపేక్ష "
 msgid "Get Away Message"
 msgstr "సందేశానికి దూరంగా"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "చివరిగా చెప్పినది"
 
 msgid "Unable to save icon file to disk."
@@ -11598,6 +11661,26 @@ msgid "/Conversation/Clea_r Scrollback"
 msgstr "/సంభాషణ/క్లియర్_ స్క్రోల్ బ్యాక్"
 
 # Conversations
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/సంభాషణ/_ఇంకా"
+
+# Conversations
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/సంభాషణ/_ఇంకా"
+
+# Conversations
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/సంభాషణ/_ఇంకా"
+
+# Conversations
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/సంభాషణ/_లాగ్‌ను చూడండి."
+
+# Conversations
 msgid "/Conversation/Se_nd File..."
 msgstr "/సంభాషణ/ఫైలును పంపుము..."
 
@@ -11689,6 +11772,21 @@ msgid "/Conversation/View Log"
 msgstr "/సంభాషణ/ వ్యూ లాగ్ "
 
 # Conversations
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/సంభాషణ/ఇంకా"
+
+# Conversations
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/సంభాషణ/ వ్యూ లాగ్ "
+
+# Conversations
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/సంభాషణ/ఇంకా"
+
+# Conversations
 msgid "/Conversation/Send File..."
 msgstr "/సంభాషణ/ఫైలును పంపుము..."
 
@@ -11887,6 +11985,9 @@ msgstr "ఆర్టిస్టులు"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "సపోర్ట్ "
 
@@ -12014,6 +12115,10 @@ msgstr "హిందీ "
 msgid "Hungarian"
 msgstr "హంగేరియన్"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "రొమేనియన్ "
+
 msgid "Indonesian"
 msgstr "ఇండోనేషియన్"
 
@@ -12029,6 +12134,10 @@ msgstr "జార్జియన్"
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
+#, fuzzy
+msgid "Khmer"
+msgstr "ఇతరములు"
+
 msgid "Kannada"
 msgstr "కన్నడ"
 
@@ -12051,6 +12160,10 @@ msgstr "లిథుయేనియన్ "
 msgid "Macedonian"
 msgstr "మాసెడోనియన్ "
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "మాసెడోనియన్ "
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål నార్వేజియన్"
 
@@ -12107,6 +12220,9 @@ msgstr "సామాజిక"
 msgid "Swedish"
 msgstr "స్వీడిష్ "
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "తమిళం"
 
@@ -12164,8 +12280,25 @@ msgstr ""
 "చేసిఉన్నారు.రూపకర్తల పూర్తిజాబితా కోసం 'COPYRIGHT' ఫైలును చూడండి. ఈ కార్యక్రమానికి మేము వారంటీ "
 "ఇవ్వడంలేదు. <BR><BR>"
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin irc.freenode.net पर<BR><BR>"
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin irc.freenode.net पर<BR><BR>"
 
 msgid "Current Developers"
@@ -12478,7 +12611,7 @@ msgid "Hyperlink visited color"
 msgstr "హైపర్‌లింక్ కలర్ "
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "మౌస్ హైపర్ లింక్ లపై ఉన్నప్పుడు వాటిని చిత్రించడానికి రంగు."
 
 msgid "Hyperlink prelight color"
@@ -12516,16 +12649,23 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 # ---------- "Notification Removals" ----------
 #, fuzzy
 msgid "Typing notification color"
 msgstr "సూచనను తీసివేయడం"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "కొత్త మెయిల్ నోటిఫికేషన్లు "
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12538,15 +12678,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "కొత్త మెయిల్ నోటిఫికేషన్లు "
 
-msgid "_Copy Email Address"
-msgstr "_ఇ-మెయిల్ అడ్రసును కాపీ చేయండి. "
-
-msgid "_Open Link in Browser"
-msgstr "_బ్రౌజర్‌లో లింక్‌ను ఓపెన్ చేయండి. "
-
-msgid "_Copy Link Location"
-msgstr "_లింక్ లొకేషన్‌ను కాపీ చేయండి. "
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12588,11 +12719,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "సచిత్రమును సేవ్ చేయుము."
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_సచిత్రమును సేవ్ చేయుము."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "కస్టమ్ స్మైలీలను చూపించు"
 
@@ -12682,10 +12812,6 @@ msgid "Font Face"
 msgstr "ఫాంట్ ఫేస్ "
 
 #, fuzzy
-msgid "Background Color"
-msgstr "నేపధ్య ఫాంట్ కలర్ "
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "ఉపరితల ఫాంట్ కలర్ "
 
@@ -12817,6 +12943,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12844,6 +12971,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12885,14 +13013,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "పేజింగ్ "
 
-msgid "Open All Messages"
-msgstr "అన్ని సందేశాలను తెరవండి"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "లెక్కిస్తూ..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">మీకు మెయిల్ వచ్చింది!</span>\n"
-"\n"
-"%s"
 
 # Descriptive label
 #, c-format
@@ -12924,6 +13065,37 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'మాన్యుయల్' బ్రౌజర్ కమాండ్‌ను ఎంచుకున్నారు, కాని కమాండ్‌ను సెట్ చేయలేదు."
 
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+#, fuzzy
+msgid "No message"
+msgstr "అజ్ఞాత సందేశం"
+
+msgid "Open All Messages"
+msgstr "అన్ని సందేశాలను తెరవండి"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">మీకు మెయిల్ వచ్చింది!</span>\n"
+"\n"
+"%s"
+
+# "New Buddy Pounce"
+#, fuzzy
+msgid "New Pounces"
+msgstr "కొత్తమిత్రుడు దూసుకొస్తున్నాడు"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">మీకు మెయిల్ వచ్చింది!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr "ఈ కింది ప్లగ్ ఇన్ లను అన్ లోడ్ అవుతాయి."
 
@@ -12978,10 +13150,18 @@ msgstr "<b>ప్లగ్ ఇన్ వివరాలు</b>"
 msgid "Select a file"
 msgstr "ఫైలును సెలక్ట్ చేయుము."
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "మిత్రుడు దూసుకొస్తున్నాడు ఎడిట్ చేయండి "
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "ఎవరిమీద దూసుకురావాలి"
 
+# And now for the buttons
+msgid "_Account:"
+msgstr "_ఖాతా:"
+
 msgid "_Buddy name:"
 msgstr "_మిత్రుని పేరు:"
 
@@ -13049,7 +13229,60 @@ msgstr "రికరింగ్"
 msgid "Pounce Target"
 msgstr "లక్ష్యంవైపు దూసుకురండి"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "టైప్ చేస్తున్నారు"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "టైప్ చేస్తుండగా దూసుకు రానీయండి"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "సైన్ ఆన్"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr " (%s) ఖాళీగా ఉన్న %s  తిరిగి వచ్చారు"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "తిరిగివచ్చారు"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "టైపుచేయడం ఆపేశారు"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "సైన్‌ఆఫ్ "
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "ఖాళీగా ఉన్నారు"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "దూరంగా ఉన్నప్పుడు "
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "సందేశాన్ని పంపండి"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "తెలియని వారెవరో దూసుకొచ్చారు. దయచేసి రిపోర్టు చేయండి!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "స్మైలీ థీమ్ వెల్లడిలో వైఫల్యం. "
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "స్మైలీ థీమ్ వెల్లడిలో వైఫల్యం. "
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "స్మైలీ థీమ్ వెల్లడిలో వైఫల్యం. "
 
 msgid "Install Theme"
@@ -13072,6 +13305,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "%s తో సంభాషణలు "
 
+# Buddy List
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "మిత్రుల జాబితా "
+
 # *< api_version
 #  *< type
 #  *< ui_requirement
@@ -13085,6 +13324,7 @@ msgstr "%s తో సంభాషణలు "
 # *< dependencies
 # *< priority
 # *< id
+#. System Tray
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
@@ -13094,8 +13334,10 @@ msgstr "_సిస్టమ్ ట్రే ఐకాన్ ను చూపి�
 msgid "On unread messages"
 msgstr "చదవని సందేశాల పై"
 
-msgid "Conversation Window Hiding"
-msgstr "సంభాషణ విండో దాచబడుతోంది"
+# IM Convo trans options
+#, fuzzy
+msgid "Conversation Window"
+msgstr "IM Conversation Windows"
 
 msgid "_Hide new IM conversations:"
 msgstr "కొత్త IM సంభాషణలను: దాచు _"
@@ -13103,6 +13345,10 @@ msgstr "కొత్త IM సంభాషణలను: దాచు _"
 msgid "When away"
 msgstr "దూరంగా ఉన్నప్పుడు "
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "సంభాషణ విండోను లేవనెత్తు"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "టాబ్ లు"
@@ -13162,10 +13408,6 @@ msgstr "స్మూత్-స్క్రోలింగ్ ను ఉపయో
 msgid "F_lash window when IMs are received"
 msgstr " IM లు అందుకొన్నప్పుడు విండోను ఫ్లాష్ _ చేయు"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "సంభాషణ విండోను లేవనెత్తు"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13199,14 +13441,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "వినియోగదారుని సమాచారం తీసుకొనివచ్చుటకు వీలుపడదు. "
 
-msgid "ST_UN server:"
-msgstr "ST_UN సర్వర్:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<స్పాన్ స్టైల్=\"ఇటాలిక్\">ఉదాహరణ: stunserver.org</span>"
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_ఆటోడిటెక్ట్ IP అడ్రస్  "
 
 msgid "Public _IP:"
@@ -13227,6 +13466,10 @@ msgstr "_పోర్ట్ ను ప్రారంభించండి:"
 msgid "_End port:"
 msgstr "_పోర్ట్ ను ముగించండి:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "ప్రాక్సీ సర్వర్ "
@@ -13256,6 +13499,10 @@ msgstr "ప్రాక్సీ సర్వర్ "
 msgid "No proxy"
 msgstr "ప్రాక్సీ లేదు "
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_వినియోగదారుడు:"
 
@@ -13431,13 +13678,13 @@ msgstr "ఇద్దరూ దూరంగా లేదా ఖాళీగా �
 msgid "Auto-away"
 msgstr "స్వతఃదూరం"
 
-msgid "Change status when _idle"
-msgstr "_ఖాళీగా ఉన్నప్పుడు స్థాయిని మార్చు"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "స్థాయిమార్చడానికి _నిమిషాల ముందు:"
 
+msgid "Change status when _idle"
+msgstr "_ఖాళీగా ఉన్నప్పుడు స్థాయిని మార్చు"
+
 msgid "Change _status to:"
 msgstr " _స్థాయిని కు మార్చు:"
 
@@ -13589,29 +13836,19 @@ msgstr "సేవ్ చేసి, ఉపయోగించు"
 msgid "Status for %s"
 msgstr "%s కోసం స్థాయి "
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "స్మైలీని చేర్చండి."
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "డూప్లికేట్ కరక్షన్"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "స్థాయికోసం ఖాళీగాలేని శీర్షికను దయచేసి ఎంటర్ చేయండి. "
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "స్మైలీని చేర్చండి."
@@ -13622,21 +13859,33 @@ msgid "Add Smiley"
 msgstr "చిరునవ్వు!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "సచిత్రమును సేవ్ చేయుము."
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+# Creating the options for the protocol
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "పోర్ట్ "
 
 # show everything
 #, fuzzy
 msgid "Smiley"
 msgstr "చిరునవ్వు!"
 
+# Creating the options for the protocol
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "పోర్ట్ "
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+# "Select Buddy" button
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "మిత్రుని ఎంపిక చేయండి "
+
 #, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "ఈ అకౌంటు కోసం ఈ మిత్రుని ఐకన్ ను ఉపయోగించండి:"
@@ -13731,9 +13980,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "లాంచర్ ను పంపజాలదు"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "మీరు డెస్క్ టాప్ లాంచర్ ను తెచ్చివేశారు. స్వయంగా ఈ లాంచర్ ను పంపేబదులు లాంచర్ దేన్ని సూచిస్తే దాన్నిపంపాలని "
 "మీరు భావిస్తున్నట్టుంది."
@@ -13767,6 +14017,16 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "చిత్రం '%s': ను లోడ్ చేయడంలో వైఫల్యం కారణం తెలియదు, బహుశా చిత్రంఫైలు కరప్ట్ అయిఉండవచ్చు"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr ": లో _లింక్‌ను ఓపెన్ చేయండి"
+
+msgid "_Copy Link Location"
+msgstr "_లింక్ లొకేషన్‌ను కాపీ చేయండి. "
+
+msgid "_Copy Email Address"
+msgstr "_ఇ-మెయిల్ అడ్రసును కాపీ చేయండి. "
+
 msgid "Save File"
 msgstr "ఫైలును సేవ్ చేయి"
 
@@ -13865,6 +14125,78 @@ msgstr "అవైలబిలిటి ప్రెడిక్షన్ ప్�
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "సెర్వర్ అడ్రసు "
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "కాన్ఫరెన్స్  సర్వర్‌ను ఎంటర్ చేయండి"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "ప్రశ్నించడానికి కాన్ఫరెన్స్ సర్వర్‌ను ఎంపిక చేయండి "
+
+#, fuzzy
+msgid "Find Services"
+msgstr "ఆన్‌లైన్ సర్వీసులు "
+
+# Buddy List
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "మిత్రుల లిస్టును పంపుము"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "దూరం వెళ్తున్నారు"
+
+#, fuzzy
+msgid "Directory"
+msgstr "లాగ్ డైరెక్టరీ"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "సౌండ్ సెలక్షన్ "
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "వివరణ"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "డైరెక్టరీ సమాచారాన్ని సెట్ చేయండి. "
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_బ్రౌజర్:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "వినియోగదారు అస్తిత్వంలో లేరు"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr " సపోర్టు కలిగిన  ప్రమాణీకరణ  పద్ధతిని సర్వర్ వాడటం లేదు."
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "డైరెక్టరీ సమాచారాన్ని సెట్ చేయండి. "
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "ఈ ప్లగ్ ఇన్ XMPP సర్వర్ ను లేదా క్లైంట్స్ ను డీబగ్గింగ్ చేయాడానికి ఉపయోగపడుతుంది."
+
 msgid "Buddy is idle"
 msgstr "మిత్రుడు ఖాళీగా ఉన్నాడు "
 
@@ -14342,9 +14674,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "సంయుక్త స్వరకల్పన కోసం మ్యూజిక్ సందేశాల ప్లగ్ ఇన్. "
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "వాస్తవిక సమయంలో ఉమ్మడి స్కోరును ఎడిట్ చేయడం ద్వారా ఒక సంగీతాంశం పై ఒకేసారి అనేకమంది వినియోగదారులు "
 "పనిచేయడానికి మ్యూజిక్ సందేశాల ప్లగ్ ఇన్ వీలుకల్పిస్తుంది."
@@ -14500,12 +14833,6 @@ msgstr ""
 "- లోపలకు వచ్చే ప్రతి శబ్దాన్నీ వెనక్కు పంపుతుంది.\n"
 "- ప్రజలు అకౌంటు ప్రారంభించగానే మీ లిస్టులో ప్రజలకు సందేశం పంపుతుంది "
 
-msgid "Cursor Color"
-msgstr "కర్సర్ రంగు"
-
-msgid "Secondary Cursor Color"
-msgstr "సెకండరీ కర్సర్ రంగు"
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "హైపర్‌లింక్ కలర్ "
@@ -14518,6 +14845,11 @@ msgstr "హైపర్‌లింక్ కలర్ "
 msgid "Highlighted Message Name Color"
 msgstr "హైలైట్ చేసిన సందేశాలు"
 
+# ---------- "Notification Removals" ----------
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "సూచనను తీసివేయడం"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Gtkట్రీవ్యూ అడ్డంగా విభజించి చూపించు"
 
@@ -14547,35 +14879,24 @@ msgstr "GTK+ ఇంటర్ ఫేస్ ఫాంట్"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ టెక్స్ట షార్ట్ కట్ థీమ్"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "ఇంటర్ ఫేస్ రంగులు"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "కొత్త మెయిల్ నోటిఫికేషన్లు "
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "పిడ్గిన్ GTK+ థీమ్ కంట్రోల్"
 
-msgid "Widget Sizes"
-msgstr "విడ్ జెట్ పరిమాణాలు"
+#, fuzzy
+msgid "Colors"
+msgstr "ముగించు "
 
 msgid "Fonts"
 msgstr "ఫాంట్ లు"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -14681,7 +15002,7 @@ msgstr "సంభాషణ విండో దాచబడుతోంది"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14733,6 +15054,115 @@ msgstr "టెక్‌స్ట్ రీప్లేస్‌మెంట్ "
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "బయటకు పంపే సందేశాల్లో వినియోగదారుడు నిర్వచించిన నియమాలను అనుసరించి టెక్‌స్ట్ రీప్లేస్ అగును."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "లాగ్ ఇన్ చేయలేదు"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "లాగ్ ఇన్ చేయలేదు"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "సంభాషణలో చేరండి."
+
+#, fuzzy
+msgid "Ignored"
+msgstr "ఉపేక్ష "
+
+#, fuzzy
+msgid "Founder"
+msgstr "బిగ్గరగా"
+
+#, fuzzy
+msgid "Operator"
+msgstr "ఒపెరా "
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "ఆథరైజేషన్ ఇవ్వబడింది. "
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "పొరపాటు "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "పని సమాచారం "
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "అభ్యర్థనా డైలాగ్"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "వార్నింగ్ లెవల్"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s కోసం స్థాయి "
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "చాట్ రూమ్ ప్రదేశం "
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "ఐకన్‌ను సేవ్ చేయుము "
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "పిడ్గిన్ GTK+ థీమ్ కంట్రోల్"
+
+#, fuzzy
+msgid "Contact"
+msgstr "కాంటాక్టు వివరాలు"
+
+# Buddy List
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "మిత్రుల జాబితా "
+
+# Buddy List
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "మిత్రుల జాబితా "
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "పిడ్గిన్ GTK+ థీమ్ కంట్రోల్"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "పిడ్గిన్ GTK+ థీమ్ కంట్రోల్"
+
 # *< type
 # *< ui_requirement
 # *< flags
@@ -14924,9 +15354,6 @@ msgstr "_మిత్రుల జాబితా విండోను ఎప�
 msgid "Only when docked"
 msgstr "డాక్ కాబడినప్పుడు మాత్రమే"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_చాట్ సందేశాలు మీకు చేరినప్పుడు విండోను ఫ్లాష్ చేయండి"
-
 #, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "పిడ్గ్విన్ అవకాశాలు"
@@ -14934,8 +15361,9 @@ msgstr "పిడ్గ్విన్ అవకాశాలు"
 msgid "Options specific to Pidgin for Windows."
 msgstr "విండోస్ కోసం పిడ్గ్విన్ కు ప్రత్యేకమైన అవకాశాలు."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "మిత్రుల జాబితా డాకింగ్ తరహాలో విండోస్ కోసం పిడ్గ్విన్ కు ప్రత్యేకమైన అవకాశాలు కల్పిస్తుంది."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14977,6 +15405,518 @@ msgstr "కొత్త raw XMPP స్టాంజాలను పంపిం�
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "ఈ ప్లగ్ ఇన్ XMPP సర్వర్ ను లేదా క్లైంట్స్ ను డీబగ్గింగ్ చేయాడానికి ఉపయోగపడుతుంది."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "సాకెట్ ను తెరవజాలదు"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "సాకెట్ పై వినలేకపోతున్నాం"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "సాకెట్‌ను చదవడం సాధ్యంకాదు"
+
+#~ msgid "Connection failed."
+#~ msgstr "కనెక్ట్ అవడంలో వైఫల్యం."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "సర్వర్ డిస్‌కనెక్ట్ అయింది"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "సాకెట్‌ను సృష్టించలేదు"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు"
+
+#~ msgid "Read error"
+#~ msgstr "రీడ్ చేయడంలో పొరపాటు"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "రైట్ చేయడంలో పొరపాటు"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "డైరెక్టరీ సమాచారాన్ని సెట్ చేయండి. "
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "సంపూర్ణ అడ్రస్ "
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "చాట్ మారుపేరు"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "వినియోగాదారునికి డైరెక్టరీ సమాచారం లేదు. "
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "కమాండ్ "
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "నమోదులో పొరపాటు"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "ప్రదేశం"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "వినియోగదారు అన్వేషణ"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "మిత్రుడి State Notification"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "సపోర్టులేని వెర్షన్ "
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "దిశ"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "వినియోగదారుని మోడ్స్ "
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "వినియోగదారుని హద్దు "
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "యోగ్యతలు "
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "వినియోగదారు పేరు "
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "కీ ఎక్స్‌చెంజ్‌తో IM "
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ఇ-మెయిల్ అడ్రస్ "
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "ప్రొఫైల్ "
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "పింగ్ "
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "వినియోగదారు పేరు "
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "ప్రత్యక్ష వీడియో "
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "సందేశం అందినది"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "పబ్లిక్ కీ బాబిల్ ప్రింట్ "
+
+# Build the user options frame.
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "వినియోగదారుని ఆప్షన్స్."
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "వినియోగదారుని మోడ్స్ "
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "వినియోగదారు పేరు "
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "వినియోగదారుని హద్దు "
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian Encryption"
+
+#~ msgid "Read Error"
+#~ msgstr "రీడ్ చేయడంలో పొరపాటు"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "సర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "పూర్తి క్యూ."
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "సందేశాన్ని పద విశ్లేషణ చేయడంలో అశక్తత"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "లాగిన్ విఫలమైనది (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "మీరు మరో వర్క్‌స్టేషన్‌లో లాగ్ చేసినారు గాన మిమ్మల్ని లగ్‌ ఔట్ చేయడమైనది."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "పొరపాటు. SSL సపోర్ట్ ఇన్‌స్టాల్ కాలేదు. "
+
+#~ msgid "Incorrect password."
+#~ msgstr "తప్పు పాస్‌వర్డ్."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS సర్వర్ :\n"
+#~ " కు కనెక్ట్ చేయలేకపోయింది %s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "మీరు త్వరలో డిస్కనెక్ట్ కాబోతున్నారు.  అప్ డేట్లకోసం %s చూడండి."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "కనెక్ట్ చేయుట సాధ్యం కాదు"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "చెల్లుబాటు కాని పేరు. "
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
+
+# msgstr "%sను ట్రాన్స్‌ఫర్ చేయడాన్ని %s రద్దు చేశారు."
+#~ msgid "Connection lost"
+#~ msgstr "కనెక్షన్ పోయింది"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "హోస్ట్ ను నిశ్చయించలేకపోయాం"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "కనెక్షన్ ముగిసింది (రైటింగ్)"
+
+#~ msgid "Connection reset"
+#~ msgstr "కనెక్షన్ రీ సెట్ అయింది"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "సాకెట్ : %s నుంచి రీడింగ్ లో లోపం"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "హోస్ట్ కు కనెక్ట్‌ చేయలేని స్థితి "
+
+#~ msgid "Could not write"
+#~ msgstr "రాయలేక పోతున్నాం"
+
+#~ msgid "Could not connect"
+#~ msgstr "కనెక్ట్ చేయడం సాధ్యంమగుట లేదు. "
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "వినదగిన సాకెట్ ను సృష్టించలేకపోతున్నాం"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "హోస్ట్ పేరును నిశ్చయించలేకపోతున్నాం"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "తప్పుడు పాస్‌వర్డ్ "
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "యూహూ జపాన్ "
+
+#~ msgid "Japan Pager server"
+#~ msgstr "జపాన్ పేజర్ సర్వర్"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "జపాన్ ఫైల్ బదిలీ సర్వర్"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "సర్వర్ నుంచి కనెక్షన్ తెగిపోయింది \n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "హోస్ట్ పేరును నిశ్చయించలేకపోతున్నాం"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "లాగిన్ చేయాలంటే సర్వర్ కు TLS/SSL అవసరం. TLS/SSL సహకారం లభించలేదు. "
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "సంభాషణ విండో దాచబడుతోంది"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "స్థాయికోసం ఖాళీగాలేని శీర్షికను దయచేసి ఎంటర్ చేయండి. "
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "ఏ IDని యాక్టివ్ చేయాలి?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "కర్సర్ రంగు"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "సెకండరీ కర్సర్ రంగు"
+
+#~ msgid "Interface colors"
+#~ msgstr "ఇంటర్ ఫేస్ రంగులు"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "విడ్ జెట్ పరిమాణాలు"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "సందేశంలో పొందుపరచు"
+
+# Put our happy label in it.
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "మీరు ఆహ్వానించదల్చుకున్న మిత్రుని పేరును ఆప్షనల్ ఆహ్వాన సందేశంతో పాటుగా ఎంటర్ చేయండి."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "నోట్స్ అడ్రస్ బుక్ ను ఎంపిక చేయండి"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "త్వరలో మీరు డిస్‌కనెక్ట్ చేయబడవచ్చు. ఇది ఫిక్స్ అయేంతవరకు మీరు TOC ని వాడాలని అనుకోవచ్చు. అప్‌డేట్స్ "
+#~ "కోసం %s చెక్ చేయండి. "
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "మిత్రుని చేర్చుము "
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "రీడ్ చేయడంలో పొరపాటు"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "సర్వర్ తో కనెక్షన్ పోయింది:\n"
+#~ "%s"
+
+# Account options
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "సర్వర్‌ను కనెక్ట్ చేయండి"
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s కోసం చూస్తున్నది "
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%s కు కనెక్షన్ వైఫల్యం"
+
+#~ msgid "Signon: %s"
+#~ msgstr "సైన్-ఆన్: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "%s ఫైలును రైట్ చేయలేకపోతోంది."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "%s ఫైలును రీడ్ చేయలేకపోతోంది."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "సందేశం చాలా పొడవుగా ఉంది, చివరి %s బైట్స్ కుదించబడ్డాయి. "
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s ప్రస్తుతం లాగ్ ఇన్ కాలేదు."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s చేసిన హెచ్చరికకు అనుమతిలేదు."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "ఒక సందేశాన్ని వదిలివేయడమైనది. మీ సర్వర్ వేగపరిమితిని దాటింది."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%s లో సంభాషణ లభ్యం కాలేదు. "
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "మీరు %s కి సందేశములను వేగంగా పంపిస్తున్నారు."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "మీరు  ఒక  IMను %s నుంచి మిస్ అయినారు, ఎందుకంటే అది చాలా పెద్దది. "
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "మీరు  ఒక  IMను %s నుంచి మిస్ అయినారు, ఎందుకంటే అది అతివేగంతో పంపబడింది."
+
+#~ msgid "Failure."
+#~ msgstr "వైఫల్యం."
+
+#~ msgid "Too many matches."
+#~ msgstr "సరిపోలేవి అనేకం ఉన్నాయి."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "మరిన్ని క్వాలిఫైయర్స్ కావాలి."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "డైరెక్టరీ సేవ తాత్కాలికంగా అందుబాటులో లేదు."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "ఇ-మెయిల్‌ను చూడటంపై ఆంక్షలు."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "కీవర్డ్ విస్మరించబడింది."
+
+#~ msgid "No keywords."
+#~ msgstr "కీవర్డ్స్ లేవు. "
+
+#~ msgid "User has no directory information."
+#~ msgstr "వినియోగాదారునికి డైరెక్టరీ సమాచారం లేదు. "
+
+#~ msgid "Country not supported."
+#~ msgstr "దేశానికి సపోర్టు లేదు. "
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "తెలియని వైఫల్యం: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "స్క్రీన్ పేరు లేదా  పాస్‌వర్డ్ తప్పు. "
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "సర్వీస్ తాత్కాలికంగా అందుబాటులే లేదు. "
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "లాగిన్ చేయడానికి మీ వార్నింగ్ లెవల్ చాలా ఎక్కువగా ఉంది. "
+
+#~ 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 ""
+#~ "మీరు చాలా తరచుగా కనెక్ట్ చేస్తున్నారు, డిస్‌కనెక్ట్ చేస్తున్నారు. పది నిమిషాలు వేచి చూసి మరల "
+#~ "ప్రయత్నించండి. మీరు ఇలాగే ప్రయత్నిస్తుంటే ఇంకా ఎక్కువ సమయం నిరీక్షించాల్సివస్తుంది. "
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "అజ్ఞాత సైనాన్ పొరపాటు సంభవించింది: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "అజ్ఞాత పొరపాటు, %d , సంభవించింది. సమాచారం: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "చెల్లుబాటుకాని గ్రూప్ పేరు"
+
+#~ msgid "Connection Closed"
+#~ msgstr "కనెక్షన్ ముగిసింది"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "సమాధానం కోసం ప్రతీక్ష ... "
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "ఆగిన TOC మరల వెనక్కు వచ్చినది. మీరు మళ్ళీ సందేశాలను పంపవచ్చును."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "విజయవంతంగా పాస్‌వర్డ్‌ మార్పు"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "డైరెక్టరీ సమాచారాన్ని పొందండి"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "డైరెక్టరీ సమాచారాన్ని సెట్ చేయండి. "
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "వ్రాయడానికి %s ను ఓపెన్ చేయలేదు"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "ఫైల్ ట్రాన్స్‌ఫర్ వైఫల్యం; బహుశా రెండవవైపు రద్దయి ఉంటుంది. "
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "ట్రాన్స్‌ఫర్ కోసం కనెక్ట్ చేయడం సాధ్యం కాలేదు. "
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "ఫైల్ శీర్షికను వ్రాయడం సాధ్యం కాలేదు. ఫైల్‌ ట్రాన్స్‌ఫర్ చేయబడదు."
+
+#~ msgid "Save As..."
+#~ msgstr "ఇలా సేవ్ చేయండి..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s అభ్యర్థనలు %s ఆమోదించుటకు %d files: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "ఫైల్ పంపవలసిందిగా %s మిమ్మల్ని అభ్యర్థిస్తున్నారు."
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+# *  description
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC ప్రొటోకాల్ ప్లగ్ ఇన్"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr " %s కు సంబంధించిన వినియోగదారుని సమాచారం అలభ్యం. "
+
+# Build the protocol options frame.
+#~ msgid "%s Options"
+#~ msgstr "%s ఆప్షన్స్"
+
+#~ msgid "Proxy Options"
+#~ msgstr "ప్రాక్సీ ఆప్షన్లు "
+
+#~ msgid "By log size"
+#~ msgstr "లాగ్ సైజ్ వలన "
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_బ్రౌజర్‌లో లింక్‌ను ఓపెన్ చేయండి. "
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN సర్వర్:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "సచిత్రమును సేవ్ చేయుము."
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_చాట్ సందేశాలు మీకు చేరినప్పుడు విండోను ఫ్లాష్ చేయండి"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "ఆ పేరుతో గ్రూపు ఇంతకు ముందునుంచే ఉంది. "
 
@@ -15074,13 +16014,6 @@ msgstr "ఈ ప్లగ్ ఇన్ XMPP సర్వర్ ను లేద�
 #~ msgid "Do you want to approve the request?"
 #~ msgstr "అభ్యర్థనను మీరు ఆమోదించ దలచుకున్నారా?"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "సిస్టం సందేశం"
 
@@ -15260,9 +16193,6 @@ msgstr "ఈ ప్లగ్ ఇన్ XMPP సర్వర్ ను లేద�
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "%dగ్రూపులో చేరడానికి మీరు చేసిన అభ్యర్థనను admin %d ఆమోదించారు"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "మీ మిత్రుల జాబితాకు ఈ గ్రూపును చేర్చడం జరిగింది"
-
 #~ msgid "I am applying to join"
 #~ msgstr "నేను చేరడానికి దరఖాస్తు చేస్తున్నాను"
 
@@ -15283,10 +16213,6 @@ msgstr "ఈ ప్లగ్ ఇన్ XMPP సర్వర్ ను లేద�
 #~ msgid "Enter your reason:"
 #~ msgstr "మీకారణాన్ని తెలియజేయండి:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "కనెక్షన్ ఏర్పాటులో పొరపాటు"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "లాగ్ ఇన్ చేయలేక పోయింది, డీబగ్ లాగ్ ను తనిఖీ చేయండి"
 
@@ -15334,12 +16260,6 @@ msgstr "ఈ ప్లగ్ ఇన్ XMPP సర్వర్ ను లేద�
 #~ "మీ మిత్రుల లిస్టుకు చేర్చదల్చుకున్న వ్యక్తి స్క్రీన్‌పేరును ఎంటర్ చేయండి. ఆప్షన్‌గా మీరు ఉపనామాన్ని "
 #~ "ఎంటర్ చేయవచ్చును. సాధ్యమైనచోట్ల స్క్రీన్ పేరు బదులుగా ఉపనామము ప్రదర్శించబడును. \n"
 
-# And now for the buttons
-# Set up stuff for the account box
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "అకౌంటు:"
-
 #, fuzzy
 #~ msgid "_Screen name:"
 #~ msgstr "స్క్రీన్ పేరు:"
diff --git a/po/th.po b/po/th.po
index 26bb2c3657..389a2593a7 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-04-04 15:35+0700\n"
 "Last-Translator: Isriya Paireepairit <markpeak@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
@@ -34,7 +34,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -619,19 +619,6 @@ msgid "Send To"
 msgstr "_ส่งไปยัง"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "เปิดข้อความทั้งหมด"
-
-msgid "Invite"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr "ใส่ชื่อคู่สนทนาที่ต้องการเชิญ รวมถึงข้อความเชิญ"
-
-#, fuzzy
 msgid "Conversation"
 msgstr "การสนทนา"
 
@@ -885,6 +872,43 @@ msgid "System Log"
 msgstr "บันทึกของระบบ"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "กำลังคำนวณ..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+#, fuzzy
+msgid "Accept"
+msgstr "_ตอบรับ"
+
+#, fuzzy
+msgid "Reject"
+msgstr "คืนค่าเดิม"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "คุณได้คุยในการสนทนากลุ่ม"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "อีเมล"
 
@@ -921,6 +945,9 @@ msgstr "เชื่อมต่อ"
 msgid "IM"
 msgstr "ส่งข้อความ"
 
+msgid "Invite"
+msgstr ""
+
 msgid "(none)"
 msgstr ""
 
@@ -1138,7 +1165,6 @@ msgstr "%s เปลี่ยนสถานะเป็นไม่อยู่
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ส่งข้อความถึงคุณ (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
@@ -1194,7 +1220,6 @@ msgstr "เ_วลาเป็นนาทีสำหรับเปลี่�
 msgid "Change status to"
 msgstr "เปลี่ยน_สถานะเป็น:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "การสนทนา"
 
@@ -1536,7 +1561,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr "เมื่อเปิดหน้าต่างสนทนาใหม่ ปลั๊กอินนี้จะแสดงประวัติการสนทนาคราวก่อนด้วย"
 
-#, c-format
 msgid "Online"
 msgstr ""
 
@@ -1584,6 +1608,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr ""
 
@@ -1682,15 +1728,6 @@ msgstr "ตอบรับคำเชิญสนทนา?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-#, fuzzy
-msgid "Accept"
-msgstr "_ตอบรับ"
-
-#, fuzzy
-msgid "Reject"
-msgstr "คืนค่าเดิม"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1779,6 +1816,8 @@ msgstr ""
 msgid "+++ %s signed off"
 msgstr ""
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
 
@@ -1827,6 +1866,16 @@ msgstr "%s ออกจากห้อง"
 msgid "%s left the room (%s)."
 msgstr "%s ออกจากห้อง (%s)"
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "เ_ริ่มสนทนากลุ่ม"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "ใส่ชื่อคู่สนทนาที่ต้องการเชิญ รวมถึงข้อความเชิญ"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr ""
@@ -1954,7 +2003,6 @@ msgstr "เริ่มการส่งแฟ้ม %s จาก %s"
 msgid "Transfer of file %s complete"
 msgstr "การส่งแฟ้ม %s สำเร็จ"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "การส่งแฟ้มสำเร็จ"
 
@@ -1962,7 +2010,6 @@ msgstr "การส่งแฟ้มสำเร็จ"
 msgid "You canceled the transfer of %s"
 msgstr "คุณได้ยกเลิกการส่งแฟ้ม %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "การส่งแฟ้มถูกยกเลิก"
 
@@ -2143,11 +2190,14 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2536,7 +2586,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2587,7 +2637,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2616,6 +2666,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "ใส่รหัสผ่าน"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2804,18 +2880,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "ชื่อ"
 
@@ -2849,6 +2925,11 @@ msgstr ""
 msgid "Purple Person"
 msgstr ""
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "_รูปแบบของบันทึก:"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2859,15 +2940,17 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2914,13 +2997,14 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "รหัสผ่านไม่ตรงกัน"
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2932,14 +3016,18 @@ msgstr ""
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-msgid "Password (retype)"
-msgstr "รหัสผ่าน (ใส่อีกครั้ง)"
+msgid "Password (again)"
+msgstr "รหัสผ่าน (ซ้ำ)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+# msgstr ""
+# "เกิดข้อผิดพลาดขณะบันทึกรูป: %s\n"
+# "%s"
+#, fuzzy
+msgid "Captcha"
+msgstr "บันทึกรูปภาพ"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -2992,6 +3080,15 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr "รหัสผ่าน (ใส่อีกครั้ง)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3005,13 +3102,13 @@ msgstr ""
 msgid "Add to chat..."
 msgstr ""
 
+#. Global
 msgid "Available"
 msgstr "อยู่"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "ไม่อยู่"
 
@@ -3039,8 +3136,9 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
-msgstr ""
+#, fuzzy
+msgid "Unable to read from socket"
+msgstr "ไม่สามารถส่งข้อความได้"
 
 msgid "Buddy list downloaded"
 msgstr ""
@@ -3054,7 +3152,13 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr ""
+
+msgid "Connection failed"
 msgstr ""
 
 msgid "Add to chat"
@@ -3063,14 +3167,24 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "ไม่สามารถส่งข้อความได้"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "กำลังเชื่อมต่อ"
+
 msgid "Chat error"
 msgstr ""
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
-msgstr ""
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "บันทึกการสนทนากับ %s"
 
 msgid "Find buddies..."
 msgstr ""
@@ -3111,6 +3225,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+#, fuzzy
+msgid "GG server"
+msgstr "แก้ข้อมูลผู้ใช้..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "ไม่รู้จักคำสั่ง: %s"
@@ -3125,8 +3243,9 @@ msgstr "ไม่ได้ตั้งหัวข้อไว้"
 msgid "File Transfer Failed"
 msgstr "การส่งแฟ้มล้มเหลว"
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "ไม่สามารถเปิดแฟ้มได้"
 
 msgid "Error displaying MOTD"
 msgstr ""
@@ -3141,8 +3260,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
-msgstr "การเชื่อมต่อกับเซิร์ฟเวอร์ถูกตัด"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "บันทึกการสนทนากับ %s"
 
 msgid "View MOTD"
 msgstr ""
@@ -3153,25 +3280,24 @@ msgstr "_ห้อง:"
 msgid "_Password:"
 msgstr "_รหัสผ่าน:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "ชื่อเล่นของ IRC ไม่อนุญาตให้มีช่องว่าง"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "กำลังเชื่อมต่อ"
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
-msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
-msgid "Read error"
-msgstr ""
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "การเชื่อมต่อกับเซิร์ฟเวอร์ถูกตัด"
 
 msgid "Users"
 msgstr "ผู้ใช้"
@@ -3350,6 +3476,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "ชื่อเล่น"
+
 msgid "Cannot change nick"
 msgstr ""
 
@@ -3549,10 +3686,10 @@ msgstr ""
 msgid "execute"
 msgstr "ลบ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3567,18 +3704,48 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "เชื่อมต่อล้มเหลว"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "เซิร์ฟเวอร์ไม่ถูกต้อง"
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "เซิร์ฟเวอร์"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
 msgstr ""
 
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "บันทึกการสนทนากับ %s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "บันทึกการสนทนากับ %s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
+
 msgid "Full Name"
 msgstr "ชื่อเต็ม"
 
@@ -3645,182 +3812,23 @@ msgstr "เมือง"
 msgid "Operating System"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
 #, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "ที่อยู่ (เพิ่มเติม)"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "ตั้งชื่อห้องสนทนา"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "เรียกคำสั่ง"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "เกิดข้อผิดพลาดในการลงทะเบียน"
-
-#, fuzzy
-msgid "User Location"
-msgstr "ตัวเลือกสำหรับผู้ใช้"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "การแจ้งเตือนข้อความ"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "บันทึกการสนทนา"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "เริ่มการตรวจสอบผู้ใช้"
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "ชื่อผู้ใช้"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ที่อยู่อีเมล"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "แฟ้มประวัติ MSN"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "ชื่อเล่น"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
+msgid "Local Time"
+msgstr "ที่อยู่:"
 
-msgid "Jingle Video"
+msgid "Priority"
 msgstr ""
 
-msgid "Jingle DTMF"
+msgid "Resource"
 msgstr ""
 
-#, fuzzy
-msgid "Message Receipts"
-msgstr "ได้รับข้อความ"
-
-msgid "Public Key Publishing"
+#, c-format
+msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "User Chatting"
-msgstr "ตัวเลือกสำหรับผู้ใช้"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "คู่สนทนากำลังพิมพ์..."
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "ชื่อผู้ใช้"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "คู่สนทนากำลังพิมพ์..."
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
-msgid "Priority"
-msgstr ""
-
-msgid "Resource"
-msgstr ""
+msgid "Logged Off"
+msgstr "ไม่ได้ล็อกอิน"
 
 msgid "Middle Name"
 msgstr "ชื่อกลาง"
@@ -3870,7 +3878,6 @@ msgstr "กำลังคุย"
 msgid "Extended Away"
 msgstr "ไม่อยู่ยาว"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "ห้ามรบกวน"
 
@@ -3991,26 +3998,25 @@ msgstr "ใส่เซิร์ฟเวอร์สำหรับประช
 msgid "Find Rooms"
 msgstr "ค้นหาห้อง"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "นามแฝง:"
 
-msgid "Write error"
-msgstr ""
+#, fuzzy
+msgid "No users found"
+msgstr "ไม่มีบันทึก"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "ข้อความปกติ"
+msgid "Roles:"
+msgstr "ตำแหน่ง"
 
-msgid "Read Error"
-msgstr ""
+#, fuzzy
+msgid "Ping timed out"
+msgstr "ข้อความปกติ"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-
-msgid "Unable to create socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4019,6 +4025,10 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
@@ -4044,9 +4054,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr "เชื่อมต่อล้มเหลว"
 
-msgid "Already Registered"
-msgstr "ลงทะเบียนแล้ว"
-
 msgid "State"
 msgstr "รัฐ"
 
@@ -4059,6 +4066,9 @@ msgstr "โทรศัพท์"
 msgid "Date"
 msgstr ""
 
+msgid "Already Registered"
+msgstr "ลงทะเบียนแล้ว"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "ลงทะเบียน"
@@ -4090,6 +4100,10 @@ msgstr "ลงทะเบียนผู้ใช้ Jabber ใหม่"
 msgid "Change Registration"
 msgstr "เกิดข้อผิดพลาดในการลงทะเบียน"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4108,9 +4122,18 @@ msgstr ""
 msgid "Re-initializing Stream"
 msgstr ""
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr ""
 
+msgid "Mood"
+msgstr ""
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr ""
 
@@ -4132,12 +4155,6 @@ msgstr ""
 msgid "Subscription"
 msgstr ""
 
-msgid "Mood"
-msgstr ""
-
-msgid "Now Listening"
-msgstr ""
-
 msgid "Mood Text"
 msgstr ""
 
@@ -4182,9 +4199,6 @@ msgstr "คุณเปลี่ยนรหัสผ่านเรียบร
 msgid "Error changing password"
 msgstr "เกิดปัญหาในการเปลี่ยนรหัสผ่าน"
 
-msgid "Password (again)"
-msgstr "รหัสผ่าน (ซ้ำ)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "เปลี่ยนรหัสผ่าน"
@@ -4378,18 +4392,24 @@ msgstr ""
 msgid "Unable to ping user %s"
 msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "ไม่สามารถเล่นเสียงได้ เนื่องจากไม่พบแฟ้มที่เลือก (%s)"
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "ไม่สามารถเล่นเสียงได้ เนื่องจากไม่พบแฟ้มที่เลือก (%s)"
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "ไม่สามารถเล่นเสียงได้ เนื่องจากไม่พบแฟ้มที่เลือก (%s)"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4399,10 +4419,36 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr "%s ออกจากระบบ"
 
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "ไม่สามารถส่งข้อความได้: ข้อความใหญ่เกินไป"
+
 #, c-format
-msgid "Buzzing %s..."
+msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
 
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "เชื่อมต่อล้มเหลว"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "กรุณาใส่ชื่อคู่สนทนาที่ต้องการดูข้อมูล"
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "เลือกแฟ้ม"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "เ_ริ่มสนทนากลุ่ม"
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4422,13 +4468,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4492,6 +4538,9 @@ msgstr "เซิร์ฟเวอร์"
 msgid "File transfer proxies"
 msgstr "ส่งแฟ้ม"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4532,6 +4581,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr "สร้างห้องใหม่"
 
@@ -4546,12 +4603,30 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
+#, fuzzy
+msgid "No reason"
+msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
+
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s เปลี่ยนสถานะเป็นไม่ได้ใช้งาน (%s)"
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "Kicked (%s)"
 msgstr ""
 
-#, c-format
-msgid "Error in chat %s"
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "การส่งแฟ้มล้มเหลว"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "ไม่สามารถเปิดแฟ้มได้"
+
+msgid "Failed to open in-band bytestream"
 msgstr ""
 
 #, c-format
@@ -4577,10 +4652,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "กรุณาใส่ชื่อคู่สนทนาที่ต้องการดูข้อมูล"
 
-#, fuzzy
-msgid "Select a Resource"
-msgstr "เลือกแฟ้ม"
-
 msgid "Edit User Mood"
 msgstr ""
 
@@ -4619,7 +4690,17 @@ msgstr "การกระทำ"
 msgid "Select an action"
 msgstr "เลือกแฟ้ม"
 
-msgid "Unable to retrieve MSN Address Book"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr ""
+
+msgid "Buddy Add error"
+msgstr ""
+
+msgid "The username specified does not exist."
 msgstr ""
 
 #, c-format
@@ -4846,7 +4927,6 @@ msgstr ""
 msgid "Passport account not yet verified"
 msgstr ""
 
-#, c-format
 msgid "Passport account suspended"
 msgstr ""
 
@@ -4869,6 +4949,10 @@ msgstr "คนอื่นคุยในการสนทนากลุ่ม
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -4937,6 +5021,13 @@ msgstr ""
 msgid "Page"
 msgstr ""
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "IM ที่ทำงาน"
+
 msgid "Has you"
 msgstr "มีชื่อคุณในรายการ"
 
@@ -4977,6 +5068,14 @@ msgstr "ที่อยู่"
 msgid "Album"
 msgstr ""
 
+#, fuzzy
+msgid "Game Title"
+msgstr "ชื่อ"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "ชื่อ"
+
 msgid "Set Friendly Name..."
 msgstr "เปลี่ยนชื่อเรียก..."
 
@@ -5010,9 +5109,6 @@ msgstr "เ_ริ่มสนทนากลุ่ม"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
 
@@ -5167,8 +5263,9 @@ msgid ""
 "does not exist."
 msgstr "Pidgin ไม่สามารถหาข้อมูลของคู่สนทนาได้ ผู้ใช้นี้อาจไม่มีแฟ้มประวัติ"
 
-msgid "Profile URL"
-msgstr "URL ของแฟ้มประวัติ"
+#, fuzzy
+msgid "View web profile"
+msgstr "ผู้ใช้ออฟไลน์"
 
 #. *< type
 #. *< ui_requirement
@@ -5202,65 +5299,28 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr ""
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ส่งข้อความถึงคุณ (%s)"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
 
 msgid "Unable to add user"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "นี่คือผลลัพธ์ในการค้นหา"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr ""
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5293,9 +5353,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr ""
 
@@ -5308,19 +5365,21 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "คุณได้เข้าระบบจากที่อื่น"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5349,6 +5408,14 @@ msgstr "กำลังส่งคุกกี้"
 msgid "Retrieving buddy list"
 msgstr "กำลังรับรายการคู่สนทนา"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "ไม่อยู่ที่คอมพิวเตอร์"
 
@@ -5385,14 +5452,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "เพิ่มชื่อในสมุดที่อยู่"
@@ -5400,19 +5459,15 @@ msgstr "เพิ่มชื่อในสมุดที่อยู่"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr ""
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr ""
-
 msgid "The username specified is invalid."
 msgstr ""
 
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "URL ของแฟ้มประวัติ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5427,17 +5482,62 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "ปลั๊กอิน Jabber"
 
-msgid "Missing Cipher"
+#, c-format
+msgid "%s is not a valid group."
 msgstr ""
 
-msgid "The RC4 cipher could not be found"
+msgid "Unknown error."
 msgstr ""
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
 msgstr ""
 
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+#, fuzzy
+msgid "User lookup"
+msgstr "ผู้ใช้ไม่อยู่ในกลุ่ม"
+
 msgid "Reading challenge"
 msgstr ""
 
@@ -5448,12 +5548,23 @@ msgstr ""
 msgid "Logging in"
 msgstr "บันทึกเหตุการณ์"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "ไม่มีชื่อ"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "บันทึกการสนทนากับ %s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "ส่ง_ข้อความ"
@@ -5474,19 +5585,19 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "ไม่มีชื่อ"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "หน้าต่าง_สนทนา"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
+msgid "Add contacts from server"
 msgstr ""
 
 #, c-format
@@ -5495,15 +5606,21 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "รหัสผ่านใหม่"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
+msgid "Invalid input condition"
+msgstr ""
+
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5513,14 +5630,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "ผู้ใช้ไม่อยู่ในกลุ่ม"
-
 msgid "Failed to remove buddy"
 msgstr ""
 
@@ -5530,34 +5639,15 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr ""
 
-msgid "Invalid input condition"
+msgid "Missing Cipher"
 msgstr ""
 
-msgid "Read buffer full (2)"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#, fuzzy
-msgid "Unparseable message"
-msgstr "ข้อความที่ไม่ได้อ่าน"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
-
-#, fuzzy
-msgid "IM Friends"
-msgstr "หน้าต่าง_สนทนา"
-
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-
-msgid "Add contacts from server"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
 msgstr ""
 
 msgid "Add friends from MySpace.com"
@@ -5604,10 +5694,6 @@ msgstr "เพิ่มขนาดอักษร"
 msgid "User"
 msgstr "ผู้ใช้"
 
-#, fuzzy
-msgid "Profile"
-msgstr "แฟ้มประวัติ MSN"
-
 msgid "Headline"
 msgstr ""
 
@@ -5622,15 +5708,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "ปิดการสนทนา"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "ไม่มีชื่อ"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 msgid "MySpaceIM - Username Available"
@@ -5642,6 +5723,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "ธีมนี้ไม่มีหน้าแสดงอารมณ์"
@@ -5650,6 +5734,14 @@ msgstr "ธีมนี้ไม่มีหน้าแสดงอารมณ
 msgid "Please try another username:"
 msgstr "ใส่รหัสผ่านใหม่ที่ต้องการ"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "ไม่มีชื่อ"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5844,10 +5936,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "รหัสผ่านใหม่"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5886,9 +5974,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5986,9 +6074,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -6009,23 +6094,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
-msgid "Error. SSL support is not installed."
-msgstr ""
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -6048,6 +6126,22 @@ msgstr "ที่อยู่เซิร์ฟเวอร์"
 msgid "Server port"
 msgstr "พอร์ตเซิร์ฟเวอร์"
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+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 ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
@@ -6057,17 +6151,8 @@ msgid "Invalid chat room name"
 msgstr "ใส่ชื่อห้องไม่ถูกต้อง"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "การเชื่อมต่อกับเซิร์ฟเวอร์ถูกตัด"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-
-msgid "Received invalid data on connection with server."
-msgstr ""
+msgid "Received invalid data on connection with server"
+msgstr "บันทึกการสนทนากับ %s"
 
 #. *< type
 #. *< ui_requirement
@@ -6116,8 +6201,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "บันทึกการสนทนากับ %s"
 
 msgid "Direct IM established"
 msgstr ""
@@ -6285,23 +6371,18 @@ msgstr ""
 msgid "Screen Sharing"
 msgstr "ชื่อผู้ใช้"
 
-#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#, c-format
 msgid "Not Available"
 msgstr ""
 
-#, c-format
 msgid "Occupied"
 msgstr ""
 
-#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#, c-format
 msgid "Invisible"
 msgstr "ไม่แสดงตัว"
 
@@ -6315,16 +6396,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+msgid "Unable to connect to BOS server: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 #, fuzzy
 msgid "Username sent"
@@ -6339,46 +6416,50 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#. Unregistered screen name
-#. uid is not exist
-#, fuzzy
-msgid "Invalid username."
-msgstr "ชื่อผู้ใช้ไม่ถูกต้อง"
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "คุณถูกตัดการเชื่อมต่อจากเซิร์ฟเวอร์"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
 
-msgid "Incorrect password."
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Received authorization"
 msgstr ""
 
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "ไม่มีชื่อ"
+
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr ""
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6394,22 +6475,6 @@ msgstr ""
 msgid "_OK"
 msgstr "ตกลง"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "คุณถูกตัดการเชื่อมต่อจากเซิร์ฟเวอร์"
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -6522,7 +6587,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
@@ -6544,6 +6609,13 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
+#, fuzzy
+msgid "Profile"
+msgstr "แฟ้มประวัติ MSN"
+
 msgid "Your AIM connection may be lost."
 msgstr ""
 
@@ -6696,7 +6768,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6719,7 +6791,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6727,7 +6799,7 @@ msgid "(no name)"
 msgstr ""
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, fuzzy, c-format
@@ -6791,6 +6863,7 @@ msgstr "เชื่อมต่อ"
 msgid "Get AIM Info"
 msgstr "_ดูข้อมูลคู่สนทนา"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr ""
 
@@ -6849,6 +6922,7 @@ msgstr "หา"
 msgid "Set User Info (web)..."
 msgstr "แก้ข้อมูลผู้ใช้..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "เปลี่ยนรหัสผ่าน"
@@ -6879,6 +6953,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6896,7 +6973,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
@@ -6997,7 +7073,7 @@ msgstr ""
 msgid "Visible"
 msgstr "ไม่แสดงตัว"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7090,18 +7166,51 @@ msgstr ""
 msgid "Could not change buddy information."
 msgstr "ดูข้อมูลของคู่สนทนา"
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "ใช้ผ่านมือถือ"
+
+msgid "Note"
 msgstr ""
 
+#. callback
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "เพิ่มคู่สนทนา"
+msgid "Buddy Memo"
+msgstr "ไอคอนในการสนทนา"
 
-msgid "Input answer here"
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
+msgid "_Modify"
+msgstr "แ_ก้ไข"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "แ_ก้ไข"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "เซิ_ร์ฟเวอร์:"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, c-format
+msgid "%u requires verification"
+msgstr ""
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "เพิ่มคู่สนทนาในรายการคู่สนทนาของคุณ?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "ใส่เซิร์ฟเวอร์สำหรับประชุม"
+
+#, fuzzy
 msgid "Send"
 msgstr "_ส่ง"
 
@@ -7112,19 +7221,20 @@ msgstr "ชื่อผู้ใช้ไม่ถูกต้อง"
 msgid "Authorization denied message:"
 msgstr ""
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "เริ่มการตรวจสอบผู้ใช้"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "เพิ่มคู่สนทนาในรายการคู่สนทนาของคุณ?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "ใส่เซิร์ฟเวอร์สำหรับประชุม"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7146,7 +7256,7 @@ msgid "Failed sending authorize"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "กำลังรับรายการคู่สนทนา"
 
 #, fuzzy, c-format
@@ -7190,6 +7300,9 @@ msgstr "ใส่รหัสผ่านใหม่ที่ต้องกา
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
 msgid "Not member"
 msgstr ""
 
@@ -7229,15 +7342,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr ""
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "ตั้งหมายเลขโทรศัพท์บ้าน"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7248,7 +7364,7 @@ msgstr "ตั้งค่าเสียง"
 msgid "Failed:"
 msgstr "ล้มเหลว"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7260,11 +7376,11 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr ""
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "ตั้งหมายเลขโทรศัพท์บ้าน"
 
 #, fuzzy
@@ -7275,35 +7391,35 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "ต้องการเขียนทับหรือไม่"
 
 msgid "Setup"
 msgstr ""
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr ""
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "ลบคู่สนทนา"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "ลบคู่สนทนา"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7423,6 +7539,13 @@ msgstr "<b>นามแฝง:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>นามแฝง:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<br><b>ส่วนตัว</b><br>%s"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7430,7 +7553,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "เกี่ยวกับ Pidgin"
 
 #, fuzzy
@@ -7451,6 +7574,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "เกี่ยวกับ Pidgin"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "ที่อยู่บ้าน"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7482,7 +7609,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "กำลังเชื่อมต่อ"
@@ -7495,6 +7621,9 @@ msgstr "พอร์ตเซิร์ฟเวอร์"
 msgid "Show server news"
 msgstr "ที่อยู่เซิร์ฟเวอร์"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 msgid "Keep alive interval (seconds)"
 msgstr ""
 
@@ -7503,12 +7632,9 @@ msgid "Update interval (seconds)"
 msgstr "ข้อมูลคู่สนทนา"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "เซิร์ฟเวอร์"
 
-msgid "Can not decrypt get server reply"
-msgstr ""
-
 #, c-format
 msgid "Failed requesting token, 0x%02X"
 msgstr ""
@@ -7528,19 +7654,17 @@ msgid "Activation required"
 msgstr ""
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
-msgstr ""
-
-msgid "Keep alive error"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Requesting captcha ..."
-msgstr ""
+#, fuzzy
+msgid "Requesting captcha"
+msgstr "เหลืออีก"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
+msgid "Failed captcha verification"
 msgstr ""
 
 # msgstr ""
@@ -7554,7 +7678,7 @@ msgstr "บันทึกรูปภาพ"
 msgid "Enter code"
 msgstr "ใส่รหัสผ่าน"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7562,65 +7686,42 @@ msgid "Enter the text from the image"
 msgstr "กรุณาใส่ชื่อของกลุ่มที่ต้องการเพิ่ม"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr ""
-
 msgid "Socket error"
 msgstr ""
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "บันทึกการสนทนากับ %s"
-
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "ไม่สามารถส่งข้อความได้"
-
-msgid "Write Error"
-msgstr ""
+msgid "Getting server"
+msgstr "แก้ข้อมูลผู้ใช้..."
 
 #, fuzzy
-msgid "Connection lost"
-msgstr "เกิดข้อผิดพลาดในการเชื่อมต่อ"
+msgid "Requesting token"
+msgstr "เหลืออีก"
 
 #, fuzzy
-msgid "Get server ..."
-msgstr "แก้ข้อมูลผู้ใช้..."
-
-msgid "Request token"
-msgstr ""
-
-msgid "Couldn't resolve host"
-msgstr ""
+msgid "Unable to resolve hostname"
+msgstr "ไม่สามารถส่งข้อความได้"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "เซิร์ฟเวอร์ไม่ถูกต้อง"
 
 #, fuzzy
-msgid "Connecting server ..."
+msgid "Connecting to server"
 msgstr "เซิร์ฟเวอร์"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "เกิดข้อผิดพลาดในการเชื่อมต่อ"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "ไม่สามารถส่งข้อความได้"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7629,6 +7730,10 @@ msgid ""
 "%s"
 msgstr "ที่อยู่เซิร์ฟเวอร์"
 
+#, c-format
+msgid "%s:%s"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "จาก"
@@ -7639,32 +7744,30 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "เรียกคำสั่ง"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "เซิร์ฟเวอร์"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
 
 #, fuzzy, c-format
@@ -7679,9 +7782,6 @@ msgstr "ล้มเหลว"
 msgid "%d canceled the transfer of %s"
 msgstr "%s ยกเลิกการส่งแฟ้ม %s"
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7735,17 +7835,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7768,6 +7857,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr ""
+
 #, fuzzy
 msgid "Supports"
 msgstr "พอร์ต"
@@ -8443,9 +8535,6 @@ msgstr ""
 msgid "Unit"
 msgstr ""
 
-msgid "Note"
-msgstr ""
-
 msgid "Join Chat"
 msgstr ""
 
@@ -8531,6 +8620,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8589,8 +8681,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "เซิร์ฟเวอร์"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8599,27 +8692,27 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
-msgstr ""
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "ไม่สามารถเปิดแฟ้มได้"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "ไม่สามารถเปิดแฟ้มได้"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -8895,8 +8988,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -8984,6 +9078,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9024,38 +9121,37 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "ไม่มีชื่อ"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "ไม่สามารถเปิดแฟ้มได้"
 
-msgid "Could not connect"
+msgid "Unable to create connection"
 msgstr ""
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
 
-msgid "Could not create listen socket"
-msgstr ""
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+msgid "Unable to create listen socket"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "ชื่อเล่นของ IRC ไม่อนุญาตให้มีช่องว่าง"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "พอร์ตเซิร์ฟเวอร์"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9089,174 +9185,65 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "Looking up %s"
-msgstr ""
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr ""
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr ""
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr ""
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr ""
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr ""
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr ""
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#, c-format
-msgid "Failure."
-msgstr ""
-
-#, c-format
-msgid "Too many matches."
-msgstr ""
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr ""
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr ""
-
-#, c-format
-msgid "Keyword ignored."
-msgstr ""
-
-#, c-format
-msgid "No keywords."
-msgstr ""
-
-#, c-format
-msgid "User has no directory information."
-msgstr ""
-
-#, c-format
-msgid "Country not supported."
-msgstr ""
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "รหัสผ่านใหม่"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr ""
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown signon error has occurred: %s."
+msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-msgid "Invalid Groupname"
-msgstr "ชื่อกลุ่มไม่ถูกต้อง"
-
-msgid "Connection Closed"
-msgstr ""
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "เลือก..."
 
-msgid "Waiting for reply..."
-msgstr "กำลังรอการตอบรับ..."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "ปลั๊กอิน Jabber"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
+#, fuzzy
+msgid "Pager server"
+msgstr "เซิร์ฟเวอร์พร็อกซี"
 
-msgid "Password Change Successful"
+msgid "Pager port"
 msgstr ""
 
-msgid "_Group:"
-msgstr ""
+#, fuzzy
+msgid "File transfer server"
+msgstr "ส่งแฟ้ม"
 
-msgid "Get Dir Info"
+msgid "File transfer port"
 msgstr ""
 
-msgid "Set Dir Info"
+msgid "Chat room locale"
 msgstr ""
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr ""
+msgid "Ignore conference and chatroom invitations"
+msgstr "ไม่สนใจคำเชิญร่วมสนทนากลุ่มหรือประชุม"
 
-msgid "File transfer failed; other side probably canceled."
+msgid "Chat room list URL"
 msgstr ""
 
-msgid "Could not connect for transfer."
+msgid "Yahoo Chat server"
 msgstr ""
 
-msgid "Could not write file header.  The file will not be transferred."
+msgid "Yahoo Chat port"
 msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "บันทึกไอคอนเป็น..."
-
-#, 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] ""
-
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr ""
+msgid "Yahoo JAPAN ID..."
+msgstr "เลือก..."
 
 #. *< type
 #. *< ui_requirement
@@ -9268,11 +9255,11 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr ""
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "ปลั๊กอิน Jabber"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9295,6 +9282,27 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "รหัสผ่านใหม่"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9322,33 +9330,27 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "เพิ่มคู่สนทนาในรายการคู่สนทนาของคุณ?"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
-msgstr ""
-
-msgid "Connection problem"
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "บันทึกการสนทนากับ %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "บันทึกการสนทนากับ %s"
 
 msgid "Not at Home"
 msgstr ""
@@ -9395,7 +9397,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -9411,77 +9413,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr "เปิดกล่องจดหมายเข้า Hotmail"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "เลือก..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-#, fuzzy
-msgid "Pager server"
-msgstr "เซิร์ฟเวอร์พร็อกซี"
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "ส่งแฟ้ม"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "การส่งแฟ้มสำเร็จ"
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "ไม่สนใจคำเชิญร่วมสนทนากลุ่มหรือประชุม"
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9489,6 +9429,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s ขอส่งแฟ้ม %s ให้คุณ"
 
+msgid "Write Error"
+msgstr ""
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9529,13 +9472,8 @@ msgstr ""
 msgid "Last Update"
 msgstr ""
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr ""
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9598,20 +9536,18 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
-msgid "Unable to fetch room list."
+msgid "Connection problem"
 msgstr ""
 
-msgid "User Rooms"
+msgid "Unable to fetch room list."
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
+msgid "User Rooms"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Connection problem with the YCHT server"
+msgstr "บันทึกการสนทนากับ %s"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9730,21 +9666,15 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "เกิดข้อผิดพลาดในการเชื่อมต่อ"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
@@ -9753,9 +9683,6 @@ msgstr ""
 "เกิดข้อผิดพลาดขณะบันทึกรูป: %s\n"
 "%s"
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9853,9 +9780,6 @@ msgstr "ห้ามรบกวน"
 msgid "Extended away"
 msgstr "ไม่อยู่ยาว"
 
-msgid "Mobile"
-msgstr "ใช้ผ่านมือถือ"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -9897,16 +9821,6 @@ msgstr ""
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr ""
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-
 msgid "Calculating..."
 msgstr "กำลังคำนวณ..."
 
@@ -10012,6 +9926,16 @@ msgstr "เกิดข้อผิดพลาดในการเชื่อ
 msgid "Address already in use."
 msgstr ""
 
+#, c-format
+msgid "Error Reading %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
 msgid "Internet Messenger"
 msgstr "โปรแกรมข้อความด่วน"
 
@@ -10059,10 +9983,8 @@ msgstr "แจ้งเตือนเมลใหม่"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "ตัวเลือกสำหรับ %s "
+msgid "_Advanced"
+msgstr "_ระดับสูง"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10098,9 +10020,6 @@ msgstr ""
 msgid "you can see the butterflies mating"
 msgstr ""
 
-msgid "Proxy Options"
-msgstr "พร็อกซี"
-
 msgid "Proxy _type:"
 msgstr "ชนิด_พร็อกซี:"
 
@@ -10129,8 +10048,9 @@ msgstr "_พื้นฐาน"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_ระดับสูง"
+#, fuzzy
+msgid "_Proxy"
+msgstr "พร็อกซี"
 
 msgid "Enabled"
 msgstr "ใช้งาน"
@@ -10167,16 +10087,17 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "รายชื่อห้อง"
+msgid "A_ccount"
+msgstr "บัญชี:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "ใส่ข้อมูลที่จำเป็นในการร่วมสนทนากลุ่ม\n"
 
-msgid "_Account:"
-msgstr "_บัญชี:"
+#, fuzzy
+msgid "Room _List"
+msgstr "รายชื่อห้อง"
 
 msgid "_Block"
 msgstr "_บล็อค"
@@ -10195,6 +10116,16 @@ msgid "I_M"
 msgstr "_ส่งข้อความ"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "เ_พิ่มการสนทนากลุ่ม"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "ส่งแ_ฟ้ม"
 
@@ -10206,7 +10137,11 @@ msgid "View _Log"
 msgstr "ดู_บันทึกการสนทนา"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "ผู้ใช้ออฟไลน์"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "ผู้ใช้ออฟไลน์"
 
 msgid "_Alias..."
@@ -10345,6 +10280,10 @@ msgstr "/เครื่องมือ/เตือน_สถานะคู่
 msgid "/Tools/_Certificates"
 msgstr "/เครื่องมือ/_ปรับแต่ง"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/เครื่องมือ/บันทึกของ_ระบบ"
+
 msgid "/Tools/Plu_gins"
 msgstr "/เครื่องมือ/ป_ลั๊กอิน"
 
@@ -10354,10 +10293,6 @@ msgstr "/เครื่องมือ/_ปรับแต่ง"
 msgid "/Tools/Pr_ivacy"
 msgstr "/เครื่องมือ/ความเป็นส่วน_ตัว"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/เครื่องมือ/บันทึกของ_ระบบ"
-
 msgid "/Tools/_File Transfers"
 msgstr "/เครื่องมือ/ส่งแ_ฟ้ม"
 
@@ -10482,8 +10417,8 @@ msgstr "ผู้ใช้เรียงเอง"
 msgid "By status"
 msgstr "ตามสถานะ"
 
-msgid "By log size"
-msgstr "ตามขนาดแฟ้มบันทึก"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10501,6 +10436,9 @@ msgstr "เชื่อมต่อ"
 msgid "Re-enable"
 msgstr "เ_ปลี่ยนชื่อ"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10591,6 +10529,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "นามแฝง:"
 
+msgid "_Group:"
+msgstr ""
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10624,6 +10565,115 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "สีพื้นหลัง"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "ตัวเลือกการล็อกอิน"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "สีพื้นหลัง"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_ขยาย"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "เลือกสีของพื้นหลัง"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_ย่อ"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "เลือกสีของพื้นหลัง"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "พอร์ต"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "ออนไลน์ตั้งแต่"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "ไม่อยู่"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "ออฟไลน์"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "ไม่ได้ใช้งาน"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "ข้อความถูกส่ง"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "เปลี่ยนข้อมูลผู้ใช้ของ %s"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -10643,12 +10693,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "เชิญเข้าห้องสนทนากลุ่ม"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "ใส่ชื่อคู่สนทนาที่ต้องการเชิญ รวมถึงข้อความเชิญ"
-
 msgid "_Buddy:"
 msgstr "_คู่สนทนา:"
 
@@ -10677,7 +10721,8 @@ msgstr "ไม่สนใจ"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "ตอบล่าสุด"
 
 msgid "Unable to save icon file to disk."
@@ -10725,6 +10770,22 @@ msgstr "/สนทนา/บันทึกเ_ป็น..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/สนทนา/_ล้างข้อความเก่า"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/สนทนา/ปิ_ด"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/สนทนา/ปิ_ด"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/สนทนา/ปิ_ด"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/สนทนา/ดูบันทึกการ_สนทนา"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/สนทนา/_ส่งแฟ้ม..."
 
@@ -10802,6 +10863,18 @@ msgstr "/_สนทนา"
 msgid "/Conversation/View Log"
 msgstr "/สนทนา/ดูบันทึกการสนทนา"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/สนทนา/ปิ_ด"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/สนทนา/ดูบันทึกการสนทนา"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/สนทนา/ปิ_ด"
+
 msgid "/Conversation/Send File..."
 msgstr ""
 
@@ -10988,6 +11061,9 @@ msgstr "ที่อยู่"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr ""
 
@@ -11113,6 +11189,10 @@ msgstr ""
 msgid "Hungarian"
 msgstr ""
 
+#, fuzzy
+msgid "Armenian"
+msgstr "นามแฝง"
+
 msgid "Indonesian"
 msgstr ""
 
@@ -11129,6 +11209,9 @@ msgstr ""
 msgid "Ubuntu Georgian Translators"
 msgstr "ผู้แปลในปัจจุบัน"
 
+msgid "Khmer"
+msgstr ""
+
 msgid "Kannada"
 msgstr ""
 
@@ -11150,6 +11233,9 @@ msgstr ""
 msgid "Macedonian"
 msgstr ""
 
+msgid "Mongolian"
+msgstr ""
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11206,6 +11292,9 @@ msgstr ""
 msgid "Swedish"
 msgstr ""
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr ""
 
@@ -11257,7 +11346,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 
 msgid "Current Developers"
@@ -11515,7 +11621,7 @@ msgstr "สีสำหรับลิงก์"
 msgid "Hyperlink visited color"
 msgstr "สีสำหรับเน้นข้อความ"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11553,15 +11659,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "เลิกแจ้งเตือนเมื่อ"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "แจ้งเตือนเมลใหม่"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11574,15 +11687,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "แจ้งเตือนเมลใหม่"
 
-msgid "_Copy Email Address"
-msgstr "คัดลอก_อีเมล"
-
-msgid "_Open Link in Browser"
-msgstr "เปิดลิงก์ในเ_บราว์เซอร์"
-
-msgid "_Copy Link Location"
-msgstr "คัดลอกที่อยู่_ลิงก์"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11615,11 +11719,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "บันทึกรูปภาพ"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "บันทึก_รูปภาพ..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "แสดงหน้าแสดงอารมณ์พิเศษที่คู่สนทนาส่งมา"
 
@@ -11708,10 +11811,6 @@ msgid "Font Face"
 msgstr "รูปแบบอักษร"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "สีพื้นหลัง"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "สีตัวอักษร"
 
@@ -11839,6 +11938,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11856,6 +11956,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11887,11 +11988,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "ปลั๊กอิน"
 
-msgid "Open All Messages"
-msgstr "เปิดข้อความทั้งหมด"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">คุณมีเมลใหม่!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "กำลังคำนวณ..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, fuzzy, c-format
 msgid "%s has %d new message."
@@ -11920,6 +12037,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "ข้อความ"
+
+msgid "Open All Messages"
+msgstr "เปิดข้อความทั้งหมด"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">คุณมีเมลใหม่!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "เพิ่มการเตือนสถานะคู่สนทนา"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">คุณมีเมลใหม่!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -11969,10 +12107,17 @@ msgstr "<b>รายละเอียดของปลั๊กอิน</b>"
 msgid "Select a file"
 msgstr "เลือกแฟ้ม"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "แก้ไขการเตือนสถานะคู่สนทนา"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "คู่สนทนาที่ต้องการให้แจ้งเตือน"
 
+msgid "_Account:"
+msgstr "_บัญชี:"
+
 msgid "_Buddy name:"
 msgstr "_ชื่อคู่สนทนา:"
 
@@ -12040,7 +12185,58 @@ msgstr "เตือน_ซ้ำ"
 msgid "Pounce Target"
 msgstr "เป้าหมาย"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "เ_ริ่มพิมพ์"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "คู่สนทนากำลังพิมพ์..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "เ_ข้าระบบ"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s กลับมาจากสถานะไม่ได้ใช้งาน (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "_กลับจากไม่อยู่"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "หยุดพิมพ์"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "_ออกจากระบบ"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "ไม่ใ_ช้งาน"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "เมื่อไม่อยู่"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "ส่ง_ข้อความ"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "ข้อความใหญ่เกินไป"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12061,6 +12257,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "บันทึกการสนทนากับ %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "รายชื่อคู่สนทนา"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "ไอคอนในถาดของระบบ"
 
@@ -12073,7 +12275,7 @@ msgid "On unread messages"
 msgstr "ข้อความที่ไม่ได้อ่าน"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "บันทึกการสนทนากับ %s"
 
 #, fuzzy
@@ -12083,6 +12285,10 @@ msgstr "_ซ่อนการสนทนาใหม่"
 msgid "When away"
 msgstr "เมื่อไม่อยู่"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "แสดงหน้าต่างสนทนานั้น"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12142,10 +12348,6 @@ msgstr "ใช้ smooth-scrolling"
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "แสดงหน้าต่างสนทนานั้น"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12179,13 +12381,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-msgid "ST_UN server:"
-msgstr "เซิร์ฟเวอร์ ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_หาหมายเลขไอพีอัตโนมัติ"
 
 msgid "Public _IP:"
@@ -12206,6 +12406,10 @@ msgstr "พอร์ตเ_ริ่มต้น:"
 msgid "_End port:"
 msgstr "พอร์ต_สุดท้าย:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "เซิร์ฟเวอร์พร็อกซี"
@@ -12235,6 +12439,10 @@ msgstr "เซิร์ฟเวอร์พร็อกซี"
 msgid "No proxy"
 msgstr "ไม่ใช้พร็อกซี"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_ผู้ใช้:"
 
@@ -12397,13 +12605,13 @@ msgstr "เมื่อไม่อยู่หรือไม่ได้ใช
 msgid "Auto-away"
 msgstr "ตั้งไม่อยู่อัตโนมัติ"
 
-msgid "Change status when _idle"
-msgstr "เปลี่ยนสถานะเมื่อไ_ม่ได้ใช้งาน"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "เ_วลาเป็นนาทีสำหรับเปลี่ยนสถานะ"
 
+msgid "Change status when _idle"
+msgstr "เปลี่ยนสถานะเมื่อไ_ม่ได้ใช้งาน"
+
 msgid "Change _status to:"
 msgstr "เปลี่ยน_สถานะเป็น:"
 
@@ -12556,28 +12764,18 @@ msgstr "บั_นทึกและใช้"
 msgid "Status for %s"
 msgstr "สถานะของ %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "แทรกหน้าแสดงอารมณ์"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 msgid "Duplicate Shortcut"
 msgstr ""
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "ใช้สถานะที่_ต่างกันตามแต่ละบัญชี"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "แทรกหน้าแสดงอารมณ์"
@@ -12586,24 +12784,30 @@ msgstr "แทรกหน้าแสดงอารมณ์"
 msgid "Add Smiley"
 msgstr "หน้าแสดงอารมณ์!"
 
-# msgstr ""
-# "เกิดข้อผิดพลาดขณะบันทึกรูป: %s\n"
-# "%s"
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "บันทึกรูปภาพ"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "พอร์ต"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "หน้าแสดงอารมณ์!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "พอร์ต"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "ไอคอนในการสนทนา"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -12685,8 +12889,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -12716,6 +12920,16 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "เ_ปิดลิงก์ใน:"
+
+msgid "_Copy Link Location"
+msgstr "คัดลอกที่อยู่_ลิงก์"
+
+msgid "_Copy Email Address"
+msgstr "คัดลอก_อีเมล"
+
 msgid "Save File"
 msgstr "บันทึกแฟ้ม"
 
@@ -12812,6 +13026,73 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "ที่อยู่เซิร์ฟเวอร์"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "ใส่เซิร์ฟเวอร์สำหรับประชุม"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "ใส่เซิร์ฟเวอร์สำหรับประชุมที่ต้องการค้นหา"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "ค้นหาคู่สนทนา"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "รายชื่อคู่สนทนา"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "ไ_ม่อยู่"
+
+#, fuzzy
+msgid "Directory"
+msgstr "ล้าง"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "คำอธิบาย"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "เ_บราว์เซอร์:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "ที่อยู่เซิร์ฟเวอร์"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "นักพัฒนา"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -13192,7 +13473,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13302,12 +13583,6 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13319,6 +13594,10 @@ msgstr "สีสำหรับเน้นข้อความ"
 msgid "Highlighted Message Name Color"
 msgstr "เน้นสิ่งที่เข้าเงื่อนไข"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "เลิกแจ้งเตือนเมื่อ"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13348,35 +13627,23 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr ""
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "แจ้งเตือนเมลใหม่"
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "ปิด"
+
 msgid "Fonts"
 msgstr "แบบอักษร"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13460,7 +13727,7 @@ msgstr "บันทึกการสนทนากับ %s"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13512,6 +13779,108 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "ไม่ได้ล็อกอิน"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "ไม่ได้ล็อกอิน"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "ร่วมสนทนากลุ่ม"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "ไม่สนใจ"
+
+#, fuzzy
+msgid "Founder"
+msgstr "ดังมาก"
+
+#, fuzzy
+msgid "Operator"
+msgstr "ล้าง"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "_อนุญาต"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "ผู้ใช้ไม่อยู่ในกลุ่ม"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "ข้อมูลคู่สนทนา"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "เหลืออีก"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "สถานะของ %s"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "บันทึกไอคอน"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "<hr><b>ข้อมูลที่อยู่</b>%s%s"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "รายชื่อคู่สนทนา"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "รายชื่อคู่สนทนา"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13667,9 +14036,6 @@ msgstr ""
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr ""
-
 #, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "ตัวเลือกการล็อกอิน"
@@ -13678,7 +14044,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13719,6 +14085,184 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Server has disconnected"
+#~ msgstr "การเชื่อมต่อกับเซิร์ฟเวอร์ถูกตัด"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "ที่อยู่ (เพิ่มเติม)"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "ตั้งชื่อห้องสนทนา"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "เรียกคำสั่ง"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "เกิดข้อผิดพลาดในการลงทะเบียน"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "ตัวเลือกสำหรับผู้ใช้"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "การแจ้งเตือนข้อความ"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "บันทึกการสนทนา"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "เริ่มการตรวจสอบผู้ใช้"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "ชื่อผู้ใช้"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ที่อยู่อีเมล"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "แฟ้มประวัติ MSN"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "ชื่อเล่น"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "ได้รับข้อความ"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "ตัวเลือกสำหรับผู้ใช้"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "คู่สนทนากำลังพิมพ์..."
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "ชื่อผู้ใช้"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "คู่สนทนากำลังพิมพ์..."
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "ข้อความที่ไม่ได้อ่าน"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "คุณถูกตัดการเชื่อมต่อจากเซิร์ฟเวอร์"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "ชื่อผู้ใช้ไม่ถูกต้อง"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "เซิร์ฟเวอร์"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "เกิดข้อผิดพลาดในการเชื่อมต่อ"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "รหัสผ่านใหม่"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "การส่งแฟ้มสำเร็จ"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "ใช้สถานะที่_ต่างกันตามแต่ละบัญชี"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "เปิดข้อความทั้งหมด"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "ใส่ชื่อคู่สนทนาที่ต้องการเชิญ รวมถึงข้อความเชิญ"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "เพิ่มคู่สนทนา"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "ไม่สามารถส่งข้อความได้"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "รหัสผ่านใหม่"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "ชื่อกลุ่มไม่ถูกต้อง"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "กำลังรอการตอบรับ..."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "บันทึกไอคอนเป็น..."
+
+#~ msgid "%s Options"
+#~ msgstr "ตัวเลือกสำหรับ %s "
+
+#~ msgid "Proxy Options"
+#~ msgstr "พร็อกซี"
+
+#~ msgid "By log size"
+#~ msgstr "ตามขนาดแฟ้มบันทึก"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "เปิดลิงก์ในเ_บราว์เซอร์"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "เซิร์ฟเวอร์ ST_UN:"
+
+# msgstr ""
+# "เกิดข้อผิดพลาดขณะบันทึกรูป: %s\n"
+# "%s"
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "บันทึกรูปภาพ"
+
 #, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "มีแฟ้มนี้อยู่แล้ว"
@@ -13782,10 +14326,6 @@ msgstr ""
 #~ msgstr "เกิดปัญหาในการเปลี่ยนรหัสผ่าน"
 
 #, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
-
-#, fuzzy
 #~ msgid "Connecting server %s, retries %d"
 #~ msgstr "เซิร์ฟเวอร์"
 
@@ -13825,10 +14365,6 @@ msgstr ""
 #~ msgstr "นักพัฒนา"
 
 #, fuzzy
-#~ msgid "XMPP developer"
-#~ msgstr "นักพัฒนา"
-
-#, fuzzy
 #~ msgid "<b>ChangeLog:</b><br>%s"
 #~ msgstr "%s<b>ทั่วไป</b><br>%s"
 
@@ -13895,10 +14431,6 @@ msgstr ""
 #~ msgstr "เกิดข้อผิดพลาดในการลงทะเบียน"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
-
-#, fuzzy
 #~ msgid "TCP Address"
 #~ msgstr "หมายเลขไอพี"
 
@@ -13976,10 +14508,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_ข้อความ:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "บัญชี:"
-
 #~ msgid "TCP port"
 #~ msgstr "พอร์ต TCP"
 
diff --git a/po/tr.po b/po/tr.po
index 87d14a8184..d080fec40f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-11-09 00:33+0200\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
 "Language-Team:  <tr@li.org>\n"
@@ -34,13 +34,13 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Daha fazla bilgi için `%s -h' deneyin.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -621,21 +621,6 @@ msgstr "Kayıt tutma durduruldu. Bundan sonraki iletiler kaydedilmeyecek."
 msgid "Send To"
 msgstr "Gönder"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "İleti içine ekle"
-
-msgid "Invite"
-msgstr "Davet Et"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"İsterseniz bir davet mesajıyla beraber davet etmek istediğiniz kişinin "
-"ismini girin."
-
 msgid "Conversation"
 msgstr "Yazışma"
 
@@ -887,6 +872,41 @@ msgstr "Yazışmalar"
 msgid "System Log"
 msgstr "Sistem Kayıtları"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Hesaplanıyor..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Kabul Et"
+
+msgid "Reject"
+msgstr "Reddet"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Sobetten ayrıldınız."
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "E-Postalar"
 
@@ -920,6 +940,9 @@ msgstr "Devam Et"
 msgid "IM"
 msgstr "Anında Mesajlaşma"
 
+msgid "Invite"
+msgstr "Davet Et"
+
 msgid "(none)"
 msgstr "(hiçbiri)"
 
@@ -1123,7 +1146,6 @@ msgstr "%s uzakta durumuna geçti (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s size bir ileti göndermek istiyor, (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Bilinmeyen uyarı olayı. Lütfen bunu raporlayın !"
 
@@ -1169,7 +1191,6 @@ msgstr "Durumunuzu değiştirmeden önce geçecek süre"
 msgid "Change status to"
 msgstr "Durumu değiştir"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Yazışmalar"
 
@@ -1494,7 +1515,6 @@ msgstr ""
 "Bu eklenti yeni bir yazışma açıldığında eski yazışmaları şimdiki yazışmanın "
 "başına ekler."
 
-#, c-format
 msgid "Online"
 msgstr "Çevrimiçi"
 
@@ -1543,6 +1563,28 @@ msgstr "Son Kayıt"
 msgid "Lastlog plugin."
 msgstr "Son Kayıt eklentisi"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "hesaplar"
 
@@ -1641,13 +1683,6 @@ msgstr "%s için sertifika kabul edilsin mi?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Kabul Et"
-
-msgid "Reject"
-msgstr "Reddet"
-
 msgid "_View Certificate..."
 msgstr "_Sertifikayı Göster..."
 
@@ -1734,6 +1769,8 @@ msgstr "+++ %s giriş yaptı"
 msgid "+++ %s signed off"
 msgstr "+++ %s çıkış yaptı"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Bilinmeyen Hata"
 
@@ -1780,6 +1817,18 @@ msgstr "%s odadan ayrıldı."
 msgid "%s left the room (%s)."
 msgstr "%s odadan ayrıldı (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Konferansa Davet Et"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"İsterseniz bir davet mesajıyla beraber davet etmek istediğiniz kişinin "
+"ismini girin."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Bağlantı sağlanamadı: %s"
@@ -1914,7 +1963,6 @@ msgstr "%s transferi, %s tarafından başlatılıyor."
 msgid "Transfer of file %s complete"
 msgstr "%s transferi tamamlandı"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Dosya transferi tamamlandı"
 
@@ -1922,7 +1970,6 @@ msgstr "Dosya transferi tamamlandı"
 msgid "You canceled the transfer of %s"
 msgstr "Dosya Transferinden Vazgeçildi (%s)"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Dosya transferinden vazgeçildi"
 
@@ -2126,11 +2173,14 @@ msgstr "<font color=\"red\"><b>Dosya okunamıyor: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Otomatik-cevap>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Bağlantı oluşturma hatası"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s kullanıyorsunuz fakat bu eklenti %s gerektiriyor."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Bu eklentinin bir kimliği yok."
 
@@ -2524,7 +2574,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2573,7 +2623,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2601,6 +2651,32 @@ msgstr "Çevrimdışı iletileri uyarıcı içine kaydet"
 msgid "Do not ask. Always save in pounce."
 msgstr "Sorma. Herzaman uyarıcıya kaydet."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Parola"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2790,18 +2866,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "Bağlantı başlatılamadı"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Ad"
 
@@ -2833,6 +2909,11 @@ msgstr "Bonjour Protokolü Eklentisi"
 msgid "Purple Person"
 msgstr "Mor Kişi"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Yer"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2843,14 +2924,21 @@ msgstr "%s yazışmayı kapattı."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "İletiniz gönderilemedi, yazışma başlatılamadı."
 
-msgid "Cannot open socket"
-msgstr "Soket açılamıyor"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Soket oluşturulamadı:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Soket porta yönlendirilemedi"
 
-msgid "Could not listen on socket"
-msgstr "Soketten okunamıyor"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Soket oluşturulamadı:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -2900,13 +2988,16 @@ msgstr "Kişi listesi Kaydet..."
 msgid "Load buddylist from file..."
 msgstr "Kişi listesini dosyadan yükle..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Kayıt alanlarını doldurun."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Parolalar çelişiyor."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Yeni hesap kaydedilemedi. Bir hata oluştu.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2918,14 +3009,15 @@ msgstr "Kayıt başarıyla tamamlandı!"
 msgid "Password"
 msgstr "Parola"
 
-msgid "Password (retype)"
-msgstr "Parola (tekrar)"
+msgid "Password (again)"
+msgstr "Yeni parola (tekrar)"
 
-msgid "Enter current token"
-msgstr "Geçerli ifadeyi girin"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Geçerli ifade"
+#, fuzzy
+msgid "Captcha"
+msgstr "Resmi Kaydet"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Yeni Gadu-Gadu Hesabı Oluştur"
@@ -2978,6 +3070,15 @@ msgstr "Parola başarıyla değiştirildi!"
 msgid "Current password"
 msgstr "Şimdiki parola"
 
+msgid "Password (retype)"
+msgstr "Parola (tekrar)"
+
+msgid "Enter current token"
+msgstr "Geçerli ifadeyi girin"
+
+msgid "Current token"
+msgstr "Geçerli ifade"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Lütfen UIN için şimdiki parolanızı ve yeni parolanızı girin:"
 
@@ -2991,13 +3092,13 @@ msgstr "Kişi için bir sohbet seçin : %s"
 msgid "Add to chat..."
 msgstr "Sohbete ekle..."
 
+#. Global
 msgid "Available"
 msgstr "Çevrimiçi"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Uzakta"
 
@@ -3025,8 +3126,8 @@ msgstr "Uygun kullanıcı bulunamadı"
 msgid "There are no users matching your search criteria."
 msgstr "Arama kirterlerinize uyan bir kullanıcı bulunamadı."
 
-msgid "Unable to read socket"
-msgstr "Soket okunamıyor"
+msgid "Unable to read from socket"
+msgstr "Soketten okunamıyor"
 
 msgid "Buddy list downloaded"
 msgstr "Kişi listesi indirildi"
@@ -3040,8 +3141,14 @@ msgstr "Kişi listesi gönderildi"
 msgid "Your buddy list was stored on the server."
 msgstr "Kişi listeniz sunucuya gönderildi."
 
-msgid "Connection failed."
-msgstr "Bağlantı kurulamadı."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Bağlandı"
+
+msgid "Connection failed"
+msgstr "Bağlantı Kurulamıyor"
 
 msgid "Add to chat"
 msgstr "Sohbete ekle"
@@ -3049,13 +3156,23 @@ msgstr "Sohbete ekle"
 msgid "Chat _name:"
 msgstr "Sohbet _adı:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Sunucuya bağlanılamadı."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Bağlanılıyor"
+
 msgid "Chat error"
 msgstr "Sohbet hatası"
 
 msgid "This chat name is already in use"
 msgstr "Bu sohbet adı zaten kullanımda"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Sunucuya bağlı değilsiniz."
 
 msgid "Find buddies..."
@@ -3097,6 +3214,10 @@ msgstr "Polonyalı popüler Hızlı Mesajlaşma"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Kullanıcısı"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Kullanıcı Bilgisi Ayarla..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Bilinmeyen komut: %s"
@@ -3111,7 +3232,8 @@ msgstr "Konu ayarlanmamış"
 msgid "File Transfer Failed"
 msgstr "Dosya aktarımı başarısız oldu"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Bir dinleme portu açılamadı."
 
 msgid "Error displaying MOTD"
@@ -3127,8 +3249,18 @@ msgstr "Bu bağlantıyla ilgilişkilendirilmiş bir MOTD yok."
 msgid "MOTD for %s"
 msgstr "%s için MOTD"
 
-msgid "Server has disconnected"
-msgstr "Sunucu bağlantısı kesildi"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Sunucu ile bağlantı kesildi:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTD'yi göster"
@@ -3139,25 +3271,24 @@ msgstr "_Kanal"
 msgid "_Password:"
 msgstr "Ş_ifre"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC isimler boşluk karakteri içeremez"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Bağlanılıyor"
-
 msgid "SSL support unavailable"
 msgstr "SSL desteği mevcut değil"
 
-msgid "Couldn't create socket"
-msgstr "Soket yaratılamadı"
+msgid "Unable to connect"
+msgstr "Bağlanılamıyor"
 
-msgid "Couldn't connect to host"
-msgstr "Ana bilgisayara bağlanılamadı"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s konumuna bağlanılamadı"
 
-msgid "Read error"
-msgstr "Okuma hatası"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Sunucu bağlantıyı kapattı."
 
 msgid "Users"
 msgstr "Kullanıcılar"
@@ -3339,6 +3470,17 @@ msgstr ""
 "Seçtiğiniz hesap adı sunucu tarafından reddedildi.  Muhtemelen geçersiz "
 "karakterler içeriyor."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Bu sohbet adı zaten kullanımda"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Takma ad"
+
 msgid "Cannot change nick"
 msgstr "Takma ad değiştirilemez"
 
@@ -3570,12 +3712,13 @@ msgstr "Ad-Hoc Komutu Başarısız"
 msgid "execute"
 msgstr "çalıştır"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Bu sunucu bağlanmak için TLS/SSL gerektirir. Hiç TLS/SSL desteği bulunamadı."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Bu sunucu bağlanmak için TLS/SSL gerektirir. Hiç TLS/SSL desteği bulunamadı."
 
@@ -3593,18 +3736,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Şifresiz Metin Yetkilendirmesi"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Kimlik denetimi başarısız"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Hata: sunucudan geçersiz cevap"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Sunucu bir kimlik doğrulama yöntemi kulanmıyor"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Sunucudan geçersiz yanıt"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL hatası"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Sebep yazılmamış."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Desteklenmeyen Sürüm"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Sunucu ile bağlantı sağlanamadı:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Sunucu ile bağlantı sağlanamadı:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Bağlantı başlatılamadı"
+
 msgid "Full Name"
 msgstr "Tam İsim"
 
@@ -3671,158 +3850,9 @@ msgstr "İstemci"
 msgid "Operating System"
 msgstr "İşletim Sistemi"
 
-msgid "Last Activity"
-msgstr "Son Etkinlik"
-
-msgid "Service Discovery Info"
-msgstr "Servis Bulma Bilgileri"
-
-msgid "Service Discovery Items"
-msgstr "Servis Bulma Ögeleri"
-
-msgid "Extended Stanza Addressing"
-msgstr "Genişletilmiş Stanza Adreslemesi"
-
-msgid "Multi-User Chat"
-msgstr "Çok Kullanıcılı Sohbet"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc Komutları"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Kullanıcı Konumu"
-
-msgid "User Avatar"
-msgstr "Kullanıcı Resmi"
-
-msgid "Chat State Notifications"
-msgstr "Sohbet Durum Uyarısı"
-
-msgid "Software Version"
-msgstr "Yazılım Sürümü"
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr "Dosya Aktarımı"
-
-msgid "User Mood"
-msgstr "Kullanıcı Modu"
-
-msgid "User Activity"
-msgstr "Kullanıcı Etkinliği"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr "Erişebilirlik Adresi"
-
-msgid "User Profile"
-msgstr "Kullanıcı Profili"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Kullanıcı Takma Adı"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "İleti Alındığında"
-
-msgid "Public Key Publishing"
-msgstr "Genel Anahtar Yayınlama"
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza Şifrelemesi"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Yetenekler"
+#, fuzzy
+msgid "Local Time"
+msgstr "Yerel Dosya:"
 
 msgid "Priority"
 msgstr "Öncelik"
@@ -3830,6 +3860,14 @@ msgstr "Öncelik"
 msgid "Resource"
 msgstr "Kaynak"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Çevrimiçi"
+
 msgid "Middle Name"
 msgstr "İkinci İsim"
 
@@ -3876,7 +3914,6 @@ msgstr "Konuşkan"
 msgid "Extended Away"
 msgstr "Uzun Süreli Uzakta"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Rahatsız Etme"
 
@@ -3995,29 +4032,26 @@ msgstr "Sorgulamak için bir konferans sunucusu seçin"
 msgid "Find Rooms"
 msgstr "Oda Bul"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Görünen İsim:"
 
-msgid "Write error"
-msgstr "Yazma hatası"
+#, fuzzy
+msgid "No users found"
+msgstr "Uygun kullanıcı bulunamadı"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Düz metin"
+msgid "Roles:"
+msgstr "Rol"
 
-msgid "Read Error"
-msgstr "Okuma hatası"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Düz metin"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Sunucu ile bağlantı sağlanamadı:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Soket oluşturulamadı"
 
 msgid "Invalid XMPP ID"
 msgstr "Geçersiz XMPP Kimliği"
@@ -4025,6 +4059,10 @@ msgstr "Geçersiz XMPP Kimliği"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Geçersiz XMPP Kimliği. Alan adı ayarlanmalı."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Sunucuya bağlanılamadı"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s kaydı başarılı oldu"
@@ -4049,9 +4087,6 @@ msgstr "Kayıt Silme Başarılı"
 msgid "Unregistration Failed"
 msgstr "Kayıt Silme Başarısız Oldu"
 
-msgid "Already Registered"
-msgstr "Zaten Kayıtlı"
-
 msgid "State"
 msgstr "Durum"
 
@@ -4064,6 +4099,9 @@ msgstr "Telefon"
 msgid "Date"
 msgstr "Tarih"
 
+msgid "Already Registered"
+msgstr "Zaten Kayıtlı"
+
 msgid "Unregister"
 msgstr "Kayıt Sil"
 
@@ -4091,6 +4129,10 @@ msgstr "Yeni %s Hesabına Kayıt Ol"
 msgid "Change Registration"
 msgstr "Kaydı Değiştir"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Sunucuya bağlanılamadı"
+
 msgid "Error unregistering account"
 msgstr "Hesap silinirken hata oluştu"
 
@@ -4109,9 +4151,18 @@ msgstr "Kimlik Doğrulaması Yapılıyor"
 msgid "Re-initializing Stream"
 msgstr "Yayın Yeniden Başlatılıyor"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Yetki Verilmemiş"
 
+msgid "Mood"
+msgstr "Ruh Hali"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "İkisi de"
 
@@ -4133,12 +4184,6 @@ msgstr "Hiçbiri"
 msgid "Subscription"
 msgstr "Üyelik"
 
-msgid "Mood"
-msgstr "Ruh Hali"
-
-msgid "Now Listening"
-msgstr ""
-
 msgid "Mood Text"
 msgstr ""
 
@@ -4181,9 +4226,6 @@ msgstr "Parolanız değiştirildi."
 msgid "Error changing password"
 msgstr "Parola değiştirilirken hata"
 
-msgid "Password (again)"
-msgstr "Yeni parola (tekrar)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP Parolası Değiştir"
 
@@ -4377,17 +4419,23 @@ msgid "Unable to ping user %s"
 msgstr "%s kullanıcısına ping atılamadı"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s kullanıcısına bir titreşim gönderiliyor..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4397,9 +4445,36 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr ""
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "%s kullanıcısına bir titreşim gönderiliyor..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "İleti %s kişisine gönderilemedi, geçersiz JID"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Dosya %s kişisine gönderilemedi, kullanıcı bağlı değil"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "%s kullanıcısına dosya gönderilemedi, kullanıcı bağlı değil"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Kayıt Başarısız Oldu"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Lütfen bilgilerini görmek istediğiniz kişinin görüntü veya etiket ismini "
+"giriniz."
+
+msgid "Select a Resource"
+msgstr "Bir Kaynak Seçin"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Kişiyle Sohbete _Başla"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Sohbet odasını düzenle."
@@ -4422,16 +4497,18 @@ msgstr ""
 "ban &lt;user&gt; [room]:  Kullanıcıyı odadan uzun süreli uzaklaştırır "
 "(banlar)."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Bir "
 "kullanıcının odayla ilişkisini ayarlar."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;kullanıcı&gt; &lt;yönetici|katılımcı|ziyaretçi|hiçbiri&gt;: Bir "
 "kullanıcının odadaki rolünü ayarla."
@@ -4496,6 +4573,9 @@ msgstr "Bağlantı sunucusu"
 msgid "File transfer proxies"
 msgstr "Dosya aktarım portu"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4535,6 +4615,14 @@ msgstr "XML ayrıştırma hatası"
 msgid "Unknown Error in presence"
 msgstr "Bilinmeyen Hata"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "%s sohbetine katılırken hata"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "%s sohbetinde hata"
+
 msgid "Create New Room"
 msgstr "Yeni Oda Oluştur"
 
@@ -4551,13 +4639,32 @@ msgstr "_Odayı Düzenle"
 msgid "_Accept Defaults"
 msgstr "Varsayılanları _Kabul Et"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "%s sohbetine katılırken hata"
+#, fuzzy
+msgid "No reason"
+msgstr "Sebep yazılmamış."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "%s sohbetinde hata"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s tarafından atıldınız: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s tarafından atıldınız (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Dosyayı açarken bir hata oluştu."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Dosya aktarımı başarısız oldu"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Dosya açılamadı '%s': %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4584,9 +4691,6 @@ msgstr ""
 "Lütfen bilgilerini görmek istediğiniz kişinin görüntü veya etiket ismini "
 "giriniz."
 
-msgid "Select a Resource"
-msgstr "Bir Kaynak Seçin"
-
 msgid "Edit User Mood"
 msgstr ""
 
@@ -4619,8 +4723,19 @@ msgstr "Eylemler"
 msgid "Select an action"
 msgstr "Bir eylem seçin"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "MSN Adres Defteri getirilemedi"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\" eklenemiyor."
+
+msgid "Buddy Add error"
+msgstr ""
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Belirlenen görüntü adı geçersiz."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4846,7 +4961,7 @@ msgstr "Ebeveyn izinsiz Çocuk Passport hesabı"
 msgid "Passport account not yet verified"
 msgstr "Passport hesabı henüz doğrulanmadı"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Passport hesabı henüz doğrulanmadı"
 
@@ -4870,6 +4985,10 @@ msgstr "Önerilen İrtibat"
 msgid "Non-IM Contacts"
 msgstr "Kişiyi Kaldır"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr "Uyarı"
 
@@ -4940,6 +5059,13 @@ msgstr "Bir SMS gönder."
 msgid "Page"
 msgstr "Sayfa"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "İş"
+
 msgid "Has you"
 msgstr ""
 
@@ -4981,6 +5107,13 @@ msgstr "Sanatçılar"
 msgid "Album"
 msgstr "Adium"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "Başlık"
+
+msgid "Office Title"
+msgstr ""
+
 msgid "Set Friendly Name..."
 msgstr "Arkadaşlık İsmi Ayarla..."
 
@@ -5015,9 +5148,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "MSN için SSL desteği gereklidir. Lütfen geçerli bir SSL kütüphanesi yükleyin."
 
-msgid "Failed to connect to server."
-msgstr "Sunucuya bağlanılamadı"
-
 msgid "Error retrieving profile"
 msgstr "Profil alınırken hata"
 
@@ -5170,8 +5300,9 @@ msgid ""
 "does not exist."
 msgstr ""
 
-msgid "Profile URL"
-msgstr "Profil URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "Çevrimdışıyken gizle"
 
 #. *< type
 #. *< ui_requirement
@@ -5205,65 +5336,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID Kimlik Doğrulaması: Bağlanılamadı"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s geçerli bir grup değil."
-
-msgid "Unknown error."
-msgstr "Bilinmeyen Hata"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s - %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s size bir titreşim gönderdi!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Bilinmeyen hata (%d)"
 
 msgid "Unable to add user"
 msgstr "Kullanıcı eklenemedi"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Bilinmeyen hata (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Arama sonuçlarınız"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kullanıcı %s 'a eklenemiyor (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s içindeki kullanıcı engellenemiyor (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s içindeki kullanıcıya izin verilemiyor (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s eklenemiyor, çünkü listeniz dolu durumda."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s geçerli bir passport hesabı değil."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Bu Servis Geçici Olarak Hizmet Dışı"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "İleti gönderilmedi, çünkü oturum açmamışsınız."
 
-msgid "Unable to rename group"
-msgstr "Grup adı değiştirilemiyor"
-
-msgid "Unable to delete group"
-msgstr "Grup silinemiyor"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5302,9 +5396,6 @@ msgstr "İleti gönderilmemiş olabilir çünkü bilinmeyen bir hata meydana gel
 msgid "Message was not sent because an unknown error occurred."
 msgstr "İleti gönderilmemiş olabilir çünkü bilinmeyen bir hata meydana geldi:"
 
-msgid "Unable to connect"
-msgstr "Bağlanılamıyor"
-
 msgid "Writing error"
 msgstr "Yazma hatası"
 
@@ -5319,13 +5410,16 @@ msgstr ""
 "%s sunucusuna bağlanma hatası:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Bu protokol sunucu tarafından desteklenmiyor."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP ayrıştırma hatası"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Başka bir programla oturum açtınız."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5333,7 +5427,8 @@ msgstr ""
 "MSN sunucular geçici olarak servis dışıdır. Lütfen bekleyin ve tekrar "
 "deneyin."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN sunucusu geçici olarak kapatılıyor"
 
 #, c-format
@@ -5363,6 +5458,14 @@ msgstr "Çerez gönderiliyor"
 msgid "Retrieving buddy list"
 msgstr "Liste alınıyor"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Bilgisayardan Uzakta"
 
@@ -5400,14 +5503,6 @@ msgstr "İleti gönderilmemiş olabilir çünkü santralle bir problem oluştu:"
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "İleti gönderilmemiş olabilir çünkü bilinmeyen bir hata meydana geldi:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s sizi kişi listesine ekledi."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s sizi kişi listesinden sildi."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Adres Defterine Ekle"
@@ -5416,13 +5511,6 @@ msgstr "Adres Defterine Ekle"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Bunu arkadaş listenize eklemek istiyor musunuz?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "\"%s\" eklenemiyor."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "Belirlenen görüntü adı geçersiz."
@@ -5430,6 +5518,9 @@ msgstr "Belirlenen görüntü adı geçersiz."
 msgid "This Hotmail account may not be active."
 msgstr "Bu Hotmail hesabı aktif olmayabilir."
 
+msgid "Profile URL"
+msgstr "Profil URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5444,15 +5535,59 @@ msgstr "Bu Hotmail hesabı aktif olmayabilir."
 msgid "MSN Protocol Plugin"
 msgstr "AIM Protokolü Eklentisi"
 
-msgid "Missing Cipher"
-msgstr ""
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s geçerli bir grup değil."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "Bilinmeyen Hata"
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s - %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kullanıcı %s 'a eklenemiyor (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s içindeki kullanıcı engellenemiyor (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s içindeki kullanıcıya izin verilemiyor (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s eklenemiyor, çünkü listeniz dolu durumda."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s geçerli bir passport hesabı değil."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Bu Servis Geçici Olarak Hizmet Dışı"
+
+msgid "Unable to rename group"
+msgstr "Grup adı değiştirilemiyor"
+
+msgid "Unable to delete group"
+msgstr "Grup silinemiyor"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s sizi kişi listesine ekledi."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s sizi kişi listesinden sildi."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "Böyle bir kullanıcı yok: %s"
+
+msgid "User lookup"
 msgstr ""
 
 msgid "Reading challenge"
@@ -5464,12 +5599,25 @@ msgstr ""
 msgid "Logging in"
 msgstr "Giriş yapılıyor"
 
-#, fuzzy, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] "Sunucuya yapılan bağlantı kapandı (%d saniyedir veri alınamıyor)"
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "Kullanıcı adı ayarlanmadı"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"Sunucuyla yapılan bağlantı kesildi\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Yeni e-posta iletisi"
 
@@ -5488,21 +5636,20 @@ msgstr "Yeni resim yorumları"
 msgid "MySpace"
 msgstr "MySpace"
 
-#, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "Kullanıcı adı ayarlanmadı"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "Hızlı Mesajlaşma Arkadaşları"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Bağlandı"
+msgid "Add contacts from server"
+msgstr "Sunucudan kişileri ekle"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5510,15 +5657,21 @@ msgstr "Protokol hatası, kod: %d: %s"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Yanlış takma ad veya parola"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM Hatası"
 
+msgid "Invalid input condition"
+msgstr "Geçersiz girdi durumu"
+
 msgid "Failed to add buddy"
 msgstr "Kişi eklenemedi"
 
@@ -5528,13 +5681,6 @@ msgstr "'addbuddy' komutu başarısız oldu."
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr "Böyle bir kullanıcı yok: %s"
-
-msgid "User lookup"
-msgstr ""
-
 msgid "Failed to remove buddy"
 msgstr "Kişi silinemedi"
 
@@ -5544,34 +5690,16 @@ msgstr "'delbuddy' komutu başarısız oldu"
 msgid "blocklist command failed"
 msgstr ""
 
-msgid "Invalid input condition"
-msgstr "Geçersiz girdi durumu"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Okuma ara belleği dolu"
-
-msgid "Unparseable message"
-msgstr "Ayrıştırılamayan ileti"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Bilgisayara bağlanılamadı: %s (%d)"
+msgid "Missing Cipher"
+msgstr ""
 
-msgid "IM Friends"
-msgstr "Hızlı Mesajlaşma Arkadaşları"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-
-msgid "Add contacts from server"
-msgstr "Sunucudan kişileri ekle"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr "MySpace.com adresinden yeni arkadaşlar ekle"
@@ -5613,9 +5741,6 @@ msgstr "Temel yazıtipi boyutu (pt)"
 msgid "User"
 msgstr "Kullanıcı"
 
-msgid "Profile"
-msgstr "Profil"
-
 msgid "Headline"
 msgstr "Manşet"
 
@@ -5628,14 +5753,10 @@ msgstr "Toplam Arkadaşlar"
 msgid "Client Version"
 msgstr "İstemci Sürümü"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "Kullanıcı adı ayarlanmadı"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5648,6 +5769,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "Bu tema gülenyüz içermiyor."
@@ -5656,6 +5780,13 @@ msgstr "Bu tema gülenyüz içermiyor."
 msgid "Please try another username:"
 msgstr "Lütfen %s için yeni ismi girin"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Kullanıcı adı ayarlanmadı"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5848,10 +5979,6 @@ msgid "Master archive is misconfigured"
 msgstr "Ana arşiv yanlış yapılandırılmış."
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Yanlış takma ad veya parola"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Girdiğiniz kullanıcı adınının sunucusu tanınamadı"
 
@@ -5894,9 +6021,9 @@ msgstr "Kullanıcı çevrimdışı ya da sizi engellemiş"
 msgid "Unknown error: 0x%X"
 msgstr "Bilinmeyen hata: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Oturum açma işlemi başarısız (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s kullanıcısına ping atılamadı"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5998,9 +6125,6 @@ msgstr "GroupWise Konferansı %d"
 msgid "Authenticating..."
 msgstr "Kimlik doğrulaması yapılıyor..."
 
-msgid "Unable to connect to server."
-msgstr "Sunucuya bağlanılamadı."
-
 msgid "Waiting for response..."
 msgstr "Sunucudan yanıt bekleniyor..."
 
@@ -6024,23 +6148,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Yazışmaya katılmak istiyor musunuz?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Oturumunuz kapandı, çünkü başka bir yerden oturum açtınız."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s çevrimdışı gözüküyor ve henüz gönderdiğiniz iletileri alamıyor."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "Sunucuya bağlanılamadı. Lütfen bağlanmak istediğiniz adresi giriniz."
 
-msgid "Error. SSL support is not installed."
-msgstr "Hata. SSL desteği kurulmamış."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Bu konferans kapandı. Artık iletiler gönderilmeyecek."
 
@@ -6064,6 +6182,26 @@ msgid "Server port"
 msgstr "Sunucu portu"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Sunucudan beklenmeyen bir HTTP yanıtı alındı."
+
+#. username connecting too frequently
+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 ""
+"Çok sık bağlanıp kopuyorsunuz. Lütfen on dakika bekledikten sonra tekrar "
+"deneyin. Eğer denemeye devam ederseniz daha uzun beklemek zorunda "
+"kalacaksınız."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "%s çözümleme hatası"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Bağlanılamadı"
 
@@ -6071,18 +6209,8 @@ msgstr "Bağlanılamadı"
 msgid "Invalid chat room name"
 msgstr "Geçersiz Oda İsmi"
 
-msgid "Server closed the connection."
-msgstr "Sunucu bağlantıyı kapattı."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Sunucu ile bağlantı kesildi:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Sunucu bağlantısından geçersiz veri alındı."
 
 #. *< type
@@ -6130,7 +6258,8 @@ msgstr "Uzak kullanıcı ile bağlantı koptu:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Uzak kullanıcı ile yapılan bağlantı üzerinden geçersiz veri alındı."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Uzak kullanıcı ile bağlantı kurulamıyor."
 
 msgid "Direct IM established"
@@ -6300,23 +6429,18 @@ msgstr "Kamera"
 msgid "Screen Sharing"
 msgstr "Kayıtlı İsim"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Sohbet için Hazır"
 
-#, c-format
 msgid "Not Available"
 msgstr "Erişilebilir Değil"
 
-#, c-format
 msgid "Occupied"
 msgstr "Meşgul"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Web'e Açık"
 
-#, c-format
 msgid "Invisible"
 msgstr "Görünmez"
 
@@ -6329,21 +6453,15 @@ msgstr "Uyarı Seviyesi"
 msgid "Buddy Comment"
 msgstr "Kişi Hakkında Yorum"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Kimlik doğrulaması için sunucuya bağlanılamıyor:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS sunucuya bağlanılamadı:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Sunucuya bağlanılamadı."
 
 #, fuzzy
 msgid "Username sent"
@@ -6358,52 +6476,60 @@ msgstr "Bağlantı sonlandırılıyor"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Oturum açılamadı: %s olarak bağlanılamadı, çünkü görünen adınız geçerli "
 "değil. Takma adlar bir harfle başlamalı ve harfler, rakamlar, boşluk ile "
 "devam etmelidir."
 
-#. Unregistered screen name
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Kısa bir süreliğine bağlantı koptu.  Güncellemeler için %s adresine bakın."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Geçerli AIM giriş hash'i alınamadı."
+
+msgid "Unable to get a valid login hash."
+msgstr "Geçerli bir giriş hash'i alınamadı."
+
+msgid "Received authorization"
+msgstr "İzin alındı."
+
+#. Unregistered username
 #. uid is not exist
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Geçersiz ad"
-
-msgid "Incorrect password."
-msgstr "Yanlış parola."
+msgid "Username does not exist"
+msgstr "Kullanıcı mevcut değil"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Hesabınız şuan için durdurulmuştur."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger (Anlık İleti) Servisi geçici olarak servis dışı."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "İstemci sürümünüz çok eski. Lütfen şuadan güncelleyin: %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Çok sık bağlanıp kopuyorsunuz. Lütfen on dakika bekledikten sonra tekrar "
 "deneyin. Eğer denemeye devam ederseniz daha uzun beklemek zorunda "
 "kalacaksınız."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "İstemci sürümünüz çok eski. Lütfen şuadan güncelleyin: %s"
-
-msgid "Could Not Connect"
-msgstr "Bağlanılamadı"
-
-msgid "Received authorization"
-msgstr "İzin alındı."
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Girilen SecurID anahtarı geçersiz."
 
 msgid "Enter SecurID"
@@ -6418,25 +6544,6 @@ msgstr "Dijital görünümden 6 rakamı giriniz."
 msgid "_OK"
 msgstr "_Tamam"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Kısa bir süreliğine bağlantı kopmuş olabilir. Bu onarılana kadar TOC "
-"kullanmalısınız. Güncellemeler için ziyaret edin : %s "
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Geçerli AIM giriş hash'i alınamadı."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Kısa bir süreliğine bağlantı koptu.  Güncellemeler için %s adresine bakın."
-
-msgid "Unable to get a valid login hash."
-msgstr "Geçerli bir giriş hash'i alınamadı."
-
 msgid "Password sent"
 msgstr "Parola gönderildi"
 
@@ -6561,7 +6668,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 "%hu mesajı %s gönderinden bilinmeyen bir sebepten dolayı kaçırdınız."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Mesaj gönderilemedi: %s"
@@ -6583,6 +6690,12 @@ msgstr "Bağlı olduğu süre:"
 msgid "Member Since"
 msgstr "Üye olduğu süre:"
 
+msgid "Capabilities"
+msgstr "Yetenekler"
+
+msgid "Profile"
+msgstr "Profil"
+
 msgid "Your AIM connection may be lost."
 msgstr "AIM bağlantınız kaybolmuş olabilir."
 
@@ -6751,7 +6864,7 @@ msgstr "Uzakta iletiniz çok uzun."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6777,9 +6890,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Kimsesizler"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "%s kişisi eklenemedi çünkü kişi listenizde çok kişi var. Bir tanesini silin "
@@ -6788,8 +6901,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(isimsiz)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Bilinmeyen bir sebepten dolayı %s kişisi eklenemedi."
 
 #, fuzzy, c-format
@@ -6855,6 +6968,7 @@ msgstr "_Bağlan"
 msgid "Get AIM Info"
 msgstr "AIM Bilgilerini Al"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Kişi Açıklaması Düzenle"
 
@@ -6914,6 +7028,7 @@ msgstr "_Ara"
 msgid "Set User Info (web)..."
 msgstr "Kullanıcı Bilgisini Ayarla (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Parola değiştir (URL)"
@@ -6946,6 +7061,10 @@ msgid "Search for Buddy by Information"
 msgstr "Kişi Bilgilerine Göre Kişi Ara"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "Kullanıcı oturum açmamış"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6966,7 +7085,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s kullanıcısına bağlantı sağlanmaya çalışılıyor:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Bir proxy sunucu üzerinden bağlanmaya çalışılıyor."
 
@@ -7062,7 +7180,7 @@ msgstr "Diğer"
 msgid "Visible"
 msgstr "Görünmez"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7153,16 +7271,48 @@ msgstr "Son Güncelleme"
 msgid "Could not change buddy information."
 msgstr "Lütfen kişi bilgilerini girin."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "Cep"
+
+msgid "Note"
+msgstr "Not"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Kişi Simgesi"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Kişi Ekle"
+msgid "_Modify"
+msgstr "Düzenle"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Düzenle"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Sunucu meşgul"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "İzin gereksin"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Add buddy question"
+msgstr "Kişiyi listenize eklemek istiyor musunuz?"
+
+#, fuzzy
+msgid "Enter answer here"
 msgstr "İsteğinizi buraya girin"
 
 msgid "Send"
@@ -7176,18 +7326,19 @@ msgid "Authorization denied message:"
 msgstr "İzin reddetme iletisi:"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "Üzgünüm, benim tipim değilsin..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "%d kullanıcısı kimlik doğrulamaya gereksinim duyuyor"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Kişiyi listenize eklemek istiyor musunuz?"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "İsteğinizi buraya girin"
 
 msgid "Would you be my friend?"
@@ -7210,7 +7361,7 @@ msgid "Failed sending authorize"
 msgstr "Lütfen sizi eklememe izin verin!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Kişi silinemedi"
 
 #, fuzzy, c-format
@@ -7254,6 +7405,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Geçersiz proxy ayarları"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Ben bir üye değilim"
 
@@ -7296,16 +7451,19 @@ msgstr "Bu grup diğerlerinin katılmasına izin vermiyor"
 msgid "Join QQ Qun"
 msgstr "Sohbete Başla..."
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "İsteğinizi buraya girin"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Qun üyesini başarılı şekilde düzenlediniz"
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "Qun üyesini başarılı şekilde düzenlediniz"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7315,7 +7473,7 @@ msgstr ""
 msgid "Failed:"
 msgstr "Başarısız Oldu"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7328,11 +7486,11 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "Üzgünüm, benim tipim değilsin..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Qun üyesini başarılı şekilde düzenlediniz"
 
 #, fuzzy
@@ -7343,35 +7501,35 @@ msgid "You have successfully created a Qun"
 msgstr "Başarılı şekilde Qun oluşturdunuz"
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Şimdi Qun detaylarını ayarlamak ister misiniz?"
 
 msgid "Setup"
 msgstr "Kur"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "%d kullanıcısı %d grubuna katılmak istedi"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "%d kullanıcısı %d grubuna katılmak istedi"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Kişiyle sohbete katılınamadı"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Kişiyi Sil"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Kişiyi Sil"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7488,6 +7646,13 @@ msgstr "<b>Son Yenileme:</b> %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Şimdi Çevrimiçi</b>: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Son Yenileme:</b> %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7495,7 +7660,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "%s Hakkında"
 
 #, fuzzy
@@ -7516,6 +7681,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "%s Hakkında"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Ev Adresi"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7547,7 +7716,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "TCP kullanarak bağlan"
@@ -7560,6 +7728,9 @@ msgstr "Sunucu portu"
 msgid "Show server news"
 msgstr "Sunucu adresi"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 msgid "Keep alive interval (seconds)"
 msgstr ""
 
@@ -7568,11 +7739,7 @@ msgid "Update interval (seconds)"
 msgstr "Bilgilerimi güncelle"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Sunucu bilgileri alınamıyor"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Sunucu bilgileri alınamıyor"
 
 #, c-format
@@ -7595,20 +7762,19 @@ msgid "Activation required"
 msgstr "Kayıt Gerekli"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
-msgstr ""
-
-msgid "Keep alive error"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Requesting captcha ..."
-msgstr ""
+#, fuzzy
+msgid "Requesting captcha"
+msgstr "İstek Diyaloğu"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Yahoo! Kimlik Denetimi Başarısız"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7618,7 +7784,7 @@ msgstr "Resmi Kaydet"
 msgid "Enter code"
 msgstr "Parola"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7626,65 +7792,42 @@ msgid "Enter the text from the image"
 msgstr "Lütfen grubun ismini girin"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Bağlanılamıyor."
-
 msgid "Socket error"
 msgstr "Soket hatası"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"Sunucu ile bağlantı kesildi:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "Soketten okunamıyor"
-
-msgid "Write Error"
-msgstr "Yazma Hatası"
-
-msgid "Connection lost"
-msgstr "Bağlantı kapandı"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Kullanıcı Bilgisi Ayarla..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "İstek reddedildi"
 
-msgid "Couldn't resolve host"
-msgstr "Ana bilgisayar çözümlenemedi"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Sunucuya bağlanılamadı."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Geçersiz hata"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Bağlantı sunucusu"
+msgid "Connecting to server"
+msgstr "SILC sunucusuna bağlanılıyor"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "QQ Kimlik Hatası"
 
-msgid "Failed to send IM."
-msgstr "Anlık ileti gönderimi başarısız oldu."
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7694,6 +7837,10 @@ msgid ""
 msgstr "ICQ Server Relay"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Kimden"
 
@@ -7703,32 +7850,30 @@ msgid ""
 "%s"
 msgstr "Sunucu Bilgileri: %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Bilinmeyen sebep"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Komut"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Sunucu bilgileri alınamıyor"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Bilinmeyen sebep"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Bilinmeyen sebep"
 
 #, c-format
@@ -7742,9 +7887,6 @@ msgstr "Dosya Gönder"
 msgid "%d canceled the transfer of %s"
 msgstr "%d şu dosyayı göndermekten vazgeçti %s"
 
-msgid "Connection closed (writing)"
-msgstr "Bağlantı kapandı (yazılıyor)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grup Başlığı:</b> %s<br>"
@@ -7798,17 +7940,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Eşzamanlı Yönetici  Duyurusu"
 
-msgid "Connection reset"
-msgstr "Bağlantı kesildi"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Soket okuma hatası: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Ana bilgisayara bağlanılamadı"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s kişisinden Anons"
@@ -7831,6 +7962,9 @@ msgstr "Hoparlör"
 msgid "Video Camera"
 msgstr "Video Kamera"
 
+msgid "File Transfer"
+msgstr "Dosya Aktarımı"
+
 msgid "Supports"
 msgstr "Destekler"
 
@@ -8513,9 +8647,6 @@ msgstr "Şirket"
 msgid "Unit"
 msgstr "Ünite"
 
-msgid "Note"
-msgstr "Not"
-
 msgid "Join Chat"
 msgstr "Sohbete Başla..."
 
@@ -8615,6 +8746,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Ağ istatistikleri"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping başarısız oldu"
 
@@ -8679,7 +8813,8 @@ msgstr "Desteklenmeyen anahtar değeri"
 msgid "Disconnected by server"
 msgstr "Sunucu bağlantısı kesildi"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC Sunucusuna bağlanırken hata"
 
 msgid "Key Exchange failed"
@@ -8691,26 +8826,26 @@ msgstr ""
 "Ayrılmış oturuma devam edilemedi. Yeni bir bağlantı oluşturmak için Yeniden "
 "Bağlan'a basınız."
 
-msgid "Connection failed"
-msgstr "Bağlantı Kurulamıyor"
-
 msgid "Performing key exchange"
 msgstr "Anahtar değişimi yapılıyor"
 
-msgid "Unable to create connection"
-msgstr "Bağlantı oluşturulamadı"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "SILC anahtar çifti yüklenemedi"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC sunucusuna bağlanılıyor"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC anahtar çifti yüklenemedi"
+
 msgid "Out of memory"
 msgstr "Bellek Aşımı"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC protokolü başlatılamadı"
 
 msgid "Error loading SILC key pair"
@@ -9003,7 +9138,8 @@ msgstr "Tüm anlık iletileri dijital olarak imzala"
 msgid "Creating SILC key pair..."
 msgstr "SILC anahtar çifti oluşturuluyor..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "SILC anahtar çifti oluşturulamadı\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9097,6 +9233,9 @@ msgstr "Beyaz Tahta"
 msgid "No server statistics available"
 msgstr "Sunucu istatistikleri mevcut değil"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC Sunucusuna bağlanırken hata"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Başarısız: Sürüm uyuşmazlığı, programı güncelleştirin"
@@ -9137,35 +9276,36 @@ msgstr "Hata: Geçersiz çerez"
 msgid "Failure: Authentication failed"
 msgstr "Hata: Kimlik denetimi başarısız"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC Client bağlantısı başlatılamadı"
 
 msgid "John Noname"
 msgstr "Serdar İsimsiz"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC anahtar çifti yüklenemedi: %s"
 
-msgid "Could not write"
-msgstr "Yazılamadı"
-
-msgid "Could not connect"
-msgstr "Bağlanılamadı"
+msgid "Unable to create connection"
+msgstr "Bağlantı oluşturulamadı"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Bilinmeyen sunucu yanıtı."
 
-msgid "Could not create listen socket"
-msgstr "Dinleme soketi yaratılamadı"
-
-msgid "Could not resolve hostname"
-msgstr "Makine adı çözümlenemedi"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Soket oluşturulamadı"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "IRC isimler boşluk karakteri içeremez"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Sunucu portu"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9199,177 +9339,63 @@ msgstr "Kullanıcı Kimliğini Doğrula"
 msgid "Auth Domain"
 msgstr "Makine Kimliğini Doğrula"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "%s aranıyor"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Bağlantı başarısız (%s)"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Bağlan: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Dosya yazılamıyor. (%s)"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Dosya açılamıyor. (%s)"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "İleti çok uzun , son %s byte(harf) kesildi."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "Kullanıcı %s oturum açmamış"
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s 'nin uyarısına izin verilmiyor"
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Bir ileti düşürüldü, sunucunun hız limitini aşıyorsunuz."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s de sohbet mümkün değil."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "%s kullanıcısına çok hızlı ileti yolluyorsunuz."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "%s tarafından gönderilen mesaj çok uzun olduğundan alınamadı."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "%s tarafından gönderilen mesaj çok hızlı gönderildiği için alınamadı."
-
-#, c-format
-msgid "Failure."
-msgstr "Başarısız."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Çok sonuç var."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Daha fazla niteleyici gerek."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Bu servis geçici olarak hizmet dışıdır."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "E-posta araması yasaklandı."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "İpucu gözardı edildi."
-
-#, c-format
-msgid "No keywords."
-msgstr "Anahtar sözcük yok."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Kullanıcı dizin bilgisine sahip değil."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Ülke desteklenmiyor."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Bilinmeyen hata: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Yanlış takma ad veya parola."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Bu servis geçici olarak hizmet dışıdır."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;oda&gt;:  Yahoo'daki bir sohbet odasına katıl"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Uyarı düzeyiniz şuan oturum açabilmek için çok yüksek."
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Yahoo ağındaki kanalları listele"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"Çok sık bağlanıp kopuyorsunuz. Lütfen on dakika bekledikten sonra tekrar "
-"deneyin. Eğer denemeye devam ederseniz daha uzun beklemek zorunda "
-"kalacaksınız."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Bilinmeyen bağlantı hatası oluştu: %s."
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Bilinmeyen hata, %d, oluştu. Bilgi: %s"
-
-msgid "Invalid Groupname"
-msgstr "Geçersiz grup adı"
-
-msgid "Connection Closed"
-msgstr "Bağlantı Kesildi"
-
-msgid "Waiting for reply..."
-msgstr "Cevap için bekleniyor..."
-
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"TOC duraklamadan tekrar çalışır hale geldi. Şimdi iletilerinizi "
-"yollayabilirsiniz."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-msgid "Password Change Successful"
-msgstr "Şifreniz  Başarıyla Değiştirildi"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protokol Eklentisi"
 
-msgid "_Group:"
-msgstr "_Grup:"
+msgid "Pager server"
+msgstr "Çağrı cihazı sunucusu"
 
-msgid "Get Dir Info"
-msgstr "Dizin adını al"
+msgid "Pager port"
+msgstr "Çağrı cihazı portu"
 
-msgid "Set Dir Info"
-msgstr "Dizin adı ayarla"
+msgid "File transfer server"
+msgstr "Dosya aktarım sunucusu"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "%s yazma için açılamıyor!"
+msgid "File transfer port"
+msgstr "Dosya aktarım portu"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Dosya transferi gerçekleştirilemedi; karşı taraf iptal etmiş olabilir."
+msgid "Chat room locale"
+msgstr "Sohbet Odası Yereli"
 
-msgid "Could not connect for transfer."
-msgstr "Transfer için bağlanamıyor."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Konferans ve sohbet odası davetlerini yok say"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Dosyanın üstbilgisi okunamadı. Dosya transer edilemeyecek."
+msgid "Chat room list URL"
+msgstr "Sohbet Odası Listesi URL"
 
-msgid "Save As..."
-msgstr "Farklı Kaydet..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo Sohbet sunucusu"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s istiyor %s kabul etmeyi %d dosyasını: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Sohbet portu"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s sizden kendine bir dosya yollanmasını istiyor."
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9381,11 +9407,11 @@ msgstr "%s sizden kendine bir dosya yollanmasını istiyor."
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC Protokol Eklentisi"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protokol Eklentisi"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9408,6 +9434,30 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Kişi ekleme reddedildi"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Sunucu bağlantısından geçersiz veri alındı."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "Kullanıcı hesabınız kilitlendi, lütfen Yahoo! sitesine giriş yapın."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "Kullanıcı hesabınız kilitlendi, lütfen Yahoo! sitesine giriş yapın."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Yanlış takma ad veya parola"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9437,37 +9487,32 @@ msgstr "Kullanıcı hesabınız kilitlendi, lütfen Yahoo! sitesine giriş yapı
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "%s izin verilenler listesine eklenemedi (%s)."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Arkadaşınız sunucu listesine eklenemedi"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Sesli %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Sunucudan beklenmeyen bir HTTP yanıtı alındı."
 
-msgid "Connection problem"
-msgstr "Bağlantı sorunu"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "%s sunucusu ile bağlantı kesildi:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"%s sunucusu ile bağlantı sağlanamadı:\n"
+"Sunucu ile bağlantı sağlanamadı:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9515,8 +9560,8 @@ msgstr "Bulunma Ayarları"
 msgid "Start Doodling"
 msgstr "Karalamaya Başla"
 
-msgid "Activate which ID?"
-msgstr "Hangi Kimlik etkinleştirilsin?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Kullanıcıyla sohbet et..."
@@ -9530,74 +9575,15 @@ msgstr "Kullanıcıyla Sohbet Et..."
 msgid "Open Inbox"
 msgstr "Gelen Kutusunu Aç"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;oda&gt;:  Yahoo'daki bir sohbet odasına katıl"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Yahoo ağındaki kanalları listele"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protokol Eklentisi"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japon"
-
-msgid "Pager server"
-msgstr "Çağrı cihazı sunucusu"
-
-msgid "Japan Pager server"
-msgstr "Japon Çağrı cihazı sunucusu"
-
-msgid "Pager port"
-msgstr "Çağrı cihazı portu"
-
-msgid "File transfer server"
-msgstr "Dosya aktarım sunucusu"
-
-msgid "Japan file transfer server"
-msgstr "Japon dosya aktarım sunucusu"
-
-msgid "File transfer port"
-msgstr "Dosya aktarım portu"
-
-msgid "Chat room locale"
-msgstr "Sohbet Odası Yereli"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Konferans ve sohbet odası davetlerini yok say"
-
-msgid "Chat room list URL"
-msgstr "Sohbet Odası Listesi URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Sohbet sunucusu"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Sohbet portu"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Bağlanılamıyor."
+
 msgid "Unable to establish file descriptor."
 msgstr "Dosya açıklayıcısı (tanımlayıcısı) kurulamadı."
 
@@ -9605,6 +9591,9 @@ msgstr "Dosya açıklayıcısı (tanımlayıcısı) kurulamadı."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s %s dosyasını göndermek istiyor"
 
+msgid "Write Error"
+msgstr "Yazma Hatası"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japon Profili"
 
@@ -9645,13 +9634,8 @@ msgstr "Bağlantı 3"
 msgid "Last Update"
 msgstr "Son Güncelleme"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s adlı kullanıcının bilgisi mevcut değil"
-
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 
 msgid ""
@@ -9723,23 +9707,19 @@ msgstr "Sesler"
 msgid "Webcams"
 msgstr "Web Kameralar"
 
+msgid "Connection problem"
+msgstr "Bağlantı sorunu"
+
 msgid "Unable to fetch room list."
 msgstr "Oda listesi alınamıyor."
 
 msgid "User Rooms"
 msgstr "Kullanıcı Odaları"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT sunucusuna bağlantı hatası."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Sunucuyla yapılan bağlantı kesildi\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9861,24 +9841,16 @@ msgstr "Memleket"
 msgid "Exposure"
 msgstr "Açıklık"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Soket oluşturulamadı:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP proxy yanıtı ayrıştırılamadı: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP Proxy bağlantı hatası %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Erişim engellendi : HTTP proxy sunucusu %d portunda tünellemeye izin "
 "vermiyor."
@@ -9887,9 +9859,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "%s çözümleme hatası"
 
-msgid "Could not resolve host name"
-msgstr "Ana makina ismi çözümlenemedi"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9979,9 +9948,6 @@ msgstr "Rahatsız etmeyin"
 msgid "Extended away"
 msgstr "Uzun süreli uzakta"
 
-msgid "Mobile"
-msgstr "Cep"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10023,18 +9989,6 @@ msgstr "+++ %s şimdi boşta değil"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "%s Okuma Hatası"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"%s okunurken bir hata oluştu.  Dosyalar yüklenmedi ve eski dosya %s~ olarak "
-"yeniden adlandırıldı."
-
 msgid "Calculating..."
 msgstr "Hesaplanıyor..."
 
@@ -10136,6 +10090,18 @@ msgstr "Bağlantı kesildi"
 msgid "Address already in use."
 msgstr "Bu sohbet adı zaten kullanımda"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "%s Okuma Hatası"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"%s okunurken bir hata oluştu.  Dosyalar yüklenmedi ve eski dosya %s~ olarak "
+"yeniden adlandırıldı."
+
 msgid "Internet Messenger"
 msgstr "İnternet Mesajlaşma Aracı"
 
@@ -10178,10 +10144,8 @@ msgstr "Yeni e-posta b_ildirimleri"
 msgid "Use this buddy _icon for this account:"
 msgstr "Bu hesap için b_u kişi simgesini kullan:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Seçenekleri"
+msgid "_Advanced"
+msgstr "_Gelişmiş Yapılandırma"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "GnomeProxy Ayarlarını Kullan"
@@ -10216,9 +10180,6 @@ msgstr "Eğer gerçekten yakın görüyorsanız"
 msgid "you can see the butterflies mating"
 msgstr "kelebeklerin çiftleşmesini izleyebilirsiniz"
 
-msgid "Proxy Options"
-msgstr "Proxy Seçenekleri"
-
 msgid "Proxy _type:"
 msgstr "Proxy _tipi:"
 
@@ -10247,8 +10208,9 @@ msgstr "_Temel Yapılandırma"
 msgid "Create _this new account on the server"
 msgstr "Bu yeni hesabı sunucu üzerinde oluştur"
 
-msgid "_Advanced"
-msgstr "_Gelişmiş Yapılandırma"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Proxy"
 
 msgid "Enabled"
 msgstr "Etkin"
@@ -10296,8 +10258,8 @@ msgid "Please update the necessary fields."
 msgstr "Lütfen gerekli alanları Güncelleyin."
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Oda Listesi"
+msgid "A_ccount"
+msgstr "He_sap:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10306,8 +10268,9 @@ msgstr ""
 "Lütfen katılmak istediğiniz sohbet hakkında gereken bilgileri açık bir "
 "şekilde girin.\n"
 
-msgid "_Account:"
-msgstr "_Hesap:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Oda Listesi"
 
 msgid "_Block"
 msgstr "_Engelle"
@@ -10324,6 +10287,17 @@ msgstr "Kişi Bilgilerini _Al"
 msgid "I_M"
 msgstr "Kişiye Anlık _İleti Göner"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "_Sohbet Ekle"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Görüntülü Sohbet"
+
 msgid "_Send File..."
 msgstr "_Dosya Gönder..."
 
@@ -10333,9 +10307,14 @@ msgstr "Kişi için Uyarıcı E_kle..."
 msgid "View _Log"
 msgstr "_Geçmiş Sohbetleri Göster"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Çevrimdışıyken gizle"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Çevrimdışıyken göster"
+
 msgid "_Alias..."
 msgstr "Kişi İçin _Görünen İsim Ayarla"
 
@@ -10464,6 +10443,10 @@ msgstr "/Araçlar/Kişi _Uyarıcılar"
 msgid "/Tools/_Certificates"
 msgstr "/Araçlar/_Sertifikalar"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Araçlar/Gizlilik"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Araçlar/Eklentiler"
 
@@ -10473,10 +10456,6 @@ msgstr "/Araçlar/_Tercihler"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Araçlar/_Gizlilik"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Araçlar/Gizlilik"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Araçlar/_Dosya Aktarımları"
 
@@ -10597,8 +10576,8 @@ msgstr "El ile ayarla"
 msgid "By status"
 msgstr "Duruma göre"
 
-msgid "By log size"
-msgstr "Kayıt büyüklüğüne göre"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10616,6 +10595,9 @@ msgstr "Bağlan"
 msgid "Re-enable"
 msgstr "Hesabı Yeniden Etkinleştir"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10707,6 +10689,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "G_örünen isim:"
 
+msgid "_Group:"
+msgstr "_Grup:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -10740,6 +10725,115 @@ msgstr "/Araçlar"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kişiler/Kişileri Sırala"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Arkaplan Rengi"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Bu grup kişi listenize eklendi"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Arkaplan Rengi"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Genişlet"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Arkaplan Rengini Seç"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Daralt"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Arkaplan Rengini Seç"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Sırala"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Çevrimiçi"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Uzakta"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Çevrimdışı"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Boşta"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Mesaj gönderildiğinde"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s için kullanıcı bilgilerini değiştir"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Sunucuları"
@@ -10758,14 +10852,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kişiyi Sohbet Odasına Davet Et"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"İsterseniz bir davet mesajıyla beraber davet etmek istediğiniz kişinin "
-"ismini girin."
-
 msgid "_Buddy:"
 msgstr "_Kişi:"
 
@@ -10794,7 +10880,8 @@ msgstr "Yoksay"
 msgid "Get Away Message"
 msgstr "Uzakta İletisi Al"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Son söylenen"
 
 msgid "Unable to save icon file to disk."
@@ -10841,6 +10928,22 @@ msgstr "/Yazışma/_Farklı Kaydet..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Yazışma/Temi_zle"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Yazışma/_Daha Fazla"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Yazışma/_Daha Fazla"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Yazışma/_Daha Fazla"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Yazışma/_Kayıtları Göster"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Yazışma/Kişiye _Dosya Gönder..."
 
@@ -10913,6 +11016,18 @@ msgstr "/Yazışma"
 msgid "/Conversation/View Log"
 msgstr "/Yazışma/Kayıtları Göster"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Yazışma/Daha Fazla"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Yazışma/Kayıtları Göster"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Yazışma/Daha Fazla"
+
 msgid "/Conversation/Send File..."
 msgstr "/Yazışma/Kişiye Dosya Gönder..."
 
@@ -11094,6 +11209,9 @@ msgstr "Sanatçılar"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "destek"
 
@@ -11220,6 +11338,10 @@ msgstr "Hindu dili"
 msgid "Hungarian"
 msgstr "Macarca"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Romence"
+
 msgid "Indonesian"
 msgstr "Endonezya Dili"
 
@@ -11235,6 +11357,10 @@ msgstr "Gürcü Dili"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu Gürcüce Çevirmenleri"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Diğer"
+
 msgid "Kannada"
 msgstr "Kannada (Hindistanda konuşulan bir dil)"
 
@@ -11256,6 +11382,10 @@ msgstr "Litvanca"
 msgid "Macedonian"
 msgstr "Makedonca"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "Makedonca"
+
 msgid "Bokmål Norwegian"
 msgstr "Norveççe"
 
@@ -11311,6 +11441,9 @@ msgstr "Sosyal"
 msgid "Swedish"
 msgstr "İsveççe"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11370,7 +11503,24 @@ msgstr ""
 "listesine bakabilirsiniz. Bu uygulama için garanti vermiyoruz.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net #pidgin<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net #pidgin<BR><BR>"
 
 msgid "Current Developers"
@@ -11633,7 +11783,7 @@ msgid "Hyperlink visited color"
 msgstr "Bağlantı rengi"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Bağlantıları fare üzerine geldiğinde renklendir."
 
 msgid "Hyperlink prelight color"
@@ -11671,15 +11821,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Uyarıyı Kaldırma"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Yeni e-posta bildirimleri"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11692,15 +11849,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Yeni e-posta bildirimleri"
 
-msgid "_Copy Email Address"
-msgstr "E-Posta Adresini _Kopyala"
-
-msgid "_Open Link in Browser"
-msgstr "_Bağlantıyı Tarayıcıda Aç"
-
-msgid "_Copy Link Location"
-msgstr "Bağlantıyı _Konumunu Kopyala"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11742,11 +11890,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "Resmi Kaydet"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Resmi _Kaydet..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Özel gülenyüzleri göster"
 
@@ -11834,9 +11981,6 @@ msgstr "Yazıtipi Boyutunu Küçült"
 msgid "Font Face"
 msgstr "Yazı Tipi"
 
-msgid "Background Color"
-msgstr "Arkaplan Rengi"
-
 msgid "Foreground Color"
 msgstr "Yazı Rengi"
 
@@ -11955,6 +12099,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11986,6 +12131,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12030,11 +12176,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Tüm E-postaları Aç"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Yeni E-postanız var !</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Hesaplanıyor..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12063,6 +12225,27 @@ msgstr ""
 "Tarayıcı yapılandırmasında 'El ile ayarla' seçili, ancak bu seçenek için "
 "komut belirtilmemiş."
 
+#, fuzzy
+msgid "No message"
+msgstr "Bilinmeyen ileti"
+
+msgid "Open All Messages"
+msgstr "Tüm E-postaları Aç"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Yeni E-postanız var !</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Yeni Kişi Uyarıcı"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Yeni E-postanız var !</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Bu eklentiler kaldırılacak."
 
@@ -12115,10 +12298,17 @@ msgstr "<b>Eklenti Detayları</b>"
 msgid "Select a file"
 msgstr "Bir dosya seçin"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Kişi Uyarıcıyı Düzenle"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Uyarılacak Kişi"
 
+msgid "_Account:"
+msgstr "_Hesap:"
+
 msgid "_Buddy name:"
 msgstr "_Kişi adı:"
 
@@ -12185,7 +12375,60 @@ msgstr "_Tekrarlayan"
 msgid "Pounce Target"
 msgstr "Uyarıcı Hedefi"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Yazmaya başlayınca"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Yazmaya ara verince"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Giriş yapınca"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s boşta durumuna geçti (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Geri dönünce"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Yazmayı Bıraktı"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Çıkış yapınca"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Boşta durumuna geçince"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Uzaktayken"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Bir ileti gönder"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Bilinmeyen uyarı olayı. Lütfen bunu raporlayın !"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Gülenyüz teması açılırken hata oluştu."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Gülenyüz teması açılırken hata oluştu."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Gülenyüz teması açılırken hata oluştu."
 
 msgid "Install Theme"
@@ -12208,6 +12451,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "%s ile konuşma"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Pidgin - Kişi Listesi"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Sistem Çekmecesi Simgesi"
 
@@ -12217,8 +12466,9 @@ msgstr "_Sistem çekmecesi simgesini göster:"
 msgid "On unread messages"
 msgstr "Okunmayan iletiler olunca"
 
-msgid "Conversation Window Hiding"
-msgstr "Yazışma Penceresi Gizleme"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Yazışma Penceresi"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Yeni Anında Mesajlaşma yazışmalarını gizle:"
@@ -12226,6 +12476,9 @@ msgstr "_Yeni Anında Mesajlaşma yazışmalarını gizle:"
 msgid "When away"
 msgstr "Uzaktayken"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Yeni yazışma pencerelerini _küçült"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Sekmeler"
@@ -12284,9 +12537,6 @@ msgstr "Yumuşak geçiş kullan"
 msgid "F_lash window when IMs are received"
 msgstr "_Yeni ileti geldiğinde pencereyi canlandır"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Yeni yazışma pencerelerini _küçült"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12318,13 +12568,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Tarayıcı yapılandırma uygulaması başlatılamıyor."
 
-msgid "ST_UN server:"
-msgstr "ST_UN sunucusu:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Örnek: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_IP Adresini Otomatik Bul"
 
 msgid "Public _IP:"
@@ -12345,6 +12593,10 @@ msgstr "Başlangıç _portu:"
 msgid "_End port:"
 msgstr "Bitiş p_ortu:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Vekil Sunucu & Tarayıcı"
 
@@ -12371,6 +12623,10 @@ msgstr "Proxy Sunucusu"
 msgid "No proxy"
 msgstr "Proxy yok"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Kullanıcı:"
 
@@ -12535,12 +12791,12 @@ msgstr "Aynı anda meşgul ve boş olduğu zaman"
 msgid "Auto-away"
 msgstr "Otomatik-uzakta"
 
-msgid "Change status when _idle"
-msgstr "Boşken durumu değ_iştir"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Boşta durumuna geçmeden önceki süre"
 
+msgid "Change status when _idle"
+msgstr "Boşken durumu değ_iştir"
+
 msgid "Change _status to:"
 msgstr "Durumu _değiştir:"
 
@@ -12690,29 +12946,19 @@ msgstr "Kayde_t & Kullan"
 msgid "Status for %s"
 msgstr "%s için durum"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Gülenyüz Ekle"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Çift Doğrulama"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Lütfen kendiniz için yeni bir takma ad belirtin."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Gülenyüz Ekle"
@@ -12722,22 +12968,31 @@ msgid "Add Smiley"
 msgstr "Gülenyüz!"
 
 #, fuzzy
-msgid "Smiley _Image"
-msgstr "Resmi Kaydet"
+msgid "_Image:"
+msgstr "_Resim"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Sırala"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Gülenyüz!"
 
 #, fuzzy
+msgid "Shortcut Text"
+msgstr "Sırala"
+
+#, fuzzy
 msgid "Custom Smiley Manager"
 msgstr "Sertifika Yöneticisi"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Kişi Seçin"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Bu hesap için b_u kişi simgesini kullan:"
 
@@ -12824,9 +13079,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Çalıştırıcı gönderilemiyor"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -12861,6 +13117,16 @@ msgid ""
 msgstr ""
 "Resim dosyası yüklenemedi '%s': sebep bilinmiyor, muhtemelen dosya bozuk"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Bağlantıyı aç:"
+
+msgid "_Copy Link Location"
+msgstr "Bağlantıyı _Konumunu Kopyala"
+
+msgid "_Copy Email Address"
+msgstr "E-Posta Adresini _Kopyala"
+
 msgid "Save File"
 msgstr "Dosyayı Kaydet"
 
@@ -12956,6 +13222,79 @@ msgstr "Kişilerin Uygunluğunu Gösteren eklenti."
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Sunucu adresi"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Bir Konferans Sunucusuna Gir"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Sorgulamak için bir konferans sunucusu seçin"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Çevrimiçi Servisler"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Kişi Listesi Gönder"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Uzakta durumuna geçince"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Kayıt Dizini"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Ses Seçimi"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Açıklama"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Servis Bulma Bilgileri"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Tarayıcı:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Kullanıcı mevcut değil"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Sunucu bir kimlik doğrulama yöntemi kulanmıyor"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Servis Bulma Bilgileri"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Bu eklenti XMPP sunucularının ve istemcilerinin hatalarını ayıklamak için "
+"kullanışlıdır."
+
 msgid "Buddy is idle"
 msgstr "Kişi boşta"
 
@@ -13345,7 +13684,7 @@ msgstr "Birlikte beste yapmak için Müzik Mesajlaşma Eklentisi"
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13460,12 +13799,6 @@ msgstr ""
 "- Tüm gelen metinleri ters çevirir\n"
 "- Oturum açtığınızda listenizdeki kişilere anında ileti gönderir."
 
-msgid "Cursor Color"
-msgstr "İmleç Rengi"
-
-msgid "Secondary Cursor Color"
-msgstr "İkincil İmleç Rengi"
-
 msgid "Hyperlink Color"
 msgstr "Bağlantı Rengi"
 
@@ -13477,6 +13810,10 @@ msgstr "Bağlantı Rengi"
 msgid "Highlighted Message Name Color"
 msgstr "Vurgulanmış İletiler"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Uyarıyı Kaldırma"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView Yatay Dağılımı"
 
@@ -13506,35 +13843,24 @@ msgstr "GTK+ Arayüz Yazıtipi"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Metin Kısayol Teması"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Arayüz rekleri"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Yeni e-posta bildirimleri"
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ Tema Kontrolü"
 
-msgid "Widget Sizes"
-msgstr "Parçacık Boyutları"
+#, fuzzy
+msgid "Colors"
+msgstr "Kapat"
 
 msgid "Fonts"
 msgstr "Yazıtipleri"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc Dosyası Araçları"
 
@@ -13622,7 +13948,7 @@ msgstr "Yazışma Penceresi Gizleme"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13674,6 +14000,113 @@ msgstr "Metin çevirici"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Belirtilen kurallara göre giden mesajdaki kelimeleri değiştirir."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Oturum açılmamış"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Oturum açılmamış"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Bir Sohbete Katıl"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Yoksay"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Daha Yüksek"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Yetki Verildi"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Hata "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Kullanıcı Bilgileri"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "İstek Diyaloğu"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Uyarı Seviyesi"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s için durum"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Sohbet Odası Yereli"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Simgeyi Kaydet"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ Tema Kontrolü"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Bağlantı Bilgileri"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin - Kişi Listesi"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Pidgin - Kişi Listesi"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ Tema Kontrolü"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ Tema Kontrolü"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13835,18 +14268,16 @@ msgstr "Kişi Listesi penceresi her zaman _üstte tut"
 msgid "Only when docked"
 msgstr ""
 
-msgid "_Flash window when chat messages are received"
-msgstr "Yeni sohbet iletisi geldiğinde pencereyi _canlandır"
-
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin Seçenekleri"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows için Pidgin'e Özel Seçenekler."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Windows için Pidgin'e Özel Seçenekler."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Oturum kapatıldı.</font>"
@@ -13887,6 +14318,459 @@ msgstr ""
 "Bu eklenti XMPP sunucularının ve istemcilerinin hatalarını ayıklamak için "
 "kullanışlıdır."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Soket açılamıyor"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Soketten okunamıyor"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Soket okunamıyor"
+
+#~ msgid "Connection failed."
+#~ msgstr "Bağlantı kurulamadı."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Sunucu bağlantısı kesildi"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Soket yaratılamadı"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Ana bilgisayara bağlanılamadı"
+
+#~ msgid "Read error"
+#~ msgstr "Okuma hatası"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Sunucu ile bağlantı sağlanamadı:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Yazma hatası"
+
+#~ msgid "Last Activity"
+#~ msgstr "Son Etkinlik"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Servis Bulma Bilgileri"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Servis Bulma Ögeleri"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Genişletilmiş Stanza Adreslemesi"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Çok Kullanıcılı Sohbet"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc Komutları"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Kullanıcı Konumu"
+
+#~ msgid "User Avatar"
+#~ msgstr "Kullanıcı Resmi"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Sohbet Durum Uyarısı"
+
+#~ msgid "Software Version"
+#~ msgstr "Yazılım Sürümü"
+
+#~ msgid "User Mood"
+#~ msgstr "Kullanıcı Modu"
+
+#~ msgid "User Activity"
+#~ msgstr "Kullanıcı Etkinliği"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Erişebilirlik Adresi"
+
+#~ msgid "User Profile"
+#~ msgstr "Kullanıcı Profili"
+
+#~ msgid "User Nickname"
+#~ msgstr "Kullanıcı Takma Adı"
+
+#~ msgid "Message Receipts"
+#~ msgstr "İleti Alındığında"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Genel Anahtar Yayınlama"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanza Şifrelemesi"
+
+#~ msgid "Read Error"
+#~ msgstr "Okuma hatası"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Sunucuya bağlanılamadı"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Okuma ara belleği dolu"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Ayrıştırılamayan ileti"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Bilgisayara bağlanılamadı: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Oturum açma işlemi başarısız (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Oturumunuz kapandı, çünkü başka bir yerden oturum açtınız."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Hata. SSL desteği kurulmamış."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Yanlış parola."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS sunucuya bağlanılamadı:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Kısa bir süreliğine bağlantı koptu.  Güncellemeler için %s adresine bakın."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Bağlanılamadı"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Geçersiz ad"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Sunucu bilgileri alınamıyor"
+
+#~ msgid "Connection lost"
+#~ msgstr "Bağlantı kapandı"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Ana bilgisayar çözümlenemedi"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Bağlantı kapandı (yazılıyor)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Bağlantı kesildi"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Soket okuma hatası: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Ana bilgisayara bağlanılamadı"
+
+#~ msgid "Could not write"
+#~ msgstr "Yazılamadı"
+
+#~ msgid "Could not connect"
+#~ msgstr "Bağlanılamadı"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Dinleme soketi yaratılamadı"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Makine adı çözümlenemedi"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Yanlış parola"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s sunucusu ile bağlantı sağlanamadı:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japon"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japon Çağrı cihazı sunucusu"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japon dosya aktarım sunucusu"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Sunucuyla yapılan bağlantı kesildi\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Ana makina ismi çözümlenemedi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Bu sunucu bağlanmak için TLS/SSL gerektirir. Hiç TLS/SSL desteği "
+#~ "bulunamadı."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Yazışma Penceresi Gizleme"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Lütfen kendiniz için yeni bir takma ad belirtin."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Hangi Kimlik etkinleştirilsin?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "İmleç Rengi"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "İkincil İmleç Rengi"
+
+#~ msgid "Interface colors"
+#~ msgstr "Arayüz rekleri"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Parçacık Boyutları"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "İleti içine ekle"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "İsterseniz bir davet mesajıyla beraber davet etmek istediğiniz kişinin "
+#~ "ismini girin."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "MSN Adres Defteri getirilemedi"
+
+#, fuzzy
+#~ msgid "Connection to server lost (no data received within %d second)"
+#~ msgid_plural ""
+#~ "Connection to server lost (no data received within %d seconds)"
+#~ msgstr[0] "Sunucuya yapılan bağlantı kapandı (%d saniyedir veri alınamıyor)"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Kısa bir süreliğine bağlantı kopmuş olabilir. Bu onarılana kadar TOC "
+#~ "kullanmalısınız. Güncellemeler için ziyaret edin : %s "
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Kişi Ekle"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Sunucu bilgileri alınamıyor"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "Sunucu ile bağlantı kesildi:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Bağlantı sunucusu"
+
+#~ msgid "Failed to send IM."
+#~ msgstr "Anlık ileti gönderimi başarısız oldu."
+
+#~ msgid "Looking up %s"
+#~ msgstr "%s aranıyor"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Bağlantı başarısız (%s)"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Bağlan: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Dosya yazılamıyor. (%s)"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Dosya açılamıyor. (%s)"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "İleti çok uzun , son %s byte(harf) kesildi."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "Kullanıcı %s oturum açmamış"
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%s 'nin uyarısına izin verilmiyor"
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Bir ileti düşürüldü, sunucunun hız limitini aşıyorsunuz."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%s de sohbet mümkün değil."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "%s kullanıcısına çok hızlı ileti yolluyorsunuz."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "%s tarafından gönderilen mesaj çok uzun olduğundan alınamadı."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "%s tarafından gönderilen mesaj çok hızlı gönderildiği için alınamadı."
+
+#~ msgid "Failure."
+#~ msgstr "Başarısız."
+
+#~ msgid "Too many matches."
+#~ msgstr "Çok sonuç var."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Daha fazla niteleyici gerek."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Bu servis geçici olarak hizmet dışıdır."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "E-posta araması yasaklandı."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "İpucu gözardı edildi."
+
+#~ msgid "No keywords."
+#~ msgstr "Anahtar sözcük yok."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Kullanıcı dizin bilgisine sahip değil."
+
+#~ msgid "Country not supported."
+#~ msgstr "Ülke desteklenmiyor."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Bilinmeyen hata: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Yanlış takma ad veya parola."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Bu servis geçici olarak hizmet dışıdır."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Uyarı düzeyiniz şuan oturum açabilmek için çok yüksek."
+
+#~ 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 ""
+#~ "Çok sık bağlanıp kopuyorsunuz. Lütfen on dakika bekledikten sonra tekrar "
+#~ "deneyin. Eğer denemeye devam ederseniz daha uzun beklemek zorunda "
+#~ "kalacaksınız."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Bilinmeyen bağlantı hatası oluştu: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Bilinmeyen hata, %d, oluştu. Bilgi: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Geçersiz grup adı"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Bağlantı Kesildi"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Cevap için bekleniyor..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "TOC duraklamadan tekrar çalışır hale geldi. Şimdi iletilerinizi "
+#~ "yollayabilirsiniz."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Şifreniz  Başarıyla Değiştirildi"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Dizin adını al"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Dizin adı ayarla"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "%s yazma için açılamıyor!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Dosya transferi gerçekleştirilemedi; karşı taraf iptal etmiş olabilir."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Transfer için bağlanamıyor."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Dosyanın üstbilgisi okunamadı. Dosya transer edilemeyecek."
+
+#~ msgid "Save As..."
+#~ msgstr "Farklı Kaydet..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s istiyor %s kabul etmeyi %d dosyasını: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s sizden kendine bir dosya yollanmasını istiyor."
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC Protokol Eklentisi"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%s adlı kullanıcının bilgisi mevcut değil"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Seçenekleri"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxy Seçenekleri"
+
+#~ msgid "By log size"
+#~ msgstr "Kayıt büyüklüğüne göre"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Bağlantıyı Tarayıcıda Aç"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UN sunucusu:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Resmi Kaydet"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "Yeni sohbet iletisi geldiğinde pencereyi _canlandır"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "Bu adı taşıyan bir grup zaten var."
 
@@ -13968,13 +14852,6 @@ msgstr ""
 #~ msgid "Change Qun information"
 #~ msgstr "Kanal Bilgisi"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "Sistem İletisi"
 
@@ -14160,9 +15037,6 @@ msgstr ""
 #~ msgid "Please enter external group ID"
 #~ msgstr "LÜtfen dış grup Kimliğini girin"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Bu grup kişi listenize eklendi"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Katılmak için başvuruyorum"
 
@@ -14231,9 +15105,6 @@ msgstr ""
 #~ "takdirde girdiğiniz isim, kişinin kayıtlı ismi yerine listenizde "
 #~ "görünecektir.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "He_sap:"
-
 #~ msgid "_Screen name:"
 #~ msgstr "Kay_ıtlı isim:"
 
diff --git a/po/uk.po b/po/uk.po
index 13ba9913d8..4458ae56ab 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-08-21 10:43+0300\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -33,7 +33,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -640,21 +640,6 @@ msgid "Send To"
 msgstr "_Надіслати як"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "Повідомлення про вихід"
-
-msgid "Invite"
-msgstr "Запросити"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Введіть ім'я користувача, якого ви бажаєте запросити, та введіть "
-"необов'язковий текст запрошення."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "Бесіди"
 
@@ -918,6 +903,42 @@ msgid "System Log"
 msgstr "Системний журнал"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "Підрахунок..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Прийняти"
+
+#, fuzzy
+msgid "Reject"
+msgstr "Скинути"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Ви від'єднались від каналу%s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "Ел.пошта"
 
@@ -956,6 +977,9 @@ msgstr "З'єднання"
 msgid "IM"
 msgstr "Повідомлення"
 
+msgid "Invite"
+msgstr "Запросити"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(немає імені)"
@@ -1179,7 +1203,6 @@ msgstr "%s відходить. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s бажає надіслати вам %s (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Невідома подія стеження. Сповістіть про це!"
 
@@ -1235,7 +1258,6 @@ msgstr "_Хвилин до встановлення статусу \"Відій�
 msgid "Change status to"
 msgstr "Змінити адресу на:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Бесіди"
 
@@ -1586,7 +1608,6 @@ msgstr ""
 "При відкриванні нової бесіди, цей модуль вставить останню бесіду у поточну "
 "бесіду."
 
-#, c-format
 msgid "Online"
 msgstr "У мережі"
 
@@ -1635,6 +1656,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 #, fuzzy
 msgid "accounts"
 msgstr "Облікові записи"
@@ -1738,14 +1781,6 @@ msgstr "Прийняти запрошення до розмови?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Прийняти"
-
-#, fuzzy
-msgid "Reject"
-msgstr "Скинути"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1835,6 +1870,8 @@ msgstr "%s входить"
 msgid "+++ %s signed off"
 msgstr "%s виходить"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
@@ -1883,6 +1920,18 @@ msgstr "%s залишив кімнату."
 msgid "%s left the room (%s)."
 msgstr "%s залишив кімнату (%s)"
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Створити конференцію"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Введіть ім'я користувача, якого ви бажаєте запросити, та введіть "
+"необов'язковий текст запрошення."
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "Не вдається встановити режими каналу для %s"
@@ -2021,7 +2070,6 @@ msgstr "Задовольнити запит передавання файлу %s
 msgid "Transfer of file %s complete"
 msgstr "Передавання файлу %s  завершено"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Передавання файлу завершено"
 
@@ -2029,7 +2077,6 @@ msgstr "Передавання файлу завершено"
 msgid "You canceled the transfer of %s"
 msgstr "Ви скасували передавання %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Передавання файлу скасовано"
 
@@ -2216,11 +2263,14 @@ msgstr "<font color=\"red\"><b>Не вдається прочитати файл
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <АВТО_ВІДПОВІДЬ>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Помилка при створенні з'єднання"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2634,7 +2684,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2686,7 +2736,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2715,6 +2765,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Зміна паролю"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2908,19 +2984,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Не вдається створити нове з'єднання."
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 #, fuzzy
 msgid "First name"
 msgstr "Ім'я:"
@@ -2958,6 +3033,11 @@ msgstr "Модуль протоколу Yahoo"
 msgid "Purple Person"
 msgstr "Нова особа"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Район"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2969,16 +3049,16 @@ msgstr "%s закрив вікно бесіди."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не вдається відправити повідомлення. Повідомлення завелике."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Не вдається відкрити сокет"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Не вдається створити сокет"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Не вдається створити сокет"
 
-#, fuzzy
-msgid "Could not listen on socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
 msgstr "Не вдається створити сокет"
 
 #, fuzzy
@@ -3037,15 +3117,15 @@ msgstr "Надсилання списку контактів"
 msgid "Load buddylist from file..."
 msgstr "Імпортувати список контактів з сервера"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "Нові паролі не співпадають."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Не вдається створити нове з'єднання."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3058,17 +3138,15 @@ msgstr "Реєстрацію завершено успішно"
 msgid "Password"
 msgstr "Пароль"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Пароль відправлено"
+msgid "Password (again)"
+msgstr "Пароль (ще раз)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s наразі не у мережі."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Наразі на"
+msgid "Captcha"
+msgstr "Збереження зображення"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3130,6 +3208,18 @@ msgid "Current password"
 msgstr "Неправильний пароль."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Пароль відправлено"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s наразі не у мережі."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Наразі на"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Введіть ваш поточний пароль та новий пароль."
 
@@ -3145,13 +3235,13 @@ msgstr "Видалити розмову зі списку контактів"
 msgid "Add to chat..."
 msgstr "Додати _розмову"
 
+#. Global
 msgid "Available"
 msgstr "Доступний"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Користувач відійшов"
 
@@ -3183,7 +3273,8 @@ msgstr "Невідповідні вузли"
 msgid "There are no users matching your search criteria."
 msgstr "Введіть новий пароль"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Не вдається прочитати сокет"
 
 #, fuzzy
@@ -3202,8 +3293,14 @@ msgstr "Відображення користувачів"
 msgid "Your buddy list was stored on the server."
 msgstr "Список контактів, що зберігається на сервері Gadu-Gadu."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "З'єднатися"
+
+msgid "Connection failed"
 msgstr "Не вдається встановити з'єднання"
 
 #, fuzzy
@@ -3214,6 +3311,15 @@ msgstr "Додати розмову"
 msgid "Chat _name:"
 msgstr "Прізвище:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Не вдається перевірити доступність сервера"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "З'єднання"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Помилка читання"
@@ -3223,7 +3329,7 @@ msgid "This chat name is already in use"
 msgstr "Такий файл вже існує"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "Вас було роз'єднано з сервером."
 
 #, fuzzy
@@ -3272,6 +3378,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "Пошукова система Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Встановити інформацію про користувача..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Невідома команда: %s"
@@ -3288,7 +3398,7 @@ msgid "File Transfer Failed"
 msgstr "Передавання файлу скасовано"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin не вдається відрити порт для прослуховування."
 
 msgid "Error displaying MOTD"
@@ -3304,8 +3414,16 @@ msgstr "Немає MOTD пов'язаного з цим з'єднанням."
 msgid "MOTD for %s"
 msgstr "MOTD для %s"
 
-msgid "Server has disconnected"
-msgstr "Сервер розірвав з'єднання"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Вас було роз'єднано з сервером."
 
 msgid "View MOTD"
 msgstr "Переглянути MOTD"
@@ -3316,25 +3434,24 @@ msgstr "_Канал:"
 msgid "_Password:"
 msgstr "_Пароль:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Псевдоніми IRC не повинні містити побіли"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "З'єднання"
-
 msgid "SSL support unavailable"
 msgstr "Підтримка SSL недоступна"
 
-msgid "Couldn't create socket"
-msgstr "Не вдається створити сокет"
+msgid "Unable to connect"
+msgstr "Не вдається з'єднатись"
 
-msgid "Couldn't connect to host"
-msgstr "Не вдається з'єднатись з вузлом"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Не вдається з'єднатися з сервером."
 
-msgid "Read error"
-msgstr "Помилка читання"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Помилка при створенні з'єднання"
 
 msgid "Users"
 msgstr "Користувачі"
@@ -3521,6 +3638,17 @@ msgstr ""
 "Вибрану вами назву облікового запису відхилено сервером.  Можливо вона "
 "містить некоректні символи."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Такий файл вже існує"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Прізвисько"
+
 msgid "Cannot change nick"
 msgstr "Не вдається змінити псевдонім"
 
@@ -3770,12 +3898,13 @@ msgstr "Команда відключена"
 msgid "execute"
 msgstr "Не передбачено"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Для входу на сервер вимагається TLS/SSL. Підтримку TLS/SSL не знайдено."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Для входу на сервер вимагається TLS/SSL. Підтримку TLS/SSL не знайдено."
 
@@ -3794,19 +3923,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Ідентифікація звичайним текстом"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Ідентифікація завершилась невдало"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Недопустима відповідь від сервера."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Сервер не використовує жодного підтримуваного методу ідентифікації"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Неправильний запит з серверу"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Помилка читання"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Причина не вказана."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Непідтримувана версія"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "Не вдається встановити SSL-з'єднання з сервером."
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Не вдається встановити SSL-з'єднання з сервером."
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Не вдається створити нове з'єднання."
+
 msgid "Full Name"
 msgstr "Повне ім'я"
 
@@ -3874,187 +4034,9 @@ msgstr "Місто"
 msgid "Operating System"
 msgstr "Приховувати операційну систему"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Встановити інформацію каталогу"
-
-msgid "Service Discovery Items"
-msgstr ""
-
 #, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Додаткова адреса"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Псевдонім розмови"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Користувач не має довідникових даних."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "команда"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Помилка реєстрації"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Розташування"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Повідомлення про стан користувача"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Непідтримувана версія"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Орієнтація"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "Передавання файлів"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Режими користувача"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Межа кількості користувачів"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Можливості"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Ім'я користувача"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM з обміном ключами"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Адреса ел.пошти"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Встановити профіль"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Прізвисько"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Живе відео"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Отримано повідомлення"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Babbleprint публічного ключа"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Меню користувача"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Режими користувача"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Межа кількості користувачів"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Межа кількості користувачів"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Кодування Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Можливості"
+msgid "Local Time"
+msgstr "Локальний файл:"
 
 #, fuzzy
 msgid "Priority"
@@ -4063,6 +4045,14 @@ msgstr "Порт"
 msgid "Resource"
 msgstr "Ресурс"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Не у мережі"
+
 msgid "Middle Name"
 msgstr "Прізвище"
 
@@ -4111,7 +4101,6 @@ msgstr "Готовий розмовляти"
 msgid "Extended Away"
 msgstr "Розширений статус \"Відійшов\""
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Не турбувати"
 
@@ -4238,28 +4227,27 @@ msgstr "Виберіть сервер конференцій для опитув
 msgid "Find Rooms"
 msgstr "Знайти кімнати"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Псевдонім:"
 
-msgid "Write error"
-msgstr "Помилка запису"
+#, fuzzy
+msgid "No users found"
+msgstr "Невідповідні вузли"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "звичайний текст"
+msgid "Roles:"
+msgstr "Посада"
 
-msgid "Read Error"
-msgstr "Помилка читання"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "звичайний текст"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "Не вдається створити сокет"
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "Неправильний ID"
@@ -4267,6 +4255,10 @@ msgstr "Неправильний ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Не вдається з'єднатися з сервером."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Реєстрація %s@%s завершена успішно"
@@ -4293,9 +4285,6 @@ msgstr "Реєстрацію завершено успішно"
 msgid "Unregistration Failed"
 msgstr "Реєстрація завершилась невдало"
 
-msgid "Already Registered"
-msgstr "Вже зареєстровано"
-
 msgid "State"
 msgstr "Область"
 
@@ -4309,6 +4298,9 @@ msgstr "Телефон"
 msgid "Date"
 msgstr "Дата"
 
+msgid "Already Registered"
+msgstr "Вже зареєстровано"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Зареєструвати"
@@ -4341,6 +4333,10 @@ msgid "Change Registration"
 msgstr "Помилка реєстрації"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Не вдається з'єднатися з сервером."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Помилка зміни інформації про обліковий запис"
 
@@ -4360,9 +4356,18 @@ msgstr "Ідентифікація"
 msgid "Re-initializing Stream"
 msgstr "Повторна ініціалізація потоку"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Не авторизований"
 
+msgid "Mood"
+msgstr "Настрій"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Обидві"
 
@@ -4384,12 +4389,6 @@ msgstr "немає"
 msgid "Subscription"
 msgstr "Підписка"
 
-msgid "Mood"
-msgstr "Настрій"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "Настрій"
@@ -4437,9 +4436,6 @@ msgstr "Пароль було змінено."
 msgid "Error changing password"
 msgstr "Помилка зміни паролю"
 
-msgid "Password (again)"
-msgstr "Пароль (ще раз)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Зміна паролю"
@@ -4635,18 +4631,24 @@ msgstr "Не вдається видалити користувача %s"
 msgid "Unable to ping user %s"
 msgstr "Не вдається заборонити користувача %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "Не вдається відтворити звук, тому що вказаний файл (%s) не існує."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "Не вдається відтворити звук, тому що вказаний файл (%s) не існує."
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Не вдається відтворити звук, тому що вказаний файл (%s) не існує."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4657,9 +4659,39 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr "Користувач заблокував вас"
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Не вдається відправити повідомлення %s:"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
 msgstr ""
+"Не вдається надіслати файл до %s, користувач не підтримує прийом файлів"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Не вдається надіслати файл до %s, користувач не підтримує прийом файлів"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Реєстрація завершилась невдало"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+"Введіть ідентифікатор користувача, інформацію про якого ви бажаєте "
+"переглянути."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "Вибір файлу"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Почати _розмову"
 
 msgid "config:  Configure a chat room."
 msgstr "config: Налаштувати кімнату."
@@ -4681,13 +4713,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;користувач&gt; [кімната]: Заборонити користувача у кімнаті."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4758,6 +4790,9 @@ msgstr "З'єднатися з сервером"
 msgid "File transfer proxies"
 msgstr "Порт передавання файлів"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4798,6 +4833,14 @@ msgstr "Помилка аналізу XML"
 msgid "Unknown Error in presence"
 msgstr "Невідома помилка стану присутності"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Помилка підключення до розмови %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Помилка у розмові %s"
+
 msgid "Create New Room"
 msgstr "Створення нової кімнати"
 
@@ -4816,13 +4859,32 @@ msgstr "Налаштувати кімнату"
 msgid "_Accept Defaults"
 msgstr "Прийняти типові параметри"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Помилка підключення до розмови %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Причина не вказана."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Помилка у розмові %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Ви були видалені оператором %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Видалений оператором %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Помилка при відкриванні файлу."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Передавання файлу скасовано"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Не вдається зберегти зображення: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4853,10 +4915,6 @@ msgstr ""
 "переглянути."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "Вибір файлу"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "Режими користувача"
 
@@ -4896,9 +4954,20 @@ msgstr "Облікові записи"
 msgid "Select an action"
 msgstr "Вибір файлу"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Не вдається додати \"%s\"."
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Не вдається завантажити список контактів"
+msgid "Buddy Add error"
+msgstr "Помилка списку контактів"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Вказана назва екрану неправильна."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5128,7 +5197,7 @@ msgstr "Дитячий паспорт без батьківської згоди
 msgid "Passport account not yet verified"
 msgstr "Паспортний обліковий запис ще не підтверджений"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Паспортний обліковий запис ще не підтверджений"
 
@@ -5152,6 +5221,10 @@ msgstr "Уподобаний контакт"
 msgid "Non-IM Contacts"
 msgstr "Видалити контакт"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5223,6 +5296,13 @@ msgstr "Надіслати мобільне повідомлення."
 msgid "Page"
 msgstr "Сторінка"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Попередити"
+
 msgid "Has you"
 msgstr ""
 
@@ -5266,6 +5346,14 @@ msgid "Album"
 msgstr ""
 
 #, fuzzy
+msgid "Game Title"
+msgstr "Звання"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Звання"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "Ввести дружнє ім'я"
 
@@ -5307,9 +5395,6 @@ msgstr ""
 "Для MSN необхідна підтримка SSL. Встановіть підтримувану бібліотеку SSL. За "
 "додатковою інформацією звертайтесь на http://Pidgin.sf.net/faq-ssl.php"
 
-msgid "Failed to connect to server."
-msgstr "Не вдається з'єднатися з сервером."
-
 msgid "Error retrieving profile"
 msgstr "Помилка зчитування профілю"
 
@@ -5485,8 +5570,9 @@ msgstr ""
 "Pidgin не вдається знайти інформацію про профіль користувача. Швидше за все "
 "користувач не існує."
 
-msgid "Profile URL"
-msgstr "URL профілю"
+#, fuzzy
+msgid "View web profile"
+msgstr "Не допускається не у мережі"
 
 #. *< type
 #. *< ui_requirement
@@ -5524,67 +5610,29 @@ msgstr "Звичайна ідентифікація завершилась ав�
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Звичайна ідентифікація завершилась аварійно!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s не є правильною назвою групи."
-
-msgid "Unknown error."
-msgstr "Невідома помилка."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s на %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s бажає надіслати вам файл"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Невідома помилка"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Не вдається заборонити користувача %s"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Невідома помилка"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Не вдається додати користувача %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Не вдається заблокувати користувача %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Не вдається дозволити користувача %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Не вдається додати %s, тому що список контактів повний."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s не є допустимим паспортним обліковим записом."
-
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Служба тимчасово недоступна"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Неможливо надіслати повідомлення, тому що користувач не у мережі:"
 
-msgid "Unable to rename group"
-msgstr "Не вдається перейменувати групу"
-
-msgid "Unable to delete group"
-msgstr "Не вдається видалити групу"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5633,9 +5681,6 @@ msgstr "Неможливо надіслати повідомлення чере�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Неможливо надіслати повідомлення через невідому помилку:"
 
-msgid "Unable to connect"
-msgstr "Не вдається з'єднатись"
-
 msgid "Writing error"
 msgstr "Помилка запису"
 
@@ -5650,20 +5695,24 @@ msgstr ""
 "Невідома помилка від сервера %s (%s):\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Цей протокол не підтримується сервером."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Помилка розбору HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Ви увійшли з іншого місця."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Сервери MSN тимчасово недоступні. Зачекайте, та пізніше спробуйте ще раз."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Сервери MSN тимчасово вимикаються."
 
 #, c-format
@@ -5694,6 +5743,14 @@ msgstr "Надсилання cookie"
 msgid "Retrieving buddy list"
 msgstr "Завантаження списку контактів"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Відійшов від комп'ютера"
 
@@ -5731,14 +5788,6 @@ msgstr "Неможливо надіслати повідомлення чере�
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Неможливо надіслати повідомлення через невідому помилку:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Користувач %s бажає додати %s до власного списку контактів."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "Користувач %s бажає додати %s до власного списку контактів."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Додати до адресної книги"
@@ -5747,13 +5796,6 @@ msgstr "Додати до адресної книги"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Бажаєте додати цей контакт у список контактів?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Не вдається додати \"%s\"."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "Вказана назва екрану неправильна."
@@ -5761,6 +5803,9 @@ msgstr "Вказана назва екрану неправильна."
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "URL профілю"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5775,18 +5820,64 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "Модуль протоколу AIM/ICQ"
 
-msgid "Missing Cipher"
-msgstr ""
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s не є правильною назвою групи."
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "Невідома помилка."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s на %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Не вдається додати користувача %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Не вдається заблокувати користувача %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Не вдається дозволити користувача %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Не вдається додати %s, тому що список контактів повний."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s не є допустимим паспортним обліковим записом."
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Служба тимчасово недоступна"
+
+msgid "Unable to rename group"
+msgstr "Не вдається перейменувати групу"
+
+msgid "Unable to delete group"
+msgstr "Не вдається видалити групу"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Користувач %s бажає додати %s до власного списку контактів."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Користувач %s бажає додати %s до власного списку контактів."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "Кімнати користувача"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "Читання даних"
 
@@ -5798,14 +5889,23 @@ msgstr "Неправильний запит з серверу"
 msgid "Logging in"
 msgstr "Журнали"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "Не вказано ідентифікатор користувача."
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "Вас було роз'єднано з сервером."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Нове повідомлення про відсутність"
@@ -5826,21 +5926,23 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "Не вказано ідентифікатор користувача."
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "Вікна _бесід"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connected"
-msgstr "З'єднатися"
+msgid "Add contacts from server"
+msgstr "Недопустима відповідь від сервера."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5848,16 +5950,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Неправильне прізвисько або пароль."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "Завершення встановлення з'єднання"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Не вдається приєднатися до користувача у кімнаті"
 
@@ -5869,14 +5978,6 @@ msgstr "Імпортувати список контактів з сервера
 msgid "persist command failed"
 msgstr "Помилка панелі перемикання"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "Кімнати користувача"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Не вдається приєднатися до користувача у кімнаті"
@@ -5888,40 +5989,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "Помилка панелі перемикання"
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "Завершення встановлення з'єднання"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Черга повна"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Не вдається розібрати повідомлення"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Не вдається з'єднатись з вузлом"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "Вікна _бесід"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "Недопустима відповідь від сервера."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5969,9 +6046,6 @@ msgstr "Більший розмір шрифту"
 msgid "User"
 msgstr "Користувачі"
 
-msgid "Profile"
-msgstr "Профіль"
-
 #, fuzzy
 msgid "Headline"
 msgstr "Відмовитись"
@@ -5987,15 +6061,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "Закрити бесіду"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "Не вказано ідентифікатор користувача."
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -6008,6 +6077,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "Ця тема не має доступних значків емоцій."
@@ -6016,6 +6088,14 @@ msgstr "Ця тема не має доступних значків емоцій
 msgid "Please try another username:"
 msgstr "Введіть нову назву для обраної групи."
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "Не вказано ідентифікатор користувача."
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6213,10 +6293,6 @@ msgid "Master archive is misconfigured"
 msgstr "Головний архів не налаштований"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Неправильне прізвисько або пароль."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Не вдається дізнатись вузол введеного імені користувача"
 
@@ -6261,9 +6337,9 @@ msgstr "Користувач не у мережі або заблокував в
 msgid "Unknown error: 0x%X"
 msgstr "Невідома помилка: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Не вдається увійти у мережу (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Не вдається заборонити користувача %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6371,9 +6447,6 @@ msgstr "Конференція GroupWise %d"
 msgid "Authenticating..."
 msgstr "Ідентифікація..."
 
-msgid "Unable to connect to server."
-msgstr "Не вдається з'єднатися з сервером."
-
 msgid "Waiting for response..."
 msgstr "Очікування відповіді..."
 
@@ -6397,26 +6470,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Бажаєте приєднатися до бесіди?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Ви були відключені, тому що увійшли у систему з іншої машини."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "Ймовірно, %s не у мережі та не отримав повідомлення, яке ви щойно відправили."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Не вдається з'єднатись з сервером. Введіть адресу сервера, з яким ви бажаєте "
 "з'єднатись."
 
-msgid "Error. SSL support is not installed."
-msgstr "Помилка. Підтримку SSL не встановлено."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Ця конференція була закрита. Більше неможливо відправити жодного "
@@ -6442,6 +6509,25 @@ msgid "Server port"
 msgstr "Порт сервера"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Недопустима відповідь від сервера."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Ви занадто часто з'єднуєтесь та від'єднуєтесь. Зачекайте 10 хвилин та "
+"спробуйте знову. Якщо ви продовжите спроби, вам доведеться чекати ще довше."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Помилка при створенні з'єднання"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Не вдається встановити з'єднання"
 
@@ -6450,17 +6536,7 @@ msgid "Invalid chat room name"
 msgstr "Неправильна назва кімнати"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Помилка при створенні з'єднання"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Вас було роз'єднано з сервером."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Не вдається встановити SSL-з'єднання з сервером."
 
 #. *< type
@@ -6513,8 +6589,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Не вдається встановити SSL-з'єднання з сервером."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6685,23 +6762,18 @@ msgstr "Відеокамера"
 msgid "Screen Sharing"
 msgstr "Ідентифікатор"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Готовий до розмови"
 
-#, c-format
 msgid "Not Available"
 msgstr "Недоступний"
 
-#, c-format
 msgid "Occupied"
 msgstr "Зайнятий"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Підтримується Web"
 
-#, c-format
 msgid "Invisible"
 msgstr "Невидимий"
 
@@ -6715,15 +6787,11 @@ msgid "Buddy Comment"
 msgstr "Коментар користувача"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Не вдається з'єднатися для передавання."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr "Не вдається з'єднатися з сервером."
 
 #, fuzzy
@@ -6739,52 +6807,63 @@ msgstr "Завершення встановлення з'єднання"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Не вдається увійти: Не вдається підписатись на %s, тому що ідентифікатор "
 "користувача неправильний. Ідентифікатор користувача повинен починатись з "
 "літери та повинен містити лише літери, цифри та пробіли, або ж повинен "
 "містити лише цифри."
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Незабаром ви можете бути від'єднані. Можливо, ви захочете використати TOC, "
+"доки це не буде виправлено. Перевірте оновлення на %s."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "Неправильне ім'я користувача"
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin не вдається отримати допустимий хеш входу AIM."
 
-msgid "Incorrect password."
-msgstr "Неправильний пароль."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin не вдається отримати допустимий хеш входу."
+
+msgid "Received authorization"
+msgstr "Прийнято авторизацію"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Користувач не існує"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Ваш обліковий запис наразі заблокований."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Служба миттєвих повідомлень AOL тимчасово недоступна."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Ви використовуєте застару версію клієнта. Поновіть до %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Ви занадто часто з'єднуєтесь та від'єднуєтесь. Зачекайте 10 хвилин та "
 "спробуйте знову. Якщо ви продовжите спроби, вам доведеться чекати ще довше."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Ви використовуєте застару версію клієнта. Поновіть до %s"
-
-msgid "Could Not Connect"
-msgstr "Не вдається з'єднатися"
-
-msgid "Received authorization"
-msgstr "Прийнято авторизацію"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Ключ SecurID - неправильний."
 
 msgid "Enter SecurID"
@@ -6800,28 +6879,6 @@ msgstr "Введіть 6-цифрове число з цифрового дис�
 msgid "_OK"
 msgstr "Гаразд"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Незабаром ви можете бути від'єднані. Можливо, ви захочете використати TOC, "
-"доки це не буде виправлено. Перевірте оновлення на %s."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin не вдається отримати допустимий хеш входу AIM."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Незабаром ви можете бути від'єднані. Можливо, ви захочете використати TOC, "
-"доки це не буде виправлено. Перевірте оновлення на %s."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin не вдається отримати допустимий хеш входу."
-
 msgid "Password sent"
 msgstr "Пароль відправлено"
 
@@ -6972,7 +7029,7 @@ msgstr[0] "Ви не отримали %hu повідомлення від %s, з
 msgstr[1] "Ви не отримали %hu повідомлення від %s, з невідомої причини."
 msgstr[2] "Ви не отримали %hu повідомлень від %s, з невідомої причини."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Не вдається відправити повідомлення: %s"
@@ -6994,6 +7051,12 @@ msgstr "У мережі з"
 msgid "Member Since"
 msgstr "Член з"
 
+msgid "Capabilities"
+msgstr "Можливості"
+
+msgid "Profile"
+msgstr "Профіль"
+
 msgid "Your AIM connection may be lost."
 msgstr "Ваше з'єднання AIM можливо буде розірване."
 
@@ -7162,7 +7225,8 @@ msgid ""
 msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "Максимальна довжина повідмлення складає %d байт. Pidgin обрізав його."
+msgstr[0] ""
+"Максимальна довжина повідмлення складає %d байт. Pidgin обрізав його."
 msgstr[1] ""
 "Максимальна довжина повідмлення складає %d байти. Pidgin обрізав його."
 msgstr[2] ""
@@ -7173,7 +7237,7 @@ msgstr "Повідомлення про відсутність надто дов
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7194,16 +7258,16 @@ msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
 msgstr ""
-"Pidgin тимчасово не в змозі отримати ваш список контактів з серверів АІМ. Ваш "
-"список контактів не втрачений, та вірогідно стане доступним через декілька "
-"годин."
+"Pidgin тимчасово не в змозі отримати ваш список контактів з серверів АІМ. "
+"Ваш список контактів не втрачений, та вірогідно стане доступним через "
+"декілька годин."
 
 msgid "Orphans"
 msgstr "Завислі рядки"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Не вдається додати користувача %s, тому що у вашому списку контактів надто "
@@ -7213,7 +7277,7 @@ msgid "(no name)"
 msgstr "(немає імені)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Вашу команду не виконано з невідомої причини."
 
 #, fuzzy, c-format
@@ -7287,6 +7351,7 @@ msgstr "З'єднатися"
 msgid "Get AIM Info"
 msgstr "Отримати інформацію"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Змінити коментар користувача"
 
@@ -7352,6 +7417,7 @@ msgstr "Шукати"
 msgid "Set User Info (web)..."
 msgstr "Встановити інформацію про користувача(URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Змінити пароль (URL)"
@@ -7387,6 +7453,10 @@ msgstr "Шукати користувача за адресою ел.пошти.
 msgid "Search for Buddy by Information"
 msgstr "Шукати користувача за інформацією"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Користувач не у мережі"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7404,7 +7474,7 @@ msgstr "Запит створення прямого з'єднання %s з н�
 msgid "Attempting to connect to %s:%hu."
 msgstr "Спроба створення прямого з'єднання з %s у %s:%hu"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "Спроба створення прямого з'єднання з %s у %s:%hu"
 
@@ -7514,7 +7584,7 @@ msgstr "Opera"
 msgid "Visible"
 msgstr "Невидимий"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7610,17 +7680,51 @@ msgstr "Останнє оновлення"
 msgid "Could not change buddy information."
 msgstr "Введіть користувача для стеження."
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "Мобільний Телефон"
+
+msgid "Note"
+msgstr "Примітки"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Значок користувача"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Додати користувача"
+msgid "_Modify"
+msgstr "З_мінити"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "З_мінити"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Сервер зайнятий"
+
+msgid "Your request was accepted."
+msgstr ""
 
-msgid "Input answer here"
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Запитати авторизацію"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Додати користувача у список?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Не можна відправляти каталог."
+
 msgid "Send"
 msgstr "Надіслати"
 
@@ -7632,19 +7736,20 @@ msgstr "Неправильний пароль"
 msgid "Authorization denied message:"
 msgstr "Повідомлення відмови у авторизації:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Початок ідентифікації"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Додати користувача у список?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "Увійти на сервер конференцій"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7667,7 +7772,7 @@ msgid "Failed sending authorize"
 msgstr "Будь-ласка, авторизуйте мене!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Не вдається приєднатися до користувача у кімнаті"
 
 #, fuzzy, c-format
@@ -7713,6 +7818,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Неправильні параметри проксі"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Член з"
 
@@ -7757,15 +7866,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "Приєднатися до розмови"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Номер телефон"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7776,7 +7888,7 @@ msgstr "Параметри звуку"
 msgid "Failed:"
 msgstr "Помилка"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7788,11 +7900,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
-msgstr ""
+#, fuzzy
+msgid "Sorry, you are not our style"
+msgstr "Вибачте, я на хвилинку відійшов(відійшла)!"
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Номер телефон"
 
 #, fuzzy
@@ -7803,7 +7916,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Бажаєте приєднатися до бесіди?"
 
 #, fuzzy
@@ -7811,28 +7924,28 @@ msgid "Setup"
 msgstr "_Встановити"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Не вдається приєднатися до користувача у кімнаті"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Видалити користувача"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Видалити користувача"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7952,6 +8065,13 @@ msgstr "<b>Користувач:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Псевдонім:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Користувач:</b> %s<br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7959,7 +8079,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Про Pidgin"
 
 #, fuzzy
@@ -7980,6 +8100,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Про Pidgin"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Домашня адреса"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8011,7 +8135,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "З'єднання"
@@ -8024,6 +8147,9 @@ msgstr "Показати менше параметри"
 msgid "Show server news"
 msgstr "Показати менше параметри"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Помилка читання"
@@ -8033,11 +8159,7 @@ msgid "Update interval (seconds)"
 msgstr "Помилка читання"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Не вдається отримати інформацію про сервер"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Не вдається отримати інформацію про сервер"
 
 #, c-format
@@ -8060,21 +8182,19 @@ msgid "Activation required"
 msgstr "Вимагається реєстрація"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "Помилка читання"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "Неоднозначний запит"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Ідентифікація Yahoo! завершилась невдало"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -8084,7 +8204,7 @@ msgstr "Збереження зображення"
 msgid "Enter code"
 msgstr "Зміна паролю"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -8092,69 +8212,43 @@ msgid "Enter the text from the image"
 msgstr "Введіть назву групи, що додаватиметься."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Не вдається встановити з'єднання."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Невідома помилка"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "Вас було роз'єднано з сервером."
-
-#, fuzzy
-msgid "Unable to read from socket"
-msgstr "Не вдається прочитати сокет"
-
 #, fuzzy
-msgid "Write Error"
-msgstr "Помилка запису"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "З'єднання розірвано"
-
-#, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Встановити інформацію про користувача..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Запит заборонено"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Не вдається з'єднатись з вузлом"
+msgid "Unable to resolve hostname"
+msgstr "Не вдається перевірити доступність сервера"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Неправильне ім'я користувача чи пароль"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "З'єднатися з сервером"
+msgid "Connecting to server"
+msgstr "З'єднання з SILC сервером"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Помилка читання"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "Не вдається приєднатися до розмови"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8164,6 +8258,10 @@ msgid ""
 msgstr "Транзитний сервер ICQ"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s на %s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Від"
 
@@ -8173,32 +8271,30 @@ msgid ""
 "%s"
 msgstr "Інформація про сервер"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Помилка невідома."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "команда"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Не вдається отримати інформацію про сервер"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Помилка невідома."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Помилка невідома."
 
 #, fuzzy, c-format
@@ -8213,10 +8309,6 @@ msgstr "Не вдається відправити файл"
 msgid "%d canceled the transfer of %s"
 msgstr "%s скасував передавання %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "З'єднання розірвано"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Користувач:</b> %s<br>"
@@ -8278,19 +8370,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "З'єднання розірвано"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Помилка при зчитуванні з сокету."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Не вдається з'єднатися з сервером."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8318,6 +8397,10 @@ msgid "Video Camera"
 msgstr "Відеорозмова"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "Передавання файлів"
+
+#, fuzzy
 msgid "Supports"
 msgstr "підтримка"
 
@@ -9051,9 +9134,6 @@ msgstr "Організація"
 msgid "Unit"
 msgstr "Відділ"
 
-msgid "Note"
-msgstr "Примітки"
-
 msgid "Join Chat"
 msgstr "Приєднатися до розмови"
 
@@ -9156,6 +9236,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Статистика мережі"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Помилка Ping"
 
@@ -9221,7 +9304,8 @@ msgstr "Непідтримуваний тип публічного ключа"
 msgid "Disconnected by server"
 msgstr "З'єднання розірвано сервером"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Помилка при з'єднанні з сервером SILC"
 
 msgid "Key Exchange failed"
@@ -9233,29 +9317,26 @@ msgstr ""
 "Не вдається відновити перерваний сеанс. Щоб створити нове з'єднання "
 "натисніть \"Повторне з'єднання\""
 
-msgid "Connection failed"
-msgstr "Не вдається встановити з'єднання"
-
 msgid "Performing key exchange"
 msgstr "Виконується обмін ключами"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Не вдається створити нове з'єднання."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Не вдається завантажити публічний ключ"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "З'єднання з SILC сервером"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Не вдається завантажити публічний ключ"
+
 msgid "Out of memory"
 msgstr "Недостатньо пам'яті"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Не вдається ініціалізувати з'єднання клієнта SILC"
 
 #, fuzzy
@@ -9573,7 +9654,7 @@ msgid "Creating SILC key pair..."
 msgstr "Створення пари ключів SILC..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Створення пари ключів SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9667,6 +9748,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Немає доступної статистики серверу"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Помилка при з'єднанні з сервером SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Помилка: невідповідність версій. Поновіть власного клієнта"
@@ -9707,7 +9791,8 @@ msgstr "Помилка: неправильний cookie"
 msgid "Failure: Authentication failed"
 msgstr "Помилка: ідентифікація завершилась невдало"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Не вдається ініціалізувати з'єднання клієнта SILC"
 
 #, fuzzy
@@ -9715,32 +9800,29 @@ msgid "John Noname"
 msgstr "Вузол пішов"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Не вдається завантажити публічний ключ"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Не вдається відправити"
-
-msgid "Could not connect"
-msgstr "Не вдається встановити з'єднання"
+msgid "Unable to create connection"
+msgstr "Не вдається створити нове з'єднання."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Невідома помилка."
 
 #, fuzzy
-msgid "Could not create listen socket"
+msgid "Unable to create listen socket"
 msgstr "Не вдається створити сокет"
 
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Не вдається розв'язати назву вузла."
-
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Псевдоніми IRC не повинні містити побіли"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Показати менше параметри"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9781,179 +9863,69 @@ msgstr "Користувач AP"
 msgid "Auth Domain"
 msgstr "автоматично"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Пошук %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Не вдається з'єднатись з %s"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Підключення: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Не вдається записати файл %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Не вдається прочитати файл %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Повідомлення занадто довге, останні %s байт обрізані"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s наразі не у мережі."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Попередження %s не дозволено."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Повідомлення відкинуто, ви перевищили межу швидкості сервера."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Розмова у %s недоступна."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Ви відправляєте повідомлення до %s занадто швидко."
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;кімната&gt;:  приєднатися до кімнати розмов мережі Yahoo."
 
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Ви не отримали повідомлення від %s, тому що воно було надто велике."
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Список каналів цієї мережі"
 
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"Ви не отримали повідомлення від %s, тому що воно надсилалось занадто швидко."
-
-#, c-format
-msgid "Failure."
-msgstr "Збій."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Забагато відповідностей."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Вимагається більша точність."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Службі каталогів тимчасово недоступна."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Пошук ел.пошти обмежений."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Ключове слово проігноровано."
 
-#, c-format
-msgid "No keywords."
-msgstr "Немає ключових слів."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-#, c-format
-msgid "User has no directory information."
-msgstr "Користувач не має довідникових даних."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Модуль протоколу Yahoo"
 
-#, c-format
-msgid "Country not supported."
-msgstr "Країна не підтримується."
+#, fuzzy
+msgid "Pager server"
+msgstr "Проксі-сервер"
 
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Невідомий збій: %s."
+msgid "Pager port"
+msgstr "Порт пейджера"
 
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Неправильне прізвисько або пароль."
+#, fuzzy
+msgid "File transfer server"
+msgstr "Вузол передавання файлів"
 
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Служба тимчасово недоступна."
+msgid "File transfer port"
+msgstr "Порт передавання файлів"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Ваш рівень застереження зависокий для входу у систему."
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Локаль кімнати розмов"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
-"Ви занадто часто з'єднуєтесь та від'єднуєтесь. Зачекайте 10 хвилин та "
-"спробуйте знову. Якщо ви продовжите спроби, вам доведеться чекати ще довше."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Невідома помилка підключення: %s"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Невідома помилка %d. Інформація: %s"
 
 #, fuzzy
-msgid "Invalid Groupname"
-msgstr "Неправильна група"
-
-msgid "Connection Closed"
-msgstr "З'єднання розірвано"
-
-msgid "Waiting for reply..."
-msgstr "Очікування відповіді..."
-
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC зв'язок відновлено. Тепер ви можете відправити повідомлення знову."
-
-msgid "Password Change Successful"
-msgstr "Пароль успішно змінено"
-
-msgid "_Group:"
-msgstr "_Група:"
-
-msgid "Get Dir Info"
-msgstr "Отримати інформацію каталогу"
-
-msgid "Set Dir Info"
-msgstr "Встановити інформацію каталогу"
-
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Не вдається відкрити %s для запису!"
-
-msgid "File transfer failed; other side probably canceled."
-msgstr "Не вдається передати файл; вірогідно, скасовано на іншому боці."
-
-msgid "Could not connect for transfer."
-msgstr "Не вдається з'єднатися для передавання."
+msgid "Chat room list URL"
+msgstr "Url переліку розмов"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Не вдається записати заголовок файлу. Файл не буде передаватись."
+msgid "Yahoo Chat server"
+msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "Зберегти значок як..."
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s просить %s прийняти %d файл: %s (%.2f %s)%s%s"
-msgstr[1] "%s просить %s прийняти %d файли: %s (%.2f %s)%s%s"
-msgstr[2] "%s просить %s прийняти %d файлів: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s просить вас відправити йому файл"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9965,11 +9937,11 @@ msgstr "%s просить вас відправити йому файл"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Модуль протоколу TOC "
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Модуль протоколу Yahoo"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9993,6 +9965,32 @@ msgstr "%s (повторно) не заборонив вам додати себ
 msgid "Add buddy rejected"
 msgstr "У додаванні користувача відмовлено"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Не вдається встановити SSL-з'єднання з сервером."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Невідома помилка з номером %d. Вхід з веб-сторінки Yahoo! може це виправити."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Невідома помилка з номером %d. Вхід з веб-сторінки Yahoo! може це виправити."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Неправильне прізвисько або пароль."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10000,8 +9998,8 @@ msgid ""
 "Check %s for updates."
 msgstr ""
 "Сервер Yahoo намагається використовувати невідомий метод ідентифікації. Ця "
-"версія Pidgin швидше за все не зможе увійти у систему Yahoo. Спробуйте оновити "
-"%s."
+"версія Pidgin швидше за все не зможе увійти у систему Yahoo. Спробуйте "
+"оновити %s."
 
 msgid "Failed Yahoo! Authentication"
 msgstr "Ідентифікація Yahoo! завершилась невдало"
@@ -10026,11 +10024,12 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Невідома помилка з номером %d. Вхід з веб-сторінки Yahoo! може це виправити."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Не вдається додати користувача %s у групу %s у список на сервері %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Не вдається додати користувача у список на сервері"
 
 #, c-format
@@ -10038,23 +10037,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Недопустима відповідь від сервера."
 
-msgid "Connection problem"
-msgstr "Проблема зв'язку"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Бесіда з %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Не вдається встановити SSL-з'єднання з сервером."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10109,9 +10101,8 @@ msgstr "використовувати параметри оточення"
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Активувати який ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "До кого приєднатись у розмові?"
@@ -10126,82 +10117,15 @@ msgstr "Приєднатися до користувача у розмові..."
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;кімната&gt;:  приєднатися до кімнати розмов мережі Yahoo."
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Список каналів цієї мережі"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Модуль протоколу Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Проксі-сервер"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japan вузол пейджера"
-
-msgid "Pager port"
-msgstr "Порт пейджера"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Вузол передавання файлів"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japan вузол передавання файлів"
-
-msgid "File transfer port"
-msgstr "Порт передавання файлів"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Локаль кімнати розмов"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Url переліку розмов"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Не вдається встановити з'єднання."
+
 msgid "Unable to establish file descriptor."
 msgstr "Не вдається встановити дескриптор файлу."
 
@@ -10209,6 +10133,10 @@ msgstr "Не вдається встановити дескриптор файл
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Пропозиція надіслати %s до %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Помилка запису"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Профіль Yahoo! Japan"
 
@@ -10254,14 +10182,9 @@ msgstr "Цікаве посилання 3"
 msgid "Last Update"
 msgstr "Останнє оновлення"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Інформація про користувача %s недоступна"
-
 #, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr "Схоже, цей профіль на мові, яка наразі не підтримується."
 
 msgid ""
@@ -10332,21 +10255,19 @@ msgstr "Голос"
 msgid "Webcams"
 msgstr "Веб-камери"
 
+msgid "Connection problem"
+msgstr "Проблема зв'язку"
+
 msgid "Unable to fetch room list."
 msgstr "Не вдається завантажити перелік кімнат."
 
 msgid "User Rooms"
 msgstr "Кімнати користувача"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Проблема зв'язку з сервером YCHT."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Вас було роз'єднано з сервером."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10489,31 +10410,21 @@ msgid "Exposure"
 msgstr "Експозиція"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Не вдається створити сокет"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Не вдається відправити повідомлення: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Помилка з'єднання з проксі %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Доступ заборонено: проксі-сервер забороняє тунелювання порту %d."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Помилка підключення до розмови %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Не вдається розв'язати назву вузла."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10610,10 +10521,6 @@ msgstr "Не турбувати"
 msgid "Extended away"
 msgstr "Розширений статус \"Відійшов\""
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Мобільний Телефон"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10655,20 +10562,6 @@ msgstr "%s виходить зі стану бездіяльності"
 msgid "%x %X"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr ""
-"Помилка читання %s: \n"
-"%s.\n"
-
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Помилка при синтаксичному розборі списку контактів. Список не був "
-"завантажений, а попередній файл перейменований на blist.xml~."
-
 msgid "Calculating..."
 msgstr "Підрахунок..."
 
@@ -10786,6 +10679,20 @@ msgstr "З'єднання розірвано"
 msgid "Address already in use."
 msgstr "Такий файл вже існує"
 
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"Помилка читання %s: \n"
+"%s.\n"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Помилка при синтаксичному розборі списку контактів. Список не був "
+"завантажений, а попередній файл перейменований на blist.xml~."
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "Обмін миттєвими повідомленнями"
@@ -10834,10 +10741,9 @@ msgstr "Сповіщення про нову пошту"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "Параметри %s"
+#, fuzzy
+msgid "_Advanced"
+msgstr "_Скасувати"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10873,9 +10779,6 @@ msgstr "Якщо ви ретельно придивитесь"
 msgid "you can see the butterflies mating"
 msgstr "ви можете побачити метеликів"
 
-msgid "Proxy Options"
-msgstr "Параметри проксі"
-
 msgid "Proxy _type:"
 msgstr "_Тип проксі:"
 
@@ -10906,8 +10809,8 @@ msgid "Create _this new account on the server"
 msgstr ""
 
 #, fuzzy
-msgid "_Advanced"
-msgstr "_Скасувати"
+msgid "_Proxy"
+msgstr "без проксі"
 
 #, fuzzy
 msgid "Enabled"
@@ -10947,8 +10850,8 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Перелік кімнат"
+msgid "A_ccount"
+msgstr "Обліковий запис:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10957,8 +10860,9 @@ msgstr ""
 "Введіть відповідну інформацію про розмову, до якого ви бажали б "
 "приєднатись.\n"
 
-msgid "_Account:"
-msgstr "_Обліковий запис:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Перелік кімнат"
 
 #, fuzzy
 msgid "_Block"
@@ -10978,6 +10882,17 @@ msgid "I_M"
 msgstr "_Повідомл"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "Додати розмову"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Відеорозмова"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "_Надіслати файл"
 
@@ -10989,7 +10904,11 @@ msgid "View _Log"
 msgstr "Переглянути _журнал"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Не допускається не у мережі"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Не допускається не у мережі"
 
 msgid "_Alias..."
@@ -11136,6 +11055,10 @@ msgid "/Tools/_Certificates"
 msgstr "/Сервіс/П_араметри"
 
 #, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Сервіс/С_татус"
+
+#, fuzzy
 msgid "/Tools/Plu_gins"
 msgstr "/Сервіс/Дії над модулями"
 
@@ -11145,10 +11068,6 @@ msgstr "/Сервіс/П_араметри"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Сервіс/_Конфіденційність"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Сервіс/С_татус"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Сервіс/Передавання _файлів..."
 
@@ -11282,8 +11201,8 @@ msgstr "інший"
 msgid "By status"
 msgstr "за статусом"
 
-msgid "By log size"
-msgstr "за розміром журналу"
+msgid "By recent log activity"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "%s disconnected"
@@ -11301,6 +11220,9 @@ msgstr "_Повторне з'єднання"
 msgid "Re-enable"
 msgstr "Зареєструвати новий обліковий запис Jabber"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s повертається"
@@ -11399,6 +11321,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Псевдонім:"
 
+msgid "_Group:"
+msgstr "_Група:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11437,6 +11362,120 @@ msgstr "/С_ервіс"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Контакти/Показувати відсутніх користувачів"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Колір тла"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Бажаєте додати цей контакт у список контактів?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Не у мережі"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Колір тла"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Розгорнути"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Вибір кольору тла"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Згорнути"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Вибір кольору тла"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Комбінації клавіш"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "У мережі"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Отримати інформацію про обраного користувача"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Користувач відійшов"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Отримати інформацію про обраного користувача"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Не в мережі"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Отримати інформацію про обраного користувача"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Настрій"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Отримати інформацію про обраного користувача"
+
+msgid "Message Text"
+msgstr "Текст повідомлення"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Текст повідомлення"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Зміна інформації про %s"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11459,14 +11498,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Запросити користувача у час"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Введіть ім'я користувача, якого ви бажаєте запросити, та введіть "
-"необов'язковий текст запрошення."
-
 msgid "_Buddy:"
 msgstr "_Користувач:"
 
@@ -11497,7 +11528,7 @@ msgid "Get Away Message"
 msgstr "Нове повідомлення про відсутність"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Прізвище:"
 
 msgid "Unable to save icon file to disk."
@@ -11546,6 +11577,22 @@ msgstr "/Бесіда/Зберегти _як..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Бесіда/О_чистити"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Бесіда/_Закрити"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Бесіда/_Закрити"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Бесіда/_Закрити"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Бесіда/Переглянути _журнал"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Бесіда/Наді_слати файл..."
 
@@ -11624,6 +11671,18 @@ msgstr "/_Бесіда"
 msgid "/Conversation/View Log"
 msgstr "/Бесіда/Переглянути журнал"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Бесіда/_Закрити"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Бесіда/Переглянути журнал"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Бесіда/_Закрити"
+
 msgid "/Conversation/Send File..."
 msgstr "/Бесіда/Надіслати файл..."
 
@@ -11825,6 +11884,9 @@ msgstr "Адреса"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "підтримка"
 
@@ -11958,6 +12020,10 @@ msgid "Hungarian"
 msgstr "Угорська"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Румунська"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Македонська"
 
@@ -11975,6 +12041,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "Поточні перекладачі"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "Opera"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "Заборонено"
 
@@ -11998,6 +12068,10 @@ msgid "Macedonian"
 msgstr "Македонська"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "Македонська"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Норвезька"
 
@@ -12055,6 +12129,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "Шведська"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Термінал"
@@ -12106,8 +12183,25 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"3\">IRC:</FONT> #Pidgin на irc.freenode.net<BR><BR>"
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> #Pidgin на irc.freenode.net<BR><BR>"
 
 #, fuzzy
@@ -12389,7 +12483,7 @@ msgid "Hyperlink visited color"
 msgstr "Колір гіперпосилання"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Колір для відображення гіперпосилань"
 
 #, fuzzy
@@ -12429,15 +12523,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Видалення сповіщень"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Сповіщення про нову пошту"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12450,15 +12551,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Сповіщення про нову пошту"
 
-msgid "_Copy Email Address"
-msgstr "_Копіювати адресу ел.пошти"
-
-msgid "_Open Link in Browser"
-msgstr "_Відкрити посилання у веб-переглядачі"
-
-msgid "_Copy Link Location"
-msgstr "_Копіювати посилання"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12500,11 +12592,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "Збереження зображення"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "З_берегти зображення..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Показати подробиці про користувача"
 
@@ -12595,10 +12686,6 @@ msgid "Font Face"
 msgstr "Вид шрифту"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Колір тла"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Колір шрифту"
 
@@ -12732,6 +12819,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12749,6 +12837,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12780,16 +12869,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Пейджер"
 
-#, fuzzy
-msgid "Open All Messages"
-msgstr "Надсилання повідомлення"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
 
 #, fuzzy
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "Calling..."
+msgstr "Підрахунок..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ви отримали пошту!</span>\n"
-"\n"
-"%s"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12820,6 +12920,35 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Було вибрано веб-переглядач \"інший\", але команду не було задано."
 
+#, fuzzy
+msgid "No message"
+msgstr "(1 повідомлення)"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "Надсилання повідомлення"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Ви отримали пошту!</span>\n"
+"\n"
+"%s"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Нове правило"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Ви отримали пошту!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12873,11 +13002,18 @@ msgstr ""
 msgid "Select a file"
 msgstr "Вибір файлу"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Змінити правило"
+
 #. Create the "Pounce on Whom" frame.
 #, fuzzy
 msgid "Pounce on Whom"
 msgstr "За ким слідкувати"
 
+msgid "_Account:"
+msgstr "_Обліковий запис:"
+
 msgid "_Buddy name:"
 msgstr "І_м'я користувача:"
 
@@ -12958,7 +13094,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr "Коли реагувати"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Користувач почав _набирати"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Користувач пише..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "_Увійшов"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "П_ерестав бути бездіяльним"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "_Повернувся"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Ping"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Ви_йшов"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s має стан бездіяльності"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "при відсутності"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Надіслати пові_домлення"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Невідома подія стеження. Сповістіть про це!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Не вдається зберегти зображення: %s\n"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12982,6 +13169,12 @@ msgstr "Комбінації клавіш"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Бесіда з %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Список контактів"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Значок системного лотка"
 
@@ -12994,7 +13187,7 @@ msgid "On unread messages"
 msgstr "Надіслати пові_домлення"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "Вікна бесід"
 
 #, fuzzy
@@ -13004,6 +13197,10 @@ msgstr "Закрити бесіду"
 msgid "When away"
 msgstr "при відсутності"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Вікна бесід"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13068,10 +13265,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Блимати вікном, при отриманні повідомлення"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Вікна бесід"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13107,15 +13300,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Не вдається отримати інформацію про користувача"
 
-#, fuzzy
-msgid "ST_UN server:"
-msgstr "_Сервер:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Автоматично визначати IP-адресу"
 
 msgid "Public _IP:"
@@ -13138,6 +13327,10 @@ msgstr "П_очатковий порт:"
 msgid "_End port:"
 msgstr "К_інцевий порт:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "Проксі-сервер"
@@ -13167,6 +13360,10 @@ msgstr "Проксі-сервер"
 msgid "No proxy"
 msgstr "без проксі"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Користувач:"
 
@@ -13337,14 +13534,14 @@ msgid "Auto-away"
 msgstr "Авто-\"Відійшов\""
 
 #, fuzzy
-msgid "Change status when _idle"
-msgstr "Ав_томатично встановлювати статус \"Відійшов\""
-
-#, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Хвилин до встановлення статусу \"Відійшов\""
 
 #, fuzzy
+msgid "Change status when _idle"
+msgstr "Ав_томатично встановлювати статус \"Відійшов\""
+
+#, fuzzy
 msgid "Change _status to:"
 msgstr "Змінити адресу на:"
 
@@ -13501,29 +13698,19 @@ msgstr "Зберегти _та застосувати"
 msgid "Status for %s"
 msgstr "Стан: %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Вставити посмішку"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Файл публічного ключа"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Введіть нову назву для обраної групи."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Вставити посмішку"
@@ -13533,21 +13720,29 @@ msgid "Add Smiley"
 msgstr "Посмішка!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "Збереження зображення"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "Комбінації клавіш"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Посмішка!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Комбінації клавіш"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Вибрати користувача"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13637,8 +13832,8 @@ msgid "Cannot send launcher"
 msgstr "Не вдається надіслати файл"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13673,6 +13868,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "_Відкривати посилання у:"
+
+msgid "_Copy Link Location"
+msgstr "_Копіювати посилання"
+
+msgid "_Copy Email Address"
+msgstr "_Копіювати адресу ел.пошти"
+
+#, fuzzy
 msgid "Save File"
 msgstr "Збереження файлу..."
 
@@ -13776,6 +13981,78 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Адреса сервера"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Увійти на сервер конференцій"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Виберіть сервер конференцій для опитування"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Мережні служби"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Надсилання списку контактів"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "при відсутності"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Шукати:"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Вибір звуку"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Опис:</b> Примарний"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Встановити інформацію каталогу"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Веб-переглядач:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Користувач не існує"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Сервер не використовує жодного підтримуваного методу ідентифікації"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Встановити інформацію каталогу"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Користувач бездіяльний:"
 
@@ -14189,7 +14466,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14305,12 +14582,6 @@ msgstr ""
 "- перегортає весь вхідний текст\n"
 "- відправляє повідомлення користувачам з вашого списку коли вони входять"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Колір гіперпосилання"
@@ -14323,6 +14594,10 @@ msgstr "Колір гіперпосилання"
 msgid "Highlighted Message Name Color"
 msgstr "Надсилання повідомлення"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Видалення сповіщень"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14357,37 +14632,25 @@ msgstr "Параметри зовнішнього вигляду"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ігнорувати _кольори"
+msgid "Disable Typing Notification Text"
+msgstr "Сповіщення про нову пошту"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Керування Pidgin з файлу"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Закрити"
 
 #, fuzzy
 msgid "Fonts"
 msgstr "Облікові записи"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Керування Pidgin з файлу"
@@ -14482,7 +14745,7 @@ msgstr "Вікна бесід"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14537,6 +14800,113 @@ msgstr ""
 "Замінює текст у вихідних повідомленнях згідно правилам, що встановлені "
 "користувачем."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Не у мережі"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s не у мережі."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Приєднатися до розмови"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ігнорувати"
+
+#, fuzzy
+msgid "Founder"
+msgstr "година"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Авторизацію отримано"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Помилка"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Інформація"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Неоднозначний запит"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Рівень попередження"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Стан: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Локаль кімнати розмов"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Збереження значка"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Керування Pidgin з файлу"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Дані про обліковий запис"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Список контактів"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Список контактів"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Керування Pidgin з файлу"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Керування Pidgin з файлу"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14709,10 +15079,6 @@ msgid "Only when docked"
 msgstr ""
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "_Блимати вікном, при отриманні повідомлення"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "Параметри входу"
 
@@ -14720,9 +15086,10 @@ msgstr "Параметри входу"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Специфічні для Windows параметри Pidgin."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Специфічні для Windows параметри Pidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14764,6 +15131,520 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Не вдається відкрити сокет"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Не вдається створити сокет"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Не вдається прочитати сокет"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Не вдається встановити з'єднання"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Сервер розірвав з'єднання"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Не вдається створити сокет"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Не вдається з'єднатись з вузлом"
+
+#~ msgid "Read error"
+#~ msgstr "Помилка читання"
+
+#~ msgid "Write error"
+#~ msgstr "Помилка запису"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Встановити інформацію каталогу"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Додаткова адреса"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Псевдонім розмови"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Користувач не має довідникових даних."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "команда"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Помилка реєстрації"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Розташування"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Повідомлення про стан користувача"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Непідтримувана версія"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Орієнтація"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Режими користувача"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Межа кількості користувачів"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Можливості"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Ім'я користувача"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM з обміном ключами"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Адреса ел.пошти"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Встановити профіль"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Прізвисько"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Живе відео"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Отримано повідомлення"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Babbleprint публічного ключа"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Меню користувача"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Режими користувача"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Межа кількості користувачів"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Межа кількості користувачів"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Кодування Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "Помилка читання"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Не вдається з'єднатися з сервером."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Черга повна"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Не вдається розібрати повідомлення"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Не вдається з'єднатись з вузлом"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Не вдається увійти у мережу (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Не вдається з'єднатися з сервером."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Ви були відключені, тому що увійшли у систему з іншої машини."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Помилка. Підтримку SSL не встановлено."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Неправильний пароль."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Не вдається з'єднатися з сервером."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Незабаром ви можете бути від'єднані. Можливо, ви захочете використати "
+#~ "TOC, доки це не буде виправлено. Перевірте оновлення на %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Не вдається з'єднатися"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Неправильне ім'я користувача"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Не вдається отримати інформацію про сервер"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "З'єднання розірвано"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Не вдається з'єднатись з вузлом"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "З'єднання розірвано"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "З'єднання розірвано"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Помилка при зчитуванні з сокету."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Не вдається з'єднатися з сервером."
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Не вдається відправити"
+
+#~ msgid "Could not connect"
+#~ msgstr "Не вдається встановити з'єднання"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Не вдається створити сокет"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Не вдається розв'язати назву вузла."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Неправильний пароль."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan вузол пейджера"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan вузол передавання файлів"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Вас було роз'єднано з сервером."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Не вдається розв'язати назву вузла."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Для входу на сервер вимагається TLS/SSL. Підтримку TLS/SSL не знайдено."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Вікна бесід"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Введіть нову назву для обраної групи."
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Активувати який ID?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ігнорувати _кольори"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "Повідомлення про вихід"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Введіть ім'я користувача, якого ви бажаєте запросити, та введіть "
+#~ "необов'язковий текст запрошення."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Не вдається завантажити список контактів"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Незабаром ви можете бути від'єднані. Можливо, ви захочете використати "
+#~ "TOC, доки це не буде виправлено. Перевірте оновлення на %s."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Додати користувача"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Не вдається отримати інформацію про сервер"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "Помилка читання"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "Вас було роз'єднано з сервером."
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "З'єднатися з сервером"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "Не вдається приєднатися до розмови"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Пошук %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Не вдається з'єднатись з %s"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Підключення: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Не вдається записати файл %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Не вдається прочитати файл %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Повідомлення занадто довге, останні %s байт обрізані"
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s наразі не у мережі."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Попередження %s не дозволено."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Повідомлення відкинуто, ви перевищили межу швидкості сервера."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Розмова у %s недоступна."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Ви відправляєте повідомлення до %s занадто швидко."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Ви не отримали повідомлення від %s, тому що воно було надто велике."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr ""
+#~ "Ви не отримали повідомлення від %s, тому що воно надсилалось занадто "
+#~ "швидко."
+
+#~ msgid "Failure."
+#~ msgstr "Збій."
+
+#~ msgid "Too many matches."
+#~ msgstr "Забагато відповідностей."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Вимагається більша точність."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Службі каталогів тимчасово недоступна."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Пошук ел.пошти обмежений."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Ключове слово проігноровано."
+
+#~ msgid "No keywords."
+#~ msgstr "Немає ключових слів."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Користувач не має довідникових даних."
+
+#~ msgid "Country not supported."
+#~ msgstr "Країна не підтримується."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Невідомий збій: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Неправильне прізвисько або пароль."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Служба тимчасово недоступна."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Ваш рівень застереження зависокий для входу у систему."
+
+#~ msgid ""
+#~ "You have been connecting and disconnecting too frequently.  Wait ten "
+#~ "minutes and try again.  If you continue to try, you will need to wait "
+#~ "even longer."
+#~ msgstr ""
+#~ "Ви занадто часто з'єднуєтесь та від'єднуєтесь. Зачекайте 10 хвилин та "
+#~ "спробуйте знову. Якщо ви продовжите спроби, вам доведеться чекати ще "
+#~ "довше."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Невідома помилка підключення: %s"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Невідома помилка %d. Інформація: %s"
+
+#, fuzzy
+#~ msgid "Invalid Groupname"
+#~ msgstr "Неправильна група"
+
+#~ msgid "Connection Closed"
+#~ msgstr "З'єднання розірвано"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Очікування відповіді..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "TOC зв'язок відновлено. Тепер ви можете відправити повідомлення знову."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Пароль успішно змінено"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Отримати інформацію каталогу"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Встановити інформацію каталогу"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Не вдається відкрити %s для запису!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Не вдається передати файл; вірогідно, скасовано на іншому боці."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Не вдається з'єднатися для передавання."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Не вдається записати заголовок файлу. Файл не буде передаватись."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Зберегти значок як..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s просить %s прийняти %d файл: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s просить %s прийняти %d файли: %s (%.2f %s)%s%s"
+#~ msgstr[2] "%s просить %s прийняти %d файлів: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s просить вас відправити йому файл"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Модуль протоколу TOC "
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Інформація про користувача %s недоступна"
+
+#~ msgid "%s Options"
+#~ msgstr "Параметри %s"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Параметри проксі"
+
+#~ msgid "By log size"
+#~ msgstr "за розміром журналу"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Відкрити посилання у веб-переглядачі"
+
+#, fuzzy
+#~ msgid "ST_UN server:"
+#~ msgstr "_Сервер:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Збереження зображення"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Комбінації клавіш"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Блимати вікном, при отриманні повідомлення"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "Тека з такою назвою вже існує"
 
@@ -14832,13 +15713,6 @@ msgstr ""
 #~ msgstr "Чи дійсно бажаєте видалити повідомлення про відсутність \"%s\"?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s на %s (%s)"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Надсилання повідомлення"
 
@@ -14980,9 +15854,6 @@ msgstr ""
 #~ msgid "Invalid screen name"
 #~ msgstr "Неправильне ім'я користувача"
 
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Не вдається встановити SSL-з'єднання з сервером."
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "Занадто докучливий (відправник)"
 
@@ -15043,10 +15914,6 @@ msgstr ""
 #~ msgstr "Користувачі %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Бажаєте додати цей контакт у список контактів?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "Помилка при роботі з файлом"
 
@@ -15055,10 +15922,6 @@ msgstr ""
 #~ msgstr "%s наразі не у мережі."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Помилка при створенні з'єднання"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Не вдається ввійти у мережу AIM"
 
@@ -15177,17 +16040,9 @@ msgstr ""
 #~ msgstr "Наразі на"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Не вдається з'єднатися з сервером."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Повідомлення:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Обліковий запис:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Ховати помилки розриву з'єднання"
 
@@ -15233,8 +16088,8 @@ msgstr ""
 #~ "allows messages to be queued until the icon is clicked, similar to ICQ."
 #~ msgstr ""
 #~ "Відображає значок системного лотка (наприклад, у GNOME, KDE або Windows) "
-#~ "який показує поточний стан Pidgin, що надає швидкий доступ до операцій, які "
-#~ "використовуються у більшості випадків, та дозволяє вмикати/вимикати "
+#~ "який показує поточний стан Pidgin, що надає швидкий доступ до операцій, "
+#~ "які використовуються у більшості випадків, та дозволяє вмикати/вимикати "
 #~ "відображення даних списку контактів або вікна входу. Також дозволяє "
 #~ "зберігати повідомлення у черзі, до їх викликання клацанням на зображенні, "
 #~ "подібно до ICQ."
@@ -15247,8 +16102,8 @@ msgstr ""
 #~ "You can get version %s from:<br><a href=\"http://Pidgin.sourceforge.net/"
 #~ "\">http://Pidgin.sourceforge.net</a>."
 #~ msgstr ""
-#~ "Ви можете отримати версію %s з:<br><a href=\"http://Pidgin.sourceforge.net/"
-#~ "\">http://Pidgin.sourceforge.net</a>."
+#~ "Ви можете отримати версію %s з:<br><a href=\"http://Pidgin.sourceforge."
+#~ "net/\">http://Pidgin.sourceforge.net</a>."
 
 #~ msgid "Delay"
 #~ msgstr "Затримка"
@@ -15350,13 +16205,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>Статус:</b> Не у мережі"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Опис:</b> Примарний"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -15457,9 +16305,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "С_тав бездіяльним"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "П_ерестав бути бездіяльним"
-
 #~ msgid "Pounce Action"
 #~ msgstr "Що робити"
 
@@ -15759,12 +16604,12 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "Коли це трапляється, TOC ігнорує будь-які надіслані йому повідомлення, та "
-#~ "може відключити вас при спробі надіслати повідомлення. Pidgin не дозволить "
-#~ "цього зробити. Це тимчасові труднощі, будьте терплячими."
+#~ "може відключити вас при спробі надіслати повідомлення. Pidgin не "
+#~ "дозволить цього зробити. Це тимчасові труднощі, будьте терплячими."
 
 #~ msgid "Pidgin - Save As..."
 #~ msgstr "Pidgin - Зберегти як..."
@@ -15778,8 +16623,8 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "Звичайний метод ідентифікації завершився аварійно. Це означає що, або ви "
 #~ "вказали некоректний пароль, або змінилась схема автентифікації Yahoo!. "
@@ -15809,9 +16654,6 @@ msgstr ""
 #~ msgstr[1] "(%d повідомлення)"
 #~ msgstr[2] "(%d повідомлень)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(1 повідомлення)"
-
 #, fuzzy
 #~ msgid "Default auto-away"
 #~ msgstr "Авто-\"Відійшов\""
@@ -15905,9 +16747,6 @@ msgstr ""
 #~ msgid "Away title: "
 #~ msgstr "Назва повідомлення:"
 
-#~ msgid "Buddy List Error"
-#~ msgstr "Помилка списку контактів"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Розмір стрілки розширювача"
 
@@ -16040,9 +16879,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Відправити повідомлення до обраного користувача"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Отримати інформацію про обраного користувача"
-
 #~ msgid "_Chat"
 #~ msgstr "_Розмова"
 
@@ -16254,9 +17090,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Зведення"
 
-#~ msgid "Message Text"
-#~ msgstr "Текст повідомлення"
-
 #~ msgid "Away Messages"
 #~ msgstr "Повідомлення про відсутність"
 
@@ -16318,13 +17151,13 @@ msgstr ""
 #~ msgstr "Не вдається завантажити параметри"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
-#~ "Pidgin не вдається завантажити параметри, тому що вони збережені у старому "
-#~ "форматі, який вже не використовується. Виконайте ще раз налаштовування у "
-#~ "вікні параметрів."
+#~ "Pidgin не вдається завантажити параметри, тому що вони збережені у "
+#~ "старому форматі, який вже не використовується. Виконайте ще раз "
+#~ "налаштовування у вікні параметрів."
 
 #~ msgid "Slightly less boring default"
 #~ msgstr "типове повідомлення про відсутність"
@@ -16359,9 +17192,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Критична помилка у бібліотеці GG\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Не вдається перевірити доступність сервера"
-
 #~ msgid "Send as message"
 #~ msgstr "Надіслати як повідомлення"
 
@@ -16430,15 +17260,15 @@ msgstr ""
 #~ msgstr "Не вдається отримати доступ до каталогу"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin не вдається виконати пошук у каталозі, тому що не вдалось з'єднатись "
-#~ "з сервером каталогу. Пізніше спробуйте ще раз."
+#~ "Pidgin не вдається виконати пошук у каталозі, тому що не вдалось "
+#~ "з'єднатись з сервером каталогу. Пізніше спробуйте ще раз."
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin не вдається змінити ваш пароль через помилку з'єднання з сервером "
 #~ "Gadu-Gadu. Пізніше спробуйте ще раз."
@@ -16450,8 +17280,8 @@ msgstr ""
 #~ msgstr "Не вдається отримати доступ до профілю користувача."
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin не вдається отримати доступ до профілю цього користувача через "
 #~ "помилку з'єднання з сервером каталогу. Спробуйте ще раз пізніше."
@@ -16574,9 +17404,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s у мережі."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s не у мережі."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -16594,9 +17421,6 @@ msgstr ""
 #~ "%s запросив %s у кімнату розмов %s:\n"
 #~ "<b>%s</b>"
 
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Вибачте, я на хвилинку відійшов(відійшла)!"
-
 #~ msgid "/Conversation/A_lias..."
 #~ msgstr "/Бесіда/_Псевдонім..."
 
diff --git a/po/ur.po b/po/ur.po
index 0c84e800ba..f6cd584169 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin Urdu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-11-14 14:00+0530\n"
 "Last-Translator: RKVS Raman <raman@cdacbangalore.in>\n"
 "Language-Team: C-DAC,Gist,Urdu Team / BharateeyaOO.o <info.gist@cdac.in / "
@@ -30,13 +30,13 @@ msgstr "فرانسیسی"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. كوشش `%s -h' مزید معلومات كے لیے.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -622,21 +622,6 @@ msgid "Send To"
 msgstr "_کو بھیجو"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "پیام میں داخل کرو"
-
-msgid "Invite"
-msgstr "مدعوكریں"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"براہ کرمصارف کا نام داخل کریں جسے آپ مدعو کرنا چاہتےہیں، آپشنل دعوتی پیام کے "
-"ساتھ۔"
-
-#, fuzzy
 msgid "Conversation"
 msgstr "/گفتگو"
 
@@ -897,6 +882,41 @@ msgstr "مکالمے"
 msgid "System Log"
 msgstr "سسٹم لاگ"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "شمارکررہا ہے۔۔۔"
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "قبول کرو"
+
+msgid "Reject"
+msgstr "ریجیكٹ"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "آپ نے %s%s چینل تقسیم کیا"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "ای میلس"
 
@@ -934,6 +954,9 @@ msgstr "جاری"
 msgid "IM"
 msgstr "IM"
 
+msgid "Invite"
+msgstr "مدعوكریں"
+
 msgid "(none)"
 msgstr "(كچھ نہيں )"
 
@@ -1156,7 +1179,6 @@ msgstr "%s دور چلا گيا(%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s نےآپ كو پیام بھیجا۔ (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "نا معلوم پانس واقعہ۔ براہ کرم اس کی رپورٹ کریں!"
 
@@ -1207,7 +1229,6 @@ msgstr "_اسٹیٹس تبدیل كرنےسےپہلے منٹس"
 msgid "Change status to"
 msgstr "كےلیےاسٹیٹس_تبدیل كریں"
 
-#. Conversations
 msgid "Conversations"
 msgstr "مکالمے"
 
@@ -1546,7 +1567,6 @@ msgid ""
 "conversation into the current conversation."
 msgstr "جب نئی گفتگو شروع كی جاتی ہے تب یہ پلگ ان "
 
-#, c-format
 msgid "Online"
 msgstr "آن لائن"
 
@@ -1596,6 +1616,28 @@ msgstr "Gntآخری لاگ"
 msgid "Lastlog plugin."
 msgstr "گائم متن كے لیے آخری لاگ پلگ ان كرو۔"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "اکاؤنٹس"
 
@@ -1695,13 +1737,6 @@ msgstr ""
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "قبول کرو"
-
-msgid "Reject"
-msgstr "ریجیكٹ"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1792,6 +1827,8 @@ msgstr "+++ %s سائن آن ہوچكا"
 msgid "+++ %s signed off"
 msgstr "+++ %sسائن آف ہوچكا"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "نامعلوم خامی "
 
@@ -1838,6 +1875,18 @@ msgstr "%sنے کمرہ چھوڑ دیا۔"
 msgid "%s left the room (%s)."
 msgstr "%sنے کمرہ چھوڑ دیا(%s)۔"
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "كانفرنس كےلیےمدعوكریں"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"براہ کرمصارف کا نام داخل کریں جسے آپ مدعو کرنا چاہتےہیں، آپشنل دعوتی پیام کے "
+"ساتھ۔"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "كنیكشن لینے میں نا كامیاب:%s"
@@ -1972,7 +2021,6 @@ msgstr " %sسے  %sکا ٹرانسفر شروع کررہا ہے"
 msgid "Transfer of file %s complete"
 msgstr " %sفائل   ٹرانسفر مکمل"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "فائل   ٹرانسفر مکمل"
 
@@ -1980,7 +2028,6 @@ msgstr "فائل   ٹرانسفر مکمل"
 msgid "You canceled the transfer of %s"
 msgstr "آپ نے%sکا ٹرانسفر منسوخ کر دیا"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "فائل ٹرانسفر منسوخ کر دیا"
 
@@ -2183,11 +2230,14 @@ msgstr "<فانٹ رنگ=\"red\"><b>فائل نہیں پڑھی جاسکی: %s</b
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "خامی رابطہ قائم کررہی ہے"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "آپ %s كا استعمال كررہے ہیں ، لیكن  یہ پلگ ان  %s. مہیا كرتا ہے۔"
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2594,9 +2644,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "لاگ ویورمیں  IMكلائنٹس كےدیگرلاگس شامل كرتاہے۔"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2652,7 +2703,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2681,6 +2732,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "خفیہ لفظ داخل کرو"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2873,18 +2950,18 @@ msgstr ""
 "چاہتے ہیں ، ایكٹیوTCL انسٹال كروfrom http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "آنے والے IM كنیكشنس كو سننے میں نااہل\n"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "لوكل mDNSسروركے ساتھ كنیكشن قائم نااہل۔كیایہ چل رہاہے؟"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "ابتدائی نام"
 
@@ -2918,6 +2995,11 @@ msgstr "Bonjour پروٹوكال پلگ ان"
 msgid "Purple Person"
 msgstr "نیا فرد"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "محل وقوع"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2928,14 +3010,17 @@ msgstr "%sنےگفتگوبند كردی۔"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "پیام بھیجا نہیں جاسكا،گفتگو شروع نہیں ہو سكی۔"
 
-msgid "Cannot open socket"
-msgstr "ساكیٹ نہیں كھول سكتا"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ساكیٹ كی تخلیق  نا ممكن :n%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "ساكیٹ كوپورٹ كےلیےباندھ نہیں سكا"
 
-msgid "Could not listen on socket"
-msgstr "ساكیٹ پر سنا نہیں جا سكا"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "ساكیٹ كی تخلیق  نا ممكن :n%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -2986,13 +3071,16 @@ msgstr "بڈی فہرست محفوظ کرو۔۔۔"
 msgid "Load buddylist from file..."
 msgstr "فائل سے بڈی لسٹ لوڈ كریں۔۔۔"
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "رجسٹریشن شعبے میں بھرو۔"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "خفیہ لفظ میل نہیں کھاتا۔"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "نیا اکاؤنٹ رجسٹر کرنے میں ناقابل۔ خامی واقع ہوگئی۔\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3004,14 +3092,15 @@ msgstr "رجسٹریشن کامیابی سےمکمل ہوا!"
 msgid "Password"
 msgstr "خفیہ لفظ"
 
-msgid "Password (retype)"
-msgstr "خفیہ لفظ (دوبارہ ٹائپ کرو)"
+msgid "Password (again)"
+msgstr "خفیہ لفظ(دوبارہ)"
 
-msgid "Enter current token"
-msgstr "حالیہ ٹوکن داخل کرو"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "خالیہ ٹوکن"
+#, fuzzy
+msgid "Captcha"
+msgstr "امیج محفوظ کرو"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "نیا گڈو- گڈو اکاؤنٹ رجسٹر کریں"
@@ -3064,6 +3153,15 @@ msgstr "خفیہ لفظ کامیابی سے تبدیل ہوگيا!"
 msgid "Current password"
 msgstr "حالیہ خفیہ لفظ"
 
+msgid "Password (retype)"
+msgstr "خفیہ لفظ (دوبارہ ٹائپ کرو)"
+
+msgid "Enter current token"
+msgstr "حالیہ ٹوکن داخل کرو"
+
+msgid "Current token"
+msgstr "خالیہ ٹوکن"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "براہ کرم، UINاپنا حالیہ خفیہ لفظ اورنیا خفیہ لفظ داخل کریں:"
 
@@ -3077,13 +3175,13 @@ msgstr "بڈی کے لئے گفتگو منتخب کریں:%s"
 msgid "Add to chat..."
 msgstr "گفتگو میں ملاؤ۔۔۔"
 
+#. Global
 msgid "Available"
 msgstr "دستیاب"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "دور"
 
@@ -3111,8 +3209,8 @@ msgstr "كوئی مماثل صارفین نہیں ملے"
 msgid "There are no users matching your search criteria."
 msgstr "آپ كی تلاش كرائٹیریا سے كوئی بھی صارفین میل  نہیں ركھتےہیں۔"
 
-msgid "Unable to read socket"
-msgstr "ساکیٹ پڑھنے میں نا قابل"
+msgid "Unable to read from socket"
+msgstr " ساكیٹ سے پڑھنا ناممكن"
 
 msgid "Buddy list downloaded"
 msgstr "بڈی لسٹ ڈاؤن لوڈكی گئی"
@@ -3126,8 +3224,14 @@ msgstr "بڈی لسٹ اپ لوڈكی گئی"
 msgid "Your buddy list was stored on the server."
 msgstr "آپ كی بڈی لسٹ سرورپر اسٹوركی گئی تھی۔"
 
-msgid "Connection failed."
-msgstr "کنیکشن ناکام۔"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "كنیكٹ كیا گیا"
+
+msgid "Connection failed"
+msgstr "کنیکشن ناکام ہوا"
 
 msgid "Add to chat"
 msgstr "گفتگو میں ملاؤ"
@@ -3135,13 +3239,23 @@ msgstr "گفتگو میں ملاؤ"
 msgid "Chat _name:"
 msgstr "گفتگو - نام:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "سرورکوکنیکٹ کرنے میں نا قا بل۔"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "کنیکٹ کررہا ہے"
+
 msgid "Chat error"
 msgstr "گفتگو خامی"
 
 msgid "This chat name is already in use"
 msgstr "یہ گفتگو نام پہلے سے استعمال میں"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "سرور سے کنیکٹ نہیں ہوا۔"
 
 msgid "Find buddies..."
@@ -3183,6 +3297,10 @@ msgstr "پالش مقبول IM"
 msgid "Gadu-Gadu User"
 msgstr "گڈو - گڈو صارف"
 
+#, fuzzy
+msgid "GG server"
+msgstr "صارف معلومات سیٹ کرو۔۔۔"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "نا معلوم کمانڈ:%s"
@@ -3198,7 +3316,7 @@ msgid "File Transfer Failed"
 msgstr "فائل ٹرانسفر  ناکام ہوا"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "گائم سننے والے پورٹ کھول نہیں سکا۔"
 
 msgid "Error displaying MOTD"
@@ -3214,8 +3332,18 @@ msgstr "اس کنیکشن کے ساتھ MOTDمتعلقہ نہیں ہے۔"
 msgid "MOTD for %s"
 msgstr "MOTDکے لئے%s"
 
-msgid "Server has disconnected"
-msgstr "سرور منقطع ہوگیا"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"سرور كے ساتھ كنیكشن گم ہوا:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "دیکھو  MOTD"
@@ -3226,25 +3354,24 @@ msgstr "چینل:"
 msgid "_Password:"
 msgstr "خفیہ لفظ:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRCنکس سفید اسپیس سے وابستہ نہیں ہوگی"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "کنیکٹ کررہا ہے"
-
 msgid "SSL support unavailable"
 msgstr "SSL  تعاون غیر دستیاب"
 
-msgid "Couldn't create socket"
-msgstr "ساکیٹ تخلیق نہیں کر سکا"
+msgid "Unable to connect"
+msgstr "کنیکٹ ہونے میں نا قابل"
 
-msgid "Couldn't connect to host"
-msgstr "ہاسٹ سے کنیکٹ نہیں ہو سکا"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "کنیکٹ ہونے میں نا قابل"
 
-msgid "Read error"
-msgstr "پڑھو خامی"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "سرورنےرابطہ بندكردیا۔"
 
 msgid "Users"
 msgstr "صارفین  "
@@ -3426,6 +3553,17 @@ msgstr ""
 "آپ نے منتخب کیا ہوا اکاؤنٹ نام سرور کے ذریعے مسترد کیا گیا ہے۔ممکن ہے کہ یہ "
 "غیر معتبر الفاظ سے وابستہ ہوگا۔"
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "یہ گفتگو نام پہلے سے استعمال میں"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "عرفیتی نام"
+
 msgid "Cannot change nick"
 msgstr "نک تبدیل نہیں کر سکتا"
 
@@ -3668,11 +3806,12 @@ msgstr "خامی نا قابل ہوئي"
 msgid "execute"
 msgstr "توقع نہیں"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "سرور کو ضرورت ہے TLS/SSL لاگ ان کے لئے۔  کوئی TLS/SSL تعاون نہیں ملا۔"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "سرور کو ضرورت ہے TLS/SSL لاگ ان کے لئے۔  کوئی TLS/SSL تعاون نہیں ملا۔"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3688,18 +3827,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "سادہ متن تصدیق"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "تصدیق نا کام"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "سرور سے غیر معتبر رد عمل۔"
 
 msgid "Server does not use any supported authentication method"
 msgstr "سرور کوئی مستند طریقے کا تعاون استعمال نہیں کرتا"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "سرور سے غیر معتبر چیلینج"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL خامی"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "کوئی وجہ نہیں دی گئی۔"
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "غیر معاون ورجن"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr " كنیكشن كی شروعات نا ممكن"
+
 msgid "Full Name"
 msgstr "پورا نام"
 
@@ -3767,187 +3942,9 @@ msgstr "كلائنٹ"
 msgid "Operating System"
 msgstr "آپریٹینگ سسٹم"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "ڈائریکٹری معلومات سیٹ کرو"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "توسیع شدہ ایڈریس"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "عرفیت گفتگو  "
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "صارف کے پاس کوئی ڈائریکٹری معلومات نہیں۔"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "کمانڈ  "
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "رجسٹریشن خامی"
-
-#, fuzzy
-msgid "User Location"
-msgstr "مقام"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "صارف تلاش"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "بڈی اسٹیٹ اطلاع"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "غیر معاون ورجن"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "رخ بندی"
-
-msgid "File Transfer"
-msgstr "فائل تبادلہ"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "صارف موڈس"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "صارف حد"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "صلاحیتیں"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "صارف کا نام"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IMکے ساتھ کلید ایکسچینج"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ای میل ایڈریس"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "پروفائل"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "پینگ  "
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "صارف كا نام"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "جاری ویڈیو"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "پیام موصول ہوا"
-
 #, fuzzy
-msgid "Public Key Publishing"
-msgstr "پبلک کلید بیبل پرنٹ"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "صارف آپشنس"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "صارف موڈس"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "صارف كا نام"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "صارف حد"
-
-msgid "Ping"
-msgstr "پینگ  "
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ٹری لیئن اینکریپشن"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "صلاحیتیں"
+msgid "Local Time"
+msgstr "لوکل فائل:"
 
 msgid "Priority"
 msgstr "ترجیح"
@@ -3955,6 +3952,14 @@ msgstr "ترجیح"
 msgid "Resource"
 msgstr "ماخذ"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "لاگڈ ان"
+
 msgid "Middle Name"
 msgstr "درمیانی نام"
 
@@ -4003,7 +4008,6 @@ msgstr "باتونی"
 msgid "Extended Away"
 msgstr " "
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "ڈسٹرب مت کرو"
 
@@ -4127,29 +4131,26 @@ msgstr "استفسار کے لئے کانفرنس سرور منتخب  کرو"
 msgid "Find Rooms"
 msgstr "کمرے تلاش کرو"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "عرفیت:"
 
-msgid "Write error"
-msgstr "لکھو خامی"
+#, fuzzy
+msgid "No users found"
+msgstr "كوئی مماثل صارفین نہیں ملے"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "سادہ متن"
+msgid "Roles:"
+msgstr "رول"
 
-msgid "Read Error"
-msgstr "پڑھو خامی"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "سادہ متن"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "ساکیٹ تخلیق کرنےمیں نا قابل"
 
 #, fuzzy
 msgid "Invalid XMPP ID"
@@ -4158,6 +4159,10 @@ msgstr "IDغیر معتبر"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "سرور سے کنیکٹ ہونے میں ناکام۔"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "کا رجسٹریشن %s@%s کامیاب"
@@ -4184,9 +4189,6 @@ msgstr "رجسٹریشن کامیاب"
 msgid "Unregistration Failed"
 msgstr "رجسٹریشن نا کام ہوا"
 
-msgid "Already Registered"
-msgstr "پہلے ہی رجسٹر کیا گیا"
-
 msgid "State"
 msgstr "ریاست"
 
@@ -4199,6 +4201,9 @@ msgstr "فون"
 msgid "Date"
 msgstr "تاریخ"
 
+msgid "Already Registered"
+msgstr "پہلے ہی رجسٹر کیا گیا"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "رجسٹر"
@@ -4231,6 +4236,10 @@ msgid "Change Registration"
 msgstr ""
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "سرور سے کنیکٹ ہونے میں ناکام۔"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "خامی تبدیل کررہی ہے اکاؤنٹ معلومات"
 
@@ -4251,9 +4260,18 @@ msgstr "تصدیق کررہا ہے"
 msgid "Re-initializing Stream"
 msgstr "ری -  انیشیئلائزینگ اسٹریم"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "تصدیق نہيں کیا گیا"
 
+msgid "Mood"
+msgstr "موڈ"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "دونوں"
 
@@ -4275,12 +4293,6 @@ msgstr "کوئی نہیں"
 msgid "Subscription"
 msgstr "سبس کریپشن"
 
-msgid "Mood"
-msgstr "موڈ"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "بلڈ ٹائپ"
@@ -4327,9 +4339,6 @@ msgstr "آپ کا خفیہ لفظ تبدیل کیا جا چکا ہے۔"
 msgid "Error changing password"
 msgstr "خامی خفیہ لفظ تبدیل کرنا"
 
-msgid "Password (again)"
-msgstr "خفیہ لفظ(دوبارہ)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "خفیہ لفظ تبدیل کرو"
@@ -4524,18 +4533,25 @@ msgstr "%sصارف کو ٹھوکر مارنے میں ناقابل"
 msgid "Unable to ping user %s"
 msgstr "%sصارف کو بین کرنے میں ناقابل"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "آواز بجانے میں نا قابل کیونکہ منتخب کی گئی فائل(%s)موجود نہیں ہے۔"
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "آواز بجانے میں نا قابل کیونکہ منتخب کی گئی فائل(%s)موجود نہیں ہے۔"
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "آواز بجانے میں نا قابل کیونکہ منتخب کی گئی فائل(%s)موجود نہیں ہے۔"
 
+# msgstr "%s has added you [%s]"
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4546,10 +4562,37 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr ""
 
-# msgstr "%s has added you [%s]"
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "%sکو پیام بھیجنے میں ناقابل۔"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "%sکوفا ئل بھیجنے میں نہ قابل،صارف فائل ٹرانسفرز کو تعاون نہیں دیتا "
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "%sکوفا ئل بھیجنے میں نہ قابل،صارف فائل ٹرانسفرز کو تعاون نہیں دیتا "
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "رجسٹریشن نا کام ہوا"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
 msgstr ""
+"براہ کرم فرد کا اسکرین نام یا عرفیت داخل کریں جسےکی معلومات آپ دیکھنا پسند "
+"کرے گے۔"
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "فائل منتخب کرو"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "ابتدائی - گفتگو"
 
 msgid "config:  Configure a chat room."
 msgstr "وضع:کمرہ گفتگو کو ہیئت دو۔"
@@ -4570,16 +4613,18 @@ msgstr "موضوع[نیا موضوع]:دیکھو یا موضوع تبدیل کر
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "بین &یہ؛صارف&gt؛ [کمرہ]:  صارف کو کمرے سے بین کرو۔ "
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "شرکت &یہ؛صارف&gt؛ &یہ؛owner|admin|member|outcast|none&gt؛:کمرے کے ساتھ صارف "
 "کی شرکت سیٹ کریں۔"
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4647,6 +4692,9 @@ msgstr "سرور کو کنیکٹ کرو"
 msgid "File transfer proxies"
 msgstr " فائل ٹرانسفر پورٹ"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4687,6 +4735,14 @@ msgstr "XMLتصریف خامی"
 msgid "Unknown Error in presence"
 msgstr "حال میں نامعلوم خامی"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "خامی گفتگو میں حصہ لے رہاہے %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "گفتگو میں خامی%s"
+
 msgid "Create New Room"
 msgstr "نیا کمرہ تخلیق کرو"
 
@@ -4703,13 +4759,32 @@ msgstr "_ہیئتی كمرہ"
 msgid "_Accept Defaults"
 msgstr "ـڈیفالٹس قبول كریں"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "خامی گفتگو میں حصہ لے رہاہے %s"
+#, fuzzy
+msgid "No reason"
+msgstr "کوئی وجہ نہیں دی گئی۔"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "گفتگو میں خامی%s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "آپ  کو%s: (%s)کے ذریعے ٹھوکر ماری گئی۔"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr " %s (%s)کے ذریعے ٹھوکر ماری گئی"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "فائل کھولنےکےدوران  خامی واقع ہوگئی۔"
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "فائل ٹرانسفر  ناکام ہوا"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr " '%s': %s كو كھولنا نا كامیاب"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4737,10 +4812,6 @@ msgstr ""
 "کرے گے۔"
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "فائل منتخب کرو"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "صارف موڈس"
 
@@ -4778,9 +4849,19 @@ msgstr "ایكشن"
 msgid "Select an action"
 msgstr "فائل منتخب کرو"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr " \"%s\"شامل کرنے میں ناقابل۔"
+
+msgid "Buddy Add error"
+msgstr ""
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "نوٹس ایڈریس بك منتخب كریں"
+msgid "The username specified does not exist."
+msgstr "مخصوص کیا گيا اسکرین نام معتبرنہیں ہے۔"
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5010,7 +5091,7 @@ msgstr "بچوں کا پاسپورٹ  بغیر والدین کے اجازت کے
 msgid "Passport account not yet verified"
 msgstr "پاسپورٹ اکاؤنٹ ابھی تک تصدیق نہیں کیا گیا"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "پاسپورٹ اکاؤنٹ ابھی تک تصدیق نہیں کیا گیا"
 
@@ -5034,6 +5115,10 @@ msgstr "ترجیح دیا گیا رابطہ "
 msgid "Non-IM Contacts"
 msgstr "رابطہ ہٹاؤ"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5107,6 +5192,13 @@ msgstr "موبائل پیام بھیجو۔"
 msgid "Page"
 msgstr "صفحہ"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "كام"
+
 msgid "Has you"
 msgstr "کیا آپ نے"
 
@@ -5148,6 +5240,14 @@ msgstr "برج حمل"
 msgid "Album"
 msgstr "Adium"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "عنوان"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "عنوان"
+
 msgid "Set Friendly Name..."
 msgstr "دوستانہ نام سیٹ كریں۔۔۔"
 
@@ -5184,9 +5284,6 @@ msgstr ""
 "MSNکےلئےSSLتعاون کی ضرورت ہے۔براہ کرم تعاون دیا گیا SSLکتب خانہ انسٹال "
 "کریں۔مزید معلومات کے لئے دیکھیے http://Pidgin.sf.net/faq-ssl.php "
 
-msgid "Failed to connect to server."
-msgstr "سرور سے کنیکٹ ہونے میں ناکام۔"
-
 msgid "Error retrieving profile"
 msgstr "خامی دوبارہ فائل حاصل کرنے کی کوشش کررہا ہے"
 
@@ -5343,8 +5440,8 @@ msgstr ""
 "گائم صارف کی پروفائل میں کوئی معلومات تلاش نہیں کرسکا۔ ہو سکتا ہے کہ صارف "
 "موجود نہیں ہے۔"
 
-msgid "Profile URL"
-msgstr "پرو فائل URL"
+msgid "View web profile"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -5380,66 +5477,29 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "عام تصدیق ناکام ہوئي!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s معتبر گروپ نہیں ہے۔"
-
-msgid "Unknown error."
-msgstr "نا معلوم خامی۔"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s پر %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%sنے ابھی آپ کو نج بھیجا!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
+msgstr "نا معلوم خامی:0x%X"
 
 # msgstr "نامعلوم خامی "
 msgid "Unable to add user"
 msgstr "صارف كوشامل كرنے میں مجازنہیں"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr ""
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "مندرجہ ذیل آپ کے تلاش کے نتائج ہیں"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr " %s (%s)پرصارف شامل کرنے میں نا قابل "
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr " %s (%s) پر صارف کو بلاک کرنے میں نا قابل"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr " %s (%s)پر صارف کو اجازت دینے میں  ناقابل"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%sملا نہیں سکا کیو نکہ آپ کی بڈی فہرست فل ہوگئی ہے۔"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%sمعتبر پاسپورٹ اکاؤنٹ نہیں ہے۔"
-
-msgid "Service Temporarily Unavailable."
-msgstr "سروس عارضی طورپرغیردستیاب ہے۔"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "پیام نہیں بھیجاجا سكاكیونكہ بہت جلدجلدبھیج رہےہیں:"
 
-msgid "Unable to rename group"
-msgstr "گروپ کو دوبارہ نام  دینے میں ناقابل"
-
-msgid "Unable to delete group"
-msgstr "گروپ کو خارج  کرنے میں ناقابل"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5485,9 +5545,6 @@ msgstr "پیام نہیں بھیجا جا سکا کیونکہ نا معلوم خ
 msgid "Message was not sent because an unknown error occurred."
 msgstr "پیام نہیں بھیجا جا سکا کیونکہ نا معلوم خامی واقع ہوگئی:"
 
-msgid "Unable to connect"
-msgstr "کنیکٹ ہونے میں نا قابل"
-
 msgid "Writing error"
 msgstr "لکھ رہا ہے خامی"
 
@@ -5502,13 +5559,16 @@ msgstr ""
 "سےكنیكشن خامی%s server:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "ہمارا  پروٹوکال سرور کے ذریعے معارن نہیں ہے۔"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "خامی تصریف کررہی ہے HTTP۔"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "آپ نے دوسرے لوکیشن سے سائنڈ آن کیا ہے۔"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5516,7 +5576,8 @@ msgstr ""
 "MSNسرورز عارضی طور پر غیر دستیاب ہیں۔ براہ کرم انتظار کریں اور دوبارہ کوشش "
 "کریں۔"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN سرورز عارضی طور پر نیچے جارہے ہیں۔"
 
 #, c-format
@@ -5547,6 +5608,14 @@ msgstr "کوکی بھیج رہا ہے"
 msgid "Retrieving buddy list"
 msgstr "بڈی فہرست دوبارہ حاصل کررہا ہے"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "کمپیوٹر سے دور رہو"
 
@@ -5583,14 +5652,6 @@ msgstr "پیام نہیں بھیجا جا سکا کیونکہ سوئچ بورڈ
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "پیام نہیں بھیجا جا سکا کیونکہ نا معلوم خامی واقع ہوگئی:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%sنے آپ كواپنی بڈی لسٹ میں شامل كردیا۔"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%sنے آپ كواپنی بڈی لسٹ سےخارج كردیا۔"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "ایڈریس بک میں ملاؤ"
@@ -5599,13 +5660,6 @@ msgstr "ایڈریس بک میں ملاؤ"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "کیا آپ اس بڈی کو اپنی بڈی لسٹ میں شامل کرنا چاہتے ہیں؟"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr " \"%s\"شامل کرنے میں ناقابل۔"
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "مخصوص کیا گيا اسکرین نام معتبرنہیں ہے۔"
@@ -5613,6 +5667,9 @@ msgstr "مخصوص کیا گيا اسکرین نام معتبرنہیں ہے۔"
 msgid "This Hotmail account may not be active."
 msgstr "یہ ہاٹ میل اکاؤنٹ  شاید فعال نہیں ہو سکتا۔"
 
+msgid "Profile URL"
+msgstr "پرو فائل URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5626,19 +5683,63 @@ msgstr "یہ ہاٹ میل اکاؤنٹ  شاید فعال نہیں ہو سکت�
 msgid "MSN Protocol Plugin"
 msgstr "MSN  پروٹو کال پلگ ان"
 
-#, fuzzy
-msgid "Missing Cipher"
-msgstr "صفر"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s معتبر گروپ نہیں ہے۔"
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "نا معلوم خامی۔"
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s پر %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr " %s (%s)پرصارف شامل کرنے میں نا قابل "
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr " %s (%s) پر صارف کو بلاک کرنے میں نا قابل"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr " %s (%s)پر صارف کو اجازت دینے میں  ناقابل"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%sملا نہیں سکا کیو نکہ آپ کی بڈی فہرست فل ہوگئی ہے۔"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%sمعتبر پاسپورٹ اکاؤنٹ نہیں ہے۔"
+
+msgid "Service Temporarily Unavailable."
+msgstr "سروس عارضی طورپرغیردستیاب ہے۔"
+
+msgid "Unable to rename group"
+msgstr "گروپ کو دوبارہ نام  دینے میں ناقابل"
+
+msgid "Unable to delete group"
+msgstr "گروپ کو خارج  کرنے میں ناقابل"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%sنے آپ كواپنی بڈی لسٹ میں شامل كردیا۔"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%sنے آپ كواپنی بڈی لسٹ سےخارج كردیا۔"
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "صارف کمرے"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "پڑھ رہا ہے خامی"
 
@@ -5650,13 +5751,25 @@ msgstr "سرور سے غیر معتبر چیلینج"
 msgid "Logging in"
 msgstr "لاگینگ"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "كوئی نام نہیں"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"سرور كے ساتھ گم شدہ كنیكشن\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr " پیام_  بھیجو"
@@ -5676,21 +5789,24 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
+# msgstr "ہاسٹ سے کنیکٹ نہیں ہو سکا"
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "كوئی نام نہیں"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "_IM ونڈوز"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "كنیكٹ كیا گیا"
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "سرور سے غیر معتبر رد عمل۔"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5698,15 +5814,22 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "غیر صحیح اسكرین نام اور پا سورڈ"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
+#, fuzzy
+msgid "Invalid input condition"
+msgstr "کنیکشن فائنل کررہا ہے"
+
 # msgstr "پروسیس لوٹایا گيا خامی کوڈ %d"
 msgid "Failed to add buddy"
 msgstr ""
@@ -5717,14 +5840,6 @@ msgstr ""
 msgid "persist command failed"
 msgstr ""
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "صارف کمرے"
-
 msgid "Failed to remove buddy"
 msgstr ""
 
@@ -5735,39 +5850,16 @@ msgid "blocklist command failed"
 msgstr ""
 
 #, fuzzy
-msgid "Invalid input condition"
-msgstr "کنیکشن فائنل کررہا ہے"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "قطار فل"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "پیام  کی تصریف میں ناقابل"
+msgid "Missing Cipher"
+msgstr "صفر"
 
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
+msgid "The RC4 cipher could not be found"
 msgstr ""
 
-# msgstr "ہاسٹ سے کنیکٹ نہیں ہو سکا"
-#, fuzzy
-msgid "IM Friends"
-msgstr "_IM ونڈوز"
-
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "سرور سے غیر معتبر رد عمل۔"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5814,9 +5906,6 @@ msgstr "بڑی فانٹ سائز"
 msgid "User"
 msgstr "صارف"
 
-msgid "Profile"
-msgstr "پروفائل"
-
 #, fuzzy
 msgid "Headline"
 msgstr "مسترد کرنا"
@@ -5832,15 +5921,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "مکالمہ بند کرو"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "كوئی نام نہیں"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5854,6 +5938,9 @@ msgstr "%s سفیدبورڈپرپیام بھیجا۔كیاآپ سفیدبورڈ�
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "اس تھم میں اسمائلیز دستیاب نہیں۔"
@@ -5862,6 +5949,14 @@ msgstr "اس تھم میں اسمائلیز دستیاب نہیں۔"
 msgid "Please try another username:"
 msgstr "براہ كرم %s كے لیے نام داخل  كیجیے۔"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "كوئی نام نہیں"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6054,10 +6149,6 @@ msgid "Master archive is misconfigured"
 msgstr "ماسٹر محافظ خانہ غیر وضع کیا گيا ہے"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "غیر صحیح اسكرین نام اور پا سورڈ"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr " اسكرین نام كا ہوسٹ  آپ داخل كئے كی تشكیل نہیں كی جاسكتی۔"
 
@@ -6101,9 +6192,9 @@ msgstr "صارف آف لائن ہے یا آپ بلاک ہوگئے ہیں"
 msgid "Unknown error: 0x%X"
 msgstr "نا معلوم خامی:0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "لاگ ان ناکا م ہوئی(%s)۔"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%sصارف کو بین کرنے میں ناقابل"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6205,9 +6296,6 @@ msgstr "گروپ وائز کانفرنس %d"
 msgid "Authenticating..."
 msgstr "تصدیق کررہا ہے۔۔۔"
 
-msgid "Unable to connect to server."
-msgstr "سرورکوکنیکٹ کرنے میں نا قا بل۔"
-
 msgid "Waiting for response..."
 msgstr "در عمل کے لئے انتظار کررہا ہے۔۔۔"
 
@@ -6231,25 +6319,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "کیا آپ مکالمے میں شرکت کرنا پسند کریں گے؟"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "آپ لاگڈ آؤٹ کئے جاچکے ہیں کیونکہ آپ نےدوسرے ورک اسٹیشن میں لاگڈ کیا۔"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr " %sآف لائن  نظر آتا ہے اور آپ نے ابھی بھیجا ہوا پیام موصول نہیں کیا۔"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "سرور سے کنیکٹ ہونے میں ناقابل۔براہ کرم سرور کا ایڈریس داخل کریں  جس سےآپ "
 "کنیکٹ ہونا چاہتے ہیں۔"
 
-msgid "Error. SSL support is not installed."
-msgstr "خامی۔ SSL تعاون انسٹال نہیں کیا گیا ہے۔"
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "یہ کانفرنس بند کیا جا چکا ہے۔ مزید پیاماتنہیں بھیجے جاسکتے۔"
 
@@ -6273,6 +6355,26 @@ msgid "Server port"
 msgstr "سرور پورٹ"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "غیر قبول   HTTP رسپانس سرور سے وصول كیا جاتا ہے۔"
+
+#. username connecting too frequently
+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 ""
+"آپ بہت تیزی سے کنیکٹ اور ڈس کنیکٹ ہوچکے ہیں۔دس منٹ تک انتظار کریں اور دوبارہ "
+"کوشش کریں۔ اگر آپ جاری رکھنے کی کوشش کرتے ہیں تو، آپ کو اور زیادہ دیر تک "
+"انظار کرنے کی ضرورت ہے۔"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "خامی رابطہ قائم کررہی ہے"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "كنیكٹ نہیں ہوسكا"
 
@@ -6280,18 +6382,8 @@ msgstr "كنیكٹ نہیں ہوسكا"
 msgid "Invalid chat room name"
 msgstr "غیر معتبر کمرہ نام"
 
-msgid "Server closed the connection."
-msgstr "سرورنےرابطہ بندكردیا۔"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"سرور كے ساتھ كنیكشن گم ہوا:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "سروركےساتھ كنیكشن پرغیرمعتبرڈاٹاموصول ہوا۔"
 
 #. *< type
@@ -6341,7 +6433,8 @@ msgstr "ریموٹ صارف كے ساتھ آخری كنیكشن:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "ریموٹ صارف كے ساتھ كنیكشن پر غیرمعتبرڈاٹاموصول ہوا۔"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "ریموٹ صارف كے ساتھ رابطہ قائم نہیں ہو سكا۔"
 
 msgid "Direct IM established"
@@ -6515,23 +6608,18 @@ msgstr "کیمرہ"
 msgid "Screen Sharing"
 msgstr "اسکرین کا نام"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "گفتگو کے لئے فری"
 
-#, c-format
 msgid "Not Available"
 msgstr "عدم دستیاب"
 
-#, c-format
 msgid "Occupied"
 msgstr "قبضہ کیا گيا"
 
-#, c-format
 msgid "Web Aware"
 msgstr "ویب خبر داری"
 
-#, c-format
 msgid "Invisible"
 msgstr "اوجھل"
 
@@ -6544,21 +6632,15 @@ msgstr "آگہی سطح"
 msgid "Buddy Comment"
 msgstr "بڈی رائے"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 " ایك تصدیق كئے گئے سرور سے كنیكٹ نہيں  كیا جاسكتا:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS سرور سے رابطہ نہیں كیا جاسكتا:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "سرورکوکنیکٹ کرنے میں نا قا بل۔"
 
 #, fuzzy
 msgid "Username sent"
@@ -6573,52 +6655,61 @@ msgstr "کنیکشن فائنل کررہا ہے"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "لاگ ان کرنے میں ناقابل:%sکے طور پر سائن نہیں کرسکا کیونکہ اسکرین نام غیر "
 "معتبر ہے۔اسکرین نام یا حرف کے ساتھ شروع ہونا چاہیے یا صرف حروف  ،نمبرز اور "
 "اسپیسیس، یا صرف نمبر سے وابستہ  ہو۔"
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "آپ كچھ دیركےلیےمنقطع ہوسكتےہیں۔اپ ڈیٹس كے لیے%sجانچیے۔"
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "نا درست نام "
+msgid "Unable to get a valid AIM login hash."
+msgstr "گائم معتبرAIM lلاگ ان ہیش حاصل کرنے میں ناقابل تھا۔"
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "گائم معتبرلاگ ان ہیش حاصل کرنے میں ناقابل تھا۔"
 
-msgid "Incorrect password."
-msgstr "غلط خفیہ لفظ۔"
+msgid "Received authorization"
+msgstr "اتھورائزیشن موصول ہوا"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "صارف موجود نہیں"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "آپ کا اکاؤنٹ فی الحال معطل کر دیا گیا ہے۔"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOLانسٹنٹ میسینجر سروس عارضی طور پر غیر دستیاب ہے۔"
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "آپ استعمال کررہے کلائنٹ ورژن بہت لمبا ہے ۔ براہ کرم%sمیں اپ گریڈ کریں"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "آپ بہت تیزی سے کنیکٹ اور ڈس کنیکٹ ہوچکے ہیں۔دس منٹ تک انتظار کریں اور دوبارہ "
 "کوشش کریں۔ اگر آپ جاری رکھنے کی کوشش کرتے ہیں تو، آپ کو اور زیادہ دیر تک "
 "انظار کرنے کی ضرورت ہے۔"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "آپ استعمال کررہے کلائنٹ ورژن بہت لمبا ہے ۔ براہ کرم%sمیں اپ گریڈ کریں"
-
-msgid "Could Not Connect"
-msgstr "کنیکٹ نہیں ہو سکا"
-
-msgid "Received authorization"
-msgstr "اتھورائزیشن موصول ہوا"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
 
 msgid "Enter SecurID"
@@ -6634,26 +6725,6 @@ msgstr "ڈیجیٹل ڈسپلے سے 6ڈیجیٹ نمبر داخل کریں۔"
 msgid "_OK"
 msgstr "ٹھیک ہے"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"آپ شاید مختضر وقفے کےلئے منقطع کر دیئے گئے ہوگے۔آپ کو  TOC  استعمال کرنی "
-"ہوگی جب تک یہ  فکس نہیں ہوتی ہے۔%sاپ ڈیٹس کےلئے جانچيے۔"
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "گائم معتبرAIM lلاگ ان ہیش حاصل کرنے میں ناقابل تھا۔"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "آپ كچھ دیركےلیےمنقطع ہوسكتےہیں۔اپ ڈیٹس كے لیے%sجانچیے۔"
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "گائم معتبرلاگ ان ہیش حاصل کرنے میں ناقابل تھا۔"
-
 msgid "Password sent"
 msgstr "خفیہ لفظ بھیجا"
 
@@ -6786,7 +6857,7 @@ msgstr[0] " آپ نے نا معلوم وجہ کےلئے %2$sسے%1$hu پیام �
 msgstr[1] " آپ نے نا معلوم وجہ کےلئے %2$sسے%1$hu پیامات مس کردیئے ۔"
 
 # Data is assumed to be the destination sn
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "پیام بھیجنے میں نا قابل:   %s "
@@ -6808,6 +6879,12 @@ msgstr "آن لائن جب تک "
 msgid "Member Since"
 msgstr "ممبر جب تک"
 
+msgid "Capabilities"
+msgstr "صلاحیتیں"
+
+msgid "Profile"
+msgstr "پروفائل"
+
 msgid "Your AIM connection may be lost."
 msgstr "آپ کا AIM کنیکشن کھو گیا۔"
 
@@ -6988,7 +7065,7 @@ msgstr "دور پیام بہت طویل۔"
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7015,9 +7092,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "یتیم"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "بڈی %s شامل نہیں کرسکا کیو نکہ آپ کے پاس آپ کی بڈی لسٹ میں بہت سارے بڈیز "
@@ -7026,9 +7103,9 @@ msgstr ""
 msgid "(no name)"
 msgstr "(کوئی نام نہیں)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "آپ کا کمانڈ نا معلوم سبب کے لئے ناکام ہوا۔"
 
 # msgstr "آپ کا کمانڈ نا معلوم سبب کے لئے ناکام ہوا۔"
 #, fuzzy, c-format
@@ -7100,6 +7177,7 @@ msgstr "کنیکٹ"
 msgid "Get AIM Info"
 msgstr "AIM معلومات حاصل كریں"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "بڈی رائے مرتب کریں"
 
@@ -7161,6 +7239,7 @@ msgstr "تلاش کرو"
 msgid "Set User Info (web)..."
 msgstr "صارف معلومات سیٹ (URL)۔۔۔"
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "خفیہ لفظ  تبدیل کرو(URL)"
@@ -7193,6 +7272,10 @@ msgid "Search for Buddy by Information"
 msgstr "معلومات کے ذریعے بڈی کے لئے تلاش کریں"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "صارف لاگڈ ان نہیں"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7213,7 +7296,6 @@ msgstr ""
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s:%hu.سےكنیكٹ ہونےكی كوشش كررہاہے۔"
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr " viaپراكسی سرورسےكنیكٹ ہونےكی كوشش كررہاہے۔"
 
@@ -7309,7 +7391,7 @@ msgstr "دیگر"
 msgid "Visible"
 msgstr "اوجھل"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7400,16 +7482,49 @@ msgstr "آخری اپ ڈیٹ"
 msgid "Could not change buddy information."
 msgstr "براہ كرم بڈی معلومات داخل كیجیے۔"
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "موبائل"
+
+msgid "Note"
+msgstr "نوٹ"
+
+# msgstr "(پیام موصول ہونے میں خامی تھی۔  جس بڈی سے آپ بات کررہے تھے بہت حد تک قیاس ہے کہ کلائنٹ بگی تھا۔)"
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "بڈی آئیکن"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "بڈی ملاؤ"
+msgid "_Modify"
+msgstr "ترمیم"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Memo Modify"
+msgstr "ترمیم"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "سرور مصروف"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "مطلوبہ اتھورائزیشن "
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "آپ کی  لسٹ میں بڈی ملانا ؟"
+
+#, fuzzy
+msgid "Enter answer here"
 msgstr "یہاں درخواست ان پٹ كیجیے"
 
 msgid "Send"
@@ -7423,18 +7538,19 @@ msgid "Authorization denied message:"
 msgstr "اتھارائزیشن میسیج سے انكار كیا گیا:"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "معاف كیجیے، آپ میرے ٹائپ كے نہیں ہے۔۔۔"
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "صارف %d  تصدیق چاہتا ہے"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "آپ کی  لسٹ میں بڈی ملانا ؟"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "یہاں درخواست ان پٹ كیجیے"
 
 msgid "Would you be my friend?"
@@ -7458,7 +7574,7 @@ msgid "Failed sending authorize"
 msgstr "براہ کرم مجھے اتھورائز کریں!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "گفتگو میں بڈی کی شرکت ناکام ہوئی"
 
 #, fuzzy, c-format
@@ -7503,6 +7619,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr "آپ مستقل صرف QQ گروپس كی تلاش كرسكتے ہیں \n"
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "غیر معتبر پراکسی سیٹینگس"
+
+#, fuzzy
 msgid "Not member"
 msgstr "میں ممبر نہیں ہوں"
 
@@ -7545,16 +7665,19 @@ msgstr "یہ گروپ دوسروں كو  جوائن كرنے كے لیے اجا�
 msgid "Join QQ Qun"
 msgstr "گفتگو میں شرکت کریں"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "یہاں درخواست ان پٹ كیجیے"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "آپ نے كامیابی سے Qun  كی تخلیق كی ہے"
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "آپ نے كامیابی سے Qun  كی تخلیق كی ہے"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7564,7 +7687,7 @@ msgstr "QQ Qun آپریشن"
 msgid "Failed:"
 msgstr " ناکام ہوا"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7579,11 +7702,11 @@ msgstr ""
 " یہ آپریشن  اس كن كو مثالی طورپر نكالے گا۔"
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "معاف كیجیے، آپ میرے ٹائپ كے نہیں ہے۔۔۔"
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "فون  نمبر"
 
 #, fuzzy
@@ -7594,35 +7717,35 @@ msgid "You have successfully created a Qun"
 msgstr "آپ نے كامیابی سے Qun  كی تخلیق كی ہے"
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "كیا آپ ابھی Qun  تفصیلات سیٹ اپ كرنا  پسند كرینگے"
 
 msgid "Setup"
 msgstr "سیٹ اپ "
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "صارف %d   گروپ جوائن كرنے  كے لیے لاگو كیاگیا%d"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "صارف %d   گروپ جوائن كرنے  كے لیے لاگو كیاگیا%d"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "گفتگو میں بڈی کی شرکت ناکام ہوئی"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "بڈی نکالو"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "بڈی نکالو"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7739,15 +7862,22 @@ msgstr "<b>Last Refresh</b>: %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Current Online</b>: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Last Refresh</b>: %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
 msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
-#, c-format
-msgid "About OpenQ r%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "About OpenQ %s"
+msgstr "Adium"
 
 #, fuzzy
 msgid "Change Icon"
@@ -7766,6 +7896,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr ""
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "گھر کا ایڈریس"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7797,7 +7931,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "کنیکٹ کررہا ہے"
@@ -7810,6 +7943,9 @@ msgstr "سرور پورٹ"
 msgid "Show server news"
 msgstr "سرور ایڈریس"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "پڑھ رہا ہے خامی"
@@ -7819,11 +7955,7 @@ msgid "Update interval (seconds)"
 msgstr "پڑھ رہا ہے خامی"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "سرور معلومات نہیں لے سکتا"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "سرور معلومات نہیں لے سکتا"
 
 #, c-format
@@ -7846,21 +7978,19 @@ msgid "Activation required"
 msgstr "رجسٹریشن کی ضروت تھی"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "پڑھ رہا ہے خامی"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "درخواست ڈائیلاگ"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Yahooناکام!تصدیق"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7870,7 +8000,7 @@ msgstr "امیج محفوظ کرو"
 msgid "Enter code"
 msgstr "خفیہ لفظ داخل کرو"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7878,66 +8008,42 @@ msgid "Enter the text from the image"
 msgstr "گروپ كا نام داخل كیجیے۔"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "کنیکٹ ہونے میں ناقابل۔"
-
 msgid "Socket error"
 msgstr "ساكیٹ خامی"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"سرور كے ساتھ كنیكشن گم ہوا:\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr " ساكیٹ سے پڑھنا ناممكن"
-
-msgid "Write Error"
-msgstr "خامی لكھیں"
-
 #, fuzzy
-msgid "Connection lost"
-msgstr "كنیكشن گم   ہوگیا!"
-
-#, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "صارف معلومات سیٹ کرو۔۔۔"
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "درخواست انکار کی گئی"
 
-msgid "Couldn't resolve host"
-msgstr "ہوسٹ كوہم آہنگ نہیں كرسكا"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "سرورکوکنیکٹ کرنے میں نا قا بل۔"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "غیر معتبر خامی"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "سرور کو کنیکٹ کرو"
+msgid "Connecting to server"
+msgstr " SILC  سرور سے کنیکٹ کررہا ہے"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "QQid خامی"
 
-msgid "Failed to send IM."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7947,6 +8053,10 @@ msgid ""
 msgstr "ICQسرور ری لے"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "سے"
 
@@ -7956,32 +8066,30 @@ msgid ""
 "%s"
 msgstr "سرورہدایات:%s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "نا معلوم وجہ"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "کمانڈ  "
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "سرور معلومات نہیں لے سکتا"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "نا معلوم وجہ"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "نا معلوم وجہ"
 
 #, c-format
@@ -7995,9 +8103,6 @@ msgstr "فائل بھیجی گئي"
 msgid "%d canceled the transfer of %s"
 msgstr "%dٹرانسفر  منسوخ كیا گیا%s"
 
-msgid "Connection closed (writing)"
-msgstr "رابطہ بندہوا(لكھ رہا ہے)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>گروپ عنوان:</b> %s<br>"
@@ -8051,17 +8156,6 @@ msgstr "اسی وقت كے منتظم نےسرور %sپرمندرجہ ذیل ا�
 msgid "Sametime Administrator Announcement"
 msgstr "ایك ہی وقت میں اعلانِ منتظم"
 
-msgid "Connection reset"
-msgstr "رابطہ دوبارہ سیٹ كیا گیا"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "ساكیٹ سےخامی پڑھ رہاہے:%s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "ہوسٹ سےكنیكٹ ہونے میں نااہل"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%sكی طرف سے اعلان"
@@ -8084,6 +8178,9 @@ msgstr "اسپیكرز"
 msgid "Video Camera"
 msgstr "وڈیوكیمرہ"
 
+msgid "File Transfer"
+msgstr "فائل تبادلہ"
+
 msgid "Supports"
 msgstr "سپورٹس"
 
@@ -8804,9 +8901,6 @@ msgstr "تنظیم"
 msgid "Unit"
 msgstr " یونٹ"
 
-msgid "Note"
-msgstr "نوٹ"
-
 msgid "Join Chat"
 msgstr "گفتگو میں شرکت کریں"
 
@@ -8907,6 +9001,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "نیٹ ورک شماریات"
 
+msgid "Ping"
+msgstr "پینگ  "
+
 msgid "Ping failed"
 msgstr "پینگ ناکام ہوا"
 
@@ -8970,7 +9067,8 @@ msgstr "غیر معاون شدہ پبلک کلید ٹائپ"
 msgid "Disconnected by server"
 msgstr "سرور سے منقطع کیا گیا"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC سرور سے کنیکٹ ہرنے کے دوران خامی"
 
 msgid "Key Exchange failed"
@@ -8982,27 +9080,26 @@ msgstr ""
 "ریزیومینگ سیشن   ملاحدہ کرنا ناکام ہوا۔ نیا کنیکشن تخلیق کرنے کے لئے ری "
 "کنیکٹ پر پریس کریں۔"
 
-msgid "Connection failed"
-msgstr "کنیکشن ناکام ہوا"
-
 msgid "Performing key exchange"
 msgstr "کلید ایکسچینج  پر عمل کررہا "
 
-msgid "Unable to create connection"
-msgstr "رابطہ تخلیق میں نااہل"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr " SILCكلیدجوڑی لوڈنہیں كر سكا:%s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr " SILC  سرور سے کنیکٹ کررہا ہے"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr " SILCكلیدجوڑی لوڈنہیں كر سكا:%s"
+
 msgid "Out of memory"
 msgstr "میمری سے باہر"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILCپروٹوكال كومقدم نہیں كرسكا"
 
 #, fuzzy
@@ -9296,7 +9393,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILCکلید جوڑی تخلیق کررہا ہے"
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "SILCکلید جوڑی تخلیق کررہا ہے"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9390,6 +9487,9 @@ msgstr "سفیدبورڈ"
 msgid "No server statistics available"
 msgstr "کوئی سرور شماریات دستیاب نہیں"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC سرور سے کنیکٹ ہرنے کے دوران خامی"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "ناکامی: ورجن میل نہیں کھاتا، اپنے کلائنٹ کو اپ گریڈ کریں"
@@ -9430,37 +9530,37 @@ msgstr "ناکام: غیر معتبر کوکی"
 msgid "Failure: Authentication failed"
 msgstr "ناکام: تصدیق ناکام ہوا"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr " SILC کلائنٹ کنیکشن انیشیئلائز نہیں کرسکتے۔"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "كوئی نام نہیں"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr " SILCكلیدجوڑی لوڈنہیں كر سكا:%s"
 
-msgid "Could not write"
-msgstr "نہیں لكھ سكا"
-
-msgid "Could not connect"
-msgstr "كنیكٹ نہیں ہوسكا"
+msgid "Unable to create connection"
+msgstr "رابطہ تخلیق میں نااہل"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "نامعلوم خامی سرور"
 
-msgid "Could not create listen socket"
-msgstr "سننے والاساكٹتخلیق نہیں ہوسكا"
-
-msgid "Could not resolve hostname"
-msgstr "ہوسٹ نام ریزولو نہيں كیا جاسكتا"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "ساکیٹ تخلیق کرنےمیں نا قابل"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIPاسكرین نام  وائٹ اسپیسیس ركھتا ہے یا@ علامتیں"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "سرور پورٹ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9494,177 +9594,63 @@ msgstr "مستندصارف"
 msgid "Auth Domain"
 msgstr "مستندڈومین"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "لوکینگ اپ %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%sسے کنیکٹ میں ناکام"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "سائن آن:%s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "فائل %sلکھنے میں نا قابل۔"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "فائل %sپڑھنے میں نا قابل۔"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "پیام بہت طویل ،آخری  %sبائٹس پرن کیٹ کی ہوئی۔"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%sفی الحال لاگ ان نہیں کیا گیا۔"
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%sکی آگہی کی اجازت نہیں۔"
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "پیام گرایا جا چکا ہے،آپ سرور رفتار حد سے  آگے گذر رہے ہیں۔"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%sمیں گفتگو دستیاب نہیں ہے۔"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "آپ %sکو بہت تیزی پیامات بھیج رہے ہیں۔ "
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "آپ نے%sسے IMکھو دیا کیونکہ یہ بہت طویل تھا۔"
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "آپ نےIMکھ دیا ہے %s سے کیونکہ یہ بہت تیزی سے بھیجا گیا۔"
-
-#, c-format
-msgid "Failure."
-msgstr "ناکام۔"
-
-#, c-format
-msgid "Too many matches."
-msgstr "بہت زیادہ مماثلات۔"
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "مزید کولیفائر کی ضرورت۔"
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "براہ راست سروس عارضی طور پر غیر دستیاب۔"
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Email پابند دكھائی دیتاہے۔"
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "کلیدی لفظ نظر انداز کردیاگیا ۔"
-
-#, c-format
-msgid "No keywords."
-msgstr "کوئی کلیدی الفاظ نہیں۔"
-
-#, c-format
-msgid "User has no directory information."
-msgstr "صارف کے پاس کوئی ڈائریکٹری معلومات نہیں۔"
-
-#, c-format
-msgid "Country not supported."
-msgstr "ملک معاون نہیں۔"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "ناکامی نامعلوم:%s۔"
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "غیر صحیح اسكرین نام یا پاس ورڈ۔"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "یہ سروس عارضی طور پر غیر دستیاب ہے۔"
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "آپ کی حالیہ آگہی لاگ کرنے کے لئے بہت  اونچی ہے۔"
-
-#, c-format
-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 ""
-"آپ بہت تویزی سے کنیکٹ اور منقطع ہوتے ہیں۔ دس ممنٹس تک انتظار کریں اور دوبارہ "
-"کوشش کریں۔ اگر آپ کوشش کرنا جاری رکھتے ہیں، تو آپ کو اور دیر تک انتظار کرنے "
-"کی ضرورت ہوگي۔"
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "سائن پر نا معلوم خامی واقع ہوگئی:%s۔"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "جوائن&یہ؛کمرہ&gt؛:  یاہو نیٹ ورک پر کمرہ گفتگو میں شرکت کریں۔"
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "نا معلوم خامی،%d، واقع ہوگئی۔معلومات:%s"
+msgid "list: List rooms on the Yahoo network"
+msgstr "لسٹ:لسٹ رومز پرYahooنیٹ ورك"
 
-msgid "Invalid Groupname"
-msgstr "غیر معتبر گروپ نام"
+msgid "doodle: Request user to start a Doodle session"
+msgstr "چیستان:صارف کو چیستان سیشن شروع کرنے کی درخواست کریں"
 
-msgid "Connection Closed"
-msgstr "کنیکشن بند ہوگیا"
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "یا ہو! ID"
 
-msgid "Waiting for reply..."
-msgstr "جوابی کاروائی کے لئے انتظار کررہا ہے۔۔۔"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "یا ہو پروٹوکال پلگ ان"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOCاس کی رکاوٹ سے واپس آگیا۔ اب آپ دوبارہ پیامات بھیج سکتے ہیں۔"
+msgid "Pager server"
+msgstr "پیجرسرور"
 
-msgid "Password Change Successful"
-msgstr "خفیہ لفظ کامیابی سے تبدیل"
+msgid "Pager port"
+msgstr "پیج رپورٹ"
 
-msgid "_Group:"
-msgstr "گروپ:"
+msgid "File transfer server"
+msgstr "فائل ٹرانسفرسرور"
 
-msgid "Get Dir Info"
-msgstr "ڈائریکٹری معلومات لو"
+msgid "File transfer port"
+msgstr " فائل ٹرانسفر پورٹ"
 
-msgid "Set Dir Info"
-msgstr "ڈائریکٹری معلومات سیٹ کرو"
+msgid "Chat room locale"
+msgstr "كمرہِ گفتگولوكیل"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "لکھنے کے لئے %s کھول نہیں سکا!"
+msgid "Ignore conference and chatroom invitations"
+msgstr "كانفرنس اورچیٹ روم دعوتیں نظراندازكریں"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "فائل ٹرانسفر ناکام ہوا؛یا ممکن ہے دوسری حانب منسوخ ہوا ہے۔"
+msgid "Chat room list URL"
+msgstr "چیٹ روم لسٹ URL"
 
-msgid "Could not connect for transfer."
-msgstr "ٹرانسفر کے لئے کنیکٹ نہیں ہو سکا۔"
+msgid "Yahoo Chat server"
+msgstr "Yahoo Chat سرور"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "فائل کا بالائی حاشیہ نہیں لکھ سکا۔ فائل ٹرانسفر نہیں ہوگي۔"
+msgid "Yahoo Chat port"
+msgstr "Yahoo Chatپورٹ"
 
 #, fuzzy
-msgid "Save As..."
-msgstr "آئیکن محفوظ کرو جیسے۔۔۔"
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s درخواست کرتا ہے %s قبول کرنے کے لئے%d فائل: %s (%.2f %s)%s%s"
-msgstr[1] "%s درخواست کرتا ہے %s قبول کرنے کے لئے%d فائلیں: %s (%.2f %s)%s%s"
-
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s"
+msgid "Yahoo JAPAN ID..."
+msgstr "یا ہو! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9676,11 +9662,11 @@ msgstr "%s"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOCپروٹو کول پلگ ان"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "یا ہو پروٹوکال پلگ ان"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -9707,6 +9693,32 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "مسترد کئے گئے بڈی ملاؤ"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "سروركےساتھ كنیكشن پرغیرمعتبرڈاٹاموصول ہوا۔"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"نامعلوم خامی نمبر %d۔یا ہو! ویب سائٹ ميں لاگینگ کریں جو اسے فکس کرے گی۔"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"نامعلوم خامی نمبر %d۔یا ہو! ویب سائٹ ميں لاگینگ کریں جو اسے فکس کرے گی۔"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "غیر صحیح اسكرین نام اور پا سورڈ"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9740,37 +9752,33 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "نامعلوم خامی نمبر %d۔یا ہو! ویب سائٹ ميں لاگینگ کریں جو اسے فکس کرے گی۔"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "بڈی کو نہیں ملا سکتے %s  گروپ کو %s سرور فہرست کو اکاؤنٹ پر%s۔"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "سرور لسٹ میں بڈی لسٹ نہیں ملا سکا"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "غیر قبول   HTTP رسپانس سرور سے وصول كیا جاتا ہے۔"
 
-msgid "Connection problem"
-msgstr "کنیکشن پریشانی"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
-
-# msgstr ""
-# "سرور كے ساتھ كنیكشن گم ہوا:\n"
-# "%s"
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
+"سرور كے ساتھ كنیكشن گم ہوا:\n"
 "%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
+"سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
+"%s"
 
 # msgstr ""
 # "سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
@@ -9820,9 +9828,8 @@ msgstr "موجودسیٹینگس"
 msgid "Start Doodling"
 msgstr "چیستان بناناشروع كریں"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "فعال کونسا  ID؟"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 #, fuzzy
 msgid "Join whom in chat?"
@@ -9838,74 +9845,15 @@ msgstr "صارف كو گفتگومیں شامل كریں۔۔۔"
 msgid "Open Inbox"
 msgstr "ہاٹ میل ان باکس کھولیں"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "جوائن&یہ؛کمرہ&gt؛:  یاہو نیٹ ورک پر کمرہ گفتگو میں شرکت کریں۔"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "لسٹ:لسٹ رومز پرYahooنیٹ ورك"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "چیستان:صارف کو چیستان سیشن شروع کرنے کی درخواست کریں"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "یا ہو! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "یا ہو پروٹوکال پلگ ان"
-
-msgid "Yahoo Japan"
-msgstr "یا ہو جاپان"
-
-msgid "Pager server"
-msgstr "پیجرسرور"
-
-msgid "Japan Pager server"
-msgstr "جاپان پیجرسرور"
-
-msgid "Pager port"
-msgstr "پیج رپورٹ"
-
-msgid "File transfer server"
-msgstr "فائل ٹرانسفرسرور"
-
-msgid "Japan file transfer server"
-msgstr "جاپان فائل ٹرانسفرسرور"
-
-msgid "File transfer port"
-msgstr " فائل ٹرانسفر پورٹ"
-
-msgid "Chat room locale"
-msgstr "كمرہِ گفتگولوكیل"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "كانفرنس اورچیٹ روم دعوتیں نظراندازكریں"
-
-msgid "Chat room list URL"
-msgstr "چیٹ روم لسٹ URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Chat سرور"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chatپورٹ"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "ڈوڈل درخواست بھیجی گئی۔"
 
+msgid "Unable to connect."
+msgstr "کنیکٹ ہونے میں ناقابل۔"
+
 msgid "Unable to establish file descriptor."
 msgstr "فائل ڈسکریپٹر قائم کرنے میں نا قابل۔"
 
@@ -9913,6 +9861,9 @@ msgstr "فائل ڈسکریپٹر قائم کرنے میں نا قابل۔"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s  پیش کش کررہا ہے%s کو فائل بھیجنے کی"
 
+msgid "Write Error"
+msgstr "خامی لكھیں"
+
 msgid "Yahoo! Japan Profile"
 msgstr "یاہو! جاپان پروفائل"
 
@@ -9955,13 +9906,9 @@ msgstr "کول لنک 3"
 msgid "Last Update"
 msgstr "آخری اپ ڈیٹ"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%sغیر دستیاب کے لئے صارف معلومات"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "سوری،یہ پروفائل شاید زبان كا یا فارمیٹ كا لگتا ہے جو اس وقت معاون نہیں ہے۔ "
 
@@ -10033,23 +9980,19 @@ msgstr "آوازیں"
 msgid "Webcams"
 msgstr "ویب کیمس"
 
+msgid "Connection problem"
+msgstr "کنیکشن پریشانی"
+
 msgid "Unable to fetch room list."
 msgstr "کمرہ فہرست فیچ کرنے میں ناقابل۔"
 
 msgid "User Rooms"
 msgstr "صارف کمرے"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT سرور کے ساتھ کنیکشن پریشانی۔"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"سرور كے ساتھ گم شدہ كنیكشن\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10171,31 +10114,22 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "انکشاف"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "ساكیٹ كی تخلیق  نا ممكن :n%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP پراكسی سے پارس ریفرینس  نا ممكن :%s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP پراكسی كنیكشن خامی %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "اسیس انكار كی گئي: HTTP پراكسی سرور فاربیڈس پورٹ %d ٹنیلینگ۔"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "خامی %s ریزول كررہا ہے"
 
-msgid "Could not resolve host name"
-msgstr "ہوسٹ نام ریزولو نہيں كیا جاسكتا"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10295,9 +10229,6 @@ msgstr "ڈسٹرب مت کرو"
 msgid "Extended away"
 msgstr " "
 
-msgid "Mobile"
-msgstr "موبائل"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10340,18 +10271,6 @@ msgstr "+++ %s بیكارنہیں ہوا ہے"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr " %sخامی پڑھ رہا ہے"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-" آپکا %s پڑھتے وقت ایک خامی اچانک واقع ہوگئی تھی۔وہ ابھی تک لوڈ نہیں کيے گئے "
-"ہے ، اور پرانی فائل کو%s~ دوبارہ نام دیا گیا "
-
 msgid "Calculating..."
 msgstr "شمارکررہا ہے۔۔۔"
 
@@ -10460,6 +10379,18 @@ msgstr "رابطہ دوبارہ سیٹ كیا گیا"
 msgid "Address already in use."
 msgstr "یہ گفتگو نام پہلے سے استعمال میں"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr " %sخامی پڑھ رہا ہے"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+" آپکا %s پڑھتے وقت ایک خامی اچانک واقع ہوگئی تھی۔وہ ابھی تک لوڈ نہیں کيے گئے "
+"ہے ، اور پرانی فائل کو%s~ دوبارہ نام دیا گیا "
+
 # msgstr "ہوسٹ سےكنیكٹ ہونے میں نااہل"
 msgid "Internet Messenger"
 msgstr "ا نٹرنیٹ میسینجر"
@@ -10509,10 +10440,8 @@ msgstr "نئی میل اطلاعات"
 msgid "Use this buddy _icon for this account:"
 msgstr "اس اكاؤنٹ كے لیے  بڈی اكاؤنٹس استعمال كیجیے:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%sآپشنس"
+msgid "_Advanced"
+msgstr "_ایڈوانسڈ"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "GNOME پراكسی سیٹینگس  استعمال كیجیے"
@@ -10547,9 +10476,6 @@ msgstr "اگر آپ حقیقت میں قریب سے دیکھتے ہیں"
 msgid "you can see the butterflies mating"
 msgstr "آپ تتلیوں کی میٹینگ دیکھ سکتے ہیں"
 
-msgid "Proxy Options"
-msgstr "پراکسی آپشنس"
-
 msgid "Proxy _type:"
 msgstr "پراکسی - ٹائپ:"
 
@@ -10578,8 +10504,9 @@ msgstr "_بیسك"
 msgid "Create _this new account on the server"
 msgstr ""
 
-msgid "_Advanced"
-msgstr "_ایڈوانسڈ"
+#, fuzzy
+msgid "_Proxy"
+msgstr "پراكسی"
 
 msgid "Enabled"
 msgstr "قابل مجازکیا"
@@ -10624,8 +10551,8 @@ msgid "Please update the necessary fields."
 msgstr "براہ كرم ضروری شعبوں كو اپ ڈیٹ كیجیے۔"
 
 #, fuzzy
-msgid "Room _List"
-msgstr "کمرہ فہرست"
+msgid "A_ccount"
+msgstr "اکاؤنٹ:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10634,8 +10561,9 @@ msgstr ""
 "براہ کرم گفتگو کے متعلق ٹھیک ٹھیک معلومات داخل کریں جس میں شرکت کرنا چاہتے "
 "ہیں؟\n"
 
-msgid "_Account:"
-msgstr "_ اکاؤنٹ:"
+#, fuzzy
+msgid "Room _List"
+msgstr "کمرہ فہرست"
 
 msgid "_Block"
 msgstr "_بلاك"
@@ -10654,6 +10582,17 @@ msgid "I_M"
 msgstr "I_M"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "_گفتگو ملائیں"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "وڈیو گفتگو"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "_ فائل بھیجو"
 
@@ -10664,9 +10603,13 @@ msgstr "بڈی ملائیے- پاؤنس"
 msgid "View _Log"
 msgstr "دیکھو - لاگ"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr ""
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "آف لائن بڈیس دكھاؤ"
+
 msgid "_Alias..."
 msgstr "_عرفیت۔۔۔"
 
@@ -10805,6 +10748,10 @@ msgstr "/Tools/Buddy _Pounces"
 msgid "/Tools/_Certificates"
 msgstr "/ٹولس/ترجیحات"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/ٹولس/پرایوسی"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Tools/Plu_gins"
 
@@ -10814,10 +10761,6 @@ msgstr "/ٹولس/ترجیحات"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ٹولس/پرایوسی"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/ٹولس/پرایوسی"
-
 msgid "/Tools/_File Transfers"
 msgstr "/ٹولس/ _فائل ٹرانسفرس"
 
@@ -10939,8 +10882,8 @@ msgstr "مینیولی"
 msgid "By status"
 msgstr "سے اسٹیٹس"
 
-msgid "By log size"
-msgstr "لاگ سائز کے ذریعے"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10958,6 +10901,9 @@ msgstr ""
 msgid "Re-enable"
 msgstr "دوبارہ مجاز كیاگیا اكاؤنٹ"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -11056,6 +11002,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "عرفیت:"
 
+msgid "_Group:"
+msgstr "گروپ:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11091,6 +11040,116 @@ msgstr "/ٹولز"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Sort Buddies"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "پس منظرکارنگ"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "یہ گروپ آپ كی بڈی فہرست كو ملائے جاتے ہیں "
+
+#, fuzzy
+msgid "Layout"
+msgstr "برج اسد"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "پس منظرکارنگ"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_ توسیع کرو"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "پس منظر رنگ  منتخب کرو"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_ بند کرو"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "پس منظر رنگ  منتخب کرو"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "پورٹ"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "آن لائن"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "دور"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr " آف لائن  "
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "بلڈ ٹائپ"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "پیام بھیجا گیا"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr " %sکے لئے صارف معلومات تبدیل کریں"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11111,14 +11170,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "بڈی کو کمرہ گفتگو میں مدعو کریں"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"براہ کرمصارف کا نام داخل کریں جسے آپ مدعو کرنا چاہتےہیں، آپشنل دعوتی پیام کے "
-"ساتھ۔"
-
 msgid "_Buddy:"
 msgstr "بڈی:"
 
@@ -11147,7 +11198,8 @@ msgstr "نظراندازکرو"
 msgid "Get Away Message"
 msgstr "پیام سے  دور ہو"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "آخری كہا گیا"
 
 msgid "Unable to save icon file to disk."
@@ -11194,6 +11246,22 @@ msgstr "/مکالمہ/_محفوظ کرو جیسے..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/Clea_r Scrollback"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/گفتگو/M_ore"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/گفتگو/M_ore"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/گفتگو/M_ore"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/مکالمہ/لاگ_منظر..."
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/مکالمہ/فائل بھیجو..."
 
@@ -11268,6 +11336,18 @@ msgstr "/گفتگو"
 msgid "/Conversation/View Log"
 msgstr "/مکالمہ/لاگ دیکھو"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/گفتگو/مزید"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/مکالمہ/لاگ دیکھو"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/گفتگو/مزید"
+
 msgid "/Conversation/Send File..."
 msgstr "/مکالمہ/فائل بھیجو۔۔۔"
 
@@ -11453,6 +11533,9 @@ msgstr "برج حمل"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "تعاون"
 
@@ -11581,6 +11664,10 @@ msgid "Hungarian"
 msgstr "ہنگیرین"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "رومینیائی"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "میسی ڈونین"
 
@@ -11596,6 +11683,10 @@ msgstr " جارجئین"
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
+#, fuzzy
+msgid "Khmer"
+msgstr "دیگر"
+
 msgid "Kannada"
 msgstr ""
 
@@ -11619,6 +11710,10 @@ msgid "Macedonian"
 msgstr "میسی ڈونین"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "میسی ڈونین"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "نارویائی"
 
@@ -11676,6 +11771,9 @@ msgstr "سوشل"
 msgid "Swedish"
 msgstr "سویڈيش"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "تامل"
 
@@ -11727,9 +11825,27 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
 # msgstr "گائم AIM, MSN, Yahoo!,  كو استعمال كرتے ہوئے ایك ماڈیولر میسیجینگ كلائںٹ  كیبل ہے ۔Jabber, ICQ, IRC, SILC, SIP/SIMPLE, ناول  گروپ وائس، لوٹس مشابہ ٹائم،بونزور، زیفیر،گڈو گڈو، اورQQایك بار میں ۔یہ GTK+.<BR><BR> استعمال كرتے ہوئے لكھا جاتا ہے  آپ ترمیم كرینگے  اور  پروگرام كوGPL شرطوں كے ماتحٹ دوبارہ تقسیم كرینگے (version 2 or later).GPLكی ایك كاپی  'COPYING' فائل میں ركھتی ہے گائم سے تقسیم كی جاتی ہے۔ گائم  اسے شراكت داروں سے   كاپی رائٹیڈ ہے ۔ شراكت داروں كی مكمل فہرست كے لیے   گائم كی 'COPYRIGHT'   فائل دیكھیے۔ ہم اس پروگرام كے لیے كوئي وارنٹی مہیا نہیں كرتے ہیں ۔<BR><BR>"
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+
+# msgstr "گائم AIM, MSN, Yahoo!,  كو استعمال كرتے ہوئے ایك ماڈیولر میسیجینگ كلائںٹ  كیبل ہے ۔Jabber, ICQ, IRC, SILC, SIP/SIMPLE, ناول  گروپ وائس، لوٹس مشابہ ٹائم،بونزور، زیفیر،گڈو گڈو، اورQQایك بار میں ۔یہ GTK+.<BR><BR> استعمال كرتے ہوئے لكھا جاتا ہے  آپ ترمیم كرینگے  اور  پروگرام كوGPL شرطوں كے ماتحٹ دوبارہ تقسیم كرینگے (version 2 or later).GPLكی ایك كاپی  'COPYING' فائل میں ركھتی ہے گائم سے تقسیم كی جاتی ہے۔ گائم  اسے شراكت داروں سے   كاپی رائٹیڈ ہے ۔ شراكت داروں كی مكمل فہرست كے لیے   گائم كی 'COPYRIGHT'   فائل دیكھیے۔ ہم اس پروگرام كے لیے كوئي وارنٹی مہیا نہیں كرتے ہیں ۔<BR><BR>"
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11993,7 +12109,7 @@ msgid "Hyperlink visited color"
 msgstr "ہائپر لنک رنگ"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "ہائپر لنکس ڈراؤ کرنے کے لئے رنگ جب ماؤس اس پر ہو۔"
 
 msgid "Hyperlink prelight color"
@@ -12031,15 +12147,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "نوٹیفیکیشن ریمول"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "نئی میل اطلاعات"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12052,15 +12175,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "نئی میل اطلاعات"
 
-msgid "_Copy Email Address"
-msgstr "_ای -میل ایڈریس نقل کریں"
-
-msgid "_Open Link in Browser"
-msgstr "_براؤزر میں لنک کھولو"
-
-msgid "_Copy Link Location"
-msgstr "_لنک لوکیشن نقل کریں"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12102,11 +12216,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "امیج محفوظ کرو"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "امیج محفوظ کرو۔۔۔"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "كسٹم اسمائلیز دكھائیں"
 
@@ -12196,10 +12309,6 @@ msgid "Font Face"
 msgstr "فانٹ فیس"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "پس منظرکارنگ"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr " پیش منظر فانٹ رنگ"
 
@@ -12331,6 +12440,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12356,6 +12466,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12413,11 +12524,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "پیگینگ"
 
-msgid "Open All Messages"
-msgstr "تمام پیامات كھولیں"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "شمارکررہا ہے۔۔۔"
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12447,6 +12574,27 @@ msgid ""
 msgstr ""
 "'مینیول'براؤزر کمانڈ منتخب کئے گئے ہیں، لیکن کوئی کمانڈ سیٹ نہیں کیا گيا ۔"
 
+#, fuzzy
+msgid "No message"
+msgstr "نا معلوم پیام"
+
+msgid "Open All Messages"
+msgstr "تمام پیامات كھولیں"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "نیا بڈی پانس"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "مندرجہ ذیل پلگ انس لوڈنہیں كيےجائےگے۔"
 
@@ -12501,10 +12649,17 @@ msgstr "<b>Plugin Details</b>"
 msgid "Select a file"
 msgstr "فائل منتخب کرو"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "بڈی پانس مرتب کرو"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "كس پرجھپٹنا"
 
+msgid "_Account:"
+msgstr "_ اکاؤنٹ:"
+
 msgid "_Buddy name:"
 msgstr "بڈی نام:"
 
@@ -12572,7 +12727,60 @@ msgstr "_تكرار"
 msgid "Pounce Target"
 msgstr "جھپٹنے كا ٹارگیٹ"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Starts _typing"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "P_auses while typing"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Si_gns on"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s سست ہونے سے لوٹ آیا(%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Ret_urns from away"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "ٹائپینگ رك گئی"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Signs o_ff"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Becomes _idle"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "جب دور ہو"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr " پیام_  بھیجو"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "نا معلوم پانس واقعہ۔ براہ کرم اس کی رپورٹ کریں!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "اسماںلی تھیم ان پیك كرنے میں ناكام"
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "اسماںلی تھیم ان پیك كرنے میں ناكام"
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "اسماںلی تھیم ان پیك كرنے میں ناكام"
 
 msgid "Install Theme"
@@ -12595,6 +12803,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "کے ساتھ مکالمہ %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "دوست فہرست"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "سسٹم ٹرے آئيکن"
 
@@ -12604,8 +12818,9 @@ msgstr "سسٹم ٹرے آئي كن دكھاؤ:"
 msgid "On unread messages"
 msgstr "نا پڑھے ہوئے میسیجیس پر"
 
-msgid "Conversation Window Hiding"
-msgstr "گفتگو ونڈو چھپارہا ہے"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "IMمکالمہ ونڈوز"
 
 msgid "_Hide new IM conversations:"
 msgstr "_نئی IM گفتگویں چھپاؤ:"
@@ -12613,6 +12828,10 @@ msgstr "_نئی IM گفتگویں چھپاؤ:"
 msgid "When away"
 msgstr "جب دور ہو"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "مکالمہ ونڈ وبڑھاؤ"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "ٹیبس"
@@ -12672,10 +12891,6 @@ msgstr "اسموتھ ۔اسكرولنگ استعمال كریں"
 msgid "F_lash window when IMs are received"
 msgstr " جب IMs وصول ہوتا ہے فلیش ونڈو"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "مکالمہ ونڈ وبڑھاؤ"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12711,13 +12926,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "صارف معلومات نہیں مل سکتی"
 
-msgid "ST_UN server:"
-msgstr "ST_UNسرور:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Example: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_خودكاری سی پكڑاگیاIPایڈریس"
 
 msgid "Public _IP:"
@@ -12738,6 +12951,10 @@ msgstr "_پورٹ شروع كریں:"
 msgid "_End port:"
 msgstr "_پورٹ ختم كریں:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "پروکسی سرور"
@@ -12767,6 +12984,10 @@ msgstr "پروکسی سرور"
 msgid "No proxy"
 msgstr "_پروکسی نہیں"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_صارف    :"
 
@@ -12931,13 +13152,13 @@ msgstr "جب دونوں دور اور سست ہو"
 msgid "Auto-away"
 msgstr "خود کار_دور"
 
-msgid "Change status when _idle"
-msgstr "اسٹیٹس تبدیل كریںwhen _idle"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "سیٹینگ کرنے سے پہلے منٹس:"
 
+msgid "Change status when _idle"
+msgstr "اسٹیٹس تبدیل كریںwhen _idle"
+
 msgid "Change _status to:"
 msgstr "كےلیےاسٹیٹس_تبدیل كریں"
 
@@ -13088,29 +13309,19 @@ msgstr "Sa_ve & استعمال كریں"
 msgid "Status for %s"
 msgstr " %sكےلیےاسٹیٹس"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "اسمائلی داخل کرو"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "ڈوپلیکیٹ اصلاح"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr " براہ كرم اسٹیٹس كے لیے ایك نا خالی عنوان داخل كیجیے۰"
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "اسمائلی داخل کرو"
@@ -13120,21 +13331,30 @@ msgid "Add Smiley"
 msgstr "مسکرایئے!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "امیج محفوظ کرو"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "پورٹ"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "مسکرایئے!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "پورٹ"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "بڈی منتخب کرو"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "اس اكاؤنٹ كے لیے  بڈی اكاؤنٹس استعمال كیجیے:"
 
@@ -13229,9 +13449,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "لاؤنچر کو نہیں بھیج سکتے"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr "                               "
 
 #, c-format
@@ -13265,6 +13486,16 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "امیج لوڈ كرنا نا  كامیاب '%s':  وجوہات نہیں ملی،  شاید كرپٹ امیج فائل"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_میں لنک کھولو:"
+
+msgid "_Copy Link Location"
+msgstr "_لنک لوکیشن نقل کریں"
+
+msgid "_Copy Email Address"
+msgstr "_ای -میل ایڈریس نقل کریں"
+
 msgid "Save File"
 msgstr "فائل محفوظ كریں"
 
@@ -13380,6 +13611,76 @@ msgstr " قابل فراہمی پریڈیكشن پلگ ان سے رابطہ كی
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "سرور ایڈریس"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "کانفرنس سرور داخل کرو"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "استفسار کے لئے کانفرنس سرور منتخب  کرو"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "آن لائن سرویسیز"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "بڈی فہرست بھیجو"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Goes a_way"
+
+#, fuzzy
+msgid "Directory"
+msgstr "لاگ ڈائریكٹری"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "صوتی  انتخاب"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "وضاحت"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "ڈائریکٹری معلومات سیٹ کرو"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_براؤزر:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "صارف موجود نہیں"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "سرور کوئی مستند طریقے کا تعاون استعمال نہیں کرتا"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "ڈائریکٹری معلومات سیٹ کرو"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "دوست سست ہے"
 
@@ -13775,9 +14076,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "مجموعی مضمون كےلیے میوزك میسیجینگ پلگ ان۔"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "یہ میوزك میسیجینگ پلگ ان بہت سے صارفین كوبیك وقت حقیقی ۔وقت میں كامن اسكور "
 "مرتب كرنے كے ذریعے میوزك كے پیس پر كام كرنےكی اجازت دیتاہے۔"
@@ -13893,12 +14195,6 @@ msgstr ""
 "-یہ تمام آنے والے متن کو واپس کرتا ہے \n"
 "-یہ جلدی سے آپ کی فہرست پر لوگوں کو میسیج بھیجتا ہے جب وہ پر سائن کرتے ہے"
 
-msgid "Cursor Color"
-msgstr "کرسر کا رنگ"
-
-msgid "Secondary Cursor Color"
-msgstr "ثانوی کرسر رنگ"
-
 msgid "Hyperlink Color"
 msgstr "ہائپر لنک رنگ"
 
@@ -13910,6 +14206,10 @@ msgstr "ہائپر لنک رنگ"
 msgid "Highlighted Message Name Color"
 msgstr "ہائی لائٹ موازنہ"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "نوٹیفیکیشن ریمول"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Gtkٹری وئیو عمودی علاحدگی"
 
@@ -13939,35 +14239,24 @@ msgstr "GTK+انٹر فیس فانٹ"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+متن شارٹ کٹ تھیم"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "انٹرفیس رنگ"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "نئی میل اطلاعات"
 
-msgid "Widget Sizes"
-msgstr "مفیدسائزیز"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "گائمGTK+تھیم کنٹرول"
+
+#, fuzzy
+msgid "Colors"
+msgstr "بندکرو"
 
 msgid "Fonts"
 msgstr "فانٹس"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "گائم فائل کنٹرول"
@@ -14059,7 +14348,7 @@ msgstr "گفتگو ونڈو چھپارہا ہے"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14113,6 +14402,113 @@ msgstr ""
 "متن باہر جانے والے پیامات میں ریپلیس کرتا ہے صارف نے متعین کئے گئے اصولوں "
 "کےمطابق۔"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "لاگڈ ان نہیں"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "لاگڈ ان نہیں"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "گفتگو میں شرکت کریں"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "نظراندازکرو"
+
+#, fuzzy
+msgid "Founder"
+msgstr "بہت زورسے"
+
+#, fuzzy
+msgid "Operator"
+msgstr "آپیرا"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "اتھورائزیشن دیا گيا"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "خامی"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "کام کی معلومات"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "درخواست ڈائیلاگ"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "آگہی سطح"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr " %sكےلیےاسٹیٹس"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "كمرہِ گفتگولوكیل"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "آغیکن محفوظ کریں"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "گائمGTK+تھیم کنٹرول"
+
+#, fuzzy
+msgid "Contact"
+msgstr "معلومات سے رابطہ كیجیے"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "دوست فہرست"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "دوست فہرست"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "گائمGTK+تھیم کنٹرول"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "گائمGTK+تھیم کنٹرول"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14278,9 +14674,6 @@ msgstr " _ دوست فہرست ونڈو اوپر رکھو:"
 msgid "Only when docked"
 msgstr "صرف جب ڈاک کیا گیا"
 
-msgid "_Flash window when chat messages are received"
-msgstr "_فلیش ونڈو  جب چیٹ میسیجیس وصول كئے جاتے ہیں "
-
 #, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "لاگ ان آپشنس"
@@ -14291,7 +14684,7 @@ msgstr "ونڈوز گائم کے لئے آپشنس مخصوص۔"
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "ونڈوز گائم كو  مخصوص آپشنس مہیا كرتا ہے، جیسے بڈی فہرست ڈاكینگ۔"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14333,6 +14726,505 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cannot open socket"
+#~ msgstr "ساكیٹ نہیں كھول سكتا"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "ساكیٹ پر سنا نہیں جا سكا"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "ساکیٹ پڑھنے میں نا قابل"
+
+#~ msgid "Connection failed."
+#~ msgstr "کنیکشن ناکام۔"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "سرور منقطع ہوگیا"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "ساکیٹ تخلیق نہیں کر سکا"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "ہاسٹ سے کنیکٹ نہیں ہو سکا"
+
+#~ msgid "Read error"
+#~ msgstr "پڑھو خامی"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "لکھو خامی"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "ڈائریکٹری معلومات سیٹ کرو"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "توسیع شدہ ایڈریس"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "عرفیت گفتگو  "
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "صارف کے پاس کوئی ڈائریکٹری معلومات نہیں۔"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "کمانڈ  "
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "رجسٹریشن خامی"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "مقام"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "صارف تلاش"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "بڈی اسٹیٹ اطلاع"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "غیر معاون ورجن"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "رخ بندی"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "صارف موڈس"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "صارف حد"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "صلاحیتیں"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "صارف کا نام"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IMکے ساتھ کلید ایکسچینج"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ای میل ایڈریس"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "پروفائل"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "پینگ  "
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "صارف كا نام"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "جاری ویڈیو"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "پیام موصول ہوا"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "پبلک کلید بیبل پرنٹ"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "صارف آپشنس"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "صارف موڈس"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "صارف كا نام"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "صارف حد"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ٹری لیئن اینکریپشن"
+
+#~ msgid "Read Error"
+#~ msgstr "پڑھو خامی"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "سرور سے کنیکٹ ہونے میں ناکام۔"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "قطار فل"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "پیام  کی تصریف میں ناقابل"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "لاگ ان ناکا م ہوئی(%s)۔"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "آپ لاگڈ آؤٹ کئے جاچکے ہیں کیونکہ آپ نےدوسرے ورک اسٹیشن میں لاگڈ کیا۔"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "خامی۔ SSL تعاون انسٹال نہیں کیا گیا ہے۔"
+
+#~ msgid "Incorrect password."
+#~ msgstr "غلط خفیہ لفظ۔"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS سرور سے رابطہ نہیں كیا جاسكتا:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "آپ كچھ دیركےلیےمنقطع ہوسكتےہیں۔اپ ڈیٹس كے لیے%sجانچیے۔"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "کنیکٹ نہیں ہو سکا"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "نا درست نام "
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "سرور معلومات نہیں لے سکتا"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "كنیكشن گم   ہوگیا!"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "ہوسٹ كوہم آہنگ نہیں كرسكا"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "رابطہ بندہوا(لكھ رہا ہے)"
+
+#~ msgid "Connection reset"
+#~ msgstr "رابطہ دوبارہ سیٹ كیا گیا"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "ساكیٹ سےخامی پڑھ رہاہے:%s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "ہوسٹ سےكنیكٹ ہونے میں نااہل"
+
+#~ msgid "Could not write"
+#~ msgstr "نہیں لكھ سكا"
+
+#~ msgid "Could not connect"
+#~ msgstr "كنیكٹ نہیں ہوسكا"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "سننے والاساكٹتخلیق نہیں ہوسكا"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ہوسٹ نام ریزولو نہيں كیا جاسكتا"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "غیر  صحیح پاس ورڈ"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "یا ہو جاپان"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "جاپان پیجرسرور"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "جاپان فائل ٹرانسفرسرور"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "سرور كے ساتھ گم شدہ كنیكشن\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "ہوسٹ نام ریزولو نہيں كیا جاسكتا"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "سرور کو ضرورت ہے TLS/SSL لاگ ان کے لئے۔  کوئی TLS/SSL تعاون نہیں ملا۔"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "گفتگو ونڈو چھپارہا ہے"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr " براہ كرم اسٹیٹس كے لیے ایك نا خالی عنوان داخل كیجیے۰"
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "فعال کونسا  ID؟"
+
+#~ msgid "Cursor Color"
+#~ msgstr "کرسر کا رنگ"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "ثانوی کرسر رنگ"
+
+#~ msgid "Interface colors"
+#~ msgstr "انٹرفیس رنگ"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "مفیدسائزیز"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "پیام میں داخل کرو"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "براہ کرمصارف کا نام داخل کریں جسے آپ مدعو کرنا چاہتےہیں، آپشنل دعوتی پیام "
+#~ "کے ساتھ۔"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "نوٹس ایڈریس بك منتخب كریں"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "آپ شاید مختضر وقفے کےلئے منقطع کر دیئے گئے ہوگے۔آپ کو  TOC  استعمال کرنی "
+#~ "ہوگی جب تک یہ  فکس نہیں ہوتی ہے۔%sاپ ڈیٹس کےلئے جانچيے۔"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "بڈی ملاؤ"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "سرور معلومات نہیں لے سکتا"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "پڑھ رہا ہے خامی"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "سرور كے ساتھ كنیكشن گم ہوا:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "سرور کو کنیکٹ کرو"
+
+#~ msgid "Looking up %s"
+#~ msgstr "لوکینگ اپ %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "%sسے کنیکٹ میں ناکام"
+
+#~ msgid "Signon: %s"
+#~ msgstr "سائن آن:%s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "فائل %sلکھنے میں نا قابل۔"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "فائل %sپڑھنے میں نا قابل۔"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "پیام بہت طویل ،آخری  %sبائٹس پرن کیٹ کی ہوئی۔"
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%sفی الحال لاگ ان نہیں کیا گیا۔"
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "%sکی آگہی کی اجازت نہیں۔"
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "پیام گرایا جا چکا ہے،آپ سرور رفتار حد سے  آگے گذر رہے ہیں۔"
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "%sمیں گفتگو دستیاب نہیں ہے۔"
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "آپ %sکو بہت تیزی پیامات بھیج رہے ہیں۔ "
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "آپ نے%sسے IMکھو دیا کیونکہ یہ بہت طویل تھا۔"
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "آپ نےIMکھ دیا ہے %s سے کیونکہ یہ بہت تیزی سے بھیجا گیا۔"
+
+#~ msgid "Failure."
+#~ msgstr "ناکام۔"
+
+#~ msgid "Too many matches."
+#~ msgstr "بہت زیادہ مماثلات۔"
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "مزید کولیفائر کی ضرورت۔"
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "براہ راست سروس عارضی طور پر غیر دستیاب۔"
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Email پابند دكھائی دیتاہے۔"
+
+#~ msgid "Keyword ignored."
+#~ msgstr "کلیدی لفظ نظر انداز کردیاگیا ۔"
+
+#~ msgid "No keywords."
+#~ msgstr "کوئی کلیدی الفاظ نہیں۔"
+
+#~ msgid "User has no directory information."
+#~ msgstr "صارف کے پاس کوئی ڈائریکٹری معلومات نہیں۔"
+
+#~ msgid "Country not supported."
+#~ msgstr "ملک معاون نہیں۔"
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "ناکامی نامعلوم:%s۔"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "غیر صحیح اسكرین نام یا پاس ورڈ۔"
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "یہ سروس عارضی طور پر غیر دستیاب ہے۔"
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "آپ کی حالیہ آگہی لاگ کرنے کے لئے بہت  اونچی ہے۔"
+
+#~ 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 ""
+#~ "آپ بہت تویزی سے کنیکٹ اور منقطع ہوتے ہیں۔ دس ممنٹس تک انتظار کریں اور "
+#~ "دوبارہ کوشش کریں۔ اگر آپ کوشش کرنا جاری رکھتے ہیں، تو آپ کو اور دیر تک "
+#~ "انتظار کرنے کی ضرورت ہوگي۔"
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "سائن پر نا معلوم خامی واقع ہوگئی:%s۔"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "نا معلوم خامی،%d، واقع ہوگئی۔معلومات:%s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "غیر معتبر گروپ نام"
+
+#~ msgid "Connection Closed"
+#~ msgstr "کنیکشن بند ہوگیا"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "جوابی کاروائی کے لئے انتظار کررہا ہے۔۔۔"
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOCاس کی رکاوٹ سے واپس آگیا۔ اب آپ دوبارہ پیامات بھیج سکتے ہیں۔"
+
+#~ msgid "Password Change Successful"
+#~ msgstr "خفیہ لفظ کامیابی سے تبدیل"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "ڈائریکٹری معلومات لو"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "ڈائریکٹری معلومات سیٹ کرو"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "لکھنے کے لئے %s کھول نہیں سکا!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "فائل ٹرانسفر ناکام ہوا؛یا ممکن ہے دوسری حانب منسوخ ہوا ہے۔"
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "ٹرانسفر کے لئے کنیکٹ نہیں ہو سکا۔"
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "فائل کا بالائی حاشیہ نہیں لکھ سکا۔ فائل ٹرانسفر نہیں ہوگي۔"
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "آئیکن محفوظ کرو جیسے۔۔۔"
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s درخواست کرتا ہے %s قبول کرنے کے لئے%d فائل: %s (%.2f %s)%s%s"
+#~ msgstr[1] ""
+#~ "%s درخواست کرتا ہے %s قبول کرنے کے لئے%d فائلیں: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOCپروٹو کول پلگ ان"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%sغیر دستیاب کے لئے صارف معلومات"
+
+#~ msgid "%s Options"
+#~ msgstr "%sآپشنس"
+
+#~ msgid "Proxy Options"
+#~ msgstr "پراکسی آپشنس"
+
+#~ msgid "By log size"
+#~ msgstr "لاگ سائز کے ذریعے"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_براؤزر میں لنک کھولو"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "ST_UNسرور:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "امیج محفوظ کرو"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_فلیش ونڈو  جب چیٹ میسیجیس وصول كئے جاتے ہیں "
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "گروپ نام كے ساتھ پہلے ہی سے موجود ہے۔"
 
@@ -14423,13 +15315,6 @@ msgstr ""
 #~ msgid "Do you want to approve the request?"
 #~ msgstr " كیا آپ درخواست كو وانا چاہتے ہیں ؟"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "سسٹم میسیج"
 
@@ -14607,9 +15492,6 @@ msgstr ""
 #~ msgstr ""
 #~ "گروپ%d  جوائن كرنے كے لیے  آپ كی درخواستadmin %d سے اپرو كی جائے گی۔"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "یہ گروپ آپ كی بڈی فہرست كو ملائے جاتے ہیں "
-
 #~ msgid "I am applying to join"
 #~ msgstr "میں  نے  جوائن كرنے كے لیے لاگو كیا ہے"
 
@@ -14630,10 +15512,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "آپ كی وجہ داخل كیجیے:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "خامی رابطہ قائم کررہی ہے"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "لاگ ان كرنا نا ممكن، ڈی بگ لاگ جانچیے"
 
@@ -14684,10 +15562,6 @@ msgstr ""
 #~ "اسکرین نام کی جگہ میں ڈسپلے کی جائے گی جب بھی ممکن ہو۔\n"
 
 #, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "اکاؤنٹ:"
-
-#, fuzzy
 #~ msgid "_Screen name:"
 #~ msgstr "اسكرین كا نام:"
 
diff --git a/po/vi.po b/po/vi.po
index 8548ebbaf3..3ea2ea9cbd 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CVS Version of Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-06-22 21:58+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -31,13 +31,13 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Chạy '%s -h' để biết thêm thông tin.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -611,19 +611,6 @@ msgstr ""
 msgid "Send To"
 msgstr "Gửi cho"
 
-msgid "Invite message"
-msgstr "Lời mời"
-
-msgid "Invite"
-msgstr "Mời"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Hãy nhập tên người dùng mà bạn muốn mời,\n"
-"kèm theo lời mời tùy ý."
-
 msgid "Conversation"
 msgstr "Cuộc thoại"
 
@@ -881,6 +868,41 @@ msgstr "Mọi cuộc trao đổi"
 msgid "System Log"
 msgstr "Sổ theo dõi hệ thống"
 
+#, fuzzy
+msgid "Calling ... "
+msgstr "Đang tính toán..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Chấp nhận"
+
+msgid "Reject"
+msgstr "Từ chối"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Bạn rời khỏi kênh %s%s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
 msgid "Emails"
 msgstr "Thư điện tử"
 
@@ -914,6 +936,9 @@ msgstr "Tiếp tục"
 msgid "IM"
 msgstr "Tin nhắn"
 
+msgid "Invite"
+msgstr "Mời"
+
 msgid "(none)"
 msgstr "(không có)"
 
@@ -1115,7 +1140,6 @@ msgstr "%s đã đi vắng. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s đã gửi tin nhẳn cho bạn. (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Dữ kiện thông báo không rõ. Hãy ghi báo cáo việc này!"
 
@@ -1161,7 +1185,6 @@ msgstr "Số phút trước khi thay đổi trạng thái"
 msgid "Change status to"
 msgstr "Đổi trạng thái thành"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Cuộc thoại"
 
@@ -1485,7 +1508,6 @@ msgstr ""
 "Khi bắt đầu cuộc thoại mới, phần bổ sung này sẽ chèn cuộc thoại cuối cùng "
 "vào cuộc thoại hiện thời."
 
-#, c-format
 msgid "Online"
 msgstr "Trực tuyến"
 
@@ -1531,6 +1553,28 @@ msgstr "GntLastlog"
 msgid "Lastlog plugin."
 msgstr "Phần bổ sung lastlog."
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "URL điệu"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "tài khoản"
 
@@ -1631,13 +1675,6 @@ msgstr "Chấp nhận chứng nhận cho %s không?"
 msgid "SSL Certificate Verification"
 msgstr "Thẩm tra chứng nhận SSL"
 
-#. Number of actions
-msgid "Accept"
-msgstr "Chấp nhận"
-
-msgid "Reject"
-msgstr "Từ chối"
-
 msgid "_View Certificate..."
 msgstr "_Xem chứng nhận..."
 
@@ -1738,6 +1775,8 @@ msgstr "+++ %s đã đăng nhập"
 msgid "+++ %s signed off"
 msgstr "+++ %s đã đăng xuất"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Lỗi không rõ"
 
@@ -1784,6 +1823,16 @@ msgstr "%s rời phòng."
 msgid "%s left the room (%s)."
 msgstr "%s rời phòng (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Mời vào hội thảo"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "Hãy nhập tên người dùng mà bạn muốn mời, kèm theo lời mời tùy ý."
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Không lấy được kết nối: %s"
@@ -1918,7 +1967,6 @@ msgstr "Đang bắt đầu truyền %s từ %s"
 msgid "Transfer of file %s complete"
 msgstr "Đã truyền xong tập tin %s"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "Đã truyền xong tập tin"
 
@@ -1926,7 +1974,6 @@ msgstr "Đã truyền xong tập tin"
 msgid "You canceled the transfer of %s"
 msgstr "Bạn đã thôi truyền %s"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Tiến trình truyền tập tin bị thôi."
 
@@ -2130,11 +2177,14 @@ msgstr "<font color=\"red\"><b>Không thể đọc tập tin: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Trả Lời-Tự Động>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Lỗi khi tạo kết nối"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Bạn đang sử dụng %s, còn phần bổ sung này cần thiết %s."
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Phần bổ sung này chưa xác định mã ID."
 
@@ -2537,9 +2587,10 @@ msgstr ""
 "Bao gồm trong bộ xem bản ghi các bản ghi của ứng dụng khách tin nhắn khác."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2593,8 +2644,9 @@ msgstr "Mô phỏng tin nhẳn ngoại tuyến"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Lưu dạng thông báo các tin nhẳn được gửi cho người dùng chưa kết nối."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Phần còn lại của các tin nhẳn sẽ được lưu dạng thông báo. Bạn cũng có thể "
@@ -2628,6 +2680,32 @@ msgstr "Lưu tin nhẳn ngoại tuyến trong thông báo"
 msgid "Do not ask. Always save in pounce."
 msgstr "Đừng hỏi. Luôn luôn lưu trong thông báo."
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "Nhập mật khẩu"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2821,21 +2899,22 @@ msgstr ""
 "Không thể phát hiện bản cài đặt ActiveTCL. Muốn sử dụng phần bổ sung TCL thì "
 "cài đặt ActiveTCL từ địa chỉ « http://www.activestate.com ».\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Không tìm thấy bộ công cụ Apple Bonjour For Windows, xem FAQ (Hỏi Đáp) ở địa "
 "chỉ « http://d.pidgin.im/BonjourWindows » để tìm chi tiết."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Không thể lắng nghe kết nối tin nhắn gửi đến\n"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Không thể thiết lập kết nối đến máy phục vụ mDNS cục bộ. Nó chạy chưa?"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "Tên"
 
@@ -2867,6 +2946,11 @@ msgstr "Phần bổ sung giao thức Bonjour"
 msgid "Purple Person"
 msgstr "Người Purple"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Nơi ở"
+
 # Đây là tên của giao thức Apple: đừng dịch.
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2878,14 +2962,21 @@ msgstr "%s đã đóng cửa sổ cuộc thoại."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Không thể gửi tin, vì không thể bắt đầu nói chuyện."
 
-msgid "Cannot open socket"
-msgstr "Không thể mở ổ cắm."
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Không thể tạo ổ cắm\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Không thể đóng kết ổ cắm tới cổng"
 
-msgid "Could not listen on socket"
-msgstr "Không thể lắng nghe trên ổ cắm"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Không thể tạo ổ cắm\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Lỗi liên lạc với cơ chế đáp ứng DNS mDNSResponder cục bộ."
@@ -2933,13 +3024,16 @@ msgstr "Lưu danh sách bạn bè..."
 msgid "Load buddylist from file..."
 msgstr "Nạp danh sách bạn bè từ tập tin..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Đìên vào các trường đăng ký."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Hai mật khẩu không trùng."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Không thể đăng ký tài khoản mới. Lỗi xảy ra.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2951,14 +3045,15 @@ msgstr "Đăng ký thành công."
 msgid "Password"
 msgstr "Mật khẩu"
 
-msgid "Password (retype)"
-msgstr "Mật khẩu (gõ lại)"
+msgid "Password (again)"
+msgstr "Nhập lại mật khẩu"
 
-msgid "Enter current token"
-msgstr "Nhập hiệu bài hiện có"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Hiệu bài hiện có"
+#, fuzzy
+msgid "Captcha"
+msgstr "Lưu ảnh"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Đăng ký tài khoản Gadu-Gadu mới"
@@ -3011,6 +3106,15 @@ msgstr "Đổi thành công mật khẩu."
 msgid "Current password"
 msgstr "Mật khẩu hiện tại"
 
+msgid "Password (retype)"
+msgstr "Mật khẩu (gõ lại)"
+
+msgid "Enter current token"
+msgstr "Nhập hiệu bài hiện có"
+
+msgid "Current token"
+msgstr "Hiệu bài hiện có"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Hãy nhập mật khẩu hiện tại và mật khẩu mới của bạn cho UIN: "
 
@@ -3024,13 +3128,13 @@ msgstr "Chọn cuộc chát cho bạn thân: %s"
 msgid "Add to chat..."
 msgstr "Thêm vào chát..."
 
+#. Global
 msgid "Available"
 msgstr "Có mặt"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Vắng mặt"
 
@@ -3058,8 +3162,8 @@ msgstr "Không tìm thấy người dùng tương ứng"
 msgid "There are no users matching your search criteria."
 msgstr "Không có người dùng tương ứng với tiêu chuẩn tìm kiếm bạn đã xác định."
 
-msgid "Unable to read socket"
-msgstr "Không thể đọc ổ cắm"
+msgid "Unable to read from socket"
+msgstr "Không thể đọc từ ổ cắm"
 
 msgid "Buddy list downloaded"
 msgstr "Danh sách bạn bè đã tải xuống"
@@ -3073,8 +3177,14 @@ msgstr "Danh sách bạn bè đã tải lên"
 msgid "Your buddy list was stored on the server."
 msgstr "Danh sách bạn bè của bạn đã được cất giữ trên máy phục vụ."
 
-msgid "Connection failed."
-msgstr "Lỗi kết nối."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Đã kết nối"
+
+msgid "Connection failed"
+msgstr "Kết nối bị lỗi"
 
 msgid "Add to chat"
 msgstr "Thêm vào chát"
@@ -3082,13 +3192,23 @@ msgstr "Thêm vào chát"
 msgid "Chat _name:"
 msgstr "Tê_n chát:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Không thể kết nối đến máy phục vụ."
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Đang kết nối"
+
 msgid "Chat error"
 msgstr "Lỗi chát"
 
 msgid "This chat name is already in use"
 msgstr "Tên chát này đang được dùng"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Không phải có kết nối tới máy phục vụ."
 
 msgid "Find buddies..."
@@ -3131,6 +3251,10 @@ msgstr "Hệ tin nhắn nhanh phổ biến ở Phần Lan"
 msgid "Gadu-Gadu User"
 msgstr "Người dùng Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Lập thông tin người dùng..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Lệnh không rõ : %s"
@@ -3145,7 +3269,8 @@ msgstr "Chưa lập chủ đề"
 msgid "File Transfer Failed"
 msgstr "Lỗi truyền tập tin"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Không thể mở cổng lắng nghe."
 
 # MOTD: Message Of The Day: thông điệp của hôm nay
@@ -3162,8 +3287,18 @@ msgstr "Không có MOTD (thông điệp của hôm nay) liên quan đến kết
 msgid "MOTD for %s"
 msgstr "MOTD cho %s"
 
-msgid "Server has disconnected"
-msgstr "Máy phục vụ đã ngắt kết nối"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Mất kết nối với máy phục vụ :\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Xem MOTD"
@@ -3174,25 +3309,24 @@ msgstr "_Kênh:"
 msgid "_Password:"
 msgstr "_Mật khẩu :"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Tên hiệu cho IRC không được chứa dấu cách"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Đang kết nối"
-
 msgid "SSL support unavailable"
 msgstr "Hiện không có hỗ trợ SSL"
 
-msgid "Couldn't create socket"
-msgstr "Không thể tạo ổ cắm"
+msgid "Unable to connect"
+msgstr "Không thể kết nối"
 
-msgid "Couldn't connect to host"
-msgstr "Không thể kết nối với máy phục vụ"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Không thể kết nối tới %s"
 
-msgid "Read error"
-msgstr "Lỗi đọc"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Máy phục vụ đã đóng kết nối."
 
 msgid "Users"
 msgstr "Người dùng"
@@ -3373,6 +3507,17 @@ msgstr ""
 "Tên tài khoản bạn chọn bị mày chủ từ chối. Có thể vì tên này có chứa các ký "
 "tự không hợp lệ."
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Tên chát này đang được dùng"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Tên hiệu"
+
 msgid "Cannot change nick"
 msgstr "Không thể thay đổi tên hiệu"
 
@@ -3612,12 +3757,14 @@ msgstr "Lệnh như thế đã bị lỗi"
 msgid "execute"
 msgstr "thực hiện"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Máy phục vụ yêu cầu TLS/SSL để đăng nhập. Không tìm thấy khả năng hỗ trợ TLS/"
 "SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Bạn cần chức năng mật mã, nhưng không tìm thấy hỗ trợ TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3635,18 +3782,54 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Xác thực nhập thô"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Không xác thực được"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Máy phục vụ trả lời không hợp lệ."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Máy phục vụ không sử dụng bất kỳ phương thức xác thực được hỗ trợ nào"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Bạn cần mật mã, nhưng máy phục vụ này không cung cấp."
+
 msgid "Invalid challenge from server"
 msgstr "Kiểm tra từ máy phục vụ không hợp lệ"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Lỗi SASL"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Không nêu lý do."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "Phiên bản không được hỗ trợ"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr ""
+"Không thể thiết lập kết nối đến máy phục vụ :\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+"Không thể thiết lập kết nối đến máy phục vụ :\n"
+"%s"
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Không thể khởi tạo kết nối"
+
 msgid "Full Name"
 msgstr "Tên đầy đủ"
 
@@ -3711,160 +3894,9 @@ msgstr "Trình khách"
 msgid "Operating System"
 msgstr "Hệ điều hành"
 
-msgid "Last Activity"
-msgstr "Hoạt động cuối cùng"
-
-msgid "Service Discovery Info"
-msgstr "Thông tin phát hiện dịch vụ"
-
-msgid "Service Discovery Items"
-msgstr "Mục phát hiện dịch vụ"
-
-msgid "Extended Stanza Addressing"
-msgstr "Đặt địa chỉ kiểu đoạn dòng mở rộng"
-
-msgid "Multi-User Chat"
-msgstr "Chat đa người dùng"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Thông tin về mặt ở đã mở rộng cho chat đa người dùng"
-
-msgid "In-Band Bytestreams"
-msgstr "Luồng byte bên trong dải"
-
-msgid "Ad-Hoc Commands"
-msgstr "Lệnh như thế"
-
-msgid "PubSub Service"
-msgstr "Dịch vụ PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Luồng byte SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Dữ liệu bên ngoài dải"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Đăng ký bên trong dải"
-
-msgid "User Location"
-msgstr "Nơi ở người dùng"
-
-msgid "User Avatar"
-msgstr "Ảnh riêng người dùng"
-
-msgid "Chat State Notifications"
-msgstr "Thông báo tình trạng chat"
-
-msgid "Software Version"
-msgstr "Phiên bản phần mềm"
-
-msgid "Stream Initiation"
-msgstr "Khởi tạo luồng"
-
-msgid "File Transfer"
-msgstr "Truyền tập tin"
-
-msgid "User Mood"
-msgstr "Tâm trạng người dùng"
-
-msgid "User Activity"
-msgstr "Hoạt động người dùng"
-
-msgid "Entity Capabilities"
-msgstr "Khả năng thực thể"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Dàn xếp phiên bản đã mật mã"
-
-msgid "User Tune"
-msgstr "Điệu người dùng"
-
-msgid "Roster Item Exchange"
-msgstr "Trao đổi mục bản liệt kê"
-
-msgid "Reachability Address"
-msgstr "Địa chỉ có thể tới"
-
-msgid "User Profile"
-msgstr "Lý lịch người dùng"
-
-# Name: don't translate/Tên: đừng dịch
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Âm thanh Jingle"
-
-msgid "User Nickname"
-msgstr "Tên hiệu người dùng"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Ảnh động Jingle"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Người nhận tin nhẳn"
-
-msgid "Public Key Publishing"
-msgstr "Xuất bản khoá công"
-
-msgid "User Chatting"
-msgstr "Người dùng nói chuyện"
-
-msgid "User Browsing"
-msgstr "Người dùng duyệt"
-
-msgid "User Gaming"
-msgstr "Người dùng chơi trò"
-
-msgid "User Viewing"
-msgstr "Người dùng xem"
-
-# Name: don't translate/Tên: đừng dịch
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Mật mã đoạn dòng"
-
-msgid "Entity Time"
-msgstr "Thời gian thực thể"
-
-msgid "Delayed Delivery"
-msgstr "Phát trễ"
-
-msgid "Collaborative Data Objects"
-msgstr "Đối tượng dữ liệu hợp tác"
-
-msgid "File Repository and Sharing"
-msgstr "Kho lưu tập tin và chia sẻ"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Phát hiện dịch vụ STUN cho Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Dàn xếp phiên chạy mật mã đơn giản"
-
-msgid "Hop Check"
-msgstr "Kiểm tra bước"
-
-msgid "Capabilities"
-msgstr "Khả năng"
+#, fuzzy
+msgid "Local Time"
+msgstr "Tập tin cục bộ :"
 
 msgid "Priority"
 msgstr "Ưu tiên"
@@ -3872,6 +3904,14 @@ msgstr "Ưu tiên"
 msgid "Resource"
 msgstr "Tài nguyên"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Đã đăng xuất"
+
 msgid "Middle Name"
 msgstr "Tên đệm"
 
@@ -3918,7 +3958,6 @@ msgstr "Thích chát"
 msgid "Extended Away"
 msgstr "Vắng mắt lâu"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Xin đừng quấy rầy"
 
@@ -4041,28 +4080,26 @@ msgstr "Chọn một máy phục vụ hội thảo để hỏi"
 msgid "Find Rooms"
 msgstr "Tìm phòng"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Bạn cần mật mã, nhưng máy phục vụ này không cung cấp."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Bí danh:"
 
-msgid "Write error"
-msgstr "Lỗi ghi"
+#, fuzzy
+msgid "No users found"
+msgstr "Không tìm thấy người dùng tương ứng"
 
-msgid "Ping timeout"
-msgstr "Quá hạn ping"
+#, fuzzy
+msgid "Roles:"
+msgstr "Vị trí"
 
-msgid "Read Error"
-msgstr "Lỗi đọc"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Quá hạn ping"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"Không thể thiết lập kết nối đến máy phục vụ :\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "Không thể tạo ổ cắm"
 
 msgid "Invalid XMPP ID"
 msgstr "ID XMPP không hợp lệ"
@@ -4070,6 +4107,10 @@ msgstr "ID XMPP không hợp lệ"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP không hợp lệ. Phải đặt miền (domain)."
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Không kết nối được với máy phục vụ."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Đăng ký thành công %s@%s"
@@ -4094,9 +4135,6 @@ msgstr "Hủy đăng ký thành công"
 msgid "Unregistration Failed"
 msgstr "Lỗi hủy đăng ký"
 
-msgid "Already Registered"
-msgstr "Đã đăng ký"
-
 msgid "State"
 msgstr "Bang"
 
@@ -4109,6 +4147,9 @@ msgstr "Điện thoại"
 msgid "Date"
 msgstr "Ngày tháng"
 
+msgid "Already Registered"
+msgstr "Đã đăng ký"
+
 msgid "Unregister"
 msgstr "Hủy đăng ký"
 
@@ -4136,6 +4177,10 @@ msgstr "Đăng ký tài khoản mới ở %s"
 msgid "Change Registration"
 msgstr "Đổi sự đăng ký"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Không kết nối được với máy phục vụ."
+
 msgid "Error unregistering account"
 msgstr "Lỗi hủy đăng ký tài khoản"
 
@@ -4156,9 +4201,18 @@ msgstr "Đang xác thực"
 msgid "Re-initializing Stream"
 msgstr "Đang khởi tạo lại Stream"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Không cho phép"
 
+msgid "Mood"
+msgstr "Tâm trạng"
+
+msgid "Now Listening"
+msgstr "Đang nghe"
+
 msgid "Both"
 msgstr "Cả hai"
 
@@ -4180,12 +4234,6 @@ msgstr "Không"
 msgid "Subscription"
 msgstr "Đăng ký"
 
-msgid "Mood"
-msgstr "Tâm trạng"
-
-msgid "Now Listening"
-msgstr "Đang nghe"
-
 msgid "Mood Text"
 msgstr "Kiểm tra tâm trạng"
 
@@ -4228,9 +4276,6 @@ msgstr "Mật khẩu của bạn đã được thay đổi."
 msgid "Error changing password"
 msgstr "Lỗi khi thay đổi mật khẩu"
 
-msgid "Password (again)"
-msgstr "Nhập lại mật khẩu"
-
 msgid "Change XMPP Password"
 msgstr "Đổi mật khẩu XMPP"
 
@@ -4423,18 +4468,24 @@ msgstr "Không thể đá người dùng %s"
 msgid "Unable to ping user %s"
 msgstr "Không thể gửi tin hiệu ping cho người dùng %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Không thể kêu gọi vì không biết gì về người dùng %s."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr "Không thể kêu gọi, vì người dùng %s có thể chưa đăng nhập."
 
-#, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+#, fuzzy, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "Không thể kêu gọi, vì người dùng %s không hỗ trợ."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Đang kêu gọi %s..."
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4444,9 +4495,35 @@ msgstr "Kêu gọi"
 msgid "%s has buzzed you!"
 msgstr "%s đã kêu gọi bạn !"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Đang kêu gọi %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Không thể gửi tập tin cho %s, JID không hợp lệ"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "Không thể gửi tập tin cho %s, người dùng chưa kết nối"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+"Không thể gửi tập tin cho %s, không đăng ký với sự có mặt của người dùng"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Lỗi đăng ký"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Hãy chọn tài nguyên nào của %s cho đó bạn muốn gửi tập tin"
+
+msgid "Select a Resource"
+msgstr "Chọn tài nguyên"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Khởi tạo _Chát"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  (viết tắt) cấu hình một phòng trò chuyện."
@@ -4466,9 +4543,10 @@ msgstr "topic [chủ đề mới]:  Xem hay thay đổi chủ đề."
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;người_dùng&gt; [lý_do]:  Cấm một người dùng ra khỏi phòng."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;người_dùng&gt; &lt;owner|admin|member|outcast|none&gt;: Đặt tư "
 "cách người dùng trong phòng\n"
@@ -4478,9 +4556,10 @@ msgstr ""
 " • outcast\tngười bị ruồng bỏ\n"
 " • none\t\tkhông có."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;người_dùng&gt; &lt;moderator|participant|visitor|none&gt;: Đặt "
 "nghiệm vụ của người dùng trong phòng\n"
@@ -4550,6 +4629,9 @@ msgstr "Máy phục vụ kết nối"
 msgid "File transfer proxies"
 msgstr "Ủy nhiệm truyền tập tin"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4589,6 +4671,14 @@ msgstr "Lỗi phân tích XML"
 msgid "Unknown Error in presence"
 msgstr "Gặp lỗi không rõ trong sự có mặt"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Lỗi vào chát %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Lỗi trong chát %s"
+
 msgid "Create New Room"
 msgstr "Tạo phòng mới"
 
@@ -4605,13 +4695,32 @@ msgstr "_Cấu hình phòng"
 msgid "_Accept Defaults"
 msgstr "Chấp nhận _mặc định"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Lỗi vào chát %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Không nêu lý do."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Lỗi trong chát %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Bạn bị %s đá: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Bị %s đá (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Gặp lỗi trong khi mở tập tin."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Lỗi truyền tập tin"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Không mở được tập tin « %s »: %s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4638,9 +4747,6 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Hãy chọn tài nguyên nào của %s cho đó bạn muốn gửi tập tin"
 
-msgid "Select a Resource"
-msgstr "Chọn tài nguyên"
-
 msgid "Edit User Mood"
 msgstr "Sửa tâm trạng người dùng"
 
@@ -4675,8 +4781,19 @@ msgstr "Hành động"
 msgid "Select an action"
 msgstr "Chọn hành động"
 
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Không thể lấy Sổ địa chỉ MSN"
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Không thể thêm « %s »."
+
+msgid "Buddy Add error"
+msgstr ""
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Bạn đã ghi rõ một tên người dùng không hợp lệ."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4906,7 +5023,7 @@ msgstr "Passport của trẻ không có sự đồng ý của cha mẹ"
 msgid "Passport account not yet verified"
 msgstr "Tài khoản Passport chưa được thẩm định"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Tài khoản Passport chưa được thẩm định"
 
@@ -4930,6 +5047,10 @@ msgstr "Liên lạc đã thích"
 msgid "Non-IM Contacts"
 msgstr "Bỏ liên lạc"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s mời bạn xem máy ảnh Web, mà chưa được hỗ trợ."
+
 msgid "Nudge"
 msgstr "Làm nổi bật"
 
@@ -5002,6 +5123,13 @@ msgstr "Gửi tin nhắn tới di động."
 msgid "Page"
 msgstr "Nhắn tin"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Việc làm"
+
 msgid "Has you"
 msgstr "Có bạn"
 
@@ -5039,6 +5167,14 @@ msgstr "Nghệ sĩ"
 msgid "Album"
 msgstr "Tập nhạc"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "Tên điệu"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Tên điệu"
+
 msgid "Set Friendly Name..."
 msgstr "Đặt tên thân mật..."
 
@@ -5072,9 +5208,6 @@ msgstr "Khởi tạo _Chát"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN yêu cầu có hỗ trợ SSL. Hãy cài đặt thư viện SSL được hỗ trợ."
 
-msgid "Failed to connect to server."
-msgstr "Không kết nối được với máy phục vụ."
-
 msgid "Error retrieving profile"
 msgstr "Lỗi lấy lý lịch"
 
@@ -5229,8 +5362,9 @@ msgstr ""
 "Không tìm thấy thông tin trong lý lịch của người dùng này. Người này rất có "
 "thể không tồn tại."
 
-msgid "Profile URL"
-msgstr "URL lý lịch"
+#, fuzzy
+msgid "View web profile"
+msgstr "Ẩn khi ngoại tuyến"
 
 #. *< type
 #. *< ui_requirement
@@ -5264,65 +5398,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Xác thực ID Windows Live: không thể kết nối"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s không phải là nhóm hợp lệ."
-
-msgid "Unknown error."
-msgstr "Lỗi không rõ."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s trên %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vừa gửi cho bạn một lời kêu gọi."
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Lỗi không rõ (%d)"
 
 msgid "Unable to add user"
 msgstr "Không thể thêm người dùng"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Lỗi không rõ (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Dưới đây là kết quả tìm kiếm"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Không thể thêm người dùng trên %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Không thể chận người dùng trên %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Không thể cho phép người dùng trên %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s không thể được thêm vào vì danh sách bạn bè của bạn đã đầy"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s không phải tài khoản Passport hợp lệ."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Tạm thời không có dịch vụ."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Tin nhẳn chưa gửi đi được vì bạn chưa đăng nhập."
 
-msgid "Unable to rename group"
-msgstr "Không thể thay đổi tên của nhóm"
-
-msgid "Unable to delete group"
-msgstr "Không thể xoá nhóm"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5361,9 +5458,6 @@ msgstr "Thông điệp không gửi đi được vì có lỗi không rõ :"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Thông điệp không gửi đi được vì có lỗi không rõ :"
 
-msgid "Unable to connect"
-msgstr "Không thể kết nối"
-
 msgid "Writing error"
 msgstr "Lỗi ghi"
 
@@ -5378,20 +5472,24 @@ msgstr ""
 "Lỗi kết nối từ máy phục vụ %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Giao thức này không được hỗ trợ bởi trình phục vụ."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Lỗi phân tích HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Bạn đã đăng nhập từ một vị trí khác."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Các máy phục vụ MSN tạm thời không sẵn sàng. Vui lòng chờ và thử lại lần nữa."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Các máy phục vụ MSN tạm thời bị ngừng."
 
 #, c-format
@@ -5422,6 +5520,14 @@ msgstr "Đang gửi cookie"
 msgid "Retrieving buddy list"
 msgstr "Đang lấy danh sách bạn bè"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s mời bạn xem máy ảnh Web, mà chưa được hỗ trợ."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s mời bạn xem máy ảnh Web, mà chưa được hỗ trợ."
+
 msgid "Away From Computer"
 msgstr "Rời khỏi máy tính"
 
@@ -5460,14 +5566,6 @@ msgstr "Thông điệp không gửi đi được vì có lỗi trong hệ thốn
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Thông điệp không gửi đi được vì có lỗi không rõ :"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s đã thêm bạn vào danh sách bạn bè."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s đã loại bỏ bạn ra khỏi danh sách bạn bè."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Thêm vào sổ địa chỉ"
@@ -5476,19 +5574,15 @@ msgstr "Thêm vào sổ địa chỉ"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Bạn muốn thêm người này vào danh sách bạn bè của bạn không?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Không thể thêm « %s »."
-
 msgid "The username specified is invalid."
 msgstr "Bạn đã ghi rõ một tên người dùng không hợp lệ."
 
 msgid "This Hotmail account may not be active."
 msgstr "Tài khoản Hotmail này có lẽ chưa kích hoạt."
 
+msgid "Profile URL"
+msgstr "URL lý lịch"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5502,18 +5596,60 @@ msgstr "Tài khoản Hotmail này có lẽ chưa kích hoạt."
 msgid "MSN Protocol Plugin"
 msgstr "Phần bổ sung giao thức MSN"
 
-msgid "Missing Cipher"
-msgstr "Thiếu mật mã"
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s không phải là nhóm hợp lệ."
 
-msgid "The RC4 cipher could not be found"
-msgstr "Không tìm thấy mật mã RC4"
+msgid "Unknown error."
+msgstr "Lỗi không rõ."
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"Nâng cấp lên thư viện libpurple hỗ trợ RC4 (≥2.0.1). Phần bổ sung MySpaceIM "
-"sẽ không được nạp."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s trên %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Không thể thêm người dùng trên %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Không thể chận người dùng trên %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Không thể cho phép người dùng trên %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s không thể được thêm vào vì danh sách bạn bè của bạn đã đầy"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s không phải tài khoản Passport hợp lệ."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Tạm thời không có dịch vụ."
+
+msgid "Unable to rename group"
+msgstr "Không thể thay đổi tên của nhóm"
+
+msgid "Unable to delete group"
+msgstr "Không thể xoá nhóm"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s đã thêm bạn vào danh sách bạn bè."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s đã loại bỏ bạn ra khỏi danh sách bạn bè."
+
+#, c-format
+msgid "No such user: %s"
+msgstr "Không có người dùng như vậy: %s"
+
+msgid "User lookup"
+msgstr "Tra cứu người dùng"
 
 msgid "Reading challenge"
 msgstr "Đố đọc"
@@ -5524,13 +5660,26 @@ msgstr "Chiều dài đố bất thường từ máy phục vụ"
 msgid "Logging in"
 msgstr "Đang đăng nhập"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-"Kết nối đến máy phục vụ bị mất (không nhận dữ liệu trong vòng %d giây)"
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM — Chưa đặt tên người dùng"
+
+msgid "You appear to have no MySpace username."
+msgstr "Có vẻ là bạn chưa có một tên người dùng MySpace."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+"Bạn có muốn đặt một tên người dùng ngay bây giờ không? (Ghi chú : KHÔNG THỂ "
+"THAY ĐỔI LẠI !)"
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"Mất kết nối với máy phục vụ\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Thư tín mới"
 
@@ -5550,41 +5699,46 @@ msgstr "Chú thích ảnh mới"
 msgid "MySpace"
 msgstr "MySpace"
 
-msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM — Chưa đặt tên người dùng"
-
-msgid "You appear to have no MySpace username."
-msgstr "Có vẻ là bạn chưa có một tên người dùng MySpace."
+msgid "IM Friends"
+msgstr "Bạn bè Nhắn Tin"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
-"Bạn có muốn đặt một tên người dùng ngay bây giờ không? (Ghi chú : KHÔNG THỂ "
-"THAY ĐỔI LẠI !)"
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d bạn thân đã được thêm hoặc cập nhật từ máy phục vụ (gồm có bạn thân đã "
+"nằm trên danh sách bên máy phục vụ)"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Đã kết nối"
+msgid "Add contacts from server"
+msgstr "Thêm liên lạc từ máy phục vụ"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Lỗi giao thức, mã %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Bạn đã đặt một mật khẩu chứa %d ký tự, vượt quá chiều dài tối đa mong đợi "
 "%d ở MySpaceIM. Hãy cắt ngắn mật khẩu ở địa chỉ « http://profileedit.myspace."
 "com/index.cfm?fuseaction=accountSettings.changePassword », rồi thử lại."
 
+msgid "Incorrect username or password"
+msgstr "Tên người dùng hoặc mật khẩu sai"
+
 msgid "MySpaceIM Error"
 msgstr "Lỗi MySpaceIM"
 
+msgid "Invalid input condition"
+msgstr "Điều kiện nhập không hợp lệ"
+
 msgid "Failed to add buddy"
 msgstr "Không thêm được bạn thân"
 
@@ -5594,13 +5748,6 @@ msgstr "Lỗi « addbuddy » (thêm bạn thân) bị lỗi."
 msgid "persist command failed"
 msgstr "Lỗi « persist » (bền bỉ) bị lỗi"
 
-#, c-format
-msgid "No such user: %s"
-msgstr "Không có người dùng như vậy: %s"
-
-msgid "User lookup"
-msgstr "Tra cứu người dùng"
-
 msgid "Failed to remove buddy"
 msgstr "Không gỡ bỏ được bạn thân"
 
@@ -5610,35 +5757,18 @@ msgstr "Lỗi « delbuddy » (xoá bạn thân) bị lỗi"
 msgid "blocklist command failed"
 msgstr "Lỗi « blocklist » (danh sách chận) bị lỗi"
 
-msgid "Invalid input condition"
-msgstr "Điều kiện nhập không hợp lệ"
-
-msgid "Read buffer full (2)"
-msgstr "Bộ đệm đọc đã đầy (2)"
-
-msgid "Unparseable message"
-msgstr "Thông điệp không thể phân tích"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Không thể kết nối đến máy: %s (%d)"
+msgid "Missing Cipher"
+msgstr "Thiếu mật mã"
 
-msgid "IM Friends"
-msgstr "Bạn bè Nhắn Tin"
+msgid "The RC4 cipher could not be found"
+msgstr "Không tìm thấy mật mã RC4"
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-"%d bạn thân đã được thêm hoặc cập nhật từ máy phục vụ (gồm có bạn thân đã "
-"nằm trên danh sách bên máy phục vụ)"
-
-msgid "Add contacts from server"
-msgstr "Thêm liên lạc từ máy phục vụ"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Nâng cấp lên thư viện libpurple hỗ trợ RC4 (≥2.0.1). Phần bổ sung MySpaceIM "
+"sẽ không được nạp."
 
 msgid "Add friends from MySpace.com"
 msgstr "Thêm bạn bè từ MySpace.com"
@@ -5681,9 +5811,6 @@ msgstr "Kích cỡ phông cơ bản (điểm)"
 msgid "User"
 msgstr "Người dùng"
 
-msgid "Profile"
-msgstr "Lý lịch"
-
 msgid "Headline"
 msgstr "Hàng đầu"
 
@@ -5696,15 +5823,11 @@ msgstr "Tổng bạn bè"
 msgid "Client Version"
 msgstr "Phiên bản khách"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "Chưa đặt tên người dùng"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM — Hãy đặt một tên người dùng"
-
-msgid "Please enter a username to check its availability:"
-msgstr "Hãy gõ một tên người dùng để kiểm tra tính hợp lệ:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM — Tên người dùng sẵn sàng"
@@ -5715,12 +5838,22 @@ msgstr "Tên người dùng này sẵn có để dùng. Bạn có muốn đặt
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "MỘT KHI ĐẶT ĐƯỢC THÌ KHÔNG THỂ THAY ĐỔI LẠI !"
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM — Hãy đặt một tên người dùng"
+
 msgid "This username is unavailable."
 msgstr "Không thể đặt tên người dùng này."
 
 msgid "Please try another username:"
 msgstr "Hãy thử một tên người dùng khác:"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Chưa đặt tên người dùng"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Hãy gõ một tên người dùng để kiểm tra tính hợp lệ:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5912,9 +6045,6 @@ msgstr "Không thể tự thêm mình"
 msgid "Master archive is misconfigured"
 msgstr "Kho lưu chủ sai cấu hình"
 
-msgid "Incorrect username or password"
-msgstr "Tên người dùng hoặc mật khẩu sai"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Không thể nhận ra máy của tên người dùng bạn vừa nhập vào"
 
@@ -5956,9 +6086,9 @@ msgstr "Người dùng này đang ngoại tuyến hoặc bạn đã bị chặn
 msgid "Unknown error: 0x%X"
 msgstr "Lỗi không rõ : 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Không đăng nhập được (%s)"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Không thể đăng nhập"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6062,9 +6192,6 @@ msgstr "Hội thảo GroupWise %d"
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
 
-msgid "Unable to connect to server."
-msgstr "Không thể kết nối đến máy phục vụ."
-
 msgid "Waiting for response..."
 msgstr "Đợi hồi âm..."
 
@@ -6088,25 +6215,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Bạn có muốn tham gia cuộc thoại này không?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Bạn bị đăng xuất vì bạn cũng đăng nhập bằng một máy trạm khác."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s có vẻ là đang ngoại tuyến nên không thể nhận tin bạn vừa gửi."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Không thể kết nối đến máy phục vụ. Hãy nhập địa chỉ của máy phục vụ tới đó "
 "bạn muốn kết nối."
 
-msgid "Error. SSL support is not installed."
-msgstr "Lỗi: chưa cài đặt khả năng hỗ trợ SSL."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Cuộc hội thảo này đã đóng nên không thể gửi thêm tin nào."
 
@@ -6129,24 +6250,33 @@ msgstr "Địa chỉ máy phục vụ"
 msgid "Server port"
 msgstr "Cổng máy phục vụ"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Nhận được đáp ứng HTTP bất thường từ máy phục vụ."
+
+#. username connecting too frequently
+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 ""
+"Bạn đã liên tục kết nối và ngắt kết nối quá nhiều. Xin chờ 10 phút rồi thử "
+"lại. Nếu bạn tiếp tục kết nối, bạn sẽ phải đợi lâu hơn."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Lỗi yêu cầu hiệu bài đăng nhập"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Không thể tham gia phòng trò chuyện"
 
 msgid "Invalid chat room name"
 msgstr "Tên phòng trò chuyện không hợp lệ"
 
-msgid "Server closed the connection."
-msgstr "Máy phục vụ đã đóng kết nối."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Mất kết nối với máy phục vụ :\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Nhận dữ liệu không hợp lệ khi kết nối tới máy phục vụ."
 
 # AIM là mạng trò chuyện khác.
@@ -6196,7 +6326,8 @@ msgstr "Mất kết nối với người dùng từ xa:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Nhận dữ liệu không hợp lệ khi kết nối với người dùng từ xa."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Không thể thiết lập kết nối với người dùng từ xa."
 
 msgid "Direct IM established"
@@ -6374,23 +6505,18 @@ msgstr "Máy ảnh"
 msgid "Screen Sharing"
 msgstr "Chia sẻ màn hình"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Rảnh rỗi để Chát"
 
-#, c-format
 msgid "Not Available"
 msgstr "Không có mặt"
 
-#, c-format
 msgid "Occupied"
 msgstr "Đang bận"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Kiến thức Web"
 
-#, c-format
 msgid "Invisible"
 msgstr "Giấu mặt"
 
@@ -6403,21 +6529,15 @@ msgstr "Mức cảnh báo"
 msgid "Buddy Comment"
 msgstr "Chú thích bạn thân"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Không thể kết nối tới máy phục vụ xác thực:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Không thể kết nối tới máy phục vụ BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Không thể kết nối đến máy phục vụ."
 
 msgid "Username sent"
 msgstr "Tên người dùng đã được gửi"
@@ -6429,54 +6549,63 @@ msgstr "Kết nối được thiết lập, đã gửi cookie"
 msgid "Finalizing connection"
 msgstr "Đang hoàn tất kết nối"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Không thể đăng nhập. Không thể đăng nhập dưới %s vì tên người dùng không hợp "
 "lệ. Tên người dùng phải là một địa chỉ thư điện tử hợp lệ, hoặc bắt đầu với "
 "một chữ cái và chỉ chứa chữ cái, chữ số và khoảng trống, hoặc chỉ chứa chữ "
 "số."
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Tên người dùng sai."
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Bạn có thể bị ngắt kết nối một thời gian ngắn. Hãy kiểm tra %s để cập nhật."
 
-msgid "Incorrect password."
-msgstr "Mật khẩu sai."
+msgid "Unable to get a valid AIM login hash."
+msgstr "Không thể lấy mã đăng nhập AIM hợp lệ."
+
+msgid "Unable to get a valid login hash."
+msgstr "Không thể lấy mã đăng nhập hợp lệ."
+
+msgid "Received authorization"
+msgstr "Nhận được sự cho phép"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Người dùng đó không tồn tại."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Tài khoản của bạn tạm thời bị đình chỉ."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Tạm thời không dùng được Dịch Vụ Nhắn Tin Nhanh AOL."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Bạn đang dùng phiên bản trình khách quá cũ. Hãy nâng cấp tại %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Bạn đã liên tục kết nối và ngắt kết nối quá nhiều. Xin chờ 10 phút rồi thử "
 "lại. Nếu bạn tiếp tục kết nối, bạn sẽ phải đợi lâu hơn."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Bạn đang dùng phiên bản trình khách quá cũ. Hãy nâng cấp tại %s"
-
-msgid "Could Not Connect"
-msgstr "Không thể kết nối"
-
-msgid "Received authorization"
-msgstr "Nhận được sự cho phép"
-
 # SecurID là tên: đừng dịch
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Khoá SecurID nhập vào không hợp lệ."
 
 msgid "Enter SecurID"
@@ -6491,25 +6620,6 @@ msgstr "Nhập vào 6 chữ số hiển thị trên màn hình."
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Bạn có thể bị ngắt kết nối một thời gian ngắn. Trong lúc chờ đợi lỗi được "
-"sửa, bạn có thể sử dụng TOC. Hãy kiểm tra %s để cập nhật."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Không thể lấy mã đăng nhập AIM hợp lệ."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Bạn có thể bị ngắt kết nối một thời gian ngắn. Hãy kiểm tra %s để cập nhật."
-
-msgid "Unable to get a valid login hash."
-msgstr "Không thể lấy mã đăng nhập hợp lệ."
-
 msgid "Password sent"
 msgstr "Đã gửi mật khẩu"
 
@@ -6636,7 +6746,7 @@ 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] "Bạn không nhận được %hu tin nhẳn từ %s do lỗi chưa xác định."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Không thể gửi tin: %s"
@@ -6658,6 +6768,12 @@ msgstr "Đã kết nối từ"
 msgid "Member Since"
 msgstr "Là thành viên từ"
 
+msgid "Capabilities"
+msgstr "Khả năng"
+
+msgid "Profile"
+msgstr "Lý lịch"
+
 msgid "Your AIM connection may be lost."
 msgstr "Bạn có thể đã bị ngắt kết nối với AIM"
 
@@ -6822,9 +6938,9 @@ msgstr[0] ""
 msgid "Away message too long."
 msgstr "Thông báo vắng mặt quá dài."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6850,9 +6966,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Thừa"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Không thể thêm bạn chát %s vì danh sách của bạn có quá nhiều bạn chát. Hãy "
@@ -6861,8 +6977,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(không tên)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Không thể thêm bạn chát %s vì lý do không rõ."
 
 #, c-format
@@ -6933,6 +7049,7 @@ msgstr "_Kết nối"
 msgid "Get AIM Info"
 msgstr "Lấy thông tin AIM"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Sửa chú thích bạn chát"
 
@@ -6991,6 +7108,7 @@ msgstr "_Tìm kiếm"
 msgid "Set User Info (web)..."
 msgstr "Đặt thông tin người dùng (Web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Đổi mật khẩu (Web)"
 
@@ -7020,6 +7138,10 @@ msgstr "Tìm kiếm bạn chát theo địa chỉ thư..."
 msgid "Search for Buddy by Information"
 msgstr "Tìm kiếm bạn chát theo thông tin"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Người dùng chưa đăng nhập"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7041,7 +7163,6 @@ msgstr "Yêu cầu %s kết nối với chúng tôi tại %s:%hu để gửi tin
 msgid "Attempting to connect to %s:%hu."
 msgstr "Đang thử kết nối đến %s:%hu."
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Đang thử kết nối thông qua máy phục vụ ủy nhiệm."
 
@@ -7137,7 +7258,7 @@ msgstr "Khác"
 msgid "Visible"
 msgstr "Giấu mặt"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7228,16 +7349,48 @@ msgstr "Cập nhật lần cuối"
 msgid "Could not change buddy information."
 msgstr "Hãy nhập thông tin về bạn thân."
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "Di động"
+
+msgid "Note"
+msgstr "Ghi chú"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "Biểu tượng bạn thân"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Thêm bạn thân"
+msgid "_Modify"
+msgstr "Sửa"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "Sửa"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Máy phục vụ bận"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Cần thiết sự cho phép"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Có thêm bạn thân vào danh sách của bạn không?"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Enter answer here"
 msgstr "Gõ yêu cầu vào đây"
 
 msgid "Send"
@@ -7251,18 +7404,19 @@ msgid "Authorization denied message:"
 msgstr "Thông điệp từ chối cho phép:"
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "Tiếc là tôi quá bận..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Người dùng %d yêu cầu sự cho phép"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Có thêm bạn thân vào danh sách của bạn không?"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "Gõ yêu cầu vào đây"
 
 msgid "Would you be my friend?"
@@ -7285,7 +7439,7 @@ msgid "Failed sending authorize"
 msgstr "Xin hãy cho phép tôi."
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Không gỡ bỏ được bạn thân"
 
 #, fuzzy, c-format
@@ -7330,6 +7484,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr "Bạn chỉ có khả năng tìm kiếm nhóm QQ bên bỉ\n"
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "Thiết lập ủy nhiệm không hợp lệ"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Tôi không phải là thành viên"
 
@@ -7373,16 +7531,19 @@ msgstr "Nhóm này không cho phép người khác tham gia"
 msgid "Join QQ Qun"
 msgstr "Tham gia chát"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "Gõ yêu cầu vào đây"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Bạn đã sửa đổi thành công thành viên Qun"
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "Bạn đã sửa đổi thành công thành viên Qun"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7392,7 +7553,7 @@ msgstr "Thao tác QQ Qun"
 msgid "Failed:"
 msgstr "Bị lỗi"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7407,11 +7568,11 @@ msgstr ""
 "cuối cùng thao tác này sẽ gỡ bỏ Qun này."
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "Tiếc là tôi quá bận..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Bạn đã sửa đổi thành công thành viên Qun"
 
 #, fuzzy
@@ -7422,35 +7583,35 @@ msgid "You have successfully created a Qun"
 msgstr "Bạn đã tạo thành công một Qun"
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Bạn có muốn thiết lập chi tiết Qun ngay bây giờ không?"
 
 msgid "Setup"
 msgstr "Thiết lập"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "Người dùng %d đã yêu cầu tham gia nhóm %d"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "Người dùng %d đã yêu cầu tham gia nhóm %d"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Không tham gia được với bạn chát"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Bỏ bạn chát"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Bỏ bạn chát"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7567,6 +7728,13 @@ msgstr "<b>Cập nhật cuối:</b> %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>IP máy phục vụ </b>: %s: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>Cập nhật cuối:</b> %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7574,7 +7742,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Giới thiệu %s"
 
 #, fuzzy
@@ -7595,6 +7763,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Giới thiệu %s"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Địa chỉ nhà"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7626,7 +7798,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Kết nối bằng TCP"
@@ -7639,6 +7810,9 @@ msgstr "Cổng máy phục vụ"
 msgid "Show server news"
 msgstr "Địa chỉ máy phục vụ"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "Lỗi giữ cho kết nối hoạt động"
@@ -7648,11 +7822,7 @@ msgid "Update interval (seconds)"
 msgstr "Lỗi giữ cho kết nối hoạt động"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Không thể lấy thông tin về máy phục vụ"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Không thể lấy thông tin về máy phục vụ"
 
 #, c-format
@@ -7675,21 +7845,20 @@ msgid "Activation required"
 msgstr "Yêu cầu đăng ký"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Keep alive error"
-msgstr "Lỗi giữ cho kết nối hoạt động"
-
 #, fuzzy
-msgid "Requesting captcha ..."
+msgid "Requesting captcha"
 msgstr "Đang yêu cầu sự chú ý của %s..."
 
-msgid "Checking code of captcha ..."
-msgstr ""
+#, fuzzy
+msgid "Checking captcha"
+msgstr "Đang yêu cầu sự chú ý của %s..."
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Lỗi xác thực Yahoo"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7699,73 +7868,51 @@ msgstr "Lưu ảnh"
 msgid "Enter code"
 msgstr "Nhập mật khẩu"
 
-msgid "QQ Captcha Verifing"
-msgstr ""
+#, fuzzy
+msgid "QQ Captcha Verification"
+msgstr "Thẩm tra chứng nhận SSL"
 
 #, fuzzy
 msgid "Enter the text from the image"
 msgstr "Hãy nhập tên của nhóm"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Không thể kết nối."
-
 msgid "Socket error"
 msgstr "Lỗi ổ cắm"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"Mất kết nối với máy phục vụ :\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "Không thể đọc từ ổ cắm"
-
-msgid "Write Error"
-msgstr "Lỗi ghi"
-
-msgid "Connection lost"
-msgstr "Kết nối bị mất"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Lập thông tin người dùng..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Yêu cầu bị từ chối"
 
-msgid "Couldn't resolve host"
-msgstr "Không thể giải quyết máy"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Không thể kết nối đến máy phục vụ."
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Lỗi không hợp lệ"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "Máy phục vụ kết nối"
+msgid "Connecting to server"
+msgstr "Đang kết nối tới máy phục vụ SILC"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Lỗi QQid"
 
-msgid "Failed to send IM."
-msgstr "Không gửi được tin nhắn."
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7775,6 +7922,10 @@ msgid ""
 msgstr "Chuyển tiếp máy phục vụ ICQ"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s (%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Từ"
 
@@ -7784,32 +7935,30 @@ msgid ""
 "%s"
 msgstr "Hướng dẫn máy phục vụ : %s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Lý do không rõ"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Lệnh"
 
-#, fuzzy, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr "Bạn [%d] đã được thêm vào nhóm « %d »"
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Không thể lấy thông tin về máy phục vụ"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Lý do không rõ"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Lý do không rõ"
 
 #, c-format
@@ -7823,9 +7972,6 @@ msgstr "Gửi tập tin"
 msgid "%d canceled the transfer of %s"
 msgstr "%d đã thôi truyền %s"
 
-msgid "Connection closed (writing)"
-msgstr "Kết nối bị đóng (đang ghi)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Tên nhóm:</b> %s<br>"
@@ -7879,17 +8025,6 @@ msgstr "Một quản trị Sametime đã thông báo như theo đây trên máy
 msgid "Sametime Administrator Announcement"
 msgstr "Thông báo Quản trị Sametime"
 
-msgid "Connection reset"
-msgstr "Kết nối bị đặt lại"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Lỗi đọc từ ổ cắm: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Không thể kết nối đến máy"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Thông báo từ %s"
@@ -7912,6 +8047,9 @@ msgstr "Loa"
 msgid "Video Camera"
 msgstr "Máy ảnh động"
 
+msgid "File Transfer"
+msgstr "Truyền tập tin"
+
 msgid "Supports"
 msgstr "Hỗ trợ"
 
@@ -8628,9 +8766,6 @@ msgstr "Tổ chức"
 msgid "Unit"
 msgstr "Đơn vị"
 
-msgid "Note"
-msgstr "Ghi chú"
-
 msgid "Join Chat"
 msgstr "Tham gia chát"
 
@@ -8737,6 +8872,10 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Thống kê mạng"
 
+# Name: don't translate/Tên: đừng dịch
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping thất bại"
 
@@ -8800,7 +8939,8 @@ msgstr "Kiểu khoá công không được hỗ trợ"
 msgid "Disconnected by server"
 msgstr "Bị máy phục vụ ngắt kết nối"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Gặp lỗi trong khi kết nối tới máy phục vụ SILC"
 
 msgid "Key Exchange failed"
@@ -8812,26 +8952,26 @@ msgstr ""
 "Phục hồi phiên chạy tách rời đã thất bại. Nhấn « Tái kết nối » để tạo kết nối "
 "mới."
 
-msgid "Connection failed"
-msgstr "Kết nối bị lỗi"
-
 msgid "Performing key exchange"
 msgstr "Đang thực hiện trao đổi mã khoá"
 
-msgid "Unable to create connection"
-msgstr "Không thể tạo kết nối"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Không thể nạp cặp khoá SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Đang kết nối tới máy phục vụ SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Không thể nạp cặp khoá SILC"
+
 msgid "Out of memory"
 msgstr "Tràn bộ nhớ"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Không thể khởi tạo giao thức SILC"
 
 msgid "Error loading SILC key pair"
@@ -9137,7 +9277,8 @@ msgstr "Ký điện và thẩm tra mọi thông điệp"
 msgid "Creating SILC key pair..."
 msgstr "Đang tạo cặp khoá SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Không thể tạo cặp khoá SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9233,6 +9374,9 @@ msgstr "Bảng trắng"
 msgid "No server statistics available"
 msgstr "Không có sẵn thống kê máy phục vụ"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Gặp lỗi trong khi kết nối tới máy phục vụ SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Thất bại: Phiên bản không tương thích, nên nâng cấp trình khách"
@@ -9273,34 +9417,35 @@ msgstr "Thất bại: Cookie không hợp lệ"
 msgid "Failure: Authentication failed"
 msgstr "Thất bại: Không xác thực được"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Không thể khởi tạo kết nối Khách SILC"
 
 msgid "John Noname"
 msgstr "Tham gia Không_tên"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Không thể nạp cặp khoá SILC: %s"
 
-msgid "Could not write"
-msgstr "Không thể ghi"
-
-msgid "Could not connect"
-msgstr "Không thể kết nối"
+msgid "Unable to create connection"
+msgstr "Không thể tạo kết nối"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Không rõ đáp ứng từ máy phục vụ"
 
-msgid "Could not create listen socket"
-msgstr "Không thể tạo ổ cắm lắng nghe"
-
-msgid "Could not resolve hostname"
-msgstr "Không thể giải quyết tên máy"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Không thể tạo ổ cắm"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Tên người dùng SIP không được chứa dấu cách hay ký hiệu @"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Cổng máy phục vụ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9334,179 +9479,63 @@ msgstr "Xác thực người dùng"
 msgid "Auth Domain"
 msgstr "Xác thực miền"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Đang tra tìm %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Kết nối đến %s không được"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Đăng nhập: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Không thể ghi tập tin %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Không thể đọc tập tin %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Tin nhắn quá dài, %s byte cuối bị cắt ngắn."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s chưa đăng nhập."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Không cho phép cảnh báo cho %s."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Một tin nhẳn không gửi đi được, bạn đang vượt quá tốc độ cho phép của máy "
-"phục vụ."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Không có sẵn chát trong %s."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Bạn đang gửi tin nhẳn quá nhanh đến %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Bạn không nhận được tin nhắn từ %s vì nó quá lớn."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Bạn không nhận được tin nhắn từ %s vì nó được gửi quá nhanh."
-
-#, c-format
-msgid "Failure."
-msgstr "Lỗi."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Quá nhiều kết quả trùng khớp."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Cần thêm từ hạn định"
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Tạm thời không có dịch vụ danh bạ."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Khả năng tra tìm địa chỉ thư điện tử bị hạn chế."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Từ khóa bị lờ đi."
-
-#, c-format
-msgid "No keywords."
-msgstr "Không có từ khóa."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Người dùng không có thông tin danh bạ."
-
-#, c-format
-msgid "Country not supported."
-msgstr "Quốc gia chưa được hỗ trợ."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Lỗi không rõ : %s."
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "Tên người dùng hay mật khẩu không đúng."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Tạm thời không có dịch vụ."
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Mức cảnh báo của bạn hiện thời quá cao nên không đăng nhập được."
-
-#, c-format
-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 ""
-"Bạn đã liên tục kết nối và ngắt kết nối quá nhiều. Hẵy đợi 10 phút và kết "
-"nối lại. Nếu bạn vẫn cố kết nối, bạn sẽ phải chờ lâu hơn."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Lỗi đăng nhập không rõ : %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr ""
-"Lỗi không rõ : %d.\n"
-"Thông tin: %s"
-
-msgid "Invalid Groupname"
-msgstr "Tên nhóm không hợp lệ"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;phòng&gt;: Tham gia một phòng chát trên mạng Yahoo"
 
-msgid "Connection Closed"
-msgstr "Kết nối bị đóng"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Liệt kê các phòng trên mạng Yahoo"
 
-msgid "Waiting for reply..."
-msgstr "Đợi hồi âm..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Yêu cầu người dùng bắt đầu vẽ hình"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"TOC thôi trạng thái tạm ngừng. Bây giờ bạn có thể gửi tin nhẳn trở lại."
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ID Yahoo"
 
-msgid "Password Change Successful"
-msgstr "Đổi mật khẩu thành công"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Phần bổ sung giao thức Yahoo"
 
-msgid "_Group:"
-msgstr "_Nhóm:"
+msgid "Pager server"
+msgstr "Máy phục vụ nhắn tin"
 
-msgid "Get Dir Info"
-msgstr "Lấy thông tin danh bạ"
+msgid "Pager port"
+msgstr "Cổng nhắn tin"
 
-msgid "Set Dir Info"
-msgstr "Lập thông tin danh bạ"
+msgid "File transfer server"
+msgstr "Máy phục vụ truyền tập tin"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Không thể mở %s để ghi !"
+msgid "File transfer port"
+msgstr "Cổng truyền tập tin"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "Không truyền được tập tin; bên khác có thể đã hủy bỏ."
+msgid "Chat room locale"
+msgstr "Miền địa phương phòng chát"
 
-msgid "Could not connect for transfer."
-msgstr "Không thể kết nối để truyền đi."
+msgid "Ignore conference and chatroom invitations"
+msgstr "Lời đi các lời mời vào hội thảo hay phòng chát"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Không thể ghi phần đầu tập tin. Tập tin sẽ không được truyền."
+msgid "Chat room list URL"
+msgstr "URL đến danh sách phòng chát"
 
-msgid "Save As..."
-msgstr "Lưu dạng..."
+msgid "Yahoo Chat server"
+msgstr "Máy phục vụ chát Yahoo"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s yêu cầu %s chấp nhận %d tập tin: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Cổng chát Yahoo"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s yêu cầu bạn gửi tập tin"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID Yahoo"
 
 #. *< type
 #. *< ui_requirement
@@ -9518,12 +9547,12 @@ msgstr "%s yêu cầu bạn gửi tập tin"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Phần bổ sung giao thức TOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Phần bổ sung giao thức Yahoo"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s mời bạn xem máy ảnh Web, mà chưa được hỗ trợ."
+msgid "Your SMS was not delivered"
+msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Tin nhẳn Yahoo! của bạn đã không được gửi."
@@ -9549,6 +9578,34 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Thêm bạn chát bị từ chối"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Nhận dữ liệu không hợp lệ khi kết nối tới máy phục vụ."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Mã lỗi không rõ %d. Đăng nhập vào địa chỉ Web của Yahoo có thể giúp khắc "
+"phục."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Mã lỗi không rõ %d. Đăng nhập vào địa chỉ Web của Yahoo có thể giúp khắc "
+"phục."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Tên người dùng hoặc mật khẩu sai"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9581,13 +9638,14 @@ msgstr ""
 "Mã lỗi không rõ %d. Đăng nhập vào địa chỉ Web của Yahoo có thể giúp khắc "
 "phục."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Không thể thêm bạn chát %s vào nhóm %s trong danh sach máy phục vụ của tài "
 "khoản %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Không thể thêm bạn chát vào danh sách máy phục vụ"
 
 # Audible là nhà cung cấp thông tin bằng âm thanh: tên, đừng dịch.
@@ -9595,26 +9653,20 @@ msgstr "Không thể thêm bạn chát vào danh sách máy phục vụ"
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Nhận được đáp ứng HTTP bất thường từ máy phục vụ."
 
-msgid "Connection problem"
-msgstr "Kết nối có vấn đề"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Mất kết nối với %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Không thể thiết lập kết nối với %s:\n"
+"Không thể thiết lập kết nối đến máy phục vụ :\n"
 "%s"
 
 msgid "Not at Home"
@@ -9662,8 +9714,8 @@ msgstr "Thiết lập có mặt"
 msgid "Start Doodling"
 msgstr "Bắt đầu vẽ"
 
-msgid "Activate which ID?"
-msgstr "Kích hoạt ID nào ?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Tham gia với ai trong chat?"
@@ -9677,74 +9729,15 @@ msgstr "Tham gia với người dùng trong chat..."
 msgid "Open Inbox"
 msgstr "Mở hộp thư đến"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;phòng&gt;: Tham gia một phòng chát trên mạng Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Liệt kê các phòng trên mạng Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Yêu cầu người dùng bắt đầu vẽ hình"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ID Yahoo"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Phần bổ sung giao thức Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Nhật bản"
-
-msgid "Pager server"
-msgstr "Máy phục vụ nhắn tin"
-
-msgid "Japan Pager server"
-msgstr "Máy phục vụ nhắn tin Nhật bản"
-
-msgid "Pager port"
-msgstr "Cổng nhắn tin"
-
-msgid "File transfer server"
-msgstr "Máy phục vụ truyền tập tin"
-
-msgid "Japan file transfer server"
-msgstr "Máy phục vụ truyền tập tin Nhật bản"
-
-msgid "File transfer port"
-msgstr "Cổng truyền tập tin"
-
-msgid "Chat room locale"
-msgstr "Miền địa phương phòng chát"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Lời đi các lời mời vào hội thảo hay phòng chát"
-
-msgid "Chat room list URL"
-msgstr "URL đến danh sách phòng chát"
-
-msgid "Yahoo Chat server"
-msgstr "Máy phục vụ chát Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Cổng chát Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Đã gửi yêu cầu vẽ hình."
 
+msgid "Unable to connect."
+msgstr "Không thể kết nối."
+
 msgid "Unable to establish file descriptor."
 msgstr "Không thể thiết lập bộ mô tả tập tin."
 
@@ -9752,6 +9745,9 @@ msgstr "Không thể thiết lập bộ mô tả tập tin."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s đang thử gửi cho bạn một tập hợp %d tập tin.\n"
 
+msgid "Write Error"
+msgstr "Lỗi ghi"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Lý lịch Yahoo Nhật bản"
 
@@ -9795,13 +9791,9 @@ msgstr "Liên kết ưa thích 3"
 msgid "Last Update"
 msgstr "Cập nhật lần cuối"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Hiện không có thông tin người dùng về %s"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Tiếc là hình như lý lịch này được viết bằng ngôn ngữ hay định dạng chưa được "
 "hỗ trợ."
@@ -9873,23 +9865,19 @@ msgstr "Thoại"
 msgid "Webcams"
 msgstr "Máy ảnh Web"
 
+msgid "Connection problem"
+msgstr "Kết nối có vấn đề"
+
 msgid "Unable to fetch room list."
 msgstr "Không thể lấy danh sách phòng."
 
 msgid "User Rooms"
 msgstr "Phòng người dùng"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Kết nối có vấn đề với máy phục vụ YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Mất kết nối với máy phục vụ\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10016,24 +10004,16 @@ msgstr "Địa hạt"
 msgid "Exposure"
 msgstr "Phơi sáng"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Không thể tạo ổ cắm\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Không thể phân tích đáp ứng từ ủy nhiệm HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Lỗi kết nối ủy nhiệm HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Truy cập bị từ chối: máy phục vụ ủy nhiệm HTTP cấm đào đường hầm xuyên qua "
 "cổng %d."
@@ -10042,9 +10022,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Lỗi giải quyết %s"
 
-msgid "Could not resolve host name"
-msgstr "Không thể giải quyết tên máy."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Đang yêu cầu sự chú ý của %s..."
@@ -10131,9 +10108,6 @@ msgstr "Xin đừng quấy rầy"
 msgid "Extended away"
 msgstr "Vắng mặt mở rộng"
 
-msgid "Mobile"
-msgstr "Di động"
-
 msgid "Listening to music"
 msgstr "Nghe nhạc"
 
@@ -10175,18 +10149,6 @@ msgstr "+++ %s đã thôi trạng thái nghỉ"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "Lỗi đọc %s"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Gặp lỗi khi đọc %s của bạn nên chưa nạp và tên tập tin cũ đã bị thay đổi "
-"thành « %s~ »."
-
 msgid "Calculating..."
 msgstr "Đang tính toán..."
 
@@ -10288,6 +10250,18 @@ msgstr "Kết nối bị từ chối."
 msgid "Address already in use."
 msgstr "Tên chát này đang được dùng"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "Lỗi đọc %s"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Gặp lỗi khi đọc %s của bạn nên chưa nạp và tên tập tin cũ đã bị thay đổi "
+"thành « %s~ »."
+
 msgid "Internet Messenger"
 msgstr "Tin Nhắn"
 
@@ -10330,10 +10304,8 @@ msgstr "Thông báo thư _mới"
 msgid "Use this buddy _icon for this account:"
 msgstr "Dùng biểu tượng bạn chát cho tài khoản này:"
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s Tùy chọn"
+msgid "_Advanced"
+msgstr "Cấp c_ao"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Dùng thiết lập ủy nhiệm GNOME"
@@ -10368,9 +10340,6 @@ msgstr "Nếu bạn thấy đúng là gần"
 msgid "you can see the butterflies mating"
 msgstr "bạn có thể nhìn thấy con bướm kết đôi"
 
-msgid "Proxy Options"
-msgstr "Tùy chọn ủy nhiệm"
-
 msgid "Proxy _type:"
 msgstr "Kiểu ủ_y nhiệm:"
 
@@ -10398,8 +10367,9 @@ msgstr "Cơ _bản"
 msgid "Create _this new account on the server"
 msgstr "_Tạo tài khoản mới này trên máy phục vụ"
 
-msgid "_Advanced"
-msgstr "Cấp c_ao"
+#, fuzzy
+msgid "_Proxy"
+msgstr "Ủy nhiệm"
 
 msgid "Enabled"
 msgstr "Đã bật"
@@ -10446,16 +10416,17 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Hãy cập nhật các trường cần thiết."
 
-msgid "Room _List"
-msgstr "Danh sách _phòng"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Tài khoản"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Hãy nhập thông tin thích hợp về cuộc chat mà bạn muốn tham gia.\n"
 
-msgid "_Account:"
-msgstr "Tài _khoản:"
+msgid "Room _List"
+msgstr "Danh sách _phòng"
 
 msgid "_Block"
 msgstr "_Chặn"
@@ -10472,6 +10443,17 @@ msgstr "Lấy thông t_in"
 msgid "I_M"
 msgstr "_Tin nhắn"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "Thê_m chát"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "Trò chuyện ảnh động"
+
 msgid "_Send File..."
 msgstr "_Gửi tập tin..."
 
@@ -10481,9 +10463,14 @@ msgstr "Thêm thông _báo bạn chát..."
 msgid "View _Log"
 msgstr "_Xem bản ghi"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Ẩn khi ngoại tuyến"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Hiện khi ngoại tuyến"
+
 msgid "_Alias..."
 msgstr "_Bí danh..."
 
@@ -10608,6 +10595,10 @@ msgstr "/Công cụ/Thông _báo bạn chát"
 msgid "/Tools/_Certificates"
 msgstr "/Công cụ/_Chứng nhận"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Công cụ/Hình cườ_i"
+
 msgid "/Tools/Plu_gins"
 msgstr "/Công cụ/_Phần bổ sung"
 
@@ -10617,9 +10608,6 @@ msgstr "/Công cụ/Tù_y chỉnh"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Công cụ/_Riêng tư"
 
-msgid "/Tools/Smile_y"
-msgstr "/Công cụ/Hình cườ_i"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Công cụ/_Truyền tập tin"
 
@@ -10736,8 +10724,8 @@ msgstr "Bằng tay"
 msgid "By status"
 msgstr "Theo trạng thái"
 
-msgid "By log size"
-msgstr "Theo kích cỡ bản ghi"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10753,6 +10741,9 @@ msgstr "Tái kết nối"
 msgid "Re-enable"
 msgstr "Bật lại"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr "Chào mừng lại !"
 
@@ -10839,6 +10830,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "_Bí danh:"
 
+msgid "_Group:"
+msgstr "_Nhóm:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Tự động tham _gia một khi tài khoản kết nối."
 
@@ -10873,6 +10867,116 @@ msgstr "/Công cụ"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Bạn chát/Sắp xếp bạn chát"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Màu nền"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Nhóm này đã được thêm vào danh sách bạn bè của bạn"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Tiếng Lào"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Màu nền"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Giãn _ra"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Chọn màu nền"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Co lại"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Chọn màu nền"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Lối tắt"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Trực tuyến"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Vắng mặt"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Ngoại tuyến"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Kiểm tra tâm trạng"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Gửi tin nhẳn"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Đổi thông tin người dùng cho %s"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Gõ tên máy cho đó có chứng nhận này."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Máy phục vụ SSL"
@@ -10892,12 +10996,6 @@ msgstr ""
 msgid "Invite Buddy Into Chat Room"
 msgstr "Mời bạn chát vào phòng chát"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "Hãy nhập tên người dùng mà bạn muốn mời, kèm theo lời mời tùy ý."
-
 msgid "_Buddy:"
 msgstr "_Bạn chát:"
 
@@ -10926,7 +11024,8 @@ msgstr "Lờ"
 msgid "Get Away Message"
 msgstr "Lấy thông điệp vắng mặt"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Nói lần cuối"
 
 msgid "Unable to save icon file to disk."
@@ -10972,6 +11071,22 @@ msgstr "/Cuộc thoại/_Lưu dạng..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Cuộc thoại/Gột _vùng cuộn ngược"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Cuộc thoại/Nữ_a"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Cuộc thoại/Nữ_a"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Cuộc thoại/Nữ_a"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Cuộc thoại/_Xem bản ghi"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Cuộc thoại/_Gửi tập tin..."
 
@@ -11044,6 +11159,18 @@ msgstr "/Cuộc thoại"
 msgid "/Conversation/View Log"
 msgstr "/Cuộc thoại/Xem bản ghi"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Cuộc thoại/_Nữa"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Cuộc thoại/Xem bản ghi"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Cuộc thoại/_Nữa"
+
 msgid "/Conversation/Send File..."
 msgstr "/Cuộc thoại/Gửi tập tin..."
 
@@ -11226,6 +11353,9 @@ msgstr "Nghệ sĩ"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "hỗ trợ"
 
@@ -11352,6 +11482,10 @@ msgstr "Tiếng Hin-đi"
 msgid "Hungarian"
 msgstr "Tiếng Hung-ga-ri"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Tiếng Ru-ma-ni"
+
 msgid "Indonesian"
 msgstr "Tiếng Nam Dương"
 
@@ -11367,6 +11501,10 @@ msgstr "Tiếng Gi-oa-gi-a"
 msgid "Ubuntu Georgian Translators"
 msgstr "Nhóm Dịch Giả Gi-oa-gi-a Ubuntu"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "Khác"
+
 msgid "Kannada"
 msgstr "Tiếng Kan-na-đa"
 
@@ -11388,6 +11526,10 @@ msgstr "Tiếng Li-tu-a-ni"
 msgid "Macedonian"
 msgstr "Tiếng Ma-xê-đô-ni"
 
+#, fuzzy
+msgid "Mongolian"
+msgstr "Tiếng Ma-xê-đô-ni"
+
 msgid "Bokmål Norwegian"
 msgstr "Tiếng Na-uy (Bóc-măn)"
 
@@ -11442,6 +11584,9 @@ msgstr "Tiếng Xin-ha-la"
 msgid "Swedish"
 msgstr "Tiếng Thụy Điển"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tiếng Ta-min"
 
@@ -11502,7 +11647,24 @@ msgstr ""
 "người đóng góp. Chương trình này không bảo hành gì cả.<BR><BR>"
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"3\">IRC:</FONT> #pidgin trên irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> #pidgin trên irc.freenode.net<BR><BR>"
 
 msgid "Current Developers"
@@ -11750,7 +11912,7 @@ msgid "Hyperlink visited color"
 msgstr "Màu siêu liên kết"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Màu siêu liên kết nổi bật khi rê chuột qua"
 
 msgid "Hyperlink prelight color"
@@ -11786,13 +11948,22 @@ msgstr "Màu để vẽ tên của tin nhẳn hành động."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Màu tên tin nhẳn hành động cho tin nhẳn thì thầm"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Màu để vẽ tên của tin nhẳn hành động."
+
 msgid "Whisper Message Name Color"
 msgstr "Màu tên tin nhẳn thì thầm"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Màu để vẽ tên của tin nhẳn hành động."
+
 msgid "Typing notification color"
 msgstr "Màu thông báo đang gõ"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Màu cần dùng cho phông chữ thông báo đang gõ"
 
 msgid "Typing notification font"
@@ -11804,15 +11975,6 @@ msgstr "Phông chữ cần dùng cho thông báo đang gõ"
 msgid "Enable typing notification"
 msgstr "Bật thông báo đang gõ"
 
-msgid "_Copy Email Address"
-msgstr "_Chép địa chỉ thư"
-
-msgid "_Open Link in Browser"
-msgstr "_Mở liên kết trong trình duyệt"
-
-msgid "_Copy Link Location"
-msgstr "_Chép địa chỉ liên kết"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11854,11 +12016,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "Lưu ảnh"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Lưu ảnh..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "Thê_m hình cười tự chọn..."
 
@@ -11947,9 +12107,6 @@ msgstr "Giảm kích cỡ phông"
 msgid "Font Face"
 msgstr "Mặt chữ"
 
-msgid "Background Color"
-msgstr "Màu nền"
-
 msgid "Foreground Color"
 msgstr "Màu cảnh gần"
 
@@ -12058,13 +12215,14 @@ msgstr "Duyệt qua thư mục _bản ghi"
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Chạy « %s -h » để biết thêm thông tin.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12088,13 +12246,14 @@ msgstr ""
 "  --display=BỘ_TRÌNH_BÀY\t\tbộ trình bày X cần dùng\n"
 "  -v, --version       \t\thiển thị phiên bản hiện thời rồi thoát\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12154,11 +12313,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "Mở mọi tin nhẳn"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Có thư mới !</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "Đang tính toán..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
 
 #, c-format
 msgid "%s has %d new message."
@@ -12186,6 +12361,27 @@ msgid ""
 msgstr ""
 "Đã chọn lệnh chạy trình duyệt « Bằng tay », nhưng không cung cấp lệnh nào."
 
+#, fuzzy
+msgid "No message"
+msgstr "Thông điệp không rõ"
+
+msgid "Open All Messages"
+msgstr "Mở mọi tin nhẳn"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Có thư mới !</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "Thông báo bạn thân mới"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Có thư mới !</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "Những phần bổ sung theo đây sẽ được bỏ nạp."
 
@@ -12234,10 +12430,17 @@ msgstr "<b>Chi tiết về phần bổ sung</b>"
 msgid "Select a file"
 msgstr "Chọn tập tin"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Sửa thông báo bạn thân"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Thông báo cho ai"
 
+msgid "_Account:"
+msgstr "Tài _khoản:"
+
 msgid "_Buddy name:"
 msgstr "Tên _bạn chát:"
 
@@ -12304,7 +12507,60 @@ msgstr "_Lặp lại"
 msgid "Pounce Target"
 msgstr "Đích thông báo"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Bắt đầu gõ phím"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Tạm dừng khi gõ phím"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Đăng nhập"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s hoạt động trở lại từ trạng thái nghỉ (%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "Có mặt trở lại"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "Dừng gõ phím"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Đăng xuất"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "Đã rơi vào trạng thái nghỉ"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Khi vắng mặt"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Gửi tin nhẳn"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Dữ kiện thông báo không rõ. Hãy ghi báo cáo việc này!"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "Sắc thái hình cười không giải nén được."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Sắc thái hình cười không giải nén được."
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "Sắc thái hình cười không giải nén được."
 
 msgid "Install Theme"
@@ -12326,6 +12582,12 @@ msgstr "Phím tắt"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Đóng cuộc th_oại dùng phím Esc"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "Danh sách bạn bè"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Biểu tượng trên khay"
 
@@ -12335,8 +12597,9 @@ msgstr "_Hiện biểu tượng trên khay:"
 msgid "On unread messages"
 msgstr "Khi có tin nhẳn chưa đọc"
 
-msgid "Conversation Window Hiding"
-msgstr "Ẩn cửa sổ cuộc thoại"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Cửa sổ cuộc thoại Tin Nhắn"
 
 msgid "_Hide new IM conversations:"
 msgstr "Ẩn cuộc t_hoại Tin Nhắn mới:"
@@ -12344,6 +12607,9 @@ msgstr "Ẩn cuộc t_hoại Tin Nhắn mới:"
 msgid "When away"
 msgstr "Khi vắng mặt"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Th_u nhỏ cửa sổ cuộc thoại mới"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Thẻ"
@@ -12402,9 +12668,6 @@ msgstr "Cuộn mịn"
 msgid "F_lash window when IMs are received"
 msgstr "Nhấp nhá_y cửa sổ khi nhận tin nhắn"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Th_u nhỏ cửa sổ cuộc thoại mới"
-
 msgid "Minimum input area height in lines:"
 msgstr "Bề cao vùng nhập tối thiểu theo dòng:"
 
@@ -12436,13 +12699,11 @@ msgstr "Không thể khởi chạy chương trình cấu hình máy phục vụ
 msgid "Cannot start browser configuration program."
 msgstr "Không thể khởi chạy chương trình cấu hình trình duyệt."
 
-msgid "ST_UN server:"
-msgstr "Máy phục vụ ST_UN:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Thí dụ : stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Tự động tìm r_a địa chỉ IP"
 
 msgid "Public _IP:"
@@ -12463,6 +12724,10 @@ msgstr "Cổng đầ_u :"
 msgid "_End port:"
 msgstr "Cổng cuố_i:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 msgid "Proxy Server &amp; Browser"
 msgstr "Máy phục vụ ủy nhiệm và Trình duyệt"
 
@@ -12491,6 +12756,10 @@ msgstr "Máy phục vụ ủy nhiệm"
 msgid "No proxy"
 msgstr "Không ủy nhiệm"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Người dùng:"
 
@@ -12661,12 +12930,12 @@ msgstr "Khi cả hai vắng mặt và nghỉ"
 msgid "Auto-away"
 msgstr "Tự động vắng mặt"
 
-msgid "Change status when _idle"
-msgstr "Đổi trạng thá_i khi nghỉ"
-
 msgid "_Minutes before becoming idle:"
 msgstr "Số _phút trước khi đi nghỉ:"
 
+msgid "Change status when _idle"
+msgstr "Đổi trạng thá_i khi nghỉ"
+
 msgid "Change _status to:"
 msgstr "Đổi t_rạng thái thành:"
 
@@ -12814,47 +13083,48 @@ msgstr "Lưu _và Dùng"
 msgid "Status for %s"
 msgstr "Trạng thái cho %s"
 
+#, fuzzy, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"Đã có một hình cười tự chọn cho lối tắt đã chọn. Hãy ghi rõ một lối tắt khác."
+
 msgid "Custom Smiley"
 msgstr "Hình cười tự chọn"
 
-msgid "More Data needed"
-msgstr "Cần thêm dữ liệu"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Hãy cung cấp một lối tắt cần liên quan đến hình cười đó."
-
 msgid "Duplicate Shortcut"
 msgstr "Nhân đôi lối tắt"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-"Đã có một hình cười tự chọn cho lối tắt đã chọn. Hãy ghi rõ một lối tắt khác."
-
-msgid "Please select an image for the smiley."
-msgstr "Hãy chọn một ảnh cho hình cười đó."
-
 msgid "Edit Smiley"
 msgstr "Sửa hình cười"
 
 msgid "Add Smiley"
 msgstr "Thêm hình cười"
 
-msgid "Smiley _Image"
-msgstr "Ảnh cườ_i"
+#, fuzzy
+msgid "_Image:"
+msgstr "Ả_nh"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "Lối tắt _hình cười"
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "Lối tắt"
 
 msgid "Smiley"
 msgstr "Hình cười"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Lối tắt"
+
 msgid "Custom Smiley Manager"
 msgstr "Bộ Quản lý Hình cười Tự chọn"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Chọn bạn chát"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Dùng biểu tượng bạn chát cho tài khoản này:"
 
@@ -12940,9 +13210,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Không thể gửi bộ khởi chạy"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Bạn đã kéo một bộ khởi chạy của môi trường. Rất có thể là bạn muốn gửi đích "
 "của bộ khởi chạy, hơn là bộ khởi chạy chính nó."
@@ -12977,6 +13248,16 @@ msgid ""
 msgstr ""
 "Không nạp được ảnh « %s »: không biết sao, rất có thể là tập tin ảnh bị hỏng"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "_Mở liên kết trong:"
+
+msgid "_Copy Link Location"
+msgstr "_Chép địa chỉ liên kết"
+
+msgid "_Copy Email Address"
+msgstr "_Chép địa chỉ thư"
+
 msgid "Save File"
 msgstr "Lưu tập tin"
 
@@ -13072,6 +13353,79 @@ msgstr "Phần bổ sung để dự đoán nếu liên lạc sẵn sàng chưa."
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Hiển thị thông tin thống kê về tình trạng có mặt của bạn bè"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Địa chỉ máy phục vụ"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Nhập máy phục vụ hội thảo"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Chọn một máy phục vụ hội thảo để hỏi"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Dịch vụ trực tuyến"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Gửi danh sách bạn bè"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Đi vắng"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Thư mục chứa sổ theo dõi"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Chọn âm thanh"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Dịch vụ PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Mô tả"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Thông tin phát hiện dịch vụ"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "Trình _duyệt:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Người dùng đó không tồn tại."
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Máy phục vụ không sử dụng bất kỳ phương thức xác thực được hỗ trợ nào"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Thông tin phát hiện dịch vụ"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Phần bổ sung này có ích để gỡ lỗi máy phục vụ hay trình khách kiểu XMPP."
+
 msgid "Buddy is idle"
 msgstr "Bạn chát đang nghỉ"
 
@@ -13461,9 +13815,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Phần bổ sung tin nhẳn nhạc để soạn nhạc một cách hợp tác."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Phần bổ sung tin nhẳn nhạc thì cho phép một số người dùng soạn cùng thời một "
 "bản nhạc bằng cách chỉnh sửa một bản dàn bè chung trong thời gian thực."
@@ -13577,12 +13932,6 @@ msgstr ""
 " • Đảo ngược mọi câu viết được gửi đến\n"
 " • Gửi tin cho thành viên có trong danh sách của bạn ngay khi họ kết nối"
 
-msgid "Cursor Color"
-msgstr "Màu con trỏ"
-
-msgid "Secondary Cursor Color"
-msgstr "Màu con trỏ phụ"
-
 msgid "Hyperlink Color"
 msgstr "Màu siêu liên kết"
 
@@ -13593,6 +13942,10 @@ msgstr "Màu siêu liên kết"
 msgid "Highlighted Message Name Color"
 msgstr "Màu tên tin nhẳn tô sáng"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Màu thông báo đang gõ"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Phân cách ngang GtkTreeView"
 
@@ -13622,35 +13975,24 @@ msgstr "Phông giao diện GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Sắc thái lối tắt văn bản GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Màu sắc giao diện"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Bật thông báo đang gõ"
 
-msgid "Widget Sizes"
-msgstr "Kích cỡ ô điều khiển"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Điều khiển sắc thái GTK+ Pidgin"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Đóng"
 
 msgid "Fonts"
 msgstr "Phông"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Công cụ tập tin Gtkrc"
 
@@ -13735,9 +14077,10 @@ msgid "Conversation Window Send Button."
 msgstr "Cái nút Gửi trong Cửa sổ Cuộc thoại."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Thêm một cái nút Gửi vào vùng nhập của cửa sổ cuộc thoát. Dự định cho trường "
 "hợp không có bàn phím vật lý."
@@ -13794,6 +14137,114 @@ msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Thay thế văn bản trong tin nhẳn gửi đi theo qui tắc người dùng định ra."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Chưa đăng nhập"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Chưa đăng nhập"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Tham gia Chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Lờ"
+
+#, fuzzy
+msgid "Founder"
+msgstr "To hơn"
+
+# Tên trình duyệt Web
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Cho phép"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Lỗi "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Thông tin"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Hộp thoại yêu cầu"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Mức cảnh báo"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Trạng thái cho %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Miền địa phương phòng chát"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Lưu biểu tượng"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Điều khiển sắc thái GTK+ Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Thông tin liên lạc"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Danh sách bạn bè"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Danh sách bạn bè"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Điều khiển sắc thái GTK+ Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Điều khiển sắc thái GTK+ Pidgin"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13955,17 +14406,15 @@ msgstr "_Giữ cửa sổ danh sách bạn bè phía trước"
 msgid "Only when docked"
 msgstr "Chỉ khi neo lại"
 
-msgid "_Flash window when chat messages are received"
-msgstr "Nhấp nhá_y cửa sổ khi nhận tin nhắn"
-
 msgid "Windows Pidgin Options"
 msgstr "Tùy chọn Pidgin Windows"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Tùy chọn riêng cho Pidgin trên Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Cung cấo thiết lập đặc biệt cho Windows Pidgin, chẳng hạn như neo danh sách "
 "bạn bè."
@@ -14008,6 +14457,557 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Phần bổ sung này có ích để gỡ lỗi máy phục vụ hay trình khách kiểu XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Không thể mở ổ cắm."
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Không thể lắng nghe trên ổ cắm"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Không thể đọc ổ cắm"
+
+#~ msgid "Connection failed."
+#~ msgstr "Lỗi kết nối."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Máy phục vụ đã ngắt kết nối"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Không thể tạo ổ cắm"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Không thể kết nối với máy phục vụ"
+
+#~ msgid "Read error"
+#~ msgstr "Lỗi đọc"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể thiết lập kết nối đến máy phục vụ :\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Lỗi ghi"
+
+#~ msgid "Last Activity"
+#~ msgstr "Hoạt động cuối cùng"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Thông tin phát hiện dịch vụ"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Mục phát hiện dịch vụ"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Đặt địa chỉ kiểu đoạn dòng mở rộng"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Chat đa người dùng"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Thông tin về mặt ở đã mở rộng cho chat đa người dùng"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Luồng byte bên trong dải"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Lệnh như thế"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Dịch vụ PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Luồng byte SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Dữ liệu bên ngoài dải"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Đăng ký bên trong dải"
+
+#~ msgid "User Location"
+#~ msgstr "Nơi ở người dùng"
+
+#~ msgid "User Avatar"
+#~ msgstr "Ảnh riêng người dùng"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Thông báo tình trạng chat"
+
+#~ msgid "Software Version"
+#~ msgstr "Phiên bản phần mềm"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Khởi tạo luồng"
+
+#~ msgid "User Mood"
+#~ msgstr "Tâm trạng người dùng"
+
+#~ msgid "User Activity"
+#~ msgstr "Hoạt động người dùng"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Khả năng thực thể"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Dàn xếp phiên bản đã mật mã"
+
+#~ msgid "User Tune"
+#~ msgstr "Điệu người dùng"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Trao đổi mục bản liệt kê"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Địa chỉ có thể tới"
+
+#~ msgid "User Profile"
+#~ msgstr "Lý lịch người dùng"
+
+# Name: don't translate/Tên: đừng dịch
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Âm thanh Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Tên hiệu người dùng"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Ảnh động Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Người nhận tin nhẳn"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Xuất bản khoá công"
+
+#~ msgid "User Chatting"
+#~ msgstr "Người dùng nói chuyện"
+
+#~ msgid "User Browsing"
+#~ msgstr "Người dùng duyệt"
+
+#~ msgid "User Gaming"
+#~ msgstr "Người dùng chơi trò"
+
+#~ msgid "User Viewing"
+#~ msgstr "Người dùng xem"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Mật mã đoạn dòng"
+
+#~ msgid "Entity Time"
+#~ msgstr "Thời gian thực thể"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Phát trễ"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Đối tượng dữ liệu hợp tác"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Kho lưu tập tin và chia sẻ"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Phát hiện dịch vụ STUN cho Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Dàn xếp phiên chạy mật mã đơn giản"
+
+#~ msgid "Hop Check"
+#~ msgstr "Kiểm tra bước"
+
+#~ msgid "Read Error"
+#~ msgstr "Lỗi đọc"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Không kết nối được với máy phục vụ."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Bộ đệm đọc đã đầy (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Thông điệp không thể phân tích"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Không thể kết nối đến máy: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Không đăng nhập được (%s)"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Bạn bị đăng xuất vì bạn cũng đăng nhập bằng một máy trạm khác."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Lỗi: chưa cài đặt khả năng hỗ trợ SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Mật khẩu sai."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể kết nối tới máy phục vụ BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Bạn có thể bị ngắt kết nối một thời gian ngắn. Hãy kiểm tra %s để cập "
+#~ "nhật."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Không thể kết nối"
+
+#~ msgid "Invalid username."
+#~ msgstr "Tên người dùng sai."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Không thể lấy thông tin về máy phục vụ"
+
+#~ msgid "Connection lost"
+#~ msgstr "Kết nối bị mất"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Không thể giải quyết máy"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Kết nối bị đóng (đang ghi)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Kết nối bị đặt lại"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Lỗi đọc từ ổ cắm: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Không thể kết nối đến máy"
+
+#~ msgid "Could not write"
+#~ msgstr "Không thể ghi"
+
+#~ msgid "Could not connect"
+#~ msgstr "Không thể kết nối"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Không thể tạo ổ cắm lắng nghe"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Không thể giải quyết tên máy"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Mật khẩu sai"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể thiết lập kết nối với %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Nhật bản"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Máy phục vụ nhắn tin Nhật bản"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Máy phục vụ truyền tập tin Nhật bản"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Mất kết nối với máy phục vụ\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Không thể giải quyết tên máy."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Máy phục vụ yêu cầu TLS/SSL để đăng nhập. Không tìm thấy khả năng hỗ trợ "
+#~ "TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Ẩn cửa sổ cuộc thoại"
+
+#~ msgid "More Data needed"
+#~ msgstr "Cần thêm dữ liệu"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Hãy cung cấp một lối tắt cần liên quan đến hình cười đó."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Hãy chọn một ảnh cho hình cười đó."
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Kích hoạt ID nào ?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Màu con trỏ"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Màu con trỏ phụ"
+
+#~ msgid "Interface colors"
+#~ msgstr "Màu sắc giao diện"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Kích cỡ ô điều khiển"
+
+#~ msgid "Invite message"
+#~ msgstr "Lời mời"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Hãy nhập tên người dùng mà bạn muốn mời,\n"
+#~ "kèm theo lời mời tùy ý."
+
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Không thể lấy Sổ địa chỉ MSN"
+
+#~ msgid "Connection to server lost (no data received within %d second)"
+#~ msgid_plural ""
+#~ "Connection to server lost (no data received within %d seconds)"
+#~ msgstr[0] ""
+#~ "Kết nối đến máy phục vụ bị mất (không nhận dữ liệu trong vòng %d giây)"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Bạn có thể bị ngắt kết nối một thời gian ngắn. Trong lúc chờ đợi lỗi được "
+#~ "sửa, bạn có thể sử dụng TOC. Hãy kiểm tra %s để cập nhật."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Thêm bạn thân"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Không thể lấy thông tin về máy phục vụ"
+
+#~ msgid "Keep alive error"
+#~ msgstr "Lỗi giữ cho kết nối hoạt động"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "Mất kết nối với máy phục vụ :\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Máy phục vụ kết nối"
+
+#~ msgid "Failed to send IM."
+#~ msgstr "Không gửi được tin nhắn."
+
+#, fuzzy
+#~ msgid "Not a member of room \"%s\"\n"
+#~ msgstr "Bạn [%d] đã được thêm vào nhóm « %d »"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Đang tra tìm %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Kết nối đến %s không được"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Đăng nhập: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Không thể ghi tập tin %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Không thể đọc tập tin %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Tin nhắn quá dài, %s byte cuối bị cắt ngắn."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s chưa đăng nhập."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Không cho phép cảnh báo cho %s."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr ""
+#~ "Một tin nhẳn không gửi đi được, bạn đang vượt quá tốc độ cho phép của máy "
+#~ "phục vụ."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Không có sẵn chát trong %s."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Bạn đang gửi tin nhẳn quá nhanh đến %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Bạn không nhận được tin nhắn từ %s vì nó quá lớn."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Bạn không nhận được tin nhắn từ %s vì nó được gửi quá nhanh."
+
+#~ msgid "Failure."
+#~ msgstr "Lỗi."
+
+#~ msgid "Too many matches."
+#~ msgstr "Quá nhiều kết quả trùng khớp."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Cần thêm từ hạn định"
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Tạm thời không có dịch vụ danh bạ."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Khả năng tra tìm địa chỉ thư điện tử bị hạn chế."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Từ khóa bị lờ đi."
+
+#~ msgid "No keywords."
+#~ msgstr "Không có từ khóa."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Người dùng không có thông tin danh bạ."
+
+#~ msgid "Country not supported."
+#~ msgstr "Quốc gia chưa được hỗ trợ."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Lỗi không rõ : %s."
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "Tên người dùng hay mật khẩu không đúng."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Tạm thời không có dịch vụ."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Mức cảnh báo của bạn hiện thời quá cao nên không đăng nhập được."
+
+#~ 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 ""
+#~ "Bạn đã liên tục kết nối và ngắt kết nối quá nhiều. Hẵy đợi 10 phút và kết "
+#~ "nối lại. Nếu bạn vẫn cố kết nối, bạn sẽ phải chờ lâu hơn."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Lỗi đăng nhập không rõ : %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr ""
+#~ "Lỗi không rõ : %d.\n"
+#~ "Thông tin: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Tên nhóm không hợp lệ"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Kết nối bị đóng"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Đợi hồi âm..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "TOC thôi trạng thái tạm ngừng. Bây giờ bạn có thể gửi tin nhẳn trở lại."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "Đổi mật khẩu thành công"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Lấy thông tin danh bạ"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Lập thông tin danh bạ"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Không thể mở %s để ghi !"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "Không truyền được tập tin; bên khác có thể đã hủy bỏ."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Không thể kết nối để truyền đi."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Không thể ghi phần đầu tập tin. Tập tin sẽ không được truyền."
+
+#~ msgid "Save As..."
+#~ msgstr "Lưu dạng..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s yêu cầu %s chấp nhận %d tập tin: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s yêu cầu bạn gửi tập tin"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Phần bổ sung giao thức TOC"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Hiện không có thông tin người dùng về %s"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Tùy chọn"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Tùy chọn ủy nhiệm"
+
+#~ msgid "By log size"
+#~ msgstr "Theo kích cỡ bản ghi"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Mở liên kết trong trình duyệt"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "Máy phục vụ ST_UN:"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "Ảnh cườ_i"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Lối tắt _hình cười"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "Nhấp nhá_y cửa sổ khi nhận tin nhắn"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "Một nhóm tên đó đã có."
 
@@ -14106,13 +15106,6 @@ msgstr ""
 #~ msgid "Change Qun information"
 #~ msgstr "Thông tin kệnh"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
 #~ msgid "System Message"
 #~ msgstr "Thông điệp hệ thống"
 
@@ -14231,9 +15224,6 @@ msgstr ""
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "Quản trị %2$d đã tán thành yêu cầu tham gia nhóm %1$d của bạn"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Nhóm này đã được thêm vào danh sách bạn bè của bạn"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Tôi muốn tham gia"
 
@@ -14264,9 +15254,6 @@ msgstr ""
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Không thể đăng nhập, hãy kiểm tra sổ theo dõi gỡ lỗi"
 
-#~ msgid "Unable to login"
-#~ msgstr "Không thể đăng nhập"
-
 #, fuzzy
 #~ msgid "Failed room reply"
 #~ msgstr "Không đăng nhập được, không có đáp ứng"
@@ -14300,9 +15287,6 @@ msgstr ""
 #~ msgid "Group Operation Error"
 #~ msgstr "Lỗi thao tác nhóm"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Lỗi yêu cầu hiệu bài đăng nhập"
-
 #~ msgid "TCP Address"
 #~ msgstr "Địa chỉ TCP"
 
diff --git a/po/xh.po b/po/xh.po
index 5576a20c69..6fd221081d 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-03-23 12:21+0200\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -33,7 +33,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -641,21 +641,6 @@ msgid "Send To"
 msgstr "_Thumela Njenge"
 
 #, fuzzy
-msgid "Invite message"
-msgstr "(umyalezo 1)"
-
-msgid "Invite"
-msgstr "Mema"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr ""
-"Nceda ufake igama lomsebenzisi onqwenela ukummema, ngokuhambisana nomyalezo "
-"ozikhethelayo wokumema."
-
-#, fuzzy
 msgid "Conversation"
 msgstr "Iincoko"
 
@@ -923,6 +908,42 @@ msgid "System Log"
 msgstr "Inkqubo yeNgxelo yokwenziweyo"
 
 #, fuzzy
+msgid "Calling ... "
+msgstr "Ukubala..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Yamkela"
+
+#, fuzzy
+msgid "Reject"
+msgstr "Ukumisela kwakhona"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+#, fuzzy
+msgid "You have rejected the call."
+msgstr "Wahlukanise isiqhagamselanisi%s %s"
+
+msgid "call: Make an audio call."
+msgstr ""
+
+#, fuzzy
 msgid "Emails"
 msgstr "I-imeyile"
 
@@ -960,6 +981,9 @@ msgstr "Ukunxulumana"
 msgid "IM"
 msgstr "I-IM"
 
+msgid "Invite"
+msgstr "Mema"
+
 #, fuzzy
 msgid "(none)"
 msgstr "(akukho gama)"
@@ -1183,7 +1207,6 @@ msgstr "I-%s ihambile. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "U-%s ufuna ukukuthumelela i-%s (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Isiganeko esingaziwayo sokutsiba. Nceda wenze ingxelo ngoku!"
 
@@ -1239,7 +1262,6 @@ msgstr "_Imizuzu phambi kokumisela ukungabikho:"
 msgid "Change status to"
 msgstr "Tshintsha iDilesi ukuya ku:"
 
-#. Conversations
 msgid "Conversations"
 msgstr "Iincoko"
 
@@ -1590,7 +1612,6 @@ msgstr ""
 "Xa incoko entsha ivulwa, yendlela yokungena iya kufaka incoko yokugqibela "
 "kwincoko yangoku."
 
-#, c-format
 msgid "Online"
 msgstr "Lukhona unxibelelwano"
 
@@ -1639,6 +1660,28 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+#, fuzzy
+msgid "TinyURL"
+msgstr "i-URL"
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 #, fuzzy
 msgid "accounts"
 msgstr "Ii-Akhawunti"
@@ -1742,14 +1785,6 @@ msgstr "Yamkela isimemo sokuncokola?"
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#. Number of actions
-msgid "Accept"
-msgstr "Yamkela"
-
-#, fuzzy
-msgid "Reject"
-msgstr "Ukumisela kwakhona"
-
 msgid "_View Certificate..."
 msgstr ""
 
@@ -1839,6 +1874,8 @@ msgstr "%s ibhalisiwe"
 msgid "+++ %s signed off"
 msgstr "%s iphumile"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Impazamo engaziwayo"
 
@@ -1887,6 +1924,18 @@ msgstr "I-%s ilishiyile igumbi."
 msgid "%s left the room (%s)."
 msgstr "I-%s ilishiyile igumbi (%s)."
 
+#, fuzzy
+msgid "Invite to chat"
+msgstr "Qalisa iNcoko"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Nceda ufake igama lomsebenzisi onqwenela ukummema, ngokuhambisana nomyalezo "
+"ozikhethelayo wokumema."
+
 #, fuzzy, c-format
 msgid "Failed to get connection: %s"
 msgstr "Akukwazekanga ukuseka ii-cmodes ze %s"
@@ -2026,7 +2075,7 @@ msgstr "Wamkela isicelo sokudlulisa ifayili esivela ku-%s?"
 msgid "Transfer of file %s complete"
 msgstr "uDluliso lwe %s lufezekile"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "File transfer complete"
 msgstr "Umququzeleli wokudlulisa ifayili"
 
@@ -2034,7 +2083,7 @@ msgstr "Umququzeleli wokudlulisa ifayili"
 msgid "You canceled the transfer of %s"
 msgstr "Ukurhoxisile ukudluliswa kwe-%s"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "File transfer cancelled"
 msgstr "Udluliso lwefayili seluqalile"
 
@@ -2220,11 +2269,14 @@ msgstr "<font color=\"red\"><b>Akukwazekanga ukufunda ifayili: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Impazamo yokudala unxibelelwano"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2640,7 +2692,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2692,7 +2744,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2721,6 +2773,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "UkuTshintsha i-Password"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2914,19 +2992,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. Creating the options for the protocol
 #, fuzzy
 msgid "First name"
 msgstr "iGama lokuQala:"
@@ -2964,6 +3041,11 @@ msgstr "Imithetho yokuSebenza yoNgeniso lweYahoo"
 msgid "Purple Person"
 msgstr "Umntu omTsha"
 
+#. Creating the options for the protocol
+#, fuzzy
+msgid "Local Port"
+msgstr "Ummandla"
+
 msgid "Bonjour"
 msgstr ""
 
@@ -2975,17 +3057,17 @@ msgstr "%s umenyiwe kule ncoko."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Akukwazeki ukuthumela umyalezo. Umyalezo mkhulu kakhulu."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Akukwazeki ukuvula isokethi"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Akukwazeki ukuyila isokethi"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Akukwazekanga ukuyila isokhethi"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Akukwazekanga ukuyila isokhethi"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Akukwazeki ukuyila isokethi"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3044,15 +3126,15 @@ msgstr "Thumela uLuhlu Lobuhlobo"
 msgid "Load buddylist from file..."
 msgstr "Ngenisa uLuhlu lomHlobo ukusuka kwiSeva"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "Ii-password ezintsha azingqamani."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3065,17 +3147,15 @@ msgstr "Impumelelo yoBhaliso"
 msgid "Password"
 msgstr "I-Password"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Ukuthunyelwa kwepassword"
+msgid "Password (again)"
+msgstr "I-Password (kwakhona)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "I-%s ayingenanga ngokwangoku."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Iyasebenza ngeli thuba"
+msgid "Captcha"
+msgstr "Gcina umFanekiso"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3137,6 +3217,18 @@ msgid "Current password"
 msgstr "I-Password ephosakeleyo."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Ukuthunyelwa kwepassword"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "I-%s ayingenanga ngokwangoku."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Iyasebenza ngeli thuba"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Nceda ufake i-password yakho yangoku kunye ne-password yakho entsha."
 
@@ -3152,13 +3244,13 @@ msgstr "Susa incoko kuluhlu lwakho lomhlobo"
 msgid "Add to chat..."
 msgstr "Yongeza iN_coko"
 
+#. Global
 msgid "Available"
 msgstr "Efumanekayo"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "Engekhoyo"
 
@@ -3190,7 +3282,8 @@ msgstr "Akukho baQuquzeleli banoNgqamaniso"
 msgid "There are no users matching your search criteria."
 msgstr "Nceda ufake i-password yakho entsha"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Akukwazeki ukufunda isokethi"
 
 #, fuzzy
@@ -3209,8 +3302,14 @@ msgstr "Bonisa umHlobo"
 msgid "Your buddy list was stored on the server."
 msgstr "Akukho Luhlu lomHlobo olugcinwe kwiseva yeGadu-Gadu."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Ukunxulumana"
+
+msgid "Connection failed"
 msgstr "Unxibelelwano luqhawukile"
 
 #, fuzzy
@@ -3221,6 +3320,15 @@ msgstr "Ngenela inCoko"
 msgid "Chat _name:"
 msgstr "iFani:"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Akukwazeki ukunika iseva isandi"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Ukunxulumana"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "ImPazamo efundiweyo"
@@ -3230,7 +3338,7 @@ msgid "This chat name is already in use"
 msgstr "Loo fayili sele ikhona"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "Ubuqhawukile kwiseva."
 
 #, fuzzy
@@ -3279,6 +3387,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr "I-Injini yeGadu-Gadu yokuKhangela"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Ulwazi oluMiselweyo lomSebenzisi..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Umyalelo ongaziwa: %s"
@@ -3295,7 +3407,7 @@ msgid "File Transfer Failed"
 msgstr "Udluliso lwefayili seluqalile"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "I-Pidgin ayikwazanga ukuvula isiqhagamsheli esimiselweyo."
 
 msgid "Error displaying MOTD"
@@ -3311,8 +3423,16 @@ msgstr "Akukho MOTD enxulumene nolu nxibelelwano."
 msgid "MOTD for %s"
 msgstr "I-MOTD ye%s"
 
-msgid "Server has disconnected"
-msgstr "Iseva iqhawule unxibelelwano"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Ubuqhawukile kwiseva."
 
 msgid "View MOTD"
 msgstr "Jonga iMOTD"
@@ -3323,25 +3443,24 @@ msgstr "I_siqhagamshelanisi:"
 msgid "_Password:"
 msgstr "I-_Password:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Izikhewu zeIRC kunokwenzeka zingabinazo izithuba ezimhlophe"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Ukunxulumana"
-
 msgid "SSL support unavailable"
 msgstr "Inkxaso engafumanekiyo yeSSL"
 
-msgid "Couldn't create socket"
-msgstr "Akukwazekanga ukuyila isokhethi"
+msgid "Unable to connect"
+msgstr "Akukwazeki ukunxulumana"
 
-msgid "Couldn't connect to host"
-msgstr "Akukwazekanga ukunxulumana nomququzeleli"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Akwazeki ukunxulumana neseva"
 
-msgid "Read error"
-msgstr "ImPazamo efundiweyo"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Impazamo yokudala unxibelelwano"
 
 msgid "Users"
 msgstr "Abasebenzisi"
@@ -3525,6 +3644,17 @@ msgid ""
 "invalid characters."
 msgstr ""
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, fuzzy, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "Loo fayili sele ikhona"
+
+#, fuzzy
+msgid "Nickname in use"
+msgstr "Igama lesiqhulo"
+
 msgid "Cannot change nick"
 msgstr "Akunokwenzeka ukutshintsha isikhewu"
 
@@ -3786,11 +3916,11 @@ msgid "execute"
 msgstr "Engalindelekanga"
 
 #, fuzzy
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Iseva ifuna i-SSL ukuze ingene"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Iseva ifuna i-SSL ukuze ingene"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3807,19 +3937,50 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Uqinisekiso lombhalo ocacileyo"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Ukuqinisekisa akuphumelelanga"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Impendulo engasebenziyo evela kwiseva."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Iseva ayisebenzisa nayiphi na indlela yokuxhasa uqinisekiso"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Ukucela umngeni okungasebenziyo okuvela kwiseva"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "ImPazamo efundiweyo"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+#, fuzzy
+msgid "No session ID given"
+msgstr "Akukho sizathu sinikiweyo."
+
+#, fuzzy
+msgid "Unsupported version of BOSH protocol"
+msgstr "INguqulelo engaXhaswanga"
+
+#, fuzzy
+msgid "Unable to establish a connection with the server"
+msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
+
+#, fuzzy
+msgid "Unable to establish SSL connection"
+msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
+
 msgid "Full Name"
 msgstr "iGama ngokuPheleleyo"
 
@@ -3889,187 +4050,9 @@ msgstr "Isixeko"
 msgid "Operating System"
 msgstr "UkuFihla iNkqubo yokuSebenza"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Misela uLwazi Ngqo"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "iDilesi Eyandisiweyo"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Ncokola noneLinye igama"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Umsebenzisi akanalo ulwazi ngovimba weefayili."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Umyalelo"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "i-HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Impazamo yoBhaliso"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Indawo"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Imo yesaZiso somHlobo"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "INguqulelo engaXhaswanga"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "iGama lomButho"
-
 #, fuzzy
-msgid "File Transfer"
-msgstr "uDlluliso lweFayili"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Izimo zomSebenzisi"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Umda womSebenzisi"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Izakhono"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Igama lomsebenzisi"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "Unaniselwano oluPhambili neIM"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Idilesi ye-iMeyile"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Ingqokelela yeempawu"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "I-Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Igama lesiqhulo"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "IVidiyo eSebenzayo"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Umyalezo wamkelwe"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "IQhosha likaWonke-wonke lomZila ongaCacanga"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Iindlela zokuKhetha zomSebenzisi"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Izimo zomSebenzisi"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Umda womSebenzisi"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Umda womSebenzisi"
-
-msgid "Ping"
-msgstr "I-Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "I-Trillian Encryption (umbhalo ontsonkothileyo)"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Izakhono"
+msgid "Local Time"
+msgstr "Abasebenzisi baseKhaya"
 
 #, fuzzy
 msgid "Priority"
@@ -4078,6 +4061,14 @@ msgstr "Isiqhagamsheli"
 msgid "Resource"
 msgstr "Uvimba"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Phuma"
+
 msgid "Middle Name"
 msgstr "iGama eliPhakathi"
 
@@ -4126,7 +4117,6 @@ msgstr "Incoko"
 msgid "Extended Away"
 msgstr "Ukungabikho okwandisiweyo"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Musa ukuPhazamisa"
 
@@ -4253,28 +4243,27 @@ msgstr "Khetha iseva yengqungquthela ukufa umbuzo"
 msgid "Find Rooms"
 msgstr "Fumana amaGumbi"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Ngokunye:"
 
-msgid "Write error"
-msgstr "Impazamo yokuBhala"
+#, fuzzy
+msgid "No users found"
+msgstr "Akukho baQuquzeleli banoNgqamaniso"
 
 #, fuzzy
-msgid "Ping timeout"
-msgstr "Umbhalo ocacileyo"
+msgid "Roles:"
+msgstr "INdima"
 
-msgid "Read Error"
-msgstr "Impazamo yokuFunda"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Umbhalo ocacileyo"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "Akukwazeki ukuyila isokethi"
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "ISazizi esingasebenziyo"
@@ -4282,6 +4271,10 @@ msgstr "ISazizi esingasebenziyo"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "Akukwazeki ukunxulumana neseva."
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Ubhaliso lwe %s@%s ngempumelelo"
@@ -4308,9 +4301,6 @@ msgstr "Impumelelo yoBhaliso"
 msgid "Unregistration Failed"
 msgstr "Ubhaliso aluphumelelanga"
 
-msgid "Already Registered"
-msgstr "Sewubhalisile"
-
 msgid "State"
 msgstr "Isimo"
 
@@ -4324,6 +4314,9 @@ msgstr "Ifowuni"
 msgid "Date"
 msgstr "Umhla"
 
+msgid "Already Registered"
+msgstr "Sewubhalisile"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Bhalisa"
@@ -4356,6 +4349,10 @@ msgid "Change Registration"
 msgstr "Impazamo yoBhaliso"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Akukwazeki ukunxulumana neseva."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Impazamo Ukutshintsha Iinkcukacha ze-akhawunti"
 
@@ -4375,9 +4372,18 @@ msgstr "Ukuqinisekisa"
 msgid "Re-initializing Stream"
 msgstr "Ukuphinda uqalise umjelo"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "Engagunyaziswanga"
 
+msgid "Mood"
+msgstr "Isimo"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "Zombini"
 
@@ -4399,12 +4405,6 @@ msgstr "Akukho nto"
 msgid "Subscription"
 msgstr "Umrhumo"
 
-msgid "Mood"
-msgstr "Isimo"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "Isimo"
@@ -4452,9 +4452,6 @@ msgstr "I-password yakho itshintshile."
 msgid "Error changing password"
 msgstr "ImPazamo yokutshintsha i-password"
 
-msgid "Password (again)"
-msgstr "I-Password (kwakhona)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "UkuTshintsha i-Password"
@@ -4650,19 +4647,27 @@ msgstr "Akukwazeki ukususa i-%s yomsebenzisi"
 msgid "Unable to ping user %s"
 msgstr "Akukwazeki ukugxotha i-%s yomsebenzisi"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
+"Akukwazeki ukudlala isandi ngenxa yokuba ifayili ekhethiweyo (%s) ayikho."
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
 msgstr ""
+"Akukwazeki ukudlala isandi ngenxa yokuba ifayili ekhethiweyo (%s) ayikho."
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr ""
 "Akukwazeki ukudlala isandi ngenxa yokuba ifayili ekhethiweyo (%s) ayikho."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4673,9 +4678,39 @@ msgstr "Tsala umnxeba!!"
 msgid "%s has buzzed you!"
 msgstr "Umsebenzisi ukuthintele"
 
-#, c-format
-msgid "Buzzing %s..."
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "Akukwazeki ukuthumela umyalezo kwi-%s:"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+"Akukwazeki ukuthumela ifayili ku-%s, umsebenzisi akaxhasi ukudluliswa "
+"kwefayili"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
+"Akukwazeki ukuthumela ifayili ku-%s, umsebenzisi akaxhasi ukudluliswa "
+"kwefayili"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "Ubhaliso aluphumelelanga"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "Nceda ubhale igama leskrini lomntu onqwenela ukubona ulwazi ngaye."
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "Khetha ifayili"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "Qalisa iNcoko"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Misela inkqubo yegumbi lencoko."
@@ -4697,13 +4732,13 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;umsebenzisi&gt; [igumbi]:  Thintela umsebenzisi kwigumbi."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4773,6 +4808,9 @@ msgstr "UkuNxulumana neSeva"
 msgid "File transfer proxies"
 msgstr "IsiQhagamshelanisi sokudlulisa ifayili"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4812,6 +4850,14 @@ msgstr "Impazamo yokwaHlula i-XML ngeziJungqe"
 msgid "Unknown Error in presence"
 msgstr "Ubukho bempazamo engaziwayo"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Impazamo yokungenela incoko eyi%s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Impazamo kwincoko ye%s"
+
 msgid "Create New Room"
 msgstr "Ukuyila iGumbi eliTsha"
 
@@ -4830,13 +4876,32 @@ msgstr "ISimo seGumbi"
 msgid "_Accept Defaults"
 msgstr "Yamkela eziMiselweyo"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Impazamo yokungenela incoko eyi%s"
+#, fuzzy
+msgid "No reason"
+msgstr "Akukho sizathu sinikiweyo."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Impazamo kwincoko ye%s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Ukhatyiwe yi-%s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Ukukhatywa nge %s (%s)"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "Kwenzeke impazamo xeshikweni uvula ifayili."
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "Udluliso lwefayili seluqalile"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "Akuphumelelekanga ukugcina umfanekiso: %s\n"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4868,10 +4933,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Nceda ubhale igama leskrini lomntu onqwenela ukubona ulwazi ngaye."
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "Khetha ifayili"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "Izimo zomSebenzisi"
 
@@ -4911,9 +4972,20 @@ msgstr "Ii-Akhawunti"
 msgid "Select an action"
 msgstr "Khetha ifayili"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Akukwazeki ukufunda ifayili %s."
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Akukwazeki ukuKhupha uLuhlu lobuhlobo"
+msgid "Buddy Add error"
+msgstr "Impazamo yoLuhlu lomHlobo"
+
+#, fuzzy
+msgid "The username specified does not exist."
+msgstr "Ulungiselelo olutsha alusebenzi."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5143,7 +5215,7 @@ msgstr "Ipaspothi yabantwana ngaphandle kwemvume yabazali"
 msgid "Passport account not yet verified"
 msgstr "I-akhawunti yepaspoti ayikaqinisekiswa"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "I-akhawunti yepaspoti ayikaqinisekiswa"
 
@@ -5167,6 +5239,10 @@ msgstr "Indibano eKhethekayo"
 msgid "Non-IM Contacts"
 msgstr "Susa umQhagamshelanisi"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5238,6 +5314,13 @@ msgstr "Thumela umyalezo ngefowuni ohamba nayo."
 msgid "Page"
 msgstr "Iphepha"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "Lumkisa"
+
 msgid "Has you"
 msgstr "Unawe"
 
@@ -5281,6 +5364,14 @@ msgid "Album"
 msgstr ""
 
 #, fuzzy
+msgid "Game Title"
+msgstr "Isihloko"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "Isihloko"
+
+#, fuzzy
 msgid "Set Friendly Name..."
 msgstr "Misela iGama Lobuhlobo"
 
@@ -5323,10 +5414,6 @@ msgstr ""
 "yeSSL. Jonga kwi-http://Pidgin.sf.net/faq-ssl.php ukuzuza iinkcukacha ezithe "
 "vetshe."
 
-#, fuzzy
-msgid "Failed to connect to server."
-msgstr "Akukwazeki ukunxulumana neseva."
-
 msgid "Error retrieving profile"
 msgstr "Impazamo yokufumana inkangeleko"
 
@@ -5502,8 +5589,9 @@ msgstr ""
 "U-Pidgin akalufumananga ulwazi kwifayili yomsebenzisi. Mhlawumbi umsebenzisi "
 "akakho."
 
-msgid "Profile URL"
-msgstr "Ifayili yoBuqu yeURL"
+#, fuzzy
+msgid "View web profile"
+msgstr "Akuvumelekanga xa kungekho unxulumano"
 
 #. *< type
 #. *< ui_requirement
@@ -5540,71 +5628,29 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Uqinisekiso lwesiqhelo aluphumelelanga!"
 
 #, fuzzy, c-format
-msgid "%s is not a valid group."
-msgstr "%s asililo igama elisebenzayo legumbi"
-
-#, fuzzy
-msgid "Unknown error."
-msgstr "Impazamo engaziwayo"
-
-#, fuzzy, c-format
-msgid "%s on %s (%s)"
-msgstr "Abasebenzisi be %s: %s"
-
-#, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "U-%s ufuna ukukuthumelela i-%s (%s)"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Impazamo engaziwayo"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Akukwazeki ukugxotha i-%s yomsebenzisi"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
 #, fuzzy, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Akwazeki ukongeza umsebenzisi kuluhlu lwabucala (%s)."
-
-#, fuzzy, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Akukwazeki ukususa i-%s yomsebenzisi"
-
-#, fuzzy, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Akukwazeki ukumema umsebenzisi (%s)."
+msgid "Unknown error (%d)"
+msgstr "Impazamo engaziwayo"
 
-#, fuzzy, c-format
-msgid "%s could not be added because your buddy list is full."
+msgid "The following users are missing from your addressbook"
 msgstr ""
-"Umyalezo ubungenakuthunyelwa ngenxa yokuba umsebenzisi akakho kunxulumano:"
-
-#, fuzzy, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s asililo igama elisebenzayo leseva"
-
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Inkonzo ayiFumaneki okweThutyana"
 
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 "Umyalezo ubungenakuthunyelwa ngenxa yokuba umsebenzisi akakho kunxulumano:"
 
-#, fuzzy
-msgid "Unable to rename group"
-msgstr "Akukwazeki ukufunda"
-
-#, fuzzy
-msgid "Unable to delete group"
-msgstr "Akukwazeki ukuyila isokethi"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5651,9 +5697,6 @@ msgstr "Umyalezo kunokwenzeka awuthunyelwanga ngenxa yempazamo engaziwayo:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Umyalezo kunokwenzeka awuthunyelwanga ngenxa yempazamo engaziwayo:"
 
-msgid "Unable to connect"
-msgstr "Akukwazeki ukunxulumana"
-
 #, fuzzy
 msgid "Writing error"
 msgstr "Impazamo yokuBhala"
@@ -5669,14 +5712,15 @@ msgid ""
 msgstr "Impazamo engaziwayo kwiseva ngama %s"
 
 #, fuzzy
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr "Lo mthetho wokusebenza awuwaxhasi amagumbi encoko."
 
 #, fuzzy
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr "Impazamo yokubonisa iMOTD"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Usayine ukwenye indawo."
 
 #, fuzzy
@@ -5685,7 +5729,8 @@ msgstr ""
 "Uluhlu lwakho lweMSN lomhlobo %s alifumaneki okwethutyana. Nceda uzame "
 "kwakhona."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Iiseva zeMSN ziza kucima okwethutyana."
 
 #, fuzzy, c-format
@@ -5720,6 +5765,14 @@ msgstr "Thumela ngeFowuni oHamba nayo"
 msgid "Retrieving buddy list"
 msgstr "Ukukhupha uluhlu lobuhlobo"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Kude kwiKhompyutha"
 
@@ -5762,14 +5815,6 @@ msgstr "Umyalezo ubungenakuthunyelwa ngenxa yempazamo eyenzeke e-switch-board:"
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Umyalezo kunokwenzeka awuthunyelwanga ngenxa yempazamo engaziwayo:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Yongeza kwiNcwadi yeDilesi"
@@ -5778,13 +5823,6 @@ msgstr "Yongeza kwiNcwadi yeDilesi"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Ingaba ufuna ukongeza lo mhlobo kuluhlu lwakho lomhlobo?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, fuzzy, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Akukwazeki ukufunda ifayili %s."
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "Ulungiselelo olutsha alusebenzi."
@@ -5792,6 +5830,9 @@ msgstr "Ulungiselelo olutsha alusebenzi."
 msgid "This Hotmail account may not be active."
 msgstr ""
 
+msgid "Profile URL"
+msgstr "Ifayili yoBuqu yeURL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5806,18 +5847,68 @@ msgstr ""
 msgid "MSN Protocol Plugin"
 msgstr "Imithetho yokuSebenza yokuNgenisa i-AIM/ICQ"
 
-msgid "Missing Cipher"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s is not a valid group."
+msgstr "%s asililo igama elisebenzayo legumbi"
 
-msgid "The RC4 cipher could not be found"
+#, fuzzy
+msgid "Unknown error."
+msgstr "Impazamo engaziwayo"
+
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
+msgstr "Abasebenzisi be %s: %s"
+
+#, fuzzy, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Akwazeki ukongeza umsebenzisi kuluhlu lwabucala (%s)."
+
+#, fuzzy, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Akukwazeki ukususa i-%s yomsebenzisi"
+
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Akukwazeki ukumema umsebenzisi (%s)."
+
+#, fuzzy, c-format
+msgid "%s could not be added because your buddy list is full."
 msgstr ""
+"Umyalezo ubungenakuthunyelwa ngenxa yokuba umsebenzisi akakho kunxulumano:"
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, fuzzy, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s asililo igama elisebenzayo leseva"
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Inkonzo ayiFumaneki okweThutyana"
+
+#, fuzzy
+msgid "Unable to rename group"
+msgstr "Akukwazeki ukufunda"
+
+#, fuzzy
+msgid "Unable to delete group"
+msgstr "Akukwazeki ukuyila isokethi"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
 #, fuzzy
+msgid "User lookup"
+msgstr "AmaGumbi omSebenzisi"
+
+#, fuzzy
 msgid "Reading challenge"
 msgstr "Ukufunda idata"
 
@@ -5829,13 +5920,23 @@ msgstr "Ukucela umngeni okungasebenziyo okuvela kwiseva"
 msgid "Logging in"
 msgstr "Ukungena"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "Alikho igama leskrini elinikiweyo."
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr "Ubuqhawukile kwiseva."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Umyalezo omtstha wokungabikho"
@@ -5856,21 +5957,22 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "Alikho igama leskrini elinikiweyo."
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "Iifestile ze-_IM"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connected"
-msgstr "Ukunxulumana"
+msgid "Add contacts from server"
+msgstr "Impendulo engasebenziyo evela kwiseva."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
@@ -5878,16 +5980,23 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Isiqhulo okanye ipassword ephosakeleyo."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "Ukugqibezela uNxulumano"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Akuphumelelanga ukudibana nomhlobo kwincoko"
 
@@ -5899,14 +6008,6 @@ msgstr "Ngenisa uLuhlu lomHlobo ukusuka kwiSeva"
 msgid "persist command failed"
 msgstr "IZiko loThungelwano alisebenzi"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "AmaGumbi omSebenzisi"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Akuphumelelanga ukudibana nomhlobo kwincoko"
@@ -5918,39 +6019,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "IZiko loThungelwano alisebenzi"
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "Ukugqibezela uNxulumano"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Ukrozo luzele"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Akukwazeki ukwahlula umyalezo ngezijungqe"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Akukwazekanga ukunxulumana nomququzeleli"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "Iifestile ze-_IM"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "Impendulo engasebenziyo evela kwiseva."
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5998,9 +6076,6 @@ msgstr "Umbhalo omKhudlwana"
 msgid "User"
 msgstr "Abasebenzisi"
 
-msgid "Profile"
-msgstr "Inkangeleko"
-
 #, fuzzy
 msgid "Headline"
 msgstr "Landula"
@@ -6016,15 +6091,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "Vala iNcoko"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "Alikho igama leskrini elinikiweyo."
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -6037,6 +6107,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "Lo mxholo awunazo izinto ezincumisayo ezifumanekayo."
@@ -6045,6 +6118,14 @@ msgstr "Lo mxholo awunazo izinto ezincumisayo ezifumanekayo."
 msgid "Please try another username:"
 msgstr "Nceda ufake igama elitsha leqela elikhethiweyo."
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "Alikho igama leskrini elinikiweyo."
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6242,10 +6323,6 @@ msgid "Master archive is misconfigured"
 msgstr "Uvimba oyi-archive unengxaki"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Isiqhulo okanye ipassword ephosakeleyo."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Akukwazekanga ukuqaphela umququzeleli wegama lomsebenzisi elifakweyo"
 
@@ -6290,9 +6367,9 @@ msgstr "Mhlawumbe umsebenzisi usebenza engekho kuthungelwano okanye uthintelwe"
 msgid "Unknown error: 0x%X"
 msgstr "Impazamo engaziwayo: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Ukungena akuphumelelanga (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Akukwazeki ukugxotha i-%s yomsebenzisi"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6397,9 +6474,6 @@ msgstr "Ingqungquthela yeGroupWise %d"
 msgid "Authenticating..."
 msgstr "Ukuqinisekisa..."
 
-msgid "Unable to connect to server."
-msgstr "Akukwazeki ukunxulumana neseva."
-
 msgid "Waiting for response..."
 msgstr "Ukulinda impendulo..."
 
@@ -6423,9 +6497,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Ingaba unqwenela ukungenela incoko?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Ukhutshiwe ngenxa yokuba ubungene kwesinye isikhululo."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6433,17 +6504,14 @@ msgstr ""
 "%s ukhangeleka engekho kunxibelelwano ngako ke akawufumananga umyalezo "
 "osandula ukuwuthumela."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Akukwazeki ukunxulumana neseva. Nceda ufake idilesi yeseva ofuna "
 "ukunxibelelana kuyo."
 
-msgid "Error. SSL support is not installed."
-msgstr "Impazamo. Inkxaso yeSSL ayifakelwanga."
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ingqungquthela ivaliwe. Akusekho miyalezo inokuthunyelwa."
 
@@ -6467,6 +6535,26 @@ msgid "Server port"
 msgstr "Isiqhagamshelisi seseva"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Impendulo engasebenziyo evela kwiseva."
+
+#. username connecting too frequently
+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 ""
+"Ubungena uphuma kunxibelelwano ngamaxa amaninzi kakhulu. Yima imizuzu "
+"elishumi ze uzame kwakhona. Ukuba uyaqhubeka ukuzama, kuya kufuneka ulinde "
+"ixesha elidana nangakumbi."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Impazamo yokudala unxibelelwano"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Akukwazeki ukunxulumana"
 
@@ -6475,17 +6563,7 @@ msgid "Invalid chat room name"
 msgstr "iGama elingaSebenziyo leGumbi"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Impazamo yokudala unxibelelwano"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Ubuqhawukile kwiseva."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
 
 #. *< type
@@ -6538,8 +6616,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6710,23 +6789,18 @@ msgstr "Ikhamera"
 msgid "Screen Sharing"
 msgstr "iGama leSkrini"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "Ukukhululeka Ukuba ungaNcokola"
 
-#, c-format
 msgid "Not Available"
 msgstr "Akufumaneki"
 
-#, c-format
 msgid "Occupied"
 msgstr "Uxakekile"
 
-#, c-format
 msgid "Web Aware"
 msgstr "Ukuqaphela iwebhu ye-Intanethi"
 
-#, c-format
 msgid "Invisible"
 msgstr "Engabonakaliyo"
 
@@ -6740,16 +6814,12 @@ msgid "Buddy Comment"
 msgstr "Izimvo zomHlobo"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Akukwazekanga ukunxibelelana ukuze kudluliswe."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Akukwazeki ukunxulumana neseva."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Akwazeki ukunxulumana neseva"
 
 #, fuzzy
 msgid "Username sent"
@@ -6764,53 +6834,66 @@ msgstr "Ukugqibezela uNxulumano"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Akukwazeki ukungena: Akwazekanga ukungena %s ngenxa yokuba igama leskrini "
 "alisebenzi.  Amagama eskrini kufuneka aqale ngoonombumba okanye abe "
 "nonobumba kuphela, amanani nezithuba, okanye amanani kuphela."
 
-#. Unregistered screen name
-#. uid is not exist
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Kunokwenzeka ukhutshwe kunxibelelwano kungekudala.  Mhlawumbi unokufuna "
+"ukusebenzisa uTOC kude kube oku kulungisiwe. Hlola u %s malunga nokuhlaziya."
+
 #, fuzzy
-msgid "Invalid username."
-msgstr "IGama lomSebenzisi elingaSebenziyo"
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+"U-Pidgin akakwazanga ukufumana iqhosha elisebenzayo le-hesh yokungena lakwa-"
+"AIM."
 
-msgid "Incorrect password."
-msgstr "I-Password ephosakeleyo."
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "U-Pidgin akakwazanga ukufumana ihesh yokungena esebenzayo."
+
+msgid "Received authorization"
+msgstr "Wamkele uGunyaziso"
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Akakho umsebenzisi onjalo"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "I-akhawunti yakho ngokwangoku ixhonyiwe."
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Inkonzo yeAOL Instant Messenger ayifumaneki okwethutyana."
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Inguqulelo umxumi ayisebenzisayo indala kakhulu. Nceda uyihlaziye e%s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Ubungena uphuma kunxibelelwano ngamaxa amaninzi kakhulu. Yima imizuzu "
 "elishumi ze uzame kwakhona. Ukuba uyaqhubeka ukuzama, kuya kufuneka ulinde "
 "ixesha elidana nangakumbi."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Inguqulelo umxumi ayisebenzisayo indala kakhulu. Nceda uyihlaziye e%s"
-
-msgid "Could Not Connect"
-msgstr "Akukwazeki ukunxulumana"
-
-msgid "Received authorization"
-msgstr "Wamkele uGunyaziso"
-
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "Ulungiselelo olutsha alusebenzi."
 
 msgid "Enter SecurID"
 msgstr ""
@@ -6825,30 +6908,6 @@ msgstr ""
 msgid "_OK"
 msgstr "Kulungile"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Kunokwenzeka ukhutshwe kunxibelelwano kungekudala.  Mhlawumbi unokufuna "
-"ukusebenzisa uTOC kude kube oku kulungisiwe. Hlola u %s malunga nokuhlaziya."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-"U-Pidgin akakwazanga ukufumana iqhosha elisebenzayo le-hesh yokungena lakwa-"
-"AIM."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Kunokwenzeka ukhutshwe kunxibelelwano kungekudala.  Mhlawumbi unokufuna "
-"ukusebenzisa uTOC kude kube oku kulungisiwe. Hlola u %s malunga nokuhlaziya."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "U-Pidgin akakwazanga ukufumana ihesh yokungena esebenzayo."
-
 msgid "Password sent"
 msgstr "Ukuthunyelwa kwepassword"
 
@@ -6985,7 +7044,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Uphose umyalezo %hu ovela ku %s ngenxa yesizathu esingaziwayo."
 msgstr[1] "Uphose imiyalezo %hu evela ku %s ngenxa yesizathu esingaziwayo."
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Akukwazeki ukuthumela umyalezo: %s:"
@@ -7007,6 +7066,12 @@ msgstr "Kunxibelelwano ukusuka"
 msgid "Member Since"
 msgstr "Lilungu ukusukela"
 
+msgid "Capabilities"
+msgstr "Izakhono"
+
+msgid "Profile"
+msgstr "Inkangeleko"
+
 msgid "Your AIM connection may be lost."
 msgstr "Kunokwenzeka unxibelelwano lwakho no-AIM lulahlekile."
 
@@ -7190,7 +7255,7 @@ msgstr "Umyalezo wokungabikho mde kakhulu."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7218,9 +7283,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Iinkedama"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Akukwazekanga ukongeza umhlobo %s ngenxa yokuba unabahlobo abaninzi kakhulu "
@@ -7230,7 +7295,7 @@ msgid "(no name)"
 msgstr "(akukho gama)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Umyalelo wakho awuphumelelanga ngenxa yesizathu esingaziwayo."
 
 #, fuzzy, c-format
@@ -7305,6 +7370,7 @@ msgstr "Ukunxulumana"
 msgid "Get AIM Info"
 msgstr "Fumana uLwazi"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Hlela uLuvo lomHlobo"
 
@@ -7370,6 +7436,7 @@ msgstr "Khangela"
 msgid "Set User Info (web)..."
 msgstr "ULwazi oluMiselweyo lomSebenzisi (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Tshintsha i-Password (URL)"
@@ -7405,6 +7472,10 @@ msgstr "Zingela umHlobo nge-Imeyile..."
 msgid "Search for Buddy by Information"
 msgstr "Zingela umHlobo ngoLwazi"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Umsebenzisi akangenanga"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7422,7 +7493,7 @@ msgstr "Ukucela %s to connect to us at %s:%hu IM ethe Ngqo."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Ukuzama ukunxulumana ne %s kwi %s:%hu malung ne IM Ngqo."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Attempting to connect via proxy server."
 msgstr "Ukuzama ukunxulumana ne %s kwi %s:%hu malung ne IM Ngqo."
 
@@ -7532,7 +7603,7 @@ msgstr "I-Opera"
 msgid "Visible"
 msgstr "Engabonakaliyo"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7628,17 +7699,51 @@ msgstr "Igqibele ukuHlaziywa"
 msgid "Could not change buddy information."
 msgstr "Nceda ufake umhlobo wokutsibela."
 
-#, c-format
-msgid "%d needs Q&A"
+#, fuzzy
+msgid "Mobile"
+msgstr "Ifowuni ohamba nayo"
+
+msgid "Note"
+msgstr "Inqaku"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "UmFanekiso ongumQondiso womHlobo"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Yongeza umHlobo"
+msgid "_Modify"
+msgstr "_Lungisa"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "_Lungisa"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "Iseva ixakekile"
+
+msgid "Your request was accepted."
+msgstr ""
 
-msgid "Input answer here"
+msgid "Your request was rejected."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "Isicelo soGunyaziso"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "Yongeza umhlobo kuluhlu lwakho?"
+
+#, fuzzy
+msgid "Enter answer here"
+msgstr "Akukwazeki ukuthumela uvimba weefayili."
+
 msgid "Send"
 msgstr "Thumela"
 
@@ -7650,19 +7755,20 @@ msgstr "I-password ayisebenzi"
 msgid "Authorization denied message:"
 msgstr "Umyalezo wokuLandula uGunyaziso:"
 
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "Uqinisekiso lombhalo ocacileyo"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Yongeza umhlobo kuluhlu lwakho?"
 
-msgid "Input request here"
-msgstr ""
+#, fuzzy
+msgid "Enter request here"
+msgstr "Ngena kwiSeva yeNgqungquthela"
 
 #, fuzzy
 msgid "Would you be my friend?"
@@ -7685,7 +7791,7 @@ msgid "Failed sending authorize"
 msgstr "Nceda undigunyazise!"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "Akuphumelelanga ukudibana nomhlobo kwincoko"
 
 #, fuzzy, c-format
@@ -7731,6 +7837,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr ""
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "ImiMiselo engasebenziyo yomQobo"
+
+#, fuzzy
 msgid "Not member"
 msgstr "Lilungu ukusukela"
 
@@ -7775,15 +7885,18 @@ msgstr ""
 msgid "Join QQ Qun"
 msgstr "Ngenela iNcoko"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
+msgid "Input request here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Inombolo yeFowuni"
+
 msgid "Successfully joined Qun"
 msgstr ""
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 #, fuzzy
@@ -7794,7 +7907,7 @@ msgstr "Ezinokukhethwe kwiSandi"
 msgid "Failed:"
 msgstr "Akuphumelelanga"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7806,11 +7919,12 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr ""
 
-msgid "Sorry, you are not our style ..."
-msgstr ""
+#, fuzzy
+msgid "Sorry, you are not our style"
+msgstr "Uxolo, ndibalekele ucuntsu!"
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "Inombolo yeFowuni"
 
 #, fuzzy
@@ -7821,7 +7935,7 @@ msgid "You have successfully created a Qun"
 msgstr ""
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "Ingaba unqwenela ukungenela incoko?"
 
 #, fuzzy
@@ -7829,28 +7943,28 @@ msgid "Setup"
 msgstr "_Misela"
 
 #, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr ""
 
 #, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Akuphumelelanga ukudibana nomhlobo kwincoko"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "Susa umHlobo"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "Susa umHlobo"
 
 #, fuzzy, c-format
 msgid "Unknown-%d"
@@ -7970,6 +8084,13 @@ msgstr "<b>UmSebenzisi:</b> %s<br>"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Elinye igama:</b> %s<br>"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>UmSebenzisi:</b> %s<br>"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7977,7 +8098,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "Malunga nePidgin"
 
 #, fuzzy
@@ -7998,6 +8119,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "Malunga nePidgin"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "Idilesi yaseKhaya"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8029,7 +8154,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "Ukunxulumana"
@@ -8042,6 +8166,9 @@ msgstr "Bonisa ezimbalwa ezinokukhethwa"
 msgid "Show server news"
 msgstr "Bonisa ezimbalwa ezinokukhethwa"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "ImPazamo efundiweyo"
@@ -8051,11 +8178,7 @@ msgid "Update interval (seconds)"
 msgstr "ImPazamo efundiweyo"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Akukwazeki ukufumana ulwazi ngeseva"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Akukwazeki ukufumana ulwazi ngeseva"
 
 #, c-format
@@ -8078,21 +8201,19 @@ msgid "Activation required"
 msgstr "Kufuneka uBhaliso"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Keep alive error"
-msgstr "ImPazamo efundiweyo"
-
-msgid "Requesting captcha ..."
-msgstr ""
+msgid "Requesting captcha"
+msgstr "Isicelo simbaxa"
 
-msgid "Checking code of captcha ..."
+msgid "Checking captcha"
 msgstr ""
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "U-Yahoo akaphumelelanga! Ukunyanisekisa"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -8102,7 +8223,7 @@ msgstr "Gcina umFanekiso"
 msgid "Enter code"
 msgstr "UkuTshintsha i-Password"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -8110,69 +8231,43 @@ msgid "Enter the text from the image"
 msgstr "Nceda ufake igama leqela elimele ukongezwa."
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Akukwazeki ukunxulumana."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Impazamo engaziwayo"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr "Ubuqhawukile kwiseva."
-
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Akukwazeki ukufunda isokethi"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Impazamo yokuBhala"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Unxibelelwano luvaliwe"
-
-#, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "Ulwazi oluMiselweyo lomSebenzisi..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "Isicelo silandulwe"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Akukwazekanga ukunxulumana nomququzeleli"
+msgid "Unable to resolve hostname"
+msgstr "Akukwazeki ukunika iseva isandi"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Igama lomsebenzisi okanye ipassword zezingasebenziyo"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "UkuNxulumana neSeva"
+msgid "Connecting to server"
+msgstr "Ukunxibelelana neSeva yeSILC"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "Impazamo yokuFunda"
 
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "Akuphumelelanga ukungenela incoko"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -8182,6 +8277,10 @@ msgid ""
 msgstr "Ukuthumela kweSeva kwi-ICQ"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "Abasebenzisi be %s: %s"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "Ukusuka"
 
@@ -8191,32 +8290,30 @@ msgid ""
 "%s"
 msgstr "Ulwazi ngeSeva"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "Isizathu esingaziwayo."
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Umyalelo"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Akukwazeki ukufumana ulwazi ngeseva"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "Isizathu esingaziwayo."
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "Isizathu esingaziwayo."
 
 #, fuzzy, c-format
@@ -8231,10 +8328,6 @@ msgstr "AkuPhumelelenga ukuThumela iFayili"
 msgid "%d canceled the transfer of %s"
 msgstr "%s icime udluliso lwe %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Unxibelelwano luvaliwe"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>UmSebenzisi:</b> %s<br>"
@@ -8296,19 +8389,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Unxibelelwano luvaliwe"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Impazamo xeshikweni kufundwa kwi-sokhethi."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Akwazeki ukunxulumana neseva"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8336,6 +8416,10 @@ msgid "Video Camera"
 msgstr "InCoko ngeVidiyo"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "uDlluliso lweFayili"
+
+#, fuzzy
 msgid "Supports"
 msgstr "inkxaso"
 
@@ -9075,9 +9159,6 @@ msgstr "iGama lomButho"
 msgid "Unit"
 msgstr "Icandelo loMbutho"
 
-msgid "Note"
-msgstr "Inqaku"
-
 msgid "Join Chat"
 msgstr "Ngenela iNcoko"
 
@@ -9180,6 +9261,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Ingqokelela yamaNani oThungelwano"
 
+msgid "Ping"
+msgstr "I-Ping"
+
 msgid "Ping failed"
 msgstr "Isilumkiso asiphumelelanga"
 
@@ -9247,7 +9331,8 @@ msgstr "Uhlobo olungaxhaswa lweqhosha likawonke-wonke"
 msgid "Disconnected by server"
 msgstr "Ukhutshwe kunxibelelwano yiseva"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Impazamo ngelixa lonxulumano neSeva yeSILC"
 
 msgid "Key Exchange failed"
@@ -9259,29 +9344,26 @@ msgstr ""
 "Ukungaphumeleli kokuqalisa kwakhona indibano ehlukanisiweyo. Cofa "
 "uNxibelelwano kwakhona ukuyila unxibelelwano olutsha."
 
-msgid "Connection failed"
-msgstr "Unxibelelwano luqhawukile"
-
 msgid "Performing key exchange"
 msgstr "Ukuphumeza unaniselwano oluphambili"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Akukwazekanga ukufaka iqhosha likawonke-wonke"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Ukunxibelelana neSeva yeSILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Akukwazekanga ukufaka iqhosha likawonke-wonke"
+
 msgid "Out of memory"
 msgstr "Uvimba weefayili awusebenzi"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Akukwazeki ukuqalisa unxibelelwano nomXumi weSILC"
 
 #, fuzzy
@@ -9607,7 +9689,7 @@ msgid "Creating SILC key pair..."
 msgstr "Ukudala iqhosa eliyiperi leSILC..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Ukudala iqhosa eliyiperi leSILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9701,6 +9783,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Ingqokelela yamanani eseva ayifumaneki"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Impazamo ngelixa lonxulumano neSeva yeSILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Ukungaphumeleli: Ukungahambelani kwenguqulelo, hlaziya umxumi wakho"
@@ -9743,7 +9828,8 @@ msgstr "Ukungaphumeleli: I-cookie engasebenziyo"
 msgid "Failure: Authentication failed"
 msgstr "Ukungaphumeleli: Ukungaphumeleli kokuqinisekisa"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Akukwazeki ukuqalisa unxibelelwano nomXumi weSILC"
 
 #, fuzzy
@@ -9751,32 +9837,29 @@ msgid "John Noname"
 msgstr "iFani:"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Akukwazekanga ukufaka iqhosha likawonke-wonke"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Akukwazeki ukuthumela"
-
-msgid "Could not connect"
-msgstr "Akukwazeki ukunxulumana"
+msgid "Unable to create connection"
+msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Impazamo engaziwayo"
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "Akukwazekanga ukuyila isokhethi"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Akukwazeki ukusombulula igama lomququzeleli."
+msgid "Unable to create listen socket"
+msgstr "Akukwazeki ukuyila isokethi"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Izikhewu zeIRC kunokwenzeka zingabinazo izithuba ezimhlophe"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "Bonisa ezimbalwa ezinokukhethwa"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9817,178 +9900,70 @@ msgstr "Umsebenzisi we-AP"
 msgid "Auth Domain"
 msgstr "Ngokuzenzekela"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "Ukujonga phezulu %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Ukunxulumana kwi%s akuphumelelanga"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "Ukungena: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Akukwazeki ukubhala ifayili %s."
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Akukwazeki ukufunda ifayili %s."
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Umyalezo mde kakhulu, ii-byte %s zokugqibela zishunqulelwe."
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "I-%s ayingenanga ngokwangoku."
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Isilumkiso se-%s asivunyelwanga."
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Umyalezo ulahliwe, ugqithisile kumda wesantya seseva."
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Incoko %s ayifumaneki."
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Uthumela imiyalezo ngokukhawuleza kakhulu kwi %s."
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Uphose iIM evela %s ngenxa yokuba ibinkulu kakhulu."
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Uphose iIM evela %s ngenxa yokuba ithunyelwe ngesantya esikhulu."
-
-#, c-format
-msgid "Failure."
-msgstr "Ukungaphumeleli."
-
-#, c-format
-msgid "Too many matches."
-msgstr "Kukho ufano oluninzi kakhulu."
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "Kufuneka izichazi ezongezelelweyo."
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "Inkonzo yovimba weefayili ayifumaneki okwethutyana."
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "Ukukhangela i-imeyile kunezithintelo."
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "Igama eliyintloko alihoywangwa."
-
-#, c-format
-msgid "No keywords."
-msgstr "Akukho magama aphambili."
-
-#, c-format
-msgid "User has no directory information."
-msgstr "Umsebenzisi akanalo ulwazi ngovimba weefayili."
-
-#, c-format
-msgid "Country not supported."
-msgstr "ILizwe alixhaswanga."
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Ukungaphumeleli akwaziwa: %s."
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "Isiqhulo okanye ipassword ephosakeleyo."
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "Inkonzo ayifumaneki okwethutyana."
+#, fuzzy
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;igumbi&gt; [iseva]:  Ngenela incoko kule seva."
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "Umgangatho wakho wesilumkiso uphezulu kakhulu okwangoku kungeniso."
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Yenza uluhlu lweziqhagamshelanisi koku thungelwano"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"Ubungena uphume kaninzi kakhulu kunxibelelwano.  Yima imizuzu elishumi ze "
-"uphinde uzame.  Ukuba uyaqhubeka ukuzama, kuya kufuneka ulinde nangakumbi."
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Kwenzeke impazamo engaziwayo yokungena: %s."
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Impazamo engaziwayo, %d, yenzekile.  Ulwazi: %s"
 
 #, fuzzy
-msgid "Invalid Groupname"
-msgstr "Iqela elingasebenziyo"
-
-msgid "Connection Closed"
-msgstr "Unxibelelwano luvaliwe"
-
-msgid "Waiting for reply..."
-msgstr "Ulindele impendulo..."
+msgid "Yahoo ID..."
+msgstr "Isazisi seYahoo!"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "I-TOC ibuyile kunqumamo lwayo. Ngoku ungathumela imiyalezo kwakhona."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Imithetho yokuSebenza yoNgeniso lweYahoo"
 
-msgid "Password Change Successful"
-msgstr "UTshintsho lwePassword luPhumelele"
+#, fuzzy
+msgid "Pager server"
+msgstr "Iseva yoMqobo"
 
-msgid "_Group:"
-msgstr "_Iqela:"
+msgid "Pager port"
+msgstr "IsiQhagamsheli sePager"
 
-msgid "Get Dir Info"
-msgstr "Fumana uLwazi Ngqo"
+#, fuzzy
+msgid "File transfer server"
+msgstr "Umququzeleli wokudlulisa ifayili"
 
-msgid "Set Dir Info"
-msgstr "Misela uLwazi Ngqo"
+msgid "File transfer port"
+msgstr "IsiQhagamshelanisi sokudlulisa ifayili"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Akukwazekanga ukuvula i-%s malunga nokubhala!"
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Uluhlu lwe-Url lweGumbi leNcoko"
 
-msgid "File transfer failed; other side probably canceled."
+msgid "Ignore conference and chatroom invitations"
 msgstr ""
-"Ukudluliswa kwefayili akuphumelelanga; mhlawumbi elinye icala licinyiwe."
 
-msgid "Could not connect for transfer."
-msgstr "Akukwazekanga ukunxibelelana ukuze kudluliswe."
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Uluhlu lwe-Url lweGumbi leNcoko"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Akukwazekanga ukubhala kumntla wefayili.  Ifayili ayinakudluliswa."
+msgid "Yahoo Chat server"
+msgstr ""
 
 #, fuzzy
-msgid "Save As..."
-msgstr "Gcina umFanekiso womQondiso njeng..."
-
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s ucela %s ukwamkela %d ifayili: %s (%.2f %s)%s%s"
-msgstr[1] "%s ucela %s ukwamkela %d iifayili: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "U-Yahoo eJapan"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s ucela ukuba uthumela ifayili"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Isazisi seYahoo!"
 
 #. *< type
 #. *< ui_requirement
@@ -10000,11 +9975,11 @@ msgstr "%s ucela ukuba uthumela ifayili"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "Imithetho yokuSebenza yokuNgenisa iTOC"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Imithetho yokuSebenza yoNgeniso lweYahoo"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
+msgid "Your SMS was not delivered"
 msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
@@ -10031,6 +10006,34 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr "Ukongeza umhlobo kukhatyiwe"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"Impazamo engaziwayo yenani %d. Ukungena kunxibelelwano kwi-website kaYahoo! "
+"kungakulungisa oku."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"Impazamo engaziwayo yenani %d. Ukungena kunxibelelwano kwi-website kaYahoo! "
+"kungakulungisa oku."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Isiqhulo okanye ipassword ephosakeleyo."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10064,13 +10067,14 @@ msgstr ""
 "Impazamo engaziwayo yenani %d. Ukungena kunxibelelwano kwi-website kaYahoo! "
 "kungakulungisa oku."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Akukwazekanga ukongeza umhlobo %s kwiqela %s kuluhlu lweseva ngenxa yokuba %"
 "s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Akukwazekanga ukongeza umhlobo kuluhlu lweseva"
 
 #, c-format
@@ -10078,23 +10082,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Impendulo engasebenziyo evela kwiseva."
 
-msgid "Connection problem"
-msgstr "INgxaki yokuNxulumana"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Iincoko nge %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10149,9 +10146,8 @@ msgstr "Sebenzisa imiMiselo yokusiNgqongileyo"
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Sesiphi Isazisi esisebenzayo?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Ngenela incoko?"
@@ -10166,83 +10162,15 @@ msgstr "Dibana nomsebenzisi wencoko..."
 msgid "Open Inbox"
 msgstr ""
 
-#, fuzzy
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;igumbi&gt; [iseva]:  Ngenela incoko kule seva."
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Yenza uluhlu lweziqhagamshelanisi koku thungelwano"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Isazisi seYahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Imithetho yokuSebenza yoNgeniso lweYahoo"
-
-msgid "Yahoo Japan"
-msgstr "U-Yahoo eJapan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Iseva yoMqobo"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Umququzeleli wemiNxeba waseJapan"
-
-msgid "Pager port"
-msgstr "IsiQhagamsheli sePager"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Umququzeleli wokudlulisa ifayili"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Umququzeleli wokudlulisa ifayili waseJapan"
-
-msgid "File transfer port"
-msgstr "IsiQhagamshelanisi sokudlulisa ifayili"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Uluhlu lwe-Url lweGumbi leNcoko"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Uluhlu lwe-Url lweGumbi leNcoko"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "U-Yahoo eJapan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Akukwazeki ukunxulumana."
+
 msgid "Unable to establish file descriptor."
 msgstr "Akukwazeki ukuseka isichazi sefayili."
 
@@ -10250,6 +10178,10 @@ msgstr "Akukwazeki ukuseka isichazi sefayili."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Nikela ukuthumela %s ku %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Impazamo yokuBhala"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Inkangeleko yeYahoo! yaseJapan"
 
@@ -10296,14 +10228,9 @@ msgstr "Ikhonkco eliHle 3"
 msgid "Last Update"
 msgstr "Igqibele ukuHlaziywa"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Ulwazi lomsebenzisi eli-%s alifumaneki"
-
 #, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Uxolo, le nkangeleko ibonakala ingathi ingolwimi okungaxhaswa ngeli xesha."
 
@@ -10378,21 +10305,19 @@ msgstr "Amazwi"
 msgid "Webcams"
 msgstr "Ii-webcam"
 
+msgid "Connection problem"
+msgstr "INgxaki yokuNxulumana"
+
 msgid "Unable to fetch room list."
 msgstr "Akukwazeki ukulanda uluhlu lwegumbi."
 
 msgid "User Rooms"
 msgstr "AmaGumbi omSebenzisi"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Ingxaki yonxulumano neseva yeYCHT."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Ubuqhawukile kwiseva."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10527,21 +10452,15 @@ msgid "Exposure"
 msgstr "Ukutyhileka"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Akukwazeki ukuyila isokethi"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Akukwazeki ukuthumela umyalezo: %s:"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Impazamo yonxibelelwano yomqobo we-%d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Ukwalelwa ukufikelela: iseva engumqobo ithintela isiqhagamsheli %d ityhalela."
 
@@ -10549,10 +10468,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Impazamo yokungenela incoko eyi%s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Akukwazeki ukusombulula igama lomququzeleli."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10649,10 +10564,6 @@ msgstr "Musa ukuPhazamisa"
 msgid "Extended away"
 msgstr "Ukungabikho okwandisiweyo"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Ifowuni ohamba nayo"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -10694,20 +10605,6 @@ msgstr "%s iyekile ukuba lilalela"
 msgid "%x %X"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr ""
-"Impazamo yokufunda %s: \n"
-"%s.\n"
-
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Kuvele impazamo xa kwahlulwa uluhlu lomhlobo ngezijungqe.  Belufakelwanga, "
-"yaye ifayili endala ishenxile ukuya kwi-blist.xml~."
-
 msgid "Calculating..."
 msgstr "Ukubala..."
 
@@ -10815,6 +10712,20 @@ msgstr "Unxibelelwano luvaliwe"
 msgid "Address already in use."
 msgstr "Loo fayili sele ikhona"
 
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"Impazamo yokufunda %s: \n"
+"%s.\n"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Kuvele impazamo xa kwahlulwa uluhlu lomhlobo ngezijungqe.  Belufakelwanga, "
+"yaye ifayili endala ishenxile ukuya kwi-blist.xml~."
+
 #, fuzzy
 msgid "Internet Messenger"
 msgstr "Abathumeli bemiYalezo yaNgoko nangoko"
@@ -10864,10 +10775,9 @@ msgstr "Izaziso ngemeyile entsha"
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s ekunokukhethwa kuko"
+#, fuzzy
+msgid "_Advanced"
+msgstr "_Rhoxisa"
 
 #, fuzzy
 msgid "Use GNOME Proxy Settings"
@@ -10903,9 +10813,6 @@ msgstr "Xa uqwalasela ngocoselelo"
 msgid "you can see the butterflies mating"
 msgstr "ungawabona amabhabhathane esenza ubuqabane"
 
-msgid "Proxy Options"
-msgstr "Umqobo onokukhethwa"
-
 msgid "Proxy _type:"
 msgstr "Uhlobo _lomqobo:"
 
@@ -10936,8 +10843,8 @@ msgid "Create _this new account on the server"
 msgstr ""
 
 #, fuzzy
-msgid "_Advanced"
-msgstr "_Rhoxisa"
+msgid "_Proxy"
+msgstr "Akukho Mqobo"
 
 #, fuzzy
 msgid "Enabled"
@@ -10976,8 +10883,8 @@ msgid "Please update the necessary fields."
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Uluhlu lweGumbi"
+msgid "A_ccount"
+msgstr "I-Akhawunti:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10985,8 +10892,9 @@ msgid ""
 msgstr ""
 "Nceda ufake ulwazi olufanelekileyo malunga nencoko onqwenela ukuyingenela.\n"
 
-msgid "_Account:"
-msgstr "I-_Akhawunti:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Uluhlu lweGumbi"
 
 #, fuzzy
 msgid "_Block"
@@ -11006,6 +10914,17 @@ msgid "I_M"
 msgstr "I-I_M"
 
 #, fuzzy
+msgid "_Audio Call"
+msgstr "Ngenela inCoko"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "InCoko ngeVidiyo"
+
+#, fuzzy
 msgid "_Send File..."
 msgstr "_Thumela iFayili"
 
@@ -11017,7 +10936,11 @@ msgid "View _Log"
 msgstr "Jonga _ukuNgena"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Akuvumelekanga xa kungekho unxulumano"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Akuvumelekanga xa kungekho unxulumano"
 
 msgid "_Alias..."
@@ -11162,6 +11085,10 @@ msgid "/Tools/_Certificates"
 msgstr "/Izixhobo/izinto _eziKhethwayo"
 
 #, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/Izixhobo/_ukuNgabikho"
+
+#, fuzzy
 msgid "/Tools/Plu_gins"
 msgstr "/Izixhobo/iiNtshukumo zokuNgenisa"
 
@@ -11171,10 +11098,6 @@ msgstr "/Izixhobo/izinto _eziKhethwayo"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Izixhobo/Ukuba _Ngasese"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/Izixhobo/_ukuNgabikho"
-
 msgid "/Tools/_File Transfers"
 msgstr "/Izixhobo/ukuDlulisa i_Fayili"
 
@@ -11307,8 +11230,8 @@ msgstr "Uxwebhu lokusebenzisa"
 msgid "By status"
 msgstr "Ngemo"
 
-msgid "By log size"
-msgstr "Ngobukhulu beqhosha lwesandisi"
+msgid "By recent log activity"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "%s disconnected"
@@ -11326,6 +11249,9 @@ msgstr "_Nxulumanisa kwakhona"
 msgid "Re-enable"
 msgstr "Bhalisa i-Akhawunti eNtsha yeJabber"
 
+msgid "SSL FAQs"
+msgstr ""
+
 #, fuzzy
 msgid "Welcome back!"
 msgstr "%s ibuyile"
@@ -11425,6 +11351,9 @@ msgstr ""
 msgid "A_lias:"
 msgstr "Ngokunye:"
 
+msgid "_Group:"
+msgstr "_Iqela:"
+
 msgid "Auto_join when account becomes online."
 msgstr ""
 
@@ -11463,6 +11392,120 @@ msgstr "/_Izixhobo"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Abahlobo/Umboniso Abahlobo abangekho kunxibelelwano"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Umbala oNgasemva"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Ingaba ufuna ukongeza lo mhlobo kuluhlu lwakho lomhlobo?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Phuma"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Umbala oNgasemva"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Ukwanda"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Khetha Umbala wangaseMva"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Ukudilika"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Khetha Umbala wangaseMva"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Izniqumlisi"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Lukhona unxibelelwano"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Fumana ulwazi ngomhlobo okhethiweyo"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Engekhoyo"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Fumana ulwazi ngomhlobo okhethiweyo"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Akukho lunxibelelwano"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Fumana ulwazi ngomhlobo okhethiweyo"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Isimo"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Fumana ulwazi ngomhlobo okhethiweyo"
+
+msgid "Message Text"
+msgstr "Umbhalo womYalezo"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Umbhalo womYalezo"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Tshintsha ulwazi lomsebenzisi lwe-%s"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11483,14 +11526,6 @@ msgstr "Ngeli thuba awubhaliswanga nge-akhawunti enokongeza loo mhlobo."
 msgid "Invite Buddy Into Chat Room"
 msgstr "Memela umHlobo kwiGumbi leNcoko"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Nceda ufake igama lomsebenzisi onqwenela ukummema, ngokuhambisana nomyalezo "
-"ozikhethelayo wokumema."
-
 msgid "_Buddy:"
 msgstr "_UmHlobo:"
 
@@ -11521,7 +11556,7 @@ msgid "Get Away Message"
 msgstr "UmYalezo omTsha wokuNgabikho"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "iFani:"
 
 msgid "Unable to save icon file to disk."
@@ -11570,6 +11605,22 @@ msgstr "/Incoko/_Gcina Njenge..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Incoko/Cima"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/Incoko/_Vala"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/Incoko/_Vala"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/Incoko/_Vala"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/Incoko/Buka _Ingxelo yezinto ezenziweyo"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/Incoko/Thu_mela iFayili..."
 
@@ -11650,6 +11701,18 @@ msgstr "/_INcoko"
 msgid "/Conversation/View Log"
 msgstr "/Incoko/Buka Ingxelo yezinto ezenziweyo"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/Incoko/_Vala"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/Incoko/Buka Ingxelo yezinto ezenziweyo"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/Incoko/_Vala"
+
 msgid "/Conversation/Send File..."
 msgstr "/Incoko/Thumela iFayili..."
 
@@ -11850,6 +11913,9 @@ msgstr "iDilesi"
 msgid "Ka-Hing Cheung"
 msgstr ""
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "inkxaso"
 
@@ -11984,6 +12050,10 @@ msgid "Hungarian"
 msgstr "IsiHungaria"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "IsiRomania"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "IsiMacedonia"
 
@@ -12002,6 +12072,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "Abaguquleli baNgoku"
 
 #, fuzzy
+msgid "Khmer"
+msgstr "I-Opera"
+
+#, fuzzy
 msgid "Kannada"
 msgstr "Ukugxotha"
 
@@ -12025,6 +12099,10 @@ msgid "Macedonian"
 msgstr "IsiMacedonia"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "IsiMacedonia"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "IsiNorwegia"
 
@@ -12082,6 +12160,9 @@ msgstr ""
 msgid "Swedish"
 msgstr "IsiSwede"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "I-Terminal"
@@ -12133,8 +12214,25 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">:</FONT> #Pidgin kwi- irc.freenode.net<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">:</FONT> #Pidgin kwi- irc.freenode.net<BR><BR>"
 
 #, fuzzy
@@ -12415,7 +12513,7 @@ msgid "Hyperlink visited color"
 msgstr "Umbala woQhagamshelwano"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Umbala wokuzoba uqhagamshelwano."
 
 #, fuzzy
@@ -12455,15 +12553,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "UkuSusa isaZiso"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Izaziso ngemeyile entsha"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12476,15 +12581,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "Izaziso ngemeyile entsha"
 
-msgid "_Copy Email Address"
-msgstr "_Kopa iDilesi ye-iMeyile"
-
-msgid "_Open Link in Browser"
-msgstr "_IsiKhangeli soQhagamshelo oluVulekileyo"
-
-msgid "_Copy Link Location"
-msgstr "_Indawo yokuNxulumanisa iKopi"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12517,11 +12613,9 @@ msgstr "Impazamo yokugcina umfanekiso: %s"
 msgid "Save Image"
 msgstr "Gcina umFanekiso"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Gcina umFanekiso..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12612,10 +12706,6 @@ msgid "Font Face"
 msgstr "Inkangeleko yomBhalo"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Umbala oNgasemva"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Umbala ophambili wombhalo"
 
@@ -12749,6 +12839,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12766,6 +12857,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12797,16 +12889,27 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Ukubiza ngomnxeba"
 
-#, fuzzy
-msgid "Open All Messages"
-msgstr "Thumela umYalezo"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
 
 #, fuzzy
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgid "Calling..."
+msgstr "Ukubala..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Unemeyile!</span>\n"
-"\n"
-"%s"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12837,6 +12940,35 @@ msgstr ""
 "'Incwadana' yomyalelo wokukhangela ikhethiwe, kodwa akukho myalelo "
 "umiselweyo."
 
+#, fuzzy
+msgid "No message"
+msgstr "(umyalezo 1)"
+
+#, fuzzy
+msgid "Open All Messages"
+msgstr "Thumela umYalezo"
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Unemeyile!</span>\n"
+"\n"
+"%s"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "UkuTsibela umHlobo omTsha"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Unemeyile!</span>\n"
+"\n"
+"%s"
+
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12890,11 +13022,18 @@ msgstr ""
 msgid "Select a file"
 msgstr "Khetha ifayili"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "Hlela ukuTsibela umHlobo"
+
 #. Create the "Pounce on Whom" frame.
 #, fuzzy
 msgid "Pounce on Whom"
 msgstr "Kutsityelwe bani"
 
+msgid "_Account:"
+msgstr "I-_Akhawunti:"
+
 msgid "_Buddy name:"
 msgstr "_iGama lomhlobo:"
 
@@ -12975,7 +13114,58 @@ msgstr ""
 msgid "Pounce Target"
 msgstr "Atsityelwe Nini"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "Umhlobo uqalisa uku_chwetheza"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "Umsebenzisi uyachwetheza..."
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "Bha_lisa"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "Buya _kukulalela"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "_Buya kukungabikho"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "I-Ping"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "Phu_ma"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "%s ilalele"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "Xa ungekho"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "Thumela um_yalezo"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "Isiganeko esingaziwayo sokutsiba. Nceda wenze ingxelo ngoku!"
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Akuphumelelekanga ukugcina umfanekiso: %s\n"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12999,6 +13189,12 @@ msgstr "Izniqumlisi"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Iincoko nge %s"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "uLuhlu lwabaHlobo"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "Inkqubo yeTreyi yomFanekiso womQondiso"
 
@@ -13011,7 +13207,7 @@ msgid "On unread messages"
 msgstr "Thumela um_yalezo"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "Iifestile zeNcoko zeIM"
 
 #, fuzzy
@@ -13021,6 +13217,10 @@ msgstr "Vala iNcoko"
 msgid "When away"
 msgstr "Xa ungekho"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Iifestile zeNcoko zeIM"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13085,10 +13285,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Bhanyazisa iFestile xa imiyalezo isamkelwa"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Iifestile zeNcoko zeIM"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13124,15 +13320,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "Alufumaneki ulwazi lomsebenzisi"
 
-#, fuzzy
-msgid "ST_UN server:"
-msgstr "_Iseva:"
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Ukuziphawulela iDilesi ye-IP"
 
 msgid "Public _IP:"
@@ -13155,6 +13347,10 @@ msgstr "_Qalisa isiqhagamshelanisi:"
 msgid "_End port:"
 msgstr "_Isiphelo sesiQhagamshelisi:"
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "Iseva yoMqobo"
@@ -13184,6 +13380,10 @@ msgstr "Iseva yoMqobo"
 msgid "No proxy"
 msgstr "Akukho mqobo"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "_Umsebenzisi:"
 
@@ -13354,14 +13554,14 @@ msgid "Auto-away"
 msgstr "Ukungabikho nokuzenzekela"
 
 #, fuzzy
-msgid "Change status when _idle"
-msgstr "Misela ukungabikho _xa ulalele"
-
-#, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Imizuzu phambi kokumisela ukungabikho:"
 
 #, fuzzy
+msgid "Change status when _idle"
+msgstr "Misela ukungabikho _xa ulalele"
+
+#, fuzzy
 msgid "Change _status to:"
 msgstr "Tshintsha iDilesi ukuya ku:"
 
@@ -13521,29 +13721,19 @@ msgstr "Gci_na & uSebenzise"
 msgid "Status for %s"
 msgstr "uBume: %s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, fuzzy
 msgid "Custom Smiley"
 msgstr "Fakela okuNcumisayo"
 
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Ifayili ePhambili yoLuntu"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Nceda ufake igama elitsha leqela elikhethiweyo."
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "Fakela okuNcumisayo"
@@ -13553,21 +13743,29 @@ msgid "Add Smiley"
 msgstr "Ncuma!"
 
 #, fuzzy
-msgid "Smiley _Image"
+msgid "_Image:"
 msgstr "Gcina umFanekiso"
 
-#. Smiley shortcut
+#. Shortcut text
 #, fuzzy
-msgid "Smiley S_hortcut"
+msgid "S_hortcut text:"
 msgstr "Izniqumlisi"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "Ncuma!"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "Izniqumlisi"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Khetha umHlobo"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13657,8 +13855,8 @@ msgid "Cannot send launcher"
 msgstr "Akukwazeki ukuthumela ifayili"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13693,6 +13891,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "_Open Link"
+msgstr "_Ikhonco elivulekileyo:"
+
+msgid "_Copy Link Location"
+msgstr "_Indawo yokuNxulumanisa iKopi"
+
+msgid "_Copy Email Address"
+msgstr "_Kopa iDilesi ye-iMeyile"
+
+#, fuzzy
 msgid "Save File"
 msgstr "Gcina iFayili..."
 
@@ -13796,6 +14004,78 @@ msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Idilesi yeseva"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Ngena kwiSeva yeNgqungquthela"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Khetha iseva yengqungquthela ukufa umbuzo"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Iinkonzo zoNxibelelwano"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Thumela uLuhlu Lobuhlobo"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Xa ungekho"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Khangela i:"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Ukhetho lweSandi"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Inkcazelo:<b> IsiPorho"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Misela uLwazi Ngqo"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_IsiKhangeli:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Akakho umsebenzisi onjalo"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Iseva ayisebenzisa nayiphi na indlela yokuxhasa uqinisekiso"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Misela uLwazi Ngqo"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Umhlobo ulalele:"
 
@@ -14209,7 +14489,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14326,12 +14606,6 @@ msgstr ""
 "- Iguqula yonke imibhalo engenayo\n"
 "- Ithumela umyalezo kubantu abakuluhlu lwakho kwangoko xa bebhalisa"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Umbala woQhagamshelwano"
@@ -14344,6 +14618,10 @@ msgstr "Umbala woQhagamshelwano"
 msgid "Highlighted Message Name Color"
 msgstr "Thumela umYalezo"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "UkuSusa isaZiso"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14378,38 +14656,27 @@ msgstr "Ukhetho kwimidibaniso yemida"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ukungahoyi i_mibala"
+msgid "Disable Typing Notification Text"
+msgstr "Izaziso ngemeyile entsha"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Ulawulo lweFayile yePidgin"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Vala"
 
 #, fuzzy
 msgid "Fonts"
 msgstr "Ii-Akhawunti"
 
 #, fuzzy
+msgid "Miscellaneous"
+msgstr "Impazamo yeZinto ngezinto"
+
+#, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Ulawulo lweFayile yePidgin"
 
@@ -14503,7 +14770,7 @@ msgstr "Iifestile zeNcoko zeIM"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14557,6 +14824,113 @@ msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Utshintsha umbhalo wemiyalezo ephumayo ngokwemithetho emiselwe ngumsebenzisi."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Akangenanga"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s iphumile."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Ngenela iNcoko"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Musa ukuHoya"
+
+#, fuzzy
+msgid "Founder"
+msgstr "iyure"
+
+#, fuzzy
+msgid "Operator"
+msgstr "I-Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Ugunyaziso lunikiwe"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Impazamo"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Ulwazi"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Isicelo simbaxa"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Umgangatho wesiLumkiso"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "uBume: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Uluhlu lwe-Url lweGumbi leNcoko"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Gcina umFanekiso womQondiso"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Ulawulo lweFayile yePidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Ulwazi nge-akhawunti"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "uLuhlu lwabaHlobo"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "uLuhlu lwabaHlobo"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Ulawulo lweFayile yePidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Ulawulo lweFayile yePidgin"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14730,10 +15104,6 @@ msgid "Only when docked"
 msgstr ""
 
 #, fuzzy
-msgid "_Flash window when chat messages are received"
-msgstr "_Bhanyazisa iFestile xa imiyalezo isamkelwa"
-
-#, fuzzy
 msgid "Windows Pidgin Options"
 msgstr "IinDlela zokuKhetha zokuNgena"
 
@@ -14741,9 +15111,10 @@ msgstr "IinDlela zokuKhetha zokuNgena"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Izinto ezizodwa okunokukhethwa kuzo kwiiFestile zePidgin."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Izinto ezizodwa okunokukhethwa kuzo kwiiFestile zePidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14785,6 +15156,519 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Akukwazeki ukuvula isokethi"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Akukwazekanga ukuyila isokhethi"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Akukwazeki ukufunda isokethi"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Unxibelelwano luqhawukile"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Iseva iqhawule unxibelelwano"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Akukwazekanga ukuyila isokhethi"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Akukwazekanga ukunxulumana nomququzeleli"
+
+#~ msgid "Read error"
+#~ msgstr "ImPazamo efundiweyo"
+
+#~ msgid "Write error"
+#~ msgstr "Impazamo yokuBhala"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Misela uLwazi Ngqo"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "iDilesi Eyandisiweyo"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Ncokola noneLinye igama"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Umsebenzisi akanalo ulwazi ngovimba weefayili."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Umyalelo"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "i-HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Impazamo yoBhaliso"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Indawo"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Imo yesaZiso somHlobo"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "INguqulelo engaXhaswanga"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "iGama lomButho"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Izimo zomSebenzisi"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Umda womSebenzisi"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Izakhono"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Igama lomsebenzisi"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Unaniselwano oluPhambili neIM"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Idilesi ye-iMeyile"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Ingqokelela yeempawu"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "I-Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Igama lesiqhulo"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "IVidiyo eSebenzayo"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Umyalezo wamkelwe"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "IQhosha likaWonke-wonke lomZila ongaCacanga"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Iindlela zokuKhetha zomSebenzisi"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Izimo zomSebenzisi"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Umda womSebenzisi"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Umda womSebenzisi"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "I-Trillian Encryption (umbhalo ontsonkothileyo)"
+
+#~ msgid "Read Error"
+#~ msgstr "Impazamo yokuFunda"
+
+#, fuzzy
+#~ msgid "Failed to connect to server."
+#~ msgstr "Akukwazeki ukunxulumana neseva."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Ukrozo luzele"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Akukwazeki ukwahlula umyalezo ngezijungqe"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Akukwazekanga ukunxulumana nomququzeleli"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Ukungena akuphumelelanga (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Akukwazeki ukunxulumana neseva."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Ukhutshiwe ngenxa yokuba ubungene kwesinye isikhululo."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Impazamo. Inkxaso yeSSL ayifakelwanga."
+
+#~ msgid "Incorrect password."
+#~ msgstr "I-Password ephosakeleyo."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Akukwazeki ukunxulumana neseva."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Kunokwenzeka ukhutshwe kunxibelelwano kungekudala.  Mhlawumbi unokufuna "
+#~ "ukusebenzisa uTOC kude kube oku kulungisiwe. Hlola u %s malunga "
+#~ "nokuhlaziya."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Akukwazeki ukunxulumana"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "IGama lomSebenzisi elingaSebenziyo"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Akukwazeki ukufumana ulwazi ngeseva"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Unxibelelwano luvaliwe"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Akukwazekanga ukunxulumana nomququzeleli"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Unxibelelwano luvaliwe"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Unxibelelwano luvaliwe"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Impazamo xeshikweni kufundwa kwi-sokhethi."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Akwazeki ukunxulumana neseva"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Akukwazeki ukuthumela"
+
+#~ msgid "Could not connect"
+#~ msgstr "Akukwazeki ukunxulumana"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Akukwazekanga ukuyila isokhethi"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Akukwazeki ukusombulula igama lomququzeleli."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "I-Password ephosakeleyo."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "U-Yahoo eJapan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Umququzeleli wemiNxeba waseJapan"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Umququzeleli wokudlulisa ifayili waseJapan"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Ubuqhawukile kwiseva."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Akukwazeki ukusombulula igama lomququzeleli."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Iseva ifuna i-SSL ukuze ingene"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Iifestile zeNcoko zeIM"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Nceda ufake igama elitsha leqela elikhethiweyo."
+
+#, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Sesiphi Isazisi esisebenzayo?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ukungahoyi i_mibala"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "(umyalezo 1)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr ""
+#~ "Nceda ufake igama lomsebenzisi onqwenela ukummema, ngokuhambisana "
+#~ "nomyalezo ozikhethelayo wokumema."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Akukwazeki ukuKhupha uLuhlu lobuhlobo"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Kunokwenzeka ukhutshwe kunxibelelwano kungekudala.  Mhlawumbi unokufuna "
+#~ "ukusebenzisa uTOC kude kube oku kulungisiwe. Hlola u %s malunga "
+#~ "nokuhlaziya."
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Yongeza umHlobo"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Akukwazeki ukufumana ulwazi ngeseva"
+
+#, fuzzy
+#~ msgid "Keep alive error"
+#~ msgstr "ImPazamo efundiweyo"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr "Ubuqhawukile kwiseva."
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "UkuNxulumana neSeva"
+
+#, fuzzy
+#~ msgid "Failed to send IM."
+#~ msgstr "Akuphumelelanga ukungenela incoko"
+
+#~ msgid "Looking up %s"
+#~ msgstr "Ukujonga phezulu %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "Ukunxulumana kwi%s akuphumelelanga"
+
+#~ msgid "Signon: %s"
+#~ msgstr "Ukungena: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "Akukwazeki ukubhala ifayili %s."
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "Akukwazeki ukufunda ifayili %s."
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "Umyalezo mde kakhulu, ii-byte %s zokugqibela zishunqulelwe."
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "I-%s ayingenanga ngokwangoku."
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "Isilumkiso se-%s asivunyelwanga."
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "Umyalezo ulahliwe, ugqithisile kumda wesantya seseva."
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "Incoko %s ayifumaneki."
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "Uthumela imiyalezo ngokukhawuleza kakhulu kwi %s."
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "Uphose iIM evela %s ngenxa yokuba ibinkulu kakhulu."
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "Uphose iIM evela %s ngenxa yokuba ithunyelwe ngesantya esikhulu."
+
+#~ msgid "Failure."
+#~ msgstr "Ukungaphumeleli."
+
+#~ msgid "Too many matches."
+#~ msgstr "Kukho ufano oluninzi kakhulu."
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "Kufuneka izichazi ezongezelelweyo."
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "Inkonzo yovimba weefayili ayifumaneki okwethutyana."
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "Ukukhangela i-imeyile kunezithintelo."
+
+#~ msgid "Keyword ignored."
+#~ msgstr "Igama eliyintloko alihoywangwa."
+
+#~ msgid "No keywords."
+#~ msgstr "Akukho magama aphambili."
+
+#~ msgid "User has no directory information."
+#~ msgstr "Umsebenzisi akanalo ulwazi ngovimba weefayili."
+
+#~ msgid "Country not supported."
+#~ msgstr "ILizwe alixhaswanga."
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "Ukungaphumeleli akwaziwa: %s."
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "Isiqhulo okanye ipassword ephosakeleyo."
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "Inkonzo ayifumaneki okwethutyana."
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "Umgangatho wakho wesilumkiso uphezulu kakhulu okwangoku kungeniso."
+
+#~ 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 ""
+#~ "Ubungena uphume kaninzi kakhulu kunxibelelwano.  Yima imizuzu elishumi ze "
+#~ "uphinde uzame.  Ukuba uyaqhubeka ukuzama, kuya kufuneka ulinde nangakumbi."
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "Kwenzeke impazamo engaziwayo yokungena: %s."
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "Impazamo engaziwayo, %d, yenzekile.  Ulwazi: %s"
+
+#, fuzzy
+#~ msgid "Invalid Groupname"
+#~ msgstr "Iqela elingasebenziyo"
+
+#~ msgid "Connection Closed"
+#~ msgstr "Unxibelelwano luvaliwe"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "Ulindele impendulo..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr ""
+#~ "I-TOC ibuyile kunqumamo lwayo. Ngoku ungathumela imiyalezo kwakhona."
+
+#~ msgid "Password Change Successful"
+#~ msgstr "UTshintsho lwePassword luPhumelele"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "Fumana uLwazi Ngqo"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "Misela uLwazi Ngqo"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "Akukwazekanga ukuvula i-%s malunga nokubhala!"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr ""
+#~ "Ukudluliswa kwefayili akuphumelelanga; mhlawumbi elinye icala licinyiwe."
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "Akukwazekanga ukunxibelelana ukuze kudluliswe."
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "Akukwazekanga ukubhala kumntla wefayili.  Ifayili ayinakudluliswa."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Gcina umFanekiso womQondiso njeng..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s ucela %s ukwamkela %d ifayili: %s (%.2f %s)%s%s"
+#~ msgstr[1] "%s ucela %s ukwamkela %d iifayili: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s ucela ukuba uthumela ifayili"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "Imithetho yokuSebenza yokuNgenisa iTOC"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Ulwazi lomsebenzisi eli-%s alifumaneki"
+
+#~ msgid "%s Options"
+#~ msgstr "%s ekunokukhethwa kuko"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Umqobo onokukhethwa"
+
+#~ msgid "By log size"
+#~ msgstr "Ngobukhulu beqhosha lwesandisi"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_IsiKhangeli soQhagamshelo oluVulekileyo"
+
+#, fuzzy
+#~ msgid "ST_UN server:"
+#~ msgstr "_Iseva:"
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "Gcina umFanekiso"
+
+#, fuzzy
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "Izniqumlisi"
+
+#, fuzzy
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "_Bhanyazisa iFestile xa imiyalezo isamkelwa"
+
+#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "Ifayili enelo gama sele ikhona"
 
@@ -14853,13 +15737,6 @@ msgstr ""
 #~ msgstr "Uqinisekile ukufuna ukususa umyalezo wokungabikho \"%s\"?"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "Abasebenzisi be %s: %s"
-
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Thumela umYalezo"
 
@@ -14999,9 +15876,6 @@ msgstr ""
 #~ msgid "Invalid screen name"
 #~ msgstr "IGama lomSebenzisi elingaSebenziyo"
 
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "Ukhohlakele kakhulu (umthumeli)"
 
@@ -15062,10 +15936,6 @@ msgstr ""
 #~ msgstr "Abasebenzisi be %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Ingaba ufuna ukongeza lo mhlobo kuluhlu lwakho lomhlobo?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "ImPazamo yokuSebenza kweNkqubo"
 
@@ -15074,10 +15944,6 @@ msgstr ""
 #~ msgstr "I-%s ayingenanga ngokwangoku."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Impazamo yokudala unxibelelwano"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Akwazeku ukuNgena kwiAIM"
 
@@ -15196,17 +16062,9 @@ msgstr ""
 #~ msgstr "Iyasebenza ngeli thuba"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Akwazeki ukunxulumana neseva"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Umyalezo:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "I-Akhawunti:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Fihla iimPazamo ezingaNxulumaniswanga"
 
@@ -15269,8 +16127,8 @@ msgstr ""
 #~ "You can get version %s from:<br><a href=\"http://Pidgin.sourceforge.net/"
 #~ "\">http://Pidgin.sourceforge.net</a>."
 #~ msgstr ""
-#~ "Ungafumana inguqulelo ye%s ivela:<br><ahref=\"http://Pidgin.souceforge.net/"
-#~ "\">http://Pidgin.sourceforge.net</a>."
+#~ "Ungafumana inguqulelo ye%s ivela:<br><ahref=\"http://Pidgin.souceforge."
+#~ "net/\">http://Pidgin.sourceforge.net</a>."
 
 #~ msgid "Delay"
 #~ msgstr "Ukubambezela"
@@ -15366,13 +16224,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>Imo:</b> Alukho unxibelelwano"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Inkcazelo:<b> IsiPorho"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -15426,10 +16277,10 @@ msgstr ""
 #~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
 #~ "<BR><BR>"
 #~ msgstr ""
-#~ "I-Pidgin ngumxhasi omiselweyo wemiyalezo okwaziyo ukusebenzisa iAIM, iMSN, "
-#~ "iYahoo!, iJabber, iICQ, iSILC, iNovell GroupWise, iNapster, iZephyr, "
-#~ "neGadu-Gadu zonke ngexexha elinye.  Ibhalwa kusetyenziswa iGtk+ yaye "
-#~ "inelayisensi ngaphantsi kweGPL.<BR><BR>"
+#~ "I-Pidgin ngumxhasi omiselweyo wemiyalezo okwaziyo ukusebenzisa iAIM, "
+#~ "iMSN, iYahoo!, iJabber, iICQ, iSILC, iNovell GroupWise, iNapster, "
+#~ "iZephyr, neGadu-Gadu zonke ngexexha elinye.  Ibhalwa kusetyenziswa iGtk+ "
+#~ "yaye inelayisensi ngaphantsi kweGPL.<BR><BR>"
 
 #, fuzzy
 #~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin on irc.freenode.net<BR><BR>"
@@ -15474,9 +16325,6 @@ msgstr ""
 #~ msgid "_Idle"
 #~ msgstr "_Lalela"
 
-#~ msgid "Retur_n from idle"
-#~ msgstr "Buya _kukulalela"
-
 #~ msgid "Pounce Action"
 #~ msgstr "Intshukumo yokuTsibela"
 
@@ -15770,8 +16618,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "Xa oku kusenzeka, iTOC ayithatheli ngqalelo nayiphi na imiyalezo "
 #~ "ethunyelwa kuyo, yaye inokukukhupha xa uthumela umyalezo. U-Pidgin uya "
@@ -15789,8 +16637,8 @@ msgstr ""
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "Indlela eqhelekileyo yokuqinisekisa ayiphumelelanga. Oku kuthetha ukuthi "
 #~ "mhlawumbi i-password iphosakele, okanye inkqubo yokuqinisekisa kaYahoo! "
@@ -15819,9 +16667,6 @@ msgstr ""
 #~ msgstr[0] "(%d myalezo)"
 #~ msgstr[1] "(%d imiyalezo)"
 
-#~ msgid "(1 message)"
-#~ msgstr "(umyalezo 1)"
-
 #, fuzzy
 #~ msgid "Default auto-away"
 #~ msgstr "Ukungabikho nokuzenzekela"
@@ -15889,8 +16734,8 @@ msgstr ""
 #~ "Gives Pidgin the ability to be remote-controlled through third-party "
 #~ "applications or through the Pidgin-remote tool."
 #~ msgstr ""
-#~ "Inika iPidgin ukubanakho ukulawulwa kwenye indawo okanye yimisebenzi yeqela "
-#~ "lesithathu okanye ngesixhobo se-Pidgin esikwenye indawo."
+#~ "Inika iPidgin ukubanakho ukulawulwa kwenye indawo okanye yimisebenzi "
+#~ "yeqela lesithathu okanye ngesixhobo se-Pidgin esikwenye indawo."
 
 #~ msgid "Docked _Buddy List is always on top"
 #~ msgstr "ULuhlu oluShunquliweyo _lomHlobo lungaphezulu ngamaxa onke"
@@ -15925,9 +16770,6 @@ msgstr ""
 #~ msgid "Away title: "
 #~ msgstr "Isihloko sokungabikho: "
 
-#~ msgid "Buddy List Error"
-#~ msgstr "Impazamo yoLuhlu lomHlobo"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Ubukhulu beqhosha lwesandisi"
 
@@ -16059,9 +16901,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Thumela umyalezo kumhlobo okhethekileyo"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Fumana ulwazi ngomhlobo okhethiweyo"
-
 #~ msgid "_Chat"
 #~ msgstr "_Ukuncokola"
 
@@ -16267,9 +17106,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Isishwankathelo"
 
-#~ msgid "Message Text"
-#~ msgstr "Umbhalo womYalezo"
-
 #~ msgid "Away Messages"
 #~ msgstr "Imiyalezo yokuNgabikho"
 
@@ -16329,8 +17165,8 @@ msgstr ""
 #~ msgstr "Akukwazeki ukufaka ezithandwayo"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin 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 ""
 #~ "U-Pidgin akakwazanga ukufakela izinto ezikhethwayo ngenxa yokuba zigcinwa "
@@ -16370,9 +17206,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Impazamo ebalulekileyo kwi-GG library\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Akukwazeki ukunika iseva isandi"
-
 #~ msgid "Send as message"
 #~ msgstr "Thumela njengomyalezo"
 
@@ -16440,16 +17273,16 @@ msgstr ""
 #~ msgstr "Akukwazeki ukufikelela kuvimba weefayili"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "U-Pidgin akakwazanga ukukhangela uVimba weefayili ngenxa yokuba "
 #~ "kungakwazeki ukunxibelelana neseva yovimba weefayili.  Nceda uzama emva "
 #~ "kwethutyana."
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
 #~ "U-Pidgin akakwazanga ukutshintsha ipassword yakho ngenxa yempazamo "
 #~ "kunxibelelwano neseva yeGadu-Gadu.  Nceda uzame emva kwethutyana."
@@ -16461,8 +17294,8 @@ msgstr ""
 #~ msgstr "Akukwazeki ukufikelela kwinkangeleko yomsebenzisi."
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "U-Pidgin akakwazanga ukufikelela kwinkangeleko yomsebenzisi ngenxa "
 #~ "yempazamo yonxibelelwano novimba weefayili kwiseva.  Nceda uzame kwakhona "
@@ -16586,9 +17419,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s ingenisiwe."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s iphumile."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -16606,9 +17436,6 @@ msgstr ""
 #~ "%s umeme %s kwigumbi lencoko %s:\n"
 #~ "<b>%s</b>"
 
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Uxolo, ndibalekele ucuntsu!"
-
 #~ msgid "Myanmar"
 #~ msgstr "IsiMyamar"
 
@@ -16619,12 +17446,6 @@ msgstr ""
 #~ "Akukwazeki ukuthelekelela uhlobo lomfanekiso olusekwe kulwandiso "
 #~ "lwefayili olunikiweyo.  Kumiselwe kuPNG."
 
-#~ msgid "Miscellaneous error"
-#~ msgstr "Impazamo yeZinto ngezinto"
-
-#~ msgid "Initiate Chat"
-#~ msgstr "Qalisa iNcoko"
-
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr "Impazamo engaziwayo xa uzama ukugunyazisa neseva yeMSN xa ungena."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e7a40b2fd1..cbb8111c3b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,20 +1,21 @@
-# pidgin 软件包的简体中文翻译。
-# Copyright (C) 2003 pidgin team.
+# Pidgin 软件包的简体中文翻译。
+# Copyright (C) 2009 pidgin team.
 # This file is distributed under the same license as the pidgin package.
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
+# liyuekui <liyuekui@gmail.com>, 2009.
+# Aron Xu <aronmalache@163.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
-"PO-Revision-Date: 2007-05-20 20:22+0800\n"
-"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
+"PO-Revision-Date: 2009-04-23 00:32+0800\n"
+"Last-Translator: Aron Xu <aronmalache@163.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -31,7 +32,7 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
+"  -d, --debug         print debugging messages to stderr\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
@@ -60,7 +61,6 @@ msgstr "出错"
 msgid "Account was not added"
 msgstr "账户未添加"
 
-#, fuzzy
 msgid "Username of an account must be non-empty."
 msgstr "账户的用户名必须非空。"
 
@@ -70,7 +70,6 @@ msgstr "新邮件通知"
 msgid "Remember password"
 msgstr "记住密码"
 
-#, fuzzy
 msgid "There are no protocol plugins installed."
 msgstr "未安装协议插件。"
 
@@ -86,9 +85,8 @@ msgstr "新建账户"
 msgid "Protocol:"
 msgstr "协议："
 
-#, fuzzy
 msgid "Username:"
-msgstr "用户名(_U)："
+msgstr "用户名:"
 
 msgid "Password:"
 msgstr "密码："
@@ -97,7 +95,6 @@ msgid "Alias:"
 msgstr "别名："
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
 msgstr "在服务器上创建此新帐户"
 
@@ -179,7 +176,6 @@ msgstr ""
 msgid "Default"
 msgstr "默认"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
 msgstr "您必须提供好友的用户名。"
 
@@ -198,13 +194,11 @@ msgstr "添加好友出错"
 msgid "Username"
 msgstr "用户名"
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "给联系人起名"
+msgstr "联系人别名(可选)"
 
-#, fuzzy
 msgid "Add in group"
-msgstr "添加组"
+msgstr "添加到组"
 
 msgid "Account"
 msgstr "账户"
@@ -346,9 +340,8 @@ msgstr "已存..."
 msgid "Plugins"
 msgstr "插件"
 
-#, fuzzy
 msgid "Block/Unblock"
-msgstr "取消屏蔽"
+msgstr "屏蔽/取消屏蔽"
 
 msgid "Block"
 msgstr "屏蔽"
@@ -356,11 +349,10 @@ msgstr "屏蔽"
 msgid "Unblock"
 msgstr "取消屏蔽"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "您想要跟谁聊？请输入他/她的用户名或别名。"
+msgstr "清输入你想要屏蔽/解除屏蔽的用户名活别名。"
 
 #. Not multiline
 #. Not masked?
@@ -371,7 +363,6 @@ msgstr "确定"
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr "您想要跟谁聊？请输入他/她的用户名或别名。"
 
@@ -387,11 +378,10 @@ msgstr "请输入您想要加入的聊天名称。"
 msgid "Join"
 msgstr "加入"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
-msgstr "您想要查看谁的日志？请输入他/她的用户名或别名。"
+msgstr "您想要查看和谁聊天的日志？请输入他/她的用户名或别名。"
 
 #. Create the "Options" frame.
 msgid "Options"
@@ -400,20 +390,17 @@ msgstr "选项"
 msgid "Send IM..."
 msgstr "发送消息..."
 
-#, fuzzy
 msgid "Block/Unblock..."
-msgstr "取消屏蔽"
+msgstr "屏蔽/取消屏蔽..."
 
 msgid "Join Chat..."
 msgstr "加入聊天..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "查看日志"
+msgstr "查看日志..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "查看日志"
+msgstr "查看全部日志"
 
 msgid "Show"
 msgstr "显示"
@@ -436,19 +423,17 @@ msgstr "按字母序"
 msgid "By Log Size"
 msgstr "按日志大小"
 
-#, fuzzy
 msgid "Buddy"
-msgstr "好友(_B)："
+msgstr "好友"
 
 msgid "Chat"
 msgstr "聊天"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "组"
+msgstr "分组"
 
 msgid "Certificate Import"
-msgstr "证书导入"
+msgstr "导入证书"
 
 msgid "Specify a hostname"
 msgstr "指定主机名"
@@ -503,17 +488,17 @@ msgid ""
 msgstr ""
 
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "SSL 主机证书"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "确实要删除 %s 的证书吗？"
 
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "确认删除证书"
 
 msgid "Certificate Manager"
-msgstr ""
+msgstr "证书管理器"
 
 #. Creating the user splits
 msgid "Hostname"
@@ -603,19 +588,6 @@ msgstr "记录已停止。此会话中的后续消息将不会被记录。"
 msgid "Send To"
 msgstr "发送到"
 
-#, fuzzy
-msgid "Invite message"
-msgstr "在消息中插入"
-
-msgid "Invite"
-msgstr "邀请"
-
-#, fuzzy
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr "您想要邀请谁？请输入他/她的名字，以及可选的邀请消息。"
-
 msgid "Conversation"
 msgstr "对话"
 
@@ -628,7 +600,6 @@ msgstr "显示时间戳"
 msgid "Add Buddy Pounce..."
 msgstr "添加好友千里眼..."
 
-#, fuzzy
 msgid "Invite..."
 msgstr "邀请"
 
@@ -644,7 +615,8 @@ msgstr "<自动回复> "
 #, fuzzy, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "用户列表:\n"
+msgstr[0] "%d 个用户的列表:\n"
+msgstr[1] "%d 个用户的列表:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
@@ -663,7 +635,7 @@ msgstr ""
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
-msgstr ""
+msgstr "%s 不是有效的信息类型。查看'/help msgcolor' 已查找有效的信息"
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
@@ -740,6 +712,7 @@ msgstr "暂停"
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
 msgstr[0] "文件传送 - 已完成 %d%%，共 %d 个文件"
+msgstr[1] "文件传送 - 已完成 %d%%，共 %d 个文件"
 
 #. Create the window.
 msgid "File Transfers"
@@ -786,13 +759,11 @@ msgstr "已失败"
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/秒"
 
-#, fuzzy
 msgid "Sent"
-msgstr "设置(_S)"
+msgstr "已发送"
 
-#, fuzzy
 msgid "Received"
-msgstr "收到的消息"
+msgstr "已收到"
 
 msgid "Finished"
 msgstr "已完成"
@@ -801,21 +772,20 @@ msgstr "已完成"
 msgid "The file was saved as %s."
 msgstr "文件已另存为 %s。"
 
-#, fuzzy
 msgid "Sending"
-msgstr "发送"
+msgstr "正在发送"
 
-#, fuzzy
 msgid "Receiving"
-msgstr "剩余"
+msgstr "正在接收"
 
-#, fuzzy, c-format
+# c-format
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "与 %s 的对话"
+msgstr "在 %s 中与 %s 的对话"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "与 %s 的对话"
+msgstr "与 %s 在 %s 的对话"
 
 msgid "%B %Y"
 msgstr "%Y年%m月"
@@ -852,13 +822,45 @@ msgstr "与 %s 的对话"
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "对话"
+msgstr "全部对话"
 
 msgid "System Log"
 msgstr "系统日志"
 
+msgid "Calling ... "
+msgstr "正在呼叫..."
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "接受"
+
+msgid "Reject"
+msgstr "拒绝"
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+msgid "You have rejected the call."
+msgstr "您已经拒绝呼叫"
+
+msgid "call: Make an audio call."
+msgstr "呼叫：音频呼叫。"
+
 msgid "Emails"
 msgstr "电子邮件"
 
@@ -871,10 +873,11 @@ msgstr "发送方"
 msgid "Subject"
 msgstr "主题"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s(%s) 有 %d 封新邮件。"
+msgstr[1] "%s(%s) 有 %d 封新邮件。"
 
 msgid "New Mail"
 msgstr "新邮件"
@@ -892,19 +895,20 @@ msgstr "继续"
 msgid "IM"
 msgstr "开聊"
 
+msgid "Invite"
+msgstr "邀请"
+
 msgid "(none)"
 msgstr "(无)"
 
-#, fuzzy
 msgid "URI"
-msgstr "UIN"
+msgstr "URI"
 
 msgid "ERROR"
-msgstr ""
+msgstr "错误"
 
-#, fuzzy
 msgid "loading plugin failed"
-msgstr "Ping 失败"
+msgstr "载入插件失败"
 
 msgid "unloading plugin failed"
 msgstr ""
@@ -941,9 +945,8 @@ msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
 
-#, fuzzy
 msgid "Select plugin to install"
-msgstr "选择文件"
+msgstr "选择插件以安装"
 
 msgid "You can (un)load plugins from the following list."
 msgstr "您可以卸载以下列表中的插件。"
@@ -1034,16 +1037,14 @@ msgstr "执行命令"
 msgid "Play a sound"
 msgstr "播放声音"
 
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "仅当我的状态不可用时才监视(_O)"
+msgstr "仅当我的状态不可用时才监视"
 
 msgid "Recurring"
 msgstr "再现"
 
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "无法更改昵称"
+msgstr "无法创建监视"
 
 msgid "You do not have any accounts."
 msgstr "您没有帐户。"
@@ -1098,7 +1099,6 @@ msgstr "%s 走了。(%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 给您发送了消息。(%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误！"
 
@@ -1144,20 +1144,17 @@ msgstr "更改状态前等几分钟"
 msgid "Change status to"
 msgstr "将状态更改为"
 
-#. Conversations
 msgid "Conversations"
 msgstr "对话"
 
 msgid "Logging"
 msgstr "日志"
 
-#, fuzzy
 msgid "You must fill all the required fields."
-msgstr "填入注册字段。"
+msgstr "您必须填入注册字段。"
 
-#, fuzzy
 msgid "The required fields are underlined."
-msgstr "所需插件 %s 无法装入。"
+msgstr "所需区域已用下划线标出。"
 
 msgid "Not implemented yet."
 msgstr "未实现。"
@@ -1168,16 +1165,14 @@ msgstr "保存文件..."
 msgid "Open File..."
 msgstr "打开文件..."
 
-#, fuzzy
 msgid "Choose Location..."
-msgstr "位置"
+msgstr "选择位置..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
+msgstr "按'Enter'以寻找更多此分类下的聊天室。"
 
-#, fuzzy
 msgid "Get"
-msgstr "设置(_S)"
+msgstr "获取"
 
 #. Create the window.
 msgid "Room List"
@@ -1210,9 +1205,8 @@ msgstr "您在聊天中发言"
 msgid "Others talk in chat"
 msgstr "别人在聊天中发言"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "别人在聊天中提到您的名字"
+msgstr "有人在聊天中提到您的名字"
 
 msgid "GStreamer Failure"
 msgstr "GStreamer 失败"
@@ -1250,7 +1244,7 @@ msgstr "声音方式"
 msgid "Method: "
 msgstr "方式："
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
@@ -1274,9 +1268,8 @@ msgstr "仅当可用时"
 msgid "Only when not available"
 msgstr "仅当不可用时"
 
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "音量："
+msgstr "音量(0-100)："
 
 #. Sound events
 msgid "Sound Events"
@@ -1463,31 +1456,26 @@ msgid ""
 "conversation into the current conversation."
 msgstr "打开新对话时，此插件将会将上次对话插入当前对话。"
 
-#, c-format
 msgid "Online"
 msgstr "在线"
 
 msgid "Offline"
 msgstr "离线"
 
-#, fuzzy
 msgid "Online Buddies"
-msgstr "离线好友"
+msgstr "在线好友"
 
-#, fuzzy
 msgid "Offline Buddies"
 msgstr "离线好友"
 
-#, fuzzy
 msgid "Online/Offline"
-msgstr "上线时间"
+msgstr "在线/离线"
 
 msgid "Meebo"
 msgstr ""
 
-#, fuzzy
 msgid "No Grouping"
-msgstr "无声音"
+msgstr "未分组"
 
 msgid "Nested Subgroup"
 msgstr ""
@@ -1495,12 +1483,11 @@ msgstr ""
 msgid "Nested Grouping (experimental)"
 msgstr ""
 
-#, fuzzy
 msgid "Provides alternate buddylist grouping options."
-msgstr "提供与 Evolution 的集成。"
+msgstr "提供其他分组选项。"
 
 msgid "Lastlog"
-msgstr "Lastlog"
+msgstr "最近日志"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
@@ -1513,6 +1500,27 @@ msgstr "历史"
 msgid "Lastlog plugin."
 msgstr "Lastlog 插件。"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL 插件"
+
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr ""
+
 msgid "accounts"
 msgstr "账户"
 
@@ -1603,20 +1611,13 @@ msgid "SSL Peers Cache"
 msgstr ""
 
 #. Make messages
-#, fuzzy, c-format
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "接受聊天邀请吗？"
+msgstr "接受 %s 的聊天邀请吗？"
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr ""
-
-#. Number of actions
-msgid "Accept"
-msgstr "接受"
-
-msgid "Reject"
-msgstr "拒绝"
+msgstr "SSL 证书验证"
 
 msgid "_View Certificate..."
 msgstr "查看证书(_V)..."
@@ -1688,16 +1689,14 @@ msgid ""
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "服务器信息"
+msgstr "证书信息"
 
 msgid "Registration Error"
 msgstr "注册错误"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "注册错误"
+msgstr "解除注册错误"
 
 #, c-format
 msgid "+++ %s signed on"
@@ -1707,6 +1706,8 @@ msgstr "+++ %s 已登入"
 msgid "+++ %s signed off"
 msgstr "+++ %s 已登出"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "未知错误"
 
@@ -1753,6 +1754,15 @@ msgstr "%s 离开了聊天室。"
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
+msgid "Invite to chat"
+msgstr "邀请会议"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "您想要邀请谁？请输入他/她的名字，以及可选的邀请消息。"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "获得连接失败: %s"
@@ -1887,7 +1897,6 @@ msgstr "开始来自 %2$s 的 %1$s 传送"
 msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"
 
-#, c-format
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
@@ -1895,7 +1904,6 @@ msgstr "文件传送完成"
 msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
-#, c-format
 msgid "File transfer cancelled"
 msgstr "文件传送已取消"
 
@@ -2080,11 +2088,14 @@ msgstr "<font color=\"red\"><b>无法读取文件: %s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "创建连接出错"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "您正在使用 %s，但插件需要 %s。"
 
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2116,9 +2127,9 @@ msgstr "所需插件 %s 无法装入。"
 msgid "Unable to load your plugin."
 msgstr "无法装入您的插件。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "依赖的插件 %s 装入失败。"
+msgstr "%s 依赖的插件 %s 卸载失败。"
 
 msgid "Autoaccept"
 msgstr "自动接受"
@@ -2174,9 +2185,8 @@ msgid ""
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "选择要搜索的用户目录"
+msgstr "为每个用户创建新目录"
 
 msgid "Notes"
 msgstr "备注"
@@ -2466,9 +2476,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日志查看器中包含其它即时通讯客户的日志。"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2521,7 +2532,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2549,6 +2560,32 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
+#, fuzzy
+msgid "One Time Password"
+msgstr "输入密码"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2737,18 +2774,18 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "无法监听连入的 IM 连接\n"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "无法建立与本地 mDNS 服务器的连接。服务器是否在运行中？"
 
-#. Creating the options for the protocol
 msgid "First name"
 msgstr "名"
 
@@ -2780,6 +2817,10 @@ msgstr "Bonjour 协议插件"
 msgid "Purple Person"
 msgstr "Purple 联系人"
 
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "本地端口"
+
 msgid "Bonjour"
 msgstr "Bonjour"
 
@@ -2790,18 +2831,24 @@ msgstr "%s 已经关闭了对话。"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "无法发送消息，无法开始对话。"
 
-msgid "Cannot open socket"
-msgstr "无法打开套接字"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"无法创建套接字：\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "无法将套接字绑定到端口"
 
-msgid "Could not listen on socket"
-msgstr "无法在套接字上监听"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"无法创建套接字：\n"
+"%s"
 
-#, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "与服务器通讯出错"
+msgstr "与本地 DNS 服务通讯出错"
 
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
@@ -2826,9 +2873,9 @@ msgstr "您的好友列表为空，没有什么可保存到文件的。"
 msgid "Buddylist saved successfully!"
 msgstr "好友列表成功保存!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "无法装入好友列表"
+msgstr "无法为 %s 写入 %s 好友列表"
 
 msgid "Couldn't load buddylist"
 msgstr "无法装入好友列表"
@@ -2845,13 +2892,16 @@ msgstr "保存好友列表..."
 msgid "Load buddylist from file..."
 msgstr "从文件装入好友列表..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "填入注册字段。"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "密码不匹配。"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "无法创建新账户。发生了错误。\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2863,14 +2913,15 @@ msgstr "注册成功！"
 msgid "Password"
 msgstr "密码"
 
-msgid "Password (retype)"
-msgstr "密码(重新输入)"
+msgid "Password (again)"
+msgstr "再次输入新密码"
 
-msgid "Enter current token"
-msgstr "输入当前令牌"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "当前令牌"
+#, fuzzy
+msgid "Captcha"
+msgstr "保存图像"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "注册新的 Gadu-Gadu 账户"
@@ -2923,6 +2974,15 @@ msgstr "密码成功更改！"
 msgid "Current password"
 msgstr "当前密码"
 
+msgid "Password (retype)"
+msgstr "密码(重新输入)"
+
+msgid "Enter current token"
+msgstr "输入当前令牌"
+
+msgid "Current token"
+msgstr "当前令牌"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "请输入您目前 UIN 的密码和新密码："
 
@@ -2936,13 +2996,13 @@ msgstr "为好友选择聊天：%s"
 msgid "Add to chat..."
 msgstr "添加到聊天..."
 
+#. Global
 msgid "Available"
 msgstr "可用"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#, c-format
 msgid "Away"
 msgstr "离开"
 
@@ -2970,7 +3030,7 @@ msgstr "未找到匹配的用户"
 msgid "There are no users matching your search criteria."
 msgstr "没有与您的搜索条件匹配的用户。"
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "无法读取套接字"
 
 msgid "Buddy list downloaded"
@@ -2985,8 +3045,14 @@ msgstr "好友列表已上传"
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友列表存储于服务器上。"
 
-msgid "Connection failed."
-msgstr "连接失败。"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "已连接"
+
+msgid "Connection failed"
+msgstr "连接失败"
 
 msgid "Add to chat"
 msgstr "添加到聊天"
@@ -2994,13 +3060,23 @@ msgstr "添加到聊天"
 msgid "Chat _name:"
 msgstr "聊天名(_N)："
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "无法连接到服务器。"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "正连接"
+
 msgid "Chat error"
 msgstr "聊天错误"
 
 msgid "This chat name is already in use"
 msgstr "此聊天名已经在使用中"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "未连接到服务器。"
 
 msgid "Find buddies..."
@@ -3042,6 +3118,10 @@ msgstr "波兰流行的即时通讯软件"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 用户"
 
+#, fuzzy
+msgid "GG server"
+msgstr "设置用户信息..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
@@ -3056,7 +3136,8 @@ msgstr "未设定话题"
 msgid "File Transfer Failed"
 msgstr "文件传送失败"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "无法打开监听端口。"
 
 msgid "Error displaying MOTD"
@@ -3072,8 +3153,18 @@ msgstr "没有与此连接关联的 MOTD"
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-msgid "Server has disconnected"
-msgstr "服务器已断开连接"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"失去与服务器的连接：\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "查看 MOTD"
@@ -3084,25 +3175,24 @@ msgstr "频道(_C)："
 msgid "_Password:"
 msgstr "密码(_P)："
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "正连接"
-
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-msgid "Couldn't create socket"
-msgstr "无法创建套接字"
+msgid "Unable to connect"
+msgstr "无法连接"
 
-msgid "Couldn't connect to host"
-msgstr "无法连接到主机"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "无法连接到 %s"
 
-msgid "Read error"
-msgstr "读取错误"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "服务器关闭了连接。"
 
 msgid "Users"
 msgstr "用户"
@@ -3156,13 +3246,12 @@ msgstr "无效模式"
 msgid "Ban on %s by %s, set %s ago"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Ban on %s"
-msgstr "原因: %s"
+msgstr "屏蔽: %s"
 
-#, fuzzy
 msgid "End of ban list"
-msgstr "未列出"
+msgstr "屏蔽列表结束"
 
 #, c-format
 msgid "You are banned from %s."
@@ -3280,6 +3369,16 @@ msgid ""
 "invalid characters."
 msgstr "您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "昵称 \"%s\" 已被使用。"
+
+msgid "Nickname in use"
+msgstr "昵称已被使用"
+
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
@@ -3297,9 +3396,9 @@ msgstr "错误: 服务器的 PONG 无效"
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "需要注册"
+msgstr "无法加入 %s：需要注册"
 
 msgid "Cannot join channel"
 msgstr "无法加入频道"
@@ -3493,12 +3592,13 @@ msgstr "命令已禁用"
 msgid "execute"
 msgstr "未期待"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "您要求 TLS/SSL 登录，但没有找到 TLS/SSL 支持。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
@@ -3512,18 +3612,46 @@ msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做
 msgid "Plaintext Authentication"
 msgstr "纯文本认证"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "认证失败"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "服务器的响应无效。"
 
 msgid "Server does not use any supported authentication method"
 msgstr "服务器未使用任何支持的身份验证方法"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL 错误"
 
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr "没有给出会话 ID"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "不支持 BOSH 协议的版本"
+
+msgid "Unable to establish a connection with the server"
+msgstr "无法与服务器建立连接"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "无法与服务器建立连接"
+
+msgid "Unable to establish SSL connection"
+msgstr "无法建立 SSL 连接"
+
 msgid "Full Name"
 msgstr "全名"
 
@@ -3588,182 +3716,8 @@ msgstr "客户"
 msgid "Operating System"
 msgstr "操作系统"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr "服务目录信息"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "额外地址"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "给聊天起名"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "用户没有目录信息。"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "命令"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "注册错误"
-
-#, fuzzy
-msgid "User Location"
-msgstr "位置"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "用户搜索"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "好友状态通知"
-
-msgid "Software Version"
-msgstr "软件版本"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "方向"
-
-msgid "File Transfer"
-msgstr "文件传送"
-
-msgid "User Mood"
-msgstr "用户心情"
-
-msgid "User Activity"
-msgstr "用户活动"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "能力"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "用户名"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "带密钥交换开聊"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "电子邮件地址"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "个人资料"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "加入"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "用户名"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "实时视频"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "消息已收到"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "公钥漏印"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "用户选项"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "用户模式"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "用户名"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "允许限制"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian 加密"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "能力"
+msgid "Local Time"
+msgstr "本地时间"
 
 msgid "Priority"
 msgstr "优先级"
@@ -3771,6 +3725,14 @@ msgstr "优先级"
 msgid "Resource"
 msgstr "资源"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "已登入"
+
 msgid "Middle Name"
 msgstr "中名"
 
@@ -3805,13 +3767,11 @@ msgstr "(重新)请求认证"
 msgid "Unsubscribe"
 msgstr "退订"
 
-#, fuzzy
 msgid "Log In"
-msgstr "已登入"
+msgstr "登录"
 
-#, fuzzy
 msgid "Log Out"
-msgstr "记录聊天"
+msgstr "退出"
 
 msgid "Chatty"
 msgstr "唠叨"
@@ -3819,7 +3779,6 @@ msgstr "唠叨"
 msgid "Extended Away"
 msgstr "远远离开"
 
-#, c-format
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
@@ -3859,9 +3818,8 @@ msgstr "填入输入框可以搜索匹配的 Jabber 用户。"
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "搜索用户"
+msgstr "搜索 XMPP 用户"
 
 #. "Search"
 msgid "Search"
@@ -3942,29 +3900,24 @@ msgstr "选择要查询的会议服务器"
 msgid "Find Rooms"
 msgstr "查找房间"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "别名："
 
-msgid "Write error"
-msgstr "写错误"
+msgid "No users found"
+msgstr "未找到匹配的用户"
 
-#, fuzzy
-msgid "Ping timeout"
-msgstr "纯文本"
+msgid "Roles:"
+msgstr "角色："
 
-msgid "Read Error"
-msgstr "读取错误"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Ping 超时"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
-"无法建立与服务器：\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "无法创建套接字"
 
 msgid "Invalid XMPP ID"
 msgstr "无效 XMPP ID"
@@ -3972,13 +3925,17 @@ msgstr "无效 XMPP ID"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
+#, fuzzy
+msgid "Malformed BOSH URL"
+msgstr "连接到服务器失败。"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "%s@%s 注册成功"
+msgstr "%s 注册成功"
 
 msgid "Registration Successful"
 msgstr "注册成功"
@@ -3986,20 +3943,15 @@ msgstr "注册成功"
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "%s@%s 注册成功"
+msgstr "%s 取消注册成功"
 
-#, fuzzy
 msgid "Unregistration Successful"
-msgstr "注册成功"
+msgstr "取消注册成功"
 
-#, fuzzy
 msgid "Unregistration Failed"
-msgstr "注册失败"
-
-msgid "Already Registered"
-msgstr "已注册"
+msgstr "取消注册失败"
 
 msgid "State"
 msgstr "州/省"
@@ -4013,10 +3965,12 @@ msgstr "电话"
 msgid "Date"
 msgstr "日期"
 
+msgid "Already Registered"
+msgstr "已注册"
+
 msgid "Unregister"
 msgstr "取消注册"
 
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "请在下面填入信息以注册您新的账户。"
@@ -4024,39 +3978,39 @@ msgstr "请在下面填入信息以注册您新的账户。"
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "注册新的 Jabber 账户"
+msgstr "注册新的 XMPP 账户"
 
 msgid "Register"
 msgstr "注册"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "更改 %s 的用户信息"
+msgstr "更改在 %s 的用户信息"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Register New Account at %s"
-msgstr "注册新的 Jabber 账户"
+msgstr "在 %s 注册新账户"
 
-#, fuzzy
 msgid "Change Registration"
-msgstr "注册错误"
+msgstr "更改帐户"
+
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "连接到服务器失败。"
 
 #, fuzzy
 msgid "Error unregistering account"
 msgstr "更改账户信息出错"
 
-#, fuzzy
 msgid "Account successfully unregistered"
-msgstr "您成功创建了一个群"
+msgstr "取消帐户注册成功"
 
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "初始化流"
+msgstr "初始化 SSL/TLS"
 
 msgid "Authenticating"
 msgstr "正在认证"
@@ -4064,9 +4018,18 @@ msgstr "正在认证"
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
+msgid "Server doesn't support blocking"
+msgstr ""
+
 msgid "Not Authorized"
 msgstr "未认证"
 
+msgid "Mood"
+msgstr "心情"
+
+msgid "Now Listening"
+msgstr ""
+
 msgid "Both"
 msgstr "双向"
 
@@ -4088,12 +4051,6 @@ msgstr "无"
 msgid "Subscription"
 msgstr "订阅"
 
-msgid "Mood"
-msgstr "心情"
-
-msgid "Now Listening"
-msgstr ""
-
 #, fuzzy
 msgid "Mood Text"
 msgstr "血型"
@@ -4141,12 +4098,8 @@ msgstr "您的密码已更改。"
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-msgid "Password (again)"
-msgstr "再次输入新密码"
-
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "更改密码"
+msgstr "更改 XMPP 密码"
 
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
@@ -4334,22 +4287,28 @@ msgstr "无法发送消息: %s"
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "无法屏蔽用户 %s"
+msgstr "无法 ping 用户 %s"
 
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "无法给 %s 发送文件，用户不支持文件传送"
 
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "无法给 %s 发送文件，用户不支持文件传送"
 
 #, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "无法给 %s 发送文件，用户不支持文件传送"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4359,9 +4318,35 @@ msgstr ""
 msgid "%s has buzzed you!"
 msgstr "%s 已经将您[%s]添加为好友"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "无法给 %s 发送消息。"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "无法给 %s 发送文件，用户不支持文件传送"
+
+#, fuzzy, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "无法给 %s 发送文件，用户不支持文件传送"
+
+#, fuzzy
+msgid "Media Initiation Failed"
+msgstr "注册失败"
+
+#, fuzzy, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "您想要查看谁的信息？请输入他/她的用户名或别名。"
+
+#, fuzzy
+msgid "Select a Resource"
+msgstr "选择文件"
+
+#, fuzzy
+msgid "Initiate Media"
+msgstr "发起聊天(_C)"
 
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
@@ -4383,13 +4368,14 @@ msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: 设置用户在房间"
 "中的角色。"
@@ -4425,14 +4411,12 @@ msgstr "buzz: 向联系人发送闪屏震动，以便引起他的注意"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "XMPP Protocol Plugin"
-msgstr "MSN 协议插件"
+msgstr "XMPP 协议插件"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#, fuzzy
 msgid "Domain"
-msgstr "罗马尼亚语"
+msgstr "域"
 
 msgid "Require SSL/TLS"
 msgstr ""
@@ -4452,19 +4436,20 @@ msgstr "连接端口"
 msgid "Connect server"
 msgstr "连接服务器"
 
-#, fuzzy
 msgid "File transfer proxies"
-msgstr "文件传送端口"
+msgstr "文件传送代理"
+
+msgid "BOSH URL"
+msgstr ""
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
-msgstr "显示自定义如下："
+msgstr "显示自定义表情"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s 已经关闭了对话。"
+msgstr "%s 已经离开了对话。"
 
 #, c-format
 msgid "Message from %s"
@@ -4482,11 +4467,10 @@ msgstr "话题为: %s"
 msgid "Message delivery to %s failed: %s"
 msgstr "投递到 %s 的消息失败: %s"
 
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "Jabber 消息错误"
+msgstr "XMPP 消息错误"
 
-#, fuzzy, c-format
+#, c-format
 msgid "(Code %s)"
 msgstr " (代码 %s)"
 
@@ -4496,6 +4480,14 @@ msgstr "XML 分析错误"
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "加入聊天 %s 出错"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "聊天 %s 出错"
+
 msgid "Create New Room"
 msgstr "创建新房间"
 
@@ -4510,13 +4502,32 @@ msgstr "配置房间(_C)"
 msgid "_Accept Defaults"
 msgstr "接受默认值(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "加入聊天 %s 出错"
+#, fuzzy
+msgid "No reason"
+msgstr "没有给出理由。"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "聊天 %s 出错"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "您被 %s: %s 踢出了"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "被 %s (%s) 踢出"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "打开文件时发生了错误。"
+
+#, fuzzy
+msgid "Transfer was closed."
+msgstr "文件传送失败"
+
+#, fuzzy
+msgid "Failed to open the file"
+msgstr "打开文件“%s”：%s"
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4542,10 +4553,6 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "您想要查看谁的信息？请输入他/她的用户名或别名。"
 
 #, fuzzy
-msgid "Select a Resource"
-msgstr "选择文件"
-
-#, fuzzy
 msgid "Edit User Mood"
 msgstr "用户模式"
 
@@ -4585,9 +4592,19 @@ msgstr "动作"
 msgid "Select an action"
 msgstr "选择文件"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "无法添加“%s”。"
+
+msgid "Buddy Add error"
+msgstr ""
+
 #, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "选择 Notes 地址簿"
+msgid "The username specified does not exist."
+msgstr "指定的用户名无效。"
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4814,7 +4831,7 @@ msgstr "没有父母在的儿童 Passport"
 msgid "Passport account not yet verified"
 msgstr "Passport 账户未验证"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Passport account suspended"
 msgstr "Passport 账户未验证"
 
@@ -4838,6 +4855,10 @@ msgstr "首选联系人"
 msgid "Non-IM Contacts"
 msgstr "删除联系人"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s 向您发送了摄像头邀请，但尚不支持。"
+
 msgid "Nudge"
 msgstr ""
 
@@ -4910,6 +4931,13 @@ msgstr "发送移动消息。"
 msgid "Page"
 msgstr "寻呼"
 
+msgid "Playing a game"
+msgstr ""
+
+#, fuzzy
+msgid "Working"
+msgstr "工作"
+
 msgid "Has you"
 msgstr ""
 
@@ -4951,6 +4979,14 @@ msgstr "美工"
 msgid "Album"
 msgstr "Adium"
 
+#, fuzzy
+msgid "Game Title"
+msgstr "标题"
+
+#, fuzzy
+msgid "Office Title"
+msgstr "标题"
+
 msgid "Set Friendly Name..."
 msgstr "设置友好的名称..."
 
@@ -4984,9 +5020,6 @@ msgstr "发起聊天(_C)"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。"
 
-msgid "Failed to connect to server."
-msgstr "连接到服务器失败。"
-
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
@@ -5139,8 +5172,9 @@ msgid ""
 "does not exist."
 msgstr "在用户的个人资料中找不到任何信息。用户可能不存在。"
 
-msgid "Profile URL"
-msgstr "配置文件 URL"
+#, fuzzy
+msgid "View web profile"
+msgstr "离线时隐藏"
 
 #. *< type
 #. *< ui_requirement
@@ -5176,66 +5210,29 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "失败: 身份验证失败"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s 不是有效的组名。"
-
-msgid "Unknown error."
-msgstr "未知错误。"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2$s(%3$s) 上的 %1$s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 刚刚给您发送了闪屏振动！"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "未知错误"
 
 msgid "Unable to add user"
 msgstr "无法添加用户"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "未知错误"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "下面是您搜索的结果"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "无法在 %s(%s) 上添加用户"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "无法在 %s(%s) 上屏蔽用户"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "无法允许 %s(%s) 上的拥护"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "无法添加 %s，原因是您的好友列表已满。"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s 不是有效的通行证账户。"
-
-msgid "Service Temporarily Unavailable."
-msgstr "服务暂时不可用。"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "消息未发出，因为您尚未登入。"
 
-msgid "Unable to rename group"
-msgstr "无法重命名组"
-
-msgid "Unable to delete group"
-msgstr "无法删除组"
-
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
 "automatically be signed out at that time.  Please finish any conversations "
@@ -5255,6 +5252,11 @@ msgstr[0] ""
 "现在进行中的对话。\n"
 "\n"
 "维护完成后，您将能够成功登入。"
+msgstr[1] ""
+"MSN 服务器即将于 %d 分钟后关闭进行维护。到那时，您将会被自动登出。请尽快关闭"
+"现在进行中的对话。\n"
+"\n"
+"维护完成后，您将能够成功登入。"
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
@@ -5273,9 +5275,6 @@ msgstr "消息未发出，因为发生了未知错误："
 msgid "Message was not sent because an unknown error occurred."
 msgstr "消息未发出，因为发生了未知错误："
 
-msgid "Unable to connect"
-msgstr "无法连接"
-
 msgid "Writing error"
 msgstr "写入错误"
 
@@ -5290,19 +5289,23 @@ msgstr ""
 "%s 服务器的连接错误：\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "服务器不支持此协议。"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "分析 HTTP 出错。"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "您在其它位置用此用户名登入了。"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN 服务器临时不可用。请稍候再试一次。"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN 服务器目前维护中。"
 
 #, c-format
@@ -5331,6 +5334,14 @@ msgstr "发送 cookie"
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s 向您发送了摄像头邀请，但尚不支持。"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s 向您发送了摄像头邀请，但尚不支持。"
+
 msgid "Away From Computer"
 msgstr "远离电脑"
 
@@ -5367,14 +5378,6 @@ msgstr "消息未发出，因为切换板发生了错误："
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "消息未发出，因为发生了未知错误："
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s 已将您添加为好友。"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s 已经将您从好友名单中删除。"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "添加到地址簿"
@@ -5383,13 +5386,6 @@ msgstr "添加到地址簿"
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "您是否想要将此人加为好友？"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "无法添加“%s”。"
-
 #, fuzzy
 msgid "The username specified is invalid."
 msgstr "指定的用户名无效。"
@@ -5397,6 +5393,9 @@ msgstr "指定的用户名无效。"
 msgid "This Hotmail account may not be active."
 msgstr "此 Hotmail 账户可能未激活。"
 
+msgid "Profile URL"
+msgstr "配置文件 URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5411,17 +5410,62 @@ msgstr "此 Hotmail 账户可能未激活。"
 msgid "MSN Protocol Plugin"
 msgstr "AIM 协议插件"
 
-msgid "Missing Cipher"
-msgstr ""
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s 不是有效的组名。"
 
-msgid "The RC4 cipher could not be found"
-msgstr ""
+msgid "Unknown error."
+msgstr "未知错误。"
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s(%3$s) 上的 %1$s"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "无法在 %s(%s) 上添加用户"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "无法在 %s(%s) 上屏蔽用户"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "无法允许 %s(%s) 上的拥护"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "无法添加 %s，原因是您的好友列表已满。"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s 不是有效的通行证账户。"
+
+msgid "Service Temporarily Unavailable."
+msgstr "服务暂时不可用。"
+
+msgid "Unable to rename group"
+msgstr "无法重命名组"
+
+msgid "Unable to delete group"
+msgstr "无法删除组"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s 已将您添加为好友。"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s 已经将您从好友名单中删除。"
+
+#, c-format
+msgid "No such user: %s"
 msgstr ""
 
+#, fuzzy
+msgid "User lookup"
+msgstr "用户房间"
+
 msgid "Reading challenge"
 msgstr "读取挑战"
 
@@ -5433,12 +5477,25 @@ msgstr "服务器的挑战无效"
 msgid "Logging in"
 msgstr "日志"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] ""
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "无名称"
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#, fuzzy
+msgid "Lost connection with server"
+msgstr ""
+"丢失与服务器的连接\n"
+"%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "发送消息"
@@ -5459,20 +5516,21 @@ msgid "MySpace"
 msgstr ""
 
 #, fuzzy
-msgid "MySpaceIM - No Username Set"
-msgstr "无名称"
-
-msgid "You appear to have no MySpace username."
-msgstr ""
+msgid "IM Friends"
+msgstr "即时消息窗口(_I)"
 
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "已连接"
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "服务器的响应无效。"
 
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
@@ -5480,16 +5538,23 @@ msgstr "进程返回了错误代码 %d"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "昵称或密码不对"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid input condition"
+msgstr "完成连接"
+
+#, fuzzy
 msgid "Failed to add buddy"
 msgstr "在聊天中加入好友失败"
 
@@ -5501,14 +5566,6 @@ msgstr "从文件装入好友列表..."
 msgid "persist command failed"
 msgstr "切换板失败"
 
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
-msgid "User lookup"
-msgstr "用户房间"
-
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "在聊天中加入好友失败"
@@ -5520,38 +5577,16 @@ msgstr ""
 msgid "blocklist command failed"
 msgstr "切换板失败"
 
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "完成连接"
-
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "队列满"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "无法处理消息"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "无法连接到主机"
+msgid "Missing Cipher"
+msgstr ""
 
-#, fuzzy
-msgid "IM Friends"
-msgstr "即时消息窗口(_I)"
+msgid "The RC4 cipher could not be found"
+msgstr ""
 
-#, c-format
 msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "服务器的响应无效。"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
 
 msgid "Add friends from MySpace.com"
 msgstr ""
@@ -5596,9 +5631,6 @@ msgstr "较大字体"
 msgid "User"
 msgstr "用户"
 
-msgid "Profile"
-msgstr "个人资料"
-
 #, fuzzy
 msgid "Headline"
 msgstr "昵称(_H)："
@@ -5614,15 +5646,10 @@ msgstr ""
 msgid "Client Version"
 msgstr "关闭对话"
 
-#. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
-msgid "No username set"
-msgstr "无名称"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-msgid "Please enter a username to check its availability:"
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
 msgstr ""
 
 #, fuzzy
@@ -5635,6 +5662,9 @@ msgstr ""
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "此主题没有可用的表情。"
@@ -5643,6 +5673,14 @@ msgstr "此主题没有可用的表情。"
 msgid "Please try another username:"
 msgstr "请输入 %s 的新名称"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "无名称"
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -5838,10 +5876,6 @@ msgid "Master archive is misconfigured"
 msgstr "主存档配置错误"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "昵称或密码不对"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "无法识别您输入用户名的主机"
 
@@ -5881,9 +5915,9 @@ msgstr "用户或者离线，或者已经屏蔽了您"
 msgid "Unknown error: 0x%X"
 msgstr "未知错误: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "登录失败(%s)。"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "无法 ping 用户 %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5981,9 +6015,6 @@ msgstr "GroupWise 会议 %d"
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-msgid "Unable to connect to server."
-msgstr "无法连接到服务器。"
-
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
@@ -6007,23 +6038,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话？"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "您已被注销，因为您已从其它计算机上登录。"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 显示为离线，因此未接受到您刚刚发出的消息。"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-msgid "Error. SSL support is not installed."
-msgstr "出错。SSL 支持未安装。"
-
-#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
@@ -6047,6 +6072,25 @@ msgid "Server port"
 msgstr "服务器端口"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "从服务器收到了意外的 HTTP 响应。"
+
+#. username connecting too frequently
+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 ""
+"您连接和断开得太频繁。请等十分钟，然后再试一次。如果您继续重试，您等的时间可"
+"能会更长。"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "请求登录令牌出错"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "无法连接"
 
@@ -6054,18 +6098,8 @@ msgstr "无法连接"
 msgid "Invalid chat room name"
 msgstr "无效的房间名"
 
-msgid "Server closed the connection."
-msgstr "服务器关闭了连接。"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"失去与服务器的连接：\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "在与服务器的连接中收到了无效的数据。"
 
 #. *< type
@@ -6113,7 +6147,8 @@ msgstr "失去与远程用户的连接：<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "无法建立与远程用户的连接。"
 
 msgid "Direct IM established"
@@ -6216,7 +6251,7 @@ msgstr "(转换此信息出错。与您对话的好友可能正在使用存在�
 
 #. Label
 msgid "Buddy Icon"
-msgstr "好友图标"
+msgstr "用户头像"
 
 msgid "Voice"
 msgstr "语音"
@@ -6282,23 +6317,18 @@ msgstr "相机"
 msgid "Screen Sharing"
 msgstr "用户名"
 
-#, c-format
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#, c-format
 msgid "Not Available"
 msgstr "不可用"
 
-#, c-format
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#, c-format
 msgid "Web Aware"
 msgstr "网上留意"
 
-#, c-format
 msgid "Invisible"
 msgstr "隐身"
 
@@ -6311,21 +6341,15 @@ msgstr "警告级别"
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "无法连接到身份验证服务器：\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"无法连接到 BOS 服务器：\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "无法连接到服务器。"
 
 #, fuzzy
 msgid "Username sent"
@@ -6340,50 +6364,57 @@ msgstr "完成连接"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "无法登入: 无法以 %s 登入，原因是用户名无效。用户名必须是有效的电子邮件地址，"
 "或者以字母开头，且只能包含字母、数字和空格，或者只包含数字。"
 
-#. Unregistered screen name
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "您即将被断开。请检查 %s 上的更新。"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "无法获取有效的 AIM 登录码。"
+
+msgid "Unable to get a valid login hash."
+msgstr "无法获取有效的登录码。"
+
+msgid "Received authorization"
+msgstr "收到的认证"
+
+#. Unregistered username
 #. uid is not exist
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "名称无效"
-
-msgid "Incorrect password."
-msgstr "密码不对。"
+msgid "Username does not exist"
+msgstr "用户不存在"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#. screen name connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "您使用的客户版本太老。请在 %s 升级"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "您连接和断开得太频繁。请等十分钟，然后再试一次。如果您继续重试，您等的时间可"
 "能会更长。"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "您使用的客户版本太老。请在 %s 升级"
-
-msgid "Could Not Connect"
-msgstr "无法连接"
-
-msgid "Received authorization"
-msgstr "收到的认证"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "输入的 SecurID 密钥无效。"
 
 msgid "Enter SecurID"
@@ -6398,23 +6429,6 @@ msgstr "输入所显示的六位数字。"
 msgid "_OK"
 msgstr "确定(_O)"
 
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "无法获取有效的 AIM 登录码。"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "您即将被断开。请检查 %s 上的更新。"
-
-msgid "Unable to get a valid login hash."
-msgstr "无法获取有效的登录码。"
-
 msgid "Password sent"
 msgstr "密码已送出"
 
@@ -6502,42 +6516,48 @@ msgstr "添加(_A)"
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#, c-format
+#, fuzzy, 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] "您错过了 %2$s 的 %1$hu 条消息，原因是这些消息无效。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因是这些消息无效。"
 
-#, c-format
+#, fuzzy, 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] "您错过了 %2$s 的 %1$hu 条消息，原因是这些消息太大。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因是这些消息太大。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息，原因是达到了等级限制。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因是达到了等级限制。"
 
 #, fuzzy, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "您错过了 %2$s 的 %1$hu 条消息，原因是他/她太可恶了。"
+msgstr[0] "您错过了 %2$s 的 %1$hu 条消息，原因是他/她的警告级别过高。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因是他/她的警告级别过高。"
 
 #, fuzzy, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "您错过了 %2$s 的 %1$hu 条消息，原因是您太可恶了。"
+msgstr[0] "您错过了 %2$s 的 %1$hu 条消息，原因是您的警告级别过高。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因是您的警告级别过高。"
 
-#, c-format
+#, fuzzy, 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] "您错过了 %2$s 的 %1$hu 条消息，原因未知。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因未知。"
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "无法发送消息: %s"
@@ -6559,6 +6579,12 @@ msgstr "上线时间"
 msgid "Member Since"
 msgstr "注册时间"
 
+msgid "Capabilities"
+msgstr "能力"
+
+msgid "Profile"
+msgstr "个人资料"
+
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
@@ -6687,7 +6713,7 @@ msgstr ""
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定；请在您完全连接后"
 "再试一次。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -6695,11 +6721,12 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
+msgstr[1] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
 
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -6707,13 +6734,14 @@ msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
+msgstr[1] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
 
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6739,9 +6767,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "孤儿"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "无法将 %s 加为好友，原因是您的好友太多。请删除其中一个好友，然后再试一次。"
@@ -6750,7 +6778,7 @@ msgid "(no name)"
 msgstr "(无名称)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "您的命令失败，原因未知。"
 
 #, fuzzy, c-format
@@ -6815,6 +6843,7 @@ msgstr "连接(_O)"
 msgid "Get AIM Info"
 msgstr "获得 AIM 信息"
 
+#. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
@@ -6875,6 +6904,7 @@ msgstr "搜索(_S)"
 msgid "Set User Info (web)..."
 msgstr "设置用户信息(URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "更改密码(URL)"
@@ -6907,6 +6937,10 @@ msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "用户未登入"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6926,7 +6960,6 @@ msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在试图连接到 %s:%hu。"
 
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "正在试图通过代理服务器连接。"
 
@@ -7021,7 +7054,7 @@ msgstr "其它"
 msgid "Visible"
 msgstr "隐身"
 
-msgid "Firend Only"
+msgid "Friend Only"
 msgstr ""
 
 #, fuzzy
@@ -7112,16 +7145,48 @@ msgstr "上次更新"
 msgid "Could not change buddy information."
 msgstr "请输入好友信息。"
 
-#, c-format
-msgid "%d needs Q&A"
+msgid "Mobile"
+msgstr "移动"
+
+msgid "Note"
+msgstr "备注"
+
+#. callback
+#, fuzzy
+msgid "Buddy Memo"
+msgstr "好友图标"
+
+msgid "Change his/her memo as you like"
 msgstr ""
 
 #, fuzzy
-msgid "Add buddy Q&A"
-msgstr "添加好友"
+msgid "_Modify"
+msgstr "修改"
+
+#, fuzzy
+msgid "Memo Modify"
+msgstr "修改"
+
+#, fuzzy
+msgid "Server says:"
+msgstr "服务器忙"
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%u requires verification"
+msgstr "请求认证"
+
+#, fuzzy
+msgid "Add buddy question"
+msgstr "将用户加为好友吗？"
 
 #, fuzzy
-msgid "Input answer here"
+msgid "Enter answer here"
 msgstr "在此输入请求"
 
 msgid "Send"
@@ -7135,18 +7200,19 @@ msgid "Authorization denied message:"
 msgstr "认证拒绝消息："
 
 #, fuzzy
-msgid "Sorry, You are not my style."
+msgid "Sorry, you're not my style."
 msgstr "抱歉，我不接受好友..."
 
 #, fuzzy, c-format
-msgid "%d needs authentication"
+msgid "%u needs authorization"
 msgstr "用户 %d 需要身份验证"
 
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "将用户加为好友吗？"
 
-msgid "Input request here"
+#, fuzzy
+msgid "Enter request here"
 msgstr "在此输入请求"
 
 msgid "Would you be my friend?"
@@ -7169,7 +7235,7 @@ msgid "Failed sending authorize"
 msgstr "请同意我将您加入好友！"
 
 #, fuzzy, c-format
-msgid "Failed removing buddy %d"
+msgid "Failed removing buddy %u"
 msgstr "在聊天中加入好友失败"
 
 #, fuzzy, c-format
@@ -7214,6 +7280,10 @@ msgid "You can only search for permanent Qun\n"
 msgstr "您只能搜索永久 QQ 群\n"
 
 #, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "无效的代理设置"
+
+#, fuzzy
 msgid "Not member"
 msgstr "我不是成员"
 
@@ -7256,16 +7326,19 @@ msgstr "此群不允许其他人加入"
 msgid "Join QQ Qun"
 msgstr "加入聊天"
 
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
+msgid "Input request here"
+msgstr "在此输入请求"
+
+#, fuzzy, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "您成功修改了群成员"
 
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "您成功修改了群成员"
 
 #, c-format
-msgid "Qun %d denied to join"
+msgid "Qun %u denied from joining"
 msgstr ""
 
 msgid "QQ Qun Operation"
@@ -7275,7 +7348,7 @@ msgstr "QQ 群操作"
 msgid "Failed:"
 msgstr "已失败"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr ""
 
 #, fuzzy
@@ -7290,11 +7363,11 @@ msgstr ""
 "此操作将永久删除此群。"
 
 #, fuzzy
-msgid "Sorry, you are not our style ..."
+msgid "Sorry, you are not our style"
 msgstr "抱歉，我不接受好友..."
 
 #, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Successfully changed Qun members"
 msgstr "您成功修改了群成员"
 
 #, fuzzy
@@ -7305,35 +7378,35 @@ msgid "You have successfully created a Qun"
 msgstr "您成功创建了一个群"
 
 #, fuzzy
-msgid "Would you like to set detailed information now?"
+msgid "Would you like to set up detailed information now?"
 msgstr "您现在是否想要设置群资料？"
 
 msgid "Setup"
 msgstr "设置"
 
 #, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
+msgid "%u requested to join Qun %u for %s"
 msgstr "用户 %d 申请加入 %d 群"
 
 #, fuzzy, c-format
-msgid "%d request to join Qun %d"
+msgid "%u request to join Qun %u"
 msgstr "用户 %d 申请加入 %d 群"
 
 #, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
+msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "在聊天中加入好友失败"
 
 #, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
+msgid "<b>Removed buddy %u.</b>"
 msgstr "删除好友"
 
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, fuzzy, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "删除好友"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7450,6 +7523,13 @@ msgstr "<b>上次刷新</b>: %s<br>\n"
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>目前在线人数</b>: %d<br>\n"
 
+#, fuzzy
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr "<b>上次刷新</b>: %s<br>\n"
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
@@ -7457,7 +7537,7 @@ msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "About OpenQ r%s"
+msgid "About OpenQ %s"
 msgstr "关于 %s"
 
 #, fuzzy
@@ -7478,6 +7558,10 @@ msgstr ""
 msgid "About OpenQ"
 msgstr "关于 %s"
 
+#, fuzzy
+msgid "Modify Buddy Memo"
+msgstr "家庭住址"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7509,7 +7593,6 @@ msgstr ""
 msgid "QQ2008"
 msgstr ""
 
-#. #endif
 #, fuzzy
 msgid "Connect by TCP"
 msgstr "正连接"
@@ -7522,6 +7605,9 @@ msgstr "服务器端口"
 msgid "Show server news"
 msgstr "服务器地址"
 
+msgid "Show chat room when msg comes"
+msgstr ""
+
 #, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "保持在线错误"
@@ -7531,11 +7617,7 @@ msgid "Update interval (seconds)"
 msgstr "保持在线错误"
 
 #, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "无法获取服务器信息"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
+msgid "Unable to decrypt server reply"
 msgstr "无法获取服务器信息"
 
 #, c-format
@@ -7558,21 +7640,20 @@ msgid "Activation required"
 msgstr "需要注册"
 
 #, c-format
-msgid "Unknow reply code when login (0x%02X)"
+msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Keep alive error"
-msgstr "保持在线错误"
-
 #, fuzzy
-msgid "Requesting captcha ..."
+msgid "Requesting captcha"
 msgstr "正在请求 %s 的注意..."
 
-msgid "Checking code of captcha ..."
-msgstr ""
+#, fuzzy
+msgid "Checking captcha"
+msgstr "正在请求 %s 的注意..."
 
-msgid "Failed captcha verify"
-msgstr ""
+#, fuzzy
+msgid "Failed captcha verification"
+msgstr "Yahoo! 认证失败"
 
 #, fuzzy
 msgid "Captcha Image"
@@ -7582,7 +7663,7 @@ msgstr "保存图像"
 msgid "Enter code"
 msgstr "输入密码"
 
-msgid "QQ Captcha Verifing"
+msgid "QQ Captcha Verification"
 msgstr ""
 
 #, fuzzy
@@ -7590,65 +7671,42 @@ msgid "Enter the text from the image"
 msgstr "请输入组名称"
 
 #, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
+msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
 
 #, c-format
 msgid ""
-"Unknow reply code when login (0x%02X):\n"
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "无法连接。"
-
 msgid "Socket error"
 msgstr "套接字错误"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"失去与服务器的连接：\n"
-"%s"
-
-msgid "Unable to read from socket"
-msgstr "无法读取套接字"
-
-msgid "Write Error"
-msgstr "写错误"
-
-msgid "Connection lost"
-msgstr "连接丢失"
-
 #, fuzzy
-msgid "Get server ..."
+msgid "Getting server"
 msgstr "设置用户信息..."
 
 #, fuzzy
-msgid "Request token"
+msgid "Requesting token"
 msgstr "请求被禁止"
 
-msgid "Couldn't resolve host"
-msgstr "无法解析主机"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "无法连接到服务器。"
 
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "无效错误"
 
 #, fuzzy
-msgid "Connecting server ..."
-msgstr "连接服务器"
+msgid "Connecting to server"
+msgstr "连接到 SILC 服务器"
 
 #, fuzzy
 msgid "QQ Error"
 msgstr "QQ 号错误"
 
-msgid "Failed to send IM."
-msgstr "发送消息失败"
-
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -7658,6 +7716,10 @@ msgid ""
 msgstr "ICQ 服务器转发"
 
 #, fuzzy, c-format
+msgid "%s:%s"
+msgstr "%s(%s)"
+
+#, fuzzy, c-format
 msgid "From %s:"
 msgstr "来自"
 
@@ -7667,32 +7729,30 @@ msgid ""
 "%s"
 msgstr "服务器指令：%s"
 
-msgid "Unknow SERVER CMD"
-msgstr ""
+#, fuzzy
+msgid "Unknown SERVER CMD"
+msgstr "未知原因"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
+"Room %u, reply 0x%02X"
 msgstr ""
 
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "命令"
 
-#, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr ""
-
-msgid "Can not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "无法获取服务器信息"
 
 #, fuzzy
-msgid "Unknow LOGIN CMD"
+msgid "Unknown LOGIN CMD"
 msgstr "未知原因"
 
 #, fuzzy
-msgid "Unknow CLIENT CMD"
+msgid "Unknown CLIENT CMD"
 msgstr "未知原因"
 
 #, c-format
@@ -7706,9 +7766,6 @@ msgstr "发送文件"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了 %s 的传送"
 
-msgid "Connection closed (writing)"
-msgstr "连接已关闭(写入)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>组标题：</b> %s<br>"
@@ -7762,17 +7819,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理员通知"
 
-msgid "Connection reset"
-msgstr "连接重置"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "从套接字读取时出错：%s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "无法连接到主机"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "来自 %s 的通知"
@@ -7796,6 +7842,9 @@ msgstr "扬声器"
 msgid "Video Camera"
 msgstr "摄像头"
 
+msgid "File Transfer"
+msgstr "文件传送"
+
 msgid "Supports"
 msgstr "支持"
 
@@ -8481,9 +8530,6 @@ msgstr "组织"
 msgid "Unit"
 msgstr "单元"
 
-msgid "Note"
-msgstr "备注"
-
 msgid "Join Chat"
 msgstr "加入聊天"
 
@@ -8583,6 +8629,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "网络统计"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping 失败"
 
@@ -8644,7 +8693,8 @@ msgstr "不支持的公钥类型"
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
 msgid "Key Exchange failed"
@@ -8654,26 +8704,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
-msgid "Connection failed"
-msgstr "连接失败"
-
 msgid "Performing key exchange"
 msgstr "执行密钥交换"
 
-msgid "Unable to create connection"
-msgstr "无法创建连接"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "无法装入 SILC 密钥对"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "无法装入 SILC 密钥对"
+
 msgid "Out of memory"
 msgstr "内存溢出"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "无法初始化 SILC 协议"
 
 msgid "Error loading SILC key pair"
@@ -8959,7 +9009,7 @@ msgid "Creating SILC key pair..."
 msgstr "创建 SILC 密钥对..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "创建 SILC 密钥对..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9053,6 +9103,9 @@ msgstr "白板"
 msgid "No server statistics available"
 msgstr "没有可用的服务器统计"
 
+msgid "Error during connecting to SILC Server"
+msgstr "连接到 SILC 服务器时出错"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配，请升级您的客户端"
@@ -9093,35 +9146,36 @@ msgstr "失败: 无效的 cookie"
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "无法初始化 SILC 客户连接"
 
 msgid "John Noname"
 msgstr "张三"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "无法装入 SILC 密钥对: %s"
 
-msgid "Could not write"
-msgstr "无法写入"
-
-msgid "Could not connect"
-msgstr "无法连接"
+msgid "Unable to create connection"
+msgstr "无法创建连接"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "未知的服务器响应。"
 
-msgid "Could not create listen socket"
-msgstr "无法创建监听套接字"
-
-msgid "Could not resolve hostname"
-msgstr "无法解析主机名"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "无法创建套接字"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 用户名不能包含空格或 @ 符号"
 
+#, fuzzy
+msgid "SIP connect server not specified"
+msgstr "服务器端口"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9155,174 +9209,63 @@ msgstr "认证用户"
 msgid "Auth Domain"
 msgstr "认证域"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "查阅 %s"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "连接到 %s 失败"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "登录名: %s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "无法写入文件 %s。"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "无法读取文件 %s。"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "消息太长，最后 %s 字节被截断。"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s 目前未登入。"
-
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "不允许对 %s 发出警告。"
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "丢失了一条消息，您超过了服务器速度限制。"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "在 %s 中无法聊天。"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "您给 %s 发送消息的速度太快。"
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "您错过了来自 %s 的消息，原因是该消息太大。"
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "您错过了来自 %s 的消息，原因是发送太快。"
-
-#, c-format
-msgid "Failure."
-msgstr "失败。"
-
-#, c-format
-msgid "Too many matches."
-msgstr "匹配太多。"
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "需要更多条件。"
-
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "目录服务暂时不可用。"
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "电子邮件查阅被限制。"
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "关键字被忽略。"
-
-#, c-format
-msgid "No keywords."
-msgstr "无关键字。"
-
-#, c-format
-msgid "User has no directory information."
-msgstr "用户没有目录信息。"
-
-#, c-format
-msgid "Country not supported."
-msgstr "国家不被支持。"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "未知失败: %s。"
-
-#, fuzzy, c-format
-msgid "Incorrect username or password."
-msgstr "昵称或密码不对。"
-
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "服务暂时不可用。"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
 
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "您的警告级别太高，无法登入。"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: 列出 Yahoo 网络上的房间"
 
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
+msgid "doodle: Request user to start a Doodle session"
 msgstr ""
-"您连接和断开得太频繁。请等十分钟，然后再试一次。如果您继续重试，您等的时间可"
-"能会更长。"
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "发生了未知登入错误: %s。"
 
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "发生了未知错误 %d。信息: %s"
-
-msgid "Invalid Groupname"
-msgstr "无效的组名"
-
-msgid "Connection Closed"
-msgstr "连接已关闭"
-
-msgid "Waiting for reply..."
-msgstr "正在等候回复..."
-
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
 
-msgid "Password Change Successful"
-msgstr "密码更改成功"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo 协议插件"
 
-msgid "_Group:"
-msgstr "组(_G)："
+msgid "Pager server"
+msgstr "寻呼服务器"
 
-msgid "Get Dir Info"
-msgstr "获取目录信息"
+msgid "Pager port"
+msgstr "寻呼端口"
 
-msgid "Set Dir Info"
-msgstr "设置目录信息"
+msgid "File transfer server"
+msgstr "文件传送服务器"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "无法打开 %s 写入！"
+msgid "File transfer port"
+msgstr "文件传送端口"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "文件传送失败；可能其中一端取消了传送。"
+msgid "Chat room locale"
+msgstr "聊天房间语系"
 
-msgid "Could not connect for transfer."
-msgstr "无法连接进行传送。"
+msgid "Ignore conference and chatroom invitations"
+msgstr "忽略会议和聊天室邀请"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "无法写入文件头。文件将不会被传送。"
+msgid "Chat room list URL"
+msgstr "聊天房间列表 URL"
 
-msgid "Save As..."
-msgstr "另存为..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo 聊天服务器"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s 请求 %s 接受 %d 个文件: %s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo 聊天端口"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s 请求您发送文件"
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
 
 #. *< type
 #. *< ui_requirement
@@ -9334,12 +9277,12 @@ msgstr "%s 请求您发送文件"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC 协议插件"
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo 协议插件"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s 向您发送了摄像头邀请，但尚不支持。"
+msgid "Your SMS was not delivered"
+msgstr ""
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
@@ -9361,6 +9304,30 @@ msgstr "%s 拒绝您将他/她加入好友。"
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "在与服务器的连接中收到了无效的数据。"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "昵称或密码不对"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9390,38 +9357,31 @@ msgstr "您的账户已锁定，请登录到 Yahoo! 网站。"
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "从服务器收到了意外的 HTTP 响应。"
 
-msgid "Connection problem"
-msgstr "连接问题"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "失去与 %s 的连接：\n"
 "%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"无法建立与服务器：\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "无法与服务器建立连接"
 
 msgid "Not at Home"
 msgstr "不在家"
@@ -9470,8 +9430,8 @@ msgstr "使用环境设置"
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "激活哪个 ID？"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "将谁加入聊天？"
@@ -9485,74 +9445,15 @@ msgstr "在聊天中加入用户..."
 msgid "Open Inbox"
 msgstr "打开收件箱"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: 列出 Yahoo 网络上的房间"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo 协议插件"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo 日本"
-
-msgid "Pager server"
-msgstr "寻呼服务器"
-
-msgid "Japan Pager server"
-msgstr "日本寻呼服务器"
-
-msgid "Pager port"
-msgstr "寻呼端口"
-
-msgid "File transfer server"
-msgstr "文件传送服务器"
-
-msgid "Japan file transfer server"
-msgstr "日本文件传送服务器"
-
-msgid "File transfer port"
-msgstr "文件传送端口"
-
-msgid "Chat room locale"
-msgstr "聊天房间语系"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "忽略会议和聊天室邀请"
-
-msgid "Chat room list URL"
-msgstr "聊天房间列表 URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天服务器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天端口"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "无法连接。"
+
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
@@ -9560,6 +9461,9 @@ msgstr "无法建立文件描述符。"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 正在发送文件 %s"
 
+msgid "Write Error"
+msgstr "写错误"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo 日本资料"
 
@@ -9600,13 +9504,9 @@ msgstr "酷链接 3"
 msgid "Last Update"
 msgstr "上次更新"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s 的用户信息不可用"
-
+#, fuzzy
 msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+"This profile is in a language or format that is not supported at this time."
 msgstr "抱歉，此配置文件似乎是目前并不支持的语言或格式。"
 
 msgid ""
@@ -9671,23 +9571,19 @@ msgstr "语音"
 msgid "Webcams"
 msgstr "摄像头"
 
+msgid "Connection problem"
+msgstr "连接问题"
+
 msgid "Unable to fetch room list."
 msgstr "无法获取房间列表。"
 
 msgid "User Rooms"
 msgstr "用户房间"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT 服务器连接出现问题。"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"丢失与服务器的连接\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9808,33 +9704,22 @@ msgstr "域"
 msgid "Exposure"
 msgstr "暴露"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"无法创建套接字：\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "无法从 HTTP 代理分析响应：%s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理服务器连接错误 %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "访问被禁止: HTTP 代理服务器禁止端口 %d 流过。"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 出错"
 
-msgid "Could not resolve host name"
-msgstr "无法解析主机名"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "正在请求 %s 的注意..."
@@ -9924,9 +9809,6 @@ msgstr "请勿打扰"
 msgid "Extended away"
 msgstr "远远离开"
 
-msgid "Mobile"
-msgstr "移动"
-
 msgid "Listening to music"
 msgstr ""
 
@@ -9968,51 +9850,47 @@ msgstr "+++ %s 发完呆了"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "读取 %s 出错"
-
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr "读取您的 %s 时遇到了错误。该文件未装入，旧文件被移动到 %s~ 中了。"
-
 msgid "Calculating..."
 msgstr "正在计算..."
 
 msgid "Unknown."
 msgstr "未知。"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
+msgstr[1] "%d 秒"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
+msgstr[1] "%d 天"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小时"
+msgstr[1] "%s %d 小时"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
+msgstr[1] "%d 小时"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
+msgstr[1] "%s %d 分"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
+msgstr[1] "%d 分"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -10077,6 +9955,16 @@ msgstr "连接重置"
 msgid "Address already in use."
 msgstr "此聊天名已经在使用中"
 
+#, c-format
+msgid "Error Reading %s"
+msgstr "读取 %s 出错"
+
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr "读取您的 %s 时遇到了错误。该文件未装入，旧文件被移动到 %s~ 中了。"
+
 msgid "Internet Messenger"
 msgstr "互联网通讯程序"
 
@@ -10117,12 +10005,10 @@ msgstr "新邮件通知(_M)"
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "此账户使用此好友图标(_I)："
+msgstr "用作当前账户头像(_I)："
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s 选项"
+msgid "_Advanced"
+msgstr "高级(_A)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 代理设置"
@@ -10157,9 +10043,6 @@ msgstr "万事成蹉跎"
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-msgid "Proxy Options"
-msgstr "代理选项"
-
 msgid "Proxy _type:"
 msgstr "代理类型(_T)："
 
@@ -10188,8 +10071,9 @@ msgstr "基本(_B)"
 msgid "Create _this new account on the server"
 msgstr "在服务器上创建此新帐户"
 
-msgid "_Advanced"
-msgstr "高级(_A)"
+#, fuzzy
+msgid "_Proxy"
+msgstr "代理"
 
 msgid "Enabled"
 msgstr "已启用"
@@ -10218,11 +10102,12 @@ msgstr ""
 "如果您想要回到此窗口以便添加、编辑或删除帐户，可以从好友列表中窗口中选择<b>帐"
 "户->添加/编辑</b>"
 
-#, c-format
+#, fuzzy, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "您已经有名为 %2$s 的 %1$d 位联系人。您是否想要合并？"
+msgstr[1] "您已经有名为 %2$s 的 %1$d 位联系人。您是否想要合并？"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -10232,21 +10117,20 @@ msgstr ""
 "合并联系人将会使得这些联系人在好友列表中只显示单一的一项，并且使用单一的对话"
 "窗口。如果您想再解散合并后的联系人，可以从联系人的快捷菜单中选择“展开”"
 
-#, fuzzy
 msgid "Please update the necessary fields."
 msgstr "请更新必要的字段。"
 
-#, fuzzy
-msgid "Room _List"
-msgstr "房间列表"
+msgid "A_ccount"
+msgstr "账户(_C)："
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-msgid "_Account:"
-msgstr "账户(_A)："
+#, fuzzy
+msgid "Room _List"
+msgstr "房间列表"
 
 msgid "_Block"
 msgstr "屏蔽(_B)"
@@ -10263,6 +10147,17 @@ msgstr "资料(_I)"
 msgid "I_M"
 msgstr "开聊(_M)"
 
+#, fuzzy
+msgid "_Audio Call"
+msgstr "添加聊天(_A)"
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+#, fuzzy
+msgid "_Video Call"
+msgstr "可视聊天"
+
 msgid "_Send File..."
 msgstr "发送文件(_S)..."
 
@@ -10272,9 +10167,14 @@ msgstr "添加好友千里眼(_P)..."
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "离线时隐藏"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "离线时显示"
+
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
@@ -10401,6 +10301,10 @@ msgstr "/工具(T)/好友千里眼(_P)"
 msgid "/Tools/_Certificates"
 msgstr "/工具(T)/证书(_C)"
 
+#, fuzzy
+msgid "/Tools/Custom Smile_ys"
+msgstr "/工具(T)/隐私(I)"
+
 msgid "/Tools/Plu_gins"
 msgstr "/工具(T)/插件(_G)"
 
@@ -10410,10 +10314,6 @@ msgstr "/工具(T)/首选项(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#, fuzzy
-msgid "/Tools/Smile_y"
-msgstr "/工具(T)/隐私(I)"
-
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
@@ -10523,10 +10423,11 @@ msgstr "/工具(T)/隐私(I)"
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "来自 %2$s 的 %1$d 条未读消息\n"
+msgstr[1] "来自 %2$s 的 %1$d 条未读消息\n"
 
 msgid "Manually"
 msgstr "手动"
@@ -10534,8 +10435,8 @@ msgstr "手动"
 msgid "By status"
 msgstr "按状态"
 
-msgid "By log size"
-msgstr "按日志大小"
+msgid "By recent log activity"
+msgstr ""
 
 #, c-format
 msgid "%s disconnected"
@@ -10553,6 +10454,9 @@ msgstr "连接"
 msgid "Re-enable"
 msgstr "重新启用账户"
 
+msgid "SSL FAQs"
+msgstr ""
+
 msgid "Welcome back!"
 msgstr ""
 
@@ -10638,6 +10542,9 @@ msgstr "您想要将聊天加入您的好友列表，请输入该聊天的别名
 msgid "A_lias:"
 msgstr "别名(_L)："
 
+msgid "_Group:"
+msgstr "组(_G)："
+
 #, fuzzy
 msgid "Auto_join when account becomes online."
 msgstr "帐户在线时自动加入。"
@@ -10673,6 +10580,116 @@ msgstr "/工具(T)"
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友(B)/好友排序(S)"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "背景颜色"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "您已经将此群添加到好友"
+
+#, fuzzy
+msgid "Layout"
+msgstr "狮子座"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "背景颜色"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "展开(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "选择背景颜色"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "折叠(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "选择背景颜色"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "排序"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "在线"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "离开"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "离线"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "血型"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "消息已送出"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "更改 %s 的用户信息"
+
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "输入此证书所适用的主机名。"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL 服务器"
@@ -10690,12 +10707,6 @@ msgstr "您目前登入的协议中没有一个可以邀请好友的。"
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "您想要邀请谁？请输入他/她的名字，以及可选的邀请消息。"
-
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
@@ -10724,7 +10735,8 @@ msgstr "忽略"
 msgid "Get Away Message"
 msgstr "获得离开消息"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "上次说道"
 
 msgid "Unable to save icon file to disk."
@@ -10771,6 +10783,22 @@ msgstr "/对话(C)/另存为(_S)..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/对话(C)/清除回滚(_R)"
 
+#, fuzzy
+msgid "/Conversation/M_edia"
+msgstr "/对话(C)/更多(_O)"
+
+#, fuzzy
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/对话(C)/更多(_O)"
+
+#, fuzzy
+msgid "/Conversation/Media/_Video Call"
+msgstr "/对话(C)/更多(_O)"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/对话(C)/查看日志(_L)"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
@@ -10843,6 +10871,18 @@ msgstr "/对话(C)"
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
+#, fuzzy
+msgid "/Conversation/Media/Audio Call"
+msgstr "/对话(C)/更多(O)"
+
+#, fuzzy
+msgid "/Conversation/Media/Video Call"
+msgstr "/对话(C)/查看日志(L)"
+
+#, fuzzy
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/对话(C)/更多(O)"
+
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
@@ -10908,10 +10948,11 @@ msgstr "发送(_S)"
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
+msgstr[1] "聊天室里有 %d 个人"
 
 msgid "Typing"
 msgstr "正打字"
@@ -11023,6 +11064,9 @@ msgstr "美工"
 msgid "Ka-Hing Cheung"
 msgstr "张家兴"
 
+msgid "voice and video"
+msgstr ""
+
 msgid "support"
 msgstr "支持"
 
@@ -11150,6 +11194,10 @@ msgstr "印地语"
 msgid "Hungarian"
 msgstr "匈牙利语"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "罗马尼亚语"
+
 msgid "Indonesian"
 msgstr "印度尼西亚语"
 
@@ -11165,6 +11213,10 @@ msgstr "乔治亚语"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 乔治亚语翻译者"
 
+#, fuzzy
+msgid "Khmer"
+msgstr "其它"
+
 msgid "Kannada"
 msgstr ""
 
@@ -11188,6 +11240,10 @@ msgid "Macedonian"
 msgstr "马其顿语"
 
 #, fuzzy
+msgid "Mongolian"
+msgstr "马其顿语"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "挪威语"
 
@@ -11246,6 +11302,9 @@ msgstr "社会"
 msgid "Swedish"
 msgstr "瑞典语"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "泰米尔语"
 
@@ -11297,7 +11356,24 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin<BR><BR>"
+
+#, fuzzy, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin<BR><BR>"
 
 msgid "Current Developers"
@@ -11358,7 +11434,7 @@ msgstr "给聊天起名"
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
@@ -11368,6 +11444,9 @@ msgid_plural ""
 msgstr[0] ""
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗？"
+msgstr[1] ""
+"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
+"吗？"
 
 msgid "Remove Contact"
 msgstr "删除联系人"
@@ -11551,7 +11630,7 @@ msgid "Hyperlink visited color"
 msgstr "超级链接颜色"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "绘制超级链接悬停时的颜色。"
 
 msgid "Hyperlink prelight color"
@@ -11589,15 +11668,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "通知删除"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "新邮件通知"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11610,15 +11696,6 @@ msgstr ""
 msgid "Enable typing notification"
 msgstr "新邮件通知"
 
-msgid "_Copy Email Address"
-msgstr "复制电子邮件地址(_C)"
-
-msgid "_Open Link in Browser"
-msgstr "在浏览器中打开链接(_O)"
-
-msgid "_Copy Link Location"
-msgstr "复制链接地址(_C)"
-
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -11660,11 +11737,10 @@ msgstr ""
 msgid "Save Image"
 msgstr "保存图像"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "显示自定义如下："
 
@@ -11750,9 +11826,6 @@ msgstr "减少字体大小"
 msgid "Font Face"
 msgstr "字体"
 
-msgid "Background Color"
-msgstr "背景颜色"
-
 msgid "Foreground Color"
 msgstr "前景颜色"
 
@@ -11866,6 +11939,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11892,6 +11966,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11931,21 +12006,39 @@ msgstr ""
 msgid "Pidgin"
 msgstr "Pidgin"
 
-msgid "Open All Messages"
-msgstr "打开全部消息"
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, fuzzy
+msgid "Calling..."
+msgstr "正在计算..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
 
 #, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
+
+#, fuzzy, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
+msgstr[1] "%s 有 %d 封新邮件。"
 
-#, c-format
+#, fuzzy, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d 封新邮件。</b>"
+msgstr[1] "<b>%d 封新邮件。</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -11962,6 +12055,27 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令，但未设置命令。"
 
+#, fuzzy
+msgid "No message"
+msgstr "未知信息"
+
+msgid "Open All Messages"
+msgstr "打开全部消息"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
+
+#, fuzzy
+msgid "New Pounces"
+msgstr "新建好友千里眼"
+
+msgid "Dismiss"
+msgstr ""
+
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "下列插件将会被卸载。"
 
@@ -12014,10 +12128,17 @@ msgstr "<b>插件细节</b>"
 msgid "Select a file"
 msgstr "选择文件"
 
+#, fuzzy
+msgid "Modify Buddy Pounce"
+msgstr "编辑好友千里眼"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "监视对象"
 
+msgid "_Account:"
+msgstr "账户(_A)："
+
 msgid "_Buddy name:"
 msgstr "好友名称(_B)："
 
@@ -12084,7 +12205,60 @@ msgstr "再现(_R)"
 msgid "Pounce Target"
 msgstr "监视目标"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy, c-format
+msgid "Started typing"
+msgstr "开始打字"
+
+#, fuzzy, c-format
+msgid "Paused while typing"
+msgstr "输入时暂停"
+
+#, fuzzy, c-format
+msgid "Signed on"
+msgstr "登入"
+
+#, fuzzy, c-format
+msgid "Returned from being idle"
+msgstr "%s 发完呆了(%s)"
+
+#, fuzzy, c-format
+msgid "Returned from being away"
+msgstr "回来"
+
+#, fuzzy, c-format
+msgid "Stopped typing"
+msgstr "停止打字"
+
+#, fuzzy, c-format
+msgid "Signed off"
+msgstr "登出"
+
+#, fuzzy, c-format
+msgid "Became idle"
+msgstr "发起了呆"
+
+#, fuzzy, c-format
+msgid "Went away"
+msgstr "离开时"
+
+#, fuzzy, c-format
+msgid "Sent a message"
+msgstr "发送消息"
+
+#, fuzzy, c-format
+msgid "Unknown.... Please report this!"
+msgstr "未知的千里眼。请报告此错误！"
+
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "表情主题解包失败。"
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "表情主题解包失败。"
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "表情主题解包失败。"
 
 msgid "Install Theme"
@@ -12105,6 +12279,12 @@ msgstr ""
 msgid "Cl_ose conversations with the Escape key"
 msgstr "与 %s 的对话"
 
+#. Buddy List Themes
+#, fuzzy
+msgid "Buddy List Theme"
+msgstr "好友列表"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
@@ -12114,8 +12294,9 @@ msgstr "显示系统托盘图标(_S):"
 msgid "On unread messages"
 msgstr "有未读消息时"
 
-msgid "Conversation Window Hiding"
-msgstr "对话窗口隐藏"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "即时消息对话窗口"
 
 msgid "_Hide new IM conversations:"
 msgstr "隐藏新的 IM 对话(_H):"
@@ -12123,6 +12304,9 @@ msgstr "隐藏新的 IM 对话(_H):"
 msgid "When away"
 msgstr "离开时"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "最小化对话窗口(_Z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "标签"
@@ -12181,9 +12365,6 @@ msgstr "使用平滑滚动"
 msgid "F_lash window when IMs are received"
 msgstr "收到信息时闪烁窗口(_L)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "最小化对话窗口(_Z)"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12214,13 +12395,11 @@ msgstr ""
 msgid "Cannot start browser configuration program."
 msgstr "无法获取用户信息"
 
-msgid "ST_UN server:"
-msgstr "STUN 服务器(_U)："
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例：stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "自动检测 IP 地址(_A)"
 
 msgid "Public _IP:"
@@ -12241,6 +12420,10 @@ msgstr "起始端口(_S)："
 msgid "_End port:"
 msgstr "终止端口(_E)："
 
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "代理服务器"
@@ -12270,6 +12453,10 @@ msgstr "代理服务器"
 msgid "No proxy"
 msgstr "无代理"
 
+#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
+msgid "Use remote DNS with SOCKS4 proxies"
+msgstr ""
+
 msgid "_User:"
 msgstr "用户(_U)："
 
@@ -12392,31 +12579,26 @@ msgstr ""
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "静音"
+msgstr "静音(_U)"
 
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "启用声音:"
+msgstr "开启声音(_E):"
 
-#, fuzzy
 msgid "V_olume:"
-msgstr "音量："
+msgstr "音量(_O):"
 
 msgid "Play"
 msgstr "播放"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "浏览(_E)..."
+msgstr "浏览(_B)..."
 
-#, fuzzy
 msgid "_Reset"
-msgstr "重置"
+msgstr "重置(_R)"
 
 msgid "_Report idle time:"
 msgstr "报告发呆时间(_R)："
@@ -12434,12 +12616,12 @@ msgstr "离开和发呆时"
 msgid "Auto-away"
 msgstr "自动离开"
 
-msgid "Change status when _idle"
-msgstr "发呆时更改状态(_I)"
-
 msgid "_Minutes before becoming idle:"
 msgstr "更改状态前等几分钟(_M)："
 
+msgid "Change status when _idle"
+msgstr "发呆时更改状态(_I)"
+
 msgid "Change _status to:"
 msgstr "将状态更改为(_S)："
 
@@ -12490,9 +12672,8 @@ msgid "Set privacy for:"
 msgstr "设置隐私的账户："
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "删除"
+msgstr "全部删除(_L)"
 
 msgid "Permit User"
 msgstr "允许用户"
@@ -12588,68 +12769,59 @@ msgstr "保存并使用(_V)"
 msgid "Status for %s"
 msgstr "%s 的状态"
 
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "插入表情"
-
-msgid "More Data needed"
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
+msgid "Custom Smiley"
+msgstr "自定义表情"
 
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "重复更正"
 
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr ""
-
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "请输入 %s 的新名称"
-
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "插入表情"
+msgstr "修改表情"
 
-#, fuzzy
 msgid "Add Smiley"
-msgstr "表情"
+msgstr "添加表情"
 
-#, fuzzy
-msgid "Smiley _Image"
-msgstr "保存图像"
+msgid "_Image:"
+msgstr "图像(_I):"
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr ""
+#. Shortcut text
+#, fuzzy
+msgid "S_hortcut text:"
+msgstr "排序"
 
 #, fuzzy
 msgid "Smiley"
 msgstr "表情"
 
+#, fuzzy
+msgid "Shortcut Text"
+msgstr "排序"
+
 msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "选择好友"
+
 msgid "Click to change your buddyicon for this account."
-msgstr "此账户使用此好友图标(_I)："
+msgstr "点此修改当前账户所用图标。"
 
-#, fuzzy
 msgid "Click to change your buddyicon for all accounts."
-msgstr "此账户使用此好友图标(_I)："
+msgstr "点此修改所有账户所用图标。"
 
 msgid "Waiting for network connection"
 msgstr "正在等待网络连接"
 
-#, fuzzy
 msgid "New status..."
-msgstr "新消息..."
+msgstr "新状态..."
 
-#, fuzzy
 msgid "Saved statuses..."
 msgstr "已存状态"
 
@@ -12687,7 +12859,7 @@ msgstr ""
 "您可以通过文件传送发送此图像，将其嵌入到此消息中，或者将其用作此用户的头像。"
 
 msgid "Set as buddy icon"
-msgstr "设置为好友头像"
+msgstr "设置为用户头像"
 
 msgid "Send image file"
 msgstr "发送图像文件"
@@ -12701,12 +12873,12 @@ msgstr "您是否想要将其设置为此用户的头像？"
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
-msgstr "您可以通过文件传送发送此图像，或者将其用作此用户的头像。"
+msgstr "您可以通过文件传送发送该图片，或者将其用作此用户的头像。"
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr "您可以通过文件传送发送此图像，或者将其用作此用户的头像。"
+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
@@ -12716,9 +12888,10 @@ msgstr "您可以通过文件传送发送此图像，或者将其用作此用户
 msgid "Cannot send launcher"
 msgstr "无法发送启动器"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "您拖曳的是桌面启动器。在大多数情况下，您可能想要发送此启动器所指向的文件，而"
 "非启动器自身。"
@@ -12752,6 +12925,16 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "装入图像“%s”失败：原因位置，可能是图像文件已损坏"
 
+#, fuzzy
+msgid "_Open Link"
+msgstr "打开链接(_O)："
+
+msgid "_Copy Link Location"
+msgstr "复制链接地址(_C)"
+
+msgid "_Copy Email Address"
+msgstr "复制电子邮件地址(_C)"
+
 msgid "Save File"
 msgstr "保存文件"
 
@@ -12770,24 +12953,20 @@ msgstr "获得信息(_G)"
 msgid "_Invite"
 msgstr "邀请(_I)"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "修改(_M)"
+msgstr "修改(_M)..."
 
-#, fuzzy
 msgid "_Add..."
-msgstr "添加(_A)"
+msgstr "添加(_A)..."
 
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#, fuzzy
 msgid "_Edit"
-msgstr "编辑"
+msgstr "编辑(_E)"
 
-#, fuzzy
 msgid "Pidgin Tooltip"
-msgstr "Pidgin"
+msgstr "Pidgin 工具提示"
 
 msgid "Pidgin smileys"
 msgstr "Pidgin 表情"
@@ -12801,9 +12980,8 @@ msgstr "选择此选项将禁用图形化表情。"
 msgid "none"
 msgstr "无"
 
-#, fuzzy
 msgid "Small"
-msgstr "电子邮件"
+msgstr "小"
 
 msgid "Smaller versions of the default smilies"
 msgstr ""
@@ -12847,6 +13025,77 @@ msgstr "联系人状态预测插件。"
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "服务器地址"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "进入会议服务器"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "选择要查询的会议服务器"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "在线服务"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "发送好友列表"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "离开"
+
+#, fuzzy
+msgid "Directory"
+msgstr "日志目录"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "声音选择"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "描述"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "服务目录信息"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "浏览器(_B)："
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "用户不存在"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "服务器未使用任何支持的身份验证方法"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "服务目录信息"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "此插件用于调试 XMPP 服务器或客户端。"
+
 msgid "Buddy is idle"
 msgstr "好友正发呆"
 
@@ -13002,7 +13251,6 @@ msgid "Provides support for mouse gestures"
 msgstr "提供鼠标手势的支持"
 
 #. *  description
-#, fuzzy
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -13013,9 +13261,9 @@ msgstr ""
 "允许在对话窗口中支持鼠标手势。\n"
 "拖曳鼠标中键可执行特定操作:\n"
 "\n"
-"向下再向右可关闭对话。\n"
-"向上再向左可切换到上个对话。\n"
-"向上再向右可切换到下个对话。"
+"·向下再向右可关闭对话。\n"
+"·向上再向左可切换到上个对话。\n"
+"·向上再向右可切换到下个对话。"
 
 msgid "Instant Messaging"
 msgstr "即时通讯"
@@ -13091,7 +13339,6 @@ msgstr "提供与 Evolution 的集成。"
 msgid "Please enter the person's information below."
 msgstr "请在下面输入联系人的信息。"
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
 msgstr "请在下面输入好友的用户名和账户类型。"
 
@@ -13127,11 +13374,13 @@ msgstr "GTK 信号测试"
 msgid "Test to see that all ui signals are working properly."
 msgstr "测试看看所有的 UI 信号是否都工作正确。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
-msgstr "好友备注"
+msgstr ""
+"\n"
+"<b>好友备注</b>: %s"
 
 msgid "History"
 msgstr "历史"
@@ -13161,20 +13410,17 @@ msgstr "检查新的本地邮件。"
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "在好友列表旁显示一个小方块，标明您是否有新邮件。"
 
-#, fuzzy
 msgid "Markerline"
-msgstr "下划线"
+msgstr "分割线"
 
-#, fuzzy
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "对话时显示通知消息"
+msgstr "在对话中以分割线突出显示新消息。"
 
-#, fuzzy
 msgid "Jump to markerline"
-msgstr "下划线"
+msgstr "跳至分割线"
 
 msgid "Draw Markerline in "
-msgstr ""
+msgstr "分割线使用在"
 
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
@@ -13224,18 +13470,18 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "合作作曲的音乐信使插件。"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr "音乐信使插件允许多个用户同时在同一份曲谱上工作。"
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
 msgstr "提醒"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "\t仅当别人在聊天中提到您的名字(_O)"
+msgstr "\t仅当别人提到您的名字时(_O)"
 
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
@@ -13259,18 +13505,16 @@ msgstr "在 X 属性中插入新消息数(_X)"
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "聊天窗口(_H)"
+msgstr "闪烁窗口(_F)"
 
 #. Raise window method button
 msgid "R_aise conversation window"
 msgstr "升起对话窗口(_A)"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "升起对话窗口(_A)"
+msgstr "当前对话窗口(_P)"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -13339,23 +13583,20 @@ msgstr ""
 "- 颠倒所有收到的文本\n"
 "- 当您的好友登入后立即给他们发送信息"
 
-msgid "Cursor Color"
-msgstr "光标颜色"
-
-msgid "Secondary Cursor Color"
-msgstr "次要光标颜色"
-
 msgid "Hyperlink Color"
 msgstr "超级链接颜色"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "超级链接颜色"
+msgstr "访问过的超级链接颜色"
 
 #, fuzzy
 msgid "Highlighted Message Name Color"
 msgstr "突出显示的消息"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "通知删除"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平分隔"
 
@@ -13385,35 +13626,24 @@ msgstr "GTK+ 界面字体"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ 文字快捷方式主题"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "界面颜色"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "新邮件通知"
 
-msgid "Widget Sizes"
-msgstr "部件大小"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ 主题控制"
+
+#, fuzzy
+msgid "Colors"
+msgstr "关闭"
 
 msgid "Fonts"
 msgstr "字体"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc 文件工具"
 
@@ -13450,13 +13680,11 @@ msgstr ""
 msgid "New Version Available"
 msgstr "新版本可用"
 
-#, fuzzy
 msgid "Later"
-msgstr "日期"
+msgstr "稍后"
 
-#, fuzzy
 msgid "Download Now"
-msgstr "%s 上的用户数: %s"
+msgstr "立即下载"
 
 #. *< type
 #. *< ui_requirement
@@ -13487,21 +13715,20 @@ msgstr "定期检查新版本并通知用户更新记录。"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "发送到"
+msgstr "发送按钮"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "对话窗口隐藏"
+msgstr "对话窗口的发送按钮"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
-msgstr ""
+"for use when no physical keyboard is present."
+msgstr "在对话窗口的输入栏添加一个发送按钮，适用于非键盘输入。"
 
 msgid "Duplicate Correction"
 msgstr "重复更正"
@@ -13552,6 +13779,113 @@ msgstr "文本替换"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "未登入"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "未登入"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "加入聊天"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "忽略"
+
+#, fuzzy
+msgid "Founder"
+msgstr "较大"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "给出的认证"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "错误 "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "信息"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "请求对话框"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "警告级别"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s 的状态"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "聊天房间语系"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "保存图标"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ 主题控制"
+
+#, fuzzy
+msgid "Contact"
+msgstr "联系信息"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "好友列表"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "好友列表"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ 主题控制"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ 主题控制"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13710,17 +14044,15 @@ msgstr "好友列表窗口常居顶端(_K)："
 msgid "Only when docked"
 msgstr "仅停靠时"
 
-msgid "_Flash window when chat messages are received"
-msgstr "收到聊天信息时闪烁窗口(_F)"
-
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin 选项"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Pidgin for Windows 特定的选项。"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Pidgin for Windows 特定的选项，比如好友列表停靠。"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13760,6 +14092,503 @@ msgstr "发送和接受原始 XMPP 节。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "此插件用于调试 XMPP 服务器或客户端。"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "无法打开套接字"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "无法在套接字上监听"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "无法读取套接字"
+
+#~ msgid "Connection failed."
+#~ msgstr "连接失败。"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "服务器已断开连接"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "无法创建套接字"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "无法连接到主机"
+
+#~ msgid "Read error"
+#~ msgstr "读取错误"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法建立与服务器：\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "写错误"
+
+#~ msgid "Last Activity"
+#~ msgstr "最近活动"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "服务目录信息"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "额外地址"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "多用户聊天"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "用户没有目录信息。"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "命令"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "注册错误"
+
+#~ msgid "User Location"
+#~ msgstr "用户位置"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "用户搜索"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "聊天状态通知"
+
+#~ msgid "Software Version"
+#~ msgstr "软件版本"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "方向"
+
+#~ msgid "User Mood"
+#~ msgstr "用户心情"
+
+#~ msgid "User Activity"
+#~ msgstr "用户活动"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "能力"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "用户名"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "带密钥交换开聊"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "电子邮件地址"
+
+#~ msgid "User Profile"
+#~ msgstr "用户资料"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "加入"
+
+#~ msgid "User Nickname"
+#~ msgstr "用户昵称"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "实时视频"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "消息已收到"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "公钥漏印"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "用户选项"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "用户模式"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "用户名"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "允许限制"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian 加密"
+
+#~ msgid "Read Error"
+#~ msgstr "读取错误"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "连接到服务器失败。"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "队列满"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "无法处理消息"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "无法连接到主机"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "登录失败(%s)。"
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "无法连接到服务器。"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "您已被注销，因为您已从其它计算机上登录。"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "出错。SSL 支持未安装。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "密码不对。"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法连接到 BOS 服务器：\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "您即将被断开。请检查 %s 上的更新。"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "无法连接"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "无法获取服务器信息"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "名称无效"
+
+#~ msgid "Connection lost"
+#~ msgstr "连接丢失"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "无法解析主机"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "连接已关闭(写入)"
+
+#~ msgid "Connection reset"
+#~ msgstr "连接重置"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "从套接字读取时出错：%s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "无法连接到主机"
+
+#~ msgid "Could not write"
+#~ msgstr "无法写入"
+
+#~ msgid "Could not connect"
+#~ msgstr "无法连接"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "无法创建监听套接字"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "无法解析主机名"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "密码不对"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法建立与服务器：\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo 日本"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "日本寻呼服务器"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "日本文件传送服务器"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "丢失与服务器的连接\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "无法解析主机名"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "对话窗口隐藏"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "激活哪个 ID？"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "请给这个表情选择一个图片"
+
+#~ msgid "Cursor Color"
+#~ msgstr "光标颜色"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "次要光标颜色"
+
+#~ msgid "Interface colors"
+#~ msgstr "界面颜色"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "部件大小"
+
+#, fuzzy
+#~ msgid "Invite message"
+#~ msgstr "在消息中插入"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "您想要邀请谁？请输入他/她的名字，以及可选的邀请消息。"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "选择 Notes 地址簿"
+
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "添加好友"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "无法获取服务器信息"
+
+#~ msgid "Keep alive error"
+#~ msgstr "保持在线错误"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "失去与服务器的连接：\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "连接服务器"
+
+#~ msgid "Failed to send IM."
+#~ msgstr "发送消息失败"
+
+#~ msgid "Looking up %s"
+#~ msgstr "查阅 %s"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "连接到 %s 失败"
+
+#~ msgid "Signon: %s"
+#~ msgstr "登录名: %s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "无法写入文件 %s。"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "无法读取文件 %s。"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "消息太长，最后 %s 字节被截断。"
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s 目前未登入。"
+
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "不允许对 %s 发出警告。"
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "丢失了一条消息，您超过了服务器速度限制。"
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "在 %s 中无法聊天。"
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "您给 %s 发送消息的速度太快。"
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "您错过了来自 %s 的消息，原因是该消息太大。"
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "您错过了来自 %s 的消息，原因是发送太快。"
+
+#~ msgid "Failure."
+#~ msgstr "失败。"
+
+#~ msgid "Too many matches."
+#~ msgstr "匹配太多。"
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "需要更多条件。"
+
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "目录服务暂时不可用。"
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "电子邮件查阅被限制。"
+
+#~ msgid "Keyword ignored."
+#~ msgstr "关键字被忽略。"
+
+#~ msgid "No keywords."
+#~ msgstr "无关键字。"
+
+#~ msgid "User has no directory information."
+#~ msgstr "用户没有目录信息。"
+
+#~ msgid "Country not supported."
+#~ msgstr "国家不被支持。"
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "未知失败: %s。"
+
+#, fuzzy
+#~ msgid "Incorrect username or password."
+#~ msgstr "昵称或密码不对。"
+
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "服务暂时不可用。"
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "您的警告级别太高，无法登入。"
+
+#~ 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 ""
+#~ "您连接和断开得太频繁。请等十分钟，然后再试一次。如果您继续重试，您等的时间"
+#~ "可能会更长。"
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "发生了未知登入错误: %s。"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "发生了未知错误 %d。信息: %s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "无效的组名"
+
+#~ msgid "Connection Closed"
+#~ msgstr "连接已关闭"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "正在等候回复..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
+
+#~ msgid "Password Change Successful"
+#~ msgstr "密码更改成功"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "获取目录信息"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "设置目录信息"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "无法打开 %s 写入！"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "文件传送失败；可能其中一端取消了传送。"
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "无法连接进行传送。"
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "无法写入文件头。文件将不会被传送。"
+
+#~ msgid "Save As..."
+#~ msgstr "另存为..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s 请求 %s 接受 %d 个文件: %s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s 请求您发送文件"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC 协议插件"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%s 的用户信息不可用"
+
+#~ msgid "%s Options"
+#~ msgstr "%s 选项"
+
+#~ msgid "Proxy Options"
+#~ msgstr "代理选项"
+
+#~ msgid "By log size"
+#~ msgstr "按日志大小"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "在浏览器中打开链接(_O)"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN 服务器(_U)："
+
+#, fuzzy
+#~ msgid "Smiley _Image"
+#~ msgstr "保存图像"
+
+#~ msgid "_Flash window when chat messages are received"
+#~ msgstr "收到聊天信息时闪烁窗口(_F)"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "已存在同名组。"
 
@@ -13857,13 +14686,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgid "Change Qun information"
 #~ msgstr "频道信息"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s(%s)"
-
 #~ msgid "System Message"
 #~ msgstr "系统消息"
 
@@ -13995,10 +14817,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgid "Windows Live ID authentication Failed"
 #~ msgstr "失败: 身份验证失败"
 
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "无法连接到服务器。"
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "无法通过 SSL 连接到服务器。"
 
@@ -14059,9 +14877,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "您加入 %d 群的请求已经被管理员 %d 批准"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "您已经将此群添加到好友"
-
 #~ msgid "I am applying to join"
 #~ msgstr "我请求加入"
 
@@ -14083,9 +14898,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgid "Enter your reason:"
 #~ msgstr "输入您的原因："
 
-#~ msgid "Error requesting login token"
-#~ msgstr "请求登录令牌出错"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "无法登录，请检查调试日志"
 
@@ -14138,9 +14950,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ "您想要将谁加为好友？请输入他/她的用户名。您还可为好友输入别名和昵称。只要"
 #~ "可能的话，别名将会替代用户名显示。\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "账户(_C)："
-
 #~ msgid "_Screen name:"
 #~ msgstr "用户名(_S)："
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 27908a8608..bc14e38020 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,11 +1,14 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.19 2008/08/24 21:23:04 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.20 2009/08/04 05:20:24 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2008, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2008, Ambrose C. Li <acli@ada.dhs.org>
+# Copyright (C) 2002-2009, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li@gmail.com>
+#
+# PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
+# LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.562 2009/02/27 04:50:13 acli Exp $
+# $InternalId: zh_TW.po,v 1.594 2009/08/06 05:26:27 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -19,7 +22,7 @@
 #        screen name 和 user name 在意義上是沒有分別的！
 # 理據如下
 # (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
-# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the Pidgin-devel mailing list.  (I'm unhappy with the change.)
+# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
 # SILC問題：似乎臺灣和香港的「密碼學」術語相差甚遠，很頭痛 (^^;)
 # - Key 暫譯「密鑰」，原因：「Key Exchange」既有譯文為「交換密鑰」
@@ -49,10 +52,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.5.5\n"
+"Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-27 10:14-0800\n"
-"PO-Revision-Date: 2009-02-25 09:57-0500\n"
+"POT-Creation-Date: 2009-08-05 23:59-0700\n"
+"PO-Revision-Date: 2009-07-30 01:53-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -637,11 +640,12 @@ msgstr "這個指令在這個通訊協定內無效。"
 msgid "Message was not sent, because you are not signed on."
 msgstr "因為你並未登入，所以訊息無法送出："
 
-# XXX 這是什麼？
+# NOTE 交談標題、使用者名稱、協定名稱
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
+# NOTE 交談標題、意義不明的單字元標
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
@@ -667,17 +671,6 @@ msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記
 msgid "Send To"
 msgstr "傳送到"
 
-msgid "Invite message"
-msgstr "邀請訊息"
-
-msgid "Invite"
-msgstr "邀請"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr "請輸入你想邀請的使用者名稱，以及選擇性填寫邀請的訊息。"
-
 msgid "Conversation"
 msgstr "交談"
 
@@ -931,6 +924,43 @@ msgstr "所有交談"
 msgid "System Log"
 msgstr "系統日誌"
 
+msgid "Calling ... "
+msgstr "撥打中..."
+
+# NOTE 這是按鈕上的標籤
+msgid "Hangup"
+msgstr "掛斷"
+
+#. Number of actions
+msgid "Accept"
+msgstr "接受"
+
+msgid "Reject"
+msgstr "拒絕"
+
+#  XXX 暫譯 - acli 20090730
+msgid "Call in progress."
+msgstr "撥打中。"
+
+msgid "The call has been terminated."
+msgstr "通話已中斷。"
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s 希望與你進行語音通話。"
+
+# XXX 媒體? - acli 20090730
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s 嘗試與你以一種未獲支援的方式進行媒體通話。"
+
+msgid "You have rejected the call."
+msgstr "你拒絕了通話。"
+
+# FIXME 暫譯，譯文有待改進 - acli 20090730
+msgid "call: Make an audio call."
+msgstr "call：語音通話。"
+
 msgid "Emails"
 msgstr "電子郵件"
 
@@ -966,6 +996,9 @@ msgstr "繼續"
 msgid "IM"
 msgstr "即時訊息"
 
+msgid "Invite"
+msgstr "邀請"
+
 # TODO 要覆查 - 20061028
 msgid "(none)"
 msgstr "(沒有名字)"
@@ -1171,7 +1204,6 @@ msgstr "%s 已經離開。 (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給你。 (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請匯報這個問題！"
 
@@ -1181,8 +1213,9 @@ msgstr "以鍵盤的使用為基準"
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Never"
-msgstr "從不"
+msgstr "關閉此功能"
 
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
@@ -1206,7 +1239,7 @@ msgid "Log status change events"
 msgstr "記錄所有的狀態改變"
 
 msgid "Report Idle time"
-msgstr "閒置時間基準(_R)"
+msgstr "閒置時間基準"
 
 msgid "Change status when idle"
 msgstr "閒置時更改狀態"
@@ -1277,7 +1310,7 @@ msgid "You talk in chat"
 msgstr "你在聊天室說話"
 
 msgid "Others talk in chat"
-msgstr "其他人進入聊天室"
+msgstr "其他人在聊天室說話"
 
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到你的帳號"
@@ -1335,8 +1368,9 @@ msgstr "當交談取得輸入焦點發出音效"
 
 # XXX: 務必 聽起來不太恰當。這裡是指 Enable Sound 的選項 - c9s, 08 Dec 27 12/27/2008
 # XXX 「務必」不只指 Enable Sound，也在其他地方用到，改譯「完全啟用」不行 - 20090226 acli
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Always"
-msgstr "務必"
+msgstr "啟動此功能"
 
 # NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
 msgid "Only when available"
@@ -1484,7 +1518,7 @@ msgstr "%s 在 %s 提到你的網名"
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%s 在 %s 送出一個訊息給你。"
+msgstr "%s 在 %s 送出一個訊息給你"
 
 msgid "Buddy signs on/off"
 msgstr "好友登入／登出"
@@ -1589,6 +1623,33 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr "Lastlog 模組。"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"取得 TinyURL 中..."
+
+# XXX 暫譯 - 20090729 acli
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "只在網址長度為這個數值或以上時才建立 TinyURL"
+
+# XXX 暫譯 - 20090729 acli
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL（或同類型）網址前綴"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL 模組"
+
+# NOTE 這個 copying 應係指人手抄寫，因為如果是在電腦上複製，無論網址長短，複製也應該不會有難易之分
+# XXX 暫譯 - 20090729 acli
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "當接收到含有網址的訊息時，使用 TinyURL 縮短網址，好方便抄寫"
+
 msgid "accounts"
 msgstr "帳號清單"
 
@@ -1644,9 +1705,9 @@ msgstr "設定使用者資訊"
 
 # XXX 問題：
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白）
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
 # XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
 # XXX - Ambrose 20061123
 msgid "Unknown"
@@ -1700,39 +1761,40 @@ msgstr "接受 %s 的證書嗎？"
 msgid "SSL Certificate Verification"
 msgstr "核實 SSL 證書"
 
-#. Number of actions
-msgid "Accept"
-msgstr "接受"
-
-msgid "Reject"
-msgstr "拒絕"
-
 msgid "_View Certificate..."
 msgstr "檢視證書(_V)"
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
+# FIXME 譯文不太通順 - acli 20070913
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr "「%s」出示的證書是自簽的，無法自動進行核實。"
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "「%s」出示的證書鍊是無效的。"
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"「%s」出示的證書聲稱它應該屬於「%s」，你目前可能的連線可能不是你心目中希望使"
+"用的服務。"
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL 證書錯誤"
 
 msgid "Invalid certificate chain"
 msgstr "無效的證書鏈"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1740,6 +1802,19 @@ msgid ""
 msgstr ""
 "無法核實這張證書，因為你沒有根證書機構證書 (root certificate) 的資料庫。"
 
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr "「%s」出示的證書是自簽的，無法自動進行核實。"
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "「%s」出示的證書鍊是無效的。"
+
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1757,19 +1832,6 @@ msgstr ""
 msgid "Invalid certificate authority signature"
 msgstr "證書機構的簽署是無效的"
 
-# FIXME 譯文不太通順 - acli 20070913
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"「%s」出示的證書聲稱它應該屬於「%s」，你目前可能的連線可能不是你心目中希望使"
-"用的服務。"
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1805,6 +1867,8 @@ msgstr "+++ %s 登入"
 msgid "+++ %s signed off"
 msgstr "+++ %s 登出"
 
+#. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -1851,6 +1915,15 @@ msgstr "%s 離開聊天室。"
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
+msgid "Invite to chat"
+msgstr "邀請進入聊天室"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "請輸入你想邀請的使用者名稱，以及邀請的訊息。"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "無法建立連結：%s"
@@ -1986,6 +2059,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "開始自 %2$s 傳送 %1$s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "檔案 <A HREF=\"file://%s\">%s</A> 傳送完畢"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
@@ -2182,6 +2259,10 @@ msgstr "<font color=\"red\"><b>無法讀取檔案：%s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>：%s\n"
 
+# FIXME 譯文有待改進 - acli 20090731
+msgid "Error creating conference."
+msgstr "建立會議失敗。"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "你目前使用的是 %s，但這模組需要 %s。"
@@ -2607,13 +2688,13 @@ msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "當瀏覽日誌時，這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 "
-"Adium、Fire、Messenger Plus!、MSN Messenger，以及 Trillian。\n"
+"Adium、Fire、Messenger Plus!、MSN Messenger、aMSN、以及 Trillian。\n"
 "\n"
 "注意：這個模組仍處於開發初期，因此可能經常當掉。如果使用，後果自負！"
 
@@ -2659,7 +2740,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "好友離線時，利用「好友狀態捕捉」功能儲存送出的訊息。"
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "未能送出的訊息將會儲存成「好友狀態捕捉」。如有需要，訊息可在「好友狀態捕捉」"
@@ -2691,6 +2772,31 @@ msgstr "使用「好友狀態捕捉」儲存離線訊息"
 msgid "Do not ask. Always save in pounce."
 msgstr "毋須提問，務必使用「好友狀態捕捉」儲存離線訊息。"
 
+msgid "One Time Password"
+msgstr "一次性密碼"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "一次性密碼支援"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "強制密碼只用一次"
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2882,16 +2988,15 @@ msgstr ""
 "找不到 ActiveTCL；如果打算使用 TCL 寫成的模組，請到 http://www.activestate."
 "com 下載及安裝 ActiveTCL。\n"
 
-# FIXME 沒有譯「toolkit」- 20071023 acli
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://d.pidgin.im/"
-"BonjourWindows 查閱 FAQ 部分。"
+"找不到 Apple 的「Bonjour For Windows」工具，詳情請到網址 http://d.pidgin.im/"
+"BonjourWindows 查閱。"
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "無法接收連入的即時訊息連線\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "無法監聽來訊的即時訊息連線"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2945,17 +3050,20 @@ msgstr "%s 已經關閉這個交談。"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息，交談無法開始。"
 
-msgid "Cannot open socket"
-msgstr "無法開啟Socket"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "無法建立 Socket：%s"
 
-msgid "Could not bind socket to port"
-msgstr "無法聯結 Socket 到通訊埠"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "無法連結 Socket 到通訊埠：%s"
 
-msgid "Could not listen on socket"
-msgstr "無法監聽 Socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "無法監聽 Socket：%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "和本地端的mDNSResponder溝通時發生錯誤"
+msgstr "和本地端的 mDNSResponder 溝通時發生錯誤"
 
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
@@ -2964,7 +3072,7 @@ msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"對於你目前所設定的代理伺服器型態來說，你所指定的伺服器名稱及通訊埠是無效的"
+"對於你目前所設定的代理伺服器型態來說，你所指定的伺服器名稱或通訊埠是無效的。"
 
 msgid "Token Error"
 msgstr "符記錯誤"
@@ -3000,14 +3108,14 @@ msgstr "儲存好友清單..."
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
-msgid "Fill in the registration fields."
-msgstr "填寫註冊資料欄位。"
+msgid "You must fill in all registration fields"
+msgstr "必需填妥所有註冊資料欄位"
 
-msgid "Passwords do not match."
-msgstr "新密碼並不相符。"
+msgid "Passwords do not match"
+msgstr "兩個密碼並不相符"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "無法註冊新帳號。錯誤發生。\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "無法註冊新帳號，錯誤原因不明。"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
@@ -3018,14 +3126,14 @@ msgstr "註冊成功！"
 msgid "Password"
 msgstr "密碼"
 
-msgid "Password (retype)"
-msgstr "密碼（再次輸入）"
+msgid "Password (again)"
+msgstr "舊密碼（再次確認）"
 
-msgid "Enter current token"
-msgstr "輸入目前的密碼"
+msgid "Enter captcha text"
+msgstr "請輸入驗證圖片內的文字"
 
-msgid "Current token"
-msgstr "目前密碼"
+msgid "Captcha"
+msgstr "驗證圖片"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
@@ -3078,6 +3186,15 @@ msgstr "密碼修改成功！"
 msgid "Current password"
 msgstr "舊密碼"
 
+msgid "Password (retype)"
+msgstr "密碼（再次輸入）"
+
+msgid "Enter current token"
+msgstr "輸入目前的密碼"
+
+msgid "Current token"
+msgstr "目前密碼"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸入你的舊密碼及你的新密碼："
 
@@ -3091,6 +3208,7 @@ msgstr "選取一個聊天室給好友；%s"
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
+#. Global
 msgid "Available"
 msgstr "上線"
 
@@ -3125,7 +3243,7 @@ msgstr "找不到符合的使用者"
 msgid "There are no users matching your search criteria."
 msgstr "無法根據搜尋條件找到相符的使用者。"
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "無法讀取 Socket"
 
 msgid "Buddy list downloaded"
@@ -3140,8 +3258,15 @@ msgstr "上傳好友清單"
 msgid "Your buddy list was stored on the server."
 msgstr "你的好友清單已被存放於伺服器上。"
 
-msgid "Connection failed."
-msgstr "連線失敗。"
+# TODO 要覆查 - 20061027
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "已連結"
+
+msgid "Connection failed"
+msgstr "連線失敗"
 
 msgid "Add to chat"
 msgstr "新增到聊天室"
@@ -3149,14 +3274,23 @@ msgstr "新增到聊天室"
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N)："
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "無法解析主機名稱「%s」：%s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "連線中"
+
 msgid "Chat error"
 msgstr "聊天錯誤"
 
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-msgid "Not connected to the server."
-msgstr "尚未連線到伺服器。"
+msgid "Not connected to the server"
+msgstr "尚未連線到伺服器"
 
 msgid "Find buddies..."
 msgstr "尋找好友..."
@@ -3197,6 +3331,9 @@ msgstr "波蘭廣受歡迎的即時通訊程式"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
+msgid "GG server"
+msgstr "Gadu-Gadu 伺服器"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令：%s"
@@ -3211,7 +3348,7 @@ msgstr "沒有設定主題"
 msgid "File Transfer Failed"
 msgstr "檔案傳輸失敗"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "無法開啟監聽埠。"
 
 msgid "Error displaying MOTD"
@@ -3227,8 +3364,16 @@ msgstr "這個連結沒有相關的是日訊息。"
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-msgid "Server has disconnected"
-msgstr "伺服器已停止連線"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "與伺服器之間的連線突然中斷：%s"
 
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
@@ -3239,27 +3384,24 @@ msgstr "頻道(_C)："
 msgid "_Password:"
 msgstr "密碼(_P)："
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC 網名不可含有空白字符"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "連線中"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC 網名和伺服器名稱均不可含有空白字符"
 
 # XXX 暫譯
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
-msgid "Couldn't create socket"
-msgstr "無法建立 Socket"
+msgid "Unable to connect"
+msgstr "無法連線"
 
-msgid "Couldn't connect to host"
-msgstr "無法連到伺服器"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "無法連線：%s"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-msgid "Read error"
-msgstr "讀取錯誤"
+#, c-format
+msgid "Server closed the connection"
+msgstr "伺服器關閉了連線"
 
 msgid "Users"
 msgstr "使用者"
@@ -3448,6 +3590,16 @@ msgid ""
 "invalid characters."
 msgstr "伺服器拒絕了你所指定的帳號名稱，名稱中大概含有無效字符。"
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "網名「%s」已在使用中。"
+
+msgid "Nickname in use"
+msgstr "網名已在使用中"
+
 msgid "Cannot change nick"
 msgstr "無法更改網名"
 
@@ -3683,11 +3835,11 @@ msgstr "臨時指令失敗"
 msgid "execute"
 msgstr "執行"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "伺服器要求使用 TLS/SSL，但找不到 TLS/SSL 支援。"
 
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "你指定必須加密，但找不到 TLS/SSL 支援。"
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "你要求加密，但找不到 TLS/SSL 支援。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
@@ -3701,19 +3853,44 @@ msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-msgid "Invalid response from server."
-msgstr "伺服器送來了無效的回應。"
+msgid "SASL authentication failed"
+msgstr "SASL 認證失敗"
+
+msgid "Invalid response from server"
+msgstr "伺服器送來了無效的回應"
 
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "你要求加密，但這伺服器沒有加密功能。"
+
 # XXX 好像有些怪，譯文有待改進
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-msgid "SASL error"
-msgstr "SASL 錯誤"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL 錯誤：%s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "BOSH 連線管理員中斷了你的工作階段。"
+
+msgid "No session ID given"
+msgstr "沒有給定工作階段代碼"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "不支援的 BOSH 協定版本"
+
+msgid "Unable to establish a connection with the server"
+msgstr "無法與伺服器建立連線"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "無法與伺服器建立連線：%s"
+
+msgid "Unable to establish SSL connection"
+msgstr "無法建立 SSL 連線"
 
 msgid "Full Name"
 msgstr "全名"
@@ -3730,6 +3907,11 @@ msgstr "URL"
 msgid "Street Address"
 msgstr "街道地址"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "地址(續)"
 
@@ -3780,185 +3962,10 @@ msgstr "用戶端"
 msgid "Operating System"
 msgstr "作業系統"
 
-# NOTE 這是功能名稱（直譯）
-msgid "Last Activity"
-msgstr "最近活動"
-
-msgid "Service Discovery Info"
-msgstr "服務探尋資訊"
-
-#  FIXME acli 2070914
-msgid "Service Discovery Items"
-msgstr "服務探尋項目"
-
-# NOTE 這是功能名稱（直譯）
-msgid "Extended Stanza Addressing"
-msgstr "延伸段落定址"
-
-# NOTE 這是功能名稱
-msgid "Multi-User Chat"
-msgstr "多用戶聊天"
-
-# NOTE 這是功能名稱（直譯）
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "多用戶聊天延伸上線狀態資訊"
-
-# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
-msgid "In-Band Bytestreams"
-msgstr "帶內位元組串流"
-
-msgid "Ad-Hoc Commands"
-msgstr "臨時指令"
-
-msgid "PubSub Service"
-msgstr "PubSub 服務"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 位元組串流"
-
-msgid "Out of Band Data"
-msgstr "帶外數據"
-
-#  NOTE Untranslated
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "帶內註冊"
-
-msgid "User Location"
-msgstr "使用者所在位置"
-
-msgid "User Avatar"
-msgstr "使用者化身"
-
-msgid "Chat State Notifications"
-msgstr "聊天狀態通知"
-
-# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-msgid "Software Version"
-msgstr "軟件版本"
-
-msgid "Stream Initiation"
-msgstr "開始串流"
-
-msgid "File Transfer"
-msgstr "檔案傳輸"
-
-msgid "User Mood"
-msgstr "使用者情緒"
-
-# XXX may be wrong
-msgid "User Activity"
-msgstr "使用者活動狀態"
-
-#  NOTE 直譯：個體能力
-#  FIXME 譯文有待改進 - acli 20070918
-msgid "Entity Capabilities"
-msgstr "個體能力"
-
-#  FIXME 這聽來不對 - acli 20070913
-msgid "Encrypted Session Negotiations"
-msgstr "加密工作階段協商"
-
-msgid "User Tune"
-msgstr "使用者樂曲"
-
-#  NOTE「Roster」指「名冊」，但Open Source software似乎一般譯「好友清單」、「成員列表」等
-#  FIXME 譯文有待改進 - acli 20070918
-msgid "Roster Item Exchange"
-msgstr "好友清單項目交換"
-
-#  NOTE 參見 http://jabber.org/protocol/reach
-#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」（例如電話號碼）
-#  NOTE 直譯：可抵達性位址
-#  XXX 是否譯「其他通訊方法」較好？但要先看上下文 - acli 20070918
-msgid "Reachability Address"
-msgstr "可抵達性位址"
-
-msgid "User Profile"
-msgstr "使用者資料"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle 音訊"
-
-msgid "User Nickname"
-msgstr "使用者網名"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr "Jingle 視像"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "收到的訊息"
-
-msgid "Public Key Publishing"
-msgstr "發佈公開密碼匙"
-
-# NOTE Jabber 新功能規格
-msgid "User Chatting"
-msgstr ""
-
-# NOTE Jabber 新功能規格
-msgid "User Browsing"
-msgstr "使用者瀏覽"
-
-# NOTE Jabber 新功能規格
-msgid "User Gaming"
-msgstr ""
-
-# NOTE Jabber 新功能規格
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "段落加密"
-
-# NOTE http://www.xmpp.org/extensions/xep-0202.html
-msgid "Entity Time"
-msgstr ""
-
-#  XXX 暫譯- acli 20070913
-msgid "Delayed Delivery"
-msgstr "延遲送出"
-
-# NOTE http://www.xmpp.org/extensions/xep-0204.html
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Jingle 用的 STUN 服務偵測"
-
-# FIXME 這聽來不對
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "簡化加密工作階段協商"
-
-msgid "Hop Check"
-msgstr "中繼段檢查"
-
-msgid "Capabilities"
-msgstr "兼容性"
+# NOTE Debian 譯「local」為「本地端」
+# XXX
+msgid "Local Time"
+msgstr "本地端時間："
 
 msgid "Priority"
 msgstr "優先次序"
@@ -3971,6 +3978,13 @@ msgstr "優先次序"
 msgid "Resource"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr "%s前"
+
+msgid "Logged Off"
+msgstr "已登出"
+
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
 msgid "Middle Name"
@@ -3995,7 +4009,6 @@ msgstr "現身給"
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
@@ -4004,7 +4017,6 @@ msgstr "要求或重新要求認證"
 
 # NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4138,9 +4150,8 @@ msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
 
 msgid "Invalid Server"
-msgstr "無效的伺服器名"
+msgstr "無效的伺服器名稱"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
@@ -4151,28 +4162,23 @@ msgstr "選擇查詢的會議伺服器"
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "你指定必須加密，但這伺服器沒有加密功能。"
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
+msgid "Affiliations:"
+msgstr "從屬關係："
 
-msgid "Write error"
-msgstr "寫入錯誤"
+msgid "No users found"
+msgstr "找不到任何使用者"
 
-msgid "Ping timeout"
-msgstr "Ping逾時"
+msgid "Roles:"
+msgstr "身份："
 
-msgid "Read Error"
-msgstr "讀取錯誤"
+msgid "Ping timed out"
+msgstr "Ping逾時"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "無法建立 Socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
+msgstr "無法直接連線，但無法找到其他的 XMPP 連線方法。"
 
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
@@ -4180,6 +4186,10 @@ msgstr "XMPP 帳號無效"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效，域名是必須設定的。"
 
+# FIXME 譯文聽來好像有點怪 20070518 acli
+msgid "Malformed BOSH URL"
+msgstr "畸型的 BOSH 網址"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
@@ -4204,9 +4214,6 @@ msgstr "移除註冊成功"
 msgid "Unregistration Failed"
 msgstr "移除註冊失敗"
 
-msgid "Already Registered"
-msgstr "已經註冊"
-
 msgid "State"
 msgstr "省／州"
 
@@ -4219,6 +4226,9 @@ msgstr "電話"
 msgid "Date"
 msgstr "日期"
 
+msgid "Already Registered"
+msgstr "已經註冊"
+
 msgid "Unregister"
 msgstr "移除註冊"
 
@@ -4265,11 +4275,18 @@ msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "伺服器不支援封鎖"
 
 msgid "Not Authorized"
 msgstr "未認證"
 
+msgid "Mood"
+msgstr "心情"
+
+# FIXME - acli 20080511
+msgid "Now Listening"
+msgstr "正在聽的音樂"
+
 # NOTE 這些奇怪 Jabber 術語（至「Subscription」條）的解釋由 faceprint 提供
 # NOTE LSchiere2 的補充如下：
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
@@ -4303,13 +4320,6 @@ msgstr "無"
 msgid "Subscription"
 msgstr "認證狀態"
 
-msgid "Mood"
-msgstr "心情"
-
-# FIXME - acli 20080511
-msgid "Now Listening"
-msgstr "正在聽的音樂"
-
 # XXX 要覆查 - acli 20070914
 msgid "Mood Text"
 msgstr "情緒描述"
@@ -4356,9 +4366,6 @@ msgstr "成功修改了你的密碼。"
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-msgid "Password (again)"
-msgstr "舊密碼（再次確認）"
-
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
@@ -4585,16 +4592,16 @@ msgstr "串流錯誤"
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#  XXX 暫譯「（會員）等級」 - ambrose 20070415
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "不明的等級：「%s」"
+msgstr "不明的從屬關係：「%s」"
 
-#  XXX 暫譯 - ambrose 20070415
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "無法將使用者 %s 的等級設定為「%s」"
+msgstr "無法將使用者 %s 與這聊天室的從屬關係設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
@@ -4616,16 +4623,24 @@ msgid "Unable to ping user %s"
 msgstr "無法 Ping 使用者 %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "無法「嗶」使用者 %s ，因為沒有有關對方的任何資料。"
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "無法「嗶」%s ，因為沒有有關對方的任何資料。"
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "無法「嗶」使用者 %s ，因為對方目前可能離線。"
+msgid "Unable to buzz, because %s might be offline."
+msgstr "無法「嗶」%s ，因為對方目前可能離線。"
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "無法「嗶」使用者 %s ，因為對方的用戶端不支援這個功能。"
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"無法「嗶」%s ，因為對方的用戶端不支援這個功能，或者目前關閉了這個功能。"
+
+# XXX 這是暫譯 - acli 20070913
+#, c-format
+msgid "Buzzing %s..."
+msgstr "正在給 %s 一個嗶..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4636,10 +4651,38 @@ msgstr "嗶！"
 msgid "%s has buzzed you!"
 msgstr "%s「嗶」了你一聲"
 
-# XXX 這是暫譯 - acli 20070913
+# XXX 媒體? - acli 20090730
 #, c-format
-msgid "Buzzing %s..."
-msgstr "正在給 %s 一個嗶..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "無法與 %s 進行媒體通話，因為這個 JID 是無效的"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "無法與 %s 進行媒體通話，因為對方目前沒有連線"
+
+#  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
+#  FIXME 這很明顯是有問題的譯文，但這是這個 PO 檔現有的譯法（見「To」條）；
+#  FIXME 如果這個要改，其他有關 presence 的譯文也要一齊改才行。-acli 20070614
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "無法與 %s 進行媒體通話，因為未獲對方認證"
+
+msgid "Media Initiation Failed"
+msgstr "媒體通話啟動失敗"
+
+#  FIXME 這不通順 - acli 20090730
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "請指定與 %s 的那一個 Resource 進行媒體通話。"
+
+msgid "Select a Resource"
+msgstr "選擇一個 Resource"
+
+# XXX 暫譯 - acli 20090730
+msgid "Initiate Media"
+msgstr "媒體通話"
 
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
@@ -4659,21 +4702,21 @@ msgstr "topic [新主題]：檢視或修改聊天主題"
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [理由]：禁止某使用者進入聊天室"
 
-#  XXX 暫譯「（會員）等級」 - ambrose 20070415
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt;: 設定使用者"
-"在這聊天室內的等級"
+"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt; [網名1] [網"
+"名2] ...: 取得與聊天室有從屬關係的使用者，或設定使用者與這聊天室內的從屬關係"
 
 #  NOTE 譯文改動 by ambrose
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
-"這聊天室內的身份。"
+"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt; [網名1] [網名"
+"2] ...: 取得在聊天室有身份的使用者，或設定使用者在這聊天室內的身份。"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]：邀請使用者進入聊天室"
@@ -4733,6 +4776,9 @@ msgstr "連結伺服器"
 msgid "File transfer proxies"
 msgstr "檔案傳輸代理伺服器"
 
+msgid "BOSH URL"
+msgstr "BOSH 網址"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4771,6 +4817,14 @@ msgstr "XML 分析錯誤"
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "加入聊天室 %s 時發生錯誤"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "聊天室 %s 發生錯誤"
+
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
@@ -4785,13 +4839,29 @@ msgstr "設定聊天室(_C)"
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
+msgid "No reason"
+msgstr "沒有給予原因"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "加入聊天室 %s 時發生錯誤"
+msgid "You have been kicked: (%s)"
+msgstr "你已被踢出：(%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "聊天室 %s 發生錯誤"
+msgid "Kicked (%s)"
+msgstr "已被踢出 (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "帶內位元組流傳輸途中發生錯誤\n"
+
+# XXX 還是直譯「被關閉」？ 20090305 acli
+msgid "Transfer was closed."
+msgstr "傳輸已被中止。"
+
+msgid "Failed to open the file"
+msgstr "無法開啟檔案"
+
+msgid "Failed to open in-band bytestream"
+msgstr "無法開啟帶內位元組流"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4820,9 +4890,6 @@ msgstr "無法傳送檔案至 %s，因為未獲對方認證"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 
-msgid "Select a Resource"
-msgstr "選擇一個 Resource"
-
 msgid "Edit User Mood"
 msgstr "編輯使用者情緒"
 
@@ -5137,6 +5204,26 @@ msgstr "沒有羣組的好友"
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s 對你眨眼，<a href='msn-wink://%s'>請點擊這裏播放這個動作</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s 對你眨眼，但無法給眨眼動作存檔"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s 送來了一段語音片段，<a href='audio://%s'>請點擊這裏播放</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s 送來了一段語音片段，但無法給語音片段存檔"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s 送來了一個語音聊天的邀請，但目前還沒有語音聊天的支援。"
+
 msgid "Nudge"
 msgstr "呼叫"
 
@@ -5292,8 +5379,26 @@ msgstr "開啟聊天室(_C)"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-msgid "Failed to connect to server."
-msgstr "無法連線到伺服器。"
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr "所以無法新增好友「%s」，因為這個帳號是無效的。帳號必須為有效電郵地址。"
+
+msgid "Unable to Add"
+msgstr "無法加入"
+
+msgid "Authorization Request Message:"
+msgstr "認證要求訊息："
+
+msgid "Please authorize me!"
+msgstr "請通過我的認證！"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "確定(_O)"
 
 msgid "Error retrieving profile"
 msgstr "取得個人資料時發生錯誤"
@@ -5484,71 +5589,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID 認證：回應無效"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s 不是一個有效的羣組。"
-
-msgid "Unknown error."
-msgstr "未知錯誤。"
-
-# NOTE: 第二個 %s 為使用者名稱，第三個 %s 為通訊協定名稱
-# NOTE: 第一個 %s 似乎係錯誤訊息摘要（整個字串為視窗標題）
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2$s (%3$s)：%1$s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 在呼叫你！"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "不明錯誤（代碼 %d）"
+msgid "Unknown error (%d): %s"
+msgstr "不明錯誤（代碼 %d）：%s"
 
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "不明錯誤（代碼 %d）"
+
 # XXX 暫譯 - 20090226
 msgid "The following users are missing from your addressbook"
 msgstr "以下使用者不在通訊錄內"
 
-#  TODO 請覆查，譯文有待改進
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) 新增使用者失敗"
-
-#  TODO 請覆查，譯文有待改進
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) 拒絕使用者失敗"
-
-#  TODO 請覆查，譯文有待改進
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) 允許使用者失敗"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "因為好友清單已滿，以致無法新增 %s"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s 不是一個有效的護照帳號"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-msgid "Service Temporarily Unavailable."
-msgstr "暫時無法提供服務"
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "因為行動訊息過長，所以無法送出："
 
-msgid "Unable to rename group"
-msgstr "無法更改羣組名稱"
-
-msgid "Unable to delete group"
-msgstr "無法移除羣組"
-
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
 #, c-format
@@ -5593,9 +5655,6 @@ msgstr "因為發生不明的編碼錯誤，訊息無法送出："
 msgid "Message was not sent because an unknown error occurred."
 msgstr "因為發生不明的錯誤，訊息無法送出。"
 
-msgid "Unable to connect"
-msgstr "無法連線"
-
 msgid "Writing error"
 msgstr "寫入錯誤"
 
@@ -5612,21 +5671,21 @@ msgstr ""
 "%s 伺服器傳來一個連線錯誤：\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "這個伺服器不支援我們使用的通訊協定。"
+msgid "Our protocol is not supported by the server"
+msgstr "這個伺服器不支援我們使用的通訊協定"
 
-msgid "Error parsing HTTP."
-msgstr "解析 HTTP 途中發生錯誤。"
+msgid "Error parsing HTTP"
+msgstr "解析 HTTP 途中發生錯誤"
 
-msgid "You have signed on from another location."
-msgstr "你由其他的地方登入。"
+msgid "You have signed on from another location"
+msgstr "你由其他的地方登入"
 
 #  XXX
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "暫時無法使用 MSN 使服器，請過一會後重試。"
+msgstr "暫時無法使用 MSN 伺服器，請過一會後重試。"
 
-msgid "The MSN servers are going down temporarily."
-msgstr "MSN 伺服器將暫時關閉。"
+msgid "The MSN servers are going down temporarily"
+msgstr "MSN 伺服器將暫時關閉"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5655,6 +5714,16 @@ msgstr "傳送 Cookie 中"
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
+# FIXME 不知這是什麼意思 - acli 20090803
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s 要求看你的 webcam，但目前還沒有這個功能的支援。"
+
+# FIXME 不知這是什麼意思 - acli 20090803
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s 送來了一個 webcam 邀請，但目前還沒有這個功能的支援。"
+
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
@@ -5693,14 +5762,6 @@ msgstr "因為 Switchboard 發生錯誤，所以訊息無法送出"
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "因為發生不明的錯誤，訊息可能沒有送出："
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s 將你加入他（她）的好友清單。"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s 將你從他（她）的好友清單中移除。"
-
 #  NOTE 注意！evolution 本身的譯法是「目錄服務」而非「通訊錄」
 msgid "Delete Buddy from Address Book?"
 msgstr "將好友自通訊錄刪除？"
@@ -5731,6 +5792,61 @@ msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s 不是一個有效的羣組。"
+
+msgid "Unknown error."
+msgstr "未知錯誤。"
+
+# NOTE: 第二個 %s 為使用者名稱，第三個 %s 為通訊協定名稱
+# NOTE: 第一個 %s 似乎係錯誤訊息摘要（整個字串為視窗標題）
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s (%3$s)：%1$s"
+
+#  TODO 請覆查，譯文有待改進
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) 新增使用者失敗"
+
+#  TODO 請覆查，譯文有待改進
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) 拒絕使用者失敗"
+
+#  TODO 請覆查，譯文有待改進
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) 允許使用者失敗"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "因為好友清單已滿，以致無法新增 %s"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s 不是一個有效的護照帳號"
+
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+msgid "Service Temporarily Unavailable."
+msgstr "暫時無法提供服務"
+
+msgid "Unable to rename group"
+msgstr "無法更改羣組名稱"
+
+msgid "Unable to delete group"
+msgstr "無法移除羣組"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s 將你加入他（她）的好友清單。"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s 將你從他（她）的好友清單中移除。"
+
+#, c-format
 msgid "No such user: %s"
 msgstr "無此使用者：%s"
 
@@ -5761,6 +5877,8 @@ msgid "Lost connection with server"
 msgstr "與伺服器之間的連線中斷"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "有新郵件"
 
@@ -5797,13 +5915,6 @@ msgstr[1] "從伺服器新增或更新了 %d 個好友（包括伺服器上已�
 msgid "Add contacts from server"
 msgstr "從伺服器加入聯絡人"
 
-# TODO 要覆查 - 20061027
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "已連結"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "通訊協定錯誤，代碼 %d：%s"
@@ -5811,14 +5922,16 @@ msgstr "通訊協定錯誤，代碼 %d：%s"
 # NOTE 第一個 %s 是錯誤訊息
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s 你的密碼的長度為 %d 個字符，超出了估計中 MySpaceIM 所設 %d 字符的上限。請"
-"透過 http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
-"changePassword 選擇一個較短的密碼，然後重試。"
+"%s 你的密碼的長度為 %zu 個字符，超出了 %d 字符的上限。請透過 http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"選擇一個較短的密碼，然後重試。"
+
+msgid "Incorrect username or password"
+msgstr "錯誤的帳號或密碼"
 
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM 錯誤"
@@ -5829,16 +5942,6 @@ msgstr "MySpaceIM 錯誤"
 msgid "Invalid input condition"
 msgstr "輸入狀況無效"
 
-msgid "Read buffer full (2)"
-msgstr "讀取用的暫存區滿了（代號2）"
-
-msgid "Unparseable message"
-msgstr "無法解析訊息"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "無法連到伺服器：%s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "無法新增好友"
 
@@ -5925,6 +6028,14 @@ msgstr "好友總數"
 msgid "Client Version"
 msgstr "客戶端版本"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"設定使用者名稱途中發生錯誤。請重試，或到網址 http://editprofile.myspace.com/"
+"index.cfm?fuseaction=profile.username  設定使用者名稱。"
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM：可取得此使用者名稱"
 
@@ -6150,9 +6261,6 @@ msgstr "無法新增你自己至好友清單"
 msgid "Master archive is misconfigured"
 msgstr "Master archive 設定錯誤"
 
-msgid "Incorrect username or password"
-msgstr "錯誤的帳號或密碼"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "無法辦識你所輸入的帳號內的主機名稱"
 
@@ -6192,8 +6300,8 @@ msgid "Unknown error: 0x%X"
 msgstr "未知錯誤：0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "登入失敗 (%s)。"
+msgid "Unable to login: %s"
+msgstr "無法登入：%s"
 
 #  XXX 暫譯
 #, c-format
@@ -6295,9 +6403,6 @@ msgstr "GroupWise 會議 %d"
 msgid "Authenticating..."
 msgstr "認證中..."
 
-msgid "Unable to connect to server."
-msgstr "無法連線到伺服器。"
-
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
@@ -6322,23 +6427,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "你要加入個這交談嗎？"
 
-# XXX 暫譯
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "你已經被登出，因為你已在其他電腦上登入。"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 目前似乎離線，所以不會收到你剛才送出的訊息。"
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "無法連線至伺服器。請輸入你希望連線至的伺服器的位址。"
 
-msgid "Error. SSL support is not installed."
-msgstr "錯誤：沒有安裝 SSL 支援。"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -6361,25 +6459,34 @@ msgstr "伺服器位址"
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
+msgid "Received unexpected response from "
+msgstr "伺服器發出了奇怪的回應，伺服器位址 "
+
+#. username connecting too frequently
+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 ""
+"你的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線，"
+"那麼你的等待時間將會更加的延長。"
+
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
+msgid "Error requesting "
+msgstr "要求途中發生了錯誤，伺服器位址 "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL 不允許你的帳號在這裏登入"
+
 msgid "Could not join chat room"
 msgstr "無法加入聊天室"
 
 msgid "Invalid chat room name"
 msgstr "聊天室名稱無效"
 
-msgid "Server closed the connection."
-msgstr "伺服器關閉連線。"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"與伺服器之間的連線突然中斷:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "連線至伺服器時收到無效的資料。"
+msgid "Received invalid data on connection with server"
+msgstr "連線至伺服器時收到無效的資料"
 
 #. *< type
 #. *< ui_requirement
@@ -6426,7 +6533,7 @@ msgstr "與遠端使用者的連線突然中斷：<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "在與遠端使用者的連線上收到無交的資料。"
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "無法與遠端使用者建立連線。"
 
 msgid "Direct IM established"
@@ -6485,7 +6592,7 @@ msgstr "遺失回應"
 msgid "Request denied"
 msgstr "要求被拒"
 
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#Pidgin提供
+# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
@@ -6644,23 +6751,15 @@ msgid "Warning Level"
 msgstr "警告等級"
 
 msgid "Buddy Comment"
-msgstr "好友說明"
+msgstr "好友備註"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"無法連線至認證伺服器：\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "無法連線至認證伺服器：%s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"無法連線到 BOS 伺服器：\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "無法連線到 BOS 伺服器：%s"
 
 msgid "Username sent"
 msgstr "已送出使用者名稱"
@@ -6674,24 +6773,36 @@ msgstr "完成連線中"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"無法登入：無法以 %s 身份登入，因為這個帳號是無效的。帳號必須為有效電郵地址；"
-"或者以英文字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
+"無法以 %s 身份登入，因為這個帳號是無效的。帳號必須為有效電郵地址；或者以英文"
+"字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "使用者名稱無效。"
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "你可能會在短時間內中斷連線。如果屬實，請到 %s 看看有沒有更新。"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "無法取得有效的 AIM 登入碼。"
+
+msgid "Unable to get a valid login hash."
+msgstr "無法取得有效的登入雜湊。"
+
+msgid "Received authorization"
+msgstr "收到認證"
 
-msgid "Incorrect password."
-msgstr "密碼錯誤。"
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "使用者名稱不存在"
 
+# XXX「suspend」真是「停用」嗎？
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "你的帳號目前停用中。"
+msgid "Your account is currently suspended"
+msgstr "你的帳號目前停用中"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
@@ -6700,27 +6811,21 @@ msgstr "你的帳號目前停用中。"
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"你的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線，"
-"那麼你的等待時間將會更加的延長。"
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "你所使用的用戶端程式太過老舊。請到 %s 更新"
 
-msgid "Could Not Connect"
-msgstr "無法連線"
-
-msgid "Received authorization"
-msgstr "收到認證"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"你的連線／斷線動作太過頻繁。請等待一分鐘後再行重試。如果你依然繼續嘗試連線，"
+"那麼你的等待時間將會更加的延長。"
 
-msgid "The SecurID key entered is invalid."
-msgstr "你所輸入的 SecurID 碼無效。"
+msgid "The SecurID key entered is invalid"
+msgstr "你所輸入的 SecurID 碼無效"
 
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
@@ -6728,26 +6833,6 @@ msgstr "請輸入 SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "確定(_O)"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "你可能會在短時間內中斷連線。如果屬實，請到 %s 看看有沒有更新。"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "無法取得有效的 AIM 登入碼。"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "你可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
-
-msgid "Unable to get a valid login hash."
-msgstr "無法取得有效的登入雜湊。"
-
 msgid "Password sent"
 msgstr "成功送出密碼"
 
@@ -6757,12 +6842,6 @@ msgstr "無法初始化連結"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求，好讓我可以將你加入我的好友清單中。"
 
-msgid "Authorization Request Message:"
-msgstr "認證要求訊息："
-
-msgid "Please authorize me!"
-msgstr "請通過我的認證！"
-
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
@@ -6877,7 +6956,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息：%s"
@@ -6900,6 +6979,9 @@ msgstr "上線自"
 msgid "Member Since"
 msgstr "成為成員的時間"
 
+msgid "Capabilities"
+msgstr "兼容性"
+
 msgid "Profile"
 msgstr "個人資料"
 
@@ -7064,15 +7146,12 @@ msgstr "離開訊息過長。"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"所以無法新增好友「%s」，因為這個帳號是無效的。帳號必須為有效電郵地址；或者以"
-"英文字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
-
-msgid "Unable to Add"
-msgstr "無法加入"
+"無法新增好友「%s」，因為這個帳號是無效的。帳號必須為有效電郵地址；或者以英文"
+"字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "無法取得好友清單"
@@ -7089,17 +7168,17 @@ msgstr "孤兒們"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"因為你的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
-"試。"
+"因為你的好友清單中有太多的好友，所以沒有辦法加入好友 %s。請移除其中一個，然後"
+"重試。"
 
 msgid "(no name)"
 msgstr "(沒有名字)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "無法把 %s 加入好友清單，原因不明。"
 
 # XXX 好像有些不順 - acli 20080508
@@ -7137,7 +7216,7 @@ msgstr ""
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
-# NOTE: 這裡的字義係由 #Pidgin 的 MrHappy 及 deryni 提供的
+# NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同，暫時不予理會
 msgid "_Exchange:"
 msgstr "頻道號碼(_E)："
@@ -7154,10 +7233,10 @@ msgstr "iTunes Store 網站連結"
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "%s 的好友說明"
+msgstr "%s 的好友備註"
 
 msgid "Buddy Comment:"
-msgstr "好友說明："
+msgstr "好友備註："
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
@@ -7176,7 +7255,7 @@ msgstr "取得 AIM 資訊"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "編輯好友說明"
+msgstr "編輯好友備註"
 
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
@@ -7188,12 +7267,12 @@ msgstr "即時訊息"
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-# NOTE Require意為「需要」，不是「要求」
+# NOTE 在這裏「Require」是指別人如果要新增您為好友，得先向您發出驗證要求，再由您允許
 msgid "Require authorization"
-msgstr "需要認證"
+msgstr "必須驗證"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "允許其他使用者在網絡上查看你目前的狀態（會導致你收到垃圾訊息！）"
+msgstr "允許在網絡上檢視你目前的狀態（會導致你收到垃圾訊息！）"
 
 msgid "ICQ Privacy Options"
 msgstr "ICQ 私隱選頊"
@@ -7236,6 +7315,7 @@ msgstr "搜尋(_S)"
 msgid "Set User Info (web)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "修改密碼 (透過網頁)"
 
@@ -7266,6 +7346,9 @@ msgstr "使用電子郵件地址搜尋好友..."
 msgid "Search for Buddy by Information"
 msgstr "根據資訊尋找好友"
 
+msgid "Use clientLogin"
+msgstr "使用 clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7400,9 +7483,8 @@ msgstr "郵遞編號"
 msgid "Phone Number"
 msgstr "電話號碼"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "給予認證？"
+msgstr "允許新增你為好友"
 
 msgid "Cellphone Number"
 msgstr "流動電話號碼"
@@ -7460,14 +7542,43 @@ msgstr "更新"
 msgid "Could not change buddy information."
 msgstr "無法修改好友資訊。"
 
-# NOTE Require意為「需要」，不是「要求」
+msgid "Mobile"
+msgstr "使用流動通訊器材"
+
+msgid "Note"
+msgstr "備註"
+
+# NOTE 正式的QQ介面寫「备注」(備註)
+#. callback
+msgid "Buddy Memo"
+msgstr "好友備註"
+
+msgid "Change his/her memo as you like"
+msgstr "請隨意修改備註"
+
+msgid "_Modify"
+msgstr "修改(_M)"
+
+msgid "Memo Modify"
+msgstr "修改備註"
+
+# XXX 中文正常應該不會用「says」一類的擬人字眼？ - acli 20090305
+msgid "Server says:"
+msgstr "伺服器回應："
+
+msgid "Your request was accepted."
+msgstr "請求已獲接受。"
+
+msgid "Your request was rejected."
+msgstr "請求已被拒絶。"
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u 要求認證"
 
-#, fuzzy
+# XXX 暫譯 - acli 20090803
 msgid "Add buddy question"
-msgstr "將使用者加入你的好友清單？"
+msgstr "新增好友的認證問題"
 
 msgid "Enter answer here"
 msgstr "在此輸入答案"
@@ -7484,14 +7595,16 @@ msgstr "拒絕認證訊息："
 msgid "Sorry, you're not my style."
 msgstr "不好意思，你不是我的菜…"
 
+# NOTE 請看下面 =P
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u 需要授權"
+msgstr "%u 需要認證"
 
-#, fuzzy
+# NOTE 這是視窗標題，對應下面的「Enter request here」和「Would you be my friend?」
 msgid "Add buddy authorize"
-msgstr "將使用者加入你的好友清單？"
+msgstr "新增好友認證"
 
+# NOTE 其他協定譯「認證要求訊息：」
 msgid "Enter request here"
 msgstr "在此輸入要求"
 
@@ -7509,7 +7622,7 @@ msgid "Invalid QQ Number"
 msgstr "無效的 QQ 號碼"
 
 msgid "Failed sending authorize"
-msgstr "送出授權失敗"
+msgstr "送出認證失敗"
 
 #, c-format
 msgid "Failed removing buddy %u"
@@ -7568,10 +7681,10 @@ msgid "Member"
 msgstr "用戶"
 
 msgid "Requesting"
-msgstr ""
+msgstr "請求中"
 
 msgid "Admin"
-msgstr ""
+msgstr "管理人"
 
 msgid "Notice"
 msgstr "通知"
@@ -7597,19 +7710,17 @@ msgstr "加入羣組"
 msgid "Input request here"
 msgstr "請輸入要求"
 
-#  NOTE QQ「member」應是「成員」
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "成功加入 Qun %s (%u)"
+msgstr "成功加入羣組 %s (%u)"
 
-#  NOTE QQ「member」應是「成員」
 msgid "Successfully joined Qun"
-msgstr "成功加入 Qun"
+msgstr "成功加入羣組"
 
 # NOTE 這是 QQ_ROOM_JOIN_DENIED
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr "加入 Qun %u 被拒絕"
+msgstr "加入羣組 %u 被拒絕"
 
 msgid "QQ Qun Operation"
 msgstr "QQ 羣組操作"
@@ -7618,15 +7729,15 @@ msgid "Failed:"
 msgstr "失敗："
 
 msgid "Join Qun, Unknown Reply"
-msgstr "加入 Qun，未知的回覆"
+msgstr "加入羣組途中收到未知的回覆"
 
 msgid "Quit Qun"
-msgstr "離開 Qun"
+msgstr "離開羣組"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
-msgstr "請注意，假如你是創立者，這最終會把這個羣 (Qun) 移除。"
+msgstr "請注意，假如你是創立者，這最終會把這個羣組 (Qun) 移除。"
 
 #  NOTE 這個「你」字沒有打錯，主要是法文及德文的譯者都採用「你」
 #  NOTE（法文「tu」、德文「du」）而不是「您」（「vous」、「Sie」），
@@ -7636,14 +7747,14 @@ msgstr "不好意思，你不是我們的菜"
 
 #  NOTE QQ「member」應是「成員」
 msgid "Successfully changed Qun members"
-msgstr "成功的更改了 Qun 成員"
+msgstr "成功的更改了羣組成員"
 
 # FIXME 暫譯 ambrose 20070415
 msgid "Successfully changed Qun information"
 msgstr "成功的更改了 Qun 資訊"
 
 msgid "You have successfully created a Qun"
-msgstr "成功建立了一個羣 (Qun)"
+msgstr "成功建立了一個羣組 (Qun)"
 
 msgid "Would you like to set up detailed information now?"
 msgstr "你現在要立即設定詳細資訊嗎？"
@@ -7651,9 +7762,10 @@ msgstr "你現在要立即設定詳細資訊嗎？"
 msgid "Setup"
 msgstr "設定"
 
-#, fuzzy, c-format
+# NOTE %s 為「reason」
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "使用者 %d 要求加入羣組 %d"
+msgstr "使用者 %u 要求加入羣組 %u，理由為「%s」"
 
 #, c-format
 msgid "%u request to join Qun %u"
@@ -7661,11 +7773,12 @@ msgstr "使用者 %u 要求加入羣組 %u"
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr ""
+msgstr "加入羣組 %u 失敗，羣組管理員為 %u"
 
+# NOTE %s 為「reason」
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>管理員 %2$u 允許了你加入羣組 %1$u，理由為「%3$s」</b>"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
 #, c-format
@@ -7679,9 +7792,9 @@ msgstr "<b>新好友 %u 已加入。</b>"
 
 # XXX 問題：
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白）
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
 # XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
 # XXX - Ambrose 20061123
 #, c-format
@@ -7744,9 +7857,12 @@ msgstr "<b>最近更新時間：</b>： %d-%d-%d, %d:%d:%d<br>\n"
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>伺服器位址</b>：%s<br>\n"
 
-#, fuzzy, c-format
+#  NOTE 直譯：「客戶端旗標」
+#  NOTE 根據原始碼，所謂 Client Tag 係指你的客戶端有什麼功能 (qq2007、QQ2008等等)
+#  NOTE 在OSCAR協定模組對應的欄位 (Capabilities) 譯「相容性」
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>登入時間：</b>%s<br>\n"
+msgstr "<b>兼容性：</b>%s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
@@ -7804,6 +7920,9 @@ msgstr "<p><b>鳴謝</b>：<br>\n"
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>仔細的品管人員</b>:<br>\n"
 
+msgid "and more, please let me know... thank you!))"
+msgstr "如有遺漏務請通知……謝謝！))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>還有所有幕後默默貢獻的無名英雄們…</i><br>\n"
 
@@ -7824,14 +7943,13 @@ msgid "Account Information"
 msgstr "帳號資訊"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "更新所有 QQ 羣"
 
 msgid "About OpenQ"
 msgstr "關於 OpenQ"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "修改地址"
+msgstr "修改好友備註"
 
 #. *< type
 #. *< ui_requirement
@@ -7873,7 +7991,7 @@ msgid "Show server news"
 msgstr "顯示伺服器是日訊息"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "收到聊天室訊息時自動顯示聊天室"
 
 # XXX 20080810 acli - 譯文有待改進，原文也是
 msgid "Keep alive interval (seconds)"
@@ -7883,7 +8001,7 @@ msgstr "每隔多少秒送出 Keep Alive"
 msgid "Update interval (seconds)"
 msgstr "每隔多少秒更新"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "無法解密伺服器回應"
 
 #, c-format
@@ -7902,15 +8020,12 @@ msgstr "暫時不支援 Redirect_EX"
 #. need activation
 #. need activation
 msgid "Activation required"
-msgstr "必須啟動帳號"
+msgstr "必須先啟動帳號"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "無法登入，不明回應碼「0x%02X」"
 
-msgid "Could not decrypt server reply"
-msgstr "無法解密伺服器回應"
-
 msgid "Requesting captcha"
 msgstr "要求驗證圖片中"
 
@@ -7923,9 +8038,11 @@ msgstr "圖片驗證失敗"
 msgid "Captcha Image"
 msgstr "驗證圖片"
 
+# NOTE 這裏的所謂「Enter code」係指輸入驗證圖片上所寫的文字
 msgid "Enter code"
-msgstr "輸入啟動碼"
+msgstr "輸入驗證文字"
 
+# NOTE 視窗標題
 msgid "QQ Captcha Verification"
 msgstr "QQ 圖示驗證"
 
@@ -7945,32 +8062,18 @@ msgstr ""
 "登入時，傳回未知的回覆碼「0x%02X」：\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "無法連線。"
-
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
-msgid "Unable to read from socket"
-msgstr "無法讀取 Socket"
-
-msgid "Write Error"
-msgstr "寫入錯誤"
-
-msgid "Connection lost"
-msgstr "連線中斷"
-
-#, fuzzy
 msgid "Getting server"
-msgstr "設定使用者資訊..."
+msgstr "取得伺服器位址中"
 
 # XXX 這是看了原始碼後的結論（但可能會錯）- acli 20080930
 msgid "Requesting token"
 msgstr "請求符記中"
 
-msgid "Couldn't resolve host"
-msgstr "無法解析主機"
+msgid "Unable to resolve hostname"
+msgstr "無法解析主機名稱"
 
 msgid "Invalid server or port"
 msgstr "伺服器或通訊埠無效"
@@ -8025,14 +8128,14 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ 羣組指令"
 
-msgid "Could not decrypt login reply"
-msgstr "無法解密伺服器回應"
+msgid "Unable to decrypt login reply"
+msgstr "無法解密登入回應"
 
 msgid "Unknown LOGIN CMD"
 msgstr "未知的登入指令"
 
 msgid "Unknown CLIENT CMD"
-msgstr "無知的用戶端指令"
+msgstr "不明的用戶端指令"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8045,9 +8148,6 @@ msgstr "傳送檔案"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了「%s」的傳送"
 
-msgid "Connection closed (writing)"
-msgstr "連線關閉（寫入）"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>羣組名稱：</b>%s<br>"
@@ -8107,17 +8207,6 @@ msgstr "在伺服器「%s」上，有 Sametime 管理人發出了下列通告"
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理人通告"
 
-msgid "Connection reset"
-msgstr "連線重置"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "讀取 Socket 時發生錯誤；%s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "無法連線到主機"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "自 %s 發佈"
@@ -8141,6 +8230,9 @@ msgstr "喇叭"
 msgid "Video Camera"
 msgstr "視像"
 
+msgid "File Transfer"
+msgstr "檔案傳輸"
+
 msgid "Supports"
 msgstr "支援"
 
@@ -8169,7 +8261,6 @@ msgstr "現有會議室"
 msgid "Create New Conference..."
 msgstr "開啟新會議室..."
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite user to a conference"
 msgstr "邀請使用者進入會議室"
 
@@ -8182,12 +8273,11 @@ msgstr ""
 "從下方的清單中選取一個會議室，同時發出邀請給使用者%s。如果你想開啟一個新的會"
 "議室，並且邀請這個使用者加入，你可以選擇「開啟新會議室」選項。"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
 msgid "Invite to Conference..."
-msgstr "邀請進入會議室"
+msgstr "邀請進入會議室..."
 
 #  XXX 要覆查 - 20061029
 msgid "Send TEST Announcement"
@@ -8860,9 +8950,6 @@ msgstr "所屬機構"
 msgid "Unit"
 msgstr "部門"
 
-msgid "Note"
-msgstr "備註"
-
 msgid "Join Chat"
 msgstr "加入聊天室"
 
@@ -8964,6 +9051,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "網絡統計資料"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
@@ -9028,7 +9118,7 @@ msgstr "不支援的公開密碼匙類型"
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
 msgid "Key Exchange failed"
@@ -9038,17 +9128,11 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗，請按「重新連線」建立新的連線。"
 
-msgid "Connection failed"
-msgstr "連線失敗"
-
 msgid "Performing key exchange"
 msgstr "交換密碼匙中"
 
-msgid "Unable to create connection"
-msgstr "無法建立連結"
-
-msgid "Could not load SILC key pair"
-msgstr "無法讀取 SILC 配對密碼匙"
+msgid "Unable to load SILC key pair"
+msgstr "無法載入 SILC 配對密碼匙"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -9057,7 +9141,7 @@ msgstr "連線至 SILC 伺服器中"
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
 msgid "Error loading SILC key pair"
@@ -9357,8 +9441,8 @@ msgstr "數碼簽署所有即時訊息"
 msgid "Creating SILC key pair..."
 msgstr "產生 SILC 配對密碼匙中..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "無法產生 SILC 配對密碼匙\n"
+msgid "Unable to create SILC key pair"
+msgstr "無法產生 SILC 配對密碼匙"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9451,6 +9535,9 @@ msgstr "白板"
 msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
+msgid "Error during connecting to SILC Server"
+msgstr "連線至 SILC 伺服器時發生錯誤"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗：版本不符，請更新你的用戶端程式"
@@ -9493,7 +9580,7 @@ msgstr "失敗：無效的 Cookie"
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
 # NOTE 香港會寫「陳大文」，台灣人會看不明（寫「老張」一類，港人看見會覺得很怪），頭痛 :P
@@ -9501,23 +9588,17 @@ msgid "John Noname"
 msgstr "無名氏"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "無法讀取 SILC 配對密碼匙：%s"
-
-msgid "Could not write"
-msgstr "無法寫入"
+msgid "Unable to load SILC key pair: %s"
+msgstr "無法載入 SILC 配對密碼匙：%s"
 
-msgid "Could not connect"
-msgstr "無法連結"
-
-msgid "Unknown server response."
-msgstr "不明的伺服器回應。"
+msgid "Unable to create connection"
+msgstr "無法建立連結"
 
-msgid "Could not create listen socket"
-msgstr "無法建立 Socket 監聽"
+msgid "Unknown server response"
+msgstr "不明的伺服器回應"
 
-msgid "Could not resolve hostname"
-msgstr "無法解析主機"
+msgid "Unable to create listen socket"
+msgstr "無法建立監聽 Socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字符或「@」符號"
@@ -9558,180 +9639,61 @@ msgstr "認證使用者"
 msgid "Auth Domain"
 msgstr "認證域名"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "找尋 %s 中"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "連結到 %s 失敗"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "登入：%s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "無法寫入檔案 %s。"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "無法讀取檔案 %s。"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "訊息太長，最後的 %s 位元組被截去。"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s 目前並未登入。"
-
-#  NOTE 譯文更動 by Ambrose
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "不允許對 %s 發出警告。"
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "訊息被丟棄，因為你達到了伺服器所限制的發送速度。"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "在 %s 不可以聊天。"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "你送訊息給 %s 的速度太快了。"
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "你遺失了一個由 %s 送來的訊息，因為它太大了。"
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "你遺失了一個由 %s 送來的訊息，因為它傳送的速度太快。"
-
-#, c-format
-msgid "Failure."
-msgstr "失敗。"
-
-#, c-format
-msgid "Too many matches."
-msgstr "匹配太多。"
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "需輸入更多檢索條件。"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "暫時無法使用目錄服務。"
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "禁止 E-Mail 檢查。"
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "關鍵字已被忽略。"
-
-#, c-format
-msgid "No keywords."
-msgstr "沒有關鍵字。"
-
-#, c-format
-msgid "User has no directory information."
-msgstr "這個使用者沒有他的相關資訊。"
-
-#, c-format
-msgid "Country not supported."
-msgstr "這個國家不被支援。"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "未知的失敗原因：%s。"
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "錯誤的帳號或密碼。"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "暫時無法使用該項服務。"
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "你目前登入系統的警告等級太高，以致無法登入。"
-
-#, c-format
-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 ""
-"你的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線，"
-"那麼你的等待時間將會更加的延長。"
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "發生了一個未知的登入錯誤：%s。"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "一個未知的錯誤 %d 發生。資訊：%s"
-
-msgid "Invalid Groupname"
-msgstr "無效的羣組名稱"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網絡的一個聊天室"
 
-msgid "Connection Closed"
-msgstr "連線關閉"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list：列出Yahoo網絡上的聊天室清單"
 
-msgid "Waiting for reply..."
-msgstr "等待回覆中..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: 要求使用者開始 Doodle Session"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC 結束了暫停狀態。你現在可以繼續的傳送你的訊息。"
+msgid "Yahoo ID..."
+msgstr "Yahoo 帳號"
 
-msgid "Password Change Successful"
-msgstr "密碼修改成功"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo 協定模組"
 
-msgid "_Group:"
-msgstr "羣組(_G)："
+msgid "Pager server"
+msgstr "傳呼伺服器"
 
-msgid "Get Dir Info"
-msgstr "取得使用者個人資料"
+msgid "Pager port"
+msgstr "傳呼系統通訊埠"
 
-msgid "Set Dir Info"
-msgstr "設定使用者個人資料"
+msgid "File transfer server"
+msgstr "檔案傳輸伺服器"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "無法開啟 %s 以供寫入！"
+msgid "File transfer port"
+msgstr "檔案傳輸通訊埠"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "檔案傳輸失敗；可能是對方取消傳輸。"
+#  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
+msgid "Chat room locale"
+msgstr "聊天室區域 (Locale)"
 
-msgid "Could not connect for transfer."
-msgstr "無法開啟連線以供傳輸。"
+msgid "Ignore conference and chatroom invitations"
+msgstr "忽略會議室與聊天室邀請"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
+msgid "Chat room list URL"
+msgstr "聊天室清單所在網址"
 
-msgid "Save As..."
-msgstr "另存新檔..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo 聊天伺服器"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
-msgstr[1] "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo 聊天室通訊埠"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s 要求你傳送檔案給他（她）。"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN 帳號..."
 
 #. *< type
 #. *< ui_requirement
@@ -9743,12 +9705,11 @@ msgstr "%s 要求你傳送檔案給他（她）。"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC 協定模組"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo JAPAN 協定模組"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請，但目前還沒有視像聊天的支援。"
+msgid "Your SMS was not delivered"
+msgstr "無法發送你的短訊"
 
 # NOTE 譯文更動 by Ambrose
 msgid "Your Yahoo! message did not get sent."
@@ -9774,6 +9735,26 @@ msgstr "使用者 %s 剛剛拒絕了你先前將他（她）新增至你的好�
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "收到無效的資料"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "帳號已被封鎖：登入失敗次數太多。登入 Yahoo 網站或許可以解除封鎖。"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "帳號已被封鎖：原因不明。登入 Yahoo 網站或許可以解除封鎖。"
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "未有輸入帳號或密碼"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9797,18 +9778,19 @@ msgstr ""
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
+# NOTE「封鎖」好像比「暫時關閉」通順？ - acli 20090730
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "你的帳戶目前被暫時關閉。請你登入 Yahoo! 網站。"
+msgstr "你的帳戶目前已被封鎖。請你登入 Yahoo! 網站。"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的羣組「%2$s」。"
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
 #, c-format
@@ -9816,27 +9798,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-msgid "Received unexpected HTTP response from server."
-msgstr "伺服器發出了奇怪的 HTTP 回應。"
-
-msgid "Connection problem"
-msgstr "連線錯誤"
+msgid "Received unexpected HTTP response from server"
+msgstr "伺服器發出了奇怪的 HTTP 回應"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"與 %s 之間的連線突然中斷:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "與 %s 之間的連線突然中斷：%s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"無法與 %s 建立連線:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "無法與 %s 建立連線：%s"
 
 msgid "Not at Home"
 msgstr "不在家"
@@ -9878,7 +9849,7 @@ msgstr "暫時報稱離線"
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
-# NOTE #Pidgin 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
+# NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
@@ -9893,10 +9864,10 @@ msgstr "上線狀態設定"
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-msgid "Activate which ID?"
-msgstr "啟用哪一個 ID？"
+msgid "Select the ID you want to activate"
+msgstr "請輸入希望啟動的 ID"
 
-# NOTE #Pidgin 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
+# NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join whom in chat?"
 msgstr "加入誰的聊天室？"
@@ -9910,82 +9881,26 @@ msgstr "加入好友目前所在的聊天室..."
 msgid "Open Inbox"
 msgstr "開啟收件匣"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網絡的一個聊天室"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list：列出Yahoo網絡上的聊天室清單"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: 要求使用者開始 Doodle Session"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo 帳號"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo 協定模組"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "傳呼伺服器"
-
-msgid "Japan Pager server"
-msgstr "傳呼伺服器（日本地區）"
-
-msgid "Pager port"
-msgstr "傳呼系統通訊埠"
-
-msgid "File transfer server"
-msgstr "檔案傳輸伺服器"
-
-msgid "Japan file transfer server"
-msgstr "檔案傳輸伺服器（日本地區）"
-
-msgid "File transfer port"
-msgstr "檔案傳輸通訊埠"
-
-#  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
-msgid "Chat room locale"
-msgstr "聊天室區域 (Locale)"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "忽略會議室與聊天室邀請"
-
-msgid "Chat room list URL"
-msgstr "聊天室清單所在網址"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天伺服器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天室通訊埠"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "送出 Doodle 要求。"
 
-# TODO - 覆查譯文 - 20061028
+msgid "Unable to connect."
+msgstr "無法連線。"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=descriptor&qrytype=en&x=0&y=0
 msgid "Unable to establish file descriptor."
-msgstr "無法建立檔案介紹。"
+msgstr "無法建立檔描述符。"
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 提出一次過傳送 %d 個檔案。\n"
 
+msgid "Write Error"
+msgstr "寫入錯誤"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan 個人資料"
 
@@ -10049,11 +9964,8 @@ msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 婉拒了你詢問他（她）到會議室「%s」的邀請，理由是「%s」。"
-
-msgid "Invitation Rejected"
-msgstr "邀請被婉拒了"
+msgid "%s has declined to join."
+msgstr "%s 婉拒了加入聊天室。"
 
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
@@ -10096,6 +10008,9 @@ msgstr "可語音聊天"
 msgid "Webcams"
 msgstr "可視像聊天"
 
+msgid "Connection problem"
+msgstr "連線錯誤"
+
 msgid "Unable to fetch room list."
 msgstr "無法取得聊天室清單。"
 
@@ -10105,17 +10020,9 @@ msgstr "無法取得聊天室清單。"
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-msgid "Connection problem with the YCHT server."
+msgid "Connection problem with the YCHT server"
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"與伺服器之間的連線突然中斷\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10236,7 +10143,7 @@ msgstr "TZC 指令"
 # NOTE: 這是Zephyr使用者會自然明白的術語，不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Export to .anyone"
@@ -10248,7 +10155,7 @@ msgstr "匯出至 .zephyr.subs 檔"
 # NOTE: 這是Zephyr使用者會自然明白的術語，不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Import from .anyone"
@@ -10267,32 +10174,22 @@ msgid "Exposure"
 msgstr "現身程度"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"無法建立 Socket：\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "無法解析 HTTP 代理伺服應的回應：%s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "無法解析 HTTP 代理伺服應的回應：%s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理伺服器連線錯誤 %d"
 
+# NOTE 參閱 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=tunnel&qrytype=en&x=35&y=11
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "拒絕存取：HTTP 代理伺服器禁止通訊埠 %d 的資料傳送。"
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "拒絕存取：HTTP 代理伺服器禁止使用通訊埠 %d 穿隧"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 途中發生了錯誤"
 
-msgid "Could not resolve host name"
-msgstr "無法解析主機"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "要求 %s 的注意中..."
@@ -10385,9 +10282,6 @@ msgstr "請勿打擾"
 msgid "Extended away"
 msgstr "長時間離開"
 
-msgid "Mobile"
-msgstr "使用流動通訊器材"
-
 msgid "Listening to music"
 msgstr "聽音樂中"
 
@@ -10429,18 +10323,6 @@ msgstr "+++ %s 不再閒置"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "讀取 %s 途中發生了錯誤"
-
-# NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"在解析你的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
-
 msgid "Calculating..."
 msgstr "計算中..."
 
@@ -10547,6 +10429,21 @@ msgstr "連線被拒。"
 msgid "Address already in use."
 msgstr "位址已在使用中"
 
+# NOTE 這個 %s 係指 filename
+#, c-format
+msgid "Error Reading %s"
+msgstr "讀取 %s 途中發生了錯誤"
+
+# NOTE 第一個 %s 是 description，第二個 %s 是 filename_full
+# NOTE 上文有註釋「If we could not parse the file then show the user an error message」
+# NOTE 所以所謂「reading」其實係指「解析」而不是「讀入」
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"在解析你的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
+
 msgid "Internet Messenger"
 msgstr "網絡即時通"
 
@@ -10592,10 +10489,8 @@ msgstr "新郵件通知(_M)"
 msgid "Use this buddy _icon for this account:"
 msgstr "使用下列好友圖示(_I)："
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s 選項"
+msgid "Ad_vanced"
+msgstr "進階設定(_V)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
@@ -10632,9 +10527,6 @@ msgstr "如果你看得夠仔細"
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-msgid "Proxy Options"
-msgstr "代理伺服器選項"
-
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
@@ -10662,8 +10554,8 @@ msgstr "基本設定(_B)"
 msgid "Create _this new account on the server"
 msgstr "在伺服器上建立這個新帳號(_T)"
 
-msgid "_Advanced"
-msgstr "進階設定(_A)"
+msgid "P_roxy"
+msgstr "代理伺服器(_R)"
 
 msgid "Enabled"
 msgstr "啟動"
@@ -10710,16 +10602,16 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
-msgid "Room _List"
-msgstr "聊天室清單(_L)"
+msgid "A_ccount"
+msgstr "帳號(_C)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於你所想加入好友清單的聊天室的適當資訊。\n"
 
-msgid "_Account:"
-msgstr "帳號(_A)："
+msgid "Room _List"
+msgstr "聊天室清單(_L)"
 
 msgid "_Block"
 msgstr "封鎖(_B)"
@@ -10736,6 +10628,15 @@ msgstr "取得資訊(_I)"
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
+msgid "_Audio Call"
+msgstr "語音通話(_A)"
+
+msgid "Audio/_Video Call"
+msgstr "語音／視像通話"
+
+msgid "_Video Call"
+msgstr "視像通話(_V)"
+
 msgid "_Send File..."
 msgstr "傳送檔案(_S)..."
 
@@ -10745,9 +10646,12 @@ msgstr "加入好友狀態捕捉(_P)..."
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "離線時隱藏"
 
+msgid "Show When Offline"
+msgstr "離線時顯示"
+
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
@@ -10876,6 +10780,9 @@ msgstr "/工具/好友狀態捕捉(_P)"
 msgid "/Tools/_Certificates"
 msgstr "/工具/證書(_C)"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/工具/自定表情(_Y)"
+
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
@@ -10885,9 +10792,6 @@ msgstr "/工具/偏好設定(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/私隱設定(_I)"
 
-msgid "/Tools/Smile_y"
-msgstr "/工具/表情(_Y)"
-
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
@@ -11007,8 +10911,9 @@ msgstr "使用者自定"
 msgid "By status"
 msgstr "根據狀態"
 
-msgid "By log size"
-msgstr "根據日誌大小"
+# XXX 暫譯 20090305 acli
+msgid "By recent log activity"
+msgstr "根據日誌更新時間"
 
 #, c-format
 msgid "%s disconnected"
@@ -11024,6 +10929,9 @@ msgstr "重新連線"
 msgid "Re-enable"
 msgstr "重新啟動"
 
+msgid "SSL FAQs"
+msgstr "SSL 常見問題"
+
 msgid "Welcome back!"
 msgstr "歡迎歸來！"
 
@@ -11108,6 +11016,9 @@ msgstr "請輸入別名，或者關於你所想加入好友清單的聊天室的
 msgid "A_lias:"
 msgstr "別名(_L)："
 
+msgid "_Group:"
+msgstr "羣組(_G)："
+
 msgid "Auto_join when account becomes online."
 msgstr "帳號上線後隨即自動加入(_J)。"
 
@@ -11146,6 +11057,107 @@ msgstr "/工具"
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "背景顏色"
+
+msgid "The background color for the buddy list"
+msgstr "好友清單的背景顏色"
+
+msgid "Layout"
+msgstr "佈局"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "好友清單內圖示、名稱和狀態的佈局"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "展開的羣組的背景顏色"
+
+msgid "The background color of an expanded group"
+msgstr "羣組展開時的羣組名稱的背景顏色"
+
+# NOTE 根據gtkblist-theme-loader的原始碼，這個「文字」選項應該係指PidginThemeFont（字體名稱、字體顏色兩項），下同
+msgid "Expanded Text"
+msgstr "展開的羣組的名稱"
+
+msgid "The text information for when a group is expanded"
+msgstr "羣組展開時羣組名稱的字體及文字顏色"
+
+msgid "Collapsed Background Color"
+msgstr "收起的羣組的背景顏色"
+
+msgid "The background color of a collapsed group"
+msgstr "羣組收起時羣組名稱的背景顏色"
+
+msgid "Collapsed Text"
+msgstr "收起的羣組的名稱"
+
+msgid "The text information for when a group is collapsed"
+msgstr "羣組收起時羣組名稱的字體及文字顏色"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "好友／聊天室的背景顏色"
+
+msgid "The background color of a contact or chat"
+msgstr "好友或聊天室名稱的背景顏色"
+
+msgid "Contact Text"
+msgstr "整組好友的名稱"
+
+# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
+# NOTE 根據deryni的解釋，當contact收起時，我們見到的是priority buddy
+# NOTE 但當contact展開時，我們見到的是一個contact的名稱和包含在contact內的所有buddy
+# NOTE 照推理，所謂「text information for when a contact is expanded」應該是指contact的名稱
+msgid "The text information for when a contact is expanded"
+msgstr "好友展開時整組好友的名稱的字體及文字顏色"
+
+msgid "On-line Text"
+msgstr "上線好友的名稱"
+
+msgid "The text information for when a buddy is online"
+msgstr "好友上線時好友名稱的字體及文字顏色"
+
+msgid "Away Text"
+msgstr "離開好友的名稱"
+
+msgid "The text information for when a buddy is away"
+msgstr "好友離開時好友名稱的字體及文字顏色"
+
+msgid "Off-line Text"
+msgstr "離線好友的名稱"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "好友離線時好友名稱的字體及文字顏色"
+
+msgid "Idle Text"
+msgstr "閒置好友的名稱"
+
+msgid "The text information for when a buddy is idle"
+msgstr "好友閒置時好友名稱的字體及文字顏色"
+
+msgid "Message Text"
+msgstr "有未讀訊息的好友名稱"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "好友有未讀訊息時好友名稱的字體及文字顏色"
+
+msgid "Message (Nick Said) Text"
+msgstr "提到你的網名的聊天室名稱"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr "聊天室中提到你的網名時聊天室名稱的字體及文字顏色"
+
+msgid "The text information for a buddy's status"
+msgstr "好友狀態的字體及文字顏色"
+
+# XXX 譯文有待改進 - acli 20070913
+msgid "Type the host name for this certificate."
+msgstr "請輸入這張證書所屬的主機名稱。"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL 伺服器"
@@ -11164,12 +11176,6 @@ msgstr "你並未登入任何一個可供你邀請哪個好友的通訊協定。
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "請輸入你想邀請的使用者名稱，以及邀請的訊息。"
-
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
@@ -11200,7 +11206,7 @@ msgstr "忽略"
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "上次提到"
 
 msgid "Unable to save icon file to disk."
@@ -11248,6 +11254,19 @@ msgstr "/交談/另存新檔(_S)..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
+# XXX 媒體?  - acli 20090730
+msgid "/Conversation/M_edia"
+msgstr "/交談/媒體(_E)"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/交談/媒體/語音通話(_A)"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/交談/媒體/視像通話(_V)"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/交談/媒體/語音／視像通話(_C)"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
@@ -11320,6 +11339,16 @@ msgstr "/交談"
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
+# XXX 媒體? - acli 20090730
+msgid "/Conversation/Media/Audio Call"
+msgstr "/交談/媒體/語音通話"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/交談/媒體/視像通話"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/交談/媒體/語音／視像通話"
+
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
@@ -11517,6 +11546,9 @@ msgstr "平面設計"
 msgid "Ka-Hing Cheung"
 msgstr "張家興"
 
+msgid "voice and video"
+msgstr "語音及視像功能"
+
 msgid "support"
 msgstr "支援"
 
@@ -11653,6 +11685,9 @@ msgstr "印地文"
 msgid "Hungarian"
 msgstr "匈牙利文"
 
+msgid "Armenian"
+msgstr "亞美尼亞文"
+
 msgid "Indonesian"
 msgstr "印尼文"
 
@@ -11675,6 +11710,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 旗下所有格魯吉亞文翻譯人員"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
+msgid "Khmer"
+msgstr "高棉文"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE 註：KDE 譯「坎納達」
 msgid "Kannada"
 msgstr "康納達文"
@@ -11772,6 +11811,10 @@ msgstr "僧迦羅文"
 msgid "Swedish"
 msgstr "瑞典文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=swahili&qrytype=en&x=29&y=7
+msgid "Swahili"
+msgstr "斯瓦希里文"
+
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」，台一般譯「塔米爾」（看來較常見）或「泰米爾」
 msgid "Tamil"
@@ -11853,7 +11896,7 @@ msgstr ""
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC 頻道</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
+"<FONT SIZE=\"4\">IRC 頻道：</FONT>irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
 #, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
@@ -11863,8 +11906,8 @@ msgstr ""
 msgid "Current Developers"
 msgstr "現任開發者"
 
-# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on Pidgin ;-)
-# NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 Pidgin 賣力」
+# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
+# NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份，所以翻成「狂熱的模組作者」會比較好 :P
 msgid "Crazy Patch Writers"
@@ -12097,14 +12140,6 @@ msgstr "清除已完成的傳輸(_C)"
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
-#. Pause button
-msgid "_Pause"
-msgstr "暫停(_P)"
-
-#. Resume button
-msgid "_Resume"
-msgstr "恢復(_R)"
-
 #  NOTE Nautilus譯「貼上文本」，Abiword譯「未格式化貼上」，聽來都有些怪
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
@@ -12124,7 +12159,7 @@ msgstr "顯示連結時所用的顏色。"
 msgid "Hyperlink visited color"
 msgstr "瀏覽過的連結顏色"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "當滑鼠經過瀏覽過（或已啟動）的連結時的連結顏色。"
 
 msgid "Hyperlink prelight color"
@@ -12161,13 +12196,19 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 "收到的訊息是對方以「輕聲的說」這種動作發出的訊息時，用來顯示對方帳號的顏色"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "收到的訊息是代表對方「輕聲的說」時，用來顯示對帳號的顏色。"
+
 msgid "Whisper Message Name Color"
 msgstr "輕聲訊息帳號顏色"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "收到的訊息是輕聲訊息時，用來顯示對帳號的顏色。"
+
 msgid "Typing notification color"
 msgstr "輸入通知顏色"
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr "用來顯示輸入通知的顏色"
 
 msgid "Typing notification font"
@@ -12180,16 +12221,7 @@ msgstr "用來顯示輸入通知的字型"
 msgid "Enable typing notification"
 msgstr "啟用輸入通知"
 
-msgid "_Copy Email Address"
-msgstr "複製電子郵件地址(_C)"
-
-msgid "_Open Link in Browser"
-msgstr "在瀏覽器中打開連結(_O)"
-
-msgid "_Copy Link Location"
-msgstr "複製連結位址(_C)"
-
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12199,7 +12231,7 @@ msgstr ""
 "\n"
 "暫且當成 PNG 檔處理。"
 
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12232,11 +12264,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "儲存圖像"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "儲存圖像(_S)..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "插入自選表情(_A)..."
 
@@ -12326,9 +12356,6 @@ msgstr "縮小字體"
 msgid "Font Face"
 msgstr "字型"
 
-msgid "Background Color"
-msgstr "背景顏色"
-
 #  XXX 譯「文字顏色」會否較好？ - acli 20070614
 msgid "Foreground Color"
 msgstr "前景顏色"
@@ -12448,6 +12475,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12462,6 +12490,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網絡實際狀態，強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12479,6 +12508,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12492,6 +12522,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網絡實際狀態，強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12526,11 +12557,25 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "Open All Messages"
-msgstr "開啟所有訊息"
+# XXX 媒體? - acli 20090730
+msgid "/_Media"
+msgstr "/媒體(_M)"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">你有郵件！</span>"
+# XXX 暫譯 - acli 20090730
+msgid "/Media/_Hangup"
+msgstr "/媒體/掛斷(_H)"
+
+# XXX 暫譯 - acli 20090730
+msgid "Calling..."
+msgstr "撥打中..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s 希望跟你進行語音／視像通話。"
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s 希望跟你進行視像通話。"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12559,6 +12604,28 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "你選用了「使用者自定瀏覽器」，卻未有設定指令。"
 
+msgid "No message"
+msgstr "沒有訊息"
+
+msgid "Open All Messages"
+msgstr "開啟所有訊息"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">你有郵件！</span>"
+
+# XXX 這似乎是「好友狀態捕捉」發生時的通知視窗的視窗標題
+# XXX 暫譯，譯文有待改進 - acli 20090730
+msgid "New Pounces"
+msgstr "新發生的好友狀態捕捉"
+
+# XXX 譯「確定」是否較正常？ - acli 20090730
+msgid "Dismiss"
+msgstr "關閉"
+
+# XXX 暫譯，譯文有待改進 - acli 20090730
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">你捕捉到了好友狀態！</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "以下的模組將會被卸載。"
 
@@ -12605,10 +12672,16 @@ msgstr "<b>模組明細</b>"
 msgid "Select a file"
 msgstr "選擇檔案"
 
+msgid "Modify Buddy Pounce"
+msgstr "編輯好友狀態捕捉"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
+msgid "_Account:"
+msgstr "帳號(_A)："
+
 msgid "_Buddy name:"
 msgstr "好友名稱(_B)："
 
@@ -12675,9 +12748,59 @@ msgstr "重覆發生(_R)"
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
-# XXX 要覆查 - 20061025
-msgid "Smiley theme failed to unpack."
-msgstr "無法打開表情主題。"
+#, c-format
+msgid "Started typing"
+msgstr "開始輸入"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "暫停輸入"
+
+#, c-format
+msgid "Signed on"
+msgstr "登入"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "由閒置返回"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "由離開返回"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "停止輸入"
+
+#, c-format
+msgid "Signed off"
+msgstr "登出"
+
+#, c-format
+msgid "Became idle"
+msgstr "閒置"
+
+#, c-format
+msgid "Went away"
+msgstr "離開"
+
+#, c-format
+msgid "Sent a message"
+msgstr "送出訊息"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "未知的捕捉事件……請匯報這個問題！"
+
+# XXX 要覆查 - 20090730
+msgid "Theme failed to unpack."
+msgstr "無法解開表情主題檔。"
+
+msgid "Theme failed to load."
+msgstr "無法載入表情主題。"
+
+msgid "Theme failed to copy."
+msgstr "無法複製表情主題。"
 
 #  NOTE 直譯「安裝主題」好像很無棱兩可，加個「檔」字好像較好
 msgid "Install Theme"
@@ -12699,6 +12822,11 @@ msgstr "鍵盤捷徑"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "好友清單主題"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
@@ -12708,8 +12836,8 @@ msgstr "顯示系統工作匣圖示(_S)："
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-msgid "Conversation Window Hiding"
-msgstr "隱藏即時訊息交談視窗"
+msgid "Conversation Window"
+msgstr "交談視窗"
 
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H)："
@@ -12717,6 +12845,9 @@ msgstr "隱藏新的即時訊息交談(_H)："
 msgid "When away"
 msgstr "離開期間"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "最小化所有新交談視窗(_Z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "分頁"
@@ -12777,9 +12908,6 @@ msgstr "使用平滑捲軸"
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "最小化所有新交談視窗(_Z)"
-
 msgid "Minimum input area height in lines:"
 msgstr "文字輸入區的最少行數："
 
@@ -12812,14 +12940,12 @@ msgstr "無法啟動代理伺服器設定程式。"
 msgid "Cannot start browser configuration program."
 msgstr "無法啟動瀏覽器設定程式。"
 
-msgid "ST_UN server:"
-msgstr "STUN 伺服器(_U)："
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例：stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "自動偵測 IP 位址(_A)"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "使用自動偵測得來的 IP 位址(_A)：%s"
 
 msgid "Public _IP:"
 msgstr "公共IP (_I)："
@@ -12839,6 +12965,11 @@ msgstr "啟始通訊埠(_S)："
 msgid "_End port:"
 msgstr "結束通訊埠(_E)："
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=relay&qrytype=en&x=29&y=11
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "中繼伺服器 (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "代理伺服器及瀏覽器"
 
@@ -13019,7 +13150,7 @@ msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
 msgid "_Auto-reply:"
-msgstr "何時送出自動回應："
+msgstr "何時送出自動回應(_A)："
 
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
@@ -13028,13 +13159,13 @@ msgstr "當離開並同時閒置時"
 msgid "Auto-away"
 msgstr "自動離開"
 
-msgid "Change status when _idle"
-msgstr "閒置時更改狀態(_I)"
-
 # NOTE 譯文更動 by Ambrose
 msgid "_Minutes before becoming idle:"
 msgstr "閒置多少分鐘更改狀態(_M)："
 
+msgid "Change status when _idle"
+msgstr "閒置時更改狀態(_I)"
+
 msgid "Change _status to:"
 msgstr "更改狀態為(_S)："
 
@@ -13184,46 +13315,44 @@ msgstr "儲存並使用(_V)"
 msgid "Status for %s"
 msgstr "狀態：%s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr "「%s」已自選表情，請指定另一個捷徑。"
+
 msgid "Custom Smiley"
 msgstr "自選表情"
 
-msgid "More Data needed"
-msgstr "需要進一步的資料"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "請給這個表情給定一個相關的捷徑。"
-
 msgid "Duplicate Shortcut"
 msgstr "重覆的表情定義"
 
-# XXX 20080810 acli - 暫譯
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr "指定的捷徑已有相關的自選表情，請指定另一個捷徑。"
-
-msgid "Please select an image for the smiley."
-msgstr "請給這個表情選擇一個圖像。"
-
 msgid "Edit Smiley"
 msgstr "修改表情"
 
 msgid "Add Smiley"
 msgstr "新增表情"
 
-msgid "Smiley _Image"
-msgstr "表情圖像(_I)"
+msgid "_Image:"
+msgstr "圖像(_I)："
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "表情捷徑(_H)"
+# XXX 暫譯 - 20090305 acli
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "捷徑文字(_H)："
 
 msgid "Smiley"
 msgstr "表情"
 
+# XXX 暫譯 - 20090305 acli
+msgid "Shortcut Text"
+msgstr "捷徑文字"
+
 msgid "Custom Smiley Manager"
 msgstr "自選表情管理"
 
+msgid "Select Buddy Icon"
+msgstr "選擇好友圖示"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "點選以更改這個帳號的圖示。"
 
@@ -13308,8 +13437,8 @@ msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr "你拖曳了一個啟動器；你大概想傳送啟動器要啟動的檔案，而不是啟動器本身。"
 
 #, c-format
@@ -13341,9 +13470,30 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "無法載入圖像「%s」，原因不明，大概是圖像檔已損壞"
 
+msgid "_Open Link"
+msgstr "打開連結(_O)"
+
+msgid "_Copy Link Location"
+msgstr "複製連結位址(_C)"
+
+msgid "_Copy Email Address"
+msgstr "複製電子郵件地址(_C)"
+
+msgid "_Open File"
+msgstr "開啟檔案(_O)"
+
+msgid "Open _Containing Directory"
+msgstr "開啟上層目錄(_C)"
+
 msgid "Save File"
 msgstr "儲存檔案"
 
+msgid "_Play Sound"
+msgstr "播放音效(_P)"
+
+msgid "_Save File"
+msgstr "儲存檔案(_S)"
+
 msgid "Select color"
 msgstr "選擇顏色"
 
@@ -13368,6 +13518,9 @@ msgstr "新增(_A)"
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+msgid "_Pause"
+msgstr "暫停(_P)"
+
 # TODO 要覆查 - 20080826
 msgid "_Edit"
 msgstr "修改(_E)"
@@ -13439,6 +13592,74 @@ msgstr "好友在線狀態預測模組"
 msgid "Displays statistical information about your buddies' availability"
 msgstr "顯示一些有關好友的在線狀態的統計"
 
+#  NOTE 這是「Select an XMPP server to query」所在視窗的標題
+msgid "Server name request"
+msgstr "要求伺服器名稱"
+
+#  XXX 這是半肓猜，看了原始碼也看不明，開發者又不答我的問題 - acli 20090803
+msgid "Enter an XMPP Server"
+msgstr "請輸入 XMPP 伺服器名稱"
+
+msgid "Select an XMPP server to query"
+msgstr "選擇查詢的 XMPP 伺服器"
+
+#  NOTE 這是按鈕
+#  FIXME 譯文有待改進 - acli 20090730
+msgid "Find Services"
+msgstr "搜尋服務"
+
+msgid "Add to Buddy List"
+msgstr "新增至好友清單"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
+msgid "Gateway"
+msgstr "閘道器"
+
+msgid "Directory"
+msgstr "目錄"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
+msgid "PubSub Collection"
+msgstr "PubSub 集子節點"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
+msgid "PubSub Leaf"
+msgstr "PubSub 葉子節點"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>描述：</b>"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "服務探索"
+
+msgid "_Browse"
+msgstr "瀏覽(_B)"
+
+msgid "Server does not exist"
+msgstr "伺服器不存在"
+
+msgid "Server does not support service discovery"
+msgstr "伺服器不支援服務探索"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP 服務探索"
+
+#  FIXME 譯文有待改進 - acli 20090730
+msgid "Allows browsing and registering services."
+msgstr "讓你瀏覽和註冊服務。"
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "幫助在傳統的傳送協定或其他 XMPP 服務中註冊。"
+
 msgid "Buddy is idle"
 msgstr "好友閒置"
 
@@ -13848,7 +14069,7 @@ msgstr "集體作曲用的音樂訊息模組"
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "音樂訊息模組為音樂編寫提供即時傳訊功能，讓多個使用者能同時編輯同一份樂譜。"
 
@@ -13964,13 +14185,6 @@ msgstr ""
 "- 它會將所有收到的訊息左右掉轉\n"
 "- 它會在你的好友登入時，立刻送出一個訊息給他們"
 
-msgid "Cursor Color"
-msgstr "游標顏色"
-
-#  XXX 只有一個軟件這樣譯，在無更好的譯文可供參考下暫且借用
-msgid "Secondary Cursor Color"
-msgstr "第二游標顏色"
-
 msgid "Hyperlink Color"
 msgstr "超連結顏色"
 
@@ -13982,6 +14196,9 @@ msgstr "瀏覽過的超連結顏色"
 msgid "Highlighted Message Name Color"
 msgstr "已標示訊息名稱顏"
 
+msgid "Typing Notification Color"
+msgstr "輸入通知顏色"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平間隔距離"
 
@@ -14012,35 +14229,22 @@ msgstr "GTK+介面字型"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "介面顏色"
+# XXX 這是我譯的，但我認為這是很差的譯文，看了也不知是什麼 - acli 20080511
+msgid "Disable Typing Notification Text"
+msgstr "停用輸入通知"
 
-msgid "Widget Sizes"
-msgstr "Widget 大小"
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ 佈景主題控制設定"
+
+msgid "Colors"
+msgstr "顏色"
 
 msgid "Fonts"
 msgstr "字型"
 
+msgid "Miscellaneous"
+msgstr "雜項"
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc檔專用工具"
 
@@ -14080,10 +14284,10 @@ msgstr "%s 現已可升級至 %s 版。"
 msgid "New Version Available"
 msgstr "有新版本"
 
+# NOTE 這個「Later」是指「稍後下載」（即說：我知道有新版本了，稍後我會下載，暫時別煩我）
 msgid "Later"
-msgstr "稍後"
+msgstr "稍後下載"
 
-# NOTE: ui_name, ui_website - 這是「請從ui_website下載ui_name」的廣告訊息（quit message），ui_name通常就是「pidgin」
 msgid "Download Now"
 msgstr "立即下載"
 
@@ -14129,7 +14333,7 @@ msgstr "交談視窗的「傳送」按紐"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr "在交談視窗的輸入欄位加添一個「傳送」按紐，適用於沒有連接鍵盤時使用。"
 
 # FIXME 譯文有譯改進 - 20061027
@@ -14185,6 +14389,102 @@ msgstr "文字取代"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根據使用者所定義的規則來取代送出訊息中的文字。"
 
+msgid "Just logged in"
+msgstr "剛巧登入"
+
+msgid "Just logged out"
+msgstr "剛巧登出"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"代表好友的圖示/\n"
+"代表不明者的圖示"
+
+msgid "Icon for Chat"
+msgstr "代表聊天室的圖示"
+
+msgid "Ignored"
+msgstr "已忽略"
+
+#  NOTE「Founder」這處係指聊天室的建立者
+msgid "Founder"
+msgstr "建立者"
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "管理員"
+
+#  NOTE 指聊天室內擁有部分管理員權限的人員，Konversation譯「助理」，Chatzilla譯「次管理員」
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr "助理"
+
+msgid "Authorization dialog"
+msgstr "認證視窗"
+
+msgid "Error dialog"
+msgstr "錯誤訊息視窗"
+
+msgid "Information dialog"
+msgstr "資訊訊息視窗"
+
+msgid "Mail dialog"
+msgstr "郵件視窗"
+
+#  XXX 這譯文絶對有問題，但想不到怎樣譯較好 - ambrose 20090730
+msgid "Question dialog"
+msgstr "提問視窗"
+
+msgid "Warning dialog"
+msgstr "警告訊息視窗"
+
+msgid "What kind of dialog is this?"
+msgstr "這是什麼類型的視窗？"
+
+msgid "Status Icons"
+msgstr "狀態圖示"
+
+# XXX 暫譯 - acli 20090730
+msgid "Chatroom Emblems"
+msgstr "聊天室圖示"
+
+msgid "Dialog Icons"
+msgstr "視窗圖示"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin 圖示主題編輯器"
+
+msgid "Contact"
+msgstr "好友"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin 好友清單主題編輯器"
+
+msgid "Edit Buddylist Theme"
+msgstr "編輯好友清單主題"
+
+msgid "Edit Icon Theme"
+msgstr "編輯圖示主題"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin 主題編輯器"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin 主題編輯器。"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14341,9 +14641,10 @@ msgstr "可停駐的好友清單(_D)"
 msgid "_Keep Buddy List window on top:"
 msgstr "好友清單視窗保持在桌面最上層(_K)；"
 
+# NOTE 譯文改動 by Ambrose 20090806, see Always/Never
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "只在停駐時生效"
+msgstr "只在停駐時啟動"
 
 msgid "Windows Pidgin Options"
 msgstr "Windows 版 Pidgin 選項"
@@ -14352,7 +14653,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 的相關選項。"
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項，例如好友清單的停駐功能。"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14394,6 +14695,482 @@ msgstr "送出、讀取未加工的 XMPP 段落。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "_Resume"
+#~ msgstr "恢復(_R)"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "無法讀取 SILC 密鑰對"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s 婉拒了你詢問他（她）到會議室「%s」的邀請，理由是「%s」。"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "邀請被婉拒了"
+
+#~ msgid "Invite message"
+#~ msgstr "邀請訊息"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "請輸入您想邀請的使用者名稱，以及選擇性填寫邀請的訊息。"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "無法開啟Socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "無法監聽 Socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "無法讀取 Socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "連線失敗。"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "伺服器已停止連線"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "無法建立 Socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "無法連到伺服器"
+
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+#~ msgid "Read error"
+#~ msgstr "讀取錯誤"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Last Activity"
+#~ msgstr "最近活動"
+
+#  FIXME acli 2070914
+#~ msgid "Service Discovery Items"
+#~ msgstr "服務探尋項目"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "延伸段落定址"
+
+# NOTE 這是功能名稱
+#~ msgid "Multi-User Chat"
+#~ msgstr "多用戶聊天"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "多用戶聊天延伸上線狀態資訊"
+
+# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "帶內位元組串流"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "臨時指令"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 位元組串流"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "帶外數據"
+
+#  NOTE Untranslated
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "帶內註冊"
+
+#~ msgid "User Location"
+#~ msgstr "使用者所在位置"
+
+#~ msgid "User Avatar"
+#~ msgstr "使用者化身"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "聊天狀態通知"
+
+# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+#~ msgid "Software Version"
+#~ msgstr "軟體版本"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "開始串流"
+
+#~ msgid "User Mood"
+#~ msgstr "使用者情緒"
+
+# XXX may be wrong
+#~ msgid "User Activity"
+#~ msgstr "使用者活動狀態"
+
+#  NOTE 直譯：個體能力
+#  FIXME 譯文有待改進 - acli 20070918
+#~ msgid "Entity Capabilities"
+#~ msgstr "個體能力"
+
+#  FIXME 這聽來不對 - acli 20070913
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "加密工作階段協商"
+
+#~ msgid "User Tune"
+#~ msgstr "使用者樂曲"
+
+#  NOTE「Roster」指「名冊」，但Open Source software似乎一般譯「好友清單」、「成員列表」等
+#  FIXME 譯文有待改進 - acli 20070918
+#~ msgid "Roster Item Exchange"
+#~ msgstr "好友清單項目交換"
+
+#  NOTE 參見 http://jabber.org/protocol/reach
+#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」（例如電話號碼）
+#  NOTE 直譯：可抵達性位址
+#  XXX 是否譯「其他通訊方法」較好？但要先看上下文 - acli 20070918
+#~ msgid "Reachability Address"
+#~ msgstr "可抵達性位址"
+
+#~ msgid "User Profile"
+#~ msgstr "使用者資料"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle 音訊"
+
+#~ msgid "User Nickname"
+#~ msgstr "使用者暱稱"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle 視訊"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "收到的訊息"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "發佈公鑰"
+
+# NOTE Jabber 新功能規格
+#~ msgid "User Browsing"
+#~ msgstr "使用者瀏覽"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "段落加密"
+
+#  XXX 暫譯- acli 20070913
+#~ msgid "Delayed Delivery"
+#~ msgstr "延遲送出"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Jingle 用的 STUN 服務偵測"
+
+# FIXME 這聽來不對
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "簡化加密工作階段協商"
+
+#~ msgid "Hop Check"
+#~ msgstr "中繼段檢查"
+
+#~ msgid "Write error"
+#~ msgstr "寫入錯誤"
+
+#~ msgid "Read Error"
+#~ msgstr "讀取錯誤"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "無法連線到伺服器。"
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "讀取用的暫存區滿了（代號2）"
+
+#~ msgid "Unparseable message"
+#~ msgstr "無法解析訊息"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "無法連到伺服器：%s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "登入失敗 (%s)。"
+
+# XXX 暫譯
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "您已經被登出，因為您已在其他電腦上登入。"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "錯誤：沒有安裝 SSL 支援。"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法連線到 BOS 伺服器：\n"
+#~ "%s"
+
+#~ msgid "Invalid username."
+#~ msgstr "使用者名稱無效。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "密碼錯誤。"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "無法連線"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "無法解密伺服器回應"
+
+#~ msgid "Connection lost"
+#~ msgstr "連線中斷"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "無法解析主機"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "連線關閉（寫入）"
+
+#~ msgid "Connection reset"
+#~ msgstr "連線重置"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "讀取 Socket 時發生錯誤；%s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "無法連線到主機"
+
+#~ msgid "Could not write"
+#~ msgstr "無法寫入"
+
+#~ msgid "Could not connect"
+#~ msgstr "無法連結"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "無法建立 Socket 監聽"
+
+#~ msgid "Looking up %s"
+#~ msgstr "找尋 %s 中"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "連結到 %s 失敗"
+
+#~ msgid "Signon: %s"
+#~ msgstr "登入：%s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "無法寫入檔案 %s。"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "無法讀取檔案 %s。"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "訊息太長，最後的 %s 位元組被截去。"
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s 目前並未登入。"
+
+#  NOTE 譯文更動 by Ambrose
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "不允許對 %s 發出警告。"
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "訊息被丟棄，因為您達到了伺服器所限制的發送速度。"
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "在 %s 不可以聊天。"
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "您送訊息給 %s 的速度太快了。"
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "您遺失了一個由 %s 送來的訊息，因為它太大了。"
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "您遺失了一個由 %s 送來的訊息，因為它傳送的速度太快。"
+
+#~ msgid "Failure."
+#~ msgstr "失敗。"
+
+#~ msgid "Too many matches."
+#~ msgstr "匹配太多。"
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "需輸入更多檢索條件。"
+
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "暫時無法使用目錄服務。"
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "禁止 E-Mail 檢查。"
+
+#~ msgid "Keyword ignored."
+#~ msgstr "關鍵字已被忽略。"
+
+#~ msgid "No keywords."
+#~ msgstr "沒有關鍵字。"
+
+#~ msgid "User has no directory information."
+#~ msgstr "這個使用者沒有他的相關資訊。"
+
+#~ msgid "Country not supported."
+#~ msgstr "這個國家不被支援。"
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "未知的失敗原因：%s。"
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "錯誤的帳號或密碼。"
+
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "暫時無法使用該項服務。"
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "您目前登入系統的警告等級太高，以致無法登入。"
+
+#~ 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 ""
+#~ "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+#~ "線，那麼您的等待時間將會更加的延長。"
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "發生了一個未知的登入錯誤：%s。"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "一個未知的錯誤 %d 發生。資訊：%s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "無效的群組名稱"
+
+#~ msgid "Connection Closed"
+#~ msgstr "連線關閉"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "等待回覆中..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
+
+#~ msgid "Password Change Successful"
+#~ msgstr "密碼修改成功"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "取得使用者個人資訊"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "設定使用者個人資訊"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "無法開啟 %s 以供寫入！"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "檔案傳輸失敗；可能是對方取消傳輸。"
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "無法開啟連線以供傳輸。"
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
+
+#~ msgid "Save As..."
+#~ msgstr "另存新檔..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
+#~ msgstr[1] "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s 要求您傳送檔案給他（她）。"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC 協定模組"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "啟用哪一個 ID？"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "傳呼伺服器（日本地區）"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "檔案傳輸伺服器（日本地區）"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "與伺服器之間的連線突然中斷\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "無法解析主機"
+
+#~ msgid "%s Options"
+#~ msgstr "%s 選項"
+
+#~ msgid "Proxy Options"
+#~ msgstr "代理伺服器選項"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "隱藏即時訊息交談視窗"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN 伺服器(_U)："
+
+#~ msgid "More Data needed"
+#~ msgstr "需要進一步的資料"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "請給這個表情給定一個相關的捷徑。"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "請給這個表情選擇一個圖像。"
+
+#~ msgid "Cursor Color"
+#~ msgstr "游標顏色"
+
+#  XXX 只有一個軟件這樣譯，在無更好的譯文可供參考下暫且借用
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "第二游標顏色"
+
+#~ msgid "Interface colors"
+#~ msgstr "介面顏色"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget 大小"
+
+#~ msgid "By log size"
+#~ msgstr "依照日誌大小"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "在瀏覽器中打開連結(_O)"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "表情圖像(_I)"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "表情捷徑(_H)"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "無法讀取 MSN 通訊錄"
 
@@ -14413,14 +15190,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgstr[0] "與伺服器失去連線（%d 秒內收不到任何資料）"
 #~ msgstr[1] "與伺服器失去連線（%d 秒內收不到任何資料）"
 
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "新增好友"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "登入回應解密失敗"
-
 #~ msgid "Keep alive error"
 #~ msgstr "Keep Alive錯誤"
 
@@ -14431,14 +15200,9 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ "與伺服器之間的連線突然中斷：\n"
 #~ "%d, %s"
 
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "連結伺服器"
-
 #~ msgid "Failed to send IM."
 #~ msgstr "送出即時訊息失敗。"
 
-#, fuzzy
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "您並非群組「%s」的成員\n"
 
@@ -14600,10 +15364,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "QQ Server Notice"
 #~ msgstr "QQ 伺服器通告"
 
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "遠端結束連線"
-
 #~ msgid "developer"
 #~ msgstr "開發者"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 98fac8547b..23d179f8a7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,9 +1,12 @@
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2008, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2008, Ambrose C. Li <acli@ada.dhs.org>
+# Copyright (C) 2002-2009, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li@gmail.com>
+#
+# PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
+# LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.562 2009/02/27 04:50:13 acli Exp $
+# $InternalId: zh_TW.po,v 1.594 2009/08/06 05:26:27 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -17,7 +20,7 @@
 #        screen name 和 user name 在意義上是沒有分別的！
 # 理據如下
 # (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
-# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the Pidgin-devel mailing list.  (I'm unhappy with the change.)
+# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
 # SILC問題：似乎臺灣和香港的「密碼學」術語相差甚遠，很頭痛 (^^;)
 # - Key 暫譯「密鑰」，原因：「Key Exchange」既有譯文為「交換密鑰」
@@ -47,10 +50,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.5.5\n"
+"Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-27 10:14-0800\n"
-"PO-Revision-Date: 2009-02-25 09:57-0500\n"
+"POT-Creation-Date: 2009-08-05 23:59-0700\n"
+"PO-Revision-Date: 2009-07-30 01:53-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -635,11 +638,12 @@ msgstr "這個指令在這個通訊協定內無效。"
 msgid "Message was not sent, because you are not signed on."
 msgstr "因為您並未登入，所以訊息無法送出："
 
-# XXX 這是什麼？
+# NOTE 交談標題、使用者名稱、協定名稱
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
+# NOTE 交談標題、意義不明的單字元標
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
@@ -665,17 +669,6 @@ msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記
 msgid "Send To"
 msgstr "傳送到"
 
-msgid "Invite message"
-msgstr "邀請訊息"
-
-msgid "Invite"
-msgstr "邀請"
-
-msgid ""
-"Please enter the name of the user you wish to invite,\n"
-"along with an optional invite message."
-msgstr "請輸入您想邀請的使用者名稱，以及選擇性填寫邀請的訊息。"
-
 msgid "Conversation"
 msgstr "交談"
 
@@ -929,6 +922,43 @@ msgstr "所有交談"
 msgid "System Log"
 msgstr "系統日誌"
 
+msgid "Calling ... "
+msgstr "撥打中..."
+
+# NOTE 這是按鈕上的標籤
+msgid "Hangup"
+msgstr "掛斷"
+
+#. Number of actions
+msgid "Accept"
+msgstr "接受"
+
+msgid "Reject"
+msgstr "拒絕"
+
+#  XXX 暫譯 - acli 20090730
+msgid "Call in progress."
+msgstr "撥打中。"
+
+msgid "The call has been terminated."
+msgstr "通話已中斷。"
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr "%s 希望與您進行語音通話。"
+
+# XXX 媒體? - acli 20090730
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr "%s 嘗試與您以一種未獲支援的方式進行媒體通話。"
+
+msgid "You have rejected the call."
+msgstr "您拒絕了通話。"
+
+# FIXME 暫譯，譯文有待改進 - acli 20090730
+msgid "call: Make an audio call."
+msgstr "call：語音通話。"
+
 msgid "Emails"
 msgstr "電子郵件"
 
@@ -964,6 +994,9 @@ msgstr "繼續"
 msgid "IM"
 msgstr "即時訊息"
 
+msgid "Invite"
+msgstr "邀請"
+
 # TODO 要覆查 - 20061028
 msgid "(none)"
 msgstr "(沒有名字)"
@@ -1169,7 +1202,6 @@ msgstr "%s 已經離開。 (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
-#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題！"
 
@@ -1179,8 +1211,9 @@ msgstr "以鍵盤的使用為基準"
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Never"
-msgstr "從不"
+msgstr "關閉此功能"
 
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
@@ -1204,7 +1237,7 @@ msgid "Log status change events"
 msgstr "記錄所有的狀態改變"
 
 msgid "Report Idle time"
-msgstr "閒置時間基準(_R)"
+msgstr "閒置時間基準"
 
 msgid "Change status when idle"
 msgstr "閒置時更改狀態"
@@ -1275,7 +1308,7 @@ msgid "You talk in chat"
 msgstr "您在聊天室說話"
 
 msgid "Others talk in chat"
-msgstr "其他人進入聊天室"
+msgstr "其他人在聊天室說話"
 
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到您的帳號"
@@ -1333,8 +1366,9 @@ msgstr "當交談取得輸入焦點發出音效"
 
 # XXX: 務必 聽起來不太恰當。這裡是指 Enable Sound 的選項 - c9s, 08 Dec 27 12/27/2008
 # XXX 「務必」不只指 Enable Sound，也在其他地方用到，改譯「完全啟用」不行 - 20090226 acli
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Always"
-msgstr "務必"
+msgstr "啟動此功能"
 
 # NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
 msgid "Only when available"
@@ -1482,7 +1516,7 @@ msgstr "%s 在 %s 提到您的暱稱"
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%s 在 %s 送出一個訊息給您。"
+msgstr "%s 在 %s 送出一個訊息給您"
 
 msgid "Buddy signs on/off"
 msgstr "好友登入／登出"
@@ -1587,6 +1621,33 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr "Lastlog 模組。"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"取得 TinyURL 中..."
+
+# XXX 暫譯 - 20090729 acli
+msgid "Only create TinyURL for urls of this length or greater"
+msgstr "只在網址長度為這個數值或以上時才建立 TinyURL"
+
+# XXX 暫譯 - 20090729 acli
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL（或同類型）網址前綴"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL 模組"
+
+# NOTE 這個 copying 應係指人手抄寫，因為如果是在電腦上複製，無論網址長短，複製也應該不會有難易之分
+# XXX 暫譯 - 20090729 acli
+msgid "When receiving a message with URL(s), TinyURL for easier copying"
+msgstr "當接收到含有網址的訊息時，使用 TinyURL 縮短網址，好方便抄寫"
+
 msgid "accounts"
 msgstr "帳號清單"
 
@@ -1642,9 +1703,9 @@ msgstr "設定使用者資訊"
 
 # XXX 問題：
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白）
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
 # XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
 # XXX - Ambrose 20061123
 msgid "Unknown"
@@ -1698,39 +1759,40 @@ msgstr "接受 %s 的憑證嗎？"
 msgid "SSL Certificate Verification"
 msgstr "核實 SSL 憑證"
 
-#. Number of actions
-msgid "Accept"
-msgstr "接受"
-
-msgid "Reject"
-msgstr "拒絕"
-
 msgid "_View Certificate..."
 msgstr "檢視憑證(_V)"
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
+# FIXME 譯文不太通順 - acli 20070913
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr "「%s」出示的憑證是自簽的，無法自動進行核實。"
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "「%s」出示的憑證鍊是無效的。"
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"「%s」出示的憑證聲稱它應該屬於「%s」，您目前可能的連線可能不是您心目中希望使"
+"用的服務。"
 
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL 憑證錯誤"
 
 msgid "Invalid certificate chain"
 msgstr "無效的憑證鏈"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1738,6 +1800,19 @@ msgid ""
 msgstr ""
 "無法核實這張憑證，因為您沒有根憑證機構憑證 (root certificate) 的資料庫。"
 
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr "「%s」出示的憑證是自簽的，無法自動進行核實。"
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "「%s」出示的憑證鍊是無效的。"
+
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1755,19 +1830,6 @@ msgstr ""
 msgid "Invalid certificate authority signature"
 msgstr "憑證機構的簽章是無效的"
 
-# FIXME 譯文不太通順 - acli 20070913
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"「%s」出示的憑證聲稱它應該屬於「%s」，您目前可能的連線可能不是您心目中希望使"
-"用的服務。"
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1803,6 +1865,8 @@ msgstr "+++ %s 登入"
 msgid "+++ %s signed off"
 msgstr "+++ %s 登出"
 
+#. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -1849,6 +1913,15 @@ msgstr "%s 離開聊天室。"
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
+msgid "Invite to chat"
+msgstr "邀請進入聊天室"
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
+
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "無法建立連結：%s"
@@ -1984,6 +2057,10 @@ msgid "Starting transfer of %s from %s"
 msgstr "開始自 %2$s 傳送 %1$s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "檔案 <A HREF=\"file://%s\">%s</A> 傳送完畢"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
@@ -2180,6 +2257,10 @@ msgstr "<font color=\"red\"><b>無法讀取檔案：%s</b></font>"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>：%s\n"
 
+# FIXME 譯文有待改進 - acli 20090731
+msgid "Error creating conference."
+msgstr "建立會議失敗。"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "您目前使用的是 %s，但這模組需要 %s。"
@@ -2605,13 +2686,13 @@ msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
 "當瀏覽日誌時，這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 "
-"Adium、Fire、Messenger Plus!、MSN Messenger，以及 Trillian。\n"
+"Adium、Fire、Messenger Plus!、MSN Messenger、aMSN、以及 Trillian。\n"
 "\n"
 "注意：這個模組仍處於開發初期，因此可能經常當掉。如果使用，後果自負！"
 
@@ -2657,7 +2738,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "好友離線時，利用「好友狀態捕捉」功能儲存送出的訊息。"
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "未能送出的訊息將會儲存成「好友狀態捕捉」。如有需要，訊息可在「好友狀態捕捉」"
@@ -2689,6 +2770,31 @@ msgstr "使用「好友狀態捕捉」儲存離線訊息"
 msgid "Do not ask. Always save in pounce."
 msgstr "毋須提問，務必使用「好友狀態捕捉」儲存離線訊息。"
 
+msgid "One Time Password"
+msgstr "一次性密碼"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr "一次性密碼支援"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr "強制密碼只用一次"
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2880,16 +2986,15 @@ msgstr ""
 "找不到 ActiveTCL；如果打算使用 TCL 寫成的模組，請到 http://www.activestate."
 "com 下載及安裝 ActiveTCL。\n"
 
-# FIXME 沒有譯「toolkit」- 20071023 acli
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
-"找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://d.pidgin.im/"
-"BonjourWindows 查閱 FAQ 部分。"
+"找不到 Apple 的「Bonjour For Windows」工具，詳情請到網址 http://d.pidgin.im/"
+"BonjourWindows 查閱。"
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "無法接收連入的即時訊息連線\n"
+msgid "Unable to listen for incoming IM connections"
+msgstr "無法監聽來訊的即時訊息連線"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2943,17 +3048,20 @@ msgstr "%s 已經關閉這個交談。"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息，交談無法開始。"
 
-msgid "Cannot open socket"
-msgstr "無法開啟Socket"
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "無法建立 Socket：%s"
 
-msgid "Could not bind socket to port"
-msgstr "無法聯結 Socket 到通訊埠"
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "無法連結 Socket 到通訊埠：%s"
 
-msgid "Could not listen on socket"
-msgstr "無法監聽 Socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "無法監聽 Socket：%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "和本地端的mDNSResponder溝通時發生錯誤"
+msgstr "和本地端的 mDNSResponder 溝通時發生錯誤"
 
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
@@ -2962,7 +3070,7 @@ msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"對於您目前所設定的代理伺服器型態來說，您所給定的伺服器名稱及通訊埠是無效的"
+"對於您目前所設定的代理伺服器型態來說，您所給定的伺服器名稱或通訊埠是無效的。"
 
 msgid "Token Error"
 msgstr "符記錯誤"
@@ -2998,14 +3106,14 @@ msgstr "儲存好友清單..."
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
-msgid "Fill in the registration fields."
-msgstr "填寫註冊資料欄位。"
+msgid "You must fill in all registration fields"
+msgstr "必需填妥所有註冊資料欄位"
 
-msgid "Passwords do not match."
-msgstr "新密碼並不相符。"
+msgid "Passwords do not match"
+msgstr "兩個密碼並不相符"
 
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "無法註冊新帳號。錯誤發生。\n"
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr "無法註冊新帳號，錯誤原因不明。"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
@@ -3016,14 +3124,14 @@ msgstr "註冊成功！"
 msgid "Password"
 msgstr "密碼"
 
-msgid "Password (retype)"
-msgstr "密碼（再次輸入）"
+msgid "Password (again)"
+msgstr "舊密碼（再次確認）"
 
-msgid "Enter current token"
-msgstr "輸入目前的密碼"
+msgid "Enter captcha text"
+msgstr "請輸入驗證圖片內的文字"
 
-msgid "Current token"
-msgstr "目前密碼"
+msgid "Captcha"
+msgstr "驗證圖片"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
@@ -3076,6 +3184,15 @@ msgstr "密碼修改成功！"
 msgid "Current password"
 msgstr "舊密碼"
 
+msgid "Password (retype)"
+msgstr "密碼（再次輸入）"
+
+msgid "Enter current token"
+msgstr "輸入目前的密碼"
+
+msgid "Current token"
+msgstr "目前密碼"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸入您的舊密碼及你的新密碼："
 
@@ -3089,6 +3206,7 @@ msgstr "選取一個聊天室給好友；%s"
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
+#. Global
 msgid "Available"
 msgstr "上線"
 
@@ -3123,7 +3241,7 @@ msgstr "找不到符合的使用者"
 msgid "There are no users matching your search criteria."
 msgstr "無法依照搜尋條件找到相符的使用者。"
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "無法讀取 Socket"
 
 msgid "Buddy list downloaded"
@@ -3138,8 +3256,15 @@ msgstr "上傳好友清單"
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友清單已被存放於伺服器上。"
 
-msgid "Connection failed."
-msgstr "連線失敗。"
+# TODO 要覆查 - 20061027
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "已連結"
+
+msgid "Connection failed"
+msgstr "連線失敗"
 
 msgid "Add to chat"
 msgstr "新增到聊天室"
@@ -3147,14 +3272,23 @@ msgstr "新增到聊天室"
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N)："
 
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "無法解析主機名稱「%s」：%s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "連線中"
+
 msgid "Chat error"
 msgstr "聊天錯誤"
 
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-msgid "Not connected to the server."
-msgstr "尚未連線到伺服器。"
+msgid "Not connected to the server"
+msgstr "尚未連線到伺服器"
 
 msgid "Find buddies..."
 msgstr "尋找好友..."
@@ -3195,6 +3329,9 @@ msgstr "波蘭廣受歡迎的即時通訊程式"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
+msgid "GG server"
+msgstr "Gadu-Gadu 伺服器"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令：%s"
@@ -3209,7 +3346,7 @@ msgstr "沒有設定主題"
 msgid "File Transfer Failed"
 msgstr "檔案傳輸失敗"
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "無法開啟監聽埠。"
 
 msgid "Error displaying MOTD"
@@ -3225,8 +3362,16 @@ msgstr "這個連結沒有相關的是日訊息。"
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-msgid "Server has disconnected"
-msgstr "伺服器已停止連線"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr "與伺服器之間的連線突然中斷：%s"
 
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
@@ -3237,27 +3382,24 @@ msgstr "頻道(_C)："
 msgid "_Password:"
 msgstr "密碼(_P)："
 
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC 暱稱不可含有空白字元"
-
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "連線中"
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC 暱稱和伺服器名稱均不可含有空白字元"
 
 # XXX 暫譯
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
-msgid "Couldn't create socket"
-msgstr "無法建立 Socket"
+msgid "Unable to connect"
+msgstr "無法連線"
 
-msgid "Couldn't connect to host"
-msgstr "無法連到伺服器"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "無法連線：%s"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-msgid "Read error"
-msgstr "讀取錯誤"
+#, c-format
+msgid "Server closed the connection"
+msgstr "伺服器關閉了連線"
 
 msgid "Users"
 msgstr "使用者"
@@ -3446,6 +3588,16 @@ msgid ""
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的帳號名稱，名稱中大概含有無效字元。"
 
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr "暱稱「%s」已在使用中。"
+
+msgid "Nickname in use"
+msgstr "暱稱已在使用中"
+
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
@@ -3681,11 +3833,11 @@ msgstr "臨時指令失敗"
 msgid "execute"
 msgstr "執行"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "伺服器要求使用 TLS/SSL，但找不到 TLS/SSL 支援。"
 
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "您指定必須加密，但找不到 TLS/SSL 支援。"
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "您要求加密，但找不到 TLS/SSL 支援。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
@@ -3699,19 +3851,44 @@ msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-msgid "Invalid response from server."
-msgstr "伺服器送來了無效的回應。"
+msgid "SASL authentication failed"
+msgstr "SASL 認證失敗"
+
+msgid "Invalid response from server"
+msgstr "伺服器送來了無效的回應"
 
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "您要求加密，但這伺服器沒有加密功能。"
+
 # XXX 好像有些怪，譯文有待改進
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-msgid "SASL error"
-msgstr "SASL 錯誤"
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL 錯誤：%s"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "BOSH 連線管理員中斷了您的工作階段。"
+
+msgid "No session ID given"
+msgstr "沒有給定工作階段代碼"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "不支援的 BOSH 協定版本"
+
+msgid "Unable to establish a connection with the server"
+msgstr "無法與伺服器建立連線"
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "無法與伺服器建立連線：%s"
+
+msgid "Unable to establish SSL connection"
+msgstr "無法建立 SSL 連線"
 
 msgid "Full Name"
 msgstr "全名"
@@ -3728,6 +3905,11 @@ msgstr "URL"
 msgid "Street Address"
 msgstr "街道地址"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "地址(續)"
 
@@ -3778,185 +3960,10 @@ msgstr "用戶端"
 msgid "Operating System"
 msgstr "作業系統"
 
-# NOTE 這是功能名稱（直譯）
-msgid "Last Activity"
-msgstr "最近活動"
-
-msgid "Service Discovery Info"
-msgstr "服務探尋資訊"
-
-#  FIXME acli 2070914
-msgid "Service Discovery Items"
-msgstr "服務探尋項目"
-
-# NOTE 這是功能名稱（直譯）
-msgid "Extended Stanza Addressing"
-msgstr "延伸段落定址"
-
-# NOTE 這是功能名稱
-msgid "Multi-User Chat"
-msgstr "多用戶聊天"
-
-# NOTE 這是功能名稱（直譯）
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "多用戶聊天延伸上線狀態資訊"
-
-# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
-msgid "In-Band Bytestreams"
-msgstr "帶內位元組串流"
-
-msgid "Ad-Hoc Commands"
-msgstr "臨時指令"
-
-msgid "PubSub Service"
-msgstr "PubSub 服務"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 位元組串流"
-
-msgid "Out of Band Data"
-msgstr "帶外數據"
-
-#  NOTE Untranslated
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "帶內註冊"
-
-msgid "User Location"
-msgstr "使用者所在位置"
-
-msgid "User Avatar"
-msgstr "使用者化身"
-
-msgid "Chat State Notifications"
-msgstr "聊天狀態通知"
-
-# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-msgid "Software Version"
-msgstr "軟體版本"
-
-msgid "Stream Initiation"
-msgstr "開始串流"
-
-msgid "File Transfer"
-msgstr "檔案傳輸"
-
-msgid "User Mood"
-msgstr "使用者情緒"
-
-# XXX may be wrong
-msgid "User Activity"
-msgstr "使用者活動狀態"
-
-#  NOTE 直譯：個體能力
-#  FIXME 譯文有待改進 - acli 20070918
-msgid "Entity Capabilities"
-msgstr "個體能力"
-
-#  FIXME 這聽來不對 - acli 20070913
-msgid "Encrypted Session Negotiations"
-msgstr "加密工作階段協商"
-
-msgid "User Tune"
-msgstr "使用者樂曲"
-
-#  NOTE「Roster」指「名冊」，但Open Source software似乎一般譯「好友清單」、「成員列表」等
-#  FIXME 譯文有待改進 - acli 20070918
-msgid "Roster Item Exchange"
-msgstr "好友清單項目交換"
-
-#  NOTE 參見 http://jabber.org/protocol/reach
-#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」（例如電話號碼）
-#  NOTE 直譯：可抵達性位址
-#  XXX 是否譯「其他通訊方法」較好？但要先看上下文 - acli 20070918
-msgid "Reachability Address"
-msgstr "可抵達性位址"
-
-msgid "User Profile"
-msgstr "使用者資料"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle 音訊"
-
-msgid "User Nickname"
-msgstr "使用者暱稱"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr "Jingle 視訊"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "收到的訊息"
-
-msgid "Public Key Publishing"
-msgstr "發佈公鑰"
-
-# NOTE Jabber 新功能規格
-msgid "User Chatting"
-msgstr ""
-
-# NOTE Jabber 新功能規格
-msgid "User Browsing"
-msgstr "使用者瀏覽"
-
-# NOTE Jabber 新功能規格
-msgid "User Gaming"
-msgstr ""
-
-# NOTE Jabber 新功能規格
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "段落加密"
-
-# NOTE http://www.xmpp.org/extensions/xep-0202.html
-msgid "Entity Time"
-msgstr ""
-
-#  XXX 暫譯- acli 20070913
-msgid "Delayed Delivery"
-msgstr "延遲送出"
-
-# NOTE http://www.xmpp.org/extensions/xep-0204.html
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Jingle 用的 STUN 服務偵測"
-
-# FIXME 這聽來不對
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "簡化加密工作階段協商"
-
-msgid "Hop Check"
-msgstr "中繼段檢查"
-
-msgid "Capabilities"
-msgstr "相容性"
+# NOTE Debian 譯「local」為「本地端」
+# XXX
+msgid "Local Time"
+msgstr "本地端時間："
 
 msgid "Priority"
 msgstr "優先次序"
@@ -3969,6 +3976,13 @@ msgstr "優先次序"
 msgid "Resource"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr "%s前"
+
+msgid "Logged Off"
+msgstr "已登出"
+
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
 msgid "Middle Name"
@@ -3993,7 +4007,6 @@ msgstr "現身給"
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
@@ -4002,7 +4015,6 @@ msgstr "要求或重新要求認證"
 
 # NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4136,9 +4148,8 @@ msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
 
 msgid "Invalid Server"
-msgstr "無效的伺服器名"
+msgstr "無效的伺服器名稱"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
@@ -4149,28 +4160,23 @@ msgstr "選擇查詢的會議伺服器"
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "您指定必須加密，但這伺服器沒有加密功能。"
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
+msgid "Affiliations:"
+msgstr "從屬關係："
 
-msgid "Write error"
-msgstr "寫入錯誤"
+msgid "No users found"
+msgstr "找不到任何使用者"
 
-msgid "Ping timeout"
-msgstr "Ping逾時"
+msgid "Roles:"
+msgstr "身份："
 
-msgid "Read Error"
-msgstr "讀取錯誤"
+msgid "Ping timed out"
+msgstr "Ping逾時"
 
-#, c-format
 msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
-msgid "Unable to create socket"
-msgstr "無法建立 Socket"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
+msgstr "無法直接連線，但無法找到其他的 XMPP 連線方法。"
 
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
@@ -4178,6 +4184,10 @@ msgstr "XMPP 帳號無效"
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效，域名是必須設定的。"
 
+# FIXME 譯文聽來好像有點怪 20070518 acli
+msgid "Malformed BOSH URL"
+msgstr "畸型的 BOSH 網址"
+
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
@@ -4202,9 +4212,6 @@ msgstr "移除註冊成功"
 msgid "Unregistration Failed"
 msgstr "移除註冊失敗"
 
-msgid "Already Registered"
-msgstr "已經註冊"
-
 msgid "State"
 msgstr "省／州"
 
@@ -4217,6 +4224,9 @@ msgstr "電話"
 msgid "Date"
 msgstr "日期"
 
+msgid "Already Registered"
+msgstr "已經註冊"
+
 msgid "Unregister"
 msgstr "移除註冊"
 
@@ -4263,11 +4273,18 @@ msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "伺服器不支援封鎖"
 
 msgid "Not Authorized"
 msgstr "未認證"
 
+msgid "Mood"
+msgstr "心情"
+
+# FIXME - acli 20080511
+msgid "Now Listening"
+msgstr "正在聽的音樂"
+
 # NOTE 這些奇怪 Jabber 術語（至「Subscription」條）的解釋由 faceprint 提供
 # NOTE LSchiere2 的補充如下：
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
@@ -4301,13 +4318,6 @@ msgstr "無"
 msgid "Subscription"
 msgstr "認證狀態"
 
-msgid "Mood"
-msgstr "心情"
-
-# FIXME - acli 20080511
-msgid "Now Listening"
-msgstr "正在聽的音樂"
-
 # XXX 要覆查 - acli 20070914
 msgid "Mood Text"
 msgstr "情緒描述"
@@ -4354,9 +4364,6 @@ msgstr "成功修改了您的密碼。"
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-msgid "Password (again)"
-msgstr "舊密碼（再次確認）"
-
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
@@ -4583,16 +4590,16 @@ msgstr "串流錯誤"
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#  XXX 暫譯「（會員）等級」 - ambrose 20070415
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "不明的等級：「%s」"
+msgstr "不明的從屬關係：「%s」"
 
-#  XXX 暫譯 - ambrose 20070415
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "無法將使用者 %s 的等級設定為「%s」"
+msgstr "無法將使用者 %s 與這聊天室的從屬關係設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
@@ -4614,16 +4621,24 @@ msgid "Unable to ping user %s"
 msgstr "無法 Ping 使用者 %s"
 
 #, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "無法「嗶」使用者 %s ，因為沒有有關對方的任何資料。"
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "無法「嗶」%s ，因為沒有有關對方的任何資料。"
 
 #, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr "無法「嗶」使用者 %s ，因為對方目前可能離線。"
+msgid "Unable to buzz, because %s might be offline."
+msgstr "無法「嗶」%s ，因為對方目前可能離線。"
 
 #, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "無法「嗶」使用者 %s ，因為對方的用戶端不支援這個功能。"
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"無法「嗶」%s ，因為對方的用戶端不支援這個功能，或者目前關閉了這個功能。"
+
+# XXX 這是暫譯 - acli 20070913
+#, c-format
+msgid "Buzzing %s..."
+msgstr "正在給 %s 一個嗶..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4634,10 +4649,38 @@ msgstr "嗶！"
 msgid "%s has buzzed you!"
 msgstr "%s「嗶」了您一聲"
 
-# XXX 這是暫譯 - acli 20070913
+# XXX 媒體? - acli 20090730
 #, c-format
-msgid "Buzzing %s..."
-msgstr "正在給 %s 一個嗶..."
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr "無法與 %s 進行媒體通話，因為這個 JID 是無效的"
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "無法與 %s 進行媒體通話，因為對方目前沒有連線"
+
+#  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
+#  FIXME 這很明顯是有問題的譯文，但這是這個 PO 檔現有的譯法（見「To」條）；
+#  FIXME 如果這個要改，其他有關 presence 的譯文也要一齊改才行。-acli 20070614
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "無法與 %s 進行媒體通話，因為未獲對方認證"
+
+msgid "Media Initiation Failed"
+msgstr "媒體通話啟動失敗"
+
+#  FIXME 這不通順 - acli 20090730
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr "請指定與 %s 的那一個 Resource 進行媒體通話。"
+
+msgid "Select a Resource"
+msgstr "選擇一個 Resource"
+
+# XXX 暫譯 - acli 20090730
+msgid "Initiate Media"
+msgstr "媒體通話"
 
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
@@ -4657,21 +4700,21 @@ msgstr "topic [新主題]：檢視或修改聊天主題"
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [理由]：禁止某使用者進入聊天室"
 
-#  XXX 暫譯「（會員）等級」 - ambrose 20070415
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt;: 設定使用者"
-"在這聊天室內的等級"
+"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt; [暱稱1] [暱"
+"稱2] ...: 取得與聊天室有從屬關係的使用者，或設定使用者與這聊天室內的從屬關係"
 
 #  NOTE 譯文改動 by ambrose
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
-"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
-"這聊天室內的身份。"
+"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt; [暱稱1] [暱稱"
+"2] ...: 取得在聊天室有身份的使用者，或設定使用者在這聊天室內的身份。"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]：邀請使用者進入聊天室"
@@ -4731,6 +4774,9 @@ msgstr "連結伺服器"
 msgid "File transfer proxies"
 msgstr "檔案傳輸代理伺服器"
 
+msgid "BOSH URL"
+msgstr "BOSH 網址"
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4769,6 +4815,14 @@ msgstr "XML 分析錯誤"
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "加入聊天室 %s 時發生錯誤"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "聊天室 %s 發生錯誤"
+
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
@@ -4783,13 +4837,29 @@ msgstr "設定聊天室(_C)"
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
+msgid "No reason"
+msgstr "沒有給予原因"
+
 #, c-format
-msgid "Error joining chat %s"
-msgstr "加入聊天室 %s 時發生錯誤"
+msgid "You have been kicked: (%s)"
+msgstr "您已被踢出：(%s)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "聊天室 %s 發生錯誤"
+msgid "Kicked (%s)"
+msgstr "已被踢出 (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "帶內位元組流傳輸途中發生錯誤\n"
+
+# XXX 還是直譯「被關閉」？ 20090305 acli
+msgid "Transfer was closed."
+msgstr "傳輸已被中止。"
+
+msgid "Failed to open the file"
+msgstr "無法開啟檔案"
+
+msgid "Failed to open in-band bytestream"
+msgstr "無法開啟帶內位元組流"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4818,9 +4888,6 @@ msgstr "無法傳送檔案至 %s，因為未獲對方認證"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 
-msgid "Select a Resource"
-msgstr "選擇一個 Resource"
-
 msgid "Edit User Mood"
 msgstr "編輯使用者情緒"
 
@@ -5135,6 +5202,26 @@ msgstr "沒有群組的好友"
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
 
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s 對您眨眼，<a href='msn-wink://%s'>請點擊這裏播放這個動作</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s 對您眨眼，但無法給眨眼動作存檔"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s 送來了一段語音片段，<a href='audio://%s'>請點擊這裏播放</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s 送來了一段語音片段，但無法給語音片段存檔"
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s 送來了一個語音聊天的邀請，但目前還沒有語音聊天的支援。"
+
 msgid "Nudge"
 msgstr "呼叫"
 
@@ -5290,8 +5377,26 @@ msgstr "開啟聊天室(_C)"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-msgid "Failed to connect to server."
-msgstr "無法連線到伺服器。"
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr "所以無法新增好友「%s」，因為這個帳號是無效的。帳號必須為有效電郵地址。"
+
+msgid "Unable to Add"
+msgstr "無法加入"
+
+msgid "Authorization Request Message:"
+msgstr "認證要求訊息："
+
+msgid "Please authorize me!"
+msgstr "請通過我的認證！"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "確定(_O)"
 
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
@@ -5482,71 +5587,28 @@ msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID 認證：回應無效"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s 不是一個有效的群組。"
-
-msgid "Unknown error."
-msgstr "未知錯誤。"
-
-# NOTE: 第二個 %s 為使用者名稱，第三個 %s 為通訊協定名稱
-# NOTE: 第一個 %s 似乎係錯誤訊息摘要（整個字串為視窗標題）
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2$s (%3$s)：%1$s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 在呼叫您！"
 
-#. char *adl = g_strndup(payload, len);
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "不明錯誤（代碼 %d）"
+msgid "Unknown error (%d): %s"
+msgstr "不明錯誤（代碼 %d）：%s"
 
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "不明錯誤（代碼 %d）"
+
 # XXX 暫譯 - 20090226
 msgid "The following users are missing from your addressbook"
 msgstr "以下使用者不在通訊錄內"
 
-#  TODO 請覆查，譯文有待改進
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) 新增使用者失敗"
-
-#  TODO 請覆查，譯文有待改進
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) 拒絕使用者失敗"
-
-#  TODO 請覆查，譯文有待改進
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) 允許使用者失敗"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "因為好友清單已滿，以致無法新增 %s"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s 不是一個有效的護照帳號"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-msgid "Service Temporarily Unavailable."
-msgstr "暫時無法提供服務"
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "因為行動訊息過長，所以無法送出："
 
-msgid "Unable to rename group"
-msgstr "無法更改群組名稱"
-
-msgid "Unable to delete group"
-msgstr "無法移除群組"
-
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
 #, c-format
@@ -5591,9 +5653,6 @@ msgstr "因為發生不明的編碼錯誤，訊息無法送出："
 msgid "Message was not sent because an unknown error occurred."
 msgstr "因為發生不明的錯誤，訊息無法送出。"
 
-msgid "Unable to connect"
-msgstr "無法連線"
-
 msgid "Writing error"
 msgstr "寫入錯誤"
 
@@ -5610,21 +5669,21 @@ msgstr ""
 "%s 伺服器傳來一個連線錯誤：\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
-msgstr "這個伺服器不支援我們使用的通訊協定。"
+msgid "Our protocol is not supported by the server"
+msgstr "這個伺服器不支援我們使用的通訊協定"
 
-msgid "Error parsing HTTP."
-msgstr "解析 HTTP 途中發生錯誤。"
+msgid "Error parsing HTTP"
+msgstr "解析 HTTP 途中發生錯誤"
 
-msgid "You have signed on from another location."
-msgstr "您由其他的地方登入。"
+msgid "You have signed on from another location"
+msgstr "您由其他的地方登入"
 
 #  XXX
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "暫時無法使用 MSN 使服器，請過一會後重試。"
+msgstr "暫時無法使用 MSN 伺服器，請過一會後重試。"
 
-msgid "The MSN servers are going down temporarily."
-msgstr "MSN 伺服器將暫時關閉。"
+msgid "The MSN servers are going down temporarily"
+msgstr "MSN 伺服器將暫時關閉"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5653,6 +5712,16 @@ msgstr "傳送 Cookie 中"
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
+# FIXME 不知這是什麼意思 - acli 20090803
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s 要求看您的 webcam，但目前還沒有這個功能的支援。"
+
+# FIXME 不知這是什麼意思 - acli 20090803
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s 送來了一個 webcam 邀請，但目前還沒有這個功能的支援。"
+
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
@@ -5691,14 +5760,6 @@ msgstr "因為 Switchboard 發生錯誤，所以訊息無法送出"
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "因為發生不明的錯誤，訊息可能沒有送出："
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s 將您加入他（她）的好友清單。"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s 將您從他（她）的好友清單中移除。"
-
 #  NOTE 注意！evolution 本身的譯法是「目錄服務」而非「通訊錄」
 msgid "Delete Buddy from Address Book?"
 msgstr "將好友自通訊錄刪除？"
@@ -5729,6 +5790,61 @@ msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s 不是一個有效的群組。"
+
+msgid "Unknown error."
+msgstr "未知錯誤。"
+
+# NOTE: 第二個 %s 為使用者名稱，第三個 %s 為通訊協定名稱
+# NOTE: 第一個 %s 似乎係錯誤訊息摘要（整個字串為視窗標題）
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s (%3$s)：%1$s"
+
+#  TODO 請覆查，譯文有待改進
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) 新增使用者失敗"
+
+#  TODO 請覆查，譯文有待改進
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) 拒絕使用者失敗"
+
+#  TODO 請覆查，譯文有待改進
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) 允許使用者失敗"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "因為好友清單已滿，以致無法新增 %s"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s 不是一個有效的護照帳號"
+
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+msgid "Service Temporarily Unavailable."
+msgstr "暫時無法提供服務"
+
+msgid "Unable to rename group"
+msgstr "無法更改群組名稱"
+
+msgid "Unable to delete group"
+msgstr "無法移除群組"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s 將您加入他（她）的好友清單。"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s 將您從他（她）的好友清單中移除。"
+
+#, c-format
 msgid "No such user: %s"
 msgstr "無此使用者：%s"
 
@@ -5759,6 +5875,8 @@ msgid "Lost connection with server"
 msgstr "與伺服器之間的連線中斷"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "有新郵件"
 
@@ -5795,13 +5913,6 @@ msgstr[1] "從伺服器新增或更新了 %d 個好友（包括伺服器上已�
 msgid "Add contacts from server"
 msgstr "從伺服器加入聯絡人"
 
-# TODO 要覆查 - 20061027
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "已連結"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "通訊協定錯誤，代碼 %d：%s"
@@ -5809,14 +5920,16 @@ msgstr "通訊協定錯誤，代碼 %d：%s"
 # NOTE 第一個 %s 是錯誤訊息
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s 您的密碼的長度為 %d 個字元，超出了估計中 MySpaceIM 所設 %d 字元的上限。請"
-"透過 http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
-"changePassword 選擇一個較短的密碼，然後重試。"
+"%s 您的密碼的長度為 %zu 個字元，超出了 %d 字元的上限。請透過 http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"選擇一個較短的密碼，然後重試。"
+
+msgid "Incorrect username or password"
+msgstr "錯誤的帳號或密碼"
 
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM 錯誤"
@@ -5827,16 +5940,6 @@ msgstr "MySpaceIM 錯誤"
 msgid "Invalid input condition"
 msgstr "輸入狀況無效"
 
-msgid "Read buffer full (2)"
-msgstr "讀取用的暫存區滿了（代號2）"
-
-msgid "Unparseable message"
-msgstr "無法解析訊息"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "無法連到伺服器：%s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "無法新增好友"
 
@@ -5923,6 +6026,14 @@ msgstr "好友總數"
 msgid "Client Version"
 msgstr "客戶端版本"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"設定使用者名稱途中發生錯誤。請重試，或到網址 http://editprofile.myspace.com/"
+"index.cfm?fuseaction=profile.username  設定使用者名稱。"
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM：可取得此使用者名稱"
 
@@ -6148,9 +6259,6 @@ msgstr "無法新增您自己至好友清單"
 msgid "Master archive is misconfigured"
 msgstr "Master archive 設定錯誤"
 
-msgid "Incorrect username or password"
-msgstr "錯誤的帳號或密碼"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "無法辦識您所輸入的帳號內的主機名稱"
 
@@ -6190,8 +6298,8 @@ msgid "Unknown error: 0x%X"
 msgstr "未知錯誤：0x%X"
 
 #, c-format
-msgid "Login failed (%s)."
-msgstr "登入失敗 (%s)。"
+msgid "Unable to login: %s"
+msgstr "無法登入：%s"
 
 #  XXX 暫譯
 #, c-format
@@ -6293,9 +6401,6 @@ msgstr "GroupWise 會議 %d"
 msgid "Authenticating..."
 msgstr "認證中..."
 
-msgid "Unable to connect to server."
-msgstr "無法連線到伺服器。"
-
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
@@ -6320,23 +6425,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎？"
 
-# XXX 暫譯
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "您已經被登出，因為您已在其他電腦上登入。"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 目前似乎離線，所以不會收到您剛才送出的訊息。"
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-msgid "Error. SSL support is not installed."
-msgstr "錯誤：沒有安裝 SSL 支援。"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -6359,25 +6457,34 @@ msgstr "伺服器位址"
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
+msgid "Received unexpected response from "
+msgstr "伺服器發出了奇怪的回應，伺服器位址 "
+
+#. username connecting too frequently
+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 ""
+"您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+"線，那麼您的等待時間將會更加的延長。"
+
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
+msgid "Error requesting "
+msgstr "要求途中發生了錯誤，伺服器位址 "
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL 不允許您的帳號在這裏登入"
+
 msgid "Could not join chat room"
 msgstr "無法加入聊天室"
 
 msgid "Invalid chat room name"
 msgstr "聊天室名稱無效"
 
-msgid "Server closed the connection."
-msgstr "伺服器關閉連線。"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"與伺服器之間的連線突然中斷:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr "連線至伺服器時收到無效的資料。"
+msgid "Received invalid data on connection with server"
+msgstr "連線至伺服器時收到無效的資料"
 
 #. *< type
 #. *< ui_requirement
@@ -6424,7 +6531,7 @@ msgstr "與遠端使用者的連線突然中斷：<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "在與遠端使用者的連線上收到無交的資料。"
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "無法與遠端使用者建立連線。"
 
 msgid "Direct IM established"
@@ -6483,7 +6590,7 @@ msgstr "遺失回應"
 msgid "Request denied"
 msgstr "要求被拒"
 
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#Pidgin提供
+# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
@@ -6642,23 +6749,15 @@ msgid "Warning Level"
 msgstr "警告等級"
 
 msgid "Buddy Comment"
-msgstr "好友說明"
+msgstr "好友備註"
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
-"無法連線至認證伺服器：\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
+msgstr "無法連線至認證伺服器：%s"
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"無法連線到 BOS 伺服器：\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
+msgstr "無法連線到 BOS 伺服器：%s"
 
 msgid "Username sent"
 msgstr "已送出使用者名稱"
@@ -6672,24 +6771,36 @@ msgstr "完成連線中"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"無法登入：無法以 %s 身份登入，因為這個帳號是無效的。帳號必須為有效電郵地址；"
-"或者以英文字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
+"無法以 %s 身份登入，因為這個帳號是無效的。帳號必須為有效電郵地址；或者以英文"
+"字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
 
-#. Unregistered screen name
-#. uid is not exist
-msgid "Invalid username."
-msgstr "使用者名稱無效。"
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "您可能會在短時間內中斷連線。如果屬實，請到 %s 看看有沒有更新。"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "無法取得有效的 AIM 登入碼。"
+
+msgid "Unable to get a valid login hash."
+msgstr "無法取得有效的登入雜湊。"
+
+msgid "Received authorization"
+msgstr "收到認證"
 
-msgid "Incorrect password."
-msgstr "密碼錯誤。"
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr "使用者名稱不存在"
 
+# XXX「suspend」真是「停用」嗎？
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr "您的帳號目前停用中。"
+msgid "Your account is currently suspended"
+msgstr "您的帳號目前停用中"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
@@ -6698,27 +6809,21 @@ msgstr "您的帳號目前停用中。"
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#. screen name connecting too frequently
-#. IP address connecting too frequently
-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 ""
-"您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
-"線，那麼您的等待時間將會更加的延長。"
-
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-msgid "Could Not Connect"
-msgstr "無法連線"
-
-msgid "Received authorization"
-msgstr "收到認證"
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"您的連線／斷線動作太過頻繁。請等待一分鐘後再行重試。如果您依然繼續嘗試著連"
+"線，那麼您的等待時間將會更加的延長。"
 
-msgid "The SecurID key entered is invalid."
-msgstr "您所輸入的 SecurID 碼無效。"
+msgid "The SecurID key entered is invalid"
+msgstr "您所輸入的 SecurID 碼無效"
 
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
@@ -6726,26 +6831,6 @@ msgstr "請輸入 SecurID"
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "確定(_O)"
-
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "您可能會在短時間內中斷連線。如果屬實，請到 %s 看看有沒有更新。"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "無法取得有效的 AIM 登入碼。"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
-
-msgid "Unable to get a valid login hash."
-msgstr "無法取得有效的登入雜湊。"
-
 msgid "Password sent"
 msgstr "成功送出密碼"
 
@@ -6755,12 +6840,6 @@ msgstr "無法初始化連結"
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
 
-msgid "Authorization Request Message:"
-msgstr "認證要求訊息："
-
-msgid "Please authorize me!"
-msgstr "請通過我的認證！"
-
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
@@ -6875,7 +6954,7 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 
-#. Data is assumed to be the destination sn
+#. Data is assumed to be the destination bn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息：%s"
@@ -6898,6 +6977,9 @@ msgstr "上線自"
 msgid "Member Since"
 msgstr "成為成員的時間"
 
+msgid "Capabilities"
+msgstr "相容性"
+
 msgid "Profile"
 msgstr "個人資料"
 
@@ -7062,15 +7144,12 @@ msgstr "離開訊息過長。"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"所以無法新增好友「%s」，因為這個帳號是無效的。帳號必須為有效電郵地址；或者以"
-"英文字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
-
-msgid "Unable to Add"
-msgstr "無法加入"
+"無法新增好友「%s」，因為這個帳號是無效的。帳號必須為有效電郵地址；或者以英文"
+"字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "無法取得好友清單"
@@ -7087,17 +7166,17 @@ msgstr "孤兒們"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
-"試。"
+"因為您的好友清單中有太多的好友，所以沒有辦法加入好友 %s。請移除其中一個，然後"
+"重試。"
 
 msgid "(no name)"
 msgstr "(沒有名字)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "無法把 %s 加入好友清單，原因不明。"
 
 # XXX 好像有些不順 - acli 20080508
@@ -7135,7 +7214,7 @@ msgstr ""
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
-# NOTE: 這裡的字義係由 #Pidgin 的 MrHappy 及 deryni 提供的
+# NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同，暫時不予理會
 msgid "_Exchange:"
 msgstr "頻道號碼(_E)："
@@ -7152,10 +7231,10 @@ msgstr "iTunes Store 網站連結"
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "%s 的好友說明"
+msgstr "%s 的好友備註"
 
 msgid "Buddy Comment:"
-msgstr "好友說明："
+msgstr "好友備註："
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
@@ -7174,7 +7253,7 @@ msgstr "取得 AIM 資訊"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "編輯好友說明"
+msgstr "編輯好友備註"
 
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
@@ -7186,12 +7265,12 @@ msgstr "即時訊息"
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-# NOTE Require意為「需要」，不是「要求」
+# NOTE 在這裏「Require」是指別人如果要新增您為好友，得先向您發出驗證要求，再由您允許
 msgid "Require authorization"
-msgstr "需要認證"
+msgstr "必須驗證"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "允許其他使用者在網路上查看您目前的狀態（會導致您收到垃圾訊息！）"
+msgstr "允許在網路上檢視您目前的狀態（會導致您收到垃圾訊息！）"
 
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
@@ -7234,6 +7313,7 @@ msgstr "搜尋(_S)"
 msgid "Set User Info (web)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "修改密碼 (透過網頁)"
 
@@ -7264,6 +7344,9 @@ msgstr "使用電子郵件地址搜尋好友..."
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
+msgid "Use clientLogin"
+msgstr "使用 clientLogin"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7398,9 +7481,8 @@ msgstr "郵遞區號"
 msgid "Phone Number"
 msgstr "電話號碼"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "給予認證？"
+msgstr "允許新增您為好友"
 
 msgid "Cellphone Number"
 msgstr "行動電話號碼"
@@ -7458,14 +7540,43 @@ msgstr "更新"
 msgid "Could not change buddy information."
 msgstr "無法修改好友資訊。"
 
-# NOTE Require意為「需要」，不是「要求」
+msgid "Mobile"
+msgstr "使用行動裝置"
+
+msgid "Note"
+msgstr "備註"
+
+# NOTE 正式的QQ介面寫「备注」(備註)
+#. callback
+msgid "Buddy Memo"
+msgstr "好友備註"
+
+msgid "Change his/her memo as you like"
+msgstr "請隨意修改備註"
+
+msgid "_Modify"
+msgstr "修改(_M)"
+
+msgid "Memo Modify"
+msgstr "修改備註"
+
+# XXX 中文正常應該不會用「says」一類的擬人字眼？ - acli 20090305
+msgid "Server says:"
+msgstr "伺服器回應："
+
+msgid "Your request was accepted."
+msgstr "請求已獲接受。"
+
+msgid "Your request was rejected."
+msgstr "請求已被拒絶。"
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u 要求認證"
 
-#, fuzzy
+# XXX 暫譯 - acli 20090803
 msgid "Add buddy question"
-msgstr "將使用者加入您的好友清單？"
+msgstr "新增好友的認證問題"
 
 msgid "Enter answer here"
 msgstr "在此輸入答案"
@@ -7482,14 +7593,16 @@ msgstr "拒絕認證訊息："
 msgid "Sorry, you're not my style."
 msgstr "不好意思，你不是我的菜…"
 
+# NOTE 請看下面 =P
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u 需要授權"
+msgstr "%u 需要認證"
 
-#, fuzzy
+# NOTE 這是視窗標題，對應下面的「Enter request here」和「Would you be my friend?」
 msgid "Add buddy authorize"
-msgstr "將使用者加入您的好友清單？"
+msgstr "新增好友認證"
 
+# NOTE 其他協定譯「認證要求訊息：」
 msgid "Enter request here"
 msgstr "在此輸入要求"
 
@@ -7507,7 +7620,7 @@ msgid "Invalid QQ Number"
 msgstr "無效的 QQ 號碼"
 
 msgid "Failed sending authorize"
-msgstr "送出授權失敗"
+msgstr "送出認證失敗"
 
 #, c-format
 msgid "Failed removing buddy %u"
@@ -7566,10 +7679,10 @@ msgid "Member"
 msgstr "用戶"
 
 msgid "Requesting"
-msgstr ""
+msgstr "請求中"
 
 msgid "Admin"
-msgstr ""
+msgstr "管理人"
 
 msgid "Notice"
 msgstr "通知"
@@ -7595,19 +7708,17 @@ msgstr "加入群組"
 msgid "Input request here"
 msgstr "請輸入要求"
 
-#  NOTE QQ「member」應是「成員」
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "成功加入 Qun %s (%u)"
+msgstr "成功加入群組 %s (%u)"
 
-#  NOTE QQ「member」應是「成員」
 msgid "Successfully joined Qun"
-msgstr "成功加入 Qun"
+msgstr "成功加入群組"
 
 # NOTE 這是 QQ_ROOM_JOIN_DENIED
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr "加入 Qun %u 被拒絕"
+msgstr "加入群組 %u 被拒絕"
 
 msgid "QQ Qun Operation"
 msgstr "QQ 群組操作"
@@ -7616,15 +7727,15 @@ msgid "Failed:"
 msgstr "失敗："
 
 msgid "Join Qun, Unknown Reply"
-msgstr "加入 Qun，未知的回覆"
+msgstr "加入群組途中收到未知的回覆"
 
 msgid "Quit Qun"
-msgstr "離開 Qun"
+msgstr "離開群組"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
-msgstr "請注意，假如您是創立者，這最終會把這個群 (Qun) 移除。"
+msgstr "請注意，假如您是創立者，這最終會把這個群組 (Qun) 移除。"
 
 #  NOTE 這個「你」字沒有打錯，主要是法文及德文的譯者都採用「你」
 #  NOTE（法文「tu」、德文「du」）而不是「您」（「vous」、「Sie」），
@@ -7634,14 +7745,14 @@ msgstr "不好意思，你不是我們的菜"
 
 #  NOTE QQ「member」應是「成員」
 msgid "Successfully changed Qun members"
-msgstr "成功的變更了 Qun 成員"
+msgstr "成功的變更了群組成員"
 
 # FIXME 暫譯 ambrose 20070415
 msgid "Successfully changed Qun information"
 msgstr "成功的變更了 Qun 資訊"
 
 msgid "You have successfully created a Qun"
-msgstr "成功建立了一個群 (Qun)"
+msgstr "成功建立了一個群組 (Qun)"
 
 msgid "Would you like to set up detailed information now?"
 msgstr "你現在要立即設定詳細資訊嗎？"
@@ -7649,9 +7760,10 @@ msgstr "你現在要立即設定詳細資訊嗎？"
 msgid "Setup"
 msgstr "設定"
 
-#, fuzzy, c-format
+# NOTE %s 為「reason」
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "使用者 %d 要求加入群組 %d"
+msgstr "使用者 %u 要求加入群組 %u，理由為「%s」"
 
 #, c-format
 msgid "%u request to join Qun %u"
@@ -7659,11 +7771,12 @@ msgstr "使用者 %u 要求加入群組 %u"
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr ""
+msgstr "加入群組 %u 失敗，群組管理員為 %u"
 
+# NOTE %s 為「reason」
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>管理員 %2$u 允許了您加入群組 %1$u，理由為「%3$s」</b>"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
 #, c-format
@@ -7677,9 +7790,9 @@ msgstr "<b>新好友 %u 已加入。</b>"
 
 # XXX 問題：
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白）
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
 # XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
 # XXX - Ambrose 20061123
 #, c-format
@@ -7742,9 +7855,12 @@ msgstr "<b>最近更新時間：</b>： %d-%d-%d, %d:%d:%d<br>\n"
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>伺服器位址</b>：%s<br>\n"
 
-#, fuzzy, c-format
+#  NOTE 直譯：「客戶端旗標」
+#  NOTE 根據原始碼，所謂 Client Tag 係指你的客戶端有什麼功能 (qq2007、QQ2008等等)
+#  NOTE 在OSCAR協定模組對應的欄位 (Capabilities) 譯「相容性」
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>登入時間：</b>%s<br>\n"
+msgstr "<b>相容性：</b>%s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
@@ -7802,6 +7918,9 @@ msgstr "<p><b>鳴謝</b>：<br>\n"
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>仔細的品管人員</b>:<br>\n"
 
+msgid "and more, please let me know... thank you!))"
+msgstr "如有遺漏務請通知……謝謝！))"
+
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>還有所有幕後默默貢獻的無名英雄們…</i><br>\n"
 
@@ -7822,14 +7941,13 @@ msgid "Account Information"
 msgstr "帳號資訊"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "更新所有 QQ 群"
 
 msgid "About OpenQ"
 msgstr "關於 OpenQ"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "修改地址"
+msgstr "修改好友備註"
 
 #. *< type
 #. *< ui_requirement
@@ -7871,7 +7989,7 @@ msgid "Show server news"
 msgstr "顯示伺服器是日訊息"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "收到聊天室訊息時自動顯示聊天室"
 
 # XXX 20080810 acli - 譯文有待改進，原文也是
 msgid "Keep alive interval (seconds)"
@@ -7881,7 +7999,7 @@ msgstr "每隔多少秒送出 Keep Alive"
 msgid "Update interval (seconds)"
 msgstr "每隔多少秒更新"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "無法解密伺服器回應"
 
 #, c-format
@@ -7900,15 +8018,12 @@ msgstr "暫時不支援 Redirect_EX"
 #. need activation
 #. need activation
 msgid "Activation required"
-msgstr "必須啟動帳號"
+msgstr "必須先啟動帳號"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "無法登入，不明回應碼「0x%02X」"
 
-msgid "Could not decrypt server reply"
-msgstr "無法解密伺服器回應"
-
 msgid "Requesting captcha"
 msgstr "要求驗證圖片中"
 
@@ -7921,9 +8036,11 @@ msgstr "圖片驗證失敗"
 msgid "Captcha Image"
 msgstr "驗證圖片"
 
+# NOTE 這裏的所謂「Enter code」係指輸入驗證圖片上所寫的文字
 msgid "Enter code"
-msgstr "輸入啟動碼"
+msgstr "輸入驗證文字"
 
+# NOTE 視窗標題
 msgid "QQ Captcha Verification"
 msgstr "QQ 圖示驗證"
 
@@ -7943,32 +8060,18 @@ msgstr ""
 "登入時，傳回未知的回覆碼「0x%02X」：\n"
 "%s"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "無法連線。"
-
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
-msgid "Unable to read from socket"
-msgstr "無法讀取 Socket"
-
-msgid "Write Error"
-msgstr "寫入錯誤"
-
-msgid "Connection lost"
-msgstr "連線中斷"
-
-#, fuzzy
 msgid "Getting server"
-msgstr "設定使用者資訊..."
+msgstr "取得伺服器位址中"
 
 # XXX 這是看了原始碼後的結論（但可能會錯）- acli 20080930
 msgid "Requesting token"
 msgstr "請求符記中"
 
-msgid "Couldn't resolve host"
-msgstr "無法解析主機"
+msgid "Unable to resolve hostname"
+msgstr "無法解析主機名稱"
 
 msgid "Invalid server or port"
 msgstr "伺服器或通訊埠無效"
@@ -8023,14 +8126,14 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ 群組指令"
 
-msgid "Could not decrypt login reply"
-msgstr "無法解密伺服器回應"
+msgid "Unable to decrypt login reply"
+msgstr "無法解密登入回應"
 
 msgid "Unknown LOGIN CMD"
 msgstr "未知的登入指令"
 
 msgid "Unknown CLIENT CMD"
-msgstr "無知的用戶端指令"
+msgstr "不明的用戶端指令"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8043,9 +8146,6 @@ msgstr "傳送檔案"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了「%s」的傳送"
 
-msgid "Connection closed (writing)"
-msgstr "連線關閉（寫入）"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>群組名稱：</b>%s<br>"
@@ -8105,17 +8205,6 @@ msgstr "在伺服器「%s」上，有 Sametime 管理人發出了下列通告"
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理人通告"
 
-msgid "Connection reset"
-msgstr "連線重置"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "讀取 Socket 時發生錯誤；%s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "無法連線到主機"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "自 %s 發佈"
@@ -8139,6 +8228,9 @@ msgstr "喇叭"
 msgid "Video Camera"
 msgstr "視訊"
 
+msgid "File Transfer"
+msgstr "檔案傳輸"
+
 msgid "Supports"
 msgstr "支援"
 
@@ -8167,7 +8259,6 @@ msgstr "現有會議室"
 msgid "Create New Conference..."
 msgstr "開啟新會議室..."
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite user to a conference"
 msgstr "邀請使用者進入會議室"
 
@@ -8180,12 +8271,11 @@ msgstr ""
 "從下方的清單中選取一個會議室，同時發出邀請給使用者%s。如果您想開啟一個新的會"
 "議室，並且邀請這個使用者加入，您可以選擇「開啟新會議室」選項。"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
 msgid "Invite to Conference..."
-msgstr "邀請進入會議室"
+msgstr "邀請進入會議室..."
 
 #  XXX 要覆查 - 20061029
 msgid "Send TEST Announcement"
@@ -8856,9 +8946,6 @@ msgstr "所屬機構"
 msgid "Unit"
 msgstr "部門"
 
-msgid "Note"
-msgstr "備註"
-
 msgid "Join Chat"
 msgstr "加入聊天室"
 
@@ -8960,6 +9047,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "網路統計資料"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
@@ -9022,7 +9112,7 @@ msgstr "不支援的公鑰類型"
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
 msgid "Key Exchange failed"
@@ -9032,17 +9122,11 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗，請按「重新連線」建立新的連線。"
 
-msgid "Connection failed"
-msgstr "連線失敗"
-
 msgid "Performing key exchange"
 msgstr "交換密鑰中"
 
-msgid "Unable to create connection"
-msgstr "無法建立連結"
-
-msgid "Could not load SILC key pair"
-msgstr "無法讀取 SILC 密鑰對"
+msgid "Unable to load SILC key pair"
+msgstr "無法載入 SILC 密鑰對"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -9051,7 +9135,7 @@ msgstr "連線至 SILC 伺服器中"
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
 msgid "Error loading SILC key pair"
@@ -9351,8 +9435,8 @@ msgstr "數位簽署所有即時訊息"
 msgid "Creating SILC key pair..."
 msgstr "產生 SILC 密鑰對中..."
 
-msgid "Cannot create SILC key pair\n"
-msgstr "無法產生 SILC 密鑰對\n"
+msgid "Unable to create SILC key pair"
+msgstr "無法產生 SILC 密鑰對"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9445,6 +9529,9 @@ msgstr "白板"
 msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
+msgid "Error during connecting to SILC Server"
+msgstr "連線至 SILC 伺服器時發生錯誤"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗：版本不符，請更新您的用戶端程式"
@@ -9487,7 +9574,7 @@ msgstr "失敗：無效的 Cookie"
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
 # NOTE 香港會寫「陳大文」，台灣人會看不明（寫「老張」一類，港人看見會覺得很怪），頭痛 :P
@@ -9495,23 +9582,17 @@ msgid "John Noname"
 msgstr "無名氏"
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "無法讀取 SILC 密鑰對：%s"
-
-msgid "Could not write"
-msgstr "無法寫入"
+msgid "Unable to load SILC key pair: %s"
+msgstr "無法載入 SILC 密鑰對：%s"
 
-msgid "Could not connect"
-msgstr "無法連結"
-
-msgid "Unknown server response."
-msgstr "不明的伺服器回應。"
+msgid "Unable to create connection"
+msgstr "無法建立連結"
 
-msgid "Could not create listen socket"
-msgstr "無法建立 Socket 監聽"
+msgid "Unknown server response"
+msgstr "不明的伺服器回應"
 
-msgid "Could not resolve hostname"
-msgstr "無法解析主機"
+msgid "Unable to create listen socket"
+msgstr "無法建立監聽 Socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
@@ -9552,180 +9633,61 @@ msgstr "認證使用者"
 msgid "Auth Domain"
 msgstr "認證域名"
 
-#, c-format
-msgid "Looking up %s"
-msgstr "找尋 %s 中"
-
-#, c-format
-msgid "Connect to %s failed"
-msgstr "連結到 %s 失敗"
-
-#, c-format
-msgid "Signon: %s"
-msgstr "登入：%s"
-
-#, c-format
-msgid "Unable to write file %s."
-msgstr "無法寫入檔案 %s。"
-
-#, c-format
-msgid "Unable to read file %s."
-msgstr "無法讀取檔案 %s。"
-
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "訊息太長，最後的 %s 位元組被截去。"
-
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s 目前並未登入。"
-
-#  NOTE 譯文更動 by Ambrose
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "不允許對 %s 發出警告。"
-
-#, c-format
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "訊息被丟棄，因為您達到了伺服器所限制的發送速度。"
-
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "在 %s 不可以聊天。"
-
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "您送訊息給 %s 的速度太快了。"
-
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "您遺失了一個由 %s 送來的訊息，因為它太大了。"
-
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "您遺失了一個由 %s 送來的訊息，因為它傳送的速度太快。"
-
-#, c-format
-msgid "Failure."
-msgstr "失敗。"
-
-#, c-format
-msgid "Too many matches."
-msgstr "匹配太多。"
-
-#, c-format
-msgid "Need more qualifiers."
-msgstr "需輸入更多檢索條件。"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#, c-format
-msgid "Dir service temporarily unavailable."
-msgstr "暫時無法使用目錄服務。"
-
-#, c-format
-msgid "Email lookup restricted."
-msgstr "禁止 E-Mail 檢查。"
-
-#, c-format
-msgid "Keyword ignored."
-msgstr "關鍵字已被忽略。"
-
-#, c-format
-msgid "No keywords."
-msgstr "沒有關鍵字。"
-
-#, c-format
-msgid "User has no directory information."
-msgstr "這個使用者沒有他的相關資訊。"
-
-#, c-format
-msgid "Country not supported."
-msgstr "這個國家不被支援。"
-
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "未知的失敗原因：%s。"
-
-#, c-format
-msgid "Incorrect username or password."
-msgstr "錯誤的帳號或密碼。"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#, c-format
-msgid "The service is temporarily unavailable."
-msgstr "暫時無法使用該項服務。"
-
-#, c-format
-msgid "Your warning level is currently too high to log in."
-msgstr "您目前登入系統的警告等級太高，以致無法登入。"
-
-#, c-format
-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 ""
-"您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
-"線，那麼您的等待時間將會更加的延長。"
-
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "發生了一個未知的登入錯誤：%s。"
-
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "一個未知的錯誤 %d 發生。資訊：%s"
-
-msgid "Invalid Groupname"
-msgstr "無效的群組名稱"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網路的一個聊天室"
 
-msgid "Connection Closed"
-msgstr "連線關閉"
+msgid "list: List rooms on the Yahoo network"
+msgstr "list：列出Yahoo網路上的聊天室清單"
 
-msgid "Waiting for reply..."
-msgstr "等待回覆中..."
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: 要求使用者開始 Doodle Session"
 
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
+msgid "Yahoo ID..."
+msgstr "Yahoo 帳號"
 
-msgid "Password Change Successful"
-msgstr "密碼修改成功"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo 協定模組"
 
-msgid "_Group:"
-msgstr "群組(_G)："
+msgid "Pager server"
+msgstr "傳呼伺服器"
 
-msgid "Get Dir Info"
-msgstr "取得使用者個人資訊"
+msgid "Pager port"
+msgstr "傳呼系統通訊埠"
 
-msgid "Set Dir Info"
-msgstr "設定使用者個人資訊"
+msgid "File transfer server"
+msgstr "檔案傳輸伺服器"
 
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "無法開啟 %s 以供寫入！"
+msgid "File transfer port"
+msgstr "檔案傳輸通訊埠"
 
-msgid "File transfer failed; other side probably canceled."
-msgstr "檔案傳輸失敗；可能是對方取消傳輸。"
+#  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
+msgid "Chat room locale"
+msgstr "聊天室區域 (Locale)"
 
-msgid "Could not connect for transfer."
-msgstr "無法開啟連線以供傳輸。"
+msgid "Ignore conference and chatroom invitations"
+msgstr "忽略會議室與聊天室邀請"
 
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
+msgid "Chat room list URL"
+msgstr "聊天室清單所在網址"
 
-msgid "Save As..."
-msgstr "另存新檔..."
+msgid "Yahoo Chat server"
+msgstr "Yahoo 聊天伺服器"
 
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
-msgstr[1] "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
+msgid "Yahoo Chat port"
+msgstr "Yahoo 聊天室通訊埠"
 
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s 要求您傳送檔案給他（她）。"
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN 帳號..."
 
 #. *< type
 #. *< ui_requirement
@@ -9737,12 +9699,11 @@ msgstr "%s 要求您傳送檔案給他（她）。"
 #. *< version
 #. *  summary
 #. *  description
-msgid "TOC Protocol Plugin"
-msgstr "TOC 協定模組"
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo JAPAN 協定模組"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請，但目前還沒有視像聊天的支援。"
+msgid "Your SMS was not delivered"
+msgstr "無法發送您的短訊"
 
 # NOTE 譯文更動 by Ambrose
 msgid "Your Yahoo! message did not get sent."
@@ -9768,6 +9729,26 @@ msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好�
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr "收到無效的資料"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr "帳號已被封鎖：登入失敗次數太多。登入 Yahoo 網站或許可以解除封鎖。"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr "帳號已被封鎖：原因不明。登入 Yahoo 網站或許可以解除封鎖。"
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr "未有輸入帳號或密碼"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9791,18 +9772,19 @@ msgstr ""
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
+# NOTE「封鎖」好像比「暫時關閉」通順？ - acli 20090730
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
+msgstr "您的帳戶目前已被封鎖。請您登入 Yahoo! 網站。"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
 #, c-format
@@ -9810,27 +9792,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-msgid "Received unexpected HTTP response from server."
-msgstr "伺服器發出了奇怪的 HTTP 回應。"
-
-msgid "Connection problem"
-msgstr "連線錯誤"
+msgid "Received unexpected HTTP response from server"
+msgstr "伺服器發出了奇怪的 HTTP 回應"
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"與 %s 之間的連線突然中斷:\n"
-"%s"
+msgid "Lost connection with %s: %s"
+msgstr "與 %s 之間的連線突然中斷：%s"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"無法與 %s 建立連線:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "無法與 %s 建立連線：%s"
 
 msgid "Not at Home"
 msgstr "不在家"
@@ -9872,7 +9843,7 @@ msgstr "暫時報稱離線"
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
-# NOTE #Pidgin 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
+# NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
@@ -9887,10 +9858,10 @@ msgstr "上線狀態設定"
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-msgid "Activate which ID?"
-msgstr "啟用哪一個 ID？"
+msgid "Select the ID you want to activate"
+msgstr "請輸入希望啟動的 ID"
 
-# NOTE #Pidgin 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
+# NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join whom in chat?"
 msgstr "加入誰的聊天室？"
@@ -9904,82 +9875,26 @@ msgstr "加入好友目前所在的聊天室..."
 msgid "Open Inbox"
 msgstr "開啟收件匣"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網路的一個聊天室"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list：列出Yahoo網路上的聊天室清單"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: 要求使用者開始 Doodle Session"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo 帳號"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo 協定模組"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "傳呼伺服器"
-
-msgid "Japan Pager server"
-msgstr "傳呼伺服器（日本地區）"
-
-msgid "Pager port"
-msgstr "傳呼系統通訊埠"
-
-msgid "File transfer server"
-msgstr "檔案傳輸伺服器"
-
-msgid "Japan file transfer server"
-msgstr "檔案傳輸伺服器（日本地區）"
-
-msgid "File transfer port"
-msgstr "檔案傳輸通訊埠"
-
-#  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
-msgid "Chat room locale"
-msgstr "聊天室區域 (Locale)"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "忽略會議室與聊天室邀請"
-
-msgid "Chat room list URL"
-msgstr "聊天室清單所在網址"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天伺服器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天室通訊埠"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "送出 Doodle 要求。"
 
-# TODO - 覆查譯文 - 20061028
+msgid "Unable to connect."
+msgstr "無法連線。"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=descriptor&qrytype=en&x=0&y=0
 msgid "Unable to establish file descriptor."
-msgstr "無法建立檔案介紹。"
+msgstr "無法建立檔描述符。"
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 提出一次過傳送 %d 個檔案。\n"
 
+msgid "Write Error"
+msgstr "寫入錯誤"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan 個人資料"
 
@@ -10043,11 +9958,8 @@ msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 婉拒了你詢問他（她）到會議室「%s」的邀請，理由是「%s」。"
-
-msgid "Invitation Rejected"
-msgstr "邀請被婉拒了"
+msgid "%s has declined to join."
+msgstr "%s 婉拒了加入聊天室。"
 
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
@@ -10090,6 +10002,9 @@ msgstr "可語音聊天"
 msgid "Webcams"
 msgstr "可視像聊天"
 
+msgid "Connection problem"
+msgstr "連線錯誤"
+
 msgid "Unable to fetch room list."
 msgstr "無法取得聊天室清單。"
 
@@ -10099,17 +10014,9 @@ msgstr "無法取得聊天室清單。"
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-msgid "Connection problem with the YCHT server."
+msgid "Connection problem with the YCHT server"
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"與伺服器之間的連線突然中斷\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10230,7 +10137,7 @@ msgstr "TZC 指令"
 # NOTE: 這是Zephyr使用者會自然明白的術語，不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Export to .anyone"
@@ -10242,7 +10149,7 @@ msgstr "匯出至 .zephyr.subs 檔"
 # NOTE: 這是Zephyr使用者會自然明白的術語，不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Import from .anyone"
@@ -10261,32 +10168,22 @@ msgid "Exposure"
 msgstr "現身程度"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"無法建立 Socket：\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "無法解析 HTTP 代理伺服應的回應：%s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "無法解析 HTTP 代理伺服應的回應：%s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理伺服器連線錯誤 %d"
 
+# NOTE 參閱 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=tunnel&qrytype=en&x=35&y=11
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "拒絕存取：HTTP 代理伺服器禁止通訊埠 %d 的資料傳送。"
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr "拒絕存取：HTTP 代理伺服器禁止使用通訊埠 %d 穿隧"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 途中發生了錯誤"
 
-msgid "Could not resolve host name"
-msgstr "無法解析主機"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "要求 %s 的注意中..."
@@ -10379,9 +10276,6 @@ msgstr "請勿打擾"
 msgid "Extended away"
 msgstr "長時間離開"
 
-msgid "Mobile"
-msgstr "使用行動裝置"
-
 msgid "Listening to music"
 msgstr "聽音樂中"
 
@@ -10423,18 +10317,6 @@ msgstr "+++ %s 不再閒置"
 msgid "%x %X"
 msgstr "%x %X"
 
-#, c-format
-msgid "Error Reading %s"
-msgstr "讀取 %s 途中發生了錯誤"
-
-# NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
-
 msgid "Calculating..."
 msgstr "計算中..."
 
@@ -10541,6 +10423,21 @@ msgstr "連線被拒。"
 msgid "Address already in use."
 msgstr "位址已在使用中"
 
+# NOTE 這個 %s 係指 filename
+#, c-format
+msgid "Error Reading %s"
+msgstr "讀取 %s 途中發生了錯誤"
+
+# NOTE 第一個 %s 是 description，第二個 %s 是 filename_full
+# NOTE 上文有註釋「If we could not parse the file then show the user an error message」
+# NOTE 所以所謂「reading」其實係指「解析」而不是「讀入」
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
+
 msgid "Internet Messenger"
 msgstr "網路即時通"
 
@@ -10586,10 +10483,8 @@ msgstr "新郵件通知(_M)"
 msgid "Use this buddy _icon for this account:"
 msgstr "使用下列好友圖示(_I)："
 
-#. Build the protocol options frame.
-#, c-format
-msgid "%s Options"
-msgstr "%s 選項"
+msgid "Ad_vanced"
+msgstr "進階設定(_V)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
@@ -10626,9 +10521,6 @@ msgstr "如果您看得夠仔細"
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-msgid "Proxy Options"
-msgstr "代理伺服器選項"
-
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
@@ -10656,8 +10548,8 @@ msgstr "基本設定(_B)"
 msgid "Create _this new account on the server"
 msgstr "在伺服器上建立這個新帳號(_T)"
 
-msgid "_Advanced"
-msgstr "進階設定(_A)"
+msgid "P_roxy"
+msgstr "代理伺服器(_R)"
 
 msgid "Enabled"
 msgstr "啟動"
@@ -10704,16 +10596,16 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
-msgid "Room _List"
-msgstr "聊天室清單(_L)"
+msgid "A_ccount"
+msgstr "帳號(_C)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-msgid "_Account:"
-msgstr "帳號(_A)："
+msgid "Room _List"
+msgstr "聊天室清單(_L)"
 
 msgid "_Block"
 msgstr "封鎖(_B)"
@@ -10730,6 +10622,15 @@ msgstr "取得資訊(_I)"
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
+msgid "_Audio Call"
+msgstr "語音通話(_A)"
+
+msgid "Audio/_Video Call"
+msgstr "語音／視像通話"
+
+msgid "_Video Call"
+msgstr "視像通話(_V)"
+
 msgid "_Send File..."
 msgstr "傳送檔案(_S)..."
 
@@ -10739,9 +10640,12 @@ msgstr "加入好友狀態捕捉(_P)..."
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr "離線時隱藏"
 
+msgid "Show When Offline"
+msgstr "離線時顯示"
+
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
@@ -10870,6 +10774,9 @@ msgstr "/工具/好友狀態捕捉(_P)"
 msgid "/Tools/_Certificates"
 msgstr "/工具/憑證(_C)"
 
+msgid "/Tools/Custom Smile_ys"
+msgstr "/工具/自定表情(_Y)"
+
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
@@ -10879,9 +10786,6 @@ msgstr "/工具/偏好設定(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-msgid "/Tools/Smile_y"
-msgstr "/工具/表情(_Y)"
-
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
@@ -11001,8 +10905,9 @@ msgstr "使用者自定"
 msgid "By status"
 msgstr "依照狀態"
 
-msgid "By log size"
-msgstr "依照日誌大小"
+# XXX 暫譯 20090305 acli
+msgid "By recent log activity"
+msgstr "依照日誌更新時間"
 
 #, c-format
 msgid "%s disconnected"
@@ -11018,6 +10923,9 @@ msgstr "重新連線"
 msgid "Re-enable"
 msgstr "重新啟動"
 
+msgid "SSL FAQs"
+msgstr "SSL 常見問題"
+
 msgid "Welcome back!"
 msgstr "歡迎歸來！"
 
@@ -11102,6 +11010,9 @@ msgstr "請輸入別名，或者關於您所想加入好友清單的聊天室的
 msgid "A_lias:"
 msgstr "別名(_L)："
 
+msgid "_Group:"
+msgstr "群組(_G)："
+
 msgid "Auto_join when account becomes online."
 msgstr "帳號上線後隨即自動加入(_J)。"
 
@@ -11140,6 +11051,107 @@ msgstr "/工具"
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "背景顏色"
+
+msgid "The background color for the buddy list"
+msgstr "好友清單的背景顏色"
+
+msgid "Layout"
+msgstr "佈局"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr "好友清單內圖示、名稱和狀態的佈局"
+
+#. Group
+msgid "Expanded Background Color"
+msgstr "展開的群組的背景顏色"
+
+msgid "The background color of an expanded group"
+msgstr "群組展開時的群組名稱的背景顏色"
+
+# NOTE 根據gtkblist-theme-loader的原始碼，這個「文字」選項應該係指PidginThemeFont（字體名稱、字體顏色兩項），下同
+msgid "Expanded Text"
+msgstr "展開的群組的名稱"
+
+msgid "The text information for when a group is expanded"
+msgstr "群組展開時群組名稱的字體及文字顏色"
+
+msgid "Collapsed Background Color"
+msgstr "收起的群組的背景顏色"
+
+msgid "The background color of a collapsed group"
+msgstr "群組收起時群組名稱的背景顏色"
+
+msgid "Collapsed Text"
+msgstr "收起的群組的名稱"
+
+msgid "The text information for when a group is collapsed"
+msgstr "群組收起時群組名稱的字體及文字顏色"
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr "好友／聊天室的背景顏色"
+
+msgid "The background color of a contact or chat"
+msgstr "好友或聊天室名稱的背景顏色"
+
+msgid "Contact Text"
+msgstr "整組好友的名稱"
+
+# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
+# NOTE 根據deryni的解釋，當contact收起時，我們見到的是priority buddy
+# NOTE 但當contact展開時，我們見到的是一個contact的名稱和包含在contact內的所有buddy
+# NOTE 照推理，所謂「text information for when a contact is expanded」應該是指contact的名稱
+msgid "The text information for when a contact is expanded"
+msgstr "好友展開時整組好友的名稱的字體及文字顏色"
+
+msgid "On-line Text"
+msgstr "上線好友的名稱"
+
+msgid "The text information for when a buddy is online"
+msgstr "好友上線時好友名稱的字體及文字顏色"
+
+msgid "Away Text"
+msgstr "離開好友的名稱"
+
+msgid "The text information for when a buddy is away"
+msgstr "好友離開時好友名稱的字體及文字顏色"
+
+msgid "Off-line Text"
+msgstr "離線好友的名稱"
+
+msgid "The text information for when a buddy is off-line"
+msgstr "好友離線時好友名稱的字體及文字顏色"
+
+msgid "Idle Text"
+msgstr "閒置好友的名稱"
+
+msgid "The text information for when a buddy is idle"
+msgstr "好友閒置時好友名稱的字體及文字顏色"
+
+msgid "Message Text"
+msgstr "有未讀訊息的好友名稱"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "好友有未讀訊息時好友名稱的字體及文字顏色"
+
+msgid "Message (Nick Said) Text"
+msgstr "提到您的暱稱的聊天室名稱"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr "聊天室中提到您的暱稱時聊天室名稱的字體及文字顏色"
+
+msgid "The text information for a buddy's status"
+msgstr "好友狀態的字體及文字顏色"
+
+# XXX 譯文有待改進 - acli 20070913
+msgid "Type the host name for this certificate."
+msgstr "請輸入這張憑證所屬的主機名稱。"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL 伺服器"
@@ -11158,12 +11170,6 @@ msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
-#. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
-
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
@@ -11194,7 +11200,7 @@ msgstr "忽略"
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-msgid "Last said"
+msgid "Last Said"
 msgstr "上次提到"
 
 msgid "Unable to save icon file to disk."
@@ -11242,6 +11248,19 @@ msgstr "/交談/另存新檔(_S)..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
+# XXX 媒體?  - acli 20090730
+msgid "/Conversation/M_edia"
+msgstr "/交談/媒體(_E)"
+
+msgid "/Conversation/Media/_Audio Call"
+msgstr "/交談/媒體/語音通話(_A)"
+
+msgid "/Conversation/Media/_Video Call"
+msgstr "/交談/媒體/視像通話(_V)"
+
+msgid "/Conversation/Media/Audio\\/Video _Call"
+msgstr "/交談/媒體/語音／視像通話(_C)"
+
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
@@ -11314,6 +11333,16 @@ msgstr "/交談"
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
+# XXX 媒體? - acli 20090730
+msgid "/Conversation/Media/Audio Call"
+msgstr "/交談/媒體/語音通話"
+
+msgid "/Conversation/Media/Video Call"
+msgstr "/交談/媒體/視像通話"
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr "/交談/媒體/語音／視像通話"
+
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
@@ -11511,6 +11540,9 @@ msgstr "平面設計"
 msgid "Ka-Hing Cheung"
 msgstr "張家興"
 
+msgid "voice and video"
+msgstr "語音及視像功能"
+
 msgid "support"
 msgstr "支援"
 
@@ -11647,6 +11679,9 @@ msgstr "印度文"
 msgid "Hungarian"
 msgstr "匈牙利文"
 
+msgid "Armenian"
+msgstr "亞美尼亞文"
+
 msgid "Indonesian"
 msgstr "印尼文"
 
@@ -11669,6 +11704,10 @@ msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 旗下所有喬治亞文翻譯人員"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
+msgid "Khmer"
+msgstr "高棉文"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE 註：KDE 譯「坎納達」
 msgid "Kannada"
 msgstr "康納達文"
@@ -11766,6 +11805,10 @@ msgstr "僧伽羅文"
 msgid "Swedish"
 msgstr "瑞典文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=swahili&qrytype=en&x=29&y=7
+msgid "Swahili"
+msgstr "斯瓦西里文"
+
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」，台一般譯「塔米爾」（看來較常見）或「泰米爾」
 msgid "Tamil"
@@ -11847,7 +11890,7 @@ msgstr ""
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC 頻道</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
+"<FONT SIZE=\"4\">IRC 頻道：</FONT>irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
 #, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
@@ -11857,8 +11900,8 @@ msgstr ""
 msgid "Current Developers"
 msgstr "現任開發者"
 
-# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on Pidgin ;-)
-# NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 Pidgin 賣力」
+# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
+# NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份，所以翻成「狂熱的模組作者」會比較好 :P
 msgid "Crazy Patch Writers"
@@ -12091,14 +12134,6 @@ msgstr "清除已完成的傳輸(_C)"
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
-#. Pause button
-msgid "_Pause"
-msgstr "暫停(_P)"
-
-#. Resume button
-msgid "_Resume"
-msgstr "恢復(_R)"
-
 #  NOTE Nautilus譯「貼上文本」，Abiword譯「未格式化貼上」，聽來都有些怪
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
@@ -12118,7 +12153,7 @@ msgstr "顯示連結時所用的顏色。"
 msgid "Hyperlink visited color"
 msgstr "瀏覽過的連結顏色"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "當滑鼠經過瀏覽過（或已啟動）的連結時的連結顏色。"
 
 msgid "Hyperlink prelight color"
@@ -12155,13 +12190,19 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 "收到的訊息是對方以「輕聲的說」這種動作發出的訊息時，用來顯示對方帳號的顏色"
 
+msgid "Color to draw the name of a whispered action message."
+msgstr "收到的訊息是代表對方「輕聲的說」時，用來顯示對帳號的顏色。"
+
 msgid "Whisper Message Name Color"
 msgstr "輕聲訊息帳號顏色"
 
+msgid "Color to draw the name of a whispered message."
+msgstr "收到的訊息是輕聲訊息時，用來顯示對帳號的顏色。"
+
 msgid "Typing notification color"
 msgstr "輸入通知顏色"
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr "用來顯示輸入通知的顏色"
 
 msgid "Typing notification font"
@@ -12174,16 +12215,7 @@ msgstr "用來顯示輸入通知的字型"
 msgid "Enable typing notification"
 msgstr "啟用輸入通知"
 
-msgid "_Copy Email Address"
-msgstr "複製電子郵件地址(_C)"
-
-msgid "_Open Link in Browser"
-msgstr "在瀏覽器中打開連結(_O)"
-
-msgid "_Copy Link Location"
-msgstr "複製連結位址(_C)"
-
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12193,7 +12225,7 @@ msgstr ""
 "\n"
 "暫且當成 PNG 檔處理。"
 
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12226,11 +12258,9 @@ msgstr ""
 msgid "Save Image"
 msgstr "儲存影像"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "插入自訂表情(_A)..."
 
@@ -12320,9 +12350,6 @@ msgstr "縮小字體"
 msgid "Font Face"
 msgstr "字型"
 
-msgid "Background Color"
-msgstr "背景顏色"
-
 #  XXX 譯「文字顏色」會否較好？ - acli 20070614
 msgid "Foreground Color"
 msgstr "前景顏色"
@@ -12442,6 +12469,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12456,6 +12484,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網路實際狀態，強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12473,6 +12502,7 @@ msgid ""
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12486,6 +12516,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網路實際狀態，強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12520,11 +12551,25 @@ msgstr "Pidgin"
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "Open All Messages"
-msgstr "開啟所有訊息"
+# XXX 媒體? - acli 20090730
+msgid "/_Media"
+msgstr "/媒體(_M)"
 
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">您有郵件！</span>"
+# XXX 暫譯 - acli 20090730
+msgid "/Media/_Hangup"
+msgstr "/媒體/掛斷(_H)"
+
+# XXX 暫譯 - acli 20090730
+msgid "Calling..."
+msgstr "撥打中..."
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr "%s 希望跟您進行語音／視像通話。"
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr "%s 希望跟您進行視像通話。"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12553,6 +12598,28 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。"
 
+msgid "No message"
+msgstr "沒有訊息"
+
+msgid "Open All Messages"
+msgstr "開啟所有訊息"
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">您有郵件！</span>"
+
+# XXX 這似乎是「好友狀態捕捉」發生時的通知視窗的視窗標題
+# XXX 暫譯，譯文有待改進 - acli 20090730
+msgid "New Pounces"
+msgstr "新發生的好友狀態捕捉"
+
+# XXX 譯「確定」是否較正常？ - acli 20090730
+msgid "Dismiss"
+msgstr "關閉"
+
+# XXX 暫譯，譯文有待改進 - acli 20090730
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">您捕捉到了好友狀態！</span>"
+
 msgid "The following plugins will be unloaded."
 msgstr "以下的模組將會被卸載。"
 
@@ -12599,10 +12666,16 @@ msgstr "<b>模組明細</b>"
 msgid "Select a file"
 msgstr "選擇檔案"
 
+msgid "Modify Buddy Pounce"
+msgstr "編輯好友狀態捕捉"
+
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
+msgid "_Account:"
+msgstr "帳號(_A)："
+
 msgid "_Buddy name:"
 msgstr "好友名稱(_B)："
 
@@ -12669,9 +12742,59 @@ msgstr "重覆發生(_R)"
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
-# XXX 要覆查 - 20061025
-msgid "Smiley theme failed to unpack."
-msgstr "無法打開表情主題。"
+#, c-format
+msgid "Started typing"
+msgstr "開始輸入"
+
+#, c-format
+msgid "Paused while typing"
+msgstr "暫停輸入"
+
+#, c-format
+msgid "Signed on"
+msgstr "登入"
+
+#, c-format
+msgid "Returned from being idle"
+msgstr "由閒置返回"
+
+#, c-format
+msgid "Returned from being away"
+msgstr "由離開返回"
+
+#, c-format
+msgid "Stopped typing"
+msgstr "停止輸入"
+
+#, c-format
+msgid "Signed off"
+msgstr "登出"
+
+#, c-format
+msgid "Became idle"
+msgstr "閒置"
+
+#, c-format
+msgid "Went away"
+msgstr "離開"
+
+#, c-format
+msgid "Sent a message"
+msgstr "送出訊息"
+
+#, c-format
+msgid "Unknown.... Please report this!"
+msgstr "未知的捕捉事件……請回報這個問題！"
+
+# XXX 要覆查 - 20090730
+msgid "Theme failed to unpack."
+msgstr "無法解開表情主題檔。"
+
+msgid "Theme failed to load."
+msgstr "無法載入表情主題。"
+
+msgid "Theme failed to copy."
+msgstr "無法複製表情主題。"
 
 #  NOTE 直譯「安裝主題」好像很無棱兩可，加個「檔」字好像較好
 msgid "Install Theme"
@@ -12693,6 +12816,11 @@ msgstr "鍵盤捷徑"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
 
+#. Buddy List Themes
+msgid "Buddy List Theme"
+msgstr "好友清單主題"
+
+#. System Tray
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
@@ -12702,8 +12830,8 @@ msgstr "顯示系統工作匣圖示(_S)："
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-msgid "Conversation Window Hiding"
-msgstr "隱藏即時訊息交談視窗"
+msgid "Conversation Window"
+msgstr "交談視窗"
 
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H)："
@@ -12711,6 +12839,9 @@ msgstr "隱藏新的即時訊息交談(_H)："
 msgid "When away"
 msgstr "離開期間"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "最小化所有新交談視窗(_Z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "分頁"
@@ -12771,9 +12902,6 @@ msgstr "使用平滑捲軸"
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "最小化所有新交談視窗(_Z)"
-
 msgid "Minimum input area height in lines:"
 msgstr "文字輸入區的最少行數："
 
@@ -12806,14 +12934,12 @@ msgstr "無法啟動代理伺服器設定程式。"
 msgid "Cannot start browser configuration program."
 msgstr "無法啟動瀏覽器設定程式。"
 
-msgid "ST_UN server:"
-msgstr "STUN 伺服器(_U)："
-
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例：stunserver.org</span>"
 
-msgid "_Autodetect IP address"
-msgstr "自動偵測 IP 位址(_A)"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "使用自動偵測得來的 IP 位址(_A)：%s"
 
 msgid "Public _IP:"
 msgstr "公共IP (_I)："
@@ -12833,6 +12959,11 @@ msgstr "啟始通訊埠(_S)："
 msgid "_End port:"
 msgstr "結束通訊埠(_E)："
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=relay&qrytype=en&x=29&y=11
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "中繼伺服器 (TURN)"
+
 msgid "Proxy Server &amp; Browser"
 msgstr "代理伺服器及瀏覽器"
 
@@ -13013,7 +13144,7 @@ msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
 msgid "_Auto-reply:"
-msgstr "何時送出自動回應："
+msgstr "何時送出自動回應(_A)："
 
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
@@ -13022,13 +13153,13 @@ msgstr "當離開並同時閒置時"
 msgid "Auto-away"
 msgstr "自動離開"
 
-msgid "Change status when _idle"
-msgstr "閒置時更改狀態(_I)"
-
 # NOTE 譯文更動 by Ambrose
 msgid "_Minutes before becoming idle:"
 msgstr "閒置多少分鐘更改狀態(_M)："
 
+msgid "Change status when _idle"
+msgstr "閒置時更改狀態(_I)"
+
 msgid "Change _status to:"
 msgstr "更改狀態為(_S)："
 
@@ -13178,46 +13309,44 @@ msgstr "儲存並使用(_V)"
 msgid "Status for %s"
 msgstr "狀態：%s"
 
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr "「%s」已自訂表情，請指定另一個捷徑。"
+
 msgid "Custom Smiley"
 msgstr "自訂表情"
 
-msgid "More Data needed"
-msgstr "需要進一步的資料"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "請給這個表情給定一個相關的捷徑。"
-
 msgid "Duplicate Shortcut"
 msgstr "重覆的表情定義"
 
-# XXX 20080810 acli - 暫譯
-msgid ""
-"A custom smiley for the selected shortcut already exists. Please specify a "
-"different shortcut."
-msgstr "給定的捷徑已有相關的自訂表情，請指定另一個捷徑。"
-
-msgid "Please select an image for the smiley."
-msgstr "請給這個表情選擇一個圖像。"
-
 msgid "Edit Smiley"
 msgstr "修改表情"
 
 msgid "Add Smiley"
 msgstr "新增表情"
 
-msgid "Smiley _Image"
-msgstr "表情圖像(_I)"
+msgid "_Image:"
+msgstr "影像(_I)："
 
-#. Smiley shortcut
-msgid "Smiley S_hortcut"
-msgstr "表情捷徑(_H)"
+# XXX 暫譯 - 20090305 acli
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "捷徑文字(_H)："
 
 msgid "Smiley"
 msgstr "表情"
 
+# XXX 暫譯 - 20090305 acli
+msgid "Shortcut Text"
+msgstr "捷徑文字"
+
 msgid "Custom Smiley Manager"
 msgstr "自訂表情管理"
 
+msgid "Select Buddy Icon"
+msgstr "選擇好友圖示"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "點選以更改這個帳號的圖示。"
 
@@ -13302,8 +13431,8 @@ msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr "您拖曳了一個啟動器；您大概想傳送啟動器要啟動的檔案，而不是啟動器本身。"
 
 #, c-format
@@ -13335,9 +13464,30 @@ msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "無法載入影像「%s」，原因不明，大概是影像檔已損壞"
 
+msgid "_Open Link"
+msgstr "打開連結(_O)"
+
+msgid "_Copy Link Location"
+msgstr "複製連結位址(_C)"
+
+msgid "_Copy Email Address"
+msgstr "複製電子郵件地址(_C)"
+
+msgid "_Open File"
+msgstr "開啟檔案(_O)"
+
+msgid "Open _Containing Directory"
+msgstr "開啟上層目錄(_C)"
+
 msgid "Save File"
 msgstr "儲存檔案"
 
+msgid "_Play Sound"
+msgstr "播放音效(_P)"
+
+msgid "_Save File"
+msgstr "儲存檔案(_S)"
+
 msgid "Select color"
 msgstr "選擇顏色"
 
@@ -13362,6 +13512,9 @@ msgstr "新增(_A)"
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+msgid "_Pause"
+msgstr "暫停(_P)"
+
 # TODO 要覆查 - 20080826
 msgid "_Edit"
 msgstr "修改(_E)"
@@ -13433,6 +13586,74 @@ msgstr "好友在線狀態預測模組"
 msgid "Displays statistical information about your buddies' availability"
 msgstr "顯示一些有關好友的在線狀態的統計"
 
+#  NOTE 這是「Select an XMPP server to query」所在視窗的標題
+msgid "Server name request"
+msgstr "要求伺服器名稱"
+
+#  XXX 這是半肓猜，看了原始碼也看不明，開發者又不答我的問題 - acli 20090803
+msgid "Enter an XMPP Server"
+msgstr "請輸入 XMPP 伺服器名稱"
+
+msgid "Select an XMPP server to query"
+msgstr "選擇查詢的 XMPP 伺服器"
+
+#  NOTE 這是按鈕
+#  FIXME 譯文有待改進 - acli 20090730
+msgid "Find Services"
+msgstr "搜尋服務"
+
+msgid "Add to Buddy List"
+msgstr "新增至好友清單"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
+msgid "Gateway"
+msgstr "閘道器"
+
+msgid "Directory"
+msgstr "目錄"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
+msgid "PubSub Collection"
+msgstr "PubSub 集子節點"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
+msgid "PubSub Leaf"
+msgstr "PubSub 葉子節點"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>描述：</b>"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "服務探索"
+
+msgid "_Browse"
+msgstr "瀏覽(_B)"
+
+msgid "Server does not exist"
+msgstr "伺服器不存在"
+
+msgid "Server does not support service discovery"
+msgstr "伺服器不支援服務探索"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP 服務探索"
+
+#  FIXME 譯文有待改進 - acli 20090730
+msgid "Allows browsing and registering services."
+msgstr "讓您瀏覽和註冊服務。"
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "幫助在傳統的傳送協定或其他 XMPP 服務中註冊。"
+
 msgid "Buddy is idle"
 msgstr "好友閒置"
 
@@ -13842,7 +14063,7 @@ msgstr "集體作曲用的音樂訊息模組"
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "音樂訊息模組為音樂編寫提供即時傳訊功能，讓多個使用者能同時編輯同一份樂譜。"
 
@@ -13958,13 +14179,6 @@ msgstr ""
 "- 它會將所有收到的訊息左右掉轉\n"
 "- 它會在您的好友登入時，立刻送出一個訊息給他們"
 
-msgid "Cursor Color"
-msgstr "游標顏色"
-
-#  XXX 只有一個軟件這樣譯，在無更好的譯文可供參考下暫且借用
-msgid "Secondary Cursor Color"
-msgstr "第二游標顏色"
-
 msgid "Hyperlink Color"
 msgstr "超連結顏色"
 
@@ -13976,6 +14190,9 @@ msgstr "瀏覽過的超連結顏色"
 msgid "Highlighted Message Name Color"
 msgstr "已標示訊息名稱顏"
 
+msgid "Typing Notification Color"
+msgstr "輸入通知顏色"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平間隔距離"
 
@@ -14006,35 +14223,22 @@ msgstr "GTK+介面字型"
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "介面顏色"
+# XXX 這是我譯的，但我認為這是很差的譯文，看了也不知是什麼 - acli 20080511
+msgid "Disable Typing Notification Text"
+msgstr "停用輸入通知"
 
-msgid "Widget Sizes"
-msgstr "Widget 大小"
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ 佈景主題控制設定"
+
+msgid "Colors"
+msgstr "顏色"
 
 msgid "Fonts"
 msgstr "字型"
 
+msgid "Miscellaneous"
+msgstr "雜項"
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc檔專用工具"
 
@@ -14074,10 +14278,10 @@ msgstr "%s 現已可升級至 %s 版。"
 msgid "New Version Available"
 msgstr "有新版本"
 
+# NOTE 這個「Later」是指「稍後下載」（即說：我知道有新版本了，稍後我會下載，暫時別煩我）
 msgid "Later"
-msgstr "稍後"
+msgstr "稍後下載"
 
-# NOTE: ui_name, ui_website - 這是「請從ui_website下載ui_name」的廣告訊息（quit message），ui_name通常就是「pidgin」
 msgid "Download Now"
 msgstr "立即下載"
 
@@ -14123,7 +14327,7 @@ msgstr "交談視窗的「傳送」按紐"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr "在交談視窗的輸入欄位加添一個「傳送」按紐，適用於沒有連接鍵盤時使用。"
 
 # FIXME 譯文有譯改進 - 20061027
@@ -14179,6 +14383,102 @@ msgstr "文字取代"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
+msgid "Just logged in"
+msgstr "剛巧登入"
+
+msgid "Just logged out"
+msgstr "剛巧登出"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+"代表好友的圖示/\n"
+"代表不明者的圖示"
+
+msgid "Icon for Chat"
+msgstr "代表聊天室的圖示"
+
+msgid "Ignored"
+msgstr "已忽略"
+
+#  NOTE「Founder」這處係指聊天室的建立者
+msgid "Founder"
+msgstr "建立者"
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr "管理員"
+
+#  NOTE 指聊天室內擁有部分管理員權限的人員，Konversation譯「助理」，Chatzilla譯「次管理員」
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr "助理"
+
+msgid "Authorization dialog"
+msgstr "認證視窗"
+
+msgid "Error dialog"
+msgstr "錯誤訊息視窗"
+
+msgid "Information dialog"
+msgstr "資訊訊息視窗"
+
+msgid "Mail dialog"
+msgstr "郵件視窗"
+
+#  XXX 這譯文絶對有問題，但想不到怎樣譯較好 - ambrose 20090730
+msgid "Question dialog"
+msgstr "提問視窗"
+
+msgid "Warning dialog"
+msgstr "警告訊息視窗"
+
+msgid "What kind of dialog is this?"
+msgstr "這是什麼類型的視窗？"
+
+msgid "Status Icons"
+msgstr "狀態圖示"
+
+# XXX 暫譯 - acli 20090730
+msgid "Chatroom Emblems"
+msgstr "聊天室圖示"
+
+msgid "Dialog Icons"
+msgstr "視窗圖示"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin 圖示主題編輯器"
+
+msgid "Contact"
+msgstr "好友"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin 好友清單主題編輯器"
+
+msgid "Edit Buddylist Theme"
+msgstr "編輯好友清單主題"
+
+msgid "Edit Icon Theme"
+msgstr "編輯圖示主題"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin 主題編輯器"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin 主題編輯器。"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14335,9 +14635,10 @@ msgstr "可停駐的好友清單(_D)"
 msgid "_Keep Buddy List window on top:"
 msgstr "好友清單視窗保持在桌面最上層(_K)；"
 
+# NOTE 譯文改動 by Ambrose 20090806, see Always/Never
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "只在停駐時生效"
+msgstr "只在停駐時啟動"
 
 msgid "Windows Pidgin Options"
 msgstr "Windows 版 Pidgin 選項"
@@ -14346,7 +14647,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 的相關選項。"
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項，例如好友清單的停駐功能。"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14388,6 +14689,482 @@ msgstr "送出、讀取未加工的 XMPP 段落。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "_Resume"
+#~ msgstr "恢復(_R)"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "無法讀取 SILC 密鑰對"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s 婉拒了你詢問他（她）到會議室「%s」的邀請，理由是「%s」。"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "邀請被婉拒了"
+
+#~ msgid "Invite message"
+#~ msgstr "邀請訊息"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "請輸入您想邀請的使用者名稱，以及選擇性填寫邀請的訊息。"
+
+#~ msgid "Cannot open socket"
+#~ msgstr "無法開啟Socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "無法監聽 Socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "無法讀取 Socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "連線失敗。"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "伺服器已停止連線"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "無法建立 Socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "無法連到伺服器"
+
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+#~ msgid "Read error"
+#~ msgstr "讀取錯誤"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Last Activity"
+#~ msgstr "最近活動"
+
+#  FIXME acli 2070914
+#~ msgid "Service Discovery Items"
+#~ msgstr "服務探尋項目"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "延伸段落定址"
+
+# NOTE 這是功能名稱
+#~ msgid "Multi-User Chat"
+#~ msgstr "多用戶聊天"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "多用戶聊天延伸上線狀態資訊"
+
+# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "帶內位元組串流"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "臨時指令"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 位元組串流"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "帶外數據"
+
+#  NOTE Untranslated
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "帶內註冊"
+
+#~ msgid "User Location"
+#~ msgstr "使用者所在位置"
+
+#~ msgid "User Avatar"
+#~ msgstr "使用者化身"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "聊天狀態通知"
+
+# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+#~ msgid "Software Version"
+#~ msgstr "軟體版本"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "開始串流"
+
+#~ msgid "User Mood"
+#~ msgstr "使用者情緒"
+
+# XXX may be wrong
+#~ msgid "User Activity"
+#~ msgstr "使用者活動狀態"
+
+#  NOTE 直譯：個體能力
+#  FIXME 譯文有待改進 - acli 20070918
+#~ msgid "Entity Capabilities"
+#~ msgstr "個體能力"
+
+#  FIXME 這聽來不對 - acli 20070913
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "加密工作階段協商"
+
+#~ msgid "User Tune"
+#~ msgstr "使用者樂曲"
+
+#  NOTE「Roster」指「名冊」，但Open Source software似乎一般譯「好友清單」、「成員列表」等
+#  FIXME 譯文有待改進 - acli 20070918
+#~ msgid "Roster Item Exchange"
+#~ msgstr "好友清單項目交換"
+
+#  NOTE 參見 http://jabber.org/protocol/reach
+#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」（例如電話號碼）
+#  NOTE 直譯：可抵達性位址
+#  XXX 是否譯「其他通訊方法」較好？但要先看上下文 - acli 20070918
+#~ msgid "Reachability Address"
+#~ msgstr "可抵達性位址"
+
+#~ msgid "User Profile"
+#~ msgstr "使用者資料"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle 音訊"
+
+#~ msgid "User Nickname"
+#~ msgstr "使用者暱稱"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle 視訊"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "收到的訊息"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "發佈公鑰"
+
+# NOTE Jabber 新功能規格
+#~ msgid "User Browsing"
+#~ msgstr "使用者瀏覽"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "段落加密"
+
+#  XXX 暫譯- acli 20070913
+#~ msgid "Delayed Delivery"
+#~ msgstr "延遲送出"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Jingle 用的 STUN 服務偵測"
+
+# FIXME 這聽來不對
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "簡化加密工作階段協商"
+
+#~ msgid "Hop Check"
+#~ msgstr "中繼段檢查"
+
+#~ msgid "Write error"
+#~ msgstr "寫入錯誤"
+
+#~ msgid "Read Error"
+#~ msgstr "讀取錯誤"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "無法連線到伺服器。"
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "讀取用的暫存區滿了（代號2）"
+
+#~ msgid "Unparseable message"
+#~ msgstr "無法解析訊息"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "無法連到伺服器：%s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "登入失敗 (%s)。"
+
+# XXX 暫譯
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "您已經被登出，因為您已在其他電腦上登入。"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "錯誤：沒有安裝 SSL 支援。"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法連線到 BOS 伺服器：\n"
+#~ "%s"
+
+#~ msgid "Invalid username."
+#~ msgstr "使用者名稱無效。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "密碼錯誤。"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "無法連線"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "無法解密伺服器回應"
+
+#~ msgid "Connection lost"
+#~ msgstr "連線中斷"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "無法解析主機"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "連線關閉（寫入）"
+
+#~ msgid "Connection reset"
+#~ msgstr "連線重置"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "讀取 Socket 時發生錯誤；%s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "無法連線到主機"
+
+#~ msgid "Could not write"
+#~ msgstr "無法寫入"
+
+#~ msgid "Could not connect"
+#~ msgstr "無法連結"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "無法建立 Socket 監聽"
+
+#~ msgid "Looking up %s"
+#~ msgstr "找尋 %s 中"
+
+#~ msgid "Connect to %s failed"
+#~ msgstr "連結到 %s 失敗"
+
+#~ msgid "Signon: %s"
+#~ msgstr "登入：%s"
+
+#~ msgid "Unable to write file %s."
+#~ msgstr "無法寫入檔案 %s。"
+
+#~ msgid "Unable to read file %s."
+#~ msgstr "無法讀取檔案 %s。"
+
+#~ msgid "Message too long, last %s bytes truncated."
+#~ msgstr "訊息太長，最後的 %s 位元組被截去。"
+
+#~ msgid "%s not currently logged in."
+#~ msgstr "%s 目前並未登入。"
+
+#  NOTE 譯文更動 by Ambrose
+#~ msgid "Warning of %s not allowed."
+#~ msgstr "不允許對 %s 發出警告。"
+
+#~ msgid ""
+#~ "A message has been dropped, you are exceeding the server speed limit."
+#~ msgstr "訊息被丟棄，因為您達到了伺服器所限制的發送速度。"
+
+#~ msgid "Chat in %s is not available."
+#~ msgstr "在 %s 不可以聊天。"
+
+#~ msgid "You are sending messages too fast to %s."
+#~ msgstr "您送訊息給 %s 的速度太快了。"
+
+#~ msgid "You missed an IM from %s because it was too big."
+#~ msgstr "您遺失了一個由 %s 送來的訊息，因為它太大了。"
+
+#~ msgid "You missed an IM from %s because it was sent too fast."
+#~ msgstr "您遺失了一個由 %s 送來的訊息，因為它傳送的速度太快。"
+
+#~ msgid "Failure."
+#~ msgstr "失敗。"
+
+#~ msgid "Too many matches."
+#~ msgstr "匹配太多。"
+
+#~ msgid "Need more qualifiers."
+#~ msgstr "需輸入更多檢索條件。"
+
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#~ msgid "Dir service temporarily unavailable."
+#~ msgstr "暫時無法使用目錄服務。"
+
+#~ msgid "Email lookup restricted."
+#~ msgstr "禁止 E-Mail 檢查。"
+
+#~ msgid "Keyword ignored."
+#~ msgstr "關鍵字已被忽略。"
+
+#~ msgid "No keywords."
+#~ msgstr "沒有關鍵字。"
+
+#~ msgid "User has no directory information."
+#~ msgstr "這個使用者沒有他的相關資訊。"
+
+#~ msgid "Country not supported."
+#~ msgstr "這個國家不被支援。"
+
+#~ msgid "Failure unknown: %s."
+#~ msgstr "未知的失敗原因：%s。"
+
+#~ msgid "Incorrect username or password."
+#~ msgstr "錯誤的帳號或密碼。"
+
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#~ msgid "The service is temporarily unavailable."
+#~ msgstr "暫時無法使用該項服務。"
+
+#~ msgid "Your warning level is currently too high to log in."
+#~ msgstr "您目前登入系統的警告等級太高，以致無法登入。"
+
+#~ 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 ""
+#~ "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+#~ "線，那麼您的等待時間將會更加的延長。"
+
+#~ msgid "An unknown signon error has occurred: %s."
+#~ msgstr "發生了一個未知的登入錯誤：%s。"
+
+#~ msgid "An unknown error, %d, has occurred.  Info: %s"
+#~ msgstr "一個未知的錯誤 %d 發生。資訊：%s"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "無效的群組名稱"
+
+#~ msgid "Connection Closed"
+#~ msgstr "連線關閉"
+
+#~ msgid "Waiting for reply..."
+#~ msgstr "等待回覆中..."
+
+#~ msgid "TOC has come back from its pause. You may now send messages again."
+#~ msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
+
+#~ msgid "Password Change Successful"
+#~ msgstr "密碼修改成功"
+
+#~ msgid "Get Dir Info"
+#~ msgstr "取得使用者個人資訊"
+
+#~ msgid "Set Dir Info"
+#~ msgstr "設定使用者個人資訊"
+
+#~ msgid "Could not open %s for writing!"
+#~ msgstr "無法開啟 %s 以供寫入！"
+
+#~ msgid "File transfer failed; other side probably canceled."
+#~ msgstr "檔案傳輸失敗；可能是對方取消傳輸。"
+
+#~ msgid "Could not connect for transfer."
+#~ msgstr "無法開啟連線以供傳輸。"
+
+#~ msgid "Could not write file header.  The file will not be transferred."
+#~ msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
+
+#~ msgid "Save As..."
+#~ msgstr "另存新檔..."
+
+#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+#~ msgstr[0] "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
+#~ msgstr[1] "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
+
+#~ msgid "%s requests you to send them a file"
+#~ msgstr "%s 要求您傳送檔案給他（她）。"
+
+#~ msgid "TOC Protocol Plugin"
+#~ msgstr "TOC 協定模組"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "啟用哪一個 ID？"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "傳呼伺服器（日本地區）"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "檔案傳輸伺服器（日本地區）"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "與伺服器之間的連線突然中斷\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "無法解析主機"
+
+#~ msgid "%s Options"
+#~ msgstr "%s 選項"
+
+#~ msgid "Proxy Options"
+#~ msgstr "代理伺服器選項"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "隱藏即時訊息交談視窗"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN 伺服器(_U)："
+
+#~ msgid "More Data needed"
+#~ msgstr "需要進一步的資料"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "請給這個表情給定一個相關的捷徑。"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "請給這個表情選擇一個圖像。"
+
+#~ msgid "Cursor Color"
+#~ msgstr "游標顏色"
+
+#  XXX 只有一個軟件這樣譯，在無更好的譯文可供參考下暫且借用
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "第二游標顏色"
+
+#~ msgid "Interface colors"
+#~ msgstr "介面顏色"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget 大小"
+
+#~ msgid "By log size"
+#~ msgstr "依照日誌大小"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "在瀏覽器中打開連結(_O)"
+
+#~ msgid "Smiley _Image"
+#~ msgstr "表情圖像(_I)"
+
+#~ msgid "Smiley S_hortcut"
+#~ msgstr "表情捷徑(_H)"
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "無法讀取 MSN 通訊錄"
 
@@ -14407,14 +15184,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgstr[0] "與伺服器失去連線（%d 秒內收不到任何資料）"
 #~ msgstr[1] "與伺服器失去連線（%d 秒內收不到任何資料）"
 
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "新增好友"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "登入回應解密失敗"
-
 #~ msgid "Keep alive error"
 #~ msgstr "Keep Alive錯誤"
 
@@ -14425,14 +15194,9 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ "與伺服器之間的連線突然中斷：\n"
 #~ "%d, %s"
 
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "連結伺服器"
-
 #~ msgid "Failed to send IM."
 #~ msgstr "送出即時訊息失敗。"
 
-#, fuzzy
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "您並非群組「%s」的成員\n"
 
@@ -14594,10 +15358,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "QQ Server Notice"
 #~ msgstr "QQ 伺服器通告"
 
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "遠端結束連線"
-
 #~ msgid "developer"
 #~ msgstr "開發者"
 
diff --git a/share/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem b/share/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
new file mode 100644
index 0000000000..ce04aeb25d
--- /dev/null
+++ b/share/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----

+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc

+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT

+ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw

+MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj

+dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l

+c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC

+UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc

+58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/

+o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH

+MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr

+aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA

+A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA

+Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv

+8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV

+-----END CERTIFICATE-----

diff --git a/share/ca-certs/Makefile.am b/share/ca-certs/Makefile.am
index 6fa8d98ec7..b9a0d0b17f 100644
--- a/share/ca-certs/Makefile.am
+++ b/share/ca-certs/Makefile.am
@@ -3,16 +3,21 @@ CERTIFICATES = \
 		CAcert_Root.pem \
 		CAcert_Class3.pem \
 		Equifax_Secure_CA.pem \
+		Equifax_Secure_Global_eBusiness_CA-1.pem \
 		GTE_CyberTrust_Global_Root.pem \
+		StartCom_Certification_Authority.pem \
 		StartCom_Free_SSL_CA.pem \
+		Thawte_Premium_Server_CA.pem \
 		Verisign_RSA_Secure_Server_CA.pem \
 		Verisign_Class3_Primary_CA.pem \
-		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
+		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem \
+		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
 
 EXTRA_CERTS = \
 		AOL_Member_CA.pem \
 		Microsoft_Internet_Authority.pem \
 		Microsoft_Secure_Server_Authority.pem \
+		VeriSign_Class3_Extended_Validation_CA.pem \
 		VeriSign_International_Server_Class_3_CA.pem
 
 
diff --git a/share/ca-certs/StartCom_Certification_Authority.pem b/share/ca-certs/StartCom_Certification_Authority.pem
new file mode 100644
index 0000000000..960f2657be
--- /dev/null
+++ b/share/ca-certs/StartCom_Certification_Authority.pem
@@ -0,0 +1,44 @@
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
+ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
+LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
+BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
+dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
+cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
+YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
+dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
+bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
+YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
+TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
+9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
+jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
+FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
+ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
+ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
+EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
+L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
+O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
+um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
+NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
+-----END CERTIFICATE-----
diff --git a/share/ca-certs/Thawte_Premium_Server_CA.pem b/share/ca-certs/Thawte_Premium_Server_CA.pem
new file mode 100644
index 0000000000..51285e33c2
--- /dev/null
+++ b/share/ca-certs/Thawte_Premium_Server_CA.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
diff --git a/share/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem b/share/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
new file mode 100644
index 0000000000..16aa0c2166
--- /dev/null
+++ b/share/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----

+MIIF5DCCBMygAwIBAgIQW3dZxheE4V7HJ8AylSkoazANBgkqhkiG9w0BAQUFADCB

+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL

+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp

+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW

+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0

+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMTYxMTA3MjM1OTU5WjCBujEL

+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW

+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQg

+aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMrVmVy

+aVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTCCASIwDQYJ

+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJjboFXrnP0XeeOabhQdsVuYI4cWbod2

+nLU4O7WgerQHYwkZ5iqISKnnnbYwWgiXDOyq5BZpcmIjmvt6VCiYxQwtt9citsj5

+OBfH3doxRpqUFI6e7nigtyLUSVSXTeV0W5K87Gws3+fBthsaVWtmCAN/Ra+aM/EQ

+wGyZSpIkMQht3QI+YXZ4eLbtfjeubPOJ4bfh3BXMt1afgKCxBX9ONxX/ty8ejwY4

+P1C3aSijtWZfNhpSSENmUt+ikk/TGGC+4+peGXEFv54cbGhyJW+ze3PJbb0S/5tB

+Ml706H7FC6NMZNFOvCYIZfsZl1h44TO/7Wg+sSdFb8Di7Jdp91zT91ECAwEAAaOC

+AdIwggHOMB0GA1UdDgQWBBT8ilC6nrklWntVhU+VAGOP6VhrQzASBgNVHRMBAf8E

+CDAGAQH/AgEAMD0GA1UdIAQ2MDQwMgYEVR0gADAqMCgGCCsGAQUFBwIBFhxodHRw

+czovL3d3dy52ZXJpc2lnbi5jb20vY3BzMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6

+Ly9FVlNlY3VyZS1jcmwudmVyaXNpZ24uY29tL3BjYTMtZzUuY3JsMA4GA1UdDwEB

+/wQEAwIBBjARBglghkgBhvhCAQEEBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZ

+MFcwVRYJaW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7

+GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwKQYDVR0R

+BCIwIKQeMBwxGjAYBgNVBAMTEUNsYXNzM0NBMjA0OC0xLTQ3MD0GCCsGAQUFBwEB

+BDEwLzAtBggrBgEFBQcwAYYhaHR0cDovL0VWU2VjdXJlLW9jc3AudmVyaXNpZ24u

+Y29tMB8GA1UdIwQYMBaAFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqGSIb3DQEB

+BQUAA4IBAQCWovp/5j3t1CvOtxU/wHIDX4u6FpAl98KD2Md1NGNoElMMU4l7yVYJ

+p8M2RE4O0GJis4b66KGbNGeNUyIXPv2s7mcuQ+JdfzOE8qJwwG6Cl8A0/SXGI3/t

+5rDFV0OEst4t8dD2SB8UcVeyrDHhlyQjyRNddOVG7wl8nuGZMQoIeRuPcZ8XZsg4

+z+6Ml7YGuXNG5NOUweVgtSV1LdlpMezNlsOjdv3odESsErlNv1HoudRETifLriDR

+fip8tmNHnna6l9AW5wtsbfdDbzMLKTB3+p359U64drPNGLT5IO892+bKrZvQTtKH

+qQ2mRHNQ3XBb7a1+Srwi1agm5MKFIA3Z

+-----END CERTIFICATE-----

diff --git a/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem b/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
new file mode 100644
index 0000000000..66bd370346
--- /dev/null
+++ b/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----

+MIIE3TCCBEagAwIBAgIQWPOeXAErGUchqY7k7uD4vzANBgkqhkiG9w0BAQUFADBf

+MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsT

+LkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw

+HhcNMDYxMTA4MDAwMDAwWhcNMjExMTA3MjM1OTU5WjCByjELMAkGA1UEBhMCVVMx

+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz

+dCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZv

+ciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAz

+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEi

+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8

+RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbext0uz/o9+B1fs70Pb

+ZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhDY2pSS9KP6HBR

+TdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/

+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNH

+iDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMB

+AAGjggGoMIIBpDAPBgNVHRMBAf8EBTADAQH/MDEGA1UdHwQqMCgwJqAkoCKGIGh0

+dHA6Ly9jcmwudmVyaXNpZ24uY29tL3BjYTMuY3JsMA4GA1UdDwEB/wQEAwIBBjBt

+BggrBgEFBQcBDARhMF+hXaBbMFkwVzBVFglpbWFnZS9naWYwITAfMAcGBSsOAwIa

+BBSP5dMahqyNjmvDz4Bq1EgYLHsZLjAlFiNodHRwOi8vbG9nby52ZXJpc2lnbi5j

+b20vdnNsb2dvLmdpZjA9BgNVHSAENjA0MDIGBFUdIAAwKjAoBggrBgEFBQcCARYc

+aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL2NwczAdBgNVHQ4EFgQUf9Nlp8Ld7Lvw

+MAnzQzn6Aq8zMTMwgYAGA1UdIwR5MHehY6RhMF8xCzAJBgNVBAYTAlVTMRcwFQYD

+VQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMyBQdWJsaWMgUHJp

+bWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIQcLrkHRDZKTS2OMp7A8y6vzAN

+BgkqhkiG9w0BAQUFAAOBgQCfFUleaybO7pjnTaWSP3Vq8DML+gncKJKrjWoxQdlH

+MUdGCaE5BT5mZRmLMr9hLBzVagNvRNw7r+8bk1jWvc7Q7baJd1EVWTIoxXqJjNo+

+bVx1rIbUx579OD6Wc0CHNGqETjGo0qK5PE4G3cuyfK7h1Z8edOUk8M/km+wl6s3s

+9g==

+-----END CERTIFICATE-----